Diff of the two buildlogs:

--
--- b1/build.log	2021-12-03 05:16:34.401657504 +0000
+++ b2/build.log	2021-12-03 05:30:45.864531248 +0000
@@ -1,6 +1,6 @@
 I: pbuilder: network access will be disabled during build
-I: Current time: Thu Dec  2 16:58:17 -12 2021
-I: pbuilder-time-stamp: 1638507497
+I: Current time: Fri Jan  6 01:39:43 +14 2023
+I: pbuilder-time-stamp: 1672918783
 I: Building the build Environment
 I: extracting base tarball [/var/cache/pbuilder/buster-reproducible-base.tgz]
 I: copying local configuration
@@ -17,7 +17,7 @@
 I: Extracting source
 gpgv: unknown type of key resource 'trustedkeys.kbx'
 gpgv: keyblock resource '/root/.gnupg/trustedkeys.kbx': General error
-gpgv: Signature made Sun Apr 19 14:30:12 2020 -12
+gpgv: Signature made Mon Apr 20 16:30:12 2020 +14
 gpgv:                using RSA key 521E58F17E96D712AA0FF102DFC671EEB333FA25
 gpgv:                issuer "jrnieder@gmail.com"
 gpgv: Can't check signature: No public key
@@ -88,136 +88,170 @@
 dpkg-source: info: applying 0060-Git-2.20.4.diff
 I: using fakeroot in build.
 I: Installing the build-deps
-I: user script /srv/workspace/pbuilder/2804152/tmp/hooks/D02_print_environment starting
+I: user script /srv/workspace/pbuilder/2302516/tmp/hooks/D01_modify_environment starting
+debug: Running on ionos5-amd64.
+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
+Removing 'diversion of /bin/sh to /bin/sh.distrib by dash'
+Adding 'diversion of /bin/sh to /bin/sh.distrib by bash'
+Removing 'diversion of /usr/share/man/man1/sh.1.gz to /usr/share/man/man1/sh.distrib.1.gz by dash'
+Adding 'diversion of /usr/share/man/man1/sh.1.gz to /usr/share/man/man1/sh.distrib.1.gz by 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/2302516/tmp/hooks/D01_modify_environment finished
+I: user script /srv/workspace/pbuilder/2302516/tmp/hooks/D02_print_environment starting
 I: set
-  BUILDDIR='/build'
-  BUILDUSERGECOS='first user,first room,first work-phone,first home-phone,first other'
-  BUILDUSERNAME='pbuilder1'
-  BUILD_ARCH='amd64'
-  DEBIAN_FRONTEND='noninteractive'
-  DEB_BUILD_OPTIONS='buildinfo=+all reproducible=+all parallel=15'
-  DISTRIBUTION=''
-  HOME='/root'
-  HOST_ARCH='amd64'
+  BASH=/bin/sh
+  BASHOPTS=checkwinsize:cmdhist:complete_fullquote:extquote:force_fignore:globasciiranges:hostcomplete:interactive_comments:progcomp:promptvars:sourcepath
+  BASH_ALIASES=()
+  BASH_ARGC=()
+  BASH_ARGV=()
+  BASH_CMDS=()
+  BASH_LINENO=([0]="12" [1]="0")
+  BASH_SOURCE=([0]="/tmp/hooks/D02_print_environment" [1]="/tmp/hooks/D02_print_environment")
+  BASH_VERSINFO=([0]="5" [1]="0" [2]="3" [3]="1" [4]="release" [5]="x86_64-pc-linux-gnu")
+  BASH_VERSION='5.0.3(1)-release'
+  BUILDDIR=/build
+  BUILDUSERGECOS='second user,second room,second work-phone,second home-phone,second other'
+  BUILDUSERNAME=pbuilder2
+  BUILD_ARCH=amd64
+  DEBIAN_FRONTEND=noninteractive
+  DEB_BUILD_OPTIONS='buildinfo=+all reproducible=+all parallel=16'
+  DIRSTACK=()
+  DISTRIBUTION=
+  EUID=0
+  FUNCNAME=([0]="Echo" [1]="main")
+  GROUPS=()
+  HOME=/root
+  HOSTNAME=i-capture-the-hostname
+  HOSTTYPE=x86_64
+  HOST_ARCH=amd64
   IFS=' 	
   '
-  INVOCATION_ID='b28c0e5e29b941e3bf4e452950e0c7b0'
-  LANG='C'
-  LANGUAGE='en_US:en'
-  LC_ALL='C'
-  MAIL='/var/mail/root'
-  OPTIND='1'
-  PATH='/usr/sbin:/usr/bin:/sbin:/bin:/usr/games'
-  PBCURRENTCOMMANDLINEOPERATION='build'
-  PBUILDER_OPERATION='build'
-  PBUILDER_PKGDATADIR='/usr/share/pbuilder'
-  PBUILDER_PKGLIBDIR='/usr/lib/pbuilder'
-  PBUILDER_SYSCONFDIR='/etc'
-  PPID='2804152'
-  PS1='# '
-  PS2='> '
+  INVOCATION_ID=44ea37eb2eed49078928da398745b3f2
+  LANG=C
+  LANGUAGE=et_EE:et
+  LC_ALL=C
+  MACHTYPE=x86_64-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=2302516
   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/tmp.olT6olsMs4/pbuilderrc_ZPAB --hookdir /etc/pbuilder/first-build-hooks --debbuildopts -b --basetgz /var/cache/pbuilder/buster-reproducible-base.tgz --buildresult /srv/reproducible-results/rbuild-debian/tmp.olT6olsMs4/b1 --logfile b1/build.log git_2.20.1-2+deb10u3.dsc'
-  SUDO_GID='110'
-  SUDO_UID='105'
-  SUDO_USER='jenkins'
-  TERM='unknown'
-  TZ='/usr/share/zoneinfo/Etc/GMT+12'
-  USER='root'
-  _='/usr/bin/systemd-run'
-  http_proxy='http://78.137.99.97:3128'
+  PWD=/
+  SHELL=/bin/bash
+  SHELLOPTS=braceexpand:errexit:hashall:interactive-comments:posix
+  SHLVL=3
+  SUDO_COMMAND='/usr/bin/timeout -k 24.1h 24h /usr/bin/ionice -c 3 /usr/bin/nice -n 11 /usr/bin/unshare --uts -- /usr/sbin/pbuilder --build --configfile /srv/reproducible-results/rbuild-debian/tmp.olT6olsMs4/pbuilderrc_uwB9 --hookdir /etc/pbuilder/rebuild-hooks --debbuildopts -b --basetgz /var/cache/pbuilder/buster-reproducible-base.tgz --buildresult /srv/reproducible-results/rbuild-debian/tmp.olT6olsMs4/b2 --logfile b2/build.log git_2.20.1-2+deb10u3.dsc'
+  SUDO_GID=110
+  SUDO_UID=105
+  SUDO_USER=jenkins
+  TERM=unknown
+  TZ=/usr/share/zoneinfo/Etc/GMT-14
+  UID=0
+  USER=root
+  _='I: set'
+  http_proxy=http://85.184.249.68:3128
 I: uname -a
-  Linux ionos1-amd64 5.10.0-9-amd64 #1 SMP Debian 5.10.70-1 (2021-09-30) x86_64 GNU/Linux
+  Linux i-capture-the-hostname 5.14.0-0.bpo.2-amd64 #1 SMP Debian 5.14.9-2~bpo11+1 (2021-10-10) x86_64 GNU/Linux
 I: ls -l /bin
   total 5116
-  -rwxr-xr-x 1 root root 1168776 Apr 17  2019 bash
-  -rwxr-xr-x 3 root root   38984 Jul 10  2019 bunzip2
-  -rwxr-xr-x 3 root root   38984 Jul 10  2019 bzcat
-  lrwxrwxrwx 1 root root       6 Jul 10  2019 bzcmp -> bzdiff
-  -rwxr-xr-x 1 root root    2227 Jul 10  2019 bzdiff
-  lrwxrwxrwx 1 root root       6 Jul 10  2019 bzegrep -> bzgrep
-  -rwxr-xr-x 1 root root    4877 Jun 24  2019 bzexe
-  lrwxrwxrwx 1 root root       6 Jul 10  2019 bzfgrep -> bzgrep
-  -rwxr-xr-x 1 root root    3641 Jul 10  2019 bzgrep
-  -rwxr-xr-x 3 root root   38984 Jul 10  2019 bzip2
-  -rwxr-xr-x 1 root root   14328 Jul 10  2019 bzip2recover
-  lrwxrwxrwx 1 root root       6 Jul 10  2019 bzless -> bzmore
-  -rwxr-xr-x 1 root root    1297 Jul 10  2019 bzmore
-  -rwxr-xr-x 1 root root   43744 Feb 28  2019 cat
-  -rwxr-xr-x 1 root root   64320 Feb 28  2019 chgrp
-  -rwxr-xr-x 1 root root   64288 Feb 28  2019 chmod
-  -rwxr-xr-x 1 root root   72512 Feb 28  2019 chown
-  -rwxr-xr-x 1 root root  146880 Feb 28  2019 cp
-  -rwxr-xr-x 1 root root  121464 Jan 17  2019 dash
-  -rwxr-xr-x 1 root root  109408 Feb 28  2019 date
-  -rwxr-xr-x 1 root root   76712 Feb 28  2019 dd
-  -rwxr-xr-x 1 root root   93744 Feb 28  2019 df
-  -rwxr-xr-x 1 root root  138856 Feb 28  2019 dir
-  -rwxr-xr-x 1 root root   84288 Jan  9  2019 dmesg
-  lrwxrwxrwx 1 root root       8 Sep 26  2018 dnsdomainname -> hostname
-  lrwxrwxrwx 1 root root       8 Sep 26  2018 domainname -> hostname
-  -rwxr-xr-x 1 root root   39520 Feb 28  2019 echo
-  -rwxr-xr-x 1 root root      28 Jan  7  2019 egrep
-  -rwxr-xr-x 1 root root   35424 Feb 28  2019 false
-  -rwxr-xr-x 1 root root      28 Jan  7  2019 fgrep
-  -rwxr-xr-x 1 root root   68880 Jan  9  2019 findmnt
-  -rwsr-xr-x 1 root root   34896 Apr 22  2020 fusermount
-  -rwxr-xr-x 1 root root  198976 Jan  7  2019 grep
-  -rwxr-xr-x 2 root root    2345 Jan  5  2019 gunzip
-  -rwxr-xr-x 1 root root    6375 Jan  5  2019 gzexe
-  -rwxr-xr-x 1 root root   98048 Jan  5  2019 gzip
-  -rwxr-xr-x 1 root root   26696 Sep 26  2018 hostname
-  -rwxr-xr-x 1 root root   68552 Feb 28  2019 ln
-  -rwxr-xr-x 1 root root   56760 Jul 26  2018 login
-  -rwxr-xr-x 1 root root  138856 Feb 28  2019 ls
-  -rwxr-xr-x 1 root root  108624 Jan  9  2019 lsblk
-  -rwxr-xr-x 1 root root   89088 Feb 28  2019 mkdir
-  -rwxr-xr-x 1 root root   68544 Feb 28  2019 mknod
-  -rwxr-xr-x 1 root root   43808 Feb 28  2019 mktemp
-  -rwxr-xr-x 1 root root   43008 Jan  9  2019 more
-  -rwsr-xr-x 1 root root   51280 Jan  9  2019 mount
-  -rwxr-xr-x 1 root root   14408 Jan  9  2019 mountpoint
-  -rwxr-xr-x 1 root root  138728 Feb 28  2019 mv
-  lrwxrwxrwx 1 root root       8 Sep 26  2018 nisdomainname -> hostname
-  lrwxrwxrwx 1 root root      14 Feb 14  2019 pidof -> /sbin/killall5
-  -rwxr-xr-x 1 root root   39616 Feb 28  2019 pwd
-  lrwxrwxrwx 1 root root       4 Apr 17  2019 rbash -> bash
-  -rwxr-xr-x 1 root root   47776 Feb 28  2019 readlink
-  -rwxr-xr-x 1 root root   68416 Feb 28  2019 rm
-  -rwxr-xr-x 1 root root   47776 Feb 28  2019 rmdir
-  -rwxr-xr-x 1 root root   23312 Jan 21  2019 run-parts
-  -rwxr-xr-x 1 root root  122224 Dec 22  2018 sed
-  lrwxrwxrwx 1 root root       4 Nov  7 09:58 sh -> dash
-  -rwxr-xr-x 1 root root   39552 Feb 28  2019 sleep
-  -rwxr-xr-x 1 root root   80672 Feb 28  2019 stty
-  -rwsr-xr-x 1 root root   63568 Jan  9  2019 su
-  -rwxr-xr-x 1 root root   35488 Feb 28  2019 sync
-  -rwxr-xr-x 1 root root  445560 Apr 23  2019 tar
-  -rwxr-xr-x 1 root root   14440 Jan 21  2019 tempfile
-  -rwxr-xr-x 1 root root   97152 Feb 28  2019 touch
-  -rwxr-xr-x 1 root root   35424 Feb 28  2019 true
-  -rwxr-xr-x 1 root root   14328 Apr 22  2020 ulockmgr_server
-  -rwsr-xr-x 1 root root   34888 Jan  9  2019 umount
-  -rwxr-xr-x 1 root root   39584 Feb 28  2019 uname
-  -rwxr-xr-x 2 root root    2345 Jan  5  2019 uncompress
-  -rwxr-xr-x 1 root root  138856 Feb 28  2019 vdir
-  -rwxr-xr-x 1 root root   34896 Jan  9  2019 wdctl
-  -rwxr-xr-x 1 root root     946 Jan 21  2019 which
-  lrwxrwxrwx 1 root root       8 Sep 26  2018 ypdomainname -> hostname
-  -rwxr-xr-x 1 root root    1983 Jan  5  2019 zcat
-  -rwxr-xr-x 1 root root    1677 Jan  5  2019 zcmp
-  -rwxr-xr-x 1 root root    5879 Jan  5  2019 zdiff
-  -rwxr-xr-x 1 root root      29 Jan  5  2019 zegrep
-  -rwxr-xr-x 1 root root      29 Jan  5  2019 zfgrep
-  -rwxr-xr-x 1 root root    2080 Jan  5  2019 zforce
-  -rwxr-xr-x 1 root root    7584 Jan  5  2019 zgrep
-  -rwxr-xr-x 1 root root    2205 Jan  5  2019 zless
-  -rwxr-xr-x 1 root root    1841 Jan  5  2019 zmore
-  -rwxr-xr-x 1 root root    4552 Jan  5  2019 znew
-I: user script /srv/workspace/pbuilder/2804152/tmp/hooks/D02_print_environment finished
+  -rwxr-xr-x 1 root root 1168776 Apr 18  2019 bash
+  -rwxr-xr-x 3 root root   38984 Jul 11  2019 bunzip2
+  -rwxr-xr-x 3 root root   38984 Jul 11  2019 bzcat
+  lrwxrwxrwx 1 root root       6 Jul 11  2019 bzcmp -> bzdiff
+  -rwxr-xr-x 1 root root    2227 Jul 11  2019 bzdiff
+  lrwxrwxrwx 1 root root       6 Jul 11  2019 bzegrep -> bzgrep
+  -rwxr-xr-x 1 root root    4877 Jun 25  2019 bzexe
+  lrwxrwxrwx 1 root root       6 Jul 11  2019 bzfgrep -> bzgrep
+  -rwxr-xr-x 1 root root    3641 Jul 11  2019 bzgrep
+  -rwxr-xr-x 3 root root   38984 Jul 11  2019 bzip2
+  -rwxr-xr-x 1 root root   14328 Jul 11  2019 bzip2recover
+  lrwxrwxrwx 1 root root       6 Jul 11  2019 bzless -> bzmore
+  -rwxr-xr-x 1 root root    1297 Jul 11  2019 bzmore
+  -rwxr-xr-x 1 root root   43744 Mar  1  2019 cat
+  -rwxr-xr-x 1 root root   64320 Mar  1  2019 chgrp
+  -rwxr-xr-x 1 root root   64288 Mar  1  2019 chmod
+  -rwxr-xr-x 1 root root   72512 Mar  1  2019 chown
+  -rwxr-xr-x 1 root root  146880 Mar  1  2019 cp
+  -rwxr-xr-x 1 root root  121464 Jan 18  2019 dash
+  -rwxr-xr-x 1 root root  109408 Mar  1  2019 date
+  -rwxr-xr-x 1 root root   76712 Mar  1  2019 dd
+  -rwxr-xr-x 1 root root   93744 Mar  1  2019 df
+  -rwxr-xr-x 1 root root  138856 Mar  1  2019 dir
+  -rwxr-xr-x 1 root root   84288 Jan 10  2019 dmesg
+  lrwxrwxrwx 1 root root       8 Sep 27  2018 dnsdomainname -> hostname
+  lrwxrwxrwx 1 root root       8 Sep 27  2018 domainname -> hostname
+  -rwxr-xr-x 1 root root   39520 Mar  1  2019 echo
+  -rwxr-xr-x 1 root root      28 Jan  8  2019 egrep
+  -rwxr-xr-x 1 root root   35424 Mar  1  2019 false
+  -rwxr-xr-x 1 root root      28 Jan  8  2019 fgrep
+  -rwxr-xr-x 1 root root   68880 Jan 10  2019 findmnt
+  -rwsr-xr-x 1 root root   34896 Apr 23  2020 fusermount
+  -rwxr-xr-x 1 root root  198976 Jan  8  2019 grep
+  -rwxr-xr-x 2 root root    2345 Jan  6  2019 gunzip
+  -rwxr-xr-x 1 root root    6375 Jan  6  2019 gzexe
+  -rwxr-xr-x 1 root root   98048 Jan  6  2019 gzip
+  -rwxr-xr-x 1 root root   26696 Sep 27  2018 hostname
+  -rwxr-xr-x 1 root root   68552 Mar  1  2019 ln
+  -rwxr-xr-x 1 root root   56760 Jul 27  2018 login
+  -rwxr-xr-x 1 root root  138856 Mar  1  2019 ls
+  -rwxr-xr-x 1 root root  108624 Jan 10  2019 lsblk
+  -rwxr-xr-x 1 root root   89088 Mar  1  2019 mkdir
+  -rwxr-xr-x 1 root root   68544 Mar  1  2019 mknod
+  -rwxr-xr-x 1 root root   43808 Mar  1  2019 mktemp
+  -rwxr-xr-x 1 root root   43008 Jan 10  2019 more
+  -rwsr-xr-x 1 root root   51280 Jan 10  2019 mount
+  -rwxr-xr-x 1 root root   14408 Jan 10  2019 mountpoint
+  -rwxr-xr-x 1 root root  138728 Mar  1  2019 mv
+  lrwxrwxrwx 1 root root       8 Sep 27  2018 nisdomainname -> hostname
+  lrwxrwxrwx 1 root root      14 Feb 15  2019 pidof -> /sbin/killall5
+  -rwxr-xr-x 1 root root   39616 Mar  1  2019 pwd
+  lrwxrwxrwx 1 root root       4 Apr 18  2019 rbash -> bash
+  -rwxr-xr-x 1 root root   47776 Mar  1  2019 readlink
+  -rwxr-xr-x 1 root root   68416 Mar  1  2019 rm
+  -rwxr-xr-x 1 root root   47776 Mar  1  2019 rmdir
+  -rwxr-xr-x 1 root root   23312 Jan 22  2019 run-parts
+  -rwxr-xr-x 1 root root  122224 Dec 23  2018 sed
+  lrwxrwxrwx 1 root root       4 Jan  6 01:41 sh -> bash
+  lrwxrwxrwx 1 root root       4 Dec 11 18:21 sh.distrib -> dash
+  -rwxr-xr-x 1 root root   39552 Mar  1  2019 sleep
+  -rwxr-xr-x 1 root root   80672 Mar  1  2019 stty
+  -rwsr-xr-x 1 root root   63568 Jan 10  2019 su
+  -rwxr-xr-x 1 root root   35488 Mar  1  2019 sync
+  -rwxr-xr-x 1 root root  445560 Apr 24  2019 tar
+  -rwxr-xr-x 1 root root   14440 Jan 22  2019 tempfile
+  -rwxr-xr-x 1 root root   97152 Mar  1  2019 touch
+  -rwxr-xr-x 1 root root   35424 Mar  1  2019 true
+  -rwxr-xr-x 1 root root   14328 Apr 23  2020 ulockmgr_server
+  -rwsr-xr-x 1 root root   34888 Jan 10  2019 umount
+  -rwxr-xr-x 1 root root   39584 Mar  1  2019 uname
+  -rwxr-xr-x 2 root root    2345 Jan  6  2019 uncompress
+  -rwxr-xr-x 1 root root  138856 Mar  1  2019 vdir
+  -rwxr-xr-x 1 root root   34896 Jan 10  2019 wdctl
+  -rwxr-xr-x 1 root root     946 Jan 22  2019 which
+  lrwxrwxrwx 1 root root       8 Sep 27  2018 ypdomainname -> hostname
+  -rwxr-xr-x 1 root root    1983 Jan  6  2019 zcat
+  -rwxr-xr-x 1 root root    1677 Jan  6  2019 zcmp
+  -rwxr-xr-x 1 root root    5879 Jan  6  2019 zdiff
+  -rwxr-xr-x 1 root root      29 Jan  6  2019 zegrep
+  -rwxr-xr-x 1 root root      29 Jan  6  2019 zfgrep
+  -rwxr-xr-x 1 root root    2080 Jan  6  2019 zforce
+  -rwxr-xr-x 1 root root    7584 Jan  6  2019 zgrep
+  -rwxr-xr-x 1 root root    2205 Jan  6  2019 zless
+  -rwxr-xr-x 1 root root    1841 Jan  6  2019 zmore
+  -rwxr-xr-x 1 root root    4552 Jan  6  2019 znew
+I: user script /srv/workspace/pbuilder/2302516/tmp/hooks/D02_print_environment finished
  -> Attempting to satisfy build-dependencies
  -> Creating pbuilder-satisfydepends-dummy package
 Package: pbuilder-satisfydepends-dummy
@@ -424,7 +458,7 @@
 Get: 119 http://deb.debian.org/debian buster/main amd64 xsltproc amd64 1.1.32-2.2~deb10u1 [122 kB]
 Get: 120 http://deb.debian.org/debian buster/main amd64 xmlto amd64 0.0.28-2.1 [33.6 kB]
 Get: 121 http://deb.debian.org/debian buster/main amd64 zlib1g-dev amd64 1:1.2.11.dfsg-1 [214 kB]
-Fetched 44.5 MB in 2s (24.2 MB/s)
+Fetched 44.5 MB in 3s (15.9 MB/s)
 debconf: delaying package configuration, since apt-utils is not installed
 Selecting previously unselected package libbsd0:amd64.
 (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 ... 19195 files and directories currently installed.)
@@ -939,7 +973,8 @@
 fakeroot is already the newest version (1.23-1).
 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
 I: Building the package
-I: Running cd /build/git-2.20.1/ && 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.20.1-2+deb10u3_source.changes
+hostname: Name or service not known
+I: Running cd /build/git-2.20.1/ && 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.20.1-2+deb10u3_source.changes
 dpkg-buildpackage: info: source package git
 dpkg-buildpackage: info: source version 1:2.20.1-2+deb10u3
 dpkg-buildpackage: info: source distribution buster-security
@@ -1034,16 +1069,6 @@
 /usr/bin/make -C Documentation/ clean
 /usr/bin/make -C ../  GIT-VERSION-FILE
 make[3]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f mergetools-list.made && \
-/bin/sh -c 'MERGE_TOOLS_DIR=../mergetools && \
-	. ../git-mergetool--lib.sh && \
-	show_tool_names can_diff "* " || :' >mergetools-diff.txt && \
-/bin/sh -c 'MERGE_TOOLS_DIR=../mergetools && \
-	. ../git-mergetool--lib.sh && \
-	show_tool_names can_merge "* " || :' >mergetools-merge.txt && \
-date >mergetools-list.made
-make[3]: Leaving directory '/build/git-2.20.1/Documentation'
-make[3]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f cmd-list.made && \
 /usr/bin/perl ./cmd-list.perl ../command-list.txt  && \
 date >cmd-list.made
@@ -1057,12 +1082,22 @@
 cmds-purehelpers.txt
 cmds-synchelpers.txt
 make[3]: Leaving directory '/build/git-2.20.1/Documentation'
-make[4]: 'GIT-VERSION-FILE' is up to date.
+make[3]: Entering directory '/build/git-2.20.1/Documentation'
+rm -f mergetools-list.made && \
+/bin/sh -c 'MERGE_TOOLS_DIR=../mergetools && \
+	. ../git-mergetool--lib.sh && \
+	show_tool_names can_diff "* " || :' >mergetools-diff.txt && \
+/bin/sh -c 'MERGE_TOOLS_DIR=../mergetools && \
+	. ../git-mergetool--lib.sh && \
+	show_tool_names can_merge "* " || :' >mergetools-merge.txt && \
+date >mergetools-list.made
+make[3]: Leaving directory '/build/git-2.20.1/Documentation'
 make[3]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f doc.dep+ doc.dep && \
 /usr/bin/perl ./build-docdep.perl >doc.dep+  && \
 mv doc.dep+ doc.dep
 make[3]: Leaving directory '/build/git-2.20.1/Documentation'
+make[4]: 'GIT-VERSION-FILE' is up to date.
 /usr/bin/make -C ../  GIT-VERSION-FILE
 make[4]: 'GIT-VERSION-FILE' is up to date.
 make[3]: Entering directory '/build/git-2.20.1/Documentation'
@@ -1171,10 +1206,10 @@
     * new build flags
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-gcc -o fuzz-pack-headers.o -c -MF ./.depend/fuzz-pack-headers.o.d -MQ fuzz-pack-headers.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  fuzz-pack-headers.c
+gcc -o fuzz-pack-idx.o -c -MF ./.depend/fuzz-pack-idx.o.d -MQ fuzz-pack-idx.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  fuzz-pack-idx.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-gcc -o fuzz-pack-idx.o -c -MF ./.depend/fuzz-pack-idx.o.d -MQ fuzz-pack-idx.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  fuzz-pack-idx.c
+gcc -o fuzz-pack-headers.o -c -MF ./.depend/fuzz-pack-headers.o.d -MQ fuzz-pack-headers.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  fuzz-pack-headers.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
     * new link flags
@@ -1183,121 +1218,115 @@
     * new prefix flags
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-gcc -o abspath.o -c -MF ./.depend/abspath.o.d -MQ abspath.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  abspath.c
+gcc -o common-main.o -c -MF ./.depend/common-main.o.d -MQ common-main.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  common-main.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-gcc -o alias.o -c -MF ./.depend/alias.o.d -MQ alias.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  alias.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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  base85.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-gcc -o blob.o -c -MF ./.depend/blob.o.d -MQ blob.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  blob.c
+gcc -o credential-store.o -c -MF ./.depend/credential-store.o.d -MQ credential-store.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  credential-store.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
 gcc -o argv-array.o -c -MF ./.depend/argv-array.o.d -MQ argv-array.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  argv-array.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-gcc -o common-main.o -c -MF ./.depend/common-main.o.d -MQ common-main.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  common-main.c
+gcc -o blob.o -c -MF ./.depend/blob.o.d -MQ blob.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  blob.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-gcc -o advice.o -c -MF ./.depend/advice.o.d -MQ advice.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  advice.c
+gcc -o alias.o -c -MF ./.depend/alias.o.d -MQ alias.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  alias.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-gcc -o alloc.o -c -MF ./.depend/alloc.o.d -MQ alloc.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  alloc.c
+gcc -o abspath.o -c -MF ./.depend/abspath.o.d -MQ abspath.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  abspath.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-gcc -o checkout.o -c -MF ./.depend/checkout.o.d -MQ checkout.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  checkout.c
+gcc -o advice.o -c -MF ./.depend/advice.o.d -MQ advice.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  advice.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-gcc -o bundle.o -c -MF ./.depend/bundle.o.d -MQ bundle.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  bundle.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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  alloc.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-gcc -o credential-store.o -c -MF ./.depend/credential-store.o.d -MQ credential-store.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  credential-store.c
+gcc -o bulk-checkin.o -c -MF ./.depend/bulk-checkin.o.d -MQ bulk-checkin.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  bulk-checkin.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-gcc -o base85.o -c -MF ./.depend/base85.o.d -MQ base85.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  base85.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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  checkout.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
 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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  chdir-notify.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-gcc -o color.o -c -MF ./.depend/color.o.d -MQ color.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  color.c
-make[2]: Leaving directory '/build/git-2.20.1'
-make[2]: Entering directory '/build/git-2.20.1'
-gcc -o bulk-checkin.o -c -MF ./.depend/bulk-checkin.o.d -MQ bulk-checkin.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  bulk-checkin.c
+gcc -o archive.o -c -MF ./.depend/archive.o.d -MQ archive.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  archive.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  compat/terminal.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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  archive-zip.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
 gcc -o branch.o -c -MF ./.depend/branch.o.d -MQ branch.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  branch.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  compat/obstack.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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  bisect.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
 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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  archive-tar.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-gcc -o column.o -c -MF ./.depend/column.o.d -MQ column.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  column.c
-make[2]: Leaving directory '/build/git-2.20.1'
-make[2]: Entering directory '/build/git-2.20.1'
-gcc -o bisect.o -c -MF ./.depend/bisect.o.d -MQ bisect.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  bisect.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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  compat/obstack.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-gcc -o copy.o -c -MF ./.depend/copy.o.d -MQ copy.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  copy.c
+gcc -o compat/terminal.o -c -MF compat/.depend/terminal.o.d -MQ compat/terminal.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  compat/terminal.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-gcc -o archive.o -c -MF ./.depend/archive.o.d -MQ archive.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  archive.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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  color.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-gcc -o connected.o -c -MF ./.depend/connected.o.d -MQ connected.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  connected.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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  column.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-gcc -o ctype.o -c -MF ./.depend/ctype.o.d -MQ ctype.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  ctype.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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  bundle.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
 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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  cache-tree.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  archive-zip.c
+gcc -o connected.o -c -MF ./.depend/connected.o.d -MQ connected.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  connected.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  csum-file.c
+gcc -o copy.o -c -MF ./.depend/copy.o.d -MQ copy.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  copy.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-gcc -o credential.o -c -MF ./.depend/credential.o.d -MQ credential.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  credential.c
+gcc -o ctype.o -c -MF ./.depend/ctype.o.d -MQ ctype.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  ctype.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  commit-reach.c
+gcc -o csum-file.o -c -MF ./.depend/csum-file.o.d -MQ csum-file.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  csum-file.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
 gcc -o decorate.o -c -MF ./.depend/decorate.o.d -MQ decorate.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  decorate.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-gcc -o commit.o -c -MF ./.depend/commit.o.d -MQ commit.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  commit.c
+gcc -o connect.o -c -MF ./.depend/connect.o.d -MQ connect.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  connect.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-gcc -o blame.o -c -MF ./.depend/blame.o.d -MQ blame.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  blame.c
+gcc -o commit-reach.o -c -MF ./.depend/commit-reach.o.d -MQ commit-reach.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  commit-reach.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  commit-graph.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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  diffcore-break.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  diffcore-break.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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  credential.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-gcc -o connect.o -c -MF ./.depend/connect.o.d -MQ connect.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  connect.c
+gcc -o diffcore-delta.o -c -MF ./.depend/diffcore-delta.o.d -MQ diffcore-delta.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  diffcore-delta.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  diffcore-order.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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  commit-graph.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  diffcore-delta.c
+gcc -o diffcore-order.o -c -MF ./.depend/diffcore-order.o.d -MQ diffcore-order.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  diffcore-order.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
 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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  diffcore-pickaxe.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-gcc -o date.o -c -MF ./.depend/date.o.d -MQ date.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  date.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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  blame.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
 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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  diff-no-index.c
@@ -1306,37 +1335,34 @@
 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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  diff-delta.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-gcc -o dir-iterator.o -c -MF ./.depend/dir-iterator.o.d -MQ dir-iterator.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  dir-iterator.c
-make[2]: Leaving directory '/build/git-2.20.1'
-make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  diffcore-rename.c
+gcc -o commit.o -c -MF ./.depend/commit.o.d -MQ commit.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  commit.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-gcc -o editor.o -c -MF ./.depend/editor.o.d -MQ editor.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  editor.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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  diff-lib.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  ewah/bitmap.c
+gcc -o dir-iterator.o -c -MF ./.depend/dir-iterator.o.d -MQ dir-iterator.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  dir-iterator.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-gcc -o entry.o -c -MF ./.depend/entry.o.d -MQ entry.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  entry.c
+gcc -o editor.o -c -MF ./.depend/editor.o.d -MQ editor.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  editor.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  diff-lib.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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  convert.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  delta-islands.c
+gcc -o combine-diff.o -c -MF ./.depend/combine-diff.o.d -MQ combine-diff.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  combine-diff.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  ewah/ewah_io.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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  date.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"' '-DGIT_EXEC_PATH="/usr/lib/git-core"' '-DGIT_LOCALE_PATH="share/locale"' '-DBINDIR="bin"' '-DFALLBACK_RUNTIME_PREFIX="/usr"' exec-cmd.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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  ewah/bitmap.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-gcc -o convert.o -c -MF ./.depend/convert.o.d -MQ convert.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  convert.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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  diffcore-rename.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  combine-diff.c
+gcc -o ewah/ewah_io.o -c -MF ewah/.depend/ewah_io.o.d -MQ ewah/ewah_io.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  ewah/ewah_io.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
 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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  ewah/ewah_rlw.c
@@ -1348,73 +1374,82 @@
 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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  fetch-negotiator.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  ewah/ewah_bitmap.c
+gcc -o exec-cmd.o -c -MF ./.depend/exec-cmd.o.d -MQ exec-cmd.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"' '-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/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
 gcc -o fetch-object.o -c -MF ./.depend/fetch-object.o.d -MQ fetch-object.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  fetch-object.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-gcc -o gettext.o -c -MF ./.depend/gettext.o.d -MQ gettext.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"' -DGIT_LOCALE_PATH='"share/locale"' gettext.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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  fsmonitor.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-gcc -o hashmap.o -c -MF ./.depend/hashmap.o.d -MQ hashmap.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  hashmap.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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  delta-islands.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-gcc -o fsmonitor.o -c -MF ./.depend/fsmonitor.o.d -MQ fsmonitor.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  fsmonitor.c
+gcc -o entry.o -c -MF ./.depend/entry.o.d -MQ entry.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  entry.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-gcc -o hex.o -c -MF ./.depend/hex.o.d -MQ hex.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  hex.c
+gcc -o gpg-interface.o -c -MF ./.depend/gpg-interface.o.d -MQ gpg-interface.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  gpg-interface.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  gpg-interface.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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"' -DGIT_LOCALE_PATH='"share/locale"' gettext.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
 gcc -o config.o -c -MF ./.depend/config.o.d -MQ config.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"' -DETC_GITCONFIG='"/etc/gitconfig"' config.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
+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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  ewah/ewah_bitmap.c
+make[2]: Leaving directory '/build/git-2.20.1'
+make[2]: Entering directory '/build/git-2.20.1'
 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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  linear-assignment.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-gcc -o interdiff.o -c -MF ./.depend/interdiff.o.d -MQ interdiff.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  interdiff.c
+gcc -o hex.o -c -MF ./.depend/hex.o.d -MQ hex.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  hex.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-gcc -o levenshtein.o -c -MF ./.depend/levenshtein.o.d -MQ levenshtein.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  levenshtein.c
+gcc -o interdiff.o -c -MF ./.depend/interdiff.o.d -MQ interdiff.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  interdiff.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-gcc -o ident.o -c -MF ./.depend/ident.o.d -MQ ident.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  ident.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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  hashmap.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  json-writer.c
+gcc -o levenshtein.o -c -MF ./.depend/levenshtein.o.d -MQ levenshtein.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  levenshtein.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-gcc -o graph.o -c -MF ./.depend/graph.o.d -MQ graph.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  graph.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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  fsck.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
 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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  line-range.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-gcc -o fsck.o -c -MF ./.depend/fsck.o.d -MQ fsck.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  fsck.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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  ident.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  list-objects-filter.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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  json-writer.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
 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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  list-objects-filter-options.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  ls-refs.c
+gcc -o graph.o -c -MF ./.depend/graph.o.d -MQ graph.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  graph.c
+make[2]: Leaving directory '/build/git-2.20.1'
+make[2]: Entering directory '/build/git-2.20.1'
+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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  list-objects-filter.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
 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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  list-objects.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-gcc -o dir.o -c -MF ./.depend/dir.o.d -MQ dir.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  dir.c
+gcc -o ls-refs.o -c -MF ./.depend/ls-refs.o.d -MQ ls-refs.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  ls-refs.c
+make[2]: Leaving directory '/build/git-2.20.1'
+make[2]: Entering directory '/build/git-2.20.1'
+gcc -o kwset.o -c -MF ./.depend/kwset.o.d -MQ kwset.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  kwset.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
 gcc -o ll-merge.o -c -MF ./.depend/ll-merge.o.d -MQ ll-merge.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  ll-merge.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-gcc -o kwset.o -c -MF ./.depend/kwset.o.d -MQ kwset.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  kwset.c
+gcc -o grep.o -c -MF ./.depend/grep.o.d -MQ grep.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  grep.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
 gcc -o lockfile.o -c -MF ./.depend/lockfile.o.d -MQ lockfile.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  lockfile.c
@@ -1423,94 +1458,88 @@
 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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  match-trees.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
+gcc -o merge.o -c -MF ./.depend/merge.o.d -MQ merge.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  merge.c
+make[2]: Leaving directory '/build/git-2.20.1'
+make[2]: Entering directory '/build/git-2.20.1'
 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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  mem-pool.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
 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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  merge-blobs.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-gcc -o grep.o -c -MF ./.depend/grep.o.d -MQ grep.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  grep.c
+gcc -o fetch-pack.o -c -MF ./.depend/fetch-pack.o.d -MQ fetch-pack.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  fetch-pack.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
 gcc -o mailmap.o -c -MF ./.depend/mailmap.o.d -MQ mailmap.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  mailmap.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-gcc -o merge.o -c -MF ./.depend/merge.o.d -MQ merge.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  merge.c
-make[2]: Leaving directory '/build/git-2.20.1'
-make[2]: Entering directory '/build/git-2.20.1'
 gcc -o mergesort.o -c -MF ./.depend/mergesort.o.d -MQ mergesort.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  mergesort.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
 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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  line-log.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  negotiator/skipping.c
-make[2]: Leaving directory '/build/git-2.20.1'
-make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  name-hash.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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  dir.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
 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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  negotiator/default.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  log-tree.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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  notes-utils.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  notes-cache.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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  negotiator/skipping.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-gcc -o mailinfo.o -c -MF ./.depend/mailinfo.o.d -MQ mailinfo.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  mailinfo.c
+gcc -o notes-cache.o -c -MF ./.depend/notes-cache.o.d -MQ notes-cache.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  notes-cache.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  fetch-pack.c
+gcc -o log-tree.o -c -MF ./.depend/log-tree.o.d -MQ log-tree.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  log-tree.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
 gcc -o oidmap.o -c -MF ./.depend/oidmap.o.d -MQ oidmap.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  oidmap.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  pack-check.c
+gcc -o name-hash.o -c -MF ./.depend/name-hash.o.d -MQ name-hash.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  name-hash.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-gcc -o apply.o -c -MF ./.depend/apply.o.d -MQ apply.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  apply.c
+gcc -o midx.o -c -MF ./.depend/midx.o.d -MQ midx.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  midx.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  pack-objects.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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  oidset.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  notes-utils.c
+gcc -o pack-check.o -c -MF ./.depend/pack-check.o.d -MQ pack-check.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  pack-check.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-gcc -o oidset.o -c -MF ./.depend/oidset.o.d -MQ oidset.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  oidset.c
+gcc -o mailinfo.o -c -MF ./.depend/mailinfo.o.d -MQ mailinfo.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  mailinfo.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-gcc -o midx.o -c -MF ./.depend/midx.o.d -MQ midx.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  midx.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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  pack-objects.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
 gcc -o object.o -c -MF ./.depend/object.o.d -MQ object.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  object.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-gcc -o pager.o -c -MF ./.depend/pager.o.d -MQ pager.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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/git-2.20.1'
-make[2]: Entering directory '/build/git-2.20.1'
 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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  pack-revindex.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  pack-write.c
+gcc -o notes.o -c -MF ./.depend/notes.o.d -MQ notes.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  notes.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  patch-delta.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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
 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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  parse-options-cb.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  patch-ids.c
+gcc -o patch-delta.o -c -MF ./.depend/patch-delta.o.d -MQ patch-delta.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  patch-delta.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-gcc -o notes.o -c -MF ./.depend/notes.o.d -MQ notes.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  notes.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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  pack-write.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  pack-bitmap-write.c
+gcc -o patch-ids.o -c -MF ./.depend/patch-ids.o.d -MQ patch-ids.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  patch-ids.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
 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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  notes-merge.c
@@ -1519,61 +1548,70 @@
 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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  preload-index.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  pkt-line.c
+gcc -o prompt.o -c -MF ./.depend/prompt.o.d -MQ prompt.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  prompt.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
 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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  prio-queue.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-gcc -o prompt.o -c -MF ./.depend/prompt.o.d -MQ prompt.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  prompt.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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  pack-bitmap-write.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-gcc -o progress.o -c -MF ./.depend/progress.o.d -MQ progress.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  progress.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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  packfile.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-gcc -o protocol.o -c -MF ./.depend/protocol.o.d -MQ protocol.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  progress.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  parse-options.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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  apply.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-gcc -o pathspec.o -c -MF ./.depend/pathspec.o.d -MQ pathspec.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  pathspec.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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  pkt-line.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
 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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  pack-bitmap.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-gcc -o reachable.o -c -MF ./.depend/reachable.o.d -MQ reachable.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  reachable.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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  protocol.c
+make[2]: Leaving directory '/build/git-2.20.1'
+make[2]: Entering directory '/build/git-2.20.1'
+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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  parse-options.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
 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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  rebase-interactive.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
+gcc -o reachable.o -c -MF ./.depend/reachable.o.d -MQ reachable.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  reachable.c
+make[2]: Leaving directory '/build/git-2.20.1'
+make[2]: Entering directory '/build/git-2.20.1'
+gcc -o pathspec.o -c -MF ./.depend/pathspec.o.d -MQ pathspec.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  pathspec.c
+make[2]: Leaving directory '/build/git-2.20.1'
+make[2]: Entering directory '/build/git-2.20.1'
 gcc -o path.o -c -MF ./.depend/path.o.d -MQ path.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  path.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
 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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  reflog-walk.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-gcc -o quote.o -c -MF ./.depend/quote.o.d -MQ quote.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  quote.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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  refs/iterator.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
 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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  range-diff.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  refs/ref-cache.c
+gcc -o refspec.o -c -MF ./.depend/refspec.o.d -MQ refspec.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  refspec.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-gcc -o packfile.o -c -MF ./.depend/packfile.o.d -MQ packfile.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  packfile.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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  quote.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-gcc -o refspec.o -c -MF ./.depend/refspec.o.d -MQ refspec.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  refspec.c
+gcc -o replace-object.o -c -MF ./.depend/replace-object.o.d -MQ replace-object.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  replace-object.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  replace-object.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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  refs/packed-backend.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  refs/iterator.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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  refs/ref-cache.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
 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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  merge-recursive.c
@@ -1582,16 +1620,19 @@
 gcc -o repository.o -c -MF ./.depend/repository.o.d -MQ repository.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  repository.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
+gcc -o serve.o -c -MF ./.depend/serve.o.d -MQ serve.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  serve.c
+make[2]: Leaving directory '/build/git-2.20.1'
+make[2]: Entering directory '/build/git-2.20.1'
 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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  resolve-undo.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-gcc -o serve.o -c -MF ./.depend/serve.o.d -MQ serve.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  serve.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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  refs.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-gcc -o rerere.o -c -MF ./.depend/rerere.o.d -MQ rerere.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  rerere.c
+gcc -o server-info.o -c -MF ./.depend/server-info.o.d -MQ server-info.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  server-info.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  refs/packed-backend.c
+gcc -o sha1-array.o -c -MF ./.depend/sha1-array.o.d -MQ sha1-array.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  sha1-array.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
 gcc -o pretty.o -c -MF ./.depend/pretty.o.d -MQ pretty.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  pretty.c
@@ -1600,235 +1641,226 @@
 gcc -o sha1-lookup.o -c -MF ./.depend/sha1-lookup.o.d -MQ sha1-lookup.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  sha1-lookup.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-gcc -o diff.o -c -MF ./.depend/diff.o.d -MQ diff.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  diff.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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  send-pack.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  send-pack.c
+gcc -o sigchain.o -c -MF ./.depend/sigchain.o.d -MQ sigchain.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  sigchain.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-gcc -o sha1-array.o -c -MF ./.depend/sha1-array.o.d -MQ sha1-array.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  sha1-array.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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  refs/files-backend.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  server-info.c
+gcc -o sideband.o -c -MF ./.depend/sideband.o.d -MQ sideband.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  sideband.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  refs/files-backend.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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  rerere.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
 gcc -o setup.o -c -MF ./.depend/setup.o.d -MQ setup.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  setup.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-gcc -o remote.o -c -MF ./.depend/remote.o.d -MQ remote.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  remote.c
+gcc -o run-command.o -c -MF ./.depend/run-command.o.d -MQ run-command.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  run-command.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-gcc -o refs.o -c -MF ./.depend/refs.o.d -MQ refs.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  refs.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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  split-index.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-gcc -o sigchain.o -c -MF ./.depend/sigchain.o.d -MQ sigchain.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  sigchain.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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  remote.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-gcc -o sideband.o -c -MF ./.depend/sideband.o.d -MQ sideband.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  sideband.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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  read-cache.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  run-command.c
+gcc -o streaming.o -c -MF ./.depend/streaming.o.d -MQ streaming.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  streaming.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  split-index.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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  diff.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
 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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  string-list.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-gcc -o streaming.o -c -MF ./.depend/streaming.o.d -MQ streaming.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  streaming.c
+gcc -o shallow.o -c -MF ./.depend/shallow.o.d -MQ shallow.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  shallow.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  ref-filter.c
+gcc -o sha1-file.o -c -MF ./.depend/sha1-file.o.d -MQ sha1-file.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  sha1-file.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  thread-utils.c
+gcc -o ref-filter.o -c -MF ./.depend/ref-filter.o.d -MQ ref-filter.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  ref-filter.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  sub-process.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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  symlinks.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-gcc -o shallow.o -c -MF ./.depend/shallow.o.d -MQ shallow.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  shallow.c
+gcc -o sub-process.o -c -MF ./.depend/sub-process.o.d -MQ sub-process.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  sub-process.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-gcc -o symlinks.o -c -MF ./.depend/symlinks.o.d -MQ symlinks.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  symlinks.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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  thread-utils.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  read-cache.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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  strbuf.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
 gcc -o tag.o -c -MF ./.depend/tag.o.d -MQ tag.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  tag.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  submodule-config.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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  tmp-objdir.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  tmp-objdir.c
+gcc -o tempfile.o -c -MF ./.depend/tempfile.o.d -MQ tempfile.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  tempfile.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-gcc -o strbuf.o -c -MF ./.depend/strbuf.o.d -MQ strbuf.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  strbuf.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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  submodule-config.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
 gcc -o sha1-name.o -c -MF ./.depend/sha1-name.o.d -MQ sha1-name.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  sha1-name.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-gcc -o tempfile.o -c -MF ./.depend/tempfile.o.d -MQ tempfile.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  tempfile.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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  trace.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
 gcc -o tree.o -c -MF ./.depend/tree.o.d -MQ tree.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  tree.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-gcc -o trace.o -c -MF ./.depend/trace.o.d -MQ trace.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  trace.c
+gcc -o usage.o -c -MF ./.depend/usage.o.d -MQ usage.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  usage.c
+make[2]: Leaving directory '/build/git-2.20.1'
+make[2]: Entering directory '/build/git-2.20.1'
+gcc -o revision.o -c -MF ./.depend/revision.o.d -MQ revision.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  revision.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
 gcc -o url.o -c -MF ./.depend/url.o.d -MQ url.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  url.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-gcc -o submodule.o -c -MF ./.depend/submodule.o.d -MQ submodule.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  submodule.c
+gcc -o trailer.o -c -MF ./.depend/trailer.o.d -MQ trailer.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  trailer.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  tree-diff.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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  submodule.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-gcc -o sha1-file.o -c -MF ./.depend/sha1-file.o.d -MQ sha1-file.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  sha1-file.c
+gcc -o varint.o -c -MF ./.depend/varint.o.d -MQ varint.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  varint.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-gcc -o userdiff.o -c -MF ./.depend/userdiff.o.d -MQ userdiff.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  userdiff.c
+gcc -o tree-diff.o -c -MF ./.depend/tree-diff.o.d -MQ tree-diff.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  tree-diff.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-gcc -o usage.o -c -MF ./.depend/usage.o.d -MQ usage.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  usage.c
+gcc -o userdiff.o -c -MF ./.depend/userdiff.o.d -MQ userdiff.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  userdiff.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
 gcc -o versioncmp.o -c -MF ./.depend/versioncmp.o.d -MQ versioncmp.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  versioncmp.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-gcc -o varint.o -c -MF ./.depend/varint.o.d -MQ varint.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  varint.c
+gcc -o write-or-die.o -c -MF ./.depend/write-or-die.o.d -MQ write-or-die.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  write-or-die.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-gcc -o transport.o -c -MF ./.depend/transport.o.d -MQ transport.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  transport.c
+gcc -o utf8.o -c -MF ./.depend/utf8.o.d -MQ utf8.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  utf8.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-gcc -o revision.o -c -MF ./.depend/revision.o.d -MQ revision.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  revision.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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  walker.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-gcc -o trailer.o -c -MF ./.depend/trailer.o.d -MQ trailer.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  trailer.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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  upload-pack.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
 gcc -o urlmatch.o -c -MF ./.depend/urlmatch.o.d -MQ urlmatch.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  urlmatch.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  tree-walk.c
-make[2]: Leaving directory '/build/git-2.20.1'
-make[2]: Entering directory '/build/git-2.20.1'
-gcc -o utf8.o -c -MF ./.depend/utf8.o.d -MQ utf8.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  utf8.c
-make[2]: Leaving directory '/build/git-2.20.1'
-make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  transport-helper.c
-make[2]: Leaving directory '/build/git-2.20.1'
-make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  write-or-die.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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  wildmatch.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-/bin/sh ./generate-cmdlist.sh command-list.txt >command-list.h+ && mv command-list.h+ command-list.h
+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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  tree-walk.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-gcc -o walker.o -c -MF ./.depend/walker.o.d -MQ walker.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  walker.c
+gcc -o unix-socket.o -c -MF ./.depend/unix-socket.o.d -MQ unix-socket.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  unix-socket.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-gcc -o wildmatch.o -c -MF ./.depend/wildmatch.o.d -MQ wildmatch.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  wildmatch.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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  transport.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  unix-socket.c
+gcc -o sha1dc_git.o -c -MF ./.depend/sha1dc_git.o.d -MQ sha1dc_git.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  sha1dc_git.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  sha1dc_git.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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  transport-helper.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  xdiff-interface.c
+gcc -o zlib.o -c -MF ./.depend/zlib.o.d -MQ zlib.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  zlib.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
 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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  compat/fopen.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-gcc -o worktree.o -c -MF ./.depend/worktree.o.d -MQ worktree.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  worktree.c
+gcc -o wrapper.o -c -MF ./.depend/wrapper.o.d -MQ wrapper.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  wrapper.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  compat/strlcpy.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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  ws.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-gcc -o ws.o -c -MF ./.depend/ws.o.d -MQ ws.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  ws.c
+gcc -o compat/strlcpy.o -c -MF compat/.depend/strlcpy.o.d -MQ compat/strlcpy.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  compat/strlcpy.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  upload-pack.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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  xdiff-interface.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-gcc -o zlib.o -c -MF ./.depend/zlib.o.d -MQ zlib.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  zlib.c
+gcc -o compat/qsort_s.o -c -MF compat/.depend/qsort_s.o.d -MQ compat/qsort_s.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  compat/qsort_s.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-gcc -o wrapper.o -c -MF ./.depend/wrapper.o.d -MQ wrapper.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  wrapper.c
+gcc -o worktree.o -c -MF ./.depend/worktree.o.d -MQ worktree.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  worktree.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  compat/qsort_s.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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  unpack-trees.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  sha1dc/ubc_check.c
+gcc -o xdiff/xprepare.o -c -MF xdiff/.depend/xprepare.o.d -MQ xdiff/xprepare.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  xdiff/xprepare.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  xdiff/xhistogram.c
+gcc -o xdiff/xpatience.o -c -MF xdiff/.depend/xpatience.o.d -MQ xdiff/xpatience.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  xdiff/xpatience.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
 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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  xdiff/xemit.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  xdiff/xpatience.c
+gcc -o xdiff/xhistogram.o -c -MF xdiff/.depend/xhistogram.o.d -MQ xdiff/xhistogram.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  xdiff/xhistogram.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  xdiff/xprepare.c
+gcc -o sh-i18n--envsubst.o -c -MF ./.depend/sh-i18n--envsubst.o.d -MQ sh-i18n--envsubst.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  sh-i18n--envsubst.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  xdiff/xutils.c
+gcc -o sha1dc/ubc_check.o -c -MF sha1dc/.depend/ubc_check.o.d -MQ sha1dc/ubc_check.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  sha1dc/ubc_check.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  xdiff/xutils.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
 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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  xdiff/xdiffi.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  unpack-trees.c
-make[2]: Leaving directory '/build/git-2.20.1'
-make[2]: Entering directory '/build/git-2.20.1'
 gcc -o shell.o -c -MF ./.depend/shell.o.d -MQ shell.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  shell.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  sh-i18n--envsubst.c
+gcc -o http-backend.o -c -MF ./.depend/http-backend.o.d -MQ http-backend.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  http-backend.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-gcc -o remote-testsvn.o -c -MF ./.depend/remote-testsvn.o.d -MQ remote-testsvn.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  remote-testsvn.c
+gcc -o vcs-svn/sliding_window.o -c -MF vcs-svn/.depend/sliding_window.o.d -MQ vcs-svn/sliding_window.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  vcs-svn/sliding_window.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-gcc -o vcs-svn/sliding_window.o -c -MF vcs-svn/.depend/sliding_window.o.d -MQ vcs-svn/sliding_window.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  vcs-svn/sliding_window.c
+gcc -o vcs-svn/line_buffer.o -c -MF vcs-svn/.depend/line_buffer.o.d -MQ vcs-svn/line_buffer.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  vcs-svn/line_buffer.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
 gcc -o vcs-svn/svndiff.o -c -MF vcs-svn/.depend/svndiff.o.d -MQ vcs-svn/svndiff.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  vcs-svn/svndiff.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-gcc -o vcs-svn/line_buffer.o -c -MF vcs-svn/.depend/line_buffer.o.d -MQ vcs-svn/line_buffer.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  vcs-svn/line_buffer.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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  xdiff/xmerge.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  http-fetch.c
+gcc -o remote-testsvn.o -c -MF ./.depend/remote-testsvn.o.d -MQ remote-testsvn.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  remote-testsvn.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  http-backend.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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  sha1dc/sha1.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-gcc -o vcs-svn/fast_export.o -c -MF vcs-svn/.depend/fast_export.o.d -MQ vcs-svn/fast_export.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  vcs-svn/fast_export.c
+    * new script parameters
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-    * new script parameters
+gcc -o vcs-svn/fast_export.o -c -MF vcs-svn/.depend/fast_export.o.d -MQ vcs-svn/fast_export.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  vcs-svn/fast_export.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
     * new perl-specific parameters
@@ -1837,59 +1869,56 @@
     * new Python interpreter location
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-gcc -o credential-cache.o -c -MF ./.depend/credential-cache.o.d -MQ credential-cache.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  credential-cache.c
-make[2]: Leaving directory '/build/git-2.20.1'
-make[2]: Entering directory '/build/git-2.20.1'
-rm -f git-mergetool--lib git-mergetool--lib+ && 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/@@NO_CURL@@//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|@@SANE_TEXT_GREP@@|-a|g' -e 's|@@PAGER_ENV@@|LESS=FRX LV=-c|g' git-mergetool--lib.sh >git-mergetool--lib+ && \
-mv git-mergetool--lib+ git-mergetool--lib
-make[2]: Leaving directory '/build/git-2.20.1'
-make[2]: Entering directory '/build/git-2.20.1'
 rm -f git-instaweb git-instaweb+ && 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/@@NO_CURL@@//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|@@SANE_TEXT_GREP@@|-a|g' -e 's|@@PAGER_ENV@@|LESS=FRX LV=-c|g' git-instaweb.sh >git-instaweb+ && \
 chmod +x git-instaweb+ && \
 mv git-instaweb+ git-instaweb
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
+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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  http-fetch.c
+make[2]: Leaving directory '/build/git-2.20.1'
+make[2]: Entering directory '/build/git-2.20.1'
 gcc -o vcs-svn/svndump.o -c -MF vcs-svn/.depend/svndump.o.d -MQ vcs-svn/svndump.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  vcs-svn/svndump.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
+gcc -o credential-cache.o -c -MF ./.depend/credential-cache.o.d -MQ credential-cache.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  credential-cache.c
+make[2]: Leaving directory '/build/git-2.20.1'
+make[2]: Entering directory '/build/git-2.20.1'
+rm -f git-mergetool--lib git-mergetool--lib+ && 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/@@NO_CURL@@//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|@@SANE_TEXT_GREP@@|-a|g' -e 's|@@PAGER_ENV@@|LESS=FRX LV=-c|g' git-mergetool--lib.sh >git-mergetool--lib+ && \
+mv git-mergetool--lib+ git-mergetool--lib
+make[2]: Leaving directory '/build/git-2.20.1'
+make[2]: Entering directory '/build/git-2.20.1'
 rm -f git-parse-remote git-parse-remote+ && 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/@@NO_CURL@@//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|@@SANE_TEXT_GREP@@|-a|g' -e 's|@@PAGER_ENV@@|LESS=FRX LV=-c|g' git-parse-remote.sh >git-parse-remote+ && \
 mv git-parse-remote+ git-parse-remote
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-rm -f git-rebase--am git-rebase--am+ && 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/@@NO_CURL@@//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|@@SANE_TEXT_GREP@@|-a|g' -e 's|@@PAGER_ENV@@|LESS=FRX LV=-c|g' git-rebase--am.sh >git-rebase--am+ && \
-mv git-rebase--am+ git-rebase--am
+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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  http-walker.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-rm -f git-rebase--common git-rebase--common+ && 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/@@NO_CURL@@//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|@@SANE_TEXT_GREP@@|-a|g' -e 's|@@PAGER_ENV@@|LESS=FRX LV=-c|g' git-rebase--common.sh >git-rebase--common+ && \
-mv git-rebase--common+ git-rebase--common
+rm -f git-rebase--am git-rebase--am+ && 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/@@NO_CURL@@//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|@@SANE_TEXT_GREP@@|-a|g' -e 's|@@PAGER_ENV@@|LESS=FRX LV=-c|g' git-rebase--am.sh >git-rebase--am+ && \
+mv git-rebase--am+ git-rebase--am
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
 rm -f git-rebase--preserve-merges git-rebase--preserve-merges+ && 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/@@NO_CURL@@//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|@@SANE_TEXT_GREP@@|-a|g' -e 's|@@PAGER_ENV@@|LESS=FRX LV=-c|g' git-rebase--preserve-merges.sh >git-rebase--preserve-merges+ && \
 mv git-rebase--preserve-merges+ git-rebase--preserve-merges
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  sha1dc/sha1.c
+rm -f git-rebase--common git-rebase--common+ && 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/@@NO_CURL@@//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|@@SANE_TEXT_GREP@@|-a|g' -e 's|@@PAGER_ENV@@|LESS=FRX LV=-c|g' git-rebase--common.sh >git-rebase--common+ && \
+mv git-rebase--common+ git-rebase--common
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
 rm -f git-sh-setup git-sh-setup+ && 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/@@NO_CURL@@//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|@@SANE_TEXT_GREP@@|-a|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/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-rm -f git-rebase--merge git-rebase--merge+ && 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/@@NO_CURL@@//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|@@SANE_TEXT_GREP@@|-a|g' -e 's|@@PAGER_ENV@@|LESS=FRX LV=-c|g' git-rebase--merge.sh >git-rebase--merge+ && \
-mv git-rebase--merge+ git-rebase--merge
-make[2]: Leaving directory '/build/git-2.20.1'
-make[2]: Entering directory '/build/git-2.20.1'
 rm -f git-sh-i18n git-sh-i18n+ && 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/@@NO_CURL@@//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|@@SANE_TEXT_GREP@@|-a|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/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  http-walker.c
-make[2]: Leaving directory '/build/git-2.20.1'
-make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  imap-send.c
+gcc -o credential-cache--daemon.o -c -MF ./.depend/credential-cache--daemon.o.d -MQ credential-cache--daemon.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  credential-cache--daemon.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-gcc -o credential-cache--daemon.o -c -MF ./.depend/credential-cache--daemon.o.d -MQ credential-cache--daemon.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  credential-cache--daemon.c
+rm -f git-rebase--merge git-rebase--merge+ && 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/@@NO_CURL@@//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|@@SANE_TEXT_GREP@@|-a|g' -e 's|@@PAGER_ENV@@|LESS=FRX LV=-c|g' git-rebase--merge.sh >git-rebase--merge+ && \
+mv git-rebase--merge+ git-rebase--merge
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
 gcc -o daemon.o -c -MF ./.depend/daemon.o.d -MQ daemon.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  daemon.c
@@ -1898,22 +1927,19 @@
 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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/annotate.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/archive.c
+gcc -o builtin/bisect--helper.o -c -MF builtin/.depend/bisect--helper.o.d -MQ builtin/bisect--helper.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/bisect--helper.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
 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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/apply.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-gcc -o builtin/bisect--helper.o -c -MF builtin/.depend/bisect--helper.o.d -MQ builtin/bisect--helper.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/bisect--helper.c
-make[2]: Leaving directory '/build/git-2.20.1'
-make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/bundle.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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  imap-send.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/check-ignore.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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/archive.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/check-attr.c
+gcc -o builtin/bundle.o -c -MF builtin/.depend/bundle.o.d -MQ builtin/bundle.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/bundle.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
 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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  wt-status.c
@@ -1922,175 +1948,181 @@
 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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/add.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/check-mailmap.c
+gcc -o git.o -c -MF ./.depend/git.o.d -MQ git.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"' '-DGIT_HTML_PATH="share/doc/git/html"' '-DGIT_MAN_PATH="share/man"' '-DGIT_INFO_PATH="share/info"' git.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/check-ref-format.c
+/bin/sh ./generate-cmdlist.sh command-list.txt >command-list.h+ && mv command-list.h+ command-list.h
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-gcc -o sequencer.o -c -MF ./.depend/sequencer.o.d -MQ sequencer.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  sequencer.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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/check-attr.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-gcc -o http.o -c -MF ./.depend/http.o.d -MQ http.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  http.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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  http-push.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-gcc -o git.o -c -MF ./.depend/git.o.d -MQ git.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"' '-DGIT_HTML_PATH="share/doc/git/html"' '-DGIT_MAN_PATH="share/man"' '-DGIT_INFO_PATH="share/info"' git.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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/check-mailmap.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/cat-file.c
+gcc -o builtin/check-ref-format.o -c -MF builtin/.depend/check-ref-format.o.d -MQ builtin/check-ref-format.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/check-ref-format.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/checkout-index.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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/check-ignore.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/column.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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  sequencer.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/commit-tree.c
+gcc -o builtin/cat-file.o -c -MF builtin/.depend/cat-file.o.d -MQ builtin/cat-file.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/cat-file.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/column.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/credential.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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/commit-graph.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/count-objects.c
+gcc -o builtin/commit-tree.o -c -MF builtin/.depend/commit-tree.o.d -MQ builtin/commit-tree.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/commit-tree.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  http-push.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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  remote-curl.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/branch.c
+gcc -o builtin/checkout-index.o -c -MF builtin/.depend/checkout-index.o.d -MQ builtin/checkout-index.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/checkout-index.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/diff-files.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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/credential.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/blame.c
+gcc -o builtin/count-objects.o -c -MF builtin/.depend/count-objects.o.d -MQ builtin/count-objects.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/count-objects.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/diff-index.c
+gcc -o builtin/diff-files.o -c -MF builtin/.depend/diff-files.o.d -MQ builtin/diff-files.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/diff-files.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/diff-tree.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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/diff-index.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  remote-curl.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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/branch.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/config.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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/clean.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/am.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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/blame.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/diff.c
+gcc -o builtin/config.o -c -MF builtin/.depend/config.o.d -MQ builtin/config.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/config.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/fetch-pack.c
+gcc -o builtin/diff-tree.o -c -MF builtin/.depend/diff-tree.o.d -MQ builtin/diff-tree.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/diff-tree.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-gcc -o fast-import.o -c -MF ./.depend/fast-import.o.d -MQ fast-import.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  fast-import.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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  http.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/clean.c
+gcc -o builtin/diff.o -c -MF builtin/.depend/diff.o.d -MQ builtin/diff.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/diff.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/describe.c
+gcc -o builtin/clone.o -c -MF builtin/.depend/clone.o.d -MQ builtin/clone.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/clone.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
 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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/for-each-ref.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/clone.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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/commit.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
 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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/get-tar-commit-id.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/difftool.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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/fetch-pack.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/hash-object.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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/describe.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/gc.c
+gcc -o fast-import.o -c -MF ./.depend/fast-import.o.d -MQ fast-import.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  fast-import.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/checkout.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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/hash-object.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/commit.c
+gcc -o builtin/difftool.o -c -MF builtin/.depend/difftool.o.d -MQ builtin/difftool.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/difftool.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/interpret-trailers.c
+gcc -o builtin/help.o -c -MF builtin/.depend/help.o.d -MQ builtin/help.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"' '-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/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"' '-DGIT_HTML_PATH="share/doc/git/html"' '-DGIT_MAN_PATH="share/man"' '-DGIT_INFO_PATH="share/info"' builtin/help.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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/gc.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/mailinfo.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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/am.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/fmt-merge-msg.c
+gcc -o builtin/checkout.o -c -MF builtin/.depend/checkout.o.d -MQ builtin/checkout.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/checkout.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
 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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/fast-export.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/ls-tree.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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/interpret-trailers.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
 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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/ls-remote.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
+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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/fmt-merge-msg.c
+make[2]: Leaving directory '/build/git-2.20.1'
+make[2]: Entering directory '/build/git-2.20.1'
 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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/fsck.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/merge-index.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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/mailinfo.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/fetch.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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/merge-base.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/merge-file.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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"' -DDEFAULT_GIT_TEMPLATE_DIR='"share/git-core/templates"' builtin/init-db.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/ls-tree.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
 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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/merge-ours.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/mailsplit.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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/merge-file.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
 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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/merge-recursive.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"' -DDEFAULT_GIT_TEMPLATE_DIR='"share/git-core/templates"' builtin/init-db.c
+gcc -o builtin/merge-index.o -c -MF builtin/.depend/merge-index.o.d -MQ builtin/merge-index.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/merge-index.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
 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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/mktag.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/pack-refs.c
+gcc -o builtin/mailsplit.o -c -MF builtin/.depend/mailsplit.o.d -MQ builtin/mailsplit.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/mailsplit.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/ls-files.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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/multi-pack-index.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/multi-pack-index.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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/ls-files.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/mktree.c
+gcc -o builtin/pack-refs.o -c -MF builtin/.depend/pack-refs.o.d -MQ builtin/pack-refs.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/pack-refs.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
 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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/merge-tree.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/mv.c
+gcc -o builtin/mktree.o -c -MF builtin/.depend/mktree.o.d -MQ builtin/mktree.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/mktree.c
+make[2]: Leaving directory '/build/git-2.20.1'
+make[2]: Entering directory '/build/git-2.20.1'
+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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/fetch.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
 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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/prune-packed.c
@@ -2099,170 +2131,156 @@
 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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/patch-id.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/name-rev.c
+gcc -o builtin/mv.o -c -MF builtin/.depend/mv.o.d -MQ builtin/mv.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/mv.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/grep.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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/prune.c
+make[2]: Leaving directory '/build/git-2.20.1'
+make[2]: Entering directory '/build/git-2.20.1'
+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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/name-rev.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
 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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/range-diff.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/prune.c
+gcc -o builtin/grep.o -c -MF builtin/.depend/grep.o.d -MQ builtin/grep.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/grep.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/merge.c
+gcc -o builtin/read-tree.o -c -MF builtin/.depend/read-tree.o.d -MQ builtin/read-tree.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/read-tree.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
 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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/notes.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/read-tree.c
+gcc -o builtin/rebase--interactive.o -c -MF builtin/.depend/rebase--interactive.o.d -MQ builtin/rebase--interactive.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/rebase--interactive.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/push.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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/remote-fd.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/pull.c
+gcc -o builtin/index-pack.o -c -MF builtin/.depend/index-pack.o.d -MQ builtin/index-pack.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/index-pack.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/remote-fd.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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/pull.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/remote-ext.c
+gcc -o builtin/push.o -c -MF builtin/.depend/push.o.d -MQ builtin/push.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/push.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-gcc -o builtin/rebase--interactive.o -c -MF builtin/.depend/rebase--interactive.o.d -MQ builtin/rebase--interactive.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/rebase--interactive.c
+gcc -o builtin/remote-ext.o -c -MF builtin/.depend/remote-ext.o.d -MQ builtin/remote-ext.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/remote-ext.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
 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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/rerere.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/reflog.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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/merge.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/replace.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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/pack-redundant.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/index-pack.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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/replace.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/pack-redundant.c
+gcc -o builtin/revert.o -c -MF builtin/.depend/revert.o.d -MQ builtin/revert.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/revert.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/rev-list.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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/reflog.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
 gcc -o builtin/reset.o -c -MF builtin/.depend/reset.o.d -MQ builtin/reset.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/reset.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-gcc -o builtin/serve.o -c -MF builtin/.depend/serve.o.d -MQ builtin/serve.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/serve.c
-make[2]: Leaving directory '/build/git-2.20.1'
-make[2]: Entering directory '/build/git-2.20.1'
 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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/repack.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/rm.c
+gcc -o builtin/serve.o -c -MF builtin/.depend/serve.o.d -MQ builtin/serve.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/serve.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
 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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/log.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/revert.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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/rev-list.c
+make[2]: Leaving directory '/build/git-2.20.1'
+make[2]: Entering directory '/build/git-2.20.1'
+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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/rm.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
 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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/stripspace.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/send-pack.c
+gcc -o builtin/rebase.o -c -MF builtin/.depend/rebase.o.d -MQ builtin/rebase.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/rebase.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/send-pack.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
 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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/show-ref.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/symbolic-ref.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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/show-index.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/unpack-file.c
+gcc -o builtin/symbolic-ref.o -c -MF builtin/.depend/symbolic-ref.o.d -MQ builtin/symbolic-ref.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/symbolic-ref.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
 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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/shortlog.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/remote.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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/unpack-file.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
 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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/update-server-info.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/receive-pack.c
+gcc -o builtin/upload-pack.o -c -MF builtin/.depend/upload-pack.o.d -MQ builtin/upload-pack.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/upload-pack.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/upload-pack.c
+gcc -o builtin/receive-pack.o -c -MF builtin/.depend/receive-pack.o.d -MQ builtin/receive-pack.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/receive-pack.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
 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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/rev-parse.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
+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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/update-ref.c
+make[2]: Leaving directory '/build/git-2.20.1'
+make[2]: Entering directory '/build/git-2.20.1'
 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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/upload-archive.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
 gcc -o builtin/var.o -c -MF builtin/.depend/var.o.d -MQ builtin/var.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/var.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/write-tree.c
+rm -f xdiff/lib.a && ar rcs xdiff/lib.a xdiff/xdiffi.o xdiff/xprepare.o xdiff/xutils.o xdiff/xemit.o xdiff/xmerge.o xdiff/xpatience.o xdiff/xhistogram.o
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
 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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/verify-pack.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-gcc -o builtin/verify-tag.o -c -MF builtin/.depend/verify-tag.o.d -MQ builtin/verify-tag.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/verify-tag.c
-make[2]: Leaving directory '/build/git-2.20.1'
-make[2]: Entering directory '/build/git-2.20.1'
-gcc -o version.o -c -MF ./.depend/version.o.d -MQ version.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"' '-DGIT_VERSION="2.20.1"' '-DGIT_USER_AGENT="git/2.20.1"' '-DGIT_BUILT_FROM_COMMIT=""' version.c
-make[2]: Leaving directory '/build/git-2.20.1'
-make[2]: Entering directory '/build/git-2.20.1'
-rm -f xdiff/lib.a && ar rcs xdiff/lib.a xdiff/xdiffi.o xdiff/xprepare.o xdiff/xutils.o xdiff/xemit.o xdiff/xmerge.o xdiff/xpatience.o xdiff/xhistogram.o
+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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/verify-commit.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
 rm -f vcs-svn/lib.a && ar rcs vcs-svn/lib.a vcs-svn/line_buffer.o vcs-svn/sliding_window.o vcs-svn/fast_export.o vcs-svn/svndiff.o vcs-svn/svndump.o
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/show-branch.c
-make[2]: Leaving directory '/build/git-2.20.1'
-make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/update-ref.c
-make[2]: Leaving directory '/build/git-2.20.1'
-make[2]: Entering directory '/build/git-2.20.1'
-rm -f git-merge-octopus git-merge-octopus+ && 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/@@NO_CURL@@//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|@@SANE_TEXT_GREP@@|-a|g' -e 's|@@PAGER_ENV@@|LESS=FRX LV=-c|g' git-merge-octopus.sh >git-merge-octopus+ && \
-chmod +x git-merge-octopus+ && \
-mv git-merge-octopus+ git-merge-octopus
-make[2]: Leaving directory '/build/git-2.20.1'
-make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/rebase.c
-make[2]: Leaving directory '/build/git-2.20.1'
-make[2]: Entering directory '/build/git-2.20.1'
 rm -f git-bisect git-bisect+ && 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/@@NO_CURL@@//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|@@SANE_TEXT_GREP@@|-a|g' -e 's|@@PAGER_ENV@@|LESS=FRX LV=-c|g' git-bisect.sh >git-bisect+ && \
 chmod +x git-bisect+ && \
 mv git-bisect+ git-bisect
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-rm -f git-filter-branch git-filter-branch+ && 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/@@NO_CURL@@//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|@@SANE_TEXT_GREP@@|-a|g' -e 's|@@PAGER_ENV@@|LESS=FRX LV=-c|g' git-filter-branch.sh >git-filter-branch+ && \
-chmod +x git-filter-branch+ && \
-mv git-filter-branch+ git-filter-branch
-make[2]: Leaving directory '/build/git-2.20.1'
-make[2]: Entering directory '/build/git-2.20.1'
 rm -f git-difftool--helper git-difftool--helper+ && 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/@@NO_CURL@@//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|@@SANE_TEXT_GREP@@|-a|g' -e 's|@@PAGER_ENV@@|LESS=FRX LV=-c|g' git-difftool--helper.sh >git-difftool--helper+ && \
 chmod +x git-difftool--helper+ && \
 mv git-difftool--helper+ git-difftool--helper
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-rm -f git-mergetool git-mergetool+ && 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/@@NO_CURL@@//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|@@SANE_TEXT_GREP@@|-a|g' -e 's|@@PAGER_ENV@@|LESS=FRX LV=-c|g' git-mergetool.sh >git-mergetool+ && \
-chmod +x git-mergetool+ && \
-mv git-mergetool+ git-mergetool
+rm -f git-filter-branch git-filter-branch+ && 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/@@NO_CURL@@//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|@@SANE_TEXT_GREP@@|-a|g' -e 's|@@PAGER_ENV@@|LESS=FRX LV=-c|g' git-filter-branch.sh >git-filter-branch+ && \
+chmod +x git-filter-branch+ && \
+mv git-filter-branch+ git-filter-branch
+make[2]: Leaving directory '/build/git-2.20.1'
+make[2]: Entering directory '/build/git-2.20.1'
+rm -f git-merge-octopus git-merge-octopus+ && 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/@@NO_CURL@@//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|@@SANE_TEXT_GREP@@|-a|g' -e 's|@@PAGER_ENV@@|LESS=FRX LV=-c|g' git-merge-octopus.sh >git-merge-octopus+ && \
+chmod +x git-merge-octopus+ && \
+mv git-merge-octopus+ git-merge-octopus
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
 rm -f git-merge-one-file git-merge-one-file+ && 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/@@NO_CURL@@//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|@@SANE_TEXT_GREP@@|-a|g' -e 's|@@PAGER_ENV@@|LESS=FRX LV=-c|g' git-merge-one-file.sh >git-merge-one-file+ && \
@@ -2270,7 +2288,7 @@
 mv git-merge-one-file+ git-merge-one-file
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/verify-commit.c
+gcc -o builtin/verify-tag.o -c -MF builtin/.depend/verify-tag.o.d -MQ builtin/verify-tag.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/verify-tag.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
 rm -f git-merge-resolve git-merge-resolve+ && 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/@@NO_CURL@@//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|@@SANE_TEXT_GREP@@|-a|g' -e 's|@@PAGER_ENV@@|LESS=FRX LV=-c|g' git-merge-resolve.sh >git-merge-resolve+ && \
@@ -2278,21 +2296,29 @@
 mv git-merge-resolve+ git-merge-resolve
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
+rm -f git-mergetool git-mergetool+ && 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/@@NO_CURL@@//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|@@SANE_TEXT_GREP@@|-a|g' -e 's|@@PAGER_ENV@@|LESS=FRX LV=-c|g' git-mergetool.sh >git-mergetool+ && \
+chmod +x git-mergetool+ && \
+mv git-mergetool+ git-mergetool
+make[2]: Leaving directory '/build/git-2.20.1'
+make[2]: Entering directory '/build/git-2.20.1'
 rm -f git-quiltimport git-quiltimport+ && 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/@@NO_CURL@@//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|@@SANE_TEXT_GREP@@|-a|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/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-rm -f git-legacy-rebase git-legacy-rebase+ && 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/@@NO_CURL@@//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|@@SANE_TEXT_GREP@@|-a|g' -e 's|@@PAGER_ENV@@|LESS=FRX LV=-c|g' git-legacy-rebase.sh >git-legacy-rebase+ && \
-chmod +x git-legacy-rebase+ && \
-mv git-legacy-rebase+ git-legacy-rebase
-make[2]: Leaving directory '/build/git-2.20.1'
-make[2]: Entering directory '/build/git-2.20.1'
 rm -f git-request-pull git-request-pull+ && 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/@@NO_CURL@@//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|@@SANE_TEXT_GREP@@|-a|g' -e 's|@@PAGER_ENV@@|LESS=FRX LV=-c|g' git-request-pull.sh >git-request-pull+ && \
 chmod +x git-request-pull+ && \
 mv git-request-pull+ git-request-pull
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
+gcc -o version.o -c -MF ./.depend/version.o.d -MQ version.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"' '-DGIT_VERSION="2.20.1"' '-DGIT_USER_AGENT="git/2.20.1"' '-DGIT_BUILT_FROM_COMMIT=""' version.c
+make[2]: Leaving directory '/build/git-2.20.1'
+make[2]: Entering directory '/build/git-2.20.1'
+rm -f git-legacy-rebase git-legacy-rebase+ && 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/@@NO_CURL@@//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|@@SANE_TEXT_GREP@@|-a|g' -e 's|@@PAGER_ENV@@|LESS=FRX LV=-c|g' git-legacy-rebase.sh >git-legacy-rebase+ && \
+chmod +x git-legacy-rebase+ && \
+mv git-legacy-rebase+ git-legacy-rebase
+make[2]: Leaving directory '/build/git-2.20.1'
+make[2]: Entering directory '/build/git-2.20.1'
 rm -f git-stash git-stash+ && 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/@@NO_CURL@@//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|@@SANE_TEXT_GREP@@|-a|g' -e 's|@@PAGER_ENV@@|LESS=FRX LV=-c|g' git-stash.sh >git-stash+ && \
 chmod +x git-stash+ && \
 mv git-stash+ git-stash
@@ -2321,9 +2347,6 @@
 mv GIT-PERL-HEADER+ GIT-PERL-HEADER
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/unpack-objects.c
-make[2]: Leaving directory '/build/git-2.20.1'
-make[2]: Entering directory '/build/git-2.20.1'
 rm -f git-p4 git-p4+ && \
 sed -e '1s|#!.*python|#!/usr/bin/python|' \
     git-p4.py >git-p4+ && \
@@ -2331,43 +2354,28 @@
 mv git-p4+ git-p4
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/tag.c
-make[2]: Leaving directory '/build/git-2.20.1'
-make[2]: Entering directory '/build/git-2.20.1'
-rm -f git-add--interactive git-add--interactive+ && \
-sed -e '1{' \
-    -e '	s|#!.*perl|#!/usr/bin/perl|' \
-    -e '	r GIT-PERL-HEADER' \
-    -e '	G' \
-    -e '}' \
-    -e 's/@@GIT_VERSION@@/2.20.1/g' \
-    git-add--interactive.perl >git-add--interactive+ && \
-chmod +x git-add--interactive+ && \
-mv git-add--interactive+ git-add--interactive
-make[2]: Leaving directory '/build/git-2.20.1'
-make[2]: Entering directory '/build/git-2.20.1'
-rm -f git-svn git-svn+ && \
+rm -f git-archimport git-archimport+ && \
 sed -e '1{' \
     -e '	s|#!.*perl|#!/usr/bin/perl|' \
     -e '	r GIT-PERL-HEADER' \
     -e '	G' \
     -e '}' \
     -e 's/@@GIT_VERSION@@/2.20.1/g' \
-    git-svn.perl >git-svn+ && \
-chmod +x git-svn+ && \
-mv git-svn+ git-svn
+    git-archimport.perl >git-archimport+ && \
+chmod +x git-archimport+ && \
+mv git-archimport+ git-archimport
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-rm -f git-archimport git-archimport+ && \
+rm -f git-add--interactive git-add--interactive+ && \
 sed -e '1{' \
     -e '	s|#!.*perl|#!/usr/bin/perl|' \
     -e '	r GIT-PERL-HEADER' \
     -e '	G' \
     -e '}' \
     -e 's/@@GIT_VERSION@@/2.20.1/g' \
-    git-archimport.perl >git-archimport+ && \
-chmod +x git-archimport+ && \
-mv git-archimport+ git-archimport
+    git-add--interactive.perl >git-add--interactive+ && \
+chmod +x git-add--interactive+ && \
+mv git-add--interactive+ git-add--interactive
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
 rm -f git-cvsexportcommit git-cvsexportcommit+ && \
@@ -2382,6 +2390,9 @@
 mv git-cvsexportcommit+ git-cvsexportcommit
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
+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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/show-branch.c
+make[2]: Leaving directory '/build/git-2.20.1'
+make[2]: Entering directory '/build/git-2.20.1'
 rm -f git-cvsimport git-cvsimport+ && \
 sed -e '1{' \
     -e '	s|#!.*perl|#!/usr/bin/perl|' \
@@ -2394,6 +2405,12 @@
 mv git-cvsimport+ git-cvsimport
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
+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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/write-tree.c
+make[2]: Leaving directory '/build/git-2.20.1'
+make[2]: Entering directory '/build/git-2.20.1'
+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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/tag.c
+make[2]: Leaving directory '/build/git-2.20.1'
+make[2]: Entering directory '/build/git-2.20.1'
 rm -f git-send-email git-send-email+ && \
 sed -e '1{' \
     -e '	s|#!.*perl|#!/usr/bin/perl|' \
@@ -2418,10 +2435,22 @@
 mv git-cvsserver+ git-cvsserver
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-gcc -o attr.o -c -MF ./.depend/attr.o.d -MQ attr.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"' -DETC_GITATTRIBUTES='"/etc/gitattributes"' attr.c
+rm -f git-svn git-svn+ && \
+sed -e '1{' \
+    -e '	s|#!.*perl|#!/usr/bin/perl|' \
+    -e '	r GIT-PERL-HEADER' \
+    -e '	G' \
+    -e '}' \
+    -e 's/@@GIT_VERSION@@/2.20.1/g' \
+    git-svn.perl >git-svn+ && \
+chmod +x git-svn+ && \
+mv git-svn+ git-svn
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-gcc -o help.o -c -MF ./.depend/help.o.d -MQ help.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  help.c
+gcc -o builtin/unpack-objects.o -c -MF builtin/.depend/unpack-objects.o.d -MQ builtin/unpack-objects.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/unpack-objects.c
+make[2]: Leaving directory '/build/git-2.20.1'
+make[2]: Entering directory '/build/git-2.20.1'
+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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/remote.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
 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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/worktree.c
@@ -2430,85 +2459,85 @@
 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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/update-index.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-gcc -o builtin/pack-objects.o -c -MF builtin/.depend/pack-objects.o.d -MQ builtin/pack-objects.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/pack-objects.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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  help.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/submodule--helper.c
+gcc -o attr.o -c -MF ./.depend/attr.o.d -MQ attr.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"' -DETC_GITATTRIBUTES='"/etc/gitattributes"' attr.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-rm -f libgit.a && ar rcs libgit.a abspath.o advice.o alias.o alloc.o apply.o archive.o archive-tar.o archive-zip.o argv-array.o attr.o base85.o bisect.o blame.o blob.o branch.o bulk-checkin.o bundle.o cache-tree.o chdir-notify.o checkout.o color.o column.o combine-diff.o commit.o commit-graph.o commit-reach.o compat/obstack.o compat/terminal.o config.o connect.o connected.o convert.o copy.o credential.o csum-file.o ctype.o date.o decorate.o delta-islands.o diffcore-break.o diffcore-delta.o diffcore-order.o diffcore-pickaxe.o diffcore-rename.o diff-delta.o diff-lib.o diff-no-index.o diff.o dir.o dir-iterator.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-object.o fetch-pack.o fsck.o fsmonitor.o gettext.o gpg-interface.o graph.o grep.o hashmap.o linear-assignment.o help.o hex.o ident.o interdiff.o json-writer.o kwset.o levenshtein.o line-log.o line-range.o list-objects.o list-objects-filter.o list-objects-filter-options.o ll-merge.o lockfile.o log-tree.o ls-refs.o mailinfo.o mailmap.o match-trees.o mem-pool.o merge.o merge-blobs.o merge-recursive.o mergesort.o midx.o name-hash.o negotiator/default.o negotiator/skipping.o notes.o notes-cache.o notes-merge.o notes-utils.o object.o oidmap.o oidset.o packfile.o pack-bitmap.o pack-bitmap-write.o pack-check.o pack-objects.o pack-revindex.o pack-write.o pager.o parse-options.o parse-options-cb.o patch-delta.o patch-ids.o path.o pathspec.o pkt-line.o preload-index.o pretty.o prio-queue.o progress.o prompt.o protocol.o quote.o range-diff.o reachable.o read-cache.o rebase-interactive.o reflog-walk.o refs.o refs/files-backend.o refs/iterator.o refs/packed-backend.o refs/ref-cache.o refspec.o ref-filter.o remote.o replace-object.o repository.o rerere.o resolve-undo.o revision.o run-command.o send-pack.o sequencer.o serve.o server-info.o setup.o sha1-array.o sha1-lookup.o sha1-file.o sha1-name.o shallow.o sideband.o sigchain.o split-index.o strbuf.o streaming.o string-list.o submodule.o submodule-config.o sub-process.o symlinks.o tag.o tempfile.o thread-utils.o tmp-objdir.o trace.o trailer.o transport.o transport-helper.o tree-diff.o tree.o tree-walk.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 zlib.o unix-socket.o sha1dc_git.o sha1dc/sha1.o sha1dc/ubc_check.o compat/fopen.o compat/strlcpy.o compat/qsort_s.o
+gcc -o builtin/pack-objects.o -c -MF builtin/.depend/pack-objects.o.d -MQ builtin/pack-objects.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/pack-objects.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-gcc -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"' -o git-daemon -Wl,-z,relro  daemon.o common-main.o libgit.a xdiff/lib.a  -lpcre2-8 -lz -lpthread -lrt
+rm -f libgit.a && ar rcs libgit.a abspath.o advice.o alias.o alloc.o apply.o archive.o archive-tar.o archive-zip.o argv-array.o attr.o base85.o bisect.o blame.o blob.o branch.o bulk-checkin.o bundle.o cache-tree.o chdir-notify.o checkout.o color.o column.o combine-diff.o commit.o commit-graph.o commit-reach.o compat/obstack.o compat/terminal.o config.o connect.o connected.o convert.o copy.o credential.o csum-file.o ctype.o date.o decorate.o delta-islands.o diffcore-break.o diffcore-delta.o diffcore-order.o diffcore-pickaxe.o diffcore-rename.o diff-delta.o diff-lib.o diff-no-index.o diff.o dir.o dir-iterator.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-object.o fetch-pack.o fsck.o fsmonitor.o gettext.o gpg-interface.o graph.o grep.o hashmap.o linear-assignment.o help.o hex.o ident.o interdiff.o json-writer.o kwset.o levenshtein.o line-log.o line-range.o list-objects.o list-objects-filter.o list-objects-filter-options.o ll-merge.o lockfile.o log-tree.o ls-refs.o mailinfo.o mailmap.o match-trees.o mem-pool.o merge.o merge-blobs.o merge-recursive.o mergesort.o midx.o name-hash.o negotiator/default.o negotiator/skipping.o notes.o notes-cache.o notes-merge.o notes-utils.o object.o oidmap.o oidset.o packfile.o pack-bitmap.o pack-bitmap-write.o pack-check.o pack-objects.o pack-revindex.o pack-write.o pager.o parse-options.o parse-options-cb.o patch-delta.o patch-ids.o path.o pathspec.o pkt-line.o preload-index.o pretty.o prio-queue.o progress.o prompt.o protocol.o quote.o range-diff.o reachable.o read-cache.o rebase-interactive.o reflog-walk.o refs.o refs/files-backend.o refs/iterator.o refs/packed-backend.o refs/ref-cache.o refspec.o ref-filter.o remote.o replace-object.o repository.o rerere.o resolve-undo.o revision.o run-command.o send-pack.o sequencer.o serve.o server-info.o setup.o sha1-array.o sha1-lookup.o sha1-file.o sha1-name.o shallow.o sideband.o sigchain.o split-index.o strbuf.o streaming.o string-list.o submodule.o submodule-config.o sub-process.o symlinks.o tag.o tempfile.o thread-utils.o tmp-objdir.o trace.o trailer.o transport.o transport-helper.o tree-diff.o tree.o tree-walk.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 zlib.o unix-socket.o sha1dc_git.o sha1dc/sha1.o sha1dc/ubc_check.o compat/fopen.o compat/strlcpy.o compat/qsort_s.o
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-gcc -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"' -o git-fast-import -Wl,-z,relro  fast-import.o common-main.o libgit.a xdiff/lib.a  -lpcre2-8 -lz -lpthread -lrt
+gcc -o builtin/submodule--helper.o -c -MF builtin/.depend/submodule--helper.o.d -MQ builtin/submodule--helper.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  builtin/submodule--helper.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-gcc -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"' -o git-credential-store -Wl,-z,relro  credential-store.o common-main.o libgit.a xdiff/lib.a  -lpcre2-8 -lz -lpthread -lrt
+gcc -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"' -o git-http-backend -Wl,-z,relro  http-backend.o common-main.o libgit.a xdiff/lib.a  -lpcre2-8 -lz -lpthread -lrt
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-gcc -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"' -o git-remote-http -Wl,-z,relro  remote-curl.o http.o http-walker.o common-main.o \
-	 -lcurl -lexpat libgit.a xdiff/lib.a  -lpcre2-8 -lz -lpthread -lrt
+gcc -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"' -o git-credential-store -Wl,-z,relro  credential-store.o common-main.o libgit.a xdiff/lib.a  -lpcre2-8 -lz -lpthread -lrt
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-rm -f git-remote-ftp && \
-ln git-remote-http git-remote-ftp 2>/dev/null || \
-ln -s git-remote-http git-remote-ftp 2>/dev/null || \
-cp git-remote-http git-remote-ftp
+gcc -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"' -o git-fast-import -Wl,-z,relro  fast-import.o common-main.o libgit.a xdiff/lib.a  -lpcre2-8 -lz -lpthread -lrt
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-rm -f git-remote-https && \
-ln git-remote-http git-remote-https 2>/dev/null || \
-ln -s git-remote-http git-remote-https 2>/dev/null || \
-cp git-remote-http git-remote-https
+gcc -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"' -o git-daemon -Wl,-z,relro  daemon.o common-main.o libgit.a xdiff/lib.a  -lpcre2-8 -lz -lpthread -lrt
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-rm -f git-remote-ftps && \
-ln git-remote-http git-remote-ftps 2>/dev/null || \
-ln -s git-remote-http git-remote-ftps 2>/dev/null || \
-cp git-remote-http git-remote-ftps
+gcc -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"' -o git-shell -Wl,-z,relro  shell.o common-main.o libgit.a xdiff/lib.a  -lpcre2-8 -lz -lpthread -lrt
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-gcc -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"' -o git-credential-cache -Wl,-z,relro  credential-cache.o common-main.o libgit.a xdiff/lib.a  -lpcre2-8 -lz -lpthread -lrt
+gcc -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"' -o git-sh-i18n--envsubst -Wl,-z,relro  sh-i18n--envsubst.o common-main.o libgit.a xdiff/lib.a  -lpcre2-8 -lz -lpthread -lrt
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-gcc -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"' -o git-http-backend -Wl,-z,relro  http-backend.o common-main.o libgit.a xdiff/lib.a  -lpcre2-8 -lz -lpthread -lrt
+gcc -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"' -o git-imap-send -Wl,-z,relro  imap-send.o http.o common-main.o \
+	  -lcurl    libgit.a xdiff/lib.a  -lpcre2-8 -lz -lpthread -lrt
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-gcc -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"' -o git-shell -Wl,-z,relro  shell.o common-main.o libgit.a xdiff/lib.a  -lpcre2-8 -lz -lpthread -lrt
+gcc -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"' -o git-remote-testsvn -Wl,-z,relro  remote-testsvn.o common-main.o libgit.a xdiff/lib.a  -lpcre2-8 -lz -lpthread -lrt \
+vcs-svn/lib.a
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
 gcc -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"' -o git-http-fetch -Wl,-z,relro  http.o http-walker.o http-fetch.o common-main.o \
 	 -lcurl libgit.a xdiff/lib.a  -lpcre2-8 -lz -lpthread -lrt
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-gcc -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"' -o git-remote-testsvn -Wl,-z,relro  remote-testsvn.o common-main.o libgit.a xdiff/lib.a  -lpcre2-8 -lz -lpthread -lrt \
-vcs-svn/lib.a
+gcc -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"' -o git-credential-cache--daemon -Wl,-z,relro  credential-cache--daemon.o common-main.o libgit.a xdiff/lib.a  -lpcre2-8 -lz -lpthread -lrt
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-gcc -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"' -o git-credential-cache--daemon -Wl,-z,relro  credential-cache--daemon.o common-main.o libgit.a xdiff/lib.a  -lpcre2-8 -lz -lpthread -lrt
+gcc -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"' -o git-credential-cache -Wl,-z,relro  credential-cache.o common-main.o libgit.a xdiff/lib.a  -lpcre2-8 -lz -lpthread -lrt
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
 gcc -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"' -o git-http-push -Wl,-z,relro  http.o http-push.o common-main.o \
 	 -lcurl -lexpat libgit.a xdiff/lib.a  -lpcre2-8 -lz -lpthread -lrt
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-gcc -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"' -o git-sh-i18n--envsubst -Wl,-z,relro  sh-i18n--envsubst.o common-main.o libgit.a xdiff/lib.a  -lpcre2-8 -lz -lpthread -lrt
+gcc -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"' -o git-remote-http -Wl,-z,relro  remote-curl.o http.o http-walker.o common-main.o \
+	 -lcurl -lexpat libgit.a xdiff/lib.a  -lpcre2-8 -lz -lpthread -lrt
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-gcc -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"' -o git-imap-send -Wl,-z,relro  imap-send.o http.o common-main.o \
-	  -lcurl    libgit.a xdiff/lib.a  -lpcre2-8 -lz -lpthread -lrt
+rm -f git-remote-https && \
+ln git-remote-http git-remote-https 2>/dev/null || \
+ln -s git-remote-http git-remote-https 2>/dev/null || \
+cp git-remote-http git-remote-https
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-gcc -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"' -o git -Wl,-z,relro  \
-	git.o builtin/add.o builtin/am.o builtin/annotate.o builtin/apply.o builtin/archive.o builtin/bisect--helper.o builtin/blame.o builtin/branch.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-index.o builtin/checkout.o builtin/clean.o builtin/clone.o builtin/column.o builtin/commit-tree.o builtin/commit.o builtin/commit-graph.o builtin/config.o builtin/count-objects.o builtin/credential.o builtin/describe.o builtin/diff-files.o builtin/diff-index.o builtin/diff-tree.o builtin/diff.o builtin/difftool.o builtin/fast-export.o builtin/fetch-pack.o builtin/fetch.o builtin/fmt-merge-msg.o builtin/for-each-ref.o builtin/fsck.o builtin/gc.o builtin/get-tar-commit-id.o builtin/grep.o builtin/hash-object.o builtin/help.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.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/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/rebase--interactive.o builtin/receive-pack.o builtin/reflog.o builtin/remote.o builtin/remote-ext.o builtin/remote-fd.o builtin/repack.o builtin/replace.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/serve.o builtin/shortlog.o builtin/show-branch.o builtin/show-index.o builtin/show-ref.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  -lpcre2-8 -lz -lpthread -lrt
+rm -f git-remote-ftp && \
+ln git-remote-http git-remote-ftp 2>/dev/null || \
+ln -s git-remote-http git-remote-ftp 2>/dev/null || \
+cp git-remote-http git-remote-ftp
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-rm -f git-am && \
-ln git git-am 2>/dev/null || \
-ln -s git git-am 2>/dev/null || \
-cp git git-am
+rm -f git-remote-ftps && \
+ln git-remote-http git-remote-ftps 2>/dev/null || \
+ln -s git-remote-http git-remote-ftps 2>/dev/null || \
+cp git-remote-http git-remote-ftps
+make[2]: Leaving directory '/build/git-2.20.1'
+make[2]: Entering directory '/build/git-2.20.1'
+gcc -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"' -o git -Wl,-z,relro  \
+	git.o builtin/add.o builtin/am.o builtin/annotate.o builtin/apply.o builtin/archive.o builtin/bisect--helper.o builtin/blame.o builtin/branch.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-index.o builtin/checkout.o builtin/clean.o builtin/clone.o builtin/column.o builtin/commit-tree.o builtin/commit.o builtin/commit-graph.o builtin/config.o builtin/count-objects.o builtin/credential.o builtin/describe.o builtin/diff-files.o builtin/diff-index.o builtin/diff-tree.o builtin/diff.o builtin/difftool.o builtin/fast-export.o builtin/fetch-pack.o builtin/fetch.o builtin/fmt-merge-msg.o builtin/for-each-ref.o builtin/fsck.o builtin/gc.o builtin/get-tar-commit-id.o builtin/grep.o builtin/hash-object.o builtin/help.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.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/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/rebase--interactive.o builtin/receive-pack.o builtin/reflog.o builtin/remote.o builtin/remote-ext.o builtin/remote-fd.o builtin/repack.o builtin/replace.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/serve.o builtin/shortlog.o builtin/show-branch.o builtin/show-index.o builtin/show-ref.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  -lpcre2-8 -lz -lpthread -lrt
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
 rm -f git-add && \
@@ -2517,6 +2546,12 @@
 cp git git-add
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
+rm -f git-am && \
+ln git git-am 2>/dev/null || \
+ln -s git git-am 2>/dev/null || \
+cp git git-am
+make[2]: Leaving directory '/build/git-2.20.1'
+make[2]: Entering directory '/build/git-2.20.1'
 rm -f git-annotate && \
 ln git git-annotate 2>/dev/null || \
 ln -s git git-annotate 2>/dev/null || \
@@ -2559,12 +2594,6 @@
 cp git git-bundle
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-rm -f git-check-mailmap && \
-ln git git-check-mailmap 2>/dev/null || \
-ln -s git git-check-mailmap 2>/dev/null || \
-cp git git-check-mailmap
-make[2]: Leaving directory '/build/git-2.20.1'
-make[2]: Entering directory '/build/git-2.20.1'
 rm -f git-cat-file && \
 ln git git-cat-file 2>/dev/null || \
 ln -s git git-cat-file 2>/dev/null || \
@@ -2583,16 +2612,22 @@
 cp git git-check-ignore
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
+rm -f git-check-mailmap && \
+ln git git-check-mailmap 2>/dev/null || \
+ln -s git git-check-mailmap 2>/dev/null || \
+cp git git-check-mailmap
+make[2]: Leaving directory '/build/git-2.20.1'
+make[2]: Entering directory '/build/git-2.20.1'
 rm -f git-check-ref-format && \
 ln git git-check-ref-format 2>/dev/null || \
 ln -s git git-check-ref-format 2>/dev/null || \
 cp git git-check-ref-format
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-rm -f git-clone && \
-ln git git-clone 2>/dev/null || \
-ln -s git git-clone 2>/dev/null || \
-cp git git-clone
+rm -f git-checkout-index && \
+ln git git-checkout-index 2>/dev/null || \
+ln -s git git-checkout-index 2>/dev/null || \
+cp git git-checkout-index
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
 rm -f git-checkout && \
@@ -2601,10 +2636,10 @@
 cp git git-checkout
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-rm -f git-checkout-index && \
-ln git git-checkout-index 2>/dev/null || \
-ln -s git git-checkout-index 2>/dev/null || \
-cp git git-checkout-index
+rm -f git-column && \
+ln git git-column 2>/dev/null || \
+ln -s git git-column 2>/dev/null || \
+cp git git-column
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
 rm -f git-clean && \
@@ -2613,40 +2648,34 @@
 cp git git-clean
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-rm -f git-column && \
-ln git git-column 2>/dev/null || \
-ln -s git git-column 2>/dev/null || \
-cp git git-column
-make[2]: Leaving directory '/build/git-2.20.1'
-make[2]: Entering directory '/build/git-2.20.1'
 rm -f git-commit-tree && \
 ln git git-commit-tree 2>/dev/null || \
 ln -s git git-commit-tree 2>/dev/null || \
 cp git git-commit-tree
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
+rm -f git-clone && \
+ln git git-clone 2>/dev/null || \
+ln -s git git-clone 2>/dev/null || \
+cp git git-clone
+make[2]: Leaving directory '/build/git-2.20.1'
+make[2]: Entering directory '/build/git-2.20.1'
 rm -f git-commit && \
 ln git git-commit 2>/dev/null || \
 ln -s git git-commit 2>/dev/null || \
 cp git git-commit
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-rm -f git-config && \
-ln git git-config 2>/dev/null || \
-ln -s git git-config 2>/dev/null || \
-cp git git-config
-make[2]: Leaving directory '/build/git-2.20.1'
-make[2]: Entering directory '/build/git-2.20.1'
 rm -f git-commit-graph && \
 ln git git-commit-graph 2>/dev/null || \
 ln -s git git-commit-graph 2>/dev/null || \
 cp git git-commit-graph
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-rm -f git-count-objects && \
-ln git git-count-objects 2>/dev/null || \
-ln -s git git-count-objects 2>/dev/null || \
-cp git git-count-objects
+rm -f git-config && \
+ln git git-config 2>/dev/null || \
+ln -s git git-config 2>/dev/null || \
+cp git git-config
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
 rm -f git-credential && \
@@ -2661,6 +2690,18 @@
 cp git git-describe
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
+rm -f git-count-objects && \
+ln git git-count-objects 2>/dev/null || \
+ln -s git git-count-objects 2>/dev/null || \
+cp git git-count-objects
+make[2]: Leaving directory '/build/git-2.20.1'
+make[2]: Entering directory '/build/git-2.20.1'
+rm -f git-diff && \
+ln git git-diff 2>/dev/null || \
+ln -s git git-diff 2>/dev/null || \
+cp git git-diff
+make[2]: Leaving directory '/build/git-2.20.1'
+make[2]: Entering directory '/build/git-2.20.1'
 rm -f git-diff-files && \
 ln git git-diff-files 2>/dev/null || \
 ln -s git git-diff-files 2>/dev/null || \
@@ -2673,24 +2714,18 @@
 cp git git-diff-index
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-rm -f git-diff-tree && \
-ln git git-diff-tree 2>/dev/null || \
-ln -s git git-diff-tree 2>/dev/null || \
-cp git git-diff-tree
-make[2]: Leaving directory '/build/git-2.20.1'
-make[2]: Entering directory '/build/git-2.20.1'
-rm -f git-diff && \
-ln git git-diff 2>/dev/null || \
-ln -s git git-diff 2>/dev/null || \
-cp git git-diff
-make[2]: Leaving directory '/build/git-2.20.1'
-make[2]: Entering directory '/build/git-2.20.1'
 rm -f git-difftool && \
 ln git git-difftool 2>/dev/null || \
 ln -s git git-difftool 2>/dev/null || \
 cp git git-difftool
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
+rm -f git-diff-tree && \
+ln git git-diff-tree 2>/dev/null || \
+ln -s git git-diff-tree 2>/dev/null || \
+cp git git-diff-tree
+make[2]: Leaving directory '/build/git-2.20.1'
+make[2]: Entering directory '/build/git-2.20.1'
 rm -f git-fast-export && \
 ln git git-fast-export 2>/dev/null || \
 ln -s git git-fast-export 2>/dev/null || \
@@ -2721,12 +2756,6 @@
 cp git git-for-each-ref
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-rm -f git-get-tar-commit-id && \
-ln git git-get-tar-commit-id 2>/dev/null || \
-ln -s git git-get-tar-commit-id 2>/dev/null || \
-cp git git-get-tar-commit-id
-make[2]: Leaving directory '/build/git-2.20.1'
-make[2]: Entering directory '/build/git-2.20.1'
 rm -f git-fsck && \
 ln git git-fsck 2>/dev/null || \
 ln -s git git-fsck 2>/dev/null || \
@@ -2739,6 +2768,12 @@
 cp git git-gc
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
+rm -f git-get-tar-commit-id && \
+ln git git-get-tar-commit-id 2>/dev/null || \
+ln -s git git-get-tar-commit-id 2>/dev/null || \
+cp git git-get-tar-commit-id
+make[2]: Leaving directory '/build/git-2.20.1'
+make[2]: Entering directory '/build/git-2.20.1'
 rm -f git-grep && \
 ln git git-grep 2>/dev/null || \
 ln -s git git-grep 2>/dev/null || \
@@ -2751,22 +2786,16 @@
 cp git git-hash-object
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-rm -f git-help && \
-ln git git-help 2>/dev/null || \
-ln -s git git-help 2>/dev/null || \
-cp git git-help
-make[2]: Leaving directory '/build/git-2.20.1'
-make[2]: Entering directory '/build/git-2.20.1'
 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/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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
+rm -f git-help && \
+ln git git-help 2>/dev/null || \
+ln -s git git-help 2>/dev/null || \
+cp git git-help
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
 rm -f git-init-db && \
@@ -2775,6 +2804,12 @@
 cp git git-init-db
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
+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/git-2.20.1'
+make[2]: Entering directory '/build/git-2.20.1'
 rm -f git-log && \
 ln git git-log 2>/dev/null || \
 ln -s git git-log 2>/dev/null || \
@@ -2805,12 +2840,6 @@
 cp git git-mailinfo
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-rm -f git-mailsplit && \
-ln git git-mailsplit 2>/dev/null || \
-ln -s git git-mailsplit 2>/dev/null || \
-cp git git-mailsplit
-make[2]: Leaving directory '/build/git-2.20.1'
-make[2]: Entering directory '/build/git-2.20.1'
 rm -f git-merge && \
 ln git git-merge 2>/dev/null || \
 ln -s git git-merge 2>/dev/null || \
@@ -2823,6 +2852,12 @@
 cp git git-merge-base
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
+rm -f git-mailsplit && \
+ln git git-mailsplit 2>/dev/null || \
+ln -s git git-mailsplit 2>/dev/null || \
+cp git git-mailsplit
+make[2]: Leaving directory '/build/git-2.20.1'
+make[2]: Entering directory '/build/git-2.20.1'
 rm -f git-merge-file && \
 ln git git-merge-file 2>/dev/null || \
 ln -s git git-merge-file 2>/dev/null || \
@@ -2883,16 +2918,22 @@
 cp git git-name-rev
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
+rm -f git-notes && \
+ln git git-notes 2>/dev/null || \
+ln -s git git-notes 2>/dev/null || \
+cp git git-notes
+make[2]: Leaving directory '/build/git-2.20.1'
+make[2]: Entering directory '/build/git-2.20.1'
 rm -f git-pack-objects && \
 ln git git-pack-objects 2>/dev/null || \
 ln -s git git-pack-objects 2>/dev/null || \
 cp git git-pack-objects
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-rm -f git-notes && \
-ln git git-notes 2>/dev/null || \
-ln -s git git-notes 2>/dev/null || \
-cp git git-notes
+rm -f git-pack-redundant && \
+ln git git-pack-redundant 2>/dev/null || \
+ln -s git git-pack-redundant 2>/dev/null || \
+cp git git-pack-redundant
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
 rm -f git-pack-refs && \
@@ -2907,34 +2948,28 @@
 cp git git-patch-id
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-rm -f git-pack-redundant && \
-ln git git-pack-redundant 2>/dev/null || \
-ln -s git git-pack-redundant 2>/dev/null || \
-cp git git-pack-redundant
-make[2]: Leaving directory '/build/git-2.20.1'
-make[2]: Entering directory '/build/git-2.20.1'
 rm -f git-prune-packed && \
 ln git git-prune-packed 2>/dev/null || \
 ln -s git git-prune-packed 2>/dev/null || \
 cp git git-prune-packed
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-rm -f git-prune && \
-ln git git-prune 2>/dev/null || \
-ln -s git git-prune 2>/dev/null || \
-cp git git-prune
-make[2]: Leaving directory '/build/git-2.20.1'
-make[2]: Entering directory '/build/git-2.20.1'
 rm -f git-pull && \
 ln git git-pull 2>/dev/null || \
 ln -s git git-pull 2>/dev/null || \
 cp git git-pull
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-rm -f git-push && \
-ln git git-push 2>/dev/null || \
-ln -s git git-push 2>/dev/null || \
-cp git git-push
+rm -f git-prune && \
+ln git git-prune 2>/dev/null || \
+ln -s git git-prune 2>/dev/null || \
+cp git git-prune
+make[2]: Leaving directory '/build/git-2.20.1'
+make[2]: Entering directory '/build/git-2.20.1'
+rm -f git-range-diff && \
+ln git git-range-diff 2>/dev/null || \
+ln -s git git-range-diff 2>/dev/null || \
+cp git git-range-diff
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
 rm -f git-read-tree && \
@@ -2943,16 +2978,16 @@
 cp git git-read-tree
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-rm -f git-range-diff && \
-ln git git-range-diff 2>/dev/null || \
-ln -s git git-range-diff 2>/dev/null || \
-cp git git-range-diff
+rm -f git-push && \
+ln git git-push 2>/dev/null || \
+ln -s git git-push 2>/dev/null || \
+cp git git-push
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-rm -f git-rebase--interactive && \
-ln git git-rebase--interactive 2>/dev/null || \
-ln -s git git-rebase--interactive 2>/dev/null || \
-cp git git-rebase--interactive
+rm -f git-rebase && \
+ln git git-rebase 2>/dev/null || \
+ln -s git git-rebase 2>/dev/null || \
+cp git git-rebase
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
 rm -f git-receive-pack && \
@@ -2961,6 +2996,12 @@
 cp git git-receive-pack
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
+rm -f git-rebase--interactive && \
+ln git git-rebase--interactive 2>/dev/null || \
+ln -s git git-rebase--interactive 2>/dev/null || \
+cp git git-rebase--interactive
+make[2]: Leaving directory '/build/git-2.20.1'
+make[2]: Entering directory '/build/git-2.20.1'
 rm -f git-reflog && \
 ln git git-reflog 2>/dev/null || \
 ln -s git git-reflog 2>/dev/null || \
@@ -2979,12 +3020,6 @@
 cp git git-remote-ext
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-rm -f git-rebase && \
-ln git git-rebase 2>/dev/null || \
-ln -s git git-rebase 2>/dev/null || \
-cp git git-rebase
-make[2]: Leaving directory '/build/git-2.20.1'
-make[2]: Entering directory '/build/git-2.20.1'
 rm -f git-remote-fd && \
 ln git git-remote-fd 2>/dev/null || \
 ln -s git git-remote-fd 2>/dev/null || \
@@ -3009,24 +3044,18 @@
 cp git git-rerere
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-rm -f git-rev-list && \
-ln git git-rev-list 2>/dev/null || \
-ln -s git git-rev-list 2>/dev/null || \
-cp git git-rev-list
-make[2]: Leaving directory '/build/git-2.20.1'
-make[2]: Entering directory '/build/git-2.20.1'
-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/git-2.20.1'
-make[2]: Entering directory '/build/git-2.20.1'
 rm -f git-reset && \
 ln git git-reset 2>/dev/null || \
 ln -s git git-reset 2>/dev/null || \
 cp git git-reset
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
+rm -f git-rev-list && \
+ln git git-rev-list 2>/dev/null || \
+ln -s git git-rev-list 2>/dev/null || \
+cp git git-rev-list
+make[2]: Leaving directory '/build/git-2.20.1'
+make[2]: Entering directory '/build/git-2.20.1'
 rm -f git-revert && \
 ln git git-revert 2>/dev/null || \
 ln -s git git-revert 2>/dev/null || \
@@ -3039,6 +3068,12 @@
 cp git git-rev-parse
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
+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/git-2.20.1'
+make[2]: Entering directory '/build/git-2.20.1'
 rm -f git-send-pack && \
 ln git git-send-pack 2>/dev/null || \
 ln -s git git-send-pack 2>/dev/null || \
@@ -3069,18 +3104,18 @@
 cp git git-show-index
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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/git-2.20.1'
-make[2]: Entering directory '/build/git-2.20.1'
 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/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
+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/git-2.20.1'
+make[2]: Entering directory '/build/git-2.20.1'
 rm -f git-submodule--helper && \
 ln git git-submodule--helper 2>/dev/null || \
 ln -s git git-submodule--helper 2>/dev/null || \
@@ -3105,6 +3140,12 @@
 cp git git-unpack-file
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
+rm -f git-unpack-objects && \
+ln git git-unpack-objects 2>/dev/null || \
+ln -s git git-unpack-objects 2>/dev/null || \
+cp git git-unpack-objects
+make[2]: Leaving directory '/build/git-2.20.1'
+make[2]: Entering directory '/build/git-2.20.1'
 rm -f git-update-index && \
 ln git git-update-index 2>/dev/null || \
 ln -s git git-update-index 2>/dev/null || \
@@ -3117,36 +3158,24 @@
 cp git git-update-ref
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-rm -f git-update-server-info && \
-ln git git-update-server-info 2>/dev/null || \
-ln -s git git-update-server-info 2>/dev/null || \
-cp git git-update-server-info
-make[2]: Leaving directory '/build/git-2.20.1'
-make[2]: Entering directory '/build/git-2.20.1'
-rm -f git-unpack-objects && \
-ln git git-unpack-objects 2>/dev/null || \
-ln -s git git-unpack-objects 2>/dev/null || \
-cp git git-unpack-objects
-make[2]: Leaving directory '/build/git-2.20.1'
-make[2]: Entering directory '/build/git-2.20.1'
 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/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
+rm -f git-update-server-info && \
+ln git git-update-server-info 2>/dev/null || \
+ln -s git git-update-server-info 2>/dev/null || \
+cp git git-update-server-info
+make[2]: Leaving directory '/build/git-2.20.1'
+make[2]: Entering directory '/build/git-2.20.1'
 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/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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/git-2.20.1'
-make[2]: Entering directory '/build/git-2.20.1'
 rm -f git-var && \
 ln git git-var 2>/dev/null || \
 ln -s git git-var 2>/dev/null || \
@@ -3159,22 +3188,22 @@
 cp git git-verify-commit
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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/git-2.20.1'
-make[2]: Entering directory '/build/git-2.20.1'
 rm -f git-verify-pack && \
 ln git git-verify-pack 2>/dev/null || \
 ln -s git git-verify-pack 2>/dev/null || \
 cp git git-verify-pack
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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
+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/git-2.20.1'
+make[2]: Entering directory '/build/git-2.20.1'
+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/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
 rm -f git-cherry && \
@@ -3195,22 +3224,10 @@
 cp git git-format-patch
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-rm -f git-init && \
-ln git git-init 2>/dev/null || \
-ln -s git git-init 2>/dev/null || \
-cp git git-init
-make[2]: Leaving directory '/build/git-2.20.1'
-make[2]: Entering directory '/build/git-2.20.1'
-rm -f git-show && \
-ln git git-show 2>/dev/null || \
-ln -s git git-show 2>/dev/null || \
-cp git git-show
-make[2]: Leaving directory '/build/git-2.20.1'
-make[2]: Entering directory '/build/git-2.20.1'
-rm -f git-status && \
-ln git git-status 2>/dev/null || \
-ln -s git git-status 2>/dev/null || \
-cp git git-status
+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/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
 rm -f git-fsck-objects && \
@@ -3219,10 +3236,10 @@
 cp git git-fsck-objects
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-rm -f git-whatchanged && \
-ln git git-whatchanged 2>/dev/null || \
-ln -s git git-whatchanged 2>/dev/null || \
-cp git git-whatchanged
+rm -f git-init && \
+ln git git-init 2>/dev/null || \
+ln -s git git-init 2>/dev/null || \
+cp git git-init
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
 rm -f git-merge-subtree && \
@@ -3236,6 +3253,24 @@
 ln -s git git-stage 2>/dev/null || \
 cp git git-stage
 make[2]: Leaving directory '/build/git-2.20.1'
+make[2]: Entering directory '/build/git-2.20.1'
+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/git-2.20.1'
+make[2]: Entering directory '/build/git-2.20.1'
+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/git-2.20.1'
+make[2]: Entering directory '/build/git-2.20.1'
+rm -f git-show && \
+ln git git-show 2>/dev/null || \
+ln -s git git-show 2>/dev/null || \
+cp git git-show
+make[2]: Leaving directory '/build/git-2.20.1'
 /usr/bin/make -C git-gui  gitexecdir='/usr/lib/git-core' all
 make[3]: Entering directory '/build/git-2.20.1/git-gui'
 GITGUI_VERSION = 0.21.GITGUI
@@ -3244,20 +3279,20 @@
     * new locations or Tcl/Tk interpreter
 make[3]: Leaving directory '/build/git-2.20.1/git-gui'
 make[3]: Entering directory '/build/git-2.20.1/git-gui'
-msgfmt --statistics --tcl -l pt_pt -d po/ po/pt_pt.po 
-550 translated messages.
+msgfmt --statistics --tcl -l ja -d po/ po/ja.po 
+546 translated messages, 1 untranslated message.
 make[3]: Leaving directory '/build/git-2.20.1/git-gui'
 make[3]: Entering directory '/build/git-2.20.1/git-gui'
-msgfmt --statistics --tcl -l ru -d po/ po/ru.po 
-520 translated messages.
+msgfmt --statistics --tcl -l pt_pt -d po/ po/pt_pt.po 
+550 translated messages.
 make[3]: Leaving directory '/build/git-2.20.1/git-gui'
 make[3]: Entering directory '/build/git-2.20.1/git-gui'
 msgfmt --statistics --tcl -l hu -d po/ po/hu.po 
 514 translated messages.
 make[3]: Leaving directory '/build/git-2.20.1/git-gui'
 make[3]: Entering directory '/build/git-2.20.1/git-gui'
-msgfmt --statistics --tcl -l ja -d po/ po/ja.po 
-546 translated messages, 1 untranslated message.
+msgfmt --statistics --tcl -l ru -d po/ po/ru.po 
+520 translated messages.
 make[3]: Leaving directory '/build/git-2.20.1/git-gui'
 make[3]: Entering directory '/build/git-2.20.1/git-gui'
 msgfmt --statistics --tcl -l nb -d po/ po/nb.po 
@@ -3284,14 +3319,14 @@
 520 translated messages.
 make[3]: Leaving directory '/build/git-2.20.1/git-gui'
 make[3]: Entering directory '/build/git-2.20.1/git-gui'
-msgfmt --statistics --tcl -l vi -d po/ po/vi.po 
-543 translated messages.
-make[3]: Leaving directory '/build/git-2.20.1/git-gui'
-make[3]: Entering directory '/build/git-2.20.1/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/git-2.20.1/git-gui'
 make[3]: Entering directory '/build/git-2.20.1/git-gui'
+msgfmt --statistics --tcl -l vi -d po/ po/vi.po 
+543 translated messages.
+make[3]: Leaving directory '/build/git-2.20.1/git-gui'
+make[3]: Entering directory '/build/git-2.20.1/git-gui'
 msgfmt --statistics --tcl -l bg -d po/ po/bg.po 
 565 translated messages.
 make[3]: Leaving directory '/build/git-2.20.1/git-gui'
@@ -3328,83 +3363,97 @@
 make[3]: Leaving directory '/build/git-2.20.1/git-gui'
 /usr/bin/make -C gitk-git  all
 make[3]: Entering directory '/build/git-2.20.1/gitk-git'
+Generating catalog po/pt_pt.msg
+make[3]: Leaving directory '/build/git-2.20.1/gitk-git'
+make[3]: Entering directory '/build/git-2.20.1/gitk-git'
+Generating catalog po/ru.msg
+make[3]: Leaving directory '/build/git-2.20.1/gitk-git'
+make[3]: Entering directory '/build/git-2.20.1/gitk-git'
     * new Tcl/Tk interpreter location
 make[3]: Leaving directory '/build/git-2.20.1/gitk-git'
 make[3]: Entering directory '/build/git-2.20.1/gitk-git'
-Generating catalog po/pt_pt.msg
+Generating catalog po/ja.msg
+make[3]: Leaving directory '/build/git-2.20.1/gitk-git'
+make[3]: Entering directory '/build/git-2.20.1/gitk-git'
+msgfmt --statistics --tcl po/pt_pt.po -l pt_pt -d po/
+311 translated messages.
 make[3]: Leaving directory '/build/git-2.20.1/gitk-git'
 make[3]: Entering directory '/build/git-2.20.1/gitk-git'
 Generating catalog po/ca.msg
 make[3]: Leaving directory '/build/git-2.20.1/gitk-git'
 make[3]: Entering directory '/build/git-2.20.1/gitk-git'
+msgfmt --statistics --tcl po/ru.po -l ru -d po/
+317 translated messages.
+make[3]: Leaving directory '/build/git-2.20.1/gitk-git'
+make[3]: Entering directory '/build/git-2.20.1/gitk-git'
 Generating catalog po/hu.msg
 make[3]: Leaving directory '/build/git-2.20.1/gitk-git'
 make[3]: Entering directory '/build/git-2.20.1/gitk-git'
 Generating catalog po/es.msg
 make[3]: Leaving directory '/build/git-2.20.1/gitk-git'
 make[3]: Entering directory '/build/git-2.20.1/gitk-git'
-Generating catalog po/sv.msg
+msgfmt --statistics --tcl po/ja.po -l ja -d po/
+311 translated messages.
 make[3]: Leaving directory '/build/git-2.20.1/gitk-git'
 make[3]: Entering directory '/build/git-2.20.1/gitk-git'
-Generating catalog po/fr.msg
+msgfmt --statistics --tcl po/ca.po -l ca -d po/
+307 translated messages.
 make[3]: Leaving directory '/build/git-2.20.1/gitk-git'
 make[3]: Entering directory '/build/git-2.20.1/gitk-git'
-Generating catalog po/de.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/git-2.20.1/gitk-git'
 make[3]: Entering directory '/build/git-2.20.1/gitk-git'
-Generating catalog po/it.msg
+Generating catalog po/sv.msg
 make[3]: Leaving directory '/build/git-2.20.1/gitk-git'
 make[3]: Entering directory '/build/git-2.20.1/gitk-git'
-Generating catalog po/pt_br.msg
+msgfmt --statistics --tcl po/es.po -l es -d po/
+184 translated messages, 46 fuzzy translations, 77 untranslated messages.
 make[3]: Leaving directory '/build/git-2.20.1/gitk-git'
 make[3]: Entering directory '/build/git-2.20.1/gitk-git'
-Generating catalog po/vi.msg
+Generating catalog po/fr.msg
 make[3]: Leaving directory '/build/git-2.20.1/gitk-git'
 make[3]: Entering directory '/build/git-2.20.1/gitk-git'
-Generating catalog po/bg.msg
+msgfmt --statistics --tcl po/sv.po -l sv -d po/
+311 translated messages.
 make[3]: Leaving directory '/build/git-2.20.1/gitk-git'
 make[3]: Entering directory '/build/git-2.20.1/gitk-git'
-msgfmt --statistics --tcl po/ca.po -l ca -d po/
-307 translated messages.
+msgfmt --statistics --tcl po/fr.po -l fr -d po/
+311 translated messages.
 make[3]: Leaving directory '/build/git-2.20.1/gitk-git'
 make[3]: Entering directory '/build/git-2.20.1/gitk-git'
-msgfmt --statistics --tcl po/hu.po -l hu -d po/
-277 translated messages, 18 fuzzy translations, 12 untranslated messages.
+Generating catalog po/de.msg
 make[3]: Leaving directory '/build/git-2.20.1/gitk-git'
 make[3]: Entering directory '/build/git-2.20.1/gitk-git'
-msgfmt --statistics --tcl po/de.po -l de -d po/
-307 translated messages.
+Generating catalog po/it.msg
 make[3]: Leaving directory '/build/git-2.20.1/gitk-git'
 make[3]: Entering directory '/build/git-2.20.1/gitk-git'
-msgfmt --statistics --tcl po/sv.po -l sv -d po/
-311 translated messages.
+Generating catalog po/pt_br.msg
 make[3]: Leaving directory '/build/git-2.20.1/gitk-git'
 make[3]: Entering directory '/build/git-2.20.1/gitk-git'
-msgfmt --statistics --tcl po/es.po -l es -d po/
-184 translated messages, 46 fuzzy translations, 77 untranslated messages.
+msgfmt --statistics --tcl po/de.po -l de -d po/
+307 translated messages.
 make[3]: Leaving directory '/build/git-2.20.1/gitk-git'
 make[3]: Entering directory '/build/git-2.20.1/gitk-git'
-msgfmt --statistics --tcl po/pt_pt.po -l pt_pt -d po/
-311 translated messages.
+Generating catalog po/vi.msg
 make[3]: Leaving directory '/build/git-2.20.1/gitk-git'
 make[3]: Entering directory '/build/git-2.20.1/gitk-git'
 msgfmt --statistics --tcl po/it.po -l it -d po/
 274 translated messages, 17 fuzzy translations, 16 untranslated messages.
 make[3]: Leaving directory '/build/git-2.20.1/gitk-git'
 make[3]: Entering directory '/build/git-2.20.1/gitk-git'
-msgfmt --statistics --tcl po/pt_br.po -l pt_br -d po/
-279 translated messages, 16 fuzzy translations, 12 untranslated messages.
+Generating catalog po/bg.msg
 make[3]: Leaving directory '/build/git-2.20.1/gitk-git'
 make[3]: Entering directory '/build/git-2.20.1/gitk-git'
-msgfmt --statistics --tcl po/bg.po -l bg -d po/
-311 translated messages.
+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/git-2.20.1/gitk-git'
 make[3]: Entering directory '/build/git-2.20.1/gitk-git'
 msgfmt --statistics --tcl po/vi.po -l vi -d po/
 307 translated messages.
 make[3]: Leaving directory '/build/git-2.20.1/gitk-git'
 make[3]: Entering directory '/build/git-2.20.1/gitk-git'
-msgfmt --statistics --tcl po/fr.po -l fr -d po/
+msgfmt --statistics --tcl po/bg.po -l bg -d po/
 311 translated messages.
 make[3]: Leaving directory '/build/git-2.20.1/gitk-git'
 make[3]: Entering directory '/build/git-2.20.1/gitk-git'
@@ -3413,20 +3462,6 @@
 chmod +x gitk-wish+ && \
 mv -f gitk-wish+ gitk-wish
 make[3]: Leaving directory '/build/git-2.20.1/gitk-git'
-make[3]: Entering directory '/build/git-2.20.1/gitk-git'
-Generating catalog po/ja.msg
-make[3]: Leaving directory '/build/git-2.20.1/gitk-git'
-make[3]: Entering directory '/build/git-2.20.1/gitk-git'
-msgfmt --statistics --tcl po/ja.po -l ja -d po/
-311 translated messages.
-make[3]: Leaving directory '/build/git-2.20.1/gitk-git'
-make[3]: Entering directory '/build/git-2.20.1/gitk-git'
-Generating catalog po/ru.msg
-make[3]: Leaving directory '/build/git-2.20.1/gitk-git'
-make[3]: Entering directory '/build/git-2.20.1/gitk-git'
-msgfmt --statistics --tcl po/ru.po -l ru -d po/
-317 translated messages.
-make[3]: Leaving directory '/build/git-2.20.1/gitk-git'
 /usr/bin/make -C templates  SHELL_PATH='/bin/sh' PERL_PATH='/usr/bin/perl'
 make[3]: Entering directory '/build/git-2.20.1/templates'
 : no custom templates yet
@@ -3456,14 +3491,14 @@
 14 translated messages.
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-mkdir -p po/build/locale/it/LC_MESSAGES/ && msgfmt --check --statistics -o po/build/locale/it/LC_MESSAGES/git.mo po/it.po
-716 translated messages, 350 untranslated messages.
-make[2]: Leaving directory '/build/git-2.20.1'
-make[2]: Entering directory '/build/git-2.20.1'
 mkdir -p po/build/locale/ko/LC_MESSAGES/ && msgfmt --check --statistics -o po/build/locale/ko/LC_MESSAGES/git.mo po/ko.po
 3608 translated messages.
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
+mkdir -p po/build/locale/it/LC_MESSAGES/ && msgfmt --check --statistics -o po/build/locale/it/LC_MESSAGES/git.mo po/it.po
+716 translated messages, 350 untranslated messages.
+make[2]: Leaving directory '/build/git-2.20.1'
+make[2]: Entering directory '/build/git-2.20.1'
 mkdir -p po/build/locale/pt_PT/LC_MESSAGES/ && msgfmt --check --statistics -o po/build/locale/pt_PT/LC_MESSAGES/git.mo po/pt_PT.po
 3198 translated messages.
 make[2]: Leaving directory '/build/git-2.20.1'
@@ -3472,11 +3507,7 @@
 3366 translated messages, 594 untranslated messages.
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-mkdir -p po/build/locale/ca/LC_MESSAGES/ && msgfmt --check --statistics -o po/build/locale/ca/LC_MESSAGES/git.mo po/ca.po
-3398 translated messages, 455 fuzzy translations, 332 untranslated messages.
-make[2]: Leaving directory '/build/git-2.20.1'
-make[2]: Entering directory '/build/git-2.20.1'
-mkdir -p po/build/locale/es/LC_MESSAGES/ && msgfmt --check --statistics -o po/build/locale/es/LC_MESSAGES/git.mo po/es.po
+mkdir -p po/build/locale/de/LC_MESSAGES/ && msgfmt --check --statistics -o po/build/locale/de/LC_MESSAGES/git.mo po/de.po
 4187 translated messages.
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
@@ -3484,11 +3515,15 @@
 4187 translated messages.
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-mkdir -p po/build/locale/vi/LC_MESSAGES/ && msgfmt --check --statistics -o po/build/locale/vi/LC_MESSAGES/git.mo po/vi.po
+mkdir -p po/build/locale/ca/LC_MESSAGES/ && msgfmt --check --statistics -o po/build/locale/ca/LC_MESSAGES/git.mo po/ca.po
+3398 translated messages, 455 fuzzy translations, 332 untranslated messages.
+make[2]: Leaving directory '/build/git-2.20.1'
+make[2]: Entering directory '/build/git-2.20.1'
+mkdir -p po/build/locale/sv/LC_MESSAGES/ && msgfmt --check --statistics -o po/build/locale/sv/LC_MESSAGES/git.mo po/sv.po
 4187 translated messages.
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-mkdir -p po/build/locale/de/LC_MESSAGES/ && msgfmt --check --statistics -o po/build/locale/de/LC_MESSAGES/git.mo po/de.po
+mkdir -p po/build/locale/es/LC_MESSAGES/ && msgfmt --check --statistics -o po/build/locale/es/LC_MESSAGES/git.mo po/es.po
 4187 translated messages.
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
@@ -3496,30 +3531,30 @@
 4187 translated messages.
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-mkdir -p po/build/locale/bg/LC_MESSAGES/ && msgfmt --check --statistics -o po/build/locale/bg/LC_MESSAGES/git.mo po/bg.po
+mkdir -p po/build/locale/vi/LC_MESSAGES/ && msgfmt --check --statistics -o po/build/locale/vi/LC_MESSAGES/git.mo po/vi.po
 4187 translated messages.
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-mkdir -p po/build/locale/sv/LC_MESSAGES/ && msgfmt --check --statistics -o po/build/locale/sv/LC_MESSAGES/git.mo po/sv.po
+mkdir -p po/build/locale/bg/LC_MESSAGES/ && msgfmt --check --statistics -o po/build/locale/bg/LC_MESSAGES/git.mo po/bg.po
 4187 translated messages.
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-mkdir -p perl/build/lib/Git/ && \
+mkdir -p perl/build/lib/ && \
 sed -e 's|@@LOCALEDIR@@|/usr/share/locale|g' \
     -e 's|@@NO_PERL_CPAN_FALLBACKS@@|1|g' \
-< perl/Git/IndexInfo.pm > perl/build/lib/Git/IndexInfo.pm
+< perl/Git.pm > perl/build/lib/Git.pm
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-mkdir -p perl/build/lib/ && \
+mkdir -p perl/build/lib/Git/ && \
 sed -e 's|@@LOCALEDIR@@|/usr/share/locale|g' \
     -e 's|@@NO_PERL_CPAN_FALLBACKS@@|1|g' \
-< perl/Git.pm > perl/build/lib/Git.pm
+< perl/Git/IndexInfo.pm > perl/build/lib/Git/IndexInfo.pm
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
 mkdir -p perl/build/lib/Git/ && \
 sed -e 's|@@LOCALEDIR@@|/usr/share/locale|g' \
     -e 's|@@NO_PERL_CPAN_FALLBACKS@@|1|g' \
-< perl/Git/I18N.pm > perl/build/lib/Git/I18N.pm
+< perl/Git/Packet.pm > perl/build/lib/Git/Packet.pm
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
 mkdir -p perl/build/lib/Git/ && \
@@ -3528,22 +3563,22 @@
 < perl/Git/SVN.pm > perl/build/lib/Git/SVN.pm
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-mkdir -p perl/build/lib/Git/LoadCPAN/ && \
+mkdir -p perl/build/lib/Git/ && \
 sed -e 's|@@LOCALEDIR@@|/usr/share/locale|g' \
     -e 's|@@NO_PERL_CPAN_FALLBACKS@@|1|g' \
-< perl/Git/LoadCPAN/Error.pm > perl/build/lib/Git/LoadCPAN/Error.pm
+< perl/Git/LoadCPAN.pm > perl/build/lib/Git/LoadCPAN.pm
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-mkdir -p perl/build/lib/Git/ && \
+mkdir -p perl/build/lib/Git/LoadCPAN/ && \
 sed -e 's|@@LOCALEDIR@@|/usr/share/locale|g' \
     -e 's|@@NO_PERL_CPAN_FALLBACKS@@|1|g' \
-< perl/Git/Packet.pm > perl/build/lib/Git/Packet.pm
+< perl/Git/LoadCPAN/Error.pm > perl/build/lib/Git/LoadCPAN/Error.pm
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
 mkdir -p perl/build/lib/Git/ && \
 sed -e 's|@@LOCALEDIR@@|/usr/share/locale|g' \
     -e 's|@@NO_PERL_CPAN_FALLBACKS@@|1|g' \
-< perl/Git/LoadCPAN.pm > perl/build/lib/Git/LoadCPAN.pm
+< perl/Git/I18N.pm > perl/build/lib/Git/I18N.pm
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
 mkdir -p perl/build/lib/Git/SVN/ && \
@@ -3555,13 +3590,13 @@
 mkdir -p perl/build/lib/Git/SVN/ && \
 sed -e 's|@@LOCALEDIR@@|/usr/share/locale|g' \
     -e 's|@@NO_PERL_CPAN_FALLBACKS@@|1|g' \
-< perl/Git/SVN/Utils.pm > perl/build/lib/Git/SVN/Utils.pm
+< perl/Git/SVN/Fetcher.pm > perl/build/lib/Git/SVN/Fetcher.pm
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
 mkdir -p perl/build/lib/Git/SVN/ && \
 sed -e 's|@@LOCALEDIR@@|/usr/share/locale|g' \
     -e 's|@@NO_PERL_CPAN_FALLBACKS@@|1|g' \
-< perl/Git/SVN/Fetcher.pm > perl/build/lib/Git/SVN/Fetcher.pm
+< perl/Git/SVN/Utils.pm > perl/build/lib/Git/SVN/Utils.pm
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
 mkdir -p perl/build/lib/Git/SVN/ && \
@@ -3573,7 +3608,7 @@
 mkdir -p perl/build/lib/Git/SVN/ && \
 sed -e 's|@@LOCALEDIR@@|/usr/share/locale|g' \
     -e 's|@@NO_PERL_CPAN_FALLBACKS@@|1|g' \
-< perl/Git/SVN/Ra.pm > perl/build/lib/Git/SVN/Ra.pm
+< perl/Git/SVN/Migration.pm > perl/build/lib/Git/SVN/Migration.pm
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
 mkdir -p perl/build/lib/Git/SVN/ && \
@@ -3582,136 +3617,136 @@
 < perl/Git/SVN/Editor.pm > perl/build/lib/Git/SVN/Editor.pm
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-mkdir -p perl/build/lib/Git/LoadCPAN/Mail/ && \
+mkdir -p perl/build/lib/Git/SVN/ && \
 sed -e 's|@@LOCALEDIR@@|/usr/share/locale|g' \
     -e 's|@@NO_PERL_CPAN_FALLBACKS@@|1|g' \
-< perl/Git/LoadCPAN/Mail/Address.pm > perl/build/lib/Git/LoadCPAN/Mail/Address.pm
+< perl/Git/SVN/Ra.pm > perl/build/lib/Git/SVN/Ra.pm
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-mkdir -p perl/build/lib/Git/SVN/ && \
+mkdir -p perl/build/lib/Git/SVN/Memoize/ && \
 sed -e 's|@@LOCALEDIR@@|/usr/share/locale|g' \
     -e 's|@@NO_PERL_CPAN_FALLBACKS@@|1|g' \
-< perl/Git/SVN/Log.pm > perl/build/lib/Git/SVN/Log.pm
+< perl/Git/SVN/Memoize/YAML.pm > perl/build/lib/Git/SVN/Memoize/YAML.pm
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
 mkdir -p perl/build/lib/Git/SVN/ && \
 sed -e 's|@@LOCALEDIR@@|/usr/share/locale|g' \
     -e 's|@@NO_PERL_CPAN_FALLBACKS@@|1|g' \
-< perl/Git/SVN/Migration.pm > perl/build/lib/Git/SVN/Migration.pm
+< perl/Git/SVN/Log.pm > perl/build/lib/Git/SVN/Log.pm
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-mkdir -p perl/build/lib/Git/SVN/Memoize/ && \
+mkdir -p perl/build/lib/Git/LoadCPAN/Mail/ && \
 sed -e 's|@@LOCALEDIR@@|/usr/share/locale|g' \
     -e 's|@@NO_PERL_CPAN_FALLBACKS@@|1|g' \
-< perl/Git/SVN/Memoize/YAML.pm > perl/build/lib/Git/SVN/Memoize/YAML.pm
+< perl/Git/LoadCPAN/Mail/Address.pm > perl/build/lib/Git/LoadCPAN/Mail/Address.pm
+make[2]: Leaving directory '/build/git-2.20.1'
+make[2]: Entering directory '/build/git-2.20.1'
+gcc -o t/helper/test-svn-fe.o -c -MF t/helper/.depend/test-svn-fe.o.d -MQ t/helper/test-svn-fe.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  t/helper/test-svn-fe.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
 gcc -o t/helper/test-fake-ssh.o -c -MF t/helper/.depend/test-fake-ssh.o.d -MQ t/helper/test-fake-ssh.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  t/helper/test-fake-ssh.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-gcc -o t/helper/test-svn-fe.o -c -MF t/helper/.depend/test-svn-fe.o.d -MQ t/helper/test-svn-fe.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  t/helper/test-svn-fe.c
+gcc -o t/helper/test-line-buffer.o -c -MF t/helper/.depend/test-line-buffer.o.d -MQ t/helper/test-line-buffer.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  t/helper/test-line-buffer.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
 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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  t/helper/test-tool.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  t/helper/test-drop-caches.c
+gcc -o t/helper/test-ctype.o -c -MF t/helper/.depend/test-ctype.o.d -MQ t/helper/test-ctype.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  t/helper/test-ctype.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  t/helper/test-chmtime.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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  t/helper/test-dump-cache-tree.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  t/helper/test-delta.c
+gcc -o t/helper/test-drop-caches.o -c -MF t/helper/.depend/test-drop-caches.o.d -MQ t/helper/test-drop-caches.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  t/helper/test-drop-caches.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-gcc -o t/helper/test-line-buffer.o -c -MF t/helper/.depend/test-line-buffer.o.d -MQ t/helper/test-line-buffer.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  t/helper/test-line-buffer.c
+gcc -o t/helper/test-chmtime.o -c -MF t/helper/.depend/test-chmtime.o.d -MQ t/helper/test-chmtime.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  t/helper/test-chmtime.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  t/helper/test-genrandom.c
+gcc -o t/helper/test-dump-fsmonitor.o -c -MF t/helper/.depend/test-dump-fsmonitor.o.d -MQ t/helper/test-dump-fsmonitor.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  t/helper/test-dump-fsmonitor.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  t/helper/test-config.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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  t/helper/test-dump-split-index.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-gcc -o t/helper/test-ctype.o -c -MF t/helper/.depend/test-ctype.o.d -MQ t/helper/test-ctype.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  t/helper/test-ctype.c
+gcc -o t/helper/test-delta.o -c -MF t/helper/.depend/test-delta.o.d -MQ t/helper/test-delta.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  t/helper/test-delta.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  t/helper/test-date.c
+gcc -o t/helper/test-genrandom.o -c -MF t/helper/.depend/test-genrandom.o.d -MQ t/helper/test-genrandom.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  t/helper/test-genrandom.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  t/helper/test-dump-split-index.c
+gcc -o t/helper/test-config.o -c -MF t/helper/.depend/test-config.o.d -MQ t/helper/test-config.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  t/helper/test-config.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  t/helper/test-example-decorate.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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  t/helper/test-date.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  t/helper/test-dump-fsmonitor.c
+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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  t/helper/test-example-decorate.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
 gcc -o t/helper/test-index-version.o -c -MF t/helper/.depend/test-index-version.o.d -MQ t/helper/test-index-version.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  t/helper/test-index-version.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  t/helper/test-dump-cache-tree.c
-make[2]: Leaving directory '/build/git-2.20.1'
-make[2]: Entering directory '/build/git-2.20.1'
 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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  t/helper/test-dump-untracked-cache.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  t/helper/test-online-cpus.c
-make[2]: Leaving directory '/build/git-2.20.1'
-make[2]: Entering directory '/build/git-2.20.1'
 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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  t/helper/test-mktemp.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
 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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  t/helper/test-match-trees.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  t/helper/test-mergesort.c
+gcc -o t/helper/test-online-cpus.o -c -MF t/helper/.depend/test-online-cpus.o.d -MQ t/helper/test-online-cpus.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  t/helper/test-online-cpus.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  t/helper/test-lazy-init-name-hash.c
+gcc -o t/helper/test-pkt-line.o -c -MF t/helper/.depend/test-pkt-line.o.d -MQ t/helper/test-pkt-line.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  t/helper/test-pkt-line.c
+make[2]: Leaving directory '/build/git-2.20.1'
+make[2]: Entering directory '/build/git-2.20.1'
+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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  t/helper/test-mergesort.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
 gcc -o t/helper/test-prio-queue.o -c -MF t/helper/.depend/test-prio-queue.o.d -MQ t/helper/test-prio-queue.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  t/helper/test-prio-queue.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  t/helper/test-pkt-line.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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  t/helper/test-hashmap.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  t/helper/test-regex.c
+gcc -o t/helper/test-read-cache.o -c -MF t/helper/.depend/test-read-cache.o.d -MQ t/helper/test-read-cache.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  t/helper/test-read-cache.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  t/helper/test-hashmap.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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  t/helper/test-lazy-init-name-hash.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  t/helper/test-read-cache.c
+gcc -o t/helper/test-read-midx.o -c -MF t/helper/.depend/test-read-midx.o.d -MQ t/helper/test-read-midx.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  t/helper/test-read-midx.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  t/helper/test-json-writer.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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  t/helper/test-parse-options.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  t/helper/test-reach.c
+gcc -o t/helper/test-regex.o -c -MF t/helper/.depend/test-regex.o.d -MQ t/helper/test-regex.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  t/helper/test-regex.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  t/helper/test-read-midx.c
+gcc -o t/helper/test-path-utils.o -c -MF t/helper/.depend/test-path-utils.o.d -MQ t/helper/test-path-utils.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  t/helper/test-path-utils.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
 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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  t/helper/test-repository.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  t/helper/test-parse-options.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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  t/helper/test-json-writer.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  t/helper/test-revision-walking.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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  t/helper/test-scrap-cache-tree.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  t/helper/test-scrap-cache-tree.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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  t/helper/test-revision-walking.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  t/helper/test-ref-store.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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  t/helper/test-sha1.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  t/helper/test-sigchain.c
+gcc -o t/helper/test-reach.o -c -MF t/helper/.depend/test-reach.o.d -MQ t/helper/test-reach.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  t/helper/test-reach.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
 sed -e '1s|#!.*/sh|#!/bin/sh|' \
@@ -3726,13 +3761,7 @@
 chmod +x bin-wrappers/git-upload-pack
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  t/helper/test-strcmp-offset.c
-make[2]: Leaving directory '/build/git-2.20.1'
-make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  t/helper/test-string-list.c
-make[2]: Leaving directory '/build/git-2.20.1'
-make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  t/helper/test-urlmatch-normalization.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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  t/helper/test-submodule-config.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
 sed -e '1s|#!.*/sh|#!/bin/sh|' \
@@ -3741,13 +3770,7 @@
 chmod +x bin-wrappers/git-receive-pack
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  t/helper/test-run-command.c
-make[2]: Leaving directory '/build/git-2.20.1'
-make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  t/helper/test-sha1.c
-make[2]: Leaving directory '/build/git-2.20.1'
-make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  t/helper/test-subprocess.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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  t/helper/test-windows-named-pipe.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
 sed -e '1s|#!.*/sh|#!/bin/sh|' \
@@ -3756,16 +3779,19 @@
 chmod +x bin-wrappers/git-upload-archive
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  t/helper/test-windows-named-pipe.c
-make[2]: Leaving directory '/build/git-2.20.1'
-make[2]: Entering directory '/build/git-2.20.1'
 sed -e '1s|#!.*/sh|#!/bin/sh|' \
      -e 's|@@BUILD_DIR@@|/build/git-2.20.1|' \
      -e 's|@@PROG@@|git-shell|' < wrap-for-bin.sh > bin-wrappers/git-shell && \
 chmod +x bin-wrappers/git-shell
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  t/helper/test-submodule-nested-repo-config.c
+gcc -o t/helper/test-sigchain.o -c -MF t/helper/.depend/test-sigchain.o.d -MQ t/helper/test-sigchain.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  t/helper/test-sigchain.c
+make[2]: Leaving directory '/build/git-2.20.1'
+make[2]: Entering directory '/build/git-2.20.1'
+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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  t/helper/test-strcmp-offset.c
+make[2]: Leaving directory '/build/git-2.20.1'
+make[2]: Entering directory '/build/git-2.20.1'
+gcc -o t/helper/test-sha1-array.o -c -MF t/helper/.depend/test-sha1-array.o.d -MQ t/helper/test-sha1-array.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  t/helper/test-sha1-array.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
 sed -e '1s|#!.*/sh|#!/bin/sh|' \
@@ -3774,25 +3800,28 @@
 chmod +x bin-wrappers/git-cvsserver
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-sed -e '1s|#!.*/sh|#!/bin/sh|' \
-     -e 's|@@BUILD_DIR@@|/build/git-2.20.1|' \
-     -e 's|@@PROG@@|t/helper/test-fake-ssh|' < wrap-for-bin.sh > bin-wrappers/test-fake-ssh && \
-chmod +x bin-wrappers/test-fake-ssh
+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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  t/helper/test-ref-store.c
+make[2]: Leaving directory '/build/git-2.20.1'
+make[2]: Entering directory '/build/git-2.20.1'
+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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  t/helper/test-submodule-nested-repo-config.c
+make[2]: Leaving directory '/build/git-2.20.1'
+make[2]: Entering directory '/build/git-2.20.1'
+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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  t/helper/test-run-command.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
 sed -e '1s|#!.*/sh|#!/bin/sh|' \
      -e 's|@@BUILD_DIR@@|/build/git-2.20.1|' \
-     -e 's|@@PROG@@|t/helper/test-line-buffer|' < wrap-for-bin.sh > bin-wrappers/test-line-buffer && \
-chmod +x bin-wrappers/test-line-buffer
+     -e 's|@@PROG@@|t/helper/test-fake-ssh|' < wrap-for-bin.sh > bin-wrappers/test-fake-ssh && \
+chmod +x bin-wrappers/test-fake-ssh
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  t/helper/test-path-utils.c
+gcc -o t/helper/test-subprocess.o -c -MF t/helper/.depend/test-subprocess.o.d -MQ t/helper/test-subprocess.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  t/helper/test-subprocess.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
 sed -e '1s|#!.*/sh|#!/bin/sh|' \
      -e 's|@@BUILD_DIR@@|/build/git-2.20.1|' \
-     -e 's|@@PROG@@|t/helper/test-tool|' < wrap-for-bin.sh > bin-wrappers/test-tool && \
-chmod +x bin-wrappers/test-tool
+     -e 's|@@PROG@@|t/helper/test-line-buffer|' < wrap-for-bin.sh > bin-wrappers/test-line-buffer && \
+chmod +x bin-wrappers/test-line-buffer
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
 sed -e '1s|#!.*/sh|#!/bin/sh|' \
@@ -3801,24 +3830,30 @@
 chmod +x bin-wrappers/test-svn-fe
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-gcc -o t/helper/test-sha1-array.o -c -MF t/helper/.depend/test-sha1-array.o.d -MQ t/helper/test-sha1-array.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  t/helper/test-sha1-array.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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  t/helper/test-urlmatch-normalization.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  t/helper/test-submodule-config.c
+gcc -o t/helper/test-write-cache.o -c -MF t/helper/.depend/test-write-cache.o.d -MQ t/helper/test-write-cache.o -MMD -MP -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  t/helper/test-write-cache.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  t/helper/test-write-cache.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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  t/helper/test-string-list.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
 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 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"'  t/helper/test-wildmatch.c
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-gcc -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"' -o t/helper/test-line-buffer -Wl,-z,relro  t/helper/test-line-buffer.o common-main.o libgit.a xdiff/lib.a vcs-svn/lib.a libgit.a xdiff/lib.a  -lpcre2-8 -lz -lpthread -lrt
+sed -e '1s|#!.*/sh|#!/bin/sh|' \
+     -e 's|@@BUILD_DIR@@|/build/git-2.20.1|' \
+     -e 's|@@PROG@@|t/helper/test-tool|' < wrap-for-bin.sh > bin-wrappers/test-tool && \
+chmod +x bin-wrappers/test-tool
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
 gcc -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"' -o t/helper/test-fake-ssh -Wl,-z,relro  t/helper/test-fake-ssh.o common-main.o libgit.a xdiff/lib.a libgit.a xdiff/lib.a  -lpcre2-8 -lz -lpthread -lrt
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
+gcc -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"' -o t/helper/test-line-buffer -Wl,-z,relro  t/helper/test-line-buffer.o common-main.o libgit.a xdiff/lib.a vcs-svn/lib.a libgit.a xdiff/lib.a  -lpcre2-8 -lz -lpthread -lrt
+make[2]: Leaving directory '/build/git-2.20.1'
+make[2]: Entering directory '/build/git-2.20.1'
 gcc -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"x86_64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -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"' -o t/helper/test-svn-fe -Wl,-z,relro  t/helper/test-svn-fe.o common-main.o libgit.a xdiff/lib.a vcs-svn/lib.a libgit.a xdiff/lib.a  -lpcre2-8 -lz -lpthread -lrt
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
@@ -3864,7 +3899,6 @@
 cmds-synchelpers.txt
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 /usr/bin/make -C ../  GIT-VERSION-FILE
-make[3]: 'GIT-VERSION-FILE' is up to date.
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f mergetools-list.made && \
 /bin/sh -c 'MERGE_TOOLS_DIR=../mergetools && \
@@ -3880,20 +3914,16 @@
 /usr/bin/perl ./build-docdep.perl >doc.dep+  && \
 mv doc.dep+ doc.dep
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
+make[3]: 'GIT-VERSION-FILE' is up to date.
 /usr/bin/make -C ../  GIT-VERSION-FILE
 make[3]: 'GIT-VERSION-FILE' is up to date.
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
 sed "s|@@MAN_BASE_URL@@|file:///usr/share/doc/git/html/|" manpage-base-url.xsl.in > manpage-base-url.xsl
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-gui.xml+ git-gui.xml && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-gui.xml+ git-gui.txt && \
-mv git-gui.xml+ git-gui.xml
-make[2]: Leaving directory '/build/git-2.20.1/Documentation'
-make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-count-objects.xml+ git-count-objects.xml && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-count-objects.xml+ git-count-objects.txt && \
-mv git-count-objects.xml+ git-count-objects.xml
+rm -f git-init-db.xml+ git-init-db.xml && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-init-db.xml+ git-init-db.txt && \
+mv git-init-db.xml+ git-init-db.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-patch-id.xml+ git-patch-id.xml && \
@@ -3901,14 +3931,14 @@
 mv git-patch-id.xml+ git-patch-id.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-index-pack.xml+ git-index-pack.xml && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-index-pack.xml+ git-index-pack.txt && \
-mv git-index-pack.xml+ git-index-pack.xml
+rm -f git-pack-refs.xml+ git-pack-refs.xml && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-pack-refs.xml+ git-pack-refs.txt && \
+mv git-pack-refs.xml+ git-pack-refs.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-archive.xml+ git-archive.xml && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-archive.xml+ git-archive.txt && \
-mv git-archive.xml+ git-archive.xml
+rm -f git-get-tar-commit-id.xml+ git-get-tar-commit-id.xml && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-get-tar-commit-id.xml+ git-get-tar-commit-id.txt && \
+mv git-get-tar-commit-id.xml+ git-get-tar-commit-id.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-sh-setup.xml+ git-sh-setup.xml && \
@@ -3916,24 +3946,24 @@
 mv git-sh-setup.xml+ git-sh-setup.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-pack-refs.xml+ git-pack-refs.xml && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-pack-refs.xml+ git-pack-refs.txt && \
-mv git-pack-refs.xml+ git-pack-refs.xml
+rm -f git-count-objects.xml+ git-count-objects.xml && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-count-objects.xml+ git-count-objects.txt && \
+mv git-count-objects.xml+ git-count-objects.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-rm.xml+ git-rm.xml && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-rm.xml+ git-rm.txt && \
-mv git-rm.xml+ git-rm.xml
+rm -f git-index-pack.xml+ git-index-pack.xml && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-index-pack.xml+ git-index-pack.txt && \
+mv git-index-pack.xml+ git-index-pack.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-check-ignore.xml+ git-check-ignore.xml && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-check-ignore.xml+ git-check-ignore.txt && \
-mv git-check-ignore.xml+ git-check-ignore.xml
+rm -f git-commit-graph.xml+ git-commit-graph.xml && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-commit-graph.xml+ git-commit-graph.txt && \
+mv git-commit-graph.xml+ git-commit-graph.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-init-db.xml+ git-init-db.xml && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-init-db.xml+ git-init-db.txt && \
-mv git-init-db.xml+ git-init-db.xml
+rm -f git-add.xml+ git-add.xml && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-add.xml+ git-add.txt && \
+mv git-add.xml+ git-add.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-revert.xml+ git-revert.xml && \
@@ -3941,19 +3971,14 @@
 mv git-revert.xml+ git-revert.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-commit-graph.xml+ git-commit-graph.xml && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-commit-graph.xml+ git-commit-graph.txt && \
-mv git-commit-graph.xml+ git-commit-graph.xml
-make[2]: Leaving directory '/build/git-2.20.1/Documentation'
-make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-get-tar-commit-id.xml+ git-get-tar-commit-id.xml && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-get-tar-commit-id.xml+ git-get-tar-commit-id.txt && \
-mv git-get-tar-commit-id.xml+ git-get-tar-commit-id.xml
+rm -f git-gui.xml+ git-gui.xml && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-gui.xml+ git-gui.txt && \
+mv git-gui.xml+ git-gui.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-gc.xml+ git-gc.xml && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-gc.xml+ git-gc.txt && \
-mv git-gc.xml+ git-gc.xml
+rm -f git-check-ignore.xml+ git-check-ignore.xml && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-check-ignore.xml+ git-check-ignore.txt && \
+mv git-check-ignore.xml+ git-check-ignore.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-commit-tree.xml+ git-commit-tree.xml && \
@@ -3961,14 +3986,19 @@
 mv git-commit-tree.xml+ git-commit-tree.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-bundle.xml+ git-bundle.xml && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-bundle.xml+ git-bundle.txt && \
-mv git-bundle.xml+ git-bundle.xml
+rm -f git-archive.xml+ git-archive.xml && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-archive.xml+ git-archive.txt && \
+mv git-archive.xml+ git-archive.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-ls-files.xml+ git-ls-files.xml && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-ls-files.xml+ git-ls-files.txt && \
-mv git-ls-files.xml+ git-ls-files.xml
+rm -f git-rm.xml+ git-rm.xml && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-rm.xml+ git-rm.txt && \
+mv git-rm.xml+ git-rm.xml
+make[2]: Leaving directory '/build/git-2.20.1/Documentation'
+make[2]: Entering directory '/build/git-2.20.1/Documentation'
+rm -f git-mailsplit.xml+ git-mailsplit.xml && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-mailsplit.xml+ git-mailsplit.txt && \
+mv git-mailsplit.xml+ git-mailsplit.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-mv.xml+ git-mv.xml && \
@@ -3976,29 +4006,29 @@
 mv git-mv.xml+ git-mv.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-add.xml+ git-add.xml && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-add.xml+ git-add.txt && \
-mv git-add.xml+ git-add.xml
+rm -f git-gc.xml+ git-gc.xml && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-gc.xml+ git-gc.txt && \
+mv git-gc.xml+ git-gc.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-repack.xml+ git-repack.xml && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-repack.xml+ git-repack.txt && \
-mv git-repack.xml+ git-repack.xml
+rm -f git-ls-files.xml+ git-ls-files.xml && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-ls-files.xml+ git-ls-files.txt && \
+mv git-ls-files.xml+ git-ls-files.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-apply.xml+ git-apply.xml && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-apply.xml+ git-apply.txt && \
-mv git-apply.xml+ git-apply.xml
+rm -f git-bundle.xml+ git-bundle.xml && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-bundle.xml+ git-bundle.txt && \
+mv git-bundle.xml+ git-bundle.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-prune.xml+ git-prune.xml && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-prune.xml+ git-prune.txt && \
-mv git-prune.xml+ git-prune.xml
+rm -f git-repack.xml+ git-repack.xml && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-repack.xml+ git-repack.txt && \
+mv git-repack.xml+ git-repack.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-stripspace.xml+ git-stripspace.xml && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-stripspace.xml+ git-stripspace.txt && \
-mv git-stripspace.xml+ git-stripspace.xml
+rm -f git-upload-pack.xml+ git-upload-pack.xml && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-upload-pack.xml+ git-upload-pack.txt && \
+mv git-upload-pack.xml+ git-upload-pack.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-cherry.xml+ git-cherry.xml && \
@@ -4006,39 +4036,39 @@
 mv git-cherry.xml+ git-cherry.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-mailsplit.xml+ git-mailsplit.xml && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-mailsplit.xml+ git-mailsplit.txt && \
-mv git-mailsplit.xml+ git-mailsplit.xml
+rm -f git-am.xml+ git-am.xml && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-am.xml+ git-am.txt && \
+mv git-am.xml+ git-am.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-merge.xml+ git-merge.xml && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-merge.xml+ git-merge.txt && \
-mv git-merge.xml+ git-merge.xml
+rm -f git-shortlog.xml+ git-shortlog.xml && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-shortlog.xml+ git-shortlog.txt && \
+mv git-shortlog.xml+ git-shortlog.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-upload-pack.xml+ git-upload-pack.xml && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-upload-pack.xml+ git-upload-pack.txt && \
-mv git-upload-pack.xml+ git-upload-pack.xml
+rm -f git-mergetool--lib.xml+ git-mergetool--lib.xml && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-mergetool--lib.xml+ git-mergetool--lib.txt && \
+mv git-mergetool--lib.xml+ git-mergetool--lib.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-mergetool.xml+ git-mergetool.xml && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-mergetool.xml+ git-mergetool.txt && \
-mv git-mergetool.xml+ git-mergetool.xml
+rm -f git-prune.xml+ git-prune.xml && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-prune.xml+ git-prune.txt && \
+mv git-prune.xml+ git-prune.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-mergetool--lib.xml+ git-mergetool--lib.xml && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-mergetool--lib.xml+ git-mergetool--lib.txt && \
-mv git-mergetool--lib.xml+ git-mergetool--lib.xml
+rm -f git-apply.xml+ git-apply.xml && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-apply.xml+ git-apply.txt && \
+mv git-apply.xml+ git-apply.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-shortlog.xml+ git-shortlog.xml && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-shortlog.xml+ git-shortlog.txt && \
-mv git-shortlog.xml+ git-shortlog.xml
+rm -f git-stripspace.xml+ git-stripspace.xml && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-stripspace.xml+ git-stripspace.txt && \
+mv git-stripspace.xml+ git-stripspace.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-clone.xml+ git-clone.xml && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-clone.xml+ git-clone.txt && \
-mv git-clone.xml+ git-clone.xml
+rm -f git-blame.xml+ git-blame.xml && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-blame.xml+ git-blame.txt && \
+mv git-blame.xml+ git-blame.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-fsck.xml+ git-fsck.xml && \
@@ -4046,29 +4076,29 @@
 mv git-fsck.xml+ git-fsck.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-fetch-pack.xml+ git-fetch-pack.xml && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-fetch-pack.xml+ git-fetch-pack.txt && \
-mv git-fetch-pack.xml+ git-fetch-pack.xml
+rm -f git-request-pull.xml+ git-request-pull.xml && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-request-pull.xml+ git-request-pull.txt && \
+mv git-request-pull.xml+ git-request-pull.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-cat-file.xml+ git-cat-file.xml && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-cat-file.xml+ git-cat-file.txt && \
-mv git-cat-file.xml+ git-cat-file.xml
+rm -f git-clone.xml+ git-clone.xml && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-clone.xml+ git-clone.txt && \
+mv git-clone.xml+ git-clone.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-am.xml+ git-am.xml && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-am.xml+ git-am.txt && \
-mv git-am.xml+ git-am.xml
+rm -f git-fetch-pack.xml+ git-fetch-pack.xml && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-fetch-pack.xml+ git-fetch-pack.txt && \
+mv git-fetch-pack.xml+ git-fetch-pack.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-blame.xml+ git-blame.xml && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-blame.xml+ git-blame.txt && \
-mv git-blame.xml+ git-blame.xml
+rm -f git-column.xml+ git-column.xml && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-column.xml+ git-column.txt && \
+mv git-column.xml+ git-column.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-request-pull.xml+ git-request-pull.xml && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-request-pull.xml+ git-request-pull.txt && \
-mv git-request-pull.xml+ git-request-pull.xml
+rm -f git-write-tree.xml+ git-write-tree.xml && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-write-tree.xml+ git-write-tree.txt && \
+mv git-write-tree.xml+ git-write-tree.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-send-email.xml+ git-send-email.xml && \
@@ -4076,14 +4106,9 @@
 mv git-send-email.xml+ git-send-email.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-write-tree.xml+ git-write-tree.xml && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-write-tree.xml+ git-write-tree.txt && \
-mv git-write-tree.xml+ git-write-tree.xml
-make[2]: Leaving directory '/build/git-2.20.1/Documentation'
-make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-parse-remote.xml+ git-parse-remote.xml && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-parse-remote.xml+ git-parse-remote.txt && \
-mv git-parse-remote.xml+ git-parse-remote.xml
+rm -f git-mergetool.xml+ git-mergetool.xml && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-mergetool.xml+ git-mergetool.txt && \
+mv git-mergetool.xml+ git-mergetool.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-difftool.xml+ git-difftool.xml && \
@@ -4091,9 +4116,14 @@
 mv git-difftool.xml+ git-difftool.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-column.xml+ git-column.xml && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-column.xml+ git-column.txt && \
-mv git-column.xml+ git-column.xml
+rm -f git-parse-remote.xml+ git-parse-remote.xml && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-parse-remote.xml+ git-parse-remote.txt && \
+mv git-parse-remote.xml+ git-parse-remote.xml
+make[2]: Leaving directory '/build/git-2.20.1/Documentation'
+make[2]: Entering directory '/build/git-2.20.1/Documentation'
+rm -f git-p4.xml+ git-p4.xml && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-p4.xml+ git-p4.txt && \
+mv git-p4.xml+ git-p4.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-multi-pack-index.xml+ git-multi-pack-index.xml && \
@@ -4106,29 +4136,34 @@
 mv git-ls-tree.xml+ git-ls-tree.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
+rm -f git-cat-file.xml+ git-cat-file.xml && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-cat-file.xml+ git-cat-file.txt && \
+mv git-cat-file.xml+ git-cat-file.xml
+make[2]: Leaving directory '/build/git-2.20.1/Documentation'
+make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-daemon.xml+ git-daemon.xml && \
 TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-daemon.xml+ git-daemon.txt && \
 mv git-daemon.xml+ git-daemon.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-p4.xml+ git-p4.xml && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-p4.xml+ git-p4.txt && \
-mv git-p4.xml+ git-p4.xml
-make[2]: Leaving directory '/build/git-2.20.1/Documentation'
-make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-pack-objects.xml+ git-pack-objects.xml && \
 TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-pack-objects.xml+ git-pack-objects.txt && \
 mv git-pack-objects.xml+ git-pack-objects.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
+rm -f git-web--browse.xml+ git-web--browse.xml && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-web--browse.xml+ git-web--browse.txt && \
+mv git-web--browse.xml+ git-web--browse.xml
+make[2]: Leaving directory '/build/git-2.20.1/Documentation'
+make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-unpack-file.xml+ git-unpack-file.xml && \
 TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-unpack-file.xml+ git-unpack-file.txt && \
 mv git-unpack-file.xml+ git-unpack-file.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-web--browse.xml+ git-web--browse.xml && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-web--browse.xml+ git-web--browse.txt && \
-mv git-web--browse.xml+ git-web--browse.xml
+rm -f git-send-pack.xml+ git-send-pack.xml && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-send-pack.xml+ git-send-pack.txt && \
+mv git-send-pack.xml+ git-send-pack.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-annotate.xml+ git-annotate.xml && \
@@ -4146,9 +4181,9 @@
 mv git-cvsexportcommit.xml+ git-cvsexportcommit.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-send-pack.xml+ git-send-pack.xml && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-send-pack.xml+ git-send-pack.txt && \
-mv git-send-pack.xml+ git-send-pack.xml
+rm -f git-symbolic-ref.xml+ git-symbolic-ref.xml && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-symbolic-ref.xml+ git-symbolic-ref.txt && \
+mv git-symbolic-ref.xml+ git-symbolic-ref.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-name-rev.xml+ git-name-rev.xml && \
@@ -4156,6 +4191,11 @@
 mv git-name-rev.xml+ git-name-rev.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
+rm -f git-merge.xml+ git-merge.xml && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-merge.xml+ git-merge.txt && \
+mv git-merge.xml+ git-merge.xml
+make[2]: Leaving directory '/build/git-2.20.1/Documentation'
+make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-update-index.xml+ git-update-index.xml && \
 TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-update-index.xml+ git-update-index.txt && \
 mv git-update-index.xml+ git-update-index.xml
@@ -4166,6 +4206,16 @@
 mv git-check-ref-format.xml+ git-check-ref-format.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
+rm -f git-rerere.xml+ git-rerere.xml && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-rerere.xml+ git-rerere.txt && \
+mv git-rerere.xml+ git-rerere.xml
+make[2]: Leaving directory '/build/git-2.20.1/Documentation'
+make[2]: Entering directory '/build/git-2.20.1/Documentation'
+rm -f git-merge-tree.xml+ git-merge-tree.xml && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-merge-tree.xml+ git-merge-tree.txt && \
+mv git-merge-tree.xml+ git-merge-tree.xml
+make[2]: Leaving directory '/build/git-2.20.1/Documentation'
+make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-check-mailmap.xml+ git-check-mailmap.xml && \
 TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-check-mailmap.xml+ git-check-mailmap.txt && \
 mv git-check-mailmap.xml+ git-check-mailmap.xml
@@ -4181,19 +4231,9 @@
 mv git-update-ref.xml+ git-update-ref.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-merge-tree.xml+ git-merge-tree.xml && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-merge-tree.xml+ git-merge-tree.txt && \
-mv git-merge-tree.xml+ git-merge-tree.xml
-make[2]: Leaving directory '/build/git-2.20.1/Documentation'
-make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-symbolic-ref.xml+ git-symbolic-ref.xml && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-symbolic-ref.xml+ git-symbolic-ref.txt && \
-mv git-symbolic-ref.xml+ git-symbolic-ref.xml
-make[2]: Leaving directory '/build/git-2.20.1/Documentation'
-make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-rerere.xml+ git-rerere.xml && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-rerere.xml+ git-rerere.txt && \
-mv git-rerere.xml+ git-rerere.xml
+rm -f git-quiltimport.xml+ git-quiltimport.xml && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-quiltimport.xml+ git-quiltimport.txt && \
+mv git-quiltimport.xml+ git-quiltimport.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-init.xml+ git-init.xml && \
@@ -4201,14 +4241,9 @@
 mv git-init.xml+ git-init.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-quiltimport.xml+ git-quiltimport.xml && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-quiltimport.xml+ git-quiltimport.txt && \
-mv git-quiltimport.xml+ git-quiltimport.xml
-make[2]: Leaving directory '/build/git-2.20.1/Documentation'
-make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-rev-parse.xml+ git-rev-parse.xml && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-rev-parse.xml+ git-rev-parse.txt && \
-mv git-rev-parse.xml+ git-rev-parse.xml
+rm -f git-whatchanged.xml+ git-whatchanged.xml && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-whatchanged.xml+ git-whatchanged.txt && \
+mv git-whatchanged.xml+ git-whatchanged.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-help.xml+ git-help.xml && \
@@ -4216,24 +4251,19 @@
 mv git-help.xml+ git-help.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
+rm -f git-remote-ext.xml+ git-remote-ext.xml && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-remote-ext.xml+ git-remote-ext.txt && \
+mv git-remote-ext.xml+ git-remote-ext.xml
+make[2]: Leaving directory '/build/git-2.20.1/Documentation'
+make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-instaweb.xml+ git-instaweb.xml && \
 TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-instaweb.xml+ git-instaweb.txt && \
 mv git-instaweb.xml+ git-instaweb.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-whatchanged.xml+ git-whatchanged.xml && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-whatchanged.xml+ git-whatchanged.txt && \
-mv git-whatchanged.xml+ git-whatchanged.xml
-make[2]: Leaving directory '/build/git-2.20.1/Documentation'
-make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-clean.xml+ git-clean.xml && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-clean.xml+ git-clean.txt && \
-mv git-clean.xml+ git-clean.xml
-make[2]: Leaving directory '/build/git-2.20.1/Documentation'
-make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-remote-ext.xml+ git-remote-ext.xml && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-remote-ext.xml+ git-remote-ext.txt && \
-mv git-remote-ext.xml+ git-remote-ext.xml
+rm -f git-rev-parse.xml+ git-rev-parse.xml && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-rev-parse.xml+ git-rev-parse.txt && \
+mv git-rev-parse.xml+ git-rev-parse.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-submodule.xml+ git-submodule.xml && \
@@ -4241,26 +4271,16 @@
 mv git-submodule.xml+ git-submodule.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
+rm -f git-clean.xml+ git-clean.xml && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-clean.xml+ git-clean.txt && \
+mv git-clean.xml+ git-clean.xml
+make[2]: Leaving directory '/build/git-2.20.1/Documentation'
+make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-upload-archive.xml+ git-upload-archive.xml && \
 TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-upload-archive.xml+ git-upload-archive.txt && \
 mv git-upload-archive.xml+ git-upload-archive.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-tag.xml+ git-tag.xml && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-tag.xml+ git-tag.txt && \
-mv git-tag.xml+ git-tag.xml
-make[2]: Leaving directory '/build/git-2.20.1/Documentation'
-make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-range-diff.xml+ git-range-diff.xml && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-range-diff.xml+ git-range-diff.txt && \
-mv git-range-diff.xml+ git-range-diff.xml
-make[2]: Leaving directory '/build/git-2.20.1/Documentation'
-make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-mailinfo.xml+ git-mailinfo.xml && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-mailinfo.xml+ git-mailinfo.txt && \
-mv git-mailinfo.xml+ git-mailinfo.xml
-make[2]: Leaving directory '/build/git-2.20.1/Documentation'
-make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-cvsimport.xml+ git-cvsimport.xml && \
 TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-cvsimport.xml+ git-cvsimport.txt && \
 mv git-cvsimport.xml+ git-cvsimport.xml
@@ -4271,34 +4291,34 @@
 mv git-pack-redundant.xml+ git-pack-redundant.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
+rm -f git-mailinfo.xml+ git-mailinfo.xml && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-mailinfo.xml+ git-mailinfo.txt && \
+mv git-mailinfo.xml+ git-mailinfo.xml
+make[2]: Leaving directory '/build/git-2.20.1/Documentation'
+make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-merge-index.xml+ git-merge-index.xml && \
 TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-merge-index.xml+ git-merge-index.txt && \
 mv git-merge-index.xml+ git-merge-index.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-remote.xml+ git-remote.xml && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-remote.xml+ git-remote.txt && \
-mv git-remote.xml+ git-remote.xml
-make[2]: Leaving directory '/build/git-2.20.1/Documentation'
-make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-fetch.xml+ git-fetch.xml && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-fetch.xml+ git-fetch.txt && \
-mv git-fetch.xml+ git-fetch.xml
+rm -f git-credential-store.xml+ git-credential-store.xml && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-credential-store.xml+ git-credential-store.txt && \
+mv git-credential-store.xml+ git-credential-store.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-describe.xml+ git-describe.xml && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-describe.xml+ git-describe.txt && \
-mv git-describe.xml+ git-describe.xml
+rm -f git-range-diff.xml+ git-range-diff.xml && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-range-diff.xml+ git-range-diff.txt && \
+mv git-range-diff.xml+ git-range-diff.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-bisect.xml+ git-bisect.xml && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-bisect.xml+ git-bisect.txt && \
-mv git-bisect.xml+ git-bisect.xml
+rm -f git-tag.xml+ git-tag.xml && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-tag.xml+ git-tag.txt && \
+mv git-tag.xml+ git-tag.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-rev-list.xml+ git-rev-list.xml && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-rev-list.xml+ git-rev-list.txt && \
-mv git-rev-list.xml+ git-rev-list.xml
+rm -f git-remote.xml+ git-remote.xml && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-remote.xml+ git-remote.txt && \
+mv git-remote.xml+ git-remote.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-diff-index.xml+ git-diff-index.xml && \
@@ -4306,54 +4326,54 @@
 mv git-diff-index.xml+ git-diff-index.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-rebase.xml+ git-rebase.xml && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-rebase.xml+ git-rebase.txt && \
-mv git-rebase.xml+ git-rebase.xml
-make[2]: Leaving directory '/build/git-2.20.1/Documentation'
-make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-verify-commit.xml+ git-verify-commit.xml && \
 TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-verify-commit.xml+ git-verify-commit.txt && \
 mv git-verify-commit.xml+ git-verify-commit.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-credential-store.xml+ git-credential-store.xml && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-credential-store.xml+ git-credential-store.txt && \
-mv git-credential-store.xml+ git-credential-store.xml
-make[2]: Leaving directory '/build/git-2.20.1/Documentation'
-make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-sh-i18n.xml+ git-sh-i18n.xml && \
 TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-sh-i18n.xml+ git-sh-i18n.txt && \
 mv git-sh-i18n.xml+ git-sh-i18n.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
+rm -f git-describe.xml+ git-describe.xml && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-describe.xml+ git-describe.txt && \
+mv git-describe.xml+ git-describe.xml
+make[2]: Leaving directory '/build/git-2.20.1/Documentation'
+make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-mktree.xml+ git-mktree.xml && \
 TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-mktree.xml+ git-mktree.txt && \
 mv git-mktree.xml+ git-mktree.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-cherry-pick.xml+ git-cherry-pick.xml && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-cherry-pick.xml+ git-cherry-pick.txt && \
-mv git-cherry-pick.xml+ git-cherry-pick.xml
+rm -f git-bisect.xml+ git-bisect.xml && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-bisect.xml+ git-bisect.txt && \
+mv git-bisect.xml+ git-bisect.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-stage.xml+ git-stage.xml && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-stage.xml+ git-stage.txt && \
-mv git-stage.xml+ git-stage.xml
+rm -f git-fast-export.xml+ git-fast-export.xml && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-fast-export.xml+ git-fast-export.txt && \
+mv git-fast-export.xml+ git-fast-export.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-hash-object.xml+ git-hash-object.xml && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-hash-object.xml+ git-hash-object.txt && \
-mv git-hash-object.xml+ git-hash-object.xml
+rm -f git-rebase.xml+ git-rebase.xml && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-rebase.xml+ git-rebase.txt && \
+mv git-rebase.xml+ git-rebase.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-credential-cache--daemon.xml+ git-credential-cache--daemon.xml && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-credential-cache--daemon.xml+ git-credential-cache--daemon.txt && \
-mv git-credential-cache--daemon.xml+ git-credential-cache--daemon.xml
+rm -f git-rev-list.xml+ git-rev-list.xml && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-rev-list.xml+ git-rev-list.txt && \
+mv git-rev-list.xml+ git-rev-list.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-fast-export.xml+ git-fast-export.xml && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-fast-export.xml+ git-fast-export.txt && \
-mv git-fast-export.xml+ git-fast-export.xml
+rm -f git-diff.xml+ git-diff.xml && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-diff.xml+ git-diff.txt && \
+mv git-diff.xml+ git-diff.xml
+make[2]: Leaving directory '/build/git-2.20.1/Documentation'
+make[2]: Entering directory '/build/git-2.20.1/Documentation'
+rm -f git-hash-object.xml+ git-hash-object.xml && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-hash-object.xml+ git-hash-object.txt && \
+mv git-hash-object.xml+ git-hash-object.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-http-fetch.xml+ git-http-fetch.xml && \
@@ -4361,14 +4381,24 @@
 mv git-http-fetch.xml+ git-http-fetch.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-diff.xml+ git-diff.xml && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-diff.xml+ git-diff.txt && \
-mv git-diff.xml+ git-diff.xml
+rm -f git-stage.xml+ git-stage.xml && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-stage.xml+ git-stage.txt && \
+mv git-stage.xml+ git-stage.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-fmt-merge-msg.xml+ git-fmt-merge-msg.xml && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-fmt-merge-msg.xml+ git-fmt-merge-msg.txt && \
-mv git-fmt-merge-msg.xml+ git-fmt-merge-msg.xml
+rm -f git-credential-cache--daemon.xml+ git-credential-cache--daemon.xml && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-credential-cache--daemon.xml+ git-credential-cache--daemon.txt && \
+mv git-credential-cache--daemon.xml+ git-credential-cache--daemon.xml
+make[2]: Leaving directory '/build/git-2.20.1/Documentation'
+make[2]: Entering directory '/build/git-2.20.1/Documentation'
+rm -f git-cherry-pick.xml+ git-cherry-pick.xml && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-cherry-pick.xml+ git-cherry-pick.txt && \
+mv git-cherry-pick.xml+ git-cherry-pick.xml
+make[2]: Leaving directory '/build/git-2.20.1/Documentation'
+make[2]: Entering directory '/build/git-2.20.1/Documentation'
+rm -f git-fetch.xml+ git-fetch.xml && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-fetch.xml+ git-fetch.txt && \
+mv git-fetch.xml+ git-fetch.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-update-server-info.xml+ git-update-server-info.xml && \
@@ -4376,19 +4406,14 @@
 mv git-update-server-info.xml+ git-update-server-info.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-checkout-index.xml+ git-checkout-index.xml && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-checkout-index.xml+ git-checkout-index.txt && \
-mv git-checkout-index.xml+ git-checkout-index.xml
-make[2]: Leaving directory '/build/git-2.20.1/Documentation'
-make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-mktag.xml+ git-mktag.xml && \
 TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-mktag.xml+ git-mktag.txt && \
 mv git-mktag.xml+ git-mktag.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-diff-files.xml+ git-diff-files.xml && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-diff-files.xml+ git-diff-files.txt && \
-mv git-diff-files.xml+ git-diff-files.xml
+rm -f git-fmt-merge-msg.xml+ git-fmt-merge-msg.xml && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-fmt-merge-msg.xml+ git-fmt-merge-msg.txt && \
+mv git-fmt-merge-msg.xml+ git-fmt-merge-msg.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-verify-tag.xml+ git-verify-tag.xml && \
@@ -4396,31 +4421,46 @@
 mv git-verify-tag.xml+ git-verify-tag.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
+rm -f git-checkout-index.xml+ git-checkout-index.xml && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-checkout-index.xml+ git-checkout-index.txt && \
+mv git-checkout-index.xml+ git-checkout-index.xml
+make[2]: Leaving directory '/build/git-2.20.1/Documentation'
+make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-show-ref.xml+ git-show-ref.xml && \
 TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-show-ref.xml+ git-show-ref.txt && \
 mv git-show-ref.xml+ git-show-ref.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
+rm -f git-diff-files.xml+ git-diff-files.xml && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-diff-files.xml+ git-diff-files.txt && \
+mv git-diff-files.xml+ git-diff-files.xml
+make[2]: Leaving directory '/build/git-2.20.1/Documentation'
+make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-http-push.xml+ git-http-push.xml && \
 TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-http-push.xml+ git-http-push.txt && \
 mv git-http-push.xml+ git-http-push.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-fsck-objects.xml+ git-fsck-objects.xml && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-fsck-objects.xml+ git-fsck-objects.txt && \
-mv git-fsck-objects.xml+ git-fsck-objects.xml
-make[2]: Leaving directory '/build/git-2.20.1/Documentation'
-make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-citool.xml+ git-citool.xml && \
 TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-citool.xml+ git-citool.txt && \
 mv git-citool.xml+ git-citool.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
+rm -f git-fsck-objects.xml+ git-fsck-objects.xml && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-fsck-objects.xml+ git-fsck-objects.txt && \
+mv git-fsck-objects.xml+ git-fsck-objects.xml
+make[2]: Leaving directory '/build/git-2.20.1/Documentation'
+make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-check-attr.xml+ git-check-attr.xml && \
 TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-check-attr.xml+ git-check-attr.txt && \
 mv git-check-attr.xml+ git-check-attr.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
+rm -f git-push.xml+ git-push.xml && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-push.xml+ git-push.txt && \
+mv git-push.xml+ git-push.xml
+make[2]: Leaving directory '/build/git-2.20.1/Documentation'
+make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-remote-fd.xml+ git-remote-fd.xml && \
 TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-remote-fd.xml+ git-remote-fd.txt && \
 mv git-remote-fd.xml+ git-remote-fd.xml
@@ -4431,9 +4471,14 @@
 mv git-show-branch.xml+ git-show-branch.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-push.xml+ git-push.xml && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-push.xml+ git-push.txt && \
-mv git-push.xml+ git-push.xml
+rm -f git-cvsserver.xml+ git-cvsserver.xml && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-cvsserver.xml+ git-cvsserver.txt && \
+mv git-cvsserver.xml+ git-cvsserver.xml
+make[2]: Leaving directory '/build/git-2.20.1/Documentation'
+make[2]: Entering directory '/build/git-2.20.1/Documentation'
+rm -f git-merge-base.xml+ git-merge-base.xml && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-merge-base.xml+ git-merge-base.txt && \
+mv git-merge-base.xml+ git-merge-base.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-remote-testgit.xml+ git-remote-testgit.xml && \
@@ -4441,26 +4486,21 @@
 mv git-remote-testgit.xml+ git-remote-testgit.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-cvsserver.xml+ git-cvsserver.xml && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-cvsserver.xml+ git-cvsserver.txt && \
-mv git-cvsserver.xml+ git-cvsserver.xml
-make[2]: Leaving directory '/build/git-2.20.1/Documentation'
-make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-notes.xml+ git-notes.xml && \
 TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-notes.xml+ git-notes.txt && \
 mv git-notes.xml+ git-notes.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
+rm -f git-pull.xml+ git-pull.xml && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-pull.xml+ git-pull.txt && \
+mv git-pull.xml+ git-pull.xml
+make[2]: Leaving directory '/build/git-2.20.1/Documentation'
+make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-unpack-objects.xml+ git-unpack-objects.xml && \
 TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-unpack-objects.xml+ git-unpack-objects.txt && \
 mv git-unpack-objects.xml+ git-unpack-objects.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-merge-base.xml+ git-merge-base.xml && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-merge-base.xml+ git-merge-base.txt && \
-mv git-merge-base.xml+ git-merge-base.xml
-make[2]: Leaving directory '/build/git-2.20.1/Documentation'
-make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-verify-pack.xml+ git-verify-pack.xml && \
 TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-verify-pack.xml+ git-verify-pack.txt && \
 mv git-verify-pack.xml+ git-verify-pack.xml
@@ -4471,11 +4511,6 @@
 mv git-show-index.xml+ git-show-index.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-merge-file.xml+ git-merge-file.xml && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-merge-file.xml+ git-merge-file.txt && \
-mv git-merge-file.xml+ git-merge-file.xml
-make[2]: Leaving directory '/build/git-2.20.1/Documentation'
-make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-credential-cache.xml+ git-credential-cache.xml && \
 TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-credential-cache.xml+ git-credential-cache.txt && \
 mv git-credential-cache.xml+ git-credential-cache.xml
@@ -4486,9 +4521,9 @@
 mv git-sh-i18n--envsubst.xml+ git-sh-i18n--envsubst.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-ls-remote.xml+ git-ls-remote.xml && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-ls-remote.xml+ git-ls-remote.txt && \
-mv git-ls-remote.xml+ git-ls-remote.xml
+rm -f git-svn.xml+ git-svn.xml && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-svn.xml+ git-svn.txt && \
+mv git-svn.xml+ git-svn.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-imap-send.xml+ git-imap-send.xml && \
@@ -4496,6 +4531,16 @@
 mv git-imap-send.xml+ git-imap-send.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
+rm -f git-merge-file.xml+ git-merge-file.xml && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-merge-file.xml+ git-merge-file.txt && \
+mv git-merge-file.xml+ git-merge-file.xml
+make[2]: Leaving directory '/build/git-2.20.1/Documentation'
+make[2]: Entering directory '/build/git-2.20.1/Documentation'
+rm -f git-ls-remote.xml+ git-ls-remote.xml && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-ls-remote.xml+ git-ls-remote.txt && \
+mv git-ls-remote.xml+ git-ls-remote.xml
+make[2]: Leaving directory '/build/git-2.20.1/Documentation'
+make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-interpret-trailers.xml+ git-interpret-trailers.xml && \
 TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-interpret-trailers.xml+ git-interpret-trailers.txt && \
 mv git-interpret-trailers.xml+ git-interpret-trailers.xml
@@ -4506,49 +4551,39 @@
 mv git-commit.xml+ git-commit.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-pull.xml+ git-pull.xml && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-pull.xml+ git-pull.txt && \
-mv git-pull.xml+ git-pull.xml
-make[2]: Leaving directory '/build/git-2.20.1/Documentation'
-make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-config.xml+ git-config.xml && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-config.xml+ git-config.txt && \
-mv git-config.xml+ git-config.xml
-make[2]: Leaving directory '/build/git-2.20.1/Documentation'
-make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-credential.xml+ git-credential.xml && \
 TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-credential.xml+ git-credential.txt && \
 mv git-credential.xml+ git-credential.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-reflog.xml+ git-reflog.xml && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-reflog.xml+ git-reflog.txt && \
-mv git-reflog.xml+ git-reflog.xml
-make[2]: Leaving directory '/build/git-2.20.1/Documentation'
-make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-archimport.xml+ git-archimport.xml && \
 TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-archimport.xml+ git-archimport.txt && \
 mv git-archimport.xml+ git-archimport.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-svn.xml+ git-svn.xml && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-svn.xml+ git-svn.txt && \
-mv git-svn.xml+ git-svn.xml
-make[2]: Leaving directory '/build/git-2.20.1/Documentation'
-make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-prune-packed.xml+ git-prune-packed.xml && \
 TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-prune-packed.xml+ git-prune-packed.txt && \
 mv git-prune-packed.xml+ git-prune-packed.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
+rm -f git-checkout.xml+ git-checkout.xml && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-checkout.xml+ git-checkout.txt && \
+mv git-checkout.xml+ git-checkout.xml
+make[2]: Leaving directory '/build/git-2.20.1/Documentation'
+make[2]: Entering directory '/build/git-2.20.1/Documentation'
+rm -f git-reflog.xml+ git-reflog.xml && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-reflog.xml+ git-reflog.txt && \
+mv git-reflog.xml+ git-reflog.xml
+make[2]: Leaving directory '/build/git-2.20.1/Documentation'
+make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-var.xml+ git-var.xml && \
 TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-var.xml+ git-var.txt && \
 mv git-var.xml+ git-var.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-checkout.xml+ git-checkout.xml && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-checkout.xml+ git-checkout.txt && \
-mv git-checkout.xml+ git-checkout.xml
+rm -f git-status.xml+ git-status.xml && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-status.xml+ git-status.txt && \
+mv git-status.xml+ git-status.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-merge-one-file.xml+ git-merge-one-file.xml && \
@@ -4556,19 +4591,24 @@
 mv git-merge-one-file.xml+ git-merge-one-file.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
+rm -f git-show.xml+ git-show.xml && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-show.xml+ git-show.txt && \
+mv git-show.xml+ git-show.xml
+make[2]: Leaving directory '/build/git-2.20.1/Documentation'
+make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-stash.xml+ git-stash.xml && \
 TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-stash.xml+ git-stash.txt && \
 mv git-stash.xml+ git-stash.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-status.xml+ git-status.xml && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-status.xml+ git-status.txt && \
-mv git-status.xml+ git-status.xml
+rm -f git-replace.xml+ git-replace.xml && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-replace.xml+ git-replace.txt && \
+mv git-replace.xml+ git-replace.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-filter-branch.xml+ git-filter-branch.xml && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-filter-branch.xml+ git-filter-branch.txt && \
-mv git-filter-branch.xml+ git-filter-branch.xml
+rm -f git-shell.xml+ git-shell.xml && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-shell.xml+ git-shell.txt && \
+mv git-shell.xml+ git-shell.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-http-backend.xml+ git-http-backend.xml && \
@@ -4576,19 +4616,14 @@
 mv git-http-backend.xml+ git-http-backend.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-replace.xml+ git-replace.xml && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-replace.xml+ git-replace.txt && \
-mv git-replace.xml+ git-replace.xml
-make[2]: Leaving directory '/build/git-2.20.1/Documentation'
-make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-for-each-ref.xml+ git-for-each-ref.xml && \
 TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-for-each-ref.xml+ git-for-each-ref.txt && \
 mv git-for-each-ref.xml+ git-for-each-ref.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-worktree.xml+ git-worktree.xml && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-worktree.xml+ git-worktree.txt && \
-mv git-worktree.xml+ git-worktree.xml
+rm -f git-filter-branch.xml+ git-filter-branch.xml && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-filter-branch.xml+ git-filter-branch.txt && \
+mv git-filter-branch.xml+ git-filter-branch.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-receive-pack.xml+ git-receive-pack.xml && \
@@ -4596,29 +4631,29 @@
 mv git-receive-pack.xml+ git-receive-pack.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-shell.xml+ git-shell.xml && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-shell.xml+ git-shell.txt && \
-mv git-shell.xml+ git-shell.xml
-make[2]: Leaving directory '/build/git-2.20.1/Documentation'
-make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-read-tree.xml+ git-read-tree.xml && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-read-tree.xml+ git-read-tree.txt && \
-mv git-read-tree.xml+ git-read-tree.xml
-make[2]: Leaving directory '/build/git-2.20.1/Documentation'
-make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-branch.xml+ git-branch.xml && \
 TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-branch.xml+ git-branch.txt && \
 mv git-branch.xml+ git-branch.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
+rm -f gitk.xml+ gitk.xml && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o gitk.xml+ gitk.txt && \
+mv gitk.xml+ gitk.xml
+make[2]: Leaving directory '/build/git-2.20.1/Documentation'
+make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-diff-tree.xml+ git-diff-tree.xml && \
 TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-diff-tree.xml+ git-diff-tree.txt && \
 mv git-diff-tree.xml+ git-diff-tree.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f gitk.xml+ gitk.xml && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o gitk.xml+ gitk.txt && \
-mv gitk.xml+ gitk.xml
+rm -f git-worktree.xml+ git-worktree.xml && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-worktree.xml+ git-worktree.txt && \
+mv git-worktree.xml+ git-worktree.xml
+make[2]: Leaving directory '/build/git-2.20.1/Documentation'
+make[2]: Entering directory '/build/git-2.20.1/Documentation'
+rm -f git-read-tree.xml+ git-read-tree.xml && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-read-tree.xml+ git-read-tree.txt && \
+mv git-read-tree.xml+ git-read-tree.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f gitignore.xml+ gitignore.xml && \
@@ -4631,14 +4666,9 @@
 mv gitmodules.xml+ gitmodules.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-show.xml+ git-show.xml && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-show.xml+ git-show.txt && \
-mv git-show.xml+ git-show.xml
-make[2]: Leaving directory '/build/git-2.20.1/Documentation'
-make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f gitcli.xml+ gitcli.xml && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o gitcli.xml+ gitcli.txt && \
-mv gitcli.xml+ gitcli.xml
+rm -f git-format-patch.xml+ git-format-patch.xml && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-format-patch.xml+ git-format-patch.txt && \
+mv git-format-patch.xml+ git-format-patch.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f gitweb.xml+ gitweb.xml && \
@@ -4646,19 +4676,14 @@
 mv gitweb.xml+ gitweb.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f gitremote-helpers.xml+ gitremote-helpers.xml && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o gitremote-helpers.xml+ gitremote-helpers.txt && \
-mv gitremote-helpers.xml+ gitremote-helpers.xml
-make[2]: Leaving directory '/build/git-2.20.1/Documentation'
-make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-format-patch.xml+ git-format-patch.xml && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-format-patch.xml+ git-format-patch.txt && \
-mv git-format-patch.xml+ git-format-patch.xml
+rm -f gitcli.xml+ gitcli.xml && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o gitcli.xml+ gitcli.txt && \
+mv gitcli.xml+ gitcli.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f githooks.xml+ githooks.xml && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o githooks.xml+ githooks.txt && \
-mv githooks.xml+ githooks.xml
+rm -f gitrepository-layout.xml+ gitrepository-layout.xml && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o gitrepository-layout.xml+ gitrepository-layout.txt && \
+mv gitrepository-layout.xml+ gitrepository-layout.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f gitcredentials.xml+ gitcredentials.xml && \
@@ -4666,14 +4691,14 @@
 mv gitcredentials.xml+ gitcredentials.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f gitdiffcore.xml+ gitdiffcore.xml && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o gitdiffcore.xml+ gitdiffcore.txt && \
-mv gitdiffcore.xml+ gitdiffcore.xml
+rm -f githooks.xml+ githooks.xml && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o githooks.xml+ githooks.txt && \
+mv githooks.xml+ githooks.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f gitrepository-layout.xml+ gitrepository-layout.xml && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o gitrepository-layout.xml+ gitrepository-layout.txt && \
-mv gitrepository-layout.xml+ gitrepository-layout.xml
+rm -f gitremote-helpers.xml+ gitremote-helpers.xml && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o gitremote-helpers.xml+ gitremote-helpers.txt && \
+mv gitremote-helpers.xml+ gitremote-helpers.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f gitcvs-migration.xml+ gitcvs-migration.xml && \
@@ -4681,19 +4706,19 @@
 mv gitcvs-migration.xml+ gitcvs-migration.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
+rm -f gitdiffcore.xml+ gitdiffcore.xml && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o gitdiffcore.xml+ gitdiffcore.txt && \
+mv gitdiffcore.xml+ gitdiffcore.xml
+make[2]: Leaving directory '/build/git-2.20.1/Documentation'
+make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f gitnamespaces.xml+ gitnamespaces.xml && \
 TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o gitnamespaces.xml+ gitnamespaces.txt && \
 mv gitnamespaces.xml+ gitnamespaces.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f gitattributes.xml+ gitattributes.xml && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o gitattributes.xml+ gitattributes.txt && \
-mv gitattributes.xml+ gitattributes.xml
-make[2]: Leaving directory '/build/git-2.20.1/Documentation'
-make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-patch-id.html+ git-patch-id.html && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-patch-id.html+ git-patch-id.txt && \
-mv git-patch-id.html+ git-patch-id.html
+rm -f git-config.xml+ git-config.xml && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-config.xml+ git-config.txt && \
+mv git-config.xml+ git-config.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f gitsubmodules.xml+ gitsubmodules.xml && \
@@ -4706,34 +4731,44 @@
 mv giteveryday.xml+ giteveryday.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-fast-import.xml+ git-fast-import.xml && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-fast-import.xml+ git-fast-import.txt && \
-mv git-fast-import.xml+ git-fast-import.xml
-make[2]: Leaving directory '/build/git-2.20.1/Documentation'
-make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-init-db.html+ git-init-db.html && \
 TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-init-db.html+ git-init-db.txt && \
 mv git-init-db.html+ git-init-db.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
+rm -f git-patch-id.html+ git-patch-id.html && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-patch-id.html+ git-patch-id.txt && \
+mv git-patch-id.html+ git-patch-id.html
+make[2]: Leaving directory '/build/git-2.20.1/Documentation'
+make[2]: Entering directory '/build/git-2.20.1/Documentation'
+rm -f gitrevisions.xml+ gitrevisions.xml && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o gitrevisions.xml+ gitrevisions.txt && \
+mv gitrevisions.xml+ gitrevisions.xml
+make[2]: Leaving directory '/build/git-2.20.1/Documentation'
+make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f gittutorial-2.xml+ gittutorial-2.xml && \
 TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o gittutorial-2.xml+ gittutorial-2.txt && \
 mv gittutorial-2.xml+ gittutorial-2.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
+rm -f gitattributes.xml+ gitattributes.xml && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o gitattributes.xml+ gitattributes.txt && \
+mv gitattributes.xml+ gitattributes.xml
+make[2]: Leaving directory '/build/git-2.20.1/Documentation'
+make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-pack-refs.html+ git-pack-refs.html && \
 TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-pack-refs.html+ git-pack-refs.txt && \
 mv git-pack-refs.html+ git-pack-refs.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f gitweb.conf.xml+ gitweb.conf.xml && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o gitweb.conf.xml+ gitweb.conf.txt && \
-mv gitweb.conf.xml+ gitweb.conf.xml
+rm -f git-fast-import.xml+ git-fast-import.xml && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-fast-import.xml+ git-fast-import.txt && \
+mv git-fast-import.xml+ git-fast-import.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f gitrevisions.xml+ gitrevisions.xml && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o gitrevisions.xml+ gitrevisions.txt && \
-mv gitrevisions.xml+ gitrevisions.xml
+rm -f git-revert.html+ git-revert.html && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-revert.html+ git-revert.txt && \
+mv git-revert.html+ git-revert.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f gitworkflows.xml+ gitworkflows.xml && \
@@ -4741,14 +4776,19 @@
 mv gitworkflows.xml+ gitworkflows.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
+rm -f gittutorial.xml+ gittutorial.xml && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o gittutorial.xml+ gittutorial.txt && \
+mv gittutorial.xml+ gittutorial.xml
+make[2]: Leaving directory '/build/git-2.20.1/Documentation'
+make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-sh-setup.html+ git-sh-setup.html && \
 TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-sh-setup.html+ git-sh-setup.txt && \
 mv git-sh-setup.html+ git-sh-setup.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-commit-tree.html+ git-commit-tree.html && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-commit-tree.html+ git-commit-tree.txt && \
-mv git-commit-tree.html+ git-commit-tree.html
+rm -f git.xml+ git.xml && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git.xml+ git.txt && \
+mv git.xml+ git.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-get-tar-commit-id.html+ git-get-tar-commit-id.html && \
@@ -4756,39 +4796,39 @@
 mv git-get-tar-commit-id.html+ git-get-tar-commit-id.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-check-ignore.html+ git-check-ignore.html && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-check-ignore.html+ git-check-ignore.txt && \
-mv git-check-ignore.html+ git-check-ignore.html
+rm -f git-add.html+ git-add.html && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-add.html+ git-add.txt && \
+mv git-add.html+ git-add.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f gitglossary.xml+ gitglossary.xml && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o gitglossary.xml+ gitglossary.txt && \
-mv gitglossary.xml+ gitglossary.xml
+rm -f git-commit-tree.html+ git-commit-tree.html && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-commit-tree.html+ git-commit-tree.txt && \
+mv git-commit-tree.html+ git-commit-tree.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f gittutorial.xml+ gittutorial.xml && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o gittutorial.xml+ gittutorial.txt && \
-mv gittutorial.xml+ gittutorial.xml
+rm -f gitweb.conf.xml+ gitweb.conf.xml && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o gitweb.conf.xml+ gitweb.conf.txt && \
+mv gitweb.conf.xml+ gitweb.conf.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-revert.html+ git-revert.html && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-revert.html+ git-revert.txt && \
-mv git-revert.html+ git-revert.html
+rm -f git-commit-graph.html+ git-commit-graph.html && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-commit-graph.html+ git-commit-graph.txt && \
+mv git-commit-graph.html+ git-commit-graph.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-add.html+ git-add.html && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-add.html+ git-add.txt && \
-mv git-add.html+ git-add.html
+rm -f git-check-ignore.html+ git-check-ignore.html && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-check-ignore.html+ git-check-ignore.txt && \
+mv git-check-ignore.html+ git-check-ignore.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-rm.html+ git-rm.html && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-rm.html+ git-rm.txt && \
-mv git-rm.html+ git-rm.html
+rm -f git-index-pack.html+ git-index-pack.html && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-index-pack.html+ git-index-pack.txt && \
+mv git-index-pack.html+ git-index-pack.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-archive.html+ git-archive.html && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-archive.html+ git-archive.txt && \
-mv git-archive.html+ git-archive.html
+rm -f gitglossary.xml+ gitglossary.xml && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o gitglossary.xml+ gitglossary.txt && \
+mv gitglossary.xml+ gitglossary.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-count-objects.html+ git-count-objects.html && \
@@ -4796,24 +4836,24 @@
 mv git-count-objects.html+ git-count-objects.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git.xml+ git.xml && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git.xml+ git.txt && \
-mv git.xml+ git.xml
-make[2]: Leaving directory '/build/git-2.20.1/Documentation'
-make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-gui.html+ git-gui.html && \
 TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-gui.html+ git-gui.txt && \
 mv git-gui.html+ git-gui.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-commit-graph.html+ git-commit-graph.html && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-commit-graph.html+ git-commit-graph.txt && \
-mv git-commit-graph.html+ git-commit-graph.html
+rm -f git-rm.html+ git-rm.html && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-rm.html+ git-rm.txt && \
+mv git-rm.html+ git-rm.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-index-pack.html+ git-index-pack.html && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-index-pack.html+ git-index-pack.txt && \
-mv git-index-pack.html+ git-index-pack.html
+rm -f git-mailsplit.html+ git-mailsplit.html && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-mailsplit.html+ git-mailsplit.txt && \
+mv git-mailsplit.html+ git-mailsplit.html
+make[2]: Leaving directory '/build/git-2.20.1/Documentation'
+make[2]: Entering directory '/build/git-2.20.1/Documentation'
+rm -f git-archive.html+ git-archive.html && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-archive.html+ git-archive.txt && \
+mv git-archive.html+ git-archive.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-mv.html+ git-mv.html && \
@@ -4826,9 +4866,9 @@
 mv git-gc.html+ git-gc.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-mailsplit.html+ git-mailsplit.html && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-mailsplit.html+ git-mailsplit.txt && \
-mv git-mailsplit.html+ git-mailsplit.html
+rm -f gitcore-tutorial.xml+ gitcore-tutorial.xml && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o gitcore-tutorial.xml+ gitcore-tutorial.txt && \
+mv gitcore-tutorial.xml+ gitcore-tutorial.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-bundle.html+ git-bundle.html && \
@@ -4836,11 +4876,6 @@
 mv git-bundle.html+ git-bundle.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f gitcore-tutorial.xml+ gitcore-tutorial.xml && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o gitcore-tutorial.xml+ gitcore-tutorial.txt && \
-mv gitcore-tutorial.xml+ gitcore-tutorial.xml
-make[2]: Leaving directory '/build/git-2.20.1/Documentation'
-make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-repack.html+ git-repack.html && \
 TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-repack.html+ git-repack.txt && \
 mv git-repack.html+ git-repack.html
@@ -4856,19 +4891,19 @@
 mv git-ls-files.html+ git-ls-files.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
+rm -f git-upload-pack.html+ git-upload-pack.html && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-upload-pack.html+ git-upload-pack.txt && \
+mv git-upload-pack.html+ git-upload-pack.html
+make[2]: Leaving directory '/build/git-2.20.1/Documentation'
+make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-am.html+ git-am.html && \
 TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-am.html+ git-am.txt && \
 mv git-am.html+ git-am.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-prune.html+ git-prune.html && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-prune.html+ git-prune.txt && \
-mv git-prune.html+ git-prune.html
-make[2]: Leaving directory '/build/git-2.20.1/Documentation'
-make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-upload-pack.html+ git-upload-pack.html && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-upload-pack.html+ git-upload-pack.txt && \
-mv git-upload-pack.html+ git-upload-pack.html
+rm -f git-blame.html+ git-blame.html && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-blame.html+ git-blame.txt && \
+mv git-blame.html+ git-blame.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-apply.html+ git-apply.html && \
@@ -4876,14 +4911,9 @@
 mv git-apply.html+ git-apply.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-fsck.html+ git-fsck.html && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-fsck.html+ git-fsck.txt && \
-mv git-fsck.html+ git-fsck.html
-make[2]: Leaving directory '/build/git-2.20.1/Documentation'
-make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-log.xml+ git-log.xml && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-log.xml+ git-log.txt && \
-mv git-log.xml+ git-log.xml
+rm -f git-mergetool--lib.html+ git-mergetool--lib.html && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-mergetool--lib.html+ git-mergetool--lib.txt && \
+mv git-mergetool--lib.html+ git-mergetool--lib.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-shortlog.html+ git-shortlog.html && \
@@ -4891,24 +4921,24 @@
 mv git-shortlog.html+ git-shortlog.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
+rm -f git-prune.html+ git-prune.html && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-prune.html+ git-prune.txt && \
+mv git-prune.html+ git-prune.html
+make[2]: Leaving directory '/build/git-2.20.1/Documentation'
+make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-stripspace.html+ git-stripspace.html && \
 TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-stripspace.html+ git-stripspace.txt && \
 mv git-stripspace.html+ git-stripspace.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-mergetool--lib.html+ git-mergetool--lib.html && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-mergetool--lib.html+ git-mergetool--lib.txt && \
-mv git-mergetool--lib.html+ git-mergetool--lib.html
-make[2]: Leaving directory '/build/git-2.20.1/Documentation'
-make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-blame.html+ git-blame.html && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-blame.html+ git-blame.txt && \
-mv git-blame.html+ git-blame.html
+rm -f git-fsck.html+ git-fsck.html && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-fsck.html+ git-fsck.txt && \
+mv git-fsck.html+ git-fsck.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-clone.html+ git-clone.html && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-clone.html+ git-clone.txt && \
-mv git-clone.html+ git-clone.html
+rm -f git-log.xml+ git-log.xml && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d manpage -o git-log.xml+ git-log.txt && \
+mv git-log.xml+ git-log.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-fetch-pack.html+ git-fetch-pack.html && \
@@ -4916,24 +4946,29 @@
 mv git-fetch-pack.html+ git-fetch-pack.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-request-pull.html+ git-request-pull.html && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-request-pull.html+ git-request-pull.txt && \
-mv git-request-pull.html+ git-request-pull.html
-make[2]: Leaving directory '/build/git-2.20.1/Documentation'
-make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-mergetool.html+ git-mergetool.html && \
 TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-mergetool.html+ git-mergetool.txt && \
 mv git-mergetool.html+ git-mergetool.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
+rm -f git-p4.html+ git-p4.html && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-p4.html+ git-p4.txt && \
+mv git-p4.html+ git-p4.html
+make[2]: Leaving directory '/build/git-2.20.1/Documentation'
+make[2]: Entering directory '/build/git-2.20.1/Documentation'
+rm -f git-clone.html+ git-clone.html && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-clone.html+ git-clone.txt && \
+mv git-clone.html+ git-clone.html
+make[2]: Leaving directory '/build/git-2.20.1/Documentation'
+make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-write-tree.html+ git-write-tree.html && \
 TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-write-tree.html+ git-write-tree.txt && \
 mv git-write-tree.html+ git-write-tree.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-parse-remote.html+ git-parse-remote.html && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-parse-remote.html+ git-parse-remote.txt && \
-mv git-parse-remote.html+ git-parse-remote.html
+rm -f git-request-pull.html+ git-request-pull.html && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-request-pull.html+ git-request-pull.txt && \
+mv git-request-pull.html+ git-request-pull.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-column.html+ git-column.html && \
@@ -4941,6 +4976,16 @@
 mv git-column.html+ git-column.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
+rm -f git-multi-pack-index.html+ git-multi-pack-index.html && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-multi-pack-index.html+ git-multi-pack-index.txt && \
+mv git-multi-pack-index.html+ git-multi-pack-index.html
+make[2]: Leaving directory '/build/git-2.20.1/Documentation'
+make[2]: Entering directory '/build/git-2.20.1/Documentation'
+rm -f git-parse-remote.html+ git-parse-remote.html && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-parse-remote.html+ git-parse-remote.txt && \
+mv git-parse-remote.html+ git-parse-remote.html
+make[2]: Leaving directory '/build/git-2.20.1/Documentation'
+make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-difftool.html+ git-difftool.html && \
 TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-difftool.html+ git-difftool.txt && \
 mv git-difftool.html+ git-difftool.html
@@ -4951,14 +4996,9 @@
 mv git-send-email.html+ git-send-email.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-multi-pack-index.html+ git-multi-pack-index.html && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-multi-pack-index.html+ git-multi-pack-index.txt && \
-mv git-multi-pack-index.html+ git-multi-pack-index.html
-make[2]: Leaving directory '/build/git-2.20.1/Documentation'
-make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-p4.html+ git-p4.html && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-p4.html+ git-p4.txt && \
-mv git-p4.html+ git-p4.html
+rm -f git-ls-tree.html+ git-ls-tree.html && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-ls-tree.html+ git-ls-tree.txt && \
+mv git-ls-tree.html+ git-ls-tree.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-daemon.html+ git-daemon.html && \
@@ -4966,31 +5006,21 @@
 mv git-daemon.html+ git-daemon.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-cat-file.html+ git-cat-file.html && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-cat-file.html+ git-cat-file.txt && \
-mv git-cat-file.html+ git-cat-file.html
-make[2]: Leaving directory '/build/git-2.20.1/Documentation'
-make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-ls-tree.html+ git-ls-tree.html && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-ls-tree.html+ git-ls-tree.txt && \
-mv git-ls-tree.html+ git-ls-tree.html
-make[2]: Leaving directory '/build/git-2.20.1/Documentation'
-make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-web--browse.html+ git-web--browse.html && \
 TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-web--browse.html+ git-web--browse.txt && \
 mv git-web--browse.html+ git-web--browse.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
+rm -f git-cat-file.html+ git-cat-file.html && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-cat-file.html+ git-cat-file.txt && \
+mv git-cat-file.html+ git-cat-file.html
+make[2]: Leaving directory '/build/git-2.20.1/Documentation'
+make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-pack-objects.html+ git-pack-objects.html && \
 TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-pack-objects.html+ git-pack-objects.txt && \
 mv git-pack-objects.html+ git-pack-objects.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-send-pack.html+ git-send-pack.html && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-send-pack.html+ git-send-pack.txt && \
-mv git-send-pack.html+ git-send-pack.html
-make[2]: Leaving directory '/build/git-2.20.1/Documentation'
-make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-unpack-file.html+ git-unpack-file.html && \
 TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-unpack-file.html+ git-unpack-file.txt && \
 mv git-unpack-file.html+ git-unpack-file.html
@@ -5001,29 +5031,24 @@
 mv git-merge.html+ git-merge.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
+rm -f git-send-pack.html+ git-send-pack.html && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-send-pack.html+ git-send-pack.txt && \
+mv git-send-pack.html+ git-send-pack.html
+make[2]: Leaving directory '/build/git-2.20.1/Documentation'
+make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-name-rev.html+ git-name-rev.html && \
 TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-name-rev.html+ git-name-rev.txt && \
 mv git-name-rev.html+ git-name-rev.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-annotate.html+ git-annotate.html && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-annotate.html+ git-annotate.txt && \
-mv git-annotate.html+ git-annotate.html
-make[2]: Leaving directory '/build/git-2.20.1/Documentation'
-make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-reset.html+ git-reset.html && \
 TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-reset.html+ git-reset.txt && \
 mv git-reset.html+ git-reset.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-check-mailmap.html+ git-check-mailmap.html && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-check-mailmap.html+ git-check-mailmap.txt && \
-mv git-check-mailmap.html+ git-check-mailmap.html
-make[2]: Leaving directory '/build/git-2.20.1/Documentation'
-make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-check-ref-format.html+ git-check-ref-format.html && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-check-ref-format.html+ git-check-ref-format.txt && \
-mv git-check-ref-format.html+ git-check-ref-format.html
+rm -f git-annotate.html+ git-annotate.html && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-annotate.html+ git-annotate.txt && \
+mv git-annotate.html+ git-annotate.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-cvsexportcommit.html+ git-cvsexportcommit.html && \
@@ -5031,14 +5056,19 @@
 mv git-cvsexportcommit.html+ git-cvsexportcommit.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
+rm -f git-check-mailmap.html+ git-check-mailmap.html && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-check-mailmap.html+ git-check-mailmap.txt && \
+mv git-check-mailmap.html+ git-check-mailmap.html
+make[2]: Leaving directory '/build/git-2.20.1/Documentation'
+make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-merge-tree.html+ git-merge-tree.html && \
 TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-merge-tree.html+ git-merge-tree.txt && \
 mv git-merge-tree.html+ git-merge-tree.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-update-index.html+ git-update-index.html && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-update-index.html+ git-update-index.txt && \
-mv git-update-index.html+ git-update-index.html
+rm -f git-check-ref-format.html+ git-check-ref-format.html && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-check-ref-format.html+ git-check-ref-format.txt && \
+mv git-check-ref-format.html+ git-check-ref-format.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-symbolic-ref.html+ git-symbolic-ref.html && \
@@ -5046,19 +5076,19 @@
 mv git-symbolic-ref.html+ git-symbolic-ref.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-grep.html+ git-grep.html && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-grep.html+ git-grep.txt && \
-mv git-grep.html+ git-grep.html
-make[2]: Leaving directory '/build/git-2.20.1/Documentation'
-make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-update-ref.html+ git-update-ref.html && \
 TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-update-ref.html+ git-update-ref.txt && \
 mv git-update-ref.html+ git-update-ref.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-rerere.html+ git-rerere.html && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-rerere.html+ git-rerere.txt && \
-mv git-rerere.html+ git-rerere.html
+rm -f git-update-index.html+ git-update-index.html && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-update-index.html+ git-update-index.txt && \
+mv git-update-index.html+ git-update-index.html
+make[2]: Leaving directory '/build/git-2.20.1/Documentation'
+make[2]: Entering directory '/build/git-2.20.1/Documentation'
+rm -f git-grep.html+ git-grep.html && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-grep.html+ git-grep.txt && \
+mv git-grep.html+ git-grep.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-init.html+ git-init.html && \
@@ -5066,9 +5096,9 @@
 mv git-init.html+ git-init.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-help.html+ git-help.html && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-help.html+ git-help.txt && \
-mv git-help.html+ git-help.html
+rm -f git-rerere.html+ git-rerere.html && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-rerere.html+ git-rerere.txt && \
+mv git-rerere.html+ git-rerere.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-quiltimport.html+ git-quiltimport.html && \
@@ -5081,9 +5111,9 @@
 mv git-whatchanged.html+ git-whatchanged.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-remote-ext.html+ git-remote-ext.html && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-remote-ext.html+ git-remote-ext.txt && \
-mv git-remote-ext.html+ git-remote-ext.html
+rm -f git-help.html+ git-help.html && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-help.html+ git-help.txt && \
+mv git-help.html+ git-help.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-instaweb.html+ git-instaweb.html && \
@@ -5091,14 +5121,19 @@
 mv git-instaweb.html+ git-instaweb.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
+rm -f git-remote-ext.html+ git-remote-ext.html && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-remote-ext.html+ git-remote-ext.txt && \
+mv git-remote-ext.html+ git-remote-ext.html
+make[2]: Leaving directory '/build/git-2.20.1/Documentation'
+make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-submodule.html+ git-submodule.html && \
 TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-submodule.html+ git-submodule.txt && \
 mv git-submodule.html+ git-submodule.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-clean.html+ git-clean.html && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-clean.html+ git-clean.txt && \
-mv git-clean.html+ git-clean.html
+rm -f git-upload-archive.html+ git-upload-archive.html && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-upload-archive.html+ git-upload-archive.txt && \
+mv git-upload-archive.html+ git-upload-archive.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-rev-parse.html+ git-rev-parse.html && \
@@ -5106,9 +5141,9 @@
 mv git-rev-parse.html+ git-rev-parse.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-upload-archive.html+ git-upload-archive.html && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-upload-archive.html+ git-upload-archive.txt && \
-mv git-upload-archive.html+ git-upload-archive.html
+rm -f git-clean.html+ git-clean.html && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-clean.html+ git-clean.txt && \
+mv git-clean.html+ git-clean.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-pack-redundant.html+ git-pack-redundant.html && \
@@ -5121,16 +5156,21 @@
 mv git-mailinfo.html+ git-mailinfo.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
+rm -f git-merge-index.html+ git-merge-index.html && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-merge-index.html+ git-merge-index.txt && \
+mv git-merge-index.html+ git-merge-index.html
+make[2]: Leaving directory '/build/git-2.20.1/Documentation'
+make[2]: Entering directory '/build/git-2.20.1/Documentation'
+rm -f git-rebase.html+ git-rebase.html && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-rebase.html+ git-rebase.txt && \
+mv git-rebase.html+ git-rebase.html
+make[2]: Leaving directory '/build/git-2.20.1/Documentation'
+make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-tag.html+ git-tag.html && \
 TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-tag.html+ git-tag.txt && \
 mv git-tag.html+ git-tag.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-range-diff.html+ git-range-diff.html && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-range-diff.html+ git-range-diff.txt && \
-mv git-range-diff.html+ git-range-diff.html
-make[2]: Leaving directory '/build/git-2.20.1/Documentation'
-make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-remote.html+ git-remote.html && \
 TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-remote.html+ git-remote.txt && \
 mv git-remote.html+ git-remote.html
@@ -5141,14 +5181,9 @@
 mv git-cvsimport.html+ git-cvsimport.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-rebase.html+ git-rebase.html && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-rebase.html+ git-rebase.txt && \
-mv git-rebase.html+ git-rebase.html
-make[2]: Leaving directory '/build/git-2.20.1/Documentation'
-make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-merge-index.html+ git-merge-index.html && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-merge-index.html+ git-merge-index.txt && \
-mv git-merge-index.html+ git-merge-index.html
+rm -f git-describe.html+ git-describe.html && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-describe.html+ git-describe.txt && \
+mv git-describe.html+ git-describe.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-verify-commit.html+ git-verify-commit.html && \
@@ -5156,9 +5191,9 @@
 mv git-verify-commit.html+ git-verify-commit.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-sh-i18n.html+ git-sh-i18n.html && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-sh-i18n.html+ git-sh-i18n.txt && \
-mv git-sh-i18n.html+ git-sh-i18n.html
+rm -f git-range-diff.html+ git-range-diff.html && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-range-diff.html+ git-range-diff.txt && \
+mv git-range-diff.html+ git-range-diff.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-credential-store.html+ git-credential-store.html && \
@@ -5166,14 +5201,14 @@
 mv git-credential-store.html+ git-credential-store.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-bisect.html+ git-bisect.html && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-bisect.html+ git-bisect.txt && \
-mv git-bisect.html+ git-bisect.html
+rm -f git-sh-i18n.html+ git-sh-i18n.html && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-sh-i18n.html+ git-sh-i18n.txt && \
+mv git-sh-i18n.html+ git-sh-i18n.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-rev-list.html+ git-rev-list.html && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-rev-list.html+ git-rev-list.txt && \
-mv git-rev-list.html+ git-rev-list.html
+rm -f git-diff-index.html+ git-diff-index.html && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-diff-index.html+ git-diff-index.txt && \
+mv git-diff-index.html+ git-diff-index.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-mktree.html+ git-mktree.html && \
@@ -5181,19 +5216,9 @@
 mv git-mktree.html+ git-mktree.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-diff.html+ git-diff.html && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-diff.html+ git-diff.txt && \
-mv git-diff.html+ git-diff.html
-make[2]: Leaving directory '/build/git-2.20.1/Documentation'
-make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-describe.html+ git-describe.html && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-describe.html+ git-describe.txt && \
-mv git-describe.html+ git-describe.html
-make[2]: Leaving directory '/build/git-2.20.1/Documentation'
-make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-diff-index.html+ git-diff-index.html && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-diff-index.html+ git-diff-index.txt && \
-mv git-diff-index.html+ git-diff-index.html
+rm -f git-bisect.html+ git-bisect.html && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-bisect.html+ git-bisect.txt && \
+mv git-bisect.html+ git-bisect.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-credential-cache--daemon.html+ git-credential-cache--daemon.html && \
@@ -5201,14 +5226,9 @@
 mv git-credential-cache--daemon.html+ git-credential-cache--daemon.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-cherry-pick.html+ git-cherry-pick.html && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-cherry-pick.html+ git-cherry-pick.txt && \
-mv git-cherry-pick.html+ git-cherry-pick.html
-make[2]: Leaving directory '/build/git-2.20.1/Documentation'
-make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-fetch.html+ git-fetch.html && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-fetch.html+ git-fetch.txt && \
-mv git-fetch.html+ git-fetch.html
+rm -f git-hash-object.html+ git-hash-object.html && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-hash-object.html+ git-hash-object.txt && \
+mv git-hash-object.html+ git-hash-object.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-fast-export.html+ git-fast-export.html && \
@@ -5216,34 +5236,54 @@
 mv git-fast-export.html+ git-fast-export.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-hash-object.html+ git-hash-object.html && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-hash-object.html+ git-hash-object.txt && \
-mv git-hash-object.html+ git-hash-object.html
-make[2]: Leaving directory '/build/git-2.20.1/Documentation'
-make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-http-fetch.html+ git-http-fetch.html && \
 TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-http-fetch.html+ git-http-fetch.txt && \
 mv git-http-fetch.html+ git-http-fetch.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
+rm -f git-cherry-pick.html+ git-cherry-pick.html && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-cherry-pick.html+ git-cherry-pick.txt && \
+mv git-cherry-pick.html+ git-cherry-pick.html
+make[2]: Leaving directory '/build/git-2.20.1/Documentation'
+make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-stage.html+ git-stage.html && \
 TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-stage.html+ git-stage.txt && \
 mv git-stage.html+ git-stage.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
+rm -f git-fetch.html+ git-fetch.html && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-fetch.html+ git-fetch.txt && \
+mv git-fetch.html+ git-fetch.html
+make[2]: Leaving directory '/build/git-2.20.1/Documentation'
+make[2]: Entering directory '/build/git-2.20.1/Documentation'
+rm -f git-rev-list.html+ git-rev-list.html && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-rev-list.html+ git-rev-list.txt && \
+mv git-rev-list.html+ git-rev-list.html
+make[2]: Leaving directory '/build/git-2.20.1/Documentation'
+make[2]: Entering directory '/build/git-2.20.1/Documentation'
+rm -f git-diff.html+ git-diff.html && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-diff.html+ git-diff.txt && \
+mv git-diff.html+ git-diff.html
+make[2]: Leaving directory '/build/git-2.20.1/Documentation'
+make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-update-server-info.html+ git-update-server-info.html && \
 TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-update-server-info.html+ git-update-server-info.txt && \
 mv git-update-server-info.html+ git-update-server-info.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
+rm -f git-mktag.html+ git-mktag.html && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-mktag.html+ git-mktag.txt && \
+mv git-mktag.html+ git-mktag.html
+make[2]: Leaving directory '/build/git-2.20.1/Documentation'
+make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-fmt-merge-msg.html+ git-fmt-merge-msg.html && \
 TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-fmt-merge-msg.html+ git-fmt-merge-msg.txt && \
 mv git-fmt-merge-msg.html+ git-fmt-merge-msg.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-mktag.html+ git-mktag.html && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-mktag.html+ git-mktag.txt && \
-mv git-mktag.html+ git-mktag.html
+rm -f git-checkout-index.html+ git-checkout-index.html && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-checkout-index.html+ git-checkout-index.txt && \
+mv git-checkout-index.html+ git-checkout-index.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-diff-files.html+ git-diff-files.html && \
@@ -5256,24 +5296,14 @@
 mv git-show-ref.html+ git-show-ref.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-checkout-index.html+ git-checkout-index.html && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-checkout-index.html+ git-checkout-index.txt && \
-mv git-checkout-index.html+ git-checkout-index.html
-make[2]: Leaving directory '/build/git-2.20.1/Documentation'
-make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-verify-tag.html+ git-verify-tag.html && \
 TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-verify-tag.html+ git-verify-tag.txt && \
 mv git-verify-tag.html+ git-verify-tag.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-push.html+ git-push.html && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-push.html+ git-push.txt && \
-mv git-push.html+ git-push.html
-make[2]: Leaving directory '/build/git-2.20.1/Documentation'
-make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-check-attr.html+ git-check-attr.html && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-check-attr.html+ git-check-attr.txt && \
-mv git-check-attr.html+ git-check-attr.html
+rm -f git-remote-fd.html+ git-remote-fd.html && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-remote-fd.html+ git-remote-fd.txt && \
+mv git-remote-fd.html+ git-remote-fd.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-http-push.html+ git-http-push.html && \
@@ -5281,21 +5311,6 @@
 mv git-http-push.html+ git-http-push.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-citool.html+ git-citool.html && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-citool.html+ git-citool.txt && \
-mv git-citool.html+ git-citool.html
-make[2]: Leaving directory '/build/git-2.20.1/Documentation'
-make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-cvsserver.html+ git-cvsserver.html && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-cvsserver.html+ git-cvsserver.txt && \
-mv git-cvsserver.html+ git-cvsserver.html
-make[2]: Leaving directory '/build/git-2.20.1/Documentation'
-make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-remote-fd.html+ git-remote-fd.html && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-remote-fd.html+ git-remote-fd.txt && \
-mv git-remote-fd.html+ git-remote-fd.html
-make[2]: Leaving directory '/build/git-2.20.1/Documentation'
-make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-fsck-objects.html+ git-fsck-objects.html && \
 TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-fsck-objects.html+ git-fsck-objects.txt && \
 mv git-fsck-objects.html+ git-fsck-objects.html
@@ -5306,9 +5321,19 @@
 mv git-show-branch.html+ git-show-branch.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-merge-base.html+ git-merge-base.html && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-merge-base.html+ git-merge-base.txt && \
-mv git-merge-base.html+ git-merge-base.html
+rm -f git-citool.html+ git-citool.html && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-citool.html+ git-citool.txt && \
+mv git-citool.html+ git-citool.html
+make[2]: Leaving directory '/build/git-2.20.1/Documentation'
+make[2]: Entering directory '/build/git-2.20.1/Documentation'
+rm -f git-remote-testgit.html+ git-remote-testgit.html && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-remote-testgit.html+ git-remote-testgit.txt && \
+mv git-remote-testgit.html+ git-remote-testgit.html
+make[2]: Leaving directory '/build/git-2.20.1/Documentation'
+make[2]: Entering directory '/build/git-2.20.1/Documentation'
+rm -f git-check-attr.html+ git-check-attr.html && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-check-attr.html+ git-check-attr.txt && \
+mv git-check-attr.html+ git-check-attr.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-unpack-objects.html+ git-unpack-objects.html && \
@@ -5316,19 +5341,24 @@
 mv git-unpack-objects.html+ git-unpack-objects.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-remote-testgit.html+ git-remote-testgit.html && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-remote-testgit.html+ git-remote-testgit.txt && \
-mv git-remote-testgit.html+ git-remote-testgit.html
+rm -f git-pull.html+ git-pull.html && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-pull.html+ git-pull.txt && \
+mv git-pull.html+ git-pull.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-verify-pack.html+ git-verify-pack.html && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-verify-pack.html+ git-verify-pack.txt && \
-mv git-verify-pack.html+ git-verify-pack.html
+rm -f git-push.html+ git-push.html && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-push.html+ git-push.txt && \
+mv git-push.html+ git-push.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-imap-send.html+ git-imap-send.html && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-imap-send.html+ git-imap-send.txt && \
-mv git-imap-send.html+ git-imap-send.html
+rm -f git-merge-base.html+ git-merge-base.html && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-merge-base.html+ git-merge-base.txt && \
+mv git-merge-base.html+ git-merge-base.html
+make[2]: Leaving directory '/build/git-2.20.1/Documentation'
+make[2]: Entering directory '/build/git-2.20.1/Documentation'
+rm -f git-show-index.html+ git-show-index.html && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-show-index.html+ git-show-index.txt && \
+mv git-show-index.html+ git-show-index.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-notes.html+ git-notes.html && \
@@ -5336,14 +5366,24 @@
 mv git-notes.html+ git-notes.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
+rm -f git-verify-pack.html+ git-verify-pack.html && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-verify-pack.html+ git-verify-pack.txt && \
+mv git-verify-pack.html+ git-verify-pack.html
+make[2]: Leaving directory '/build/git-2.20.1/Documentation'
+make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-merge-file.html+ git-merge-file.html && \
 TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-merge-file.html+ git-merge-file.txt && \
 mv git-merge-file.html+ git-merge-file.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-show-index.html+ git-show-index.html && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-show-index.html+ git-show-index.txt && \
-mv git-show-index.html+ git-show-index.html
+rm -f git-cvsserver.html+ git-cvsserver.html && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-cvsserver.html+ git-cvsserver.txt && \
+mv git-cvsserver.html+ git-cvsserver.html
+make[2]: Leaving directory '/build/git-2.20.1/Documentation'
+make[2]: Entering directory '/build/git-2.20.1/Documentation'
+rm -f git-imap-send.html+ git-imap-send.html && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-imap-send.html+ git-imap-send.txt && \
+mv git-imap-send.html+ git-imap-send.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-credential-cache.html+ git-credential-cache.html && \
@@ -5351,14 +5391,9 @@
 mv git-credential-cache.html+ git-credential-cache.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-ls-remote.html+ git-ls-remote.html && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-ls-remote.html+ git-ls-remote.txt && \
-mv git-ls-remote.html+ git-ls-remote.html
-make[2]: Leaving directory '/build/git-2.20.1/Documentation'
-make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-pull.html+ git-pull.html && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-pull.html+ git-pull.txt && \
-mv git-pull.html+ git-pull.html
+rm -f git-archimport.html+ git-archimport.html && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-archimport.html+ git-archimport.txt && \
+mv git-archimport.html+ git-archimport.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-sh-i18n--envsubst.html+ git-sh-i18n--envsubst.html && \
@@ -5366,11 +5401,6 @@
 mv git-sh-i18n--envsubst.html+ git-sh-i18n--envsubst.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-archimport.html+ git-archimport.html && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-archimport.html+ git-archimport.txt && \
-mv git-archimport.html+ git-archimport.html
-make[2]: Leaving directory '/build/git-2.20.1/Documentation'
-make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-prune-packed.html+ git-prune-packed.html && \
 TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-prune-packed.html+ git-prune-packed.txt && \
 mv git-prune-packed.html+ git-prune-packed.html
@@ -5381,19 +5411,29 @@
 mv git-interpret-trailers.html+ git-interpret-trailers.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
+rm -f git-ls-remote.html+ git-ls-remote.html && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-ls-remote.html+ git-ls-remote.txt && \
+mv git-ls-remote.html+ git-ls-remote.html
+make[2]: Leaving directory '/build/git-2.20.1/Documentation'
+make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-credential.html+ git-credential.html && \
 TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-credential.html+ git-credential.txt && \
 mv git-credential.html+ git-credential.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
+rm -f git-var.html+ git-var.html && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-var.html+ git-var.txt && \
+mv git-var.html+ git-var.html
+make[2]: Leaving directory '/build/git-2.20.1/Documentation'
+make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-reflog.html+ git-reflog.html && \
 TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-reflog.html+ git-reflog.txt && \
 mv git-reflog.html+ git-reflog.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-var.html+ git-var.html && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-var.html+ git-var.txt && \
-mv git-var.html+ git-var.html
+rm -f git-merge-one-file.html+ git-merge-one-file.html && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-merge-one-file.html+ git-merge-one-file.txt && \
+mv git-merge-one-file.html+ git-merge-one-file.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-commit.html+ git-commit.html && \
@@ -5401,41 +5441,26 @@
 mv git-commit.html+ git-commit.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-status.html+ git-status.html && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-status.html+ git-status.txt && \
-mv git-status.html+ git-status.html
-make[2]: Leaving directory '/build/git-2.20.1/Documentation'
-make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-svn.html+ git-svn.html && \
 TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-svn.html+ git-svn.txt && \
 mv git-svn.html+ git-svn.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-checkout.html+ git-checkout.html && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-checkout.html+ git-checkout.txt && \
-mv git-checkout.html+ git-checkout.html
-make[2]: Leaving directory '/build/git-2.20.1/Documentation'
-make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-merge-one-file.html+ git-merge-one-file.html && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-merge-one-file.html+ git-merge-one-file.txt && \
-mv git-merge-one-file.html+ git-merge-one-file.html
-make[2]: Leaving directory '/build/git-2.20.1/Documentation'
-make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-stash.html+ git-stash.html && \
 TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-stash.html+ git-stash.txt && \
 mv git-stash.html+ git-stash.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-filter-branch.html+ git-filter-branch.html && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-filter-branch.html+ git-filter-branch.txt && \
-mv git-filter-branch.html+ git-filter-branch.html
-make[2]: Leaving directory '/build/git-2.20.1/Documentation'
-make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-replace.html+ git-replace.html && \
 TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-replace.html+ git-replace.txt && \
 mv git-replace.html+ git-replace.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
+rm -f git-status.html+ git-status.html && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-status.html+ git-status.txt && \
+mv git-status.html+ git-status.html
+make[2]: Leaving directory '/build/git-2.20.1/Documentation'
+make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-http-backend.html+ git-http-backend.html && \
 TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-http-backend.html+ git-http-backend.txt && \
 mv git-http-backend.html+ git-http-backend.html
@@ -5446,14 +5471,19 @@
 mv git-worktree.html+ git-worktree.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
+rm -f git-receive-pack.html+ git-receive-pack.html && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-receive-pack.html+ git-receive-pack.txt && \
+mv git-receive-pack.html+ git-receive-pack.html
+make[2]: Leaving directory '/build/git-2.20.1/Documentation'
+make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-for-each-ref.html+ git-for-each-ref.html && \
 TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-for-each-ref.html+ git-for-each-ref.txt && \
 mv git-for-each-ref.html+ git-for-each-ref.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-receive-pack.html+ git-receive-pack.html && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-receive-pack.html+ git-receive-pack.txt && \
-mv git-receive-pack.html+ git-receive-pack.html
+rm -f git-filter-branch.html+ git-filter-branch.html && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-filter-branch.html+ git-filter-branch.txt && \
+mv git-filter-branch.html+ git-filter-branch.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-shell.html+ git-shell.html && \
@@ -5461,9 +5491,9 @@
 mv git-shell.html+ git-shell.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-config.html+ git-config.html && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-config.html+ git-config.txt && \
-mv git-config.html+ git-config.html
+rm -f git-checkout.html+ git-checkout.html && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-checkout.html+ git-checkout.txt && \
+mv git-checkout.html+ git-checkout.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-branch.html+ git-branch.html && \
@@ -5471,14 +5501,9 @@
 mv git-branch.html+ git-branch.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-diff-tree.html+ git-diff-tree.html && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-diff-tree.html+ git-diff-tree.txt && \
-mv git-diff-tree.html+ git-diff-tree.html
-make[2]: Leaving directory '/build/git-2.20.1/Documentation'
-make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f gitk.html+ gitk.html && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o gitk.html+ gitk.txt && \
-mv gitk.html+ gitk.html
+rm -f git-read-tree.html+ git-read-tree.html && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-read-tree.html+ git-read-tree.txt && \
+mv git-read-tree.html+ git-read-tree.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-show.html+ git-show.html && \
@@ -5486,9 +5511,14 @@
 mv git-show.html+ git-show.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-read-tree.html+ git-read-tree.html && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-read-tree.html+ git-read-tree.txt && \
-mv git-read-tree.html+ git-read-tree.html
+rm -f gitignore.html+ gitignore.html && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o gitignore.html+ gitignore.txt && \
+mv gitignore.html+ gitignore.html
+make[2]: Leaving directory '/build/git-2.20.1/Documentation'
+make[2]: Entering directory '/build/git-2.20.1/Documentation'
+rm -f gitk.html+ gitk.html && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o gitk.html+ gitk.txt && \
+mv gitk.html+ gitk.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f gitmodules.html+ gitmodules.html && \
@@ -5496,14 +5526,14 @@
 mv gitmodules.html+ gitmodules.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-format-patch.html+ git-format-patch.html && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-format-patch.html+ git-format-patch.txt && \
-mv git-format-patch.html+ git-format-patch.html
+rm -f gitremote-helpers.html+ gitremote-helpers.html && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o gitremote-helpers.html+ gitremote-helpers.txt && \
+mv gitremote-helpers.html+ gitremote-helpers.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f gitignore.html+ gitignore.html && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o gitignore.html+ gitignore.txt && \
-mv gitignore.html+ gitignore.html
+rm -f git-diff-tree.html+ git-diff-tree.html && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-diff-tree.html+ git-diff-tree.txt && \
+mv git-diff-tree.html+ git-diff-tree.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f gitweb.html+ gitweb.html && \
@@ -5521,14 +5551,24 @@
 mv gitcli.html+ gitcli.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
+rm -f gitcredentials.html+ gitcredentials.html && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o gitcredentials.html+ gitcredentials.txt && \
+mv gitcredentials.html+ gitcredentials.html
+make[2]: Leaving directory '/build/git-2.20.1/Documentation'
+make[2]: Entering directory '/build/git-2.20.1/Documentation'
+rm -f git-format-patch.html+ git-format-patch.html && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-format-patch.html+ git-format-patch.txt && \
+mv git-format-patch.html+ git-format-patch.html
+make[2]: Leaving directory '/build/git-2.20.1/Documentation'
+make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f gitcvs-migration.html+ gitcvs-migration.html && \
 TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o gitcvs-migration.html+ gitcvs-migration.txt && \
 mv gitcvs-migration.html+ gitcvs-migration.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f gitcredentials.html+ gitcredentials.html && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o gitcredentials.html+ gitcredentials.txt && \
-mv gitcredentials.html+ gitcredentials.html
+rm -f gitnamespaces.html+ gitnamespaces.html && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o gitnamespaces.html+ gitnamespaces.txt && \
+mv gitnamespaces.html+ gitnamespaces.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f gitrepository-layout.html+ gitrepository-layout.html && \
@@ -5536,9 +5576,9 @@
 mv gitrepository-layout.html+ gitrepository-layout.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f gitremote-helpers.html+ gitremote-helpers.html && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o gitremote-helpers.html+ gitremote-helpers.txt && \
-mv gitremote-helpers.html+ gitremote-helpers.html
+rm -f gitdiffcore.html+ gitdiffcore.html && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o gitdiffcore.html+ gitdiffcore.txt && \
+mv gitdiffcore.html+ gitdiffcore.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f giteveryday.html+ giteveryday.html && \
@@ -5546,24 +5586,19 @@
 mv giteveryday.html+ giteveryday.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f gitdiffcore.html+ gitdiffcore.html && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o gitdiffcore.html+ gitdiffcore.txt && \
-mv gitdiffcore.html+ gitdiffcore.html
-make[2]: Leaving directory '/build/git-2.20.1/Documentation'
-make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f gitnamespaces.html+ gitnamespaces.html && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o gitnamespaces.html+ gitnamespaces.txt && \
-mv gitnamespaces.html+ gitnamespaces.html
+rm -f gitrevisions.html+ gitrevisions.html && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o gitrevisions.html+ gitrevisions.txt && \
+mv gitrevisions.html+ gitrevisions.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-fast-import.html+ git-fast-import.html && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-fast-import.html+ git-fast-import.txt && \
-mv git-fast-import.html+ git-fast-import.html
+rm -f git-config.html+ git-config.html && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-config.html+ git-config.txt && \
+mv git-config.html+ git-config.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f gitweb.conf.html+ gitweb.conf.html && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o gitweb.conf.html+ gitweb.conf.txt && \
-mv gitweb.conf.html+ gitweb.conf.html
+rm -f git-remote-helpers.html+ git-remote-helpers.html && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -o git-remote-helpers.html+ git-remote-helpers.txto && \
+mv git-remote-helpers.html+ git-remote-helpers.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f everyday.html+ everyday.html && \
@@ -5571,17 +5606,17 @@
 mv everyday.html+ everyday.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 git-tools.txt
+rm -f gitsubmodules.html+ gitsubmodules.html && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o gitsubmodules.html+ gitsubmodules.txt && \
+mv gitsubmodules.html+ gitsubmodules.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-remote-helpers.html+ git-remote-helpers.html && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -o git-remote-helpers.html+ git-remote-helpers.txto && \
-mv git-remote-helpers.html+ git-remote-helpers.html
+rm -f gittutorial-2.html+ gittutorial-2.html && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o gittutorial-2.html+ gittutorial-2.txt && \
+mv gittutorial-2.html+ gittutorial-2.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git.html+ git.html && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git.html+ git.txt && \
-mv git.html+ git.html
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 git-tools.txt
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f howto-index.txt+ howto-index.txt && \
@@ -5589,29 +5624,25 @@
 mv howto-index.txt+ howto-index.txt
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f gitsubmodules.html+ gitsubmodules.html && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o gitsubmodules.html+ gitsubmodules.txt && \
-mv gitsubmodules.html+ gitsubmodules.html
-make[2]: Leaving directory '/build/git-2.20.1/Documentation'
-make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f gitrevisions.html+ gitrevisions.html && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o gitrevisions.html+ gitrevisions.txt && \
-mv gitrevisions.html+ gitrevisions.html
+rm -f git-fast-import.html+ git-fast-import.html && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-fast-import.html+ git-fast-import.txt && \
+mv git-fast-import.html+ git-fast-import.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f gitattributes.html+ gitattributes.html && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o gitattributes.html+ gitattributes.txt && \
-mv gitattributes.html+ gitattributes.html
+rm -f git.html+ git.html && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git.html+ git.txt && \
+mv git.html+ git.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f gittutorial-2.html+ gittutorial-2.html && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o gittutorial-2.html+ gittutorial-2.txt && \
-mv gittutorial-2.html+ gittutorial-2.html
+rm -f howto/using-signed-tag-in-pull-request.html+ howto/using-signed-tag-in-pull-request.html && \
+sed -e '1,/^$/d' howto/using-signed-tag-in-pull-request.txt | \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -a git-relative-html-prefix=../ -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 - >howto/using-signed-tag-in-pull-request.html+ && \
+mv howto/using-signed-tag-in-pull-request.html+ howto/using-signed-tag-in-pull-request.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f gitglossary.html+ gitglossary.html && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o gitglossary.html+ gitglossary.txt && \
-mv gitglossary.html+ gitglossary.html
+rm -f gitworkflows.html+ gitworkflows.html && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o gitworkflows.html+ gitworkflows.txt && \
+mv gitworkflows.html+ gitworkflows.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f howto/new-command.html+ howto/new-command.html && \
@@ -5620,20 +5651,21 @@
 mv howto/new-command.html+ howto/new-command.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
+rm -f gitattributes.html+ gitattributes.html && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o gitattributes.html+ gitattributes.txt && \
+mv gitattributes.html+ gitattributes.html
+make[2]: Leaving directory '/build/git-2.20.1/Documentation'
+make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f howto/revert-branch-rebase.html+ howto/revert-branch-rebase.html && \
 sed -e '1,/^$/d' howto/revert-branch-rebase.txt | \
 TZ=UTC asciidoc  -a git-asciidoc-no-roff -a git-relative-html-prefix=../ -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 - >howto/revert-branch-rebase.html+ && \
 mv howto/revert-branch-rebase.html+ howto/revert-branch-rebase.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f gittutorial.html+ gittutorial.html && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o gittutorial.html+ gittutorial.txt && \
-mv gittutorial.html+ gittutorial.html
-make[2]: Leaving directory '/build/git-2.20.1/Documentation'
-make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f gitworkflows.html+ gitworkflows.html && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o gitworkflows.html+ gitworkflows.txt && \
-mv gitworkflows.html+ gitworkflows.html
+rm -f howto/using-merge-subtree.html+ howto/using-merge-subtree.html && \
+sed -e '1,/^$/d' howto/using-merge-subtree.txt | \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -a git-relative-html-prefix=../ -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 - >howto/using-merge-subtree.html+ && \
+mv howto/using-merge-subtree.html+ howto/using-merge-subtree.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f howto/update-hook-example.html+ howto/update-hook-example.html && \
@@ -5642,16 +5674,28 @@
 mv howto/update-hook-example.html+ howto/update-hook-example.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
+rm -f gitweb.conf.html+ gitweb.conf.html && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o gitweb.conf.html+ gitweb.conf.txt && \
+mv gitweb.conf.html+ gitweb.conf.html
+make[2]: Leaving directory '/build/git-2.20.1/Documentation'
+make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f howto/use-git-daemon.html+ howto/use-git-daemon.html && \
 sed -e '1,/^$/d' howto/use-git-daemon.txt | \
 TZ=UTC asciidoc  -a git-asciidoc-no-roff -a git-relative-html-prefix=../ -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 - >howto/use-git-daemon.html+ && \
 mv howto/use-git-daemon.html+ howto/use-git-daemon.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f howto/using-merge-subtree.html+ howto/using-merge-subtree.html && \
-sed -e '1,/^$/d' howto/using-merge-subtree.txt | \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -a git-relative-html-prefix=../ -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 - >howto/using-merge-subtree.html+ && \
-mv howto/using-merge-subtree.html+ howto/using-merge-subtree.html
+rm -f gitcore-tutorial.html+ gitcore-tutorial.html && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o gitcore-tutorial.html+ gitcore-tutorial.txt && \
+mv gitcore-tutorial.html+ gitcore-tutorial.html
+make[2]: Leaving directory '/build/git-2.20.1/Documentation'
+make[2]: Entering directory '/build/git-2.20.1/Documentation'
+rm -f gitglossary.html+ gitglossary.html && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o gitglossary.html+ gitglossary.txt && \
+mv gitglossary.html+ gitglossary.html
+make[2]: Leaving directory '/build/git-2.20.1/Documentation'
+make[2]: Entering directory '/build/git-2.20.1/Documentation'
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -a git-relative-html-prefix=../ -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 technical/api-setup.txt
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f howto/separating-topic-branches.html+ howto/separating-topic-branches.html && \
@@ -5666,15 +5710,12 @@
 mv howto/rebuild-from-update-hook.html+ howto/rebuild-from-update-hook.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f howto/using-signed-tag-in-pull-request.html+ howto/using-signed-tag-in-pull-request.html && \
-sed -e '1,/^$/d' howto/using-signed-tag-in-pull-request.txt | \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -a git-relative-html-prefix=../ -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 - >howto/using-signed-tag-in-pull-request.html+ && \
-mv howto/using-signed-tag-in-pull-request.html+ howto/using-signed-tag-in-pull-request.html
+rm -f gittutorial.html+ gittutorial.html && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o gittutorial.html+ gittutorial.txt && \
+mv gittutorial.html+ gittutorial.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f gitcore-tutorial.html+ gitcore-tutorial.html && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o gitcore-tutorial.html+ gitcore-tutorial.txt && \
-mv gitcore-tutorial.html+ gitcore-tutorial.html
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -a git-relative-html-prefix=../ -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 technical/api-grep.txt
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f howto/recover-corrupted-blob-object.html+ howto/recover-corrupted-blob-object.html && \
@@ -5683,10 +5724,10 @@
 mv howto/recover-corrupted-blob-object.html+ howto/recover-corrupted-blob-object.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f howto/setup-git-server-over-http.html+ howto/setup-git-server-over-http.html && \
-sed -e '1,/^$/d' howto/setup-git-server-over-http.txt | \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -a git-relative-html-prefix=../ -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 - >howto/setup-git-server-over-http.html+ && \
-mv howto/setup-git-server-over-http.html+ howto/setup-git-server-over-http.html
+rm -f howto/rebase-from-internal-branch.html+ howto/rebase-from-internal-branch.html && \
+sed -e '1,/^$/d' howto/rebase-from-internal-branch.txt | \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -a git-relative-html-prefix=../ -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 - >howto/rebase-from-internal-branch.html+ && \
+mv howto/rebase-from-internal-branch.html+ howto/rebase-from-internal-branch.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f howto/recover-corrupted-object-harder.html+ howto/recover-corrupted-object-harder.html && \
@@ -5695,409 +5736,407 @@
 mv howto/recover-corrupted-object-harder.html+ howto/recover-corrupted-object-harder.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f howto/revert-a-faulty-merge.html+ howto/revert-a-faulty-merge.html && \
-sed -e '1,/^$/d' howto/revert-a-faulty-merge.txt | \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -a git-relative-html-prefix=../ -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 - >howto/revert-a-faulty-merge.html+ && \
-mv howto/revert-a-faulty-merge.html+ howto/revert-a-faulty-merge.html
-make[2]: Leaving directory '/build/git-2.20.1/Documentation'
-make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-log.html+ git-log.html && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-log.html+ git-log.txt && \
-mv git-log.html+ git-log.html
+rm -f howto/keep-canonical-history-correct.html+ howto/keep-canonical-history-correct.html && \
+sed -e '1,/^$/d' howto/keep-canonical-history-correct.txt | \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -a git-relative-html-prefix=../ -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 - >howto/keep-canonical-history-correct.html+ && \
+mv howto/keep-canonical-history-correct.html+ howto/keep-canonical-history-correct.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f howto/rebase-from-internal-branch.html+ howto/rebase-from-internal-branch.html && \
-sed -e '1,/^$/d' howto/rebase-from-internal-branch.txt | \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -a git-relative-html-prefix=../ -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 - >howto/rebase-from-internal-branch.html+ && \
-mv howto/rebase-from-internal-branch.html+ howto/rebase-from-internal-branch.html
+rm -f howto/setup-git-server-over-http.html+ howto/setup-git-server-over-http.html && \
+sed -e '1,/^$/d' howto/setup-git-server-over-http.txt | \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -a git-relative-html-prefix=../ -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 - >howto/setup-git-server-over-http.html+ && \
+mv howto/setup-git-server-over-http.html+ howto/setup-git-server-over-http.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -a git-relative-html-prefix=../ -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 technical/api-grep.txt
+rm -f howto/revert-a-faulty-merge.html+ howto/revert-a-faulty-merge.html && \
+sed -e '1,/^$/d' howto/revert-a-faulty-merge.txt | \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -a git-relative-html-prefix=../ -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 - >howto/revert-a-faulty-merge.html+ && \
+mv howto/revert-a-faulty-merge.html+ howto/revert-a-faulty-merge.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -a git-relative-html-prefix=../ -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 technical/api-setup.txt
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -a git-relative-html-prefix=../ -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 technical/api-error-handling.txt
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
 TZ=UTC asciidoc  -a git-asciidoc-no-roff -a git-relative-html-prefix=../ -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 technical/api-quote.txt
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 git-bisect-lk2009.txt
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -a git-relative-html-prefix=../ -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 technical/api-directory-listing.txt
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
 TZ=UTC asciidoc  -a git-asciidoc-no-roff -a git-relative-html-prefix=../ -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 technical/api-config.txt
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -a git-relative-html-prefix=../ -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 technical/api-history-graph.txt
+rm -f howto/maintain-git.html+ howto/maintain-git.html && \
+sed -e '1,/^$/d' howto/maintain-git.txt | \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -a git-relative-html-prefix=../ -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 - >howto/maintain-git.html+ && \
+mv howto/maintain-git.html+ howto/maintain-git.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
 TZ=UTC asciidoc  -a git-asciidoc-no-roff -a git-relative-html-prefix=../ -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 technical/api-argv-array.txt
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -a git-relative-html-prefix=../ -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 technical/api-error-handling.txt
-make[2]: Leaving directory '/build/git-2.20.1/Documentation'
-make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f howto/keep-canonical-history-correct.html+ howto/keep-canonical-history-correct.html && \
-sed -e '1,/^$/d' howto/keep-canonical-history-correct.txt | \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -a git-relative-html-prefix=../ -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 - >howto/keep-canonical-history-correct.html+ && \
-mv howto/keep-canonical-history-correct.html+ howto/keep-canonical-history-correct.html
-make[2]: Leaving directory '/build/git-2.20.1/Documentation'
-make[2]: Entering directory '/build/git-2.20.1/Documentation'
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -a git-relative-html-prefix=../ -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 technical/api-directory-listing.txt
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -a git-relative-html-prefix=../ -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 technical/api-oid-array.txt
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -a git-relative-html-prefix=../ -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 technical/api-sigchain.txt
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -a git-relative-html-prefix=../ -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 technical/api-submodule-config.txt
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -a git-relative-html-prefix=../ -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 technical/api-oid-array.txt
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -a git-relative-html-prefix=../ -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 technical/api-run-command.txt
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -a git-relative-html-prefix=../ -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 technical/api-xdiff-interface.txt
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -a git-relative-html-prefix=../ -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 technical/api-merge.txt
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -a git-relative-html-prefix=../ -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 technical/api-allocation-growing.txt
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -a git-relative-html-prefix=../ -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 technical/api-sigchain.txt
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -a git-relative-html-prefix=../ -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 technical/api-submodule-config.txt
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -a git-relative-html-prefix=../ -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 technical/api-diff.txt
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
 cp SubmittingPatches SubmittingPatches.txt
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -a git-relative-html-prefix=../ -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 technical/api-merge.txt
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -a git-relative-html-prefix=../ -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 technical/api-credentials.txt
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -a git-relative-html-prefix=../ -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 technical/api-revision-walking.txt
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -a git-relative-html-prefix=../ -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 technical/api-xdiff-interface.txt
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f howto/maintain-git.html+ howto/maintain-git.html && \
-sed -e '1,/^$/d' howto/maintain-git.txt | \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -a git-relative-html-prefix=../ -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 - >howto/maintain-git.html+ && \
-mv howto/maintain-git.html+ howto/maintain-git.html
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -a git-relative-html-prefix=../ -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 technical/api-gitattributes.txt
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -a git-relative-html-prefix=../ -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 technical/api-gitattributes.txt
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -a git-relative-html-prefix=../ -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 technical/api-history-graph.txt
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
 TZ=UTC asciidoc  -a git-asciidoc-no-roff -a git-relative-html-prefix=../ -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 technical/api-tree-walking.txt
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -a git-relative-html-prefix=../ -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 technical/api-credentials.txt
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -a git-relative-html-prefix=../ -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 technical/api-revision-walking.txt
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -a git-relative-html-prefix=../ -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 technical/api-remote.txt
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -a git-relative-html-prefix=../ -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 technical/api-trace.txt
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -a git-relative-html-prefix=../ -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 technical/api-diff.txt
+rm -f git-log.html+ git-log.html && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 -d manpage -o git-log.html+ git-log.txt && \
+mv git-log.html+ git-log.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -a git-relative-html-prefix=../ -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 technical/api-trace.txt
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -a git-relative-html-prefix=../ -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 technical/api-object-access.txt
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -a git-relative-html-prefix=../ -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 technical/api-run-command.txt
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -a git-relative-html-prefix=../ -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 technical/api-allocation-growing.txt
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -a git-relative-html-prefix=../ -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 technical/api-object-access.txt
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -a git-relative-html-prefix=../ -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 technical/api-remote.txt
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -a git-relative-html-prefix=../ -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 technical/api-parse-options.txt
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -a git-relative-html-prefix=../ -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 technical/api-ref-iteration.txt
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -a git-relative-html-prefix=../ -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 technical/api-ref-iteration.txt
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -a git-relative-html-prefix=../ -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 technical/multi-pack-index.txt
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
 TZ=UTC asciidoc  -a git-asciidoc-no-roff -a git-relative-html-prefix=../ -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 technical/long-running-process-protocol.txt
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -a git-relative-html-prefix=../ -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 technical/multi-pack-index.txt
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -a git-relative-html-prefix=../ -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 technical/api-parse-options.txt
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -a git-relative-html-prefix=../ -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 technical/pack-format.txt
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 git-bisect-lk2009.txt
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -a git-relative-html-prefix=../ -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 technical/send-pack-pipeline.txt
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -a git-relative-html-prefix=../ -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 technical/index-format.txt
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -a git-relative-html-prefix=../ -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 technical/index-format.txt
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -a git-relative-html-prefix=../ -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 technical/send-pack-pipeline.txt
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -a git-relative-html-prefix=../ -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 technical/protocol-common.txt
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -a git-relative-html-prefix=../ -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 technical/signature-format.txt
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -a git-relative-html-prefix=../ -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 technical/partial-clone.txt
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -a git-relative-html-prefix=../ -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 technical/racy-git.txt
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -a git-relative-html-prefix=../ -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 technical/signature-format.txt
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -a git-relative-html-prefix=../ -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 technical/protocol-common.txt
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -a git-relative-html-prefix=../ -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 technical/protocol-capabilities.txt
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -a git-relative-html-prefix=../ -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 technical/pack-format.txt
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -a git-relative-html-prefix=../ -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 technical/pack-protocol.txt
+cd technical && '/bin/sh' ./api-index.sh
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
 TZ=UTC asciidoc  -a git-asciidoc-no-roff -a git-relative-html-prefix=../ -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 technical/shallow.txt
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -a git-relative-html-prefix=../ -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 technical/http-protocol.txt
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -a git-relative-html-prefix=../ -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 technical/partial-clone.txt
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -a git-relative-html-prefix=../ -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 technical/protocol-v2.txt
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -a git-relative-html-prefix=../ -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 technical/pack-heuristics.txt
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-cd technical && '/bin/sh' ./api-index.sh
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -a git-relative-html-prefix=../ -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 technical/protocol-capabilities.txt
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -a git-relative-html-prefix=../ -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 technical/hash-function-transition.txt
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -a git-relative-html-prefix=../ -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 technical/trivial-merge.txt
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -a git-relative-html-prefix=../ -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 technical/pack-heuristics.txt
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -a git-relative-html-prefix=../ -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 technical/protocol-v2.txt
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -a git-relative-html-prefix=../ -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 technical/racy-git.txt
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -a git-relative-html-prefix=../ -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 technical/http-protocol.txt
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -a git-relative-html-prefix=../ -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 technical/trivial-merge.txt
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -a git-relative-html-prefix=../ -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 technical/pack-protocol.txt
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-get-tar-commit-id.1 && \
-xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-get-tar-commit-id.xml
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -a git-relative-html-prefix=../ -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 technical/hash-function-transition.txt
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f user-manual.xml+ user-manual.xml && \
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d book -o user-manual.xml+ user-manual.txt && \
-mv user-manual.xml+ user-manual.xml
+rm -f git-init-db.1 && \
+xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-init-db.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-gui.1 && \
-xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-gui.xml
+rm -f git-patch-id.1 && \
+xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-patch-id.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-revert.1 && \
 xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-revert.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-index-pack.1 && \
-xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-index-pack.xml
-make[2]: Leaving directory '/build/git-2.20.1/Documentation'
-make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-archive.1 && \
-xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-archive.xml
+rm -f git-sh-setup.1 && \
+xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-sh-setup.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-rm.1 && \
-xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-rm.xml
+rm -f git-add.1 && \
+xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-add.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-patch-id.1 && \
-xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-patch-id.xml
+rm -f git-pack-refs.1 && \
+xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-pack-refs.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-gc.1 && \
-xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-gc.xml
+rm -f git-get-tar-commit-id.1 && \
+xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-get-tar-commit-id.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-mv.1 && \
-xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-mv.xml
+rm -f git-check-ignore.1 && \
+xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-check-ignore.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-commit-tree.1 && \
 xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-commit-tree.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-pack-refs.1 && \
-xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-pack-refs.xml
+rm -f git-archive.1 && \
+xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-archive.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-check-ignore.1 && \
-xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-check-ignore.xml
+rm -f git-rm.1 && \
+xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-rm.xml
+make[2]: Leaving directory '/build/git-2.20.1/Documentation'
+make[2]: Entering directory '/build/git-2.20.1/Documentation'
+rm -f git-gui.1 && \
+xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-gui.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-count-objects.1 && \
 xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-count-objects.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-sh-setup.1 && \
-xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-sh-setup.xml
+rm -f git-commit-graph.1 && \
+xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-commit-graph.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-init-db.1 && \
-xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-init-db.xml
+rm -f git-index-pack.1 && \
+xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-index-pack.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-add.1 && \
-xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-add.xml
+rm -f git-ls-files.1 && \
+xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-ls-files.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-mailsplit.1 && \
-xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-mailsplit.xml
+rm -f git-gc.1 && \
+xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-gc.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-repack.1 && \
 xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-repack.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-commit-graph.1 && \
-xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-commit-graph.xml
+rm -f git-mailsplit.1 && \
+xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-mailsplit.xml
+make[2]: Leaving directory '/build/git-2.20.1/Documentation'
+make[2]: Entering directory '/build/git-2.20.1/Documentation'
+rm -f git-bundle.1 && \
+xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-bundle.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-am.1 && \
 xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-am.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-ls-files.1 && \
-xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-ls-files.xml
+rm -f git-mv.1 && \
+xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-mv.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-cherry.1 && \
 xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-cherry.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-bundle.1 && \
-xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-bundle.xml
+rm -f git-blame.1 && \
+xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-blame.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-apply.1 && \
 xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-apply.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-blame.1 && \
-xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-blame.xml
-make[2]: Leaving directory '/build/git-2.20.1/Documentation'
-make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-clone.1 && \
 xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-clone.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-send-email.1 && \
-xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-send-email.xml
+rm -f git-p4.1 && \
+xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-p4.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-stripspace.1 && \
-xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-stripspace.xml
+rm -f git-upload-pack.1 && \
+xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-upload-pack.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-cat-file.1 && \
-xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-cat-file.xml
+rm -f git-shortlog.1 && \
+xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-shortlog.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-daemon.1 && \
-xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-daemon.xml
+rm -f git-mergetool--lib.1 && \
+xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-mergetool--lib.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-difftool.1 && \
-xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-difftool.xml
+rm -f git-prune.1 && \
+xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-prune.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-write-tree.1 && \
-xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-write-tree.xml
+rm -f git-stripspace.1 && \
+xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-stripspace.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-column.1 && \
-xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-column.xml
+rm -f git-send-email.1 && \
+xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-send-email.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-pack-objects.1 && \
-xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-pack-objects.xml
+rm -f git-fsck.1 && \
+xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-fsck.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-parse-remote.1 && \
-xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-parse-remote.xml
+rm -f git-request-pull.1 && \
+xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-request-pull.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-ls-tree.1 && \
-xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-ls-tree.xml
+rm -f git-fetch-pack.1 && \
+xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-fetch-pack.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-multi-pack-index.1 && \
-xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-multi-pack-index.xml
+rm -f git-merge.1 && \
+xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-merge.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-shortlog.1 && \
-xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-shortlog.xml
+rm -f git-cat-file.1 && \
+xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-cat-file.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-config.1 && \
-xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-config.xml
+rm -f git-mergetool.1 && \
+xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-mergetool.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-p4.1 && \
-xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-p4.xml
+rm -f git-difftool.1 && \
+xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-difftool.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-update-index.1 && \
-xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-update-index.xml
+rm -f git-daemon.1 && \
+xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-daemon.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-web--browse.1 && \
-xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-web--browse.xml
+rm -f git-write-tree.1 && \
+xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-write-tree.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-upload-pack.1 && \
-xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-upload-pack.xml
+rm -f git-column.1 && \
+xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-column.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-request-pull.1 && \
-xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-request-pull.xml
+rm -f git-parse-remote.1 && \
+xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-parse-remote.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-reset.1 && \
-xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-reset.xml
+rm -f git-pack-objects.1 && \
+xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-pack-objects.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-fetch-pack.1 && \
-xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-fetch-pack.xml
+rm -f git-ls-tree.1 && \
+xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-ls-tree.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-fsck.1 && \
-xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-fsck.xml
+rm -f git-multi-pack-index.1 && \
+xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-multi-pack-index.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-annotate.1 && \
-xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-annotate.xml
+rm -f git-grep.1 && \
+xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-grep.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-mergetool--lib.1 && \
-xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-mergetool--lib.xml
+rm -f git-web--browse.1 && \
+xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-web--browse.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-mergetool.1 && \
-xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-mergetool.xml
+rm -f git-send-pack.1 && \
+xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-send-pack.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-grep.1 && \
-xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-grep.xml
+rm -f git-update-index.1 && \
+xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-update-index.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-prune.1 && \
-xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-prune.xml
+rm -f git-annotate.1 && \
+xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-annotate.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-merge.1 && \
-xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-merge.xml
+rm -f git-cvsexportcommit.1 && \
+xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-cvsexportcommit.xml
+make[2]: Leaving directory '/build/git-2.20.1/Documentation'
+make[2]: Entering directory '/build/git-2.20.1/Documentation'
+rm -f git-reset.1 && \
+xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-reset.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-unpack-file.1 && \
 xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-unpack-file.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-cvsexportcommit.1 && \
-xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-cvsexportcommit.xml
+rm -f git-config.1 && \
+xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-config.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-send-pack.1 && \
-xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-send-pack.xml
+rm -f git-check-ref-format.1 && \
+xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-check-ref-format.xml
+make[2]: Leaving directory '/build/git-2.20.1/Documentation'
+make[2]: Entering directory '/build/git-2.20.1/Documentation'
+rm -f git-check-mailmap.1 && \
+xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-check-mailmap.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-name-rev.1 && \
 xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-name-rev.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-rev-parse.1 && \
-xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-rev-parse.xml
+rm -f user-manual.xml+ user-manual.xml && \
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b docbook -d book -o user-manual.xml+ user-manual.txt && \
+mv user-manual.xml+ user-manual.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-merge-tree.1 && \
-xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-merge-tree.xml
+rm -f git-rev-parse.1 && \
+xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-rev-parse.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-rerere.1 && \
@@ -6108,100 +6147,104 @@
 xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-symbolic-ref.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-check-ref-format.1 && \
-xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-check-ref-format.xml
-make[2]: Leaving directory '/build/git-2.20.1/Documentation'
-make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-rebase.1 && \
-xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-rebase.xml
-make[2]: Leaving directory '/build/git-2.20.1/Documentation'
-make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-check-mailmap.1 && \
-xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-check-mailmap.xml
-make[2]: Leaving directory '/build/git-2.20.1/Documentation'
-make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-update-ref.1 && \
 xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-update-ref.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-help.1 && \
-xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-help.xml
+rm -f git-merge-tree.1 && \
+xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-merge-tree.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-rev-list.1 && \
 xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-rev-list.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-remote-ext.1 && \
-xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-remote-ext.xml
+rm -f git-help.1 && \
+xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-help.xml
+make[2]: Leaving directory '/build/git-2.20.1/Documentation'
+make[2]: Entering directory '/build/git-2.20.1/Documentation'
+rm -f git-init.1 && \
+xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-init.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-diff.1 && \
 xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-diff.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-quiltimport.1 && \
-xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-quiltimport.xml
+rm -f git-rebase.1 && \
+xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-rebase.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-init.1 && \
-xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-init.xml
+rm -f git-instaweb.1 && \
+xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-instaweb.xml
+make[2]: Leaving directory '/build/git-2.20.1/Documentation'
+make[2]: Entering directory '/build/git-2.20.1/Documentation'
+rm -f git-remote-ext.1 && \
+xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-remote-ext.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-submodule.1 && \
 xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-submodule.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
+rm -f git-quiltimport.1 && \
+xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-quiltimport.xml
+make[2]: Leaving directory '/build/git-2.20.1/Documentation'
+make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-whatchanged.1 && \
 xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-whatchanged.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-instaweb.1 && \
-xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-instaweb.xml
+rm -f git-clean.1 && \
+xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-clean.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-diff-index.1 && \
 xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-diff-index.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-clean.1 && \
-xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-clean.xml
-make[2]: Leaving directory '/build/git-2.20.1/Documentation'
-make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-cvsimport.1 && \
-xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-cvsimport.xml
+rm -f git-upload-archive.1 && \
+xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-upload-archive.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-tag.1 && \
 xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-tag.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-upload-archive.1 && \
-xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-upload-archive.xml
+rm -f git-cvsimport.1 && \
+xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-cvsimport.xml
+make[2]: Leaving directory '/build/git-2.20.1/Documentation'
+make[2]: Entering directory '/build/git-2.20.1/Documentation'
+rm -f git-pack-redundant.1 && \
+xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-pack-redundant.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-remote.1 && \
 xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-remote.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-diff-files.1 && \
-xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-diff-files.xml
+rm -f git-mailinfo.1 && \
+xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-mailinfo.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-merge-index.1 && \
-xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-merge-index.xml
+rm -f git-diff-files.1 && \
+xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-diff-files.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-range-diff.1 && \
 xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-range-diff.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-pack-redundant.1 && \
-xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-pack-redundant.xml
+rm -f git-fetch.1 && \
+xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-fetch.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-mailinfo.1 && \
-xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-mailinfo.xml
+rm -f git-credential-store.1 && \
+xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-credential-store.xml
+make[2]: Leaving directory '/build/git-2.20.1/Documentation'
+make[2]: Entering directory '/build/git-2.20.1/Documentation'
+rm -f git-merge-index.1 && \
+xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-merge-index.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-describe.1 && \
@@ -6216,68 +6259,60 @@
 xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-bisect.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-credential-store.1 && \
-xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-credential-store.xml
-make[2]: Leaving directory '/build/git-2.20.1/Documentation'
-make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-fetch.1 && \
-xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-fetch.xml
-make[2]: Leaving directory '/build/git-2.20.1/Documentation'
-make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-cherry-pick.1 && \
 xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-cherry-pick.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-sh-i18n.1 && \
-xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-sh-i18n.xml
-make[2]: Leaving directory '/build/git-2.20.1/Documentation'
-make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-credential-cache--daemon.1 && \
 xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-credential-cache--daemon.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-fast-export.1 && \
-xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-fast-export.xml
+rm -f git-sh-i18n.1 && \
+xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-sh-i18n.xml
+make[2]: Leaving directory '/build/git-2.20.1/Documentation'
+make[2]: Entering directory '/build/git-2.20.1/Documentation'
+rm -f git-stage.1 && \
+xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-stage.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-hash-object.1 && \
 xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-hash-object.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-mktree.1 && \
-xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-mktree.xml
+rm -f git-http-fetch.1 && \
+xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-http-fetch.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-push.1 && \
-xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-push.xml
+rm -f git-fast-export.1 && \
+xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-fast-export.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-http-fetch.1 && \
-xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-http-fetch.xml
+rm -f git-push.1 && \
+xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-push.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-checkout-index.1 && \
-xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-checkout-index.xml
+rm -f git-mktree.1 && \
+xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-mktree.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-stage.1 && \
-xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-stage.xml
+rm -f git-fmt-merge-msg.1 && \
+xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-fmt-merge-msg.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-update-server-info.1 && \
-xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-update-server-info.xml
+rm -f git-svn.1 && \
+xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-svn.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-pull.1 && \
 xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-pull.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-svn.1 && \
-xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-svn.xml
+rm -f git-update-server-info.1 && \
+xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-update-server-info.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-fmt-merge-msg.1 && \
-xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-fmt-merge-msg.xml
+rm -f git-checkout-index.1 && \
+xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-checkout-index.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-mktag.1 && \
@@ -6288,108 +6323,100 @@
 xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-show-ref.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-show-branch.1 && \
-xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-show-branch.xml
-make[2]: Leaving directory '/build/git-2.20.1/Documentation'
-make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-cvsserver.1 && \
 xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-cvsserver.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-verify-tag.1 && \
-xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-verify-tag.xml
-make[2]: Leaving directory '/build/git-2.20.1/Documentation'
-make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-notes.1 && \
 xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-notes.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-remote-testgit.1 && \
-xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-remote-testgit.xml
-make[2]: Leaving directory '/build/git-2.20.1/Documentation'
-make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-citool.1 && \
-xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-citool.xml
+rm -f git-verify-tag.1 && \
+xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-verify-tag.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-http-push.1 && \
 xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-http-push.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-check-attr.1 && \
-xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-check-attr.xml
+rm -f git-show-branch.1 && \
+xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-show-branch.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-fsck-objects.1 && \
-xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-fsck-objects.xml
+rm -f git-remote-fd.1 && \
+xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-remote-fd.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-verify-pack.1 && \
-xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-verify-pack.xml
+rm -f git-fsck-objects.1 && \
+xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-fsck-objects.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-unpack-objects.1 && \
-xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-unpack-objects.xml
+rm -f git-check-attr.1 && \
+xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-check-attr.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-remote-fd.1 && \
-xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-remote-fd.xml
+rm -f git-remote-testgit.1 && \
+xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-remote-testgit.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-merge-base.1 && \
-xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-merge-base.xml
+rm -f git-citool.1 && \
+xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-citool.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-commit.1 && \
 xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-commit.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-show-index.1 && \
-xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-show-index.xml
+rm -f git-merge-base.1 && \
+xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-merge-base.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-credential-cache.1 && \
-xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-credential-cache.xml
+rm -f git-unpack-objects.1 && \
+xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-unpack-objects.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-diff-tree.1 && \
-xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-diff-tree.xml
+rm -f git-verify-pack.1 && \
+xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-verify-pack.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-imap-send.1 && \
 xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-imap-send.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-sh-i18n--envsubst.1 && \
-xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-sh-i18n--envsubst.xml
-make[2]: Leaving directory '/build/git-2.20.1/Documentation'
-make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-merge-file.1 && \
-xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-merge-file.xml
+rm -f git-show-index.1 && \
+xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-show-index.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-ls-remote.1 && \
-xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-ls-remote.xml
+rm -f git-diff-tree.1 && \
+xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-diff-tree.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-interpret-trailers.1 && \
 xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-interpret-trailers.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
+rm -f git-merge-file.1 && \
+xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-merge-file.xml
+make[2]: Leaving directory '/build/git-2.20.1/Documentation'
+make[2]: Entering directory '/build/git-2.20.1/Documentation'
+rm -f git-show.1 && \
+xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-show.xml
+make[2]: Leaving directory '/build/git-2.20.1/Documentation'
+make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-checkout.1 && \
 xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-checkout.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-archimport.1 && \
-xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-archimport.xml
+rm -f git-credential-cache.1 && \
+xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-credential-cache.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-show.1 && \
-xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-show.xml
+rm -f git-sh-i18n--envsubst.1 && \
+xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-sh-i18n--envsubst.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-status.1 && \
-xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-status.xml
+rm -f git-ls-remote.1 && \
+xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-ls-remote.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-credential.1 && \
@@ -6400,6 +6427,14 @@
 xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-reflog.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
+rm -f git-status.1 && \
+xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-status.xml
+make[2]: Leaving directory '/build/git-2.20.1/Documentation'
+make[2]: Entering directory '/build/git-2.20.1/Documentation'
+rm -f git-archimport.1 && \
+xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-archimport.xml
+make[2]: Leaving directory '/build/git-2.20.1/Documentation'
+make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-prune-packed.1 && \
 xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-prune-packed.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
@@ -6412,56 +6447,68 @@
 xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-stash.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-worktree.1 && \
-xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-worktree.xml
-make[2]: Leaving directory '/build/git-2.20.1/Documentation'
-make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-receive-pack.1 && \
-xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-receive-pack.xml
-make[2]: Leaving directory '/build/git-2.20.1/Documentation'
-make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-merge-one-file.1 && \
-xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-merge-one-file.xml
-make[2]: Leaving directory '/build/git-2.20.1/Documentation'
-make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-replace.1 && \
 xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-replace.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
+rm -f git-filter-branch.1 && \
+xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-filter-branch.xml
+make[2]: Leaving directory '/build/git-2.20.1/Documentation'
+make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-for-each-ref.1 && \
 xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-for-each-ref.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-filter-branch.1 && \
-xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-filter-branch.xml
+rm -f git-merge-one-file.1 && \
+xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-merge-one-file.xml
+make[2]: Leaving directory '/build/git-2.20.1/Documentation'
+make[2]: Entering directory '/build/git-2.20.1/Documentation'
+rm -f git-branch.1 && \
+xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-branch.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-format-patch.1 && \
 xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-format-patch.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
+rm -f git-http-backend.1 && \
+xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-http-backend.xml
+make[2]: Leaving directory '/build/git-2.20.1/Documentation'
+make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-shell.1 && \
 xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-shell.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-http-backend.1 && \
-xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-http-backend.xml
+rm -f git-worktree.1 && \
+xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-worktree.xml
+make[2]: Leaving directory '/build/git-2.20.1/Documentation'
+make[2]: Entering directory '/build/git-2.20.1/Documentation'
+rm -f git-receive-pack.1 && \
+xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-receive-pack.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f git-read-tree.1 && \
 xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-read-tree.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-branch.1 && \
-xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-branch.xml
+rm -f gitremote-helpers.1 && \
+xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man gitremote-helpers.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f gitk.1 && \
 xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man gitk.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f gitremote-helpers.1 && \
-xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man gitremote-helpers.xml
+rm -f git-fast-import.1 && \
+xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-fast-import.xml
+make[2]: Leaving directory '/build/git-2.20.1/Documentation'
+make[2]: Entering directory '/build/git-2.20.1/Documentation'
+rm -f git.1 && \
+xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git.xml
+make[2]: Leaving directory '/build/git-2.20.1/Documentation'
+make[2]: Entering directory '/build/git-2.20.1/Documentation'
+rm -f gitignore.5 && \
+xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man gitignore.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f gitweb.1 && \
@@ -6472,102 +6519,90 @@
 xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man gitmodules.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-fast-import.1 && \
-xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-fast-import.xml
-make[2]: Leaving directory '/build/git-2.20.1/Documentation'
-make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git-log.1 && \
-xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-log.xml
+rm -f gitcli.7 && \
+xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man gitcli.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f githooks.5 && \
 xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man githooks.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f gitweb.conf.5 && \
-xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man gitweb.conf.xml
+rm -f gitrepository-layout.5 && \
+xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man gitrepository-layout.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f gitignore.5 && \
-xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man gitignore.xml
+rm -f git-log.1 && \
+xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git-log.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f git.1 && \
-xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man git.xml
+rm -f gitattributes.5 && \
+xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man gitattributes.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f gitcli.7 && \
-xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man gitcli.xml
+rm -f gitweb.conf.5 && \
+xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man gitweb.conf.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f gitrepository-layout.5 && \
-xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man gitrepository-layout.xml
+rm -f gitcvs-migration.7 && \
+xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man gitcvs-migration.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f gitnamespaces.7 && \
-xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man gitnamespaces.xml
+rm -f gitdiffcore.7 && \
+xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man gitdiffcore.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f gitcredentials.7 && \
 xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man gitcredentials.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f gitattributes.5 && \
-xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man gitattributes.xml
-make[2]: Leaving directory '/build/git-2.20.1/Documentation'
-make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f gitcvs-migration.7 && \
-xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man gitcvs-migration.xml
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 howto-index.txt
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -a git-relative-html-prefix=../ -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 technical/api-index.txt
+rm -f giteveryday.7 && \
+xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man giteveryday.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f gitglossary.7 && \
-xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man gitglossary.xml
+rm -f gitnamespaces.7 && \
+xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man gitnamespaces.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 howto-index.txt
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -a git-relative-html-prefix=../ -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 technical/api-index.txt
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f giteveryday.7 && \
-xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man giteveryday.xml
+rm -f gittutorial-2.7 && \
+xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man gittutorial-2.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f gitrevisions.7 && \
-xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man gitrevisions.xml
+rm -f gitsubmodules.7 && \
+xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man gitsubmodules.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f gitcore-tutorial.7 && \
 xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man gitcore-tutorial.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f gitdiffcore.7 && \
-xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man gitdiffcore.xml
-make[2]: Leaving directory '/build/git-2.20.1/Documentation'
-make[2]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f user-manual.html+ user-manual.html && \
 xsltproc --xinclude --stringparam html.stylesheet docbook-xsl.css -o user-manual.html+ docbook.xsl user-manual.xml && \
 mv user-manual.html+ user-manual.html
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 SubmittingPatches.txt
+rm -f gitrevisions.7 && \
+xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man gitrevisions.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f gitsubmodules.7 && \
-xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man gitsubmodules.xml
+rm -f gitglossary.7 && \
+xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man gitglossary.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f gitworkflows.7 && \
-xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man gitworkflows.xml
+rm -f gittutorial.7 && \
+xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man gittutorial.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f gittutorial-2.7 && \
-xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man gittutorial-2.xml
+rm -f gitworkflows.7 && \
+xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man gitworkflows.xml
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1/Documentation'
-rm -f gittutorial.7 && \
-xmlto -m manpage-normal.xsl  -m manpage-bold-literal.xsl -m manpage-base-url.xsl man gittutorial.xml
+TZ=UTC asciidoc  -a git-asciidoc-no-roff -f asciidoc.conf -agit_version=2.20.1 -b xhtml11 SubmittingPatches.txt
 make[2]: Leaving directory '/build/git-2.20.1/Documentation'
 make[1]: Entering directory '/build/git-2.20.1'
 # git-mediawiki
@@ -6576,28 +6611,28 @@
 /usr/bin/make -C ../.. SCRIPT_PERL="contrib/mw-to-git//git-remote-mediawiki.perl contrib/mw-to-git//git-mw.perl" \
                 build-perl-script
 make[3]: Entering directory '/build/git-2.20.1'
-rm -f contrib/mw-to-git//git-mw contrib/mw-to-git//git-mw+ && \
+rm -f contrib/mw-to-git//git-remote-mediawiki contrib/mw-to-git//git-remote-mediawiki+ && \
 sed -e '1{' \
     -e '	s|#!.*perl|#!/usr/bin/perl|' \
     -e '	r GIT-PERL-HEADER' \
     -e '	G' \
     -e '}' \
     -e 's/@@GIT_VERSION@@/2.20.1/g' \
-    contrib/mw-to-git//git-mw.perl >contrib/mw-to-git//git-mw+ && \
-chmod +x contrib/mw-to-git//git-mw+ && \
-mv contrib/mw-to-git//git-mw+ contrib/mw-to-git//git-mw
+    contrib/mw-to-git//git-remote-mediawiki.perl >contrib/mw-to-git//git-remote-mediawiki+ && \
+chmod +x contrib/mw-to-git//git-remote-mediawiki+ && \
+mv contrib/mw-to-git//git-remote-mediawiki+ contrib/mw-to-git//git-remote-mediawiki
 make[3]: Leaving directory '/build/git-2.20.1'
 make[3]: Entering directory '/build/git-2.20.1'
-rm -f contrib/mw-to-git//git-remote-mediawiki contrib/mw-to-git//git-remote-mediawiki+ && \
+rm -f contrib/mw-to-git//git-mw contrib/mw-to-git//git-mw+ && \
 sed -e '1{' \
     -e '	s|#!.*perl|#!/usr/bin/perl|' \
     -e '	r GIT-PERL-HEADER' \
     -e '	G' \
     -e '}' \
     -e 's/@@GIT_VERSION@@/2.20.1/g' \
-    contrib/mw-to-git//git-remote-mediawiki.perl >contrib/mw-to-git//git-remote-mediawiki+ && \
-chmod +x contrib/mw-to-git//git-remote-mediawiki+ && \
-mv contrib/mw-to-git//git-remote-mediawiki+ contrib/mw-to-git//git-remote-mediawiki
+    contrib/mw-to-git//git-mw.perl >contrib/mw-to-git//git-mw+ && \
+chmod +x contrib/mw-to-git//git-mw+ && \
+mv contrib/mw-to-git//git-mw+ contrib/mw-to-git//git-mw
 make[3]: Leaving directory '/build/git-2.20.1'
    debian/rules override_dh_auto_test-arch
 test -z 'test' || \
@@ -6652,47 +6687,47 @@
 mv git-cvsimport+ git-cvsimport
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-rm -f git-cvsserver git-cvsserver+ && \
+rm -f git-svn git-svn+ && \
 sed -e '1{' \
     -e '	s|#!.*perl|#!/usr/bin/perl|' \
     -e '	r GIT-PERL-HEADER' \
     -e '	G' \
     -e '}' \
     -e 's/@@GIT_VERSION@@/2.20.1/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/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-rm -f git-send-email git-send-email+ && \
+rm -f git-cvsserver git-cvsserver+ && \
 sed -e '1{' \
     -e '	s|#!.*perl|#!/usr/bin/perl|' \
     -e '	r GIT-PERL-HEADER' \
     -e '	G' \
     -e '}' \
     -e 's/@@GIT_VERSION@@/2.20.1/g' \
-    git-send-email.perl >git-send-email+ && \
-chmod +x git-send-email+ && \
-mv git-send-email+ git-send-email
+    git-cvsserver.perl >git-cvsserver+ && \
+chmod +x git-cvsserver+ && \
+mv git-cvsserver+ git-cvsserver
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-rm -f git-svn git-svn+ && \
+rm -f git-p4 git-p4+ && \
+sed -e '1s|#!.*python|#!/usr/bin/python|' \
+    git-p4.py >git-p4+ && \
+chmod +x git-p4+ && \
+mv git-p4+ git-p4
+make[2]: Leaving directory '/build/git-2.20.1'
+make[2]: Entering directory '/build/git-2.20.1'
+rm -f git-send-email git-send-email+ && \
 sed -e '1{' \
     -e '	s|#!.*perl|#!/usr/bin/perl|' \
     -e '	r GIT-PERL-HEADER' \
     -e '	G' \
     -e '}' \
     -e 's/@@GIT_VERSION@@/2.20.1/g' \
-    git-svn.perl >git-svn+ && \
-chmod +x git-svn+ && \
-mv git-svn+ git-svn
-make[2]: Leaving directory '/build/git-2.20.1'
-make[2]: Entering directory '/build/git-2.20.1'
-rm -f git-p4 git-p4+ && \
-sed -e '1s|#!.*python|#!/usr/bin/python|' \
-    git-p4.py >git-p4+ && \
-chmod +x git-p4+ && \
-mv git-p4+ git-p4
+    git-send-email.perl >git-send-email+ && \
+chmod +x git-send-email+ && \
+mv git-send-email+ git-send-email
 make[2]: Leaving directory '/build/git-2.20.1'
 /usr/bin/make -C git-gui  gitexecdir='/usr/lib/git-core' all
 /usr/bin/make -C gitk-git  all
@@ -6721,84 +6756,99 @@
 1..1
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t0009-prio-queue.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t0009-prio-queue/.git/
+*** t0007-git-var.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t0007-git-var/.git/
 expecting success: 
-	test-tool prio-queue 2 6 3 10 9 5 7 4 5 8 1 dump >actual &&
+	test_tick &&
+	echo "$GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL> $GIT_AUTHOR_DATE" >expect &&
+	git var GIT_AUTHOR_IDENT >actual &&
 	test_cmp expect actual
 
-ok 1 - basic ordering
+ok 1 - get GIT_AUTHOR_IDENT
 
 expecting success: 
-	test-tool prio-queue 6 2 4 get 5 3 get get 1 dump >actual &&
+	test_tick &&
+	echo "$GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE" >expect &&
+	git var GIT_COMMITTER_IDENT >actual &&
 	test_cmp expect actual
 
-ok 2 - mixed put and get
+ok 2 - get GIT_COMMITTER_IDENT
+
+checking prerequisite: AUTOIDENT
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
+	sane_unset GIT_AUTHOR_NAME &&
+	sane_unset GIT_AUTHOR_EMAIL &&
+	git var GIT_AUTHOR_IDENT
+
+)
+second user <pbuilder2@ionos5-amd64.debian.net> 1112912053 -0700
+prerequisite AUTOIDENT ok
+skipping test: requested identites are strict 
+	(
+		sane_unset GIT_COMMITTER_NAME &&
+		sane_unset GIT_COMMITTER_EMAIL &&
+		test_must_fail git var GIT_COMMITTER_IDENT
+	)
+
+ok 3 # skip requested identites are strict (missing !AUTOIDENT)
 
 expecting success: 
-	test-tool prio-queue 1 2 get get get 1 2 get get get >actual &&
-	test_cmp expect actual
+	git var -l >actual &&
+	echo "$GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL> $GIT_AUTHOR_DATE" >expect &&
+	sed -n s/GIT_AUTHOR_IDENT=//p <actual >actual.author &&
+	test_cmp expect actual.author
 
-ok 3 - notice empty queue
+ok 4 - git var -l lists variables
 
 expecting success: 
-	test-tool prio-queue stack 8 1 5 4 6 2 3 dump >actual &&
-	test_cmp expect actual
+	git var -l >actual &&
+	echo false >expect &&
+	sed -n s/core\\.bare=//p <actual >actual.bare &&
+	test_cmp expect actual.bare
 
-ok 4 - stack order
+ok 5 - git var -l lists config
 
-# passed all 4 test(s)
-1..4
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t0005-signals.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t0005-signals/.git/
 expecting success: 
-	{ 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
+	test_must_fail git var -l GIT_COMMITTER_IDENT
 
-Terminated
-ok 1 - sigchain works
+usage: git var (-l | <variable>)
+ok 6 - listing and asking for variables are exclusive
 
+# passed all 6 test(s)
+1..6
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t0009-prio-queue.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t0009-prio-queue/.git/
 expecting success: 
-	# 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
+	test-tool prio-queue 2 6 3 10 9 5 7 4 5 8 1 dump >actual &&
+	test_cmp expect actual
 
-three
-two
-one
-error: exec test-tool sigchain died of signal 15
-ok 2 - signals are propagated using shell convention
+ok 1 - basic ordering
 
 expecting success: 
-	test-tool genrandom foo 16384 >file &&
-	git add file
+	test-tool prio-queue 6 2 4 get 5 3 get get 1 dump >actual &&
+	test_cmp expect actual
 
-ok 3 - create blob
+ok 2 - mixed put and get
 
 expecting success: 
-	OUT=$( ((large_git; echo $? 1>&3) | :) 3>&1 ) &&
-	test_match_signal 13 "$OUT"
+	test-tool prio-queue 1 2 get get get 1 2 get get get >actual &&
+	test_cmp expect actual
 
-ok 4 - a constipated git dies with SIGPIPE
+ok 3 - notice empty queue
 
 expecting success: 
-	OUT=$( ((trap "" PIPE; large_git; echo $? 1>&3) | :) 3>&1 ) &&
-	test_match_signal 13 "$OUT"
+	test-tool prio-queue stack 8 1 5 4 6 2 3 dump >actual &&
+	test_cmp expect actual
 
-ok 5 - a constipated git dies with SIGPIPE even if parent ignores it
+ok 4 - stack order
 
-# passed all 5 test(s)
-1..5
+# passed all 4 test(s)
+1..4
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
 *** t0014-alias.sh ***
@@ -6836,92 +6886,54 @@
 1..3
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t0007-git-var.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t0007-git-var/.git/
-expecting success: 
-	test_tick &&
-	echo "$GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL> $GIT_AUTHOR_DATE" >expect &&
-	git var GIT_AUTHOR_IDENT >actual &&
-	test_cmp expect actual
-
-ok 1 - get GIT_AUTHOR_IDENT
-
+*** t0005-signals.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t0005-signals/.git/
 expecting success: 
-	test_tick &&
-	echo "$GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE" >expect &&
-	git var GIT_COMMITTER_IDENT >actual &&
+	{ 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
 
-ok 2 - get GIT_COMMITTER_IDENT
-
-checking prerequisite: AUTOIDENT
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
-	sane_unset GIT_AUTHOR_NAME &&
-	sane_unset GIT_AUTHOR_EMAIL &&
-	git var GIT_AUTHOR_IDENT
-
-)
-
-*** 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.
+Terminated
+ok 1 - sigchain works
 
-fatal: empty ident name (for <pbuilder1@ionos1-amd64.debian.net>) not allowed
-prerequisite AUTOIDENT not satisfied
 expecting success: 
-	(
-		sane_unset GIT_COMMITTER_NAME &&
-		sane_unset GIT_COMMITTER_EMAIL &&
-		test_must_fail git var GIT_COMMITTER_IDENT
-	)
-
-
-*** 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.
+	# 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
 
-fatal: empty ident name (for <pbuilder1@ionos1-amd64.debian.net>) not allowed
-ok 3 - requested identites are strict
+three
+two
+one
+error: exec test-tool sigchain died of signal 15
+ok 2 - signals are propagated using shell convention
 
 expecting success: 
-	git var -l >actual &&
-	echo "$GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL> $GIT_AUTHOR_DATE" >expect &&
-	sed -n s/GIT_AUTHOR_IDENT=//p <actual >actual.author &&
-	test_cmp expect actual.author
+	test-tool genrandom foo 16384 >file &&
+	git add file
 
-ok 4 - git var -l lists variables
+ok 3 - create blob
 
 expecting success: 
-	git var -l >actual &&
-	echo false >expect &&
-	sed -n s/core\\.bare=//p <actual >actual.bare &&
-	test_cmp expect actual.bare
+	OUT=$( ((large_git; echo $? 1>&3) | :) 3>&1 ) &&
+	test_match_signal 13 "$OUT"
 
-ok 5 - git var -l lists config
+ok 4 - a constipated git dies with SIGPIPE
 
 expecting success: 
-	test_must_fail git var -l GIT_COMMITTER_IDENT
+	OUT=$( ((trap "" PIPE; large_git; echo $? 1>&3) | :) 3>&1 ) &&
+	test_match_signal 13 "$OUT"
 
-usage: git var (-l | <variable>)
-ok 6 - listing and asking for variables are exclusive
+ok 5 - a constipated git dies with SIGPIPE even if parent ignores it
 
-# passed all 6 test(s)
-1..6
+# passed all 5 test(s)
+1..5
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
 *** t0004-unwritable.sh ***
@@ -7014,6 +7026,75 @@
 1..5
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
+*** t0023-crlf-am.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t0023-crlf-am/.git/
+expecting success: 
+
+	git config core.autocrlf true &&
+	echo foo >bar &&
+	git add bar &&
+	test_tick &&
+	git commit -m initial
+
+
+warning: LF will be replaced by CRLF in bar.
+The file will have its original line endings in your working directory
+[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: 
+
+	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/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t0025-crlf-renormalize.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t0025-crlf-renormalize/.git/
+expecting success: 
+	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) b15bc22] initial
+ Author: A U Thor <author@example.com>
+ 3 files changed, 9 insertions(+)
+ create mode 100644 CRLF.txt
+ create mode 100644 CRLF_mix_LF.txt
+ create mode 100644 LF.txt
+ok 1 - setup
+
+expecting success: 
+	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 |
+	sed -e "s/	/ /g" -e "s/  */ /g" |
+	sort >actual &&
+	test_cmp expect actual
+
+ok 2 - renormalize CRLF in repo
+
+# passed all 2 test(s)
+1..2
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
 *** t0022-crlf-rename.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t0022-crlf-rename/.git/
 expecting success: 
@@ -7056,38 +7137,6 @@
 1..2
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t0023-crlf-am.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t0023-crlf-am/.git/
-expecting success: 
-
-	git config core.autocrlf true &&
-	echo foo >bar &&
-	git add bar &&
-	test_tick &&
-	git commit -m initial
-
-
-warning: LF will be replaced by CRLF in bar.
-The file will have its original line endings in your working directory
-[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: 
-
-	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/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
 *** t0024-crlf-archive.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t0024-crlf-archive/.git/
 expecting success: 
@@ -7437,43 +7486,6 @@
 1..15
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t0025-crlf-renormalize.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t0025-crlf-renormalize/.git/
-expecting success: 
-	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) dd7be42] initial
- Author: A U Thor <author@example.com>
- 3 files changed, 9 insertions(+)
- create mode 100644 CRLF.txt
- create mode 100644 CRLF_mix_LF.txt
- create mode 100644 LF.txt
-ok 1 - setup
-
-expecting success: 
-	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 |
-	sed -e "s/	/ /g" -e "s/  */ /g" |
-	sort >actual &&
-	test_cmp expect actual
-
-ok 2 - renormalize CRLF in repo
-
-# passed all 2 test(s)
-1..2
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
 *** t0002-gitfile.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t0002-gitfile/.git/
 expecting success: 
@@ -7997,7 +8009,7 @@
 
 	echo happy.
 
-[master (root-commit) 2bf868d] initial
+[master (root-commit) 1e678fc] initial
  Author: A U Thor <author@example.com>
  3 files changed, 13 insertions(+)
  create mode 100644 .gitattributes
@@ -8089,6 +8101,200 @@
 1..6
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
+*** t0051-windows-named-pipe.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t0051-windows-named-pipe/.git/
+skipping test: o_append write to named pipe 
+	GIT_TRACE="$(pwd)/expect" git status >/dev/null 2>&1 &&
+	{ test-tool windows-named-pipe t0051 >actual 2>&1 & } &&
+	pid=$! &&
+	sleep 1 &&
+	GIT_TRACE=//./pipe/t0051 git status >/dev/null 2>warning &&
+	wait $pid &&
+	test_cmp expect actual
+
+ok 1 # skip o_append write to named pipe (missing MINGW)
+
+# passed all 1 test(s)
+1..1
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t0055-beyond-symlinks.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t0055-beyond-symlinks/.git/
+checking prerequisite: SYMLINKS
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
+	# test whether the filesystem supports symbolic links
+	ln -s x y && test -h y
+
+)
+prerequisite SYMLINKS ok
+expecting success: 
+	>a &&
+	mkdir b &&
+	ln -s b c &&
+	>c/d &&
+	git update-index --add a b/d
+
+ok 1 - setup
+
+expecting success: 
+	test_must_fail git update-index --add c/d &&
+	! ( git ls-files | grep c/d )
+
+error: 'c/d' is beyond a symbolic link
+fatal: Unable to process path c/d
+ok 2 - update-index --add beyond symlinks
+
+expecting success: 
+	test_must_fail git add c/d &&
+	! ( git ls-files | grep c/d )
+
+fatal: pathspec 'c/d' is beyond a symbolic link
+ok 3 - add beyond symlinks
+
+# passed all 3 test(s)
+1..3
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t0041-usage.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t0041-usage/.git/
+expecting success: 
+	test_commit "v1.0"
+
+[master (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: 
+	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: 
+	test_must_fail git tag --contains "notag" >actual 2>actual.err &&
+	test_line_count = 0 actual &&
+	test_i18ngrep "error" actual.err &&
+	test_i18ngrep ! "usage" actual.err
+
+error: malformed object name notag
+ok 3 - tag --contains <inexistent_tag>
+
+expecting success: 
+	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: 
+	test_must_fail git tag --no-contains "notag" >actual 2>actual.err &&
+	test_line_count = 0 actual &&
+	test_i18ngrep "error" actual.err &&
+	test_i18ngrep ! "usage" actual.err
+
+error: malformed object name notag
+ok 5 - tag --no-contains <inexistent_tag>
+
+expecting success: 
+	test_must_fail git tag --noopt >actual 2>actual.err &&
+	test_line_count = 0 actual &&
+	test_i18ngrep "usage" actual.err
+
+usage: git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> [<head>]
+ok 6 - tag usage error
+
+expecting success: 
+	git branch --contains "master" >actual 2>actual.err &&
+	test_i18ngrep "master" actual &&
+	test_line_count = 0 actual.err
+
+* master
+ok 7 - branch --contains <existent_commit>
+
+expecting success: 
+	test_must_fail git branch --no-contains "nocommit" >actual 2>actual.err &&
+	test_line_count = 0 actual &&
+	test_i18ngrep "error" actual.err &&
+	test_i18ngrep ! "usage" actual.err
+
+error: malformed object name nocommit
+ok 8 - branch --contains <inexistent_commit>
+
+expecting success: 
+	git branch --no-contains "master" >actual 2>actual.err &&
+	test_line_count = 0 actual &&
+	test_line_count = 0 actual.err
+
+ok 9 - branch --no-contains <existent_commit>
+
+expecting success: 
+	test_must_fail git branch --no-contains "nocommit" >actual 2>actual.err &&
+	test_line_count = 0 actual &&
+	test_i18ngrep "error" actual.err &&
+	test_i18ngrep ! "usage" actual.err
+
+error: malformed object name nocommit
+ok 10 - branch --no-contains <inexistent_commit>
+
+expecting success: 
+	test_must_fail git branch --noopt >actual 2>actual.err &&
+	test_line_count = 0 actual &&
+	test_i18ngrep "usage" actual.err
+
+usage: git branch [<options>] [-r | -a] [--merged | --no-merged]
+ok 11 - branch usage error
+
+expecting success: 
+	git for-each-ref --contains "master" >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: 
+	test_must_fail git for-each-ref --no-contains "noobject" >actual 2>actual.err &&
+	test_line_count = 0 actual &&
+	test_i18ngrep "error" actual.err &&
+	test_i18ngrep ! "usage" actual.err
+
+error: malformed object name noobject
+ok 13 - for-each-ref --contains <inexistent_object>
+
+expecting success: 
+	git for-each-ref --no-contains "master" >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: 
+	test_must_fail git for-each-ref --no-contains "noobject" >actual 2>actual.err &&
+	test_line_count = 0 actual &&
+	test_i18ngrep "error" actual.err &&
+	test_i18ngrep ! "usage" actual.err
+
+error: malformed object name noobject
+ok 15 - for-each-ref --no-contains <inexistent_object>
+
+expecting success: 
+	test_must_fail git for-each-ref --noopt >actual 2>actual.err &&
+	test_line_count = 0 actual &&
+	test_i18ngrep "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/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
 *** t0050-filesystem.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t0050-filesystem/.git/
 checking prerequisite: CASE_INSENSITIVE_FS
@@ -8153,12 +8359,12 @@
 	git commit -m "rename" &&
 	git checkout -f master
 
-[master (root-commit) 46f77d2] initial
+[master (root-commit) 8b36ffe] initial
  Author: A U Thor <author@example.com>
  1 file changed, 0 insertions(+), 0 deletions(-)
  create mode 100644 camelcase
 Switched to a new branch 'topic'
-[topic 25eca04] rename
+[topic 3d315b8] rename
  Author: A U Thor <author@example.com>
  1 file changed, 0 insertions(+), 0 deletions(-)
  rename camelcase => CamelCase (100%)
@@ -8169,7 +8375,7 @@
 	git mv camelcase CamelCase &&
 	git commit -m "rename"
 
-[master 25eca04] rename
+[master 3d315b8] rename
  Author: A U Thor <author@example.com>
  1 file changed, 0 insertions(+), 0 deletions(-)
  rename camelcase => CamelCase (100%)
@@ -8181,8 +8387,8 @@
 	git reset --hard initial &&
 	git merge topic
 
-HEAD is now at 46f77d2 initial
-Updating 46f77d2..25eca04
+HEAD is now at 8b36ffe initial
+Updating 8b36ffe..3d315b8
 Fast-forward
  camelcase => CamelCase | 0
  1 file changed, 0 insertions(+), 0 deletions(-)
@@ -8232,12 +8438,12 @@
 	git checkout -f master
 
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t0050-filesystem/unicode/.git/
-[master (root-commit) c5b379c] initial
+[master (root-commit) 044e441] initial
  Author: A U Thor <author@example.com>
  1 file changed, 0 insertions(+), 0 deletions(-)
  create mode 100644 "a\314\210"
 Switched to a new branch 'topic'
-[topic 31c746a] rename
+[topic eacb04c] rename
  Author: A U Thor <author@example.com>
  1 file changed, 0 insertions(+), 0 deletions(-)
  rename "a\314\210" => "\303\244" (100%)
@@ -8248,7 +8454,7 @@
 	git mv "$aumlcdiar" "$auml" &&
 	git commit -m rename
 
-[master 31c746a] rename
+[master eacb04c] rename
  Author: A U Thor <author@example.com>
  1 file changed, 0 insertions(+), 0 deletions(-)
  rename "a\314\210" => "\303\244" (100%)
@@ -8258,8 +8464,8 @@
 	git reset --hard initial &&
 	git merge topic
 
-HEAD is now at c5b379c initial
-Updating c5b379c..31c746a
+HEAD is now at 044e441 initial
+Updating 044e441..eacb04c
 Fast-forward
  "a\314\210" => "\303\244" | 0
  1 file changed, 0 insertions(+), 0 deletions(-)
@@ -8270,198 +8476,123 @@
 1..10
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t0051-windows-named-pipe.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t0051-windows-named-pipe/.git/
-skipping test: o_append write to named pipe 
-	GIT_TRACE="$(pwd)/expect" git status >/dev/null 2>&1 &&
-	{ test-tool windows-named-pipe t0051 >actual 2>&1 & } &&
-	pid=$! &&
-	sleep 1 &&
-	GIT_TRACE=//./pipe/t0051 git status >/dev/null 2>warning &&
-	wait $pid &&
-	test_cmp expect actual
-
-ok 1 # skip o_append write to named pipe (missing MINGW)
-
-# passed all 1 test(s)
-1..1
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t0041-usage.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t0041-usage/.git/
+*** t0056-git-C.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t0056-git-C/.git/
 expecting success: 
-	test_commit "v1.0"
+	test_create_repo dir1 &&
+	echo 1 >dir1/a.txt &&
+	msg="initial in dir1" &&
+	(cd dir1 && git add a.txt && git commit -m "$msg") &&
+	echo "$msg" >expected &&
+	git -C dir1 log --format=%s >actual &&
+	test_cmp expected actual
 
-[master (root-commit) 843b676] v1.0
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t0056-git-C/dir1/.git/
+[master (root-commit) aa1073a] initial in dir1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 v1.0.t
-ok 1 - setup 
-
-expecting success: 
-	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: 
-	test_must_fail git tag --contains "notag" >actual 2>actual.err &&
-	test_line_count = 0 actual &&
-	test_i18ngrep "error" actual.err &&
-	test_i18ngrep ! "usage" actual.err
-
-error: malformed object name notag
-ok 3 - tag --contains <inexistent_tag>
-
-expecting success: 
-	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: 
-	test_must_fail git tag --no-contains "notag" >actual 2>actual.err &&
-	test_line_count = 0 actual &&
-	test_i18ngrep "error" actual.err &&
-	test_i18ngrep ! "usage" actual.err
-
-error: malformed object name notag
-ok 5 - tag --no-contains <inexistent_tag>
-
-expecting success: 
-	test_must_fail git tag --noopt >actual 2>actual.err &&
-	test_line_count = 0 actual &&
-	test_i18ngrep "usage" actual.err
-
-usage: git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> [<head>]
-ok 6 - tag usage error
-
-expecting success: 
-	git branch --contains "master" >actual 2>actual.err &&
-	test_i18ngrep "master" actual &&
-	test_line_count = 0 actual.err
-
-* master
-ok 7 - branch --contains <existent_commit>
-
-expecting success: 
-	test_must_fail git branch --no-contains "nocommit" >actual 2>actual.err &&
-	test_line_count = 0 actual &&
-	test_i18ngrep "error" actual.err &&
-	test_i18ngrep ! "usage" actual.err
-
-error: malformed object name nocommit
-ok 8 - branch --contains <inexistent_commit>
-
-expecting success: 
-	git branch --no-contains "master" >actual 2>actual.err &&
-	test_line_count = 0 actual &&
-	test_line_count = 0 actual.err
-
-ok 9 - branch --no-contains <existent_commit>
+ create mode 100644 a.txt
+ok 1 - "git -C <path>" runs git from the directory <path>
 
 expecting success: 
-	test_must_fail git branch --no-contains "nocommit" >actual 2>actual.err &&
-	test_line_count = 0 actual &&
-	test_i18ngrep "error" actual.err &&
-	test_i18ngrep ! "usage" actual.err
+	(
+		mkdir -p dir1/subdir &&
+		cd dir1/subdir &&
+		git -C "" rev-parse --show-prefix >actual &&
+		echo subdir/ >expect &&
+		test_cmp expect actual
+	)
 
-error: malformed object name nocommit
-ok 10 - branch --no-contains <inexistent_commit>
+ok 2 - "git -C <path>" with an empty <path> is a no-op
 
 expecting success: 
-	test_must_fail git branch --noopt >actual 2>actual.err &&
-	test_line_count = 0 actual &&
-	test_i18ngrep "usage" actual.err
+	test_create_repo dir1/dir2 &&
+	echo 1 >dir1/dir2/b.txt &&
+	git -C dir1/dir2 add b.txt &&
+	msg="initial in dir1/dir2" &&
+	echo "$msg" >expected &&
+	git -C dir1/dir2 commit -m "$msg" &&
+	git -C dir1 -C dir2 log --format=%s >actual &&
+	test_cmp expected actual
 
-usage: git branch [<options>] [-r | -a] [--merged | --no-merged]
-ok 11 - branch usage error
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t0056-git-C/dir1/dir2/.git/
+[master (root-commit) 8f4c955] initial in dir1/dir2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b.txt
+ok 3 - Multiple -C options: "-C dir1 -C dir2" is equivalent to "-C dir1/dir2"
 
 expecting success: 
-	git for-each-ref --contains "master" >actual 2>actual.err &&
-	test_line_count = 2 actual &&
-	test_line_count = 0 actual.err
+	mkdir c &&
+	mkdir c/a &&
+	mkdir c/a.git &&
+	(cd c/a.git && git init --bare) &&
+	echo 1 >c/a/a.txt &&
+	git --git-dir c/a.git --work-tree=c/a add a.txt &&
+	git --git-dir c/a.git --work-tree=c/a commit -m "initial" &&
+	git --git-dir=c/a.git log -1 --format=%s >expected &&
+	git -C c --git-dir=a.git log -1 --format=%s >actual &&
+	test_cmp expected actual
 
-ok 12 - for-each-ref --contains <existent_object>
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t0056-git-C/c/a.git/
+[master (root-commit) 2fec353] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 a.txt
+ok 4 - Effect on --git-dir option: "-C c --git-dir=a.git" is equivalent to "--git-dir c/a.git"
 
 expecting success: 
-	test_must_fail git for-each-ref --no-contains "noobject" >actual 2>actual.err &&
-	test_line_count = 0 actual &&
-	test_i18ngrep "error" actual.err &&
-	test_i18ngrep ! "usage" actual.err
+	git -C c --git-dir=a.git log -1 --format=%s >expected &&
+	git --git-dir=a.git -C c log -1 --format=%s >actual &&
+	test_cmp expected actual
 
-error: malformed object name noobject
-ok 13 - for-each-ref --contains <inexistent_object>
+ok 5 - Order should not matter: "--git-dir=a.git -C c" is equivalent to "-C c --git-dir=a.git"
 
 expecting success: 
-	git for-each-ref --no-contains "master" >actual 2>actual.err &&
-	test_line_count = 0 actual &&
-	test_line_count = 0 actual.err
+	rm c/a/a.txt &&
+	git --git-dir=c/a.git --work-tree=c/a status >expected &&
+	git -C c/a.git --work-tree=../a status >actual &&
+	test_cmp expected actual
 
-ok 14 - for-each-ref --no-contains <existent_object>
+ok 6 - Effect on --work-tree option: "-C c/a.git --work-tree=../a"  is equivalent to "--work-tree=c/a --git-dir=c/a.git"
 
 expecting success: 
-	test_must_fail git for-each-ref --no-contains "noobject" >actual 2>actual.err &&
-	test_line_count = 0 actual &&
-	test_i18ngrep "error" actual.err &&
-	test_i18ngrep ! "usage" actual.err
+	git -C c/a.git --work-tree=../a status >expected &&
+	git --work-tree=../a -C c/a.git status >actual &&
+	test_cmp expected actual
 
-error: malformed object name noobject
-ok 15 - for-each-ref --no-contains <inexistent_object>
+ok 7 - Order should not matter: "--work-tree=../a -C c/a.git" is equivalent to "-C c/a.git --work-tree=../a"
 
 expecting success: 
-	test_must_fail git for-each-ref --noopt >actual 2>actual.err &&
-	test_line_count = 0 actual &&
-	test_i18ngrep "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/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t0055-beyond-symlinks.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t0055-beyond-symlinks/.git/
-checking prerequisite: SYMLINKS
+	git --git-dir=c/a.git --work-tree=c/a status >expected &&
+	git -C c --git-dir=a.git --work-tree=a status >actual &&
+	test_cmp expected actual
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
-	# test whether the filesystem supports symbolic links
-	ln -s x y && test -h y
+ok 8 - Effect on --git-dir and --work-tree options - "-C c --git-dir=a.git --work-tree=a" is equivalent to "--git-dir=c/a.git --work-tree=c/a"
 
-)
-prerequisite SYMLINKS ok
 expecting success: 
-	>a &&
-	mkdir b &&
-	ln -s b c &&
-	>c/d &&
-	git update-index --add a b/d
+	git -C c --git-dir=a.git --work-tree=a status >expected &&
+	git --git-dir=a.git -C c --work-tree=a status >actual &&
+	test_cmp expected actual
 
-ok 1 - setup
+ok 9 - Order should not matter: "-C c --git-dir=a.git --work-tree=a" is equivalent to "--git-dir=a.git -C c --work-tree=a"
 
 expecting success: 
-	test_must_fail git update-index --add c/d &&
-	! ( git ls-files | grep c/d )
+	git -C c --git-dir=a.git --work-tree=a status >expected &&
+	git --git-dir=a.git --work-tree=a -C c status >actual &&
+	test_cmp expected actual
 
-error: 'c/d' is beyond a symbolic link
-fatal: Unable to process path c/d
-ok 2 - update-index --add beyond symlinks
+ok 10 - Order should not matter: "-C c --git-dir=a.git --work-tree=a" is equivalent to "--git-dir=a.git --work-tree=a -C c"
 
 expecting success: 
-	test_must_fail git add c/d &&
-	! ( git ls-files | grep c/d )
+	echo "initial in dir1/dir2" >expected &&
+	git -C dir1 -C "$(pwd)/dir1/dir2" log --format=%s >actual &&
+	test_cmp expected actual
 
-fatal: pathspec 'c/d' is beyond a symbolic link
-ok 3 - add beyond symlinks
+ok 11 - Relative followed by fullpath: "-C ./here -C /there" is equivalent to "-C /there"
 
-# passed all 3 test(s)
-1..3
+# passed all 11 test(s)
+1..11
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
 *** t0028-working-tree-encoding.sh ***
@@ -8527,7 +8658,7 @@
 | 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 ?
 
-[master (root-commit) 66a5c84] initial
+[master (root-commit) a7f3ead] initial
  Author: A U Thor <author@example.com>
  2 files changed, 3 insertions(+)
  create mode 100644 .gitattributes
@@ -8632,7 +8763,7 @@
 | 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 66a5c84 initial
+HEAD is now at a7f3ead initial
 ok 4 - check $GIT_DIR/info/attributes support
 
 expecting success: 
@@ -8704,7 +8835,7 @@
 | 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 66a5c84 initial
+HEAD is now at a7f3ead initial
 ok 5 - check prohibited UTF-16 BOM
 
 expecting success: 
@@ -8726,7 +8857,39 @@
 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.
-HEAD is now at 66a5c84 initial
+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.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 ?
+
+HEAD is now at a7f3ead initial
 ok 6 - check required UTF-16 BOM
 
 expecting success: 
@@ -8777,6 +8940,22 @@
 
 warning: CRLF will be replaced by LF in eol.utf16.
 The file will have its original line endings in your working directory
+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 (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  
@@ -8789,11 +8968,91 @@
 |  8:  d   |  9:  a   | 10: 74 t | 11: 68 h | 12: 72 r | 13: 65 e | 14: 65 e | 15:  d  
 | 16:  a  
 
-[master a1eba25] eol
+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 ?
+
+[master 472605f] eol
  Author: A U Thor <author@example.com>
  1 file changed, 3 insertions(+)
  create mode 100644 eol.utf16
-HEAD is now at 66a5c84 initial
+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.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.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.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 ?
+
+HEAD is now at a7f3ead initial
 ok 7 - eol conversion for UTF-16 encoded files on checkout
 
 expecting success: 
@@ -8833,7 +9092,39 @@
 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.
-HEAD is now at 66a5c84 initial
+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.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 ?
+
+HEAD is now at a7f3ead initial
 ok 8 - check prohibited UTF-32 BOM
 
 expecting success: 
@@ -8855,7 +9146,39 @@
 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 66a5c84 initial
+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.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 ?
+
+HEAD is now at a7f3ead initial
 ok 9 - check required UTF-32 BOM
 
 expecting success: 
@@ -8910,6 +9233,22 @@
 
 warning: CRLF will be replaced by LF in eol.utf32.
 The file will have its original line endings in your working directory
+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 (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  
@@ -8926,11 +9265,59 @@
 |  8:  d   |  9:  a   | 10: 74 t | 11: 68 h | 12: 72 r | 13: 65 e | 14: 65 e | 15:  d  
 | 16:  a  
 
-[master ccbdd60] eol
+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 ?
+
+[master e6a49e9] eol
  Author: A U Thor <author@example.com>
  1 file changed, 3 insertions(+)
  create mode 100644 eol.utf32
-HEAD is now at 66a5c84 initial
+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.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 ?
+
+HEAD is now at a7f3ead initial
 ok 10 - eol conversion for UTF-32 encoded files on checkout
 
 expecting success: 
@@ -8956,7 +9343,7 @@
 
 fatal: true/false are no valid working-tree-encodings
 fatal: failed to encode 't.garbage' from garbage to UTF-8
-HEAD is now at 66a5c84 initial
+HEAD is now at a7f3ead initial
 ok 11 - check unsupported encodings
 
 expecting success: 
@@ -8978,7 +9365,7 @@
 	test_i18ngrep "error: .* overwritten by checkout:" err.out
 
 error: Your local changes to the following files would be overwritten by checkout:
-HEAD is now at 66a5c84 initial
+HEAD is now at a7f3ead initial
 ok 12 - error if encoding round trip is not the same during refresh
 
 expecting success: 
@@ -8998,7 +9385,7 @@
 
 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 66a5c84 initial
+HEAD is now at a7f3ead initial
 ok 13 - error if encoding garbage is already in Git
 
 checking prerequisite: ICONV_SHIFT_JIS
@@ -9061,21 +9448,798 @@
 Checking roundtrip encoding for utf-16...
 Unstaged changes after reset:
 M	.gitattributes
-HEAD is now at 66a5c84 initial
+HEAD is now at a7f3ead initial
 ok 14 - check roundtrip encoding
 
 # passed all 14 test(s)
 1..14
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
+*** t0062-revision-walking.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t0062-revision-walking/.git/
+expecting success: 
+	echo a > a &&
+	git add a &&
+	git commit -m "add a" &&
+	echo b > b &&
+	git add b &&
+	git commit -m "add b"
+
+[master (root-commit) 380a26d] add a
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 a
+[master 0a41d80] add b
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b
+ok 1 - setup
+
+expecting success: 
+	test-tool revision-walking run-twice >run_twice_actual &&
+	test_cmp run_twice_expected run_twice_actual
+
+ok 2 - revision walking can be done twice
+
+# passed all 2 test(s)
+1..2
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t0040-parse-options.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t0040-parse-options/.git/
+expecting success: 
+	test_must_fail test-tool parse-options -h >output 2>output.err &&
+	test_must_be_empty output.err &&
+	test_i18ncmp expect output
+
+ok 1 - test help
+
+expecting success: check boolean: 1 --yes
+ok 2 - OPT_BOOL() #1
+
+expecting success: check boolean: 1 --no-doubt
+ok 3 - OPT_BOOL() #2
+
+expecting success: check boolean: 1 -D
+ok 4 - OPT_BOOL() #3
+
+expecting success: check boolean: 1 --no-fear
+ok 5 - OPT_BOOL() #4
+
+expecting success: check boolean: 1 -B
+ok 6 - OPT_BOOL() #5
+
+expecting success: check boolean: 1 --yes --yes
+ok 7 - OPT_BOOL() is idempotent #1
+
+expecting success: check boolean: 1 -DB
+ok 8 - OPT_BOOL() is idempotent #2
+
+expecting success: check boolean: 0 -D --no-yes
+ok 9 - OPT_BOOL() negation #1
+
+expecting success: check boolean: 0 -D --no-no-doubt
+ok 10 - OPT_BOOL() negation #2
+
+expecting success: check_unknown_i18n --fear
+ok 11 - OPT_BOOL() no negation #1
+
+expecting success: check_unknown_i18n --no-no-fear
+ok 12 - OPT_BOOL() no negation #2
+
+expecting success: check boolean: 0 -D --doubt
+ok 13 - OPT_BOOL() positivation
+
+expecting success: check integer: -2345 -i -2345
+ok 14 - OPT_INT() negative
+
+expecting success: 
+	check magnitude: 2345678 -m 2345678
+
+ok 15 - OPT_MAGNITUDE() simple
+
+expecting success: 
+	check magnitude: 239616 -m 234k
+
+ok 16 - OPT_MAGNITUDE() kilo
+
+expecting success: 
+	check magnitude: 104857600 -m 100m
+
+ok 17 - OPT_MAGNITUDE() mega
+
+expecting success: 
+	check magnitude: 1073741824 -m 1g
+
+ok 18 - OPT_MAGNITUDE() giga
+
+expecting success: 
+	check magnitude: 3221225472 -m 3g
+
+ok 19 - OPT_MAGNITUDE() 3giga
+
+expecting success: 
+	test-tool parse-options -s123 -b -i 1729 -m 16k -b -vv -n -F my.file \
+	>output 2>output.err &&
+	test_cmp expect output &&
+	test_must_be_empty output.err
+
+ok 20 - short options
+
+expecting success: 
+	test-tool parse-options --boolean --integer 1729 --magnitude 16k \
+		--boolean --string2=321 --verbose --verbose --no-dry-run \
+		--abbrev=10 --file fi.le --obsolete \
+		>output 2>output.err &&
+	test_must_be_empty output.err &&
+	test_cmp expect output
+
+ok 21 - long options
+
+expecting success: 
+	test_expect_code 129 test-tool parse-options -s &&
+	test_expect_code 129 test-tool parse-options --string &&
+	test_expect_code 129 test-tool parse-options --file
+
+error: switch `s' requires a value
+error: option `string' requires a value
+error: option `file' requires a value
+ok 22 - missing required value
+
+expecting success: 
+	test-tool parse-options a1 --string 123 b1 --boolean -j 13 -- --boolean \
+		>output 2>output.err &&
+	test_must_be_empty output.err &&
+	test_cmp expect output
+
+ok 23 - intermingled arguments
+
+expecting success: 
+	test-tool parse-options --int 2 --boolean --no-bo >output 2>output.err &&
+	test_must_be_empty output.err &&
+	test_cmp expect output
+
+ok 24 - unambiguously abbreviated option
+
+expecting success: 
+	test-tool parse-options --expect="integer: 2" --int=2
+
+ok 25 - unambiguously abbreviated option with "="
+
+expecting success: 
+	test_expect_code 129 test-tool parse-options --strin 123
+
+error: Ambiguous option: strin (could be --string or --string2)
+usage: test-tool parse-options <options>
+
+    A helper function for the parse-options API.
+
+    --yes                 get a boolean
+    -D, --no-doubt        begins with 'no-'
+    -B, --no-fear         be brave
+    -b, --boolean         increment by one
+    -4, --or4             bitwise-or boolean with ...0100
+    --neg-or4             same as --no-or4
+
+    -i, --integer <n>     get a integer
+    -j <n>                get a integer, too
+    -m, --magnitude <n>   get a magnitude
+    --set23               set integer to 23
+    -L, --length <str>    get length of <str>
+    -F, --file <file>     set file to <file>
+
+String options
+    -s, --string <string>
+                          get a string
+    --string2 <str>       get another string
+    --st <st>             get another string (pervert ordering)
+    -o <str>              get another string
+    --list <str>          add str to list
+
+Magic arguments
+    --quux                means --quux
+    -NUM                  set integer to NUM
+    +                     same as -b
+    --ambiguous           positive ambiguity
+    --no-ambiguous        negative ambiguity
+
+Standard options
+    --abbrev[=<n>]        use <n> digits to display SHA-1s
+    -v, --verbose         be verbose
+    -n, --dry-run         dry run
+    -q, --quiet           be quiet
+    --expect <string>     expected output in the variable dump
+
+ok 26 - ambiguously abbreviated option
+
+expecting success: 
+	test-tool parse-options --expect="string: 123" --st 123
+
+ok 27 - non ambiguous option (after two options it abbreviates)
+
+expecting success: 
+	test_must_fail test-tool parse-options -boolean >output 2>output.err &&
+	test_must_be_empty output &&
+	test_cmp typo.err output.err
+
+ok 28 - detect possible typos
+
+expecting success: 
+	test_must_fail test-tool parse-options -ambiguous >output 2>output.err &&
+	test_must_be_empty output &&
+	test_cmp typo.err output.err
+
+ok 29 - detect possible typos
+
+expecting success: 
+	test-tool parse-options --expect="arg 00: --quux" --quux
+
+ok 30 - keep some options as arguments
+
+expecting success: 
+	test-tool parse-options --length=four -b -4 >output 2>output.err &&
+	test_must_be_empty output.err &&
+	test_cmp expect output
+
+ok 31 - OPT_CALLBACK() and OPT_BIT() work
+
+expecting success: 
+	test_must_fail test-tool parse-options --no-length >output 2>output.err &&
+	test_must_be_empty output &&
+	test_must_be_empty output.err
+
+ok 32 - OPT_CALLBACK() and callback errors work
+
+expecting success: 
+	test-tool parse-options --set23 -bbbbb --no-or4 >output 2>output.err &&
+	test_must_be_empty output.err &&
+	test_cmp expect output
+
+ok 33 - OPT_BIT() and OPT_SET_INT() work
+
+expecting success: 
+	test-tool parse-options --set23 -bbbbb --neg-or4 >output 2>output.err &&
+	test_must_be_empty output.err &&
+	test_cmp expect output
+
+ok 34 - OPT_NEGBIT() and OPT_SET_INT() work
+
+expecting success: 
+	test-tool parse-options --expect="boolean: 6" -bb --or4
+
+ok 35 - OPT_BIT() works
+
+expecting success: 
+	test-tool parse-options --expect="boolean: 6" -bb --no-neg-or4
+
+ok 36 - OPT_NEGBIT() works
+
+expecting success: 
+	test-tool parse-options --expect="boolean: 6" + + + + + +
+
+ok 37 - OPT_COUNTUP() with PARSE_OPT_NODASH works
+
+expecting success: 
+	test-tool parse-options --expect="integer: 12345" -12345
+
+ok 38 - OPT_NUMBER_CALLBACK() works
+
+expecting success: 
+	test-tool parse-options --no-ambig >output 2>output.err &&
+	test_must_be_empty output.err &&
+	test_cmp expect output
+
+ok 39 - negation of OPT_NONEG flags is not ambiguous
+
+expecting success: 
+	test-tool parse-options --list foo --list=bar --list=baz >output &&
+	test_cmp expect output
+
+ok 40 - --list keeps list of strings
+
+expecting success: 
+	test-tool parse-options --list=other --list=irrelevant --list=options \
+		--no-list --list=foo --list=bar --list=baz >output &&
+	test_cmp expect output
+
+ok 41 - --no-list resets list
+
+expecting success: 
+	test-tool parse-options --expect="quiet: 3" -q -q -q
+
+ok 42 - multiple quiet levels
+
+expecting success: 
+	test-tool parse-options --expect="verbose: 3" -v -v -v
+
+ok 43 - multiple verbose levels
+
+expecting success: 
+	test-tool parse-options --expect="quiet: 0" --no-quiet
+
+ok 44 - --no-quiet sets --quiet to 0
+
+expecting success: 
+	test-tool parse-options --expect="quiet: 0" -q -q -q --no-quiet
+
+ok 45 - --no-quiet resets multiple -q to 0
+
+expecting success: 
+	test-tool parse-options --expect="verbose: 0" --no-verbose
+
+ok 46 - --no-verbose sets verbose to 0
+
+expecting success: 
+	test-tool parse-options --expect="verbose: 0" -v -v -v --no-verbose
+
+ok 47 - --no-verbose resets multiple verbose to 0
+
+# passed all 47 test(s)
+1..47
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t0006-date.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t0006-date/.git/
+expecting success: 
+	test-tool date relative 1251659995 >actual &&
+	test_i18ncmp expect actual
+	
+ok 1 - relative date (5 seconds ago)
+
+expecting success: 
+	test-tool date relative 1251659700 >actual &&
+	test_i18ncmp expect actual
+	
+ok 2 - relative date (5 minutes ago)
+
+expecting success: 
+	test-tool date relative 1251642000 >actual &&
+	test_i18ncmp expect actual
+	
+ok 3 - relative date (5 hours ago)
+
+expecting success: 
+	test-tool date relative 1251228000 >actual &&
+	test_i18ncmp expect actual
+	
+ok 4 - relative date (5 days ago)
+
+expecting success: 
+	test-tool date relative 1249932000 >actual &&
+	test_i18ncmp expect actual
+	
+ok 5 - relative date (3 weeks ago)
+
+expecting success: 
+	test-tool date relative 1238660000 >actual &&
+	test_i18ncmp expect actual
+	
+ok 6 - relative date (5 months ago)
+
+expecting success: 
+	test-tool date relative 1214160000 >actual &&
+	test_i18ncmp expect actual
+	
+ok 7 - relative date (1 year, 2 months ago)
+
+expecting success: 
+	test-tool date relative 1196472000 >actual &&
+	test_i18ncmp expect actual
+	
+ok 8 - relative date (1 year, 9 months ago)
+
+expecting success: 
+	test-tool date relative 621660000 >actual &&
+	test_i18ncmp expect actual
+	
+ok 9 - relative date (20 years ago)
+
+expecting success: 
+	test-tool date relative 1220210400 >actual &&
+	test_i18ncmp expect actual
+	
+ok 10 - relative date (12 months ago)
+
+expecting success: 
+	test-tool date relative 1188674400 >actual &&
+	test_i18ncmp expect actual
+	
+ok 11 - relative date (2 years ago)
+
+expecting success: 
+		echo "$time -> $expect" >expect &&
+		TZ=${zone:-$TZ} test-tool date show:"$format" "$time" >actual &&
+		test_cmp expect actual
+	
+ok 12 - show date (iso8601:1466000000 +0200)
+
+expecting success: 
+		echo "$time -> $expect" >expect &&
+		TZ=${zone:-$TZ} test-tool date show:"$format" "$time" >actual &&
+		test_cmp expect actual
+	
+ok 13 - show date (iso8601-strict:1466000000 +0200)
+
+expecting success: 
+		echo "$time -> $expect" >expect &&
+		TZ=${zone:-$TZ} test-tool date show:"$format" "$time" >actual &&
+		test_cmp expect actual
+	
+ok 14 - show date (rfc2822:1466000000 +0200)
+
+expecting success: 
+		echo "$time -> $expect" >expect &&
+		TZ=${zone:-$TZ} test-tool date show:"$format" "$time" >actual &&
+		test_cmp expect actual
+	
+ok 15 - show date (short:1466000000 +0200)
+
+expecting success: 
+		echo "$time -> $expect" >expect &&
+		TZ=${zone:-$TZ} test-tool date show:"$format" "$time" >actual &&
+		test_cmp expect actual
+	
+ok 16 - show date (default:1466000000 +0200)
+
+expecting success: 
+		echo "$time -> $expect" >expect &&
+		TZ=${zone:-$TZ} test-tool date show:"$format" "$time" >actual &&
+		test_cmp expect actual
+	
+ok 17 - show date (raw:1466000000 +0200)
+
+expecting success: 
+		echo "$time -> $expect" >expect &&
+		TZ=${zone:-$TZ} test-tool date show:"$format" "$time" >actual &&
+		test_cmp expect actual
+	
+ok 18 - show date (unix:1466000000 +0200)
+
+expecting success: 
+		echo "$time -> $expect" >expect &&
+		TZ=${zone:-$TZ} test-tool date show:"$format" "$time" >actual &&
+		test_cmp expect actual
+	
+ok 19 - show date (iso-local:1466000000 +0200)
+
+expecting success: 
+		echo "$time -> $expect" >expect &&
+		TZ=${zone:-$TZ} test-tool date show:"$format" "$time" >actual &&
+		test_cmp expect actual
+	
+ok 20 - show date (raw-local:1466000000 +0200)
+
+expecting success: 
+		echo "$time -> $expect" >expect &&
+		TZ=${zone:-$TZ} test-tool date show:"$format" "$time" >actual &&
+		test_cmp expect actual
+	
+ok 21 - show date (unix-local:1466000000 +0200)
+
+expecting success: 
+		echo "$time -> $expect" >expect &&
+		TZ=${zone:-$TZ} test-tool date show:"$format" "$time" >actual &&
+		test_cmp expect actual
+	
+ok 22 - show date (format:%z:1466000000 +0200)
+
+expecting success: 
+		echo "$time -> $expect" >expect &&
+		TZ=${zone:-$TZ} test-tool date show:"$format" "$time" >actual &&
+		test_cmp expect actual
+	
+ok 23 - show date (format-local:%z:1466000000 +0200)
+
+expecting success: 
+		echo "$time -> $expect" >expect &&
+		TZ=${zone:-$TZ} test-tool date show:"$format" "$time" >actual &&
+		test_cmp expect actual
+	
+ok 24 - show date (format:%Z:1466000000 +0200)
+
+expecting success: 
+		echo "$time -> $expect" >expect &&
+		TZ=${zone:-$TZ} test-tool date show:"$format" "$time" >actual &&
+		test_cmp expect actual
+	
+ok 25 - show date (format-local:%Z:1466000000 +0200)
+
+expecting success: 
+		echo "$time -> $expect" >expect &&
+		TZ=${zone:-$TZ} test-tool date show:"$format" "$time" >actual &&
+		test_cmp expect actual
+	
+ok 26 - show date (format:%%z:1466000000 +0200)
+
+expecting success: 
+		echo "$time -> $expect" >expect &&
+		TZ=${zone:-$TZ} test-tool date show:"$format" "$time" >actual &&
+		test_cmp expect actual
+	
+ok 27 - show date (format-local:%%z:1466000000 +0200)
+
+expecting success: 
+		echo "$time -> $expect" >expect &&
+		TZ=${zone:-$TZ} test-tool date show:"$format" "$time" >actual &&
+		test_cmp expect actual
+	
+ok 28 - show date (format:%Y-%m-%d %H:%M:%S:1466000000 +0200)
+
+expecting success: 
+		echo "$time -> $expect" >expect &&
+		TZ=${zone:-$TZ} test-tool date show:"$format" "$time" >actual &&
+		test_cmp expect actual
+	
+ok 29 - show date (format-local:%Y-%m-%d %H:%M:%S:1466000000 +0200)
+
+checking prerequisite: TIME_IS_64BIT
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir" &&test-tool date is64bit
+)
+prerequisite TIME_IS_64BIT ok
+checking prerequisite: TIME_T_IS_64BIT
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir" &&test-tool date time_t-is64bit
+)
+prerequisite TIME_T_IS_64BIT ok
+expecting success: 
+		echo "$time -> $expect" >expect &&
+		TZ=${zone:-$TZ} test-tool date show:"$format" "$time" >actual &&
+		test_cmp expect actual
+	
+ok 30 - show date (iso:5758122296 -0400)
+
+expecting success: 
+		echo "$time -> $expect" >expect &&
+		TZ=${zone:-$TZ} test-tool date show:"$format" "$time" >actual &&
+		test_cmp expect actual
+	
+ok 31 - show date (iso-local:5758122296 -0400)
+
+expecting success: 
+	TZ=UTC test-tool date parse '2008' >actual &&
+	test_cmp expect actual
+	
+ok 32 - parse date (2008)
+
+expecting success: 
+	TZ=UTC test-tool date parse '2008-02' >actual &&
+	test_cmp expect actual
+	
+ok 33 - parse date (2008-02)
+
+expecting success: 
+	TZ=UTC test-tool date parse '2008-02-14' >actual &&
+	test_cmp expect actual
+	
+ok 34 - parse date (2008-02-14)
+
+expecting success: 
+	TZ=UTC test-tool date parse '2008-02-14 20:30:45' >actual &&
+	test_cmp expect actual
+	
+ok 35 - parse date (2008-02-14 20:30:45)
+
+expecting success: 
+	TZ=UTC test-tool date parse '2008-02-14 20:30:45 -0500' >actual &&
+	test_cmp expect actual
+	
+ok 36 - parse date (2008-02-14 20:30:45 -0500)
+
+expecting success: 
+	TZ=UTC test-tool date parse '2008-02-14 20:30:45 -0015' >actual &&
+	test_cmp expect actual
+	
+ok 37 - parse date (2008-02-14 20:30:45 -0015)
+
+expecting success: 
+	TZ=UTC test-tool date parse '2008-02-14 20:30:45 -5' >actual &&
+	test_cmp expect actual
+	
+ok 38 - parse date (2008-02-14 20:30:45 -5)
+
+expecting success: 
+	TZ=UTC test-tool date parse '2008-02-14 20:30:45 -5:' >actual &&
+	test_cmp expect actual
+	
+ok 39 - parse date (2008-02-14 20:30:45 -5:)
+
+expecting success: 
+	TZ=UTC test-tool date parse '2008-02-14 20:30:45 -05' >actual &&
+	test_cmp expect actual
+	
+ok 40 - parse date (2008-02-14 20:30:45 -05)
+
+expecting success: 
+	TZ=UTC test-tool date parse '2008-02-14 20:30:45 -:30' >actual &&
+	test_cmp expect actual
+	
+ok 41 - parse date (2008-02-14 20:30:45 -:30)
+
+expecting success: 
+	TZ=UTC test-tool date parse '2008-02-14 20:30:45 -05:00' >actual &&
+	test_cmp expect actual
+	
+ok 42 - parse date (2008-02-14 20:30:45 -05:00)
+
+expecting success: 
+	TZ=EST5 test-tool date parse '2008-02-14 20:30:45' >actual &&
+	test_cmp expect actual
+	
+ok 43 - parse date (2008-02-14 20:30:45 TZ=EST5)
+
+expecting success: 
+	test-tool date approxidate 'now' >actual &&
+	test_cmp expect actual
+	
+ok 44 - parse approxidate (now)
+
+expecting success: 
+	test-tool date approxidate '5 seconds ago' >actual &&
+	test_cmp expect actual
+	
+ok 45 - parse approxidate (5 seconds ago)
+
+expecting success: 
+	test-tool date approxidate '5.seconds.ago' >actual &&
+	test_cmp expect actual
+	
+ok 46 - parse approxidate (5.seconds.ago)
+
+expecting success: 
+	test-tool date approxidate '10.minutes.ago' >actual &&
+	test_cmp expect actual
+	
+ok 47 - parse approxidate (10.minutes.ago)
+
+expecting success: 
+	test-tool date approxidate 'yesterday' >actual &&
+	test_cmp expect actual
+	
+ok 48 - parse approxidate (yesterday)
+
+expecting success: 
+	test-tool date approxidate '3.days.ago' >actual &&
+	test_cmp expect actual
+	
+ok 49 - parse approxidate (3.days.ago)
+
+expecting success: 
+	test-tool date approxidate '3.weeks.ago' >actual &&
+	test_cmp expect actual
+	
+ok 50 - parse approxidate (3.weeks.ago)
+
+expecting success: 
+	test-tool date approxidate '3.months.ago' >actual &&
+	test_cmp expect actual
+	
+ok 51 - parse approxidate (3.months.ago)
+
+expecting success: 
+	test-tool date approxidate '2.years.3.months.ago' >actual &&
+	test_cmp expect actual
+	
+ok 52 - parse approxidate (2.years.3.months.ago)
+
+expecting success: 
+	test-tool date approxidate '6am yesterday' >actual &&
+	test_cmp expect actual
+	
+ok 53 - parse approxidate (6am yesterday)
+
+expecting success: 
+	test-tool date approxidate '6pm yesterday' >actual &&
+	test_cmp expect actual
+	
+ok 54 - parse approxidate (6pm yesterday)
+
+expecting success: 
+	test-tool date approxidate '3:00' >actual &&
+	test_cmp expect actual
+	
+ok 55 - parse approxidate (3:00)
+
+expecting success: 
+	test-tool date approxidate '15:00' >actual &&
+	test_cmp expect actual
+	
+ok 56 - parse approxidate (15:00)
+
+expecting success: 
+	test-tool date approxidate 'noon today' >actual &&
+	test_cmp expect actual
+	
+ok 57 - parse approxidate (noon today)
+
+expecting success: 
+	test-tool date approxidate 'noon yesterday' >actual &&
+	test_cmp expect actual
+	
+ok 58 - parse approxidate (noon yesterday)
+
+expecting success: 
+	test-tool date approxidate 'January 5th noon pm' >actual &&
+	test_cmp expect actual
+	
+ok 59 - parse approxidate (January 5th noon pm)
+
+expecting success: 
+	test-tool date approxidate '10am noon' >actual &&
+	test_cmp expect actual
+	
+ok 60 - parse approxidate (10am noon)
+
+expecting success: 
+	test-tool date approxidate 'last tuesday' >actual &&
+	test_cmp expect actual
+	
+ok 61 - parse approxidate (last tuesday)
+
+expecting success: 
+	test-tool date approxidate 'July 5th' >actual &&
+	test_cmp expect actual
+	
+ok 62 - parse approxidate (July 5th)
+
+expecting success: 
+	test-tool date approxidate '06/05/2009' >actual &&
+	test_cmp expect actual
+	
+ok 63 - parse approxidate (06/05/2009)
+
+expecting success: 
+	test-tool date approxidate '06.05.2009' >actual &&
+	test_cmp expect actual
+	
+ok 64 - parse approxidate (06.05.2009)
+
+expecting success: 
+	test-tool date approxidate 'Jun 6, 5AM' >actual &&
+	test_cmp expect actual
+	
+ok 65 - parse approxidate (Jun 6, 5AM)
+
+expecting success: 
+	test-tool date approxidate '5AM Jun 6' >actual &&
+	test_cmp expect actual
+	
+ok 66 - parse approxidate (5AM Jun 6)
+
+expecting success: 
+	test-tool date approxidate '6AM, June 7, 2009' >actual &&
+	test_cmp expect actual
+	
+ok 67 - parse approxidate (6AM, June 7, 2009)
+
+expecting success: 
+	test-tool date approxidate '2008-12-01' >actual &&
+	test_cmp expect actual
+	
+ok 68 - parse approxidate (2008-12-01)
+
+expecting success: 
+	test-tool date approxidate '2009-12-01' >actual &&
+	test_cmp expect actual
+	
+ok 69 - parse approxidate (2009-12-01)
+
+# passed all 69 test(s)
+1..69
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
 *** t0003-attributes.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t0003-attributes/.git/
 expecting success: 
 	echo "\"a test=a" >.gitattributes &&
 	test_must_fail attr_check a a
 
---- expect	2021-12-03 05:04:11.513601555 +0000
-+++ actual	2021-12-03 05:04:11.509601671 +0000
+--- expect	2023-01-05 11:46:29.294868030 +0000
++++ actual	2023-01-05 11:46:29.294868030 +0000
 @@ -1 +1 @@
 -a: test: a
 +a: test: unspecified
@@ -9254,63 +10418,63 @@
 	test_must_fail attr_check a/E/f "A/e/F" "-c core.ignorecase=0"
 
 
---- expect	2021-12-03 05:04:12.561571029 +0000
-+++ actual	2021-12-03 05:04:12.561571029 +0000
+--- expect	2023-01-05 11:46:29.746868030 +0000
++++ actual	2023-01-05 11:46:29.746868030 +0000
 @@ -1 +1 @@
 -F: test: f
 +F: test: unspecified
---- expect	2021-12-03 05:04:12.573570679 +0000
-+++ actual	2021-12-03 05:04:12.573570679 +0000
+--- expect	2023-01-05 11:46:29.766868030 +0000
++++ actual	2023-01-05 11:46:29.766868030 +0000
 @@ -1 +1 @@
 -a/F: test: f
 +a/F: test: unspecified
---- expect	2021-12-03 05:04:12.597569980 +0000
-+++ actual	2021-12-03 05:04:12.597569980 +0000
+--- expect	2023-01-05 11:46:29.778868030 +0000
++++ actual	2023-01-05 11:46:29.778868030 +0000
 @@ -1 +1 @@
 -a/c/F: test: f
 +a/c/F: test: unspecified
---- expect	2021-12-03 05:04:12.613569515 +0000
-+++ actual	2021-12-03 05:04:12.609569631 +0000
+--- expect	2023-01-05 11:46:29.786868030 +0000
++++ actual	2023-01-05 11:46:29.786868030 +0000
 @@ -1 +1 @@
 -a/G: test: a/g
 +a/G: test: unspecified
---- expect	2021-12-03 05:04:12.633568932 +0000
-+++ actual	2021-12-03 05:04:12.633568932 +0000
+--- expect	2023-01-05 11:46:29.798868030 +0000
++++ actual	2023-01-05 11:46:29.798868030 +0000
 @@ -1 +1 @@
 -a/B/g: test: a/b/g
 +a/B/g: test: a/g
---- expect	2021-12-03 05:04:12.653568349 +0000
-+++ actual	2021-12-03 05:04:12.649568465 +0000
+--- expect	2023-01-05 11:46:29.814868030 +0000
++++ actual	2023-01-05 11:46:29.810868030 +0000
 @@ -1 +1 @@
 -a/b/G: test: a/b/g
 +a/b/G: test: unspecified
---- expect	2021-12-03 05:04:12.665567999 +0000
-+++ actual	2021-12-03 05:04:12.665567999 +0000
+--- expect	2023-01-05 11:46:29.826868030 +0000
++++ actual	2023-01-05 11:46:29.822868030 +0000
 @@ -1 +1 @@
 -a/b/H: test: a/b/h
 +a/b/H: test: unspecified
---- expect	2021-12-03 05:04:12.689567300 +0000
-+++ actual	2021-12-03 05:04:12.689567300 +0000
+--- expect	2023-01-05 11:46:29.838868030 +0000
++++ actual	2023-01-05 11:46:29.838868030 +0000
 @@ -1 +1 @@
 -a/b/D/g: test: a/b/d/*
 +a/b/D/g: test: a/g
---- expect	2021-12-03 05:04:12.709566718 +0000
-+++ actual	2021-12-03 05:04:12.709566718 +0000
+--- expect	2023-01-05 11:46:29.858868030 +0000
++++ actual	2023-01-05 11:46:29.858868030 +0000
 @@ -1 +1 @@
 -oNoFf: test: unset
 +oNoFf: test: unspecified
---- expect	2021-12-03 05:04:12.729566136 +0000
-+++ actual	2021-12-03 05:04:12.725566252 +0000
+--- expect	2023-01-05 11:46:29.874868030 +0000
++++ actual	2023-01-05 11:46:29.874868030 +0000
 @@ -1 +1 @@
 -oFfOn: test: set
 +oFfOn: test: unspecified
---- expect	2021-12-03 05:04:12.805563921 +0000
-+++ actual	2021-12-03 05:04:12.805563921 +0000
+--- expect	2023-01-05 11:46:29.914868030 +0000
++++ actual	2023-01-05 11:46:29.914868030 +0000
 @@ -1 +1 @@
 -a/b/D/NO: test: a/b/d/*
 +a/b/D/NO: test: unspecified
---- expect	2021-12-03 05:04:12.857562407 +0000
-+++ actual	2021-12-03 05:04:12.857562407 +0000
+--- expect	2023-01-05 11:46:29.946868030 +0000
++++ actual	2023-01-05 11:46:29.942868030 +0000
 @@ -1 +1 @@
 -a/E/f: test: A/e/F
 +a/E/f: test: f
@@ -10107,936 +11271,231 @@
 1..44
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t0062-revision-walking.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t0062-revision-walking/.git/
-expecting success: 
-	echo a > a &&
-	git add a &&
-	git commit -m "add a" &&
-	echo b > b &&
-	git add b &&
-	git commit -m "add b"
-
-[master (root-commit) 2b65e83] add a
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 a
-[master 27681cb] add b
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b
-ok 1 - setup
-
-expecting success: 
-	test-tool revision-walking run-twice >run_twice_actual &&
-	test_cmp run_twice_expected run_twice_actual
-
-ok 2 - revision walking can be done twice
-
-# passed all 2 test(s)
-1..2
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t0056-git-C.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t0056-git-C/.git/
-expecting success: 
-	test_create_repo dir1 &&
-	echo 1 >dir1/a.txt &&
-	msg="initial in dir1" &&
-	(cd dir1 && git add a.txt && git commit -m "$msg") &&
-	echo "$msg" >expected &&
-	git -C dir1 log --format=%s >actual &&
-	test_cmp expected actual
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t0056-git-C/dir1/.git/
-[master (root-commit) 3d3a347] initial in dir1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 a.txt
-ok 1 - "git -C <path>" runs git from the directory <path>
-
-expecting success: 
-	(
-		mkdir -p dir1/subdir &&
-		cd dir1/subdir &&
-		git -C "" rev-parse --show-prefix >actual &&
-		echo subdir/ >expect &&
-		test_cmp expect actual
-	)
-
-ok 2 - "git -C <path>" with an empty <path> is a no-op
-
-expecting success: 
-	test_create_repo dir1/dir2 &&
-	echo 1 >dir1/dir2/b.txt &&
-	git -C dir1/dir2 add b.txt &&
-	msg="initial in dir1/dir2" &&
-	echo "$msg" >expected &&
-	git -C dir1/dir2 commit -m "$msg" &&
-	git -C dir1 -C dir2 log --format=%s >actual &&
-	test_cmp expected actual
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t0056-git-C/dir1/dir2/.git/
-[master (root-commit) 37b3149] initial in dir1/dir2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b.txt
-ok 3 - Multiple -C options: "-C dir1 -C dir2" is equivalent to "-C dir1/dir2"
-
-expecting success: 
-	mkdir c &&
-	mkdir c/a &&
-	mkdir c/a.git &&
-	(cd c/a.git && git init --bare) &&
-	echo 1 >c/a/a.txt &&
-	git --git-dir c/a.git --work-tree=c/a add a.txt &&
-	git --git-dir c/a.git --work-tree=c/a commit -m "initial" &&
-	git --git-dir=c/a.git log -1 --format=%s >expected &&
-	git -C c --git-dir=a.git log -1 --format=%s >actual &&
-	test_cmp expected actual
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t0056-git-C/c/a.git/
-[master (root-commit) 01eaeb1] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 a.txt
-ok 4 - Effect on --git-dir option: "-C c --git-dir=a.git" is equivalent to "--git-dir c/a.git"
-
-expecting success: 
-	git -C c --git-dir=a.git log -1 --format=%s >expected &&
-	git --git-dir=a.git -C c log -1 --format=%s >actual &&
-	test_cmp expected actual
-
-ok 5 - Order should not matter: "--git-dir=a.git -C c" is equivalent to "-C c --git-dir=a.git"
-
-expecting success: 
-	rm c/a/a.txt &&
-	git --git-dir=c/a.git --work-tree=c/a status >expected &&
-	git -C c/a.git --work-tree=../a status >actual &&
-	test_cmp expected actual
-
-ok 6 - Effect on --work-tree option: "-C c/a.git --work-tree=../a"  is equivalent to "--work-tree=c/a --git-dir=c/a.git"
-
-expecting success: 
-	git -C c/a.git --work-tree=../a status >expected &&
-	git --work-tree=../a -C c/a.git status >actual &&
-	test_cmp expected actual
-
-ok 7 - Order should not matter: "--work-tree=../a -C c/a.git" is equivalent to "-C c/a.git --work-tree=../a"
-
-expecting success: 
-	git --git-dir=c/a.git --work-tree=c/a status >expected &&
-	git -C c --git-dir=a.git --work-tree=a status >actual &&
-	test_cmp expected actual
-
-ok 8 - Effect on --git-dir and --work-tree options - "-C c --git-dir=a.git --work-tree=a" is equivalent to "--git-dir=c/a.git --work-tree=c/a"
-
-expecting success: 
-	git -C c --git-dir=a.git --work-tree=a status >expected &&
-	git --git-dir=a.git -C c --work-tree=a status >actual &&
-	test_cmp expected actual
-
-ok 9 - Order should not matter: "-C c --git-dir=a.git --work-tree=a" is equivalent to "--git-dir=a.git -C c --work-tree=a"
-
-expecting success: 
-	git -C c --git-dir=a.git --work-tree=a status >expected &&
-	git --git-dir=a.git --work-tree=a -C c status >actual &&
-	test_cmp expected actual
-
-ok 10 - Order should not matter: "-C c --git-dir=a.git --work-tree=a" is equivalent to "--git-dir=a.git --work-tree=a -C c"
-
-expecting success: 
-	echo "initial in dir1/dir2" >expected &&
-	git -C dir1 -C "$(pwd)/dir1/dir2" log --format=%s >actual &&
-	test_cmp expected actual
-
-ok 11 - Relative followed by fullpath: "-C ./here -C /there" is equivalent to "-C /there"
-
-# passed all 11 test(s)
-1..11
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t0040-parse-options.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t0040-parse-options/.git/
-expecting success: 
-	test_must_fail test-tool parse-options -h >output 2>output.err &&
-	test_must_be_empty output.err &&
-	test_i18ncmp expect output
-
-ok 1 - test help
-
-expecting success: check boolean: 1 --yes
-ok 2 - OPT_BOOL() #1
-
-expecting success: check boolean: 1 --no-doubt
-ok 3 - OPT_BOOL() #2
-
-expecting success: check boolean: 1 -D
-ok 4 - OPT_BOOL() #3
-
-expecting success: check boolean: 1 --no-fear
-ok 5 - OPT_BOOL() #4
-
-expecting success: check boolean: 1 -B
-ok 6 - OPT_BOOL() #5
-
-expecting success: check boolean: 1 --yes --yes
-ok 7 - OPT_BOOL() is idempotent #1
-
-expecting success: check boolean: 1 -DB
-ok 8 - OPT_BOOL() is idempotent #2
-
-expecting success: check boolean: 0 -D --no-yes
-ok 9 - OPT_BOOL() negation #1
-
-expecting success: check boolean: 0 -D --no-no-doubt
-ok 10 - OPT_BOOL() negation #2
-
-expecting success: check_unknown_i18n --fear
-ok 11 - OPT_BOOL() no negation #1
-
-expecting success: check_unknown_i18n --no-no-fear
-ok 12 - OPT_BOOL() no negation #2
-
-expecting success: check boolean: 0 -D --doubt
-ok 13 - OPT_BOOL() positivation
-
-expecting success: check integer: -2345 -i -2345
-ok 14 - OPT_INT() negative
-
-expecting success: 
-	check magnitude: 2345678 -m 2345678
-
-ok 15 - OPT_MAGNITUDE() simple
-
-expecting success: 
-	check magnitude: 239616 -m 234k
-
-ok 16 - OPT_MAGNITUDE() kilo
-
-expecting success: 
-	check magnitude: 104857600 -m 100m
-
-ok 17 - OPT_MAGNITUDE() mega
-
-expecting success: 
-	check magnitude: 1073741824 -m 1g
-
-ok 18 - OPT_MAGNITUDE() giga
-
-expecting success: 
-	check magnitude: 3221225472 -m 3g
-
-ok 19 - OPT_MAGNITUDE() 3giga
-
-expecting success: 
-	test-tool parse-options -s123 -b -i 1729 -m 16k -b -vv -n -F my.file \
-	>output 2>output.err &&
-	test_cmp expect output &&
-	test_must_be_empty output.err
-
-ok 20 - short options
-
-expecting success: 
-	test-tool parse-options --boolean --integer 1729 --magnitude 16k \
-		--boolean --string2=321 --verbose --verbose --no-dry-run \
-		--abbrev=10 --file fi.le --obsolete \
-		>output 2>output.err &&
-	test_must_be_empty output.err &&
-	test_cmp expect output
-
-ok 21 - long options
-
-expecting success: 
-	test_expect_code 129 test-tool parse-options -s &&
-	test_expect_code 129 test-tool parse-options --string &&
-	test_expect_code 129 test-tool parse-options --file
-
-error: switch `s' requires a value
-error: option `string' requires a value
-error: option `file' requires a value
-ok 22 - missing required value
-
-expecting success: 
-	test-tool parse-options a1 --string 123 b1 --boolean -j 13 -- --boolean \
-		>output 2>output.err &&
-	test_must_be_empty output.err &&
-	test_cmp expect output
-
-ok 23 - intermingled arguments
-
-expecting success: 
-	test-tool parse-options --int 2 --boolean --no-bo >output 2>output.err &&
-	test_must_be_empty output.err &&
-	test_cmp expect output
-
-ok 24 - unambiguously abbreviated option
-
-expecting success: 
-	test-tool parse-options --expect="integer: 2" --int=2
-
-ok 25 - unambiguously abbreviated option with "="
-
-expecting success: 
-	test_expect_code 129 test-tool parse-options --strin 123
-
-error: Ambiguous option: strin (could be --string or --string2)
-usage: test-tool parse-options <options>
-
-    A helper function for the parse-options API.
-
-    --yes                 get a boolean
-    -D, --no-doubt        begins with 'no-'
-    -B, --no-fear         be brave
-    -b, --boolean         increment by one
-    -4, --or4             bitwise-or boolean with ...0100
-    --neg-or4             same as --no-or4
-
-    -i, --integer <n>     get a integer
-    -j <n>                get a integer, too
-    -m, --magnitude <n>   get a magnitude
-    --set23               set integer to 23
-    -L, --length <str>    get length of <str>
-    -F, --file <file>     set file to <file>
-
-String options
-    -s, --string <string>
-                          get a string
-    --string2 <str>       get another string
-    --st <st>             get another string (pervert ordering)
-    -o <str>              get another string
-    --list <str>          add str to list
-
-Magic arguments
-    --quux                means --quux
-    -NUM                  set integer to NUM
-    +                     same as -b
-    --ambiguous           positive ambiguity
-    --no-ambiguous        negative ambiguity
-
-Standard options
-    --abbrev[=<n>]        use <n> digits to display SHA-1s
-    -v, --verbose         be verbose
-    -n, --dry-run         dry run
-    -q, --quiet           be quiet
-    --expect <string>     expected output in the variable dump
-
-ok 26 - ambiguously abbreviated option
-
-expecting success: 
-	test-tool parse-options --expect="string: 123" --st 123
-
-ok 27 - non ambiguous option (after two options it abbreviates)
-
-expecting success: 
-	test_must_fail test-tool parse-options -boolean >output 2>output.err &&
-	test_must_be_empty output &&
-	test_cmp typo.err output.err
-
-ok 28 - detect possible typos
-
-expecting success: 
-	test_must_fail test-tool parse-options -ambiguous >output 2>output.err &&
-	test_must_be_empty output &&
-	test_cmp typo.err output.err
-
-ok 29 - detect possible typos
-
-expecting success: 
-	test-tool parse-options --expect="arg 00: --quux" --quux
-
-ok 30 - keep some options as arguments
-
-expecting success: 
-	test-tool parse-options --length=four -b -4 >output 2>output.err &&
-	test_must_be_empty output.err &&
-	test_cmp expect output
-
-ok 31 - OPT_CALLBACK() and OPT_BIT() work
-
-expecting success: 
-	test_must_fail test-tool parse-options --no-length >output 2>output.err &&
-	test_must_be_empty output &&
-	test_must_be_empty output.err
-
-ok 32 - OPT_CALLBACK() and callback errors work
-
-expecting success: 
-	test-tool parse-options --set23 -bbbbb --no-or4 >output 2>output.err &&
-	test_must_be_empty output.err &&
-	test_cmp expect output
-
-ok 33 - OPT_BIT() and OPT_SET_INT() work
-
-expecting success: 
-	test-tool parse-options --set23 -bbbbb --neg-or4 >output 2>output.err &&
-	test_must_be_empty output.err &&
-	test_cmp expect output
-
-ok 34 - OPT_NEGBIT() and OPT_SET_INT() work
-
-expecting success: 
-	test-tool parse-options --expect="boolean: 6" -bb --or4
-
-ok 35 - OPT_BIT() works
-
-expecting success: 
-	test-tool parse-options --expect="boolean: 6" -bb --no-neg-or4
-
-ok 36 - OPT_NEGBIT() works
-
-expecting success: 
-	test-tool parse-options --expect="boolean: 6" + + + + + +
-
-ok 37 - OPT_COUNTUP() with PARSE_OPT_NODASH works
-
-expecting success: 
-	test-tool parse-options --expect="integer: 12345" -12345
-
-ok 38 - OPT_NUMBER_CALLBACK() works
-
-expecting success: 
-	test-tool parse-options --no-ambig >output 2>output.err &&
-	test_must_be_empty output.err &&
-	test_cmp expect output
-
-ok 39 - negation of OPT_NONEG flags is not ambiguous
-
-expecting success: 
-	test-tool parse-options --list foo --list=bar --list=baz >output &&
-	test_cmp expect output
-
-ok 40 - --list keeps list of strings
-
-expecting success: 
-	test-tool parse-options --list=other --list=irrelevant --list=options \
-		--no-list --list=foo --list=bar --list=baz >output &&
-	test_cmp expect output
-
-ok 41 - --no-list resets list
-
-expecting success: 
-	test-tool parse-options --expect="quiet: 3" -q -q -q
-
-ok 42 - multiple quiet levels
-
-expecting success: 
-	test-tool parse-options --expect="verbose: 3" -v -v -v
-
-ok 43 - multiple verbose levels
-
-expecting success: 
-	test-tool parse-options --expect="quiet: 0" --no-quiet
-
-ok 44 - --no-quiet sets --quiet to 0
-
-expecting success: 
-	test-tool parse-options --expect="quiet: 0" -q -q -q --no-quiet
-
-ok 45 - --no-quiet resets multiple -q to 0
-
-expecting success: 
-	test-tool parse-options --expect="verbose: 0" --no-verbose
-
-ok 46 - --no-verbose sets verbose to 0
-
-expecting success: 
-	test-tool parse-options --expect="verbose: 0" -v -v -v --no-verbose
-
-ok 47 - --no-verbose resets multiple verbose to 0
-
-# passed all 47 test(s)
-1..47
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t0010-racy-git.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t0010-racy-git/.git/
-expecting success: test "" != "$files"
-ok 1 - Racy GIT trial #0 part A
-
-expecting success: test "" != "$files"
-ok 2 - Racy GIT trial #0 part B
-
-expecting success: test "" != "$files"
-ok 3 - Racy GIT trial #1 part A
-
-expecting success: test "" != "$files"
-ok 4 - Racy GIT trial #1 part B
-
-expecting success: test "" != "$files"
-ok 5 - Racy GIT trial #2 part A
-
-expecting success: test "" != "$files"
-ok 6 - Racy GIT trial #2 part B
-
-expecting success: test "" != "$files"
-ok 7 - Racy GIT trial #3 part A
-
-expecting success: test "" != "$files"
-ok 8 - Racy GIT trial #3 part B
-
-expecting success: test "" != "$files"
-ok 9 - Racy GIT trial #4 part A
-
-expecting success: test "" != "$files"
-ok 10 - Racy GIT trial #4 part B
-
-# passed all 10 test(s)
-1..10
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t0006-date.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t0006-date/.git/
-expecting success: 
-	test-tool date relative 1251659995 >actual &&
-	test_i18ncmp expect actual
-	
-ok 1 - relative date (5 seconds ago)
-
-expecting success: 
-	test-tool date relative 1251659700 >actual &&
-	test_i18ncmp expect actual
-	
-ok 2 - relative date (5 minutes ago)
-
-expecting success: 
-	test-tool date relative 1251642000 >actual &&
-	test_i18ncmp expect actual
-	
-ok 3 - relative date (5 hours ago)
-
-expecting success: 
-	test-tool date relative 1251228000 >actual &&
-	test_i18ncmp expect actual
-	
-ok 4 - relative date (5 days ago)
-
-expecting success: 
-	test-tool date relative 1249932000 >actual &&
-	test_i18ncmp expect actual
-	
-ok 5 - relative date (3 weeks ago)
-
-expecting success: 
-	test-tool date relative 1238660000 >actual &&
-	test_i18ncmp expect actual
-	
-ok 6 - relative date (5 months ago)
-
-expecting success: 
-	test-tool date relative 1214160000 >actual &&
-	test_i18ncmp expect actual
-	
-ok 7 - relative date (1 year, 2 months ago)
-
-expecting success: 
-	test-tool date relative 1196472000 >actual &&
-	test_i18ncmp expect actual
-	
-ok 8 - relative date (1 year, 9 months ago)
-
-expecting success: 
-	test-tool date relative 621660000 >actual &&
-	test_i18ncmp expect actual
-	
-ok 9 - relative date (20 years ago)
-
-expecting success: 
-	test-tool date relative 1220210400 >actual &&
-	test_i18ncmp expect actual
-	
-ok 10 - relative date (12 months ago)
-
-expecting success: 
-	test-tool date relative 1188674400 >actual &&
-	test_i18ncmp expect actual
-	
-ok 11 - relative date (2 years ago)
-
-expecting success: 
-		echo "$time -> $expect" >expect &&
-		TZ=${zone:-$TZ} test-tool date show:"$format" "$time" >actual &&
-		test_cmp expect actual
-	
-ok 12 - show date (iso8601:1466000000 +0200)
-
-expecting success: 
-		echo "$time -> $expect" >expect &&
-		TZ=${zone:-$TZ} test-tool date show:"$format" "$time" >actual &&
-		test_cmp expect actual
-	
-ok 13 - show date (iso8601-strict:1466000000 +0200)
-
-expecting success: 
-		echo "$time -> $expect" >expect &&
-		TZ=${zone:-$TZ} test-tool date show:"$format" "$time" >actual &&
-		test_cmp expect actual
-	
-ok 14 - show date (rfc2822:1466000000 +0200)
-
-expecting success: 
-		echo "$time -> $expect" >expect &&
-		TZ=${zone:-$TZ} test-tool date show:"$format" "$time" >actual &&
-		test_cmp expect actual
-	
-ok 15 - show date (short:1466000000 +0200)
-
-expecting success: 
-		echo "$time -> $expect" >expect &&
-		TZ=${zone:-$TZ} test-tool date show:"$format" "$time" >actual &&
-		test_cmp expect actual
-	
-ok 16 - show date (default:1466000000 +0200)
-
-expecting success: 
-		echo "$time -> $expect" >expect &&
-		TZ=${zone:-$TZ} test-tool date show:"$format" "$time" >actual &&
-		test_cmp expect actual
-	
-ok 17 - show date (raw:1466000000 +0200)
-
-expecting success: 
-		echo "$time -> $expect" >expect &&
-		TZ=${zone:-$TZ} test-tool date show:"$format" "$time" >actual &&
-		test_cmp expect actual
-	
-ok 18 - show date (unix:1466000000 +0200)
-
-expecting success: 
-		echo "$time -> $expect" >expect &&
-		TZ=${zone:-$TZ} test-tool date show:"$format" "$time" >actual &&
-		test_cmp expect actual
-	
-ok 19 - show date (iso-local:1466000000 +0200)
-
-expecting success: 
-		echo "$time -> $expect" >expect &&
-		TZ=${zone:-$TZ} test-tool date show:"$format" "$time" >actual &&
-		test_cmp expect actual
-	
-ok 20 - show date (raw-local:1466000000 +0200)
-
-expecting success: 
-		echo "$time -> $expect" >expect &&
-		TZ=${zone:-$TZ} test-tool date show:"$format" "$time" >actual &&
-		test_cmp expect actual
-	
-ok 21 - show date (unix-local:1466000000 +0200)
-
-expecting success: 
-		echo "$time -> $expect" >expect &&
-		TZ=${zone:-$TZ} test-tool date show:"$format" "$time" >actual &&
-		test_cmp expect actual
-	
-ok 22 - show date (format:%z:1466000000 +0200)
-
-expecting success: 
-		echo "$time -> $expect" >expect &&
-		TZ=${zone:-$TZ} test-tool date show:"$format" "$time" >actual &&
-		test_cmp expect actual
-	
-ok 23 - show date (format-local:%z:1466000000 +0200)
-
-expecting success: 
-		echo "$time -> $expect" >expect &&
-		TZ=${zone:-$TZ} test-tool date show:"$format" "$time" >actual &&
-		test_cmp expect actual
-	
-ok 24 - show date (format:%Z:1466000000 +0200)
-
-expecting success: 
-		echo "$time -> $expect" >expect &&
-		TZ=${zone:-$TZ} test-tool date show:"$format" "$time" >actual &&
-		test_cmp expect actual
-	
-ok 25 - show date (format-local:%Z:1466000000 +0200)
-
+*** t0065-strcmp-offset.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t0065-strcmp-offset/.git/
 expecting success: 
-		echo "$time -> $expect" >expect &&
-		TZ=${zone:-$TZ} test-tool date show:"$format" "$time" >actual &&
+		echo "$expect" >expect &&
+		test-tool strcmp-offset "$s1" "$s2" >actual &&
 		test_cmp expect actual
 	
-ok 26 - show date (format:%%z:1466000000 +0200)
+ok 1 - strcmp_offset(abc, abc)
 
 expecting success: 
-		echo "$time -> $expect" >expect &&
-		TZ=${zone:-$TZ} test-tool date show:"$format" "$time" >actual &&
+		echo "$expect" >expect &&
+		test-tool strcmp-offset "$s1" "$s2" >actual &&
 		test_cmp expect actual
 	
-ok 27 - show date (format-local:%%z:1466000000 +0200)
+ok 2 - strcmp_offset(abc, def)
 
 expecting success: 
-		echo "$time -> $expect" >expect &&
-		TZ=${zone:-$TZ} test-tool date show:"$format" "$time" >actual &&
+		echo "$expect" >expect &&
+		test-tool strcmp-offset "$s1" "$s2" >actual &&
 		test_cmp expect actual
 	
-ok 28 - show date (format:%Y-%m-%d %H:%M:%S:1466000000 +0200)
+ok 3 - strcmp_offset(abc, abz)
 
 expecting success: 
-		echo "$time -> $expect" >expect &&
-		TZ=${zone:-$TZ} test-tool date show:"$format" "$time" >actual &&
+		echo "$expect" >expect &&
+		test-tool strcmp-offset "$s1" "$s2" >actual &&
 		test_cmp expect actual
 	
-ok 29 - show date (format-local:%Y-%m-%d %H:%M:%S:1466000000 +0200)
-
-checking prerequisite: TIME_IS_64BIT
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir" &&test-tool date is64bit
-)
-prerequisite TIME_IS_64BIT ok
-checking prerequisite: TIME_T_IS_64BIT
+ok 4 - strcmp_offset(abc, abcdef)
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir" &&test-tool date time_t-is64bit
-)
-prerequisite TIME_T_IS_64BIT ok
+# passed all 4 test(s)
+1..4
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t0061-run-command.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t0061-run-command/.git/
 expecting success: 
-		echo "$time -> $expect" >expect &&
-		TZ=${zone:-$TZ} test-tool date show:"$format" "$time" >actual &&
-		test_cmp expect actual
-	
-ok 30 - show date (iso:5758122296 -0400)
+	test-tool run-command start-command-ENOENT ./does-not-exist 2>err &&
+	test_i18ngrep "\./does-not-exist" err
 
-expecting success: 
-		echo "$time -> $expect" >expect &&
-		TZ=${zone:-$TZ} test-tool date show:"$format" "$time" >actual &&
-		test_cmp expect actual
-	
-ok 31 - show date (iso-local:5758122296 -0400)
+fatal: cannot run ./does-not-exist: No such file or directory
+ok 1 - start_command reports ENOENT (slash)
 
 expecting success: 
-	TZ=UTC test-tool date parse '2008' >actual &&
-	test_cmp expect actual
-	
-ok 32 - parse date (2008)
+	test-tool run-command start-command-ENOENT does-not-exist 2>err &&
+	test_i18ngrep "does-not-exist" err
 
-expecting success: 
-	TZ=UTC test-tool date parse '2008-02' >actual &&
-	test_cmp expect actual
-	
-ok 33 - parse date (2008-02)
+error: cannot run does-not-exist: No such file or directory
+ok 2 - start_command reports ENOENT (no slash)
 
 expecting success: 
-	TZ=UTC test-tool date parse '2008-02-14' >actual &&
-	test_cmp expect actual
-	
-ok 34 - parse date (2008-02-14)
+	cat hello-script >hello.sh &&
+	chmod +x hello.sh &&
+	test-tool run-command run-command ./hello.sh >actual 2>err &&
 
-expecting success: 
-	TZ=UTC test-tool date parse '2008-02-14 20:30:45' >actual &&
-	test_cmp expect actual
-	
-ok 35 - parse date (2008-02-14 20:30:45)
+	test_cmp hello-script actual &&
+	test_must_be_empty err
 
-expecting success: 
-	TZ=UTC test-tool date parse '2008-02-14 20:30:45 -0500' >actual &&
-	test_cmp expect actual
-	
-ok 36 - parse date (2008-02-14 20:30:45 -0500)
+ok 3 - run_command can run a command
 
 expecting success: 
-	TZ=UTC test-tool date parse '2008-02-14 20:30:45 -0015' >actual &&
-	test_cmp expect actual
-	
-ok 37 - parse date (2008-02-14 20:30:45 -0015)
+	write_script should-not-run <<-\EOF &&
+	echo yikes
+	EOF
+	test_must_fail test-tool run-command run-command should-not-run 2>err &&
+	test_i18ngrep "should-not-run" err
 
-expecting success: 
-	TZ=UTC test-tool date parse '2008-02-14 20:30:45 -5' >actual &&
-	test_cmp expect actual
-	
-ok 38 - parse date (2008-02-14 20:30:45 -5)
+error: cannot run should-not-run: No such file or directory
+ok 4 - run_command is restricted to PATH
 
 expecting success: 
-	TZ=UTC test-tool date parse '2008-02-14 20:30:45 -5:' >actual &&
-	test_cmp expect actual
-	
-ok 39 - parse date (2008-02-14 20:30:45 -5:)
+	cat >hello <<-\EOF &&
+	cat hello-script
+	EOF
+	chmod +x hello &&
+	test-tool run-command run-command ./hello >actual 2>err &&
 
-expecting success: 
-	TZ=UTC test-tool date parse '2008-02-14 20:30:45 -05' >actual &&
-	test_cmp expect actual
-	
-ok 40 - parse date (2008-02-14 20:30:45 -05)
+	test_cmp hello-script actual &&
+	test_must_be_empty err
 
-expecting success: 
-	TZ=UTC test-tool date parse '2008-02-14 20:30:45 -:30' >actual &&
-	test_cmp expect actual
-	
-ok 41 - parse date (2008-02-14 20:30:45 -:30)
+ok 5 - run_command can run a script without a #! line
 
 expecting success: 
-	TZ=UTC test-tool date parse '2008-02-14 20:30:45 -05:00' >actual &&
-	test_cmp expect actual
-	
-ok 42 - parse date (2008-02-14 20:30:45 -05:00)
+	test_when_finished "rm -rf bin1 bin2" &&
+	mkdir -p bin1/greet bin2 &&
+	write_script bin2/greet <<-\EOF &&
+	cat bin2/greet
+	EOF
 
-expecting success: 
-	TZ=EST5 test-tool date parse '2008-02-14 20:30:45' >actual &&
-	test_cmp expect actual
-	
-ok 43 - parse date (2008-02-14 20:30:45 TZ=EST5)
+	PATH=$PWD/bin1:$PWD/bin2:$PATH \
+		test-tool run-command run-command greet >actual 2>err &&
+	test_cmp bin2/greet actual &&
+	test_must_be_empty err
 
-expecting success: 
-	test-tool date approxidate 'now' >actual &&
-	test_cmp expect actual
-	
-ok 44 - parse approxidate (now)
+ok 6 - run_command does not try to execute a directory
 
 expecting success: 
-	test-tool date approxidate '5 seconds ago' >actual &&
-	test_cmp expect actual
-	
-ok 45 - parse approxidate (5 seconds ago)
+	test_when_finished "rm -rf bin1 bin2" &&
+	mkdir -p bin1 bin2 &&
+	write_script bin1/greet <<-\EOF &&
+	cat bin1/greet
+	EOF
+	chmod -x bin1/greet &&
+	write_script bin2/greet <<-\EOF &&
+	cat bin2/greet
+	EOF
 
-expecting success: 
-	test-tool date approxidate '5.seconds.ago' >actual &&
-	test_cmp expect actual
-	
-ok 46 - parse approxidate (5.seconds.ago)
+	PATH=$PWD/bin1:$PWD/bin2:$PATH \
+		test-tool run-command run-command greet >actual 2>err &&
+	test_cmp bin2/greet actual &&
+	test_must_be_empty err
 
-expecting success: 
-	test-tool date approxidate '10.minutes.ago' >actual &&
-	test_cmp expect actual
-	
-ok 47 - parse approxidate (10.minutes.ago)
+ok 7 - run_command passes over non-executable file
 
 expecting success: 
-	test-tool date approxidate 'yesterday' >actual &&
-	test_cmp expect actual
-	
-ok 48 - parse approxidate (yesterday)
+	cat hello-script >hello.sh &&
+	chmod -x hello.sh &&
+	test_must_fail test-tool run-command run-command ./hello.sh 2>err &&
 
-expecting success: 
-	test-tool date approxidate '3.days.ago' >actual &&
-	test_cmp expect actual
-	
-ok 49 - parse approxidate (3.days.ago)
+	grep "fatal: cannot exec.*hello.sh" err
 
-expecting success: 
-	test-tool date approxidate '3.weeks.ago' >actual &&
-	test_cmp expect actual
-	
-ok 50 - parse approxidate (3.weeks.ago)
+fatal: cannot exec './hello.sh': Permission denied
+ok 8 - run_command reports EACCES
 
-expecting success: 
-	test-tool date approxidate '3.months.ago' >actual &&
-	test_cmp expect actual
-	
-ok 51 - parse approxidate (3.months.ago)
+checking prerequisite: SANITY
 
-expecting success: 
-	test-tool date approxidate '2.years.3.months.ago' >actual &&
-	test_cmp expect actual
-	
-ok 52 - parse approxidate (2.years.3.months.ago)
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
+	mkdir SANETESTD.1 SANETESTD.2 &&
 
-expecting success: 
-	test-tool date approxidate '6am yesterday' >actual &&
-	test_cmp expect actual
-	
-ok 53 - parse approxidate (6am yesterday)
+	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: 
-	test-tool date approxidate '6pm yesterday' >actual &&
-	test_cmp expect actual
-	
-ok 54 - parse approxidate (6pm yesterday)
+	! test -r SANETESTD.1/x &&
+	! rm SANETESTD.1/x && ! test -f SANETESTD.2/x
+	status=$?
 
-expecting success: 
-	test-tool date approxidate '3:00' >actual &&
-	test_cmp expect actual
-	
-ok 55 - parse approxidate (3:00)
+	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: 
-	test-tool date approxidate '15:00' >actual &&
+	mkdir local-command &&
+	test_when_finished "chmod u+rwx local-command && rm -fr local-command" &&
+	git config alias.nitfol "!echo frotz" &&
+	chmod a-rx local-command &&
+	(
+		PATH=./local-command:$PATH &&
+		git nitfol >actual
+	) &&
+	echo frotz >expect &&
 	test_cmp expect actual
-	
-ok 56 - parse approxidate (15:00)
 
-expecting success: 
-	test-tool date approxidate 'noon today' >actual &&
-	test_cmp expect actual
-	
-ok 57 - parse approxidate (noon today)
+ok 9 - unreadable directory in PATH
 
 expecting success: 
-	test-tool date approxidate 'noon yesterday' >actual &&
+	test-tool run-command run-command-parallel 5 sh -c "printf \"%s\n%s\n\" Hello World" 2>actual &&
 	test_cmp expect actual
-	
-ok 58 - parse approxidate (noon yesterday)
 
-expecting success: 
-	test-tool date approxidate 'January 5th noon pm' >actual &&
-	test_cmp expect actual
-	
-ok 59 - parse approxidate (January 5th noon pm)
+ok 10 - run_command runs in parallel with more jobs available than tasks
 
 expecting success: 
-	test-tool date approxidate '10am noon' >actual &&
+	test-tool run-command run-command-parallel 4 sh -c "printf \"%s\n%s\n\" Hello World" 2>actual &&
 	test_cmp expect actual
-	
-ok 60 - parse approxidate (10am noon)
 
-expecting success: 
-	test-tool date approxidate 'last tuesday' >actual &&
-	test_cmp expect actual
-	
-ok 61 - parse approxidate (last tuesday)
+ok 11 - run_command runs in parallel with as many jobs as tasks
 
 expecting success: 
-	test-tool date approxidate 'July 5th' >actual &&
+	test-tool run-command run-command-parallel 3 sh -c "printf \"%s\n%s\n\" Hello World" 2>actual &&
 	test_cmp expect actual
-	
-ok 62 - parse approxidate (July 5th)
 
-expecting success: 
-	test-tool date approxidate '06/05/2009' >actual &&
-	test_cmp expect actual
-	
-ok 63 - parse approxidate (06/05/2009)
+ok 12 - run_command runs in parallel with more tasks than jobs available
 
 expecting success: 
-	test-tool date approxidate '06.05.2009' >actual &&
+	test-tool run-command run-command-abort 3 false 2>actual &&
 	test_cmp expect actual
-	
-ok 64 - parse approxidate (06.05.2009)
 
-expecting success: 
-	test-tool date approxidate 'Jun 6, 5AM' >actual &&
-	test_cmp expect actual
-	
-ok 65 - parse approxidate (Jun 6, 5AM)
+ok 13 - run_command is asked to abort gracefully
 
 expecting success: 
-	test-tool date approxidate '5AM Jun 6' >actual &&
+	test-tool run-command run-command-no-jobs 3 sh -c "printf \"%s\n%s\n\" Hello World" 2>actual &&
 	test_cmp expect actual
-	
-ok 66 - parse approxidate (5AM Jun 6)
 
-expecting success: 
-	test-tool date approxidate '6AM, June 7, 2009' >actual &&
-	test_cmp expect actual
-	
-ok 67 - parse approxidate (6AM, June 7, 2009)
+ok 14 - run_command outputs 
 
 expecting success: 
-	test-tool date approxidate '2008-12-01' >actual &&
-	test_cmp expect actual
-	
-ok 68 - parse approxidate (2008-12-01)
+	test_trace "abc=1 def=2" env abc=1 env def=2 &&
+	test_trace "abc=2" env abc env abc=1 env abc=2 &&
+	test_trace "abc=2" env abc env abc=2 &&
+	(
+		abc=1 && export abc &&
+		test_trace "def=1" env abc=1 env def=1
+	) &&
+	(
+		abc=1 && export abc &&
+		test_trace "def=1" env abc env abc=1 env def=1
+	) &&
+	test_trace "def=1" env non-exist env def=1 &&
+	test_trace "abc=2" env abc=1 env abc env abc=2 &&
+	(
+		abc=1 def=2 && export abc def &&
+		test_trace "unset abc def;" env abc env def
+	) &&
+	(
+		abc=1 def=2 && export abc def &&
+		test_trace "unset def; abc=3" env abc env def env abc=3
+	) &&
+	(
+		abc=1 && export abc &&
+		test_trace "unset abc;" env abc=2 env abc
+	)
 
-expecting success: 
-	test-tool date approxidate '2009-12-01' >actual &&
-	test_cmp expect actual
-	
-ok 69 - parse approxidate (2009-12-01)
+ok 15 - GIT_TRACE with environment variables
 
-# passed all 69 test(s)
-1..69
+# passed all 15 test(s)
+1..15
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
 *** t0020-crlf.sh ***
@@ -11063,7 +11522,7 @@
 	patched=$(git hash-object --stdin <one) &&
 	git read-tree --reset -u HEAD
 
-[master (root-commit) 73acd63] initial
+[master (root-commit) 7f6b201] initial
  Author: A U Thor <author@example.com>
  3 files changed, 12 insertions(+)
  create mode 100644 dir/two
@@ -11130,7 +11589,7 @@
 		test $(grep "CRLF will be replaced by LF" err | wc -l) = 1
 	fi
 
-[master 119a508] nowarn
+[master 98a1a00] nowarn
  Author: A U Thor <author@example.com>
  1 file changed, 4 insertions(+)
  create mode 100644 doublewarn
@@ -11173,7 +11632,7 @@
 	git config core.safecrlf false &&
 	git reset --hard HEAD^
 
-HEAD is now at 73acd63 initial
+HEAD is now at 7f6b201 initial
 ok 9 - switch off autocrlf, safecrlf, reset HEAD
 
 expecting success: 
@@ -11348,7 +11807,7 @@
 	test_must_fail has_cr one &&
 	verbose has_cr three
 
-[master 7a96bb4] Add .gitattributes
+[master b694a41] Add .gitattributes
  Author: A U Thor <author@example.com>
  1 file changed, 2 insertions(+)
  create mode 100644 .gitattributes
@@ -11406,10 +11865,10 @@
 	test "$(git diff-files --raw)" = ""
 
 
-[master 1b87859] initial
+[master eb0e66a] initial
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[master 3740e2f] second
+[master 278f77f] second
  Author: A U Thor <author@example.com>
  2 files changed, 2 insertions(+)
  create mode 100644 .file
@@ -11424,8 +11883,8 @@
 
   git checkout -b <new-branch-name>
 
-HEAD is now at 1b87859 initial
-Previous HEAD position was 1b87859 initial
+HEAD is now at eb0e66a initial
+Previous HEAD position was eb0e66a initial
 Switched to branch 'master'
 ok 27 - checkout with existing .gitattributes
 
@@ -11442,7 +11901,7 @@
 
 
 rm '.gitattributes'
-[master 314c1c0] third
+[master 9da8582] third
  Author: A U Thor <author@example.com>
  2 files changed, 1 insertion(+), 4 deletions(-)
  create mode 100644 .file2
@@ -11458,9 +11917,9 @@
 
   git checkout -b <new-branch-name>
 
-HEAD is now at 3740e2f second
+HEAD is now at 278f77f second
 M	three
-Previous HEAD position was 3740e2f second
+Previous HEAD position was 278f77f second
 Switched to branch 'master'
 ok 28 - checkout when deleting .gitattributes
 
@@ -11488,7 +11947,7 @@
 	git commit -m "alllf, allcrlf and mixed only" &&
 	git tag -a -m "message" autocrlf-checkpoint
 
-[master 7710448] alllf, allcrlf and mixed only
+[master 9226363] alllf, allcrlf and mixed only
  Author: A U Thor <author@example.com>
  7 files changed, 8 insertions(+), 14 deletions(-)
  delete mode 100644 .file
@@ -11538,7 +11997,7 @@
 	git checkout -f &&
 	test_cmp alllf alllf2
 
-[master e903d67] alllf2 added
+[master e75024d] alllf2 added
  Author: A U Thor <author@example.com>
  1 file changed, 4 insertions(+)
  create mode 100644 alllf2
@@ -11548,107 +12007,6 @@
 1..36
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t0065-strcmp-offset.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t0065-strcmp-offset/.git/
-expecting success: 
-		echo "$expect" >expect &&
-		test-tool strcmp-offset "$s1" "$s2" >actual &&
-		test_cmp expect actual
-	
-ok 1 - strcmp_offset(abc, abc)
-
-expecting success: 
-		echo "$expect" >expect &&
-		test-tool strcmp-offset "$s1" "$s2" >actual &&
-		test_cmp expect actual
-	
-ok 2 - strcmp_offset(abc, def)
-
-expecting success: 
-		echo "$expect" >expect &&
-		test-tool strcmp-offset "$s1" "$s2" >actual &&
-		test_cmp expect actual
-	
-ok 3 - strcmp_offset(abc, abz)
-
-expecting success: 
-		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/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t0070-fundamental.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t0070-fundamental/.git/
-expecting success: 
-	test-tool ctype
-
-ok 1 - character classes (isspace, isalpha etc.)
-
-expecting success: 
-	test_must_fail test-tool mktemp doesnotexist/testXXXXXX 2>err &&
-	grep "doesnotexist/test" err
-
-fatal: Unable to create temporary file '/build/git-2.20.1/t/trash directory.t0070-fundamental/doesnotexist/testAVbftV': No such file or directory
-ok 2 - mktemp to nonexistent directory prints filename
-
-checking prerequisite: SANITY
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
-	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: 
-	mkdir cannotwrite &&
-	test_when_finished "chmod +w cannotwrite" &&
-	chmod -w cannotwrite &&
-	test_must_fail test-tool mktemp cannotwrite/testXXXXXX 2>err &&
-	grep "cannotwrite/test" err
-
-fatal: Unable to create temporary file '/build/git-2.20.1/t/trash directory.t0070-fundamental/cannotwrite/test8Kt6O5': Permission denied
-ok 3 - mktemp to unwritable directory prints filename
-
-expecting success: 
-	git commit --allow-empty -m message <&-
-
-[master (root-commit) 27bf890] message
- Author: A U Thor <author@example.com>
-ok 4 - git_mkstemps_mode does not fail if fd 0 is not open
-
-expecting success: 
-	# if this test fails, re-build git with NO_REGEX=1
-	test-tool regex --bug
-
-ok 5 - check for a bug in the regex routines
-
-# passed all 5 test(s)
-1..5
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
 *** t0030-stripspace.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t0030-stripspace/.git/
 expecting success: 
@@ -12090,6 +12448,73 @@
 1..26
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
+*** t0070-fundamental.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t0070-fundamental/.git/
+expecting success: 
+	test-tool ctype
+
+ok 1 - character classes (isspace, isalpha etc.)
+
+expecting success: 
+	test_must_fail test-tool mktemp doesnotexist/testXXXXXX 2>err &&
+	grep "doesnotexist/test" err
+
+fatal: Unable to create temporary file '/build/git-2.20.1/t/trash directory.t0070-fundamental/doesnotexist/testyAOXQL': No such file or directory
+ok 2 - mktemp to nonexistent directory prints filename
+
+checking prerequisite: SANITY
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
+	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: 
+	mkdir cannotwrite &&
+	test_when_finished "chmod +w cannotwrite" &&
+	chmod -w cannotwrite &&
+	test_must_fail test-tool mktemp cannotwrite/testXXXXXX 2>err &&
+	grep "cannotwrite/test" err
+
+fatal: Unable to create temporary file '/build/git-2.20.1/t/trash directory.t0070-fundamental/cannotwrite/testKBv1tS': Permission denied
+ok 3 - mktemp to unwritable directory prints filename
+
+expecting success: 
+	git commit --allow-empty -m message <&-
+
+[master (root-commit) 0362a71] message
+ Author: A U Thor <author@example.com>
+ok 4 - git_mkstemps_mode does not fail if fd 0 is not open
+
+expecting success: 
+	# if this test fails, re-build git with NO_REGEX=1
+	test-tool regex --bug
+
+ok 5 - check for a bug in the regex routines
+
+# passed all 5 test(s)
+1..5
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
 *** t0063-string-list.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t0063-string-list/.git/
 expecting success: 
@@ -12433,6 +12858,140 @@
 1..8
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
+*** t0202-gettext-perl.sh ***
+Initialized empty Git repository in /build/git-2.20.1/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
+# run 0: Perl Git::I18N API (perl /build/git-2.20.1/t/t0202/test.pl)
+1..13
+ok 1 - Testing Git::I18N with NO Perl gettext library
+ok 2 - Git::I18N is located at /build/git-2.20.1/t/../perl/build/lib/Git/I18N.pm
+ok 3 - sanity: Git::I18N has 3 export(s)
+ok 4 - sanity: Git::I18N exports everything by default
+ok 5 - sanity: N__ has a $ prototype
+ok 6 - sanity: __n has a $$$ prototype
+ok 7 - sanity: __ has a $ prototype
+ok 8 - Passing a string through __() in the C locale works
+ok 9 - Get singular string through __n() in C locale
+ok 10 - Get plural string through __n() in C locale
+ok 11 - Passing a string through N__() in the C locale works
+ok 12 - Without a gettext library + <C> locale <TEST: A Perl test string> turns into <TEST: A Perl test string>
+ok 13 - Without a gettext library + <is> locale <TEST: A Perl test string> turns into <TEST: A Perl test string>
+# test_external test Perl Git::I18N API was ok
+# expecting no stderr from previous command
+# test_external_without_stderr test no stderr: Perl Git::I18N API was ok
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t0203-gettext-setlocale-sanity.sh ***
+Initialized empty Git repository in /build/git-2.20.1/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: 
+	. "$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: 
+	. "$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/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t0201-gettext-fallbacks.sh ***
+Initialized empty Git repository in /build/git-2.20.1/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: 
+    test -n "$GIT_INTERNAL_GETTEXT_SH_SCHEME"
+
+ok 1 - sanity: $GIT_INTERNAL_GETTEXT_SH_SCHEME is set (to fallthrough)
+
+expecting success: 
+    test -n "$GIT_INTERNAL_GETTEXT_TEST_FALLBACKS"
+
+ok 2 - sanity: $GIT_INTERNAL_GETTEXT_TEST_FALLBACKS is set
+
+expecting success: 
+    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: 
+    printf "test" >expect &&
+    gettext "test" >actual &&
+    test_i18ncmp expect actual &&
+    printf "test more words" >expect &&
+    gettext "test more words" >actual &&
+    test_i18ncmp expect actual
+
+ok 4 - gettext: our gettext() fallback has pass-through semantics
+
+expecting success: 
+    printf "test" >expect &&
+    eval_gettext "test" >actual &&
+    test_i18ncmp expect actual &&
+    printf "test more words" >expect &&
+    eval_gettext "test more words" >actual &&
+    test_i18ncmp expect actual
+
+ok 5 - eval_gettext: our eval_gettext() fallback has pass-through semantics
+
+expecting success: 
+    printf "test YesPlease" >expect &&
+    GIT_INTERNAL_GETTEXT_TEST_FALLBACKS=YesPlease eval_gettext "test \$GIT_INTERNAL_GETTEXT_TEST_FALLBACKS" >actual &&
+    test_i18ncmp expect actual
+
+ok 6 - eval_gettext: our eval_gettext() fallback can interpolate variables
+
+expecting success: 
+    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_i18ncmp expect actual
+
+ok 7 - eval_gettext: our eval_gettext() fallback can interpolate variables with spaces
+
+expecting success: 
+    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_i18ncmp 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/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
 *** t0100-previous.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t0100-previous/.git/
 expecting success: 
@@ -12578,293 +13137,6 @@
 1..6
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t0202-gettext-perl.sh ***
-Initialized empty Git repository in /build/git-2.20.1/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
-# run 0: Perl Git::I18N API (perl /build/git-2.20.1/t/t0202/test.pl)
-1..13
-ok 1 - Testing Git::I18N with NO Perl gettext library
-ok 2 - Git::I18N is located at /build/git-2.20.1/t/../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>
-# test_external test Perl Git::I18N API was ok
-# expecting no stderr from previous command
-# test_external_without_stderr test no stderr: Perl Git::I18N API was ok
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t0061-run-command.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t0061-run-command/.git/
-expecting success: 
-	test-tool run-command start-command-ENOENT ./does-not-exist 2>err &&
-	test_i18ngrep "\./does-not-exist" err
-
-fatal: cannot run ./does-not-exist: No such file or directory
-ok 1 - start_command reports ENOENT (slash)
-
-expecting success: 
-	test-tool run-command start-command-ENOENT does-not-exist 2>err &&
-	test_i18ngrep "does-not-exist" err
-
-error: cannot run does-not-exist: No such file or directory
-ok 2 - start_command reports ENOENT (no slash)
-
-expecting success: 
-	cat hello-script >hello.sh &&
-	chmod +x hello.sh &&
-	test-tool run-command run-command ./hello.sh >actual 2>err &&
-
-	test_cmp hello-script actual &&
-	test_must_be_empty err
-
-ok 3 - run_command can run a command
-
-expecting success: 
-	write_script should-not-run <<-\EOF &&
-	echo yikes
-	EOF
-	test_must_fail test-tool run-command run-command should-not-run 2>err &&
-	test_i18ngrep "should-not-run" err
-
-error: cannot run should-not-run: No such file or directory
-ok 4 - run_command is restricted to PATH
-
-expecting success: 
-	cat >hello <<-\EOF &&
-	cat hello-script
-	EOF
-	chmod +x hello &&
-	test-tool run-command run-command ./hello >actual 2>err &&
-
-	test_cmp hello-script actual &&
-	test_must_be_empty err
-
-ok 5 - run_command can run a script without a #! line
-
-expecting success: 
-	test_when_finished "rm -rf bin1 bin2" &&
-	mkdir -p bin1/greet bin2 &&
-	write_script bin2/greet <<-\EOF &&
-	cat bin2/greet
-	EOF
-
-	PATH=$PWD/bin1:$PWD/bin2:$PATH \
-		test-tool run-command run-command greet >actual 2>err &&
-	test_cmp bin2/greet actual &&
-	test_must_be_empty err
-
-ok 6 - run_command does not try to execute a directory
-
-expecting success: 
-	test_when_finished "rm -rf bin1 bin2" &&
-	mkdir -p bin1 bin2 &&
-	write_script bin1/greet <<-\EOF &&
-	cat bin1/greet
-	EOF
-	chmod -x bin1/greet &&
-	write_script bin2/greet <<-\EOF &&
-	cat bin2/greet
-	EOF
-
-	PATH=$PWD/bin1:$PWD/bin2:$PATH \
-		test-tool run-command run-command greet >actual 2>err &&
-	test_cmp bin2/greet actual &&
-	test_must_be_empty err
-
-ok 7 - run_command passes over non-executable file
-
-expecting success: 
-	cat hello-script >hello.sh &&
-	chmod -x hello.sh &&
-	test_must_fail test-tool run-command run-command ./hello.sh 2>err &&
-
-	grep "fatal: cannot exec.*hello.sh" err
-
-fatal: cannot exec './hello.sh': Permission denied
-ok 8 - run_command reports EACCES
-
-checking prerequisite: SANITY
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
-	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: 
-	mkdir local-command &&
-	test_when_finished "chmod u+rwx local-command && rm -fr local-command" &&
-	git config alias.nitfol "!echo frotz" &&
-	chmod a-rx local-command &&
-	(
-		PATH=./local-command:$PATH &&
-		git nitfol >actual
-	) &&
-	echo frotz >expect &&
-	test_cmp expect actual
-
-ok 9 - unreadable directory in PATH
-
-expecting success: 
-	test-tool run-command run-command-parallel 5 sh -c "printf \"%s\n%s\n\" Hello World" 2>actual &&
-	test_cmp expect actual
-
-ok 10 - run_command runs in parallel with more jobs available than tasks
-
-expecting success: 
-	test-tool run-command run-command-parallel 4 sh -c "printf \"%s\n%s\n\" Hello World" 2>actual &&
-	test_cmp expect actual
-
-ok 11 - run_command runs in parallel with as many jobs as tasks
-
-expecting success: 
-	test-tool run-command run-command-parallel 3 sh -c "printf \"%s\n%s\n\" Hello World" 2>actual &&
-	test_cmp expect actual
-
-ok 12 - run_command runs in parallel with more tasks than jobs available
-
-expecting success: 
-	test-tool run-command run-command-abort 3 false 2>actual &&
-	test_cmp expect actual
-
-ok 13 - run_command is asked to abort gracefully
-
-expecting success: 
-	test-tool run-command run-command-no-jobs 3 sh -c "printf \"%s\n%s\n\" Hello World" 2>actual &&
-	test_cmp expect actual
-
-ok 14 - run_command outputs 
-
-expecting success: 
-	test_trace "abc=1 def=2" env abc=1 env def=2 &&
-	test_trace "abc=2" env abc env abc=1 env abc=2 &&
-	test_trace "abc=2" env abc env abc=2 &&
-	(
-		abc=1 && export abc &&
-		test_trace "def=1" env abc=1 env def=1
-	) &&
-	(
-		abc=1 && export abc &&
-		test_trace "def=1" env abc env abc=1 env def=1
-	) &&
-	test_trace "def=1" env non-exist env def=1 &&
-	test_trace "abc=2" env abc=1 env abc env abc=2 &&
-	(
-		abc=1 def=2 && export abc def &&
-		test_trace "unset abc def;" env abc env def
-	) &&
-	(
-		abc=1 def=2 && export abc def &&
-		test_trace "unset def; abc=3" env abc env def env abc=3
-	) &&
-	(
-		abc=1 && export abc &&
-		test_trace "unset abc;" env abc=2 env abc
-	)
-
-ok 15 - GIT_TRACE with environment variables
-
-# passed all 15 test(s)
-1..15
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t0201-gettext-fallbacks.sh ***
-Initialized empty Git repository in /build/git-2.20.1/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: 
-    test -n "$GIT_INTERNAL_GETTEXT_SH_SCHEME"
-
-ok 1 - sanity: $GIT_INTERNAL_GETTEXT_SH_SCHEME is set (to fallthrough)
-
-expecting success: 
-    test -n "$GIT_INTERNAL_GETTEXT_TEST_FALLBACKS"
-
-ok 2 - sanity: $GIT_INTERNAL_GETTEXT_TEST_FALLBACKS is set
-
-expecting success: 
-    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: 
-    printf "test" >expect &&
-    gettext "test" >actual &&
-    test_i18ncmp expect actual &&
-    printf "test more words" >expect &&
-    gettext "test more words" >actual &&
-    test_i18ncmp expect actual
-
-ok 4 - gettext: our gettext() fallback has pass-through semantics
-
-expecting success: 
-    printf "test" >expect &&
-    eval_gettext "test" >actual &&
-    test_i18ncmp expect actual &&
-    printf "test more words" >expect &&
-    eval_gettext "test more words" >actual &&
-    test_i18ncmp expect actual
-
-ok 5 - eval_gettext: our eval_gettext() fallback has pass-through semantics
-
-expecting success: 
-    printf "test YesPlease" >expect &&
-    GIT_INTERNAL_GETTEXT_TEST_FALLBACKS=YesPlease eval_gettext "test \$GIT_INTERNAL_GETTEXT_TEST_FALLBACKS" >actual &&
-    test_i18ncmp expect actual
-
-ok 6 - eval_gettext: our eval_gettext() fallback can interpolate variables
-
-expecting success: 
-    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_i18ncmp expect actual
-
-ok 7 - eval_gettext: our eval_gettext() fallback can interpolate variables with spaces
-
-expecting success: 
-    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_i18ncmp 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/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
 *** t0205-gettext-poison.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t0205-gettext-poison/.git/
 expecting success: 
@@ -12896,46 +13168,6 @@
 1..3
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t0203-gettext-setlocale-sanity.sh ***
-Initialized empty Git repository in /build/git-2.20.1/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: 
-	. "$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: 
-	. "$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/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
 *** t0303-credential-external.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t0303-credential-external/.git/
 1..0 # SKIP used to test external credential helpers
@@ -13143,6 +13375,247 @@
 1..8
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
+*** t0110-urlmatch-normalization.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t0110-urlmatch-normalization/.git/
+expecting success: 
+	! 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: 
+	! 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: 
+	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: 
+	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: 
+	! 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: 
+	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: 
+	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: 
+	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: 
+	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: 
+	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: 
+	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/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t0010-racy-git.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t0010-racy-git/.git/
+expecting success: test "" != "$files"
+ok 1 - Racy GIT trial #0 part A
+
+expecting success: test "" != "$files"
+ok 2 - Racy GIT trial #0 part B
+
+expecting success: test "" != "$files"
+ok 3 - Racy GIT trial #1 part A
+
+expecting success: test "" != "$files"
+ok 4 - Racy GIT trial #1 part B
+
+expecting success: test "" != "$files"
+ok 5 - Racy GIT trial #2 part A
+
+expecting success: test "" != "$files"
+ok 6 - Racy GIT trial #2 part B
+
+expecting success: test "" != "$files"
+ok 7 - Racy GIT trial #3 part A
+
+expecting success: test "" != "$files"
+ok 8 - Racy GIT trial #3 part B
+
+expecting success: test "" != "$files"
+ok 9 - Racy GIT trial #4 part A
+
+expecting success: test "" != "$files"
+ok 10 - Racy GIT trial #4 part B
+
+# passed all 10 test(s)
+1..10
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t1003-read-tree-prefix.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1003-read-tree-prefix/.git/
+expecting success: 
+	echo hello >one &&
+	git update-index --add one &&
+	tree=$(git write-tree) &&
+	echo tree is $tree
+
+tree is 700196ec4e5b1c75e9f5481e5b545d78533ff917
+ok 1 - setup
+
+expecting success: 
+	git read-tree --prefix=two/ $tree &&
+	git ls-files >actual &&
+	cmp expect actual
+
+ok 2 - read-tree --prefix
+
+# passed all 2 test(s)
+1..2
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
 *** t0300-credentials.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t0300-credentials/.git/
 expecting success: 
@@ -13608,351 +14081,6 @@
 1..25
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t0110-urlmatch-normalization.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t0110-urlmatch-normalization/.git/
-expecting success: 
-	! 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: 
-	! 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: 
-	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: 
-	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: 
-	! 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: 
-	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: 
-	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: 
-	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: 
-	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: 
-	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: 
-	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/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t1003-read-tree-prefix.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1003-read-tree-prefix/.git/
-expecting success: 
-	echo hello >one &&
-	git update-index --add one &&
-	tree=$(git write-tree) &&
-	echo tree is $tree
-
-tree is 700196ec4e5b1c75e9f5481e5b545d78533ff917
-ok 1 - setup
-
-expecting success: 
-	git read-tree --prefix=two/ $tree &&
-	git ls-files >actual &&
-	cmp expect actual
-
-ok 2 - read-tree --prefix
-
-# passed all 2 test(s)
-1..2
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t1005-read-tree-reset.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1005-read-tree-reset/.git/
-expecting success: 
-	git init &&
-	mkdir df &&
-	echo content >df/file &&
-	git add df/file &&
-	git commit -m one &&
-	git ls-files >expect &&
-	rm -rf df &&
-	echo content >df &&
-	git add df &&
-	echo content >new &&
-	git add new &&
-	git commit -m two
-
-Reinitialized existing Git repository in /build/git-2.20.1/t/trash directory.t1005-read-tree-reset/.git/
-[master (root-commit) b8d0db7] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 df/file
-[master 78e04d3] two
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+)
- rename df/file => df (100%)
- create mode 100644 new
-ok 1 - setup
-
-expecting success: 
-	read_tree_u_must_succeed -u --reset HEAD^ &&
-	git ls-files >actual &&
-	test_cmp expect actual
-
-ok 2 - reset should work
-
-expecting success: 
-	read_tree_u_must_succeed --reset -u HEAD &&
-	git ls-files -s >expect &&
-	sha1=$(git rev-parse :new) &&
-	(
-		echo "100644 $sha1 1	old" &&
-		echo "100644 $sha1 3	old"
-	) | git update-index --index-info &&
-	>old &&
-	git ls-files -s &&
-	read_tree_u_must_succeed --reset -u HEAD &&
-	git ls-files -s >actual &&
-	! test -f old
-
-100644 d95f3ad14dee633a758d2e331151e950dd13e4ed 0	df
-100644 d95f3ad14dee633a758d2e331151e950dd13e4ed 0	new
-100644 d95f3ad14dee633a758d2e331151e950dd13e4ed 1	old
-100644 d95f3ad14dee633a758d2e331151e950dd13e4ed 3	old
-ok 3 - reset should remove remnants from a failed merge
-
-expecting success: 
-	read_tree_u_must_succeed --reset -u HEAD &&
-	git ls-files -s >expect &&
-	sha1=$(git rev-parse :new) &&
-	(
-		echo "100644 $sha1 1	old" &&
-		echo "100644 $sha1 3	old"
-	) | git update-index --index-info &&
-	>old &&
-	git ls-files -s &&
-	read_tree_u_must_succeed --reset -u HEAD HEAD &&
-	git ls-files -s >actual &&
-	! test -f old
-
-100644 d95f3ad14dee633a758d2e331151e950dd13e4ed 0	df
-100644 d95f3ad14dee633a758d2e331151e950dd13e4ed 0	new
-100644 d95f3ad14dee633a758d2e331151e950dd13e4ed 1	old
-100644 d95f3ad14dee633a758d2e331151e950dd13e4ed 3	old
-ok 4 - two-way reset should remove remnants too
-
-expecting success: 
-	read_tree_u_must_succeed --reset -u HEAD &&
-	git ls-files -s >expect &&
-	sha1=$(git rev-parse :new) &&
-	(
-		echo "100644 $sha1 1	old" &&
-		echo "100644 $sha1 3	old"
-	) | git update-index --index-info &&
-	>old &&
-	git ls-files -s &&
-	git reset --hard &&
-	git ls-files -s >actual &&
-	! test -f old
-
-100644 d95f3ad14dee633a758d2e331151e950dd13e4ed 0	df
-100644 d95f3ad14dee633a758d2e331151e950dd13e4ed 0	new
-100644 d95f3ad14dee633a758d2e331151e950dd13e4ed 1	old
-100644 d95f3ad14dee633a758d2e331151e950dd13e4ed 3	old
-HEAD is now at 78e04d3 two
-ok 5 - Porcelain reset should remove remnants too
-
-expecting success: 
-	read_tree_u_must_succeed --reset -u HEAD &&
-	git ls-files -s >expect &&
-	sha1=$(git rev-parse :new) &&
-	(
-		echo "100644 $sha1 1	old" &&
-		echo "100644 $sha1 3	old"
-	) | git update-index --index-info &&
-	>old &&
-	git ls-files -s &&
-	git checkout -f &&
-	git ls-files -s >actual &&
-	! test -f old
-
-100644 d95f3ad14dee633a758d2e331151e950dd13e4ed 0	df
-100644 d95f3ad14dee633a758d2e331151e950dd13e4ed 0	new
-100644 d95f3ad14dee633a758d2e331151e950dd13e4ed 1	old
-100644 d95f3ad14dee633a758d2e331151e950dd13e4ed 3	old
-ok 6 - Porcelain checkout -f should remove remnants too
-
-expecting success: 
-	read_tree_u_must_succeed --reset -u HEAD &&
-	git ls-files -s >expect &&
-	sha1=$(git rev-parse :new) &&
-	(
-		echo "100644 $sha1 1	old" &&
-		echo "100644 $sha1 3	old"
-	) | git update-index --index-info &&
-	>old &&
-	git ls-files -s &&
-	git checkout -f HEAD &&
-	git ls-files -s >actual &&
-	! test -f old
-
-100644 d95f3ad14dee633a758d2e331151e950dd13e4ed 0	df
-100644 d95f3ad14dee633a758d2e331151e950dd13e4ed 0	new
-100644 d95f3ad14dee633a758d2e331151e950dd13e4ed 1	old
-100644 d95f3ad14dee633a758d2e331151e950dd13e4ed 3	old
-ok 7 - Porcelain checkout -f HEAD should remove remnants too
-
-# passed all 7 test(s)
-1..7
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
 *** t0012-help.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t0012-help/.git/
 expecting success: 
@@ -14924,6 +15052,220 @@
 1..135
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
+*** t1005-read-tree-reset.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1005-read-tree-reset/.git/
+expecting success: 
+	git init &&
+	mkdir df &&
+	echo content >df/file &&
+	git add df/file &&
+	git commit -m one &&
+	git ls-files >expect &&
+	rm -rf df &&
+	echo content >df &&
+	git add df &&
+	echo content >new &&
+	git add new &&
+	git commit -m two
+
+Reinitialized existing Git repository in /build/git-2.20.1/t/trash directory.t1005-read-tree-reset/.git/
+[master (root-commit) 9abc13b] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 df/file
+[master 3f5043c] two
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+)
+ rename df/file => df (100%)
+ create mode 100644 new
+ok 1 - setup
+
+expecting success: 
+	read_tree_u_must_succeed -u --reset HEAD^ &&
+	git ls-files >actual &&
+	test_cmp expect actual
+
+ok 2 - reset should work
+
+expecting success: 
+	read_tree_u_must_succeed --reset -u HEAD &&
+	git ls-files -s >expect &&
+	sha1=$(git rev-parse :new) &&
+	(
+		echo "100644 $sha1 1	old" &&
+		echo "100644 $sha1 3	old"
+	) | git update-index --index-info &&
+	>old &&
+	git ls-files -s &&
+	read_tree_u_must_succeed --reset -u HEAD &&
+	git ls-files -s >actual &&
+	! test -f old
+
+100644 d95f3ad14dee633a758d2e331151e950dd13e4ed 0	df
+100644 d95f3ad14dee633a758d2e331151e950dd13e4ed 0	new
+100644 d95f3ad14dee633a758d2e331151e950dd13e4ed 1	old
+100644 d95f3ad14dee633a758d2e331151e950dd13e4ed 3	old
+ok 3 - reset should remove remnants from a failed merge
+
+expecting success: 
+	read_tree_u_must_succeed --reset -u HEAD &&
+	git ls-files -s >expect &&
+	sha1=$(git rev-parse :new) &&
+	(
+		echo "100644 $sha1 1	old" &&
+		echo "100644 $sha1 3	old"
+	) | git update-index --index-info &&
+	>old &&
+	git ls-files -s &&
+	read_tree_u_must_succeed --reset -u HEAD HEAD &&
+	git ls-files -s >actual &&
+	! test -f old
+
+100644 d95f3ad14dee633a758d2e331151e950dd13e4ed 0	df
+100644 d95f3ad14dee633a758d2e331151e950dd13e4ed 0	new
+100644 d95f3ad14dee633a758d2e331151e950dd13e4ed 1	old
+100644 d95f3ad14dee633a758d2e331151e950dd13e4ed 3	old
+ok 4 - two-way reset should remove remnants too
+
+expecting success: 
+	read_tree_u_must_succeed --reset -u HEAD &&
+	git ls-files -s >expect &&
+	sha1=$(git rev-parse :new) &&
+	(
+		echo "100644 $sha1 1	old" &&
+		echo "100644 $sha1 3	old"
+	) | git update-index --index-info &&
+	>old &&
+	git ls-files -s &&
+	git reset --hard &&
+	git ls-files -s >actual &&
+	! test -f old
+
+100644 d95f3ad14dee633a758d2e331151e950dd13e4ed 0	df
+100644 d95f3ad14dee633a758d2e331151e950dd13e4ed 0	new
+100644 d95f3ad14dee633a758d2e331151e950dd13e4ed 1	old
+100644 d95f3ad14dee633a758d2e331151e950dd13e4ed 3	old
+HEAD is now at 3f5043c two
+ok 5 - Porcelain reset should remove remnants too
+
+expecting success: 
+	read_tree_u_must_succeed --reset -u HEAD &&
+	git ls-files -s >expect &&
+	sha1=$(git rev-parse :new) &&
+	(
+		echo "100644 $sha1 1	old" &&
+		echo "100644 $sha1 3	old"
+	) | git update-index --index-info &&
+	>old &&
+	git ls-files -s &&
+	git checkout -f &&
+	git ls-files -s >actual &&
+	! test -f old
+
+100644 d95f3ad14dee633a758d2e331151e950dd13e4ed 0	df
+100644 d95f3ad14dee633a758d2e331151e950dd13e4ed 0	new
+100644 d95f3ad14dee633a758d2e331151e950dd13e4ed 1	old
+100644 d95f3ad14dee633a758d2e331151e950dd13e4ed 3	old
+ok 6 - Porcelain checkout -f should remove remnants too
+
+expecting success: 
+	read_tree_u_must_succeed --reset -u HEAD &&
+	git ls-files -s >expect &&
+	sha1=$(git rev-parse :new) &&
+	(
+		echo "100644 $sha1 1	old" &&
+		echo "100644 $sha1 3	old"
+	) | git update-index --index-info &&
+	>old &&
+	git ls-files -s &&
+	git checkout -f HEAD &&
+	git ls-files -s >actual &&
+	! test -f old
+
+100644 d95f3ad14dee633a758d2e331151e950dd13e4ed 0	df
+100644 d95f3ad14dee633a758d2e331151e950dd13e4ed 0	new
+100644 d95f3ad14dee633a758d2e331151e950dd13e4ed 1	old
+100644 d95f3ad14dee633a758d2e331151e950dd13e4ed 3	old
+ok 7 - Porcelain checkout -f HEAD should remove remnants too
+
+# passed all 7 test(s)
+1..7
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t1008-read-tree-overlay.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1008-read-tree-overlay/.git/
+expecting success: 
+	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
+
+[master (root-commit) bf0f17a] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 a
+[master 5685326] second
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b
+Switched to a new branch 'side'
+[side 2ca49ff] third
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b/c
+ok 1 - setup
+
+expecting success: 
+	read_tree_must_succeed initial master side &&
+	test_write_lines a b/c >expect &&
+	git ls-files >actual &&
+	test_cmp expect actual
+
+ok 2 - multi-read
+
+# passed all 2 test(s)
+1..2
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t1009-read-tree-new-index.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1009-read-tree-new-index/.git/
+expecting success: 
+	echo one >a &&
+	git add a &&
+	git commit -m initial
+
+[master (root-commit) e33cf37] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 a
+ok 1 - setup
+
+expecting success: 
+	rm -f new-index &&
+	GIT_INDEX_FILE=new-index git read-tree master
+
+ok 2 - non-existent index file
+
+expecting success: 
+	rm -f new-index &&
+	> new-index &&
+	GIT_INDEX_FILE=new-index git read-tree master
+
+ok 3 - empty index file
+
+# passed all 3 test(s)
+1..3
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
 *** t1004-read-tree-m-u-wf.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1004-read-tree-m-u-wf/.git/
 expecting success: 
@@ -14944,7 +15286,7 @@
 	git update-index --remove file2 subdir/file2 &&
 	git commit -a -m "master removes file2 and subdir/file2"
 
-[master (root-commit) ad8c44d] initial
+[master (root-commit) 3be7b2d] initial
  Author: A U Thor <author@example.com>
  4 files changed, 4 insertions(+)
  create mode 100644 file1
@@ -14952,7 +15294,7 @@
  create mode 100644 subdir/file1
  create mode 100644 subdir/file2
 file2 is not tracked on the master anymore
-[master 3672d75] master removes file2 and subdir/file2
+[master 31f7ef6] master removes file2 and subdir/file2
  Author: A U Thor <author@example.com>
  2 files changed, 2 deletions(-)
  delete mode 100644 file2
@@ -15024,7 +15366,7 @@
 Switched to branch 'side'
 D	file2
 D	subdir/file2
-[side 4201a61] side adds file3 and removes file2
+[side 8f5d819] side adds file3 and removes file2
  Author: A U Thor <author@example.com>
  4 files changed, 2 insertions(+), 2 deletions(-)
  delete mode 100644 file2
@@ -15049,7 +15391,7 @@
 		echo "happy to see $err"
 	fi
 
-HEAD is now at 3672d75 master removes file2 and subdir/file2
+HEAD is now at 31f7ef6 master removes file2 and subdir/file2
 Already on 'master'
 happy to see error: Untracked working tree file 'file3' would be overwritten by merge.
 ok 7 - three-way not clobbering a working tree file
@@ -15064,7 +15406,7 @@
 
 	read_tree_u_must_succeed -m -u --exclude-per-directory=.gitignore branch-point master side
 
-HEAD is now at 3672d75 master removes file2 and subdir/file2
+HEAD is now at 31f7ef6 master removes file2 and subdir/file2
 Already on 'master'
 ok 8 - three-way not complaining on an untracked file
 
@@ -15080,13 +15422,13 @@
 	git checkout side-a
 
 
-HEAD is now at 3672d75 master removes file2 and subdir/file2
+HEAD is now at 31f7ef6 master removes file2 and subdir/file2
 Switched to a new branch 'side-a'
-[side-a 367797e] side-a changes file1
+[side-a abd9c58] side-a changes file1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 Switched to a new branch 'side-b'
-[side-b 93a1fc9] side-b changes file2
+[side-b 980c6be] side-b changes file2
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 Switched to branch 'side-a'
@@ -15105,7 +15447,7 @@
 	grep "local changes" file1
 
 
-HEAD is now at 367797e side-a changes file1
+HEAD is now at abd9c58 side-a changes file1
 new line to be kept in the merge result
 local changes
 ok 10 - 3-way not overwriting local changes (our side)
@@ -15123,7 +15465,7 @@
 	grep "local changes" file2
 
 
-HEAD is now at 367797e side-a changes file1
+HEAD is now at abd9c58 side-a changes file1
 error: Entry 'file2' not uptodate. Cannot merge.
 error: Entry 'file2' not uptodate. Cannot merge.
 local changes
@@ -15147,9 +15489,9 @@
 	read_tree_u_must_succeed -m -u sym-a sym-a sym-b
 
 
-HEAD is now at 367797e side-a changes file1
+HEAD is now at abd9c58 side-a changes file1
 Switched to a new branch 'sym-b'
-[sym-b a9097ef] side adds a/b
+[sym-b 8d41d94] side adds a/b
  Author: A U Thor <author@example.com>
  1 file changed, 0 insertions(+), 0 deletions(-)
  create mode 100644 a/b
@@ -15164,7 +15506,7 @@
 
 )
 prerequisite SYMLINKS ok
-[sym-a 161b8b3] we add a/b
+[sym-a 3813d92] we add a/b
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 120000 a/b
@@ -15208,7 +15550,7 @@
 	test_must_fail git read-tree -m -u sym-a sym-a sym-b
 
 
-HEAD is now at 161b8b3 we add a/b
+HEAD is now at 3813d92 we add a/b
 Already on 'sym-a'
 error: unable to unlink old 'a/b': Permission denied
 ok 13 - funny symlink in work tree, un-unlink-able
@@ -15226,9 +15568,9 @@
 	git commit -m "side-a changes file2 to directory"
 
 
-HEAD is now at 161b8b3 we add a/b
+HEAD is now at 3813d92 we add a/b
 Switched to branch 'side-a'
-[side-a 104e981] side-a changes file2 to directory
+[side-a 74a654b] side-a changes file2 to directory
  Author: A U Thor <author@example.com>
  2 files changed, 1 insertion(+), 1 deletion(-)
  delete mode 100644 subdir/file2
@@ -15261,7 +15603,7 @@
 
 
 warning: unable to unlink 'subdir/file2/another': Not a directory
-HEAD is now at 93a1fc9 side-b changes file2
+HEAD is now at 980c6be side-b changes file2
 Already on 'side-b'
 Trying simple merge.
 Simple merge failed, trying Automatic merge.
@@ -15275,14 +15617,14 @@
 	git merge-recursive branch-point -- side-b side-a
 
 
-HEAD is now at 93a1fc9 side-b changes file2
+HEAD is now at 980c6be side-b changes file2
 Already on 'side-b'
 Merging side-b with side-a
 Merging:
-93a1fc9 side-b changes file2
-104e981 side-a changes file2 to directory
+980c6be side-b changes file2
+74a654b side-a changes file2 to directory
 found 1 common ancestor:
-ad8c44d initial
+3be7b2d initial
 Adding subdir/file2/another
 Removing subdir/file2 to make room for subdirectory
 
@@ -15293,775 +15635,256 @@
 1..17
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t1008-read-tree-overlay.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1008-read-tree-overlay/.git/
+*** t0090-cache-tree.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t0090-cache-tree/.git/
 expecting success: 
-	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
+	test_commit foo &&
+	test_cache_tree
 
-[master (root-commit) 30a3105] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 a
-[master 1d4ab3e] second
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b
-Switched to a new branch 'side'
-[side 458b8f0] third
+[master (root-commit) ddd63c9] foo
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 b/c
-ok 1 - setup
+ create mode 100644 foo.t
+ok 1 - initial commit has cache-tree
 
 expecting success: 
-	read_tree_must_succeed initial master side &&
-	test_write_lines a b/c >expect &&
-	git ls-files >actual &&
-	test_cmp expect actual
+	git read-tree HEAD &&
+	test_cache_tree
 
-ok 2 - multi-read
+ok 2 - read-tree HEAD establishes cache-tree
 
-# passed all 2 test(s)
-1..2
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t1001-read-tree-m-2way.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1001-read-tree-m-2way/.git/
 expecting success: 
-	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
+	test_when_finished "git reset --hard; git read-tree HEAD" &&
+	echo "I changed this file" >foo &&
+	git add foo &&
+	test_invalid_cache_tree
 
-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
+HEAD is now at ddd63c9 foo
+ok 3 - git-add invalidates cache-tree
 
 expecting success: 
-	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
+	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
 
-100644 346d4e61f111336a1443ef6b2e834aa5b1a7f91a 0	bozbar
-100644 8e4020bb5a8d8c873b25de15933e75cc0fc275df 0	frotz
-100644 dca6b92303befc93086aa025d90a5facd7eb2812 0	nitfol
-bozbar: dirty
-frotz: dirty
-nitfol: dirty
-ok 2 - 1, 2, 3 - no carry forward
+error: invalid object 040000 59d259507ddf2acc00997a8b70c61d7bdc240440 for 'dirx'
+HEAD is now at ddd63c9 foo
+ok 4 - git-add in subdir invalidates cache-tree
 
 expecting success: 
-	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
+	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 &&
+	cmp_cache_tree before &&
+	echo "I changed this file" >dir1/a &&
+	git add dir1/a &&
+	cmp_cache_tree expect
 
-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.
+[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: 
-	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
+	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
 
-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.
+HEAD is now at ddd63c9 foo
+ok 6 - update-index invalidates cache-tree
 
 expecting success: 
-	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
+	test-tool scrap-cache-tree &&
+	git write-tree &&
+	test_cache_tree
 
-100644 346d4e61f111336a1443ef6b2e834aa5b1a7f91a 0	bozbar
-100644 8e4020bb5a8d8c873b25de15933e75cc0fc275df 0	frotz
-100644 dca6b92303befc93086aa025d90a5facd7eb2812 0	nitfol
-frotz: clean
-ok 5 - 6 - local addition already has the same.
+64fd3796c57084e7b8cbae358ce37970b8e954f6
+ok 7 - write-tree establishes cache-tree
 
 expecting success: 
-	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
+	git read-tree HEAD &&
+	test-tool scrap-cache-tree &&
+	test_no_cache_tree
 
-100644 346d4e61f111336a1443ef6b2e834aa5b1a7f91a 0	bozbar
-100644 8e4020bb5a8d8c873b25de15933e75cc0fc275df 0	frotz
-100644 dca6b92303befc93086aa025d90a5facd7eb2812 0	nitfol
-frotz: dirty
-ok 6 - 7 - local addition already has the same.
+ok 8 - test-tool scrap-cache-tree works
 
 expecting success: 
-	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
+	test_commit bar &&
+	test_cache_tree
 
-error: Entry 'frotz' would be overwritten by merge. Cannot merge.
-ok 7 - 8 - conflicting addition.
+[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: 
-	rm -f .git/index &&
-	read_tree_must_succeed $treeH &&
-	git checkout-index -u -f -q -a &&
-	echo frotz frotz >frotz &&
-	git update-index --add frotz &&
-	echo frotz >frotz &&
-	if read_tree_twoway $treeH $treeM; then false; else :; fi
-
-error: Entry 'frotz' would be overwritten by merge. Cannot merge.
-ok 8 - 9 - conflicting addition.
+	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 &&
+	test_cache_tree
 
-expecting success: 
-	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
+[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
 
-100644 346d4e61f111336a1443ef6b2e834aa5b1a7f91a 0	bozbar
-100644 8e4020bb5a8d8c873b25de15933e75cc0fc275df 0	frotz
-100644 dca6b92303befc93086aa025d90a5facd7eb2812 0	nitfol
-ok 9 - 10 - path removed.
+*** 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;
+ }
+Stage this hunk [y,n,q,a,d,s,e,?]? Split into 2 hunks.
+@@ -1,6 +1,6 @@
+ int foo()
+ {
+-return 42;
++return 43;
+ }
+ int bar()
+ {
+Stage this hunk [y,n,q,a,d,j,J,g,/,e,?]? @@ -4,5 +4,5 @@
+ }
+ int bar()
+ {
+-return 42;
++return 44;
+ }
+Stage this hunk [y,n,q,a,d,K,g,/,e,?]? 
+*** 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(-)
+ok 10 - commit --interactive gives cache-tree on partial commit
 
 expecting success: 
-	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
+	mkdir -p deep/subdir &&
+	echo content >deep/subdir/file &&
+	git add deep &&
+	git commit -m add &&
+	git rm -r deep &&
 
-error: Entry 'rezrov' not uptodate. Cannot merge.
-ok 10 - 11 - dirty path removed.
+	before=$(wc -c <.git/index) &&
+	git commit -m delete -p &&
+	after=$(wc -c <.git/index) &&
 
-expecting success: 
-	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
+	# double check that the index shrank
+	test $before -gt $after &&
 
-error: Entry 'rezrov' would be overwritten by merge. Cannot merge.
-ok 11 - 12 - unmatching local changes being removed.
+	# and that our index was not corrupted
+	git fsck
+
+[master 2a1d106] add
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 deep/subdir/file
+rm 'deep/subdir/file'
+diff --git a/foo.c b/foo.c
+index f0f3133..3f7f049 100644
+--- a/foo.c
++++ b/foo.c
+@@ -1,6 +1,6 @@
+ int foo()
+ {
+-return 42;
++return 43;
+ }
+ int bar()
+ {
+Stage this hunk [y,n,q,a,d,e,?]? 
+[master 6bd2374] delete
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 deep/subdir/file
+dangling blob d238b40d1657b1cc3ebd9a3c55ef04f303c694ae
+ok 11 - commit -p with shrinking cache-tree
 
 expecting success: 
-	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
+	mkdir dir &&
+	>dir/child.t &&
+	git add dir/child.t &&
+	git commit -m dir/child.t &&
+	test_cache_tree
 
-error: Entry 'rezrov' would be overwritten by merge. Cannot merge.
-ok 12 - 13 - unmatching local changes being removed.
+[master e12e84c] 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: 
-	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
+	test-tool scrap-cache-tree &&
+	git reset --hard &&
+	test_cache_tree
 
-100644 346d4e61f111336a1443ef6b2e834aa5b1a7f91a 0	bozbar
-100644 8e4020bb5a8d8c873b25de15933e75cc0fc275df 0	frotz
-100644 7e1bf714fb103c778a21dd67411666901222425a 0	nitfol
-nitfol: clean
-ok 13 - 14 - unchanged in two heads.
+HEAD is now at e12e84c dir/child.t
+ok 13 - reset --hard gives cache-tree
 
 expecting success: 
 	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
+	git reset --hard &&
+	test_cache_tree
 
-100644 346d4e61f111336a1443ef6b2e834aa5b1a7f91a 0	bozbar
-100644 8e4020bb5a8d8c873b25de15933e75cc0fc275df 0	frotz
-100644 7e1bf714fb103c778a21dd67411666901222425a 0	nitfol
-nitfol: dirty
-ok 14 - 15 - unchanged in two heads.
-
-expecting success: 
-	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: 
-	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: 
-	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: 
-	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: 
-	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: 
-	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: 
-	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: 
-	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: 
-	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: 
-	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: 
-	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: 
-	cat <<-EOF >expect &&
-		error: Updating 'fictional/a' would lose untracked files in it
-	EOF
-	test_must_fail git --super-prefix fictional/ read-tree -u -m "$treeH" "$treeM" 2>actual &&
-	test_cmp expect actual
-
-ok 26 - read-tree supports the super-prefix
-
-expecting success: 
-	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: 
-	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: 
-	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) 9e554f5] 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 2be2af3] 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/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t0090-cache-tree.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t0090-cache-tree/.git/
-expecting success: 
-	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: 
-	git read-tree HEAD &&
-	test_cache_tree
-
-ok 2 - read-tree HEAD establishes cache-tree
-
-expecting success: 
-	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: 
-	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: 
-	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 &&
-	cmp_cache_tree before &&
-	echo "I changed this file" >dir1/a &&
-	git add dir1/a &&
-	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: 
-	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: 
-	test-tool scrap-cache-tree &&
-	git write-tree &&
-	test_cache_tree
-
-64fd3796c57084e7b8cbae358ce37970b8e954f6
-ok 7 - write-tree establishes cache-tree
-
-expecting success: 
-	git read-tree HEAD &&
-	test-tool scrap-cache-tree &&
-	test_no_cache_tree
-
-ok 8 - test-tool scrap-cache-tree works
-
-expecting success: 
-	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: 
-	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 &&
-	test_cache_tree
-
-[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;
- }
-Stage this hunk [y,n,q,a,d,s,e,?]? Split into 2 hunks.
-@@ -1,6 +1,6 @@
- int foo()
- {
--return 42;
-+return 43;
- }
- int bar()
- {
-Stage this hunk [y,n,q,a,d,j,J,g,/,e,?]? @@ -4,5 +4,5 @@
- }
- int bar()
- {
--return 42;
-+return 44;
- }
-Stage this hunk [y,n,q,a,d,K,g,/,e,?]? 
-*** 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(-)
-ok 10 - commit --interactive gives cache-tree on partial commit
-
-expecting success: 
-	mkdir -p deep/subdir &&
-	echo content >deep/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 2a1d106] add
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 deep/subdir/file
-rm 'deep/subdir/file'
-diff --git a/foo.c b/foo.c
-index f0f3133..3f7f049 100644
---- a/foo.c
-+++ b/foo.c
-@@ -1,6 +1,6 @@
- int foo()
- {
--return 42;
-+return 43;
- }
- int bar()
- {
-Stage this hunk [y,n,q,a,d,e,?]? 
-[master 6bd2374] delete
- Author: A U Thor <author@example.com>
- 1 file changed, 1 deletion(-)
- delete mode 100644 deep/subdir/file
-dangling blob d238b40d1657b1cc3ebd9a3c55ef04f303c694ae
-ok 11 - commit -p with shrinking cache-tree
-
-expecting success: 
-	mkdir dir &&
-	>dir/child.t &&
-	git add dir/child.t &&
-	git commit -m dir/child.t &&
-	test_cache_tree
-
-[master e12e84c] 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: 
-	test-tool scrap-cache-tree &&
-	git reset --hard &&
-	test_cache_tree
-
-HEAD is now at e12e84c dir/child.t
-ok 13 - reset --hard gives cache-tree
-
-expecting success: 
-	rm -f .git/index &&
-	git reset --hard &&
-	test_cache_tree
-
-HEAD is now at e12e84c dir/child.t
-ok 14 - reset --hard without index gives cache-tree
+HEAD is now at e12e84c dir/child.t
+ok 14 - reset --hard without index gives cache-tree
 
 expecting success: 
 	git tag current &&
@@ -16280,36 +16103,6 @@
 1..22
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t1009-read-tree-new-index.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1009-read-tree-new-index/.git/
-expecting success: 
-	echo one >a &&
-	git add a &&
-	git commit -m initial
-
-[master (root-commit) 30a3105] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 a
-ok 1 - setup
-
-expecting success: 
-	rm -f new-index &&
-	GIT_INDEX_FILE=new-index git read-tree master
-
-ok 2 - non-existent index file
-
-expecting success: 
-	rm -f new-index &&
-	> new-index &&
-	GIT_INDEX_FILE=new-index git read-tree master
-
-ok 3 - empty index file
-
-# passed all 3 test(s)
-1..3
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
 *** t1010-mktree.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1010-mktree/.git/
 expecting success: 
@@ -16388,6 +16181,481 @@
 1..8
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
+*** t1001-read-tree-m-2way.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1001-read-tree-m-2way/.git/
+expecting success: 
+	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: 
+	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: 
+	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: 
+	rm -f .git/index &&
+	read_tree_must_succeed $treeH &&
+	git checkout-index -u -f -q -a &&
+	echo yomin >yomin &&
+	git update-index --add yomin &&
+	echo yomin yomin >yomin &&
+	read_tree_twoway $treeH $treeM &&
+	git ls-files --stage >5.out &&
+	test_must_fail git diff --no-index M.out 5.out >5diff.out &&
+	compare_change 5diff.out expected &&
+	check_cache_at yomin dirty
+
+100644 346d4e61f111336a1443ef6b2e834aa5b1a7f91a 0	bozbar
+100644 8e4020bb5a8d8c873b25de15933e75cc0fc275df 0	frotz
+100644 dca6b92303befc93086aa025d90a5facd7eb2812 0	nitfol
+100644 0a41e115ab61be0328a19b29f18cdcb49338d516 0	yomin
+yomin: dirty
+ok 4 - 5 - carry forward local addition.
+
+expecting success: 
+	rm -f .git/index &&
+	read_tree_must_succeed $treeH &&
+	git checkout-index -u -f -q -a &&
+	git update-index --add frotz &&
+	read_tree_twoway $treeH $treeM &&
+	git ls-files --stage >6.out &&
+	test_cmp M.out 6.out &&
+	check_cache_at frotz clean
+
+100644 346d4e61f111336a1443ef6b2e834aa5b1a7f91a 0	bozbar
+100644 8e4020bb5a8d8c873b25de15933e75cc0fc275df 0	frotz
+100644 dca6b92303befc93086aa025d90a5facd7eb2812 0	nitfol
+frotz: clean
+ok 5 - 6 - local addition already has the same.
+
+expecting success: 
+	rm -f .git/index &&
+	read_tree_must_succeed $treeH &&
+	git checkout-index -u -f -q -a &&
+	echo frotz >frotz &&
+	git update-index --add frotz &&
+	echo frotz frotz >frotz &&
+	read_tree_twoway $treeH $treeM &&
+	git ls-files --stage >7.out &&
+	test_cmp M.out 7.out &&
+	check_cache_at frotz dirty
+
+100644 346d4e61f111336a1443ef6b2e834aa5b1a7f91a 0	bozbar
+100644 8e4020bb5a8d8c873b25de15933e75cc0fc275df 0	frotz
+100644 dca6b92303befc93086aa025d90a5facd7eb2812 0	nitfol
+frotz: dirty
+ok 6 - 7 - local addition already has the same.
+
+expecting success: 
+	rm -f .git/index &&
+	read_tree_must_succeed $treeH &&
+	git checkout-index -u -f -q -a &&
+	echo frotz frotz >frotz &&
+	git update-index --add frotz &&
+	if read_tree_twoway $treeH $treeM; then false; else :; fi
+
+error: Entry 'frotz' would be overwritten by merge. Cannot merge.
+ok 7 - 8 - conflicting addition.
+
+expecting success: 
+	rm -f .git/index &&
+	read_tree_must_succeed $treeH &&
+	git checkout-index -u -f -q -a &&
+	echo frotz frotz >frotz &&
+	git update-index --add frotz &&
+	echo frotz >frotz &&
+	if read_tree_twoway $treeH $treeM; then false; else :; fi
+
+error: Entry 'frotz' would be overwritten by merge. Cannot merge.
+ok 8 - 9 - conflicting addition.
+
+expecting success: 
+	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: 
+	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: 
+	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: 
+	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: 
+	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: 
+	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: 
+	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: 
+	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: 
+	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: 
+	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: 
+	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: 
+	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: 
+	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: 
+	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: 
+	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: 
+	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: 
+	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: 
+	cat <<-EOF >expect &&
+		error: Updating 'fictional/a' would lose untracked files in it
+	EOF
+	test_must_fail git --super-prefix fictional/ read-tree -u -m "$treeH" "$treeM" 2>actual &&
+	test_cmp expect actual
+
+ok 26 - read-tree supports the super-prefix
+
+expecting success: 
+	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: 
+	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: 
+	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) e4e9504] 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 ab3aca5] 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/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
 *** t1002-read-tree-m-u-2way.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1002-read-tree-m-u-2way/.git/
 expecting success: echo frotz >frotz &&
@@ -17636,726 +17904,6 @@
 1..31
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t0410-partial-clone.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t0410-partial-clone/.git/
-expecting success: 
-	test_create_repo server &&
-	git clone --filter="blob:none" "file://$(pwd)/server" client &&
-	git -C client config --unset core.partialclonefilter &&
-	git -C client fetch origin
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t0410-partial-clone/server/.git/
-Cloning into 'client'...
-warning: You appear to have cloned an empty repository.
-ok 1 - extensions.partialclone without filter
-
-expecting success: 
-	rm -rf repo &&
-	test_create_repo repo &&
-	test_commit -C repo my_commit &&
-
-	A=$(git -C repo commit-tree -m a HEAD^{tree}) &&
-	C=$(git -C repo commit-tree -m c -p $A HEAD^{tree}) &&
-
-	# Reference $A only from reflog, and delete it
-	git -C repo branch my_branch "$A" &&
-	git -C repo branch -f my_branch my_commit &&
-	delete_object repo "$A" &&
-
-	# State that we got $C, which refers to $A, from promisor
-	printf "$C\n" | pack_as_from_promisor &&
-
-	# Normally, it fails
-	test_must_fail git -C repo fsck &&
-
-	# But with the extension, it succeeds
-	git -C repo config core.repositoryformatversion 1 &&
-	git -C repo config extensions.partialclone "arbitrary string" &&
-	git -C repo fsck
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t0410-partial-clone/repo/.git/
-[master (root-commit) f875b73] my_commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 my_commit.t
-738adde9f5fe99553a2e3813bb92cbbbdef79ef1
-error: refs/heads/my_branch: invalid reflog entry 31566d0be6253fd37a1ef5087a6d3933a45883a0
-error: refs/heads/my_branch: invalid reflog entry 31566d0be6253fd37a1ef5087a6d3933a45883a0
-dangling commit 4a7ce5332e0d121c1ab9428e15a83f4bb770acd7
-dangling commit 4a7ce5332e0d121c1ab9428e15a83f4bb770acd7
-ok 2 - missing reflog object, but promised by a commit, passes fsck
-
-expecting success: 
-	rm -rf repo &&
-	test_create_repo repo &&
-	test_commit -C repo my_commit &&
-
-	A=$(git -C repo commit-tree -m a HEAD^{tree}) &&
-	git -C repo tag -a -m d my_tag_name $A &&
-	T=$(git -C repo rev-parse my_tag_name) &&
-	git -C repo tag -d my_tag_name &&
-
-	# Reference $A only from reflog, and delete it
-	git -C repo branch my_branch "$A" &&
-	git -C repo branch -f my_branch my_commit &&
-	delete_object repo "$A" &&
-
-	# State that we got $T, which refers to $A, from promisor
-	printf "$T\n" | pack_as_from_promisor &&
-
-	git -C repo config core.repositoryformatversion 1 &&
-	git -C repo config extensions.partialclone "arbitrary string" &&
-	git -C repo fsck
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t0410-partial-clone/repo/.git/
-[master (root-commit) 4ce2b9b] my_commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 my_commit.t
-Deleted tag 'my_tag_name' (was 7a32993)
-7fd8925735cc15e2e2034644b64afda491571ff8
-dangling tag 7a329936d66f427bedc89d9ab903f38b07d44de7
-ok 3 - missing reflog object, but promised by a tag, passes fsck
-
-expecting success: 
-	rm -rf repo &&
-	test_create_repo repo &&
-	test_commit -C repo my_commit &&
-
-	A=$(git -C repo commit-tree -m a HEAD^{tree}) &&
-	B=$(git -C repo commit-tree -m b HEAD^{tree}) &&
-
-	# Reference $A only from reflog, and delete it
-	git -C repo branch my_branch "$A" &&
-	git -C repo branch -f my_branch my_commit &&
-	delete_object repo "$A" &&
-
-	git -C repo config core.repositoryformatversion 1 &&
-	git -C repo config extensions.partialclone "arbitrary string" &&
-	test_must_fail git -C repo fsck
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t0410-partial-clone/repo/.git/
-[master (root-commit) 2f3d175] my_commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 my_commit.t
-error: refs/heads/my_branch: invalid reflog entry c51de19226c13fa1daecab9e08d2f0b99a29784c
-error: refs/heads/my_branch: invalid reflog entry c51de19226c13fa1daecab9e08d2f0b99a29784c
-dangling commit e376c76e48cd8763bb0961aa8f03e5b8642908a8
-ok 4 - missing reflog object alone fails fsck, even with extension set
-
-expecting success: 
-	rm -rf repo &&
-	test_create_repo repo &&
-	test_commit -C repo my_commit &&
-
-	A=$(git -C repo commit-tree -m a HEAD^{tree}) &&
-
-	# Reference $A only from ref
-	git -C repo branch my_branch "$A" &&
-	promise_and_delete "$A" &&
-
-	git -C repo config core.repositoryformatversion 1 &&
-	git -C repo config extensions.partialclone "arbitrary string" &&
-	git -C repo fsck
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t0410-partial-clone/repo/.git/
-[master (root-commit) 9df77b9] my_commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 my_commit.t
-a391e3e0447189aa0050c8f206462a1b0530a34a
-dangling tag e5f4cb9fd329c512b08fb81a8e6b1f5e27658263
-ok 5 - missing ref object, but promised, passes fsck
-
-expecting success: 
-	rm -rf repo &&
-	test_create_repo repo &&
-	test_commit -C repo 1 &&
-	test_commit -C repo 2 &&
-	test_commit -C repo 3 &&
-	git -C repo tag -a annotated_tag -m "annotated tag" &&
-
-	C=$(git -C repo rev-parse 1) &&
-	T=$(git -C repo rev-parse 2^{tree}) &&
-	B=$(git hash-object repo/3.t) &&
-	AT=$(git -C repo rev-parse annotated_tag) &&
-
-	promise_and_delete "$C" &&
-	promise_and_delete "$T" &&
-	promise_and_delete "$B" &&
-	promise_and_delete "$AT" &&
-
-	git -C repo config core.repositoryformatversion 1 &&
-	git -C repo config extensions.partialclone "arbitrary string" &&
-	git -C repo fsck
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t0410-partial-clone/repo/.git/
-[master (root-commit) 6591d03] 1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 1.t
-[master 5355e57] 2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 2.t
-[master a3007a6] 3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 3.t
-fa10eb4e855a356f0abe9c352b62b71d481918b1
-error: refs/tags/1 does not point to a valid object!
-7f935f1293a005998d684b122686a1125dc47996
-error: refs/tags/1 does not point to a valid object!
-43db30889c483ee89571157f1466e2809e137c7d
-error: refs/tags/1 does not point to a valid object!
-544d2af112f571c9dceb598e755c68cb22911767
-dangling tag 8e5058c0196ed6a9b285609a259f40e05437cfad
-dangling tag 4ff31e389c270b26919d9e89e743f1bc4e9d1907
-dangling tree dcf3d5d7c6d10fb961287ca9bc59a5bf8a4b2afc
-dangling tag 5d1357650c0c7fa7890a88ef5f3b44637843a883
-dangling tag be645be2ea79274538b1d7a002db7f261d7dc509
-ok 6 - missing object, but promised, passes fsck
-
-expecting success: 
-	rm -rf repo &&
-	test_create_repo repo &&
-	test_commit -C repo my_commit &&
-
-	A=$(git -C repo commit-tree -m a HEAD^{tree}) &&
-	promise_and_delete "$A" &&
-
-	git -C repo config core.repositoryformatversion 1 &&
-	git -C repo config extensions.partialclone "arbitrary string" &&
-	git -C repo fsck "$A"
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t0410-partial-clone/repo/.git/
-[master (root-commit) da2e7de] my_commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 my_commit.t
-4337bf55380117d69ad62e8b0aa5d048dce2f274
-dangling tag 802319328bf3f4f53ce55aecd93e94ecf6f26c32
-dangling commit da2e7de93032e847edfceb74ec173302d3f32ceb
-ok 7 - missing CLI object, but promised, passes fsck
-
-expecting success: 
-	rm -rf repo &&
-	test_create_repo server &&
-	test_commit -C server foo &&
-	git -C server repack -a -d --write-bitmap-index &&
-
-	git clone "file://$(pwd)/server" repo &&
-	HASH=$(git -C repo rev-parse foo) &&
-	rm -rf repo/.git/objects/* &&
-
-	git -C repo config core.repositoryformatversion 1 &&
-	git -C repo config extensions.partialclone "origin" &&
-	git -C repo cat-file -p "$HASH" &&
-
-	# Ensure that the .promisor file is written, and check that its
-	# associated packfile contains the object
-	ls repo/.git/objects/pack/pack-*.promisor >promisorlist &&
-	test_line_count = 1 promisorlist &&
-	IDX=$(cat promisorlist | sed "s/promisor$/idx/") &&
-	git verify-pack --verbose "$IDX" | grep "$HASH"
-
-Reinitialized existing Git repository in /build/git-2.20.1/t/trash directory.t0410-partial-clone/server/.git/
-[master (root-commit) 92a62de] foo
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo.t
-Cloning into 'repo'...
-warning: filtering not recognized by server, ignoring
-tree 64fd3796c57084e7b8cbae358ce37970b8e954f6
-author A U Thor <author@example.com> 1112912473 -0700
-committer C O Mitter <committer@example.com> 1112912473 -0700
-
-foo
-92a62decadb5642314a1fd56b51afd125b27f208 commit 167 126 12
-ok 8 - fetching of missing objects
-
-expecting success: 
-	# ref-in-want requires protocol version 2
-	git -C server config protocol.version 2 &&
-	git -C server config uploadpack.allowrefinwant 1 &&
-	git -C repo config protocol.version 2 &&
-
-	rm -rf repo/.git/objects/* &&
-	rm -f trace &&
-	GIT_TRACE_PACKET="$(pwd)/trace" git -C repo cat-file -p "$HASH" &&
-	grep "git< fetch=.*ref-in-want" trace
-
-warning: filtering not recognized by server, ignoring
-tree 64fd3796c57084e7b8cbae358ce37970b8e954f6
-author A U Thor <author@example.com> 1112912473 -0700
-committer C O Mitter <committer@example.com> 1112912473 -0700
-
-foo
-packet:          git< fetch=shallow ref-in-want
-ok 9 - fetching of missing objects works with ref-in-want enabled
-
-expecting success: 
-	rm -rf server repo &&
-	test_create_repo server &&
-	test_commit -C server foo &&
-	git -C server repack -a -d --write-bitmap-index &&
-
-	git clone "file://$(pwd)/server" repo &&
-	git hash-object repo/foo.t >blobhash &&
-	rm -rf repo/.git/objects/* &&
-
-	git -C server config uploadpack.allowanysha1inwant 1 &&
-	git -C server config uploadpack.allowfilter 1 &&
-	git -C repo config core.repositoryformatversion 1 &&
-	git -C repo config extensions.partialclone "origin" &&
-
-	git -C repo cat-file -p $(cat blobhash)
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t0410-partial-clone/server/.git/
-[master (root-commit) 1463a05] foo
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo.t
-Cloning into 'repo'...
-foo
-ok 10 - fetching of missing blobs works
-
-expecting success: 
-	rm -rf server repo &&
-	test_create_repo server &&
-	test_commit -C server foo &&
-	git -C server repack -a -d --write-bitmap-index &&
-
-	git clone "file://$(pwd)/server" repo &&
-	git -C repo rev-parse foo^{tree} >treehash &&
-	git hash-object repo/foo.t >blobhash &&
-	rm -rf repo/.git/objects/* &&
-
-	git -C server config uploadpack.allowanysha1inwant 1 &&
-	git -C server config uploadpack.allowfilter 1 &&
-	git -C repo config core.repositoryformatversion 1 &&
-	git -C repo config extensions.partialclone "origin" &&
-	git -C repo cat-file -p $(cat treehash) &&
-
-	# Ensure that the tree, but not the blob, is fetched
-	git -C repo rev-list --objects --missing=print $(cat treehash) >objects &&
-	grep "^$(cat treehash)" objects &&
-	grep "^[?]$(cat blobhash)" objects
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t0410-partial-clone/server/.git/
-[master (root-commit) af4983b] foo
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo.t
-Cloning into 'repo'...
-100644 blob 257cc5642cb1a054f08cc83f2d943e56fd3ebe99	foo.t
-64fd3796c57084e7b8cbae358ce37970b8e954f6 
-?257cc5642cb1a054f08cc83f2d943e56fd3ebe99
-ok 11 - fetching of missing trees does not fetch blobs
-
-expecting success: 
-	rm -rf repo &&
-	test_create_repo repo &&
-	test_commit -C repo foo &&
-	test_commit -C repo bar &&
-
-	FOO=$(git -C repo rev-parse foo) &&
-	promise_and_delete "$FOO" &&
-
-	git -C repo config core.repositoryformatversion 1 &&
-	git -C repo config extensions.partialclone "arbitrary string" &&
-	GIT_TEST_COMMIT_GRAPH=0 git -C repo rev-list --exclude-promisor-objects --objects bar >out &&
-	grep $(git -C repo rev-parse bar) out &&
-	! grep $FOO out
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t0410-partial-clone/repo/.git/
-[master (root-commit) 7745948] foo
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo.t
-[master e514b54] bar
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 bar.t
-2b7df34bc09be010087307b898e994ce709c0db1
-e514b54fb79193e76be659c0567b436ac8d10232
-ok 12 - rev-list stops traversal at missing and promised commit
-
-expecting success: 
-	rm -rf repo &&
-	test_create_repo repo &&
-	test_commit -C repo foo &&
-	test_commit -C repo bar &&
-	test_commit -C repo baz &&
-
-	promise_and_delete $(git -C repo rev-parse bar^{tree}) &&
-	promise_and_delete $(git -C repo rev-parse foo^{tree}) &&
-
-	git -C repo config core.repositoryformatversion 1 &&
-	git -C repo config extensions.partialclone "arbitrary string" &&
-
-	git -C repo rev-list --missing=allow-promisor --objects HEAD >objs 2>rev_list_err &&
-	test_must_be_empty rev_list_err &&
-	# 3 commits, 3 blobs, and 1 tree
-	test_line_count = 7 objs &&
-
-	# Do the same for --exclude-promisor-objects, but with all trees gone.
-	promise_and_delete $(git -C repo rev-parse baz^{tree}) &&
-	git -C repo rev-list --exclude-promisor-objects --objects HEAD >objs 2>rev_list_err &&
-	test_must_be_empty rev_list_err &&
-	# 3 commits, no blobs or trees
-	test_line_count = 3 objs
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t0410-partial-clone/repo/.git/
-[master (root-commit) 04ebf83] foo
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo.t
-[master 5d5378c] bar
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 bar.t
-[master 403f8b0] baz
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 baz.t
-0b80a4a4c757c906c0610b334ecc13c1f548f26c
-4e80f36effe3aa9dd9f1a8d0e85f678beada4e19
-29e6ce195f02e80b806c775b2e0f16fa4a6e50ac
-ok 13 - missing tree objects with --missing=allow-promisor and --exclude-promisor-objects
-
-expecting success: 
-	rm -rf repo &&
-	test_create_repo repo &&
-	mkdir repo/dir &&
-	echo foo >repo/dir/foo &&
-	git -C repo add dir/foo &&
-	git -C repo commit -m "commit dir/foo" &&
-
-	promise_and_delete $(git -C repo rev-parse HEAD:dir) &&
-
-	git -C repo config core.repositoryformatversion 1 &&
-	git -C repo config extensions.partialclone "arbitrary string" &&
-
-	git -C repo rev-list --missing=allow-any --objects HEAD >objs 2>rev_list_err &&
-	test_must_be_empty rev_list_err &&
-	# 1 commit and 1 tree
-	test_line_count = 2 objs
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t0410-partial-clone/repo/.git/
-[master (root-commit) fc3d893] commit dir/foo
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 dir/foo
-6701d28601ab148de66e908befaa9f313f9670ed
-ok 14 - missing non-root tree object and rev-list
-
-expecting success: 
-	rm -rf repo &&
-	test_create_repo repo &&
-	test_commit -C repo foo &&
-	mkdir repo/a_dir &&
-	echo something >repo/a_dir/something &&
-	git -C repo add a_dir/something &&
-	git -C repo commit -m bar &&
-
-	# foo^{tree} (tree referenced from commit)
-	TREE=$(git -C repo rev-parse foo^{tree}) &&
-
-	# a tree referenced by HEAD^{tree} (tree referenced from tree)
-	TREE2=$(git -C repo ls-tree HEAD^{tree} | grep " tree " | head -1 | cut -b13-52) &&
-
-	promise_and_delete "$TREE" &&
-	promise_and_delete "$TREE2" &&
-
-	git -C repo config core.repositoryformatversion 1 &&
-	git -C repo config extensions.partialclone "arbitrary string" &&
-	git -C repo rev-list --exclude-promisor-objects --objects HEAD >out &&
-	grep $(git -C repo rev-parse foo) out &&
-	! grep $TREE out &&
-	grep $(git -C repo rev-parse HEAD) out &&
-	! grep $TREE2 out
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t0410-partial-clone/repo/.git/
-[master (root-commit) b259608] foo
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo.t
-[master 2b50f7e] bar
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 a_dir/something
-c847e09064df2c3060b894adee7d1fcbdc41d77e
-053da52d70d31500a108f08bc31d5a72f5db7bc7
-b259608956a9de662b43c93c18f15e427dcac80e
-2b50f7eb48302601d810b4c1627ad25f05e81216
-ok 15 - rev-list stops traversal at missing and promised tree
-
-expecting success: 
-	rm -rf repo &&
-	test_create_repo repo &&
-	echo something >repo/something &&
-	git -C repo add something &&
-	git -C repo commit -m foo &&
-
-	BLOB=$(git -C repo hash-object -w something) &&
-	promise_and_delete "$BLOB" &&
-
-	git -C repo config core.repositoryformatversion 1 &&
-	git -C repo config extensions.partialclone "arbitrary string" &&
-	git -C repo rev-list --exclude-promisor-objects --objects HEAD >out &&
-	grep $(git -C repo rev-parse HEAD) out &&
-	! grep $BLOB out
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t0410-partial-clone/repo/.git/
-[master (root-commit) 9aebf3f] foo
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 something
-159a5b25735cb846bca3d8d102a38e273eb423d5
-9aebf3fc471ba852071c23be641e3c8273d6ee27
-ok 16 - rev-list stops traversal at missing and promised blob
-
-expecting success: 
-	rm -rf repo &&
-	test_create_repo repo &&
-	test_commit -C repo foo &&
-	test_commit -C repo bar &&
-	test_commit -C repo baz &&
-
-	COMMIT=$(git -C repo rev-parse foo) &&
-	TREE=$(git -C repo rev-parse bar^{tree}) &&
-	BLOB=$(git hash-object repo/baz.t) &&
-	printf "%s\n%s\n%s\n" $COMMIT $TREE $BLOB | pack_as_from_promisor &&
-
-	git -C repo config core.repositoryformatversion 1 &&
-	git -C repo config extensions.partialclone "arbitrary string" &&
-	git -C repo rev-list --exclude-promisor-objects --objects HEAD >out &&
-	! grep $COMMIT out &&
-	! grep $TREE out &&
-	! grep $BLOB out &&
-	grep $(git -C repo rev-parse bar) out  # sanity check that some walking was done
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t0410-partial-clone/repo/.git/
-[master (root-commit) a4efc16] foo
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo.t
-[master b3b6050] bar
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 bar.t
-[master 70d6cfa] baz
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 baz.t
-03f058b726123c4f1ef352333fd9c0c557466ad4
-b3b6050676a5798a4107f8ec799fe53b4ecd55b1
-ok 17 - rev-list stops traversal at promisor commit, tree, and blob
-
-expecting success: 
-	rm -rf repo &&
-	test_create_repo repo &&
-	test_commit -C repo foo &&
-	test_commit -C repo bar &&
-	test_commit -C repo baz &&
-
-	COMMIT=$(git -C repo rev-parse foo) &&
-	TREE=$(git -C repo rev-parse bar^{tree}) &&
-	BLOB=$(git hash-object repo/baz.t) &&
-
-	promise_and_delete $COMMIT &&
-	promise_and_delete $TREE &&
-	promise_and_delete $BLOB &&
-
-	git -C repo config core.repositoryformatversion 1 &&
-	git -C repo config extensions.partialclone "arbitrary string" &&
-	git -C repo rev-list --exclude-promisor-objects --objects "$COMMIT" "$TREE" "$BLOB"
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t0410-partial-clone/repo/.git/
-[master (root-commit) 9221471] foo
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo.t
-[master ff8c8be] bar
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 bar.t
-[master aa6395a] baz
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 baz.t
-40181af12b32f68a435aa73643389d18023d886f
-error: refs/tags/foo does not point to a valid object!
-e3ac27606f214fe554908dcfb180e5adc75c16e7
-error: refs/tags/foo does not point to a valid object!
-2188d83092576306608ebcdf2c84441aa35221fb
-ok 18 - rev-list accepts missing and promised objects on command line
-
-expecting success: 
-	rm -rf repo &&
-	test_create_repo repo &&
-	test_commit -C repo one &&
-	test_commit -C repo two &&
-
-	TREE_ONE=$(git -C repo rev-parse one^{tree}) &&
-	printf "$TREE_ONE\n" | pack_as_from_promisor &&
-	TREE_TWO=$(git -C repo rev-parse two^{tree}) &&
-	printf "$TREE_TWO\n" | pack_as_from_promisor &&
-
-	git -C repo config core.repositoryformatversion 1 &&
-	git -C repo config extensions.partialclone "arbitrary string" &&
-	git -C repo gc &&
-
-	# Ensure that exactly one promisor packfile exists, and that it
-	# contains the trees but not the commits
-	ls repo/.git/objects/pack/pack-*.promisor >promisorlist &&
-	test_line_count = 1 promisorlist &&
-	PROMISOR_PACKFILE=$(sed "s/.promisor/.pack/" <promisorlist) &&
-	git verify-pack $PROMISOR_PACKFILE -v >out &&
-	grep "$TREE_ONE" out &&
-	grep "$TREE_TWO" out &&
-	! grep "$(git -C repo rev-parse one)" out &&
-	! grep "$(git -C repo rev-parse two)" out &&
-
-	# Remove the promisor packfile and associated files
-	rm $(sed "s/.promisor//" <promisorlist).* &&
-
-	# Ensure that the single other pack contains the commits, but not the
-	# trees
-	ls repo/.git/objects/pack/pack-*.pack >packlist &&
-	test_line_count = 1 packlist &&
-	git verify-pack repo/.git/objects/pack/pack-*.pack -v >out &&
-	grep "$(git -C repo rev-parse one)" out &&
-	grep "$(git -C repo rev-parse two)" out &&
-	! grep "$TREE_ONE" out &&
-	! grep "$TREE_TWO" out
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t0410-partial-clone/repo/.git/
-[master (root-commit) 6d3dd09] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-[master 22004c9] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-80b0d61182f42d417d3f1080999c86acd16276f7
-4f4b1c441e35611dff006a309fbda4370b40fc90
-a7cddf35737959e1438bc929b665619e9e79bfee tree   33 44 12
-2f00a404aed7e63d867313d504bd0fccea53fd25 tree   66 73 56
-6d3dd09ab2409ace50d451184915bd38484087c9 commit 167 126 169
-22004c9d096c64b8edacd5e5aa8119ba60f89b35 commit 215 157 12
-ok 19 - gc repacks promisor objects separately from non-promisor objects
-
-expecting success: 
-	rm -rf repo &&
-	test_create_repo repo &&
-	test_commit -C repo one &&
-
-	git -C repo config core.repositoryformatversion 1 &&
-	git -C repo config extensions.partialclone "arbitrary string" &&
-	git -C repo gc &&
-
-	# Ensure that only one pack exists
-	ls repo/.git/objects/pack/pack-*.pack >packlist &&
-	test_line_count = 1 packlist
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t0410-partial-clone/repo/.git/
-[master (root-commit) 46d8c68] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-ok 20 - gc does not repack promisor objects if there are none
-
-expecting success: 
-	rm -rf repo &&
-	test_create_repo repo &&
-	git -C repo config core.repositoryformatversion 1 &&
-	git -C repo config extensions.partialclone "arbitrary string" &&
-
-	git -C repo commit --allow-empty -m one &&
-	git -C repo commit --allow-empty -m two &&
-	git -C repo commit --allow-empty -m three &&
-	git -C repo commit --allow-empty -m four &&
-	ONE=$(git -C repo rev-parse HEAD^^^) &&
-	TWO=$(git -C repo rev-parse HEAD^^) &&
-	THREE=$(git -C repo rev-parse HEAD^) &&
-
-	printf "$TWO\n" | pack_as_from_promisor &&
-	printf "$THREE\n" | pack_as_from_promisor &&
-	delete_object repo "$ONE" &&
-
-	repack_and_check -a "$TWO" "$THREE" &&
-	repack_and_check -A "$TWO" "$THREE" &&
-	repack_and_check -l "$TWO" "$THREE"
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t0410-partial-clone/repo/.git/
-[master (root-commit) 95edc28] one
- Author: A U Thor <author@example.com>
-[master 114744c] two
- Author: A U Thor <author@example.com>
-[master e00c151] three
- Author: A U Thor <author@example.com>
-[master 9a209d2] four
- Author: A U Thor <author@example.com>
-c3a7ba83b6f7f6d5eb1b78f6a97d86d8c857112b
-9999d8693559878e42c5d6a9cc38dcc697697f83
-warning: reflog of 'refs/heads/master' references pruned commits
-warning: reflog of 'HEAD' references pruned commits
-warning: reflog of 'refs/heads/master' references pruned commits
-warning: reflog of 'HEAD' references pruned commits
-warning: reflog of 'refs/heads/master' references pruned commits
-warning: reflog of 'HEAD' references pruned commits
-ok 21 - repack -d does not irreversibly delete promisor objects
-
-expecting success: 
-	rm -rf repo &&
-	test_create_repo repo &&
-	test_commit -C repo my_commit &&
-
-	TREE_HASH=$(git -C repo rev-parse HEAD^{tree}) &&
-	HASH=$(promise_and_delete $TREE_HASH) &&
-
-	git -C repo config core.repositoryformatversion 1 &&
-	git -C repo config extensions.partialclone "arbitrary string" &&
-	git -C repo gc &&
-
-	# Ensure that the promisor packfile still exists, and remove it
-	test -e repo/.git/objects/pack/pack-$HASH.pack &&
-	rm repo/.git/objects/pack/pack-$HASH.* &&
-
-	# Ensure that the single other pack contains the commit, but not the tree
-	ls repo/.git/objects/pack/pack-*.pack >packlist &&
-	test_line_count = 1 packlist &&
-	git verify-pack repo/.git/objects/pack/pack-*.pack -v >out &&
-	grep "$(git -C repo rev-parse HEAD)" out &&
-	! grep "$TREE_HASH" out
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t0410-partial-clone/repo/.git/
-[master (root-commit) b740cae] my_commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 my_commit.t
-b740cae5ace132631585f8db5f228adf51170f3b commit 173 129 12
-ok 22 - gc stops traversal when a missing but promised object is reached
-
-checking prerequisite: NOT_ROOT
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
-	uid=$(id -u) &&
-	test "$uid" != 0
-
-)
-prerequisite NOT_ROOT ok
-# passed all 22 test(s)
-# SKIP no web server found at '/usr/sbin/apache2'
-1..22
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
 *** t0302-credential-store.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t0302-credential-store/.git/
 expecting success: 
@@ -19276,7 +18824,7 @@
 	git checkout -- expanded-keywords-crlf &&
 	test_cmp expected-output-crlf expanded-keywords-crlf
 
-[master (root-commit) 2dd0569] File with keywords expanded
+[master (root-commit) a943352] File with keywords expanded
  Author: A U Thor <author@example.com>
  5 files changed, 29 insertions(+)
  create mode 100644 expanded-keywords
@@ -19475,7 +19023,7 @@
 	git diff-tree -p HEAD &&
 	test_line_count = 0 count
 
-[master 6f8c182] one
+[master b67eed1] one
  Author: A U Thor <author@example.com>
  8 files changed, 7 insertions(+)
  create mode 100644 30MB
@@ -19486,10 +19034,10 @@
  create mode 100644 test.disable
  create mode 100644 test.fs
  create mode 100644 test.r
-[master 924488a] two
+[master 5e90b7e] two
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-924488ad186f441be81d841ea3399ab2d9703fbd
+5e90b7e03f4c9f661e30d8c8b4613c53a8214d3f
 diff --git a/file b/file
 index e4a1655..0c54b7b 100644
 --- a/file
@@ -19792,8 +19340,8 @@
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t0021-conversion/repo/.git/
 smudge write error at /build/git-2.20.1/t/trash directory.t0021-conversion/rot13-filter.pl line 204.
 error: external filter 'rot13-filter.pl debug.log clean smudge' failed
---- smudge-write-fail.o	2021-12-03 05:04:25.641190033 +0000
-+++ smudge-write-fail.r	2021-12-03 05:04:26.969151351 +0000
+--- smudge-write-fail.o	2023-01-05 11:46:36.566868030 +0000
++++ smudge-write-fail.r	2023-01-05 11:46:36.870868030 +0000
 @@ -1 +1 @@
 -this is going to fail
 +guvf vf tbvat gb snvy
@@ -20057,632 +19605,99 @@
 1..26
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t1000-read-tree-m-3way.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1000-read-tree-m-3way/.git/
-expecting success: git update-index --add $p &&
-	    git update-index --add Z/$p
-ok 1 - adding test file NN and Z/NN
-
-expecting success: git update-index --add $p &&
-	    git update-index --add Z/$p
-ok 2 - adding test file ND and Z/ND
-
-expecting success: git update-index --add $p &&
-	    git update-index --add Z/$p
-ok 3 - adding test file NM and Z/NM
-
-expecting success: git update-index --add $p &&
-	    git update-index --add Z/$p
-ok 4 - adding test file DN and Z/DN
-
-expecting success: git update-index --add $p &&
-	    git update-index --add Z/$p
-ok 5 - adding test file DD and Z/DD
-
-expecting success: git update-index --add $p &&
-	    git update-index --add Z/$p
-ok 6 - adding test file DM and Z/DM
-
-expecting success: git update-index --add $p &&
-	    git update-index --add Z/$p
-ok 7 - adding test file MN and Z/MN
-
-expecting success: git update-index --add $p &&
-	    git update-index --add Z/$p
-ok 8 - adding test file MD and Z/MD
-
-expecting success: git update-index --add $p &&
-	    git update-index --add Z/$p
-ok 9 - adding test file MM and Z/MM
-
-expecting success: git update-index --add SS
-ok 10 - adding test file SS
-
-expecting success: git update-index --add TT
-ok 11 - adding test file TT
-
-expecting success: tree_O=$(git write-tree)
-ok 12 - prepare initial tree
-
-expecting success: git update-index --remove $to_remove
-ok 13 - change in branch A (removal)
-
-expecting success: git update-index MD
-ok 14 - change in branch A (modification)
-
-expecting success: git update-index MM
-ok 15 - change in branch A (modification)
-
-expecting success: git update-index MN
-ok 16 - change in branch A (modification)
-
-expecting success: git update-index Z/MD
-ok 17 - change in branch A (modification)
-
-expecting success: git update-index Z/MM
-ok 18 - change in branch A (modification)
-
-expecting success: git update-index Z/MN
-ok 19 - change in branch A (modification)
-
-expecting success: git update-index --add AN
-ok 20 - change in branch A (addition)
-
-expecting success: git update-index --add AA
-ok 21 - change in branch A (addition)
-
-expecting success: git update-index --add Z/AN
-ok 22 - change in branch A (addition)
-
-expecting success: git update-index --add Z/AA
-ok 23 - change in branch A (addition)
-
-expecting success: git update-index --add LL &&
-     git update-index SS
-ok 24 - change in branch A (addition)
-
-expecting success: git update-index TT
-ok 25 - change in branch A (edit)
-
-expecting success: git update-index --add DF/DF
-ok 26 - change in branch A (change file to directory)
-
-expecting success: tree_A=$(git write-tree)
-ok 27 - recording branch A tree
-
-expecting success: git read-tree $tree_O &&
-     git checkout-index -a
-ok 28 - reading original tree and checking out
-
-expecting success: git update-index --remove DD MD ND Z/DD Z/MD Z/ND
-ok 29 - change in branch B (removal)
-
-expecting success: git update-index DM
-ok 30 - change in branch B (modification)
-
-expecting success: git update-index MM
-ok 31 - change in branch B (modification)
-
-expecting success: git update-index NM
-ok 32 - change in branch B (modification)
-
-expecting success: git update-index Z/DM
-ok 33 - change in branch B (modification)
-
-expecting success: git update-index Z/MM
-ok 34 - change in branch B (modification)
-
-expecting success: git update-index Z/NM
-ok 35 - change in branch B (modification)
-
-expecting success: git update-index --add NA
-ok 36 - change in branch B (addition)
-
-expecting success: git update-index --add AA
-ok 37 - change in branch B (addition)
-
-expecting success: git update-index --add Z/NA
-ok 38 - change in branch B (addition)
-
-expecting success: git update-index --add Z/AA
-ok 39 - change in branch B (addition)
-
-expecting success: git update-index --add LL &&
-     git update-index SS
-ok 40 - change in branch B (addition and modification)
-
-expecting success: git update-index TT
-ok 41 - change in branch B (modification)
-
-expecting success: git update-index --add DF
-ok 42 - change in branch B (addition of a file to conflict with directory)
-
-expecting success: tree_B=$(git write-tree)
-ok 43 - recording branch B tree
-
-expecting success: 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: 
-	rm -fr [NDMALTS][NDMALTSF] Z &&
-	rm .git/index &&
-	read_tree_must_succeed -m $tree_O $tree_A $tree_B &&
-	check_result
-
-ok 45 - 3-way merge with git read-tree -m, empty cache
-
-expecting success: 
-	rm -fr [NDMALTS][NDMALTSF] Z &&
-	rm .git/index &&
-	read_tree_must_succeed $tree_A &&
-	git checkout-index -f -u -a &&
-	read_tree_must_succeed -m $tree_O $tree_A $tree_B &&
-	check_result
-
-ok 46 - 3-way merge with git read-tree -m, match H
-
-expecting success: 
-	rm -f .git/index XX &&
-	echo XX >XX &&
-	git update-index --add XX &&
-	read_tree_must_fail -m $tree_O $tree_A $tree_B
-
-error: Entry 'XX' would be overwritten by merge. Cannot merge.
-error: Entry 'XX' would be overwritten by merge. Cannot merge.
-ok 47 - 1 - must not have an entry not in A.
-
-expecting success: 
-	rm -f .git/index NA &&
-	cp .orig-B/NA NA &&
-	git update-index --add NA &&
-	read_tree_must_succeed -m $tree_O $tree_A $tree_B
-
-ok 48 - 2 - must match B in !O && !A && B case.
-
-expecting success: 
-	rm -f .git/index NA &&
-	cp .orig-B/NA NA &&
-	git update-index --add NA &&
-	echo extra >>NA &&
-	read_tree_must_succeed -m $tree_O $tree_A $tree_B
-
-ok 49 - 2 - matching B alone is OK in !O && !A && B case.
-
-expecting success: 
-	rm -f .git/index AN &&
-	cp .orig-A/AN AN &&
-	git update-index --add AN &&
-	read_tree_must_succeed -m $tree_O $tree_A $tree_B &&
-	check_result
-
-ok 50 - 3 - must match A in !O && A && !B case.
-
-expecting success: 
-	rm -f .git/index AN &&
-	cp .orig-A/AN AN &&
-	git update-index --add AN &&
-	echo extra >>AN &&
-	read_tree_must_succeed -m $tree_O $tree_A $tree_B
-
-ok 51 - 3 - matching A alone is OK in !O && A && !B case.
-
-expecting success: 
-	rm -f .git/index AN &&
-	cp .orig-A/AN AN &&
-	echo extra >>AN &&
-	git update-index --add AN &&
-	read_tree_must_fail -m $tree_O $tree_A $tree_B
-
-error: Entry 'AN' would be overwritten by merge. Cannot merge.
-error: Entry 'AN' would be overwritten by merge. Cannot merge.
-ok 52 - 3 (fail) - must match A in !O && A && !B case.
-
-expecting success: 
-	rm -f .git/index AA &&
-	cp .orig-A/AA AA &&
-	git update-index --add AA &&
-	read_tree_must_succeed -m $tree_O $tree_A $tree_B &&
-	check_result
-
-ok 53 - 4 - must match and be up-to-date in !O && A && B && A!=B case.
-
-expecting success: 
-	rm -f .git/index AA &&
-	cp .orig-A/AA AA &&
-	git update-index --add AA &&
-	echo extra >>AA &&
-	read_tree_must_fail -m $tree_O $tree_A $tree_B
-
-error: Entry 'AA' not uptodate. Cannot merge.
-error: Entry 'AA' not uptodate. Cannot merge.
-ok 54 - 4 (fail) - must match and be up-to-date in !O && A && B && A!=B case.
-
-expecting success: 
-	rm -f .git/index AA &&
-	cp .orig-A/AA AA &&
-	echo extra >>AA &&
-	git update-index --add AA &&
-	read_tree_must_fail -m $tree_O $tree_A $tree_B
-
-error: Entry 'AA' would be overwritten by merge. Cannot merge.
-error: Entry 'AA' would be overwritten by merge. Cannot merge.
-ok 55 - 4 (fail) - must match and be up-to-date in !O && A && B && A!=B case.
-
-expecting success: 
-	rm -f .git/index LL &&
-	cp .orig-A/LL LL &&
-	git update-index --add LL &&
-	read_tree_must_succeed -m $tree_O $tree_A $tree_B &&
-	check_result
-
-ok 56 - 5 - must match in !O && A && B && A==B case.
-
-expecting success: 
-	rm -f .git/index LL &&
-	cp .orig-A/LL LL &&
-	git update-index --add LL &&
-	echo extra >>LL &&
-	read_tree_must_succeed -m $tree_O $tree_A $tree_B &&
-	check_result
-
-ok 57 - 5 - must match in !O && A && B && A==B case.
-
-expecting success: 
-	rm -f .git/index LL &&
-	cp .orig-A/LL LL &&
-	echo extra >>LL &&
-	git update-index --add LL &&
-	read_tree_must_fail -m $tree_O $tree_A $tree_B
-
-error: Entry 'LL' would be overwritten by merge. Cannot merge.
-error: Entry 'LL' would be overwritten by merge. Cannot merge.
-ok 58 - 5 (fail) - must match A in !O && A && B && A==B case.
-
-expecting success: 
-	rm -f .git/index DD &&
-	echo DD >DD &&
-	git update-index --add DD &&
-	read_tree_must_fail -m $tree_O $tree_A $tree_B
-
-error: Entry 'DD' would be overwritten by merge. Cannot merge.
-error: Entry 'DD' would be overwritten by merge. Cannot merge.
-ok 59 - 6 - must not exist in O && !A && !B case
-
-expecting success: 
-	rm -f .git/index DM &&
-	cp .orig-B/DM DM &&
-	git update-index --add DM &&
-	read_tree_must_fail -m $tree_O $tree_A $tree_B
-
-error: Entry 'DM' would be overwritten by merge. Cannot merge.
-error: Entry 'DM' would be overwritten by merge. Cannot merge.
-ok 60 - 7 - must not exist in O && !A && B && O!=B case
-
-expecting success: 
-	rm -f .git/index DN &&
-	cp .orig-B/DN DN &&
-	git update-index --add DN &&
-	read_tree_must_fail -m $tree_O $tree_A $tree_B
-
-error: Entry 'DN' would be overwritten by merge. Cannot merge.
-error: Entry 'DN' would be overwritten by merge. Cannot merge.
-ok 61 - 8 - must not exist in O && !A && B && O==B case
-
-expecting success: 
-	rm -f .git/index MD &&
-	cp .orig-A/MD MD &&
-	git update-index --add MD &&
-	read_tree_must_succeed -m $tree_O $tree_A $tree_B &&
-	check_result
-
-ok 62 - 9 - must match and be up-to-date in O && A && !B && O!=A case
-
-expecting success: 
-	rm -f .git/index MD &&
-	cp .orig-A/MD MD &&
-	git update-index --add MD &&
-	echo extra >>MD &&
-	read_tree_must_fail -m $tree_O $tree_A $tree_B
-
-error: Entry 'MD' not uptodate. Cannot merge.
-error: Entry 'MD' not uptodate. Cannot merge.
-ok 63 - 9 (fail) - must match and be up-to-date in O && A && !B && O!=A case
-
-expecting success: 
-	rm -f .git/index MD &&
-	cp .orig-A/MD MD &&
-	echo extra >>MD &&
-	git update-index --add MD &&
-	read_tree_must_fail -m $tree_O $tree_A $tree_B
-
-error: Entry 'MD' would be overwritten by merge. Cannot merge.
-error: Entry 'MD' would be overwritten by merge. Cannot merge.
-ok 64 - 9 (fail) - must match and be up-to-date in O && A && !B && O!=A case
-
-expecting success: 
-	rm -f .git/index ND &&
-	cp .orig-A/ND ND &&
-	git update-index --add ND &&
-	read_tree_must_succeed -m $tree_O $tree_A $tree_B &&
-	check_result
-
-ok 65 - 10 - must match and be up-to-date in O && A && !B && O==A case
-
-expecting success: 
-	rm -f .git/index ND &&
-	cp .orig-A/ND ND &&
-	git update-index --add ND &&
-	echo extra >>ND &&
-	read_tree_must_fail -m $tree_O $tree_A $tree_B
-
-error: Entry 'ND' not uptodate. Cannot merge.
-error: Entry 'ND' not uptodate. Cannot merge.
-ok 66 - 10 (fail) - must match and be up-to-date in O && A && !B && O==A case
-
-expecting success: 
-	rm -f .git/index ND &&
-	cp .orig-A/ND ND &&
-	echo extra >>ND &&
-	git update-index --add ND &&
-	read_tree_must_fail -m $tree_O $tree_A $tree_B
-
-error: Entry 'ND' would be overwritten by merge. Cannot merge.
-error: Entry 'ND' would be overwritten by merge. Cannot merge.
-ok 67 - 10 (fail) - must match and be up-to-date in O && A && !B && O==A case
-
-expecting success: 
-	rm -f .git/index MM &&
-	cp .orig-A/MM MM &&
-	git update-index --add MM &&
-	read_tree_must_succeed -m $tree_O $tree_A $tree_B &&
-	check_result
-
-ok 68 - 11 - must match and be up-to-date in O && A && B && O!=A && O!=B && A!=B case
-
-expecting success: 
-	rm -f .git/index MM &&
-	cp .orig-A/MM MM &&
-	git update-index --add MM &&
-	echo extra >>MM &&
-	read_tree_must_fail -m $tree_O $tree_A $tree_B
-
-error: Entry 'MM' not uptodate. Cannot merge.
-error: Entry 'MM' not uptodate. Cannot merge.
-ok 69 - 11 (fail) - must match and be up-to-date in O && A && B && O!=A && O!=B && A!=B case
-
-expecting success: 
-	rm -f .git/index MM &&
-	cp .orig-A/MM MM &&
-	echo extra >>MM &&
-	git update-index --add MM &&
-	read_tree_must_fail -m $tree_O $tree_A $tree_B
-
-error: Entry 'MM' would be overwritten by merge. Cannot merge.
-error: Entry 'MM' would be overwritten by merge. Cannot merge.
-ok 70 - 11 (fail) - must match and be up-to-date in O && A && B && O!=A && O!=B && A!=B case
-
-expecting success: 
-	rm -f .git/index SS &&
-	cp .orig-A/SS SS &&
-	git update-index --add SS &&
-	read_tree_must_succeed -m $tree_O $tree_A $tree_B &&
-	check_result
-
-ok 71 - 12 - must match A in O && A && B && O!=A && A==B case
-
-expecting success: 
-	rm -f .git/index SS &&
-	cp .orig-A/SS SS &&
-	git update-index --add SS &&
-	echo extra >>SS &&
-	read_tree_must_succeed -m $tree_O $tree_A $tree_B &&
-	check_result
-
-ok 72 - 12 - must match A in O && A && B && O!=A && A==B case
-
-expecting success: 
-	rm -f .git/index SS &&
-	cp .orig-A/SS SS &&
-	echo extra >>SS &&
-	git update-index --add SS &&
-	read_tree_must_fail -m $tree_O $tree_A $tree_B
-
-error: Entry 'SS' would be overwritten by merge. Cannot merge.
-error: Entry 'SS' would be overwritten by merge. Cannot merge.
-ok 73 - 12 (fail) - must match A in O && A && B && O!=A && A==B case
-
-expecting success: 
-	rm -f .git/index MN &&
-	cp .orig-A/MN MN &&
-	git update-index --add MN &&
-	read_tree_must_succeed -m $tree_O $tree_A $tree_B &&
-	check_result
-
-ok 74 - 13 - must match A in O && A && B && O!=A && O==B case
-
-expecting success: 
-	rm -f .git/index MN &&
-	cp .orig-A/MN MN &&
-	git update-index --add MN &&
-	echo extra >>MN &&
-	read_tree_must_succeed -m $tree_O $tree_A $tree_B &&
-	check_result
-
-ok 75 - 13 - must match A in O && A && B && O!=A && O==B case
-
-expecting success: 
-	rm -f .git/index NM &&
-	cp .orig-A/NM NM &&
-	git update-index --add NM &&
-	read_tree_must_succeed -m $tree_O $tree_A $tree_B &&
-	check_result
-
-ok 76 - 14 - must match and be up-to-date in O && A && B && O==A && O!=B case
-
-expecting success: 
-	rm -f .git/index NM &&
-	cp .orig-B/NM NM &&
-	git update-index --add NM &&
-	echo extra >>NM &&
-	read_tree_must_succeed -m $tree_O $tree_A $tree_B &&
-	check_result
-
-ok 77 - 14 - may match B in O && A && B && O==A && O!=B case
-
-expecting success: 
-	rm -f .git/index NM &&
-	cp .orig-A/NM NM &&
-	git update-index --add NM &&
-	echo extra >>NM &&
-	read_tree_must_fail -m $tree_O $tree_A $tree_B
-
-error: Entry 'NM' not uptodate. Cannot merge.
-error: Entry 'NM' not uptodate. Cannot merge.
-ok 78 - 14 (fail) - must match and be up-to-date in O && A && B && O==A && O!=B case
-
-expecting success: 
-	rm -f .git/index NM &&
-	cp .orig-A/NM NM &&
-	echo extra >>NM &&
-	git update-index --add NM &&
-	read_tree_must_fail -m $tree_O $tree_A $tree_B
-
-error: Entry 'NM' would be overwritten by merge. Cannot merge.
-error: Entry 'NM' would be overwritten by merge. Cannot merge.
-ok 79 - 14 (fail) - must match and be up-to-date in O && A && B && O==A && O!=B case
-
-expecting success: 
-	rm -f .git/index NN &&
-	cp .orig-A/NN NN &&
-	git update-index --add NN &&
-	read_tree_must_succeed -m $tree_O $tree_A $tree_B &&
-	check_result
-
-ok 80 - 15 - must match A in O && A && B && O==A && O==B case
-
-expecting success: 
-	rm -f .git/index NN &&
-	cp .orig-A/NN NN &&
-	git update-index --add NN &&
-	echo extra >>NN &&
-	read_tree_must_succeed -m $tree_O $tree_A $tree_B &&
-	check_result
-
-ok 81 - 15 - must match A in O && A && B && O==A && O==B case
-
-expecting success: 
-	rm -f .git/index NN &&
-	cp .orig-A/NN NN &&
-	echo extra >>NN &&
-	git update-index --add NN &&
-	read_tree_must_fail -m $tree_O $tree_A $tree_B
+*** t1021-rerere-in-workdir.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1021-rerere-in-workdir/.git/
+checking prerequisite: SYMLINKS
 
-error: Entry 'NN' would be overwritten by merge. Cannot merge.
-error: Entry 'NN' would be overwritten by merge. Cannot merge.
-ok 82 - 15 (fail) - must match A in O && A && B && O==A && O==B case
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
+	# test whether the filesystem supports symbolic links
+	ln -s x y && test -h y
 
+)
+prerequisite SYMLINKS ok
 expecting success: 
-	rm -f .git/index F16 &&
-	echo F16 >F16 &&
-	git update-index --add F16 &&
-	tree0=$(git write-tree) &&
-	echo E16 >F16 &&
-	git update-index F16 &&
-	tree1=$(git write-tree) &&
-	read_tree_must_succeed -m $tree0 $tree1 $tree1 $tree0 &&
-	git ls-files --stage
-
-100644 ecbec6db011caa3ae26739812f092f76875fe6b6 2	F16
-100644 bcf4afda2c30299bf6538240d40bcb8fb3857691 3	F16
-ok 83 - 16 - A matches in one and B matches in another.
+	git config rerere.enabled true &&
+	>world &&
+	git add world &&
+	test_tick &&
+	git commit -m initial &&
 
-# passed all 83 test(s)
-1..83
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t1012-read-tree-df.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1012-read-tree-df/.git/
-expecting success: 
-	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 &&
+	echo hello >world &&
+	test_tick &&
+	git commit -a -m hello &&
 
-	maketree O-010 t-0     t/1  t/2 t=3 &&
-	maketree A-010 t-0 t            t=3 &&
-	maketree B-010         t/1:     t=3: &&
+	git checkout -b side HEAD^ &&
+	echo goodbye >world &&
+	test_tick &&
+	git commit -a -m goodbye &&
 
-	maketree O-020 ds/dma/ioat.c ds/dma/ioat_dca.c &&
-	maketree A-020 ds/dma/ioat/Makefile ds/dma/ioat/registers.h &&
-	:
+	git checkout master
 
+[master (root-commit) 21975ff] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 world
+[master 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 'master'
 ok 1 - setup
 
 expecting success: 
-	settree A-000 &&
-	read_tree_u_must_succeed -m -u O-000 A-000 B-000 &&
-	checkindex <<-EOF
-	3 a/b
-	0 a/b-2/c/d
-	1 a/b/c/d
-	2 a/b/c/d
-	0 a/x
-	EOF
-
-ok 2 - 3-way (1)
-
-expecting success: 
-	settree A-001 &&
-	read_tree_u_must_succeed -m -u O-000 A-001 B-000 &&
-	checkindex <<-EOF
-	3 a/b
-	0 a/b-2/c/d
-	1 a/b/c/d
-	2 a/b/c/d
-	2 a/b/c/e
-	0 a/x
-	EOF
-
-ok 3 - 3-way (2)
-
-expecting success: 
-	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
+	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
+	)
 
-ok 4 - 3-way (3)
+Merging:
+02943d2 hello
+virtual side
+found 1 common ancestor:
+21975ff initial
+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: 
-	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
+checking known breakage: 
+	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
+	)
 
-ok 5 - 2-way (1)
+Merging:
+02943d2 hello
+virtual side
+found 1 common ancestor:
+21975ff initial
+Auto-merging world
+CONFLICT (content): Merge conflict in world
+fatal: could not create directory '.git/rr-cache'
+fatal: could not create directory '.git/rr-cache'
+not ok 3 - rerere in workdir (relative) # TODO known breakage
 
-# passed all 5 test(s)
-1..5
+# still have 1 known breakage(s)
+# passed all remaining 2 test(s)
+1..3
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
 *** t1015-read-index-unmerged.sh ***
@@ -20714,18 +19729,18 @@
 	)
 
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1015-read-index-unmerged/df_plus_modify_delete/.git/
-[master (root-commit) aa8b47c] initial
+[master (root-commit) ad2a2ca] initial
  Author: A U Thor <author@example.com>
  1 file changed, 8 insertions(+)
  create mode 100644 letters
 Switched to a new branch 'modify'
-[modify eaa9843] modified
+[modify 8883c1c] 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 3e2f084] deleted
+[delete 3f98f44] deleted
  Author: A U Thor <author@example.com>
  3 files changed, 1 insertion(+), 8 deletions(-)
  delete mode 100644 letters
@@ -20758,18 +19773,18 @@
 
   git checkout -b <new-branch-name>
 
-HEAD is now at 3e2f084 deleted
+HEAD is now at 3f98f44 deleted
 Merging:
-3e2f084 deleted
+3f98f44 deleted
 virtual modify
 found 1 common ancestor:
-aa8b47c initial
+ad2a2ca initial
 Adding letters/file
 Auto-merging letters.txt
 CONFLICT (add/add): Merge conflict in letters.txt
 CONFLICT (modify/delete): letters deleted in HEAD and modified in modify. Version modify of letters left in tree at letters~modify.
 Automatic merge failed; fix conflicts and then commit the result.
-HEAD is now at 3e2f084 deleted
+HEAD is now at 3f98f44 deleted
 Removing conflicts
 Removing letters~modify
 ok 2 - read-tree --reset cleans unmerged entries
@@ -20789,20 +19804,20 @@
 		test_must_be_empty conflicts
 	)
 
-HEAD is now at 3e2f084 deleted
+HEAD is now at 3f98f44 deleted
 Merging:
-3e2f084 deleted
+3f98f44 deleted
 virtual modify
 found 1 common ancestor:
-aa8b47c initial
+ad2a2ca initial
 Adding letters/file
 Auto-merging letters.txt
 CONFLICT (add/add): Merge conflict in letters.txt
 CONFLICT (modify/delete): letters deleted in HEAD and modified in modify. Version modify of letters left in tree at letters~modify.
 Automatic merge failed; fix conflicts and then commit the result.
 warning: unable to unlink 'letters': Is a directory
-HEAD is now at 3e2f084 deleted
-HEAD is now at 3e2f084 deleted
+HEAD is now at 3f98f44 deleted
+HEAD is now at 3f98f44 deleted
 Removing conflicts
 Removing letters~modify
 ok 3 - One reset --hard cleans unmerged entries
@@ -20833,17 +19848,17 @@
 	)
 
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1015-read-index-unmerged/df_plus_edit_edit/.git/
-[master (root-commit) f29fa13] initial
+[master (root-commit) e5a66f0] 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 b310aa5] directory and edit
+[d-edit d297050] 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 0474e3b] file and edit
+[f-edit ce92d41] file and edit
  Author: A U Thor <author@example.com>
  2 files changed, 2 insertions(+)
  create mode 100644 foo
@@ -20875,12 +19890,12 @@
 
   git checkout -b <new-branch-name>
 
-HEAD is now at 0474e3b file and edit
+HEAD is now at ce92d41 file and edit
 Merging:
-0474e3b file and edit
+ce92d41 file and edit
 virtual d-edit^0
 found 1 common ancestor:
-f29fa13 initial
+e5a66f0 initial
 Auto-merging numbers
 CONFLICT (content): Merge conflict in numbers
 Adding foo/bar
@@ -20888,7 +19903,7 @@
 
 CONFLICT (file/directory): There is a directory with name foo in d-edit^0. Adding foo as foo~HEAD
 Automatic merge failed; fix conflicts and then commit the result.
-HEAD is now at 0474e3b file and edit
+HEAD is now at ce92d41 file and edit
 Removing conflicts
 Removing foo~HEAD
 ok 5 - git merge --abort succeeds despite D/F conflict
@@ -20909,14 +19924,14 @@
 		test_must_be_empty conflicts
 	)
 
-HEAD is now at 0474e3b file and edit
+HEAD is now at ce92d41 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:
-0474e3b file and edit
+ce92d41 file and edit
 virtual directory and edit
 found 1 common ancestor:
 virtual 75a3e2be4ba4a7062d21fba0206758f5518d6ead
@@ -20932,7 +19947,7 @@
 When you have resolved this problem, run "git am --continue".
 If you prefer to skip this patch, run "git am --skip" instead.
 To restore the original branch and stop patching, run "git am --abort".
-HEAD is now at 0474e3b file and edit
+HEAD is now at ce92d41 file and edit
 Removing 0001-directory-and-edit.patch
 Removing conflicts
 Removing foo~HEAD
@@ -20942,41 +19957,305 @@
 1..6
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t1100-commit-tree-options.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1100-commit-tree-options/.git/
-expecting success: git write-tree >treeid
-ok 1 - test preparation: write empty tree
+*** t1014-read-tree-confusing.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1014-read-tree-confusing/.git/
+expecting success: 
+	echo content >file &&
+	git add file &&
+	git commit -m base &&
+	blob=$(git rev-parse HEAD:file) &&
+	tree=$(git rev-parse HEAD^{tree})
 
-expecting success: 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
+[master (root-commit) 590767e] base
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+ok 1 - create base tree
 
-expecting success: git cat-file commit $(cat commitid) >commit
-ok 3 - read commit
+expecting success: 
+	git config core.protectHFS true
 
-expecting success: test_cmp expected commit
-ok 4 - compare commit
+ok 2 - enable core.protectHFS for rejection tests
 
 expecting success: 
-	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
+	git config core.protectNTFS true
 
-ok 5 - flags and then non flags
+ok 3 - enable core.protectNTFS for rejection tests
+
+expecting success: 
+		printf "100644 blob %s\t%s" "$blob" "$path" >tree &&
+		bogus=$(git mktree <tree) &&
+		test_must_fail git read-tree $bogus
+	
+error: Invalid path '.'
+ok 4 - reject . at end of path
+
+expecting success: 
+		printf "040000 tree %s\t%s" "$tree" "$path" >tree &&
+		bogus=$(git mktree <tree) &&
+		test_must_fail git read-tree $bogus
+	
+error: Invalid path './file'
+ok 5 - reject . as subtree
+
+expecting success: 
+		printf "100644 blob %s\t%s" "$blob" "$path" >tree &&
+		bogus=$(git mktree <tree) &&
+		test_must_fail git read-tree $bogus
+	
+error: Invalid path '..'
+ok 6 - reject .. at end of path
+
+expecting success: 
+		printf "040000 tree %s\t%s" "$tree" "$path" >tree &&
+		bogus=$(git mktree <tree) &&
+		test_must_fail git read-tree $bogus
+	
+error: Invalid path '../file'
+ok 7 - reject .. as subtree
+
+expecting success: 
+		printf "100644 blob %s\t%s" "$blob" "$path" >tree &&
+		bogus=$(git mktree <tree) &&
+		test_must_fail git read-tree $bogus
+	
+error: Invalid path '.git'
+ok 8 - reject .git at end of path
+
+expecting success: 
+		printf "040000 tree %s\t%s" "$tree" "$path" >tree &&
+		bogus=$(git mktree <tree) &&
+		test_must_fail git read-tree $bogus
+	
+error: Invalid path '.git/file'
+ok 9 - reject .git as subtree
+
+expecting success: 
+		printf "100644 blob %s\t%s" "$blob" "$path" >tree &&
+		bogus=$(git mktree <tree) &&
+		test_must_fail git read-tree $bogus
+	
+error: Invalid path '.GIT'
+ok 10 - reject .GIT at end of path
+
+expecting success: 
+		printf "040000 tree %s\t%s" "$tree" "$path" >tree &&
+		bogus=$(git mktree <tree) &&
+		test_must_fail git read-tree $bogus
+	
+error: Invalid path '.GIT/file'
+ok 11 - reject .GIT as subtree
+
+expecting success: 
+		printf "100644 blob %s\t%s" "$blob" "$path" >tree &&
+		bogus=$(git mktree <tree) &&
+		test_must_fail git read-tree $bogus
+	
+error: Invalid path '‌.Git'
+ok 12 - reject {u200c}.Git at end of path
+
+expecting success: 
+		printf "040000 tree %s\t%s" "$tree" "$path" >tree &&
+		bogus=$(git mktree <tree) &&
+		test_must_fail git read-tree $bogus
+	
+error: Invalid path '‌.Git/file'
+ok 13 - reject {u200c}.Git as subtree
+
+expecting success: 
+		printf "100644 blob %s\t%s" "$blob" "$path" >tree &&
+		bogus=$(git mktree <tree) &&
+		test_must_fail git read-tree $bogus
+	
+error: Invalid path '.gI‌T'
+ok 14 - reject .gI{u200c}T at end of path
+
+expecting success: 
+		printf "040000 tree %s\t%s" "$tree" "$path" >tree &&
+		bogus=$(git mktree <tree) &&
+		test_must_fail git read-tree $bogus
+	
+error: Invalid path '.gI‌T/file'
+ok 15 - reject .gI{u200c}T as subtree
+
+expecting success: 
+		printf "100644 blob %s\t%s" "$blob" "$path" >tree &&
+		bogus=$(git mktree <tree) &&
+		test_must_fail git read-tree $bogus
+	
+error: Invalid path '.GiT‌'
+ok 16 - reject .GiT{u200c} at end of path
+
+expecting success: 
+		printf "040000 tree %s\t%s" "$tree" "$path" >tree &&
+		bogus=$(git mktree <tree) &&
+		test_must_fail git read-tree $bogus
+	
+error: Invalid path '.GiT‌/file'
+ok 17 - reject .GiT{u200c} as subtree
+
+expecting success: 
+		printf "100644 blob %s\t%s" "$blob" "$path" >tree &&
+		bogus=$(git mktree <tree) &&
+		test_must_fail git read-tree $bogus
+	
+error: Invalid path 'git~1'
+ok 18 - reject git~1 at end of path
+
+expecting success: 
+		printf "040000 tree %s\t%s" "$tree" "$path" >tree &&
+		bogus=$(git mktree <tree) &&
+		test_must_fail git read-tree $bogus
+	
+error: Invalid path 'git~1/file'
+ok 19 - reject git~1 as subtree
+
+expecting success: 
+		printf "100644 blob %s\t%s" "$blob" "$path" >tree &&
+		bogus=$(git mktree <tree) &&
+		test_must_fail git read-tree $bogus
+	
+error: Invalid path '.git. '
+ok 20 - reject .git.{space} at end of path
+
+expecting success: 
+		printf "040000 tree %s\t%s" "$tree" "$path" >tree &&
+		bogus=$(git mktree <tree) &&
+		test_must_fail git read-tree $bogus
+	
+error: Invalid path '.git. /file'
+ok 21 - reject .git.{space} as subtree
+
+expecting success: 
+		printf "100644 blob %s\t%s" "$blob" "$path" >tree &&
+		bogus=$(git mktree <tree) &&
+		test_must_fail git read-tree $bogus
+	
+error: Invalid path '.\.GIT\foobar'
+ok 22 - reject backslashes at end of path
+
+expecting success: 
+		printf "040000 tree %s\t%s" "$tree" "$path" >tree &&
+		bogus=$(git mktree <tree) &&
+		test_must_fail git read-tree $bogus
+	
+error: Invalid path '.\.GIT\foobar/file'
+ok 23 - reject backslashes as subtree
+
+expecting success: 
+		printf "100644 blob %s\t%s" "$blob" "$path" >tree &&
+		bogus=$(git mktree <tree) &&
+		test_must_fail git read-tree $bogus
+	
+error: Invalid path '.git\foobar'
+ok 24 - reject backslashes2 at end of path
+
+expecting success: 
+		printf "040000 tree %s\t%s" "$tree" "$path" >tree &&
+		bogus=$(git mktree <tree) &&
+		test_must_fail git read-tree $bogus
+	
+error: Invalid path '.git\foobar/file'
+ok 25 - reject backslashes2 as subtree
+
+expecting success: 
+		printf "100644 blob %s\t%s" "$blob" "$path" >tree &&
+		bogus=$(git mktree <tree) &&
+		test_must_fail git read-tree $bogus
+	
+error: Invalid path '.git...:alternate-stream'
+ok 26 - reject .git...:alternate-stream at end of path
+
+expecting success: 
+		printf "040000 tree %s\t%s" "$tree" "$path" >tree &&
+		bogus=$(git mktree <tree) &&
+		test_must_fail git read-tree $bogus
+	
+error: Invalid path '.git...:alternate-stream/file'
+ok 27 - reject .git...:alternate-stream as subtree
+
+expecting success: 
+	test_when_finished "git read-tree HEAD" &&
+	test_config core.protectHFS false &&
+	printf "100644 blob %s\t%s" "$blob" ".gi${u200c}t" >tree &&
+	ok=$(git mktree <tree) &&
+	git read-tree $ok
+
+ok 28 - utf-8 paths allowed with core.protectHFS off
+
+# passed all 28 test(s)
+1..28
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t1012-read-tree-df.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1012-read-tree-df/.git/
+expecting success: 
+	maketree O-000 a/b-2/c/d a/b/c/d a/x &&
+	maketree A-000 a/b-2/c/d a/b/c/d a/x &&
+	maketree A-001 a/b-2/c/d a/b/c/d a/b/c/e a/x &&
+	maketree B-000 a/b-2/c/d a/b     a/x &&
+
+	maketree O-010 t-0     t/1  t/2 t=3 &&
+	maketree A-010 t-0 t            t=3 &&
+	maketree B-010         t/1:     t=3: &&
+
+	maketree O-020 ds/dma/ioat.c ds/dma/ioat_dca.c &&
+	maketree A-020 ds/dma/ioat/Makefile ds/dma/ioat/registers.h &&
+	:
+
+ok 1 - setup
+
+expecting success: 
+	settree A-000 &&
+	read_tree_u_must_succeed -m -u O-000 A-000 B-000 &&
+	checkindex <<-EOF
+	3 a/b
+	0 a/b-2/c/d
+	1 a/b/c/d
+	2 a/b/c/d
+	0 a/x
+	EOF
+
+ok 2 - 3-way (1)
+
+expecting success: 
+	settree A-001 &&
+	read_tree_u_must_succeed -m -u O-000 A-001 B-000 &&
+	checkindex <<-EOF
+	3 a/b
+	0 a/b-2/c/d
+	1 a/b/c/d
+	2 a/b/c/d
+	2 a/b/c/e
+	0 a/x
+	EOF
+
+ok 3 - 3-way (2)
+
+expecting success: 
+	settree A-010 &&
+	read_tree_u_must_succeed -m -u O-010 A-010 B-010 &&
+	checkindex <<-EOF
+	2 t
+	1 t-0
+	2 t-0
+	1 t/1
+	3 t/1
+	1 t/2
+	0 t=3
+	EOF
+
+ok 4 - 3-way (3)
+
+expecting success: 
+	settree O-020 &&
+	read_tree_u_must_succeed -m -u O-020 A-020 &&
+	checkindex <<-EOF
+	0 ds/dma/ioat/Makefile
+	0 ds/dma/ioat/registers.h
+	EOF
+
+ok 5 - 2-way (1)
 
 # passed all 5 test(s)
 1..5
@@ -21316,1283 +20595,6 @@
 1..21
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t1021-rerere-in-workdir.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1021-rerere-in-workdir/.git/
-checking prerequisite: SYMLINKS
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
-	# test whether the filesystem supports symbolic links
-	ln -s x y && test -h y
-
-)
-prerequisite SYMLINKS ok
-expecting success: 
-	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 master
-
-[master (root-commit) 21975ff] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 world
-[master 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 'master'
-ok 1 - setup
-
-expecting success: 
-	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
-	)
-
-Merging:
-02943d2 hello
-virtual side
-found 1 common ancestor:
-21975ff initial
-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: 
-	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
-	)
-
-Merging:
-02943d2 hello
-virtual side
-found 1 common ancestor:
-21975ff initial
-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/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t0060-path-utils.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t0060-path-utils/.git/
-expecting success: test-tool path-utils basename
-ok 1 - basename
-
-expecting success: test-tool path-utils dirname
-ok 2 - dirname
-
-expecting success: test "$(test-tool path-utils normalize_path_copy '')" = ''
-ok 3 - normalize path:  => 
-
-expecting success: test "$(test-tool path-utils normalize_path_copy '.')" = ''
-ok 4 - normalize path: . => 
-
-expecting success: test "$(test-tool path-utils normalize_path_copy './')" = ''
-ok 5 - normalize path: ./ => 
-
-expecting success: test "$(test-tool path-utils normalize_path_copy './.')" = ''
-ok 6 - normalize path: ./. => 
-
-expecting success: test "$(test-tool path-utils normalize_path_copy './..')" = '++failed++'
-ok 7 - normalize path: ./.. => ++failed++
-
-expecting success: test "$(test-tool path-utils normalize_path_copy '../.')" = '++failed++'
-ok 8 - normalize path: ../. => ++failed++
-
-expecting success: test "$(test-tool path-utils normalize_path_copy './.././/')" = '++failed++'
-ok 9 - normalize path: ./../.// => ++failed++
-
-expecting success: test "$(test-tool path-utils normalize_path_copy 'dir/..')" = ''
-ok 10 - normalize path: dir/.. => 
-
-expecting success: test "$(test-tool path-utils normalize_path_copy 'dir/sub/../..')" = ''
-ok 11 - normalize path: dir/sub/../.. => 
-
-expecting success: test "$(test-tool path-utils normalize_path_copy 'dir/sub/../../..')" = '++failed++'
-ok 12 - normalize path: dir/sub/../../.. => ++failed++
-
-expecting success: test "$(test-tool path-utils normalize_path_copy 'dir')" = 'dir'
-ok 13 - normalize path: dir => dir
-
-expecting success: test "$(test-tool path-utils normalize_path_copy 'dir//')" = 'dir/'
-ok 14 - normalize path: dir// => dir/
-
-expecting success: test "$(test-tool path-utils normalize_path_copy './dir')" = 'dir'
-ok 15 - normalize path: ./dir => dir
-
-expecting success: test "$(test-tool path-utils normalize_path_copy 'dir/.')" = 'dir/'
-ok 16 - normalize path: dir/. => dir/
-
-expecting success: test "$(test-tool path-utils normalize_path_copy 'dir///./')" = 'dir/'
-ok 17 - normalize path: dir///./ => dir/
-
-expecting success: test "$(test-tool path-utils normalize_path_copy 'dir//sub/..')" = 'dir/'
-ok 18 - normalize path: dir//sub/.. => dir/
-
-expecting success: test "$(test-tool path-utils normalize_path_copy 'dir/sub/../')" = 'dir/'
-ok 19 - normalize path: dir/sub/../ => dir/
-
-expecting success: test "$(test-tool path-utils normalize_path_copy 'dir/sub/../.')" = 'dir/'
-ok 20 - normalize path: dir/sub/../. => dir/
-
-expecting success: test "$(test-tool path-utils normalize_path_copy 'dir/s1/../s2/')" = 'dir/s2/'
-ok 21 - normalize path: dir/s1/../s2/ => dir/s2/
-
-expecting success: test "$(test-tool path-utils normalize_path_copy 'd1/s1///s2/..//../s3/')" = 'd1/s3/'
-ok 22 - normalize path: d1/s1///s2/..//../s3/ => d1/s3/
-
-expecting success: test "$(test-tool path-utils normalize_path_copy 'd1/s1//../s2/../../d2')" = 'd2'
-ok 23 - normalize path: d1/s1//../s2/../../d2 => d2
-
-expecting success: test "$(test-tool path-utils normalize_path_copy 'd1/.../d2')" = 'd1/.../d2'
-ok 24 - normalize path: d1/.../d2 => d1/.../d2
-
-expecting success: test "$(test-tool path-utils normalize_path_copy 'd1/..././../d2')" = 'd1/d2'
-ok 25 - normalize path: d1/..././../d2 => d1/d2
-
-expecting success: test "$(test-tool path-utils normalize_path_copy '/')" = '/'
-ok 26 - normalize path: / => /
-
-expecting success: test "$(test-tool path-utils normalize_path_copy '//')" = '/'
-ok 27 - normalize path: // => /
-
-expecting success: test "$(test-tool path-utils normalize_path_copy '///')" = '/'
-ok 28 - normalize path: /// => /
-
-expecting success: test "$(test-tool path-utils normalize_path_copy '/.')" = '/'
-ok 29 - normalize path: /. => /
-
-expecting success: test "$(test-tool path-utils normalize_path_copy '/./')" = '/'
-ok 30 - normalize path: /./ => /
-
-expecting success: test "$(test-tool path-utils normalize_path_copy '/./..')" = '++failed++'
-ok 31 - normalize path: /./.. => ++failed++
-
-expecting success: test "$(test-tool path-utils normalize_path_copy '/../.')" = '++failed++'
-ok 32 - normalize path: /../. => ++failed++
-
-expecting success: test "$(test-tool path-utils normalize_path_copy '/./.././/')" = '++failed++'
-ok 33 - normalize path: /./../.// => ++failed++
-
-expecting success: test "$(test-tool path-utils normalize_path_copy '/dir/..')" = '/'
-ok 34 - normalize path: /dir/.. => /
-
-expecting success: test "$(test-tool path-utils normalize_path_copy '/dir/sub/../..')" = '/'
-ok 35 - normalize path: /dir/sub/../.. => /
-
-expecting success: test "$(test-tool path-utils normalize_path_copy '/dir/sub/../../..')" = '++failed++'
-ok 36 - normalize path: /dir/sub/../../.. => ++failed++
-
-expecting success: test "$(test-tool path-utils normalize_path_copy '/dir')" = '/dir'
-ok 37 - normalize path: /dir => /dir
-
-expecting success: test "$(test-tool path-utils normalize_path_copy '/dir//')" = '/dir/'
-ok 38 - normalize path: /dir// => /dir/
-
-expecting success: test "$(test-tool path-utils normalize_path_copy '/./dir')" = '/dir'
-ok 39 - normalize path: /./dir => /dir
-
-expecting success: test "$(test-tool path-utils normalize_path_copy '/dir/.')" = '/dir/'
-ok 40 - normalize path: /dir/. => /dir/
-
-expecting success: test "$(test-tool path-utils normalize_path_copy '/dir///./')" = '/dir/'
-ok 41 - normalize path: /dir///./ => /dir/
-
-expecting success: test "$(test-tool path-utils normalize_path_copy '/dir//sub/..')" = '/dir/'
-ok 42 - normalize path: /dir//sub/.. => /dir/
-
-expecting success: test "$(test-tool path-utils normalize_path_copy '/dir/sub/../')" = '/dir/'
-ok 43 - normalize path: /dir/sub/../ => /dir/
-
-expecting success: test "$(test-tool path-utils normalize_path_copy '//dir/sub/../.')" = '/dir/'
-ok 44 - normalize path: //dir/sub/../. => /dir/
-
-expecting success: test "$(test-tool path-utils normalize_path_copy '/dir/s1/../s2/')" = '/dir/s2/'
-ok 45 - normalize path: /dir/s1/../s2/ => /dir/s2/
-
-expecting success: test "$(test-tool path-utils normalize_path_copy '/d1/s1///s2/..//../s3/')" = '/d1/s3/'
-ok 46 - normalize path: /d1/s1///s2/..//../s3/ => /d1/s3/
-
-expecting success: test "$(test-tool path-utils normalize_path_copy '/d1/s1//../s2/../../d2')" = '/d2'
-ok 47 - normalize path: /d1/s1//../s2/../../d2 => /d2
-
-expecting success: test "$(test-tool path-utils normalize_path_copy '/d1/.../d2')" = '/d1/.../d2'
-ok 48 - normalize path: /d1/.../d2 => /d1/.../d2
-
-expecting success: test "$(test-tool path-utils normalize_path_copy '/d1/..././../d2')" = '/d1/d2'
-ok 49 - normalize path: /d1/..././../d2 => /d1/d2
-
-expecting success: actual=$(test-tool path-utils longest_ancestor_length '/' '/') &&
-	 test "$actual" = '-1'
-ok 50 - longest ancestor: / / => -1
-
-expecting success: actual=$(test-tool path-utils longest_ancestor_length '/foo' '/') &&
-	 test "$actual" = '0'
-ok 51 - longest ancestor: /foo / => 0
-
-expecting success: actual=$(test-tool path-utils longest_ancestor_length '/foo' '/fo') &&
-	 test "$actual" = '-1'
-ok 52 - longest ancestor: /foo /fo => -1
-
-expecting success: actual=$(test-tool path-utils longest_ancestor_length '/foo' '/foo') &&
-	 test "$actual" = '-1'
-ok 53 - longest ancestor: /foo /foo => -1
-
-expecting success: actual=$(test-tool path-utils longest_ancestor_length '/foo' '/bar') &&
-	 test "$actual" = '-1'
-ok 54 - longest ancestor: /foo /bar => -1
-
-expecting success: actual=$(test-tool path-utils longest_ancestor_length '/foo' '/foo/bar') &&
-	 test "$actual" = '-1'
-ok 55 - longest ancestor: /foo /foo/bar => -1
-
-expecting success: actual=$(test-tool path-utils longest_ancestor_length '/foo' '/foo:/bar') &&
-	 test "$actual" = '-1'
-ok 56 - longest ancestor: /foo /foo:/bar => -1
-
-expecting success: actual=$(test-tool path-utils longest_ancestor_length '/foo' '/:/foo:/bar') &&
-	 test "$actual" = '0'
-ok 57 - longest ancestor: /foo /:/foo:/bar => 0
-
-expecting success: actual=$(test-tool path-utils longest_ancestor_length '/foo' '/foo:/:/bar') &&
-	 test "$actual" = '0'
-ok 58 - longest ancestor: /foo /foo:/:/bar => 0
-
-expecting success: actual=$(test-tool path-utils longest_ancestor_length '/foo' '/:/bar:/foo') &&
-	 test "$actual" = '0'
-ok 59 - longest ancestor: /foo /:/bar:/foo => 0
-
-expecting success: actual=$(test-tool path-utils longest_ancestor_length '/foo/bar' '/') &&
-	 test "$actual" = '0'
-ok 60 - longest ancestor: /foo/bar / => 0
-
-expecting success: actual=$(test-tool path-utils longest_ancestor_length '/foo/bar' '/fo') &&
-	 test "$actual" = '-1'
-ok 61 - longest ancestor: /foo/bar /fo => -1
-
-expecting success: actual=$(test-tool path-utils longest_ancestor_length '/foo/bar' '/foo') &&
-	 test "$actual" = '4'
-ok 62 - longest ancestor: /foo/bar /foo => 4
-
-expecting success: actual=$(test-tool path-utils longest_ancestor_length '/foo/bar' '/foo/ba') &&
-	 test "$actual" = '-1'
-ok 63 - longest ancestor: /foo/bar /foo/ba => -1
-
-expecting success: actual=$(test-tool path-utils longest_ancestor_length '/foo/bar' '/:/fo') &&
-	 test "$actual" = '0'
-ok 64 - longest ancestor: /foo/bar /:/fo => 0
-
-expecting success: actual=$(test-tool path-utils longest_ancestor_length '/foo/bar' '/foo:/foo/ba') &&
-	 test "$actual" = '4'
-ok 65 - longest ancestor: /foo/bar /foo:/foo/ba => 4
-
-expecting success: actual=$(test-tool path-utils longest_ancestor_length '/foo/bar' '/bar') &&
-	 test "$actual" = '-1'
-ok 66 - longest ancestor: /foo/bar /bar => -1
-
-expecting success: actual=$(test-tool path-utils longest_ancestor_length '/foo/bar' '/fo') &&
-	 test "$actual" = '-1'
-ok 67 - longest ancestor: /foo/bar /fo => -1
-
-expecting success: actual=$(test-tool path-utils longest_ancestor_length '/foo/bar' '/foo:/bar') &&
-	 test "$actual" = '4'
-ok 68 - longest ancestor: /foo/bar /foo:/bar => 4
-
-expecting success: actual=$(test-tool path-utils longest_ancestor_length '/foo/bar' '/:/foo:/bar') &&
-	 test "$actual" = '4'
-ok 69 - longest ancestor: /foo/bar /:/foo:/bar => 4
-
-expecting success: actual=$(test-tool path-utils longest_ancestor_length '/foo/bar' '/foo:/:/bar') &&
-	 test "$actual" = '4'
-ok 70 - longest ancestor: /foo/bar /foo:/:/bar => 4
-
-expecting success: actual=$(test-tool path-utils longest_ancestor_length '/foo/bar' '/:/bar:/fo') &&
-	 test "$actual" = '0'
-ok 71 - longest ancestor: /foo/bar /:/bar:/fo => 0
-
-expecting success: actual=$(test-tool path-utils longest_ancestor_length '/foo/bar' '/:/bar') &&
-	 test "$actual" = '0'
-ok 72 - longest ancestor: /foo/bar /:/bar => 0
-
-expecting success: actual=$(test-tool path-utils longest_ancestor_length '/foo/bar' '/foo') &&
-	 test "$actual" = '4'
-ok 73 - longest ancestor: /foo/bar /foo => 4
-
-expecting success: actual=$(test-tool path-utils longest_ancestor_length '/foo/bar' '/foo:/bar') &&
-	 test "$actual" = '4'
-ok 74 - longest ancestor: /foo/bar /foo:/bar => 4
-
-expecting success: actual=$(test-tool path-utils longest_ancestor_length '/foo/bar' '/bar') &&
-	 test "$actual" = '-1'
-ok 75 - longest ancestor: /foo/bar /bar => -1
-
-expecting success: 
-	test c:/msysgit = $(test-tool path-utils strip_path_suffix \
-		c:/msysgit/libexec//git-core libexec/git-core)
-
-ok 76 - strip_path_suffix
-
-expecting success: 
-	test_must_fail test-tool path-utils absolute_path ""
-
-fatal: The empty string is not a valid path
-ok 77 - absolute path rejects the empty string
-
-skipping test: <drive-letter>:\\abc is an absolute path 
-	for letter in : \" C Z 1 ä
-	do
-		path=$letter:\\abc &&
-		absolute="$(test-tool path-utils absolute_path "$path")" &&
-		test "$path" = "$absolute" || return 1
-	done
-
-ok 78 # skip <drive-letter>:\\abc is an absolute path (missing MINGW)
-
-expecting success: 
-	test_must_fail test-tool path-utils real_path ""
-
-fatal: The empty string is not a valid path
-ok 79 - real path rejects the empty string
-
-expecting success: 
-	nopath="hopefully-absent-path" &&
-	test "/" = "$(test-tool path-utils real_path "/")" &&
-	test "/$nopath" = "$(test-tool path-utils real_path "/$nopath")"
-
-ok 80 - real path works on absolute paths 1
-
-expecting success: 
-	nopath="hopefully-absent-path" &&
-	# Find an existing top-level directory for the remaining tests:
-	d=$(pwd -P | sed -e "s|^\([^/]*/[^/]*\)/.*|\1|") &&
-	test "$d" = "$(test-tool path-utils real_path "$d")" &&
-	test "$d/$nopath" = "$(test-tool path-utils real_path "$d/$nopath")"
-
-ok 81 - real path works on absolute paths 2
-
-expecting success: 
-	nopath="hopefully-absent-path" &&
-	test "/" = "$(test-tool path-utils real_path "///")" &&
-	test "/$nopath" = "$(test-tool path-utils real_path "///$nopath")" &&
-	# Find an existing top-level directory for the remaining tests:
-	d=$(pwd -P | sed -e "s|^\([^/]*/[^/]*\)/.*|\1|") &&
-	test "$d" = "$(test-tool path-utils real_path "//$d")" &&
-	test "$d/$nopath" = "$(test-tool path-utils real_path "//$d/$nopath")"
-
-ok 82 - real path removes extra leading slashes
-
-expecting success: 
-	nopath="hopefully-absent-path" &&
-	# Find an existing top-level directory for the remaining tests:
-	d=$(pwd -P | sed -e "s|^\([^/]*/[^/]*\)/.*|\1|") &&
-	test "$d" = "$(test-tool path-utils real_path "$d///")" &&
-	test "$d/$nopath" = "$(test-tool path-utils real_path "$d///$nopath")"
-
-ok 83 - real path removes other extra slashes
-
-checking prerequisite: SYMLINKS
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
-	# test whether the filesystem supports symbolic links
-	ln -s x y && test -h y
-
-)
-prerequisite SYMLINKS ok
-expecting success: 
-	mkdir first &&
-	ln -s ../.git first/.git &&
-	mkdir second &&
-	ln -s ../first second/other &&
-	mkdir third &&
-	dir="$(cd .git; pwd -P)" &&
-	dir2=third/../second/other/.git &&
-	test "$dir" = "$(test-tool path-utils real_path $dir2)" &&
-	file="$dir"/index &&
-	test "$file" = "$(test-tool path-utils real_path $dir2/index)" &&
-	basename=blub &&
-	test "$dir/$basename" = "$(cd .git && test-tool path-utils real_path "$basename")" &&
-	ln -s ../first/file .git/syml &&
-	sym="$(cd first; pwd -P)"/file &&
-	test "$sym" = "$(test-tool path-utils real_path "$dir2/syml")"
-
-ok 84 - real path works on symlinks
-
-expecting success: 
-	ln -s target symlink &&
-	test "$(test-tool path-utils prefix_path prefix "$(pwd)/symlink")" = "symlink"
-
-ok 85 - prefix_path works with absolute paths to work tree symlinks
-
-expecting success: 
-	echo "" >expected &&
-	test-tool path-utils prefix_path prefix "$(pwd)" >actual &&
-	test_cmp expected actual
-
-ok 86 - prefix_path works with only absolute path to work tree
-
-expecting success: 
-	test_must_fail test-tool path-utils prefix_path prefix "$(pwd)a"
-
-fatal: '/build/git-2.20.1/t/trash directory.t0060-path-utilsa' is outside repository
-ok 87 - prefix_path rejects absolute path to dir with same beginning as work tree
-
-expecting success: 
-	git init repo &&
-	ln -s repo repolink &&
-	test "a" = "$(cd repo && test-tool path-utils prefix_path prefix "$(pwd)/../repolink/a")"
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t0060-path-utils/repo/.git/
-ok 88 - prefix_path works with absolute path to a symlink to work tree having  same beginning as work tree
-
-expecting success: test "$(test-tool path-utils relative_path '/foo/a/b/c/' '/foo/a/b/')" = 'c/'
-ok 89 - relative path: /foo/a/b/c/ /foo/a/b/ => c/
-
-expecting success: test "$(test-tool path-utils relative_path '/foo/a/b/c/' '/foo/a/b')" = 'c/'
-ok 90 - relative path: /foo/a/b/c/ /foo/a/b => c/
-
-expecting success: test "$(test-tool path-utils relative_path '/foo/a//b//c/' '///foo/a/b//')" = 'c/'
-ok 91 - relative path: /foo/a//b//c/ ///foo/a/b// => c/
-
-expecting success: test "$(test-tool path-utils relative_path '/foo/a/b' '/foo/a/b')" = './'
-ok 92 - relative path: /foo/a/b /foo/a/b => ./
-
-expecting success: test "$(test-tool path-utils relative_path '/foo/a/b/' '/foo/a/b')" = './'
-ok 93 - relative path: /foo/a/b/ /foo/a/b => ./
-
-expecting success: test "$(test-tool path-utils relative_path '/foo/a' '/foo/a/b')" = '../'
-ok 94 - relative path: /foo/a /foo/a/b => ../
-
-expecting success: test "$(test-tool path-utils relative_path '/' '/foo/a/b/')" = '../../../'
-ok 95 - relative path: / /foo/a/b/ => ../../../
-
-expecting success: test "$(test-tool path-utils relative_path '/foo/a/c' '/foo/a/b/')" = '../c'
-ok 96 - relative path: /foo/a/c /foo/a/b/ => ../c
-
-expecting success: test "$(test-tool path-utils relative_path '/foo/a/c' '/foo/a/b')" = '../c'
-ok 97 - relative path: /foo/a/c /foo/a/b => ../c
-
-expecting success: test "$(test-tool path-utils relative_path '/foo/x/y' '/foo/a/b/')" = '../../x/y'
-ok 98 - relative path: /foo/x/y /foo/a/b/ => ../../x/y
-
-expecting success: test "$(test-tool path-utils relative_path '/foo/a/b' '<empty>')" = '/foo/a/b'
-ok 99 - relative path: /foo/a/b <empty> => /foo/a/b
-
-expecting success: test "$(test-tool path-utils relative_path '/foo/a/b' '<null>')" = '/foo/a/b'
-ok 100 - relative path: /foo/a/b <null> => /foo/a/b
-
-expecting success: test "$(test-tool path-utils relative_path 'foo/a/b/c/' 'foo/a/b/')" = 'c/'
-ok 101 - relative path: foo/a/b/c/ foo/a/b/ => c/
-
-expecting success: test "$(test-tool path-utils relative_path 'foo/a/b/c/' 'foo/a/b')" = 'c/'
-ok 102 - relative path: foo/a/b/c/ foo/a/b => c/
-
-expecting success: test "$(test-tool path-utils relative_path 'foo/a/b//c' 'foo/a//b')" = 'c'
-ok 103 - relative path: foo/a/b//c foo/a//b => c
-
-expecting success: test "$(test-tool path-utils relative_path 'foo/a/b/' 'foo/a/b/')" = './'
-ok 104 - relative path: foo/a/b/ foo/a/b/ => ./
-
-expecting success: test "$(test-tool path-utils relative_path 'foo/a/b/' 'foo/a/b')" = './'
-ok 105 - relative path: foo/a/b/ foo/a/b => ./
-
-expecting success: test "$(test-tool path-utils relative_path 'foo/a' 'foo/a/b')" = '../'
-ok 106 - relative path: foo/a foo/a/b => ../
-
-expecting success: test "$(test-tool path-utils relative_path 'foo/x/y' 'foo/a/b')" = '../../x/y'
-ok 107 - relative path: foo/x/y foo/a/b => ../../x/y
-
-expecting success: test "$(test-tool path-utils relative_path 'foo/a/c' 'foo/a/b')" = '../c'
-ok 108 - relative path: foo/a/c foo/a/b => ../c
-
-expecting success: test "$(test-tool path-utils relative_path 'foo/a/b' '/foo/x/y')" = 'foo/a/b'
-ok 109 - relative path: foo/a/b /foo/x/y => foo/a/b
-
-expecting success: test "$(test-tool path-utils relative_path '/foo/a/b' 'foo/x/y')" = '/foo/a/b'
-ok 110 - relative path: /foo/a/b foo/x/y => /foo/a/b
-
-skipping test: relative path: d:/a/b D:/a/c => ../b test "$(test-tool path-utils relative_path 'd:/a/b' 'D:/a/c')" = '../b'
-ok 111 # skip relative path: d:/a/b D:/a/c => ../b (missing MINGW)
-
-skipping test: relative path: C:/a/b D:/a/c => C:/a/b test "$(test-tool path-utils relative_path 'C:/a/b' 'D:/a/c')" = 'C:/a/b'
-ok 112 # skip relative path: C:/a/b D:/a/c => C:/a/b (missing MINGW)
-
-expecting success: test "$(test-tool path-utils relative_path 'foo/a/b' '<empty>')" = 'foo/a/b'
-ok 113 - relative path: foo/a/b <empty> => foo/a/b
-
-expecting success: test "$(test-tool path-utils relative_path 'foo/a/b' '<null>')" = 'foo/a/b'
-ok 114 - relative path: foo/a/b <null> => foo/a/b
-
-expecting success: test "$(test-tool path-utils relative_path '<empty>' '/foo/a/b')" = './'
-ok 115 - relative path: <empty> /foo/a/b => ./
-
-expecting success: test "$(test-tool path-utils relative_path '<empty>' '<empty>')" = './'
-ok 116 - relative path: <empty> <empty> => ./
-
-expecting success: test "$(test-tool path-utils relative_path '<empty>' '<null>')" = './'
-ok 117 - relative path: <empty> <null> => ./
-
-expecting success: test "$(test-tool path-utils relative_path '<null>' '<empty>')" = './'
-ok 118 - relative path: <null> <empty> => ./
-
-expecting success: test "$(test-tool path-utils relative_path '<null>' '<null>')" = './'
-ok 119 - relative path: <null> <null> => ./
-
-expecting success: test "$(test-tool path-utils relative_path '<null>' '/foo/a/b')" = './'
-ok 120 - relative path: <null> /foo/a/b => ./
-
-expecting success: 
-		A=B git rev-parse --git-path info/grafts >actual &&
-		echo .git/info/grafts >expect &&
-		test_cmp expect actual
-	
-ok 121 - git-path A=B info/grafts => .git/info/grafts
-
-expecting success: 
-		GIT_GRAFT_FILE=foo git rev-parse --git-path info/grafts >actual &&
-		echo foo >expect &&
-		test_cmp expect actual
-	
-ok 122 - git-path GIT_GRAFT_FILE=foo info/grafts => foo
-
-expecting success: 
-		GIT_GRAFT_FILE=foo git rev-parse --git-path info/////grafts >actual &&
-		echo foo >expect &&
-		test_cmp expect actual
-	
-ok 123 - git-path GIT_GRAFT_FILE=foo info/////grafts => foo
-
-expecting success: 
-		GIT_INDEX_FILE=foo git rev-parse --git-path index >actual &&
-		echo foo >expect &&
-		test_cmp expect actual
-	
-ok 124 - git-path GIT_INDEX_FILE=foo index => foo
-
-expecting success: 
-		GIT_INDEX_FILE=foo git rev-parse --git-path index/foo >actual &&
-		echo .git/index/foo >expect &&
-		test_cmp expect actual
-	
-ok 125 - git-path GIT_INDEX_FILE=foo index/foo => .git/index/foo
-
-expecting success: 
-		GIT_INDEX_FILE=foo git rev-parse --git-path index2 >actual &&
-		echo .git/index2 >expect &&
-		test_cmp expect actual
-	
-ok 126 - git-path GIT_INDEX_FILE=foo index2 => .git/index2
-
-expecting success: mkdir foo
-ok 127 - setup fake objects directory foo
-
-expecting success: 
-		GIT_OBJECT_DIRECTORY=foo git rev-parse --git-path objects >actual &&
-		echo foo >expect &&
-		test_cmp expect actual
-	
-ok 128 - git-path GIT_OBJECT_DIRECTORY=foo objects => foo
-
-expecting success: 
-		GIT_OBJECT_DIRECTORY=foo git rev-parse --git-path objects/foo >actual &&
-		echo foo/foo >expect &&
-		test_cmp expect actual
-	
-ok 129 - git-path GIT_OBJECT_DIRECTORY=foo objects/foo => foo/foo
-
-expecting success: 
-		GIT_OBJECT_DIRECTORY=foo git rev-parse --git-path objects2 >actual &&
-		echo .git/objects2 >expect &&
-		test_cmp expect actual
-	
-ok 130 - git-path GIT_OBJECT_DIRECTORY=foo objects2 => .git/objects2
-
-expecting success: git --git-dir=bar init
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t0060-path-utils/bar/
-ok 131 - setup common repository
-
-expecting success: 
-		GIT_COMMON_DIR=bar git rev-parse --git-path index >actual &&
-		echo .git/index >expect &&
-		test_cmp expect actual
-	
-ok 132 - git-path GIT_COMMON_DIR=bar index => .git/index
-
-expecting success: 
-		GIT_COMMON_DIR=bar git rev-parse --git-path HEAD >actual &&
-		echo .git/HEAD >expect &&
-		test_cmp expect actual
-	
-ok 133 - git-path GIT_COMMON_DIR=bar HEAD => .git/HEAD
-
-expecting success: 
-		GIT_COMMON_DIR=bar git rev-parse --git-path logs/HEAD >actual &&
-		echo .git/logs/HEAD >expect &&
-		test_cmp expect actual
-	
-ok 134 - git-path GIT_COMMON_DIR=bar logs/HEAD => .git/logs/HEAD
-
-expecting success: 
-		GIT_COMMON_DIR=bar git rev-parse --git-path logs/refs/bisect/foo >actual &&
-		echo .git/logs/refs/bisect/foo >expect &&
-		test_cmp expect actual
-	
-ok 135 - git-path GIT_COMMON_DIR=bar logs/refs/bisect/foo => .git/logs/refs/bisect/foo
-
-expecting success: 
-		GIT_COMMON_DIR=bar git rev-parse --git-path logs/refs/bisec/foo >actual &&
-		echo bar/logs/refs/bisec/foo >expect &&
-		test_cmp expect actual
-	
-ok 136 - git-path GIT_COMMON_DIR=bar logs/refs/bisec/foo => bar/logs/refs/bisec/foo
-
-expecting success: 
-		GIT_COMMON_DIR=bar git rev-parse --git-path logs/refs/bisec >actual &&
-		echo bar/logs/refs/bisec >expect &&
-		test_cmp expect actual
-	
-ok 137 - git-path GIT_COMMON_DIR=bar logs/refs/bisec => bar/logs/refs/bisec
-
-expecting success: 
-		GIT_COMMON_DIR=bar git rev-parse --git-path logs/refs/bisectfoo >actual &&
-		echo bar/logs/refs/bisectfoo >expect &&
-		test_cmp expect actual
-	
-ok 138 - git-path GIT_COMMON_DIR=bar logs/refs/bisectfoo => bar/logs/refs/bisectfoo
-
-expecting success: 
-		GIT_COMMON_DIR=bar git rev-parse --git-path objects >actual &&
-		echo bar/objects >expect &&
-		test_cmp expect actual
-	
-ok 139 - git-path GIT_COMMON_DIR=bar objects => bar/objects
-
-expecting success: 
-		GIT_COMMON_DIR=bar git rev-parse --git-path objects/bar >actual &&
-		echo bar/objects/bar >expect &&
-		test_cmp expect actual
-	
-ok 140 - git-path GIT_COMMON_DIR=bar objects/bar => bar/objects/bar
-
-expecting success: 
-		GIT_COMMON_DIR=bar git rev-parse --git-path info/exclude >actual &&
-		echo bar/info/exclude >expect &&
-		test_cmp expect actual
-	
-ok 141 - git-path GIT_COMMON_DIR=bar info/exclude => bar/info/exclude
-
-expecting success: 
-		GIT_COMMON_DIR=bar git rev-parse --git-path info/grafts >actual &&
-		echo bar/info/grafts >expect &&
-		test_cmp expect actual
-	
-ok 142 - git-path GIT_COMMON_DIR=bar info/grafts => bar/info/grafts
-
-expecting success: 
-		GIT_COMMON_DIR=bar git rev-parse --git-path info/sparse-checkout >actual &&
-		echo .git/info/sparse-checkout >expect &&
-		test_cmp expect actual
-	
-ok 143 - git-path GIT_COMMON_DIR=bar info/sparse-checkout => .git/info/sparse-checkout
-
-expecting success: 
-		GIT_COMMON_DIR=bar git rev-parse --git-path info//sparse-checkout >actual &&
-		echo .git/info//sparse-checkout >expect &&
-		test_cmp expect actual
-	
-ok 144 - git-path GIT_COMMON_DIR=bar info//sparse-checkout => .git/info//sparse-checkout
-
-expecting success: 
-		GIT_COMMON_DIR=bar git rev-parse --git-path remotes/bar >actual &&
-		echo bar/remotes/bar >expect &&
-		test_cmp expect actual
-	
-ok 145 - git-path GIT_COMMON_DIR=bar remotes/bar => bar/remotes/bar
-
-expecting success: 
-		GIT_COMMON_DIR=bar git rev-parse --git-path branches/bar >actual &&
-		echo bar/branches/bar >expect &&
-		test_cmp expect actual
-	
-ok 146 - git-path GIT_COMMON_DIR=bar branches/bar => bar/branches/bar
-
-expecting success: 
-		GIT_COMMON_DIR=bar git rev-parse --git-path logs/refs/heads/master >actual &&
-		echo bar/logs/refs/heads/master >expect &&
-		test_cmp expect actual
-	
-ok 147 - git-path GIT_COMMON_DIR=bar logs/refs/heads/master => bar/logs/refs/heads/master
-
-expecting success: 
-		GIT_COMMON_DIR=bar git rev-parse --git-path refs/heads/master >actual &&
-		echo bar/refs/heads/master >expect &&
-		test_cmp expect actual
-	
-ok 148 - git-path GIT_COMMON_DIR=bar refs/heads/master => bar/refs/heads/master
-
-expecting success: 
-		GIT_COMMON_DIR=bar git rev-parse --git-path refs/bisect/foo >actual &&
-		echo .git/refs/bisect/foo >expect &&
-		test_cmp expect actual
-	
-ok 149 - git-path GIT_COMMON_DIR=bar refs/bisect/foo => .git/refs/bisect/foo
-
-expecting success: 
-		GIT_COMMON_DIR=bar git rev-parse --git-path hooks/me >actual &&
-		echo bar/hooks/me >expect &&
-		test_cmp expect actual
-	
-ok 150 - git-path GIT_COMMON_DIR=bar hooks/me => bar/hooks/me
-
-expecting success: 
-		GIT_COMMON_DIR=bar git rev-parse --git-path config >actual &&
-		echo bar/config >expect &&
-		test_cmp expect actual
-	
-ok 151 - git-path GIT_COMMON_DIR=bar config => bar/config
-
-expecting success: 
-		GIT_COMMON_DIR=bar git rev-parse --git-path packed-refs >actual &&
-		echo bar/packed-refs >expect &&
-		test_cmp expect actual
-	
-ok 152 - git-path GIT_COMMON_DIR=bar packed-refs => bar/packed-refs
-
-expecting success: 
-		GIT_COMMON_DIR=bar git rev-parse --git-path shallow >actual &&
-		echo bar/shallow >expect &&
-		test_cmp expect actual
-	
-ok 153 - git-path GIT_COMMON_DIR=bar shallow => bar/shallow
-
-expecting success: 
-		GIT_COMMON_DIR=bar git rev-parse --git-path common >actual &&
-		echo bar/common >expect &&
-		test_cmp expect actual
-	
-ok 154 - git-path GIT_COMMON_DIR=bar common => bar/common
-
-expecting success: 
-		GIT_COMMON_DIR=bar git rev-parse --git-path common/file >actual &&
-		echo bar/common/file >expect &&
-		test_cmp expect actual
-	
-ok 155 - git-path GIT_COMMON_DIR=bar common/file => bar/common/file
-
-expecting success: 
-		actual=$(git submodule--helper resolve-relative-url-test '../' '../foo' '../submodule') &&
-		test "$actual" = '../../submodule'
-	
-ok 156 - test_submodule_relative_url: ../ ../foo ../submodule => ../../submodule
-
-expecting success: 
-		actual=$(git submodule--helper resolve-relative-url-test '../' '../foo/bar' '../submodule') &&
-		test "$actual" = '../../foo/submodule'
-	
-ok 157 - test_submodule_relative_url: ../ ../foo/bar ../submodule => ../../foo/submodule
-
-expecting success: 
-		actual=$(git submodule--helper resolve-relative-url-test '../' '../foo/submodule' '../submodule') &&
-		test "$actual" = '../../foo/submodule'
-	
-ok 158 - test_submodule_relative_url: ../ ../foo/submodule ../submodule => ../../foo/submodule
-
-expecting success: 
-		actual=$(git submodule--helper resolve-relative-url-test '../' './foo' '../submodule') &&
-		test "$actual" = '../submodule'
-	
-ok 159 - test_submodule_relative_url: ../ ./foo ../submodule => ../submodule
-
-expecting success: 
-		actual=$(git submodule--helper resolve-relative-url-test '../' './foo/bar' '../submodule') &&
-		test "$actual" = '../foo/submodule'
-	
-ok 160 - test_submodule_relative_url: ../ ./foo/bar ../submodule => ../foo/submodule
-
-expecting success: 
-		actual=$(git submodule--helper resolve-relative-url-test '../../../' '../foo/bar' '../sub/a/b/c') &&
-		test "$actual" = '../../../../foo/sub/a/b/c'
-	
-ok 161 - test_submodule_relative_url: ../../../ ../foo/bar ../sub/a/b/c => ../../../../foo/sub/a/b/c
-
-expecting success: 
-		actual=$(git submodule--helper resolve-relative-url-test '../' '/build/git-2.20.1/t/trash directory.t0060-path-utils/addtest' '../repo') &&
-		test "$actual" = '/build/git-2.20.1/t/trash directory.t0060-path-utils/repo'
-	
-ok 162 - test_submodule_relative_url: ../ /build/git-2.20.1/t/trash directory.t0060-path-utils/addtest ../repo => /build/git-2.20.1/t/trash directory.t0060-path-utils/repo
-
-expecting success: 
-		actual=$(git submodule--helper resolve-relative-url-test '../' 'foo/bar' '../submodule') &&
-		test "$actual" = '../foo/submodule'
-	
-ok 163 - test_submodule_relative_url: ../ foo/bar ../submodule => ../foo/submodule
-
-expecting success: 
-		actual=$(git submodule--helper resolve-relative-url-test '../' 'foo' '../submodule') &&
-		test "$actual" = '../submodule'
-	
-ok 164 - test_submodule_relative_url: ../ foo ../submodule => ../submodule
-
-expecting success: 
-		actual=$(git submodule--helper resolve-relative-url-test '(null)' '../foo/bar' '../sub/a/b/c') &&
-		test "$actual" = '../foo/sub/a/b/c'
-	
-ok 165 - test_submodule_relative_url: (null) ../foo/bar ../sub/a/b/c => ../foo/sub/a/b/c
-
-expecting success: 
-		actual=$(git submodule--helper resolve-relative-url-test '(null)' '../foo/bar' '../sub/a/b/c/') &&
-		test "$actual" = '../foo/sub/a/b/c'
-	
-ok 166 - test_submodule_relative_url: (null) ../foo/bar ../sub/a/b/c/ => ../foo/sub/a/b/c
-
-expecting success: 
-		actual=$(git submodule--helper resolve-relative-url-test '(null)' '../foo/bar/' '../sub/a/b/c') &&
-		test "$actual" = '../foo/sub/a/b/c'
-	
-ok 167 - test_submodule_relative_url: (null) ../foo/bar/ ../sub/a/b/c => ../foo/sub/a/b/c
-
-expecting success: 
-		actual=$(git submodule--helper resolve-relative-url-test '(null)' '../foo/bar' '../submodule') &&
-		test "$actual" = '../foo/submodule'
-	
-ok 168 - test_submodule_relative_url: (null) ../foo/bar ../submodule => ../foo/submodule
-
-expecting success: 
-		actual=$(git submodule--helper resolve-relative-url-test '(null)' '../foo/submodule' '../submodule') &&
-		test "$actual" = '../foo/submodule'
-	
-ok 169 - test_submodule_relative_url: (null) ../foo/submodule ../submodule => ../foo/submodule
-
-expecting success: 
-		actual=$(git submodule--helper resolve-relative-url-test '(null)' '../foo' '../submodule') &&
-		test "$actual" = '../submodule'
-	
-ok 170 - test_submodule_relative_url: (null) ../foo ../submodule => ../submodule
-
-expecting success: 
-		actual=$(git submodule--helper resolve-relative-url-test '(null)' './foo/bar' '../submodule') &&
-		test "$actual" = 'foo/submodule'
-	
-ok 171 - test_submodule_relative_url: (null) ./foo/bar ../submodule => foo/submodule
-
-expecting success: 
-		actual=$(git submodule--helper resolve-relative-url-test '(null)' './foo' '../submodule') &&
-		test "$actual" = 'submodule'
-	
-ok 172 - test_submodule_relative_url: (null) ./foo ../submodule => submodule
-
-expecting success: 
-		actual=$(git submodule--helper resolve-relative-url-test '(null)' '//somewhere else/repo' '../subrepo') &&
-		test "$actual" = '//somewhere else/subrepo'
-	
-ok 173 - test_submodule_relative_url: (null) //somewhere else/repo ../subrepo => //somewhere else/subrepo
-
-expecting success: 
-		actual=$(git submodule--helper resolve-relative-url-test '(null)' '//somewhere else/repo' '../../subrepo') &&
-		test "$actual" = '//subrepo'
-	
-ok 174 - test_submodule_relative_url: (null) //somewhere else/repo ../../subrepo => //subrepo
-
-expecting success: 
-		actual=$(git submodule--helper resolve-relative-url-test '(null)' '//somewhere else/repo' '../../../subrepo') &&
-		test "$actual" = '/subrepo'
-	
-ok 175 - test_submodule_relative_url: (null) //somewhere else/repo ../../../subrepo => /subrepo
-
-expecting success: 
-		actual=$(git submodule--helper resolve-relative-url-test '(null)' '//somewhere else/repo' '../../../../subrepo') &&
-		test "$actual" = 'subrepo'
-	
-ok 176 - test_submodule_relative_url: (null) //somewhere else/repo ../../../../subrepo => subrepo
-
-expecting success: 
-		actual=$(git submodule--helper resolve-relative-url-test '(null)' '/build/git-2.20.1/t/trash directory.t0060-path-utils/subsuper_update_r' '../subsubsuper_update_r') &&
-		test "$actual" = '/build/git-2.20.1/t/trash directory.t0060-path-utils/subsubsuper_update_r'
-	
-ok 177 - test_submodule_relative_url: (null) /build/git-2.20.1/t/trash directory.t0060-path-utils/subsuper_update_r ../subsubsuper_update_r => /build/git-2.20.1/t/trash directory.t0060-path-utils/subsubsuper_update_r
-
-expecting success: 
-		actual=$(git submodule--helper resolve-relative-url-test '(null)' '/build/git-2.20.1/t/trash directory.t0060-path-utils/super_update_r2' '../subsuper_update_r') &&
-		test "$actual" = '/build/git-2.20.1/t/trash directory.t0060-path-utils/subsuper_update_r'
-	
-ok 178 - test_submodule_relative_url: (null) /build/git-2.20.1/t/trash directory.t0060-path-utils/super_update_r2 ../subsuper_update_r => /build/git-2.20.1/t/trash directory.t0060-path-utils/subsuper_update_r
-
-expecting success: 
-		actual=$(git submodule--helper resolve-relative-url-test '(null)' '/build/git-2.20.1/t/trash directory.t0060-path-utils/.' '../.') &&
-		test "$actual" = '/build/git-2.20.1/t/trash directory.t0060-path-utils/.'
-	
-ok 179 - test_submodule_relative_url: (null) /build/git-2.20.1/t/trash directory.t0060-path-utils/. ../. => /build/git-2.20.1/t/trash directory.t0060-path-utils/.
-
-expecting success: 
-		actual=$(git submodule--helper resolve-relative-url-test '(null)' '/build/git-2.20.1/t/trash directory.t0060-path-utils' './.') &&
-		test "$actual" = '/build/git-2.20.1/t/trash directory.t0060-path-utils/.'
-	
-ok 180 - test_submodule_relative_url: (null) /build/git-2.20.1/t/trash directory.t0060-path-utils ./. => /build/git-2.20.1/t/trash directory.t0060-path-utils/.
-
-expecting success: 
-		actual=$(git submodule--helper resolve-relative-url-test '(null)' '/build/git-2.20.1/t/trash directory.t0060-path-utils/addtest' '../repo') &&
-		test "$actual" = '/build/git-2.20.1/t/trash directory.t0060-path-utils/repo'
-	
-ok 181 - test_submodule_relative_url: (null) /build/git-2.20.1/t/trash directory.t0060-path-utils/addtest ../repo => /build/git-2.20.1/t/trash directory.t0060-path-utils/repo
-
-expecting success: 
-		actual=$(git submodule--helper resolve-relative-url-test '(null)' '/build/git-2.20.1/t/trash directory.t0060-path-utils' './å äö') &&
-		test "$actual" = '/build/git-2.20.1/t/trash directory.t0060-path-utils/å äö'
-	
-ok 182 - test_submodule_relative_url: (null) /build/git-2.20.1/t/trash directory.t0060-path-utils ./å äö => /build/git-2.20.1/t/trash directory.t0060-path-utils/å äö
-
-expecting success: 
-		actual=$(git submodule--helper resolve-relative-url-test '(null)' '/build/git-2.20.1/t/trash directory.t0060-path-utils/.' '../submodule') &&
-		test "$actual" = '/build/git-2.20.1/t/trash directory.t0060-path-utils/submodule'
-	
-ok 183 - test_submodule_relative_url: (null) /build/git-2.20.1/t/trash directory.t0060-path-utils/. ../submodule => /build/git-2.20.1/t/trash directory.t0060-path-utils/submodule
-
-expecting success: 
-		actual=$(git submodule--helper resolve-relative-url-test '(null)' '/build/git-2.20.1/t/trash directory.t0060-path-utils/submodule' '../submodule') &&
-		test "$actual" = '/build/git-2.20.1/t/trash directory.t0060-path-utils/submodule'
-	
-ok 184 - test_submodule_relative_url: (null) /build/git-2.20.1/t/trash directory.t0060-path-utils/submodule ../submodule => /build/git-2.20.1/t/trash directory.t0060-path-utils/submodule
-
-expecting success: 
-		actual=$(git submodule--helper resolve-relative-url-test '(null)' '/build/git-2.20.1/t/trash directory.t0060-path-utils/home2/../remote' '../bundle1') &&
-		test "$actual" = '/build/git-2.20.1/t/trash directory.t0060-path-utils/home2/../bundle1'
-	
-ok 185 - test_submodule_relative_url: (null) /build/git-2.20.1/t/trash directory.t0060-path-utils/home2/../remote ../bundle1 => /build/git-2.20.1/t/trash directory.t0060-path-utils/home2/../bundle1
-
-expecting success: 
-		actual=$(git submodule--helper resolve-relative-url-test '(null)' '/build/git-2.20.1/t/trash directory.t0060-path-utils/submodule_update_repo' './.') &&
-		test "$actual" = '/build/git-2.20.1/t/trash directory.t0060-path-utils/submodule_update_repo/.'
-	
-ok 186 - test_submodule_relative_url: (null) /build/git-2.20.1/t/trash directory.t0060-path-utils/submodule_update_repo ./. => /build/git-2.20.1/t/trash directory.t0060-path-utils/submodule_update_repo/.
-
-expecting success: 
-		actual=$(git submodule--helper resolve-relative-url-test '(null)' 'file:///tmp/repo' '../subrepo') &&
-		test "$actual" = 'file:///tmp/subrepo'
-	
-ok 187 - test_submodule_relative_url: (null) file:///tmp/repo ../subrepo => file:///tmp/subrepo
-
-expecting success: 
-		actual=$(git submodule--helper resolve-relative-url-test '(null)' 'foo/bar' '../submodule') &&
-		test "$actual" = 'foo/submodule'
-	
-ok 188 - test_submodule_relative_url: (null) foo/bar ../submodule => foo/submodule
-
-expecting success: 
-		actual=$(git submodule--helper resolve-relative-url-test '(null)' 'foo' '../submodule') &&
-		test "$actual" = 'submodule'
-	
-ok 189 - test_submodule_relative_url: (null) foo ../submodule => submodule
-
-expecting success: 
-		actual=$(git submodule--helper resolve-relative-url-test '(null)' 'helper:://hostname/repo' '../subrepo') &&
-		test "$actual" = 'helper:://hostname/subrepo'
-	
-ok 190 - test_submodule_relative_url: (null) helper:://hostname/repo ../subrepo => helper:://hostname/subrepo
-
-expecting success: 
-		actual=$(git submodule--helper resolve-relative-url-test '(null)' 'helper:://hostname/repo' '../../subrepo') &&
-		test "$actual" = 'helper:://subrepo'
-	
-ok 191 - test_submodule_relative_url: (null) helper:://hostname/repo ../../subrepo => helper:://subrepo
-
-expecting success: 
-		actual=$(git submodule--helper resolve-relative-url-test '(null)' 'helper:://hostname/repo' '../../../subrepo') &&
-		test "$actual" = 'helper::/subrepo'
-	
-ok 192 - test_submodule_relative_url: (null) helper:://hostname/repo ../../../subrepo => helper::/subrepo
-
-expecting success: 
-		actual=$(git submodule--helper resolve-relative-url-test '(null)' 'helper:://hostname/repo' '../../../../subrepo') &&
-		test "$actual" = 'helper::subrepo'
-	
-ok 193 - test_submodule_relative_url: (null) helper:://hostname/repo ../../../../subrepo => helper::subrepo
-
-expecting success: 
-		actual=$(git submodule--helper resolve-relative-url-test '(null)' 'helper:://hostname/repo' '../../../../../subrepo') &&
-		test "$actual" = 'helper:subrepo'
-	
-ok 194 - test_submodule_relative_url: (null) helper:://hostname/repo ../../../../../subrepo => helper:subrepo
-
-expecting success: 
-		actual=$(git submodule--helper resolve-relative-url-test '(null)' 'helper:://hostname/repo' '../../../../../../subrepo') &&
-		test "$actual" = '.:subrepo'
-	
-ok 195 - test_submodule_relative_url: (null) helper:://hostname/repo ../../../../../../subrepo => .:subrepo
-
-expecting success: 
-		actual=$(git submodule--helper resolve-relative-url-test '(null)' 'ssh://hostname/repo' '../subrepo') &&
-		test "$actual" = 'ssh://hostname/subrepo'
-	
-ok 196 - test_submodule_relative_url: (null) ssh://hostname/repo ../subrepo => ssh://hostname/subrepo
-
-expecting success: 
-		actual=$(git submodule--helper resolve-relative-url-test '(null)' 'ssh://hostname/repo' '../../subrepo') &&
-		test "$actual" = 'ssh://subrepo'
-	
-ok 197 - test_submodule_relative_url: (null) ssh://hostname/repo ../../subrepo => ssh://subrepo
-
-expecting success: 
-		actual=$(git submodule--helper resolve-relative-url-test '(null)' 'ssh://hostname/repo' '../../../subrepo') &&
-		test "$actual" = 'ssh:/subrepo'
-	
-ok 198 - test_submodule_relative_url: (null) ssh://hostname/repo ../../../subrepo => ssh:/subrepo
-
-expecting success: 
-		actual=$(git submodule--helper resolve-relative-url-test '(null)' 'ssh://hostname/repo' '../../../../subrepo') &&
-		test "$actual" = 'ssh:subrepo'
-	
-ok 199 - test_submodule_relative_url: (null) ssh://hostname/repo ../../../../subrepo => ssh:subrepo
-
-expecting success: 
-		actual=$(git submodule--helper resolve-relative-url-test '(null)' 'ssh://hostname/repo' '../../../../../subrepo') &&
-		test "$actual" = '.:subrepo'
-	
-ok 200 - test_submodule_relative_url: (null) ssh://hostname/repo ../../../../../subrepo => .:subrepo
-
-expecting success: 
-		actual=$(git submodule--helper resolve-relative-url-test '(null)' 'ssh://hostname:22/repo' '../subrepo') &&
-		test "$actual" = 'ssh://hostname:22/subrepo'
-	
-ok 201 - test_submodule_relative_url: (null) ssh://hostname:22/repo ../subrepo => ssh://hostname:22/subrepo
-
-expecting success: 
-		actual=$(git submodule--helper resolve-relative-url-test '(null)' 'user@host:path/to/repo' '../subrepo') &&
-		test "$actual" = 'user@host:path/to/subrepo'
-	
-ok 202 - test_submodule_relative_url: (null) user@host:path/to/repo ../subrepo => user@host:path/to/subrepo
-
-expecting success: 
-		actual=$(git submodule--helper resolve-relative-url-test '(null)' 'user@host:repo' '../subrepo') &&
-		test "$actual" = 'user@host:subrepo'
-	
-ok 203 - test_submodule_relative_url: (null) user@host:repo ../subrepo => user@host:subrepo
-
-expecting success: 
-		actual=$(git submodule--helper resolve-relative-url-test '(null)' 'user@host:repo' '../../subrepo') &&
-		test "$actual" = '.:subrepo'
-	
-ok 204 - test_submodule_relative_url: (null) user@host:repo ../../subrepo => .:subrepo
-
-expecting success: 
-	test-tool path-utils is_dotgitmodules \
-		.gitmodules \
-		\
-		.git${u200c}modules \
-		\
-		.Gitmodules \
-		.gitmoduleS \
-		\
-		".gitmodules " \
-		".gitmodules." \
-		".gitmodules  " \
-		".gitmodules. " \
-		".gitmodules ." \
-		".gitmodules.." \
-		".gitmodules   " \
-		".gitmodules.  " \
-		".gitmodules . " \
-		".gitmodules  ." \
-		\
-		".Gitmodules " \
-		".Gitmodules." \
-		".Gitmodules  " \
-		".Gitmodules. " \
-		".Gitmodules ." \
-		".Gitmodules.." \
-		".Gitmodules   " \
-		".Gitmodules.  " \
-		".Gitmodules . " \
-		".Gitmodules  ." \
-		\
-		GITMOD~1 \
-		gitmod~1 \
-		GITMOD~2 \
-		gitmod~3 \
-		GITMOD~4 \
-		\
-		"GITMOD~1 " \
-		"gitmod~2." \
-		"GITMOD~3  " \
-		"gitmod~4. " \
-		"GITMOD~1 ." \
-		"gitmod~2   " \
-		"GITMOD~3.  " \
-		"gitmod~4 . " \
-		\
-		GI7EBA~1 \
-		gi7eba~9 \
-		\
-		GI7EB~10 \
-		GI7EB~11 \
-		GI7EB~99 \
-		GI7EB~10 \
-		GI7E~100 \
-		GI7E~101 \
-		GI7E~999 \
-		~1000000 \
-		~9999999 \
-		\
-		.gitmodules:\$DATA \
-		"gitmod~4 . :\$DATA" \
-		\
-		--not \
-		".gitmodules x"  \
-		".gitmodules .x" \
-		\
-		" .gitmodules" \
-		\
-		..gitmodules \
-		\
-		gitmodules \
-		\
-		.gitmodule \
-		\
-		".gitmodules x " \
-		".gitmodules .x" \
-		\
-		GI7EBA~ \
-		GI7EBA~0 \
-		GI7EBA~~1 \
-		GI7EBA~X \
-		Gx7EBA~1 \
-		GI7EBX~1 \
-		\
-		GI7EB~1 \
-		GI7EB~01 \
-		GI7EB~1X \
-		\
-		.gitmodules,:\$DATA
-
-ok: '.gitmodules' is .gitmodules
-ok: '.git‌modules' is .gitmodules
-ok: '.Gitmodules' is .gitmodules
-ok: '.gitmoduleS' is .gitmodules
-ok: '.gitmodules ' is .gitmodules
-ok: '.gitmodules.' is .gitmodules
-ok: '.gitmodules  ' is .gitmodules
-ok: '.gitmodules. ' is .gitmodules
-ok: '.gitmodules .' is .gitmodules
-ok: '.gitmodules..' is .gitmodules
-ok: '.gitmodules   ' is .gitmodules
-ok: '.gitmodules.  ' is .gitmodules
-ok: '.gitmodules . ' is .gitmodules
-ok: '.gitmodules  .' is .gitmodules
-ok: '.Gitmodules ' is .gitmodules
-ok: '.Gitmodules.' is .gitmodules
-ok: '.Gitmodules  ' is .gitmodules
-ok: '.Gitmodules. ' is .gitmodules
-ok: '.Gitmodules .' is .gitmodules
-ok: '.Gitmodules..' is .gitmodules
-ok: '.Gitmodules   ' is .gitmodules
-ok: '.Gitmodules.  ' is .gitmodules
-ok: '.Gitmodules . ' is .gitmodules
-ok: '.Gitmodules  .' is .gitmodules
-ok: 'GITMOD~1' is .gitmodules
-ok: 'gitmod~1' is .gitmodules
-ok: 'GITMOD~2' is .gitmodules
-ok: 'gitmod~3' is .gitmodules
-ok: 'GITMOD~4' is .gitmodules
-ok: 'GITMOD~1 ' is .gitmodules
-ok: 'gitmod~2.' is .gitmodules
-ok: 'GITMOD~3  ' is .gitmodules
-ok: 'gitmod~4. ' is .gitmodules
-ok: 'GITMOD~1 .' is .gitmodules
-ok: 'gitmod~2   ' is .gitmodules
-ok: 'GITMOD~3.  ' is .gitmodules
-ok: 'gitmod~4 . ' is .gitmodules
-ok: 'GI7EBA~1' is .gitmodules
-ok: 'gi7eba~9' is .gitmodules
-ok: 'GI7EB~10' is .gitmodules
-ok: 'GI7EB~11' is .gitmodules
-ok: 'GI7EB~99' is .gitmodules
-ok: 'GI7EB~10' is .gitmodules
-ok: 'GI7E~100' is .gitmodules
-ok: 'GI7E~101' is .gitmodules
-ok: 'GI7E~999' is .gitmodules
-ok: '~1000000' is .gitmodules
-ok: '~9999999' is .gitmodules
-ok: '.gitmodules:$DATA' is .gitmodules
-ok: 'gitmod~4 . :$DATA' is .gitmodules
-ok: '.gitmodules x' is not .gitmodules
-ok: '.gitmodules .x' is not .gitmodules
-ok: ' .gitmodules' is not .gitmodules
-ok: '..gitmodules' is not .gitmodules
-ok: 'gitmodules' is not .gitmodules
-ok: '.gitmodule' is not .gitmodules
-ok: '.gitmodules x ' is not .gitmodules
-ok: '.gitmodules .x' is not .gitmodules
-ok: 'GI7EBA~' is not .gitmodules
-ok: 'GI7EBA~0' is not .gitmodules
-ok: 'GI7EBA~~1' is not .gitmodules
-ok: 'GI7EBA~X' is not .gitmodules
-ok: 'Gx7EBA~1' is not .gitmodules
-ok: 'GI7EBX~1' is not .gitmodules
-ok: 'GI7EB~1' is not .gitmodules
-ok: 'GI7EB~01' is not .gitmodules
-ok: 'GI7EB~1X' is not .gitmodules
-ok: '.gitmodules,:$DATA' is not .gitmodules
-ok 205 - match .gitmodules
-
-skipping test: is_valid_path() on Windows 
-       test-tool path-utils is_valid_path \
-		win32 \
-		"win32 x" \
-		../hello.txt \
-		C:\\git \
-		\
-		--not \
-		"win32 "  \
-		"win32 /x "  \
-		"win32."  \
-		"win32 . ." \
-		.../hello.txt \
-		colon:test
-
-ok 206 # skip is_valid_path() on Windows (missing MINGW)
-
-# passed all 206 test(s)
-1..206
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
 *** t1020-subdirectory.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1020-subdirectory/.git/
 expecting success: 
@@ -22814,14 +20816,14 @@
 		git show -s HEAD
 	)
 
-[master (root-commit) ae8b565] 1
+[master (root-commit) aa50f75] 1
  Author: A U Thor <author@example.com>
  2 files changed, 58 insertions(+)
  create mode 100644 dir/two
  create mode 100644 one
-commit ae8b56502dc2c3764db7337f7f02a5a0ec252e7f
+commit aa50f75d8bfc041dacbb0cd05ec2c62fb65d2491
 Author: A U Thor <author@example.com>
-Date:   Fri Dec 3 05:04:33 2021 +0000
+Date:   Thu Jan 5 11:46:43 2023 +0000
 
     1
 ok 12 - no file/rev ambiguity check inside .git
@@ -22839,9 +20841,9 @@
 
 Cloning into bare repository 'foo.git'...
 done.
-commit ae8b56502dc2c3764db7337f7f02a5a0ec252e7f
+commit aa50f75d8bfc041dacbb0cd05ec2c62fb65d2491
 Author: A U Thor <author@example.com>
-Date:   Fri Dec 3 05:04:33 2021 +0000
+Date:   Thu Jan 5 11:46:43 2023 +0000
 
     1
 ok 13 - no file/rev ambiguity check inside a bare repo (explicit GIT_DIR)
@@ -22856,9 +20858,9 @@
 
 Cloning into bare repository 'foo.git'...
 done.
-commit ae8b56502dc2c3764db7337f7f02a5a0ec252e7f
+commit aa50f75d8bfc041dacbb0cd05ec2c62fb65d2491
 Author: A U Thor <author@example.com>
-Date:   Fri Dec 3 05:04:33 2021 +0000
+Date:   Thu Jan 5 11:46:43 2023 +0000
 
     1
 ok 14 - no file/rev ambiguity check inside a bare repo
@@ -22883,9 +20885,9 @@
 
 Cloning into 'another'...
 done.
-commit ae8b56502dc2c3764db7337f7f02a5a0ec252e7f
+commit aa50f75d8bfc041dacbb0cd05ec2c62fb65d2491
 Author: A U Thor <author@example.com>
-Date:   Fri Dec 3 05:04:33 2021 +0000
+Date:   Thu Jan 5 11:46:43 2023 +0000
 
     1
 ok 15 - detection should not be fooled by a symlink
@@ -22894,546 +20896,717 @@
 1..15
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t1014-read-tree-confusing.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1014-read-tree-confusing/.git/
+*** t1051-large-conversion.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1051-large-conversion/.git/
 expecting success: 
-	echo content >file &&
-	git add file &&
-	git commit -m base &&
-	blob=$(git rev-parse HEAD:file) &&
-	tree=$(git rev-parse HEAD^{tree})
+	printf "\$Id: foo\$\\r\\n" >small &&
+	cat small small >large &&
+	git config core.bigfilethreshold 20 &&
+	git config filter.test.clean "sed s/.*/CLEAN/"
 
-[master (root-commit) fe85a3d] base
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-ok 1 - create base tree
+ok 1 - setup input tests
 
 expecting success: 
-	git config core.protectHFS true
+	test_config core.autocrlf true &&
+	check_input
 
-ok 2 - enable core.protectHFS for rejection tests
+ok 2 - autocrlf=true converts on input
 
 expecting success: 
-	git config core.protectNTFS true
+	set_attr eol=crlf &&
+	check_input
 
-ok 3 - enable core.protectNTFS for rejection tests
+ok 3 - eol=crlf converts on input
 
 expecting success: 
-		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
+	set_attr ident &&
+	check_input
 
-expecting success: 
-		printf "040000 tree %s\t%s" "$tree" "$path" >tree &&
-		bogus=$(git mktree <tree) &&
-		test_must_fail git read-tree $bogus
-	
-error: Invalid path './file'
-ok 5 - reject . as subtree
+ok 4 - ident converts on input
 
 expecting success: 
-		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
+	set_attr filter=test &&
+	check_input
 
-expecting success: 
-		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
+ok 5 - user-defined filters convert on input
 
 expecting success: 
-		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
+	echo "\$Id\$" >small &&
+	cat small small >large &&
+	git add small large &&
+	git config core.bigfilethreshold 7 &&
+	git config filter.test.smudge "sed s/.*/SMUDGE/"
 
-expecting success: 
-		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
+ok 6 - setup output tests
 
 expecting success: 
-		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
+	test_config core.autocrlf true &&
+	check_output
 
-expecting success: 
-		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
+ok 7 - autocrlf=true converts on output
 
 expecting success: 
-		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
+	set_attr eol=crlf &&
+	check_output
 
-expecting success: 
-		printf "040000 tree %s\t%s" "$tree" "$path" >tree &&
-		bogus=$(git mktree <tree) &&
-		test_must_fail git read-tree $bogus
-	
-error: Invalid path '‌.Git/file'
-ok 13 - reject {u200c}.Git as subtree
+ok 8 - eol=crlf converts on output
 
 expecting success: 
-		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
+	set_attr filter=test &&
+	check_output
 
-expecting success: 
-		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
+ok 9 - user-defined filters convert on output
 
 expecting success: 
-		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
+	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
+
+ok 10 - ident converts on output
+
+# passed all 10 test(s)
+1..10
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t1100-commit-tree-options.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1100-commit-tree-options/.git/
+expecting success: git write-tree >treeid
+ok 1 - test preparation: write empty tree
+
+expecting success: 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: git cat-file commit $(cat commitid) >commit
+ok 3 - read commit
+
+expecting success: test_cmp expected commit
+ok 4 - compare commit
 
 expecting success: 
-		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
+	test_tick &&
+	echo comment text |
+	git commit-tree $(cat treeid) >commitid &&
+	echo comment text |
+	git commit-tree $(cat treeid) -p $(cat commitid) >childid-1 &&
+	echo comment text |
+	git commit-tree -p $(cat commitid) $(cat treeid) >childid-2 &&
+	test_cmp childid-1 childid-2 &&
+	git commit-tree $(cat treeid) -m foo >childid-3 &&
+	git commit-tree -m foo $(cat treeid) >childid-4 &&
+	test_cmp childid-3 childid-4
 
+ok 5 - flags and then non flags
+
+# passed all 5 test(s)
+1..5
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t1304-default-acl.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1304-default-acl/.git/
 expecting success: 
-		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
+	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 | egrep "mask::?rw-"
+	then
+		test_set_prereq SETFACL
+	fi
+
+./test-lib.sh: line 683: setfacl: command not found
+ok 1 - checking for a working acl setup
+
+skipping test: Setup test repo 
+	setfacl -m d:u::rwx,d:g::---,d:o:---,d:m:rwx $dirs_to_set &&
+	setfacl -m m:rwx               $dirs_to_set &&
+	setfacl -m u:root:rwx          $dirs_to_set &&
+	setfacl -m d:u:"$LOGNAME":rwx  $dirs_to_set &&
+	setfacl -m d:u:root:rwx        $dirs_to_set &&
+
+	touch file.txt &&
+	git add file.txt &&
+	git commit -m "init"
+
+ok 2 # skip Setup test repo (missing SETFACL)
+
+skipping test: Objects creation does not break ACLs with restrictive umask 
+	# SHA1 for empty blob
+	check_perms_and_acl .git/objects/$(echo $EMPTY_BLOB | sed -e "s,^\(..\),\1/,")
+
+ok 3 # skip Objects creation does not break ACLs with restrictive umask (missing SETFACL)
+
+skipping test: git gc does not break ACLs with restrictive umask 
+	git gc &&
+	check_perms_and_acl .git/objects/pack/*.pack
+
+ok 4 # skip git gc does not break ACLs with restrictive umask (missing SETFACL)
+
+# passed all 4 test(s)
+1..4
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t1000-read-tree-m-3way.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1000-read-tree-m-3way/.git/
+expecting success: git update-index --add $p &&
+	    git update-index --add Z/$p
+ok 1 - adding test file NN and Z/NN
+
+expecting success: git update-index --add $p &&
+	    git update-index --add Z/$p
+ok 2 - adding test file ND and Z/ND
+
+expecting success: git update-index --add $p &&
+	    git update-index --add Z/$p
+ok 3 - adding test file NM and Z/NM
+
+expecting success: git update-index --add $p &&
+	    git update-index --add Z/$p
+ok 4 - adding test file DN and Z/DN
+
+expecting success: git update-index --add $p &&
+	    git update-index --add Z/$p
+ok 5 - adding test file DD and Z/DD
+
+expecting success: git update-index --add $p &&
+	    git update-index --add Z/$p
+ok 6 - adding test file DM and Z/DM
+
+expecting success: git update-index --add $p &&
+	    git update-index --add Z/$p
+ok 7 - adding test file MN and Z/MN
+
+expecting success: git update-index --add $p &&
+	    git update-index --add Z/$p
+ok 8 - adding test file MD and Z/MD
+
+expecting success: git update-index --add $p &&
+	    git update-index --add Z/$p
+ok 9 - adding test file MM and Z/MM
+
+expecting success: git update-index --add SS
+ok 10 - adding test file SS
+
+expecting success: git update-index --add TT
+ok 11 - adding test file TT
+
+expecting success: tree_O=$(git write-tree)
+ok 12 - prepare initial tree
+
+expecting success: git update-index --remove $to_remove
+ok 13 - change in branch A (removal)
+
+expecting success: git update-index MD
+ok 14 - change in branch A (modification)
+
+expecting success: git update-index MM
+ok 15 - change in branch A (modification)
+
+expecting success: git update-index MN
+ok 16 - change in branch A (modification)
+
+expecting success: git update-index Z/MD
+ok 17 - change in branch A (modification)
+
+expecting success: git update-index Z/MM
+ok 18 - change in branch A (modification)
+
+expecting success: git update-index Z/MN
+ok 19 - change in branch A (modification)
+
+expecting success: git update-index --add AN
+ok 20 - change in branch A (addition)
+
+expecting success: git update-index --add AA
+ok 21 - change in branch A (addition)
+
+expecting success: git update-index --add Z/AN
+ok 22 - change in branch A (addition)
+
+expecting success: git update-index --add Z/AA
+ok 23 - change in branch A (addition)
+
+expecting success: git update-index --add LL &&
+     git update-index SS
+ok 24 - change in branch A (addition)
+
+expecting success: git update-index TT
+ok 25 - change in branch A (edit)
+
+expecting success: git update-index --add DF/DF
+ok 26 - change in branch A (change file to directory)
+
+expecting success: tree_A=$(git write-tree)
+ok 27 - recording branch A tree
+
+expecting success: git read-tree $tree_O &&
+     git checkout-index -a
+ok 28 - reading original tree and checking out
+
+expecting success: git update-index --remove DD MD ND Z/DD Z/MD Z/ND
+ok 29 - change in branch B (removal)
+
+expecting success: git update-index DM
+ok 30 - change in branch B (modification)
+
+expecting success: git update-index MM
+ok 31 - change in branch B (modification)
+
+expecting success: git update-index NM
+ok 32 - change in branch B (modification)
+
+expecting success: git update-index Z/DM
+ok 33 - change in branch B (modification)
+
+expecting success: git update-index Z/MM
+ok 34 - change in branch B (modification)
+
+expecting success: git update-index Z/NM
+ok 35 - change in branch B (modification)
+
+expecting success: git update-index --add NA
+ok 36 - change in branch B (addition)
+
+expecting success: git update-index --add AA
+ok 37 - change in branch B (addition)
+
+expecting success: git update-index --add Z/NA
+ok 38 - change in branch B (addition)
+
+expecting success: git update-index --add Z/AA
+ok 39 - change in branch B (addition)
+
+expecting success: git update-index --add LL &&
+     git update-index SS
+ok 40 - change in branch B (addition and modification)
+
+expecting success: git update-index TT
+ok 41 - change in branch B (modification)
+
+expecting success: git update-index --add DF
+ok 42 - change in branch B (addition of a file to conflict with directory)
+
+expecting success: tree_B=$(git write-tree)
+ok 43 - recording branch B tree
+
+expecting success: 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: 
-		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
+	rm -fr [NDMALTS][NDMALTSF] Z &&
+	rm .git/index &&
+	read_tree_must_succeed -m $tree_O $tree_A $tree_B &&
+	check_result
+
+ok 45 - 3-way merge with git read-tree -m, empty cache
 
 expecting success: 
-		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
+	rm -fr [NDMALTS][NDMALTSF] Z &&
+	rm .git/index &&
+	read_tree_must_succeed $tree_A &&
+	git checkout-index -f -u -a &&
+	read_tree_must_succeed -m $tree_O $tree_A $tree_B &&
+	check_result
+
+ok 46 - 3-way merge with git read-tree -m, match H
 
 expecting success: 
-		printf "040000 tree %s\t%s" "$tree" "$path" >tree &&
-		bogus=$(git mktree <tree) &&
-		test_must_fail git read-tree $bogus
-	
-error: Invalid path '.git. /file'
-ok 21 - reject .git.{space} as subtree
+	rm -f .git/index XX &&
+	echo XX >XX &&
+	git update-index --add XX &&
+	read_tree_must_fail -m $tree_O $tree_A $tree_B
+
+error: Entry 'XX' would be overwritten by merge. Cannot merge.
+error: Entry 'XX' would be overwritten by merge. Cannot merge.
+ok 47 - 1 - must not have an entry not in A.
 
 expecting success: 
-		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
+	rm -f .git/index NA &&
+	cp .orig-B/NA NA &&
+	git update-index --add NA &&
+	read_tree_must_succeed -m $tree_O $tree_A $tree_B
+
+ok 48 - 2 - must match B in !O && !A && B case.
 
 expecting success: 
-		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
+	rm -f .git/index NA &&
+	cp .orig-B/NA NA &&
+	git update-index --add NA &&
+	echo extra >>NA &&
+	read_tree_must_succeed -m $tree_O $tree_A $tree_B
+
+ok 49 - 2 - matching B alone is OK in !O && !A && B case.
 
 expecting success: 
-		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
+	rm -f .git/index AN &&
+	cp .orig-A/AN AN &&
+	git update-index --add AN &&
+	read_tree_must_succeed -m $tree_O $tree_A $tree_B &&
+	check_result
+
+ok 50 - 3 - must match A in !O && A && !B case.
 
 expecting success: 
-		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
+	rm -f .git/index AN &&
+	cp .orig-A/AN AN &&
+	git update-index --add AN &&
+	echo extra >>AN &&
+	read_tree_must_succeed -m $tree_O $tree_A $tree_B
+
+ok 51 - 3 - matching A alone is OK in !O && A && !B case.
 
 expecting success: 
-		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
+	rm -f .git/index AN &&
+	cp .orig-A/AN AN &&
+	echo extra >>AN &&
+	git update-index --add AN &&
+	read_tree_must_fail -m $tree_O $tree_A $tree_B
+
+error: Entry 'AN' would be overwritten by merge. Cannot merge.
+error: Entry 'AN' would be overwritten by merge. Cannot merge.
+ok 52 - 3 (fail) - must match A in !O && A && !B case.
 
 expecting success: 
-		printf "040000 tree %s\t%s" "$tree" "$path" >tree &&
-		bogus=$(git mktree <tree) &&
-		test_must_fail git read-tree $bogus
-	
-error: Invalid path '.git...:alternate-stream/file'
-ok 27 - reject .git...:alternate-stream as subtree
+	rm -f .git/index AA &&
+	cp .orig-A/AA AA &&
+	git update-index --add AA &&
+	read_tree_must_succeed -m $tree_O $tree_A $tree_B &&
+	check_result
+
+ok 53 - 4 - must match and be up-to-date in !O && A && B && A!=B case.
 
 expecting success: 
-	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
+	rm -f .git/index AA &&
+	cp .orig-A/AA AA &&
+	git update-index --add AA &&
+	echo extra >>AA &&
+	read_tree_must_fail -m $tree_O $tree_A $tree_B
 
-ok 28 - utf-8 paths allowed with core.protectHFS off
+error: Entry 'AA' not uptodate. Cannot merge.
+error: Entry 'AA' not uptodate. Cannot merge.
+ok 54 - 4 (fail) - must match and be up-to-date in !O && A && B && A!=B case.
 
-# passed all 28 test(s)
-1..28
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t1303-wacky-config.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1303-wacky-config/.git/
 expecting success: 
-	setup &&
-	git config section.key bar &&
-	check section.key bar
+	rm -f .git/index AA &&
+	cp .orig-A/AA AA &&
+	echo extra >>AA &&
+	git update-index --add AA &&
+	read_tree_must_fail -m $tree_O $tree_A $tree_B
 
-ok 1 - modify same key
+error: Entry 'AA' would be overwritten by merge. Cannot merge.
+error: Entry 'AA' would be overwritten by merge. Cannot merge.
+ok 55 - 4 (fail) - must match and be up-to-date in !O && A && B && A!=B case.
 
 expecting success: 
-	setup &&
-	git config section.other bar &&
-	check section.key foo &&
-	check section.other bar
+	rm -f .git/index LL &&
+	cp .orig-A/LL LL &&
+	git update-index --add LL &&
+	read_tree_must_succeed -m $tree_O $tree_A $tree_B &&
+	check_result
 
-ok 2 - add key in same section
+ok 56 - 5 - must match in !O && A && B && A==B case.
 
 expecting success: 
-	setup &&
-	git config section2.key bar &&
-	check section.key foo &&
-	check section2.key bar
+	rm -f .git/index LL &&
+	cp .orig-A/LL LL &&
+	git update-index --add LL &&
+	echo extra >>LL &&
+	read_tree_must_succeed -m $tree_O $tree_A $tree_B &&
+	check_result
 
-ok 3 - add key in different section
+ok 57 - 5 - must match in !O && A && B && A==B case.
 
 expecting success: 
-	git config "$SECTION" bar &&
-	check "$SECTION" bar
+	rm -f .git/index LL &&
+	cp .orig-A/LL LL &&
+	echo extra >>LL &&
+	git update-index --add LL &&
+	read_tree_must_fail -m $tree_O $tree_A $tree_B
 
-ok 4 - make sure git config escapes section names properly
+error: Entry 'LL' would be overwritten by merge. Cannot merge.
+error: Entry 'LL' would be overwritten by merge. Cannot merge.
+ok 58 - 5 (fail) - must match A in !O && A && B && A==B case.
 
 expecting success: 
-	setup &&
-	git config section.key "$LONG_VALUE" &&
-	check section.key "$LONG_VALUE"
+	rm -f .git/index DD &&
+	echo DD >DD &&
+	git update-index --add DD &&
+	read_tree_must_fail -m $tree_O $tree_A $tree_B
 
-ok 5 - do not crash on special long config line
+error: Entry 'DD' would be overwritten by merge. Cannot merge.
+error: Entry 'DD' would be overwritten by merge. Cannot merge.
+ok 59 - 6 - must not exist in O && !A && !B case
 
 expecting success: 
-	setup_many &&
-	git config --get-all section.key >actual &&
-	test_line_count = 3126 actual
+	rm -f .git/index DM &&
+	cp .orig-B/DM DM &&
+	git update-index --add DM &&
+	read_tree_must_fail -m $tree_O $tree_A $tree_B
 
-ok 6 - get many entries
+error: Entry 'DM' would be overwritten by merge. Cannot merge.
+error: Entry 'DM' would be overwritten by merge. Cannot merge.
+ok 60 - 7 - must not exist in O && !A && B && O!=B case
 
 expecting success: 
-	setup_many &&
-	git config --get-regexp "sec.*ke." >actual &&
-	test_line_count = 3126 actual
+	rm -f .git/index DN &&
+	cp .orig-B/DN DN &&
+	git update-index --add DN &&
+	read_tree_must_fail -m $tree_O $tree_A $tree_B
 
-ok 7 - get many entries by regex
+error: Entry 'DN' would be overwritten by merge. Cannot merge.
+error: Entry 'DN' would be overwritten by merge. Cannot merge.
+ok 61 - 8 - must not exist in O && !A && B && O==B case
 
 expecting success: 
-	setup_many &&
-	git config --add section.key bar &&
-	check_regex section.key "b.*r" bar &&
-	git config section.key beer "b.*r" &&
-	check_regex section.key "b.*r" beer
+	rm -f .git/index MD &&
+	cp .orig-A/MD MD &&
+	git update-index --add MD &&
+	read_tree_must_succeed -m $tree_O $tree_A $tree_B &&
+	check_result
 
-ok 8 - add and replace one of many entries
+ok 62 - 9 - must match and be up-to-date in O && A && !B && O!=A case
 
 expecting success: 
-	setup_many &&
-	git config --replace-all section.key bar &&
-	check section.key bar
+	rm -f .git/index MD &&
+	cp .orig-A/MD MD &&
+	git update-index --add MD &&
+	echo extra >>MD &&
+	read_tree_must_fail -m $tree_O $tree_A $tree_B
 
-ok 9 - replace many entries
+error: Entry 'MD' not uptodate. Cannot merge.
+error: Entry 'MD' not uptodate. Cannot merge.
+ok 63 - 9 (fail) - must match and be up-to-date in O && A && !B && O!=A case
 
 expecting success: 
-	setup_many &&
-	git config --unset-all section.key &&
-	test_must_fail git config section.key
+	rm -f .git/index MD &&
+	cp .orig-A/MD MD &&
+	echo extra >>MD &&
+	git update-index --add MD &&
+	read_tree_must_fail -m $tree_O $tree_A $tree_B
 
-ok 10 - unset many entries
+error: Entry 'MD' would be overwritten by merge. Cannot merge.
+error: Entry 'MD' would be overwritten by merge. Cannot merge.
+ok 64 - 9 (fail) - must match and be up-to-date in O && A && !B && O!=A case
 
 expecting success: 
-	cat >expect <<-\EOF &&
+	rm -f .git/index ND &&
+	cp .orig-A/ND ND &&
+	git update-index --add ND &&
+	read_tree_must_succeed -m $tree_O $tree_A $tree_B &&
+	check_result
 
+ok 65 - 10 - must match and be up-to-date in O && A && !B && O==A case
 
-	fool
-	roll
-	EOF
-	cp .git/config .git/config.old &&
-	test_when_finished "mv .git/config.old .git/config" &&
-	cat >.git/config <<-\EOF &&
-	[foo]
-		baz
-		baz =
-		baz = fool
-	EOF
-	git config --add foo.baz roll &&
-	git config --get-all foo.baz >output &&
-	test_cmp expect output
+expecting success: 
+	rm -f .git/index ND &&
+	cp .orig-A/ND ND &&
+	git update-index --add ND &&
+	echo extra >>ND &&
+	read_tree_must_fail -m $tree_O $tree_A $tree_B
 
-ok 11 - --add appends new value after existing empty value
+error: Entry 'ND' not uptodate. Cannot merge.
+error: Entry 'ND' not uptodate. Cannot merge.
+ok 66 - 10 (fail) - must match and be up-to-date in O && A && !B && O==A case
 
-# passed all 11 test(s)
-1..11
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t1060-object-corruption.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1060-object-corruption/.git/
 expecting success: 
-	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
-	)
+	rm -f .git/index ND &&
+	cp .orig-A/ND ND &&
+	echo extra >>ND &&
+	git update-index --add ND &&
+	read_tree_must_fail -m $tree_O $tree_A $tree_B
 
-Initialized empty Git repository in /build/git-2.20.1/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, 6.0457e-05 s, 16.5 kB/s
-Initialized empty Git repository in /build/git-2.20.1/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
+error: Entry 'ND' would be overwritten by merge. Cannot merge.
+error: Entry 'ND' would be overwritten by merge. Cannot merge.
+ok 67 - 10 (fail) - must match and be up-to-date in O && A && !B && O==A case
 
 expecting success: 
-	git init missing &&
-	(
-		cd missing &&
-		test_commit content &&
-		rm -f "$(obj_to_file HEAD:content.t)"
-	)
+	rm -f .git/index MM &&
+	cp .orig-A/MM MM &&
+	git update-index --add MM &&
+	read_tree_must_succeed -m $tree_O $tree_A $tree_B &&
+	check_result
 
-Initialized empty Git repository in /build/git-2.20.1/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
+ok 68 - 11 - must match and be up-to-date in O && A && B && O!=A && O!=B && A!=B case
 
 expecting success: 
-	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"
-	)
+	rm -f .git/index MM &&
+	cp .orig-A/MM MM &&
+	git update-index --add MM &&
+	echo extra >>MM &&
+	read_tree_must_fail -m $tree_O $tree_A $tree_B
 
-Initialized empty Git repository in /build/git-2.20.1/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
+error: Entry 'MM' not uptodate. Cannot merge.
+error: Entry 'MM' not uptodate. Cannot merge.
+ok 69 - 11 (fail) - must match and be up-to-date in O && A && B && O!=A && O!=B && A!=B case
 
 expecting success: 
-	(
-		cd bit-error &&
-		test_must_fail git cat-file blob HEAD:content.t
-	)
+	rm -f .git/index MM &&
+	cp .orig-A/MM MM &&
+	echo extra >>MM &&
+	git update-index --add MM &&
+	read_tree_must_fail -m $tree_O $tree_A $tree_B
 
-error: 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
+error: Entry 'MM' would be overwritten by merge. Cannot merge.
+error: Entry 'MM' would be overwritten by merge. Cannot merge.
+ok 70 - 11 (fail) - must match and be up-to-date in O && A && B && O!=A && O!=B && A!=B case
 
 expecting success: 
-	(
-		cd bit-error &&
-		test_must_fail git cat-file -s HEAD:content.t
-	)
+	rm -f .git/index SS &&
+	cp .orig-A/SS SS &&
+	git update-index --add SS &&
+	read_tree_must_succeed -m $tree_O $tree_A $tree_B &&
+	check_result
 
-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
+ok 71 - 12 - must match A in O && A && B && O!=A && A==B case
 
 expecting success: 
-	(
-		cd bit-error &&
-		rm -f content.t &&
-		test_must_fail git read-tree --reset -u HEAD
-	)
+	rm -f .git/index SS &&
+	cp .orig-A/SS SS &&
+	git update-index --add SS &&
+	echo extra >>SS &&
+	read_tree_must_succeed -m $tree_O $tree_A $tree_B &&
+	check_result
 
-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
+ok 72 - 12 - must match A in O && A && B && O!=A && A==B case
 
 expecting success: 
-	(
-		cd missing &&
-		rm -f content.t &&
-		test_must_fail git read-tree --reset -u HEAD
-	)
+	rm -f .git/index SS &&
+	cp .orig-A/SS SS &&
+	echo extra >>SS &&
+	git update-index --add SS &&
+	read_tree_must_fail -m $tree_O $tree_A $tree_B
 
-error: unable to read sha1 file of content.t (d95f3ad14dee633a758d2e331151e950dd13e4ed)
-ok 7 - read-tree -u detects missing objects
+error: Entry 'SS' would be overwritten by merge. Cannot merge.
+error: Entry 'SS' would be overwritten by merge. Cannot merge.
+ok 73 - 12 (fail) - must match A in O && A && B && O!=A && A==B case
 
 expecting success: 
-	test_must_fail git clone --no-local --bare bit-error corrupt-transport
+	rm -f .git/index MN &&
+	cp .orig-A/MN MN &&
+	git update-index --add MN &&
+	read_tree_must_succeed -m $tree_O $tree_A $tree_B &&
+	check_result
 
-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: index-pack failed
-ok 8 - clone --no-local --bare detects corruption
+ok 74 - 13 - must match A in O && A && B && O!=A && O==B case
 
 expecting success: 
-	test_must_fail git clone --no-local --bare missing missing-transport
+	rm -f .git/index MN &&
+	cp .orig-A/MN MN &&
+	git update-index --add MN &&
+	echo extra >>MN &&
+	read_tree_must_succeed -m $tree_O $tree_A $tree_B &&
+	check_result
 
-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: index-pack failed
-ok 9 - clone --no-local --bare detects missing object
+ok 75 - 13 - must match A in O && A && B && O!=A && O==B case
 
 expecting success: 
-	test_must_fail git clone --no-local --bare misnamed misnamed-transport
+	rm -f .git/index NM &&
+	cp .orig-A/NM NM &&
+	git update-index --add NM &&
+	read_tree_must_succeed -m $tree_O $tree_A $tree_B &&
+	check_result
 
-Cloning into bare repository 'misnamed-transport'...
-fatal: did not receive expected object d95f3ad14dee633a758d2e331151e950dd13e4ed
-fatal: index-pack failed
-ok 10 - clone --no-local --bare detects misnamed object
+ok 76 - 14 - must match and be up-to-date in O && A && B && O==A && O!=B case
 
 expecting success: 
-	test_must_fail git clone --local bit-error corrupt-checkout
+	rm -f .git/index NM &&
+	cp .orig-B/NM NM &&
+	git update-index --add NM &&
+	echo extra >>NM &&
+	read_tree_must_succeed -m $tree_O $tree_A $tree_B &&
+	check_result
 
-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/git-2.20.1/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 the checkout with 'git checkout -f HEAD'
+ok 77 - 14 - may match B in O && A && B && O==A && O!=B case
 
-ok 11 - clone --local detects corruption
+expecting success: 
+	rm -f .git/index NM &&
+	cp .orig-A/NM NM &&
+	git update-index --add NM &&
+	echo extra >>NM &&
+	read_tree_must_fail -m $tree_O $tree_A $tree_B
+
+error: Entry 'NM' not uptodate. Cannot merge.
+error: Entry 'NM' not uptodate. Cannot merge.
+ok 78 - 14 (fail) - must match and be up-to-date in O && A && B && O==A && O!=B case
 
 expecting success: 
-	test_path_is_dir corrupt-checkout/.git
+	rm -f .git/index NM &&
+	cp .orig-A/NM NM &&
+	echo extra >>NM &&
+	git update-index --add NM &&
+	read_tree_must_fail -m $tree_O $tree_A $tree_B
 
-ok 12 - error detected during checkout leaves repo intact
+error: Entry 'NM' would be overwritten by merge. Cannot merge.
+error: Entry 'NM' would be overwritten by merge. Cannot merge.
+ok 79 - 14 (fail) - must match and be up-to-date in O && A && B && O==A && O!=B case
 
 expecting success: 
-	test_must_fail git clone --local missing missing-checkout
+	rm -f .git/index NN &&
+	cp .orig-A/NN NN &&
+	git update-index --add NN &&
+	read_tree_must_succeed -m $tree_O $tree_A $tree_B &&
+	check_result
 
-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 the checkout with 'git checkout -f HEAD'
+ok 80 - 15 - must match A in O && A && B && O==A && O==B case
 
-ok 13 - clone --local detects missing objects
+expecting success: 
+	rm -f .git/index NN &&
+	cp .orig-A/NN NN &&
+	git update-index --add NN &&
+	echo extra >>NN &&
+	read_tree_must_succeed -m $tree_O $tree_A $tree_B &&
+	check_result
 
-checking known breakage: 
-	test_must_fail git clone --local misnamed misnamed-checkout
+ok 81 - 15 - must match A in O && A && B && O==A && O==B case
 
-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: 
+	rm -f .git/index NN &&
+	cp .orig-A/NN NN &&
+	echo extra >>NN &&
+	git update-index --add NN &&
+	read_tree_must_fail -m $tree_O $tree_A $tree_B
+
+error: Entry 'NN' would be overwritten by merge. Cannot merge.
+error: Entry 'NN' would be overwritten by merge. Cannot merge.
+ok 82 - 15 (fail) - must match A in O && A && B && O==A && O==B case
 
 expecting success: 
-	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_i18ngrep ! -i collision stderr
-	)
+	rm -f .git/index F16 &&
+	echo F16 >F16 &&
+	git update-index --add F16 &&
+	tree0=$(git write-tree) &&
+	echo E16 >F16 &&
+	git update-index F16 &&
+	tree1=$(git write-tree) &&
+	read_tree_must_succeed -m $tree0 $tree1 $tree1 $tree0 &&
+	git ls-files --stage
 
-ok 15 - fetch into corrupted repo with index-pack
+100644 ecbec6db011caa3ae26739812f092f76875fe6b6 2	F16
+100644 bcf4afda2c30299bf6538240d40bcb8fb3857691 3	F16
+ok 83 - 16 - A matches in one and B matches in another.
 
-# still have 1 known breakage(s)
-# passed all remaining 14 test(s)
-1..15
+# passed all 83 test(s)
+1..83
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
 *** t1090-sparse-checkout-scope.sh ***
@@ -23445,7 +21618,7 @@
 	git add a b c &&
 	git commit -m "initial commit"
 
-[master (root-commit) 81a5b8a] initial commit
+[master (root-commit) 1a582b4] initial commit
  Author: A U Thor <author@example.com>
  3 files changed, 3 insertions(+)
  create mode 100644 a
@@ -23461,7 +21634,7 @@
 	git commit -m "modification"
 
 Switched to a new branch 'feature'
-[feature 0cb49e9] modification
+[feature 571b00a] modification
  Author: A U Thor <author@example.com>
  2 files changed, 2 insertions(+), 2 deletions(-)
 ok 2 - create feature branch
@@ -23504,7 +21677,7 @@
 	test_path_is_file c &&
 	test "$(cat c)" = "modified"
 
-Updating 81a5b8a..0cb49e9
+Updating 1a582b4..571b00a
 Fast-forward
  b | 2 +-
  c | 2 +-
@@ -23559,7 +21732,7 @@
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1090-sparse-checkout-scope/server/.git/
 Cloning into 'client'...
 warning: You appear to have cloned an empty repository.
-[master (root-commit) dcdf2f5] message
+[master (root-commit) 3736eac] message
  Author: A U Thor <author@example.com>
  3 files changed, 3 insertions(+)
  create mode 100644 a
@@ -23578,484 +21751,2125 @@
 
   git checkout -b <new-branch-name>
 
-HEAD is now at dcdf2f5 message
+HEAD is now at 3736eac message
 ok 7 - in partial clone, sparse checkout only fetches needed blobs
 
 # passed all 7 test(s)
 1..7
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t1051-large-conversion.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1051-large-conversion/.git/
+*** t0410-partial-clone.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t0410-partial-clone/.git/
 expecting success: 
-	printf "\$Id: foo\$\\r\\n" >small &&
-	cat small small >large &&
-	git config core.bigfilethreshold 20 &&
-	git config filter.test.clean "sed s/.*/CLEAN/"
+	test_create_repo server &&
+	git clone --filter="blob:none" "file://$(pwd)/server" client &&
+	git -C client config --unset core.partialclonefilter &&
+	git -C client fetch origin
 
-ok 1 - setup input tests
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t0410-partial-clone/server/.git/
+Cloning into 'client'...
+warning: You appear to have cloned an empty repository.
+ok 1 - extensions.partialclone without filter
 
 expecting success: 
-	test_config core.autocrlf true &&
-	check_input
+	rm -rf repo &&
+	test_create_repo repo &&
+	test_commit -C repo my_commit &&
 
-ok 2 - autocrlf=true converts on input
+	A=$(git -C repo commit-tree -m a HEAD^{tree}) &&
+	C=$(git -C repo commit-tree -m c -p $A HEAD^{tree}) &&
+
+	# Reference $A only from reflog, and delete it
+	git -C repo branch my_branch "$A" &&
+	git -C repo branch -f my_branch my_commit &&
+	delete_object repo "$A" &&
+
+	# State that we got $C, which refers to $A, from promisor
+	printf "$C\n" | pack_as_from_promisor &&
+
+	# Normally, it fails
+	test_must_fail git -C repo fsck &&
+
+	# But with the extension, it succeeds
+	git -C repo config core.repositoryformatversion 1 &&
+	git -C repo config extensions.partialclone "arbitrary string" &&
+	git -C repo fsck
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t0410-partial-clone/repo/.git/
+[master (root-commit) f875b73] my_commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 my_commit.t
+738adde9f5fe99553a2e3813bb92cbbbdef79ef1
+error: refs/heads/my_branch: invalid reflog entry 31566d0be6253fd37a1ef5087a6d3933a45883a0
+error: refs/heads/my_branch: invalid reflog entry 31566d0be6253fd37a1ef5087a6d3933a45883a0
+dangling commit 4a7ce5332e0d121c1ab9428e15a83f4bb770acd7
+dangling commit 4a7ce5332e0d121c1ab9428e15a83f4bb770acd7
+ok 2 - missing reflog object, but promised by a commit, passes fsck
 
 expecting success: 
-	set_attr eol=crlf &&
-	check_input
+	rm -rf repo &&
+	test_create_repo repo &&
+	test_commit -C repo my_commit &&
 
-ok 3 - eol=crlf converts on input
+	A=$(git -C repo commit-tree -m a HEAD^{tree}) &&
+	git -C repo tag -a -m d my_tag_name $A &&
+	T=$(git -C repo rev-parse my_tag_name) &&
+	git -C repo tag -d my_tag_name &&
+
+	# Reference $A only from reflog, and delete it
+	git -C repo branch my_branch "$A" &&
+	git -C repo branch -f my_branch my_commit &&
+	delete_object repo "$A" &&
+
+	# State that we got $T, which refers to $A, from promisor
+	printf "$T\n" | pack_as_from_promisor &&
+
+	git -C repo config core.repositoryformatversion 1 &&
+	git -C repo config extensions.partialclone "arbitrary string" &&
+	git -C repo fsck
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t0410-partial-clone/repo/.git/
+[master (root-commit) 4ce2b9b] my_commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 my_commit.t
+Deleted tag 'my_tag_name' (was 7a32993)
+7fd8925735cc15e2e2034644b64afda491571ff8
+dangling tag 7a329936d66f427bedc89d9ab903f38b07d44de7
+ok 3 - missing reflog object, but promised by a tag, passes fsck
 
 expecting success: 
-	set_attr ident &&
-	check_input
+	rm -rf repo &&
+	test_create_repo repo &&
+	test_commit -C repo my_commit &&
 
-ok 4 - ident converts on input
+	A=$(git -C repo commit-tree -m a HEAD^{tree}) &&
+	B=$(git -C repo commit-tree -m b HEAD^{tree}) &&
+
+	# Reference $A only from reflog, and delete it
+	git -C repo branch my_branch "$A" &&
+	git -C repo branch -f my_branch my_commit &&
+	delete_object repo "$A" &&
+
+	git -C repo config core.repositoryformatversion 1 &&
+	git -C repo config extensions.partialclone "arbitrary string" &&
+	test_must_fail git -C repo fsck
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t0410-partial-clone/repo/.git/
+[master (root-commit) 2f3d175] my_commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 my_commit.t
+error: refs/heads/my_branch: invalid reflog entry c51de19226c13fa1daecab9e08d2f0b99a29784c
+error: refs/heads/my_branch: invalid reflog entry c51de19226c13fa1daecab9e08d2f0b99a29784c
+dangling commit e376c76e48cd8763bb0961aa8f03e5b8642908a8
+ok 4 - missing reflog object alone fails fsck, even with extension set
 
 expecting success: 
-	set_attr filter=test &&
-	check_input
+	rm -rf repo &&
+	test_create_repo repo &&
+	test_commit -C repo my_commit &&
 
-ok 5 - user-defined filters convert on input
+	A=$(git -C repo commit-tree -m a HEAD^{tree}) &&
+
+	# Reference $A only from ref
+	git -C repo branch my_branch "$A" &&
+	promise_and_delete "$A" &&
+
+	git -C repo config core.repositoryformatversion 1 &&
+	git -C repo config extensions.partialclone "arbitrary string" &&
+	git -C repo fsck
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t0410-partial-clone/repo/.git/
+[master (root-commit) 9df77b9] my_commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 my_commit.t
+a391e3e0447189aa0050c8f206462a1b0530a34a
+dangling tag e5f4cb9fd329c512b08fb81a8e6b1f5e27658263
+ok 5 - missing ref object, but promised, passes fsck
 
 expecting success: 
-	echo "\$Id\$" >small &&
-	cat small small >large &&
-	git add small large &&
-	git config core.bigfilethreshold 7 &&
-	git config filter.test.smudge "sed s/.*/SMUDGE/"
+	rm -rf repo &&
+	test_create_repo repo &&
+	test_commit -C repo 1 &&
+	test_commit -C repo 2 &&
+	test_commit -C repo 3 &&
+	git -C repo tag -a annotated_tag -m "annotated tag" &&
 
-ok 6 - setup output tests
+	C=$(git -C repo rev-parse 1) &&
+	T=$(git -C repo rev-parse 2^{tree}) &&
+	B=$(git hash-object repo/3.t) &&
+	AT=$(git -C repo rev-parse annotated_tag) &&
+
+	promise_and_delete "$C" &&
+	promise_and_delete "$T" &&
+	promise_and_delete "$B" &&
+	promise_and_delete "$AT" &&
+
+	git -C repo config core.repositoryformatversion 1 &&
+	git -C repo config extensions.partialclone "arbitrary string" &&
+	git -C repo fsck
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t0410-partial-clone/repo/.git/
+[master (root-commit) 6591d03] 1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1.t
+[master 5355e57] 2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 2.t
+[master a3007a6] 3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 3.t
+fa10eb4e855a356f0abe9c352b62b71d481918b1
+error: refs/tags/1 does not point to a valid object!
+7f935f1293a005998d684b122686a1125dc47996
+error: refs/tags/1 does not point to a valid object!
+43db30889c483ee89571157f1466e2809e137c7d
+error: refs/tags/1 does not point to a valid object!
+544d2af112f571c9dceb598e755c68cb22911767
+dangling tag 8e5058c0196ed6a9b285609a259f40e05437cfad
+dangling tag 4ff31e389c270b26919d9e89e743f1bc4e9d1907
+dangling tree dcf3d5d7c6d10fb961287ca9bc59a5bf8a4b2afc
+dangling tag 5d1357650c0c7fa7890a88ef5f3b44637843a883
+dangling tag be645be2ea79274538b1d7a002db7f261d7dc509
+ok 6 - missing object, but promised, passes fsck
 
 expecting success: 
-	test_config core.autocrlf true &&
-	check_output
+	rm -rf repo &&
+	test_create_repo repo &&
+	test_commit -C repo my_commit &&
 
-ok 7 - autocrlf=true converts on output
+	A=$(git -C repo commit-tree -m a HEAD^{tree}) &&
+	promise_and_delete "$A" &&
+
+	git -C repo config core.repositoryformatversion 1 &&
+	git -C repo config extensions.partialclone "arbitrary string" &&
+	git -C repo fsck "$A"
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t0410-partial-clone/repo/.git/
+[master (root-commit) da2e7de] my_commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 my_commit.t
+4337bf55380117d69ad62e8b0aa5d048dce2f274
+dangling tag 802319328bf3f4f53ce55aecd93e94ecf6f26c32
+dangling commit da2e7de93032e847edfceb74ec173302d3f32ceb
+ok 7 - missing CLI object, but promised, passes fsck
 
 expecting success: 
-	set_attr eol=crlf &&
-	check_output
+	rm -rf repo &&
+	test_create_repo server &&
+	test_commit -C server foo &&
+	git -C server repack -a -d --write-bitmap-index &&
 
-ok 8 - eol=crlf converts on output
+	git clone "file://$(pwd)/server" repo &&
+	HASH=$(git -C repo rev-parse foo) &&
+	rm -rf repo/.git/objects/* &&
+
+	git -C repo config core.repositoryformatversion 1 &&
+	git -C repo config extensions.partialclone "origin" &&
+	git -C repo cat-file -p "$HASH" &&
+
+	# Ensure that the .promisor file is written, and check that its
+	# associated packfile contains the object
+	ls repo/.git/objects/pack/pack-*.promisor >promisorlist &&
+	test_line_count = 1 promisorlist &&
+	IDX=$(cat promisorlist | sed "s/promisor$/idx/") &&
+	git verify-pack --verbose "$IDX" | grep "$HASH"
+
+Reinitialized existing Git repository in /build/git-2.20.1/t/trash directory.t0410-partial-clone/server/.git/
+[master (root-commit) 92a62de] foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo.t
+Cloning into 'repo'...
+warning: filtering not recognized by server, ignoring
+tree 64fd3796c57084e7b8cbae358ce37970b8e954f6
+author A U Thor <author@example.com> 1112912473 -0700
+committer C O Mitter <committer@example.com> 1112912473 -0700
+
+foo
+92a62decadb5642314a1fd56b51afd125b27f208 commit 167 126 12
+ok 8 - fetching of missing objects
 
 expecting success: 
-	set_attr filter=test &&
-	check_output
+	# ref-in-want requires protocol version 2
+	git -C server config protocol.version 2 &&
+	git -C server config uploadpack.allowrefinwant 1 &&
+	git -C repo config protocol.version 2 &&
 
-ok 9 - user-defined filters convert on output
+	rm -rf repo/.git/objects/* &&
+	rm -f trace &&
+	GIT_TRACE_PACKET="$(pwd)/trace" git -C repo cat-file -p "$HASH" &&
+	grep "git< fetch=.*ref-in-want" trace
+
+warning: filtering not recognized by server, ignoring
+tree 64fd3796c57084e7b8cbae358ce37970b8e954f6
+author A U Thor <author@example.com> 1112912473 -0700
+committer C O Mitter <committer@example.com> 1112912473 -0700
+
+foo
+packet:          git< fetch=shallow ref-in-want
+ok 9 - fetching of missing objects works with ref-in-want enabled
 
 expecting success: 
-	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
+	rm -rf server repo &&
+	test_create_repo server &&
+	test_commit -C server foo &&
+	git -C server repack -a -d --write-bitmap-index &&
 
-ok 10 - ident converts on output
+	git clone "file://$(pwd)/server" repo &&
+	git hash-object repo/foo.t >blobhash &&
+	rm -rf repo/.git/objects/* &&
 
-# passed all 10 test(s)
-1..10
+	git -C server config uploadpack.allowanysha1inwant 1 &&
+	git -C server config uploadpack.allowfilter 1 &&
+	git -C repo config core.repositoryformatversion 1 &&
+	git -C repo config extensions.partialclone "origin" &&
+
+	git -C repo cat-file -p $(cat blobhash)
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t0410-partial-clone/server/.git/
+[master (root-commit) 1463a05] foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo.t
+Cloning into 'repo'...
+foo
+ok 10 - fetching of missing blobs works
+
+expecting success: 
+	rm -rf server repo &&
+	test_create_repo server &&
+	test_commit -C server foo &&
+	git -C server repack -a -d --write-bitmap-index &&
+
+	git clone "file://$(pwd)/server" repo &&
+	git -C repo rev-parse foo^{tree} >treehash &&
+	git hash-object repo/foo.t >blobhash &&
+	rm -rf repo/.git/objects/* &&
+
+	git -C server config uploadpack.allowanysha1inwant 1 &&
+	git -C server config uploadpack.allowfilter 1 &&
+	git -C repo config core.repositoryformatversion 1 &&
+	git -C repo config extensions.partialclone "origin" &&
+	git -C repo cat-file -p $(cat treehash) &&
+
+	# Ensure that the tree, but not the blob, is fetched
+	git -C repo rev-list --objects --missing=print $(cat treehash) >objects &&
+	grep "^$(cat treehash)" objects &&
+	grep "^[?]$(cat blobhash)" objects
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t0410-partial-clone/server/.git/
+[master (root-commit) af4983b] foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo.t
+Cloning into 'repo'...
+100644 blob 257cc5642cb1a054f08cc83f2d943e56fd3ebe99	foo.t
+64fd3796c57084e7b8cbae358ce37970b8e954f6 
+?257cc5642cb1a054f08cc83f2d943e56fd3ebe99
+ok 11 - fetching of missing trees does not fetch blobs
+
+expecting success: 
+	rm -rf repo &&
+	test_create_repo repo &&
+	test_commit -C repo foo &&
+	test_commit -C repo bar &&
+
+	FOO=$(git -C repo rev-parse foo) &&
+	promise_and_delete "$FOO" &&
+
+	git -C repo config core.repositoryformatversion 1 &&
+	git -C repo config extensions.partialclone "arbitrary string" &&
+	GIT_TEST_COMMIT_GRAPH=0 git -C repo rev-list --exclude-promisor-objects --objects bar >out &&
+	grep $(git -C repo rev-parse bar) out &&
+	! grep $FOO out
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t0410-partial-clone/repo/.git/
+[master (root-commit) 7745948] foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo.t
+[master e514b54] bar
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 bar.t
+2b7df34bc09be010087307b898e994ce709c0db1
+e514b54fb79193e76be659c0567b436ac8d10232
+ok 12 - rev-list stops traversal at missing and promised commit
+
+expecting success: 
+	rm -rf repo &&
+	test_create_repo repo &&
+	test_commit -C repo foo &&
+	test_commit -C repo bar &&
+	test_commit -C repo baz &&
+
+	promise_and_delete $(git -C repo rev-parse bar^{tree}) &&
+	promise_and_delete $(git -C repo rev-parse foo^{tree}) &&
+
+	git -C repo config core.repositoryformatversion 1 &&
+	git -C repo config extensions.partialclone "arbitrary string" &&
+
+	git -C repo rev-list --missing=allow-promisor --objects HEAD >objs 2>rev_list_err &&
+	test_must_be_empty rev_list_err &&
+	# 3 commits, 3 blobs, and 1 tree
+	test_line_count = 7 objs &&
+
+	# Do the same for --exclude-promisor-objects, but with all trees gone.
+	promise_and_delete $(git -C repo rev-parse baz^{tree}) &&
+	git -C repo rev-list --exclude-promisor-objects --objects HEAD >objs 2>rev_list_err &&
+	test_must_be_empty rev_list_err &&
+	# 3 commits, no blobs or trees
+	test_line_count = 3 objs
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t0410-partial-clone/repo/.git/
+[master (root-commit) 04ebf83] foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo.t
+[master 5d5378c] bar
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 bar.t
+[master 403f8b0] baz
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 baz.t
+0b80a4a4c757c906c0610b334ecc13c1f548f26c
+4e80f36effe3aa9dd9f1a8d0e85f678beada4e19
+29e6ce195f02e80b806c775b2e0f16fa4a6e50ac
+ok 13 - missing tree objects with --missing=allow-promisor and --exclude-promisor-objects
+
+expecting success: 
+	rm -rf repo &&
+	test_create_repo repo &&
+	mkdir repo/dir &&
+	echo foo >repo/dir/foo &&
+	git -C repo add dir/foo &&
+	git -C repo commit -m "commit dir/foo" &&
+
+	promise_and_delete $(git -C repo rev-parse HEAD:dir) &&
+
+	git -C repo config core.repositoryformatversion 1 &&
+	git -C repo config extensions.partialclone "arbitrary string" &&
+
+	git -C repo rev-list --missing=allow-any --objects HEAD >objs 2>rev_list_err &&
+	test_must_be_empty rev_list_err &&
+	# 1 commit and 1 tree
+	test_line_count = 2 objs
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t0410-partial-clone/repo/.git/
+[master (root-commit) fc3d893] commit dir/foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 dir/foo
+6701d28601ab148de66e908befaa9f313f9670ed
+ok 14 - missing non-root tree object and rev-list
+
+expecting success: 
+	rm -rf repo &&
+	test_create_repo repo &&
+	test_commit -C repo foo &&
+	mkdir repo/a_dir &&
+	echo something >repo/a_dir/something &&
+	git -C repo add a_dir/something &&
+	git -C repo commit -m bar &&
+
+	# foo^{tree} (tree referenced from commit)
+	TREE=$(git -C repo rev-parse foo^{tree}) &&
+
+	# a tree referenced by HEAD^{tree} (tree referenced from tree)
+	TREE2=$(git -C repo ls-tree HEAD^{tree} | grep " tree " | head -1 | cut -b13-52) &&
+
+	promise_and_delete "$TREE" &&
+	promise_and_delete "$TREE2" &&
+
+	git -C repo config core.repositoryformatversion 1 &&
+	git -C repo config extensions.partialclone "arbitrary string" &&
+	git -C repo rev-list --exclude-promisor-objects --objects HEAD >out &&
+	grep $(git -C repo rev-parse foo) out &&
+	! grep $TREE out &&
+	grep $(git -C repo rev-parse HEAD) out &&
+	! grep $TREE2 out
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t0410-partial-clone/repo/.git/
+[master (root-commit) b259608] foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo.t
+[master 2b50f7e] bar
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 a_dir/something
+c847e09064df2c3060b894adee7d1fcbdc41d77e
+053da52d70d31500a108f08bc31d5a72f5db7bc7
+b259608956a9de662b43c93c18f15e427dcac80e
+2b50f7eb48302601d810b4c1627ad25f05e81216
+ok 15 - rev-list stops traversal at missing and promised tree
+
+expecting success: 
+	rm -rf repo &&
+	test_create_repo repo &&
+	echo something >repo/something &&
+	git -C repo add something &&
+	git -C repo commit -m foo &&
+
+	BLOB=$(git -C repo hash-object -w something) &&
+	promise_and_delete "$BLOB" &&
+
+	git -C repo config core.repositoryformatversion 1 &&
+	git -C repo config extensions.partialclone "arbitrary string" &&
+	git -C repo rev-list --exclude-promisor-objects --objects HEAD >out &&
+	grep $(git -C repo rev-parse HEAD) out &&
+	! grep $BLOB out
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t0410-partial-clone/repo/.git/
+[master (root-commit) 9aebf3f] foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 something
+159a5b25735cb846bca3d8d102a38e273eb423d5
+9aebf3fc471ba852071c23be641e3c8273d6ee27
+ok 16 - rev-list stops traversal at missing and promised blob
+
+expecting success: 
+	rm -rf repo &&
+	test_create_repo repo &&
+	test_commit -C repo foo &&
+	test_commit -C repo bar &&
+	test_commit -C repo baz &&
+
+	COMMIT=$(git -C repo rev-parse foo) &&
+	TREE=$(git -C repo rev-parse bar^{tree}) &&
+	BLOB=$(git hash-object repo/baz.t) &&
+	printf "%s\n%s\n%s\n" $COMMIT $TREE $BLOB | pack_as_from_promisor &&
+
+	git -C repo config core.repositoryformatversion 1 &&
+	git -C repo config extensions.partialclone "arbitrary string" &&
+	git -C repo rev-list --exclude-promisor-objects --objects HEAD >out &&
+	! grep $COMMIT out &&
+	! grep $TREE out &&
+	! grep $BLOB out &&
+	grep $(git -C repo rev-parse bar) out  # sanity check that some walking was done
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t0410-partial-clone/repo/.git/
+[master (root-commit) a4efc16] foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo.t
+[master b3b6050] bar
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 bar.t
+[master 70d6cfa] baz
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 baz.t
+03f058b726123c4f1ef352333fd9c0c557466ad4
+b3b6050676a5798a4107f8ec799fe53b4ecd55b1
+ok 17 - rev-list stops traversal at promisor commit, tree, and blob
+
+expecting success: 
+	rm -rf repo &&
+	test_create_repo repo &&
+	test_commit -C repo foo &&
+	test_commit -C repo bar &&
+	test_commit -C repo baz &&
+
+	COMMIT=$(git -C repo rev-parse foo) &&
+	TREE=$(git -C repo rev-parse bar^{tree}) &&
+	BLOB=$(git hash-object repo/baz.t) &&
+
+	promise_and_delete $COMMIT &&
+	promise_and_delete $TREE &&
+	promise_and_delete $BLOB &&
+
+	git -C repo config core.repositoryformatversion 1 &&
+	git -C repo config extensions.partialclone "arbitrary string" &&
+	git -C repo rev-list --exclude-promisor-objects --objects "$COMMIT" "$TREE" "$BLOB"
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t0410-partial-clone/repo/.git/
+[master (root-commit) 9221471] foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo.t
+[master ff8c8be] bar
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 bar.t
+[master aa6395a] baz
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 baz.t
+40181af12b32f68a435aa73643389d18023d886f
+error: refs/tags/foo does not point to a valid object!
+e3ac27606f214fe554908dcfb180e5adc75c16e7
+error: refs/tags/foo does not point to a valid object!
+2188d83092576306608ebcdf2c84441aa35221fb
+ok 18 - rev-list accepts missing and promised objects on command line
+
+expecting success: 
+	rm -rf repo &&
+	test_create_repo repo &&
+	test_commit -C repo one &&
+	test_commit -C repo two &&
+
+	TREE_ONE=$(git -C repo rev-parse one^{tree}) &&
+	printf "$TREE_ONE\n" | pack_as_from_promisor &&
+	TREE_TWO=$(git -C repo rev-parse two^{tree}) &&
+	printf "$TREE_TWO\n" | pack_as_from_promisor &&
+
+	git -C repo config core.repositoryformatversion 1 &&
+	git -C repo config extensions.partialclone "arbitrary string" &&
+	git -C repo gc &&
+
+	# Ensure that exactly one promisor packfile exists, and that it
+	# contains the trees but not the commits
+	ls repo/.git/objects/pack/pack-*.promisor >promisorlist &&
+	test_line_count = 1 promisorlist &&
+	PROMISOR_PACKFILE=$(sed "s/.promisor/.pack/" <promisorlist) &&
+	git verify-pack $PROMISOR_PACKFILE -v >out &&
+	grep "$TREE_ONE" out &&
+	grep "$TREE_TWO" out &&
+	! grep "$(git -C repo rev-parse one)" out &&
+	! grep "$(git -C repo rev-parse two)" out &&
+
+	# Remove the promisor packfile and associated files
+	rm $(sed "s/.promisor//" <promisorlist).* &&
+
+	# Ensure that the single other pack contains the commits, but not the
+	# trees
+	ls repo/.git/objects/pack/pack-*.pack >packlist &&
+	test_line_count = 1 packlist &&
+	git verify-pack repo/.git/objects/pack/pack-*.pack -v >out &&
+	grep "$(git -C repo rev-parse one)" out &&
+	grep "$(git -C repo rev-parse two)" out &&
+	! grep "$TREE_ONE" out &&
+	! grep "$TREE_TWO" out
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t0410-partial-clone/repo/.git/
+[master (root-commit) 6d3dd09] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+[master 22004c9] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+80b0d61182f42d417d3f1080999c86acd16276f7
+4f4b1c441e35611dff006a309fbda4370b40fc90
+a7cddf35737959e1438bc929b665619e9e79bfee tree   33 44 12
+2f00a404aed7e63d867313d504bd0fccea53fd25 tree   66 73 56
+6d3dd09ab2409ace50d451184915bd38484087c9 commit 167 126 169
+22004c9d096c64b8edacd5e5aa8119ba60f89b35 commit 215 157 12
+ok 19 - gc repacks promisor objects separately from non-promisor objects
+
+expecting success: 
+	rm -rf repo &&
+	test_create_repo repo &&
+	test_commit -C repo one &&
+
+	git -C repo config core.repositoryformatversion 1 &&
+	git -C repo config extensions.partialclone "arbitrary string" &&
+	git -C repo gc &&
+
+	# Ensure that only one pack exists
+	ls repo/.git/objects/pack/pack-*.pack >packlist &&
+	test_line_count = 1 packlist
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t0410-partial-clone/repo/.git/
+[master (root-commit) 46d8c68] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+ok 20 - gc does not repack promisor objects if there are none
+
+expecting success: 
+	rm -rf repo &&
+	test_create_repo repo &&
+	git -C repo config core.repositoryformatversion 1 &&
+	git -C repo config extensions.partialclone "arbitrary string" &&
+
+	git -C repo commit --allow-empty -m one &&
+	git -C repo commit --allow-empty -m two &&
+	git -C repo commit --allow-empty -m three &&
+	git -C repo commit --allow-empty -m four &&
+	ONE=$(git -C repo rev-parse HEAD^^^) &&
+	TWO=$(git -C repo rev-parse HEAD^^) &&
+	THREE=$(git -C repo rev-parse HEAD^) &&
+
+	printf "$TWO\n" | pack_as_from_promisor &&
+	printf "$THREE\n" | pack_as_from_promisor &&
+	delete_object repo "$ONE" &&
+
+	repack_and_check -a "$TWO" "$THREE" &&
+	repack_and_check -A "$TWO" "$THREE" &&
+	repack_and_check -l "$TWO" "$THREE"
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t0410-partial-clone/repo/.git/
+[master (root-commit) 95edc28] one
+ Author: A U Thor <author@example.com>
+[master 114744c] two
+ Author: A U Thor <author@example.com>
+[master e00c151] three
+ Author: A U Thor <author@example.com>
+[master 9a209d2] four
+ Author: A U Thor <author@example.com>
+c3a7ba83b6f7f6d5eb1b78f6a97d86d8c857112b
+9999d8693559878e42c5d6a9cc38dcc697697f83
+warning: reflog of 'refs/heads/master' references pruned commits
+warning: reflog of 'HEAD' references pruned commits
+warning: reflog of 'refs/heads/master' references pruned commits
+warning: reflog of 'HEAD' references pruned commits
+warning: reflog of 'refs/heads/master' references pruned commits
+warning: reflog of 'HEAD' references pruned commits
+ok 21 - repack -d does not irreversibly delete promisor objects
+
+expecting success: 
+	rm -rf repo &&
+	test_create_repo repo &&
+	test_commit -C repo my_commit &&
+
+	TREE_HASH=$(git -C repo rev-parse HEAD^{tree}) &&
+	HASH=$(promise_and_delete $TREE_HASH) &&
+
+	git -C repo config core.repositoryformatversion 1 &&
+	git -C repo config extensions.partialclone "arbitrary string" &&
+	git -C repo gc &&
+
+	# Ensure that the promisor packfile still exists, and remove it
+	test -e repo/.git/objects/pack/pack-$HASH.pack &&
+	rm repo/.git/objects/pack/pack-$HASH.* &&
+
+	# Ensure that the single other pack contains the commit, but not the tree
+	ls repo/.git/objects/pack/pack-*.pack >packlist &&
+	test_line_count = 1 packlist &&
+	git verify-pack repo/.git/objects/pack/pack-*.pack -v >out &&
+	grep "$(git -C repo rev-parse HEAD)" out &&
+	! grep "$TREE_HASH" out
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t0410-partial-clone/repo/.git/
+[master (root-commit) b740cae] my_commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 my_commit.t
+b740cae5ace132631585f8db5f228adf51170f3b commit 173 129 12
+ok 22 - gc stops traversal when a missing but promised object is reached
+
+checking prerequisite: NOT_ROOT
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
+	uid=$(id -u) &&
+	test "$uid" != 0
+
+)
+prerequisite NOT_ROOT ok
+# passed all 22 test(s)
+# SKIP no web server found at '/usr/sbin/apache2'
+1..22
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t1305-config-include.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1305-config-include/.git/
+*** t0060-path-utils.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t0060-path-utils/.git/
+expecting success: test-tool path-utils basename
+ok 1 - basename
+
+expecting success: test-tool path-utils dirname
+ok 2 - dirname
+
+expecting success: test "$(test-tool path-utils normalize_path_copy '')" = ''
+ok 3 - normalize path:  => 
+
+expecting success: test "$(test-tool path-utils normalize_path_copy '.')" = ''
+ok 4 - normalize path: . => 
+
+expecting success: test "$(test-tool path-utils normalize_path_copy './')" = ''
+ok 5 - normalize path: ./ => 
+
+expecting success: test "$(test-tool path-utils normalize_path_copy './.')" = ''
+ok 6 - normalize path: ./. => 
+
+expecting success: test "$(test-tool path-utils normalize_path_copy './..')" = '++failed++'
+ok 7 - normalize path: ./.. => ++failed++
+
+expecting success: test "$(test-tool path-utils normalize_path_copy '../.')" = '++failed++'
+ok 8 - normalize path: ../. => ++failed++
+
+expecting success: test "$(test-tool path-utils normalize_path_copy './.././/')" = '++failed++'
+ok 9 - normalize path: ./../.// => ++failed++
+
+expecting success: test "$(test-tool path-utils normalize_path_copy 'dir/..')" = ''
+ok 10 - normalize path: dir/.. => 
+
+expecting success: test "$(test-tool path-utils normalize_path_copy 'dir/sub/../..')" = ''
+ok 11 - normalize path: dir/sub/../.. => 
+
+expecting success: test "$(test-tool path-utils normalize_path_copy 'dir/sub/../../..')" = '++failed++'
+ok 12 - normalize path: dir/sub/../../.. => ++failed++
+
+expecting success: test "$(test-tool path-utils normalize_path_copy 'dir')" = 'dir'
+ok 13 - normalize path: dir => dir
+
+expecting success: test "$(test-tool path-utils normalize_path_copy 'dir//')" = 'dir/'
+ok 14 - normalize path: dir// => dir/
+
+expecting success: test "$(test-tool path-utils normalize_path_copy './dir')" = 'dir'
+ok 15 - normalize path: ./dir => dir
+
+expecting success: test "$(test-tool path-utils normalize_path_copy 'dir/.')" = 'dir/'
+ok 16 - normalize path: dir/. => dir/
+
+expecting success: test "$(test-tool path-utils normalize_path_copy 'dir///./')" = 'dir/'
+ok 17 - normalize path: dir///./ => dir/
+
+expecting success: test "$(test-tool path-utils normalize_path_copy 'dir//sub/..')" = 'dir/'
+ok 18 - normalize path: dir//sub/.. => dir/
+
+expecting success: test "$(test-tool path-utils normalize_path_copy 'dir/sub/../')" = 'dir/'
+ok 19 - normalize path: dir/sub/../ => dir/
+
+expecting success: test "$(test-tool path-utils normalize_path_copy 'dir/sub/../.')" = 'dir/'
+ok 20 - normalize path: dir/sub/../. => dir/
+
+expecting success: test "$(test-tool path-utils normalize_path_copy 'dir/s1/../s2/')" = 'dir/s2/'
+ok 21 - normalize path: dir/s1/../s2/ => dir/s2/
+
+expecting success: test "$(test-tool path-utils normalize_path_copy 'd1/s1///s2/..//../s3/')" = 'd1/s3/'
+ok 22 - normalize path: d1/s1///s2/..//../s3/ => d1/s3/
+
+expecting success: test "$(test-tool path-utils normalize_path_copy 'd1/s1//../s2/../../d2')" = 'd2'
+ok 23 - normalize path: d1/s1//../s2/../../d2 => d2
+
+expecting success: test "$(test-tool path-utils normalize_path_copy 'd1/.../d2')" = 'd1/.../d2'
+ok 24 - normalize path: d1/.../d2 => d1/.../d2
+
+expecting success: test "$(test-tool path-utils normalize_path_copy 'd1/..././../d2')" = 'd1/d2'
+ok 25 - normalize path: d1/..././../d2 => d1/d2
+
+expecting success: test "$(test-tool path-utils normalize_path_copy '/')" = '/'
+ok 26 - normalize path: / => /
+
+expecting success: test "$(test-tool path-utils normalize_path_copy '//')" = '/'
+ok 27 - normalize path: // => /
+
+expecting success: test "$(test-tool path-utils normalize_path_copy '///')" = '/'
+ok 28 - normalize path: /// => /
+
+expecting success: test "$(test-tool path-utils normalize_path_copy '/.')" = '/'
+ok 29 - normalize path: /. => /
+
+expecting success: test "$(test-tool path-utils normalize_path_copy '/./')" = '/'
+ok 30 - normalize path: /./ => /
+
+expecting success: test "$(test-tool path-utils normalize_path_copy '/./..')" = '++failed++'
+ok 31 - normalize path: /./.. => ++failed++
+
+expecting success: test "$(test-tool path-utils normalize_path_copy '/../.')" = '++failed++'
+ok 32 - normalize path: /../. => ++failed++
+
+expecting success: test "$(test-tool path-utils normalize_path_copy '/./.././/')" = '++failed++'
+ok 33 - normalize path: /./../.// => ++failed++
+
+expecting success: test "$(test-tool path-utils normalize_path_copy '/dir/..')" = '/'
+ok 34 - normalize path: /dir/.. => /
+
+expecting success: test "$(test-tool path-utils normalize_path_copy '/dir/sub/../..')" = '/'
+ok 35 - normalize path: /dir/sub/../.. => /
+
+expecting success: test "$(test-tool path-utils normalize_path_copy '/dir/sub/../../..')" = '++failed++'
+ok 36 - normalize path: /dir/sub/../../.. => ++failed++
+
+expecting success: test "$(test-tool path-utils normalize_path_copy '/dir')" = '/dir'
+ok 37 - normalize path: /dir => /dir
+
+expecting success: test "$(test-tool path-utils normalize_path_copy '/dir//')" = '/dir/'
+ok 38 - normalize path: /dir// => /dir/
+
+expecting success: test "$(test-tool path-utils normalize_path_copy '/./dir')" = '/dir'
+ok 39 - normalize path: /./dir => /dir
+
+expecting success: test "$(test-tool path-utils normalize_path_copy '/dir/.')" = '/dir/'
+ok 40 - normalize path: /dir/. => /dir/
+
+expecting success: test "$(test-tool path-utils normalize_path_copy '/dir///./')" = '/dir/'
+ok 41 - normalize path: /dir///./ => /dir/
+
+expecting success: test "$(test-tool path-utils normalize_path_copy '/dir//sub/..')" = '/dir/'
+ok 42 - normalize path: /dir//sub/.. => /dir/
+
+expecting success: test "$(test-tool path-utils normalize_path_copy '/dir/sub/../')" = '/dir/'
+ok 43 - normalize path: /dir/sub/../ => /dir/
+
+expecting success: test "$(test-tool path-utils normalize_path_copy '//dir/sub/../.')" = '/dir/'
+ok 44 - normalize path: //dir/sub/../. => /dir/
+
+expecting success: test "$(test-tool path-utils normalize_path_copy '/dir/s1/../s2/')" = '/dir/s2/'
+ok 45 - normalize path: /dir/s1/../s2/ => /dir/s2/
+
+expecting success: test "$(test-tool path-utils normalize_path_copy '/d1/s1///s2/..//../s3/')" = '/d1/s3/'
+ok 46 - normalize path: /d1/s1///s2/..//../s3/ => /d1/s3/
+
+expecting success: test "$(test-tool path-utils normalize_path_copy '/d1/s1//../s2/../../d2')" = '/d2'
+ok 47 - normalize path: /d1/s1//../s2/../../d2 => /d2
+
+expecting success: test "$(test-tool path-utils normalize_path_copy '/d1/.../d2')" = '/d1/.../d2'
+ok 48 - normalize path: /d1/.../d2 => /d1/.../d2
+
+expecting success: test "$(test-tool path-utils normalize_path_copy '/d1/..././../d2')" = '/d1/d2'
+ok 49 - normalize path: /d1/..././../d2 => /d1/d2
+
+expecting success: actual=$(test-tool path-utils longest_ancestor_length '/' '/') &&
+	 test "$actual" = '-1'
+ok 50 - longest ancestor: / / => -1
+
+expecting success: actual=$(test-tool path-utils longest_ancestor_length '/foo' '/') &&
+	 test "$actual" = '0'
+ok 51 - longest ancestor: /foo / => 0
+
+expecting success: actual=$(test-tool path-utils longest_ancestor_length '/foo' '/fo') &&
+	 test "$actual" = '-1'
+ok 52 - longest ancestor: /foo /fo => -1
+
+expecting success: actual=$(test-tool path-utils longest_ancestor_length '/foo' '/foo') &&
+	 test "$actual" = '-1'
+ok 53 - longest ancestor: /foo /foo => -1
+
+expecting success: actual=$(test-tool path-utils longest_ancestor_length '/foo' '/bar') &&
+	 test "$actual" = '-1'
+ok 54 - longest ancestor: /foo /bar => -1
+
+expecting success: actual=$(test-tool path-utils longest_ancestor_length '/foo' '/foo/bar') &&
+	 test "$actual" = '-1'
+ok 55 - longest ancestor: /foo /foo/bar => -1
+
+expecting success: actual=$(test-tool path-utils longest_ancestor_length '/foo' '/foo:/bar') &&
+	 test "$actual" = '-1'
+ok 56 - longest ancestor: /foo /foo:/bar => -1
+
+expecting success: actual=$(test-tool path-utils longest_ancestor_length '/foo' '/:/foo:/bar') &&
+	 test "$actual" = '0'
+ok 57 - longest ancestor: /foo /:/foo:/bar => 0
+
+expecting success: actual=$(test-tool path-utils longest_ancestor_length '/foo' '/foo:/:/bar') &&
+	 test "$actual" = '0'
+ok 58 - longest ancestor: /foo /foo:/:/bar => 0
+
+expecting success: actual=$(test-tool path-utils longest_ancestor_length '/foo' '/:/bar:/foo') &&
+	 test "$actual" = '0'
+ok 59 - longest ancestor: /foo /:/bar:/foo => 0
+
+expecting success: actual=$(test-tool path-utils longest_ancestor_length '/foo/bar' '/') &&
+	 test "$actual" = '0'
+ok 60 - longest ancestor: /foo/bar / => 0
+
+expecting success: actual=$(test-tool path-utils longest_ancestor_length '/foo/bar' '/fo') &&
+	 test "$actual" = '-1'
+ok 61 - longest ancestor: /foo/bar /fo => -1
+
+expecting success: actual=$(test-tool path-utils longest_ancestor_length '/foo/bar' '/foo') &&
+	 test "$actual" = '4'
+ok 62 - longest ancestor: /foo/bar /foo => 4
+
+expecting success: actual=$(test-tool path-utils longest_ancestor_length '/foo/bar' '/foo/ba') &&
+	 test "$actual" = '-1'
+ok 63 - longest ancestor: /foo/bar /foo/ba => -1
+
+expecting success: actual=$(test-tool path-utils longest_ancestor_length '/foo/bar' '/:/fo') &&
+	 test "$actual" = '0'
+ok 64 - longest ancestor: /foo/bar /:/fo => 0
+
+expecting success: actual=$(test-tool path-utils longest_ancestor_length '/foo/bar' '/foo:/foo/ba') &&
+	 test "$actual" = '4'
+ok 65 - longest ancestor: /foo/bar /foo:/foo/ba => 4
+
+expecting success: actual=$(test-tool path-utils longest_ancestor_length '/foo/bar' '/bar') &&
+	 test "$actual" = '-1'
+ok 66 - longest ancestor: /foo/bar /bar => -1
+
+expecting success: actual=$(test-tool path-utils longest_ancestor_length '/foo/bar' '/fo') &&
+	 test "$actual" = '-1'
+ok 67 - longest ancestor: /foo/bar /fo => -1
+
+expecting success: actual=$(test-tool path-utils longest_ancestor_length '/foo/bar' '/foo:/bar') &&
+	 test "$actual" = '4'
+ok 68 - longest ancestor: /foo/bar /foo:/bar => 4
+
+expecting success: actual=$(test-tool path-utils longest_ancestor_length '/foo/bar' '/:/foo:/bar') &&
+	 test "$actual" = '4'
+ok 69 - longest ancestor: /foo/bar /:/foo:/bar => 4
+
+expecting success: actual=$(test-tool path-utils longest_ancestor_length '/foo/bar' '/foo:/:/bar') &&
+	 test "$actual" = '4'
+ok 70 - longest ancestor: /foo/bar /foo:/:/bar => 4
+
+expecting success: actual=$(test-tool path-utils longest_ancestor_length '/foo/bar' '/:/bar:/fo') &&
+	 test "$actual" = '0'
+ok 71 - longest ancestor: /foo/bar /:/bar:/fo => 0
+
+expecting success: actual=$(test-tool path-utils longest_ancestor_length '/foo/bar' '/:/bar') &&
+	 test "$actual" = '0'
+ok 72 - longest ancestor: /foo/bar /:/bar => 0
+
+expecting success: actual=$(test-tool path-utils longest_ancestor_length '/foo/bar' '/foo') &&
+	 test "$actual" = '4'
+ok 73 - longest ancestor: /foo/bar /foo => 4
+
+expecting success: actual=$(test-tool path-utils longest_ancestor_length '/foo/bar' '/foo:/bar') &&
+	 test "$actual" = '4'
+ok 74 - longest ancestor: /foo/bar /foo:/bar => 4
+
+expecting success: actual=$(test-tool path-utils longest_ancestor_length '/foo/bar' '/bar') &&
+	 test "$actual" = '-1'
+ok 75 - longest ancestor: /foo/bar /bar => -1
+
 expecting success: 
-	echo "[test]one = 1" >one &&
-	echo "[include]path = \"$(pwd)/one\"" >.gitconfig &&
-	echo 1 >expect &&
-	git config test.one >actual &&
-	test_cmp expect actual
+	test c:/msysgit = $(test-tool path-utils strip_path_suffix \
+		c:/msysgit/libexec//git-core libexec/git-core)
 
-ok 1 - include file by absolute path
+ok 76 - strip_path_suffix
 
 expecting success: 
-	echo "[test]one = 1" >one &&
-	echo "[include]path = one" >.gitconfig &&
-	echo 1 >expect &&
-	git config test.one >actual &&
-	test_cmp expect actual
+	test_must_fail test-tool path-utils absolute_path ""
 
-ok 2 - include file by relative path
+fatal: The empty string is not a valid path
+ok 77 - absolute path rejects the empty string
+
+skipping test: <drive-letter>:\\abc is an absolute path 
+	for letter in : \" C Z 1 ä
+	do
+		path=$letter:\\abc &&
+		absolute="$(test-tool path-utils absolute_path "$path")" &&
+		test "$path" = "$absolute" || return 1
+	done
+
+ok 78 # skip <drive-letter>:\\abc is an absolute path (missing MINGW)
 
 expecting success: 
-	mkdir subdir &&
-	echo "[test]three = 3" >subdir/three &&
-	echo "[include]path = three" >subdir/two &&
-	echo "[include]path = subdir/two" >.gitconfig &&
-	echo 3 >expect &&
-	git config test.three >actual &&
-	test_cmp expect actual
+	test_must_fail test-tool path-utils real_path ""
 
-ok 3 - chained relative paths
+fatal: The empty string is not a valid path
+ok 79 - real path rejects the empty string
 
 expecting success: 
-	echo "[test]one = 1" >one &&
-	echo "[include]path = ~/one" >.gitconfig &&
-	echo 1 >expect &&
-	git config test.one >actual &&
-	test_cmp expect actual
+	nopath="hopefully-absent-path" &&
+	test "/" = "$(test-tool path-utils real_path "/")" &&
+	test "/$nopath" = "$(test-tool path-utils real_path "/$nopath")"
 
-ok 4 - include paths get tilde-expansion
+ok 80 - real path works on absolute paths 1
 
 expecting success: 
-	echo "[test]one = 1" >one &&
-	echo "[include]path = one" >.gitconfig &&
-	echo one >expect &&
-	git config include.path >actual &&
-	test_cmp expect actual
+	nopath="hopefully-absent-path" &&
+	# Find an existing top-level directory for the remaining tests:
+	d=$(pwd -P | sed -e "s|^\([^/]*/[^/]*\)/.*|\1|") &&
+	test "$d" = "$(test-tool path-utils real_path "$d")" &&
+	test "$d/$nopath" = "$(test-tool path-utils real_path "$d/$nopath")"
 
-ok 5 - include options can still be examined
+ok 81 - real path works on absolute paths 2
 
 expecting success: 
-	echo "[test]one = 1" >one &&
-	echo "[include]path = one" >.gitconfig &&
-	cat >expect <<-\EOF &&
-	include.path=one
-	test.one=1
-	EOF
-	git config --list >actual.full &&
-	grep -v ^core actual.full >actual &&
-	test_cmp expect actual
+	nopath="hopefully-absent-path" &&
+	test "/" = "$(test-tool path-utils real_path "///")" &&
+	test "/$nopath" = "$(test-tool path-utils real_path "///$nopath")" &&
+	# Find an existing top-level directory for the remaining tests:
+	d=$(pwd -P | sed -e "s|^\([^/]*/[^/]*\)/.*|\1|") &&
+	test "$d" = "$(test-tool path-utils real_path "//$d")" &&
+	test "$d/$nopath" = "$(test-tool path-utils real_path "//$d/$nopath")"
 
-ok 6 - listing includes option and expansion
+ok 82 - real path removes extra leading slashes
 
 expecting success: 
-	echo "[test]one = 1" >one &&
-	echo "[include]path = one" >.gitconfig &&
-	test_must_fail git config -f .gitconfig test.one &&
-	test_must_fail git config --global test.one &&
-	echo 1 >expect &&
-	git config --includes -f .gitconfig test.one >actual &&
-	test_cmp expect actual
+	nopath="hopefully-absent-path" &&
+	# Find an existing top-level directory for the remaining tests:
+	d=$(pwd -P | sed -e "s|^\([^/]*/[^/]*\)/.*|\1|") &&
+	test "$d" = "$(test-tool path-utils real_path "$d///")" &&
+	test "$d/$nopath" = "$(test-tool path-utils real_path "$d///$nopath")"
 
-ok 7 - single file lookup does not expand includes by default
+ok 83 - real path removes other extra slashes
+
+checking prerequisite: SYMLINKS
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
+	# test whether the filesystem supports symbolic links
+	ln -s x y && test -h y
 
+)
+prerequisite SYMLINKS ok
 expecting success: 
-	echo "[test]one = 1" >one &&
-	echo "[include]path = one" >.gitconfig &&
-	echo "include.path=one" >expect &&
-	git config -f .gitconfig --list >actual &&
-	test_cmp expect actual
+	mkdir first &&
+	ln -s ../.git first/.git &&
+	mkdir second &&
+	ln -s ../first second/other &&
+	mkdir third &&
+	dir="$(cd .git; pwd -P)" &&
+	dir2=third/../second/other/.git &&
+	test "$dir" = "$(test-tool path-utils real_path $dir2)" &&
+	file="$dir"/index &&
+	test "$file" = "$(test-tool path-utils real_path $dir2/index)" &&
+	basename=blub &&
+	test "$dir/$basename" = "$(cd .git && test-tool path-utils real_path "$basename")" &&
+	ln -s ../first/file .git/syml &&
+	sym="$(cd first; pwd -P)"/file &&
+	test "$sym" = "$(test-tool path-utils real_path "$dir2/syml")"
 
-ok 8 - single file list does not expand includes by default
+ok 84 - real path works on symlinks
 
 expecting success: 
-	echo "[test]one = 1" >one &&
-	echo "[include]path = one" >.gitconfig &&
-	git config test.two 2 &&
-	echo 2 >expect &&
-	git config --no-includes test.two >actual &&
-	test_cmp expect actual &&
-	test_must_fail git config --no-includes test.one
+	ln -s target symlink &&
+	test "$(test-tool path-utils prefix_path prefix "$(pwd)/symlink")" = "symlink"
 
-ok 9 - writing config file does not expand includes
+ok 85 - prefix_path works with absolute paths to work tree symlinks
 
 expecting success: 
-	echo "[test]one = 1" >one &&
-	echo "[include]path = one" >.gitconfig &&
-	git config test.one 2 &&
-	echo 1 >expect &&
-	git config -f one test.one >actual &&
-	test_cmp expect actual &&
-	cat >expect <<-\EOF &&
-	1
-	2
-	EOF
-	git config --get-all test.one >actual &&
-	test_cmp expect actual
+	echo "" >expected &&
+	test-tool path-utils prefix_path prefix "$(pwd)" >actual &&
+	test_cmp expected actual
 
-ok 10 - config modification does not affect includes
+ok 86 - prefix_path works with only absolute path to work tree
 
 expecting success: 
-	cat >.gitconfig <<-\EOF &&
-	[include]path = non-existent
-	[test]value = yes
-	EOF
-	echo yes >expect &&
-	git config test.value >actual &&
-	test_cmp expect actual
+	test_must_fail test-tool path-utils prefix_path prefix "$(pwd)a"
 
-ok 11 - missing include files are ignored
+fatal: '/build/git-2.20.1/t/trash directory.t0060-path-utilsa' is outside repository
+ok 87 - prefix_path rejects absolute path to dir with same beginning as work tree
 
 expecting success: 
-	echo "[test]one = 1" >one &&
-	echo 1 >expect &&
-	git -c include.path="$(pwd)/one" config test.one >actual &&
-	test_cmp expect actual
+	git init repo &&
+	ln -s repo repolink &&
+	test "a" = "$(cd repo && test-tool path-utils prefix_path prefix "$(pwd)/../repolink/a")"
 
-ok 12 - absolute includes from command line work
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t0060-path-utils/repo/.git/
+ok 88 - prefix_path works with absolute path to a symlink to work tree having  same beginning as work tree
+
+expecting success: test "$(test-tool path-utils relative_path '/foo/a/b/c/' '/foo/a/b/')" = 'c/'
+ok 89 - relative path: /foo/a/b/c/ /foo/a/b/ => c/
+
+expecting success: test "$(test-tool path-utils relative_path '/foo/a/b/c/' '/foo/a/b')" = 'c/'
+ok 90 - relative path: /foo/a/b/c/ /foo/a/b => c/
+
+expecting success: test "$(test-tool path-utils relative_path '/foo/a//b//c/' '///foo/a/b//')" = 'c/'
+ok 91 - relative path: /foo/a//b//c/ ///foo/a/b// => c/
+
+expecting success: test "$(test-tool path-utils relative_path '/foo/a/b' '/foo/a/b')" = './'
+ok 92 - relative path: /foo/a/b /foo/a/b => ./
+
+expecting success: test "$(test-tool path-utils relative_path '/foo/a/b/' '/foo/a/b')" = './'
+ok 93 - relative path: /foo/a/b/ /foo/a/b => ./
+
+expecting success: test "$(test-tool path-utils relative_path '/foo/a' '/foo/a/b')" = '../'
+ok 94 - relative path: /foo/a /foo/a/b => ../
+
+expecting success: test "$(test-tool path-utils relative_path '/' '/foo/a/b/')" = '../../../'
+ok 95 - relative path: / /foo/a/b/ => ../../../
+
+expecting success: test "$(test-tool path-utils relative_path '/foo/a/c' '/foo/a/b/')" = '../c'
+ok 96 - relative path: /foo/a/c /foo/a/b/ => ../c
+
+expecting success: test "$(test-tool path-utils relative_path '/foo/a/c' '/foo/a/b')" = '../c'
+ok 97 - relative path: /foo/a/c /foo/a/b => ../c
+
+expecting success: test "$(test-tool path-utils relative_path '/foo/x/y' '/foo/a/b/')" = '../../x/y'
+ok 98 - relative path: /foo/x/y /foo/a/b/ => ../../x/y
+
+expecting success: test "$(test-tool path-utils relative_path '/foo/a/b' '<empty>')" = '/foo/a/b'
+ok 99 - relative path: /foo/a/b <empty> => /foo/a/b
+
+expecting success: test "$(test-tool path-utils relative_path '/foo/a/b' '<null>')" = '/foo/a/b'
+ok 100 - relative path: /foo/a/b <null> => /foo/a/b
+
+expecting success: test "$(test-tool path-utils relative_path 'foo/a/b/c/' 'foo/a/b/')" = 'c/'
+ok 101 - relative path: foo/a/b/c/ foo/a/b/ => c/
+
+expecting success: test "$(test-tool path-utils relative_path 'foo/a/b/c/' 'foo/a/b')" = 'c/'
+ok 102 - relative path: foo/a/b/c/ foo/a/b => c/
+
+expecting success: test "$(test-tool path-utils relative_path 'foo/a/b//c' 'foo/a//b')" = 'c'
+ok 103 - relative path: foo/a/b//c foo/a//b => c
+
+expecting success: test "$(test-tool path-utils relative_path 'foo/a/b/' 'foo/a/b/')" = './'
+ok 104 - relative path: foo/a/b/ foo/a/b/ => ./
+
+expecting success: test "$(test-tool path-utils relative_path 'foo/a/b/' 'foo/a/b')" = './'
+ok 105 - relative path: foo/a/b/ foo/a/b => ./
+
+expecting success: test "$(test-tool path-utils relative_path 'foo/a' 'foo/a/b')" = '../'
+ok 106 - relative path: foo/a foo/a/b => ../
+
+expecting success: test "$(test-tool path-utils relative_path 'foo/x/y' 'foo/a/b')" = '../../x/y'
+ok 107 - relative path: foo/x/y foo/a/b => ../../x/y
+
+expecting success: test "$(test-tool path-utils relative_path 'foo/a/c' 'foo/a/b')" = '../c'
+ok 108 - relative path: foo/a/c foo/a/b => ../c
+
+expecting success: test "$(test-tool path-utils relative_path 'foo/a/b' '/foo/x/y')" = 'foo/a/b'
+ok 109 - relative path: foo/a/b /foo/x/y => foo/a/b
+
+expecting success: test "$(test-tool path-utils relative_path '/foo/a/b' 'foo/x/y')" = '/foo/a/b'
+ok 110 - relative path: /foo/a/b foo/x/y => /foo/a/b
+
+skipping test: relative path: d:/a/b D:/a/c => ../b test "$(test-tool path-utils relative_path 'd:/a/b' 'D:/a/c')" = '../b'
+ok 111 # skip relative path: d:/a/b D:/a/c => ../b (missing MINGW)
+
+skipping test: relative path: C:/a/b D:/a/c => C:/a/b test "$(test-tool path-utils relative_path 'C:/a/b' 'D:/a/c')" = 'C:/a/b'
+ok 112 # skip relative path: C:/a/b D:/a/c => C:/a/b (missing MINGW)
+
+expecting success: test "$(test-tool path-utils relative_path 'foo/a/b' '<empty>')" = 'foo/a/b'
+ok 113 - relative path: foo/a/b <empty> => foo/a/b
+
+expecting success: test "$(test-tool path-utils relative_path 'foo/a/b' '<null>')" = 'foo/a/b'
+ok 114 - relative path: foo/a/b <null> => foo/a/b
+
+expecting success: test "$(test-tool path-utils relative_path '<empty>' '/foo/a/b')" = './'
+ok 115 - relative path: <empty> /foo/a/b => ./
+
+expecting success: test "$(test-tool path-utils relative_path '<empty>' '<empty>')" = './'
+ok 116 - relative path: <empty> <empty> => ./
+
+expecting success: test "$(test-tool path-utils relative_path '<empty>' '<null>')" = './'
+ok 117 - relative path: <empty> <null> => ./
+
+expecting success: test "$(test-tool path-utils relative_path '<null>' '<empty>')" = './'
+ok 118 - relative path: <null> <empty> => ./
+
+expecting success: test "$(test-tool path-utils relative_path '<null>' '<null>')" = './'
+ok 119 - relative path: <null> <null> => ./
+
+expecting success: test "$(test-tool path-utils relative_path '<null>' '/foo/a/b')" = './'
+ok 120 - relative path: <null> /foo/a/b => ./
 
 expecting success: 
-	echo "[test]one = 1" >one &&
-	test_must_fail git -c include.path=one config test.one
+		A=B git rev-parse --git-path info/grafts >actual &&
+		echo .git/info/grafts >expect &&
+		test_cmp expect actual
+	
+ok 121 - git-path A=B info/grafts => .git/info/grafts
 
-error: relative config includes must come from files
-fatal: unable to parse command-line config
-ok 13 - relative includes from command line fail
+expecting success: 
+		GIT_GRAFT_FILE=foo git rev-parse --git-path info/grafts >actual &&
+		echo foo >expect &&
+		test_cmp expect actual
+	
+ok 122 - git-path GIT_GRAFT_FILE=foo info/grafts => foo
 
 expecting success: 
-	echo "[test]one = 1" >one &&
-	echo "[include]path=$(pwd)/one" >blob &&
-	blob=$(git hash-object -w blob) &&
-	echo 1 >expect &&
-	git config --blob=$blob test.one >actual &&
-	test_cmp expect actual
+		GIT_GRAFT_FILE=foo git rev-parse --git-path info/////grafts >actual &&
+		echo foo >expect &&
+		test_cmp expect actual
+	
+ok 123 - git-path GIT_GRAFT_FILE=foo info/////grafts => foo
 
-ok 14 - absolute includes from blobs work
+expecting success: 
+		GIT_INDEX_FILE=foo git rev-parse --git-path index >actual &&
+		echo foo >expect &&
+		test_cmp expect actual
+	
+ok 124 - git-path GIT_INDEX_FILE=foo index => foo
 
 expecting success: 
-	echo "[test]one = 1" >one &&
-	echo "[include]path=one" >blob &&
-	blob=$(git hash-object -w blob) &&
-	test_must_fail git config --blob=$blob test.one
+		GIT_INDEX_FILE=foo git rev-parse --git-path index/foo >actual &&
+		echo .git/index/foo >expect &&
+		test_cmp expect actual
+	
+ok 125 - git-path GIT_INDEX_FILE=foo index/foo => .git/index/foo
 
-error: relative config includes must come from files
-error: bad config line 1 in blob d085876092eb24c144128bcd5db5d26e665f4f8a
-ok 15 - relative includes from blobs fail
+expecting success: 
+		GIT_INDEX_FILE=foo git rev-parse --git-path index2 >actual &&
+		echo .git/index2 >expect &&
+		test_cmp expect actual
+	
+ok 126 - git-path GIT_INDEX_FILE=foo index2 => .git/index2
+
+expecting success: mkdir foo
+ok 127 - setup fake objects directory foo
 
 expecting success: 
-	echo "[test]one = 1" >one &&
-	echo 1 >expect &&
-	echo "[include]path=\"$(pwd)/one\"" |
-	git config --file - test.one >actual &&
-	test_cmp expect actual
+		GIT_OBJECT_DIRECTORY=foo git rev-parse --git-path objects >actual &&
+		echo foo >expect &&
+		test_cmp expect actual
+	
+ok 128 - git-path GIT_OBJECT_DIRECTORY=foo objects => foo
 
-ok 16 - absolute includes from stdin work
+expecting success: 
+		GIT_OBJECT_DIRECTORY=foo git rev-parse --git-path objects/foo >actual &&
+		echo foo/foo >expect &&
+		test_cmp expect actual
+	
+ok 129 - git-path GIT_OBJECT_DIRECTORY=foo objects/foo => foo/foo
 
 expecting success: 
-	echo "[test]one = 1" >one &&
-	echo "[include]path=one" |
-	test_must_fail git config --file - test.one
+		GIT_OBJECT_DIRECTORY=foo git rev-parse --git-path objects2 >actual &&
+		echo .git/objects2 >expect &&
+		test_cmp expect actual
+	
+ok 130 - git-path GIT_OBJECT_DIRECTORY=foo objects2 => .git/objects2
 
-error: relative config includes must come from files
-fatal: bad config line 1 in standard input
-ok 17 - relative includes from stdin line fail
+expecting success: git --git-dir=bar init
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t0060-path-utils/bar/
+ok 131 - setup common repository
 
 expecting success: 
-	git init foo &&
-	(
-		cd foo &&
-		echo "[includeIf \"gitdir:foo/\"]path=bar" >>.git/config &&
-		echo "[test]one=1" >.git/bar &&
-		echo 1 >expect &&
-		git config test.one >actual &&
+		GIT_COMMON_DIR=bar git rev-parse --git-path index >actual &&
+		echo .git/index >expect &&
 		test_cmp expect actual
-	)
+	
+ok 132 - git-path GIT_COMMON_DIR=bar index => .git/index
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1305-config-include/foo/.git/
-ok 18 - conditional include, both unanchored
+expecting success: 
+		GIT_COMMON_DIR=bar git rev-parse --git-path HEAD >actual &&
+		echo .git/HEAD >expect &&
+		test_cmp expect actual
+	
+ok 133 - git-path GIT_COMMON_DIR=bar HEAD => .git/HEAD
 
 expecting success: 
-	(
-		cd foo &&
-		echo "[includeIf \"gitdir:~/foo/\"]path=bar2" >>.git/config &&
-		echo "[test]two=2" >.git/bar2 &&
-		echo 2 >expect &&
-		git config test.two >actual &&
+		GIT_COMMON_DIR=bar git rev-parse --git-path logs/HEAD >actual &&
+		echo .git/logs/HEAD >expect &&
 		test_cmp expect actual
-	)
+	
+ok 134 - git-path GIT_COMMON_DIR=bar logs/HEAD => .git/logs/HEAD
 
-ok 19 - conditional include, $HOME expansion
+expecting success: 
+		GIT_COMMON_DIR=bar git rev-parse --git-path logs/refs/bisect/foo >actual &&
+		echo .git/logs/refs/bisect/foo >expect &&
+		test_cmp expect actual
+	
+ok 135 - git-path GIT_COMMON_DIR=bar logs/refs/bisect/foo => .git/logs/refs/bisect/foo
 
 expecting success: 
-	(
-		cd foo &&
-		echo "[includeIf \"gitdir:**/foo/**\"]path=bar3" >>.git/config &&
-		echo "[test]three=3" >.git/bar3 &&
-		echo 3 >expect &&
-		git config test.three >actual &&
+		GIT_COMMON_DIR=bar git rev-parse --git-path logs/refs/bisec/foo >actual &&
+		echo bar/logs/refs/bisec/foo >expect &&
 		test_cmp expect actual
-	)
+	
+ok 136 - git-path GIT_COMMON_DIR=bar logs/refs/bisec/foo => bar/logs/refs/bisec/foo
 
-ok 20 - conditional include, full pattern
+expecting success: 
+		GIT_COMMON_DIR=bar git rev-parse --git-path logs/refs/bisec >actual &&
+		echo bar/logs/refs/bisec >expect &&
+		test_cmp expect actual
+	
+ok 137 - git-path GIT_COMMON_DIR=bar logs/refs/bisec => bar/logs/refs/bisec
 
 expecting success: 
-	echo "[includeIf \"gitdir:./foo/.git\"]path=bar4" >>.gitconfig &&
-	echo "[test]four=4" >bar4 &&
-	(
-		cd foo &&
-		echo 4 >expect &&
-		git config test.four >actual &&
+		GIT_COMMON_DIR=bar git rev-parse --git-path logs/refs/bisectfoo >actual &&
+		echo bar/logs/refs/bisectfoo >expect &&
 		test_cmp expect actual
-	)
+	
+ok 138 - git-path GIT_COMMON_DIR=bar logs/refs/bisectfoo => bar/logs/refs/bisectfoo
 
-ok 21 - conditional include, relative path
+expecting success: 
+		GIT_COMMON_DIR=bar git rev-parse --git-path objects >actual &&
+		echo bar/objects >expect &&
+		test_cmp expect actual
+	
+ok 139 - git-path GIT_COMMON_DIR=bar objects => bar/objects
 
 expecting success: 
-	(
-		cd foo &&
-		echo "[includeIf \"gitdir/i:FOO/\"]path=bar5" >>.git/config &&
-		echo "[test]five=5" >.git/bar5 &&
-		echo 5 >expect &&
-		git config test.five >actual &&
+		GIT_COMMON_DIR=bar git rev-parse --git-path objects/bar >actual &&
+		echo bar/objects/bar >expect &&
 		test_cmp expect actual
-	)
+	
+ok 140 - git-path GIT_COMMON_DIR=bar objects/bar => bar/objects/bar
 
-ok 22 - conditional include, both unanchored, icase
+expecting success: 
+		GIT_COMMON_DIR=bar git rev-parse --git-path info/exclude >actual &&
+		echo bar/info/exclude >expect &&
+		test_cmp expect actual
+	
+ok 141 - git-path GIT_COMMON_DIR=bar info/exclude => bar/info/exclude
 
 expecting success: 
-	(
-		cd foo &&
-		echo "[includeIf \"gitdir:foo/\"]path=bar6" >>.git/config &&
-		echo "[test]six=6" >.git/bar6 &&
-		echo 6 >expect &&
-		test-tool config read_early_config test.six >actual &&
+		GIT_COMMON_DIR=bar git rev-parse --git-path info/grafts >actual &&
+		echo bar/info/grafts >expect &&
 		test_cmp expect actual
-	)
+	
+ok 142 - git-path GIT_COMMON_DIR=bar info/grafts => bar/info/grafts
 
-ok 23 - conditional include, early config reading
+expecting success: 
+		GIT_COMMON_DIR=bar git rev-parse --git-path info/sparse-checkout >actual &&
+		echo .git/info/sparse-checkout >expect &&
+		test_cmp expect actual
+	
+ok 143 - git-path GIT_COMMON_DIR=bar info/sparse-checkout => .git/info/sparse-checkout
 
-checking prerequisite: SYMLINKS
+expecting success: 
+		GIT_COMMON_DIR=bar git rev-parse --git-path info//sparse-checkout >actual &&
+		echo .git/info//sparse-checkout >expect &&
+		test_cmp expect actual
+	
+ok 144 - git-path GIT_COMMON_DIR=bar info//sparse-checkout => .git/info//sparse-checkout
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
-	# test whether the filesystem supports symbolic links
-	ln -s x y && test -h y
+expecting success: 
+		GIT_COMMON_DIR=bar git rev-parse --git-path remotes/bar >actual &&
+		echo bar/remotes/bar >expect &&
+		test_cmp expect actual
+	
+ok 145 - git-path GIT_COMMON_DIR=bar remotes/bar => bar/remotes/bar
 
-)
-prerequisite SYMLINKS ok
 expecting success: 
-	mkdir real-home &&
-	ln -s real-home home &&
-	(
-		HOME="$TRASH_DIRECTORY/home" &&
-		export HOME &&
-		cd "$HOME" &&
+		GIT_COMMON_DIR=bar git rev-parse --git-path branches/bar >actual &&
+		echo bar/branches/bar >expect &&
+		test_cmp expect actual
+	
+ok 146 - git-path GIT_COMMON_DIR=bar branches/bar => bar/branches/bar
 
-		git init foo &&
-		cd foo &&
-		mkdir sub
+expecting success: 
+		GIT_COMMON_DIR=bar git rev-parse --git-path logs/refs/heads/master >actual &&
+		echo bar/logs/refs/heads/master >expect &&
+		test_cmp expect actual
+	
+ok 147 - git-path GIT_COMMON_DIR=bar logs/refs/heads/master => bar/logs/refs/heads/master
+
+expecting success: 
+		GIT_COMMON_DIR=bar git rev-parse --git-path refs/heads/master >actual &&
+		echo bar/refs/heads/master >expect &&
+		test_cmp expect actual
+	
+ok 148 - git-path GIT_COMMON_DIR=bar refs/heads/master => bar/refs/heads/master
+
+expecting success: 
+		GIT_COMMON_DIR=bar git rev-parse --git-path refs/bisect/foo >actual &&
+		echo .git/refs/bisect/foo >expect &&
+		test_cmp expect actual
+	
+ok 149 - git-path GIT_COMMON_DIR=bar refs/bisect/foo => .git/refs/bisect/foo
+
+expecting success: 
+		GIT_COMMON_DIR=bar git rev-parse --git-path hooks/me >actual &&
+		echo bar/hooks/me >expect &&
+		test_cmp expect actual
+	
+ok 150 - git-path GIT_COMMON_DIR=bar hooks/me => bar/hooks/me
+
+expecting success: 
+		GIT_COMMON_DIR=bar git rev-parse --git-path config >actual &&
+		echo bar/config >expect &&
+		test_cmp expect actual
+	
+ok 151 - git-path GIT_COMMON_DIR=bar config => bar/config
+
+expecting success: 
+		GIT_COMMON_DIR=bar git rev-parse --git-path packed-refs >actual &&
+		echo bar/packed-refs >expect &&
+		test_cmp expect actual
+	
+ok 152 - git-path GIT_COMMON_DIR=bar packed-refs => bar/packed-refs
+
+expecting success: 
+		GIT_COMMON_DIR=bar git rev-parse --git-path shallow >actual &&
+		echo bar/shallow >expect &&
+		test_cmp expect actual
+	
+ok 153 - git-path GIT_COMMON_DIR=bar shallow => bar/shallow
+
+expecting success: 
+		GIT_COMMON_DIR=bar git rev-parse --git-path common >actual &&
+		echo bar/common >expect &&
+		test_cmp expect actual
+	
+ok 154 - git-path GIT_COMMON_DIR=bar common => bar/common
+
+expecting success: 
+		GIT_COMMON_DIR=bar git rev-parse --git-path common/file >actual &&
+		echo bar/common/file >expect &&
+		test_cmp expect actual
+	
+ok 155 - git-path GIT_COMMON_DIR=bar common/file => bar/common/file
+
+expecting success: 
+		actual=$(git submodule--helper resolve-relative-url-test '../' '../foo' '../submodule') &&
+		test "$actual" = '../../submodule'
+	
+ok 156 - test_submodule_relative_url: ../ ../foo ../submodule => ../../submodule
+
+expecting success: 
+		actual=$(git submodule--helper resolve-relative-url-test '../' '../foo/bar' '../submodule') &&
+		test "$actual" = '../../foo/submodule'
+	
+ok 157 - test_submodule_relative_url: ../ ../foo/bar ../submodule => ../../foo/submodule
+
+expecting success: 
+		actual=$(git submodule--helper resolve-relative-url-test '../' '../foo/submodule' '../submodule') &&
+		test "$actual" = '../../foo/submodule'
+	
+ok 158 - test_submodule_relative_url: ../ ../foo/submodule ../submodule => ../../foo/submodule
+
+expecting success: 
+		actual=$(git submodule--helper resolve-relative-url-test '../' './foo' '../submodule') &&
+		test "$actual" = '../submodule'
+	
+ok 159 - test_submodule_relative_url: ../ ./foo ../submodule => ../submodule
+
+expecting success: 
+		actual=$(git submodule--helper resolve-relative-url-test '../' './foo/bar' '../submodule') &&
+		test "$actual" = '../foo/submodule'
+	
+ok 160 - test_submodule_relative_url: ../ ./foo/bar ../submodule => ../foo/submodule
+
+expecting success: 
+		actual=$(git submodule--helper resolve-relative-url-test '../../../' '../foo/bar' '../sub/a/b/c') &&
+		test "$actual" = '../../../../foo/sub/a/b/c'
+	
+ok 161 - test_submodule_relative_url: ../../../ ../foo/bar ../sub/a/b/c => ../../../../foo/sub/a/b/c
+
+expecting success: 
+		actual=$(git submodule--helper resolve-relative-url-test '../' '/build/git-2.20.1/t/trash directory.t0060-path-utils/addtest' '../repo') &&
+		test "$actual" = '/build/git-2.20.1/t/trash directory.t0060-path-utils/repo'
+	
+ok 162 - test_submodule_relative_url: ../ /build/git-2.20.1/t/trash directory.t0060-path-utils/addtest ../repo => /build/git-2.20.1/t/trash directory.t0060-path-utils/repo
+
+expecting success: 
+		actual=$(git submodule--helper resolve-relative-url-test '../' 'foo/bar' '../submodule') &&
+		test "$actual" = '../foo/submodule'
+	
+ok 163 - test_submodule_relative_url: ../ foo/bar ../submodule => ../foo/submodule
+
+expecting success: 
+		actual=$(git submodule--helper resolve-relative-url-test '../' 'foo' '../submodule') &&
+		test "$actual" = '../submodule'
+	
+ok 164 - test_submodule_relative_url: ../ foo ../submodule => ../submodule
+
+expecting success: 
+		actual=$(git submodule--helper resolve-relative-url-test '(null)' '../foo/bar' '../sub/a/b/c') &&
+		test "$actual" = '../foo/sub/a/b/c'
+	
+ok 165 - test_submodule_relative_url: (null) ../foo/bar ../sub/a/b/c => ../foo/sub/a/b/c
+
+expecting success: 
+		actual=$(git submodule--helper resolve-relative-url-test '(null)' '../foo/bar' '../sub/a/b/c/') &&
+		test "$actual" = '../foo/sub/a/b/c'
+	
+ok 166 - test_submodule_relative_url: (null) ../foo/bar ../sub/a/b/c/ => ../foo/sub/a/b/c
+
+expecting success: 
+		actual=$(git submodule--helper resolve-relative-url-test '(null)' '../foo/bar/' '../sub/a/b/c') &&
+		test "$actual" = '../foo/sub/a/b/c'
+	
+ok 167 - test_submodule_relative_url: (null) ../foo/bar/ ../sub/a/b/c => ../foo/sub/a/b/c
+
+expecting success: 
+		actual=$(git submodule--helper resolve-relative-url-test '(null)' '../foo/bar' '../submodule') &&
+		test "$actual" = '../foo/submodule'
+	
+ok 168 - test_submodule_relative_url: (null) ../foo/bar ../submodule => ../foo/submodule
+
+expecting success: 
+		actual=$(git submodule--helper resolve-relative-url-test '(null)' '../foo/submodule' '../submodule') &&
+		test "$actual" = '../foo/submodule'
+	
+ok 169 - test_submodule_relative_url: (null) ../foo/submodule ../submodule => ../foo/submodule
+
+expecting success: 
+		actual=$(git submodule--helper resolve-relative-url-test '(null)' '../foo' '../submodule') &&
+		test "$actual" = '../submodule'
+	
+ok 170 - test_submodule_relative_url: (null) ../foo ../submodule => ../submodule
+
+expecting success: 
+		actual=$(git submodule--helper resolve-relative-url-test '(null)' './foo/bar' '../submodule') &&
+		test "$actual" = 'foo/submodule'
+	
+ok 171 - test_submodule_relative_url: (null) ./foo/bar ../submodule => foo/submodule
+
+expecting success: 
+		actual=$(git submodule--helper resolve-relative-url-test '(null)' './foo' '../submodule') &&
+		test "$actual" = 'submodule'
+	
+ok 172 - test_submodule_relative_url: (null) ./foo ../submodule => submodule
+
+expecting success: 
+		actual=$(git submodule--helper resolve-relative-url-test '(null)' '//somewhere else/repo' '../subrepo') &&
+		test "$actual" = '//somewhere else/subrepo'
+	
+ok 173 - test_submodule_relative_url: (null) //somewhere else/repo ../subrepo => //somewhere else/subrepo
+
+expecting success: 
+		actual=$(git submodule--helper resolve-relative-url-test '(null)' '//somewhere else/repo' '../../subrepo') &&
+		test "$actual" = '//subrepo'
+	
+ok 174 - test_submodule_relative_url: (null) //somewhere else/repo ../../subrepo => //subrepo
+
+expecting success: 
+		actual=$(git submodule--helper resolve-relative-url-test '(null)' '//somewhere else/repo' '../../../subrepo') &&
+		test "$actual" = '/subrepo'
+	
+ok 175 - test_submodule_relative_url: (null) //somewhere else/repo ../../../subrepo => /subrepo
+
+expecting success: 
+		actual=$(git submodule--helper resolve-relative-url-test '(null)' '//somewhere else/repo' '../../../../subrepo') &&
+		test "$actual" = 'subrepo'
+	
+ok 176 - test_submodule_relative_url: (null) //somewhere else/repo ../../../../subrepo => subrepo
+
+expecting success: 
+		actual=$(git submodule--helper resolve-relative-url-test '(null)' '/build/git-2.20.1/t/trash directory.t0060-path-utils/subsuper_update_r' '../subsubsuper_update_r') &&
+		test "$actual" = '/build/git-2.20.1/t/trash directory.t0060-path-utils/subsubsuper_update_r'
+	
+ok 177 - test_submodule_relative_url: (null) /build/git-2.20.1/t/trash directory.t0060-path-utils/subsuper_update_r ../subsubsuper_update_r => /build/git-2.20.1/t/trash directory.t0060-path-utils/subsubsuper_update_r
+
+expecting success: 
+		actual=$(git submodule--helper resolve-relative-url-test '(null)' '/build/git-2.20.1/t/trash directory.t0060-path-utils/super_update_r2' '../subsuper_update_r') &&
+		test "$actual" = '/build/git-2.20.1/t/trash directory.t0060-path-utils/subsuper_update_r'
+	
+ok 178 - test_submodule_relative_url: (null) /build/git-2.20.1/t/trash directory.t0060-path-utils/super_update_r2 ../subsuper_update_r => /build/git-2.20.1/t/trash directory.t0060-path-utils/subsuper_update_r
+
+expecting success: 
+		actual=$(git submodule--helper resolve-relative-url-test '(null)' '/build/git-2.20.1/t/trash directory.t0060-path-utils/.' '../.') &&
+		test "$actual" = '/build/git-2.20.1/t/trash directory.t0060-path-utils/.'
+	
+ok 179 - test_submodule_relative_url: (null) /build/git-2.20.1/t/trash directory.t0060-path-utils/. ../. => /build/git-2.20.1/t/trash directory.t0060-path-utils/.
+
+expecting success: 
+		actual=$(git submodule--helper resolve-relative-url-test '(null)' '/build/git-2.20.1/t/trash directory.t0060-path-utils' './.') &&
+		test "$actual" = '/build/git-2.20.1/t/trash directory.t0060-path-utils/.'
+	
+ok 180 - test_submodule_relative_url: (null) /build/git-2.20.1/t/trash directory.t0060-path-utils ./. => /build/git-2.20.1/t/trash directory.t0060-path-utils/.
+
+expecting success: 
+		actual=$(git submodule--helper resolve-relative-url-test '(null)' '/build/git-2.20.1/t/trash directory.t0060-path-utils/addtest' '../repo') &&
+		test "$actual" = '/build/git-2.20.1/t/trash directory.t0060-path-utils/repo'
+	
+ok 181 - test_submodule_relative_url: (null) /build/git-2.20.1/t/trash directory.t0060-path-utils/addtest ../repo => /build/git-2.20.1/t/trash directory.t0060-path-utils/repo
+
+expecting success: 
+		actual=$(git submodule--helper resolve-relative-url-test '(null)' '/build/git-2.20.1/t/trash directory.t0060-path-utils' './å äö') &&
+		test "$actual" = '/build/git-2.20.1/t/trash directory.t0060-path-utils/å äö'
+	
+ok 182 - test_submodule_relative_url: (null) /build/git-2.20.1/t/trash directory.t0060-path-utils ./å äö => /build/git-2.20.1/t/trash directory.t0060-path-utils/å äö
+
+expecting success: 
+		actual=$(git submodule--helper resolve-relative-url-test '(null)' '/build/git-2.20.1/t/trash directory.t0060-path-utils/.' '../submodule') &&
+		test "$actual" = '/build/git-2.20.1/t/trash directory.t0060-path-utils/submodule'
+	
+ok 183 - test_submodule_relative_url: (null) /build/git-2.20.1/t/trash directory.t0060-path-utils/. ../submodule => /build/git-2.20.1/t/trash directory.t0060-path-utils/submodule
+
+expecting success: 
+		actual=$(git submodule--helper resolve-relative-url-test '(null)' '/build/git-2.20.1/t/trash directory.t0060-path-utils/submodule' '../submodule') &&
+		test "$actual" = '/build/git-2.20.1/t/trash directory.t0060-path-utils/submodule'
+	
+ok 184 - test_submodule_relative_url: (null) /build/git-2.20.1/t/trash directory.t0060-path-utils/submodule ../submodule => /build/git-2.20.1/t/trash directory.t0060-path-utils/submodule
+
+expecting success: 
+		actual=$(git submodule--helper resolve-relative-url-test '(null)' '/build/git-2.20.1/t/trash directory.t0060-path-utils/home2/../remote' '../bundle1') &&
+		test "$actual" = '/build/git-2.20.1/t/trash directory.t0060-path-utils/home2/../bundle1'
+	
+ok 185 - test_submodule_relative_url: (null) /build/git-2.20.1/t/trash directory.t0060-path-utils/home2/../remote ../bundle1 => /build/git-2.20.1/t/trash directory.t0060-path-utils/home2/../bundle1
+
+expecting success: 
+		actual=$(git submodule--helper resolve-relative-url-test '(null)' '/build/git-2.20.1/t/trash directory.t0060-path-utils/submodule_update_repo' './.') &&
+		test "$actual" = '/build/git-2.20.1/t/trash directory.t0060-path-utils/submodule_update_repo/.'
+	
+ok 186 - test_submodule_relative_url: (null) /build/git-2.20.1/t/trash directory.t0060-path-utils/submodule_update_repo ./. => /build/git-2.20.1/t/trash directory.t0060-path-utils/submodule_update_repo/.
+
+expecting success: 
+		actual=$(git submodule--helper resolve-relative-url-test '(null)' 'file:///tmp/repo' '../subrepo') &&
+		test "$actual" = 'file:///tmp/subrepo'
+	
+ok 187 - test_submodule_relative_url: (null) file:///tmp/repo ../subrepo => file:///tmp/subrepo
+
+expecting success: 
+		actual=$(git submodule--helper resolve-relative-url-test '(null)' 'foo/bar' '../submodule') &&
+		test "$actual" = 'foo/submodule'
+	
+ok 188 - test_submodule_relative_url: (null) foo/bar ../submodule => foo/submodule
+
+expecting success: 
+		actual=$(git submodule--helper resolve-relative-url-test '(null)' 'foo' '../submodule') &&
+		test "$actual" = 'submodule'
+	
+ok 189 - test_submodule_relative_url: (null) foo ../submodule => submodule
+
+expecting success: 
+		actual=$(git submodule--helper resolve-relative-url-test '(null)' 'helper:://hostname/repo' '../subrepo') &&
+		test "$actual" = 'helper:://hostname/subrepo'
+	
+ok 190 - test_submodule_relative_url: (null) helper:://hostname/repo ../subrepo => helper:://hostname/subrepo
+
+expecting success: 
+		actual=$(git submodule--helper resolve-relative-url-test '(null)' 'helper:://hostname/repo' '../../subrepo') &&
+		test "$actual" = 'helper:://subrepo'
+	
+ok 191 - test_submodule_relative_url: (null) helper:://hostname/repo ../../subrepo => helper:://subrepo
+
+expecting success: 
+		actual=$(git submodule--helper resolve-relative-url-test '(null)' 'helper:://hostname/repo' '../../../subrepo') &&
+		test "$actual" = 'helper::/subrepo'
+	
+ok 192 - test_submodule_relative_url: (null) helper:://hostname/repo ../../../subrepo => helper::/subrepo
+
+expecting success: 
+		actual=$(git submodule--helper resolve-relative-url-test '(null)' 'helper:://hostname/repo' '../../../../subrepo') &&
+		test "$actual" = 'helper::subrepo'
+	
+ok 193 - test_submodule_relative_url: (null) helper:://hostname/repo ../../../../subrepo => helper::subrepo
+
+expecting success: 
+		actual=$(git submodule--helper resolve-relative-url-test '(null)' 'helper:://hostname/repo' '../../../../../subrepo') &&
+		test "$actual" = 'helper:subrepo'
+	
+ok 194 - test_submodule_relative_url: (null) helper:://hostname/repo ../../../../../subrepo => helper:subrepo
+
+expecting success: 
+		actual=$(git submodule--helper resolve-relative-url-test '(null)' 'helper:://hostname/repo' '../../../../../../subrepo') &&
+		test "$actual" = '.:subrepo'
+	
+ok 195 - test_submodule_relative_url: (null) helper:://hostname/repo ../../../../../../subrepo => .:subrepo
+
+expecting success: 
+		actual=$(git submodule--helper resolve-relative-url-test '(null)' 'ssh://hostname/repo' '../subrepo') &&
+		test "$actual" = 'ssh://hostname/subrepo'
+	
+ok 196 - test_submodule_relative_url: (null) ssh://hostname/repo ../subrepo => ssh://hostname/subrepo
+
+expecting success: 
+		actual=$(git submodule--helper resolve-relative-url-test '(null)' 'ssh://hostname/repo' '../../subrepo') &&
+		test "$actual" = 'ssh://subrepo'
+	
+ok 197 - test_submodule_relative_url: (null) ssh://hostname/repo ../../subrepo => ssh://subrepo
+
+expecting success: 
+		actual=$(git submodule--helper resolve-relative-url-test '(null)' 'ssh://hostname/repo' '../../../subrepo') &&
+		test "$actual" = 'ssh:/subrepo'
+	
+ok 198 - test_submodule_relative_url: (null) ssh://hostname/repo ../../../subrepo => ssh:/subrepo
+
+expecting success: 
+		actual=$(git submodule--helper resolve-relative-url-test '(null)' 'ssh://hostname/repo' '../../../../subrepo') &&
+		test "$actual" = 'ssh:subrepo'
+	
+ok 199 - test_submodule_relative_url: (null) ssh://hostname/repo ../../../../subrepo => ssh:subrepo
+
+expecting success: 
+		actual=$(git submodule--helper resolve-relative-url-test '(null)' 'ssh://hostname/repo' '../../../../../subrepo') &&
+		test "$actual" = '.:subrepo'
+	
+ok 200 - test_submodule_relative_url: (null) ssh://hostname/repo ../../../../../subrepo => .:subrepo
+
+expecting success: 
+		actual=$(git submodule--helper resolve-relative-url-test '(null)' 'ssh://hostname:22/repo' '../subrepo') &&
+		test "$actual" = 'ssh://hostname:22/subrepo'
+	
+ok 201 - test_submodule_relative_url: (null) ssh://hostname:22/repo ../subrepo => ssh://hostname:22/subrepo
+
+expecting success: 
+		actual=$(git submodule--helper resolve-relative-url-test '(null)' 'user@host:path/to/repo' '../subrepo') &&
+		test "$actual" = 'user@host:path/to/subrepo'
+	
+ok 202 - test_submodule_relative_url: (null) user@host:path/to/repo ../subrepo => user@host:path/to/subrepo
+
+expecting success: 
+		actual=$(git submodule--helper resolve-relative-url-test '(null)' 'user@host:repo' '../subrepo') &&
+		test "$actual" = 'user@host:subrepo'
+	
+ok 203 - test_submodule_relative_url: (null) user@host:repo ../subrepo => user@host:subrepo
+
+expecting success: 
+		actual=$(git submodule--helper resolve-relative-url-test '(null)' 'user@host:repo' '../../subrepo') &&
+		test "$actual" = '.:subrepo'
+	
+ok 204 - test_submodule_relative_url: (null) user@host:repo ../../subrepo => .:subrepo
+
+expecting success: 
+	test-tool path-utils is_dotgitmodules \
+		.gitmodules \
+		\
+		.git${u200c}modules \
+		\
+		.Gitmodules \
+		.gitmoduleS \
+		\
+		".gitmodules " \
+		".gitmodules." \
+		".gitmodules  " \
+		".gitmodules. " \
+		".gitmodules ." \
+		".gitmodules.." \
+		".gitmodules   " \
+		".gitmodules.  " \
+		".gitmodules . " \
+		".gitmodules  ." \
+		\
+		".Gitmodules " \
+		".Gitmodules." \
+		".Gitmodules  " \
+		".Gitmodules. " \
+		".Gitmodules ." \
+		".Gitmodules.." \
+		".Gitmodules   " \
+		".Gitmodules.  " \
+		".Gitmodules . " \
+		".Gitmodules  ." \
+		\
+		GITMOD~1 \
+		gitmod~1 \
+		GITMOD~2 \
+		gitmod~3 \
+		GITMOD~4 \
+		\
+		"GITMOD~1 " \
+		"gitmod~2." \
+		"GITMOD~3  " \
+		"gitmod~4. " \
+		"GITMOD~1 ." \
+		"gitmod~2   " \
+		"GITMOD~3.  " \
+		"gitmod~4 . " \
+		\
+		GI7EBA~1 \
+		gi7eba~9 \
+		\
+		GI7EB~10 \
+		GI7EB~11 \
+		GI7EB~99 \
+		GI7EB~10 \
+		GI7E~100 \
+		GI7E~101 \
+		GI7E~999 \
+		~1000000 \
+		~9999999 \
+		\
+		.gitmodules:\$DATA \
+		"gitmod~4 . :\$DATA" \
+		\
+		--not \
+		".gitmodules x"  \
+		".gitmodules .x" \
+		\
+		" .gitmodules" \
+		\
+		..gitmodules \
+		\
+		gitmodules \
+		\
+		.gitmodule \
+		\
+		".gitmodules x " \
+		".gitmodules .x" \
+		\
+		GI7EBA~ \
+		GI7EBA~0 \
+		GI7EBA~~1 \
+		GI7EBA~X \
+		Gx7EBA~1 \
+		GI7EBX~1 \
+		\
+		GI7EB~1 \
+		GI7EB~01 \
+		GI7EB~1X \
+		\
+		.gitmodules,:\$DATA
+
+ok: '.gitmodules' is .gitmodules
+ok: '.git‌modules' is .gitmodules
+ok: '.Gitmodules' is .gitmodules
+ok: '.gitmoduleS' is .gitmodules
+ok: '.gitmodules ' is .gitmodules
+ok: '.gitmodules.' is .gitmodules
+ok: '.gitmodules  ' is .gitmodules
+ok: '.gitmodules. ' is .gitmodules
+ok: '.gitmodules .' is .gitmodules
+ok: '.gitmodules..' is .gitmodules
+ok: '.gitmodules   ' is .gitmodules
+ok: '.gitmodules.  ' is .gitmodules
+ok: '.gitmodules . ' is .gitmodules
+ok: '.gitmodules  .' is .gitmodules
+ok: '.Gitmodules ' is .gitmodules
+ok: '.Gitmodules.' is .gitmodules
+ok: '.Gitmodules  ' is .gitmodules
+ok: '.Gitmodules. ' is .gitmodules
+ok: '.Gitmodules .' is .gitmodules
+ok: '.Gitmodules..' is .gitmodules
+ok: '.Gitmodules   ' is .gitmodules
+ok: '.Gitmodules.  ' is .gitmodules
+ok: '.Gitmodules . ' is .gitmodules
+ok: '.Gitmodules  .' is .gitmodules
+ok: 'GITMOD~1' is .gitmodules
+ok: 'gitmod~1' is .gitmodules
+ok: 'GITMOD~2' is .gitmodules
+ok: 'gitmod~3' is .gitmodules
+ok: 'GITMOD~4' is .gitmodules
+ok: 'GITMOD~1 ' is .gitmodules
+ok: 'gitmod~2.' is .gitmodules
+ok: 'GITMOD~3  ' is .gitmodules
+ok: 'gitmod~4. ' is .gitmodules
+ok: 'GITMOD~1 .' is .gitmodules
+ok: 'gitmod~2   ' is .gitmodules
+ok: 'GITMOD~3.  ' is .gitmodules
+ok: 'gitmod~4 . ' is .gitmodules
+ok: 'GI7EBA~1' is .gitmodules
+ok: 'gi7eba~9' is .gitmodules
+ok: 'GI7EB~10' is .gitmodules
+ok: 'GI7EB~11' is .gitmodules
+ok: 'GI7EB~99' is .gitmodules
+ok: 'GI7EB~10' is .gitmodules
+ok: 'GI7E~100' is .gitmodules
+ok: 'GI7E~101' is .gitmodules
+ok: 'GI7E~999' is .gitmodules
+ok: '~1000000' is .gitmodules
+ok: '~9999999' is .gitmodules
+ok: '.gitmodules:$DATA' is .gitmodules
+ok: 'gitmod~4 . :$DATA' is .gitmodules
+ok: '.gitmodules x' is not .gitmodules
+ok: '.gitmodules .x' is not .gitmodules
+ok: ' .gitmodules' is not .gitmodules
+ok: '..gitmodules' is not .gitmodules
+ok: 'gitmodules' is not .gitmodules
+ok: '.gitmodule' is not .gitmodules
+ok: '.gitmodules x ' is not .gitmodules
+ok: '.gitmodules .x' is not .gitmodules
+ok: 'GI7EBA~' is not .gitmodules
+ok: 'GI7EBA~0' is not .gitmodules
+ok: 'GI7EBA~~1' is not .gitmodules
+ok: 'GI7EBA~X' is not .gitmodules
+ok: 'Gx7EBA~1' is not .gitmodules
+ok: 'GI7EBX~1' is not .gitmodules
+ok: 'GI7EB~1' is not .gitmodules
+ok: 'GI7EB~01' is not .gitmodules
+ok: 'GI7EB~1X' is not .gitmodules
+ok: '.gitmodules,:$DATA' is not .gitmodules
+ok 205 - match .gitmodules
+
+skipping test: is_valid_path() on Windows 
+       test-tool path-utils is_valid_path \
+		win32 \
+		"win32 x" \
+		../hello.txt \
+		C:\\git \
+		\
+		--not \
+		"win32 "  \
+		"win32 /x "  \
+		"win32."  \
+		"win32 . ." \
+		.../hello.txt \
+		colon:test
+
+ok 206 # skip is_valid_path() on Windows (missing MINGW)
+
+# passed all 206 test(s)
+1..206
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t1060-object-corruption.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1060-object-corruption/.git/
+expecting success: 
+	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
 	)
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1305-config-include/real-home/foo/.git/
-ok 24 - conditional include, set up symlinked $HOME
+Initialized empty Git repository in /build/git-2.20.1/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, 7.2011e-05 s, 13.9 kB/s
+Initialized empty Git repository in /build/git-2.20.1/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: 
+	git init missing &&
 	(
-		HOME="$TRASH_DIRECTORY/home" &&
-		export HOME &&
-		cd "$HOME"/foo &&
+		cd missing &&
+		test_commit content &&
+		rm -f "$(obj_to_file HEAD:content.t)"
+	)
 
-		echo "[includeIf \"gitdir:~/foo/\"]path=bar2" >>.git/config &&
-		echo "[test]two=2" >.git/bar2 &&
-		echo 2 >expect &&
-		force_setup_explicit_git_dir &&
-		git -C sub config test.two >actual &&
-		test_cmp expect actual
+Initialized empty Git repository in /build/git-2.20.1/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: 
+	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 25 - conditional include, $HOME expansion with symlinks
+Initialized empty Git repository in /build/git-2.20.1/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: 
-	echo "[includeIf \"gitdir:./foo/.git\"]path=bar4" >home/.gitconfig &&
-	echo "[test]four=4" >home/bar4 &&
 	(
-		HOME="$TRASH_DIRECTORY/home" &&
-		export HOME &&
-		cd "$HOME"/foo &&
+		cd bit-error &&
+		test_must_fail git cat-file blob HEAD:content.t
+	)
 
-		echo 4 >expect &&
-		force_setup_explicit_git_dir &&
-		git -C sub config test.four >actual &&
-		test_cmp expect actual
+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: 
+	(
+		cd bit-error &&
+		test_must_fail git cat-file -s HEAD:content.t
 	)
 
-ok 26 - conditional include, relative path with symlinks
+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: 
-	ln -s foo bar &&
 	(
-		cd bar &&
-		echo "[includeIf \"gitdir:bar/\"]path=bar7" >>.git/config &&
-		echo "[test]seven=7" >.git/bar7 &&
-		echo 7 >expect &&
-		git config test.seven >actual &&
-		test_cmp expect actual
+		cd bit-error &&
+		rm -f content.t &&
+		test_must_fail git read-tree --reset -u HEAD
 	)
 
-ok 27 - conditional include, gitdir matching symlink
+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: 
 	(
-		cd bar &&
-		echo "[includeIf \"gitdir/i:BAR/\"]path=bar8" >>.git/config &&
-		echo "[test]eight=8" >.git/bar8 &&
-		echo 8 >expect &&
-		git config test.eight >actual &&
-		test_cmp expect actual
+		cd missing &&
+		rm -f content.t &&
+		test_must_fail git read-tree --reset -u HEAD
 	)
 
-ok 28 - conditional include, gitdir matching symlink, icase
+error: unable to read sha1 file of content.t (d95f3ad14dee633a758d2e331151e950dd13e4ed)
+ok 7 - read-tree -u detects missing objects
 
 expecting success: 
-	cat >.gitconfig <<-\EOF &&
-	[test]value = gitconfig
-	[include]path = cycle
-	EOF
-	cat >cycle <<-\EOF &&
-	[test]value = cycle
-	[include]path = .gitconfig
-	EOF
-	cat >expect <<-\EOF &&
-	gitconfig
-	cycle
-	EOF
-	test_must_fail git config --get-all test.value 2>stderr &&
-	test_i18ngrep "exceeded maximum include depth" stderr
+	test_must_fail git clone --no-local --bare bit-error corrupt-transport
 
-fatal: exceeded maximum include depth (10) while including
-ok 29 - include cycles are detected
+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: index-pack failed
+ok 8 - clone --no-local --bare detects corruption
 
-# passed all 29 test(s)
-1..29
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t1304-default-acl.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1304-default-acl/.git/
 expecting success: 
-	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 | egrep "mask::?rw-"
-	then
-		test_set_prereq SETFACL
-	fi
+	test_must_fail git clone --no-local --bare missing missing-transport
 
-t1304-default-acl.sh: 4: eval: setfacl: not found
-ok 1 - checking for a working acl setup
+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: index-pack failed
+ok 9 - clone --no-local --bare detects missing object
 
-skipping test: Setup test repo 
-	setfacl -m d:u::rwx,d:g::---,d:o:---,d:m:rwx $dirs_to_set &&
-	setfacl -m m:rwx               $dirs_to_set &&
-	setfacl -m u:root:rwx          $dirs_to_set &&
-	setfacl -m d:u:"$LOGNAME":rwx  $dirs_to_set &&
-	setfacl -m d:u:root:rwx        $dirs_to_set &&
+expecting success: 
+	test_must_fail git clone --no-local --bare misnamed misnamed-transport
 
-	touch file.txt &&
-	git add file.txt &&
-	git commit -m "init"
+Cloning into bare repository 'misnamed-transport'...
+fatal: did not receive expected object d95f3ad14dee633a758d2e331151e950dd13e4ed
+fatal: index-pack failed
+ok 10 - clone --no-local --bare detects misnamed object
 
-ok 2 # skip Setup test repo (missing SETFACL)
+expecting success: 
+	test_must_fail git clone --local bit-error corrupt-checkout
 
-skipping test: Objects creation does not break ACLs with restrictive umask 
-	# SHA1 for empty blob
-	check_perms_and_acl .git/objects/$(echo $EMPTY_BLOB | sed -e "s,^\(..\),\1/,")
+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/git-2.20.1/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 the checkout with 'git checkout -f HEAD'
 
-ok 3 # skip Objects creation does not break ACLs with restrictive umask (missing SETFACL)
+ok 11 - clone --local detects corruption
 
-skipping test: git gc does not break ACLs with restrictive umask 
-	git gc &&
-	check_perms_and_acl .git/objects/pack/*.pack
+expecting success: 
+	test_path_is_dir corrupt-checkout/.git
 
-ok 4 # skip git gc does not break ACLs with restrictive umask (missing SETFACL)
+ok 12 - error detected during checkout leaves repo intact
 
-# passed all 4 test(s)
-1..4
+expecting success: 
+	test_must_fail git clone --local missing missing-checkout
+
+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 the checkout with 'git checkout -f HEAD'
+
+ok 13 - clone --local detects missing objects
+
+checking known breakage: 
+	test_must_fail git clone --local misnamed misnamed-checkout
+
+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: 
+	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_i18ngrep ! -i collision stderr
+	)
+
+ok 15 - fetch into corrupted repo with index-pack
+
+# still have 1 known breakage(s)
+# passed all remaining 14 test(s)
+1..15
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
 *** t1302-repo-version.sh ***
@@ -24188,6 +24002,148 @@
 1..15
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
+*** t1303-wacky-config.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1303-wacky-config/.git/
+expecting success: 
+	setup &&
+	git config section.key bar &&
+	check section.key bar
+
+ok 1 - modify same key
+
+expecting success: 
+	setup &&
+	git config section.other bar &&
+	check section.key foo &&
+	check section.other bar
+
+ok 2 - add key in same section
+
+expecting success: 
+	setup &&
+	git config section2.key bar &&
+	check section.key foo &&
+	check section2.key bar
+
+ok 3 - add key in different section
+
+expecting success: 
+	git config "$SECTION" bar &&
+	check "$SECTION" bar
+
+ok 4 - make sure git config escapes section names properly
+
+expecting success: 
+	setup &&
+	git config section.key "$LONG_VALUE" &&
+	check section.key "$LONG_VALUE"
+
+ok 5 - do not crash on special long config line
+
+expecting success: 
+	setup_many &&
+	git config --get-all section.key >actual &&
+	test_line_count = 3126 actual
+
+ok 6 - get many entries
+
+expecting success: 
+	setup_many &&
+	git config --get-regexp "sec.*ke." >actual &&
+	test_line_count = 3126 actual
+
+ok 7 - get many entries by regex
+
+expecting success: 
+	setup_many &&
+	git config --add section.key bar &&
+	check_regex section.key "b.*r" bar &&
+	git config section.key beer "b.*r" &&
+	check_regex section.key "b.*r" beer
+
+ok 8 - add and replace one of many entries
+
+expecting success: 
+	setup_many &&
+	git config --replace-all section.key bar &&
+	check section.key bar
+
+ok 9 - replace many entries
+
+expecting success: 
+	setup_many &&
+	git config --unset-all section.key &&
+	test_must_fail git config section.key
+
+ok 10 - unset many entries
+
+expecting success: 
+	cat >expect <<-\EOF &&
+
+
+	fool
+	roll
+	EOF
+	cp .git/config .git/config.old &&
+	test_when_finished "mv .git/config.old .git/config" &&
+	cat >.git/config <<-\EOF &&
+	[foo]
+		baz
+		baz =
+		baz = fool
+	EOF
+	git config --add foo.baz roll &&
+	git config --get-all foo.baz >output &&
+	test_cmp expect output
+
+ok 11 - --add appends new value after existing empty value
+
+# passed all 11 test(s)
+1..11
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t1310-config-default.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1310-config-default/.git/
+expecting success: 
+	echo quux >expect &&
+	git config -f config --default=quux core.foo >actual &&
+	test_cmp expect actual
+
+ok 1 - uses --default when entry missing
+
+expecting success: 
+	echo bar >expect &&
+	git -c core.foo=bar config --default=baz core.foo >actual &&
+	test_cmp expect actual
+
+ok 2 - does not use --default when entry present
+
+expecting success: 
+	echo true >expect &&
+	git config -f config --default=yes --bool core.foo >actual &&
+	test_cmp expect actual
+
+ok 3 - canonicalizes --default with appropriate type
+
+expecting success: 
+	test_must_fail git config -f config --type=expiry-date --default=x --get \
+		not.a.section 2>error &&
+	test_i18ngrep "failed to format default config value" error
+
+fatal: failed to format default config value: x
+ok 4 - dies when --default cannot be parsed
+
+expecting success: 
+	test_must_fail git config --default=quux --unset a.section >output 2>&1 &&
+	test_i18ngrep "\-\-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/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
 *** t1307-config-blob.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1307-config-blob/.git/
 expecting success: 
@@ -24198,7 +24154,7 @@
 	git add config &&
 	git commit -m foo
 
-[master (root-commit) f84e322] foo
+[master (root-commit) e9b5075] foo
  Author: A U Thor <author@example.com>
  1 file changed, 2 insertions(+)
  create mode 100644 config
@@ -24313,7 +24269,7 @@
 	test_must_fail git config --blob=HEAD:config some.value 2>err &&
 	test_i18ngrep "HEAD:config" err
 
-[master e48a3ed] broken
+[master f74eca0] broken
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 error: bad config line 2 in blob HEAD:config
@@ -24327,7 +24283,7 @@
 	git config --blob=HEAD:config some.key >actual &&
 	test_cmp expect actual
 
-[master f2c3f80] CR
+[master fc93282] CR
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 2 deletions(-)
 ok 12 - can parse blob ending with CR
@@ -24342,48 +24298,6 @@
 1..13
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t1310-config-default.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1310-config-default/.git/
-expecting success: 
-	echo quux >expect &&
-	git config -f config --default=quux core.foo >actual &&
-	test_cmp expect actual
-
-ok 1 - uses --default when entry missing
-
-expecting success: 
-	echo bar >expect &&
-	git -c core.foo=bar config --default=baz core.foo >actual &&
-	test_cmp expect actual
-
-ok 2 - does not use --default when entry present
-
-expecting success: 
-	echo true >expect &&
-	git config -f config --default=yes --bool core.foo >actual &&
-	test_cmp expect actual
-
-ok 3 - canonicalizes --default with appropriate type
-
-expecting success: 
-	test_must_fail git config -f config --type=expiry-date --default=x --get \
-		not.a.section 2>error &&
-	test_i18ngrep "failed to format default config value" error
-
-fatal: failed to format default config value: x
-ok 4 - dies when --default cannot be parsed
-
-expecting success: 
-	test_must_fail git config --default=quux --unset a.section >output 2>&1 &&
-	test_i18ngrep "\-\-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/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
 *** t1309-early-config.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1309-early-config/.git/
 expecting success: 
@@ -24479,6 +24393,71 @@
 1..8
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
+*** t1350-config-hooks-path.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1350-config-hooks-path/.git/
+expecting success: 
+	mkdir -p .git/custom-hooks .git/hooks &&
+	write_script .git/custom-hooks/pre-commit <<-\EOF &&
+	echo CUSTOM >>actual
+	EOF
+	write_script .git/hooks/pre-commit <<-\EOF
+	echo NORMAL >>actual
+	EOF
+
+ok 1 - set up a pre-commit hook in core.hooksPath
+
+expecting success: 
+	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: 
+	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
+
+# passed all 3 test(s)
+1..3
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
 *** t1306-xdg-files.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1306-xdg-files/.git/
 expecting success: 
@@ -24690,71 +24669,6 @@
 1..21
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t1350-config-hooks-path.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1350-config-hooks-path/.git/
-expecting success: 
-	mkdir -p .git/custom-hooks .git/hooks &&
-	write_script .git/custom-hooks/pre-commit <<-\EOF &&
-	echo CUSTOM >>actual
-	EOF
-	write_script .git/hooks/pre-commit <<-\EOF
-	echo NORMAL >>actual
-	EOF
-
-ok 1 - set up a pre-commit hook in core.hooksPath
-
-expecting success: 
-	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: 
-	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
-
-# passed all 3 test(s)
-1..3
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
 *** t1301-shared-repo.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1301-shared-repo/.git/
 expecting success: 
@@ -25072,692 +24986,659 @@
 1..22
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t1308-config-set.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1308-config-set/.git/
+*** t1305-config-include.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1305-config-include/.git/
 expecting success: 
-	cat >.git/config <<-\EOF
-	[case]
-		penguin = very blue
-		Movie = BadPhysics
-		UPPERCASE = true
-		MixedCase = true
-		my =
-		foo
-		baz = sam
-	[Cores]
-		WhatEver = Second
-		baz = bar
-	[cores]
-		baz = bat
-	[CORES]
-		baz = ball
-	[my "Foo bAr"]
-		hi = mixed-case
-	[my "FOO BAR"]
-		hi = upper-case
-	[my "foo bar"]
-		hi = lower-case
-	[case]
-		baz = bat
-		baz = hask
-	[lamb]
-		chop = 65
-		head = none
-	[goat]
-		legs = 4
-		head = true
-		skin = false
-		nose = 1
-		horns
-	EOF
+	echo "[test]one = 1" >one &&
+	echo "[include]path = \"$(pwd)/one\"" >.gitconfig &&
+	echo 1 >expect &&
+	git config test.one >actual &&
+	test_cmp expect actual
 
-ok 1 - setup default config
+ok 1 - include file by absolute path
 
 expecting success: 
-	check_config get_value case.penguin "very blue"
+	echo "[test]one = 1" >one &&
+	echo "[include]path = one" >.gitconfig &&
+	echo 1 >expect &&
+	git config test.one >actual &&
+	test_cmp expect actual
 
-ok 2 - get value for a simple key
+ok 2 - include file by relative path
 
 expecting success: 
-	check_config get_value case.my ""
+	mkdir subdir &&
+	echo "[test]three = 3" >subdir/three &&
+	echo "[include]path = three" >subdir/two &&
+	echo "[include]path = subdir/two" >.gitconfig &&
+	echo 3 >expect &&
+	git config test.three >actual &&
+	test_cmp expect actual
 
-ok 3 - get value for a key with value as an empty string
+ok 3 - chained relative paths
 
 expecting success: 
-	check_config get_value case.foo "(NULL)"
+	echo "[test]one = 1" >one &&
+	echo "[include]path = ~/one" >.gitconfig &&
+	echo 1 >expect &&
+	git config test.one >actual &&
+	test_cmp expect actual
 
-ok 4 - get value for a key with value as NULL
+ok 4 - include paths get tilde-expansion
 
 expecting success: 
-	check_config get_value case.UPPERCASE "true" &&
-	check_config get_value case.uppercase "true"
+	echo "[test]one = 1" >one &&
+	echo "[include]path = one" >.gitconfig &&
+	echo one >expect &&
+	git config include.path >actual &&
+	test_cmp expect actual
 
-ok 5 - upper case key
+ok 5 - include options can still be examined
 
 expecting success: 
-	check_config get_value case.MixedCase "true" &&
-	check_config get_value case.MIXEDCASE "true" &&
-	check_config get_value case.mixedcase "true"
+	echo "[test]one = 1" >one &&
+	echo "[include]path = one" >.gitconfig &&
+	cat >expect <<-\EOF &&
+	include.path=one
+	test.one=1
+	EOF
+	git config --list >actual.full &&
+	grep -v ^core actual.full >actual &&
+	test_cmp expect actual
 
-ok 6 - mixed case key
+ok 6 - listing includes option and expansion
 
 expecting success: 
-	check_config get_value case.Movie "BadPhysics"
+	echo "[test]one = 1" >one &&
+	echo "[include]path = one" >.gitconfig &&
+	test_must_fail git config -f .gitconfig test.one &&
+	test_must_fail git config --global test.one &&
+	echo 1 >expect &&
+	git config --includes -f .gitconfig test.one >actual &&
+	test_cmp expect actual
 
-ok 7 - key and value with mixed case
+ok 7 - single file lookup does not expand includes by default
 
 expecting success: 
-	check_config get_value "my.Foo bAr.hi" "mixed-case" &&
-	check_config get_value "my.FOO BAR.hi" "upper-case" &&
-	check_config get_value "my.foo bar.hi" "lower-case"
+	echo "[test]one = 1" >one &&
+	echo "[include]path = one" >.gitconfig &&
+	echo "include.path=one" >expect &&
+	git config -f .gitconfig --list >actual &&
+	test_cmp expect actual
 
-ok 8 - key with case sensitive subsection
+ok 8 - single file list does not expand includes by default
 
 expecting success: 
-	check_config get_value cores.baz "ball" &&
-	check_config get_value Cores.baz "ball" &&
-	check_config get_value CORES.baz "ball" &&
-	check_config get_value coreS.baz "ball"
+	echo "[test]one = 1" >one &&
+	echo "[include]path = one" >.gitconfig &&
+	git config test.two 2 &&
+	echo 2 >expect &&
+	git config --no-includes test.two >actual &&
+	test_cmp expect actual &&
+	test_must_fail git config --no-includes test.one
 
-ok 9 - key with case insensitive section header
+ok 9 - writing config file does not expand includes
 
 expecting success: 
-	check_config get_value CORES.BAZ "ball" &&
-	check_config get_value cores.baz "ball" &&
-	check_config get_value cores.BaZ "ball" &&
-	check_config get_value cOreS.bAz "ball"
+	echo "[test]one = 1" >one &&
+	echo "[include]path = one" >.gitconfig &&
+	git config test.one 2 &&
+	echo 1 >expect &&
+	git config -f one test.one >actual &&
+	test_cmp expect actual &&
+	cat >expect <<-\EOF &&
+	1
+	2
+	EOF
+	git config --get-all test.one >actual &&
+	test_cmp expect actual
 
-ok 10 - key with case insensitive section header & variable
+ok 10 - config modification does not affect includes
 
 expecting success: 
-	check_config expect_code 1 get_value "my.fOo Bar.hi" "Value not found for \"my.fOo Bar.hi\""
+	cat >.gitconfig <<-\EOF &&
+	[include]path = non-existent
+	[test]value = yes
+	EOF
+	echo yes >expect &&
+	git config test.value >actual &&
+	test_cmp expect actual
 
-ok 11 - find value with misspelled key
+ok 11 - missing include files are ignored
 
 expecting success: 
-	check_config get_value case.baz "hask"
+	echo "[test]one = 1" >one &&
+	echo 1 >expect &&
+	git -c include.path="$(pwd)/one" config test.one >actual &&
+	test_cmp expect actual
 
-ok 12 - find value with the highest priority
+ok 12 - absolute includes from command line work
 
 expecting success: 
-	check_config get_int lamb.chop 65
+	echo "[test]one = 1" >one &&
+	test_must_fail git -c include.path=one config test.one
 
-ok 13 - find integer value for a key
+error: relative config includes must come from files
+fatal: unable to parse command-line config
+ok 13 - relative includes from command line fail
 
 expecting success: 
-	check_config get_string case.baz hask &&
-	check_config expect_code 1 get_string case.ba "Value not found for \"case.ba\""
+	echo "[test]one = 1" >one &&
+	echo "[include]path=$(pwd)/one" >blob &&
+	blob=$(git hash-object -w blob) &&
+	echo 1 >expect &&
+	git config --blob=$blob test.one >actual &&
+	test_cmp expect actual
 
-ok 14 - find string value for a key
+ok 14 - absolute includes from blobs work
 
 expecting success: 
-	test_expect_code 128 test-tool config get_string case.foo 2>result &&
-	test_i18ngrep "fatal: .*case\.foo.*\.git/config.*line 7" result
+	echo "[test]one = 1" >one &&
+	echo "[include]path=one" >blob &&
+	blob=$(git hash-object -w blob) &&
+	test_must_fail git config --blob=$blob test.one
 
-fatal: bad config variable 'case.foo' in file '.git/config' at line 7
-ok 15 - check line error when NULL string is queried
+error: relative config includes must come from files
+error: bad config line 1 in blob d085876092eb24c144128bcd5db5d26e665f4f8a
+ok 15 - relative includes from blobs fail
 
 expecting success: 
-	check_config expect_code 128 get_int lamb.head
+	echo "[test]one = 1" >one &&
+	echo 1 >expect &&
+	echo "[include]path=\"$(pwd)/one\"" |
+	git config --file - test.one >actual &&
+	test_cmp expect actual
 
-fatal: bad numeric config value 'none' for 'lamb.head': invalid unit
-ok 16 - find integer if value is non parse-able
+ok 16 - absolute includes from stdin work
 
 expecting success: 
-	check_config get_bool goat.head 1 &&
-	check_config get_bool goat.skin 0 &&
-	check_config get_bool goat.nose 1 &&
-	check_config get_bool goat.horns 1 &&
-	check_config get_bool goat.legs 1
+	echo "[test]one = 1" >one &&
+	echo "[include]path=one" |
+	test_must_fail git config --file - test.one
 
-ok 17 - find bool value for the entered key
+error: relative config includes must come from files
+fatal: bad config line 1 in standard input
+ok 17 - relative includes from stdin line fail
 
 expecting success: 
-	check_config get_value_multi case.baz sam bat hask
+	git init foo &&
+	(
+		cd foo &&
+		echo "[includeIf \"gitdir:foo/\"]path=bar" >>.git/config &&
+		echo "[test]one=1" >.git/bar &&
+		echo 1 >expect &&
+		git config test.one >actual &&
+		test_cmp expect actual
+	)
 
-ok 18 - find multiple values
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1305-config-include/foo/.git/
+ok 18 - conditional include, both unanchored
 
 expecting success: 
-	cat >config2 <<-\EOF &&
-	[case]
-		baz = lama
-	[my]
-		new = silk
-	[case]
-		baz = ball
-	EOF
-	echo silk >expect &&
-	test-tool config configset_get_value my.new config2 .git/config >actual &&
-	test_cmp expect actual
+	(
+		cd foo &&
+		echo "[includeIf \"gitdir:~/foo/\"]path=bar2" >>.git/config &&
+		echo "[test]two=2" >.git/bar2 &&
+		echo 2 >expect &&
+		git config test.two >actual &&
+		test_cmp expect actual
+	)
 
-ok 19 - find value from a configset
+ok 19 - conditional include, $HOME expansion
 
 expecting success: 
-	echo hask >expect &&
-	test-tool config configset_get_value case.baz config2 .git/config >actual &&
-	test_cmp expect actual
+	(
+		cd foo &&
+		echo "[includeIf \"gitdir:**/foo/**\"]path=bar3" >>.git/config &&
+		echo "[test]three=3" >.git/bar3 &&
+		echo 3 >expect &&
+		git config test.three >actual &&
+		test_cmp expect actual
+	)
 
-ok 20 - find value with highest priority from a configset
+ok 20 - conditional include, full pattern
 
 expecting success: 
-	cat >except <<-\EOF &&
-	sam
-	bat
-	hask
-	lama
-	ball
-	EOF
-	test-tool config configset_get_value case.baz config2 .git/config >actual &&
-	test_cmp expect actual
+	echo "[includeIf \"gitdir:./foo/.git\"]path=bar4" >>.gitconfig &&
+	echo "[test]four=4" >bar4 &&
+	(
+		cd foo &&
+		echo 4 >expect &&
+		git config test.four >actual &&
+		test_cmp expect actual
+	)
 
-ok 21 - find value_list for a key from a configset
+ok 21 - conditional include, relative path
 
 expecting success: 
-	echo "Error (-1) reading configuration file non-existent-file." >expect &&
-	test_expect_code 2 test-tool config configset_get_value foo.bar non-existent-file 2>actual &&
-	test_cmp expect actual
+	(
+		cd foo &&
+		echo "[includeIf \"gitdir/i:FOO/\"]path=bar5" >>.git/config &&
+		echo "[test]five=5" >.git/bar5 &&
+		echo 5 >expect &&
+		git config test.five >actual &&
+		test_cmp expect actual
+	)
 
-ok 22 - proper error on non-existent files
+ok 22 - conditional include, both unanchored, icase
 
 expecting success: 
-	echo "Error (-1) reading configuration file a-directory." >expect &&
-	mkdir a-directory &&
-	test_expect_code 2 test-tool config configset_get_value foo.bar a-directory 2>output &&
-	grep "^warning:" output &&
-	grep "^Error" output >actual &&
-	test_cmp expect actual
+	(
+		cd foo &&
+		echo "[includeIf \"gitdir:foo/\"]path=bar6" >>.git/config &&
+		echo "[test]six=6" >.git/bar6 &&
+		echo 6 >expect &&
+		test-tool config read_early_config test.six >actual &&
+		test_cmp expect actual
+	)
 
-warning: unable to access 'a-directory': Is a directory
-ok 23 - proper error on directory "files"
+ok 23 - conditional include, early config reading
 
-checking prerequisite: SANITY
+checking prerequisite: SYMLINKS
 
 mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
 (
 	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
-	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
+	# test whether the filesystem supports symbolic links
+	ln -s x y && test -h y
 
 )
-rm: cannot remove 'SANETESTD.1/x': Permission denied
-prerequisite SANITY ok
+prerequisite SYMLINKS ok
 expecting success: 
-	chmod -r .git/config &&
-	test_when_finished "chmod +r .git/config" &&
-	echo "Error (-1) reading configuration file .git/config." >expect &&
-	test_expect_code 2 test-tool config configset_get_value foo.bar .git/config 2>output &&
-	grep "^warning:" output &&
-	grep "^Error" output >actual &&
-	test_cmp expect actual
-
-warning: unable to access '.git/config': Permission denied
-warning: unable to access '.git/config': Permission denied
-ok 24 - proper error on non-accessible files
+	mkdir real-home &&
+	ln -s real-home home &&
+	(
+		HOME="$TRASH_DIRECTORY/home" &&
+		export HOME &&
+		cd "$HOME" &&
 
-expecting success: 
-	cp .git/config .git/config.old &&
-	test_when_finished "mv .git/config.old .git/config" &&
-	echo "[" >>.git/config &&
-	echo "fatal: bad config line 34 in file .git/config" >expect &&
-	test_expect_code 128 test-tool config get_value foo.bar 2>actual &&
-	test_i18ncmp expect actual
+		git init foo &&
+		cd foo &&
+		mkdir sub
+	)
 
-ok 25 - proper error on error in default config files
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1305-config-include/real-home/foo/.git/
+ok 24 - conditional include, set up symlinked $HOME
 
 expecting success: 
-	echo "[" >>syntax-error &&
-	echo "fatal: bad config line 1 in file syntax-error" >expect &&
-	test_expect_code 128 test-tool config configset_get_value foo.bar syntax-error 2>actual &&
-	test_i18ncmp expect actual
+	(
+		HOME="$TRASH_DIRECTORY/home" &&
+		export HOME &&
+		cd "$HOME"/foo &&
 
-ok 26 - proper error on error in custom config files
+		echo "[includeIf \"gitdir:~/foo/\"]path=bar2" >>.git/config &&
+		echo "[test]two=2" >.git/bar2 &&
+		echo 2 >expect &&
+		force_setup_explicit_git_dir &&
+		git -C sub config test.two >actual &&
+		test_cmp expect actual
+	)
+
+ok 25 - conditional include, $HOME expansion with symlinks
 
 expecting success: 
-	mv .git/config .git/config.old &&
-	test_when_finished "mv .git/config.old .git/config" &&
-	cat >.git/config <<-\EOF &&
-	[alias]
-		br
-	EOF
-	test_expect_code 128 git br 2>result &&
-	test_i18ngrep "missing value for .alias\.br" result &&
-	test_i18ngrep "fatal: .*\.git/config" result &&
-	test_i18ngrep "fatal: .*line 2" result
+	echo "[includeIf \"gitdir:./foo/.git\"]path=bar4" >home/.gitconfig &&
+	echo "[test]four=4" >home/bar4 &&
+	(
+		HOME="$TRASH_DIRECTORY/home" &&
+		export HOME &&
+		cd "$HOME"/foo &&
 
-error: missing value for 'alias.br'
-fatal: bad config line 2 in file .git/config
-fatal: bad config line 2 in file .git/config
-ok 27 - check line errors for malformed values
+		echo 4 >expect &&
+		force_setup_explicit_git_dir &&
+		git -C sub config test.four >actual &&
+		test_cmp expect actual
+	)
+
+ok 26 - conditional include, relative path with symlinks
 
 expecting success: 
-	nongit test_must_fail git config a.b c 2>err &&
-	test_i18ngrep "not in a git directory" err
+	ln -s foo bar &&
+	(
+		cd bar &&
+		echo "[includeIf \"gitdir:bar/\"]path=bar7" >>.git/config &&
+		echo "[test]seven=7" >.git/bar7 &&
+		echo 7 >expect &&
+		git config test.seven >actual &&
+		test_cmp expect actual
+	)
 
-fatal: not in a git directory
-ok 28 - error on modifying repo config without repo
+ok 27 - conditional include, gitdir matching symlink
 
 expecting success: 
-	echo "[foo]bar = from-repo" >.git/config &&
-	echo "[foo]bar = from-home" >.gitconfig &&
-	if test_have_prereq MINGW
-	then
-		# Use Windows path (i.e. *not* $HOME)
-		HOME_GITCONFIG=$(pwd)/.gitconfig
-	else
-		# Do not get fooled by symbolic links, i.e. $HOME != $(pwd)
-		HOME_GITCONFIG=$HOME/.gitconfig
-	fi &&
-	cat >expect <<-EOF &&
-	key=foo.bar
-	value=from-home
-	origin=file
-	name=$HOME_GITCONFIG
-	scope=global
+	(
+		cd bar &&
+		echo "[includeIf \"gitdir/i:BAR/\"]path=bar8" >>.git/config &&
+		echo "[test]eight=8" >.git/bar8 &&
+		echo 8 >expect &&
+		git config test.eight >actual &&
+		test_cmp expect actual
+	)
 
-	key=foo.bar
-	value=from-repo
-	origin=file
-	name=.git/config
-	scope=repo
+ok 28 - conditional include, gitdir matching symlink, icase
 
-	key=foo.bar
-	value=from-cmdline
-	origin=command line
-	name=
-	scope=cmdline
+expecting success: 
+	cat >.gitconfig <<-\EOF &&
+	[test]value = gitconfig
+	[include]path = cycle
 	EOF
-	GIT_CONFIG_PARAMETERS=$cmdline_config test-tool config iterate >actual &&
-	test_cmp expect actual
+	cat >cycle <<-\EOF &&
+	[test]value = cycle
+	[include]path = .gitconfig
+	EOF
+	cat >expect <<-\EOF &&
+	gitconfig
+	cycle
+	EOF
+	test_must_fail git config --get-all test.value 2>stderr &&
+	test_i18ngrep "exceeded maximum include depth" stderr
 
-ok 29 - iteration shows correct origins
+fatal: exceeded maximum include depth (10) while including
+ok 29 - include cycles are detected
 
 # passed all 29 test(s)
 1..29
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t1401-symbolic-ref.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1401-symbolic-ref/.git/
+*** t1050-large.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1050-large/.git/
 expecting success: 
-	git symbolic-ref HEAD refs/heads/foo &&
-	echo ref: refs/heads/foo >expect &&
-	test_cmp expect .git/HEAD
+	# clone does not allow us to pass core.bigfilethreshold to
+	# new repos, so set core.bigfilethreshold globally
+	git config --global core.bigfilethreshold 200k &&
+	printf "%2000000s" X >large1 &&
+	cp large1 large2 &&
+	cp large1 large3 &&
+	printf "%2500000s" Y >huge &&
+	GIT_ALLOC_LIMIT=1500k &&
+	export GIT_ALLOC_LIMIT
 
-ok 1 - symbolic-ref writes HEAD
+ok 1 - setup
 
 expecting success: 
-	echo refs/heads/foo >expect &&
-	git symbolic-ref HEAD >actual &&
-	test_cmp expect actual
-
-ok 2 - symbolic-ref reads HEAD
+		test_when_finished "rm -f .git/objects/pack/pack-*.* .git/index" &&
+		git $config add large1 &&
+		sz=$(file_size .git/objects/pack/pack-*.pack) &&
+		case "$expect" in
+		small) test "$sz" -le 100000 ;;
+		large) test "$sz" -ge 100000 ;;
+		esac
+	
+ok 2 - add with -c core.compression=0
 
 expecting success: 
-	test_must_fail git symbolic-ref HEAD foo
-
-fatal: Refusing to point HEAD outside of refs/
-ok 3 - symbolic-ref refuses non-ref for HEAD
+		test_when_finished "rm -f .git/objects/pack/pack-*.* .git/index" &&
+		git $config add large1 &&
+		sz=$(file_size .git/objects/pack/pack-*.pack) &&
+		case "$expect" in
+		small) test "$sz" -le 100000 ;;
+		large) test "$sz" -ge 100000 ;;
+		esac
+	
+ok 3 - add with -c core.compression=9
 
 expecting success: 
-	echo content >file && git add file && git commit -m one &&
-	test_must_fail git symbolic-ref HEAD $(git rev-parse HEAD)
-
-[foo (root-commit) 3cac20b] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-fatal: Refusing to point HEAD outside of refs/
-ok 4 - symbolic-ref refuses bare sha1
+		test_when_finished "rm -f .git/objects/pack/pack-*.* .git/index" &&
+		git $config add large1 &&
+		sz=$(file_size .git/objects/pack/pack-*.pack) &&
+		case "$expect" in
+		small) test "$sz" -le 100000 ;;
+		large) test "$sz" -ge 100000 ;;
+		esac
+	
+ok 4 - add with -c core.compression=0 -c pack.compression=0
 
 expecting success: 
-	test_must_fail git symbolic-ref -d HEAD
-
-fatal: deleting 'HEAD' is not allowed
-ok 5 - HEAD cannot be removed
+		test_when_finished "rm -f .git/objects/pack/pack-*.* .git/index" &&
+		git $config add large1 &&
+		sz=$(file_size .git/objects/pack/pack-*.pack) &&
+		case "$expect" in
+		small) test "$sz" -le 100000 ;;
+		large) test "$sz" -ge 100000 ;;
+		esac
+	
+ok 5 - add with -c core.compression=9 -c pack.compression=0
 
 expecting success: 
-	git symbolic-ref NOTHEAD refs/heads/foo &&
-	git symbolic-ref -d NOTHEAD &&
-	test_path_is_file .git/refs/heads/foo &&
-	test_path_is_missing .git/NOTHEAD
-
-ok 6 - symbolic-ref can be deleted
+		test_when_finished "rm -f .git/objects/pack/pack-*.* .git/index" &&
+		git $config add large1 &&
+		sz=$(file_size .git/objects/pack/pack-*.pack) &&
+		case "$expect" in
+		small) test "$sz" -le 100000 ;;
+		large) test "$sz" -ge 100000 ;;
+		esac
+	
+ok 6 - add with -c core.compression=0 -c pack.compression=9
 
 expecting success: 
-	git symbolic-ref NOTHEAD refs/heads/missing &&
-	git symbolic-ref -d NOTHEAD &&
-	test_path_is_missing .git/refs/heads/missing &&
-	test_path_is_missing .git/NOTHEAD
-
-ok 7 - symbolic-ref can delete dangling symref
+		test_when_finished "rm -f .git/objects/pack/pack-*.* .git/index" &&
+		git $config add large1 &&
+		sz=$(file_size .git/objects/pack/pack-*.pack) &&
+		case "$expect" in
+		small) test "$sz" -le 100000 ;;
+		large) test "$sz" -ge 100000 ;;
+		esac
+	
+ok 7 - add with -c core.compression=9 -c pack.compression=9
 
 expecting success: 
-	echo "fatal: Cannot delete FOO, not a symbolic ref" >expect &&
-	test_must_fail git symbolic-ref -d FOO >actual 2>&1 &&
-	test_cmp expect actual
-
-ok 8 - symbolic-ref fails to delete missing FOO
+		test_when_finished "rm -f .git/objects/pack/pack-*.* .git/index" &&
+		git $config add large1 &&
+		sz=$(file_size .git/objects/pack/pack-*.pack) &&
+		case "$expect" in
+		small) test "$sz" -le 100000 ;;
+		large) test "$sz" -ge 100000 ;;
+		esac
+	
+ok 8 - add with -c pack.compression=0
 
 expecting success: 
-	echo "fatal: Cannot delete refs/heads/foo, not a symbolic ref" >expect &&
-	test_must_fail git symbolic-ref -d refs/heads/foo >actual 2>&1 &&
-	git rev-parse --verify refs/heads/foo &&
-	test_cmp expect actual
-
-3cac20bda2648161c88bdbc04e99f030fa9d39f5
-ok 9 - symbolic-ref fails to delete real ref
+		test_when_finished "rm -f .git/objects/pack/pack-*.* .git/index" &&
+		git $config add large1 &&
+		sz=$(file_size .git/objects/pack/pack-*.pack) &&
+		case "$expect" in
+		small) test "$sz" -le 100000 ;;
+		large) test "$sz" -ge 100000 ;;
+		esac
+	
+ok 9 - add with -c pack.compression=9
 
 expecting success: 
-	# make 256+ character ref; some systems may not handle that,
-	# so be gentle
-	long=0123456789abcdef &&
-	long=$long/$long/$long/$long &&
-	long=$long/$long/$long/$long &&
-	long_ref=refs/heads/$long &&
-	tree=$(git write-tree) &&
-	commit=$(echo foo | git commit-tree $tree) &&
-	if git update-ref $long_ref $commit; then
-		test_set_prereq LONG_REF
-	else
-		echo >&2 "long refs not supported"
-	fi
-
-ok 10 - create large ref name
-
-expecting success: 
-	git symbolic-ref HEAD $long_ref &&
-	echo $long_ref >expect &&
-	git symbolic-ref HEAD >actual &&
-	test_cmp expect actual
-
-ok 11 - symbolic-ref can point to large ref name
-
-expecting success: 
-	echo $commit >expect &&
-	git rev-parse --verify HEAD >actual &&
-	test_cmp expect actual
-
-ok 12 - we can parse long symbolic ref
-
-expecting success: 
-	test_when_finished "rm -f .git/HEAD.lock" &&
-	>.git/HEAD.lock &&
-	test_must_fail git symbolic-ref HEAD refs/heads/whatever
-
-error: Unable to create '/build/git-2.20.1/t/trash directory.t1401-symbolic-ref/.git/HEAD.lock': File exists.
-
-Another git process seems to be running in this repository, e.g.
-an editor opened by 'git commit'. Please make sure all processes
-are terminated then try again. If it still fails, a git process
-may have crashed in this repository earlier:
-remove the file manually to continue.
-ok 13 - symbolic-ref reports failure in exit code
+	git add large1 huge large2 &&
+	# make sure we got a single packfile and no loose objects
+	bad= count=0 idx= &&
+	for p in .git/objects/pack/pack-*.pack
+	do
+		count=$(( $count + 1 ))
+		if test -f "$p" && idx=${p%.pack}.idx && test -f "$idx"
+		then
+			continue
+		fi
+		bad=t
+	done &&
+	test -z "$bad" &&
+	test $count = 1 &&
+	cnt=$(git show-index <"$idx" | wc -l) &&
+	test $cnt = 2 &&
+	for l in .git/objects/??/??????????????????????????????????????
+	do
+		test -f "$l" || continue
+		bad=t
+	done &&
+	test -z "$bad" &&
 
-expecting success: 
-	git checkout -b log1 &&
-	test_commit one &&
-	git checkout -b log2  &&
-	test_commit two &&
-	git checkout --orphan orphan &&
-	git symbolic-ref -m create HEAD refs/heads/log1 &&
-	git symbolic-ref -m update HEAD refs/heads/log2 &&
-	cat >expect <<-\EOF &&
-	update
-	create
-	EOF
-	git log --format=%gs -g -2 >actual &&
-	test_cmp expect actual
+	# attempt to add another copy of the same
+	git add large3 &&
+	bad= count=0 &&
+	for p in .git/objects/pack/pack-*.pack
+	do
+		count=$(( $count + 1 ))
+		if test -f "$p" && idx=${p%.pack}.idx && test -f "$idx"
+		then
+			continue
+		fi
+		bad=t
+	done &&
+	test -z "$bad" &&
+	test $count = 1
 
-Switched to a new branch 'log1'
-[log1 25f3b1d] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-Switched to a new branch 'log2'
-[log2 815c135] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-Switched to a new branch 'orphan'
-ok 14 - symbolic-ref writes reflog entry
+ok 10 - add a large file or two
 
 expecting success: 
-	git checkout -b df &&
-	test_commit df &&
-	test_must_fail git symbolic-ref refs/heads/df/conflict refs/heads/df &&
-	git pack-refs --all --prune &&
-	test_must_fail git symbolic-ref refs/heads/df/conflict refs/heads/df
+	large1=$(git rev-parse :large1) &&
+	git update-index --add --cacheinfo 100644 $large1 another &&
+	git checkout another &&
+	test_cmp large1 another
 
-Switched to a new branch 'df'
-[df a967c31] df
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 df.t
-error: Unable to create '/build/git-2.20.1/t/trash directory.t1401-symbolic-ref/.git/refs/heads/df/conflict.lock': Not a directory
-error: 'refs/heads/df' exists; cannot create 'refs/heads/df/conflict'
-ok 15 - symbolic-ref does not create ref d/f conflicts
+ok 11 - checkout a large file
 
 expecting success: 
-	test_when_finished reset_to_sane &&
-	head=$(git rev-parse HEAD) &&
-	git symbolic-ref HEAD refs/heads/outer &&
-	test_when_finished "git update-ref -d refs/heads/outer/inner" &&
-	git update-ref refs/heads/outer/inner $head &&
-	git symbolic-ref HEAD refs/heads/unrelated
-
-ok 16 - symbolic-ref can overwrite pointer to invalid name
+	test_create_repo mid &&
+	(
+		cd mid &&
+		git config core.bigfilethreshold 64k &&
+		git config pack.packsizelimit 256k &&
 
-expecting success: 
-	test_when_finished reset_to_sane &&
-	head=$(git rev-parse HEAD) &&
-	git symbolic-ref HEAD refs/heads/outer/inner &&
-	test_when_finished "git update-ref -d refs/heads/outer" &&
-	git update-ref refs/heads/outer $head &&
-	echo refs/heads/outer/inner >expect &&
-	git symbolic-ref HEAD >actual &&
-	test_cmp expect actual
+		# mid1 and mid2 will fit within 256k limit but
+		# appending mid3 will bust the limit and will
+		# result in a separate packfile.
+		test-tool genrandom "a" $(( 66 * 1024 )) >mid1 &&
+		test-tool genrandom "b" $(( 80 * 1024 )) >mid2 &&
+		test-tool genrandom "c" $(( 128 * 1024 )) >mid3 &&
+		git add mid1 mid2 mid3 &&
 
-ok 17 - symbolic-ref can resolve d/f name (EISDIR)
+		count=0 &&
+		for pi in .git/objects/pack/pack-*.idx
+		do
+			test -f "$pi" && count=$(( $count + 1 ))
+		done &&
+		test $count = 2 &&
 
-expecting success: 
-	test_when_finished reset_to_sane &&
-	head=$(git rev-parse HEAD) &&
-	git symbolic-ref HEAD refs/heads/outer &&
-	test_when_finished "git update-ref -d refs/heads/outer/inner" &&
-	git update-ref refs/heads/outer/inner $head &&
-	echo refs/heads/outer >expect &&
-	git symbolic-ref HEAD >actual &&
-	test_cmp expect actual
+		(
+			git hash-object --stdin <mid1 &&
+			git hash-object --stdin <mid2 &&
+			git hash-object --stdin <mid3
+		) |
+		sort >expect &&
 
-ok 18 - symbolic-ref can resolve d/f name (ENOTDIR)
+		for pi in .git/objects/pack/pack-*.idx
+		do
+			git show-index <"$pi"
+		done |
+		sed -e "s/^[0-9]* \([0-9a-f]*\) .*/\1/" |
+		sort >actual &&
 
-# passed all 18 test(s)
-1..18
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t1405-main-ref-store.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1405-main-ref-store/.git/
-expecting success: 
-	test_commit one &&
-	N=`find .git/refs -type f | wc -l` &&
-	test "$N" != 0 &&
-	$RUN pack-refs 3 &&
-	N=`find .git/refs -type f | wc -l`
+		test_cmp expect actual
+	)
 
-[master (root-commit) d79ce16] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-ok 1 - pack_refs(PACK_REFS_ALL | PACK_REFS_PRUNE)
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1050-large/mid/.git/
+ok 12 - packsize limit
 
 expecting success: 
-	git rev-parse HEAD >expected &&
-	git tag -a -m new-tag new-tag HEAD &&
-	$RUN peel-ref refs/tags/new-tag >actual &&
-	test_cmp expected actual
+	git commit -q -m initial &&
+	echo modified >>large1 &&
+	git add large1 &&
+	git commit -q -m modified &&
+	git diff --raw HEAD^
 
-ok 2 - peel_ref(new-tag)
+:100644 100644 6cef6d8 171a2cf M	large1
+ok 13 - diff --raw
 
 expecting success: 
-	$RUN create-symref FOO refs/heads/master nothing &&
-	echo refs/heads/master >expected &&
-	git symbolic-ref FOO >actual &&
-	test_cmp expected actual
+	git diff --stat HEAD^ HEAD
 
-ok 3 - create_symref(FOO, refs/heads/master)
+ large1 | Bin 2000000 -> 2000009 bytes
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ok 14 - diff --stat
 
 expecting success: 
-	git rev-parse FOO -- &&
-	git rev-parse refs/tags/new-tag -- &&
-	$RUN delete-refs 0 nothing FOO refs/tags/new-tag &&
-	test_must_fail git rev-parse FOO -- &&
-	test_must_fail git rev-parse refs/tags/new-tag --
+	git diff HEAD^ HEAD >actual &&
+	grep "Binary files.*differ" actual
 
-d79ce1670bdcb76e6d1da2ae095e890ccb326ae9
---
-407ffbd56c168afa4e9302a7cdfe469155f84482
---
-fatal: bad revision 'FOO'
-fatal: bad revision 'refs/tags/new-tag'
-ok 4 - delete_refs(FOO, refs/tags/new-tag)
+Binary files a/large1 and b/large1 differ
+ok 15 - diff
 
 expecting success: 
-	git rev-parse master >expected &&
-	$RUN rename-ref refs/heads/master refs/heads/new-master &&
-	git rev-parse new-master >actual &&
-	test_cmp expected actual &&
-	test_commit recreate-master
+	git diff --cached HEAD^ >actual &&
+	grep "Binary files.*differ" actual
 
-[master (root-commit) c90e4dc] recreate-master
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 one.t
- create mode 100644 recreate-master.t
-ok 5 - rename_refs(master, new-master)
+Binary files a/large1 and b/large1 differ
+ok 16 - diff --cached
 
 expecting success: 
-	$RUN for-each-ref refs/heads/ | cut -d" " -f 2- >actual &&
-	cat >expected <<-\EOF &&
-	master 0x0
-	new-master 0x0
-	EOF
-	test_cmp expected actual
+	git hash-object large1
 
-ok 6 - for_each_ref(refs/heads/)
+171a2cf5cd75bd8d405266c986591716925e9712
+ok 17 - hash-object
 
 expecting success: 
-	$RUN for-each-ref refs/heads/ | cut -d" " -f 2- >actual &&
-	sort actual > expected &&
-	test_cmp expected actual
+	git cat-file blob :large1 >/dev/null
 
-ok 7 - for_each_ref() is sorted
+ok 18 - cat-file a large file
 
 expecting success: 
-	SHA1=`git rev-parse new-master` &&
-	echo "$SHA1 refs/heads/new-master 0x0" >expected &&
-	$RUN resolve-ref refs/heads/new-master 0 >actual &&
-	test_cmp expected actual
+	git tag -m largefile largefiletag :large1 &&
+	git cat-file blob largefiletag >/dev/null
 
-ok 8 - resolve_ref(new-master)
+ok 19 - cat-file a large file from a tag
 
 expecting success: 
-	$RUN verify-ref refs/heads/new-master
-
-ok 9 - verify_ref(new-master)
+	git show :large1 >/dev/null
 
-expecting success: 
-	$RUN for-each-reflog | sort -k2 | cut -d" " -f 2- >actual &&
-	cat >expected <<-\EOF &&
-	HEAD 0x1
-	refs/heads/master 0x0
-	refs/heads/new-master 0x0
-	EOF
-	test_cmp expected actual
 
-ok 10 - for_each_reflog()
+ok 20 - git-show a large file
 
 expecting success: 
-	$RUN for-each-reflog-ent HEAD >actual &&
-	head -n1 actual | grep one &&
-	tail -n2 actual | head -n1 | grep recreate-master
+	git clone file://"$(pwd)"/.git foo &&
+	GIT_DIR=non-existent git index-pack --strict --verify foo/.git/objects/pack/*.pack
 
-0000000000000000000000000000000000000000 d79ce1670bdcb76e6d1da2ae095e890ccb326ae9 C O Mitter <committer@example.com> 1112911993 -700 commit (initial): one
-0000000000000000000000000000000000000000 c90e4dc5e12224a428dedfbd45ba11e5531706a2 C O Mitter <committer@example.com> 1112912053 -700 commit (initial): recreate-master
-ok 11 - for_each_reflog_ent()
+Cloning into 'foo'...
+ok 21 - index-pack
 
 expecting success: 
-	$RUN for-each-reflog-ent-reverse HEAD >actual &&
-	head -n1 actual | grep recreate-master &&
-	tail -n2 actual | head -n1 | grep one
+	git repack -ad
 
-0000000000000000000000000000000000000000 c90e4dc5e12224a428dedfbd45ba11e5531706a2 C O Mitter <committer@example.com> 1112912053 -700 commit (initial): recreate-master
-0000000000000000000000000000000000000000 d79ce1670bdcb76e6d1da2ae095e890ccb326ae9 C O Mitter <committer@example.com> 1112911993 -700 commit (initial): one
-ok 12 - for_each_reflog_ent_reverse()
+ok 22 - repack
 
 expecting success: 
-	$RUN reflog-exists HEAD
+	SHA1=$(git hash-object huge) &&
+	test_create_repo loose &&
+	echo $SHA1 | git pack-objects --stdout |
+		GIT_ALLOC_LIMIT=0 GIT_DIR=loose/.git git unpack-objects &&
+	echo $SHA1 | GIT_DIR=loose/.git git pack-objects pack &&
+	test_create_repo packed &&
+	mv pack-* packed/.git/objects/pack &&
+	GIT_DIR=packed/.git git cat-file blob $SHA1 >actual &&
+	test_cmp huge actual
 
-ok 13 - reflog_exists(HEAD)
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1050-large/loose/.git/
+dc5b4c5413c9a2a6ca4f121474e1c9c8ea086153
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1050-large/packed/.git/
+ok 23 - pack-objects with large loose object
 
 expecting success: 
-	$RUN delete-reflog HEAD &&
-	! test -f .git/logs/HEAD
+	git archive --format=tar HEAD >/dev/null
 
-ok 14 - delete_reflog(HEAD)
+ok 24 - tar achiving
 
 expecting success: 
-	$RUN create-reflog HEAD 1 &&
-	test -f .git/logs/HEAD
+	git archive --format=zip -0 HEAD >/dev/null
 
-ok 15 - create-reflog(HEAD)
+ok 25 - zip achiving, store only
 
 expecting success: 
-	git checkout -b foo &&
-	FOO_SHA1=`git rev-parse foo` &&
-	git checkout --detach &&
-	test_commit bar-commit &&
-	git checkout -b bar &&
-	BAR_SHA1=`git rev-parse bar` &&
-	$RUN update-ref updating refs/heads/foo $BAR_SHA1 $FOO_SHA1 0 &&
-	echo $BAR_SHA1 >expected &&
-	git rev-parse refs/heads/foo >actual &&
-	test_cmp expected actual
+	git archive --format=zip HEAD >/dev/null
 
-Switched to a new branch 'foo'
-HEAD is now at c90e4dc recreate-master
-[detached HEAD 1e995a9] 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 16 - delete_ref(refs/heads/foo)
+ok 26 - zip achiving, deflate
 
 expecting success: 
-	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 --
+	git fsck 2>err &&
+	test_must_be_empty err
 
-HEAD is now at 1e995a9 bar-commit
-fatal: bad revision 'refs/heads/foo'
-ok 17 - delete_ref(refs/heads/foo)
+ok 27 - fsck large blobs
 
-# passed all 17 test(s)
-1..17
+# passed all 27 test(s)
+1..27
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
 *** t0000-basic.sh ***
@@ -26770,7 +26651,7 @@
 		wc -l) &&
 	test $numparent = 1
 
-error: duplicate parent dfdb5589f3af0af6551bd73f81ab65d364828e42 ignored
+error: duplicate parent 35bca81dc9d29ca9370cf5f6660cf49b0004c79b ignored
 ok 80 - git commit-tree omits duplicated parent in a commit
 
 expecting success: 
@@ -26808,360 +26689,664 @@
 1..82
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t1409-avoid-packing-refs.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1409-avoid-packing-refs/.git/
+*** t1408-packed-refs.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1408-packed-refs/.git/
 expecting success: 
-	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)
+	test_tick &&
+	git commit --allow-empty -m one &&
+	one=$(git rev-parse HEAD) &&
+	git for-each-ref >actual &&
+	echo "$one commit	refs/heads/master" >expect &&
+	test_cmp expect actual &&
+
+	git pack-refs --all &&
+	git for-each-ref >actual &&
+	echo "$one commit	refs/heads/master" >expect &&
+	test_cmp expect actual &&
+
+	git checkout --orphan another &&
+	test_tick &&
+	git commit --allow-empty -m two &&
+	two=$(git rev-parse HEAD) &&
+	git checkout -B master &&
+	git branch -D another &&
+
+	git for-each-ref >actual &&
+	echo "$two commit	refs/heads/master" >expect &&
+	test_cmp expect actual &&
+
+	git reflog expire --expire=now --all &&
+	git prune &&
+	git tag -m v1.0 v1.0 master
 
-[master (root-commit) 58c24b9] Commit A
+[master (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>
-[master 504ab46] Commit B
+Switched to and reset branch 'master'
+Deleted branch another (was 169e1dc).
+ok 1 - setup
+
+expecting success: 
+	git describe master >actual 2>&1 &&
+	echo "v1.0" >expect &&
+	test_cmp expect actual
+
+ok 2 - no error from stale entry in packed-refs
+
+# passed all 2 test(s)
+1..2
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t1407-worktree-ref-store.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1407-worktree-ref-store/.git/
+expecting success: 
+	test_commit first &&
+	git worktree add -b wt-master wt &&
+	(
+		cd wt &&
+		test_commit second
+	)
+
+[master (root-commit) 50e526b] first
  Author: A U Thor <author@example.com>
-[master 9332065] Commit C
+ 1 file changed, 1 insertion(+)
+ create mode 100644 first.t
+Preparing worktree (new branch 'wt-master')
+HEAD is now at 50e526b first
+[wt-master d662100] second
  Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 second.t
 ok 1 - setup
 
 expecting success: 
-	test_must_fail test -f .git/packed-refs &&
-	git update-ref refs/heads/foo $A &&
-	test_must_fail test -f .git/packed-refs &&
-	git update-ref refs/heads/foo $B &&
-	test_must_fail test -f .git/packed-refs &&
-	git update-ref refs/heads/foo $C $B &&
-	test_must_fail test -f .git/packed-refs &&
-	git update-ref -d refs/heads/foo &&
-	test_must_fail test -f .git/packed-refs
+	SHA1=`git rev-parse master` &&
+	echo "$SHA1 refs/heads/master 0x0" >expected &&
+	$RWT resolve-ref refs/heads/master 0 >actual &&
+	test_cmp expected actual &&
+	$RMAIN resolve-ref refs/heads/master 0 >actual &&
+	test_cmp expected actual
 
-ok 2 - do not create packed-refs file gratuitously
+ok 2 - resolve_ref(<shared-ref>)
 
 expecting success: 
-	git for-each-ref >expected &&
-	git pack-refs --all &&
-	mark_packed_refs &&
-	check_packed_refs_marked &&
-	git for-each-ref >actual &&
+	SHA1=`git -C wt rev-parse HEAD` &&
+	echo "$SHA1 refs/heads/wt-master 0x1" >expected &&
+	$RWT resolve-ref HEAD 0 >actual &&
 	test_cmp expected actual &&
-	git pack-refs --all &&
-	test_must_fail check_packed_refs_marked &&
-	git for-each-ref >actual2 &&
-	test_cmp expected actual2
 
-ok 3 - check that marking the packed-refs file works
+	SHA1=`git rev-parse HEAD` &&
+	echo "$SHA1 refs/heads/master 0x1" >expected &&
+	$RMAIN resolve-ref HEAD 0 >actual &&
+	test_cmp expected actual
+
+ok 3 - resolve_ref(<per-worktree-ref>)
 
 expecting success: 
-	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
+	$RWT create-symref FOO refs/heads/master nothing &&
+	echo refs/heads/master >expected &&
+	git -C wt symbolic-ref FOO >actual &&
+	test_cmp expected actual &&
 
-ok 4 - leave packed-refs untouched on update of packed
+	$RMAIN create-symref FOO refs/heads/wt-master nothing &&
+	echo refs/heads/wt-master >expected &&
+	git symbolic-ref FOO >actual &&
+	test_cmp expected actual
+
+ok 4 - create_symref(FOO, refs/heads/master)
 
 expecting success: 
-	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
+	echo $ZERO_OID > .git/logs/PSEUDO-MAIN &&
+	mkdir -p     .git/logs/refs/bisect &&
+	echo $ZERO_OID > .git/logs/refs/bisect/random &&
 
-ok 5 - leave packed-refs untouched on checked update of packed
+	echo $ZERO_OID > .git/worktrees/wt/logs/PSEUDO-WT &&
+	mkdir -p     .git/worktrees/wt/logs/refs/bisect &&
+	echo $ZERO_OID > .git/worktrees/wt/logs/refs/bisect/wt-random &&
+
+	$RWT for-each-reflog | cut -d" " -f 2- | sort >actual &&
+	cat >expected <<-\EOF &&
+	HEAD 0x1
+	PSEUDO-WT 0x0
+	refs/bisect/wt-random 0x0
+	refs/heads/master 0x0
+	refs/heads/wt-master 0x0
+	EOF
+	test_cmp expected actual &&
+
+	$RMAIN for-each-reflog | cut -d" " -f 2- | sort >actual &&
+	cat >expected <<-\EOF &&
+	HEAD 0x1
+	PSEUDO-MAIN 0x0
+	refs/bisect/random 0x0
+	refs/heads/master 0x0
+	refs/heads/wt-master 0x0
+	EOF
+	test_cmp expected actual
+
+ok 5 - for_each_reflog()
 
+# passed all 5 test(s)
+1..5
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t1401-symbolic-ref.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1401-symbolic-ref/.git/
 expecting success: 
-	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
+	git symbolic-ref HEAD refs/heads/foo &&
+	echo ref: refs/heads/foo >expect &&
+	test_cmp expect .git/HEAD
 
-ok 6 - leave packed-refs untouched on verify of packed
+ok 1 - symbolic-ref writes HEAD
 
 expecting success: 
-	git update-ref refs/heads/packed-delete $A &&
-	git pack-refs --all &&
-	mark_packed_refs &&
-	git update-ref -d refs/heads/packed-delete &&
-	test_must_fail check_packed_refs_marked
+	echo refs/heads/foo >expect &&
+	git symbolic-ref HEAD >actual &&
+	test_cmp expect actual
 
-ok 7 - touch packed-refs on delete of packed
+ok 2 - symbolic-ref reads HEAD
 
 expecting success: 
-	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
+	test_must_fail git symbolic-ref HEAD foo
 
-ok 8 - leave packed-refs untouched on update of loose
+fatal: Refusing to point HEAD outside of refs/
+ok 3 - symbolic-ref refuses non-ref for HEAD
 
 expecting success: 
-	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
+	echo content >file && git add file && git commit -m one &&
+	test_must_fail git symbolic-ref HEAD $(git rev-parse HEAD)
 
-ok 9 - leave packed-refs untouched on checked update of loose
+[foo (root-commit) 9ed65e7] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+fatal: Refusing to point HEAD outside of refs/
+ok 4 - symbolic-ref refuses bare sha1
 
 expecting success: 
-	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
+	test_must_fail git symbolic-ref -d HEAD
 
-ok 10 - leave packed-refs untouched on verify of loose
+fatal: deleting 'HEAD' is not allowed
+ok 5 - HEAD cannot be removed
 
 expecting success: 
-	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
+	git symbolic-ref NOTHEAD refs/heads/foo &&
+	git symbolic-ref -d NOTHEAD &&
+	test_path_is_file .git/refs/heads/foo &&
+	test_path_is_missing .git/NOTHEAD
 
-ok 11 - leave packed-refs untouched on delete of loose
+ok 6 - symbolic-ref can be deleted
 
-# passed all 11 test(s)
-1..11
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t1403-show-ref.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1403-show-ref/.git/
 expecting success: 
-	test_commit A &&
-	git tag -f -a -m "annotated A" A &&
-	git checkout -b side &&
-	test_commit B &&
-	git tag -f -a -m "annotated B" B &&
-	git checkout master &&
-	test_commit C &&
-	git branch B A^0
+	git symbolic-ref NOTHEAD refs/heads/missing &&
+	git symbolic-ref -d NOTHEAD &&
+	test_path_is_missing .git/refs/heads/missing &&
+	test_path_is_missing .git/NOTHEAD
 
-[master (root-commit) 0ddfaf1] A
+ok 7 - symbolic-ref can delete dangling symref
+
+expecting success: 
+	echo "fatal: Cannot delete FOO, not a symbolic ref" >expect &&
+	test_must_fail git symbolic-ref -d FOO >actual 2>&1 &&
+	test_cmp expect actual
+
+ok 8 - symbolic-ref fails to delete missing FOO
+
+expecting success: 
+	echo "fatal: Cannot delete refs/heads/foo, not a symbolic ref" >expect &&
+	test_must_fail git symbolic-ref -d refs/heads/foo >actual 2>&1 &&
+	git rev-parse --verify refs/heads/foo &&
+	test_cmp expect actual
+
+9ed65e7fd809c90d6cc7d6dc52e8c3b3f4e35414
+ok 9 - symbolic-ref fails to delete real ref
+
+expecting success: 
+	# make 256+ character ref; some systems may not handle that,
+	# so be gentle
+	long=0123456789abcdef &&
+	long=$long/$long/$long/$long &&
+	long=$long/$long/$long/$long &&
+	long_ref=refs/heads/$long &&
+	tree=$(git write-tree) &&
+	commit=$(echo foo | git commit-tree $tree) &&
+	if git update-ref $long_ref $commit; then
+		test_set_prereq LONG_REF
+	else
+		echo >&2 "long refs not supported"
+	fi
+
+ok 10 - create large ref name
+
+expecting success: 
+	git symbolic-ref HEAD $long_ref &&
+	echo $long_ref >expect &&
+	git symbolic-ref HEAD >actual &&
+	test_cmp expect actual
+
+ok 11 - symbolic-ref can point to large ref name
+
+expecting success: 
+	echo $commit >expect &&
+	git rev-parse --verify HEAD >actual &&
+	test_cmp expect actual
+
+ok 12 - we can parse long symbolic ref
+
+expecting success: 
+	test_when_finished "rm -f .git/HEAD.lock" &&
+	>.git/HEAD.lock &&
+	test_must_fail git symbolic-ref HEAD refs/heads/whatever
+
+error: Unable to create '/build/git-2.20.1/t/trash directory.t1401-symbolic-ref/.git/HEAD.lock': File exists.
+
+Another git process seems to be running in this repository, e.g.
+an editor opened by 'git commit'. Please make sure all processes
+are terminated then try again. If it still fails, a git process
+may have crashed in this repository earlier:
+remove the file manually to continue.
+ok 13 - symbolic-ref reports failure in exit code
+
+expecting success: 
+	git checkout -b log1 &&
+	test_commit one &&
+	git checkout -b log2  &&
+	test_commit two &&
+	git checkout --orphan orphan &&
+	git symbolic-ref -m create HEAD refs/heads/log1 &&
+	git symbolic-ref -m update HEAD refs/heads/log2 &&
+	cat >expect <<-\EOF &&
+	update
+	create
+	EOF
+	git log --format=%gs -g -2 >actual &&
+	test_cmp expect actual
+
+Switched to a new branch 'log1'
+[log1 c44d522] one
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 A.t
-Updated tag 'A' (was 0ddfaf1)
-Switched to a new branch 'side'
-[side d9df450] B
+ create mode 100644 one.t
+Switched to a new branch 'log2'
+[log2 0989d54] two
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 B.t
-Updated tag 'B' (was d9df450)
-Switched to branch 'master'
-[master 5dee784] C
+ create mode 100644 two.t
+Switched to a new branch 'orphan'
+ok 14 - symbolic-ref writes reflog entry
+
+expecting success: 
+	git checkout -b df &&
+	test_commit df &&
+	test_must_fail git symbolic-ref refs/heads/df/conflict refs/heads/df &&
+	git pack-refs --all --prune &&
+	test_must_fail git symbolic-ref refs/heads/df/conflict refs/heads/df
+
+Switched to a new branch 'df'
+[df 033545c] df
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 C.t
-ok 1 - setup
+ create mode 100644 df.t
+error: Unable to create '/build/git-2.20.1/t/trash directory.t1401-symbolic-ref/.git/refs/heads/df/conflict.lock': Not a directory
+error: 'refs/heads/df' exists; cannot create 'refs/heads/df/conflict'
+ok 15 - symbolic-ref does not create ref d/f conflicts
 
 expecting success: 
-	echo $(git rev-parse refs/tags/A) refs/tags/A >expect &&
+	test_when_finished reset_to_sane &&
+	head=$(git rev-parse HEAD) &&
+	git symbolic-ref HEAD refs/heads/outer &&
+	test_when_finished "git update-ref -d refs/heads/outer/inner" &&
+	git update-ref refs/heads/outer/inner $head &&
+	git symbolic-ref HEAD refs/heads/unrelated
 
-	git show-ref A >actual &&
-	test_cmp expect actual &&
+ok 16 - symbolic-ref can overwrite pointer to invalid name
 
-	git show-ref tags/A >actual &&
-	test_cmp expect actual &&
+expecting success: 
+	test_when_finished reset_to_sane &&
+	head=$(git rev-parse HEAD) &&
+	git symbolic-ref HEAD refs/heads/outer/inner &&
+	test_when_finished "git update-ref -d refs/heads/outer" &&
+	git update-ref refs/heads/outer $head &&
+	echo refs/heads/outer/inner >expect &&
+	git symbolic-ref HEAD >actual &&
+	test_cmp expect actual
 
-	git show-ref refs/tags/A >actual &&
-	test_cmp expect actual &&
+ok 17 - symbolic-ref can resolve d/f name (EISDIR)
 
-	test_must_fail git show-ref D >actual &&
-	test_must_be_empty actual
+expecting success: 
+	test_when_finished reset_to_sane &&
+	head=$(git rev-parse HEAD) &&
+	git symbolic-ref HEAD refs/heads/outer &&
+	test_when_finished "git update-ref -d refs/heads/outer/inner" &&
+	git update-ref refs/heads/outer/inner $head &&
+	echo refs/heads/outer >expect &&
+	git symbolic-ref HEAD >actual &&
+	test_cmp expect actual
 
-ok 2 - show-ref
+ok 18 - symbolic-ref can resolve d/f name (ENOTDIR)
 
+# passed all 18 test(s)
+1..18
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t1308-config-set.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1308-config-set/.git/
 expecting success: 
-	git show-ref -q A >actual &&
-	test_must_be_empty actual &&
+	cat >.git/config <<-\EOF
+	[case]
+		penguin = very blue
+		Movie = BadPhysics
+		UPPERCASE = true
+		MixedCase = true
+		my =
+		foo
+		baz = sam
+	[Cores]
+		WhatEver = Second
+		baz = bar
+	[cores]
+		baz = bat
+	[CORES]
+		baz = ball
+	[my "Foo bAr"]
+		hi = mixed-case
+	[my "FOO BAR"]
+		hi = upper-case
+	[my "foo bar"]
+		hi = lower-case
+	[case]
+		baz = bat
+		baz = hask
+	[lamb]
+		chop = 65
+		head = none
+	[goat]
+		legs = 4
+		head = true
+		skin = false
+		nose = 1
+		horns
+	EOF
 
-	git show-ref -q tags/A >actual &&
-	test_must_be_empty actual &&
+ok 1 - setup default config
 
-	git show-ref -q refs/tags/A >actual &&
-	test_must_be_empty actual &&
+expecting success: 
+	check_config get_value case.penguin "very blue"
 
-	test_must_fail git show-ref -q D >actual &&
-	test_must_be_empty actual
+ok 2 - get value for a simple key
 
-ok 3 - show-ref -q
+expecting success: 
+	check_config get_value case.my ""
+
+ok 3 - get value for a key with value as an empty string
 
 expecting success: 
-	echo $(git rev-parse refs/tags/A) refs/tags/A >expect &&
+	check_config get_value case.foo "(NULL)"
 
-	git show-ref --verify refs/tags/A >actual &&
-	test_cmp expect actual &&
+ok 4 - get value for a key with value as NULL
 
-	test_must_fail git show-ref --verify A >actual &&
-	test_must_be_empty actual &&
+expecting success: 
+	check_config get_value case.UPPERCASE "true" &&
+	check_config get_value case.uppercase "true"
 
-	test_must_fail git show-ref --verify tags/A >actual &&
-	test_must_be_empty actual &&
+ok 5 - upper case key
 
-	test_must_fail git show-ref --verify D >actual &&
-	test_must_be_empty actual
+expecting success: 
+	check_config get_value case.MixedCase "true" &&
+	check_config get_value case.MIXEDCASE "true" &&
+	check_config get_value case.mixedcase "true"
 
-fatal: 'A' - not a valid ref
-fatal: 'tags/A' - not a valid ref
-fatal: 'D' - not a valid ref
-ok 4 - show-ref --verify
+ok 6 - mixed case key
 
 expecting success: 
-	git show-ref --verify -q refs/tags/A >actual &&
-	test_must_be_empty actual &&
+	check_config get_value case.Movie "BadPhysics"
 
-	test_must_fail git show-ref --verify -q A >actual &&
-	test_must_be_empty actual &&
+ok 7 - key and value with mixed case
 
-	test_must_fail git show-ref --verify -q tags/A >actual &&
-	test_must_be_empty actual &&
+expecting success: 
+	check_config get_value "my.Foo bAr.hi" "mixed-case" &&
+	check_config get_value "my.FOO BAR.hi" "upper-case" &&
+	check_config get_value "my.foo bar.hi" "lower-case"
 
-	test_must_fail git show-ref --verify -q D >actual &&
-	test_must_be_empty actual
+ok 8 - key with case sensitive subsection
 
-ok 5 - show-ref --verify -q
+expecting success: 
+	check_config get_value cores.baz "ball" &&
+	check_config get_value Cores.baz "ball" &&
+	check_config get_value CORES.baz "ball" &&
+	check_config get_value coreS.baz "ball"
+
+ok 9 - key with case insensitive section header
 
 expecting success: 
-	{
-		echo $(git rev-parse refs/tags/A) refs/tags/A &&
-		echo $(git rev-parse refs/tags/A^0) "refs/tags/A^{}"
-		echo $(git rev-parse refs/tags/C) refs/tags/C
-	} >expect &&
-	git show-ref -d A C >actual &&
-	test_cmp expect actual &&
+	check_config get_value CORES.BAZ "ball" &&
+	check_config get_value cores.baz "ball" &&
+	check_config get_value cores.BaZ "ball" &&
+	check_config get_value cOreS.bAz "ball"
 
-	git show-ref -d tags/A tags/C >actual &&
-	test_cmp expect actual &&
+ok 10 - key with case insensitive section header & variable
 
-	git show-ref -d refs/tags/A refs/tags/C >actual &&
-	test_cmp expect actual &&
+expecting success: 
+	check_config expect_code 1 get_value "my.fOo Bar.hi" "Value not found for \"my.fOo Bar.hi\""
 
-	git show-ref --verify -d refs/tags/A refs/tags/C >actual &&
-	test_cmp expect actual &&
+ok 11 - find value with misspelled key
 
-	echo $(git rev-parse refs/heads/master) refs/heads/master >expect &&
-	git show-ref -d master >actual &&
-	test_cmp expect actual &&
+expecting success: 
+	check_config get_value case.baz "hask"
 
-	git show-ref -d heads/master >actual &&
-	test_cmp expect actual &&
+ok 12 - find value with the highest priority
 
-	git show-ref -d refs/heads/master >actual &&
-	test_cmp expect actual &&
+expecting success: 
+	check_config get_int lamb.chop 65
 
-	git show-ref -d --verify refs/heads/master >actual &&
-	test_cmp expect actual &&
+ok 13 - find integer value for a key
 
-	test_must_fail git show-ref -d --verify master >actual &&
-	test_must_be_empty actual &&
+expecting success: 
+	check_config get_string case.baz hask &&
+	check_config expect_code 1 get_string case.ba "Value not found for \"case.ba\""
 
-	test_must_fail git show-ref -d --verify heads/master >actual &&
-	test_must_be_empty actual &&
+ok 14 - find string value for a key
 
-	test_must_fail git show-ref --verify -d A C >actual &&
-	test_must_be_empty actual &&
+expecting success: 
+	test_expect_code 128 test-tool config get_string case.foo 2>result &&
+	test_i18ngrep "fatal: .*case\.foo.*\.git/config.*line 7" result
 
-	test_must_fail git show-ref --verify -d tags/A tags/C >actual &&
-	test_must_be_empty actual
+fatal: bad config variable 'case.foo' in file '.git/config' at line 7
+ok 15 - check line error when NULL string is queried
 
+expecting success: 
+	check_config expect_code 128 get_int lamb.head
 
-fatal: 'master' - not a valid ref
-fatal: 'heads/master' - not a valid ref
-fatal: 'A' - not a valid ref
-fatal: 'tags/A' - not a valid ref
-ok 6 - show-ref -d
+fatal: bad numeric config value 'none' for 'lamb.head': invalid unit
+ok 16 - find integer if value is non parse-able
 
 expecting success: 
-	for branch in B master side
-	do
-		echo $(git rev-parse refs/heads/$branch) refs/heads/$branch
-	done >expect.heads &&
-	git show-ref --heads >actual &&
-	test_cmp expect.heads actual &&
+	check_config get_bool goat.head 1 &&
+	check_config get_bool goat.skin 0 &&
+	check_config get_bool goat.nose 1 &&
+	check_config get_bool goat.horns 1 &&
+	check_config get_bool goat.legs 1
 
-	for tag in A B C
-	do
-		echo $(git rev-parse refs/tags/$tag) refs/tags/$tag
-	done >expect.tags &&
-	git show-ref --tags >actual &&
-	test_cmp expect.tags actual &&
+ok 17 - find bool value for the entered key
 
-	cat expect.heads expect.tags >expect &&
-	git show-ref --heads --tags >actual &&
-	test_cmp expect actual &&
+expecting success: 
+	check_config get_value_multi case.baz sam bat hask
 
-	{
-		echo $(git rev-parse HEAD) HEAD &&
-		cat expect.heads expect.tags
-	} >expect &&
-	git show-ref --heads --tags --head >actual &&
-	test_cmp expect actual &&
+ok 18 - find multiple values
 
-	{
-		echo $(git rev-parse HEAD) HEAD &&
-		echo $(git rev-parse refs/heads/B) refs/heads/B
-		echo $(git rev-parse refs/tags/B) refs/tags/B
-	} >expect &&
-	git show-ref --head B >actual &&
-	test_cmp expect actual &&
+expecting success: 
+	cat >config2 <<-\EOF &&
+	[case]
+		baz = lama
+	[my]
+		new = silk
+	[case]
+		baz = ball
+	EOF
+	echo silk >expect &&
+	test-tool config configset_get_value my.new config2 .git/config >actual &&
+	test_cmp expect actual
 
-	{
-		echo $(git rev-parse HEAD) HEAD &&
-		echo $(git rev-parse refs/heads/B) refs/heads/B
-		echo $(git rev-parse refs/tags/B) refs/tags/B
-		echo $(git rev-parse refs/tags/B^0) "refs/tags/B^{}"
-	} >expect &&
-	git show-ref --head -d B >actual &&
+ok 19 - find value from a configset
+
+expecting success: 
+	echo hask >expect &&
+	test-tool config configset_get_value case.baz config2 .git/config >actual &&
 	test_cmp expect actual
 
-ok 7 - show-ref --heads, --tags, --head, pattern
+ok 20 - find value with highest priority from a configset
 
 expecting success: 
-	echo $(git rev-parse HEAD) HEAD >expect &&
-	git show-ref --verify HEAD >actual &&
-	test_cmp expect actual &&
+	cat >except <<-\EOF &&
+	sam
+	bat
+	hask
+	lama
+	ball
+	EOF
+	test-tool config configset_get_value case.baz config2 .git/config >actual &&
+	test_cmp expect actual
 
-	git show-ref --verify -q HEAD >actual &&
-	test_must_be_empty actual
+ok 21 - find value_list for a key from a configset
 
-ok 8 - show-ref --verify HEAD
+expecting success: 
+	echo "Error (-1) reading configuration file non-existent-file." >expect &&
+	test_expect_code 2 test-tool config configset_get_value foo.bar non-existent-file 2>actual &&
+	test_cmp expect actual
+
+ok 22 - proper error on non-existent files
 
 expecting success: 
-	sha1_file() {
-		echo "$*" | sed "s#..#.git/objects/&/#"
-	} &&
+	echo "Error (-1) reading configuration file a-directory." >expect &&
+	mkdir a-directory &&
+	test_expect_code 2 test-tool config configset_get_value foo.bar a-directory 2>output &&
+	grep "^warning:" output &&
+	grep "^Error" output >actual &&
+	test_cmp expect actual
 
-	remove_object() {
-		file=$(sha1_file "$*") &&
-		test -e "$file" &&
-		rm -f "$file"
-	} &&
+warning: unable to access 'a-directory': Is a directory
+ok 23 - proper error on directory "files"
 
-	test_when_finished "rm -rf dangling" &&
-	(
-		git init dangling &&
-		cd dangling &&
-		test_commit dangling &&
-		sha=$(git rev-parse refs/tags/dangling) &&
-		remove_object $sha &&
-		test_must_fail git show-ref --verify refs/tags/dangling
-	)
+checking prerequisite: SANITY
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1403-show-ref/dangling/.git/
-[master (root-commit) ceb9007] dangling
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 dangling.t
-fatal: git show-ref: bad ref refs/tags/dangling (ceb9007ddae8b252f505d0ef9dcf579bfda7e91c)
-ok 9 - show-ref --verify with dangling ref
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
+	mkdir SANETESTD.1 SANETESTD.2 &&
 
-# passed all 9 test(s)
-1..9
+	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: 
+	chmod -r .git/config &&
+	test_when_finished "chmod +r .git/config" &&
+	echo "Error (-1) reading configuration file .git/config." >expect &&
+	test_expect_code 2 test-tool config configset_get_value foo.bar .git/config 2>output &&
+	grep "^warning:" output &&
+	grep "^Error" output >actual &&
+	test_cmp expect actual
+
+warning: unable to access '.git/config': Permission denied
+warning: unable to access '.git/config': Permission denied
+ok 24 - proper error on non-accessible files
+
+expecting success: 
+	cp .git/config .git/config.old &&
+	test_when_finished "mv .git/config.old .git/config" &&
+	echo "[" >>.git/config &&
+	echo "fatal: bad config line 34 in file .git/config" >expect &&
+	test_expect_code 128 test-tool config get_value foo.bar 2>actual &&
+	test_i18ncmp expect actual
+
+ok 25 - proper error on error in default config files
+
+expecting success: 
+	echo "[" >>syntax-error &&
+	echo "fatal: bad config line 1 in file syntax-error" >expect &&
+	test_expect_code 128 test-tool config configset_get_value foo.bar syntax-error 2>actual &&
+	test_i18ncmp expect actual
+
+ok 26 - proper error on error in custom config files
+
+expecting success: 
+	mv .git/config .git/config.old &&
+	test_when_finished "mv .git/config.old .git/config" &&
+	cat >.git/config <<-\EOF &&
+	[alias]
+		br
+	EOF
+	test_expect_code 128 git br 2>result &&
+	test_i18ngrep "missing value for .alias\.br" result &&
+	test_i18ngrep "fatal: .*\.git/config" result &&
+	test_i18ngrep "fatal: .*line 2" result
+
+error: missing value for 'alias.br'
+fatal: bad config line 2 in file .git/config
+fatal: bad config line 2 in file .git/config
+ok 27 - check line errors for malformed values
+
+expecting success: 
+	nongit test_must_fail git config a.b c 2>err &&
+	test_i18ngrep "not in a git directory" err
+
+fatal: not in a git directory
+ok 28 - error on modifying repo config without repo
+
+expecting success: 
+	echo "[foo]bar = from-repo" >.git/config &&
+	echo "[foo]bar = from-home" >.gitconfig &&
+	if test_have_prereq MINGW
+	then
+		# Use Windows path (i.e. *not* $HOME)
+		HOME_GITCONFIG=$(pwd)/.gitconfig
+	else
+		# Do not get fooled by symbolic links, i.e. $HOME != $(pwd)
+		HOME_GITCONFIG=$HOME/.gitconfig
+	fi &&
+	cat >expect <<-EOF &&
+	key=foo.bar
+	value=from-home
+	origin=file
+	name=$HOME_GITCONFIG
+	scope=global
+
+	key=foo.bar
+	value=from-repo
+	origin=file
+	name=.git/config
+	scope=repo
+
+	key=foo.bar
+	value=from-cmdline
+	origin=command line
+	name=
+	scope=cmdline
+	EOF
+	GIT_CONFIG_PARAMETERS=$cmdline_config test-tool config iterate >actual &&
+	test_cmp expect actual
+
+ok 29 - iteration shows correct origins
+
+# passed all 29 test(s)
+1..29
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
 *** t1406-submodule-ref-store.sh ***
@@ -27298,544 +27483,6 @@
 1..16
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t1407-worktree-ref-store.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1407-worktree-ref-store/.git/
-expecting success: 
-	test_commit first &&
-	git worktree add -b wt-master wt &&
-	(
-		cd wt &&
-		test_commit second
-	)
-
-[master (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-master')
-HEAD is now at 50e526b first
-[wt-master d662100] second
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 second.t
-ok 1 - setup
-
-expecting success: 
-	SHA1=`git rev-parse master` &&
-	echo "$SHA1 refs/heads/master 0x0" >expected &&
-	$RWT resolve-ref refs/heads/master 0 >actual &&
-	test_cmp expected actual &&
-	$RMAIN resolve-ref refs/heads/master 0 >actual &&
-	test_cmp expected actual
-
-ok 2 - resolve_ref(<shared-ref>)
-
-expecting success: 
-	SHA1=`git -C wt rev-parse HEAD` &&
-	echo "$SHA1 refs/heads/wt-master 0x1" >expected &&
-	$RWT resolve-ref HEAD 0 >actual &&
-	test_cmp expected actual &&
-
-	SHA1=`git rev-parse HEAD` &&
-	echo "$SHA1 refs/heads/master 0x1" >expected &&
-	$RMAIN resolve-ref HEAD 0 >actual &&
-	test_cmp expected actual
-
-ok 3 - resolve_ref(<per-worktree-ref>)
-
-expecting success: 
-	$RWT create-symref FOO refs/heads/master nothing &&
-	echo refs/heads/master >expected &&
-	git -C wt symbolic-ref FOO >actual &&
-	test_cmp expected actual &&
-
-	$RMAIN create-symref FOO refs/heads/wt-master nothing &&
-	echo refs/heads/wt-master >expected &&
-	git symbolic-ref FOO >actual &&
-	test_cmp expected actual
-
-ok 4 - create_symref(FOO, refs/heads/master)
-
-expecting success: 
-	echo $ZERO_OID > .git/logs/PSEUDO-MAIN &&
-	mkdir -p     .git/logs/refs/bisect &&
-	echo $ZERO_OID > .git/logs/refs/bisect/random &&
-
-	echo $ZERO_OID > .git/worktrees/wt/logs/PSEUDO-WT &&
-	mkdir -p     .git/worktrees/wt/logs/refs/bisect &&
-	echo $ZERO_OID > .git/worktrees/wt/logs/refs/bisect/wt-random &&
-
-	$RWT for-each-reflog | cut -d" " -f 2- | sort >actual &&
-	cat >expected <<-\EOF &&
-	HEAD 0x1
-	PSEUDO-WT 0x0
-	refs/bisect/wt-random 0x0
-	refs/heads/master 0x0
-	refs/heads/wt-master 0x0
-	EOF
-	test_cmp expected actual &&
-
-	$RMAIN for-each-reflog | cut -d" " -f 2- | sort >actual &&
-	cat >expected <<-\EOF &&
-	HEAD 0x1
-	PSEUDO-MAIN 0x0
-	refs/bisect/random 0x0
-	refs/heads/master 0x0
-	refs/heads/wt-master 0x0
-	EOF
-	test_cmp expected actual
-
-ok 5 - for_each_reflog()
-
-# passed all 5 test(s)
-1..5
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t1408-packed-refs.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1408-packed-refs/.git/
-expecting success: 
-	test_tick &&
-	git commit --allow-empty -m one &&
-	one=$(git rev-parse HEAD) &&
-	git for-each-ref >actual &&
-	echo "$one commit	refs/heads/master" >expect &&
-	test_cmp expect actual &&
-
-	git pack-refs --all &&
-	git for-each-ref >actual &&
-	echo "$one commit	refs/heads/master" >expect &&
-	test_cmp expect actual &&
-
-	git checkout --orphan another &&
-	test_tick &&
-	git commit --allow-empty -m two &&
-	two=$(git rev-parse HEAD) &&
-	git checkout -B master &&
-	git branch -D another &&
-
-	git for-each-ref >actual &&
-	echo "$two commit	refs/heads/master" >expect &&
-	test_cmp expect actual &&
-
-	git reflog expire --expire=now --all &&
-	git prune &&
-	git tag -m v1.0 v1.0 master
-
-[master (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 'master'
-Deleted branch another (was 169e1dc).
-ok 1 - setup
-
-expecting success: 
-	git describe master >actual 2>&1 &&
-	echo "v1.0" >expect &&
-	test_cmp expect actual
-
-ok 2 - no error from stale entry in packed-refs
-
-# passed all 2 test(s)
-1..2
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t1412-reflog-loop.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1412-reflog-loop/.git/
-expecting success: 
-	test_tick &&
-	echo content >file && git add file && git commit -m one &&
-	git tag one &&
-	echo content >>file && git add file && git commit -m two &&
-	git tag two
-
-[master (root-commit) e46513e] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-[master 441e5e0] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 1 - setup commits
-
-expecting success: 
-	git checkout -b topic &&
-	git reset one &&
-	git reset two &&
-	git reset one &&
-	git reset two
-
-Switched to a new branch 'topic'
-Unstaged changes after reset:
-M	file
-Unstaged changes after reset:
-M	file
-ok 2 - setup reflog with alternating commits
-
-expecting success: 
-	cat >expect <<-\EOF &&
-		topic@{0} reset: moving to two
-		topic@{1} reset: moving to one
-		topic@{2} reset: moving to two
-		topic@{3} reset: moving to one
-		topic@{4} branch: Created from HEAD
-	EOF
-	git log -g --format="%gd %gs" topic >actual &&
-	test_cmp expect actual
-
-ok 3 - reflog shows all entries
-
-# passed all 3 test(s)
-1..3
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t1420-lost-found.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1420-lost-found/.git/
-expecting success: 
-	git config core.logAllRefUpdates 0 &&
-	: > file1 &&
-	git add file1 &&
-	test_tick &&
-	git commit -m initial &&
-	echo 1 > file1 &&
-	echo 2 > file2 &&
-	git add file1 file2 &&
-	test_tick &&
-	git commit -m second &&
-	echo 3 > file3 &&
-	git add file3
-
-[master (root-commit) 9bb1ae9] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 file1
-[master 8ad33be] second
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 file2
-ok 1 - setup
-
-expecting success: 
-	git rev-parse HEAD > lost-commit &&
-	git rev-parse :file3 > lost-other &&
-	test_tick &&
-	git reset --hard HEAD^ &&
-	git fsck --lost-found &&
-	test 2 = $(ls .git/lost-found/*/* | wc -l) &&
-	test -f .git/lost-found/commit/$(cat lost-commit) &&
-	test -f .git/lost-found/other/$(cat lost-other)
-
-HEAD is now at 9bb1ae9 initial
-dangling blob 00750edc07d6415dcc07ae0351e9397b0222b7ba
-dangling commit 8ad33beea8de8e15812274614acd0a26d73b60f8
-ok 2 - lost and found something
-
-# passed all 2 test(s)
-1..2
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t1050-large.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1050-large/.git/
-expecting success: 
-	# clone does not allow us to pass core.bigfilethreshold to
-	# new repos, so set core.bigfilethreshold globally
-	git config --global core.bigfilethreshold 200k &&
-	printf "%2000000s" X >large1 &&
-	cp large1 large2 &&
-	cp large1 large3 &&
-	printf "%2500000s" Y >huge &&
-	GIT_ALLOC_LIMIT=1500k &&
-	export GIT_ALLOC_LIMIT
-
-ok 1 - setup
-
-expecting success: 
-		test_when_finished "rm -f .git/objects/pack/pack-*.* .git/index" &&
-		git $config add large1 &&
-		sz=$(file_size .git/objects/pack/pack-*.pack) &&
-		case "$expect" in
-		small) test "$sz" -le 100000 ;;
-		large) test "$sz" -ge 100000 ;;
-		esac
-	
-ok 2 - add with -c core.compression=0
-
-expecting success: 
-		test_when_finished "rm -f .git/objects/pack/pack-*.* .git/index" &&
-		git $config add large1 &&
-		sz=$(file_size .git/objects/pack/pack-*.pack) &&
-		case "$expect" in
-		small) test "$sz" -le 100000 ;;
-		large) test "$sz" -ge 100000 ;;
-		esac
-	
-ok 3 - add with -c core.compression=9
-
-expecting success: 
-		test_when_finished "rm -f .git/objects/pack/pack-*.* .git/index" &&
-		git $config add large1 &&
-		sz=$(file_size .git/objects/pack/pack-*.pack) &&
-		case "$expect" in
-		small) test "$sz" -le 100000 ;;
-		large) test "$sz" -ge 100000 ;;
-		esac
-	
-ok 4 - add with -c core.compression=0 -c pack.compression=0
-
-expecting success: 
-		test_when_finished "rm -f .git/objects/pack/pack-*.* .git/index" &&
-		git $config add large1 &&
-		sz=$(file_size .git/objects/pack/pack-*.pack) &&
-		case "$expect" in
-		small) test "$sz" -le 100000 ;;
-		large) test "$sz" -ge 100000 ;;
-		esac
-	
-ok 5 - add with -c core.compression=9 -c pack.compression=0
-
-expecting success: 
-		test_when_finished "rm -f .git/objects/pack/pack-*.* .git/index" &&
-		git $config add large1 &&
-		sz=$(file_size .git/objects/pack/pack-*.pack) &&
-		case "$expect" in
-		small) test "$sz" -le 100000 ;;
-		large) test "$sz" -ge 100000 ;;
-		esac
-	
-ok 6 - add with -c core.compression=0 -c pack.compression=9
-
-expecting success: 
-		test_when_finished "rm -f .git/objects/pack/pack-*.* .git/index" &&
-		git $config add large1 &&
-		sz=$(file_size .git/objects/pack/pack-*.pack) &&
-		case "$expect" in
-		small) test "$sz" -le 100000 ;;
-		large) test "$sz" -ge 100000 ;;
-		esac
-	
-ok 7 - add with -c core.compression=9 -c pack.compression=9
-
-expecting success: 
-		test_when_finished "rm -f .git/objects/pack/pack-*.* .git/index" &&
-		git $config add large1 &&
-		sz=$(file_size .git/objects/pack/pack-*.pack) &&
-		case "$expect" in
-		small) test "$sz" -le 100000 ;;
-		large) test "$sz" -ge 100000 ;;
-		esac
-	
-ok 8 - add with -c pack.compression=0
-
-expecting success: 
-		test_when_finished "rm -f .git/objects/pack/pack-*.* .git/index" &&
-		git $config add large1 &&
-		sz=$(file_size .git/objects/pack/pack-*.pack) &&
-		case "$expect" in
-		small) test "$sz" -le 100000 ;;
-		large) test "$sz" -ge 100000 ;;
-		esac
-	
-ok 9 - add with -c pack.compression=9
-
-expecting success: 
-	git add large1 huge large2 &&
-	# make sure we got a single packfile and no loose objects
-	bad= count=0 idx= &&
-	for p in .git/objects/pack/pack-*.pack
-	do
-		count=$(( $count + 1 ))
-		if test -f "$p" && idx=${p%.pack}.idx && test -f "$idx"
-		then
-			continue
-		fi
-		bad=t
-	done &&
-	test -z "$bad" &&
-	test $count = 1 &&
-	cnt=$(git show-index <"$idx" | wc -l) &&
-	test $cnt = 2 &&
-	for l in .git/objects/??/??????????????????????????????????????
-	do
-		test -f "$l" || continue
-		bad=t
-	done &&
-	test -z "$bad" &&
-
-	# attempt to add another copy of the same
-	git add large3 &&
-	bad= count=0 &&
-	for p in .git/objects/pack/pack-*.pack
-	do
-		count=$(( $count + 1 ))
-		if test -f "$p" && idx=${p%.pack}.idx && test -f "$idx"
-		then
-			continue
-		fi
-		bad=t
-	done &&
-	test -z "$bad" &&
-	test $count = 1
-
-ok 10 - add a large file or two
-
-expecting success: 
-	large1=$(git rev-parse :large1) &&
-	git update-index --add --cacheinfo 100644 $large1 another &&
-	git checkout another &&
-	test_cmp large1 another
-
-ok 11 - checkout a large file
-
-expecting success: 
-	test_create_repo mid &&
-	(
-		cd mid &&
-		git config core.bigfilethreshold 64k &&
-		git config pack.packsizelimit 256k &&
-
-		# mid1 and mid2 will fit within 256k limit but
-		# appending mid3 will bust the limit and will
-		# result in a separate packfile.
-		test-tool genrandom "a" $(( 66 * 1024 )) >mid1 &&
-		test-tool genrandom "b" $(( 80 * 1024 )) >mid2 &&
-		test-tool genrandom "c" $(( 128 * 1024 )) >mid3 &&
-		git add mid1 mid2 mid3 &&
-
-		count=0 &&
-		for pi in .git/objects/pack/pack-*.idx
-		do
-			test -f "$pi" && count=$(( $count + 1 ))
-		done &&
-		test $count = 2 &&
-
-		(
-			git hash-object --stdin <mid1 &&
-			git hash-object --stdin <mid2 &&
-			git hash-object --stdin <mid3
-		) |
-		sort >expect &&
-
-		for pi in .git/objects/pack/pack-*.idx
-		do
-			git show-index <"$pi"
-		done |
-		sed -e "s/^[0-9]* \([0-9a-f]*\) .*/\1/" |
-		sort >actual &&
-
-		test_cmp expect actual
-	)
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1050-large/mid/.git/
-ok 12 - packsize limit
-
-expecting success: 
-	git commit -q -m initial &&
-	echo modified >>large1 &&
-	git add large1 &&
-	git commit -q -m modified &&
-	git diff --raw HEAD^
-
-:100644 100644 6cef6d8 171a2cf M	large1
-ok 13 - diff --raw
-
-expecting success: 
-	git diff --stat HEAD^ HEAD
-
- large1 | Bin 2000000 -> 2000009 bytes
- 1 file changed, 0 insertions(+), 0 deletions(-)
-ok 14 - diff --stat
-
-expecting success: 
-	git diff HEAD^ HEAD >actual &&
-	grep "Binary files.*differ" actual
-
-Binary files a/large1 and b/large1 differ
-ok 15 - diff
-
-expecting success: 
-	git diff --cached HEAD^ >actual &&
-	grep "Binary files.*differ" actual
-
-Binary files a/large1 and b/large1 differ
-ok 16 - diff --cached
-
-expecting success: 
-	git hash-object large1
-
-171a2cf5cd75bd8d405266c986591716925e9712
-ok 17 - hash-object
-
-expecting success: 
-	git cat-file blob :large1 >/dev/null
-
-ok 18 - cat-file a large file
-
-expecting success: 
-	git tag -m largefile largefiletag :large1 &&
-	git cat-file blob largefiletag >/dev/null
-
-ok 19 - cat-file a large file from a tag
-
-expecting success: 
-	git show :large1 >/dev/null
-
-
-ok 20 - git-show a large file
-
-expecting success: 
-	git clone file://"$(pwd)"/.git foo &&
-	GIT_DIR=non-existent git index-pack --strict --verify foo/.git/objects/pack/*.pack
-
-Cloning into 'foo'...
-ok 21 - index-pack
-
-expecting success: 
-	git repack -ad
-
-ok 22 - repack
-
-expecting success: 
-	SHA1=$(git hash-object huge) &&
-	test_create_repo loose &&
-	echo $SHA1 | git pack-objects --stdout |
-		GIT_ALLOC_LIMIT=0 GIT_DIR=loose/.git git unpack-objects &&
-	echo $SHA1 | GIT_DIR=loose/.git git pack-objects pack &&
-	test_create_repo packed &&
-	mv pack-* packed/.git/objects/pack &&
-	GIT_DIR=packed/.git git cat-file blob $SHA1 >actual &&
-	test_cmp huge actual
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1050-large/loose/.git/
-dc5b4c5413c9a2a6ca4f121474e1c9c8ea086153
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1050-large/packed/.git/
-ok 23 - pack-objects with large loose object
-
-expecting success: 
-	git archive --format=tar HEAD >/dev/null
-
-ok 24 - tar achiving
-
-expecting success: 
-	git archive --format=zip -0 HEAD >/dev/null
-
-ok 25 - zip achiving, store only
-
-expecting success: 
-	git archive --format=zip HEAD >/dev/null
-
-ok 26 - zip achiving, deflate
-
-expecting success: 
-	git fsck 2>err &&
-	test_must_be_empty err
-
-ok 27 - fsck large blobs
-
-# passed all 27 test(s)
-1..27
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
 *** t1006-cat-file.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1006-cat-file/.git/
 expecting success: 
@@ -28921,7 +28568,7 @@
 	HEAD:foo-plus
 	EOF
 
-[master (root-commit) e3bc8ac] foo
+[master (root-commit) 18d1dee] foo
  Author: A U Thor <author@example.com>
  3 files changed, 1 insertion(+)
  create mode 100644 foo
@@ -29025,7 +28672,7 @@
 
 )
 prerequisite SYMLINKS ok
-[master 3fbf35c] test
+[master d6776fe] test
  Author: A U Thor <author@example.com>
  30 files changed, 30 insertions(+)
  create mode 120000 broken-same-dir-link
@@ -29281,125 +28928,506 @@
 1..111
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t1415-worktree-refs.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1415-worktree-refs/.git/
+*** t1405-main-ref-store.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1405-main-ref-store/.git/
 expecting success: 
-	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
+	test_commit one &&
+	N=`find .git/refs -type f | wc -l` &&
+	test "$N" != 0 &&
+	$RUN pack-refs 3 &&
+	N=`find .git/refs -type f | wc -l`
 
-[master (root-commit) 24b24cf] initial
+[master (root-commit) d79ce16] one
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-[master 42fba42] wt1
+ create mode 100644 one.t
+ok 1 - pack_refs(PACK_REFS_ALL | PACK_REFS_PRUNE)
+
+expecting success: 
+	git rev-parse HEAD >expected &&
+	git tag -a -m new-tag new-tag HEAD &&
+	$RUN peel-ref refs/tags/new-tag >actual &&
+	test_cmp expected actual
+
+ok 2 - peel_ref(new-tag)
+
+expecting success: 
+	$RUN create-symref FOO refs/heads/master nothing &&
+	echo refs/heads/master >expected &&
+	git symbolic-ref FOO >actual &&
+	test_cmp expected actual
+
+ok 3 - create_symref(FOO, refs/heads/master)
+
+expecting success: 
+	git rev-parse FOO -- &&
+	git rev-parse refs/tags/new-tag -- &&
+	$RUN delete-refs 0 nothing FOO refs/tags/new-tag &&
+	test_must_fail git rev-parse FOO -- &&
+	test_must_fail git rev-parse refs/tags/new-tag --
+
+d79ce1670bdcb76e6d1da2ae095e890ccb326ae9
+--
+407ffbd56c168afa4e9302a7cdfe469155f84482
+--
+fatal: bad revision 'FOO'
+fatal: bad revision 'refs/tags/new-tag'
+ok 4 - delete_refs(FOO, refs/tags/new-tag)
+
+expecting success: 
+	git rev-parse master >expected &&
+	$RUN rename-ref refs/heads/master refs/heads/new-master &&
+	git rev-parse new-master >actual &&
+	test_cmp expected actual &&
+	test_commit recreate-master
+
+[master (root-commit) c90e4dc] recreate-master
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 wt1.t
-[master 83df652] wt2
+ 2 files changed, 2 insertions(+)
+ create mode 100644 one.t
+ create mode 100644 recreate-master.t
+ok 5 - rename_refs(master, new-master)
+
+expecting success: 
+	$RUN for-each-ref refs/heads/ | cut -d" " -f 2- >actual &&
+	cat >expected <<-\EOF &&
+	master 0x0
+	new-master 0x0
+	EOF
+	test_cmp expected actual
+
+ok 6 - for_each_ref(refs/heads/)
+
+expecting success: 
+	$RUN for-each-ref refs/heads/ | cut -d" " -f 2- >actual &&
+	sort actual > expected &&
+	test_cmp expected actual
+
+ok 7 - for_each_ref() is sorted
+
+expecting success: 
+	SHA1=`git rev-parse new-master` &&
+	echo "$SHA1 refs/heads/new-master 0x0" >expected &&
+	$RUN resolve-ref refs/heads/new-master 0 >actual &&
+	test_cmp expected actual
+
+ok 8 - resolve_ref(new-master)
+
+expecting success: 
+	$RUN verify-ref refs/heads/new-master
+
+ok 9 - verify_ref(new-master)
+
+expecting success: 
+	$RUN for-each-reflog | sort -k2 | cut -d" " -f 2- >actual &&
+	cat >expected <<-\EOF &&
+	HEAD 0x1
+	refs/heads/master 0x0
+	refs/heads/new-master 0x0
+	EOF
+	test_cmp expected actual
+
+ok 10 - for_each_reflog()
+
+expecting success: 
+	$RUN for-each-reflog-ent HEAD >actual &&
+	head -n1 actual | grep one &&
+	tail -n2 actual | head -n1 | grep recreate-master
+
+0000000000000000000000000000000000000000 d79ce1670bdcb76e6d1da2ae095e890ccb326ae9 C O Mitter <committer@example.com> 1112911993 -700 commit (initial): one
+0000000000000000000000000000000000000000 c90e4dc5e12224a428dedfbd45ba11e5531706a2 C O Mitter <committer@example.com> 1112912053 -700 commit (initial): recreate-master
+ok 11 - for_each_reflog_ent()
+
+expecting success: 
+	$RUN for-each-reflog-ent-reverse HEAD >actual &&
+	head -n1 actual | grep recreate-master &&
+	tail -n2 actual | head -n1 | grep one
+
+0000000000000000000000000000000000000000 c90e4dc5e12224a428dedfbd45ba11e5531706a2 C O Mitter <committer@example.com> 1112912053 -700 commit (initial): recreate-master
+0000000000000000000000000000000000000000 d79ce1670bdcb76e6d1da2ae095e890ccb326ae9 C O Mitter <committer@example.com> 1112911993 -700 commit (initial): one
+ok 12 - for_each_reflog_ent_reverse()
+
+expecting success: 
+	$RUN reflog-exists HEAD
+
+ok 13 - reflog_exists(HEAD)
+
+expecting success: 
+	$RUN delete-reflog HEAD &&
+	! test -f .git/logs/HEAD
+
+ok 14 - delete_reflog(HEAD)
+
+expecting success: 
+	$RUN create-reflog HEAD 1 &&
+	test -f .git/logs/HEAD
+
+ok 15 - create-reflog(HEAD)
+
+expecting success: 
+	git checkout -b foo &&
+	FOO_SHA1=`git rev-parse foo` &&
+	git checkout --detach &&
+	test_commit bar-commit &&
+	git checkout -b bar &&
+	BAR_SHA1=`git rev-parse bar` &&
+	$RUN update-ref updating refs/heads/foo $BAR_SHA1 $FOO_SHA1 0 &&
+	echo $BAR_SHA1 >expected &&
+	git rev-parse refs/heads/foo >actual &&
+	test_cmp expected actual
+
+Switched to a new branch 'foo'
+HEAD is now at c90e4dc recreate-master
+[detached HEAD 1e995a9] bar-commit
  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: checking out 'initial'.
+ create mode 100644 bar-commit.t
+Switched to a new branch 'bar'
+ok 16 - delete_ref(refs/heads/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 performing another checkout.
+expecting success: 
+	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 --
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
+HEAD is now at 1e995a9 bar-commit
+fatal: bad revision 'refs/heads/foo'
+ok 17 - delete_ref(refs/heads/foo)
 
-  git checkout -b <new-branch-name>
+# passed all 17 test(s)
+1..17
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t1403-show-ref.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1403-show-ref/.git/
+expecting success: 
+	test_commit A &&
+	git tag -f -a -m "annotated A" A &&
+	git checkout -b side &&
+	test_commit B &&
+	git tag -f -a -m "annotated B" B &&
+	git checkout master &&
+	test_commit C &&
+	git branch B A^0
 
-HEAD is now at 24b24cf initial
+[master (root-commit) 0ddfaf1] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A.t
+Updated tag 'A' (was 0ddfaf1)
+Switched to a new branch 'side'
+[side d9df450] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 B.t
+Updated tag 'B' (was d9df450)
+Switched to branch 'master'
+[master 5dee784] C
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 C.t
 ok 1 - setup
 
 expecting success: 
-	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
+	echo $(git rev-parse refs/tags/A) refs/tags/A >expect &&
 
-ok 2 - refs/worktree must not be packed
+	git show-ref A >actual &&
+	test_cmp expect actual &&
+
+	git show-ref tags/A >actual &&
+	test_cmp expect actual &&
+
+	git show-ref refs/tags/A >actual &&
+	test_cmp expect actual &&
+
+	test_must_fail git show-ref D >actual &&
+	test_must_be_empty actual
+
+ok 2 - show-ref
 
 expecting success: 
-	test_cmp_rev worktree/foo initial &&
-	( cd wt1 && test_cmp_rev worktree/foo wt1 ) &&
-	( cd wt2 && test_cmp_rev worktree/foo wt2 )
+	git show-ref -q A >actual &&
+	test_must_be_empty actual &&
 
-ok 3 - refs/worktree are per-worktree
+	git show-ref -q tags/A >actual &&
+	test_must_be_empty actual &&
+
+	git show-ref -q refs/tags/A >actual &&
+	test_must_be_empty actual &&
+
+	test_must_fail git show-ref -q D >actual &&
+	test_must_be_empty actual
+
+ok 3 - show-ref -q
 
 expecting success: 
-	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 )
+	echo $(git rev-parse refs/tags/A) refs/tags/A >expect &&
 
-ok 4 - resolve main-worktree/HEAD
+	git show-ref --verify refs/tags/A >actual &&
+	test_cmp expect actual &&
+
+	test_must_fail git show-ref --verify A >actual &&
+	test_must_be_empty actual &&
+
+	test_must_fail git show-ref --verify tags/A >actual &&
+	test_must_be_empty actual &&
+
+	test_must_fail git show-ref --verify D >actual &&
+	test_must_be_empty actual
+
+fatal: 'A' - not a valid ref
+fatal: 'tags/A' - not a valid ref
+fatal: 'D' - not a valid ref
+ok 4 - show-ref --verify
 
 expecting success: 
-	mkdir -p .git/refs/heads/main-worktree &&
-	test_when_finished rm -f .git/refs/heads/main-worktree/HEAD &&
-	cp .git/HEAD .git/refs/heads/main-worktree/HEAD &&
-	git rev-parse main-worktree/HEAD 2>warn &&
-	grep "main-worktree/HEAD.*ambiguous" warn
+	git show-ref --verify -q refs/tags/A >actual &&
+	test_must_be_empty actual &&
 
-24b24cf8a829f5b8c30dfc018b0a459a2ccaf380
-warning: refname 'main-worktree/HEAD' is ambiguous.
-ok 5 - ambiguous main-worktree/HEAD
+	test_must_fail git show-ref --verify -q A >actual &&
+	test_must_be_empty actual &&
+
+	test_must_fail git show-ref --verify -q tags/A >actual &&
+	test_must_be_empty actual &&
+
+	test_must_fail git show-ref --verify -q D >actual &&
+	test_must_be_empty actual
+
+ok 5 - show-ref --verify -q
 
 expecting success: 
-	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 )
+	{
+		echo $(git rev-parse refs/tags/A) refs/tags/A &&
+		echo $(git rev-parse refs/tags/A^0) "refs/tags/A^{}"
+		echo $(git rev-parse refs/tags/C) refs/tags/C
+	} >expect &&
+	git show-ref -d A C >actual &&
+	test_cmp expect actual &&
 
-ok 6 - resolve worktrees/xx/HEAD
+	git show-ref -d tags/A tags/C >actual &&
+	test_cmp expect actual &&
+
+	git show-ref -d refs/tags/A refs/tags/C >actual &&
+	test_cmp expect actual &&
+
+	git show-ref --verify -d refs/tags/A refs/tags/C >actual &&
+	test_cmp expect actual &&
+
+	echo $(git rev-parse refs/heads/master) refs/heads/master >expect &&
+	git show-ref -d master >actual &&
+	test_cmp expect actual &&
+
+	git show-ref -d heads/master >actual &&
+	test_cmp expect actual &&
+
+	git show-ref -d refs/heads/master >actual &&
+	test_cmp expect actual &&
+
+	git show-ref -d --verify refs/heads/master >actual &&
+	test_cmp expect actual &&
+
+	test_must_fail git show-ref -d --verify master >actual &&
+	test_must_be_empty actual &&
+
+	test_must_fail git show-ref -d --verify heads/master >actual &&
+	test_must_be_empty actual &&
+
+	test_must_fail git show-ref --verify -d A C >actual &&
+	test_must_be_empty actual &&
+
+	test_must_fail git show-ref --verify -d tags/A tags/C >actual &&
+	test_must_be_empty actual
+
+
+fatal: 'master' - not a valid ref
+fatal: 'heads/master' - not a valid ref
+fatal: 'A' - not a valid ref
+fatal: 'tags/A' - not a valid ref
+ok 6 - show-ref -d
 
 expecting success: 
-	mkdir -p .git/refs/heads/worktrees/wt1 &&
-	test_when_finished rm -f .git/refs/heads/worktrees/wt1/HEAD &&
-	cp .git/HEAD .git/refs/heads/worktrees/wt1/HEAD &&
-	git rev-parse worktrees/wt1/HEAD 2>warn &&
-	grep "worktrees/wt1/HEAD.*ambiguous" warn
+	for branch in B master side
+	do
+		echo $(git rev-parse refs/heads/$branch) refs/heads/$branch
+	done >expect.heads &&
+	git show-ref --heads >actual &&
+	test_cmp expect.heads actual &&
 
-42fba42569eaa325aaade18832dfa5432d54ffd1
-warning: refname 'worktrees/wt1/HEAD' is ambiguous.
-ok 7 - ambiguous worktrees/xx/HEAD
+	for tag in A B C
+	do
+		echo $(git rev-parse refs/tags/$tag) refs/tags/$tag
+	done >expect.tags &&
+	git show-ref --tags >actual &&
+	test_cmp expect.tags actual &&
+
+	cat expect.heads expect.tags >expect &&
+	git show-ref --heads --tags >actual &&
+	test_cmp expect actual &&
+
+	{
+		echo $(git rev-parse HEAD) HEAD &&
+		cat expect.heads expect.tags
+	} >expect &&
+	git show-ref --heads --tags --head >actual &&
+	test_cmp expect actual &&
+
+	{
+		echo $(git rev-parse HEAD) HEAD &&
+		echo $(git rev-parse refs/heads/B) refs/heads/B
+		echo $(git rev-parse refs/tags/B) refs/tags/B
+	} >expect &&
+	git show-ref --head B >actual &&
+	test_cmp expect actual &&
+
+	{
+		echo $(git rev-parse HEAD) HEAD &&
+		echo $(git rev-parse refs/heads/B) refs/heads/B
+		echo $(git rev-parse refs/tags/B) refs/tags/B
+		echo $(git rev-parse refs/tags/B^0) "refs/tags/B^{}"
+	} >expect &&
+	git show-ref --head -d B >actual &&
+	test_cmp expect actual
+
+ok 7 - show-ref --heads, --tags, --head, pattern
 
 expecting success: 
-	git reflog HEAD | sed "s/HEAD/main-worktree\/HEAD/" >expected &&
-	git reflog main-worktree/HEAD >actual &&
-	test_cmp expected actual &&
-	git -C wt1 reflog main-worktree/HEAD >actual.wt1 &&
-	test_cmp expected actual.wt1
+	echo $(git rev-parse HEAD) HEAD >expect &&
+	git show-ref --verify HEAD >actual &&
+	test_cmp expect actual &&
 
-ok 8 - reflog of main-worktree/HEAD
+	git show-ref --verify -q HEAD >actual &&
+	test_must_be_empty actual
+
+ok 8 - show-ref --verify HEAD
 
 expecting success: 
-	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
+	sha1_file() {
+		echo "$*" | sed "s#..#.git/objects/&/#"
+	} &&
 
-ok 9 - reflog of worktrees/xx/HEAD
+	remove_object() {
+		file=$(sha1_file "$*") &&
+		test -e "$file" &&
+		rm -f "$file"
+	} &&
+
+	test_when_finished "rm -rf dangling" &&
+	(
+		git init dangling &&
+		cd dangling &&
+		test_commit dangling &&
+		sha=$(git rev-parse refs/tags/dangling) &&
+		remove_object $sha &&
+		test_must_fail git show-ref --verify refs/tags/dangling
+	)
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1403-show-ref/dangling/.git/
+[master (root-commit) ceb9007] dangling
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 dangling.t
+fatal: git show-ref: bad ref refs/tags/dangling (ceb9007ddae8b252f505d0ef9dcf579bfda7e91c)
+ok 9 - show-ref --verify with dangling ref
 
 # passed all 9 test(s)
 1..9
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
+*** t1412-reflog-loop.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1412-reflog-loop/.git/
+expecting success: 
+	test_tick &&
+	echo content >file && git add file && git commit -m one &&
+	git tag one &&
+	echo content >>file && git add file && git commit -m two &&
+	git tag two
+
+[master (root-commit) e46513e] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+[master 441e5e0] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 1 - setup commits
+
+expecting success: 
+	git checkout -b topic &&
+	git reset one &&
+	git reset two &&
+	git reset one &&
+	git reset two
+
+Switched to a new branch 'topic'
+Unstaged changes after reset:
+M	file
+Unstaged changes after reset:
+M	file
+ok 2 - setup reflog with alternating commits
+
+expecting success: 
+	cat >expect <<-\EOF &&
+		topic@{0} reset: moving to two
+		topic@{1} reset: moving to one
+		topic@{2} reset: moving to two
+		topic@{3} reset: moving to one
+		topic@{4} branch: Created from HEAD
+	EOF
+	git log -g --format="%gd %gs" topic >actual &&
+	test_cmp expect actual
+
+ok 3 - reflog shows all entries
+
+# passed all 3 test(s)
+1..3
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t1420-lost-found.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1420-lost-found/.git/
+expecting success: 
+	git config core.logAllRefUpdates 0 &&
+	: > file1 &&
+	git add file1 &&
+	test_tick &&
+	git commit -m initial &&
+	echo 1 > file1 &&
+	echo 2 > file2 &&
+	git add file1 file2 &&
+	test_tick &&
+	git commit -m second &&
+	echo 3 > file3 &&
+	git add file3
+
+[master (root-commit) 9bb1ae9] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 file1
+[master 8ad33be] second
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 file2
+ok 1 - setup
+
+expecting success: 
+	git rev-parse HEAD > lost-commit &&
+	git rev-parse :file3 > lost-other &&
+	test_tick &&
+	git reset --hard HEAD^ &&
+	git fsck --lost-found &&
+	test 2 = $(ls .git/lost-found/*/* | wc -l) &&
+	test -f .git/lost-found/commit/$(cat lost-commit) &&
+	test -f .git/lost-found/other/$(cat lost-other)
+
+HEAD is now at 9bb1ae9 initial
+dangling blob 00750edc07d6415dcc07ae0351e9397b0222b7ba
+dangling commit 8ad33beea8de8e15812274614acd0a26d73b60f8
+ok 2 - lost and found something
+
+# passed all 2 test(s)
+1..2
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
 *** t1413-reflog-detach.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1413-reflog-detach/.git/
 expecting success: 
@@ -29535,6 +29563,127 @@
 1..7
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
+*** t1409-avoid-packing-refs.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1409-avoid-packing-refs/.git/
+expecting success: 
+	git commit --allow-empty -m "Commit A" &&
+	A=$(git rev-parse HEAD) &&
+	git commit --allow-empty -m "Commit B" &&
+	B=$(git rev-parse HEAD) &&
+	git commit --allow-empty -m "Commit C" &&
+	C=$(git rev-parse HEAD)
+
+[master (root-commit) c32a60b] Commit A
+ Author: A U Thor <author@example.com>
+[master f2b77bc] Commit B
+ Author: A U Thor <author@example.com>
+[master c75e5eb] Commit C
+ Author: A U Thor <author@example.com>
+ok 1 - setup
+
+expecting success: 
+	test_must_fail test -f .git/packed-refs &&
+	git update-ref refs/heads/foo $A &&
+	test_must_fail test -f .git/packed-refs &&
+	git update-ref refs/heads/foo $B &&
+	test_must_fail test -f .git/packed-refs &&
+	git update-ref refs/heads/foo $C $B &&
+	test_must_fail test -f .git/packed-refs &&
+	git update-ref -d refs/heads/foo &&
+	test_must_fail test -f .git/packed-refs
+
+ok 2 - do not create packed-refs file gratuitously
+
+expecting success: 
+	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 &&
+	test_must_fail check_packed_refs_marked &&
+	git for-each-ref >actual2 &&
+	test_cmp expected actual2
+
+ok 3 - check that marking the packed-refs file works
+
+expecting success: 
+	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
+
+ok 4 - leave packed-refs untouched on update of packed
+
+expecting success: 
+	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
+
+ok 5 - leave packed-refs untouched on checked update of packed
+
+expecting success: 
+	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
+
+ok 6 - leave packed-refs untouched on verify of packed
+
+expecting success: 
+	git update-ref refs/heads/packed-delete $A &&
+	git pack-refs --all &&
+	mark_packed_refs &&
+	git update-ref -d refs/heads/packed-delete &&
+	test_must_fail check_packed_refs_marked
+
+ok 7 - touch packed-refs on delete of packed
+
+expecting success: 
+	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
+
+ok 8 - leave packed-refs untouched on update of loose
+
+expecting success: 
+	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
+
+ok 9 - leave packed-refs untouched on checked update of loose
+
+expecting success: 
+	git pack-refs --all &&
+	git update-ref refs/heads/loose-verify $A &&
+	mark_packed_refs &&
+	echo "verify refs/heads/loose-verify $A" | git update-ref --stdin &&
+	check_packed_refs_marked
+
+ok 10 - leave packed-refs untouched on verify of loose
+
+expecting success: 
+	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
+
+ok 11 - leave packed-refs untouched on delete of loose
+
+# passed all 11 test(s)
+1..11
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
 *** t1414-reflog-walk.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1414-reflog-walk/.git/
 expecting success: 
@@ -29735,6 +29884,125 @@
 1..12
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
+*** t1415-worktree-refs.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1415-worktree-refs/.git/
+expecting success: 
+	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
+
+[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: checking out '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 performing another checkout.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -b with the checkout command again. Example:
+
+  git checkout -b <new-branch-name>
+
+HEAD is now at 24b24cf initial
+ok 1 - setup
+
+expecting success: 
+	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
+
+ok 2 - refs/worktree must not be packed
+
+expecting success: 
+	test_cmp_rev worktree/foo initial &&
+	( cd wt1 && test_cmp_rev worktree/foo wt1 ) &&
+	( cd wt2 && test_cmp_rev worktree/foo wt2 )
+
+ok 3 - refs/worktree are per-worktree
+
+expecting success: 
+	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 )
+
+ok 4 - resolve main-worktree/HEAD
+
+expecting success: 
+	mkdir -p .git/refs/heads/main-worktree &&
+	test_when_finished rm -f .git/refs/heads/main-worktree/HEAD &&
+	cp .git/HEAD .git/refs/heads/main-worktree/HEAD &&
+	git rev-parse main-worktree/HEAD 2>warn &&
+	grep "main-worktree/HEAD.*ambiguous" warn
+
+24b24cf8a829f5b8c30dfc018b0a459a2ccaf380
+warning: refname 'main-worktree/HEAD' is ambiguous.
+ok 5 - ambiguous main-worktree/HEAD
+
+expecting success: 
+	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 )
+
+ok 6 - resolve worktrees/xx/HEAD
+
+expecting success: 
+	mkdir -p .git/refs/heads/worktrees/wt1 &&
+	test_when_finished rm -f .git/refs/heads/worktrees/wt1/HEAD &&
+	cp .git/HEAD .git/refs/heads/worktrees/wt1/HEAD &&
+	git rev-parse worktrees/wt1/HEAD 2>warn &&
+	grep "worktrees/wt1/HEAD.*ambiguous" warn
+
+42fba42569eaa325aaade18832dfa5432d54ffd1
+warning: refname 'worktrees/wt1/HEAD' is ambiguous.
+ok 7 - ambiguous worktrees/xx/HEAD
+
+expecting success: 
+	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
+
+ok 8 - reflog of main-worktree/HEAD
+
+expecting success: 
+	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
+
+ok 9 - reflog of worktrees/xx/HEAD
+
+# passed all 9 test(s)
+1..9
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
 *** t1411-reflog-show.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1411-reflog-show/.git/
 expecting success: 
@@ -29883,574 +30151,87 @@
 1..18
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t1402-check-ref-format.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1402-check-ref-format/.git/
-expecting success: 
-		test_must_fail git check-ref-format  ''
-	
-ok 1 - ref name '' is invalid
-
-expecting success: 
-		test_must_fail git check-ref-format  '/'
-	
-ok 2 - ref name '/' is invalid
-
-expecting success: 
-		test_must_fail git check-ref-format --allow-onelevel '/'
-	
-ok 3 - ref name '/' is invalid with options --allow-onelevel
-
-expecting success: 
-		test_must_fail git check-ref-format --normalize '/'
-	
-ok 4 - ref name '/' is invalid with options --normalize
-
-expecting success: 
-		test_must_fail git check-ref-format --allow-onelevel --normalize '/'
-	
-ok 5 - ref name '/' is invalid with options --allow-onelevel --normalize
-
-expecting success: 
-		git check-ref-format  'foo/bar/baz'
-	
-ok 6 - ref name 'foo/bar/baz' is valid
-
-expecting success: 
-		git check-ref-format --normalize 'foo/bar/baz'
-	
-foo/bar/baz
-ok 7 - ref name 'foo/bar/baz' is valid with options --normalize
-
-expecting success: 
-		test_must_fail git check-ref-format  'refs///heads/foo'
-	
-ok 8 - ref name 'refs///heads/foo' is invalid
-
-expecting success: 
-		git check-ref-format --normalize 'refs///heads/foo'
-	
-refs/heads/foo
-ok 9 - ref name 'refs///heads/foo' is valid with options --normalize
-
-expecting success: 
-		test_must_fail git check-ref-format  'heads/foo/'
-	
-ok 10 - ref name 'heads/foo/' is invalid
-
-expecting success: 
-		test_must_fail git check-ref-format  '/heads/foo'
-	
-ok 11 - ref name '/heads/foo' is invalid
-
-expecting success: 
-		git check-ref-format --normalize '/heads/foo'
-	
-heads/foo
-ok 12 - ref name '/heads/foo' is valid with options --normalize
-
-expecting success: 
-		test_must_fail git check-ref-format  '///heads/foo'
-	
-ok 13 - ref name '///heads/foo' is invalid
-
-expecting success: 
-		git check-ref-format --normalize '///heads/foo'
-	
-heads/foo
-ok 14 - ref name '///heads/foo' is valid with options --normalize
-
-expecting success: 
-		test_must_fail git check-ref-format  './foo'
-	
-ok 15 - ref name './foo' is invalid
-
-expecting success: 
-		test_must_fail git check-ref-format  './foo/bar'
-	
-ok 16 - ref name './foo/bar' is invalid
-
-expecting success: 
-		test_must_fail git check-ref-format  'foo/./bar'
-	
-ok 17 - ref name 'foo/./bar' is invalid
-
-expecting success: 
-		test_must_fail git check-ref-format  'foo/bar/.'
-	
-ok 18 - ref name 'foo/bar/.' is invalid
-
-expecting success: 
-		test_must_fail git check-ref-format  '.refs/foo'
-	
-ok 19 - ref name '.refs/foo' is invalid
-
-expecting success: 
-		test_must_fail git check-ref-format  'refs/heads/foo.'
-	
-ok 20 - ref name 'refs/heads/foo.' is invalid
-
-expecting success: 
-		test_must_fail git check-ref-format  'heads/foo..bar'
-	
-ok 21 - ref name 'heads/foo..bar' is invalid
-
-expecting success: 
-		test_must_fail git check-ref-format  'heads/foo?bar'
-	
-ok 22 - ref name 'heads/foo?bar' is invalid
-
-expecting success: 
-		git check-ref-format  'foo./bar'
-	
-ok 23 - ref name 'foo./bar' is valid
-
-expecting success: 
-		test_must_fail git check-ref-format  'heads/foo.lock'
-	
-ok 24 - ref name 'heads/foo.lock' is invalid
-
-expecting success: 
-		test_must_fail git check-ref-format  'heads///foo.lock'
-	
-ok 25 - ref name 'heads///foo.lock' is invalid
-
-expecting success: 
-		test_must_fail git check-ref-format  'foo.lock/bar'
-	
-ok 26 - ref name 'foo.lock/bar' is invalid
-
-expecting success: 
-		test_must_fail git check-ref-format  'foo.lock///bar'
-	
-ok 27 - ref name 'foo.lock///bar' is invalid
-
-expecting success: 
-		git check-ref-format  'heads/foo@bar'
-	
-ok 28 - ref name 'heads/foo@bar' is valid
-
-expecting success: 
-		test_must_fail git check-ref-format  'heads/v@{ation'
-	
-ok 29 - ref name 'heads/v@{ation' is invalid
-
-expecting success: 
-		test_must_fail git check-ref-format  'heads/foo\bar'
-	
-ok 30 - ref name 'heads/foo\bar' is invalid
-
-expecting success: 
-		test_must_fail git check-ref-format  'heads/foo	'
-	
-ok 31 - ref name 'heads/foo	' is invalid
-
-expecting success: 
-		test_must_fail git check-ref-format  'heads/foo'
-	
-ok 32 - ref name 'heads/foo' is invalid
-
-expecting success: 
-		git check-ref-format  'heads/fuß'
-	
-ok 33 - ref name 'heads/fuß' is valid
-
-expecting success: 
-		git check-ref-format --refspec-pattern 'heads/*foo/bar'
-	
-ok 34 - ref name 'heads/*foo/bar' is valid with options --refspec-pattern
-
-expecting success: 
-		git check-ref-format --refspec-pattern 'heads/foo*/bar'
-	
-ok 35 - ref name 'heads/foo*/bar' is valid with options --refspec-pattern
-
-expecting success: 
-		git check-ref-format --refspec-pattern 'heads/f*o/bar'
-	
-ok 36 - ref name 'heads/f*o/bar' is valid with options --refspec-pattern
-
-expecting success: 
-		test_must_fail git check-ref-format --refspec-pattern 'heads/f*o*/bar'
-	
-ok 37 - ref name 'heads/f*o*/bar' is invalid with options --refspec-pattern
-
-expecting success: 
-		test_must_fail git check-ref-format --refspec-pattern 'heads/foo*/bar*'
-	
-ok 38 - ref name 'heads/foo*/bar*' is invalid with options --refspec-pattern
-
-expecting success: 
-		test_must_fail git check-ref-format  'foo'
-	
-ok 39 - ref name 'foo' is invalid
-
-expecting success: 
-		git check-ref-format --allow-onelevel 'foo'
-	
-ok 40 - ref name 'foo' is valid with options --allow-onelevel
-
-expecting success: 
-		test_must_fail git check-ref-format --refspec-pattern 'foo'
-	
-ok 41 - ref name 'foo' is invalid with options --refspec-pattern
-
-expecting success: 
-		git check-ref-format --refspec-pattern --allow-onelevel 'foo'
-	
-ok 42 - ref name 'foo' is valid with options --refspec-pattern --allow-onelevel
-
-expecting success: 
-		test_must_fail git check-ref-format --normalize 'foo'
-	
-ok 43 - ref name 'foo' is invalid with options --normalize
-
-expecting success: 
-		git check-ref-format --allow-onelevel --normalize 'foo'
-	
-foo
-ok 44 - ref name 'foo' is valid with options --allow-onelevel --normalize
-
-expecting success: 
-		git check-ref-format  'foo/bar'
-	
-ok 45 - ref name 'foo/bar' is valid
-
-expecting success: 
-		git check-ref-format --allow-onelevel 'foo/bar'
-	
-ok 46 - ref name 'foo/bar' is valid with options --allow-onelevel
-
-expecting success: 
-		git check-ref-format --refspec-pattern 'foo/bar'
-	
-ok 47 - ref name 'foo/bar' is valid with options --refspec-pattern
-
-expecting success: 
-		git check-ref-format --refspec-pattern --allow-onelevel 'foo/bar'
-	
-ok 48 - ref name 'foo/bar' is valid with options --refspec-pattern --allow-onelevel
-
-expecting success: 
-		git check-ref-format --normalize 'foo/bar'
-	
-foo/bar
-ok 49 - ref name 'foo/bar' is valid with options --normalize
-
-expecting success: 
-		test_must_fail git check-ref-format  'foo/*'
-	
-ok 50 - ref name 'foo/*' is invalid
-
-expecting success: 
-		test_must_fail git check-ref-format --allow-onelevel 'foo/*'
-	
-ok 51 - ref name 'foo/*' is invalid with options --allow-onelevel
-
-expecting success: 
-		git check-ref-format --refspec-pattern 'foo/*'
-	
-ok 52 - ref name 'foo/*' is valid with options --refspec-pattern
-
-expecting success: 
-		git check-ref-format --refspec-pattern --allow-onelevel 'foo/*'
-	
-ok 53 - ref name 'foo/*' is valid with options --refspec-pattern --allow-onelevel
-
-expecting success: 
-		test_must_fail git check-ref-format  '*/foo'
-	
-ok 54 - ref name '*/foo' is invalid
-
-expecting success: 
-		test_must_fail git check-ref-format --allow-onelevel '*/foo'
-	
-ok 55 - ref name '*/foo' is invalid with options --allow-onelevel
-
-expecting success: 
-		git check-ref-format --refspec-pattern '*/foo'
-	
-ok 56 - ref name '*/foo' is valid with options --refspec-pattern
-
-expecting success: 
-		git check-ref-format --refspec-pattern --allow-onelevel '*/foo'
-	
-ok 57 - ref name '*/foo' is valid with options --refspec-pattern --allow-onelevel
-
-expecting success: 
-		test_must_fail git check-ref-format --normalize '*/foo'
-	
-ok 58 - ref name '*/foo' is invalid with options --normalize
-
-expecting success: 
-		git check-ref-format --refspec-pattern --normalize '*/foo'
-	
-*/foo
-ok 59 - ref name '*/foo' is valid with options --refspec-pattern --normalize
-
-expecting success: 
-		test_must_fail git check-ref-format  'foo/*/bar'
-	
-ok 60 - ref name 'foo/*/bar' is invalid
-
-expecting success: 
-		test_must_fail git check-ref-format --allow-onelevel 'foo/*/bar'
-	
-ok 61 - ref name 'foo/*/bar' is invalid with options --allow-onelevel
-
-expecting success: 
-		git check-ref-format --refspec-pattern 'foo/*/bar'
-	
-ok 62 - ref name 'foo/*/bar' is valid with options --refspec-pattern
-
-expecting success: 
-		git check-ref-format --refspec-pattern --allow-onelevel 'foo/*/bar'
-	
-ok 63 - ref name 'foo/*/bar' is valid with options --refspec-pattern --allow-onelevel
-
-expecting success: 
-		test_must_fail git check-ref-format  '*'
-	
-ok 64 - ref name '*' is invalid
-
-expecting success: 
-		test_must_fail git check-ref-format --allow-onelevel '*'
-	
-ok 65 - ref name '*' is invalid with options --allow-onelevel
-
-expecting success: 
-		test_must_fail git check-ref-format --refspec-pattern '*'
-	
-ok 66 - ref name '*' is invalid with options --refspec-pattern
-
-expecting success: 
-		git check-ref-format --refspec-pattern --allow-onelevel '*'
-	
-ok 67 - ref name '*' is valid with options --refspec-pattern --allow-onelevel
-
-expecting success: 
-		test_must_fail git check-ref-format --refspec-pattern 'foo/*/*'
-	
-ok 68 - ref name 'foo/*/*' is invalid with options --refspec-pattern
-
-expecting success: 
-		test_must_fail git check-ref-format --refspec-pattern --allow-onelevel 'foo/*/*'
-	
-ok 69 - ref name 'foo/*/*' is invalid with options --refspec-pattern --allow-onelevel
-
-expecting success: 
-		test_must_fail git check-ref-format --refspec-pattern '*/foo/*'
-	
-ok 70 - ref name '*/foo/*' is invalid with options --refspec-pattern
-
-expecting success: 
-		test_must_fail git check-ref-format --refspec-pattern --allow-onelevel '*/foo/*'
-	
-ok 71 - ref name '*/foo/*' is invalid with options --refspec-pattern --allow-onelevel
-
-expecting success: 
-		test_must_fail git check-ref-format --refspec-pattern '*/*/foo'
-	
-ok 72 - ref name '*/*/foo' is invalid with options --refspec-pattern
-
-expecting success: 
-		test_must_fail git check-ref-format --refspec-pattern --allow-onelevel '*/*/foo'
-	
-ok 73 - ref name '*/*/foo' is invalid with options --refspec-pattern --allow-onelevel
-
-expecting success: 
-		test_must_fail git check-ref-format  '/foo'
-	
-ok 74 - ref name '/foo' is invalid
-
-expecting success: 
-		test_must_fail git check-ref-format --allow-onelevel '/foo'
-	
-ok 75 - ref name '/foo' is invalid with options --allow-onelevel
-
-expecting success: 
-		test_must_fail git check-ref-format --refspec-pattern '/foo'
-	
-ok 76 - ref name '/foo' is invalid with options --refspec-pattern
-
-expecting success: 
-		test_must_fail git check-ref-format --refspec-pattern --allow-onelevel '/foo'
-	
-ok 77 - ref name '/foo' is invalid with options --refspec-pattern --allow-onelevel
-
-expecting success: 
-		test_must_fail git check-ref-format --normalize '/foo'
-	
-ok 78 - ref name '/foo' is invalid with options --normalize
-
-expecting success: 
-		git check-ref-format --allow-onelevel --normalize '/foo'
-	
-foo
-ok 79 - ref name '/foo' is valid with options --allow-onelevel --normalize
-
-expecting success: 
-		test_must_fail git check-ref-format --refspec-pattern --normalize '/foo'
-	
-ok 80 - ref name '/foo' is invalid with options --refspec-pattern --normalize
-
-expecting success: 
-		git check-ref-format --refspec-pattern --allow-onelevel --normalize '/foo'
-	
-foo
-ok 81 - ref name '/foo' is valid with options --refspec-pattern --allow-onelevel --normalize
-
-expecting success: 
-	T=$(git write-tree) &&
-	sha1=$(echo A | git commit-tree $T) &&
-	git update-ref refs/heads/master $sha1 &&
-	git update-ref refs/remotes/origin/master $sha1 &&
-	git checkout master &&
-	git checkout origin/master &&
-	git checkout master &&
-	refname=$(git check-ref-format --branch @{-1}) &&
-	test "$refname" = "$sha1" &&
-	refname2=$(git check-ref-format --branch @{-2}) &&
-	test "$refname2" = master
-Already on 'master'
-Note: checking out 'origin/master'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by performing another checkout.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
-
-  git checkout -b <new-branch-name>
-
-HEAD is now at 69aaa35 A
-Switched to branch 'master'
-ok 82 - check-ref-format --branch @{-1}
-
-expecting success: 
-	test_must_fail git check-ref-format --branch -naster >actual &&
-	test_must_be_empty actual
-
-fatal: '-naster' is not a valid branch name
-ok 83 - check-ref-format --branch -naster
-
+*** t1505-rev-parse-last.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1505-rev-parse-last/.git/
 expecting success: 
-	mkdir subdir &&
-
-	T=$(git write-tree) &&
-	sha1=$(echo A | git commit-tree $T) &&
-	git update-ref refs/heads/master $sha1 &&
-	git update-ref refs/remotes/origin/master $sha1 &&
-	git checkout master &&
-	git checkout origin/master &&
-	git checkout master &&
-	refname=$(
-		cd subdir &&
-		git check-ref-format --branch @{-1}
-	) &&
-	test "$refname" = "$sha1"
-
-Already on 'master'
-Note: checking out 'origin/master'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by performing another checkout.
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
+	make_commit 1 &&
+	git branch side &&
+	make_commit 2 &&
+	make_commit 3 &&
+	git checkout side &&
+	make_commit 4 &&
+	git merge master &&
+	git checkout master
 
-  git checkout -b <new-branch-name>
 
-HEAD is now at 69aaa35 A
+[master (root-commit) 514dac8] 1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1
+[master a15fc79] 2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 2
+[master 6d6abfb] 3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 3
+Switched to branch 'side'
+[side 5e95dd1] 4
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 4
+Merging:
+5e95dd1 4
+virtual master
+found 1 common ancestor:
+514dac8 1
+Merge made by the 'recursive' strategy.
+ 2 | 1 +
+ 3 | 1 +
+ 2 files changed, 2 insertions(+)
+ create mode 100644 2
+ create mode 100644 3
 Switched to branch 'master'
-ok 84 - check-ref-format --branch from subdir
-
-expecting success: 
-	nongit test_must_fail git check-ref-format --branch @{-1} >actual &&
-	test_must_be_empty actual
-
-fatal: '@{-1}' is not a valid branch name
-ok 85 - check-ref-format --branch @{-1} from non-repo
-
-expecting success: 
-	echo master >expect &&
-	nongit git check-ref-format --branch master >actual &&
-	test_cmp expect actual
-
-ok 86 - check-ref-format --branch master from non-repo
-
-expecting success: 
-		refname=$(git check-ref-format --normalize 'heads/foo') &&
-		test "$refname" = 'heads/foo'
-	
-ok 87 - ref name 'heads/foo' simplifies to 'heads/foo'
+ok 1 - setup
 
 expecting success: 
-		refname=$(git check-ref-format --normalize 'refs///heads/foo') &&
-		test "$refname" = 'refs/heads/foo'
-	
-ok 88 - ref name 'refs///heads/foo' simplifies to 'refs/heads/foo'
+	test_cmp_rev side @{-1}
 
-expecting success: 
-		refname=$(git check-ref-format --normalize '/heads/foo') &&
-		test "$refname" = 'heads/foo'
-	
-ok 89 - ref name '/heads/foo' simplifies to 'heads/foo'
+ok 2 - @{-1} works
 
 expecting success: 
-		refname=$(git check-ref-format --normalize '///heads/foo') &&
-		test "$refname" = 'heads/foo'
-	
-ok 90 - ref name '///heads/foo' simplifies to 'heads/foo'
+	test_cmp_rev side~2 @{-1}~2
 
-expecting success: 
-		test_must_fail git check-ref-format --normalize 'foo'
-	
-ok 91 - check-ref-format --normalize rejects 'foo'
+ok 3 - @{-1}~2 works
 
 expecting success: 
-		test_must_fail git check-ref-format --normalize '/foo'
-	
-ok 92 - check-ref-format --normalize rejects '/foo'
+	test_cmp_rev side^2 @{-1}^2
 
-expecting success: 
-		test_must_fail git check-ref-format --normalize 'heads/foo/../bar'
-	
-ok 93 - check-ref-format --normalize rejects 'heads/foo/../bar'
+ok 4 - @{-1}^2 works
 
 expecting success: 
-		test_must_fail git check-ref-format --normalize 'heads/./foo'
-	
-ok 94 - check-ref-format --normalize rejects 'heads/./foo'
+	test_cmp_rev side@{1} @{-1}@{1}
 
-expecting success: 
-		test_must_fail git check-ref-format --normalize 'heads\foo'
-	
-ok 95 - check-ref-format --normalize rejects 'heads\foo'
+ok 5 - @{-1}@{1} works
 
 expecting success: 
-		test_must_fail git check-ref-format --normalize 'heads/foo.lock'
-	
-ok 96 - check-ref-format --normalize rejects 'heads/foo.lock'
+	test_cmp_rev master @{-2}
 
-expecting success: 
-		test_must_fail git check-ref-format --normalize 'heads///foo.lock'
-	
-ok 97 - check-ref-format --normalize rejects 'heads///foo.lock'
+ok 6 - @{-2} works
 
 expecting success: 
-		test_must_fail git check-ref-format --normalize 'foo.lock/bar'
-	
-ok 98 - check-ref-format --normalize rejects 'foo.lock/bar'
+	test_must_fail git rev-parse @{-3}
 
-expecting success: 
-		test_must_fail git check-ref-format --normalize 'foo.lock///bar'
-	
-ok 99 - check-ref-format --normalize rejects 'foo.lock///bar'
+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 99 test(s)
-1..99
+# passed all 7 test(s)
+1..7
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
 *** t1502-rev-parse-parseopt.sh ***
@@ -30765,89 +30546,6 @@
 1..27
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t1505-rev-parse-last.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1505-rev-parse-last/.git/
-expecting success: 
-
-	make_commit 1 &&
-	git branch side &&
-	make_commit 2 &&
-	make_commit 3 &&
-	git checkout side &&
-	make_commit 4 &&
-	git merge master &&
-	git checkout master
-
-
-[master (root-commit) 72ef6f5] 1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 1
-[master c241b34] 2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 2
-[master e59d056] 3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 3
-Switched to branch 'side'
-[side 9f27a1e] 4
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 4
-Merging:
-9f27a1e 4
-virtual master
-found 1 common ancestor:
-72ef6f5 1
-Merge made by the 'recursive' strategy.
- 2 | 1 +
- 3 | 1 +
- 2 files changed, 2 insertions(+)
- create mode 100644 2
- create mode 100644 3
-Switched to branch 'master'
-ok 1 - setup
-
-expecting success: 
-	test_cmp_rev side @{-1}
-
-ok 2 - @{-1} works
-
-expecting success: 
-	test_cmp_rev side~2 @{-1}~2
-
-ok 3 - @{-1}~2 works
-
-expecting success: 
-	test_cmp_rev side^2 @{-1}^2
-
-ok 4 - @{-1}^2 works
-
-expecting success: 
-	test_cmp_rev side@{1} @{-1}@{1}
-
-ok 5 - @{-1}@{1} works
-
-expecting success: 
-	test_cmp_rev master @{-2}
-
-ok 6 - @{-2} works
-
-expecting success: 
-	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/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
 *** t1503-rev-parse-verify.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1503-rev-parse-verify/.git/
 expecting success: 
@@ -31552,6 +31250,576 @@
 1..21
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
+*** t1402-check-ref-format.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1402-check-ref-format/.git/
+expecting success: 
+		test_must_fail git check-ref-format  ''
+	
+ok 1 - ref name '' is invalid
+
+expecting success: 
+		test_must_fail git check-ref-format  '/'
+	
+ok 2 - ref name '/' is invalid
+
+expecting success: 
+		test_must_fail git check-ref-format --allow-onelevel '/'
+	
+ok 3 - ref name '/' is invalid with options --allow-onelevel
+
+expecting success: 
+		test_must_fail git check-ref-format --normalize '/'
+	
+ok 4 - ref name '/' is invalid with options --normalize
+
+expecting success: 
+		test_must_fail git check-ref-format --allow-onelevel --normalize '/'
+	
+ok 5 - ref name '/' is invalid with options --allow-onelevel --normalize
+
+expecting success: 
+		git check-ref-format  'foo/bar/baz'
+	
+ok 6 - ref name 'foo/bar/baz' is valid
+
+expecting success: 
+		git check-ref-format --normalize 'foo/bar/baz'
+	
+foo/bar/baz
+ok 7 - ref name 'foo/bar/baz' is valid with options --normalize
+
+expecting success: 
+		test_must_fail git check-ref-format  'refs///heads/foo'
+	
+ok 8 - ref name 'refs///heads/foo' is invalid
+
+expecting success: 
+		git check-ref-format --normalize 'refs///heads/foo'
+	
+refs/heads/foo
+ok 9 - ref name 'refs///heads/foo' is valid with options --normalize
+
+expecting success: 
+		test_must_fail git check-ref-format  'heads/foo/'
+	
+ok 10 - ref name 'heads/foo/' is invalid
+
+expecting success: 
+		test_must_fail git check-ref-format  '/heads/foo'
+	
+ok 11 - ref name '/heads/foo' is invalid
+
+expecting success: 
+		git check-ref-format --normalize '/heads/foo'
+	
+heads/foo
+ok 12 - ref name '/heads/foo' is valid with options --normalize
+
+expecting success: 
+		test_must_fail git check-ref-format  '///heads/foo'
+	
+ok 13 - ref name '///heads/foo' is invalid
+
+expecting success: 
+		git check-ref-format --normalize '///heads/foo'
+	
+heads/foo
+ok 14 - ref name '///heads/foo' is valid with options --normalize
+
+expecting success: 
+		test_must_fail git check-ref-format  './foo'
+	
+ok 15 - ref name './foo' is invalid
+
+expecting success: 
+		test_must_fail git check-ref-format  './foo/bar'
+	
+ok 16 - ref name './foo/bar' is invalid
+
+expecting success: 
+		test_must_fail git check-ref-format  'foo/./bar'
+	
+ok 17 - ref name 'foo/./bar' is invalid
+
+expecting success: 
+		test_must_fail git check-ref-format  'foo/bar/.'
+	
+ok 18 - ref name 'foo/bar/.' is invalid
+
+expecting success: 
+		test_must_fail git check-ref-format  '.refs/foo'
+	
+ok 19 - ref name '.refs/foo' is invalid
+
+expecting success: 
+		test_must_fail git check-ref-format  'refs/heads/foo.'
+	
+ok 20 - ref name 'refs/heads/foo.' is invalid
+
+expecting success: 
+		test_must_fail git check-ref-format  'heads/foo..bar'
+	
+ok 21 - ref name 'heads/foo..bar' is invalid
+
+expecting success: 
+		test_must_fail git check-ref-format  'heads/foo?bar'
+	
+ok 22 - ref name 'heads/foo?bar' is invalid
+
+expecting success: 
+		git check-ref-format  'foo./bar'
+	
+ok 23 - ref name 'foo./bar' is valid
+
+expecting success: 
+		test_must_fail git check-ref-format  'heads/foo.lock'
+	
+ok 24 - ref name 'heads/foo.lock' is invalid
+
+expecting success: 
+		test_must_fail git check-ref-format  'heads///foo.lock'
+	
+ok 25 - ref name 'heads///foo.lock' is invalid
+
+expecting success: 
+		test_must_fail git check-ref-format  'foo.lock/bar'
+	
+ok 26 - ref name 'foo.lock/bar' is invalid
+
+expecting success: 
+		test_must_fail git check-ref-format  'foo.lock///bar'
+	
+ok 27 - ref name 'foo.lock///bar' is invalid
+
+expecting success: 
+		git check-ref-format  'heads/foo@bar'
+	
+ok 28 - ref name 'heads/foo@bar' is valid
+
+expecting success: 
+		test_must_fail git check-ref-format  'heads/v@{ation'
+	
+ok 29 - ref name 'heads/v@{ation' is invalid
+
+expecting success: 
+		test_must_fail git check-ref-format  'heads/foo\bar'
+	
+ok 30 - ref name 'heads/foo\bar' is invalid
+
+expecting success: 
+		test_must_fail git check-ref-format  'heads/foo	'
+	
+ok 31 - ref name 'heads/foo	' is invalid
+
+expecting success: 
+		test_must_fail git check-ref-format  'heads/foo'
+	
+ok 32 - ref name 'heads/foo' is invalid
+
+expecting success: 
+		git check-ref-format  'heads/fuß'
+	
+ok 33 - ref name 'heads/fuß' is valid
+
+expecting success: 
+		git check-ref-format --refspec-pattern 'heads/*foo/bar'
+	
+ok 34 - ref name 'heads/*foo/bar' is valid with options --refspec-pattern
+
+expecting success: 
+		git check-ref-format --refspec-pattern 'heads/foo*/bar'
+	
+ok 35 - ref name 'heads/foo*/bar' is valid with options --refspec-pattern
+
+expecting success: 
+		git check-ref-format --refspec-pattern 'heads/f*o/bar'
+	
+ok 36 - ref name 'heads/f*o/bar' is valid with options --refspec-pattern
+
+expecting success: 
+		test_must_fail git check-ref-format --refspec-pattern 'heads/f*o*/bar'
+	
+ok 37 - ref name 'heads/f*o*/bar' is invalid with options --refspec-pattern
+
+expecting success: 
+		test_must_fail git check-ref-format --refspec-pattern 'heads/foo*/bar*'
+	
+ok 38 - ref name 'heads/foo*/bar*' is invalid with options --refspec-pattern
+
+expecting success: 
+		test_must_fail git check-ref-format  'foo'
+	
+ok 39 - ref name 'foo' is invalid
+
+expecting success: 
+		git check-ref-format --allow-onelevel 'foo'
+	
+ok 40 - ref name 'foo' is valid with options --allow-onelevel
+
+expecting success: 
+		test_must_fail git check-ref-format --refspec-pattern 'foo'
+	
+ok 41 - ref name 'foo' is invalid with options --refspec-pattern
+
+expecting success: 
+		git check-ref-format --refspec-pattern --allow-onelevel 'foo'
+	
+ok 42 - ref name 'foo' is valid with options --refspec-pattern --allow-onelevel
+
+expecting success: 
+		test_must_fail git check-ref-format --normalize 'foo'
+	
+ok 43 - ref name 'foo' is invalid with options --normalize
+
+expecting success: 
+		git check-ref-format --allow-onelevel --normalize 'foo'
+	
+foo
+ok 44 - ref name 'foo' is valid with options --allow-onelevel --normalize
+
+expecting success: 
+		git check-ref-format  'foo/bar'
+	
+ok 45 - ref name 'foo/bar' is valid
+
+expecting success: 
+		git check-ref-format --allow-onelevel 'foo/bar'
+	
+ok 46 - ref name 'foo/bar' is valid with options --allow-onelevel
+
+expecting success: 
+		git check-ref-format --refspec-pattern 'foo/bar'
+	
+ok 47 - ref name 'foo/bar' is valid with options --refspec-pattern
+
+expecting success: 
+		git check-ref-format --refspec-pattern --allow-onelevel 'foo/bar'
+	
+ok 48 - ref name 'foo/bar' is valid with options --refspec-pattern --allow-onelevel
+
+expecting success: 
+		git check-ref-format --normalize 'foo/bar'
+	
+foo/bar
+ok 49 - ref name 'foo/bar' is valid with options --normalize
+
+expecting success: 
+		test_must_fail git check-ref-format  'foo/*'
+	
+ok 50 - ref name 'foo/*' is invalid
+
+expecting success: 
+		test_must_fail git check-ref-format --allow-onelevel 'foo/*'
+	
+ok 51 - ref name 'foo/*' is invalid with options --allow-onelevel
+
+expecting success: 
+		git check-ref-format --refspec-pattern 'foo/*'
+	
+ok 52 - ref name 'foo/*' is valid with options --refspec-pattern
+
+expecting success: 
+		git check-ref-format --refspec-pattern --allow-onelevel 'foo/*'
+	
+ok 53 - ref name 'foo/*' is valid with options --refspec-pattern --allow-onelevel
+
+expecting success: 
+		test_must_fail git check-ref-format  '*/foo'
+	
+ok 54 - ref name '*/foo' is invalid
+
+expecting success: 
+		test_must_fail git check-ref-format --allow-onelevel '*/foo'
+	
+ok 55 - ref name '*/foo' is invalid with options --allow-onelevel
+
+expecting success: 
+		git check-ref-format --refspec-pattern '*/foo'
+	
+ok 56 - ref name '*/foo' is valid with options --refspec-pattern
+
+expecting success: 
+		git check-ref-format --refspec-pattern --allow-onelevel '*/foo'
+	
+ok 57 - ref name '*/foo' is valid with options --refspec-pattern --allow-onelevel
+
+expecting success: 
+		test_must_fail git check-ref-format --normalize '*/foo'
+	
+ok 58 - ref name '*/foo' is invalid with options --normalize
+
+expecting success: 
+		git check-ref-format --refspec-pattern --normalize '*/foo'
+	
+*/foo
+ok 59 - ref name '*/foo' is valid with options --refspec-pattern --normalize
+
+expecting success: 
+		test_must_fail git check-ref-format  'foo/*/bar'
+	
+ok 60 - ref name 'foo/*/bar' is invalid
+
+expecting success: 
+		test_must_fail git check-ref-format --allow-onelevel 'foo/*/bar'
+	
+ok 61 - ref name 'foo/*/bar' is invalid with options --allow-onelevel
+
+expecting success: 
+		git check-ref-format --refspec-pattern 'foo/*/bar'
+	
+ok 62 - ref name 'foo/*/bar' is valid with options --refspec-pattern
+
+expecting success: 
+		git check-ref-format --refspec-pattern --allow-onelevel 'foo/*/bar'
+	
+ok 63 - ref name 'foo/*/bar' is valid with options --refspec-pattern --allow-onelevel
+
+expecting success: 
+		test_must_fail git check-ref-format  '*'
+	
+ok 64 - ref name '*' is invalid
+
+expecting success: 
+		test_must_fail git check-ref-format --allow-onelevel '*'
+	
+ok 65 - ref name '*' is invalid with options --allow-onelevel
+
+expecting success: 
+		test_must_fail git check-ref-format --refspec-pattern '*'
+	
+ok 66 - ref name '*' is invalid with options --refspec-pattern
+
+expecting success: 
+		git check-ref-format --refspec-pattern --allow-onelevel '*'
+	
+ok 67 - ref name '*' is valid with options --refspec-pattern --allow-onelevel
+
+expecting success: 
+		test_must_fail git check-ref-format --refspec-pattern 'foo/*/*'
+	
+ok 68 - ref name 'foo/*/*' is invalid with options --refspec-pattern
+
+expecting success: 
+		test_must_fail git check-ref-format --refspec-pattern --allow-onelevel 'foo/*/*'
+	
+ok 69 - ref name 'foo/*/*' is invalid with options --refspec-pattern --allow-onelevel
+
+expecting success: 
+		test_must_fail git check-ref-format --refspec-pattern '*/foo/*'
+	
+ok 70 - ref name '*/foo/*' is invalid with options --refspec-pattern
+
+expecting success: 
+		test_must_fail git check-ref-format --refspec-pattern --allow-onelevel '*/foo/*'
+	
+ok 71 - ref name '*/foo/*' is invalid with options --refspec-pattern --allow-onelevel
+
+expecting success: 
+		test_must_fail git check-ref-format --refspec-pattern '*/*/foo'
+	
+ok 72 - ref name '*/*/foo' is invalid with options --refspec-pattern
+
+expecting success: 
+		test_must_fail git check-ref-format --refspec-pattern --allow-onelevel '*/*/foo'
+	
+ok 73 - ref name '*/*/foo' is invalid with options --refspec-pattern --allow-onelevel
+
+expecting success: 
+		test_must_fail git check-ref-format  '/foo'
+	
+ok 74 - ref name '/foo' is invalid
+
+expecting success: 
+		test_must_fail git check-ref-format --allow-onelevel '/foo'
+	
+ok 75 - ref name '/foo' is invalid with options --allow-onelevel
+
+expecting success: 
+		test_must_fail git check-ref-format --refspec-pattern '/foo'
+	
+ok 76 - ref name '/foo' is invalid with options --refspec-pattern
+
+expecting success: 
+		test_must_fail git check-ref-format --refspec-pattern --allow-onelevel '/foo'
+	
+ok 77 - ref name '/foo' is invalid with options --refspec-pattern --allow-onelevel
+
+expecting success: 
+		test_must_fail git check-ref-format --normalize '/foo'
+	
+ok 78 - ref name '/foo' is invalid with options --normalize
+
+expecting success: 
+		git check-ref-format --allow-onelevel --normalize '/foo'
+	
+foo
+ok 79 - ref name '/foo' is valid with options --allow-onelevel --normalize
+
+expecting success: 
+		test_must_fail git check-ref-format --refspec-pattern --normalize '/foo'
+	
+ok 80 - ref name '/foo' is invalid with options --refspec-pattern --normalize
+
+expecting success: 
+		git check-ref-format --refspec-pattern --allow-onelevel --normalize '/foo'
+	
+foo
+ok 81 - ref name '/foo' is valid with options --refspec-pattern --allow-onelevel --normalize
+
+expecting success: 
+	T=$(git write-tree) &&
+	sha1=$(echo A | git commit-tree $T) &&
+	git update-ref refs/heads/master $sha1 &&
+	git update-ref refs/remotes/origin/master $sha1 &&
+	git checkout master &&
+	git checkout origin/master &&
+	git checkout master &&
+	refname=$(git check-ref-format --branch @{-1}) &&
+	test "$refname" = "$sha1" &&
+	refname2=$(git check-ref-format --branch @{-2}) &&
+	test "$refname2" = master
+Already on 'master'
+Note: checking out 'origin/master'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by performing another checkout.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -b with the checkout command again. Example:
+
+  git checkout -b <new-branch-name>
+
+HEAD is now at 6e1f152 A
+Switched to branch 'master'
+ok 82 - check-ref-format --branch @{-1}
+
+expecting success: 
+	test_must_fail git check-ref-format --branch -naster >actual &&
+	test_must_be_empty actual
+
+fatal: '-naster' is not a valid branch name
+ok 83 - check-ref-format --branch -naster
+
+expecting success: 
+	mkdir subdir &&
+
+	T=$(git write-tree) &&
+	sha1=$(echo A | git commit-tree $T) &&
+	git update-ref refs/heads/master $sha1 &&
+	git update-ref refs/remotes/origin/master $sha1 &&
+	git checkout master &&
+	git checkout origin/master &&
+	git checkout master &&
+	refname=$(
+		cd subdir &&
+		git check-ref-format --branch @{-1}
+	) &&
+	test "$refname" = "$sha1"
+
+Already on 'master'
+Note: checking out 'origin/master'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by performing another checkout.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -b with the checkout command again. Example:
+
+  git checkout -b <new-branch-name>
+
+HEAD is now at 6e1f152 A
+Switched to branch 'master'
+ok 84 - check-ref-format --branch from subdir
+
+expecting success: 
+	nongit test_must_fail git check-ref-format --branch @{-1} >actual &&
+	test_must_be_empty actual
+
+fatal: '@{-1}' is not a valid branch name
+ok 85 - check-ref-format --branch @{-1} from non-repo
+
+expecting success: 
+	echo master >expect &&
+	nongit git check-ref-format --branch master >actual &&
+	test_cmp expect actual
+
+ok 86 - check-ref-format --branch master from non-repo
+
+expecting success: 
+		refname=$(git check-ref-format --normalize 'heads/foo') &&
+		test "$refname" = 'heads/foo'
+	
+ok 87 - ref name 'heads/foo' simplifies to 'heads/foo'
+
+expecting success: 
+		refname=$(git check-ref-format --normalize 'refs///heads/foo') &&
+		test "$refname" = 'refs/heads/foo'
+	
+ok 88 - ref name 'refs///heads/foo' simplifies to 'refs/heads/foo'
+
+expecting success: 
+		refname=$(git check-ref-format --normalize '/heads/foo') &&
+		test "$refname" = 'heads/foo'
+	
+ok 89 - ref name '/heads/foo' simplifies to 'heads/foo'
+
+expecting success: 
+		refname=$(git check-ref-format --normalize '///heads/foo') &&
+		test "$refname" = 'heads/foo'
+	
+ok 90 - ref name '///heads/foo' simplifies to 'heads/foo'
+
+expecting success: 
+		test_must_fail git check-ref-format --normalize 'foo'
+	
+ok 91 - check-ref-format --normalize rejects 'foo'
+
+expecting success: 
+		test_must_fail git check-ref-format --normalize '/foo'
+	
+ok 92 - check-ref-format --normalize rejects '/foo'
+
+expecting success: 
+		test_must_fail git check-ref-format --normalize 'heads/foo/../bar'
+	
+ok 93 - check-ref-format --normalize rejects 'heads/foo/../bar'
+
+expecting success: 
+		test_must_fail git check-ref-format --normalize 'heads/./foo'
+	
+ok 94 - check-ref-format --normalize rejects 'heads/./foo'
+
+expecting success: 
+		test_must_fail git check-ref-format --normalize 'heads\foo'
+	
+ok 95 - check-ref-format --normalize rejects 'heads\foo'
+
+expecting success: 
+		test_must_fail git check-ref-format --normalize 'heads/foo.lock'
+	
+ok 96 - check-ref-format --normalize rejects 'heads/foo.lock'
+
+expecting success: 
+		test_must_fail git check-ref-format --normalize 'heads///foo.lock'
+	
+ok 97 - check-ref-format --normalize rejects 'heads///foo.lock'
+
+expecting success: 
+		test_must_fail git check-ref-format --normalize 'foo.lock/bar'
+	
+ok 98 - check-ref-format --normalize rejects 'foo.lock/bar'
+
+expecting success: 
+		test_must_fail git check-ref-format --normalize 'foo.lock///bar'
+	
+ok 99 - check-ref-format --normalize rejects 'foo.lock///bar'
+
+# passed all 99 test(s)
+1..99
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
 *** t1509-root-work-tree.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1509-root-work-tree/.git/
 1..0 # SKIP Test requiring writable / skipped. Read this test if you want to run it
@@ -31744,6 +32012,267 @@
 1..44
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
+*** t1506-rev-parse-diagnosis.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1506-rev-parse-diagnosis/.git/
+expecting success: 
+	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
+
+[master (root-commit) ad0bf3c] 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: 
+	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: 
+	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: 
+	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: 
+	(
+		cd subdir &&
+		git rev-parse HEAD:../file.txt >result &&
+		test_cmp ../expected result
+	)
+
+ok 5 - correct relative file objects (2)
+
+expecting success: 
+	(
+		cd subdir &&
+		git rev-parse HEAD:../subdir/../file.txt >result &&
+		test_cmp ../expected result
+	)
+
+ok 6 - correct relative file objects (3)
+
+expecting success: 
+	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: 
+	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: 
+	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: 
+	test_must_fail git rev-parse foobar:file.txt 2>error &&
+	grep "Invalid object name 'foobar'." error &&
+	test_must_fail git rev-parse foobar 2> error &&
+	test_i18ngrep "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: 
+	test_must_fail git rev-parse HEAD:nothing.txt 2> error &&
+	grep "fatal: Path 'nothing.txt' does not exist in 'HEAD'" error &&
+	test_must_fail git rev-parse HEAD:index-only.txt 2> error &&
+	grep "fatal: 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: 
+	test_must_fail git rev-parse :nothing.txt 2> error &&
+	grep "fatal: 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 &&
+	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 &&
+	grep "fatal: 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: 
+	test_must_fail git rev-parse master@{99999} >output 2>error &&
+	test -z "$(cat output)" &&
+	grep "fatal: Log for [^ ]* only has [0-9][0-9]* entries." error  &&
+	test_must_fail git rev-parse --verify master@{99999} >output 2>error &&
+	test -z "$(cat output)" &&
+	grep "fatal: Log for [^ ]* only has [0-9][0-9]* entries." error
+
+fatal: Log for 'master' only has 1 entries.
+fatal: Log for 'master' only has 1 entries.
+ok 13 - invalid @{n} reference
+
+expecting success: 
+	(
+		cd subdir &&
+		test_must_fail git rev-parse HEAD:./nonexistent.txt 2>error &&
+		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: 
+	test_must_fail git rev-parse HEAD:../file.txt >output 2>error &&
+	test -z "$(cat output)" &&
+	test_i18ngrep "outside repository" error
+
+fatal: '../file.txt' is outside repository
+ok 15 - relative path outside worktree
+
+expecting success: 
+	test_must_fail git --git-dir=.git --work-tree=subdir rev-parse HEAD:./file.txt >output 2>error &&
+	test -z "$(cat output)" &&
+	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: 
+	test_must_fail git rev-parse file.txt HEAD:file.txt 1>actual 2>error &&
+	test_i18ngrep ! "exists on disk" error &&
+	test_i18ngrep "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: 
+	( 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: 
+	test_must_fail git rev-parse foobar -- 2>stderr &&
+	test_i18ngrep "bad revision" stderr
+
+fatal: bad revision 'foobar'
+ok 19 - arg before dashdash must be a revision (missing)
+
+expecting success: 
+	>foobar &&
+	test_must_fail git rev-parse foobar -- 2>stderr &&
+	test_i18ngrep "bad revision" stderr
+
+fatal: bad revision 'foobar'
+ok 20 - arg before dashdash must be a revision (file)
+
+expecting success: 
+	>foobar &&
+	git update-ref refs/heads/foobar HEAD &&
+	{
+		# we do not want to use rev-parse here, because
+		# we are testing it
+		cat .git/refs/heads/foobar &&
+		printf "%s\n" --
+	} >expect &&
+	git rev-parse foobar -- >actual &&
+	test_cmp expect actual
+
+ok 21 - arg before dashdash must be a revision (ambiguous)
+
+# passed all 21 test(s)
+1..21
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
 *** t1430-bad-ref-name.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1430-bad-ref-name/.git/
 expecting success: 
@@ -31775,7 +32304,7 @@
 	test_must_fail git fast-import <input
 
 fatal: Branch name doesn't conform to GIT standards: .badbranchname
-fast-import: dumping crash report to .git/fast_import_crash_2967559
+fast-import: dumping crash report to .git/fast_import_crash_2449138
 ok 2 - fast-import: fail on invalid branch name ".badbranchname"
 
 expecting success: 
@@ -31793,7 +32322,7 @@
 	test_must_fail git fast-import <input
 
 fatal: Branch name doesn't conform to GIT standards: bad[branch]name
-fast-import: dumping crash report to .git/fast_import_crash_2968411
+fast-import: dumping crash report to .git/fast_import_crash_2449361
 ok 3 - fast-import: fail on invalid branch name "bad[branch]name"
 
 expecting success: 
@@ -32229,362 +32758,101 @@
 1..42
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t1506-rev-parse-diagnosis.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1506-rev-parse-diagnosis/.git/
+*** t1501-work-tree.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1501-work-tree/.git/
 expecting success: 
-	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
+	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/") &&
 
-[master (root-commit) 28a6d33] 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
+	mkdir -p work/sub/dir &&
+	mkdir -p work2 &&
+	mv .git repo.git
+
+ok 1 - setup
 
 expecting success: 
-	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) )
+	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 &&
 
-f719efd430d52bcfc8566a43b2eb655688d38871
-8510665149157c2bc901848c3e0b746954e9cbd9
-2bdf67abb163a4ffb2d7f3f0880c9fe5068ce782
-ok 2 - correct file objects
+		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: 
-	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
+		test_cmp expected.bare actual.bare &&
+		test_cmp expected.inside-git actual.inside-git &&
+		test_cmp expected.inside-worktree actual.inside-worktree &&
+		if test $# -ge 4
+		then
+			# rev-parse --show-prefix should output
+			# a single newline when at the top of the work tree,
+			# but we test for that separately.
+			test -z "$4" && test_must_be_empty actual.prefix ||
+			test_cmp expected.prefix actual.prefix
+		fi
+	}
 
-ok 3 - correct relative file objects (0)
+ok 2 - setup: helper for testing rev-parse
 
 expecting success: 
-	git rev-parse HEAD:file.txt >expected &&
-	git rev-parse HEAD:./file.txt >result &&
-	test_cmp expected result
+	sane_unset GIT_WORK_TREE &&
+	GIT_DIR=repo.git &&
+	GIT_CONFIG="$(pwd)"/$GIT_DIR/config &&
+	export GIT_DIR GIT_CONFIG &&
+	git config core.worktree ../work
 
-ok 4 - correct relative file objects (1)
+ok 3 - setup: core.worktree = relative path
 
 expecting success: 
-	(
-		cd subdir &&
-		git rev-parse HEAD:../file.txt >result &&
-		test_cmp ../expected result
-	)
+	test_rev_parse false false false
 
-ok 5 - correct relative file objects (2)
+ok 4 - outside
 
 expecting success: 
 	(
-		cd subdir &&
-		git rev-parse HEAD:../subdir/../file.txt >result &&
-		test_cmp ../expected result
+		cd work &&
+		GIT_DIR=../repo.git &&
+		GIT_CONFIG="$(pwd)"/$GIT_DIR/config &&
+		test_rev_parse false false true ""
 	)
 
-ok 6 - correct relative file objects (3)
+'actual.prefix' is not empty, it contains:
+
+ok 5 - inside work tree
 
 expecting success: 
-	git rev-parse HEAD:subdir/file.txt >expected &&
+	echo >expected &&
 	(
-		cd subdir &&
-		git rev-parse HEAD:./file.txt >result &&
-		test_cmp ../expected result
-	)
+		cd work &&
+		GIT_DIR=../repo.git &&
+		GIT_CONFIG="$(pwd)"/$GIT_DIR/config &&
+		git rev-parse --show-prefix >../actual
+	) &&
+	test_cmp expected actual
 
-ok 7 - correct relative file objects (4)
+ok 6 - empty prefix is actually written out
 
 expecting success: 
-	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
+		cd work/sub/dir &&
+		GIT_DIR=../../../repo.git &&
+		GIT_CONFIG="$(pwd)"/$GIT_DIR/config &&
+		test_rev_parse false false true sub/dir/
 	)
 
-ok 8 - correct relative file objects (5)
-
-expecting success: 
-	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: 
-	test_must_fail git rev-parse foobar:file.txt 2>error &&
-	grep "Invalid object name 'foobar'." error &&
-	test_must_fail git rev-parse foobar 2> error &&
-	test_i18ngrep "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: 
-	test_must_fail git rev-parse HEAD:nothing.txt 2> error &&
-	grep "fatal: Path 'nothing.txt' does not exist in 'HEAD'" error &&
-	test_must_fail git rev-parse HEAD:index-only.txt 2> error &&
-	grep "fatal: 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: 
-	test_must_fail git rev-parse :nothing.txt 2> error &&
-	grep "fatal: 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 &&
-	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 &&
-	grep "fatal: 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: 
-	test_must_fail git rev-parse master@{99999} >output 2>error &&
-	test -z "$(cat output)" &&
-	grep "fatal: Log for [^ ]* only has [0-9][0-9]* entries." error  &&
-	test_must_fail git rev-parse --verify master@{99999} >output 2>error &&
-	test -z "$(cat output)" &&
-	grep "fatal: Log for [^ ]* only has [0-9][0-9]* entries." error
-
-fatal: Log for 'master' only has 1 entries.
-fatal: Log for 'master' only has 1 entries.
-ok 13 - invalid @{n} reference
-
-expecting success: 
-	(
-		cd subdir &&
-		test_must_fail git rev-parse HEAD:./nonexistent.txt 2>error &&
-		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: 
-	test_must_fail git rev-parse HEAD:../file.txt >output 2>error &&
-	test -z "$(cat output)" &&
-	test_i18ngrep "outside repository" error
-
-fatal: '../file.txt' is outside repository
-ok 15 - relative path outside worktree
-
-expecting success: 
-	test_must_fail git --git-dir=.git --work-tree=subdir rev-parse HEAD:./file.txt >output 2>error &&
-	test -z "$(cat output)" &&
-	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: 
-	test_must_fail git rev-parse file.txt HEAD:file.txt 1>actual 2>error &&
-	test_i18ngrep ! "exists on disk" error &&
-	test_i18ngrep "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: 
-	( 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: 
-	test_must_fail git rev-parse foobar -- 2>stderr &&
-	test_i18ngrep "bad revision" stderr
-
-fatal: bad revision 'foobar'
-ok 19 - arg before dashdash must be a revision (missing)
-
-expecting success: 
-	>foobar &&
-	test_must_fail git rev-parse foobar -- 2>stderr &&
-	test_i18ngrep "bad revision" stderr
-
-fatal: bad revision 'foobar'
-ok 20 - arg before dashdash must be a revision (file)
-
-expecting success: 
-	>foobar &&
-	git update-ref refs/heads/foobar HEAD &&
-	{
-		# we do not want to use rev-parse here, because
-		# we are testing it
-		cat .git/refs/heads/foobar &&
-		printf "%s\n" --
-	} >expect &&
-	git rev-parse foobar -- >actual &&
-	test_cmp expect actual
-
-ok 21 - arg before dashdash must be a revision (ambiguous)
-
-# passed all 21 test(s)
-1..21
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t1501-work-tree.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1501-work-tree/.git/
-expecting success: 
-	EMPTY_TREE=$(git write-tree) &&
-	EMPTY_BLOB=$(git hash-object -t blob --stdin </dev/null) &&
-	CHANGED_BLOB=$(echo changed | git hash-object -t blob --stdin) &&
-	EMPTY_BLOB7=$(echo $EMPTY_BLOB | sed "s/\(.......\).*/\1/") &&
-	CHANGED_BLOB7=$(echo $CHANGED_BLOB | sed "s/\(.......\).*/\1/") &&
-
-	mkdir -p work/sub/dir &&
-	mkdir -p work2 &&
-	mv .git repo.git
-
-ok 1 - setup
-
-expecting success: 
-	test_rev_parse() {
-		echo $1 >expected.bare &&
-		echo $2 >expected.inside-git &&
-		echo $3 >expected.inside-worktree &&
-		if test $# -ge 4
-		then
-			echo $4 >expected.prefix
-		fi &&
-
-		git rev-parse --is-bare-repository >actual.bare &&
-		git rev-parse --is-inside-git-dir >actual.inside-git &&
-		git rev-parse --is-inside-work-tree >actual.inside-worktree &&
-		if test $# -ge 4
-		then
-			git rev-parse --show-prefix >actual.prefix
-		fi &&
-
-		test_cmp expected.bare actual.bare &&
-		test_cmp expected.inside-git actual.inside-git &&
-		test_cmp expected.inside-worktree actual.inside-worktree &&
-		if test $# -ge 4
-		then
-			# rev-parse --show-prefix should output
-			# a single newline when at the top of the work tree,
-			# but we test for that separately.
-			test -z "$4" && test_must_be_empty actual.prefix ||
-			test_cmp expected.prefix actual.prefix
-		fi
-	}
-
-ok 2 - setup: helper for testing rev-parse
-
-expecting success: 
-	sane_unset GIT_WORK_TREE &&
-	GIT_DIR=repo.git &&
-	GIT_CONFIG="$(pwd)"/$GIT_DIR/config &&
-	export GIT_DIR GIT_CONFIG &&
-	git config core.worktree ../work
-
-ok 3 - setup: core.worktree = relative path
-
-expecting success: 
-	test_rev_parse false false false
-
-ok 4 - outside
-
-expecting success: 
-	(
-		cd work &&
-		GIT_DIR=../repo.git &&
-		GIT_CONFIG="$(pwd)"/$GIT_DIR/config &&
-		test_rev_parse false false true ""
-	)
-
-'actual.prefix' is not empty, it contains:
-
-ok 5 - inside work tree
-
-expecting success: 
-	echo >expected &&
-	(
-		cd work &&
-		GIT_DIR=../repo.git &&
-		GIT_CONFIG="$(pwd)"/$GIT_DIR/config &&
-		git rev-parse --show-prefix >../actual
-	) &&
-	test_cmp expected actual
-
-ok 6 - empty prefix is actually written out
-
-expecting success: 
-	(
-		cd work/sub/dir &&
-		GIT_DIR=../../../repo.git &&
-		GIT_CONFIG="$(pwd)"/$GIT_DIR/config &&
-		test_rev_parse false false true sub/dir/
-	)
-
-ok 7 - subdir of work tree
+ok 7 - subdir of work tree
 
 expecting success: 
 	sane_unset GIT_WORK_TREE &&
@@ -32855,7 +33123,7 @@
 		GIT_DIR=. GIT_WORK_TREE=work git commit -a -m done
 	)
 
-[master (root-commit) 0a8065a] done
+[master (root-commit) 06c2685] done
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 sub/dir/tracked
@@ -32993,9 +33261,9 @@
 	test_cmp expect actual
 
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1501-work-tree/relative/.git/
-[master (root-commit) c78bf3e] one
+[master (root-commit) 59fef35] one
  Author: A U Thor <author@example.com>
-[master ae1e5be] two
+[master b6570d2] two
  Author: A U Thor <author@example.com>
 ok 39 - refs work with relative gitdir and work tree
 
@@ -33003,583 +33271,217 @@
 1..39
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t1404-update-ref-errors.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1404-update-ref-errors/.git/
+*** t1511-rev-parse-caret.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1511-rev-parse-caret/.git/
 expecting success: 
+	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 master &&
+	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
 
-	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)
-
-[master (root-commit) 3fcecbc] Initial
+[master (root-commit) 7d49d4e] 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 'master'
+[master 18ac4c1] Modified
  Author: A U Thor <author@example.com>
-[master 0efb1d6] Second
+ 1 file changed, 1 insertion(+)
+[master cac74a6] !Exp
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master e9b2697] Changed
  Author: A U Thor <author@example.com>
-[master 7c7d328] Third
+ 1 file changed, 1 insertion(+)
+[master 69f9a05] Changed-again
  Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
 ok 1 - setup
 
 expecting success: 
+	test_must_fail git rev-parse ref^{non-existent}
 
-	prefix=refs/1l &&
-	test_update_rejected "a c e" false "b c/x d" \
-		"$Q$prefix/c$Q exists; cannot create $Q$prefix/c/x$Q"
-
-
-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: 
-
-	prefix=refs/1p &&
-	test_update_rejected "a c e" true "b c/x d" \
-		"$Q$prefix/c$Q exists; cannot create $Q$prefix/c/x$Q"
-
-
-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: 
-
-	prefix=refs/2l &&
-	test_update_rejected "a c e" false "b c/x/y d" \
-		"$Q$prefix/c$Q exists; cannot create $Q$prefix/c/x/y$Q"
-
-
-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: 
-
-	prefix=refs/2p &&
-	test_update_rejected "a c e" true "b c/x/y d" \
-		"$Q$prefix/c$Q exists; cannot create $Q$prefix/c/x/y$Q"
-
-
-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: 
-
-	prefix=refs/3l &&
-	test_update_rejected "a c/x e" false "b c d" \
-		"$Q$prefix/c/x$Q exists; cannot create $Q$prefix/c$Q"
-
-
-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: 
-
-	prefix=refs/3p &&
-	test_update_rejected "a c/x e" true "b c d" \
-		"$Q$prefix/c/x$Q exists; cannot create $Q$prefix/c$Q"
-
-
-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
+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: 
+	git rev-parse ref >expected &&
+	git rev-parse ref^{} >actual &&
+	test_cmp expected actual &&
+	git rev-parse commit-tag^{} >actual &&
+	test_cmp expected actual
 
-	prefix=refs/4l &&
-	test_update_rejected "a c/x/y e" false "b c d" \
-		"$Q$prefix/c/x/y$Q exists; cannot create $Q$prefix/c$Q"
-
-
-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 3 - ref^{}
 
 expecting success: 
+	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}
 
-	prefix=refs/4p &&
-	test_update_rejected "a c/x/y e" true "b c d" \
-		"$Q$prefix/c/x/y$Q exists; cannot create $Q$prefix/c$Q"
-
-
-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
+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: 
+	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}
 
-	prefix=refs/5 &&
-	test_update_rejected "a e" false "b c c/x d" \
-		"cannot process $Q$prefix/c$Q and $Q$prefix/c/x$Q at the same time"
-
-
-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
+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: 
-	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_must_fail git rev-parse HEAD^{tag} &&
+	git rev-parse commit-tag >expected &&
+	git rev-parse commit-tag^{tag} >actual &&
 	test_cmp expected actual
 
-ok 11 - empty directory should not fool rev-parse
+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: 
-	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 &&
+	git rev-parse master >expected &&
+	git rev-parse master^{/.} >actual &&
 	test_cmp expected actual
 
-ok 12 - empty directory should not fool for-each-ref
-
-expecting success: 
-	prefix=refs/e-create &&
-	mkdir -p .git/$prefix/foo/bar/baz &&
-	printf "create %s $C\n" $prefix/foo |
-	git update-ref --stdin
-
-ok 13 - empty directory should not fool create
-
-expecting success: 
-	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 14 - empty directory should not fool verify
-
-expecting success: 
-	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 15 - empty directory should not fool 1-arg update
-
-expecting success: 
-	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 16 - empty directory should not fool 2-arg update
-
-expecting success: 
-	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 17 - empty directory should not fool 0-arg delete
-
-expecting success: 
-	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 18 - empty directory should not fool 1-arg delete
-
-expecting success: 
-	df_test refs/df-al-ds --add-del foo/bar foo
-
-ok 19 - D/F conflict prevents add long + delete short
-
-expecting success: 
-	df_test refs/df-as-dl --add-del foo foo/bar
-
-ok 20 - D/F conflict prevents add short + delete long
-
-expecting success: 
-	df_test refs/df-dl-as --del-add foo/bar foo
-
-ok 21 - D/F conflict prevents delete long + add short
-
-expecting success: 
-	df_test refs/df-ds-al --del-add foo foo/bar
-
-ok 22 - D/F conflict prevents delete short + add long
-
-expecting success: 
-	df_test refs/df-al-dsp --pack --add-del foo/bar foo
-
-ok 23 - D/F conflict prevents add long + delete short packed
-
-expecting success: 
-	df_test refs/df-as-dlp --pack --add-del foo foo/bar
-
-ok 24 - D/F conflict prevents add short + delete long packed
-
-expecting success: 
-	df_test refs/df-dlp-as --pack --del-add foo/bar foo
-
-ok 25 - D/F conflict prevents delete long packed + add short
-
-expecting success: 
-	df_test refs/df-dsp-al --pack --del-add foo foo/bar
-
-ok 26 - D/F conflict prevents delete short packed + add long
-
-expecting success: 
-	df_test refs/df-ial-ds --sym-add --add-del foo/bar foo
-
-ok 27 - D/F conflict prevents indirect add long + delete short
-
-expecting success: 
-	df_test refs/df-ial-ids --sym-add --sym-del --add-del foo/bar foo
-
-ok 28 - D/F conflict prevents indirect add long + indirect delete short
-
-expecting success: 
-	df_test refs/df-ias-idl --sym-add --sym-del --add-del foo foo/bar
-
-ok 29 - D/F conflict prevents indirect add short + indirect delete long
-
-expecting success: 
-	df_test refs/df-idl-ias --sym-add --sym-del --del-add foo/bar foo
-
-ok 30 - D/F conflict prevents indirect delete long + indirect add short
-
-expecting success: 
-	df_test refs/df-ial-dsp --sym-add --pack --add-del foo/bar foo
-
-ok 31 - D/F conflict prevents indirect add long + delete short packed
-
-expecting success: 
-	df_test refs/df-ial-idsp --sym-add --sym-del --pack --add-del foo/bar foo
-
-ok 32 - D/F conflict prevents indirect add long + indirect delete short packed
-
-expecting success: 
-	df_test refs/df-al-idsp --sym-del --pack --add-del foo/bar foo
-
-ok 33 - D/F conflict prevents add long + indirect delete short packed
-
-expecting success: 
-	df_test refs/df-idlp-ias --sym-add --sym-del --pack --del-add foo/bar foo
-
-ok 34 - D/F conflict prevents indirect delete long packed + indirect add short
-
-expecting success: 
-	prefix=refs/missing-update &&
-	cat >expected <<-EOF &&
-	fatal: cannot lock ref $Q$prefix/foo$Q: unable to resolve reference $Q$prefix/foo$Q
-	EOF
-	printf "%s\n" "update $prefix/foo $E $D" |
-	test_must_fail git update-ref --stdin 2>output.err &&
-	test_cmp expected output.err
-
-ok 35 - missing old value blocks update
-
-expecting success: 
-	prefix=refs/incorrect-update &&
-	git update-ref $prefix/foo $C &&
-	cat >expected <<-EOF &&
-	fatal: cannot lock ref $Q$prefix/foo$Q: 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
-
-ok 36 - incorrect old value blocks update
-
-expecting success: 
-	prefix=refs/existing-create &&
-	git update-ref $prefix/foo $C &&
-	cat >expected <<-EOF &&
-	fatal: cannot lock ref $Q$prefix/foo$Q: 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
-
-ok 37 - existing old value blocks create
-
-expecting success: 
-	prefix=refs/incorrect-delete &&
-	git update-ref $prefix/foo $C &&
-	cat >expected <<-EOF &&
-	fatal: cannot lock ref $Q$prefix/foo$Q: 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
-
-ok 38 - incorrect old value blocks delete
-
-expecting success: 
-	prefix=refs/missing-indirect-update &&
-	git symbolic-ref $prefix/symref $prefix/foo &&
-	cat >expected <<-EOF &&
-	fatal: cannot lock ref $Q$prefix/symref$Q: unable to resolve reference $Q$prefix/foo$Q
-	EOF
-	printf "%s\n" "update $prefix/symref $E $D" |
-	test_must_fail git update-ref --stdin 2>output.err &&
-	test_cmp expected output.err
-
-ok 39 - missing old value blocks indirect update
-
-expecting success: 
-	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 $Q$prefix/symref$Q: 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
-
-ok 40 - incorrect old value blocks indirect update
-
-expecting success: 
-	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 $Q$prefix/symref$Q: 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
-
-ok 41 - existing old value blocks indirect create
-
-expecting success: 
-	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 $Q$prefix/symref$Q: 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
-
-ok 42 - incorrect old value blocks indirect delete
+ok 7 - ref^{/.}
 
 expecting success: 
-	prefix=refs/missing-noderef-update &&
-	git symbolic-ref $prefix/symref $prefix/foo &&
-	cat >expected <<-EOF &&
-	fatal: cannot lock ref $Q$prefix/symref$Q: 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
+	test_must_fail git rev-parse master^{/non-existent}
 
-ok 43 - missing old value blocks indirect no-deref update
+fatal: ambiguous argument 'master^{/non-existent}': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+master^{/non-existent}
+ok 8 - ref^{/non-existent}
 
 expecting success: 
-	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 $Q$prefix/symref$Q: 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
+	git rev-parse ref >expected &&
+	git rev-parse master^{/Initial} >actual &&
+	test_cmp expected actual
 
-ok 44 - incorrect old value blocks indirect no-deref update
+ok 9 - ref^{/Initial}
 
 expecting success: 
-	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 $Q$prefix/symref$Q: 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
+	test_must_fail git rev-parse master^{/!Exp}
 
-ok 45 - existing old value blocks indirect no-deref create
+fatal: ambiguous argument 'master^{/!Exp}': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+master^{/!Exp}
+ok 10 - ref^{/!Exp}
 
 expecting success: 
-	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 $Q$prefix/symref$Q: 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
+	test_must_fail git rev-parse master^{/!}
 
-ok 46 - incorrect old value blocks indirect no-deref delete
+fatal: ambiguous argument 'master^{/!}': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+master^{/!}
+ok 11 - ref^{/!}
 
 expecting success: 
-	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 $Q$prefix/foo$Q: there is a non-empty directory $Q.git/$prefix/foo$Q blocking reference $Q$prefix/foo$Q
-	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 $Q$prefix/foo$Q: unable to resolve reference $Q$prefix/foo$Q
-	EOF
-	printf "%s\n" "update $prefix/foo $D $C" |
-	test_must_fail git update-ref --stdin 2>output.err &&
-	test_cmp expected output.err
+	git rev-parse expref >expected &&
+	git rev-parse master^{/!!Exp} >actual &&
+	test_cmp expected actual
 
-ok 47 - non-empty directory blocks create
+ok 12 - ref^{/!!Exp}
 
 expecting success: 
-	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 $Q$prefix/foo$Q: unable to resolve reference $Q$prefix/foo$Q: 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 $Q$prefix/foo$Q: unable to resolve reference $Q$prefix/foo$Q: reference broken
-	EOF
-	printf "%s\n" "update $prefix/foo $D $C" |
-	test_must_fail git update-ref --stdin 2>output.err &&
-	test_cmp expected output.err
+	test_must_fail git rev-parse master^{/!-}
 
-ok 48 - broken reference blocks create
+fatal: ambiguous argument 'master^{/!-}': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+master^{/!-}
+ok 13 - ref^{/!-}
 
 expecting success: 
-	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 $Q$prefix/symref$Q: there is a non-empty directory $Q.git/$prefix/foo$Q blocking reference $Q$prefix/foo$Q
-	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 $Q$prefix/symref$Q: unable to resolve reference $Q$prefix/foo$Q
-	EOF
-	printf "%s\n" "update $prefix/symref $D $C" |
-	test_must_fail git update-ref --stdin 2>output.err &&
-	test_cmp expected output.err
+	test_must_fail git rev-parse master^{/!-.}
 
-ok 49 - non-empty directory blocks indirect create
+fatal: ambiguous argument 'master^{/!-.}': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+master^{/!-.}
+ok 14 - ref^{/!-.}
 
 expecting success: 
-	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 $Q$prefix/symref$Q: unable to resolve reference $Q$prefix/foo$Q: 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 $Q$prefix/symref$Q: unable to resolve reference $Q$prefix/foo$Q: 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
+	git rev-parse master >expected &&
+	git rev-parse master^{/!-non-existent} >actual &&
+	test_cmp expected actual
 
-ok 50 - broken reference blocks indirect create
+ok 15 - ref^{/!-non-existent}
 
 expecting success: 
-	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 &&
-	git for-each-ref $prefix >unchanged &&
-	# Now try to update the reference, but hold the `packed-refs` lock
-	# for a while to see what happens while the process is blocked:
-	: >.git/packed-refs.lock &&
-	test_when_finished "rm -f .git/packed-refs.lock" &&
-	{
-		# Note: the following command is intentionally run in the
-		# background. We increase the timeout so that `update-ref`
-		# attempts to acquire the `packed-refs` lock for much longer
-		# than it takes for us to do the check then delete it:
-		git -c core.packedrefstimeout=30000 update-ref -d $prefix/foo &
-	} &&
-	pid2=$! &&
-	# Give update-ref plenty of time to get to the point where it tries
-	# to lock packed-refs:
-	sleep 1 &&
-	# Make sure that update-ref did not complete despite the lock:
-	kill -0 $pid2 &&
-	# Verify that the reference still has its old value:
-	sha1=$(git rev-parse --verify --quiet $prefix/foo || echo undefined) &&
-	case "$sha1" in
-	$D)
-		# This is what we hope for; it means that nothing
-		# user-visible has changed yet.
-		: ;;
-	undefined)
-		# This is not correct; it means the deletion has happened
-		# already even though update-ref should not have been
-		# able to acquire the lock yet.
-		echo "$prefix/foo deleted prematurely" &&
-		break
-		;;
-	$C)
-		# This value should never be seen. Probably the loose
-		# reference has been deleted but the packed reference
-		# is still there:
-		echo "$prefix/foo incorrectly observed to be C" &&
-		break
-		;;
-	*)
-		# WTF?
-		echo "unexpected value observed for $prefix/foo: $sha1" &&
-		break
-		;;
-	esac >out &&
-	rm -f .git/packed-refs.lock &&
-	wait $pid2 &&
-	test_must_be_empty out &&
-	test_must_fail git rev-parse --verify --quiet $prefix/foo
+	git rev-parse expref >expected &&
+	git rev-parse master^{/!-Changed} >actual &&
+	test_cmp expected actual
 
-ok 51 - no bogus intermediate values during delete
+ok 16 - ref^{/!-Changed}
 
 expecting success: 
-	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_i18ngrep "Unable to create $Q.*packed-refs.lock$Q: File exists" err &&
-	test_cmp unchanged actual
+	git rev-parse modref >expected &&
+	git rev-parse expref^{/!-!Exp} >actual &&
+	test_cmp expected actual
 
-error: Unable to create '/build/git-2.20.1/t/trash directory.t1404-update-ref-errors/.git/packed-refs.lock': File exists.
-ok 52 - delete fails cleanly if packed-refs file is locked
+ok 17 - ref^{/!-!Exp}
 
-# passed all 52 test(s)
-1..52
+# passed all 17 test(s)
+1..17
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
 *** t1508-at-combinations.sh ***
@@ -34068,373 +33970,739 @@
 1..33
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t1515-rev-parse-outside-repo.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1515-rev-parse-outside-repo/.git/
+*** t1513-rev-parse-prefix.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1513-rev-parse-prefix/.git/
 expecting success: 
-	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
+	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
 
-fatal: not a git repository (or any of the parent directories): .git
-ok 1 - set up non-repo directory
+[master (root-commit) 966ee45] 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: 
-	dump_args "$tricky" easy >expect &&
-	eval "dump_args $(git rev-parse --sq-quote "$tricky" easy)" >actual &&
-	test_cmp expect actual
+	git rev-parse --prefix "" -- top sub1/file1 >actual &&
+	cat <<-\EOF >expected &&
+	--
+	top
+	sub1/file1
+	EOF
+	test_cmp expected actual
 
-ok 2 - rev-parse --sq-quote
+ok 2 - empty prefix -- file
 
 expecting success: 
-	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 rev-parse --prefix sub1/ -- file1 sub2/file2 >actual &&
+	cat <<-\EOF >expected &&
+	--
+	sub1/file1
+	sub1/sub2/file2
+	EOF
+	test_cmp expected actual
 
-GIT_DIR
-ok 3 - rev-parse --local-env-vars
+ok 3 - valid prefix -- file
 
 expecting success: 
-	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
+	git rev-parse --prefix sub1/ -- ../top sub2/file2 >actual &&
+	cat <<-\EOF >expected &&
+	--
+	sub1/../top
+	sub1/sub2/file2
+	EOF
+	test_cmp expected actual
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1515-rev-parse-outside-repo/non-repo/repo/
-fatal: not a gitdir '.'
-ok 4 - rev-parse --resolve-git-dir
+ok 4 - valid prefix -- ../file
 
-# passed all 4 test(s)
-1..4
+expecting success: 
+	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: 
+	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: 
+	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: 
+	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: 
+	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: 
+	git rev-parse --prefix sub1/ master file1 >actual &&
+	cat <<-EOF >expected &&
+	$(git rev-parse master)
+	sub1/file1
+	EOF
+	test_cmp expected actual
+
+ok 10 - file and refs with prefix
+
+expecting success: 
+	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/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t1511-rev-parse-caret.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1511-rev-parse-caret/.git/
+*** t1404-update-ref-errors.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1404-update-ref-errors/.git/
 expecting success: 
-	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 master &&
-	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
 
-[master (root-commit) e8de2a2] 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 'master'
-[master 9840ac0] Modified
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[master b634fc5] !Exp
+	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)
+
+[master (root-commit) d6fd4bb] Initial
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[master cca8114] Changed
+[master 1db882d] Second
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[master 3f965b9] Changed-again
+[master ca1e3ca] Third
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
 ok 1 - setup
 
 expecting success: 
-	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}
+	prefix=refs/1l &&
+	test_update_rejected "a c e" false "b c/x d" \
+		"$Q$prefix/c$Q exists; cannot create $Q$prefix/c/x$Q"
+
+
+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: 
-	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^{}
+	prefix=refs/1p &&
+	test_update_rejected "a c e" true "b c/x d" \
+		"$Q$prefix/c$Q exists; cannot create $Q$prefix/c/x$Q"
+
+
+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: 
-	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}
+	prefix=refs/2l &&
+	test_update_rejected "a c e" false "b c/x/y d" \
+		"$Q$prefix/c$Q exists; cannot create $Q$prefix/c/x/y$Q"
+
+
+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: 
-	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}
+	prefix=refs/2p &&
+	test_update_rejected "a c e" true "b c/x/y d" \
+		"$Q$prefix/c$Q exists; cannot create $Q$prefix/c/x/y$Q"
+
+
+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: 
-	test_must_fail git rev-parse HEAD^{tag} &&
-	git rev-parse commit-tag >expected &&
-	git rev-parse commit-tag^{tag} >actual &&
+
+	prefix=refs/3l &&
+	test_update_rejected "a c/x e" false "b c d" \
+		"$Q$prefix/c/x$Q exists; cannot create $Q$prefix/c$Q"
+
+
+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: 
+
+	prefix=refs/3p &&
+	test_update_rejected "a c/x e" true "b c d" \
+		"$Q$prefix/c/x$Q exists; cannot create $Q$prefix/c$Q"
+
+
+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: 
+
+	prefix=refs/4l &&
+	test_update_rejected "a c/x/y e" false "b c d" \
+		"$Q$prefix/c/x/y$Q exists; cannot create $Q$prefix/c$Q"
+
+
+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: 
+
+	prefix=refs/4p &&
+	test_update_rejected "a c/x/y e" true "b c d" \
+		"$Q$prefix/c/x/y$Q exists; cannot create $Q$prefix/c$Q"
+
+
+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: 
+
+	prefix=refs/5 &&
+	test_update_rejected "a e" false "b c c/x d" \
+		"cannot process $Q$prefix/c$Q and $Q$prefix/c/x$Q at the same time"
+
+
+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: 
+	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
 
-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}
+ok 11 - empty directory should not fool rev-parse
 
 expecting success: 
-	git rev-parse master >expected &&
-	git rev-parse master^{/.} >actual &&
+	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 7 - ref^{/.}
+ok 12 - empty directory should not fool for-each-ref
 
 expecting success: 
-	test_must_fail git rev-parse master^{/non-existent}
+	prefix=refs/e-create &&
+	mkdir -p .git/$prefix/foo/bar/baz &&
+	printf "create %s $C\n" $prefix/foo |
+	git update-ref --stdin
 
-fatal: ambiguous argument 'master^{/non-existent}': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-master^{/non-existent}
-ok 8 - ref^{/non-existent}
+ok 13 - empty directory should not fool create
 
 expecting success: 
-	git rev-parse ref >expected &&
-	git rev-parse master^{/Initial} >actual &&
-	test_cmp expected actual
+	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 9 - ref^{/Initial}
+ok 14 - empty directory should not fool verify
 
 expecting success: 
-	test_must_fail git rev-parse master^{/!Exp}
+	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
 
-fatal: ambiguous argument 'master^{/!Exp}': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-master^{/!Exp}
-ok 10 - ref^{/!Exp}
+ok 15 - empty directory should not fool 1-arg update
 
 expecting success: 
-	test_must_fail git rev-parse master^{/!}
+	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
 
-fatal: ambiguous argument 'master^{/!}': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-master^{/!}
-ok 11 - ref^{/!}
+ok 16 - empty directory should not fool 2-arg update
 
 expecting success: 
-	git rev-parse expref >expected &&
-	git rev-parse master^{/!!Exp} >actual &&
-	test_cmp expected actual
+	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 12 - ref^{/!!Exp}
+ok 17 - empty directory should not fool 0-arg delete
 
 expecting success: 
-	test_must_fail git rev-parse master^{/!-}
+	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
 
-fatal: ambiguous argument 'master^{/!-}': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-master^{/!-}
-ok 13 - ref^{/!-}
+ok 18 - empty directory should not fool 1-arg delete
 
 expecting success: 
-	test_must_fail git rev-parse master^{/!-.}
+	df_test refs/df-al-ds --add-del foo/bar foo
 
-fatal: ambiguous argument 'master^{/!-.}': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-master^{/!-.}
-ok 14 - ref^{/!-.}
+ok 19 - D/F conflict prevents add long + delete short
 
 expecting success: 
-	git rev-parse master >expected &&
-	git rev-parse master^{/!-non-existent} >actual &&
-	test_cmp expected actual
+	df_test refs/df-as-dl --add-del foo foo/bar
 
-ok 15 - ref^{/!-non-existent}
+ok 20 - D/F conflict prevents add short + delete long
 
 expecting success: 
-	git rev-parse expref >expected &&
-	git rev-parse master^{/!-Changed} >actual &&
-	test_cmp expected actual
+	df_test refs/df-dl-as --del-add foo/bar foo
 
-ok 16 - ref^{/!-Changed}
+ok 21 - D/F conflict prevents delete long + add short
 
 expecting success: 
-	git rev-parse modref >expected &&
-	git rev-parse expref^{/!-!Exp} >actual &&
-	test_cmp expected actual
+	df_test refs/df-ds-al --del-add foo foo/bar
 
-ok 17 - ref^{/!-!Exp}
+ok 22 - D/F conflict prevents delete short + add long
 
-# passed all 17 test(s)
-1..17
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t1513-rev-parse-prefix.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1513-rev-parse-prefix/.git/
 expecting success: 
-	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
+	df_test refs/df-al-dsp --pack --add-del foo/bar foo
 
-[master (root-commit) adfabc0] 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
+ok 23 - D/F conflict prevents add long + delete short packed
 
 expecting success: 
-	git rev-parse --prefix "" -- top sub1/file1 >actual &&
-	cat <<-\EOF >expected &&
-	--
-	top
-	sub1/file1
+	df_test refs/df-as-dlp --pack --add-del foo foo/bar
+
+ok 24 - D/F conflict prevents add short + delete long packed
+
+expecting success: 
+	df_test refs/df-dlp-as --pack --del-add foo/bar foo
+
+ok 25 - D/F conflict prevents delete long packed + add short
+
+expecting success: 
+	df_test refs/df-dsp-al --pack --del-add foo foo/bar
+
+ok 26 - D/F conflict prevents delete short packed + add long
+
+expecting success: 
+	df_test refs/df-ial-ds --sym-add --add-del foo/bar foo
+
+ok 27 - D/F conflict prevents indirect add long + delete short
+
+expecting success: 
+	df_test refs/df-ial-ids --sym-add --sym-del --add-del foo/bar foo
+
+ok 28 - D/F conflict prevents indirect add long + indirect delete short
+
+expecting success: 
+	df_test refs/df-ias-idl --sym-add --sym-del --add-del foo foo/bar
+
+ok 29 - D/F conflict prevents indirect add short + indirect delete long
+
+expecting success: 
+	df_test refs/df-idl-ias --sym-add --sym-del --del-add foo/bar foo
+
+ok 30 - D/F conflict prevents indirect delete long + indirect add short
+
+expecting success: 
+	df_test refs/df-ial-dsp --sym-add --pack --add-del foo/bar foo
+
+ok 31 - D/F conflict prevents indirect add long + delete short packed
+
+expecting success: 
+	df_test refs/df-ial-idsp --sym-add --sym-del --pack --add-del foo/bar foo
+
+ok 32 - D/F conflict prevents indirect add long + indirect delete short packed
+
+expecting success: 
+	df_test refs/df-al-idsp --sym-del --pack --add-del foo/bar foo
+
+ok 33 - D/F conflict prevents add long + indirect delete short packed
+
+expecting success: 
+	df_test refs/df-idlp-ias --sym-add --sym-del --pack --del-add foo/bar foo
+
+ok 34 - D/F conflict prevents indirect delete long packed + indirect add short
+
+expecting success: 
+	prefix=refs/missing-update &&
+	cat >expected <<-EOF &&
+	fatal: cannot lock ref $Q$prefix/foo$Q: unable to resolve reference $Q$prefix/foo$Q
 	EOF
-	test_cmp expected actual
+	printf "%s\n" "update $prefix/foo $E $D" |
+	test_must_fail git update-ref --stdin 2>output.err &&
+	test_cmp expected output.err
 
-ok 2 - empty prefix -- file
+ok 35 - missing old value blocks update
 
 expecting success: 
-	git rev-parse --prefix sub1/ -- file1 sub2/file2 >actual &&
-	cat <<-\EOF >expected &&
-	--
-	sub1/file1
-	sub1/sub2/file2
+	prefix=refs/incorrect-update &&
+	git update-ref $prefix/foo $C &&
+	cat >expected <<-EOF &&
+	fatal: cannot lock ref $Q$prefix/foo$Q: is at $C but expected $D
 	EOF
-	test_cmp expected actual
+	printf "%s\n" "update $prefix/foo $E $D" |
+	test_must_fail git update-ref --stdin 2>output.err &&
+	test_cmp expected output.err
 
-ok 3 - valid prefix -- file
+ok 36 - incorrect old value blocks update
 
 expecting success: 
-	git rev-parse --prefix sub1/ -- ../top sub2/file2 >actual &&
-	cat <<-\EOF >expected &&
-	--
-	sub1/../top
-	sub1/sub2/file2
+	prefix=refs/existing-create &&
+	git update-ref $prefix/foo $C &&
+	cat >expected <<-EOF &&
+	fatal: cannot lock ref $Q$prefix/foo$Q: reference already exists
 	EOF
-	test_cmp expected actual
+	printf "%s\n" "create $prefix/foo $E" |
+	test_must_fail git update-ref --stdin 2>output.err &&
+	test_cmp expected output.err
 
-ok 4 - valid prefix -- ../file
+ok 37 - existing old value blocks create
 
 expecting success: 
-	git rev-parse --prefix "" HEAD:./top >actual &&
-	git rev-parse HEAD:top >expected &&
-	test_cmp expected actual
+	prefix=refs/incorrect-delete &&
+	git update-ref $prefix/foo $C &&
+	cat >expected <<-EOF &&
+	fatal: cannot lock ref $Q$prefix/foo$Q: 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
 
-ok 5 - empty prefix HEAD:./path
+ok 38 - incorrect old value blocks delete
 
 expecting success: 
-	git rev-parse --prefix sub1/ HEAD:./file1 >actual &&
-	git rev-parse HEAD:sub1/file1 >expected &&
-	test_cmp expected actual
+	prefix=refs/missing-indirect-update &&
+	git symbolic-ref $prefix/symref $prefix/foo &&
+	cat >expected <<-EOF &&
+	fatal: cannot lock ref $Q$prefix/symref$Q: unable to resolve reference $Q$prefix/foo$Q
+	EOF
+	printf "%s\n" "update $prefix/symref $E $D" |
+	test_must_fail git update-ref --stdin 2>output.err &&
+	test_cmp expected output.err
 
-ok 6 - valid prefix HEAD:./path
+ok 39 - missing old value blocks indirect update
 
 expecting success: 
-	git rev-parse --prefix sub1/ HEAD:../top >actual &&
-	git rev-parse HEAD:top >expected &&
-	test_cmp expected actual
+	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 $Q$prefix/symref$Q: 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
 
-ok 7 - valid prefix HEAD:../path
+ok 40 - incorrect old value blocks indirect update
 
 expecting success: 
-	git rev-parse --prefix sub1/ HEAD:top >actual &&
-	git rev-parse HEAD:top >expected &&
-	test_cmp expected actual
+	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 $Q$prefix/symref$Q: 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
 
-ok 8 - prefix ignored with HEAD:top
+ok 41 - existing old value blocks indirect create
 
 expecting success: 
-	git rev-parse --prefix sub1/ file1 >actual &&
-	cat <<-\EOF >expected &&
-	sub1/file1
+	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 $Q$prefix/symref$Q: is at $C but expected $D
 	EOF
-	test_cmp expected actual
+	printf "%s\n" "delete $prefix/symref $D" |
+	test_must_fail git update-ref --stdin 2>output.err &&
+	test_cmp expected output.err
 
-ok 9 - disambiguate path with valid prefix
+ok 42 - incorrect old value blocks indirect delete
 
 expecting success: 
-	git rev-parse --prefix sub1/ master file1 >actual &&
-	cat <<-EOF >expected &&
-	$(git rev-parse master)
-	sub1/file1
+	prefix=refs/missing-noderef-update &&
+	git symbolic-ref $prefix/symref $prefix/foo &&
+	cat >expected <<-EOF &&
+	fatal: cannot lock ref $Q$prefix/symref$Q: reference is missing but expected $D
 	EOF
-	test_cmp expected actual
+	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
 
-ok 10 - file and refs with prefix
+ok 43 - missing old value blocks indirect no-deref update
 
 expecting success: 
-	git rev-parse --prefix sub1/sub2/ -- file2 >actual &&
-	cat <<-\EOF >expected &&
-	--
-	sub1/sub2/file2
+	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 $Q$prefix/symref$Q: is at $C but expected $D
 	EOF
-	test_cmp expected actual
+	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
 
-ok 11 - two-levels deep
+ok 44 - incorrect old value blocks indirect no-deref update
 
-# passed all 11 test(s)
-1..11
+expecting success: 
+	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 $Q$prefix/symref$Q: 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
+
+ok 45 - existing old value blocks indirect no-deref create
+
+expecting success: 
+	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 $Q$prefix/symref$Q: 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
+
+ok 46 - incorrect old value blocks indirect no-deref delete
+
+expecting success: 
+	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 $Q$prefix/foo$Q: there is a non-empty directory $Q.git/$prefix/foo$Q blocking reference $Q$prefix/foo$Q
+	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 $Q$prefix/foo$Q: unable to resolve reference $Q$prefix/foo$Q
+	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 47 - non-empty directory blocks create
+
+expecting success: 
+	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 $Q$prefix/foo$Q: unable to resolve reference $Q$prefix/foo$Q: 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 $Q$prefix/foo$Q: unable to resolve reference $Q$prefix/foo$Q: 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 48 - broken reference blocks create
+
+expecting success: 
+	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 $Q$prefix/symref$Q: there is a non-empty directory $Q.git/$prefix/foo$Q blocking reference $Q$prefix/foo$Q
+	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 $Q$prefix/symref$Q: unable to resolve reference $Q$prefix/foo$Q
+	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 49 - non-empty directory blocks indirect create
+
+expecting success: 
+	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 $Q$prefix/symref$Q: unable to resolve reference $Q$prefix/foo$Q: 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 $Q$prefix/symref$Q: unable to resolve reference $Q$prefix/foo$Q: 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 50 - broken reference blocks indirect create
+
+expecting success: 
+	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 &&
+	git for-each-ref $prefix >unchanged &&
+	# 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 51 - no bogus intermediate values during delete
+
+expecting success: 
+	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_i18ngrep "Unable to create $Q.*packed-refs.lock$Q: File exists" err &&
+	test_cmp unchanged actual
+
+error: Unable to create '/build/git-2.20.1/t/trash directory.t1404-update-ref-errors/.git/packed-refs.lock': File exists.
+ok 52 - delete fails cleanly if packed-refs file is locked
+
+# passed all 52 test(s)
+1..52
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t1515-rev-parse-outside-repo.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1515-rev-parse-outside-repo/.git/
+expecting success: 
+	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: 
+	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: 
+	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: 
+	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/git-2.20.1/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/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
 *** t1601-index-bogus.sh ***
@@ -34470,6 +34738,86 @@
 1..4
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
+*** t1600-index.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1600-index/.git/
+expecting success: 
+	echo 1 >a
+
+ok 1 - setup
+
+expecting success: 
+	(
+		rm -f .git/index &&
+		GIT_INDEX_VERSION=2bogus &&
+		export GIT_INDEX_VERSION &&
+		git add a 2>&1 | sed "s/[0-9]//" >actual.err &&
+		sed -e "s/ Z$/ /" <<-\EOF >expect.err &&
+			warning: GIT_INDEX_VERSION set, but the value is invalid.
+			Using version Z
+		EOF
+		test_i18ncmp expect.err actual.err
+	)
+
+ok 2 - bogus GIT_INDEX_VERSION issues warning
+
+expecting success: 
+	(
+		rm -f .git/index &&
+		GIT_INDEX_VERSION=1 &&
+		export GIT_INDEX_VERSION &&
+		git add a 2>&1 | sed "s/[0-9]//" >actual.err &&
+		sed -e "s/ Z$/ /" <<-\EOF >expect.err &&
+			warning: GIT_INDEX_VERSION set, but the value is invalid.
+			Using version Z
+		EOF
+		test_i18ncmp expect.err actual.err
+	)
+
+ok 3 - out of bounds GIT_INDEX_VERSION issues warning
+
+expecting success: 
+	(
+		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: 
+	(
+		sane_unset GIT_INDEX_VERSION &&
+		rm -f .git/index &&
+		git config --add index.version 1 &&
+		git add a 2>&1 | sed "s/[0-9]//" >actual.err &&
+		sed -e "s/ Z$/ /" <<-\EOF >expect.err &&
+			warning: index.version set, but the value is invalid.
+			Using version Z
+		EOF
+		test_i18ncmp expect.err actual.err
+	)
+
+ok 5 - out of bounds index.version issues warning
+
+expecting success: 
+	(
+		rm -f .git/index &&
+		GIT_INDEX_VERSION=4 &&
+		export GIT_INDEX_VERSION &&
+		git config --add index.version 2 &&
+		git add a 2>&1 &&
+		echo 4 >expect &&
+		test-tool index-version <.git/index >actual &&
+		test_cmp expect actual
+	)
+
+ok 6 - GIT_INDEX_VERSION takes precedence over config
+
+# passed all 6 test(s)
+1..6
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
 *** t1507-rev-parse-upstream.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1507-rev-parse-upstream/.git/
 expecting success: 
@@ -34820,113 +35168,6 @@
 1..28
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t1600-index.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1600-index/.git/
-expecting success: 
-	echo 1 >a
-
-ok 1 - setup
-
-expecting success: 
-	(
-		rm -f .git/index &&
-		GIT_INDEX_VERSION=2bogus &&
-		export GIT_INDEX_VERSION &&
-		git add a 2>&1 | sed "s/[0-9]//" >actual.err &&
-		sed -e "s/ Z$/ /" <<-\EOF >expect.err &&
-			warning: GIT_INDEX_VERSION set, but the value is invalid.
-			Using version Z
-		EOF
-		test_i18ncmp expect.err actual.err
-	)
-
-ok 2 - bogus GIT_INDEX_VERSION issues warning
-
-expecting success: 
-	(
-		rm -f .git/index &&
-		GIT_INDEX_VERSION=1 &&
-		export GIT_INDEX_VERSION &&
-		git add a 2>&1 | sed "s/[0-9]//" >actual.err &&
-		sed -e "s/ Z$/ /" <<-\EOF >expect.err &&
-			warning: GIT_INDEX_VERSION set, but the value is invalid.
-			Using version Z
-		EOF
-		test_i18ncmp expect.err actual.err
-	)
-
-ok 3 - out of bounds GIT_INDEX_VERSION issues warning
-
-expecting success: 
-	(
-		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: 
-	(
-		sane_unset GIT_INDEX_VERSION &&
-		rm -f .git/index &&
-		git config --add index.version 1 &&
-		git add a 2>&1 | sed "s/[0-9]//" >actual.err &&
-		sed -e "s/ Z$/ /" <<-\EOF >expect.err &&
-			warning: index.version set, but the value is invalid.
-			Using version Z
-		EOF
-		test_i18ncmp expect.err actual.err
-	)
-
-ok 5 - out of bounds index.version issues warning
-
-expecting success: 
-	(
-		rm -f .git/index &&
-		GIT_INDEX_VERSION=4 &&
-		export GIT_INDEX_VERSION &&
-		git config --add index.version 2 &&
-		git add a 2>&1 &&
-		echo 4 >expect &&
-		test-tool index-version <.git/index >actual &&
-		test_cmp expect actual
-	)
-
-ok 6 - GIT_INDEX_VERSION takes precedence over config
-
-# passed all 6 test(s)
-1..6
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t2002-checkout-cache-u.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t2002-checkout-cache-u/.git/
-expecting success: 
-echo frotz >path0 &&
-git update-index --add path0 &&
-t=$(git write-tree)
-ok 1 - preparation
-
-expecting success: 
-rm -f path0 &&
-git read-tree $t &&
-git checkout-index -f -a &&
-test_must_fail git diff-files --exit-code
-:100644 100644 8e4020bb5a8d8c873b25de15933e75cc0fc275df 0000000000000000000000000000000000000000 M	path0
-ok 2 - without -u, git checkout-index smudges stat information.
-
-expecting success: 
-rm -f path0 &&
-git read-tree $t &&
-git checkout-index -u -f -a &&
-git diff-files --exit-code
-ok 3 - with -u, git checkout-index picks up stat information from new files.
-
-# passed all 3 test(s)
-1..3
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
 *** t1514-rev-parse-push.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1514-rev-parse-push/.git/
 expecting success: 
@@ -35039,6 +35280,33 @@
 1..9
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
+*** t2002-checkout-cache-u.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t2002-checkout-cache-u/.git/
+expecting success: 
+echo frotz >path0 &&
+git update-index --add path0 &&
+t=$(git write-tree)
+ok 1 - preparation
+
+expecting success: 
+rm -f path0 &&
+git read-tree $t &&
+git checkout-index -f -a &&
+test_must_fail git diff-files --exit-code
+:100644 100644 8e4020bb5a8d8c873b25de15933e75cc0fc275df 0000000000000000000000000000000000000000 M	path0
+ok 2 - without -u, git checkout-index smudges stat information.
+
+expecting success: 
+rm -f path0 &&
+git read-tree $t &&
+git checkout-index -u -f -a &&
+git diff-files --exit-code
+ok 3 - with -u, git checkout-index picks up stat information from new files.
+
+# passed all 3 test(s)
+1..3
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
 *** t2005-checkout-index-symlinks.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t2005-checkout-index-symlinks/.git/
 expecting success: 
@@ -35060,6 +35328,33 @@
 1..3
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
+*** t2006-checkout-index-basic.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t2006-checkout-index-basic/.git/
+expecting success: 
+	test_expect_code 129 git checkout-index --gobbledegook 2>err &&
+	test_i18ngrep "[Uu]sage" err
+
+usage: git checkout-index [<options>] [--] [<file>...]
+ok 1 - checkout-index --gobbledegook
+
+expecting success: 
+	mkdir broken &&
+	(
+		cd broken &&
+		git init &&
+		>.git/index &&
+		test_expect_code 129 git checkout-index -h >usage 2>&1
+	) &&
+	test_i18ngrep "[Uu]sage" broken/usage
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t2006-checkout-index-basic/broken/.git/
+usage: git checkout-index [<options>] [--] [<file>...]
+ok 2 - checkout-index -h in broken repository
+
+# passed all 2 test(s)
+1..2
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
 *** t2000-conflict-when-checking-files-out.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t2000-conflict-when-checking-files-out/.git/
 expecting success: git update-index --add path0 path1/file1
@@ -36437,6 +36732,87 @@
 1..66
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
+*** t2007-checkout-symlink.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t2007-checkout-symlink/.git/
+expecting success: 
+
+	mkdir frotz &&
+	echo hello >frotz/filfre &&
+	git add frotz/filfre &&
+	test_tick &&
+	git commit -m "master has file frotz/filfre" &&
+
+	git branch side &&
+
+	echo goodbye >nitfol &&
+	git add nitfol &&
+	test_tick &&
+	git commit -m "master 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/"
+
+
+[master (root-commit) f92d3a8] master has file frotz/filfre
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 frotz/filfre
+[master ed594a0] master 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" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
+	# test whether the filesystem supports symbolic links
+	ln -s x y && test -h y
+
+)
+prerequisite SYMLINKS ok
+[side 1502bd7] 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: 
+
+	git checkout master
+
+
+Switched to branch 'master'
+ok 2 - switch from symlink to dir
+
+expecting success: 
+	rm -fr frotz xyzzy nitfol &&
+	git checkout -f master
+
+Already on 'master'
+ok 3 - Remove temporary directories & switch to master
+
+expecting success: 
+
+	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/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
 *** t2003-checkout-cache-mkdir.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t2003-checkout-cache-mkdir/.git/
 expecting success: 
@@ -36567,31 +36943,69 @@
 1..10
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t2006-checkout-index-basic.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t2006-checkout-index-basic/.git/
+*** t2009-checkout-statinfo.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t2009-checkout-statinfo/.git/
 expecting success: 
-	test_expect_code 129 git checkout-index --gobbledegook 2>err &&
-	test_i18ngrep "[Uu]sage" err
 
-usage: git checkout-index [<options>] [--] [<file>...]
-ok 1 - checkout-index --gobbledegook
+	echo hello >world &&
+	git update-index --add world &&
+	git commit -m initial &&
+	git branch side &&
+	echo goodbye >world &&
+	git update-index --add world &&
+	git commit -m second
+
+
+[master (root-commit) ee65e1f] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 world
+[master 1f74d6f] second
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 1 - setup
 
 expecting success: 
-	mkdir broken &&
-	(
-		cd broken &&
-		git init &&
-		>.git/index &&
-		test_expect_code 129 git checkout-index -h >usage 2>&1
-	) &&
-	test_i18ngrep "[Uu]sage" broken/usage
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t2006-checkout-index-basic/broken/.git/
-usage: git checkout-index [<options>] [--] [<file>...]
-ok 2 - checkout-index -h in broken repository
+	git reset --hard &&
+	test "$(git diff-files --raw)" = "" &&
 
-# passed all 2 test(s)
-1..2
+	git checkout master &&
+	test "$(git diff-files --raw)" = "" &&
+
+	git checkout side &&
+	test "$(git diff-files --raw)" = "" &&
+
+	git checkout master &&
+	test "$(git diff-files --raw)" = ""
+
+
+HEAD is now at 1f74d6f second
+Already on 'master'
+Switched to branch 'side'
+Switched to branch 'master'
+ok 2 - branch switching
+
+expecting success: 
+
+	git reset --hard &&
+	test "$(git diff-files --raw)" = "" &&
+
+	git checkout master world &&
+	test "$(git diff-files --raw)" = "" &&
+
+	git checkout side world &&
+	test "$(git diff-files --raw)" = "" &&
+
+	git checkout master world &&
+	test "$(git diff-files --raw)" = ""
+
+
+HEAD is now at 1f74d6f second
+ok 3 - path checkout
+
+# passed all 3 test(s)
+1..3
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
 *** t1512-rev-parse-disambiguation.sh ***
@@ -37195,152 +37609,6 @@
 1..34
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t2007-checkout-symlink.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t2007-checkout-symlink/.git/
-expecting success: 
-
-	mkdir frotz &&
-	echo hello >frotz/filfre &&
-	git add frotz/filfre &&
-	test_tick &&
-	git commit -m "master has file frotz/filfre" &&
-
-	git branch side &&
-
-	echo goodbye >nitfol &&
-	git add nitfol &&
-	test_tick &&
-	git commit -m "master 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/"
-
-
-[master (root-commit) f92d3a8] master has file frotz/filfre
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 frotz/filfre
-[master ed594a0] master 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" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
-	# test whether the filesystem supports symbolic links
-	ln -s x y && test -h y
-
-)
-prerequisite SYMLINKS ok
-[side 1502bd7] 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: 
-
-	git checkout master
-
-
-Switched to branch 'master'
-ok 2 - switch from symlink to dir
-
-expecting success: 
-	rm -fr frotz xyzzy nitfol &&
-	git checkout -f master
-
-Already on 'master'
-ok 3 - Remove temporary directories & switch to master
-
-expecting success: 
-
-	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/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t2009-checkout-statinfo.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t2009-checkout-statinfo/.git/
-expecting success: 
-
-	echo hello >world &&
-	git update-index --add world &&
-	git commit -m initial &&
-	git branch side &&
-	echo goodbye >world &&
-	git update-index --add world &&
-	git commit -m second
-
-
-[master (root-commit) c70732b] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 world
-[master 779bac0] second
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 1 - setup
-
-expecting success: 
-
-	git reset --hard &&
-	test "$(git diff-files --raw)" = "" &&
-
-	git checkout master &&
-	test "$(git diff-files --raw)" = "" &&
-
-	git checkout side &&
-	test "$(git diff-files --raw)" = "" &&
-
-	git checkout master &&
-	test "$(git diff-files --raw)" = ""
-
-
-HEAD is now at 779bac0 second
-Already on 'master'
-Switched to branch 'side'
-Switched to branch 'master'
-ok 2 - branch switching
-
-expecting success: 
-
-	git reset --hard &&
-	test "$(git diff-files --raw)" = "" &&
-
-	git checkout master world &&
-	test "$(git diff-files --raw)" = "" &&
-
-	git checkout side world &&
-	test "$(git diff-files --raw)" = "" &&
-
-	git checkout master world &&
-	test "$(git diff-files --raw)" = ""
-
-
-HEAD is now at 779bac0 second
-ok 3 - path checkout
-
-# passed all 3 test(s)
-1..3
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
 *** t2008-checkout-subdir.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t2008-checkout-subdir/.git/
 expecting success: 
@@ -37435,6 +37703,47 @@
 1..9
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
+*** t2014-switch.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t2014-switch/.git/
+expecting success: 
+	echo Hello >file &&
+	git add file &&
+	test_tick &&
+	git commit -m V1 &&
+	echo Hello world >file &&
+	git add file &&
+	git checkout -b other
+
+[master (root-commit) 68a43dc] V1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+Switched to a new branch 'other'
+M	file
+ok 1 - setup
+
+expecting success: 
+	git diff --exit-code
+
+ok 2 - check all changes are staged
+
+expecting success: 
+	git commit -m V2
+
+[other c55967b] V2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 3 - second commit
+
+expecting success: 
+	git diff --cached --exit-code
+
+ok 4 - check
+
+# passed all 4 test(s)
+1..4
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
 *** t2010-checkout-ambiguous.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t2010-checkout-ambiguous/.git/
 expecting success: 
@@ -37444,7 +37753,7 @@
 	git commit -m initial &&
 	git branch world
 
-[master (root-commit) 1e988e4] initial
+[master (root-commit) f231293] initial
  Author: A U Thor <author@example.com>
  2 files changed, 2 insertions(+)
  create mode 100644 all
@@ -37525,6 +37834,426 @@
 1..10
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
+*** t2011-checkout-invalid-head.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t2011-checkout-invalid-head/.git/
+expecting success: 
+	echo hello >world &&
+	git add world &&
+	git commit -m initial
+
+[master (root-commit) ee67dd2] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 world
+ok 1 - setup
+
+expecting success: 
+	test_must_fail git checkout -b newbranch master^{tree}
+
+fatal: Cannot switch branch to a non-commit 'master^{tree}'
+ok 2 - checkout should not start branch from a tree
+
+expecting success: 
+	echo $ZERO_OID >.git/HEAD &&
+	git checkout master --
+
+Switched to branch 'master'
+ok 3 - checkout master from invalid HEAD
+
+expecting success: 
+	test_when_finished "rm -f .git/HEAD.lock" &&
+	>.git/HEAD.lock &&
+	test_must_fail git checkout -b other
+
+error: Unable to create '/build/git-2.20.1/t/trash directory.t2011-checkout-invalid-head/.git/HEAD.lock': File exists.
+
+Another git process seems to be running in this repository, e.g.
+an editor opened by 'git commit'. Please make sure all processes
+are terminated then try again. If it still fails, a git process
+may have crashed in this repository earlier:
+remove the file manually to continue.
+fatal: unable to update HEAD
+ok 4 - checkout notices failure to lock HEAD
+
+expecting success: 
+	git update-ref refs/heads/outer/inner master &&
+
+	# do not rely on symbolic-ref to get a known state,
+	# as it may use the same code we are testing
+	reset_to_df () {
+		echo "ref: refs/heads/outer" >.git/HEAD
+	}
+
+ok 5 - create ref directory/file conflict scenario
+
+expecting success: 
+	reset_to_df &&
+	git checkout master
+
+Switched to branch 'master'
+ok 6 - checkout away from d/f HEAD (unpacked, to branch)
+
+expecting success: 
+	reset_to_df &&
+	git checkout --detach master
+
+HEAD is now at ee67dd2 initial
+ok 7 - checkout away from d/f HEAD (unpacked, to detached)
+
+expecting success: 
+	git pack-refs --all --prune
+
+ok 8 - pack refs
+
+expecting success: 
+	reset_to_df &&
+	git checkout master
+
+Switched to branch 'master'
+ok 9 - checkout away from d/f HEAD (packed, to branch)
+
+expecting success: 
+	reset_to_df &&
+	git checkout --detach master
+
+HEAD is now at ee67dd2 initial
+ok 10 - checkout away from d/f HEAD (packed, to detached)
+
+# passed all 10 test(s)
+1..10
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t2015-checkout-unborn.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t2015-checkout-unborn/.git/
+expecting success: 
+	mkdir parent &&
+	(cd parent &&
+	 git init &&
+	 echo content >file &&
+	 git add file &&
+	 git commit -m base
+	) &&
+	git fetch parent master:origin
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t2015-checkout-unborn/parent/.git/
+[master (root-commit) edb8907] base
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+From parent
+ * [new branch]      master     -> origin
+ok 1 - setup
+
+expecting success: 
+	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: 
+	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: 
+	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: 
+	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: 
+	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/git-2.20.1/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/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t2004-checkout-cache-temp.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t2004-checkout-cache-temp/.git/
+expecting success: 
+	mkdir asubdir &&
+	echo tree1path0 >path0 &&
+	echo tree1path1 >path1 &&
+	echo tree1path3 >path3 &&
+	echo tree1path4 >path4 &&
+	echo tree1asubdir/path5 >asubdir/path5 &&
+	git update-index --add path0 path1 path3 path4 asubdir/path5 &&
+	t1=$(git write-tree) &&
+	rm -f path* .merge_* actual .git/index &&
+	echo tree2path0 >path0 &&
+	echo tree2path1 >path1 &&
+	echo tree2path2 >path2 &&
+	echo tree2path4 >path4 &&
+	git update-index --add path0 path1 path2 path4 &&
+	t2=$(git write-tree) &&
+	rm -f path* .merge_* actual .git/index &&
+	echo tree2path0 >path0 &&
+	echo tree3path1 >path1 &&
+	echo tree3path2 >path2 &&
+	echo tree3path3 >path3 &&
+	git update-index --add path0 path1 path2 path3 &&
+	t3=$(git write-tree)
+
+ok 1 - setup
+
+expecting success: 
+	rm -f path* .merge_* actual .git/index &&
+	git read-tree $t1 &&
+	git checkout-index --temp -- path1 >actual &&
+	test_line_count = 1 actual &&
+	test $(cut "-d	" -f2 actual) = path1 &&
+	p=$(cut "-d	" -f1 actual) &&
+	test -f $p &&
+	test $(cat $p) = tree1path1
+
+ok 2 - checkout one stage 0 to temporary file
+
+expecting success: 
+	rm -f path* .merge_* actual .git/index &&
+	git read-tree $t1 &&
+	git checkout-index -a --temp >actual &&
+	test_line_count = 5 actual &&
+	for f in path0 path1 path3 path4 asubdir/path5
+	do
+		test $(grep $f actual | cut "-d	" -f2) = $f &&
+		p=$(grep $f actual | cut "-d	" -f1) &&
+		test -f $p &&
+		test $(cat $p) = tree1$f
+	done
+
+ok 3 - checkout all stage 0 to temporary files
+
+expecting success: 
+	rm -f path* .merge_* actual .git/index &&
+	git read-tree -m $t1 $t2 $t3
+
+ok 4 - setup 3-way merge
+
+expecting success: 
+	rm -f path* .merge_* actual &&
+	git checkout-index --stage=2 --temp -- path1 >actual &&
+	test_line_count = 1 actual &&
+	test $(cut "-d	" -f2 actual) = path1 &&
+	p=$(cut "-d	" -f1 actual) &&
+	test -f $p &&
+	test $(cat $p) = tree2path1
+
+ok 5 - checkout one stage 2 to temporary file
+
+expecting success: 
+	rm -f path* .merge_* actual &&
+	git checkout-index --all --stage=2 --temp >actual &&
+	test_line_count = 3 actual &&
+	for f in path1 path2 path4
+	do
+		test $(grep $f actual | cut "-d	" -f2) = $f &&
+		p=$(grep $f actual | cut "-d	" -f1) &&
+		test -f $p &&
+		test $(cat $p) = tree2$f
+	done
+
+ok 6 - checkout all stage 2 to temporary files
+
+expecting success: 
+	rm -f path* .merge_* actual &&
+	git checkout-index --stage=all --temp -- path0 >actual &&
+	test_line_count = 0 actual
+
+git checkout-index: path0 does not exist at stage 4
+ok 7 - checkout all stages/one file to nothing
+
+expecting success: 
+	rm -f path* .merge_* actual &&
+	git checkout-index --stage=all --temp -- path1 >actual &&
+	test_line_count = 1 actual &&
+	test $(cut "-d	" -f2 actual) = path1 &&
+	cut "-d	" -f1 actual | (read s1 s2 s3 &&
+	test -f $s1 &&
+	test -f $s2 &&
+	test -f $s3 &&
+	test $(cat $s1) = tree1path1 &&
+	test $(cat $s2) = tree2path1 &&
+	test $(cat $s3) = tree3path1)
+
+ok 8 - checkout all stages/one file to temporary files
+
+expecting success: 
+	rm -f path* .merge_* actual &&
+	git checkout-index --stage=all --temp -- path2 >actual &&
+	test_line_count = 1 actual &&
+	test $(cut "-d	" -f2 actual) = path2 &&
+	cut "-d	" -f1 actual | (read s1 s2 s3 &&
+	test $s1 = . &&
+	test -f $s2 &&
+	test -f $s3 &&
+	test $(cat $s2) = tree2path2 &&
+	test $(cat $s3) = tree3path2)
+
+ok 9 - checkout some stages/one file to temporary files
+
+expecting success: 
+	rm -f path* .merge_* actual &&
+	git checkout-index -a --stage=all --temp >actual &&
+	test_line_count = 5 actual
+
+ok 10 - checkout all stages/all files to temporary files
+
+expecting success: 
+	test x$(grep path0 actual | cut "-d	" -f2) = x
+
+ok 11 - -- path0: no entry
+
+expecting success: 
+	test $(grep path1 actual | cut "-d	" -f2) = path1 &&
+	grep path1 actual | cut "-d	" -f1 | (read s1 s2 s3 &&
+	test -f $s1 &&
+	test -f $s2 &&
+	test -f $s3 &&
+	test $(cat $s1) = tree1path1 &&
+	test $(cat $s2) = tree2path1 &&
+	test $(cat $s3) = tree3path1)
+
+ok 12 - -- path1: all 3 stages
+
+expecting success: 
+	test $(grep path2 actual | cut "-d	" -f2) = path2 &&
+	grep path2 actual | cut "-d	" -f1 | (read s1 s2 s3 &&
+	test $s1 = . &&
+	test -f $s2 &&
+	test -f $s3 &&
+	test $(cat $s2) = tree2path2 &&
+	test $(cat $s3) = tree3path2)
+
+ok 13 - -- path2: no stage 1, have stage 2 and 3
+
+expecting success: 
+	test $(grep path3 actual | cut "-d	" -f2) = path3 &&
+	grep path3 actual | cut "-d	" -f1 | (read s1 s2 s3 &&
+	test -f $s1 &&
+	test $s2 = . &&
+	test -f $s3 &&
+	test $(cat $s1) = tree1path3 &&
+	test $(cat $s3) = tree3path3)
+
+ok 14 - -- path3: no stage 2, have stage 1 and 3
+
+expecting success: 
+	test $(grep path4 actual | cut "-d	" -f2) = path4 &&
+	grep path4 actual | cut "-d	" -f1 | (read s1 s2 s3 &&
+	test -f $s1 &&
+	test -f $s2 &&
+	test $s3 = . &&
+	test $(cat $s1) = tree1path4 &&
+	test $(cat $s2) = tree2path4)
+
+ok 15 - -- path4: no stage 3, have stage 1 and 3
+
+expecting success: 
+	test $(grep asubdir/path5 actual | cut "-d	" -f2) = asubdir/path5 &&
+	grep asubdir/path5 actual | cut "-d	" -f1 | (read s1 s2 s3 &&
+	test -f $s1 &&
+	test $s2 = . &&
+	test $s3 = . &&
+	test $(cat $s1) = tree1asubdir/path5)
+
+ok 16 - -- asubdir/path5: no stage 2 and 3 have stage 1
+
+expecting success: 
+	(
+		cd asubdir &&
+		git checkout-index -a --stage=all >actual &&
+		test_line_count = 1 actual &&
+		test $(grep path5 actual | cut "-d	" -f2) = path5 &&
+		grep path5 actual | cut "-d	" -f1 | (read s1 s2 s3 &&
+		test -f ../$s1 &&
+		test $s2 = . &&
+		test $s3 = . &&
+		test $(cat ../$s1) = tree1asubdir/path5)
+	)
+
+ok 17 - checkout --temp within subdir
+
+expecting success: 
+	rm -f path* .merge_* actual .git/index &&
+	test_ln_s_add path7 path6 &&
+	git checkout-index --temp -a >actual &&
+	test_line_count = 1 actual &&
+	test $(cut "-d	" -f2 actual) = path6 &&
+	p=$(cut "-d	" -f1 actual) &&
+	test -f $p &&
+	test $(cat $p) = path7
+
+checking prerequisite: SYMLINKS
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
+	# test whether the filesystem supports symbolic links
+	ln -s x y && test -h y
+
+)
+prerequisite SYMLINKS ok
+ok 18 - checkout --temp symlink
+
+expecting success: 
+	rm -f path* .merge_* actual .git/index &&
+	>path0123456789 &&
+	git update-index --add path0123456789 &&
+	(
+		cd asubdir &&
+		git checkout-index --temp -- ../path0123456789 >actual &&
+		test_line_count = 1 actual &&
+		test $(cut "-d	" -f2 actual) = ../path0123456789
+	)
+
+ok 19 - emit well-formed relative path
+
+# passed all 19 test(s)
+1..19
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
 *** t1300-config.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1300-config/.git/
 expecting success: 
@@ -38340,7 +39069,7 @@
 	test_must_fail git merge master
 
 fatal: Bad alias.split-cmdline-fix string: unclosed quote
-[master (root-commit) d9e1152] initial commit
+[master (root-commit) c31b7bb] initial commit
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 foo
@@ -39161,7 +39890,7 @@
 	git config --blob=master:"$CUSTOM_CONFIG_FILE" --show-origin --list >output &&
 	test_cmp expect output
 
-[master b5e72a3] new config file
+[master a187c9e] new config file
  Author: A U Thor <author@example.com>
  1 file changed, 2 insertions(+)
  create mode 100644 "file\" (dq) and spaces.conf"
@@ -39259,351 +39988,347 @@
 1..165
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t2014-switch.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t2014-switch/.git/
+*** t2019-checkout-ambiguous-ref.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t2019-checkout-ambiguous-ref/.git/
 expecting success: 
-	echo Hello >file &&
-	git add file &&
-	test_tick &&
-	git commit -m V1 &&
-	echo Hello world >file &&
-	git add file &&
-	git checkout -b other
+	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) 68a43dc] V1
+[master (root-commit) c291a6e] branch
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 file
-Switched to a new branch 'other'
-M	file
-ok 1 - setup
-
-expecting success: 
-	git diff --exit-code
-
-ok 2 - check all changes are staged
-
-expecting success: 
-	git commit -m V2
-
-[other c55967b] V2
+[master a40f7cf] tag
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-ok 3 - second commit
-
-expecting success: 
-	git diff --cached --exit-code
-
-ok 4 - check
-
-# passed all 4 test(s)
-1..4
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t2011-checkout-invalid-head.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t2011-checkout-invalid-head/.git/
-expecting success: 
-	echo hello >world &&
-	git add world &&
-	git commit -m initial
-
-[master (root-commit) c70732b] initial
+[master 3b61e26] other
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 world
-ok 1 - setup
-
-expecting success: 
-	test_must_fail git checkout -b newbranch master^{tree}
-
-fatal: Cannot switch branch to a non-commit 'master^{tree}'
-ok 2 - checkout should not start branch from a tree
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 1 - setup ambiguous refs
 
 expecting success: 
-	echo $ZERO_OID >.git/HEAD &&
-	git checkout master --
+	git checkout ambiguity >stdout 2>stderr
 
-Switched to branch 'master'
-ok 3 - checkout master from invalid HEAD
+ok 2 - checkout ambiguous ref succeeds
 
 expecting success: 
-	test_when_finished "rm -f .git/HEAD.lock" &&
-	>.git/HEAD.lock &&
-	test_must_fail git checkout -b other
-
-error: Unable to create '/build/git-2.20.1/t/trash directory.t2011-checkout-invalid-head/.git/HEAD.lock': File exists.
+	grep "warning.*ambiguous" stderr
 
-Another git process seems to be running in this repository, e.g.
-an editor opened by 'git commit'. Please make sure all processes
-are terminated then try again. If it still fails, a git process
-may have crashed in this repository earlier:
-remove the file manually to continue.
-fatal: unable to update HEAD
-ok 4 - checkout notices failure to lock HEAD
+warning: refname 'ambiguity' is ambiguous.
+ok 3 - checkout produces ambiguity warning
 
 expecting success: 
-	git update-ref refs/heads/outer/inner master &&
-
-	# do not rely on symbolic-ref to get a known state,
-	# as it may use the same code we are testing
-	reset_to_df () {
-		echo "ref: refs/heads/outer" >.git/HEAD
-	}
+	echo refs/heads/ambiguity >expect &&
+	git symbolic-ref HEAD >actual &&
+	test_cmp expect actual &&
+	echo branch >expect &&
+	test_cmp expect file
 
-ok 5 - create ref directory/file conflict scenario
+ok 4 - checkout chooses branch over tag
 
 expecting success: 
-	reset_to_df &&
-	git checkout master
+	test_i18ngrep "Switched to branch" stderr &&
+	test_i18ngrep ! "^HEAD is now at" stderr
 
-Switched to branch 'master'
-ok 6 - checkout away from d/f HEAD (unpacked, to branch)
+Switched to branch 'ambiguity'
+ok 5 - checkout reports switch to branch
 
 expecting success: 
-	reset_to_df &&
-	git checkout --detach master
+	git checkout vagueness >stdout 2>stderr &&
+	test_set_prereq VAGUENESS_SUCCESS
 
-HEAD is now at c70732b initial
-ok 7 - checkout away from d/f HEAD (unpacked, to detached)
+ok 6 - checkout vague ref succeeds
 
 expecting success: 
-	git pack-refs --all --prune
+	grep "warning.*ambiguous" stderr
 
-ok 8 - pack refs
+warning: refname 'vagueness' is ambiguous.
+ok 7 - checkout produces ambiguity warning
 
 expecting success: 
-	reset_to_df &&
-	git checkout master
+	echo refs/heads/vagueness >expect &&
+	git symbolic-ref HEAD >actual &&
+	test_cmp expect actual &&
+	echo branch >expect &&
+	test_cmp expect file
 
-Switched to branch 'master'
-ok 9 - checkout away from d/f HEAD (packed, to branch)
+ok 8 - checkout chooses branch over tag
 
 expecting success: 
-	reset_to_df &&
-	git checkout --detach master
+	test_i18ngrep "Switched to branch" stderr &&
+	test_i18ngrep ! "^HEAD is now at" stderr
 
-HEAD is now at c70732b initial
-ok 10 - checkout away from d/f HEAD (packed, to detached)
+Switched to branch 'vagueness'
+ok 9 - checkout reports switch to branch
 
-# passed all 10 test(s)
-1..10
+# passed all 9 test(s)
+1..9
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t2004-checkout-cache-temp.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t2004-checkout-cache-temp/.git/
+*** t2017-checkout-orphan.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t2017-checkout-orphan/.git/
 expecting success: 
-	mkdir asubdir &&
-	echo tree1path0 >path0 &&
-	echo tree1path1 >path1 &&
-	echo tree1path3 >path3 &&
-	echo tree1path4 >path4 &&
-	echo tree1asubdir/path5 >asubdir/path5 &&
-	git update-index --add path0 path1 path3 path4 asubdir/path5 &&
-	t1=$(git write-tree) &&
-	rm -f path* .merge_* actual .git/index &&
-	echo tree2path0 >path0 &&
-	echo tree2path1 >path1 &&
-	echo tree2path2 >path2 &&
-	echo tree2path4 >path4 &&
-	git update-index --add path0 path1 path2 path4 &&
-	t2=$(git write-tree) &&
-	rm -f path* .merge_* actual .git/index &&
-	echo tree2path0 >path0 &&
-	echo tree3path1 >path1 &&
-	echo tree3path2 >path2 &&
-	echo tree3path3 >path3 &&
-	git update-index --add path0 path1 path2 path3 &&
-	t3=$(git write-tree)
+	echo "Initial" >"$TEST_FILE" &&
+	git add "$TEST_FILE" &&
+	git commit -m "First Commit" &&
+	test_tick &&
+	echo "State 1" >>"$TEST_FILE" &&
+	git add "$TEST_FILE" &&
+	test_tick &&
+	git commit -m "Second Commit"
 
-ok 1 - setup
+[master (root-commit) 6c4f711] First Commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo
+[master ee2a00e] Second Commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 1 - Setup
 
 expecting success: 
-	rm -f path* .merge_* actual .git/index &&
-	git read-tree $t1 &&
-	git checkout-index --temp -- path1 >actual &&
-	test_line_count = 1 actual &&
-	test $(cut "-d	" -f2 actual) = path1 &&
-	p=$(cut "-d	" -f1 actual) &&
-	test -f $p &&
-	test $(cat $p) = tree1path1
+	git checkout --orphan alpha &&
+	test_must_fail git rev-parse --verify HEAD &&
+	test "refs/heads/alpha" = "$(git symbolic-ref HEAD)" &&
+	test_tick &&
+	git commit -m "Third Commit" &&
+	test_must_fail git rev-parse --verify HEAD^ &&
+	git diff-tree --quiet master alpha
 
-ok 2 - checkout one stage 0 to temporary file
+Switched to a new branch 'alpha'
+fatal: Needed a single revision
+[alpha (root-commit) 6f20c32] Third Commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 foo
+fatal: Needed a single revision
+ok 2 - --orphan creates a new orphan branch from HEAD
 
 expecting success: 
-	rm -f path* .merge_* actual .git/index &&
-	git read-tree $t1 &&
-	git checkout-index -a --temp >actual &&
-	test_line_count = 5 actual &&
-	for f in path0 path1 path3 path4 asubdir/path5
-	do
-		test $(grep $f actual | cut "-d	" -f2) = $f &&
-		p=$(grep $f actual | cut "-d	" -f1) &&
-		test -f $p &&
-		test $(cat $p) = tree1$f
-	done
+	git checkout master &&
+	git checkout --orphan beta master^ &&
+	test_must_fail git rev-parse --verify HEAD &&
+	test "refs/heads/beta" = "$(git symbolic-ref HEAD)" &&
+	test_tick &&
+	git commit -m "Fourth Commit" &&
+	test_must_fail git rev-parse --verify HEAD^ &&
+	git diff-tree --quiet master^ beta
 
-ok 3 - checkout all stage 0 to temporary files
+Switched to branch 'master'
+Switched to a new branch 'beta'
+fatal: Needed a single revision
+[beta (root-commit) 530edda] Fourth Commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo
+fatal: Needed a single revision
+ok 3 - --orphan creates a new orphan branch from <start_point>
 
 expecting success: 
-	rm -f path* .merge_* actual .git/index &&
-	git read-tree -m $t1 $t2 $t3
+	git checkout master &&
+	test_must_fail git checkout --orphan new -b newer &&
+	test refs/heads/master = "$(git symbolic-ref HEAD)"
 
-ok 4 - setup 3-way merge
+Switched to branch 'master'
+fatal: -b, -B and --orphan are mutually exclusive
+ok 4 - --orphan must be rejected with -b
 
 expecting success: 
-	rm -f path* .merge_* actual &&
-	git checkout-index --stage=2 --temp -- path1 >actual &&
-	test_line_count = 1 actual &&
-	test $(cut "-d	" -f2 actual) = path1 &&
-	p=$(cut "-d	" -f1 actual) &&
-	test -f $p &&
-	test $(cat $p) = tree2path1
+	git checkout master &&
+	test_must_fail git checkout --orphan new -t master &&
+	test refs/heads/master = "$(git symbolic-ref HEAD)"
 
-ok 5 - checkout one stage 2 to temporary file
+Already on 'master'
+fatal: '--orphan' cannot be used with '-t'
+ok 5 - --orphan must be rejected with -t
 
 expecting success: 
-	rm -f path* .merge_* actual &&
-	git checkout-index --all --stage=2 --temp >actual &&
-	test_line_count = 3 actual &&
-	for f in path1 path2 path4
-	do
-		test $(grep $f actual | cut "-d	" -f2) = $f &&
-		p=$(grep $f actual | cut "-d	" -f1) &&
-		test -f $p &&
-		test $(cat $p) = tree2$f
-	done
+	git checkout master &&
+	git config branch.autosetupmerge always &&
+	git checkout --orphan gamma &&
+	test -z "$(git config branch.gamma.merge)" &&
+	test refs/heads/gamma = "$(git symbolic-ref HEAD)" &&
+	test_must_fail git rev-parse --verify HEAD^
 
-ok 6 - checkout all stage 2 to temporary files
+Already on 'master'
+Switched to a new branch 'gamma'
+fatal: Needed a single revision
+ok 6 - --orphan ignores branch.autosetupmerge
 
 expecting success: 
-	rm -f path* .merge_* actual &&
-	git checkout-index --stage=all --temp -- path0 >actual &&
-	test_line_count = 0 actual
+	git checkout master &&
+	git config --unset core.logAllRefUpdates &&
+	git checkout --orphan delta &&
+	test_must_fail git rev-parse --verify delta@{0} &&
+	git commit -m Delta &&
+	git rev-parse --verify delta@{0}
 
-git checkout-index: path0 does not exist at stage 4
-ok 7 - checkout all stages/one file to nothing
+Switched to branch 'master'
+Switched to a new branch 'delta'
+fatal: Needed a single revision
+[delta (root-commit) 9beee35] Delta
+ Author: A U Thor <author@example.com>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 foo
+9beee35744aee191f8186ef0a6ab78f710cdd57c
+ok 7 - --orphan makes reflog by default
 
 expecting success: 
-	rm -f path* .merge_* actual &&
-	git checkout-index --stage=all --temp -- path1 >actual &&
-	test_line_count = 1 actual &&
-	test $(cut "-d	" -f2 actual) = path1 &&
-	cut "-d	" -f1 actual | (read s1 s2 s3 &&
-	test -f $s1 &&
-	test -f $s2 &&
-	test -f $s3 &&
-	test $(cat $s1) = tree1path1 &&
-	test $(cat $s2) = tree2path1 &&
-	test $(cat $s3) = tree3path1)
+	git checkout master &&
+	git config core.logAllRefUpdates false &&
+	git checkout --orphan epsilon &&
+	test_must_fail git rev-parse --verify epsilon@{0} &&
+	git commit -m Epsilon &&
+	test_must_fail git rev-parse --verify epsilon@{0}
 
-ok 8 - checkout all stages/one file to temporary files
+Switched to branch 'master'
+Switched to a new branch 'epsilon'
+fatal: Needed a single revision
+[epsilon (root-commit) c5e7701] Epsilon
+ Author: A U Thor <author@example.com>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 foo
+fatal: Needed a single revision
+ok 8 - --orphan does not make reflog when core.logAllRefUpdates = false
 
 expecting success: 
-	rm -f path* .merge_* actual &&
-	git checkout-index --stage=all --temp -- path2 >actual &&
-	test_line_count = 1 actual &&
-	test $(cut "-d	" -f2 actual) = path2 &&
-	cut "-d	" -f1 actual | (read s1 s2 s3 &&
-	test $s1 = . &&
-	test -f $s2 &&
-	test -f $s3 &&
-	test $(cat $s2) = tree2path2 &&
-	test $(cat $s3) = tree3path2)
+	git checkout master &&
+	git checkout -l --orphan zeta &&
+	test_must_fail git rev-parse --verify zeta@{0} &&
+	git commit -m Zeta &&
+	git rev-parse --verify zeta@{0}
 
-ok 9 - checkout some stages/one file to temporary files
+Switched to branch 'master'
+Switched to a new branch 'zeta'
+fatal: Needed a single revision
+[zeta (root-commit) 1b23595] Zeta
+ Author: A U Thor <author@example.com>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 foo
+1b235958474dccc5c8f228713c620d22e7d1825d
+ok 9 - --orphan with -l makes reflog when core.logAllRefUpdates = false
 
 expecting success: 
-	rm -f path* .merge_* actual &&
-	git checkout-index -a --stage=all --temp >actual &&
-	test_line_count = 5 actual
+	git checkout master &&
+	git checkout -l --orphan eta &&
+	test_must_fail git rev-parse --verify eta@{0} &&
+	git checkout master &&
+	test_must_fail git rev-parse --verify eta@{0}
 
-ok 10 - checkout all stages/all files to temporary files
+Switched to branch 'master'
+Switched to a new branch 'eta'
+fatal: Needed a single revision
+Switched to branch 'master'
+fatal: Needed a single revision
+ok 10 - giving up --orphan not committed when -l and core.logAllRefUpdates = false deletes reflog
 
 expecting success: 
-	test x$(grep path0 actual | cut "-d	" -f2) = x
+	git checkout master &&
+	test_must_fail git checkout --orphan master &&
+	test refs/heads/master = "$(git symbolic-ref HEAD)"
 
-ok 11 - -- path0: no entry
+Already on 'master'
+fatal: A branch named 'master' already exists.
+ok 11 - --orphan is rejected with an existing name
 
 expecting success: 
-	test $(grep path1 actual | cut "-d	" -f2) = path1 &&
-	grep path1 actual | cut "-d	" -f1 | (read s1 s2 s3 &&
-	test -f $s1 &&
-	test -f $s2 &&
-	test -f $s3 &&
-	test $(cat $s1) = tree1path1 &&
-	test $(cat $s2) = tree2path1 &&
-	test $(cat $s3) = tree3path1)
+	git checkout master &&
+	git reset --hard &&
+	echo local >>"$TEST_FILE" &&
+	cat "$TEST_FILE" >"$TEST_FILE.saved" &&
+	test_must_fail git checkout --orphan new master^ &&
+	test refs/heads/master = "$(git symbolic-ref HEAD)" &&
+	test_cmp "$TEST_FILE" "$TEST_FILE.saved" &&
+	git diff-index --quiet --cached HEAD &&
+	git reset --hard
 
-ok 12 - -- path1: all 3 stages
+Already on 'master'
+HEAD is now at ee2a00e Second Commit
+error: Your local changes to the following files would be overwritten by checkout:
+	foo
+Please commit your changes or stash them before you switch branches.
+Aborting
+HEAD is now at ee2a00e Second Commit
+ok 12 - --orphan refuses to switch if a merge is needed
 
 expecting success: 
-	test $(grep path2 actual | cut "-d	" -f2) = path2 &&
-	grep path2 actual | cut "-d	" -f1 | (read s1 s2 s3 &&
-	test $s1 = . &&
-	test -f $s2 &&
-	test -f $s3 &&
-	test $(cat $s2) = tree2path2 &&
-	test $(cat $s3) = tree3path2)
+	git checkout master &&
+	git checkout --orphan new &&
+	test_must_fail git checkout --detach
 
-ok 13 - -- path2: no stage 1, have stage 2 and 3
+Already on 'master'
+Switched to a new branch 'new'
+fatal: You are on a branch yet to be born
+ok 13 - cannot --detach on an unborn branch
 
+# passed all 13 test(s)
+1..13
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t2021-checkout-overwrite.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t2021-checkout-overwrite/.git/
 expecting success: 
-	test $(grep path3 actual | cut "-d	" -f2) = path3 &&
-	grep path3 actual | cut "-d	" -f1 | (read s1 s2 s3 &&
-	test -f $s1 &&
-	test $s2 = . &&
-	test -f $s3 &&
-	test $(cat $s1) = tree1path3 &&
-	test $(cat $s3) = tree3path3)
 
-ok 14 - -- path3: no stage 2, have stage 1 and 3
-
-expecting success: 
-	test $(grep path4 actual | cut "-d	" -f2) = path4 &&
-	grep path4 actual | cut "-d	" -f1 | (read s1 s2 s3 &&
-	test -f $s1 &&
-	test -f $s2 &&
-	test $s3 = . &&
-	test $(cat $s1) = tree1path4 &&
-	test $(cat $s2) = tree2path4)
+	mkdir -p a/b/c &&
+	>a/b/c/d &&
+	git add -A &&
+	git commit -m base &&
+	git tag start
 
-ok 15 - -- path4: no stage 3, have stage 1 and 3
+[master (root-commit) ce6ba3c] 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: 
-	test $(grep asubdir/path5 actual | cut "-d	" -f2) = asubdir/path5 &&
-	grep asubdir/path5 actual | cut "-d	" -f1 | (read s1 s2 s3 &&
-	test -f $s1 &&
-	test $s2 = . &&
-	test $s3 = . &&
-	test $(cat $s1) = tree1asubdir/path5)
 
-ok 16 - -- asubdir/path5: no stage 2 and 3 have stage 1
+	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 aba082f] 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: 
-	(
-		cd asubdir &&
-		git checkout-index -a --stage=all >actual &&
-		test_line_count = 1 actual &&
-		test $(grep path5 actual | cut "-d	" -f2) = path5 &&
-		grep path5 actual | cut "-d	" -f1 | (read s1 s2 s3 &&
-		test -f ../$s1 &&
-		test $s2 = . &&
-		test $s3 = . &&
-		test $(cat ../$s1) = tree1asubdir/path5)
-	)
 
-ok 17 - checkout --temp within subdir
+	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 0625520] 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: 
-	rm -f path* .merge_* actual .git/index &&
-	test_ln_s_add path7 path6 &&
-	git checkout-index --temp -a >actual &&
-	test_line_count = 1 actual &&
-	test $(cut "-d	" -f2 actual) = path6 &&
-	p=$(cut "-d	" -f1 actual) &&
-	test -f $p &&
-	test $(cat $p) = path7
 
+	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" &&
@@ -39614,194 +40339,40 @@
 
 )
 prerequisite SYMLINKS ok
-ok 18 - checkout --temp symlink
+[symlink 0e2ea2d] 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: 
-	rm -f path* .merge_* actual .git/index &&
-	>path0123456789 &&
-	git update-index --add path0123456789 &&
-	(
-		cd asubdir &&
-		git checkout-index --temp -- ../path0123456789 >actual &&
-		test_line_count = 1 actual &&
-		test $(cut "-d	" -f2 actual) = ../path0123456789
-	)
-
-ok 19 - emit well-formed relative path
 
-# passed all 19 test(s)
-1..19
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t2015-checkout-unborn.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t2015-checkout-unborn/.git/
-expecting success: 
-	mkdir parent &&
-	(cd parent &&
-	 git init &&
-	 echo content >file &&
-	 git add file &&
-	 git commit -m base
-	) &&
-	git fetch parent master:origin
+	git rm --cached a/b &&
+	git commit -m "un-track the symlink" &&
+	test_must_fail git checkout start
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t2015-checkout-unborn/parent/.git/
-[master (root-commit) a5712de] base
+rm 'a/b'
+[symlink 038e383] un-track the symlink
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-From parent
- * [new branch]      master     -> origin
-ok 1 - setup
-
-expecting success: 
-	echo precious >expect &&
-	echo precious >file &&
-	test_must_fail git checkout -b new origin &&
-	test_cmp expect file
-
+ 1 file changed, 1 deletion(-)
+ delete mode 120000 a/b
 error: The following untracked working tree files would be overwritten by checkout:
-	file
+	a/b
 Please move or remove them before you switch branches.
 Aborting
-ok 2 - checkout from unborn preserves untracked files
-
-expecting success: 
-	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: 
-	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
+ok 5 - checkout commit with dir must not remove untracked a/b
 
 expecting success: 
-	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: 
-	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
-	)
+	test -h a/b
 
-Initialized empty Git repository in /build/git-2.20.1/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
+ok 6 - the symlink remained
 
 # passed all 6 test(s)
 1..6
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t2019-checkout-ambiguous-ref.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t2019-checkout-ambiguous-ref/.git/
-expecting success: 
-	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: 
-	git checkout ambiguity >stdout 2>stderr
-
-ok 2 - checkout ambiguous ref succeeds
-
-expecting success: 
-	grep "warning.*ambiguous" stderr
-
-warning: refname 'ambiguity' is ambiguous.
-ok 3 - checkout produces ambiguity warning
-
-expecting success: 
-	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: 
-	test_i18ngrep "Switched to branch" stderr &&
-	test_i18ngrep ! "^HEAD is now at" stderr
-
-Switched to branch 'ambiguity'
-ok 5 - checkout reports switch to branch
-
-expecting success: 
-	git checkout vagueness >stdout 2>stderr &&
-	test_set_prereq VAGUENESS_SUCCESS
-
-ok 6 - checkout vague ref succeeds
-
-expecting success: 
-	grep "warning.*ambiguous" stderr
-
-warning: refname 'vagueness' is ambiguous.
-ok 7 - checkout produces ambiguity warning
-
-expecting success: 
-	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: 
-	test_i18ngrep "Switched to branch" stderr &&
-	test_i18ngrep ! "^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/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
 *** t1700-split-index.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1700-split-index/.git/
 expecting success: 
@@ -40341,7 +40912,7 @@
 	test_might_fail test-tool dump-cache-tree >cache-tree.out &&
 	test_line_count = 0 cache-tree.out
 
-[master (root-commit) e2a6b65] commit
+[master (root-commit) bdc8d4c] commit
  Author: A U Thor <author@example.com>
  15 files changed, 0 insertions(+), 0 deletions(-)
  create mode 100644 eight
@@ -40361,7 +40932,7 @@
  create mode 100644 two
 error: invalid object 160000 0000000000000000000000000000000000000000 for 'broken'
 warning: cache entry has null sha1: broken
-HEAD is now at 77ab0a8 add broken entry
+HEAD is now at 4ab426a add broken entry
 error: invalid object 160000 0000000000000000000000000000000000000000 for 'broken'
 ok 25 - writing split index with null sha1 does not write cache tree
 
@@ -40369,309 +40940,6 @@
 1..25
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t2017-checkout-orphan.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t2017-checkout-orphan/.git/
-expecting success: 
-	echo "Initial" >"$TEST_FILE" &&
-	git add "$TEST_FILE" &&
-	git commit -m "First Commit" &&
-	test_tick &&
-	echo "State 1" >>"$TEST_FILE" &&
-	git add "$TEST_FILE" &&
-	test_tick &&
-	git commit -m "Second Commit"
-
-[master (root-commit) 6eaf6a7] First Commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo
-[master 0f097f5] Second Commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 1 - Setup
-
-expecting success: 
-	git checkout --orphan alpha &&
-	test_must_fail git rev-parse --verify HEAD &&
-	test "refs/heads/alpha" = "$(git symbolic-ref HEAD)" &&
-	test_tick &&
-	git commit -m "Third Commit" &&
-	test_must_fail git rev-parse --verify HEAD^ &&
-	git diff-tree --quiet master alpha
-
-Switched to a new branch 'alpha'
-fatal: Needed a single revision
-[alpha (root-commit) 6f20c32] Third Commit
- Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+)
- create mode 100644 foo
-fatal: Needed a single revision
-ok 2 - --orphan creates a new orphan branch from HEAD
-
-expecting success: 
-	git checkout master &&
-	git checkout --orphan beta master^ &&
-	test_must_fail git rev-parse --verify HEAD &&
-	test "refs/heads/beta" = "$(git symbolic-ref HEAD)" &&
-	test_tick &&
-	git commit -m "Fourth Commit" &&
-	test_must_fail git rev-parse --verify HEAD^ &&
-	git diff-tree --quiet master^ beta
-
-Switched to branch 'master'
-Switched to a new branch 'beta'
-fatal: Needed a single revision
-[beta (root-commit) 530edda] Fourth Commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo
-fatal: Needed a single revision
-ok 3 - --orphan creates a new orphan branch from <start_point>
-
-expecting success: 
-	git checkout master &&
-	test_must_fail git checkout --orphan new -b newer &&
-	test refs/heads/master = "$(git symbolic-ref HEAD)"
-
-Switched to branch 'master'
-fatal: -b, -B and --orphan are mutually exclusive
-ok 4 - --orphan must be rejected with -b
-
-expecting success: 
-	git checkout master &&
-	test_must_fail git checkout --orphan new -t master &&
-	test refs/heads/master = "$(git symbolic-ref HEAD)"
-
-Already on 'master'
-fatal: '--orphan' cannot be used with '-t'
-ok 5 - --orphan must be rejected with -t
-
-expecting success: 
-	git checkout master &&
-	git config branch.autosetupmerge always &&
-	git checkout --orphan gamma &&
-	test -z "$(git config branch.gamma.merge)" &&
-	test refs/heads/gamma = "$(git symbolic-ref HEAD)" &&
-	test_must_fail git rev-parse --verify HEAD^
-
-Already on 'master'
-Switched to a new branch 'gamma'
-fatal: Needed a single revision
-ok 6 - --orphan ignores branch.autosetupmerge
-
-expecting success: 
-	git checkout master &&
-	git config --unset core.logAllRefUpdates &&
-	git checkout --orphan delta &&
-	test_must_fail git rev-parse --verify delta@{0} &&
-	git commit -m Delta &&
-	git rev-parse --verify delta@{0}
-
-Switched to branch 'master'
-Switched to a new branch 'delta'
-fatal: Needed a single revision
-[delta (root-commit) 9beee35] Delta
- Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+)
- create mode 100644 foo
-9beee35744aee191f8186ef0a6ab78f710cdd57c
-ok 7 - --orphan makes reflog by default
-
-expecting success: 
-	git checkout master &&
-	git config core.logAllRefUpdates false &&
-	git checkout --orphan epsilon &&
-	test_must_fail git rev-parse --verify epsilon@{0} &&
-	git commit -m Epsilon &&
-	test_must_fail git rev-parse --verify epsilon@{0}
-
-Switched to branch 'master'
-Switched to a new branch 'epsilon'
-fatal: Needed a single revision
-[epsilon (root-commit) c5e7701] Epsilon
- Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+)
- create mode 100644 foo
-fatal: Needed a single revision
-ok 8 - --orphan does not make reflog when core.logAllRefUpdates = false
-
-expecting success: 
-	git checkout master &&
-	git checkout -l --orphan zeta &&
-	test_must_fail git rev-parse --verify zeta@{0} &&
-	git commit -m Zeta &&
-	git rev-parse --verify zeta@{0}
-
-Switched to branch 'master'
-Switched to a new branch 'zeta'
-fatal: Needed a single revision
-[zeta (root-commit) 1b23595] Zeta
- Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+)
- create mode 100644 foo
-1b235958474dccc5c8f228713c620d22e7d1825d
-ok 9 - --orphan with -l makes reflog when core.logAllRefUpdates = false
-
-expecting success: 
-	git checkout master &&
-	git checkout -l --orphan eta &&
-	test_must_fail git rev-parse --verify eta@{0} &&
-	git checkout master &&
-	test_must_fail git rev-parse --verify eta@{0}
-
-Switched to branch 'master'
-Switched to a new branch 'eta'
-fatal: Needed a single revision
-Switched to branch 'master'
-fatal: Needed a single revision
-ok 10 - giving up --orphan not committed when -l and core.logAllRefUpdates = false deletes reflog
-
-expecting success: 
-	git checkout master &&
-	test_must_fail git checkout --orphan master &&
-	test refs/heads/master = "$(git symbolic-ref HEAD)"
-
-Already on 'master'
-fatal: A branch named 'master' already exists.
-ok 11 - --orphan is rejected with an existing name
-
-expecting success: 
-	git checkout master &&
-	git reset --hard &&
-	echo local >>"$TEST_FILE" &&
-	cat "$TEST_FILE" >"$TEST_FILE.saved" &&
-	test_must_fail git checkout --orphan new master^ &&
-	test refs/heads/master = "$(git symbolic-ref HEAD)" &&
-	test_cmp "$TEST_FILE" "$TEST_FILE.saved" &&
-	git diff-index --quiet --cached HEAD &&
-	git reset --hard
-
-Already on 'master'
-HEAD is now at 0f097f5 Second Commit
-error: Your local changes to the following files would be overwritten by checkout:
-	foo
-Please commit your changes or stash them before you switch branches.
-Aborting
-HEAD is now at 0f097f5 Second Commit
-ok 12 - --orphan refuses to switch if a merge is needed
-
-expecting success: 
-	git checkout master &&
-	git checkout --orphan new &&
-	test_must_fail git checkout --detach
-
-Already on 'master'
-Switched to a new branch 'new'
-fatal: You are on a branch yet to be born
-ok 13 - cannot --detach on an unborn branch
-
-# passed all 13 test(s)
-1..13
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t2021-checkout-overwrite.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t2021-checkout-overwrite/.git/
-expecting success: 
-
-	mkdir -p a/b/c &&
-	>a/b/c/d &&
-	git add -A &&
-	git commit -m base &&
-	git tag start
-
-[master (root-commit) e4cffe1] 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: 
-
-	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 8d1015b] 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: 
-
-	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 8ffe02f] 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: 
-
-	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" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
-	# test whether the filesystem supports symbolic links
-	ln -s x y && test -h y
-
-)
-prerequisite SYMLINKS ok
-[symlink dd5d98c] 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: 
-
-	git rm --cached a/b &&
-	git commit -m "un-track the symlink" &&
-	test_must_fail git checkout start
-
-rm 'a/b'
-[symlink 33a9126] 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: 
-
-	test -h a/b
-
-ok 6 - the symlink remained
-
-# passed all 6 test(s)
-1..6
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
 *** t2022-checkout-paths.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t2022-checkout-paths/.git/
 expecting success: 
@@ -40784,6 +41052,80 @@
 1..4
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
+*** t2023-checkout-m.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t2023-checkout-m/.git/
+expecting success: 
+	test_tick &&
+	test_commit both.txt both.txt initial &&
+	git branch topic &&
+	test_commit modified_in_master both.txt in_master &&
+	test_commit added_in_master each.txt in_master &&
+	git checkout topic &&
+	test_commit modified_in_topic both.txt in_topic &&
+	test_commit added_in_topic each.txt in_topic
+
+[master (root-commit) 7a8c5bf] both.txt
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 both.txt
+[master dc44449] modified_in_master
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[master 642a0cb] added_in_master
+ 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: 
+    test_must_fail git merge master
+
+Merging:
+d46615c added_in_topic
+virtual master
+found 1 common ancestor:
+7a8c5bf both.txt
+Auto-merging each.txt
+CONFLICT (add/add): Merge conflict in each.txt
+Auto-merging both.txt
+CONFLICT (content): Merge conflict in both.txt
+Automatic merge failed; fix conflicts and then commit the result.
+ok 2 - git merge master
+
+expecting success: 
+	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: 
+	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
+
+# passed all 4 test(s)
+1..4
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
 *** t2018-checkout-branch.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t2018-checkout-branch/.git/
 expecting success: 
@@ -41035,80 +41377,6 @@
 1..18
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t2023-checkout-m.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t2023-checkout-m/.git/
-expecting success: 
-	test_tick &&
-	test_commit both.txt both.txt initial &&
-	git branch topic &&
-	test_commit modified_in_master both.txt in_master &&
-	test_commit added_in_master each.txt in_master &&
-	git checkout topic &&
-	test_commit modified_in_topic both.txt in_topic &&
-	test_commit added_in_topic each.txt in_topic
-
-[master (root-commit) 7a8c5bf] both.txt
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 both.txt
-[master dc44449] modified_in_master
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[master 642a0cb] added_in_master
- 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: 
-    test_must_fail git merge master
-
-Merging:
-d46615c added_in_topic
-virtual master
-found 1 common ancestor:
-7a8c5bf both.txt
-Auto-merging each.txt
-CONFLICT (add/add): Merge conflict in each.txt
-Auto-merging both.txt
-CONFLICT (content): Merge conflict in both.txt
-Automatic merge failed; fix conflicts and then commit the result.
-ok 2 - git merge master
-
-expecting success: 
-	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: 
-	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
-
-# passed all 4 test(s)
-1..4
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
 *** t2012-checkout-last.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t2012-checkout-last/.git/
 expecting success: 
@@ -41120,11 +41388,11 @@
 	git add world &&
 	git commit -m second
 
-[master (root-commit) c70732b] initial
+[master (root-commit) ee67dd2] initial
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 world
-[master 889e0cc] second
+[master 8cf8619] second
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 ok 1 - setup
@@ -41158,7 +41426,7 @@
 expecting success: 
 	git checkout $(git rev-parse HEAD)
 
-Note: checking out 'c70732b8271de3442ae8b55ff0250595c7ab13a1'.
+Note: checking out 'ee67dd24db08a7a0cfcd7c7cd237202a7424b580'.
 
 You are in 'detached HEAD' state. You can look around, make experimental
 changes and commit them, and you can discard any commits you make in this
@@ -41169,7 +41437,7 @@
 
   git checkout -b <new-branch-name>
 
-HEAD is now at c70732b initial
+HEAD is now at ee67dd2 initial
 ok 6 - detach HEAD
 
 expecting success: 
@@ -41184,7 +41452,7 @@
 	test "z$(git rev-parse HEAD)" = "z$(git rev-parse other)" &&
 	test_must_fail git symbolic-ref HEAD
 
-Note: checking out 'c70732b8271de3442ae8b55ff0250595c7ab13a1'.
+Note: checking out 'ee67dd24db08a7a0cfcd7c7cd237202a7424b580'.
 
 You are in 'detached HEAD' state. You can look around, make experimental
 changes and commit them, and you can discard any commits you make in this
@@ -41195,7 +41463,7 @@
 
   git checkout -b <new-branch-name>
 
-HEAD is now at c70732b initial
+HEAD is now at ee67dd2 initial
 fatal: ref HEAD is not a symbolic ref
 ok 8 - "checkout -" detaches again
 
@@ -41350,7 +41618,7 @@
 	git commit -m third
 
 Switched to a new branch 'another'
-[another 944de90] third
+[another 0984c1c] third
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 ok 15 - merge base test setup
@@ -41372,7 +41640,7 @@
 
   git checkout -b <new-branch-name>
 
-HEAD is now at c70732b initial
+HEAD is now at ee67dd2 initial
 ok 16 - another...master
 
 expecting success: 
@@ -41380,7 +41648,7 @@
 	git checkout ...master &&
 	test "z$(git rev-parse --verify HEAD)" = "z$(git rev-parse --verify master^)"
 
-Previous HEAD position was c70732b initial
+Previous HEAD position was ee67dd2 initial
 Switched to branch 'another'
 Note: checking out '...master'.
 
@@ -41393,7 +41661,7 @@
 
   git checkout -b <new-branch-name>
 
-HEAD is now at c70732b initial
+HEAD is now at ee67dd2 initial
 ok 17 - ...master
 
 expecting success: 
@@ -41401,7 +41669,7 @@
 	git checkout master... &&
 	test "z$(git rev-parse --verify HEAD)" = "z$(git rev-parse --verify master^)"
 
-Previous HEAD position was c70732b initial
+Previous HEAD position was ee67dd2 initial
 Switched to branch 'another'
 Note: checking out 'master...'.
 
@@ -41414,7 +41682,7 @@
 
   git checkout -b <new-branch-name>
 
-HEAD is now at c70732b initial
+HEAD is now at ee67dd2 initial
 ok 18 - master...
 
 expecting success: 
@@ -41424,7 +41692,7 @@
 	git checkout - &&
 	test "z$(git symbolic-ref HEAD)" = "zrefs/heads/master"
 
-Previous HEAD position was c70732b initial
+Previous HEAD position was ee67dd2 initial
 Switched to branch 'master'
 Switched to branch 'other'
 First, rewinding head to replay your work on top of it...
@@ -41479,113 +41747,1117 @@
 1..22
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t1400-update-ref.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1400-update-ref/.git/
+*** t2026-worktree-prune.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t2026-worktree-prune/.git/
 expecting success: 
-	create_test_commits "" &&
-	mkdir $bare &&
-	cd $bare &&
-	git init --bare &&
-	create_test_commits "bare" &&
-	cd -
+	git commit --allow-empty -m init
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1400-update-ref/bare-repo/
-/build/git-2.20.1/t/trash directory.t1400-update-ref
-ok 1 - setup
+[master (root-commit) d668210] init
+ Author: A U Thor <author@example.com>
+ok 1 - initialize
 
 expecting success: 
-	git update-ref $m $A &&
-	test $A = $(cat .git/$m)
+	git worktree prune &&
+	test_must_fail git worktree prune abc
 
-ok 2 - create refs/heads/master
+usage: git worktree add [<options>] <path> [<commit-ish>]
+   or: git worktree list [<options>]
+   or: git worktree lock [<options>] <path>
+   or: git worktree move <worktree> <new-path>
+   or: git worktree prune [<options>]
+   or: git worktree remove [<options>] <worktree>
+   or: git worktree unlock <path>
 
-expecting success: 
-	git update-ref $m $B $A &&
-	test $B = $(cat .git/$m)
+    -n, --dry-run         do not remove, show only
+    -v, --verbose         report pruned working trees
+    --expire <expiry-date>
+                          expire working trees older than <time>
 
-ok 3 - create refs/heads/master with oldvalue verification
+ok 2 - worktree prune on normal repo
 
 expecting success: 
-	test_must_fail git update-ref -d $m $A &&
-	test $B = "$(cat .git/$m)"
+	mkdir .git/worktrees &&
+	: >.git/worktrees/abc &&
+	git worktree prune --verbose >actual &&
+	cat >expect <<EOF &&
+Removing worktrees/abc: not a valid directory
+EOF
+	test_i18ncmp expect actual &&
+	! test -f .git/worktrees/abc &&
+	! test -d .git/worktrees
 
-error: cannot lock ref 'refs/heads/master': is at 56d5c1374e8028a1e122ab046ab7b98165342dc4 but expected 102939797ab91a4f201d131418d2c9d919dcdd2c
-ok 4 - fail to delete refs/heads/master with stale ref
+ok 3 - prune files inside $GIT_DIR/worktrees
 
 expecting success: 
-	test_when_finished "rm -f .git/$m" &&
-	git update-ref -d $m $B &&
-	test_path_is_missing .git/$m
-
-ok 5 - delete refs/heads/master
+	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 >actual &&
+	test_i18ncmp expect actual &&
+	! test -d .git/worktrees/def &&
+	! test -d .git/worktrees
 
-expecting success: 
-	test_when_finished "rm -f .git/$m" &&
-	git update-ref $m $A &&
-	test $A = $(cat .git/$m) &&
-	git update-ref -d $m &&
-	test_path_is_missing .git/$m
+ok 4 - prune directories without gitdir
 
-ok 6 - delete refs/heads/master without oldvalue verification
+checking prerequisite: SANITY
 
-expecting success: 
-	test_when_finished "rm -f .git/$n_dir" &&
-	touch .git/$n_dir &&
-	test_must_fail git update-ref $n $A
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
+	mkdir SANETESTD.1 SANETESTD.2 &&
 
-fatal: update_ref failed for ref 'refs/heads/gu/fixes': cannot lock ref 'refs/heads/gu/fixes': unable to create lock file .git/refs/heads/gu/fixes.lock; non-directory in the way
-ok 7 - fail to create refs/heads/gu/fixes
+	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: 
-	git update-ref HEAD $A &&
-	test $A = $(cat .git/$m)
+	! test -r SANETESTD.1/x &&
+	! rm SANETESTD.1/x && ! test -f SANETESTD.2/x
+	status=$?
 
-ok 8 - create refs/heads/master (by HEAD)
+	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: 
-	git update-ref HEAD $B $A &&
-	test $B = $(cat .git/$m)
+	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 >actual &&
+	test_i18ngrep "Removing worktrees/def: unable to read gitdir file" actual &&
+	! test -d .git/worktrees/def &&
+	! test -d .git/worktrees
 
-ok 9 - create refs/heads/master (by HEAD) with oldvalue verification
+Removing worktrees/def: unable to read gitdir file (Permission denied)
+ok 5 - prune directories with unreadable gitdir
 
 expecting success: 
-	test_must_fail git update-ref -d HEAD $A &&
-	test $B = $(cat .git/$m)
+	mkdir -p .git/worktrees/def/abc &&
+	: >.git/worktrees/def/def &&
+	: >.git/worktrees/def/gitdir &&
+	git worktree prune --verbose >actual &&
+	test_i18ngrep "Removing worktrees/def: invalid gitdir file" actual &&
+	! test -d .git/worktrees/def &&
+	! test -d .git/worktrees
 
-error: cannot lock ref 'HEAD': is at 56d5c1374e8028a1e122ab046ab7b98165342dc4 but expected 102939797ab91a4f201d131418d2c9d919dcdd2c
-ok 10 - fail to delete refs/heads/master (by HEAD) with stale ref
+Removing worktrees/def: invalid gitdir file
+ok 6 - prune directories with invalid gitdir
 
 expecting success: 
-	test_when_finished "rm -f .git/$m" &&
-	git update-ref -d HEAD $B &&
-	test_path_is_missing .git/$m
+	mkdir -p .git/worktrees/def/abc &&
+	: >.git/worktrees/def/def &&
+	echo "$(pwd)"/nowhere >.git/worktrees/def/gitdir &&
+	git worktree prune --verbose >actual &&
+	test_i18ngrep "Removing worktrees/def: gitdir file points to non-existent location" actual &&
+	! test -d .git/worktrees/def &&
+	! test -d .git/worktrees
 
-ok 11 - delete refs/heads/master (by HEAD)
+Removing worktrees/def: gitdir file points to non-existent location
+ok 7 - prune directories with gitdir pointing to nowhere
 
 expecting success: 
-	test_when_finished "rm -f .git/$m" &&
-	git update-ref $m $A &&
-	git symbolic-ref HEAD $m &&
-	git update-ref -m delete-$m -d $m &&
-	test_path_is_missing .git/$m &&
-	grep "delete-$m$" .git/logs/HEAD
+	test_when_finished rm -r .git/worktrees &&
+	mkdir -p .git/worktrees/ghi &&
+	: >.git/worktrees/ghi/locked &&
+	git worktree prune &&
+	test -d .git/worktrees/ghi
 
-102939797ab91a4f201d131418d2c9d919dcdd2c 0000000000000000000000000000000000000000 C O Mitter <committer@example.com> 1112912653 -0700	delete-refs/heads/master
-ok 12 - deleting current branch adds message to HEAD's log
+ok 8 - not prune locked checkout
 
 expecting success: 
-	test_when_finished "rm -f .git/$m" &&
-	git update-ref $m $A &&
-	git symbolic-ref HEAD $m &&
-	git update-ref -m delete-by-head -d HEAD &&
-	test_path_is_missing .git/$m &&
-	grep "delete-by-head$" .git/logs/HEAD
+	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
 
-102939797ab91a4f201d131418d2c9d919dcdd2c 0000000000000000000000000000000000000000 C O Mitter <committer@example.com> 1112912653 -0700	delete-by-head
-ok 13 - deleting by HEAD adds message to HEAD's log
+Preparing worktree (detached HEAD d668210)
+HEAD is now at d668210 init
+ok 9 - not prune recent checkouts
 
 expecting success: 
-	test_when_finished "git update-ref -d $outside" &&
+	test_when_finished rm -r .git/worktrees &&
+	git worktree add --detach "$PWD/nop" master &&
+	git worktree prune &&
+	test -d .git/worktrees/nop
+
+Preparing worktree (detached HEAD d668210)
+HEAD is now at d668210 init
+ok 10 - not prune proper checkouts
+
+# passed all 10 test(s)
+1..10
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t2029-worktree-config.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t2029-worktree-config/.git/
+expecting success: 
+	test_commit start
+
+[master (root-commit) bb4ab09] start
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 start.t
+ok 1 - setup
+
+expecting success: 
+	git config --worktree foo.bar true &&
+	test_cmp_config true foo.bar
+
+ok 2 - config --worktree in single worktree
+
+expecting success: 
+	git worktree add wt1 &&
+	git worktree add wt2
+
+Preparing worktree (new branch 'wt1')
+HEAD is now at bb4ab09 start
+Preparing worktree (new branch 'wt2')
+HEAD is now at bb4ab09 start
+ok 3 - add worktrees
+
+expecting success: 
+	test_must_fail git config --worktree foo.bar false
+
+fatal: --worktree cannot be used with multiple working trees unless the config
+extension worktreeConfig is enabled. Please read "CONFIGURATION FILE"
+section in "git help worktree" for details
+ok 4 - config --worktree without extension
+
+expecting success: 
+	git config extensions.worktreeConfig true &&
+	test_cmp_config true extensions.worktreeConfig
+
+ok 5 - enable worktreeConfig extension
+
+expecting success: 
+	git config this.is shared &&
+	test_cmp_config shared this.is &&
+	test_cmp_config -C wt1 shared this.is &&
+	test_cmp_config -C wt2 shared this.is
+
+ok 6 - config is shared as before
+
+expecting success: 
+	git -C wt1 config that.is also-shared &&
+	test_cmp_config also-shared that.is &&
+	test_cmp_config -C wt1 also-shared that.is &&
+	test_cmp_config -C wt2 also-shared that.is
+
+ok 7 - config is shared (set from another worktree)
+
+expecting success: 
+	git config --worktree this.is for-main &&
+	test_cmp_config for-main this.is &&
+	test_cmp_config -C wt1 shared this.is &&
+	test_cmp_config -C wt2 shared this.is
+
+ok 8 - config private to main worktree
+
+expecting success: 
+	git -C wt1 config --worktree this.is for-wt1 &&
+	test_cmp_config for-main this.is &&
+	test_cmp_config -C wt1 for-wt1 this.is &&
+	test_cmp_config -C wt2 shared this.is
+
+ok 9 - config private to linked worktree
+
+expecting success: 
+	test_config core.bare true &&
+	test "$(git rev-parse --is-bare-repository)" = true &&
+	test "$(git -C wt1 rev-parse --is-bare-repository)" = true &&
+	test "$(git -C wt2 rev-parse --is-bare-repository)" = true
+
+ok 10 - core.bare no longer for main only
+
+expecting success: 
+	git -C wt1 config --worktree core.bare true &&
+	test "$(git rev-parse --is-bare-repository)" = false &&
+	test "$(git -C wt1 rev-parse --is-bare-repository)" = true &&
+	test "$(git -C wt2 rev-parse --is-bare-repository)" = false
+
+ok 11 - per-worktree core.bare is picked up
+
+expecting success: 
+	git config --unset extensions.worktreeConfig &&
+	test_cmp_config shared this.is &&
+	test_cmp_config -C wt1 shared this.is &&
+	test_cmp_config -C wt2 shared this.is
+
+ok 12 - config.worktree no longer read without extension
+
+# passed all 12 test(s)
+1..12
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t2020-checkout-detach.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t2020-checkout-detach/.git/
+expecting success: 
+	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
+
+[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
+Deleted tag 'three' (was 7c7cd71)
+[master 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: 
+	reset &&
+	git checkout branch &&
+	check_not_detached
+
+Already on 'master'
+Switched to branch 'branch'
+ok 2 - checkout branch does not detach
+
+expecting success: 
+	reset &&
+	git checkout tag &&
+	check_detached
+
+Switched to branch 'master'
+Note: checking out '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 performing another checkout.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -b with the checkout command again. Example:
+
+  git checkout -b <new-branch-name>
+
+HEAD is now at fd8d77e four
+ok 3 - checkout tag detaches
+
+expecting success: 
+	reset &&
+	git checkout refs/heads/branch &&
+	check_detached
+
+Switched to branch 'master'
+Note: checking out '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 performing another checkout.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -b with the checkout command again. Example:
+
+  git checkout -b <new-branch-name>
+
+HEAD is now at fd8d77e four
+ok 4 - checkout branch by full name detaches
+
+expecting success: 
+	reset &&
+	git checkout branch^ &&
+	check_detached
+
+Switched to branch 'master'
+Note: checking out '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 performing another checkout.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -b with the checkout command again. Example:
+
+  git checkout -b <new-branch-name>
+
+HEAD is now at 7c7cd71 three
+ok 5 - checkout non-ref detaches
+
+expecting success: 
+	reset &&
+	git checkout branch^0 &&
+	check_detached
+
+Previous HEAD position was 7c7cd71 three
+Switched to branch 'master'
+Note: checking out 'branch^0'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by performing another checkout.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -b with the checkout command again. Example:
+
+  git checkout -b <new-branch-name>
+
+HEAD is now at fd8d77e four
+ok 6 - checkout ref^0 detaches
+
+expecting success: 
+	reset &&
+	git checkout --detach branch &&
+	check_detached
+
+Switched to branch 'master'
+HEAD is now at fd8d77e four
+ok 7 - checkout --detach detaches
+
+expecting success: 
+	reset &&
+	git checkout --detach &&
+	check_detached
+
+Switched to branch 'master'
+HEAD is now at fd8d77e four
+ok 8 - checkout --detach without branch name
+
+expecting success: 
+	reset &&
+	test_must_fail git checkout --detach one^{tree} &&
+	check_not_detached
+
+Switched to branch 'master'
+fatal: Cannot switch branch to a non-commit 'one^{tree}'
+ok 9 - checkout --detach errors out for non-commit
+
+expecting success: 
+	reset &&
+	git checkout master &&
+	test_must_fail git checkout --detach tag one.t &&
+	check_not_detached
+
+Already on 'master'
+Already on 'master'
+fatal: git checkout: --detach does not take a path argument 'one.t'
+ok 10 - checkout --detach errors out for extra argument
+
+expecting success: 
+	reset &&
+	test_must_fail git checkout --detach -b newbranch tag &&
+	check_not_detached
+
+Already on 'master'
+fatal: '--detach' cannot be used with '-b/-B/--orphan'
+ok 11 - checkout --detached and -b are incompatible
+
+expecting success: 
+	reset &&
+	git checkout one &&
+	git checkout --detach two &&
+	git diff --exit-code HEAD &&
+	git diff --exit-code two
+
+Already on 'master'
+Note: checking out 'one'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by performing another checkout.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -b with the checkout command again. Example:
+
+  git checkout -b <new-branch-name>
+
+HEAD is now at d79ce16 one
+Previous HEAD position was d79ce16 one
+HEAD is now at 139b20d two
+ok 12 - checkout --detach moves HEAD
+
+expecting success: 
+	reset &&
+	git checkout --detach two &&
+	echo content >orphan &&
+	git add orphan &&
+	git commit -a -m orphan1 &&
+	echo new content >orphan &&
+	git commit -a -m orphan2 &&
+	orphan2=$(git rev-parse HEAD) &&
+	git checkout master 2>stderr
+
+Previous HEAD position was 139b20d two
+Switched to branch 'master'
+HEAD is now at 139b20d two
+[detached HEAD 61e8031] orphan1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 orphan
+[detached HEAD bfea71d] orphan2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 13 - checkout warns on orphan commits
+
+expecting success: 
+	check_orphan_warning stderr "2 commits"
+
+Warning: you are leaving 2 commits behind, not connected to
+ok 14 - checkout warns on orphan commits: output
+
+expecting success: 
+	git checkout "$orphan2" &&
+	git checkout HEAD^ 2>stderr
+
+Note: checking out 'bfea71df3731158d55fcf7b9d1ae214132b90e2b'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by performing another checkout.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -b with the checkout command again. Example:
+
+  git checkout -b <new-branch-name>
+
+HEAD is now at bfea71d orphan2
+ok 15 - checkout warns orphaning 1 of 2 commits
+
+expecting success: 
+	check_orphan_warning stderr "1 commit"
+
+Warning: you are leaving 1 commit behind, not connected to
+ok 16 - checkout warns orphaning 1 of 2 commits: output
+
+expecting success: 
+	reset &&
+	git checkout --detach two &&
+	git checkout master 2>stderr
+
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  61e8031 orphan1
+
+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> 61e8031
+
+Switched to branch 'master'
+HEAD is now at 139b20d two
+ok 17 - checkout does not warn leaving ref tip
+
+expecting success: 
+	check_no_orphan_warning stderr
+
+Previous HEAD position was 139b20d two
+ok 18 - checkout does not warn leaving ref tip
+
+expecting success: 
+	reset &&
+	git checkout --detach HEAD^ &&
+	git checkout master 2>stderr
+
+Already on 'master'
+HEAD is now at 7c7cd71 three
+ok 19 - checkout does not warn leaving reachable commit
+
+expecting success: 
+	check_no_orphan_warning stderr
+
+Previous HEAD position was 7c7cd71 three
+ok 20 - checkout does not warn leaving reachable commit
+
+expecting success: 
+	reset &&
+	git branch child master^ &&
+	git config branch.child.remote . &&
+	git config branch.child.merge refs/heads/master &&
+	git checkout child^ &&
+	git checkout child >stdout &&
+	test_i18ncmp expect stdout
+
+Already on 'master'
+Note: checking out 'child^'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by performing another checkout.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -b with the checkout command again. Example:
+
+  git checkout -b <new-branch-name>
+
+HEAD is now at 139b20d two
+Previous HEAD position was 139b20d two
+Switched to branch 'child'
+ok 21 - tracking count is accurate after orphan check
+
+expecting success: 
+	# baseline
+	test_config advice.detachedHead true &&
+	git checkout child && git checkout HEAD^0 >expect.advice 2>&1 &&
+	test_config advice.detachedHead false &&
+	git checkout child && git checkout HEAD^0 >expect.no-advice 2>&1 &&
+	test_unconfig advice.detachedHead &&
+	# without configuration, the advice.* variables default to true
+	git checkout child && git checkout HEAD^0 >actual 2>&1 &&
+	test_cmp expect.advice actual &&
+
+	# with explicit --detach
+	# no configuration
+	test_unconfig advice.detachedHead &&
+	git checkout child && git checkout --detach HEAD^0 >actual 2>&1 &&
+	test_cmp expect.no-advice actual &&
+
+	# explicitly decline advice
+	test_config advice.detachedHead false &&
+	git checkout child && git checkout --detach HEAD^0 >actual 2>&1 &&
+	test_cmp expect.no-advice actual
+
+Already on 'child'
+Your branch is behind 'master' by 1 commit, and can be fast-forwarded.
+  (use "git pull" to update your local branch)
+Switched to branch 'child'
+Your branch is behind 'master' by 1 commit, and can be fast-forwarded.
+  (use "git pull" to update your local branch)
+Switched to branch 'child'
+Your branch is behind 'master' by 1 commit, and can be fast-forwarded.
+  (use "git pull" to update your local branch)
+Switched to branch 'child'
+Your branch is behind 'master' by 1 commit, and can be fast-forwarded.
+  (use "git pull" to update your local branch)
+Switched to branch 'child'
+Your branch is behind 'master' by 1 commit, and can be fast-forwarded.
+  (use "git pull" to update your local branch)
+ok 22 - no advice given for explicit detached head state
+
+expecting success: 
+
+	commit=7c7cd714e262 &&
+	commit2=139b20d8e6c5 &&
+	commit3=d79ce1670bdc &&
+
+	# The first detach operation is more chatty than the following ones.
+	cat >1st_detach <<-EOF &&
+	Note: checking out '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 performing another checkout.
+
+	If you want to create a new branch to retain commits you create, you may
+	do so (now or later) by using -b with the checkout command again. Example:
+
+	  git checkout -b <new-branch-name>
+
+	HEAD is now at $commit three
+	EOF
+
+	# The remaining ones just show info about previous and current HEADs.
+	cat >2nd_detach <<-EOF &&
+	Previous HEAD position was $commit three
+	HEAD is now at $commit2 two
+	EOF
+
+	cat >3rd_detach <<-EOF &&
+	Previous HEAD position was $commit2 two
+	HEAD is now at $commit3 one
+	EOF
+
+	reset &&
+	check_not_detached &&
+
+	# Various ways of *not* asking for ellipses
+
+	sane_unset GIT_PRINT_SHA1_ELLIPSIS &&
+	git -c 'core.abbrev=12' checkout HEAD^ >actual 2>&1 &&
+	check_detached &&
+	test_i18ncmp 1st_detach actual &&
+
+	GIT_PRINT_SHA1_ELLIPSIS=no git -c 'core.abbrev=12' checkout HEAD^ >actual 2>&1 &&
+	check_detached &&
+	test_i18ncmp 2nd_detach actual &&
+
+	GIT_PRINT_SHA1_ELLIPSIS= git -c 'core.abbrev=12' checkout HEAD^ >actual 2>&1 &&
+	check_detached &&
+	test_i18ncmp 3rd_detach actual &&
+
+	sane_unset GIT_PRINT_SHA1_ELLIPSIS &&
+
+	# We only have four commits, but we can re-use them
+	reset &&
+	check_not_detached &&
+
+	# Make no mention of the env var at all
+	git -c 'core.abbrev=12' checkout HEAD^ >actual 2>&1 &&
+	check_detached &&
+	test_i18ncmp 1st_detach actual &&
+
+	GIT_PRINT_SHA1_ELLIPSIS='nope' &&
+	git -c 'core.abbrev=12' checkout HEAD^ >actual 2>&1 &&
+	check_detached &&
+	test_i18ncmp 2nd_detach actual &&
+
+	GIT_PRINT_SHA1_ELLIPSIS=nein &&
+	git -c 'core.abbrev=12' checkout HEAD^ >actual 2>&1 &&
+	check_detached &&
+	test_i18ncmp 3rd_detach actual &&
+
+	true
+
+Previous HEAD position was 7c7cd71 three
+Switched to branch 'master'
+Previous HEAD position was d79ce16 one
+Switched to branch 'master'
+ok 23 - describe_detached_head prints no SHA-1 ellipsis when not asked to
+
+expecting success: 
+
+	commit=7c7cd714e262 &&
+	commit2=139b20d8e6c5 &&
+	commit3=d79ce1670bdc &&
+
+	# The first detach operation is more chatty than the following ones.
+	cat >1st_detach <<-EOF &&
+	Note: checking out '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 performing another checkout.
+
+	If you want to create a new branch to retain commits you create, you may
+	do so (now or later) by using -b with the checkout command again. Example:
+
+	  git checkout -b <new-branch-name>
+
+	HEAD is now at $commit... three
+	EOF
+
+	# The remaining ones just show info about previous and current HEADs.
+	cat >2nd_detach <<-EOF &&
+	Previous HEAD position was $commit... three
+	HEAD is now at $commit2... two
+	EOF
+
+	cat >3rd_detach <<-EOF &&
+	Previous HEAD position was $commit2... two
+	HEAD is now at $commit3... one
+	EOF
+
+	reset &&
+	check_not_detached &&
+
+	# Various ways of asking for ellipses...
+	# The user can just use any kind of quoting (including none).
+
+	GIT_PRINT_SHA1_ELLIPSIS=yes git -c 'core.abbrev=12' checkout HEAD^ >actual 2>&1 &&
+	check_detached &&
+	test_i18ncmp 1st_detach actual &&
+
+	GIT_PRINT_SHA1_ELLIPSIS=Yes git -c 'core.abbrev=12' checkout HEAD^ >actual 2>&1 &&
+	check_detached &&
+	test_i18ncmp 2nd_detach actual &&
+
+	GIT_PRINT_SHA1_ELLIPSIS=YES git -c 'core.abbrev=12' checkout HEAD^ >actual 2>&1 &&
+	check_detached &&
+	test_i18ncmp 3rd_detach actual &&
+
+	true
+
+Previous HEAD position was d79ce16 one
+Switched to branch 'master'
+ok 24 - describe_detached_head does print SHA-1 ellipsis when asked to
+
+# passed all 24 test(s)
+1..24
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t2050-git-dir-relative.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t2050-git-dir-relative/.git/
+expecting success: 
+mkdir -p .git/hooks &&
+echo >.git/hooks/post-commit "#!/bin/sh
+touch \"\${COMMIT_FILE}\"
+echo Post commit hook was called." &&
+chmod +x .git/hooks/post-commit
+ok 1 - Setting up post-commit hook
+
+expecting success: 
+echo initial >top &&
+git add top &&
+git commit -m initial &&
+test -r "${COMMIT_FILE}"
+
+Post commit hook was called.
+[master (root-commit) 3f3e824] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 top
+ok 2 - post-commit hook used ordinarily
+
+expecting success: 
+echo changed >top &&
+git --git-dir subdir/.git add top &&
+git --git-dir subdir/.git commit -m topcommit &&
+test -r "${COMMIT_FILE}"
+
+Post commit hook was called.
+[master b72f2cb] topcommit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 3 - post-commit-hook created and used from top dir
+
+expecting success: 
+echo changed again >top &&
+cd subdir &&
+git --git-dir .git --work-tree .. add ../top &&
+git --git-dir .git --work-tree .. commit -m subcommit &&
+test -r "${COMMIT_FILE}"
+
+Post commit hook was called.
+[master cf43026] subcommit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 4 - post-commit-hook from sub dir
+
+# passed all 4 test(s)
+1..4
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t2027-worktree-list.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t2027-worktree-list/.git/
+expecting success: 
+	test_commit init
+
+[master (root-commit) 2519212] init
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 init.t
+ok 1 - setup
+
+expecting success: 
+	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: 
+	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 master &&
+	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: 
+	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 master &&
+	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: 
+	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 master &&
+	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: 
+	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 master &&
+	echo "worktree $(git -C here rev-parse --show-toplevel)" >>expect &&
+	echo "HEAD $(git rev-parse HEAD)" >>expect &&
+	echo "detached" >>expect &&
+	echo >>expect &&
+	git worktree list --porcelain >actual &&
+	test_cmp expect actual
+
+Preparing worktree (detached HEAD 2519212)
+HEAD is now at 2519212 init
+ok 6 - "list" all worktrees --porcelain
+
+expecting success: 
+	git init --bare bare1 &&
+	echo "data" >file1 &&
+	git add file1 &&
+	git commit -m"File1: add data" &&
+	git push bare1 master &&
+	git reset --hard HEAD^
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t2027-worktree-list/bare1/
+[master 7c81006] File1: add data
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file1
+To bare1
+ * [new branch]      master -> master
+HEAD is now at 2519212 init
+ok 7 - bare repo setup
+
+expecting success: 
+	test_when_finished "rm -rf there out actual expect && git -C bare1 worktree prune" &&
+	git -C bare1 worktree add --detach ../there master &&
+	echo "$(pwd)/bare1 (bare)" >expect &&
+	echo "$(git -C there rev-parse --show-toplevel) $(git -C there rev-parse --short HEAD) (detached HEAD)" >>expect &&
+	git -C bare1 worktree list >out &&
+	sed "s/  */ /g" <out >actual &&
+	test_cmp expect actual
+
+Preparing worktree (detached HEAD 7c81006)
+HEAD is now at 7c81006 File1: add data
+ok 8 - "list" all worktrees from bare main
+
+expecting success: 
+	test_when_finished "rm -rf there actual expect && git -C bare1 worktree prune" &&
+	git -C bare1 worktree add --detach ../there master &&
+	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 9 - "list" all worktrees --porcelain from bare main
+
+expecting success: 
+	test_when_finished "rm -rf there out actual expect && git -C bare1 worktree prune" &&
+	git -C bare1 worktree add --detach ../there master &&
+	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 10 - "list" all worktrees from linked with a bare main
+
+expecting success: 
+	rm -rf bare1
+
+ok 11 - bare repo cleanup
+
+expecting success: 
+	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 &&
+		echo "ref: .broken" >../.git/HEAD &&
+		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/git-2.20.1/t/trash directory.t2027-worktree-list/broken-main/.git/
+[master (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/git-2.20.1/t/trash directory.t2027-worktree-list/broken-main         0000000 (error)
+ok 12 - broken main worktree still at the top
+
+expecting success: 
+	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/git-2.20.1/t/trash directory.t2027-worktree-list/sorted/main/.git/
+[master (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 13 - linked worktrees are sorted
+
+# passed all 13 test(s)
+1..13
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t1400-update-ref.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1400-update-ref/.git/
+expecting success: 
+	create_test_commits "" &&
+	mkdir $bare &&
+	cd $bare &&
+	git init --bare &&
+	create_test_commits "bare" &&
+	cd -
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1400-update-ref/bare-repo/
+/build/git-2.20.1/t/trash directory.t1400-update-ref
+ok 1 - setup
+
+expecting success: 
+	git update-ref $m $A &&
+	test $A = $(cat .git/$m)
+
+ok 2 - create refs/heads/master
+
+expecting success: 
+	git update-ref $m $B $A &&
+	test $B = $(cat .git/$m)
+
+ok 3 - create refs/heads/master with oldvalue verification
+
+expecting success: 
+	test_must_fail git update-ref -d $m $A &&
+	test $B = "$(cat .git/$m)"
+
+error: cannot lock ref 'refs/heads/master': is at 56d5c1374e8028a1e122ab046ab7b98165342dc4 but expected 102939797ab91a4f201d131418d2c9d919dcdd2c
+ok 4 - fail to delete refs/heads/master with stale ref
+
+expecting success: 
+	test_when_finished "rm -f .git/$m" &&
+	git update-ref -d $m $B &&
+	test_path_is_missing .git/$m
+
+ok 5 - delete refs/heads/master
+
+expecting success: 
+	test_when_finished "rm -f .git/$m" &&
+	git update-ref $m $A &&
+	test $A = $(cat .git/$m) &&
+	git update-ref -d $m &&
+	test_path_is_missing .git/$m
+
+ok 6 - delete refs/heads/master without oldvalue verification
+
+expecting success: 
+	test_when_finished "rm -f .git/$n_dir" &&
+	touch .git/$n_dir &&
+	test_must_fail git update-ref $n $A
+
+fatal: update_ref failed for ref 'refs/heads/gu/fixes': cannot lock ref 'refs/heads/gu/fixes': unable to create lock file .git/refs/heads/gu/fixes.lock; non-directory in the way
+ok 7 - fail to create refs/heads/gu/fixes
+
+expecting success: 
+	git update-ref HEAD $A &&
+	test $A = $(cat .git/$m)
+
+ok 8 - create refs/heads/master (by HEAD)
+
+expecting success: 
+	git update-ref HEAD $B $A &&
+	test $B = $(cat .git/$m)
+
+ok 9 - create refs/heads/master (by HEAD) with oldvalue verification
+
+expecting success: 
+	test_must_fail git update-ref -d HEAD $A &&
+	test $B = $(cat .git/$m)
+
+error: cannot lock ref 'HEAD': is at 56d5c1374e8028a1e122ab046ab7b98165342dc4 but expected 102939797ab91a4f201d131418d2c9d919dcdd2c
+ok 10 - fail to delete refs/heads/master (by HEAD) with stale ref
+
+expecting success: 
+	test_when_finished "rm -f .git/$m" &&
+	git update-ref -d HEAD $B &&
+	test_path_is_missing .git/$m
+
+ok 11 - delete refs/heads/master (by HEAD)
+
+expecting success: 
+	test_when_finished "rm -f .git/$m" &&
+	git update-ref $m $A &&
+	git symbolic-ref HEAD $m &&
+	git update-ref -m delete-$m -d $m &&
+	test_path_is_missing .git/$m &&
+	grep "delete-$m$" .git/logs/HEAD
+
+102939797ab91a4f201d131418d2c9d919dcdd2c 0000000000000000000000000000000000000000 C O Mitter <committer@example.com> 1112912653 -0700	delete-refs/heads/master
+ok 12 - deleting current branch adds message to HEAD's log
+
+expecting success: 
+	test_when_finished "rm -f .git/$m" &&
+	git update-ref $m $A &&
+	git symbolic-ref HEAD $m &&
+	git update-ref -m delete-by-head -d HEAD &&
+	test_path_is_missing .git/$m &&
+	grep "delete-by-head$" .git/logs/HEAD
+
+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: 
+	test_when_finished "git update-ref -d $outside" &&
 	git update-ref $outside $A &&
 	git rev-parse $A >expect &&
 	git rev-parse $outside >actual &&
@@ -43118,8 +44390,8 @@
 Use '--' to separate paths from revisions, like this:
 'git <command> [<revision>...] -- [<file>...]'
 refs/bisect/something
---- main-head	2021-12-03 05:05:00.300180457 +0000
-+++ worktree-head	2021-12-03 05:05:00.220182787 +0000
+--- main-head	2023-01-05 11:47:04.722868030 +0000
++++ worktree-head	2023-01-05 11:47:04.666868030 +0000
 @@ -1 +1 @@
 -58a052250c09f010b95ad9bfe32f35d704eda1a0
 +b62e0cb4990da3244885da90fe7d493334cca9f5
@@ -43129,842 +44401,765 @@
 1..172
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t2026-worktree-prune.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t2026-worktree-prune/.git/
-expecting success: 
-	git commit --allow-empty -m init
-
-[master (root-commit) e09d13b] init
- Author: A U Thor <author@example.com>
-ok 1 - initialize
-
-expecting success: 
-	git worktree prune &&
-	test_must_fail git worktree prune abc
-
-usage: git worktree add [<options>] <path> [<commit-ish>]
-   or: git worktree list [<options>]
-   or: git worktree lock [<options>] <path>
-   or: git worktree move <worktree> <new-path>
-   or: git worktree prune [<options>]
-   or: git worktree remove [<options>] <worktree>
-   or: git worktree unlock <path>
-
-    -n, --dry-run         do not remove, show only
-    -v, --verbose         report pruned working trees
-    --expire <expiry-date>
-                          expire working trees older than <time>
-
-ok 2 - worktree prune on normal repo
-
-expecting success: 
-	mkdir .git/worktrees &&
-	: >.git/worktrees/abc &&
-	git worktree prune --verbose >actual &&
-	cat >expect <<EOF &&
-Removing worktrees/abc: not a valid directory
-EOF
-	test_i18ncmp expect actual &&
-	! test -f .git/worktrees/abc &&
-	! test -d .git/worktrees
-
-ok 3 - prune files inside $GIT_DIR/worktrees
-
-expecting success: 
-	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 >actual &&
-	test_i18ncmp expect actual &&
-	! test -d .git/worktrees/def &&
-	! test -d .git/worktrees
-
-ok 4 - prune directories without gitdir
-
-checking prerequisite: SANITY
+*** t2100-update-cache-badpath.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t2100-update-cache-badpath/.git/
+checking prerequisite: SYMLINKS
 
 mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
 (
 	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
-	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
+	# test whether the filesystem supports symbolic links
+	ln -s x y && test -h y
 
 )
-rm: cannot remove 'SANETESTD.1/x': Permission denied
-prerequisite SANITY ok
-expecting success: 
-	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 >actual &&
-	test_i18ngrep "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: 
-	mkdir -p .git/worktrees/def/abc &&
-	: >.git/worktrees/def/def &&
-	: >.git/worktrees/def/gitdir &&
-	git worktree prune --verbose >actual &&
-	test_i18ngrep "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: 
-	mkdir -p .git/worktrees/def/abc &&
-	: >.git/worktrees/def/def &&
-	echo "$(pwd)"/nowhere >.git/worktrees/def/gitdir &&
-	git worktree prune --verbose >actual &&
-	test_i18ngrep "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: 
-	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
+prerequisite SYMLINKS ok
+expecting success: git update-index --add -- path0 path1 path2/file2 path3/file3
+ok 1 - git update-index --add to add various paths.
 
-expecting success: 
-	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: 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.
 
-Preparing worktree (detached HEAD e09d13b)
-HEAD is now at e09d13b init
-ok 9 - not prune recent checkouts
+expecting success: test_must_fail git update-index --add -- path1/file1
+error: 'path1/file1' appears as both a file and as a directory
+error: path1/file1: cannot add to the index - missing --add option?
+fatal: Unable to process path path1/file1
+ok 3 - git update-index to add conflicting path path1/file1 should fail.
 
-expecting success: 
-	test_when_finished rm -r .git/worktrees &&
-	git worktree add --detach "$PWD/nop" master &&
-	git worktree prune &&
-	test -d .git/worktrees/nop
+expecting success: test_must_fail git update-index --add -- path2
+error: 'path2' appears as both a file and as a directory
+error: path2: cannot add to the index - missing --add option?
+fatal: Unable to process path path2
+ok 4 - git update-index to add conflicting path path2 should fail.
 
-Preparing worktree (detached HEAD e09d13b)
-HEAD is now at e09d13b init
-ok 10 - not prune proper checkouts
+expecting success: test_must_fail git update-index --add -- path3
+error: 'path3' appears as both a file and as a directory
+error: path3: cannot add to the index - missing --add option?
+fatal: Unable to process path path3
+ok 5 - git update-index to add conflicting path path3 should fail.
 
-# passed all 10 test(s)
-1..10
+# passed all 5 test(s)
+1..5
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t2020-checkout-detach.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t2020-checkout-detach/.git/
+*** t2028-worktree-move.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t2028-worktree-move/.git/
 expecting success: 
-	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
+	test_commit init &&
+	git worktree add source &&
+	git worktree list --porcelain >out &&
+	grep "^worktree" out >actual &&
+	cat <<-EOF >expected &&
+	worktree $(pwd)
+	worktree $(pwd)/source
+	EOF
+	test_cmp expected actual
 
-[master (root-commit) 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
-Deleted tag 'three' (was 7c7cd71)
-[master fd8d77e] four
+[master (root-commit) 2519212] init
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 four.t
-Deleted tag 'four' (was fd8d77e)
+ create mode 100644 init.t
+Preparing worktree (new branch 'source')
+HEAD is now at 2519212 init
 ok 1 - setup
 
 expecting success: 
-	reset &&
-	git checkout branch &&
-	check_not_detached
+	test_must_fail git worktree lock .
 
-Already on 'master'
-Switched to branch 'branch'
-ok 2 - checkout branch does not detach
+fatal: The main working tree cannot be locked or unlocked
+ok 2 - lock main worktree
 
 expecting success: 
-	reset &&
-	git checkout tag &&
-	check_detached
-
-Switched to branch 'master'
-Note: checking out '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 performing another checkout.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
-
-  git checkout -b <new-branch-name>
+	git worktree lock --reason hahaha source &&
+	echo hahaha >expected &&
+	test_cmp expected .git/worktrees/source/locked
 
-HEAD is now at fd8d77e four
-ok 3 - checkout tag detaches
+ok 3 - lock linked worktree
 
 expecting success: 
-	reset &&
-	git checkout refs/heads/branch &&
-	check_detached
-
-Switched to branch 'master'
-Note: checking out '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 performing another checkout.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
-
-  git checkout -b <new-branch-name>
+	rm .git/worktrees/source/locked &&
+	git worktree add elsewhere &&
+	git -C elsewhere worktree lock --reason hahaha ../source &&
+	echo hahaha >expected &&
+	test_cmp expected .git/worktrees/source/locked
 
-HEAD is now at fd8d77e four
-ok 4 - checkout branch by full name detaches
+Preparing worktree (new branch 'elsewhere')
+HEAD is now at 2519212 init
+ok 4 - lock linked worktree from another worktree
 
 expecting success: 
-	reset &&
-	git checkout branch^ &&
-	check_detached
-
-Switched to branch 'master'
-Note: checking out '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 performing another checkout.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
-
-  git checkout -b <new-branch-name>
+	test_must_fail git worktree lock source &&
+	echo hahaha >expected &&
+	test_cmp expected .git/worktrees/source/locked
 
-HEAD is now at 7c7cd71 three
-ok 5 - checkout non-ref detaches
+fatal: 'source' is already locked, reason: hahaha
+ok 5 - lock worktree twice
 
 expecting success: 
-	reset &&
-	git checkout branch^0 &&
-	check_detached
-
-Previous HEAD position was 7c7cd71 three
-Switched to branch 'master'
-Note: checking out 'branch^0'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by performing another checkout.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
-
-  git checkout -b <new-branch-name>
+	test_must_fail git -C source worktree lock . &&
+	echo hahaha >expected &&
+	test_cmp expected .git/worktrees/source/locked
 
-HEAD is now at fd8d77e four
-ok 6 - checkout ref^0 detaches
+fatal: '.' is already locked, reason: hahaha
+ok 6 - lock worktree twice (from the locked worktree)
 
 expecting success: 
-	reset &&
-	git checkout --detach branch &&
-	check_detached
+	test_must_fail git worktree unlock .
 
-Switched to branch 'master'
-HEAD is now at fd8d77e four
-ok 7 - checkout --detach detaches
+fatal: The main working tree cannot be locked or unlocked
+ok 7 - unlock main worktree
 
 expecting success: 
-	reset &&
-	git checkout --detach &&
-	check_detached
+	git worktree unlock source &&
+	test_path_is_missing .git/worktrees/source/locked
 
-Switched to branch 'master'
-HEAD is now at fd8d77e four
-ok 8 - checkout --detach without branch name
+ok 8 - unlock linked worktree
 
 expecting success: 
-	reset &&
-	test_must_fail git checkout --detach one^{tree} &&
-	check_not_detached
+	test_must_fail git worktree unlock source &&
+	test_path_is_missing .git/worktrees/source/locked
 
-Switched to branch 'master'
-fatal: Cannot switch branch to a non-commit 'one^{tree}'
-ok 9 - checkout --detach errors out for non-commit
+fatal: 'source' is not locked
+ok 9 - unlock worktree twice
 
 expecting success: 
-	reset &&
-	git checkout master &&
-	test_must_fail git checkout --detach tag one.t &&
-	check_not_detached
+	mkdir abc &&
+	test_must_fail git worktree move abc def
 
-Already on 'master'
-Already on 'master'
-fatal: git checkout: --detach does not take a path argument 'one.t'
-ok 10 - checkout --detach errors out for extra argument
+fatal: 'abc' is not a working tree
+ok 10 - move non-worktree
 
 expecting success: 
-	reset &&
-	test_must_fail git checkout --detach -b newbranch tag &&
-	check_not_detached
+	git worktree lock source &&
+	test_when_finished "git worktree unlock source" &&
+	test_must_fail git worktree move source destination
 
-Already on 'master'
-fatal: '--detach' cannot be used with '-b/-B/--orphan'
-ok 11 - checkout --detached and -b are incompatible
+fatal: cannot move a locked working tree;
+use 'move -f -f' to override or unlock first
+ok 11 - move locked worktree
 
 expecting success: 
-	reset &&
-	git checkout one &&
-	git checkout --detach two &&
-	git diff --exit-code HEAD &&
-	git diff --exit-code two
-
-Already on 'master'
-Note: checking out 'one'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by performing another checkout.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
-
-  git checkout -b <new-branch-name>
+	git worktree move source destination &&
+	test_path_is_missing source &&
+	git worktree list --porcelain >out &&
+	grep "^worktree.*/destination$" out &&
+	! grep "^worktree.*/source$" out &&
+	git -C destination log --format=%s >actual2 &&
+	echo init >expected2 &&
+	test_cmp expected2 actual2
 
-HEAD is now at d79ce16 one
-Previous HEAD position was d79ce16 one
-HEAD is now at 139b20d two
-ok 12 - checkout --detach moves HEAD
+worktree /build/git-2.20.1/t/trash directory.t2028-worktree-move/destination
+ok 12 - move worktree
 
 expecting success: 
-	reset &&
-	git checkout --detach two &&
-	echo content >orphan &&
-	git add orphan &&
-	git commit -a -m orphan1 &&
-	echo new content >orphan &&
-	git commit -a -m orphan2 &&
-	orphan2=$(git rev-parse HEAD) &&
-	git checkout master 2>stderr
+	test_must_fail git worktree move . def
 
-Previous HEAD position was 139b20d two
-Switched to branch 'master'
-HEAD is now at 139b20d two
-[detached HEAD 61e8031] orphan1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 orphan
-[detached HEAD bfea71d] orphan2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 13 - checkout warns on orphan commits
+fatal: '.' is a main working tree
+ok 13 - move main worktree
 
 expecting success: 
-	check_orphan_warning stderr "2 commits"
+	mkdir some-dir &&
+	git worktree move destination some-dir &&
+	test_when_finished "git worktree move some-dir/destination destination" &&
+	test_path_is_missing destination &&
+	git worktree list --porcelain >out &&
+	grep "^worktree.*/some-dir/destination$" out &&
+	git -C some-dir/destination log --format=%s >actual2 &&
+	echo init >expected2 &&
+	test_cmp expected2 actual2
 
-Warning: you are leaving 2 commits behind, not connected to
-ok 14 - checkout warns on orphan commits: output
+worktree /build/git-2.20.1/t/trash directory.t2028-worktree-move/some-dir/destination
+ok 14 - move worktree to another dir
 
 expecting success: 
-	git checkout "$orphan2" &&
-	git checkout HEAD^ 2>stderr
-
-Note: checking out 'bfea71df3731158d55fcf7b9d1ae214132b90e2b'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by performing another checkout.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
-
-  git checkout -b <new-branch-name>
+	test_when_finished "
+		git worktree unlock flump || :
+		git worktree remove flump || :
+		git worktree unlock ploof || :
+		git worktree remove ploof || :
+		" &&
+	git worktree add --detach flump &&
+	git worktree lock flump &&
+	test_must_fail git worktree move flump ploof" &&
+	test_must_fail git worktree move --force flump ploof" &&
+	git worktree move --force --force flump ploof
 
-HEAD is now at bfea71d orphan2
-ok 15 - checkout warns orphaning 1 of 2 commits
+Preparing worktree (detached HEAD 2519212)
+HEAD is now at 2519212 init
+fatal: cannot move a locked working tree;
+use 'move -f -f' to override or unlock first
+fatal: 'flump' is not a working tree
+fatal: 'flump' is not a working tree
+ok 15 - move locked worktree (force)
 
 expecting success: 
-	check_orphan_warning stderr "1 commit"
+	test_must_fail git worktree remove .
 
-Warning: you are leaving 1 commit behind, not connected to
-ok 16 - checkout warns orphaning 1 of 2 commits: output
+fatal: '.' is a main working tree
+ok 16 - remove main worktree
 
 expecting success: 
-	reset &&
-	git checkout --detach two &&
-	git checkout master 2>stderr
-
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  61e8031 orphan1
-
-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> 61e8031
+	git worktree lock destination &&
+	test_when_finished "git worktree unlock destination" &&
+	test_must_fail git worktree remove destination
 
-Switched to branch 'master'
-HEAD is now at 139b20d two
-ok 17 - checkout does not warn leaving ref tip
+fatal: cannot remove a locked working tree;
+use 'remove -f -f' to override or unlock first
+ok 17 - remove locked worktree
 
 expecting success: 
-	check_no_orphan_warning stderr
+	echo dirty >>destination/init.t &&
+	test_when_finished "git -C destination checkout init.t" &&
+	test_must_fail git worktree remove destination
 
-Previous HEAD position was 139b20d two
-ok 18 - checkout does not warn leaving ref tip
+fatal: 'destination' is dirty, use --force to delete it
+ok 18 - remove worktree with dirty tracked file
 
 expecting success: 
-	reset &&
-	git checkout --detach HEAD^ &&
-	git checkout master 2>stderr
+	: >destination/untracked &&
+	test_must_fail git worktree remove destination
 
-Already on 'master'
-HEAD is now at 7c7cd71 three
-ok 19 - checkout does not warn leaving reachable commit
+fatal: 'destination' is dirty, use --force to delete it
+ok 19 - remove worktree with untracked file
 
 expecting success: 
-	check_no_orphan_warning stderr
+	git worktree remove --force destination &&
+	test_path_is_missing destination
 
-Previous HEAD position was 7c7cd71 three
-ok 20 - checkout does not warn leaving reachable commit
+ok 20 - force remove worktree with untracked file
 
 expecting success: 
-	reset &&
-	git branch child master^ &&
-	git config branch.child.remote . &&
-	git config branch.child.merge refs/heads/master &&
-	git checkout child^ &&
-	git checkout child >stdout &&
-	test_i18ncmp expect stdout
-
-Already on 'master'
-Note: checking out 'child^'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by performing another checkout.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
-
-  git checkout -b <new-branch-name>
+	git worktree add to-be-gone &&
+	test -d .git/worktrees/to-be-gone &&
+	mv to-be-gone gone &&
+	git worktree remove to-be-gone &&
+	test_path_is_missing .git/worktrees/to-be-gone
 
-HEAD is now at 139b20d two
-Previous HEAD position was 139b20d two
-Switched to branch 'child'
-ok 21 - tracking count is accurate after orphan check
+Preparing worktree (new branch 'to-be-gone')
+HEAD is now at 2519212 init
+ok 21 - remove missing worktree
 
 expecting success: 
-	# baseline
-	test_config advice.detachedHead true &&
-	git checkout child && git checkout HEAD^0 >expect.advice 2>&1 &&
-	test_config advice.detachedHead false &&
-	git checkout child && git checkout HEAD^0 >expect.no-advice 2>&1 &&
-	test_unconfig advice.detachedHead &&
-	# without configuration, the advice.* variables default to true
-	git checkout child && git checkout HEAD^0 >actual 2>&1 &&
-	test_cmp expect.advice actual &&
+	git worktree add gone-but-locked &&
+	git worktree lock gone-but-locked &&
+	test -d .git/worktrees/gone-but-locked &&
+	mv gone-but-locked really-gone-now &&
+	test_must_fail git worktree remove gone-but-locked &&
+	test_path_is_dir .git/worktrees/gone-but-locked
 
-	# with explicit --detach
-	# no configuration
-	test_unconfig advice.detachedHead &&
-	git checkout child && git checkout --detach HEAD^0 >actual 2>&1 &&
-	test_cmp expect.no-advice actual &&
+Preparing worktree (new branch 'gone-but-locked')
+HEAD is now at 2519212 init
+fatal: cannot remove a locked working tree;
+use 'remove -f -f' to override or unlock first
+ok 22 - NOT remove missing-but-locked worktree
 
-	# explicitly decline advice
-	test_config advice.detachedHead false &&
-	git checkout child && git checkout --detach HEAD^0 >actual 2>&1 &&
-	test_cmp expect.no-advice actual
+expecting success: 
+	for i in noodle noodle/bork
+	do
+		test_must_fail git worktree lock $i 2>err &&
+		test_i18ngrep "not a working tree" err || return 1
+	done
 
-Already on 'child'
-Your branch is behind 'master' by 1 commit, and can be fast-forwarded.
-  (use "git pull" to update your local branch)
-Switched to branch 'child'
-Your branch is behind 'master' by 1 commit, and can be fast-forwarded.
-  (use "git pull" to update your local branch)
-Switched to branch 'child'
-Your branch is behind 'master' by 1 commit, and can be fast-forwarded.
-  (use "git pull" to update your local branch)
-Switched to branch 'child'
-Your branch is behind 'master' by 1 commit, and can be fast-forwarded.
-  (use "git pull" to update your local branch)
-Switched to branch 'child'
-Your branch is behind 'master' by 1 commit, and can be fast-forwarded.
-  (use "git pull" to update your local branch)
-ok 22 - no advice given for explicit detached head state
+fatal: 'noodle' is not a working tree
+fatal: 'noodle/bork' is not a working tree
+ok 23 - proper error when worktree not found
 
 expecting success: 
+	git worktree add --detach gumby &&
+	test_when_finished "git worktree remove gumby || :" &&
+	git worktree lock gumby &&
+	test_when_finished "git worktree unlock gumby || :" &&
+	test_must_fail git worktree remove gumby &&
+	test_must_fail git worktree remove --force gumby &&
+	git worktree remove --force --force gumby
 
-	commit=7c7cd714e262 &&
-	commit2=139b20d8e6c5 &&
-	commit3=d79ce1670bdc &&
-
-	# The first detach operation is more chatty than the following ones.
-	cat >1st_detach <<-EOF &&
-	Note: checking out 'HEAD^'.
+Preparing worktree (detached HEAD 2519212)
+HEAD is now at 2519212 init
+fatal: cannot remove a locked working tree;
+use 'remove -f -f' to override or unlock first
+fatal: cannot remove a locked working tree;
+use 'remove -f -f' to override or unlock first
+fatal: 'gumby' is not a working tree
+fatal: 'gumby' is not a working tree
+ok 24 - remove locked worktree (force)
 
-	You are in 'detached HEAD' state. You can look around, make experimental
-	changes and commit them, and you can discard any commits you make in this
-	state without impacting any branches by performing another checkout.
+expecting success: 
+	git init moog &&
+	(
+		cd moog &&
+		test_commit bim &&
+		git worktree add --detach goom &&
+		test_path_exists .git/worktrees &&
+		git worktree remove goom &&
+		test_path_is_missing .git/worktrees
+	)
 
-	If you want to create a new branch to retain commits you create, you may
-	do so (now or later) by using -b with the checkout command again. Example:
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t2028-worktree-move/moog/.git/
+[master (root-commit) 89d547b] bim
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 bim.t
+Preparing worktree (detached HEAD 89d547b)
+HEAD is now at 89d547b bim
+ok 25 - remove cleans up .git/worktrees when empty
 
-	  git checkout -b <new-branch-name>
+# passed all 25 test(s)
+1..25
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t2102-update-index-symlinks.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t2102-update-index-symlinks/.git/
+expecting success: 
+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
 
-	HEAD is now at $commit three
-	EOF
+expecting success: 
+printf new-file > symlink &&
+git update-index symlink
+ok 2 - modify the symbolic link
 
-	# The remaining ones just show info about previous and current HEADs.
-	cat >2nd_detach <<-EOF &&
-	Previous HEAD position was $commit three
-	HEAD is now at $commit2 two
-	EOF
+expecting success: 
+case "$(git ls-files --stage --cached symlink)" in
+120000" "*symlink) echo pass;;
+*) echo fail; git ls-files --stage --cached symlink; (exit 1);;
+esac
+pass
+ok 3 - the index entry must still be a symbolic link
 
-	cat >3rd_detach <<-EOF &&
-	Previous HEAD position was $commit2 two
-	HEAD is now at $commit3 one
+# passed all 3 test(s)
+1..3
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t2101-update-index-reupdate.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t2101-update-index-reupdate/.git/
+expecting success: 
+	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
 
-	reset &&
-	check_not_detached &&
-
-	# Various ways of *not* asking for ellipses
-
-	sane_unset GIT_PRINT_SHA1_ELLIPSIS &&
-	git -c 'core.abbrev=12' checkout HEAD^ >actual 2>&1 &&
-	check_detached &&
-	test_i18ncmp 1st_detach actual &&
-
-	GIT_PRINT_SHA1_ELLIPSIS=no git -c 'core.abbrev=12' checkout HEAD^ >actual 2>&1 &&
-	check_detached &&
-	test_i18ncmp 2nd_detach actual &&
-
-	GIT_PRINT_SHA1_ELLIPSIS= git -c 'core.abbrev=12' checkout HEAD^ >actual 2>&1 &&
-	check_detached &&
-	test_i18ncmp 3rd_detach actual &&
-
-	sane_unset GIT_PRINT_SHA1_ELLIPSIS &&
-
-	# We only have four commits, but we can re-use them
-	reset &&
-	check_not_detached &&
-
-	# Make no mention of the env var at all
-	git -c 'core.abbrev=12' checkout HEAD^ >actual 2>&1 &&
-	check_detached &&
-	test_i18ncmp 1st_detach actual &&
-
-	GIT_PRINT_SHA1_ELLIPSIS='nope' &&
-	git -c 'core.abbrev=12' checkout HEAD^ >actual 2>&1 &&
-	check_detached &&
-	test_i18ncmp 2nd_detach actual &&
-
-	GIT_PRINT_SHA1_ELLIPSIS=nein &&
-	git -c 'core.abbrev=12' checkout HEAD^ >actual 2>&1 &&
-	check_detached &&
-	test_i18ncmp 3rd_detach actual &&
-
-	true
-
-Previous HEAD position was 7c7cd71 three
-Switched to branch 'master'
-Previous HEAD position was d79ce16 one
-Switched to branch 'master'
-ok 23 - describe_detached_head prints no SHA-1 ellipsis when not asked to
+ok 1 - update-index --add
 
 expecting success: 
+	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
 
-	commit=7c7cd714e262 &&
-	commit2=139b20d8e6c5 &&
-	commit3=d79ce1670bdc &&
-
-	# The first detach operation is more chatty than the following ones.
-	cat >1st_detach <<-EOF &&
-	Note: checking out 'HEAD^'.
+error: file1: does not exist and --remove not passed
+fatal: Unable to process path file1
+happy - failed as expected
+ok 2 - update-index --again
 
-	You are in 'detached HEAD' state. You can look around, make experimental
-	changes and commit them, and you can discard any commits you make in this
-	state without impacting any branches by performing another checkout.
+expecting success: 
+	git update-index --remove --again &&
+	git ls-files -s >current &&
+	cat >expected <<-EOF &&
+	100644 $(git hash-object file2) 0	file2
+	EOF
+	cmp current expected
 
-	If you want to create a new branch to retain commits you create, you may
-	do so (now or later) by using -b with the checkout command again. Example:
+ok 3 - update-index --remove --again
 
-	  git checkout -b <new-branch-name>
+expecting success: git commit -m initial
+[master (root-commit) 7222c2d] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file2
+ok 4 - first commit
 
-	HEAD is now at $commit... three
+expecting success: 
+	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
 
-	# The remaining ones just show info about previous and current HEADs.
-	cat >2nd_detach <<-EOF &&
-	Previous HEAD position was $commit... three
-	HEAD is now at $commit2... two
-	EOF
+ok 5 - update-index again
 
-	cat >3rd_detach <<-EOF &&
-	Previous HEAD position was $commit2... two
-	HEAD is now at $commit3... one
+expecting success: 
+	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
 
-	reset &&
-	check_not_detached &&
-
-	# Various ways of asking for ellipses...
-	# The user can just use any kind of quoting (including none).
-
-	GIT_PRINT_SHA1_ELLIPSIS=yes git -c 'core.abbrev=12' checkout HEAD^ >actual 2>&1 &&
-	check_detached &&
-	test_i18ncmp 1st_detach actual &&
+ok 6 - update-index --update from subdir
 
-	GIT_PRINT_SHA1_ELLIPSIS=Yes git -c 'core.abbrev=12' checkout HEAD^ >actual 2>&1 &&
-	check_detached &&
-	test_i18ncmp 2nd_detach actual &&
+expecting success: 
+	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
 
-	GIT_PRINT_SHA1_ELLIPSIS=YES git -c 'core.abbrev=12' checkout HEAD^ >actual 2>&1 &&
-	check_detached &&
-	test_i18ncmp 3rd_detach actual &&
+ok 7 - update-index --update with pathspec
 
-	true
+# passed all 7 test(s)
+1..7
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t2106-update-index-assume-unchanged.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t2106-update-index-assume-unchanged/.git/
+expecting success: : >file &&
+	 git add file &&
+	 git commit -m initial &&
+	 git branch other &&
+	 echo upstream >file &&
+	 git add file &&
+	 git commit -m upstream
+[master (root-commit) 97e0c96] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 file
+[master 3e82f49] upstream
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 1 - setup
 
-Previous HEAD position was d79ce16 one
-Switched to branch 'master'
-ok 24 - describe_detached_head does print SHA-1 ellipsis when asked to
+expecting success: git reset --hard &&
+	 git checkout other &&
+	 echo dirt >file &&
+	 git update-index --assume-unchanged file &&
+	 test_must_fail git checkout master
+HEAD is now at 3e82f49 upstream
+Switched to branch 'other'
+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 2 - do not switch branches with dirty file
 
-# passed all 24 test(s)
-1..24
+# passed all 2 test(s)
+1..2
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t2050-git-dir-relative.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t2050-git-dir-relative/.git/
-expecting success: 
-mkdir -p .git/hooks &&
-echo >.git/hooks/post-commit "#!/bin/sh
-touch \"\${COMMIT_FILE}\"
-echo Post commit hook was called." &&
-chmod +x .git/hooks/post-commit
-ok 1 - Setting up post-commit hook
-
+*** t2105-update-index-gitfile.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t2105-update-index-gitfile/.git/
 expecting success: 
-echo initial >top &&
-git add top &&
-git commit -m initial &&
-test -r "${COMMIT_FILE}"
+	mkdir sub1 &&
+	(cd sub1 &&
+	 git init &&
+	 REAL="$(pwd)/.real" &&
+	 mv .git "$REAL" &&
+	 echo "gitdir: $REAL" >.git &&
+	 test_commit first)
 
-Post commit hook was called.
-[master (root-commit) c93fdaf] initial
+Initialized empty Git repository in /build/git-2.20.1/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 top
-ok 2 - post-commit hook used ordinarily
+ create mode 100644 first.t
+ok 1 - submodule with absolute .git file
 
 expecting success: 
-echo changed >top &&
-git --git-dir subdir/.git add top &&
-git --git-dir subdir/.git commit -m topcommit &&
-test -r "${COMMIT_FILE}"
+	git update-index --add -- sub1
 
-Post commit hook was called.
-[master 8a12be9] topcommit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 3 - post-commit-hook created and used from top dir
+ok 2 - add gitlink to absolute .git file
 
 expecting success: 
-echo changed again >top &&
-cd subdir &&
-git --git-dir .git --work-tree .. add ../top &&
-git --git-dir .git --work-tree .. commit -m subcommit &&
-test -r "${COMMIT_FILE}"
+	mkdir sub2 &&
+	(cd sub2 &&
+	 git init &&
+	 mv .git .real &&
+	 echo "gitdir: .real" >.git &&
+	 test_commit first)
 
-Post commit hook was called.
-[master 601a3f2] subcommit
+Initialized empty Git repository in /build/git-2.20.1/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(+), 1 deletion(-)
-ok 4 - post-commit-hook from sub dir
+ 1 file changed, 1 insertion(+)
+ create mode 100644 first.t
+ok 3 - submodule with relative .git file
+
+expecting success: 
+	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/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t2029-worktree-config.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t2029-worktree-config/.git/
+*** t2104-update-index-skip-worktree.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t2104-update-index-skip-worktree/.git/
 expecting success: 
-	test_commit start
+	mkdir sub &&
+	touch ./1 ./2 sub/1 sub/2 &&
+	git add 1 2 sub/1 sub/2 &&
+	git ls-files -t | test_cmp expect.full -
 
-[master (root-commit) bb4ab09] start
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 start.t
 ok 1 - setup
 
 expecting success: 
-	git config --worktree foo.bar true &&
-	test_cmp_config true foo.bar
+	test "$(test-tool index-version < .git/index)" = 2
 
-ok 2 - config --worktree in single worktree
+ok 2 - index is at version 2
 
 expecting success: 
-	git worktree add wt1 &&
-	git worktree add wt2
+	git update-index --skip-worktree 1 sub/1 &&
+	git ls-files -t | test_cmp expect.skip -
 
-Preparing worktree (new branch 'wt1')
-HEAD is now at bb4ab09 start
-Preparing worktree (new branch 'wt2')
-HEAD is now at bb4ab09 start
-ok 3 - add worktrees
+ok 3 - update-index --skip-worktree
 
 expecting success: 
-	test_must_fail git config --worktree foo.bar false
+	test "$(test-tool index-version < .git/index)" = 3
 
-fatal: --worktree cannot be used with multiple working trees unless the config
-extension worktreeConfig is enabled. Please read "CONFIGURATION FILE"
-section in "git help worktree" for details
-ok 4 - config --worktree without extension
+ok 4 - index is at version 3 after having some skip-worktree entries
 
 expecting success: 
-	git config extensions.worktreeConfig true &&
-	test_cmp_config true extensions.worktreeConfig
+	git ls-files -t | test_cmp expect.skip -
 
-ok 5 - enable worktreeConfig extension
+ok 5 - ls-files -t
 
 expecting success: 
-	git config this.is shared &&
-	test_cmp_config shared this.is &&
-	test_cmp_config -C wt1 shared this.is &&
-	test_cmp_config -C wt2 shared this.is
+	git update-index --no-skip-worktree 1 sub/1 &&
+	git ls-files -t | test_cmp expect.full -
 
-ok 6 - config is shared as before
+ok 6 - update-index --no-skip-worktree
 
 expecting success: 
-	git -C wt1 config that.is also-shared &&
-	test_cmp_config also-shared that.is &&
-	test_cmp_config -C wt1 also-shared that.is &&
-	test_cmp_config -C wt2 also-shared that.is
+	test "$(test-tool index-version < .git/index)" = 2
 
-ok 7 - config is shared (set from another worktree)
+ok 7 - index version is back to 2 when there is no skip-worktree entry
 
+# passed all 7 test(s)
+1..7
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t2103-update-index-ignore-missing.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t2103-update-index-ignore-missing/.git/
 expecting success: 
-	git config --worktree this.is for-main &&
-	test_cmp_config for-main this.is &&
-	test_cmp_config -C wt1 shared this.is &&
-	test_cmp_config -C wt2 shared this.is
+	>one &&
+	>two &&
+	>three &&
 
-ok 8 - config private to main worktree
+	# need --add when adding
+	test_must_fail git update-index one &&
+	test -z "$(git ls-files)" &&
+	git update-index --add one &&
+	test zone = "z$(git ls-files)" &&
+
+	# update-index is atomic
+	echo 1 >one &&
+	test_must_fail git update-index one two &&
+	echo "M	one" >expect &&
+	git diff-files --name-status >actual &&
+	test_cmp expect actual &&
+
+	git update-index --add one two three &&
+	for i in one three two; do echo $i; done >expect &&
+	git ls-files >actual &&
+	test_cmp expect actual &&
+
+	test_tick &&
+	(
+		test_create_repo xyzzy &&
+		cd xyzzy &&
+		>file &&
+		git add file &&
+		git commit -m "sub initial"
+	) &&
+	git add xyzzy &&
+
+	test_tick &&
+	git commit -m initial &&
+	git tag initial
+
+error: one: cannot add to the index - missing --add option?
+fatal: Unable to process path one
+error: two: cannot add to the index - missing --add option?
+fatal: Unable to process path two
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t2103-update-index-ignore-missing/xyzzy/.git/
+[master (root-commit) a40d181] sub initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 file
+warning: adding embedded git repository: xyzzy
+hint: You've added another git repository inside your current repository.
+hint: Clones of the outer repository will not contain the contents of
+hint: the embedded repository and will not know how to obtain it.
+hint: If you meant to add a submodule, use:
+hint: 
+hint: 	git submodule add <url> xyzzy
+hint: 
+hint: If you added this path by mistake, you can remove it from the
+hint: index with:
+hint: 
+hint: 	git rm --cached xyzzy
+hint: 
+hint: See "git help submodule" for more information.
+[master (root-commit) ce14d7f] initial
+ Author: A U Thor <author@example.com>
+ 4 files changed, 2 insertions(+)
+ create mode 100644 one
+ create mode 100644 three
+ create mode 100644 two
+ create mode 160000 xyzzy
+ok 1 - basics
 
 expecting success: 
-	git -C wt1 config --worktree this.is for-wt1 &&
-	test_cmp_config for-main this.is &&
-	test_cmp_config -C wt1 for-wt1 this.is &&
-	test_cmp_config -C wt2 shared this.is
+	git reset --hard initial &&
+	echo 2 >one &&
+	test_must_fail git update-index --refresh &&
+	echo 1 >one &&
+	git update-index --refresh &&
+	rm -f two &&
+	test_must_fail git update-index --refresh &&
+	git update-index --ignore-missing --refresh
 
-ok 9 - config private to linked worktree
+
+HEAD is now at ce14d7f initial
+one: needs update
+two: needs update
+ok 2 - --ignore-missing --refresh
 
 expecting success: 
-	test_config core.bare true &&
-	test "$(git rev-parse --is-bare-repository)" = true &&
-	test "$(git -C wt1 rev-parse --is-bare-repository)" = true &&
-	test "$(git -C wt2 rev-parse --is-bare-repository)" = true
+	git reset --hard initial &&
+	info=$(git ls-files -s one | sed -e "s/ 0	/ 1	/") &&
+	git rm --cached one &&
+	echo "$info" | git update-index --index-info &&
+	test_must_fail git update-index --refresh &&
+	git update-index --unmerged --refresh &&
+	echo 2 >two &&
+	test_must_fail git update-index --unmerged --refresh >actual &&
+	grep two actual &&
+	! grep one actual &&
+	! grep three actual
 
-ok 10 - core.bare no longer for main only
+HEAD is now at ce14d7f initial
+rm 'one'
+one: needs merge
+two: needs update
+ok 3 - --unmerged --refresh
 
 expecting success: 
-	git -C wt1 config --worktree core.bare true &&
-	test "$(git rev-parse --is-bare-repository)" = false &&
-	test "$(git -C wt1 rev-parse --is-bare-repository)" = true &&
-	test "$(git -C wt2 rev-parse --is-bare-repository)" = false
+	git reset --hard initial &&
+	rm -f two &&
+	test_must_fail git update-index --ignore-submodules --refresh
 
-ok 11 - per-worktree core.bare is picked up
+HEAD is now at ce14d7f initial
+two: needs update
+ok 4 - --ignore-submodules --refresh (1)
 
 expecting success: 
-	git config --unset extensions.worktreeConfig &&
-	test_cmp_config shared this.is &&
-	test_cmp_config -C wt1 shared this.is &&
-	test_cmp_config -C wt2 shared this.is
+	git reset --hard initial &&
+	test_tick &&
+	(
+		cd xyzzy &&
+		git commit -m "sub second" --allow-empty
+	) &&
+	test_must_fail git update-index --refresh &&
+	test_must_fail git update-index --ignore-missing --refresh &&
+	git update-index --ignore-submodules --refresh
 
-ok 12 - config.worktree no longer read without extension
+HEAD is now at ce14d7f initial
+[master 66f0d66] sub second
+ Author: A U Thor <author@example.com>
+xyzzy: needs update
+xyzzy: needs update
+ok 5 - --ignore-submodules --refresh (2)
 
-# passed all 12 test(s)
-1..12
+# passed all 5 test(s)
+1..5
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t2100-update-cache-badpath.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t2100-update-cache-badpath/.git/
-checking prerequisite: SYMLINKS
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
-	# test whether the filesystem supports symbolic links
-	ln -s x y && test -h y
+*** t2202-add-addremove.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t2202-add-addremove/.git/
+expecting success: 
+	(
+		echo .gitignore &&
+		echo will-remove
+	) >expect &&
+	(
+		echo actual &&
+		echo expect &&
+		echo ignored
+	) >.gitignore &&
+	git --literal-pathspecs add --all &&
+	>will-remove &&
+	git add --all &&
+	test_tick &&
+	git commit -m initial &&
+	git ls-files >actual &&
+	test_cmp expect actual
 
-)
-prerequisite SYMLINKS ok
-expecting success: git update-index --add -- path0 path1 path2/file2 path3/file3
-ok 1 - git update-index --add to add various paths.
+[master (root-commit) 50dd5d8] initial
+ Author: A U Thor <author@example.com>
+ 2 files changed, 3 insertions(+)
+ create mode 100644 .gitignore
+ create mode 100644 will-remove
+ok 1 - setup
 
-expecting success: 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: 
+	(
+		echo .gitignore &&
+		echo not-ignored &&
+		echo "M	.gitignore" &&
+		echo "A	not-ignored" &&
+		echo "D	will-remove"
+	) >expect &&
+	>ignored &&
+	>not-ignored &&
+	echo modification >>.gitignore &&
+	rm -f will-remove &&
+	git add --all &&
+	git update-index --refresh &&
+	git ls-files >actual &&
+	git diff-index --name-status --cached HEAD >>actual &&
+	test_cmp expect actual
 
-expecting success: test_must_fail git update-index --add -- path1/file1
-error: 'path1/file1' appears as both a file and as a directory
-error: path1/file1: cannot add to the index - missing --add option?
-fatal: Unable to process path path1/file1
-ok 3 - git update-index to add conflicting path path1/file1 should fail.
+ok 2 - git add --all
 
-expecting success: test_must_fail git update-index --add -- path2
-error: 'path2' appears as both a file and as a directory
-error: path2: cannot add to the index - missing --add option?
-fatal: Unable to process path path2
-ok 4 - git update-index to add conflicting path path2 should fail.
+expecting success: 
+	git reset --hard &&
+	echo >will-remove &&
+	>will-not-be-added &&
+	git add &&
+	git diff-index --name-status --cached HEAD >actual &&
+	test_must_be_empty actual
 
-expecting success: test_must_fail git update-index --add -- path3
-error: 'path3' appears as both a file and as a directory
-error: path3: cannot add to the index - missing --add option?
-fatal: Unable to process path path3
-ok 5 - git update-index to add conflicting path path3 should fail.
+HEAD is now at 50dd5d8 initial
+Nothing specified, nothing added.
+Maybe you wanted to say 'git add .'?
+ok 3 - Just "git add" is a no-op
 
-# passed all 5 test(s)
-1..5
+# passed all 3 test(s)
+1..3
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
 *** t1450-fsck.sh ***
@@ -45390,7 +46585,7 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 6.0484e-05 s, 16.5 kB/s
+1 byte copied, 5.6492e-05 s, 17.7 kB/s
 error: .git/objects/pack/pack-8be9f6a4139bcddd74c3d2ed343bb71e87863c4b.pack pack checksum mismatch
 ok 68 - fsck fails on corrupt packfile
 
@@ -45532,923 +46727,1385 @@
 1..76
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t2027-worktree-list.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t2027-worktree-list/.git/
+*** t2024-checkout-dwim.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t2024-checkout-dwim/.git/
 expecting success: 
-	test_commit init
+	test_commit my_master &&
+	git init repo_a &&
+	(
+		cd repo_a &&
+		test_commit a_master &&
+		git checkout -b foo &&
+		test_commit a_foo &&
+		git checkout -b bar &&
+		test_commit a_bar
+	) &&
+	git init repo_b &&
+	(
+		cd repo_b &&
+		test_commit b_master &&
+		git checkout -b foo &&
+		test_commit b_foo &&
+		git checkout -b baz &&
+		test_commit b_baz
+	) &&
+	git remote add repo_a repo_a &&
+	git remote add repo_b repo_b &&
+	git config remote.repo_b.fetch \
+		"+refs/heads/*:refs/remotes/other_b/*" &&
+	git fetch --all
 
-[master (root-commit) 2519212] init
+[master (root-commit) 93159a7] my_master
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 init.t
+ create mode 100644 my_master.t
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t2024-checkout-dwim/repo_a/.git/
+[master (root-commit) 9480204] a_master
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 a_master.t
+Switched to a new branch 'foo'
+[foo ba3a763] a_foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 a_foo.t
+Switched to a new branch 'bar'
+[bar 1901e7e] a_bar
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 a_bar.t
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t2024-checkout-dwim/repo_b/.git/
+[master (root-commit) eb1360a] b_master
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b_master.t
+Switched to a new branch 'foo'
+[foo 73c9fcf] b_foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b_foo.t
+Switched to a new branch 'baz'
+[baz a4f4a16] b_baz
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b_baz.t
+Fetching repo_a
+warning: no common commits
+From repo_a
+ * [new branch]      bar        -> repo_a/bar
+ * [new branch]      foo        -> repo_a/foo
+ * [new branch]      master     -> repo_a/master
+ * [new tag]         a_bar      -> a_bar
+ * [new tag]         a_foo      -> a_foo
+ * [new tag]         a_master   -> a_master
+Fetching repo_b
+warning: no common commits
+From repo_b
+ * [new branch]      baz        -> other_b/baz
+ * [new branch]      foo        -> other_b/foo
+ * [new branch]      master     -> other_b/master
+ * [new tag]         b_baz      -> b_baz
+ * [new tag]         b_foo      -> b_foo
+ * [new tag]         b_master   -> b_master
 ok 1 - setup
 
 expecting success: 
-	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
+	git checkout -B master &&
+	test_might_fail git branch -D xyzzy &&
 
-expecting success: 
-	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 master &&
-	git -C linked-tree rev-parse --git-path objects >actual &&
-	test_cmp expect actual
+	test_must_fail git checkout xyzzy &&
+	status_uno_is_clean &&
+	test_must_fail git rev-parse --verify refs/heads/xyzzy &&
+	test_branch master
 
-Preparing worktree (detached HEAD 2519212)
-HEAD is now at 2519212 init
-ok 3 - rev-parse --git-path objects linked worktree
+Reset branch 'master'
+error: branch 'xyzzy' not found.
+error: pathspec 'xyzzy' did not match any file(s) known to git
+fatal: Needed a single revision
+ok 2 - checkout of non-existing branch fails
 
 expecting success: 
-	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 master &&
-	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
+	git checkout -B master &&
+	test_might_fail git branch -D foo &&
 
-expecting success: 
-	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 master &&
-	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
+	test_must_fail git checkout foo &&
+	status_uno_is_clean &&
+	test_must_fail git rev-parse --verify refs/heads/foo &&
+	test_branch master
 
-Preparing worktree (detached HEAD 2519212)
-HEAD is now at 2519212 init
-ok 5 - "list" all worktrees from linked
+Reset branch 'master'
+error: branch 'foo' not found.
+error: pathspec 'foo' did not match any file(s) known to git
+hint: 'foo' matched more than one remote tracking branch.
+hint: We found 2 remotes with a reference that matched. So we fell back
+hint: on trying to resolve the argument as a path, but failed there too!
+hint: 
+hint: If you meant to check out a remote tracking branch on, e.g. 'origin',
+hint: you can do so by fully qualifying the name with the --track option:
+hint: 
+hint:     git checkout --track origin/<name>
+hint: 
+hint: If you'd like to always have checkouts of an ambiguous <name> prefer
+hint: one remote, e.g. the 'origin' remote, consider setting
+hint: checkout.defaultRemote=origin in your config.
+fatal: Needed a single revision
+ok 3 - checkout of branch from multiple remotes fails #1
 
 expecting success: 
-	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 master &&
-	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
+	git checkout -B master &&
+	test_might_fail git branch -D foo &&
+	test_must_fail git checkout foo 2>stderr &&
+	test_branch master &&
+	status_uno_is_clean &&
+	test_i18ngrep "^hint: " stderr &&
+	test_must_fail git -c advice.checkoutAmbiguousRemoteBranchName=false \
+		checkout foo 2>stderr &&
+	test_branch master &&
+	status_uno_is_clean &&
+	test_i18ngrep ! "^hint: " stderr
 
-Preparing worktree (detached HEAD 2519212)
-HEAD is now at 2519212 init
-ok 6 - "list" all worktrees --porcelain
+Reset branch 'master'
+error: branch 'foo' not found.
+hint: 'foo' matched more than one remote tracking branch.
+hint: We found 2 remotes with a reference that matched. So we fell back
+hint: on trying to resolve the argument as a path, but failed there too!
+hint: 
+hint: If you meant to check out a remote tracking branch on, e.g. 'origin',
+hint: you can do so by fully qualifying the name with the --track option:
+hint: 
+hint:     git checkout --track origin/<name>
+hint: 
+hint: If you'd like to always have checkouts of an ambiguous <name> prefer
+hint: one remote, e.g. the 'origin' remote, consider setting
+hint: checkout.defaultRemote=origin in your config.
+ok 4 - checkout of branch from multiple remotes fails with advice
 
 expecting success: 
-	git init --bare bare1 &&
-	echo "data" >file1 &&
-	git add file1 &&
-	git commit -m"File1: add data" &&
-	git push bare1 master &&
-	git reset --hard HEAD^
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t2027-worktree-list/bare1/
-[master 7c81006] File1: add data
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file1
-To bare1
- * [new branch]      master -> master
-HEAD is now at 2519212 init
-ok 7 - bare repo setup
+	git checkout -B master &&
+	test_might_fail git branch -D foo &&
 
-expecting success: 
-	test_when_finished "rm -rf there out actual expect && git -C bare1 worktree prune" &&
-	git -C bare1 worktree add --detach ../there master &&
-	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
+	git checkout -p foo 2>stderr &&
+	test_i18ngrep ! "^hint: " stderr &&
+	status_uno_is_clean
 
-Preparing worktree (detached HEAD 7c81006)
-HEAD is now at 7c81006 File1: add data
-ok 8 - "list" all worktrees from bare main
+Reset branch 'master'
+error: branch 'foo' not found.
+ok 5 - checkout -p with multiple remotes does not print advice
 
 expecting success: 
-	test_when_finished "rm -rf there actual expect && git -C bare1 worktree prune" &&
-	git -C bare1 worktree add --detach ../there master &&
-	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
+	git checkout -B master &&
+	status_uno_is_clean &&
+	test_might_fail git branch -D foo &&
 
-Preparing worktree (detached HEAD 7c81006)
-HEAD is now at 7c81006 File1: add data
-ok 9 - "list" all worktrees --porcelain from bare main
+	git -c checkout.defaultRemote=repo_a checkout foo &&
+	status_uno_is_clean &&
+	test_branch foo &&
+	test_cmp_rev remotes/repo_a/foo HEAD &&
+	test_branch_upstream foo repo_a foo
+
+Reset branch 'master'
+error: branch 'foo' not found.
+Switched to a new branch 'foo'
+Branch 'foo' set up to track remote branch 'foo' from 'repo_a'.
+ok 6 - checkout of branch from multiple remotes succeeds with checkout.defaultRemote #1
 
 expecting success: 
-	test_when_finished "rm -rf there out actual expect && git -C bare1 worktree prune" &&
-	git -C bare1 worktree add --detach ../there master &&
-	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
+	git checkout -B master &&
+	test_might_fail git branch -D bar &&
 
-Preparing worktree (detached HEAD 7c81006)
-HEAD is now at 7c81006 File1: add data
-ok 10 - "list" all worktrees from linked with a bare main
+	git checkout bar &&
+	status_uno_is_clean &&
+	test_branch bar &&
+	test_cmp_rev remotes/repo_a/bar HEAD &&
+	test_branch_upstream bar repo_a bar
+
+Switched to and reset branch 'master'
+error: branch 'bar' not found.
+Switched to a new branch 'bar'
+Branch 'bar' set up to track remote branch 'bar' from 'repo_a'.
+ok 7 - checkout of branch from a single remote succeeds #1
 
 expecting success: 
-	rm -rf bare1
+	git checkout -B master &&
+	test_might_fail git branch -D baz &&
 
-ok 11 - bare repo cleanup
+	git checkout baz &&
+	status_uno_is_clean &&
+	test_branch baz &&
+	test_cmp_rev remotes/other_b/baz HEAD &&
+	test_branch_upstream baz repo_b baz
+
+Switched to and reset branch 'master'
+error: branch 'baz' not found.
+Switched to a new branch 'baz'
+Branch 'baz' set up to track remote branch 'baz' from 'repo_b'.
+ok 8 - checkout of branch from a single remote succeeds #2
 
 expecting success: 
-	git init broken-main &&
-	(
-		cd broken-main &&
-		test_commit new &&
-		git worktree add linked &&
-		cat >expected <<-EOF &&
-		worktree $(pwd)
-		HEAD $ZERO_OID
+	git checkout -B master &&
+	status_uno_is_clean &&
+	test_might_fail git branch -D bar &&
 
-		EOF
-		cd linked &&
-		echo "worktree $(pwd)" >expected &&
-		echo "ref: .broken" >../.git/HEAD &&
-		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
-	)
+	test_must_fail git checkout --no-guess bar &&
+	test_must_fail git rev-parse --verify refs/heads/bar &&
+	test_branch master
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t2027-worktree-list/broken-main/.git/
-[master (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/git-2.20.1/t/trash directory.t2027-worktree-list/broken-main         0000000 (error)
-ok 12 - broken main worktree still at the top
+Switched to and reset branch 'master'
+Deleted branch bar (was 1901e7e).
+error: pathspec 'bar' did not match any file(s) known to git
+fatal: Needed a single revision
+ok 9 - --no-guess suppresses branch auto-vivification
 
 expecting success: 
-	mkdir sorted &&
-	git init sorted/main &&
+	git checkout -B master &&
+	status_uno_is_clean &&
+	git init repo_c &&
 	(
-		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
+		cd repo_c &&
+		test_commit c_master &&
+		git checkout -b bar &&
+		test_commit c_bar &&
+		git checkout -b spam &&
+		test_commit c_spam
 	) &&
-	cat >expected <<-EOF &&
-	worktree $(pwd)/sorted/main
-	worktree $(pwd)/sorted/first
-	worktree $(pwd)/sorted/second
-	EOF
-	test_cmp expected sorted/main/actual
+	git init repo_d &&
+	(
+		cd repo_d &&
+		test_commit d_master &&
+		git checkout -b baz &&
+		test_commit d_baz &&
+		git checkout -b eggs &&
+		test_commit d_eggs
+	) &&
+	git remote add repo_c repo_c &&
+	git config remote.repo_c.fetch \
+		"+refs/heads/*:refs/remotes/extra_dir/repo_c/extra_dir/*" &&
+	git remote add repo_d repo_d &&
+	git config remote.repo_d.fetch \
+		"+refs/heads/*:refs/repo_d/*" &&
+	git fetch --all
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t2027-worktree-list/sorted/main/.git/
-[master (root-commit) d8ef111] new
+Reset branch 'master'
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t2024-checkout-dwim/repo_c/.git/
+[master (root-commit) dc015ba] c_master
  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 13 - linked worktrees are sorted
-
-# passed all 13 test(s)
-1..13
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t2028-worktree-move.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t2028-worktree-move/.git/
-expecting success: 
-	test_commit init &&
-	git worktree add source &&
-	git worktree list --porcelain >out &&
-	grep "^worktree" out >actual &&
-	cat <<-EOF >expected &&
-	worktree $(pwd)
-	worktree $(pwd)/source
-	EOF
-	test_cmp expected actual
-
-[master (root-commit) 2519212] init
+ create mode 100644 c_master.t
+Switched to a new branch 'bar'
+[bar a433ad7] c_bar
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 init.t
-Preparing worktree (new branch 'source')
-HEAD is now at 2519212 init
-ok 1 - setup
+ create mode 100644 c_bar.t
+Switched to a new branch 'spam'
+[spam 1702b85] c_spam
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c_spam.t
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t2024-checkout-dwim/repo_d/.git/
+[master (root-commit) f130d8f] d_master
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 d_master.t
+Switched to a new branch 'baz'
+[baz aff1e77] d_baz
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 d_baz.t
+Switched to a new branch 'eggs'
+[eggs fea4556] d_eggs
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 d_eggs.t
+Fetching repo_a
+Fetching repo_b
+Fetching repo_c
+warning: no common commits
+From repo_c
+ * [new branch]      bar        -> extra_dir/repo_c/extra_dir/bar
+ * [new branch]      master     -> extra_dir/repo_c/extra_dir/master
+ * [new branch]      spam       -> extra_dir/repo_c/extra_dir/spam
+ * [new tag]         c_bar      -> c_bar
+ * [new tag]         c_master   -> c_master
+ * [new tag]         c_spam     -> c_spam
+Fetching repo_d
+warning: no common commits
+From repo_d
+ * [new branch]      baz        -> refs/repo_d/baz
+ * [new branch]      eggs       -> refs/repo_d/eggs
+ * [new branch]      master     -> refs/repo_d/master
+ * [new tag]         d_baz      -> d_baz
+ * [new tag]         d_eggs     -> d_eggs
+ * [new tag]         d_master   -> d_master
+ok 10 - setup more remotes with unconventional refspecs
 
 expecting success: 
-	test_must_fail git worktree lock .
+	git checkout -B master &&
+	status_uno_is_clean &&
+	test_might_fail git branch -D bar &&
 
-fatal: The main working tree cannot be locked or unlocked
-ok 2 - lock main worktree
+	test_must_fail git checkout bar &&
+	status_uno_is_clean &&
+	test_must_fail git rev-parse --verify refs/heads/bar &&
+	test_branch master
+
+Reset branch 'master'
+error: branch 'bar' not found.
+error: pathspec 'bar' did not match any file(s) known to git
+hint: 'bar' matched more than one remote tracking branch.
+hint: We found 2 remotes with a reference that matched. So we fell back
+hint: on trying to resolve the argument as a path, but failed there too!
+hint: 
+hint: If you meant to check out a remote tracking branch on, e.g. 'origin',
+hint: you can do so by fully qualifying the name with the --track option:
+hint: 
+hint:     git checkout --track origin/<name>
+hint: 
+hint: If you'd like to always have checkouts of an ambiguous <name> prefer
+hint: one remote, e.g. the 'origin' remote, consider setting
+hint: checkout.defaultRemote=origin in your config.
+fatal: Needed a single revision
+ok 11 - checkout of branch from multiple remotes fails #2
 
 expecting success: 
-	git worktree lock --reason hahaha source &&
-	echo hahaha >expected &&
-	test_cmp expected .git/worktrees/source/locked
+	git checkout -B master &&
+	status_uno_is_clean &&
+	test_might_fail git branch -D baz &&
 
-ok 3 - lock linked worktree
+	test_must_fail git checkout baz &&
+	status_uno_is_clean &&
+	test_must_fail git rev-parse --verify refs/heads/baz &&
+	test_branch master
+
+Reset branch 'master'
+Deleted branch baz (was a4f4a16).
+error: pathspec 'baz' did not match any file(s) known to git
+hint: 'baz' matched more than one remote tracking branch.
+hint: We found 2 remotes with a reference that matched. So we fell back
+hint: on trying to resolve the argument as a path, but failed there too!
+hint: 
+hint: If you meant to check out a remote tracking branch on, e.g. 'origin',
+hint: you can do so by fully qualifying the name with the --track option:
+hint: 
+hint:     git checkout --track origin/<name>
+hint: 
+hint: If you'd like to always have checkouts of an ambiguous <name> prefer
+hint: one remote, e.g. the 'origin' remote, consider setting
+hint: checkout.defaultRemote=origin in your config.
+fatal: Needed a single revision
+ok 12 - checkout of branch from multiple remotes fails #3
 
 expecting success: 
-	rm .git/worktrees/source/locked &&
-	git worktree add elsewhere &&
-	git -C elsewhere worktree lock --reason hahaha ../source &&
-	echo hahaha >expected &&
-	test_cmp expected .git/worktrees/source/locked
+	git checkout -B master &&
+	status_uno_is_clean &&
+	test_might_fail git branch -D spam &&
 
-Preparing worktree (new branch 'elsewhere')
-HEAD is now at 2519212 init
-ok 4 - lock linked worktree from another worktree
+	git checkout spam &&
+	status_uno_is_clean &&
+	test_branch spam &&
+	test_cmp_rev refs/remotes/extra_dir/repo_c/extra_dir/spam HEAD &&
+	test_branch_upstream spam repo_c spam
+
+Reset branch 'master'
+error: branch 'spam' not found.
+Switched to a new branch 'spam'
+Branch 'spam' set up to track remote branch 'spam' from 'repo_c'.
+ok 13 - checkout of branch from a single remote succeeds #3
 
 expecting success: 
-	test_must_fail git worktree lock source &&
-	echo hahaha >expected &&
-	test_cmp expected .git/worktrees/source/locked
+	git checkout -B master &&
+	status_uno_is_clean &&
+	test_might_fail git branch -D eggs &&
 
-fatal: 'source' is already locked, reason: hahaha
-ok 5 - lock worktree twice
+	git checkout eggs &&
+	status_uno_is_clean &&
+	test_branch eggs &&
+	test_cmp_rev refs/repo_d/eggs HEAD &&
+	test_branch_upstream eggs repo_d eggs
+
+Switched to and reset branch 'master'
+error: branch 'eggs' not found.
+Switched to a new branch 'eggs'
+Branch 'eggs' set up to track remote branch 'eggs' from 'repo_d'.
+ok 14 - checkout of branch from a single remote succeeds #4
 
 expecting success: 
-	test_must_fail git -C source worktree lock . &&
-	echo hahaha >expected &&
-	test_cmp expected .git/worktrees/source/locked
+	git checkout -B master &&
+	status_uno_is_clean &&
+	test_might_fail git branch -D spam &&
 
-fatal: '.' is already locked, reason: hahaha
-ok 6 - lock worktree twice (from the locked worktree)
+	>spam &&
+	test_must_fail git checkout spam &&
+	status_uno_is_clean &&
+	test_must_fail git rev-parse --verify refs/heads/spam &&
+	test_branch master
+
+Switched to and reset branch 'master'
+Deleted branch spam (was 1702b85).
+error: pathspec 'spam' did not match any file(s) known to git
+fatal: Needed a single revision
+ok 15 - checkout of branch with a file having the same name fails
 
 expecting success: 
-	test_must_fail git worktree unlock .
+	git checkout -B master &&
+	status_uno_is_clean &&
+	test_might_fail git branch -D spam &&
 
-fatal: The main working tree cannot be locked or unlocked
-ok 7 - unlock main worktree
+	>spam &&
+	mkdir sub &&
+	mv spam sub/spam &&
+	test_must_fail git -C sub checkout spam &&
+	status_uno_is_clean &&
+	test_must_fail git rev-parse --verify refs/heads/spam &&
+	test_branch master
+
+Reset branch 'master'
+error: branch 'spam' not found.
+error: pathspec 'spam' did not match any file(s) known to git
+fatal: Needed a single revision
+ok 16 - checkout of branch with a file in subdir having the same name fails
 
 expecting success: 
-	git worktree unlock source &&
-	test_path_is_missing .git/worktrees/source/locked
+	git checkout -B master &&
+	status_uno_is_clean &&
+	test_might_fail git branch -D spam &&
 
-ok 8 - unlock linked worktree
+	>spam &&
+	git checkout spam -- &&
+	status_uno_is_clean &&
+	test_branch spam &&
+	test_cmp_rev refs/remotes/extra_dir/repo_c/extra_dir/spam HEAD &&
+	test_branch_upstream spam repo_c spam
+
+Reset branch 'master'
+error: branch 'spam' not found.
+Switched to a new branch 'spam'
+Branch 'spam' set up to track remote branch 'spam' from 'repo_c'.
+ok 17 - checkout <branch> -- succeeds, even if a file with the same name exists
 
 expecting success: 
-	test_must_fail git worktree unlock source &&
-	test_path_is_missing .git/worktrees/source/locked
 
-fatal: 'source' is not locked
-ok 9 - unlock worktree twice
+	git checkout master &&
+	status_uno_is_clean &&
+	git branch strict &&
+	git branch loose &&
+	git commit --allow-empty -m "a bit more" &&
 
-expecting success: 
-	mkdir abc &&
-	test_must_fail git worktree move abc def
+	test_config branch.strict.remote . &&
+	test_config branch.loose.remote . &&
+	test_config branch.strict.merge refs/heads/master &&
+	test_config branch.loose.merge master &&
 
-fatal: 'abc' is not a working tree
-ok 10 - move non-worktree
+	git checkout strict | sed -e "s/strict/BRANCHNAME/g" >expect &&
+	status_uno_is_clean &&
+	git checkout loose | sed -e "s/loose/BRANCHNAME/g" >actual &&
+	status_uno_is_clean &&
 
-expecting success: 
-	git worktree lock source &&
-	test_when_finished "git worktree unlock source" &&
-	test_must_fail git worktree move source destination
+	test_cmp expect actual
 
-fatal: cannot move a locked working tree;
-use 'move -f -f' to override or unlock first
-ok 11 - move locked worktree
+Switched to branch 'master'
+[master b3a488e] a bit more
+ Author: A U Thor <author@example.com>
+Switched to branch 'strict'
+Switched to branch 'loose'
+ok 18 - loosely defined local base branch is reported correctly
 
+# passed all 18 test(s)
+1..18
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t2030-unresolve-info.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t2030-unresolve-info/.git/
 expecting success: 
-	git worktree move source destination &&
-	test_path_is_missing source &&
-	git worktree list --porcelain >out &&
-	grep "^worktree.*/destination$" out &&
-	! grep "^worktree.*/source$" out &&
-	git -C destination log --format=%s >actual2 &&
-	echo init >expected2 &&
-	test_cmp expected2 actual2
+	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 master
 
-worktree /build/git-2.20.1/t/trash directory.t2028-worktree-move/destination
-ok 12 - move worktree
+[master (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
+[master 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 'master'
+ok 1 - setup
 
 expecting success: 
-	test_must_fail git worktree move . def
+	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
 
-fatal: '.' is a main working tree
-ok 13 - move main worktree
+HEAD is now at 9a00f99 second
+Note: checking out 'second^0'.
 
-expecting success: 
-	mkdir some-dir &&
-	git worktree move destination some-dir &&
-	test_when_finished "git worktree move some-dir/destination destination" &&
-	test_path_is_missing destination &&
-	git worktree list --porcelain >out &&
-	grep "^worktree.*/some-dir/destination$" out &&
-	git -C some-dir/destination log --format=%s >actual2 &&
-	echo init >expected2 &&
-	test_cmp expected2 actual2
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by performing another checkout.
 
-worktree /build/git-2.20.1/t/trash directory.t2028-worktree-move/some-dir/destination
-ok 14 - move worktree to another dir
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -b with the checkout command again. Example:
 
-expecting success: 
-	test_when_finished "
-		git worktree unlock flump || :
-		git worktree remove flump || :
-		git worktree unlock ploof || :
-		git worktree remove ploof || :
-		" &&
-	git worktree add --detach flump &&
-	git worktree lock flump &&
-	test_must_fail git worktree move flump ploof" &&
-	test_must_fail git worktree move --force flump ploof" &&
-	git worktree move --force --force flump ploof
+  git checkout -b <new-branch-name>
 
-Preparing worktree (detached HEAD 2519212)
-HEAD is now at 2519212 init
-fatal: cannot move a locked working tree;
-use 'move -f -f' to override or unlock first
-fatal: 'flump' is not a working tree
-fatal: 'flump' is not a working tree
-ok 15 - move locked worktree (force)
+HEAD is now at 9a00f99 second
+Merging:
+9a00f99 second
+virtual third^0
+found 1 common ancestor:
+7b271e3 initial
+Auto-merging fi/le
+CONFLICT (content): Merge conflict in fi/le
+Automatic merge failed; fix conflicts and then commit the result.
+merge does not leave anything
+resolving records
+[detached HEAD b3a51df] merged
+ Author: A U Thor <author@example.com>
+committing keeps
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-expecting success: 
-	test_must_fail git worktree remove .
+  b3a51df merged
 
-fatal: '.' is a main working tree
-ok 16 - remove main worktree
+If you want to keep it by creating a new branch, this may be a good time
+to do so with:
 
-expecting success: 
-	git worktree lock destination &&
-	test_when_finished "git worktree unlock destination" &&
-	test_must_fail git worktree remove destination
+ git branch <new-branch-name> b3a51df
 
-fatal: cannot remove a locked working tree;
-use 'remove -f -f' to override or unlock first
-ok 17 - remove locked worktree
+HEAD is now at 9a00f99 second
+switching clears
+ok 2 - add records switch clears
 
 expecting success: 
-	echo dirty >>destination/init.t &&
-	test_when_finished "git -C destination checkout init.t" &&
-	test_must_fail git worktree remove destination
+	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 &&
 
-fatal: 'destination' is dirty, use --force to delete it
-ok 18 - remove worktree with dirty tracked file
+	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
+Merging:
+9a00f99 second
+virtual third^0
+found 1 common ancestor:
+7b271e3 initial
+Auto-merging fi/le
+CONFLICT (content): Merge conflict in fi/le
+Automatic merge failed; fix conflicts and then commit the result.
+merge does not leave anything
+resolving records
+[detached HEAD 70d285e] merged
+ Author: A U Thor <author@example.com>
+committing keeps
+merge clears upfront
+Merging:
+70d285e merged
+virtual fourth^0
+found 1 common ancestor:
+7b271e3 initial
+Auto-merging fi/le
+CONFLICT (content): Merge conflict in fi/le
+Automatic merge failed; fix conflicts and then commit the result.
+fi/le: needs merge
+rm 'fi/le'
+resolving records
+HEAD is now at 70d285e merged
+resetting discards
+ok 3 - rm records reset clears
 
 expecting success: 
-	: >destination/untracked &&
-	test_must_fail git worktree remove destination
+	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 &&
 
-fatal: 'destination' is dirty, use --force to delete it
-ok 19 - remove worktree with untracked file
+	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
+Merging:
+9a00f99 second
+virtual third^0
+found 1 common ancestor:
+7b271e3 initial
+Auto-merging fi/le
+CONFLICT (content): Merge conflict in fi/le
+Automatic merge failed; fix conflicts and then commit the result.
+merge does not leave anything
+resolving records
+[detached HEAD 894de51] merged
+ Author: A U Thor <author@example.com>
+committing keeps
+plumbing clear
+ok 4 - plumbing clears
 
 expecting success: 
-	git worktree remove --force destination &&
-	test_path_is_missing destination
+	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
 
-ok 20 - force remove worktree with untracked file
+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
+Merging:
+9a00f99 second
+virtual third^0
+found 1 common ancestor:
+7b271e3 initial
+Auto-merging fi/le
+CONFLICT (content): Merge conflict in fi/le
+Automatic merge failed; fix conflicts and then commit the result.
+merge does not leave anything
+resolving records
+diff --git a/fi/le b/fi/le
+index e019be0..8dca2f8 100644
+--- a/fi/le
++++ b/fi/le
+@@ -1 +1 @@
+-second
++different
+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: 
-	git worktree add to-be-gone &&
-	test -d .git/worktrees/to-be-gone &&
-	mv to-be-gone gone &&
-	git worktree remove to-be-gone &&
-	test_path_is_missing .git/worktrees/to-be-gone
+	prime_resolve_undo &&
+	git update-index --unresolve fi/le &&
+	git ls-files -u >actual &&
+	test_line_count = 3 actual
 
-Preparing worktree (new branch 'to-be-gone')
-HEAD is now at 2519212 init
-ok 21 - remove missing worktree
+HEAD is now at 9a00f99 second
+HEAD is now at 9a00f99 second
+Merging:
+9a00f99 second
+virtual third^0
+found 1 common ancestor:
+7b271e3 initial
+Auto-merging fi/le
+CONFLICT (content): Merge conflict in fi/le
+Automatic merge failed; fix conflicts and then commit the result.
+merge does not leave anything
+resolving records
+ok 6 - unmerge with plumbing
 
 expecting success: 
-	git worktree add gone-but-locked &&
-	git worktree lock gone-but-locked &&
-	test -d .git/worktrees/gone-but-locked &&
-	mv gone-but-locked really-gone-now &&
-	test_must_fail git worktree remove gone-but-locked &&
-	test_path_is_dir .git/worktrees/gone-but-locked
+	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
 
-Preparing worktree (new branch 'gone-but-locked')
-HEAD is now at 2519212 init
-fatal: cannot remove a locked working tree;
-use 'remove -f -f' to override or unlock first
-ok 22 - NOT remove missing-but-locked worktree
+HEAD is now at 9a00f99 second
+HEAD is now at 9a00f99 second
+Merging:
+9a00f99 second
+virtual third^0
+found 1 common ancestor:
+7b271e3 initial
+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.
+merge does not leave anything
+resolving records
+record the resolution
+Recorded resolution for 'fi/le'.
+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 7 - rerere and rerere forget
 
 expecting success: 
-	for i in noodle noodle/bork
-	do
-		test_must_fail git worktree lock $i 2>err &&
-		test_i18ngrep "not a working tree" err || return 1
-	done
+	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
 
-fatal: 'noodle' is not a working tree
-fatal: 'noodle/bork' is not a working tree
-ok 23 - proper error when worktree not found
+HEAD is now at 9a00f99 second
+HEAD is now at 9a00f99 second
+Merging:
+9a00f99 second
+virtual third^0
+found 1 common ancestor:
+7b271e3 initial
+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.
+merge does not leave anything
+resolving records
+record the resolution
+Recorded resolution for 'fi/le'.
+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 8 - rerere and rerere forget (subdirectory)
 
 expecting success: 
-	git worktree add --detach gumby &&
-	test_when_finished "git worktree remove gumby || :" &&
-	git worktree lock gumby &&
-	test_when_finished "git worktree unlock gumby || :" &&
-	test_must_fail git worktree remove gumby &&
-	test_must_fail git worktree remove --force gumby &&
-	git worktree remove --force --force gumby
+	git checkout -f side &&
+	printf "a\0c" >binary &&
+	git commit -a -m binary &&
+	test_must_fail git merge second &&
+	git rerere forget binary
 
-Preparing worktree (detached HEAD 2519212)
-HEAD is now at 2519212 init
-fatal: cannot remove a locked working tree;
-use 'remove -f -f' to override or unlock first
-fatal: cannot remove a locked working tree;
-use 'remove -f -f' to override or unlock first
-fatal: 'gumby' is not a working tree
-fatal: 'gumby' is not a working tree
-ok 24 - remove locked worktree (force)
+Previous HEAD position was 9a00f99 second
+Switched to branch 'side'
+[side 431a49e] binary
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+warning: Cannot merge binary files: binary (HEAD vs. second)
+Merging:
+431a49e binary
+virtual second
+found 1 common ancestor:
+7b271e3 initial
+Auto-merging fi/le
+CONFLICT (content): Merge conflict in fi/le
+Auto-merging binary
+CONFLICT (content): Merge conflict in binary
+Recorded preimage for 'fi/le'
+Automatic merge failed; fix conflicts and then commit the result.
+warning: Cannot merge binary files: binary (ours vs. theirs)
+error: could not parse conflict hunks in 'binary'
+ok 9 - rerere forget (binary)
 
 expecting success: 
-	git init moog &&
-	(
-		cd moog &&
-		test_commit bim &&
-		git worktree add --detach goom &&
-		test_path_exists .git/worktrees &&
-		git worktree remove goom &&
-		test_path_is_missing .git/worktrees
-	)
+	git checkout -f master &&
+	echo master >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_i18ngrep "no remembered" actual
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t2028-worktree-move/moog/.git/
-[master (root-commit) 89d547b] bim
+Switched to branch 'master'
+[master 2aac45c] add differently
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 bim.t
-Preparing worktree (detached HEAD 89d547b)
-HEAD is now at 89d547b bim
-ok 25 - remove cleans up .git/worktrees when empty
+ create mode 100644 add-differently
+Merging:
+2aac45c add differently
+virtual fifth
+found 1 common ancestor:
+7b271e3 initial
+Auto-merging fi/le
+CONFLICT (content): Merge conflict in fi/le
+Auto-merging add-differently
+CONFLICT (add/add): Merge conflict in add-differently
+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 10 - rerere forget (add-add conflict)
 
-# passed all 25 test(s)
-1..25
+# passed all 10 test(s)
+1..10
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t2101-update-index-reupdate.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t2101-update-index-reupdate/.git/
+*** t2016-checkout-patch.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t2016-checkout-patch/.git/
 expecting success: 
-	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
+	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
 
-ok 1 - update-index --add
+[master (root-commit) 2dccafa] initial
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 bar
+ create mode 100644 dir/foo
+[master baa0ca8] second
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 1 - setup
 
 expecting success: 
-	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
+	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
 
-error: file1: does not exist and --remove not passed
-fatal: Unable to process path file1
-happy - failed as expected
-ok 2 - update-index --again
+diff --git a/bar b/bar
+index 7780244..8c999e6 100644
+--- a/bar
++++ b/bar
+@@ -1 +1 @@
+-bar_index
++bar_work
+Discard this hunk from worktree [y,n,q,a,d,e,?]? 
+diff --git a/dir/foo b/dir/foo
+index 564b12f..b8f99f5 100644
+--- a/dir/foo
++++ b/dir/foo
+@@ -1 +1 @@
+-head
++work
+Discard this hunk from worktree [y,n,q,a,d,e,?]? 
+ok 2 - saying "n" does nothing
 
 expecting success: 
-	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
+	test_write_lines n y | git checkout -p &&
+	verify_saved_state bar &&
+	verify_state dir/foo head head
 
-expecting success: git commit -m initial
-[master (root-commit) c2dbdd2] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file2
-ok 4 - first commit
+diff --git a/bar b/bar
+index 7780244..8c999e6 100644
+--- a/bar
++++ b/bar
+@@ -1 +1 @@
+-bar_index
++bar_work
+Discard this hunk from worktree [y,n,q,a,d,e,?]? 
+diff --git a/dir/foo b/dir/foo
+index 564b12f..b8f99f5 100644
+--- a/dir/foo
++++ b/dir/foo
+@@ -1 +1 @@
+-head
++work
+Discard this hunk from worktree [y,n,q,a,d,e,?]? 
+ok 3 - git checkout -p
 
 expecting success: 
-	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
+	set_state dir/foo work index &&
+	test_write_lines n y | git checkout -p &&
+	verify_saved_state bar &&
+	verify_state dir/foo index index
 
-ok 5 - update-index again
+diff --git a/bar b/bar
+index 7780244..8c999e6 100644
+--- a/bar
++++ b/bar
+@@ -1 +1 @@
+-bar_index
++bar_work
+Discard this hunk from worktree [y,n,q,a,d,e,?]? 
+diff --git a/dir/foo b/dir/foo
+index 9015a7a..b8f99f5 100644
+--- a/dir/foo
++++ b/dir/foo
+@@ -1 +1 @@
+-index
++work
+Discard this hunk from worktree [y,n,q,a,d,e,?]? 
+ok 4 - git checkout -p with staged changes
 
 expecting success: 
-	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
+	set_and_save_state dir/foo work head &&
+	test_write_lines n y n | git checkout -p HEAD &&
+	verify_saved_state bar &&
+	verify_saved_state dir/foo
 
-expecting success: 
-	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
+diff --git a/bar b/bar
+index 421376d..8c999e6 100644
+--- a/bar
++++ b/bar
+@@ -1 +1 @@
+-dummy
++bar_work
+Discard this hunk from index and worktree [y,n,q,a,d,e,?]? 
+diff --git a/dir/foo b/dir/foo
+index 564b12f..b8f99f5 100644
+--- a/dir/foo
++++ b/dir/foo
+@@ -1 +1 @@
+-head
++work
+Discard this hunk from index and worktree [y,n,q,a,d,e,?]? error: patch failed: dir/foo:1
+error: dir/foo: patch does not apply
+The selected hunks do not apply to the index!
+Apply them to the worktree anyway? Nothing was applied.
 
-ok 7 - update-index --update with pathspec
+ok 5 - git checkout -p HEAD with NO staged changes: abort
 
-# passed all 7 test(s)
-1..7
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t2102-update-index-symlinks.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t2102-update-index-symlinks/.git/
 expecting success: 
-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
+	test_write_lines n y y | git checkout -p HEAD &&
+	verify_saved_state bar &&
+	verify_state dir/foo head head
 
-expecting success: 
-printf new-file > symlink &&
-git update-index symlink
-ok 2 - modify the symbolic link
+diff --git a/bar b/bar
+index 421376d..8c999e6 100644
+--- a/bar
++++ b/bar
+@@ -1 +1 @@
+-dummy
++bar_work
+Discard this hunk from index and worktree [y,n,q,a,d,e,?]? 
+diff --git a/dir/foo b/dir/foo
+index 564b12f..b8f99f5 100644
+--- a/dir/foo
++++ b/dir/foo
+@@ -1 +1 @@
+-head
++work
+Discard this hunk from index and worktree [y,n,q,a,d,e,?]? error: patch failed: dir/foo:1
+error: dir/foo: patch does not apply
+The selected hunks do not apply to the index!
+Apply them to the worktree anyway? 
+ok 6 - git checkout -p HEAD with NO staged changes: apply
 
 expecting success: 
-case "$(git ls-files --stage --cached symlink)" in
-120000" "*symlink) echo pass;;
-*) echo fail; git ls-files --stage --cached symlink; (exit 1);;
-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/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t2106-update-index-assume-unchanged.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t2106-update-index-assume-unchanged/.git/
-expecting success: : >file &&
-	 git add file &&
-	 git commit -m initial &&
-	 git branch other &&
-	 echo upstream >file &&
-	 git add file &&
-	 git commit -m upstream
-[master (root-commit) 182918e] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 file
-[master bae58d1] upstream
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 1 - setup
+	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 HEAD &&
+	verify_saved_state bar &&
+	verify_state dir/foo head head
 
-expecting success: git reset --hard &&
-	 git checkout other &&
-	 echo dirt >file &&
-	 git update-index --assume-unchanged file &&
-	 test_must_fail git checkout master
-HEAD is now at bae58d1 upstream
-Switched to branch 'other'
-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 2 - do not switch branches with dirty file
+diff --git a/bar b/bar
+index 421376d..8c999e6 100644
+--- a/bar
++++ b/bar
+@@ -1 +1 @@
+-dummy
++bar_work
+Discard this hunk from index and worktree [y,n,q,a,d,e,?]? 
+diff --git a/dir/foo b/dir/foo
+index 564b12f..9015a7a 100644
+--- a/dir/foo
++++ b/dir/foo
+@@ -1 +1 @@
+-head
++index
+Discard this hunk from index and worktree [y,n,q,a,d,e,?]? 
+ok 7 - git checkout -p HEAD with change already staged
 
-# passed all 2 test(s)
-1..2
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t2104-update-index-skip-worktree.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t2104-update-index-skip-worktree/.git/
 expecting success: 
-	mkdir sub &&
-	touch ./1 ./2 sub/1 sub/2 &&
-	git add 1 2 sub/1 sub/2 &&
-	git ls-files -t | test_cmp expect.full -
+	# 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
 
-ok 1 - setup
+diff --git b/bar a/bar
+index 8c999e6..421376d 100644
+--- b/bar
++++ a/bar
+@@ -1 +1 @@
+-bar_work
++dummy
+Apply this hunk to index and worktree [y,n,q,a,d,e,?]? 
+diff --git b/dir/foo a/dir/foo
+index 564b12f..9676f5b 100644
+--- b/dir/foo
++++ a/dir/foo
+@@ -1 +1 @@
+-head
++parent
+Apply this hunk to index and worktree [y,n,q,a,d,e,?]? 
+ok 8 - git checkout -p HEAD^
 
 expecting success: 
-	test "$(test-tool index-version < .git/index)" = 2
+	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
 
-ok 2 - index is at version 2
+diff --git a/bar b/bar
+index 7780244..8c999e6 100644
+--- a/bar
++++ b/bar
+@@ -1 +1 @@
+-bar_index
++bar_work
+Discard this hunk from worktree [y,n,q,a,d,e,?]? 
+diff --git a/dir/foo b/dir/foo
+index 9015a7a..0000000
+--- a/dir/foo
++++ /dev/null
+deleted file mode 100644
+@@ -1 +0,0 @@
+-index
+Discard deletion from worktree [y,n,q,a,d,?]? 
+ok 9 - git checkout -p handles deletion
 
 expecting success: 
-	git update-index --skip-worktree 1 sub/1 &&
-	git ls-files -t | test_cmp expect.skip -
+	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
 
-ok 3 - update-index --skip-worktree
+diff --git a/dir/foo b/dir/foo
+index 564b12f..b8f99f5 100644
+--- a/dir/foo
++++ b/dir/foo
+@@ -1 +1 @@
+-head
++work
+Discard this hunk from worktree [y,n,q,a,d,e,?]? 
+ok 10 - path limiting works: dir
 
 expecting success: 
-	test "$(test-tool index-version < .git/index)" = 3
+	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
 
-ok 4 - index is at version 3 after having some skip-worktree entries
+diff --git a/dir/foo b/dir/foo
+index 564b12f..b8f99f5 100644
+--- a/dir/foo
++++ b/dir/foo
+@@ -1 +1 @@
+-head
++work
+Discard this hunk from worktree [y,n,q,a,d,e,?]? 
+ok 11 - path limiting works: -- dir
 
 expecting success: 
-	git ls-files -t | test_cmp expect.skip -
+	# 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
 
-ok 5 - ls-files -t
+diff --git b/dir/foo a/dir/foo
+index 564b12f..9676f5b 100644
+--- b/dir/foo
++++ a/dir/foo
+@@ -1 +1 @@
+-head
++parent
+Apply this hunk to index and worktree [y,n,q,a,d,e,?]? 
+ok 12 - path limiting works: HEAD^ -- dir
 
 expecting success: 
-	git update-index --no-skip-worktree 1 sub/1 &&
-	git ls-files -t | test_cmp expect.full -
+	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
 
-ok 6 - update-index --no-skip-worktree
+diff --git a/dir/foo b/dir/foo
+index 564b12f..b8f99f5 100644
+--- a/dir/foo
++++ b/dir/foo
+@@ -1 +1 @@
+-head
++work
+Discard this hunk from worktree [y,n,q,a,d,e,?]? 
+ok 13 - path limiting works: foo inside dir
 
 expecting success: 
-	test "$(test-tool index-version < .git/index)" = 2
+	verify_saved_head
 
-ok 7 - index version is back to 2 when there is no skip-worktree entry
+ok 14 - none of this moved HEAD
 
-# passed all 7 test(s)
-1..7
+# passed all 14 test(s)
+1..14
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t2105-update-index-gitfile.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t2105-update-index-gitfile/.git/
+*** t2107-update-index-basic.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t2107-update-index-basic/.git/
 expecting success: 
-	mkdir sub1 &&
-	(cd sub1 &&
-	 git init &&
-	 REAL="$(pwd)/.real" &&
-	 mv .git "$REAL" &&
-	 echo "gitdir: $REAL" >.git &&
-	 test_commit first)
+	test_must_fail git update-index --nonsense 2>msg &&
+	cat msg &&
+	test -s msg
 
-Initialized empty Git repository in /build/git-2.20.1/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
+error: unknown option 'nonsense'
+usage: git update-index [<options>] [--] [<file>...]
 
-expecting success: 
-	git update-index --add -- sub1
+    -q                    continue refresh even when index needs update
+    --ignore-submodules   refresh: ignore submodules
+    --add                 do not ignore new files
+    --replace             let files replace directories and vice-versa
+    --remove              notice files missing from worktree
+    --unmerged            refresh even if index contains unmerged entries
+    --refresh             refresh stat information
+    --really-refresh      like --refresh, but ignore assume-unchanged setting
+    --cacheinfo <mode>,<object>,<path>
+                          add the specified entry to the index
+    --chmod (+|-)x        override the executable bit of the listed files
+    --assume-unchanged    mark files as "not changing"
+    --no-assume-unchanged
+                          clear assumed-unchanged bit
+    --skip-worktree       mark files as "index-only"
+    --no-skip-worktree    clear skip-worktree bit
+    --info-only           add to index only; do not add content to object database
+    --force-remove        remove named paths even if present in worktree
+    -z                    with --stdin: input lines are terminated by null bytes
+    --stdin               read list of paths to be updated from standard input
+    --index-info          add entries from standard input to the index
+    --unresolve           repopulate stages #2 and #3 for the listed paths
+    -g, --again           only update entries that differ from HEAD
+    --ignore-missing      ignore files missing from worktree
+    --verbose             report actions to standard output
+    --clear-resolve-undo  (for porcelains) forget saved unresolved conflicts
+    --index-version <n>   write index in this format
+    --split-index         enable or disable split index
+    --untracked-cache     enable/disable untracked cache
+    --test-untracked-cache
+                          test if the filesystem supports untracked cache
+    --force-untracked-cache
+                          enable untracked cache without testing the filesystem
+    --force-write-index   write out the index even if is not flagged as changed
+    --fsmonitor           enable or disable file system monitor
+    --fsmonitor-valid     mark files as fsmonitor valid
+    --no-fsmonitor-valid  clear fsmonitor valid bit
 
-ok 2 - add gitlink to absolute .git file
+ok 1 - update-index --nonsense fails
 
 expecting success: 
-	mkdir sub2 &&
-	(cd sub2 &&
-	 git init &&
-	 mv .git .real &&
-	 echo "gitdir: .real" >.git &&
-	 test_commit first)
+	test_expect_code 129 git update-index --nonsense 2>err &&
+	test_i18ngrep "[Uu]sage: git update-index" err
 
-Initialized empty Git repository in /build/git-2.20.1/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
+usage: git update-index [<options>] [--] [<file>...]
+ok 2 - update-index --nonsense dumps usage
 
 expecting success: 
-	git update-index --add -- sub2
+	mkdir broken &&
+	(
+		cd broken &&
+		git init &&
+		>.git/index &&
+		test_expect_code 129 git update-index -h >usage 2>&1
+	) &&
+	test_i18ngrep "[Uu]sage: git update-index" broken/usage
 
-ok 4 - add gitlink to relative .git file
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t2107-update-index-basic/broken/.git/
+usage: git update-index [<options>] [--] [<file>...]
+ok 3 - update-index -h with corrupt index
 
-# passed all 4 test(s)
-1..4
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t2103-update-index-ignore-missing.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t2103-update-index-ignore-missing/.git/
 expecting success: 
-	>one &&
-	>two &&
-	>three &&
-
-	# need --add when adding
-	test_must_fail git update-index one &&
-	test -z "$(git ls-files)" &&
-	git update-index --add one &&
-	test zone = "z$(git ls-files)" &&
+	test_must_fail git update-index --cacheinfo
 
-	# update-index is atomic
-	echo 1 >one &&
-	test_must_fail git update-index one two &&
-	echo "M	one" >expect &&
-	git diff-files --name-status >actual &&
-	test_cmp expect actual &&
+error: option 'cacheinfo' expects <mode>,<sha1>,<path>
+ok 4 - --cacheinfo complains of missing arguments
 
-	git update-index --add one two three &&
-	for i in one three two; do echo $i; done >expect &&
-	git ls-files >actual &&
-	test_cmp expect actual &&
+expecting success: 
+	echo content >file &&
+	git add file &&
+	git rev-parse :file >expect &&
+	test_must_fail git update-index --cacheinfo 100644 $ZERO_OID file &&
+	git rev-parse :file >actual &&
+	test_cmp expect actual
 
-	test_tick &&
-	(
-		test_create_repo xyzzy &&
-		cd xyzzy &&
-		>file &&
-		git add file &&
-		git commit -m "sub initial"
-	) &&
-	git add xyzzy &&
+error: cache entry has null sha1: file
+fatal: Unable to write new index file
+ok 5 - --cacheinfo does not accept blob null sha1
 
-	test_tick &&
-	git commit -m initial &&
-	git tag initial
+expecting success: 
+	git init submodule &&
+	(cd submodule && test_commit foo) &&
+	git add submodule &&
+	git rev-parse :submodule >expect &&
+	test_must_fail git update-index --cacheinfo 160000 $ZERO_OID submodule &&
+	git rev-parse :submodule >actual &&
+	test_cmp expect actual
 
-error: one: cannot add to the index - missing --add option?
-fatal: Unable to process path one
-error: two: cannot add to the index - missing --add option?
-fatal: Unable to process path two
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t2103-update-index-ignore-missing/xyzzy/.git/
-[master (root-commit) a40d181] sub initial
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t2107-update-index-basic/submodule/.git/
+[master (root-commit) ddd63c9] foo
  Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 file
-warning: adding embedded git repository: xyzzy
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo.t
+warning: adding embedded git repository: submodule
 hint: You've added another git repository inside your current repository.
 hint: Clones of the outer repository will not contain the contents of
 hint: the embedded repository and will not know how to obtain it.
 hint: If you meant to add a submodule, use:
 hint: 
-hint: 	git submodule add <url> xyzzy
+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 xyzzy
+hint: 	git rm --cached submodule
 hint: 
 hint: See "git help submodule" for more information.
-[master (root-commit) ce14d7f] initial
- Author: A U Thor <author@example.com>
- 4 files changed, 2 insertions(+)
- create mode 100644 one
- create mode 100644 three
- create mode 100644 two
- create mode 160000 xyzzy
-ok 1 - basics
+error: cache entry has null sha1: submodule
+fatal: Unable to write new index file
+ok 6 - --cacheinfo does not accept gitlink null sha1
 
 expecting success: 
-	git reset --hard initial &&
-	echo 2 >one &&
-	test_must_fail git update-index --refresh &&
-	echo 1 >one &&
-	git update-index --refresh &&
-	rm -f two &&
-	test_must_fail git update-index --refresh &&
-	git update-index --ignore-missing --refresh
-
+	echo content >file &&
+	git hash-object -w --stdin <file >expect &&
 
-HEAD is now at ce14d7f initial
-one: needs update
-two: needs update
-ok 2 - --ignore-missing --refresh
+	git update-index --add --cacheinfo 100644 "$(cat expect)" file &&
+	git rev-parse :file >actual &&
+	test_cmp expect actual &&
 
-expecting success: 
-	git reset --hard initial &&
-	info=$(git ls-files -s one | sed -e "s/ 0	/ 1	/") &&
-	git rm --cached one &&
-	echo "$info" | git update-index --index-info &&
-	test_must_fail git update-index --refresh &&
-	git update-index --unmerged --refresh &&
-	echo 2 >two &&
-	test_must_fail git update-index --unmerged --refresh >actual &&
-	grep two actual &&
-	! grep one actual &&
-	! grep three actual
+	git update-index --add --cacheinfo "100644,$(cat expect),elif" &&
+	git rev-parse :elif >actual &&
+	test_cmp expect actual
 
-HEAD is now at ce14d7f initial
-rm 'one'
-one: needs merge
-two: needs update
-ok 3 - --unmerged --refresh
+ok 7 - --cacheinfo mode,sha1,path (new syntax)
 
 expecting success: 
-	git reset --hard initial &&
-	rm -f two &&
-	test_must_fail git update-index --ignore-submodules --refresh
+	mkdir cleanup &&
+	(
+	cd cleanup &&
+	mkdir worktree &&
+	git init repo &&
+	cd repo &&
+	git config core.worktree ../../worktree &&
+	# --refresh triggers late setup_work_tree,
+	# active_cache_changed is zero, rollback_lock_file fails
+	git update-index --refresh &&
+	! test -f .git/index.lock
+	)
 
-HEAD is now at ce14d7f initial
-two: needs update
-ok 4 - --ignore-submodules --refresh (1)
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t2107-update-index-basic/cleanup/repo/.git/
+ok 8 - .lock files cleaned up
 
 expecting success: 
-	git reset --hard initial &&
-	test_tick &&
-	(
-		cd xyzzy &&
-		git commit -m "sub second" --allow-empty
-	) &&
-	test_must_fail git update-index --refresh &&
-	test_must_fail git update-index --ignore-missing --refresh &&
-	git update-index --ignore-submodules --refresh
+	>A &&
+	>B &&
+	git add A B &&
+	git update-index --chmod=+x A --chmod=-x B &&
+	cat >expect <<-EOF &&
+	100755 $EMPTY_BLOB 0	A
+	100644 $EMPTY_BLOB 0	B
+	EOF
+	git ls-files --stage A B >actual &&
+	test_cmp expect actual
 
-HEAD is now at ce14d7f initial
-[master 66f0d66] sub second
- Author: A U Thor <author@example.com>
-xyzzy: needs update
-xyzzy: needs update
-ok 5 - --ignore-submodules --refresh (2)
+ok 9 - --chmod=+x and chmod=-x in the same argument list
 
-# passed all 5 test(s)
-1..5
+# passed all 9 test(s)
+1..9
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t0008-ignores.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t0008-ignores/.git/
+*** t2201-add-update-typechange.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t2201-add-update-typechange/.git/
 expecting success: 
-	init_vars &&
-	mkdir -p a/b/ignored-dir a/submodule b &&
-	if test_have_prereq SYMLINKS
-	then
-		ln -s b a/symlink
+	>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 &&
-	(
-		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
-	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:
+	mkdir rezrov &&
+	>rezrov/bozbar &&
+	git add caskly xyzzy yomin nitfol rezrov/bozbar &&
+
+	test_tick &&
+	git commit -m initial
 
-		!on*
-		!two
-	EOF
-	echo "seven" >a/b/ignored-dir/.gitignore &&
-	test -n "$HOME" &&
-	cat <<-\EOF >"$global_excludes" &&
-		globalone
-		!globaltwo
-		globalthree
-	EOF
-	cat <<-\EOF >>.git/info/exclude
-		per-repo
-	EOF
 
 checking prerequisite: SYMLINKS
 
@@ -46460,19 +48117,1829 @@
 
 )
 prerequisite SYMLINKS ok
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t0008-ignores/a/submodule/.git/
-[master (root-commit) 01baea4] commit in submodule
+[master (root-commit) 8dc0761] initial
  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: 
+ 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: 
+	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/git-2.20.1/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/git-2.20.1/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: 
+	git diff-files --raw >actual &&
+	test_cmp expect-files actual
+
+ok 3 - diff-files
+
+expecting success: 
+	git diff-index --raw HEAD -- >actual &&
+	test_cmp expect-index actual
+
+ok 4 - diff-index
+
+expecting success: 
+	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: 
+	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>
+ 5 files changed, 2 insertions(+)
+ rename caskly => nitfol (100%)
+ 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/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t3002-ls-files-dashpath.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3002-ls-files-dashpath/.git/
+expecting success: echo frotz >path0 &&
+	echo frotz >./-foo &&
+	echo frotz >./--
+ok 1 - setup
+
+expecting success: git ls-files --others >output &&
+     test_cmp output - <<EOF
+--
+-foo
+output
+path0
+EOF
+
+ok 2 - git ls-files without path restriction.
+
+expecting success: git ls-files --others path0 >output &&
+	test_cmp output - <<EOF
+path0
+EOF
+
+ok 3 - git ls-files with path restriction.
+
+expecting success: git ls-files --others -- path0 >output &&
+	test_cmp output - <<EOF
+path0
+EOF
+
+ok 4 - git ls-files with path restriction with --.
+
+expecting success: git ls-files --others -- -- >output &&
+	test_cmp output - <<EOF
+--
+EOF
+
+ok 5 - git ls-files with path restriction with -- --.
+
+expecting success: git ls-files --others -- >output &&
+	test_cmp output - <<EOF
+--
+-foo
+output
+path0
+EOF
+
+ok 6 - git ls-files with no path restriction.
+
+# passed all 6 test(s)
+1..6
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t2200-add-update.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t2200-add-update/.git/
+expecting success: 
+	echo initial >check &&
+	echo initial >top &&
+	echo initial >foo &&
+	mkdir dir1 dir2 &&
+	echo initial >dir1/sub1 &&
+	echo initial >dir1/sub2 &&
+	echo initial >dir2/sub3 &&
+	git add check dir1 dir2 top foo &&
+	test_tick &&
+	git commit -m initial &&
+
+	echo changed >check &&
+	echo changed >top &&
+	echo changed >dir2/sub3 &&
+	rm -f dir1/sub1 &&
+	echo other >dir2/other
+
+[master (root-commit) ec46c19] initial
+ Author: A U Thor <author@example.com>
+ 6 files changed, 6 insertions(+)
+ create mode 100644 check
+ create mode 100644 dir1/sub1
+ create mode 100644 dir1/sub2
+ create mode 100644 dir2/sub3
+ create mode 100644 foo
+ create mode 100644 top
+ok 1 - setup
+
+expecting success: 
+	git add -u dir1 dir2
+
+ok 2 - update
+
+expecting success: 
+	test "$(git ls-files dir1/sub1)" = ""
+
+ok 3 - update noticed a removal
+
+expecting success: 
+	test "$(git diff-files --name-status dir2/sub3)" = ""
+
+ok 4 - update touched correct path
+
+expecting success: 
+	test "$(git diff-files --name-status check)" = "M	check" &&
+	test "$(git diff-files --name-status top)" = "M	top"
+
+ok 5 - update did not touch other tracked files
+
+expecting success: 
+	test "$(git ls-files dir2/other)" = ""
+
+ok 6 - update did not touch untracked files
+
+expecting success: 
+
+	git ls-files -s |
+	sed -e "s/ 0	/	/" >expect &&
+	git ls-tree -r $(git write-tree) |
+	sed -e "s/ blob / /" >current &&
+	test_cmp expect current
+
+
+ok 7 - cache tree has not been corrupted
+
+expecting success: 
+	(
+		cd dir1 &&
+		echo more >sub2 &&
+		git add -u sub2
+	)
+
+ok 8 - update from a subdirectory
+
+expecting success: 
+
+	test "$(git diff-files --name-status dir1)" = ""
+
+
+ok 9 - change gets noticed
+
+expecting success: 
+	(
+		cd dir1 &&
+		echo even more >>sub2 &&
+		git --literal-pathspecs add -u &&
+		echo even more >>sub2 &&
+		git add -u
+	) &&
+	git diff-files --name-only >actual &&
+	test_must_be_empty actual
+
+ok 10 - non-qualified update in subdir updates from the root
+
+expecting success: 
+
+	rm foo &&
+	test_ln_s_add top foo
+
+
+checking prerequisite: SYMLINKS
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
+	# test whether the filesystem supports symbolic links
+	ln -s x y && test -h y
+
+)
+prerequisite SYMLINKS ok
+ok 11 - replace a file with a symlink
+
+expecting success: 
+
+	git add -u &&
+	test -z "$(git diff-files)"
+
+
+ok 12 - add everything changed
+
+expecting success: 
+
+	touch check &&
+	git add -u &&
+	test -z "$(git diff-files)"
+
+
+ok 13 - touch and then add -u
+
+expecting success: 
+
+	touch check &&
+	git add check &&
+	test -z "$(git diff-files)"
+
+
+ok 14 - touch and then add explicitly
+
+expecting success: 
+
+	(
+		echo "add 'check'" &&
+		echo "remove 'top'"
+	) >expect &&
+	before=$(git ls-files -s check top) &&
+	echo changed >>check &&
+	rm -f top &&
+	git add -n -u >actual &&
+	after=$(git ls-files -s check top) &&
+
+	test "$before" = "$after" &&
+	test_i18ncmp expect actual
+
+
+ok 15 - add -n -u should not add but just report
+
+expecting success: 
+	git reset --hard &&
+	one=$(echo 1 | git hash-object -w --stdin) &&
+	two=$(echo 2 | git hash-object -w --stdin) &&
+	three=$(echo 3 | git hash-object -w --stdin) &&
+	{
+		for path in path1 path2
+		do
+			echo "100644 $one 1	$path"
+			echo "100644 $two 2	$path"
+			echo "100644 $three 3	$path"
+		done
+		echo "100644 $one 1	path3"
+		echo "100644 $one 1	path4"
+		echo "100644 $one 3	path5"
+		echo "100644 $one 3	path6"
+	} |
+	git update-index --index-info &&
+	echo 3 >path1 &&
+	echo 2 >path3 &&
+	echo 2 >path5 &&
+
+	# Fail to explicitly resolve removed paths with "git add"
+	test_must_fail git add --no-all path4 &&
+	test_must_fail git add --no-all path6 &&
+
+	# "add -u" should notice removals no matter what stages
+	# the index entries are in.
+	git add -u &&
+	git ls-files -s path1 path2 path3 path4 path5 path6 >actual &&
+	{
+		echo "100644 $three 0	path1"
+		echo "100644 $two 0	path3"
+		echo "100644 $two 0	path5"
+	} >expect &&
+	test_cmp expect actual
+
+HEAD is now at ec46c19 initial
+fatal: unable to stat 'path4': No such file or directory
+fatal: unable to stat 'path6': No such file or directory
+ok 16 - add -u resolves unmerged paths
+
+expecting success: 
+	test_must_fail git add -u non-existent &&
+	! (git ls-files | grep "non-existent")
+
+fatal: pathspec 'non-existent' did not match any files
+ok 17 - "add -u non-existent" should fail
+
+# passed all 17 test(s)
+1..17
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t3003-ls-files-exclude.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3003-ls-files-exclude/.git/
+expecting success: 
+	echo content >file &&
+	git add file &&
+	git commit -m file &&
+	echo modification >file
+
+[master (root-commit) 237c33c] file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+ok 1 - create repo with file
+
+expecting success: 
+	echo 'file' >expect &&
+	git ls-files --exclude-standard --cached >output &&
+	test_cmp expect output
+
+ok 2 - ls-files output contains file (cached)
+
+expecting success: 
+	echo 'file' >expect &&
+	git ls-files --exclude-standard --modified >output &&
+	test_cmp expect output
+
+ok 3 - ls-files output contains file (modified)
+
+expecting success: 
+	echo file >.gitignore
+
+ok 4 - add file to gitignore
+
+expecting success: 
+	echo 'file' >expect &&
+	git ls-files --exclude-standard --cached >output &&
+	test_cmp expect output
+
+ok 5 - ls-files output contains file (cached)
+
+expecting success: 
+	echo 'file' >expect &&
+	git ls-files --exclude-standard --modified >output &&
+	test_cmp expect output
+
+ok 6 - ls-files output contains file (modified)
+
+expecting success: 
+	echo content >other-file &&
+	git add other-file &&
+	echo file >expect &&
+	git ls-files -i --exclude-standard >output &&
+	test_cmp expect output
+
+ok 7 - ls-files -i lists only tracked-but-ignored files
+
+# passed all 7 test(s)
+1..7
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t3000-ls-files-others.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3000-ls-files-others/.git/
+expecting success: 
+	date >path0 &&
+	if test_have_prereq SYMLINKS
+	then
+		ln -s xyzzy path1
+	else
+		date >path1
+	fi &&
+	mkdir path2 path3 path4 &&
+	date >path2/file2 &&
+	date >path2-junk &&
+	date >path3/file3 &&
+	date >path3-junk &&
+	git update-index --add path3-junk path3/file3
+
+checking prerequisite: SYMLINKS
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
+	# test whether the filesystem supports symbolic links
+	ln -s x y && test -h y
+
+)
+prerequisite SYMLINKS ok
+ok 1 - setup 
+
+expecting success: 
+	cat >expected1 <<-\EOF &&
+	expected1
+	expected2
+	expected3
+	output
+	path0
+	path1
+	path2-junk
+	path2/file2
+	EOF
+
+	sed -e "s|path2/file2|path2/|" <expected1 >expected2 &&
+	cp expected2 expected3 &&
+	echo path4/ >>expected2
+
+ok 2 - setup: expected output
+
+expecting success: 
+	git ls-files --others >output &&
+	test_cmp expected1 output
+
+ok 3 - ls-files --others
+
+expecting success: 
+	git ls-files --others --directory >output &&
+	test_cmp expected2 output
+
+ok 4 - ls-files --others --directory
+
+expecting success: 
+	git ls-files --others --directory --no-empty-directory >output &&
+	test_cmp expected3 output
+
+ok 5 - --no-empty-directory hides empty directory
+
+expecting success: 
+	mkdir not-a-submodule &&
+	echo foo >not-a-submodule/.git &&
+	git ls-files -o >output &&
+	test_cmp expected1 output
+
+ok 6 - ls-files --others handles non-submodule .git
+
+expecting success: 
+	git init super &&
+	git init sub &&
+	(
+		cd sub &&
+		>a &&
+		git add a &&
+		git commit -m sub &&
+		git pack-refs --all
+	) &&
+	(
+		cd super &&
+		"$SHELL_PATH" "$TEST_DIRECTORY/../contrib/workdir/git-new-workdir" ../sub sub &&
+		git ls-files --others --exclude-standard >../actual
+	) &&
+	echo sub/ >expect &&
+	test_cmp expect actual
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3000-ls-files-others/super/.git/
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3000-ls-files-others/sub/.git/
+[master (root-commit) 751601c] sub
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 a
+ok 7 - ls-files --others with symlinked submodule
+
+# passed all 7 test(s)
+1..7
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t3004-ls-files-basic.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3004-ls-files-basic/.git/
+expecting success: 
+	git ls-files >actual &&
+	test_must_be_empty actual
+
+ok 1 - ls-files in empty repository
+
+expecting success: 
+	git ls-files doesnotexist >actual &&
+	test_must_be_empty actual
+
+ok 2 - ls-files with nonexistent path
+
+expecting success: 
+	test_expect_code 129 git ls-files --nonsense 2>actual &&
+	test_i18ngrep "[Uu]sage: git ls-files" actual
+
+usage: git ls-files [<options>] [<file>...]
+ok 3 - ls-files with nonsense option
+
+expecting success: 
+	mkdir broken &&
+	(
+		cd broken &&
+		git init &&
+		>.git/index &&
+		test_expect_code 129 git ls-files -h >usage 2>&1
+	) &&
+	test_i18ngrep "[Uu]sage: git ls-files " broken/usage
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3004-ls-files-basic/broken/.git/
+usage: git ls-files [<options>] [<file>...]
+ok 4 - ls-files -h in corrupt repository
+
+checking prerequisite: SYMLINKS
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
+	# test whether the filesystem supports symbolic links
+	ln -s x y && test -h y
+
+)
+prerequisite SYMLINKS ok
+expecting success: 
+	mkdir subs &&
+	ln -s nosuch link &&
+	ln -s ../nosuch subs/link &&
+	git add link subs/link &&
+	git ls-files -s link subs/link >expect &&
+	git ls-files -s "$(pwd)/link" "$(pwd)/subs/link" >actual &&
+	test_cmp expect actual &&
+
+	(
+		cd subs &&
+		git ls-files -s link >../expect &&
+		git ls-files -s "$(pwd)/link" >../actual
+	) &&
+	test_cmp expect actual
+
+ok 5 - ls-files with absolute paths to symlinks
+
+# passed all 5 test(s)
+1..5
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t3006-ls-files-long.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3006-ls-files-long/.git/
+expecting success: 
+	p=filefilefilefilefilefilefilefile &&
+	p=$p$p$p$p$p$p$p$p$p$p$p$p$p$p$p$p &&
+	p=$p$p$p$p$p$p$p$p$p$p$p$p$p$p$p$p &&
+
+	path_a=${p}_a &&
+	path_z=${p}_z &&
+
+	blob_a=$(echo frotz | git hash-object -w --stdin) &&
+	blob_z=$(echo nitfol | git hash-object -w --stdin) &&
+
+	pat="100644 %s 0\t%s\n"
+
+ok 1 - setup
+
+expecting success: 
+	printf "$pat" "$blob_a" "$path_a" |
+	git update-index --add --index-info &&
+	echo "$path_a" >expect &&
+	git ls-files >actual &&
+	test_cmp expect actual
+
+ok 2 - overly-long path by itself is not a problem
+
+expecting success: 
+	printf "$pat" "$blob_a" "$path_a" "$blob_z" "$path_z" |
+	git update-index --add --index-info &&
+	(
+		echo "$path_a" &&
+		echo "$path_z"
+	) >expect &&
+	git ls-files >actual &&
+	test_cmp expect actual
+
+ok 3 - overly-long path does not replace another by mistake
+
+# passed all 3 test(s)
+1..3
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t2300-cd-to-toplevel.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t2300-cd-to-toplevel/.git/
+expecting success: 
+		(
+			cd 'repo' &&
+			PATH="$EXEC_PATH:$PATH" &&
+			. git-sh-setup &&
+			cd_to_toplevel &&
+			[ "$(pwd -P)" = "$TOPLEVEL" ]
+		)
+	
+ok 1 - at physical root
+
+expecting success: 
+		(
+			cd 'repo/sub/dir' &&
+			PATH="$EXEC_PATH:$PATH" &&
+			. git-sh-setup &&
+			cd_to_toplevel &&
+			[ "$(pwd -P)" = "$TOPLEVEL" ]
+		)
+	
+ok 2 - at physical subdir
+
+checking prerequisite: SYMLINKS
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
+	# test whether the filesystem supports symbolic links
+	ln -s x y && test -h y
+
+)
+prerequisite SYMLINKS ok
+expecting success: 
+		(
+			cd 'symrepo' &&
+			PATH="$EXEC_PATH:$PATH" &&
+			. git-sh-setup &&
+			cd_to_toplevel &&
+			[ "$(pwd -P)" = "$TOPLEVEL" ]
+		)
+	
+ok 3 - at symbolic root
+
+expecting success: 
+		(
+			cd 'subdir-link' &&
+			PATH="$EXEC_PATH:$PATH" &&
+			. git-sh-setup &&
+			cd_to_toplevel &&
+			[ "$(pwd -P)" = "$TOPLEVEL" ]
+		)
+	
+ok 4 - at symbolic subdir
+
+expecting success: 
+		(
+			cd 'internal-link' &&
+			PATH="$EXEC_PATH:$PATH" &&
+			. git-sh-setup &&
+			cd_to_toplevel &&
+			[ "$(pwd -P)" = "$TOPLEVEL" ]
+		)
+	
+ok 5 - at internal symbolic subdir
+
+# passed all 5 test(s)
+1..5
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t3005-ls-files-relative.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3005-ls-files-relative/.git/
+expecting success: 
+	: >never-mind-me &&
+	git add never-mind-me &&
+	mkdir top &&
+	(
+		cd top &&
+		mkdir sub &&
+		x="x xa xbc xdef xghij xklmno" &&
+		y=$(echo "$x" | tr x y) &&
+		touch $x &&
+		touch $y &&
+		cd sub &&
+		git add ../x*
+	)
+
+ok 1 - prepare
+
+expecting success: 
+	(
+		cd top/sub &&
+		cat >expect <<-EOF &&
+		../../never-mind-me
+		../x
+		EOF
+		git ls-files $(cat expect) >actual &&
+		test_cmp expect actual
+	)
+
+ok 2 - ls-files with mixed levels
+
+expecting success: 
+	(
+		cd top/sub &&
+		for f in ../y*
+		do
+			echo "error: pathspec $sq$f$sq did not match any file(s) known to git"
+		done >expect.err &&
+		echo "Did you forget to ${sq}git add${sq}?" >>expect.err &&
+		ls ../x* >expect.out &&
+		test_must_fail git ls-files -c --error-unmatch ../[xy]* >actual.out 2>actual.err &&
+		test_cmp expect.out actual.out &&
+		test_i18ncmp expect.err actual.err
+	)
+
+ok 3 - ls-files -c
+
+expecting success: 
+	(
+		cd top/sub &&
+		for f in ../x*
+		do
+			echo "error: pathspec $sq$f$sq did not match any file(s) known to git"
+		done >expect.err &&
+		echo "Did you forget to ${sq}git add${sq}?" >>expect.err &&
+		ls ../y* >expect.out &&
+		test_must_fail git ls-files -o --error-unmatch ../[xy]* >actual.out 2>actual.err &&
+		test_cmp expect.out actual.out &&
+		test_i18ncmp expect.err actual.err
+	)
+
+ok 4 - ls-files -o
+
+# passed all 4 test(s)
+1..4
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t3008-ls-files-lazy-init-name-hash.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3008-ls-files-lazy-init-name-hash/.git/
+expecting success: 
+	(
+	    test_seq $LAZY_THREAD_COST | sed "s/^/a_/" &&
+	    echo b/b/b &&
+	    test_seq $LAZY_THREAD_COST | sed "s/^/c_/" &&
+	    test_seq 50 | sed "s/^/d_/" | tr "\n" "/" && echo d
+	) |
+	sed "s/^/100644 $EMPTY_BLOB	/" |
+	git update-index --index-info &&
+	test-tool lazy-init-name-hash -m
+
+0.000925 0.020618 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/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t3020-ls-files-error-unmatch.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3020-ls-files-error-unmatch/.git/
+expecting success: 
+	touch foo bar &&
+	git update-index --add foo bar &&
+	git commit -m "add foo bar"
+
+[master (root-commit) d47cf81] add foo bar
+ Author: A U Thor <author@example.com>
+ 2 files changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 bar
+ create mode 100644 foo
+ok 1 - setup
+
+expecting success: test_must_fail git ls-files --error-unmatch foo bar-does-not-match
+error: pathspec 'bar-does-not-match' did not match any file(s) known to git
+Did you forget to 'git add'?
+foo
+ok 2 - git ls-files --error-unmatch should fail with unmatched path.
+
+expecting success: git ls-files --error-unmatch foo bar
+bar
+foo
+ok 3 - git ls-files --error-unmatch should succeed with matched paths.
+
+# passed all 3 test(s)
+1..3
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t3010-ls-files-killed-modified.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3010-ls-files-killed-modified/.git/
+expecting success: 
+	date >path0 &&
+	test_ln_s_add xyzzy path1 &&
+	mkdir path2 path3 pathx &&
+	date >path2/file2 &&
+	date >path3/file3 &&
+	>pathx/ju &&
+	: >path7 &&
+	date >path8 &&
+	: >path9 &&
+	date >path10 &&
+	git update-index --add -- path0 path?/file? pathx/ju path7 path8 path9 path10 &&
+	git init submod1 &&
+	git -C submod1 commit --allow-empty -m "empty 1" &&
+	git init submod2 &&
+	git -C submod2 commit --allow-empty -m "empty 2" &&
+	git update-index --add submod[12] &&
+	(
+		cd submod1 &&
+		git commit --allow-empty -m "empty 1 (updated)"
+	) &&
+	rm -fr path?	# leave path10 alone
+
+checking prerequisite: SYMLINKS
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
+	# test whether the filesystem supports symbolic links
+	ln -s x y && test -h y
+
+)
+prerequisite SYMLINKS ok
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3010-ls-files-killed-modified/submod1/.git/
+[master (root-commit) fbc945a] empty 1
+ Author: A U Thor <author@example.com>
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3010-ls-files-killed-modified/submod2/.git/
+[master (root-commit) 9287e45] empty 2
+ Author: A U Thor <author@example.com>
+[master 0b36195] empty 1 (updated)
+ Author: A U Thor <author@example.com>
+ok 1 - git update-index --add to add various paths.
+
+expecting success: 
+	date >path2 &&
+	if test_have_prereq SYMLINKS
+	then
+		ln -s frotz path3 &&
+		ln -s nitfol path5
+	else
+		date >path3 &&
+		date >path5
+	fi &&
+	mkdir -p path0 path1 path6 pathx/ju &&
+	date >path0/file0 &&
+	date >path1/file1 &&
+	date >path6/file6 &&
+	date >path7 &&
+	: >path8 &&
+	: >path9 &&
+	touch path10 &&
+	>pathx/ju/nk &&
+	cat >.expected <<-\EOF
+	path0/file0
+	path1/file1
+	path2
+	path3
+	pathx/ju/nk
+	EOF
+
+ok 2 - git ls-files -k to show killed files.
+
+expecting success: 
+	git ls-files -k >.output &&
+	test_cmp .expected .output
+
+ok 3 - git ls-files -k output (w/o icase)
+
+expecting success: 
+	git -c core.ignorecase=true ls-files -k >.output &&
+	test_cmp .expected .output
+
+ok 4 - git ls-files -k output (w/ icase)
+
+expecting success: 
+	git ls-files -m >.output
+
+ok 5 - git ls-files -m to show modified files.
+
+expecting success: 
+	cat >.expected <<-\EOF &&
+	path0
+	path1
+	path2/file2
+	path3/file3
+	path7
+	path8
+	pathx/ju
+	submod1
+	EOF
+	test_cmp .expected .output
+
+ok 6 - validate git ls-files -m output.
+
+# passed all 6 test(s)
+1..6
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t3001-ls-files-others-exclude.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3001-ls-files-others-exclude/.git/
+expecting success: 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: 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: 
+	git add $allignores &&
+	git update-index --skip-worktree $allignores &&
+	rm $allignores
+
+ok 3 - setup skip-worktree gitignore
+
+expecting success: 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: 
+	git checkout --ignore-skip-worktree-bits $allignores &&
+	rm .git/index
+
+ok 5 - restore gitignore
+
+expecting success: test_cmp expect output
+ok 6 - git status honors core.excludesfile
+
+expecting success: 
+
+	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: 
+
+	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: 
+
+	>two &&
+	git ls-files --others --exclude=two/ >output &&
+	grep "^two" output
+
+
+two
+ok 9 - trailing slash in exclude forces directory match (1)
+
+expecting success: 
+
+	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: 
+
+	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: 
+
+	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: 
+
+	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: 
+	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/git-2.20.1/t/trash directory.t3001-ls-files-others-exclude/top/.git/
+ok 14 - subdirectory ignore (setup)
+
+expecting success: 
+	(
+		cd top &&
+		git ls-files -o --exclude-standard
+	) >actual &&
+	test_must_be_empty actual
+
+ok 15 - subdirectory ignore (toplevel)
+
+expecting success: 
+	(
+		cd top/l1/l2 &&
+		git ls-files -o --exclude-standard
+	) >actual &&
+	test_must_be_empty actual
+
+ok 16 - subdirectory ignore (l1/l2)
+
+expecting success: 
+	(
+		cd top/l1 &&
+		git ls-files -o --exclude-standard
+	) >actual &&
+	test_must_be_empty actual
+
+ok 17 - subdirectory ignore (l1)
+
+expecting success: 
+	rm top/l1/l2/l1 &&
+	rm top/l1/.gitignore
+
+ok 18 - show/hide empty ignored directory (setup)
+
+expecting success: 
+	(
+		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: 
+	(
+		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: 
+	> top/l1/tracked &&
+	(
+		cd top &&
+		git add -f l1/tracked
+	)
+
+ok 21 - show/hide empty ignored sub-directory (setup)
+
+expecting success: 
+	(
+		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: 
+	(
+		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: 
+	git ls-files -i -o --exclude "/three/a.3[abc]" >actual &&
+	test_must_be_empty actual
+
+ok 24 - pattern matches prefix completely
+
+expecting success: 
+	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: 
+	git ls-files -o -i --exclude "one**a.1" >actual &&
+	test_must_be_empty actual
+
+ok 26 - ls-files with "**" patterns and no slashes
+
+# passed all 26 test(s)
+1..26
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t3031-merge-criscross.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3031-merge-criscross/.git/
+expecting success: 
+	mkdir data &&
+
+	# create a bunch of files
+	n=1 &&
+	while test $n -le 10
+	do
+		echo $n > data/$n &&
+		n=$(($n+1)) ||
+		return 1
+	done &&
+
+	# check them in
+	git add data &&
+	git commit -m A &&
+	git branch A &&
+
+	# a file in one branch
+	git checkout -b B A &&
+	git rm data/9 &&
+	git add data &&
+	git commit -m B &&
+
+	# with a branch off of it
+	git branch D &&
+
+	# put some commits on D
+	git checkout D &&
+	echo testD > data/testD &&
+	git add data &&
+	git commit -m D &&
+
+	# back up to the top, create another branch and cause
+	# a rename conflict with the file we deleted earlier
+	git checkout -b C A &&
+	git mv data/9 data/new-9 &&
+	git add data &&
+	git commit -m C &&
+
+	# with a branch off of it
+	git branch E &&
+
+	# put a commit on E
+	git checkout E &&
+	echo testE > data/testE &&
+	git add data &&
+	git commit -m E &&
+
+	# now, merge E into B
+	git checkout B &&
+	test_must_fail git merge E &&
+	# force-resolve
+	git add data &&
+	git commit -m F &&
+	git branch F &&
+
+	# and merge D into C
+	git checkout C &&
+	test_must_fail git merge D &&
+	# force-resolve
+	git add data &&
+	git commit -m G &&
+	git branch G
+
+[master (root-commit) f2e4b7f] A
+ Author: A U Thor <author@example.com>
+ 10 files changed, 10 insertions(+)
+ create mode 100644 data/1
+ create mode 100644 data/10
+ create mode 100644 data/2
+ create mode 100644 data/3
+ create mode 100644 data/4
+ create mode 100644 data/5
+ create mode 100644 data/6
+ create mode 100644 data/7
+ create mode 100644 data/8
+ create mode 100644 data/9
+Switched to a new branch 'B'
+rm 'data/9'
+[B 3c54d10] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 data/9
+Switched to branch 'D'
+[D 5823095] D
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 data/testD
+Switched to a new branch 'C'
+[C 9f47b26] C
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename data/{9 => new-9} (100%)
+Switched to branch 'E'
+[E f7e1d69] E
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 data/testE
+Switched to branch 'B'
+Merging:
+3c54d10 B
+virtual E
+found 1 common ancestor:
+f2e4b7f A
+CONFLICT (rename/delete): data/9 deleted in HEAD and renamed to data/new-9 in E. Version E of data/new-9 left in tree.
+Automatic merge failed; fix conflicts and then commit the result.
+[B a53ec2c] F
+ Author: A U Thor <author@example.com>
+Switched to branch 'C'
+Merging:
+9f47b26 C
+virtual D
+found 1 common ancestor:
+f2e4b7f A
+CONFLICT (rename/delete): data/9 deleted in D and renamed to data/new-9 in HEAD. Version HEAD of data/new-9 left in tree.
+Automatic merge failed; fix conflicts and then commit the result.
+[C 1fd0a96] G
+ Author: A U Thor <author@example.com>
+ok 1 - setup repo with criss-cross history
+
+expecting success: 
+	git merge F
+
+Merging:
+1fd0a96 G
+virtual F
+found 2 common ancestors:
+9f47b26 C
+3c54d10 B
+  Merging:
+  9f47b26 C
+  3c54d10 B
+  found 1 common ancestor:
+  f2e4b7f A
+Skipped data/new-9 (merged same as existing)
+Merge made by the 'recursive' strategy.
+ data/testE | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 data/testE
+ok 2 - recursive merge between F and G does not cause segfault
+
+# passed all 2 test(s)
+1..2
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t2203-add-intent.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t2203-add-intent/.git/
+expecting success: 
+	test_commit 1 &&
+	git rm 1.t &&
+	echo hello >1.t &&
+	echo hello >file &&
+	echo hello >elif &&
+	git add -N file &&
+	git add elif &&
+	git add -N 1.t
+
+[master (root-commit) d0dcf97] 1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1.t
+rm '1.t'
+ok 1 - intent to add
+
+expecting success: 
+	git status --porcelain | grep -v actual >actual &&
+	cat >expect <<-\EOF &&
+	DA 1.t
+	A  elif
+	 A file
+	EOF
+	test_cmp expect actual
+
+ok 2 - git status
+
+expecting success: 
+	git status --porcelain=v2 | grep -v "^?" >actual &&
+	nam1=$(echo 1 | git hash-object --stdin) &&
+	nam2=$(git hash-object elif) &&
+	cat >expect <<-EOF &&
+	1 DA N... 100644 000000 100644 $nam1 $ZERO_OID 1.t
+	1 A. N... 000000 100644 100644 $ZERO_OID $nam2 elif
+	1 .A N... 000000 000000 100644 $ZERO_OID $ZERO_OID file
+	EOF
+	test_cmp expect actual
+
+ok 3 - git status with porcelain v2
+
+expecting success: 
+	git ls-files -s file >actual &&
+	empty=$(git hash-object --stdin </dev/null) &&
+	echo "100644 $empty 0	file" >expect &&
+	test_cmp expect actual
+
+ok 4 - check result of "add -N"
+
+expecting success: 
+	git add -u &&
+	git ls-files -s file >actual &&
+	git ls-files -s elif | sed -e "s/elif/file/" >expect &&
+	test_cmp expect actual
+
+ok 5 - intent to add is just an ordinary empty blob
+
+expecting success: 
+	git add -N file elif &&
+	empty=$(git hash-object --stdin </dev/null) &&
+	git ls-files -s >actual &&
+	! grep "$empty" actual
+
+ok 6 - intent to add does not clobber existing paths
+
+expecting success: 
+	test_tick &&
+	git commit -a -m initial &&
+	git reset --hard &&
+
+	echo xyzzy >rezrov &&
+	echo frotz >nitfol &&
+	git add rezrov &&
+	git add -N nitfol &&
+	git commit -m second &&
+	test $(git ls-tree HEAD -- nitfol | wc -l) = 0 &&
+	test $(git diff --name-only HEAD -- nitfol | wc -l) = 1 &&
+	test $(git diff --name-only -- nitfol | wc -l) = 1
+
+[master b7cca08] initial
+ Author: A U Thor <author@example.com>
+ 3 files changed, 3 insertions(+), 1 deletion(-)
+ create mode 100644 elif
+ create mode 100644 file
+HEAD is now at b7cca08 initial
+[master b70ad0b] second
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 rezrov
+ok 7 - i-t-a entry is simply ignored
+
+expecting success: 
+	git reset --hard &&
+	echo bozbar >rezrov &&
+	echo frotz >nitfol &&
+	git add rezrov &&
+	git add -N nitfol &&
+	git commit -m partial rezrov
+
+HEAD is now at b70ad0b second
+[master 1ed15b5] partial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 8 - can commit with an unrelated i-t-a entry in index
+
+expecting success: 
+	git reset --hard &&
+	: >nitfol &&
+	git add -N nitfol &&
+	git commit -a -m all
+
+HEAD is now at 1ed15b5 partial
+[master 415f3ad] all
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 nitfol
+ok 9 - can "commit -a" with an i-t-a entry
+
+expecting success: 
+	git reset --hard &&
+	mkdir dir &&
+	: >dir/foo &&
+	git add dir/foo &&
+	git commit -m foo &&
+
+	: >dir/bar &&
+	git add -N dir/bar &&
+	git diff --name-only >actual &&
+	echo dir/bar >expect &&
+	test_cmp expect actual &&
+
+	git write-tree >/dev/null &&
+
+	git diff --name-only >actual &&
+	echo dir/bar >expect &&
+	test_cmp expect actual
+
+HEAD is now at 415f3ad all
+[master 03f6a20] foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 dir/foo
+ok 10 - cache-tree invalidates i-t-a paths
+
+expecting success: 
+	git init ita-in-dir &&
+	(
+		cd ita-in-dir &&
+		mkdir 2 &&
+		for f in 1 2/1 2/2 3
+		do
+			echo "$f" >"$f"
+		done &&
+		git add 1 2/2 3 &&
+		git add -N 2/1 &&
+		git commit -m committed &&
+		git ls-tree -r HEAD >actual &&
+		grep 2/2 actual
+	)
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t2203-add-intent/ita-in-dir/.git/
+[master (root-commit) 7b0eb4f] committed
+ Author: A U Thor <author@example.com>
+ 3 files changed, 3 insertions(+)
+ create mode 100644 1
+ create mode 100644 2/2
+ create mode 100644 3
+100644 blob 6b8a6f549c42bad0c52be670caa297a269052aa7	2/2
+ok 11 - cache-tree does not ignore dir that has i-t-a entries
+
+expecting success: 
+	rm -fr ita-in-dir &&
+	git init ita-in-dir &&
+	(
+		cd ita-in-dir &&
+		mkdir -p 1/2/3 &&
+		echo 4 >1/2/3/4 &&
+		git add -N 1/2/3/4 &&
+		git write-tree >actual &&
+		echo $EMPTY_TREE >expected &&
+		test_cmp expected actual
+	)
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t2203-add-intent/ita-in-dir/.git/
+ok 12 - cache-tree does skip dir that becomes empty
+
+expecting success: 
+	git init empty-initial-commit &&
+	(
+		cd empty-initial-commit &&
+		: >one &&
+		git add -N one &&
+		test_must_fail git commit -m nothing-new-here
+	)
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t2203-add-intent/empty-initial-commit/.git/
+On branch master
+
+Initial commit
+
+Changes not staged for commit:
+	new file:   one
+
+no changes added to commit
+ok 13 - commit: ita entries ignored in empty initial commit check
+
+expecting success: 
+	git init empty-subsequent-commit &&
+	(
+		cd empty-subsequent-commit &&
+		test_commit one &&
+		: >two &&
+		git add -N two &&
+		test_must_fail git commit -m nothing-new-here
+	)
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t2203-add-intent/empty-subsequent-commit/.git/
+[master (root-commit) 4331c28] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+On branch master
+Changes not staged for commit:
+	new file:   two
+
+no changes added to commit
+ok 14 - commit: ita entries ignored in empty commit check
+
+expecting success: 
+	git init rename-detection &&
+	(
+		cd rename-detection &&
+		echo contents >first &&
+		git add first &&
+		git commit -m first &&
+		mv first third &&
+		git add -N third &&
+
+		git status | grep -v "^?" >actual.1 &&
+		test_i18ngrep "renamed: *first -> third" actual.1 &&
+
+		git status --porcelain | grep -v "^?" >actual.2 &&
+		cat >expected.2 <<-\EOF &&
+		 R first -> third
+		EOF
+		test_cmp expected.2 actual.2 &&
+
+		hash=$(git hash-object third) &&
+		git status --porcelain=v2 | grep -v "^?" >actual.3 &&
+		cat >expected.3 <<-EOF &&
+		2 .R N... 100644 100644 100644 $hash $hash R100 third	first
+		EOF
+		test_cmp expected.3 actual.3 &&
+
+		git diff --stat >actual.4 &&
+		cat >expected.4 <<-EOF &&
+		 first => third | 0
+		 1 file changed, 0 insertions(+), 0 deletions(-)
+		EOF
+		test_cmp expected.4 actual.4 &&
+
+		git diff --cached --stat >actual.5 &&
+		test_must_be_empty actual.5
+
+	)
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t2203-add-intent/rename-detection/.git/
+[master (root-commit) 0bad72c] first
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 first
+	renamed:    first -> third
+ok 15 - rename detection finds the right names
+
+expecting success: 
+	git init rename-detection-2 &&
+	(
+		cd rename-detection-2 &&
+		echo contents >first &&
+		git add first &&
+		git commit -m first &&
+		git mv first second &&
+		mv second third &&
+		git add -N third &&
+
+		git status | grep -v "^?" >actual.1 &&
+		test_i18ngrep "renamed: *first -> second" actual.1 &&
+		test_i18ngrep "renamed: *second -> third" actual.1 &&
+
+		git status --porcelain | grep -v "^?" >actual.2 &&
+		cat >expected.2 <<-\EOF &&
+		R  first -> second
+		 R second -> third
+		EOF
+		test_cmp expected.2 actual.2 &&
+
+		hash=$(git hash-object third) &&
+		git status --porcelain=v2 | grep -v "^?" >actual.3 &&
+		cat >expected.3 <<-EOF &&
+		2 R. N... 100644 100644 100644 $hash $hash R100 second	first
+		2 .R N... 100644 100644 100644 $hash $hash R100 third	second
+		EOF
+		test_cmp expected.3 actual.3
+	)
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t2203-add-intent/rename-detection-2/.git/
+[master (root-commit) 0bad72c] first
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 first
+	renamed:    first -> second
+	renamed:    second -> third
+ok 16 - double rename detection in status
+
+expecting success: 
+	git reset --hard &&
+	echo new >new-ita &&
+	git add -N new-ita &&
+	git diff --summary >actual &&
+	echo " create mode 100644 new-ita" >expected &&
+	test_cmp expected actual &&
+	git diff --cached --summary >actual2 &&
+	test_must_be_empty actual2
+
+HEAD is now at 03f6a20 foo
+ok 17 - diff-files/diff-cached shows ita as new/not-new files
+
+expecting success: 
+	git reset --hard &&
+	echo new >new-ita &&
+	git add -N new-ita &&
+	git diff HEAD >actual &&
+	cat >expected <<-\EOF &&
+	diff --git a/new-ita b/new-ita
+	new file mode 100644
+	index 0000000..3e75765
+	--- /dev/null
+	+++ b/new-ita
+	@@ -0,0 +1 @@
+	+new
+	EOF
+	test_cmp expected actual
+
+HEAD is now at 03f6a20 foo
+ok 18 - "diff HEAD" includes ita as new files
+
+expecting success: 
+	git reset --hard &&
+	echo new >new-ita &&
+	git add -N new-ita &&
+	git diff >expected &&
+	grep "new file" expected &&
+	git reset --hard &&
+	git apply --intent-to-add expected &&
+	git diff >actual &&
+	test_cmp expected actual
+
+HEAD is now at 03f6a20 foo
+new file mode 100644
+HEAD is now at 03f6a20 foo
+ok 19 - apply --intent-to-add
+
+# passed all 19 test(s)
+1..19
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t0008-ignores.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t0008-ignores/.git/
+expecting success: 
+	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
+	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
+	cat <<-\EOF >>.git/info/exclude
+		per-repo
+	EOF
+
+checking prerequisite: SYMLINKS
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
+	# test whether the filesystem supports symbolic links
+	ln -s x y && test -h y
+
+)
+prerequisite SYMLINKS ok
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t0008-ignores/a/submodule/.git/
+[master (root-commit) add1d0d] 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: 
@@ -49725,1424 +53192,1262 @@
 1..394
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t2202-add-addremove.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t2202-add-addremove/.git/
+*** t3060-ls-files-with-tree.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3060-ls-files-with-tree/.git/
 expecting success: 
-	(
-		echo .gitignore &&
-		echo will-remove
-	) >expect &&
-	(
-		echo actual &&
-		echo expect &&
-		echo ignored
-	) >.gitignore &&
-	git --literal-pathspecs add --all &&
-	>will-remove &&
-	git add --all &&
-	test_tick &&
-	git commit -m initial &&
-	git ls-files >actual &&
-	test_cmp expect actual
 
-[master (root-commit) 50dd5d8] initial
+	# The bug we are exercising requires a fair number of entries
+	# in a sub-directory so that add_index_entry will trigger a
+	# realloc.
+
+	echo file >expected &&
+	mkdir sub &&
+	for n in 0 1 2 3 4 5
+	do
+		for m in 0 1 2 3 4 5 6 7 8 9
+		do
+			num=00$n$m &&
+			>sub/file-$num &&
+			echo file-$num >>expected ||
+			return 1
+		done
+	done &&
+	git add . &&
+	git commit -m "add a bunch of files" &&
+
+	# We remove them all so that we will have something to add
+	# back with --with-tree and so that we will definitely be
+	# under the realloc size to trigger the bug.
+	rm -rf sub &&
+	git commit -a -m "remove them all" &&
+
+	# The bug also requires some entry before our directory so that
+	# prune_path will modify the_index.cache
+
+	mkdir a_directory_that_sorts_before_sub &&
+	>a_directory_that_sorts_before_sub/file &&
+	mkdir sub &&
+	>sub/file &&
+	git add .
+
+[master (root-commit) feb88a4] add a bunch of files
  Author: A U Thor <author@example.com>
- 2 files changed, 3 insertions(+)
- create mode 100644 .gitignore
- create mode 100644 will-remove
+ 61 files changed, 61 insertions(+)
+ create mode 100644 expected
+ create mode 100644 sub/file-0000
+ create mode 100644 sub/file-0001
+ create mode 100644 sub/file-0002
+ create mode 100644 sub/file-0003
+ create mode 100644 sub/file-0004
+ create mode 100644 sub/file-0005
+ create mode 100644 sub/file-0006
+ create mode 100644 sub/file-0007
+ create mode 100644 sub/file-0008
+ create mode 100644 sub/file-0009
+ create mode 100644 sub/file-0010
+ create mode 100644 sub/file-0011
+ create mode 100644 sub/file-0012
+ create mode 100644 sub/file-0013
+ create mode 100644 sub/file-0014
+ create mode 100644 sub/file-0015
+ create mode 100644 sub/file-0016
+ create mode 100644 sub/file-0017
+ create mode 100644 sub/file-0018
+ create mode 100644 sub/file-0019
+ create mode 100644 sub/file-0020
+ create mode 100644 sub/file-0021
+ create mode 100644 sub/file-0022
+ create mode 100644 sub/file-0023
+ create mode 100644 sub/file-0024
+ create mode 100644 sub/file-0025
+ create mode 100644 sub/file-0026
+ create mode 100644 sub/file-0027
+ create mode 100644 sub/file-0028
+ create mode 100644 sub/file-0029
+ create mode 100644 sub/file-0030
+ create mode 100644 sub/file-0031
+ create mode 100644 sub/file-0032
+ create mode 100644 sub/file-0033
+ create mode 100644 sub/file-0034
+ create mode 100644 sub/file-0035
+ create mode 100644 sub/file-0036
+ create mode 100644 sub/file-0037
+ create mode 100644 sub/file-0038
+ create mode 100644 sub/file-0039
+ create mode 100644 sub/file-0040
+ create mode 100644 sub/file-0041
+ create mode 100644 sub/file-0042
+ create mode 100644 sub/file-0043
+ create mode 100644 sub/file-0044
+ create mode 100644 sub/file-0045
+ create mode 100644 sub/file-0046
+ create mode 100644 sub/file-0047
+ create mode 100644 sub/file-0048
+ create mode 100644 sub/file-0049
+ create mode 100644 sub/file-0050
+ create mode 100644 sub/file-0051
+ create mode 100644 sub/file-0052
+ create mode 100644 sub/file-0053
+ create mode 100644 sub/file-0054
+ create mode 100644 sub/file-0055
+ create mode 100644 sub/file-0056
+ create mode 100644 sub/file-0057
+ create mode 100644 sub/file-0058
+ create mode 100644 sub/file-0059
+[master 22d7480] remove them all
+ Author: A U Thor <author@example.com>
+ 60 files changed, 0 insertions(+), 0 deletions(-)
+ delete mode 100644 sub/file-0000
+ delete mode 100644 sub/file-0001
+ delete mode 100644 sub/file-0002
+ delete mode 100644 sub/file-0003
+ delete mode 100644 sub/file-0004
+ delete mode 100644 sub/file-0005
+ delete mode 100644 sub/file-0006
+ delete mode 100644 sub/file-0007
+ delete mode 100644 sub/file-0008
+ delete mode 100644 sub/file-0009
+ delete mode 100644 sub/file-0010
+ delete mode 100644 sub/file-0011
+ delete mode 100644 sub/file-0012
+ delete mode 100644 sub/file-0013
+ delete mode 100644 sub/file-0014
+ delete mode 100644 sub/file-0015
+ delete mode 100644 sub/file-0016
+ delete mode 100644 sub/file-0017
+ delete mode 100644 sub/file-0018
+ delete mode 100644 sub/file-0019
+ delete mode 100644 sub/file-0020
+ delete mode 100644 sub/file-0021
+ delete mode 100644 sub/file-0022
+ delete mode 100644 sub/file-0023
+ delete mode 100644 sub/file-0024
+ delete mode 100644 sub/file-0025
+ delete mode 100644 sub/file-0026
+ delete mode 100644 sub/file-0027
+ delete mode 100644 sub/file-0028
+ delete mode 100644 sub/file-0029
+ delete mode 100644 sub/file-0030
+ delete mode 100644 sub/file-0031
+ delete mode 100644 sub/file-0032
+ delete mode 100644 sub/file-0033
+ delete mode 100644 sub/file-0034
+ delete mode 100644 sub/file-0035
+ delete mode 100644 sub/file-0036
+ delete mode 100644 sub/file-0037
+ delete mode 100644 sub/file-0038
+ delete mode 100644 sub/file-0039
+ delete mode 100644 sub/file-0040
+ delete mode 100644 sub/file-0041
+ delete mode 100644 sub/file-0042
+ delete mode 100644 sub/file-0043
+ delete mode 100644 sub/file-0044
+ delete mode 100644 sub/file-0045
+ delete mode 100644 sub/file-0046
+ delete mode 100644 sub/file-0047
+ delete mode 100644 sub/file-0048
+ delete mode 100644 sub/file-0049
+ delete mode 100644 sub/file-0050
+ delete mode 100644 sub/file-0051
+ delete mode 100644 sub/file-0052
+ delete mode 100644 sub/file-0053
+ delete mode 100644 sub/file-0054
+ delete mode 100644 sub/file-0055
+ delete mode 100644 sub/file-0056
+ delete mode 100644 sub/file-0057
+ delete mode 100644 sub/file-0058
+ delete mode 100644 sub/file-0059
 ok 1 - setup
 
 expecting success: 
+	# We have to run from a sub-directory to trigger prune_path
+	# Then we finally get to run our --with-tree test
 	(
-		echo .gitignore &&
-		echo not-ignored &&
-		echo "M	.gitignore" &&
-		echo "A	not-ignored" &&
-		echo "D	will-remove"
-	) >expect &&
-	>ignored &&
-	>not-ignored &&
-	echo modification >>.gitignore &&
-	rm -f will-remove &&
-	git add --all &&
-	git update-index --refresh &&
-	git ls-files >actual &&
-	git diff-index --name-status --cached HEAD >>actual &&
-	test_cmp expect actual
-
-ok 2 - git add --all
+		cd sub &&
+		git ls-files --with-tree=HEAD~1 >../output
+	)
 
-expecting success: 
-	git reset --hard &&
-	echo >will-remove &&
-	>will-not-be-added &&
-	git add &&
-	git diff-index --name-status --cached HEAD >actual &&
-	test_must_be_empty actual
+ok 2 - git -ls-files --with-tree should succeed from subdir
 
-HEAD is now at 50dd5d8 initial
-Nothing specified, nothing added.
-Maybe you wanted to say 'git add .'?
-ok 3 - Just "git add" is a no-op
+expecting success: test_cmp expected output
+ok 3 - git -ls-files --with-tree should add entries from named tree.
 
 # passed all 3 test(s)
 1..3
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t2107-update-index-basic.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t2107-update-index-basic/.git/
-expecting success: 
-	test_must_fail git update-index --nonsense 2>msg &&
-	cat msg &&
-	test -s msg
-
-error: unknown option 'nonsense'
-usage: git update-index [<options>] [--] [<file>...]
-
-    -q                    continue refresh even when index needs update
-    --ignore-submodules   refresh: ignore submodules
-    --add                 do not ignore new files
-    --replace             let files replace directories and vice-versa
-    --remove              notice files missing from worktree
-    --unmerged            refresh even if index contains unmerged entries
-    --refresh             refresh stat information
-    --really-refresh      like --refresh, but ignore assume-unchanged setting
-    --cacheinfo <mode>,<object>,<path>
-                          add the specified entry to the index
-    --chmod (+|-)x        override the executable bit of the listed files
-    --assume-unchanged    mark files as "not changing"
-    --no-assume-unchanged
-                          clear assumed-unchanged bit
-    --skip-worktree       mark files as "index-only"
-    --no-skip-worktree    clear skip-worktree bit
-    --info-only           add to index only; do not add content to object database
-    --force-remove        remove named paths even if present in worktree
-    -z                    with --stdin: input lines are terminated by null bytes
-    --stdin               read list of paths to be updated from standard input
-    --index-info          add entries from standard input to the index
-    --unresolve           repopulate stages #2 and #3 for the listed paths
-    -g, --again           only update entries that differ from HEAD
-    --ignore-missing      ignore files missing from worktree
-    --verbose             report actions to standard output
-    --clear-resolve-undo  (for porcelains) forget saved unresolved conflicts
-    --index-version <n>   write index in this format
-    --split-index         enable or disable split index
-    --untracked-cache     enable/disable untracked cache
-    --test-untracked-cache
-                          test if the filesystem supports untracked cache
-    --force-untracked-cache
-                          enable untracked cache without testing the filesystem
-    --force-write-index   write out the index even if is not flagged as changed
-    --fsmonitor           enable or disable file system monitor
-    --fsmonitor-valid     mark files as fsmonitor valid
-    --no-fsmonitor-valid  clear fsmonitor valid bit
-
-ok 1 - update-index --nonsense fails
-
-expecting success: 
-	test_expect_code 129 git update-index --nonsense 2>err &&
-	test_i18ngrep "[Uu]sage: git update-index" err
-
-usage: git update-index [<options>] [--] [<file>...]
-ok 2 - update-index --nonsense dumps usage
-
-expecting success: 
-	mkdir broken &&
-	(
-		cd broken &&
-		git init &&
-		>.git/index &&
-		test_expect_code 129 git update-index -h >usage 2>&1
-	) &&
-	test_i18ngrep "[Uu]sage: git update-index" broken/usage
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t2107-update-index-basic/broken/.git/
-usage: git update-index [<options>] [--] [<file>...]
-ok 3 - update-index -h with corrupt index
-
-expecting success: 
-	test_must_fail git update-index --cacheinfo
-
-error: option 'cacheinfo' expects <mode>,<sha1>,<path>
-ok 4 - --cacheinfo complains of missing arguments
-
-expecting success: 
-	echo content >file &&
-	git add file &&
-	git rev-parse :file >expect &&
-	test_must_fail git update-index --cacheinfo 100644 $ZERO_OID file &&
-	git rev-parse :file >actual &&
-	test_cmp expect actual
-
-error: cache entry has null sha1: file
-fatal: Unable to write new index file
-ok 5 - --cacheinfo does not accept blob null sha1
-
+*** t3032-merge-recursive-space-options.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3032-merge-recursive-space-options/.git/
 expecting success: 
-	git init submodule &&
-	(cd submodule && test_commit foo) &&
-	git add submodule &&
-	git rev-parse :submodule >expect &&
-	test_must_fail git update-index --cacheinfo 160000 $ZERO_OID submodule &&
-	git rev-parse :submodule >actual &&
-	test_cmp expect actual
+	conflict_hunks () {
+		sed $SED_OPTIONS -n -e "
+			/^<<<</ b conflict
+			b
+			: conflict
+			p
+			/^>>>>/ b
+			n
+			b conflict
+		" "$@"
+	} &&
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t2107-update-index-basic/submodule/.git/
-[master (root-commit) ddd63c9] foo
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo.t
-warning: adding embedded git repository: submodule
-hint: You've added another git repository inside your current repository.
-hint: Clones of the outer repository will not contain the contents of
-hint: the embedded repository and will not know how to obtain it.
-hint: If you meant to add a submodule, use:
-hint: 
-hint: 	git submodule add <url> submodule
-hint: 
-hint: If you added this path by mistake, you can remove it from the
-hint: index with:
-hint: 
-hint: 	git rm --cached submodule
-hint: 
-hint: See "git help submodule" for more information.
-error: cache entry has null sha1: submodule
-fatal: Unable to write new index file
-ok 6 - --cacheinfo does not accept gitlink null sha1
+	cat <<-\EOF >text.txt &&
+	    Hope, he says, cherishes the soul of him who lives in
+	    justice and holiness and is the nurse of his age and the
+	    companion of his journey;--hope which is mightiest to sway
+	    the restless soul of man.
 
-expecting success: 
-	echo content >file &&
-	git hash-object -w --stdin <file >expect &&
+	How admirable are his words!  And the great blessing of riches, I do
+	not say to every man, but to a good man, is, that he has had no
+	occasion to deceive or to defraud others, either intentionally or
+	unintentionally; and when he departs to the world below he is not in
+	any apprehension about offerings due to the gods or debts which he owes
+	to men.  Now to this peace of mind the possession of wealth greatly
+	contributes; and therefore I say, that, setting one thing against
+	another, of the many advantages which wealth has to give, to a man of
+	sense this is in my opinion the greatest.
 
-	git update-index --add --cacheinfo 100644 "$(cat expect)" file &&
-	git rev-parse :file >actual &&
-	test_cmp expect actual &&
+	Well said, Cephalus, I replied; but as concerning justice, what is
+	it?--to speak the truth and to pay your debts--no more than this?  And
+	even to this are there not exceptions?  Suppose that a friend when in
+	his right mind has deposited arms with me and he asks for them when he
+	is not in his right mind, ought I to give them back to him?  No one
+	would say that I ought or that I should be right in doing so, any more
+	than they would say that I ought always to speak the truth to one who
+	is in his condition.
 
-	git update-index --add --cacheinfo "100644,$(cat expect),elif" &&
-	git rev-parse :elif >actual &&
-	test_cmp expect actual
+	You are quite right, he replied.
 
-ok 7 - --cacheinfo mode,sha1,path (new syntax)
+	But then, I said, speaking the truth and paying your debts is not a
+	correct definition of justice.
 
-expecting success: 
-	mkdir cleanup &&
-	(
-	cd cleanup &&
-	mkdir worktree &&
-	git init repo &&
-	cd repo &&
-	git config core.worktree ../../worktree &&
-	# --refresh triggers late setup_work_tree,
-	# active_cache_changed is zero, rollback_lock_file fails
-	git update-index --refresh &&
-	! test -f .git/index.lock
-	)
+	CEPHALUS - SOCRATES - POLEMARCHUS
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t2107-update-index-basic/cleanup/repo/.git/
-ok 8 - .lock files cleaned up
+	Quite correct, Socrates, if Simonides is to be believed, said
+	Polemarchus interposing.
 
-expecting success: 
-	>A &&
-	>B &&
-	git add A B &&
-	git update-index --chmod=+x A --chmod=-x B &&
-	cat >expect <<-EOF &&
-	100755 $EMPTY_BLOB 0	A
-	100644 $EMPTY_BLOB 0	B
+	I fear, said Cephalus, that I must go now, for I have to look after the
+	sacrifices, and I hand over the argument to Polemarchus and the company.
 	EOF
-	git ls-files --stage A B >actual &&
-	test_cmp expect actual
+	git add text.txt &&
+	test_tick &&
+	git commit -m "Initial revision" &&
 
-ok 9 - --chmod=+x and chmod=-x in the same argument list
+	git checkout -b remote &&
+	sed -e "
+			s/\.  /\. /g
+			s/[?]  /? /g
+			s/    /	/g
+			s/--/---/g
+			s/but as concerning/but as con cerning/
+			/CEPHALUS - SOCRATES - POLEMARCHUS/ d
+		" text.txt >text.txt+ &&
+	mv text.txt+ text.txt &&
+	git commit -a -m "Remove cruft" &&
 
-# passed all 9 test(s)
-1..9
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t2030-unresolve-info.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t2030-unresolve-info/.git/
-expecting success: 
-	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 master
+	git checkout master &&
+	sed -e "
+			s/\(not in his right mind\),\(.*\)/\1;\2Q/
+			s/Quite correct\(.*\)/It is too correct\1Q/
+			s/unintentionally/un intentionally/
+			/un intentionally/ s/$/Q/
+			s/Polemarchus interposing./Polemarchus, interposing.Q/
+			/justice and holiness/ s/$/Q/
+			/pay your debts/ s/$/Q/
+		" text.txt | q_to_cr >text.txt+ &&
+	mv text.txt+ text.txt &&
+	git commit -a -m "Clarify" &&
+	git show-branch --all
 
-[master (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
-[master 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
+[master (root-commit) c1e95d9] Initial revision
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to branch 'add-add'
-[add-add b851e77] fifth
+ 1 file changed, 36 insertions(+)
+ create mode 100644 text.txt
+Switched to a new branch 'remote'
+[remote be82dcf] Remove cruft
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 add-differently
+ 1 file changed, 9 insertions(+), 10 deletions(-)
 Switched to branch 'master'
+[master 0ab7224] Clarify
+ Author: A U Thor <author@example.com>
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+* [master] Clarify
+ ! [remote] Remove cruft
+--
+ + [remote] Remove cruft
+*  [master] Clarify
+*+ [remote^] Initial revision
 ok 1 - setup
 
 expecting success: 
-	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: checking out '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 performing another checkout.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
-
-  git checkout -b <new-branch-name>
+	git read-tree --reset -u HEAD &&
+	test_must_fail git merge-recursive HEAD^ -- HEAD remote &&
+	test_must_fail git update-index --refresh &&
+	grep "<<<<<<" text.txt
 
-HEAD is now at 9a00f99 second
+Merging HEAD with remote
 Merging:
-9a00f99 second
-virtual third^0
+0ab7224 Clarify
+be82dcf Remove cruft
 found 1 common ancestor:
-7b271e3 initial
-Auto-merging fi/le
-CONFLICT (content): Merge conflict in fi/le
-Automatic merge failed; fix conflicts and then commit the result.
-merge does not leave anything
-resolving records
-[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:
+c1e95d9 Initial revision
+Auto-merging text.txt
+CONFLICT (content): Merge conflict in text.txt
+text.txt: needs merge
+<<<<<<< HEAD
+<<<<<<< HEAD
+ok 2 - naive merge fails
 
-  b3a51df merged
+expecting success: 
+	git read-tree --reset -u HEAD &&
+	git merge-recursive --ignore-space-change HEAD^ -- HEAD remote
 
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
+Merging HEAD with remote
+Merging:
+0ab7224 Clarify
+be82dcf Remove cruft
+found 1 common ancestor:
+c1e95d9 Initial revision
+Auto-merging text.txt
+ok 3 - --ignore-space-change makes merge succeed
 
- git branch <new-branch-name> b3a51df
+expecting success: 
+	git read-tree --reset -u HEAD &&
+	test_must_fail git cherry-pick --no-commit remote &&
+	git read-tree --reset -u HEAD &&
+	test_must_fail git cherry-pick remote &&
+	test_must_fail git update-index --refresh &&
+	grep "<<<<<<" text.txt
 
-HEAD is now at 9a00f99 second
-switching clears
-ok 2 - add records switch clears
+Auto-merging text.txt
+CONFLICT (content): Merge conflict in text.txt
+error: could not apply be82dcf... Remove cruft
+hint: after resolving the conflicts, mark the corrected paths
+hint: with 'git add <paths>' or 'git rm <paths>'
+Auto-merging text.txt
+CONFLICT (content): Merge conflict in text.txt
+error: could not apply be82dcf... Remove cruft
+hint: after resolving the conflicts, mark the corrected paths
+hint: with 'git add <paths>' or 'git rm <paths>'
+hint: and commit the result with 'git commit'
+text.txt: needs merge
+<<<<<<< HEAD
+<<<<<<< HEAD
+ok 4 - naive cherry-pick fails
 
 expecting success: 
-	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 read-tree --reset -u HEAD &&
+	git cherry-pick --no-commit -Xignore-space-change remote
 
-	echo merge clears upfront &&
-	test_must_fail git merge fourth^0 &&
-	check_resolve_undo nuked &&
+Auto-merging text.txt
+ok 5 - -Xignore-space-change makes cherry-pick succeed
 
-	git rm -f fi/le &&
-	echo resolving records &&
-	check_resolve_undo recorded fi/le initial:fi/le HEAD:fi/le fourth:fi/le &&
+expecting success: 
+	q_to_cr <<-\EOF >expected &&
+	    justice and holiness and is the nurse of his age and theQ
+	EOF
 
-	git reset --hard &&
-	echo resetting discards &&
-	check_resolve_undo discarded
+	git read-tree --reset -u HEAD &&
+	git merge-recursive --ignore-space-change HEAD^ -- HEAD remote &&
+	grep "justice and holiness" text.txt >actual &&
+	test_cmp expected actual
 
-HEAD is now at 9a00f99 second
-HEAD is now at 9a00f99 second
-Merging:
-9a00f99 second
-virtual third^0
-found 1 common ancestor:
-7b271e3 initial
-Auto-merging fi/le
-CONFLICT (content): Merge conflict in fi/le
-Automatic merge failed; fix conflicts and then commit the result.
-merge does not leave anything
-resolving records
-[detached HEAD 70d285e] merged
- Author: A U Thor <author@example.com>
-committing keeps
-merge clears upfront
+Merging HEAD with remote
 Merging:
-70d285e merged
-virtual fourth^0
+0ab7224 Clarify
+be82dcf Remove cruft
 found 1 common ancestor:
-7b271e3 initial
-Auto-merging fi/le
-CONFLICT (content): Merge conflict in fi/le
-Automatic merge failed; fix conflicts and then commit the result.
-fi/le: needs merge
-rm 'fi/le'
-resolving records
-HEAD is now at 70d285e merged
-resetting discards
-ok 3 - rm records reset clears
+c1e95d9 Initial revision
+Auto-merging text.txt
+ok 6 - --ignore-space-change: our w/s-only change wins
 
 expecting success: 
-	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
+	cat <<-\EOF >expected &&
+	it?---to speak the truth and to pay your debts---no more than this? And
+	EOF
 
-HEAD is now at 70d285e merged
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+	git read-tree --reset -u HEAD &&
+	git merge-recursive --ignore-space-change HEAD^ -- HEAD remote &&
+	grep "pay your debts" text.txt >actual &&
+	test_cmp expected actual
 
-  70d285e merged
+Merging HEAD with remote
+Merging:
+0ab7224 Clarify
+be82dcf Remove cruft
+found 1 common ancestor:
+c1e95d9 Initial revision
+Auto-merging text.txt
+ok 7 - --ignore-space-change: their real change wins over w/s
 
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
+expecting success: 
+	cat <<-\EOF >expected1 &&
+	Well said, Cephalus, I replied; but as con cerning justice, what is
+	EOF
+	q_to_cr <<-\EOF >expected2 &&
+	un intentionally; and when he departs to the world below he is not inQ
+	EOF
 
- git branch <new-branch-name> 70d285e
+	git read-tree --reset -u HEAD &&
+	git merge-recursive --ignore-space-change HEAD^ -- HEAD remote &&
+	grep "Well said" text.txt >actual1 &&
+	grep "when he departs" text.txt >actual2 &&
+	test_cmp expected1 actual1 &&
+	test_cmp expected2 actual2
 
-HEAD is now at 9a00f99 second
+Merging HEAD with remote
 Merging:
-9a00f99 second
-virtual third^0
+0ab7224 Clarify
+be82dcf Remove cruft
 found 1 common ancestor:
-7b271e3 initial
-Auto-merging fi/le
-CONFLICT (content): Merge conflict in fi/le
-Automatic merge failed; fix conflicts and then commit the result.
-merge does not leave anything
-resolving records
-[detached HEAD 894de51] merged
- Author: A U Thor <author@example.com>
-committing keeps
-plumbing clear
-ok 4 - plumbing clears
+c1e95d9 Initial revision
+Auto-merging text.txt
+ok 8 - --ignore-space-change: does not ignore new spaces
 
 expecting success: 
-	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
+	cat <<-\EOF >expected &&
+	Well said, Cephalus, I replied; but as concerning justice, what is
+	EOF
 
-HEAD is now at 894de51 merged
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+	git read-tree --reset -u HEAD &&
+	git merge-recursive --ignore-all-space HEAD^ -- HEAD remote &&
+	grep "Well said" text.txt >actual &&
+	test_cmp expected actual
 
-  894de51 merged
+Merging HEAD with remote
+Merging:
+0ab7224 Clarify
+be82dcf Remove cruft
+found 1 common ancestor:
+c1e95d9 Initial revision
+Auto-merging text.txt
+ok 9 - --ignore-all-space drops their new spaces
 
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
+expecting success: 
+	q_to_cr <<-\EOF >expected &&
+	un intentionally; and when he departs to the world below he is not inQ
+	EOF
 
- git branch <new-branch-name> 894de51
+	git read-tree --reset -u HEAD &&
+	git merge-recursive --ignore-all-space HEAD^ -- HEAD remote &&
+	grep "when he departs" text.txt >actual &&
+	test_cmp expected actual
 
-HEAD is now at 9a00f99 second
+Merging HEAD with remote
 Merging:
-9a00f99 second
-virtual third^0
+0ab7224 Clarify
+be82dcf Remove cruft
 found 1 common ancestor:
-7b271e3 initial
-Auto-merging fi/le
-CONFLICT (content): Merge conflict in fi/le
-Automatic merge failed; fix conflicts and then commit the result.
-merge does not leave anything
-resolving records
-diff --git a/fi/le b/fi/le
-index e019be0..8dca2f8 100644
---- a/fi/le
-+++ b/fi/le
-@@ -1 +1 @@
--second
-+different
-checkout used the record and removed it
-the index and the work tree is unmerged again
-++<<<<<<< ours
-ok 5 - add records checkout -m undoes
+c1e95d9 Initial revision
+Auto-merging text.txt
+ok 10 - --ignore-all-space keeps our new spaces
 
 expecting success: 
-	prime_resolve_undo &&
-	git update-index --unresolve fi/le &&
-	git ls-files -u >actual &&
-	test_line_count = 3 actual
+	q_to_cr <<-\EOF >expected &&
+	<<<<<<< HEAD
+	is not in his right mind; ought I to give them back to him?  No oneQ
+	=======
+	is not in his right mind, ought I to give them back to him? No one
+	>>>>>>> remote
+	EOF
 
-HEAD is now at 9a00f99 second
-HEAD is now at 9a00f99 second
+	git read-tree --reset -u HEAD &&
+	test_must_fail git merge-recursive --ignore-space-at-eol \
+						 HEAD^ -- HEAD remote &&
+	conflict_hunks text.txt >actual &&
+	test_cmp expected actual
+
+Merging HEAD with remote
 Merging:
-9a00f99 second
-virtual third^0
+0ab7224 Clarify
+be82dcf Remove cruft
 found 1 common ancestor:
-7b271e3 initial
-Auto-merging fi/le
-CONFLICT (content): Merge conflict in fi/le
-Automatic merge failed; fix conflicts and then commit the result.
-merge does not leave anything
-resolving records
-ok 6 - unmerge with plumbing
+c1e95d9 Initial revision
+Auto-merging text.txt
+CONFLICT (content): Merge conflict in text.txt
+ok 11 - --ignore-space-at-eol
 
+# passed all 11 test(s)
+1..11
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t3035-merge-sparse.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3035-merge-sparse/.git/
 expecting success: 
-	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
+	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 &&
+	echo "/checked-out" >.git/info/sparse-checkout &&
+	git reset --hard &&
+	! git merge theirs
 
-HEAD is now at 9a00f99 second
-HEAD is now at 9a00f99 second
+[master (root-commit) aff534d] init
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 checked-out
+ create mode 100644 modify_delete
+[master 87a6655] theirs
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+HEAD is now at aff534d init
+rm 'modify_delete'
+[master 4c33e02] ours
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 modify_delete
+HEAD is now at 4c33e02 ours
 Merging:
-9a00f99 second
-virtual third^0
+4c33e02 ours
+virtual theirs
 found 1 common ancestor:
-7b271e3 initial
-Auto-merging fi/le
-CONFLICT (content): Merge conflict in fi/le
-Recorded preimage for 'fi/le'
+aff534d init
+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.
-merge does not leave anything
-resolving records
-record the resolution
-Recorded resolution for 'fi/le'.
-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 7 - rerere and rerere forget
+ok 1 - setup
 
 expecting success: 
-	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
+	git reset --hard
 
-HEAD is now at 9a00f99 second
-HEAD is now at 9a00f99 second
-Merging:
-9a00f99 second
-virtual third^0
-found 1 common ancestor:
-7b271e3 initial
-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.
-merge does not leave anything
-resolving records
-record the resolution
-Recorded resolution for 'fi/le'.
-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 8 - rerere and rerere forget (subdirectory)
+HEAD is now at 4c33e02 ours
+ok 2 - reset --hard works after the conflict
 
 expecting success: 
-	git checkout -f side &&
-	printf "a\0c" >binary &&
-	git commit -a -m binary &&
-	test_must_fail git merge second &&
-	git rerere forget binary
+	git status --porcelain -- modify_delete >out &&
+	test_must_be_empty out &&
+	test_path_is_missing modify_delete
 
-Previous HEAD position was 9a00f99 second
-Switched to branch 'side'
-[side 431a49e] binary
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
-warning: Cannot merge binary files: binary (HEAD vs. second)
-Merging:
-431a49e binary
-virtual second
-found 1 common ancestor:
-7b271e3 initial
-Auto-merging fi/le
-CONFLICT (content): Merge conflict in fi/le
-Auto-merging binary
-CONFLICT (content): Merge conflict in binary
-Recorded preimage for 'fi/le'
-Automatic merge failed; fix conflicts and then commit the result.
-warning: Cannot merge binary files: binary (ours vs. theirs)
-error: could not parse conflict hunks in 'binary'
-ok 9 - rerere forget (binary)
+ok 3 - is reset properly
 
 expecting success: 
-	git checkout -f master &&
-	echo master >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_i18ngrep "no remembered" actual
+	! git merge theirs
 
-Switched to branch 'master'
-[master 2aac45c] add differently
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 add-differently
 Merging:
-2aac45c add differently
-virtual fifth
+4c33e02 ours
+virtual theirs
 found 1 common ancestor:
-7b271e3 initial
-Auto-merging fi/le
-CONFLICT (content): Merge conflict in fi/le
-Auto-merging add-differently
-CONFLICT (add/add): Merge conflict in add-differently
-Recorded preimage for 'add-differently'
-Recorded preimage for 'fi/le'
+aff534d init
+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.
-error: no remembered resolution for 'add-differently'
-ok 10 - rerere forget (add-add conflict)
+ok 4 - setup: conflict back
 
-# passed all 10 test(s)
-1..10
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t2201-add-update-typechange.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t2201-add-update-typechange/.git/
 expecting success: 
-	>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
-
+	git merge --abort
 
-checking prerequisite: SYMLINKS
+ok 5 - Merge abort works after the conflict
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
-	# test whether the filesystem supports symbolic links
-	ln -s x y && test -h y
+expecting success: 
+	git status --porcelain -- modify_delete >out &&
+	test_must_be_empty out &&
+	test_path_is_missing modify_delete
 
-)
-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
+ok 6 - is aborted properly
 
+# passed all 6 test(s)
+1..6
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t3050-subprojects-fetch.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3050-subprojects-fetch/.git/
 expecting success: 
-	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 &&
+	test_tick &&
+	mkdir -p sub && (
+		cd sub &&
 		git init &&
-		git add yonk &&
-		git commit -m "sub initial"
+		>subfile &&
+		git add subfile &&
+		git commit -m "subproject commit #1"
 	) &&
-	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
+	>mainfile &&
+	git add sub mainfile &&
+	test_tick &&
+	git commit -m "superproject commit #1"
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t2201-add-update-typechange/yomin/.git/
-[master (root-commit) 9da2848] sub initial
+Initialized empty Git repository in /build/git-2.20.1/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 yomin
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t2201-add-update-typechange/yonk/.git/
-[master (root-commit) 9cc3160] sub initial
+ 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.
+[master (root-commit) 1226c2e] superproject commit #1
  Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 yonk
-ok 2 - modify
-
-expecting success: 
-	git diff-files --raw >actual &&
-	test_cmp expect-files actual
-
-ok 3 - diff-files
+ 2 files changed, 1 insertion(+)
+ create mode 100644 mainfile
+ create mode 160000 sub
+ok 1 - setup
 
 expecting success: 
-	git diff-index --raw HEAD -- >actual &&
-	test_cmp expect-index actual
+	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
 
-ok 4 - diff-index
+Cloning into 'cloned'...
+ok 2 - clone
 
 expecting success: 
-	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
+	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"
 
-ok 5 - add -u
+[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: 
-	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
+	(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
 
-[master 0f3d2ce] second
- Author: A U Thor <author@example.com>
- 5 files changed, 2 insertions(+)
- rename caskly => nitfol (100%)
- delete mode 100644 rezrov/bozbar
- delete mode 100644 xyzzy
- mode change 100644 => 160000 yomin
- create mode 160000 yonk
-ok 6 - commit -a
+From file:///build/git-2.20.1/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 6 test(s)
-1..6
+# passed all 4 test(s)
+1..4
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t2024-checkout-dwim.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t2024-checkout-dwim/.git/
+*** t2204-add-ignored.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t2204-add-ignored/.git/
 expecting success: 
-	test_commit my_master &&
-	git init repo_a &&
-	(
-		cd repo_a &&
-		test_commit a_master &&
-		git checkout -b foo &&
-		test_commit a_foo &&
-		git checkout -b bar &&
-		test_commit a_bar
-	) &&
-	git init repo_b &&
-	(
-		cd repo_b &&
-		test_commit b_master &&
-		git checkout -b foo &&
-		test_commit b_foo &&
-		git checkout -b baz &&
-		test_commit b_baz
-	) &&
-	git remote add repo_a repo_a &&
-	git remote add repo_b repo_b &&
-	git config remote.repo_b.fetch \
-		"+refs/heads/*:refs/remotes/other_b/*" &&
-	git fetch --all
+	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
 
-[master (root-commit) 93159a7] my_master
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 my_master.t
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t2024-checkout-dwim/repo_a/.git/
-[master (root-commit) 9480204] a_master
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 a_master.t
-Switched to a new branch 'foo'
-[foo ba3a763] a_foo
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 a_foo.t
-Switched to a new branch 'bar'
-[bar 1901e7e] a_bar
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 a_bar.t
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t2024-checkout-dwim/repo_b/.git/
-[master (root-commit) eb1360a] b_master
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b_master.t
-Switched to a new branch 'foo'
-[foo 73c9fcf] b_foo
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b_foo.t
-Switched to a new branch 'baz'
-[baz a4f4a16] b_baz
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b_baz.t
-Fetching repo_a
-warning: no common commits
-From repo_a
- * [new branch]      bar        -> repo_a/bar
- * [new branch]      foo        -> repo_a/foo
- * [new branch]      master     -> repo_a/master
- * [new tag]         a_bar      -> a_bar
- * [new tag]         a_foo      -> a_foo
- * [new tag]         a_master   -> a_master
-Fetching repo_b
-warning: no common commits
-From repo_b
- * [new branch]      baz        -> other_b/baz
- * [new branch]      foo        -> other_b/foo
- * [new branch]      master     -> other_b/master
- * [new tag]         b_baz      -> b_baz
- * [new tag]         b_foo      -> b_foo
- * [new tag]         b_master   -> b_master
 ok 1 - setup
 
 expecting success: 
-	git checkout -B master &&
-	test_might_fail git branch -D xyzzy &&
+		rm -f .git/index &&
+		git add "$i" &&
+		git ls-files "$i" >out &&
+		test -s out
+	
+ok 2 - no complaints for unignored file
 
-	test_must_fail git checkout xyzzy &&
-	status_uno_is_clean &&
-	test_must_fail git rev-parse --verify refs/heads/xyzzy &&
-	test_branch master
+expecting success: 
+		rm -f .git/index &&
+		git add "$i" &&
+		git ls-files "$i" >out &&
+		test -s out
+	
+ok 3 - no complaints for unignored dir/file
 
-Reset branch 'master'
-error: branch 'xyzzy' not found.
-error: pathspec 'xyzzy' did not match any file(s) known to git
-fatal: Needed a single revision
-ok 2 - checkout of non-existing branch fails
+expecting success: 
+		rm -f .git/index &&
+		git add "$i" &&
+		git ls-files "$i" >out &&
+		test -s out
+	
+ok 4 - no complaints for unignored dir
 
 expecting success: 
-	git checkout -B master &&
-	test_might_fail git branch -D foo &&
+		rm -f .git/index &&
+		git add "$i" &&
+		git ls-files "$i" >out &&
+		test -s out
+	
+ok 5 - no complaints for unignored d*
 
-	test_must_fail git checkout foo &&
-	status_uno_is_clean &&
-	test_must_fail git rev-parse --verify refs/heads/foo &&
-	test_branch master
+expecting success: 
+		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
 
-Reset branch 'master'
-error: branch 'foo' not found.
-error: pathspec 'foo' did not match any file(s) known to git
-hint: 'foo' matched more than one remote tracking branch.
-hint: We found 2 remotes with a reference that matched. So we fell back
-hint: on trying to resolve the argument as a path, but failed there too!
-hint: 
-hint: If you meant to check out a remote tracking branch on, e.g. 'origin',
-hint: you can do so by fully qualifying the name with the --track option:
-hint: 
-hint:     git checkout --track origin/<name>
-hint: 
-hint: If you'd like to always have checkouts of an ambiguous <name> prefer
-hint: one remote, e.g. the 'origin' remote, consider setting
-hint: checkout.defaultRemote=origin in your config.
-fatal: Needed a single revision
-ok 3 - checkout of branch from multiple remotes fails #1
+expecting success: 
+		test_i18ngrep -e "Use -f if" err
+	
+Use -f if you really want to add them.
+ok 7 - complaints for ignored ign output
 
 expecting success: 
-	git checkout -B master &&
-	test_might_fail git branch -D foo &&
-	test_must_fail git checkout foo 2>stderr &&
-	test_branch master &&
-	status_uno_is_clean &&
-	test_i18ngrep "^hint: " stderr &&
-	test_must_fail git -c advice.checkoutAmbiguousRemoteBranchName=false \
-		checkout foo 2>stderr &&
-	test_branch master &&
-	status_uno_is_clean &&
-	test_i18ngrep ! "^hint: " stderr
+		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
 
-Reset branch 'master'
-error: branch 'foo' not found.
-hint: 'foo' matched more than one remote tracking branch.
-hint: We found 2 remotes with a reference that matched. So we fell back
-hint: on trying to resolve the argument as a path, but failed there too!
-hint: 
-hint: If you meant to check out a remote tracking branch on, e.g. 'origin',
-hint: you can do so by fully qualifying the name with the --track option:
-hint: 
-hint:     git checkout --track origin/<name>
-hint: 
-hint: If you'd like to always have checkouts of an ambiguous <name> prefer
-hint: one remote, e.g. the 'origin' remote, consider setting
-hint: checkout.defaultRemote=origin in your config.
-ok 4 - checkout of branch from multiple remotes fails with advice
+expecting success: 
+		test_i18ngrep -e "Use -f if" err
+	
+Use -f if you really want to add them.
+ok 9 - complaints for ignored ign with unignored file output
 
 expecting success: 
-	git checkout -B master &&
-	test_might_fail git branch -D foo &&
+		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
 
-	git checkout -p foo 2>stderr &&
-	test_i18ngrep ! "^hint: " stderr &&
-	status_uno_is_clean
+expecting success: 
+		test_i18ngrep -e "Use -f if" err
+	
+Use -f if you really want to add them.
+ok 11 - complaints for ignored dir/ign output
 
-Reset branch 'master'
-error: branch 'foo' not found.
-ok 5 - checkout -p with multiple remotes does not print advice
+expecting success: 
+		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: 
-	git checkout -B master &&
-	status_uno_is_clean &&
-	test_might_fail git branch -D foo &&
+		test_i18ngrep -e "Use -f if" err
+	
+Use -f if you really want to add them.
+ok 13 - complaints for ignored dir/ign with unignored file output
 
-	git -c checkout.defaultRemote=repo_a checkout foo &&
-	status_uno_is_clean &&
-	test_branch foo &&
-	test_cmp_rev remotes/repo_a/foo HEAD &&
-	test_branch_upstream foo repo_a foo
+expecting success: 
+		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
 
-Reset branch 'master'
-error: branch 'foo' not found.
-Switched to a new branch 'foo'
-Branch 'foo' set up to track remote branch 'foo' from 'repo_a'.
-ok 6 - checkout of branch from multiple remotes succeeds with checkout.defaultRemote #1
+expecting success: 
+		test_i18ngrep -e "Use -f if" err
+	
+Use -f if you really want to add them.
+ok 15 - complaints for ignored dir/sub output
 
 expecting success: 
-	git checkout -B master &&
-	test_might_fail git branch -D bar &&
+		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
 
-	git checkout bar &&
-	status_uno_is_clean &&
-	test_branch bar &&
-	test_cmp_rev remotes/repo_a/bar HEAD &&
-	test_branch_upstream bar repo_a bar
+expecting success: 
+		test_i18ngrep -e "Use -f if" err
+	
+Use -f if you really want to add them.
+ok 17 - complaints for ignored dir/sub with unignored file output
 
-Switched to and reset branch 'master'
-error: branch 'bar' not found.
-Switched to a new branch 'bar'
-Branch 'bar' set up to track remote branch 'bar' from 'repo_a'.
-ok 7 - checkout of branch from a single remote succeeds #1
+expecting success: 
+		rm -f .git/index &&
+		test_must_fail git add "$i" 2>err &&
+		git ls-files "$i" >out &&
+		test_must_be_empty out
+	
+ok 18 - complaints for ignored dir/sub/ign
 
 expecting success: 
-	git checkout -B master &&
-	test_might_fail git branch -D baz &&
+		test_i18ngrep -e "Use -f if" err
+	
+Use -f if you really want to add them.
+ok 19 - complaints for ignored dir/sub/ign output
 
-	git checkout baz &&
-	status_uno_is_clean &&
-	test_branch baz &&
-	test_cmp_rev remotes/other_b/baz HEAD &&
-	test_branch_upstream baz repo_b baz
+expecting success: 
+		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
 
-Switched to and reset branch 'master'
-error: branch 'baz' not found.
-Switched to a new branch 'baz'
-Branch 'baz' set up to track remote branch 'baz' from 'repo_b'.
-ok 8 - checkout of branch from a single remote succeeds #2
+expecting success: 
+		test_i18ngrep -e "Use -f if" err
+	
+Use -f if you really want to add them.
+ok 21 - complaints for ignored dir/sub/ign with unignored file output
 
 expecting success: 
-	git checkout -B master &&
-	status_uno_is_clean &&
-	test_might_fail git branch -D bar &&
+		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
 
-	test_must_fail git checkout --no-guess bar &&
-	test_must_fail git rev-parse --verify refs/heads/bar &&
-	test_branch master
+expecting success: 
+		test_i18ngrep -e "Use -f if" err
+	
+Use -f if you really want to add them.
+ok 23 - complaints for ignored sub/file output
 
-Switched to and reset branch 'master'
-Deleted branch bar (was 1901e7e).
-error: pathspec 'bar' did not match any file(s) known to git
-fatal: Needed a single revision
-ok 9 - --no-guess suppresses branch auto-vivification
+expecting success: 
+		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: 
-	git checkout -B master &&
-	status_uno_is_clean &&
-	git init repo_c &&
-	(
-		cd repo_c &&
-		test_commit c_master &&
-		git checkout -b bar &&
-		test_commit c_bar &&
-		git checkout -b spam &&
-		test_commit c_spam
-	) &&
-	git init repo_d &&
-	(
-		cd repo_d &&
-		test_commit d_master &&
-		git checkout -b baz &&
-		test_commit d_baz &&
-		git checkout -b eggs &&
-		test_commit d_eggs
-	) &&
-	git remote add repo_c repo_c &&
-	git config remote.repo_c.fetch \
-		"+refs/heads/*:refs/remotes/extra_dir/repo_c/extra_dir/*" &&
-	git remote add repo_d repo_d &&
-	git config remote.repo_d.fetch \
-		"+refs/heads/*:refs/repo_d/*" &&
-	git fetch --all
+		test_i18ngrep -e "Use -f if" err
+	
+Use -f if you really want to add them.
+ok 25 - complaints for ignored sub/file with unignored file output
 
-Reset branch 'master'
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t2024-checkout-dwim/repo_c/.git/
-[master (root-commit) dc015ba] c_master
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c_master.t
-Switched to a new branch 'bar'
-[bar a433ad7] c_bar
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c_bar.t
-Switched to a new branch 'spam'
-[spam 1702b85] c_spam
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c_spam.t
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t2024-checkout-dwim/repo_d/.git/
-[master (root-commit) f130d8f] d_master
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 d_master.t
-Switched to a new branch 'baz'
-[baz aff1e77] d_baz
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 d_baz.t
-Switched to a new branch 'eggs'
-[eggs fea4556] d_eggs
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 d_eggs.t
-Fetching repo_a
-Fetching repo_b
-Fetching repo_c
-warning: no common commits
-From repo_c
- * [new branch]      bar        -> extra_dir/repo_c/extra_dir/bar
- * [new branch]      master     -> extra_dir/repo_c/extra_dir/master
- * [new branch]      spam       -> extra_dir/repo_c/extra_dir/spam
- * [new tag]         c_bar      -> c_bar
- * [new tag]         c_master   -> c_master
- * [new tag]         c_spam     -> c_spam
-Fetching repo_d
-warning: no common commits
-From repo_d
- * [new branch]      baz        -> refs/repo_d/baz
- * [new branch]      eggs       -> refs/repo_d/eggs
- * [new branch]      master     -> refs/repo_d/master
- * [new tag]         d_baz      -> d_baz
- * [new tag]         d_eggs     -> d_eggs
- * [new tag]         d_master   -> d_master
-ok 10 - setup more remotes with unconventional refspecs
+expecting success: 
+		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: 
-	git checkout -B master &&
-	status_uno_is_clean &&
-	test_might_fail git branch -D bar &&
+		test_i18ngrep -e "Use -f if" err
+	
+Use -f if you really want to add them.
+ok 27 - complaints for ignored sub output
 
-	test_must_fail git checkout bar &&
-	status_uno_is_clean &&
-	test_must_fail git rev-parse --verify refs/heads/bar &&
-	test_branch master
+expecting success: 
+		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
 
-Reset branch 'master'
-error: branch 'bar' not found.
-error: pathspec 'bar' did not match any file(s) known to git
-hint: 'bar' matched more than one remote tracking branch.
-hint: We found 2 remotes with a reference that matched. So we fell back
-hint: on trying to resolve the argument as a path, but failed there too!
-hint: 
-hint: If you meant to check out a remote tracking branch on, e.g. 'origin',
-hint: you can do so by fully qualifying the name with the --track option:
-hint: 
-hint:     git checkout --track origin/<name>
-hint: 
-hint: If you'd like to always have checkouts of an ambiguous <name> prefer
-hint: one remote, e.g. the 'origin' remote, consider setting
-hint: checkout.defaultRemote=origin in your config.
-fatal: Needed a single revision
-ok 11 - checkout of branch from multiple remotes fails #2
+expecting success: 
+		test_i18ngrep -e "Use -f if" err
+	
+Use -f if you really want to add them.
+ok 29 - complaints for ignored sub with unignored file output
 
 expecting success: 
-	git checkout -B master &&
-	status_uno_is_clean &&
-	test_might_fail git branch -D baz &&
+		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
 
-	test_must_fail git checkout baz &&
-	status_uno_is_clean &&
-	test_must_fail git rev-parse --verify refs/heads/baz &&
-	test_branch master
+expecting success: 
+		test_i18ngrep -e "Use -f if" err
+	
+Use -f if you really want to add them.
+ok 31 - complaints for ignored sub/file output
 
-Reset branch 'master'
-Deleted branch baz (was a4f4a16).
-error: pathspec 'baz' did not match any file(s) known to git
-hint: 'baz' matched more than one remote tracking branch.
-hint: We found 2 remotes with a reference that matched. So we fell back
-hint: on trying to resolve the argument as a path, but failed there too!
-hint: 
-hint: If you meant to check out a remote tracking branch on, e.g. 'origin',
-hint: you can do so by fully qualifying the name with the --track option:
-hint: 
-hint:     git checkout --track origin/<name>
-hint: 
-hint: If you'd like to always have checkouts of an ambiguous <name> prefer
-hint: one remote, e.g. the 'origin' remote, consider setting
-hint: checkout.defaultRemote=origin in your config.
-fatal: Needed a single revision
-ok 12 - checkout of branch from multiple remotes fails #3
+expecting success: 
+		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: 
-	git checkout -B master &&
-	status_uno_is_clean &&
-	test_might_fail git branch -D spam &&
+		test_i18ngrep -e "Use -f if" err
+	
+Use -f if you really want to add them.
+ok 33 - complaints for ignored sub/file with unignored file output
 
-	git checkout spam &&
-	status_uno_is_clean &&
-	test_branch spam &&
-	test_cmp_rev refs/remotes/extra_dir/repo_c/extra_dir/spam HEAD &&
-	test_branch_upstream spam repo_c spam
+expecting success: 
+		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
 
-Reset branch 'master'
-error: branch 'spam' not found.
-Switched to a new branch 'spam'
-Branch 'spam' set up to track remote branch 'spam' from 'repo_c'.
-ok 13 - checkout of branch from a single remote succeeds #3
+expecting success: 
+		test_i18ngrep -e "Use -f if" err
+	
+Use -f if you really want to add them.
+ok 35 - complaints for ignored sub/ign output
 
 expecting success: 
-	git checkout -B master &&
-	status_uno_is_clean &&
-	test_might_fail git branch -D eggs &&
+		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
 
-	git checkout eggs &&
-	status_uno_is_clean &&
-	test_branch eggs &&
-	test_cmp_rev refs/repo_d/eggs HEAD &&
-	test_branch_upstream eggs repo_d eggs
+expecting success: 
+		test_i18ngrep -e "Use -f if" err
+	
+Use -f if you really want to add them.
+ok 37 - complaints for ignored sub/ign with unignored file output
 
-Switched to and reset branch 'master'
-error: branch 'eggs' not found.
-Switched to a new branch 'eggs'
-Branch 'eggs' set up to track remote branch 'eggs' from 'repo_d'.
-ok 14 - checkout of branch from a single remote succeeds #4
+expecting success: 
+		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: 
-	git checkout -B master &&
-	status_uno_is_clean &&
-	test_might_fail git branch -D spam &&
+		(
+			cd dir &&
+			test_i18ngrep -e "Use -f if" err
+		)
+	
+Use -f if you really want to add them.
+ok 39 - complaints for ignored sub in dir output
 
-	>spam &&
-	test_must_fail git checkout spam &&
-	status_uno_is_clean &&
-	test_must_fail git rev-parse --verify refs/heads/spam &&
-	test_branch master
+expecting success: 
+		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
 
-Switched to and reset branch 'master'
-Deleted branch spam (was 1702b85).
-error: pathspec 'spam' did not match any file(s) known to git
-fatal: Needed a single revision
-ok 15 - checkout of branch with a file having the same name fails
+expecting success: 
+		(
+			cd dir &&
+			test_i18ngrep -e "Use -f if" err
+		)
+	
+Use -f if you really want to add them.
+ok 41 - complaints for ignored sub/file in dir output
 
 expecting success: 
-	git checkout -B master &&
-	status_uno_is_clean &&
-	test_might_fail git branch -D spam &&
+		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
 
-	>spam &&
-	mkdir sub &&
-	mv spam sub/spam &&
-	test_must_fail git -C sub checkout spam &&
-	status_uno_is_clean &&
-	test_must_fail git rev-parse --verify refs/heads/spam &&
-	test_branch master
+expecting success: 
+		(
+			cd dir &&
+			test_i18ngrep -e "Use -f if" err
+		)
+	
+Use -f if you really want to add them.
+ok 43 - complaints for ignored sub/ign in dir output
 
-Reset branch 'master'
-error: branch 'spam' not found.
-error: pathspec 'spam' did not match any file(s) known to git
-fatal: Needed a single revision
-ok 16 - checkout of branch with a file in subdir having the same name fails
+expecting success: 
+		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: 
-	git checkout -B master &&
-	status_uno_is_clean &&
-	test_might_fail git branch -D spam &&
+		(
+			cd sub &&
+			test_i18ngrep -e "Use -f if" err
+		)
+	
+Use -f if you really want to add them.
+ok 45 - complaints for ignored ign in sub output
 
-	>spam &&
-	git checkout spam -- &&
-	status_uno_is_clean &&
-	test_branch spam &&
-	test_cmp_rev refs/remotes/extra_dir/repo_c/extra_dir/spam HEAD &&
-	test_branch_upstream spam repo_c spam
+expecting success: 
+		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
 
-Reset branch 'master'
-error: branch 'spam' not found.
-Switched to a new branch 'spam'
-Branch 'spam' set up to track remote branch 'spam' from 'repo_c'.
-ok 17 - checkout <branch> -- succeeds, even if a file with the same name exists
+expecting success: 
+		(
+			cd sub &&
+			test_i18ngrep -e "Use -f if" err
+		)
+	
+Use -f if you really want to add them.
+ok 47 - complaints for ignored file in sub output
 
+# passed all 47 test(s)
+1..47
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t3040-subprojects-basic.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3040-subprojects-basic/.git/
 expecting success: 
+	: >Makefile &&
+	git add Makefile &&
+	git commit -m "Superproject created"
 
-	git checkout master &&
-	status_uno_is_clean &&
-	git branch strict &&
-	git branch loose &&
-	git commit --allow-empty -m "a bit more" &&
+[master (root-commit) b45d9d9] 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
 
-	test_config branch.strict.remote . &&
-	test_config branch.loose.remote . &&
-	test_config branch.strict.merge refs/heads/master &&
-	test_config branch.loose.merge master &&
+expecting success: 
+	mkdir sub1 &&
+	( cd sub1 && git init && : >Makefile && git add * &&
+	git commit -q -m "subproject 1" ) &&
+	mkdir sub2 &&
+	( cd sub2 && git init && : >Makefile && git add * &&
+	git commit -q -m "subproject 2" ) &&
+	git update-index --add sub1 &&
+	git add sub2 &&
+	git commit -q -m "subprojects added" &&
+	GIT_PRINT_SHA1_ELLIPSIS="yes" git diff-tree --abbrev=5 HEAD^ HEAD |cut -d" " -f-3,5- >current &&
+	git branch save HEAD &&
+	cat >expected <<-\EOF &&
+	:000000 160000 00000... A	sub1
+	:000000 160000 00000... A	sub2
+	EOF
+	test_cmp expected current
 
-	git checkout strict | sed -e "s/strict/BRANCHNAME/g" >expect &&
-	status_uno_is_clean &&
-	git checkout loose | sed -e "s/loose/BRANCHNAME/g" >actual &&
-	status_uno_is_clean &&
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3040-subprojects-basic/sub1/.git/
+Initialized empty Git repository in /build/git-2.20.1/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.
+ok 2 - setup: create subprojects
 
-	test_cmp expect actual
+expecting success: 
+	git fsck --full
 
-Switched to branch 'master'
-[master b3a488e] a bit more
- Author: A U Thor <author@example.com>
-Switched to branch 'strict'
-Switched to branch 'loose'
-ok 18 - loosely defined local base branch is reported correctly
+ok 3 - check if fsck ignores the subprojects
 
-# passed all 18 test(s)
-1..18
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t2200-add-update.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t2200-add-update/.git/
 expecting success: 
-	echo initial >check &&
-	echo initial >top &&
-	echo initial >foo &&
-	mkdir dir1 dir2 &&
-	echo initial >dir1/sub1 &&
-	echo initial >dir1/sub2 &&
-	echo initial >dir2/sub3 &&
-	git add check dir1 dir2 top foo &&
-	test_tick &&
-	git commit -m initial &&
+	( cd sub1 &&
+	echo "all:" >>Makefile &&
+	echo "	true" >>Makefile &&
+	git commit -q -a -m "make all" ) &&
+	test_expect_code 1 git diff-files --exit-code
 
-	echo changed >check &&
-	echo changed >top &&
-	echo changed >dir2/sub3 &&
-	rm -f dir1/sub1 &&
-	echo other >dir2/other
+:160000 160000 1a8ab85a1fc4a9a6e0c82b4fcf5ecd571c65bd6c 0000000000000000000000000000000000000000 M	sub1
+ok 4 - check if commit in a subproject detected
 
-[master (root-commit) ec46c19] initial
- Author: A U Thor <author@example.com>
- 6 files changed, 6 insertions(+)
- create mode 100644 check
- create mode 100644 dir1/sub1
- create mode 100644 dir1/sub2
- create mode 100644 dir2/sub3
- create mode 100644 foo
- create mode 100644 top
-ok 1 - setup
+expecting success: 
+	git commit -q -a -m "sub1 changed" &&
+	test_expect_code 1 git diff-tree --exit-code HEAD^ HEAD
+
+:160000 160000 1a8ab85a1fc4a9a6e0c82b4fcf5ecd571c65bd6c e56847099b111dc025372cea4cffe38e653302d3 M	sub1
+ok 5 - check if a changed subproject HEAD can be committed
 
 expecting success: 
-	git add -u dir1 dir2
+	test_expect_code 1 git diff-index --exit-code --cached save -- sub1
 
-ok 2 - update
+:160000 160000 1a8ab85a1fc4a9a6e0c82b4fcf5ecd571c65bd6c e56847099b111dc025372cea4cffe38e653302d3 M	sub1
+ok 6 - check if diff-index works for subproject elements
 
 expecting success: 
-	test "$(git ls-files dir1/sub1)" = ""
+	test_expect_code 1 git diff-tree --exit-code HEAD^ HEAD -- sub1
 
-ok 3 - update noticed a removal
+:160000 160000 1a8ab85a1fc4a9a6e0c82b4fcf5ecd571c65bd6c e56847099b111dc025372cea4cffe38e653302d3 M	sub1
+ok 7 - check if diff-tree works for subproject elements
 
 expecting success: 
-	test "$(git diff-files --name-status dir2/sub3)" = ""
+	test_expect_code 1 git diff --exit-code HEAD^ HEAD
 
-ok 4 - update touched correct path
+diff --git a/sub1 b/sub1
+index 1a8ab85..e568470 160000
+--- a/sub1
++++ b/sub1
+@@ -1 +1 @@
+-Subproject commit 1a8ab85a1fc4a9a6e0c82b4fcf5ecd571c65bd6c
++Subproject commit e56847099b111dc025372cea4cffe38e653302d3
+ok 8 - check if git diff works for subproject elements
 
 expecting success: 
-	test "$(git diff-files --name-status check)" = "M	check" &&
-	test "$(git diff-files --name-status top)" = "M	top"
+	git ls-files -s >expected &&
+	git clone -l -s . cloned &&
+	( cd cloned && git ls-files -s ) >current &&
+	test_cmp expected current
 
-ok 5 - update did not touch other tracked files
+Cloning into 'cloned'...
+done.
+ok 9 - check if clone works
 
 expecting success: 
-	test "$(git ls-files dir2/other)" = ""
+	git update-index --force-remove -- sub2 &&
+	mv sub2 sub3 &&
+	git add sub3 &&
+	git commit -q -m "renaming a subproject" &&
+	test_expect_code 1 git diff -M --name-status --exit-code HEAD^ HEAD
 
-ok 6 - update did not touch untracked files
+warning: adding embedded git repository: sub3
+hint: You've added another git repository inside your current repository.
+hint: Clones of the outer repository will not contain the contents of
+hint: the embedded repository and will not know how to obtain it.
+hint: If you meant to add a submodule, use:
+hint: 
+hint: 	git submodule add <url> sub3
+hint: 
+hint: If you added this path by mistake, you can remove it from the
+hint: index with:
+hint: 
+hint: 	git rm --cached sub3
+hint: 
+hint: See "git help submodule" for more information.
+R100	sub2	sub3
+ok 10 - removing and adding subproject
 
 expecting success: 
+	git checkout save &&
+	git diff-index --exit-code --raw --cached save -- sub1
 
-	git ls-files -s |
-	sed -e "s/ 0	/	/" >expect &&
-	git ls-tree -r $(git write-tree) |
-	sed -e "s/ blob / /" >current &&
-	test_cmp expect current
+warning: unable to rmdir 'sub3': Directory not empty
+Switched to branch 'save'
+M	sub1
+ok 11 - checkout in superproject
 
+# passed all 11 test(s)
+1..11
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t3102-ls-tree-wildcards.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3102-ls-tree-wildcards/.git/
+expecting success: 
+	mkdir a aa "a[a]" &&
+	touch a/one aa/two "a[a]/three" &&
+	git add a/one aa/two "a[a]/three" &&
+	git commit -m test
 
-ok 7 - cache tree has not been corrupted
+[master (root-commit) 202e1e0] 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: 
-	(
-		cd dir1 &&
-		echo more >sub2 &&
-		git add -u sub2
-	)
+	cat >expect <<-EOF &&
+	100644 blob $EMPTY_BLOB	a[a]/three
+	EOF
+	git ls-tree -r HEAD "a[a]" >actual &&
+	test_cmp expect actual
 
-ok 8 - update from a subdirectory
+ok 2 - ls-tree a[a] matches literally
 
 expecting success: 
+	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
 
-	test "$(git diff-files --name-status dir1)" = ""
+ok 3 - ls-tree outside prefix
 
+checking known breakage: 
+	git ls-files ":(exclude)a" "a*" >expect &&
+	git ls-tree --name-only -r HEAD ":(exclude)a" "a*" >actual &&
+	test_cmp expect actual
 
-ok 9 - change gets noticed
+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/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t3103-ls-tree-misc.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3103-ls-tree-misc/.git/
 expecting success: 
-	(
-		cd dir1 &&
-		echo even more >>sub2 &&
-		git --literal-pathspecs add -u &&
-		echo even more >>sub2 &&
-		git add -u
-	) &&
-	git diff-files --name-only >actual &&
-	test_must_be_empty actual
+	mkdir a &&
+	touch a/one &&
+	git add a/one &&
+	git commit -m test
 
-ok 10 - non-qualified update in subdir updates from the root
+[master (root-commit) 6cee0ce] 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: 
+	tree=$(git rev-parse HEAD:a) &&
+	rm -f .git/objects/$(echo $tree | sed -e "s,^\(..\),\1/,") &&
+	test_must_fail git ls-tree -r HEAD
 
-	rm foo &&
-	test_ln_s_add top foo
-
+error: Could not read 5fcffbd6e4c5c5b8d81f5e9314b20e338e3ffff5
+ok 2 - ls-tree fails with non-zero exit code on broken tree
 
+# passed all 2 test(s)
+1..2
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t3100-ls-tree-restrict.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3100-ls-tree-restrict/.git/
+expecting success: mkdir path2 path2/baz &&
+     echo Hi >path0 &&
+     test_ln_s_add path0 path1 &&
+     test_ln_s_add ../path1 path2/bazbo &&
+     echo Lo >path2/foo &&
+     echo Mi >path2/baz/b &&
+     find path? \( -type f -o -type l \) -print |
+     xargs git update-index --add &&
+     tree=$(git write-tree) &&
+     echo $tree
 checking prerequisite: SYMLINKS
 
 mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
@@ -51153,3155 +54458,431 @@
 
 )
 prerequisite SYMLINKS ok
-ok 11 - replace a file with a symlink
-
-expecting success: 
+a384d4f8dd786f29d6da4705dee4c2c0bc6b5049
+ok 1 - setup
 
-	git add -u &&
-	test -z "$(git diff-files)"
+expecting success: git ls-tree $tree >current &&
+     cat >expected <<\EOF &&
+100644 blob X	path0
+120000 blob X	path1
+040000 tree X	path2
+EOF
+     test_output
+ok 2 - ls-tree plain
 
+expecting success: git ls-tree -r $tree >current &&
+     cat >expected <<\EOF &&
+100644 blob X	path0
+120000 blob X	path1
+100644 blob X	path2/baz/b
+120000 blob X	path2/bazbo
+100644 blob X	path2/foo
+EOF
+     test_output
+ok 3 - ls-tree recursive
 
-ok 12 - add everything changed
+expecting success: git ls-tree -r -t $tree >current &&
+     cat >expected <<\EOF &&
+100644 blob X	path0
+120000 blob X	path1
+040000 tree X	path2
+040000 tree X	path2/baz
+100644 blob X	path2/baz/b
+120000 blob X	path2/bazbo
+100644 blob X	path2/foo
+EOF
+     test_output
+ok 4 - ls-tree recursive with -t
 
-expecting success: 
+expecting success: git ls-tree -r -d $tree >current &&
+     cat >expected <<\EOF &&
+040000 tree X	path2
+040000 tree X	path2/baz
+EOF
+     test_output
+ok 5 - ls-tree recursive with -d
 
-	touch check &&
-	git add -u &&
-	test -z "$(git diff-files)"
+expecting success: git ls-tree $tree path >current &&
+     cat >expected <<\EOF &&
+EOF
+     test_output
+ok 6 - ls-tree filtered with path
 
+expecting success: git ls-tree $tree path1 path0 >current &&
+     cat >expected <<\EOF &&
+100644 blob X	path0
+120000 blob X	path1
+EOF
+     test_output
+ok 7 - ls-tree filtered with path1 path0
 
-ok 13 - touch and then add -u
+expecting success: git ls-tree $tree path0/ >current &&
+     cat >expected <<\EOF &&
+EOF
+     test_output
+ok 8 - ls-tree filtered with path0/
 
-expecting success: 
+expecting success: git ls-tree $tree path2 >current &&
+     cat >expected <<\EOF &&
+040000 tree X	path2
+EOF
+     test_output
+ok 9 - ls-tree filtered with path2
 
-	touch check &&
-	git add check &&
-	test -z "$(git diff-files)"
+expecting success: git ls-tree $tree path2/ >current &&
+     cat >expected <<\EOF &&
+040000 tree X	path2/baz
+120000 blob X	path2/bazbo
+100644 blob X	path2/foo
+EOF
+     test_output
+ok 10 - ls-tree filtered with path2/
 
+expecting success: git ls-tree $tree path2/baz >current &&
+     cat >expected <<\EOF &&
+040000 tree X	path2/baz
+EOF
+     test_output
+ok 11 - ls-tree filtered with path2/baz
 
-ok 14 - touch and then add explicitly
+expecting success: git ls-tree $tree path2/bak >current &&
+     cat >expected <<\EOF &&
+EOF
+     test_output
+ok 12 - ls-tree filtered with path2/bak
 
-expecting success: 
-
-	(
-		echo "add 'check'" &&
-		echo "remove 'top'"
-	) >expect &&
-	before=$(git ls-files -s check top) &&
-	echo changed >>check &&
-	rm -f top &&
-	git add -n -u >actual &&
-	after=$(git ls-files -s check top) &&
-
-	test "$before" = "$after" &&
-	test_i18ncmp expect actual
-
-
-ok 15 - add -n -u should not add but just report
-
-expecting success: 
-	git reset --hard &&
-	one=$(echo 1 | git hash-object -w --stdin) &&
-	two=$(echo 2 | git hash-object -w --stdin) &&
-	three=$(echo 3 | git hash-object -w --stdin) &&
-	{
-		for path in path1 path2
-		do
-			echo "100644 $one 1	$path"
-			echo "100644 $two 2	$path"
-			echo "100644 $three 3	$path"
-		done
-		echo "100644 $one 1	path3"
-		echo "100644 $one 1	path4"
-		echo "100644 $one 3	path5"
-		echo "100644 $one 3	path6"
-	} |
-	git update-index --index-info &&
-	echo 3 >path1 &&
-	echo 2 >path3 &&
-	echo 2 >path5 &&
-
-	# Fail to explicitly resolve removed paths with "git add"
-	test_must_fail git add --no-all path4 &&
-	test_must_fail git add --no-all path6 &&
-
-	# "add -u" should notice removals no matter what stages
-	# the index entries are in.
-	git add -u &&
-	git ls-files -s path1 path2 path3 path4 path5 path6 >actual &&
-	{
-		echo "100644 $three 0	path1"
-		echo "100644 $two 0	path3"
-		echo "100644 $two 0	path5"
-	} >expect &&
-	test_cmp expect actual
-
-HEAD is now at ec46c19 initial
-fatal: unable to stat 'path4': No such file or directory
-fatal: unable to stat 'path6': No such file or directory
-ok 16 - add -u resolves unmerged paths
-
-expecting success: 
-	test_must_fail git add -u non-existent &&
-	! (git ls-files | grep "non-existent")
-
-fatal: pathspec 'non-existent' did not match any files
-ok 17 - "add -u non-existent" should fail
-
-# passed all 17 test(s)
-1..17
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t2016-checkout-patch.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t2016-checkout-patch/.git/
-expecting success: 
-	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) ee66fb9] initial
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 bar
- create mode 100644 dir/foo
-[master c1062d4] second
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 1 - setup
-
-expecting success: 
-	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
-Discard this hunk from worktree [y,n,q,a,d,e,?]? 
-diff --git a/dir/foo b/dir/foo
-index 564b12f..b8f99f5 100644
---- a/dir/foo
-+++ b/dir/foo
-@@ -1 +1 @@
--head
-+work
-Discard this hunk from worktree [y,n,q,a,d,e,?]? 
-ok 2 - saying "n" does nothing
-
-expecting success: 
-	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
-Discard this hunk from worktree [y,n,q,a,d,e,?]? 
-diff --git a/dir/foo b/dir/foo
-index 564b12f..b8f99f5 100644
---- a/dir/foo
-+++ b/dir/foo
-@@ -1 +1 @@
--head
-+work
-Discard this hunk from worktree [y,n,q,a,d,e,?]? 
-ok 3 - git checkout -p
-
-expecting success: 
-	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
-Discard this hunk from worktree [y,n,q,a,d,e,?]? 
-diff --git a/dir/foo b/dir/foo
-index 9015a7a..b8f99f5 100644
---- a/dir/foo
-+++ b/dir/foo
-@@ -1 +1 @@
--index
-+work
-Discard this hunk from worktree [y,n,q,a,d,e,?]? 
-ok 4 - git checkout -p with staged changes
-
-expecting success: 
-	set_and_save_state dir/foo work head &&
-	test_write_lines n y n | git checkout -p HEAD &&
-	verify_saved_state bar &&
-	verify_saved_state dir/foo
-
-diff --git a/bar b/bar
-index 421376d..8c999e6 100644
---- a/bar
-+++ b/bar
-@@ -1 +1 @@
--dummy
-+bar_work
-Discard this hunk from index and worktree [y,n,q,a,d,e,?]? 
-diff --git a/dir/foo b/dir/foo
-index 564b12f..b8f99f5 100644
---- a/dir/foo
-+++ b/dir/foo
-@@ -1 +1 @@
--head
-+work
-Discard this hunk from index and worktree [y,n,q,a,d,e,?]? error: patch failed: dir/foo:1
-error: dir/foo: patch does not apply
-The selected hunks do not apply to the index!
-Apply them to the worktree anyway? Nothing was applied.
-
-ok 5 - git checkout -p HEAD with NO staged changes: abort
-
-expecting success: 
-	test_write_lines n y y | git checkout -p HEAD &&
-	verify_saved_state bar &&
-	verify_state dir/foo head head
-
-diff --git a/bar b/bar
-index 421376d..8c999e6 100644
---- a/bar
-+++ b/bar
-@@ -1 +1 @@
--dummy
-+bar_work
-Discard this hunk from index and worktree [y,n,q,a,d,e,?]? 
-diff --git a/dir/foo b/dir/foo
-index 564b12f..b8f99f5 100644
---- a/dir/foo
-+++ b/dir/foo
-@@ -1 +1 @@
--head
-+work
-Discard this hunk from index and worktree [y,n,q,a,d,e,?]? error: patch failed: dir/foo:1
-error: dir/foo: patch does not apply
-The selected hunks do not apply to the index!
-Apply them to the worktree anyway? 
-ok 6 - git checkout -p HEAD with NO staged changes: apply
-
-expecting success: 
-	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 HEAD &&
-	verify_saved_state bar &&
-	verify_state dir/foo head head
-
-diff --git a/bar b/bar
-index 421376d..8c999e6 100644
---- a/bar
-+++ b/bar
-@@ -1 +1 @@
--dummy
-+bar_work
-Discard this hunk from index and worktree [y,n,q,a,d,e,?]? 
-diff --git a/dir/foo b/dir/foo
-index 564b12f..9015a7a 100644
---- a/dir/foo
-+++ b/dir/foo
-@@ -1 +1 @@
--head
-+index
-Discard this hunk from index and worktree [y,n,q,a,d,e,?]? 
-ok 7 - git checkout -p HEAD with change already staged
-
-expecting success: 
-	# 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
-Apply this hunk to index and worktree [y,n,q,a,d,e,?]? 
-diff --git b/dir/foo a/dir/foo
-index 564b12f..9676f5b 100644
---- b/dir/foo
-+++ a/dir/foo
-@@ -1 +1 @@
--head
-+parent
-Apply this hunk to index and worktree [y,n,q,a,d,e,?]? 
-ok 8 - git checkout -p HEAD^
-
-expecting success: 
-	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
-Discard this hunk from worktree [y,n,q,a,d,e,?]? 
-diff --git a/dir/foo b/dir/foo
-index 9015a7a..0000000
---- a/dir/foo
-+++ /dev/null
-deleted file mode 100644
-@@ -1 +0,0 @@
--index
-Discard deletion from worktree [y,n,q,a,d,?]? 
-ok 9 - git checkout -p handles deletion
-
-expecting success: 
-	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
-Discard this hunk from worktree [y,n,q,a,d,e,?]? 
-ok 10 - path limiting works: dir
-
-expecting success: 
-	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
-Discard this hunk from worktree [y,n,q,a,d,e,?]? 
-ok 11 - path limiting works: -- dir
-
-expecting success: 
-	# 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
-Apply this hunk to index and worktree [y,n,q,a,d,e,?]? 
-ok 12 - path limiting works: HEAD^ -- dir
-
-expecting success: 
-	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
-Discard this hunk from worktree [y,n,q,a,d,e,?]? 
-ok 13 - path limiting works: foo inside dir
-
-expecting success: 
-	verify_saved_head
-
-ok 14 - none of this moved HEAD
-
-# passed all 14 test(s)
-1..14
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t3000-ls-files-others.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3000-ls-files-others/.git/
-expecting success: 
-	date >path0 &&
-	if test_have_prereq SYMLINKS
-	then
-		ln -s xyzzy path1
-	else
-		date >path1
-	fi &&
-	mkdir path2 path3 path4 &&
-	date >path2/file2 &&
-	date >path2-junk &&
-	date >path3/file3 &&
-	date >path3-junk &&
-	git update-index --add path3-junk path3/file3
-
-checking prerequisite: SYMLINKS
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
-	# test whether the filesystem supports symbolic links
-	ln -s x y && test -h y
-
-)
-prerequisite SYMLINKS ok
-ok 1 - setup 
-
-expecting success: 
-	cat >expected1 <<-\EOF &&
-	expected1
-	expected2
-	expected3
-	output
-	path0
-	path1
-	path2-junk
-	path2/file2
-	EOF
-
-	sed -e "s|path2/file2|path2/|" <expected1 >expected2 &&
-	cp expected2 expected3 &&
-	echo path4/ >>expected2
-
-ok 2 - setup: expected output
-
-expecting success: 
-	git ls-files --others >output &&
-	test_cmp expected1 output
-
-ok 3 - ls-files --others
-
-expecting success: 
-	git ls-files --others --directory >output &&
-	test_cmp expected2 output
-
-ok 4 - ls-files --others --directory
-
-expecting success: 
-	git ls-files --others --directory --no-empty-directory >output &&
-	test_cmp expected3 output
-
-ok 5 - --no-empty-directory hides empty directory
-
-expecting success: 
-	mkdir not-a-submodule &&
-	echo foo >not-a-submodule/.git &&
-	git ls-files -o >output &&
-	test_cmp expected1 output
-
-ok 6 - ls-files --others handles non-submodule .git
-
-expecting success: 
-	git init super &&
-	git init sub &&
-	(
-		cd sub &&
-		>a &&
-		git add a &&
-		git commit -m sub &&
-		git pack-refs --all
-	) &&
-	(
-		cd super &&
-		"$SHELL_PATH" "$TEST_DIRECTORY/../contrib/workdir/git-new-workdir" ../sub sub &&
-		git ls-files --others --exclude-standard >../actual
-	) &&
-	echo sub/ >expect &&
-	test_cmp expect actual
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3000-ls-files-others/super/.git/
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3000-ls-files-others/sub/.git/
-[master (root-commit) b0ba0bc] sub
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 a
-ok 7 - ls-files --others with symlinked submodule
-
-# passed all 7 test(s)
-1..7
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t3002-ls-files-dashpath.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3002-ls-files-dashpath/.git/
-expecting success: echo frotz >path0 &&
-	echo frotz >./-foo &&
-	echo frotz >./--
-ok 1 - setup
-
-expecting success: git ls-files --others >output &&
-     test_cmp output - <<EOF
---
--foo
-output
-path0
-EOF
-
-ok 2 - git ls-files without path restriction.
-
-expecting success: git ls-files --others path0 >output &&
-	test_cmp output - <<EOF
-path0
-EOF
-
-ok 3 - git ls-files with path restriction.
-
-expecting success: git ls-files --others -- path0 >output &&
-	test_cmp output - <<EOF
-path0
-EOF
-
-ok 4 - git ls-files with path restriction with --.
-
-expecting success: git ls-files --others -- -- >output &&
-	test_cmp output - <<EOF
---
+expecting success: git ls-tree -t $tree path2/bak >current &&
+     cat >expected <<\EOF &&
+040000 tree X	path2
 EOF
+     test_output
+ok 13 - ls-tree -t filtered with path2/bak
 
-ok 5 - git ls-files with path restriction with -- --.
-
-expecting success: git ls-files --others -- >output &&
-	test_cmp output - <<EOF
---
--foo
-output
-path0
+expecting success: git ls-tree $tree path2/baz path2/bazbo >current &&
+     cat >expected <<\EOF &&
+040000 tree X	path2/baz
+120000 blob X	path2/bazbo
 EOF
+     test_output
+ok 14 - ls-tree with one path a prefix of the other
 
-ok 6 - git ls-files with no path restriction.
-
-# passed all 6 test(s)
-1..6
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t3003-ls-files-exclude.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3003-ls-files-exclude/.git/
-expecting success: 
-	echo content >file &&
-	git add file &&
-	git commit -m file &&
-	echo modification >file
-
-[master (root-commit) 0ec8a8c] file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-ok 1 - create repo with file
-
-expecting success: 
-	echo 'file' >expect &&
-	git ls-files --exclude-standard --cached >output &&
-	test_cmp expect output
-
-ok 2 - ls-files output contains file (cached)
-
-expecting success: 
-	echo 'file' >expect &&
-	git ls-files --exclude-standard --modified >output &&
-	test_cmp expect output
-
-ok 3 - ls-files output contains file (modified)
-
-expecting success: 
-	echo file >.gitignore
-
-ok 4 - add file to gitignore
-
-expecting success: 
-	echo 'file' >expect &&
-	git ls-files --exclude-standard --cached >output &&
-	test_cmp expect output
-
-ok 5 - ls-files output contains file (cached)
-
-expecting success: 
-	echo 'file' >expect &&
-	git ls-files --exclude-standard --modified >output &&
-	test_cmp expect output
-
-ok 6 - ls-files output contains file (modified)
-
-expecting success: 
-	echo content >other-file &&
-	git add other-file &&
-	echo file >expect &&
-	git ls-files -i --exclude-standard >output &&
-	test_cmp expect output
-
-ok 7 - ls-files -i lists only tracked-but-ignored files
-
-# passed all 7 test(s)
-1..7
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t2300-cd-to-toplevel.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t2300-cd-to-toplevel/.git/
-expecting success: 
-		(
-			cd 'repo' &&
-			PATH="$EXEC_PATH:$PATH" &&
-			. git-sh-setup &&
-			cd_to_toplevel &&
-			[ "$(pwd -P)" = "$TOPLEVEL" ]
-		)
-	
-ok 1 - at physical root
-
-expecting success: 
-		(
-			cd 'repo/sub/dir' &&
-			PATH="$EXEC_PATH:$PATH" &&
-			. git-sh-setup &&
-			cd_to_toplevel &&
-			[ "$(pwd -P)" = "$TOPLEVEL" ]
-		)
-	
-ok 2 - at physical subdir
-
-checking prerequisite: SYMLINKS
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
-	# test whether the filesystem supports symbolic links
-	ln -s x y && test -h y
-
-)
-prerequisite SYMLINKS ok
-expecting success: 
-		(
-			cd 'symrepo' &&
-			PATH="$EXEC_PATH:$PATH" &&
-			. git-sh-setup &&
-			cd_to_toplevel &&
-			[ "$(pwd -P)" = "$TOPLEVEL" ]
-		)
-	
-ok 3 - at symbolic root
-
-expecting success: 
-		(
-			cd 'subdir-link' &&
-			PATH="$EXEC_PATH:$PATH" &&
-			. git-sh-setup &&
-			cd_to_toplevel &&
-			[ "$(pwd -P)" = "$TOPLEVEL" ]
-		)
-	
-ok 4 - at symbolic subdir
-
-expecting success: 
-		(
-			cd 'internal-link' &&
-			PATH="$EXEC_PATH:$PATH" &&
-			. git-sh-setup &&
-			cd_to_toplevel &&
-			[ "$(pwd -P)" = "$TOPLEVEL" ]
-		)
-	
-ok 5 - at internal symbolic subdir
-
-# passed all 5 test(s)
-1..5
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t3005-ls-files-relative.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3005-ls-files-relative/.git/
-expecting success: 
-	: >never-mind-me &&
-	git add never-mind-me &&
-	mkdir top &&
-	(
-		cd top &&
-		mkdir sub &&
-		x="x xa xbc xdef xghij xklmno" &&
-		y=$(echo "$x" | tr x y) &&
-		touch $x &&
-		touch $y &&
-		cd sub &&
-		git add ../x*
-	)
-
-ok 1 - prepare
-
-expecting success: 
-	(
-		cd top/sub &&
-		cat >expect <<-EOF &&
-		../../never-mind-me
-		../x
-		EOF
-		git ls-files $(cat expect) >actual &&
-		test_cmp expect actual
-	)
-
-ok 2 - ls-files with mixed levels
-
-expecting success: 
-	(
-		cd top/sub &&
-		for f in ../y*
-		do
-			echo "error: pathspec $sq$f$sq did not match any file(s) known to git"
-		done >expect.err &&
-		echo "Did you forget to ${sq}git add${sq}?" >>expect.err &&
-		ls ../x* >expect.out &&
-		test_must_fail git ls-files -c --error-unmatch ../[xy]* >actual.out 2>actual.err &&
-		test_cmp expect.out actual.out &&
-		test_i18ncmp expect.err actual.err
-	)
-
-ok 3 - ls-files -c
-
-expecting success: 
-	(
-		cd top/sub &&
-		for f in ../x*
-		do
-			echo "error: pathspec $sq$f$sq did not match any file(s) known to git"
-		done >expect.err &&
-		echo "Did you forget to ${sq}git add${sq}?" >>expect.err &&
-		ls ../y* >expect.out &&
-		test_must_fail git ls-files -o --error-unmatch ../[xy]* >actual.out 2>actual.err &&
-		test_cmp expect.out actual.out &&
-		test_i18ncmp expect.err actual.err
-	)
-
-ok 4 - ls-files -o
-
-# passed all 4 test(s)
-1..4
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t3004-ls-files-basic.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3004-ls-files-basic/.git/
-expecting success: 
-	git ls-files >actual &&
-	test_must_be_empty actual
-
-ok 1 - ls-files in empty repository
-
-expecting success: 
-	git ls-files doesnotexist >actual &&
-	test_must_be_empty actual
-
-ok 2 - ls-files with nonexistent path
-
-expecting success: 
-	test_expect_code 129 git ls-files --nonsense 2>actual &&
-	test_i18ngrep "[Uu]sage: git ls-files" actual
-
-usage: git ls-files [<options>] [<file>...]
-ok 3 - ls-files with nonsense option
-
-expecting success: 
-	mkdir broken &&
-	(
-		cd broken &&
-		git init &&
-		>.git/index &&
-		test_expect_code 129 git ls-files -h >usage 2>&1
-	) &&
-	test_i18ngrep "[Uu]sage: git ls-files " broken/usage
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3004-ls-files-basic/broken/.git/
-usage: git ls-files [<options>] [<file>...]
-ok 4 - ls-files -h in corrupt repository
-
-checking prerequisite: SYMLINKS
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
-	# test whether the filesystem supports symbolic links
-	ln -s x y && test -h y
-
-)
-prerequisite SYMLINKS ok
-expecting success: 
-	mkdir subs &&
-	ln -s nosuch link &&
-	ln -s ../nosuch subs/link &&
-	git add link subs/link &&
-	git ls-files -s link subs/link >expect &&
-	git ls-files -s "$(pwd)/link" "$(pwd)/subs/link" >actual &&
-	test_cmp expect actual &&
-
-	(
-		cd subs &&
-		git ls-files -s link >../expect &&
-		git ls-files -s "$(pwd)/link" >../actual
-	) &&
-	test_cmp expect actual
-
-ok 5 - ls-files with absolute paths to symlinks
-
-# passed all 5 test(s)
-1..5
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t3006-ls-files-long.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3006-ls-files-long/.git/
-expecting success: 
-	p=filefilefilefilefilefilefilefile &&
-	p=$p$p$p$p$p$p$p$p$p$p$p$p$p$p$p$p &&
-	p=$p$p$p$p$p$p$p$p$p$p$p$p$p$p$p$p &&
-
-	path_a=${p}_a &&
-	path_z=${p}_z &&
-
-	blob_a=$(echo frotz | git hash-object -w --stdin) &&
-	blob_z=$(echo nitfol | git hash-object -w --stdin) &&
-
-	pat="100644 %s 0\t%s\n"
-
-ok 1 - setup
-
-expecting success: 
-	printf "$pat" "$blob_a" "$path_a" |
-	git update-index --add --index-info &&
-	echo "$path_a" >expect &&
-	git ls-files >actual &&
-	test_cmp expect actual
-
-ok 2 - overly-long path by itself is not a problem
-
-expecting success: 
-	printf "$pat" "$blob_a" "$path_a" "$blob_z" "$path_z" |
-	git update-index --add --index-info &&
-	(
-		echo "$path_a" &&
-		echo "$path_z"
-	) >expect &&
-	git ls-files >actual &&
-	test_cmp expect actual
-
-ok 3 - overly-long path does not replace another by mistake
-
-# passed all 3 test(s)
-1..3
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t3008-ls-files-lazy-init-name-hash.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3008-ls-files-lazy-init-name-hash/.git/
-expecting success: 
-	(
-	    test_seq $LAZY_THREAD_COST | sed "s/^/a_/" &&
-	    echo b/b/b &&
-	    test_seq $LAZY_THREAD_COST | sed "s/^/c_/" &&
-	    test_seq 50 | sed "s/^/d_/" | tr "\n" "/" && echo d
-	) |
-	sed "s/^/100644 $EMPTY_BLOB	/" |
-	git update-index --index-info &&
-	test-tool lazy-init-name-hash -m
-
-0.000861 0.033796 4002 multi 2
-ok 1 - no buffer overflow in lazy_init_name_hash
-
-# passed all 1 test(s)
-1..1
+# passed all 14 test(s)
+1..14
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t3020-ls-files-error-unmatch.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3020-ls-files-error-unmatch/.git/
+*** t3101-ls-tree-dirname.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3101-ls-tree-dirname/.git/
 expecting success: 
-	touch foo bar &&
-	git update-index --add foo bar &&
-	git commit -m "add foo bar"
+	echo 111 >1.txt &&
+	echo 222 >2.txt &&
+	mkdir path0 path0/a path0/a/b path0/a/b/c &&
+	echo 111 >path0/a/b/c/1.txt &&
+	mkdir path1 path1/b path1/b/c &&
+	echo 111 >path1/b/c/1.txt &&
+	mkdir path2 &&
+	echo 111 >path2/1.txt &&
+	mkdir path3 &&
+	echo 111 >path3/1.txt &&
+	echo 222 >path3/2.txt &&
+	find *.txt path* \( -type f -o -type l \) -print |
+	xargs git update-index --add &&
+	tree=$(git write-tree) &&
+	echo $tree
 
-[master (root-commit) 4865e11] add foo bar
- Author: A U Thor <author@example.com>
- 2 files changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 bar
- create mode 100644 foo
+ef2ea4d6de8ec0863f430e4cad7468ce74f60aa7
 ok 1 - setup
 
-expecting success: test_must_fail git ls-files --error-unmatch foo bar-does-not-match
-error: pathspec 'bar-does-not-match' did not match any file(s) known to git
-Did you forget to 'git add'?
-foo
-ok 2 - git ls-files --error-unmatch should fail with unmatched path.
-
-expecting success: git ls-files --error-unmatch foo bar
-bar
-foo
-ok 3 - git ls-files --error-unmatch should succeed with matched paths.
-
-# passed all 3 test(s)
-1..3
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t3001-ls-files-others-exclude.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3001-ls-files-others-exclude/.git/
-expecting success: 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: 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: 
-	git add $allignores &&
-	git update-index --skip-worktree $allignores &&
-	rm $allignores
-
-ok 3 - setup skip-worktree gitignore
-
-expecting success: 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: 
-	git checkout --ignore-skip-worktree-bits $allignores &&
-	rm .git/index
-
-ok 5 - restore gitignore
-
-expecting success: test_cmp expect output
-ok 6 - git status honors core.excludesfile
-
-expecting success: 
-
-	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: 
-
-	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: 
-
-	>two &&
-	git ls-files --others --exclude=two/ >output &&
-	grep "^two" output
-
-
-two
-ok 9 - trailing slash in exclude forces directory match (1)
-
-expecting success: 
-
-	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: 
-
-	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: 
+	git ls-tree $tree >current &&
+	cat >expected <<\EOF &&
+100644 blob X	1.txt
+100644 blob X	2.txt
+040000 tree X	path0
+040000 tree X	path1
+040000 tree X	path2
+040000 tree X	path3
+EOF
+	test_output
 
-	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
+ok 2 - ls-tree plain
 
 expecting success: 
+	git ls-tree -r $tree >current &&
+	cat >expected <<\EOF &&
+100644 blob X	1.txt
+100644 blob X	2.txt
+100644 blob X	path0/a/b/c/1.txt
+100644 blob X	path1/b/c/1.txt
+100644 blob X	path2/1.txt
+100644 blob X	path3/1.txt
+100644 blob X	path3/2.txt
+EOF
+	test_output
 
-	git 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
+ok 3 - ls-tree recursive
 
 expecting success: 
-	mkdir -p top/l1/l2 &&
-	(
-		cd top &&
-		git init &&
-		echo /.gitignore >.gitignore &&
-		echo l1 >>.gitignore &&
-		echo l2 >l1/.gitignore &&
-		>l1/l2/l1
-	)
+	git ls-tree $tree 1.txt >current &&
+	cat >expected <<\EOF &&
+100644 blob X	1.txt
+EOF
+	test_output
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3001-ls-files-others-exclude/top/.git/
-ok 14 - subdirectory ignore (setup)
+ok 4 - ls-tree filter 1.txt
 
 expecting success: 
-	(
-		cd top &&
-		git ls-files -o --exclude-standard
-	) >actual &&
-	test_must_be_empty actual
+	git ls-tree $tree path1/b/c/1.txt >current &&
+	cat >expected <<\EOF &&
+100644 blob X	path1/b/c/1.txt
+EOF
+	test_output
 
-ok 15 - subdirectory ignore (toplevel)
+ok 5 - ls-tree filter path1/b/c/1.txt
 
 expecting success: 
-	(
-		cd top/l1/l2 &&
-		git ls-files -o --exclude-standard
-	) >actual &&
-	test_must_be_empty actual
+	git ls-tree $tree 1.txt path0/a/b/c/1.txt \
+		path1/b/c/1.txt path2/1.txt path3/1.txt >current &&
+	cat >expected <<\EOF &&
+100644 blob X	1.txt
+100644 blob X	path0/a/b/c/1.txt
+100644 blob X	path1/b/c/1.txt
+100644 blob X	path2/1.txt
+100644 blob X	path3/1.txt
+EOF
+	test_output
 
-ok 16 - subdirectory ignore (l1/l2)
+ok 6 - ls-tree filter all 1.txt files
 
 expecting success: 
-	(
-		cd top/l1 &&
-		git ls-files -o --exclude-standard
-	) >actual &&
-	test_must_be_empty actual
+	git ls-tree $tree path3 path2 path0/a/b/c path1/b/c path0/a >current &&
+	cat >expected <<\EOF &&
+040000 tree X	path0/a/b/c
+040000 tree X	path1/b/c
+040000 tree X	path2
+040000 tree X	path3
+EOF
+	test_output
 
-ok 17 - subdirectory ignore (l1)
+ok 7 - ls-tree filter directories
 
 expecting success: 
-	rm top/l1/l2/l1 &&
-	rm top/l1/.gitignore
+	git ls-tree $tree 1.txt ./1.txt .//1.txt \
+		path3/1.txt path3/./1.txt path3 path3// >current &&
+	cat >expected <<\EOF &&
+100644 blob X	1.txt
+100644 blob X	path3/1.txt
+100644 blob X	path3/2.txt
+EOF
+	test_output
 
-ok 18 - show/hide empty ignored directory (setup)
+ok 8 - ls-tree filter odd names
 
 expecting success: 
-	(
-		cd top &&
-		git ls-files -o -i --exclude l1 --directory
-	) >actual &&
-	echo l1/ >expect &&
-	test_cmp expect actual
+	git ls-tree $tree 1.txt/ abc.txt \
+		path3//23.txt path3/2.txt/// >current &&
+	>expected &&
+	test_output
 
-ok 19 - show empty ignored directory with --directory
+ok 9 - ls-tree filter missing files and extra slashes
 
 expecting success: 
-	(
-		cd top &&
-		git ls-files -o -i --exclude l1 --directory --no-empty-directory
-	) >actual &&
-	test_must_be_empty actual
+	git ls-tree $tree pa path3/a >current &&
+	>expected &&
+	test_output
 
-ok 20 - hide empty ignored directory with --no-empty-directory
+ok 10 - ls-tree filter is leading path match
 
 expecting success: 
-	> top/l1/tracked &&
 	(
-		cd top &&
-		git add -f l1/tracked
-	)
+		cd path0 &&
+		git ls-tree --full-name $tree a
+	) >current &&
+	cat >expected <<\EOF &&
+040000 tree X	path0/a
+EOF
+	test_output
 
-ok 21 - show/hide empty ignored sub-directory (setup)
+ok 11 - ls-tree --full-name
 
 expecting success: 
 	(
-		cd top &&
-		git ls-files -o -i --exclude l1 --directory
-	) >actual &&
-	echo l1/l2/ >expect &&
-	test_cmp expect actual
+		cd path1/b/c &&
+		git ls-tree --full-tree $tree
+	) >current &&
+	cat >expected <<\EOF &&
+100644 blob X	1.txt
+100644 blob X	2.txt
+040000 tree X	path0
+040000 tree X	path1
+040000 tree X	path2
+040000 tree X	path3
+EOF
+	test_output
 
-ok 22 - show empty ignored sub-directory with --directory
+ok 12 - ls-tree --full-tree
 
 expecting success: 
 	(
-		cd top &&
-		git ls-files -o -i --exclude l1 --directory --no-empty-directory
-	) >actual &&
-	test_must_be_empty actual
+		cd path3/ &&
+		git ls-tree --full-tree -r $tree
+	) >current &&
+	cat >expected <<\EOF &&
+100644 blob X	1.txt
+100644 blob X	2.txt
+100644 blob X	path0/a/b/c/1.txt
+100644 blob X	path1/b/c/1.txt
+100644 blob X	path2/1.txt
+100644 blob X	path3/1.txt
+100644 blob X	path3/2.txt
+EOF
+	test_output
 
-ok 23 - hide empty ignored sub-directory with --no-empty-directory
+ok 13 - ls-tree --full-tree -r
 
 expecting success: 
-	git ls-files -i -o --exclude "/three/a.3[abc]" >actual &&
-	test_must_be_empty actual
+	git ls-tree --abbrev=5 $tree >current &&
+	sed -e "s/ $_x05[0-9a-f]*	/ X	/" <current >check &&
+	cat >expected <<\EOF &&
+100644 blob X	1.txt
+100644 blob X	2.txt
+040000 tree X	path0
+040000 tree X	path1
+040000 tree X	path2
+040000 tree X	path3
+EOF
+	test_cmp expected check
 
-ok 24 - pattern matches prefix completely
+ok 14 - ls-tree --abbrev=5
 
 expecting success: 
-	cat <<\EOF >expect &&
-a.1
-one/a.1
-one/two/a.1
-three/a.1
+	git ls-tree --name-only $tree >current &&
+	cat >expected <<\EOF &&
+1.txt
+2.txt
+path0
+path1
+path2
+path3
 EOF
-	git ls-files -o -i --exclude "**/a.1" >actual &&
-	test_cmp expect actual
+	test_output
 
-ok 25 - ls-files with "**" patterns
+ok 15 - ls-tree --name-only
 
 expecting success: 
-	git ls-files -o -i --exclude "one**a.1" >actual &&
-	test_must_be_empty actual
+	git ls-tree --name-only -r $tree >current &&
+	cat >expected <<\EOF &&
+1.txt
+2.txt
+path0/a/b/c/1.txt
+path1/b/c/1.txt
+path2/1.txt
+path3/1.txt
+path3/2.txt
+EOF
+	test_output
 
-ok 26 - ls-files with "**" patterns and no slashes
+ok 16 - ls-tree --name-only -r
 
-# passed all 26 test(s)
-1..26
+# passed all 16 test(s)
+1..16
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t3010-ls-files-killed-modified.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3010-ls-files-killed-modified/.git/
-expecting success: 
-	date >path0 &&
-	test_ln_s_add xyzzy path1 &&
-	mkdir path2 path3 pathx &&
-	date >path2/file2 &&
-	date >path3/file3 &&
-	>pathx/ju &&
-	: >path7 &&
-	date >path8 &&
-	: >path9 &&
-	date >path10 &&
-	git update-index --add -- path0 path?/file? pathx/ju path7 path8 path9 path10 &&
-	git init submod1 &&
-	git -C submod1 commit --allow-empty -m "empty 1" &&
-	git init submod2 &&
-	git -C submod2 commit --allow-empty -m "empty 2" &&
-	git update-index --add submod[12] &&
-	(
-		cd submod1 &&
-		git commit --allow-empty -m "empty 1 (updated)"
-	) &&
-	rm -fr path?	# leave path10 alone
-
-checking prerequisite: SYMLINKS
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
-	# test whether the filesystem supports symbolic links
-	ln -s x y && test -h y
-
-)
-prerequisite SYMLINKS ok
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3010-ls-files-killed-modified/submod1/.git/
-[master (root-commit) 84bb2f8] empty 1
- Author: A U Thor <author@example.com>
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3010-ls-files-killed-modified/submod2/.git/
-[master (root-commit) cff6539] empty 2
- Author: A U Thor <author@example.com>
-[master c1f7aa8] empty 1 (updated)
- Author: A U Thor <author@example.com>
-ok 1 - git update-index --add to add various paths.
-
-expecting success: 
-	date >path2 &&
-	if test_have_prereq SYMLINKS
-	then
-		ln -s frotz path3 &&
-		ln -s nitfol path5
-	else
-		date >path3 &&
-		date >path5
-	fi &&
-	mkdir -p path0 path1 path6 pathx/ju &&
-	date >path0/file0 &&
-	date >path1/file1 &&
-	date >path6/file6 &&
-	date >path7 &&
-	: >path8 &&
-	: >path9 &&
-	touch path10 &&
-	>pathx/ju/nk &&
-	cat >.expected <<-\EOF
-	path0/file0
-	path1/file1
-	path2
-	path3
-	pathx/ju/nk
-	EOF
-
-ok 2 - git ls-files -k to show killed files.
-
-expecting success: 
-	git ls-files -k >.output &&
-	test_cmp .expected .output
-
-ok 3 - git ls-files -k output (w/o icase)
-
-expecting success: 
-	git -c core.ignorecase=true ls-files -k >.output &&
-	test_cmp .expected .output
-
-ok 4 - git ls-files -k output (w/ icase)
-
-expecting success: 
-	git ls-files -m >.output
-
-ok 5 - git ls-files -m to show modified files.
-
+*** t3202-show-branch-octopus.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3202-show-branch-octopus/.git/
 expecting success: 
-	cat >.expected <<-\EOF &&
-	path0
-	path1
-	path2/file2
-	path3/file3
-	path7
-	path8
-	pathx/ju
-	submod1
-	EOF
-	test_cmp .expected .output
-
-ok 6 - validate git ls-files -m output.
 
-# passed all 6 test(s)
-1..6
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t3031-merge-criscross.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3031-merge-criscross/.git/
-expecting success: 
-	mkdir data &&
+	> file &&
+	git add file &&
+	test_tick &&
+	git commit -m initial &&
 
-	# create a bunch of files
-	n=1 &&
-	while test $n -le 10
+	for i in $numbers
 	do
-		echo $n > data/$n &&
-		n=$(($n+1)) ||
-		return 1
-	done &&
-
-	# check them in
-	git add data &&
-	git commit -m A &&
-	git branch A &&
-
-	# a file in one branch
-	git checkout -b B A &&
-	git rm data/9 &&
-	git add data &&
-	git commit -m B &&
-
-	# with a branch off of it
-	git branch D &&
-
-	# put some commits on D
-	git checkout D &&
-	echo testD > data/testD &&
-	git add data &&
-	git commit -m D &&
-
-	# back up to the top, create another branch and cause
-	# a rename conflict with the file we deleted earlier
-	git checkout -b C A &&
-	git mv data/9 data/new-9 &&
-	git add data &&
-	git commit -m C &&
-
-	# with a branch off of it
-	git branch E &&
-
-	# put a commit on E
-	git checkout E &&
-	echo testE > data/testE &&
-	git add data &&
-	git commit -m E &&
-
-	# now, merge E into B
-	git checkout B &&
-	test_must_fail git merge E &&
-	# force-resolve
-	git add data &&
-	git commit -m F &&
-	git branch F &&
+		git checkout -b branch$i master &&
+		> file$i &&
+		git add file$i &&
+		test_tick &&
+		git commit -m branch$i || return 1
+	done
 
-	# and merge D into C
-	git checkout C &&
-	test_must_fail git merge D &&
-	# force-resolve
-	git add data &&
-	git commit -m G &&
-	git branch G
 
-[master (root-commit) 99ba59b] A
- Author: A U Thor <author@example.com>
- 10 files changed, 10 insertions(+)
- create mode 100644 data/1
- create mode 100644 data/10
- create mode 100644 data/2
- create mode 100644 data/3
- create mode 100644 data/4
- create mode 100644 data/5
- create mode 100644 data/6
- create mode 100644 data/7
- create mode 100644 data/8
- create mode 100644 data/9
-Switched to a new branch 'B'
-rm 'data/9'
-[B 04260ee] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 deletion(-)
- delete mode 100644 data/9
-Switched to branch 'D'
-[D cbb46ca] D
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 data/testD
-Switched to a new branch 'C'
-[C f486317] C
+[master (root-commit) 1bd44cb] initial
  Author: A U Thor <author@example.com>
  1 file changed, 0 insertions(+), 0 deletions(-)
- rename data/{9 => new-9} (100%)
-Switched to branch 'E'
-[E aa0b21a] E
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 data/testE
-Switched to branch 'B'
-Merging:
-04260ee B
-virtual E
-found 1 common ancestor:
-99ba59b A
-CONFLICT (rename/delete): data/9 deleted in HEAD and renamed to data/new-9 in E. Version E of data/new-9 left in tree.
-Automatic merge failed; fix conflicts and then commit the result.
-[B abf2151] F
- Author: A U Thor <author@example.com>
-Switched to branch 'C'
-Merging:
-f486317 C
-virtual D
-found 1 common ancestor:
-99ba59b A
-CONFLICT (rename/delete): data/9 deleted in D and renamed to data/new-9 in HEAD. Version HEAD of data/new-9 left in tree.
-Automatic merge failed; fix conflicts and then commit the result.
-[C dc5b081] G
- Author: A U Thor <author@example.com>
-ok 1 - setup repo with criss-cross history
-
-expecting success: 
-	git merge F
-
-Merging:
-dc5b081 G
-virtual F
-found 2 common ancestors:
-f486317 C
-04260ee B
-  Merging:
-  f486317 C
-  04260ee B
-  found 1 common ancestor:
-  99ba59b A
-Skipped data/new-9 (merged same as existing)
-Merge made by the 'recursive' strategy.
- data/testE | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 data/testE
-ok 2 - recursive merge between F and G does not cause segfault
-
-# passed all 2 test(s)
-1..2
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t2203-add-intent.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t2203-add-intent/.git/
-expecting success: 
-	test_commit 1 &&
-	git rm 1.t &&
-	echo hello >1.t &&
-	echo hello >file &&
-	echo hello >elif &&
-	git add -N file &&
-	git add elif &&
-	git add -N 1.t
-
-[master (root-commit) d0dcf97] 1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 1.t
-rm '1.t'
-ok 1 - intent to add
-
-expecting success: 
-	git status --porcelain | grep -v actual >actual &&
-	cat >expect <<-\EOF &&
-	DA 1.t
-	A  elif
-	 A file
-	EOF
-	test_cmp expect actual
-
-ok 2 - git status
-
-expecting success: 
-	git status --porcelain=v2 | grep -v "^?" >actual &&
-	nam1=$(echo 1 | git hash-object --stdin) &&
-	nam2=$(git hash-object elif) &&
-	cat >expect <<-EOF &&
-	1 DA N... 100644 000000 100644 $nam1 $ZERO_OID 1.t
-	1 A. N... 000000 100644 100644 $ZERO_OID $nam2 elif
-	1 .A N... 000000 000000 100644 $ZERO_OID $ZERO_OID file
-	EOF
-	test_cmp expect actual
-
-ok 3 - git status with porcelain v2
-
-expecting success: 
-	git ls-files -s file >actual &&
-	empty=$(git hash-object --stdin </dev/null) &&
-	echo "100644 $empty 0	file" >expect &&
-	test_cmp expect actual
-
-ok 4 - check result of "add -N"
-
-expecting success: 
-	git add -u &&
-	git ls-files -s file >actual &&
-	git ls-files -s elif | sed -e "s/elif/file/" >expect &&
-	test_cmp expect actual
-
-ok 5 - intent to add is just an ordinary empty blob
-
-expecting success: 
-	git add -N file elif &&
-	empty=$(git hash-object --stdin </dev/null) &&
-	git ls-files -s >actual &&
-	! grep "$empty" actual
-
-ok 6 - intent to add does not clobber existing paths
-
-expecting success: 
-	test_tick &&
-	git commit -a -m initial &&
-	git reset --hard &&
-
-	echo xyzzy >rezrov &&
-	echo frotz >nitfol &&
-	git add rezrov &&
-	git add -N nitfol &&
-	git commit -m second &&
-	test $(git ls-tree HEAD -- nitfol | wc -l) = 0 &&
-	test $(git diff --name-only HEAD -- nitfol | wc -l) = 1 &&
-	test $(git diff --name-only -- nitfol | wc -l) = 1
-
-[master b7cca08] initial
- Author: A U Thor <author@example.com>
- 3 files changed, 3 insertions(+), 1 deletion(-)
- create mode 100644 elif
  create mode 100644 file
-HEAD is now at b7cca08 initial
-[master b70ad0b] second
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 rezrov
-ok 7 - i-t-a entry is simply ignored
-
-expecting success: 
-	git reset --hard &&
-	echo bozbar >rezrov &&
-	echo frotz >nitfol &&
-	git add rezrov &&
-	git add -N nitfol &&
-	git commit -m partial rezrov
-
-HEAD is now at b70ad0b second
-[master 1ed15b5] partial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 8 - can commit with an unrelated i-t-a entry in index
-
-expecting success: 
-	git reset --hard &&
-	: >nitfol &&
-	git add -N nitfol &&
-	git commit -a -m all
-
-HEAD is now at 1ed15b5 partial
-[master 415f3ad] all
+Switched to a new branch 'branch1'
+[branch1 eabeb5d] branch1
  Author: A U Thor <author@example.com>
  1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 nitfol
-ok 9 - can "commit -a" with an i-t-a entry
-
-expecting success: 
-	git reset --hard &&
-	mkdir dir &&
-	: >dir/foo &&
-	git add dir/foo &&
-	git commit -m foo &&
-
-	: >dir/bar &&
-	git add -N dir/bar &&
-	git diff --name-only >actual &&
-	echo dir/bar >expect &&
-	test_cmp expect actual &&
-
-	git write-tree >/dev/null &&
-
-	git diff --name-only >actual &&
-	echo dir/bar >expect &&
-	test_cmp expect actual
-
-HEAD is now at 415f3ad all
-[master 03f6a20] foo
+ create mode 100644 file1
+Switched to a new branch 'branch2'
+[branch2 b4fb685] branch2
  Author: A U Thor <author@example.com>
  1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 dir/foo
-ok 10 - cache-tree invalidates i-t-a paths
-
-expecting success: 
-	git init ita-in-dir &&
-	(
-		cd ita-in-dir &&
-		mkdir 2 &&
-		for f in 1 2/1 2/2 3
-		do
-			echo "$f" >"$f"
-		done &&
-		git add 1 2/2 3 &&
-		git add -N 2/1 &&
-		git commit -m committed &&
-		git ls-tree -r HEAD >actual &&
-		grep 2/2 actual
-	)
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t2203-add-intent/ita-in-dir/.git/
-[master (root-commit) 7b0eb4f] committed
- Author: A U Thor <author@example.com>
- 3 files changed, 3 insertions(+)
- create mode 100644 1
- create mode 100644 2/2
- create mode 100644 3
-100644 blob 6b8a6f549c42bad0c52be670caa297a269052aa7	2/2
-ok 11 - cache-tree does not ignore dir that has i-t-a entries
-
-expecting success: 
-	rm -fr ita-in-dir &&
-	git init ita-in-dir &&
-	(
-		cd ita-in-dir &&
-		mkdir -p 1/2/3 &&
-		echo 4 >1/2/3/4 &&
-		git add -N 1/2/3/4 &&
-		git write-tree >actual &&
-		echo $EMPTY_TREE >expected &&
-		test_cmp expected actual
-	)
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t2203-add-intent/ita-in-dir/.git/
-ok 12 - cache-tree does skip dir that becomes empty
-
-expecting success: 
-	git init empty-initial-commit &&
-	(
-		cd empty-initial-commit &&
-		: >one &&
-		git add -N one &&
-		test_must_fail git commit -m nothing-new-here
-	)
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t2203-add-intent/empty-initial-commit/.git/
-On branch master
-
-Initial commit
-
-Changes not staged for commit:
-	new file:   one
-
-no changes added to commit
-ok 13 - commit: ita entries ignored in empty initial commit check
-
-expecting success: 
-	git init empty-subsequent-commit &&
-	(
-		cd empty-subsequent-commit &&
-		test_commit one &&
-		: >two &&
-		git add -N two &&
-		test_must_fail git commit -m nothing-new-here
-	)
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t2203-add-intent/empty-subsequent-commit/.git/
-[master (root-commit) 4331c28] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-On branch master
-Changes not staged for commit:
-	new file:   two
-
-no changes added to commit
-ok 14 - commit: ita entries ignored in empty commit check
-
-expecting success: 
-	git init rename-detection &&
-	(
-		cd rename-detection &&
-		echo contents >first &&
-		git add first &&
-		git commit -m first &&
-		mv first third &&
-		git add -N third &&
-
-		git status | grep -v "^?" >actual.1 &&
-		test_i18ngrep "renamed: *first -> third" actual.1 &&
-
-		git status --porcelain | grep -v "^?" >actual.2 &&
-		cat >expected.2 <<-\EOF &&
-		 R first -> third
-		EOF
-		test_cmp expected.2 actual.2 &&
-
-		hash=$(git hash-object third) &&
-		git status --porcelain=v2 | grep -v "^?" >actual.3 &&
-		cat >expected.3 <<-EOF &&
-		2 .R N... 100644 100644 100644 $hash $hash R100 third	first
-		EOF
-		test_cmp expected.3 actual.3 &&
-
-		git diff --stat >actual.4 &&
-		cat >expected.4 <<-EOF &&
-		 first => third | 0
-		 1 file changed, 0 insertions(+), 0 deletions(-)
-		EOF
-		test_cmp expected.4 actual.4 &&
-
-		git diff --cached --stat >actual.5 &&
-		test_must_be_empty actual.5
-
-	)
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t2203-add-intent/rename-detection/.git/
-[master (root-commit) 0bad72c] first
+ create mode 100644 file2
+Switched to a new branch 'branch3'
+[branch3 8334722] branch3
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 first
-	renamed:    first -> third
-ok 15 - rename detection finds the right names
-
-expecting success: 
-	git init rename-detection-2 &&
-	(
-		cd rename-detection-2 &&
-		echo contents >first &&
-		git add first &&
-		git commit -m first &&
-		git mv first second &&
-		mv second third &&
-		git add -N third &&
-
-		git status | grep -v "^?" >actual.1 &&
-		test_i18ngrep "renamed: *first -> second" actual.1 &&
-		test_i18ngrep "renamed: *second -> third" actual.1 &&
-
-		git status --porcelain | grep -v "^?" >actual.2 &&
-		cat >expected.2 <<-\EOF &&
-		R  first -> second
-		 R second -> third
-		EOF
-		test_cmp expected.2 actual.2 &&
-
-		hash=$(git hash-object third) &&
-		git status --porcelain=v2 | grep -v "^?" >actual.3 &&
-		cat >expected.3 <<-EOF &&
-		2 R. N... 100644 100644 100644 $hash $hash R100 second	first
-		2 .R N... 100644 100644 100644 $hash $hash R100 third	second
-		EOF
-		test_cmp expected.3 actual.3
-	)
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t2203-add-intent/rename-detection-2/.git/
-[master (root-commit) 0bad72c] first
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 file3
+Switched to a new branch 'branch4'
+[branch4 142d8e4] branch4
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 first
-	renamed:    first -> second
-	renamed:    second -> third
-ok 16 - double rename detection in status
-
-expecting success: 
-	git reset --hard &&
-	echo new >new-ita &&
-	git add -N new-ita &&
-	git diff --summary >actual &&
-	echo " create mode 100644 new-ita" >expected &&
-	test_cmp expected actual &&
-	git diff --cached --summary >actual2 &&
-	test_must_be_empty actual2
-
-HEAD is now at 03f6a20 foo
-ok 17 - diff-files/diff-cached shows ita as new/not-new files
-
-expecting success: 
-	git reset --hard &&
-	echo new >new-ita &&
-	git add -N new-ita &&
-	git diff HEAD >actual &&
-	cat >expected <<-\EOF &&
-	diff --git a/new-ita b/new-ita
-	new file mode 100644
-	index 0000000..3e75765
-	--- /dev/null
-	+++ b/new-ita
-	@@ -0,0 +1 @@
-	+new
-	EOF
-	test_cmp expected actual
-
-HEAD is now at 03f6a20 foo
-ok 18 - "diff HEAD" includes ita as new files
-
-expecting success: 
-	git reset --hard &&
-	echo new >new-ita &&
-	git add -N new-ita &&
-	git diff >expected &&
-	grep "new file" expected &&
-	git reset --hard &&
-	git apply --intent-to-add expected &&
-	git diff >actual &&
-	test_cmp expected actual
-
-HEAD is now at 03f6a20 foo
-new file mode 100644
-HEAD is now at 03f6a20 foo
-ok 19 - apply --intent-to-add
-
-# passed all 19 test(s)
-1..19
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t3035-merge-sparse.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3035-merge-sparse/.git/
-expecting success: 
-	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 &&
-	echo "/checked-out" >.git/info/sparse-checkout &&
-	git reset --hard &&
-	! git merge theirs
-
-[master (root-commit) b21827e] init
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 file4
+Switched to a new branch 'branch5'
+[branch5 c5402b6] branch5
  Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 checked-out
- create mode 100644 modify_delete
-[master 8305a8e] theirs
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 file5
+Switched to a new branch 'branch6'
+[branch6 d33aeab] branch6
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-HEAD is now at b21827e init
-rm 'modify_delete'
-[master 365d29a] ours
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 file6
+Switched to a new branch 'branch7'
+[branch7 cb80438] branch7
  Author: A U Thor <author@example.com>
- 1 file changed, 1 deletion(-)
- delete mode 100644 modify_delete
-HEAD is now at 365d29a ours
-Merging:
-365d29a ours
-virtual theirs
-found 1 common ancestor:
-b21827e init
-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: 
-	git reset --hard
-
-HEAD is now at 365d29a ours
-ok 2 - reset --hard works after the conflict
-
-expecting success: 
-	git status --porcelain -- modify_delete >out &&
-	test_must_be_empty out &&
-	test_path_is_missing modify_delete
-
-ok 3 - is reset properly
-
-expecting success: 
-	! git merge theirs
-
-Merging:
-365d29a ours
-virtual theirs
-found 1 common ancestor:
-b21827e init
-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: 
-	git merge --abort
-
-ok 5 - Merge abort works after the conflict
-
-expecting success: 
-	git status --porcelain -- modify_delete >out &&
-	test_must_be_empty out &&
-	test_path_is_missing modify_delete
-
-ok 6 - is aborted properly
-
-# passed all 6 test(s)
-1..6
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t3032-merge-recursive-space-options.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3032-merge-recursive-space-options/.git/
-expecting success: 
-	conflict_hunks () {
-		sed $SED_OPTIONS -n -e "
-			/^<<<</ b conflict
-			b
-			: conflict
-			p
-			/^>>>>/ b
-			n
-			b conflict
-		" "$@"
-	} &&
-
-	cat <<-\EOF >text.txt &&
-	    Hope, he says, cherishes the soul of him who lives in
-	    justice and holiness and is the nurse of his age and the
-	    companion of his journey;--hope which is mightiest to sway
-	    the restless soul of man.
-
-	How admirable are his words!  And the great blessing of riches, I do
-	not say to every man, but to a good man, is, that he has had no
-	occasion to deceive or to defraud others, either intentionally or
-	unintentionally; and when he departs to the world below he is not in
-	any apprehension about offerings due to the gods or debts which he owes
-	to men.  Now to this peace of mind the possession of wealth greatly
-	contributes; and therefore I say, that, setting one thing against
-	another, of the many advantages which wealth has to give, to a man of
-	sense this is in my opinion the greatest.
-
-	Well said, Cephalus, I replied; but as concerning justice, what is
-	it?--to speak the truth and to pay your debts--no more than this?  And
-	even to this are there not exceptions?  Suppose that a friend when in
-	his right mind has deposited arms with me and he asks for them when he
-	is not in his right mind, ought I to give them back to him?  No one
-	would say that I ought or that I should be right in doing so, any more
-	than they would say that I ought always to speak the truth to one who
-	is in his condition.
-
-	You are quite right, he replied.
-
-	But then, I said, speaking the truth and paying your debts is not a
-	correct definition of justice.
-
-	CEPHALUS - SOCRATES - POLEMARCHUS
-
-	Quite correct, Socrates, if Simonides is to be believed, said
-	Polemarchus interposing.
-
-	I fear, said Cephalus, that I must go now, for I have to look after the
-	sacrifices, and I hand over the argument to Polemarchus and the company.
-	EOF
-	git add text.txt &&
-	test_tick &&
-	git commit -m "Initial revision" &&
-
-	git checkout -b remote &&
-	sed -e "
-			s/\.  /\. /g
-			s/[?]  /? /g
-			s/    /	/g
-			s/--/---/g
-			s/but as concerning/but as con cerning/
-			/CEPHALUS - SOCRATES - POLEMARCHUS/ d
-		" text.txt >text.txt+ &&
-	mv text.txt+ text.txt &&
-	git commit -a -m "Remove cruft" &&
-
-	git checkout master &&
-	sed -e "
-			s/\(not in his right mind\),\(.*\)/\1;\2Q/
-			s/Quite correct\(.*\)/It is too correct\1Q/
-			s/unintentionally/un intentionally/
-			/un intentionally/ s/$/Q/
-			s/Polemarchus interposing./Polemarchus, interposing.Q/
-			/justice and holiness/ s/$/Q/
-			/pay your debts/ s/$/Q/
-		" text.txt | q_to_cr >text.txt+ &&
-	mv text.txt+ text.txt &&
-	git commit -a -m "Clarify" &&
-	git show-branch --all
-
-[master (root-commit) c1e95d9] Initial revision
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 file7
+Switched to a new branch 'branch8'
+[branch8 c922302] branch8
  Author: A U Thor <author@example.com>
- 1 file changed, 36 insertions(+)
- create mode 100644 text.txt
-Switched to a new branch 'remote'
-[remote be82dcf] Remove cruft
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 file8
+Switched to a new branch 'branch9'
+[branch9 fabe124] branch9
  Author: A U Thor <author@example.com>
- 1 file changed, 9 insertions(+), 10 deletions(-)
-Switched to branch 'master'
-[master 0ab7224] Clarify
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 file9
+Switched to a new branch 'branch10'
+[branch10 4d9b8be] branch10
  Author: A U Thor <author@example.com>
- 1 file changed, 6 insertions(+), 6 deletions(-)
-* [master] Clarify
- ! [remote] Remove cruft
---
- + [remote] Remove cruft
-*  [master] Clarify
-*+ [remote^] Initial revision
-ok 1 - setup
-
-expecting success: 
-	git read-tree --reset -u HEAD &&
-	test_must_fail git merge-recursive HEAD^ -- HEAD remote &&
-	test_must_fail git update-index --refresh &&
-	grep "<<<<<<" text.txt
-
-Merging HEAD with remote
-Merging:
-0ab7224 Clarify
-be82dcf Remove cruft
-found 1 common ancestor:
-c1e95d9 Initial revision
-Auto-merging text.txt
-CONFLICT (content): Merge conflict in text.txt
-text.txt: needs merge
-<<<<<<< HEAD
-<<<<<<< HEAD
-ok 2 - naive merge fails
-
-expecting success: 
-	git read-tree --reset -u HEAD &&
-	git merge-recursive --ignore-space-change HEAD^ -- HEAD remote
-
-Merging HEAD with remote
-Merging:
-0ab7224 Clarify
-be82dcf Remove cruft
-found 1 common ancestor:
-c1e95d9 Initial revision
-Auto-merging text.txt
-ok 3 - --ignore-space-change makes merge succeed
-
-expecting success: 
-	git read-tree --reset -u HEAD &&
-	test_must_fail git cherry-pick --no-commit remote &&
-	git read-tree --reset -u HEAD &&
-	test_must_fail git cherry-pick remote &&
-	test_must_fail git update-index --refresh &&
-	grep "<<<<<<" text.txt
-
-Auto-merging text.txt
-CONFLICT (content): Merge conflict in text.txt
-error: could not apply be82dcf... Remove cruft
-hint: after resolving the conflicts, mark the corrected paths
-hint: with 'git add <paths>' or 'git rm <paths>'
-Auto-merging text.txt
-CONFLICT (content): Merge conflict in text.txt
-error: could not apply be82dcf... Remove cruft
-hint: after resolving the conflicts, mark the corrected paths
-hint: with 'git add <paths>' or 'git rm <paths>'
-hint: and commit the result with 'git commit'
-text.txt: needs merge
-<<<<<<< HEAD
-<<<<<<< HEAD
-ok 4 - naive cherry-pick fails
-
-expecting success: 
-	git read-tree --reset -u HEAD &&
-	git cherry-pick --no-commit -Xignore-space-change remote
-
-Auto-merging text.txt
-ok 5 - -Xignore-space-change makes cherry-pick succeed
-
-expecting success: 
-	q_to_cr <<-\EOF >expected &&
-	    justice and holiness and is the nurse of his age and theQ
-	EOF
-
-	git read-tree --reset -u HEAD &&
-	git merge-recursive --ignore-space-change HEAD^ -- HEAD remote &&
-	grep "justice and holiness" text.txt >actual &&
-	test_cmp expected actual
-
-Merging HEAD with remote
-Merging:
-0ab7224 Clarify
-be82dcf Remove cruft
-found 1 common ancestor:
-c1e95d9 Initial revision
-Auto-merging text.txt
-ok 6 - --ignore-space-change: our w/s-only change wins
-
-expecting success: 
-	cat <<-\EOF >expected &&
-	it?---to speak the truth and to pay your debts---no more than this? And
-	EOF
-
-	git read-tree --reset -u HEAD &&
-	git merge-recursive --ignore-space-change HEAD^ -- HEAD remote &&
-	grep "pay your debts" text.txt >actual &&
-	test_cmp expected actual
-
-Merging HEAD with remote
-Merging:
-0ab7224 Clarify
-be82dcf Remove cruft
-found 1 common ancestor:
-c1e95d9 Initial revision
-Auto-merging text.txt
-ok 7 - --ignore-space-change: their real change wins over w/s
-
-expecting success: 
-	cat <<-\EOF >expected1 &&
-	Well said, Cephalus, I replied; but as con cerning justice, what is
-	EOF
-	q_to_cr <<-\EOF >expected2 &&
-	un intentionally; and when he departs to the world below he is not inQ
-	EOF
-
-	git read-tree --reset -u HEAD &&
-	git merge-recursive --ignore-space-change HEAD^ -- HEAD remote &&
-	grep "Well said" text.txt >actual1 &&
-	grep "when he departs" text.txt >actual2 &&
-	test_cmp expected1 actual1 &&
-	test_cmp expected2 actual2
-
-Merging HEAD with remote
-Merging:
-0ab7224 Clarify
-be82dcf Remove cruft
-found 1 common ancestor:
-c1e95d9 Initial revision
-Auto-merging text.txt
-ok 8 - --ignore-space-change: does not ignore new spaces
-
-expecting success: 
-	cat <<-\EOF >expected &&
-	Well said, Cephalus, I replied; but as concerning justice, what is
-	EOF
-
-	git read-tree --reset -u HEAD &&
-	git merge-recursive --ignore-all-space HEAD^ -- HEAD remote &&
-	grep "Well said" text.txt >actual &&
-	test_cmp expected actual
-
-Merging HEAD with remote
-Merging:
-0ab7224 Clarify
-be82dcf Remove cruft
-found 1 common ancestor:
-c1e95d9 Initial revision
-Auto-merging text.txt
-ok 9 - --ignore-all-space drops their new spaces
-
-expecting success: 
-	q_to_cr <<-\EOF >expected &&
-	un intentionally; and when he departs to the world below he is not inQ
-	EOF
-
-	git read-tree --reset -u HEAD &&
-	git merge-recursive --ignore-all-space HEAD^ -- HEAD remote &&
-	grep "when he departs" text.txt >actual &&
-	test_cmp expected actual
-
-Merging HEAD with remote
-Merging:
-0ab7224 Clarify
-be82dcf Remove cruft
-found 1 common ancestor:
-c1e95d9 Initial revision
-Auto-merging text.txt
-ok 10 - --ignore-all-space keeps our new spaces
-
-expecting success: 
-	q_to_cr <<-\EOF >expected &&
-	<<<<<<< HEAD
-	is not in his right mind; ought I to give them back to him?  No oneQ
-	=======
-	is not in his right mind, ought I to give them back to him? No one
-	>>>>>>> remote
-	EOF
-
-	git read-tree --reset -u HEAD &&
-	test_must_fail git merge-recursive --ignore-space-at-eol \
-						 HEAD^ -- HEAD remote &&
-	conflict_hunks text.txt >actual &&
-	test_cmp expected actual
-
-Merging HEAD with remote
-Merging:
-0ab7224 Clarify
-be82dcf Remove cruft
-found 1 common ancestor:
-c1e95d9 Initial revision
-Auto-merging text.txt
-CONFLICT (content): Merge conflict in text.txt
-ok 11 - --ignore-space-at-eol
-
-# passed all 11 test(s)
-1..11
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t2204-add-ignored.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t2204-add-ignored/.git/
-expecting success: 
-	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
-
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 file10
 ok 1 - setup
 
 expecting success: 
-		rm -f .git/index &&
-		git add "$i" &&
-		git ls-files "$i" >out &&
-		test -s out
-	
-ok 2 - no complaints for unignored file
-
-expecting success: 
-		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: 
-		rm -f .git/index &&
-		git add "$i" &&
-		git ls-files "$i" >out &&
-		test -s out
-	
-ok 4 - no complaints for unignored dir
-
-expecting success: 
-		rm -f .git/index &&
-		git add "$i" &&
-		git ls-files "$i" >out &&
-		test -s out
-	
-ok 5 - no complaints for unignored d*
-
-expecting success: 
-		rm -f .git/index &&
-		test_must_fail git add "$i" 2>err &&
-		git ls-files "$i" >out &&
-		test_must_be_empty out
-	
-ok 6 - complaints for ignored ign
-
-expecting success: 
-		test_i18ngrep -e "Use -f if" err
-	
-Use -f if you really want to add them.
-ok 7 - complaints for ignored ign output
-
-expecting success: 
-		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: 
-		test_i18ngrep -e "Use -f if" err
-	
-Use -f if you really want to add them.
-ok 9 - complaints for ignored ign with unignored file output
-
-expecting success: 
-		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: 
-		test_i18ngrep -e "Use -f if" err
-	
-Use -f if you really want to add them.
-ok 11 - complaints for ignored dir/ign output
-
-expecting success: 
-		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: 
-		test_i18ngrep -e "Use -f if" err
-	
-Use -f if you really want to add them.
-ok 13 - complaints for ignored dir/ign with unignored file output
-
-expecting success: 
-		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: 
-		test_i18ngrep -e "Use -f if" err
-	
-Use -f if you really want to add them.
-ok 15 - complaints for ignored dir/sub output
-
-expecting success: 
-		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: 
-		test_i18ngrep -e "Use -f if" err
-	
-Use -f if you really want to add them.
-ok 17 - complaints for ignored dir/sub with unignored file output
-
-expecting success: 
-		rm -f .git/index &&
-		test_must_fail git add "$i" 2>err &&
-		git ls-files "$i" >out &&
-		test_must_be_empty out
-	
-ok 18 - complaints for ignored dir/sub/ign
-
-expecting success: 
-		test_i18ngrep -e "Use -f if" err
-	
-Use -f if you really want to add them.
-ok 19 - complaints for ignored dir/sub/ign output
-
-expecting success: 
-		rm -f .git/index &&
-		test_must_fail git add "$i" file 2>err &&
-		git ls-files "$i" >out &&
-		test_must_be_empty out
-	
-ok 20 - complaints for ignored dir/sub/ign with unignored file
-
-expecting success: 
-		test_i18ngrep -e "Use -f if" err
-	
-Use -f if you really want to add them.
-ok 21 - complaints for ignored dir/sub/ign with unignored file output
-
-expecting success: 
-		rm -f .git/index &&
-		test_must_fail git add "$i" 2>err &&
-		git ls-files "$i" >out &&
-		test_must_be_empty out
-	
-ok 22 - complaints for ignored sub/file
-
-expecting success: 
-		test_i18ngrep -e "Use -f if" err
-	
-Use -f if you really want to add them.
-ok 23 - complaints for ignored sub/file output
-
-expecting success: 
-		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: 
-		test_i18ngrep -e "Use -f if" err
-	
-Use -f if you really want to add them.
-ok 25 - complaints for ignored sub/file with unignored file output
-
-expecting success: 
-		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: 
-		test_i18ngrep -e "Use -f if" err
-	
-Use -f if you really want to add them.
-ok 27 - complaints for ignored sub output
-
-expecting success: 
-		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: 
-		test_i18ngrep -e "Use -f if" err
-	
-Use -f if you really want to add them.
-ok 29 - complaints for ignored sub with unignored file output
-
-expecting success: 
-		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: 
-		test_i18ngrep -e "Use -f if" err
-	
-Use -f if you really want to add them.
-ok 31 - complaints for ignored sub/file output
-
-expecting success: 
-		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: 
-		test_i18ngrep -e "Use -f if" err
-	
-Use -f if you really want to add them.
-ok 33 - complaints for ignored sub/file with unignored file output
-
-expecting success: 
-		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: 
-		test_i18ngrep -e "Use -f if" err
-	
-Use -f if you really want to add them.
-ok 35 - complaints for ignored sub/ign output
-
-expecting success: 
-		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: 
-		test_i18ngrep -e "Use -f if" err
-	
-Use -f if you really want to add them.
-ok 37 - complaints for ignored sub/ign with unignored file output
-
-expecting success: 
-		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: 
-		(
-			cd dir &&
-			test_i18ngrep -e "Use -f if" err
-		)
-	
-Use -f if you really want to add them.
-ok 39 - complaints for ignored sub in dir output
-
-expecting success: 
-		rm -f .git/index &&
-		(
-			cd dir &&
-			test_must_fail git add "$i" 2>err &&
-			git ls-files "$i" >out &&
-			test_must_be_empty out
-		)
-	
-ok 40 - complaints for ignored sub/file in dir
-
-expecting success: 
-		(
-			cd dir &&
-			test_i18ngrep -e "Use -f if" err
-		)
-	
-Use -f if you really want to add them.
-ok 41 - complaints for ignored sub/file in dir output
-
-expecting success: 
-		rm -f .git/index &&
-		(
-			cd dir &&
-			test_must_fail git add "$i" 2>err &&
-			git ls-files "$i" >out &&
-			test_must_be_empty out
-		)
-	
-ok 42 - complaints for ignored sub/ign in dir
-
-expecting success: 
-		(
-			cd dir &&
-			test_i18ngrep -e "Use -f if" err
-		)
-	
-Use -f if you really want to add them.
-ok 43 - complaints for ignored sub/ign in dir output
-
-expecting success: 
-		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: 
-		(
-			cd sub &&
-			test_i18ngrep -e "Use -f if" err
-		)
-	
-Use -f if you really want to add them.
-ok 45 - complaints for ignored ign in sub output
+	git show-branch $(for i in $numbers; do echo branch$i; done) > out &&
+	test_cmp expect out
 
-expecting success: 
-		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: 
-		(
-			cd sub &&
-			test_i18ngrep -e "Use -f if" err
-		)
-	
-Use -f if you really want to add them.
-ok 47 - complaints for ignored file in sub output
+ok 2 - show-branch with more than 8 branches
 
-# passed all 47 test(s)
-1..47
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t3060-ls-files-with-tree.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3060-ls-files-with-tree/.git/
 expecting success: 
-
-	# The bug we are exercising requires a fair number of entries
-	# in a sub-directory so that add_index_entry will trigger a
-	# realloc.
-
-	echo file >expected &&
-	mkdir sub &&
-	for n in 0 1 2 3 4 5
-	do
-		for m in 0 1 2 3 4 5 6 7 8 9
-		do
-			num=00$n$m &&
-			>sub/file-$num &&
-			echo file-$num >>expected ||
-			return 1
-		done
+	for i in $numbers; do
+		git config --add showbranch.default branch$i
 	done &&
-	git add . &&
-	git commit -m "add a bunch of files" &&
-
-	# We remove them all so that we will have something to add
-	# back with --with-tree and so that we will definitely be
-	# under the realloc size to trigger the bug.
-	rm -rf sub &&
-	git commit -a -m "remove them all" &&
-
-	# The bug also requires some entry before our directory so that
-	# prune_path will modify the_index.cache
-
-	mkdir a_directory_that_sorts_before_sub &&
-	>a_directory_that_sorts_before_sub/file &&
-	mkdir sub &&
-	>sub/file &&
-	git add .
-
-[master (root-commit) 79bd6bd] add a bunch of files
- Author: A U Thor <author@example.com>
- 61 files changed, 61 insertions(+)
- create mode 100644 expected
- create mode 100644 sub/file-0000
- create mode 100644 sub/file-0001
- create mode 100644 sub/file-0002
- create mode 100644 sub/file-0003
- create mode 100644 sub/file-0004
- create mode 100644 sub/file-0005
- create mode 100644 sub/file-0006
- create mode 100644 sub/file-0007
- create mode 100644 sub/file-0008
- create mode 100644 sub/file-0009
- create mode 100644 sub/file-0010
- create mode 100644 sub/file-0011
- create mode 100644 sub/file-0012
- create mode 100644 sub/file-0013
- create mode 100644 sub/file-0014
- create mode 100644 sub/file-0015
- create mode 100644 sub/file-0016
- create mode 100644 sub/file-0017
- create mode 100644 sub/file-0018
- create mode 100644 sub/file-0019
- create mode 100644 sub/file-0020
- create mode 100644 sub/file-0021
- create mode 100644 sub/file-0022
- create mode 100644 sub/file-0023
- create mode 100644 sub/file-0024
- create mode 100644 sub/file-0025
- create mode 100644 sub/file-0026
- create mode 100644 sub/file-0027
- create mode 100644 sub/file-0028
- create mode 100644 sub/file-0029
- create mode 100644 sub/file-0030
- create mode 100644 sub/file-0031
- create mode 100644 sub/file-0032
- create mode 100644 sub/file-0033
- create mode 100644 sub/file-0034
- create mode 100644 sub/file-0035
- create mode 100644 sub/file-0036
- create mode 100644 sub/file-0037
- create mode 100644 sub/file-0038
- create mode 100644 sub/file-0039
- create mode 100644 sub/file-0040
- create mode 100644 sub/file-0041
- create mode 100644 sub/file-0042
- create mode 100644 sub/file-0043
- create mode 100644 sub/file-0044
- create mode 100644 sub/file-0045
- create mode 100644 sub/file-0046
- create mode 100644 sub/file-0047
- create mode 100644 sub/file-0048
- create mode 100644 sub/file-0049
- create mode 100644 sub/file-0050
- create mode 100644 sub/file-0051
- create mode 100644 sub/file-0052
- create mode 100644 sub/file-0053
- create mode 100644 sub/file-0054
- create mode 100644 sub/file-0055
- create mode 100644 sub/file-0056
- create mode 100644 sub/file-0057
- create mode 100644 sub/file-0058
- create mode 100644 sub/file-0059
-[master 4abd38a] remove them all
- Author: A U Thor <author@example.com>
- 60 files changed, 0 insertions(+), 0 deletions(-)
- delete mode 100644 sub/file-0000
- delete mode 100644 sub/file-0001
- delete mode 100644 sub/file-0002
- delete mode 100644 sub/file-0003
- delete mode 100644 sub/file-0004
- delete mode 100644 sub/file-0005
- delete mode 100644 sub/file-0006
- delete mode 100644 sub/file-0007
- delete mode 100644 sub/file-0008
- delete mode 100644 sub/file-0009
- delete mode 100644 sub/file-0010
- delete mode 100644 sub/file-0011
- delete mode 100644 sub/file-0012
- delete mode 100644 sub/file-0013
- delete mode 100644 sub/file-0014
- delete mode 100644 sub/file-0015
- delete mode 100644 sub/file-0016
- delete mode 100644 sub/file-0017
- delete mode 100644 sub/file-0018
- delete mode 100644 sub/file-0019
- delete mode 100644 sub/file-0020
- delete mode 100644 sub/file-0021
- delete mode 100644 sub/file-0022
- delete mode 100644 sub/file-0023
- delete mode 100644 sub/file-0024
- delete mode 100644 sub/file-0025
- delete mode 100644 sub/file-0026
- delete mode 100644 sub/file-0027
- delete mode 100644 sub/file-0028
- delete mode 100644 sub/file-0029
- delete mode 100644 sub/file-0030
- delete mode 100644 sub/file-0031
- delete mode 100644 sub/file-0032
- delete mode 100644 sub/file-0033
- delete mode 100644 sub/file-0034
- delete mode 100644 sub/file-0035
- delete mode 100644 sub/file-0036
- delete mode 100644 sub/file-0037
- delete mode 100644 sub/file-0038
- delete mode 100644 sub/file-0039
- delete mode 100644 sub/file-0040
- delete mode 100644 sub/file-0041
- delete mode 100644 sub/file-0042
- delete mode 100644 sub/file-0043
- delete mode 100644 sub/file-0044
- delete mode 100644 sub/file-0045
- delete mode 100644 sub/file-0046
- delete mode 100644 sub/file-0047
- delete mode 100644 sub/file-0048
- delete mode 100644 sub/file-0049
- delete mode 100644 sub/file-0050
- delete mode 100644 sub/file-0051
- delete mode 100644 sub/file-0052
- delete mode 100644 sub/file-0053
- delete mode 100644 sub/file-0054
- delete mode 100644 sub/file-0055
- delete mode 100644 sub/file-0056
- delete mode 100644 sub/file-0057
- delete mode 100644 sub/file-0058
- delete mode 100644 sub/file-0059
-ok 1 - setup
-
-expecting success: 
-	# We have to run from a sub-directory to trigger prune_path
-	# Then we finally get to run our --with-tree test
-	(
-		cd sub &&
-		git ls-files --with-tree=HEAD~1 >../output
-	)
-
-ok 2 - git -ls-files --with-tree should succeed from subdir
+	git show-branch >out &&
+	test_cmp expect out
 
-expecting success: test_cmp expected output
-ok 3 - git -ls-files --with-tree should add entries from named tree.
+ok 3 - show-branch with showbranch.default
 
 # passed all 3 test(s)
 1..3
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t3050-subprojects-fetch.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3050-subprojects-fetch/.git/
-expecting success: 
-	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/git-2.20.1/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.
-[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: 
-	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: 
-	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: 
-	(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/git-2.20.1/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/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t3040-subprojects-basic.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3040-subprojects-basic/.git/
-expecting success: 
-	: >Makefile &&
-	git add Makefile &&
-	git commit -m "Superproject created"
-
-[master (root-commit) c52c39d] 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: 
-	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/git-2.20.1/t/trash directory.t3040-subprojects-basic/sub1/.git/
-Initialized empty Git repository in /build/git-2.20.1/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.
-ok 2 - setup: create subprojects
-
-expecting success: 
-	git fsck --full
-
-ok 3 - check if fsck ignores the subprojects
-
-expecting success: 
-	( 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 15d5b42a3b2a224324585c3a90f09faa69818962 0000000000000000000000000000000000000000 M	sub1
-ok 4 - check if commit in a subproject detected
-
-expecting success: 
-	git commit -q -a -m "sub1 changed" &&
-	test_expect_code 1 git diff-tree --exit-code HEAD^ HEAD
-
-:160000 160000 15d5b42a3b2a224324585c3a90f09faa69818962 7df4c392cd2775cee8e9188b9bf473469010edd1 M	sub1
-ok 5 - check if a changed subproject HEAD can be committed
-
-expecting success: 
-	test_expect_code 1 git diff-index --exit-code --cached save -- sub1
-
-:160000 160000 15d5b42a3b2a224324585c3a90f09faa69818962 7df4c392cd2775cee8e9188b9bf473469010edd1 M	sub1
-ok 6 - check if diff-index works for subproject elements
-
-expecting success: 
-	test_expect_code 1 git diff-tree --exit-code HEAD^ HEAD -- sub1
-
-:160000 160000 15d5b42a3b2a224324585c3a90f09faa69818962 7df4c392cd2775cee8e9188b9bf473469010edd1 M	sub1
-ok 7 - check if diff-tree works for subproject elements
-
-expecting success: 
-	test_expect_code 1 git diff --exit-code HEAD^ HEAD
-
-diff --git a/sub1 b/sub1
-index 15d5b42..7df4c39 160000
---- a/sub1
-+++ b/sub1
-@@ -1 +1 @@
--Subproject commit 15d5b42a3b2a224324585c3a90f09faa69818962
-+Subproject commit 7df4c392cd2775cee8e9188b9bf473469010edd1
-ok 8 - check if git diff works for subproject elements
-
-expecting success: 
-	git ls-files -s >expected &&
-	git clone -l -s . cloned &&
-	( cd cloned && git ls-files -s ) >current &&
-	test_cmp expected current
-
-Cloning into 'cloned'...
-done.
-ok 9 - check if clone works
-
-expecting success: 
-	git update-index --force-remove -- sub2 &&
-	mv sub2 sub3 &&
-	git add sub3 &&
-	git commit -q -m "renaming a subproject" &&
-	test_expect_code 1 git diff -M --name-status --exit-code HEAD^ HEAD
-
-warning: adding embedded git repository: sub3
-hint: You've added another git repository inside your current repository.
-hint: Clones of the outer repository will not contain the contents of
-hint: the embedded repository and will not know how to obtain it.
-hint: If you meant to add a submodule, use:
-hint: 
-hint: 	git submodule add <url> sub3
-hint: 
-hint: If you added this path by mistake, you can remove it from the
-hint: index with:
-hint: 
-hint: 	git rm --cached sub3
-hint: 
-hint: See "git help submodule" for more information.
-R100	sub2	sub3
-ok 10 - removing and adding subproject
-
-expecting success: 
-	git checkout save &&
-	git diff-index --exit-code --raw --cached save -- sub1
-
-warning: unable to rmdir 'sub3': Directory not empty
-Switched to branch 'save'
-M	sub1
-ok 11 - checkout in superproject
-
-# passed all 11 test(s)
-1..11
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t3102-ls-tree-wildcards.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3102-ls-tree-wildcards/.git/
-expecting success: 
-	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) 5e843d5] 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: 
-	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: 
-	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: 
-	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/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t3103-ls-tree-misc.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3103-ls-tree-misc/.git/
-expecting success: 
-	mkdir a &&
-	touch a/one &&
-	git add a/one &&
-	git commit -m test
-
-[master (root-commit) 7cc6319] 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: 
-	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
-
-# passed all 2 test(s)
-1..2
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t3100-ls-tree-restrict.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3100-ls-tree-restrict/.git/
-expecting success: mkdir path2 path2/baz &&
-     echo Hi >path0 &&
-     test_ln_s_add path0 path1 &&
-     test_ln_s_add ../path1 path2/bazbo &&
-     echo Lo >path2/foo &&
-     echo Mi >path2/baz/b &&
-     find path? \( -type f -o -type l \) -print |
-     xargs git update-index --add &&
-     tree=$(git write-tree) &&
-     echo $tree
-checking prerequisite: SYMLINKS
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
-	# test whether the filesystem supports symbolic links
-	ln -s x y && test -h y
-
-)
-prerequisite SYMLINKS ok
-a384d4f8dd786f29d6da4705dee4c2c0bc6b5049
-ok 1 - setup
-
-expecting success: git ls-tree $tree >current &&
-     cat >expected <<\EOF &&
-100644 blob X	path0
-120000 blob X	path1
-040000 tree X	path2
-EOF
-     test_output
-ok 2 - ls-tree plain
-
-expecting success: git ls-tree -r $tree >current &&
-     cat >expected <<\EOF &&
-100644 blob X	path0
-120000 blob X	path1
-100644 blob X	path2/baz/b
-120000 blob X	path2/bazbo
-100644 blob X	path2/foo
-EOF
-     test_output
-ok 3 - ls-tree recursive
-
-expecting success: git ls-tree -r -t $tree >current &&
-     cat >expected <<\EOF &&
-100644 blob X	path0
-120000 blob X	path1
-040000 tree X	path2
-040000 tree X	path2/baz
-100644 blob X	path2/baz/b
-120000 blob X	path2/bazbo
-100644 blob X	path2/foo
-EOF
-     test_output
-ok 4 - ls-tree recursive with -t
-
-expecting success: git ls-tree -r -d $tree >current &&
-     cat >expected <<\EOF &&
-040000 tree X	path2
-040000 tree X	path2/baz
-EOF
-     test_output
-ok 5 - ls-tree recursive with -d
-
-expecting success: git ls-tree $tree path >current &&
-     cat >expected <<\EOF &&
-EOF
-     test_output
-ok 6 - ls-tree filtered with path
-
-expecting success: git ls-tree $tree path1 path0 >current &&
-     cat >expected <<\EOF &&
-100644 blob X	path0
-120000 blob X	path1
-EOF
-     test_output
-ok 7 - ls-tree filtered with path1 path0
-
-expecting success: git ls-tree $tree path0/ >current &&
-     cat >expected <<\EOF &&
-EOF
-     test_output
-ok 8 - ls-tree filtered with path0/
-
-expecting success: git ls-tree $tree path2 >current &&
-     cat >expected <<\EOF &&
-040000 tree X	path2
-EOF
-     test_output
-ok 9 - ls-tree filtered with path2
-
-expecting success: git ls-tree $tree path2/ >current &&
-     cat >expected <<\EOF &&
-040000 tree X	path2/baz
-120000 blob X	path2/bazbo
-100644 blob X	path2/foo
-EOF
-     test_output
-ok 10 - ls-tree filtered with path2/
-
-expecting success: git ls-tree $tree path2/baz >current &&
-     cat >expected <<\EOF &&
-040000 tree X	path2/baz
-EOF
-     test_output
-ok 11 - ls-tree filtered with path2/baz
-
-expecting success: git ls-tree $tree path2/bak >current &&
-     cat >expected <<\EOF &&
-EOF
-     test_output
-ok 12 - ls-tree filtered with path2/bak
-
-expecting success: git ls-tree -t $tree path2/bak >current &&
-     cat >expected <<\EOF &&
-040000 tree X	path2
-EOF
-     test_output
-ok 13 - ls-tree -t filtered with path2/bak
-
-expecting success: git ls-tree $tree path2/baz path2/bazbo >current &&
-     cat >expected <<\EOF &&
-040000 tree X	path2/baz
-120000 blob X	path2/bazbo
-EOF
-     test_output
-ok 14 - ls-tree with one path a prefix of the other
-
-# passed all 14 test(s)
-1..14
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
 *** t3007-ls-files-recurse-submodules.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3007-ls-files-recurse-submodules/.git/
 expecting success: 
@@ -54317,18 +54898,18 @@
 	git submodule add ./submodule &&
 	git commit -m "added submodule"
 
-[master (root-commit) 1aa11cb] add a and b
+[master (root-commit) f8e8046] 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/git-2.20.1/t/trash directory.t3007-ls-files-recurse-submodules/submodule/.git/
-[master (root-commit) 776dadc] add c
+[master (root-commit) 349dc88] 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 aab9a4c] added submodule
+[master 6c77251] added submodule
  Author: A U Thor <author@example.com>
  2 files changed, 4 insertions(+)
  create mode 100644 .gitmodules
@@ -54398,12 +54979,12 @@
 	test_cmp expect actual
 
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3007-ls-files-recurse-submodules/submodule/subsub/.git/
-[master (root-commit) b2befb6] add d
+[master (root-commit) dbb8dd1] 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 8e85831] added subsub
+[master 1d34109] added subsub
  Author: A U Thor <author@example.com>
  2 files changed, 4 insertions(+)
  create mode 100644 .gitmodules
@@ -54469,27 +55050,27 @@
 	git ls-files --recurse-submodules "*" >actual &&
 	test_cmp expect actual
 
-[master 3396a04] adding e.txt
+[master c919de7] adding e.txt
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 e.txt
-[master 9f3fbea] add f and g
+[master cd17e0e] 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 981a6b7] add h and sib/file
+[master 08f20d1] 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/git-2.20.1/t/trash directory.t3007-ls-files-recurse-submodules/sub/.git/
-[master (root-commit) b41cc5b] add file
+[master (root-commit) 38a289f] 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 7f46214] added sub
+[master 6418a3f] added sub
  Author: A U Thor <author@example.com>
  2 files changed, 4 insertions(+)
  create mode 160000 sub
@@ -54710,319 +55291,6 @@
 1..21
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t3101-ls-tree-dirname.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3101-ls-tree-dirname/.git/
-expecting success: 
-	echo 111 >1.txt &&
-	echo 222 >2.txt &&
-	mkdir path0 path0/a path0/a/b path0/a/b/c &&
-	echo 111 >path0/a/b/c/1.txt &&
-	mkdir path1 path1/b path1/b/c &&
-	echo 111 >path1/b/c/1.txt &&
-	mkdir path2 &&
-	echo 111 >path2/1.txt &&
-	mkdir path3 &&
-	echo 111 >path3/1.txt &&
-	echo 222 >path3/2.txt &&
-	find *.txt path* \( -type f -o -type l \) -print |
-	xargs git update-index --add &&
-	tree=$(git write-tree) &&
-	echo $tree
-
-ef2ea4d6de8ec0863f430e4cad7468ce74f60aa7
-ok 1 - setup
-
-expecting success: 
-	git ls-tree $tree >current &&
-	cat >expected <<\EOF &&
-100644 blob X	1.txt
-100644 blob X	2.txt
-040000 tree X	path0
-040000 tree X	path1
-040000 tree X	path2
-040000 tree X	path3
-EOF
-	test_output
-
-ok 2 - ls-tree plain
-
-expecting success: 
-	git ls-tree -r $tree >current &&
-	cat >expected <<\EOF &&
-100644 blob X	1.txt
-100644 blob X	2.txt
-100644 blob X	path0/a/b/c/1.txt
-100644 blob X	path1/b/c/1.txt
-100644 blob X	path2/1.txt
-100644 blob X	path3/1.txt
-100644 blob X	path3/2.txt
-EOF
-	test_output
-
-ok 3 - ls-tree recursive
-
-expecting success: 
-	git ls-tree $tree 1.txt >current &&
-	cat >expected <<\EOF &&
-100644 blob X	1.txt
-EOF
-	test_output
-
-ok 4 - ls-tree filter 1.txt
-
-expecting success: 
-	git ls-tree $tree path1/b/c/1.txt >current &&
-	cat >expected <<\EOF &&
-100644 blob X	path1/b/c/1.txt
-EOF
-	test_output
-
-ok 5 - ls-tree filter path1/b/c/1.txt
-
-expecting success: 
-	git ls-tree $tree 1.txt path0/a/b/c/1.txt \
-		path1/b/c/1.txt path2/1.txt path3/1.txt >current &&
-	cat >expected <<\EOF &&
-100644 blob X	1.txt
-100644 blob X	path0/a/b/c/1.txt
-100644 blob X	path1/b/c/1.txt
-100644 blob X	path2/1.txt
-100644 blob X	path3/1.txt
-EOF
-	test_output
-
-ok 6 - ls-tree filter all 1.txt files
-
-expecting success: 
-	git ls-tree $tree path3 path2 path0/a/b/c path1/b/c path0/a >current &&
-	cat >expected <<\EOF &&
-040000 tree X	path0/a/b/c
-040000 tree X	path1/b/c
-040000 tree X	path2
-040000 tree X	path3
-EOF
-	test_output
-
-ok 7 - ls-tree filter directories
-
-expecting success: 
-	git ls-tree $tree 1.txt ./1.txt .//1.txt \
-		path3/1.txt path3/./1.txt path3 path3// >current &&
-	cat >expected <<\EOF &&
-100644 blob X	1.txt
-100644 blob X	path3/1.txt
-100644 blob X	path3/2.txt
-EOF
-	test_output
-
-ok 8 - ls-tree filter odd names
-
-expecting success: 
-	git ls-tree $tree 1.txt/ abc.txt \
-		path3//23.txt path3/2.txt/// >current &&
-	>expected &&
-	test_output
-
-ok 9 - ls-tree filter missing files and extra slashes
-
-expecting success: 
-	git ls-tree $tree pa path3/a >current &&
-	>expected &&
-	test_output
-
-ok 10 - ls-tree filter is leading path match
-
-expecting success: 
-	(
-		cd path0 &&
-		git ls-tree --full-name $tree a
-	) >current &&
-	cat >expected <<\EOF &&
-040000 tree X	path0/a
-EOF
-	test_output
-
-ok 11 - ls-tree --full-name
-
-expecting success: 
-	(
-		cd path1/b/c &&
-		git ls-tree --full-tree $tree
-	) >current &&
-	cat >expected <<\EOF &&
-100644 blob X	1.txt
-100644 blob X	2.txt
-040000 tree X	path0
-040000 tree X	path1
-040000 tree X	path2
-040000 tree X	path3
-EOF
-	test_output
-
-ok 12 - ls-tree --full-tree
-
-expecting success: 
-	(
-		cd path3/ &&
-		git ls-tree --full-tree -r $tree
-	) >current &&
-	cat >expected <<\EOF &&
-100644 blob X	1.txt
-100644 blob X	2.txt
-100644 blob X	path0/a/b/c/1.txt
-100644 blob X	path1/b/c/1.txt
-100644 blob X	path2/1.txt
-100644 blob X	path3/1.txt
-100644 blob X	path3/2.txt
-EOF
-	test_output
-
-ok 13 - ls-tree --full-tree -r
-
-expecting success: 
-	git ls-tree --abbrev=5 $tree >current &&
-	sed -e "s/ $_x05[0-9a-f]*	/ X	/" <current >check &&
-	cat >expected <<\EOF &&
-100644 blob X	1.txt
-100644 blob X	2.txt
-040000 tree X	path0
-040000 tree X	path1
-040000 tree X	path2
-040000 tree X	path3
-EOF
-	test_cmp expected check
-
-ok 14 - ls-tree --abbrev=5
-
-expecting success: 
-	git ls-tree --name-only $tree >current &&
-	cat >expected <<\EOF &&
-1.txt
-2.txt
-path0
-path1
-path2
-path3
-EOF
-	test_output
-
-ok 15 - ls-tree --name-only
-
-expecting success: 
-	git ls-tree --name-only -r $tree >current &&
-	cat >expected <<\EOF &&
-1.txt
-2.txt
-path0/a/b/c/1.txt
-path1/b/c/1.txt
-path2/1.txt
-path3/1.txt
-path3/2.txt
-EOF
-	test_output
-
-ok 16 - ls-tree --name-only -r
-
-# passed all 16 test(s)
-1..16
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t3202-show-branch-octopus.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3202-show-branch-octopus/.git/
-expecting success: 
-
-	> file &&
-	git add file &&
-	test_tick &&
-	git commit -m initial &&
-
-	for i in $numbers
-	do
-		git checkout -b branch$i master &&
-		> file$i &&
-		git add file$i &&
-		test_tick &&
-		git commit -m branch$i || return 1
-	done
-
-
-[master (root-commit) 1bd44cb] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 file
-Switched to a new branch 'branch1'
-[branch1 eabeb5d] branch1
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 file1
-Switched to a new branch 'branch2'
-[branch2 b4fb685] branch2
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 file2
-Switched to a new branch 'branch3'
-[branch3 8334722] branch3
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 file3
-Switched to a new branch 'branch4'
-[branch4 142d8e4] branch4
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 file4
-Switched to a new branch 'branch5'
-[branch5 c5402b6] branch5
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 file5
-Switched to a new branch 'branch6'
-[branch6 d33aeab] branch6
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 file6
-Switched to a new branch 'branch7'
-[branch7 cb80438] branch7
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 file7
-Switched to a new branch 'branch8'
-[branch8 c922302] branch8
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 file8
-Switched to a new branch 'branch9'
-[branch9 fabe124] branch9
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 file9
-Switched to a new branch 'branch10'
-[branch10 4d9b8be] branch10
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 file10
-ok 1 - setup
-
-expecting success: 
-
-	git show-branch $(for i in $numbers; do echo branch$i; done) > out &&
-	test_cmp expect out
-
-
-ok 2 - show-branch with more than 8 branches
-
-expecting success: 
-	for i in $numbers; do
-		git config --add showbranch.default branch$i
-	done &&
-	git show-branch >out &&
-	test_cmp expect out
-
-ok 3 - show-branch with showbranch.default
-
-# passed all 3 test(s)
-1..3
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
 *** t3201-branch-contains.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3201-branch-contains/.git/
 expecting success: 
@@ -55666,496 +55934,85 @@
 1..13
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t3034-merge-recursive-rename-options.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3034-merge-recursive-rename-options/.git/
+*** t3211-peel-ref.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3211-peel-ref/.git/
 expecting success: 
-	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 master"
+	test_commit base &&
+	git tag -m annotated foo
 
-[master (root-commit) 7cc9263] base
- Author: A U Thor <author@example.com>
- 4 files changed, 16 insertions(+)
- create mode 100644 0-old
- create mode 100644 1-old
- create mode 100644 2-old
- create mode 100644 3-old
-rm '0-old'
-rm '1-old'
-rm '2-old'
-rm '3-old'
-[master 42119d8] delete
- Author: A U Thor <author@example.com>
- 4 files changed, 16 deletions(-)
- delete mode 100644 0-old
- delete mode 100644 1-old
- delete mode 100644 2-old
- delete mode 100644 3-old
-Switched to a new branch 'rename'
-rm '0-old'
-rm '1-old'
-rm '2-old'
-rm '3-old'
-[rename 1648762] rename
+[master (root-commit) d1ff1c9] base
  Author: A U Thor <author@example.com>
- 5 files changed, 7 insertions(+), 7 deletions(-)
- create mode 100644 0-new
- delete mode 100644 0-old
- rename 1-old => 1-new (50%)
- rename 2-old => 2-new (75%)
- rename 3-old => 3-new (100%)
-ok 1 - setup repo
-
-expecting success: 
-	git diff --name-status -M01 HEAD^ HEAD >diff-output &&
-	test_debug "cat diff-output" &&
-	test_line_count = 4 diff-output &&
-	grep "R[0-9][0-9][0-9]	\([0-3]\)-old	\1-new" diff-output \
-		>grep-output &&
-	test_cmp diff-output grep-output &&
-	th0=$(sed -n "s/R\(...\)	0-old	0-new/\1/p" <diff-output) &&
-	th1=$(sed -n "s/R\(...\)	1-old	1-new/\1/p" <diff-output) &&
-	th2=$(sed -n "s/R\(...\)	2-old	2-new/\1/p" <diff-output) &&
-	th3=$(sed -n "s/R\(...\)	3-old	3-new/\1/p" <diff-output) &&
-	test "$th0" -lt "$th1" &&
-	test "$th1" -lt "$th2" &&
-	test "$th2" -lt "$th3" &&
-	test "$th3" = 100 &&
-	if test 50 -le "$th0"
-	then
-		check_50=check_threshold_0
-	elif test 50 -le "$th1"
-	then
-		check_50=check_threshold_1
-	elif test 50 -le "$th2"
-	then
-		check_50=check_threshold_2
-	fi &&
-	th0="$th0%" &&
-	th1="$th1%" &&
-	th2="$th2%" &&
-	th3="$th3%"
-
-ok 2 - setup thresholds
-
-expecting success: 
-	git diff --name-status -M$th0 --diff-filter=R HEAD^ HEAD \
-		>diff-output-0 &&
-	git diff --name-status -M$th1 --diff-filter=R HEAD^ HEAD \
-		>diff-output-1 &&
-	git diff --name-status -M$th2 --diff-filter=R HEAD^ HEAD \
-		>diff-output-2 &&
-	git diff --name-status -M100% --diff-filter=R HEAD^ HEAD \
-		>diff-output-3 &&
-	test_line_count = 4 diff-output-0 &&
-	test_line_count = 3 diff-output-1 &&
-	test_line_count = 2 diff-output-2 &&
-	test_line_count = 1 diff-output-3
-
-ok 3 - assumption for tests: rename detection with diff
-
-expecting success: 
-	git read-tree --reset -u HEAD &&
-	test_must_fail git merge-recursive $tail &&
-	$check_50
-
-Merging HEAD with master
-Merging:
-1648762 rename
-42119d8 delete
-found 1 common ancestor:
-7cc9263 base
-CONFLICT (rename/delete): 3-old deleted in master and renamed to 3-new in HEAD. Version HEAD of 3-new left in tree.
-CONFLICT (rename/delete): 2-old deleted in master and renamed to 2-new in HEAD. Version HEAD of 2-new left in tree.
-CONFLICT (rename/delete): 1-old deleted in master and renamed to 1-new in HEAD. Version HEAD of 1-new left in tree.
-ok 4 - default similarity threshold is 50%
-
-expecting success: 
-	git read-tree --reset -u HEAD &&
-	test_must_fail git merge-recursive --find-renames=$th0 $tail &&
-	check_threshold_0
-
-Merging HEAD with master
-Merging:
-1648762 rename
-42119d8 delete
-found 1 common ancestor:
-7cc9263 base
-CONFLICT (rename/delete): 3-old deleted in master and renamed to 3-new in HEAD. Version HEAD of 3-new left in tree.
-CONFLICT (rename/delete): 2-old deleted in master and renamed to 2-new in HEAD. Version HEAD of 2-new left in tree.
-CONFLICT (rename/delete): 1-old deleted in master and renamed to 1-new in HEAD. Version HEAD of 1-new left in tree.
-CONFLICT (rename/delete): 0-old deleted in master and renamed to 0-new in HEAD. Version HEAD of 0-new left in tree.
-ok 5 - low rename threshold
-
-expecting success: 
-	git read-tree --reset -u HEAD &&
-	test_must_fail git merge-recursive --find-renames=$th1 $tail &&
-	check_threshold_1
-
-Merging HEAD with master
-Merging:
-1648762 rename
-42119d8 delete
-found 1 common ancestor:
-7cc9263 base
-CONFLICT (rename/delete): 3-old deleted in master and renamed to 3-new in HEAD. Version HEAD of 3-new left in tree.
-CONFLICT (rename/delete): 2-old deleted in master and renamed to 2-new in HEAD. Version HEAD of 2-new left in tree.
-CONFLICT (rename/delete): 1-old deleted in master and renamed to 1-new in HEAD. Version HEAD of 1-new left in tree.
-ok 6 - medium rename threshold
-
-expecting success: 
-	git read-tree --reset -u HEAD &&
-	test_must_fail git merge-recursive --find-renames=$th2 $tail &&
-	check_threshold_2
-
-Merging HEAD with master
-Merging:
-1648762 rename
-42119d8 delete
-found 1 common ancestor:
-7cc9263 base
-CONFLICT (rename/delete): 3-old deleted in master and renamed to 3-new in HEAD. Version HEAD of 3-new left in tree.
-CONFLICT (rename/delete): 2-old deleted in master and renamed to 2-new in HEAD. Version HEAD of 2-new left in tree.
-ok 7 - high rename threshold
-
-expecting success: 
-	git read-tree --reset -u HEAD &&
-	test_must_fail git merge-recursive --find-renames=100% $tail &&
-	check_exact_renames
-
-Merging HEAD with master
-Merging:
-1648762 rename
-42119d8 delete
-found 1 common ancestor:
-7cc9263 base
-CONFLICT (rename/delete): 3-old deleted in master and renamed to 3-new in HEAD. Version HEAD of 3-new left in tree.
-ok 8 - exact renames only
-
-expecting success: 
-	git read-tree --reset -u HEAD &&
-	test_must_fail git merge-recursive --find-renames=200% $tail &&
-	check_exact_renames
-
-Merging HEAD with master
-Merging:
-1648762 rename
-42119d8 delete
-found 1 common ancestor:
-7cc9263 base
-CONFLICT (rename/delete): 3-old deleted in master and renamed to 3-new in HEAD. Version HEAD of 3-new left in tree.
-ok 9 - rename threshold is truncated
-
-expecting success: 
-	git read-tree --reset -u HEAD &&
-	git merge-recursive --no-renames $tail &&
-	check_no_renames
-
-Merging HEAD with master
-Merging:
-1648762 rename
-42119d8 delete
-found 1 common ancestor:
-7cc9263 base
-ok 10 - disabled rename detection
-
-expecting success: 
-	git read-tree --reset -u HEAD &&
-	test_must_fail git merge-recursive \
-		--find-renames=$th0 --find-renames=$th2 $tail &&
-	check_threshold_2
-
-Merging HEAD with master
-Merging:
-1648762 rename
-42119d8 delete
-found 1 common ancestor:
-7cc9263 base
-CONFLICT (rename/delete): 3-old deleted in master and renamed to 3-new in HEAD. Version HEAD of 3-new left in tree.
-CONFLICT (rename/delete): 2-old deleted in master and renamed to 2-new in HEAD. Version HEAD of 2-new left in tree.
-ok 11 - last wins in --find-renames=<m> --find-renames=<n>
-
-expecting success: 
-	git read-tree --reset -u HEAD &&
-	test_must_fail git merge-recursive \
-		--find-renames=$th0 --find-renames $tail &&
-	$check_50
-
-Merging HEAD with master
-Merging:
-1648762 rename
-42119d8 delete
-found 1 common ancestor:
-7cc9263 base
-CONFLICT (rename/delete): 3-old deleted in master and renamed to 3-new in HEAD. Version HEAD of 3-new left in tree.
-CONFLICT (rename/delete): 2-old deleted in master and renamed to 2-new in HEAD. Version HEAD of 2-new left in tree.
-CONFLICT (rename/delete): 1-old deleted in master and renamed to 1-new in HEAD. Version HEAD of 1-new left in tree.
-ok 12 - --find-renames resets threshold
-
-expecting success: 
-	git read-tree --reset -u HEAD &&
-	test_must_fail git merge-recursive --no-renames --find-renames $tail &&
-	$check_50
-
-Merging HEAD with master
-Merging:
-1648762 rename
-42119d8 delete
-found 1 common ancestor:
-7cc9263 base
-CONFLICT (rename/delete): 3-old deleted in master and renamed to 3-new in HEAD. Version HEAD of 3-new left in tree.
-CONFLICT (rename/delete): 2-old deleted in master and renamed to 2-new in HEAD. Version HEAD of 2-new left in tree.
-CONFLICT (rename/delete): 1-old deleted in master and renamed to 1-new in HEAD. Version HEAD of 1-new left in tree.
-ok 13 - last wins in --no-renames --find-renames
-
-expecting success: 
-	git read-tree --reset -u HEAD &&
-	git merge-recursive --find-renames --no-renames $tail &&
-	check_no_renames
-
-Merging HEAD with master
-Merging:
-1648762 rename
-42119d8 delete
-found 1 common ancestor:
-7cc9263 base
-ok 14 - last wins in --find-renames --no-renames
-
-expecting success: 
-	git read-tree --reset -u HEAD &&
-	git merge-recursive HEAD -- HEAD HEAD &&
-	git diff --quiet --cached &&
-	git merge-recursive --find-renames=$th0 HEAD -- HEAD HEAD &&
-	git diff --quiet --cached &&
-	git merge-recursive --find-renames=$th2 HEAD -- HEAD HEAD &&
-	git diff --quiet --cached &&
-	git merge-recursive --find-renames=100% HEAD -- HEAD HEAD &&
-	git diff --quiet --cached &&
-	git merge-recursive --no-renames HEAD -- HEAD HEAD &&
-	git diff --quiet --cached
-
-Merging HEAD with HEAD
-Merging:
-1648762 rename
-1648762 rename
-found 1 common ancestor:
-1648762 rename
-Already up to date!
-Merging HEAD with HEAD
-Merging:
-1648762 rename
-1648762 rename
-found 1 common ancestor:
-1648762 rename
-Already up to date!
-Merging HEAD with HEAD
-Merging:
-1648762 rename
-1648762 rename
-found 1 common ancestor:
-1648762 rename
-Already up to date!
-Merging HEAD with HEAD
-Merging:
-1648762 rename
-1648762 rename
-found 1 common ancestor:
-1648762 rename
-Already up to date!
-Merging HEAD with HEAD
-Merging:
-1648762 rename
-1648762 rename
-found 1 common ancestor:
-1648762 rename
-Already up to date!
-ok 15 - assumption for further tests: trivial merge succeeds
-
-expecting success: 
-	git read-tree --reset -u HEAD &&
-	test_must_fail git merge-recursive --find-renames=-25 \
-		HEAD -- HEAD HEAD &&
-	git diff --quiet --cached
-
-fatal: unknown option --find-renames=-25
-ok 16 - --find-renames rejects negative argument
-
-expecting success: 
-	git read-tree --reset -u HEAD &&
-	test_must_fail git merge-recursive --find-renames=0xf \
-		HEAD -- HEAD HEAD &&
-	git diff --quiet --cached
-
-fatal: unknown option --find-renames=0xf
-ok 17 - --find-renames rejects non-numbers
-
-expecting success: 
-	git read-tree --reset -u HEAD &&
-	test_must_fail git merge-recursive --rename-threshold=$th0 $tail &&
-	check_threshold_0
-
-Merging HEAD with master
-Merging:
-1648762 rename
-42119d8 delete
-found 1 common ancestor:
-7cc9263 base
-CONFLICT (rename/delete): 3-old deleted in master and renamed to 3-new in HEAD. Version HEAD of 3-new left in tree.
-CONFLICT (rename/delete): 2-old deleted in master and renamed to 2-new in HEAD. Version HEAD of 2-new left in tree.
-CONFLICT (rename/delete): 1-old deleted in master and renamed to 1-new in HEAD. Version HEAD of 1-new left in tree.
-CONFLICT (rename/delete): 0-old deleted in master and renamed to 0-new in HEAD. Version HEAD of 0-new left in tree.
-ok 18 - rename-threshold=<n> is a synonym for find-renames=<n>
-
-expecting success: 
-	git read-tree --reset -u HEAD &&
-	test_must_fail git merge-recursive --no-renames --rename-threshold=$th0 $tail &&
-	check_threshold_0
-
-Merging HEAD with master
-Merging:
-1648762 rename
-42119d8 delete
-found 1 common ancestor:
-7cc9263 base
-CONFLICT (rename/delete): 3-old deleted in master and renamed to 3-new in HEAD. Version HEAD of 3-new left in tree.
-CONFLICT (rename/delete): 2-old deleted in master and renamed to 2-new in HEAD. Version HEAD of 2-new left in tree.
-CONFLICT (rename/delete): 1-old deleted in master and renamed to 1-new in HEAD. Version HEAD of 1-new left in tree.
-CONFLICT (rename/delete): 0-old deleted in master and renamed to 0-new in HEAD. Version HEAD of 0-new left in tree.
-ok 19 - last wins in --no-renames --rename-threshold=<n>
-
-expecting success: 
-	git read-tree --reset -u HEAD &&
-	git merge-recursive --rename-threshold=$th0 --no-renames $tail &&
-	check_no_renames
-
-Merging HEAD with master
-Merging:
-1648762 rename
-42119d8 delete
-found 1 common ancestor:
-7cc9263 base
-ok 20 - last wins in --rename-threshold=<n> --no-renames
+ 1 file changed, 1 insertion(+)
+ create mode 100644 base.t
+ok 1 - create annotated tag in refs/tags
 
 expecting success: 
-	git read-tree --reset -u HEAD &&
-	test_must_fail git merge-recursive --rename-threshold=-25 \
-		HEAD -- HEAD HEAD &&
-	git diff --quiet --cached
+	git update-ref refs/outside/foo refs/tags/foo
 
-fatal: unknown option --rename-threshold=-25
-ok 21 - --rename-threshold=<n> rejects negative argument
+ok 2 - create annotated tag outside of refs/tags
 
 expecting success: 
-	git read-tree --reset -u HEAD &&
-	test_must_fail git merge-recursive --rename-threshold=0xf \
-		HEAD -- HEAD HEAD &&
-	git diff --quiet --cached
+	{
+		print_ref "refs/heads/master" &&
+		print_ref "refs/outside/foo" &&
+		print_ref "refs/outside/foo^{}" &&
+		print_ref "refs/tags/base" &&
+		print_ref "refs/tags/foo" &&
+		print_ref "refs/tags/foo^{}"
+	} >expect
 
-fatal: unknown option --rename-threshold=0xf
-ok 22 - --rename-threshold=<n> rejects non-numbers
+ok 3 - set up expected show-ref output
 
 expecting success: 
-	git read-tree --reset -u HEAD &&
-	test_must_fail git merge-recursive \
-		--rename-threshold=$th0 --find-renames=$th2 $tail &&
-	check_threshold_2
+	git show-ref -d >actual &&
+	test_cmp expect actual
 
-Merging HEAD with master
-Merging:
-1648762 rename
-42119d8 delete
-found 1 common ancestor:
-7cc9263 base
-CONFLICT (rename/delete): 3-old deleted in master and renamed to 3-new in HEAD. Version HEAD of 3-new left in tree.
-CONFLICT (rename/delete): 2-old deleted in master and renamed to 2-new in HEAD. Version HEAD of 2-new left in tree.
-ok 23 - last wins in --rename-threshold=<m> --find-renames=<n>
+ok 4 - refs are peeled outside of refs/tags (loose)
 
 expecting success: 
-	git read-tree --reset -u HEAD &&
-	test_must_fail git merge-recursive \
-		--find-renames=$th2 --rename-threshold=$th0 $tail &&
-	check_threshold_0
+	git pack-refs --all &&
+	git show-ref -d >actual &&
+	test_cmp expect actual
 
-Merging HEAD with master
-Merging:
-1648762 rename
-42119d8 delete
-found 1 common ancestor:
-7cc9263 base
-CONFLICT (rename/delete): 3-old deleted in master and renamed to 3-new in HEAD. Version HEAD of 3-new left in tree.
-CONFLICT (rename/delete): 2-old deleted in master and renamed to 2-new in HEAD. Version HEAD of 2-new left in tree.
-CONFLICT (rename/delete): 1-old deleted in master and renamed to 1-new in HEAD. Version HEAD of 1-new left in tree.
-CONFLICT (rename/delete): 0-old deleted in master 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>
+ok 5 - refs are peeled outside of refs/tags (packed)
 
 expecting success: 
-	git read-tree --reset -u HEAD &&
-	git -c merge.renames=false merge-recursive $tail &&
-	check_no_renames
+	# Git no longer writes without fully-peeled, so we just write our own
+	# from scratch; we could also munge the existing file to remove the
+	# fully-peeled bits, but that seems even more prone to failure,
+	# especially if the format ever changes again. At least this way we
+	# know we are emulating exactly what an older git would have written.
+	{
+		echo "# pack-refs with: peeled " &&
+		print_ref "refs/heads/master" &&
+		print_ref "refs/outside/foo" &&
+		print_ref "refs/tags/base" &&
+		print_ref "refs/tags/foo" &&
+		echo "^$(git rev-parse "refs/tags/foo^{}")"
+	} >tmp &&
+	mv tmp .git/packed-refs
 
-Merging HEAD with master
-Merging:
-1648762 rename
-42119d8 delete
-found 1 common ancestor:
-7cc9263 base
-ok 25 - merge.renames disables rename detection
+ok 6 - create old-style pack-refs without fully-peeled
 
 expecting success: 
-	git read-tree --reset -u HEAD &&
-	git -c diff.renames=false merge-recursive $tail &&
-	check_no_renames
+	git show-ref -d >actual &&
+	test_cmp expect actual
 
-Merging HEAD with master
-Merging:
-1648762 rename
-42119d8 delete
-found 1 common ancestor:
-7cc9263 base
-ok 26 - merge.renames defaults to diff.renames
+ok 7 - refs are peeled outside of refs/tags (old packed)
 
 expecting success: 
-	git read-tree --reset -u HEAD &&
-	test_must_fail git -c diff.renames=false -c merge.renames=true merge-recursive $tail &&
-	$check_50
+	git pack-refs --all &&
+	cp .git/packed-refs fully-peeled &&
+	git branch yadda &&
+	git pack-refs --all &&
+	git branch -d yadda &&
+	test_cmp fully-peeled .git/packed-refs
 
-Merging HEAD with master
-Merging:
-1648762 rename
-42119d8 delete
-found 1 common ancestor:
-7cc9263 base
-CONFLICT (rename/delete): 3-old deleted in master and renamed to 3-new in HEAD. Version HEAD of 3-new left in tree.
-CONFLICT (rename/delete): 2-old deleted in master and renamed to 2-new in HEAD. Version HEAD of 2-new left in tree.
-CONFLICT (rename/delete): 1-old deleted in master and renamed to 1-new in HEAD. Version HEAD of 1-new left in tree.
-ok 27 - merge.renames overrides diff.renames
+Deleted branch yadda (was d1ff1c9).
+ok 8 - peeled refs survive deletion of packed ref
 
-# passed all 27 test(s)
-1..27
+# passed all 8 test(s)
+1..8
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
 *** t2025-worktree-add.sh ***
@@ -58095,8 +57952,8 @@
 found 1 common ancestor:
 88eeecf initial
 Merge made by the 'recursive' strategy.
---- expected	2021-12-03 05:05:12.383828473 +0000
-+++ actual	2021-12-03 05:05:12.379828590 +0000
+--- expected	2023-01-05 11:47:14.806868030 +0000
++++ actual	2023-01-05 11:47:14.806868030 +0000
 @@ -1,9 +1,7 @@
 -120000 blob 9cbe6ea56f225388ae614c419249bfc6d734cc30	a
  100644 blob ce013625030ba8dba906f756967f9e9ca394464a	b
@@ -58145,7 +58002,7 @@
 rm 'c'
 rm 'd/e'
 rm 'e'
-[main 6f4e09b] base
+[main 13f1ca6] base
  Author: A U Thor <author@example.com>
  20 files changed, 38 insertions(+), 1 deletion(-)
  create mode 100644 actual
@@ -58169,12 +58026,12 @@
  create mode 100644 theirs-has-rename-index
  rename {d => theirs-has-rename-work}/e (100%)
 Switched to a new branch 'other'
-[other 7a0ca9e] changesimplefile
+[other 9ff1aa7] changesimplefile
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 Switched to branch 'main'
 rm 'sub1'
-[main 65db553] changefiletodir
+[main 779a896] changefiletodir
  Author: A U Thor <author@example.com>
  4 files changed, 1 deletion(-)
  delete mode 100644 sub1
@@ -58182,10 +58039,10 @@
  rename {sub2 => sub1}/file2 (100%)
  rename {sub2 => sub1}/file3 (100%)
 Merging:
-65db553 changefiletodir
+779a896 changefiletodir
 virtual other
 found 1 common ancestor:
-6f4e09b base
+13f1ca6 base
 Skipped sub1/file3 (merged same as existing)
 Skipped sub1/file2 (merged same as existing)
 Skipped sub1/file1 (merged same as existing)
@@ -58211,7 +58068,7 @@
 	sed -n "s/^virtual //p" out | sort >actual &&
 	test_cmp expect actual
 
-HEAD is now at 78a9b17 Merge branch 'other' into main
+HEAD is now at be48f36 Merge branch 'other' into main
 error: Your local changes to the following files would be overwritten by merge:
   a actual actual-err actual-files a~b7f3e7f677ef7001dcb4b810583c9259a210141d a~b7f3e7f677ef7001dcb4b810583c9259a210141d_0 b c d/e d~9d284b3a95aea72df4581977e913e55da89d5e3d d~9d284b3a95aea72df4581977e913e55da89d5e3d_0 expected expected-files ours-has-rename-index ours-has-rename-work/b/c out simple/bar sub1/file1 sub1/file2 sub1/file3 theirs-has-rename-index theirs-has-rename-work/e
 ok 35 - merge-recursive remembers the names of all base trees
@@ -58265,30 +58122,30 @@
 
 	git merge $B
 
-HEAD is now at 78a9b17 Merge branch 'other' into main
-[main 53b8e10] O0
+HEAD is now at be48f36 Merge branch 'other' into main
+[main ae960c7] O0
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 file
-[main afad821] O1
+[main 9df5113] O1
  Author: A U Thor <author@example.com>
-HEAD is now at 53b8e10 O0
-[main 5624e4e] O2
+HEAD is now at ae960c7 O0
+[main e98e67c] O2
  Author: A U Thor <author@example.com>
 Merge made by the 'ours' strategy.
-HEAD is now at afad821 O1
+HEAD is now at 9df5113 O1
 Merge made by the 'ours' strategy.
 Merging:
-c16be77 Merge commit '5624e4e0c1826b0915344e60e86030f7953cf612' into main
-virtual 9fa83c431fed187fe8016956545ea025122cbb27
+3335c49 Merge commit 'e98e67cf618201310d7aa49cacf0a08272f7929a' into main
+virtual 145cf83e5fcba05f49c37062c2a505ebdf33595d
 found 2 common ancestors:
-afad821 O1
-5624e4e O2
+9df5113 O1
+e98e67c O2
   Merging:
-  afad821 O1
-  5624e4e O2
+  9df5113 O1
+  e98e67c O2
   found 1 common ancestor:
-  53b8e10 O0
+  ae960c7 O0
   Already up to date!
 Already up to date!
 Merge made by the 'recursive' strategy.
@@ -58299,408 +58156,341 @@
 1..36
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t3211-peel-ref.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3211-peel-ref/.git/
+*** t3206-range-diff.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3206-range-diff/.git/
 expecting success: 
-	test_commit base &&
-	git tag -m annotated foo
-
-[master (root-commit) d1ff1c9] base
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 base.t
-ok 1 - create annotated tag in refs/tags
+	git fast-import < "$TEST_DIRECTORY"/t3206/history.export
 
-expecting success: 
-	git update-ref refs/outside/foo refs/tags/foo
+/build/git-2.20.1/git-fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:       5000
+Total objects:           64 (        17 duplicates                  )
+      blobs  :           13 (         0 duplicates          0 deltas of         11 attempts)
+      trees  :           17 (        17 duplicates          1 deltas of         16 attempts)
+      commits:           34 (         0 duplicates          0 deltas of          0 attempts)
+      tags   :            0 (         0 duplicates          0 deltas of          0 attempts)
+Total branches:           9 (        10 loads     )
+      marks:           1024 (        47 unique    )
+      atoms:              2
+Memory total:          2344 KiB
+       pools:          2110 KiB
+     objects:           234 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize = 1073741824
+pack_report: core.packedGitLimit      = 35184372088832
+pack_report: pack_used_ctr            =         17
+pack_report: pack_mmap_calls          =         10
+pack_report: pack_open_windows        =          0 /          1
+pack_report: pack_mapped              =          0 /       6777
+---------------------------------------------------------------------
 
-ok 2 - create annotated tag outside of refs/tags
+ok 1 - setup
 
 expecting success: 
-	{
-		print_ref "refs/heads/master" &&
-		print_ref "refs/outside/foo" &&
-		print_ref "refs/outside/foo^{}" &&
-		print_ref "refs/tags/base" &&
-		print_ref "refs/tags/foo" &&
-		print_ref "refs/tags/foo^{}"
-	} >expect
+	git range-diff --no-color master..topic master..unmodified \
+		>actual &&
+	cat >expected <<-EOF &&
+	1:  4de457d = 1:  35b9b25 s/5/A/
+	2:  fccce22 = 2:  de345ab s/4/A/
+	3:  147e64e = 3:  9af6654 s/11/B/
+	4:  a63e992 = 4:  2901f77 s/12/B/
+	EOF
+	test_cmp expected actual
 
-ok 3 - set up expected show-ref output
+ok 2 - simple A..B A..C (unmodified)
 
 expecting success: 
-	git show-ref -d >actual &&
-	test_cmp expect actual
+	git range-diff --no-color topic...unmodified >actual &&
+	# same "expected" as above
+	test_cmp expected actual
 
-ok 4 - refs are peeled outside of refs/tags (loose)
+ok 3 - simple B...C (unmodified)
 
 expecting success: 
-	git pack-refs --all &&
-	git show-ref -d >actual &&
-	test_cmp expect actual
+	git range-diff --no-color master topic unmodified >actual &&
+	# same "expected" as above
+	test_cmp expected actual
 
-ok 5 - refs are peeled outside of refs/tags (packed)
+ok 4 - simple A B C (unmodified)
 
 expecting success: 
-	# Git no longer writes without fully-peeled, so we just write our own
-	# from scratch; we could also munge the existing file to remove the
-	# fully-peeled bits, but that seems even more prone to failure,
-	# especially if the format ever changes again. At least this way we
-	# know we are emulating exactly what an older git would have written.
-	{
-		echo "# pack-refs with: peeled " &&
-		print_ref "refs/heads/master" &&
-		print_ref "refs/outside/foo" &&
-		print_ref "refs/tags/base" &&
-		print_ref "refs/tags/foo" &&
-		echo "^$(git rev-parse "refs/tags/foo^{}")"
-	} >tmp &&
-	mv tmp .git/packed-refs
+	git range-diff --no-color master topic reordered >actual &&
+	cat >expected <<-EOF &&
+	1:  4de457d = 1:  aca177a s/5/A/
+	3:  147e64e = 2:  14ad629 s/11/B/
+	4:  a63e992 = 3:  ee58208 s/12/B/
+	2:  fccce22 = 4:  307b27a s/4/A/
+	EOF
+	test_cmp expected actual
 
-ok 6 - create old-style pack-refs without fully-peeled
+ok 5 - trivial reordering
 
 expecting success: 
-	git show-ref -d >actual &&
-	test_cmp expect actual
+	git range-diff --no-color master topic removed >actual &&
+	cat >expected <<-EOF &&
+	1:  4de457d = 1:  7657159 s/5/A/
+	2:  fccce22 < -:  ------- s/4/A/
+	3:  147e64e = 2:  43d84d3 s/11/B/
+	4:  a63e992 = 3:  a740396 s/12/B/
+	EOF
+	test_cmp expected actual
 
-ok 7 - refs are peeled outside of refs/tags (old packed)
+ok 6 - removed a commit
 
 expecting success: 
-	git pack-refs --all &&
-	cp .git/packed-refs fully-peeled &&
-	git branch yadda &&
-	git pack-refs --all &&
-	git branch -d yadda &&
-	test_cmp fully-peeled .git/packed-refs
+	git range-diff --no-color master topic added >actual &&
+	cat >expected <<-EOF &&
+	1:  4de457d = 1:  2716022 s/5/A/
+	2:  fccce22 = 2:  b62accd s/4/A/
+	-:  ------- > 3:  df46cfa s/6/A/
+	3:  147e64e = 4:  3e64548 s/11/B/
+	4:  a63e992 = 5:  12b4063 s/12/B/
+	EOF
+	test_cmp expected actual
 
-Deleted branch yadda (was d1ff1c9).
-ok 8 - peeled refs survive deletion of packed ref
-
-# passed all 8 test(s)
-1..8
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t3203-branch-output.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3203-branch-output/.git/
-expecting success: 
-	echo content >file &&
-	git add file &&
-	git commit -m one &&
-	echo content >>file &&
-	git commit -a -m two
-
-[master (root-commit) d57afb5] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-[master cb134fd] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 1 - make commits
-
-expecting success: 
-	git branch branch-one &&
-	git branch branch-two HEAD^
-
-ok 2 - make branches
-
-expecting success: 
-	git update-ref refs/remotes/origin/branch-one branch-one &&
-	git update-ref refs/remotes/origin/branch-two branch-two &&
-	git symbolic-ref refs/remotes/origin/HEAD refs/remotes/origin/branch-one
-
-ok 3 - make remote branches
-
-expecting success: 
-	git branch >actual &&
-	test_cmp expect actual
-
-ok 4 - git branch shows local branches
-
-expecting success: 
-	git branch --list >actual &&
-	test_cmp expect actual
-
-ok 5 - git branch --list shows local branches
-
-expecting success: 
-	git branch --list branch* >actual &&
-	test_cmp expect actual
-
-ok 6 - git branch --list pattern shows matching local branches
-
-expecting success: 
-	git branch -r >actual &&
-	test_cmp expect actual
-
-ok 7 - git branch -r shows remote branches
-
-expecting success: 
-	git branch -a >actual &&
-	test_cmp expect actual
-
-ok 8 - git branch -a shows local and remote branches
-
-expecting success: 
-	git branch -v >tmp &&
-	awk "{print \$NF}" <tmp >actual &&
-	test_cmp expect actual
-
-ok 9 - git branch -v shows branch summaries
-
-expecting success: 
-	git branch --list -v branch* >tmp &&
-	awk "{print \$NF}" <tmp >actual &&
-	test_cmp expect actual
-
-ok 10 - git branch --list -v pattern shows branch summaries
-
-expecting success: 
-	git branch --list --ignore-case -v BRANCH* >tmp &&
-	awk "{print \$NF}" <tmp >actual &&
-	test_cmp expect actual
-
-ok 11 - git branch --ignore-case --list -v pattern shows branch summaries
-
-expecting success: 
-	test_must_fail git branch -v branch*
-
-fatal: 'branch*' is not a valid branch name.
-ok 12 - git branch -v pattern does not show branch summaries
-
-expecting success: 
-	cat >expect <<EOF &&
-* (HEAD detached at $(git rev-parse --short HEAD^0))
-  branch-one
-  branch-two
-  master
-EOF
-	git checkout HEAD^0 &&
-	git branch >actual &&
-	test_i18ncmp expect actual
-
-Note: checking out '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 performing another checkout.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
-
-  git checkout -b <new-branch-name>
-
-HEAD is now at cb134fd two
-ok 13 - git branch shows detached HEAD properly
-
-expecting success: 
-	git checkout master &&
-	cat >expect <<EOF &&
-* (HEAD detached at $(git rev-parse --short HEAD^0))
-  branch-one
-  branch-two
-  master
-EOF
-	git checkout --detach &&
-	git branch >actual &&
-	test_i18ncmp expect actual
-
-Switched to branch 'master'
-HEAD is now at cb134fd two
-ok 14 - git branch shows detached HEAD properly after checkout --detach
+ok 7 - added a commit
 
 expecting success: 
-	cat >expect <<EOF &&
-* (HEAD detached from $(git rev-parse --short HEAD))
-  branch-one
-  branch-two
-  master
-EOF
-	git reset --hard HEAD^1 &&
-	git branch >actual &&
-	test_i18ncmp expect actual
-
-HEAD is now at d57afb5 one
-ok 15 - git branch shows detached HEAD properly after moving
-
-expecting success: 
-	cat >expect <<EOF &&
-* (HEAD detached at fromtag)
-  branch-one
-  branch-two
-  master
-EOF
-	git tag fromtag master &&
-	git checkout fromtag &&
-	git branch >actual &&
-	test_i18ncmp expect actual
+	git range-diff --no-color master topic rebased >actual &&
+	cat >expected <<-EOF &&
+	1:  4de457d = 1:  cc9c443 s/5/A/
+	2:  fccce22 = 2:  c5d9641 s/4/A/
+	3:  147e64e = 3:  28cc2b6 s/11/B/
+	4:  a63e992 = 4:  5628ab7 s/12/B/
+	EOF
+	test_cmp expected actual
 
-Previous HEAD position was d57afb5 one
-HEAD is now at cb134fd two
-ok 16 - git branch shows detached HEAD properly from tag
+ok 8 - new base, A B C
 
 expecting success: 
-	cat >expect <<EOF &&
-* (HEAD detached from fromtag)
-  branch-one
-  branch-two
-  master
-EOF
-	git reset --hard HEAD^1 &&
-	git branch >actual &&
-	test_i18ncmp expect actual
+	# this syntax includes the commits from master!
+	git range-diff --no-color topic...rebased >actual &&
+	cat >expected <<-EOF &&
+	-:  ------- > 1:  a31b12e unrelated
+	1:  4de457d = 2:  cc9c443 s/5/A/
+	2:  fccce22 = 3:  c5d9641 s/4/A/
+	3:  147e64e = 4:  28cc2b6 s/11/B/
+	4:  a63e992 = 5:  5628ab7 s/12/B/
+	EOF
+	test_cmp expected actual
 
-HEAD is now at d57afb5 one
-ok 17 - git branch shows detached HEAD properly after moving from tag
+ok 9 - new base, B...C
 
 expecting success: 
-	cat >expect <<-\EOF &&
-	* (HEAD detached from fromtag)
-	  branch-two
-	  branch-one
-	  master
+	git range-diff --no-color topic...changed >actual &&
+	cat >expected <<-EOF &&
+	1:  4de457d = 1:  a4b3333 s/5/A/
+	2:  fccce22 = 2:  f51d370 s/4/A/
+	3:  147e64e ! 3:  0559556 s/11/B/
+	    @@ -10,7 +10,7 @@
+	      9
+	      10
+	     -11
+	    -+B
+	    ++BB
+	      12
+	      13
+	      14
+	4:  a63e992 ! 4:  d966c5c s/12/B/
+	    @@ -8,7 +8,7 @@
+	     @@
+	      9
+	      10
+	    - B
+	    + BB
+	     -12
+	     +B
+	      13
 	EOF
-	git branch --sort=objectsize >actual &&
-	test_i18ncmp expect actual
+	test_cmp expected actual
 
-ok 18 - git branch `--sort` option
+ok 10 - changed commit
 
 expecting success: 
-	cat >expect <<-\EOF &&
-	  branch-one
-	  master
+	git range-diff --no-color --no-patch topic...changed >actual &&
+	cat >expected <<-EOF &&
+	1:  4de457d = 1:  a4b3333 s/5/A/
+	2:  fccce22 = 2:  f51d370 s/4/A/
+	3:  147e64e ! 3:  0559556 s/11/B/
+	4:  a63e992 ! 4:  d966c5c s/12/B/
 	EOF
-	git branch --points-at=branch-one >actual &&
-	test_cmp expect actual
+	test_cmp expected actual
 
-ok 19 - git branch --points-at option
+ok 11 - changed commit with --no-patch diff option
 
 expecting success: 
-	git tag ambiguous &&
-	git branch ambiguous &&
-	echo "  ambiguous" >expect &&
-	git branch --list ambiguous >actual &&
-	test_cmp expect actual
+	git range-diff --no-color --stat topic...changed >actual &&
+	cat >expected <<-EOF &&
+	1:  4de457d = 1:  a4b3333 s/5/A/
+	     a => b | 0
+	     1 file changed, 0 insertions(+), 0 deletions(-)
+	2:  fccce22 = 2:  f51d370 s/4/A/
+	     a => b | 0
+	     1 file changed, 0 insertions(+), 0 deletions(-)
+	3:  147e64e ! 3:  0559556 s/11/B/
+	     a => b | 0
+	     1 file changed, 0 insertions(+), 0 deletions(-)
+	4:  a63e992 ! 4:  d966c5c s/12/B/
+	     a => b | 0
+	     1 file changed, 0 insertions(+), 0 deletions(-)
+	EOF
+	test_cmp expected actual
 
-ok 20 - ambiguous branch/tag not marked
+ok 12 - changed commit with --stat diff option
 
 expecting success: 
-	git symbolic-ref refs/heads/ref-to-branch refs/heads/branch-one &&
-	git symbolic-ref refs/heads/ref-to-remote refs/remotes/origin/branch-one &&
-	cat >expect <<-\EOF &&
-	  ref-to-branch -> branch-one
-	  ref-to-remote -> origin/branch-one
+	git range-diff --no-color --submodule=log topic...changed >actual &&
+	cat >expected <<-EOF &&
+	1:  4de457d = 1:  a4b3333 s/5/A/
+	2:  fccce22 = 2:  f51d370 s/4/A/
+	3:  147e64e ! 3:  0559556 s/11/B/
+	    @@ -10,7 +10,7 @@
+	      9
+	      10
+	     -11
+	    -+B
+	    ++BB
+	      12
+	      13
+	      14
+	4:  a63e992 ! 4:  d966c5c s/12/B/
+	    @@ -8,7 +8,7 @@
+	     @@
+	      9
+	      10
+	    - B
+	    + BB
+	     -12
+	     +B
+	      13
 	EOF
-	git branch >actual.raw &&
-	grep ref-to <actual.raw >actual &&
-	test_cmp expect actual
+	test_cmp expected actual
 
-ok 21 - local-branch symrefs shortened properly
+ok 13 - changed commit with sm config
 
 expecting success: 
-	(
-		git init sort-icase &&
-		cd sort-icase &&
-		test_commit initial &&
-		git branch branch-one &&
-		git branch BRANCH-two &&
-		git branch --list | awk "{print \$NF}" >actual &&
-		cat >expected <<-\EOF &&
-		BRANCH-two
-		branch-one
-		master
-		EOF
-		test_cmp expected actual &&
-		git branch --list -i | awk "{print \$NF}" >actual &&
-		cat >expected <<-\EOF &&
-		branch-one
-		BRANCH-two
-		master
-		EOF
-		test_cmp expected actual
-	)
+	git commit --amend -m "new message" &&
+	git range-diff master HEAD@{1} HEAD
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3203-branch-output/sort-icase/.git/
-[master (root-commit) 24b24cf] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-ok 22 - sort branches, ignore case
+[master 8753efc] new message
+ Author: Thomas Rast <trast@inf.ethz.ch>
+ Date: Mon Jul 22 11:25:27 2013 +0200
+ 1 file changed, 20 deletions(-)
+ delete mode 100644 file
+1:  a31b12e < -:  ------- unrelated
+ok 14 - no commits on one side
 
 expecting success: 
-	cat >expect <<-\EOF &&
-	Refname is (HEAD detached from fromtag)
-	Refname is refs/heads/ambiguous
-	Refname is refs/heads/branch-one
-	Refname is refs/heads/branch-two
-	Refname is refs/heads/master
-	Refname is refs/heads/ref-to-branch
-	Refname is refs/heads/ref-to-remote
+	git range-diff --no-color topic...changed-message >actual &&
+	sed s/Z/\ /g >expected <<-EOF &&
+	1:  4de457d = 1:  f686024 s/5/A/
+	2:  fccce22 ! 2:  4ab067d s/4/A/
+	    @@ -2,6 +2,8 @@
+	    Z
+	    Z    s/4/A/
+	    Z
+	    +    Also a silly comment here!
+	    +
+	    Z diff --git a/file b/file
+	    Z --- a/file
+	    Z +++ b/file
+	3:  147e64e = 3:  b9cb956 s/11/B/
+	4:  a63e992 = 4:  8add5f1 s/12/B/
 	EOF
-	git branch --format="Refname is %(refname)" >actual &&
-	test_i18ncmp expect actual
+	test_cmp expected actual
 
-ok 23 - git branch --format option
+ok 15 - changed message
 
 expecting success: 
-	echo "<RED>master<RESET>" >expect.color &&
-	echo "master" >expect.bare &&
-	color_args="--format=%(color:red)%(refname:short) --list master"
+	sed -e "s|^:||" >expect <<-\EOF &&
+	:<YELLOW>1:  a4b3333 = 1:  f686024 s/5/A/<RESET>
+	:<RED>2:  f51d370 <RESET><YELLOW>!<RESET><GREEN> 2:  4ab067d<RESET><YELLOW> s/4/A/<RESET>
+	:    <REVERSE><CYAN>@@ -2,6 +2,8 @@<RESET>
+	:     <RESET>
+	:         s/4/A/<RESET>
+	:     <RESET>
+	:    <REVERSE><GREEN>+<RESET><BOLD>    Also a silly comment here!<RESET>
+	:    <REVERSE><GREEN>+<RESET>
+	:      diff --git a/file b/file<RESET>
+	:      --- a/file<RESET>
+	:      +++ b/file<RESET>
+	:<RED>3:  0559556 <RESET><YELLOW>!<RESET><GREEN> 3:  b9cb956<RESET><YELLOW> s/11/B/<RESET>
+	:    <REVERSE><CYAN>@@ -10,7 +10,7 @@<RESET>
+	:      9<RESET>
+	:      10<RESET>
+	:    <RED> -11<RESET>
+	:    <REVERSE><RED>-<RESET><FAINT;GREEN>+BB<RESET>
+	:    <REVERSE><GREEN>+<RESET><BOLD;GREEN>+B<RESET>
+	:      12<RESET>
+	:      13<RESET>
+	:      14<RESET>
+	:<RED>4:  d966c5c <RESET><YELLOW>!<RESET><GREEN> 4:  8add5f1<RESET><YELLOW> s/12/B/<RESET>
+	:    <REVERSE><CYAN>@@ -8,7 +8,7 @@<RESET>
+	:    <CYAN> @@<RESET>
+	:      9<RESET>
+	:      10<RESET>
+	:    <REVERSE><RED>-<RESET><FAINT> BB<RESET>
+	:    <REVERSE><GREEN>+<RESET><BOLD> B<RESET>
+	:    <RED> -12<RESET>
+	:    <GREEN> +B<RESET>
+	:      13<RESET>
+	EOF
+	git range-diff changed...changed-message --color --dual-color >actual.raw &&
+	test_decode_color >actual <actual.raw &&
+	test_cmp expect actual
 
-ok 24 - set up color tests
+ok 16 - dual-coloring
 
 expecting success: 
-	TERM=vt100 git branch $color_args >actual.raw &&
-	test_decode_color <actual.raw >actual &&
-	test_cmp expect.bare actual
-
-ok 25 - %(color) omitted without tty
-
-checking prerequisite: TTY
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
-	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"
+		git format-patch --cover-letter --range-diff=$prev \
+			master..unmodified >actual &&
+		test_when_finished "rm 000?-*" &&
+		test_line_count = 5 actual &&
+		test_i18ngrep "^Range-diff:$" 0000-* &&
+		grep "= 1: .* s/5/A" 0000-* &&
+		grep "= 2: .* s/4/A" 0000-* &&
+		grep "= 3: .* s/11/B" 0000-* &&
+		grep "= 4: .* s/12/B" 0000-*
+	
+Range-diff:
+1:  4de457d = 1:  35b9b25 s/5/A/
+2:  fccce22 = 2:  de345ab s/4/A/
+3:  147e64e = 3:  9af6654 s/11/B/
+4:  a63e992 = 4:  2901f77 s/12/B/
+ok 17 - format-patch --range-diff=topic
 
-)
-died of signal 15 at /build/git-2.20.1/t/test-terminal.perl line 35.
-prerequisite TTY ok
 expecting success: 
-	test_terminal git branch $color_args >actual.raw &&
-	test_decode_color <actual.raw >actual &&
-	test_cmp expect.color actual
-
-ok 26 - %(color) present with tty
+		git format-patch --cover-letter --range-diff=$prev \
+			master..unmodified >actual &&
+		test_when_finished "rm 000?-*" &&
+		test_line_count = 5 actual &&
+		test_i18ngrep "^Range-diff:$" 0000-* &&
+		grep "= 1: .* s/5/A" 0000-* &&
+		grep "= 2: .* s/4/A" 0000-* &&
+		grep "= 3: .* s/11/B" 0000-* &&
+		grep "= 4: .* s/12/B" 0000-*
+	
+Range-diff:
+1:  4de457d = 1:  35b9b25 s/5/A/
+2:  fccce22 = 2:  de345ab s/4/A/
+3:  147e64e = 3:  9af6654 s/11/B/
+4:  a63e992 = 4:  2901f77 s/12/B/
+ok 18 - format-patch --range-diff=master..topic
 
 expecting success: 
-	git branch --color $color_args >actual.raw &&
-	test_decode_color <actual.raw >actual &&
-	test_cmp expect.color actual
+	git format-patch --range-diff=HEAD~1 HEAD~1 >actual &&
+	test_when_finished "rm 0001-*" &&
+	test_line_count = 1 actual &&
+	test_i18ngrep "^Range-diff:$" 0001-* &&
+	grep "> 1: .* new message" 0001-*
 
-ok 27 - --color overrides auto-color
+Range-diff:
+-:  ------- > 1:  8753efc new message
+ok 19 - format-patch --range-diff as commentary
 
-# passed all 27 test(s)
-1..27
+# passed all 19 test(s)
+1..19
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
 *** t3033-merge-toplevel.sh ***
@@ -59014,6 +58804,820 @@
 1..13
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
+*** t3034-merge-recursive-rename-options.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3034-merge-recursive-rename-options/.git/
+expecting success: 
+	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 master"
+
+[master (root-commit) 0c569bf] base
+ Author: A U Thor <author@example.com>
+ 4 files changed, 16 insertions(+)
+ create mode 100644 0-old
+ create mode 100644 1-old
+ create mode 100644 2-old
+ create mode 100644 3-old
+rm '0-old'
+rm '1-old'
+rm '2-old'
+rm '3-old'
+[master 70dff56] delete
+ Author: A U Thor <author@example.com>
+ 4 files changed, 16 deletions(-)
+ delete mode 100644 0-old
+ delete mode 100644 1-old
+ delete mode 100644 2-old
+ delete mode 100644 3-old
+Switched to a new branch 'rename'
+rm '0-old'
+rm '1-old'
+rm '2-old'
+rm '3-old'
+[rename ed9ffa5] rename
+ Author: A U Thor <author@example.com>
+ 5 files changed, 7 insertions(+), 7 deletions(-)
+ create mode 100644 0-new
+ delete mode 100644 0-old
+ rename 1-old => 1-new (50%)
+ rename 2-old => 2-new (75%)
+ rename 3-old => 3-new (100%)
+ok 1 - setup repo
+
+expecting success: 
+	git diff --name-status -M01 HEAD^ HEAD >diff-output &&
+	test_debug "cat diff-output" &&
+	test_line_count = 4 diff-output &&
+	grep "R[0-9][0-9][0-9]	\([0-3]\)-old	\1-new" diff-output \
+		>grep-output &&
+	test_cmp diff-output grep-output &&
+	th0=$(sed -n "s/R\(...\)	0-old	0-new/\1/p" <diff-output) &&
+	th1=$(sed -n "s/R\(...\)	1-old	1-new/\1/p" <diff-output) &&
+	th2=$(sed -n "s/R\(...\)	2-old	2-new/\1/p" <diff-output) &&
+	th3=$(sed -n "s/R\(...\)	3-old	3-new/\1/p" <diff-output) &&
+	test "$th0" -lt "$th1" &&
+	test "$th1" -lt "$th2" &&
+	test "$th2" -lt "$th3" &&
+	test "$th3" = 100 &&
+	if test 50 -le "$th0"
+	then
+		check_50=check_threshold_0
+	elif test 50 -le "$th1"
+	then
+		check_50=check_threshold_1
+	elif test 50 -le "$th2"
+	then
+		check_50=check_threshold_2
+	fi &&
+	th0="$th0%" &&
+	th1="$th1%" &&
+	th2="$th2%" &&
+	th3="$th3%"
+
+ok 2 - setup thresholds
+
+expecting success: 
+	git diff --name-status -M$th0 --diff-filter=R HEAD^ HEAD \
+		>diff-output-0 &&
+	git diff --name-status -M$th1 --diff-filter=R HEAD^ HEAD \
+		>diff-output-1 &&
+	git diff --name-status -M$th2 --diff-filter=R HEAD^ HEAD \
+		>diff-output-2 &&
+	git diff --name-status -M100% --diff-filter=R HEAD^ HEAD \
+		>diff-output-3 &&
+	test_line_count = 4 diff-output-0 &&
+	test_line_count = 3 diff-output-1 &&
+	test_line_count = 2 diff-output-2 &&
+	test_line_count = 1 diff-output-3
+
+ok 3 - assumption for tests: rename detection with diff
+
+expecting success: 
+	git read-tree --reset -u HEAD &&
+	test_must_fail git merge-recursive $tail &&
+	$check_50
+
+Merging HEAD with master
+Merging:
+ed9ffa5 rename
+70dff56 delete
+found 1 common ancestor:
+0c569bf base
+CONFLICT (rename/delete): 3-old deleted in master and renamed to 3-new in HEAD. Version HEAD of 3-new left in tree.
+CONFLICT (rename/delete): 2-old deleted in master and renamed to 2-new in HEAD. Version HEAD of 2-new left in tree.
+CONFLICT (rename/delete): 1-old deleted in master and renamed to 1-new in HEAD. Version HEAD of 1-new left in tree.
+ok 4 - default similarity threshold is 50%
+
+expecting success: 
+	git read-tree --reset -u HEAD &&
+	test_must_fail git merge-recursive --find-renames=$th0 $tail &&
+	check_threshold_0
+
+Merging HEAD with master
+Merging:
+ed9ffa5 rename
+70dff56 delete
+found 1 common ancestor:
+0c569bf base
+CONFLICT (rename/delete): 3-old deleted in master and renamed to 3-new in HEAD. Version HEAD of 3-new left in tree.
+CONFLICT (rename/delete): 2-old deleted in master and renamed to 2-new in HEAD. Version HEAD of 2-new left in tree.
+CONFLICT (rename/delete): 1-old deleted in master and renamed to 1-new in HEAD. Version HEAD of 1-new left in tree.
+CONFLICT (rename/delete): 0-old deleted in master and renamed to 0-new in HEAD. Version HEAD of 0-new left in tree.
+ok 5 - low rename threshold
+
+expecting success: 
+	git read-tree --reset -u HEAD &&
+	test_must_fail git merge-recursive --find-renames=$th1 $tail &&
+	check_threshold_1
+
+Merging HEAD with master
+Merging:
+ed9ffa5 rename
+70dff56 delete
+found 1 common ancestor:
+0c569bf base
+CONFLICT (rename/delete): 3-old deleted in master and renamed to 3-new in HEAD. Version HEAD of 3-new left in tree.
+CONFLICT (rename/delete): 2-old deleted in master and renamed to 2-new in HEAD. Version HEAD of 2-new left in tree.
+CONFLICT (rename/delete): 1-old deleted in master and renamed to 1-new in HEAD. Version HEAD of 1-new left in tree.
+ok 6 - medium rename threshold
+
+expecting success: 
+	git read-tree --reset -u HEAD &&
+	test_must_fail git merge-recursive --find-renames=$th2 $tail &&
+	check_threshold_2
+
+Merging HEAD with master
+Merging:
+ed9ffa5 rename
+70dff56 delete
+found 1 common ancestor:
+0c569bf base
+CONFLICT (rename/delete): 3-old deleted in master and renamed to 3-new in HEAD. Version HEAD of 3-new left in tree.
+CONFLICT (rename/delete): 2-old deleted in master and renamed to 2-new in HEAD. Version HEAD of 2-new left in tree.
+ok 7 - high rename threshold
+
+expecting success: 
+	git read-tree --reset -u HEAD &&
+	test_must_fail git merge-recursive --find-renames=100% $tail &&
+	check_exact_renames
+
+Merging HEAD with master
+Merging:
+ed9ffa5 rename
+70dff56 delete
+found 1 common ancestor:
+0c569bf base
+CONFLICT (rename/delete): 3-old deleted in master and renamed to 3-new in HEAD. Version HEAD of 3-new left in tree.
+ok 8 - exact renames only
+
+expecting success: 
+	git read-tree --reset -u HEAD &&
+	test_must_fail git merge-recursive --find-renames=200% $tail &&
+	check_exact_renames
+
+Merging HEAD with master
+Merging:
+ed9ffa5 rename
+70dff56 delete
+found 1 common ancestor:
+0c569bf base
+CONFLICT (rename/delete): 3-old deleted in master and renamed to 3-new in HEAD. Version HEAD of 3-new left in tree.
+ok 9 - rename threshold is truncated
+
+expecting success: 
+	git read-tree --reset -u HEAD &&
+	git merge-recursive --no-renames $tail &&
+	check_no_renames
+
+Merging HEAD with master
+Merging:
+ed9ffa5 rename
+70dff56 delete
+found 1 common ancestor:
+0c569bf base
+ok 10 - disabled rename detection
+
+expecting success: 
+	git read-tree --reset -u HEAD &&
+	test_must_fail git merge-recursive \
+		--find-renames=$th0 --find-renames=$th2 $tail &&
+	check_threshold_2
+
+Merging HEAD with master
+Merging:
+ed9ffa5 rename
+70dff56 delete
+found 1 common ancestor:
+0c569bf base
+CONFLICT (rename/delete): 3-old deleted in master and renamed to 3-new in HEAD. Version HEAD of 3-new left in tree.
+CONFLICT (rename/delete): 2-old deleted in master and renamed to 2-new in HEAD. Version HEAD of 2-new left in tree.
+ok 11 - last wins in --find-renames=<m> --find-renames=<n>
+
+expecting success: 
+	git read-tree --reset -u HEAD &&
+	test_must_fail git merge-recursive \
+		--find-renames=$th0 --find-renames $tail &&
+	$check_50
+
+Merging HEAD with master
+Merging:
+ed9ffa5 rename
+70dff56 delete
+found 1 common ancestor:
+0c569bf base
+CONFLICT (rename/delete): 3-old deleted in master and renamed to 3-new in HEAD. Version HEAD of 3-new left in tree.
+CONFLICT (rename/delete): 2-old deleted in master and renamed to 2-new in HEAD. Version HEAD of 2-new left in tree.
+CONFLICT (rename/delete): 1-old deleted in master and renamed to 1-new in HEAD. Version HEAD of 1-new left in tree.
+ok 12 - --find-renames resets threshold
+
+expecting success: 
+	git read-tree --reset -u HEAD &&
+	test_must_fail git merge-recursive --no-renames --find-renames $tail &&
+	$check_50
+
+Merging HEAD with master
+Merging:
+ed9ffa5 rename
+70dff56 delete
+found 1 common ancestor:
+0c569bf base
+CONFLICT (rename/delete): 3-old deleted in master and renamed to 3-new in HEAD. Version HEAD of 3-new left in tree.
+CONFLICT (rename/delete): 2-old deleted in master and renamed to 2-new in HEAD. Version HEAD of 2-new left in tree.
+CONFLICT (rename/delete): 1-old deleted in master and renamed to 1-new in HEAD. Version HEAD of 1-new left in tree.
+ok 13 - last wins in --no-renames --find-renames
+
+expecting success: 
+	git read-tree --reset -u HEAD &&
+	git merge-recursive --find-renames --no-renames $tail &&
+	check_no_renames
+
+Merging HEAD with master
+Merging:
+ed9ffa5 rename
+70dff56 delete
+found 1 common ancestor:
+0c569bf base
+ok 14 - last wins in --find-renames --no-renames
+
+expecting success: 
+	git read-tree --reset -u HEAD &&
+	git merge-recursive HEAD -- HEAD HEAD &&
+	git diff --quiet --cached &&
+	git merge-recursive --find-renames=$th0 HEAD -- HEAD HEAD &&
+	git diff --quiet --cached &&
+	git merge-recursive --find-renames=$th2 HEAD -- HEAD HEAD &&
+	git diff --quiet --cached &&
+	git merge-recursive --find-renames=100% HEAD -- HEAD HEAD &&
+	git diff --quiet --cached &&
+	git merge-recursive --no-renames HEAD -- HEAD HEAD &&
+	git diff --quiet --cached
+
+Merging HEAD with HEAD
+Merging:
+ed9ffa5 rename
+ed9ffa5 rename
+found 1 common ancestor:
+ed9ffa5 rename
+Already up to date!
+Merging HEAD with HEAD
+Merging:
+ed9ffa5 rename
+ed9ffa5 rename
+found 1 common ancestor:
+ed9ffa5 rename
+Already up to date!
+Merging HEAD with HEAD
+Merging:
+ed9ffa5 rename
+ed9ffa5 rename
+found 1 common ancestor:
+ed9ffa5 rename
+Already up to date!
+Merging HEAD with HEAD
+Merging:
+ed9ffa5 rename
+ed9ffa5 rename
+found 1 common ancestor:
+ed9ffa5 rename
+Already up to date!
+Merging HEAD with HEAD
+Merging:
+ed9ffa5 rename
+ed9ffa5 rename
+found 1 common ancestor:
+ed9ffa5 rename
+Already up to date!
+ok 15 - assumption for further tests: trivial merge succeeds
+
+expecting success: 
+	git read-tree --reset -u HEAD &&
+	test_must_fail git merge-recursive --find-renames=-25 \
+		HEAD -- HEAD HEAD &&
+	git diff --quiet --cached
+
+fatal: unknown option --find-renames=-25
+ok 16 - --find-renames rejects negative argument
+
+expecting success: 
+	git read-tree --reset -u HEAD &&
+	test_must_fail git merge-recursive --find-renames=0xf \
+		HEAD -- HEAD HEAD &&
+	git diff --quiet --cached
+
+fatal: unknown option --find-renames=0xf
+ok 17 - --find-renames rejects non-numbers
+
+expecting success: 
+	git read-tree --reset -u HEAD &&
+	test_must_fail git merge-recursive --rename-threshold=$th0 $tail &&
+	check_threshold_0
+
+Merging HEAD with master
+Merging:
+ed9ffa5 rename
+70dff56 delete
+found 1 common ancestor:
+0c569bf base
+CONFLICT (rename/delete): 3-old deleted in master and renamed to 3-new in HEAD. Version HEAD of 3-new left in tree.
+CONFLICT (rename/delete): 2-old deleted in master and renamed to 2-new in HEAD. Version HEAD of 2-new left in tree.
+CONFLICT (rename/delete): 1-old deleted in master and renamed to 1-new in HEAD. Version HEAD of 1-new left in tree.
+CONFLICT (rename/delete): 0-old deleted in master and renamed to 0-new in HEAD. Version HEAD of 0-new left in tree.
+ok 18 - rename-threshold=<n> is a synonym for find-renames=<n>
+
+expecting success: 
+	git read-tree --reset -u HEAD &&
+	test_must_fail git merge-recursive --no-renames --rename-threshold=$th0 $tail &&
+	check_threshold_0
+
+Merging HEAD with master
+Merging:
+ed9ffa5 rename
+70dff56 delete
+found 1 common ancestor:
+0c569bf base
+CONFLICT (rename/delete): 3-old deleted in master and renamed to 3-new in HEAD. Version HEAD of 3-new left in tree.
+CONFLICT (rename/delete): 2-old deleted in master and renamed to 2-new in HEAD. Version HEAD of 2-new left in tree.
+CONFLICT (rename/delete): 1-old deleted in master and renamed to 1-new in HEAD. Version HEAD of 1-new left in tree.
+CONFLICT (rename/delete): 0-old deleted in master and renamed to 0-new in HEAD. Version HEAD of 0-new left in tree.
+ok 19 - last wins in --no-renames --rename-threshold=<n>
+
+expecting success: 
+	git read-tree --reset -u HEAD &&
+	git merge-recursive --rename-threshold=$th0 --no-renames $tail &&
+	check_no_renames
+
+Merging HEAD with master
+Merging:
+ed9ffa5 rename
+70dff56 delete
+found 1 common ancestor:
+0c569bf base
+ok 20 - last wins in --rename-threshold=<n> --no-renames
+
+expecting success: 
+	git read-tree --reset -u HEAD &&
+	test_must_fail git merge-recursive --rename-threshold=-25 \
+		HEAD -- HEAD HEAD &&
+	git diff --quiet --cached
+
+fatal: unknown option --rename-threshold=-25
+ok 21 - --rename-threshold=<n> rejects negative argument
+
+expecting success: 
+	git read-tree --reset -u HEAD &&
+	test_must_fail git merge-recursive --rename-threshold=0xf \
+		HEAD -- HEAD HEAD &&
+	git diff --quiet --cached
+
+fatal: unknown option --rename-threshold=0xf
+ok 22 - --rename-threshold=<n> rejects non-numbers
+
+expecting success: 
+	git read-tree --reset -u HEAD &&
+	test_must_fail git merge-recursive \
+		--rename-threshold=$th0 --find-renames=$th2 $tail &&
+	check_threshold_2
+
+Merging HEAD with master
+Merging:
+ed9ffa5 rename
+70dff56 delete
+found 1 common ancestor:
+0c569bf base
+CONFLICT (rename/delete): 3-old deleted in master and renamed to 3-new in HEAD. Version HEAD of 3-new left in tree.
+CONFLICT (rename/delete): 2-old deleted in master and renamed to 2-new in HEAD. Version HEAD of 2-new left in tree.
+ok 23 - last wins in --rename-threshold=<m> --find-renames=<n>
+
+expecting success: 
+	git read-tree --reset -u HEAD &&
+	test_must_fail git merge-recursive \
+		--find-renames=$th2 --rename-threshold=$th0 $tail &&
+	check_threshold_0
+
+Merging HEAD with master
+Merging:
+ed9ffa5 rename
+70dff56 delete
+found 1 common ancestor:
+0c569bf base
+CONFLICT (rename/delete): 3-old deleted in master and renamed to 3-new in HEAD. Version HEAD of 3-new left in tree.
+CONFLICT (rename/delete): 2-old deleted in master and renamed to 2-new in HEAD. Version HEAD of 2-new left in tree.
+CONFLICT (rename/delete): 1-old deleted in master and renamed to 1-new in HEAD. Version HEAD of 1-new left in tree.
+CONFLICT (rename/delete): 0-old deleted in master and renamed to 0-new in HEAD. Version HEAD of 0-new left in tree.
+ok 24 - last wins in --find-renames=<m> --rename-threshold=<n>
+
+expecting success: 
+	git read-tree --reset -u HEAD &&
+	git -c merge.renames=false merge-recursive $tail &&
+	check_no_renames
+
+Merging HEAD with master
+Merging:
+ed9ffa5 rename
+70dff56 delete
+found 1 common ancestor:
+0c569bf base
+ok 25 - merge.renames disables rename detection
+
+expecting success: 
+	git read-tree --reset -u HEAD &&
+	git -c diff.renames=false merge-recursive $tail &&
+	check_no_renames
+
+Merging HEAD with master
+Merging:
+ed9ffa5 rename
+70dff56 delete
+found 1 common ancestor:
+0c569bf base
+ok 26 - merge.renames defaults to diff.renames
+
+expecting success: 
+	git read-tree --reset -u HEAD &&
+	test_must_fail git -c diff.renames=false -c merge.renames=true merge-recursive $tail &&
+	$check_50
+
+Merging HEAD with master
+Merging:
+ed9ffa5 rename
+70dff56 delete
+found 1 common ancestor:
+0c569bf base
+CONFLICT (rename/delete): 3-old deleted in master and renamed to 3-new in HEAD. Version HEAD of 3-new left in tree.
+CONFLICT (rename/delete): 2-old deleted in master and renamed to 2-new in HEAD. Version HEAD of 2-new left in tree.
+CONFLICT (rename/delete): 1-old deleted in master and renamed to 1-new in HEAD. Version HEAD of 1-new left in tree.
+ok 27 - merge.renames overrides diff.renames
+
+# passed all 27 test(s)
+1..27
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t3203-branch-output.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3203-branch-output/.git/
+expecting success: 
+	echo content >file &&
+	git add file &&
+	git commit -m one &&
+	echo content >>file &&
+	git commit -a -m two
+
+[master (root-commit) c15e941] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+[master dafeb02] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 1 - make commits
+
+expecting success: 
+	git branch branch-one &&
+	git branch branch-two HEAD^
+
+ok 2 - make branches
+
+expecting success: 
+	git update-ref refs/remotes/origin/branch-one branch-one &&
+	git update-ref refs/remotes/origin/branch-two branch-two &&
+	git symbolic-ref refs/remotes/origin/HEAD refs/remotes/origin/branch-one
+
+ok 3 - make remote branches
+
+expecting success: 
+	git branch >actual &&
+	test_cmp expect actual
+
+ok 4 - git branch shows local branches
+
+expecting success: 
+	git branch --list >actual &&
+	test_cmp expect actual
+
+ok 5 - git branch --list shows local branches
+
+expecting success: 
+	git branch --list branch* >actual &&
+	test_cmp expect actual
+
+ok 6 - git branch --list pattern shows matching local branches
+
+expecting success: 
+	git branch -r >actual &&
+	test_cmp expect actual
+
+ok 7 - git branch -r shows remote branches
+
+expecting success: 
+	git branch -a >actual &&
+	test_cmp expect actual
+
+ok 8 - git branch -a shows local and remote branches
+
+expecting success: 
+	git branch -v >tmp &&
+	awk "{print \$NF}" <tmp >actual &&
+	test_cmp expect actual
+
+ok 9 - git branch -v shows branch summaries
+
+expecting success: 
+	git branch --list -v branch* >tmp &&
+	awk "{print \$NF}" <tmp >actual &&
+	test_cmp expect actual
+
+ok 10 - git branch --list -v pattern shows branch summaries
+
+expecting success: 
+	git branch --list --ignore-case -v BRANCH* >tmp &&
+	awk "{print \$NF}" <tmp >actual &&
+	test_cmp expect actual
+
+ok 11 - git branch --ignore-case --list -v pattern shows branch summaries
+
+expecting success: 
+	test_must_fail git branch -v branch*
+
+fatal: 'branch*' is not a valid branch name.
+ok 12 - git branch -v pattern does not show branch summaries
+
+expecting success: 
+	cat >expect <<EOF &&
+* (HEAD detached at $(git rev-parse --short HEAD^0))
+  branch-one
+  branch-two
+  master
+EOF
+	git checkout HEAD^0 &&
+	git branch >actual &&
+	test_i18ncmp expect actual
+
+Note: checking out '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 performing another checkout.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -b with the checkout command again. Example:
+
+  git checkout -b <new-branch-name>
+
+HEAD is now at dafeb02 two
+ok 13 - git branch shows detached HEAD properly
+
+expecting success: 
+	git checkout master &&
+	cat >expect <<EOF &&
+* (HEAD detached at $(git rev-parse --short HEAD^0))
+  branch-one
+  branch-two
+  master
+EOF
+	git checkout --detach &&
+	git branch >actual &&
+	test_i18ncmp expect actual
+
+Switched to branch 'master'
+HEAD is now at dafeb02 two
+ok 14 - git branch shows detached HEAD properly after checkout --detach
+
+expecting success: 
+	cat >expect <<EOF &&
+* (HEAD detached from $(git rev-parse --short HEAD))
+  branch-one
+  branch-two
+  master
+EOF
+	git reset --hard HEAD^1 &&
+	git branch >actual &&
+	test_i18ncmp expect actual
+
+HEAD is now at c15e941 one
+ok 15 - git branch shows detached HEAD properly after moving
+
+expecting success: 
+	cat >expect <<EOF &&
+* (HEAD detached at fromtag)
+  branch-one
+  branch-two
+  master
+EOF
+	git tag fromtag master &&
+	git checkout fromtag &&
+	git branch >actual &&
+	test_i18ncmp expect actual
+
+Previous HEAD position was c15e941 one
+HEAD is now at dafeb02 two
+ok 16 - git branch shows detached HEAD properly from tag
+
+expecting success: 
+	cat >expect <<EOF &&
+* (HEAD detached from fromtag)
+  branch-one
+  branch-two
+  master
+EOF
+	git reset --hard HEAD^1 &&
+	git branch >actual &&
+	test_i18ncmp expect actual
+
+HEAD is now at c15e941 one
+ok 17 - git branch shows detached HEAD properly after moving from tag
+
+expecting success: 
+	cat >expect <<-\EOF &&
+	* (HEAD detached from fromtag)
+	  branch-two
+	  branch-one
+	  master
+	EOF
+	git branch --sort=objectsize >actual &&
+	test_i18ncmp expect actual
+
+ok 18 - git branch `--sort` option
+
+expecting success: 
+	cat >expect <<-\EOF &&
+	  branch-one
+	  master
+	EOF
+	git branch --points-at=branch-one >actual &&
+	test_cmp expect actual
+
+ok 19 - git branch --points-at option
+
+expecting success: 
+	git tag ambiguous &&
+	git branch ambiguous &&
+	echo "  ambiguous" >expect &&
+	git branch --list ambiguous >actual &&
+	test_cmp expect actual
+
+ok 20 - ambiguous branch/tag not marked
+
+expecting success: 
+	git symbolic-ref refs/heads/ref-to-branch refs/heads/branch-one &&
+	git symbolic-ref refs/heads/ref-to-remote refs/remotes/origin/branch-one &&
+	cat >expect <<-\EOF &&
+	  ref-to-branch -> branch-one
+	  ref-to-remote -> origin/branch-one
+	EOF
+	git branch >actual.raw &&
+	grep ref-to <actual.raw >actual &&
+	test_cmp expect actual
+
+ok 21 - local-branch symrefs shortened properly
+
+expecting success: 
+	(
+		git init sort-icase &&
+		cd sort-icase &&
+		test_commit initial &&
+		git branch branch-one &&
+		git branch BRANCH-two &&
+		git branch --list | awk "{print \$NF}" >actual &&
+		cat >expected <<-\EOF &&
+		BRANCH-two
+		branch-one
+		master
+		EOF
+		test_cmp expected actual &&
+		git branch --list -i | awk "{print \$NF}" >actual &&
+		cat >expected <<-\EOF &&
+		branch-one
+		BRANCH-two
+		master
+		EOF
+		test_cmp expected actual
+	)
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3203-branch-output/sort-icase/.git/
+[master (root-commit) 24b24cf] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+ok 22 - sort branches, ignore case
+
+expecting success: 
+	cat >expect <<-\EOF &&
+	Refname is (HEAD detached from fromtag)
+	Refname is refs/heads/ambiguous
+	Refname is refs/heads/branch-one
+	Refname is refs/heads/branch-two
+	Refname is refs/heads/master
+	Refname is refs/heads/ref-to-branch
+	Refname is refs/heads/ref-to-remote
+	EOF
+	git branch --format="Refname is %(refname)" >actual &&
+	test_i18ncmp expect actual
+
+ok 23 - git branch --format option
+
+expecting success: 
+	echo "<RED>master<RESET>" >expect.color &&
+	echo "master" >expect.bare &&
+	color_args="--format=%(color:red)%(refname:short) --list master"
+
+ok 24 - set up color tests
+
+expecting success: 
+	TERM=vt100 git branch $color_args >actual.raw &&
+	test_decode_color <actual.raw >actual &&
+	test_cmp expect.bare actual
+
+ok 25 - %(color) omitted without tty
+
+checking prerequisite: TTY
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
+	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: 
+	test_terminal git branch $color_args >actual.raw &&
+	test_decode_color <actual.raw >actual &&
+	test_cmp expect.color actual
+
+ok 26 - %(color) present with tty
+
+expecting success: 
+	git branch --color $color_args >actual.raw &&
+	test_decode_color <actual.raw >actual &&
+	test_cmp expect.color actual
+
+ok 27 - --color overrides auto-color
+
+# passed all 27 test(s)
+1..27
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
 *** t3302-notes-index-expensive.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3302-notes-index-expensive/.git/
 expecting success: 
@@ -59139,341 +59743,66 @@
 1..12
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t3206-range-diff.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3206-range-diff/.git/
+*** t3307-notes-man.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3307-notes-man/.git/
 expecting success: 
-	git fast-import < "$TEST_DIRECTORY"/t3206/history.export
-
-/build/git-2.20.1/git-fast-import statistics:
----------------------------------------------------------------------
-Alloc'd objects:       5000
-Total objects:           64 (        17 duplicates                  )
-      blobs  :           13 (         0 duplicates          0 deltas of         11 attempts)
-      trees  :           17 (        17 duplicates          1 deltas of         16 attempts)
-      commits:           34 (         0 duplicates          0 deltas of          0 attempts)
-      tags   :            0 (         0 duplicates          0 deltas of          0 attempts)
-Total branches:           9 (        10 loads     )
-      marks:           1024 (        47 unique    )
-      atoms:              2
-Memory total:          2344 KiB
-       pools:          2110 KiB
-     objects:           234 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize = 1073741824
-pack_report: core.packedGitLimit      = 35184372088832
-pack_report: pack_used_ctr            =         17
-pack_report: pack_mmap_calls          =         10
-pack_report: pack_open_windows        =          0 /          1
-pack_report: pack_mapped              =          0 /       6777
----------------------------------------------------------------------
+	test_commit A &&
+	test_commit B &&
+	test_commit C
 
+[master (root-commit) 0ddfaf1] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A.t
+[master d9df450] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 B.t
+[master 35a8500] C
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 C.t
 ok 1 - setup
 
 expecting success: 
-	git range-diff --no-color master..topic master..unmodified \
-		>actual &&
-	cat >expected <<-EOF &&
-	1:  4de457d = 1:  35b9b25 s/5/A/
-	2:  fccce22 = 2:  de345ab s/4/A/
-	3:  147e64e = 3:  9af6654 s/11/B/
-	4:  a63e992 = 4:  2901f77 s/12/B/
-	EOF
-	test_cmp expected actual
-
-ok 2 - simple A..B A..C (unmodified)
-
-expecting success: 
-	git range-diff --no-color topic...unmodified >actual &&
-	# same "expected" as above
-	test_cmp expected actual
-
-ok 3 - simple B...C (unmodified)
-
-expecting success: 
-	git range-diff --no-color master topic unmodified >actual &&
-	# same "expected" as above
-	test_cmp expected actual
-
-ok 4 - simple A B C (unmodified)
-
-expecting success: 
-	git range-diff --no-color master topic reordered >actual &&
-	cat >expected <<-EOF &&
-	1:  4de457d = 1:  aca177a s/5/A/
-	3:  147e64e = 2:  14ad629 s/11/B/
-	4:  a63e992 = 3:  ee58208 s/12/B/
-	2:  fccce22 = 4:  307b27a s/4/A/
-	EOF
-	test_cmp expected actual
-
-ok 5 - trivial reordering
-
-expecting success: 
-	git range-diff --no-color master topic removed >actual &&
-	cat >expected <<-EOF &&
-	1:  4de457d = 1:  7657159 s/5/A/
-	2:  fccce22 < -:  ------- s/4/A/
-	3:  147e64e = 2:  43d84d3 s/11/B/
-	4:  a63e992 = 3:  a740396 s/12/B/
-	EOF
-	test_cmp expected actual
-
-ok 6 - removed a commit
-
-expecting success: 
-	git range-diff --no-color master topic added >actual &&
-	cat >expected <<-EOF &&
-	1:  4de457d = 1:  2716022 s/5/A/
-	2:  fccce22 = 2:  b62accd s/4/A/
-	-:  ------- > 3:  df46cfa s/6/A/
-	3:  147e64e = 4:  3e64548 s/11/B/
-	4:  a63e992 = 5:  12b4063 s/12/B/
-	EOF
-	test_cmp expected actual
-
-ok 7 - added a commit
-
-expecting success: 
-	git range-diff --no-color master topic rebased >actual &&
-	cat >expected <<-EOF &&
-	1:  4de457d = 1:  cc9c443 s/5/A/
-	2:  fccce22 = 2:  c5d9641 s/4/A/
-	3:  147e64e = 3:  28cc2b6 s/11/B/
-	4:  a63e992 = 4:  5628ab7 s/12/B/
-	EOF
-	test_cmp expected actual
-
-ok 8 - new base, A B C
-
-expecting success: 
-	# this syntax includes the commits from master!
-	git range-diff --no-color topic...rebased >actual &&
-	cat >expected <<-EOF &&
-	-:  ------- > 1:  a31b12e unrelated
-	1:  4de457d = 2:  cc9c443 s/5/A/
-	2:  fccce22 = 3:  c5d9641 s/4/A/
-	3:  147e64e = 4:  28cc2b6 s/11/B/
-	4:  a63e992 = 5:  5628ab7 s/12/B/
-	EOF
-	test_cmp expected actual
-
-ok 9 - new base, B...C
-
-expecting success: 
-	git range-diff --no-color topic...changed >actual &&
-	cat >expected <<-EOF &&
-	1:  4de457d = 1:  a4b3333 s/5/A/
-	2:  fccce22 = 2:  f51d370 s/4/A/
-	3:  147e64e ! 3:  0559556 s/11/B/
-	    @@ -10,7 +10,7 @@
-	      9
-	      10
-	     -11
-	    -+B
-	    ++BB
-	      12
-	      13
-	      14
-	4:  a63e992 ! 4:  d966c5c s/12/B/
-	    @@ -8,7 +8,7 @@
-	     @@
-	      9
-	      10
-	    - B
-	    + BB
-	     -12
-	     +B
-	      13
-	EOF
-	test_cmp expected actual
-
-ok 10 - changed commit
-
-expecting success: 
-	git range-diff --no-color --no-patch topic...changed >actual &&
-	cat >expected <<-EOF &&
-	1:  4de457d = 1:  a4b3333 s/5/A/
-	2:  fccce22 = 2:  f51d370 s/4/A/
-	3:  147e64e ! 3:  0559556 s/11/B/
-	4:  a63e992 ! 4:  d966c5c s/12/B/
-	EOF
-	test_cmp expected actual
-
-ok 11 - changed commit with --no-patch diff option
-
-expecting success: 
-	git range-diff --no-color --stat topic...changed >actual &&
-	cat >expected <<-EOF &&
-	1:  4de457d = 1:  a4b3333 s/5/A/
-	     a => b | 0
-	     1 file changed, 0 insertions(+), 0 deletions(-)
-	2:  fccce22 = 2:  f51d370 s/4/A/
-	     a => b | 0
-	     1 file changed, 0 insertions(+), 0 deletions(-)
-	3:  147e64e ! 3:  0559556 s/11/B/
-	     a => b | 0
-	     1 file changed, 0 insertions(+), 0 deletions(-)
-	4:  a63e992 ! 4:  d966c5c s/12/B/
-	     a => b | 0
-	     1 file changed, 0 insertions(+), 0 deletions(-)
-	EOF
-	test_cmp expected actual
-
-ok 12 - changed commit with --stat diff option
-
-expecting success: 
-	git range-diff --no-color --submodule=log topic...changed >actual &&
-	cat >expected <<-EOF &&
-	1:  4de457d = 1:  a4b3333 s/5/A/
-	2:  fccce22 = 2:  f51d370 s/4/A/
-	3:  147e64e ! 3:  0559556 s/11/B/
-	    @@ -10,7 +10,7 @@
-	      9
-	      10
-	     -11
-	    -+B
-	    ++BB
-	      12
-	      13
-	      14
-	4:  a63e992 ! 4:  d966c5c s/12/B/
-	    @@ -8,7 +8,7 @@
-	     @@
-	      9
-	      10
-	    - B
-	    + BB
-	     -12
-	     +B
-	      13
-	EOF
-	test_cmp expected actual
-
-ok 13 - changed commit with sm config
-
-expecting success: 
-	git commit --amend -m "new message" &&
-	git range-diff master HEAD@{1} HEAD
-
-[master c745377] new message
- Author: Thomas Rast <trast@inf.ethz.ch>
- Date: Mon Jul 22 11:25:27 2013 +0200
- 1 file changed, 20 deletions(-)
- delete mode 100644 file
-1:  a31b12e < -:  ------- unrelated
-ok 14 - no commits on one side
+	cat <<-\EOF >expect &&
+	    B
 
-expecting success: 
-	git range-diff --no-color topic...changed-message >actual &&
-	sed s/Z/\ /g >expected <<-EOF &&
-	1:  4de457d = 1:  f686024 s/5/A/
-	2:  fccce22 ! 2:  4ab067d s/4/A/
-	    @@ -2,6 +2,8 @@
-	    Z
-	    Z    s/4/A/
-	    Z
-	    +    Also a silly comment here!
-	    +
-	    Z diff --git a/file b/file
-	    Z --- a/file
-	    Z +++ b/file
-	3:  147e64e = 3:  b9cb956 s/11/B/
-	4:  a63e992 = 4:  8add5f1 s/12/B/
+	Notes:
+	    Acked-by: A C Ker <acker@example.com>
 	EOF
-	test_cmp expected actual
+	git notes add -m "Acked-by: A C Ker <acker@example.com>" B &&
+	git show -s B^{commit} >log &&
+	tail -n 4 log >actual &&
+	test_cmp expect actual
 
-ok 15 - changed message
+ok 2 - example 1: notes to add an Acked-by line
 
 expecting success: 
-	sed -e "s|^:||" >expect <<-\EOF &&
-	:<YELLOW>1:  a4b3333 = 1:  f686024 s/5/A/<RESET>
-	:<RED>2:  f51d370 <RESET><YELLOW>!<RESET><GREEN> 2:  4ab067d<RESET><YELLOW> s/4/A/<RESET>
-	:    <REVERSE><CYAN>@@ -2,6 +2,8 @@<RESET>
-	:     <RESET>
-	:         s/4/A/<RESET>
-	:     <RESET>
-	:    <REVERSE><GREEN>+<RESET><BOLD>    Also a silly comment here!<RESET>
-	:    <REVERSE><GREEN>+<RESET>
-	:      diff --git a/file b/file<RESET>
-	:      --- a/file<RESET>
-	:      +++ b/file<RESET>
-	:<RED>3:  0559556 <RESET><YELLOW>!<RESET><GREEN> 3:  b9cb956<RESET><YELLOW> s/11/B/<RESET>
-	:    <REVERSE><CYAN>@@ -10,7 +10,7 @@<RESET>
-	:      9<RESET>
-	:      10<RESET>
-	:    <RED> -11<RESET>
-	:    <REVERSE><RED>-<RESET><FAINT;GREEN>+BB<RESET>
-	:    <REVERSE><GREEN>+<RESET><BOLD;GREEN>+B<RESET>
-	:      12<RESET>
-	:      13<RESET>
-	:      14<RESET>
-	:<RED>4:  d966c5c <RESET><YELLOW>!<RESET><GREEN> 4:  8add5f1<RESET><YELLOW> s/12/B/<RESET>
-	:    <REVERSE><CYAN>@@ -8,7 +8,7 @@<RESET>
-	:    <CYAN> @@<RESET>
-	:      9<RESET>
-	:      10<RESET>
-	:    <REVERSE><RED>-<RESET><FAINT> BB<RESET>
-	:    <REVERSE><GREEN>+<RESET><BOLD> B<RESET>
-	:    <RED> -12<RESET>
-	:    <GREEN> +B<RESET>
-	:      13<RESET>
-	EOF
-	git range-diff changed...changed-message --color --dual-color >actual.raw &&
-	test_decode_color >actual <actual.raw &&
-	test_cmp expect actual
+	cp "$TEST_DIRECTORY"/test-binary-1.png . &&
+	git checkout B &&
+	blob=$(git hash-object -w test-binary-1.png) &&
+	git notes --ref=logo add -C "$blob" &&
+	git notes --ref=logo copy B C &&
+	git notes --ref=logo show C >actual &&
+	test_cmp test-binary-1.png actual
 
-ok 16 - dual-coloring
+Note: checking out 'B'.
 
-expecting success: 
-		git format-patch --cover-letter --range-diff=$prev \
-			master..unmodified >actual &&
-		test_when_finished "rm 000?-*" &&
-		test_line_count = 5 actual &&
-		test_i18ngrep "^Range-diff:$" 0000-* &&
-		grep "= 1: .* s/5/A" 0000-* &&
-		grep "= 2: .* s/4/A" 0000-* &&
-		grep "= 3: .* s/11/B" 0000-* &&
-		grep "= 4: .* s/12/B" 0000-*
-	
-Range-diff:
-1:  4de457d = 1:  35b9b25 s/5/A/
-2:  fccce22 = 2:  de345ab s/4/A/
-3:  147e64e = 3:  9af6654 s/11/B/
-4:  a63e992 = 4:  2901f77 s/12/B/
-ok 17 - format-patch --range-diff=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 performing another checkout.
 
-expecting success: 
-		git format-patch --cover-letter --range-diff=$prev \
-			master..unmodified >actual &&
-		test_when_finished "rm 000?-*" &&
-		test_line_count = 5 actual &&
-		test_i18ngrep "^Range-diff:$" 0000-* &&
-		grep "= 1: .* s/5/A" 0000-* &&
-		grep "= 2: .* s/4/A" 0000-* &&
-		grep "= 3: .* s/11/B" 0000-* &&
-		grep "= 4: .* s/12/B" 0000-*
-	
-Range-diff:
-1:  4de457d = 1:  35b9b25 s/5/A/
-2:  fccce22 = 2:  de345ab s/4/A/
-3:  147e64e = 3:  9af6654 s/11/B/
-4:  a63e992 = 4:  2901f77 s/12/B/
-ok 18 - format-patch --range-diff=master..topic
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -b with the checkout command again. Example:
 
-expecting success: 
-	git format-patch --range-diff=HEAD~1 HEAD~1 >actual &&
-	test_when_finished "rm 0001-*" &&
-	test_line_count = 1 actual &&
-	test_i18ngrep "^Range-diff:$" 0001-* &&
-	grep "> 1: .* new message" 0001-*
+  git checkout -b <new-branch-name>
 
-Range-diff:
--:  ------- > 1:  c745377 new message
-ok 19 - format-patch --range-diff as commentary
+HEAD is now at d9df450 B
+ok 3 - example 2: binary notes
 
-# passed all 19 test(s)
-1..19
+# passed all 3 test(s)
+1..3
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
 *** t3304-notes-mixed.sh ***
@@ -59855,68 +60184,6 @@
 1..21
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t3307-notes-man.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3307-notes-man/.git/
-expecting success: 
-	test_commit A &&
-	test_commit B &&
-	test_commit C
-
-[master (root-commit) 0ddfaf1] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.t
-[master d9df450] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 B.t
-[master 35a8500] C
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 C.t
-ok 1 - setup
-
-expecting success: 
-	cat <<-\EOF >expect &&
-	    B
-
-	Notes:
-	    Acked-by: A C Ker <acker@example.com>
-	EOF
-	git notes add -m "Acked-by: A C Ker <acker@example.com>" B &&
-	git show -s B^{commit} >log &&
-	tail -n 4 log >actual &&
-	test_cmp expect actual
-
-ok 2 - example 1: notes to add an Acked-by line
-
-expecting success: 
-	cp "$TEST_DIRECTORY"/test-binary-1.png . &&
-	git checkout B &&
-	blob=$(git hash-object -w test-binary-1.png) &&
-	git notes --ref=logo add -C "$blob" &&
-	git notes --ref=logo copy B C &&
-	git notes --ref=logo show C >actual &&
-	test_cmp test-binary-1.png actual
-
-Note: checking out '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 performing another checkout.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
-
-  git checkout -b <new-branch-name>
-
-HEAD is now at d9df450 B
-ok 3 - example 2: binary notes
-
-# passed all 3 test(s)
-1..3
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
 *** t3306-notes-prune.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3306-notes-prune/.git/
 expecting success: 
@@ -60084,7 +60351,7 @@
 
 	echo "+cached content" >expect
 
-[master (root-commit) 1522fa0] initial
+[master (root-commit) c7863f3] initial
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 racy-file
@@ -60939,6 +61206,102 @@
 1..31
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
+*** t3320-notes-merge-worktrees.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3320-notes-merge-worktrees/.git/
+expecting success: 
+	test_commit tantrum
+
+[master (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: 
+	git config core.notesRef refs/notes/x &&
+	git notes add -m "x notes on tantrum" tantrum
+
+ok 2 - setup notes ref (x)
+
+expecting success: 
+	git update-ref refs/notes/y refs/notes/x &&
+	git config core.notesRef refs/notes/y &&
+	git notes remove tantrum
+
+Removing note for object tantrum
+ok 3 - setup local branch (y)
+
+expecting success: 
+	git update-ref refs/notes/z refs/notes/x &&
+	git config core.notesRef refs/notes/z &&
+	git notes add -f -m "conflicting notes on tantrum" tantrum
+
+Overwriting existing notes for object 02f8a63df5a5eb7863e18dffcbc422a31a01d39e
+ok 4 - setup remote branch (z)
+
+expecting success: 
+	git config core.notesRef refs/notes/x &&
+	git notes add -f -m "more conflicting notes on tantrum" tantrum
+
+Overwriting existing notes for object 02f8a63df5a5eb7863e18dffcbc422a31a01d39e
+ok 5 - modify notes ref ourselves (x)
+
+expecting success: 
+	git worktree add -b newbranch worktree master &&
+	git worktree add -b newbranch2 worktree2 master
+
+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: 
+	git config core.notesRef refs/notes/y &&
+	test_must_fail git notes merge z &&
+	echo "ref: refs/notes/y" >expect &&
+	test_cmp expect .git/NOTES_MERGE_REF
+
+Automatic notes merge failed. Fix conflicts in .git/NOTES_MERGE_WORKTREE and commit the result with 'git notes merge --commit', or abort the merge with 'git notes merge --abort'.
+Auto-merging notes for 02f8a63df5a5eb7863e18dffcbc422a31a01d39e
+CONFLICT (delete/modify): Notes for object 02f8a63df5a5eb7863e18dffcbc422a31a01d39e deleted in refs/notes/y and modified in refs/notes/z. Version from refs/notes/z left in tree.
+ok 7 - merge z into y fails and sets NOTES_MERGE_REF
+
+expecting success: 
+	(
+		cd worktree &&
+		git config core.notesRef refs/notes/y &&
+		test_must_fail git notes merge z 2>err &&
+		test_i18ngrep "a notes merge into refs/notes/y is already in-progress at" err
+	) &&
+	test_path_is_missing .git/worktrees/worktree/NOTES_MERGE_REF
+
+Auto-merging notes for 02f8a63df5a5eb7863e18dffcbc422a31a01d39e
+CONFLICT (delete/modify): Notes for object 02f8a63df5a5eb7863e18dffcbc422a31a01d39e deleted in refs/notes/y and modified in refs/notes/z. Version from refs/notes/z left in tree.
+fatal: a notes merge into refs/notes/y is already in-progress at /build/git-2.20.1/t/trash directory.t3320-notes-merge-worktrees
+ok 8 - merge z into y while mid-merge in another workdir fails
+
+expecting success: 
+	(
+		cd worktree2 &&
+		git config core.notesRef refs/notes/x &&
+		test_must_fail git notes merge z >out 2>&1 &&
+		test_i18ngrep "Automatic notes merge failed" out &&
+		grep -v "A notes merge into refs/notes/x is already in-progress in" out
+	) &&
+	echo "ref: refs/notes/x" >expect &&
+	test_cmp expect .git/worktrees/worktree2/NOTES_MERGE_REF
+
+Automatic notes merge failed. Fix conflicts in /build/git-2.20.1/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/git-2.20.1/t/trash directory.t3320-notes-merge-worktrees/.git/worktrees/worktree2/NOTES_MERGE_WORKTREE and commit the result with 'git notes merge --commit', or abort the merge with 'git notes merge --abort'.
+Auto-merging notes for 02f8a63df5a5eb7863e18dffcbc422a31a01d39e
+CONFLICT (content): Merge conflict in notes for object 02f8a63df5a5eb7863e18dffcbc422a31a01d39e
+ok 9 - merge z into x while mid-merge on y succeeds
+
+# passed all 9 test(s)
+1..9
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
 *** t3210-pack-refs.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3210-pack-refs/.git/
 expecting success: 
@@ -60950,7 +61313,7 @@
      git update-index --add A &&
      git commit -m "Initial commit." &&
      HEAD=$(git rev-parse --verify HEAD)
-[master (root-commit) 89a21f6] Initial commit.
+[master (root-commit) 673aa39] Initial commit.
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 A
@@ -61007,8 +61370,8 @@
      git branch g &&
      git pack-refs --all &&
      git branch -d g
-Deleted branch g/h (was 89a21f6).
-Deleted branch g (was 89a21f6).
+Deleted branch g/h (was 673aa39).
+Deleted branch g (was 673aa39).
 ok 9 - git branch g should work when git branch g/h has been deleted
 
 expecting success: 
@@ -61026,9 +61389,9 @@
      git branch -d k/l/m &&
      git branch -d k/lm &&
      git branch k
-Deleted branch k/l (was 89a21f6).
-Deleted branch k/l/m (was 89a21f6).
-Deleted branch k/lm (was 89a21f6).
+Deleted branch k/l (was 673aa39).
+Deleted branch k/l/m (was 673aa39).
+Deleted branch k/lm (was 673aa39).
 ok 11 - test git branch k after branch k/l/m and k/lm have been deleted
 
 expecting success: git branch n/o &&
@@ -61039,9 +61402,9 @@
      git pack-refs --all --prune &&
      git branch -d n/o/p &&
      git branch n
-Deleted branch n/o (was 89a21f6).
-Deleted branch n/op (was 89a21f6).
-Deleted branch n/o/p (was 89a21f6).
+Deleted branch n/o (was 673aa39).
+Deleted branch n/op (was 673aa39).
+Deleted branch n/o/p (was 673aa39).
 ok 12 - test git branch n after some branch deletion and pruning
 
 expecting success: git branch q &&
@@ -61069,9 +61432,9 @@
 	git pack-refs --all 2>result &&
 	test_must_be_empty result
 
-[master 6c0c70a] soon to be garbage-collected
+[master da4bf53] soon to be garbage-collected
  Author: A U Thor <author@example.com>
-HEAD is now at 89a21f6 Initial commit.
+HEAD is now at 673aa39 Initial commit.
 ok 15 - explicit pack-refs with dangling packed reference
 
 expecting success: 
@@ -61086,11 +61449,11 @@
 	test_must_be_empty result
 
 Switched to a new branch 'lamb'
-[lamb f9a7cf4] future garbage
+[lamb f973a4d] future garbage
  Author: A U Thor <author@example.com>
-HEAD is now at 89a21f6 Initial commit.
+HEAD is now at 673aa39 Initial commit.
 Switched to branch 'master'
-Deleted branch lamb (was 89a21f6).
+Deleted branch lamb (was 673aa39).
 ok 16 - delete ref with dangling packed version
 
 expecting success: 
@@ -61103,10 +61466,10 @@
 	git branch -d lamb 2>result &&
 	test_must_be_empty result
 
-[master f9a7cf4] future garbage
+[master f973a4d] future garbage
  Author: A U Thor <author@example.com>
-HEAD is now at 89a21f6 Initial commit.
-Deleted branch lamb (was 89a21f6).
+HEAD is now at 673aa39 Initial commit.
+Deleted branch lamb (was 673aa39).
 ok 17 - delete ref while another dangling packed ref
 
 expecting success: 
@@ -61115,7 +61478,7 @@
 	grep refs/top .git/packed-refs &&
 	test_path_is_missing .git/refs/top
 
-89a21f60170aeabe0d5ea1ffda1161fbbd08a871 refs/top
+673aa398bbf11e2154a897dd822d89bb2a4896fb refs/top
 ok 18 - pack ref directly below refs/
 
 expecting success: 
@@ -61249,102 +61612,6 @@
 1..30
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t3320-notes-merge-worktrees.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3320-notes-merge-worktrees/.git/
-expecting success: 
-	test_commit tantrum
-
-[master (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: 
-	git config core.notesRef refs/notes/x &&
-	git notes add -m "x notes on tantrum" tantrum
-
-ok 2 - setup notes ref (x)
-
-expecting success: 
-	git update-ref refs/notes/y refs/notes/x &&
-	git config core.notesRef refs/notes/y &&
-	git notes remove tantrum
-
-Removing note for object tantrum
-ok 3 - setup local branch (y)
-
-expecting success: 
-	git update-ref refs/notes/z refs/notes/x &&
-	git config core.notesRef refs/notes/z &&
-	git notes add -f -m "conflicting notes on tantrum" tantrum
-
-Overwriting existing notes for object 02f8a63df5a5eb7863e18dffcbc422a31a01d39e
-ok 4 - setup remote branch (z)
-
-expecting success: 
-	git config core.notesRef refs/notes/x &&
-	git notes add -f -m "more conflicting notes on tantrum" tantrum
-
-Overwriting existing notes for object 02f8a63df5a5eb7863e18dffcbc422a31a01d39e
-ok 5 - modify notes ref ourselves (x)
-
-expecting success: 
-	git worktree add -b newbranch worktree master &&
-	git worktree add -b newbranch2 worktree2 master
-
-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: 
-	git config core.notesRef refs/notes/y &&
-	test_must_fail git notes merge z &&
-	echo "ref: refs/notes/y" >expect &&
-	test_cmp expect .git/NOTES_MERGE_REF
-
-Automatic notes merge failed. Fix conflicts in .git/NOTES_MERGE_WORKTREE and commit the result with 'git notes merge --commit', or abort the merge with 'git notes merge --abort'.
-Auto-merging notes for 02f8a63df5a5eb7863e18dffcbc422a31a01d39e
-CONFLICT (delete/modify): Notes for object 02f8a63df5a5eb7863e18dffcbc422a31a01d39e deleted in refs/notes/y and modified in refs/notes/z. Version from refs/notes/z left in tree.
-ok 7 - merge z into y fails and sets NOTES_MERGE_REF
-
-expecting success: 
-	(
-		cd worktree &&
-		git config core.notesRef refs/notes/y &&
-		test_must_fail git notes merge z 2>err &&
-		test_i18ngrep "a notes merge into refs/notes/y is already in-progress at" err
-	) &&
-	test_path_is_missing .git/worktrees/worktree/NOTES_MERGE_REF
-
-Auto-merging notes for 02f8a63df5a5eb7863e18dffcbc422a31a01d39e
-CONFLICT (delete/modify): Notes for object 02f8a63df5a5eb7863e18dffcbc422a31a01d39e deleted in refs/notes/y and modified in refs/notes/z. Version from refs/notes/z left in tree.
-fatal: a notes merge into refs/notes/y is already in-progress at /build/git-2.20.1/t/trash directory.t3320-notes-merge-worktrees
-ok 8 - merge z into y while mid-merge in another workdir fails
-
-expecting success: 
-	(
-		cd worktree2 &&
-		git config core.notesRef refs/notes/x &&
-		test_must_fail git notes merge z >out 2>&1 &&
-		test_i18ngrep "Automatic notes merge failed" out &&
-		grep -v "A notes merge into refs/notes/x is already in-progress in" out
-	) &&
-	echo "ref: refs/notes/x" >expect &&
-	test_cmp expect .git/worktrees/worktree2/NOTES_MERGE_REF
-
-Automatic notes merge failed. Fix conflicts in /build/git-2.20.1/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/git-2.20.1/t/trash directory.t3320-notes-merge-worktrees/.git/worktrees/worktree2/NOTES_MERGE_WORKTREE and commit the result with 'git notes merge --commit', or abort the merge with 'git notes merge --abort'.
-Auto-merging notes for 02f8a63df5a5eb7863e18dffcbc422a31a01d39e
-CONFLICT (content): Merge conflict in notes for object 02f8a63df5a5eb7863e18dffcbc422a31a01d39e
-ok 9 - merge z into x while mid-merge on y succeeds
-
-# passed all 9 test(s)
-1..9
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
 *** t3308-notes-merge.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3308-notes-merge/.git/
 expecting success: 
@@ -61983,7 +62250,7 @@
 	)
 
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3401-rebase-and-am-rename/dir-rename/.git/
-[master (root-commit) c4a0f33] Initial
+[master (root-commit) 2faf049] Initial
  Author: A U Thor <author@example.com>
  4 files changed, 39 insertions(+)
  create mode 100644 l
@@ -61991,7 +62258,7 @@
  create mode 100644 x/b
  create mode 100644 x/c
 Switched to branch 'A'
-[A 113c079] Rename x to y, l to letters
+[A 44b5e91] Rename x to y, l to letters
  Author: A U Thor <author@example.com>
  4 files changed, 0 insertions(+), 0 deletions(-)
  rename l => letters (100%)
@@ -61999,7 +62266,7 @@
  rename {x => y}/b (100%)
  rename {x => y}/c (100%)
 Switched to branch 'B'
-[B b8278a6] Modify l, add x/d
+[B 6c87dff] Modify l, add x/d
  Author: A U Thor <author@example.com>
  2 files changed, 11 insertions(+)
  create mode 100644 x/d
@@ -62032,12 +62299,12 @@
 
   git checkout -b <new-branch-name>
 
-HEAD is now at b8278a6 Modify l, add x/d
+HEAD is now at 6c87dff Modify l, add x/d
 rebase -i script before editing:
-pick b8278a6 Modify l, add x/d
+pick 6c87dff Modify l, add x/d
 
 rebase -i script after editing:
-pick b8278a6 Modify l, add x/d
+pick 6c87dff Modify l, add x/d
 Rebasing (1/1)
Successfully rebased and updated detached HEAD.
 ok 2 - rebase --interactive: directory rename detected
 
@@ -62059,21 +62326,21 @@
 Warning: you are leaving 1 commit behind, not connected to
 any of your branches:
 
-  209d7e9 Modify l, add x/d
+  1ccbff8 Modify l, add x/d
 
 If you want to keep it by creating a new branch, this may be a good time
 to do so with:
 
- git branch <new-branch-name> 209d7e9
+ git branch <new-branch-name> 1ccbff8
 
-HEAD is now at b8278a6 Modify l, add x/d
+HEAD is now at 6c87dff Modify l, add x/d
 First, rewinding head to replay your work on top of it...
 Applying: Modify l, add x/d
 Using index info to reconstruct a base tree...
 A	l
 Falling back to patching base and 3-way merge...
 Merging:
-113c079 Rename x to y, l to letters
+44b5e91 Rename x to y, l to letters
 virtual Modify l, add x/d
 found 1 common ancestor:
 virtual 4f45812d96b9febe1d7595b91de345b0a05fb0d4
@@ -62098,27 +62365,27 @@
 Warning: you are leaving 1 commit behind, not connected to
 any of your branches:
 
-  1714e67 Modify l, add x/d
+  8cb62f6 Modify l, add x/d
 
 If you want to keep it by creating a new branch, this may be a good time
 to do so with:
 
- git branch <new-branch-name> 1714e67
+ git branch <new-branch-name> 8cb62f6
 
-HEAD is now at b8278a6 Modify l, add x/d
+HEAD is now at 6c87dff Modify l, add x/d
 First, rewinding head to replay your work on top of it...
 Merging A with HEAD~0
 Merging:
-113c079 Rename x to y, l to letters
-b8278a6 Modify l, add x/d
+44b5e91 Rename x to y, l to letters
+6c87dff Modify l, add x/d
 found 1 common ancestor:
-c4a0f33 Initial
+2faf049 Initial
 Skipped y/c (merged same as existing)
 Skipped y/b (merged same as existing)
 Skipped y/a (merged same as existing)
-[detached HEAD 406f230] Modify l, add x/d
+[detached HEAD a61cb09] Modify l, add x/d
  Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:05:19 2021 +0000
+ Date: Thu Jan 5 11:47:20 2023 +0000
  2 files changed, 11 insertions(+)
  create mode 100644 y/d
 Committed: 0001 Modify l, add x/d
@@ -62145,21 +62412,21 @@
 Warning: you are leaving 1 commit behind, not connected to
 any of your branches:
 
-  406f230 Modify l, add x/d
+  a61cb09 Modify l, add x/d
 
 If you want to keep it by creating a new branch, this may be a good time
 to do so with:
 
- git branch <new-branch-name> 406f230
+ git branch <new-branch-name> a61cb09
 
-HEAD is now at 113c079 Rename x to y, l to letters
+HEAD is now at 44b5e91 Rename x to y, l to letters
 0001-Modify-l-add-x-d.patch
 Applying: Modify l, add x/d
 Using index info to reconstruct a base tree...
 A	l
 Falling back to patching base and 3-way merge...
 Merging:
-113c079 Rename x to y, l to letters
+44b5e91 Rename x to y, l to letters
 virtual Modify l, add x/d
 found 1 common ancestor:
 virtual 4f45812d96b9febe1d7595b91de345b0a05fb0d4
@@ -62197,7 +62464,7 @@
 	)
 
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3401-rebase-and-am-rename/no-dir-rename/.git/
-[master (root-commit) b19c31e] Initial
+[master (root-commit) a04b3f5] Initial
  Author: A U Thor <author@example.com>
  4 files changed, 31 insertions(+)
  create mode 100644 project_info
@@ -62205,11 +62472,11 @@
  create mode 100644 x/b
  create mode 100644 x/c
 Switched to branch 'A'
-[A d4388a0] Modify project_info
+[A cef5eb1] Modify project_info
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 Switched to branch 'B'
-[B db53870] Rename x/c to y/c, modify project_info
+[B fece823] Rename x/c to y/c, modify project_info
  Author: A U Thor <author@example.com>
  2 files changed, 1 insertion(+), 1 deletion(-)
  rename {x => y}/c (100%)
@@ -62244,20 +62511,20 @@
 
   git checkout -b <new-branch-name>
 
-HEAD is now at db53870 Rename x/c to y/c, modify project_info
+HEAD is now at fece823 Rename x/c to y/c, modify project_info
 rebase -i script before editing:
-pick db53870 Rename x/c to y/c, modify project_info
+pick fece823 Rename x/c to y/c, modify project_info
 
 rebase -i script after editing:
-pick db53870 Rename x/c to y/c, modify project_info
+pick fece823 Rename x/c to y/c, modify project_info
 Rebasing (1/1)
Auto-merging project_info
 CONFLICT (content): Merge conflict in project_info
-error: could not apply db53870... Rename x/c to y/c, modify project_info
+error: could not apply fece823... Rename x/c to y/c, modify project_info
 Resolve all conflicts manually, mark them as resolved with
 "git add/rm <conflicted_files>", then run "git rebase --continue".
 You can instead skip this commit: run "git rebase --skip".
 To abort and get back to the state before "git rebase", run "git rebase --abort".
-Could not apply db53870... Rename x/c to y/c, modify project_info
+Could not apply fece823... Rename x/c to y/c, modify project_info
 ok 7 - rebase --interactive: NO directory rename
 
 expecting success: 
@@ -62278,14 +62545,14 @@
 		test_path_is_missing x/c
 	)
 
-HEAD is now at db53870 Rename x/c to y/c, modify project_info
+HEAD is now at fece823 Rename x/c to y/c, modify project_info
 First, rewinding head to replay your work on top of it...
 Applying: Rename x/c to y/c, modify project_info
 Using index info to reconstruct a base tree...
 M	project_info
 Falling back to patching base and 3-way merge...
 Merging:
-d4388a0 Modify project_info
+cef5eb1 Modify project_info
 virtual Rename x/c to y/c, modify project_info
 found 1 common ancestor:
 virtual 70041a03917eeabc905137ab5853aed716a92bc6
@@ -62320,14 +62587,14 @@
 		test_path_is_missing x/c
 	)
 
-HEAD is now at db53870 Rename x/c to y/c, modify project_info
+HEAD is now at fece823 Rename x/c to y/c, modify project_info
 First, rewinding head to replay your work on top of it...
 Merging A with HEAD~0
 Merging:
-d4388a0 Modify project_info
-db53870 Rename x/c to y/c, modify project_info
+cef5eb1 Modify project_info
+fece823 Rename x/c to y/c, modify project_info
 found 1 common ancestor:
-b19c31e Initial
+a04b3f5 Initial
 Auto-merging project_info
 CONFLICT (content): Merge conflict in project_info
 
@@ -62357,15 +62624,15 @@
 		test_path_is_missing x/c
 	)
 
-Previous HEAD position was db53870 Rename x/c to y/c, modify project_info
-HEAD is now at d4388a0 Modify project_info
+Previous HEAD position was fece823 Rename x/c to y/c, modify project_info
+HEAD is now at cef5eb1 Modify project_info
 0001-Rename-x-c-to-y-c-modify-project_info.patch
 Applying: Rename x/c to y/c, modify project_info
 Using index info to reconstruct a base tree...
 M	project_info
 Falling back to patching base and 3-way merge...
 Merging:
-d4388a0 Modify project_info
+cef5eb1 Modify project_info
 virtual Rename x/c to y/c, modify project_info
 found 1 common ancestor:
 virtual 70041a03917eeabc905137ab5853aed716a92bc6
@@ -62384,6 +62651,274 @@
 1..10
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
+*** t3403-rebase-skip.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3403-rebase-skip/.git/
+expecting success: 
+	echo hello > hello &&
+	git add hello &&
+	git commit -m "hello" &&
+	git branch skip-reference &&
+
+	echo world >> hello &&
+	git commit -a -m "hello world" &&
+	echo goodbye >> hello &&
+	git commit -a -m "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
+	
+[master (root-commit) f841d83] hello
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 hello
+[master d8df06e] hello world
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master c7ba6aa] goodbye
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Switched to branch 'skip-reference'
+[skip-reference 1ba7e14] we should skip this
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[skip-reference 164f39a] 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: 
+	test_must_fail git rebase master
+
+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:
+c7ba6aa 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' to see the failed patch
+Patch failed at 0001 we should skip this
+
+Resolve all conflicts manually, mark them as resolved with
+"git add/rm <conflicted_files>", then run "git rebase --continue".
+You can instead skip this commit: run "git rebase --skip".
+To abort and get back to the state before "git rebase", run "git rebase --abort".
+
+ok 2 - rebase with git am -3 (default)
+
+expecting success: 
+	test_must_fail git rebase -v --skip &&
+	test_must_fail git rebase --skip -v
+
+usage: git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] [<upstream>] [<branch>]
+   or: git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]
+   or: git rebase --continue | --abort | --skip | --edit-todo
+
+    --onto <revision>     rebase onto given branch instead of upstream
+    --no-verify           allow pre-rebase hook to run
+    -q, --quiet           be quiet. implies --no-stat
+    -v, --verbose         display a diffstat of what changed upstream
+    -n, --no-stat         do not show diffstat of what changed upstream
+    --signoff             add a Signed-off-by: line to each commit
+    --ignore-whitespace   passed to 'git am'
+    --committer-date-is-author-date
+                          passed to 'git am'
+    --ignore-date         passed to 'git am'
+    -C <n>                passed to 'git apply'
+    --whitespace <action>
+                          passed to 'git apply'
+    -f, --force-rebase    cherry-pick all commits, even if unchanged
+    --no-ff               cherry-pick all commits, even if unchanged
+    --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
+    -m, --merge           use merging strategies to rebase
+    -i, --interactive     let the user edit the list of commits to rebase
+    -p, --preserve-merges
+                          try to recreate merges instead of ignoring them
+    --rerere-autoupdate   allow rerere to update index with resolved conflict
+    -k, --keep-empty      preserve empty commits during rebase
+    --autosquash          move commits that begin with squash!/fixup! under -i
+    -S, --gpg-sign[=<key-id>]
+                          GPG-sign commits
+    --autostash           automatically stash/stash pop before and after
+    -x, --exec <exec>     add exec lines after each commit of the editable list
+    --allow-empty-message
+                          allow rebasing commits with empty messages
+    -r, --rebase-merges[=<mode>]
+                          try to rebase merges instead of skipping them
+    --fork-point          use 'merge-base --fork-point' to refine upstream
+    -s, --strategy <strategy>
+                          use the given merge strategy
+    -X, --strategy-option <option>
+                          pass the argument through to the merge strategy
+    --root                rebase all reachable commits up to the root(s)
+
+usage: git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] [<upstream>] [<branch>]
+   or: git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]
+   or: git rebase --continue | --abort | --skip | --edit-todo
+
+    --onto <revision>     rebase onto given branch instead of upstream
+    --no-verify           allow pre-rebase hook to run
+    -q, --quiet           be quiet. implies --no-stat
+    -v, --verbose         display a diffstat of what changed upstream
+    -n, --no-stat         do not show diffstat of what changed upstream
+    --signoff             add a Signed-off-by: line to each commit
+    --ignore-whitespace   passed to 'git am'
+    --committer-date-is-author-date
+                          passed to 'git am'
+    --ignore-date         passed to 'git am'
+    -C <n>                passed to 'git apply'
+    --whitespace <action>
+                          passed to 'git apply'
+    -f, --force-rebase    cherry-pick all commits, even if unchanged
+    --no-ff               cherry-pick all commits, even if unchanged
+    --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
+    -m, --merge           use merging strategies to rebase
+    -i, --interactive     let the user edit the list of commits to rebase
+    -p, --preserve-merges
+                          try to recreate merges instead of ignoring them
+    --rerere-autoupdate   allow rerere to update index with resolved conflict
+    -k, --keep-empty      preserve empty commits during rebase
+    --autosquash          move commits that begin with squash!/fixup! under -i
+    -S, --gpg-sign[=<key-id>]
+                          GPG-sign commits
+    --autostash           automatically stash/stash pop before and after
+    -x, --exec <exec>     add exec lines after each commit of the editable list
+    --allow-empty-message
+                          allow rebasing commits with empty messages
+    -r, --rebase-merges[=<mode>]
+                          try to rebase merges instead of skipping them
+    --fork-point          use 'merge-base --fork-point' to refine upstream
+    -s, --strategy <strategy>
+                          use the given merge strategy
+    -X, --strategy-option <option>
+                          pass the argument through to the merge strategy
+    --root                rebase all reachable commits up to the root(s)
+
+ok 3 - rebase --skip can not be used with other options
+
+expecting success: 
+	git rebase --skip
+	
+Applying: this should not be skipped
+ok 4 - rebase --skip with am -3
+
+expecting success: 
+	test refs/heads/skip-reference = $(git symbolic-ref HEAD) &&
+	git branch post-rebase &&
+	git reset --hard pre-rebase &&
+	test_must_fail git rebase master &&
+	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 164f39a this should not be skipped
+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:
+c7ba6aa 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' to see the failed patch
+Patch failed at 0001 we should skip this
+
+Resolve all conflicts manually, mark them as resolved with
+"git add/rm <conflicted_files>", then run "git rebase --continue".
+You can instead skip this commit: run "git rebase --skip".
+To abort and get back to the state before "git rebase", run "git rebase --abort".
+
+Applying: we should skip this
+Applying: this should not be skipped
+HEAD is now at 7ed495f this should not be skipped
+ok 5 - rebase moves back to skip-reference
+
+expecting success: git checkout -f skip-merge
+Switched to branch 'skip-merge'
+ok 6 - checkout skip-merge
+
+expecting success: 
+	test_must_fail git rebase --merge master
+
+First, rewinding head to replay your work on top of it...
+Merging master with HEAD~1
+Merging:
+c7ba6aa goodbye
+1ba7e14 we should skip this
+found 1 common ancestor:
+f841d83 hello
+Auto-merging hello
+CONFLICT (content): Merge conflict in hello
+
+Resolve all conflicts manually, mark them as resolved with
+"git add/rm <conflicted_files>", then run "git rebase --continue".
+You can instead skip this commit: run "git rebase --skip".
+To abort and get back to the state before "git rebase", run "git rebase --abort".
+
+ok 7 - rebase with --merge
+
+expecting success: 
+	git rebase --skip
+
+Merging master with HEAD~0
+Merging:
+c7ba6aa goodbye
+164f39a this should not be skipped
+found 1 common ancestor:
+1ba7e14 we should skip this
+[detached HEAD b123f29] this should not be skipped
+ Author: A U Thor <author@example.com>
+ Date: Thu Jan 5 11:47:21 2023 +0000
+ 1 file changed, 1 insertion(+)
+ create mode 100644 cow
+Committed: 0002 this should not be skipped
+All done.
+ok 8 - rebase --skip with --merge
+
+expecting success: 
+	test -z "$(git diff-tree skip-merge skip-reference)"
+
+ok 9 - merge and reference trees equal
+
+expecting success: 
+	test refs/heads/skip-merge = $(git symbolic-ref HEAD)
+
+ok 10 - moved back to branch correctly
+
+# passed all 10 test(s)
+1..10
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
 *** t3310-notes-merge-manual-resolve.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3310-notes-merge-manual-resolve/.git/
 expecting success: 
@@ -62803,274 +63338,6 @@
 1..22
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t3403-rebase-skip.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3403-rebase-skip/.git/
-expecting success: 
-	echo hello > hello &&
-	git add hello &&
-	git commit -m "hello" &&
-	git branch skip-reference &&
-
-	echo world >> hello &&
-	git commit -a -m "hello world" &&
-	echo goodbye >> hello &&
-	git commit -a -m "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
-	
-[master (root-commit) ba75280] hello
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 hello
-[master 9562d87] hello world
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[master a7309a6] goodbye
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Switched to branch 'skip-reference'
-[skip-reference cfd418d] we should skip this
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[skip-reference ba43376] 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: 
-	test_must_fail git rebase master
-
-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:
-a7309a6 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' to see the failed patch
-Patch failed at 0001 we should skip this
-
-Resolve all conflicts manually, mark them as resolved with
-"git add/rm <conflicted_files>", then run "git rebase --continue".
-You can instead skip this commit: run "git rebase --skip".
-To abort and get back to the state before "git rebase", run "git rebase --abort".
-
-ok 2 - rebase with git am -3 (default)
-
-expecting success: 
-	test_must_fail git rebase -v --skip &&
-	test_must_fail git rebase --skip -v
-
-usage: git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] [<upstream>] [<branch>]
-   or: git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]
-   or: git rebase --continue | --abort | --skip | --edit-todo
-
-    --onto <revision>     rebase onto given branch instead of upstream
-    --no-verify           allow pre-rebase hook to run
-    -q, --quiet           be quiet. implies --no-stat
-    -v, --verbose         display a diffstat of what changed upstream
-    -n, --no-stat         do not show diffstat of what changed upstream
-    --signoff             add a Signed-off-by: line to each commit
-    --ignore-whitespace   passed to 'git am'
-    --committer-date-is-author-date
-                          passed to 'git am'
-    --ignore-date         passed to 'git am'
-    -C <n>                passed to 'git apply'
-    --whitespace <action>
-                          passed to 'git apply'
-    -f, --force-rebase    cherry-pick all commits, even if unchanged
-    --no-ff               cherry-pick all commits, even if unchanged
-    --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
-    -m, --merge           use merging strategies to rebase
-    -i, --interactive     let the user edit the list of commits to rebase
-    -p, --preserve-merges
-                          try to recreate merges instead of ignoring them
-    --rerere-autoupdate   allow rerere to update index with resolved conflict
-    -k, --keep-empty      preserve empty commits during rebase
-    --autosquash          move commits that begin with squash!/fixup! under -i
-    -S, --gpg-sign[=<key-id>]
-                          GPG-sign commits
-    --autostash           automatically stash/stash pop before and after
-    -x, --exec <exec>     add exec lines after each commit of the editable list
-    --allow-empty-message
-                          allow rebasing commits with empty messages
-    -r, --rebase-merges[=<mode>]
-                          try to rebase merges instead of skipping them
-    --fork-point          use 'merge-base --fork-point' to refine upstream
-    -s, --strategy <strategy>
-                          use the given merge strategy
-    -X, --strategy-option <option>
-                          pass the argument through to the merge strategy
-    --root                rebase all reachable commits up to the root(s)
-
-usage: git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] [<upstream>] [<branch>]
-   or: git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]
-   or: git rebase --continue | --abort | --skip | --edit-todo
-
-    --onto <revision>     rebase onto given branch instead of upstream
-    --no-verify           allow pre-rebase hook to run
-    -q, --quiet           be quiet. implies --no-stat
-    -v, --verbose         display a diffstat of what changed upstream
-    -n, --no-stat         do not show diffstat of what changed upstream
-    --signoff             add a Signed-off-by: line to each commit
-    --ignore-whitespace   passed to 'git am'
-    --committer-date-is-author-date
-                          passed to 'git am'
-    --ignore-date         passed to 'git am'
-    -C <n>                passed to 'git apply'
-    --whitespace <action>
-                          passed to 'git apply'
-    -f, --force-rebase    cherry-pick all commits, even if unchanged
-    --no-ff               cherry-pick all commits, even if unchanged
-    --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
-    -m, --merge           use merging strategies to rebase
-    -i, --interactive     let the user edit the list of commits to rebase
-    -p, --preserve-merges
-                          try to recreate merges instead of ignoring them
-    --rerere-autoupdate   allow rerere to update index with resolved conflict
-    -k, --keep-empty      preserve empty commits during rebase
-    --autosquash          move commits that begin with squash!/fixup! under -i
-    -S, --gpg-sign[=<key-id>]
-                          GPG-sign commits
-    --autostash           automatically stash/stash pop before and after
-    -x, --exec <exec>     add exec lines after each commit of the editable list
-    --allow-empty-message
-                          allow rebasing commits with empty messages
-    -r, --rebase-merges[=<mode>]
-                          try to rebase merges instead of skipping them
-    --fork-point          use 'merge-base --fork-point' to refine upstream
-    -s, --strategy <strategy>
-                          use the given merge strategy
-    -X, --strategy-option <option>
-                          pass the argument through to the merge strategy
-    --root                rebase all reachable commits up to the root(s)
-
-ok 3 - rebase --skip can not be used with other options
-
-expecting success: 
-	git rebase --skip
-	
-Applying: this should not be skipped
-ok 4 - rebase --skip with am -3
-
-expecting success: 
-	test refs/heads/skip-reference = $(git symbolic-ref HEAD) &&
-	git branch post-rebase &&
-	git reset --hard pre-rebase &&
-	test_must_fail git rebase master &&
-	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 ba43376 this should not be skipped
-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:
-a7309a6 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' to see the failed patch
-Patch failed at 0001 we should skip this
-
-Resolve all conflicts manually, mark them as resolved with
-"git add/rm <conflicted_files>", then run "git rebase --continue".
-You can instead skip this commit: run "git rebase --skip".
-To abort and get back to the state before "git rebase", run "git rebase --abort".
-
-Applying: we should skip this
-Applying: this should not be skipped
-HEAD is now at 9c9ec9e this should not be skipped
-ok 5 - rebase moves back to skip-reference
-
-expecting success: git checkout -f skip-merge
-Switched to branch 'skip-merge'
-ok 6 - checkout skip-merge
-
-expecting success: 
-	test_must_fail git rebase --merge master
-
-First, rewinding head to replay your work on top of it...
-Merging master with HEAD~1
-Merging:
-a7309a6 goodbye
-cfd418d we should skip this
-found 1 common ancestor:
-ba75280 hello
-Auto-merging hello
-CONFLICT (content): Merge conflict in hello
-
-Resolve all conflicts manually, mark them as resolved with
-"git add/rm <conflicted_files>", then run "git rebase --continue".
-You can instead skip this commit: run "git rebase --skip".
-To abort and get back to the state before "git rebase", run "git rebase --abort".
-
-ok 7 - rebase with --merge
-
-expecting success: 
-	git rebase --skip
-
-Merging master with HEAD~0
-Merging:
-a7309a6 goodbye
-ba43376 this should not be skipped
-found 1 common ancestor:
-cfd418d we should skip this
-[detached HEAD a1bb307] this should not be skipped
- Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:05:24 2021 +0000
- 1 file changed, 1 insertion(+)
- create mode 100644 cow
-Committed: 0002 this should not be skipped
-All done.
-ok 8 - rebase --skip with --merge
-
-expecting success: 
-	test -z "$(git diff-tree skip-merge skip-reference)"
-
-ok 9 - merge and reference trees equal
-
-expecting success: 
-	test refs/heads/skip-merge = $(git symbolic-ref HEAD)
-
-ok 10 - moved back to branch correctly
-
-# passed all 10 test(s)
-1..10
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
 *** t3405-rebase-malformed.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3405-rebase-malformed/.git/
 expecting success: 
@@ -63237,26 +63504,26 @@
 	git branch test-conflicts side &&
 	git checkout -b test-merge side
 
-[master (root-commit) 643acbc] initial
+[master (root-commit) f1f7b83] initial
  Author: A U Thor <author@example.com>
  1 file changed, 20 insertions(+)
  create mode 100644 original
-[master 0f23c8a] master updates a bit.
+[master a37c6a8] master updates a bit.
  Author: A U Thor <author@example.com>
  1 file changed, 2 insertions(+)
-[master 884fec4] master updates a bit more.
+[master dda50e1] master updates a bit more.
  Author: A U Thor <author@example.com>
  1 file changed, 2 insertions(+)
 Switched to branch 'side'
-[side dc12a44] side renames and edits.
+[side 77a4ae4] side renames and edits.
  Author: A U Thor <author@example.com>
  1 file changed, 2 insertions(+)
  rename original => renamed (90%)
-[side eee75cf] side edits further.
+[side 222b6aa] side edits further.
  Author: A U Thor <author@example.com>
  1 file changed, 20 insertions(+)
  create mode 100644 newfile
-[side e1552a8] side edits once again.
+[side 96e300e] side edits once again.
  Author: A U Thor <author@example.com>
  1 file changed, 20 insertions(+), 20 deletions(-)
  rewrite newfile (100%)
@@ -63267,10 +63534,10 @@
 	git merge -s recursive -m "reference merge" master
 
 Merging:
-e1552a8 side edits once again.
+96e300e side edits once again.
 virtual master
 found 1 common ancestor:
-643acbc initial
+f1f7b83 initial
 Auto-merging renamed
 Merge made by the 'recursive' strategy.
  renamed | 4 ++++
@@ -63285,85 +63552,85 @@
 trace: built-in: git rebase --merge master
 trace: run_command: git config --bool rebase.usebuiltin
 trace: built-in: git config --bool rebase.usebuiltin
-trace: run_command: 'GIT_DIR='\''/build/git-2.20.1/t/trash directory.t3402-rebase-merge/.git'\''; state_dir='\''.git/rebase-merge'\''; upstream_name='\''master'\''; upstream='\''884fec47fb62f0aa58c6bab616f4f128fe907309'\''; head_name='\''refs/heads/test-rebase'\''; orig_head='\''e1552a8957988e36f6c1945d39ce1423c70e9706'\''; onto='\''884fec47fb62f0aa58c6bab616f4f128fe907309'\''; onto_name='\''master'\''; revisions='\''884fec47fb62f0aa58c6bab616f4f128fe907309..e1552a8957988e36f6c1945d39ce1423c70e9706'\''; unset restrict_revision; GIT_QUIET='\'''\''; git_am_opt='\'''\''; verbose='\'''\''; diffstat='\'''\''; force_rebase='\'''\''; action='\'''\''; signoff='\'''\''; allow_rerere_autoupdate='\'''\''; keep_empty='\'''\''; autosquash='\'''\''; unset gpg_sign_opt; unset cmd; allow_empty_message='\''--allow-empty-message'\''; rebase_merges='\'''\''; rebase_cousins='\'''\''; unset strategy; unset strategy_opts; rebase_root='\'''\''; squash_onto='\'''\''; git_format_patch_opt='\'''\''; . git-sh-setup && . git-rebase--common && . git-rebase--merge && git_rebase__merge'
+trace: run_command: 'GIT_DIR='\''/build/git-2.20.1/t/trash directory.t3402-rebase-merge/.git'\''; state_dir='\''.git/rebase-merge'\''; upstream_name='\''master'\''; upstream='\''dda50e18f94809bc12479826ae6bdc38bc2648ff'\''; head_name='\''refs/heads/test-rebase'\''; orig_head='\''96e300ecaadb9407262116d292d91f331dea4b07'\''; onto='\''dda50e18f94809bc12479826ae6bdc38bc2648ff'\''; onto_name='\''master'\''; revisions='\''dda50e18f94809bc12479826ae6bdc38bc2648ff..96e300ecaadb9407262116d292d91f331dea4b07'\''; unset restrict_revision; GIT_QUIET='\'''\''; git_am_opt='\'''\''; verbose='\'''\''; diffstat='\'''\''; force_rebase='\'''\''; action='\'''\''; signoff='\'''\''; allow_rerere_autoupdate='\'''\''; keep_empty='\'''\''; autosquash='\'''\''; unset gpg_sign_opt; unset cmd; allow_empty_message='\''--allow-empty-message'\''; rebase_merges='\'''\''; rebase_cousins='\'''\''; unset strategy; unset strategy_opts; rebase_root='\'''\''; squash_onto='\'''\''; git_format_patch_opt='\'''\''; . git-sh-setup && . git-rebase--common && . git-rebase--merge && git_rebase__merge'
 First, rewinding head to replay your work on top of it...
 trace: built-in: git rev-parse --git-dir
 trace: built-in: git rev-parse --show-cdup
 trace: built-in: git rev-parse --git-path objects
 trace: built-in: git rev-parse --git-path REBASE_HEAD
-trace: built-in: git rev-list --reverse --no-merges 884fec47fb62f0aa58c6bab616f4f128fe907309..e1552a8957988e36f6c1945d39ce1423c70e9706
-trace: built-in: git update-ref REBASE_HEAD dc12a44beb50f21114144d66998eb10434beb4b3
+trace: built-in: git rev-list --reverse --no-merges dda50e18f94809bc12479826ae6bdc38bc2648ff..96e300ecaadb9407262116d292d91f331dea4b07
+trace: built-in: git update-ref REBASE_HEAD 77a4ae4d68c059f46ea48d2aa8f44a24c36c846a
 trace: built-in: git rev-parse --verify HEAD
-trace: built-in: git rev-parse --verify --quiet dc12a44beb50f21114144d66998eb10434beb4b3^
-trace: built-in: git merge-recursive 643acbc0869d7d562fbe5543163c6ad9ed2eef4a -- 884fec47fb62f0aa58c6bab616f4f128fe907309 dc12a44beb50f21114144d66998eb10434beb4b3
+trace: built-in: git rev-parse --verify --quiet 77a4ae4d68c059f46ea48d2aa8f44a24c36c846a^
+trace: built-in: git merge-recursive f1f7b83007a818fa07d5a883ea49838139ee16e5 -- dda50e18f94809bc12479826ae6bdc38bc2648ff 77a4ae4d68c059f46ea48d2aa8f44a24c36c846a
 Merging master with HEAD~2
 Merging:
-884fec4 master updates a bit more.
-dc12a44 side renames and edits.
+dda50e1 master updates a bit more.
+77a4ae4 side renames and edits.
 found 1 common ancestor:
-643acbc initial
+f1f7b83 initial
 Auto-merging renamed
 trace: built-in: git ls-files -u
 trace: built-in: git diff-index --quiet --ignore-submodules HEAD --
-trace: built-in: git commit --allow-empty-message --no-verify -C dc12a44beb50f21114144d66998eb10434beb4b3
+trace: built-in: git commit --allow-empty-message --no-verify -C 77a4ae4d68c059f46ea48d2aa8f44a24c36c846a
 trace: run_command: git gc --auto
 trace: built-in: git gc --auto
-[detached HEAD 82b6c2d] side renames and edits.
+[detached HEAD ef798be] side renames and edits.
  Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:05:20 2021 +0000
+ Date: Thu Jan 5 11:47:20 2023 +0000
  1 file changed, 2 insertions(+)
  rename original => renamed (92%)
 Committed: 0001 trace: built-in: git rev-parse HEAD^0
-trace: built-in: git log '--format=%s' -1 dc12a44beb50f21114144d66998eb10434beb4b3
+trace: built-in: git log '--format=%s' -1 77a4ae4d68c059f46ea48d2aa8f44a24c36c846a
 side renames and edits.
-trace: built-in: git update-ref REBASE_HEAD eee75cf38a95473ca2ac4340c38d00f2b988a416
+trace: built-in: git update-ref REBASE_HEAD 222b6aa5d491fa7483fbd271c3a4a8ce44dbe990
 trace: built-in: git rev-parse --verify HEAD
-trace: built-in: git rev-parse --verify --quiet eee75cf38a95473ca2ac4340c38d00f2b988a416^
-trace: built-in: git merge-recursive dc12a44beb50f21114144d66998eb10434beb4b3 -- 82b6c2d41e525f9c4476cf245180d919c17f5cf4 eee75cf38a95473ca2ac4340c38d00f2b988a416
+trace: built-in: git rev-parse --verify --quiet 222b6aa5d491fa7483fbd271c3a4a8ce44dbe990^
+trace: built-in: git merge-recursive 77a4ae4d68c059f46ea48d2aa8f44a24c36c846a -- ef798be46635d7e1b1082aecfe9ab7feed210066 222b6aa5d491fa7483fbd271c3a4a8ce44dbe990
 Merging master with HEAD~1
 Merging:
-82b6c2d side renames and edits.
-eee75cf side edits further.
+ef798be side renames and edits.
+222b6aa side edits further.
 found 1 common ancestor:
-dc12a44 side renames and edits.
+77a4ae4 side renames and edits.
 trace: built-in: git ls-files -u
 trace: built-in: git diff-index --quiet --ignore-submodules HEAD --
-trace: built-in: git commit --allow-empty-message --no-verify -C eee75cf38a95473ca2ac4340c38d00f2b988a416
+trace: built-in: git commit --allow-empty-message --no-verify -C 222b6aa5d491fa7483fbd271c3a4a8ce44dbe990
 trace: run_command: git gc --auto
 trace: built-in: git gc --auto
-[detached HEAD d892dee] side edits further.
+[detached HEAD 654b2c1] side edits further.
  Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:05:20 2021 +0000
+ Date: Thu Jan 5 11:47:20 2023 +0000
  1 file changed, 20 insertions(+)
  create mode 100644 newfile
 Committed: 0002 trace: built-in: git rev-parse HEAD^0
-trace: built-in: git log '--format=%s' -1 eee75cf38a95473ca2ac4340c38d00f2b988a416
+trace: built-in: git log '--format=%s' -1 222b6aa5d491fa7483fbd271c3a4a8ce44dbe990
 side edits further.
-trace: built-in: git update-ref REBASE_HEAD e1552a8957988e36f6c1945d39ce1423c70e9706
+trace: built-in: git update-ref REBASE_HEAD 96e300ecaadb9407262116d292d91f331dea4b07
 trace: built-in: git rev-parse --verify HEAD
-trace: built-in: git rev-parse --verify --quiet e1552a8957988e36f6c1945d39ce1423c70e9706^
-trace: built-in: git merge-recursive eee75cf38a95473ca2ac4340c38d00f2b988a416 -- d892deed386782e44701b39760733c15c72d3c87 e1552a8957988e36f6c1945d39ce1423c70e9706
+trace: built-in: git rev-parse --verify --quiet 96e300ecaadb9407262116d292d91f331dea4b07^
+trace: built-in: git merge-recursive 222b6aa5d491fa7483fbd271c3a4a8ce44dbe990 -- 654b2c1af15e1c304a4711ac220c44a6af0f8238 96e300ecaadb9407262116d292d91f331dea4b07
 Merging master with HEAD~0
 Merging:
-d892dee side edits further.
-e1552a8 side edits once again.
+654b2c1 side edits further.
+96e300e side edits once again.
 found 1 common ancestor:
-eee75cf side edits further.
+222b6aa side edits further.
 trace: built-in: git ls-files -u
 trace: built-in: git diff-index --quiet --ignore-submodules HEAD --
-trace: built-in: git commit --allow-empty-message --no-verify -C e1552a8957988e36f6c1945d39ce1423c70e9706
+trace: built-in: git commit --allow-empty-message --no-verify -C 96e300ecaadb9407262116d292d91f331dea4b07
 trace: run_command: git gc --auto
 trace: built-in: git gc --auto
-[detached HEAD 6d5ff3f] side edits once again.
+[detached HEAD 09aab20] side edits once again.
  Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:05:20 2021 +0000
+ Date: Thu Jan 5 11:47:21 2023 +0000
  1 file changed, 20 insertions(+), 20 deletions(-)
  rewrite newfile (100%)
 Committed: 0003 trace: built-in: git rev-parse HEAD^0
-trace: built-in: git log '--format=%s' -1 e1552a8957988e36f6c1945d39ce1423c70e9706
+trace: built-in: git log '--format=%s' -1 96e300ecaadb9407262116d292d91f331dea4b07
 side edits once again.
 trace: built-in: git rev-parse HEAD
-trace: built-in: git update-ref -m 'rebase finished: refs/heads/test-rebase onto 884fec47fb62f0aa58c6bab616f4f128fe907309' refs/heads/test-rebase 6d5ff3f13bb1106c9f223f51eca2214e42ed7d8c e1552a8957988e36f6c1945d39ce1423c70e9706
+trace: built-in: git update-ref -m 'rebase finished: refs/heads/test-rebase onto dda50e18f94809bc12479826ae6bdc38bc2648ff' refs/heads/test-rebase 09aab20241c8b36b690db910b4cfa52fccd68749 96e300ecaadb9407262116d292d91f331dea4b07
 trace: built-in: git symbolic-ref -m 'rebase finished: returning to refs/heads/test-rebase' HEAD refs/heads/test-rebase
 trace: built-in: git notes copy --for-rewrite=rebase
 trace: built-in: git rev-parse --git-path hooks/post-rewrite
@@ -63394,30 +63661,30 @@
 	git reset --hard master &&
 	git rebase --merge side
 
-HEAD is now at 884fec4 master updates a bit more.
+HEAD is now at dda50e1 master updates a bit more.
 First, rewinding head to replay your work on top of it...
 Merging side with HEAD~1
 Merging:
-e1552a8 side edits once again.
-0f23c8a master updates a bit.
+96e300e side edits once again.
+a37c6a8 master updates a bit.
 found 1 common ancestor:
-643acbc initial
+f1f7b83 initial
 Auto-merging renamed
-[detached HEAD bc47948] master updates a bit.
+[detached HEAD 1b9002c] master updates a bit.
  Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:05:20 2021 +0000
+ Date: Thu Jan 5 11:47:20 2023 +0000
  1 file changed, 2 insertions(+)
 Committed: 0001 master updates a bit.
 Merging side with HEAD~0
 Merging:
-bc47948 master updates a bit.
-884fec4 master updates a bit more.
+1b9002c master updates a bit.
+dda50e1 master updates a bit more.
 found 1 common ancestor:
-0f23c8a master updates a bit.
+a37c6a8 master updates a bit.
 Auto-merging renamed
-[detached HEAD e3e5af1] master updates a bit more.
+[detached HEAD 9fe49c4] master updates a bit more.
  Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:05:20 2021 +0000
+ Date: Thu Jan 5 11:47:20 2023 +0000
  1 file changed, 2 insertions(+)
 Committed: 0002 master updates a bit more.
 All done.
@@ -63432,20 +63699,20 @@
 	! grep 11 original
 
 Switched to a new branch 'conflicting'
-[conflicting 9c04116] conflicting
+[conflicting 8e1267d] conflicting
  Author: A U Thor <author@example.com>
  1 file changed, 2 insertions(+)
 First, rewinding head to replay your work on top of it...
 Merging master with HEAD~0
 Merging:
-884fec4 master updates a bit more.
-9c04116 conflicting
+dda50e1 master updates a bit more.
+8e1267d conflicting
 found 1 common ancestor:
-643acbc initial
+f1f7b83 initial
 Auto-merging original
-[detached HEAD 3bed5a9] conflicting
+[detached HEAD 94773ab] conflicting
  Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:05:23 2021 +0000
+ Date: Thu Jan 5 11:47:23 2023 +0000
  1 file changed, 1 insertion(+), 3 deletions(-)
 Committed: 0001 conflicting
 All done.
@@ -63461,20 +63728,20 @@
 	! grep 11 original
 
 Switched to a new branch 'orphan-conflicting'
-[orphan-conflicting (root-commit) 271abd6] orphan-conflicting
+[orphan-conflicting (root-commit) 8e823f6] orphan-conflicting
  Author: A U Thor <author@example.com>
  1 file changed, 22 insertions(+)
  create mode 100644 original
 First, rewinding head to replay your work on top of it...
 Merging master with HEAD~0
 Merging:
-884fec4 master updates a bit more.
-271abd6 orphan-conflicting
+dda50e1 master updates a bit more.
+8e823f6 orphan-conflicting
 found 0 common ancestors:
 Auto-merging original
-[detached HEAD 76f1cf2] orphan-conflicting
+[detached HEAD 356ea86] orphan-conflicting
  Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:05:24 2021 +0000
+ Date: Thu Jan 5 11:47:24 2023 +0000
  1 file changed, 1 insertion(+), 3 deletions(-)
 Committed: 0001 orphan-conflicting
 All done.
@@ -63516,31 +63783,31 @@
 		(exit 1)
 	esac
 
-HEAD is now at e1552a8 side edits once again.
+HEAD is now at 96e300e side edits once again.
 First, rewinding head to replay your work on top of it...
 Merging master with HEAD~1
 Merging:
-884fec4 master updates a bit more.
-eee75cf side edits further.
+dda50e1 master updates a bit more.
+222b6aa side edits further.
 found 1 common ancestor:
-dc12a44 side renames and edits.
+77a4ae4 side renames and edits.
 Skipped original (merged same as existing)
-[detached HEAD d51bce2] side edits further.
+[detached HEAD 47c9651] side edits further.
  Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:05:20 2021 +0000
+ Date: Thu Jan 5 11:47:20 2023 +0000
  1 file changed, 20 insertions(+)
  create mode 100644 newfile
 Committed: 0001 side edits further.
 Merging master with HEAD~0
 Merging:
-d51bce2 side edits further.
-e1552a8 side edits once again.
+47c9651 side edits further.
+96e300e side edits once again.
 found 1 common ancestor:
-eee75cf side edits further.
+222b6aa side edits further.
 Skipped original (merged same as existing)
-[detached HEAD 4737ebf] side edits once again.
+[detached HEAD 4228ae2] side edits once again.
  Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:05:20 2021 +0000
+ Date: Thu Jan 5 11:47:21 2023 +0000
  1 file changed, 20 insertions(+), 20 deletions(-)
  rewrite newfile (100%)
 Committed: 0002 side edits once again.
@@ -63569,20 +63836,20 @@
 	) &&
 	test -f funny.was.run
 
-HEAD is now at 4737ebf side edits once again.
+HEAD is now at 4228ae2 side edits once again.
 Switched to a new branch 'test-funny'
-[test-funny 5f6486d] funny
+[test-funny b721e0a] funny
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 funny.t
 First, rewinding head to replay your work on top of it...
 Merging master with HEAD~0
 Merging:
-884fec4 master updates a bit more.
-5f6486d funny
+dda50e1 master updates a bit more.
+b721e0a funny
 found 1 common ancestor:
-0f23c8a master updates a bit.
-[detached HEAD 8efd2e5] funny
+a37c6a8 master updates a bit.
+[detached HEAD c0524ff] funny
  Author: A U Thor <author@example.com>
  Date: Thu Apr 7 15:13:13 2005 -0700
  1 file changed, 1 insertion(+)
@@ -63604,21 +63871,21 @@
 	git rebase --skip
 
 Switched to branch 'second-side'
-[second-side 7cce4cc] edit conflicting with side
+[second-side ea69564] edit conflicting with side
  Author: A U Thor <author@example.com>
  1 file changed, 20 insertions(+), 20 deletions(-)
  rewrite newfile (100%)
-[second-side 98ec5b7] another edit conflicting with side
+[second-side b8e150d] another edit conflicting with side
  Author: A U Thor <author@example.com>
  1 file changed, 20 insertions(+), 20 deletions(-)
  rewrite newfile (100%)
 First, rewinding head to replay your work on top of it...
 Merging test-conflicts with HEAD~1
 Merging:
-e1552a8 side edits once again.
-7cce4cc edit conflicting with side
+96e300e side edits once again.
+ea69564 edit conflicting with side
 found 1 common ancestor:
-eee75cf side edits further.
+222b6aa side edits further.
 Auto-merging newfile
 CONFLICT (content): Merge conflict in newfile
 
@@ -63629,10 +63896,10 @@
 
 Merging test-conflicts with HEAD~0
 Merging:
-e1552a8 side edits once again.
-98ec5b7 another edit conflicting with side
+96e300e side edits once again.
+b8e150d another edit conflicting with side
 found 1 common ancestor:
-7cce4cc edit conflicting with side
+ea69564 edit conflicting with side
 Auto-merging newfile
 CONFLICT (content): Merge conflict in newfile
 
@@ -63648,1404 +63915,1789 @@
 1..12
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t1510-repo-setup.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1510-repo-setup/.git/
+*** t3406-rebase-message.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3406-rebase-message/.git/
 expecting success: 
-	try_repo 0 unset unset unset "" unset \
-		.git "$here/0" "$here/0" "(null)" \
-		.git "$here/0" "$here/0" sub/ 2>message &&
-	test_must_be_empty message
+	test_commit O fileO &&
+	test_commit X fileX &&
+	test_commit A fileA &&
+	test_commit B fileB &&
+	test_commit Y fileY &&
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1510-repo-setup/0/.git/
-ok 1 - #0: nonbare repo, no explicit configuration
+	git checkout -b topic O &&
+	git cherry-pick A B &&
+	test_commit Z fileZ &&
+	git tag start
+
+[master (root-commit) 3749684] O
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 fileO
+[master a2df67f] X
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 fileX
+[master 9491ce3] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 fileA
+[master 83a6553] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 fileB
+[master 545b0d0] Y
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 fileY
+Switched to a new branch 'topic'
+[topic 80ec5e8] 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 4ff7882] 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 dd88760] Z
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 fileZ
+ok 1 - setup
 
 expecting success: 
-	try_repo 1 "$here" unset unset "" unset \
-		"$here/1/.git" "$here" "$here" 1/ \
-		"$here/1/.git" "$here" "$here" 1/sub/ 2>message &&
-	test_must_be_empty message
+	git rebase -m master >report &&
+	sed -n -e "/^Already applied: /p" \
+		-e "/^Committed: /p" report >actual &&
+	test_cmp expect actual
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1510-repo-setup/1/.git/
-ok 2 - #1: GIT_WORK_TREE without explicit GIT_DIR is accepted
+ok 2 - rebase -m
 
 expecting success: 
-	try_repo 2 unset "$here/2/.git" unset "" unset \
-		"$here/2/.git" "$here/2" "$here/2" "(null)" \
-		"$here/2/.git" "$here/2/sub" "$here/2/sub" "(null)"
+	git rebase master >out &&
+	test_i18ngrep "Current branch topic is up to date" out
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1510-repo-setup/2/.git/
-ok 3 - #2: worktree defaults to cwd with explicit GIT_DIR
+Current branch topic is up to date.
+ok 3 - rebase against master twice
 
 expecting success: 
-	try_repo 2b unset ".git" unset "" unset \
-		".git" "$here/2b" "$here/2b" "(null)" \
-		"../.git" "$here/2b/sub" "$here/2b/sub" "(null)"
+	git rebase --force-rebase master >out &&
+	test_i18ngrep "Current branch topic is up to date, rebase forced" out
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1510-repo-setup/2b/.git/
-ok 4 - #2b: relative GIT_DIR
+Current branch topic is up to date, rebase forced.
+ok 4 - rebase against master twice with --force
 
 expecting success: 
-	setup_repo 3 unset "" unset &&
-	mkdir -p 3/sub/sub 3/wt/sub
+	git checkout topic^ &&
+	git rebase master topic >out &&
+	test_i18ngrep "Current branch topic is up to date" out
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1510-repo-setup/3/.git/
-ok 5 - #3: setup
+Note: checking out 'topic^'.
 
-expecting success: 
-		try_case $N "$here/$N" .git \
-			"$dotgit" "$here/$N" "$here/$N" "(null)" &&
-		try_case $N . .git \
-			"$dotgit" "$here/$N" "$here/$N" "(null)" &&
-		try_case $N "$here/$N" "$here/$N/.git" \
-			"$absgit" "$here/$N" "$here/$N" "(null)" &&
-		try_case $N . "$here/$N/.git" \
-			"$absgit" "$here/$N" "$here/$N" "(null)"
-	
-ok 6 - #3: explicit GIT_WORK_TREE and GIT_DIR at toplevel
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by performing another checkout.
 
-expecting success: 
-		try_case $N/sub/sub "$here/$N" ../../.git \
-			"$absgit" "$here/$N" "$here/$N" sub/sub/ &&
-		try_case $N/sub/sub ../.. ../../.git \
-			"$absgit" "$here/$N" "$here/$N" sub/sub/ &&
-		try_case $N/sub/sub "$here/$N" "$here/$N/.git" \
-			"$absgit" "$here/$N" "$here/$N" sub/sub/ &&
-		try_case $N/sub/sub ../.. "$here/$N/.git" \
-			"$absgit" "$here/$N" "$here/$N" sub/sub/
-	
-ok 7 - #3: explicit GIT_WORK_TREE and GIT_DIR in subdir
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -b with the checkout command again. Example:
 
-expecting success: 
-		try_case $N "$here/$N/wt" .git \
-			"$dotgit" "$here/$N/wt" "$here/$N" "(null)" &&
-		try_case $N wt .git \
-			"$dotgit" "$here/$N/wt" "$here/$N" "(null)" &&
-		try_case $N wt "$here/$N/.git" \
-			"$absgit" "$here/$N/wt" "$here/$N" "(null)" &&
-		try_case $N "$here/$N/wt" "$here/$N/.git" \
-			"$absgit" "$here/$N/wt" "$here/$N" "(null)"
-	
-ok 8 - #3: explicit GIT_WORK_TREE from parent of worktree
+  git checkout -b <new-branch-name>
 
-expecting success: 
-		try_case $N/sub/sub "$here/$N/wt" ../../.git \
-			"$dotdotgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)" &&
-		try_case $N/sub/sub ../../wt ../../.git \
-			"$dotdotgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)" &&
-		try_case $N/sub/sub ../../wt "$here/$N/.git" \
-			"$absgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)" &&
-		try_case $N/sub/sub "$here/$N/wt" "$here/$N/.git" \
-			"$absgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)"
-	
-ok 9 - #3: explicit GIT_WORK_TREE from nephew of worktree
+HEAD is now at 545b0d0 Y
+Current branch topic is up to date.
+ok 5 - rebase against master twice from another branch
 
 expecting success: 
-		try_case $N "$here" .git \
-			"$absgit" "$here" "$here" $N/ &&
-		try_case $N .. .git \
-			"$absgit" "$here" "$here" $N/ &&
-		try_case $N .. "$here/$N/.git" \
-			"$absgit" "$here" "$here" $N/ &&
-		try_case $N "$here" "$here/$N/.git" \
-			"$absgit" "$here" "$here" $N/
-	
-ok 10 - #3: chdir_to_toplevel uses worktree, not git dir
+	git checkout topic^ &&
+	git rebase topic >out &&
+	test_i18ngrep "Fast-forwarded HEAD to topic" out
 
-expecting success: 
-		try_case $N/sub/sub "$here" ../../.git \
-			"$absgit" "$here" "$here" $N/sub/sub/ &&
-		try_case $N/sub/sub ../../.. ../../.git \
-			"$absgit" "$here" "$here" $N/sub/sub/ &&
-		try_case $N/sub/sub ../../../ "$here/$N/.git" \
-			"$absgit" "$here" "$here" $N/sub/sub/ &&
-		try_case $N/sub/sub "$here" "$here/$N/.git" \
-			"$absgit" "$here" "$here" $N/sub/sub/
-	
-ok 11 - #3: chdir_to_toplevel uses worktree (from subdir)
+Note: checking out 'topic^'.
 
-expecting success: 
-	setup_repo 4 ../sub "" unset &&
-	mkdir -p 4/sub sub &&
-	try_case 4 unset unset \
-		.git "$here/4/sub" "$here/4" "(null)" \
-		"$here/4/.git" "$here/4/sub" "$here/4/sub" "(null)" 2>message &&
-	test_must_be_empty message
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by performing another checkout.
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1510-repo-setup/4/.git/
-ok 12 - #4: core.worktree without GIT_DIR set is accepted
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -b with the checkout command again. Example:
 
-expecting success: 
-	# or: you cannot intimidate away the lack of GIT_DIR setting
-	try_repo 5 "$here" unset "$here/5" "" unset \
-		"$here/5/.git" "$here" "$here" 5/ \
-		"$here/5/.git" "$here" "$here" 5/sub/ 2>message &&
-	try_repo 5a .. unset "$here/5a" "" unset \
-		"$here/5a/.git" "$here" "$here" 5a/ \
-		"$here/5a/.git" "$here/5a" "$here/5a" sub/ &&
-	test_must_be_empty message
+  git checkout -b <new-branch-name>
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1510-repo-setup/5/.git/
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1510-repo-setup/5a/.git/
-ok 13 - #5: core.worktree + GIT_WORK_TREE is accepted
+HEAD is now at 545b0d0 Y
+Fast-forwarded HEAD to topic.
+ok 6 - rebase fast-forward to master
 
 expecting success: 
-	setup_repo 6 "$here/6" "" unset &&
-	try_case 6 unset .git \
-		.git "$here/6" "$here/6" "(null)" &&
-	try_case 6 unset "$here/6/.git" \
-		"$here/6/.git" "$here/6" "$here/6" "(null)" &&
-	try_case 6/sub/sub unset ../../.git \
-		"$here/6/.git" "$here/6" "$here/6" sub/sub/ &&
-	try_case 6/sub/sub unset "$here/6/.git" \
-		"$here/6/.git" "$here/6" "$here/6" sub/sub/
+	git reset --hard start &&
+        git rebase --stat master >diffstat.txt &&
+        grep "^ fileX |  *1 +$" diffstat.txt
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1510-repo-setup/6/.git/
-ok 14 - #6: setting GIT_DIR brings core.worktree to life
+HEAD is now at dd88760 Z
+ fileX | 1 +
+ok 7 - rebase --stat
 
 expecting success: 
-	setup_repo 6b .. "" unset &&
-	try_case 6b unset .git \
-		.git "$here/6b" "$here/6b" "(null)" &&
-	try_case 6b unset "$here/6b/.git" \
-		"$here/6b/.git" "$here/6b" "$here/6b" "(null)" &&
-	try_case 6b/sub/sub unset ../../.git \
-		"$here/6b/.git" "$here/6b" "$here/6b" sub/sub/ &&
-	try_case 6b/sub/sub unset "$here/6b/.git" \
-		"$here/6b/.git" "$here/6b" "$here/6b" sub/sub/
+	git reset --hard start &&
+        git config rebase.stat true &&
+        git rebase master >diffstat.txt &&
+        grep "^ fileX |  *1 +$" diffstat.txt
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1510-repo-setup/6b/.git/
-ok 15 - #6b: GIT_DIR set, core.worktree relative
+HEAD is now at dd88760 Z
+ fileX | 1 +
+ok 8 - rebase w/config rebase.stat
 
 expecting success: 
-	setup_repo 6c "$here/6c/wt" "" unset &&
-	mkdir -p 6c/wt/sub &&
-
-	try_case 6c unset .git \
-		.git "$here/6c/wt" "$here/6c" "(null)" &&
-	try_case 6c unset "$here/6c/.git" \
-		"$here/6c/.git" "$here/6c/wt" "$here/6c" "(null)" &&
-	try_case 6c/sub/sub unset ../../.git \
-		../../.git "$here/6c/wt" "$here/6c/sub/sub" "(null)" &&
-	try_case 6c/sub/sub unset "$here/6c/.git" \
-		"$here/6c/.git" "$here/6c/wt" "$here/6c/sub/sub" "(null)"
+	git reset --hard start &&
+        git config rebase.stat true &&
+        git rebase -n master >diffstat.txt &&
+        ! grep "^ fileX |  *1 +$" diffstat.txt
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1510-repo-setup/6c/.git/
-ok 16 - #6c: GIT_DIR set, core.worktree=../wt (absolute)
+HEAD is now at dd88760 Z
+ok 9 - rebase -n overrides config rebase.stat config
 
 expecting success: 
-	setup_repo 6d "$here/6d/wt" "" unset &&
-	mkdir -p 6d/wt/sub &&
-
-	try_case 6d unset .git \
-		.git "$here/6d/wt" "$here/6d" "(null)" &&
-	try_case 6d unset "$here/6d/.git" \
-		"$here/6d/.git" "$here/6d/wt" "$here/6d" "(null)" &&
-	try_case 6d/sub/sub unset ../../.git \
-		../../.git "$here/6d/wt" "$here/6d/sub/sub" "(null)" &&
-	try_case 6d/sub/sub unset "$here/6d/.git" \
-		"$here/6d/.git" "$here/6d/wt" "$here/6d/sub/sub" "(null)"
+	test_must_fail git rebase --onto invalid-ref HEAD HEAD 2>err &&
+	test_i18ngrep "invalid-ref" err
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1510-repo-setup/6d/.git/
-ok 17 - #6d: GIT_DIR set, core.worktree=../wt (relative)
+fatal: Does not point to a valid commit 'invalid-ref'
+ok 10 - rebase --onto outputs the invalid ref
 
 expecting success: 
-	setup_repo 6e "$here" "" unset &&
-	try_case 6e unset .git \
-		"$here/6e/.git" "$here" "$here" 6e/ &&
-	try_case 6e unset "$here/6e/.git" \
-		"$here/6e/.git" "$here" "$here" 6e/ &&
-	try_case 6e/sub/sub unset ../../.git \
-		"$here/6e/.git" "$here" "$here" 6e/sub/sub/ &&
-	try_case 6e/sub/sub unset "$here/6e/.git" \
-		"$here/6e/.git" "$here" "$here" 6e/sub/sub/
+	test_must_fail git rebase -Cnot-a-number HEAD 2>err &&
+	test_i18ngrep "numerical value" err &&
+	test_must_fail git rebase --whitespace=bad HEAD 2>err &&
+	test_i18ngrep "Invalid whitespace option" err
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1510-repo-setup/6e/.git/
-ok 18 - #6e: GIT_DIR set, core.worktree=../.. (absolute)
+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: 
-	setup_repo 6f ../../ "" unset &&
-	try_case 6f unset .git \
-		"$here/6f/.git" "$here" "$here" 6f/ &&
-	try_case 6f unset "$here/6f/.git" \
-		"$here/6f/.git" "$here" "$here" 6f/ &&
-	try_case 6f/sub/sub unset ../../.git \
-		"$here/6f/.git" "$here" "$here" 6f/sub/sub/ &&
-	try_case 6f/sub/sub unset "$here/6f/.git" \
-		"$here/6f/.git" "$here" "$here" 6f/sub/sub/
+	git checkout start &&
+	test_commit reflog-onto &&
+	git checkout -b reflog-topic start &&
+	test_commit reflog-to-rebase &&
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1510-repo-setup/6f/.git/
-ok 19 - #6f: GIT_DIR set, core.worktree=../.. (relative)
+	git rebase reflog-onto &&
+	git log -g --format=%gs -3 >actual &&
+	cat >expect <<-\EOF &&
+	rebase finished: returning to refs/heads/reflog-topic
+	rebase: reflog-to-rebase
+	rebase: checkout reflog-onto
+	EOF
+	test_cmp expect actual &&
 
-expecting success: 
-	setup_repo 7 non-existent "" unset &&
-	mkdir -p 7/sub/sub 7/wt/sub
+	git checkout -b reflog-prefix reflog-to-rebase &&
+	GIT_REFLOG_ACTION=change-the-reflog git rebase reflog-onto &&
+	git log -g --format=%gs -3 >actual &&
+	cat >expect <<-\EOF &&
+	rebase finished: returning to refs/heads/reflog-prefix
+	change-the-reflog: reflog-to-rebase
+	change-the-reflog: checkout reflog-onto
+	EOF
+	test_cmp expect actual
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1510-repo-setup/7/.git/
-ok 20 - #7: setup
+Previous HEAD position was 102672f Z
+HEAD is now at dd88760 Z
+[detached HEAD de4658a] reflog-onto
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 reflog-onto.t
+Previous HEAD position was de4658a reflog-onto
+Switched to a new branch 'reflog-topic'
+[reflog-topic d91d0e4] reflog-to-rebase
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 reflog-to-rebase.t
+ reflog-onto.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 reflog-onto.t
+First, rewinding head to replay your work on top of it...
+Applying: reflog-to-rebase
+Switched to a new branch 'reflog-prefix'
+ reflog-onto.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 reflog-onto.t
+First, rewinding head to replay your work on top of it...
+Applying: reflog-to-rebase
+ok 12 - GIT_REFLOG_ACTION
 
 expecting success: 
-		try_case $N "$here/$N" .git \
-			"$dotgit" "$here/$N" "$here/$N" "(null)" &&
-		try_case $N . .git \
-			"$dotgit" "$here/$N" "$here/$N" "(null)" &&
-		try_case $N "$here/$N" "$here/$N/.git" \
-			"$absgit" "$here/$N" "$here/$N" "(null)" &&
-		try_case $N . "$here/$N/.git" \
-			"$absgit" "$here/$N" "$here/$N" "(null)"
-	
-ok 21 - #7: explicit GIT_WORK_TREE and GIT_DIR at toplevel
+	git init unrelated &&
+	test_commit -C unrelated 1 &&
+	git -C unrelated remote add -f origin "$PWD" &&
+	git -C unrelated branch --set-upstream-to=origin/master &&
+	git -C unrelated -c core.editor=true rebase -i -v --stat >actual &&
+	test_i18ngrep "Changes to " actual &&
+	test_i18ngrep "5 files changed" actual
 
-expecting success: 
-		try_case $N/sub/sub "$here/$N" ../../.git \
-			"$absgit" "$here/$N" "$here/$N" sub/sub/ &&
-		try_case $N/sub/sub ../.. ../../.git \
-			"$absgit" "$here/$N" "$here/$N" sub/sub/ &&
-		try_case $N/sub/sub "$here/$N" "$here/$N/.git" \
-			"$absgit" "$here/$N" "$here/$N" sub/sub/ &&
-		try_case $N/sub/sub ../.. "$here/$N/.git" \
-			"$absgit" "$here/$N" "$here/$N" sub/sub/
-	
-ok 22 - #7: explicit GIT_WORK_TREE and GIT_DIR in subdir
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3406-rebase-message/unrelated/.git/
+[master (root-commit) 11730cb] 1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1.t
+Updating origin
+warning: no common commits
+From /build/git-2.20.1/t/trash directory.t3406-rebase-message
+ * [new branch]      master        -> origin/master
+ * [new branch]      reflog-prefix -> origin/reflog-prefix
+ * [new branch]      reflog-topic  -> origin/reflog-topic
+ * [new branch]      topic         -> origin/topic
+ * [new tag]         Y             -> Y
+ * [new tag]         A             -> A
+ * [new tag]         B             -> B
+ * [new tag]         O             -> O
+ * [new tag]         X             -> X
+ * [new tag]         Z             -> Z
+ * [new tag]         reflog-onto   -> reflog-onto
+ * [new tag]         start         -> start
+Branch 'master' set up to track remote branch 'master' from 'origin'.
+Note: checking out '545b0d0a5d2af9b721d265dc5293dbb3418ab768'.
 
-expecting success: 
-		try_case $N "$here/$N/wt" .git \
-			"$dotgit" "$here/$N/wt" "$here/$N" "(null)" &&
-		try_case $N wt .git \
-			"$dotgit" "$here/$N/wt" "$here/$N" "(null)" &&
-		try_case $N wt "$here/$N/.git" \
-			"$absgit" "$here/$N/wt" "$here/$N" "(null)" &&
-		try_case $N "$here/$N/wt" "$here/$N/.git" \
-			"$absgit" "$here/$N/wt" "$here/$N" "(null)"
-	
-ok 23 - #7: explicit GIT_WORK_TREE from parent of worktree
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by performing another checkout.
 
-expecting success: 
-		try_case $N/sub/sub "$here/$N/wt" ../../.git \
-			"$dotdotgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)" &&
-		try_case $N/sub/sub ../../wt ../../.git \
-			"$dotdotgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)" &&
-		try_case $N/sub/sub ../../wt "$here/$N/.git" \
-			"$absgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)" &&
-		try_case $N/sub/sub "$here/$N/wt" "$here/$N/.git" \
-			"$absgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)"
-	
-ok 24 - #7: explicit GIT_WORK_TREE from nephew of worktree
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -b with the checkout command again. Example:
 
-expecting success: 
-		try_case $N "$here" .git \
-			"$absgit" "$here" "$here" $N/ &&
-		try_case $N .. .git \
-			"$absgit" "$here" "$here" $N/ &&
-		try_case $N .. "$here/$N/.git" \
-			"$absgit" "$here" "$here" $N/ &&
-		try_case $N "$here" "$here/$N/.git" \
-			"$absgit" "$here" "$here" $N/
-	
-ok 25 - #7: chdir_to_toplevel uses worktree, not git dir
+  git checkout -b <new-branch-name>
 
-expecting success: 
-		try_case $N/sub/sub "$here" ../../.git \
-			"$absgit" "$here" "$here" $N/sub/sub/ &&
-		try_case $N/sub/sub ../../.. ../../.git \
-			"$absgit" "$here" "$here" $N/sub/sub/ &&
-		try_case $N/sub/sub ../../../ "$here/$N/.git" \
-			"$absgit" "$here" "$here" $N/sub/sub/ &&
-		try_case $N/sub/sub "$here" "$here/$N/.git" \
-			"$absgit" "$here" "$here" $N/sub/sub/
-	
-ok 26 - #7: chdir_to_toplevel uses worktree (from subdir)
+HEAD is now at 545b0d0 Y
+Rebasing (1/1)
+Successfully rebased and updated refs/heads/master.
+Changes to 545b0d0a5d2af9b721d265dc5293dbb3418ab768:
+ 5 files changed, 5 insertions(+)
+ 5 files changed, 5 insertions(+)
+ok 13 - rebase -i onto unrelated history
 
+# passed all 13 test(s)
+1..13
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t3400-rebase.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3400-rebase/.git/
 expecting success: 
-	try_repo 8 unset unset unset gitfile unset \
-		"$here/8.git" "$here/8" "$here/8" "(null)" \
-		"$here/8.git" "$here/8" "$here/8" sub/
+	git config core.logAllRefUpdates true &&
+	echo First >A &&
+	git update-index --add A &&
+	git commit -m "Add A." &&
+	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 master &&
+	mkdir D &&
+	git mv A D/A &&
+	git commit -m "Move A." &&
+	git checkout -b my-topic-branch master &&
+	echo Second >B &&
+	git update-index --add B &&
+	git commit -m "Add B." &&
+	git checkout -f master &&
+	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
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1510-repo-setup/8/.git/
-ok 27 - #8: gitfile, easy case
+[master (root-commit) eabfa87] 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 5bfd579] Add Y.
+ Author: author@name <bogus@email@address>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 Y
+Switched to a new branch 'filemove'
+[filemove 2b67e5f] 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 d7d6fe8] Add B.
+ Author: author@name <bogus@email@address>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 B
+Switched to branch 'master'
+[master c383ad2] Modify A.
+ Author: author@name <bogus@email@address>
+ 1 file changed, 1 insertion(+)
+Switched to a new branch 'side'
+[side e5b69ab] 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: 
-	mkdir -p 9/wt &&
-	try_repo 9 wt unset unset gitfile unset \
-		"$here/9.git" "$here/9/wt" "$here/9" "(null)" \
-		"$here/9.git" "$here/9/sub/wt" "$here/9/sub" "(null)" 2>message &&
-	test_must_be_empty message
+	echo dirty >>A &&
+	test_must_fail git rebase master
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1510-repo-setup/9/.git/
-ok 28 - #9: GIT_WORK_TREE accepted with gitfile
+error: cannot rebase: You have unstaged changes.
+error: Please commit or stash them.
+ok 2 - rebase on dirty worktree
 
 expecting success: 
-	try_repo 10 unset "$here/10/.git" unset gitfile unset \
-		"$here/10.git" "$here/10" "$here/10" "(null)" \
-		"$here/10.git" "$here/10/sub" "$here/10/sub" "(null)"
+	git add A &&
+	test_must_fail git rebase master
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1510-repo-setup/10/.git/
-ok 29 - #10: GIT_DIR can point to gitfile
+error: cannot rebase: Your index contains uncommitted changes.
+error: Please commit or stash them.
+ok 3 - rebase on dirty cache
 
 expecting success: 
-	try_repo 10b unset .git unset gitfile unset \
-		"$here/10b.git" "$here/10b" "$here/10b" "(null)" \
-		"$here/10b.git" "$here/10b/sub" "$here/10b/sub" "(null)"
+	git reset --hard HEAD &&
+	git rebase master
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1510-repo-setup/10b/.git/
-ok 30 - #10b: relative GIT_DIR can point to gitfile
+HEAD is now at d7d6fe8 Add B.
+First, rewinding head to replay your work on top of it...
+Applying: Add B.
+ok 4 - rebase against master
 
 expecting success: 
-	setup_repo 11 unset gitfile unset &&
-	mkdir -p 11/sub/sub 11/wt/sub
+	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
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1510-repo-setup/11/.git/
-ok 31 - #11: setup
+Switched to a new branch 'torebase'
+First, rewinding head to replay your work on top of it...
+HEAD is now at c383ad2 Modify A.
+First, rewinding head to replay your work on top of it...
+Switched to branch 'my-topic-branch'
+Deleted branch torebase (was eabfa87).
+ok 5 - rebase, with <onto> and <upstream> specified as :/quuxery
 
 expecting success: 
-		try_case $N "$here/$N" .git \
-			"$dotgit" "$here/$N" "$here/$N" "(null)" &&
-		try_case $N . .git \
-			"$dotgit" "$here/$N" "$here/$N" "(null)" &&
-		try_case $N "$here/$N" "$here/$N/.git" \
-			"$absgit" "$here/$N" "$here/$N" "(null)" &&
-		try_case $N . "$here/$N/.git" \
-			"$absgit" "$here/$N" "$here/$N" "(null)"
-	
-ok 32 - #11: explicit GIT_WORK_TREE and GIT_DIR at toplevel
+	! (git log | grep "Author:" | grep "<>")
 
-expecting success: 
-		try_case $N/sub/sub "$here/$N" ../../.git \
-			"$absgit" "$here/$N" "$here/$N" sub/sub/ &&
-		try_case $N/sub/sub ../.. ../../.git \
-			"$absgit" "$here/$N" "$here/$N" sub/sub/ &&
-		try_case $N/sub/sub "$here/$N" "$here/$N/.git" \
-			"$absgit" "$here/$N" "$here/$N" sub/sub/ &&
-		try_case $N/sub/sub ../.. "$here/$N/.git" \
-			"$absgit" "$here/$N" "$here/$N" sub/sub/
-	
-ok 33 - #11: explicit GIT_WORK_TREE and GIT_DIR in subdir
+ok 6 - the rebase operation should not have destroyed author information
 
 expecting success: 
-		try_case $N "$here/$N/wt" .git \
-			"$dotgit" "$here/$N/wt" "$here/$N" "(null)" &&
-		try_case $N wt .git \
-			"$dotgit" "$here/$N/wt" "$here/$N" "(null)" &&
-		try_case $N wt "$here/$N/.git" \
-			"$absgit" "$here/$N/wt" "$here/$N" "(null)" &&
-		try_case $N "$here/$N/wt" "$here/$N/.git" \
-			"$absgit" "$here/$N/wt" "$here/$N" "(null)"
-	
-ok 34 - #11: explicit GIT_WORK_TREE from parent of worktree
+	git log -1 |
+	grep 'Author: author@name <bogus@email@address>'
 
-expecting success: 
-		try_case $N/sub/sub "$here/$N/wt" ../../.git \
-			"$dotdotgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)" &&
-		try_case $N/sub/sub ../../wt ../../.git \
-			"$dotdotgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)" &&
-		try_case $N/sub/sub ../../wt "$here/$N/.git" \
-			"$absgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)" &&
-		try_case $N/sub/sub "$here/$N/wt" "$here/$N/.git" \
-			"$absgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)"
-	
-ok 35 - #11: explicit GIT_WORK_TREE from nephew of worktree
+Author: author@name <bogus@email@address>
+ok 7 - the rebase operation should not have destroyed author information (2)
 
 expecting success: 
-		try_case $N "$here" .git \
-			"$absgit" "$here" "$here" $N/ &&
-		try_case $N .. .git \
-			"$absgit" "$here" "$here" $N/ &&
-		try_case $N .. "$here/$N/.git" \
-			"$absgit" "$here" "$here" $N/ &&
-		try_case $N "$here" "$here/$N/.git" \
-			"$absgit" "$here" "$here" $N/
-	
-ok 36 - #11: chdir_to_toplevel uses worktree, not git dir
+	test $(git rev-parse HEAD@{1}) != $(git rev-parse my-topic-branch@{1})
 
-expecting success: 
-		try_case $N/sub/sub "$here" ../../.git \
-			"$absgit" "$here" "$here" $N/sub/sub/ &&
-		try_case $N/sub/sub ../../.. ../../.git \
-			"$absgit" "$here" "$here" $N/sub/sub/ &&
-		try_case $N/sub/sub ../../../ "$here/$N/.git" \
-			"$absgit" "$here" "$here" $N/sub/sub/ &&
-		try_case $N/sub/sub "$here" "$here/$N/.git" \
-			"$absgit" "$here" "$here" $N/sub/sub/
-	
-ok 37 - #11: chdir_to_toplevel uses worktree (from subdir)
+ok 8 - HEAD was detached during rebase
 
 expecting success: 
-	try_repo 12 unset unset "$here/12" gitfile unset \
-		"$here/12.git" "$here/12" "$here/12" "(null)" \
-		"$here/12.git" "$here/12" "$here/12" sub/ 2>message &&
-	test_must_be_empty message
+	git checkout -b topic side &&
+	git rebase master
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1510-repo-setup/12/.git/
-ok 38 - #12: core.worktree with gitfile is accepted
+Switched to a new branch 'topic'
+First, rewinding head to replay your work on top of it...
+Applying: Add B.
+Applying: Add C
+ok 9 - rebase from ambiguous branch name
 
 expecting success: 
-	# or: you cannot intimidate away the lack of GIT_DIR setting
-	try_repo 13 non-existent-too unset non-existent gitfile unset \
-		"$here/13.git" "$here/13/non-existent-too" "$here/13" "(null)" \
-		"$here/13.git" "$here/13/sub/non-existent-too" "$here/13/sub" "(null)" 2>message &&
-	test_must_be_empty message
+	git checkout master &&
+	git checkout HEAD^ &&
+	git rebase @{-1} >expect.messages &&
+	git merge-base master HEAD >expect.forkpoint &&
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1510-repo-setup/13/.git/
-ok 39 - #13: core.worktree+GIT_WORK_TREE accepted (with gitfile)
+	git checkout master &&
+	git checkout HEAD^ &&
+	git rebase - >actual.messages &&
+	git merge-base master HEAD >actual.forkpoint &&
 
-expecting success: 
-	setup_repo 14 "$here/14" gitfile unset &&
-	try_case 14 unset .git \
-		"$here/14.git" "$here/14" "$here/14" "(null)" &&
-	try_case 14 unset "$here/14/.git" \
-		"$here/14.git" "$here/14" "$here/14" "(null)" &&
-	try_case 14/sub/sub unset ../../.git \
-		"$here/14.git" "$here/14" "$here/14" sub/sub/ &&
-	try_case 14/sub/sub unset "$here/14/.git" \
-		"$here/14.git" "$here/14" "$here/14" sub/sub/ &&
+	test_cmp expect.forkpoint actual.forkpoint &&
+	# the next one is dubious---we may want to say "-",
+	# instead of @{-1}, in the message
+	test_i18ncmp expect.messages actual.messages
 
-	setup_repo 14c "$here/14c/wt" gitfile unset &&
-	mkdir -p 14c/wt/sub &&
+Switched to branch 'master'
+Note: checking out 'HEAD^'.
 
-	try_case 14c unset .git \
-		"$here/14c.git" "$here/14c/wt" "$here/14c" "(null)" &&
-	try_case 14c unset "$here/14c/.git" \
-		"$here/14c.git" "$here/14c/wt" "$here/14c" "(null)" &&
-	try_case 14c/sub/sub unset ../../.git \
-		"$here/14c.git" "$here/14c/wt" "$here/14c/sub/sub" "(null)" &&
-	try_case 14c/sub/sub unset "$here/14c/.git" \
-		"$here/14c.git" "$here/14c/wt" "$here/14c/sub/sub" "(null)" &&
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by performing another checkout.
 
-	setup_repo 14d "$here/14d/wt" gitfile unset &&
-	mkdir -p 14d/wt/sub &&
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -b with the checkout command again. Example:
 
-	try_case 14d unset .git \
-		"$here/14d.git" "$here/14d/wt" "$here/14d" "(null)" &&
-	try_case 14d unset "$here/14d/.git" \
-		"$here/14d.git" "$here/14d/wt" "$here/14d" "(null)" &&
-	try_case 14d/sub/sub unset ../../.git \
-		"$here/14d.git" "$here/14d/wt" "$here/14d/sub/sub" "(null)" &&
-	try_case 14d/sub/sub unset "$here/14d/.git" \
-		"$here/14d.git" "$here/14d/wt" "$here/14d/sub/sub" "(null)" &&
+  git checkout -b <new-branch-name>
 
-	setup_repo 14e "$here" gitfile unset &&
-	try_case 14e unset .git \
-		"$here/14e.git" "$here" "$here" 14e/ &&
-	try_case 14e unset "$here/14e/.git" \
-		"$here/14e.git" "$here" "$here" 14e/ &&
-	try_case 14e/sub/sub unset ../../.git \
-		"$here/14e.git" "$here" "$here" 14e/sub/sub/ &&
-	try_case 14e/sub/sub unset "$here/14e/.git" \
-		"$here/14e.git" "$here" "$here" 14e/sub/sub/
+HEAD is now at eabfa87 Add A.
+Switched to branch 'master'
+Note: checking out 'HEAD^'.
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1510-repo-setup/14/.git/
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1510-repo-setup/14c/.git/
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1510-repo-setup/14d/.git/
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1510-repo-setup/14e/.git/
-ok 40 - #14: core.worktree with GIT_DIR pointing to gitfile
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by performing another checkout.
 
-expecting success: 
-	setup_repo 14b ../14b gitfile unset &&
-	try_case 14b unset .git \
-		"$here/14b.git" "$here/14b" "$here/14b" "(null)" &&
-	try_case 14b unset "$here/14b/.git" \
-		"$here/14b.git" "$here/14b" "$here/14b" "(null)" &&
-	try_case 14b/sub/sub unset ../../.git \
-		"$here/14b.git" "$here/14b" "$here/14b" sub/sub/ &&
-	try_case 14b/sub/sub unset "$here/14b/.git" \
-		"$here/14b.git" "$here/14b" "$here/14b" sub/sub/ &&
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -b with the checkout command again. Example:
 
-	setup_repo 14f ../ gitfile unset &&
-	try_case 14f unset .git \
-		"$here/14f.git" "$here" "$here" 14f/ &&
-	try_case 14f unset "$here/14f/.git" \
-		"$here/14f.git" "$here" "$here" 14f/ &&
-	try_case 14f/sub/sub unset ../../.git \
-		"$here/14f.git" "$here" "$here" 14f/sub/sub/ &&
-	try_case 14f/sub/sub unset "$here/14f/.git" \
-		"$here/14f.git" "$here" "$here" 14f/sub/sub/
+  git checkout -b <new-branch-name>
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1510-repo-setup/14b/.git/
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1510-repo-setup/14f/.git/
-ok 41 - #14b: core.worktree is relative to actual git dir
+HEAD is now at eabfa87 Add A.
+ok 10 - rebase off of the previous branch using "-"
 
 expecting success: 
-	setup_repo 15 non-existent gitfile unset &&
-	mkdir -p 15/sub/sub 15/wt/sub
+	git checkout master &&
+	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 master
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1510-repo-setup/15/.git/
-ok 42 - #15: setup
+Switched to branch 'master'
+Deleted branch topic (was 470c979).
+[master e874f76] prepare
+ Author: author@name <bogus@email@address>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 X
+Switched to a new branch 'modechange'
+[modechange c8fcd01] 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 master
+trace: run_command: git config --bool rebase.usebuiltin
+trace: built-in: git config --bool rebase.usebuiltin
+trace: run_command: 'GIT_DIR='\''/build/git-2.20.1/t/trash directory.t3400-rebase/.git'\''; state_dir='\''.git/rebase-apply'\''; upstream_name='\''master'\''; upstream='\''e874f76402b8fc86e4fedf6741cc1260659d662d'\''; head_name='\''refs/heads/modechange'\''; orig_head='\''c8fcd0109210687e93ee9770afb01ed3d686fdb7'\''; onto='\''e874f76402b8fc86e4fedf6741cc1260659d662d'\''; onto_name='\''master'\''; revisions='\''e874f76402b8fc86e4fedf6741cc1260659d662d..c8fcd0109210687e93ee9770afb01ed3d686fdb7'\''; unset restrict_revision; GIT_QUIET='\'''\''; git_am_opt='\'''\''; verbose='\'''\''; diffstat='\'''\''; force_rebase='\'''\''; action='\'''\''; signoff='\'''\''; allow_rerere_autoupdate='\'''\''; keep_empty='\'''\''; autosquash='\'''\''; unset gpg_sign_opt; unset cmd; allow_empty_message='\''--allow-empty-message'\''; rebase_merges='\'''\''; rebase_cousins='\'''\''; unset strategy; unset strategy_opts; rebase_root='\'''\''; squash_onto='\'''\''; git_format_patch_opt='\'''\''; . git-sh-setup && . git-rebase--common && . git-rebase--am && git_rebase__am'
+First, rewinding head to replay your work on top of it...
+trace: built-in: git rev-parse --git-dir
+trace: built-in: git rev-parse --show-cdup
+trace: built-in: git rev-parse --git-path objects
+trace: built-in: git format-patch -k --stdout --full-index --cherry-pick --right-only --src-prefix=a/ --dst-prefix=b/ --no-renames --no-cover-letter --pretty=mboxrd e874f76402b8fc86e4fedf6741cc1260659d662d...c8fcd0109210687e93ee9770afb01ed3d686fdb7
+trace: built-in: git am --rebasing '--resolvemsg=
+Resolve all conflicts manually, mark them as resolved with
+"git add/rm <conflicted_files>", then run "git rebase --continue".
+You can instead skip this commit: run "git rebase --skip".
+To abort and get back to the state before "git rebase", run "git rebase --abort".
+' --patch-format=mboxrd
+trace: run_command: git mailsplit -d4 -o.git/rebase-apply -b --mboxrd --
+trace: built-in: git mailsplit -d4 -o.git/rebase-apply -b --mboxrd --
+trace: run_command: git apply --build-fake-ancestor=.git/rebase-apply/patch-merge-index .git/rebase-apply/patch
+Applying: modechange
+trace: built-in: git apply --build-fake-ancestor=.git/rebase-apply/patch-merge-index .git/rebase-apply/patch
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+Merging:
+e874f76 prepare
+virtual modechange
+found 1 common ancestor:
+virtual 20d8b2c6c42a40f913517c72113d9d08e124064a
+trace: built-in: git rev-parse HEAD
+trace: built-in: git update-ref -m 'rebase finished: refs/heads/modechange onto e874f76402b8fc86e4fedf6741cc1260659d662d' refs/heads/modechange a680c8073ca6bb107a633317d4ea3124e2b26d9a c8fcd0109210687e93ee9770afb01ed3d686fdb7
+trace: built-in: git symbolic-ref -m 'rebase finished: returning to refs/heads/modechange' HEAD refs/heads/modechange
+trace: run_command: git gc --auto
+trace: built-in: git gc --auto
+ok 11 - rebase a single mode change
 
 expecting success: 
-		try_case $N "$here/$N" .git \
-			"$dotgit" "$here/$N" "$here/$N" "(null)" &&
-		try_case $N . .git \
-			"$dotgit" "$here/$N" "$here/$N" "(null)" &&
-		try_case $N "$here/$N" "$here/$N/.git" \
-			"$absgit" "$here/$N" "$here/$N" "(null)" &&
-		try_case $N . "$here/$N/.git" \
-			"$absgit" "$here/$N" "$here/$N" "(null)"
-	
-ok 43 - #15: explicit GIT_WORK_TREE and GIT_DIR at toplevel
+	test_config diff.renames copies &&
+	git checkout filemove &&
+	GIT_TRACE=1 git rebase force-3way
 
-expecting success: 
-		try_case $N/sub/sub "$here/$N" ../../.git \
-			"$absgit" "$here/$N" "$here/$N" sub/sub/ &&
-		try_case $N/sub/sub ../.. ../../.git \
-			"$absgit" "$here/$N" "$here/$N" sub/sub/ &&
-		try_case $N/sub/sub "$here/$N" "$here/$N/.git" \
-			"$absgit" "$here/$N" "$here/$N" sub/sub/ &&
-		try_case $N/sub/sub ../.. "$here/$N/.git" \
-			"$absgit" "$here/$N" "$here/$N" sub/sub/
-	
-ok 44 - #15: explicit GIT_WORK_TREE and GIT_DIR in subdir
+Switched to branch 'filemove'
+trace: built-in: git rebase force-3way
+trace: run_command: git config --bool rebase.usebuiltin
+trace: built-in: git config --bool rebase.usebuiltin
+trace: run_command: 'GIT_DIR='\''/build/git-2.20.1/t/trash directory.t3400-rebase/.git'\''; state_dir='\''.git/rebase-apply'\''; upstream_name='\''force-3way'\''; upstream='\''5bfd579efbb9b543520c07f057b68def2edce84b'\''; head_name='\''refs/heads/filemove'\''; orig_head='\''2b67e5fea27708b3b8fbf9c2844e83eeec1d1e41'\''; onto='\''5bfd579efbb9b543520c07f057b68def2edce84b'\''; onto_name='\''force-3way'\''; revisions='\''5bfd579efbb9b543520c07f057b68def2edce84b..2b67e5fea27708b3b8fbf9c2844e83eeec1d1e41'\''; unset restrict_revision; GIT_QUIET='\'''\''; git_am_opt='\'''\''; verbose='\'''\''; diffstat='\'''\''; force_rebase='\'''\''; action='\'''\''; signoff='\'''\''; allow_rerere_autoupdate='\'''\''; keep_empty='\'''\''; autosquash='\'''\''; unset gpg_sign_opt; unset cmd; allow_empty_message='\''--allow-empty-message'\''; rebase_merges='\'''\''; rebase_cousins='\'''\''; unset strategy; unset strategy_opts; rebase_root='\'''\''; squash_onto='\'''\''; git_format_patch_opt='\'''\''; . git-sh-setup && . git-rebase--common && . git-rebase--am && git_rebase__am'
+First, rewinding head to replay your work on top of it...
+trace: built-in: git rev-parse --git-dir
+trace: built-in: git rev-parse --show-cdup
+trace: built-in: git rev-parse --git-path objects
+trace: built-in: git format-patch -k --stdout --full-index --cherry-pick --right-only --src-prefix=a/ --dst-prefix=b/ --no-renames --no-cover-letter --pretty=mboxrd 5bfd579efbb9b543520c07f057b68def2edce84b...2b67e5fea27708b3b8fbf9c2844e83eeec1d1e41
+trace: built-in: git am --rebasing '--resolvemsg=
+Resolve all conflicts manually, mark them as resolved with
+"git add/rm <conflicted_files>", then run "git rebase --continue".
+You can instead skip this commit: run "git rebase --skip".
+To abort and get back to the state before "git rebase", run "git rebase --abort".
+' --patch-format=mboxrd
+trace: run_command: git mailsplit -d4 -o.git/rebase-apply -b --mboxrd --
+trace: built-in: git mailsplit -d4 -o.git/rebase-apply -b --mboxrd --
+trace: run_command: git apply --build-fake-ancestor=.git/rebase-apply/patch-merge-index .git/rebase-apply/patch
+Applying: Move A.
+trace: built-in: git apply --build-fake-ancestor=.git/rebase-apply/patch-merge-index .git/rebase-apply/patch
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+Merging:
+5bfd579 Add Y.
+virtual Move A.
+found 1 common ancestor:
+virtual 26395c6fe842cd8894b5dde87a6fb53cccfabc06
+trace: built-in: git rev-parse HEAD
+trace: built-in: git update-ref -m 'rebase finished: refs/heads/filemove onto 5bfd579efbb9b543520c07f057b68def2edce84b' refs/heads/filemove aa185e87543df8366df89b9b058081dfbc53a213 2b67e5fea27708b3b8fbf9c2844e83eeec1d1e41
+trace: built-in: git symbolic-ref -m 'rebase finished: returning to refs/heads/filemove' HEAD refs/heads/filemove
+trace: run_command: git gc --auto
+trace: built-in: git gc --auto
+ok 12 - rebase is not broken by diff.renames
 
 expecting success: 
-		try_case $N "$here/$N/wt" .git \
-			"$dotgit" "$here/$N/wt" "$here/$N" "(null)" &&
-		try_case $N wt .git \
-			"$dotgit" "$here/$N/wt" "$here/$N" "(null)" &&
-		try_case $N wt "$here/$N/.git" \
-			"$absgit" "$here/$N/wt" "$here/$N" "(null)" &&
-		try_case $N "$here/$N/wt" "$here/$N/.git" \
-			"$absgit" "$here/$N/wt" "$here/$N" "(null)"
-	
-ok 45 - #15: explicit GIT_WORK_TREE from parent of worktree
+	test_might_fail git rebase --abort &&
+	git reset --hard &&
+	git checkout modechange
 
-expecting success: 
-		try_case $N/sub/sub "$here/$N/wt" ../../.git \
-			"$dotdotgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)" &&
-		try_case $N/sub/sub ../../wt ../../.git \
-			"$dotdotgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)" &&
-		try_case $N/sub/sub ../../wt "$here/$N/.git" \
-			"$absgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)" &&
-		try_case $N/sub/sub "$here/$N/wt" "$here/$N/.git" \
-			"$absgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)"
-	
-ok 46 - #15: explicit GIT_WORK_TREE from nephew of worktree
+fatal: No rebase in progress?
+HEAD is now at aa185e8 Move A.
+Switched to branch 'modechange'
+ok 13 - setup: recover
 
 expecting success: 
-		try_case $N "$here" .git \
-			"$absgit" "$here" "$here" $N/ &&
-		try_case $N .. .git \
-			"$absgit" "$here" "$here" $N/ &&
-		try_case $N .. "$here/$N/.git" \
-			"$absgit" "$here" "$here" $N/ &&
-		try_case $N "$here" "$here/$N/.git" \
-			"$absgit" "$here" "$here" $N/
-	
-ok 47 - #15: chdir_to_toplevel uses worktree, not git dir
+	>B &&
+	test_must_fail git rebase topic 2>output.err >output.out &&
+	test_i18ngrep "The following untracked working tree files would be overwritten by checkout:" output.err &&
+	test_i18ngrep B output.err
 
-expecting success: 
-		try_case $N/sub/sub "$here" ../../.git \
-			"$absgit" "$here" "$here" $N/sub/sub/ &&
-		try_case $N/sub/sub ../../.. ../../.git \
-			"$absgit" "$here" "$here" $N/sub/sub/ &&
-		try_case $N/sub/sub ../../../ "$here/$N/.git" \
-			"$absgit" "$here" "$here" $N/sub/sub/ &&
-		try_case $N/sub/sub "$here" "$here/$N/.git" \
-			"$absgit" "$here" "$here" $N/sub/sub/
-	
-ok 48 - #15: chdir_to_toplevel uses worktree (from subdir)
+error: The following untracked working tree files would be overwritten by checkout:
+	B
+ok 14 - Show verbose error when HEAD could not be detached
 
 expecting success: 
-	setup_repo 16a unset "" unset &&
-	mkdir -p 16a/.git/wt/sub &&
+	git checkout topic &&
+	test_must_fail git rebase
 
-	try_case 16a/.git unset unset \
-		. "(null)" "$here/16a/.git" "(null)" &&
-	try_case 16a/.git/wt unset unset \
-		"$here/16a/.git" "(null)" "$here/16a/.git/wt" "(null)" &&
-	try_case 16a/.git/wt/sub unset unset \
-		"$here/16a/.git" "(null)" "$here/16a/.git/wt/sub" "(null)"
+Note: checking out 'topic'.
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1510-repo-setup/16a/.git/
-ok 49 - #16a: implicitly bare repo (cwd inside .git dir)
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by performing another checkout.
 
-expecting success: 
-	setup_repo 16b unset "" true &&
-	mkdir -p 16b/.git/wt/sub &&
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -b with the checkout command again. Example:
 
-	try_case 16b/.git unset unset \
-		. "(null)" "$here/16b/.git" "(null)" &&
-	try_case 16b/.git/wt unset unset \
-		"$here/16b/.git" "(null)" "$here/16b/.git/wt" "(null)" &&
-	try_case 16b/.git/wt/sub unset unset \
-		"$here/16b/.git" "(null)" "$here/16b/.git/wt/sub" "(null)"
+  git checkout -b <new-branch-name>
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1510-repo-setup/16b/.git/
-ok 50 - #16b: bare .git (cwd inside .git dir)
+HEAD is now at d7d6fe8 Add B.
+You are not currently on a branch.
+Please specify which branch you want to rebase against.
+See git-rebase(1) for details.
 
-expecting success: 
-	try_repo 16c unset unset unset "" true \
-		.git "(null)" "$here/16c" "(null)" \
-		"$here/16c/.git" "(null)" "$here/16c/sub" "(null)"
+    git rebase '<branch>'
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1510-repo-setup/16c/.git/
-ok 51 - #16c: bare .git has no worktree
+ok 15 - fail when upstream arg is missing and not on branch
 
 expecting success: 
-	setup_repo 16d unset "" unset &&
-	(
-		cd 16d/.git &&
-		test_must_fail git status &&
-		git config alias.st status &&
-		test_must_fail git st
-	)
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1510-repo-setup/16d/.git/
-fatal: this operation must be run in a work tree
-fatal: this operation must be run in a work tree
-ok 52 - #16d: bareness preserved across alias
+	git checkout -b no-config topic &&
+	test_must_fail git rebase
 
-expecting success: 
-	setup_repo 16e unset "" unset &&
-	(
-		cd 16e/.git &&
-		test_must_fail git status &&
-		test_must_fail git --bare status
-	)
+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.
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1510-repo-setup/16e/.git/
-fatal: this operation must be run in a work tree
-fatal: this operation must be run in a work tree
-ok 53 - #16e: bareness preserved by --bare
+    git rebase '<branch>'
 
-expecting success: 
-	# Just like #16.
-	setup_repo 17a unset "" true &&
-	setup_repo 17b unset "" true &&
-	mkdir -p 17a/.git/wt/sub &&
-	mkdir -p 17b/.git/wt/sub &&
+If you wish to set tracking information for this branch you can do so with:
 
-	try_case 17a/.git "$here/17a" unset \
-		"$here/17a/.git" "$here/17a" "$here/17a" .git/ \
-		2>message &&
-	try_case 17a/.git/wt "$here/17a" unset \
-		"$here/17a/.git" "$here/17a" "$here/17a" .git/wt/ &&
-	try_case 17a/.git/wt/sub "$here/17a" unset \
-		"$here/17a/.git" "$here/17a" "$here/17a" .git/wt/sub/ &&
+    git branch --set-upstream-to=<remote>/<branch> no-config
 
-	try_case 17b/.git "$here/17b" unset \
-		"$here/17b/.git" "$here/17b" "$here/17b" .git/ &&
-	try_case 17b/.git/wt "$here/17b" unset \
-		"$here/17b/.git" "$here/17b" "$here/17b" .git/wt/ &&
-	try_case 17b/.git/wt/sub "$here/17b" unset \
-		"$here/17b/.git" "$here/17b" "$here/17b" .git/wt/sub/ &&
+ok 16 - fail when upstream arg is missing and not configured
 
-	try_repo 17c "$here/17c" unset unset "" true \
-		.git "$here/17c" "$here/17c" "(null)" \
-		"$here/17c/.git" "$here/17c" "$here/17c" sub/ 2>message &&
-	test_must_be_empty message
+expecting success: 
+	git checkout -b default-base master &&
+	git checkout -b default topic &&
+	git config branch.default.remote . &&
+	git config branch.default.merge refs/heads/default-base &&
+	git rebase &&
+	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 &&
+	git rev-parse --verify default-base >expect &&
+	git rev-parse default~1 >actual &&
+	test_cmp expect actual
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1510-repo-setup/17a/.git/
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1510-repo-setup/17b/.git/
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1510-repo-setup/17c/.git/
-ok 54 - #17: GIT_WORK_TREE without explicit GIT_DIR is accepted (bare case)
+Switched to a new branch 'default-base'
+Switched to a new branch 'default'
+First, rewinding head to replay your work on top of it...
+Applying: Add B.
+Switched to branch 'default-base'
+HEAD is now at c383ad2 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 17 - default to common base in @{upstream}s reflog if no upstream arg
 
 expecting success: 
-	try_repo 18 unset .git unset "" true \
-		.git "(null)" "$here/18" "(null)" \
-		../.git "(null)" "$here/18/sub" "(null)" &&
-	try_repo 18b unset "$here/18b/.git" unset "" true \
-		"$here/18b/.git" "(null)" "$here/18b" "(null)" \
-		"$here/18b/.git" "(null)" "$here/18b/sub" "(null)"
+	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
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1510-repo-setup/18/.git/
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1510-repo-setup/18b/.git/
-ok 55 - #18: bare .git named by GIT_DIR has no worktree
+Switched to branch 'default-base'
+[default-base d0d375f] Modify A.
+ Author: author@name <bogus@email@address>
+ Date: Thu Jan 5 11:47:20 2023 +0000
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[default-base 002e7cb] B
+ Author: author@name <bogus@email@address>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 B
+[default-base 7a116f9] new_B
+ Author: author@name <bogus@email@address>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[default-base 662f934] 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" to merge the remote branch into yours)
+HEAD is now at c383ad2 Modify A.
+[default 9d44d3e] D
+ Author: author@name <bogus@email@address>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 D
+[default b504bd5] B
+ Author: author@name <bogus@email@address>
+ Date: Thu Apr 7 15:15:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 B
+[default 98b571a] new_B
+ Author: author@name <bogus@email@address>
+ Date: Thu Apr 7 15:16:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[default a04c497] final_B
+ Author: author@name <bogus@email@address>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+First, rewinding head to replay your work on top of it...
+Applying: D
+Applying: final_B
+ok 18 - cherry-picked commits and fork-point work together
 
 expecting success: 
-	setup_repo 19 unset "" true &&
-	mkdir -p 19/sub/sub 19/wt/sub
+	git checkout -b quiet topic &&
+	git rebase -q master >output.out 2>&1 &&
+	test_must_be_empty output.out
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1510-repo-setup/19/.git/
-ok 56 - #19: setup
+Switched to a new branch 'quiet'
+ok 19 - rebase -q is quiet
 
 expecting success: 
-		try_case $N "$here/$N" .git \
-			"$dotgit" "$here/$N" "$here/$N" "(null)" &&
-		try_case $N . .git \
-			"$dotgit" "$here/$N" "$here/$N" "(null)" &&
-		try_case $N "$here/$N" "$here/$N/.git" \
-			"$absgit" "$here/$N" "$here/$N" "(null)" &&
-		try_case $N . "$here/$N/.git" \
-			"$absgit" "$here/$N" "$here/$N" "(null)"
-	
-ok 57 - #19: explicit GIT_WORK_TREE and GIT_DIR at toplevel
+	(
+		echo "One" &&
+		echo "TwoQ" &&
+		echo "Three" &&
+		echo "FQur" &&
+		echo "Five"
+	) | q_to_cr >CR &&
+	git add CR &&
+	test_tick &&
+	git commit -a -m "A file with a line with CR" &&
+	git tag file-with-cr &&
+	git checkout HEAD^0 &&
+	git rebase --onto HEAD^^ HEAD^ &&
+	git diff --exit-code file-with-cr:CR HEAD:CR
 
-expecting success: 
-		try_case $N/sub/sub "$here/$N" ../../.git \
-			"$absgit" "$here/$N" "$here/$N" sub/sub/ &&
-		try_case $N/sub/sub ../.. ../../.git \
-			"$absgit" "$here/$N" "$here/$N" sub/sub/ &&
-		try_case $N/sub/sub "$here/$N" "$here/$N/.git" \
-			"$absgit" "$here/$N" "$here/$N" sub/sub/ &&
-		try_case $N/sub/sub ../.. "$here/$N/.git" \
-			"$absgit" "$here/$N" "$here/$N" sub/sub/
-	
-ok 58 - #19: explicit GIT_WORK_TREE and GIT_DIR in subdir
+[quiet 9f9038d] A file with a line with CR
+ Author: author@name <bogus@email@address>
+ 1 file changed, 5 insertions(+)
+ create mode 100644 CR
+Note: checking out 'HEAD^0'.
 
-expecting success: 
-		try_case $N "$here/$N/wt" .git \
-			"$dotgit" "$here/$N/wt" "$here/$N" "(null)" &&
-		try_case $N wt .git \
-			"$dotgit" "$here/$N/wt" "$here/$N" "(null)" &&
-		try_case $N wt "$here/$N/.git" \
-			"$absgit" "$here/$N/wt" "$here/$N" "(null)" &&
-		try_case $N "$here/$N/wt" "$here/$N/.git" \
-			"$absgit" "$here/$N/wt" "$here/$N" "(null)"
-	
-ok 59 - #19: explicit GIT_WORK_TREE from parent of worktree
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by performing another checkout.
 
-expecting success: 
-		try_case $N/sub/sub "$here/$N/wt" ../../.git \
-			"$dotdotgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)" &&
-		try_case $N/sub/sub ../../wt ../../.git \
-			"$dotdotgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)" &&
-		try_case $N/sub/sub ../../wt "$here/$N/.git" \
-			"$absgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)" &&
-		try_case $N/sub/sub "$here/$N/wt" "$here/$N/.git" \
-			"$absgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)"
-	
-ok 60 - #19: explicit GIT_WORK_TREE from nephew of worktree
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -b with the checkout command again. Example:
 
-expecting success: 
-		try_case $N "$here" .git \
-			"$absgit" "$here" "$here" $N/ &&
-		try_case $N .. .git \
-			"$absgit" "$here" "$here" $N/ &&
-		try_case $N .. "$here/$N/.git" \
-			"$absgit" "$here" "$here" $N/ &&
-		try_case $N "$here" "$here/$N/.git" \
-			"$absgit" "$here" "$here" $N/
-	
-ok 61 - #19: chdir_to_toplevel uses worktree, not git dir
+  git checkout -b <new-branch-name>
 
-expecting success: 
-		try_case $N/sub/sub "$here" ../../.git \
-			"$absgit" "$here" "$here" $N/sub/sub/ &&
-		try_case $N/sub/sub ../../.. ../../.git \
-			"$absgit" "$here" "$here" $N/sub/sub/ &&
-		try_case $N/sub/sub ../../../ "$here/$N/.git" \
-			"$absgit" "$here" "$here" $N/sub/sub/ &&
-		try_case $N/sub/sub "$here" "$here/$N/.git" \
-			"$absgit" "$here" "$here" $N/sub/sub/
-	
-ok 62 - #19: chdir_to_toplevel uses worktree (from subdir)
+HEAD is now at 9f9038d A file with a line with CR
+First, rewinding head to replay your work on top of it...
+Applying: A file with a line with CR
+ok 20 - Rebase a commit that sprinkles CRs in
 
 expecting success: 
-	# Unlike case #16a.
-	setup_repo 20a "$here/20a" "" unset &&
-	mkdir -p 20a/.git/wt/sub &&
-	try_case 20a/.git unset unset \
-		"$here/20a/.git" "$here/20a" "$here/20a" .git/ 2>message &&
-	try_case 20a/.git/wt unset unset \
-		"$here/20a/.git" "$here/20a" "$here/20a" .git/wt/ &&
-	try_case 20a/.git/wt/sub unset unset \
-		"$here/20a/.git" "$here/20a" "$here/20a" .git/wt/sub/ &&
-	test_must_be_empty message
+	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)"
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1510-repo-setup/20a/.git/
-ok 63 - #20a: core.worktree without GIT_DIR accepted (inside .git)
+[detached HEAD 5888c19] n1
+ Author: author@name <bogus@email@address>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 n1.t
+[detached HEAD 637a95c] n2
+ Author: author@name <bogus@email@address>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 n2.t
+[detached HEAD e501afb] n3
+ Author: author@name <bogus@email@address>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 n3.t
+First, rewinding head to replay your work on top of it...
+Applying: n3
+ok 21 - rebase can copy notes
 
 expecting success: 
-	setup_repo 20b non-existent "" true &&
-	mkdir -p 20b/.git/wt/sub &&
-	(
-		cd 20b/.git &&
-		test_must_fail git status >/dev/null
-	) 2>message &&
-	grep "core.bare and core.worktree" message
+	git reset --hard n3 &&
+	git rebase -m --onto n1 n2 &&
+	test "a note" = "$(git notes show HEAD)"
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1510-repo-setup/20b/.git/
-warning: core.bare and core.worktree do not make sense
-ok 64 - #20b/c: core.worktree and core.bare conflict
+HEAD is now at e501afb n3
+First, rewinding head to replay your work on top of it...
+Merging n1 with HEAD~0
+Merging:
+5888c19 n1
+e501afb n3
+found 1 common ancestor:
+637a95c n2
+[detached HEAD 34691b8] n3
+ Author: author@name <bogus@email@address>
+ Date: Thu Apr 7 15:23:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 n3.t
+Committed: 0001 n3
+All done.
+ok 22 - rebase -m can copy notes
 
 expecting success: 
-	setup_repo 20d non-existent "" true &&
-	mkdir -p 20d/.git/wt/sub &&
-	(
-		cd 20d/.git &&
-		git config foo.bar value
-	)
+	git reset --hard &&
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1510-repo-setup/20d/.git/
-warning: core.bare and core.worktree do not make sense
-ok 65 - #20d: core.worktree and core.bare OK when working tree not needed
+	>old.one && git add old.one && test_tick &&
+	git commit --date="@12345 +0400" -m "Old one" &&
+	>old.two && git add old.two && test_tick &&
+	git commit --date="@23456 +0500" -m "Old two" &&
+	>old.three && git add old.three && test_tick &&
+	git commit --date="@34567 +0600" -m "Old three" &&
 
-expecting success: 
-	setup_repo 21 non-existent "" unset &&
-	mkdir -p 21/.git/wt/sub &&
-	(
-		cd 21/.git &&
-		GIT_WORK_TREE="$here/21" &&
-		export GIT_WORK_TREE &&
-		git status >/dev/null
-	) 2>message &&
-	test_must_be_empty message
+	git 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^ &&
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1510-repo-setup/21/.git/
-ok 66 - #21: setup, core.worktree warns before overriding core.bare
+	git cat-file commit HEAD >actual &&
+	grep "author .* 34567 +0600$" actual
 
-expecting success: 
-		try_case $N "$here/$N" .git \
-			"$dotgit" "$here/$N" "$here/$N" "(null)" &&
-		try_case $N . .git \
-			"$dotgit" "$here/$N" "$here/$N" "(null)" &&
-		try_case $N "$here/$N" "$here/$N/.git" \
-			"$absgit" "$here/$N" "$here/$N" "(null)" &&
-		try_case $N . "$here/$N/.git" \
-			"$absgit" "$here/$N" "$here/$N" "(null)"
-	
-ok 67 - #21: explicit GIT_WORK_TREE and GIT_DIR at toplevel
+HEAD is now at 34691b8 n3
+[detached HEAD 0129e75] 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 8fb48b9] 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 63a42a0] 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
+First, rewinding head to replay your work on top of it...
+Applying: Old three
+author author@name <bogus@email@address> 34567 +0600
+ok 23 - rebase commit with an ancient timestamp
 
 expecting success: 
-		try_case $N/sub/sub "$here/$N" ../../.git \
-			"$absgit" "$here/$N" "$here/$N" sub/sub/ &&
-		try_case $N/sub/sub ../.. ../../.git \
-			"$absgit" "$here/$N" "$here/$N" sub/sub/ &&
-		try_case $N/sub/sub "$here/$N" "$here/$N/.git" \
-			"$absgit" "$here/$N" "$here/$N" sub/sub/ &&
-		try_case $N/sub/sub ../.. "$here/$N/.git" \
-			"$absgit" "$here/$N" "$here/$N" sub/sub/
-	
-ok 68 - #21: explicit GIT_WORK_TREE and GIT_DIR in subdir
+	git checkout -b preserve-from master~1 &&
+	cat >From_.msg <<EOF &&
+Somebody embedded an mbox in a commit message
 
-expecting success: 
-		try_case $N "$here/$N/wt" .git \
-			"$dotgit" "$here/$N/wt" "$here/$N" "(null)" &&
-		try_case $N wt .git \
-			"$dotgit" "$here/$N/wt" "$here/$N" "(null)" &&
-		try_case $N wt "$here/$N/.git" \
-			"$absgit" "$here/$N/wt" "$here/$N" "(null)" &&
-		try_case $N "$here/$N/wt" "$here/$N/.git" \
-			"$absgit" "$here/$N/wt" "$here/$N" "(null)"
-	
-ok 69 - #21: explicit GIT_WORK_TREE from parent of worktree
+This is from so-and-so:
 
-expecting success: 
-		try_case $N/sub/sub "$here/$N/wt" ../../.git \
-			"$dotdotgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)" &&
-		try_case $N/sub/sub ../../wt ../../.git \
-			"$dotdotgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)" &&
-		try_case $N/sub/sub ../../wt "$here/$N/.git" \
-			"$absgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)" &&
-		try_case $N/sub/sub "$here/$N/wt" "$here/$N/.git" \
-			"$absgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)"
-	
-ok 70 - #21: explicit GIT_WORK_TREE from nephew of worktree
+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
 
-expecting success: 
-		try_case $N "$here" .git \
-			"$absgit" "$here" "$here" $N/ &&
-		try_case $N .. .git \
-			"$absgit" "$here" "$here" $N/ &&
-		try_case $N .. "$here/$N/.git" \
-			"$absgit" "$here" "$here" $N/ &&
-		try_case $N "$here" "$here/$N/.git" \
-			"$absgit" "$here" "$here" $N/
-	
-ok 71 - #21: chdir_to_toplevel uses worktree, not git dir
+something
+EOF
+	>From_ &&
+	git add From_ &&
+	git commit -F From_.msg &&
+	git rebase master &&
+	git log -1 --pretty=format:%B >out &&
+	test_cmp From_.msg out
 
-expecting success: 
-		try_case $N/sub/sub "$here" ../../.git \
-			"$absgit" "$here" "$here" $N/sub/sub/ &&
-		try_case $N/sub/sub ../../.. ../../.git \
-			"$absgit" "$here" "$here" $N/sub/sub/ &&
-		try_case $N/sub/sub ../../../ "$here/$N/.git" \
-			"$absgit" "$here" "$here" $N/sub/sub/ &&
-		try_case $N/sub/sub "$here" "$here/$N/.git" \
-			"$absgit" "$here" "$here" $N/sub/sub/
-	
-ok 72 - #21: chdir_to_toplevel uses worktree (from subdir)
+Warning: you are leaving 3 commits behind, not connected to
+any of your branches:
 
-expecting success: 
-	# like case #6.
+  8659e0b Old three
+  0129e75 Old one
+  34691b8 n3
 
-	setup_repo 22a "$here/22a/.git" "" unset &&
-	setup_repo 22ab . "" unset &&
-	mkdir -p 22a/.git/sub 22a/sub &&
-	mkdir -p 22ab/.git/sub 22ab/sub &&
-	try_case 22a/.git unset . \
-		. "$here/22a/.git" "$here/22a/.git" "(null)" &&
-	try_case 22a/.git unset "$here/22a/.git" \
-		"$here/22a/.git" "$here/22a/.git" "$here/22a/.git" "(null)" &&
-	try_case 22a/.git/sub unset .. \
-		"$here/22a/.git" "$here/22a/.git" "$here/22a/.git" sub/ &&
-	try_case 22a/.git/sub unset "$here/22a/.git" \
-		"$here/22a/.git" "$here/22a/.git" "$here/22a/.git" sub/ &&
+If you want to keep them by creating a new branch, this may be a good time
+to do so with:
 
-	try_case 22ab/.git unset . \
-		. "$here/22ab/.git" "$here/22ab/.git" "(null)" &&
-	try_case 22ab/.git unset "$here/22ab/.git" \
-		"$here/22ab/.git" "$here/22ab/.git" "$here/22ab/.git" "(null)" &&
-	try_case 22ab/.git/sub unset .. \
-		"$here/22ab/.git" "$here/22ab/.git" "$here/22ab/.git" sub/ &&
-	try_case 22ab/.git unset "$here/22ab/.git" \
-		"$here/22ab/.git" "$here/22ab/.git" "$here/22ab/.git" "(null)"
+ git branch <new-branch-name> 8659e0b
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1510-repo-setup/22a/.git/
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1510-repo-setup/22ab/.git/
-ok 73 - #22a: core.worktree = GIT_DIR = .git dir
+Switched to a new branch 'preserve-from'
+[preserve-from 9a2b742] 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_
+First, rewinding head to replay your work on top of it...
+Applying: Somebody embedded an mbox in a commit message
+ok 24 - rebase with "From " line in commit message
 
 expecting success: 
-	setup_repo 22b "$here/22b/.git/wt" "" unset &&
-	setup_repo 22bb wt "" unset &&
-	mkdir -p 22b/.git/sub 22b/sub 22b/.git/wt/sub 22b/wt/sub &&
-	mkdir -p 22bb/.git/sub 22bb/sub 22bb/.git/wt 22bb/wt &&
+	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 --onto init HEAD^ &&
+		GIT_TRACE=1 git rebase --show-current-patch >/dev/null 2>stderr &&
+		grep "show.*$(git rev-parse two)" stderr
+	)
 
-	try_case 22b/.git unset . \
-		. "$here/22b/.git/wt" "$here/22b/.git" "(null)" &&
-	try_case 22b/.git unset "$here/22b/.git" \
-		"$here/22b/.git" "$here/22b/.git/wt" "$here/22b/.git" "(null)" &&
-	try_case 22b/.git/sub unset .. \
-		.. "$here/22b/.git/wt" "$here/22b/.git/sub" "(null)" &&
-	try_case 22b/.git/sub unset "$here/22b/.git" \
-		"$here/22b/.git" "$here/22b/.git/wt" "$here/22b/.git/sub" "(null)" &&
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3400-rebase/conflict-apply/.git/
+[master (root-commit) 080fbe0] init
+ Author: author@name <bogus@email@address>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 init.t
+[master 61e26c1] one
+ Author: author@name <bogus@email@address>
+ 1 file changed, 1 insertion(+)
+[master 1bf3d8f] 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:
+080fbe0 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' to see the failed patch
+Patch failed at 0001 two
 
-	try_case 22bb/.git unset . \
-		. "$here/22bb/.git/wt" "$here/22bb/.git" "(null)" &&
-	try_case 22bb/.git unset "$here/22bb/.git" \
-		"$here/22bb/.git" "$here/22bb/.git/wt" "$here/22bb/.git" "(null)" &&
-	try_case 22bb/.git/sub unset .. \
-		.. "$here/22bb/.git/wt" "$here/22bb/.git/sub" "(null)" &&
-	try_case 22bb/.git/sub unset "$here/22bb/.git" \
-		"$here/22bb/.git" "$here/22bb/.git/wt" "$here/22bb/.git/sub" "(null)"
+Resolve all conflicts manually, mark them as resolved with
+"git add/rm <conflicted_files>", then run "git rebase --continue".
+You can instead skip this commit: run "git rebase --skip".
+To abort and get back to the state before "git rebase", run "git rebase --abort".
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1510-repo-setup/22b/.git/
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1510-repo-setup/22bb/.git/
-ok 74 - #22b: core.worktree child of .git, GIT_DIR=.git
+trace: run_command: git show 1bf3d8fe33fb3e440d4f72b014f1eae094a4ac2c --
+trace: built-in: git show 1bf3d8fe33fb3e440d4f72b014f1eae094a4ac2c --
+ok 25 - rebase--am.sh and --show-current-patch
 
 expecting success: 
-	setup_repo 22c "$here/22c" "" unset &&
-	setup_repo 22cb .. "" unset &&
-	mkdir -p 22c/.git/sub 22c/sub &&
-	mkdir -p 22cb/.git/sub 22cb/sub &&
+	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)"
+	)
 
-	try_case 22c/.git unset . \
-		"$here/22c/.git" "$here/22c" "$here/22c" .git/ &&
-	try_case 22c/.git unset "$here/22c/.git" \
-		"$here/22c/.git" "$here/22c" "$here/22c" .git/ &&
-	try_case 22c/.git/sub unset .. \
-		"$here/22c/.git" "$here/22c" "$here/22c" .git/sub/ &&
-	try_case 22c/.git/sub unset "$here/22c/.git" \
-		"$here/22c/.git" "$here/22c" "$here/22c" .git/sub/ &&
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3400-rebase/conflict-merge/.git/
+[master (root-commit) 080fbe0] init
+ Author: author@name <bogus@email@address>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 init.t
+[master 61e26c1] one
+ Author: author@name <bogus@email@address>
+ 1 file changed, 1 insertion(+)
+[master 1bf3d8f] two
+ Author: author@name <bogus@email@address>
+ 1 file changed, 1 insertion(+)
+First, rewinding head to replay your work on top of it...
+Merging init with HEAD~0
+Merging:
+080fbe0 init
+1bf3d8f two
+found 1 common ancestor:
+61e26c1 one
+Auto-merging init.t
+CONFLICT (content): Merge conflict in init.t
 
-	try_case 22cb/.git unset . \
-		"$here/22cb/.git" "$here/22cb" "$here/22cb" .git/ &&
-	try_case 22cb/.git unset "$here/22cb/.git" \
-		"$here/22cb/.git" "$here/22cb" "$here/22cb" .git/ &&
-	try_case 22cb/.git/sub unset .. \
-		"$here/22cb/.git" "$here/22cb" "$here/22cb" .git/sub/ &&
-	try_case 22cb/.git/sub unset "$here/22cb/.git" \
-		"$here/22cb/.git" "$here/22cb" "$here/22cb" .git/sub/
+Resolve all conflicts manually, mark them as resolved with
+"git add/rm <conflicted_files>", then run "git rebase --continue".
+You can instead skip this commit: run "git rebase --skip".
+To abort and get back to the state before "git rebase", run "git rebase --abort".
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1510-repo-setup/22c/.git/
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1510-repo-setup/22cb/.git/
-ok 75 - #22c: core.worktree = .git/.., GIT_DIR=.git
+trace: built-in: git show REBASE_HEAD --
+ok 26 - rebase--merge.sh and --show-current-patch
 
+# passed all 26 test(s)
+1..26
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t3407-rebase-abort.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3407-rebase-abort/.git/
 expecting success: 
-	setup_repo 22 "$here/22" "" true &&
-	(
-		cd 22/.git &&
-		GIT_DIR=. &&
-		export GIT_DIR &&
-		test_must_fail git status 2>result
-	) &&
-	(
-		cd 22 &&
-		GIT_DIR=.git &&
-		export GIT_DIR &&
-		test_must_fail git status 2>result
-	) &&
-	grep "core.bare and core.worktree" 22/.git/result &&
-	grep "core.bare and core.worktree" 22/result
+	mkdir -p "$work_dir" &&
+	cd "$work_dir" &&
+	git init &&
+	echo a > a &&
+	git add a &&
+	git commit -m a &&
+	git branch to-rebase &&
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1510-repo-setup/22/.git/
-warning: core.bare and core.worktree do not make sense
-warning: core.bare and core.worktree do not make sense
-ok 76 - #22.2: core.worktree and core.bare conflict
+	echo b > a &&
+	git commit -a -m b &&
+	echo c > a &&
+	git commit -a -m c &&
 
-expecting success: 
-	setup_repo 23 non-existent "" true &&
-	mkdir -p 23/sub/sub 23/wt/sub
+	git checkout to-rebase &&
+	echo d > a &&
+	git commit -a -m "merge should fail on this" &&
+	echo e > a &&
+	git commit -a -m "merge should fail on this, too" &&
+	git branch pre-rebase
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1510-repo-setup/23/.git/
-ok 77 - #23: setup
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3407-rebase-abort/test dir/.git/
+[master (root-commit) 33dae3c] a
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 a
+[master 38b8095] b
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[master 3b5840b] c
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to branch 'to-rebase'
+[to-rebase a37c9d7] merge should fail on this
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[to-rebase c2094ef] 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: 
-		try_case $N "$here/$N" .git \
-			"$dotgit" "$here/$N" "$here/$N" "(null)" &&
-		try_case $N . .git \
-			"$dotgit" "$here/$N" "$here/$N" "(null)" &&
-		try_case $N "$here/$N" "$here/$N/.git" \
-			"$absgit" "$here/$N" "$here/$N" "(null)" &&
-		try_case $N . "$here/$N/.git" \
-			"$absgit" "$here/$N" "$here/$N" "(null)"
+		cd "$work_dir" &&
+		# Clean up the state from the previous one
+		git reset --hard pre-rebase &&
+		test_must_fail git rebase$type master &&
+		test_path_is_dir "$dotest" &&
+		git rebase --abort &&
+		test $(git rev-parse to-rebase) = $(git rev-parse pre-rebase) &&
+		test ! -d "$dotest"
 	
-ok 78 - #23: explicit GIT_WORK_TREE and GIT_DIR at toplevel
+HEAD is now at c2094ef 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:
+3b5840b 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' to see the failed patch
+Patch failed at 0001 merge should fail on this
 
-expecting success: 
-		try_case $N/sub/sub "$here/$N" ../../.git \
-			"$absgit" "$here/$N" "$here/$N" sub/sub/ &&
-		try_case $N/sub/sub ../.. ../../.git \
-			"$absgit" "$here/$N" "$here/$N" sub/sub/ &&
-		try_case $N/sub/sub "$here/$N" "$here/$N/.git" \
-			"$absgit" "$here/$N" "$here/$N" sub/sub/ &&
-		try_case $N/sub/sub ../.. "$here/$N/.git" \
-			"$absgit" "$here/$N" "$here/$N" sub/sub/
-	
-ok 79 - #23: explicit GIT_WORK_TREE and GIT_DIR in subdir
+Resolve all conflicts manually, mark them as resolved with
+"git add/rm <conflicted_files>", then run "git rebase --continue".
+You can instead skip this commit: run "git rebase --skip".
+To abort and get back to the state before "git rebase", run "git rebase --abort".
 
-expecting success: 
-		try_case $N "$here/$N/wt" .git \
-			"$dotgit" "$here/$N/wt" "$here/$N" "(null)" &&
-		try_case $N wt .git \
-			"$dotgit" "$here/$N/wt" "$here/$N" "(null)" &&
-		try_case $N wt "$here/$N/.git" \
-			"$absgit" "$here/$N/wt" "$here/$N" "(null)" &&
-		try_case $N "$here/$N/wt" "$here/$N/.git" \
-			"$absgit" "$here/$N/wt" "$here/$N" "(null)"
-	
-ok 80 - #23: explicit GIT_WORK_TREE from parent of worktree
+ok 2 - rebase --abort
 
 expecting success: 
-		try_case $N/sub/sub "$here/$N/wt" ../../.git \
-			"$dotdotgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)" &&
-		try_case $N/sub/sub ../../wt ../../.git \
-			"$dotdotgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)" &&
-		try_case $N/sub/sub ../../wt "$here/$N/.git" \
-			"$absgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)" &&
-		try_case $N/sub/sub "$here/$N/wt" "$here/$N/.git" \
-			"$absgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)"
+		cd "$work_dir" &&
+		# Clean up the state from the previous one
+		git reset --hard pre-rebase &&
+		test_must_fail git rebase$type master &&
+		test_path_is_dir "$dotest" &&
+		test_must_fail git rebase --skip &&
+		test $(git rev-parse HEAD) = $(git rev-parse master) &&
+		git rebase --abort &&
+		test $(git rev-parse to-rebase) = $(git rev-parse pre-rebase) &&
+		test ! -d "$dotest"
 	
-ok 81 - #23: explicit GIT_WORK_TREE from nephew of worktree
+HEAD is now at c2094ef 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:
+3b5840b 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' to see the failed patch
+Patch failed at 0001 merge should fail on this
 
-expecting success: 
-		try_case $N "$here" .git \
-			"$absgit" "$here" "$here" $N/ &&
-		try_case $N .. .git \
-			"$absgit" "$here" "$here" $N/ &&
-		try_case $N .. "$here/$N/.git" \
-			"$absgit" "$here" "$here" $N/ &&
-		try_case $N "$here" "$here/$N/.git" \
-			"$absgit" "$here" "$here" $N/
-	
-ok 82 - #23: chdir_to_toplevel uses worktree, not git dir
+Resolve all conflicts manually, mark them as resolved with
+"git add/rm <conflicted_files>", then run "git rebase --continue".
+You can instead skip this commit: run "git rebase --skip".
+To abort and get back to the state before "git rebase", run "git rebase --abort".
 
-expecting success: 
-		try_case $N/sub/sub "$here" ../../.git \
-			"$absgit" "$here" "$here" $N/sub/sub/ &&
-		try_case $N/sub/sub ../../.. ../../.git \
-			"$absgit" "$here" "$here" $N/sub/sub/ &&
-		try_case $N/sub/sub ../../../ "$here/$N/.git" \
-			"$absgit" "$here" "$here" $N/sub/sub/ &&
-		try_case $N/sub/sub "$here" "$here/$N/.git" \
-			"$absgit" "$here" "$here" $N/sub/sub/
-	
-ok 83 - #23: chdir_to_toplevel uses worktree (from subdir)
+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:
+3b5840b 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' to see the failed patch
+Patch failed at 0002 merge should fail on this, too
 
-expecting success: 
-	try_repo 24 unset unset unset gitfile true \
-		"$here/24.git" "(null)" "$here/24" "(null)" \
-		"$here/24.git" "(null)" "$here/24/sub" "(null)"
+Resolve all conflicts manually, mark them as resolved with
+"git add/rm <conflicted_files>", then run "git rebase --continue".
+You can instead skip this commit: run "git rebase --skip".
+To abort and get back to the state before "git rebase", run "git rebase --abort".
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1510-repo-setup/24/.git/
-ok 84 - #24: bare repo has no worktree (gitfile case)
+ok 3 - rebase --abort after --skip
 
 expecting success: 
-	try_repo 25 "$here/25" unset unset gitfile true \
-		"$here/25.git" "$here/25" "$here/25" "(null)"  \
-		"$here/25.git" "$here/25" "$here/25" "sub/" 2>message &&
-	test_must_be_empty message
+		cd "$work_dir" &&
+		# Clean up the state from the previous one
+		git reset --hard pre-rebase &&
+		test_must_fail git rebase$type master &&
+		test_path_is_dir "$dotest" &&
+		echo c > a &&
+		echo d >> a &&
+		git add a &&
+		test_must_fail git rebase --continue &&
+		test $(git rev-parse HEAD) != $(git rev-parse master) &&
+		git rebase --abort &&
+		test $(git rev-parse to-rebase) = $(git rev-parse pre-rebase) &&
+		test ! -d "$dotest"
+	
+HEAD is now at c2094ef 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:
+3b5840b 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' to see the failed patch
+Patch failed at 0001 merge should fail on this
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1510-repo-setup/25/.git/
-ok 85 - #25: GIT_WORK_TREE accepted if GIT_DIR unset (bare gitfile case)
+Resolve all conflicts manually, mark them as resolved with
+"git add/rm <conflicted_files>", then run "git rebase --continue".
+You can instead skip this commit: run "git rebase --skip".
+To abort and get back to the state before "git rebase", run "git rebase --abort".
 
-expecting success: 
-	try_repo 26 unset "$here/26/.git" unset gitfile true \
-		"$here/26.git" "(null)" "$here/26" "(null)" \
-		"$here/26.git" "(null)" "$here/26/sub" "(null)" &&
-	try_repo 26b unset .git unset gitfile true \
-		"$here/26b.git" "(null)" "$here/26b" "(null)" \
-		"$here/26b.git" "(null)" "$here/26b/sub" "(null)"
+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:
+7074404 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' to see the failed patch
+Patch failed at 0002 merge should fail on this, too
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1510-repo-setup/26/.git/
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1510-repo-setup/26b/.git/
-ok 86 - #26: bare repo has no worktree (GIT_DIR -> gitfile case)
+Resolve all conflicts manually, mark them as resolved with
+"git add/rm <conflicted_files>", then run "git rebase --continue".
+You can instead skip this commit: run "git rebase --skip".
+To abort and get back to the state before "git rebase", run "git rebase --abort".
+
+ok 4 - rebase --abort after --continue
 
 expecting success: 
-	setup_repo 27 unset gitfile true &&
-	mkdir -p 27/sub/sub 27/wt/sub
+		cd "$work_dir" &&
+		# 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 master &&
+		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 c2094ef 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:
+3b5840b 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' to see the failed patch
+Patch failed at 0001 merge should fail on this
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1510-repo-setup/27/.git/
-ok 87 - #27: setup
+Resolve all conflicts manually, mark them as resolved with
+"git add/rm <conflicted_files>", then run "git rebase --continue".
+You can instead skip this commit: run "git rebase --skip".
+To abort and get back to the state before "git rebase", run "git rebase --abort".
+
+ok 5 - rebase --abort does not update reflog
 
 expecting success: 
-		try_case $N "$here/$N" .git \
-			"$dotgit" "$here/$N" "$here/$N" "(null)" &&
-		try_case $N . .git \
-			"$dotgit" "$here/$N" "$here/$N" "(null)" &&
-		try_case $N "$here/$N" "$here/$N/.git" \
-			"$absgit" "$here/$N" "$here/$N" "(null)" &&
-		try_case $N . "$here/$N/.git" \
-			"$absgit" "$here/$N" "$here/$N" "(null)"
+		cd "$work_dir" &&
+		# Clean up the state from the previous one
+		git reset --hard pre-rebase &&
+		test_must_fail git rebase$type master &&
+		test_must_fail git rebase -v --abort &&
+		test_must_fail git rebase --abort -v &&
+		git rebase --abort
 	
-ok 88 - #27: explicit GIT_WORK_TREE and GIT_DIR at toplevel
+HEAD is now at c2094ef 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:
+3b5840b 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' to see the failed patch
+Patch failed at 0001 merge should fail on this
+
+Resolve all conflicts manually, mark them as resolved with
+"git add/rm <conflicted_files>", then run "git rebase --continue".
+You can instead skip this commit: run "git rebase --skip".
+To abort and get back to the state before "git rebase", run "git rebase --abort".
+
+usage: git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] [<upstream>] [<branch>]
+   or: git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]
+   or: git rebase --continue | --abort | --skip | --edit-todo
+
+    --onto <revision>     rebase onto given branch instead of upstream
+    --no-verify           allow pre-rebase hook to run
+    -q, --quiet           be quiet. implies --no-stat
+    -v, --verbose         display a diffstat of what changed upstream
+    -n, --no-stat         do not show diffstat of what changed upstream
+    --signoff             add a Signed-off-by: line to each commit
+    --ignore-whitespace   passed to 'git am'
+    --committer-date-is-author-date
+                          passed to 'git am'
+    --ignore-date         passed to 'git am'
+    -C <n>                passed to 'git apply'
+    --whitespace <action>
+                          passed to 'git apply'
+    -f, --force-rebase    cherry-pick all commits, even if unchanged
+    --no-ff               cherry-pick all commits, even if unchanged
+    --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
+    -m, --merge           use merging strategies to rebase
+    -i, --interactive     let the user edit the list of commits to rebase
+    -p, --preserve-merges
+                          try to recreate merges instead of ignoring them
+    --rerere-autoupdate   allow rerere to update index with resolved conflict
+    -k, --keep-empty      preserve empty commits during rebase
+    --autosquash          move commits that begin with squash!/fixup! under -i
+    -S, --gpg-sign[=<key-id>]
+                          GPG-sign commits
+    --autostash           automatically stash/stash pop before and after
+    -x, --exec <exec>     add exec lines after each commit of the editable list
+    --allow-empty-message
+                          allow rebasing commits with empty messages
+    -r, --rebase-merges[=<mode>]
+                          try to rebase merges instead of skipping them
+    --fork-point          use 'merge-base --fork-point' to refine upstream
+    -s, --strategy <strategy>
+                          use the given merge strategy
+    -X, --strategy-option <option>
+                          pass the argument through to the merge strategy
+    --root                rebase all reachable commits up to the root(s)
+
+usage: git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] [<upstream>] [<branch>]
+   or: git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]
+   or: git rebase --continue | --abort | --skip | --edit-todo
+
+    --onto <revision>     rebase onto given branch instead of upstream
+    --no-verify           allow pre-rebase hook to run
+    -q, --quiet           be quiet. implies --no-stat
+    -v, --verbose         display a diffstat of what changed upstream
+    -n, --no-stat         do not show diffstat of what changed upstream
+    --signoff             add a Signed-off-by: line to each commit
+    --ignore-whitespace   passed to 'git am'
+    --committer-date-is-author-date
+                          passed to 'git am'
+    --ignore-date         passed to 'git am'
+    -C <n>                passed to 'git apply'
+    --whitespace <action>
+                          passed to 'git apply'
+    -f, --force-rebase    cherry-pick all commits, even if unchanged
+    --no-ff               cherry-pick all commits, even if unchanged
+    --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
+    -m, --merge           use merging strategies to rebase
+    -i, --interactive     let the user edit the list of commits to rebase
+    -p, --preserve-merges
+                          try to recreate merges instead of ignoring them
+    --rerere-autoupdate   allow rerere to update index with resolved conflict
+    -k, --keep-empty      preserve empty commits during rebase
+    --autosquash          move commits that begin with squash!/fixup! under -i
+    -S, --gpg-sign[=<key-id>]
+                          GPG-sign commits
+    --autostash           automatically stash/stash pop before and after
+    -x, --exec <exec>     add exec lines after each commit of the editable list
+    --allow-empty-message
+                          allow rebasing commits with empty messages
+    -r, --rebase-merges[=<mode>]
+                          try to rebase merges instead of skipping them
+    --fork-point          use 'merge-base --fork-point' to refine upstream
+    -s, --strategy <strategy>
+                          use the given merge strategy
+    -X, --strategy-option <option>
+                          pass the argument through to the merge strategy
+    --root                rebase all reachable commits up to the root(s)
+
+ok 6 - rebase --abort can not be used with other options
 
 expecting success: 
-		try_case $N/sub/sub "$here/$N" ../../.git \
-			"$absgit" "$here/$N" "$here/$N" sub/sub/ &&
-		try_case $N/sub/sub ../.. ../../.git \
-			"$absgit" "$here/$N" "$here/$N" sub/sub/ &&
-		try_case $N/sub/sub "$here/$N" "$here/$N/.git" \
-			"$absgit" "$here/$N" "$here/$N" sub/sub/ &&
-		try_case $N/sub/sub ../.. "$here/$N/.git" \
-			"$absgit" "$here/$N" "$here/$N" sub/sub/
+		cd "$work_dir" &&
+		# Clean up the state from the previous one
+		git reset --hard pre-rebase &&
+		test_must_fail git rebase$type master &&
+		test_path_is_dir "$dotest" &&
+		git rebase --abort &&
+		test $(git rev-parse to-rebase) = $(git rev-parse pre-rebase) &&
+		test ! -d "$dotest"
 	
-ok 89 - #27: explicit GIT_WORK_TREE and GIT_DIR in subdir
+HEAD is now at c2094ef merge should fail on this, too
+First, rewinding head to replay your work on top of it...
+Merging master with HEAD~1
+Merging:
+3b5840b c
+a37c9d7 merge should fail on this
+found 1 common ancestor:
+33dae3c a
+Auto-merging a
+CONFLICT (content): Merge conflict in a
+
+Resolve all conflicts manually, mark them as resolved with
+"git add/rm <conflicted_files>", then run "git rebase --continue".
+You can instead skip this commit: run "git rebase --skip".
+To abort and get back to the state before "git rebase", run "git rebase --abort".
+
+ok 7 - rebase --merge --abort
 
 expecting success: 
-		try_case $N "$here/$N/wt" .git \
-			"$dotgit" "$here/$N/wt" "$here/$N" "(null)" &&
-		try_case $N wt .git \
-			"$dotgit" "$here/$N/wt" "$here/$N" "(null)" &&
-		try_case $N wt "$here/$N/.git" \
-			"$absgit" "$here/$N/wt" "$here/$N" "(null)" &&
-		try_case $N "$here/$N/wt" "$here/$N/.git" \
-			"$absgit" "$here/$N/wt" "$here/$N" "(null)"
+		cd "$work_dir" &&
+		# Clean up the state from the previous one
+		git reset --hard pre-rebase &&
+		test_must_fail git rebase$type master &&
+		test_path_is_dir "$dotest" &&
+		test_must_fail git rebase --skip &&
+		test $(git rev-parse HEAD) = $(git rev-parse master) &&
+		git rebase --abort &&
+		test $(git rev-parse to-rebase) = $(git rev-parse pre-rebase) &&
+		test ! -d "$dotest"
 	
-ok 90 - #27: explicit GIT_WORK_TREE from parent of worktree
+HEAD is now at c2094ef merge should fail on this, too
+First, rewinding head to replay your work on top of it...
+Merging master with HEAD~1
+Merging:
+3b5840b c
+a37c9d7 merge should fail on this
+found 1 common ancestor:
+33dae3c a
+Auto-merging a
+CONFLICT (content): Merge conflict in a
+
+Resolve all conflicts manually, mark them as resolved with
+"git add/rm <conflicted_files>", then run "git rebase --continue".
+You can instead skip this commit: run "git rebase --skip".
+To abort and get back to the state before "git rebase", run "git rebase --abort".
+
+Merging master with HEAD~0
+Merging:
+3b5840b c
+c2094ef merge should fail on this, too
+found 1 common ancestor:
+a37c9d7 merge should fail on this
+Auto-merging a
+CONFLICT (content): Merge conflict in a
+
+Resolve all conflicts manually, mark them as resolved with
+"git add/rm <conflicted_files>", then run "git rebase --continue".
+You can instead skip this commit: run "git rebase --skip".
+To abort and get back to the state before "git rebase", run "git rebase --abort".
+
+ok 8 - rebase --merge --abort after --skip
 
 expecting success: 
-		try_case $N/sub/sub "$here/$N/wt" ../../.git \
-			"$dotdotgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)" &&
-		try_case $N/sub/sub ../../wt ../../.git \
-			"$dotdotgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)" &&
-		try_case $N/sub/sub ../../wt "$here/$N/.git" \
-			"$absgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)" &&
-		try_case $N/sub/sub "$here/$N/wt" "$here/$N/.git" \
-			"$absgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)"
+		cd "$work_dir" &&
+		# Clean up the state from the previous one
+		git reset --hard pre-rebase &&
+		test_must_fail git rebase$type master &&
+		test_path_is_dir "$dotest" &&
+		echo c > a &&
+		echo d >> a &&
+		git add a &&
+		test_must_fail git rebase --continue &&
+		test $(git rev-parse HEAD) != $(git rev-parse master) &&
+		git rebase --abort &&
+		test $(git rev-parse to-rebase) = $(git rev-parse pre-rebase) &&
+		test ! -d "$dotest"
 	
-ok 91 - #27: explicit GIT_WORK_TREE from nephew of worktree
+HEAD is now at c2094ef merge should fail on this, too
+First, rewinding head to replay your work on top of it...
+Merging master with HEAD~1
+Merging:
+3b5840b c
+a37c9d7 merge should fail on this
+found 1 common ancestor:
+33dae3c a
+Auto-merging a
+CONFLICT (content): Merge conflict in a
+
+Resolve all conflicts manually, mark them as resolved with
+"git add/rm <conflicted_files>", then run "git rebase --continue".
+You can instead skip this commit: run "git rebase --skip".
+To abort and get back to the state before "git rebase", run "git rebase --abort".
+
+[detached HEAD 2205561] merge should fail on this
+ Author: A U Thor <author@example.com>
+ Date: Thu Jan 5 11:47:25 2023 +0000
+ 1 file changed, 1 insertion(+)
+Committed: 0001 merge should fail on this
+Merging master with HEAD~0
+Merging:
+2205561 merge should fail on this
+c2094ef merge should fail on this, too
+found 1 common ancestor:
+a37c9d7 merge should fail on this
+Auto-merging a
+CONFLICT (content): Merge conflict in a
+
+Resolve all conflicts manually, mark them as resolved with
+"git add/rm <conflicted_files>", then run "git rebase --continue".
+You can instead skip this commit: run "git rebase --skip".
+To abort and get back to the state before "git rebase", run "git rebase --abort".
+
+ok 9 - rebase --merge --abort after --continue
 
 expecting success: 
-		try_case $N "$here" .git \
-			"$absgit" "$here" "$here" $N/ &&
-		try_case $N .. .git \
-			"$absgit" "$here" "$here" $N/ &&
-		try_case $N .. "$here/$N/.git" \
-			"$absgit" "$here" "$here" $N/ &&
-		try_case $N "$here" "$here/$N/.git" \
-			"$absgit" "$here" "$here" $N/
+		cd "$work_dir" &&
+		# 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 master &&
+		git rebase --abort &&
+		git reflog show to-rebase > reflog_after &&
+		test_cmp reflog_before reflog_after &&
+		rm reflog_before reflog_after
 	
-ok 92 - #27: chdir_to_toplevel uses worktree, not git dir
+HEAD is now at c2094ef merge should fail on this, too
+First, rewinding head to replay your work on top of it...
+Merging master with HEAD~1
+Merging:
+3b5840b c
+a37c9d7 merge should fail on this
+found 1 common ancestor:
+33dae3c a
+Auto-merging a
+CONFLICT (content): Merge conflict in a
+
+Resolve all conflicts manually, mark them as resolved with
+"git add/rm <conflicted_files>", then run "git rebase --continue".
+You can instead skip this commit: run "git rebase --skip".
+To abort and get back to the state before "git rebase", run "git rebase --abort".
+
+ok 10 - rebase --merge --abort does not update reflog
 
 expecting success: 
-		try_case $N/sub/sub "$here" ../../.git \
-			"$absgit" "$here" "$here" $N/sub/sub/ &&
-		try_case $N/sub/sub ../../.. ../../.git \
-			"$absgit" "$here" "$here" $N/sub/sub/ &&
-		try_case $N/sub/sub ../../../ "$here/$N/.git" \
-			"$absgit" "$here" "$here" $N/sub/sub/ &&
-		try_case $N/sub/sub "$here" "$here/$N/.git" \
-			"$absgit" "$here" "$here" $N/sub/sub/
+		cd "$work_dir" &&
+		# Clean up the state from the previous one
+		git reset --hard pre-rebase &&
+		test_must_fail git rebase$type master &&
+		test_must_fail git rebase -v --abort &&
+		test_must_fail git rebase --abort -v &&
+		git rebase --abort
 	
-ok 93 - #27: chdir_to_toplevel uses worktree (from subdir)
+HEAD is now at c2094ef merge should fail on this, too
+First, rewinding head to replay your work on top of it...
+Merging master with HEAD~1
+Merging:
+3b5840b c
+a37c9d7 merge should fail on this
+found 1 common ancestor:
+33dae3c a
+Auto-merging a
+CONFLICT (content): Merge conflict in a
 
-expecting success: 
-	setup_repo 28 "$here/28" gitfile true &&
-	(
-		cd 28 &&
-		test_must_fail git status
-	) 2>message &&
-	grep "core.bare and core.worktree" message
+Resolve all conflicts manually, mark them as resolved with
+"git add/rm <conflicted_files>", then run "git rebase --continue".
+You can instead skip this commit: run "git rebase --skip".
+To abort and get back to the state before "git rebase", run "git rebase --abort".
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1510-repo-setup/28/.git/
-warning: core.bare and core.worktree do not make sense
-ok 94 - #28: core.worktree and core.bare conflict (gitfile case)
+usage: git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] [<upstream>] [<branch>]
+   or: git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]
+   or: git rebase --continue | --abort | --skip | --edit-todo
 
-expecting success: 
-	setup_repo 29 non-existent gitfile true &&
-	mkdir -p 29/sub/sub 29/wt/sub &&
-	(
-		cd 29 &&
-		GIT_WORK_TREE="$here/29" &&
-		export GIT_WORK_TREE &&
-		git status
-	) 2>message &&
-	test_must_be_empty message
+    --onto <revision>     rebase onto given branch instead of upstream
+    --no-verify           allow pre-rebase hook to run
+    -q, --quiet           be quiet. implies --no-stat
+    -v, --verbose         display a diffstat of what changed upstream
+    -n, --no-stat         do not show diffstat of what changed upstream
+    --signoff             add a Signed-off-by: line to each commit
+    --ignore-whitespace   passed to 'git am'
+    --committer-date-is-author-date
+                          passed to 'git am'
+    --ignore-date         passed to 'git am'
+    -C <n>                passed to 'git apply'
+    --whitespace <action>
+                          passed to 'git apply'
+    -f, --force-rebase    cherry-pick all commits, even if unchanged
+    --no-ff               cherry-pick all commits, even if unchanged
+    --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
+    -m, --merge           use merging strategies to rebase
+    -i, --interactive     let the user edit the list of commits to rebase
+    -p, --preserve-merges
+                          try to recreate merges instead of ignoring them
+    --rerere-autoupdate   allow rerere to update index with resolved conflict
+    -k, --keep-empty      preserve empty commits during rebase
+    --autosquash          move commits that begin with squash!/fixup! under -i
+    -S, --gpg-sign[=<key-id>]
+                          GPG-sign commits
+    --autostash           automatically stash/stash pop before and after
+    -x, --exec <exec>     add exec lines after each commit of the editable list
+    --allow-empty-message
+                          allow rebasing commits with empty messages
+    -r, --rebase-merges[=<mode>]
+                          try to rebase merges instead of skipping them
+    --fork-point          use 'merge-base --fork-point' to refine upstream
+    -s, --strategy <strategy>
+                          use the given merge strategy
+    -X, --strategy-option <option>
+                          pass the argument through to the merge strategy
+    --root                rebase all reachable commits up to the root(s)
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1510-repo-setup/29/.git/
-On branch master
+usage: git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] [<upstream>] [<branch>]
+   or: git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]
+   or: git rebase --continue | --abort | --skip | --edit-todo
 
-No commits yet
+    --onto <revision>     rebase onto given branch instead of upstream
+    --no-verify           allow pre-rebase hook to run
+    -q, --quiet           be quiet. implies --no-stat
+    -v, --verbose         display a diffstat of what changed upstream
+    -n, --no-stat         do not show diffstat of what changed upstream
+    --signoff             add a Signed-off-by: line to each commit
+    --ignore-whitespace   passed to 'git am'
+    --committer-date-is-author-date
+                          passed to 'git am'
+    --ignore-date         passed to 'git am'
+    -C <n>                passed to 'git apply'
+    --whitespace <action>
+                          passed to 'git apply'
+    -f, --force-rebase    cherry-pick all commits, even if unchanged
+    --no-ff               cherry-pick all commits, even if unchanged
+    --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
+    -m, --merge           use merging strategies to rebase
+    -i, --interactive     let the user edit the list of commits to rebase
+    -p, --preserve-merges
+                          try to recreate merges instead of ignoring them
+    --rerere-autoupdate   allow rerere to update index with resolved conflict
+    -k, --keep-empty      preserve empty commits during rebase
+    --autosquash          move commits that begin with squash!/fixup! under -i
+    -S, --gpg-sign[=<key-id>]
+                          GPG-sign commits
+    --autostash           automatically stash/stash pop before and after
+    -x, --exec <exec>     add exec lines after each commit of the editable list
+    --allow-empty-message
+                          allow rebasing commits with empty messages
+    -r, --rebase-merges[=<mode>]
+                          try to rebase merges instead of skipping them
+    --fork-point          use 'merge-base --fork-point' to refine upstream
+    -s, --strategy <strategy>
+                          use the given merge strategy
+    -X, --strategy-option <option>
+                          pass the argument through to the merge strategy
+    --root                rebase all reachable commits up to the root(s)
 
-nothing to commit (create/copy files and use "git add" to track)
-ok 95 - #29: setup
+ok 11 - rebase --abort can not be used with other options
 
 expecting success: 
-		try_case $N "$here/$N" .git \
-			"$dotgit" "$here/$N" "$here/$N" "(null)" &&
-		try_case $N . .git \
-			"$dotgit" "$here/$N" "$here/$N" "(null)" &&
-		try_case $N "$here/$N" "$here/$N/.git" \
-			"$absgit" "$here/$N" "$here/$N" "(null)" &&
-		try_case $N . "$here/$N/.git" \
-			"$absgit" "$here/$N" "$here/$N" "(null)"
-	
-ok 96 - #29: explicit GIT_WORK_TREE and GIT_DIR at toplevel
+	cd "$work_dir" &&
+	# Clean up the state from the previous one
+	git reset --hard pre-rebase &&
+	test_must_fail git rebase master &&
+	test_path_is_dir .git/rebase-apply &&
+	head_before=$(git rev-parse HEAD) &&
+	git rebase --quit &&
+	test $(git rev-parse HEAD) = $head_before &&
+	test ! -d .git/rebase-apply
 
-expecting success: 
-		try_case $N/sub/sub "$here/$N" ../../.git \
-			"$absgit" "$here/$N" "$here/$N" sub/sub/ &&
-		try_case $N/sub/sub ../.. ../../.git \
-			"$absgit" "$here/$N" "$here/$N" sub/sub/ &&
-		try_case $N/sub/sub "$here/$N" "$here/$N/.git" \
-			"$absgit" "$here/$N" "$here/$N" sub/sub/ &&
-		try_case $N/sub/sub ../.. "$here/$N/.git" \
-			"$absgit" "$here/$N" "$here/$N" sub/sub/
-	
-ok 97 - #29: explicit GIT_WORK_TREE and GIT_DIR in subdir
+HEAD is now at c2094ef 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:
+3b5840b 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' to see the failed patch
+Patch failed at 0001 merge should fail on this
 
-expecting success: 
-		try_case $N "$here/$N/wt" .git \
-			"$dotgit" "$here/$N/wt" "$here/$N" "(null)" &&
-		try_case $N wt .git \
-			"$dotgit" "$here/$N/wt" "$here/$N" "(null)" &&
-		try_case $N wt "$here/$N/.git" \
-			"$absgit" "$here/$N/wt" "$here/$N" "(null)" &&
-		try_case $N "$here/$N/wt" "$here/$N/.git" \
-			"$absgit" "$here/$N/wt" "$here/$N" "(null)"
-	
-ok 98 - #29: explicit GIT_WORK_TREE from parent of worktree
+Resolve all conflicts manually, mark them as resolved with
+"git add/rm <conflicted_files>", then run "git rebase --continue".
+You can instead skip this commit: run "git rebase --skip".
+To abort and get back to the state before "git rebase", run "git rebase --abort".
 
-expecting success: 
-		try_case $N/sub/sub "$here/$N/wt" ../../.git \
-			"$dotdotgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)" &&
-		try_case $N/sub/sub ../../wt ../../.git \
-			"$dotdotgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)" &&
-		try_case $N/sub/sub ../../wt "$here/$N/.git" \
-			"$absgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)" &&
-		try_case $N/sub/sub "$here/$N/wt" "$here/$N/.git" \
-			"$absgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)"
-	
-ok 99 - #29: explicit GIT_WORK_TREE from nephew of worktree
+ok 12 - rebase --quit
 
 expecting success: 
-		try_case $N "$here" .git \
-			"$absgit" "$here" "$here" $N/ &&
-		try_case $N .. .git \
-			"$absgit" "$here" "$here" $N/ &&
-		try_case $N .. "$here/$N/.git" \
-			"$absgit" "$here" "$here" $N/ &&
-		try_case $N "$here" "$here/$N/.git" \
-			"$absgit" "$here" "$here" $N/
-	
-ok 100 - #29: chdir_to_toplevel uses worktree, not git dir
+	cd "$work_dir" &&
+	# Clean up the state from the previous one
+	git reset --hard pre-rebase &&
+	test_must_fail git rebase --merge master &&
+	test_path_is_dir .git/rebase-merge &&
+	head_before=$(git rev-parse HEAD) &&
+	git rebase --quit &&
+	test $(git rev-parse HEAD) = $head_before &&
+	test ! -d .git/rebase-merge
 
-expecting success: 
-		try_case $N/sub/sub "$here" ../../.git \
-			"$absgit" "$here" "$here" $N/sub/sub/ &&
-		try_case $N/sub/sub ../../.. ../../.git \
-			"$absgit" "$here" "$here" $N/sub/sub/ &&
-		try_case $N/sub/sub ../../../ "$here/$N/.git" \
-			"$absgit" "$here" "$here" $N/sub/sub/ &&
-		try_case $N/sub/sub "$here" "$here/$N/.git" \
-			"$absgit" "$here" "$here" $N/sub/sub/
-	
-ok 101 - #29: chdir_to_toplevel uses worktree (from subdir)
+HEAD is now at c2094ef merge should fail on this, too
+First, rewinding head to replay your work on top of it...
+Merging master with HEAD~1
+Merging:
+3b5840b c
+a37c9d7 merge should fail on this
+found 1 common ancestor:
+33dae3c a
+Auto-merging a
+CONFLICT (content): Merge conflict in a
 
-expecting success: 
-	# Just like case #22.
-	setup_repo 30 "$here/30" gitfile true &&
-	(
-		cd 30 &&
-		test_must_fail env GIT_DIR=.git git status 2>result
-	) &&
-	grep "core.bare and core.worktree" 30/result
+Resolve all conflicts manually, mark them as resolved with
+"git add/rm <conflicted_files>", then run "git rebase --continue".
+You can instead skip this commit: run "git rebase --skip".
+To abort and get back to the state before "git rebase", run "git rebase --abort".
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1510-repo-setup/30/.git/
-warning: core.bare and core.worktree do not make sense
-ok 102 - #30: core.worktree and core.bare conflict (gitfile version)
+ok 13 - rebase --merge --quit
 
+# passed all 13 test(s)
+1..13
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t3408-rebase-multi-line.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3408-rebase-multi-line/.git/
 expecting success: 
-	setup_repo 31 non-existent gitfile true &&
-	mkdir -p 31/sub/sub 31/wt/sub
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1510-repo-setup/31/.git/
-ok 103 - #31: setup
+	>file &&
+	git add file &&
+	test_tick &&
+	git commit -m initial &&
 
-expecting success: 
-		try_case $N "$here/$N" .git \
-			"$dotgit" "$here/$N" "$here/$N" "(null)" &&
-		try_case $N . .git \
-			"$dotgit" "$here/$N" "$here/$N" "(null)" &&
-		try_case $N "$here/$N" "$here/$N/.git" \
-			"$absgit" "$here/$N" "$here/$N" "(null)" &&
-		try_case $N . "$here/$N/.git" \
-			"$absgit" "$here/$N" "$here/$N" "(null)"
-	
-ok 104 - #31: explicit GIT_WORK_TREE and GIT_DIR at toplevel
+	echo hello >file &&
+	test_tick &&
+	git commit -a -m "A sample commit log message that has a long
+summary that spills over multiple lines.
 
-expecting success: 
-		try_case $N/sub/sub "$here/$N" ../../.git \
-			"$absgit" "$here/$N" "$here/$N" sub/sub/ &&
-		try_case $N/sub/sub ../.. ../../.git \
-			"$absgit" "$here/$N" "$here/$N" sub/sub/ &&
-		try_case $N/sub/sub "$here/$N" "$here/$N/.git" \
-			"$absgit" "$here/$N" "$here/$N" sub/sub/ &&
-		try_case $N/sub/sub ../.. "$here/$N/.git" \
-			"$absgit" "$here/$N" "$here/$N" sub/sub/
-	
-ok 105 - #31: explicit GIT_WORK_TREE and GIT_DIR in subdir
+But otherwise with a sane description." &&
 
-expecting success: 
-		try_case $N "$here/$N/wt" .git \
-			"$dotgit" "$here/$N/wt" "$here/$N" "(null)" &&
-		try_case $N wt .git \
-			"$dotgit" "$here/$N/wt" "$here/$N" "(null)" &&
-		try_case $N wt "$here/$N/.git" \
-			"$absgit" "$here/$N/wt" "$here/$N" "(null)" &&
-		try_case $N "$here/$N/wt" "$here/$N/.git" \
-			"$absgit" "$here/$N/wt" "$here/$N" "(null)"
-	
-ok 106 - #31: explicit GIT_WORK_TREE from parent of worktree
+	git branch side &&
 
-expecting success: 
-		try_case $N/sub/sub "$here/$N/wt" ../../.git \
-			"$dotdotgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)" &&
-		try_case $N/sub/sub ../../wt ../../.git \
-			"$dotdotgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)" &&
-		try_case $N/sub/sub ../../wt "$here/$N/.git" \
-			"$absgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)" &&
-		try_case $N/sub/sub "$here/$N/wt" "$here/$N/.git" \
-			"$absgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)"
-	
-ok 107 - #31: explicit GIT_WORK_TREE from nephew of worktree
+	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
+
+[master (root-commit) 1bd44cb] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 file
+[master 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
+[master 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
+Merging:
+e79e348 second
+virtual side2
+found 1 common ancestor:
+e79e348 second
+Merge made by the 'recursive' strategy.
+ afile | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 afile
+ok 1 - setup
 
 expecting success: 
-		try_case $N "$here" .git \
-			"$absgit" "$here" "$here" $N/ &&
-		try_case $N .. .git \
-			"$absgit" "$here" "$here" $N/ &&
-		try_case $N .. "$here/$N/.git" \
-			"$absgit" "$here" "$here" $N/ &&
-		try_case $N "$here" "$here/$N/.git" \
-			"$absgit" "$here" "$here" $N/
-	
-ok 108 - #31: chdir_to_toplevel uses worktree, not git dir
 
+	git checkout side &&
+	git rebase master &&
+	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'
+First, rewinding head to replay your work on top of it...
+Applying: A sample commit log message that has a long
+ok 2 - rebase
+
+checking prerequisite: REBASE_P
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
+	test -z "$GIT_TEST_SKIP_REBASE_P"
+
+)
+prerequisite REBASE_P ok
 expecting success: 
-		try_case $N/sub/sub "$here" ../../.git \
-			"$absgit" "$here" "$here" $N/sub/sub/ &&
-		try_case $N/sub/sub ../../.. ../../.git \
-			"$absgit" "$here" "$here" $N/sub/sub/ &&
-		try_case $N/sub/sub ../../../ "$here/$N/.git" \
-			"$absgit" "$here" "$here" $N/sub/sub/ &&
-		try_case $N/sub/sub "$here" "$here/$N/.git" \
-			"$absgit" "$here" "$here" $N/sub/sub/
-	
-ok 109 - #31: chdir_to_toplevel uses worktree (from subdir)
 
-# passed all 109 test(s)
-1..109
+	git checkout side-merge &&
+	git rebase -p side &&
+	git cat-file commit HEAD | sed -e "1,/^\$/d" >actual &&
+	git cat-file commit side-merge-original | sed -e "1,/^\$/d" >expect &&
+	test_cmp expect actual
+
+
+Switched to branch 'side-merge'
+Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated refs/heads/side-merge.
+ok 3 - rebasep
+
+# passed all 3 test(s)
+1..3
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
 *** t3200-branch.sh ***
@@ -65059,11 +65711,11 @@
 	git commit -m "Second commit." &&
 	HEAD=$(git rev-parse --verify HEAD)
 
-[master (root-commit) 5f1e520] Initial commit.
+[master (root-commit) 77312f2] Initial commit.
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 A
-[master 27a2f2c] Second commit.
+[master d68efc7] Second commit.
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 ok 1 - prepare a trivial repository
@@ -65118,7 +65770,7 @@
 	test_path_is_missing .git/refs/heads/d/e/f &&
 	test_must_fail git reflog exists refs/heads/d/e/f
 
-Deleted branch d/e/f (was 27a2f2c).
+Deleted branch d/e/f (was d68efc7).
 ok 8 - git branch -d d/e/f should delete a branch and a log
 
 expecting success: 
@@ -65126,7 +65778,7 @@
 	git branch -d j &&
 	git branch j/k
 
-Deleted branch j (was 27a2f2c).
+Deleted branch j (was d68efc7).
 ok 9 - git branch j/k should work after branch j has been deleted
 
 expecting success: 
@@ -65134,7 +65786,7 @@
 	git branch -d l/m &&
 	git branch l
 
-Deleted branch l/m (was 27a2f2c).
+Deleted branch l/m (was d68efc7).
 ok 10 - git branch l should work after branch l/m has been deleted
 
 expecting success: 
@@ -65152,7 +65804,7 @@
 	git reflog exists refs/heads/broken_symref &&
 	test_must_fail git reflog exists refs/heads/i_am_broken
 
-Deleted branch broken_symref (was 27a2f2c).
+Deleted branch broken_symref (was d68efc7).
 ok 12 - git branch -m m broken_symref should work
 
 expecting success: 
@@ -65183,10 +65835,10 @@
 	test_cmp expect actual
 
 Switched to a new branch 'aaa'
-[aaa 43238a7] a new commit
+[aaa 065123d] a new commit
  Author: A U Thor <author@example.com>
 Switched to branch 'master'
-Deleted branch bbb (was 43238a7).
+Deleted branch bbb (was 065123d).
 ok 15 - git branch -m bbb should rename checked out branch
 
 expecting success: 
@@ -65200,7 +65852,7 @@
 
 Switched to a new branch 'foo'
 Switched to branch 'master'
-Deleted branch foo/bar (was 27a2f2c).
+Deleted branch foo/bar (was d68efc7).
 ok 16 - renaming checked out branch works with d/f conflict
 
 expecting success: 
@@ -65262,8 +65914,8 @@
 	grep " 0\{40\}.*$msg$" .git/logs/HEAD &&
 	grep "^0\{40\}.*$msg$" .git/logs/HEAD
 
-27a2f2c8e39b4efd5beb292b0339dd8a60811a79 0000000000000000000000000000000000000000 C O Mitter <committer@example.com> 1638507911 +0000	Branch: renamed refs/heads/baz to refs/heads/bam
-0000000000000000000000000000000000000000 27a2f2c8e39b4efd5beb292b0339dd8a60811a79 C O Mitter <committer@example.com> 1638507911 +0000	Branch: renamed refs/heads/baz to refs/heads/bam
+d68efc73a673507283ca9d9d842bdb33dfc31186 0000000000000000000000000000000000000000 C O Mitter <committer@example.com> 1672919234 +0000	Branch: renamed refs/heads/baz to refs/heads/bam
+0000000000000000000000000000000000000000 d68efc73a673507283ca9d9d842bdb33dfc31186 C O Mitter <committer@example.com> 1672919234 +0000	Branch: renamed refs/heads/baz to refs/heads/bam
 ok 24 - git branch -M baz bam should add entries to .git/logs/HEAD
 
 expecting success: 
@@ -65309,9 +65961,9 @@
 
 Switched to branch 'master'
 Preparing worktree (new branch 'baz')
-HEAD is now at 27a2f2c Second commit.
+HEAD is now at d68efc7 Second commit.
 Preparing worktree (checking out 'baz')
-HEAD is now at 27a2f2c Second commit.
+HEAD is now at d68efc7 Second commit.
 ok 27 - git branch -M baz bam should succeed when baz is checked out as linked working tree
 
 expecting success: 
@@ -65326,7 +65978,7 @@
 
 Switched to a new branch 'baz'
 Preparing worktree (checking out 'baz')
-HEAD is now at 27a2f2c Second commit.
+HEAD is now at d68efc7 Second commit.
 ok 28 - git branch -M baz bam should succeed within a worktree in which baz is checked out
 
 expecting success: 
@@ -65357,8 +66009,8 @@
 	git branch -v -d t &&
 	test_must_fail git rev-parse --verify refs/heads/t
 
-27a2f2c8e39b4efd5beb292b0339dd8a60811a79
-Deleted branch t (was 27a2f2c).
+d68efc73a673507283ca9d9d842bdb33dfc31186
+Deleted branch t (was d68efc7).
 fatal: Needed a single revision
 ok 32 - git branch -v -d t should work
 
@@ -65370,10 +66022,10 @@
 	git rev-parse --verify refs/heads/s &&
 	git branch -d s
 
-27a2f2c8e39b4efd5beb292b0339dd8a60811a79
+d68efc73a673507283ca9d9d842bdb33dfc31186
 fatal: Needed a single revision
-27a2f2c8e39b4efd5beb292b0339dd8a60811a79
-Deleted branch s (was 27a2f2c).
+d68efc73a673507283ca9d9d842bdb33dfc31186
+Deleted branch s (was d68efc7).
 ok 33 - git branch -v -m t s should work
 
 expecting success: 
@@ -65383,7 +66035,7 @@
 	git branch -d t &&
 	test_must_fail git rev-parse refs/heads/t
 
-27a2f2c8e39b4efd5beb292b0339dd8a60811a79
+d68efc73a673507283ca9d9d842bdb33dfc31186
 usage: git branch [<options>] [-r | -a] [--merged | --no-merged]
    or: git branch [<options>] [-l] [-f] <branch-name> [<start-point>]
    or: git branch [<options>] [-r] (-d | -D) <branch-name>...
@@ -65426,7 +66078,7 @@
     -i, --ignore-case     sorting and filtering are case insensitive
     --format <format>     format to use for the output
 
-Deleted branch t (was 27a2f2c).
+Deleted branch t (was d68efc7).
 fatal: ambiguous argument 'refs/heads/t': unknown revision or path not in the working tree.
 Use '--' to separate paths from revisions, like this:
 'git <command> [<revision>...] -- [<file>...]'
@@ -65440,7 +66092,7 @@
 	git branch -d t &&
 	test_must_fail git rev-parse refs/heads/t
 
-27a2f2c8e39b4efd5beb292b0339dd8a60811a79
+d68efc73a673507283ca9d9d842bdb33dfc31186
 usage: git branch [<options>] [-r | -a] [--merged | --no-merged]
    or: git branch [<options>] [-l] [-f] <branch-name> [<start-point>]
    or: git branch [<options>] [-r] (-d | -D) <branch-name>...
@@ -65483,7 +66135,7 @@
     -i, --ignore-case     sorting and filtering are case insensitive
     --format <format>     format to use for the output
 
-Deleted branch t (was 27a2f2c).
+Deleted branch t (was d68efc7).
 fatal: ambiguous argument 'refs/heads/t': unknown revision or path not in the working tree.
 Use '--' to separate paths from revisions, like this:
 'git <command> [<revision>...] -- [<file>...]'
@@ -65514,7 +66166,7 @@
 	expr "$objfull" : "$obj36" >/dev/null
 
 
-Deleted branch t (was 27a2f2c).
+Deleted branch t (was d68efc7).
 ok 36 - git branch --list -v with --abbrev
 
 expecting success: 
@@ -65553,7 +66205,7 @@
 EOF
 	test_cmp expected actual
 
-Deleted branch zthis/is/a/part/of/long/branch/name/this/is/a/part/of/long/branch/name/this/is/a/part/of/long/branch/name/this/is/a/part/of/long/branch/name (was 27a2f2c).
+Deleted branch zthis/is/a/part/of/long/branch/name/this/is/a/part/of/long/branch/name/this/is/a/part/of/long/branch/name/this/is/a/part/of/long/branch/name (was d68efc7).
 ok 38 - git branch --column with an extremely long branch name
 
 expecting success: 
@@ -65616,7 +66268,7 @@
 	git branch -m s/s s &&
 	git reflog exists refs/heads/s
 
-Deleted branch s/t (was 27a2f2c).
+Deleted branch s/t (was d68efc7).
 ok 43 - git branch -m s/s s should work when s/t is deleted
 
 expecting success: 
@@ -66110,7 +66762,7 @@
 	test -z "$(git config branch.my7.remote)" &&
 	test -z "$(git config branch.my7.merge)"
 
-Deleted branch my7 (was 27a2f2c).
+Deleted branch my7 (was d68efc7).
 ok 78 - test deleting branch deletes branch config
 
 expecting success: 
@@ -66128,7 +66780,7 @@
 	test_must_fail git branch -d my7
 
 Preparing worktree (new branch 'my7')
-HEAD is now at 27a2f2c Second commit.
+HEAD is now at d68efc7 Second commit.
 error: Cannot delete branch 'my7' checked out at '/build/git-2.20.1/t/trash directory.t3200-branch/my7'
 error: Cannot delete branch 'my7' checked out at '/build/git-2.20.1/t/trash directory.t3200-branch/my7'
 ok 80 - deleting currently checked out branch fails
@@ -66183,7 +66835,7 @@
 
   git checkout -b <new-branch-name>
 
-HEAD is now at 27a2f2c Second commit.
+HEAD is now at d68efc7 Second commit.
 fatal: could not set upstream of HEAD to master when it does not point to any branch.
 Switched to branch 'master'
 ok 86 - --set-upstream-to fails on detached HEAD
@@ -66303,7 +66955,7 @@
 
   git checkout -b <new-branch-name>
 
-HEAD is now at 27a2f2c Second commit.
+HEAD is now at d68efc7 Second commit.
 fatal: could not unset upstream of HEAD when it does not point to any branch.
 Switched to branch 'master'
 ok 97 - --unset-upstream should fail on detached HEAD
@@ -66353,7 +67005,7 @@
 
 Switched to branch 'master'
 Switched to a new branch 'alpha'
-27a2f2c8e39b4efd5beb292b0339dd8a60811a79
+d68efc73a673507283ca9d9d842bdb33dfc31186
 ok 102 - checkout -b makes reflog by default
 
 expecting success: 
@@ -66375,7 +67027,7 @@
 
 Switched to branch 'master'
 Switched to a new branch 'gamma'
-27a2f2c8e39b4efd5beb292b0339dd8a60811a79
+d68efc73a673507283ca9d9d842bdb33dfc31186
 ok 104 - checkout -b with -l makes reflog when core.logAllRefUpdates = false
 
 expecting success: 
@@ -66697,7 +67349,7 @@
 
   git checkout -b <new-branch-name>
 
-HEAD is now at 27a2f2c Second commit.
+HEAD is now at d68efc7 Second commit.
 Switched to branch 'master'
 ok 126 - autosetuprebase always on detached HEAD
 
@@ -66738,7 +67390,7 @@
 
 warning: deleting branch 'my8' that has been merged to
          'refs/heads/master', but not yet merged to HEAD.
-Deleted branch my8 (was 27a2f2c).
+Deleted branch my8 (was d68efc7).
 ok 130 - attempt to delete a branch merged to its base
 
 expecting success: 
@@ -66753,7 +67405,7 @@
 	test_must_fail git branch -d my10
 
 Switched to branch 'master'
-[master 1899b1e] Third commit
+[master a6240f1] Third commit
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 Branch 'my10' set up to track local branch 'my9'.
@@ -66821,13 +67473,13 @@
 
 Switched to branch 'master'
 rebase -i script before editing:
-pick 27a2f2c Second commit.
-pick 1899b1e Third commit
+pick d68efc7 Second commit.
+pick a6240f1 Third commit
 
 rebase -i script after editing:
-pick 27a2f2c Second commit.
-edit 1899b1e Third commit
-Rebasing (2/2)
Stopped at 1899b1e...  Third commit
+pick d68efc7 Second commit.
+edit a6240f1 Third commit
+Rebasing (2/2)
Stopped at a6240f1...  Third commit
 You can amend the commit now, with
 
   git commit --amend 
@@ -66836,7 +67488,7 @@
 
   git rebase --continue
 * (no branch, rebasing master)
-HEAD is now at 1899b1e Third commit
+HEAD is now at a6240f1 Third commit
 Removing EDITOR_OUTPUT
 Removing actual
 Removing actual.0abbrev
@@ -66875,15 +67527,15 @@
 
   git checkout -b <new-branch-name>
 
-HEAD is now at 1899b1e Third commit
+HEAD is now at a6240f1 Third commit
 rebase -i script before editing:
-pick 27a2f2c Second commit.
-pick 1899b1e Third commit
+pick d68efc7 Second commit.
+pick a6240f1 Third commit
 
 rebase -i script after editing:
-pick 27a2f2c Second commit.
-edit 1899b1e Third commit
-Rebasing (2/2)
Stopped at 1899b1e...  Third commit
+pick d68efc7 Second commit.
+edit a6240f1 Third commit
+Rebasing (2/2)
Stopped at a6240f1...  Third commit
 You can amend the commit now, with
 
   git commit --amend 
@@ -66891,8 +67543,8 @@
 Once you are satisfied with your changes, run
 
   git rebase --continue
-* (no branch, rebasing detached HEAD 1899b1e)
-HEAD is now at 1899b1e Third commit
+* (no branch, rebasing detached HEAD a6240f1)
+HEAD is now at a6240f1 Third commit
 Removing actual
 Removing fake-editor.sh
 Switched to branch 'master'
@@ -67040,979 +67692,1404 @@
 1..142
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t3400-rebase.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3400-rebase/.git/
+*** t1510-repo-setup.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1510-repo-setup/.git/
 expecting success: 
-	git config core.logAllRefUpdates true &&
-	echo First >A &&
-	git update-index --add A &&
-	git commit -m "Add A." &&
-	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 master &&
-	mkdir D &&
-	git mv A D/A &&
-	git commit -m "Move A." &&
-	git checkout -b my-topic-branch master &&
-	echo Second >B &&
-	git update-index --add B &&
-	git commit -m "Add B." &&
-	git checkout -f master &&
-	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
+	try_repo 0 unset unset unset "" unset \
+		.git "$here/0" "$here/0" "(null)" \
+		.git "$here/0" "$here/0" sub/ 2>message &&
+	test_must_be_empty message
 
-[master (root-commit) 0a6f345] 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 3107e40] Add Y.
- Author: author@name <bogus@email@address>
- 1 file changed, 1 insertion(+)
- create mode 100644 Y
-Switched to a new branch 'filemove'
-[filemove 1b3d212] 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 9cfe4e4] Add B.
- Author: author@name <bogus@email@address>
- 1 file changed, 1 insertion(+)
- create mode 100644 B
-Switched to branch 'master'
-[master f487c29] Modify A.
- Author: author@name <bogus@email@address>
- 1 file changed, 1 insertion(+)
-Switched to a new branch 'side'
-[side 51bfd5e] 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
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1510-repo-setup/0/.git/
+ok 1 - #0: nonbare repo, no explicit configuration
 
 expecting success: 
-	echo dirty >>A &&
-	test_must_fail git rebase master
+	try_repo 1 "$here" unset unset "" unset \
+		"$here/1/.git" "$here" "$here" 1/ \
+		"$here/1/.git" "$here" "$here" 1/sub/ 2>message &&
+	test_must_be_empty message
 
-error: cannot rebase: You have unstaged changes.
-error: Please commit or stash them.
-ok 2 - rebase on dirty worktree
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1510-repo-setup/1/.git/
+ok 2 - #1: GIT_WORK_TREE without explicit GIT_DIR is accepted
 
 expecting success: 
-	git add A &&
-	test_must_fail git rebase master
+	try_repo 2 unset "$here/2/.git" unset "" unset \
+		"$here/2/.git" "$here/2" "$here/2" "(null)" \
+		"$here/2/.git" "$here/2/sub" "$here/2/sub" "(null)"
 
-error: cannot rebase: Your index contains uncommitted changes.
-error: Please commit or stash them.
-ok 3 - rebase on dirty cache
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1510-repo-setup/2/.git/
+ok 3 - #2: worktree defaults to cwd with explicit GIT_DIR
 
 expecting success: 
-	git reset --hard HEAD &&
-	git rebase master
+	try_repo 2b unset ".git" unset "" unset \
+		".git" "$here/2b" "$here/2b" "(null)" \
+		"../.git" "$here/2b/sub" "$here/2b/sub" "(null)"
 
-HEAD is now at 9cfe4e4 Add B.
-First, rewinding head to replay your work on top of it...
-Applying: Add B.
-ok 4 - rebase against master
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1510-repo-setup/2b/.git/
+ok 4 - #2b: relative GIT_DIR
 
 expecting success: 
-	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
+	setup_repo 3 unset "" unset &&
+	mkdir -p 3/sub/sub 3/wt/sub
 
-Switched to a new branch 'torebase'
-First, rewinding head to replay your work on top of it...
-HEAD is now at f487c29 Modify A.
-First, rewinding head to replay your work on top of it...
-Switched to branch 'my-topic-branch'
-Deleted branch torebase (was 0a6f345).
-ok 5 - rebase, with <onto> and <upstream> specified as :/quuxery
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1510-repo-setup/3/.git/
+ok 5 - #3: setup
 
 expecting success: 
-	! (git log | grep "Author:" | grep "<>")
+		try_case $N "$here/$N" .git \
+			"$dotgit" "$here/$N" "$here/$N" "(null)" &&
+		try_case $N . .git \
+			"$dotgit" "$here/$N" "$here/$N" "(null)" &&
+		try_case $N "$here/$N" "$here/$N/.git" \
+			"$absgit" "$here/$N" "$here/$N" "(null)" &&
+		try_case $N . "$here/$N/.git" \
+			"$absgit" "$here/$N" "$here/$N" "(null)"
+	
+ok 6 - #3: explicit GIT_WORK_TREE and GIT_DIR at toplevel
 
-ok 6 - the rebase operation should not have destroyed author information
+expecting success: 
+		try_case $N/sub/sub "$here/$N" ../../.git \
+			"$absgit" "$here/$N" "$here/$N" sub/sub/ &&
+		try_case $N/sub/sub ../.. ../../.git \
+			"$absgit" "$here/$N" "$here/$N" sub/sub/ &&
+		try_case $N/sub/sub "$here/$N" "$here/$N/.git" \
+			"$absgit" "$here/$N" "$here/$N" sub/sub/ &&
+		try_case $N/sub/sub ../.. "$here/$N/.git" \
+			"$absgit" "$here/$N" "$here/$N" sub/sub/
+	
+ok 7 - #3: explicit GIT_WORK_TREE and GIT_DIR in subdir
 
 expecting success: 
-	git log -1 |
-	grep 'Author: author@name <bogus@email@address>'
+		try_case $N "$here/$N/wt" .git \
+			"$dotgit" "$here/$N/wt" "$here/$N" "(null)" &&
+		try_case $N wt .git \
+			"$dotgit" "$here/$N/wt" "$here/$N" "(null)" &&
+		try_case $N wt "$here/$N/.git" \
+			"$absgit" "$here/$N/wt" "$here/$N" "(null)" &&
+		try_case $N "$here/$N/wt" "$here/$N/.git" \
+			"$absgit" "$here/$N/wt" "$here/$N" "(null)"
+	
+ok 8 - #3: explicit GIT_WORK_TREE from parent of worktree
 
-Author: author@name <bogus@email@address>
-ok 7 - the rebase operation should not have destroyed author information (2)
+expecting success: 
+		try_case $N/sub/sub "$here/$N/wt" ../../.git \
+			"$dotdotgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)" &&
+		try_case $N/sub/sub ../../wt ../../.git \
+			"$dotdotgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)" &&
+		try_case $N/sub/sub ../../wt "$here/$N/.git" \
+			"$absgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)" &&
+		try_case $N/sub/sub "$here/$N/wt" "$here/$N/.git" \
+			"$absgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)"
+	
+ok 9 - #3: explicit GIT_WORK_TREE from nephew of worktree
 
 expecting success: 
-	test $(git rev-parse HEAD@{1}) != $(git rev-parse my-topic-branch@{1})
+		try_case $N "$here" .git \
+			"$absgit" "$here" "$here" $N/ &&
+		try_case $N .. .git \
+			"$absgit" "$here" "$here" $N/ &&
+		try_case $N .. "$here/$N/.git" \
+			"$absgit" "$here" "$here" $N/ &&
+		try_case $N "$here" "$here/$N/.git" \
+			"$absgit" "$here" "$here" $N/
+	
+ok 10 - #3: chdir_to_toplevel uses worktree, not git dir
 
-ok 8 - HEAD was detached during rebase
+expecting success: 
+		try_case $N/sub/sub "$here" ../../.git \
+			"$absgit" "$here" "$here" $N/sub/sub/ &&
+		try_case $N/sub/sub ../../.. ../../.git \
+			"$absgit" "$here" "$here" $N/sub/sub/ &&
+		try_case $N/sub/sub ../../../ "$here/$N/.git" \
+			"$absgit" "$here" "$here" $N/sub/sub/ &&
+		try_case $N/sub/sub "$here" "$here/$N/.git" \
+			"$absgit" "$here" "$here" $N/sub/sub/
+	
+ok 11 - #3: chdir_to_toplevel uses worktree (from subdir)
 
 expecting success: 
-	git checkout -b topic side &&
-	git rebase master
+	setup_repo 4 ../sub "" unset &&
+	mkdir -p 4/sub sub &&
+	try_case 4 unset unset \
+		.git "$here/4/sub" "$here/4" "(null)" \
+		"$here/4/.git" "$here/4/sub" "$here/4/sub" "(null)" 2>message &&
+	test_must_be_empty message
 
-Switched to a new branch 'topic'
-First, rewinding head to replay your work on top of it...
-Applying: Add B.
-Applying: Add C
-ok 9 - rebase from ambiguous branch name
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1510-repo-setup/4/.git/
+ok 12 - #4: core.worktree without GIT_DIR set is accepted
 
 expecting success: 
-	git checkout master &&
-	git checkout HEAD^ &&
-	git rebase @{-1} >expect.messages &&
-	git merge-base master HEAD >expect.forkpoint &&
+	# or: you cannot intimidate away the lack of GIT_DIR setting
+	try_repo 5 "$here" unset "$here/5" "" unset \
+		"$here/5/.git" "$here" "$here" 5/ \
+		"$here/5/.git" "$here" "$here" 5/sub/ 2>message &&
+	try_repo 5a .. unset "$here/5a" "" unset \
+		"$here/5a/.git" "$here" "$here" 5a/ \
+		"$here/5a/.git" "$here/5a" "$here/5a" sub/ &&
+	test_must_be_empty message
 
-	git checkout master &&
-	git checkout HEAD^ &&
-	git rebase - >actual.messages &&
-	git merge-base master HEAD >actual.forkpoint &&
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1510-repo-setup/5/.git/
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1510-repo-setup/5a/.git/
+ok 13 - #5: core.worktree + GIT_WORK_TREE is accepted
 
-	test_cmp expect.forkpoint actual.forkpoint &&
-	# the next one is dubious---we may want to say "-",
-	# instead of @{-1}, in the message
-	test_i18ncmp expect.messages actual.messages
+expecting success: 
+	setup_repo 6 "$here/6" "" unset &&
+	try_case 6 unset .git \
+		.git "$here/6" "$here/6" "(null)" &&
+	try_case 6 unset "$here/6/.git" \
+		"$here/6/.git" "$here/6" "$here/6" "(null)" &&
+	try_case 6/sub/sub unset ../../.git \
+		"$here/6/.git" "$here/6" "$here/6" sub/sub/ &&
+	try_case 6/sub/sub unset "$here/6/.git" \
+		"$here/6/.git" "$here/6" "$here/6" sub/sub/
 
-Switched to branch 'master'
-Note: checking out 'HEAD^'.
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1510-repo-setup/6/.git/
+ok 14 - #6: setting GIT_DIR brings core.worktree to life
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by performing another checkout.
+expecting success: 
+	setup_repo 6b .. "" unset &&
+	try_case 6b unset .git \
+		.git "$here/6b" "$here/6b" "(null)" &&
+	try_case 6b unset "$here/6b/.git" \
+		"$here/6b/.git" "$here/6b" "$here/6b" "(null)" &&
+	try_case 6b/sub/sub unset ../../.git \
+		"$here/6b/.git" "$here/6b" "$here/6b" sub/sub/ &&
+	try_case 6b/sub/sub unset "$here/6b/.git" \
+		"$here/6b/.git" "$here/6b" "$here/6b" sub/sub/
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1510-repo-setup/6b/.git/
+ok 15 - #6b: GIT_DIR set, core.worktree relative
 
-  git checkout -b <new-branch-name>
+expecting success: 
+	setup_repo 6c "$here/6c/wt" "" unset &&
+	mkdir -p 6c/wt/sub &&
 
-HEAD is now at 0a6f345 Add A.
-Switched to branch 'master'
-Note: checking out 'HEAD^'.
+	try_case 6c unset .git \
+		.git "$here/6c/wt" "$here/6c" "(null)" &&
+	try_case 6c unset "$here/6c/.git" \
+		"$here/6c/.git" "$here/6c/wt" "$here/6c" "(null)" &&
+	try_case 6c/sub/sub unset ../../.git \
+		../../.git "$here/6c/wt" "$here/6c/sub/sub" "(null)" &&
+	try_case 6c/sub/sub unset "$here/6c/.git" \
+		"$here/6c/.git" "$here/6c/wt" "$here/6c/sub/sub" "(null)"
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by performing another checkout.
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1510-repo-setup/6c/.git/
+ok 16 - #6c: GIT_DIR set, core.worktree=../wt (absolute)
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
+expecting success: 
+	setup_repo 6d "$here/6d/wt" "" unset &&
+	mkdir -p 6d/wt/sub &&
 
-  git checkout -b <new-branch-name>
+	try_case 6d unset .git \
+		.git "$here/6d/wt" "$here/6d" "(null)" &&
+	try_case 6d unset "$here/6d/.git" \
+		"$here/6d/.git" "$here/6d/wt" "$here/6d" "(null)" &&
+	try_case 6d/sub/sub unset ../../.git \
+		../../.git "$here/6d/wt" "$here/6d/sub/sub" "(null)" &&
+	try_case 6d/sub/sub unset "$here/6d/.git" \
+		"$here/6d/.git" "$here/6d/wt" "$here/6d/sub/sub" "(null)"
 
-HEAD is now at 0a6f345 Add A.
-ok 10 - rebase off of the previous branch using "-"
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1510-repo-setup/6d/.git/
+ok 17 - #6d: GIT_DIR set, core.worktree=../wt (relative)
 
 expecting success: 
-	git checkout master &&
-	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 master
+	setup_repo 6e "$here" "" unset &&
+	try_case 6e unset .git \
+		"$here/6e/.git" "$here" "$here" 6e/ &&
+	try_case 6e unset "$here/6e/.git" \
+		"$here/6e/.git" "$here" "$here" 6e/ &&
+	try_case 6e/sub/sub unset ../../.git \
+		"$here/6e/.git" "$here" "$here" 6e/sub/sub/ &&
+	try_case 6e/sub/sub unset "$here/6e/.git" \
+		"$here/6e/.git" "$here" "$here" 6e/sub/sub/
 
-Switched to branch 'master'
-Deleted branch topic (was b7fe8d2).
-[master 4cceaf9] prepare
- Author: author@name <bogus@email@address>
- 1 file changed, 1 insertion(+)
- create mode 100644 X
-Switched to a new branch 'modechange'
-[modechange a490341] 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 master
-trace: run_command: git config --bool rebase.usebuiltin
-trace: built-in: git config --bool rebase.usebuiltin
-trace: run_command: 'GIT_DIR='\''/build/git-2.20.1/t/trash directory.t3400-rebase/.git'\''; state_dir='\''.git/rebase-apply'\''; upstream_name='\''master'\''; upstream='\''4cceaf9345d899ec71537c2d1db141a95cd7bf07'\''; head_name='\''refs/heads/modechange'\''; orig_head='\''a490341fa181e8491ed47a77b456025b0321f614'\''; onto='\''4cceaf9345d899ec71537c2d1db141a95cd7bf07'\''; onto_name='\''master'\''; revisions='\''4cceaf9345d899ec71537c2d1db141a95cd7bf07..a490341fa181e8491ed47a77b456025b0321f614'\''; unset restrict_revision; GIT_QUIET='\'''\''; git_am_opt='\'''\''; verbose='\'''\''; diffstat='\'''\''; force_rebase='\'''\''; action='\'''\''; signoff='\'''\''; allow_rerere_autoupdate='\'''\''; keep_empty='\'''\''; autosquash='\'''\''; unset gpg_sign_opt; unset cmd; allow_empty_message='\''--allow-empty-message'\''; rebase_merges='\'''\''; rebase_cousins='\'''\''; unset strategy; unset strategy_opts; rebase_root='\'''\''; squash_onto='\'''\''; git_format_patch_opt='\'''\''; . git-sh-setup && . git-rebase--common && . git-rebase--am && git_rebase__am'
-First, rewinding head to replay your work on top of it...
-trace: built-in: git rev-parse --git-dir
-trace: built-in: git rev-parse --show-cdup
-trace: built-in: git rev-parse --git-path objects
-trace: built-in: git format-patch -k --stdout --full-index --cherry-pick --right-only --src-prefix=a/ --dst-prefix=b/ --no-renames --no-cover-letter --pretty=mboxrd 4cceaf9345d899ec71537c2d1db141a95cd7bf07...a490341fa181e8491ed47a77b456025b0321f614
-trace: built-in: git am --rebasing '--resolvemsg=
-Resolve all conflicts manually, mark them as resolved with
-"git add/rm <conflicted_files>", then run "git rebase --continue".
-You can instead skip this commit: run "git rebase --skip".
-To abort and get back to the state before "git rebase", run "git rebase --abort".
-' --patch-format=mboxrd
-trace: run_command: git mailsplit -d4 -o.git/rebase-apply -b --mboxrd --
-trace: built-in: git mailsplit -d4 -o.git/rebase-apply -b --mboxrd --
-trace: run_command: git apply --build-fake-ancestor=.git/rebase-apply/patch-merge-index .git/rebase-apply/patch
-Applying: modechange
-trace: built-in: git apply --build-fake-ancestor=.git/rebase-apply/patch-merge-index .git/rebase-apply/patch
-Using index info to reconstruct a base tree...
-Falling back to patching base and 3-way merge...
-Merging:
-4cceaf9 prepare
-virtual modechange
-found 1 common ancestor:
-virtual 20d8b2c6c42a40f913517c72113d9d08e124064a
-trace: built-in: git rev-parse HEAD
-trace: built-in: git update-ref -m 'rebase finished: refs/heads/modechange onto 4cceaf9345d899ec71537c2d1db141a95cd7bf07' refs/heads/modechange d32df267f85963af0b691b7859036760b0c3c0d8 a490341fa181e8491ed47a77b456025b0321f614
-trace: built-in: git symbolic-ref -m 'rebase finished: returning to refs/heads/modechange' HEAD refs/heads/modechange
-trace: run_command: git gc --auto
-trace: built-in: git gc --auto
-ok 11 - rebase a single mode change
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1510-repo-setup/6e/.git/
+ok 18 - #6e: GIT_DIR set, core.worktree=../.. (absolute)
 
 expecting success: 
-	test_config diff.renames copies &&
-	git checkout filemove &&
-	GIT_TRACE=1 git rebase force-3way
+	setup_repo 6f ../../ "" unset &&
+	try_case 6f unset .git \
+		"$here/6f/.git" "$here" "$here" 6f/ &&
+	try_case 6f unset "$here/6f/.git" \
+		"$here/6f/.git" "$here" "$here" 6f/ &&
+	try_case 6f/sub/sub unset ../../.git \
+		"$here/6f/.git" "$here" "$here" 6f/sub/sub/ &&
+	try_case 6f/sub/sub unset "$here/6f/.git" \
+		"$here/6f/.git" "$here" "$here" 6f/sub/sub/
 
-Switched to branch 'filemove'
-trace: built-in: git rebase force-3way
-trace: run_command: git config --bool rebase.usebuiltin
-trace: built-in: git config --bool rebase.usebuiltin
-trace: run_command: 'GIT_DIR='\''/build/git-2.20.1/t/trash directory.t3400-rebase/.git'\''; state_dir='\''.git/rebase-apply'\''; upstream_name='\''force-3way'\''; upstream='\''3107e40df180a8d59a2d5094bf18b4f48bdc7dde'\''; head_name='\''refs/heads/filemove'\''; orig_head='\''1b3d2128f28e407a30483ac58dc0fd91063bd55a'\''; onto='\''3107e40df180a8d59a2d5094bf18b4f48bdc7dde'\''; onto_name='\''force-3way'\''; revisions='\''3107e40df180a8d59a2d5094bf18b4f48bdc7dde..1b3d2128f28e407a30483ac58dc0fd91063bd55a'\''; unset restrict_revision; GIT_QUIET='\'''\''; git_am_opt='\'''\''; verbose='\'''\''; diffstat='\'''\''; force_rebase='\'''\''; action='\'''\''; signoff='\'''\''; allow_rerere_autoupdate='\'''\''; keep_empty='\'''\''; autosquash='\'''\''; unset gpg_sign_opt; unset cmd; allow_empty_message='\''--allow-empty-message'\''; rebase_merges='\'''\''; rebase_cousins='\'''\''; unset strategy; unset strategy_opts; rebase_root='\'''\''; squash_onto='\'''\''; git_format_patch_opt='\'''\''; . git-sh-setup && . git-rebase--common && . git-rebase--am && git_rebase__am'
-First, rewinding head to replay your work on top of it...
-trace: built-in: git rev-parse --git-dir
-trace: built-in: git rev-parse --show-cdup
-trace: built-in: git rev-parse --git-path objects
-trace: built-in: git format-patch -k --stdout --full-index --cherry-pick --right-only --src-prefix=a/ --dst-prefix=b/ --no-renames --no-cover-letter --pretty=mboxrd 3107e40df180a8d59a2d5094bf18b4f48bdc7dde...1b3d2128f28e407a30483ac58dc0fd91063bd55a
-trace: built-in: git am --rebasing '--resolvemsg=
-Resolve all conflicts manually, mark them as resolved with
-"git add/rm <conflicted_files>", then run "git rebase --continue".
-You can instead skip this commit: run "git rebase --skip".
-To abort and get back to the state before "git rebase", run "git rebase --abort".
-' --patch-format=mboxrd
-trace: run_command: git mailsplit -d4 -o.git/rebase-apply -b --mboxrd --
-trace: built-in: git mailsplit -d4 -o.git/rebase-apply -b --mboxrd --
-trace: run_command: git apply --build-fake-ancestor=.git/rebase-apply/patch-merge-index .git/rebase-apply/patch
-Applying: Move A.
-trace: built-in: git apply --build-fake-ancestor=.git/rebase-apply/patch-merge-index .git/rebase-apply/patch
-Using index info to reconstruct a base tree...
-Falling back to patching base and 3-way merge...
-Merging:
-3107e40 Add Y.
-virtual Move A.
-found 1 common ancestor:
-virtual 26395c6fe842cd8894b5dde87a6fb53cccfabc06
-trace: built-in: git rev-parse HEAD
-trace: built-in: git update-ref -m 'rebase finished: refs/heads/filemove onto 3107e40df180a8d59a2d5094bf18b4f48bdc7dde' refs/heads/filemove ee991f88af0de1b3aa3a6ce26e12e531110032a6 1b3d2128f28e407a30483ac58dc0fd91063bd55a
-trace: built-in: git symbolic-ref -m 'rebase finished: returning to refs/heads/filemove' HEAD refs/heads/filemove
-trace: run_command: git gc --auto
-trace: built-in: git gc --auto
-ok 12 - rebase is not broken by diff.renames
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1510-repo-setup/6f/.git/
+ok 19 - #6f: GIT_DIR set, core.worktree=../.. (relative)
 
 expecting success: 
-	test_might_fail git rebase --abort &&
-	git reset --hard &&
-	git checkout modechange
+	setup_repo 7 non-existent "" unset &&
+	mkdir -p 7/sub/sub 7/wt/sub
 
-fatal: No rebase in progress?
-HEAD is now at ee991f8 Move A.
-Switched to branch 'modechange'
-ok 13 - setup: recover
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1510-repo-setup/7/.git/
+ok 20 - #7: setup
 
 expecting success: 
-	>B &&
-	test_must_fail git rebase topic 2>output.err >output.out &&
-	test_i18ngrep "The following untracked working tree files would be overwritten by checkout:" output.err &&
-	test_i18ngrep B output.err
+		try_case $N "$here/$N" .git \
+			"$dotgit" "$here/$N" "$here/$N" "(null)" &&
+		try_case $N . .git \
+			"$dotgit" "$here/$N" "$here/$N" "(null)" &&
+		try_case $N "$here/$N" "$here/$N/.git" \
+			"$absgit" "$here/$N" "$here/$N" "(null)" &&
+		try_case $N . "$here/$N/.git" \
+			"$absgit" "$here/$N" "$here/$N" "(null)"
+	
+ok 21 - #7: explicit GIT_WORK_TREE and GIT_DIR at toplevel
 
-error: The following untracked working tree files would be overwritten by checkout:
-	B
-ok 14 - Show verbose error when HEAD could not be detached
+expecting success: 
+		try_case $N/sub/sub "$here/$N" ../../.git \
+			"$absgit" "$here/$N" "$here/$N" sub/sub/ &&
+		try_case $N/sub/sub ../.. ../../.git \
+			"$absgit" "$here/$N" "$here/$N" sub/sub/ &&
+		try_case $N/sub/sub "$here/$N" "$here/$N/.git" \
+			"$absgit" "$here/$N" "$here/$N" sub/sub/ &&
+		try_case $N/sub/sub ../.. "$here/$N/.git" \
+			"$absgit" "$here/$N" "$here/$N" sub/sub/
+	
+ok 22 - #7: explicit GIT_WORK_TREE and GIT_DIR in subdir
 
 expecting success: 
-	git checkout topic &&
-	test_must_fail git rebase
+		try_case $N "$here/$N/wt" .git \
+			"$dotgit" "$here/$N/wt" "$here/$N" "(null)" &&
+		try_case $N wt .git \
+			"$dotgit" "$here/$N/wt" "$here/$N" "(null)" &&
+		try_case $N wt "$here/$N/.git" \
+			"$absgit" "$here/$N/wt" "$here/$N" "(null)" &&
+		try_case $N "$here/$N/wt" "$here/$N/.git" \
+			"$absgit" "$here/$N/wt" "$here/$N" "(null)"
+	
+ok 23 - #7: explicit GIT_WORK_TREE from parent of worktree
 
-Note: checking out 'topic'.
+expecting success: 
+		try_case $N/sub/sub "$here/$N/wt" ../../.git \
+			"$dotdotgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)" &&
+		try_case $N/sub/sub ../../wt ../../.git \
+			"$dotdotgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)" &&
+		try_case $N/sub/sub ../../wt "$here/$N/.git" \
+			"$absgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)" &&
+		try_case $N/sub/sub "$here/$N/wt" "$here/$N/.git" \
+			"$absgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)"
+	
+ok 24 - #7: explicit GIT_WORK_TREE from nephew of worktree
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by performing another checkout.
+expecting success: 
+		try_case $N "$here" .git \
+			"$absgit" "$here" "$here" $N/ &&
+		try_case $N .. .git \
+			"$absgit" "$here" "$here" $N/ &&
+		try_case $N .. "$here/$N/.git" \
+			"$absgit" "$here" "$here" $N/ &&
+		try_case $N "$here" "$here/$N/.git" \
+			"$absgit" "$here" "$here" $N/
+	
+ok 25 - #7: chdir_to_toplevel uses worktree, not git dir
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
+expecting success: 
+		try_case $N/sub/sub "$here" ../../.git \
+			"$absgit" "$here" "$here" $N/sub/sub/ &&
+		try_case $N/sub/sub ../../.. ../../.git \
+			"$absgit" "$here" "$here" $N/sub/sub/ &&
+		try_case $N/sub/sub ../../../ "$here/$N/.git" \
+			"$absgit" "$here" "$here" $N/sub/sub/ &&
+		try_case $N/sub/sub "$here" "$here/$N/.git" \
+			"$absgit" "$here" "$here" $N/sub/sub/
+	
+ok 26 - #7: chdir_to_toplevel uses worktree (from subdir)
 
-  git checkout -b <new-branch-name>
+expecting success: 
+	try_repo 8 unset unset unset gitfile unset \
+		"$here/8.git" "$here/8" "$here/8" "(null)" \
+		"$here/8.git" "$here/8" "$here/8" sub/
 
-HEAD is now at 9cfe4e4 Add B.
-You are not currently on a branch.
-Please specify which branch you want to rebase against.
-See git-rebase(1) for details.
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1510-repo-setup/8/.git/
+ok 27 - #8: gitfile, easy case
 
-    git rebase '<branch>'
+expecting success: 
+	mkdir -p 9/wt &&
+	try_repo 9 wt unset unset gitfile unset \
+		"$here/9.git" "$here/9/wt" "$here/9" "(null)" \
+		"$here/9.git" "$here/9/sub/wt" "$here/9/sub" "(null)" 2>message &&
+	test_must_be_empty message
 
-ok 15 - fail when upstream arg is missing and not on branch
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1510-repo-setup/9/.git/
+ok 28 - #9: GIT_WORK_TREE accepted with gitfile
 
 expecting success: 
-	git checkout -b no-config topic &&
-	test_must_fail git rebase
+	try_repo 10 unset "$here/10/.git" unset gitfile unset \
+		"$here/10.git" "$here/10" "$here/10" "(null)" \
+		"$here/10.git" "$here/10/sub" "$here/10/sub" "(null)"
 
-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.
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1510-repo-setup/10/.git/
+ok 29 - #10: GIT_DIR can point to gitfile
 
-    git rebase '<branch>'
+expecting success: 
+	try_repo 10b unset .git unset gitfile unset \
+		"$here/10b.git" "$here/10b" "$here/10b" "(null)" \
+		"$here/10b.git" "$here/10b/sub" "$here/10b/sub" "(null)"
 
-If you wish to set tracking information for this branch you can do so with:
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1510-repo-setup/10b/.git/
+ok 30 - #10b: relative GIT_DIR can point to gitfile
 
-    git branch --set-upstream-to=<remote>/<branch> no-config
+expecting success: 
+	setup_repo 11 unset gitfile unset &&
+	mkdir -p 11/sub/sub 11/wt/sub
 
-ok 16 - fail when upstream arg is missing and not configured
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1510-repo-setup/11/.git/
+ok 31 - #11: setup
 
 expecting success: 
-	git checkout -b default-base master &&
-	git checkout -b default topic &&
-	git config branch.default.remote . &&
-	git config branch.default.merge refs/heads/default-base &&
-	git rebase &&
-	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 &&
-	git rev-parse --verify default-base >expect &&
-	git rev-parse default~1 >actual &&
-	test_cmp expect actual
+		try_case $N "$here/$N" .git \
+			"$dotgit" "$here/$N" "$here/$N" "(null)" &&
+		try_case $N . .git \
+			"$dotgit" "$here/$N" "$here/$N" "(null)" &&
+		try_case $N "$here/$N" "$here/$N/.git" \
+			"$absgit" "$here/$N" "$here/$N" "(null)" &&
+		try_case $N . "$here/$N/.git" \
+			"$absgit" "$here/$N" "$here/$N" "(null)"
+	
+ok 32 - #11: explicit GIT_WORK_TREE and GIT_DIR at toplevel
 
-Switched to a new branch 'default-base'
-Switched to a new branch 'default'
-First, rewinding head to replay your work on top of it...
-Applying: Add B.
-Switched to branch 'default-base'
-HEAD is now at f487c29 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 17 - default to common base in @{upstream}s reflog if no upstream arg
+expecting success: 
+		try_case $N/sub/sub "$here/$N" ../../.git \
+			"$absgit" "$here/$N" "$here/$N" sub/sub/ &&
+		try_case $N/sub/sub ../.. ../../.git \
+			"$absgit" "$here/$N" "$here/$N" sub/sub/ &&
+		try_case $N/sub/sub "$here/$N" "$here/$N/.git" \
+			"$absgit" "$here/$N" "$here/$N" sub/sub/ &&
+		try_case $N/sub/sub ../.. "$here/$N/.git" \
+			"$absgit" "$here/$N" "$here/$N" sub/sub/
+	
+ok 33 - #11: explicit GIT_WORK_TREE and GIT_DIR in subdir
 
 expecting success: 
-	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
+		try_case $N "$here/$N/wt" .git \
+			"$dotgit" "$here/$N/wt" "$here/$N" "(null)" &&
+		try_case $N wt .git \
+			"$dotgit" "$here/$N/wt" "$here/$N" "(null)" &&
+		try_case $N wt "$here/$N/.git" \
+			"$absgit" "$here/$N/wt" "$here/$N" "(null)" &&
+		try_case $N "$here/$N/wt" "$here/$N/.git" \
+			"$absgit" "$here/$N/wt" "$here/$N" "(null)"
+	
+ok 34 - #11: explicit GIT_WORK_TREE from parent of worktree
 
-Switched to branch 'default-base'
-[default-base 51f01a8] Modify A.
- Author: author@name <bogus@email@address>
- Date: Fri Dec 3 05:05:19 2021 +0000
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[default-base 6acddac] B
- Author: author@name <bogus@email@address>
- 1 file changed, 1 insertion(+)
- create mode 100644 B
-[default-base d1ad253] new_B
- Author: author@name <bogus@email@address>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[default-base 9b16a00] 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" to merge the remote branch into yours)
-HEAD is now at f487c29 Modify A.
-[default cbbc84d] D
- Author: author@name <bogus@email@address>
- 1 file changed, 1 insertion(+)
- create mode 100644 D
-[default 67e79e2] B
- Author: author@name <bogus@email@address>
- Date: Thu Apr 7 15:15:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 B
-[default 2f73f3b] new_B
- Author: author@name <bogus@email@address>
- Date: Thu Apr 7 15:16:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[default 38933d6] final_B
- Author: author@name <bogus@email@address>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-First, rewinding head to replay your work on top of it...
-Applying: D
-Applying: final_B
-ok 18 - cherry-picked commits and fork-point work together
+expecting success: 
+		try_case $N/sub/sub "$here/$N/wt" ../../.git \
+			"$dotdotgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)" &&
+		try_case $N/sub/sub ../../wt ../../.git \
+			"$dotdotgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)" &&
+		try_case $N/sub/sub ../../wt "$here/$N/.git" \
+			"$absgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)" &&
+		try_case $N/sub/sub "$here/$N/wt" "$here/$N/.git" \
+			"$absgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)"
+	
+ok 35 - #11: explicit GIT_WORK_TREE from nephew of worktree
 
 expecting success: 
-	git checkout -b quiet topic &&
-	git rebase -q master >output.out 2>&1 &&
-	test_must_be_empty output.out
+		try_case $N "$here" .git \
+			"$absgit" "$here" "$here" $N/ &&
+		try_case $N .. .git \
+			"$absgit" "$here" "$here" $N/ &&
+		try_case $N .. "$here/$N/.git" \
+			"$absgit" "$here" "$here" $N/ &&
+		try_case $N "$here" "$here/$N/.git" \
+			"$absgit" "$here" "$here" $N/
+	
+ok 36 - #11: chdir_to_toplevel uses worktree, not git dir
 
-Switched to a new branch 'quiet'
-ok 19 - rebase -q is quiet
+expecting success: 
+		try_case $N/sub/sub "$here" ../../.git \
+			"$absgit" "$here" "$here" $N/sub/sub/ &&
+		try_case $N/sub/sub ../../.. ../../.git \
+			"$absgit" "$here" "$here" $N/sub/sub/ &&
+		try_case $N/sub/sub ../../../ "$here/$N/.git" \
+			"$absgit" "$here" "$here" $N/sub/sub/ &&
+		try_case $N/sub/sub "$here" "$here/$N/.git" \
+			"$absgit" "$here" "$here" $N/sub/sub/
+	
+ok 37 - #11: chdir_to_toplevel uses worktree (from subdir)
 
 expecting success: 
-	(
-		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
+	try_repo 12 unset unset "$here/12" gitfile unset \
+		"$here/12.git" "$here/12" "$here/12" "(null)" \
+		"$here/12.git" "$here/12" "$here/12" sub/ 2>message &&
+	test_must_be_empty message
 
-[quiet 722e7ec] A file with a line with CR
- Author: author@name <bogus@email@address>
- 1 file changed, 5 insertions(+)
- create mode 100644 CR
-Note: checking out 'HEAD^0'.
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1510-repo-setup/12/.git/
+ok 38 - #12: core.worktree with gitfile is accepted
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by performing another checkout.
+expecting success: 
+	# or: you cannot intimidate away the lack of GIT_DIR setting
+	try_repo 13 non-existent-too unset non-existent gitfile unset \
+		"$here/13.git" "$here/13/non-existent-too" "$here/13" "(null)" \
+		"$here/13.git" "$here/13/sub/non-existent-too" "$here/13/sub" "(null)" 2>message &&
+	test_must_be_empty message
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1510-repo-setup/13/.git/
+ok 39 - #13: core.worktree+GIT_WORK_TREE accepted (with gitfile)
 
-  git checkout -b <new-branch-name>
+expecting success: 
+	setup_repo 14 "$here/14" gitfile unset &&
+	try_case 14 unset .git \
+		"$here/14.git" "$here/14" "$here/14" "(null)" &&
+	try_case 14 unset "$here/14/.git" \
+		"$here/14.git" "$here/14" "$here/14" "(null)" &&
+	try_case 14/sub/sub unset ../../.git \
+		"$here/14.git" "$here/14" "$here/14" sub/sub/ &&
+	try_case 14/sub/sub unset "$here/14/.git" \
+		"$here/14.git" "$here/14" "$here/14" sub/sub/ &&
 
-HEAD is now at 722e7ec A file with a line with CR
-First, rewinding head to replay your work on top of it...
-Applying: A file with a line with CR
-ok 20 - Rebase a commit that sprinkles CRs in
+	setup_repo 14c "$here/14c/wt" gitfile unset &&
+	mkdir -p 14c/wt/sub &&
+
+	try_case 14c unset .git \
+		"$here/14c.git" "$here/14c/wt" "$here/14c" "(null)" &&
+	try_case 14c unset "$here/14c/.git" \
+		"$here/14c.git" "$here/14c/wt" "$here/14c" "(null)" &&
+	try_case 14c/sub/sub unset ../../.git \
+		"$here/14c.git" "$here/14c/wt" "$here/14c/sub/sub" "(null)" &&
+	try_case 14c/sub/sub unset "$here/14c/.git" \
+		"$here/14c.git" "$here/14c/wt" "$here/14c/sub/sub" "(null)" &&
+
+	setup_repo 14d "$here/14d/wt" gitfile unset &&
+	mkdir -p 14d/wt/sub &&
+
+	try_case 14d unset .git \
+		"$here/14d.git" "$here/14d/wt" "$here/14d" "(null)" &&
+	try_case 14d unset "$here/14d/.git" \
+		"$here/14d.git" "$here/14d/wt" "$here/14d" "(null)" &&
+	try_case 14d/sub/sub unset ../../.git \
+		"$here/14d.git" "$here/14d/wt" "$here/14d/sub/sub" "(null)" &&
+	try_case 14d/sub/sub unset "$here/14d/.git" \
+		"$here/14d.git" "$here/14d/wt" "$here/14d/sub/sub" "(null)" &&
+
+	setup_repo 14e "$here" gitfile unset &&
+	try_case 14e unset .git \
+		"$here/14e.git" "$here" "$here" 14e/ &&
+	try_case 14e unset "$here/14e/.git" \
+		"$here/14e.git" "$here" "$here" 14e/ &&
+	try_case 14e/sub/sub unset ../../.git \
+		"$here/14e.git" "$here" "$here" 14e/sub/sub/ &&
+	try_case 14e/sub/sub unset "$here/14e/.git" \
+		"$here/14e.git" "$here" "$here" 14e/sub/sub/
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1510-repo-setup/14/.git/
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1510-repo-setup/14c/.git/
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1510-repo-setup/14d/.git/
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1510-repo-setup/14e/.git/
+ok 40 - #14: core.worktree with GIT_DIR pointing to gitfile
 
 expecting success: 
-	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)"
+	setup_repo 14b ../14b gitfile unset &&
+	try_case 14b unset .git \
+		"$here/14b.git" "$here/14b" "$here/14b" "(null)" &&
+	try_case 14b unset "$here/14b/.git" \
+		"$here/14b.git" "$here/14b" "$here/14b" "(null)" &&
+	try_case 14b/sub/sub unset ../../.git \
+		"$here/14b.git" "$here/14b" "$here/14b" sub/sub/ &&
+	try_case 14b/sub/sub unset "$here/14b/.git" \
+		"$here/14b.git" "$here/14b" "$here/14b" sub/sub/ &&
 
-[detached HEAD 051e289] n1
- Author: author@name <bogus@email@address>
- 1 file changed, 1 insertion(+)
- create mode 100644 n1.t
-[detached HEAD 4660371] n2
- Author: author@name <bogus@email@address>
- 1 file changed, 1 insertion(+)
- create mode 100644 n2.t
-[detached HEAD 8a56c7b] n3
- Author: author@name <bogus@email@address>
- 1 file changed, 1 insertion(+)
- create mode 100644 n3.t
-First, rewinding head to replay your work on top of it...
-Applying: n3
-ok 21 - rebase can copy notes
+	setup_repo 14f ../ gitfile unset &&
+	try_case 14f unset .git \
+		"$here/14f.git" "$here" "$here" 14f/ &&
+	try_case 14f unset "$here/14f/.git" \
+		"$here/14f.git" "$here" "$here" 14f/ &&
+	try_case 14f/sub/sub unset ../../.git \
+		"$here/14f.git" "$here" "$here" 14f/sub/sub/ &&
+	try_case 14f/sub/sub unset "$here/14f/.git" \
+		"$here/14f.git" "$here" "$here" 14f/sub/sub/
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1510-repo-setup/14b/.git/
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1510-repo-setup/14f/.git/
+ok 41 - #14b: core.worktree is relative to actual git dir
 
 expecting success: 
-	git reset --hard n3 &&
-	git rebase -m --onto n1 n2 &&
-	test "a note" = "$(git notes show HEAD)"
+	setup_repo 15 non-existent gitfile unset &&
+	mkdir -p 15/sub/sub 15/wt/sub
 
-HEAD is now at 8a56c7b n3
-First, rewinding head to replay your work on top of it...
-Merging n1 with HEAD~0
-Merging:
-051e289 n1
-8a56c7b n3
-found 1 common ancestor:
-4660371 n2
-[detached HEAD 08cb9d5] n3
- Author: author@name <bogus@email@address>
- Date: Thu Apr 7 15:23:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 n3.t
-Committed: 0001 n3
-All done.
-ok 22 - rebase -m can copy notes
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1510-repo-setup/15/.git/
+ok 42 - #15: setup
 
 expecting success: 
-	git reset --hard &&
+		try_case $N "$here/$N" .git \
+			"$dotgit" "$here/$N" "$here/$N" "(null)" &&
+		try_case $N . .git \
+			"$dotgit" "$here/$N" "$here/$N" "(null)" &&
+		try_case $N "$here/$N" "$here/$N/.git" \
+			"$absgit" "$here/$N" "$here/$N" "(null)" &&
+		try_case $N . "$here/$N/.git" \
+			"$absgit" "$here/$N" "$here/$N" "(null)"
+	
+ok 43 - #15: explicit GIT_WORK_TREE and GIT_DIR at toplevel
 
-	>old.one && git add old.one && test_tick &&
-	git commit --date="@12345 +0400" -m "Old one" &&
-	>old.two && git add old.two && test_tick &&
-	git commit --date="@23456 +0500" -m "Old two" &&
-	>old.three && git add old.three && test_tick &&
-	git commit --date="@34567 +0600" -m "Old three" &&
+expecting success: 
+		try_case $N/sub/sub "$here/$N" ../../.git \
+			"$absgit" "$here/$N" "$here/$N" sub/sub/ &&
+		try_case $N/sub/sub ../.. ../../.git \
+			"$absgit" "$here/$N" "$here/$N" sub/sub/ &&
+		try_case $N/sub/sub "$here/$N" "$here/$N/.git" \
+			"$absgit" "$here/$N" "$here/$N" sub/sub/ &&
+		try_case $N/sub/sub ../.. "$here/$N/.git" \
+			"$absgit" "$here/$N" "$here/$N" sub/sub/
+	
+ok 44 - #15: explicit GIT_WORK_TREE and GIT_DIR in subdir
 
-	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 &&
+expecting success: 
+		try_case $N "$here/$N/wt" .git \
+			"$dotgit" "$here/$N/wt" "$here/$N" "(null)" &&
+		try_case $N wt .git \
+			"$dotgit" "$here/$N/wt" "$here/$N" "(null)" &&
+		try_case $N wt "$here/$N/.git" \
+			"$absgit" "$here/$N/wt" "$here/$N" "(null)" &&
+		try_case $N "$here/$N/wt" "$here/$N/.git" \
+			"$absgit" "$here/$N/wt" "$here/$N" "(null)"
+	
+ok 45 - #15: explicit GIT_WORK_TREE from parent of worktree
 
-	git rebase --onto HEAD^^ HEAD^ &&
+expecting success: 
+		try_case $N/sub/sub "$here/$N/wt" ../../.git \
+			"$dotdotgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)" &&
+		try_case $N/sub/sub ../../wt ../../.git \
+			"$dotdotgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)" &&
+		try_case $N/sub/sub ../../wt "$here/$N/.git" \
+			"$absgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)" &&
+		try_case $N/sub/sub "$here/$N/wt" "$here/$N/.git" \
+			"$absgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)"
+	
+ok 46 - #15: explicit GIT_WORK_TREE from nephew of worktree
 
-	git cat-file commit HEAD >actual &&
-	grep "author .* 34567 +0600$" actual
+expecting success: 
+		try_case $N "$here" .git \
+			"$absgit" "$here" "$here" $N/ &&
+		try_case $N .. .git \
+			"$absgit" "$here" "$here" $N/ &&
+		try_case $N .. "$here/$N/.git" \
+			"$absgit" "$here" "$here" $N/ &&
+		try_case $N "$here" "$here/$N/.git" \
+			"$absgit" "$here" "$here" $N/
+	
+ok 47 - #15: chdir_to_toplevel uses worktree, not git dir
 
-HEAD is now at 08cb9d5 n3
-[detached HEAD a926ac0] 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 dd2823c] 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 e1bcad6] 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
-First, rewinding head to replay your work on top of it...
-Applying: Old three
-author author@name <bogus@email@address> 34567 +0600
-ok 23 - rebase commit with an ancient timestamp
+expecting success: 
+		try_case $N/sub/sub "$here" ../../.git \
+			"$absgit" "$here" "$here" $N/sub/sub/ &&
+		try_case $N/sub/sub ../../.. ../../.git \
+			"$absgit" "$here" "$here" $N/sub/sub/ &&
+		try_case $N/sub/sub ../../../ "$here/$N/.git" \
+			"$absgit" "$here" "$here" $N/sub/sub/ &&
+		try_case $N/sub/sub "$here" "$here/$N/.git" \
+			"$absgit" "$here" "$here" $N/sub/sub/
+	
+ok 48 - #15: chdir_to_toplevel uses worktree (from subdir)
 
 expecting success: 
-	git checkout -b preserve-from master~1 &&
-	cat >From_.msg <<EOF &&
-Somebody embedded an mbox in a commit message
+	setup_repo 16a unset "" unset &&
+	mkdir -p 16a/.git/wt/sub &&
 
-This is from so-and-so:
+	try_case 16a/.git unset unset \
+		. "(null)" "$here/16a/.git" "(null)" &&
+	try_case 16a/.git/wt unset unset \
+		"$here/16a/.git" "(null)" "$here/16a/.git/wt" "(null)" &&
+	try_case 16a/.git/wt/sub unset unset \
+		"$here/16a/.git" "(null)" "$here/16a/.git/wt/sub" "(null)"
 
-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
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1510-repo-setup/16a/.git/
+ok 49 - #16a: implicitly bare repo (cwd inside .git dir)
 
-something
-EOF
-	>From_ &&
-	git add From_ &&
-	git commit -F From_.msg &&
-	git rebase master &&
-	git log -1 --pretty=format:%B >out &&
-	test_cmp From_.msg out
+expecting success: 
+	setup_repo 16b unset "" true &&
+	mkdir -p 16b/.git/wt/sub &&
 
-Warning: you are leaving 3 commits behind, not connected to
-any of your branches:
+	try_case 16b/.git unset unset \
+		. "(null)" "$here/16b/.git" "(null)" &&
+	try_case 16b/.git/wt unset unset \
+		"$here/16b/.git" "(null)" "$here/16b/.git/wt" "(null)" &&
+	try_case 16b/.git/wt/sub unset unset \
+		"$here/16b/.git" "(null)" "$here/16b/.git/wt/sub" "(null)"
 
-  5ff701a Old three
-  a926ac0 Old one
-  08cb9d5 n3
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1510-repo-setup/16b/.git/
+ok 50 - #16b: bare .git (cwd inside .git dir)
 
-If you want to keep them by creating a new branch, this may be a good time
-to do so with:
+expecting success: 
+	try_repo 16c unset unset unset "" true \
+		.git "(null)" "$here/16c" "(null)" \
+		"$here/16c/.git" "(null)" "$here/16c/sub" "(null)"
 
- git branch <new-branch-name> 5ff701a
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1510-repo-setup/16c/.git/
+ok 51 - #16c: bare .git has no worktree
 
-Switched to a new branch 'preserve-from'
-[preserve-from 93e776e] 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_
-First, rewinding head to replay your work on top of it...
-Applying: Somebody embedded an mbox in a commit message
-ok 24 - rebase with "From " line in commit message
+expecting success: 
+	setup_repo 16d unset "" unset &&
+	(
+		cd 16d/.git &&
+		test_must_fail git status &&
+		git config alias.st status &&
+		test_must_fail git st
+	)
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1510-repo-setup/16d/.git/
+fatal: this operation must be run in a work tree
+fatal: this operation must be run in a work tree
+ok 52 - #16d: bareness preserved across alias
 
 expecting success: 
-	test_create_repo conflict-apply &&
+	setup_repo 16e unset "" unset &&
 	(
-		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 --onto init HEAD^ &&
-		GIT_TRACE=1 git rebase --show-current-patch >/dev/null 2>stderr &&
-		grep "show.*$(git rev-parse two)" stderr
+		cd 16e/.git &&
+		test_must_fail git status &&
+		test_must_fail git --bare status
 	)
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3400-rebase/conflict-apply/.git/
-[master (root-commit) 080fbe0] init
- Author: author@name <bogus@email@address>
- 1 file changed, 1 insertion(+)
- create mode 100644 init.t
-[master 61e26c1] one
- Author: author@name <bogus@email@address>
- 1 file changed, 1 insertion(+)
-[master 1bf3d8f] 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:
-080fbe0 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' to see the failed patch
-Patch failed at 0001 two
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1510-repo-setup/16e/.git/
+fatal: this operation must be run in a work tree
+fatal: this operation must be run in a work tree
+ok 53 - #16e: bareness preserved by --bare
 
-Resolve all conflicts manually, mark them as resolved with
-"git add/rm <conflicted_files>", then run "git rebase --continue".
-You can instead skip this commit: run "git rebase --skip".
-To abort and get back to the state before "git rebase", run "git rebase --abort".
+expecting success: 
+	# Just like #16.
+	setup_repo 17a unset "" true &&
+	setup_repo 17b unset "" true &&
+	mkdir -p 17a/.git/wt/sub &&
+	mkdir -p 17b/.git/wt/sub &&
 
-trace: run_command: git show 1bf3d8fe33fb3e440d4f72b014f1eae094a4ac2c --
-trace: built-in: git show 1bf3d8fe33fb3e440d4f72b014f1eae094a4ac2c --
-ok 25 - rebase--am.sh and --show-current-patch
+	try_case 17a/.git "$here/17a" unset \
+		"$here/17a/.git" "$here/17a" "$here/17a" .git/ \
+		2>message &&
+	try_case 17a/.git/wt "$here/17a" unset \
+		"$here/17a/.git" "$here/17a" "$here/17a" .git/wt/ &&
+	try_case 17a/.git/wt/sub "$here/17a" unset \
+		"$here/17a/.git" "$here/17a" "$here/17a" .git/wt/sub/ &&
+
+	try_case 17b/.git "$here/17b" unset \
+		"$here/17b/.git" "$here/17b" "$here/17b" .git/ &&
+	try_case 17b/.git/wt "$here/17b" unset \
+		"$here/17b/.git" "$here/17b" "$here/17b" .git/wt/ &&
+	try_case 17b/.git/wt/sub "$here/17b" unset \
+		"$here/17b/.git" "$here/17b" "$here/17b" .git/wt/sub/ &&
+
+	try_repo 17c "$here/17c" unset unset "" true \
+		.git "$here/17c" "$here/17c" "(null)" \
+		"$here/17c/.git" "$here/17c" "$here/17c" sub/ 2>message &&
+	test_must_be_empty message
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1510-repo-setup/17a/.git/
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1510-repo-setup/17b/.git/
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1510-repo-setup/17c/.git/
+ok 54 - #17: GIT_WORK_TREE without explicit GIT_DIR is accepted (bare case)
 
 expecting success: 
-	test_create_repo conflict-merge &&
+	try_repo 18 unset .git unset "" true \
+		.git "(null)" "$here/18" "(null)" \
+		../.git "(null)" "$here/18/sub" "(null)" &&
+	try_repo 18b unset "$here/18b/.git" unset "" true \
+		"$here/18b/.git" "(null)" "$here/18b" "(null)" \
+		"$here/18b/.git" "(null)" "$here/18b/sub" "(null)"
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1510-repo-setup/18/.git/
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1510-repo-setup/18b/.git/
+ok 55 - #18: bare .git named by GIT_DIR has no worktree
+
+expecting success: 
+	setup_repo 19 unset "" true &&
+	mkdir -p 19/sub/sub 19/wt/sub
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1510-repo-setup/19/.git/
+ok 56 - #19: setup
+
+expecting success: 
+		try_case $N "$here/$N" .git \
+			"$dotgit" "$here/$N" "$here/$N" "(null)" &&
+		try_case $N . .git \
+			"$dotgit" "$here/$N" "$here/$N" "(null)" &&
+		try_case $N "$here/$N" "$here/$N/.git" \
+			"$absgit" "$here/$N" "$here/$N" "(null)" &&
+		try_case $N . "$here/$N/.git" \
+			"$absgit" "$here/$N" "$here/$N" "(null)"
+	
+ok 57 - #19: explicit GIT_WORK_TREE and GIT_DIR at toplevel
+
+expecting success: 
+		try_case $N/sub/sub "$here/$N" ../../.git \
+			"$absgit" "$here/$N" "$here/$N" sub/sub/ &&
+		try_case $N/sub/sub ../.. ../../.git \
+			"$absgit" "$here/$N" "$here/$N" sub/sub/ &&
+		try_case $N/sub/sub "$here/$N" "$here/$N/.git" \
+			"$absgit" "$here/$N" "$here/$N" sub/sub/ &&
+		try_case $N/sub/sub ../.. "$here/$N/.git" \
+			"$absgit" "$here/$N" "$here/$N" sub/sub/
+	
+ok 58 - #19: explicit GIT_WORK_TREE and GIT_DIR in subdir
+
+expecting success: 
+		try_case $N "$here/$N/wt" .git \
+			"$dotgit" "$here/$N/wt" "$here/$N" "(null)" &&
+		try_case $N wt .git \
+			"$dotgit" "$here/$N/wt" "$here/$N" "(null)" &&
+		try_case $N wt "$here/$N/.git" \
+			"$absgit" "$here/$N/wt" "$here/$N" "(null)" &&
+		try_case $N "$here/$N/wt" "$here/$N/.git" \
+			"$absgit" "$here/$N/wt" "$here/$N" "(null)"
+	
+ok 59 - #19: explicit GIT_WORK_TREE from parent of worktree
+
+expecting success: 
+		try_case $N/sub/sub "$here/$N/wt" ../../.git \
+			"$dotdotgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)" &&
+		try_case $N/sub/sub ../../wt ../../.git \
+			"$dotdotgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)" &&
+		try_case $N/sub/sub ../../wt "$here/$N/.git" \
+			"$absgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)" &&
+		try_case $N/sub/sub "$here/$N/wt" "$here/$N/.git" \
+			"$absgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)"
+	
+ok 60 - #19: explicit GIT_WORK_TREE from nephew of worktree
+
+expecting success: 
+		try_case $N "$here" .git \
+			"$absgit" "$here" "$here" $N/ &&
+		try_case $N .. .git \
+			"$absgit" "$here" "$here" $N/ &&
+		try_case $N .. "$here/$N/.git" \
+			"$absgit" "$here" "$here" $N/ &&
+		try_case $N "$here" "$here/$N/.git" \
+			"$absgit" "$here" "$here" $N/
+	
+ok 61 - #19: chdir_to_toplevel uses worktree, not git dir
+
+expecting success: 
+		try_case $N/sub/sub "$here" ../../.git \
+			"$absgit" "$here" "$here" $N/sub/sub/ &&
+		try_case $N/sub/sub ../../.. ../../.git \
+			"$absgit" "$here" "$here" $N/sub/sub/ &&
+		try_case $N/sub/sub ../../../ "$here/$N/.git" \
+			"$absgit" "$here" "$here" $N/sub/sub/ &&
+		try_case $N/sub/sub "$here" "$here/$N/.git" \
+			"$absgit" "$here" "$here" $N/sub/sub/
+	
+ok 62 - #19: chdir_to_toplevel uses worktree (from subdir)
+
+expecting success: 
+	# Unlike case #16a.
+	setup_repo 20a "$here/20a" "" unset &&
+	mkdir -p 20a/.git/wt/sub &&
+	try_case 20a/.git unset unset \
+		"$here/20a/.git" "$here/20a" "$here/20a" .git/ 2>message &&
+	try_case 20a/.git/wt unset unset \
+		"$here/20a/.git" "$here/20a" "$here/20a" .git/wt/ &&
+	try_case 20a/.git/wt/sub unset unset \
+		"$here/20a/.git" "$here/20a" "$here/20a" .git/wt/sub/ &&
+	test_must_be_empty message
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1510-repo-setup/20a/.git/
+ok 63 - #20a: core.worktree without GIT_DIR accepted (inside .git)
+
+expecting success: 
+	setup_repo 20b non-existent "" true &&
+	mkdir -p 20b/.git/wt/sub &&
 	(
-		cd conflict-merge &&
-		test_commit init &&
-		echo one >>init.t &&
-		git commit -a -m one &&
-		echo two >>init.t &&
-		git commit -a -m two &&
-		git tag two &&
-		test_must_fail git rebase --merge --onto init HEAD^ &&
-		git rebase --show-current-patch >actual.patch &&
-		GIT_TRACE=1 git rebase --show-current-patch >/dev/null 2>stderr &&
-		grep "show.*REBASE_HEAD" stderr &&
-		test "$(git rev-parse REBASE_HEAD)" = "$(git rev-parse two)"
+		cd 20b/.git &&
+		test_must_fail git status >/dev/null
+	) 2>message &&
+	grep "core.bare and core.worktree" message
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1510-repo-setup/20b/.git/
+warning: core.bare and core.worktree do not make sense
+ok 64 - #20b/c: core.worktree and core.bare conflict
+
+expecting success: 
+	setup_repo 20d non-existent "" true &&
+	mkdir -p 20d/.git/wt/sub &&
+	(
+		cd 20d/.git &&
+		git config foo.bar value
 	)
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3400-rebase/conflict-merge/.git/
-[master (root-commit) 080fbe0] init
- Author: author@name <bogus@email@address>
- 1 file changed, 1 insertion(+)
- create mode 100644 init.t
-[master 61e26c1] one
- Author: author@name <bogus@email@address>
- 1 file changed, 1 insertion(+)
-[master 1bf3d8f] two
- Author: author@name <bogus@email@address>
- 1 file changed, 1 insertion(+)
-First, rewinding head to replay your work on top of it...
-Merging init with HEAD~0
-Merging:
-080fbe0 init
-1bf3d8f two
-found 1 common ancestor:
-61e26c1 one
-Auto-merging init.t
-CONFLICT (content): Merge conflict in init.t
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1510-repo-setup/20d/.git/
+warning: core.bare and core.worktree do not make sense
+ok 65 - #20d: core.worktree and core.bare OK when working tree not needed
 
-Resolve all conflicts manually, mark them as resolved with
-"git add/rm <conflicted_files>", then run "git rebase --continue".
-You can instead skip this commit: run "git rebase --skip".
-To abort and get back to the state before "git rebase", run "git rebase --abort".
+expecting success: 
+	setup_repo 21 non-existent "" unset &&
+	mkdir -p 21/.git/wt/sub &&
+	(
+		cd 21/.git &&
+		GIT_WORK_TREE="$here/21" &&
+		export GIT_WORK_TREE &&
+		git status >/dev/null
+	) 2>message &&
+	test_must_be_empty message
 
-trace: built-in: git show REBASE_HEAD --
-ok 26 - rebase--merge.sh and --show-current-patch
 
-# passed all 26 test(s)
-1..26
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t3406-rebase-message.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3406-rebase-message/.git/
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1510-repo-setup/21/.git/
+ok 66 - #21: setup, core.worktree warns before overriding core.bare
+
 expecting success: 
-	test_commit O fileO &&
-	test_commit X fileX &&
-	test_commit A fileA &&
-	test_commit B fileB &&
-	test_commit Y fileY &&
+		try_case $N "$here/$N" .git \
+			"$dotgit" "$here/$N" "$here/$N" "(null)" &&
+		try_case $N . .git \
+			"$dotgit" "$here/$N" "$here/$N" "(null)" &&
+		try_case $N "$here/$N" "$here/$N/.git" \
+			"$absgit" "$here/$N" "$here/$N" "(null)" &&
+		try_case $N . "$here/$N/.git" \
+			"$absgit" "$here/$N" "$here/$N" "(null)"
+	
+ok 67 - #21: explicit GIT_WORK_TREE and GIT_DIR at toplevel
 
-	git checkout -b topic O &&
-	git cherry-pick A B &&
-	test_commit Z fileZ &&
-	git tag start
+expecting success: 
+		try_case $N/sub/sub "$here/$N" ../../.git \
+			"$absgit" "$here/$N" "$here/$N" sub/sub/ &&
+		try_case $N/sub/sub ../.. ../../.git \
+			"$absgit" "$here/$N" "$here/$N" sub/sub/ &&
+		try_case $N/sub/sub "$here/$N" "$here/$N/.git" \
+			"$absgit" "$here/$N" "$here/$N" sub/sub/ &&
+		try_case $N/sub/sub ../.. "$here/$N/.git" \
+			"$absgit" "$here/$N" "$here/$N" sub/sub/
+	
+ok 68 - #21: explicit GIT_WORK_TREE and GIT_DIR in subdir
 
-[master (root-commit) 3749684] O
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 fileO
-[master a2df67f] X
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 fileX
-[master 9491ce3] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 fileA
-[master 83a6553] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 fileB
-[master 545b0d0] Y
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 fileY
-Switched to a new branch 'topic'
-[topic 80ec5e8] 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 4ff7882] 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 dd88760] Z
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 fileZ
-ok 1 - setup
+expecting success: 
+		try_case $N "$here/$N/wt" .git \
+			"$dotgit" "$here/$N/wt" "$here/$N" "(null)" &&
+		try_case $N wt .git \
+			"$dotgit" "$here/$N/wt" "$here/$N" "(null)" &&
+		try_case $N wt "$here/$N/.git" \
+			"$absgit" "$here/$N/wt" "$here/$N" "(null)" &&
+		try_case $N "$here/$N/wt" "$here/$N/.git" \
+			"$absgit" "$here/$N/wt" "$here/$N" "(null)"
+	
+ok 69 - #21: explicit GIT_WORK_TREE from parent of worktree
 
 expecting success: 
-	git rebase -m master >report &&
-	sed -n -e "/^Already applied: /p" \
-		-e "/^Committed: /p" report >actual &&
-	test_cmp expect actual
+		try_case $N/sub/sub "$here/$N/wt" ../../.git \
+			"$dotdotgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)" &&
+		try_case $N/sub/sub ../../wt ../../.git \
+			"$dotdotgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)" &&
+		try_case $N/sub/sub ../../wt "$here/$N/.git" \
+			"$absgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)" &&
+		try_case $N/sub/sub "$here/$N/wt" "$here/$N/.git" \
+			"$absgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)"
+	
+ok 70 - #21: explicit GIT_WORK_TREE from nephew of worktree
 
-ok 2 - rebase -m
+expecting success: 
+		try_case $N "$here" .git \
+			"$absgit" "$here" "$here" $N/ &&
+		try_case $N .. .git \
+			"$absgit" "$here" "$here" $N/ &&
+		try_case $N .. "$here/$N/.git" \
+			"$absgit" "$here" "$here" $N/ &&
+		try_case $N "$here" "$here/$N/.git" \
+			"$absgit" "$here" "$here" $N/
+	
+ok 71 - #21: chdir_to_toplevel uses worktree, not git dir
 
 expecting success: 
-	git rebase master >out &&
-	test_i18ngrep "Current branch topic is up to date" out
+		try_case $N/sub/sub "$here" ../../.git \
+			"$absgit" "$here" "$here" $N/sub/sub/ &&
+		try_case $N/sub/sub ../../.. ../../.git \
+			"$absgit" "$here" "$here" $N/sub/sub/ &&
+		try_case $N/sub/sub ../../../ "$here/$N/.git" \
+			"$absgit" "$here" "$here" $N/sub/sub/ &&
+		try_case $N/sub/sub "$here" "$here/$N/.git" \
+			"$absgit" "$here" "$here" $N/sub/sub/
+	
+ok 72 - #21: chdir_to_toplevel uses worktree (from subdir)
 
-Current branch topic is up to date.
-ok 3 - rebase against master twice
+expecting success: 
+	# like case #6.
+
+	setup_repo 22a "$here/22a/.git" "" unset &&
+	setup_repo 22ab . "" unset &&
+	mkdir -p 22a/.git/sub 22a/sub &&
+	mkdir -p 22ab/.git/sub 22ab/sub &&
+	try_case 22a/.git unset . \
+		. "$here/22a/.git" "$here/22a/.git" "(null)" &&
+	try_case 22a/.git unset "$here/22a/.git" \
+		"$here/22a/.git" "$here/22a/.git" "$here/22a/.git" "(null)" &&
+	try_case 22a/.git/sub unset .. \
+		"$here/22a/.git" "$here/22a/.git" "$here/22a/.git" sub/ &&
+	try_case 22a/.git/sub unset "$here/22a/.git" \
+		"$here/22a/.git" "$here/22a/.git" "$here/22a/.git" sub/ &&
+
+	try_case 22ab/.git unset . \
+		. "$here/22ab/.git" "$here/22ab/.git" "(null)" &&
+	try_case 22ab/.git unset "$here/22ab/.git" \
+		"$here/22ab/.git" "$here/22ab/.git" "$here/22ab/.git" "(null)" &&
+	try_case 22ab/.git/sub unset .. \
+		"$here/22ab/.git" "$here/22ab/.git" "$here/22ab/.git" sub/ &&
+	try_case 22ab/.git unset "$here/22ab/.git" \
+		"$here/22ab/.git" "$here/22ab/.git" "$here/22ab/.git" "(null)"
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1510-repo-setup/22a/.git/
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1510-repo-setup/22ab/.git/
+ok 73 - #22a: core.worktree = GIT_DIR = .git dir
 
 expecting success: 
-	git rebase --force-rebase master >out &&
-	test_i18ngrep "Current branch topic is up to date, rebase forced" out
+	setup_repo 22b "$here/22b/.git/wt" "" unset &&
+	setup_repo 22bb wt "" unset &&
+	mkdir -p 22b/.git/sub 22b/sub 22b/.git/wt/sub 22b/wt/sub &&
+	mkdir -p 22bb/.git/sub 22bb/sub 22bb/.git/wt 22bb/wt &&
 
-Current branch topic is up to date, rebase forced.
-ok 4 - rebase against master twice with --force
+	try_case 22b/.git unset . \
+		. "$here/22b/.git/wt" "$here/22b/.git" "(null)" &&
+	try_case 22b/.git unset "$here/22b/.git" \
+		"$here/22b/.git" "$here/22b/.git/wt" "$here/22b/.git" "(null)" &&
+	try_case 22b/.git/sub unset .. \
+		.. "$here/22b/.git/wt" "$here/22b/.git/sub" "(null)" &&
+	try_case 22b/.git/sub unset "$here/22b/.git" \
+		"$here/22b/.git" "$here/22b/.git/wt" "$here/22b/.git/sub" "(null)" &&
+
+	try_case 22bb/.git unset . \
+		. "$here/22bb/.git/wt" "$here/22bb/.git" "(null)" &&
+	try_case 22bb/.git unset "$here/22bb/.git" \
+		"$here/22bb/.git" "$here/22bb/.git/wt" "$here/22bb/.git" "(null)" &&
+	try_case 22bb/.git/sub unset .. \
+		.. "$here/22bb/.git/wt" "$here/22bb/.git/sub" "(null)" &&
+	try_case 22bb/.git/sub unset "$here/22bb/.git" \
+		"$here/22bb/.git" "$here/22bb/.git/wt" "$here/22bb/.git/sub" "(null)"
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1510-repo-setup/22b/.git/
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1510-repo-setup/22bb/.git/
+ok 74 - #22b: core.worktree child of .git, GIT_DIR=.git
 
 expecting success: 
-	git checkout topic^ &&
-	git rebase master topic >out &&
-	test_i18ngrep "Current branch topic is up to date" out
+	setup_repo 22c "$here/22c" "" unset &&
+	setup_repo 22cb .. "" unset &&
+	mkdir -p 22c/.git/sub 22c/sub &&
+	mkdir -p 22cb/.git/sub 22cb/sub &&
 
-Note: checking out 'topic^'.
+	try_case 22c/.git unset . \
+		"$here/22c/.git" "$here/22c" "$here/22c" .git/ &&
+	try_case 22c/.git unset "$here/22c/.git" \
+		"$here/22c/.git" "$here/22c" "$here/22c" .git/ &&
+	try_case 22c/.git/sub unset .. \
+		"$here/22c/.git" "$here/22c" "$here/22c" .git/sub/ &&
+	try_case 22c/.git/sub unset "$here/22c/.git" \
+		"$here/22c/.git" "$here/22c" "$here/22c" .git/sub/ &&
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by performing another checkout.
+	try_case 22cb/.git unset . \
+		"$here/22cb/.git" "$here/22cb" "$here/22cb" .git/ &&
+	try_case 22cb/.git unset "$here/22cb/.git" \
+		"$here/22cb/.git" "$here/22cb" "$here/22cb" .git/ &&
+	try_case 22cb/.git/sub unset .. \
+		"$here/22cb/.git" "$here/22cb" "$here/22cb" .git/sub/ &&
+	try_case 22cb/.git/sub unset "$here/22cb/.git" \
+		"$here/22cb/.git" "$here/22cb" "$here/22cb" .git/sub/
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1510-repo-setup/22c/.git/
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1510-repo-setup/22cb/.git/
+ok 75 - #22c: core.worktree = .git/.., GIT_DIR=.git
 
-  git checkout -b <new-branch-name>
+expecting success: 
+	setup_repo 22 "$here/22" "" true &&
+	(
+		cd 22/.git &&
+		GIT_DIR=. &&
+		export GIT_DIR &&
+		test_must_fail git status 2>result
+	) &&
+	(
+		cd 22 &&
+		GIT_DIR=.git &&
+		export GIT_DIR &&
+		test_must_fail git status 2>result
+	) &&
+	grep "core.bare and core.worktree" 22/.git/result &&
+	grep "core.bare and core.worktree" 22/result
 
-HEAD is now at 545b0d0 Y
-Current branch topic is up to date.
-ok 5 - rebase against master twice from another branch
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1510-repo-setup/22/.git/
+warning: core.bare and core.worktree do not make sense
+warning: core.bare and core.worktree do not make sense
+ok 76 - #22.2: core.worktree and core.bare conflict
 
 expecting success: 
-	git checkout topic^ &&
-	git rebase topic >out &&
-	test_i18ngrep "Fast-forwarded HEAD to topic" out
+	setup_repo 23 non-existent "" true &&
+	mkdir -p 23/sub/sub 23/wt/sub
 
-Note: checking out 'topic^'.
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1510-repo-setup/23/.git/
+ok 77 - #23: setup
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by performing another checkout.
+expecting success: 
+		try_case $N "$here/$N" .git \
+			"$dotgit" "$here/$N" "$here/$N" "(null)" &&
+		try_case $N . .git \
+			"$dotgit" "$here/$N" "$here/$N" "(null)" &&
+		try_case $N "$here/$N" "$here/$N/.git" \
+			"$absgit" "$here/$N" "$here/$N" "(null)" &&
+		try_case $N . "$here/$N/.git" \
+			"$absgit" "$here/$N" "$here/$N" "(null)"
+	
+ok 78 - #23: explicit GIT_WORK_TREE and GIT_DIR at toplevel
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
+expecting success: 
+		try_case $N/sub/sub "$here/$N" ../../.git \
+			"$absgit" "$here/$N" "$here/$N" sub/sub/ &&
+		try_case $N/sub/sub ../.. ../../.git \
+			"$absgit" "$here/$N" "$here/$N" sub/sub/ &&
+		try_case $N/sub/sub "$here/$N" "$here/$N/.git" \
+			"$absgit" "$here/$N" "$here/$N" sub/sub/ &&
+		try_case $N/sub/sub ../.. "$here/$N/.git" \
+			"$absgit" "$here/$N" "$here/$N" sub/sub/
+	
+ok 79 - #23: explicit GIT_WORK_TREE and GIT_DIR in subdir
 
-  git checkout -b <new-branch-name>
+expecting success: 
+		try_case $N "$here/$N/wt" .git \
+			"$dotgit" "$here/$N/wt" "$here/$N" "(null)" &&
+		try_case $N wt .git \
+			"$dotgit" "$here/$N/wt" "$here/$N" "(null)" &&
+		try_case $N wt "$here/$N/.git" \
+			"$absgit" "$here/$N/wt" "$here/$N" "(null)" &&
+		try_case $N "$here/$N/wt" "$here/$N/.git" \
+			"$absgit" "$here/$N/wt" "$here/$N" "(null)"
+	
+ok 80 - #23: explicit GIT_WORK_TREE from parent of worktree
 
-HEAD is now at 545b0d0 Y
-Fast-forwarded HEAD to topic.
-ok 6 - rebase fast-forward to master
+expecting success: 
+		try_case $N/sub/sub "$here/$N/wt" ../../.git \
+			"$dotdotgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)" &&
+		try_case $N/sub/sub ../../wt ../../.git \
+			"$dotdotgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)" &&
+		try_case $N/sub/sub ../../wt "$here/$N/.git" \
+			"$absgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)" &&
+		try_case $N/sub/sub "$here/$N/wt" "$here/$N/.git" \
+			"$absgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)"
+	
+ok 81 - #23: explicit GIT_WORK_TREE from nephew of worktree
 
 expecting success: 
-	git reset --hard start &&
-        git rebase --stat master >diffstat.txt &&
-        grep "^ fileX |  *1 +$" diffstat.txt
+		try_case $N "$here" .git \
+			"$absgit" "$here" "$here" $N/ &&
+		try_case $N .. .git \
+			"$absgit" "$here" "$here" $N/ &&
+		try_case $N .. "$here/$N/.git" \
+			"$absgit" "$here" "$here" $N/ &&
+		try_case $N "$here" "$here/$N/.git" \
+			"$absgit" "$here" "$here" $N/
+	
+ok 82 - #23: chdir_to_toplevel uses worktree, not git dir
 
-HEAD is now at dd88760 Z
- fileX | 1 +
-ok 7 - rebase --stat
+expecting success: 
+		try_case $N/sub/sub "$here" ../../.git \
+			"$absgit" "$here" "$here" $N/sub/sub/ &&
+		try_case $N/sub/sub ../../.. ../../.git \
+			"$absgit" "$here" "$here" $N/sub/sub/ &&
+		try_case $N/sub/sub ../../../ "$here/$N/.git" \
+			"$absgit" "$here" "$here" $N/sub/sub/ &&
+		try_case $N/sub/sub "$here" "$here/$N/.git" \
+			"$absgit" "$here" "$here" $N/sub/sub/
+	
+ok 83 - #23: chdir_to_toplevel uses worktree (from subdir)
 
 expecting success: 
-	git reset --hard start &&
-        git config rebase.stat true &&
-        git rebase master >diffstat.txt &&
-        grep "^ fileX |  *1 +$" diffstat.txt
+	try_repo 24 unset unset unset gitfile true \
+		"$here/24.git" "(null)" "$here/24" "(null)" \
+		"$here/24.git" "(null)" "$here/24/sub" "(null)"
 
-HEAD is now at dd88760 Z
- fileX | 1 +
-ok 8 - rebase w/config rebase.stat
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1510-repo-setup/24/.git/
+ok 84 - #24: bare repo has no worktree (gitfile case)
 
 expecting success: 
-	git reset --hard start &&
-        git config rebase.stat true &&
-        git rebase -n master >diffstat.txt &&
-        ! grep "^ fileX |  *1 +$" diffstat.txt
+	try_repo 25 "$here/25" unset unset gitfile true \
+		"$here/25.git" "$here/25" "$here/25" "(null)"  \
+		"$here/25.git" "$here/25" "$here/25" "sub/" 2>message &&
+	test_must_be_empty message
 
-HEAD is now at dd88760 Z
-ok 9 - rebase -n overrides config rebase.stat config
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1510-repo-setup/25/.git/
+ok 85 - #25: GIT_WORK_TREE accepted if GIT_DIR unset (bare gitfile case)
 
 expecting success: 
-	test_must_fail git rebase --onto invalid-ref HEAD HEAD 2>err &&
-	test_i18ngrep "invalid-ref" err
+	try_repo 26 unset "$here/26/.git" unset gitfile true \
+		"$here/26.git" "(null)" "$here/26" "(null)" \
+		"$here/26.git" "(null)" "$here/26/sub" "(null)" &&
+	try_repo 26b unset .git unset gitfile true \
+		"$here/26b.git" "(null)" "$here/26b" "(null)" \
+		"$here/26b.git" "(null)" "$here/26b/sub" "(null)"
 
-fatal: Does not point to a valid commit 'invalid-ref'
-ok 10 - rebase --onto outputs the invalid ref
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1510-repo-setup/26/.git/
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1510-repo-setup/26b/.git/
+ok 86 - #26: bare repo has no worktree (GIT_DIR -> gitfile case)
 
 expecting success: 
-	test_must_fail git rebase -Cnot-a-number HEAD 2>err &&
-	test_i18ngrep "numerical value" err &&
-	test_must_fail git rebase --whitespace=bad HEAD 2>err &&
-	test_i18ngrep "Invalid whitespace option" err
+	setup_repo 27 unset gitfile true &&
+	mkdir -p 27/sub/sub 27/wt/sub
 
-fatal: switch `C' expects a numerical value
-fatal: Invalid whitespace option: 'bad'
-ok 11 - error out early upon -C<n> or --whitespace=<bad>
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1510-repo-setup/27/.git/
+ok 87 - #27: setup
 
 expecting success: 
-	git checkout start &&
-	test_commit reflog-onto &&
-	git checkout -b reflog-topic start &&
-	test_commit reflog-to-rebase &&
+		try_case $N "$here/$N" .git \
+			"$dotgit" "$here/$N" "$here/$N" "(null)" &&
+		try_case $N . .git \
+			"$dotgit" "$here/$N" "$here/$N" "(null)" &&
+		try_case $N "$here/$N" "$here/$N/.git" \
+			"$absgit" "$here/$N" "$here/$N" "(null)" &&
+		try_case $N . "$here/$N/.git" \
+			"$absgit" "$here/$N" "$here/$N" "(null)"
+	
+ok 88 - #27: explicit GIT_WORK_TREE and GIT_DIR at toplevel
 
-	git rebase reflog-onto &&
-	git log -g --format=%gs -3 >actual &&
-	cat >expect <<-\EOF &&
-	rebase finished: returning to refs/heads/reflog-topic
-	rebase: reflog-to-rebase
-	rebase: checkout reflog-onto
-	EOF
-	test_cmp expect actual &&
+expecting success: 
+		try_case $N/sub/sub "$here/$N" ../../.git \
+			"$absgit" "$here/$N" "$here/$N" sub/sub/ &&
+		try_case $N/sub/sub ../.. ../../.git \
+			"$absgit" "$here/$N" "$here/$N" sub/sub/ &&
+		try_case $N/sub/sub "$here/$N" "$here/$N/.git" \
+			"$absgit" "$here/$N" "$here/$N" sub/sub/ &&
+		try_case $N/sub/sub ../.. "$here/$N/.git" \
+			"$absgit" "$here/$N" "$here/$N" sub/sub/
+	
+ok 89 - #27: explicit GIT_WORK_TREE and GIT_DIR in subdir
 
-	git checkout -b reflog-prefix reflog-to-rebase &&
-	GIT_REFLOG_ACTION=change-the-reflog git rebase reflog-onto &&
-	git log -g --format=%gs -3 >actual &&
-	cat >expect <<-\EOF &&
-	rebase finished: returning to refs/heads/reflog-prefix
-	change-the-reflog: reflog-to-rebase
-	change-the-reflog: checkout reflog-onto
-	EOF
-	test_cmp expect actual
+expecting success: 
+		try_case $N "$here/$N/wt" .git \
+			"$dotgit" "$here/$N/wt" "$here/$N" "(null)" &&
+		try_case $N wt .git \
+			"$dotgit" "$here/$N/wt" "$here/$N" "(null)" &&
+		try_case $N wt "$here/$N/.git" \
+			"$absgit" "$here/$N/wt" "$here/$N" "(null)" &&
+		try_case $N "$here/$N/wt" "$here/$N/.git" \
+			"$absgit" "$here/$N/wt" "$here/$N" "(null)"
+	
+ok 90 - #27: explicit GIT_WORK_TREE from parent of worktree
 
-Previous HEAD position was 102672f Z
-HEAD is now at dd88760 Z
-[detached HEAD de4658a] reflog-onto
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 reflog-onto.t
-Previous HEAD position was de4658a reflog-onto
-Switched to a new branch 'reflog-topic'
-[reflog-topic d91d0e4] reflog-to-rebase
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 reflog-to-rebase.t
- reflog-onto.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 reflog-onto.t
-First, rewinding head to replay your work on top of it...
-Applying: reflog-to-rebase
-Switched to a new branch 'reflog-prefix'
- reflog-onto.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 reflog-onto.t
-First, rewinding head to replay your work on top of it...
-Applying: reflog-to-rebase
-ok 12 - GIT_REFLOG_ACTION
+expecting success: 
+		try_case $N/sub/sub "$here/$N/wt" ../../.git \
+			"$dotdotgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)" &&
+		try_case $N/sub/sub ../../wt ../../.git \
+			"$dotdotgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)" &&
+		try_case $N/sub/sub ../../wt "$here/$N/.git" \
+			"$absgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)" &&
+		try_case $N/sub/sub "$here/$N/wt" "$here/$N/.git" \
+			"$absgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)"
+	
+ok 91 - #27: explicit GIT_WORK_TREE from nephew of worktree
 
 expecting success: 
-	git init unrelated &&
-	test_commit -C unrelated 1 &&
-	git -C unrelated remote add -f origin "$PWD" &&
-	git -C unrelated branch --set-upstream-to=origin/master &&
-	git -C unrelated -c core.editor=true rebase -i -v --stat >actual &&
-	test_i18ngrep "Changes to " actual &&
-	test_i18ngrep "5 files changed" actual
+		try_case $N "$here" .git \
+			"$absgit" "$here" "$here" $N/ &&
+		try_case $N .. .git \
+			"$absgit" "$here" "$here" $N/ &&
+		try_case $N .. "$here/$N/.git" \
+			"$absgit" "$here" "$here" $N/ &&
+		try_case $N "$here" "$here/$N/.git" \
+			"$absgit" "$here" "$here" $N/
+	
+ok 92 - #27: chdir_to_toplevel uses worktree, not git dir
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3406-rebase-message/unrelated/.git/
-[master (root-commit) 11730cb] 1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 1.t
-Updating origin
-warning: no common commits
-From /build/git-2.20.1/t/trash directory.t3406-rebase-message
- * [new branch]      master        -> origin/master
- * [new branch]      reflog-prefix -> origin/reflog-prefix
- * [new branch]      reflog-topic  -> origin/reflog-topic
- * [new branch]      topic         -> origin/topic
- * [new tag]         Y             -> Y
- * [new tag]         A             -> A
- * [new tag]         B             -> B
- * [new tag]         O             -> O
- * [new tag]         X             -> X
- * [new tag]         Z             -> Z
- * [new tag]         reflog-onto   -> reflog-onto
- * [new tag]         start         -> start
-Branch 'master' set up to track remote branch 'master' from 'origin'.
-Note: checking out '545b0d0a5d2af9b721d265dc5293dbb3418ab768'.
+expecting success: 
+		try_case $N/sub/sub "$here" ../../.git \
+			"$absgit" "$here" "$here" $N/sub/sub/ &&
+		try_case $N/sub/sub ../../.. ../../.git \
+			"$absgit" "$here" "$here" $N/sub/sub/ &&
+		try_case $N/sub/sub ../../../ "$here/$N/.git" \
+			"$absgit" "$here" "$here" $N/sub/sub/ &&
+		try_case $N/sub/sub "$here" "$here/$N/.git" \
+			"$absgit" "$here" "$here" $N/sub/sub/
+	
+ok 93 - #27: chdir_to_toplevel uses worktree (from subdir)
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by performing another checkout.
+expecting success: 
+	setup_repo 28 "$here/28" gitfile true &&
+	(
+		cd 28 &&
+		test_must_fail git status
+	) 2>message &&
+	grep "core.bare and core.worktree" message
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1510-repo-setup/28/.git/
+warning: core.bare and core.worktree do not make sense
+ok 94 - #28: core.worktree and core.bare conflict (gitfile case)
 
-  git checkout -b <new-branch-name>
+expecting success: 
+	setup_repo 29 non-existent gitfile true &&
+	mkdir -p 29/sub/sub 29/wt/sub &&
+	(
+		cd 29 &&
+		GIT_WORK_TREE="$here/29" &&
+		export GIT_WORK_TREE &&
+		git status
+	) 2>message &&
+	test_must_be_empty message
 
-HEAD is now at 545b0d0 Y
-Rebasing (1/1)
-Successfully rebased and updated refs/heads/master.
-Changes to 545b0d0a5d2af9b721d265dc5293dbb3418ab768:
- 5 files changed, 5 insertions(+)
- 5 files changed, 5 insertions(+)
-ok 13 - rebase -i onto unrelated history
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1510-repo-setup/29/.git/
+On branch master
 
-# passed all 13 test(s)
-1..13
+No commits yet
+
+nothing to commit (create/copy files and use "git add" to track)
+ok 95 - #29: setup
+
+expecting success: 
+		try_case $N "$here/$N" .git \
+			"$dotgit" "$here/$N" "$here/$N" "(null)" &&
+		try_case $N . .git \
+			"$dotgit" "$here/$N" "$here/$N" "(null)" &&
+		try_case $N "$here/$N" "$here/$N/.git" \
+			"$absgit" "$here/$N" "$here/$N" "(null)" &&
+		try_case $N . "$here/$N/.git" \
+			"$absgit" "$here/$N" "$here/$N" "(null)"
+	
+ok 96 - #29: explicit GIT_WORK_TREE and GIT_DIR at toplevel
+
+expecting success: 
+		try_case $N/sub/sub "$here/$N" ../../.git \
+			"$absgit" "$here/$N" "$here/$N" sub/sub/ &&
+		try_case $N/sub/sub ../.. ../../.git \
+			"$absgit" "$here/$N" "$here/$N" sub/sub/ &&
+		try_case $N/sub/sub "$here/$N" "$here/$N/.git" \
+			"$absgit" "$here/$N" "$here/$N" sub/sub/ &&
+		try_case $N/sub/sub ../.. "$here/$N/.git" \
+			"$absgit" "$here/$N" "$here/$N" sub/sub/
+	
+ok 97 - #29: explicit GIT_WORK_TREE and GIT_DIR in subdir
+
+expecting success: 
+		try_case $N "$here/$N/wt" .git \
+			"$dotgit" "$here/$N/wt" "$here/$N" "(null)" &&
+		try_case $N wt .git \
+			"$dotgit" "$here/$N/wt" "$here/$N" "(null)" &&
+		try_case $N wt "$here/$N/.git" \
+			"$absgit" "$here/$N/wt" "$here/$N" "(null)" &&
+		try_case $N "$here/$N/wt" "$here/$N/.git" \
+			"$absgit" "$here/$N/wt" "$here/$N" "(null)"
+	
+ok 98 - #29: explicit GIT_WORK_TREE from parent of worktree
+
+expecting success: 
+		try_case $N/sub/sub "$here/$N/wt" ../../.git \
+			"$dotdotgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)" &&
+		try_case $N/sub/sub ../../wt ../../.git \
+			"$dotdotgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)" &&
+		try_case $N/sub/sub ../../wt "$here/$N/.git" \
+			"$absgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)" &&
+		try_case $N/sub/sub "$here/$N/wt" "$here/$N/.git" \
+			"$absgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)"
+	
+ok 99 - #29: explicit GIT_WORK_TREE from nephew of worktree
+
+expecting success: 
+		try_case $N "$here" .git \
+			"$absgit" "$here" "$here" $N/ &&
+		try_case $N .. .git \
+			"$absgit" "$here" "$here" $N/ &&
+		try_case $N .. "$here/$N/.git" \
+			"$absgit" "$here" "$here" $N/ &&
+		try_case $N "$here" "$here/$N/.git" \
+			"$absgit" "$here" "$here" $N/
+	
+ok 100 - #29: chdir_to_toplevel uses worktree, not git dir
+
+expecting success: 
+		try_case $N/sub/sub "$here" ../../.git \
+			"$absgit" "$here" "$here" $N/sub/sub/ &&
+		try_case $N/sub/sub ../../.. ../../.git \
+			"$absgit" "$here" "$here" $N/sub/sub/ &&
+		try_case $N/sub/sub ../../../ "$here/$N/.git" \
+			"$absgit" "$here" "$here" $N/sub/sub/ &&
+		try_case $N/sub/sub "$here" "$here/$N/.git" \
+			"$absgit" "$here" "$here" $N/sub/sub/
+	
+ok 101 - #29: chdir_to_toplevel uses worktree (from subdir)
+
+expecting success: 
+	# Just like case #22.
+	setup_repo 30 "$here/30" gitfile true &&
+	(
+		cd 30 &&
+		test_must_fail env GIT_DIR=.git git status 2>result
+	) &&
+	grep "core.bare and core.worktree" 30/result
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1510-repo-setup/30/.git/
+warning: core.bare and core.worktree do not make sense
+ok 102 - #30: core.worktree and core.bare conflict (gitfile version)
+
+expecting success: 
+	setup_repo 31 non-existent gitfile true &&
+	mkdir -p 31/sub/sub 31/wt/sub
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1510-repo-setup/31/.git/
+ok 103 - #31: setup
+
+expecting success: 
+		try_case $N "$here/$N" .git \
+			"$dotgit" "$here/$N" "$here/$N" "(null)" &&
+		try_case $N . .git \
+			"$dotgit" "$here/$N" "$here/$N" "(null)" &&
+		try_case $N "$here/$N" "$here/$N/.git" \
+			"$absgit" "$here/$N" "$here/$N" "(null)" &&
+		try_case $N . "$here/$N/.git" \
+			"$absgit" "$here/$N" "$here/$N" "(null)"
+	
+ok 104 - #31: explicit GIT_WORK_TREE and GIT_DIR at toplevel
+
+expecting success: 
+		try_case $N/sub/sub "$here/$N" ../../.git \
+			"$absgit" "$here/$N" "$here/$N" sub/sub/ &&
+		try_case $N/sub/sub ../.. ../../.git \
+			"$absgit" "$here/$N" "$here/$N" sub/sub/ &&
+		try_case $N/sub/sub "$here/$N" "$here/$N/.git" \
+			"$absgit" "$here/$N" "$here/$N" sub/sub/ &&
+		try_case $N/sub/sub ../.. "$here/$N/.git" \
+			"$absgit" "$here/$N" "$here/$N" sub/sub/
+	
+ok 105 - #31: explicit GIT_WORK_TREE and GIT_DIR in subdir
+
+expecting success: 
+		try_case $N "$here/$N/wt" .git \
+			"$dotgit" "$here/$N/wt" "$here/$N" "(null)" &&
+		try_case $N wt .git \
+			"$dotgit" "$here/$N/wt" "$here/$N" "(null)" &&
+		try_case $N wt "$here/$N/.git" \
+			"$absgit" "$here/$N/wt" "$here/$N" "(null)" &&
+		try_case $N "$here/$N/wt" "$here/$N/.git" \
+			"$absgit" "$here/$N/wt" "$here/$N" "(null)"
+	
+ok 106 - #31: explicit GIT_WORK_TREE from parent of worktree
+
+expecting success: 
+		try_case $N/sub/sub "$here/$N/wt" ../../.git \
+			"$dotdotgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)" &&
+		try_case $N/sub/sub ../../wt ../../.git \
+			"$dotdotgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)" &&
+		try_case $N/sub/sub ../../wt "$here/$N/.git" \
+			"$absgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)" &&
+		try_case $N/sub/sub "$here/$N/wt" "$here/$N/.git" \
+			"$absgit" "$here/$N/wt" "$here/$N/sub/sub" "(null)"
+	
+ok 107 - #31: explicit GIT_WORK_TREE from nephew of worktree
+
+expecting success: 
+		try_case $N "$here" .git \
+			"$absgit" "$here" "$here" $N/ &&
+		try_case $N .. .git \
+			"$absgit" "$here" "$here" $N/ &&
+		try_case $N .. "$here/$N/.git" \
+			"$absgit" "$here" "$here" $N/ &&
+		try_case $N "$here" "$here/$N/.git" \
+			"$absgit" "$here" "$here" $N/
+	
+ok 108 - #31: chdir_to_toplevel uses worktree, not git dir
+
+expecting success: 
+		try_case $N/sub/sub "$here" ../../.git \
+			"$absgit" "$here" "$here" $N/sub/sub/ &&
+		try_case $N/sub/sub ../../.. ../../.git \
+			"$absgit" "$here" "$here" $N/sub/sub/ &&
+		try_case $N/sub/sub ../../../ "$here/$N/.git" \
+			"$absgit" "$here" "$here" $N/sub/sub/ &&
+		try_case $N/sub/sub "$here" "$here/$N/.git" \
+			"$absgit" "$here" "$here" $N/sub/sub/
+	
+ok 109 - #31: chdir_to_toplevel uses worktree (from subdir)
+
+# passed all 109 test(s)
+1..109
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
 *** t3301-notes.sh ***
@@ -69795,1014 +70872,185 @@
 1..134
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t3408-rebase-multi-line.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3408-rebase-multi-line/.git/
+*** t3416-rebase-onto-threedots.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3416-rebase-onto-threedots/.git/
 expecting success: 
-
-	>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." &&
-
+	test_commit A &&
+	test_commit B &&
 	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_commit C &&
+	git branch topic &&
+	git checkout side &&
+	test_commit H &&
+	git checkout master &&
 	test_tick &&
-	git commit -m third &&
-	echo hello >afile &&
+	git merge H &&
+	git tag D &&
+	test_commit E &&
+	git checkout topic &&
+	test_commit F &&
+	test_commit G &&
+	git checkout side &&
 	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
+	git merge C &&
+	git tag I &&
+	test_commit J &&
+	test_commit K
 
-[master (root-commit) 1bd44cb] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 file
-[master 1708bf0] A sample commit log message that has a long summary that spills over multiple lines.
+[master (root-commit) 0ddfaf1] A
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-HEAD is now at 1bd44cb initial
-[master e79e348] second
+ create mode 100644 A.t
+[master d9df450] B
  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
+ 1 file changed, 1 insertion(+)
+ create mode 100644 B.t
+[master 35a8500] C
  Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 afile
-[side2 5efd714] fourth
+ 1 file changed, 1 insertion(+)
+ create mode 100644 C.t
+Switched to branch 'side'
+[side e9f30f6] H
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-Switched to a new branch 'side-merge'
-HEAD is now at e79e348 second
+ create mode 100644 H.t
+Switched to branch 'master'
 Merging:
-e79e348 second
-virtual side2
+35a8500 C
+virtual H
 found 1 common ancestor:
-e79e348 second
+d9df450 B
 Merge made by the 'recursive' strategy.
- afile | 1 +
+ H.t | 1 +
  1 file changed, 1 insertion(+)
- create mode 100644 afile
-ok 1 - setup
-
-expecting success: 
-
-	git checkout side &&
-	git rebase master &&
-	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'
-First, rewinding head to replay your work on top of it...
-Applying: A sample commit log message that has a long
-ok 2 - rebase
-
-checking prerequisite: REBASE_P
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
-	test -z "$GIT_TEST_SKIP_REBASE_P"
-
-)
-prerequisite REBASE_P ok
-expecting success: 
-
-	git checkout side-merge &&
-	git rebase -p side &&
-	git cat-file commit HEAD | sed -e "1,/^\$/d" >actual &&
-	git cat-file commit side-merge-original | sed -e "1,/^\$/d" >expect &&
-	test_cmp expect actual
-
-
-Switched to branch 'side-merge'
-Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated refs/heads/side-merge.
-ok 3 - rebasep
-
-# passed all 3 test(s)
-1..3
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t3407-rebase-abort.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3407-rebase-abort/.git/
-expecting success: 
-	mkdir -p "$work_dir" &&
-	cd "$work_dir" &&
-	git init &&
-	echo a > a &&
-	git add a &&
-	git commit -m a &&
-	git branch to-rebase &&
-
-	echo b > a &&
-	git commit -a -m b &&
-	echo c > a &&
-	git commit -a -m c &&
-
-	git checkout to-rebase &&
-	echo d > a &&
-	git commit -a -m "merge should fail on this" &&
-	echo e > a &&
-	git commit -a -m "merge should fail on this, too" &&
-	git branch pre-rebase
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3407-rebase-abort/test dir/.git/
-[master (root-commit) dd0c555] a
+ create mode 100644 H.t
+[master 0cd72fb] E
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 a
-[master 6e8cce3] b
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[master d4f4394] c
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to branch 'to-rebase'
-[to-rebase e9a74cc] merge should fail on this
+ create mode 100644 E.t
+Switched to branch 'topic'
+[topic 0fb828b] F
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[to-rebase f4831fc] merge should fail on this, too
+ 1 file changed, 1 insertion(+)
+ create mode 100644 F.t
+[topic a08c965] G
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 1 - setup
-
-expecting success: 
-		cd "$work_dir" &&
-		# Clean up the state from the previous one
-		git reset --hard pre-rebase &&
-		test_must_fail git rebase$type master &&
-		test_path_is_dir "$dotest" &&
-		git rebase --abort &&
-		test $(git rev-parse to-rebase) = $(git rev-parse pre-rebase) &&
-		test ! -d "$dotest"
-	
-HEAD is now at f4831fc 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:
-d4f4394 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' to see the failed patch
-Patch failed at 0001 merge should fail on this
-
-Resolve all conflicts manually, mark them as resolved with
-"git add/rm <conflicted_files>", then run "git rebase --continue".
-You can instead skip this commit: run "git rebase --skip".
-To abort and get back to the state before "git rebase", run "git rebase --abort".
-
-ok 2 - rebase --abort
-
-expecting success: 
-		cd "$work_dir" &&
-		# Clean up the state from the previous one
-		git reset --hard pre-rebase &&
-		test_must_fail git rebase$type master &&
-		test_path_is_dir "$dotest" &&
-		test_must_fail git rebase --skip &&
-		test $(git rev-parse HEAD) = $(git rev-parse master) &&
-		git rebase --abort &&
-		test $(git rev-parse to-rebase) = $(git rev-parse pre-rebase) &&
-		test ! -d "$dotest"
-	
-HEAD is now at f4831fc 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:
-d4f4394 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' to see the failed patch
-Patch failed at 0001 merge should fail on this
-
-Resolve all conflicts manually, mark them as resolved with
-"git add/rm <conflicted_files>", then run "git rebase --continue".
-You can instead skip this commit: run "git rebase --skip".
-To abort and get back to the state before "git rebase", run "git rebase --abort".
-
-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:
-d4f4394 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' to see the failed patch
-Patch failed at 0002 merge should fail on this, too
-
-Resolve all conflicts manually, mark them as resolved with
-"git add/rm <conflicted_files>", then run "git rebase --continue".
-You can instead skip this commit: run "git rebase --skip".
-To abort and get back to the state before "git rebase", run "git rebase --abort".
-
-ok 3 - rebase --abort after --skip
-
-expecting success: 
-		cd "$work_dir" &&
-		# Clean up the state from the previous one
-		git reset --hard pre-rebase &&
-		test_must_fail git rebase$type master &&
-		test_path_is_dir "$dotest" &&
-		echo c > a &&
-		echo d >> a &&
-		git add a &&
-		test_must_fail git rebase --continue &&
-		test $(git rev-parse HEAD) != $(git rev-parse master) &&
-		git rebase --abort &&
-		test $(git rev-parse to-rebase) = $(git rev-parse pre-rebase) &&
-		test ! -d "$dotest"
-	
-HEAD is now at f4831fc 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:
-d4f4394 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' to see the failed patch
-Patch failed at 0001 merge should fail on this
-
-Resolve all conflicts manually, mark them as resolved with
-"git add/rm <conflicted_files>", then run "git rebase --continue".
-You can instead skip this commit: run "git rebase --skip".
-To abort and get back to the state before "git rebase", run "git rebase --abort".
-
-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:
-c2fbc75 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' to see the failed patch
-Patch failed at 0002 merge should fail on this, too
-
-Resolve all conflicts manually, mark them as resolved with
-"git add/rm <conflicted_files>", then run "git rebase --continue".
-You can instead skip this commit: run "git rebase --skip".
-To abort and get back to the state before "git rebase", run "git rebase --abort".
-
-ok 4 - rebase --abort after --continue
-
-expecting success: 
-		cd "$work_dir" &&
-		# 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 master &&
-		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 f4831fc 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:
-d4f4394 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' to see the failed patch
-Patch failed at 0001 merge should fail on this
-
-Resolve all conflicts manually, mark them as resolved with
-"git add/rm <conflicted_files>", then run "git rebase --continue".
-You can instead skip this commit: run "git rebase --skip".
-To abort and get back to the state before "git rebase", run "git rebase --abort".
-
-ok 5 - rebase --abort does not update reflog
-
-expecting success: 
-		cd "$work_dir" &&
-		# Clean up the state from the previous one
-		git reset --hard pre-rebase &&
-		test_must_fail git rebase$type master &&
-		test_must_fail git rebase -v --abort &&
-		test_must_fail git rebase --abort -v &&
-		git rebase --abort
-	
-HEAD is now at f4831fc 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:
-d4f4394 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' to see the failed patch
-Patch failed at 0001 merge should fail on this
-
-Resolve all conflicts manually, mark them as resolved with
-"git add/rm <conflicted_files>", then run "git rebase --continue".
-You can instead skip this commit: run "git rebase --skip".
-To abort and get back to the state before "git rebase", run "git rebase --abort".
-
-usage: git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] [<upstream>] [<branch>]
-   or: git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]
-   or: git rebase --continue | --abort | --skip | --edit-todo
-
-    --onto <revision>     rebase onto given branch instead of upstream
-    --no-verify           allow pre-rebase hook to run
-    -q, --quiet           be quiet. implies --no-stat
-    -v, --verbose         display a diffstat of what changed upstream
-    -n, --no-stat         do not show diffstat of what changed upstream
-    --signoff             add a Signed-off-by: line to each commit
-    --ignore-whitespace   passed to 'git am'
-    --committer-date-is-author-date
-                          passed to 'git am'
-    --ignore-date         passed to 'git am'
-    -C <n>                passed to 'git apply'
-    --whitespace <action>
-                          passed to 'git apply'
-    -f, --force-rebase    cherry-pick all commits, even if unchanged
-    --no-ff               cherry-pick all commits, even if unchanged
-    --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
-    -m, --merge           use merging strategies to rebase
-    -i, --interactive     let the user edit the list of commits to rebase
-    -p, --preserve-merges
-                          try to recreate merges instead of ignoring them
-    --rerere-autoupdate   allow rerere to update index with resolved conflict
-    -k, --keep-empty      preserve empty commits during rebase
-    --autosquash          move commits that begin with squash!/fixup! under -i
-    -S, --gpg-sign[=<key-id>]
-                          GPG-sign commits
-    --autostash           automatically stash/stash pop before and after
-    -x, --exec <exec>     add exec lines after each commit of the editable list
-    --allow-empty-message
-                          allow rebasing commits with empty messages
-    -r, --rebase-merges[=<mode>]
-                          try to rebase merges instead of skipping them
-    --fork-point          use 'merge-base --fork-point' to refine upstream
-    -s, --strategy <strategy>
-                          use the given merge strategy
-    -X, --strategy-option <option>
-                          pass the argument through to the merge strategy
-    --root                rebase all reachable commits up to the root(s)
-
-usage: git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] [<upstream>] [<branch>]
-   or: git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]
-   or: git rebase --continue | --abort | --skip | --edit-todo
-
-    --onto <revision>     rebase onto given branch instead of upstream
-    --no-verify           allow pre-rebase hook to run
-    -q, --quiet           be quiet. implies --no-stat
-    -v, --verbose         display a diffstat of what changed upstream
-    -n, --no-stat         do not show diffstat of what changed upstream
-    --signoff             add a Signed-off-by: line to each commit
-    --ignore-whitespace   passed to 'git am'
-    --committer-date-is-author-date
-                          passed to 'git am'
-    --ignore-date         passed to 'git am'
-    -C <n>                passed to 'git apply'
-    --whitespace <action>
-                          passed to 'git apply'
-    -f, --force-rebase    cherry-pick all commits, even if unchanged
-    --no-ff               cherry-pick all commits, even if unchanged
-    --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
-    -m, --merge           use merging strategies to rebase
-    -i, --interactive     let the user edit the list of commits to rebase
-    -p, --preserve-merges
-                          try to recreate merges instead of ignoring them
-    --rerere-autoupdate   allow rerere to update index with resolved conflict
-    -k, --keep-empty      preserve empty commits during rebase
-    --autosquash          move commits that begin with squash!/fixup! under -i
-    -S, --gpg-sign[=<key-id>]
-                          GPG-sign commits
-    --autostash           automatically stash/stash pop before and after
-    -x, --exec <exec>     add exec lines after each commit of the editable list
-    --allow-empty-message
-                          allow rebasing commits with empty messages
-    -r, --rebase-merges[=<mode>]
-                          try to rebase merges instead of skipping them
-    --fork-point          use 'merge-base --fork-point' to refine upstream
-    -s, --strategy <strategy>
-                          use the given merge strategy
-    -X, --strategy-option <option>
-                          pass the argument through to the merge strategy
-    --root                rebase all reachable commits up to the root(s)
-
-ok 6 - rebase --abort can not be used with other options
-
-expecting success: 
-		cd "$work_dir" &&
-		# Clean up the state from the previous one
-		git reset --hard pre-rebase &&
-		test_must_fail git rebase$type master &&
-		test_path_is_dir "$dotest" &&
-		git rebase --abort &&
-		test $(git rev-parse to-rebase) = $(git rev-parse pre-rebase) &&
-		test ! -d "$dotest"
-	
-HEAD is now at f4831fc merge should fail on this, too
-First, rewinding head to replay your work on top of it...
-Merging master with HEAD~1
-Merging:
-d4f4394 c
-e9a74cc merge should fail on this
-found 1 common ancestor:
-dd0c555 a
-Auto-merging a
-CONFLICT (content): Merge conflict in a
-
-Resolve all conflicts manually, mark them as resolved with
-"git add/rm <conflicted_files>", then run "git rebase --continue".
-You can instead skip this commit: run "git rebase --skip".
-To abort and get back to the state before "git rebase", run "git rebase --abort".
-
-ok 7 - rebase --merge --abort
-
-expecting success: 
-		cd "$work_dir" &&
-		# Clean up the state from the previous one
-		git reset --hard pre-rebase &&
-		test_must_fail git rebase$type master &&
-		test_path_is_dir "$dotest" &&
-		test_must_fail git rebase --skip &&
-		test $(git rev-parse HEAD) = $(git rev-parse master) &&
-		git rebase --abort &&
-		test $(git rev-parse to-rebase) = $(git rev-parse pre-rebase) &&
-		test ! -d "$dotest"
-	
-HEAD is now at f4831fc merge should fail on this, too
-First, rewinding head to replay your work on top of it...
-Merging master with HEAD~1
-Merging:
-d4f4394 c
-e9a74cc merge should fail on this
-found 1 common ancestor:
-dd0c555 a
-Auto-merging a
-CONFLICT (content): Merge conflict in a
-
-Resolve all conflicts manually, mark them as resolved with
-"git add/rm <conflicted_files>", then run "git rebase --continue".
-You can instead skip this commit: run "git rebase --skip".
-To abort and get back to the state before "git rebase", run "git rebase --abort".
-
-Merging master with HEAD~0
-Merging:
-d4f4394 c
-f4831fc merge should fail on this, too
-found 1 common ancestor:
-e9a74cc merge should fail on this
-Auto-merging a
-CONFLICT (content): Merge conflict in a
-
-Resolve all conflicts manually, mark them as resolved with
-"git add/rm <conflicted_files>", then run "git rebase --continue".
-You can instead skip this commit: run "git rebase --skip".
-To abort and get back to the state before "git rebase", run "git rebase --abort".
-
-ok 8 - rebase --merge --abort after --skip
-
-expecting success: 
-		cd "$work_dir" &&
-		# Clean up the state from the previous one
-		git reset --hard pre-rebase &&
-		test_must_fail git rebase$type master &&
-		test_path_is_dir "$dotest" &&
-		echo c > a &&
-		echo d >> a &&
-		git add a &&
-		test_must_fail git rebase --continue &&
-		test $(git rev-parse HEAD) != $(git rev-parse master) &&
-		git rebase --abort &&
-		test $(git rev-parse to-rebase) = $(git rev-parse pre-rebase) &&
-		test ! -d "$dotest"
-	
-HEAD is now at f4831fc merge should fail on this, too
-First, rewinding head to replay your work on top of it...
-Merging master with HEAD~1
+ 1 file changed, 1 insertion(+)
+ create mode 100644 G.t
+Switched to branch 'side'
 Merging:
-d4f4394 c
-e9a74cc merge should fail on this
+e9f30f6 H
+virtual C
 found 1 common ancestor:
-dd0c555 a
-Auto-merging a
-CONFLICT (content): Merge conflict in a
-
-Resolve all conflicts manually, mark them as resolved with
-"git add/rm <conflicted_files>", then run "git rebase --continue".
-You can instead skip this commit: run "git rebase --skip".
-To abort and get back to the state before "git rebase", run "git rebase --abort".
-
-[detached HEAD 6fa3352] merge should fail on this
+d9df450 B
+Merge made by the 'recursive' strategy.
+ C.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 C.t
+[side 9eed7bf] J
  Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:05:29 2021 +0000
  1 file changed, 1 insertion(+)
-Committed: 0001 merge should fail on this
-Merging master with HEAD~0
-Merging:
-6fa3352 merge should fail on this
-f4831fc merge should fail on this, too
-found 1 common ancestor:
-e9a74cc merge should fail on this
-Auto-merging a
-CONFLICT (content): Merge conflict in a
-
-Resolve all conflicts manually, mark them as resolved with
-"git add/rm <conflicted_files>", then run "git rebase --continue".
-You can instead skip this commit: run "git rebase --skip".
-To abort and get back to the state before "git rebase", run "git rebase --abort".
-
-ok 9 - rebase --merge --abort after --continue
+ create mode 100644 J.t
+[side 4d3c411] K
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 K.t
+ok 1 - setup
 
 expecting success: 
-		cd "$work_dir" &&
-		# 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 master &&
-		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 f4831fc merge should fail on this, too
-First, rewinding head to replay your work on top of it...
-Merging master with HEAD~1
-Merging:
-d4f4394 c
-e9a74cc merge should fail on this
-found 1 common ancestor:
-dd0c555 a
-Auto-merging a
-CONFLICT (content): Merge conflict in a
-
-Resolve all conflicts manually, mark them as resolved with
-"git add/rm <conflicted_files>", then run "git rebase --continue".
-You can instead skip this commit: run "git rebase --skip".
-To abort and get back to the state before "git rebase", run "git rebase --abort".
+	git reset --hard &&
+	git checkout topic &&
+	git reset --hard G &&
 
-ok 10 - rebase --merge --abort does not update reflog
+	git rebase --onto master...topic F &&
+	git rev-parse HEAD^1 >actual &&
+	git rev-parse C^0 >expect &&
+	test_cmp expect actual
 
-expecting success: 
-		cd "$work_dir" &&
-		# Clean up the state from the previous one
-		git reset --hard pre-rebase &&
-		test_must_fail git rebase$type master &&
-		test_must_fail git rebase -v --abort &&
-		test_must_fail git rebase --abort -v &&
-		git rebase --abort
-	
-HEAD is now at f4831fc merge should fail on this, too
+HEAD is now at 4d3c411 K
+Switched to branch 'topic'
+HEAD is now at a08c965 G
 First, rewinding head to replay your work on top of it...
-Merging master with HEAD~1
-Merging:
-d4f4394 c
-e9a74cc merge should fail on this
-found 1 common ancestor:
-dd0c555 a
-Auto-merging a
-CONFLICT (content): Merge conflict in a
-
-Resolve all conflicts manually, mark them as resolved with
-"git add/rm <conflicted_files>", then run "git rebase --continue".
-You can instead skip this commit: run "git rebase --skip".
-To abort and get back to the state before "git rebase", run "git rebase --abort".
-
-usage: git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] [<upstream>] [<branch>]
-   or: git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]
-   or: git rebase --continue | --abort | --skip | --edit-todo
-
-    --onto <revision>     rebase onto given branch instead of upstream
-    --no-verify           allow pre-rebase hook to run
-    -q, --quiet           be quiet. implies --no-stat
-    -v, --verbose         display a diffstat of what changed upstream
-    -n, --no-stat         do not show diffstat of what changed upstream
-    --signoff             add a Signed-off-by: line to each commit
-    --ignore-whitespace   passed to 'git am'
-    --committer-date-is-author-date
-                          passed to 'git am'
-    --ignore-date         passed to 'git am'
-    -C <n>                passed to 'git apply'
-    --whitespace <action>
-                          passed to 'git apply'
-    -f, --force-rebase    cherry-pick all commits, even if unchanged
-    --no-ff               cherry-pick all commits, even if unchanged
-    --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
-    -m, --merge           use merging strategies to rebase
-    -i, --interactive     let the user edit the list of commits to rebase
-    -p, --preserve-merges
-                          try to recreate merges instead of ignoring them
-    --rerere-autoupdate   allow rerere to update index with resolved conflict
-    -k, --keep-empty      preserve empty commits during rebase
-    --autosquash          move commits that begin with squash!/fixup! under -i
-    -S, --gpg-sign[=<key-id>]
-                          GPG-sign commits
-    --autostash           automatically stash/stash pop before and after
-    -x, --exec <exec>     add exec lines after each commit of the editable list
-    --allow-empty-message
-                          allow rebasing commits with empty messages
-    -r, --rebase-merges[=<mode>]
-                          try to rebase merges instead of skipping them
-    --fork-point          use 'merge-base --fork-point' to refine upstream
-    -s, --strategy <strategy>
-                          use the given merge strategy
-    -X, --strategy-option <option>
-                          pass the argument through to the merge strategy
-    --root                rebase all reachable commits up to the root(s)
-
-usage: git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] [<upstream>] [<branch>]
-   or: git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]
-   or: git rebase --continue | --abort | --skip | --edit-todo
-
-    --onto <revision>     rebase onto given branch instead of upstream
-    --no-verify           allow pre-rebase hook to run
-    -q, --quiet           be quiet. implies --no-stat
-    -v, --verbose         display a diffstat of what changed upstream
-    -n, --no-stat         do not show diffstat of what changed upstream
-    --signoff             add a Signed-off-by: line to each commit
-    --ignore-whitespace   passed to 'git am'
-    --committer-date-is-author-date
-                          passed to 'git am'
-    --ignore-date         passed to 'git am'
-    -C <n>                passed to 'git apply'
-    --whitespace <action>
-                          passed to 'git apply'
-    -f, --force-rebase    cherry-pick all commits, even if unchanged
-    --no-ff               cherry-pick all commits, even if unchanged
-    --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
-    -m, --merge           use merging strategies to rebase
-    -i, --interactive     let the user edit the list of commits to rebase
-    -p, --preserve-merges
-                          try to recreate merges instead of ignoring them
-    --rerere-autoupdate   allow rerere to update index with resolved conflict
-    -k, --keep-empty      preserve empty commits during rebase
-    --autosquash          move commits that begin with squash!/fixup! under -i
-    -S, --gpg-sign[=<key-id>]
-                          GPG-sign commits
-    --autostash           automatically stash/stash pop before and after
-    -x, --exec <exec>     add exec lines after each commit of the editable list
-    --allow-empty-message
-                          allow rebasing commits with empty messages
-    -r, --rebase-merges[=<mode>]
-                          try to rebase merges instead of skipping them
-    --fork-point          use 'merge-base --fork-point' to refine upstream
-    -s, --strategy <strategy>
-                          use the given merge strategy
-    -X, --strategy-option <option>
-                          pass the argument through to the merge strategy
-    --root                rebase all reachable commits up to the root(s)
-
-ok 11 - rebase --abort can not be used with other options
+Applying: G
+ok 2 - rebase --onto master...topic
 
 expecting success: 
-	cd "$work_dir" &&
-	# Clean up the state from the previous one
-	git reset --hard pre-rebase &&
-	test_must_fail git rebase master &&
-	test_path_is_dir .git/rebase-apply &&
-	head_before=$(git rev-parse HEAD) &&
-	git rebase --quit &&
-	test $(git rev-parse HEAD) = $head_before &&
-	test ! -d .git/rebase-apply
-
-HEAD is now at f4831fc 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:
-d4f4394 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' to see the failed patch
-Patch failed at 0001 merge should fail on this
-
-Resolve all conflicts manually, mark them as resolved with
-"git add/rm <conflicted_files>", then run "git rebase --continue".
-You can instead skip this commit: run "git rebase --skip".
-To abort and get back to the state before "git rebase", run "git rebase --abort".
-
-ok 12 - rebase --quit
+	git reset --hard &&
+	git checkout topic &&
+	git reset --hard G &&
 
-expecting success: 
-	cd "$work_dir" &&
-	# Clean up the state from the previous one
-	git reset --hard pre-rebase &&
-	test_must_fail git rebase --merge master &&
-	test_path_is_dir .git/rebase-merge &&
-	head_before=$(git rev-parse HEAD) &&
-	git rebase --quit &&
-	test $(git rev-parse HEAD) = $head_before &&
-	test ! -d .git/rebase-merge
+	git rebase --onto master... F &&
+	git rev-parse HEAD^1 >actual &&
+	git rev-parse C^0 >expect &&
+	test_cmp expect actual
 
-HEAD is now at f4831fc merge should fail on this, too
+HEAD is now at f576ef2 G
+Already on 'topic'
+HEAD is now at a08c965 G
 First, rewinding head to replay your work on top of it...
-Merging master with HEAD~1
-Merging:
-d4f4394 c
-e9a74cc merge should fail on this
-found 1 common ancestor:
-dd0c555 a
-Auto-merging a
-CONFLICT (content): Merge conflict in a
-
-Resolve all conflicts manually, mark them as resolved with
-"git add/rm <conflicted_files>", then run "git rebase --continue".
-You can instead skip this commit: run "git rebase --skip".
-To abort and get back to the state before "git rebase", run "git rebase --abort".
-
-ok 13 - rebase --merge --quit
-
-# passed all 13 test(s)
-1..13
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t3410-rebase-preserve-dropped-merges.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3410-rebase-preserve-dropped-merges/.git/
-checking prerequisite: REBASE_P
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
-	test -z "$GIT_TEST_SKIP_REBASE_P"
+Applying: G
+ok 3 - rebase --onto master...
 
-)
-prerequisite REBASE_P ok
 expecting success: 
-	test_commit A file1 &&
-	test_commit B file1 1 &&
-	test_commit C file2 &&
-	test_commit D file1 2 &&
-	test_commit E file3 &&
-	git checkout A &&
-	test_commit F file4 &&
-	test_commit G file1 3 &&
-	test_commit H file5 &&
-	git checkout F &&
-	test_commit I file6
-
-[master (root-commit) 6e62bf8] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file1
-[master 5c95b17] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[master 7be4cc1] C
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file2
-[master 3d13cae] D
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[master 1fe5a44] E
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file3
-Note: checking out '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 performing another checkout.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
+	git reset --hard &&
+	git checkout side &&
+	git reset --hard K &&
 
-  git checkout -b <new-branch-name>
+	test_must_fail git rebase --onto master...side J
 
-HEAD is now at 6e62bf8 A
-[detached HEAD cfefd94] F
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file4
-[detached HEAD 66ee775] G
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[detached HEAD 25e63b2] H
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file5
-Previous HEAD position was 25e63b2 H
-HEAD is now at cfefd94 F
-[detached HEAD 615be62] I
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file6
-ok 1 - setup
+HEAD is now at f576ef2 G
+Switched to branch 'side'
+HEAD is now at 4d3c411 K
+fatal: 'master...side': need exactly one merge base
+ok 4 - rebase --onto master...side
 
 expecting success: 
-	git checkout H &&
-	test_must_fail git merge E &&
-	test_commit L file1 23 &&
-	git checkout I &&
-	test_commit G2 file1 3 &&
-	test_must_fail git merge E &&
-	test_commit J file1 23 &&
-	test_commit K file7 file7 &&
-	git rebase -i -p L &&
-	test $(git rev-parse HEAD^^) = $(git rev-parse L) &&
-	test "23" = "$(cat file1)" &&
-	test "I" = "$(cat file6)" &&
-	test "file7" = "$(cat file7)"
+	git reset --hard &&
+	git checkout topic &&
+	git reset --hard G &&
+	set_fake_editor &&
+	EXPECT_COUNT=1 git rebase -i --onto master...topic F &&
+	git rev-parse HEAD^1 >actual &&
+	git rev-parse C^0 >expect &&
+	test_cmp expect actual
 
-Previous HEAD position was 615be62 I
-HEAD is now at 25e63b2 H
-Merging:
-25e63b2 H
-virtual E
-found 1 common ancestor:
-6e62bf8 A
-Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-Automatic merge failed; fix conflicts and then commit the result.
-[detached HEAD 70a312a] L
- Author: A U Thor <author@example.com>
-Previous HEAD position was 70a312a L
-HEAD is now at 615be62 I
-[detached HEAD 93b50ed] G2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Merging:
-93b50ed G2
-virtual E
-found 1 common ancestor:
-6e62bf8 A
-Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-Automatic merge failed; fix conflicts and then commit the result.
-[detached HEAD 6b192df] J
- Author: A U Thor <author@example.com>
-[detached HEAD 273eec6] K
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file7
-Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated detached HEAD.
-ok 2 - skip same-resolution merges with -p
+HEAD is now at 4d3c411 K
+Switched to branch 'topic'
+HEAD is now at a08c965 G
+Rebasing (1/1)
Successfully rebased and updated refs/heads/topic.
+ok 5 - rebase -i --onto master...topic
 
 expecting success: 
-	git checkout H &&
-	test_must_fail git merge E &&
-	test_commit L2 file1 23 &&
-	git checkout I &&
-	test_commit G3 file1 4 &&
-	test_must_fail git merge E &&
-	test_commit J2 file1 24 &&
-	test_commit K2 file7 file7 &&
-	test_must_fail git rebase -i -p L2 &&
-	echo 234 > file1 &&
-	git add file1 &&
-	git rebase --continue &&
-	test $(git rev-parse HEAD^^^) = $(git rev-parse L2) &&
-	test "234" = "$(cat file1)" &&
-	test "I" = "$(cat file6)" &&
-	test "file7" = "$(cat file7)"
-
-Warning: you are leaving 2 commits behind, not connected to
-any of your branches:
-
-  519f02c K
-  e785c42 I
+	git reset --hard &&
+	git checkout topic &&
+	git reset --hard G &&
+	set_fake_editor &&
+	EXPECT_COUNT=1 git rebase -i --onto master... F &&
+	git rev-parse HEAD^1 >actual &&
+	git rev-parse C^0 >expect &&
+	test_cmp expect actual
 
-If you want to keep them by creating a new branch, this may be a good time
-to do so with:
+HEAD is now at f576ef2 G
+Already on 'topic'
+HEAD is now at a08c965 G
+Rebasing (1/1)
Successfully rebased and updated refs/heads/topic.
+ok 6 - rebase -i --onto master...
 
- git branch <new-branch-name> 519f02c
+expecting success: 
+	git reset --hard &&
+	git checkout side &&
+	git reset --hard K &&
 
-HEAD is now at 25e63b2 H
-Merging:
-25e63b2 H
-virtual E
-found 1 common ancestor:
-6e62bf8 A
-Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-Automatic merge failed; fix conflicts and then commit the result.
-[detached HEAD 4c4dd24] L2
- Author: A U Thor <author@example.com>
-Previous HEAD position was 4c4dd24 L2
-HEAD is now at 615be62 I
-[detached HEAD 6e00aee] G3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Merging:
-6e00aee G3
-virtual E
-found 1 common ancestor:
-6e62bf8 A
-Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-Automatic merge failed; fix conflicts and then commit the result.
-[detached HEAD 4917c92] J2
- Author: A U Thor <author@example.com>
-[detached HEAD c670ef0] K2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file7
-Rebasing (1/4)
Rebasing (2/4)
Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-error: could not apply 6e00aee... G3
+	test_must_fail git rebase -i --onto master...side J
 
-Resolve all conflicts manually, mark them as resolved with
-"git add/rm <conflicted_files>", then run "git rebase --continue".
-You can instead skip this commit: run "git rebase --skip".
-To abort and get back to the state before "git rebase", run "git rebase --abort".
-Could not pick 6e00aee07e42a4daf7ffd5d296964868ea26ad79
-[detached HEAD ff7174a] G3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Rebasing (3/4)
Rebasing (4/4)
Successfully rebased and updated detached HEAD.
-ok 3 - keep different-resolution merges with -p
+HEAD is now at f576ef2 G
+Switched to branch 'side'
+HEAD is now at 4d3c411 K
+fatal: 'master...side': need exactly one merge base
+ok 7 - rebase -i --onto master...side
 
-# passed all 3 test(s)
-1..3
+# passed all 7 test(s)
+1..7
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
 *** t3413-rebase-hook.sh ***
@@ -71021,187 +71269,6 @@
 1..15
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t3416-rebase-onto-threedots.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3416-rebase-onto-threedots/.git/
-expecting success: 
-	test_commit A &&
-	test_commit B &&
-	git branch side &&
-	test_commit C &&
-	git branch topic &&
-	git checkout side &&
-	test_commit H &&
-	git checkout master &&
-	test_tick &&
-	git merge H &&
-	git tag D &&
-	test_commit E &&
-	git checkout topic &&
-	test_commit F &&
-	test_commit G &&
-	git checkout side &&
-	test_tick &&
-	git merge C &&
-	git tag I &&
-	test_commit J &&
-	test_commit K
-
-[master (root-commit) 0ddfaf1] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.t
-[master d9df450] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 B.t
-[master 35a8500] C
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 C.t
-Switched to branch 'side'
-[side e9f30f6] H
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 H.t
-Switched to branch 'master'
-Merging:
-35a8500 C
-virtual H
-found 1 common ancestor:
-d9df450 B
-Merge made by the 'recursive' strategy.
- H.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 H.t
-[master 0cd72fb] E
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 E.t
-Switched to branch 'topic'
-[topic 0fb828b] F
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 F.t
-[topic a08c965] G
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 G.t
-Switched to branch 'side'
-Merging:
-e9f30f6 H
-virtual C
-found 1 common ancestor:
-d9df450 B
-Merge made by the 'recursive' strategy.
- C.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 C.t
-[side 9eed7bf] J
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 J.t
-[side 4d3c411] K
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 K.t
-ok 1 - setup
-
-expecting success: 
-	git reset --hard &&
-	git checkout topic &&
-	git reset --hard G &&
-
-	git rebase --onto master...topic F &&
-	git rev-parse HEAD^1 >actual &&
-	git rev-parse C^0 >expect &&
-	test_cmp expect actual
-
-HEAD is now at 4d3c411 K
-Switched to branch 'topic'
-HEAD is now at a08c965 G
-First, rewinding head to replay your work on top of it...
-Applying: G
-ok 2 - rebase --onto master...topic
-
-expecting success: 
-	git reset --hard &&
-	git checkout topic &&
-	git reset --hard G &&
-
-	git rebase --onto master... F &&
-	git rev-parse HEAD^1 >actual &&
-	git rev-parse C^0 >expect &&
-	test_cmp expect actual
-
-HEAD is now at f576ef2 G
-Already on 'topic'
-HEAD is now at a08c965 G
-First, rewinding head to replay your work on top of it...
-Applying: G
-ok 3 - rebase --onto master...
-
-expecting success: 
-	git reset --hard &&
-	git checkout side &&
-	git reset --hard K &&
-
-	test_must_fail git rebase --onto master...side J
-
-HEAD is now at f576ef2 G
-Switched to branch 'side'
-HEAD is now at 4d3c411 K
-fatal: 'master...side': need exactly one merge base
-ok 4 - rebase --onto master...side
-
-expecting success: 
-	git reset --hard &&
-	git checkout topic &&
-	git reset --hard G &&
-	set_fake_editor &&
-	EXPECT_COUNT=1 git rebase -i --onto master...topic F &&
-	git rev-parse HEAD^1 >actual &&
-	git rev-parse C^0 >expect &&
-	test_cmp expect actual
-
-HEAD is now at 4d3c411 K
-Switched to branch 'topic'
-HEAD is now at a08c965 G
-Rebasing (1/1)
Successfully rebased and updated refs/heads/topic.
-ok 5 - rebase -i --onto master...topic
-
-expecting success: 
-	git reset --hard &&
-	git checkout topic &&
-	git reset --hard G &&
-	set_fake_editor &&
-	EXPECT_COUNT=1 git rebase -i --onto master... F &&
-	git rev-parse HEAD^1 >actual &&
-	git rev-parse C^0 >expect &&
-	test_cmp expect actual
-
-HEAD is now at f576ef2 G
-Already on 'topic'
-HEAD is now at a08c965 G
-Rebasing (1/1)
Successfully rebased and updated refs/heads/topic.
-ok 6 - rebase -i --onto master...
-
-expecting success: 
-	git reset --hard &&
-	git checkout side &&
-	git reset --hard K &&
-
-	test_must_fail git rebase -i --onto master...side J
-
-HEAD is now at f576ef2 G
-Switched to branch 'side'
-HEAD is now at 4d3c411 K
-fatal: 'master...side': need exactly one merge base
-ok 7 - rebase -i --onto master...side
-
-# passed all 7 test(s)
-1..7
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
 *** t3417-rebase-whitespace-fix.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3417-rebase-whitespace-fix/.git/
 expecting success: 
@@ -71213,13 +71280,13 @@
 	git diff --exit-code HEAD^:file expect-first &&
 	test_cmp expect-second file
 
-[master (root-commit) 682ef05] Initial empty commit
+[master (root-commit) 3d63b2c] Initial empty commit
  Author: A U Thor <author@example.com>
-[master f75afdf] first
+[master c75e54c] first
  Author: A U Thor <author@example.com>
  1 file changed, 4 insertions(+)
  create mode 100644 file
-[master 8d199cc] second
+[master 87b1825] second
  Author: A U Thor <author@example.com>
  1 file changed, 7 insertions(+)
 Current branch master is up to date, rebase forced.
@@ -71234,7 +71301,7 @@
 	git diff --exit-code HEAD^:file expect-second &&
 	test_cmp expect-third file
 
-[master c307433] third
+[master 5bd8eea] third
  Author: A U Thor <author@example.com>
  1 file changed, 7 insertions(+)
 Current branch master is up to date, rebase forced.
@@ -71251,8 +71318,8 @@
 	git diff --exit-code HEAD^:file expect-second &&
 	test_cmp file third
 
-HEAD is now at fc546da second
-[master 5eb4248] third
+HEAD is now at 0fe40c7 second
+[master 5bd8eea] third
  Author: A U Thor <author@example.com>
  1 file changed, 7 insertions(+)
 Current branch master is up to date, rebase forced.
@@ -71272,10 +71339,10 @@
 	git rebase --whitespace=fix HEAD^^ &&
 	test_cmp expect-beginning file
 
-[master de749e1] beginning
+[master 28585a8] beginning
  Author: A U Thor <author@example.com>
  1 file changed, 2 insertions(+), 13 deletions(-)
-[master 45f5b38] more
+[master ba85648] more
  Author: A U Thor <author@example.com>
  1 file changed, 5 insertions(+)
 Current branch master is up to date, rebase forced.
@@ -71294,7 +71361,7 @@
 	git commit --allow-empty -m initial &&
 	git tag root
 
-[master (root-commit) 7cbc5fb] initial
+[master (root-commit) 092cb29] initial
  Author: A U Thor <author@example.com>
 ok 1 - setup
 
@@ -71318,7 +71385,7 @@
 
 		git cherry-pick master >/dev/null 2>&1
 	
-HEAD is now at 7cbc5fb initial
+HEAD is now at 092cb29 initial
 ok 2 - setup: 500 lines
 
 expecting success: 
@@ -71356,7 +71423,7 @@
 M	file
 Falling back to patching base and 3-way merge...
 Merging:
-cf6e802 add small file
+3bc5621 add small file
 virtual change big file
 found 1 common ancestor:
 virtual e5dcc7c81f494dce9da11f93c6ea59bdc75c6013
@@ -71435,8 +71502,8 @@
 1..9
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t3411-rebase-preserve-around-merges.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3411-rebase-preserve-around-merges/.git/
+*** t3409-rebase-preserve-merges.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3409-rebase-preserve-merges/.git/
 checking prerequisite: REBASE_P
 
 mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
@@ -71446,377 +71513,737 @@
 
 )
 prerequisite REBASE_P ok
-expecting success: 
-	test_commit A1 &&
-	test_commit B1 &&
-	test_commit C1 &&
-	git reset --hard B1 &&
-	test_commit D1 &&
-	test_merge E1 C1 &&
-	test_commit F1
+expecting success: echo First > A &&
+	git add A &&
+	git commit -m "Add A1" &&
+	git checkout -b topic &&
+	echo Second > B &&
+	git add B &&
+	git commit -m "Add B1" &&
+	git checkout -f master &&
+	echo Third >> A &&
+	git commit -a -m "Modify A2" &&
+	echo Fifth > B &&
+	git add B &&
+	git commit -m "Add different B" &&
 
-[master (root-commit) 6fb0b66] A1
- Author: A U Thor <author@example.com>
+	git clone ./. clone2 &&
+	(
+		cd clone2 &&
+		git checkout -b topic origin/topic &&
+		test_must_fail git merge origin/master &&
+		echo Resolved >B &&
+		git add B &&
+		git commit -m "Merge origin/master into topic"
+	) &&
+
+	git clone ./. clone3 &&
+	(
+		cd clone3 &&
+		git checkout -b topic2 origin/topic &&
+		echo Sixth > A &&
+		git commit -a -m "Modify A3" &&
+		git checkout -b topic origin/topic &&
+		git merge --no-ff topic2
+	) &&
+
+	git clone ./. clone4 &&
+	(
+		cd clone4 &&
+		git checkout -b topic2 origin/topic &&
+		echo Sixth > A &&
+		git commit -a -m "Modify A3" &&
+		git checkout -b topic origin/topic &&
+		git merge --no-ff topic2
+	) &&
+
+	git checkout topic &&
+	echo Fourth >> B &&
+	git commit -a -m "Modify B2"
+
+[master (root-commit) 7216f87] Add A1
+ Author: A U Thor <bogus_email_address>
  1 file changed, 1 insertion(+)
- create mode 100644 A1.t
-[master 37e5de5] B1
- Author: A U Thor <author@example.com>
+ create mode 100644 A
+Switched to a new branch 'topic'
+[topic 0c7d1f3] Add B1
+ Author: A U Thor <bogus_email_address>
  1 file changed, 1 insertion(+)
- create mode 100644 B1.t
-[master 9db6c33] C1
- Author: A U Thor <author@example.com>
+ create mode 100644 B
+Switched to branch 'master'
+[master 15a4f38] Modify A2
+ Author: A U Thor <bogus_email_address>
  1 file changed, 1 insertion(+)
- create mode 100644 C1.t
-HEAD is now at 37e5de5 B1
-[master 98f5076] D1
- Author: A U Thor <author@example.com>
+[master b0f1d8f] Add different B
+ Author: A U Thor <bogus_email_address>
  1 file changed, 1 insertion(+)
- create mode 100644 D1.t
+ create mode 100644 B
+Cloning into 'clone2'...
+done.
+Switched to a new branch 'topic'
+Branch 'topic' set up to track remote branch 'topic' from 'origin'.
 Merging:
-98f5076 D1
-virtual C1
+0c7d1f3 Add B1
+virtual origin/master
 found 1 common ancestor:
-37e5de5 B1
+7216f87 Add A1
+Auto-merging B
+CONFLICT (add/add): Merge conflict in B
+Automatic merge failed; fix conflicts and then commit the result.
+[topic e63c5f5] Merge origin/master into topic
+ Author: A U Thor <bogus_email_address>
+Cloning into 'clone3'...
+done.
+Switched to a new branch 'topic2'
+Branch 'topic2' set up to track remote branch 'topic' from 'origin'.
+[topic2 dae1e8b] Modify A3
+ Author: A U Thor <bogus_email_address>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'topic'
+Branch 'topic' set up to track remote branch 'topic' from 'origin'.
+Merging:
+0c7d1f3 Add B1
+virtual topic2
+found 1 common ancestor:
+0c7d1f3 Add B1
 Merge made by the 'recursive' strategy.
- C1.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 C1.t
-[master 0f3967e] F1
- Author: A U Thor <author@example.com>
+ A | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Cloning into 'clone4'...
+done.
+Switched to a new branch 'topic2'
+Branch 'topic2' set up to track remote branch 'topic' from 'origin'.
+[topic2 dae1e8b] Modify A3
+ Author: A U Thor <bogus_email_address>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'topic'
+Branch 'topic' set up to track remote branch 'topic' from 'origin'.
+Merging:
+0c7d1f3 Add B1
+virtual topic2
+found 1 common ancestor:
+0c7d1f3 Add B1
+Merge made by the 'recursive' strategy.
+ A | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to branch 'topic'
+[topic 44b41bc] Modify B2
+ Author: A U Thor <bogus_email_address>
  1 file changed, 1 insertion(+)
- create mode 100644 F1.t
-ok 1 - setup
+ok 1 - setup for merge-preserving rebase
 
 expecting success: 
-	FAKE_LINES="1 squash 4 2 3" git rebase -i -p B1 &&
-	test "$(git rev-parse HEAD^2)" = "$(git rev-parse C1)" &&
-	test "$(git rev-parse HEAD~2)" = "$(git rev-parse B1)" &&
-	git tag E2
-
-rebase -i script before editing:
-pick 98f5076 D1
-pick 9db6c33 C1
-pick b855587 E1
-pick 0f3967e F1
+	(
+	cd clone2 &&
+	git fetch &&
+	test_must_fail git rebase -p origin/topic &&
+	test 2 = $(git ls-files B | wc -l) &&
+	echo Resolved again > B &&
+	test_must_fail git rebase --continue &&
+	grep "^@@@ " .git/rebase-merge/patch &&
+	git add B &&
+	git rebase --continue &&
+	test 1 = $(git rev-list --all --pretty=oneline | grep "Modify A" | wc -l) &&
+	test 1 = $(git rev-list --all --pretty=oneline | grep "Add different" | wc -l) &&
+	test 1 = $(git rev-list --all --pretty=oneline | grep "Merge origin" | wc -l)
+	)
 
-rebase -i script after editing:
-pick 98f5076 D1
-squash 0f3967e F1
-pick 9db6c33 C1
-pick b855587 E1
-Rebasing (1/4)
Rebasing (2/4)
[detached HEAD 5d81168] D1
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:16:13 2005 -0700
- 2 files changed, 2 insertions(+)
- create mode 100644 D1.t
- create mode 100644 F1.t
-Rebasing (3/4)
Rebasing (4/4)
Successfully rebased and updated refs/heads/master.
-ok 2 - squash F1 into D1
+From /build/git-2.20.1/t/trash directory.t3409-rebase-preserve-merges/./.
+   0c7d1f3..44b41bc  topic      -> origin/topic
+Rebasing (1/1)
Merging:
+44b41bc Modify B2
+virtual b0f1d8f56a5bc319fbf0e5b3ccda2fdf38fe59e5
+found 1 common ancestor:
+7216f87 Add A1
+Auto-merging B
+CONFLICT (add/add): Merge conflict in B
+Automatic merge failed; fix conflicts and then commit the result.
+Error redoing merge e63c5f514082c814ad1e3e7fa19e91749372ce26
+B: needs merge
+You must edit all merge conflicts and then
+mark them as resolved using git add
+@@@ -1,1 -1,1 +1,1 @@@
+[detached HEAD 6049c00] Merge origin/master into topic
+ Author: A U Thor <bogus_email_address>
+Rebasing (1/1)
Successfully rebased and updated refs/heads/topic.
+ok 2 - --continue works after a conflict
 
 expecting success: 
-	git checkout A1 &&
-	test_commit G1 &&
-	test_commit H1 &&
-	test_commit I1 &&
-	git checkout -b branch3 H1 &&
-	test_commit J1 &&
-	test_merge K1 I1 &&
-	git checkout -b branch2 G1 &&
-	test_commit L1 &&
-	test_merge M1 K1 &&
-	GIT_EDITOR=: git rebase -i -p E2 &&
-	test "$(git rev-parse HEAD~3)" = "$(git rev-parse E2)" &&
-	test "$(git rev-parse HEAD~2)" = "$(git rev-parse HEAD^2^2~2)" &&
-	test "$(git rev-parse HEAD^2^1^1)" = "$(git rev-parse HEAD^2^2^1)"
+	(
+	cd clone3 &&
+	git fetch &&
+	git rebase -p origin/topic &&
+	test 3 = $(git rev-list --all --pretty=oneline | grep "Modify A" | wc -l) &&
+	test 1 = $(git rev-list --all --pretty=oneline | grep "Merge branch" | wc -l)
+	)
 
-Note: checking out 'A1'.
+From /build/git-2.20.1/t/trash directory.t3409-rebase-preserve-merges/./.
+   0c7d1f3..44b41bc  topic      -> origin/topic
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/topic.
+ok 3 - rebase -p preserves no-ff merges
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by performing another checkout.
+expecting success: 
+	(
+	cd clone4 &&
+	git fetch &&
+	git -c merge.log=1 rebase -p origin/topic &&
+	echo >expected &&
+	git log --format="%b" -1 >current &&
+	test_cmp expected current
+	)
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
+From /build/git-2.20.1/t/trash directory.t3409-rebase-preserve-merges/./.
+   0c7d1f3..44b41bc  topic      -> origin/topic
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/topic.
+ok 4 - rebase -p ignores merge.log config
 
-  git checkout -b <new-branch-name>
+# passed all 4 test(s)
+1..4
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t3415-rebase-autosquash.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3415-rebase-autosquash/.git/
+expecting success: 
+	echo 0 >file0 &&
+	git add . &&
+	test_tick &&
+	git commit -m "initial commit" &&
+	echo 0 >file1 &&
+	echo 2 >file2 &&
+	git add . &&
+	test_tick &&
+	git commit -m "first commit" &&
+	git tag first-commit &&
+	echo 3 >file3 &&
+	git add . &&
+	test_tick &&
+	git commit -m "second commit" &&
+	git tag base
 
-HEAD is now at 6fb0b66 A1
-[detached HEAD f51c4db] G1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 G1.t
-[detached HEAD 8227962] H1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 H1.t
-[detached HEAD f56baeb] I1
+[master (root-commit) d78c915] initial commit
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 I1.t
-Previous HEAD position was f56baeb I1
-Switched to a new branch 'branch3'
-[branch3 904e05f] J1
+ create mode 100644 file0
+[master 244a0fe] first commit
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 J1.t
-Merging:
-904e05f J1
-virtual I1
-found 1 common ancestor:
-8227962 H1
-Merge made by the 'recursive' strategy.
- I1.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 I1.t
-Switched to a new branch 'branch2'
-[branch2 86c413d] L1
+ 2 files changed, 2 insertions(+)
+ create mode 100644 file1
+ create mode 100644 file2
+[master f0c2a7e] second commit
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 L1.t
-Merging:
-86c413d L1
-virtual K1
-found 1 common ancestor:
-f51c4db G1
-Merge made by the 'recursive' strategy.
- H1.t | 1 +
- I1.t | 1 +
- J1.t | 1 +
- 3 files changed, 3 insertions(+)
- create mode 100644 H1.t
- create mode 100644 I1.t
- create mode 100644 J1.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/branch2.
-ok 3 - rebase two levels of merge
+ create mode 100644 file3
+ok 1 - setup
 
-# passed all 3 test(s)
-1..3
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t3311-notes-merge-fanout.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3311-notes-merge-fanout/.git/
 expecting success: 
-	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
+	test_auto_fixup final-fixup-option --autosquash
 
-ok 1 - setup a few initial commits with notes (notes ref: x)
+HEAD is now at f0c2a7e second commit
+[master e17f730] fixup! first
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated refs/heads/master.
+ok 2 - auto fixup (option)
 
 expecting success: 
-	verify_notes x commit5 &&
-	verify_no_fanout x
+	git config rebase.autosquash true &&
+	test_auto_fixup final-fixup-config-true &&
+	test_must_fail test_auto_fixup fixup-config-true-no --no-autosquash &&
+	git config rebase.autosquash false &&
+	test_must_fail test_auto_fixup final-fixup-config-false
 
-ok 2 - sanity check (x)
+HEAD is now at f0c2a7e second commit
+[master f84b6d6] fixup! first
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated refs/heads/master.
+HEAD is now at f0c2a7e second commit
+[master 03041cb] fixup! first
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Successfully rebased and updated refs/heads/master.
+test_line_count: line count for actual != 3
+03041cb fixup! first
+f0c2a7e second commit
+244a0fe first commit
+d78c915 initial commit
+HEAD is now at f0c2a7e second commit
+[master bee11d3] fixup! first
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Successfully rebased and updated refs/heads/master.
+test_line_count: line count for actual != 3
+bee11d3 fixup! first
+f0c2a7e second commit
+244a0fe first commit
+d78c915 initial commit
+ok 3 - auto fixup (config)
 
 expecting success: 
-	git update-ref refs/notes/y refs/notes/x &&
-	git config core.notesRef refs/notes/y &&
-	i=5 &&
-	while test $i -lt $num
-	do
-		i=$(($i + 1)) &&
-		test_commit "commit$i" >/dev/null &&
-		git notes add -m "notes for commit$i" || return 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
-
-ok 3 - Add a few hundred commits w/notes to trigger fanout (x -> y)
+	test_auto_squash final-squash --autosquash
 
-expecting success: verify_fanout y
-ok 4 - notes tree has fanout (y)
+HEAD is now at f0c2a7e second commit
+[master 19ce186] squash! first
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Rebasing (2/3)
[detached HEAD 9064ef2] first commit
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:14:13 2005 -0700
+ 2 files changed, 2 insertions(+)
+ create mode 100644 file1
+ create mode 100644 file2
+Rebasing (3/3)
Successfully rebased and updated refs/heads/master.
+ok 4 - auto squash (option)
 
 expecting success: 
-	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)"
+	git config rebase.autosquash true &&
+	test_auto_squash final-squash-config-true &&
+	test_must_fail test_auto_squash squash-config-true-no --no-autosquash &&
+	git config rebase.autosquash false &&
+	test_must_fail test_auto_squash final-squash-config-false
 
-Already up to date!
-ok 5 - No-op merge (already included) (x => y)
+HEAD is now at f0c2a7e second commit
+[master a95a906] squash! first
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Rebasing (2/3)
[detached HEAD 46676fa] first commit
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:14:13 2005 -0700
+ 2 files changed, 2 insertions(+)
+ create mode 100644 file1
+ create mode 100644 file2
+Rebasing (3/3)
Successfully rebased and updated refs/heads/master.
+HEAD is now at f0c2a7e second commit
+[master fc8ff6e] squash! first
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Successfully rebased and updated refs/heads/master.
+test_line_count: line count for actual != 3
+fc8ff6e squash! first
+f0c2a7e second commit
+244a0fe first commit
+d78c915 initial commit
+HEAD is now at f0c2a7e second commit
+[master 336ee2b] squash! first
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Successfully rebased and updated refs/heads/master.
+test_line_count: line count for actual != 3
+336ee2b squash! first
+f0c2a7e second commit
+244a0fe first commit
+d78c915 initial commit
+ok 5 - auto squash (config)
 
 expecting success: 
-	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)"
+	git reset --hard base &&
+	echo 1 >file1 &&
+	git add -u &&
+	test_tick &&
+	git commit -m "squash! forst" &&
+	git tag final-missquash &&
+	test_tick &&
+	git rebase --autosquash -i HEAD^^^ &&
+	git log --oneline >actual &&
+	test_line_count = 4 actual &&
+	git diff --exit-code final-missquash &&
+	test 0 = $(git rev-list final-missquash...HEAD | wc -l)
 
-Fast-forward
-ok 6 - Fast-forward merge (y => x)
+HEAD is now at f0c2a7e second commit
+[master bdc406a] squash! forst
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Successfully rebased and updated refs/heads/master.
+ok 6 - misspelled auto squash
 
 expecting success: 
-	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)
+	git reset --hard base &&
+	echo 4 >file4 &&
+	git add file4 &&
+	test_tick &&
+	git commit -m "first new commit" &&
+	echo 1 >file1 &&
+	git add -u &&
+	test_tick &&
+	git commit -m "squash! first" &&
+	git tag final-multisquash &&
+	test_tick &&
+	git rebase --autosquash -i HEAD~4 &&
+	git log --oneline >actual &&
+	test_line_count = 4 actual &&
+	git diff --exit-code final-multisquash &&
+	test 1 = "$(git cat-file blob HEAD^^:file1)" &&
+	test 2 = $(git cat-file commit HEAD^^ | grep first | wc -l) &&
+	test 1 = $(git cat-file commit HEAD | grep first | wc -l)
 
-expecting success: verify_no_fanout z
-ok 8 - notes tree has no fanout (z)
+HEAD is now at f0c2a7e second commit
+[master 671d0de] first new commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file4
+[master 1cded01] squash! first
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Rebasing (2/4)
[detached HEAD 8cc2a0e] first commit
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:14:13 2005 -0700
+ 2 files changed, 2 insertions(+)
+ create mode 100644 file1
+ create mode 100644 file2
+Rebasing (3/4)
Rebasing (4/4)
Successfully rebased and updated refs/heads/master.
+ok 7 - auto squash that matches 2 commits
 
 expecting success: 
-	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
+	git reset --hard base &&
+	echo 1 >file1 &&
+	git add -u &&
+	test_tick &&
+	git commit -m "squash! third" &&
+	echo 4 >file4 &&
+	git add file4 &&
+	test_tick &&
+	git commit -m "third commit" &&
+	git tag final-presquash &&
+	test_tick &&
+	git rebase --autosquash -i HEAD~4 &&
+	git log --oneline >actual &&
+	test_line_count = 5 actual &&
+	git diff --exit-code final-presquash &&
+	test 0 = "$(git cat-file blob HEAD^^:file1)" &&
+	test 1 = "$(git cat-file blob HEAD^:file1)" &&
+	test 1 = $(git cat-file commit HEAD | grep third | wc -l) &&
+	test 1 = $(git cat-file commit HEAD^ | grep third | wc -l)
 
-ok 9 - successful merge without conflicts (y => z)
+HEAD is now at f0c2a7e second commit
+[master 3a205cd] squash! third
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[master 76ae28b] third commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file4
+Successfully rebased and updated refs/heads/master.
+ok 8 - auto squash that matches a commit after the squash
 
-expecting success: verify_fanout m
-ok 10 - notes tree still has fanout after merge (m)
+expecting success: 
+	git reset --hard base &&
+	echo 1 >file1 &&
+	git add -u &&
+	test_tick &&
+	git commit -m "squash! $(git rev-parse --short HEAD^)" &&
+	git tag final-shasquash &&
+	test_tick &&
+	git rebase --autosquash -i HEAD^^^ &&
+	git log --oneline >actual &&
+	test_line_count = 3 actual &&
+	git diff --exit-code final-shasquash &&
+	test 1 = "$(git cat-file blob HEAD^:file1)" &&
+	test 1 = $(git cat-file commit HEAD^ | grep squash | wc -l)
+
+HEAD is now at f0c2a7e second commit
+[master 2592f98] squash! 244a0fe
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Rebasing (2/3)
[detached HEAD ba6c8cf] first commit
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:14:13 2005 -0700
+ 2 files changed, 2 insertions(+)
+ create mode 100644 file1
+ create mode 100644 file2
+Rebasing (3/3)
Successfully rebased and updated refs/heads/master.
+ok 9 - auto squash that matches a sha1
 
 expecting success: 
-	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
+	git reset --hard base &&
+	echo 1 >file1 &&
+	git add -u &&
+	test_tick &&
+	git commit -m "squash! $(git rev-parse --short=11 HEAD^)" &&
+	git tag final-longshasquash &&
+	test_tick &&
+	git rebase --autosquash -i HEAD^^^ &&
+	git log --oneline >actual &&
+	test_line_count = 3 actual &&
+	git diff --exit-code final-longshasquash &&
+	test 1 = "$(git cat-file blob HEAD^:file1)" &&
+	test 1 = $(git cat-file commit HEAD^ | grep squash | wc -l)
 
-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)
+HEAD is now at f0c2a7e second commit
+[master 358ddef] squash! 244a0fe611d
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Rebasing (2/3)
[detached HEAD 2fb404b] first commit
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:14:13 2005 -0700
+ 2 files changed, 2 insertions(+)
+ create mode 100644 file1
+ create mode 100644 file2
+Rebasing (3/3)
Successfully rebased and updated refs/heads/master.
+ok 10 - auto squash that matches longer sha1
 
 expecting success: 
-	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
+	test_auto_commit_flags fixup 1
 
-Using local notes for 157e8cc0aeac5befb302d276f2e706112bf6e413
-Using local notes for e0851358fb6b4703f23d74ef964bc4491bec7ab9
-ok 12 - successful merge using "ours" strategy (z => w)
+HEAD is now at f0c2a7e second commit
+[master ec3ac31] fixup! first commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated refs/heads/master.
+ok 11 - use commit --fixup
 
-expecting success: verify_fanout m
-ok 13 - notes tree still has fanout after merge (m)
+expecting success: 
+	test_auto_commit_flags squash 2
+
+HEAD is now at f0c2a7e second commit
+[master 56a0d48] squash! first commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Rebasing (2/3)
[detached HEAD ca39a78] first commit
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:14:13 2005 -0700
+ 2 files changed, 2 insertions(+)
+ create mode 100644 file1
+ create mode 100644 file2
+Rebasing (3/3)
Successfully rebased and updated refs/heads/master.
+ok 12 - use commit --squash
 
 expecting success: 
-	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
+	test_auto_fixup_fixup fixup fixup
 
-Using remote notes for 157e8cc0aeac5befb302d276f2e706112bf6e413
-Using remote notes for e0851358fb6b4703f23d74ef964bc4491bec7ab9
-ok 14 - successful merge using "theirs" strategy (z => w)
+HEAD is now at f0c2a7e second commit
+[master f2259fa] fixup! first
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[master a8ab281] fixup! fixup! first
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+error: There was a problem with the editor '"$FAKE_EDITOR"'.
+Rebasing (2/4)
Rebasing (3/4)
Rebasing (4/4)
Successfully rebased and updated refs/heads/master.
+ok 13 - fixup! fixup!
 
-expecting success: verify_fanout m
-ok 15 - notes tree still has fanout after merge (m)
+expecting success: 
+	test_auto_fixup_fixup fixup squash
+
+HEAD is now at f0c2a7e second commit
+[master a1ad567] fixup! first
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[master ec0f8ee] fixup! squash! first
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+error: There was a problem with the editor '"$FAKE_EDITOR"'.
+Rebasing (2/4)
Rebasing (3/4)
Rebasing (4/4)
Successfully rebased and updated refs/heads/master.
+ok 14 - fixup! squash!
 
 expecting success: 
-	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
+	test_auto_fixup_fixup squash squash
 
-Concatenating local and remote notes for 157e8cc0aeac5befb302d276f2e706112bf6e413
-Concatenating local and remote notes for e0851358fb6b4703f23d74ef964bc4491bec7ab9
-ok 16 - successful merge using "union" strategy (z => w)
+HEAD is now at f0c2a7e second commit
+[master b3c0532] squash! first
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[master 90b2119] squash! squash! first
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+error: There was a problem with the editor '"$FAKE_EDITOR"'.
+Rebasing (2/4)
Rebasing (3/4)
[detached HEAD 0c6388e] first commit
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:14:13 2005 -0700
+ 2 files changed, 2 insertions(+)
+ create mode 100644 file1
+ create mode 100644 file2
+Rebasing (4/4)
Successfully rebased and updated refs/heads/master.
+ok 15 - squash! squash!
 
-expecting success: verify_fanout m
-ok 17 - notes tree still has fanout after merge (m)
+expecting success: 
+	test_auto_fixup_fixup squash fixup
+
+HEAD is now at f0c2a7e second commit
+[master 9e62506] squash! first
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[master baa3050] squash! fixup! first
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+error: There was a problem with the editor '"$FAKE_EDITOR"'.
+Rebasing (2/4)
Rebasing (3/4)
[detached HEAD f53dd90] first commit
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:14:13 2005 -0700
+ 2 files changed, 2 insertions(+)
+ create mode 100644 file1
+ create mode 100644 file2
+Rebasing (4/4)
Successfully rebased and updated refs/heads/master.
+ok 16 - squash! fixup!
 
 expecting success: 
-	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
+	git reset --hard base &&
+	git config --add rebase.instructionFormat "[%an @ %ar] %s"  &&
+	echo 2 >file1 &&
+	git add -u &&
+	test_tick &&
+	git commit -m "squash! $(git rev-parse --short HEAD^)" &&
+	echo 1 >file1 &&
+	git add -u &&
+	test_tick &&
+	git commit -m "squash! $(git log -n 1 --format=%s HEAD~2)" &&
+	git tag final-squash-instFmt &&
+	test_tick &&
+	git rebase --autosquash -i HEAD~4 &&
+	git log --oneline >actual &&
+	test_line_count = 3 actual &&
+	git diff --exit-code final-squash-instFmt &&
+	test 1 = "$(git cat-file blob HEAD^:file1)" &&
+	test 2 = $(git cat-file commit HEAD^ | grep squash | wc -l)
 
-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)
+HEAD is now at f0c2a7e second commit
+[master 8c2a608] squash! 244a0fe
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[master ab98abd] squash! first commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Rebasing (2/4)
Rebasing (3/4)
[detached HEAD a066413] first commit
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:14:13 2005 -0700
+ 2 files changed, 2 insertions(+)
+ create mode 100644 file1
+ create mode 100644 file2
+Rebasing (4/4)
Successfully rebased and updated refs/heads/master.
+ok 17 - autosquash with custom inst format
 
-expecting success: verify_fanout m
-ok 19 - notes tree still has fanout after merge (m)
+expecting success: 
+	git reset --hard base &&
+	test_commit empty-instructionFormat-test &&
+	(
+		set_cat_todo_editor &&
+		test_must_fail git -c rebase.instructionFormat= \
+			rebase --autosquash  --force -i HEAD^ >actual &&
+		git log -1 --format="pick %h %s" >expect &&
+		test_cmp expect actual
+	)
+
+HEAD is now at f0c2a7e second commit
+[master c73d304] empty-instructionFormat-test
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 empty-instructionFormat-test.t
+error: There was a problem with the editor '"$FAKE_EDITOR"'.
+ok 18 - autosquash with empty custom instructionFormat
 
 expecting success: 
-	git update-ref refs/notes/m refs/notes/w &&
-	test_must_fail git notes merge z
+	test_tick &&
+	git commit --allow-empty -m "empty" &&
+	test_tick &&
+	git commit --allow-empty -m "empty2" &&
+	test_tick &&
+	>fixup &&
+	git add fixup &&
+	git commit --fixup HEAD^^ &&
+	(
+		set_backup_editor &&
+		GIT_USE_REBASE_HELPER=false \
+		git rebase -i --force-rebase --autosquash HEAD~4 &&
+		grep empty2 .git/backup-git-rebase-todo
+	)
 
-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)
+[master f0b00cc] empty
+ Author: A U Thor <author@example.com>
+[master 57d336e] empty2
+ Author: A U Thor <author@example.com>
+[master 214c1c2] fixup! empty-instructionFormat-test
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 fixup
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/master.
+# pick 57d336ec506cd26f9ae698f8800eb63788ef86fe [A U Thor @ 18 years ago] empty2
+ok 19 - autosquash with multiple empty patches
 
-expecting success: verify_fanout m
-ok 21 - notes tree still has fanout after merge (m)
+expecting success: 
+	base=$(git rev-parse HEAD) &&
+	test_commit to-fixup &&
+	git commit --allow-empty -m "fixup!  to-fixup" &&
+	git rebase -i --autosquash --keep-empty HEAD~2 &&
+	parent=$(git rev-parse HEAD^) &&
+	test $base = $parent
+
+[master e70b585] to-fixup
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 to-fixup.t
+[master 0b5a07e] fixup!  to-fixup
+ Author: A U Thor <author@example.com>
+Rebasing (2/2)
Successfully rebased and updated refs/heads/master.
+ok 20 - extra spaces after fixup!
 
 expecting success: 
-	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)"
+	if test -d .git/rebase-merge; then git rebase --abort; fi &&
+	base=$(git rev-parse HEAD) &&
+	echo "wrapped subject" >wrapped &&
+	git add wrapped &&
+	test_tick &&
+	git commit --allow-empty -m "$(printf "To\nfixup")" &&
+	test_tick &&
+	git commit --allow-empty -m "fixup! To fixup" &&
+	git rebase -i --autosquash --keep-empty HEAD~2 &&
+	parent=$(git rev-parse HEAD^) &&
+	test $base = $parent
 
-ok 22 - verify conflict entries (with no fanout)
+[master 8785f39] To fixup
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 wrapped
+[master c4fe568] fixup! To fixup
+ Author: A U Thor <author@example.com>
+Rebasing (2/2)
Successfully rebased and updated refs/heads/master.
+ok 21 - wrapped original subject
 
 expecting success: 
-	cat >.git/NOTES_MERGE_WORKTREE/$commit_sha3 <<EOF &&
-other notes for commit3
+	test_when_finished "test_might_fail git rebase --abort" &&
+	test_when_finished "git checkout master" &&
 
-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
+	git checkout -b some-squashes &&
+	git commit --allow-empty -m first &&
+	git commit --allow-empty --squash HEAD &&
+	git commit --allow-empty -m second &&
+	git commit --allow-empty --squash HEAD &&
 
-ok 23 - resolve and finalize merge (z => w)
+	test_must_fail git -c core.editor="grep -q ^pick" \
+		rebase -ki --autosquash HEAD~4 &&
+	: do not finish the squash, but resolve it manually &&
+	git commit --allow-empty --amend -m edited-first &&
+	git rebase --skip &&
+	git show >actual &&
+	! grep first actual
 
-expecting success: verify_fanout m
-ok 24 - notes tree still has fanout after merge (m)
+Switched to a new branch 'some-squashes'
+[some-squashes ceaf0dc] first
+ Author: A U Thor <author@example.com>
+[some-squashes fd6f13b] squash! first
+ Author: A U Thor <author@example.com>
+[some-squashes 66b5018] second
+ Author: A U Thor <author@example.com>
+[some-squashes 10808aa] squash! second
+ Author: A U Thor <author@example.com>
+Rebasing (2/4)
error: There was a problem with the editor 'grep -q ^pick'.
+Please supply the message using either -m or -F option.
+Could not apply fd6f13b... [A U Thor @ 18 years ago] squash! first
+[detached HEAD 4808a4c] edited-first
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 16:09:13 2005 -0700
+Rebasing (3/4)
Rebasing (4/4)
[detached HEAD 3e50d0a] second
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 16:09:13 2005 -0700
+Successfully rebased and updated refs/heads/some-squashes.
+Switched to branch 'master'
+fatal: No rebase in progress?
+ok 22 - abort last squash
 
-# passed all 24 test(s)
-1..24
+# passed all 22 test(s)
+1..22
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t3414-rebase-preserve-onto.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3414-rebase-preserve-onto/.git/
+*** t3410-rebase-preserve-dropped-merges.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3410-rebase-preserve-dropped-merges/.git/
 checking prerequisite: REBASE_P
 
 mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
@@ -71827,67 +72254,37 @@
 )
 prerequisite REBASE_P ok
 expecting success: 
-	test_commit A1 &&
-	test_commit B1 &&
-	test_commit C1 &&
-	test_commit D1 &&
-	git reset --hard B1 &&
-	test_commit E1 &&
-	test_commit F1 &&
-	test_merge G1 D1 &&
-	git reset --hard A1 &&
-	test_commit H1
+	test_commit A file1 &&
+	test_commit B file1 1 &&
+	test_commit C file2 &&
+	test_commit D file1 2 &&
+	test_commit E file3 &&
+	git checkout A &&
+	test_commit F file4 &&
+	test_commit G file1 3 &&
+	test_commit H file5 &&
+	git checkout F &&
+	test_commit I file6
 
-[master (root-commit) 6fb0b66] A1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A1.t
-[master 37e5de5] B1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 B1.t
-[master 9db6c33] C1
+[master (root-commit) 6e62bf8] A
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 C1.t
-[master d7157d8] D1
+ create mode 100644 file1
+[master 5c95b17] B
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 D1.t
-HEAD is now at 37e5de5 B1
-[master b959d6c] E1
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[master 7be4cc1] C
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 E1.t
-[master 81dc3a6] F1
+ create mode 100644 file2
+[master 3d13cae] D
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 F1.t
-Merging:
-81dc3a6 F1
-virtual D1
-found 1 common ancestor:
-37e5de5 B1
-Merge made by the 'recursive' strategy.
- C1.t | 1 +
- D1.t | 1 +
- 2 files changed, 2 insertions(+)
- create mode 100644 C1.t
- create mode 100644 D1.t
-HEAD is now at 6fb0b66 A1
-[master 4950a7c] H1
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[master 1fe5a44] E
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 H1.t
-ok 1 - setup
-
-expecting success: 
-	git checkout G1 &&
-	git rebase -p --onto H1 B1 &&
-	test "$(git rev-parse HEAD^1^1^1)" = "$(git rev-parse H1)" &&
-	test "$(git rev-parse HEAD^2^1^1)" = "$(git rev-parse H1)"
-
-Note: checking out 'G1'.
+ create mode 100644 file3
+Note: checking out '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
@@ -71898,100 +72295,248 @@
 
   git checkout -b <new-branch-name>
 
-HEAD is now at 52308dd G1
-Rebasing (1/5)
Rebasing (2/5)
Rebasing (3/5)
Rebasing (4/5)
Rebasing (5/5)
Successfully rebased and updated detached HEAD.
-ok 2 - rebase from B1 onto H1
+HEAD is now at 6e62bf8 A
+[detached HEAD cfefd94] F
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file4
+[detached HEAD 66ee775] G
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[detached HEAD 25e63b2] H
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file5
+Previous HEAD position was 25e63b2 H
+HEAD is now at cfefd94 F
+[detached HEAD 615be62] I
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file6
+ok 1 - setup
 
 expecting success: 
-	git checkout G1 &&
-	git rebase -p --onto H1 E1 &&
-	test "$(git rev-parse HEAD^1^1)" = "$(git rev-parse H1)" &&
-	test "$(git rev-parse HEAD^2)" = "$(git rev-parse D1)"
-
-Warning: you are leaving 5 commits behind, not connected to
-any of your branches:
-
-  ab2e25c G1
-  eb95cad F1
-  52202eb D1
-  227fb12 E1
-  9e481e9 C1
-
-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> ab2e25c
+	git checkout H &&
+	test_must_fail git merge E &&
+	test_commit L file1 23 &&
+	git checkout I &&
+	test_commit G2 file1 3 &&
+	test_must_fail git merge E &&
+	test_commit J file1 23 &&
+	test_commit K file7 file7 &&
+	git rebase -i -p L &&
+	test $(git rev-parse HEAD^^) = $(git rev-parse L) &&
+	test "23" = "$(cat file1)" &&
+	test "I" = "$(cat file6)" &&
+	test "file7" = "$(cat file7)"
 
-HEAD is now at 52308dd G1
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated detached HEAD.
-ok 3 - rebase from E1 onto H1
+Previous HEAD position was 615be62 I
+HEAD is now at 25e63b2 H
+Merging:
+25e63b2 H
+virtual E
+found 1 common ancestor:
+6e62bf8 A
+Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+Automatic merge failed; fix conflicts and then commit the result.
+[detached HEAD 70a312a] L
+ Author: A U Thor <author@example.com>
+Previous HEAD position was 70a312a L
+HEAD is now at 615be62 I
+[detached HEAD 93b50ed] G2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Merging:
+93b50ed G2
+virtual E
+found 1 common ancestor:
+6e62bf8 A
+Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+Automatic merge failed; fix conflicts and then commit the result.
+[detached HEAD 6b192df] J
+ Author: A U Thor <author@example.com>
+[detached HEAD 273eec6] K
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file7
+Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated detached HEAD.
+ok 2 - skip same-resolution merges with -p
 
 expecting success: 
-	git checkout G1 &&
-	git rev-list --first-parent --pretty=oneline C1..G1 &&
-	git rebase -p --onto H1 C1 &&
-	test "$(git rev-parse HEAD^2^1)" = "$(git rev-parse H1)" &&
-	test "$(git rev-parse HEAD^1)" = "$(git rev-parse F1)"
+	git checkout H &&
+	test_must_fail git merge E &&
+	test_commit L2 file1 23 &&
+	git checkout I &&
+	test_commit G3 file1 4 &&
+	test_must_fail git merge E &&
+	test_commit J2 file1 24 &&
+	test_commit K2 file7 file7 &&
+	test_must_fail git rebase -i -p L2 &&
+	echo 234 > file1 &&
+	git add file1 &&
+	git rebase --continue &&
+	test $(git rev-parse HEAD^^^) = $(git rev-parse L2) &&
+	test "234" = "$(cat file1)" &&
+	test "I" = "$(cat file6)" &&
+	test "file7" = "$(cat file7)"
 
 Warning: you are leaving 2 commits behind, not connected to
 any of your branches:
 
-  a6d9fc8 G1
-  4d3dd7d F1
+  519f02c K
+  e785c42 I
 
 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> a6d9fc8
+ git branch <new-branch-name> 519f02c
 
-HEAD is now at 52308dd G1
-52308dd60394ebd5599b39fb69108f164975ed7a G1
-81dc3a6494c9a0091f921c65194433ffa66d8dac F1
-b959d6cc0d4f2d10f0d432e45cd5578c75065af5 E1
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated detached HEAD.
-ok 4 - rebase from C1 onto H1
+HEAD is now at 25e63b2 H
+Merging:
+25e63b2 H
+virtual E
+found 1 common ancestor:
+6e62bf8 A
+Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+Automatic merge failed; fix conflicts and then commit the result.
+[detached HEAD 4c4dd24] L2
+ Author: A U Thor <author@example.com>
+Previous HEAD position was 4c4dd24 L2
+HEAD is now at 615be62 I
+[detached HEAD 6e00aee] G3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Merging:
+6e00aee G3
+virtual E
+found 1 common ancestor:
+6e62bf8 A
+Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+Automatic merge failed; fix conflicts and then commit the result.
+[detached HEAD 4917c92] J2
+ Author: A U Thor <author@example.com>
+[detached HEAD c670ef0] K2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file7
+Rebasing (1/4)
Rebasing (2/4)
Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+error: could not apply 6e00aee... G3
 
-# passed all 4 test(s)
-1..4
+Resolve all conflicts manually, mark them as resolved with
+"git add/rm <conflicted_files>", then run "git rebase --continue".
+You can instead skip this commit: run "git rebase --skip".
+To abort and get back to the state before "git rebase", run "git rebase --abort".
+Could not pick 6e00aee07e42a4daf7ffd5d296964868ea26ad79
+[detached HEAD ff7174a] G3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Rebasing (3/4)
Rebasing (4/4)
Successfully rebased and updated detached HEAD.
+ok 3 - keep different-resolution merges with -p
+
+# passed all 3 test(s)
+1..3
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t3423-rebase-reword.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3423-rebase-reword/.git/
-expecting success: 
-	test_commit master file-1 test &&
+*** t3411-rebase-preserve-around-merges.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3411-rebase-preserve-around-merges/.git/
+checking prerequisite: REBASE_P
 
-	git checkout -b stuff &&
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
+	test -z "$GIT_TEST_SKIP_REBASE_P"
 
-	test_commit feature_a file-2 aaa &&
-	test_commit feature_b file-2 ddd
+)
+prerequisite REBASE_P ok
+expecting success: 
+	test_commit A1 &&
+	test_commit B1 &&
+	test_commit C1 &&
+	git reset --hard B1 &&
+	test_commit D1 &&
+	test_merge E1 C1 &&
+	test_commit F1
 
-[master (root-commit) 1b67fbb] master
+[master (root-commit) 6fb0b66] A1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 file-1
-Switched to a new branch 'stuff'
-[stuff 94f30ac] feature_a
+ create mode 100644 A1.t
+[master 37e5de5] B1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 file-2
-[stuff 97706f8] feature_b
+ create mode 100644 B1.t
+[master 9db6c33] C1
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ 1 file changed, 1 insertion(+)
+ create mode 100644 C1.t
+HEAD is now at 37e5de5 B1
+[master 98f5076] D1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 D1.t
+Merging:
+98f5076 D1
+virtual C1
+found 1 common ancestor:
+37e5de5 B1
+Merge made by the 'recursive' strategy.
+ C1.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 C1.t
+[master 0f3967e] F1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 F1.t
 ok 1 - setup
 
 expecting success: 
-	test_when_finished "reset_rebase" &&
+	FAKE_LINES="1 squash 4 2 3" git rebase -i -p B1 &&
+	test "$(git rev-parse HEAD^2)" = "$(git rev-parse C1)" &&
+	test "$(git rev-parse HEAD~2)" = "$(git rev-parse B1)" &&
+	git tag E2
 
-	git checkout stuff^0 &&
+rebase -i script before editing:
+pick 98f5076 D1
+pick 9db6c33 C1
+pick b855587 E1
+pick 0f3967e F1
 
-	set_fake_editor &&
-	FAKE_LINES="pick 1 reword 2" FAKE_COMMIT_MESSAGE="feature_b_reworded" \
-		git rebase -i -v master &&
+rebase -i script after editing:
+pick 98f5076 D1
+squash 0f3967e F1
+pick 9db6c33 C1
+pick b855587 E1
+Rebasing (1/4)
Rebasing (2/4)
[detached HEAD 5d81168] D1
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:16:13 2005 -0700
+ 2 files changed, 2 insertions(+)
+ create mode 100644 D1.t
+ create mode 100644 F1.t
+Rebasing (3/4)
Rebasing (4/4)
Successfully rebased and updated refs/heads/master.
+ok 2 - squash F1 into D1
 
-	test "$(git log -1 --format=%B)" = "feature_b_reworded" &&
-	test $(git rev-list --count HEAD) = 3
+expecting success: 
+	git checkout A1 &&
+	test_commit G1 &&
+	test_commit H1 &&
+	test_commit I1 &&
+	git checkout -b branch3 H1 &&
+	test_commit J1 &&
+	test_merge K1 I1 &&
+	git checkout -b branch2 G1 &&
+	test_commit L1 &&
+	test_merge M1 K1 &&
+	GIT_EDITOR=: git rebase -i -p E2 &&
+	test "$(git rev-parse HEAD~3)" = "$(git rev-parse E2)" &&
+	test "$(git rev-parse HEAD~2)" = "$(git rev-parse HEAD^2^2~2)" &&
+	test "$(git rev-parse HEAD^2^1^1)" = "$(git rev-parse HEAD^2^2^1)"
 
-Note: checking out 'stuff^0'.
+Note: checking out 'A1'.
 
 You are in 'detached HEAD' state. You can look around, make experimental
 changes and commit them, and you can discard any commits you make in this
@@ -72002,85 +72547,54 @@
 
   git checkout -b <new-branch-name>
 
-HEAD is now at 97706f8 feature_b
-warning: refname 'master' is ambiguous.
-warning: refname 'master' is ambiguous.
-Changes from 1b67fbb47bfbc89766d785c152239ac6bc83af30 to 1b67fbb47bfbc89766d785c152239ac6bc83af30:
-rebase -i script before editing:
-pick 94f30ac feature_a
-pick 97706f8 feature_b
-
-rebase -i script after editing:
-pick 94f30ac feature_a
-reword 97706f8 feature_b
-Previous HEAD position was 97706f8 feature_b
-HEAD is now at 94f30ac feature_a
-Rebasing (2/2)
-[detached HEAD ac09183] feature_b_reworded
+HEAD is now at 6fb0b66 A1
+[detached HEAD f51c4db] G1
  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 ac09183 feature_b_reworded
-Removing fake-editor.sh
-ok 2 - reword without issues functions as intended
-
-expecting success: 
-	test_when_finished "reset_rebase" &&
-
-	git checkout stuff^0 &&
-
-	set_fake_editor &&
-	test_must_fail env FAKE_LINES="reword 2" \
-		git rebase -i -v master &&
-
-	git checkout --theirs file-2 &&
-	git add file-2 &&
-	FAKE_COMMIT_MESSAGE="feature_b_reworded" git rebase --continue &&
-
-	test "$(git log -1 --format=%B)" = "feature_b_reworded" &&
-	test $(git rev-list --count HEAD) = 2
-
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  ac09183 feature_b_reworded
-
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
-
- git branch <new-branch-name> ac09183
-
-HEAD is now at 97706f8 feature_b
-warning: refname 'master' is ambiguous.
-warning: refname 'master' is ambiguous.
-Changes from 1b67fbb47bfbc89766d785c152239ac6bc83af30 to 1b67fbb47bfbc89766d785c152239ac6bc83af30:
-rebase -i script before editing:
-pick 94f30ac feature_a
-pick 97706f8 feature_b
-
-rebase -i script after editing:
-reword 97706f8 feature_b
-Previous HEAD position was 97706f8 feature_b
-HEAD is now at 1b67fbb master
-Rebasing (1/1)
-CONFLICT (modify/delete): file-2 deleted in HEAD and modified in 97706f8... feature_b. Version 97706f8... feature_b of file-2 left in tree.
-error: could not apply 97706f8... feature_b
-Resolve all conflicts manually, mark them as resolved with
-"git add/rm <conflicted_files>", then run "git rebase --continue".
-You can instead skip this commit: run "git rebase --skip".
-To abort and get back to the state before "git rebase", run "git rebase --abort".
-Could not apply 97706f8... feature_b
-[detached HEAD 1c9291c] feature_b_reworded
+ 1 file changed, 1 insertion(+)
+ create mode 100644 G1.t
+[detached HEAD 8227962] H1
  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 1c9291c feature_b_reworded
-Removing fake-editor.sh
-ok 3 - reword after a conflict preserves commit
+ create mode 100644 H1.t
+[detached HEAD f56baeb] I1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 I1.t
+Previous HEAD position was f56baeb I1
+Switched to a new branch 'branch3'
+[branch3 904e05f] J1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 J1.t
+Merging:
+904e05f J1
+virtual I1
+found 1 common ancestor:
+8227962 H1
+Merge made by the 'recursive' strategy.
+ I1.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 I1.t
+Switched to a new branch 'branch2'
+[branch2 86c413d] L1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 L1.t
+Merging:
+86c413d L1
+virtual K1
+found 1 common ancestor:
+f51c4db G1
+Merge made by the 'recursive' strategy.
+ H1.t | 1 +
+ I1.t | 1 +
+ J1.t | 1 +
+ 3 files changed, 3 insertions(+)
+ create mode 100644 H1.t
+ create mode 100644 I1.t
+ create mode 100644 J1.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/branch2.
+ok 3 - rebase two levels of merge
 
 # passed all 3 test(s)
 1..3
@@ -72433,6 +72947,137 @@
 1..6
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
+*** t3423-rebase-reword.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3423-rebase-reword/.git/
+expecting success: 
+	test_commit master file-1 test &&
+
+	git checkout -b stuff &&
+
+	test_commit feature_a file-2 aaa &&
+	test_commit feature_b file-2 ddd
+
+[master (root-commit) 1b67fbb] master
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file-1
+Switched to a new branch 'stuff'
+[stuff 94f30ac] feature_a
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file-2
+[stuff 97706f8] feature_b
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 1 - setup
+
+expecting success: 
+	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 master &&
+
+	test "$(git log -1 --format=%B)" = "feature_b_reworded" &&
+	test $(git rev-list --count HEAD) = 3
+
+Note: checking out '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 performing another checkout.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -b with the checkout command again. Example:
+
+  git checkout -b <new-branch-name>
+
+HEAD is now at 97706f8 feature_b
+warning: refname 'master' is ambiguous.
+warning: refname 'master' is ambiguous.
+Changes from 1b67fbb47bfbc89766d785c152239ac6bc83af30 to 1b67fbb47bfbc89766d785c152239ac6bc83af30:
+rebase -i script before editing:
+pick 94f30ac feature_a
+pick 97706f8 feature_b
+
+rebase -i script after editing:
+pick 94f30ac feature_a
+reword 97706f8 feature_b
+Previous HEAD position was 97706f8 feature_b
+HEAD is now at 94f30ac feature_a
+Rebasing (2/2)
+[detached HEAD ac09183] 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 ac09183 feature_b_reworded
+Removing fake-editor.sh
+ok 2 - reword without issues functions as intended
+
+expecting success: 
+	test_when_finished "reset_rebase" &&
+
+	git checkout stuff^0 &&
+
+	set_fake_editor &&
+	test_must_fail env FAKE_LINES="reword 2" \
+		git rebase -i -v master &&
+
+	git checkout --theirs file-2 &&
+	git add file-2 &&
+	FAKE_COMMIT_MESSAGE="feature_b_reworded" git rebase --continue &&
+
+	test "$(git log -1 --format=%B)" = "feature_b_reworded" &&
+	test $(git rev-list --count HEAD) = 2
+
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  ac09183 feature_b_reworded
+
+If you want to keep it by creating a new branch, this may be a good time
+to do so with:
+
+ git branch <new-branch-name> ac09183
+
+HEAD is now at 97706f8 feature_b
+warning: refname 'master' is ambiguous.
+warning: refname 'master' is ambiguous.
+Changes from 1b67fbb47bfbc89766d785c152239ac6bc83af30 to 1b67fbb47bfbc89766d785c152239ac6bc83af30:
+rebase -i script before editing:
+pick 94f30ac feature_a
+pick 97706f8 feature_b
+
+rebase -i script after editing:
+reword 97706f8 feature_b
+Previous HEAD position was 97706f8 feature_b
+HEAD is now at 1b67fbb master
+Rebasing (1/1)
+CONFLICT (modify/delete): file-2 deleted in HEAD and modified in 97706f8... feature_b. Version 97706f8... feature_b of file-2 left in tree.
+error: could not apply 97706f8... feature_b
+Resolve all conflicts manually, mark them as resolved with
+"git add/rm <conflicted_files>", then run "git rebase --continue".
+You can instead skip this commit: run "git rebase --skip".
+To abort and get back to the state before "git rebase", run "git rebase --abort".
+Could not apply 97706f8... feature_b
+[detached HEAD 1c9291c] 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 1c9291c feature_b_reworded
+Removing fake-editor.sh
+ok 3 - reword after a conflict preserves commit
+
+# passed all 3 test(s)
+1..3
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
 *** t3422-rebase-incompatible-options.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3422-rebase-incompatible-options/.git/
 expecting success: 
@@ -72453,16 +73098,16 @@
 	git add foo &&
 	git commit -m B
 
-[master (root-commit) a07d5cc] orig
+[master (root-commit) 202d243] orig
  Author: A U Thor <author@example.com>
  1 file changed, 8 insertions(+)
  create mode 100644 foo
 Switched to branch 'A'
-[A 91a8f7e] A
+[A 8cff944] A
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 Switched to branch 'B'
-[B 96607ca] B
+[B 6f59162] B
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 ok 1 - setup
@@ -72482,7 +73127,7 @@
 
   git checkout -b <new-branch-name>
 
-HEAD is now at 96607ca B
+HEAD is now at 6f59162 B
 fatal: error: cannot combine merge options (--merge, --strategy, --strategy-option) with am options (.git/rebase-apply/applying)
 ok 2 - --whitespace=fix incompatible with --merge
 
@@ -72490,7 +73135,7 @@
 		git checkout B^0 &&
 		test_must_fail git rebase --whitespace=fix --strategy=ours A
 	
-HEAD is now at 96607ca B
+HEAD is now at 6f59162 B
 fatal: error: cannot combine merge options (--merge, --strategy, --strategy-option) with am options (.git/rebase-apply/applying)
 ok 3 - --whitespace=fix incompatible with --strategy=ours
 
@@ -72498,7 +73143,7 @@
 		git checkout B^0 &&
 		test_must_fail git rebase --whitespace=fix --strategy-option=ours A
 	
-HEAD is now at 96607ca B
+HEAD is now at 6f59162 B
 fatal: error: cannot combine merge options (--merge, --strategy, --strategy-option) with am options ( --ours)
 ok 4 - --whitespace=fix incompatible with --strategy-option=ours
 
@@ -72506,7 +73151,7 @@
 		git checkout B^0 &&
 		test_must_fail git rebase --whitespace=fix --interactive A
 	
-HEAD is now at 96607ca B
+HEAD is now at 6f59162 B
 fatal: error: cannot combine interactive options (--interactive, --exec, --rebase-merges, --preserve-merges, --keep-empty, --root + --onto) with am options (.git/rebase-apply/applying)
 ok 5 - --whitespace=fix incompatible with --interactive
 
@@ -72514,7 +73159,7 @@
 		git checkout B^0 &&
 		test_must_fail git rebase --whitespace=fix --exec 'true' A
 	
-HEAD is now at 96607ca B
+HEAD is now at 6f59162 B
 fatal: error: cannot combine interactive options (--interactive, --exec, --rebase-merges, --preserve-merges, --keep-empty, --root + --onto) with am options (exec true
 )
 ok 6 - --whitespace=fix incompatible with --exec
@@ -72523,7 +73168,7 @@
 		git checkout B^0 &&
 		test_must_fail git rebase --ignore-whitespace --merge A
 	
-HEAD is now at 96607ca B
+HEAD is now at 6f59162 B
 fatal: error: cannot combine merge options (--merge, --strategy, --strategy-option) with am options (.git/rebase-apply/applying)
 ok 7 - --ignore-whitespace incompatible with --merge
 
@@ -72531,7 +73176,7 @@
 		git checkout B^0 &&
 		test_must_fail git rebase --ignore-whitespace --strategy=ours A
 	
-HEAD is now at 96607ca B
+HEAD is now at 6f59162 B
 fatal: error: cannot combine merge options (--merge, --strategy, --strategy-option) with am options (.git/rebase-apply/applying)
 ok 8 - --ignore-whitespace incompatible with --strategy=ours
 
@@ -72539,7 +73184,7 @@
 		git checkout B^0 &&
 		test_must_fail git rebase --ignore-whitespace --strategy-option=ours A
 	
-HEAD is now at 96607ca B
+HEAD is now at 6f59162 B
 fatal: error: cannot combine merge options (--merge, --strategy, --strategy-option) with am options ( --ours)
 ok 9 - --ignore-whitespace incompatible with --strategy-option=ours
 
@@ -72547,7 +73192,7 @@
 		git checkout B^0 &&
 		test_must_fail git rebase --ignore-whitespace --interactive A
 	
-HEAD is now at 96607ca B
+HEAD is now at 6f59162 B
 fatal: error: cannot combine interactive options (--interactive, --exec, --rebase-merges, --preserve-merges, --keep-empty, --root + --onto) with am options (.git/rebase-apply/applying)
 ok 10 - --ignore-whitespace incompatible with --interactive
 
@@ -72555,7 +73200,7 @@
 		git checkout B^0 &&
 		test_must_fail git rebase --ignore-whitespace --exec 'true' A
 	
-HEAD is now at 96607ca B
+HEAD is now at 6f59162 B
 fatal: error: cannot combine interactive options (--interactive, --exec, --rebase-merges, --preserve-merges, --keep-empty, --root + --onto) with am options (exec true
 )
 ok 11 - --ignore-whitespace incompatible with --exec
@@ -72564,7 +73209,7 @@
 		git checkout B^0 &&
 		test_must_fail git rebase --committer-date-is-author-date --merge A
 	
-HEAD is now at 96607ca B
+HEAD is now at 6f59162 B
 fatal: error: cannot combine merge options (--merge, --strategy, --strategy-option) with am options (.git/rebase-apply/applying)
 ok 12 - --committer-date-is-author-date incompatible with --merge
 
@@ -72572,7 +73217,7 @@
 		git checkout B^0 &&
 		test_must_fail git rebase --committer-date-is-author-date --strategy=ours A
 	
-HEAD is now at 96607ca B
+HEAD is now at 6f59162 B
 fatal: error: cannot combine merge options (--merge, --strategy, --strategy-option) with am options (.git/rebase-apply/applying)
 ok 13 - --committer-date-is-author-date incompatible with --strategy=ours
 
@@ -72580,7 +73225,7 @@
 		git checkout B^0 &&
 		test_must_fail git rebase --committer-date-is-author-date --strategy-option=ours A
 	
-HEAD is now at 96607ca B
+HEAD is now at 6f59162 B
 fatal: error: cannot combine merge options (--merge, --strategy, --strategy-option) with am options ( --ours)
 ok 14 - --committer-date-is-author-date incompatible with --strategy-option=ours
 
@@ -72588,7 +73233,7 @@
 		git checkout B^0 &&
 		test_must_fail git rebase --committer-date-is-author-date --interactive A
 	
-HEAD is now at 96607ca B
+HEAD is now at 6f59162 B
 fatal: error: cannot combine interactive options (--interactive, --exec, --rebase-merges, --preserve-merges, --keep-empty, --root + --onto) with am options (.git/rebase-apply/applying)
 ok 15 - --committer-date-is-author-date incompatible with --interactive
 
@@ -72596,7 +73241,7 @@
 		git checkout B^0 &&
 		test_must_fail git rebase --committer-date-is-author-date --exec 'true' A
 	
-HEAD is now at 96607ca B
+HEAD is now at 6f59162 B
 fatal: error: cannot combine interactive options (--interactive, --exec, --rebase-merges, --preserve-merges, --keep-empty, --root + --onto) with am options (exec true
 )
 ok 16 - --committer-date-is-author-date incompatible with --exec
@@ -72605,7 +73250,7 @@
 		git checkout B^0 &&
 		test_must_fail git rebase -C4 --merge A
 	
-HEAD is now at 96607ca B
+HEAD is now at 6f59162 B
 fatal: error: cannot combine merge options (--merge, --strategy, --strategy-option) with am options (.git/rebase-apply/applying)
 ok 17 - -C4 incompatible with --merge
 
@@ -72613,7 +73258,7 @@
 		git checkout B^0 &&
 		test_must_fail git rebase -C4 --strategy=ours A
 	
-HEAD is now at 96607ca B
+HEAD is now at 6f59162 B
 fatal: error: cannot combine merge options (--merge, --strategy, --strategy-option) with am options (.git/rebase-apply/applying)
 ok 18 - -C4 incompatible with --strategy=ours
 
@@ -72621,7 +73266,7 @@
 		git checkout B^0 &&
 		test_must_fail git rebase -C4 --strategy-option=ours A
 	
-HEAD is now at 96607ca B
+HEAD is now at 6f59162 B
 fatal: error: cannot combine merge options (--merge, --strategy, --strategy-option) with am options ( --ours)
 ok 19 - -C4 incompatible with --strategy-option=ours
 
@@ -72629,7 +73274,7 @@
 		git checkout B^0 &&
 		test_must_fail git rebase -C4 --interactive A
 	
-HEAD is now at 96607ca B
+HEAD is now at 6f59162 B
 fatal: error: cannot combine interactive options (--interactive, --exec, --rebase-merges, --preserve-merges, --keep-empty, --root + --onto) with am options (.git/rebase-apply/applying)
 ok 20 - -C4 incompatible with --interactive
 
@@ -72637,7 +73282,7 @@
 		git checkout B^0 &&
 		test_must_fail git rebase -C4 --exec 'true' A
 	
-HEAD is now at 96607ca B
+HEAD is now at 6f59162 B
 fatal: error: cannot combine interactive options (--interactive, --exec, --rebase-merges, --preserve-merges, --keep-empty, --root + --onto) with am options (exec true
 )
 ok 21 - -C4 incompatible with --exec
@@ -72646,7 +73291,7 @@
 	git checkout B^0 &&
 	test_must_fail git rebase --preserve-merges --signoff A
 
-HEAD is now at 96607ca B
+HEAD is now at 6f59162 B
 fatal: cannot combine '--signoff' with '--preserve-merges'
 ok 22 - --preserve-merges incompatible with --signoff
 
@@ -72654,7 +73299,7 @@
 	git checkout B^0 &&
 	test_must_fail git rebase --preserve-merges --rebase-merges A
 
-HEAD is now at 96607ca B
+HEAD is now at 6f59162 B
 fatal: error: cannot combine '--preserve-merges' with '--rebase-merges'
 ok 23 - --preserve-merges incompatible with --rebase-merges
 
@@ -72662,7 +73307,7 @@
 	git checkout B^0 &&
 	test_must_fail git rebase --rebase-merges -s resolve A
 
-HEAD is now at 96607ca B
+HEAD is now at 6f59162 B
 fatal: error: cannot combine '--rebase-merges' with '--strategy'
 ok 24 - --rebase-merges incompatible with --strategy
 
@@ -72670,7 +73315,7 @@
 	git checkout B^0 &&
 	test_must_fail git rebase --rebase-merges -Xignore-space-change A
 
-HEAD is now at 96607ca B
+HEAD is now at 6f59162 B
 fatal: error: cannot combine '--rebase-merges' with '--strategy-option'
 ok 25 - --rebase-merges incompatible with --strategy-option
 
@@ -72678,549 +73323,365 @@
 1..25
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t3415-rebase-autosquash.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3415-rebase-autosquash/.git/
+*** t3428-rebase-signoff.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3428-rebase-signoff/.git/
 expecting success: 
-	echo 0 >file0 &&
-	git add . &&
-	test_tick &&
-	git commit -m "initial commit" &&
-	echo 0 >file1 &&
-	echo 2 >file2 &&
-	git add . &&
-	test_tick &&
-	git commit -m "first commit" &&
-	git tag first-commit &&
-	echo 3 >file3 &&
-	git add . &&
-	test_tick &&
-	git commit -m "second commit" &&
-	git tag base
+	git commit --allow-empty -m "Initial empty commit" &&
+	git add file && git commit -m first &&
+	git config alias.rbs "rebase --signoff" &&
+	git rbs HEAD^ &&
+	git cat-file commit HEAD | sed -e "1,/^\$/d" > actual &&
+	test_cmp expected-signed actual
 
-[master (root-commit) d78c915] initial commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file0
-[master 244a0fe] first commit
+[master (root-commit) d0a935f] Initial empty commit
  Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 file1
- create mode 100644 file2
-[master f0c2a7e] second commit
+[master 080d414] first
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 file3
-ok 1 - setup
+ create mode 100644 file
+Current branch master is up to date, rebase forced.
+First, rewinding head to replay your work on top of it...
+Applying: first
+ok 1 - rebase --signoff adds a sign-off line
 
 expecting success: 
-	test_auto_fixup final-fixup-option --autosquash
+	git commit --amend -m "first" &&
+	git rbs --no-signoff HEAD^ &&
+	git cat-file commit HEAD | sed -e "1,/^\$/d" > actual &&
+	test_cmp expected-unsigned actual
 
-HEAD is now at f0c2a7e second commit
-[master e17f730] fixup! first
+[master 080d414] first
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated refs/heads/master.
-ok 2 - auto fixup (option)
+ Date: Thu Jan 5 11:47:48 2023 +0000
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+Current branch master is up to date.
+ok 2 - rebase --no-signoff does not add a sign-off line
 
 expecting success: 
-	git config rebase.autosquash true &&
-	test_auto_fixup final-fixup-config-true &&
-	test_must_fail test_auto_fixup fixup-config-true-no --no-autosquash &&
-	git config rebase.autosquash false &&
-	test_must_fail test_auto_fixup final-fixup-config-false
+	test_when_finished "rm exec" &&
+	git commit --amend -m "first" &&
+	git rebase --exec "touch exec" --signoff HEAD^ &&
+	test_path_is_file exec &&
+	git cat-file commit HEAD | sed -e "1,/^\$/d" >actual &&
+	test_cmp expected-signed actual
 
-HEAD is now at f0c2a7e second commit
-[master f84b6d6] fixup! first
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated refs/heads/master.
-HEAD is now at f0c2a7e second commit
-[master 03041cb] fixup! first
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Successfully rebased and updated refs/heads/master.
-test_line_count: line count for actual != 3
-03041cb fixup! first
-f0c2a7e second commit
-244a0fe first commit
-d78c915 initial commit
-HEAD is now at f0c2a7e second commit
-[master bee11d3] fixup! first
+[master b387e0d] first
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ Date: Thu Jan 5 11:47:48 2023 +0000
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+Rebasing (1/2)
Rebasing (2/2)
Executing: touch exec
 Successfully rebased and updated refs/heads/master.
-test_line_count: line count for actual != 3
-bee11d3 fixup! first
-f0c2a7e second commit
-244a0fe first commit
-d78c915 initial commit
-ok 3 - auto fixup (config)
-
-expecting success: 
-	test_auto_squash final-squash --autosquash
-
-HEAD is now at f0c2a7e second commit
-[master 19ce186] squash! first
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Rebasing (2/3)
[detached HEAD 9064ef2] first commit
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:14:13 2005 -0700
- 2 files changed, 2 insertions(+)
- create mode 100644 file1
- create mode 100644 file2
-Rebasing (3/3)
Successfully rebased and updated refs/heads/master.
-ok 4 - auto squash (option)
+ok 3 - rebase --exec --signoff adds a sign-off line
 
 expecting success: 
-	git config rebase.autosquash true &&
-	test_auto_squash final-squash-config-true &&
-	test_must_fail test_auto_squash squash-config-true-no --no-autosquash &&
-	git config rebase.autosquash false &&
-	test_must_fail test_auto_squash final-squash-config-false
+	git commit --amend -m "first" &&
+	git rebase --root --keep-empty --signoff &&
+	git cat-file commit HEAD^ | sed -e "1,/^\$/d" >actual &&
+	test_cmp expected-initial-signed actual &&
+	git cat-file commit HEAD | sed -e "1,/^\$/d" >actual &&
+	test_cmp expected-signed actual
 
-HEAD is now at f0c2a7e second commit
-[master a95a906] squash! first
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Rebasing (2/3)
[detached HEAD 46676fa] first commit
+[master b387e0d] first
  Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:14:13 2005 -0700
- 2 files changed, 2 insertions(+)
- create mode 100644 file1
- create mode 100644 file2
-Rebasing (3/3)
Successfully rebased and updated refs/heads/master.
-HEAD is now at f0c2a7e second commit
-[master fc8ff6e] squash! first
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Successfully rebased and updated refs/heads/master.
-test_line_count: line count for actual != 3
-fc8ff6e squash! first
-f0c2a7e second commit
-244a0fe first commit
-d78c915 initial commit
-HEAD is now at f0c2a7e second commit
-[master 336ee2b] squash! first
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Successfully rebased and updated refs/heads/master.
-test_line_count: line count for actual != 3
-336ee2b squash! first
-f0c2a7e second commit
-244a0fe first commit
-d78c915 initial commit
-ok 5 - auto squash (config)
+ Date: Thu Jan 5 11:47:48 2023 +0000
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/master.
+ok 4 - rebase --root --signoff adds a sign-off line
 
 expecting success: 
-	git reset --hard base &&
-	echo 1 >file1 &&
-	git add -u &&
-	test_tick &&
-	git commit -m "squash! forst" &&
-	git tag final-missquash &&
-	test_tick &&
-	git rebase --autosquash -i HEAD^^^ &&
-	git log --oneline >actual &&
-	test_line_count = 4 actual &&
-	git diff --exit-code final-missquash &&
-	test 0 = $(git rev-list final-missquash...HEAD | wc -l)
+	git commit --amend -m "first" &&
+	git rebase -i --signoff HEAD^ &&
+	git cat-file commit HEAD | sed -e "1,/^\$/d" >actual &&
+	test_cmp expected-signed actual
 
-HEAD is now at f0c2a7e second commit
-[master bdc406a] squash! forst
+[master ccf70f3] first
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Successfully rebased and updated refs/heads/master.
-ok 6 - misspelled auto squash
+ Date: Thu Jan 5 11:47:48 2023 +0000
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+Rebasing (1/1)
Successfully rebased and updated refs/heads/master.
+ok 5 - rebase -i --signoff fails
 
 expecting success: 
-	git reset --hard base &&
-	echo 4 >file4 &&
-	git add file4 &&
-	test_tick &&
-	git commit -m "first new commit" &&
-	echo 1 >file1 &&
-	git add -u &&
-	test_tick &&
-	git commit -m "squash! first" &&
-	git tag final-multisquash &&
-	test_tick &&
-	git rebase --autosquash -i HEAD~4 &&
-	git log --oneline >actual &&
-	test_line_count = 4 actual &&
-	git diff --exit-code final-multisquash &&
-	test 1 = "$(git cat-file blob HEAD^^:file1)" &&
-	test 2 = $(git cat-file commit HEAD^^ | grep first | wc -l) &&
-	test 1 = $(git cat-file commit HEAD | grep first | wc -l)
+	git commit --amend -m "first" &&
+	git rebase -m --signoff HEAD^ &&
+	git cat-file commit HEAD | sed -e "1,/^\$/d" >actual &&
+	test_cmp expected-signed actual
 
-HEAD is now at f0c2a7e second commit
-[master 671d0de] first new commit
+[master ccf70f3] first
  Author: A U Thor <author@example.com>
+ Date: Thu Jan 5 11:47:48 2023 +0000
  1 file changed, 1 insertion(+)
- create mode 100644 file4
-[master 1cded01] squash! first
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Rebasing (2/4)
[detached HEAD 8cc2a0e] first commit
+ create mode 100644 file
+Current branch master is up to date, rebase forced.
+First, rewinding head to replay your work on top of it...
+Merging HEAD^ with HEAD~0
+Merging:
+047fa2d Initial empty commit
+ccf70f3 first
+found 1 common ancestor:
+047fa2d Initial empty commit
+[detached HEAD 679df68] first
  Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:14:13 2005 -0700
- 2 files changed, 2 insertions(+)
- create mode 100644 file1
- create mode 100644 file2
-Rebasing (3/4)
Rebasing (4/4)
Successfully rebased and updated refs/heads/master.
-ok 7 - auto squash that matches 2 commits
+ Date: Thu Jan 5 11:47:48 2023 +0000
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+Committed: 0001 first
+All done.
+ok 6 - rebase -m --signoff fails
 
+# passed all 6 test(s)
+1..6
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t3429-rebase-edit-todo.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3429-rebase-edit-todo/.git/
 expecting success: 
-	git reset --hard base &&
-	echo 1 >file1 &&
-	git add -u &&
-	test_tick &&
-	git commit -m "squash! third" &&
-	echo 4 >file4 &&
-	git add file4 &&
-	test_tick &&
-	git commit -m "third commit" &&
-	git tag final-presquash &&
-	test_tick &&
-	git rebase --autosquash -i HEAD~4 &&
-	git log --oneline >actual &&
-	test_line_count = 5 actual &&
-	git diff --exit-code final-presquash &&
-	test 0 = "$(git cat-file blob HEAD^^:file1)" &&
-	test 1 = "$(git cat-file blob HEAD^:file1)" &&
-	test 1 = $(git cat-file commit HEAD | grep third | wc -l) &&
-	test 1 = $(git cat-file commit HEAD^ | grep third | wc -l)
+	test_commit initial &&
+	todo=.git/rebase-merge/git-rebase-todo &&
+	git rebase HEAD -x "echo exec touch F >>$todo" &&
+	test -e F
 
-HEAD is now at f0c2a7e second commit
-[master 3a205cd] squash! third
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[master 76ae28b] third commit
+[master (root-commit) 24b24cf] initial
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 file4
+ create mode 100644 initial.t
+Rebasing (2/2)
Executing: echo exec touch F >>.git/rebase-merge/git-rebase-todo
+Rebasing (3/3)
Executing: touch F
 Successfully rebased and updated refs/heads/master.
-ok 8 - auto squash that matches a commit after the squash
+ok 1 - rebase exec modifies rebase-todo
 
+# passed all 1 test(s)
+1..1
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t3311-notes-merge-fanout.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3311-notes-merge-fanout/.git/
 expecting success: 
-	git reset --hard base &&
-	echo 1 >file1 &&
-	git add -u &&
-	test_tick &&
-	git commit -m "squash! $(git rev-parse --short HEAD^)" &&
-	git tag final-shasquash &&
-	test_tick &&
-	git rebase --autosquash -i HEAD^^^ &&
-	git log --oneline >actual &&
-	test_line_count = 3 actual &&
-	git diff --exit-code final-shasquash &&
-	test 1 = "$(git cat-file blob HEAD^:file1)" &&
-	test 1 = $(git cat-file commit HEAD^ | grep squash | wc -l)
+	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
 
-HEAD is now at f0c2a7e second commit
-[master 2592f98] squash! 244a0fe
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Rebasing (2/3)
[detached HEAD ba6c8cf] first commit
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:14:13 2005 -0700
- 2 files changed, 2 insertions(+)
- create mode 100644 file1
- create mode 100644 file2
-Rebasing (3/3)
Successfully rebased and updated refs/heads/master.
-ok 9 - auto squash that matches a sha1
+ok 1 - setup a few initial commits with notes (notes ref: x)
 
 expecting success: 
-	git reset --hard base &&
-	echo 1 >file1 &&
-	git add -u &&
-	test_tick &&
-	git commit -m "squash! $(git rev-parse --short=11 HEAD^)" &&
-	git tag final-longshasquash &&
-	test_tick &&
-	git rebase --autosquash -i HEAD^^^ &&
-	git log --oneline >actual &&
-	test_line_count = 3 actual &&
-	git diff --exit-code final-longshasquash &&
-	test 1 = "$(git cat-file blob HEAD^:file1)" &&
-	test 1 = $(git cat-file commit HEAD^ | grep squash | wc -l)
+	verify_notes x commit5 &&
+	verify_no_fanout x
 
-HEAD is now at f0c2a7e second commit
-[master 358ddef] squash! 244a0fe611d
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Rebasing (2/3)
[detached HEAD 2fb404b] first commit
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:14:13 2005 -0700
- 2 files changed, 2 insertions(+)
- create mode 100644 file1
- create mode 100644 file2
-Rebasing (3/3)
Successfully rebased and updated refs/heads/master.
-ok 10 - auto squash that matches longer sha1
+ok 2 - sanity check (x)
 
 expecting success: 
-	test_auto_commit_flags fixup 1
+	git update-ref refs/notes/y refs/notes/x &&
+	git config core.notesRef refs/notes/y &&
+	i=5 &&
+	while test $i -lt $num
+	do
+		i=$(($i + 1)) &&
+		test_commit "commit$i" >/dev/null &&
+		git notes add -m "notes for commit$i" || return 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
 
-HEAD is now at f0c2a7e second commit
-[master ec3ac31] fixup! first commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated refs/heads/master.
-ok 11 - use commit --fixup
+ok 3 - Add a few hundred commits w/notes to trigger fanout (x -> y)
+
+expecting success: verify_fanout y
+ok 4 - notes tree has fanout (y)
 
 expecting success: 
-	test_auto_commit_flags squash 2
+	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)"
 
-HEAD is now at f0c2a7e second commit
-[master 56a0d48] squash! first commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Rebasing (2/3)
[detached HEAD ca39a78] first commit
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:14:13 2005 -0700
- 2 files changed, 2 insertions(+)
- create mode 100644 file1
- create mode 100644 file2
-Rebasing (3/3)
Successfully rebased and updated refs/heads/master.
-ok 12 - use commit --squash
+Already up to date!
+ok 5 - No-op merge (already included) (x => y)
 
 expecting success: 
-	test_auto_fixup_fixup fixup fixup
+	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)"
 
-HEAD is now at f0c2a7e second commit
-[master f2259fa] fixup! first
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[master a8ab281] fixup! fixup! first
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-error: There was a problem with the editor '"$FAKE_EDITOR"'.
-Rebasing (2/4)
Rebasing (3/4)
Rebasing (4/4)
Successfully rebased and updated refs/heads/master.
-ok 13 - fixup! fixup!
+Fast-forward
+ok 6 - Fast-forward merge (y => x)
 
 expecting success: 
-	test_auto_fixup_fixup fixup squash
+	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
 
-HEAD is now at f0c2a7e second commit
-[master a1ad567] fixup! first
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[master ec0f8ee] fixup! squash! first
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-error: There was a problem with the editor '"$FAKE_EDITOR"'.
-Rebasing (2/4)
Rebasing (3/4)
Rebasing (4/4)
Successfully rebased and updated refs/heads/master.
-ok 14 - fixup! squash!
+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: verify_no_fanout z
+ok 8 - notes tree has no fanout (z)
 
 expecting success: 
-	test_auto_fixup_fixup squash squash
+	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
 
-HEAD is now at f0c2a7e second commit
-[master b3c0532] squash! first
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[master 90b2119] squash! squash! first
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-error: There was a problem with the editor '"$FAKE_EDITOR"'.
-Rebasing (2/4)
Rebasing (3/4)
[detached HEAD 0c6388e] first commit
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:14:13 2005 -0700
- 2 files changed, 2 insertions(+)
- create mode 100644 file1
- create mode 100644 file2
-Rebasing (4/4)
Successfully rebased and updated refs/heads/master.
-ok 15 - squash! squash!
+ok 9 - successful merge without conflicts (y => z)
+
+expecting success: verify_fanout m
+ok 10 - notes tree still has fanout after merge (m)
 
 expecting success: 
-	test_auto_fixup_fixup squash fixup
+	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
 
-HEAD is now at f0c2a7e second commit
-[master 9e62506] squash! first
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[master baa3050] squash! fixup! first
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-error: There was a problem with the editor '"$FAKE_EDITOR"'.
-Rebasing (2/4)
Rebasing (3/4)
[detached HEAD f53dd90] first commit
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:14:13 2005 -0700
- 2 files changed, 2 insertions(+)
- create mode 100644 file1
- create mode 100644 file2
-Rebasing (4/4)
Successfully rebased and updated refs/heads/master.
-ok 16 - squash! fixup!
+Overwriting existing notes for object ef004cfa88883bb87e030b6196934dd90e3548d2
+Overwriting existing notes for object e0851358fb6b4703f23d74ef964bc4491bec7ab9
+Overwriting existing notes for object 157e8cc0aeac5befb302d276f2e706112bf6e413
+Removing note for object commit5
+ok 11 - introduce conflicting changes (y -> w)
 
 expecting success: 
-	git reset --hard base &&
-	git config --add rebase.instructionFormat "[%an @ %ar] %s"  &&
-	echo 2 >file1 &&
-	git add -u &&
-	test_tick &&
-	git commit -m "squash! $(git rev-parse --short HEAD^)" &&
-	echo 1 >file1 &&
-	git add -u &&
-	test_tick &&
-	git commit -m "squash! $(git log -n 1 --format=%s HEAD~2)" &&
-	git tag final-squash-instFmt &&
-	test_tick &&
-	git rebase --autosquash -i HEAD~4 &&
-	git log --oneline >actual &&
-	test_line_count = 3 actual &&
-	git diff --exit-code final-squash-instFmt &&
-	test 1 = "$(git cat-file blob HEAD^:file1)" &&
-	test 2 = $(git cat-file commit HEAD^ | grep squash | wc -l)
+	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
 
-HEAD is now at f0c2a7e second commit
-[master 8c2a608] squash! 244a0fe
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[master ab98abd] squash! first commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Rebasing (2/4)
Rebasing (3/4)
[detached HEAD a066413] first commit
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:14:13 2005 -0700
- 2 files changed, 2 insertions(+)
- create mode 100644 file1
- create mode 100644 file2
-Rebasing (4/4)
Successfully rebased and updated refs/heads/master.
-ok 17 - autosquash with custom inst format
+Using local notes for 157e8cc0aeac5befb302d276f2e706112bf6e413
+Using local notes for e0851358fb6b4703f23d74ef964bc4491bec7ab9
+ok 12 - successful merge using "ours" strategy (z => w)
+
+expecting success: verify_fanout m
+ok 13 - notes tree still has fanout after merge (m)
 
 expecting success: 
-	git reset --hard base &&
-	test_commit empty-instructionFormat-test &&
-	(
-		set_cat_todo_editor &&
-		test_must_fail git -c rebase.instructionFormat= \
-			rebase --autosquash  --force -i HEAD^ >actual &&
-		git log -1 --format="pick %h %s" >expect &&
-		test_cmp expect actual
-	)
+	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
 
-HEAD is now at f0c2a7e second commit
-[master c73d304] empty-instructionFormat-test
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 empty-instructionFormat-test.t
-error: There was a problem with the editor '"$FAKE_EDITOR"'.
-ok 18 - autosquash with empty custom instructionFormat
+Using remote notes for 157e8cc0aeac5befb302d276f2e706112bf6e413
+Using remote notes for e0851358fb6b4703f23d74ef964bc4491bec7ab9
+ok 14 - successful merge using "theirs" strategy (z => w)
+
+expecting success: verify_fanout m
+ok 15 - notes tree still has fanout after merge (m)
 
 expecting success: 
-	test_tick &&
-	git commit --allow-empty -m "empty" &&
-	test_tick &&
-	git commit --allow-empty -m "empty2" &&
-	test_tick &&
-	>fixup &&
-	git add fixup &&
-	git commit --fixup HEAD^^ &&
-	(
-		set_backup_editor &&
-		GIT_USE_REBASE_HELPER=false \
-		git rebase -i --force-rebase --autosquash HEAD~4 &&
-		grep empty2 .git/backup-git-rebase-todo
-	)
+	git update-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
 
-[master f0b00cc] empty
- Author: A U Thor <author@example.com>
-[master 57d336e] empty2
- Author: A U Thor <author@example.com>
-[master 214c1c2] fixup! empty-instructionFormat-test
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 fixup
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/master.
-# pick 57d336ec506cd26f9ae698f8800eb63788ef86fe [A U Thor @ 17 years ago] empty2
-ok 19 - autosquash with multiple empty patches
+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: verify_fanout m
+ok 17 - notes tree still has fanout after merge (m)
 
 expecting success: 
-	base=$(git rev-parse HEAD) &&
-	test_commit to-fixup &&
-	git commit --allow-empty -m "fixup!  to-fixup" &&
-	git rebase -i --autosquash --keep-empty HEAD~2 &&
-	parent=$(git rev-parse HEAD^) &&
-	test $base = $parent
+	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
 
-[master e70b585] to-fixup
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 to-fixup.t
-[master 0b5a07e] fixup!  to-fixup
- Author: A U Thor <author@example.com>
-Rebasing (2/2)
Successfully rebased and updated refs/heads/master.
-ok 20 - extra spaces after fixup!
+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: verify_fanout m
+ok 19 - notes tree still has fanout after merge (m)
 
 expecting success: 
-	if test -d .git/rebase-merge; then git rebase --abort; fi &&
-	base=$(git rev-parse HEAD) &&
-	echo "wrapped subject" >wrapped &&
-	git add wrapped &&
-	test_tick &&
-	git commit --allow-empty -m "$(printf "To\nfixup")" &&
-	test_tick &&
-	git commit --allow-empty -m "fixup! To fixup" &&
-	git rebase -i --autosquash --keep-empty HEAD~2 &&
-	parent=$(git rev-parse HEAD^) &&
-	test $base = $parent
+	git update-ref refs/notes/m refs/notes/w &&
+	test_must_fail git notes merge z
 
-[master 8785f39] To fixup
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 wrapped
-[master c4fe568] fixup! To fixup
- Author: A U Thor <author@example.com>
-Rebasing (2/2)
Successfully rebased and updated refs/heads/master.
-ok 21 - wrapped original subject
+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: verify_fanout m
+ok 21 - notes tree still has fanout after merge (m)
 
 expecting success: 
-	test_when_finished "test_might_fail git rebase --abort" &&
-	test_when_finished "git checkout master" &&
+	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)"
 
-	git checkout -b some-squashes &&
-	git commit --allow-empty -m first &&
-	git commit --allow-empty --squash HEAD &&
-	git commit --allow-empty -m second &&
-	git commit --allow-empty --squash HEAD &&
+ok 22 - verify conflict entries (with no fanout)
 
-	test_must_fail git -c core.editor="grep -q ^pick" \
-		rebase -ki --autosquash HEAD~4 &&
-	: do not finish the squash, but resolve it manually &&
-	git commit --allow-empty --amend -m edited-first &&
-	git rebase --skip &&
-	git show >actual &&
-	! grep first actual
+expecting success: 
+	cat >.git/NOTES_MERGE_WORKTREE/$commit_sha3 <<EOF &&
+other notes for commit3
 
-Switched to a new branch 'some-squashes'
-[some-squashes ceaf0dc] first
- Author: A U Thor <author@example.com>
-[some-squashes fd6f13b] squash! first
- Author: A U Thor <author@example.com>
-[some-squashes 66b5018] second
- Author: A U Thor <author@example.com>
-[some-squashes 10808aa] squash! second
- Author: A U Thor <author@example.com>
-Rebasing (2/4)
error: There was a problem with the editor 'grep -q ^pick'.
-Please supply the message using either -m or -F option.
-Could not apply fd6f13b... [A U Thor @ 17 years ago] squash! first
-[detached HEAD 4808a4c] edited-first
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 16:09:13 2005 -0700
-Rebasing (3/4)
Rebasing (4/4)
[detached HEAD 3e50d0a] second
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 16:09:13 2005 -0700
-Successfully rebased and updated refs/heads/some-squashes.
-Switched to branch 'master'
-fatal: No rebase in progress?
-ok 22 - abort last squash
+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
 
-# passed all 22 test(s)
-1..22
+ok 23 - resolve and finalize merge (z => w)
+
+expecting success: verify_fanout m
+ok 24 - notes tree still has fanout after merge (m)
+
+# passed all 24 test(s)
+1..24
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t3409-rebase-preserve-merges.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3409-rebase-preserve-merges/.git/
+*** t3414-rebase-preserve-onto.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3414-rebase-preserve-onto/.git/
 checking prerequisite: REBASE_P
 
 mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
@@ -73230,327 +73691,133 @@
 
 )
 prerequisite REBASE_P ok
-expecting success: echo First > A &&
-	git add A &&
-	git commit -m "Add A1" &&
-	git checkout -b topic &&
-	echo Second > B &&
-	git add B &&
-	git commit -m "Add B1" &&
-	git checkout -f master &&
-	echo Third >> A &&
-	git commit -a -m "Modify A2" &&
-	echo Fifth > B &&
-	git add B &&
-	git commit -m "Add different B" &&
-
-	git clone ./. clone2 &&
-	(
-		cd clone2 &&
-		git checkout -b topic origin/topic &&
-		test_must_fail git merge origin/master &&
-		echo Resolved >B &&
-		git add B &&
-		git commit -m "Merge origin/master into topic"
-	) &&
-
-	git clone ./. clone3 &&
-	(
-		cd clone3 &&
-		git checkout -b topic2 origin/topic &&
-		echo Sixth > A &&
-		git commit -a -m "Modify A3" &&
-		git checkout -b topic origin/topic &&
-		git merge --no-ff topic2
-	) &&
-
-	git clone ./. clone4 &&
-	(
-		cd clone4 &&
-		git checkout -b topic2 origin/topic &&
-		echo Sixth > A &&
-		git commit -a -m "Modify A3" &&
-		git checkout -b topic origin/topic &&
-		git merge --no-ff topic2
-	) &&
-
-	git checkout topic &&
-	echo Fourth >> B &&
-	git commit -a -m "Modify B2"
+expecting success: 
+	test_commit A1 &&
+	test_commit B1 &&
+	test_commit C1 &&
+	test_commit D1 &&
+	git reset --hard B1 &&
+	test_commit E1 &&
+	test_commit F1 &&
+	test_merge G1 D1 &&
+	git reset --hard A1 &&
+	test_commit H1
 
-[master (root-commit) fe27c70] Add A1
- Author: A U Thor <bogus_email_address>
+[master (root-commit) 6fb0b66] A1
+ Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 A
-Switched to a new branch 'topic'
-[topic 5c09409] Add B1
- Author: A U Thor <bogus_email_address>
+ create mode 100644 A1.t
+[master 37e5de5] B1
+ Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 B
-Switched to branch 'master'
-[master 4d2a244] Modify A2
- Author: A U Thor <bogus_email_address>
+ create mode 100644 B1.t
+[master 9db6c33] C1
+ Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[master 7980834] Add different B
- Author: A U Thor <bogus_email_address>
+ create mode 100644 C1.t
+[master d7157d8] D1
+ Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 B
-Cloning into 'clone2'...
-done.
-Switched to a new branch 'topic'
-Branch 'topic' set up to track remote branch 'topic' from 'origin'.
-Merging:
-5c09409 Add B1
-virtual origin/master
-found 1 common ancestor:
-fe27c70 Add A1
-Auto-merging B
-CONFLICT (add/add): Merge conflict in B
-Automatic merge failed; fix conflicts and then commit the result.
-[topic 7925308] Merge origin/master into topic
- Author: A U Thor <bogus_email_address>
-Cloning into 'clone3'...
-done.
-Switched to a new branch 'topic2'
-Branch 'topic2' set up to track remote branch 'topic' from 'origin'.
-[topic2 d97e505] Modify A3
- Author: A U Thor <bogus_email_address>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'topic'
-Branch 'topic' set up to track remote branch 'topic' from 'origin'.
-Merging:
-5c09409 Add B1
-virtual topic2
-found 1 common ancestor:
-5c09409 Add B1
-Merge made by the 'recursive' strategy.
- A | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Cloning into 'clone4'...
-done.
-Switched to a new branch 'topic2'
-Branch 'topic2' set up to track remote branch 'topic' from 'origin'.
-[topic2 3629539] Modify A3
- Author: A U Thor <bogus_email_address>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'topic'
-Branch 'topic' set up to track remote branch 'topic' from 'origin'.
+ create mode 100644 D1.t
+HEAD is now at 37e5de5 B1
+[master b959d6c] E1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 E1.t
+[master 81dc3a6] F1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 F1.t
 Merging:
-5c09409 Add B1
-virtual topic2
+81dc3a6 F1
+virtual D1
 found 1 common ancestor:
-5c09409 Add B1
+37e5de5 B1
 Merge made by the 'recursive' strategy.
- A | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to branch 'topic'
-[topic 8f87f33] Modify B2
- Author: A U Thor <bogus_email_address>
+ C1.t | 1 +
+ D1.t | 1 +
+ 2 files changed, 2 insertions(+)
+ create mode 100644 C1.t
+ create mode 100644 D1.t
+HEAD is now at 6fb0b66 A1
+[master 4950a7c] H1
+ Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-ok 1 - setup for merge-preserving rebase
-
-expecting success: 
-	(
-	cd clone2 &&
-	git fetch &&
-	test_must_fail git rebase -p origin/topic &&
-	test 2 = $(git ls-files B | wc -l) &&
-	echo Resolved again > B &&
-	test_must_fail git rebase --continue &&
-	grep "^@@@ " .git/rebase-merge/patch &&
-	git add B &&
-	git rebase --continue &&
-	test 1 = $(git rev-list --all --pretty=oneline | grep "Modify A" | wc -l) &&
-	test 1 = $(git rev-list --all --pretty=oneline | grep "Add different" | wc -l) &&
-	test 1 = $(git rev-list --all --pretty=oneline | grep "Merge origin" | wc -l)
-	)
-
-From /build/git-2.20.1/t/trash directory.t3409-rebase-preserve-merges/./.
-   5c09409..8f87f33  topic      -> origin/topic
-Rebasing (1/1)
Merging:
-8f87f33 Modify B2
-virtual 79808342b6afc16274e420ea002d3550c018169a
-found 1 common ancestor:
-fe27c70 Add A1
-Auto-merging B
-CONFLICT (add/add): Merge conflict in B
-Automatic merge failed; fix conflicts and then commit the result.
-Error redoing merge 7925308ae4caf41fcdeefda20e4dd4807425946e
-B: needs merge
-You must edit all merge conflicts and then
-mark them as resolved using git add
-@@@ -1,1 -1,1 +1,1 @@@
-[detached HEAD a74eab4] Merge origin/master into topic
- Author: A U Thor <bogus_email_address>
-Rebasing (1/1)
Successfully rebased and updated refs/heads/topic.
-ok 2 - --continue works after a conflict
+ create mode 100644 H1.t
+ok 1 - setup
 
 expecting success: 
-	(
-	cd clone3 &&
-	git fetch &&
-	git rebase -p origin/topic &&
-	test 3 = $(git rev-list --all --pretty=oneline | grep "Modify A" | wc -l) &&
-	test 1 = $(git rev-list --all --pretty=oneline | grep "Merge branch" | wc -l)
-	)
+	git checkout G1 &&
+	git rebase -p --onto H1 B1 &&
+	test "$(git rev-parse HEAD^1^1^1)" = "$(git rev-parse H1)" &&
+	test "$(git rev-parse HEAD^2^1^1)" = "$(git rev-parse H1)"
 
-From /build/git-2.20.1/t/trash directory.t3409-rebase-preserve-merges/./.
-   5c09409..8f87f33  topic      -> origin/topic
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/topic.
-ok 3 - rebase -p preserves no-ff merges
+Note: checking out 'G1'.
 
-expecting success: 
-	(
-	cd clone4 &&
-	git fetch &&
-	git -c merge.log=1 rebase -p origin/topic &&
-	echo >expected &&
-	git log --format="%b" -1 >current &&
-	test_cmp expected current
-	)
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by performing another checkout.
 
-From /build/git-2.20.1/t/trash directory.t3409-rebase-preserve-merges/./.
-   5c09409..8f87f33  topic      -> origin/topic
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/topic.
-ok 4 - rebase -p ignores merge.log config
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -b with the checkout command again. Example:
 
-# passed all 4 test(s)
-1..4
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t3429-rebase-edit-todo.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3429-rebase-edit-todo/.git/
-expecting success: 
-	test_commit initial &&
-	todo=.git/rebase-merge/git-rebase-todo &&
-	git rebase HEAD -x "echo exec touch F >>$todo" &&
-	test -e F
+  git checkout -b <new-branch-name>
 
-[master (root-commit) 24b24cf] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-Rebasing (2/2)
Executing: echo exec touch F >>.git/rebase-merge/git-rebase-todo
-Rebasing (3/3)
Executing: touch F
-Successfully rebased and updated refs/heads/master.
-ok 1 - rebase exec modifies rebase-todo
+HEAD is now at 52308dd G1
+Rebasing (1/5)
Rebasing (2/5)
Rebasing (3/5)
Rebasing (4/5)
Rebasing (5/5)
Successfully rebased and updated detached HEAD.
+ok 2 - rebase from B1 onto H1
 
-# passed all 1 test(s)
-1..1
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t3428-rebase-signoff.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3428-rebase-signoff/.git/
 expecting success: 
-	git commit --allow-empty -m "Initial empty commit" &&
-	git add file && git commit -m first &&
-	git config alias.rbs "rebase --signoff" &&
-	git rbs HEAD^ &&
-	git cat-file commit HEAD | sed -e "1,/^\$/d" > actual &&
-	test_cmp expected-signed actual
+	git checkout G1 &&
+	git rebase -p --onto H1 E1 &&
+	test "$(git rev-parse HEAD^1^1)" = "$(git rev-parse H1)" &&
+	test "$(git rev-parse HEAD^2)" = "$(git rev-parse D1)"
 
-[master (root-commit) df317c4] Initial empty commit
- Author: A U Thor <author@example.com>
-[master 759962e] first
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-Current branch master is up to date, rebase forced.
-First, rewinding head to replay your work on top of it...
-Applying: first
-ok 1 - rebase --signoff adds a sign-off line
+Warning: you are leaving 5 commits behind, not connected to
+any of your branches:
 
-expecting success: 
-	git commit --amend -m "first" &&
-	git rbs --no-signoff HEAD^ &&
-	git cat-file commit HEAD | sed -e "1,/^\$/d" > actual &&
-	test_cmp expected-unsigned actual
+  ab2e25c G1
+  eb95cad F1
+  52202eb D1
+  227fb12 E1
+  9e481e9 C1
 
-[master 759962e] first
- Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:05:57 2021 +0000
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-Current branch master is up to date.
-ok 2 - rebase --no-signoff does not add a sign-off line
+If you want to keep them by creating a new branch, this may be a good time
+to do so with:
 
-expecting success: 
-	test_when_finished "rm exec" &&
-	git commit --amend -m "first" &&
-	git rebase --exec "touch exec" --signoff HEAD^ &&
-	test_path_is_file exec &&
-	git cat-file commit HEAD | sed -e "1,/^\$/d" >actual &&
-	test_cmp expected-signed actual
+ git branch <new-branch-name> ab2e25c
 
-[master 759962e] first
- Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:05:57 2021 +0000
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-Rebasing (1/2)
Rebasing (2/2)
Executing: touch exec
-Successfully rebased and updated refs/heads/master.
-ok 3 - rebase --exec --signoff adds a sign-off line
+HEAD is now at 52308dd G1
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated detached HEAD.
+ok 3 - rebase from E1 onto H1
 
 expecting success: 
-	git commit --amend -m "first" &&
-	git rebase --root --keep-empty --signoff &&
-	git cat-file commit HEAD^ | sed -e "1,/^\$/d" >actual &&
-	test_cmp expected-initial-signed actual &&
-	git cat-file commit HEAD | sed -e "1,/^\$/d" >actual &&
-	test_cmp expected-signed actual
+	git checkout G1 &&
+	git rev-list --first-parent --pretty=oneline C1..G1 &&
+	git rebase -p --onto H1 C1 &&
+	test "$(git rev-parse HEAD^2^1)" = "$(git rev-parse H1)" &&
+	test "$(git rev-parse HEAD^1)" = "$(git rev-parse F1)"
 
-[master cd90ade] first
- Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:05:57 2021 +0000
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/master.
-ok 4 - rebase --root --signoff adds a sign-off line
+Warning: you are leaving 2 commits behind, not connected to
+any of your branches:
 
-expecting success: 
-	git commit --amend -m "first" &&
-	git rebase -i --signoff HEAD^ &&
-	git cat-file commit HEAD | sed -e "1,/^\$/d" >actual &&
-	test_cmp expected-signed actual
+  a6d9fc8 G1
+  4d3dd7d F1
 
-[master aac46fb] first
- Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:05:57 2021 +0000
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-Rebasing (1/1)
Successfully rebased and updated refs/heads/master.
-ok 5 - rebase -i --signoff fails
+If you want to keep them by creating a new branch, this may be a good time
+to do so with:
 
-expecting success: 
-	git commit --amend -m "first" &&
-	git rebase -m --signoff HEAD^ &&
-	git cat-file commit HEAD | sed -e "1,/^\$/d" >actual &&
-	test_cmp expected-signed actual
+ git branch <new-branch-name> a6d9fc8
 
-[master aac46fb] first
- Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:05:57 2021 +0000
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-Current branch master is up to date, rebase forced.
-First, rewinding head to replay your work on top of it...
-Merging HEAD^ with HEAD~0
-Merging:
-45f1b43 Initial empty commit
-aac46fb first
-found 1 common ancestor:
-45f1b43 Initial empty commit
-[detached HEAD b24ae0e] first
- Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:05:57 2021 +0000
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-Committed: 0001 first
-All done.
-ok 6 - rebase -m --signoff fails
+HEAD is now at 52308dd G1
+52308dd60394ebd5599b39fb69108f164975ed7a G1
+81dc3a6494c9a0091f921c65194433ffa66d8dac F1
+b959d6cc0d4f2d10f0d432e45cd5578c75065af5 E1
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated detached HEAD.
+ok 4 - rebase from C1 onto H1
 
-# passed all 6 test(s)
-1..6
+# passed all 4 test(s)
+1..4
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
 *** t3500-cherry.sh ***
@@ -73624,6 +73891,268 @@
 1..3
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
+*** t3502-cherry-pick-merge.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3502-cherry-pick-merge/.git/
+expecting success: 
+
+	>A &&
+	>B &&
+	git add A B &&
+	git commit -m "Initial" &&
+	git tag initial &&
+	git branch side &&
+	echo new line >A &&
+	git commit -m "add line to A" A &&
+	git tag a &&
+	git checkout side &&
+	echo new line >B &&
+	git commit -m "add line to B" B &&
+	git tag b &&
+	git checkout master &&
+	git merge side &&
+	git tag c
+
+
+[master (root-commit) 4782060] Initial
+ Author: A U Thor <author@example.com>
+ 2 files changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 A
+ create mode 100644 B
+[master bb22e8e] add line to A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Switched to branch 'side'
+[side fba6d05] add line to B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Switched to branch 'master'
+Merging:
+bb22e8e add line to A
+virtual side
+found 1 common ancestor:
+4782060 Initial
+Merge made by the 'recursive' strategy.
+ B | 1 +
+ 1 file changed, 1 insertion(+)
+ok 1 - setup
+
+expecting success: 
+	# expect 129 here to distinguish between cases where
+	# there was nothing to cherry-pick
+	test_expect_code 129 git cherry-pick -m &&
+	test_expect_code 129 git cherry-pick -m foo b &&
+	test_expect_code 129 git cherry-pick -m -1 b &&
+	test_expect_code 129 git cherry-pick -m 0 b
+
+error: switch `m' requires a value
+error: option `mainline' expects a number greater than zero
+error: option `mainline' expects a number greater than zero
+error: option `mainline' expects a number greater than zero
+ok 2 - cherry-pick -m complains of bogus numbers
+
+expecting success: 
+
+	git reset --hard &&
+	git checkout a^0 &&
+	test_expect_code 128 git cherry-pick -m 1 b &&
+	git diff --exit-code a --
+
+
+HEAD is now at aff51ff Merge branch 'side'
+Note: checking out '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 performing another checkout.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -b with the checkout command again. Example:
+
+  git checkout -b <new-branch-name>
+
+HEAD is now at bb22e8e add line to A
+error: mainline was specified but commit fba6d05980ca8106cd600a13616ccfcea25a87bd is not a merge.
+fatal: cherry-pick failed
+ok 3 - cherry-pick a non-merge with -m should fail
+
+expecting success: 
+
+	git reset --hard &&
+	git checkout a^0 &&
+	test_must_fail git cherry-pick c &&
+	git diff --exit-code a --
+
+
+HEAD is now at bb22e8e add line to A
+HEAD is now at bb22e8e add line to A
+error: commit aff51ff0b1b82c2d27badebc816dae2f110c1db2 is a merge but no -m option was given.
+fatal: cherry-pick failed
+ok 4 - cherry pick a merge without -m should fail
+
+expecting success: 
+
+	git reset --hard &&
+	git checkout a^0 &&
+	git cherry-pick -m 1 c &&
+	git diff --exit-code c
+
+
+HEAD is now at bb22e8e add line to A
+HEAD is now at bb22e8e add line to A
+[detached HEAD 5b4bdf8] Merge branch 'side'
+ Author: A U Thor <author@example.com>
+ Date: Thu Jan 5 11:47:53 2023 +0000
+ 1 file changed, 1 insertion(+)
+ok 5 - cherry pick a merge (1)
+
+expecting success: 
+
+	git reset --hard &&
+	git checkout b^0 &&
+	git cherry-pick -m 2 c &&
+	git diff --exit-code c
+
+
+HEAD is now at 5b4bdf8 Merge branch 'side'
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  5b4bdf8 Merge branch 'side'
+
+If you want to keep it by creating a new branch, this may be a good time
+to do so with:
+
+ git branch <new-branch-name> 5b4bdf8
+
+HEAD is now at fba6d05 add line to B
+[detached HEAD 8ede01d] Merge branch 'side'
+ Author: A U Thor <author@example.com>
+ Date: Thu Jan 5 11:47:53 2023 +0000
+ 1 file changed, 1 insertion(+)
+ok 6 - cherry pick a merge (2)
+
+expecting success: 
+
+	git reset --hard &&
+	git checkout b^0 &&
+	test_must_fail git cherry-pick -m 3 c
+
+
+HEAD is now at 8ede01d Merge branch 'side'
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  8ede01d Merge branch 'side'
+
+If you want to keep it by creating a new branch, this may be a good time
+to do so with:
+
+ git branch <new-branch-name> 8ede01d
+
+HEAD is now at fba6d05 add line to B
+error: commit aff51ff0b1b82c2d27badebc816dae2f110c1db2 does not have parent 3
+fatal: cherry-pick failed
+ok 7 - cherry pick a merge relative to nonexistent parent should fail
+
+expecting success: 
+
+	git reset --hard &&
+	git checkout c^0 &&
+	test_must_fail git revert -m 1 b &&
+	git diff --exit-code c
+
+
+HEAD is now at fba6d05 add line to B
+Previous HEAD position was fba6d05 add line to B
+HEAD is now at aff51ff Merge branch 'side'
+error: mainline was specified but commit fba6d05980ca8106cd600a13616ccfcea25a87bd is not a merge.
+fatal: revert failed
+ok 8 - revert a non-merge with -m should fail
+
+expecting success: 
+
+	git reset --hard &&
+	git checkout c^0 &&
+	test_must_fail git revert c &&
+	git diff --exit-code c
+
+
+HEAD is now at aff51ff Merge branch 'side'
+HEAD is now at aff51ff Merge branch 'side'
+error: commit aff51ff0b1b82c2d27badebc816dae2f110c1db2 is a merge but no -m option was given.
+fatal: revert failed
+ok 9 - revert a merge without -m should fail
+
+expecting success: 
+
+	git reset --hard &&
+	git checkout c^0 &&
+	git revert -m 1 c &&
+	git diff --exit-code a --
+
+
+HEAD is now at aff51ff Merge branch 'side'
+HEAD is now at aff51ff Merge branch 'side'
+[detached HEAD 67950e8] Revert "Merge branch 'side'"
+ Author: A U Thor <author@example.com>
+ Date: Thu Jan 5 11:47:54 2023 +0000
+ 1 file changed, 1 deletion(-)
+ok 10 - revert a merge (1)
+
+expecting success: 
+
+	git reset --hard &&
+	git checkout c^0 &&
+	git revert -m 2 c &&
+	git diff --exit-code b --
+
+
+HEAD is now at 67950e8 Revert "Merge branch 'side'"
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  67950e8 Revert "Merge branch 'side'"
+
+If you want to keep it by creating a new branch, this may be a good time
+to do so with:
+
+ git branch <new-branch-name> 67950e8
+
+HEAD is now at aff51ff Merge branch 'side'
+[detached HEAD 2fabf0e] Revert "Merge branch 'side'"
+ Author: A U Thor <author@example.com>
+ Date: Thu Jan 5 11:47:54 2023 +0000
+ 1 file changed, 1 deletion(-)
+ok 11 - revert a merge (2)
+
+expecting success: 
+
+	git reset --hard &&
+	git checkout c^0 &&
+	test_must_fail git revert -m 3 c &&
+	git diff --exit-code c
+
+
+HEAD is now at 2fabf0e Revert "Merge branch 'side'"
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  2fabf0e Revert "Merge branch 'side'"
+
+If you want to keep it by creating a new branch, this may be a good time
+to do so with:
+
+ git branch <new-branch-name> 2fabf0e
+
+HEAD is now at aff51ff Merge branch 'side'
+error: commit aff51ff0b1b82c2d27badebc816dae2f110c1db2 does not have parent 3
+fatal: revert failed
+ok 12 - revert a merge relative to nonexistent parent should fail
+
+# passed all 12 test(s)
+1..12
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
 *** t3501-revert-cherry-pick.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3501-revert-cherry-pick/.git/
 expecting success: 
@@ -73927,268 +74456,6 @@
 1..12
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t3502-cherry-pick-merge.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3502-cherry-pick-merge/.git/
-expecting success: 
-
-	>A &&
-	>B &&
-	git add A B &&
-	git commit -m "Initial" &&
-	git tag initial &&
-	git branch side &&
-	echo new line >A &&
-	git commit -m "add line to A" A &&
-	git tag a &&
-	git checkout side &&
-	echo new line >B &&
-	git commit -m "add line to B" B &&
-	git tag b &&
-	git checkout master &&
-	git merge side &&
-	git tag c
-
-
-[master (root-commit) c2b157e] Initial
- Author: A U Thor <author@example.com>
- 2 files changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 A
- create mode 100644 B
-[master d410fbd] add line to A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Switched to branch 'side'
-[side 167c353] add line to B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Switched to branch 'master'
-Merging:
-d410fbd add line to A
-virtual side
-found 1 common ancestor:
-c2b157e Initial
-Merge made by the 'recursive' strategy.
- B | 1 +
- 1 file changed, 1 insertion(+)
-ok 1 - setup
-
-expecting success: 
-	# expect 129 here to distinguish between cases where
-	# there was nothing to cherry-pick
-	test_expect_code 129 git cherry-pick -m &&
-	test_expect_code 129 git cherry-pick -m foo b &&
-	test_expect_code 129 git cherry-pick -m -1 b &&
-	test_expect_code 129 git cherry-pick -m 0 b
-
-error: switch `m' requires a value
-error: option `mainline' expects a number greater than zero
-error: option `mainline' expects a number greater than zero
-error: option `mainline' expects a number greater than zero
-ok 2 - cherry-pick -m complains of bogus numbers
-
-expecting success: 
-
-	git reset --hard &&
-	git checkout a^0 &&
-	test_expect_code 128 git cherry-pick -m 1 b &&
-	git diff --exit-code a --
-
-
-HEAD is now at aae20eb Merge branch 'side'
-Note: checking out '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 performing another checkout.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
-
-  git checkout -b <new-branch-name>
-
-HEAD is now at d410fbd add line to A
-error: mainline was specified but commit 167c3533381260a9198b69c83bf745fa0824d4fa is not a merge.
-fatal: cherry-pick failed
-ok 3 - cherry-pick a non-merge with -m should fail
-
-expecting success: 
-
-	git reset --hard &&
-	git checkout a^0 &&
-	test_must_fail git cherry-pick c &&
-	git diff --exit-code a --
-
-
-HEAD is now at d410fbd add line to A
-HEAD is now at d410fbd add line to A
-error: commit aae20ebe9c6a13e201807a219fd8e6e12499cb53 is a merge but no -m option was given.
-fatal: cherry-pick failed
-ok 4 - cherry pick a merge without -m should fail
-
-expecting success: 
-
-	git reset --hard &&
-	git checkout a^0 &&
-	git cherry-pick -m 1 c &&
-	git diff --exit-code c
-
-
-HEAD is now at d410fbd add line to A
-HEAD is now at d410fbd add line to A
-[detached HEAD 81c4d75] Merge branch 'side'
- Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:06:03 2021 +0000
- 1 file changed, 1 insertion(+)
-ok 5 - cherry pick a merge (1)
-
-expecting success: 
-
-	git reset --hard &&
-	git checkout b^0 &&
-	git cherry-pick -m 2 c &&
-	git diff --exit-code c
-
-
-HEAD is now at 81c4d75 Merge branch 'side'
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  81c4d75 Merge branch 'side'
-
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
-
- git branch <new-branch-name> 81c4d75
-
-HEAD is now at 167c353 add line to B
-[detached HEAD d3be0f6] Merge branch 'side'
- Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:06:03 2021 +0000
- 1 file changed, 1 insertion(+)
-ok 6 - cherry pick a merge (2)
-
-expecting success: 
-
-	git reset --hard &&
-	git checkout b^0 &&
-	test_must_fail git cherry-pick -m 3 c
-
-
-HEAD is now at d3be0f6 Merge branch 'side'
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  d3be0f6 Merge branch 'side'
-
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
-
- git branch <new-branch-name> d3be0f6
-
-HEAD is now at 167c353 add line to B
-error: commit aae20ebe9c6a13e201807a219fd8e6e12499cb53 does not have parent 3
-fatal: cherry-pick failed
-ok 7 - cherry pick a merge relative to nonexistent parent should fail
-
-expecting success: 
-
-	git reset --hard &&
-	git checkout c^0 &&
-	test_must_fail git revert -m 1 b &&
-	git diff --exit-code c
-
-
-HEAD is now at 167c353 add line to B
-Previous HEAD position was 167c353 add line to B
-HEAD is now at aae20eb Merge branch 'side'
-error: mainline was specified but commit 167c3533381260a9198b69c83bf745fa0824d4fa is not a merge.
-fatal: revert failed
-ok 8 - revert a non-merge with -m should fail
-
-expecting success: 
-
-	git reset --hard &&
-	git checkout c^0 &&
-	test_must_fail git revert c &&
-	git diff --exit-code c
-
-
-HEAD is now at aae20eb Merge branch 'side'
-HEAD is now at aae20eb Merge branch 'side'
-error: commit aae20ebe9c6a13e201807a219fd8e6e12499cb53 is a merge but no -m option was given.
-fatal: revert failed
-ok 9 - revert a merge without -m should fail
-
-expecting success: 
-
-	git reset --hard &&
-	git checkout c^0 &&
-	git revert -m 1 c &&
-	git diff --exit-code a --
-
-
-HEAD is now at aae20eb Merge branch 'side'
-HEAD is now at aae20eb Merge branch 'side'
-[detached HEAD 43e81d4] Revert "Merge branch 'side'"
- Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:06:04 2021 +0000
- 1 file changed, 1 deletion(-)
-ok 10 - revert a merge (1)
-
-expecting success: 
-
-	git reset --hard &&
-	git checkout c^0 &&
-	git revert -m 2 c &&
-	git diff --exit-code b --
-
-
-HEAD is now at 43e81d4 Revert "Merge branch 'side'"
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  43e81d4 Revert "Merge branch 'side'"
-
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
-
- git branch <new-branch-name> 43e81d4
-
-HEAD is now at aae20eb Merge branch 'side'
-[detached HEAD 9bab4bc] Revert "Merge branch 'side'"
- Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:06:04 2021 +0000
- 1 file changed, 1 deletion(-)
-ok 11 - revert a merge (2)
-
-expecting success: 
-
-	git reset --hard &&
-	git checkout c^0 &&
-	test_must_fail git revert -m 3 c &&
-	git diff --exit-code c
-
-
-HEAD is now at 9bab4bc Revert "Merge branch 'side'"
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  9bab4bc Revert "Merge branch 'side'"
-
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
-
- git branch <new-branch-name> 9bab4bc
-
-HEAD is now at aae20eb Merge branch 'side'
-error: commit aae20ebe9c6a13e201807a219fd8e6e12499cb53 does not have parent 3
-fatal: revert failed
-ok 12 - revert a merge relative to nonexistent parent should fail
-
-# passed all 12 test(s)
-1..12
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
 *** t3503-cherry-pick-root.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3503-cherry-pick-root/.git/
 expecting success: 
@@ -74345,1925 +74612,646 @@
 1..6
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t1013-read-tree-submodule.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/.git/
+*** t3504-cherry-pick-rerere.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3504-cherry-pick-rerere/.git/
 expecting success: 
-		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/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1/.git/
-[master (root-commit) 839fc9d] 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/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update_sub2/.git/
-[master (root-commit) 1d9815c] 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/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update_repo/.git/
-[master (root-commit) a3d8ae7] 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/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update_repo/sub1'...
-done.
-Cloning into '/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update_repo/uninitialized_sub'...
-done.
-[add_sub1 d92336d] 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'
-Removing uninitialized_sub
-Removing sub1
-Removing .gitmodules
-[remove_sub1 7e2c5cc] Revert "Add sub1"
- Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:04:32 2021 +0000
- 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 af28ff5] modified file2 and added file3
+	test_commit foo &&
+	test_commit foo-master foo &&
+	test_commit bar-master bar &&
+
+	git checkout -b dev foo &&
+	test_commit foo-dev foo &&
+	test_commit bar-dev bar &&
+	git config rerere.enabled true
+
+[master (root-commit) ddd63c9] foo
  Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+), 1 deletion(-)
- create mode 100644 file3
-To /build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1
- * [new branch]      modifications -> modifications
-[modify_sub1 66ddaf7] Modify sub1
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo.t
+[master 07d3a39] foo-master
  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/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update_repo/sub1/sub2'...
-done.
-[add_nested_sub 762838b] add a nested submodule
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo
+[master 04a71fd] bar-master
  Author: A U Thor <author@example.com>
- 2 files changed, 5 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub2
-[add_nested_sub 70a2bbb] update submodule, that updates a nested submodule
+ 1 file changed, 1 insertion(+)
+ create mode 100644 bar
+Switched to a new branch 'dev'
+[dev 1d8ba7e] foo-dev
  Author: A U Thor <author@example.com>
-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 d1625ae] make a change in nested sub
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo
+[dev 5392a79] bar-dev
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 file3
-[modify_sub1_recursively e8b2462] update nested sub
+ create mode 100644 bar
+ok 1 - setup
+
+expecting success: 
+	test_must_fail git merge master
+
+Merging:
+5392a79 bar-dev
+virtual master
+found 1 common ancestor:
+ddd63c9 foo
+Auto-merging foo
+CONFLICT (add/add): Merge conflict in foo
+Auto-merging bar
+CONFLICT (add/add): Merge conflict in bar
+Recorded preimage for 'bar'
+Recorded preimage for 'foo'
+Automatic merge failed; fix conflicts and then commit the result.
+ok 2 - conflicting merge
+
+expecting success: 
+	echo foo-resolved >foo &&
+	echo bar-resolved >bar &&
+	git commit -am resolved &&
+	cp foo foo-expect &&
+	cp bar bar-expect &&
+	git reset --hard HEAD^
+
+Recorded resolution for 'bar'.
+Recorded resolution for 'foo'.
+[dev b8bd488] resolved
+ Author: A U Thor <author@example.com>
+HEAD is now at 5392a79 bar-dev
+ok 3 - fixup
+
+expecting success: 
+	test_must_fail git cherry-pick --rerere-autoupdate foo..bar-master &&
+	test_cmp foo-expect foo &&
+	git diff-files --quiet &&
+	test_must_fail git cherry-pick --continue &&
+	test_cmp bar-expect bar &&
+	git diff-files --quiet &&
+	git cherry-pick --continue &&
+	git reset --hard bar-dev
+
+Auto-merging foo
+CONFLICT (add/add): Merge conflict in foo
+error: could not apply 07d3a39... foo-master
+hint: after resolving the conflicts, mark the corrected paths
+hint: with 'git add <paths>' or 'git rm <paths>'
+hint: and commit the result with 'git commit'
+Staged 'foo' using previous resolution.
+[dev 7d941fc] foo-master
  Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:14:13 2005 -0700
  1 file changed, 1 insertion(+), 1 deletion(-)
-[modify_sub1_recursively 02afa2f] update sub1, that updates nested sub
+Auto-merging bar
+CONFLICT (add/add): Merge conflict in bar
+error: could not apply 04a71fd... bar-master
+hint: after resolving the conflicts, mark the corrected paths
+hint: with 'git add <paths>' or 'git rm <paths>'
+hint: and commit the result with 'git commit'
+Staged 'bar' using previous resolution.
+[dev f23d681] bar-master
  Author: A U Thor <author@example.com>
-To /build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1
- * [new branch]      modify_sub1_recursively -> modify_sub1_recursively
-To /build/git-2.20.1/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 '839fc9debdec2466afc3592b8a3280bd74195f55'
-Previous HEAD position was 839fc9d Base inside first submodule
-Switched to branch 'modifications'
-rm 'sub1'
-[replace_sub1_with_directory d669f84] Replace sub1 with directory
+ Date: Thu Apr 7 15:15:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+HEAD is now at 5392a79 bar-dev
+ok 4 - cherry-pick conflict with --rerere-autoupdate
+
+expecting success: 
+	test_config rerere.autoUpdate true &&
+	test_must_fail git cherry-pick foo..bar-master &&
+	test_cmp foo-expect foo &&
+	git diff-files --quiet &&
+	test_must_fail git cherry-pick --continue &&
+	test_cmp bar-expect bar &&
+	git diff-files --quiet &&
+	git cherry-pick --continue &&
+	git reset --hard bar-dev
+
+Auto-merging foo
+CONFLICT (add/add): Merge conflict in foo
+error: could not apply 07d3a39... foo-master
+hint: after resolving the conflicts, mark the corrected paths
+hint: with 'git add <paths>' or 'git rm <paths>'
+hint: and commit the result with 'git commit'
+Staged 'foo' using previous resolution.
+[dev 7d941fc] foo-master
  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'
-Removing sub1/file3
-Removing sub1/file2
-Removing sub1/file1
-Adding sub1
-[replace_directory_with_sub1 473c706] Revert "Replace sub1 with directory"
+ Date: Thu Apr 7 15:14:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Auto-merging bar
+CONFLICT (add/add): Merge conflict in bar
+error: could not apply 04a71fd... bar-master
+hint: after resolving the conflicts, mark the corrected paths
+hint: with 'git add <paths>' or 'git rm <paths>'
+hint: and commit the result with 'git commit'
+Staged 'bar' using previous resolution.
+[dev f23d681] bar-master
  Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:04:38 2021 +0000
- 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 b1de0eb] Replace sub1 with file
+ Date: Thu Apr 7 15:15:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+HEAD is now at 5392a79 bar-dev
+ok 5 - cherry-pick conflict repsects rerere.autoUpdate
+
+expecting success: 
+	test_config rerere.autoUpdate true &&
+	test_must_fail git cherry-pick --no-rerere-autoupdate foo..bar-master &&
+	test_cmp foo-expect foo &&
+	test_must_fail git diff-files --quiet &&
+	git add foo &&
+	test_must_fail git cherry-pick --continue &&
+	test_cmp bar-expect bar &&
+	test_must_fail git diff-files --quiet &&
+	git add bar &&
+	git cherry-pick --continue &&
+	git reset --hard bar-dev
+
+Auto-merging foo
+CONFLICT (add/add): Merge conflict in foo
+error: could not apply 07d3a39... foo-master
+hint: after resolving the conflicts, mark the corrected paths
+hint: with 'git add <paths>' or 'git rm <paths>'
+hint: and commit the result with 'git commit'
+Resolved 'foo' using previous resolution.
+[dev 7d941fc] foo-master
  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 0b372b9] Revert "Replace sub1 with file"
+ Date: Thu Apr 7 15:14:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Auto-merging bar
+CONFLICT (add/add): Merge conflict in bar
+error: could not apply 04a71fd... bar-master
+hint: after resolving the conflicts, mark the corrected paths
+hint: with 'git add <paths>' or 'git rm <paths>'
+hint: and commit the result with 'git commit'
+Resolved 'bar' using previous resolution.
+[dev f23d681] bar-master
  Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:04:38 2021 +0000
- 2 files changed, 5 insertions(+), 1 deletion(-)
- mode change 100644 => 160000 sub1
-Switched to a new branch 'invalid_sub1'
-[invalid_sub1 f93c47e] Invalid sub1 commit
+ Date: Thu Apr 7 15:15:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+HEAD is now at 5392a79 bar-dev
+ok 6 - cherry-pick conflict with --no-rerere-autoupdate
+
+expecting success: 
+	test_must_fail git cherry-pick --rerere-autoupdate foo..bar-master &&
+	test_cmp foo-expect foo &&
+	git diff-files --quiet &&
+	test_must_fail git cherry-pick --continue --rerere-autoupdate >actual 2>&1 &&
+	echo "fatal: cherry-pick: --rerere-autoupdate cannot be used with --continue" >expect &&
+	test_i18ncmp expect actual &&
+	test_must_fail git cherry-pick --continue --no-rerere-autoupdate >actual 2>&1 &&
+	echo "fatal: cherry-pick: --no-rerere-autoupdate cannot be used with --continue" >expect &&
+	test_i18ncmp expect actual &&
+	git cherry-pick --abort
+
+Auto-merging foo
+CONFLICT (add/add): Merge conflict in foo
+error: could not apply 07d3a39... foo-master
+hint: after resolving the conflicts, mark the corrected paths
+hint: with 'git add <paths>' or 'git rm <paths>'
+hint: and commit the result with 'git commit'
+Staged 'foo' using previous resolution.
+ok 7 - cherry-pick --continue rejects --rerere-autoupdate
+
+expecting success: 
+	test_must_fail git cherry-pick --rerere-autoupdate --rerere-autoupdate foo..bar-master &&
+	test_cmp foo-expect foo &&
+	git diff-files --quiet &&
+	git cherry-pick --abort &&
+	test_must_fail git cherry-pick --rerere-autoupdate --no-rerere-autoupdate --rerere-autoupdate foo..bar-master &&
+	test_cmp foo-expect foo &&
+	git diff-files --quiet &&
+	git cherry-pick --abort &&
+	test_must_fail git cherry-pick --rerere-autoupdate --no-rerere-autoupdate foo..bar-master &&
+	test_must_fail git diff-files --quiet &&
+	git cherry-pick --abort
+
+Auto-merging foo
+CONFLICT (add/add): Merge conflict in foo
+error: could not apply 07d3a39... foo-master
+hint: after resolving the conflicts, mark the corrected paths
+hint: with 'git add <paths>' or 'git rm <paths>'
+hint: and commit the result with 'git commit'
+Staged 'foo' using previous resolution.
+Auto-merging foo
+CONFLICT (add/add): Merge conflict in foo
+error: could not apply 07d3a39... foo-master
+hint: after resolving the conflicts, mark the corrected paths
+hint: with 'git add <paths>' or 'git rm <paths>'
+hint: and commit the result with 'git commit'
+Staged 'foo' using previous resolution.
+Auto-merging foo
+CONFLICT (add/add): Merge conflict in foo
+error: could not apply 07d3a39... foo-master
+hint: after resolving the conflicts, mark the corrected paths
+hint: with 'git add <paths>' or 'git rm <paths>'
+hint: and commit the result with 'git commit'
+Resolved 'foo' using previous resolution.
+ok 8 - cherry-pick --rerere-autoupdate more than once
+
+expecting success: 
+	test_config rerere.enabled false &&
+	test_must_fail git cherry-pick master &&
+	test_must_fail test_cmp expect foo
+
+Auto-merging bar
+CONFLICT (add/add): Merge conflict in bar
+error: could not apply 04a71fd... bar-master
+hint: after resolving the conflicts, mark the corrected paths
+hint: with 'git add <paths>' or 'git rm <paths>'
+hint: and commit the result with 'git commit'
+--- expect	2023-01-05 11:47:56.638868030 +0000
++++ foo	2023-01-05 11:47:56.946868030 +0000
+@@ -1 +1 @@
+-fatal: cherry-pick: --no-rerere-autoupdate cannot be used with --continue
++foo-dev
+ok 9 - cherry-pick conflict without rerere
+
+# passed all 9 test(s)
+1..9
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t3505-cherry-pick-empty.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3505-cherry-pick-empty/.git/
+expecting success: 
+
+	echo first > file1 &&
+	git add file1 &&
+	test_tick &&
+	git commit -m "first" &&
+
+	git checkout -b empty-message-branch &&
+	echo third >> file1 &&
+	git add file1 &&
+	test_tick &&
+	git commit --allow-empty-message -m "" &&
+
+	git checkout master &&
+	git checkout -b empty-change-branch &&
+	test_tick &&
+	git commit --allow-empty -m "empty"
+
+
+[master (root-commit) 0c72e4f] first
  Author: A U Thor <author@example.com>
-Switched to a new branch 'valid_sub1'
-[valid_sub1 6032b20] Revert "Invalid sub1 commit"
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file1
+Switched to a new branch 'empty-message-branch'
+[empty-message-branch d6aa1e8] 
  Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:04:39 2021 +0000
-warning: unable to rmdir 'uninitialized_sub': Directory not empty
+ 1 file changed, 1 insertion(+)
 Switched to branch 'master'
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'no_submodule'
-Branch 'no_submodule' set up to track remote branch 'no_submodule' from 'origin'.
-Branch 'add_sub1' set up to track remote branch 'add_sub1' from 'origin'.
-ok 1 - git read-tree -u -m --recurse-submodules: added submodule is checked out
+Switched to a new branch 'empty-change-branch'
+[empty-change-branch 0f51a27] empty
+ Author: A U Thor <author@example.com>
+ok 1 - setup
 
 expecting success: 
-		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 remote branch 'no_submodule' from 'origin'.
-Branch 'add_sub1' set up to track remote branch 'add_sub1' from 'origin'.
-ok 2 - git read-tree -u -m --recurse-submodules: added submodule is checked out in empty dir
+	git checkout master &&
+	test_expect_code 1 git cherry-pick empty-change-branch
+
+Switched to branch 'master'
+Already up to date!
+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 reset'
+On branch master
+You are currently cherry-picking commit 0f51a27.
+
+nothing to commit, working tree clean
+ok 2 - cherry-pick an empty commit
 
 expecting success: 
-		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 remote branch 'add_sub1' from 'origin'.
-Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '839fc9debdec2466afc3592b8a3280bd74195f55'
-Switched to a new branch 'keep_branch'
-Branch 'modify_sub1' set up to track remote branch 'modify_sub1' from 'origin'.
-fatal: ref HEAD is not a symbolic ref
-ok 3 - git read-tree -u -m --recurse-submodules: submodule branch is not changed, detach HEAD instead
+	test ! -f .git/index.lock
+
+ok 3 - index lockfile was removed
 
 expecting success: 
-		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 remote branch 'replace_sub1_with_file' from 'origin'.
-fatal: Needed a single revision
-Branch 'replace_file_with_sub1' set up to track remote branch 'replace_file_with_sub1' from 'origin'.
-ok 4 - git read-tree -u -m --recurse-submodules: replace tracked file with submodule checks out submodule
+	test_when_finished "git reset --hard empty-message-branch~1" &&
+	git checkout master &&
+	git cherry-pick empty-message-branch
+
+Already on 'master'
+[master d800ed2] 
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:14:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+HEAD is now at 0c72e4f first
+ok 4 - cherry-pick a commit with an empty message
 
 expecting success: 
-		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 remote branch 'replace_sub1_with_directory' from 'origin'.
-fatal: Needed a single revision
-Branch 'replace_directory_with_sub1' set up to track remote branch 'replace_directory_with_sub1' from 'origin'.
-ok 5 - git read-tree -u -m --recurse-submodules: replace directory with submodule
+	test ! -f .git/index.lock
+
+ok 5 - index lockfile was removed
 
 expecting success: 
-		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
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-Branch 'add_sub1' set up to track remote branch 'add_sub1' from 'origin'.
-Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '839fc9debdec2466afc3592b8a3280bd74195f55'
-Branch 'remove_sub1' set up to track remote branch 'remove_sub1' from 'origin'.
-ok 6 - git read-tree -u -m --recurse-submodules: removed submodule removes submodules working tree
+	git checkout -f master &&
+	git cherry-pick --allow-empty-message empty-message-branch
+
+Already on 'master'
+[master d800ed2] 
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:14:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ok 6 - cherry-pick a commit with an empty message with --allow-empty-message
 
 expecting success: 
-		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 remote branch 'add_sub1' from 'origin'.
-Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '839fc9debdec2466afc3592b8a3280bd74195f55'
-Branch 'remove_sub1' set up to track remote branch 'remove_sub1' from 'origin'.
-Migrating git directory of 'sub1' from
-'/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1/.git' to
-'/build/git-2.20.1/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
+	git checkout master &&
+	echo fourth >>file2 &&
+	git add file2 &&
+	git commit -m "fourth" &&
+	test_must_fail git cherry-pick empty-change-branch
+
+Already on 'master'
+[master 36c19c0] fourth
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file2
+Already up to date!
+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 reset'
+On branch master
+You are currently cherry-picking commit 0f51a27.
+
+nothing to commit, working tree clean
+ok 7 - cherry pick an empty non-ff commit without --allow-empty
 
 expecting success: 
-		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 remote branch 'add_sub1' from 'origin'.
-Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '839fc9debdec2466afc3592b8a3280bd74195f55'
-Branch 'replace_sub1_with_file' set up to track remote branch 'replace_sub1_with_file' from 'origin'.
-ok 8 - git read-tree -u -m --recurse-submodules: replace submodule with a file
+	git checkout master &&
+	git cherry-pick --allow-empty empty-change-branch
 
-checking known breakage: 
-		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 remote branch 'add_sub1' from 'origin'.
-Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '839fc9debdec2466afc3592b8a3280bd74195f55'
-Branch 'replace_sub1_with_file' set up to track remote branch 'replace_sub1_with_file' from 'origin'.
-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
+Already on 'master'
+Already up to date!
+[master 72a973f] empty
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:15:13 2005 -0700
+ok 8 - cherry pick an empty non-ff commit with --allow-empty
 
 expecting success: 
-		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 remote branch 'add_sub1' from 'origin'.
-Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '839fc9debdec2466afc3592b8a3280bd74195f55'
-Branch 'modify_sub1' set up to track remote branch 'modify_sub1' from 'origin'.
-ok 10 - git read-tree -u -m --recurse-submodules: modified submodule updates submodule work tree
+	git checkout master &&
+	git cherry-pick --keep-redundant-commits HEAD^
+
+Already on 'master'
+[master 938d13f] fourth
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:15:13 2005 -0700
+ok 9 - cherry pick with --keep-redundant-commits
 
 expecting success: 
-		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_i18ngrep 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 remote branch 'add_sub1' from 'origin'.
-Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '839fc9debdec2466afc3592b8a3280bd74195f55'
-Branch 'invalid_sub1' set up to track remote branch 'invalid_sub1' from 'origin'.
-error: Submodule 'sub1' could not be updated.
-error: Submodule 'sub1' cannot checkout new HEAD.
-ok 11 - git read-tree -u -m --recurse-submodules: updating to a missing submodule commit fails
+	git checkout master &&
+	git branch fork &&
+	echo foo >file2 &&
+	git add file2 &&
+	test_tick &&
+	git commit -m "add file2 on master" &&
+
+	git checkout fork &&
+	echo foo >file2 &&
+	git add file2 &&
+	test_tick &&
+	git commit -m "add file2 on the side"
+
+Already on 'master'
+[master 756e982] add file2 on master
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to branch 'fork'
+[fork 521fc70] add file2 on the side
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 10 - cherry-pick a commit that becomes no-op (prep)
 
 expecting success: 
-		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 remote branch 'no_submodule' from 'origin'.
-Branch 'add_sub1' set up to track remote branch 'add_sub1' from 'origin'.
-error: Untracked working tree file 'sub1' would be overwritten by merge.
-ok 12 - git read-tree -u -m --recurse-submodules: added submodule doesn't remove untracked file with same name
+	git reset --hard &&
+	git checkout fork^0 &&
+	test_must_fail git cherry-pick master
 
-checking known breakage: 
-		test_when_finished "rm submodule_update/.git/info/exclude" &&
-		prolog &&
-		reset_work_tree_to_interested no_submodule &&
-		(
-			cd submodule_update &&
-			git branch -t add_sub1 origin/add_sub1 &&
-			: >sub1 &&
-			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 remote branch 'no_submodule' from 'origin'.
-Branch 'add_sub1' set up to track remote branch 'add_sub1' from 'origin'.
-error: Untracked working tree file 'sub1' would be overwritten by merge.
-not ok 13 - git read-tree -u -m --recurse-submodules: added submodule removes an untracked ignored file # TODO known breakage
+HEAD is now at 521fc70 add file2 on the side
+Note: checking out 'fork^0'.
 
-checking known breakage: 
-		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 remote branch 'add_sub1' from 'origin'.
-Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '839fc9debdec2466afc3592b8a3280bd74195f55'
-Branch 'replace_sub1_with_directory' set up to track remote branch 'replace_sub1_with_directory' from 'origin'.
-error: Untracked working tree file 'sub1/file1' would be overwritten by merge.
-not ok 14 - git read-tree -u -m --recurse-submodules: replace submodule with a directory # TODO known breakage
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by performing another checkout.
 
-checking known breakage: 
-		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 remote branch 'add_sub1' from 'origin'.
-Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '839fc9debdec2466afc3592b8a3280bd74195f55'
-Branch 'replace_sub1_with_directory' set up to track remote branch 'replace_sub1_with_directory' from 'origin'.
-error: Untracked working tree file 'sub1/file1' would be overwritten by merge.
-not ok 15 - git read-tree -u -m --recurse-submodules: replace submodule containing a .git directory with a directory must absorb the git dir # TODO known breakage
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -b with the checkout command again. Example:
+
+  git checkout -b <new-branch-name>
+
+HEAD is now at 521fc70 add file2 on the side
+The previous cherry-pick is now empty, possibly due to conflict resolution.
+If you wish to commit it anyway, use:
+
+    git commit --allow-empty
+
+Otherwise, please use 'git reset'
+HEAD detached at 521fc70
+You are currently cherry-picking commit 756e982.
+
+nothing to commit, working tree clean
+ok 11 - cherry-pick a no-op without --keep-redundant
 
 expecting success: 
-		test_when_finished "rm submodule_update/.git/modules/sub1/info/exclude" &&
-		prolog &&
-		reset_work_tree_to_interested add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
-			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 remote branch 'add_sub1' from 'origin'.
-Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '839fc9debdec2466afc3592b8a3280bd74195f55'
-Branch 'replace_sub1_with_file' set up to track remote branch 'replace_sub1_with_file' from 'origin'.
-ok 16 - git read-tree -u -m --recurse-submodules: replace submodule with a file works ignores ignored files in submodule
+	git reset --hard &&
+	git checkout fork^0 &&
+	git cherry-pick --keep-redundant-commits master &&
+	git show -s --format=%s >actual &&
+	echo "add file2 on master" >expect &&
+	test_cmp expect actual
+
+HEAD is now at 521fc70 add file2 on the side
+HEAD is now at 521fc70 add file2 on the side
+[detached HEAD 2ac6e2a] add file2 on master
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:16:13 2005 -0700
+ok 12 - cherry-pick a no-op with --keep-redundant
 
+# passed all 12 test(s)
+1..12
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t3506-cherry-pick-ff.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3506-cherry-pick-ff/.git/
 expecting success: 
-		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 remote branch 'add_sub1' from 'origin'.
-Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '839fc9debdec2466afc3592b8a3280bd74195f55'
-Branch 'modify_sub1' set up to track remote branch 'modify_sub1' from 'origin'.
-ok 17 - git -c submodule.recurse=true read-tree -u -m: modified submodule updates submodule work tree
+	echo first > file1 &&
+	git add file1 &&
+	test_tick &&
+	git commit -m "first" &&
+	git tag first &&
+
+	git checkout -b other &&
+	echo second >> file1 &&
+	git add file1 &&
+	test_tick &&
+	git commit -m "second" &&
+	git tag second
+
+[master (root-commit) 0c72e4f] first
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file1
+Switched to a new branch 'other'
+[other 453a047] second
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 1 - setup
 
 expecting success: 
-		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 remote branch 'add_nested_sub' from 'origin'.
-Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '762838b53eafd1e34813b431d5617643ccf114cb'
-Submodule 'sub2' (/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update_sub2) registered for path 'sub1/sub2'
-Cloning into '/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1/sub2'...
-done.
-Submodule path 'sub1/sub2': checked out '1d9815c762faf17ccbf05c20665aafe394143aea'
-Branch 'modify_sub1_recursively' set up to track remote branch 'modify_sub1_recursively' from 'origin'.
-ok 18 - git read-tree -u -m --recurse-submodules: modified submodule updates submodule recursively
+	git checkout master &&
+	git reset --hard first &&
+	test_tick &&
+	git cherry-pick --ff second &&
+	test "$(git rev-parse --verify HEAD)" = "$(git rev-parse --verify second)"
+
+Switched to branch 'master'
+HEAD is now at 0c72e4f first
+ok 2 - cherry-pick using --ff fast forwards
 
 expecting success: 
-		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 remote branch 'no_submodule' from 'origin'.
-Branch 'add_sub1' set up to track remote branch 'add_sub1' from 'origin'.
-ok 19 - git read-tree -u --reset --recurse-submodules: added submodule is checked out
+	git checkout master &&
+	git reset --hard first &&
+	test_tick &&
+	git cherry-pick second &&
+	test "$(git rev-parse --verify HEAD)" != "$(git rev-parse --verify second)"
+
+Already on 'master'
+HEAD is now at 0c72e4f first
+[master 43e4ff7] second
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:14:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ok 3 - cherry-pick not using --ff does not fast forwards
 
 expecting success: 
-		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 remote branch 'no_submodule' from 'origin'.
-Branch 'add_sub1' set up to track remote branch 'add_sub1' from 'origin'.
-ok 20 - git read-tree -u --reset --recurse-submodules: added submodule is checked out in empty dir
+	git checkout master &&
+	git reset --hard first &&
+	echo new line >A &&
+	git add A &&
+	test_tick &&
+	git commit -m "add line to A" A &&
+	git tag A &&
+	git checkout -b side first &&
+	echo new line >B &&
+	git add B &&
+	test_tick &&
+	git commit -m "add line to B" B &&
+	git tag B &&
+	git checkout master &&
+	git merge side &&
+	git tag C &&
+	git checkout -b new A
+
+Already on 'master'
+HEAD is now at 0c72e4f first
+[master e3ca70e] add line to A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A
+Switched to a new branch 'side'
+[side 5faaf2e] add line to B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 B
+Switched to branch 'master'
+Merging:
+e3ca70e add line to A
+virtual side
+found 1 common ancestor:
+0c72e4f first
+Merge made by the 'recursive' strategy.
+ B | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 B
+Switched to a new branch 'new'
+ok 4 - merge setup
 
 expecting success: 
-		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 remote branch 'add_sub1' from 'origin'.
-Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '839fc9debdec2466afc3592b8a3280bd74195f55'
-Switched to a new branch 'keep_branch'
-Branch 'modify_sub1' set up to track remote branch 'modify_sub1' from 'origin'.
-fatal: ref HEAD is not a symbolic ref
-ok 21 - git read-tree -u --reset --recurse-submodules: submodule branch is not changed, detach HEAD instead
+	git reset --hard A -- &&
+	test_must_fail git cherry-pick --ff -m 1 B &&
+	git diff --exit-code A --
+
+HEAD is now at e3ca70e add line to A
+error: mainline was specified but commit 5faaf2e252b35c03c6bb69c9d78820cf1bdec73d is not a merge.
+fatal: cherry-pick failed
+ok 5 - cherry-pick a non-merge with --ff and -m should fail
 
 expecting success: 
-		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 remote branch 'replace_sub1_with_file' from 'origin'.
-fatal: Needed a single revision
-Branch 'replace_file_with_sub1' set up to track remote branch 'replace_file_with_sub1' from 'origin'.
-ok 22 - git read-tree -u --reset --recurse-submodules: replace tracked file with submodule checks out submodule
+	git reset --hard A -- &&
+	test_must_fail git cherry-pick --ff C &&
+	git diff --exit-code A --
+
+HEAD is now at e3ca70e add line to A
+error: commit 17345dd7218a0fc4dc087d5aacc6be7192e4fa2a is a merge but no -m option was given.
+fatal: cherry-pick failed
+ok 6 - cherry pick a merge with --ff but without -m should fail
 
 expecting success: 
-		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 remote branch 'replace_sub1_with_directory' from 'origin'.
-fatal: Needed a single revision
-Branch 'replace_directory_with_sub1' set up to track remote branch 'replace_directory_with_sub1' from 'origin'.
-ok 23 - git read-tree -u --reset --recurse-submodules: replace directory with submodule
+	git reset --hard A -- &&
+	git cherry-pick --ff -m 1 C &&
+	git diff --exit-code C &&
+	test "$(git rev-parse --verify HEAD)" = "$(git rev-parse --verify C)"
+
+HEAD is now at e3ca70e add line to A
+ok 7 - cherry pick with --ff a merge (1)
 
 expecting success: 
-		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
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-Branch 'add_sub1' set up to track remote branch 'add_sub1' from 'origin'.
-Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '839fc9debdec2466afc3592b8a3280bd74195f55'
-Branch 'remove_sub1' set up to track remote branch 'remove_sub1' from 'origin'.
-ok 24 - git read-tree -u --reset --recurse-submodules: removed submodule removes submodules working tree
+	git reset --hard B -- &&
+	git cherry-pick --ff -m 2 C &&
+	git diff --exit-code C &&
+	test "$(git rev-parse --verify HEAD)" = "$(git rev-parse --verify C)"
+
+HEAD is now at 5faaf2e add line to B
+ok 8 - cherry pick with --ff a merge (2)
 
 expecting success: 
-		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 remote branch 'add_sub1' from 'origin'.
-Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '839fc9debdec2466afc3592b8a3280bd74195f55'
-Branch 'remove_sub1' set up to track remote branch 'remove_sub1' from 'origin'.
-Migrating git directory of 'sub1' from
-'/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1/.git' to
-'/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update/.git/modules/sub1'
-ok 25 - git read-tree -u --reset --recurse-submodules: removed submodule absorbs submodules .git directory
+	git reset --hard B -- &&
+	test_must_fail git cherry-pick --ff -m 3 C
+
+HEAD is now at 5faaf2e add line to B
+error: commit 17345dd7218a0fc4dc087d5aacc6be7192e4fa2a does not have parent 3
+fatal: cherry-pick failed
+ok 9 - cherry pick a merge relative to nonexistent parent with --ff should fail
 
 expecting success: 
-		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 remote branch 'add_sub1' from 'origin'.
-Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '839fc9debdec2466afc3592b8a3280bd74195f55'
-Branch 'replace_sub1_with_file' set up to track remote branch 'replace_sub1_with_file' from 'origin'.
-ok 26 - git read-tree -u --reset --recurse-submodules: replace submodule with a file
+	git reset --hard first -- &&
+	git rm file1 &&
+	echo first >file2 &&
+	git add file2 &&
+	git commit --amend -m "file2" &&
+	git cherry-pick --ff first &&
+	test "$(git rev-parse --verify HEAD)" = "1df192cd8bc58a2b275d842cede4d221ad9000d1"
 
-checking known breakage: 
-		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 remote branch 'add_sub1' from 'origin'.
-Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '839fc9debdec2466afc3592b8a3280bd74195f55'
-Branch 'replace_sub1_with_file' set up to track remote branch 'replace_sub1_with_file' from 'origin'.
-test_must_fail: command succeeded: git read-tree -u --reset --recurse-submodules replace_sub1_with_file
-not ok 27 - git read-tree -u --reset --recurse-submodules: replace submodule with a file must fail with untracked files # TODO known breakage
-
-expecting success: 
-		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 remote branch 'add_sub1' from 'origin'.
-Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '839fc9debdec2466afc3592b8a3280bd74195f55'
-Branch 'modify_sub1' set up to track remote branch 'modify_sub1' from 'origin'.
-ok 28 - git read-tree -u --reset --recurse-submodules: modified submodule updates submodule work tree
-
-expecting success: 
-		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_i18ngrep 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 remote branch 'add_sub1' from 'origin'.
-Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '839fc9debdec2466afc3592b8a3280bd74195f55'
-Branch 'invalid_sub1' set up to track remote branch 'invalid_sub1' from 'origin'.
-error: Submodule 'sub1' could not be updated.
-error: Submodule 'sub1' cannot checkout new HEAD.
-ok 29 - git read-tree -u --reset --recurse-submodules: updating to a missing submodule commit fails
-
-expecting success: 
-		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 remote branch 'no_submodule' from 'origin'.
-Branch 'add_sub1' set up to track remote branch 'add_sub1' from 'origin'.
-ok 30 - git read-tree -u --reset --recurse-submodules: added submodule does remove untracked unignored file with same name when forced
-
-expecting success: 
-		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 remote branch 'add_sub1' from 'origin'.
-Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '839fc9debdec2466afc3592b8a3280bd74195f55'
-Branch 'replace_sub1_with_directory' set up to track remote branch 'replace_sub1_with_directory' from 'origin'.
-ok 31 - git read-tree -u --reset --recurse-submodules: replace submodule with a directory
-
-expecting success: 
-		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 remote branch 'add_sub1' from 'origin'.
-Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '839fc9debdec2466afc3592b8a3280bd74195f55'
-Branch 'replace_sub1_with_directory' set up to track remote branch 'replace_sub1_with_directory' from 'origin'.
-Migrating git directory of 'sub1' from
-'/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1/.git' to
-'/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update/.git/modules/sub1'
-ok 32 - git read-tree -u --reset --recurse-submodules: replace submodule containing a .git directory with a directory must fail
-
-expecting success: 
-		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 remote branch 'add_sub1' from 'origin'.
-Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '839fc9debdec2466afc3592b8a3280bd74195f55'
-Branch 'replace_sub1_with_file' set up to track remote branch 'replace_sub1_with_file' from 'origin'.
-ok 33 - git read-tree -u --reset --recurse-submodules: replace submodule with a file ignoring ignored files
-
-expecting success: 
-		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 remote branch 'invalid_sub1' from 'origin'.
-fatal: Needed a single revision
-Branch 'valid_sub1' set up to track remote branch 'valid_sub1' from 'origin'.
-ok 34 - git read-tree -u --reset --recurse-submodules: modified submodule does update submodule work tree from invalid commit
-
-expecting success: 
-		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 remote branch 'add_sub1' from 'origin'.
-Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '839fc9debdec2466afc3592b8a3280bd74195f55'
-Branch 'modify_sub1' set up to track remote branch 'modify_sub1' from 'origin'.
-ok 35 - git read-tree -u --reset --recurse-submodules: updating submodules fixes .git links
-
-expecting success: 
-		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 remote branch 'add_sub1' from 'origin'.
-Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '839fc9debdec2466afc3592b8a3280bd74195f55'
-ok 36 - git read-tree -u --reset --recurse-submodules: changed submodule worktree is reset
-
-expecting success: 
-		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 remote branch 'no_submodule' from 'origin'.
-Branch 'add_sub1' set up to track remote branch 'add_sub1' from 'origin'.
-Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '839fc9debdec2466afc3592b8a3280bd74195f55'
-Submodule path 'uninitialized_sub': checked out '839fc9debdec2466afc3592b8a3280bd74195f55'
-ok 37 - git read-tree -u -m: added submodule creates empty directory
-
-expecting success: 
-		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 remote branch 'no_submodule' from 'origin'.
-Branch 'add_sub1' set up to track remote branch 'add_sub1' from 'origin'.
-Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '839fc9debdec2466afc3592b8a3280bd74195f55'
-Submodule path 'uninitialized_sub': checked out '839fc9debdec2466afc3592b8a3280bd74195f55'
-ok 38 - git read-tree -u -m: added submodule leaves existing empty directory alone
-
-expecting success: 
-		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 remote branch 'replace_sub1_with_file' from 'origin'.
-fatal: Needed a single revision
-Branch 'replace_file_with_sub1' set up to track remote branch 'replace_file_with_sub1' from 'origin'.
-Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '839fc9debdec2466afc3592b8a3280bd74195f55'
-Submodule path 'uninitialized_sub': checked out '839fc9debdec2466afc3592b8a3280bd74195f55'
-ok 39 - git read-tree -u -m: replace tracked file with submodule creates empty directory
-
-expecting success: 
-		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 remote branch 'replace_sub1_with_directory' from 'origin'.
-fatal: Needed a single revision
-Branch 'replace_directory_with_sub1' set up to track remote branch 'replace_directory_with_sub1' from 'origin'.
-Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '839fc9debdec2466afc3592b8a3280bd74195f55'
-Submodule path 'uninitialized_sub': checked out '839fc9debdec2466afc3592b8a3280bd74195f55'
-ok 40 - git read-tree -u -m: replace directory with submodule
-
-expecting success: 
-		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 remote branch 'add_sub1' from 'origin'.
-Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '839fc9debdec2466afc3592b8a3280bd74195f55'
-Branch 'remove_sub1' set up to track remote branch 'remove_sub1' from 'origin'.
-warning: unable to rmdir 'sub1': Directory not empty
-ok 41 - git read-tree -u -m: removed submodule leaves submodule directory and its contents in place
-
-expecting success: 
-		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 remote branch 'add_sub1' from 'origin'.
-Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '839fc9debdec2466afc3592b8a3280bd74195f55'
-Branch 'remove_sub1' set up to track remote branch 'remove_sub1' from 'origin'.
-warning: unable to rmdir 'sub1': Directory not empty
-ok 42 - git read-tree -u -m: removed submodule leaves submodule containing a .git directory alone
-
-expecting success: 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
-			test_must_fail $command replace_sub1_with_directory &&
-			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 remote branch 'add_sub1' from 'origin'.
-Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '839fc9debdec2466afc3592b8a3280bd74195f55'
-Branch 'replace_sub1_with_directory' set up to track remote branch 'replace_sub1_with_directory' from 'origin'.
-error: Untracked working tree file 'sub1/file1' would be overwritten by merge.
-ok 43 - git read-tree -u -m: replace submodule with a directory must fail
-
-expecting success: 
-		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 &&
-			test_must_fail $command replace_sub1_with_directory &&
-			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 remote branch 'add_sub1' from 'origin'.
-Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '839fc9debdec2466afc3592b8a3280bd74195f55'
-Branch 'replace_sub1_with_directory' set up to track remote branch 'replace_sub1_with_directory' from 'origin'.
-error: Untracked working tree file 'sub1/file1' would be overwritten by merge.
-ok 44 - git read-tree -u -m: replace submodule containing a .git directory with a directory must fail
-
-checking known breakage: 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
-			test_must_fail $command replace_sub1_with_file &&
-			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 remote branch 'add_sub1' from 'origin'.
-Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '839fc9debdec2466afc3592b8a3280bd74195f55'
-Branch 'replace_sub1_with_file' set up to track remote branch 'replace_sub1_with_file' from 'origin'.
-test_must_fail: command succeeded: git read-tree -u -m replace_sub1_with_file
-not ok 45 - git read-tree -u -m: replace submodule with a file must fail # TODO known breakage
-
-checking known breakage: 
-		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 &&
-			test_must_fail $command replace_sub1_with_file &&
-			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 remote branch 'add_sub1' from 'origin'.
-Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '839fc9debdec2466afc3592b8a3280bd74195f55'
-Branch 'replace_sub1_with_file' set up to track remote branch 'replace_sub1_with_file' from 'origin'.
-test_must_fail: command succeeded: git read-tree -u -m replace_sub1_with_file
-not ok 46 - git read-tree -u -m: replace submodule containing a .git directory with a file must fail # TODO known breakage
-
-expecting success: 
-		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 remote branch 'add_sub1' from 'origin'.
-Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '839fc9debdec2466afc3592b8a3280bd74195f55'
-Branch 'modify_sub1' set up to track remote branch 'modify_sub1' from 'origin'.
-Submodule path 'sub1': checked out 'af28ff50a68788933bafa3755c163148c1f08502'
-ok 47 - git read-tree -u -m: modified submodule does not update submodule work tree
-
-expecting success: 
-		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 remote branch 'add_sub1' from 'origin'.
-Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '839fc9debdec2466afc3592b8a3280bd74195f55'
-Branch 'invalid_sub1' set up to track remote branch 'invalid_sub1' from 'origin'.
-error: Server does not allow request for unadvertised object 0123456789012345678901234567890123456789
-Fetched in submodule path 'sub1', but it did not contain 0123456789012345678901234567890123456789. Direct fetching of that commit failed.
-ok 48 - git read-tree -u -m: modified submodule does not update submodule work tree to invalid commit
-
-expecting success: 
-		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 remote branch 'invalid_sub1' from 'origin'.
-fatal: Needed a single revision
-Branch 'valid_sub1' set up to track remote branch 'valid_sub1' from 'origin'.
-Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '839fc9debdec2466afc3592b8a3280bd74195f55'
-Submodule path 'uninitialized_sub': checked out '839fc9debdec2466afc3592b8a3280bd74195f55'
-ok 49 - git read-tree -u -m: modified submodule does not update submodule work tree from invalid commit
-
-expecting success: 
-		prolog &&
-		reset_work_tree_to 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 remote branch 'no_submodule' from 'origin'.
-Branch 'add_sub1' set up to track remote branch 'add_sub1' from 'origin'.
-error: Untracked working tree file 'sub1' would be overwritten by merge.
-ok 50 - git read-tree -u -m: added submodule doesn't remove untracked unignored file with same name
-
-expecting success: 
-		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 remote branch 'no_submodule' from 'origin'.
-Branch 'add_sub1' set up to track remote branch 'add_sub1' from 'origin'.
-Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '839fc9debdec2466afc3592b8a3280bd74195f55'
-Submodule path 'uninitialized_sub': checked out '839fc9debdec2466afc3592b8a3280bd74195f55'
-ok 51 - git read-tree -u --reset: added submodule creates empty directory
-
-expecting success: 
-		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 remote branch 'no_submodule' from 'origin'.
-Branch 'add_sub1' set up to track remote branch 'add_sub1' from 'origin'.
-Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '839fc9debdec2466afc3592b8a3280bd74195f55'
-Submodule path 'uninitialized_sub': checked out '839fc9debdec2466afc3592b8a3280bd74195f55'
-ok 52 - git read-tree -u --reset: added submodule leaves existing empty directory alone
-
-expecting success: 
-		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 remote branch 'replace_sub1_with_file' from 'origin'.
-fatal: Needed a single revision
-Branch 'replace_file_with_sub1' set up to track remote branch 'replace_file_with_sub1' from 'origin'.
-Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '839fc9debdec2466afc3592b8a3280bd74195f55'
-Submodule path 'uninitialized_sub': checked out '839fc9debdec2466afc3592b8a3280bd74195f55'
-ok 53 - git read-tree -u --reset: replace tracked file with submodule creates empty directory
-
-expecting success: 
-		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 remote branch 'replace_sub1_with_directory' from 'origin'.
-fatal: Needed a single revision
-Branch 'replace_directory_with_sub1' set up to track remote branch 'replace_directory_with_sub1' from 'origin'.
-Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '839fc9debdec2466afc3592b8a3280bd74195f55'
-Submodule path 'uninitialized_sub': checked out '839fc9debdec2466afc3592b8a3280bd74195f55'
-ok 54 - git read-tree -u --reset: replace directory with submodule
-
-expecting success: 
-		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 remote branch 'add_sub1' from 'origin'.
-Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '839fc9debdec2466afc3592b8a3280bd74195f55'
-Branch 'remove_sub1' set up to track remote branch 'remove_sub1' from 'origin'.
-warning: unable to rmdir 'sub1': Directory not empty
-ok 55 - git read-tree -u --reset: removed submodule leaves submodule directory and its contents in place
-
-expecting success: 
-		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 remote branch 'add_sub1' from 'origin'.
-Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '839fc9debdec2466afc3592b8a3280bd74195f55'
-Branch 'remove_sub1' set up to track remote branch 'remove_sub1' from 'origin'.
-warning: unable to rmdir 'sub1': Directory not empty
-ok 56 - git read-tree -u --reset: removed submodule leaves submodule containing a .git directory alone
-
-checking known breakage: 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
-			test_must_fail $command replace_sub1_with_directory &&
-			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 remote branch 'add_sub1' from 'origin'.
-Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '839fc9debdec2466afc3592b8a3280bd74195f55'
-Branch 'replace_sub1_with_directory' set up to track remote branch 'replace_sub1_with_directory' from 'origin'.
-warning: unable to rmdir 'sub1': Directory not empty
-test_must_fail: command succeeded: git read-tree -u --reset replace_sub1_with_directory
-not ok 57 - git read-tree -u --reset: replace submodule with a directory must fail # TODO known breakage
-
-checking known breakage: 
-		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 &&
-			test_must_fail $command replace_sub1_with_directory &&
-			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 remote branch 'add_sub1' from 'origin'.
-Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '839fc9debdec2466afc3592b8a3280bd74195f55'
-Branch 'replace_sub1_with_directory' set up to track remote branch 'replace_sub1_with_directory' from 'origin'.
-warning: unable to rmdir 'sub1': Directory not empty
-test_must_fail: command succeeded: git read-tree -u --reset replace_sub1_with_directory
-not ok 58 - git read-tree -u --reset: replace submodule containing a .git directory with a directory must fail # TODO known breakage
-
-checking known breakage: 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
-			test_must_fail $command replace_sub1_with_file &&
-			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 remote branch 'add_sub1' from 'origin'.
-Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '839fc9debdec2466afc3592b8a3280bd74195f55'
-Branch 'replace_sub1_with_file' set up to track remote branch 'replace_sub1_with_file' from 'origin'.
-test_must_fail: command succeeded: git read-tree -u --reset replace_sub1_with_file
-not ok 59 - git read-tree -u --reset: replace submodule with a file must fail # TODO known breakage
-
-checking known breakage: 
-		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 &&
-			test_must_fail $command replace_sub1_with_file &&
-			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 remote branch 'add_sub1' from 'origin'.
-Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '839fc9debdec2466afc3592b8a3280bd74195f55'
-Branch 'replace_sub1_with_file' set up to track remote branch 'replace_sub1_with_file' from 'origin'.
-test_must_fail: command succeeded: git read-tree -u --reset replace_sub1_with_file
-not ok 60 - git read-tree -u --reset: replace submodule containing a .git directory with a file must fail # TODO known breakage
-
-expecting success: 
-		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 remote branch 'add_sub1' from 'origin'.
-Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '839fc9debdec2466afc3592b8a3280bd74195f55'
-Branch 'modify_sub1' set up to track remote branch 'modify_sub1' from 'origin'.
-Submodule path 'sub1': checked out 'af28ff50a68788933bafa3755c163148c1f08502'
-ok 61 - git read-tree -u --reset: modified submodule does not update submodule work tree
-
-expecting success: 
-		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 remote branch 'add_sub1' from 'origin'.
-Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '839fc9debdec2466afc3592b8a3280bd74195f55'
-Branch 'invalid_sub1' set up to track remote branch 'invalid_sub1' from 'origin'.
-error: Server does not allow request for unadvertised object 0123456789012345678901234567890123456789
-Fetched in submodule path 'sub1', but it did not contain 0123456789012345678901234567890123456789. Direct fetching of that commit failed.
-ok 62 - git read-tree -u --reset: modified submodule does not update submodule work tree to invalid commit
-
-expecting success: 
-		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 remote branch 'invalid_sub1' from 'origin'.
-fatal: Needed a single revision
-Branch 'valid_sub1' set up to track remote branch 'valid_sub1' from 'origin'.
-Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '839fc9debdec2466afc3592b8a3280bd74195f55'
-Submodule path 'uninitialized_sub': checked out '839fc9debdec2466afc3592b8a3280bd74195f55'
-ok 63 - git read-tree -u --reset: modified submodule does not update submodule work tree from invalid commit
-
-expecting success: 
-		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 remote branch 'no_submodule' from 'origin'.
-Branch 'add_sub1' set up to track remote branch 'add_sub1' from 'origin'.
-ok 64 - git read-tree -u --reset: added submodule does remove untracked unignored file with same name when forced
-
-# still have 11 known breakage(s)
-# passed all remaining 53 test(s)
-1..64
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t3504-cherry-pick-rerere.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3504-cherry-pick-rerere/.git/
-expecting success: 
-	test_commit foo &&
-	test_commit foo-master foo &&
-	test_commit bar-master bar &&
-
-	git checkout -b dev foo &&
-	test_commit foo-dev foo &&
-	test_commit bar-dev bar &&
-	git config rerere.enabled true
-
-[master (root-commit) ddd63c9] foo
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo.t
-[master 07d3a39] foo-master
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo
-[master 04a71fd] bar-master
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 bar
-Switched to a new branch 'dev'
-[dev 1d8ba7e] foo-dev
+HEAD is now at 0c72e4f first
+rm 'file1'
+[new 1654ff9] file2
  Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:13:13 2005 -0700
  1 file changed, 1 insertion(+)
- create mode 100644 foo
-[dev 5392a79] bar-dev
+ create mode 100644 file2
+[new 1df192c] first
  Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:13:13 2005 -0700
  1 file changed, 1 insertion(+)
- create mode 100644 bar
-ok 1 - setup
-
-expecting success: 
-	test_must_fail git merge master
-
-Merging:
-5392a79 bar-dev
-virtual master
-found 1 common ancestor:
-ddd63c9 foo
-Auto-merging foo
-CONFLICT (add/add): Merge conflict in foo
-Auto-merging bar
-CONFLICT (add/add): Merge conflict in bar
-Recorded preimage for 'bar'
-Recorded preimage for 'foo'
-Automatic merge failed; fix conflicts and then commit the result.
-ok 2 - conflicting merge
-
-expecting success: 
-	echo foo-resolved >foo &&
-	echo bar-resolved >bar &&
-	git commit -am resolved &&
-	cp foo foo-expect &&
-	cp bar bar-expect &&
-	git reset --hard HEAD^
-
-Recorded resolution for 'bar'.
-Recorded resolution for 'foo'.
-[dev b8bd488] resolved
- Author: A U Thor <author@example.com>
-HEAD is now at 5392a79 bar-dev
-ok 3 - fixup
-
-expecting success: 
-	test_must_fail git cherry-pick --rerere-autoupdate foo..bar-master &&
-	test_cmp foo-expect foo &&
-	git diff-files --quiet &&
-	test_must_fail git cherry-pick --continue &&
-	test_cmp bar-expect bar &&
-	git diff-files --quiet &&
-	git cherry-pick --continue &&
-	git reset --hard bar-dev
-
-Auto-merging foo
-CONFLICT (add/add): Merge conflict in foo
-error: could not apply 07d3a39... foo-master
-hint: after resolving the conflicts, mark the corrected paths
-hint: with 'git add <paths>' or 'git rm <paths>'
-hint: and commit the result with 'git commit'
-Staged 'foo' using previous resolution.
-[dev 7d941fc] foo-master
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:14:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Auto-merging bar
-CONFLICT (add/add): Merge conflict in bar
-error: could not apply 04a71fd... bar-master
-hint: after resolving the conflicts, mark the corrected paths
-hint: with 'git add <paths>' or 'git rm <paths>'
-hint: and commit the result with 'git commit'
-Staged 'bar' using previous resolution.
-[dev f23d681] bar-master
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:15:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-HEAD is now at 5392a79 bar-dev
-ok 4 - cherry-pick conflict with --rerere-autoupdate
-
-expecting success: 
-	test_config rerere.autoUpdate true &&
-	test_must_fail git cherry-pick foo..bar-master &&
-	test_cmp foo-expect foo &&
-	git diff-files --quiet &&
-	test_must_fail git cherry-pick --continue &&
-	test_cmp bar-expect bar &&
-	git diff-files --quiet &&
-	git cherry-pick --continue &&
-	git reset --hard bar-dev
-
-Auto-merging foo
-CONFLICT (add/add): Merge conflict in foo
-error: could not apply 07d3a39... foo-master
-hint: after resolving the conflicts, mark the corrected paths
-hint: with 'git add <paths>' or 'git rm <paths>'
-hint: and commit the result with 'git commit'
-Staged 'foo' using previous resolution.
-[dev 7d941fc] foo-master
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:14:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Auto-merging bar
-CONFLICT (add/add): Merge conflict in bar
-error: could not apply 04a71fd... bar-master
-hint: after resolving the conflicts, mark the corrected paths
-hint: with 'git add <paths>' or 'git rm <paths>'
-hint: and commit the result with 'git commit'
-Staged 'bar' using previous resolution.
-[dev f23d681] bar-master
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:15:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-HEAD is now at 5392a79 bar-dev
-ok 5 - cherry-pick conflict repsects rerere.autoUpdate
-
-expecting success: 
-	test_config rerere.autoUpdate true &&
-	test_must_fail git cherry-pick --no-rerere-autoupdate foo..bar-master &&
-	test_cmp foo-expect foo &&
-	test_must_fail git diff-files --quiet &&
-	git add foo &&
-	test_must_fail git cherry-pick --continue &&
-	test_cmp bar-expect bar &&
-	test_must_fail git diff-files --quiet &&
-	git add bar &&
-	git cherry-pick --continue &&
-	git reset --hard bar-dev
-
-Auto-merging foo
-CONFLICT (add/add): Merge conflict in foo
-error: could not apply 07d3a39... foo-master
-hint: after resolving the conflicts, mark the corrected paths
-hint: with 'git add <paths>' or 'git rm <paths>'
-hint: and commit the result with 'git commit'
-Resolved 'foo' using previous resolution.
-[dev 7d941fc] foo-master
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:14:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Auto-merging bar
-CONFLICT (add/add): Merge conflict in bar
-error: could not apply 04a71fd... bar-master
-hint: after resolving the conflicts, mark the corrected paths
-hint: with 'git add <paths>' or 'git rm <paths>'
-hint: and commit the result with 'git commit'
-Resolved 'bar' using previous resolution.
-[dev f23d681] bar-master
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:15:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-HEAD is now at 5392a79 bar-dev
-ok 6 - cherry-pick conflict with --no-rerere-autoupdate
-
-expecting success: 
-	test_must_fail git cherry-pick --rerere-autoupdate foo..bar-master &&
-	test_cmp foo-expect foo &&
-	git diff-files --quiet &&
-	test_must_fail git cherry-pick --continue --rerere-autoupdate >actual 2>&1 &&
-	echo "fatal: cherry-pick: --rerere-autoupdate cannot be used with --continue" >expect &&
-	test_i18ncmp expect actual &&
-	test_must_fail git cherry-pick --continue --no-rerere-autoupdate >actual 2>&1 &&
-	echo "fatal: cherry-pick: --no-rerere-autoupdate cannot be used with --continue" >expect &&
-	test_i18ncmp expect actual &&
-	git cherry-pick --abort
-
-Auto-merging foo
-CONFLICT (add/add): Merge conflict in foo
-error: could not apply 07d3a39... foo-master
-hint: after resolving the conflicts, mark the corrected paths
-hint: with 'git add <paths>' or 'git rm <paths>'
-hint: and commit the result with 'git commit'
-Staged 'foo' using previous resolution.
-ok 7 - cherry-pick --continue rejects --rerere-autoupdate
-
-expecting success: 
-	test_must_fail git cherry-pick --rerere-autoupdate --rerere-autoupdate foo..bar-master &&
-	test_cmp foo-expect foo &&
-	git diff-files --quiet &&
-	git cherry-pick --abort &&
-	test_must_fail git cherry-pick --rerere-autoupdate --no-rerere-autoupdate --rerere-autoupdate foo..bar-master &&
-	test_cmp foo-expect foo &&
-	git diff-files --quiet &&
-	git cherry-pick --abort &&
-	test_must_fail git cherry-pick --rerere-autoupdate --no-rerere-autoupdate foo..bar-master &&
-	test_must_fail git diff-files --quiet &&
-	git cherry-pick --abort
-
-Auto-merging foo
-CONFLICT (add/add): Merge conflict in foo
-error: could not apply 07d3a39... foo-master
-hint: after resolving the conflicts, mark the corrected paths
-hint: with 'git add <paths>' or 'git rm <paths>'
-hint: and commit the result with 'git commit'
-Staged 'foo' using previous resolution.
-Auto-merging foo
-CONFLICT (add/add): Merge conflict in foo
-error: could not apply 07d3a39... foo-master
-hint: after resolving the conflicts, mark the corrected paths
-hint: with 'git add <paths>' or 'git rm <paths>'
-hint: and commit the result with 'git commit'
-Staged 'foo' using previous resolution.
-Auto-merging foo
-CONFLICT (add/add): Merge conflict in foo
-error: could not apply 07d3a39... foo-master
-hint: after resolving the conflicts, mark the corrected paths
-hint: with 'git add <paths>' or 'git rm <paths>'
-hint: and commit the result with 'git commit'
-Resolved 'foo' using previous resolution.
-ok 8 - cherry-pick --rerere-autoupdate more than once
+ create mode 100644 file1
+ok 10 - cherry pick a root commit with --ff
 
 expecting success: 
-	test_config rerere.enabled false &&
-	test_must_fail git cherry-pick master &&
-	test_must_fail test_cmp expect foo
+	git checkout --orphan unborn &&
+	git rm --cached -r . &&
+	rm -rf * &&
+	git cherry-pick --ff first &&
+	test_cmp_rev first HEAD
 
-Auto-merging bar
-CONFLICT (add/add): Merge conflict in bar
-error: could not apply 04a71fd... bar-master
-hint: after resolving the conflicts, mark the corrected paths
-hint: with 'git add <paths>' or 'git rm <paths>'
-hint: and commit the result with 'git commit'
---- expect	2021-12-03 05:06:08.414196372 +0000
-+++ foo	2021-12-03 05:06:08.738186936 +0000
-@@ -1 +1 @@
--fatal: cherry-pick: --no-rerere-autoupdate cannot be used with --continue
-+foo-dev
-ok 9 - cherry-pick conflict without rerere
+Switched to a new branch 'unborn'
+rm 'file1'
+rm 'file2'
+ok 11 - cherry-pick --ff on unborn branch
 
-# passed all 9 test(s)
-1..9
+# passed all 11 test(s)
+1..11
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
 *** t3430-rebase-merges.sh ***
@@ -77034,1052 +76022,6 @@
 1..18
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t3505-cherry-pick-empty.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3505-cherry-pick-empty/.git/
-expecting success: 
-
-	echo first > file1 &&
-	git add file1 &&
-	test_tick &&
-	git commit -m "first" &&
-
-	git checkout -b empty-message-branch &&
-	echo third >> file1 &&
-	git add file1 &&
-	test_tick &&
-	git commit --allow-empty-message -m "" &&
-
-	git checkout master &&
-	git checkout -b empty-change-branch &&
-	test_tick &&
-	git commit --allow-empty -m "empty"
-
-
-[master (root-commit) 0c72e4f] first
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file1
-Switched to a new branch 'empty-message-branch'
-[empty-message-branch d6aa1e8] 
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Switched to branch 'master'
-Switched to a new branch 'empty-change-branch'
-[empty-change-branch 0f51a27] empty
- Author: A U Thor <author@example.com>
-ok 1 - setup
-
-expecting success: 
-	git checkout master &&
-	test_expect_code 1 git cherry-pick empty-change-branch
-
-Switched to branch 'master'
-Already up to date!
-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 reset'
-On branch master
-You are currently cherry-picking commit 0f51a27.
-
-nothing to commit, working tree clean
-ok 2 - cherry-pick an empty commit
-
-expecting success: 
-	test ! -f .git/index.lock
-
-ok 3 - index lockfile was removed
-
-expecting success: 
-	test_when_finished "git reset --hard empty-message-branch~1" &&
-	git checkout master &&
-	git cherry-pick empty-message-branch
-
-Already on 'master'
-[master d800ed2] 
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:14:13 2005 -0700
- 1 file changed, 1 insertion(+)
-HEAD is now at 0c72e4f first
-ok 4 - cherry-pick a commit with an empty message
-
-expecting success: 
-	test ! -f .git/index.lock
-
-ok 5 - index lockfile was removed
-
-expecting success: 
-	git checkout -f master &&
-	git cherry-pick --allow-empty-message empty-message-branch
-
-Already on 'master'
-[master d800ed2] 
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:14:13 2005 -0700
- 1 file changed, 1 insertion(+)
-ok 6 - cherry-pick a commit with an empty message with --allow-empty-message
-
-expecting success: 
-	git checkout master &&
-	echo fourth >>file2 &&
-	git add file2 &&
-	git commit -m "fourth" &&
-	test_must_fail git cherry-pick empty-change-branch
-
-Already on 'master'
-[master 36c19c0] fourth
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file2
-Already up to date!
-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 reset'
-On branch master
-You are currently cherry-picking commit 0f51a27.
-
-nothing to commit, working tree clean
-ok 7 - cherry pick an empty non-ff commit without --allow-empty
-
-expecting success: 
-	git checkout master &&
-	git cherry-pick --allow-empty empty-change-branch
-
-Already on 'master'
-Already up to date!
-[master 72a973f] empty
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:15:13 2005 -0700
-ok 8 - cherry pick an empty non-ff commit with --allow-empty
-
-expecting success: 
-	git checkout master &&
-	git cherry-pick --keep-redundant-commits HEAD^
-
-Already on 'master'
-[master 938d13f] fourth
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:15:13 2005 -0700
-ok 9 - cherry pick with --keep-redundant-commits
-
-expecting success: 
-	git checkout master &&
-	git branch fork &&
-	echo foo >file2 &&
-	git add file2 &&
-	test_tick &&
-	git commit -m "add file2 on master" &&
-
-	git checkout fork &&
-	echo foo >file2 &&
-	git add file2 &&
-	test_tick &&
-	git commit -m "add file2 on the side"
-
-Already on 'master'
-[master 756e982] add file2 on master
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to branch 'fork'
-[fork 521fc70] add file2 on the side
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 10 - cherry-pick a commit that becomes no-op (prep)
-
-expecting success: 
-	git reset --hard &&
-	git checkout fork^0 &&
-	test_must_fail git cherry-pick master
-
-HEAD is now at 521fc70 add file2 on the side
-Note: checking out 'fork^0'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by performing another checkout.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
-
-  git checkout -b <new-branch-name>
-
-HEAD is now at 521fc70 add file2 on the side
-The previous cherry-pick is now empty, possibly due to conflict resolution.
-If you wish to commit it anyway, use:
-
-    git commit --allow-empty
-
-Otherwise, please use 'git reset'
-HEAD detached at 521fc70
-You are currently cherry-picking commit 756e982.
-
-nothing to commit, working tree clean
-ok 11 - cherry-pick a no-op without --keep-redundant
-
-expecting success: 
-	git reset --hard &&
-	git checkout fork^0 &&
-	git cherry-pick --keep-redundant-commits master &&
-	git show -s --format=%s >actual &&
-	echo "add file2 on master" >expect &&
-	test_cmp expect actual
-
-HEAD is now at 521fc70 add file2 on the side
-HEAD is now at 521fc70 add file2 on the side
-[detached HEAD 2ac6e2a] add file2 on master
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:16:13 2005 -0700
-ok 12 - cherry-pick a no-op with --keep-redundant
-
-# passed all 12 test(s)
-1..12
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t3506-cherry-pick-ff.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3506-cherry-pick-ff/.git/
-expecting success: 
-	echo first > file1 &&
-	git add file1 &&
-	test_tick &&
-	git commit -m "first" &&
-	git tag first &&
-
-	git checkout -b other &&
-	echo second >> file1 &&
-	git add file1 &&
-	test_tick &&
-	git commit -m "second" &&
-	git tag second
-
-[master (root-commit) 0c72e4f] first
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file1
-Switched to a new branch 'other'
-[other 453a047] second
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 1 - setup
-
-expecting success: 
-	git checkout master &&
-	git reset --hard first &&
-	test_tick &&
-	git cherry-pick --ff second &&
-	test "$(git rev-parse --verify HEAD)" = "$(git rev-parse --verify second)"
-
-Switched to branch 'master'
-HEAD is now at 0c72e4f first
-ok 2 - cherry-pick using --ff fast forwards
-
-expecting success: 
-	git checkout master &&
-	git reset --hard first &&
-	test_tick &&
-	git cherry-pick second &&
-	test "$(git rev-parse --verify HEAD)" != "$(git rev-parse --verify second)"
-
-Already on 'master'
-HEAD is now at 0c72e4f first
-[master 43e4ff7] second
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:14:13 2005 -0700
- 1 file changed, 1 insertion(+)
-ok 3 - cherry-pick not using --ff does not fast forwards
-
-expecting success: 
-	git checkout master &&
-	git reset --hard first &&
-	echo new line >A &&
-	git add A &&
-	test_tick &&
-	git commit -m "add line to A" A &&
-	git tag A &&
-	git checkout -b side first &&
-	echo new line >B &&
-	git add B &&
-	test_tick &&
-	git commit -m "add line to B" B &&
-	git tag B &&
-	git checkout master &&
-	git merge side &&
-	git tag C &&
-	git checkout -b new A
-
-Already on 'master'
-HEAD is now at 0c72e4f first
-[master e3ca70e] add line to A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A
-Switched to a new branch 'side'
-[side 5faaf2e] add line to B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 B
-Switched to branch 'master'
-Merging:
-e3ca70e add line to A
-virtual side
-found 1 common ancestor:
-0c72e4f first
-Merge made by the 'recursive' strategy.
- B | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 B
-Switched to a new branch 'new'
-ok 4 - merge setup
-
-expecting success: 
-	git reset --hard A -- &&
-	test_must_fail git cherry-pick --ff -m 1 B &&
-	git diff --exit-code A --
-
-HEAD is now at e3ca70e add line to A
-error: mainline was specified but commit 5faaf2e252b35c03c6bb69c9d78820cf1bdec73d is not a merge.
-fatal: cherry-pick failed
-ok 5 - cherry-pick a non-merge with --ff and -m should fail
-
-expecting success: 
-	git reset --hard A -- &&
-	test_must_fail git cherry-pick --ff C &&
-	git diff --exit-code A --
-
-HEAD is now at e3ca70e add line to A
-error: commit 17345dd7218a0fc4dc087d5aacc6be7192e4fa2a is a merge but no -m option was given.
-fatal: cherry-pick failed
-ok 6 - cherry pick a merge with --ff but without -m should fail
-
-expecting success: 
-	git reset --hard A -- &&
-	git cherry-pick --ff -m 1 C &&
-	git diff --exit-code C &&
-	test "$(git rev-parse --verify HEAD)" = "$(git rev-parse --verify C)"
-
-HEAD is now at e3ca70e add line to A
-ok 7 - cherry pick with --ff a merge (1)
-
-expecting success: 
-	git reset --hard B -- &&
-	git cherry-pick --ff -m 2 C &&
-	git diff --exit-code C &&
-	test "$(git rev-parse --verify HEAD)" = "$(git rev-parse --verify C)"
-
-HEAD is now at 5faaf2e add line to B
-ok 8 - cherry pick with --ff a merge (2)
-
-expecting success: 
-	git reset --hard B -- &&
-	test_must_fail git cherry-pick --ff -m 3 C
-
-HEAD is now at 5faaf2e add line to B
-error: commit 17345dd7218a0fc4dc087d5aacc6be7192e4fa2a does not have parent 3
-fatal: cherry-pick failed
-ok 9 - cherry pick a merge relative to nonexistent parent with --ff should fail
-
-expecting success: 
-	git reset --hard first -- &&
-	git rm file1 &&
-	echo first >file2 &&
-	git add file2 &&
-	git commit --amend -m "file2" &&
-	git cherry-pick --ff first &&
-	test "$(git rev-parse --verify HEAD)" = "1df192cd8bc58a2b275d842cede4d221ad9000d1"
-
-HEAD is now at 0c72e4f first
-rm 'file1'
-[new 1654ff9] file2
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:13:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 file2
-[new 1df192c] first
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:13:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 file1
-ok 10 - cherry pick a root commit with --ff
-
-expecting success: 
-	git checkout --orphan unborn &&
-	git rm --cached -r . &&
-	rm -rf * &&
-	git cherry-pick --ff first &&
-	test_cmp_rev first HEAD
-
-Switched to a new branch 'unborn'
-rm 'file1'
-rm 'file2'
-ok 11 - cherry-pick --ff on unborn branch
-
-# passed all 11 test(s)
-1..11
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t3412-rebase-root.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3412-rebase-root/.git/
-expecting success: 
-	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
-
-[master (root-commit) c746ea0] 1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A
-[master 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: 
-	git checkout -B fail other &&
-	test_must_fail git rebase --onto master --root fail fail
-
-Switched to a new branch 'fail'
-usage: git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] [<upstream>] [<branch>]
-   or: git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]
-   or: git rebase --continue | --abort | --skip | --edit-todo
-
-    --onto <revision>     rebase onto given branch instead of upstream
-    --no-verify           allow pre-rebase hook to run
-    -q, --quiet           be quiet. implies --no-stat
-    -v, --verbose         display a diffstat of what changed upstream
-    -n, --no-stat         do not show diffstat of what changed upstream
-    --signoff             add a Signed-off-by: line to each commit
-    --ignore-whitespace   passed to 'git am'
-    --committer-date-is-author-date
-                          passed to 'git am'
-    --ignore-date         passed to 'git am'
-    -C <n>                passed to 'git apply'
-    --whitespace <action>
-                          passed to 'git apply'
-    -f, --force-rebase    cherry-pick all commits, even if unchanged
-    --no-ff               cherry-pick all commits, even if unchanged
-    --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
-    -m, --merge           use merging strategies to rebase
-    -i, --interactive     let the user edit the list of commits to rebase
-    -p, --preserve-merges
-                          try to recreate merges instead of ignoring them
-    --rerere-autoupdate   allow rerere to update index with resolved conflict
-    -k, --keep-empty      preserve empty commits during rebase
-    --autosquash          move commits that begin with squash!/fixup! under -i
-    -S, --gpg-sign[=<key-id>]
-                          GPG-sign commits
-    --autostash           automatically stash/stash pop before and after
-    -x, --exec <exec>     add exec lines after each commit of the editable list
-    --allow-empty-message
-                          allow rebasing commits with empty messages
-    -r, --rebase-merges[=<mode>]
-                          try to rebase merges instead of skipping them
-    --fork-point          use 'merge-base --fork-point' to refine upstream
-    -s, --strategy <strategy>
-                          use the given merge strategy
-    -X, --strategy-option <option>
-                          pass the argument through to the merge strategy
-    --root                rebase all reachable commits up to the root(s)
-
-ok 2 - rebase --root fails with too many args
-
-expecting success: 
-	mkdir -p .git/hooks &&
-	cat >.git/hooks/pre-rebase <<EOF &&
-#!$SHELL_PATH
-echo "\$1,\$2" >.git/PRE-REBASE-INPUT
-EOF
-	chmod +x .git/hooks/pre-rebase
-
-ok 3 - setup pre-rebase hook
-
-expecting success: 
-	git checkout -b work other &&
-	git rebase --root --onto master &&
-	git log --pretty=tformat:"%s" > rebased &&
-	test_cmp expect rebased
-
-Switched to a new branch 'work'
-First, rewinding head to replay your work on top of it...
-Applying: 3
-Applying: 4
-ok 4 - rebase --root --onto <newbase>
-
-expecting success: 
-	test "z$(cat .git/PRE-REBASE-INPUT)" = z--root,
-
-ok 5 - pre-rebase got correct input (1)
-
-expecting success: 
-	git branch work2 other &&
-	git rebase --root --onto master work2 &&
-	git log --pretty=tformat:"%s" > rebased2 &&
-	test_cmp expect rebased2
-
-First, rewinding head to replay your work on top of it...
-Applying: 3
-Applying: 4
-ok 6 - rebase --root --onto <newbase> <branch>
-
-expecting success: 
-	test "z$(cat .git/PRE-REBASE-INPUT)" = z--root,work2
-
-ok 7 - pre-rebase got correct input (2)
-
-expecting success: 
-	git checkout -b work3 other &&
-	git rebase -i --root --onto master &&
-	git log --pretty=tformat:"%s" > rebased3 &&
-	test_cmp expect rebased3
-
-Switched to a new branch 'work3'
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/work3.
-ok 8 - rebase -i --root --onto <newbase>
-
-expecting success: 
-	test "z$(cat .git/PRE-REBASE-INPUT)" = z--root,
-
-ok 9 - pre-rebase got correct input (3)
-
-expecting success: 
-	git branch work4 other &&
-	git rebase -i --root --onto master work4 &&
-	git log --pretty=tformat:"%s" > rebased4 &&
-	test_cmp expect rebased4
-
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/work4.
-ok 10 - rebase -i --root --onto <newbase> <branch>
-
-expecting success: 
-	test "z$(cat .git/PRE-REBASE-INPUT)" = z--root,work4
-
-ok 11 - pre-rebase got correct input (4)
-
-checking prerequisite: REBASE_P
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
-	test -z "$GIT_TEST_SKIP_REBASE_P"
-
-)
-prerequisite REBASE_P ok
-expecting success: 
-	git checkout -b work5 other &&
-	git rebase -i -p --root --onto master &&
-	git log --pretty=tformat:"%s" > rebased5 &&
-	test_cmp expect rebased5
-
-Switched to a new branch 'work5'
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/work5.
-ok 12 - rebase -i -p with linear history
-
-expecting success: 
-	test "z$(cat .git/PRE-REBASE-INPUT)" = z--root,
-
-ok 13 - pre-rebase got correct input (5)
-
-expecting success: 
-	git checkout other^ &&
-	git checkout -b side &&
-	test_commit 5 C &&
-	git checkout other &&
-	git merge side
-
-Note: checking out '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 performing another checkout.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
-
-  git checkout -b <new-branch-name>
-
-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'
-Merging:
-41e7797 4
-virtual side
-found 1 common ancestor:
-1c4476a 1b
-Merge made by the 'recursive' strategy.
- C | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 C
-ok 14 - set up merge history
-
-expecting success: 
-	git checkout -b work6 other &&
-	git rebase -i -p --root --onto master &&
-	log_with_names work6 > rebased6 &&
-	test_cmp expect-side rebased6
-
-Switched to a new branch 'work6'
-Rebasing (1/4)
Rebasing (2/4)
Rebasing (3/4)
Rebasing (4/4)
Successfully rebased and updated refs/heads/work6.
-ok 15 - rebase -i -p with merge
-
-expecting success: 
-	git symbolic-ref HEAD refs/heads/third &&
-	rm .git/index &&
-	rm A B C &&
-	test_commit 6 D &&
-	git checkout other &&
-	git merge --allow-unrelated-histories third
-
-[third (root-commit) 00ac2af] 6
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 D
-Switched to branch 'other'
-Merging:
-ddb0186 Merge branch 'side' into other
-virtual third
-found 0 common ancestors:
-Merge made by the 'recursive' strategy.
- D | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 D
-ok 16 - set up second root and merge
-
-expecting success: 
-	git checkout -b work7 other &&
-	git rebase -i -p --root --onto master &&
-	log_with_names work7 > rebased7 &&
-	test_cmp expect-third rebased7
-
-Switched to a new branch 'work7'
-Rebasing (1/6)
Rebasing (2/6)
Rebasing (3/6)
Rebasing (4/6)
Rebasing (5/6)
Rebasing (6/6)
Successfully rebased and updated refs/heads/work7.
-ok 17 - rebase -i -p with two roots
-
-expecting success: 
-	mkdir -p .git/hooks &&
-	cat >.git/hooks/pre-rebase <<EOF &&
-#!$SHELL_PATH
-false
-EOF
-	chmod +x .git/hooks/pre-rebase
-
-ok 18 - setup pre-rebase hook that fails
-
-expecting success: 
-	git checkout -b stops1 other &&
-	test_must_fail git rebase --root --onto master &&
-	test "z$(git symbolic-ref HEAD)" = zrefs/heads/stops1 &&
-	test 0 = $(git rev-list other...stops1 | wc -l)
-
-Switched to a new branch 'stops1'
-fatal: The pre-rebase hook refused to rebase.
-ok 19 - pre-rebase hook stops rebase
-
-expecting success: 
-	git checkout -b stops2 other &&
-	test_must_fail git rebase --root --onto master &&
-	test "z$(git symbolic-ref HEAD)" = zrefs/heads/stops2 &&
-	test 0 = $(git rev-list other...stops2 | wc -l)
-
-Switched to a new branch 'stops2'
-fatal: The pre-rebase hook refused to rebase.
-ok 20 - pre-rebase hook stops rebase -i
-
-expecting success: 
-	rm -f .git/hooks/pre-rebase
-
-ok 21 - remove pre-rebase hook
-
-expecting success: 
-	git checkout master &&
-	echo conflict > B &&
-	git add B &&
-	git commit -m conflict
-
-Switched to branch 'master'
-[master f80eebe] conflict
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 B
-ok 22 - set up a conflict
-
-expecting success: 
-	git checkout -b conflict1 other &&
-	test_must_fail git rebase --root --onto master &&
-	git ls-files -u | grep "B$"
-
-Switched to a new branch 'conflict1'
-First, rewinding head to replay your work on top of it...
-Applying: 3
-Using index info to reconstruct a base tree...
-Falling back to patching base and 3-way merge...
-Merging:
-f80eebe conflict
-virtual 3
-found 1 common ancestor:
-virtual 4b825dc642cb6eb9a060e54bf8d69288fbee4904
-Auto-merging B
-CONFLICT (add/add): Merge conflict in B
-error: Failed to merge in the changes.
-hint: Use 'git am --show-current-patch' to see the failed patch
-Patch failed at 0001 3
-
-Resolve all conflicts manually, mark them as resolved with
-"git add/rm <conflicted_files>", then run "git rebase --continue".
-You can instead skip this commit: run "git rebase --skip".
-To abort and get back to the state before "git rebase", run "git rebase --abort".
-
-100644 9b1719f5cf069568785080a0bbabbe7c377e22ae 2	B
-100644 00750edc07d6415dcc07ae0351e9397b0222b7ba 3	B
-ok 23 - rebase --root with conflict (first part)
-
-expecting success: 
-	echo 3 > B &&
-	git add B
-
-ok 24 - fix the conflict
-
-expecting success: 
-	git rebase --continue &&
-	git log --pretty=tformat:"%s" > conflict1 &&
-	test_cmp expect-conflict conflict1
-
-Applying: 3
-Applying: 4
-Applying: 5
-Applying: 6
-ok 25 - rebase --root with conflict (second part)
-
-expecting success: 
-	git checkout -b conflict2 other &&
-	test_must_fail git rebase -i --root --onto master &&
-	git ls-files -u | grep "B$"
-
-Switched to a new branch 'conflict2'
-Rebasing (1/4)
Auto-merging B
-CONFLICT (add/add): Merge conflict in B
-error: could not apply 2c64091... 3
-Resolve all conflicts manually, mark them as resolved with
-"git add/rm <conflicted_files>", then run "git rebase --continue".
-You can instead skip this commit: run "git rebase --skip".
-To abort and get back to the state before "git rebase", run "git rebase --abort".
-Could not apply 2c64091... 3
-100644 9b1719f5cf069568785080a0bbabbe7c377e22ae 2	B
-100644 00750edc07d6415dcc07ae0351e9397b0222b7ba 3	B
-ok 26 - rebase -i --root with conflict (first part)
-
-expecting success: 
-	echo 3 > B &&
-	git add B
-
-ok 27 - fix the conflict
-
-expecting success: 
-	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 28 - rebase -i --root with conflict (second part)
-
-expecting success: 
-	git checkout -b conflict3 other &&
-	test_must_fail git rebase -i -p --root --onto master &&
-	git ls-files -u | grep "B$"
-
-Switched to a new branch 'conflict3'
-Rebasing (1/6)
Auto-merging B
-CONFLICT (add/add): Merge conflict in B
-error: could not apply 2c64091... 3
-
-Resolve all conflicts manually, mark them as resolved with
-"git add/rm <conflicted_files>", then run "git rebase --continue".
-You can instead skip this commit: run "git rebase --skip".
-To abort and get back to the state before "git rebase", run "git rebase --abort".
-Could not pick 2c64091600777cfca4ad9dca6ec274f5a2554d69
-100644 9b1719f5cf069568785080a0bbabbe7c377e22ae 2	B
-100644 00750edc07d6415dcc07ae0351e9397b0222b7ba 3	B
-ok 29 - rebase -i -p --root with conflict (first part)
-
-expecting success: 
-	echo 3 > B &&
-	git add B
-
-ok 30 - fix the conflict
-
-expecting success: 
-	git rebase --continue &&
-	log_with_names conflict3 >out &&
-	test_cmp expect-conflict-p out
-
-[detached HEAD 308ae33] 3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Rebasing (2/6)
Rebasing (3/6)
Rebasing (4/6)
Rebasing (5/6)
Rebasing (6/6)
Successfully rebased and updated refs/heads/conflict3.
-ok 31 - rebase -i -p --root with conflict (second part)
-
-# passed all 31 test(s)
-1..31
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t3509-cherry-pick-merge-df.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3509-cherry-pick-merge-df/.git/
-expecting success: 
-	mkdir a &&
-	>a/f &&
-	git add a &&
-	git commit -m a
-
-[master (root-commit) 22e719f] a
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 a/f
-ok 1 - Initialize repository
-
-expecting success: 
-	mkdir b &&
-	test_ln_s_add ../a b/a &&
-	git commit -m b &&
-
-	git checkout -b branch &&
-	rm b/a &&
-	git mv a b/a &&
-	test_ln_s_add b/a a &&
-	git commit -m swap &&
-
-	>f1 &&
-	git add f1 &&
-	git commit -m f1
-
-checking prerequisite: SYMLINKS
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
-	# test whether the filesystem supports symbolic links
-	ln -s x y && test -h y
-
-)
-prerequisite SYMLINKS ok
-[master 090eac8] b
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 120000 b/a
-Switched to a new branch 'branch'
-[branch 46835e5] swap
- Author: A U Thor <author@example.com>
- 3 files changed, 1 insertion(+), 1 deletion(-)
- create mode 120000 a
- delete mode 120000 b/a
- rename {a => b/a}/f (100%)
-[branch bee42cb] f1
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 f1
-ok 2 - Setup rename across paths each below D/F conflicts
-
-expecting success: 
-	git reset --hard &&
-	git checkout master^0 &&
-	git cherry-pick branch
-
-HEAD is now at bee42cb f1
-Note: checking out 'master^0'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by performing another checkout.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
-
-  git checkout -b <new-branch-name>
-
-HEAD is now at 090eac8 b
-Adding b/a
-Adding a/f
-[detached HEAD 00aef1d] f1
- Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:06:11 2021 +0000
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 f1
-ok 3 - Cherry-pick succeeds with rename across D/F conflicts
-
-expecting success: 
-	git checkout --orphan nick-testcase &&
-	git rm -rf . &&
-
-	>empty &&
-	git add empty &&
-	git commit -m "Empty file" &&
-
-	git checkout -b simple &&
-	mv empty file &&
-	mkdir empty &&
-	mv file empty &&
-	git add empty/file &&
-	git commit -m "Empty file under empty dir" &&
-
-	echo content >newfile &&
-	git add newfile &&
-	git commit -m "New file"
-
-Switched to a new branch 'nick-testcase'
-rm 'a/f'
-rm 'b/a'
-rm 'f1'
-[nick-testcase (root-commit) 5c5e4ed] Empty file
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 empty
-Switched to a new branch 'simple'
-[simple 689220a] Empty file under empty dir
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename empty => empty/file (100%)
-[simple 4204837] New file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 newfile
-ok 4 - Setup rename with file on one side matching directory name on other
-
-expecting success: 
-	git reset --hard &&
-	git checkout -q nick-testcase^0 &&
-	git cherry-pick --strategy=resolve simple
-
-HEAD is now at 4204837 New file
-Trying simple merge.
-Simple merge failed, trying Automatic merge.
-[detached HEAD 9e10982] New file
- Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:06:12 2021 +0000
- 1 file changed, 1 insertion(+)
- create mode 100644 newfile
-ok 5 - Cherry-pick succeeds with was_a_dir/file -> was_a_dir (resolve)
-
-expecting success: 
-	git reset --hard &&
-	git checkout -q nick-testcase^0 &&
-	git cherry-pick --strategy=recursive simple
-
-HEAD is now at 9e10982 New file
-Adding empty
-[detached HEAD 9e10982] New file
- Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:06:12 2021 +0000
- 1 file changed, 1 insertion(+)
- create mode 100644 newfile
-ok 6 - Cherry-pick succeeds with was_a_dir/file -> was_a_dir (recursive)
-
-expecting success: 
-	git reset --hard &&
-	git checkout --orphan mergeme &&
-	git rm -rf . &&
-
-	mkdir sub &&
-	mkdir othersub &&
-	echo content > sub/file &&
-	echo foo > othersub/whatever &&
-	git add -A &&
-	git commit -m "Common commit" &&
-
-	git rm -rf othersub &&
-	git mv sub/file othersub &&
-	git commit -m "Commit to merge" &&
-
-	git checkout -b newhead mergeme~1 &&
-	>independent-change &&
-	git add independent-change &&
-	git commit -m "Completely unrelated change"
-
-HEAD is now at 9e10982 New file
-Switched to a new branch 'mergeme'
-rm 'empty'
-rm 'newfile'
-[mergeme (root-commit) e8a0ae3] Common commit
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 othersub/whatever
- create mode 100644 sub/file
-rm 'othersub/whatever'
-[mergeme 03ccba7] Commit to merge
- Author: A U Thor <author@example.com>
- 2 files changed, 1 deletion(-)
- rename sub/file => othersub (100%)
- delete mode 100644 othersub/whatever
-Switched to a new branch 'newhead'
-[newhead f816da0] Completely unrelated change
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 independent-change
-ok 7 - Setup rename with file on one side matching different dirname on other
-
-expecting success: 
-	git reset --hard &&
-	git checkout -q newhead^0 &&
-	git cherry-pick --strategy=resolve mergeme
-
-HEAD is now at f816da0 Completely unrelated change
-Trying simple merge.
-Simple merge failed, trying Automatic merge.
-Adding othersub
-[detached HEAD ee80d57] Commit to merge
- Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:06:13 2021 +0000
- 2 files changed, 1 deletion(-)
- rename sub/file => othersub (100%)
- delete mode 100644 othersub/whatever
-ok 8 - Cherry-pick with rename to different D/F conflict succeeds (resolve)
-
-expecting success: 
-	git reset --hard &&
-	git checkout -q newhead^0 &&
-	git cherry-pick --strategy=recursive mergeme
-
-HEAD is now at ee80d57 Commit to merge
-Removing othersub/whatever
-[detached HEAD ee80d57] Commit to merge
- Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:06:13 2021 +0000
- 2 files changed, 1 deletion(-)
- rename sub/file => othersub (100%)
- delete mode 100644 othersub/whatever
-ok 9 - Cherry-pick with rename to different D/F conflict succeeds (recursive)
-
-# passed all 9 test(s)
-1..9
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
 *** t3508-cherry-pick-many-commits.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3508-cherry-pick-many-commits/.git/
 expecting success: 
@@ -78462,6 +76404,1901 @@
 1..14
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
+*** t3509-cherry-pick-merge-df.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3509-cherry-pick-merge-df/.git/
+expecting success: 
+	mkdir a &&
+	>a/f &&
+	git add a &&
+	git commit -m a
+
+[master (root-commit) 7baa904] a
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 a/f
+ok 1 - Initialize repository
+
+expecting success: 
+	mkdir b &&
+	test_ln_s_add ../a b/a &&
+	git commit -m b &&
+
+	git checkout -b branch &&
+	rm b/a &&
+	git mv a b/a &&
+	test_ln_s_add b/a a &&
+	git commit -m swap &&
+
+	>f1 &&
+	git add f1 &&
+	git commit -m f1
+
+checking prerequisite: SYMLINKS
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
+	# test whether the filesystem supports symbolic links
+	ln -s x y && test -h y
+
+)
+prerequisite SYMLINKS ok
+[master 018e365] b
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 120000 b/a
+Switched to a new branch 'branch'
+[branch 8c3b984] swap
+ Author: A U Thor <author@example.com>
+ 3 files changed, 1 insertion(+), 1 deletion(-)
+ create mode 120000 a
+ delete mode 120000 b/a
+ rename {a => b/a}/f (100%)
+[branch b04cbb7] f1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 f1
+ok 2 - Setup rename across paths each below D/F conflicts
+
+expecting success: 
+	git reset --hard &&
+	git checkout master^0 &&
+	git cherry-pick branch
+
+HEAD is now at b04cbb7 f1
+Note: checking out 'master^0'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by performing another checkout.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -b with the checkout command again. Example:
+
+  git checkout -b <new-branch-name>
+
+HEAD is now at 018e365 b
+Adding b/a
+Adding a/f
+[detached HEAD eda595d] f1
+ Author: A U Thor <author@example.com>
+ Date: Thu Jan 5 11:48:01 2023 +0000
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 f1
+ok 3 - Cherry-pick succeeds with rename across D/F conflicts
+
+expecting success: 
+	git checkout --orphan nick-testcase &&
+	git rm -rf . &&
+
+	>empty &&
+	git add empty &&
+	git commit -m "Empty file" &&
+
+	git checkout -b simple &&
+	mv empty file &&
+	mkdir empty &&
+	mv file empty &&
+	git add empty/file &&
+	git commit -m "Empty file under empty dir" &&
+
+	echo content >newfile &&
+	git add newfile &&
+	git commit -m "New file"
+
+Switched to a new branch 'nick-testcase'
+rm 'a/f'
+rm 'b/a'
+rm 'f1'
+[nick-testcase (root-commit) 8288c19] Empty file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 empty
+Switched to a new branch 'simple'
+[simple 1d7e89a] Empty file under empty dir
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename empty => empty/file (100%)
+[simple 981c8e3] New file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 newfile
+ok 4 - Setup rename with file on one side matching directory name on other
+
+expecting success: 
+	git reset --hard &&
+	git checkout -q nick-testcase^0 &&
+	git cherry-pick --strategy=resolve simple
+
+HEAD is now at 981c8e3 New file
+Trying simple merge.
+Simple merge failed, trying Automatic merge.
+[detached HEAD 08a5aa6] New file
+ Author: A U Thor <author@example.com>
+ Date: Thu Jan 5 11:48:01 2023 +0000
+ 1 file changed, 1 insertion(+)
+ create mode 100644 newfile
+ok 5 - Cherry-pick succeeds with was_a_dir/file -> was_a_dir (resolve)
+
+expecting success: 
+	git reset --hard &&
+	git checkout -q nick-testcase^0 &&
+	git cherry-pick --strategy=recursive simple
+
+HEAD is now at 08a5aa6 New file
+Adding empty
+[detached HEAD 08a5aa6] New file
+ Author: A U Thor <author@example.com>
+ Date: Thu Jan 5 11:48:01 2023 +0000
+ 1 file changed, 1 insertion(+)
+ create mode 100644 newfile
+ok 6 - Cherry-pick succeeds with was_a_dir/file -> was_a_dir (recursive)
+
+expecting success: 
+	git reset --hard &&
+	git checkout --orphan mergeme &&
+	git rm -rf . &&
+
+	mkdir sub &&
+	mkdir othersub &&
+	echo content > sub/file &&
+	echo foo > othersub/whatever &&
+	git add -A &&
+	git commit -m "Common commit" &&
+
+	git rm -rf othersub &&
+	git mv sub/file othersub &&
+	git commit -m "Commit to merge" &&
+
+	git checkout -b newhead mergeme~1 &&
+	>independent-change &&
+	git add independent-change &&
+	git commit -m "Completely unrelated change"
+
+HEAD is now at 08a5aa6 New file
+Switched to a new branch 'mergeme'
+rm 'empty'
+rm 'newfile'
+[mergeme (root-commit) ff29780] Common commit
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 othersub/whatever
+ create mode 100644 sub/file
+rm 'othersub/whatever'
+[mergeme 2d4c73b] Commit to merge
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 deletion(-)
+ rename sub/file => othersub (100%)
+ delete mode 100644 othersub/whatever
+Switched to a new branch 'newhead'
+[newhead 7319c1b] Completely unrelated change
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 independent-change
+ok 7 - Setup rename with file on one side matching different dirname on other
+
+expecting success: 
+	git reset --hard &&
+	git checkout -q newhead^0 &&
+	git cherry-pick --strategy=resolve mergeme
+
+HEAD is now at 7319c1b Completely unrelated change
+Trying simple merge.
+Simple merge failed, trying Automatic merge.
+Adding othersub
+[detached HEAD 23be049] Commit to merge
+ Author: A U Thor <author@example.com>
+ Date: Thu Jan 5 11:48:02 2023 +0000
+ 2 files changed, 1 deletion(-)
+ rename sub/file => othersub (100%)
+ delete mode 100644 othersub/whatever
+ok 8 - Cherry-pick with rename to different D/F conflict succeeds (resolve)
+
+expecting success: 
+	git reset --hard &&
+	git checkout -q newhead^0 &&
+	git cherry-pick --strategy=recursive mergeme
+
+HEAD is now at 23be049 Commit to merge
+Removing othersub/whatever
+[detached HEAD f5dd914] Commit to merge
+ Author: A U Thor <author@example.com>
+ Date: Thu Jan 5 11:48:02 2023 +0000
+ 2 files changed, 1 deletion(-)
+ rename sub/file => othersub (100%)
+ delete mode 100644 othersub/whatever
+ok 9 - Cherry-pick with rename to different D/F conflict succeeds (recursive)
+
+# passed all 9 test(s)
+1..9
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t1013-read-tree-submodule.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/.git/
+expecting success: 
+		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/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1/.git/
+[master (root-commit) 8b1b179] 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/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update_sub2/.git/
+[master (root-commit) 9b6d169] 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/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update_repo/.git/
+[master (root-commit) b4cdfc0] 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/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update_repo/sub1'...
+done.
+Cloning into '/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update_repo/uninitialized_sub'...
+done.
+[add_sub1 241b775] 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'
+Removing uninitialized_sub
+Removing sub1
+Removing .gitmodules
+[remove_sub1 7bd74cd] Revert "Add sub1"
+ Author: A U Thor <author@example.com>
+ Date: Thu Jan 5 11:46:41 2023 +0000
+ 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 d99bb09] 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/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1
+ * [new branch]      modifications -> modifications
+[modify_sub1 4275c65] 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/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update_repo/sub1/sub2'...
+done.
+[add_nested_sub 41a86dd] 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 04c23ca] 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 eb61ea9] 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 18e9fef] update nested sub
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[modify_sub1_recursively 7d2ce49] update sub1, that updates nested sub
+ Author: A U Thor <author@example.com>
+To /build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1
+ * [new branch]      modify_sub1_recursively -> modify_sub1_recursively
+To /build/git-2.20.1/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 '8b1b179f980ca7eb4e58338ea90c9a29fd25c4bc'
+Previous HEAD position was 8b1b179 Base inside first submodule
+Switched to branch 'modifications'
+rm 'sub1'
+[replace_sub1_with_directory 5570094] 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'
+Removing sub1/file3
+Removing sub1/file2
+Removing sub1/file1
+Adding sub1
+[replace_directory_with_sub1 f1b234f] Revert "Replace sub1 with directory"
+ Author: A U Thor <author@example.com>
+ Date: Thu Jan 5 11:46:44 2023 +0000
+ 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 d708f40] 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 b9834d0] Revert "Replace sub1 with file"
+ Author: A U Thor <author@example.com>
+ Date: Thu Jan 5 11:46:44 2023 +0000
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+ mode change 100644 => 160000 sub1
+Switched to a new branch 'invalid_sub1'
+[invalid_sub1 cd828df] Invalid sub1 commit
+ Author: A U Thor <author@example.com>
+Switched to a new branch 'valid_sub1'
+[valid_sub1 554dadf] Revert "Invalid sub1 commit"
+ Author: A U Thor <author@example.com>
+ Date: Thu Jan 5 11:46:44 2023 +0000
+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 remote branch 'no_submodule' from 'origin'.
+Branch 'add_sub1' set up to track remote branch 'add_sub1' from 'origin'.
+ok 1 - git read-tree -u -m --recurse-submodules: added submodule is checked out
+
+expecting success: 
+		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 remote branch 'no_submodule' from 'origin'.
+Branch 'add_sub1' set up to track remote branch 'add_sub1' from 'origin'.
+ok 2 - git read-tree -u -m --recurse-submodules: added submodule is checked out in empty dir
+
+expecting success: 
+		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 remote branch 'add_sub1' from 'origin'.
+Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '8b1b179f980ca7eb4e58338ea90c9a29fd25c4bc'
+Switched to a new branch 'keep_branch'
+Branch 'modify_sub1' set up to track remote branch 'modify_sub1' from 'origin'.
+fatal: ref HEAD is not a symbolic ref
+ok 3 - git read-tree -u -m --recurse-submodules: submodule branch is not changed, detach HEAD instead
+
+expecting success: 
+		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 remote branch 'replace_sub1_with_file' from 'origin'.
+fatal: Needed a single revision
+Branch 'replace_file_with_sub1' set up to track remote branch 'replace_file_with_sub1' from 'origin'.
+ok 4 - git read-tree -u -m --recurse-submodules: replace tracked file with submodule checks out submodule
+
+expecting success: 
+		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 remote branch 'replace_sub1_with_directory' from 'origin'.
+fatal: Needed a single revision
+Branch 'replace_directory_with_sub1' set up to track remote branch 'replace_directory_with_sub1' from 'origin'.
+ok 5 - git read-tree -u -m --recurse-submodules: replace directory with submodule
+
+expecting success: 
+		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
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+Branch 'add_sub1' set up to track remote branch 'add_sub1' from 'origin'.
+Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '8b1b179f980ca7eb4e58338ea90c9a29fd25c4bc'
+Branch 'remove_sub1' set up to track remote branch 'remove_sub1' from 'origin'.
+ok 6 - git read-tree -u -m --recurse-submodules: removed submodule removes submodules working tree
+
+expecting success: 
+		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 remote branch 'add_sub1' from 'origin'.
+Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '8b1b179f980ca7eb4e58338ea90c9a29fd25c4bc'
+Branch 'remove_sub1' set up to track remote branch 'remove_sub1' from 'origin'.
+Migrating git directory of 'sub1' from
+'/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1/.git' to
+'/build/git-2.20.1/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: 
+		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 remote branch 'add_sub1' from 'origin'.
+Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '8b1b179f980ca7eb4e58338ea90c9a29fd25c4bc'
+Branch 'replace_sub1_with_file' set up to track remote branch 'replace_sub1_with_file' from 'origin'.
+ok 8 - git read-tree -u -m --recurse-submodules: replace submodule with a file
+
+checking known breakage: 
+		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 remote branch 'add_sub1' from 'origin'.
+Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '8b1b179f980ca7eb4e58338ea90c9a29fd25c4bc'
+Branch 'replace_sub1_with_file' set up to track remote branch 'replace_sub1_with_file' from 'origin'.
+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: 
+		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 remote branch 'add_sub1' from 'origin'.
+Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '8b1b179f980ca7eb4e58338ea90c9a29fd25c4bc'
+Branch 'modify_sub1' set up to track remote branch 'modify_sub1' from 'origin'.
+ok 10 - git read-tree -u -m --recurse-submodules: modified submodule updates submodule work tree
+
+expecting success: 
+		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_i18ngrep 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 remote branch 'add_sub1' from 'origin'.
+Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '8b1b179f980ca7eb4e58338ea90c9a29fd25c4bc'
+Branch 'invalid_sub1' set up to track remote branch 'invalid_sub1' from 'origin'.
+error: Submodule 'sub1' could not be updated.
+error: Submodule 'sub1' cannot checkout new HEAD.
+ok 11 - git read-tree -u -m --recurse-submodules: updating to a missing submodule commit fails
+
+expecting success: 
+		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 remote branch 'no_submodule' from 'origin'.
+Branch 'add_sub1' set up to track remote branch 'add_sub1' from 'origin'.
+error: Untracked working tree file 'sub1' would be overwritten by merge.
+ok 12 - git read-tree -u -m --recurse-submodules: added submodule doesn't remove untracked file with same name
+
+checking known breakage: 
+		test_when_finished "rm submodule_update/.git/info/exclude" &&
+		prolog &&
+		reset_work_tree_to_interested no_submodule &&
+		(
+			cd submodule_update &&
+			git branch -t add_sub1 origin/add_sub1 &&
+			: >sub1 &&
+			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 remote branch 'no_submodule' from 'origin'.
+Branch 'add_sub1' set up to track remote branch 'add_sub1' from 'origin'.
+error: Untracked working tree file 'sub1' would be overwritten by merge.
+not ok 13 - git read-tree -u -m --recurse-submodules: added submodule removes an untracked ignored file # TODO known breakage
+
+checking known breakage: 
+		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 remote branch 'add_sub1' from 'origin'.
+Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '8b1b179f980ca7eb4e58338ea90c9a29fd25c4bc'
+Branch 'replace_sub1_with_directory' set up to track remote branch 'replace_sub1_with_directory' from 'origin'.
+error: Untracked working tree file 'sub1/file1' would be overwritten by merge.
+not ok 14 - git read-tree -u -m --recurse-submodules: replace submodule with a directory # TODO known breakage
+
+checking known breakage: 
+		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 remote branch 'add_sub1' from 'origin'.
+Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '8b1b179f980ca7eb4e58338ea90c9a29fd25c4bc'
+Branch 'replace_sub1_with_directory' set up to track remote branch 'replace_sub1_with_directory' from 'origin'.
+error: Untracked working tree file 'sub1/file1' would be overwritten by merge.
+not ok 15 - 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: 
+		test_when_finished "rm submodule_update/.git/modules/sub1/info/exclude" &&
+		prolog &&
+		reset_work_tree_to_interested add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
+			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 remote branch 'add_sub1' from 'origin'.
+Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '8b1b179f980ca7eb4e58338ea90c9a29fd25c4bc'
+Branch 'replace_sub1_with_file' set up to track remote branch 'replace_sub1_with_file' from 'origin'.
+ok 16 - git read-tree -u -m --recurse-submodules: replace submodule with a file works ignores ignored files in submodule
+
+expecting success: 
+		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 remote branch 'add_sub1' from 'origin'.
+Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '8b1b179f980ca7eb4e58338ea90c9a29fd25c4bc'
+Branch 'modify_sub1' set up to track remote branch 'modify_sub1' from 'origin'.
+ok 17 - git -c submodule.recurse=true read-tree -u -m: modified submodule updates submodule work tree
+
+expecting success: 
+		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 remote branch 'add_nested_sub' from 'origin'.
+Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '41a86dd50b9aaf6c15916cd7d1ac8e1fe8613bb6'
+Submodule 'sub2' (/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update_sub2) registered for path 'sub1/sub2'
+Cloning into '/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1/sub2'...
+done.
+Submodule path 'sub1/sub2': checked out '9b6d169672f999583b894a3e652dc11387cbda3b'
+Branch 'modify_sub1_recursively' set up to track remote branch 'modify_sub1_recursively' from 'origin'.
+ok 18 - git read-tree -u -m --recurse-submodules: modified submodule updates submodule recursively
+
+expecting success: 
+		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 remote branch 'no_submodule' from 'origin'.
+Branch 'add_sub1' set up to track remote branch 'add_sub1' from 'origin'.
+ok 19 - git read-tree -u --reset --recurse-submodules: added submodule is checked out
+
+expecting success: 
+		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 remote branch 'no_submodule' from 'origin'.
+Branch 'add_sub1' set up to track remote branch 'add_sub1' from 'origin'.
+ok 20 - git read-tree -u --reset --recurse-submodules: added submodule is checked out in empty dir
+
+expecting success: 
+		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 remote branch 'add_sub1' from 'origin'.
+Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '8b1b179f980ca7eb4e58338ea90c9a29fd25c4bc'
+Switched to a new branch 'keep_branch'
+Branch 'modify_sub1' set up to track remote branch 'modify_sub1' from 'origin'.
+fatal: ref HEAD is not a symbolic ref
+ok 21 - git read-tree -u --reset --recurse-submodules: submodule branch is not changed, detach HEAD instead
+
+expecting success: 
+		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 remote branch 'replace_sub1_with_file' from 'origin'.
+fatal: Needed a single revision
+Branch 'replace_file_with_sub1' set up to track remote branch 'replace_file_with_sub1' from 'origin'.
+ok 22 - git read-tree -u --reset --recurse-submodules: replace tracked file with submodule checks out submodule
+
+expecting success: 
+		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 remote branch 'replace_sub1_with_directory' from 'origin'.
+fatal: Needed a single revision
+Branch 'replace_directory_with_sub1' set up to track remote branch 'replace_directory_with_sub1' from 'origin'.
+ok 23 - git read-tree -u --reset --recurse-submodules: replace directory with submodule
+
+expecting success: 
+		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
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+Branch 'add_sub1' set up to track remote branch 'add_sub1' from 'origin'.
+Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '8b1b179f980ca7eb4e58338ea90c9a29fd25c4bc'
+Branch 'remove_sub1' set up to track remote branch 'remove_sub1' from 'origin'.
+ok 24 - git read-tree -u --reset --recurse-submodules: removed submodule removes submodules working tree
+
+expecting success: 
+		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 remote branch 'add_sub1' from 'origin'.
+Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '8b1b179f980ca7eb4e58338ea90c9a29fd25c4bc'
+Branch 'remove_sub1' set up to track remote branch 'remove_sub1' from 'origin'.
+Migrating git directory of 'sub1' from
+'/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1/.git' to
+'/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update/.git/modules/sub1'
+ok 25 - git read-tree -u --reset --recurse-submodules: removed submodule absorbs submodules .git directory
+
+expecting success: 
+		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 remote branch 'add_sub1' from 'origin'.
+Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '8b1b179f980ca7eb4e58338ea90c9a29fd25c4bc'
+Branch 'replace_sub1_with_file' set up to track remote branch 'replace_sub1_with_file' from 'origin'.
+ok 26 - git read-tree -u --reset --recurse-submodules: replace submodule with a file
+
+checking known breakage: 
+		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 remote branch 'add_sub1' from 'origin'.
+Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '8b1b179f980ca7eb4e58338ea90c9a29fd25c4bc'
+Branch 'replace_sub1_with_file' set up to track remote branch 'replace_sub1_with_file' from 'origin'.
+test_must_fail: command succeeded: git read-tree -u --reset --recurse-submodules replace_sub1_with_file
+not ok 27 - git read-tree -u --reset --recurse-submodules: replace submodule with a file must fail with untracked files # TODO known breakage
+
+expecting success: 
+		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 remote branch 'add_sub1' from 'origin'.
+Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '8b1b179f980ca7eb4e58338ea90c9a29fd25c4bc'
+Branch 'modify_sub1' set up to track remote branch 'modify_sub1' from 'origin'.
+ok 28 - git read-tree -u --reset --recurse-submodules: modified submodule updates submodule work tree
+
+expecting success: 
+		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_i18ngrep 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 remote branch 'add_sub1' from 'origin'.
+Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '8b1b179f980ca7eb4e58338ea90c9a29fd25c4bc'
+Branch 'invalid_sub1' set up to track remote branch 'invalid_sub1' from 'origin'.
+error: Submodule 'sub1' could not be updated.
+error: Submodule 'sub1' cannot checkout new HEAD.
+ok 29 - git read-tree -u --reset --recurse-submodules: updating to a missing submodule commit fails
+
+expecting success: 
+		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 remote branch 'no_submodule' from 'origin'.
+Branch 'add_sub1' set up to track remote branch 'add_sub1' from 'origin'.
+ok 30 - git read-tree -u --reset --recurse-submodules: added submodule does remove untracked unignored file with same name when forced
+
+expecting success: 
+		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 remote branch 'add_sub1' from 'origin'.
+Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '8b1b179f980ca7eb4e58338ea90c9a29fd25c4bc'
+Branch 'replace_sub1_with_directory' set up to track remote branch 'replace_sub1_with_directory' from 'origin'.
+ok 31 - git read-tree -u --reset --recurse-submodules: replace submodule with a directory
+
+expecting success: 
+		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 remote branch 'add_sub1' from 'origin'.
+Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '8b1b179f980ca7eb4e58338ea90c9a29fd25c4bc'
+Branch 'replace_sub1_with_directory' set up to track remote branch 'replace_sub1_with_directory' from 'origin'.
+Migrating git directory of 'sub1' from
+'/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1/.git' to
+'/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update/.git/modules/sub1'
+ok 32 - git read-tree -u --reset --recurse-submodules: replace submodule containing a .git directory with a directory must fail
+
+expecting success: 
+		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 remote branch 'add_sub1' from 'origin'.
+Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '8b1b179f980ca7eb4e58338ea90c9a29fd25c4bc'
+Branch 'replace_sub1_with_file' set up to track remote branch 'replace_sub1_with_file' from 'origin'.
+ok 33 - git read-tree -u --reset --recurse-submodules: replace submodule with a file ignoring ignored files
+
+expecting success: 
+		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 remote branch 'invalid_sub1' from 'origin'.
+fatal: Needed a single revision
+Branch 'valid_sub1' set up to track remote branch 'valid_sub1' from 'origin'.
+ok 34 - git read-tree -u --reset --recurse-submodules: modified submodule does update submodule work tree from invalid commit
+
+expecting success: 
+		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 remote branch 'add_sub1' from 'origin'.
+Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '8b1b179f980ca7eb4e58338ea90c9a29fd25c4bc'
+Branch 'modify_sub1' set up to track remote branch 'modify_sub1' from 'origin'.
+ok 35 - git read-tree -u --reset --recurse-submodules: updating submodules fixes .git links
+
+expecting success: 
+		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 remote branch 'add_sub1' from 'origin'.
+Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '8b1b179f980ca7eb4e58338ea90c9a29fd25c4bc'
+ok 36 - git read-tree -u --reset --recurse-submodules: changed submodule worktree is reset
+
+expecting success: 
+		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 remote branch 'no_submodule' from 'origin'.
+Branch 'add_sub1' set up to track remote branch 'add_sub1' from 'origin'.
+Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '8b1b179f980ca7eb4e58338ea90c9a29fd25c4bc'
+Submodule path 'uninitialized_sub': checked out '8b1b179f980ca7eb4e58338ea90c9a29fd25c4bc'
+ok 37 - git read-tree -u -m: added submodule creates empty directory
+
+expecting success: 
+		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 remote branch 'no_submodule' from 'origin'.
+Branch 'add_sub1' set up to track remote branch 'add_sub1' from 'origin'.
+Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '8b1b179f980ca7eb4e58338ea90c9a29fd25c4bc'
+Submodule path 'uninitialized_sub': checked out '8b1b179f980ca7eb4e58338ea90c9a29fd25c4bc'
+ok 38 - git read-tree -u -m: added submodule leaves existing empty directory alone
+
+expecting success: 
+		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 remote branch 'replace_sub1_with_file' from 'origin'.
+fatal: Needed a single revision
+Branch 'replace_file_with_sub1' set up to track remote branch 'replace_file_with_sub1' from 'origin'.
+Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '8b1b179f980ca7eb4e58338ea90c9a29fd25c4bc'
+Submodule path 'uninitialized_sub': checked out '8b1b179f980ca7eb4e58338ea90c9a29fd25c4bc'
+ok 39 - git read-tree -u -m: replace tracked file with submodule creates empty directory
+
+expecting success: 
+		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 remote branch 'replace_sub1_with_directory' from 'origin'.
+fatal: Needed a single revision
+Branch 'replace_directory_with_sub1' set up to track remote branch 'replace_directory_with_sub1' from 'origin'.
+Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '8b1b179f980ca7eb4e58338ea90c9a29fd25c4bc'
+Submodule path 'uninitialized_sub': checked out '8b1b179f980ca7eb4e58338ea90c9a29fd25c4bc'
+ok 40 - git read-tree -u -m: replace directory with submodule
+
+expecting success: 
+		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 remote branch 'add_sub1' from 'origin'.
+Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '8b1b179f980ca7eb4e58338ea90c9a29fd25c4bc'
+Branch 'remove_sub1' set up to track remote branch 'remove_sub1' from 'origin'.
+warning: unable to rmdir 'sub1': Directory not empty
+ok 41 - git read-tree -u -m: removed submodule leaves submodule directory and its contents in place
+
+expecting success: 
+		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 remote branch 'add_sub1' from 'origin'.
+Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '8b1b179f980ca7eb4e58338ea90c9a29fd25c4bc'
+Branch 'remove_sub1' set up to track remote branch 'remove_sub1' from 'origin'.
+warning: unable to rmdir 'sub1': Directory not empty
+ok 42 - git read-tree -u -m: removed submodule leaves submodule containing a .git directory alone
+
+expecting success: 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
+			test_must_fail $command replace_sub1_with_directory &&
+			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 remote branch 'add_sub1' from 'origin'.
+Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '8b1b179f980ca7eb4e58338ea90c9a29fd25c4bc'
+Branch 'replace_sub1_with_directory' set up to track remote branch 'replace_sub1_with_directory' from 'origin'.
+error: Untracked working tree file 'sub1/file1' would be overwritten by merge.
+ok 43 - git read-tree -u -m: replace submodule with a directory must fail
+
+expecting success: 
+		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 &&
+			test_must_fail $command replace_sub1_with_directory &&
+			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 remote branch 'add_sub1' from 'origin'.
+Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '8b1b179f980ca7eb4e58338ea90c9a29fd25c4bc'
+Branch 'replace_sub1_with_directory' set up to track remote branch 'replace_sub1_with_directory' from 'origin'.
+error: Untracked working tree file 'sub1/file1' would be overwritten by merge.
+ok 44 - git read-tree -u -m: replace submodule containing a .git directory with a directory must fail
+
+checking known breakage: 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
+			test_must_fail $command replace_sub1_with_file &&
+			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 remote branch 'add_sub1' from 'origin'.
+Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '8b1b179f980ca7eb4e58338ea90c9a29fd25c4bc'
+Branch 'replace_sub1_with_file' set up to track remote branch 'replace_sub1_with_file' from 'origin'.
+test_must_fail: command succeeded: git read-tree -u -m replace_sub1_with_file
+not ok 45 - git read-tree -u -m: replace submodule with a file must fail # TODO known breakage
+
+checking known breakage: 
+		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 &&
+			test_must_fail $command replace_sub1_with_file &&
+			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 remote branch 'add_sub1' from 'origin'.
+Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '8b1b179f980ca7eb4e58338ea90c9a29fd25c4bc'
+Branch 'replace_sub1_with_file' set up to track remote branch 'replace_sub1_with_file' from 'origin'.
+test_must_fail: command succeeded: git read-tree -u -m replace_sub1_with_file
+not ok 46 - git read-tree -u -m: replace submodule containing a .git directory with a file must fail # TODO known breakage
+
+expecting success: 
+		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 remote branch 'add_sub1' from 'origin'.
+Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '8b1b179f980ca7eb4e58338ea90c9a29fd25c4bc'
+Branch 'modify_sub1' set up to track remote branch 'modify_sub1' from 'origin'.
+Submodule path 'sub1': checked out 'd99bb091315c356d368cda705866c7f8615838a1'
+ok 47 - git read-tree -u -m: modified submodule does not update submodule work tree
+
+expecting success: 
+		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 remote branch 'add_sub1' from 'origin'.
+Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '8b1b179f980ca7eb4e58338ea90c9a29fd25c4bc'
+Branch 'invalid_sub1' set up to track remote branch 'invalid_sub1' from 'origin'.
+error: Server does not allow request for unadvertised object 0123456789012345678901234567890123456789
+Fetched in submodule path 'sub1', but it did not contain 0123456789012345678901234567890123456789. Direct fetching of that commit failed.
+ok 48 - git read-tree -u -m: modified submodule does not update submodule work tree to invalid commit
+
+expecting success: 
+		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 remote branch 'invalid_sub1' from 'origin'.
+fatal: Needed a single revision
+Branch 'valid_sub1' set up to track remote branch 'valid_sub1' from 'origin'.
+Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '8b1b179f980ca7eb4e58338ea90c9a29fd25c4bc'
+Submodule path 'uninitialized_sub': checked out '8b1b179f980ca7eb4e58338ea90c9a29fd25c4bc'
+ok 49 - git read-tree -u -m: modified submodule does not update submodule work tree from invalid commit
+
+expecting success: 
+		prolog &&
+		reset_work_tree_to 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 remote branch 'no_submodule' from 'origin'.
+Branch 'add_sub1' set up to track remote branch 'add_sub1' from 'origin'.
+error: Untracked working tree file 'sub1' would be overwritten by merge.
+ok 50 - git read-tree -u -m: added submodule doesn't remove untracked unignored file with same name
+
+expecting success: 
+		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 remote branch 'no_submodule' from 'origin'.
+Branch 'add_sub1' set up to track remote branch 'add_sub1' from 'origin'.
+Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '8b1b179f980ca7eb4e58338ea90c9a29fd25c4bc'
+Submodule path 'uninitialized_sub': checked out '8b1b179f980ca7eb4e58338ea90c9a29fd25c4bc'
+ok 51 - git read-tree -u --reset: added submodule creates empty directory
+
+expecting success: 
+		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 remote branch 'no_submodule' from 'origin'.
+Branch 'add_sub1' set up to track remote branch 'add_sub1' from 'origin'.
+Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '8b1b179f980ca7eb4e58338ea90c9a29fd25c4bc'
+Submodule path 'uninitialized_sub': checked out '8b1b179f980ca7eb4e58338ea90c9a29fd25c4bc'
+ok 52 - git read-tree -u --reset: added submodule leaves existing empty directory alone
+
+expecting success: 
+		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 remote branch 'replace_sub1_with_file' from 'origin'.
+fatal: Needed a single revision
+Branch 'replace_file_with_sub1' set up to track remote branch 'replace_file_with_sub1' from 'origin'.
+Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '8b1b179f980ca7eb4e58338ea90c9a29fd25c4bc'
+Submodule path 'uninitialized_sub': checked out '8b1b179f980ca7eb4e58338ea90c9a29fd25c4bc'
+ok 53 - git read-tree -u --reset: replace tracked file with submodule creates empty directory
+
+expecting success: 
+		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 remote branch 'replace_sub1_with_directory' from 'origin'.
+fatal: Needed a single revision
+Branch 'replace_directory_with_sub1' set up to track remote branch 'replace_directory_with_sub1' from 'origin'.
+Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '8b1b179f980ca7eb4e58338ea90c9a29fd25c4bc'
+Submodule path 'uninitialized_sub': checked out '8b1b179f980ca7eb4e58338ea90c9a29fd25c4bc'
+ok 54 - git read-tree -u --reset: replace directory with submodule
+
+expecting success: 
+		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 remote branch 'add_sub1' from 'origin'.
+Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '8b1b179f980ca7eb4e58338ea90c9a29fd25c4bc'
+Branch 'remove_sub1' set up to track remote branch 'remove_sub1' from 'origin'.
+warning: unable to rmdir 'sub1': Directory not empty
+ok 55 - git read-tree -u --reset: removed submodule leaves submodule directory and its contents in place
+
+expecting success: 
+		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 remote branch 'add_sub1' from 'origin'.
+Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '8b1b179f980ca7eb4e58338ea90c9a29fd25c4bc'
+Branch 'remove_sub1' set up to track remote branch 'remove_sub1' from 'origin'.
+warning: unable to rmdir 'sub1': Directory not empty
+ok 56 - git read-tree -u --reset: removed submodule leaves submodule containing a .git directory alone
+
+checking known breakage: 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
+			test_must_fail $command replace_sub1_with_directory &&
+			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 remote branch 'add_sub1' from 'origin'.
+Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '8b1b179f980ca7eb4e58338ea90c9a29fd25c4bc'
+Branch 'replace_sub1_with_directory' set up to track remote branch 'replace_sub1_with_directory' from 'origin'.
+warning: unable to rmdir 'sub1': Directory not empty
+test_must_fail: command succeeded: git read-tree -u --reset replace_sub1_with_directory
+not ok 57 - git read-tree -u --reset: replace submodule with a directory must fail # TODO known breakage
+
+checking known breakage: 
+		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 &&
+			test_must_fail $command replace_sub1_with_directory &&
+			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 remote branch 'add_sub1' from 'origin'.
+Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '8b1b179f980ca7eb4e58338ea90c9a29fd25c4bc'
+Branch 'replace_sub1_with_directory' set up to track remote branch 'replace_sub1_with_directory' from 'origin'.
+warning: unable to rmdir 'sub1': Directory not empty
+test_must_fail: command succeeded: git read-tree -u --reset replace_sub1_with_directory
+not ok 58 - git read-tree -u --reset: replace submodule containing a .git directory with a directory must fail # TODO known breakage
+
+checking known breakage: 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
+			test_must_fail $command replace_sub1_with_file &&
+			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 remote branch 'add_sub1' from 'origin'.
+Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '8b1b179f980ca7eb4e58338ea90c9a29fd25c4bc'
+Branch 'replace_sub1_with_file' set up to track remote branch 'replace_sub1_with_file' from 'origin'.
+test_must_fail: command succeeded: git read-tree -u --reset replace_sub1_with_file
+not ok 59 - git read-tree -u --reset: replace submodule with a file must fail # TODO known breakage
+
+checking known breakage: 
+		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 &&
+			test_must_fail $command replace_sub1_with_file &&
+			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 remote branch 'add_sub1' from 'origin'.
+Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '8b1b179f980ca7eb4e58338ea90c9a29fd25c4bc'
+Branch 'replace_sub1_with_file' set up to track remote branch 'replace_sub1_with_file' from 'origin'.
+test_must_fail: command succeeded: git read-tree -u --reset replace_sub1_with_file
+not ok 60 - git read-tree -u --reset: replace submodule containing a .git directory with a file must fail # TODO known breakage
+
+expecting success: 
+		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 remote branch 'add_sub1' from 'origin'.
+Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '8b1b179f980ca7eb4e58338ea90c9a29fd25c4bc'
+Branch 'modify_sub1' set up to track remote branch 'modify_sub1' from 'origin'.
+Submodule path 'sub1': checked out 'd99bb091315c356d368cda705866c7f8615838a1'
+ok 61 - git read-tree -u --reset: modified submodule does not update submodule work tree
+
+expecting success: 
+		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 remote branch 'add_sub1' from 'origin'.
+Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '8b1b179f980ca7eb4e58338ea90c9a29fd25c4bc'
+Branch 'invalid_sub1' set up to track remote branch 'invalid_sub1' from 'origin'.
+error: Server does not allow request for unadvertised object 0123456789012345678901234567890123456789
+Fetched in submodule path 'sub1', but it did not contain 0123456789012345678901234567890123456789. Direct fetching of that commit failed.
+ok 62 - git read-tree -u --reset: modified submodule does not update submodule work tree to invalid commit
+
+expecting success: 
+		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 remote branch 'invalid_sub1' from 'origin'.
+fatal: Needed a single revision
+Branch 'valid_sub1' set up to track remote branch 'valid_sub1' from 'origin'.
+Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/git-2.20.1/t/trash directory.t1013-read-tree-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '8b1b179f980ca7eb4e58338ea90c9a29fd25c4bc'
+Submodule path 'uninitialized_sub': checked out '8b1b179f980ca7eb4e58338ea90c9a29fd25c4bc'
+ok 63 - git read-tree -u --reset: modified submodule does not update submodule work tree from invalid commit
+
+expecting success: 
+		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 remote branch 'no_submodule' from 'origin'.
+Branch 'add_sub1' set up to track remote branch 'add_sub1' from 'origin'.
+ok 64 - git read-tree -u --reset: added submodule does remove untracked unignored file with same name when forced
+
+# still have 11 known breakage(s)
+# passed all remaining 53 test(s)
+1..64
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
 *** t3507-cherry-pick-conflict.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3507-cherry-pick-conflict/.git/
 expecting success: 
@@ -79174,122 +79011,552 @@
 1..32
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t3511-cherry-pick-x.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3511-cherry-pick-x/.git/
+*** t3412-rebase-root.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3412-rebase-root/.git/
 expecting success: 
-	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
+	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
 
-[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
+[master (root-commit) c746ea0] 1
  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(+)
+ create mode 100644 A
+[master 46611ad] 2
  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
+[other (root-commit) 2c64091] 3
  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(+)
+ create mode 100644 B
+[other 1c4476a] 1b
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 1 - setup
-
-expecting success: 
-	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
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A
+[other 41e7797] 4
  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
+ok 1 - prepare repository
 
 expecting success: 
-	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
+	git checkout -B fail other &&
+	test_must_fail git rebase --onto master --root fail fail
 
-expecting success: 
-	pristine_detach initial &&
-	git cherry-pick -s mesg-broken-footer &&
-	cat <<-EOF >expect &&
-		$mesg_broken_footer
+Switched to a new branch 'fail'
+usage: git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] [<upstream>] [<branch>]
+   or: git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]
+   or: git rebase --continue | --abort | --skip | --edit-todo
 
-		Signed-off-by: $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>
-	EOF
-	git log -1 --pretty=format:%B >actual &&
-	test_cmp expect actual
+    --onto <revision>     rebase onto given branch instead of upstream
+    --no-verify           allow pre-rebase hook to run
+    -q, --quiet           be quiet. implies --no-stat
+    -v, --verbose         display a diffstat of what changed upstream
+    -n, --no-stat         do not show diffstat of what changed upstream
+    --signoff             add a Signed-off-by: line to each commit
+    --ignore-whitespace   passed to 'git am'
+    --committer-date-is-author-date
+                          passed to 'git am'
+    --ignore-date         passed to 'git am'
+    -C <n>                passed to 'git apply'
+    --whitespace <action>
+                          passed to 'git apply'
+    -f, --force-rebase    cherry-pick all commits, even if unchanged
+    --no-ff               cherry-pick all commits, even if unchanged
+    --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
+    -m, --merge           use merging strategies to rebase
+    -i, --interactive     let the user edit the list of commits to rebase
+    -p, --preserve-merges
+                          try to recreate merges instead of ignoring them
+    --rerere-autoupdate   allow rerere to update index with resolved conflict
+    -k, --keep-empty      preserve empty commits during rebase
+    --autosquash          move commits that begin with squash!/fixup! under -i
+    -S, --gpg-sign[=<key-id>]
+                          GPG-sign commits
+    --autostash           automatically stash/stash pop before and after
+    -x, --exec <exec>     add exec lines after each commit of the editable list
+    --allow-empty-message
+                          allow rebasing commits with empty messages
+    -r, --rebase-merges[=<mode>]
+                          try to rebase merges instead of skipping them
+    --fork-point          use 'merge-base --fork-point' to refine upstream
+    -s, --strategy <strategy>
+                          use the given merge strategy
+    -X, --strategy-option <option>
+                          pass the argument through to the merge strategy
+    --root                rebase all reachable commits up to the root(s)
+
+ok 2 - rebase --root fails with too many args
+
+expecting success: 
+	mkdir -p .git/hooks &&
+	cat >.git/hooks/pre-rebase <<EOF &&
+#!$SHELL_PATH
+echo "\$1,\$2" >.git/PRE-REBASE-INPUT
+EOF
+	chmod +x .git/hooks/pre-rebase
+
+ok 3 - setup pre-rebase hook
+
+expecting success: 
+	git checkout -b work other &&
+	git rebase --root --onto master &&
+	git log --pretty=tformat:"%s" > rebased &&
+	test_cmp expect rebased
+
+Switched to a new branch 'work'
+First, rewinding head to replay your work on top of it...
+Applying: 3
+Applying: 4
+ok 4 - rebase --root --onto <newbase>
+
+expecting success: 
+	test "z$(cat .git/PRE-REBASE-INPUT)" = z--root,
+
+ok 5 - pre-rebase got correct input (1)
+
+expecting success: 
+	git branch work2 other &&
+	git rebase --root --onto master work2 &&
+	git log --pretty=tformat:"%s" > rebased2 &&
+	test_cmp expect rebased2
+
+First, rewinding head to replay your work on top of it...
+Applying: 3
+Applying: 4
+ok 6 - rebase --root --onto <newbase> <branch>
+
+expecting success: 
+	test "z$(cat .git/PRE-REBASE-INPUT)" = z--root,work2
+
+ok 7 - pre-rebase got correct input (2)
+
+expecting success: 
+	git checkout -b work3 other &&
+	git rebase -i --root --onto master &&
+	git log --pretty=tformat:"%s" > rebased3 &&
+	test_cmp expect rebased3
+
+Switched to a new branch 'work3'
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/work3.
+ok 8 - rebase -i --root --onto <newbase>
+
+expecting success: 
+	test "z$(cat .git/PRE-REBASE-INPUT)" = z--root,
+
+ok 9 - pre-rebase got correct input (3)
+
+expecting success: 
+	git branch work4 other &&
+	git rebase -i --root --onto master work4 &&
+	git log --pretty=tformat:"%s" > rebased4 &&
+	test_cmp expect rebased4
+
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/work4.
+ok 10 - rebase -i --root --onto <newbase> <branch>
+
+expecting success: 
+	test "z$(cat .git/PRE-REBASE-INPUT)" = z--root,work4
+
+ok 11 - pre-rebase got correct input (4)
+
+checking prerequisite: REBASE_P
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
+	test -z "$GIT_TEST_SKIP_REBASE_P"
+
+)
+prerequisite REBASE_P ok
+expecting success: 
+	git checkout -b work5 other &&
+	git rebase -i -p --root --onto master &&
+	git log --pretty=tformat:"%s" > rebased5 &&
+	test_cmp expect rebased5
+
+Switched to a new branch 'work5'
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/work5.
+ok 12 - rebase -i -p with linear history
+
+expecting success: 
+	test "z$(cat .git/PRE-REBASE-INPUT)" = z--root,
+
+ok 13 - pre-rebase got correct input (5)
+
+expecting success: 
+	git checkout other^ &&
+	git checkout -b side &&
+	test_commit 5 C &&
+	git checkout other &&
+	git merge side
+
+Note: checking out '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 performing another checkout.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -b with the checkout command again. Example:
+
+  git checkout -b <new-branch-name>
+
+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'
+Merging:
+41e7797 4
+virtual side
+found 1 common ancestor:
+1c4476a 1b
+Merge made by the 'recursive' strategy.
+ C | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 C
+ok 14 - set up merge history
+
+expecting success: 
+	git checkout -b work6 other &&
+	git rebase -i -p --root --onto master &&
+	log_with_names work6 > rebased6 &&
+	test_cmp expect-side rebased6
+
+Switched to a new branch 'work6'
+Rebasing (1/4)
Rebasing (2/4)
Rebasing (3/4)
Rebasing (4/4)
Successfully rebased and updated refs/heads/work6.
+ok 15 - rebase -i -p with merge
+
+expecting success: 
+	git symbolic-ref HEAD refs/heads/third &&
+	rm .git/index &&
+	rm A B C &&
+	test_commit 6 D &&
+	git checkout other &&
+	git merge --allow-unrelated-histories third
+
+[third (root-commit) 00ac2af] 6
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 D
+Switched to branch 'other'
+Merging:
+ddb0186 Merge branch 'side' into other
+virtual third
+found 0 common ancestors:
+Merge made by the 'recursive' strategy.
+ D | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 D
+ok 16 - set up second root and merge
+
+expecting success: 
+	git checkout -b work7 other &&
+	git rebase -i -p --root --onto master &&
+	log_with_names work7 > rebased7 &&
+	test_cmp expect-third rebased7
+
+Switched to a new branch 'work7'
+Rebasing (1/6)
Rebasing (2/6)
Rebasing (3/6)
Rebasing (4/6)
Rebasing (5/6)
Rebasing (6/6)
Successfully rebased and updated refs/heads/work7.
+ok 17 - rebase -i -p with two roots
+
+expecting success: 
+	mkdir -p .git/hooks &&
+	cat >.git/hooks/pre-rebase <<EOF &&
+#!$SHELL_PATH
+false
+EOF
+	chmod +x .git/hooks/pre-rebase
+
+ok 18 - setup pre-rebase hook that fails
+
+expecting success: 
+	git checkout -b stops1 other &&
+	test_must_fail git rebase --root --onto master &&
+	test "z$(git symbolic-ref HEAD)" = zrefs/heads/stops1 &&
+	test 0 = $(git rev-list other...stops1 | wc -l)
+
+Switched to a new branch 'stops1'
+fatal: The pre-rebase hook refused to rebase.
+ok 19 - pre-rebase hook stops rebase
+
+expecting success: 
+	git checkout -b stops2 other &&
+	test_must_fail git rebase --root --onto master &&
+	test "z$(git symbolic-ref HEAD)" = zrefs/heads/stops2 &&
+	test 0 = $(git rev-list other...stops2 | wc -l)
+
+Switched to a new branch 'stops2'
+fatal: The pre-rebase hook refused to rebase.
+ok 20 - pre-rebase hook stops rebase -i
+
+expecting success: 
+	rm -f .git/hooks/pre-rebase
+
+ok 21 - remove pre-rebase hook
+
+expecting success: 
+	git checkout master &&
+	echo conflict > B &&
+	git add B &&
+	git commit -m conflict
+
+Switched to branch 'master'
+[master f80eebe] conflict
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 B
+ok 22 - set up a conflict
+
+expecting success: 
+	git checkout -b conflict1 other &&
+	test_must_fail git rebase --root --onto master &&
+	git ls-files -u | grep "B$"
+
+Switched to a new branch 'conflict1'
+First, rewinding head to replay your work on top of it...
+Applying: 3
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+Merging:
+f80eebe conflict
+virtual 3
+found 1 common ancestor:
+virtual 4b825dc642cb6eb9a060e54bf8d69288fbee4904
+Auto-merging B
+CONFLICT (add/add): Merge conflict in B
+error: Failed to merge in the changes.
+hint: Use 'git am --show-current-patch' to see the failed patch
+Patch failed at 0001 3
+
+Resolve all conflicts manually, mark them as resolved with
+"git add/rm <conflicted_files>", then run "git rebase --continue".
+You can instead skip this commit: run "git rebase --skip".
+To abort and get back to the state before "git rebase", run "git rebase --abort".
+
+100644 9b1719f5cf069568785080a0bbabbe7c377e22ae 2	B
+100644 00750edc07d6415dcc07ae0351e9397b0222b7ba 3	B
+ok 23 - rebase --root with conflict (first part)
+
+expecting success: 
+	echo 3 > B &&
+	git add B
+
+ok 24 - fix the conflict
+
+expecting success: 
+	git rebase --continue &&
+	git log --pretty=tformat:"%s" > conflict1 &&
+	test_cmp expect-conflict conflict1
+
+Applying: 3
+Applying: 4
+Applying: 5
+Applying: 6
+ok 25 - rebase --root with conflict (second part)
+
+expecting success: 
+	git checkout -b conflict2 other &&
+	test_must_fail git rebase -i --root --onto master &&
+	git ls-files -u | grep "B$"
+
+Switched to a new branch 'conflict2'
+Rebasing (1/4)
Auto-merging B
+CONFLICT (add/add): Merge conflict in B
+error: could not apply 2c64091... 3
+Resolve all conflicts manually, mark them as resolved with
+"git add/rm <conflicted_files>", then run "git rebase --continue".
+You can instead skip this commit: run "git rebase --skip".
+To abort and get back to the state before "git rebase", run "git rebase --abort".
+Could not apply 2c64091... 3
+100644 9b1719f5cf069568785080a0bbabbe7c377e22ae 2	B
+100644 00750edc07d6415dcc07ae0351e9397b0222b7ba 3	B
+ok 26 - rebase -i --root with conflict (first part)
+
+expecting success: 
+	echo 3 > B &&
+	git add B
+
+ok 27 - fix the conflict
+
+expecting success: 
+	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 28 - rebase -i --root with conflict (second part)
+
+expecting success: 
+	git checkout -b conflict3 other &&
+	test_must_fail git rebase -i -p --root --onto master &&
+	git ls-files -u | grep "B$"
+
+Switched to a new branch 'conflict3'
+Rebasing (1/6)
Auto-merging B
+CONFLICT (add/add): Merge conflict in B
+error: could not apply 2c64091... 3
+
+Resolve all conflicts manually, mark them as resolved with
+"git add/rm <conflicted_files>", then run "git rebase --continue".
+You can instead skip this commit: run "git rebase --skip".
+To abort and get back to the state before "git rebase", run "git rebase --abort".
+Could not pick 2c64091600777cfca4ad9dca6ec274f5a2554d69
+100644 9b1719f5cf069568785080a0bbabbe7c377e22ae 2	B
+100644 00750edc07d6415dcc07ae0351e9397b0222b7ba 3	B
+ok 29 - rebase -i -p --root with conflict (first part)
+
+expecting success: 
+	echo 3 > B &&
+	git add B
+
+ok 30 - fix the conflict
+
+expecting success: 
+	git rebase --continue &&
+	log_with_names conflict3 >out &&
+	test_cmp expect-conflict-p out
+
+[detached HEAD 308ae33] 3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Rebasing (2/6)
Rebasing (3/6)
Rebasing (4/6)
Rebasing (5/6)
Rebasing (6/6)
Successfully rebased and updated refs/heads/conflict3.
+ok 31 - rebase -i -p --root with conflict (second part)
+
+# passed all 31 test(s)
+1..31
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t3511-cherry-pick-x.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3511-cherry-pick-x/.git/
+expecting success: 
+	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: 
+	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: 
+	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: 
+	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:
@@ -80917,6 +81184,672 @@
 1..41
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
+*** t3700-add.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3700-add/.git/
+expecting success: touch foo && git add foo
+ok 1 - Test of git add
+
+expecting success: git ls-files foo | grep foo
+foo
+ok 2 - Post-check that foo is in the index
+
+expecting success: touch -- -q && git add -- -q
+ok 3 - Test that "git add -- -q" works
+
+expecting success: git config core.filemode 0 &&
+	 echo foo >xfoo1 &&
+	 chmod 755 xfoo1 &&
+	 git add xfoo1 &&
+	 test_mode_in_index 100644 xfoo1
+pass
+ok 4 - git add: Test that executable bit is not used if core.filemode=0
+
+expecting success: 
+	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" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
+	# test whether the filesystem supports symbolic links
+	ln -s x y && test -h y
+
+)
+prerequisite SYMLINKS ok
+pass
+ok 5 - git add: filemode=0 should not get confused by symlink
+
+expecting success: git config core.filemode 0 &&
+	 echo foo >xfoo2 &&
+	 chmod 755 xfoo2 &&
+	 git update-index --add xfoo2 &&
+	 test_mode_in_index 100644 xfoo2
+pass
+ok 6 - git update-index --add: Test that executable bit is not used...
+
+expecting success: 
+	rm -f xfoo2 &&
+	test_ln_s_add foo xfoo2 &&
+	test_mode_in_index 120000 xfoo2
+
+pass
+ok 7 - git add: filemode=0 should not get confused by symlink
+
+expecting success: git config core.filemode 0 &&
+	 test_ln_s_add xfoo2 xfoo3 &&	# runs git update-index --add
+	 test_mode_in_index 120000 xfoo3
+pass
+ok 8 - git update-index --add: Test that executable bit is not used...
+
+expecting success: 
+	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 9 - .gitignore test setup
+
+expecting success: 
+	git add . &&
+	! (git ls-files | grep "\\.ig")
+
+ok 10 - .gitignore is honored
+
+expecting success: 
+	test_must_fail git add a.?? &&
+	! (git ls-files | grep "\\.ig")
+
+The following paths are ignored by one of your .gitignore files:
+a.ig
+Use -f if you really want to add them.
+ok 11 - error out when attempting to add ignored ones without -f
+
+expecting success: 
+	test_must_fail git add d.?? &&
+	! (git ls-files | grep "\\.ig")
+
+The following paths are ignored by one of your .gitignore files:
+d.ig
+Use -f if you really want to add them.
+ok 12 - error out when attempting to add ignored ones without -f
+
+expecting success: 
+	touch a.if &&
+	test_must_fail git add a.?? &&
+	! (git ls-files | grep "\\.ig") &&
+	(git ls-files | grep a.if)
+
+The following paths are ignored by one of your .gitignore files:
+a.ig
+Use -f if you really want to add them.
+a.if
+ok 13 - error out when attempting to add ignored ones but add others
+
+expecting success: 
+	git add -f a.?? &&
+	git ls-files --error-unmatch a.ig
+
+a.ig
+ok 14 - add ignored ones with -f
+
+expecting success: 
+	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 15 - add ignored ones with -f
+
+expecting success: 
+	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 16 - add ignored ones with -f
+
+expecting success: 
+
+	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 17 - .gitignore with subdirectory
+
+expecting success: 
+	rm -f .git/index &&
+	git add 1/2/a 1/3/b 1/2/c
+
+ok 18 - check correct prefix detection
+
+expecting success: 
+	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"
+	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 19 - git add with filemode=0, symlinks=0, and unmerged entries
+
+expecting success: 
+	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 20 - git add with filemode=0, symlinks=0 prefers stage 2 over stage 1
+
+expecting success: 
+	>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; (exit 1);;
+	esac &&
+	git add --refresh -- foo &&
+	test -z "$(git diff-index HEAD -- foo)"
+
+[master (root-commit) 9b44cda] 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 21 - git add --refresh
+
+expecting success: 
+	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 9b44cda commit all
+rm 'foo'
+baz
+ok 22 - git add --refresh with pathspec
+
+checking prerequisite: SANITY
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
+	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: 
+	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 9b44cda 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 'b.if'
+add 'c.if/c.if'
+add 'foo1'
+ok 23 - git add should fail atomically upon an unreadable file
+
+expecting success: 
+	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 9b44cda commit all
+error: open("foo2"): Permission denied
+error: unable to index file foo2
+add '1/2/a'
+add '1/2/c'
+add '1/3/b'
+add 'file'
+add 'foo'
+add 'symlink'
+add '-q'
+add '.gitignore'
+add 'a.if'
+add 'actual'
+add 'b.if'
+add 'c.if/c.if'
+add 'foo1'
+add 'stage1'
+add 'stage2'
+add 'stage3'
+add 'sub/.gitignore'
+add 'sub/dir/a.ig'
+add 'xfoo1'
+add 'xfoo2'
+add 'xfoo3'
+foo1
+ok 24 - git add --ignore-errors
+
+expecting success: 
+	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 9b44cda 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 25 - git add (add.ignore-errors)
+
+expecting success: 
+	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 9b44cda commit all
+error: open("foo2"): Permission denied
+error: unable to index file foo2
+fatal: adding files failed
+add 'foo1'
+ok 26 - git add (add.ignore-errors = false)
+
+expecting success: 
+       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 9b44cda commit all
+error: open("foo2"): Permission denied
+error: unable to index file foo2
+fatal: adding files failed
+add 'foo1'
+ok 27 - --no-ignore-errors overrides config
+
+expecting success: 
+	git reset --hard &&
+	touch fo\[ou\]bar foobar &&
+	git add 'fo\[ou\]bar' &&
+	git ls-files fo\[ou\]bar | fgrep fo\[ou\]bar &&
+	! ( git ls-files foobar | grep foobar )
+
+HEAD is now at 9b44cda commit all
+fo[ou]bar
+ok 28 - git add 'fo\[ou\]bar' ignores foobar
+
+expecting success: 
+	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 9b44cda commit all
+ok 29 - git add to resolve conflicts on otherwise ignored path
+
+expecting success: 
+	test_must_fail git add non-existent &&
+	! (git ls-files | grep "non-existent")
+
+fatal: pathspec 'non-existent' did not match any files
+ok 30 - "add non-existent" should fail
+
+expecting success: 
+	rm -fr empty &&
+	git init empty &&
+	(
+		cd empty &&
+		git add -A . &&
+		git add -A
+	)
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3700-add/empty/.git/
+ok 31 - git add -A on empty repo does not error out
+
+expecting success: 
+	rm -fr empty &&
+	git init empty &&
+	(
+		cd empty &&
+		git add .
+	)
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3700-add/empty/.git/
+ok 32 - "git add ." in empty repo
+
+expecting success: 
+	echo new >>track-this &&
+	git add --dry-run track-this >actual 2>&1 &&
+	echo "add 'track-this'" | test_cmp - actual
+
+ok 33 - git add --dry-run of existing changed file
+
+expecting success: 
+	echo ignored-file >>.gitignore &&
+	test_must_fail git add --dry-run track-this ignored-file >actual 2>&1
+
+ok 34 - git add --dry-run of non-existing file
+
+expecting success: 
+	echo "fatal: pathspec 'ignored-file' did not match any files" >expect &&
+	test_i18ncmp expect actual
+
+ok 35 - git add --dry-run of an existing file output
+
+expecting success: 
+	test_must_fail git add --dry-run --ignore-missing track-this ignored-file >actual.out 2>actual.err
+
+ok 36 - git add --dry-run --ignore-missing of non-existing file
+
+expecting success: 
+	test_i18ncmp expect.out actual.out &&
+	test_i18ncmp expect.err actual.err
+
+ok 37 - git add --dry-run --ignore-missing of non-existing file output
+
+expecting success: 
+	test_must_fail git add ""
+
+fatal: empty string is not a valid pathspec. please use . instead if you meant to match all paths
+ok 38 - git add empty string should fail
+
+expecting success: 
+	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 39 - git add --chmod=[+-]x stages correctly
+
+expecting success: 
+	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 40 - git add --chmod=+x with symlinks
+
+expecting success: 
+	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 9b44cda commit all
+pass
+pass
+ok 41 - git add --chmod=[+-]x changes index with already added file
+
+expecting success: 
+	echo foo >foo4 &&
+	git add foo4 &&
+	git add --chmod=+x foo4 &&
+	! test -x foo4
+
+ok 42 - git add --chmod=[+-]x does not change the working tree
+
+expecting success: 
+	>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.
+Maybe you wanted to say 'git add .'?
+pass
+pass
+ok 43 - no file status change if no pathspec is given
+
+expecting success: 
+	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.
+Maybe you wanted to say 'git add .'?
+pass
+pass
+ok 44 - no file status change if no pathspec is given in subdir
+
+expecting success: 
+	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
+
+cannot chmod +x 'symlink'
+cannot chmod -x 'symlink'
+ok 45 - all statuses changed in folder if . is given
+
+# passed all 45 test(s)
+1..45
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t3702-add-edit.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3702-add-edit/.git/
+expecting success: 
+
+	git add file &&
+	test_tick &&
+	git commit -m initial file
+
+
+[master (root-commit) e055285] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 11 insertions(+)
+ create mode 100644 file
+ok 1 - setup
+
+expecting success: 
+
+	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: 
+	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/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t3703-add-magic-pathspec.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3703-add-magic-pathspec/.git/
+expecting success: 
+	mkdir sub anothersub &&
+	: >sub/foo &&
+	: >anothersub/foo
+
+ok 1 - setup
+
+expecting success: 
+	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: 
+	(cd sub && git add -n :/anothersub >actual) &&
+	test_cmp expected sub/actual
+
+ok 3 - add :/anothersub
+
+expecting success: 
+	(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: 
+	: >":(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: 
+	: >":/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/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
 *** t3418-rebase-continue.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3418-rebase-continue/.git/
 expecting success: 
@@ -82126,6 +83059,1100 @@
 1..22
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
+*** t3800-mktag.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3800-mktag/.git/
+expecting success: 
+	echo Hello >A &&
+	git update-index --add A &&
+	git commit -m "Initial commit" &&
+	head=$(git rev-parse --verify HEAD)
+
+[master (root-commit) 4066b4f] Initial commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A
+ok 1 - setup
+
+expecting success: 
+		( test_must_fail git mktag <tag.sig 2>message ) &&
+		grep "$expect" message
+	
+error: wanna fool me ? you obviously got the size wrong !
+ok 2 - Tag object length check
+
+expecting success: 
+		( test_must_fail git mktag <tag.sig 2>message ) &&
+		grep "$expect" message
+	
+error: char0: does not start with "object "
+ok 3 - "object" line label check
+
+expecting success: 
+		( test_must_fail git mktag <tag.sig 2>message ) &&
+		grep "$expect" message
+	
+error: char7: could not get SHA1 hash
+ok 4 - "object" line SHA1 check
+
+expecting success: 
+		( test_must_fail git mktag <tag.sig 2>message ) &&
+		grep "$expect" message
+	
+error: char47: could not find "\ntype "
+ok 5 - "type" line label check
+
+expecting success: 
+		( test_must_fail git mktag <tag.sig 2>message ) &&
+		grep "$expect" message
+	
+error: char48: could not find next "\n"
+ok 6 - "type" line eol check
+
+expecting success: 
+		( test_must_fail git mktag <tag.sig 2>message ) &&
+		grep "$expect" message
+	
+error: char57: no "tag " found
+ok 7 - "tag" line label check #1
+
+expecting success: 
+		( test_must_fail git mktag <tag.sig 2>message ) &&
+		grep "$expect" message
+	
+error: char87: no "tag " found
+ok 8 - "tag" line label check #2
+
+expecting success: 
+		( test_must_fail git mktag <tag.sig 2>message ) &&
+		grep "$expect" message
+	
+error: char53: type too long
+ok 9 - "type" line type-name length check
+
+expecting success: 
+		( test_must_fail git mktag <tag.sig 2>message ) &&
+		grep "$expect" message
+	
+error: char7: could not verify object 779e9b33986b1c2670fff52c5067603117b3e895
+ok 10 - verify object (SHA1/type) check
+
+expecting success: 
+		( test_must_fail git mktag <tag.sig 2>message ) &&
+		grep "$expect" message
+	
+error: char67: could not verify tag name
+ok 11 - verify tag-name check
+
+expecting success: 
+		( test_must_fail git mktag <tag.sig 2>message ) &&
+		grep "$expect" message
+	
+error: char70: could not find "tagger "
+ok 12 - "tagger" line label check #1
+
+expecting success: 
+		( test_must_fail git mktag <tag.sig 2>message ) &&
+		grep "$expect" message
+	
+error: char70: could not find "tagger "
+ok 13 - "tagger" line label check #2
+
+expecting success: 
+		( test_must_fail git mktag <tag.sig 2>message ) &&
+		grep "$expect" message
+	
+error: char77: missing tagger name
+ok 14 - disallow missing tag author name
+
+expecting success: 
+		( test_must_fail git mktag <tag.sig 2>message ) &&
+		grep "$expect" message
+	
+error: char77: malformed tagger field
+ok 15 - disallow malformed tagger
+
+expecting success: git mktag <tag.sig >.git/refs/tags/mytag 2>message
+ok 16 - allow empty tag email
+
+expecting success: 
+		( test_must_fail git mktag <tag.sig 2>message ) &&
+		grep "$expect" message
+	
+error: char77: malformed tagger field
+ok 17 - disallow spaces in tag email
+
+expecting success: 
+		( test_must_fail git mktag <tag.sig 2>message ) &&
+		grep "$expect" message
+	
+error: char107: missing tag timestamp
+ok 18 - disallow missing tag timestamp
+
+expecting success: 
+		( test_must_fail git mktag <tag.sig 2>message ) &&
+		grep "$expect" message
+	
+error: char107: missing tag timestamp
+ok 19 - detect invalid tag timestamp1
+
+expecting success: 
+		( test_must_fail git mktag <tag.sig 2>message ) &&
+		grep "$expect" message
+	
+error: char111: malformed tag timestamp
+ok 20 - detect invalid tag timestamp2
+
+expecting success: 
+		( test_must_fail git mktag <tag.sig 2>message ) &&
+		grep "$expect" message
+	
+error: char118: malformed tag timezone
+ok 21 - detect invalid tag timezone1
+
+expecting success: 
+		( test_must_fail git mktag <tag.sig 2>message ) &&
+		grep "$expect" message
+	
+error: char118: malformed tag timezone
+ok 22 - detect invalid tag timezone2
+
+expecting success: 
+		( test_must_fail git mktag <tag.sig 2>message ) &&
+		grep "$expect" message
+	
+error: char118: malformed tag timezone
+ok 23 - detect invalid tag timezone3
+
+expecting success: 
+		( test_must_fail git mktag <tag.sig 2>message ) &&
+		grep "$expect" message
+	
+error: char124: trailing garbage in tag header
+ok 24 - detect invalid header entry
+
+expecting success: git mktag <tag.sig >.git/refs/tags/mytag 2>message
+ok 25 - create valid tag
+
+expecting success: git tag -l | grep mytag
+mytag
+ok 26 - check mytag
+
+# passed all 26 test(s)
+1..26
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t3427-rebase-subtree.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3427-rebase-subtree/.git/
+expecting success: 
+	test_commit README &&
+	mkdir files &&
+	(
+		cd files &&
+		git init &&
+		test_commit master1 &&
+		test_commit master2 &&
+		test_commit master3
+	) &&
+	git fetch files master &&
+	git branch files-master FETCH_HEAD &&
+	git read-tree --prefix=files_subtree files-master &&
+	git checkout -- files_subtree &&
+	tree=$(git write-tree) &&
+	head=$(git rev-parse HEAD) &&
+	rev=$(git rev-parse --verify files-master^0) &&
+	commit=$(git commit-tree -p $head -p $rev -m "Add subproject master" $tree) &&
+	git update-ref HEAD $commit &&
+	(
+		cd files_subtree &&
+		test_commit master4
+	) &&
+	test_commit files_subtree/master5
+
+[master (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/git-2.20.1/t/trash directory.t3427-rebase-subtree/files/.git/
+[master (root-commit) ba4017d] master1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 master1.t
+[master eb398b9] master2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 master2.t
+[master 138d8fa] master3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 master3.t
+warning: no common commits
+From files
+ * branch            master     -> FETCH_HEAD
+[master 8aaa705] master4
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 files_subtree/master4.t
+[master 8bb50ad] files_subtree/master5
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 files_subtree/master5.t
+ok 1 - setup
+
+checking known breakage: 
+	reset_rebase &&
+	git checkout -b rebase-preserve-merges-4 master &&
+	git filter-branch --prune-empty -f --subdirectory-filter files_subtree &&
+	git commit -m "Empty commit" --allow-empty &&
+	git rebase -Xsubtree=files_subtree --preserve-merges --onto files-master master &&
+	verbose test "$(commit_message HEAD~)" = "files_subtree/master4"
+
+fatal: No rebase in progress?
+HEAD is now at 8bb50ad files_subtree/master5
+Switched to a new branch 'rebase-preserve-merges-4'
+
Rewrite 857c354c14dec65ebdcbe167a352a0809dfe91f4 (1/3) (0 seconds passed, remaining 0 predicted)    
Rewrite 8aaa705aa976a6676d7a4f353323a6c49c23b5a2 (2/3) (1 seconds passed, remaining 0 predicted)    
Rewrite 8bb50adc9630aa0deade7689343795f582e5d715 (2/3) (1 seconds passed, remaining 0 predicted)    
+Ref 'refs/heads/rebase-preserve-merges-4' was rewritten
+[rebase-preserve-merges-4 6ceeae2] Empty commit
+ Author: A U Thor <author@example.com>
+Rebasing (1/1)
Successfully rebased and updated refs/heads/rebase-preserve-merges-4.
+command failed:  'test' 'master2' '=' 'files_subtree/master4'
+not ok 2 - Rebase -Xsubtree --preserve-merges --onto commit 4 # TODO known breakage
+
+checking known breakage: 
+	reset_rebase &&
+	git checkout -b rebase-preserve-merges-5 master &&
+	git filter-branch --prune-empty -f --subdirectory-filter files_subtree &&
+	git commit -m "Empty commit" --allow-empty &&
+	git rebase -Xsubtree=files_subtree --preserve-merges --onto files-master master &&
+	verbose test "$(commit_message HEAD)" = "files_subtree/master5"
+
+fatal: No rebase in progress?
+HEAD is now at 138d8fa master3
+Switched to a new branch 'rebase-preserve-merges-5'
+
Rewrite 857c354c14dec65ebdcbe167a352a0809dfe91f4 (1/3) (0 seconds passed, remaining 0 predicted)    
Rewrite 8aaa705aa976a6676d7a4f353323a6c49c23b5a2 (2/3) (0 seconds passed, remaining 0 predicted)    
Rewrite 8bb50adc9630aa0deade7689343795f582e5d715 (3/3) (0 seconds passed, remaining 0 predicted)    
+Ref 'refs/heads/rebase-preserve-merges-5' was rewritten
+[rebase-preserve-merges-5 6ceeae2] Empty commit
+ Author: A U Thor <author@example.com>
+Rebasing (1/1)
Successfully rebased and updated refs/heads/rebase-preserve-merges-5.
+command failed:  'test' 'master3' '=' 'files_subtree/master5'
+not ok 3 - Rebase -Xsubtree --preserve-merges --onto commit 5 # TODO known breakage
+
+checking known breakage: 
+	reset_rebase &&
+	git checkout -b rebase-keep-empty-4 master &&
+	git filter-branch --prune-empty -f --subdirectory-filter files_subtree &&
+	git commit -m "Empty commit" --allow-empty &&
+	git rebase -Xsubtree=files_subtree --keep-empty --preserve-merges --onto files-master master &&
+	verbose test "$(commit_message HEAD~2)" = "files_subtree/master4"
+
+fatal: No rebase in progress?
+HEAD is now at 138d8fa master3
+Switched to a new branch 'rebase-keep-empty-4'
+
Rewrite 857c354c14dec65ebdcbe167a352a0809dfe91f4 (1/3) (0 seconds passed, remaining 0 predicted)    
Rewrite 8aaa705aa976a6676d7a4f353323a6c49c23b5a2 (2/3) (0 seconds passed, remaining 0 predicted)    
Rewrite 8bb50adc9630aa0deade7689343795f582e5d715 (3/3) (0 seconds passed, remaining 0 predicted)    
+Ref 'refs/heads/rebase-keep-empty-4' was rewritten
+[rebase-keep-empty-4 6ceeae2] Empty commit
+ Author: A U Thor <author@example.com>
+Rebasing (1/1)
Successfully rebased and updated refs/heads/rebase-keep-empty-4.
+command failed:  'test' 'master1' '=' 'files_subtree/master4'
+not ok 4 - Rebase -Xsubtree --keep-empty --preserve-merges --onto commit 4 # TODO known breakage
+
+checking known breakage: 
+	reset_rebase &&
+	git checkout -b rebase-keep-empty-5 master &&
+	git filter-branch --prune-empty -f --subdirectory-filter files_subtree &&
+	git commit -m "Empty commit" --allow-empty &&
+	git rebase -Xsubtree=files_subtree --keep-empty --preserve-merges --onto files-master master &&
+	verbose test "$(commit_message HEAD~)" = "files_subtree/master5"
+
+fatal: No rebase in progress?
+HEAD is now at 138d8fa master3
+Switched to a new branch 'rebase-keep-empty-5'
+
Rewrite 857c354c14dec65ebdcbe167a352a0809dfe91f4 (1/3) (0 seconds passed, remaining 0 predicted)    
Rewrite 8aaa705aa976a6676d7a4f353323a6c49c23b5a2 (2/3) (0 seconds passed, remaining 0 predicted)    
Rewrite 8bb50adc9630aa0deade7689343795f582e5d715 (3/3) (0 seconds passed, remaining 0 predicted)    
+Ref 'refs/heads/rebase-keep-empty-5' was rewritten
+[rebase-keep-empty-5 6ceeae2] Empty commit
+ Author: A U Thor <author@example.com>
+Rebasing (1/1)
Successfully rebased and updated refs/heads/rebase-keep-empty-5.
+command failed:  'test' 'master2' '=' 'files_subtree/master5'
+not ok 5 - Rebase -Xsubtree --keep-empty --preserve-merges --onto commit 5 # TODO known breakage
+
+checking known breakage: 
+	reset_rebase &&
+	git checkout -b rebase-keep-empty-empty master &&
+	git filter-branch --prune-empty -f --subdirectory-filter files_subtree &&
+	git commit -m "Empty commit" --allow-empty &&
+	git rebase -Xsubtree=files_subtree --keep-empty --preserve-merges --onto files-master master &&
+	verbose test "$(commit_message HEAD)" = "Empty commit"
+
+fatal: No rebase in progress?
+HEAD is now at 138d8fa master3
+Switched to a new branch 'rebase-keep-empty-empty'
+
Rewrite 857c354c14dec65ebdcbe167a352a0809dfe91f4 (1/3) (1 seconds passed, remaining 2 predicted)    
Rewrite 8aaa705aa976a6676d7a4f353323a6c49c23b5a2 (1/3) (1 seconds passed, remaining 2 predicted)    
Rewrite 8bb50adc9630aa0deade7689343795f582e5d715 (3/3) (1 seconds passed, remaining 0 predicted)    
+Ref 'refs/heads/rebase-keep-empty-empty' was rewritten
+[rebase-keep-empty-empty 6ceeae2] Empty commit
+ Author: A U Thor <author@example.com>
+Rebasing (1/1)
Successfully rebased and updated refs/heads/rebase-keep-empty-empty.
+command failed:  'test' 'master3' '=' 'Empty commit'
+not ok 6 - Rebase -Xsubtree --keep-empty --preserve-merges --onto empty commit # TODO known breakage
+
+checking known breakage: 
+	reset_rebase &&
+	git checkout -b rebase-onto-4 master &&
+	git filter-branch --prune-empty -f --subdirectory-filter files_subtree &&
+	git commit -m "Empty commit" --allow-empty &&
+	git rebase -Xsubtree=files_subtree --onto files-master master &&
+	verbose test "$(commit_message HEAD~2)" = "files_subtree/master4"
+
+fatal: No rebase in progress?
+HEAD is now at 138d8fa master3
+Switched to a new branch 'rebase-onto-4'
+
Rewrite 857c354c14dec65ebdcbe167a352a0809dfe91f4 (1/3) (0 seconds passed, remaining 0 predicted)    
Rewrite 8aaa705aa976a6676d7a4f353323a6c49c23b5a2 (2/3) (0 seconds passed, remaining 0 predicted)    
Rewrite 8bb50adc9630aa0deade7689343795f582e5d715 (3/3) (1 seconds passed, remaining 0 predicted)    
+Ref 'refs/heads/rebase-onto-4' was rewritten
+[rebase-onto-4 6ceeae2] Empty commit
+ Author: A U Thor <author@example.com>
+First, rewinding head to replay your work on top of it...
+Merging files-master with HEAD~3
+Merging:
+138d8fa master3
+c2298a8 Add subproject master
+found 0 common ancestors:
+Already applied: 0001 Add subproject master
+Merging files-master with HEAD~2
+Merging:
+138d8fa master3
+ffbb8e9 master4
+found 1 common ancestor:
+c2298a8 Add subproject master
+[detached HEAD 5f90a88] master4
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:14:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 master4.t
+Committed: 0002 master4
+Merging files-master with HEAD~1
+Merging:
+5f90a88 master4
+1059aa6 files_subtree/master5
+found 1 common ancestor:
+ffbb8e9 master4
+[detached HEAD c64768c] files_subtree/master5
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:14:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 master5.t
+Committed: 0003 files_subtree/master5
+Merging files-master with HEAD~0
+Merging:
+c64768c files_subtree/master5
+6ceeae2 Empty commit
+found 1 common ancestor:
+1059aa6 files_subtree/master5
+Already up to date!
+Already applied: 0004 Empty commit
+All done.
+command failed:  'test' 'master3' '=' 'files_subtree/master4'
+not ok 7 - Rebase -Xsubtree --onto commit 4 # TODO known breakage
+
+checking known breakage: 
+	reset_rebase &&
+	git checkout -b rebase-onto-5 master &&
+	git filter-branch --prune-empty -f --subdirectory-filter files_subtree &&
+	git commit -m "Empty commit" --allow-empty &&
+	git rebase -Xsubtree=files_subtree --onto files-master master &&
+	verbose test "$(commit_message HEAD~)" = "files_subtree/master5"
+
+fatal: No rebase in progress?
+HEAD is now at c64768c files_subtree/master5
+Switched to a new branch 'rebase-onto-5'
+
Rewrite 857c354c14dec65ebdcbe167a352a0809dfe91f4 (1/3) (0 seconds passed, remaining 0 predicted)    
Rewrite 8aaa705aa976a6676d7a4f353323a6c49c23b5a2 (2/3) (0 seconds passed, remaining 0 predicted)    
Rewrite 8bb50adc9630aa0deade7689343795f582e5d715 (3/3) (0 seconds passed, remaining 0 predicted)    
+Ref 'refs/heads/rebase-onto-5' was rewritten
+[rebase-onto-5 6ceeae2] Empty commit
+ Author: A U Thor <author@example.com>
+First, rewinding head to replay your work on top of it...
+Merging files-master with HEAD~3
+Merging:
+138d8fa master3
+c2298a8 Add subproject master
+found 0 common ancestors:
+Already applied: 0001 Add subproject master
+Merging files-master with HEAD~2
+Merging:
+138d8fa master3
+ffbb8e9 master4
+found 1 common ancestor:
+c2298a8 Add subproject master
+[detached HEAD 5f90a88] master4
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:14:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 master4.t
+Committed: 0002 master4
+Merging files-master with HEAD~1
+Merging:
+5f90a88 master4
+1059aa6 files_subtree/master5
+found 1 common ancestor:
+ffbb8e9 master4
+[detached HEAD c64768c] files_subtree/master5
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:14:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 master5.t
+Committed: 0003 files_subtree/master5
+Merging files-master with HEAD~0
+Merging:
+c64768c files_subtree/master5
+6ceeae2 Empty commit
+found 1 common ancestor:
+1059aa6 files_subtree/master5
+Already up to date!
+Already applied: 0004 Empty commit
+All done.
+command failed:  'test' 'master4' '=' 'files_subtree/master5'
+not ok 8 - Rebase -Xsubtree --onto commit 5 # TODO known breakage
+
+checking known breakage: 
+	reset_rebase &&
+	git checkout -b rebase-onto-empty master &&
+	git filter-branch --prune-empty -f --subdirectory-filter files_subtree &&
+	git commit -m "Empty commit" --allow-empty &&
+	git rebase -Xsubtree=files_subtree --onto files-master master &&
+	verbose test "$(commit_message HEAD)" = "Empty commit"
+
+fatal: No rebase in progress?
+HEAD is now at c64768c files_subtree/master5
+Switched to a new branch 'rebase-onto-empty'
+
Rewrite 857c354c14dec65ebdcbe167a352a0809dfe91f4 (1/3) (1 seconds passed, remaining 2 predicted)    
Rewrite 8aaa705aa976a6676d7a4f353323a6c49c23b5a2 (1/3) (1 seconds passed, remaining 2 predicted)    
Rewrite 8bb50adc9630aa0deade7689343795f582e5d715 (3/3) (1 seconds passed, remaining 0 predicted)    
+Ref 'refs/heads/rebase-onto-empty' was rewritten
+[rebase-onto-empty 6ceeae2] Empty commit
+ Author: A U Thor <author@example.com>
+First, rewinding head to replay your work on top of it...
+Merging files-master with HEAD~3
+Merging:
+138d8fa master3
+c2298a8 Add subproject master
+found 0 common ancestors:
+Already applied: 0001 Add subproject master
+Merging files-master with HEAD~2
+Merging:
+138d8fa master3
+ffbb8e9 master4
+found 1 common ancestor:
+c2298a8 Add subproject master
+[detached HEAD 5f90a88] master4
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:14:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 master4.t
+Committed: 0002 master4
+Merging files-master with HEAD~1
+Merging:
+5f90a88 master4
+1059aa6 files_subtree/master5
+found 1 common ancestor:
+ffbb8e9 master4
+[detached HEAD c64768c] files_subtree/master5
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:14:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 master5.t
+Committed: 0003 files_subtree/master5
+Merging files-master with HEAD~0
+Merging:
+c64768c files_subtree/master5
+6ceeae2 Empty commit
+found 1 common ancestor:
+1059aa6 files_subtree/master5
+Already up to date!
+Already applied: 0004 Empty commit
+All done.
+command failed:  'test' 'files_subtree/master5' '=' 'Empty commit'
+not ok 9 - Rebase -Xsubtree --onto empty commit # TODO known breakage
+
+# still have 8 known breakage(s)
+# passed all remaining 1 test(s)
+1..9
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t3900-i18n-commit.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3900-i18n-commit/.git/
+expecting success: 
+	: >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: 
+	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: 
+	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: 
+	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_i18ngrep "did not conform" "$HOME"/stderr
+
+[master 7d1eeb8] 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: 
+	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_i18ngrep "did not conform" "$HOME"/stderr
+
+[master d323cb1] à‚©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: 
+	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_i18ngrep "did not conform" "$HOME"/stderr
+
+[master 42bf3df] 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: 
+	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_i18ngrep "did not conform" "$HOME"/stderr
+
+[master 4f956b4] 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: 
+		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 0cb63b0] ÄËÑÏÖ
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 8 - ISO8859-1 setup
+
+expecting success: 
+		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 62f92a9] ¤Ï¤ì¤Ò¤Û¤Õ
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 9 - eucJP setup
+
+expecting success: 
+		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 d9710c1] $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: 
+		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: 
+		E=$(git cat-file commit eucJP | sed -ne "s/^encoding //p") &&
+		test "z$E" = "zeucJP"
+	
+ok 12 - check encoding header for eucJP
+
+expecting success: 
+		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: 
+	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: 
+	compare_with ISO8859-1 "$TEST_DIRECTORY"/t3900/1-UTF-8.txt
+
+ok 15 - ISO8859-1 should be shown in UTF-8 now
+
+expecting success: 
+		compare_with eucJP "$TEST_DIRECTORY"/t3900/2-UTF-8.txt
+	
+ok 16 - eucJP should be shown in UTF-8 now
+
+expecting success: 
+		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: 
+	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: 
+		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: 
+		git config i18n.commitencoding eucJP &&
+		compare_with eucJP "$TEST_DIRECTORY"/t3900/eucJP.txt
+	
+ok 20 - eucJP should be shown in itself now
+
+expecting success: 
+		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: 
+	git config i18n.logoutputencoding UTF-8
+
+ok 22 - config to tweak customization
+
+expecting success: 
+	compare_with ISO8859-1 "$TEST_DIRECTORY"/t3900/1-UTF-8.txt
+
+ok 23 - ISO8859-1 should be shown in UTF-8 now
+
+expecting success: 
+		compare_with eucJP "$TEST_DIRECTORY"/t3900/2-UTF-8.txt
+	
+ok 24 - eucJP should be shown in UTF-8 now
+
+expecting success: 
+		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: 
+			compare_with eucJP "$TEST_DIRECTORY"/t3900/eucJP.txt $ICONV
+		
+ok 26 - eucJP should be shown in eucJP now
+
+expecting success: 
+			compare_with ISO-2022-JP "$TEST_DIRECTORY"/t3900/eucJP.txt $ICONV
+		
+ok 27 - ISO-2022-JP should be shown in eucJP now
+
+expecting success: 
+			compare_with eucJP "$TEST_DIRECTORY"/t3900/ISO-2022-JP.txt $ICONV
+		
+ok 28 - eucJP should be shown in ISO-2022-JP now
+
+expecting success: 
+			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: 
+		compare_with "--encoding=none ISO8859-1" "$TEST_DIRECTORY"/t3900/ISO8859-1.txt
+	
+ok 30 - No conversion with ISO8859-1
+
+expecting success: 
+		compare_with "--encoding=none eucJP" "$TEST_DIRECTORY"/t3900/eucJP.txt
+	
+ok 31 - No conversion with eucJP
+
+expecting success: 
+		compare_with "--encoding=none ISO-2022-JP" "$TEST_DIRECTORY"/t3900/ISO-2022-JP.txt
+	
+ok 32 - No conversion with ISO-2022-JP
+
+expecting success: 
+		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 3e04009] $B$O$l$R$[$U(B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[eucJP-fixup c171a18] intermediate commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 G
+[eucJP-fixup 2790a14] fixup! $B$O$l$R$[$U(B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Rebasing (2/3)
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.
+Rebasing (3/3)
Successfully rebased and updated refs/heads/eucJP-fixup.
+ok 33 - commit --fixup with eucJP encoding
+
+expecting success: 
+		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 4a40070] $B$O$l$R$[$U(B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[ISO-2022-JP-squash eac1e1a] intermediate commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 G
+[ISO-2022-JP-squash f31400b] squash! $B$O$l$R$[$U(B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Rebasing (2/3)
[detached HEAD de8a574] $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
+
+# passed all 34 test(s)
+1..34
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t3902-quoted.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3902-quoted/.git/
+expecting success: 
+
+	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 0c116fe] Second
+ Author: A U Thor <author@example.com>
+ 11 files changed, 11 insertions(+), 11 deletions(-)
+ok 1 - setup
+
+expecting success: 
+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: 
+
+	git ls-files >current && test_cmp expect.quoted current
+
+
+ok 3 - check fully quoted output from ls-files
+
+expecting success: 
+
+	git diff --name-only >current &&
+	test_cmp expect.quoted current
+
+
+ok 4 - check fully quoted output from diff-files
+
+expecting success: 
+
+	git diff --name-only HEAD >current &&
+	test_cmp expect.quoted current
+
+
+ok 5 - check fully quoted output from diff-index
+
+expecting success: 
+
+	git diff --name-only HEAD^ HEAD >current &&
+	test_cmp expect.quoted current
+
+
+ok 6 - check fully quoted output from diff-tree
+
+expecting success: 
+
+	git ls-tree --name-only -r HEAD >current &&
+	test_cmp expect.quoted current
+
+
+ok 7 - check fully quoted output from ls-tree
+
+expecting success: 
+
+	git config --bool core.quotepath false
+
+
+ok 8 - setting core.quotepath
+
+expecting success: 
+
+	git ls-files >current && test_cmp expect.raw current
+
+
+ok 9 - check fully quoted output from ls-files
+
+expecting success: 
+
+	git diff --name-only >current &&
+	test_cmp expect.raw current
+
+
+ok 10 - check fully quoted output from diff-files
+
+expecting success: 
+
+	git diff --name-only HEAD >current &&
+	test_cmp expect.raw current
+
+
+ok 11 - check fully quoted output from diff-index
+
+expecting success: 
+
+	git diff --name-only HEAD^ HEAD >current &&
+	test_cmp expect.raw current
+
+
+ok 12 - check fully quoted output from diff-tree
+
+expecting success: 
+
+	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/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t3303-notes-subtrees.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3303-notes-subtrees/.git/
+expecting success: 
+
+	(
+		nr=0 &&
+		while [ $nr -lt $number_of_commits ]; do
+			nr=$(($nr+1)) &&
+			test_tick &&
+			cat <<INPUT_END
+commit refs/heads/master
+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: test_sha1_based "s|^..|&/|"
+ok 2 - test notes in 2/38-fanout
+
+expecting success: verify_notes
+ok 3 - verify notes in 2/38-fanout
+
+expecting success: test_sha1_based "s|^\(..\)\(..\)|\1/\2/|"
+ok 4 - test notes in 2/2/36-fanout
+
+expecting success: verify_notes
+ok 5 - verify notes in 2/2/36-fanout
+
+expecting success: test_sha1_based "s|^\(..\)\(..\)\(..\)|\1/\2/\3/|"
+ok 6 - test notes in 2/2/2/34-fanout
+
+expecting success: verify_notes
+ok 7 - verify notes in 2/2/2/34-fanout
+
+expecting success: test_same_notes "s|^..|&/|" ""
+ok 8 - test same notes in no fanout and 2/38-fanout
+
+expecting success: verify_notes
+ok 9 - verify same notes in no fanout and 2/38-fanout
+
+expecting success: test_same_notes "s|^\(..\)\(..\)|\1/\2/|" ""
+ok 10 - test same notes in no fanout and 2/2/36-fanout
+
+expecting success: verify_notes
+ok 11 - verify same notes in no fanout and 2/2/36-fanout
+
+expecting success: test_same_notes "s|^\(..\)\(..\)|\1/\2/|" "s|^..|&/|"
+ok 12 - test same notes in 2/38-fanout and 2/2/36-fanout
+
+expecting success: verify_notes
+ok 13 - verify same notes in 2/38-fanout and 2/2/36-fanout
+
+expecting success: 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: verify_notes
+ok 15 - verify same notes in 2/2/2/34-fanout and 2/2/36-fanout
+
+expecting success: test_concatenated_notes "s|^..|&/|" ""
+ok 16 - test notes in no fanout concatenated with 2/38-fanout
+
+expecting success: verify_concatenated_notes
+ok 17 - verify notes in no fanout concatenated with 2/38-fanout
+
+expecting success: test_concatenated_notes "s|^\(..\)\(..\)|\1/\2/|" ""
+ok 18 - test notes in no fanout concatenated with 2/2/36-fanout
+
+expecting success: verify_concatenated_notes
+ok 19 - verify notes in no fanout concatenated with 2/2/36-fanout
+
+expecting success: test_concatenated_notes "s|^\(..\)\(..\)|\1/\2/|" "s|^..|&/|"
+ok 20 - test notes in 2/38-fanout concatenated with 2/2/36-fanout
+
+expecting success: verify_concatenated_notes
+ok 21 - verify notes in 2/38-fanout concatenated with 2/2/36-fanout
+
+expecting success: 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: 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/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
 *** t2013-checkout-submodule.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t2013-checkout-submodule/.git/
 expecting success: 
@@ -84020,4868 +86047,1312 @@
 1..70
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t3702-add-edit.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3702-add-edit/.git/
+*** t3404-rebase-interactive.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3404-rebase-interactive/.git/
 expecting success: 
+	test_commit A file1 &&
+	test_commit B file1 &&
+	test_commit C file2 &&
+	test_commit D file1 &&
+	test_commit E file3 &&
+	git checkout -b branch1 A &&
+	test_commit F file4 &&
+	test_commit G file1 &&
+	test_commit H file5 &&
+	git checkout -b branch2 F &&
+	test_commit I file6 &&
+	git checkout -b conflict-branch A &&
+	test_commit one conflict &&
+	test_commit two conflict &&
+	test_commit three conflict &&
+	test_commit four conflict &&
+	git checkout -b no-conflict-branch A &&
+	test_commit J fileJ &&
+	test_commit K fileK &&
+	test_commit L fileL &&
+	test_commit M fileM &&
+	git checkout -b no-ff-branch A &&
+	test_commit N fileN &&
+	test_commit O fileO &&
+	test_commit P fileP
 
-	git add file &&
-	test_tick &&
-	git commit -m initial file
-
-
-[master (root-commit) e055285] initial
+[master (root-commit) 6e62bf8] A
  Author: A U Thor <author@example.com>
- 1 file changed, 11 insertions(+)
- create mode 100644 file
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file1
+[master 313fe96] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[master d0f65f2] C
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file2
+[master 0547e3f] D
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[master 8f99a4f] E
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file3
+Switched to a new branch 'branch1'
+[branch1 cfefd94] F
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file4
+[branch1 83751a6] G
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[branch1 4373208] H
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file5
+Switched to a new branch 'branch2'
+[branch2 615be62] I
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file6
+Switched to a new branch 'conflict-branch'
+[conflict-branch b895952] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 conflict
+[conflict-branch 766a798] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[conflict-branch 1eadf03] three
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[conflict-branch f91a2b3] four
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'no-conflict-branch'
+[no-conflict-branch 808874f] J
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 fileJ
+[no-conflict-branch 265b89e] K
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 fileK
+[no-conflict-branch 6b0f5e6] L
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 fileL
+[no-conflict-branch 3389558] M
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 fileM
+Switched to a new branch 'no-ff-branch'
+[no-ff-branch 53b4423] N
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 fileN
+[no-ff-branch cc47714] O
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 fileO
+[no-ff-branch faef1a5] P
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 fileP
 ok 1 - setup
 
 expecting success: 
+	git checkout -b emptybranch master &&
+	git commit --allow-empty -m "empty" &&
+	git rebase --keep-empty -i HEAD~2 &&
+	git log --oneline >actual &&
+	test_line_count = 6 actual
 
-	cp second-part file &&
-	git add -e &&
-	test_cmp second-part file &&
-	test_cmp expected-patch orig-patch &&
-	git diff --cached >actual &&
-	grep -v index actual >out &&
-	test_cmp expected out
+Switched to a new branch 'emptybranch'
+[emptybranch da33401] empty
+ Author: A U Thor <author@example.com>
+Successfully rebased and updated refs/heads/emptybranch.
+ok 2 - rebase --keep-empty
 
+expecting success: 
+	set_fake_editor &&
+	test_must_fail env FAKE_LINES="1 exec_true" git rebase -i HEAD^ >actual 2>&1 &&
+	test_i18ncmp expect actual
 
-ok 2 - add -e
+ok 3 - rebase -i with empty HEAD
 
 expecting success: 
-	git reset --hard &&
-	echo change >>file &&
-	test_must_fail env GIT_EDITOR=false git add -e &&
-	test_expect_code 1 git diff --exit-code
+	git checkout master &&
+	(
+	set_fake_editor &&
+	FAKE_LINES="1 exec_>touch-one
+		2 exec_>touch-two exec_false exec_>touch-three
+		3 4 exec_>\"touch-file__name_with_spaces\";_>touch-after-semicolon 5" &&
+	export FAKE_LINES &&
+	test_must_fail git rebase -i A
+	) &&
+	test_path_is_file touch-one &&
+	test_path_is_file touch-two &&
+	test_path_is_missing touch-three " (should have stopped before)" &&
+	test_cmp_rev C HEAD &&
+	git rebase --continue &&
+	test_path_is_file touch-three &&
+	test_path_is_file "touch-file  name with spaces" &&
+	test_path_is_file touch-after-semicolon &&
+	test_cmp_rev master HEAD &&
+	rm -f touch-*
 
-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
+Switched to branch 'master'
+rebase -i script before editing:
+pick 313fe96 B
+pick d0f65f2 C
+pick 0547e3f D
+pick 8f99a4f E
 
-# passed all 3 test(s)
-1..3
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t3700-add.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3700-add/.git/
-expecting success: touch foo && git add foo
-ok 1 - Test of git add
+rebase -i script after editing:
+pick 313fe96 B
+exec >touch-one
+pick d0f65f2 C
+exec >touch-two
+exec false
+exec >touch-three
+pick 0547e3f D
+pick 8f99a4f E
+exec >"touch-file  name with spaces"; >touch-after-semicolon
+Rebasing (2/9)
Executing: >touch-one
+Rebasing (3/9)
Rebasing (4/9)
Executing: >touch-two
+Rebasing (5/9)
Executing: false
+warning: execution failed: false
+You can fix the problem, and then run
 
-expecting success: git ls-files foo | grep foo
-foo
-ok 2 - Post-check that foo is in the index
+  git rebase --continue
 
-expecting success: touch -- -q && git add -- -q
-ok 3 - Test that "git add -- -q" works
 
-expecting success: git config core.filemode 0 &&
-	 echo foo >xfoo1 &&
-	 chmod 755 xfoo1 &&
-	 git add xfoo1 &&
-	 test_mode_in_index 100644 xfoo1
-pass
-ok 4 - git add: Test that executable bit is not used if core.filemode=0
+Rebasing (6/9)
Executing: >touch-three
+Rebasing (7/9)
Rebasing (8/9)
Rebasing (9/9)
Executing: >"touch-file  name with spaces"; >touch-after-semicolon
+Successfully rebased and updated refs/heads/master.
+ok 4 - rebase -i with the exec command
 
 expecting success: 
-	rm -f xfoo1 &&
-	test_ln_s_add foo xfoo1 &&
-	test_mode_in_index 120000 xfoo1
+	git checkout master &&
+	mkdir subdir && (cd subdir &&
+	set_fake_editor &&
+	FAKE_LINES="1 exec_>touch-subdir" \
+		git rebase -i HEAD^
+	) &&
+	test_path_is_file touch-subdir &&
+	rm -fr subdir
 
-checking prerequisite: SYMLINKS
+Already on 'master'
+rebase -i script before editing:
+pick 8f99a4f E
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
-	# test whether the filesystem supports symbolic links
-	ln -s x y && test -h y
+rebase -i script after editing:
+pick 8f99a4f E
+exec >touch-subdir
+Rebasing (2/2)
Executing: >touch-subdir
+Successfully rebased and updated refs/heads/master.
+ok 5 - rebase -i with the exec command runs from tree root
 
-)
-prerequisite SYMLINKS ok
-pass
-ok 5 - git add: filemode=0 should not get confused by symlink
+expecting success: 
+	test_when_finished "rm -rf subdir" &&
+	test_when_finished "git rebase --abort ||:" &&
+	git checkout master &&
+	mkdir subdir && (cd subdir &&
+	set_fake_editor &&
+	FAKE_LINES="1 x_cd_subdir_&&_git_rev-parse_--is-inside-work-tree" \
+		git rebase -i HEAD^
+	)
 
-expecting success: git config core.filemode 0 &&
-	 echo foo >xfoo2 &&
-	 chmod 755 xfoo2 &&
-	 git update-index --add xfoo2 &&
-	 test_mode_in_index 100644 xfoo2
-pass
-ok 6 - git update-index --add: Test that executable bit is not used...
+Already on 'master'
+rebase -i script before editing:
+pick 8f99a4f E
 
-expecting success: 
-	rm -f xfoo2 &&
-	test_ln_s_add foo xfoo2 &&
-	test_mode_in_index 120000 xfoo2
+rebase -i script after editing:
+pick 8f99a4f E
+x cd subdir && git rev-parse --is-inside-work-tree
+Rebasing (2/2)
Executing: cd subdir && git rev-parse --is-inside-work-tree
+true
+Successfully rebased and updated refs/heads/master.
+fatal: No rebase in progress?
+ok 6 - rebase -i with exec allows git commands in subdirs
 
-pass
-ok 7 - git add: filemode=0 should not get confused by symlink
+expecting success: 
+	test_when_finished "rm -rf subdir" &&
+	test_when_finished "test_might_fail git rebase --abort" &&
+	mkdir subdir &&
+	git rebase -x "(cd subdir && git rev-parse --show-toplevel)" HEAD^ \
+		>actual &&
+	! grep "/subdir$" actual
 
-expecting success: git config core.filemode 0 &&
-	 test_ln_s_add xfoo2 xfoo3 &&	# runs git update-index --add
-	 test_mode_in_index 120000 xfoo3
-pass
-ok 8 - git update-index --add: Test that executable bit is not used...
+Rebasing (2/2)
Executing: (cd subdir && git rev-parse --show-toplevel)
+Successfully rebased and updated refs/heads/master.
+fatal: No rebase in progress?
+ok 7 - rebase -i sets work tree properly
 
 expecting success: 
-	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
+	git checkout master &&
+	set_fake_editor &&
+	test_must_fail env FAKE_LINES="exec_echo_foo_>file1 1" git rebase -i HEAD^ &&
+	test_cmp_rev master^ HEAD &&
+	git reset --hard &&
+	git rebase --continue
 
-ok 9 - .gitignore test setup
+Already on 'master'
+rebase -i script before editing:
+pick 8f99a4f E
+
+rebase -i script after editing:
+exec echo foo >file1
+pick 8f99a4f E
+Rebasing (1/2)
Executing: echo foo >file1
+error: cannot rebase: You have unstaged changes.
+warning: execution succeeded: echo foo >file1
+but left changes to the index and/or the working tree
+Commit or stash your changes, and then run
+
+  git rebase --continue
+
+
+HEAD is now at 0547e3f D
+Rebasing (2/2)
Successfully rebased and updated refs/heads/master.
+ok 8 - rebase -i with the exec command checks tree cleanness
 
 expecting success: 
-	git add . &&
-	! (git ls-files | grep "\\.ig")
+	git checkout master &&
+	test_when_finished "git rebase --abort" &&
+	set_fake_editor &&
+	test_must_fail env FAKE_LINES="exec_this-command-does-not-exist 1" \
+	git rebase -i HEAD^ >actual 2>&1 &&
+	! grep "Maybe git-rebase is broken" actual
 
-ok 10 - .gitignore is honored
+Already on 'master'
+ok 9 - rebase -i with exec of inexistent command
 
 expecting success: 
-	test_must_fail git add a.?? &&
-	! (git ls-files | grep "\\.ig")
+	git checkout branch2 &&
+	set_fake_editor &&
+	git rebase -i F &&
+	test "$(git symbolic-ref -q HEAD)" = "refs/heads/branch2" &&
+	test $(git rev-parse I) = $(git rev-parse HEAD)
 
-The following paths are ignored by one of your .gitignore files:
-a.ig
-Use -f if you really want to add them.
-ok 11 - error out when attempting to add ignored ones without -f
+Switched to branch 'branch2'
+Successfully rebased and updated refs/heads/branch2.
+ok 10 - no changes are a nop
 
 expecting success: 
-	test_must_fail git add d.?? &&
-	! (git ls-files | grep "\\.ig")
+	git checkout -b dead-end &&
+	git rm file6 &&
+	git commit -m "stop here" &&
+	set_fake_editor &&
+	git rebase -i F branch2 &&
+	test "$(git symbolic-ref -q HEAD)" = "refs/heads/branch2" &&
+	test $(git rev-parse I) = $(git rev-parse branch2) &&
+	test $(git rev-parse I) = $(git rev-parse HEAD)
 
-The following paths are ignored by one of your .gitignore files:
-d.ig
-Use -f if you really want to add them.
-ok 12 - error out when attempting to add ignored ones without -f
+Switched to a new branch 'dead-end'
+rm 'file6'
+[dead-end f814f58] stop here
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 file6
+Successfully rebased and updated refs/heads/branch2.
+ok 11 - test the [branch] option
 
 expecting success: 
-	touch a.if &&
-	test_must_fail git add a.?? &&
-	! (git ls-files | grep "\\.ig") &&
-	(git ls-files | grep a.if)
+	git checkout -b test-onto branch2 &&
+	set_fake_editor &&
+	git rebase -i --onto branch1 F &&
+	test "$(git symbolic-ref -q HEAD)" = "refs/heads/test-onto" &&
+	test $(git rev-parse HEAD^) = $(git rev-parse branch1) &&
+	test $(git rev-parse I) = $(git rev-parse branch2)
 
-The following paths are ignored by one of your .gitignore files:
-a.ig
-Use -f if you really want to add them.
-a.if
-ok 13 - error out when attempting to add ignored ones but add others
+Switched to a new branch 'test-onto'
+Rebasing (1/1)
Successfully rebased and updated refs/heads/test-onto.
+ok 12 - test --onto <branch>
 
 expecting success: 
-	git add -f a.?? &&
-	git ls-files --error-unmatch a.ig
+	git checkout branch1 &&
+	git tag original-branch1 &&
+	set_fake_editor &&
+	git rebase -i branch2 &&
+	test file6 = $(git diff --name-only original-branch1) &&
+	test "$(git symbolic-ref -q HEAD)" = "refs/heads/branch1" &&
+	test $(git rev-parse I) = $(git rev-parse branch2) &&
+	test $(git rev-parse I) = $(git rev-parse HEAD~2)
 
-a.ig
-ok 14 - add ignored ones with -f
+Switched to branch 'branch1'
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/branch1.
+ok 13 - rebase on top of a non-conflicting commit
 
 expecting success: 
-	git add -f d.??/* &&
-	git ls-files --error-unmatch d.ig/d.if d.ig/d.ig
+	test $(git rev-parse branch1@{1}) = $(git rev-parse original-branch1)
 
-d.ig/d.if
-d.ig/d.ig
-ok 15 - add ignored ones with -f
+ok 14 - reflog for the branch shows state before rebase
 
 expecting success: 
-	rm -f .git/index &&
-	git add -f d.?? &&
-	git ls-files --error-unmatch d.ig/d.if d.ig/d.ig
+	printf "rebase -i (finish): refs/heads/branch1 onto %s\n" \
+		"$(git rev-parse branch2)" >expected &&
+	git log -g --pretty=%gs -1 refs/heads/branch1 >actual &&
+	test_cmp expected actual
 
-d.ig/d.if
-d.ig/d.ig
-ok 16 - add ignored ones with -f
+ok 15 - reflog for the branch shows correct finish message
 
 expecting success: 
+	set_fake_editor &&
+	FAKE_LINES="2 1" git rebase -i HEAD~2 &&
+	test H = $(git cat-file commit HEAD^ | sed -ne \$p) &&
+	test G = $(git cat-file commit HEAD | sed -ne \$p)
 
-	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
+rebase -i script before editing:
+pick ae8f65e G
+pick f5f5249 H
 
-sub/dir/a.ig
-sub/dir/a.ig
-ok 17 - .gitignore with subdirectory
+rebase -i script after editing:
+pick f5f5249 H
+pick ae8f65e G
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/branch1.
+ok 16 - exchange two commits
 
 expecting success: 
-	rm -f .git/index &&
-	git add 1/2/a 1/3/b 1/2/c
+	git tag new-branch1 &&
+	set_fake_editor &&
+	test_must_fail git rebase -i master &&
+	test "$(git rev-parse HEAD~3)" = "$(git rev-parse master)" &&
+	test_cmp expect .git/rebase-merge/patch &&
+	test_cmp expect2 file1 &&
+	test "$(git diff --name-status |
+		sed -n -e "/^U/s/^U[^a-z]*//p")" = file1 &&
+	test 4 = $(grep -v "^#" < .git/rebase-merge/done | wc -l) &&
+	test 0 = $(grep -c "^[^#]" < .git/rebase-merge/git-rebase-todo)
 
-ok 18 - check correct prefix detection
+Rebasing (1/4)
Rebasing (2/4)
Rebasing (3/4)
Rebasing (4/4)
Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+error: could not apply 5d18e54... G
+Resolve all conflicts manually, mark them as resolved with
+"git add/rm <conflicted_files>", then run "git rebase --continue".
+You can instead skip this commit: run "git rebase --skip".
+To abort and get back to the state before "git rebase", run "git rebase --abort".
+Could not apply 5d18e54... G
+ok 17 - stop on conflicting pick
 
 expecting success: 
-	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"
-	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$"
+	GIT_TRACE=1 git rebase --show-current-patch >/dev/null 2>stderr &&
+	grep "show.*REBASE_HEAD" stderr &&
+	# the original stopped-sha1 is abbreviated
+	stopped_sha1="$(git rev-parse $(cat ".git/rebase-merge/stopped-sha"))" &&
+	test "$(git rev-parse REBASE_HEAD)" = "$stopped_sha1"
 
-100755 3e757656cf36eca53338e520d134963a44f793f8 0	file
-120000 3e757656cf36eca53338e520d134963a44f793f8 0	symlink
-ok 19 - git add with filemode=0, symlinks=0, and unmerged entries
+trace: run_command: git show REBASE_HEAD --
+trace: built-in: git show REBASE_HEAD --
+ok 18 - show conflicted patch
 
 expecting success: 
-	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$"
+	git rebase --abort &&
+	test $(git rev-parse new-branch1) = $(git rev-parse HEAD) &&
+	test "$(git symbolic-ref -q HEAD)" = "refs/heads/branch1" &&
+	test_path_is_missing .git/rebase-merge
 
-rm 'file'
-rm 'symlink'
-100755 3e757656cf36eca53338e520d134963a44f793f8 0	file
-120000 3e757656cf36eca53338e520d134963a44f793f8 0	symlink
-ok 20 - git add with filemode=0, symlinks=0 prefers stage 2 over stage 1
+ok 19 - abort
 
 expecting success: 
-	>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; (exit 1);;
-	esac &&
-	git add --refresh -- foo &&
-	test -z "$(git diff-index HEAD -- foo)"
+	git rm --cached file1 &&
+	git commit -m "remove file in base" &&
+	set_fake_editor &&
+	test_must_fail git rebase -i master > output 2>&1 &&
+	test_i18ngrep "The following untracked working tree files would be overwritten by checkout:" \
+		output &&
+	test_i18ngrep "file1" output &&
+	test_path_is_missing .git/rebase-merge &&
+	git reset --hard HEAD^
 
-[master (root-commit) 790753e] commit all
+rm 'file1'
+[branch1 2dd5570] remove file in base
  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 21 - git add --refresh
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 file1
+error: The following untracked working tree files would be overwritten by checkout:
+	file1
+HEAD is now at 5d18e54 G
+ok 20 - abort with error when new base cannot be checked out
 
 expecting success: 
-	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 A > file7 &&
+	git add file7 &&
+	test_tick &&
+	GIT_AUTHOR_NAME="Twerp Snog" git commit -m "different author" &&
+	git tag twerp &&
+	set_fake_editor &&
+	git rebase -i --onto master HEAD^ &&
+	git show HEAD | grep "^Author: Twerp Snog"
 
-HEAD is now at 790753e commit all
-rm 'foo'
-baz
-ok 22 - git add --refresh with pathspec
+[branch1 2596307] different author
+ Author: Twerp Snog <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file7
+Rebasing (1/1)
Successfully rebased and updated refs/heads/branch1.
+Author: Twerp Snog <author@example.com>
+ok 21 - retain authorship
 
-checking prerequisite: SANITY
+expecting success: 
+	oGIT_AUTHOR_NAME=$GIT_AUTHOR_NAME &&
+	test_when_finished "GIT_AUTHOR_NAME=\$oGIT_AUTHOR_NAME" &&
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
-	mkdir SANETESTD.1 SANETESTD.2 &&
+	git reset --hard twerp &&
+	test_commit a conflict a conflict-a &&
+	git reset --hard twerp &&
 
-	chmod +w SANETESTD.1 SANETESTD.2 &&
-	>SANETESTD.1/x 2>SANETESTD.2/x &&
-	chmod -w SANETESTD.1 &&
-	chmod -r SANETESTD.1/x &&
-	chmod -rx SANETESTD.2 ||
-	BUG "cannot prepare SANETESTD"
+	GIT_AUTHOR_NAME=AttributeMe &&
+	export GIT_AUTHOR_NAME &&
+	test_commit b conflict b conflict-b &&
+	GIT_AUTHOR_NAME=$oGIT_AUTHOR_NAME &&
 
-	! test -r SANETESTD.1/x &&
-	! rm SANETESTD.1/x && ! test -f SANETESTD.2/x
-	status=$?
+	set_fake_editor &&
+	test_must_fail git rebase -i conflict-a &&
+	echo resolved >conflict &&
+	git add conflict &&
+	git rebase --continue &&
+	test $(git rev-parse conflict-a^0) = $(git rev-parse HEAD^) &&
+	git show >out &&
+	grep AttributeMe out
 
-	chmod +rwx SANETESTD.1 SANETESTD.2 &&
-	rm -rf SANETESTD.1 SANETESTD.2 ||
-	BUG "cannot clean SANETESTD"
-	return $status
+HEAD is now at 2596307 different author
+[branch1 748a43d] a
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 conflict
+HEAD is now at 2596307 different author
+[branch1 34d1a6c] b
+ Author: AttributeMe <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 conflict
+Rebasing (1/1)
Auto-merging conflict
+CONFLICT (add/add): Merge conflict in conflict
+error: could not apply 34d1a6c... b
+Resolve all conflicts manually, mark them as resolved with
+"git add/rm <conflicted_files>", then run "git rebase --continue".
+You can instead skip this commit: run "git rebase --skip".
+To abort and get back to the state before "git rebase", run "git rebase --abort".
+Could not apply 34d1a6c... b
+[detached HEAD 7866b12] b
+ Author: AttributeMe <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Successfully rebased and updated refs/heads/branch1.
+Author: AttributeMe <author@example.com>
+ok 22 - retain authorship w/ conflicts
 
-)
-rm: cannot remove 'SANETESTD.1/x': Permission denied
-prerequisite SANITY ok
 expecting success: 
-	git reset --hard &&
-	date >foo1 &&
-	date >foo2 &&
-	chmod 0 foo2 &&
-	test_must_fail git add --verbose . &&
-	! ( git ls-files foo1 | grep foo1 )
+	git reset --hard twerp &&
+	echo B > file7 &&
+	test_tick &&
+	GIT_AUTHOR_NAME="Nitfol" git commit -m "nitfol" file7 &&
+	echo "******************************" &&
+	set_fake_editor &&
+	FAKE_LINES="1 squash 2" EXPECT_HEADER_COUNT=2 \
+		git rebase -i --onto master HEAD~2 &&
+	test B = $(cat file7) &&
+	test $(git rev-parse HEAD^) = $(git rev-parse master)
 
-HEAD is now at 790753e 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 'b.if'
-add 'c.if/c.if'
-add 'foo1'
-ok 23 - git add should fail atomically upon an unreadable file
+HEAD is now at 2596307 different author
+[branch1 cdf577a] nitfol
+ Author: Nitfol <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+******************************
+rebase -i script before editing:
+pick 2596307 different author
+pick cdf577a nitfol
+
+rebase -i script after editing:
+pick 2596307 different author
+squash cdf577a nitfol
+Rebasing (1/2)
Rebasing (2/2)
[detached HEAD d2d5ba7] different author
+ Author: Twerp Snog <author@example.com>
+ Date: Thu Apr 7 15:33:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file7
+Successfully rebased and updated refs/heads/branch1.
+ok 23 - squash
 
 expecting success: 
-	git reset --hard &&
-	date >foo1 &&
-	date >foo2 &&
-	chmod 0 foo2 &&
-	test_must_fail git add --verbose --ignore-errors . &&
-	git ls-files foo1 | grep foo1
+	git show HEAD | grep "^Author: Twerp Snog"
 
-HEAD is now at 790753e commit all
-error: open("foo2"): Permission denied
-error: unable to index file foo2
-add 'foo'
-add '-q'
-add '.gitignore'
-add 'a.if'
-add 'actual'
-add 'b.if'
-add 'c.if/c.if'
-add 'foo1'
-add 'stage1'
-add 'stage2'
-add 'stage3'
-add 'sub/.gitignore'
-add 'sub/dir/a.ig'
-add 'xfoo1'
-add 'xfoo2'
-add 'xfoo3'
-foo1
-ok 24 - git add --ignore-errors
+Author: Twerp Snog <author@example.com>
+ok 24 - retain authorship when squashing
 
-expecting success: 
-	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
+checking prerequisite: REBASE_P
 
-HEAD is now at 790753e commit all
-error: open("foo2"): Permission denied
-error: unable to index file foo2
-add 'foo'
-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 25 - git add (add.ignore-errors)
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
+	test -z "$GIT_TEST_SKIP_REBASE_P"
 
+)
+prerequisite REBASE_P ok
 expecting success: 
-	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=$(git rev-parse HEAD) &&
+	set_fake_editor &&
+	git rebase -i -p HEAD^ &&
+	git update-index --refresh &&
+	git diff-files --quiet &&
+	git diff-index --quiet --cached HEAD -- &&
+	test $HEAD = $(git rev-parse HEAD)
 
-HEAD is now at 790753e commit all
-error: open("foo2"): Permission denied
-error: unable to index file foo2
-fatal: adding files failed
-add 'foo1'
-ok 26 - git add (add.ignore-errors = false)
+Rebasing (1/1)
Successfully rebased and updated refs/heads/branch1.
+ok 25 - -p handles "no changes" gracefully
 
-expecting success: 
-       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
+checking known breakage: 
+	git checkout H &&
+	set_fake_editor &&
+	FAKE_LINES="2 1" git rebase -i -p HEAD~2 &&
+	test H = $(git cat-file commit HEAD^ | sed -ne \$p) &&
+	test G = $(git cat-file commit HEAD | sed -ne \$p)
 
-HEAD is now at 790753e commit all
-error: open("foo2"): Permission denied
-error: unable to index file foo2
-fatal: adding files failed
-add 'foo1'
-ok 27 - --no-ignore-errors overrides config
+Note: checking out 'H'.
 
-expecting success: 
-	git reset --hard &&
-	touch fo\[ou\]bar foobar &&
-	git add 'fo\[ou\]bar' &&
-	git ls-files fo\[ou\]bar | fgrep fo\[ou\]bar &&
-	! ( git ls-files foobar | grep foobar )
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by performing another checkout.
 
-HEAD is now at 790753e commit all
-fo[ou]bar
-ok 28 - git add 'fo\[ou\]bar' ignores foobar
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -b with the checkout command again. Example:
 
-expecting success: 
-	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
+  git checkout -b <new-branch-name>
 
-HEAD is now at 790753e commit all
-ok 29 - git add to resolve conflicts on otherwise ignored path
+HEAD is now at 4373208 H
+rebase -i script before editing:
+pick 83751a6 G
+pick 4373208 H
+
+rebase -i script after editing:
+pick 4373208 H
+pick 83751a6 G
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated detached HEAD.
+not ok 26 - exchange two commits with -p # TODO known breakage
 
 expecting success: 
-	test_must_fail git add non-existent &&
-	! (git ls-files | grep "non-existent")
+	git checkout -b to-be-preserved master^ &&
+	: > unrelated-file &&
+	git add unrelated-file &&
+	test_tick &&
+	git commit -m "unrelated" &&
+	git checkout -b another-branch master &&
+	echo B > file1 &&
+	test_tick &&
+	git commit -m J file1 &&
+	test_tick &&
+	git merge to-be-preserved &&
+	echo C > file1 &&
+	test_tick &&
+	git commit -m K file1 &&
+	echo D > file1 &&
+	test_tick &&
+	git commit -m L1 file1 &&
+	git checkout HEAD^ &&
+	echo 1 > unrelated-file &&
+	test_tick &&
+	git commit -m L2 unrelated-file &&
+	test_tick &&
+	git merge another-branch &&
+	echo E > file1 &&
+	test_tick &&
+	git commit -m M file1 &&
+	git checkout -b to-be-rebased &&
+	test_tick &&
+	set_fake_editor &&
+	git rebase -i -p --onto branch1 master &&
+	git update-index --refresh &&
+	git diff-files --quiet &&
+	git diff-index --quiet --cached HEAD -- &&
+	test $(git rev-parse HEAD~6) = $(git rev-parse branch1) &&
+	test $(git rev-parse HEAD~4^2) = $(git rev-parse to-be-preserved) &&
+	test $(git rev-parse HEAD^^2^) = $(git rev-parse HEAD^^^) &&
+	test $(git show HEAD~5:file1) = B &&
+	test $(git show HEAD~3:file1) = C &&
+	test $(git show HEAD:file1) = E &&
+	test $(git show HEAD:unrelated-file) = 1
 
-fatal: pathspec 'non-existent' did not match any files
-ok 30 - "add non-existent" should fail
+Previous HEAD position was 83751a6 G
+Switched to a new branch 'to-be-preserved'
+[to-be-preserved 8dba1b0] unrelated
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 unrelated-file
+Switched to a new branch 'another-branch'
+[another-branch b55ddc1] J
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Merging:
+b55ddc1 J
+virtual to-be-preserved
+found 1 common ancestor:
+0547e3f D
+Merge made by the 'recursive' strategy.
+ unrelated-file | 0
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 unrelated-file
+[another-branch 28ab3c9] K
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[another-branch b22c0b1] L1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Note: checking out 'HEAD^'.
 
-expecting success: 
-	rm -fr empty &&
-	git init empty &&
-	(
-		cd empty &&
-		git add -A . &&
-		git add -A
-	)
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by performing another checkout.
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3700-add/empty/.git/
-ok 31 - git add -A on empty repo does not error out
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -b with the checkout command again. Example:
 
-expecting success: 
-	rm -fr empty &&
-	git init empty &&
-	(
-		cd empty &&
-		git add .
-	)
+  git checkout -b <new-branch-name>
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3700-add/empty/.git/
-ok 32 - "git add ." in empty repo
+HEAD is now at 28ab3c9 K
+[detached HEAD 9986375] L2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Merging:
+9986375 L2
+virtual another-branch
+found 1 common ancestor:
+28ab3c9 K
+Merge made by the 'recursive' strategy.
+ file1 | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[detached HEAD 806db33] M
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'to-be-rebased'
+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/to-be-rebased.
+ok 27 - preserve merges with -p
 
 expecting success: 
-	echo new >>track-this &&
-	git add --dry-run track-this >actual 2>&1 &&
-	echo "add 'track-this'" | test_cmp - actual
+	set_fake_editor &&
+	FAKE_LINES="1 2 edit 3 4" git rebase -i -p HEAD~3 &&
+	echo 2 > unrelated-file &&
+	test_tick &&
+	git commit -m L2-modified --amend unrelated-file &&
+	git rebase --continue &&
+	git update-index --refresh &&
+	git diff-files --quiet &&
+	git diff-index --quiet --cached HEAD -- &&
+	test $(git show HEAD:unrelated-file) = 2
 
-ok 33 - git add --dry-run of existing changed file
+rebase -i script before editing:
+pick 028896d L2
+pick 44a20cd L1
+pick 5f48528 Merge branch 'another-branch' into HEAD
+pick 2c6682a M
 
-expecting success: 
-	echo ignored-file >>.gitignore &&
-	test_must_fail git add --dry-run track-this ignored-file >actual 2>&1
+rebase -i script after editing:
+pick 028896d L2
+pick 44a20cd L1
+edit 5f48528 Merge branch 'another-branch' into HEAD
+pick 2c6682a M
+Rebasing (1/4)
Rebasing (2/4)
Rebasing (3/4)
Stopped at 5f48528... Merge branch 'another-branch' into HEAD
+You can amend the commit now, with
 
-ok 34 - git add --dry-run of non-existing file
+	git commit --amend 
 
-expecting success: 
-	echo "fatal: pathspec 'ignored-file' did not match any files" >expect &&
-	test_i18ncmp expect actual
+Once you are satisfied with your changes, run
 
-ok 35 - git add --dry-run of an existing file output
+	git rebase --continue
+
+[detached HEAD ed60d45] L2-modified
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:43:13 2005 -0700
+Rebasing (4/4)
Successfully rebased and updated refs/heads/to-be-rebased.
+ok 28 - edit ancestor with -p
 
 expecting success: 
-	test_must_fail git add --dry-run --ignore-missing track-this ignored-file >actual.out 2>actual.err
+	git reset --hard D &&
+	test_tick &&
+	set_fake_editor &&
+	test_must_fail git rebase -i --onto new-branch1 HEAD^ &&
+	echo resolved > file1 &&
+	git add file1 &&
+	FAKE_COMMIT_MESSAGE="chouette!" git rebase --continue &&
+	test $(git rev-parse HEAD^) = $(git rev-parse new-branch1) &&
+	git show HEAD | grep chouette
 
-ok 36 - git add --dry-run --ignore-missing of non-existing file
+HEAD is now at 0547e3f D
+Rebasing (1/1)
Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+error: could not apply 0547e3f... D
+Resolve all conflicts manually, mark them as resolved with
+"git add/rm <conflicted_files>", then run "git rebase --continue".
+You can instead skip this commit: run "git rebase --skip".
+To abort and get back to the state before "git rebase", run "git rebase --abort".
+Could not apply 0547e3f... D
+[detached HEAD eb2be51] chouette!
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Successfully rebased and updated refs/heads/to-be-rebased.
+    chouette!
+ok 29 - --continue tries to commit
 
 expecting success: 
-	test_i18ncmp expect.out actual.out &&
-	test_i18ncmp expect.err actual.err
+	git reset --hard master@{1} &&
+	test_tick &&
+	set_fake_editor &&
+	test_must_fail git rebase -v -i --onto new-branch1 HEAD^ &&
+	echo resolved > file1 &&
+	git add file1 &&
+	git rebase --continue > output &&
+	grep "^ file1 | 2 +-$" output
 
-ok 37 - git add --dry-run --ignore-missing of non-existing file output
+HEAD is now at 0547e3f D
+Changes from 6e62bf890e21973b771e4e6fc28f5ade62edb4bc to 5d18e5414f663da21d1363c271f2d684aeda7b5b:
+ file1 | 2 +-
+ file4 | 1 +
+ file5 | 1 +
+ file6 | 1 +
+ 4 files changed, 4 insertions(+), 1 deletion(-)
+ create mode 100644 file4
+ create mode 100644 file5
+ create mode 100644 file6
+Note: checking out '5d18e5414f663da21d1363c271f2d684aeda7b5b'.
 
-expecting success: 
-	test_must_fail git 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 performing another checkout.
 
-fatal: empty string is not a valid pathspec. please use . instead if you meant to match all paths
-ok 38 - git add empty string should fail
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -b with the checkout command again. Example:
 
-expecting success: 
-	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
+  git checkout -b <new-branch-name>
 
-pass
-pass
-ok 39 - git add --chmod=[+-]x stages correctly
+HEAD is now at 5d18e54 G
+Rebasing (1/1)
+Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+error: could not apply 0547e3f... D
+Resolve all conflicts manually, mark them as resolved with
+"git add/rm <conflicted_files>", then run "git rebase --continue".
+You can instead skip this commit: run "git rebase --skip".
+To abort and get back to the state before "git rebase", run "git rebase --abort".
+Could not apply 0547e3f... D
+Successfully rebased and updated refs/heads/to-be-rebased.
+ file1 | 2 +-
+ok 30 - verbose flag is heeded, even after --continue
 
 expecting success: 
-	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
+	base=$(git rev-parse HEAD~4) &&
+	set_fake_editor &&
+	FAKE_COMMIT_AMEND="ONCE" FAKE_LINES="1 squash 2 squash 3 squash 4" \
+		EXPECT_HEADER_COUNT=4 \
+		git rebase -i $base &&
+	test $base = $(git rev-parse HEAD^) &&
+	test 1 = $(git show | grep ONCE | wc -l)
 
-pass
-ok 40 - git add --chmod=+x with symlinks
+rebase -i script before editing:
+pick 615be62 I
+pick 0626e8d H
+pick 5d18e54 G
+pick 2e6badc D
+
+rebase -i script after editing:
+pick 615be62 I
+squash 0626e8d H
+squash 5d18e54 G
+squash 2e6badc D
+Rebasing (2/4)
Rebasing (3/4)
Rebasing (4/4)
[detached HEAD e5aa6ef] I
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:21:13 2005 -0700
+ 3 files changed, 3 insertions(+), 1 deletion(-)
+ create mode 100644 file5
+ create mode 100644 file6
+Successfully rebased and updated refs/heads/to-be-rebased.
+ok 31 - multi-squash only fires up editor once
 
 expecting success: 
-	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
+	git checkout -b multi-fixup E &&
+	base=$(git rev-parse HEAD~4) &&
+	set_fake_editor &&
+	FAKE_COMMIT_AMEND="NEVER" FAKE_LINES="1 fixup 2 fixup 3 fixup 4" \
+		git rebase -i $base &&
+	test $base = $(git rev-parse HEAD^) &&
+	test 0 = $(git show | grep NEVER | wc -l) &&
+	git checkout @{-1} &&
+	git branch -D multi-fixup
 
-HEAD is now at 790753e commit all
-pass
-pass
-ok 41 - git add --chmod=[+-]x changes index with already added file
+Switched to a new branch 'multi-fixup'
+rebase -i script before editing:
+pick 313fe96 B
+pick d0f65f2 C
+pick 0547e3f D
+pick 8f99a4f E
+
+rebase -i script after editing:
+pick 313fe96 B
+fixup d0f65f2 C
+fixup 0547e3f D
+fixup 8f99a4f E
+Rebasing (2/4)
Rebasing (3/4)
Rebasing (4/4)
Successfully rebased and updated refs/heads/multi-fixup.
+Switched to branch 'to-be-rebased'
+Deleted branch multi-fixup (was acbd024).
+ok 32 - multi-fixup does not fire up editor
 
 expecting success: 
-	echo foo >foo4 &&
-	git add foo4 &&
-	git add --chmod=+x foo4 &&
-	! test -x foo4
+	git checkout -b conflict-fixup conflict-branch &&
+	base=$(git rev-parse HEAD~4) &&
+	set_fake_editor &&
+	test_must_fail env FAKE_LINES="1 fixup 3 fixup 4" git rebase -i $base &&
+	echo three > conflict &&
+	git add conflict &&
+	FAKE_COMMIT_AMEND="ONCE" EXPECT_HEADER_COUNT=2 \
+		git rebase --continue &&
+	test $base = $(git rev-parse HEAD^) &&
+	test 1 = $(git show | grep ONCE | wc -l) &&
+	git checkout @{-1} &&
+	git branch -D conflict-fixup
 
-ok 42 - git add --chmod=[+-]x does not change the working tree
+Switched to a new branch 'conflict-fixup'
+rebase -i script before editing:
+pick b895952 one
+pick 766a798 two
+pick 1eadf03 three
+pick f91a2b3 four
+
+rebase -i script after editing:
+pick b895952 one
+fixup 1eadf03 three
+fixup f91a2b3 four
+Rebasing (2/3)
Auto-merging conflict
+CONFLICT (content): Merge conflict in conflict
+error: could not apply 1eadf03... three
+Resolve all conflicts manually, mark them as resolved with
+"git add/rm <conflicted_files>", then run "git rebase --continue".
+You can instead skip this commit: run "git rebase --skip".
+To abort and get back to the state before "git rebase", run "git rebase --abort".
+Could not apply 1eadf03... three
+[detached HEAD c36af95] one
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:22:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 conflict
+Rebasing (3/3)
Successfully rebased and updated refs/heads/conflict-fixup.
+Switched to branch 'to-be-rebased'
+Deleted branch conflict-fixup (was 221ec56).
+ok 33 - commit message used after conflict
 
 expecting success: 
-	>foo5 &&
-	>foo6 &&
-	git add foo5 foo6 &&
-	git add --chmod=+x &&
-	test_mode_in_index 100644 foo5 &&
-	test_mode_in_index 100644 foo6
+	git checkout -b conflict-squash conflict-branch &&
+	base=$(git rev-parse HEAD~4) &&
+	set_fake_editor &&
+	test_must_fail env FAKE_LINES="1 fixup 3 squash 4" git rebase -i $base &&
+	echo three > conflict &&
+	git add conflict &&
+	FAKE_COMMIT_AMEND="TWICE" EXPECT_HEADER_COUNT=2 \
+		git rebase --continue &&
+	test $base = $(git rev-parse HEAD^) &&
+	test 2 = $(git show | grep TWICE | wc -l) &&
+	git checkout @{-1} &&
+	git branch -D conflict-squash
 
-Nothing specified, nothing added.
-Maybe you wanted to say 'git add .'?
-pass
-pass
-ok 43 - no file status change if no pathspec is given
+Switched to a new branch 'conflict-squash'
+rebase -i script before editing:
+pick b895952 one
+pick 766a798 two
+pick 1eadf03 three
+pick f91a2b3 four
+
+rebase -i script after editing:
+pick b895952 one
+fixup 1eadf03 three
+squash f91a2b3 four
+Rebasing (2/3)
Auto-merging conflict
+CONFLICT (content): Merge conflict in conflict
+error: could not apply 1eadf03... three
+Resolve all conflicts manually, mark them as resolved with
+"git add/rm <conflicted_files>", then run "git rebase --continue".
+You can instead skip this commit: run "git rebase --skip".
+To abort and get back to the state before "git rebase", run "git rebase --abort".
+Could not apply 1eadf03... three
+[detached HEAD 191a914] one
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:22:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 conflict
+Rebasing (3/3)
[detached HEAD 60ec801] one
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:22:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 conflict
+Successfully rebased and updated refs/heads/conflict-squash.
+Switched to branch 'to-be-rebased'
+Deleted branch conflict-squash (was 60ec801).
+ok 34 - commit message retained after conflict
 
 expecting success: 
-	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
-	)
+	git checkout -b squash-fixup E &&
+	base=$(git rev-parse HEAD~4) &&
+	set_fake_editor &&
+	FAKE_COMMIT_AMEND="ONCE" FAKE_LINES="1 fixup 2 squash 3 fixup 4" \
+		EXPECT_HEADER_COUNT=4 \
+		git rebase -i $base &&
+	git cat-file commit HEAD | sed -e 1,/^\$/d > actual-squash-fixup &&
+	test_cmp expect-squash-fixup actual-squash-fixup &&
+	git cat-file commit HEAD@{2} |
+		grep "^# This is a combination of 3 commits\."  &&
+	git cat-file commit HEAD@{3} |
+		grep "^# This is a combination of 2 commits\."  &&
+	git checkout @{-1} &&
+	git branch -D squash-fixup
 
-Nothing specified, nothing added.
-Maybe you wanted to say 'git add .'?
-pass
-pass
-ok 44 - no file status change if no pathspec is given in subdir
+Switched to a new branch 'squash-fixup'
+rebase -i script before editing:
+pick 313fe96 B
+pick d0f65f2 C
+pick 0547e3f D
+pick 8f99a4f E
+
+rebase -i script after editing:
+pick 313fe96 B
+fixup d0f65f2 C
+squash 0547e3f D
+fixup 8f99a4f E
+Rebasing (2/4)
Rebasing (3/4)
Rebasing (4/4)
[detached HEAD 74d534c] B
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:14:13 2005 -0700
+ 3 files changed, 3 insertions(+), 1 deletion(-)
+ create mode 100644 file2
+ create mode 100644 file3
+Successfully rebased and updated refs/heads/squash-fixup.
+# This is a combination of 3 commits.
+# This is a combination of 2 commits.
+Switched to branch 'to-be-rebased'
+Deleted branch squash-fixup (was 74d534c).
+ok 35 - squash and fixup generate correct log messages
 
 expecting success: 
-	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
+	git checkout -b skip-comments E &&
+	base=$(git rev-parse HEAD~4) &&
+	set_fake_editor &&
+	FAKE_COMMIT_AMEND="ONCE" FAKE_LINES="# 1 # squash 2 # squash 3 # squash 4 #" \
+		EXPECT_HEADER_COUNT=4 \
+		git rebase -i $base &&
+	test $base = $(git rev-parse HEAD^) &&
+	test 1 = $(git show | grep ONCE | wc -l) &&
+	git checkout @{-1} &&
+	git branch -D skip-comments
 
-cannot chmod +x 'symlink'
-cannot chmod -x 'symlink'
-ok 45 - all statuses changed in folder if . is given
+Switched to a new branch 'skip-comments'
+rebase -i script before editing:
+pick 313fe96 B
+pick d0f65f2 C
+pick 0547e3f D
+pick 8f99a4f E
+
+rebase -i script after editing:
+# comment
+pick 313fe96 B
+# comment
+squash d0f65f2 C
+# comment
+squash 0547e3f D
+# comment
+squash 8f99a4f E
+# comment
+Rebasing (2/4)
Rebasing (3/4)
Rebasing (4/4)
[detached HEAD f397ac4] B
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:14:13 2005 -0700
+ 3 files changed, 3 insertions(+), 1 deletion(-)
+ create mode 100644 file2
+ create mode 100644 file3
+Successfully rebased and updated refs/heads/skip-comments.
+Switched to branch 'to-be-rebased'
+Deleted branch skip-comments (was f397ac4).
+ok 36 - squash ignores comments
 
-# passed all 45 test(s)
-1..45
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t3703-add-magic-pathspec.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3703-add-magic-pathspec/.git/
 expecting success: 
-	mkdir sub anothersub &&
-	: >sub/foo &&
-	: >anothersub/foo
+	git checkout -b skip-blank-lines E &&
+	base=$(git rev-parse HEAD~4) &&
+	set_fake_editor &&
+	FAKE_COMMIT_AMEND="ONCE" FAKE_LINES="> 1 > squash 2 > squash 3 > squash 4 >" \
+		EXPECT_HEADER_COUNT=4 \
+		git rebase -i $base &&
+	test $base = $(git rev-parse HEAD^) &&
+	test 1 = $(git show | grep ONCE | wc -l) &&
+	git checkout @{-1} &&
+	git branch -D skip-blank-lines
 
-ok 1 - setup
+Switched to a new branch 'skip-blank-lines'
+rebase -i script before editing:
+pick 313fe96 B
+pick d0f65f2 C
+pick 0547e3f D
+pick 8f99a4f E
 
-expecting success: 
-	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
+rebase -i script after editing:
 
-ok 2 - add :/
+pick 313fe96 B
 
-expecting success: 
-	(cd sub && git add -n :/anothersub >actual) &&
-	test_cmp expected sub/actual
+squash d0f65f2 C
 
-ok 3 - add :/anothersub
+squash 0547e3f D
 
-expecting success: 
-	(cd sub && test_must_fail git add -n :/non-existent)
+squash 8f99a4f E
 
-fatal: pathspec ':/non-existent' did not match any files
-ok 4 - add :/non-existent
+Rebasing (2/4)
Rebasing (3/4)
Rebasing (4/4)
[detached HEAD f397ac4] B
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:14:13 2005 -0700
+ 3 files changed, 3 insertions(+), 1 deletion(-)
+ create mode 100644 file2
+ create mode 100644 file3
+Successfully rebased and updated refs/heads/skip-blank-lines.
+Switched to branch 'to-be-rebased'
+Deleted branch skip-blank-lines (was f397ac4).
+ok 37 - squash ignores blank lines
 
 expecting success: 
-	: >":(icase)ha" &&
-	test_must_fail git add -n ":(icase)ha" &&
-	git add -n "./:(icase)ha"
+	git checkout -b squash-works no-conflict-branch &&
+	one=$(git rev-parse HEAD~3) &&
+	set_fake_editor &&
+	FAKE_LINES="1 s 3 2" EXPECT_HEADER_COUNT=2 \
+		git rebase -i HEAD~3 &&
+	test $one = $(git rev-parse HEAD~2)
 
-fatal: pathspec ':(icase)ha' did not match any files
-add ':(icase)ha'
-ok 5 - a file with the same (long) magic name exists
+Switched to a new branch 'squash-works'
+rebase -i script before editing:
+pick 265b89e K
+pick 6b0f5e6 L
+pick 3389558 M
+
+rebase -i script after editing:
+pick 265b89e K
+s 3389558 M
+pick 6b0f5e6 L
+Rebasing (2/3)
[detached HEAD fb01347] K
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:27:13 2005 -0700
+ 2 files changed, 2 insertions(+)
+ create mode 100644 fileK
+ create mode 100644 fileM
+Rebasing (3/3)
Successfully rebased and updated refs/heads/squash-works.
+ok 38 - squash works as expected
 
 expecting success: 
-	: >":/bar" &&
-	test_must_fail git add -n :/bar &&
-	git add -n "./:/bar"
+	git checkout -b interrupted-squash conflict-branch &&
+	one=$(git rev-parse HEAD~3) &&
+	set_fake_editor &&
+	test_must_fail env FAKE_LINES="1 squash 3 2" git rebase -i HEAD~3 &&
+	test_write_lines one two four > conflict &&
+	git add conflict &&
+	test_must_fail git rebase --continue &&
+	echo resolved > conflict &&
+	git add conflict &&
+	git rebase --continue &&
+	test $one = $(git rev-parse HEAD~2)
 
-fatal: pathspec ':/bar' did not match any files
-add ':/bar'
-ok 6 - a file with the same (short) magic name exists
+Switched to a new branch 'interrupted-squash'
+rebase -i script before editing:
+pick 766a798 two
+pick 1eadf03 three
+pick f91a2b3 four
+
+rebase -i script after editing:
+pick 766a798 two
+squash f91a2b3 four
+pick 1eadf03 three
+Rebasing (2/3)
Auto-merging conflict
+CONFLICT (content): Merge conflict in conflict
+error: could not apply f91a2b3... four
+Resolve all conflicts manually, mark them as resolved with
+"git add/rm <conflicted_files>", then run "git rebase --continue".
+You can instead skip this commit: run "git rebase --skip".
+To abort and get back to the state before "git rebase", run "git rebase --abort".
+Could not apply f91a2b3... four
+[detached HEAD d1cbea4] two
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:23:13 2005 -0700
+ 1 file changed, 2 insertions(+)
+Rebasing (3/3)
Auto-merging conflict
+CONFLICT (content): Merge conflict in conflict
+error: could not apply 1eadf03... three
+Resolve all conflicts manually, mark them as resolved with
+"git add/rm <conflicted_files>", then run "git rebase --continue".
+You can instead skip this commit: run "git rebase --skip".
+To abort and get back to the state before "git rebase", run "git rebase --abort".
+Could not apply 1eadf03... three
+[detached HEAD 634f347] three
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+Successfully rebased and updated refs/heads/interrupted-squash.
+ok 39 - interrupted squash works as expected
 
-# passed all 6 test(s)
-1..6
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t3427-rebase-subtree.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3427-rebase-subtree/.git/
 expecting success: 
-	test_commit README &&
-	mkdir files &&
-	(
-		cd files &&
-		git init &&
-		test_commit master1 &&
-		test_commit master2 &&
-		test_commit master3
-	) &&
-	git fetch files master &&
-	git branch files-master FETCH_HEAD &&
-	git read-tree --prefix=files_subtree files-master &&
-	git checkout -- files_subtree &&
-	tree=$(git write-tree) &&
-	head=$(git rev-parse HEAD) &&
-	rev=$(git rev-parse --verify files-master^0) &&
-	commit=$(git commit-tree -p $head -p $rev -m "Add subproject master" $tree) &&
-	git update-ref HEAD $commit &&
-	(
-		cd files_subtree &&
-		test_commit master4
-	) &&
-	test_commit files_subtree/master5
+	git checkout -b interrupted-squash2 conflict-branch &&
+	one=$(git rev-parse HEAD~3) &&
+	set_fake_editor &&
+	test_must_fail env FAKE_LINES="3 squash 1 2" git rebase -i HEAD~3 &&
+	test_write_lines one four > conflict &&
+	git add conflict &&
+	test_must_fail git rebase --continue &&
+	test_write_lines one two four > conflict &&
+	git add conflict &&
+	test_must_fail git rebase --continue &&
+	echo resolved > conflict &&
+	git add conflict &&
+	git rebase --continue &&
+	test $one = $(git rev-parse HEAD~2)
 
-[master (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/git-2.20.1/t/trash directory.t3427-rebase-subtree/files/.git/
-[master (root-commit) ba4017d] master1
+Switched to a new branch 'interrupted-squash2'
+rebase -i script before editing:
+pick 766a798 two
+pick 1eadf03 three
+pick f91a2b3 four
+
+rebase -i script after editing:
+pick f91a2b3 four
+squash 766a798 two
+pick 1eadf03 three
+Rebasing (1/3)
Auto-merging conflict
+CONFLICT (content): Merge conflict in conflict
+error: could not apply f91a2b3... four
+Resolve all conflicts manually, mark them as resolved with
+"git add/rm <conflicted_files>", then run "git rebase --continue".
+You can instead skip this commit: run "git rebase --skip".
+To abort and get back to the state before "git rebase", run "git rebase --abort".
+Could not apply f91a2b3... four
+[detached HEAD d5ff450] four
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 master1.t
-[master eb398b9] master2
+Rebasing (2/3)
Auto-merging conflict
+CONFLICT (content): Merge conflict in conflict
+error: could not apply 766a798... two
+Resolve all conflicts manually, mark them as resolved with
+"git add/rm <conflicted_files>", then run "git rebase --continue".
+You can instead skip this commit: run "git rebase --skip".
+To abort and get back to the state before "git rebase", run "git rebase --abort".
+Could not apply 766a798... two
+[detached HEAD ea11a0c] four
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 master2.t
-[master 138d8fa] master3
+ Date: Thu Apr 7 15:25:13 2005 -0700
+ 1 file changed, 2 insertions(+)
+Rebasing (3/3)
Auto-merging conflict
+CONFLICT (content): Merge conflict in conflict
+error: could not apply 1eadf03... three
+Resolve all conflicts manually, mark them as resolved with
+"git add/rm <conflicted_files>", then run "git rebase --continue".
+You can instead skip this commit: run "git rebase --skip".
+To abort and get back to the state before "git rebase", run "git rebase --abort".
+Could not apply 1eadf03... three
+[detached HEAD f26b32e] three
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 master3.t
-warning: no common commits
-From files
- * branch            master     -> FETCH_HEAD
-[master 8aaa705] master4
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+Successfully rebased and updated refs/heads/interrupted-squash2.
+ok 40 - interrupted squash works as expected (case 2)
+
+expecting success: 
+	echo unrelated > file7 &&
+	git add file7 &&
+	test_tick &&
+	git commit -m "unrelated change" &&
+	parent=$(git rev-parse HEAD^) &&
+	test_tick &&
+	set_fake_editor &&
+	FAKE_LINES="edit 1" git rebase -i HEAD^ &&
+	echo edited > file7 &&
+	git add file7 &&
+	FAKE_COMMIT_MESSAGE="chouette!" git rebase --continue &&
+	test edited = $(git show HEAD:file7) &&
+	git show HEAD | grep chouette &&
+	test $parent = $(git rev-parse HEAD^)
+
+[interrupted-squash2 1c8cc7a] unrelated change
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 files_subtree/master4.t
-[master 8bb50ad] files_subtree/master5
+ create mode 100644 file7
+rebase -i script before editing:
+pick 1c8cc7a unrelated change
+
+rebase -i script after editing:
+edit 1c8cc7a unrelated change
+Rebasing (1/1)
Stopped at 1c8cc7a...  unrelated change
+You can amend the commit now, with
+
+  git commit --amend 
+
+Once you are satisfied with your changes, run
+
+  git rebase --continue
+[detached HEAD d64edb7] chouette!
  Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:49:13 2005 -0700
  1 file changed, 1 insertion(+)
- create mode 100644 files_subtree/master5.t
-ok 1 - setup
+ create mode 100644 file7
+Successfully rebased and updated refs/heads/interrupted-squash2.
+    chouette!
+ok 41 - --continue tries to commit, even for "edit"
 
-checking known breakage: 
-	reset_rebase &&
-	git checkout -b rebase-preserve-merges-4 master &&
-	git filter-branch --prune-empty -f --subdirectory-filter files_subtree &&
-	git commit -m "Empty commit" --allow-empty &&
-	git rebase -Xsubtree=files_subtree --preserve-merges --onto files-master master &&
-	verbose test "$(commit_message HEAD~)" = "files_subtree/master4"
+expecting success: 
+	old=$(git rev-parse HEAD) &&
+	test_tick &&
+	set_fake_editor &&
+	FAKE_LINES="edit 1" git rebase -i HEAD^ &&
+	echo "edited again" > file7 &&
+	git add file7 &&
+	test_must_fail env FAKE_COMMIT_MESSAGE=" " git rebase --continue &&
+	test $old = $(git rev-parse HEAD) &&
+	git rebase --abort
 
-fatal: No rebase in progress?
-HEAD is now at 8bb50ad files_subtree/master5
-Switched to a new branch 'rebase-preserve-merges-4'
-
Rewrite 857c354c14dec65ebdcbe167a352a0809dfe91f4 (1/3) (0 seconds passed, remaining 0 predicted)    
Rewrite 8aaa705aa976a6676d7a4f353323a6c49c23b5a2 (2/3) (1 seconds passed, remaining 0 predicted)    
Rewrite 8bb50adc9630aa0deade7689343795f582e5d715 (2/3) (1 seconds passed, remaining 0 predicted)    
-Ref 'refs/heads/rebase-preserve-merges-4' was rewritten
-[rebase-preserve-merges-4 6ceeae2] Empty commit
- Author: A U Thor <author@example.com>
-Rebasing (1/1)
Successfully rebased and updated refs/heads/rebase-preserve-merges-4.
-command failed:  'test' 'master2' '=' 'files_subtree/master4'
-not ok 2 - Rebase -Xsubtree --preserve-merges --onto commit 4 # TODO known breakage
+rebase -i script before editing:
+pick d64edb7 chouette!
 
-checking known breakage: 
-	reset_rebase &&
-	git checkout -b rebase-preserve-merges-5 master &&
-	git filter-branch --prune-empty -f --subdirectory-filter files_subtree &&
-	git commit -m "Empty commit" --allow-empty &&
-	git rebase -Xsubtree=files_subtree --preserve-merges --onto files-master master &&
-	verbose test "$(commit_message HEAD)" = "files_subtree/master5"
+rebase -i script after editing:
+edit d64edb7 chouette!
+Rebasing (1/1)
Stopped at d64edb7...  chouette!
+You can amend the commit now, with
 
-fatal: No rebase in progress?
-HEAD is now at 138d8fa master3
-Switched to a new branch 'rebase-preserve-merges-5'
-
Rewrite 857c354c14dec65ebdcbe167a352a0809dfe91f4 (1/3) (0 seconds passed, remaining 0 predicted)    
Rewrite 8aaa705aa976a6676d7a4f353323a6c49c23b5a2 (2/3) (0 seconds passed, remaining 0 predicted)    
Rewrite 8bb50adc9630aa0deade7689343795f582e5d715 (3/3) (0 seconds passed, remaining 0 predicted)    
-Ref 'refs/heads/rebase-preserve-merges-5' was rewritten
-[rebase-preserve-merges-5 6ceeae2] Empty commit
- Author: A U Thor <author@example.com>
-Rebasing (1/1)
Successfully rebased and updated refs/heads/rebase-preserve-merges-5.
-command failed:  'test' 'master3' '=' 'files_subtree/master5'
-not ok 3 - Rebase -Xsubtree --preserve-merges --onto commit 5 # TODO known breakage
+  git commit --amend 
 
-checking known breakage: 
-	reset_rebase &&
-	git checkout -b rebase-keep-empty-4 master &&
-	git filter-branch --prune-empty -f --subdirectory-filter files_subtree &&
-	git commit -m "Empty commit" --allow-empty &&
-	git rebase -Xsubtree=files_subtree --keep-empty --preserve-merges --onto files-master master &&
-	verbose test "$(commit_message HEAD~2)" = "files_subtree/master4"
+Once you are satisfied with your changes, run
 
-fatal: No rebase in progress?
-HEAD is now at 138d8fa master3
-Switched to a new branch 'rebase-keep-empty-4'
-
Rewrite 857c354c14dec65ebdcbe167a352a0809dfe91f4 (1/3) (0 seconds passed, remaining 0 predicted)    
Rewrite 8aaa705aa976a6676d7a4f353323a6c49c23b5a2 (2/3) (0 seconds passed, remaining 0 predicted)    
Rewrite 8bb50adc9630aa0deade7689343795f582e5d715 (3/3) (0 seconds passed, remaining 0 predicted)    
-Ref 'refs/heads/rebase-keep-empty-4' was rewritten
-[rebase-keep-empty-4 6ceeae2] Empty commit
- Author: A U Thor <author@example.com>
-Rebasing (1/1)
Successfully rebased and updated refs/heads/rebase-keep-empty-4.
-command failed:  'test' 'master1' '=' 'files_subtree/master4'
-not ok 4 - Rebase -Xsubtree --keep-empty --preserve-merges --onto commit 4 # TODO known breakage
+  git rebase --continue
+Aborting commit due to empty commit message.
+error: could not commit staged changes.
+ok 42 - aborted --continue does not squash commits after "edit"
 
-checking known breakage: 
-	reset_rebase &&
-	git checkout -b rebase-keep-empty-5 master &&
-	git filter-branch --prune-empty -f --subdirectory-filter files_subtree &&
-	git commit -m "Empty commit" --allow-empty &&
-	git rebase -Xsubtree=files_subtree --keep-empty --preserve-merges --onto files-master master &&
-	verbose test "$(commit_message HEAD~)" = "files_subtree/master5"
+expecting success: 
+	test_tick &&
+	set_fake_editor &&
+	FAKE_LINES="edit 1" git rebase -i HEAD^ &&
+	echo "edited again" > file7 &&
+	git add file7 &&
+	FAKE_COMMIT_MESSAGE="edited file7 again" git commit &&
+	echo "and again" > file7 &&
+	git add file7 &&
+	test_tick &&
+	test_must_fail env FAKE_COMMIT_MESSAGE="and again" git rebase --continue &&
+	git rebase --abort
 
-fatal: No rebase in progress?
-HEAD is now at 138d8fa master3
-Switched to a new branch 'rebase-keep-empty-5'
-
Rewrite 857c354c14dec65ebdcbe167a352a0809dfe91f4 (1/3) (0 seconds passed, remaining 0 predicted)    
Rewrite 8aaa705aa976a6676d7a4f353323a6c49c23b5a2 (2/3) (0 seconds passed, remaining 0 predicted)    
Rewrite 8bb50adc9630aa0deade7689343795f582e5d715 (3/3) (0 seconds passed, remaining 0 predicted)    
-Ref 'refs/heads/rebase-keep-empty-5' was rewritten
-[rebase-keep-empty-5 6ceeae2] Empty commit
- Author: A U Thor <author@example.com>
-Rebasing (1/1)
Successfully rebased and updated refs/heads/rebase-keep-empty-5.
-command failed:  'test' 'master2' '=' 'files_subtree/master5'
-not ok 5 - Rebase -Xsubtree --keep-empty --preserve-merges --onto commit 5 # TODO known breakage
+rebase -i script before editing:
+pick d64edb7 chouette!
 
-checking known breakage: 
-	reset_rebase &&
-	git checkout -b rebase-keep-empty-empty master &&
-	git filter-branch --prune-empty -f --subdirectory-filter files_subtree &&
-	git commit -m "Empty commit" --allow-empty &&
-	git rebase -Xsubtree=files_subtree --keep-empty --preserve-merges --onto files-master master &&
-	verbose test "$(commit_message HEAD)" = "Empty commit"
+rebase -i script after editing:
+edit d64edb7 chouette!
+Rebasing (1/1)
Stopped at d64edb7...  chouette!
+You can amend the commit now, with
 
-fatal: No rebase in progress?
-HEAD is now at 138d8fa master3
-Switched to a new branch 'rebase-keep-empty-empty'
-
Rewrite 857c354c14dec65ebdcbe167a352a0809dfe91f4 (1/3) (0 seconds passed, remaining 0 predicted)    
Rewrite 8aaa705aa976a6676d7a4f353323a6c49c23b5a2 (2/3) (0 seconds passed, remaining 0 predicted)    
Rewrite 8bb50adc9630aa0deade7689343795f582e5d715 (3/3) (0 seconds passed, remaining 0 predicted)    
-Ref 'refs/heads/rebase-keep-empty-empty' was rewritten
-[rebase-keep-empty-empty 6ceeae2] Empty commit
- Author: A U Thor <author@example.com>
-Rebasing (1/1)
Successfully rebased and updated refs/heads/rebase-keep-empty-empty.
-command failed:  'test' 'master3' '=' 'Empty commit'
-not ok 6 - Rebase -Xsubtree --keep-empty --preserve-merges --onto empty commit # TODO known breakage
+  git commit --amend 
 
-checking known breakage: 
-	reset_rebase &&
-	git checkout -b rebase-onto-4 master &&
-	git filter-branch --prune-empty -f --subdirectory-filter files_subtree &&
-	git commit -m "Empty commit" --allow-empty &&
-	git rebase -Xsubtree=files_subtree --onto files-master master &&
-	verbose test "$(commit_message HEAD~2)" = "files_subtree/master4"
+Once you are satisfied with your changes, run
 
-fatal: No rebase in progress?
-HEAD is now at 138d8fa master3
-Switched to a new branch 'rebase-onto-4'
-
Rewrite 857c354c14dec65ebdcbe167a352a0809dfe91f4 (1/3) (0 seconds passed, remaining 0 predicted)    
Rewrite 8aaa705aa976a6676d7a4f353323a6c49c23b5a2 (2/3) (0 seconds passed, remaining 0 predicted)    
Rewrite 8bb50adc9630aa0deade7689343795f582e5d715 (3/3) (0 seconds passed, remaining 0 predicted)    
-Ref 'refs/heads/rebase-onto-4' was rewritten
-[rebase-onto-4 6ceeae2] Empty commit
- Author: A U Thor <author@example.com>
-First, rewinding head to replay your work on top of it...
-Merging files-master with HEAD~3
-Merging:
-138d8fa master3
-c2298a8 Add subproject master
-found 0 common ancestors:
-Already applied: 0001 Add subproject master
-Merging files-master with HEAD~2
-Merging:
-138d8fa master3
-ffbb8e9 master4
-found 1 common ancestor:
-c2298a8 Add subproject master
-[detached HEAD 5f90a88] master4
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:14:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 master4.t
-Committed: 0002 master4
-Merging files-master with HEAD~1
-Merging:
-5f90a88 master4
-1059aa6 files_subtree/master5
-found 1 common ancestor:
-ffbb8e9 master4
-[detached HEAD c64768c] files_subtree/master5
+  git rebase --continue
+[detached HEAD 53dfc25] edited file7 again
  Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:14:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 master5.t
-Committed: 0003 files_subtree/master5
-Merging files-master with HEAD~0
-Merging:
-c64768c files_subtree/master5
-6ceeae2 Empty commit
-found 1 common ancestor:
-1059aa6 files_subtree/master5
-Already up to date!
-Already applied: 0004 Empty commit
-All done.
-command failed:  'test' 'master3' '=' 'files_subtree/master4'
-not ok 7 - Rebase -Xsubtree --onto commit 4 # TODO known breakage
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+error: 
+You have uncommitted changes in your working tree. Please, commit them
+first and then run 'git rebase --continue' again.
+ok 43 - auto-amend only edited commits after "edit"
 
-checking known breakage: 
-	reset_rebase &&
-	git checkout -b rebase-onto-5 master &&
-	git filter-branch --prune-empty -f --subdirectory-filter files_subtree &&
-	git commit -m "Empty commit" --allow-empty &&
-	git rebase -Xsubtree=files_subtree --onto files-master master &&
-	verbose test "$(commit_message HEAD~)" = "files_subtree/master5"
-
-fatal: No rebase in progress?
-HEAD is now at c64768c files_subtree/master5
-Switched to a new branch 'rebase-onto-5'
-
Rewrite 857c354c14dec65ebdcbe167a352a0809dfe91f4 (1/3) (0 seconds passed, remaining 0 predicted)    
Rewrite 8aaa705aa976a6676d7a4f353323a6c49c23b5a2 (2/3) (0 seconds passed, remaining 0 predicted)    
Rewrite 8bb50adc9630aa0deade7689343795f582e5d715 (3/3) (0 seconds passed, remaining 0 predicted)    
-Ref 'refs/heads/rebase-onto-5' was rewritten
-[rebase-onto-5 6ceeae2] Empty commit
- Author: A U Thor <author@example.com>
-First, rewinding head to replay your work on top of it...
-Merging files-master with HEAD~3
-Merging:
-138d8fa master3
-c2298a8 Add subproject master
-found 0 common ancestors:
-Already applied: 0001 Add subproject master
-Merging files-master with HEAD~2
-Merging:
-138d8fa master3
-ffbb8e9 master4
-found 1 common ancestor:
-c2298a8 Add subproject master
-[detached HEAD 5f90a88] master4
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:14:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 master4.t
-Committed: 0002 master4
-Merging files-master with HEAD~1
-Merging:
-5f90a88 master4
-1059aa6 files_subtree/master5
-found 1 common ancestor:
-ffbb8e9 master4
-[detached HEAD c64768c] files_subtree/master5
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:14:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 master5.t
-Committed: 0003 files_subtree/master5
-Merging files-master with HEAD~0
-Merging:
-c64768c files_subtree/master5
-6ceeae2 Empty commit
-found 1 common ancestor:
-1059aa6 files_subtree/master5
-Already up to date!
-Already applied: 0004 Empty commit
-All done.
-command failed:  'test' 'master4' '=' 'files_subtree/master5'
-not ok 8 - Rebase -Xsubtree --onto commit 5 # TODO known breakage
-
-checking known breakage: 
-	reset_rebase &&
-	git checkout -b rebase-onto-empty master &&
-	git filter-branch --prune-empty -f --subdirectory-filter files_subtree &&
-	git commit -m "Empty commit" --allow-empty &&
-	git rebase -Xsubtree=files_subtree --onto files-master master &&
-	verbose test "$(commit_message HEAD)" = "Empty commit"
-
-fatal: No rebase in progress?
-HEAD is now at c64768c files_subtree/master5
-Switched to a new branch 'rebase-onto-empty'
-
Rewrite 857c354c14dec65ebdcbe167a352a0809dfe91f4 (1/3) (0 seconds passed, remaining 0 predicted)    
Rewrite 8aaa705aa976a6676d7a4f353323a6c49c23b5a2 (2/3) (0 seconds passed, remaining 0 predicted)    
Rewrite 8bb50adc9630aa0deade7689343795f582e5d715 (3/3) (0 seconds passed, remaining 0 predicted)    
-Ref 'refs/heads/rebase-onto-empty' was rewritten
-[rebase-onto-empty 6ceeae2] Empty commit
- Author: A U Thor <author@example.com>
-First, rewinding head to replay your work on top of it...
-Merging files-master with HEAD~3
-Merging:
-138d8fa master3
-c2298a8 Add subproject master
-found 0 common ancestors:
-Already applied: 0001 Add subproject master
-Merging files-master with HEAD~2
-Merging:
-138d8fa master3
-ffbb8e9 master4
-found 1 common ancestor:
-c2298a8 Add subproject master
-[detached HEAD 5f90a88] master4
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:14:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 master4.t
-Committed: 0002 master4
-Merging files-master with HEAD~1
-Merging:
-5f90a88 master4
-1059aa6 files_subtree/master5
-found 1 common ancestor:
-ffbb8e9 master4
-[detached HEAD c64768c] files_subtree/master5
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:14:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 master5.t
-Committed: 0003 files_subtree/master5
-Merging files-master with HEAD~0
-Merging:
-c64768c files_subtree/master5
-6ceeae2 Empty commit
-found 1 common ancestor:
-1059aa6 files_subtree/master5
-Already up to date!
-Already applied: 0004 Empty commit
-All done.
-command failed:  'test' 'files_subtree/master5' '=' 'Empty commit'
-not ok 9 - Rebase -Xsubtree --onto empty commit # TODO known breakage
-
-# still have 8 known breakage(s)
-# passed all remaining 1 test(s)
-1..9
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t3800-mktag.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3800-mktag/.git/
-expecting success: 
-	echo Hello >A &&
-	git update-index --add A &&
-	git commit -m "Initial commit" &&
-	head=$(git rev-parse --verify HEAD)
-
-[master (root-commit) 0f7f29a] Initial commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A
-ok 1 - setup
-
-expecting success: 
-		( test_must_fail git mktag <tag.sig 2>message ) &&
-		grep "$expect" message
-	
-error: wanna fool me ? you obviously got the size wrong !
-ok 2 - Tag object length check
-
-expecting success: 
-		( test_must_fail git mktag <tag.sig 2>message ) &&
-		grep "$expect" message
-	
-error: char0: does not start with "object "
-ok 3 - "object" line label check
-
-expecting success: 
-		( test_must_fail git mktag <tag.sig 2>message ) &&
-		grep "$expect" message
-	
-error: char7: could not get SHA1 hash
-ok 4 - "object" line SHA1 check
-
-expecting success: 
-		( test_must_fail git mktag <tag.sig 2>message ) &&
-		grep "$expect" message
-	
-error: char47: could not find "\ntype "
-ok 5 - "type" line label check
-
-expecting success: 
-		( test_must_fail git mktag <tag.sig 2>message ) &&
-		grep "$expect" message
-	
-error: char48: could not find next "\n"
-ok 6 - "type" line eol check
-
-expecting success: 
-		( test_must_fail git mktag <tag.sig 2>message ) &&
-		grep "$expect" message
-	
-error: char57: no "tag " found
-ok 7 - "tag" line label check #1
-
-expecting success: 
-		( test_must_fail git mktag <tag.sig 2>message ) &&
-		grep "$expect" message
-	
-error: char87: no "tag " found
-ok 8 - "tag" line label check #2
-
-expecting success: 
-		( test_must_fail git mktag <tag.sig 2>message ) &&
-		grep "$expect" message
-	
-error: char53: type too long
-ok 9 - "type" line type-name length check
-
-expecting success: 
-		( test_must_fail git mktag <tag.sig 2>message ) &&
-		grep "$expect" message
-	
-error: char7: could not verify object 779e9b33986b1c2670fff52c5067603117b3e895
-ok 10 - verify object (SHA1/type) check
-
-expecting success: 
-		( test_must_fail git mktag <tag.sig 2>message ) &&
-		grep "$expect" message
-	
-error: char67: could not verify tag name
-ok 11 - verify tag-name check
-
-expecting success: 
-		( test_must_fail git mktag <tag.sig 2>message ) &&
-		grep "$expect" message
-	
-error: char70: could not find "tagger "
-ok 12 - "tagger" line label check #1
-
-expecting success: 
-		( test_must_fail git mktag <tag.sig 2>message ) &&
-		grep "$expect" message
-	
-error: char70: could not find "tagger "
-ok 13 - "tagger" line label check #2
-
-expecting success: 
-		( test_must_fail git mktag <tag.sig 2>message ) &&
-		grep "$expect" message
-	
-error: char77: missing tagger name
-ok 14 - disallow missing tag author name
-
-expecting success: 
-		( test_must_fail git mktag <tag.sig 2>message ) &&
-		grep "$expect" message
-	
-error: char77: malformed tagger field
-ok 15 - disallow malformed tagger
-
-expecting success: git mktag <tag.sig >.git/refs/tags/mytag 2>message
-ok 16 - allow empty tag email
-
-expecting success: 
-		( test_must_fail git mktag <tag.sig 2>message ) &&
-		grep "$expect" message
-	
-error: char77: malformed tagger field
-ok 17 - disallow spaces in tag email
-
-expecting success: 
-		( test_must_fail git mktag <tag.sig 2>message ) &&
-		grep "$expect" message
-	
-error: char107: missing tag timestamp
-ok 18 - disallow missing tag timestamp
-
-expecting success: 
-		( test_must_fail git mktag <tag.sig 2>message ) &&
-		grep "$expect" message
-	
-error: char107: missing tag timestamp
-ok 19 - detect invalid tag timestamp1
-
-expecting success: 
-		( test_must_fail git mktag <tag.sig 2>message ) &&
-		grep "$expect" message
-	
-error: char111: malformed tag timestamp
-ok 20 - detect invalid tag timestamp2
-
-expecting success: 
-		( test_must_fail git mktag <tag.sig 2>message ) &&
-		grep "$expect" message
-	
-error: char118: malformed tag timezone
-ok 21 - detect invalid tag timezone1
-
-expecting success: 
-		( test_must_fail git mktag <tag.sig 2>message ) &&
-		grep "$expect" message
-	
-error: char118: malformed tag timezone
-ok 22 - detect invalid tag timezone2
-
-expecting success: 
-		( test_must_fail git mktag <tag.sig 2>message ) &&
-		grep "$expect" message
-	
-error: char118: malformed tag timezone
-ok 23 - detect invalid tag timezone3
-
-expecting success: 
-		( test_must_fail git mktag <tag.sig 2>message ) &&
-		grep "$expect" message
-	
-error: char124: trailing garbage in tag header
-ok 24 - detect invalid header entry
-
-expecting success: git mktag <tag.sig >.git/refs/tags/mytag 2>message
-ok 25 - create valid tag
-
-expecting success: git tag -l | grep mytag
-mytag
-ok 26 - check mytag
-
-# passed all 26 test(s)
-1..26
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t3303-notes-subtrees.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3303-notes-subtrees/.git/
-expecting success: 
-
-	(
-		nr=0 &&
-		while [ $nr -lt $number_of_commits ]; do
-			nr=$(($nr+1)) &&
-			test_tick &&
-			cat <<INPUT_END
-commit refs/heads/master
-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: test_sha1_based "s|^..|&/|"
-ok 2 - test notes in 2/38-fanout
-
-expecting success: verify_notes
-ok 3 - verify notes in 2/38-fanout
-
-expecting success: test_sha1_based "s|^\(..\)\(..\)|\1/\2/|"
-ok 4 - test notes in 2/2/36-fanout
-
-expecting success: verify_notes
-ok 5 - verify notes in 2/2/36-fanout
-
-expecting success: test_sha1_based "s|^\(..\)\(..\)\(..\)|\1/\2/\3/|"
-ok 6 - test notes in 2/2/2/34-fanout
-
-expecting success: verify_notes
-ok 7 - verify notes in 2/2/2/34-fanout
-
-expecting success: test_same_notes "s|^..|&/|" ""
-ok 8 - test same notes in no fanout and 2/38-fanout
-
-expecting success: verify_notes
-ok 9 - verify same notes in no fanout and 2/38-fanout
-
-expecting success: test_same_notes "s|^\(..\)\(..\)|\1/\2/|" ""
-ok 10 - test same notes in no fanout and 2/2/36-fanout
-
-expecting success: verify_notes
-ok 11 - verify same notes in no fanout and 2/2/36-fanout
-
-expecting success: test_same_notes "s|^\(..\)\(..\)|\1/\2/|" "s|^..|&/|"
-ok 12 - test same notes in 2/38-fanout and 2/2/36-fanout
-
-expecting success: verify_notes
-ok 13 - verify same notes in 2/38-fanout and 2/2/36-fanout
-
-expecting success: 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: verify_notes
-ok 15 - verify same notes in 2/2/2/34-fanout and 2/2/36-fanout
-
-expecting success: test_concatenated_notes "s|^..|&/|" ""
-ok 16 - test notes in no fanout concatenated with 2/38-fanout
-
-expecting success: verify_concatenated_notes
-ok 17 - verify notes in no fanout concatenated with 2/38-fanout
-
-expecting success: test_concatenated_notes "s|^\(..\)\(..\)|\1/\2/|" ""
-ok 18 - test notes in no fanout concatenated with 2/2/36-fanout
-
-expecting success: verify_concatenated_notes
-ok 19 - verify notes in no fanout concatenated with 2/2/36-fanout
-
-expecting success: test_concatenated_notes "s|^\(..\)\(..\)|\1/\2/|" "s|^..|&/|"
-ok 20 - test notes in 2/38-fanout concatenated with 2/2/36-fanout
-
-expecting success: verify_concatenated_notes
-ok 21 - verify notes in 2/38-fanout concatenated with 2/2/36-fanout
-
-expecting success: 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: 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/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t3902-quoted.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3902-quoted/.git/
-expecting success: 
-
-	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 b7c637f] Second
- Author: A U Thor <author@example.com>
- 11 files changed, 11 insertions(+), 11 deletions(-)
-ok 1 - setup
-
-expecting success: 
-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: 
-
-	git ls-files >current && test_cmp expect.quoted current
-
-
-ok 3 - check fully quoted output from ls-files
-
-expecting success: 
-
-	git diff --name-only >current &&
-	test_cmp expect.quoted current
-
-
-ok 4 - check fully quoted output from diff-files
-
-expecting success: 
-
-	git diff --name-only HEAD >current &&
-	test_cmp expect.quoted current
-
-
-ok 5 - check fully quoted output from diff-index
-
-expecting success: 
-
-	git diff --name-only HEAD^ HEAD >current &&
-	test_cmp expect.quoted current
-
-
-ok 6 - check fully quoted output from diff-tree
-
-expecting success: 
-
-	git ls-tree --name-only -r HEAD >current &&
-	test_cmp expect.quoted current
-
-
-ok 7 - check fully quoted output from ls-tree
-
-expecting success: 
-
-	git config --bool core.quotepath false
-
-
-ok 8 - setting core.quotepath
-
-expecting success: 
-
-	git ls-files >current && test_cmp expect.raw current
-
-
-ok 9 - check fully quoted output from ls-files
-
-expecting success: 
-
-	git diff --name-only >current &&
-	test_cmp expect.raw current
-
-
-ok 10 - check fully quoted output from diff-files
-
-expecting success: 
-
-	git diff --name-only HEAD >current &&
-	test_cmp expect.raw current
-
-
-ok 11 - check fully quoted output from diff-index
-
-expecting success: 
-
-	git diff --name-only HEAD^ HEAD >current &&
-	test_cmp expect.raw current
-
-
-ok 12 - check fully quoted output from diff-tree
-
-expecting success: 
-
-	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/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t3900-i18n-commit.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3900-i18n-commit/.git/
-expecting success: 
-	: >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: 
-	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: 
-	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: 
-	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_i18ngrep "did not conform" "$HOME"/stderr
-
-[master 0d05538] 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: 
-	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_i18ngrep "did not conform" "$HOME"/stderr
-
-[master 3972c02] à‚©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: 
-	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_i18ngrep "did not conform" "$HOME"/stderr
-
-[master eba9d20] 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: 
-	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_i18ngrep "did not conform" "$HOME"/stderr
-
-[master 993eb84] 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: 
-		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 1823c2c] ÄËÑÏÖ
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 8 - ISO8859-1 setup
-
-expecting success: 
-		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 ed6915a] ¤Ï¤ì¤Ò¤Û¤Õ
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 9 - eucJP setup
-
-expecting success: 
-		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 c3a9b19] $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: 
-		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: 
-		E=$(git cat-file commit eucJP | sed -ne "s/^encoding //p") &&
-		test "z$E" = "zeucJP"
-	
-ok 12 - check encoding header for eucJP
-
-expecting success: 
-		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: 
-	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: 
-	compare_with ISO8859-1 "$TEST_DIRECTORY"/t3900/1-UTF-8.txt
-
-ok 15 - ISO8859-1 should be shown in UTF-8 now
-
-expecting success: 
-		compare_with eucJP "$TEST_DIRECTORY"/t3900/2-UTF-8.txt
-	
-ok 16 - eucJP should be shown in UTF-8 now
-
-expecting success: 
-		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: 
-	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: 
-		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: 
-		git config i18n.commitencoding eucJP &&
-		compare_with eucJP "$TEST_DIRECTORY"/t3900/eucJP.txt
-	
-ok 20 - eucJP should be shown in itself now
-
-expecting success: 
-		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: 
-	git config i18n.logoutputencoding UTF-8
-
-ok 22 - config to tweak customization
-
-expecting success: 
-	compare_with ISO8859-1 "$TEST_DIRECTORY"/t3900/1-UTF-8.txt
-
-ok 23 - ISO8859-1 should be shown in UTF-8 now
-
-expecting success: 
-		compare_with eucJP "$TEST_DIRECTORY"/t3900/2-UTF-8.txt
-	
-ok 24 - eucJP should be shown in UTF-8 now
-
-expecting success: 
-		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: 
-			compare_with eucJP "$TEST_DIRECTORY"/t3900/eucJP.txt $ICONV
-		
-ok 26 - eucJP should be shown in eucJP now
-
-expecting success: 
-			compare_with ISO-2022-JP "$TEST_DIRECTORY"/t3900/eucJP.txt $ICONV
-		
-ok 27 - ISO-2022-JP should be shown in eucJP now
-
-expecting success: 
-			compare_with eucJP "$TEST_DIRECTORY"/t3900/ISO-2022-JP.txt $ICONV
-		
-ok 28 - eucJP should be shown in ISO-2022-JP now
-
-expecting success: 
-			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: 
-		compare_with "--encoding=none ISO8859-1" "$TEST_DIRECTORY"/t3900/ISO8859-1.txt
-	
-ok 30 - No conversion with ISO8859-1
-
-expecting success: 
-		compare_with "--encoding=none eucJP" "$TEST_DIRECTORY"/t3900/eucJP.txt
-	
-ok 31 - No conversion with eucJP
-
-expecting success: 
-		compare_with "--encoding=none ISO-2022-JP" "$TEST_DIRECTORY"/t3900/ISO-2022-JP.txt
-	
-ok 32 - No conversion with ISO-2022-JP
-
-expecting success: 
-		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 bfac9e6] $B$O$l$R$[$U(B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[eucJP-fixup 58aa9a7] intermediate commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 G
-[eucJP-fixup 879dc27] fixup! $B$O$l$R$[$U(B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Rebasing (2/3)
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.
-Rebasing (3/3)
Successfully rebased and updated refs/heads/eucJP-fixup.
-ok 33 - commit --fixup with eucJP encoding
-
-expecting success: 
-		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 af8c87c] $B$O$l$R$[$U(B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[ISO-2022-JP-squash 2b527e6] intermediate commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 G
-[ISO-2022-JP-squash 199410a] squash! $B$O$l$R$[$U(B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Rebasing (2/3)
[detached HEAD 5fe652f] $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
-
-# passed all 34 test(s)
-1..34
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t3420-rebase-autostash.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3420-rebase-autostash/.git/
-expecting success: 
-	echo hello-world >file0 &&
-	git add . &&
-	test_tick &&
-	git commit -m "initial commit" &&
-	git checkout -b feature-branch &&
-	echo another-hello >file1 &&
-	echo goodbye >file2 &&
-	git add . &&
-	test_tick &&
-	git commit -m "second commit" &&
-	echo final-goodbye >file3 &&
-	git add . &&
-	test_tick &&
-	git commit -m "third commit" &&
-	git checkout -b unrelated-onto-branch master &&
-	echo unrelated >file4 &&
-	git add . &&
-	test_tick &&
-	git commit -m "unrelated commit" &&
-	git checkout -b related-onto-branch master &&
-	echo conflicting-change >file2 &&
-	git add . &&
-	test_tick &&
-	git commit -m "related commit"
-
-[master (root-commit) bfa4f02] initial commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file0
-Switched to a new branch 'feature-branch'
-[feature-branch 6fe95e2] second commit
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 file1
- create mode 100644 file2
-[feature-branch 0c4d2f1] third commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file3
-Switched to a new branch 'unrelated-onto-branch'
-[unrelated-onto-branch 4aede2f] unrelated commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file4
-Switched to a new branch 'related-onto-branch'
-[related-onto-branch c57d250] related commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file2
-ok 1 - setup
-
-expecting success: 
-	test_config rebase.autostash true &&
-	git reset --hard &&
-	git checkout -b behind-feature-branch feature-branch~1 &&
-	test_when_finished git branch -D behind-feature-branch &&
-	echo dirty >>file1 &&
-	git rebase feature-branch &&
-	grep dirty file1 &&
-	git checkout feature-branch
-
-HEAD is now at c57d250 related commit
-Switched to a new branch 'behind-feature-branch'
-Created autostash: 9a740dd
-HEAD is now at 6fe95e2 second commit
-First, rewinding head to replay your work on top of it...
-Fast-forwarded behind-feature-branch to feature-branch.
-Applied autostash.
-dirty
-Switched to branch 'feature-branch'
-M	file1
-Deleted branch behind-feature-branch (was 0c4d2f1).
-ok 2 - rebase: fast-forward rebase
-
-expecting success: 
-	test_config rebase.autostash true &&
-	git reset --hard &&
-	git checkout -b same-feature-branch feature-branch &&
-	test_when_finished git branch -D same-feature-branch &&
-	echo dirty >>file1 &&
-	git rebase feature-branch &&
-	grep dirty file1 &&
-	git checkout feature-branch
-
-HEAD is now at 0c4d2f1 third commit
-Switched to a new branch 'same-feature-branch'
-Created autostash: 37616bd
-HEAD is now at 0c4d2f1 third commit
-Current branch same-feature-branch is up to date.
-Applied autostash.
-dirty
-Switched to branch 'feature-branch'
-M	file1
-Deleted branch same-feature-branch (was 0c4d2f1).
-ok 3 - rebase: noop rebase
-
-expecting success: 
-		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 4 - rebase: dirty worktree, --no-autostash
-
-expecting success: 
-		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 5 - rebase: dirty worktree, non-conflicting rebase
-
-expecting success: 
-		test_when_finished git branch -D rebased-feature-branch &&
-		suffix=${type#\ --} && suffix=${suffix:-am} &&
-		create_expected_success_$suffix &&
-		test_i18ncmp expected actual
-	
-Deleted branch rebased-feature-branch (was b607b14).
-ok 6 - rebase --autostash: check output
-
-expecting success: 
-		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: e9af673
-HEAD is now at 0c4d2f1 third commit
-First, rewinding head to replay your work on top of it...
-Applying: second commit
-Applying: third commit
-Applied autostash.
-unrelated
-dirty
-Switched to branch 'feature-branch'
-M	file3
-Deleted branch rebased-feature-branch (was b607b14).
-ok 7 - rebase: dirty index, non-conflicting rebase
-
-expecting success: 
-		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: cdca6ca
-HEAD is now at 0c4d2f1 third commit
-First, rewinding head to replay your work on top of it...
-Applying: second commit
-Using index info to reconstruct a base tree...
-Falling back to patching base and 3-way merge...
-Merging:
-c57d250 related commit
-virtual second commit
-found 1 common ancestor:
-virtual 4b825dc642cb6eb9a060e54bf8d69288fbee4904
-Auto-merging file2
-CONFLICT (add/add): Merge conflict in file2
-error: Failed to merge in the changes.
-hint: Use 'git am --show-current-patch' to see the failed patch
-Patch failed at 0001 second commit
-
-Resolve all conflicts manually, mark them as resolved with
-"git add/rm <conflicted_files>", then run "git rebase --continue".
-You can instead skip this commit: run "git rebase --skip".
-To abort and get back to the state before "git rebase", run "git rebase --abort".
-
-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 8 - rebase: conflicting rebase
-
-expecting success: 
-		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: cdca6ca
-HEAD is now at 0c4d2f1 third commit
-First, rewinding head to replay your work on top of it...
-Applying: second commit
-Using index info to reconstruct a base tree...
-Falling back to patching base and 3-way merge...
-Merging:
-c57d250 related commit
-virtual second commit
-found 1 common ancestor:
-virtual 4b825dc642cb6eb9a060e54bf8d69288fbee4904
-Auto-merging file2
-CONFLICT (add/add): Merge conflict in file2
-error: Failed to merge in the changes.
-hint: Use 'git am --show-current-patch' to see the failed patch
-Patch failed at 0001 second commit
-
-Resolve all conflicts manually, mark them as resolved with
-"git add/rm <conflicted_files>", then run "git rebase --continue".
-You can instead skip this commit: run "git rebase --skip".
-To abort and get back to the state before "git rebase", run "git rebase --abort".
-
-Applying: second commit
-Applying: third commit
-Applied autostash.
-dirty
-Switched to branch 'feature-branch'
-M	file3
-Deleted branch rebased-feature-branch (was 51f2c81).
-ok 9 - rebase: --continue
-
-expecting success: 
-		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: cdca6ca
-HEAD is now at 0c4d2f1 third commit
-First, rewinding head to replay your work on top of it...
-Applying: second commit
-Using index info to reconstruct a base tree...
-Falling back to patching base and 3-way merge...
-Merging:
-c57d250 related commit
-virtual second commit
-found 1 common ancestor:
-virtual 4b825dc642cb6eb9a060e54bf8d69288fbee4904
-Auto-merging file2
-CONFLICT (add/add): Merge conflict in file2
-error: Failed to merge in the changes.
-hint: Use 'git am --show-current-patch' to see the failed patch
-Patch failed at 0001 second commit
-
-Resolve all conflicts manually, mark them as resolved with
-"git add/rm <conflicted_files>", then run "git rebase --continue".
-You can instead skip this commit: run "git rebase --skip".
-To abort and get back to the state before "git rebase", run "git rebase --abort".
-
-Applying: third commit
-Applied autostash.
-dirty
-Switched to branch 'feature-branch'
-M	file3
-Deleted branch rebased-feature-branch (was fa02356).
-ok 10 - rebase: --skip
-
-expecting success: 
-		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: cdca6ca
-HEAD is now at 0c4d2f1 third commit
-First, rewinding head to replay your work on top of it...
-Applying: second commit
-Using index info to reconstruct a base tree...
-Falling back to patching base and 3-way merge...
-Merging:
-c57d250 related commit
-virtual second commit
-found 1 common ancestor:
-virtual 4b825dc642cb6eb9a060e54bf8d69288fbee4904
-Auto-merging file2
-CONFLICT (add/add): Merge conflict in file2
-error: Failed to merge in the changes.
-hint: Use 'git am --show-current-patch' to see the failed patch
-Patch failed at 0001 second commit
-
-Resolve all conflicts manually, mark them as resolved with
-"git add/rm <conflicted_files>", then run "git rebase --continue".
-You can instead skip this commit: run "git rebase --skip".
-To abort and get back to the state before "git rebase", run "git rebase --abort".
-
-Applied autostash.
-dirty
-Switched to branch 'feature-branch'
-M	file3
-Deleted branch rebased-feature-branch (was 0c4d2f1).
-ok 11 - rebase: --abort
-
-expecting success: 
-		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
-Merging:
-virtual Version stash was based on
-virtual Stashed changes
-found 1 common ancestor:
-virtual 28566cc718f43a597c158e8411c19d7048328a85
-On branch feature-branch
-Changes to be committed:
-  (use "git reset HEAD <file>..." to unstage)
-
-	new file:   file4
-
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-
-	actual
-	expected
-
-Dropped refs/stash@{0} (de4e47a31ead4744c6d223df2e4638effc5ff8b7)
-dirty
-ok 12 - rebase: non-conflicting rebase, conflicting stash
-
-expecting success: 
-		test_when_finished git branch -D rebased-feature-branch &&
-		suffix=${type#\ --} && suffix=${suffix:-am} &&
-		create_expected_failure_$suffix &&
-		test_i18ncmp expected actual
-	
-Deleted branch rebased-feature-branch (was b607b14).
-ok 13 - rebase: check output with conflicting stash
-
-expecting success: 
-		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 14 - rebase --merge: dirty worktree, --no-autostash
-
-expecting success: 
-		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 15 - rebase --merge: dirty worktree, non-conflicting rebase
-
-expecting success: 
-		test_when_finished git branch -D rebased-feature-branch &&
-		suffix=${type#\ --} && suffix=${suffix:-am} &&
-		create_expected_success_$suffix &&
-		test_i18ncmp expected actual
-	
-Deleted branch rebased-feature-branch (was b607b14).
-ok 16 - rebase --merge --autostash: check output
-
-expecting success: 
-		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: e9af673
-HEAD is now at 0c4d2f1 third commit
-First, rewinding head to replay your work on top of it...
-Merging unrelated-onto-branch with HEAD~1
-Merging:
-4aede2f unrelated commit
-6fe95e2 second commit
-found 1 common ancestor:
-bfa4f02 initial commit
-[detached HEAD 54abd5c] second commit
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:14:13 2005 -0700
- 2 files changed, 2 insertions(+)
- create mode 100644 file1
- create mode 100644 file2
-Committed: 0001 second commit
-Merging unrelated-onto-branch with HEAD~0
-Merging:
-54abd5c second commit
-0c4d2f1 third commit
-found 1 common ancestor:
-6fe95e2 second commit
-[detached HEAD b607b14] third commit
- 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
-Committed: 0002 third commit
-All done.
-Applied autostash.
-unrelated
-dirty
-Switched to branch 'feature-branch'
-M	file3
-Deleted branch rebased-feature-branch (was b607b14).
-ok 17 - rebase --merge: dirty index, non-conflicting rebase
-
-expecting success: 
-		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: cdca6ca
-HEAD is now at 0c4d2f1 third commit
-First, rewinding head to replay your work on top of it...
-Merging related-onto-branch with HEAD~1
-Merging:
-c57d250 related commit
-6fe95e2 second commit
-found 1 common ancestor:
-bfa4f02 initial commit
-Auto-merging file2
-CONFLICT (add/add): Merge conflict in file2
-
-Resolve all conflicts manually, mark them as resolved with
-"git add/rm <conflicted_files>", then run "git rebase --continue".
-You can instead skip this commit: run "git rebase --skip".
-To abort and get back to the state before "git rebase", run "git rebase --abort".
-
-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 18 - rebase --merge: conflicting rebase
-
-expecting success: 
-		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: cdca6ca
-HEAD is now at 0c4d2f1 third commit
-First, rewinding head to replay your work on top of it...
-Merging related-onto-branch with HEAD~1
-Merging:
-c57d250 related commit
-6fe95e2 second commit
-found 1 common ancestor:
-bfa4f02 initial commit
-Auto-merging file2
-CONFLICT (add/add): Merge conflict in file2
-
-Resolve all conflicts manually, mark them as resolved with
-"git add/rm <conflicted_files>", then run "git rebase --continue".
-You can instead skip this commit: run "git rebase --skip".
-To abort and get back to the state before "git rebase", run "git rebase --abort".
-
-[detached HEAD 62edf38] second commit
- 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 file1
-Committed: 0001 second commit
-Merging related-onto-branch with HEAD~0
-Merging:
-62edf38 second commit
-0c4d2f1 third commit
-found 1 common ancestor:
-6fe95e2 second commit
-[detached HEAD 51f2c81] third commit
- 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
-Committed: 0002 third commit
-All done.
-Applied autostash.
-dirty
-Switched to branch 'feature-branch'
-M	file3
-Deleted branch rebased-feature-branch (was 51f2c81).
-ok 19 - rebase --merge: --continue
-
-expecting success: 
-		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: cdca6ca
-HEAD is now at 0c4d2f1 third commit
-First, rewinding head to replay your work on top of it...
-Merging related-onto-branch with HEAD~1
-Merging:
-c57d250 related commit
-6fe95e2 second commit
-found 1 common ancestor:
-bfa4f02 initial commit
-Auto-merging file2
-CONFLICT (add/add): Merge conflict in file2
-
-Resolve all conflicts manually, mark them as resolved with
-"git add/rm <conflicted_files>", then run "git rebase --continue".
-You can instead skip this commit: run "git rebase --skip".
-To abort and get back to the state before "git rebase", run "git rebase --abort".
-
-Merging related-onto-branch with HEAD~0
-Merging:
-c57d250 related commit
-0c4d2f1 third commit
-found 1 common ancestor:
-6fe95e2 second commit
-[detached HEAD fa02356] third commit
- 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
-Committed: 0002 third commit
-All done.
-Applied autostash.
-dirty
-Switched to branch 'feature-branch'
-M	file3
-Deleted branch rebased-feature-branch (was fa02356).
-ok 20 - rebase --merge: --skip
-
-expecting success: 
-		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: cdca6ca
-HEAD is now at 0c4d2f1 third commit
-First, rewinding head to replay your work on top of it...
-Merging related-onto-branch with HEAD~1
-Merging:
-c57d250 related commit
-6fe95e2 second commit
-found 1 common ancestor:
-bfa4f02 initial commit
-Auto-merging file2
-CONFLICT (add/add): Merge conflict in file2
-
-Resolve all conflicts manually, mark them as resolved with
-"git add/rm <conflicted_files>", then run "git rebase --continue".
-You can instead skip this commit: run "git rebase --skip".
-To abort and get back to the state before "git rebase", run "git rebase --abort".
-
-Applied autostash.
-dirty
-Switched to branch 'feature-branch'
-M	file3
-Deleted branch rebased-feature-branch (was 0c4d2f1).
-ok 21 - rebase --merge: --abort
-
-expecting success: 
-		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
-Merging:
-virtual Version stash was based on
-virtual Stashed changes
-found 1 common ancestor:
-virtual 28566cc718f43a597c158e8411c19d7048328a85
-On branch feature-branch
-Changes to be committed:
-  (use "git reset HEAD <file>..." to unstage)
-
-	new file:   file4
-
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-
-	actual
-	expected
-
-Dropped refs/stash@{0} (de4e47a31ead4744c6d223df2e4638effc5ff8b7)
-dirty
-ok 22 - rebase --merge: non-conflicting rebase, conflicting stash
-
-expecting success: 
-		test_when_finished git branch -D rebased-feature-branch &&
-		suffix=${type#\ --} && suffix=${suffix:-am} &&
-		create_expected_failure_$suffix &&
-		test_i18ncmp expected actual
-	
-Deleted branch rebased-feature-branch (was b607b14).
-ok 23 - rebase --merge: check output with conflicting stash
-
-expecting success: 
-		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 24 - rebase --interactive: dirty worktree, --no-autostash
-
-expecting success: 
-		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 25 - rebase --interactive: dirty worktree, non-conflicting rebase
-
-expecting success: 
-		test_when_finished git branch -D rebased-feature-branch &&
-		suffix=${type#\ --} && suffix=${suffix:-am} &&
-		create_expected_success_$suffix &&
-		test_i18ncmp expected actual
-	
-Deleted branch rebased-feature-branch (was b607b14).
-ok 26 - rebase --interactive --autostash: check output
-
-expecting success: 
-		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: e9af673
-HEAD is now at 0c4d2f1 third commit
-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 27 - rebase --interactive: dirty index, non-conflicting rebase
-
-expecting success: 
-		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: cdca6ca
-HEAD is now at 0c4d2f1 third commit
-Rebasing (1/2)
Auto-merging file2
-CONFLICT (add/add): Merge conflict in file2
-error: could not apply 6fe95e2... second commit
-Resolve all conflicts manually, mark them as resolved with
-"git add/rm <conflicted_files>", then run "git rebase --continue".
-You can instead skip this commit: run "git rebase --skip".
-To abort and get back to the state before "git rebase", run "git rebase --abort".
-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 28 - rebase --interactive: conflicting rebase
-
-expecting success: 
-		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: cdca6ca
-HEAD is now at 0c4d2f1 third commit
-Rebasing (1/2)
Auto-merging file2
-CONFLICT (add/add): Merge conflict in file2
-error: could not apply 6fe95e2... second commit
-Resolve all conflicts manually, mark them as resolved with
-"git add/rm <conflicted_files>", then run "git rebase --continue".
-You can instead skip this commit: run "git rebase --skip".
-To abort and get back to the state before "git rebase", run "git rebase --abort".
-Could not apply 6fe95e2... second commit
-[detached HEAD 62edf38] second commit
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+), 1 deletion(-)
- create mode 100644 file1
-Rebasing (2/2)
Applied autostash.
-Successfully rebased and updated refs/heads/rebased-feature-branch.
-dirty
-Switched to branch 'feature-branch'
-M	file3
-Deleted branch rebased-feature-branch (was 51f2c81).
-ok 29 - rebase --interactive: --continue
-
-expecting success: 
-		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: cdca6ca
-HEAD is now at 0c4d2f1 third commit
-Rebasing (1/2)
Auto-merging file2
-CONFLICT (add/add): Merge conflict in file2
-error: could not apply 6fe95e2... second commit
-Resolve all conflicts manually, mark them as resolved with
-"git add/rm <conflicted_files>", then run "git rebase --continue".
-You can instead skip this commit: run "git rebase --skip".
-To abort and get back to the state before "git rebase", run "git rebase --abort".
-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 30 - rebase --interactive: --skip
-
-expecting success: 
-		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: cdca6ca
-HEAD is now at 0c4d2f1 third commit
-Rebasing (1/2)
Auto-merging file2
-CONFLICT (add/add): Merge conflict in file2
-error: could not apply 6fe95e2... second commit
-Resolve all conflicts manually, mark them as resolved with
-"git add/rm <conflicted_files>", then run "git rebase --continue".
-You can instead skip this commit: run "git rebase --skip".
-To abort and get back to the state before "git rebase", run "git rebase --abort".
-Could not apply 6fe95e2... second commit
-Applied autostash.
-dirty
-Switched to branch 'feature-branch'
-M	file3
-Deleted branch rebased-feature-branch (was 0c4d2f1).
-ok 31 - rebase --interactive: --abort
-
-expecting success: 
-		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
-Merging:
-virtual Version stash was based on
-virtual Stashed changes
-found 1 common ancestor:
-virtual 28566cc718f43a597c158e8411c19d7048328a85
-On branch feature-branch
-Changes to be committed:
-  (use "git reset HEAD <file>..." to unstage)
-
-	new file:   file4
-
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-
-	actual
-	expected
-
-Dropped refs/stash@{0} (de4e47a31ead4744c6d223df2e4638effc5ff8b7)
-dirty
-ok 32 - rebase --interactive: non-conflicting rebase, conflicting stash
-
-expecting success: 
-		test_when_finished git branch -D rebased-feature-branch &&
-		suffix=${type#\ --} && suffix=${suffix:-am} &&
-		create_expected_failure_$suffix &&
-		test_i18ncmp expected actual
-	
-Deleted branch rebased-feature-branch (was b607b14).
-ok 33 - rebase --interactive: check output with conflicting stash
-
-expecting success: 
-	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: 5885b29
-HEAD is now at 0c4d2f1 third commit
-Applied autostash.
-error: nothing to do
-HEAD is now at 0c4d2f1 third commit
-ok 34 - abort rebase -i with --autostash
-
-expecting success: 
-	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: 5cd734b
-HEAD is now at 0c4d2f1 third commit
-error: There was a problem with the editor '"$FAKE_EDITOR"'.
-Applied autostash.
-HEAD is now at 0c4d2f1 third commit
-ok 35 - restore autostash on editor failure
-
-expecting success: 
-	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: 5cd734b
-HEAD is now at 0c4d2f1 third commit
-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.
-Merging Version stash was based on with Stashed changes
-Merging:
-virtual Version stash was based on
-virtual Stashed changes
-found 1 common ancestor:
-virtual 28566cc718f43a597c158e8411c19d7048328a85
-On branch feature-branch
-Changes not staged for commit:
-  (use "git add <file>..." to update what will be committed)
-  (use "git checkout -- <file>..." to discard changes in working directory)
-
-	modified:   file0
-
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-
-	actual
-	expected
-
-no changes added to commit (use "git add" and/or "git commit -a")
-Dropped refs/stash@{0} (5cd734b91d271fe3e8dc3da7a91046a5745e404f)
-HEAD is now at 0c4d2f1 third commit
-ok 36 - autostash is saved on editor failure with conflict
-
-expecting success: 
-	test_when_finished "git reset --hard && git checkout master" &&
-	git checkout -b with-submodule &&
-	git 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/git-2.20.1/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 'master'
-ok 37 - autostash with dirty submodules
-
-expecting success: 
-	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: 09c3c9d
-HEAD is now at bfa4f02 initial commit
-Current branch unchanged-branch is up to date.
-Applied autostash.
-ok 38 - branch is left alone when possible
-
-# passed all 38 test(s)
-1..38
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t3512-cherry-pick-submodule.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3512-cherry-pick-submodule/.git/
-expecting success: 
-		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/git-2.20.1/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1/.git/
-[master (root-commit) 5be2c12] 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/git-2.20.1/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub2/.git/
-[master (root-commit) db57141] 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/git-2.20.1/t/trash directory.t3512-cherry-pick-submodule/submodule_update_repo/.git/
-[master (root-commit) c202898] 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/git-2.20.1/t/trash directory.t3512-cherry-pick-submodule/submodule_update_repo/sub1'...
-done.
-Cloning into '/build/git-2.20.1/t/trash directory.t3512-cherry-pick-submodule/submodule_update_repo/uninitialized_sub'...
-done.
-[add_sub1 20df6f7] 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'
-Removing uninitialized_sub
-Removing sub1
-Removing .gitmodules
-[remove_sub1 be31a02] Revert "Add sub1"
- Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:06:16 2021 +0000
- 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 5477eee] 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/git-2.20.1/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1
- * [new branch]      modifications -> modifications
-[modify_sub1 30ae661] 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/git-2.20.1/t/trash directory.t3512-cherry-pick-submodule/submodule_update_repo/sub1/sub2'...
-done.
-[add_nested_sub a52fa08] 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 5f3f4d7] 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 4fca706] 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 fc63e21] update nested sub
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[modify_sub1_recursively d15265e] update sub1, that updates nested sub
- Author: A U Thor <author@example.com>
-To /build/git-2.20.1/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1
- * [new branch]      modify_sub1_recursively -> modify_sub1_recursively
-To /build/git-2.20.1/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 '5be2c12b82fb53e65f72eae3fa1f7f74c7ed23e9'
-Previous HEAD position was 5be2c12 Base inside first submodule
-Switched to branch 'modifications'
-rm 'sub1'
-[replace_sub1_with_directory e09a9c9] 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'
-Removing sub1/file3
-Removing sub1/file2
-Removing sub1/file1
-Adding sub1
-[replace_directory_with_sub1 d722663] Revert "Replace sub1 with directory"
- Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:06:19 2021 +0000
- 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 cf9e327] 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 19fe0de] Revert "Replace sub1 with file"
- Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:06:20 2021 +0000
- 2 files changed, 5 insertions(+), 1 deletion(-)
- mode change 100644 => 160000 sub1
-Switched to a new branch 'invalid_sub1'
-[invalid_sub1 d0e80bf] Invalid sub1 commit
- Author: A U Thor <author@example.com>
-Switched to a new branch 'valid_sub1'
-[valid_sub1 c99bfde] Revert "Invalid sub1 commit"
- Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:06:20 2021 +0000
-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 remote branch 'no_submodule' from 'origin'.
-Branch 'add_sub1' set up to track remote branch 'add_sub1' from 'origin'.
-[no_submodule f2cd4ec] Add sub1
- Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:06:16 2021 +0000
- 2 files changed, 8 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 uninitialized_sub
-Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/git-2.20.1/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/git-2.20.1/t/trash directory.t3512-cherry-pick-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/git-2.20.1/t/trash directory.t3512-cherry-pick-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '5be2c12b82fb53e65f72eae3fa1f7f74c7ed23e9'
-Submodule path 'uninitialized_sub': checked out '5be2c12b82fb53e65f72eae3fa1f7f74c7ed23e9'
-ok 1 - git cherry-pick: added submodule creates empty directory
-
-expecting success: 
-		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 remote branch 'no_submodule' from 'origin'.
-Branch 'add_sub1' set up to track remote branch 'add_sub1' from 'origin'.
-[no_submodule 3d0c4cd] Add sub1
- Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:06:16 2021 +0000
- 2 files changed, 8 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 uninitialized_sub
-Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/git-2.20.1/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/git-2.20.1/t/trash directory.t3512-cherry-pick-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/git-2.20.1/t/trash directory.t3512-cherry-pick-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '5be2c12b82fb53e65f72eae3fa1f7f74c7ed23e9'
-Submodule path 'uninitialized_sub': checked out '5be2c12b82fb53e65f72eae3fa1f7f74c7ed23e9'
-ok 2 - git cherry-pick: added submodule leaves existing empty directory alone
-
-expecting success: 
-		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 remote branch 'replace_sub1_with_file' from 'origin'.
-fatal: Needed a single revision
-Branch 'replace_file_with_sub1' set up to track remote branch 'replace_file_with_sub1' from 'origin'.
-[replace_sub1_with_file 40a177b] Revert "Replace sub1 with file"
- Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:06:20 2021 +0000
- 2 files changed, 5 insertions(+), 1 deletion(-)
- mode change 100644 => 160000 sub1
-Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/git-2.20.1/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/git-2.20.1/t/trash directory.t3512-cherry-pick-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/git-2.20.1/t/trash directory.t3512-cherry-pick-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '5be2c12b82fb53e65f72eae3fa1f7f74c7ed23e9'
-Submodule path 'uninitialized_sub': checked out '5be2c12b82fb53e65f72eae3fa1f7f74c7ed23e9'
-ok 3 - git cherry-pick: replace tracked file with submodule creates empty directory
-
-checking known breakage: 
-		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 remote branch 'replace_sub1_with_directory' from 'origin'.
-fatal: Needed a single revision
-Branch 'replace_directory_with_sub1' set up to track remote branch 'replace_directory_with_sub1' from 'origin'.
-Removing sub1/file3
-Removing sub1/file2
-Removing sub1/file1
-Adding sub1
-[replace_sub1_with_directory 6b45709] Revert "Replace sub1 with directory"
- Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:06:19 2021 +0000
- 4 files changed, 4 insertions(+), 3 deletions(-)
- delete mode 100644 sub1/file1
- delete mode 100644 sub1/file2
- delete mode 100644 sub1/file3
-Directory sub1 doesn't exist. 
-not ok 4 - git cherry-pick: replace directory with submodule # TODO known breakage
-
-expecting success: 
-		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 remote branch 'add_sub1' from 'origin'.
-Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/git-2.20.1/t/trash directory.t3512-cherry-pick-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '5be2c12b82fb53e65f72eae3fa1f7f74c7ed23e9'
-Branch 'remove_sub1' set up to track remote branch 'remove_sub1' from 'origin'.
-Removing uninitialized_sub
-Removing sub1
-Removing .gitmodules
-[add_sub1 6aed8c7] Revert "Add sub1"
- Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:06:16 2021 +0000
- 3 files changed, 9 deletions(-)
- delete mode 100644 .gitmodules
- delete mode 160000 sub1
- delete mode 160000 uninitialized_sub
-ok 5 - git cherry-pick: removed submodule leaves submodule directory and its contents in place
-
-expecting success: 
-		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 remote branch 'add_sub1' from 'origin'.
-Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/git-2.20.1/t/trash directory.t3512-cherry-pick-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '5be2c12b82fb53e65f72eae3fa1f7f74c7ed23e9'
-Branch 'remove_sub1' set up to track remote branch 'remove_sub1' from 'origin'.
-Removing uninitialized_sub
-Removing sub1
-Removing .gitmodules
-[add_sub1 7e2a54e] Revert "Add sub1"
- Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:06:16 2021 +0000
- 3 files changed, 9 deletions(-)
- delete mode 100644 .gitmodules
- delete mode 160000 sub1
- delete mode 160000 uninitialized_sub
-ok 6 - git cherry-pick: removed submodule leaves submodule containing a .git directory alone
-
-checking known breakage: 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
-			test_must_fail $command replace_sub1_with_directory &&
-			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 remote branch 'add_sub1' from 'origin'.
-Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/git-2.20.1/t/trash directory.t3512-cherry-pick-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '5be2c12b82fb53e65f72eae3fa1f7f74c7ed23e9'
-Branch 'replace_sub1_with_directory' set up to track remote branch 'replace_sub1_with_directory' from 'origin'.
-error: refusing to lose untracked file at 'sub1/file2'
-error: refusing to lose untracked file at 'sub1/file1'
-Adding sub1/file3
-Adding sub1/file2
-Adding sub1/file1
-Removing sub1
-[add_sub1 0e16d31] Replace sub1 with directory
- Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:06:19 2021 +0000
- 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
-test_must_fail: command succeeded: git cherry-pick replace_sub1_with_directory
-not ok 7 - git cherry-pick: replace submodule with a directory must fail # TODO known breakage
-
-checking known breakage: 
-		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 &&
-			test_must_fail $command replace_sub1_with_directory &&
-			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 remote branch 'add_sub1' from 'origin'.
-Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/git-2.20.1/t/trash directory.t3512-cherry-pick-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '5be2c12b82fb53e65f72eae3fa1f7f74c7ed23e9'
-Branch 'replace_sub1_with_directory' set up to track remote branch 'replace_sub1_with_directory' from 'origin'.
-error: refusing to lose untracked file at 'sub1/file2'
-error: refusing to lose untracked file at 'sub1/file1'
-Adding sub1/file3
-Adding sub1/file2
-Adding sub1/file1
-Removing sub1
-[add_sub1 0e16d31] Replace sub1 with directory
- Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:06:19 2021 +0000
- 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
-test_must_fail: command succeeded: git cherry-pick replace_sub1_with_directory
-not ok 8 - git cherry-pick: replace submodule containing a .git directory with a directory must fail # TODO known breakage
-
-checking known breakage: 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
-			test_must_fail $command replace_sub1_with_file &&
-			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 remote branch 'add_sub1' from 'origin'.
-Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/git-2.20.1/t/trash directory.t3512-cherry-pick-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '5be2c12b82fb53e65f72eae3fa1f7f74c7ed23e9'
-Branch 'replace_sub1_with_file' set up to track remote branch 'replace_sub1_with_file' from 'origin'.
-[add_sub1 14dd2d5] Replace sub1 with file
- Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:06:20 2021 +0000
- 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 cherry-pick: replace submodule with a file must fail # TODO known breakage
-
-checking known breakage: 
-		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 &&
-			test_must_fail $command replace_sub1_with_file &&
-			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 remote branch 'add_sub1' from 'origin'.
-Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/git-2.20.1/t/trash directory.t3512-cherry-pick-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '5be2c12b82fb53e65f72eae3fa1f7f74c7ed23e9'
-Branch 'replace_sub1_with_file' set up to track remote branch 'replace_sub1_with_file' from 'origin'.
-[add_sub1 dcb2642] Replace sub1 with file
- Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:06:20 2021 +0000
- 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 cherry-pick: replace submodule containing a .git directory with a file must fail # TODO known breakage
-
-expecting success: 
-		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 remote branch 'add_sub1' from 'origin'.
-Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/git-2.20.1/t/trash directory.t3512-cherry-pick-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '5be2c12b82fb53e65f72eae3fa1f7f74c7ed23e9'
-Branch 'modify_sub1' set up to track remote branch 'modify_sub1' from 'origin'.
-[add_sub1 3d31a3d] Modify sub1
- Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:06:17 2021 +0000
-Submodule path 'sub1': checked out '5477eeefbc531ecf3d14819dc23ed7ad033ad0ee'
-ok 11 - git cherry-pick: modified submodule does not update submodule work tree
-
-expecting success: 
-		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 remote branch 'add_sub1' from 'origin'.
-Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/git-2.20.1/t/trash directory.t3512-cherry-pick-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '5be2c12b82fb53e65f72eae3fa1f7f74c7ed23e9'
-Branch 'invalid_sub1' set up to track remote branch 'invalid_sub1' from 'origin'.
-[add_sub1 5b552ec] Invalid sub1 commit
- Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:06:20 2021 +0000
-error: Server does not allow request for unadvertised object 0123456789012345678901234567890123456789
-Fetched in submodule path 'sub1', but it did not contain 0123456789012345678901234567890123456789. Direct fetching of that commit failed.
-ok 12 - git cherry-pick: modified submodule does not update submodule work tree to invalid commit
-
-expecting success: 
-		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 remote branch 'invalid_sub1' from 'origin'.
-fatal: Needed a single revision
-Branch 'valid_sub1' set up to track remote branch 'valid_sub1' from 'origin'.
-[invalid_sub1 e0d5ee4] Revert "Invalid sub1 commit"
- Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:06:20 2021 +0000
-Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/git-2.20.1/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/git-2.20.1/t/trash directory.t3512-cherry-pick-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/git-2.20.1/t/trash directory.t3512-cherry-pick-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '5be2c12b82fb53e65f72eae3fa1f7f74c7ed23e9'
-Submodule path 'uninitialized_sub': checked out '5be2c12b82fb53e65f72eae3fa1f7f74c7ed23e9'
-ok 13 - git cherry-pick: modified submodule does not update submodule work tree from invalid commit
-
-expecting success: 
-		prolog &&
-		reset_work_tree_to 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 remote branch 'no_submodule' from 'origin'.
-Branch 'add_sub1' set up to track remote branch 'add_sub1' from 'origin'.
-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 ab2c4704e5ab799bdd450fcf5e97a203fd156b8d failed
-fatal: cherry-pick failed
-ok 14 - git cherry-pick: added submodule doesn't remove untracked unignored file with same name
-
-expecting success: 
-	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 master &&
-
-		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/git-2.20.1/t/trash directory.t3512-cherry-pick-submodule/sub/.git/
-[master (root-commit) 68f6cf0] 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/git-2.20.1/t/trash directory.t3512-cherry-pick-submodule/a_repo/.git/
-[master (root-commit) 4d263c2] 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 1eae5ba] 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 bd0f96b] modify a file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Switched to branch 'master'
-Cloning into '/build/git-2.20.1/t/trash directory.t3512-cherry-pick-submodule/a_repo/sub'...
-done.
-[master ffc8ae1] 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
-Adding sub
-[master 9911967] modify a file
- Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:06:31 2021 +0000
- 1 file changed, 1 insertion(+)
-ok 15 - unrelated submodule/file conflict is ignored
-
-# still have 5 known breakage(s)
-# passed all remaining 10 test(s)
-1..15
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t3910-mac-os-precompose.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3910-mac-os-precompose/.git/
-checking prerequisite: UTF8_NFD_TO_NFC
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
-	# 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/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t3404-rebase-interactive.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3404-rebase-interactive/.git/
-expecting success: 
-	test_commit A file1 &&
-	test_commit B file1 &&
-	test_commit C file2 &&
-	test_commit D file1 &&
-	test_commit E file3 &&
-	git checkout -b branch1 A &&
-	test_commit F file4 &&
-	test_commit G file1 &&
-	test_commit H file5 &&
-	git checkout -b branch2 F &&
-	test_commit I file6 &&
-	git checkout -b conflict-branch A &&
-	test_commit one conflict &&
-	test_commit two conflict &&
-	test_commit three conflict &&
-	test_commit four conflict &&
-	git checkout -b no-conflict-branch A &&
-	test_commit J fileJ &&
-	test_commit K fileK &&
-	test_commit L fileL &&
-	test_commit M fileM &&
-	git checkout -b no-ff-branch A &&
-	test_commit N fileN &&
-	test_commit O fileO &&
-	test_commit P fileP
-
-[master (root-commit) 6e62bf8] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file1
-[master 313fe96] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[master d0f65f2] C
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file2
-[master 0547e3f] D
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[master 8f99a4f] E
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file3
-Switched to a new branch 'branch1'
-[branch1 cfefd94] F
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file4
-[branch1 83751a6] G
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[branch1 4373208] H
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file5
-Switched to a new branch 'branch2'
-[branch2 615be62] I
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file6
-Switched to a new branch 'conflict-branch'
-[conflict-branch b895952] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 conflict
-[conflict-branch 766a798] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[conflict-branch 1eadf03] three
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[conflict-branch f91a2b3] four
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'no-conflict-branch'
-[no-conflict-branch 808874f] J
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 fileJ
-[no-conflict-branch 265b89e] K
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 fileK
-[no-conflict-branch 6b0f5e6] L
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 fileL
-[no-conflict-branch 3389558] M
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 fileM
-Switched to a new branch 'no-ff-branch'
-[no-ff-branch 53b4423] N
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 fileN
-[no-ff-branch cc47714] O
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 fileO
-[no-ff-branch faef1a5] P
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 fileP
-ok 1 - setup
-
-expecting success: 
-	git checkout -b emptybranch master &&
-	git commit --allow-empty -m "empty" &&
-	git rebase --keep-empty -i HEAD~2 &&
-	git log --oneline >actual &&
-	test_line_count = 6 actual
-
-Switched to a new branch 'emptybranch'
-[emptybranch da33401] empty
- Author: A U Thor <author@example.com>
-Successfully rebased and updated refs/heads/emptybranch.
-ok 2 - rebase --keep-empty
-
-expecting success: 
-	set_fake_editor &&
-	test_must_fail env FAKE_LINES="1 exec_true" git rebase -i HEAD^ >actual 2>&1 &&
-	test_i18ncmp expect actual
-
-ok 3 - rebase -i with empty HEAD
-
-expecting success: 
-	git checkout master &&
-	(
-	set_fake_editor &&
-	FAKE_LINES="1 exec_>touch-one
-		2 exec_>touch-two exec_false exec_>touch-three
-		3 4 exec_>\"touch-file__name_with_spaces\";_>touch-after-semicolon 5" &&
-	export FAKE_LINES &&
-	test_must_fail git rebase -i A
-	) &&
-	test_path_is_file touch-one &&
-	test_path_is_file touch-two &&
-	test_path_is_missing touch-three " (should have stopped before)" &&
-	test_cmp_rev C HEAD &&
-	git rebase --continue &&
-	test_path_is_file touch-three &&
-	test_path_is_file "touch-file  name with spaces" &&
-	test_path_is_file touch-after-semicolon &&
-	test_cmp_rev master HEAD &&
-	rm -f touch-*
-
-Switched to branch 'master'
-rebase -i script before editing:
-pick 313fe96 B
-pick d0f65f2 C
-pick 0547e3f D
-pick 8f99a4f E
-
-rebase -i script after editing:
-pick 313fe96 B
-exec >touch-one
-pick d0f65f2 C
-exec >touch-two
-exec false
-exec >touch-three
-pick 0547e3f D
-pick 8f99a4f E
-exec >"touch-file  name with spaces"; >touch-after-semicolon
-Rebasing (2/9)
Executing: >touch-one
-Rebasing (3/9)
Rebasing (4/9)
Executing: >touch-two
-Rebasing (5/9)
Executing: false
-warning: execution failed: false
-You can fix the problem, and then run
-
-  git rebase --continue
-
-
-Rebasing (6/9)
Executing: >touch-three
-Rebasing (7/9)
Rebasing (8/9)
Rebasing (9/9)
Executing: >"touch-file  name with spaces"; >touch-after-semicolon
-Successfully rebased and updated refs/heads/master.
-ok 4 - rebase -i with the exec command
-
-expecting success: 
-	git checkout master &&
-	mkdir subdir && (cd subdir &&
-	set_fake_editor &&
-	FAKE_LINES="1 exec_>touch-subdir" \
-		git rebase -i HEAD^
-	) &&
-	test_path_is_file touch-subdir &&
-	rm -fr subdir
-
-Already on 'master'
-rebase -i script before editing:
-pick 8f99a4f E
-
-rebase -i script after editing:
-pick 8f99a4f E
-exec >touch-subdir
-Rebasing (2/2)
Executing: >touch-subdir
-Successfully rebased and updated refs/heads/master.
-ok 5 - rebase -i with the exec command runs from tree root
-
-expecting success: 
-	test_when_finished "rm -rf subdir" &&
-	test_when_finished "git rebase --abort ||:" &&
-	git checkout master &&
-	mkdir subdir && (cd subdir &&
-	set_fake_editor &&
-	FAKE_LINES="1 x_cd_subdir_&&_git_rev-parse_--is-inside-work-tree" \
-		git rebase -i HEAD^
-	)
-
-Already on 'master'
-rebase -i script before editing:
-pick 8f99a4f E
-
-rebase -i script after editing:
-pick 8f99a4f E
-x cd subdir && git rev-parse --is-inside-work-tree
-Rebasing (2/2)
Executing: cd subdir && git rev-parse --is-inside-work-tree
-true
-Successfully rebased and updated refs/heads/master.
-fatal: No rebase in progress?
-ok 6 - rebase -i with exec allows git commands in subdirs
-
-expecting success: 
-	test_when_finished "rm -rf subdir" &&
-	test_when_finished "test_might_fail git rebase --abort" &&
-	mkdir subdir &&
-	git rebase -x "(cd subdir && git rev-parse --show-toplevel)" HEAD^ \
-		>actual &&
-	! grep "/subdir$" actual
-
-Rebasing (2/2)
Executing: (cd subdir && git rev-parse --show-toplevel)
-Successfully rebased and updated refs/heads/master.
-fatal: No rebase in progress?
-ok 7 - rebase -i sets work tree properly
-
-expecting success: 
-	git checkout master &&
-	set_fake_editor &&
-	test_must_fail env FAKE_LINES="exec_echo_foo_>file1 1" git rebase -i HEAD^ &&
-	test_cmp_rev master^ HEAD &&
-	git reset --hard &&
-	git rebase --continue
-
-Already on 'master'
-rebase -i script before editing:
-pick 8f99a4f E
-
-rebase -i script after editing:
-exec echo foo >file1
-pick 8f99a4f E
-Rebasing (1/2)
Executing: echo foo >file1
-error: cannot rebase: You have unstaged changes.
-warning: execution succeeded: echo foo >file1
-but left changes to the index and/or the working tree
-Commit or stash your changes, and then run
-
-  git rebase --continue
-
-
-HEAD is now at 0547e3f D
-Rebasing (2/2)
Successfully rebased and updated refs/heads/master.
-ok 8 - rebase -i with the exec command checks tree cleanness
-
-expecting success: 
-	git checkout master &&
-	test_when_finished "git rebase --abort" &&
-	set_fake_editor &&
-	test_must_fail env FAKE_LINES="exec_this-command-does-not-exist 1" \
-	git rebase -i HEAD^ >actual 2>&1 &&
-	! grep "Maybe git-rebase is broken" actual
-
-Already on 'master'
-ok 9 - rebase -i with exec of inexistent command
-
-expecting success: 
-	git checkout branch2 &&
-	set_fake_editor &&
-	git rebase -i F &&
-	test "$(git symbolic-ref -q HEAD)" = "refs/heads/branch2" &&
-	test $(git rev-parse I) = $(git rev-parse HEAD)
-
-Switched to branch 'branch2'
-Successfully rebased and updated refs/heads/branch2.
-ok 10 - no changes are a nop
-
-expecting success: 
-	git checkout -b dead-end &&
-	git rm file6 &&
-	git commit -m "stop here" &&
-	set_fake_editor &&
-	git rebase -i F branch2 &&
-	test "$(git symbolic-ref -q HEAD)" = "refs/heads/branch2" &&
-	test $(git rev-parse I) = $(git rev-parse branch2) &&
-	test $(git rev-parse I) = $(git rev-parse HEAD)
-
-Switched to a new branch 'dead-end'
-rm 'file6'
-[dead-end f814f58] stop here
- Author: A U Thor <author@example.com>
- 1 file changed, 1 deletion(-)
- delete mode 100644 file6
-Successfully rebased and updated refs/heads/branch2.
-ok 11 - test the [branch] option
-
-expecting success: 
-	git checkout -b test-onto branch2 &&
-	set_fake_editor &&
-	git rebase -i --onto branch1 F &&
-	test "$(git symbolic-ref -q HEAD)" = "refs/heads/test-onto" &&
-	test $(git rev-parse HEAD^) = $(git rev-parse branch1) &&
-	test $(git rev-parse I) = $(git rev-parse branch2)
-
-Switched to a new branch 'test-onto'
-Rebasing (1/1)
Successfully rebased and updated refs/heads/test-onto.
-ok 12 - test --onto <branch>
-
-expecting success: 
-	git checkout branch1 &&
-	git tag original-branch1 &&
-	set_fake_editor &&
-	git rebase -i branch2 &&
-	test file6 = $(git diff --name-only original-branch1) &&
-	test "$(git symbolic-ref -q HEAD)" = "refs/heads/branch1" &&
-	test $(git rev-parse I) = $(git rev-parse branch2) &&
-	test $(git rev-parse I) = $(git rev-parse HEAD~2)
-
-Switched to branch 'branch1'
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/branch1.
-ok 13 - rebase on top of a non-conflicting commit
-
-expecting success: 
-	test $(git rev-parse branch1@{1}) = $(git rev-parse original-branch1)
-
-ok 14 - reflog for the branch shows state before rebase
-
-expecting success: 
-	printf "rebase -i (finish): refs/heads/branch1 onto %s\n" \
-		"$(git rev-parse branch2)" >expected &&
-	git log -g --pretty=%gs -1 refs/heads/branch1 >actual &&
-	test_cmp expected actual
-
-ok 15 - reflog for the branch shows correct finish message
-
-expecting success: 
-	set_fake_editor &&
-	FAKE_LINES="2 1" git rebase -i HEAD~2 &&
-	test H = $(git cat-file commit HEAD^ | sed -ne \$p) &&
-	test G = $(git cat-file commit HEAD | sed -ne \$p)
-
-rebase -i script before editing:
-pick ae8f65e G
-pick f5f5249 H
-
-rebase -i script after editing:
-pick f5f5249 H
-pick ae8f65e G
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/branch1.
-ok 16 - exchange two commits
-
-expecting success: 
-	git tag new-branch1 &&
-	set_fake_editor &&
-	test_must_fail git rebase -i master &&
-	test "$(git rev-parse HEAD~3)" = "$(git rev-parse master)" &&
-	test_cmp expect .git/rebase-merge/patch &&
-	test_cmp expect2 file1 &&
-	test "$(git diff --name-status |
-		sed -n -e "/^U/s/^U[^a-z]*//p")" = file1 &&
-	test 4 = $(grep -v "^#" < .git/rebase-merge/done | wc -l) &&
-	test 0 = $(grep -c "^[^#]" < .git/rebase-merge/git-rebase-todo)
-
-Rebasing (1/4)
Rebasing (2/4)
Rebasing (3/4)
Rebasing (4/4)
Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-error: could not apply 5d18e54... G
-Resolve all conflicts manually, mark them as resolved with
-"git add/rm <conflicted_files>", then run "git rebase --continue".
-You can instead skip this commit: run "git rebase --skip".
-To abort and get back to the state before "git rebase", run "git rebase --abort".
-Could not apply 5d18e54... G
-ok 17 - stop on conflicting pick
-
-expecting success: 
-	GIT_TRACE=1 git rebase --show-current-patch >/dev/null 2>stderr &&
-	grep "show.*REBASE_HEAD" stderr &&
-	# the original stopped-sha1 is abbreviated
-	stopped_sha1="$(git rev-parse $(cat ".git/rebase-merge/stopped-sha"))" &&
-	test "$(git rev-parse REBASE_HEAD)" = "$stopped_sha1"
-
-trace: run_command: git show REBASE_HEAD --
-trace: built-in: git show REBASE_HEAD --
-ok 18 - show conflicted patch
-
-expecting success: 
-	git rebase --abort &&
-	test $(git rev-parse new-branch1) = $(git rev-parse HEAD) &&
-	test "$(git symbolic-ref -q HEAD)" = "refs/heads/branch1" &&
-	test_path_is_missing .git/rebase-merge
-
-ok 19 - abort
-
-expecting success: 
-	git rm --cached file1 &&
-	git commit -m "remove file in base" &&
-	set_fake_editor &&
-	test_must_fail git rebase -i master > output 2>&1 &&
-	test_i18ngrep "The following untracked working tree files would be overwritten by checkout:" \
-		output &&
-	test_i18ngrep "file1" output &&
-	test_path_is_missing .git/rebase-merge &&
-	git reset --hard HEAD^
-
-rm 'file1'
-[branch1 2dd5570] remove file in base
- Author: A U Thor <author@example.com>
- 1 file changed, 1 deletion(-)
- delete mode 100644 file1
-error: The following untracked working tree files would be overwritten by checkout:
-	file1
-HEAD is now at 5d18e54 G
-ok 20 - abort with error when new base cannot be checked out
-
-expecting success: 
-	echo A > file7 &&
-	git add file7 &&
-	test_tick &&
-	GIT_AUTHOR_NAME="Twerp Snog" git commit -m "different author" &&
-	git tag twerp &&
-	set_fake_editor &&
-	git rebase -i --onto master HEAD^ &&
-	git show HEAD | grep "^Author: Twerp Snog"
-
-[branch1 2596307] different author
- Author: Twerp Snog <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file7
-Rebasing (1/1)
Successfully rebased and updated refs/heads/branch1.
-Author: Twerp Snog <author@example.com>
-ok 21 - retain authorship
-
-expecting success: 
-	oGIT_AUTHOR_NAME=$GIT_AUTHOR_NAME &&
-	test_when_finished "GIT_AUTHOR_NAME=\$oGIT_AUTHOR_NAME" &&
-
-	git reset --hard twerp &&
-	test_commit a conflict a conflict-a &&
-	git reset --hard twerp &&
-
-	GIT_AUTHOR_NAME=AttributeMe &&
-	export GIT_AUTHOR_NAME &&
-	test_commit b conflict b conflict-b &&
-	GIT_AUTHOR_NAME=$oGIT_AUTHOR_NAME &&
-
-	set_fake_editor &&
-	test_must_fail git rebase -i conflict-a &&
-	echo resolved >conflict &&
-	git add conflict &&
-	git rebase --continue &&
-	test $(git rev-parse conflict-a^0) = $(git rev-parse HEAD^) &&
-	git show >out &&
-	grep AttributeMe out
-
-HEAD is now at 2596307 different author
-[branch1 748a43d] a
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 conflict
-HEAD is now at 2596307 different author
-[branch1 34d1a6c] b
- Author: AttributeMe <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 conflict
-Rebasing (1/1)
Auto-merging conflict
-CONFLICT (add/add): Merge conflict in conflict
-error: could not apply 34d1a6c... b
-Resolve all conflicts manually, mark them as resolved with
-"git add/rm <conflicted_files>", then run "git rebase --continue".
-You can instead skip this commit: run "git rebase --skip".
-To abort and get back to the state before "git rebase", run "git rebase --abort".
-Could not apply 34d1a6c... b
-[detached HEAD 7866b12] b
- Author: AttributeMe <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Successfully rebased and updated refs/heads/branch1.
-Author: AttributeMe <author@example.com>
-ok 22 - retain authorship w/ conflicts
-
-expecting success: 
-	git reset --hard twerp &&
-	echo B > file7 &&
-	test_tick &&
-	GIT_AUTHOR_NAME="Nitfol" git commit -m "nitfol" file7 &&
-	echo "******************************" &&
-	set_fake_editor &&
-	FAKE_LINES="1 squash 2" EXPECT_HEADER_COUNT=2 \
-		git rebase -i --onto master HEAD~2 &&
-	test B = $(cat file7) &&
-	test $(git rev-parse HEAD^) = $(git rev-parse master)
-
-HEAD is now at 2596307 different author
-[branch1 cdf577a] nitfol
- Author: Nitfol <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-******************************
-rebase -i script before editing:
-pick 2596307 different author
-pick cdf577a nitfol
-
-rebase -i script after editing:
-pick 2596307 different author
-squash cdf577a nitfol
-Rebasing (1/2)
Rebasing (2/2)
[detached HEAD d2d5ba7] different author
- Author: Twerp Snog <author@example.com>
- Date: Thu Apr 7 15:33:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 file7
-Successfully rebased and updated refs/heads/branch1.
-ok 23 - squash
-
-expecting success: 
-	git show HEAD | grep "^Author: Twerp Snog"
-
-Author: Twerp Snog <author@example.com>
-ok 24 - retain authorship when squashing
-
-checking prerequisite: REBASE_P
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
-	test -z "$GIT_TEST_SKIP_REBASE_P"
-
-)
-prerequisite REBASE_P ok
-expecting success: 
-	HEAD=$(git rev-parse HEAD) &&
-	set_fake_editor &&
-	git rebase -i -p HEAD^ &&
-	git update-index --refresh &&
-	git diff-files --quiet &&
-	git diff-index --quiet --cached HEAD -- &&
-	test $HEAD = $(git rev-parse HEAD)
-
-Rebasing (1/1)
Successfully rebased and updated refs/heads/branch1.
-ok 25 - -p handles "no changes" gracefully
-
-checking known breakage: 
-	git checkout H &&
-	set_fake_editor &&
-	FAKE_LINES="2 1" git rebase -i -p HEAD~2 &&
-	test H = $(git cat-file commit HEAD^ | sed -ne \$p) &&
-	test G = $(git cat-file commit HEAD | sed -ne \$p)
-
-Note: checking out 'H'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by performing another checkout.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
-
-  git checkout -b <new-branch-name>
-
-HEAD is now at 4373208 H
-rebase -i script before editing:
-pick 83751a6 G
-pick 4373208 H
-
-rebase -i script after editing:
-pick 4373208 H
-pick 83751a6 G
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated detached HEAD.
-not ok 26 - exchange two commits with -p # TODO known breakage
-
-expecting success: 
-	git checkout -b to-be-preserved master^ &&
-	: > unrelated-file &&
-	git add unrelated-file &&
-	test_tick &&
-	git commit -m "unrelated" &&
-	git checkout -b another-branch master &&
-	echo B > file1 &&
-	test_tick &&
-	git commit -m J file1 &&
-	test_tick &&
-	git merge to-be-preserved &&
-	echo C > file1 &&
-	test_tick &&
-	git commit -m K file1 &&
-	echo D > file1 &&
-	test_tick &&
-	git commit -m L1 file1 &&
-	git checkout HEAD^ &&
-	echo 1 > unrelated-file &&
-	test_tick &&
-	git commit -m L2 unrelated-file &&
-	test_tick &&
-	git merge another-branch &&
-	echo E > file1 &&
-	test_tick &&
-	git commit -m M file1 &&
-	git checkout -b to-be-rebased &&
-	test_tick &&
-	set_fake_editor &&
-	git rebase -i -p --onto branch1 master &&
-	git update-index --refresh &&
-	git diff-files --quiet &&
-	git diff-index --quiet --cached HEAD -- &&
-	test $(git rev-parse HEAD~6) = $(git rev-parse branch1) &&
-	test $(git rev-parse HEAD~4^2) = $(git rev-parse to-be-preserved) &&
-	test $(git rev-parse HEAD^^2^) = $(git rev-parse HEAD^^^) &&
-	test $(git show HEAD~5:file1) = B &&
-	test $(git show HEAD~3:file1) = C &&
-	test $(git show HEAD:file1) = E &&
-	test $(git show HEAD:unrelated-file) = 1
-
-Previous HEAD position was 83751a6 G
-Switched to a new branch 'to-be-preserved'
-[to-be-preserved 8dba1b0] unrelated
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 unrelated-file
-Switched to a new branch 'another-branch'
-[another-branch b55ddc1] J
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Merging:
-b55ddc1 J
-virtual to-be-preserved
-found 1 common ancestor:
-0547e3f D
-Merge made by the 'recursive' strategy.
- unrelated-file | 0
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 unrelated-file
-[another-branch 28ab3c9] K
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[another-branch b22c0b1] L1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Note: checking out '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 performing another checkout.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
-
-  git checkout -b <new-branch-name>
-
-HEAD is now at 28ab3c9 K
-[detached HEAD 9986375] L2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Merging:
-9986375 L2
-virtual another-branch
-found 1 common ancestor:
-28ab3c9 K
-Merge made by the 'recursive' strategy.
- file1 | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[detached HEAD 806db33] M
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'to-be-rebased'
-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/to-be-rebased.
-ok 27 - preserve merges with -p
-
-expecting success: 
-	set_fake_editor &&
-	FAKE_LINES="1 2 edit 3 4" git rebase -i -p HEAD~3 &&
-	echo 2 > unrelated-file &&
-	test_tick &&
-	git commit -m L2-modified --amend unrelated-file &&
-	git rebase --continue &&
-	git update-index --refresh &&
-	git diff-files --quiet &&
-	git diff-index --quiet --cached HEAD -- &&
-	test $(git show HEAD:unrelated-file) = 2
-
-rebase -i script before editing:
-pick 028896d L2
-pick 44a20cd L1
-pick 5f48528 Merge branch 'another-branch' into HEAD
-pick 2c6682a M
-
-rebase -i script after editing:
-pick 028896d L2
-pick 44a20cd L1
-edit 5f48528 Merge branch 'another-branch' into HEAD
-pick 2c6682a M
-Rebasing (1/4)
Rebasing (2/4)
Rebasing (3/4)
Stopped at 5f48528... Merge branch 'another-branch' into HEAD
-You can amend the commit now, with
-
-	git commit --amend 
-
-Once you are satisfied with your changes, run
-
-	git rebase --continue
-
-[detached HEAD ed60d45] L2-modified
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:43:13 2005 -0700
-Rebasing (4/4)
Successfully rebased and updated refs/heads/to-be-rebased.
-ok 28 - edit ancestor with -p
-
-expecting success: 
-	git reset --hard D &&
-	test_tick &&
-	set_fake_editor &&
-	test_must_fail git rebase -i --onto new-branch1 HEAD^ &&
-	echo resolved > file1 &&
-	git add file1 &&
-	FAKE_COMMIT_MESSAGE="chouette!" git rebase --continue &&
-	test $(git rev-parse HEAD^) = $(git rev-parse new-branch1) &&
-	git show HEAD | grep chouette
-
-HEAD is now at 0547e3f D
-Rebasing (1/1)
Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-error: could not apply 0547e3f... D
-Resolve all conflicts manually, mark them as resolved with
-"git add/rm <conflicted_files>", then run "git rebase --continue".
-You can instead skip this commit: run "git rebase --skip".
-To abort and get back to the state before "git rebase", run "git rebase --abort".
-Could not apply 0547e3f... D
-[detached HEAD eb2be51] chouette!
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Successfully rebased and updated refs/heads/to-be-rebased.
-    chouette!
-ok 29 - --continue tries to commit
-
-expecting success: 
-	git reset --hard master@{1} &&
-	test_tick &&
-	set_fake_editor &&
-	test_must_fail git rebase -v -i --onto new-branch1 HEAD^ &&
-	echo resolved > file1 &&
-	git add file1 &&
-	git rebase --continue > output &&
-	grep "^ file1 | 2 +-$" output
-
-HEAD is now at 0547e3f D
-Changes from 6e62bf890e21973b771e4e6fc28f5ade62edb4bc to 5d18e5414f663da21d1363c271f2d684aeda7b5b:
- file1 | 2 +-
- file4 | 1 +
- file5 | 1 +
- file6 | 1 +
- 4 files changed, 4 insertions(+), 1 deletion(-)
- create mode 100644 file4
- create mode 100644 file5
- create mode 100644 file6
-Note: checking out '5d18e5414f663da21d1363c271f2d684aeda7b5b'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by performing another checkout.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
-
-  git checkout -b <new-branch-name>
-
-HEAD is now at 5d18e54 G
-Rebasing (1/1)
-Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-error: could not apply 0547e3f... D
-Resolve all conflicts manually, mark them as resolved with
-"git add/rm <conflicted_files>", then run "git rebase --continue".
-You can instead skip this commit: run "git rebase --skip".
-To abort and get back to the state before "git rebase", run "git rebase --abort".
-Could not apply 0547e3f... D
-Successfully rebased and updated refs/heads/to-be-rebased.
- file1 | 2 +-
-ok 30 - verbose flag is heeded, even after --continue
-
-expecting success: 
-	base=$(git rev-parse HEAD~4) &&
-	set_fake_editor &&
-	FAKE_COMMIT_AMEND="ONCE" FAKE_LINES="1 squash 2 squash 3 squash 4" \
-		EXPECT_HEADER_COUNT=4 \
-		git rebase -i $base &&
-	test $base = $(git rev-parse HEAD^) &&
-	test 1 = $(git show | grep ONCE | wc -l)
-
-rebase -i script before editing:
-pick 615be62 I
-pick 0626e8d H
-pick 5d18e54 G
-pick 2e6badc D
-
-rebase -i script after editing:
-pick 615be62 I
-squash 0626e8d H
-squash 5d18e54 G
-squash 2e6badc D
-Rebasing (2/4)
Rebasing (3/4)
Rebasing (4/4)
[detached HEAD e5aa6ef] I
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:21:13 2005 -0700
- 3 files changed, 3 insertions(+), 1 deletion(-)
- create mode 100644 file5
- create mode 100644 file6
-Successfully rebased and updated refs/heads/to-be-rebased.
-ok 31 - multi-squash only fires up editor once
-
-expecting success: 
-	git checkout -b multi-fixup E &&
-	base=$(git rev-parse HEAD~4) &&
-	set_fake_editor &&
-	FAKE_COMMIT_AMEND="NEVER" FAKE_LINES="1 fixup 2 fixup 3 fixup 4" \
-		git rebase -i $base &&
-	test $base = $(git rev-parse HEAD^) &&
-	test 0 = $(git show | grep NEVER | wc -l) &&
-	git checkout @{-1} &&
-	git branch -D multi-fixup
-
-Switched to a new branch 'multi-fixup'
-rebase -i script before editing:
-pick 313fe96 B
-pick d0f65f2 C
-pick 0547e3f D
-pick 8f99a4f E
-
-rebase -i script after editing:
-pick 313fe96 B
-fixup d0f65f2 C
-fixup 0547e3f D
-fixup 8f99a4f E
-Rebasing (2/4)
Rebasing (3/4)
Rebasing (4/4)
Successfully rebased and updated refs/heads/multi-fixup.
-Switched to branch 'to-be-rebased'
-Deleted branch multi-fixup (was acbd024).
-ok 32 - multi-fixup does not fire up editor
-
-expecting success: 
-	git checkout -b conflict-fixup conflict-branch &&
-	base=$(git rev-parse HEAD~4) &&
-	set_fake_editor &&
-	test_must_fail env FAKE_LINES="1 fixup 3 fixup 4" git rebase -i $base &&
-	echo three > conflict &&
-	git add conflict &&
-	FAKE_COMMIT_AMEND="ONCE" EXPECT_HEADER_COUNT=2 \
-		git rebase --continue &&
-	test $base = $(git rev-parse HEAD^) &&
-	test 1 = $(git show | grep ONCE | wc -l) &&
-	git checkout @{-1} &&
-	git branch -D conflict-fixup
-
-Switched to a new branch 'conflict-fixup'
-rebase -i script before editing:
-pick b895952 one
-pick 766a798 two
-pick 1eadf03 three
-pick f91a2b3 four
-
-rebase -i script after editing:
-pick b895952 one
-fixup 1eadf03 three
-fixup f91a2b3 four
-Rebasing (2/3)
Auto-merging conflict
-CONFLICT (content): Merge conflict in conflict
-error: could not apply 1eadf03... three
-Resolve all conflicts manually, mark them as resolved with
-"git add/rm <conflicted_files>", then run "git rebase --continue".
-You can instead skip this commit: run "git rebase --skip".
-To abort and get back to the state before "git rebase", run "git rebase --abort".
-Could not apply 1eadf03... three
-[detached HEAD c36af95] one
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:22:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 conflict
-Rebasing (3/3)
Successfully rebased and updated refs/heads/conflict-fixup.
-Switched to branch 'to-be-rebased'
-Deleted branch conflict-fixup (was 221ec56).
-ok 33 - commit message used after conflict
-
-expecting success: 
-	git checkout -b conflict-squash conflict-branch &&
-	base=$(git rev-parse HEAD~4) &&
-	set_fake_editor &&
-	test_must_fail env FAKE_LINES="1 fixup 3 squash 4" git rebase -i $base &&
-	echo three > conflict &&
-	git add conflict &&
-	FAKE_COMMIT_AMEND="TWICE" EXPECT_HEADER_COUNT=2 \
-		git rebase --continue &&
-	test $base = $(git rev-parse HEAD^) &&
-	test 2 = $(git show | grep TWICE | wc -l) &&
-	git checkout @{-1} &&
-	git branch -D conflict-squash
-
-Switched to a new branch 'conflict-squash'
-rebase -i script before editing:
-pick b895952 one
-pick 766a798 two
-pick 1eadf03 three
-pick f91a2b3 four
-
-rebase -i script after editing:
-pick b895952 one
-fixup 1eadf03 three
-squash f91a2b3 four
-Rebasing (2/3)
Auto-merging conflict
-CONFLICT (content): Merge conflict in conflict
-error: could not apply 1eadf03... three
-Resolve all conflicts manually, mark them as resolved with
-"git add/rm <conflicted_files>", then run "git rebase --continue".
-You can instead skip this commit: run "git rebase --skip".
-To abort and get back to the state before "git rebase", run "git rebase --abort".
-Could not apply 1eadf03... three
-[detached HEAD 191a914] one
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:22:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 conflict
-Rebasing (3/3)
[detached HEAD 60ec801] one
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:22:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 conflict
-Successfully rebased and updated refs/heads/conflict-squash.
-Switched to branch 'to-be-rebased'
-Deleted branch conflict-squash (was 60ec801).
-ok 34 - commit message retained after conflict
-
-expecting success: 
-	git checkout -b squash-fixup E &&
-	base=$(git rev-parse HEAD~4) &&
-	set_fake_editor &&
-	FAKE_COMMIT_AMEND="ONCE" FAKE_LINES="1 fixup 2 squash 3 fixup 4" \
-		EXPECT_HEADER_COUNT=4 \
-		git rebase -i $base &&
-	git cat-file commit HEAD | sed -e 1,/^\$/d > actual-squash-fixup &&
-	test_cmp expect-squash-fixup actual-squash-fixup &&
-	git cat-file commit HEAD@{2} |
-		grep "^# This is a combination of 3 commits\."  &&
-	git cat-file commit HEAD@{3} |
-		grep "^# This is a combination of 2 commits\."  &&
-	git checkout @{-1} &&
-	git branch -D squash-fixup
-
-Switched to a new branch 'squash-fixup'
-rebase -i script before editing:
-pick 313fe96 B
-pick d0f65f2 C
-pick 0547e3f D
-pick 8f99a4f E
-
-rebase -i script after editing:
-pick 313fe96 B
-fixup d0f65f2 C
-squash 0547e3f D
-fixup 8f99a4f E
-Rebasing (2/4)
Rebasing (3/4)
Rebasing (4/4)
[detached HEAD 74d534c] B
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:14:13 2005 -0700
- 3 files changed, 3 insertions(+), 1 deletion(-)
- create mode 100644 file2
- create mode 100644 file3
-Successfully rebased and updated refs/heads/squash-fixup.
-# This is a combination of 3 commits.
-# This is a combination of 2 commits.
-Switched to branch 'to-be-rebased'
-Deleted branch squash-fixup (was 74d534c).
-ok 35 - squash and fixup generate correct log messages
-
-expecting success: 
-	git checkout -b skip-comments E &&
-	base=$(git rev-parse HEAD~4) &&
-	set_fake_editor &&
-	FAKE_COMMIT_AMEND="ONCE" FAKE_LINES="# 1 # squash 2 # squash 3 # squash 4 #" \
-		EXPECT_HEADER_COUNT=4 \
-		git rebase -i $base &&
-	test $base = $(git rev-parse HEAD^) &&
-	test 1 = $(git show | grep ONCE | wc -l) &&
-	git checkout @{-1} &&
-	git branch -D skip-comments
-
-Switched to a new branch 'skip-comments'
-rebase -i script before editing:
-pick 313fe96 B
-pick d0f65f2 C
-pick 0547e3f D
-pick 8f99a4f E
-
-rebase -i script after editing:
-# comment
-pick 313fe96 B
-# comment
-squash d0f65f2 C
-# comment
-squash 0547e3f D
-# comment
-squash 8f99a4f E
-# comment
-Rebasing (2/4)
Rebasing (3/4)
Rebasing (4/4)
[detached HEAD f397ac4] B
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:14:13 2005 -0700
- 3 files changed, 3 insertions(+), 1 deletion(-)
- create mode 100644 file2
- create mode 100644 file3
-Successfully rebased and updated refs/heads/skip-comments.
-Switched to branch 'to-be-rebased'
-Deleted branch skip-comments (was f397ac4).
-ok 36 - squash ignores comments
-
-expecting success: 
-	git checkout -b skip-blank-lines E &&
-	base=$(git rev-parse HEAD~4) &&
-	set_fake_editor &&
-	FAKE_COMMIT_AMEND="ONCE" FAKE_LINES="> 1 > squash 2 > squash 3 > squash 4 >" \
-		EXPECT_HEADER_COUNT=4 \
-		git rebase -i $base &&
-	test $base = $(git rev-parse HEAD^) &&
-	test 1 = $(git show | grep ONCE | wc -l) &&
-	git checkout @{-1} &&
-	git branch -D skip-blank-lines
-
-Switched to a new branch 'skip-blank-lines'
-rebase -i script before editing:
-pick 313fe96 B
-pick d0f65f2 C
-pick 0547e3f D
-pick 8f99a4f E
-
-rebase -i script after editing:
-
-pick 313fe96 B
-
-squash d0f65f2 C
-
-squash 0547e3f D
-
-squash 8f99a4f E
-
-Rebasing (2/4)
Rebasing (3/4)
Rebasing (4/4)
[detached HEAD f397ac4] B
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:14:13 2005 -0700
- 3 files changed, 3 insertions(+), 1 deletion(-)
- create mode 100644 file2
- create mode 100644 file3
-Successfully rebased and updated refs/heads/skip-blank-lines.
-Switched to branch 'to-be-rebased'
-Deleted branch skip-blank-lines (was f397ac4).
-ok 37 - squash ignores blank lines
-
-expecting success: 
-	git checkout -b squash-works no-conflict-branch &&
-	one=$(git rev-parse HEAD~3) &&
-	set_fake_editor &&
-	FAKE_LINES="1 s 3 2" EXPECT_HEADER_COUNT=2 \
-		git rebase -i HEAD~3 &&
-	test $one = $(git rev-parse HEAD~2)
-
-Switched to a new branch 'squash-works'
-rebase -i script before editing:
-pick 265b89e K
-pick 6b0f5e6 L
-pick 3389558 M
-
-rebase -i script after editing:
-pick 265b89e K
-s 3389558 M
-pick 6b0f5e6 L
-Rebasing (2/3)
[detached HEAD fb01347] K
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:27:13 2005 -0700
- 2 files changed, 2 insertions(+)
- create mode 100644 fileK
- create mode 100644 fileM
-Rebasing (3/3)
Successfully rebased and updated refs/heads/squash-works.
-ok 38 - squash works as expected
-
-expecting success: 
-	git checkout -b interrupted-squash conflict-branch &&
-	one=$(git rev-parse HEAD~3) &&
-	set_fake_editor &&
-	test_must_fail env FAKE_LINES="1 squash 3 2" git rebase -i HEAD~3 &&
-	test_write_lines one two four > conflict &&
-	git add conflict &&
-	test_must_fail git rebase --continue &&
-	echo resolved > conflict &&
-	git add conflict &&
-	git rebase --continue &&
-	test $one = $(git rev-parse HEAD~2)
-
-Switched to a new branch 'interrupted-squash'
-rebase -i script before editing:
-pick 766a798 two
-pick 1eadf03 three
-pick f91a2b3 four
-
-rebase -i script after editing:
-pick 766a798 two
-squash f91a2b3 four
-pick 1eadf03 three
-Rebasing (2/3)
Auto-merging conflict
-CONFLICT (content): Merge conflict in conflict
-error: could not apply f91a2b3... four
-Resolve all conflicts manually, mark them as resolved with
-"git add/rm <conflicted_files>", then run "git rebase --continue".
-You can instead skip this commit: run "git rebase --skip".
-To abort and get back to the state before "git rebase", run "git rebase --abort".
-Could not apply f91a2b3... four
-[detached HEAD d1cbea4] two
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:23:13 2005 -0700
- 1 file changed, 2 insertions(+)
-Rebasing (3/3)
Auto-merging conflict
-CONFLICT (content): Merge conflict in conflict
-error: could not apply 1eadf03... three
-Resolve all conflicts manually, mark them as resolved with
-"git add/rm <conflicted_files>", then run "git rebase --continue".
-You can instead skip this commit: run "git rebase --skip".
-To abort and get back to the state before "git rebase", run "git rebase --abort".
-Could not apply 1eadf03... three
-[detached HEAD 634f347] three
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 3 deletions(-)
-Successfully rebased and updated refs/heads/interrupted-squash.
-ok 39 - interrupted squash works as expected
-
-expecting success: 
-	git checkout -b interrupted-squash2 conflict-branch &&
-	one=$(git rev-parse HEAD~3) &&
-	set_fake_editor &&
-	test_must_fail env FAKE_LINES="3 squash 1 2" git rebase -i HEAD~3 &&
-	test_write_lines one four > conflict &&
-	git add conflict &&
-	test_must_fail git rebase --continue &&
-	test_write_lines one two four > conflict &&
-	git add conflict &&
-	test_must_fail git rebase --continue &&
-	echo resolved > conflict &&
-	git add conflict &&
-	git rebase --continue &&
-	test $one = $(git rev-parse HEAD~2)
-
-Switched to a new branch 'interrupted-squash2'
-rebase -i script before editing:
-pick 766a798 two
-pick 1eadf03 three
-pick f91a2b3 four
-
-rebase -i script after editing:
-pick f91a2b3 four
-squash 766a798 two
-pick 1eadf03 three
-Rebasing (1/3)
Auto-merging conflict
-CONFLICT (content): Merge conflict in conflict
-error: could not apply f91a2b3... four
-Resolve all conflicts manually, mark them as resolved with
-"git add/rm <conflicted_files>", then run "git rebase --continue".
-You can instead skip this commit: run "git rebase --skip".
-To abort and get back to the state before "git rebase", run "git rebase --abort".
-Could not apply f91a2b3... four
-[detached HEAD d5ff450] four
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Rebasing (2/3)
Auto-merging conflict
-CONFLICT (content): Merge conflict in conflict
-error: could not apply 766a798... two
-Resolve all conflicts manually, mark them as resolved with
-"git add/rm <conflicted_files>", then run "git rebase --continue".
-You can instead skip this commit: run "git rebase --skip".
-To abort and get back to the state before "git rebase", run "git rebase --abort".
-Could not apply 766a798... two
-[detached HEAD ea11a0c] four
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:25:13 2005 -0700
- 1 file changed, 2 insertions(+)
-Rebasing (3/3)
Auto-merging conflict
-CONFLICT (content): Merge conflict in conflict
-error: could not apply 1eadf03... three
-Resolve all conflicts manually, mark them as resolved with
-"git add/rm <conflicted_files>", then run "git rebase --continue".
-You can instead skip this commit: run "git rebase --skip".
-To abort and get back to the state before "git rebase", run "git rebase --abort".
-Could not apply 1eadf03... three
-[detached HEAD f26b32e] three
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 3 deletions(-)
-Successfully rebased and updated refs/heads/interrupted-squash2.
-ok 40 - interrupted squash works as expected (case 2)
-
-expecting success: 
-	echo unrelated > file7 &&
-	git add file7 &&
-	test_tick &&
-	git commit -m "unrelated change" &&
-	parent=$(git rev-parse HEAD^) &&
-	test_tick &&
-	set_fake_editor &&
-	FAKE_LINES="edit 1" git rebase -i HEAD^ &&
-	echo edited > file7 &&
-	git add file7 &&
-	FAKE_COMMIT_MESSAGE="chouette!" git rebase --continue &&
-	test edited = $(git show HEAD:file7) &&
-	git show HEAD | grep chouette &&
-	test $parent = $(git rev-parse HEAD^)
-
-[interrupted-squash2 1c8cc7a] unrelated change
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file7
-rebase -i script before editing:
-pick 1c8cc7a unrelated change
-
-rebase -i script after editing:
-edit 1c8cc7a unrelated change
-Rebasing (1/1)
Stopped at 1c8cc7a...  unrelated change
-You can amend the commit now, with
-
-  git commit --amend 
-
-Once you are satisfied with your changes, run
-
-  git rebase --continue
-[detached HEAD d64edb7] chouette!
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:49:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 file7
-Successfully rebased and updated refs/heads/interrupted-squash2.
-    chouette!
-ok 41 - --continue tries to commit, even for "edit"
-
-expecting success: 
-	old=$(git rev-parse HEAD) &&
-	test_tick &&
-	set_fake_editor &&
-	FAKE_LINES="edit 1" git rebase -i HEAD^ &&
-	echo "edited again" > file7 &&
-	git add file7 &&
-	test_must_fail env FAKE_COMMIT_MESSAGE=" " git rebase --continue &&
-	test $old = $(git rev-parse HEAD) &&
-	git rebase --abort
-
-rebase -i script before editing:
-pick d64edb7 chouette!
-
-rebase -i script after editing:
-edit d64edb7 chouette!
-Rebasing (1/1)
Stopped at d64edb7...  chouette!
-You can amend the commit now, with
-
-  git commit --amend 
-
-Once you are satisfied with your changes, run
-
-  git rebase --continue
-Aborting commit due to empty commit message.
-error: could not commit staged changes.
-ok 42 - aborted --continue does not squash commits after "edit"
-
-expecting success: 
-	test_tick &&
-	set_fake_editor &&
-	FAKE_LINES="edit 1" git rebase -i HEAD^ &&
-	echo "edited again" > file7 &&
-	git add file7 &&
-	FAKE_COMMIT_MESSAGE="edited file7 again" git commit &&
-	echo "and again" > file7 &&
-	git add file7 &&
-	test_tick &&
-	test_must_fail env FAKE_COMMIT_MESSAGE="and again" git rebase --continue &&
-	git rebase --abort
-
-rebase -i script before editing:
-pick d64edb7 chouette!
-
-rebase -i script after editing:
-edit d64edb7 chouette!
-Rebasing (1/1)
Stopped at d64edb7...  chouette!
-You can amend the commit now, with
-
-  git commit --amend 
-
-Once you are satisfied with your changes, run
-
-  git rebase --continue
-[detached HEAD 53dfc25] edited file7 again
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-error: 
-You have uncommitted changes in your working tree. Please, commit them
-first and then run 'git rebase --continue' again.
-ok 43 - auto-amend only edited commits after "edit"
-
-expecting success: 
-	test_tick &&
-	test_when_finished "git rebase --abort || :" &&
-	set_fake_editor &&
-	test_must_fail env FAKE_LINES="1 exec_false" git rebase -i HEAD^ &&
-	echo "edited again" > file7 &&
-	git add file7 &&
-	test_must_fail git rebase --continue 2>error &&
-	test_i18ngrep "you have staged changes in your working tree" error
+expecting success: 
+	test_tick &&
+	test_when_finished "git rebase --abort || :" &&
+	set_fake_editor &&
+	test_must_fail env FAKE_LINES="1 exec_false" git rebase -i HEAD^ &&
+	echo "edited again" > file7 &&
+	git add file7 &&
+	test_must_fail git rebase --continue 2>error &&
+	test_i18ngrep "you have staged changes in your working tree" error
 
 rebase -i script before editing:
 pick d64edb7 chouette!
@@ -90882,48 +89353,717 @@
 1..107
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t4000-diff-format.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4000-diff-format/.git/
-expecting success: 
-	git update-index --add path0 path1
-
-ok 1 - update-index --add two files with and without +x.
-
-expecting success: 
-	git diff-files -p >actual
-
-ok 2 - git diff-files -p after editing work tree.
-
-expecting success: 
-	compare_diff_patch expected actual
+*** t3910-mac-os-precompose.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3910-mac-os-precompose/.git/
+checking prerequisite: UTF8_NFD_TO_NFC
 
-ok 3 - validate git diff-files -p output.
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
+	# 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/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t3512-cherry-pick-submodule.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3512-cherry-pick-submodule/.git/
 expecting success: 
-	git diff-files -s >actual 2>err &&
-	test_must_be_empty actual &&
-	test_must_be_empty err
-
-ok 4 - git diff-files -s after editing work tree
+		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/git-2.20.1/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1/.git/
+[master (root-commit) 395bd01] 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/git-2.20.1/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub2/.git/
+[master (root-commit) e31aa26] 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/git-2.20.1/t/trash directory.t3512-cherry-pick-submodule/submodule_update_repo/.git/
+[master (root-commit) 70ad6aa] 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/git-2.20.1/t/trash directory.t3512-cherry-pick-submodule/submodule_update_repo/sub1'...
+done.
+Cloning into '/build/git-2.20.1/t/trash directory.t3512-cherry-pick-submodule/submodule_update_repo/uninitialized_sub'...
+done.
+[add_sub1 0240a16] 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'
+Removing uninitialized_sub
+Removing sub1
+Removing .gitmodules
+[remove_sub1 83e09ee] Revert "Add sub1"
+ Author: A U Thor <author@example.com>
+ Date: Thu Jan 5 11:48:05 2023 +0000
+ 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 4df0c81] 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/git-2.20.1/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1
+ * [new branch]      modifications -> modifications
+[modify_sub1 f7ece45] 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/git-2.20.1/t/trash directory.t3512-cherry-pick-submodule/submodule_update_repo/sub1/sub2'...
+done.
+[add_nested_sub ef493c7] 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 8a63f2f] 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 0d2dbf3] 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 7a83dc8] update nested sub
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[modify_sub1_recursively 05a9df8] update sub1, that updates nested sub
+ Author: A U Thor <author@example.com>
+To /build/git-2.20.1/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1
+ * [new branch]      modify_sub1_recursively -> modify_sub1_recursively
+To /build/git-2.20.1/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 '395bd01d4bae6c749a897d7fdae2ce17858a1ef9'
+Previous HEAD position was 395bd01 Base inside first submodule
+Switched to branch 'modifications'
+rm 'sub1'
+[replace_sub1_with_directory b3be329] 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'
+Removing sub1/file3
+Removing sub1/file2
+Removing sub1/file1
+Adding sub1
+[replace_directory_with_sub1 2f473fa] Revert "Replace sub1 with directory"
+ Author: A U Thor <author@example.com>
+ Date: Thu Jan 5 11:48:08 2023 +0000
+ 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 1e55f76] 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 59336e7] Revert "Replace sub1 with file"
+ Author: A U Thor <author@example.com>
+ Date: Thu Jan 5 11:48:08 2023 +0000
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+ mode change 100644 => 160000 sub1
+Switched to a new branch 'invalid_sub1'
+[invalid_sub1 1413c75] Invalid sub1 commit
+ Author: A U Thor <author@example.com>
+Switched to a new branch 'valid_sub1'
+[valid_sub1 c174140] Revert "Invalid sub1 commit"
+ Author: A U Thor <author@example.com>
+ Date: Thu Jan 5 11:48:08 2023 +0000
+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 remote branch 'no_submodule' from 'origin'.
+Branch 'add_sub1' set up to track remote branch 'add_sub1' from 'origin'.
+[no_submodule 439a715] Add sub1
+ Author: A U Thor <author@example.com>
+ Date: Thu Jan 5 11:48:05 2023 +0000
+ 2 files changed, 8 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 uninitialized_sub
+Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/git-2.20.1/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/git-2.20.1/t/trash directory.t3512-cherry-pick-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/git-2.20.1/t/trash directory.t3512-cherry-pick-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '395bd01d4bae6c749a897d7fdae2ce17858a1ef9'
+Submodule path 'uninitialized_sub': checked out '395bd01d4bae6c749a897d7fdae2ce17858a1ef9'
+ok 1 - git cherry-pick: added submodule creates empty directory
 
 expecting success: 
-	git diff-files --no-patch >actual 2>err &&
-	test_must_be_empty actual &&
-	test_must_be_empty err
-
-ok 5 - git diff-files --no-patch as synonym for -s
+		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 remote branch 'no_submodule' from 'origin'.
+Branch 'add_sub1' set up to track remote branch 'add_sub1' from 'origin'.
+[no_submodule d3b7ec4] Add sub1
+ Author: A U Thor <author@example.com>
+ Date: Thu Jan 5 11:48:05 2023 +0000
+ 2 files changed, 8 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 uninitialized_sub
+Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/git-2.20.1/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/git-2.20.1/t/trash directory.t3512-cherry-pick-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/git-2.20.1/t/trash directory.t3512-cherry-pick-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '395bd01d4bae6c749a897d7fdae2ce17858a1ef9'
+Submodule path 'uninitialized_sub': checked out '395bd01d4bae6c749a897d7fdae2ce17858a1ef9'
+ok 2 - git cherry-pick: added submodule leaves existing empty directory alone
 
 expecting success: 
-	git diff-files --no-patch --patch >actual &&
-	compare_diff_patch expected actual
-
-ok 6 - git diff-files --no-patch --patch shows the patch
+		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 remote branch 'replace_sub1_with_file' from 'origin'.
+fatal: Needed a single revision
+Branch 'replace_file_with_sub1' set up to track remote branch 'replace_file_with_sub1' from 'origin'.
+[replace_sub1_with_file 3836add] Revert "Replace sub1 with file"
+ Author: A U Thor <author@example.com>
+ Date: Thu Jan 5 11:48:08 2023 +0000
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+ mode change 100644 => 160000 sub1
+Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/git-2.20.1/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/git-2.20.1/t/trash directory.t3512-cherry-pick-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/git-2.20.1/t/trash directory.t3512-cherry-pick-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '395bd01d4bae6c749a897d7fdae2ce17858a1ef9'
+Submodule path 'uninitialized_sub': checked out '395bd01d4bae6c749a897d7fdae2ce17858a1ef9'
+ok 3 - git cherry-pick: replace tracked file with submodule creates empty directory
 
-expecting success: 
-	git diff-files --no-patch --patch-with-raw >actual &&
-	grep -q "^:100644 100755 .* 0000000000000000000000000000000000000000 M	path0\$" actual &&
-	tail -n +4 actual >actual-patch &&
-	compare_diff_patch expected actual-patch
+checking known breakage: 
+		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 remote branch 'replace_sub1_with_directory' from 'origin'.
+fatal: Needed a single revision
+Branch 'replace_directory_with_sub1' set up to track remote branch 'replace_directory_with_sub1' from 'origin'.
+Removing sub1/file3
+Removing sub1/file2
+Removing sub1/file1
+Adding sub1
+[replace_sub1_with_directory d2ad536] Revert "Replace sub1 with directory"
+ Author: A U Thor <author@example.com>
+ Date: Thu Jan 5 11:48:08 2023 +0000
+ 4 files changed, 4 insertions(+), 3 deletions(-)
+ delete mode 100644 sub1/file1
+ delete mode 100644 sub1/file2
+ delete mode 100644 sub1/file3
+Directory sub1 doesn't exist. 
+not ok 4 - git cherry-pick: replace directory with submodule # TODO known breakage
+
+expecting success: 
+		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 remote branch 'add_sub1' from 'origin'.
+Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/git-2.20.1/t/trash directory.t3512-cherry-pick-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '395bd01d4bae6c749a897d7fdae2ce17858a1ef9'
+Branch 'remove_sub1' set up to track remote branch 'remove_sub1' from 'origin'.
+Removing uninitialized_sub
+Removing sub1
+Removing .gitmodules
+[add_sub1 c4e14aa] Revert "Add sub1"
+ Author: A U Thor <author@example.com>
+ Date: Thu Jan 5 11:48:05 2023 +0000
+ 3 files changed, 9 deletions(-)
+ delete mode 100644 .gitmodules
+ delete mode 160000 sub1
+ delete mode 160000 uninitialized_sub
+ok 5 - git cherry-pick: removed submodule leaves submodule directory and its contents in place
+
+expecting success: 
+		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 remote branch 'add_sub1' from 'origin'.
+Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/git-2.20.1/t/trash directory.t3512-cherry-pick-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '395bd01d4bae6c749a897d7fdae2ce17858a1ef9'
+Branch 'remove_sub1' set up to track remote branch 'remove_sub1' from 'origin'.
+Removing uninitialized_sub
+Removing sub1
+Removing .gitmodules
+[add_sub1 5ad629f] Revert "Add sub1"
+ Author: A U Thor <author@example.com>
+ Date: Thu Jan 5 11:48:05 2023 +0000
+ 3 files changed, 9 deletions(-)
+ delete mode 100644 .gitmodules
+ delete mode 160000 sub1
+ delete mode 160000 uninitialized_sub
+ok 6 - git cherry-pick: removed submodule leaves submodule containing a .git directory alone
+
+checking known breakage: 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
+			test_must_fail $command replace_sub1_with_directory &&
+			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 remote branch 'add_sub1' from 'origin'.
+Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/git-2.20.1/t/trash directory.t3512-cherry-pick-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '395bd01d4bae6c749a897d7fdae2ce17858a1ef9'
+Branch 'replace_sub1_with_directory' set up to track remote branch 'replace_sub1_with_directory' from 'origin'.
+error: refusing to lose untracked file at 'sub1/file2'
+error: refusing to lose untracked file at 'sub1/file1'
+Adding sub1/file3
+Adding sub1/file2
+Adding sub1/file1
+Removing sub1
+[add_sub1 9ac2d2a] Replace sub1 with directory
+ Author: A U Thor <author@example.com>
+ Date: Thu Jan 5 11:48:08 2023 +0000
+ 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
+test_must_fail: command succeeded: git cherry-pick replace_sub1_with_directory
+not ok 7 - git cherry-pick: replace submodule with a directory must fail # TODO known breakage
+
+checking known breakage: 
+		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 &&
+			test_must_fail $command replace_sub1_with_directory &&
+			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 remote branch 'add_sub1' from 'origin'.
+Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/git-2.20.1/t/trash directory.t3512-cherry-pick-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '395bd01d4bae6c749a897d7fdae2ce17858a1ef9'
+Branch 'replace_sub1_with_directory' set up to track remote branch 'replace_sub1_with_directory' from 'origin'.
+error: refusing to lose untracked file at 'sub1/file2'
+error: refusing to lose untracked file at 'sub1/file1'
+Adding sub1/file3
+Adding sub1/file2
+Adding sub1/file1
+Removing sub1
+[add_sub1 c490a48] Replace sub1 with directory
+ Author: A U Thor <author@example.com>
+ Date: Thu Jan 5 11:48:08 2023 +0000
+ 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
+test_must_fail: command succeeded: git cherry-pick replace_sub1_with_directory
+not ok 8 - git cherry-pick: replace submodule containing a .git directory with a directory must fail # TODO known breakage
+
+checking known breakage: 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
+			test_must_fail $command replace_sub1_with_file &&
+			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 remote branch 'add_sub1' from 'origin'.
+Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/git-2.20.1/t/trash directory.t3512-cherry-pick-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '395bd01d4bae6c749a897d7fdae2ce17858a1ef9'
+Branch 'replace_sub1_with_file' set up to track remote branch 'replace_sub1_with_file' from 'origin'.
+[add_sub1 b5628f9] Replace sub1 with file
+ Author: A U Thor <author@example.com>
+ Date: Thu Jan 5 11:48:08 2023 +0000
+ 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 cherry-pick: replace submodule with a file must fail # TODO known breakage
+
+checking known breakage: 
+		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 &&
+			test_must_fail $command replace_sub1_with_file &&
+			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 remote branch 'add_sub1' from 'origin'.
+Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/git-2.20.1/t/trash directory.t3512-cherry-pick-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '395bd01d4bae6c749a897d7fdae2ce17858a1ef9'
+Branch 'replace_sub1_with_file' set up to track remote branch 'replace_sub1_with_file' from 'origin'.
+[add_sub1 a305d34] Replace sub1 with file
+ Author: A U Thor <author@example.com>
+ Date: Thu Jan 5 11:48:08 2023 +0000
+ 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 cherry-pick: replace submodule containing a .git directory with a file must fail # TODO known breakage
+
+expecting success: 
+		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 remote branch 'add_sub1' from 'origin'.
+Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/git-2.20.1/t/trash directory.t3512-cherry-pick-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '395bd01d4bae6c749a897d7fdae2ce17858a1ef9'
+Branch 'modify_sub1' set up to track remote branch 'modify_sub1' from 'origin'.
+[add_sub1 d67f8ae] Modify sub1
+ Author: A U Thor <author@example.com>
+ Date: Thu Jan 5 11:48:06 2023 +0000
+Submodule path 'sub1': checked out '4df0c81e15f5458fe3eaad9b7a5391e26e6376ad'
+ok 11 - git cherry-pick: modified submodule does not update submodule work tree
+
+expecting success: 
+		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 remote branch 'add_sub1' from 'origin'.
+Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/git-2.20.1/t/trash directory.t3512-cherry-pick-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '395bd01d4bae6c749a897d7fdae2ce17858a1ef9'
+Branch 'invalid_sub1' set up to track remote branch 'invalid_sub1' from 'origin'.
+[add_sub1 2999b46] Invalid sub1 commit
+ Author: A U Thor <author@example.com>
+ Date: Thu Jan 5 11:48:08 2023 +0000
+error: Server does not allow request for unadvertised object 0123456789012345678901234567890123456789
+Fetched in submodule path 'sub1', but it did not contain 0123456789012345678901234567890123456789. Direct fetching of that commit failed.
+ok 12 - git cherry-pick: modified submodule does not update submodule work tree to invalid commit
+
+expecting success: 
+		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 remote branch 'invalid_sub1' from 'origin'.
+fatal: Needed a single revision
+Branch 'valid_sub1' set up to track remote branch 'valid_sub1' from 'origin'.
+[invalid_sub1 90297bf] Revert "Invalid sub1 commit"
+ Author: A U Thor <author@example.com>
+ Date: Thu Jan 5 11:48:08 2023 +0000
+Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/git-2.20.1/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/git-2.20.1/t/trash directory.t3512-cherry-pick-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/git-2.20.1/t/trash directory.t3512-cherry-pick-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '395bd01d4bae6c749a897d7fdae2ce17858a1ef9'
+Submodule path 'uninitialized_sub': checked out '395bd01d4bae6c749a897d7fdae2ce17858a1ef9'
+ok 13 - git cherry-pick: modified submodule does not update submodule work tree from invalid commit
+
+expecting success: 
+		prolog &&
+		reset_work_tree_to 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 remote branch 'no_submodule' from 'origin'.
+Branch 'add_sub1' set up to track remote branch 'add_sub1' from 'origin'.
+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 d86c04b964e19a01bac4223237007e76cd9d93da failed
+fatal: cherry-pick failed
+ok 14 - git cherry-pick: added submodule doesn't remove untracked unignored file with same name
+
+expecting success: 
+	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 master &&
+
+		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/git-2.20.1/t/trash directory.t3512-cherry-pick-submodule/sub/.git/
+[master (root-commit) f38c21f] 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/git-2.20.1/t/trash directory.t3512-cherry-pick-submodule/a_repo/.git/
+[master (root-commit) f9cf74a] 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 4eec8eb] 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 3644912] modify a file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Switched to branch 'master'
+Cloning into '/build/git-2.20.1/t/trash directory.t3512-cherry-pick-submodule/a_repo/sub'...
+done.
+[master c2f6785] 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
+Adding sub
+[master db2558c] modify a file
+ Author: A U Thor <author@example.com>
+ Date: Thu Jan 5 11:48:27 2023 +0000
+ 1 file changed, 1 insertion(+)
+ok 15 - unrelated submodule/file conflict is ignored
+
+# still have 5 known breakage(s)
+# passed all remaining 10 test(s)
+1..15
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t4000-diff-format.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4000-diff-format/.git/
+expecting success: 
+	git update-index --add path0 path1
+
+ok 1 - update-index --add two files with and without +x.
+
+expecting success: 
+	git diff-files -p >actual
+
+ok 2 - git diff-files -p after editing work tree.
+
+expecting success: 
+	compare_diff_patch expected actual
+
+ok 3 - validate git diff-files -p output.
+
+expecting success: 
+	git diff-files -s >actual 2>err &&
+	test_must_be_empty actual &&
+	test_must_be_empty err
+
+ok 4 - git diff-files -s after editing work tree
+
+expecting success: 
+	git diff-files --no-patch >actual 2>err &&
+	test_must_be_empty actual &&
+	test_must_be_empty err
+
+ok 5 - git diff-files --no-patch as synonym for -s
+
+expecting success: 
+	git diff-files --no-patch --patch >actual &&
+	compare_diff_patch expected actual
+
+ok 6 - git diff-files --no-patch --patch shows the patch
+
+expecting success: 
+	git diff-files --no-patch --patch-with-raw >actual &&
+	grep -q "^:100644 100755 .* 0000000000000000000000000000000000000000 M	path0\$" actual &&
+	tail -n +4 actual >actual-patch &&
+	compare_diff_patch expected actual-patch
 
 ok 7 - git diff-files --no-patch --patch-with-raw shows the patch and raw data
 
@@ -91556,21 +90696,21 @@
 		)
 	
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3513-revert-submodule/submodule_update_sub1/.git/
-[master (root-commit) 1d81b82] Base inside first submodule
+[master (root-commit) fa213d7] 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/git-2.20.1/t/trash directory.t3513-revert-submodule/submodule_update_sub2/.git/
-[master (root-commit) dc298c3] nested submodule base
+[master (root-commit) d8e25e8] 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/git-2.20.1/t/trash directory.t3513-revert-submodule/submodule_update_repo/.git/
-[master (root-commit) cec7288] Base
+[master (root-commit) 70ad6aa] Base
  Author: A U Thor <author@example.com>
  3 files changed, 4 insertions(+)
  create mode 100644 .gitignore
@@ -91581,7 +90721,7 @@
 done.
 Cloning into '/build/git-2.20.1/t/trash directory.t3513-revert-submodule/submodule_update_repo/uninitialized_sub'...
 done.
-[add_sub1 d6b3584] Add sub1
+[add_sub1 7d9bb19] Add sub1
  Author: A U Thor <author@example.com>
  2 files changed, 8 insertions(+)
  create mode 100644 .gitmodules
@@ -91590,45 +90730,45 @@
 Removing uninitialized_sub
 Removing sub1
 Removing .gitmodules
-[remove_sub1 9921a80] Revert "Add sub1"
+[remove_sub1 c129263] Revert "Add sub1"
  Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:06:17 2021 +0000
+ Date: Thu Jan 5 11:48:06 2023 +0000
  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 fa696c4] modified file2 and added file3
+[modifications dbf149a] 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/git-2.20.1/t/trash directory.t3513-revert-submodule/submodule_update_sub1
  * [new branch]      modifications -> modifications
-[modify_sub1 8d83a56] Modify sub1
+[modify_sub1 5a106ba] 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/git-2.20.1/t/trash directory.t3513-revert-submodule/submodule_update_repo/sub1/sub2'...
 done.
-[add_nested_sub bb02b03] add a nested submodule
+[add_nested_sub 9d2f406] 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 b84cb4d] update submodule, that updates a nested submodule
+[add_nested_sub e7141df] 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 0c37146] make a change in nested sub
+[modify_sub1_recursively 0f5500c] 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 9ea34d2] update nested sub
+[modify_sub1_recursively e1529bb] update nested sub
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-[modify_sub1_recursively 839d0d6] update sub1, that updates nested sub
+[modify_sub1_recursively 822600a] update sub1, that updates nested sub
  Author: A U Thor <author@example.com>
 To /build/git-2.20.1/t/trash directory.t3513-revert-submodule/submodule_update_sub1
  * [new branch]      modify_sub1_recursively -> modify_sub1_recursively
@@ -91637,11 +90777,11 @@
 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 '1d81b82788f164a9e8ecd1585fb76ef5eea5ba4a'
-Previous HEAD position was 1d81b82 Base inside first submodule
+Submodule path 'sub1': checked out 'fa213d76242e6e2373b3e474aa67ae5cefa59bd2'
+Previous HEAD position was fa213d7 Base inside first submodule
 Switched to branch 'modifications'
 rm 'sub1'
-[replace_sub1_with_directory 292d308] Replace sub1 with directory
+[replace_sub1_with_directory 9462f9d] Replace sub1 with directory
  Author: A U Thor <author@example.com>
  5 files changed, 3 insertions(+), 5 deletions(-)
  delete mode 160000 sub1
@@ -91653,32 +90793,32 @@
 Removing sub1/file2
 Removing sub1/file1
 Adding sub1
-[replace_directory_with_sub1 55bc5c3] Revert "Replace sub1 with directory"
+[replace_directory_with_sub1 c7b31e2] Revert "Replace sub1 with directory"
  Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:06:21 2021 +0000
+ Date: Thu Jan 5 11:48:09 2023 +0000
  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 805213d] Replace sub1 with file
+[replace_sub1_with_file fcd08ed] 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 12528f5] Revert "Replace sub1 with file"
+[replace_file_with_sub1 6761142] Revert "Replace sub1 with file"
  Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:06:21 2021 +0000
+ Date: Thu Jan 5 11:48:09 2023 +0000
  2 files changed, 5 insertions(+), 1 deletion(-)
  mode change 100644 => 160000 sub1
 Switched to a new branch 'invalid_sub1'
-[invalid_sub1 c950211] Invalid sub1 commit
+[invalid_sub1 b082960] Invalid sub1 commit
  Author: A U Thor <author@example.com>
 Switched to a new branch 'valid_sub1'
-[valid_sub1 21751a7] Revert "Invalid sub1 commit"
+[valid_sub1 7b47744] Revert "Invalid sub1 commit"
  Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:06:21 2021 +0000
+ Date: Thu Jan 5 11:48:09 2023 +0000
 warning: unable to rmdir 'uninitialized_sub': Directory not empty
 Switched to branch 'master'
 Cloning into 'submodule_update'...
@@ -91691,16 +90831,16 @@
 Removing uninitialized_sub
 Removing sub1
 Removing .gitmodules
-[add_sub1 1a4b5c9] Revert "Add sub1"
+[add_sub1 92db9f3] Revert "Add sub1"
  Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:06:21 2021 +0000
+ Date: Thu Jan 5 11:48:10 2023 +0000
  3 files changed, 9 deletions(-)
  delete mode 100644 .gitmodules
  delete mode 160000 sub1
  delete mode 160000 uninitialized_sub
-[add_sub1 2c4b51e] Revert "Revert "Add sub1""
+[add_sub1 bf3aef8] Revert "Revert "Add sub1""
  Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:06:21 2021 +0000
+ Date: Thu Jan 5 11:48:10 2023 +0000
  2 files changed, 8 insertions(+)
  create mode 100644 .gitmodules
  create mode 160000 uninitialized_sub
@@ -91710,8 +90850,8 @@
 done.
 Cloning into '/build/git-2.20.1/t/trash directory.t3513-revert-submodule/submodule_update/uninitialized_sub'...
 done.
-Submodule path 'sub1': checked out '1d81b82788f164a9e8ecd1585fb76ef5eea5ba4a'
-Submodule path 'uninitialized_sub': checked out '1d81b82788f164a9e8ecd1585fb76ef5eea5ba4a'
+Submodule path 'sub1': checked out 'fa213d76242e6e2373b3e474aa67ae5cefa59bd2'
+Submodule path 'uninitialized_sub': checked out 'fa213d76242e6e2373b3e474aa67ae5cefa59bd2'
 ok 1 - git_revert: added submodule creates empty directory
 
 expecting success: 
@@ -91738,16 +90878,16 @@
 Removing uninitialized_sub
 Removing sub1
 Removing .gitmodules
-[add_sub1 5c4d45b] Revert "Add sub1"
+[add_sub1 5eb127d] Revert "Add sub1"
  Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:06:23 2021 +0000
+ Date: Thu Jan 5 11:48:12 2023 +0000
  3 files changed, 9 deletions(-)
  delete mode 100644 .gitmodules
  delete mode 160000 sub1
  delete mode 160000 uninitialized_sub
-[add_sub1 23647f4] Revert "Revert "Add sub1""
+[add_sub1 f795d6f] Revert "Revert "Add sub1""
  Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:06:23 2021 +0000
+ Date: Thu Jan 5 11:48:12 2023 +0000
  2 files changed, 8 insertions(+)
  create mode 100644 .gitmodules
  create mode 160000 uninitialized_sub
@@ -91757,8 +90897,8 @@
 done.
 Cloning into '/build/git-2.20.1/t/trash directory.t3513-revert-submodule/submodule_update/uninitialized_sub'...
 done.
-Submodule path 'sub1': checked out '1d81b82788f164a9e8ecd1585fb76ef5eea5ba4a'
-Submodule path 'uninitialized_sub': checked out '1d81b82788f164a9e8ecd1585fb76ef5eea5ba4a'
+Submodule path 'sub1': checked out 'fa213d76242e6e2373b3e474aa67ae5cefa59bd2'
+Submodule path 'uninitialized_sub': checked out 'fa213d76242e6e2373b3e474aa67ae5cefa59bd2'
 ok 2 - git_revert: added submodule leaves existing empty directory alone
 
 expecting success: 
@@ -91782,14 +90922,14 @@
 Branch 'replace_file_with_sub1' set up to track remote branch 'replace_file_with_sub1' from 'origin'.
 Switched to branch 'replace_file_with_sub1'
 Your branch is up to date with 'origin/replace_file_with_sub1'.
-[replace_file_with_sub1 b7bd74d] Revert "Revert "Replace sub1 with file""
+[replace_file_with_sub1 ad27dd5] Revert "Revert "Replace sub1 with file""
  Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:06:24 2021 +0000
+ Date: Thu Jan 5 11:48:14 2023 +0000
  2 files changed, 1 insertion(+), 5 deletions(-)
  mode change 160000 => 100644 sub1
-[replace_file_with_sub1 c88983b] Revert "Revert "Revert "Replace sub1 with file"""
+[replace_file_with_sub1 0f22550] Revert "Revert "Revert "Replace sub1 with file"""
  Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:06:24 2021 +0000
+ Date: Thu Jan 5 11:48:14 2023 +0000
  2 files changed, 5 insertions(+), 1 deletion(-)
  mode change 100644 => 160000 sub1
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t3513-revert-submodule/submodule_update_sub1) registered for path 'sub1'
@@ -91798,8 +90938,8 @@
 done.
 Cloning into '/build/git-2.20.1/t/trash directory.t3513-revert-submodule/submodule_update/uninitialized_sub'...
 done.
-Submodule path 'sub1': checked out '1d81b82788f164a9e8ecd1585fb76ef5eea5ba4a'
-Submodule path 'uninitialized_sub': checked out '1d81b82788f164a9e8ecd1585fb76ef5eea5ba4a'
+Submodule path 'sub1': checked out 'fa213d76242e6e2373b3e474aa67ae5cefa59bd2'
+Submodule path 'uninitialized_sub': checked out 'fa213d76242e6e2373b3e474aa67ae5cefa59bd2'
 ok 3 - git_revert: replace tracked file with submodule creates empty directory
 
 checking known breakage: 
@@ -91827,9 +90967,9 @@
 Adding sub1/file2
 Adding sub1/file1
 Removing sub1
-[replace_directory_with_sub1 cba1c4f] Revert "Revert "Replace sub1 with directory""
+[replace_directory_with_sub1 f4a52d9] Revert "Revert "Replace sub1 with directory""
  Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:06:25 2021 +0000
+ Date: Thu Jan 5 11:48:15 2023 +0000
  5 files changed, 3 insertions(+), 5 deletions(-)
  delete mode 160000 sub1
  create mode 100644 sub1/file1
@@ -91839,9 +90979,9 @@
 Removing sub1/file2
 Removing sub1/file1
 Adding sub1
-[replace_directory_with_sub1 1c828b4] Revert "Revert "Revert "Replace sub1 with directory"""
+[replace_directory_with_sub1 84da64e] Revert "Revert "Revert "Replace sub1 with directory"""
  Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:06:25 2021 +0000
+ Date: Thu Jan 5 11:48:15 2023 +0000
  4 files changed, 4 insertions(+), 3 deletions(-)
  delete mode 100644 sub1/file1
  delete mode 100644 sub1/file2
@@ -91867,23 +91007,23 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t3513-revert-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t3513-revert-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out '1d81b82788f164a9e8ecd1585fb76ef5eea5ba4a'
+Submodule path 'sub1': checked out 'fa213d76242e6e2373b3e474aa67ae5cefa59bd2'
 Branch 'remove_sub1' set up to track remote branch 'remove_sub1' from 'origin'.
 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 579b26e] Revert "Revert "Add sub1""
+[remove_sub1 3edcc30] Revert "Revert "Add sub1""
  Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:06:26 2021 +0000
+ Date: Thu Jan 5 11:48:16 2023 +0000
  2 files changed, 8 insertions(+)
  create mode 100644 .gitmodules
  create mode 160000 uninitialized_sub
 Removing uninitialized_sub
 Removing sub1
 Removing .gitmodules
-[remove_sub1 6bc9963] Revert "Revert "Revert "Add sub1"""
+[remove_sub1 3a1a046] Revert "Revert "Revert "Add sub1"""
  Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:06:26 2021 +0000
+ Date: Thu Jan 5 11:48:17 2023 +0000
  3 files changed, 9 deletions(-)
  delete mode 100644 .gitmodules
  delete mode 160000 sub1
@@ -91910,23 +91050,23 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t3513-revert-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t3513-revert-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out '1d81b82788f164a9e8ecd1585fb76ef5eea5ba4a'
+Submodule path 'sub1': checked out 'fa213d76242e6e2373b3e474aa67ae5cefa59bd2'
 Branch 'remove_sub1' set up to track remote branch 'remove_sub1' from 'origin'.
 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 0949354] Revert "Revert "Add sub1""
+[remove_sub1 7b7a83b] Revert "Revert "Add sub1""
  Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:06:27 2021 +0000
+ Date: Thu Jan 5 11:48:18 2023 +0000
  2 files changed, 8 insertions(+)
  create mode 100644 .gitmodules
  create mode 160000 uninitialized_sub
 Removing uninitialized_sub
 Removing sub1
 Removing .gitmodules
-[remove_sub1 8e90837] Revert "Revert "Revert "Add sub1"""
+[remove_sub1 56d8982] Revert "Revert "Revert "Add sub1"""
  Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:06:27 2021 +0000
+ Date: Thu Jan 5 11:48:18 2023 +0000
  3 files changed, 9 deletions(-)
  delete mode 100644 .gitmodules
  delete mode 160000 sub1
@@ -91951,7 +91091,7 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t3513-revert-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t3513-revert-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out '1d81b82788f164a9e8ecd1585fb76ef5eea5ba4a'
+Submodule path 'sub1': checked out 'fa213d76242e6e2373b3e474aa67ae5cefa59bd2'
 Branch 'replace_sub1_with_directory' set up to track remote branch 'replace_sub1_with_directory' from 'origin'.
 error: The following untracked working tree files would be overwritten by checkout:
 	sub1/file1
@@ -91980,7 +91120,7 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t3513-revert-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t3513-revert-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out '1d81b82788f164a9e8ecd1585fb76ef5eea5ba4a'
+Submodule path 'sub1': checked out 'fa213d76242e6e2373b3e474aa67ae5cefa59bd2'
 Branch 'replace_sub1_with_directory' set up to track remote branch 'replace_sub1_with_directory' from 'origin'.
 error: The following untracked working tree files would be overwritten by checkout:
 	sub1/file1
@@ -92007,18 +91147,18 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t3513-revert-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t3513-revert-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out '1d81b82788f164a9e8ecd1585fb76ef5eea5ba4a'
+Submodule path 'sub1': checked out 'fa213d76242e6e2373b3e474aa67ae5cefa59bd2'
 Branch 'replace_sub1_with_file' set up to track remote branch 'replace_sub1_with_file' from 'origin'.
 Switched to branch 'replace_sub1_with_file'
 Your branch is up to date with 'origin/replace_sub1_with_file'.
-[replace_sub1_with_file 810971b] Revert "Replace sub1 with file"
+[replace_sub1_with_file 90379ae] Revert "Replace sub1 with file"
  Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:06:29 2021 +0000
+ Date: Thu Jan 5 11:48:22 2023 +0000
  2 files changed, 5 insertions(+), 1 deletion(-)
  mode change 100644 => 160000 sub1
-[replace_sub1_with_file eea05d0] Revert "Revert "Replace sub1 with file""
+[replace_sub1_with_file 0e14edf] Revert "Revert "Replace sub1 with file""
  Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:06:29 2021 +0000
+ Date: Thu Jan 5 11:48:22 2023 +0000
  2 files changed, 1 insertion(+), 5 deletions(-)
  mode change 160000 => 100644 sub1
 test_must_fail: command succeeded: git_revert replace_sub1_with_file
@@ -92044,18 +91184,18 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t3513-revert-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t3513-revert-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out '1d81b82788f164a9e8ecd1585fb76ef5eea5ba4a'
+Submodule path 'sub1': checked out 'fa213d76242e6e2373b3e474aa67ae5cefa59bd2'
 Branch 'replace_sub1_with_file' set up to track remote branch 'replace_sub1_with_file' from 'origin'.
 Switched to branch 'replace_sub1_with_file'
 Your branch is up to date with 'origin/replace_sub1_with_file'.
-[replace_sub1_with_file ceec8de] Revert "Replace sub1 with file"
+[replace_sub1_with_file 7615310] Revert "Replace sub1 with file"
  Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:06:30 2021 +0000
+ Date: Thu Jan 5 11:48:23 2023 +0000
  2 files changed, 5 insertions(+), 1 deletion(-)
  mode change 100644 => 160000 sub1
-[replace_sub1_with_file f736336] Revert "Revert "Replace sub1 with file""
+[replace_sub1_with_file ee947cd] Revert "Revert "Replace sub1 with file""
  Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:06:30 2021 +0000
+ Date: Thu Jan 5 11:48:24 2023 +0000
  2 files changed, 1 insertion(+), 5 deletions(-)
  mode change 160000 => 100644 sub1
 test_must_fail: command succeeded: git_revert replace_sub1_with_file
@@ -92081,17 +91221,17 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t3513-revert-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t3513-revert-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out '1d81b82788f164a9e8ecd1585fb76ef5eea5ba4a'
+Submodule path 'sub1': checked out 'fa213d76242e6e2373b3e474aa67ae5cefa59bd2'
 Branch 'modify_sub1' set up to track remote branch 'modify_sub1' from 'origin'.
 Switched to branch 'modify_sub1'
 Your branch is up to date with 'origin/modify_sub1'.
-[modify_sub1 9d5aa72] Revert "Modify sub1"
+[modify_sub1 7a2c2f9] Revert "Modify sub1"
  Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:06:30 2021 +0000
-[modify_sub1 8e0cd33] Revert "Revert "Modify sub1""
+ Date: Thu Jan 5 11:48:25 2023 +0000
+[modify_sub1 9f1e65b] Revert "Revert "Modify sub1""
  Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:06:30 2021 +0000
-Submodule path 'sub1': checked out 'fa696c4e09002ca943ec0d6c2311d4662a01f3af'
+ Date: Thu Jan 5 11:48:25 2023 +0000
+Submodule path 'sub1': checked out 'dbf149a8b07ce9da970e15c0501fcc75e1428434'
 ok 11 - git_revert: modified submodule does not update submodule work tree
 
 expecting success: 
@@ -92114,16 +91254,16 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t3513-revert-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t3513-revert-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out '1d81b82788f164a9e8ecd1585fb76ef5eea5ba4a'
+Submodule path 'sub1': checked out 'fa213d76242e6e2373b3e474aa67ae5cefa59bd2'
 Branch 'invalid_sub1' set up to track remote branch 'invalid_sub1' from 'origin'.
 Switched to branch 'invalid_sub1'
 Your branch is up to date with 'origin/invalid_sub1'.
-[invalid_sub1 0406422] Revert "Invalid sub1 commit"
+[invalid_sub1 518d169] Revert "Invalid sub1 commit"
  Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:06:31 2021 +0000
-[invalid_sub1 501d44c] Revert "Revert "Invalid sub1 commit""
+ Date: Thu Jan 5 11:48:27 2023 +0000
+[invalid_sub1 5bb6f54] Revert "Revert "Invalid sub1 commit""
  Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:06:31 2021 +0000
+ Date: Thu Jan 5 11:48:27 2023 +0000
 error: Server does not allow request for unadvertised object 0123456789012345678901234567890123456789
 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
@@ -92149,20 +91289,20 @@
 Branch 'valid_sub1' set up to track remote branch 'valid_sub1' from 'origin'.
 Switched to branch 'valid_sub1'
 Your branch is up to date with 'origin/valid_sub1'.
-[valid_sub1 67cbcc5] Revert "Revert "Invalid sub1 commit""
+[valid_sub1 c52c8d6] Revert "Revert "Invalid sub1 commit""
  Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:06:32 2021 +0000
-[valid_sub1 96b6bf2] Revert "Revert "Revert "Invalid sub1 commit"""
+ Date: Thu Jan 5 11:48:28 2023 +0000
+[valid_sub1 9cc34cf] Revert "Revert "Revert "Invalid sub1 commit"""
  Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:06:32 2021 +0000
+ Date: Thu Jan 5 11:48:28 2023 +0000
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t3513-revert-submodule/submodule_update_sub1) registered for path 'sub1'
 Submodule 'uninitialized_sub' (/build/git-2.20.1/t/trash directory.t3513-revert-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
 Cloning into '/build/git-2.20.1/t/trash directory.t3513-revert-submodule/submodule_update/sub1'...
 done.
 Cloning into '/build/git-2.20.1/t/trash directory.t3513-revert-submodule/submodule_update/uninitialized_sub'...
 done.
-Submodule path 'sub1': checked out '1d81b82788f164a9e8ecd1585fb76ef5eea5ba4a'
-Submodule path 'uninitialized_sub': checked out '1d81b82788f164a9e8ecd1585fb76ef5eea5ba4a'
+Submodule path 'sub1': checked out 'fa213d76242e6e2373b3e474aa67ae5cefa59bd2'
+Submodule path 'uninitialized_sub': checked out 'fa213d76242e6e2373b3e474aa67ae5cefa59bd2'
 ok 13 - git_revert: modified submodule does not update submodule work tree from invalid commit
 
 expecting success: 
@@ -92293,44 +91433,1135 @@
 1..4
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t4006-diff-mode.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4006-diff-mode/.git/
+*** t3420-rebase-autostash.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3420-rebase-autostash/.git/
 expecting success: 
-	echo frotz >rezrov &&
-	git update-index --add rezrov &&
-	tree=$(git write-tree) &&
-	echo $tree
+	echo hello-world >file0 &&
+	git add . &&
+	test_tick &&
+	git commit -m "initial commit" &&
+	git checkout -b feature-branch &&
+	echo another-hello >file1 &&
+	echo goodbye >file2 &&
+	git add . &&
+	test_tick &&
+	git commit -m "second commit" &&
+	echo final-goodbye >file3 &&
+	git add . &&
+	test_tick &&
+	git commit -m "third commit" &&
+	git checkout -b unrelated-onto-branch master &&
+	echo unrelated >file4 &&
+	git add . &&
+	test_tick &&
+	git commit -m "unrelated commit" &&
+	git checkout -b related-onto-branch master &&
+	echo conflicting-change >file2 &&
+	git add . &&
+	test_tick &&
+	git commit -m "related commit"
 
-5189e2f1ba2c164fa2006e4f8f4e4ec56f15291e
+[master (root-commit) bfa4f02] initial commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file0
+Switched to a new branch 'feature-branch'
+[feature-branch 6fe95e2] second commit
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 file1
+ create mode 100644 file2
+[feature-branch 0c4d2f1] third commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file3
+Switched to a new branch 'unrelated-onto-branch'
+[unrelated-onto-branch 4aede2f] unrelated commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file4
+Switched to a new branch 'related-onto-branch'
+[related-onto-branch c57d250] related commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file2
 ok 1 - setup
 
 expecting success: 
-	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
+	test_config rebase.autostash true &&
+	git reset --hard &&
+	git checkout -b behind-feature-branch feature-branch~1 &&
+	test_when_finished git branch -D behind-feature-branch &&
+	echo dirty >>file1 &&
+	git rebase feature-branch &&
+	grep dirty file1 &&
+	git checkout feature-branch
 
-ok 2 - chmod
+HEAD is now at c57d250 related commit
+Switched to a new branch 'behind-feature-branch'
+Created autostash: 9a740dd
+HEAD is now at 6fe95e2 second commit
+First, rewinding head to replay your work on top of it...
+Fast-forwarded behind-feature-branch to feature-branch.
+Applied autostash.
+dirty
+Switched to branch 'feature-branch'
+M	file1
+Deleted branch behind-feature-branch (was 0c4d2f1).
+ok 2 - rebase: fast-forward rebase
 
 expecting success: 
-	git commit -m rezrov &&
-	printf "\00\01\02\03\04\05\06" >binbin &&
-	git add binbin &&
-	git commit -m binbin
+	test_config rebase.autostash true &&
+	git reset --hard &&
+	git checkout -b same-feature-branch feature-branch &&
+	test_when_finished git branch -D same-feature-branch &&
+	echo dirty >>file1 &&
+	git rebase feature-branch &&
+	grep dirty file1 &&
+	git checkout feature-branch
+
+HEAD is now at 0c4d2f1 third commit
+Switched to a new branch 'same-feature-branch'
+Created autostash: 37616bd
+HEAD is now at 0c4d2f1 third commit
+Current branch same-feature-branch is up to date.
+Applied autostash.
+dirty
+Switched to branch 'feature-branch'
+M	file1
+Deleted branch same-feature-branch (was 0c4d2f1).
+ok 3 - rebase: noop rebase
+
+expecting success: 
+		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 4 - rebase: dirty worktree, --no-autostash
+
+expecting success: 
+		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 5 - rebase: dirty worktree, non-conflicting rebase
+
+expecting success: 
+		test_when_finished git branch -D rebased-feature-branch &&
+		suffix=${type#\ --} && suffix=${suffix:-am} &&
+		create_expected_success_$suffix &&
+		test_i18ncmp expected actual
+	
+Deleted branch rebased-feature-branch (was b607b14).
+ok 6 - rebase --autostash: check output
+
+expecting success: 
+		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: e9af673
+HEAD is now at 0c4d2f1 third commit
+First, rewinding head to replay your work on top of it...
+Applying: second commit
+Applying: third commit
+Applied autostash.
+unrelated
+dirty
+Switched to branch 'feature-branch'
+M	file3
+Deleted branch rebased-feature-branch (was b607b14).
+ok 7 - rebase: dirty index, non-conflicting rebase
+
+expecting success: 
+		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: cdca6ca
+HEAD is now at 0c4d2f1 third commit
+First, rewinding head to replay your work on top of it...
+Applying: second commit
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+Merging:
+c57d250 related commit
+virtual second commit
+found 1 common ancestor:
+virtual 4b825dc642cb6eb9a060e54bf8d69288fbee4904
+Auto-merging file2
+CONFLICT (add/add): Merge conflict in file2
+error: Failed to merge in the changes.
+hint: Use 'git am --show-current-patch' to see the failed patch
+Patch failed at 0001 second commit
+
+Resolve all conflicts manually, mark them as resolved with
+"git add/rm <conflicted_files>", then run "git rebase --continue".
+You can instead skip this commit: run "git rebase --skip".
+To abort and get back to the state before "git rebase", run "git rebase --abort".
+
+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 8 - rebase: conflicting rebase
+
+expecting success: 
+		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: cdca6ca
+HEAD is now at 0c4d2f1 third commit
+First, rewinding head to replay your work on top of it...
+Applying: second commit
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+Merging:
+c57d250 related commit
+virtual second commit
+found 1 common ancestor:
+virtual 4b825dc642cb6eb9a060e54bf8d69288fbee4904
+Auto-merging file2
+CONFLICT (add/add): Merge conflict in file2
+error: Failed to merge in the changes.
+hint: Use 'git am --show-current-patch' to see the failed patch
+Patch failed at 0001 second commit
+
+Resolve all conflicts manually, mark them as resolved with
+"git add/rm <conflicted_files>", then run "git rebase --continue".
+You can instead skip this commit: run "git rebase --skip".
+To abort and get back to the state before "git rebase", run "git rebase --abort".
+
+Applying: second commit
+Applying: third commit
+Applied autostash.
+dirty
+Switched to branch 'feature-branch'
+M	file3
+Deleted branch rebased-feature-branch (was 51f2c81).
+ok 9 - rebase: --continue
+
+expecting success: 
+		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: cdca6ca
+HEAD is now at 0c4d2f1 third commit
+First, rewinding head to replay your work on top of it...
+Applying: second commit
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+Merging:
+c57d250 related commit
+virtual second commit
+found 1 common ancestor:
+virtual 4b825dc642cb6eb9a060e54bf8d69288fbee4904
+Auto-merging file2
+CONFLICT (add/add): Merge conflict in file2
+error: Failed to merge in the changes.
+hint: Use 'git am --show-current-patch' to see the failed patch
+Patch failed at 0001 second commit
+
+Resolve all conflicts manually, mark them as resolved with
+"git add/rm <conflicted_files>", then run "git rebase --continue".
+You can instead skip this commit: run "git rebase --skip".
+To abort and get back to the state before "git rebase", run "git rebase --abort".
+
+Applying: third commit
+Applied autostash.
+dirty
+Switched to branch 'feature-branch'
+M	file3
+Deleted branch rebased-feature-branch (was fa02356).
+ok 10 - rebase: --skip
+
+expecting success: 
+		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: cdca6ca
+HEAD is now at 0c4d2f1 third commit
+First, rewinding head to replay your work on top of it...
+Applying: second commit
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+Merging:
+c57d250 related commit
+virtual second commit
+found 1 common ancestor:
+virtual 4b825dc642cb6eb9a060e54bf8d69288fbee4904
+Auto-merging file2
+CONFLICT (add/add): Merge conflict in file2
+error: Failed to merge in the changes.
+hint: Use 'git am --show-current-patch' to see the failed patch
+Patch failed at 0001 second commit
+
+Resolve all conflicts manually, mark them as resolved with
+"git add/rm <conflicted_files>", then run "git rebase --continue".
+You can instead skip this commit: run "git rebase --skip".
+To abort and get back to the state before "git rebase", run "git rebase --abort".
+
+Applied autostash.
+dirty
+Switched to branch 'feature-branch'
+M	file3
+Deleted branch rebased-feature-branch (was 0c4d2f1).
+ok 11 - rebase: --abort
+
+expecting success: 
+		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
+Merging:
+virtual Version stash was based on
+virtual Stashed changes
+found 1 common ancestor:
+virtual 28566cc718f43a597c158e8411c19d7048328a85
+On branch feature-branch
+Changes to be committed:
+  (use "git reset HEAD <file>..." to unstage)
+
+	new file:   file4
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+
+	actual
+	expected
+
+Dropped refs/stash@{0} (de4e47a31ead4744c6d223df2e4638effc5ff8b7)
+dirty
+ok 12 - rebase: non-conflicting rebase, conflicting stash
+
+expecting success: 
+		test_when_finished git branch -D rebased-feature-branch &&
+		suffix=${type#\ --} && suffix=${suffix:-am} &&
+		create_expected_failure_$suffix &&
+		test_i18ncmp expected actual
+	
+Deleted branch rebased-feature-branch (was b607b14).
+ok 13 - rebase: check output with conflicting stash
+
+expecting success: 
+		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 14 - rebase --merge: dirty worktree, --no-autostash
+
+expecting success: 
+		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 15 - rebase --merge: dirty worktree, non-conflicting rebase
+
+expecting success: 
+		test_when_finished git branch -D rebased-feature-branch &&
+		suffix=${type#\ --} && suffix=${suffix:-am} &&
+		create_expected_success_$suffix &&
+		test_i18ncmp expected actual
+	
+Deleted branch rebased-feature-branch (was b607b14).
+ok 16 - rebase --merge --autostash: check output
 
-[master (root-commit) 4eb7141] rezrov
+expecting success: 
+		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: e9af673
+HEAD is now at 0c4d2f1 third commit
+First, rewinding head to replay your work on top of it...
+Merging unrelated-onto-branch with HEAD~1
+Merging:
+4aede2f unrelated commit
+6fe95e2 second commit
+found 1 common ancestor:
+bfa4f02 initial commit
+[detached HEAD 54abd5c] second commit
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:14:13 2005 -0700
+ 2 files changed, 2 insertions(+)
+ create mode 100644 file1
+ create mode 100644 file2
+Committed: 0001 second commit
+Merging unrelated-onto-branch with HEAD~0
+Merging:
+54abd5c second commit
+0c4d2f1 third commit
+found 1 common ancestor:
+6fe95e2 second commit
+[detached HEAD b607b14] third commit
  Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:15:13 2005 -0700
  1 file changed, 1 insertion(+)
- create mode 100755 rezrov
-[master bff15b7] binbin
+ create mode 100644 file3
+Committed: 0002 third commit
+All done.
+Applied autostash.
+unrelated
+dirty
+Switched to branch 'feature-branch'
+M	file3
+Deleted branch rebased-feature-branch (was b607b14).
+ok 17 - rebase --merge: dirty index, non-conflicting rebase
+
+expecting success: 
+		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: cdca6ca
+HEAD is now at 0c4d2f1 third commit
+First, rewinding head to replay your work on top of it...
+Merging related-onto-branch with HEAD~1
+Merging:
+c57d250 related commit
+6fe95e2 second commit
+found 1 common ancestor:
+bfa4f02 initial commit
+Auto-merging file2
+CONFLICT (add/add): Merge conflict in file2
+
+Resolve all conflicts manually, mark them as resolved with
+"git add/rm <conflicted_files>", then run "git rebase --continue".
+You can instead skip this commit: run "git rebase --skip".
+To abort and get back to the state before "git rebase", run "git rebase --abort".
+
+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 18 - rebase --merge: conflicting rebase
+
+expecting success: 
+		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: cdca6ca
+HEAD is now at 0c4d2f1 third commit
+First, rewinding head to replay your work on top of it...
+Merging related-onto-branch with HEAD~1
+Merging:
+c57d250 related commit
+6fe95e2 second commit
+found 1 common ancestor:
+bfa4f02 initial commit
+Auto-merging file2
+CONFLICT (add/add): Merge conflict in file2
+
+Resolve all conflicts manually, mark them as resolved with
+"git add/rm <conflicted_files>", then run "git rebase --continue".
+You can instead skip this commit: run "git rebase --skip".
+To abort and get back to the state before "git rebase", run "git rebase --abort".
+
+[detached HEAD 62edf38] second commit
  Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 binbin
-ok 3 - prepare binary file
+ Date: Thu Apr 7 15:14:13 2005 -0700
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+ create mode 100644 file1
+Committed: 0001 second commit
+Merging related-onto-branch with HEAD~0
+Merging:
+62edf38 second commit
+0c4d2f1 third commit
+found 1 common ancestor:
+6fe95e2 second commit
+[detached HEAD 51f2c81] third commit
+ 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
+Committed: 0002 third commit
+All done.
+Applied autostash.
+dirty
+Switched to branch 'feature-branch'
+M	file3
+Deleted branch rebased-feature-branch (was 51f2c81).
+ok 19 - rebase --merge: --continue
 
-# passed all 3 test(s)
-1..3
+expecting success: 
+		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: cdca6ca
+HEAD is now at 0c4d2f1 third commit
+First, rewinding head to replay your work on top of it...
+Merging related-onto-branch with HEAD~1
+Merging:
+c57d250 related commit
+6fe95e2 second commit
+found 1 common ancestor:
+bfa4f02 initial commit
+Auto-merging file2
+CONFLICT (add/add): Merge conflict in file2
+
+Resolve all conflicts manually, mark them as resolved with
+"git add/rm <conflicted_files>", then run "git rebase --continue".
+You can instead skip this commit: run "git rebase --skip".
+To abort and get back to the state before "git rebase", run "git rebase --abort".
+
+Merging related-onto-branch with HEAD~0
+Merging:
+c57d250 related commit
+0c4d2f1 third commit
+found 1 common ancestor:
+6fe95e2 second commit
+[detached HEAD fa02356] third commit
+ 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
+Committed: 0002 third commit
+All done.
+Applied autostash.
+dirty
+Switched to branch 'feature-branch'
+M	file3
+Deleted branch rebased-feature-branch (was fa02356).
+ok 20 - rebase --merge: --skip
+
+expecting success: 
+		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: cdca6ca
+HEAD is now at 0c4d2f1 third commit
+First, rewinding head to replay your work on top of it...
+Merging related-onto-branch with HEAD~1
+Merging:
+c57d250 related commit
+6fe95e2 second commit
+found 1 common ancestor:
+bfa4f02 initial commit
+Auto-merging file2
+CONFLICT (add/add): Merge conflict in file2
+
+Resolve all conflicts manually, mark them as resolved with
+"git add/rm <conflicted_files>", then run "git rebase --continue".
+You can instead skip this commit: run "git rebase --skip".
+To abort and get back to the state before "git rebase", run "git rebase --abort".
+
+Applied autostash.
+dirty
+Switched to branch 'feature-branch'
+M	file3
+Deleted branch rebased-feature-branch (was 0c4d2f1).
+ok 21 - rebase --merge: --abort
+
+expecting success: 
+		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
+Merging:
+virtual Version stash was based on
+virtual Stashed changes
+found 1 common ancestor:
+virtual 28566cc718f43a597c158e8411c19d7048328a85
+On branch feature-branch
+Changes to be committed:
+  (use "git reset HEAD <file>..." to unstage)
+
+	new file:   file4
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+
+	actual
+	expected
+
+Dropped refs/stash@{0} (de4e47a31ead4744c6d223df2e4638effc5ff8b7)
+dirty
+ok 22 - rebase --merge: non-conflicting rebase, conflicting stash
+
+expecting success: 
+		test_when_finished git branch -D rebased-feature-branch &&
+		suffix=${type#\ --} && suffix=${suffix:-am} &&
+		create_expected_failure_$suffix &&
+		test_i18ncmp expected actual
+	
+Deleted branch rebased-feature-branch (was b607b14).
+ok 23 - rebase --merge: check output with conflicting stash
+
+expecting success: 
+		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 24 - rebase --interactive: dirty worktree, --no-autostash
+
+expecting success: 
+		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 25 - rebase --interactive: dirty worktree, non-conflicting rebase
+
+expecting success: 
+		test_when_finished git branch -D rebased-feature-branch &&
+		suffix=${type#\ --} && suffix=${suffix:-am} &&
+		create_expected_success_$suffix &&
+		test_i18ncmp expected actual
+	
+Deleted branch rebased-feature-branch (was b607b14).
+ok 26 - rebase --interactive --autostash: check output
+
+expecting success: 
+		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: e9af673
+HEAD is now at 0c4d2f1 third commit
+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 27 - rebase --interactive: dirty index, non-conflicting rebase
+
+expecting success: 
+		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: cdca6ca
+HEAD is now at 0c4d2f1 third commit
+Rebasing (1/2)
Auto-merging file2
+CONFLICT (add/add): Merge conflict in file2
+error: could not apply 6fe95e2... second commit
+Resolve all conflicts manually, mark them as resolved with
+"git add/rm <conflicted_files>", then run "git rebase --continue".
+You can instead skip this commit: run "git rebase --skip".
+To abort and get back to the state before "git rebase", run "git rebase --abort".
+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 28 - rebase --interactive: conflicting rebase
+
+expecting success: 
+		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: cdca6ca
+HEAD is now at 0c4d2f1 third commit
+Rebasing (1/2)
Auto-merging file2
+CONFLICT (add/add): Merge conflict in file2
+error: could not apply 6fe95e2... second commit
+Resolve all conflicts manually, mark them as resolved with
+"git add/rm <conflicted_files>", then run "git rebase --continue".
+You can instead skip this commit: run "git rebase --skip".
+To abort and get back to the state before "git rebase", run "git rebase --abort".
+Could not apply 6fe95e2... second commit
+[detached HEAD 62edf38] second commit
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+ create mode 100644 file1
+Rebasing (2/2)
Applied autostash.
+Successfully rebased and updated refs/heads/rebased-feature-branch.
+dirty
+Switched to branch 'feature-branch'
+M	file3
+Deleted branch rebased-feature-branch (was 51f2c81).
+ok 29 - rebase --interactive: --continue
+
+expecting success: 
+		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: cdca6ca
+HEAD is now at 0c4d2f1 third commit
+Rebasing (1/2)
Auto-merging file2
+CONFLICT (add/add): Merge conflict in file2
+error: could not apply 6fe95e2... second commit
+Resolve all conflicts manually, mark them as resolved with
+"git add/rm <conflicted_files>", then run "git rebase --continue".
+You can instead skip this commit: run "git rebase --skip".
+To abort and get back to the state before "git rebase", run "git rebase --abort".
+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 30 - rebase --interactive: --skip
+
+expecting success: 
+		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: cdca6ca
+HEAD is now at 0c4d2f1 third commit
+Rebasing (1/2)
Auto-merging file2
+CONFLICT (add/add): Merge conflict in file2
+error: could not apply 6fe95e2... second commit
+Resolve all conflicts manually, mark them as resolved with
+"git add/rm <conflicted_files>", then run "git rebase --continue".
+You can instead skip this commit: run "git rebase --skip".
+To abort and get back to the state before "git rebase", run "git rebase --abort".
+Could not apply 6fe95e2... second commit
+Applied autostash.
+dirty
+Switched to branch 'feature-branch'
+M	file3
+Deleted branch rebased-feature-branch (was 0c4d2f1).
+ok 31 - rebase --interactive: --abort
+
+expecting success: 
+		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
+Merging:
+virtual Version stash was based on
+virtual Stashed changes
+found 1 common ancestor:
+virtual 28566cc718f43a597c158e8411c19d7048328a85
+On branch feature-branch
+Changes to be committed:
+  (use "git reset HEAD <file>..." to unstage)
+
+	new file:   file4
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+
+	actual
+	expected
+
+Dropped refs/stash@{0} (de4e47a31ead4744c6d223df2e4638effc5ff8b7)
+dirty
+ok 32 - rebase --interactive: non-conflicting rebase, conflicting stash
+
+expecting success: 
+		test_when_finished git branch -D rebased-feature-branch &&
+		suffix=${type#\ --} && suffix=${suffix:-am} &&
+		create_expected_failure_$suffix &&
+		test_i18ncmp expected actual
+	
+Deleted branch rebased-feature-branch (was b607b14).
+ok 33 - rebase --interactive: check output with conflicting stash
+
+expecting success: 
+	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: 5885b29
+HEAD is now at 0c4d2f1 third commit
+Applied autostash.
+error: nothing to do
+HEAD is now at 0c4d2f1 third commit
+ok 34 - abort rebase -i with --autostash
+
+expecting success: 
+	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: 5cd734b
+HEAD is now at 0c4d2f1 third commit
+error: There was a problem with the editor '"$FAKE_EDITOR"'.
+Applied autostash.
+HEAD is now at 0c4d2f1 third commit
+ok 35 - restore autostash on editor failure
+
+expecting success: 
+	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: 5cd734b
+HEAD is now at 0c4d2f1 third commit
+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.
+Merging Version stash was based on with Stashed changes
+Merging:
+virtual Version stash was based on
+virtual Stashed changes
+found 1 common ancestor:
+virtual 28566cc718f43a597c158e8411c19d7048328a85
+On branch feature-branch
+Changes not staged for commit:
+  (use "git add <file>..." to update what will be committed)
+  (use "git checkout -- <file>..." to discard changes in working directory)
+
+	modified:   file0
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+
+	actual
+	expected
+
+no changes added to commit (use "git add" and/or "git commit -a")
+Dropped refs/stash@{0} (5cd734b91d271fe3e8dc3da7a91046a5745e404f)
+HEAD is now at 0c4d2f1 third commit
+ok 36 - autostash is saved on editor failure with conflict
+
+expecting success: 
+	test_when_finished "git reset --hard && git checkout master" &&
+	git checkout -b with-submodule &&
+	git 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/git-2.20.1/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 'master'
+ok 37 - autostash with dirty submodules
+
+expecting success: 
+	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: 09c3c9d
+HEAD is now at bfa4f02 initial commit
+Current branch unchanged-branch is up to date.
+Applied autostash.
+ok 38 - branch is left alone when possible
+
+# passed all 38 test(s)
+1..38
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
 *** t4005-diff-rename-2.sh ***
@@ -92392,6 +92623,46 @@
 1..4
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
+*** t4006-diff-mode.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4006-diff-mode/.git/
+expecting success: 
+	echo frotz >rezrov &&
+	git update-index --add rezrov &&
+	tree=$(git write-tree) &&
+	echo $tree
+
+5189e2f1ba2c164fa2006e4f8f4e4ec56f15291e
+ok 1 - setup
+
+expecting success: 
+	test_chmod +x rezrov &&
+	git diff-index $tree >current &&
+	sed -e "$sed_script" <current >check &&
+	echo ":100644 100755 X X M	rezrov" >expected &&
+	test_cmp expected check
+
+ok 2 - chmod
+
+expecting success: 
+	git commit -m rezrov &&
+	printf "\00\01\02\03\04\05\06" >binbin &&
+	git add binbin &&
+	git commit -m binbin
+
+[master (root-commit) 638a040] rezrov
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100755 rezrov
+[master fd627bc] binbin
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 binbin
+ok 3 - prepare binary file
+
+# passed all 3 test(s)
+1..3
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
 *** t4001-diff-rename.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4001-diff-rename/.git/
 expecting success: 
@@ -92519,7 +92790,7 @@
 	git status >out &&
 	test_i18ngrep "renamed: .*path1 -> subdir/path1" out
 
-[master (root-commit) f0681e6] 1
+[master (root-commit) 12384f1] 1
  Author: A U Thor <author@example.com>
  2 files changed, 30 insertions(+)
  create mode 100644 another-path
@@ -92564,8 +92835,8 @@
 	git status >out &&
 	test_i18ngrep "renamed: .*dir/A/file -> other-dir/A/file" out
 
-HEAD is now at f0681e6 1
-[master 84685e7] 2
+HEAD is now at 12384f1 1
+[master 3de2af3] 2
  Author: A U Thor <author@example.com>
  2 files changed, 30 insertions(+)
  create mode 100644 dir/A/file
@@ -92597,8 +92868,8 @@
 	test_cmp expect actual.munged &&
 	grep warning actual.err
 
-HEAD is now at 84685e7 2
-[master 2e54880] hundred
+HEAD is now at 3de2af3 2
+[master cf2fe79] hundred
  Author: A U Thor <author@example.com>
  100 files changed, 100 insertions(+)
  create mode 100644 path00
@@ -92718,12 +92989,12 @@
 	git diff -M --stat HEAD^ HEAD >output &&
 	test_i18ngrep " a/b/c => c/b/a " output
 
-[master 745d6f9] create a/b/c
+[master 4cbfd0e] 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 fc452cd] a/b/c -> c/b/a
+[master 495ef5d] 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%)
@@ -92740,7 +93011,7 @@
 	git diff -M --stat HEAD^ HEAD >output &&
 	test_i18ngrep " c/{b/a => d/e} " output
 
-[master 4dadf22] c/b/a -> c/d/e
+[master 2df0245] 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%)
@@ -92757,7 +93028,7 @@
 	git diff -M --stat HEAD^ HEAD >output &&
 	test_i18ngrep " {c/d => d}/e " output
 
-[master 6673360] c/d/e -> d/e
+[master d3c6c51] 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%)
@@ -92774,7 +93045,7 @@
 	git diff -M --stat HEAD^ HEAD >output &&
 	test_i18ngrep " d/{ => f}/e " output
 
-[master b73eb4c] d/e -> d/f/e
+[master 17b5443] d/e -> d/f/e
  Author: A U Thor <author@example.com>
  1 file changed, 0 insertions(+), 0 deletions(-)
  rename d/{ => f}/e (100%)
@@ -92791,7 +93062,7 @@
 	git diff -M --stat HEAD^ HEAD >output &&
 	test_i18ngrep " d/f/{ => f}/e " output
 
-[master 70ff67d] d/f/e d/f/f/e
+[master 8d18a4d] 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%)
@@ -92813,12 +93084,12 @@
 	# Verify that a rename from myotherfile to myfile was detected
 	grep "myotherfile.*myfile" actual
 
-[master b6cf2b4] x
+[master ac1c76e] x
  Author: A U Thor <author@example.com>
  1 file changed, 3 insertions(+)
  create mode 100644 myfile
 rm 'myfile'
-[master 3599b79] x
+[master a8b05f1] x
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
  rename myfile => myotherfile (66%)
@@ -92887,6 +93158,355 @@
 1..8
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
+*** t3904-stash-patch.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3904-stash-patch/.git/
+expecting success: 
+	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) 11214bc] 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 78f7943] second
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 1 - setup
+
+expecting success: 
+	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
+Stash this hunk [y,n,q,a,d,e,?]? 
+diff --git a/bar b/bar
+index 421376d..8c999e6 100644
+--- a/bar
++++ b/bar
+@@ -1 +1 @@
+-dummy
++bar_work
+Stash this hunk [y,n,q,a,d,e,?]? 
+diff --git a/dir/foo b/dir/foo
+index 564b12f..b8f99f5 100644
+--- a/dir/foo
++++ b/dir/foo
+@@ -1 +1 @@
+-head
++work
+Stash this hunk [y,n,q,a,d,e,?]? 
+No changes selected
+ok 2 - saying "n" does nothing
+
+expecting success: 
+	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
+Stash this hunk [y,n,q,a,d,e,?]? 
+diff --git a/bar b/bar
+index 421376d..8c999e6 100644
+--- a/bar
++++ b/bar
+@@ -1 +1 @@
+-dummy
++bar_work
+Stash this hunk [y,n,q,a,d,e,?]? 
+diff --git a/dir/foo b/dir/foo
+index 564b12f..b8f99f5 100644
+--- a/dir/foo
++++ b/dir/foo
+@@ -1 +1 @@
+-head
++work
+Stash this hunk [y,n,q,a,d,e,?]? 
+Saved working directory and index state WIP on master: 78f7943 second
+HEAD is now at 78f7943 second
+Merging Version stash was based on with Stashed changes
+Merging:
+virtual Version stash was based on
+virtual Stashed changes
+found 1 common ancestor:
+virtual 933b7810e0d844b5ea1fdca8c598255ba6838976
+On branch master
+Changes not staged for commit:
+  (use "git add <file>..." to update what will be committed)
+  (use "git checkout -- <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
+
+no changes added to commit (use "git add" and/or "git commit -a")
+ok 3 - git stash -p
+
+expecting success: 
+	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
+Stash this hunk [y,n,q,a,d,e,?]? 
+diff --git a/bar b/bar
+index 421376d..8c999e6 100644
+--- a/bar
++++ b/bar
+@@ -1 +1 @@
+-dummy
++bar_work
+Stash this hunk [y,n,q,a,d,e,?]? 
+diff --git a/dir/foo b/dir/foo
+index 564b12f..b8f99f5 100644
+--- a/dir/foo
++++ b/dir/foo
+@@ -1 +1 @@
+-head
++work
+Stash this hunk [y,n,q,a,d,e,?]? 
+Saved working directory and index state WIP on master: 78f7943 second
+HEAD is now at 78f7943 second
+Merging Version stash was based on with Stashed changes
+Merging:
+virtual Version stash was based on
+virtual Stashed changes
+found 1 common ancestor:
+virtual 933b7810e0d844b5ea1fdca8c598255ba6838976
+On branch master
+Changes to be committed:
+  (use "git reset HEAD <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 checkout -- <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
+
+ok 4 - git stash -p --no-keep-index
+
+expecting success: 
+	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
+Stash this hunk [y,n,q,a,d,e,?]? 
+diff --git a/bar b/bar
+index 421376d..8c999e6 100644
+--- a/bar
++++ b/bar
+@@ -1 +1 @@
+-dummy
++bar_work
+Stash this hunk [y,n,q,a,d,e,?]? 
+diff --git a/dir/foo b/dir/foo
+index 564b12f..b8f99f5 100644
+--- a/dir/foo
++++ b/dir/foo
+@@ -1 +1 @@
+-head
++work
+Stash this hunk [y,n,q,a,d,e,?]? 
+Saved working directory and index state WIP on master: 78f7943 second
+HEAD is now at 78f7943 second
+Merging Version stash was based on with Stashed changes
+Merging:
+virtual Version stash was based on
+virtual Stashed changes
+found 1 common ancestor:
+virtual 933b7810e0d844b5ea1fdca8c598255ba6838976
+On branch master
+Changes to be committed:
+  (use "git reset HEAD <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 checkout -- <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
+
+ok 5 - git stash --no-keep-index -p
+
+expecting success: 
+	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
+Stash this hunk [y,n,q,a,d,e,?]? 
+Saved working directory and index state WIP on master: 78f7943 second
+ok 6 - stash -p --no-keep-index -- <pathspec> does not unstage other files
+
+expecting success: 
+	verify_saved_head
+
+ok 7 - none of this moved HEAD
+
+checking known breakage: 
+	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 |
+	test_might_fail git stash -p 2>error &&
+	! test_must_be_empty error &&
+	grep "added line 1" test &&
+	! grep "added line 2" test
+
+HEAD is now at 78f7943 second
+[master a839188] 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
+Stash this hunk [y,n,q,a,d,s,e,?]? Split into 2 hunks.
+@@ -1,2 +1,3 @@
+ aaa
++added line 1
+ bbb
+Stash this hunk [y,n,q,a,d,j,J,g,/,e,?]? @@ -2,2 +3,3 @@
+ bbb
++added line 2
+ ccc
+Stash this hunk [y,n,q,a,d,K,g,/,e,?]? 
+Saved working directory and index state WIP on master: a839188 initial
+'error' is not empty, it contains:
+error: patch failed: test:1
+error: test: patch does not apply
+Cannot remove worktree changes
+added line 1
+added line 2
+not ok 8 - stash -p with split hunk # TODO known breakage
+
+# still have 1 known breakage(s)
+# passed all remaining 7 test(s)
+1..8
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
 *** t4009-diff-rename-4.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4009-diff-rename-4/.git/
 expecting success: cat "$TEST_DIRECTORY"/diff-lib/COPYING >COPYING &&
@@ -93416,353 +94036,224 @@
 1..17
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t3904-stash-patch.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3904-stash-patch/.git/
+*** t4012-diff-binary.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4012-diff-binary/.git/
 expecting success: 
-	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
+	echo AIT >a && echo BIT >b && echo CIT >c && echo DIT >d &&
+	git update-index --add a b c d &&
+	echo git >a &&
+	cat "$TEST_DIRECTORY"/test-binary-1.png >b &&
+	echo git >c &&
+	cat b b >d
 
-[master (root-commit) 1f9b8b7] 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 8ecc954] second
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 1 - setup
+ok 1 - prepare repository
 
 expecting success: 
-	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
+	git diff >diff &&
+	git apply --stat --summary <diff >current &&
+	test_i18ncmp expected current
 
-diff --git a/HEAD b/HEAD
-index d0fe822..e74fca5 100644
---- a/HEAD
-+++ b/HEAD
-@@ -1 +1 @@
--committed
-+HEADfile_work
-Stash this hunk [y,n,q,a,d,e,?]? 
-diff --git a/bar b/bar
-index 421376d..8c999e6 100644
---- a/bar
-+++ b/bar
-@@ -1 +1 @@
--dummy
-+bar_work
-Stash this hunk [y,n,q,a,d,e,?]? 
-diff --git a/dir/foo b/dir/foo
-index 564b12f..b8f99f5 100644
---- a/dir/foo
-+++ b/dir/foo
-@@ -1 +1 @@
--head
-+work
-Stash this hunk [y,n,q,a,d,e,?]? 
-No changes selected
-ok 2 - saying "n" does nothing
+ok 2 - apply --stat output for binary file change
 
 expecting success: 
-	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
+	tail -n 1 expected >expect &&
+	git diff --shortstat >current &&
+	test_i18ncmp expect current
 
-diff --git a/HEAD b/HEAD
-index d0fe822..e74fca5 100644
---- a/HEAD
-+++ b/HEAD
-@@ -1 +1 @@
--committed
-+HEADfile_work
-Stash this hunk [y,n,q,a,d,e,?]? 
-diff --git a/bar b/bar
-index 421376d..8c999e6 100644
---- a/bar
-+++ b/bar
-@@ -1 +1 @@
--dummy
-+bar_work
-Stash this hunk [y,n,q,a,d,e,?]? 
-diff --git a/dir/foo b/dir/foo
-index 564b12f..b8f99f5 100644
---- a/dir/foo
-+++ b/dir/foo
-@@ -1 +1 @@
--head
-+work
-Stash this hunk [y,n,q,a,d,e,?]? 
-Saved working directory and index state WIP on master: 8ecc954 second
-HEAD is now at 8ecc954 second
-Merging Version stash was based on with Stashed changes
-Merging:
-virtual Version stash was based on
-virtual Stashed changes
-found 1 common ancestor:
-virtual 933b7810e0d844b5ea1fdca8c598255ba6838976
-On branch master
-Changes not staged for commit:
-  (use "git add <file>..." to update what will be committed)
-  (use "git checkout -- <file>..." to discard changes in working directory)
+ok 3 - diff --shortstat output for binary file change
 
-	modified:   HEAD
-	modified:   dir/foo
+expecting success: 
+	echo " 1 file changed, 0 insertions(+), 0 deletions(-)" >expected &&
+	git diff --shortstat -- b >current &&
+	test_i18ncmp expected current
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
+ok 4 - diff --shortstat output for binary file change only
 
-	_head
-	_index_bar
-	_worktree_bar
+expecting success: 
+	git diff >diff &&
+	git apply --numstat <diff >current &&
+	test_cmp expect.binary-numstat current
 
-no changes added to commit (use "git add" and/or "git commit -a")
-ok 3 - git stash -p
+ok 5 - apply --numstat notices binary file change
 
 expecting success: 
-	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
+	git diff --binary >diff &&
+	git apply --numstat <diff >current &&
+	test_cmp expect.binary-numstat current
 
-diff --git a/HEAD b/HEAD
-index d0fe822..e74fca5 100644
---- a/HEAD
-+++ b/HEAD
-@@ -1 +1 @@
--committed
-+HEADfile_work
-Stash this hunk [y,n,q,a,d,e,?]? 
-diff --git a/bar b/bar
-index 421376d..8c999e6 100644
---- a/bar
-+++ b/bar
-@@ -1 +1 @@
--dummy
-+bar_work
-Stash this hunk [y,n,q,a,d,e,?]? 
-diff --git a/dir/foo b/dir/foo
-index 564b12f..b8f99f5 100644
---- a/dir/foo
-+++ b/dir/foo
-@@ -1 +1 @@
--head
-+work
-Stash this hunk [y,n,q,a,d,e,?]? 
-Saved working directory and index state WIP on master: 8ecc954 second
-HEAD is now at 8ecc954 second
-Merging Version stash was based on with Stashed changes
-Merging:
-virtual Version stash was based on
-virtual Stashed changes
-found 1 common ancestor:
-virtual 933b7810e0d844b5ea1fdca8c598255ba6838976
-On branch master
-Changes to be committed:
-  (use "git reset HEAD <file>..." to unstage)
+ok 6 - apply --numstat understands diff --binary format
 
-	modified:   HEAD
-	modified:   bar
-	modified:   dir/foo
+expecting success: 
+	git diff >output &&
+	sed -e "s/-CIT/xCIT/" <output >broken &&
+	test_must_fail git apply --stat --summary broken 2>detected &&
+	detected=$(cat detected) &&
+	detected=$(expr "$detected" : "error.*at line \\([0-9]*\\)\$") &&
+	detected=$(sed -ne "${detected}p" broken) &&
+	test "$detected" = xCIT
 
-Changes not staged for commit:
-  (use "git add <file>..." to update what will be committed)
-  (use "git checkout -- <file>..." to discard changes in working directory)
+ok 7 - apply detecting corrupt patch correctly
 
-	modified:   HEAD
-	modified:   bar
-	modified:   dir/foo
+expecting success: 
+	git diff --binary | sed -e "s/-CIT/xCIT/" >broken &&
+	test_must_fail git apply --stat --summary broken 2>detected &&
+	detected=$(cat detected) &&
+	detected=$(expr "$detected" : "error.*at line \\([0-9]*\\)\$") &&
+	detected=$(sed -ne "${detected}p" broken) &&
+	test "$detected" = xCIT
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
+ok 8 - apply detecting corrupt patch correctly
 
-	_head
-	_index_bar
-	_worktree_bar
+expecting success: git commit -a -m initial
+[master (root-commit) 6f388f2] initial
+ Author: A U Thor <author@example.com>
+ 4 files changed, 2 insertions(+)
+ create mode 100644 a
+ create mode 100644 b
+ create mode 100644 c
+ create mode 100644 d
+ok 9 - initial commit
 
-ok 4 - git stash -p --no-keep-index
+expecting success: 
+	echo AIT >a && mv b e && echo CIT >c && cat e >d &&
+	git update-index --add --remove a b c d e &&
+	tree0=$(git write-tree) &&
+	git diff --cached --binary >current &&
+	git apply --stat --summary current
+
+ a |    2 +-
+ c |    2 +-
+ d |  Bin
+ e |    0 
+ 4 files changed, 2 insertions(+), 2 deletions(-)
+ rename b => e (100%)
+ok 10 - diff-index with --binary
 
 expecting success: 
-	set_state HEAD HEADfile_work HEADfile_index &&
-	set_state bar bar_work bar_index &&
-	set_state dir/foo work index &&
-	test_write_lines y n y | git stash save --no-keep-index -p &&
-	verify_state HEAD committed committed &&
-	verify_state dir/foo head head &&
-	verify_state bar bar_work dummy &&
 	git reset --hard &&
-	git stash apply --index &&
-	verify_state HEAD HEADfile_work HEADfile_index &&
-	verify_state bar dummy bar_index &&
-	verify_state dir/foo work index
+	git apply --binary --index <current &&
+	tree1=$(git write-tree) &&
+	test "$tree1" = "$tree0"
 
-diff --git a/HEAD b/HEAD
-index d0fe822..e74fca5 100644
---- a/HEAD
-+++ b/HEAD
-@@ -1 +1 @@
--committed
-+HEADfile_work
-Stash this hunk [y,n,q,a,d,e,?]? 
-diff --git a/bar b/bar
-index 421376d..8c999e6 100644
---- a/bar
-+++ b/bar
-@@ -1 +1 @@
--dummy
-+bar_work
-Stash this hunk [y,n,q,a,d,e,?]? 
-diff --git a/dir/foo b/dir/foo
-index 564b12f..b8f99f5 100644
---- a/dir/foo
-+++ b/dir/foo
-@@ -1 +1 @@
--head
-+work
-Stash this hunk [y,n,q,a,d,e,?]? 
-Saved working directory and index state WIP on master: 8ecc954 second
-HEAD is now at 8ecc954 second
-Merging Version stash was based on with Stashed changes
-Merging:
-virtual Version stash was based on
-virtual Stashed changes
-found 1 common ancestor:
-virtual 933b7810e0d844b5ea1fdca8c598255ba6838976
-On branch master
-Changes to be committed:
-  (use "git reset HEAD <file>..." to unstage)
+HEAD is now at 6f388f2 initial
+ok 11 - apply binary patch
 
-	modified:   HEAD
-	modified:   bar
-	modified:   dir/foo
+expecting success: 
+	echo Q | q_to_nul >binary &&
+	# hide error code from diff, which just indicates differences
+	test_might_fail git diff --binary --no-index /dev/null binary >current &&
+	rm binary &&
+	git apply --binary <current &&
+	echo Q >expected &&
+	nul_to_q <binary >actual &&
+	test_cmp expected actual
 
-Changes not staged for commit:
-  (use "git add <file>..." to update what will be committed)
-  (use "git checkout -- <file>..." to discard changes in working directory)
+ok 12 - diff --no-index with binary creation
 
-	modified:   HEAD
-	modified:   bar
-	modified:   dir/foo
+expecting success: 
+	printf "\01\00%1024d" 1 >binfile &&
+	git add binfile &&
+	i=0 &&
+	while test $i -lt 10000; do
+		echo $i &&
+		i=$(($i + 1))
+	done >textfile &&
+	git add textfile &&
+	git diff --cached --stat binfile textfile >output &&
+	grep " | " output >actual &&
+	test_cmp expect actual
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
+ok 13 - diff --stat with binary files and big change count
 
-	_head
-	_index_bar
-	_worktree_bar
+# passed all 13 test(s)
+1..13
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t4016-diff-quote.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4016-diff-quote/.git/
+expecting success: 
+	echo P0.0 >"$P0.0" &&
+	echo P0.1 >"$P0.1" &&
+	echo P0.2 >"$P0.2" &&
+	echo P0.3 >"$P0.3" &&
+	echo P1.0 >"$P1.0" &&
+	echo P1.2 >"$P1.2" &&
+	echo P1.3 >"$P1.3" &&
+	git add . &&
+	git commit -m initial &&
+	git mv "$P0.0" "R$P0.0" &&
+	git mv "$P0.1" "R$P1.0" &&
+	git mv "$P0.2" "R$P2.0" &&
+	git mv "$P0.3" "R$P3.0" &&
+	git mv "$P1.0" "R$P0.1" &&
+	git mv "$P1.2" "R$P2.1" &&
+	git mv "$P1.3" "R$P3.1" &&
+	:
 
-ok 5 - git stash --no-keep-index -p
+[master (root-commit) 2303fd5] initial
+ Author: A U Thor <author@example.com>
+ 7 files changed, 7 insertions(+)
+ create mode 100644 "pathname\twith HT.0"
+ create mode 100644 "pathname\twith HT.2"
+ create mode 100644 "pathname\twith HT.3"
+ create mode 100644 pathname.0
+ create mode 100644 pathname.1
+ create mode 100644 pathname.2
+ create mode 100644 pathname.3
+ok 1 - setup
 
 expecting success: 
-	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
+cat >expect <<\EOF
+ rename pathname.1 => "Rpathname\twith HT.0" (100%)
+ rename pathname.3 => "Rpathname\nwith LF.0" (100%)
+ rename "pathname\twith HT.3" => "Rpathname\nwith LF.1" (100%)
+ rename pathname.2 => Rpathname with SP.0 (100%)
+ rename "pathname\twith HT.2" => Rpathname with SP.1 (100%)
+ rename pathname.0 => Rpathname.0 (100%)
+ rename "pathname\twith HT.0" => Rpathname.1 (100%)
+EOF
 
-diff --git a/HEAD b/HEAD
-index d0fe822..e74fca5 100644
---- a/HEAD
-+++ b/HEAD
-@@ -1 +1 @@
--committed
-+HEADfile_work
-Stash this hunk [y,n,q,a,d,e,?]? 
-Saved working directory and index state WIP on master: 8ecc954 second
-ok 6 - stash -p --no-keep-index -- <pathspec> does not unstage other files
+ok 2 - setup expected files
 
 expecting success: 
-	verify_saved_head
+	git diff --summary -M HEAD >actual &&
+	test_cmp expect actual
 
-ok 7 - none of this moved HEAD
+ok 3 - git diff --summary -M HEAD
 
-checking known breakage: 
-	git reset --hard &&
-	cat >test <<-\EOF &&
-	aaa
-	bbb
-	ccc
+expecting success: 
+	cat >expect <<-\EOF &&
+	0	0	pathname.1 => "Rpathname\twith HT.0"
+	0	0	pathname.3 => "Rpathname\nwith LF.0"
+	0	0	"pathname\twith HT.3" => "Rpathname\nwith LF.1"
+	0	0	pathname.2 => Rpathname with SP.0
+	0	0	"pathname\twith HT.2" => Rpathname with SP.1
+	0	0	pathname.0 => Rpathname.0
+	0	0	"pathname\twith HT.0" => Rpathname.1
 	EOF
-	git add test &&
-	git commit -m "initial" &&
-	cat >test <<-\EOF &&
-	aaa
-	added line 1
-	bbb
-	added line 2
-	ccc
+	git diff --numstat -M HEAD >actual &&
+	test_cmp expect actual
+
+ok 4 - git diff --numstat -M HEAD
+
+expecting success: 
+	cat >expect <<-\EOF &&
+	 pathname.1 => "Rpathname\twith HT.0"            | 0
+	 pathname.3 => "Rpathname\nwith LF.0"            | 0
+	 "pathname\twith HT.3" => "Rpathname\nwith LF.1" | 0
+	 pathname.2 => Rpathname with SP.0               | 0
+	 "pathname\twith HT.2" => Rpathname with SP.1    | 0
+	 pathname.0 => Rpathname.0                       | 0
+	 "pathname\twith HT.0" => Rpathname.1            | 0
+	 7 files changed, 0 insertions(+), 0 deletions(-)
 	EOF
-	printf "%s\n" s n y q |
-	test_might_fail git stash -p 2>error &&
-	! test_must_be_empty error &&
-	grep "added line 1" test &&
-	! grep "added line 2" test
+	git diff --stat -M HEAD >actual &&
+	test_i18ncmp expect actual
 
-HEAD is now at 8ecc954 second
-[master 6323404] 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
-Stash this hunk [y,n,q,a,d,s,e,?]? Split into 2 hunks.
-@@ -1,2 +1,3 @@
- aaa
-+added line 1
- bbb
-Stash this hunk [y,n,q,a,d,j,J,g,/,e,?]? @@ -2,2 +3,3 @@
- bbb
-+added line 2
- ccc
-Stash this hunk [y,n,q,a,d,K,g,/,e,?]? 
-Saved working directory and index state WIP on master: 6323404 initial
-'error' is not empty, it contains:
-error: patch failed: test:1
-error: test: patch does not apply
-Cannot remove worktree changes
-added line 1
-added line 2
-not ok 8 - stash -p with split hunk # TODO known breakage
+ok 5 - git diff --stat -M HEAD
 
-# still have 1 known breakage(s)
-# passed all remaining 7 test(s)
-1..8
+# passed all 5 test(s)
+1..5
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
 *** t4002-diff-basic.sh ***
@@ -94075,1417 +94566,6 @@
 1..63
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t4012-diff-binary.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4012-diff-binary/.git/
-expecting success: 
-	echo AIT >a && echo BIT >b && echo CIT >c && echo DIT >d &&
-	git update-index --add a b c d &&
-	echo git >a &&
-	cat "$TEST_DIRECTORY"/test-binary-1.png >b &&
-	echo git >c &&
-	cat b b >d
-
-ok 1 - prepare repository
-
-expecting success: 
-	git diff >diff &&
-	git apply --stat --summary <diff >current &&
-	test_i18ncmp expected current
-
-ok 2 - apply --stat output for binary file change
-
-expecting success: 
-	tail -n 1 expected >expect &&
-	git diff --shortstat >current &&
-	test_i18ncmp expect current
-
-ok 3 - diff --shortstat output for binary file change
-
-expecting success: 
-	echo " 1 file changed, 0 insertions(+), 0 deletions(-)" >expected &&
-	git diff --shortstat -- b >current &&
-	test_i18ncmp expected current
-
-ok 4 - diff --shortstat output for binary file change only
-
-expecting success: 
-	git diff >diff &&
-	git apply --numstat <diff >current &&
-	test_cmp expect.binary-numstat current
-
-ok 5 - apply --numstat notices binary file change
-
-expecting success: 
-	git diff --binary >diff &&
-	git apply --numstat <diff >current &&
-	test_cmp expect.binary-numstat current
-
-ok 6 - apply --numstat understands diff --binary format
-
-expecting success: 
-	git diff >output &&
-	sed -e "s/-CIT/xCIT/" <output >broken &&
-	test_must_fail git apply --stat --summary broken 2>detected &&
-	detected=$(cat detected) &&
-	detected=$(expr "$detected" : "error.*at line \\([0-9]*\\)\$") &&
-	detected=$(sed -ne "${detected}p" broken) &&
-	test "$detected" = xCIT
-
-ok 7 - apply detecting corrupt patch correctly
-
-expecting success: 
-	git diff --binary | sed -e "s/-CIT/xCIT/" >broken &&
-	test_must_fail git apply --stat --summary broken 2>detected &&
-	detected=$(cat detected) &&
-	detected=$(expr "$detected" : "error.*at line \\([0-9]*\\)\$") &&
-	detected=$(sed -ne "${detected}p" broken) &&
-	test "$detected" = xCIT
-
-ok 8 - apply detecting corrupt patch correctly
-
-expecting success: git commit -a -m initial
-[master (root-commit) 7564e6e] initial
- Author: A U Thor <author@example.com>
- 4 files changed, 2 insertions(+)
- create mode 100644 a
- create mode 100644 b
- create mode 100644 c
- create mode 100644 d
-ok 9 - initial commit
-
-expecting success: 
-	echo AIT >a && mv b e && echo CIT >c && cat e >d &&
-	git update-index --add --remove a b c d e &&
-	tree0=$(git write-tree) &&
-	git diff --cached --binary >current &&
-	git apply --stat --summary current
-
- a |    2 +-
- c |    2 +-
- d |  Bin
- e |    0 
- 4 files changed, 2 insertions(+), 2 deletions(-)
- rename b => e (100%)
-ok 10 - diff-index with --binary
-
-expecting success: 
-	git reset --hard &&
-	git apply --binary --index <current &&
-	tree1=$(git write-tree) &&
-	test "$tree1" = "$tree0"
-
-HEAD is now at 7564e6e initial
-ok 11 - apply binary patch
-
-expecting success: 
-	echo Q | q_to_nul >binary &&
-	# hide error code from diff, which just indicates differences
-	test_might_fail git diff --binary --no-index /dev/null binary >current &&
-	rm binary &&
-	git apply --binary <current &&
-	echo Q >expected &&
-	nul_to_q <binary >actual &&
-	test_cmp expected actual
-
-ok 12 - diff --no-index with binary creation
-
-expecting success: 
-	printf "\01\00%1024d" 1 >binfile &&
-	git add binfile &&
-	i=0 &&
-	while test $i -lt 10000; do
-		echo $i &&
-		i=$(($i + 1))
-	done >textfile &&
-	git add textfile &&
-	git diff --cached --stat binfile textfile >output &&
-	grep " | " output >actual &&
-	test_cmp expect actual
-
-ok 13 - diff --stat with binary files and big change count
-
-# passed all 13 test(s)
-1..13
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t4016-diff-quote.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4016-diff-quote/.git/
-expecting success: 
-	echo P0.0 >"$P0.0" &&
-	echo P0.1 >"$P0.1" &&
-	echo P0.2 >"$P0.2" &&
-	echo P0.3 >"$P0.3" &&
-	echo P1.0 >"$P1.0" &&
-	echo P1.2 >"$P1.2" &&
-	echo P1.3 >"$P1.3" &&
-	git add . &&
-	git commit -m initial &&
-	git mv "$P0.0" "R$P0.0" &&
-	git mv "$P0.1" "R$P1.0" &&
-	git mv "$P0.2" "R$P2.0" &&
-	git mv "$P0.3" "R$P3.0" &&
-	git mv "$P1.0" "R$P0.1" &&
-	git mv "$P1.2" "R$P2.1" &&
-	git mv "$P1.3" "R$P3.1" &&
-	:
-
-[master (root-commit) 246a7eb] initial
- Author: A U Thor <author@example.com>
- 7 files changed, 7 insertions(+)
- create mode 100644 "pathname\twith HT.0"
- create mode 100644 "pathname\twith HT.2"
- create mode 100644 "pathname\twith HT.3"
- create mode 100644 pathname.0
- create mode 100644 pathname.1
- create mode 100644 pathname.2
- create mode 100644 pathname.3
-ok 1 - setup
-
-expecting success: 
-cat >expect <<\EOF
- rename pathname.1 => "Rpathname\twith HT.0" (100%)
- rename pathname.3 => "Rpathname\nwith LF.0" (100%)
- rename "pathname\twith HT.3" => "Rpathname\nwith LF.1" (100%)
- rename pathname.2 => Rpathname with SP.0 (100%)
- rename "pathname\twith HT.2" => Rpathname with SP.1 (100%)
- rename pathname.0 => Rpathname.0 (100%)
- rename "pathname\twith HT.0" => Rpathname.1 (100%)
-EOF
-
-ok 2 - setup expected files
-
-expecting success: 
-	git diff --summary -M HEAD >actual &&
-	test_cmp expect actual
-
-ok 3 - git diff --summary -M HEAD
-
-expecting success: 
-	cat >expect <<-\EOF &&
-	0	0	pathname.1 => "Rpathname\twith HT.0"
-	0	0	pathname.3 => "Rpathname\nwith LF.0"
-	0	0	"pathname\twith HT.3" => "Rpathname\nwith LF.1"
-	0	0	pathname.2 => Rpathname with SP.0
-	0	0	"pathname\twith HT.2" => Rpathname with SP.1
-	0	0	pathname.0 => Rpathname.0
-	0	0	"pathname\twith HT.0" => Rpathname.1
-	EOF
-	git diff --numstat -M HEAD >actual &&
-	test_cmp expect actual
-
-ok 4 - git diff --numstat -M HEAD
-
-expecting success: 
-	cat >expect <<-\EOF &&
-	 pathname.1 => "Rpathname\twith HT.0"            | 0
-	 pathname.3 => "Rpathname\nwith LF.0"            | 0
-	 "pathname\twith HT.3" => "Rpathname\nwith LF.1" | 0
-	 pathname.2 => Rpathname with SP.0               | 0
-	 "pathname\twith HT.2" => Rpathname with SP.1    | 0
-	 pathname.0 => Rpathname.0                       | 0
-	 "pathname\twith HT.0" => Rpathname.1            | 0
-	 7 files changed, 0 insertions(+), 0 deletions(-)
-	EOF
-	git diff --stat -M HEAD >actual &&
-	test_i18ncmp expect actual
-
-ok 5 - git diff --stat -M HEAD
-
-# passed all 5 test(s)
-1..5
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t3426-rebase-submodule.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3426-rebase-submodule/.git/
-expecting success: 
-		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/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update_sub1/.git/
-[master (root-commit) d38f90f] 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/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update_sub2/.git/
-[master (root-commit) 79bbad1] 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/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update_repo/.git/
-[master (root-commit) 6b1535e] 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/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update_repo/sub1'...
-done.
-Cloning into '/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update_repo/uninitialized_sub'...
-done.
-[add_sub1 0777815] 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'
-Removing uninitialized_sub
-Removing sub1
-Removing .gitmodules
-[remove_sub1 bc9cfee] Revert "Add sub1"
- Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:05:56 2021 +0000
- 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 9492adb] 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/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update_sub1
- * [new branch]      modifications -> modifications
-[modify_sub1 224435e] 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/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update_repo/sub1/sub2'...
-done.
-[add_nested_sub 2383f82] 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 0ecfc93] 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 5d5d3e9] 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 e2d9efe] update nested sub
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[modify_sub1_recursively f1bc4eb] update sub1, that updates nested sub
- Author: A U Thor <author@example.com>
-To /build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update_sub1
- * [new branch]      modify_sub1_recursively -> modify_sub1_recursively
-To /build/git-2.20.1/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 'd38f90f41e255e336a7f7026ac3f2e330a7d75cd'
-Previous HEAD position was d38f90f Base inside first submodule
-Switched to branch 'modifications'
-rm 'sub1'
-[replace_sub1_with_directory 7aea8de] 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'
-Removing sub1/file3
-Removing sub1/file2
-Removing sub1/file1
-Adding sub1
-[replace_directory_with_sub1 fb3cad3] Revert "Replace sub1 with directory"
- Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:05:59 2021 +0000
- 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 f6de598] 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 d608f07] Revert "Replace sub1 with file"
- Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:05:59 2021 +0000
- 2 files changed, 5 insertions(+), 1 deletion(-)
- mode change 100644 => 160000 sub1
-Switched to a new branch 'invalid_sub1'
-[invalid_sub1 ee82fae] Invalid sub1 commit
- Author: A U Thor <author@example.com>
-Switched to a new branch 'valid_sub1'
-[valid_sub1 70eb719] Revert "Invalid sub1 commit"
- Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:06:00 2021 +0000
-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 remote branch 'no_submodule' from 'origin'.
-Branch 'add_sub1' set up to track remote branch 'add_sub1' from 'origin'.
-Switched to a new branch 'ours'
-[ours 0047315] add_x
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[ours f4fd363] Revert "add_x"
- Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:06:00 2021 +0000
- 1 file changed, 1 deletion(-)
-First, rewinding head to replay your work on top of it...
-Applying: add_x
-Applying: Revert "add_x"
-Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out 'd38f90f41e255e336a7f7026ac3f2e330a7d75cd'
-Submodule path 'uninitialized_sub': checked out 'd38f90f41e255e336a7f7026ac3f2e330a7d75cd'
-ok 1 - git_rebase: added submodule creates empty directory
-
-expecting success: 
-		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 remote branch 'no_submodule' from 'origin'.
-Branch 'add_sub1' set up to track remote branch 'add_sub1' from 'origin'.
-Switched to a new branch 'ours'
-[ours cdb33af] add_x
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[ours 696a98e] Revert "add_x"
- Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:06:02 2021 +0000
- 1 file changed, 1 deletion(-)
-First, rewinding head to replay your work on top of it...
-Applying: add_x
-Applying: Revert "add_x"
-Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out 'd38f90f41e255e336a7f7026ac3f2e330a7d75cd'
-Submodule path 'uninitialized_sub': checked out 'd38f90f41e255e336a7f7026ac3f2e330a7d75cd'
-ok 2 - git_rebase: added submodule leaves existing empty directory alone
-
-expecting success: 
-		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 remote branch 'replace_sub1_with_file' from 'origin'.
-fatal: Needed a single revision
-Branch 'replace_file_with_sub1' set up to track remote branch 'replace_file_with_sub1' from 'origin'.
-Switched to a new branch 'ours'
-[ours 6f3166c] add_x
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[ours 36ce50f] Revert "add_x"
- Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:06:04 2021 +0000
- 1 file changed, 1 deletion(-)
-First, rewinding head to replay your work on top of it...
-Applying: add_x
-Applying: Revert "add_x"
-Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out 'd38f90f41e255e336a7f7026ac3f2e330a7d75cd'
-Submodule path 'uninitialized_sub': checked out 'd38f90f41e255e336a7f7026ac3f2e330a7d75cd'
-ok 3 - git_rebase: replace tracked file with submodule creates empty directory
-
-expecting success: 
-		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 remote branch 'replace_sub1_with_directory' from 'origin'.
-fatal: Needed a single revision
-Branch 'replace_directory_with_sub1' set up to track remote branch 'replace_directory_with_sub1' from 'origin'.
-Switched to a new branch 'ours'
-[ours eb54dc5] add_x
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[ours c138fab] Revert "add_x"
- Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:06:06 2021 +0000
- 1 file changed, 1 deletion(-)
-First, rewinding head to replay your work on top of it...
-Applying: add_x
-Applying: Revert "add_x"
-Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out 'd38f90f41e255e336a7f7026ac3f2e330a7d75cd'
-Submodule path 'uninitialized_sub': checked out 'd38f90f41e255e336a7f7026ac3f2e330a7d75cd'
-ok 4 - git_rebase: replace directory with submodule
-
-expecting success: 
-		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 remote branch 'add_sub1' from 'origin'.
-Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out 'd38f90f41e255e336a7f7026ac3f2e330a7d75cd'
-Branch 'remove_sub1' set up to track remote branch 'remove_sub1' from 'origin'.
-Switched to a new branch 'ours'
-[ours f54570e] add_x
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[ours abecf5b] Revert "add_x"
- Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:06:09 2021 +0000
- 1 file changed, 1 deletion(-)
-warning: unable to rmdir 'sub1': Directory not empty
-First, rewinding head to replay your work on top of it...
-Applying: add_x
-Applying: Revert "add_x"
-ok 5 - git_rebase: removed submodule leaves submodule directory and its contents in place
-
-expecting success: 
-		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 remote branch 'add_sub1' from 'origin'.
-Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out 'd38f90f41e255e336a7f7026ac3f2e330a7d75cd'
-Branch 'remove_sub1' set up to track remote branch 'remove_sub1' from 'origin'.
-Switched to a new branch 'ours'
-[ours 1eede15] add_x
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[ours 5c0ceff] Revert "add_x"
- Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:06:11 2021 +0000
- 1 file changed, 1 deletion(-)
-warning: unable to rmdir 'sub1': Directory not empty
-First, rewinding head to replay your work on top of it...
-Applying: add_x
-Applying: Revert "add_x"
-ok 6 - git_rebase: removed submodule leaves submodule containing a .git directory alone
-
-expecting success: 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
-			test_must_fail $command replace_sub1_with_directory &&
-			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 remote branch 'add_sub1' from 'origin'.
-Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out 'd38f90f41e255e336a7f7026ac3f2e330a7d75cd'
-Branch 'replace_sub1_with_directory' set up to track remote branch 'replace_sub1_with_directory' from 'origin'.
-Switched to a new branch 'ours'
-[ours b77288a] add_x
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[ours 8beeb2b] Revert "add_x"
- Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:06:12 2021 +0000
- 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
-fatal: Could not detach HEAD
-First, rewinding head to replay your work on top of it...
-ok 7 - git_rebase: replace submodule with a directory must fail
-
-expecting success: 
-		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 &&
-			test_must_fail $command replace_sub1_with_directory &&
-			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 remote branch 'add_sub1' from 'origin'.
-Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out 'd38f90f41e255e336a7f7026ac3f2e330a7d75cd'
-Branch 'replace_sub1_with_directory' set up to track remote branch 'replace_sub1_with_directory' from 'origin'.
-Switched to a new branch 'ours'
-[ours 801eaff] add_x
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[ours 42357ad] Revert "add_x"
- Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:06:14 2021 +0000
- 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
-fatal: Could not detach HEAD
-First, rewinding head to replay your work on top of it...
-ok 8 - git_rebase: replace submodule containing a .git directory with a directory must fail
-
-checking known breakage: 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
-			test_must_fail $command replace_sub1_with_file &&
-			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 remote branch 'add_sub1' from 'origin'.
-Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out 'd38f90f41e255e336a7f7026ac3f2e330a7d75cd'
-Branch 'replace_sub1_with_file' set up to track remote branch 'replace_sub1_with_file' from 'origin'.
-Switched to a new branch 'ours'
-[ours 5c381de] add_x
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[ours d2ac501] Revert "add_x"
- Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:06:15 2021 +0000
- 1 file changed, 1 deletion(-)
-First, rewinding head to replay your work on top of it...
-Applying: add_x
-Applying: Revert "add_x"
-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: 
-		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 &&
-			test_must_fail $command replace_sub1_with_file &&
-			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 remote branch 'add_sub1' from 'origin'.
-Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out 'd38f90f41e255e336a7f7026ac3f2e330a7d75cd'
-Branch 'replace_sub1_with_file' set up to track remote branch 'replace_sub1_with_file' from 'origin'.
-Switched to a new branch 'ours'
-[ours ea61be4] add_x
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[ours f68898d] Revert "add_x"
- Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:06:17 2021 +0000
- 1 file changed, 1 deletion(-)
-First, rewinding head to replay your work on top of it...
-Applying: add_x
-Applying: Revert "add_x"
-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: 
-		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 remote branch 'add_sub1' from 'origin'.
-Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out 'd38f90f41e255e336a7f7026ac3f2e330a7d75cd'
-Branch 'modify_sub1' set up to track remote branch 'modify_sub1' from 'origin'.
-Switched to a new branch 'ours'
-[ours 0ca4ba7] add_x
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[ours 3660d8d] Revert "add_x"
- Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:06:18 2021 +0000
- 1 file changed, 1 deletion(-)
-First, rewinding head to replay your work on top of it...
-Applying: add_x
-Applying: Revert "add_x"
-Submodule path 'sub1': checked out '9492adb8192da19fb90f24aec4516dd48923c2e6'
-ok 11 - git_rebase: modified submodule does not update submodule work tree
-
-expecting success: 
-		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 remote branch 'add_sub1' from 'origin'.
-Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out 'd38f90f41e255e336a7f7026ac3f2e330a7d75cd'
-Branch 'invalid_sub1' set up to track remote branch 'invalid_sub1' from 'origin'.
-Switched to a new branch 'ours'
-[ours 5fedb31] add_x
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[ours 48e2c5a] Revert "add_x"
- Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:06:21 2021 +0000
- 1 file changed, 1 deletion(-)
-First, rewinding head to replay your work on top of it...
-Applying: add_x
-Applying: Revert "add_x"
-error: Server does not allow request for unadvertised object 0123456789012345678901234567890123456789
-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: 
-		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 remote branch 'invalid_sub1' from 'origin'.
-fatal: Needed a single revision
-Branch 'valid_sub1' set up to track remote branch 'valid_sub1' from 'origin'.
-Switched to a new branch 'ours'
-[ours eeb89d0] add_x
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[ours f33df07] Revert "add_x"
- Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:06:22 2021 +0000
- 1 file changed, 1 deletion(-)
-First, rewinding head to replay your work on top of it...
-Applying: add_x
-Applying: Revert "add_x"
-Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out 'd38f90f41e255e336a7f7026ac3f2e330a7d75cd'
-Submodule path 'uninitialized_sub': checked out 'd38f90f41e255e336a7f7026ac3f2e330a7d75cd'
-ok 13 - git_rebase: modified submodule does not update submodule work tree from invalid commit
-
-expecting success: 
-		prolog &&
-		reset_work_tree_to 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 remote branch 'no_submodule' from 'origin'.
-Branch 'add_sub1' set up to track remote branch 'add_sub1' from 'origin'.
-Switched to a new branch 'ours'
-[ours 2b24b88] add_x
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[ours 5275130] Revert "add_x"
- Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:06:24 2021 +0000
- 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
-fatal: Could not detach HEAD
-First, rewinding head to replay your work on top of it...
-ok 14 - git_rebase: added submodule doesn't remove untracked unignored file with same name
-
-expecting success: 
-		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 remote branch 'no_submodule' from 'origin'.
-Branch 'add_sub1' set up to track remote branch 'add_sub1' from 'origin'.
-Switched to a new branch 'ours'
-[ours 2b24b88] add_x
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[ours 5275130] Revert "add_x"
- Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:06:24 2021 +0000
- 1 file changed, 1 deletion(-)
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/ours.
-Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out 'd38f90f41e255e336a7f7026ac3f2e330a7d75cd'
-Submodule path 'uninitialized_sub': checked out 'd38f90f41e255e336a7f7026ac3f2e330a7d75cd'
-ok 15 - git_rebase_interactive: added submodule creates empty directory
-
-expecting success: 
-		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 remote branch 'no_submodule' from 'origin'.
-Branch 'add_sub1' set up to track remote branch 'add_sub1' from 'origin'.
-Switched to a new branch 'ours'
-[ours e02593a] add_x
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[ours 519ee4c] Revert "add_x"
- Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:06:26 2021 +0000
- 1 file changed, 1 deletion(-)
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/ours.
-Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out 'd38f90f41e255e336a7f7026ac3f2e330a7d75cd'
-Submodule path 'uninitialized_sub': checked out 'd38f90f41e255e336a7f7026ac3f2e330a7d75cd'
-ok 16 - git_rebase_interactive: added submodule leaves existing empty directory alone
-
-expecting success: 
-		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 remote branch 'replace_sub1_with_file' from 'origin'.
-fatal: Needed a single revision
-Branch 'replace_file_with_sub1' set up to track remote branch 'replace_file_with_sub1' from 'origin'.
-Switched to a new branch 'ours'
-[ours 6d073f8] add_x
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[ours 3ce79a1] Revert "add_x"
- Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:06:27 2021 +0000
- 1 file changed, 1 deletion(-)
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/ours.
-Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out 'd38f90f41e255e336a7f7026ac3f2e330a7d75cd'
-Submodule path 'uninitialized_sub': checked out 'd38f90f41e255e336a7f7026ac3f2e330a7d75cd'
-ok 17 - git_rebase_interactive: replace tracked file with submodule creates empty directory
-
-expecting success: 
-		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 remote branch 'replace_sub1_with_directory' from 'origin'.
-fatal: Needed a single revision
-Branch 'replace_directory_with_sub1' set up to track remote branch 'replace_directory_with_sub1' from 'origin'.
-Switched to a new branch 'ours'
-[ours 96aa678] add_x
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[ours ab7e6b0] Revert "add_x"
- Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:06:28 2021 +0000
- 1 file changed, 1 deletion(-)
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/ours.
-Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out 'd38f90f41e255e336a7f7026ac3f2e330a7d75cd'
-Submodule path 'uninitialized_sub': checked out 'd38f90f41e255e336a7f7026ac3f2e330a7d75cd'
-ok 18 - git_rebase_interactive: replace directory with submodule
-
-expecting success: 
-		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 remote branch 'add_sub1' from 'origin'.
-Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out 'd38f90f41e255e336a7f7026ac3f2e330a7d75cd'
-Branch 'remove_sub1' set up to track remote branch 'remove_sub1' from 'origin'.
-Switched to a new branch 'ours'
-[ours 25a4d7b] add_x
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[ours 93d473f] Revert "add_x"
- Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:06:29 2021 +0000
- 1 file changed, 1 deletion(-)
-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
-
-expecting success: 
-		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 remote branch 'add_sub1' from 'origin'.
-Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out 'd38f90f41e255e336a7f7026ac3f2e330a7d75cd'
-Branch 'remove_sub1' set up to track remote branch 'remove_sub1' from 'origin'.
-Switched to a new branch 'ours'
-[ours e5a1e82] add_x
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[ours 5115ae7] Revert "add_x"
- Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:06:30 2021 +0000
- 1 file changed, 1 deletion(-)
-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
-
-expecting success: 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
-			test_must_fail $command replace_sub1_with_directory &&
-			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 remote branch 'add_sub1' from 'origin'.
-Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out 'd38f90f41e255e336a7f7026ac3f2e330a7d75cd'
-Branch 'replace_sub1_with_directory' set up to track remote branch 'replace_sub1_with_directory' from 'origin'.
-Switched to a new branch 'ours'
-[ours e5a1e82] add_x
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[ours 5115ae7] Revert "add_x"
- Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:06:30 2021 +0000
- 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
-
-expecting success: 
-		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 &&
-			test_must_fail $command replace_sub1_with_directory &&
-			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 remote branch 'add_sub1' from 'origin'.
-Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out 'd38f90f41e255e336a7f7026ac3f2e330a7d75cd'
-Branch 'replace_sub1_with_directory' set up to track remote branch 'replace_sub1_with_directory' from 'origin'.
-Switched to a new branch 'ours'
-[ours 4642ca1] add_x
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[ours 5f5bb83] Revert "add_x"
- Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:06:31 2021 +0000
- 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
-
-checking known breakage: 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
-			test_must_fail $command replace_sub1_with_file &&
-			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 remote branch 'add_sub1' from 'origin'.
-Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out 'd38f90f41e255e336a7f7026ac3f2e330a7d75cd'
-Branch 'replace_sub1_with_file' set up to track remote branch 'replace_sub1_with_file' from 'origin'.
-Switched to a new branch 'ours'
-[ours a743fad] add_x
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[ours c6bc041] Revert "add_x"
- Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:06:32 2021 +0000
- 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_interactive replace_sub1_with_file
-not ok 23 - git_rebase_interactive: replace submodule with a file must fail # TODO known breakage
-
-checking known breakage: 
-		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 &&
-			test_must_fail $command replace_sub1_with_file &&
-			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 remote branch 'add_sub1' from 'origin'.
-Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out 'd38f90f41e255e336a7f7026ac3f2e330a7d75cd'
-Branch 'replace_sub1_with_file' set up to track remote branch 'replace_sub1_with_file' from 'origin'.
-Switched to a new branch 'ours'
-[ours 15274f0] add_x
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[ours 9435c4d] Revert "add_x"
- Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:06:33 2021 +0000
- 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_interactive replace_sub1_with_file
-not ok 24 - git_rebase_interactive: replace submodule containing a .git directory with a file must fail # TODO known breakage
-
-expecting success: 
-		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 remote branch 'add_sub1' from 'origin'.
-Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out 'd38f90f41e255e336a7f7026ac3f2e330a7d75cd'
-Branch 'modify_sub1' set up to track remote branch 'modify_sub1' from 'origin'.
-Switched to a new branch 'ours'
-[ours c320041] add_x
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[ours 1036a20] Revert "add_x"
- Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:06:34 2021 +0000
- 1 file changed, 1 deletion(-)
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/ours.
-Submodule path 'sub1': checked out '9492adb8192da19fb90f24aec4516dd48923c2e6'
-ok 25 - git_rebase_interactive: modified submodule does not update submodule work tree
-
-expecting success: 
-		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 remote branch 'add_sub1' from 'origin'.
-Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out 'd38f90f41e255e336a7f7026ac3f2e330a7d75cd'
-Branch 'invalid_sub1' set up to track remote branch 'invalid_sub1' from 'origin'.
-Switched to a new branch 'ours'
-[ours ebd20a9] add_x
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[ours 9e628fd] Revert "add_x"
- Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:06:36 2021 +0000
- 1 file changed, 1 deletion(-)
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/ours.
-error: Server does not allow request for unadvertised object 0123456789012345678901234567890123456789
-Fetched in submodule path 'sub1', but it did not contain 0123456789012345678901234567890123456789. Direct fetching of that commit failed.
-ok 26 - git_rebase_interactive: modified submodule does not update submodule work tree to invalid commit
-
-expecting success: 
-		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 remote branch 'invalid_sub1' from 'origin'.
-fatal: Needed a single revision
-Branch 'valid_sub1' set up to track remote branch 'valid_sub1' from 'origin'.
-Switched to a new branch 'ours'
-[ours 0e5a47f] add_x
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[ours 1ef5c00] Revert "add_x"
- Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:06:37 2021 +0000
- 1 file changed, 1 deletion(-)
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/ours.
-Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out 'd38f90f41e255e336a7f7026ac3f2e330a7d75cd'
-Submodule path 'uninitialized_sub': checked out 'd38f90f41e255e336a7f7026ac3f2e330a7d75cd'
-ok 27 - git_rebase_interactive: modified submodule does not update submodule work tree from invalid commit
-
-expecting success: 
-		prolog &&
-		reset_work_tree_to 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 remote branch 'no_submodule' from 'origin'.
-Branch 'add_sub1' set up to track remote branch 'add_sub1' from 'origin'.
-Switched to a new branch 'ours'
-[ours 9569499] add_x
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[ours 541f467] Revert "add_x"
- Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:06:39 2021 +0000
- 1 file changed, 1 deletion(-)
-error: The following untracked working tree files would be overwritten by checkout:
-	sub1
-Please move or remove them before you switch branches.
-Aborting
-error: could not detach HEAD
-ok 28 - git_rebase_interactive: added submodule doesn't remove untracked unignored file with same name
-
-expecting success: 
-	test_when_finished "rm -rf super sub" &&
-	git init sub &&
-	git -C sub commit --allow-empty -m "Initial commit" &&
-	git init super &&
-	git -C super submodule add ../sub &&
-	git -C super config submodule.sub.ignore dirty &&
-	>super/foo &&
-	git -C super add foo &&
-	git -C super commit -m "Initial commit" &&
-	test_commit -C super a &&
-	test_commit -C super b &&
-	test_commit -C super/sub c &&
-	set_fake_editor &&
-	git -C super rebase -i HEAD^^
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3426-rebase-submodule/sub/.git/
-[master (root-commit) 87632eb] Initial commit
- Author: A U Thor <author@example.com>
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3426-rebase-submodule/super/.git/
-Cloning into '/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/super/sub'...
-done.
-[master (root-commit) f80e3b5] 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 ccb7020] a
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 a.t
-[master 768c11d] b
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b.t
-[master beb4126] c
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c.t
-Successfully rebased and updated refs/heads/master.
-ok 29 - rebase interactive ignores modified submodules
-
-# still have 4 known breakage(s)
-# passed all remaining 25 test(s)
-1..29
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
 *** t4017-diff-retval.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4017-diff-retval/.git/
 expecting success: 
@@ -95499,14 +94579,14 @@
 	git add . &&
 	git commit -a -m second
 
-[master (root-commit) c603872] zeroth
+[master (root-commit) f1521fd] zeroth
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 a
-[master f547cc5] first
+[master afc8c07] first
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-[master d333bcd] second
+[master f90f207] second
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 b
@@ -95547,7 +94627,7 @@
 expecting success: 
 	echo $(git rev-parse HEAD) | test_expect_code 1 git diff-tree --exit-code --stdin
 
-d333bcd8e6099814a786e1fc46b906e58896438a
+f90f2078510577818db3b24ab7ea6a06a8555693
 :000000 100644 0000000000000000000000000000000000000000 0cfbf08886fca9a91cb753ec8734c84fcbe52c9f A	b
 ok 8 - echo HEAD | git diff-tree --stdin
 
@@ -95586,7 +94666,7 @@
 	git commit -m "text in b" &&
 	test_expect_code 1 git diff-tree -p --exit-code -Stext HEAD^ HEAD -- b
 
-[master ad9b9dd] text in b
+[master 435c7b1] text in b
  Author: A U Thor <author@example.com>
  2 files changed, 2 insertions(+)
  create mode 100644 c
@@ -95673,7 +94753,7 @@
 	test 3 = $(grep "conflict marker" test.out | wc -l) &&
 	git reset --hard
 
-HEAD is now at ad9b9dd text in b
+HEAD is now at 435c7b1 text in b
 Note: checking out 'HEAD^'.
 
 You are in 'detached HEAD' state. You can look around, make experimental
@@ -95685,19 +94765,19 @@
 
   git checkout -b <new-branch-name>
 
-HEAD is now at d333bcd second
-[detached HEAD 4800e80] side
+HEAD is now at f90f207 second
+[detached HEAD ffcf0ae] side
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 Merging:
-4800e80 side
+ffcf0ae side
 virtual master
 found 1 common ancestor:
-d333bcd second
+f90f207 second
 Auto-merging b
 CONFLICT (content): Merge conflict in b
 Automatic merge failed; fix conflicts and then commit the result.
-HEAD is now at 4800e80 side
+HEAD is now at ffcf0ae side
 ok 23 - check detects leftover conflict markers
 
 expecting success: 
@@ -95715,11 +94795,11 @@
 	git diff --check a &&
 	git reset --hard
 
-HEAD is now at 4800e80 side
+HEAD is now at ffcf0ae side
 b:3: leftover conflict marker
-HEAD is now at 4800e80 side
+HEAD is now at ffcf0ae side
 b:3: leftover conflict marker
-HEAD is now at 4800e80 side
+HEAD is now at ffcf0ae side
 ok 24 - check honors conflict marker length
 
 # passed all 24 test(s)
@@ -96027,1930 +95107,314 @@
 1..21
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t4020-diff-external.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4020-diff-external/.git/
+*** t3701-add-interactive.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3701-add-interactive/.git/
 expecting success: 
-
-	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) &&
+	echo content >file &&
 	git add file &&
-	git commit -m second &&
-
-	test_tick &&
-	echo third >file
+	echo more >>file &&
+	echo lines >>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
+ok 1 - setup (initial)
 
 expecting success: 
+	git add -i </dev/null >output &&
+	grep "+1/-0 *+2/-0 file" output
 
-	GIT_EXTERNAL_DIFF=echo git diff | {
-		read path oldfile oldhex oldmode newfile newhex newmode &&
-		test "z$path" = zfile &&
-		test "z$oldmode" = z100644 &&
-		test "z$newhex" = "z$ZERO_OID" &&
-		test "z$newmode" = z100644 &&
-		oh=$(git rev-parse --verify HEAD:file) &&
-		test "z$oh" = "z$oldhex"
-	}
-
-
-ok 2 - GIT_EXTERNAL_DIFF environment
+  1:        +1/-0        +2/-0 file
+ok 2 - status works (initial)
 
 expecting success: 
+	cat >expected <<-\EOF
+	new file mode 100644
+	index 0000000..d95f3ad
+	--- /dev/null
+	+++ b/file
+	@@ -0,0 +1 @@
+	+content
+	EOF
 
-	GIT_EXTERNAL_DIFF=echo git log -p -1 HEAD |
-	grep "^diff --git a/file b/file"
-
-
-diff --git a/file b/file
-ok 3 - GIT_EXTERNAL_DIFF environment should apply only to diff
+ok 3 - setup expected
 
 expecting success: 
+	test_write_lines d 1 | git add -i >output &&
+	sed -ne "/new file/,/content/p" <output >diff &&
+	diff_cmp expected diff
 
-	GIT_EXTERNAL_DIFF=echo git diff --no-ext-diff |
-	grep "^diff --git a/file b/file"
+ok 4 - diff works (initial)
 
+expecting success: 
+	git add file &&
+	test_write_lines r 1 | git add -i &&
+	git ls-files >output &&
+	! grep . output
 
-diff --git a/file b/file
-ok 4 - GIT_EXTERNAL_DIFF environment and --no-ext-diff
+           staged     unstaged path
+  1:        +3/-0      nothing file
 
-checking prerequisite: SYMLINKS
+*** 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>> 
+rm 'file'
+reverted 1 path
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
-	# test whether the filesystem supports symbolic links
-	ln -s x y && test -h y
+*** 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 5 - revert works (initial)
 
-)
-prerequisite SYMLINKS ok
 expecting success: 
-	rm -f file &&
-	ln -s elif file &&
-	GIT_EXTERNAL_DIFF=echo git diff  | {
-		read path oldfile oldhex oldmode newfile newhex newmode &&
-		test "z$path" = zfile &&
-		test "z$oldmode" = z100644 &&
-		test "z$newhex" = "z$ZERO_OID" &&
-		test "z$newmode" = z120000 &&
-		oh=$(git rev-parse --verify HEAD:file) &&
-		test "z$oh" = "z$oldhex"
-	} &&
-	GIT_EXTERNAL_DIFF=echo git diff --no-ext-diff >actual &&
-	git diff >expect &&
-	test_cmp expect actual
+	echo baseline >file &&
+	git add file &&
+	git commit -m commit &&
+	echo content >>file &&
+	git add file &&
+	echo more >>file &&
+	echo lines >>file
 
-ok 5 - typechange diff
+[master (root-commit) 1232012] commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+ok 6 - setup (commit)
 
 expecting success: 
-	git reset --hard &&
-	echo third >file &&
-	test_config diff.external echo &&
-	git diff | {
-		read path oldfile oldhex oldmode newfile newhex newmode &&
-		test "z$path" = zfile &&
-		test "z$oldmode" = z100644 &&
-		test "z$newhex" = "z$ZERO_OID" &&
-		test "z$newmode" = z100644 &&
-		oh=$(git rev-parse --verify HEAD:file) &&
-		test "z$oh" = "z$oldhex"
-	}
+	git add -i </dev/null >output &&
+	grep "+1/-0 *+2/-0 file" output
 
-HEAD is now at f3562cd second
-ok 6 - diff.external
+  1:        +1/-0        +2/-0 file
+ok 7 - status works (commit)
 
 expecting success: 
-	test_config diff.external echo &&
-	git log -p -1 HEAD |
-	grep "^diff --git a/file b/file"
+	cat >expected <<-\EOF
+	index 180b47c..b6f2c08 100644
+	--- a/file
+	+++ b/file
+	@@ -1 +1,2 @@
+	 baseline
+	+content
+	EOF
 
-diff --git a/file b/file
-ok 7 - diff.external should apply only to diff
+ok 8 - setup expected
 
 expecting success: 
-	test_config diff.external echo &&
-	git diff --no-ext-diff |
-	grep "^diff --git a/file b/file"
+	test_write_lines d 1 | git add -i >output &&
+	sed -ne "/^index/,/content/p" <output >diff &&
+	diff_cmp expected diff
 
-diff --git a/file b/file
-ok 8 - diff.external and --no-ext-diff
+ok 9 - diff works (commit)
 
 expecting success: 
-	git reset --hard &&
-	echo third >file &&
-
-	git config diff.parrot.command echo &&
-
-	echo >.gitattributes "file diff=parrot" &&
+	git add file &&
+	test_write_lines r 1 | git add -i &&
+	git add -i </dev/null >output &&
+	grep "unchanged *+3/-0 file" output
 
-	git diff | {
-		read path oldfile oldhex oldmode newfile newhex newmode &&
-		test "z$path" = zfile &&
-		test "z$oldmode" = z100644 &&
-		test "z$newhex" = "z$ZERO_OID" &&
-		test "z$newmode" = z100644 &&
-		oh=$(git rev-parse --verify HEAD:file) &&
-		test "z$oh" = "z$oldhex"
-	}
+           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
 
-HEAD is now at f3562cd second
-ok 9 - diff attribute
+*** 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 10 - revert works (commit)
 
 expecting success: 
+	cat >expected <<-\EOF
+	EOF
 
-	git log -p -1 HEAD |
-	grep "^diff --git a/file b/file"
-
-
-diff --git a/file b/file
-ok 10 - diff attribute should apply only to diff
+ok 11 - setup expected
 
 expecting success: 
-
-	git diff --no-ext-diff |
-	grep "^diff --git a/file b/file"
-
+	test_set_editor : &&
+	test_write_lines e a | git add -p &&
+	git diff > diff &&
+	diff_cmp expected diff
 
 diff --git a/file b/file
-ok 11 - diff attribute and --no-ext-diff
+index 180b47c..f910ae9 100644
+--- a/file
++++ b/file
+@@ -1 +1,4 @@
+ baseline
++content
++more
++lines
+Stage this hunk [y,n,q,a,d,e,?]? 
+ok 12 - dummy edit works
 
 expecting success: 
+	cat >patch <<-\EOF
+	@@ -1,1 +1,4 @@
+	 this
+	+patch
+	-does not
+	 apply
+	EOF
 
-	git config --unset diff.parrot.command &&
-	git config diff.color.command echo &&
-
-	echo >.gitattributes "file diff=color" &&
-
-	git diff | {
-		read path oldfile oldhex oldmode newfile newhex newmode &&
-		test "z$path" = zfile &&
-		test "z$oldmode" = z100644 &&
-		test "z$newhex" = "z$ZERO_OID" &&
-		test "z$newmode" = z100644 &&
-		oh=$(git rev-parse --verify HEAD:file) &&
-		test "z$oh" = "z$oldhex"
-	}
-
-
-ok 12 - diff attribute
+ok 13 - setup patch
 
 expecting success: 
+	write_script "fake_editor.sh" <<-\EOF &&
+	mv -f "$1" oldpatch &&
+	mv -f patch "$1"
+	EOF
+	test_set_editor "$(pwd)/fake_editor.sh"
 
-	git log -p -1 HEAD |
-	grep "^diff --git a/file b/file"
-
-
-diff --git a/file b/file
-ok 13 - diff attribute should apply only to diff
+ok 14 - setup fake editor
 
 expecting success: 
+	git reset &&
+	test_write_lines e n d | git add -p >output &&
+	grep "hunk does not apply" output
 
-	git diff --no-ext-diff |
-	grep "^diff --git a/file b/file"
+Unstaged changes after reset:
+M	file
+error: patch failed: file:1
+error: file: patch does not apply
+Stage this hunk [y,n,q,a,d,e,?]? Your edited hunk does not apply. Edit again (saying "no" discards!) [y/n]? @@ -1 +1,4 @@
+ok 15 - bad edit rejected
 
+expecting success: 
+	cat >patch <<-\EOF
+	this patch
+	is garbage
+	EOF
 
-diff --git a/file b/file
-ok 14 - diff attribute and --no-ext-diff
+ok 16 - setup patch
 
 expecting success: 
-	>.gitattributes &&
-	test_config diff.external "echo ext-global" &&
-	GIT_EXTERNAL_DIFF="echo ext-env" git diff | grep ext-env
+	git reset &&
+	test_write_lines e n d | git add -p >output &&
+	grep "hunk does not apply" output
 
-ext-env file /tmp/xwqtZH_file e019be006cf33489e2d0177a3837a2384eddebc5 100644 file 0000000000000000000000000000000000000000 100644
-ok 15 - GIT_EXTERNAL_DIFF trumps diff.external
+Unstaged changes after reset:
+M	file
+error: corrupt patch at line 6
+Stage this hunk [y,n,q,a,d,e,?]? Your edited hunk does not apply. Edit again (saying "no" discards!) [y/n]? @@ -1 +1,4 @@
+ok 17 - garbage edit rejected
 
 expecting success: 
-	test_config diff.foo.command "echo ext-attribute" &&
-	test_config diff.external "echo ext-global" &&
-	echo "file diff=foo" >.gitattributes &&
-	GIT_EXTERNAL_DIFF="echo ext-env" git diff | grep ext-attribute
+	cat >patch <<-\EOF
+	@@ -1,0 +1,0 @@
+	 baseline
+	+content
+	+newcontent
+	+lines
+	EOF
 
-ext-attribute file /tmp/kVhW3W_file e019be006cf33489e2d0177a3837a2384eddebc5 100644 file 0000000000000000000000000000000000000000 100644
-ok 16 - attributes trump GIT_EXTERNAL_DIFF and diff.external
+ok 18 - setup patch
 
 expecting success: 
-	echo >.gitattributes "file -diff" &&
-	git diff | grep Binary
+	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
 
-Binary files a/file and b/file differ
-ok 17 - no diff with -diff
+ok 19 - setup expected
 
 expecting success: 
-	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
+	test_write_lines e n d | git add -p &&
+	git diff >output &&
+	diff_cmp expected output
 
-ok 18 - force diff with "diff"
+diff --git a/file b/file
+index 180b47c..f910ae9 100644
+--- a/file
++++ b/file
+@@ -1 +1,4 @@
+ baseline
++content
++more
++lines
+Stage this hunk [y,n,q,a,d,e,?]? 
+ok 20 - real edit works
 
 expecting success: 
-	echo anotherfile > file2 &&
-	git add file2 &&
-	git commit -m "added 2nd file" &&
-	echo modified >file2 &&
-	GIT_EXTERNAL_DIFF=echo git diff
+	test_write_lines a "" b "" c >file &&
+	git add file &&
+	test_write_lines a "" d "" c >file
 
-[master 314ec38] added 2nd file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file2
-file /tmp/ebqO7g_file e019be006cf33489e2d0177a3837a2384eddebc5 100644 file 0000000000000000000000000000000000000000 100644
-file2 /tmp/gIwXSf_file2 abc9fa522731419e7eaa3d472e3cb3d99e475c49 100644 file2 0000000000000000000000000000000000000000 100644
-ok 19 - GIT_EXTERNAL_DIFF with more than one changed files
+ok 21 - setup file
 
 expecting success: 
-	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
+	SP=" " &&
+	NULL="" &&
+	cat >patch <<-EOF
+	@@ -1,4 +1,4 @@
+	 a
+	$NULL
+	-b
+	+f
+	$SP
+	c
 	EOF
-	GIT_EXTERNAL_DIFF=./external-diff.sh git diff &&
-	test_cmp expect counter.txt
 
-ok 20 - GIT_EXTERNAL_DIFF path counter/total
+ok 22 - setup patch
 
 expecting success: 
-	touch file.ext &&
-	git add file.ext &&
-	echo with extension > file.ext &&
-	GIT_EXTERNAL_DIFF=echo git diff file.ext | grep ......_file\.ext &&
-	git update-index --force-remove file.ext &&
-	rm file.ext
+	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
 
-file.ext /tmp/8j2V0B_file.ext e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 file.ext 0000000000000000000000000000000000000000 100644
-ok 21 - GIT_EXTERNAL_DIFF generates pretty paths
+ok 23 - setup expected
 
 expecting success: 
-	test_config core.autocrlf true &&
-	GIT_EXTERNAL_DIFF=./fake-diff.sh git diff &&
-	test $(wc -l < crlfed.txt) = $(cat crlfed.txt | keep_only_cr | wc -c)
+	test_write_lines e n q | git add -p 2>error &&
+	test_must_be_empty error &&
+	git diff >output &&
+	diff_cmp expected output
 
-warning: LF will be replaced by CRLF in file2.
-The file will have its original line endings in your working directory
-ok 22 - external diff with autocrlf = true
-
-expecting success: 
-	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: 
-	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: 
-	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/git-2.20.1/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.
-[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/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t4022-diff-rewrite.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4022-diff-rewrite/.git/
-expecting success: 
-
-	cat "$TEST_DIRECTORY"/../COPYING >test &&
-	git add test &&
-	tr \
-	  "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ" \
-	  "nopqrstuvwxyzabcdefghijklmNOPQRSTUVWXYZABCDEFGHIJKLM" \
-	  <"$TEST_DIRECTORY"/../COPYING >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: 
-
-	actual=$(git diff-files -B --summary test) &&
-	verbose expr "$actual" : " rewrite test ([0-9]*%)$"
-
-
-19
-ok 2 - detect rewrite
-
-expecting success: 
-
-	rm test2 &&
-	git diff -- test2 >actual &&
-	test_cmp expect actual
-
-ok 3 - show deletion diff without -D
-
-expecting success: 
-
-	git diff -D -- test2 >actual &&
-	test_cmp expect actual
-
-ok 4 - suppress deletion diff with -D
-
-expecting success: 
-
-	git diff -B -- test >actual &&
-	grep "Linus Torvalds" actual
-
--			Linus Torvalds
-ok 5 - show deletion diff with -B
-
-expecting success: 
-
-	git diff -B -D -- test >actual &&
-	grep -v "Linus Torvalds" actual
-
-diff --git a/test b/test
-dissimilarity index 98%
-index 536e555..189438f 100644
---- a/test
-+++ b/test
-@@ -?,? +1,360 @@
-+
-+ 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
-+
-+----------------------------------------
-+
-+		    TAH TRARENY CHOYVP YVPRAFR
-+		       Irefvba 2, Whar 1991
-+
-+ Pbclevtug (P) 1989, 1991 Serr Fbsgjner Sbhaqngvba, Vap.,
-+ 51 Senaxyva Fgerrg, Svsgu Sybbe, Obfgba, ZN 02110-1301 HFN
-+ Rirelbar vf crezvggrq gb pbcl naq qvfgevohgr ireongvz pbcvrf
-+ bs guvf yvprafr qbphzrag, ohg punatvat vg vf abg nyybjrq.
-+
-+			    Cernzoyr
-+
-+  Gur yvprafrf sbe zbfg fbsgjner ner qrfvtarq gb gnxr njnl lbhe
-+serrqbz gb funer naq punatr vg.  Ol pbagenfg, gur TAH Trareny Choyvp
-+Yvprafr vf vagraqrq gb thnenagrr lbhe serrqbz gb funer naq punatr serr
-+fbsgjner--gb znxr fher gur fbsgjner vf serr sbe nyy vgf hfref.  Guvf
-+Trareny Choyvp Yvprafr nccyvrf gb zbfg bs gur Serr Fbsgjner
-+Sbhaqngvba'f fbsgjner naq gb nal bgure cebtenz jubfr nhgubef pbzzvg gb
-+hfvat vg.  (Fbzr bgure Serr Fbsgjner Sbhaqngvba fbsgjner vf pbirerq ol
-+gur TAH Yrffre Trareny Choyvp Yvprafr vafgrnq.)  Lbh pna nccyl vg gb
-+lbhe cebtenzf, gbb.
-+
-+  Jura jr fcrnx bs serr fbsgjner, jr ner ersreevat gb serrqbz, abg
-+cevpr.  Bhe Trareny Choyvp Yvprafrf ner qrfvtarq gb znxr fher gung lbh
-+unir gur serrqbz gb qvfgevohgr pbcvrf bs serr fbsgjner (naq punetr sbe
-+guvf freivpr vs lbh jvfu), gung lbh erprvir fbhepr pbqr be pna trg vg
-+vs lbh jnag vg, gung lbh pna punatr gur fbsgjner be hfr cvrprf bs vg
-+va arj serr cebtenzf; naq gung lbh xabj lbh pna qb gurfr guvatf.
-+
-+  Gb cebgrpg lbhe evtugf, jr arrq gb znxr erfgevpgvbaf gung sbeovq
-+nalbar gb qral lbh gurfr evtugf be gb nfx lbh gb fheeraqre gur evtugf.
-+Gurfr erfgevpgvbaf genafyngr gb pregnva erfcbafvovyvgvrf sbe lbh vs lbh
-+qvfgevohgr pbcvrf bs gur fbsgjner, be vs lbh zbqvsl vg.
-+
-+  Sbe rknzcyr, vs lbh qvfgevohgr pbcvrf bs fhpu n cebtenz, jurgure
-+tengvf be sbe n srr, lbh zhfg tvir gur erpvcvragf nyy gur evtugf gung
-+lbh unir.  Lbh zhfg znxr fher gung gurl, gbb, erprvir be pna trg gur
-+fbhepr pbqr.  Naq lbh zhfg fubj gurz gurfr grezf fb gurl xabj gurve
-+evtugf.
-+
-+  Jr cebgrpg lbhe evtugf jvgu gjb fgrcf: (1) pbclevtug gur fbsgjner, naq
-+(2) bssre lbh guvf yvprafr juvpu tvirf lbh yrtny crezvffvba gb pbcl,
-+qvfgevohgr naq/be zbqvsl gur fbsgjner.
-+
-+  Nyfb, sbe rnpu nhgube'f cebgrpgvba naq bhef, jr jnag gb znxr pregnva
-+gung rirelbar haqrefgnaqf gung gurer vf ab jneenagl sbe guvf serr
-+fbsgjner.  Vs gur fbsgjner vf zbqvsvrq ol fbzrbar ryfr naq cnffrq ba, jr
-+jnag vgf erpvcvragf gb xabj gung jung gurl unir vf abg gur bevtvany, fb
-+gung nal ceboyrzf vagebqhprq ol bguref jvyy abg ersyrpg ba gur bevtvany
-+nhgubef' erchgngvbaf.
-+
-+  Svanyyl, nal serr cebtenz vf guerngrarq pbafgnagyl ol fbsgjner
-+cngragf.  Jr jvfu gb nibvq gur qnatre gung erqvfgevohgbef bs n serr
-+cebtenz jvyy vaqvivqhnyyl bognva cngrag yvprafrf, va rssrpg znxvat gur
-+cebtenz cebcevrgnel.  Gb cerirag guvf, jr unir znqr vg pyrne gung nal
-+cngrag zhfg or yvprafrq sbe rirelbar'f serr hfr be abg yvprafrq ng nyy.
-+
-+  Gur cerpvfr grezf naq pbaqvgvbaf sbe pbclvat, qvfgevohgvba naq
-+zbqvsvpngvba sbyybj.
-+
-+		    TAH TRARENY CHOYVP YVPRAFR
-+   GREZF NAQ PBAQVGVBAF SBE PBCLVAT, QVFGEVOHGVBA NAQ ZBQVSVPNGVBA
-+
-+  0. Guvf Yvprafr nccyvrf gb nal cebtenz be bgure jbex juvpu pbagnvaf
-+n abgvpr cynprq ol gur pbclevtug ubyqre fnlvat vg znl or qvfgevohgrq
-+haqre gur grezf bs guvf Trareny Choyvp Yvprafr.  Gur "Cebtenz", orybj,
-+ersref gb nal fhpu cebtenz be jbex, naq n "jbex onfrq ba gur Cebtenz"
-+zrnaf rvgure gur Cebtenz be nal qrevingvir jbex haqre pbclevtug ynj:
-+gung vf gb fnl, n jbex pbagnvavat gur Cebtenz be n cbegvba bs vg,
-+rvgure ireongvz be jvgu zbqvsvpngvbaf naq/be genafyngrq vagb nabgure
-+ynathntr.  (Urervansgre, genafyngvba vf vapyhqrq jvgubhg yvzvgngvba va
-+gur grez "zbqvsvpngvba".)  Rnpu yvprafrr vf nqqerffrq nf "lbh".
-+
-+Npgvivgvrf bgure guna pbclvat, qvfgevohgvba naq zbqvsvpngvba ner abg
-+pbirerq ol guvf Yvprafr; gurl ner bhgfvqr vgf fpbcr.  Gur npg bs
-+ehaavat gur Cebtenz vf abg erfgevpgrq, naq gur bhgchg sebz gur Cebtenz
-+vf pbirerq bayl vs vgf pbagragf pbafgvghgr n jbex onfrq ba gur
-+Cebtenz (vaqrcraqrag bs univat orra znqr ol ehaavat gur Cebtenz).
-+Jurgure gung vf gehr qrcraqf ba jung gur Cebtenz qbrf.
-+
-+  1. Lbh znl pbcl naq qvfgevohgr ireongvz pbcvrf bs gur Cebtenz'f
-+fbhepr pbqr nf lbh erprvir vg, va nal zrqvhz, cebivqrq gung lbh
-+pbafcvphbhfyl naq nccebcevngryl choyvfu ba rnpu pbcl na nccebcevngr
-+pbclevtug abgvpr naq qvfpynvzre bs jneenagl; xrrc vagnpg nyy gur
-+abgvprf gung ersre gb guvf Yvprafr naq gb gur nofrapr bs nal jneenagl;
-+naq tvir nal bgure erpvcvragf bs gur Cebtenz n pbcl bs guvf Yvprafr
-+nybat jvgu gur Cebtenz.
-+
-+Lbh znl punetr n srr sbe gur culfvpny npg bs genafsreevat n pbcl, naq
-+lbh znl ng lbhe bcgvba bssre jneenagl cebgrpgvba va rkpunatr sbe n srr.
-+
-+  2. Lbh znl zbqvsl lbhe pbcl be pbcvrf bs gur Cebtenz be nal cbegvba
-+bs vg, guhf sbezvat n jbex onfrq ba gur Cebtenz, naq pbcl naq
-+qvfgevohgr fhpu zbqvsvpngvbaf be jbex haqre gur grezf bs Frpgvba 1
-+nobir, cebivqrq gung lbh nyfb zrrg nyy bs gurfr pbaqvgvbaf:
-+
-+    n) Lbh zhfg pnhfr gur zbqvsvrq svyrf gb pneel cebzvarag abgvprf
-+    fgngvat gung lbh punatrq gur svyrf naq gur qngr bs nal punatr.
-+
-+    o) Lbh zhfg pnhfr nal jbex gung lbh qvfgevohgr be choyvfu, gung va
-+    jubyr be va cneg pbagnvaf be vf qrevirq sebz gur Cebtenz be nal
-+    cneg gurerbs, gb or yvprafrq nf n jubyr ng ab punetr gb nyy guveq
-+    cnegvrf haqre gur grezf bs guvf Yvprafr.
-+
-+    p) Vs gur zbqvsvrq cebtenz abeznyyl ernqf pbzznaqf vagrenpgviryl
-+    jura eha, lbh zhfg pnhfr vg, jura fgnegrq ehaavat sbe fhpu
-+    vagrenpgvir hfr va gur zbfg beqvanel jnl, gb cevag be qvfcynl na
-+    naabhaprzrag vapyhqvat na nccebcevngr pbclevtug abgvpr naq n
-+    abgvpr gung gurer vf ab jneenagl (be ryfr, fnlvat gung lbh cebivqr
-+    n jneenagl) naq gung hfref znl erqvfgevohgr gur cebtenz haqre
-+    gurfr pbaqvgvbaf, naq gryyvat gur hfre ubj gb ivrj n pbcl bs guvf
-+    Yvprafr.  (Rkprcgvba: vs gur Cebtenz vgfrys vf vagrenpgvir ohg
-+    qbrf abg abeznyyl cevag fhpu na naabhaprzrag, lbhe jbex onfrq ba
-+    gur Cebtenz vf abg erdhverq gb cevag na naabhaprzrag.)
-+
-+Gurfr erdhverzragf nccyl gb gur zbqvsvrq jbex nf n jubyr.  Vs
-+vqragvsvnoyr frpgvbaf bs gung jbex ner abg qrevirq sebz gur Cebtenz,
-+naq pna or ernfbanoyl pbafvqrerq vaqrcraqrag naq frcnengr jbexf va
-+gurzfryirf, gura guvf Yvprafr, naq vgf grezf, qb abg nccyl gb gubfr
-+frpgvbaf jura lbh qvfgevohgr gurz nf frcnengr jbexf.  Ohg jura lbh
-+qvfgevohgr gur fnzr frpgvbaf nf cneg bs n jubyr juvpu vf n jbex onfrq
-+ba gur Cebtenz, gur qvfgevohgvba bs gur jubyr zhfg or ba gur grezf bs
-+guvf Yvprafr, jubfr crezvffvbaf sbe bgure yvprafrrf rkgraq gb gur
-+ragver jubyr, naq guhf gb rnpu naq rirel cneg ertneqyrff bs jub jebgr vg.
-+
-+Guhf, vg vf abg gur vagrag bs guvf frpgvba gb pynvz evtugf be pbagrfg
-+lbhe evtugf gb jbex jevggra ragveryl ol lbh; engure, gur vagrag vf gb
-+rkrepvfr gur evtug gb pbageby gur qvfgevohgvba bs qrevingvir be
-+pbyyrpgvir jbexf onfrq ba gur Cebtenz.
-+
-+Va nqqvgvba, zrer nttertngvba bs nabgure jbex abg onfrq ba gur Cebtenz
-+jvgu gur Cebtenz (be jvgu n jbex onfrq ba gur Cebtenz) ba n ibyhzr bs
-+n fgbentr be qvfgevohgvba zrqvhz qbrf abg oevat gur bgure jbex haqre
-+gur fpbcr bs guvf Yvprafr.
-+
-+  3. Lbh znl pbcl naq qvfgevohgr gur Cebtenz (be n jbex onfrq ba vg,
-+haqre Frpgvba 2) va bowrpg pbqr be rkrphgnoyr sbez haqre gur grezf bs
-+Frpgvbaf 1 naq 2 nobir cebivqrq gung lbh nyfb qb bar bs gur sbyybjvat:
-+
-+    n) Nppbzcnal vg jvgu gur pbzcyrgr pbeerfcbaqvat znpuvar-ernqnoyr
-+    fbhepr pbqr, juvpu zhfg or qvfgevohgrq haqre gur grezf bs Frpgvbaf
-+    1 naq 2 nobir ba n zrqvhz phfgbznevyl hfrq sbe fbsgjner vagrepunatr; be,
-+
-+    o) Nppbzcnal vg jvgu n jevggra bssre, inyvq sbe ng yrnfg guerr
-+    lrnef, gb tvir nal guveq cnegl, sbe n punetr ab zber guna lbhe
-+    pbfg bs culfvpnyyl cresbezvat fbhepr qvfgevohgvba, n pbzcyrgr
-+    znpuvar-ernqnoyr pbcl bs gur pbeerfcbaqvat fbhepr pbqr, gb or
-+    qvfgevohgrq haqre gur grezf bs Frpgvbaf 1 naq 2 nobir ba n zrqvhz
-+    phfgbznevyl hfrq sbe fbsgjner vagrepunatr; be,
-+
-+    p) Nppbzcnal vg jvgu gur vasbezngvba lbh erprvirq nf gb gur bssre
-+    gb qvfgevohgr pbeerfcbaqvat fbhepr pbqr.  (Guvf nygreangvir vf
-+    nyybjrq bayl sbe abapbzzrepvny qvfgevohgvba naq bayl vs lbh
-+    erprvirq gur cebtenz va bowrpg pbqr be rkrphgnoyr sbez jvgu fhpu
-+    na bssre, va nppbeq jvgu Fhofrpgvba o nobir.)
-+
-+Gur fbhepr pbqr sbe n jbex zrnaf gur cersreerq sbez bs gur jbex sbe
-+znxvat zbqvsvpngvbaf gb vg.  Sbe na rkrphgnoyr jbex, pbzcyrgr fbhepr
-+pbqr zrnaf nyy gur fbhepr pbqr sbe nyy zbqhyrf vg pbagnvaf, cyhf nal
-+nffbpvngrq vagresnpr qrsvavgvba svyrf, cyhf gur fpevcgf hfrq gb
-+pbageby pbzcvyngvba naq vafgnyyngvba bs gur rkrphgnoyr.  Ubjrire, nf n
-+fcrpvny rkprcgvba, gur fbhepr pbqr qvfgevohgrq arrq abg vapyhqr
-+nalguvat gung vf abeznyyl qvfgevohgrq (va rvgure fbhepr be ovanel
-+sbez) jvgu gur znwbe pbzcbaragf (pbzcvyre, xreary, naq fb ba) bs gur
-+bcrengvat flfgrz ba juvpu gur rkrphgnoyr ehaf, hayrff gung pbzcbarag
-+vgfrys nppbzcnavrf gur rkrphgnoyr.
-+
-+Vs qvfgevohgvba bs rkrphgnoyr be bowrpg pbqr vf znqr ol bssrevat
-+npprff gb pbcl sebz n qrfvtangrq cynpr, gura bssrevat rdhvinyrag
-+npprff gb pbcl gur fbhepr pbqr sebz gur fnzr cynpr pbhagf nf
-+qvfgevohgvba bs gur fbhepr pbqr, rira gubhtu guveq cnegvrf ner abg
-+pbzcryyrq gb pbcl gur fbhepr nybat jvgu gur bowrpg pbqr.
-+
-+  4. Lbh znl abg pbcl, zbqvsl, fhoyvprafr, be qvfgevohgr gur Cebtenz
-+rkprcg nf rkcerffyl cebivqrq haqre guvf Yvprafr.  Nal nggrzcg
-+bgurejvfr gb pbcl, zbqvsl, fhoyvprafr be qvfgevohgr gur Cebtenz vf
-+ibvq, naq jvyy nhgbzngvpnyyl grezvangr lbhe evtugf haqre guvf Yvprafr.
-+Ubjrire, cnegvrf jub unir erprvirq pbcvrf, be evtugf, sebz lbh haqre
-+guvf Yvprafr jvyy abg unir gurve yvprafrf grezvangrq fb ybat nf fhpu
-+cnegvrf erznva va shyy pbzcyvnapr.
-+
-+  5. Lbh ner abg erdhverq gb npprcg guvf Yvprafr, fvapr lbh unir abg
-+fvtarq vg.  Ubjrire, abguvat ryfr tenagf lbh crezvffvba gb zbqvsl be
-+qvfgevohgr gur Cebtenz be vgf qrevingvir jbexf.  Gurfr npgvbaf ner
-+cebuvovgrq ol ynj vs lbh qb abg npprcg guvf Yvprafr.  Gurersber, ol
-+zbqvslvat be qvfgevohgvat gur Cebtenz (be nal jbex onfrq ba gur
-+Cebtenz), lbh vaqvpngr lbhe npprcgnapr bs guvf Yvprafr gb qb fb, naq
-+nyy vgf grezf naq pbaqvgvbaf sbe pbclvat, qvfgevohgvat be zbqvslvat
-+gur Cebtenz be jbexf onfrq ba vg.
-+
-+  6. Rnpu gvzr lbh erqvfgevohgr gur Cebtenz (be nal jbex onfrq ba gur
-+Cebtenz), gur erpvcvrag nhgbzngvpnyyl erprvirf n yvprafr sebz gur
-+bevtvany yvprafbe gb pbcl, qvfgevohgr be zbqvsl gur Cebtenz fhowrpg gb
-+gurfr grezf naq pbaqvgvbaf.  Lbh znl abg vzcbfr nal shegure
-+erfgevpgvbaf ba gur erpvcvragf' rkrepvfr bs gur evtugf tenagrq urerva.
-+Lbh ner abg erfcbafvoyr sbe rasbepvat pbzcyvnapr ol guveq cnegvrf gb
-+guvf Yvprafr.
-+
-+  7. Vs, nf n pbafrdhrapr bs n pbheg whqtzrag be nyyrtngvba bs cngrag
-+vasevatrzrag be sbe nal bgure ernfba (abg yvzvgrq gb cngrag vffhrf),
-+pbaqvgvbaf ner vzcbfrq ba lbh (jurgure ol pbheg beqre, nterrzrag be
-+bgurejvfr) gung pbagenqvpg gur pbaqvgvbaf bs guvf Yvprafr, gurl qb abg
-+rkphfr lbh sebz gur pbaqvgvbaf bs guvf Yvprafr.  Vs lbh pnaabg
-+qvfgevohgr fb nf gb fngvfsl fvzhygnarbhfyl lbhe boyvtngvbaf haqre guvf
-+Yvprafr naq nal bgure cregvarag boyvtngvbaf, gura nf n pbafrdhrapr lbh
-+znl abg qvfgevohgr gur Cebtenz ng nyy.  Sbe rknzcyr, vs n cngrag
-+yvprafr jbhyq abg crezvg eblnygl-serr erqvfgevohgvba bs gur Cebtenz ol
-+nyy gubfr jub erprvir pbcvrf qverpgyl be vaqverpgyl guebhtu lbh, gura
-+gur bayl jnl lbh pbhyq fngvfsl obgu vg naq guvf Yvprafr jbhyq or gb
-+ersenva ragveryl sebz qvfgevohgvba bs gur Cebtenz.
-+
-+Vs nal cbegvba bs guvf frpgvba vf uryq vainyvq be harasbeprnoyr haqre
-+nal cnegvphyne pvephzfgnapr, gur onynapr bs gur frpgvba vf vagraqrq gb
-+nccyl naq gur frpgvba nf n jubyr vf vagraqrq gb nccyl va bgure
-+pvephzfgnaprf.
-+
-+Vg vf abg gur checbfr bs guvf frpgvba gb vaqhpr lbh gb vasevatr nal
-+cngragf be bgure cebcregl evtug pynvzf be gb pbagrfg inyvqvgl bs nal
-+fhpu pynvzf; guvf frpgvba unf gur fbyr checbfr bs cebgrpgvat gur
-+vagrtevgl bs gur serr fbsgjner qvfgevohgvba flfgrz, juvpu vf
-+vzcyrzragrq ol choyvp yvprafr cenpgvprf.  Znal crbcyr unir znqr
-+trarebhf pbagevohgvbaf gb gur jvqr enatr bs fbsgjner qvfgevohgrq
-+guebhtu gung flfgrz va eryvnapr ba pbafvfgrag nccyvpngvba bs gung
-+flfgrz; vg vf hc gb gur nhgube/qbabe gb qrpvqr vs ur be fur vf jvyyvat
-+gb qvfgevohgr fbsgjner guebhtu nal bgure flfgrz naq n yvprafrr pnaabg
-+vzcbfr gung pubvpr.
-+
-+Guvf frpgvba vf vagraqrq gb znxr gubebhtuyl pyrne jung vf oryvrirq gb
-+or n pbafrdhrapr bs gur erfg bs guvf Yvprafr.
-+
-+  8. Vs gur qvfgevohgvba naq/be hfr bs gur Cebtenz vf erfgevpgrq va
-+pregnva pbhagevrf rvgure ol cngragf be ol pbclevtugrq vagresnprf, gur
-+bevtvany pbclevtug ubyqre jub cynprf gur Cebtenz haqre guvf Yvprafr
-+znl nqq na rkcyvpvg trbtencuvpny qvfgevohgvba yvzvgngvba rkpyhqvat
-+gubfr pbhagevrf, fb gung qvfgevohgvba vf crezvggrq bayl va be nzbat
-+pbhagevrf abg guhf rkpyhqrq.  Va fhpu pnfr, guvf Yvprafr vapbecbengrf
-+gur yvzvgngvba nf vs jevggra va gur obql bs guvf Yvprafr.
-+
-+  9. Gur Serr Fbsgjner Sbhaqngvba znl choyvfu erivfrq naq/be arj irefvbaf
-+bs gur Trareny Choyvp Yvprafr sebz gvzr gb gvzr.  Fhpu arj irefvbaf jvyy
-+or fvzvyne va fcvevg gb gur cerfrag irefvba, ohg znl qvssre va qrgnvy gb
-+nqqerff arj ceboyrzf be pbapreaf.
-+
-+Rnpu irefvba vf tvira n qvfgvathvfuvat irefvba ahzore.  Vs gur Cebtenz
-+fcrpvsvrf n irefvba ahzore bs guvf Yvprafr juvpu nccyvrf gb vg naq "nal
-+yngre irefvba", lbh unir gur bcgvba bs sbyybjvat gur grezf naq pbaqvgvbaf
-+rvgure bs gung irefvba be bs nal yngre irefvba choyvfurq ol gur Serr
-+Fbsgjner Sbhaqngvba.  Vs gur Cebtenz qbrf abg fcrpvsl n irefvba ahzore bs
-+guvf Yvprafr, lbh znl pubbfr nal irefvba rire choyvfurq ol gur Serr Fbsgjner
-+Sbhaqngvba.
-+
-+  10. Vs lbh jvfu gb vapbecbengr cnegf bs gur Cebtenz vagb bgure serr
-+cebtenzf jubfr qvfgevohgvba pbaqvgvbaf ner qvssrerag, jevgr gb gur nhgube
-+gb nfx sbe crezvffvba.  Sbe fbsgjner juvpu vf pbclevtugrq ol gur Serr
-+Fbsgjner Sbhaqngvba, jevgr gb gur Serr Fbsgjner Sbhaqngvba; jr fbzrgvzrf
-+znxr rkprcgvbaf sbe guvf.  Bhe qrpvfvba jvyy or thvqrq ol gur gjb tbnyf
-+bs cerfreivat gur serr fgnghf bs nyy qrevingvirf bs bhe serr fbsgjner naq
-+bs cebzbgvat gur funevat naq erhfr bs fbsgjner trarenyyl.
-+
-+			    AB JNEENAGL
-+
-+  11. ORPNHFR GUR CEBTENZ VF YVPRAFRQ SERR BS PUNETR, GURER VF AB JNEENAGL
-+SBE GUR CEBTENZ, GB GUR RKGRAG CREZVGGRQ OL NCCYVPNOYR YNJ.  RKPRCG JURA
-+BGUREJVFR FGNGRQ VA JEVGVAT GUR PBCLEVTUG UBYQREF NAQ/BE BGURE CNEGVRF
-+CEBIVQR GUR CEBTENZ "NF VF" JVGUBHG JNEENAGL BS NAL XVAQ, RVGURE RKCERFFRQ
-+BE VZCYVRQ, VAPYHQVAT, OHG ABG YVZVGRQ GB, GUR VZCYVRQ JNEENAGVRF BS
-+ZREPUNAGNOVYVGL NAQ SVGARFF SBE N CNEGVPHYNE CHECBFR.  GUR RAGVER EVFX NF
-+GB GUR DHNYVGL NAQ CRESBEZNAPR BS GUR CEBTENZ VF JVGU LBH.  FUBHYQ GUR
-+CEBTENZ CEBIR QRSRPGVIR, LBH NFFHZR GUR PBFG BS NYY ARPRFFNEL FREIVPVAT,
-+ERCNVE BE PBEERPGVBA.
-+
-+  12. VA AB RIRAG HAYRFF ERDHVERQ OL NCCYVPNOYR YNJ BE NTERRQ GB VA JEVGVAT
-+JVYY NAL PBCLEVTUG UBYQRE, BE NAL BGURE CNEGL JUB ZNL ZBQVSL NAQ/BE
-+ERQVFGEVOHGR GUR CEBTENZ NF CREZVGGRQ NOBIR, OR YVNOYR GB LBH SBE QNZNTRF,
-+VAPYHQVAT NAL TRARENY, FCRPVNY, VAPVQRAGNY BE PBAFRDHRAGVNY QNZNTRF NEVFVAT
-+BHG BS GUR HFR BE VANOVYVGL GB HFR GUR CEBTENZ (VAPYHQVAT OHG ABG YVZVGRQ
-+GB YBFF BS QNGN BE QNGN ORVAT ERAQRERQ VANPPHENGR BE YBFFRF FHFGNVARQ OL
-+LBH BE GUVEQ CNEGVRF BE N SNVYHER BS GUR CEBTENZ GB BCRENGR JVGU NAL BGURE
-+CEBTENZF), RIRA VS FHPU UBYQRE BE BGURE CNEGL UNF ORRA NQIVFRQ BS GUR
-+CBFFVOVYVGL BS FHPU QNZNTRF.
-+
-+		     RAQ BS GREZF NAQ PBAQVGVBAF
-+
-+	    Ubj gb Nccyl Gurfr Grezf gb Lbhe Arj Cebtenzf
-+
-+  Vs lbh qrirybc n arj cebtenz, naq lbh jnag vg gb or bs gur terngrfg
-+cbffvoyr hfr gb gur choyvp, gur orfg jnl gb npuvrir guvf vf gb znxr vg
-+serr fbsgjner juvpu rirelbar pna erqvfgevohgr naq punatr haqre gurfr grezf.
-+
-+  Gb qb fb, nggnpu gur sbyybjvat abgvprf gb gur cebtenz.  Vg vf fnsrfg
-+gb nggnpu gurz gb gur fgneg bs rnpu fbhepr svyr gb zbfg rssrpgviryl
-+pbairl gur rkpyhfvba bs jneenagl; naq rnpu svyr fubhyq unir ng yrnfg
-+gur "pbclevtug" yvar naq n cbvagre gb jurer gur shyy abgvpr vf sbhaq.
-+
-+    <bar yvar gb tvir gur cebtenz'f anzr naq n oevrs vqrn bs jung vg qbrf.>
-+    Pbclevtug (P) <lrne>  <anzr bs nhgube>
-+
-+    Guvf cebtenz vf serr fbsgjner; lbh pna erqvfgevohgr vg naq/be zbqvsl
-+    vg haqre gur grezf bs gur TAH Trareny Choyvp Yvprafr nf choyvfurq ol
-+    gur Serr Fbsgjner Sbhaqngvba; rvgure irefvba 2 bs gur Yvprafr, be
-+    (ng lbhe bcgvba) nal yngre irefvba.
-+
-+    Guvf cebtenz vf qvfgevohgrq va gur ubcr gung vg jvyy or hfrshy,
-+    ohg JVGUBHG NAL JNEENAGL; jvgubhg rira gur vzcyvrq jneenagl bs
-+    ZREPUNAGNOVYVGL be SVGARFF SBE N CNEGVPHYNE CHECBFR.  Frr gur
-+    TAH Trareny Choyvp Yvprafr sbe zber qrgnvyf.
-+
-+    Lbh fubhyq unir erprvirq n pbcl bs gur TAH Trareny Choyvp Yvprafr nybat
-+    jvgu guvf cebtenz; vs abg, jevgr gb gur Serr Fbsgjner Sbhaqngvba, Vap.,
-+    51 Senaxyva Fgerrg, Svsgu Sybbe, Obfgba, ZN 02110-1301 HFN.
-+
-+Nyfb nqq vasbezngvba ba ubj gb pbagnpg lbh ol ryrpgebavp naq cncre znvy.
-+
-+Vs gur cebtenz vf vagrenpgvir, znxr vg bhgchg n fubeg abgvpr yvxr guvf
-+jura vg fgnegf va na vagrenpgvir zbqr:
-+
-+    Tabzbivfvba irefvba 69, Pbclevtug (P) lrne anzr bs nhgube
-+    Tabzbivfvba pbzrf jvgu NOFBYHGRYL AB JNEENAGL; sbe qrgnvyf glcr `fubj j'.
-+    Guvf vf serr fbsgjner, naq lbh ner jrypbzr gb erqvfgevohgr vg
-+    haqre pregnva pbaqvgvbaf; glcr `fubj p' sbe qrgnvyf.
-+
-+Gur ulcbgurgvpny pbzznaqf `fubj j' naq `fubj p' fubhyq fubj gur nccebcevngr
-+cnegf bs gur Trareny Choyvp Yvprafr.  Bs pbhefr, gur pbzznaqf lbh hfr znl
-+or pnyyrq fbzrguvat bgure guna `fubj j' naq `fubj p'; gurl pbhyq rira or
-+zbhfr-pyvpxf be zrah vgrzf--jungrire fhvgf lbhe cebtenz.
-+
-+Lbh fubhyq nyfb trg lbhe rzcyblre (vs lbh jbex nf n cebtenzzre) be lbhe
-+fpubby, vs nal, gb fvta n "pbclevtug qvfpynvzre" sbe gur cebtenz, vs
-+arprffnel.  Urer vf n fnzcyr; nygre gur anzrf:
-+
-+  Lblbqlar, Vap., urerol qvfpynvzf nyy pbclevtug vagrerfg va gur cebtenz
-+  `Tabzbivfvba' (juvpu znxrf cnffrf ng pbzcvyref) jevggra ol Wnzrf Unpxre.
-+
-+  <fvtangher bs Gl Pbba>, 1 Ncevy 1989
-+  Gl Pbba, Cerfvqrag bs Ivpr
-+
-+Guvf Trareny Choyvp Yvprafr qbrf abg crezvg vapbecbengvat lbhe cebtenz vagb
-+cebcevrgnel cebtenzf.  Vs lbhe cebtenz vf n fhoebhgvar yvoenel, lbh znl
-+pbafvqre vg zber hfrshy gb crezvg yvaxvat cebcevrgnel nccyvpngvbaf jvgu gur
-+yvoenel.  Vs guvf vf jung lbh jnag gb qb, hfr gur TAH Yrffre Trareny
-+Choyvp Yvprafr vafgrnq bs guvf Yvprafr.
-ok 6 - suppress deletion diff with -B -D
-
-expecting success: 
-	test_seq 1 99 >seq &&
-	printf 100 >>seq &&
-	git add seq &&
-	git commit seq -m seq
-
-[master (root-commit) 0069865] 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: 
-	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: 
-	git diff -B seq >res &&
-	grep "dissimilarity index" res
-
-dissimilarity index 92%
-ok 9 - confirm that sequence file is considered a rewrite
-
-expecting success: 
-	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: 
-	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/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t4021-format-patch-numbered.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4021-format-patch-numbered/.git/
-expecting success: 
-
-	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) b9d938a] First
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-[master 9fd634a] Second
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[master e0fca76] Third
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 1 - setup
-
-expecting success: 
-	git format-patch --stdout HEAD~1 >patch0.single &&
-	test_single_no_numbered patch0.single
-
-ok 2 - single patch defaults to no numbers
-
-expecting success: 
-
-	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: 
-
-	git format-patch --numbered --stdout HEAD~1 >patch1 &&
-	test_single_numbered patch1
-
-
-Subject: [PATCH 1/1] Third
-ok 4 - Use --numbered
-
-expecting success: 
-
-	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: 
-
-	git format-patch --stdout HEAD^ > patch3 &&
-	test_single_numbered patch3
-
-
-Subject: [PATCH 1/1] Third
-ok 6 - format.numbered && single patch
-
-expecting success: 
-
-	git format-patch --no-numbered --stdout HEAD~2 >patch4 &&
-	test_no_numbered patch4
-
-
-ok 7 - format.numbered && --no-numbered
-
-expecting success: 
-
-	git format-patch --keep-subject --stdout HEAD^ >patch4a &&
-	grep "^Subject: Third" patch4a
-
-
-Subject: Third
-ok 8 - format.numbered && --keep-subject
-
-expecting success: 
-
-	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: 
-
-	git format-patch --stdout HEAD^ > patch6 &&
-	test_single_no_numbered patch6
-
-
-ok 10 - format.numbered = auto && single patch
-
-expecting success: 
-
-	git format-patch --no-numbered --stdout HEAD~2 > patch7 &&
-	test_no_numbered patch7
-
-
-ok 11 - format.numbered = auto && --no-numbered
-
-expecting success: 
-
-	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: 
-	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: 
-	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/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t4023-diff-rename-typechange.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4023-diff-rename-typechange/.git/
-expecting success: 
-
-	rm -f foo bar &&
-	cat "$TEST_DIRECTORY"/../COPYING >foo &&
-	test_ln_s_add linklink bar &&
-	git add foo &&
-	git commit -a -m Initial &&
-	git tag one &&
-
-	git rm -f foo bar &&
-	cat "$TEST_DIRECTORY"/../COPYING >bar &&
-	test_ln_s_add linklink foo &&
-	git add bar &&
-	git commit -a -m Second &&
-	git tag two &&
-
-	git rm -f foo bar &&
-	cat "$TEST_DIRECTORY"/../COPYING >foo &&
-	git add foo &&
-	git commit -a -m Third &&
-	git tag three &&
-
-	mv foo bar &&
-	test_ln_s_add linklink foo &&
-	git add bar &&
-	git commit -a -m Fourth &&
-	git tag four &&
-
-	# This is purely for sanity check
-
-	git rm -f foo bar &&
-	cat "$TEST_DIRECTORY"/../COPYING >foo &&
-	cat "$TEST_DIRECTORY"/../Makefile >bar &&
-	git add foo bar &&
-	git commit -a -m Fifth &&
-	git tag five &&
-
-	git rm -f foo bar &&
-	cat "$TEST_DIRECTORY"/../Makefile >foo &&
-	cat "$TEST_DIRECTORY"/../COPYING >bar &&
-	git add foo bar &&
-	git commit -a -m Sixth &&
-	git tag six
-
-
-checking prerequisite: SYMLINKS
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
-	# test whether the filesystem supports symbolic links
-	ln -s x y && test -h y
-
-)
-prerequisite SYMLINKS ok
-[master (root-commit) 66f442f] Initial
- Author: A U Thor <author@example.com>
- 2 files changed, 361 insertions(+)
- create mode 120000 bar
- create mode 100644 foo
-rm 'bar'
-rm 'foo'
-[master f755402] Second
- Author: A U Thor <author@example.com>
- 2 files changed, 0 insertions(+), 0 deletions(-)
- rename foo => bar (100%)
- rename bar => foo (100%)
-rm 'bar'
-rm 'foo'
-[master 13cbbf7] Third
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename bar => foo (100%)
-[master 4e390a6] Fourth
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+), 360 deletions(-)
- copy foo => bar (100%)
- rewrite foo (100%)
- mode change 100644 => 120000
-rm 'bar'
-rm 'foo'
-[master 116576e] Fifth
- Author: A U Thor <author@example.com>
- 2 files changed, 3118 insertions(+), 360 deletions(-)
- rewrite bar (98%)
- copy bar => foo (100%)
-rm 'bar'
-rm 'foo'
-[master 96a8a70] Sixth
- Author: A U Thor <author@example.com>
- 2 files changed, 0 insertions(+), 0 deletions(-)
- rename foo => bar (100%)
- rename bar => foo (100%)
-ok 1 - setup
-
-expecting success: 
-
-	git diff-tree five six -r --name-status -B -M | sort >actual &&
-	{
-		echo "R100	foo	bar"
-		echo "R100	bar	foo"
-	} | sort >expect &&
-	test_cmp expect actual
-
-
-ok 2 - cross renames to be detected for regular files
-
-expecting success: 
-
-	git diff-tree one two -r --name-status -B -M | sort >actual &&
-	{
-		echo "R100	foo	bar"
-		echo "R100	bar	foo"
-	} | sort >expect &&
-	test_cmp expect actual
-
-
-ok 3 - cross renames to be detected for typechange
-
-expecting success: 
-
-	git diff-tree three four -r --name-status -B -M | sort >actual &&
-	{
-		# see -B -M (#6) in t4008
-		echo "C100	foo	bar"
-		echo "T100	foo"
-	} | sort >expect &&
-	test_cmp expect actual
-
-
-ok 4 - moves and renames
-
-# passed all 4 test(s)
-1..4
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t4024-diff-optimize-common.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4024-diff-optimize-common/.git/
-expecting success: 
-
-	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: 
-
-	for n in $sample
-	do
-		git diff -U0 file-?$n
-	done | zc >actual &&
-	test_cmp expect actual
-
-
-ok 2 - diff -U0
-
-# passed all 2 test(s)
-1..2
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t4025-hunk-header.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4025-hunk-header/.git/
-expecting success: 
-
-	(
-		echo "A $NS" &&
-		for c in B C D E F G H I J K
-		do
-			echo "  $c"
-		done &&
-		echo "L  $NS" &&
-		for c in M N O P Q R S T U V
-		do
-			echo "  $c"
-		done
-	) >file &&
-	git add file &&
-
-	sed -e "/^  [EP]/s/$/ modified/" <file >file+ &&
-	mv file+ file
-
-
-ok 1 - setup
-
-expecting success: 
-
-	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/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t3905-stash-include-untracked.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3905-stash-include-untracked/.git/
-expecting success: 
-	echo 1 > file &&
-	git add file &&
-	test_tick &&
-	git commit -m initial &&
-	echo 2 > file &&
-	git add file &&
-	echo 3 > file &&
-	test_tick &&
-	echo 1 > file2 &&
-	echo 1 > HEAD &&
-	mkdir untracked &&
-	echo untracked >untracked/untracked &&
-	git stash --include-untracked &&
-	git diff-files --quiet &&
-	git diff-index --cached --quiet HEAD
-
-[master (root-commit) 777c62c] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-Saved working directory and index state WIP on master: 777c62c initial
-ok 1 - stash save --include-untracked some dirty working directory
-
-expecting success: 
-	git status --porcelain >actual &&
-	test_cmp expect actual
-
-ok 2 - stash save --include-untracked cleaned the untracked files
-
-expecting success: 
-	test_path_is_missing file2 &&
-	test_path_is_missing untracked &&
-	test_path_is_missing HEAD &&
-	git diff HEAD stash^3 -- HEAD file2 untracked >actual &&
-	test_cmp expect.diff actual &&
-	git ls-tree --name-only stash^3: >actual &&
-	test_cmp expect.lstree actual
-
-ok 3 - stash save --include-untracked stashed the untracked files
-
-expecting success: 
-	test_must_fail git stash --patch --include-untracked
-
-Can't use --patch and --include-untracked or --all at the same time
-ok 4 - stash save --patch --include-untracked fails
-
-expecting success: 
-	test_must_fail git stash --patch --all
-
-Can't use --patch and --include-untracked or --all at the same time
-ok 5 - stash save --patch --all fails
-
-expecting success: 
-	git stash pop &&
-	git status --porcelain >actual &&
-	test_cmp expect actual &&
-	test "1" = "$(cat file2)" &&
-	test untracked = "$(cat untracked/untracked)"
-
-Merging Version stash was based on with Stashed changes
-Merging:
-virtual Version stash was based on
-virtual Stashed changes
-found 1 common ancestor:
-virtual f27c6ae26adb8396d3861976ba268f87ad8afa0b
-On branch master
-Changes not staged for commit:
-  (use "git add <file>..." to update what will be committed)
-  (use "git checkout -- <file>..." to discard changes in working directory)
-
-	modified:   file
-
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-
-	HEAD
-	expect
-	file2
-	untracked/
-
-no changes added to commit (use "git add" and/or "git commit -a")
-Dropped refs/stash@{0} (0a7d204f1703777538511f544d27630f4eca5b11)
-ok 6 - stash pop after save --include-untracked leaves files untracked again
-
-expecting success: 
-	echo 4 > file3 &&
-	git add file3 &&
-	test_tick &&
-	git stash -u
-
-Saved working directory and index state WIP on master: 777c62c initial
-ok 7 - stash save -u dirty index
-
-expecting success: 
-	git stash pop --index &&
-	git diff --cached >actual &&
-	test_cmp expect actual
-
-Merging Version stash was based on with Stashed changes
-Merging:
-virtual Version stash was based on
-virtual Stashed changes
-found 1 common ancestor:
-virtual f27c6ae26adb8396d3861976ba268f87ad8afa0b
-On branch master
-Changes to be committed:
-  (use "git reset HEAD <file>..." to unstage)
-
-	new file:   file3
-
-Changes not staged for commit:
-  (use "git add <file>..." to update what will be committed)
-  (use "git checkout -- <file>..." to discard changes in working directory)
-
-	modified:   file
-
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-
-	expect
-
-Dropped refs/stash@{0} (d531845c34afd9e73a5059048aeaaaf9bdbf02ff)
-ok 8 - stash save --include-untracked dirty index got stashed
-
-expecting success: 
-	echo 1 > file5 &&
-	git stash save --include-untracked --quiet > .git/stash-output.out 2>&1 &&
-	test_line_count = 0 .git/stash-output.out &&
-	rm -f .git/stash-output.out
-
-ok 9 - stash save --include-untracked -q is quiet
-
-expecting success: 
-	rm -f file &&
-	git stash save --include-untracked &&
-	echo 1 > expect &&
-	test_cmp expect file
-
-Saved working directory and index state WIP on master: 777c62c initial
-ok 10 - stash save --include-untracked removed files
-
-expecting success: 
-	git stash pop &&
-	test_path_is_missing file
-
-Merging Version stash was based on with Stashed changes
-Merging:
-virtual Version stash was based on
-virtual Stashed changes
-found 1 common ancestor:
-virtual f27c6ae26adb8396d3861976ba268f87ad8afa0b
-Removing file
-On branch master
-Changes not staged for commit:
-  (use "git add/rm <file>..." to update what will be committed)
-  (use "git checkout -- <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} (0fe2ec27acd9fc86eb08e4840c3d194b1a902734)
-ok 11 - stash save --include-untracked removed files got stashed
-
-expecting success: 
-	echo ignored > ignored &&
-	mkdir ignored.d &&
-	echo ignored >ignored.d/untracked &&
-	git stash -u &&
-	test -s ignored &&
-	test -s ignored.d/untracked &&
-	test -s .gitignore
-
-Saved working directory and index state WIP on master: 777c62c initial
-ok 12 - stash save --include-untracked respects .gitignore
-
-expecting success: 
-	echo 4 > file4 &&
-	git stash -u &&
-	test_path_is_missing file4
-
-Saved working directory and index state WIP on master: 777c62c initial
-ok 13 - stash save -u can stash with only untracked files different
-
-expecting success: 
-	git stash -a &&
-	test_path_is_missing ignored &&
-	test_path_is_missing ignored.d &&
-	test_path_is_missing .gitignore
-
-Saved working directory and index state WIP on master: 777c62c initial
-ok 14 - stash save --all does not respect .gitignore
-
-expecting success: 
-	git stash pop &&
-	test -s ignored &&
-	test -s ignored.d/untracked &&
-	test -s .gitignore
-
-Merging Version stash was based on with Version stash was based on
-Merging:
-virtual Version stash was based on
-virtual Version stash was based on
-found 1 common ancestor:
-virtual f27c6ae26adb8396d3861976ba268f87ad8afa0b
-Already up to date!
-On branch master
-nothing to commit, working tree clean
-Dropped refs/stash@{0} (237dbb933d97e03cdd270bc30c51e573dcf9a6ca)
-ok 15 - stash save --all is stash poppable
-
-expecting success: 
-	>foo &&
-	>bar &&
-	git stash push --include-untracked -- foo &&
-	test_path_is_file bar &&
-	test_path_is_missing foo &&
-	git stash pop &&
-	test_path_is_file bar &&
-	test_path_is_file foo
-
-Saved working directory and index state WIP on master: 777c62c initial
-Merging Version stash was based on with Version stash was based on
-Merging:
-virtual Version stash was based on
-virtual Version stash was based on
-found 1 common ancestor:
-virtual f27c6ae26adb8396d3861976ba268f87ad8afa0b
-Already up to date!
-On branch master
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-
-	bar
-	foo
-
-nothing added to commit but untracked files present (use "git add" to track)
-Dropped refs/stash@{0} (49d4a45c68f9c8f49ba4e5d98977bafffbb0368c)
-ok 16 - stash push --include-untracked with pathspec
-
-expecting success: 
-	>"foo bar" &&
-	>foo &&
-	>bar &&
-	git add foo* &&
-	git stash push --include-untracked -- "foo b*" &&
-	test_path_is_missing "foo bar" &&
-	test_path_is_file foo &&
-	test_path_is_file bar &&
-	git stash pop &&
-	test_path_is_file "foo bar" &&
-	test_path_is_file foo &&
-	test_path_is_file bar
-
-Saved working directory and index state WIP on master: 777c62c initial
-Merging Updated upstream with Stashed changes
-Merging:
-virtual Updated upstream
-virtual Stashed changes
-found 1 common ancestor:
-virtual f27c6ae26adb8396d3861976ba268f87ad8afa0b
-On branch master
-Changes to be committed:
-  (use "git reset HEAD <file>..." to unstage)
-
-	new file:   foo
-	new file:   foo bar
-
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-
-	bar
-
-Dropped refs/stash@{0} (1b64bbe5a16668a7a5a6fabfddf7fe8c30c16a63)
-ok 17 - stash push with $IFS character
-
-expecting success: 
-	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
-
-[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
-Merging:
-virtual Version stash was based on
-virtual Stashed changes
-found 1 common ancestor:
-virtual f810f552a0f89486ec70c4734dc5a9c52c8342dd
-On branch master
-Changes not staged for commit:
-  (use "git add <file>..." to update what will be committed)
-  (use "git checkout -- <file>..." to discard changes in working directory)
-
-	modified:   .gitignore
-
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-
-	bar
-	foo
-	foo bar
-	ignored.d/
-
-no changes added to commit (use "git add" and/or "git commit -a")
-Dropped refs/stash@{0} (389c72c4d3838b0b99c65190f50f6b9257e12eec)
-ok 18 - stash previously ignored file
-
-expecting success: 
-	>untracked &&
-	git stash push -u -- untracked 2>actual &&
-	test_path_is_missing untracked &&
-	test_line_count = 0 actual
-
-Saved working directory and index state WIP on master: 14579a4 Add .gitignore
-ok 19 - stash -u -- <untracked> doesnt print error
-
-expecting success: 
-	>tracked &&
-	git add tracked &&
-	>untracked &&
-	git stash push -u -- untracked &&
-	test_path_is_missing untracked &&
-	test_path_is_file tracked
-
-Saved working directory and index state WIP on master: 14579a4 Add .gitignore
-ok 20 - stash -u -- <untracked> leaves rest of working tree in place
-
-expecting success: 
-	>tracked &&
-	git add tracked &&
-	>untracked &&
-	git stash push -u -- tracked untracked &&
-	test_path_is_missing tracked &&
-	test_path_is_missing untracked
-
-Saved working directory and index state WIP on master: 14579a4 Add .gitignore
-ok 21 - stash -u -- <tracked> <untracked> clears changes in both
-
-expecting success: 
-	>ignored.d/bar &&
-	git stash push --all -- ignored.d/bar &&
-	test_path_is_missing ignored.d/bar
-
-Saved working directory and index state WIP on master: 14579a4 Add .gitignore
-ok 22 - stash --all -- <ignored> stashes ignored file
-
-expecting success: 
-	>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
-
-Saved working directory and index state WIP on master: 14579a4 Add .gitignore
-ok 23 - stash --all -- <tracked> <ignored> clears changes in both
-
-expecting success: 
-	>ignored.d/bar &&
-	git stash push -u -- ignored.d/bar &&
-	test_path_is_file ignored.d/bar
-
-No local changes to save
-ok 24 - stash -u -- <ignored> leaves ignored file alone
-
-expecting success: 
-	git stash push -u -- non-existant >actual &&
-	echo "No local changes to save" >expect &&
-	test_i18ncmp expect actual
-
-ok 25 - stash -u -- <non-existant> shows no changes when there are none
-
-# passed all 25 test(s)
-1..25
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t4028-format-patch-mime-headers.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4028-format-patch-mime-headers/.git/
-expecting success: 
-	echo content >file &&
-	git add file &&
-	git commit -m one &&
-	echo more >>file &&
-	git commit -a -m "two
-
-	utf-8 body: ñ"
-
-[master (root-commit) e95f705] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-[master 38218e8] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 1 - create commit with utf-8 body
-
-expecting success: 
-	rm -f 0001-two.patch &&
-	git format-patch HEAD^ &&
-	grep -i "content-type: text/plain; charset=utf-8" 0001-two.patch
-
-0001-two.patch
-Content-Type: text/plain; charset=UTF-8
-ok 2 - patch has mime headers
-
-expecting success: 
-	rm -f 0001-two.patch &&
-	git config format.headers "x-foo: bar" &&
-	git format-patch HEAD^ &&
-	grep -i "x-foo: bar" 0001-two.patch &&
-	grep -i "content-type: text/plain; charset=utf-8" 0001-two.patch
-
-0001-two.patch
-x-foo: bar
-Content-Type: text/plain; charset=UTF-8
-ok 3 - patch has mime and extra headers
-
-# passed all 3 test(s)
-1..3
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t3701-add-interactive.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3701-add-interactive/.git/
-expecting success: 
-	echo content >file &&
-	git add file &&
-	echo more >>file &&
-	echo lines >>file
-
-ok 1 - setup (initial)
-
-expecting success: 
-	git add -i </dev/null >output &&
-	grep "+1/-0 *+2/-0 file" output
-
-  1:        +1/-0        +2/-0 file
-ok 2 - status works (initial)
-
-expecting success: 
-	cat >expected <<-\EOF
-	new file mode 100644
-	index 0000000..d95f3ad
-	--- /dev/null
-	+++ b/file
-	@@ -0,0 +1 @@
-	+content
-	EOF
-
-ok 3 - setup expected
-
-expecting success: 
-	test_write_lines d 1 | git add -i >output &&
-	sed -ne "/new file/,/content/p" <output >diff &&
-	diff_cmp expected diff
-
-ok 4 - diff works (initial)
-
-expecting success: 
-	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>> 
-rm 'file'
-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 5 - revert works (initial)
-
-expecting success: 
-	echo baseline >file &&
-	git add file &&
-	git commit -m commit &&
-	echo content >>file &&
-	git add file &&
-	echo more >>file &&
-	echo lines >>file
-
-[master (root-commit) e4cb0dd] commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-ok 6 - setup (commit)
-
-expecting success: 
-	git add -i </dev/null >output &&
-	grep "+1/-0 *+2/-0 file" output
-
-  1:        +1/-0        +2/-0 file
-ok 7 - status works (commit)
-
-expecting success: 
-	cat >expected <<-\EOF
-	index 180b47c..b6f2c08 100644
-	--- a/file
-	+++ b/file
-	@@ -1 +1,2 @@
-	 baseline
-	+content
-	EOF
-
-ok 8 - setup expected
-
-expecting success: 
-	test_write_lines d 1 | git add -i >output &&
-	sed -ne "/^index/,/content/p" <output >diff &&
-	diff_cmp expected diff
-
-ok 9 - diff works (commit)
-
-expecting success: 
-	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 10 - revert works (commit)
-
-expecting success: 
-	cat >expected <<-\EOF
-	EOF
-
-ok 11 - setup expected
-
-expecting success: 
-	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
-Stage this hunk [y,n,q,a,d,e,?]? 
-ok 12 - dummy edit works
-
-expecting success: 
-	cat >patch <<-\EOF
-	@@ -1,1 +1,4 @@
-	 this
-	+patch
-	-does not
-	 apply
-	EOF
-
-ok 13 - setup patch
-
-expecting success: 
-	write_script "fake_editor.sh" <<-\EOF &&
-	mv -f "$1" oldpatch &&
-	mv -f patch "$1"
-	EOF
-	test_set_editor "$(pwd)/fake_editor.sh"
-
-ok 14 - setup fake editor
-
-expecting success: 
-	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
-Stage this hunk [y,n,q,a,d,e,?]? Your edited hunk does not apply. Edit again (saying "no" discards!) [y/n]? @@ -1 +1,4 @@
-ok 15 - bad edit rejected
-
-expecting success: 
-	cat >patch <<-\EOF
-	this patch
-	is garbage
-	EOF
-
-ok 16 - setup patch
-
-expecting success: 
-	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
-Stage this hunk [y,n,q,a,d,e,?]? Your edited hunk does not apply. Edit again (saying "no" discards!) [y/n]? @@ -1 +1,4 @@
-ok 17 - garbage edit rejected
-
-expecting success: 
-	cat >patch <<-\EOF
-	@@ -1,0 +1,0 @@
-	 baseline
-	+content
-	+newcontent
-	+lines
-	EOF
-
-ok 18 - setup patch
-
-expecting success: 
-	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 19 - setup expected
-
-expecting success: 
-	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
-Stage this hunk [y,n,q,a,d,e,?]? 
-ok 20 - real edit works
-
-expecting success: 
-	test_write_lines a "" b "" c >file &&
-	git add file &&
-	test_write_lines a "" d "" c >file
-
-ok 21 - setup file
-
-expecting success: 
-	SP=" " &&
-	NULL="" &&
-	cat >patch <<-EOF
-	@@ -1,4 +1,4 @@
-	 a
-	$NULL
-	-b
-	+f
-	$SP
-	c
-	EOF
-
-ok 22 - setup patch
-
-expecting success: 
-	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 23 - setup expected
-
-expecting success: 
-	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
-Stage this hunk [y,n,q,a,d,e,?]? 
-ok 24 - edit can strip spaces from empty context lines
+diff --git a/file b/file
+index bda3f38..90b7c9d 100644
+--- a/file
++++ b/file
+@@ -1,5 +1,5 @@
+ a
+ 
+-b
++d
+ 
+ c
+Stage this hunk [y,n,q,a,d,e,?]? 
+ok 24 - edit can strip spaces from empty context lines
 
 expecting success: 
 	git reset &&
@@ -97976,10 +95440,10 @@
 Stage this hunk [y,n,q,a,d,e,?]? 
 Unstaged changes after reset:
 M	file
-[master d5c97a1] commit
+[master 76419d3] commit
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-HEAD is now at e4cb0dd commit
+HEAD is now at 1232012 commit
 ok 25 - skip files similarly as commit -a
 
 checking prerequisite: FILEMODE
@@ -97999,7 +95463,7 @@
 	git show :file | grep content &&
 	git diff file | grep "new mode"
 
-HEAD is now at e4cb0dd commit
+HEAD is now at 1232012 commit
 diff --git a/file b/file
 index 180b47c..b6f2c08
 --- a/file
@@ -98022,7 +95486,7 @@
 	git diff --cached file | grep "new mode" &&
 	git diff          file | grep "+content"
 
-HEAD is now at e4cb0dd commit
+HEAD is now at 1232012 commit
 diff --git a/file b/file
 index 180b47c..b6f2c08
 --- a/file
@@ -98046,7 +95510,7 @@
 	git diff --cached file | grep "+content" &&
 	test -z "$(git diff file)"
 
-HEAD is now at e4cb0dd commit
+HEAD is now at 1232012 commit
 diff --git a/file b/file
 index 180b47c..b6f2c08
 --- a/file
@@ -98066,7 +95530,7 @@
 	test_chmod +x file &&
 	echo content >>file
 
-HEAD is now at e4cb0dd commit
+HEAD is now at 1232012 commit
 ok 29 - setup again
 
 expecting success: 
@@ -98120,7 +95584,7 @@
 	diff_cmp expected diff &&
 	test_cmp expected-output output
 
-[master 24b2bd9] clear local changes
+[master acf73aa] clear local changes
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  mode change 100644 => 100755 file
@@ -98149,8 +95613,8 @@
 	git diff --cached >diff &&
 	diff_cmp expected diff
 
-HEAD is now at 24b2bd9 clear local changes
-[master a35cd99] non-empty
+HEAD is now at acf73aa clear local changes
+[master ac9f70b] non-empty
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 non-empty
@@ -98183,8 +95647,8 @@
 	git diff --cached >diff &&
 	diff_cmp expected diff
 
-HEAD is now at a35cd99 non-empty
-[master dd1f124] empty
+HEAD is now at ac9f70b non-empty
+[master 506c4f7] empty
  Author: A U Thor <author@example.com>
  1 file changed, 0 insertions(+), 0 deletions(-)
  create mode 100644 empty
@@ -98203,8 +95667,8 @@
 
 	test_write_lines 10 15 20 21 22 23 24 30 40 50 60 >test
 
-HEAD is now at dd1f124 empty
-[master 8ff8dae] test
+HEAD is now at 506c4f7 empty
+[master 0fcfeb2] test
  Author: A U Thor <author@example.com>
  1 file changed, 6 insertions(+)
  create mode 100644 test
@@ -98336,30 +95800,30 @@
 	git diff --cached >diff &&
 	diff_cmp expected diff
 
-HEAD is now at 8ff8dae test
-[master 8feb84e] conflict
+HEAD is now at 0fcfeb2 test
+[master e229b4d] conflict
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 conflict.t
-[master 7520445] non-conflict
+[master 4c454fc] 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 1bf7371] side
+[side eb8e2bf] side
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 Switched to branch 'master'
-[master d1018ae] master
+[master 9777b3d] master
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 warning: refname 'side' is ambiguous.
 warning: refname 'side' is ambiguous.
 Merging:
-d1018ae master
+9777b3d master
 virtual side
 found 1 common ancestor:
-7520445 non-conflict
+4c454fc non-conflict
 Auto-merging conflict.t
 CONFLICT (content): Merge conflict in conflict.t
 Automatic merge failed; fix conflicts and then commit the result.
@@ -98404,7 +95868,7 @@
 	# git uses for diffs, so just check that we saw some kind of color.
 	grep "$(printf "\\033")" output
 
-HEAD is now at d1018ae master
+HEAD is now at 9777b3d master
 diff --git a/test b/test
 index 0889435..d95f3ad 100644
 --- a/test
@@ -98431,7 +95895,7 @@
 	# and just make sure we saw our diff prefixed
 	grep foo:.*content output
 
-HEAD is now at d1018ae master
+HEAD is now at 9777b3d master
 foo:+content
 ok 42 - diffFilter filters diff
 
@@ -98442,7 +95906,7 @@
 	test_config interactive.diffFilter "echo too-short" &&
 	printf y | test_must_fail test_terminal git add -p
 
-HEAD is now at d1018ae master
+HEAD is now at 9777b3d master
 fatal: mismatched output from interactive.diffFilter
 hint: Your filter must maintain a one-to-one correspondence
 hint: between its input and output lines.
@@ -98465,7 +95929,7 @@
 	git diff --cached --name-only >actual &&
 	diff_cmp expect actual
 
-HEAD is now at d1018ae master
+HEAD is now at 9777b3d master
            staged     unstaged path
   1:    unchanged        +1/-2 file
   2:    unchanged        +1/-6 test
@@ -98521,8 +95985,8 @@
 	git diff --cached --name-only >actual &&
 	test_cmp expect actual
 
-HEAD is now at d1018ae master
-[master c4ac86a] base
+HEAD is now at 9777b3d master
+[master 84858a3] base
  Author: A U Thor <author@example.com>
  2 files changed, 2 insertions(+)
  create mode 100644 one.c
@@ -98566,8 +96030,8 @@
 	git diff --cached --name-only >actual &&
 	test_cmp expect actual
 
-HEAD is now at c4ac86a base
-[master 95ecf6d] relpath
+HEAD is now at 84858a3 base
+[master 3866647] relpath
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 relpath.c
@@ -98599,8 +96063,8 @@
 	# So look only for "not-changed".
 	! grep -E "^trace: (built-in|exec|run_command): .*not-changed" trace.out
 
-HEAD is now at 95ecf6d relpath
-[master fa5c8c2] add not-changed file
+HEAD is now at 3866647 relpath
+[master 2498e63] add not-changed file
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 not-changed
@@ -98622,7 +96086,7 @@
 	echo e | GIT_EDITOR=true git add -p &&
 	git diff --exit-code
 
-HEAD is now at fa5c8c2 add not-changed file
+HEAD is now at 2498e63 add not-changed file
 diff --git a/file b/file
 index b6f2c08..59630e0 100755
 --- a/file
@@ -98643,7 +96107,7 @@
 	git diff --cached --name-only >actual &&
 	test_cmp expect actual
 
-HEAD is now at fa5c8c2 add not-changed file
+HEAD is now at 2498e63 add not-changed file
 diff --git a/file b/file
 index b6f2c08..59630e0 100755
 --- a/file
@@ -98772,8 +96236,8 @@
 	# as well as changes to other lines
 	test_write_lines +b " a" >patch
 
-HEAD is now at fa5c8c2 add not-changed file
-[master beb6332] a
+HEAD is now at 2498e63 add not-changed file
+[master 7e0c6eb] a
  Author: A U Thor <author@example.com>
  1 file changed, 11 insertions(+)
  create mode 100644 a
@@ -98845,6 +96309,2425 @@
 1..54
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
+*** t3426-rebase-submodule.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3426-rebase-submodule/.git/
+expecting success: 
+		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/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update_sub1/.git/
+[master (root-commit) 595b0d0] 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/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update_sub2/.git/
+[master (root-commit) f188fd8] 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/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update_repo/.git/
+[master (root-commit) 79ac994] 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/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update_repo/sub1'...
+done.
+Cloning into '/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update_repo/uninitialized_sub'...
+done.
+[add_sub1 45a3d72] 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'
+Removing uninitialized_sub
+Removing sub1
+Removing .gitmodules
+[remove_sub1 e21e5bb] Revert "Add sub1"
+ Author: A U Thor <author@example.com>
+ Date: Thu Jan 5 11:47:47 2023 +0000
+ 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 71943cc] 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/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update_sub1
+ * [new branch]      modifications -> modifications
+[modify_sub1 7155331] 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/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update_repo/sub1/sub2'...
+done.
+[add_nested_sub 3661531] 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 cdd73d5] 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 fcc1d1c] 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 cbca629] update nested sub
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[modify_sub1_recursively 0744734] update sub1, that updates nested sub
+ Author: A U Thor <author@example.com>
+To /build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update_sub1
+ * [new branch]      modify_sub1_recursively -> modify_sub1_recursively
+To /build/git-2.20.1/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 '595b0d0a1966fc5e4011517f000ba58372738f83'
+Previous HEAD position was 595b0d0 Base inside first submodule
+Switched to branch 'modifications'
+rm 'sub1'
+[replace_sub1_with_directory e0babbe] 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'
+Removing sub1/file3
+Removing sub1/file2
+Removing sub1/file1
+Adding sub1
+[replace_directory_with_sub1 92d62be] Revert "Replace sub1 with directory"
+ Author: A U Thor <author@example.com>
+ Date: Thu Jan 5 11:47:50 2023 +0000
+ 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 1e830d2] 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 80518e6] Revert "Replace sub1 with file"
+ Author: A U Thor <author@example.com>
+ Date: Thu Jan 5 11:47:50 2023 +0000
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+ mode change 100644 => 160000 sub1
+Switched to a new branch 'invalid_sub1'
+[invalid_sub1 5a24036] Invalid sub1 commit
+ Author: A U Thor <author@example.com>
+Switched to a new branch 'valid_sub1'
+[valid_sub1 ed46921] Revert "Invalid sub1 commit"
+ Author: A U Thor <author@example.com>
+ Date: Thu Jan 5 11:47:51 2023 +0000
+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 remote branch 'no_submodule' from 'origin'.
+Branch 'add_sub1' set up to track remote branch 'add_sub1' from 'origin'.
+Switched to a new branch 'ours'
+[ours fdb539d] add_x
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[ours cf0a451] Revert "add_x"
+ Author: A U Thor <author@example.com>
+ Date: Thu Jan 5 11:47:51 2023 +0000
+ 1 file changed, 1 deletion(-)
+First, rewinding head to replay your work on top of it...
+Applying: add_x
+Applying: Revert "add_x"
+Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '595b0d0a1966fc5e4011517f000ba58372738f83'
+Submodule path 'uninitialized_sub': checked out '595b0d0a1966fc5e4011517f000ba58372738f83'
+ok 1 - git_rebase: added submodule creates empty directory
+
+expecting success: 
+		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 remote branch 'no_submodule' from 'origin'.
+Branch 'add_sub1' set up to track remote branch 'add_sub1' from 'origin'.
+Switched to a new branch 'ours'
+[ours 3bfe759] add_x
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[ours ff6676d] Revert "add_x"
+ Author: A U Thor <author@example.com>
+ Date: Thu Jan 5 11:47:53 2023 +0000
+ 1 file changed, 1 deletion(-)
+First, rewinding head to replay your work on top of it...
+Applying: add_x
+Applying: Revert "add_x"
+Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '595b0d0a1966fc5e4011517f000ba58372738f83'
+Submodule path 'uninitialized_sub': checked out '595b0d0a1966fc5e4011517f000ba58372738f83'
+ok 2 - git_rebase: added submodule leaves existing empty directory alone
+
+expecting success: 
+		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 remote branch 'replace_sub1_with_file' from 'origin'.
+fatal: Needed a single revision
+Branch 'replace_file_with_sub1' set up to track remote branch 'replace_file_with_sub1' from 'origin'.
+Switched to a new branch 'ours'
+[ours 1165c3e] add_x
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[ours 6405018] Revert "add_x"
+ Author: A U Thor <author@example.com>
+ Date: Thu Jan 5 11:47:55 2023 +0000
+ 1 file changed, 1 deletion(-)
+First, rewinding head to replay your work on top of it...
+Applying: add_x
+Applying: Revert "add_x"
+Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '595b0d0a1966fc5e4011517f000ba58372738f83'
+Submodule path 'uninitialized_sub': checked out '595b0d0a1966fc5e4011517f000ba58372738f83'
+ok 3 - git_rebase: replace tracked file with submodule creates empty directory
+
+expecting success: 
+		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 remote branch 'replace_sub1_with_directory' from 'origin'.
+fatal: Needed a single revision
+Branch 'replace_directory_with_sub1' set up to track remote branch 'replace_directory_with_sub1' from 'origin'.
+Switched to a new branch 'ours'
+[ours fa29c1c] add_x
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[ours 2112026] Revert "add_x"
+ Author: A U Thor <author@example.com>
+ Date: Thu Jan 5 11:47:57 2023 +0000
+ 1 file changed, 1 deletion(-)
+First, rewinding head to replay your work on top of it...
+Applying: add_x
+Applying: Revert "add_x"
+Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '595b0d0a1966fc5e4011517f000ba58372738f83'
+Submodule path 'uninitialized_sub': checked out '595b0d0a1966fc5e4011517f000ba58372738f83'
+ok 4 - git_rebase: replace directory with submodule
+
+expecting success: 
+		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 remote branch 'add_sub1' from 'origin'.
+Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '595b0d0a1966fc5e4011517f000ba58372738f83'
+Branch 'remove_sub1' set up to track remote branch 'remove_sub1' from 'origin'.
+Switched to a new branch 'ours'
+[ours 294238c] add_x
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[ours 3d54386] Revert "add_x"
+ Author: A U Thor <author@example.com>
+ Date: Thu Jan 5 11:47:59 2023 +0000
+ 1 file changed, 1 deletion(-)
+warning: unable to rmdir 'sub1': Directory not empty
+First, rewinding head to replay your work on top of it...
+Applying: add_x
+Applying: Revert "add_x"
+ok 5 - git_rebase: removed submodule leaves submodule directory and its contents in place
+
+expecting success: 
+		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 remote branch 'add_sub1' from 'origin'.
+Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '595b0d0a1966fc5e4011517f000ba58372738f83'
+Branch 'remove_sub1' set up to track remote branch 'remove_sub1' from 'origin'.
+Switched to a new branch 'ours'
+[ours 9941019] add_x
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[ours 826eb7c] Revert "add_x"
+ Author: A U Thor <author@example.com>
+ Date: Thu Jan 5 11:48:01 2023 +0000
+ 1 file changed, 1 deletion(-)
+warning: unable to rmdir 'sub1': Directory not empty
+First, rewinding head to replay your work on top of it...
+Applying: add_x
+Applying: Revert "add_x"
+ok 6 - git_rebase: removed submodule leaves submodule containing a .git directory alone
+
+expecting success: 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
+			test_must_fail $command replace_sub1_with_directory &&
+			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 remote branch 'add_sub1' from 'origin'.
+Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '595b0d0a1966fc5e4011517f000ba58372738f83'
+Branch 'replace_sub1_with_directory' set up to track remote branch 'replace_sub1_with_directory' from 'origin'.
+Switched to a new branch 'ours'
+[ours 4b10825] add_x
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[ours ecc786d] Revert "add_x"
+ Author: A U Thor <author@example.com>
+ Date: Thu Jan 5 11:48:03 2023 +0000
+ 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
+fatal: Could not detach HEAD
+First, rewinding head to replay your work on top of it...
+ok 7 - git_rebase: replace submodule with a directory must fail
+
+expecting success: 
+		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 &&
+			test_must_fail $command replace_sub1_with_directory &&
+			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 remote branch 'add_sub1' from 'origin'.
+Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '595b0d0a1966fc5e4011517f000ba58372738f83'
+Branch 'replace_sub1_with_directory' set up to track remote branch 'replace_sub1_with_directory' from 'origin'.
+Switched to a new branch 'ours'
+[ours d9a4b0d] add_x
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[ours 11add6c] Revert "add_x"
+ Author: A U Thor <author@example.com>
+ Date: Thu Jan 5 11:48:04 2023 +0000
+ 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
+fatal: Could not detach HEAD
+First, rewinding head to replay your work on top of it...
+ok 8 - git_rebase: replace submodule containing a .git directory with a directory must fail
+
+checking known breakage: 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
+			test_must_fail $command replace_sub1_with_file &&
+			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 remote branch 'add_sub1' from 'origin'.
+Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '595b0d0a1966fc5e4011517f000ba58372738f83'
+Branch 'replace_sub1_with_file' set up to track remote branch 'replace_sub1_with_file' from 'origin'.
+Switched to a new branch 'ours'
+[ours 36c0dcb] add_x
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[ours 8096d45] Revert "add_x"
+ Author: A U Thor <author@example.com>
+ Date: Thu Jan 5 11:48:06 2023 +0000
+ 1 file changed, 1 deletion(-)
+First, rewinding head to replay your work on top of it...
+Applying: add_x
+Applying: Revert "add_x"
+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: 
+		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 &&
+			test_must_fail $command replace_sub1_with_file &&
+			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 remote branch 'add_sub1' from 'origin'.
+Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '595b0d0a1966fc5e4011517f000ba58372738f83'
+Branch 'replace_sub1_with_file' set up to track remote branch 'replace_sub1_with_file' from 'origin'.
+Switched to a new branch 'ours'
+[ours c027014] add_x
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[ours 017bf42] Revert "add_x"
+ Author: A U Thor <author@example.com>
+ Date: Thu Jan 5 11:48:08 2023 +0000
+ 1 file changed, 1 deletion(-)
+First, rewinding head to replay your work on top of it...
+Applying: add_x
+Applying: Revert "add_x"
+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: 
+		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 remote branch 'add_sub1' from 'origin'.
+Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '595b0d0a1966fc5e4011517f000ba58372738f83'
+Branch 'modify_sub1' set up to track remote branch 'modify_sub1' from 'origin'.
+Switched to a new branch 'ours'
+[ours 9b6d4c3] add_x
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[ours 37e26a7] Revert "add_x"
+ Author: A U Thor <author@example.com>
+ Date: Thu Jan 5 11:48:09 2023 +0000
+ 1 file changed, 1 deletion(-)
+First, rewinding head to replay your work on top of it...
+Applying: add_x
+Applying: Revert "add_x"
+Submodule path 'sub1': checked out '71943cc5853a8dcfb617b746a851850b7be75ec1'
+ok 11 - git_rebase: modified submodule does not update submodule work tree
+
+expecting success: 
+		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 remote branch 'add_sub1' from 'origin'.
+Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '595b0d0a1966fc5e4011517f000ba58372738f83'
+Branch 'invalid_sub1' set up to track remote branch 'invalid_sub1' from 'origin'.
+Switched to a new branch 'ours'
+[ours 58ec874] add_x
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[ours 72337ad] Revert "add_x"
+ Author: A U Thor <author@example.com>
+ Date: Thu Jan 5 11:48:12 2023 +0000
+ 1 file changed, 1 deletion(-)
+First, rewinding head to replay your work on top of it...
+Applying: add_x
+Applying: Revert "add_x"
+error: Server does not allow request for unadvertised object 0123456789012345678901234567890123456789
+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: 
+		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 remote branch 'invalid_sub1' from 'origin'.
+fatal: Needed a single revision
+Branch 'valid_sub1' set up to track remote branch 'valid_sub1' from 'origin'.
+Switched to a new branch 'ours'
+[ours f9ae945] add_x
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[ours 6e1bf86] Revert "add_x"
+ Author: A U Thor <author@example.com>
+ Date: Thu Jan 5 11:48:13 2023 +0000
+ 1 file changed, 1 deletion(-)
+First, rewinding head to replay your work on top of it...
+Applying: add_x
+Applying: Revert "add_x"
+Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '595b0d0a1966fc5e4011517f000ba58372738f83'
+Submodule path 'uninitialized_sub': checked out '595b0d0a1966fc5e4011517f000ba58372738f83'
+ok 13 - git_rebase: modified submodule does not update submodule work tree from invalid commit
+
+expecting success: 
+		prolog &&
+		reset_work_tree_to 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 remote branch 'no_submodule' from 'origin'.
+Branch 'add_sub1' set up to track remote branch 'add_sub1' from 'origin'.
+Switched to a new branch 'ours'
+[ours aeb5ac1] add_x
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[ours 860af7e] Revert "add_x"
+ Author: A U Thor <author@example.com>
+ Date: Thu Jan 5 11:48:15 2023 +0000
+ 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
+fatal: Could not detach HEAD
+First, rewinding head to replay your work on top of it...
+ok 14 - git_rebase: added submodule doesn't remove untracked unignored file with same name
+
+expecting success: 
+		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 remote branch 'no_submodule' from 'origin'.
+Branch 'add_sub1' set up to track remote branch 'add_sub1' from 'origin'.
+Switched to a new branch 'ours'
+[ours f8aab12] add_x
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[ours 40b2c5d] Revert "add_x"
+ Author: A U Thor <author@example.com>
+ Date: Thu Jan 5 11:48:16 2023 +0000
+ 1 file changed, 1 deletion(-)
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/ours.
+Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '595b0d0a1966fc5e4011517f000ba58372738f83'
+Submodule path 'uninitialized_sub': checked out '595b0d0a1966fc5e4011517f000ba58372738f83'
+ok 15 - git_rebase_interactive: added submodule creates empty directory
+
+expecting success: 
+		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 remote branch 'no_submodule' from 'origin'.
+Branch 'add_sub1' set up to track remote branch 'add_sub1' from 'origin'.
+Switched to a new branch 'ours'
+[ours bb31a9f] add_x
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[ours 4fb5ab7] Revert "add_x"
+ Author: A U Thor <author@example.com>
+ Date: Thu Jan 5 11:48:18 2023 +0000
+ 1 file changed, 1 deletion(-)
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/ours.
+Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '595b0d0a1966fc5e4011517f000ba58372738f83'
+Submodule path 'uninitialized_sub': checked out '595b0d0a1966fc5e4011517f000ba58372738f83'
+ok 16 - git_rebase_interactive: added submodule leaves existing empty directory alone
+
+expecting success: 
+		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 remote branch 'replace_sub1_with_file' from 'origin'.
+fatal: Needed a single revision
+Branch 'replace_file_with_sub1' set up to track remote branch 'replace_file_with_sub1' from 'origin'.
+Switched to a new branch 'ours'
+[ours 7773aa0] add_x
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[ours f5da6cd] Revert "add_x"
+ Author: A U Thor <author@example.com>
+ Date: Thu Jan 5 11:48:19 2023 +0000
+ 1 file changed, 1 deletion(-)
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/ours.
+Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '595b0d0a1966fc5e4011517f000ba58372738f83'
+Submodule path 'uninitialized_sub': checked out '595b0d0a1966fc5e4011517f000ba58372738f83'
+ok 17 - git_rebase_interactive: replace tracked file with submodule creates empty directory
+
+expecting success: 
+		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 remote branch 'replace_sub1_with_directory' from 'origin'.
+fatal: Needed a single revision
+Branch 'replace_directory_with_sub1' set up to track remote branch 'replace_directory_with_sub1' from 'origin'.
+Switched to a new branch 'ours'
+[ours 0209b36] add_x
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[ours 95cb4bb] Revert "add_x"
+ Author: A U Thor <author@example.com>
+ Date: Thu Jan 5 11:48:22 2023 +0000
+ 1 file changed, 1 deletion(-)
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/ours.
+Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '595b0d0a1966fc5e4011517f000ba58372738f83'
+Submodule path 'uninitialized_sub': checked out '595b0d0a1966fc5e4011517f000ba58372738f83'
+ok 18 - git_rebase_interactive: replace directory with submodule
+
+expecting success: 
+		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 remote branch 'add_sub1' from 'origin'.
+Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '595b0d0a1966fc5e4011517f000ba58372738f83'
+Branch 'remove_sub1' set up to track remote branch 'remove_sub1' from 'origin'.
+Switched to a new branch 'ours'
+[ours f57673e] add_x
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[ours d3c46be] Revert "add_x"
+ Author: A U Thor <author@example.com>
+ Date: Thu Jan 5 11:48:24 2023 +0000
+ 1 file changed, 1 deletion(-)
+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
+
+expecting success: 
+		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 remote branch 'add_sub1' from 'origin'.
+Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '595b0d0a1966fc5e4011517f000ba58372738f83'
+Branch 'remove_sub1' set up to track remote branch 'remove_sub1' from 'origin'.
+Switched to a new branch 'ours'
+[ours 918c9e0] add_x
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[ours fae189d] Revert "add_x"
+ Author: A U Thor <author@example.com>
+ Date: Thu Jan 5 11:48:26 2023 +0000
+ 1 file changed, 1 deletion(-)
+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
+
+expecting success: 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
+			test_must_fail $command replace_sub1_with_directory &&
+			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 remote branch 'add_sub1' from 'origin'.
+Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '595b0d0a1966fc5e4011517f000ba58372738f83'
+Branch 'replace_sub1_with_directory' set up to track remote branch 'replace_sub1_with_directory' from 'origin'.
+Switched to a new branch 'ours'
+[ours 30f7669] add_x
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[ours 1b74613] Revert "add_x"
+ Author: A U Thor <author@example.com>
+ Date: Thu Jan 5 11:48:27 2023 +0000
+ 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
+
+expecting success: 
+		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 &&
+			test_must_fail $command replace_sub1_with_directory &&
+			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 remote branch 'add_sub1' from 'origin'.
+Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '595b0d0a1966fc5e4011517f000ba58372738f83'
+Branch 'replace_sub1_with_directory' set up to track remote branch 'replace_sub1_with_directory' from 'origin'.
+Switched to a new branch 'ours'
+[ours 21a61f3] add_x
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[ours 2a20f7a] Revert "add_x"
+ Author: A U Thor <author@example.com>
+ Date: Thu Jan 5 11:48:29 2023 +0000
+ 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
+
+checking known breakage: 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
+			test_must_fail $command replace_sub1_with_file &&
+			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 remote branch 'add_sub1' from 'origin'.
+Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '595b0d0a1966fc5e4011517f000ba58372738f83'
+Branch 'replace_sub1_with_file' set up to track remote branch 'replace_sub1_with_file' from 'origin'.
+Switched to a new branch 'ours'
+[ours 901cb44] add_x
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[ours 5e71232] Revert "add_x"
+ Author: A U Thor <author@example.com>
+ Date: Thu Jan 5 11:48:30 2023 +0000
+ 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_interactive replace_sub1_with_file
+not ok 23 - git_rebase_interactive: replace submodule with a file must fail # TODO known breakage
+
+checking known breakage: 
+		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 &&
+			test_must_fail $command replace_sub1_with_file &&
+			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 remote branch 'add_sub1' from 'origin'.
+Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '595b0d0a1966fc5e4011517f000ba58372738f83'
+Branch 'replace_sub1_with_file' set up to track remote branch 'replace_sub1_with_file' from 'origin'.
+Switched to a new branch 'ours'
+[ours 31e8341] add_x
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[ours 0a45ab8] Revert "add_x"
+ Author: A U Thor <author@example.com>
+ Date: Thu Jan 5 11:48:32 2023 +0000
+ 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_interactive replace_sub1_with_file
+not ok 24 - git_rebase_interactive: replace submodule containing a .git directory with a file must fail # TODO known breakage
+
+expecting success: 
+		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 remote branch 'add_sub1' from 'origin'.
+Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '595b0d0a1966fc5e4011517f000ba58372738f83'
+Branch 'modify_sub1' set up to track remote branch 'modify_sub1' from 'origin'.
+Switched to a new branch 'ours'
+[ours e22acb9] add_x
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[ours 5b7827f] Revert "add_x"
+ Author: A U Thor <author@example.com>
+ Date: Thu Jan 5 11:48:33 2023 +0000
+ 1 file changed, 1 deletion(-)
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/ours.
+Submodule path 'sub1': checked out '71943cc5853a8dcfb617b746a851850b7be75ec1'
+ok 25 - git_rebase_interactive: modified submodule does not update submodule work tree
+
+expecting success: 
+		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 remote branch 'add_sub1' from 'origin'.
+Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '595b0d0a1966fc5e4011517f000ba58372738f83'
+Branch 'invalid_sub1' set up to track remote branch 'invalid_sub1' from 'origin'.
+Switched to a new branch 'ours'
+[ours c308e10] add_x
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[ours 9ba00cf] Revert "add_x"
+ Author: A U Thor <author@example.com>
+ Date: Thu Jan 5 11:48:34 2023 +0000
+ 1 file changed, 1 deletion(-)
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/ours.
+error: Server does not allow request for unadvertised object 0123456789012345678901234567890123456789
+Fetched in submodule path 'sub1', but it did not contain 0123456789012345678901234567890123456789. Direct fetching of that commit failed.
+ok 26 - git_rebase_interactive: modified submodule does not update submodule work tree to invalid commit
+
+expecting success: 
+		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 remote branch 'invalid_sub1' from 'origin'.
+fatal: Needed a single revision
+Branch 'valid_sub1' set up to track remote branch 'valid_sub1' from 'origin'.
+Switched to a new branch 'ours'
+[ours 47604a4] add_x
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[ours ce0e96a] Revert "add_x"
+ Author: A U Thor <author@example.com>
+ Date: Thu Jan 5 11:48:35 2023 +0000
+ 1 file changed, 1 deletion(-)
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/ours.
+Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '595b0d0a1966fc5e4011517f000ba58372738f83'
+Submodule path 'uninitialized_sub': checked out '595b0d0a1966fc5e4011517f000ba58372738f83'
+ok 27 - git_rebase_interactive: modified submodule does not update submodule work tree from invalid commit
+
+expecting success: 
+		prolog &&
+		reset_work_tree_to 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 remote branch 'no_submodule' from 'origin'.
+Branch 'add_sub1' set up to track remote branch 'add_sub1' from 'origin'.
+Switched to a new branch 'ours'
+[ours 5411eea] add_x
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[ours 769f584] Revert "add_x"
+ Author: A U Thor <author@example.com>
+ Date: Thu Jan 5 11:48:36 2023 +0000
+ 1 file changed, 1 deletion(-)
+error: The following untracked working tree files would be overwritten by checkout:
+	sub1
+Please move or remove them before you switch branches.
+Aborting
+error: could not detach HEAD
+ok 28 - git_rebase_interactive: added submodule doesn't remove untracked unignored file with same name
+
+expecting success: 
+	test_when_finished "rm -rf super sub" &&
+	git init sub &&
+	git -C sub commit --allow-empty -m "Initial commit" &&
+	git init super &&
+	git -C super submodule add ../sub &&
+	git -C super config submodule.sub.ignore dirty &&
+	>super/foo &&
+	git -C super add foo &&
+	git -C super commit -m "Initial commit" &&
+	test_commit -C super a &&
+	test_commit -C super b &&
+	test_commit -C super/sub c &&
+	set_fake_editor &&
+	git -C super rebase -i HEAD^^
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3426-rebase-submodule/sub/.git/
+[master (root-commit) d9d0a1e] Initial commit
+ Author: A U Thor <author@example.com>
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3426-rebase-submodule/super/.git/
+Cloning into '/build/git-2.20.1/t/trash directory.t3426-rebase-submodule/super/sub'...
+done.
+[master (root-commit) 69c47f0] 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 2364c53] a
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 a.t
+[master 86e9470] b
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b.t
+[master 3036885] c
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c.t
+Successfully rebased and updated refs/heads/master.
+ok 29 - rebase interactive ignores modified submodules
+
+# still have 4 known breakage(s)
+# passed all remaining 25 test(s)
+1..29
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t4021-format-patch-numbered.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4021-format-patch-numbered/.git/
+expecting success: 
+
+	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) 54bd99e] First
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+[master 0b7e45c] Second
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master 5353d5d] Third
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 1 - setup
+
+expecting success: 
+	git format-patch --stdout HEAD~1 >patch0.single &&
+	test_single_no_numbered patch0.single
+
+ok 2 - single patch defaults to no numbers
+
+expecting success: 
+
+	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: 
+
+	git format-patch --numbered --stdout HEAD~1 >patch1 &&
+	test_single_numbered patch1
+
+
+Subject: [PATCH 1/1] Third
+ok 4 - Use --numbered
+
+expecting success: 
+
+	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: 
+
+	git format-patch --stdout HEAD^ > patch3 &&
+	test_single_numbered patch3
+
+
+Subject: [PATCH 1/1] Third
+ok 6 - format.numbered && single patch
+
+expecting success: 
+
+	git format-patch --no-numbered --stdout HEAD~2 >patch4 &&
+	test_no_numbered patch4
+
+
+ok 7 - format.numbered && --no-numbered
+
+expecting success: 
+
+	git format-patch --keep-subject --stdout HEAD^ >patch4a &&
+	grep "^Subject: Third" patch4a
+
+
+Subject: Third
+ok 8 - format.numbered && --keep-subject
+
+expecting success: 
+
+	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: 
+
+	git format-patch --stdout HEAD^ > patch6 &&
+	test_single_no_numbered patch6
+
+
+ok 10 - format.numbered = auto && single patch
+
+expecting success: 
+
+	git format-patch --no-numbered --stdout HEAD~2 > patch7 &&
+	test_no_numbered patch7
+
+
+ok 11 - format.numbered = auto && --no-numbered
+
+expecting success: 
+
+	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: 
+	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: 
+	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/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t4022-diff-rewrite.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4022-diff-rewrite/.git/
+expecting success: 
+
+	cat "$TEST_DIRECTORY"/../COPYING >test &&
+	git add test &&
+	tr \
+	  "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ" \
+	  "nopqrstuvwxyzabcdefghijklmNOPQRSTUVWXYZABCDEFGHIJKLM" \
+	  <"$TEST_DIRECTORY"/../COPYING >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: 
+
+	actual=$(git diff-files -B --summary test) &&
+	verbose expr "$actual" : " rewrite test ([0-9]*%)$"
+
+
+19
+ok 2 - detect rewrite
+
+expecting success: 
+
+	rm test2 &&
+	git diff -- test2 >actual &&
+	test_cmp expect actual
+
+ok 3 - show deletion diff without -D
+
+expecting success: 
+
+	git diff -D -- test2 >actual &&
+	test_cmp expect actual
+
+ok 4 - suppress deletion diff with -D
+
+expecting success: 
+
+	git diff -B -- test >actual &&
+	grep "Linus Torvalds" actual
+
+-			Linus Torvalds
+ok 5 - show deletion diff with -B
+
+expecting success: 
+
+	git diff -B -D -- test >actual &&
+	grep -v "Linus Torvalds" actual
+
+diff --git a/test b/test
+dissimilarity index 98%
+index 536e555..189438f 100644
+--- a/test
++++ b/test
+@@ -?,? +1,360 @@
++
++ 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
++
++----------------------------------------
++
++		    TAH TRARENY CHOYVP YVPRAFR
++		       Irefvba 2, Whar 1991
++
++ Pbclevtug (P) 1989, 1991 Serr Fbsgjner Sbhaqngvba, Vap.,
++ 51 Senaxyva Fgerrg, Svsgu Sybbe, Obfgba, ZN 02110-1301 HFN
++ Rirelbar vf crezvggrq gb pbcl naq qvfgevohgr ireongvz pbcvrf
++ bs guvf yvprafr qbphzrag, ohg punatvat vg vf abg nyybjrq.
++
++			    Cernzoyr
++
++  Gur yvprafrf sbe zbfg fbsgjner ner qrfvtarq gb gnxr njnl lbhe
++serrqbz gb funer naq punatr vg.  Ol pbagenfg, gur TAH Trareny Choyvp
++Yvprafr vf vagraqrq gb thnenagrr lbhe serrqbz gb funer naq punatr serr
++fbsgjner--gb znxr fher gur fbsgjner vf serr sbe nyy vgf hfref.  Guvf
++Trareny Choyvp Yvprafr nccyvrf gb zbfg bs gur Serr Fbsgjner
++Sbhaqngvba'f fbsgjner naq gb nal bgure cebtenz jubfr nhgubef pbzzvg gb
++hfvat vg.  (Fbzr bgure Serr Fbsgjner Sbhaqngvba fbsgjner vf pbirerq ol
++gur TAH Yrffre Trareny Choyvp Yvprafr vafgrnq.)  Lbh pna nccyl vg gb
++lbhe cebtenzf, gbb.
++
++  Jura jr fcrnx bs serr fbsgjner, jr ner ersreevat gb serrqbz, abg
++cevpr.  Bhe Trareny Choyvp Yvprafrf ner qrfvtarq gb znxr fher gung lbh
++unir gur serrqbz gb qvfgevohgr pbcvrf bs serr fbsgjner (naq punetr sbe
++guvf freivpr vs lbh jvfu), gung lbh erprvir fbhepr pbqr be pna trg vg
++vs lbh jnag vg, gung lbh pna punatr gur fbsgjner be hfr cvrprf bs vg
++va arj serr cebtenzf; naq gung lbh xabj lbh pna qb gurfr guvatf.
++
++  Gb cebgrpg lbhe evtugf, jr arrq gb znxr erfgevpgvbaf gung sbeovq
++nalbar gb qral lbh gurfr evtugf be gb nfx lbh gb fheeraqre gur evtugf.
++Gurfr erfgevpgvbaf genafyngr gb pregnva erfcbafvovyvgvrf sbe lbh vs lbh
++qvfgevohgr pbcvrf bs gur fbsgjner, be vs lbh zbqvsl vg.
++
++  Sbe rknzcyr, vs lbh qvfgevohgr pbcvrf bs fhpu n cebtenz, jurgure
++tengvf be sbe n srr, lbh zhfg tvir gur erpvcvragf nyy gur evtugf gung
++lbh unir.  Lbh zhfg znxr fher gung gurl, gbb, erprvir be pna trg gur
++fbhepr pbqr.  Naq lbh zhfg fubj gurz gurfr grezf fb gurl xabj gurve
++evtugf.
++
++  Jr cebgrpg lbhe evtugf jvgu gjb fgrcf: (1) pbclevtug gur fbsgjner, naq
++(2) bssre lbh guvf yvprafr juvpu tvirf lbh yrtny crezvffvba gb pbcl,
++qvfgevohgr naq/be zbqvsl gur fbsgjner.
++
++  Nyfb, sbe rnpu nhgube'f cebgrpgvba naq bhef, jr jnag gb znxr pregnva
++gung rirelbar haqrefgnaqf gung gurer vf ab jneenagl sbe guvf serr
++fbsgjner.  Vs gur fbsgjner vf zbqvsvrq ol fbzrbar ryfr naq cnffrq ba, jr
++jnag vgf erpvcvragf gb xabj gung jung gurl unir vf abg gur bevtvany, fb
++gung nal ceboyrzf vagebqhprq ol bguref jvyy abg ersyrpg ba gur bevtvany
++nhgubef' erchgngvbaf.
++
++  Svanyyl, nal serr cebtenz vf guerngrarq pbafgnagyl ol fbsgjner
++cngragf.  Jr jvfu gb nibvq gur qnatre gung erqvfgevohgbef bs n serr
++cebtenz jvyy vaqvivqhnyyl bognva cngrag yvprafrf, va rssrpg znxvat gur
++cebtenz cebcevrgnel.  Gb cerirag guvf, jr unir znqr vg pyrne gung nal
++cngrag zhfg or yvprafrq sbe rirelbar'f serr hfr be abg yvprafrq ng nyy.
++
++  Gur cerpvfr grezf naq pbaqvgvbaf sbe pbclvat, qvfgevohgvba naq
++zbqvsvpngvba sbyybj.
++
++		    TAH TRARENY CHOYVP YVPRAFR
++   GREZF NAQ PBAQVGVBAF SBE PBCLVAT, QVFGEVOHGVBA NAQ ZBQVSVPNGVBA
++
++  0. Guvf Yvprafr nccyvrf gb nal cebtenz be bgure jbex juvpu pbagnvaf
++n abgvpr cynprq ol gur pbclevtug ubyqre fnlvat vg znl or qvfgevohgrq
++haqre gur grezf bs guvf Trareny Choyvp Yvprafr.  Gur "Cebtenz", orybj,
++ersref gb nal fhpu cebtenz be jbex, naq n "jbex onfrq ba gur Cebtenz"
++zrnaf rvgure gur Cebtenz be nal qrevingvir jbex haqre pbclevtug ynj:
++gung vf gb fnl, n jbex pbagnvavat gur Cebtenz be n cbegvba bs vg,
++rvgure ireongvz be jvgu zbqvsvpngvbaf naq/be genafyngrq vagb nabgure
++ynathntr.  (Urervansgre, genafyngvba vf vapyhqrq jvgubhg yvzvgngvba va
++gur grez "zbqvsvpngvba".)  Rnpu yvprafrr vf nqqerffrq nf "lbh".
++
++Npgvivgvrf bgure guna pbclvat, qvfgevohgvba naq zbqvsvpngvba ner abg
++pbirerq ol guvf Yvprafr; gurl ner bhgfvqr vgf fpbcr.  Gur npg bs
++ehaavat gur Cebtenz vf abg erfgevpgrq, naq gur bhgchg sebz gur Cebtenz
++vf pbirerq bayl vs vgf pbagragf pbafgvghgr n jbex onfrq ba gur
++Cebtenz (vaqrcraqrag bs univat orra znqr ol ehaavat gur Cebtenz).
++Jurgure gung vf gehr qrcraqf ba jung gur Cebtenz qbrf.
++
++  1. Lbh znl pbcl naq qvfgevohgr ireongvz pbcvrf bs gur Cebtenz'f
++fbhepr pbqr nf lbh erprvir vg, va nal zrqvhz, cebivqrq gung lbh
++pbafcvphbhfyl naq nccebcevngryl choyvfu ba rnpu pbcl na nccebcevngr
++pbclevtug abgvpr naq qvfpynvzre bs jneenagl; xrrc vagnpg nyy gur
++abgvprf gung ersre gb guvf Yvprafr naq gb gur nofrapr bs nal jneenagl;
++naq tvir nal bgure erpvcvragf bs gur Cebtenz n pbcl bs guvf Yvprafr
++nybat jvgu gur Cebtenz.
++
++Lbh znl punetr n srr sbe gur culfvpny npg bs genafsreevat n pbcl, naq
++lbh znl ng lbhe bcgvba bssre jneenagl cebgrpgvba va rkpunatr sbe n srr.
++
++  2. Lbh znl zbqvsl lbhe pbcl be pbcvrf bs gur Cebtenz be nal cbegvba
++bs vg, guhf sbezvat n jbex onfrq ba gur Cebtenz, naq pbcl naq
++qvfgevohgr fhpu zbqvsvpngvbaf be jbex haqre gur grezf bs Frpgvba 1
++nobir, cebivqrq gung lbh nyfb zrrg nyy bs gurfr pbaqvgvbaf:
++
++    n) Lbh zhfg pnhfr gur zbqvsvrq svyrf gb pneel cebzvarag abgvprf
++    fgngvat gung lbh punatrq gur svyrf naq gur qngr bs nal punatr.
++
++    o) Lbh zhfg pnhfr nal jbex gung lbh qvfgevohgr be choyvfu, gung va
++    jubyr be va cneg pbagnvaf be vf qrevirq sebz gur Cebtenz be nal
++    cneg gurerbs, gb or yvprafrq nf n jubyr ng ab punetr gb nyy guveq
++    cnegvrf haqre gur grezf bs guvf Yvprafr.
++
++    p) Vs gur zbqvsvrq cebtenz abeznyyl ernqf pbzznaqf vagrenpgviryl
++    jura eha, lbh zhfg pnhfr vg, jura fgnegrq ehaavat sbe fhpu
++    vagrenpgvir hfr va gur zbfg beqvanel jnl, gb cevag be qvfcynl na
++    naabhaprzrag vapyhqvat na nccebcevngr pbclevtug abgvpr naq n
++    abgvpr gung gurer vf ab jneenagl (be ryfr, fnlvat gung lbh cebivqr
++    n jneenagl) naq gung hfref znl erqvfgevohgr gur cebtenz haqre
++    gurfr pbaqvgvbaf, naq gryyvat gur hfre ubj gb ivrj n pbcl bs guvf
++    Yvprafr.  (Rkprcgvba: vs gur Cebtenz vgfrys vf vagrenpgvir ohg
++    qbrf abg abeznyyl cevag fhpu na naabhaprzrag, lbhe jbex onfrq ba
++    gur Cebtenz vf abg erdhverq gb cevag na naabhaprzrag.)
++
++Gurfr erdhverzragf nccyl gb gur zbqvsvrq jbex nf n jubyr.  Vs
++vqragvsvnoyr frpgvbaf bs gung jbex ner abg qrevirq sebz gur Cebtenz,
++naq pna or ernfbanoyl pbafvqrerq vaqrcraqrag naq frcnengr jbexf va
++gurzfryirf, gura guvf Yvprafr, naq vgf grezf, qb abg nccyl gb gubfr
++frpgvbaf jura lbh qvfgevohgr gurz nf frcnengr jbexf.  Ohg jura lbh
++qvfgevohgr gur fnzr frpgvbaf nf cneg bs n jubyr juvpu vf n jbex onfrq
++ba gur Cebtenz, gur qvfgevohgvba bs gur jubyr zhfg or ba gur grezf bs
++guvf Yvprafr, jubfr crezvffvbaf sbe bgure yvprafrrf rkgraq gb gur
++ragver jubyr, naq guhf gb rnpu naq rirel cneg ertneqyrff bs jub jebgr vg.
++
++Guhf, vg vf abg gur vagrag bs guvf frpgvba gb pynvz evtugf be pbagrfg
++lbhe evtugf gb jbex jevggra ragveryl ol lbh; engure, gur vagrag vf gb
++rkrepvfr gur evtug gb pbageby gur qvfgevohgvba bs qrevingvir be
++pbyyrpgvir jbexf onfrq ba gur Cebtenz.
++
++Va nqqvgvba, zrer nttertngvba bs nabgure jbex abg onfrq ba gur Cebtenz
++jvgu gur Cebtenz (be jvgu n jbex onfrq ba gur Cebtenz) ba n ibyhzr bs
++n fgbentr be qvfgevohgvba zrqvhz qbrf abg oevat gur bgure jbex haqre
++gur fpbcr bs guvf Yvprafr.
++
++  3. Lbh znl pbcl naq qvfgevohgr gur Cebtenz (be n jbex onfrq ba vg,
++haqre Frpgvba 2) va bowrpg pbqr be rkrphgnoyr sbez haqre gur grezf bs
++Frpgvbaf 1 naq 2 nobir cebivqrq gung lbh nyfb qb bar bs gur sbyybjvat:
++
++    n) Nppbzcnal vg jvgu gur pbzcyrgr pbeerfcbaqvat znpuvar-ernqnoyr
++    fbhepr pbqr, juvpu zhfg or qvfgevohgrq haqre gur grezf bs Frpgvbaf
++    1 naq 2 nobir ba n zrqvhz phfgbznevyl hfrq sbe fbsgjner vagrepunatr; be,
++
++    o) Nppbzcnal vg jvgu n jevggra bssre, inyvq sbe ng yrnfg guerr
++    lrnef, gb tvir nal guveq cnegl, sbe n punetr ab zber guna lbhe
++    pbfg bs culfvpnyyl cresbezvat fbhepr qvfgevohgvba, n pbzcyrgr
++    znpuvar-ernqnoyr pbcl bs gur pbeerfcbaqvat fbhepr pbqr, gb or
++    qvfgevohgrq haqre gur grezf bs Frpgvbaf 1 naq 2 nobir ba n zrqvhz
++    phfgbznevyl hfrq sbe fbsgjner vagrepunatr; be,
++
++    p) Nppbzcnal vg jvgu gur vasbezngvba lbh erprvirq nf gb gur bssre
++    gb qvfgevohgr pbeerfcbaqvat fbhepr pbqr.  (Guvf nygreangvir vf
++    nyybjrq bayl sbe abapbzzrepvny qvfgevohgvba naq bayl vs lbh
++    erprvirq gur cebtenz va bowrpg pbqr be rkrphgnoyr sbez jvgu fhpu
++    na bssre, va nppbeq jvgu Fhofrpgvba o nobir.)
++
++Gur fbhepr pbqr sbe n jbex zrnaf gur cersreerq sbez bs gur jbex sbe
++znxvat zbqvsvpngvbaf gb vg.  Sbe na rkrphgnoyr jbex, pbzcyrgr fbhepr
++pbqr zrnaf nyy gur fbhepr pbqr sbe nyy zbqhyrf vg pbagnvaf, cyhf nal
++nffbpvngrq vagresnpr qrsvavgvba svyrf, cyhf gur fpevcgf hfrq gb
++pbageby pbzcvyngvba naq vafgnyyngvba bs gur rkrphgnoyr.  Ubjrire, nf n
++fcrpvny rkprcgvba, gur fbhepr pbqr qvfgevohgrq arrq abg vapyhqr
++nalguvat gung vf abeznyyl qvfgevohgrq (va rvgure fbhepr be ovanel
++sbez) jvgu gur znwbe pbzcbaragf (pbzcvyre, xreary, naq fb ba) bs gur
++bcrengvat flfgrz ba juvpu gur rkrphgnoyr ehaf, hayrff gung pbzcbarag
++vgfrys nppbzcnavrf gur rkrphgnoyr.
++
++Vs qvfgevohgvba bs rkrphgnoyr be bowrpg pbqr vf znqr ol bssrevat
++npprff gb pbcl sebz n qrfvtangrq cynpr, gura bssrevat rdhvinyrag
++npprff gb pbcl gur fbhepr pbqr sebz gur fnzr cynpr pbhagf nf
++qvfgevohgvba bs gur fbhepr pbqr, rira gubhtu guveq cnegvrf ner abg
++pbzcryyrq gb pbcl gur fbhepr nybat jvgu gur bowrpg pbqr.
++
++  4. Lbh znl abg pbcl, zbqvsl, fhoyvprafr, be qvfgevohgr gur Cebtenz
++rkprcg nf rkcerffyl cebivqrq haqre guvf Yvprafr.  Nal nggrzcg
++bgurejvfr gb pbcl, zbqvsl, fhoyvprafr be qvfgevohgr gur Cebtenz vf
++ibvq, naq jvyy nhgbzngvpnyyl grezvangr lbhe evtugf haqre guvf Yvprafr.
++Ubjrire, cnegvrf jub unir erprvirq pbcvrf, be evtugf, sebz lbh haqre
++guvf Yvprafr jvyy abg unir gurve yvprafrf grezvangrq fb ybat nf fhpu
++cnegvrf erznva va shyy pbzcyvnapr.
++
++  5. Lbh ner abg erdhverq gb npprcg guvf Yvprafr, fvapr lbh unir abg
++fvtarq vg.  Ubjrire, abguvat ryfr tenagf lbh crezvffvba gb zbqvsl be
++qvfgevohgr gur Cebtenz be vgf qrevingvir jbexf.  Gurfr npgvbaf ner
++cebuvovgrq ol ynj vs lbh qb abg npprcg guvf Yvprafr.  Gurersber, ol
++zbqvslvat be qvfgevohgvat gur Cebtenz (be nal jbex onfrq ba gur
++Cebtenz), lbh vaqvpngr lbhe npprcgnapr bs guvf Yvprafr gb qb fb, naq
++nyy vgf grezf naq pbaqvgvbaf sbe pbclvat, qvfgevohgvat be zbqvslvat
++gur Cebtenz be jbexf onfrq ba vg.
++
++  6. Rnpu gvzr lbh erqvfgevohgr gur Cebtenz (be nal jbex onfrq ba gur
++Cebtenz), gur erpvcvrag nhgbzngvpnyyl erprvirf n yvprafr sebz gur
++bevtvany yvprafbe gb pbcl, qvfgevohgr be zbqvsl gur Cebtenz fhowrpg gb
++gurfr grezf naq pbaqvgvbaf.  Lbh znl abg vzcbfr nal shegure
++erfgevpgvbaf ba gur erpvcvragf' rkrepvfr bs gur evtugf tenagrq urerva.
++Lbh ner abg erfcbafvoyr sbe rasbepvat pbzcyvnapr ol guveq cnegvrf gb
++guvf Yvprafr.
++
++  7. Vs, nf n pbafrdhrapr bs n pbheg whqtzrag be nyyrtngvba bs cngrag
++vasevatrzrag be sbe nal bgure ernfba (abg yvzvgrq gb cngrag vffhrf),
++pbaqvgvbaf ner vzcbfrq ba lbh (jurgure ol pbheg beqre, nterrzrag be
++bgurejvfr) gung pbagenqvpg gur pbaqvgvbaf bs guvf Yvprafr, gurl qb abg
++rkphfr lbh sebz gur pbaqvgvbaf bs guvf Yvprafr.  Vs lbh pnaabg
++qvfgevohgr fb nf gb fngvfsl fvzhygnarbhfyl lbhe boyvtngvbaf haqre guvf
++Yvprafr naq nal bgure cregvarag boyvtngvbaf, gura nf n pbafrdhrapr lbh
++znl abg qvfgevohgr gur Cebtenz ng nyy.  Sbe rknzcyr, vs n cngrag
++yvprafr jbhyq abg crezvg eblnygl-serr erqvfgevohgvba bs gur Cebtenz ol
++nyy gubfr jub erprvir pbcvrf qverpgyl be vaqverpgyl guebhtu lbh, gura
++gur bayl jnl lbh pbhyq fngvfsl obgu vg naq guvf Yvprafr jbhyq or gb
++ersenva ragveryl sebz qvfgevohgvba bs gur Cebtenz.
++
++Vs nal cbegvba bs guvf frpgvba vf uryq vainyvq be harasbeprnoyr haqre
++nal cnegvphyne pvephzfgnapr, gur onynapr bs gur frpgvba vf vagraqrq gb
++nccyl naq gur frpgvba nf n jubyr vf vagraqrq gb nccyl va bgure
++pvephzfgnaprf.
++
++Vg vf abg gur checbfr bs guvf frpgvba gb vaqhpr lbh gb vasevatr nal
++cngragf be bgure cebcregl evtug pynvzf be gb pbagrfg inyvqvgl bs nal
++fhpu pynvzf; guvf frpgvba unf gur fbyr checbfr bs cebgrpgvat gur
++vagrtevgl bs gur serr fbsgjner qvfgevohgvba flfgrz, juvpu vf
++vzcyrzragrq ol choyvp yvprafr cenpgvprf.  Znal crbcyr unir znqr
++trarebhf pbagevohgvbaf gb gur jvqr enatr bs fbsgjner qvfgevohgrq
++guebhtu gung flfgrz va eryvnapr ba pbafvfgrag nccyvpngvba bs gung
++flfgrz; vg vf hc gb gur nhgube/qbabe gb qrpvqr vs ur be fur vf jvyyvat
++gb qvfgevohgr fbsgjner guebhtu nal bgure flfgrz naq n yvprafrr pnaabg
++vzcbfr gung pubvpr.
++
++Guvf frpgvba vf vagraqrq gb znxr gubebhtuyl pyrne jung vf oryvrirq gb
++or n pbafrdhrapr bs gur erfg bs guvf Yvprafr.
++
++  8. Vs gur qvfgevohgvba naq/be hfr bs gur Cebtenz vf erfgevpgrq va
++pregnva pbhagevrf rvgure ol cngragf be ol pbclevtugrq vagresnprf, gur
++bevtvany pbclevtug ubyqre jub cynprf gur Cebtenz haqre guvf Yvprafr
++znl nqq na rkcyvpvg trbtencuvpny qvfgevohgvba yvzvgngvba rkpyhqvat
++gubfr pbhagevrf, fb gung qvfgevohgvba vf crezvggrq bayl va be nzbat
++pbhagevrf abg guhf rkpyhqrq.  Va fhpu pnfr, guvf Yvprafr vapbecbengrf
++gur yvzvgngvba nf vs jevggra va gur obql bs guvf Yvprafr.
++
++  9. Gur Serr Fbsgjner Sbhaqngvba znl choyvfu erivfrq naq/be arj irefvbaf
++bs gur Trareny Choyvp Yvprafr sebz gvzr gb gvzr.  Fhpu arj irefvbaf jvyy
++or fvzvyne va fcvevg gb gur cerfrag irefvba, ohg znl qvssre va qrgnvy gb
++nqqerff arj ceboyrzf be pbapreaf.
++
++Rnpu irefvba vf tvira n qvfgvathvfuvat irefvba ahzore.  Vs gur Cebtenz
++fcrpvsvrf n irefvba ahzore bs guvf Yvprafr juvpu nccyvrf gb vg naq "nal
++yngre irefvba", lbh unir gur bcgvba bs sbyybjvat gur grezf naq pbaqvgvbaf
++rvgure bs gung irefvba be bs nal yngre irefvba choyvfurq ol gur Serr
++Fbsgjner Sbhaqngvba.  Vs gur Cebtenz qbrf abg fcrpvsl n irefvba ahzore bs
++guvf Yvprafr, lbh znl pubbfr nal irefvba rire choyvfurq ol gur Serr Fbsgjner
++Sbhaqngvba.
++
++  10. Vs lbh jvfu gb vapbecbengr cnegf bs gur Cebtenz vagb bgure serr
++cebtenzf jubfr qvfgevohgvba pbaqvgvbaf ner qvssrerag, jevgr gb gur nhgube
++gb nfx sbe crezvffvba.  Sbe fbsgjner juvpu vf pbclevtugrq ol gur Serr
++Fbsgjner Sbhaqngvba, jevgr gb gur Serr Fbsgjner Sbhaqngvba; jr fbzrgvzrf
++znxr rkprcgvbaf sbe guvf.  Bhe qrpvfvba jvyy or thvqrq ol gur gjb tbnyf
++bs cerfreivat gur serr fgnghf bs nyy qrevingvirf bs bhe serr fbsgjner naq
++bs cebzbgvat gur funevat naq erhfr bs fbsgjner trarenyyl.
++
++			    AB JNEENAGL
++
++  11. ORPNHFR GUR CEBTENZ VF YVPRAFRQ SERR BS PUNETR, GURER VF AB JNEENAGL
++SBE GUR CEBTENZ, GB GUR RKGRAG CREZVGGRQ OL NCCYVPNOYR YNJ.  RKPRCG JURA
++BGUREJVFR FGNGRQ VA JEVGVAT GUR PBCLEVTUG UBYQREF NAQ/BE BGURE CNEGVRF
++CEBIVQR GUR CEBTENZ "NF VF" JVGUBHG JNEENAGL BS NAL XVAQ, RVGURE RKCERFFRQ
++BE VZCYVRQ, VAPYHQVAT, OHG ABG YVZVGRQ GB, GUR VZCYVRQ JNEENAGVRF BS
++ZREPUNAGNOVYVGL NAQ SVGARFF SBE N CNEGVPHYNE CHECBFR.  GUR RAGVER EVFX NF
++GB GUR DHNYVGL NAQ CRESBEZNAPR BS GUR CEBTENZ VF JVGU LBH.  FUBHYQ GUR
++CEBTENZ CEBIR QRSRPGVIR, LBH NFFHZR GUR PBFG BS NYY ARPRFFNEL FREIVPVAT,
++ERCNVE BE PBEERPGVBA.
++
++  12. VA AB RIRAG HAYRFF ERDHVERQ OL NCCYVPNOYR YNJ BE NTERRQ GB VA JEVGVAT
++JVYY NAL PBCLEVTUG UBYQRE, BE NAL BGURE CNEGL JUB ZNL ZBQVSL NAQ/BE
++ERQVFGEVOHGR GUR CEBTENZ NF CREZVGGRQ NOBIR, OR YVNOYR GB LBH SBE QNZNTRF,
++VAPYHQVAT NAL TRARENY, FCRPVNY, VAPVQRAGNY BE PBAFRDHRAGVNY QNZNTRF NEVFVAT
++BHG BS GUR HFR BE VANOVYVGL GB HFR GUR CEBTENZ (VAPYHQVAT OHG ABG YVZVGRQ
++GB YBFF BS QNGN BE QNGN ORVAT ERAQRERQ VANPPHENGR BE YBFFRF FHFGNVARQ OL
++LBH BE GUVEQ CNEGVRF BE N SNVYHER BS GUR CEBTENZ GB BCRENGR JVGU NAL BGURE
++CEBTENZF), RIRA VS FHPU UBYQRE BE BGURE CNEGL UNF ORRA NQIVFRQ BS GUR
++CBFFVOVYVGL BS FHPU QNZNTRF.
++
++		     RAQ BS GREZF NAQ PBAQVGVBAF
++
++	    Ubj gb Nccyl Gurfr Grezf gb Lbhe Arj Cebtenzf
++
++  Vs lbh qrirybc n arj cebtenz, naq lbh jnag vg gb or bs gur terngrfg
++cbffvoyr hfr gb gur choyvp, gur orfg jnl gb npuvrir guvf vf gb znxr vg
++serr fbsgjner juvpu rirelbar pna erqvfgevohgr naq punatr haqre gurfr grezf.
++
++  Gb qb fb, nggnpu gur sbyybjvat abgvprf gb gur cebtenz.  Vg vf fnsrfg
++gb nggnpu gurz gb gur fgneg bs rnpu fbhepr svyr gb zbfg rssrpgviryl
++pbairl gur rkpyhfvba bs jneenagl; naq rnpu svyr fubhyq unir ng yrnfg
++gur "pbclevtug" yvar naq n cbvagre gb jurer gur shyy abgvpr vf sbhaq.
++
++    <bar yvar gb tvir gur cebtenz'f anzr naq n oevrs vqrn bs jung vg qbrf.>
++    Pbclevtug (P) <lrne>  <anzr bs nhgube>
++
++    Guvf cebtenz vf serr fbsgjner; lbh pna erqvfgevohgr vg naq/be zbqvsl
++    vg haqre gur grezf bs gur TAH Trareny Choyvp Yvprafr nf choyvfurq ol
++    gur Serr Fbsgjner Sbhaqngvba; rvgure irefvba 2 bs gur Yvprafr, be
++    (ng lbhe bcgvba) nal yngre irefvba.
++
++    Guvf cebtenz vf qvfgevohgrq va gur ubcr gung vg jvyy or hfrshy,
++    ohg JVGUBHG NAL JNEENAGL; jvgubhg rira gur vzcyvrq jneenagl bs
++    ZREPUNAGNOVYVGL be SVGARFF SBE N CNEGVPHYNE CHECBFR.  Frr gur
++    TAH Trareny Choyvp Yvprafr sbe zber qrgnvyf.
++
++    Lbh fubhyq unir erprvirq n pbcl bs gur TAH Trareny Choyvp Yvprafr nybat
++    jvgu guvf cebtenz; vs abg, jevgr gb gur Serr Fbsgjner Sbhaqngvba, Vap.,
++    51 Senaxyva Fgerrg, Svsgu Sybbe, Obfgba, ZN 02110-1301 HFN.
++
++Nyfb nqq vasbezngvba ba ubj gb pbagnpg lbh ol ryrpgebavp naq cncre znvy.
++
++Vs gur cebtenz vf vagrenpgvir, znxr vg bhgchg n fubeg abgvpr yvxr guvf
++jura vg fgnegf va na vagrenpgvir zbqr:
++
++    Tabzbivfvba irefvba 69, Pbclevtug (P) lrne anzr bs nhgube
++    Tabzbivfvba pbzrf jvgu NOFBYHGRYL AB JNEENAGL; sbe qrgnvyf glcr `fubj j'.
++    Guvf vf serr fbsgjner, naq lbh ner jrypbzr gb erqvfgevohgr vg
++    haqre pregnva pbaqvgvbaf; glcr `fubj p' sbe qrgnvyf.
++
++Gur ulcbgurgvpny pbzznaqf `fubj j' naq `fubj p' fubhyq fubj gur nccebcevngr
++cnegf bs gur Trareny Choyvp Yvprafr.  Bs pbhefr, gur pbzznaqf lbh hfr znl
++or pnyyrq fbzrguvat bgure guna `fubj j' naq `fubj p'; gurl pbhyq rira or
++zbhfr-pyvpxf be zrah vgrzf--jungrire fhvgf lbhe cebtenz.
++
++Lbh fubhyq nyfb trg lbhe rzcyblre (vs lbh jbex nf n cebtenzzre) be lbhe
++fpubby, vs nal, gb fvta n "pbclevtug qvfpynvzre" sbe gur cebtenz, vs
++arprffnel.  Urer vf n fnzcyr; nygre gur anzrf:
++
++  Lblbqlar, Vap., urerol qvfpynvzf nyy pbclevtug vagrerfg va gur cebtenz
++  `Tabzbivfvba' (juvpu znxrf cnffrf ng pbzcvyref) jevggra ol Wnzrf Unpxre.
++
++  <fvtangher bs Gl Pbba>, 1 Ncevy 1989
++  Gl Pbba, Cerfvqrag bs Ivpr
++
++Guvf Trareny Choyvp Yvprafr qbrf abg crezvg vapbecbengvat lbhe cebtenz vagb
++cebcevrgnel cebtenzf.  Vs lbhe cebtenz vf n fhoebhgvar yvoenel, lbh znl
++pbafvqre vg zber hfrshy gb crezvg yvaxvat cebcevrgnel nccyvpngvbaf jvgu gur
++yvoenel.  Vs guvf vf jung lbh jnag gb qb, hfr gur TAH Yrffre Trareny
++Choyvp Yvprafr vafgrnq bs guvf Yvprafr.
+ok 6 - suppress deletion diff with -B -D
+
+expecting success: 
+	test_seq 1 99 >seq &&
+	printf 100 >>seq &&
+	git add seq &&
+	git commit seq -m seq
+
+[master (root-commit) 488b17b] 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: 
+	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: 
+	git diff -B seq >res &&
+	grep "dissimilarity index" res
+
+dissimilarity index 92%
+ok 9 - confirm that sequence file is considered a rewrite
+
+expecting success: 
+	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: 
+	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/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t4020-diff-external.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4020-diff-external/.git/
+expecting success: 
+
+	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: 
+
+	GIT_EXTERNAL_DIFF=echo git diff | {
+		read path oldfile oldhex oldmode newfile newhex newmode &&
+		test "z$path" = zfile &&
+		test "z$oldmode" = z100644 &&
+		test "z$newhex" = "z$ZERO_OID" &&
+		test "z$newmode" = z100644 &&
+		oh=$(git rev-parse --verify HEAD:file) &&
+		test "z$oh" = "z$oldhex"
+	}
+
+
+ok 2 - GIT_EXTERNAL_DIFF environment
+
+expecting success: 
+
+	GIT_EXTERNAL_DIFF=echo git log -p -1 HEAD |
+	grep "^diff --git a/file b/file"
+
+
+diff --git a/file b/file
+ok 3 - GIT_EXTERNAL_DIFF environment should apply only to diff
+
+expecting success: 
+
+	GIT_EXTERNAL_DIFF=echo git diff --no-ext-diff |
+	grep "^diff --git a/file b/file"
+
+
+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" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
+	# test whether the filesystem supports symbolic links
+	ln -s x y && test -h y
+
+)
+prerequisite SYMLINKS ok
+expecting success: 
+	rm -f file &&
+	ln -s elif file &&
+	GIT_EXTERNAL_DIFF=echo git diff  | {
+		read path oldfile oldhex oldmode newfile newhex newmode &&
+		test "z$path" = zfile &&
+		test "z$oldmode" = z100644 &&
+		test "z$newhex" = "z$ZERO_OID" &&
+		test "z$newmode" = z120000 &&
+		oh=$(git rev-parse --verify HEAD:file) &&
+		test "z$oh" = "z$oldhex"
+	} &&
+	GIT_EXTERNAL_DIFF=echo git diff --no-ext-diff >actual &&
+	git diff >expect &&
+	test_cmp expect actual
+
+ok 5 - typechange diff
+
+expecting success: 
+	git reset --hard &&
+	echo third >file &&
+	test_config diff.external echo &&
+	git diff | {
+		read path oldfile oldhex oldmode newfile newhex newmode &&
+		test "z$path" = zfile &&
+		test "z$oldmode" = z100644 &&
+		test "z$newhex" = "z$ZERO_OID" &&
+		test "z$newmode" = z100644 &&
+		oh=$(git rev-parse --verify HEAD:file) &&
+		test "z$oh" = "z$oldhex"
+	}
+
+HEAD is now at f3562cd second
+ok 6 - diff.external
+
+expecting success: 
+	test_config diff.external echo &&
+	git log -p -1 HEAD |
+	grep "^diff --git a/file b/file"
+
+diff --git a/file b/file
+ok 7 - diff.external should apply only to diff
+
+expecting success: 
+	test_config diff.external echo &&
+	git diff --no-ext-diff |
+	grep "^diff --git a/file b/file"
+
+diff --git a/file b/file
+ok 8 - diff.external and --no-ext-diff
+
+expecting success: 
+	git reset --hard &&
+	echo third >file &&
+
+	git config diff.parrot.command echo &&
+
+	echo >.gitattributes "file diff=parrot" &&
+
+	git diff | {
+		read path oldfile oldhex oldmode newfile newhex newmode &&
+		test "z$path" = zfile &&
+		test "z$oldmode" = z100644 &&
+		test "z$newhex" = "z$ZERO_OID" &&
+		test "z$newmode" = z100644 &&
+		oh=$(git rev-parse --verify HEAD:file) &&
+		test "z$oh" = "z$oldhex"
+	}
+
+
+HEAD is now at f3562cd second
+ok 9 - diff attribute
+
+expecting success: 
+
+	git log -p -1 HEAD |
+	grep "^diff --git a/file b/file"
+
+
+diff --git a/file b/file
+ok 10 - diff attribute should apply only to diff
+
+expecting success: 
+
+	git diff --no-ext-diff |
+	grep "^diff --git a/file b/file"
+
+
+diff --git a/file b/file
+ok 11 - diff attribute and --no-ext-diff
+
+expecting success: 
+
+	git config --unset diff.parrot.command &&
+	git config diff.color.command echo &&
+
+	echo >.gitattributes "file diff=color" &&
+
+	git diff | {
+		read path oldfile oldhex oldmode newfile newhex newmode &&
+		test "z$path" = zfile &&
+		test "z$oldmode" = z100644 &&
+		test "z$newhex" = "z$ZERO_OID" &&
+		test "z$newmode" = z100644 &&
+		oh=$(git rev-parse --verify HEAD:file) &&
+		test "z$oh" = "z$oldhex"
+	}
+
+
+ok 12 - diff attribute
+
+expecting success: 
+
+	git log -p -1 HEAD |
+	grep "^diff --git a/file b/file"
+
+
+diff --git a/file b/file
+ok 13 - diff attribute should apply only to diff
+
+expecting success: 
+
+	git diff --no-ext-diff |
+	grep "^diff --git a/file b/file"
+
+
+diff --git a/file b/file
+ok 14 - diff attribute and --no-ext-diff
+
+expecting success: 
+	>.gitattributes &&
+	test_config diff.external "echo ext-global" &&
+	GIT_EXTERNAL_DIFF="echo ext-env" git diff | grep ext-env
+
+ext-env file /tmp/h7d3eh_file e019be006cf33489e2d0177a3837a2384eddebc5 100644 file 0000000000000000000000000000000000000000 100644
+ok 15 - GIT_EXTERNAL_DIFF trumps diff.external
+
+expecting success: 
+	test_config diff.foo.command "echo ext-attribute" &&
+	test_config diff.external "echo ext-global" &&
+	echo "file diff=foo" >.gitattributes &&
+	GIT_EXTERNAL_DIFF="echo ext-env" git diff | grep ext-attribute
+
+ext-attribute file /tmp/x0c6Rd_file e019be006cf33489e2d0177a3837a2384eddebc5 100644 file 0000000000000000000000000000000000000000 100644
+ok 16 - attributes trump GIT_EXTERNAL_DIFF and diff.external
+
+expecting success: 
+	echo >.gitattributes "file -diff" &&
+	git diff | grep Binary
+
+Binary files a/file and b/file differ
+ok 17 - no diff with -diff
+
+expecting success: 
+	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: 
+	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/70IFRu_file e019be006cf33489e2d0177a3837a2384eddebc5 100644 file 0000000000000000000000000000000000000000 100644
+file2 /tmp/TZjrbv_file2 abc9fa522731419e7eaa3d472e3cb3d99e475c49 100644 file2 0000000000000000000000000000000000000000 100644
+ok 19 - GIT_EXTERNAL_DIFF with more than one changed files
+
+expecting success: 
+	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: 
+	touch file.ext &&
+	git add file.ext &&
+	echo with extension > file.ext &&
+	GIT_EXTERNAL_DIFF=echo git diff file.ext | grep ......_file\.ext &&
+	git update-index --force-remove file.ext &&
+	rm file.ext
+
+file.ext /tmp/mlm5HA_file.ext e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 file.ext 0000000000000000000000000000000000000000 100644
+ok 21 - GIT_EXTERNAL_DIFF generates pretty paths
+
+expecting success: 
+	test_config core.autocrlf true &&
+	GIT_EXTERNAL_DIFF=./fake-diff.sh git diff &&
+	test $(wc -l < crlfed.txt) = $(cat crlfed.txt | keep_only_cr | wc -c)
+
+warning: LF will be replaced by CRLF in file2.
+The file will have its original line endings in your working directory
+ok 22 - external diff with autocrlf = true
+
+expecting success: 
+	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: 
+	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: 
+	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/git-2.20.1/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.
+[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/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t4024-diff-optimize-common.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4024-diff-optimize-common/.git/
+expecting success: 
+
+	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: 
+
+	for n in $sample
+	do
+		git diff -U0 file-?$n
+	done | zc >actual &&
+	test_cmp expect actual
+
+
+ok 2 - diff -U0
+
+# passed all 2 test(s)
+1..2
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t4025-hunk-header.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4025-hunk-header/.git/
+expecting success: 
+
+	(
+		echo "A $NS" &&
+		for c in B C D E F G H I J K
+		do
+			echo "  $c"
+		done &&
+		echo "L  $NS" &&
+		for c in M N O P Q R S T U V
+		do
+			echo "  $c"
+		done
+	) >file &&
+	git add file &&
+
+	sed -e "/^  [EP]/s/$/ modified/" <file >file+ &&
+	mv file+ file
+
+
+ok 1 - setup
+
+expecting success: 
+
+	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/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t4023-diff-rename-typechange.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4023-diff-rename-typechange/.git/
+expecting success: 
+
+	rm -f foo bar &&
+	cat "$TEST_DIRECTORY"/../COPYING >foo &&
+	test_ln_s_add linklink bar &&
+	git add foo &&
+	git commit -a -m Initial &&
+	git tag one &&
+
+	git rm -f foo bar &&
+	cat "$TEST_DIRECTORY"/../COPYING >bar &&
+	test_ln_s_add linklink foo &&
+	git add bar &&
+	git commit -a -m Second &&
+	git tag two &&
+
+	git rm -f foo bar &&
+	cat "$TEST_DIRECTORY"/../COPYING >foo &&
+	git add foo &&
+	git commit -a -m Third &&
+	git tag three &&
+
+	mv foo bar &&
+	test_ln_s_add linklink foo &&
+	git add bar &&
+	git commit -a -m Fourth &&
+	git tag four &&
+
+	# This is purely for sanity check
+
+	git rm -f foo bar &&
+	cat "$TEST_DIRECTORY"/../COPYING >foo &&
+	cat "$TEST_DIRECTORY"/../Makefile >bar &&
+	git add foo bar &&
+	git commit -a -m Fifth &&
+	git tag five &&
+
+	git rm -f foo bar &&
+	cat "$TEST_DIRECTORY"/../Makefile >foo &&
+	cat "$TEST_DIRECTORY"/../COPYING >bar &&
+	git add foo bar &&
+	git commit -a -m Sixth &&
+	git tag six
+
+
+checking prerequisite: SYMLINKS
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
+	# test whether the filesystem supports symbolic links
+	ln -s x y && test -h y
+
+)
+prerequisite SYMLINKS ok
+[master (root-commit) 1bf39bd] Initial
+ Author: A U Thor <author@example.com>
+ 2 files changed, 361 insertions(+)
+ create mode 120000 bar
+ create mode 100644 foo
+rm 'bar'
+rm 'foo'
+[master f9304cf] Second
+ Author: A U Thor <author@example.com>
+ 2 files changed, 0 insertions(+), 0 deletions(-)
+ rename foo => bar (100%)
+ rename bar => foo (100%)
+rm 'bar'
+rm 'foo'
+[master c7c4d33] Third
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename bar => foo (100%)
+[master c6c225f] Fourth
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+), 360 deletions(-)
+ copy foo => bar (100%)
+ rewrite foo (100%)
+ mode change 100644 => 120000
+rm 'bar'
+rm 'foo'
+[master 3da80db] Fifth
+ Author: A U Thor <author@example.com>
+ 2 files changed, 3118 insertions(+), 360 deletions(-)
+ rewrite bar (98%)
+ copy bar => foo (100%)
+rm 'bar'
+rm 'foo'
+[master 035ff1f] Sixth
+ Author: A U Thor <author@example.com>
+ 2 files changed, 0 insertions(+), 0 deletions(-)
+ rename foo => bar (100%)
+ rename bar => foo (100%)
+ok 1 - setup
+
+expecting success: 
+
+	git diff-tree five six -r --name-status -B -M | sort >actual &&
+	{
+		echo "R100	foo	bar"
+		echo "R100	bar	foo"
+	} | sort >expect &&
+	test_cmp expect actual
+
+
+ok 2 - cross renames to be detected for regular files
+
+expecting success: 
+
+	git diff-tree one two -r --name-status -B -M | sort >actual &&
+	{
+		echo "R100	foo	bar"
+		echo "R100	bar	foo"
+	} | sort >expect &&
+	test_cmp expect actual
+
+
+ok 3 - cross renames to be detected for typechange
+
+expecting success: 
+
+	git diff-tree three four -r --name-status -B -M | sort >actual &&
+	{
+		# see -B -M (#6) in t4008
+		echo "C100	foo	bar"
+		echo "T100	foo"
+	} | sort >expect &&
+	test_cmp expect actual
+
+
+ok 4 - moves and renames
+
+# passed all 4 test(s)
+1..4
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t4028-format-patch-mime-headers.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4028-format-patch-mime-headers/.git/
+expecting success: 
+	echo content >file &&
+	git add file &&
+	git commit -m one &&
+	echo more >>file &&
+	git commit -a -m "two
+
+	utf-8 body: ñ"
+
+[master (root-commit) 5861109] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+[master cb2b77b] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 1 - create commit with utf-8 body
+
+expecting success: 
+	rm -f 0001-two.patch &&
+	git format-patch HEAD^ &&
+	grep -i "content-type: text/plain; charset=utf-8" 0001-two.patch
+
+0001-two.patch
+Content-Type: text/plain; charset=UTF-8
+ok 2 - patch has mime headers
+
+expecting success: 
+	rm -f 0001-two.patch &&
+	git config format.headers "x-foo: bar" &&
+	git format-patch HEAD^ &&
+	grep -i "x-foo: bar" 0001-two.patch &&
+	grep -i "content-type: text/plain; charset=utf-8" 0001-two.patch
+
+0001-two.patch
+x-foo: bar
+Content-Type: text/plain; charset=UTF-8
+ok 3 - patch has mime and extra headers
+
+# passed all 3 test(s)
+1..3
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
 *** t4029-diff-trailing-space.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4029-diff-trailing-space/.git/
 expecting success: 
@@ -99586,169 +99469,1179 @@
 1..4
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t4018-diff-funcname.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4018-diff-funcname/.git/
+*** t3905-stash-include-untracked.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3905-stash-include-untracked/.git/
 expecting success: 
-	# a non-trivial custom pattern
-	git config diff.custom1.funcname "!static
-!String
-[^ 	].*s.*" &&
-
-	# a custom pattern which matches to end of line
-	git config diff.custom2.funcname "......Beer\$" &&
+	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
 
-	# alternation in pattern
-	git config diff.custom3.funcname "Beer$" &&
-	git config diff.custom3.xfuncname "^[ 	]*((public|static).*)$" &&
+[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
 
-	# for regexp compilation tests
-	echo A >A.java &&
-	echo B >B.java
+expecting success: 
+	git status --porcelain >actual &&
+	test_cmp expect actual
 
-ok 1 - setup
+ok 2 - stash save --include-untracked cleaned the untracked files
 
 expecting success: 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index \
-			A.java B.java 2>msg &&
-		test_i18ngrep ! fatal msg &&
-		test_i18ngrep ! error msg
-	
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
--A
-+B
-ok 2 - builtin ada pattern compiles
+	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: 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index --word-diff \
-			A.java B.java 2>msg &&
-		test_i18ngrep ! fatal msg &&
-		test_i18ngrep ! error 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 wordRegex pattern compiles
+ok 3 - stash save --include-untracked stashed the untracked files
 
 expecting success: 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index \
-			A.java B.java 2>msg &&
-		test_i18ngrep ! fatal msg &&
-		test_i18ngrep ! error 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 bibtex pattern compiles
+	test_must_fail git stash --patch --include-untracked
 
-expecting success: 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index --word-diff \
-			A.java B.java 2>msg &&
-		test_i18ngrep ! fatal msg &&
-		test_i18ngrep ! error msg
-	
-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 bibtex wordRegex pattern compiles
+Can't use --patch and --include-untracked or --all at the same time
+ok 4 - stash save --patch --include-untracked fails
 
 expecting success: 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index \
-			A.java B.java 2>msg &&
-		test_i18ngrep ! fatal msg &&
-		test_i18ngrep ! error 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 cpp pattern compiles
+	test_must_fail git stash --patch --all
 
-expecting success: 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index --word-diff \
-			A.java B.java 2>msg &&
-		test_i18ngrep ! fatal msg &&
-		test_i18ngrep ! error 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 cpp wordRegex pattern compiles
+Can't use --patch and --include-untracked or --all at the same time
+ok 5 - stash save --patch --all fails
 
 expecting success: 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index \
-			A.java B.java 2>msg &&
-		test_i18ngrep ! fatal msg &&
-		test_i18ngrep ! error msg
-	
-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 csharp pattern compiles
+	git stash pop &&
+	git status --porcelain >actual &&
+	test_cmp expect actual &&
+	test "1" = "$(cat file2)" &&
+	test untracked = "$(cat untracked/untracked)"
 
-expecting success: 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index --word-diff \
-			A.java B.java 2>msg &&
-		test_i18ngrep ! fatal msg &&
-		test_i18ngrep ! error 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 csharp wordRegex pattern compiles
+Merging Version stash was based on with Stashed changes
+Merging:
+virtual Version stash was based on
+virtual Stashed changes
+found 1 common ancestor:
+virtual f27c6ae26adb8396d3861976ba268f87ad8afa0b
+On branch master
+Changes not staged for commit:
+  (use "git add <file>..." to update what will be committed)
+  (use "git checkout -- <file>..." to discard changes in working directory)
+
+	modified:   file
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+
+	HEAD
+	expect
+	file2
+	untracked/
+
+no changes added to commit (use "git add" and/or "git commit -a")
+Dropped refs/stash@{0} (0a7d204f1703777538511f544d27630f4eca5b11)
+ok 6 - stash pop after save --include-untracked leaves files untracked again
 
 expecting success: 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index \
-			A.java B.java 2>msg &&
-		test_i18ngrep ! fatal msg &&
-		test_i18ngrep ! error 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 css pattern compiles
+	echo 4 > file3 &&
+	git add file3 &&
+	test_tick &&
+	git stash -u
+
+Saved working directory and index state WIP on master: 777c62c initial
+ok 7 - stash save -u dirty index
 
 expecting success: 
-		echo "*.java diff=$p" >.gitattributes &&
+	git stash pop --index &&
+	git diff --cached >actual &&
+	test_cmp expect actual
+
+Merging Version stash was based on with Stashed changes
+Merging:
+virtual Version stash was based on
+virtual Stashed changes
+found 1 common ancestor:
+virtual f27c6ae26adb8396d3861976ba268f87ad8afa0b
+On branch master
+Changes to be committed:
+  (use "git reset HEAD <file>..." to unstage)
+
+	new file:   file3
+
+Changes not staged for commit:
+  (use "git add <file>..." to update what will be committed)
+  (use "git checkout -- <file>..." to discard changes in working directory)
+
+	modified:   file
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+
+	expect
+
+Dropped refs/stash@{0} (d531845c34afd9e73a5059048aeaaaf9bdbf02ff)
+ok 8 - stash save --include-untracked dirty index got stashed
+
+expecting success: 
+	echo 1 > file5 &&
+	git stash save --include-untracked --quiet > .git/stash-output.out 2>&1 &&
+	test_line_count = 0 .git/stash-output.out &&
+	rm -f .git/stash-output.out
+
+ok 9 - stash save --include-untracked -q is quiet
+
+expecting success: 
+	rm -f file &&
+	git stash save --include-untracked &&
+	echo 1 > expect &&
+	test_cmp expect file
+
+Saved working directory and index state WIP on master: 777c62c initial
+ok 10 - stash save --include-untracked removed files
+
+expecting success: 
+	git stash pop &&
+	test_path_is_missing file
+
+Merging Version stash was based on with Stashed changes
+Merging:
+virtual Version stash was based on
+virtual Stashed changes
+found 1 common ancestor:
+virtual f27c6ae26adb8396d3861976ba268f87ad8afa0b
+Removing file
+On branch master
+Changes not staged for commit:
+  (use "git add/rm <file>..." to update what will be committed)
+  (use "git checkout -- <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} (0fe2ec27acd9fc86eb08e4840c3d194b1a902734)
+ok 11 - stash save --include-untracked removed files got stashed
+
+expecting success: 
+	echo ignored > ignored &&
+	mkdir ignored.d &&
+	echo ignored >ignored.d/untracked &&
+	git stash -u &&
+	test -s ignored &&
+	test -s ignored.d/untracked &&
+	test -s .gitignore
+
+Saved working directory and index state WIP on master: 777c62c initial
+ok 12 - stash save --include-untracked respects .gitignore
+
+expecting success: 
+	echo 4 > file4 &&
+	git stash -u &&
+	test_path_is_missing file4
+
+Saved working directory and index state WIP on master: 777c62c initial
+ok 13 - stash save -u can stash with only untracked files different
+
+expecting success: 
+	git stash -a &&
+	test_path_is_missing ignored &&
+	test_path_is_missing ignored.d &&
+	test_path_is_missing .gitignore
+
+Saved working directory and index state WIP on master: 777c62c initial
+ok 14 - stash save --all does not respect .gitignore
+
+expecting success: 
+	git stash pop &&
+	test -s ignored &&
+	test -s ignored.d/untracked &&
+	test -s .gitignore
+
+Merging Version stash was based on with Version stash was based on
+Merging:
+virtual Version stash was based on
+virtual Version stash was based on
+found 1 common ancestor:
+virtual f27c6ae26adb8396d3861976ba268f87ad8afa0b
+Already up to date!
+On branch master
+nothing to commit, working tree clean
+Dropped refs/stash@{0} (237dbb933d97e03cdd270bc30c51e573dcf9a6ca)
+ok 15 - stash save --all is stash poppable
+
+expecting success: 
+	>foo &&
+	>bar &&
+	git stash push --include-untracked -- foo &&
+	test_path_is_file bar &&
+	test_path_is_missing foo &&
+	git stash pop &&
+	test_path_is_file bar &&
+	test_path_is_file foo
+
+Saved working directory and index state WIP on master: 777c62c initial
+Merging Version stash was based on with Version stash was based on
+Merging:
+virtual Version stash was based on
+virtual Version stash was based on
+found 1 common ancestor:
+virtual f27c6ae26adb8396d3861976ba268f87ad8afa0b
+Already up to date!
+On branch master
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+
+	bar
+	foo
+
+nothing added to commit but untracked files present (use "git add" to track)
+Dropped refs/stash@{0} (49d4a45c68f9c8f49ba4e5d98977bafffbb0368c)
+ok 16 - stash push --include-untracked with pathspec
+
+expecting success: 
+	>"foo bar" &&
+	>foo &&
+	>bar &&
+	git add foo* &&
+	git stash push --include-untracked -- "foo b*" &&
+	test_path_is_missing "foo bar" &&
+	test_path_is_file foo &&
+	test_path_is_file bar &&
+	git stash pop &&
+	test_path_is_file "foo bar" &&
+	test_path_is_file foo &&
+	test_path_is_file bar
+
+Saved working directory and index state WIP on master: 777c62c initial
+Merging Updated upstream with Stashed changes
+Merging:
+virtual Updated upstream
+virtual Stashed changes
+found 1 common ancestor:
+virtual f27c6ae26adb8396d3861976ba268f87ad8afa0b
+On branch master
+Changes to be committed:
+  (use "git reset HEAD <file>..." to unstage)
+
+	new file:   foo
+	new file:   foo bar
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+
+	bar
+
+Dropped refs/stash@{0} (1b64bbe5a16668a7a5a6fabfddf7fe8c30c16a63)
+ok 17 - stash push with $IFS character
+
+expecting success: 
+	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
+
+[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
+Merging:
+virtual Version stash was based on
+virtual Stashed changes
+found 1 common ancestor:
+virtual f810f552a0f89486ec70c4734dc5a9c52c8342dd
+On branch master
+Changes not staged for commit:
+  (use "git add <file>..." to update what will be committed)
+  (use "git checkout -- <file>..." to discard changes in working directory)
+
+	modified:   .gitignore
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+
+	bar
+	foo
+	foo bar
+	ignored.d/
+
+no changes added to commit (use "git add" and/or "git commit -a")
+Dropped refs/stash@{0} (389c72c4d3838b0b99c65190f50f6b9257e12eec)
+ok 18 - stash previously ignored file
+
+expecting success: 
+	>untracked &&
+	git stash push -u -- untracked 2>actual &&
+	test_path_is_missing untracked &&
+	test_line_count = 0 actual
+
+Saved working directory and index state WIP on master: 14579a4 Add .gitignore
+ok 19 - stash -u -- <untracked> doesnt print error
+
+expecting success: 
+	>tracked &&
+	git add tracked &&
+	>untracked &&
+	git stash push -u -- untracked &&
+	test_path_is_missing untracked &&
+	test_path_is_file tracked
+
+Saved working directory and index state WIP on master: 14579a4 Add .gitignore
+ok 20 - stash -u -- <untracked> leaves rest of working tree in place
+
+expecting success: 
+	>tracked &&
+	git add tracked &&
+	>untracked &&
+	git stash push -u -- tracked untracked &&
+	test_path_is_missing tracked &&
+	test_path_is_missing untracked
+
+Saved working directory and index state WIP on master: 14579a4 Add .gitignore
+ok 21 - stash -u -- <tracked> <untracked> clears changes in both
+
+expecting success: 
+	>ignored.d/bar &&
+	git stash push --all -- ignored.d/bar &&
+	test_path_is_missing ignored.d/bar
+
+Saved working directory and index state WIP on master: 14579a4 Add .gitignore
+ok 22 - stash --all -- <ignored> stashes ignored file
+
+expecting success: 
+	>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
+
+Saved working directory and index state WIP on master: 14579a4 Add .gitignore
+ok 23 - stash --all -- <tracked> <ignored> clears changes in both
+
+expecting success: 
+	>ignored.d/bar &&
+	git stash push -u -- ignored.d/bar &&
+	test_path_is_file ignored.d/bar
+
+No local changes to save
+ok 24 - stash -u -- <ignored> leaves ignored file alone
+
+expecting success: 
+	git stash push -u -- non-existant >actual &&
+	echo "No local changes to save" >expect &&
+	test_i18ncmp expect actual
+
+ok 25 - stash -u -- <non-existant> shows no changes when there are none
+
+# passed all 25 test(s)
+1..25
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t4027-diff-submodule.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4027-diff-submodule/.git/
+expecting success: 
+	test_tick &&
+	test_create_repo sub &&
+	(
+		cd sub &&
+		echo hello >world &&
+		git add world &&
+		git commit -m submodule
+	) &&
+
+	test_tick &&
+	echo frotz >nitfol &&
+	git add nitfol sub &&
+	git commit -m superproject &&
+
+	(
+		cd sub &&
+		echo goodbye >world &&
+		git add world &&
+		git commit -m "submodule #2"
+	) &&
+
+	set x $(
+		cd sub &&
+		git rev-list HEAD
+	) &&
+	echo ":160000 160000 $3 $ZERO_OID M	sub" >expect &&
+	subtip=$3 subprev=$2
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4027-diff-submodule/sub/.git/
+[master (root-commit) 4431e0b] submodule
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 world
+warning: adding embedded git repository: sub
+hint: You've added another git repository inside your current repository.
+hint: Clones of the outer repository will not contain the contents of
+hint: the embedded repository and will not know how to obtain it.
+hint: If you meant to add a submodule, use:
+hint: 
+hint: 	git submodule add <url> sub
+hint: 
+hint: If you added this path by mistake, you can remove it from the
+hint: index with:
+hint: 
+hint: 	git rm --cached sub
+hint: 
+hint: See "git help submodule" for more information.
+[master (root-commit) 5b035b6] superproject
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 nitfol
+ create mode 160000 sub
+[master 2dd69d6] submodule #2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 1 - setup
+
+expecting success: 
+	git diff --raw --abbrev=40 HEAD >actual &&
+	test_cmp expect actual
+
+ok 2 - git diff --raw HEAD
+
+expecting success: 
+	git diff-index --raw HEAD >actual.index &&
+	test_cmp expect actual.index
+
+ok 3 - git diff-index --raw HEAD
+
+expecting success: 
+	git diff-files --raw >actual.files &&
+	test_cmp expect actual.files
+
+ok 4 - git diff-files --raw
+
+expecting success: 
+	git diff HEAD >actual &&
+	sed -e "1,/^@@/d" actual >actual.body &&
+	expect_from_to >expect.body $subtip $subprev &&
+	test_cmp expect.body actual.body
+
+ok 5 - git diff HEAD
+
+expecting success: 
+	echo >>sub/world &&
+	git diff HEAD >actual &&
+	sed -e "1,/^@@/d" actual >actual.body &&
+	expect_from_to >expect.body $subtip $subprev-dirty &&
+	test_cmp expect.body actual.body
+
+ok 6 - git diff HEAD with dirty submodule (work tree)
+
+expecting success: 
+	(
+		cd sub &&
+		git reset --hard &&
+		echo >>world &&
+		git add world
+	) &&
+	git diff HEAD >actual &&
+	sed -e "1,/^@@/d" actual >actual.body &&
+	expect_from_to >expect.body $subtip $subprev-dirty &&
+	test_cmp expect.body actual.body
+
+HEAD is now at 2dd69d6 submodule #2
+ok 7 - git diff HEAD with dirty submodule (index)
+
+expecting success: 
+	(
+		cd sub &&
+		git reset --hard &&
+		git clean -qfdx &&
+		>cruft
+	) &&
+	git diff HEAD >actual &&
+	sed -e "1,/^@@/d" actual >actual.body &&
+	expect_from_to >expect.body $subtip $subprev-dirty &&
+	test_cmp expect.body actual.body
+
+HEAD is now at 2dd69d6 submodule #2
+ok 8 - git diff HEAD with dirty submodule (untracked)
+
+expecting success: 
+	git commit -m "x" sub &&
+	echo >>sub/world &&
+	git diff HEAD >actual &&
+	sed -e "1,/^@@/d" actual >actual.body &&
+	expect_from_to >expect.body $subprev $subprev-dirty &&
+	test_cmp expect.body actual.body &&
+	git diff --ignore-submodules HEAD >actual2 &&
+	test_must_be_empty actual2 &&
+	git diff --ignore-submodules=untracked HEAD >actual3 &&
+	sed -e "1,/^@@/d" actual3 >actual3.body &&
+	expect_from_to >expect.body $subprev $subprev-dirty &&
+	test_cmp expect.body actual3.body &&
+	git diff --ignore-submodules=dirty HEAD >actual4 &&
+	test_must_be_empty actual4
+
+[master e6ee575] x
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 9 - git diff HEAD with dirty submodule (work tree, refs match)
+
+expecting success: 
+	git config diff.ignoreSubmodules dirty &&
+	git diff HEAD >actual &&
+	test_must_be_empty actual &&
+	git config --add -f .gitmodules submodule.subname.ignore none &&
+	git config --add -f .gitmodules submodule.subname.path sub &&
+	git diff HEAD >actual &&
+	sed -e "1,/^@@/d" actual >actual.body &&
+	expect_from_to >expect.body $subprev $subprev-dirty &&
+	test_cmp expect.body actual.body &&
+	git config -f .gitmodules submodule.subname.ignore all &&
+	git config -f .gitmodules submodule.subname.path sub &&
+	git diff HEAD >actual2 &&
+	test_must_be_empty actual2 &&
+	git config -f .gitmodules submodule.subname.ignore untracked &&
+	git diff HEAD >actual3 &&
+	sed -e "1,/^@@/d" actual3 >actual3.body &&
+	expect_from_to >expect.body $subprev $subprev-dirty &&
+	test_cmp expect.body actual3.body &&
+	git config -f .gitmodules submodule.subname.ignore dirty &&
+	git diff HEAD >actual4 &&
+	test_must_be_empty actual4 &&
+	git config submodule.subname.ignore none &&
+	git config submodule.subname.path sub &&
+	git diff HEAD >actual &&
+	sed -e "1,/^@@/d" actual >actual.body &&
+	expect_from_to >expect.body $subprev $subprev-dirty &&
+	test_cmp expect.body actual.body &&
+	git config --remove-section submodule.subname &&
+	git config --remove-section -f .gitmodules submodule.subname &&
+	git config --unset diff.ignoreSubmodules &&
+	rm .gitmodules
+
+ok 10 - git diff HEAD with dirty submodule (work tree, refs match) [.gitmodules]
+
+expecting success: 
+	(
+		cd sub &&
+		git reset --hard &&
+		echo >>world &&
+		git add world
+	) &&
+	git diff HEAD >actual &&
+	sed -e "1,/^@@/d" actual >actual.body &&
+	expect_from_to >expect.body $subprev $subprev-dirty &&
+	test_cmp expect.body actual.body
+
+HEAD is now at 2dd69d6 submodule #2
+ok 11 - git diff HEAD with dirty submodule (index, refs match)
+
+expecting success: 
+	(
+		cd sub &&
+		git reset --hard &&
+		git clean -qfdx &&
+		>cruft
+	) &&
+	git diff HEAD >actual &&
+	sed -e "1,/^@@/d" actual >actual.body &&
+	expect_from_to >expect.body $subprev $subprev-dirty &&
+	test_cmp expect.body actual.body &&
+	git diff --ignore-submodules=all HEAD >actual2 &&
+	test_must_be_empty actual2 &&
+	git diff --ignore-submodules=untracked HEAD >actual3 &&
+	test_must_be_empty actual3 &&
+	git diff --ignore-submodules=dirty HEAD >actual4 &&
+	test_must_be_empty actual4
+
+HEAD is now at 2dd69d6 submodule #2
+ok 12 - git diff HEAD with dirty submodule (untracked, refs match)
+
+expecting success: 
+	git config --add -f .gitmodules submodule.subname.ignore all &&
+	git config --add -f .gitmodules submodule.subname.path sub &&
+	git diff HEAD >actual2 &&
+	test_must_be_empty actual2 &&
+	git config -f .gitmodules submodule.subname.ignore untracked &&
+	git diff HEAD >actual3 &&
+	test_must_be_empty actual3 &&
+	git config -f .gitmodules submodule.subname.ignore dirty &&
+	git diff HEAD >actual4 &&
+	test_must_be_empty actual4 &&
+	git config submodule.subname.ignore none &&
+	git config submodule.subname.path sub &&
+	git diff HEAD >actual &&
+	sed -e "1,/^@@/d" actual >actual.body &&
+	expect_from_to >expect.body $subprev $subprev-dirty &&
+	test_cmp expect.body actual.body &&
+	git config --remove-section submodule.subname &&
+	git config --remove-section -f .gitmodules submodule.subname &&
+	rm .gitmodules
+
+ok 13 - git diff HEAD with dirty submodule (untracked, refs match) [.gitmodules]
+
+expecting success: 
+	git diff HEAD^..HEAD >actual &&
+	sed -e "1,/^@@/d" actual >actual.body &&
+	expect_from_to >expect.body $subtip $subprev &&
+	test_cmp expect.body actual.body &&
+	git diff --ignore-submodules=dirty HEAD^..HEAD >actual &&
+	sed -e "1,/^@@/d" actual >actual.body &&
+	expect_from_to >expect.body $subtip $subprev &&
+	test_cmp expect.body actual.body &&
+	git diff --ignore-submodules HEAD^..HEAD >actual &&
+	test_must_be_empty actual
+
+ok 14 - git diff between submodule commits
+
+expecting success: 
+	git diff HEAD^..HEAD >actual &&
+	sed -e "1,/^@@/d" actual >actual.body &&
+	expect_from_to >expect.body $subtip $subprev &&
+	test_cmp expect.body actual.body &&
+	git config --add -f .gitmodules submodule.subname.ignore dirty &&
+	git config --add -f .gitmodules submodule.subname.path sub &&
+	git diff HEAD^..HEAD >actual &&
+	sed -e "1,/^@@/d" actual >actual.body &&
+	expect_from_to >expect.body $subtip $subprev &&
+	test_cmp expect.body actual.body &&
+	git config -f .gitmodules submodule.subname.ignore all &&
+	git diff HEAD^..HEAD >actual &&
+	test_must_be_empty actual &&
+	git config submodule.subname.ignore dirty &&
+	git config submodule.subname.path sub &&
+	git diff  HEAD^..HEAD >actual &&
+	sed -e "1,/^@@/d" actual >actual.body &&
+	expect_from_to >expect.body $subtip $subprev &&
+	git config --remove-section submodule.subname &&
+	git config --remove-section -f .gitmodules submodule.subname &&
+	rm .gitmodules
+
+ok 15 - git diff between submodule commits [.gitmodules]
+
+expecting success: 
+	rm -rf sub/* sub/.git &&
+	git diff > actual.empty &&
+	test_must_be_empty actual.empty
+
+ok 16 - git diff (empty submodule dir)
+
+expecting success: 
+
+	# 39 efs
+	c=fffffffffffffffffffffffffffffffffffffff &&
+	(
+		echo "000000 $ZERO_OID 0	sub" &&
+		echo "160000 1$c 1	sub" &&
+		echo "160000 2$c 2	sub" &&
+		echo "160000 3$c 3	sub"
+	) | git update-index --index-info &&
+	echo >expect.nosub 'diff --cc sub
+index 2ffffff,3ffffff..0000000
+--- a/sub
++++ b/sub
+@@@ -1,1 -1,1 +1,1 @@@
+- Subproject commit 2fffffffffffffffffffffffffffffffffffffff
+ -Subproject commit 3fffffffffffffffffffffffffffffffffffffff
+++Subproject commit 0000000000000000000000000000000000000000' &&
+
+	hh=$(git rev-parse HEAD) &&
+	sed -e "s/$ZERO_OID/$hh/" expect.nosub >expect.withsub
+
+
+ok 17 - conflicted submodule setup
+
+expecting success: 
+	rm -fr sub && mkdir sub &&
+	git diff >actual &&
+	test_cmp expect.nosub actual
+
+ok 18 - combined (empty submodule)
+
+expecting success: 
+	rm -fr sub &&
+	git clone --no-checkout . sub &&
+	git diff >actual &&
+	test_cmp expect.withsub actual
+
+Cloning into 'sub'...
+done.
+ok 19 - combined (with submodule)
+
+# passed all 19 test(s)
+1..19
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t4030-diff-textconv.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4030-diff-textconv/.git/
+expecting success: 
+	printf "\\0\\n" >file &&
+	git add file &&
+	git commit -m one &&
+	printf "\\01\\n" >>file &&
+	git add file &&
+	git commit -m two
+
+[master (root-commit) d1b6572] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 file
+[master 6e19351] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ok 1 - setup binary file with history
+
+expecting success: 
+	git diff HEAD^ HEAD >diff &&
+	find_diff <diff >actual &&
+	test_cmp expect.binary actual
+
+ok 2 - file is considered binary by porcelain
+
+expecting success: 
+	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: 
+	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: 
+	git diff HEAD^ HEAD >diff &&
+	find_diff <diff >actual &&
+	test_cmp expect.text actual
+
+ok 5 - diff produces text
+
+expecting success: 
+	git show HEAD >diff &&
+	find_diff <diff >actual &&
+	test_cmp expect.text actual
+
+ok 6 - show commit produces text
+
+expecting success: 
+	git diff-tree -p HEAD^ HEAD >diff &&
+	find_diff <diff >actual &&
+	test_cmp expect.binary actual
+
+ok 7 - diff-tree produces binary
+
+expecting success: 
+	git log -1 -p >log &&
+	find_diff <log >actual &&
+	test_cmp expect.text actual
+
+ok 8 - log produces text
+
+expecting success: 
+	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: 
+	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: 
+	git show HEAD:file >actual &&
+	printf "\\0\\n\\01\\n" >expect &&
+	test_cmp expect actual
+
+ok 11 - show blob produces binary
+
+expecting success: 
+	git show --textconv HEAD:file >actual &&
+	printf "0\\n1\\n" >expect &&
+	test_cmp expect actual
+
+ok 12 - show --textconv blob produces text
+
+expecting success: 
+	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: 
+	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: 
+	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: 
+	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: 
+	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: 
+	echo file diff=fail >.gitattributes &&
+	git diff --stat HEAD^ HEAD >actual &&
+	test_i18ncmp 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: 
+	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" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
+	# test whether the filesystem supports symbolic links
+	ln -s x y && test -h y
+
+)
+prerequisite SYMLINKS ok
+[master 8f69985] typechange
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rewrite file (100%)
+ mode change 100644 => 120000
+ok 19 - textconv does not act on symlinks
+
+# passed all 19 test(s)
+1..19
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t4036-format-patch-signer-mime.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4036-format-patch-signer-mime/.git/
+expecting success: 
+
+	>F &&
+	git add F &&
+	git commit -m initial &&
+	echo new line >F &&
+
+	test_tick &&
+	git commit -m "This adds some lines to F" F
+
+
+[master (root-commit) 6f039c7] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 F
+[master 6aeca25] This adds some lines to F
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 1 - setup
+
+expecting success: 
+
+	git format-patch --stdout -1 >output &&
+	! grep Content-Type output
+
+
+ok 2 - format normally
+
+expecting success: 
+
+	git format-patch -s --stdout -1 >output &&
+	! grep Content-Type output
+
+
+ok 3 - format with signoff without funny signer name
+
+expecting success: 
+
+	GIT_COMMITTER_NAME="��� ����" \
+	git format-patch -s --stdout -1 >output &&
+	grep Content-Type output
+
+
+Content-Type: text/plain; charset=UTF-8
+ok 4 - format with non ASCII signer name
+
+expecting success: 
+
+	GIT_COMMITTER_NAME="��� ����" \
+	git format-patch -s --stdout -1 --attach >output &&
+	test $(grep -ci ^MIME-Version: output) = 1
+
+
+ok 5 - attach and signoff do not duplicate mime headers
+
+# passed all 5 test(s)
+1..5
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t4037-diff-r-t-dirs.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4037-diff-r-t-dirs/.git/
+expecting success: 
+	mkdir dc dr dt &&
+	>dc/1 &&
+	>dr/2 &&
+	>dt/3 &&
+	>fc &&
+	>fr &&
+	>ft &&
+	git add . &&
+	test_tick &&
+	git commit -m initial &&
+
+	rm -fr dt dr ft fr &&
+	mkdir da ft &&
+	for p in dc/1 da/4 dt ft/5 fc
+	do
+		echo hello >$p || exit
+	done &&
+	git add -u &&
+	git add . &&
+	test_tick &&
+	git commit -m second
+
+[master (root-commit) 26fc746] initial
+ Author: A U Thor <author@example.com>
+ 6 files changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 dc/1
+ create mode 100644 dr/2
+ create mode 100644 dt/3
+ create mode 100644 fc
+ create mode 100644 fr
+ create mode 100644 ft
+[master 25e238e] second
+ Author: A U Thor <author@example.com>
+ 9 files changed, 5 insertions(+)
+ create mode 100644 da/4
+ delete mode 100644 dr/2
+ create mode 100644 dt
+ delete mode 100644 dt/3
+ delete mode 100644 fr
+ delete mode 100644 ft
+ create mode 100644 ft/5
+ok 1 - setup
+
+expecting success: 
+	git diff-tree -r -t --name-status HEAD^ HEAD >actual &&
+	test_cmp expect actual
+
+ok 2 - verify
+
+# passed all 2 test(s)
+1..2
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t4018-diff-funcname.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4018-diff-funcname/.git/
+expecting success: 
+	# a non-trivial custom pattern
+	git config diff.custom1.funcname "!static
+!String
+[^ 	].*s.*" &&
+
+	# a custom pattern which matches to end of line
+	git config diff.custom2.funcname "......Beer\$" &&
+
+	# alternation in pattern
+	git config diff.custom3.funcname "Beer$" &&
+	git config diff.custom3.xfuncname "^[ 	]*((public|static).*)$" &&
+
+	# for regexp compilation tests
+	echo A >A.java &&
+	echo B >B.java
+
+ok 1 - setup
+
+expecting success: 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index \
+			A.java B.java 2>msg &&
+		test_i18ngrep ! fatal msg &&
+		test_i18ngrep ! error msg
+	
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+-A
++B
+ok 2 - builtin ada pattern compiles
+
+expecting success: 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index --word-diff \
+			A.java B.java 2>msg &&
+		test_i18ngrep ! fatal msg &&
+		test_i18ngrep ! error 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 wordRegex pattern compiles
+
+expecting success: 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index \
+			A.java B.java 2>msg &&
+		test_i18ngrep ! fatal msg &&
+		test_i18ngrep ! error 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 bibtex pattern compiles
+
+expecting success: 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index --word-diff \
+			A.java B.java 2>msg &&
+		test_i18ngrep ! fatal msg &&
+		test_i18ngrep ! error msg
+	
+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 bibtex wordRegex pattern compiles
+
+expecting success: 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index \
+			A.java B.java 2>msg &&
+		test_i18ngrep ! fatal msg &&
+		test_i18ngrep ! error 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 cpp pattern compiles
+
+expecting success: 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index --word-diff \
+			A.java B.java 2>msg &&
+		test_i18ngrep ! fatal msg &&
+		test_i18ngrep ! error 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 cpp wordRegex pattern compiles
+
+expecting success: 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index \
+			A.java B.java 2>msg &&
+		test_i18ngrep ! fatal msg &&
+		test_i18ngrep ! error msg
+	
+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 csharp pattern compiles
+
+expecting success: 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index --word-diff \
+			A.java B.java 2>msg &&
+		test_i18ngrep ! fatal msg &&
+		test_i18ngrep ! error 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 csharp wordRegex pattern compiles
+
+expecting success: 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index \
+			A.java B.java 2>msg &&
+		test_i18ngrep ! fatal msg &&
+		test_i18ngrep ! error 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 css pattern compiles
+
+expecting success: 
+		echo "*.java diff=$p" >.gitattributes &&
 		test_expect_code 1 git diff --no-index --word-diff \
 			A.java B.java 2>msg &&
 		test_i18ngrep ! fatal msg &&
@@ -101172,1967 +102065,640 @@
 1..97
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t4027-diff-submodule.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4027-diff-submodule/.git/
+*** t4039-diff-assume-unchanged.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4039-diff-assume-unchanged/.git/
 expecting success: 
-	test_tick &&
-	test_create_repo sub &&
-	(
-		cd sub &&
-		echo hello >world &&
-		git add world &&
-		git commit -m submodule
-	) &&
-
-	test_tick &&
-	echo frotz >nitfol &&
-	git add nitfol sub &&
-	git commit -m superproject &&
-
-	(
-		cd sub &&
-		echo goodbye >world &&
-		git add world &&
-		git commit -m "submodule #2"
-	) &&
-
-	set x $(
-		cd sub &&
-		git rev-list HEAD
-	) &&
-	echo ":160000 160000 $3 $ZERO_OID M	sub" >expect &&
-	subtip=$3 subprev=$2
+	echo zero > zero &&
+	git add zero &&
+	git commit -m zero &&
+	echo one > one &&
+	echo two > two &&
+	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"
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4027-diff-submodule/sub/.git/
-[master (root-commit) 4431e0b] submodule
+[master (root-commit) 7da2559] zero
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 world
-warning: adding embedded git repository: sub
-hint: You've added another git repository inside your current repository.
-hint: Clones of the outer repository will not contain the contents of
-hint: the embedded repository and will not know how to obtain it.
-hint: If you meant to add a submodule, use:
-hint: 
-hint: 	git submodule add <url> sub
-hint: 
-hint: If you added this path by mistake, you can remove it from the
-hint: index with:
-hint: 
-hint: 	git rm --cached sub
-hint: 
-hint: See "git help submodule" for more information.
-[master (root-commit) 5b035b6] superproject
+ create mode 100644 zero
+[master cee0498] onetwo
  Author: A U Thor <author@example.com>
  2 files changed, 2 insertions(+)
- create mode 100644 nitfol
- create mode 160000 sub
-[master 2dd69d6] submodule #2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ create mode 100644 one
+ create mode 100644 two
 ok 1 - setup
 
 expecting success: 
-	git diff --raw --abbrev=40 HEAD >actual &&
-	test_cmp expect actual
-
-ok 2 - git diff --raw HEAD
-
-expecting success: 
-	git diff-index --raw HEAD >actual.index &&
-	test_cmp expect actual.index
-
-ok 3 - git diff-index --raw HEAD
-
-expecting success: 
-	git diff-files --raw >actual.files &&
-	test_cmp expect actual.files
-
-ok 4 - git diff-files --raw
-
-expecting success: 
-	git diff HEAD >actual &&
-	sed -e "1,/^@@/d" actual >actual.body &&
-	expect_from_to >expect.body $subtip $subprev &&
-	test_cmp expect.body actual.body
-
-ok 5 - git diff HEAD
-
-expecting success: 
-	echo >>sub/world &&
-	git diff HEAD >actual &&
-	sed -e "1,/^@@/d" actual >actual.body &&
-	expect_from_to >expect.body $subtip $subprev-dirty &&
-	test_cmp expect.body actual.body
-
-ok 6 - git diff HEAD with dirty submodule (work tree)
-
-expecting success: 
-	(
-		cd sub &&
-		git reset --hard &&
-		echo >>world &&
-		git add world
-	) &&
-	git diff HEAD >actual &&
-	sed -e "1,/^@@/d" actual >actual.body &&
-	expect_from_to >expect.body $subtip $subprev-dirty &&
-	test_cmp expect.body actual.body
-
-HEAD is now at 2dd69d6 submodule #2
-ok 7 - git diff HEAD with dirty submodule (index)
-
-expecting success: 
-	(
-		cd sub &&
-		git reset --hard &&
-		git clean -qfdx &&
-		>cruft
-	) &&
-	git diff HEAD >actual &&
-	sed -e "1,/^@@/d" actual >actual.body &&
-	expect_from_to >expect.body $subtip $subprev-dirty &&
-	test_cmp expect.body actual.body
-
-HEAD is now at 2dd69d6 submodule #2
-ok 8 - git diff HEAD with dirty submodule (untracked)
-
-expecting success: 
-	git commit -m "x" sub &&
-	echo >>sub/world &&
-	git diff HEAD >actual &&
-	sed -e "1,/^@@/d" actual >actual.body &&
-	expect_from_to >expect.body $subprev $subprev-dirty &&
-	test_cmp expect.body actual.body &&
-	git diff --ignore-submodules HEAD >actual2 &&
-	test_must_be_empty actual2 &&
-	git diff --ignore-submodules=untracked HEAD >actual3 &&
-	sed -e "1,/^@@/d" actual3 >actual3.body &&
-	expect_from_to >expect.body $subprev $subprev-dirty &&
-	test_cmp expect.body actual3.body &&
-	git diff --ignore-submodules=dirty HEAD >actual4 &&
-	test_must_be_empty actual4
-
-[master e6ee575] x
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 9 - git diff HEAD with dirty submodule (work tree, refs match)
-
-expecting success: 
-	git config diff.ignoreSubmodules dirty &&
-	git diff HEAD >actual &&
-	test_must_be_empty actual &&
-	git config --add -f .gitmodules submodule.subname.ignore none &&
-	git config --add -f .gitmodules submodule.subname.path sub &&
-	git diff HEAD >actual &&
-	sed -e "1,/^@@/d" actual >actual.body &&
-	expect_from_to >expect.body $subprev $subprev-dirty &&
-	test_cmp expect.body actual.body &&
-	git config -f .gitmodules submodule.subname.ignore all &&
-	git config -f .gitmodules submodule.subname.path sub &&
-	git diff HEAD >actual2 &&
-	test_must_be_empty actual2 &&
-	git config -f .gitmodules submodule.subname.ignore untracked &&
-	git diff HEAD >actual3 &&
-	sed -e "1,/^@@/d" actual3 >actual3.body &&
-	expect_from_to >expect.body $subprev $subprev-dirty &&
-	test_cmp expect.body actual3.body &&
-	git config -f .gitmodules submodule.subname.ignore dirty &&
-	git diff HEAD >actual4 &&
-	test_must_be_empty actual4 &&
-	git config submodule.subname.ignore none &&
-	git config submodule.subname.path sub &&
-	git diff HEAD >actual &&
-	sed -e "1,/^@@/d" actual >actual.body &&
-	expect_from_to >expect.body $subprev $subprev-dirty &&
-	test_cmp expect.body actual.body &&
-	git config --remove-section submodule.subname &&
-	git config --remove-section -f .gitmodules submodule.subname &&
-	git config --unset diff.ignoreSubmodules &&
-	rm .gitmodules
-
-ok 10 - git diff HEAD with dirty submodule (work tree, refs match) [.gitmodules]
-
-expecting success: 
-	(
-		cd sub &&
-		git reset --hard &&
-		echo >>world &&
-		git add world
-	) &&
-	git diff HEAD >actual &&
-	sed -e "1,/^@@/d" actual >actual.body &&
-	expect_from_to >expect.body $subprev $subprev-dirty &&
-	test_cmp expect.body actual.body
-
-HEAD is now at 2dd69d6 submodule #2
-ok 11 - git diff HEAD with dirty submodule (index, refs match)
-
-expecting success: 
-	(
-		cd sub &&
-		git reset --hard &&
-		git clean -qfdx &&
-		>cruft
-	) &&
-	git diff HEAD >actual &&
-	sed -e "1,/^@@/d" actual >actual.body &&
-	expect_from_to >expect.body $subprev $subprev-dirty &&
-	test_cmp expect.body actual.body &&
-	git diff --ignore-submodules=all HEAD >actual2 &&
-	test_must_be_empty actual2 &&
-	git diff --ignore-submodules=untracked HEAD >actual3 &&
-	test_must_be_empty actual3 &&
-	git diff --ignore-submodules=dirty HEAD >actual4 &&
-	test_must_be_empty actual4
+	git diff-index HEAD^ -- one | grep -q 5626abf0f72e58d7a153368ba57db4c673c0e171
 
-HEAD is now at 2dd69d6 submodule #2
-ok 12 - git diff HEAD with dirty submodule (untracked, refs match)
+ok 2 - diff-index does not examine assume-unchanged entries
 
 expecting success: 
-	git config --add -f .gitmodules submodule.subname.ignore all &&
-	git config --add -f .gitmodules submodule.subname.path sub &&
-	git diff HEAD >actual2 &&
-	test_must_be_empty actual2 &&
-	git config -f .gitmodules submodule.subname.ignore untracked &&
-	git diff HEAD >actual3 &&
-	test_must_be_empty actual3 &&
-	git config -f .gitmodules submodule.subname.ignore dirty &&
-	git diff HEAD >actual4 &&
-	test_must_be_empty actual4 &&
-	git config submodule.subname.ignore none &&
-	git config submodule.subname.path sub &&
-	git diff HEAD >actual &&
-	sed -e "1,/^@@/d" actual >actual.body &&
-	expect_from_to >expect.body $subprev $subprev-dirty &&
-	test_cmp expect.body actual.body &&
-	git config --remove-section submodule.subname &&
-	git config --remove-section -f .gitmodules submodule.subname &&
-	rm .gitmodules
+	rm one &&
+	test -z "$(git diff-files -- one)"
 
-ok 13 - git diff HEAD with dirty submodule (untracked, refs match) [.gitmodules]
+ok 3 - diff-files does not examine assume-unchanged entries
 
 expecting success: 
-	git diff HEAD^..HEAD >actual &&
-	sed -e "1,/^@@/d" actual >actual.body &&
-	expect_from_to >expect.body $subtip $subprev &&
-	test_cmp expect.body actual.body &&
-	git diff --ignore-submodules=dirty HEAD^..HEAD >actual &&
-	sed -e "1,/^@@/d" actual >actual.body &&
-	expect_from_to >expect.body $subtip $subprev &&
-	test_cmp expect.body actual.body &&
-	git diff --ignore-submodules HEAD^..HEAD >actual &&
+	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
 
-ok 14 - git diff between submodule commits
-
-expecting success: 
-	git diff HEAD^..HEAD >actual &&
-	sed -e "1,/^@@/d" actual >actual.body &&
-	expect_from_to >expect.body $subtip $subprev &&
-	test_cmp expect.body actual.body &&
-	git config --add -f .gitmodules submodule.subname.ignore dirty &&
-	git config --add -f .gitmodules submodule.subname.path sub &&
-	git diff HEAD^..HEAD >actual &&
-	sed -e "1,/^@@/d" actual >actual.body &&
-	expect_from_to >expect.body $subtip $subprev &&
-	test_cmp expect.body actual.body &&
-	git config -f .gitmodules submodule.subname.ignore all &&
-	git diff HEAD^..HEAD >actual &&
-	test_must_be_empty actual &&
-	git config submodule.subname.ignore dirty &&
-	git config submodule.subname.path sub &&
-	git diff  HEAD^..HEAD >actual &&
-	sed -e "1,/^@@/d" actual >actual.body &&
-	expect_from_to >expect.body $subtip $subprev &&
-	git config --remove-section submodule.subname &&
-	git config --remove-section -f .gitmodules submodule.subname &&
-	rm .gitmodules
-
-ok 15 - git diff between submodule commits [.gitmodules]
-
-expecting success: 
-	rm -rf sub/* sub/.git &&
-	git diff > actual.empty &&
-	test_must_be_empty actual.empty
-
-ok 16 - git diff (empty submodule dir)
-
-expecting success: 
-
-	# 39 efs
-	c=fffffffffffffffffffffffffffffffffffffff &&
-	(
-		echo "000000 $ZERO_OID 0	sub" &&
-		echo "160000 1$c 1	sub" &&
-		echo "160000 2$c 2	sub" &&
-		echo "160000 3$c 3	sub"
-	) | git update-index --index-info &&
-	echo >expect.nosub 'diff --cc sub
-index 2ffffff,3ffffff..0000000
---- a/sub
-+++ b/sub
-@@@ -1,1 -1,1 +1,1 @@@
-- Subproject commit 2fffffffffffffffffffffffffffffffffffffff
- -Subproject commit 3fffffffffffffffffffffffffffffffffffffff
-++Subproject commit 0000000000000000000000000000000000000000' &&
-
-	hh=$(git rev-parse HEAD) &&
-	sed -e "s/$ZERO_OID/$hh/" expect.nosub >expect.withsub
-
-
-ok 17 - conflicted submodule setup
-
-expecting success: 
-	rm -fr sub && mkdir sub &&
-	git diff >actual &&
-	test_cmp expect.nosub actual
-
-ok 18 - combined (empty submodule)
-
-expecting success: 
-	rm -fr sub &&
-	git clone --no-checkout . sub &&
-	git diff >actual &&
-	test_cmp expect.withsub actual
-
-Cloning into 'sub'...
-done.
-ok 19 - combined (with submodule)
+[master 379f080] exec
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100755 exec
+ok 4 - find-copies-harder is not confused by mode bits
 
-# passed all 19 test(s)
-1..19
+# passed all 4 test(s)
+1..4
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t4030-diff-textconv.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4030-diff-textconv/.git/
+*** t4040-whitespace-status.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4040-whitespace-status/.git/
 expecting success: 
-	printf "\\0\\n" >file &&
-	git add file &&
-	git commit -m one &&
-	printf "\\01\\n" >>file &&
-	git add file &&
-	git commit -m two
+	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) 99d2865] one
+[master (root-commit) b80f2e3] initial
  Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 file
-[master 14f8524] two
+ 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, 0 insertions(+), 0 deletions(-)
-ok 1 - setup binary file with history
-
-expecting success: 
-	git diff HEAD^ HEAD >diff &&
-	find_diff <diff >actual &&
-	test_cmp expect.binary actual
-
-ok 2 - file is considered binary by porcelain
-
-expecting success: 
-	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: 
-	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: 
-	git diff HEAD^ HEAD >diff &&
-	find_diff <diff >actual &&
-	test_cmp expect.text actual
-
-ok 5 - diff produces text
-
-expecting success: 
-	git show HEAD >diff &&
-	find_diff <diff >actual &&
-	test_cmp expect.text actual
-
-ok 6 - show commit produces text
-
-expecting success: 
-	git diff-tree -p HEAD^ HEAD >diff &&
-	find_diff <diff >actual &&
-	test_cmp expect.binary actual
-
-ok 7 - diff-tree produces binary
-
-expecting success: 
-	git log -1 -p >log &&
-	find_diff <log >actual &&
-	test_cmp expect.text actual
-
-ok 8 - log produces text
-
-expecting success: 
-	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: 
-	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
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 1 - setup
 
 expecting success: 
-	git show HEAD:file >actual &&
-	printf "\\0\\n\\01\\n" >expect &&
-	test_cmp expect actual
+	test_must_fail git diff --exit-code HEAD^ HEAD &&
+	test_must_fail git diff-tree --exit-code HEAD^ HEAD
 
-ok 11 - show blob produces binary
+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: 
-	git show --textconv HEAD:file >actual &&
-	printf "0\\n1\\n" >expect &&
-	test_cmp expect actual
+	git diff -b --exit-code HEAD^ HEAD &&
+	git diff-tree -b -p --exit-code HEAD^ HEAD &&
+	git diff-tree -b --exit-code HEAD^ HEAD
 
-ok 12 - show --textconv blob produces text
+:040000 040000 13061aad4970f02b314943ec46981e9ef332cae2 ac592974c686387705f2617b895d6585cc0a0d46 M	a
+ok 3 - diff-tree -b --exit-code
 
 expecting success: 
-	git show --no-textconv HEAD:file >actual &&
-	printf "\\0\\n\\01\\n" >expect &&
-	test_cmp expect actual
+	test_must_fail git diff --cached --exit-code HEAD &&
+	test_must_fail git diff-index --cached --exit-code HEAD
 
-ok 13 - show --no-textconv blob produces binary
+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: 
-	echo one >expect &&
-	git log --root --format=%s -G0 >actual &&
-	test_cmp expect actual
+	git diff -b --cached --exit-code HEAD &&
+	git diff-index -b -p --cached --exit-code HEAD
 
-ok 14 - grep-diff (-G) operates on textconv data (add)
+ok 5 - diff-index -b -p --cached --exit-code
 
 expecting success: 
-	echo two >expect &&
-	git log --root --format=%s -G1 >actual &&
-	test_cmp expect actual
+	test_must_fail git diff --exit-code HEAD &&
+	test_must_fail git diff-index --exit-code HEAD
 
-ok 15 - grep-diff (-G) operates on textconv data (modification)
+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: 
-	echo one >expect &&
-	git log --root --format=%s -S0 >actual &&
-	test_cmp expect actual
+	git diff -b --exit-code HEAD &&
+	git diff-index -b -p --exit-code HEAD
 
-ok 16 - pickaxe (-S) operates on textconv data (add)
+ok 7 - diff-index -b -p --exit-code
 
 expecting success: 
-	echo two >expect &&
-	git log --root --format=%s -S1 >actual &&
-	test_cmp expect actual
+	test_must_fail git diff --exit-code &&
+	test_must_fail git diff-files --exit-code
 
-ok 17 - pickaxe (-S) operates on textconv data (modification)
+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: 
-	echo file diff=fail >.gitattributes &&
-	git diff --stat HEAD^ HEAD >actual &&
-	test_i18ncmp expect.stat actual &&
-
-	head -n1 <expect.stat >expect.line1 &&
-	head -n1 <actual >actual.line1 &&
-	test_cmp expect.line1 actual.line1
+	git diff -b --exit-code &&
+	git diff-files -b -p --exit-code
 
-ok 18 - diffstat does not run textconv
+ok 9 - diff-files -b -p --exit-code
 
 expecting success: 
-	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" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
-	# test whether the filesystem supports symbolic links
-	ln -s x y && test -h y
+	git reset --hard &&
+	rm a/d &&
+	echo x >>b/e &&
+	test_must_fail git diff-files --diff-filter=M --quiet
 
-)
-prerequisite SYMLINKS ok
-[master a3fe1c2] typechange
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rewrite file (100%)
- mode change 100644 => 120000
-ok 19 - textconv does not act on symlinks
+HEAD is now at 13a0478 second
+ok 10 - diff-files --diff-filter --quiet
 
-# passed all 19 test(s)
-1..19
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t4036-format-patch-signer-mime.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4036-format-patch-signer-mime/.git/
 expecting success: 
+	git commit -a -m "worktree state" &&
+	test_must_fail git diff-tree --diff-filter=M --quiet HEAD^ HEAD
 
-	>F &&
-	git add F &&
-	git commit -m initial &&
-	echo new line >F &&
-
-	test_tick &&
-	git commit -m "This adds some lines to F" F
-
-
-[master (root-commit) 8c6d862] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 F
-[master 81bee03] This adds some lines to F
+[master c0a31dc] worktree state
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 1 - setup
-
-expecting success: 
-
-	git format-patch --stdout -1 >output &&
-	! grep Content-Type output
-
-
-ok 2 - format normally
-
-expecting success: 
-
-	git format-patch -s --stdout -1 >output &&
-	! grep Content-Type output
-
-
-ok 3 - format with signoff without funny signer name
-
-expecting success: 
-
-	GIT_COMMITTER_NAME="��� ����" \
-	git format-patch -s --stdout -1 >output &&
-	grep Content-Type output
-
-
-Content-Type: text/plain; charset=UTF-8
-ok 4 - format with non ASCII signer name
-
-expecting success: 
-
-	GIT_COMMITTER_NAME="��� ����" \
-	git format-patch -s --stdout -1 --attach >output &&
-	test $(grep -ci ^MIME-Version: output) = 1
-
-
-ok 5 - attach and signoff do not duplicate mime headers
+ 2 files changed, 1 insertion(+), 1 deletion(-)
+ delete mode 100644 a/d
+ok 11 - diff-tree --diff-filter --quiet
 
-# passed all 5 test(s)
-1..5
+# passed all 11 test(s)
+1..11
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t4037-diff-r-t-dirs.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4037-diff-r-t-dirs/.git/
+*** t4035-diff-quiet.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4035-diff-quiet/.git/
 expecting success: 
-	mkdir dc dr dt &&
-	>dc/1 &&
-	>dr/2 &&
-	>dt/3 &&
-	>fc &&
-	>fr &&
-	>ft &&
+	echo 1 >a &&
 	git add . &&
-	test_tick &&
-	git commit -m initial &&
-
-	rm -fr dt dr ft fr &&
-	mkdir da ft &&
-	for p in dc/1 da/4 dt ft/5 fc
-	do
-		echo hello >$p || exit
-	done &&
-	git add -u &&
+	git commit -m first &&
+	echo 2 >b &&
 	git add . &&
-	test_tick &&
-	git commit -m second
-
-[master (root-commit) 26fc746] initial
- Author: A U Thor <author@example.com>
- 6 files changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 dc/1
- create mode 100644 dr/2
- create mode 100644 dt/3
- create mode 100644 fc
- create mode 100644 fr
- create mode 100644 ft
-[master 25e238e] second
- Author: A U Thor <author@example.com>
- 9 files changed, 5 insertions(+)
- create mode 100644 da/4
- delete mode 100644 dr/2
- create mode 100644 dt
- delete mode 100644 dt/3
- delete mode 100644 fr
- delete mode 100644 ft
- create mode 100644 ft/5
-ok 1 - setup
-
-expecting success: 
-	git diff-tree -r -t --name-status HEAD^ HEAD >actual &&
-	test_cmp expect actual
-
-ok 2 - verify
-
-# passed all 2 test(s)
-1..2
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t3600-rm.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3600-rm/.git/
-expecting success: touch -- foo bar baz 'space embedded' -q &&
-     git add -- foo bar baz 'space embedded' -q &&
-     git commit -m 'add normal files'
-[master (root-commit) 6230a84] add normal files
- Author: A U Thor <author@example.com>
- 5 files changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 -q
- create mode 100644 bar
- create mode 100644 baz
- create mode 100644 foo
- create mode 100644 space embedded
-ok 1 - Initialize test directory
-
-checking prerequisite: FUNNYNAMES
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
-	test_have_prereq !MINGW &&
-	touch -- \
-		"FUNNYNAMES tab	embedded" \
-		"FUNNYNAMES \"quote embedded\"" \
-		"FUNNYNAMES newline
-embedded" 2>/dev/null &&
-	rm -- \
-		"FUNNYNAMES tab	embedded" \
-		"FUNNYNAMES \"quote embedded\"" \
-		"FUNNYNAMES newline
-embedded" 2>/dev/null
-
-)
-prerequisite FUNNYNAMES ok
-expecting success: 
-     touch -- 'tab	embedded' 'newline
-embedded' &&
-     git add -- 'tab	embedded' 'newline
-embedded' &&
-     git commit -m 'add files with tabs and newlines'
-
-[master 294430a] add files with tabs and newlines
- Author: A U Thor <author@example.com>
- 2 files changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 "newline\nembedded"
- create mode 100644 "tab\tembedded"
-ok 2 - add files with funny names
-
-expecting success: [ -f foo ] && git ls-files --error-unmatch foo
-foo
-ok 3 - Pre-check that foo exists and is in index before git rm foo
-
-expecting success: git rm --cached foo
-rm 'foo'
-ok 4 - Test that git rm foo succeeds
-
-expecting success: echo content >foo &&
-     git add foo &&
-     git rm --cached foo
-rm 'foo'
-ok 5 - Test that git rm --cached foo succeeds if the index matches the file
+	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
+	)
 
-expecting success: echo content >foo &&
-     git add foo &&
-     git commit -m foo &&
-     echo "other content" >foo &&
-     git rm --cached foo
-[master d24a4f8] foo
+[master (root-commit) 2be9988] first
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-rm 'foo'
-ok 6 - Test that git rm --cached foo succeeds if the index matches the file
-
-expecting success: 
-     echo content >foo &&
-     git add foo &&
-     git commit -m foo --allow-empty &&
-     echo "other content" >foo &&
-     git add foo &&
-     echo "yet another content" >foo &&
-     test_must_fail git rm --cached foo
-
-[master 93b8107] foo
- Author: A U Thor <author@example.com>
-error: the following file has staged content different from both the
-file and the HEAD:
-    foo
-(use -f to force removal)
-ok 7 - Test that git rm --cached foo fails if the index matches neither the file nor HEAD
-
-expecting success: echo content >foo &&
-     git add foo &&
-     git commit -m foo --allow-empty &&
-     echo "other content" >foo &&
-     git add foo &&
-     echo "yet another content" >foo &&
-     git rm --cached -f foo
-[master 4e70155] foo
- Author: A U Thor <author@example.com>
-rm 'foo'
-ok 8 - Test that git rm --cached -f foo works in case where --cached only did not
-
-expecting success: [ -f foo ] && test_must_fail git ls-files --error-unmatch foo
-error: pathspec 'foo' did not match any file(s) known to git
-Did you forget to 'git add'?
-ok 9 - Post-check that foo exists but is not in index after git rm foo
-
-expecting success: [ -f bar ] && git ls-files --error-unmatch bar
-bar
-ok 10 - Pre-check that bar exists and is in index before "git rm bar"
-
-expecting success: git rm bar
-rm 'bar'
-ok 11 - Test that "git rm bar" succeeds
-
-expecting success: ! [ -f bar ] && test_must_fail git ls-files --error-unmatch bar
-error: pathspec 'bar' did not match any file(s) known to git
-Did you forget to 'git add'?
-ok 12 - Post-check that bar does not exist and is not in index after "git rm -f bar"
-
-expecting success: git rm -- -q
-rm '-q'
-ok 13 - Test that "git rm -- -q" succeeds (remove a file that looks like an option)
-
-expecting success: git rm -f 'space embedded' 'tab	embedded' 'newline
-embedded'
-rm 'newline
-embedded'
-rm 'space embedded'
-rm 'tab	embedded'
-ok 14 - Test that "git rm -f" succeeds with embedded space, tab, or newline characters.
-
-checking prerequisite: SANITY
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
-	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: 
-	test_when_finished "chmod 775 ." &&
-	chmod a-w . &&
-	test_must_fail git rm -f baz
-
-fatal: git rm: 'baz': Permission denied
-rm 'baz'
-ok 15 - Test that "git rm -f" fails if its rm fails
-
-expecting success: git ls-files --error-unmatch baz
-baz
-ok 16 - When the rm in "git rm -f" fails, it should not remove the file from the index
-
-expecting success: 
-	git rm --ignore-unmatch nonexistent
-
-ok 17 - Remove nonexistent file with --ignore-unmatch
-
-expecting success: 
-	echo frotz >test-file &&
-	git add test-file &&
-	git commit -m "add file for rm test" &&
-	git rm test-file >rm-output &&
-	test $(grep "^rm " rm-output | wc -l) = 1 &&
-	rm -f test-file rm-output &&
-	git commit -m "remove file from rm test"
-
-[master bf745e7] add file for rm test
- Author: A U Thor <author@example.com>
- 7 files changed, 1 insertion(+), 1 deletion(-)
- delete mode 100644 -q
- delete mode 100644 bar
- delete mode 100644 foo
- delete mode 100644 "newline\nembedded"
- delete mode 100644 space embedded
- delete mode 100644 "tab\tembedded"
- create mode 100644 test-file
-[master 531174e] remove file from rm test
- Author: A U Thor <author@example.com>
- 1 file changed, 1 deletion(-)
- delete mode 100644 test-file
-ok 18 - "rm" command printed
-
-expecting success: 
-	echo frotz >test-file &&
-	git add test-file &&
-	git commit -m "add file for rm --quiet test" &&
-	git rm --quiet test-file >rm-output &&
-	test_must_be_empty rm-output &&
-	rm -f test-file rm-output &&
-	git commit -m "remove file from rm --quiet test"
-
-[master 6d351c3] add file for rm --quiet test
+ create mode 100644 a
+[master 3b6f039] second
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 test-file
-[master ab86df4] remove file from rm --quiet test
+ create mode 100644 b
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4035-diff-quiet/test-outside/repo/.git/
+[master (root-commit) 7303d3c] 1
  Author: A U Thor <author@example.com>
- 1 file changed, 1 deletion(-)
- delete mode 100644 test-file
-ok 19 - "rm" command suppressed with --quiet
+ 1 file changed, 1 insertion(+)
+ create mode 100644 a
+ok 1 - setup
 
 expecting success: 
-	git add foo baz &&
-	git ls-files --error-unmatch foo baz
+	test_expect_code 1 git diff-tree --quiet HEAD^ HEAD >cnt &&
+	test_line_count = 0 cnt
 
-baz
-foo
-ok 20 - Re-add foo and baz
+ok 2 - git diff-tree HEAD^ HEAD
 
 expecting success: 
-	echo >>foo &&
-	test_must_fail git rm foo baz &&
-	test -f foo &&
-	test -f baz &&
-	git ls-files --error-unmatch foo baz
+	test_expect_code 0 git diff-tree --quiet HEAD^ HEAD -- a >cnt &&
+	test_line_count = 0 cnt
 
-error: the following file has staged content different from both the
-file and the HEAD:
-    foo
-(use -f to force removal)
-baz
-foo
-ok 21 - Modify foo -- rm should refuse
+ok 3 - git diff-tree HEAD^ HEAD -- a
 
 expecting success: 
-	git rm -f foo baz &&
-	test ! -f foo &&
-	test ! -f baz &&
-	test_must_fail git ls-files --error-unmatch foo &&
-	test_must_fail git ls-files --error-unmatch bar
+	test_expect_code 1 git diff-tree --quiet HEAD^ HEAD -- b >cnt &&
+	test_line_count = 0 cnt
 
-rm 'baz'
-rm 'foo'
-error: pathspec 'foo' did not match any file(s) known to git
-Did you forget to 'git add'?
-error: pathspec 'bar' did not match any file(s) known to git
-Did you forget to 'git add'?
-ok 22 - Modified foo -- rm -f should work
+ok 4 - git diff-tree HEAD^ HEAD -- b
 
 expecting success: 
-	echo frotz >foo &&
-	git checkout HEAD -- baz &&
-	git add foo baz &&
-	git ls-files --error-unmatch foo baz
+	echo $(git rev-parse HEAD) |
+	test_expect_code 1 git diff-tree --quiet --stdin >cnt &&
+	test_line_count = 1 cnt
 
-baz
-foo
-ok 23 - Re-add foo and baz for HEAD tests
+ok 5 - echo HEAD | git diff-tree --stdin
 
 expecting success: 
-	test_must_fail git rm foo baz &&
-	test -f foo &&
-	test -f baz &&
-	git ls-files --error-unmatch foo baz
+	test_expect_code 0 git diff-tree --quiet HEAD HEAD >cnt &&
+	test_line_count = 0 cnt
 
-error: the following file has changes staged in the index:
-    foo
-(use --cached to keep the file, or -f to force removal)
-baz
-foo
-ok 24 - foo is different in index from HEAD -- rm should refuse
+ok 6 - git diff-tree HEAD HEAD
 
 expecting success: 
-	git rm -f foo baz &&
-	test ! -f foo &&
-	test ! -f baz &&
-	test_must_fail git ls-files --error-unmatch foo &&
-	test_must_fail git ls-files --error-unmatch baz
+	test_expect_code 0 git diff-files --quiet >cnt &&
+	test_line_count = 0 cnt
 
-rm 'baz'
-rm 'foo'
-error: pathspec 'foo' did not match any file(s) known to git
-Did you forget to 'git add'?
-error: pathspec 'baz' did not match any file(s) known to git
-Did you forget to 'git add'?
-ok 25 - but with -f it should work.
+ok 7 - git diff-files
 
 expecting success: 
-	>empty &&
-	git add empty &&
-	echo content >empty &&
-	test_must_fail git rm --cached empty
+	test_expect_code 0 git diff-index --quiet --cached HEAD >cnt &&
+	test_line_count = 0 cnt
 
-error: the following file has staged content different from both the
-file and the HEAD:
-    empty
-(use -f to force removal)
-ok 26 - refuse to remove cached empty file with modifications
+ok 8 - git diff-index --cached HEAD
 
 expecting success: 
-	echo content >intent-to-add &&
-	git add -N intent-to-add &&
-	git rm --cached intent-to-add
+	test_expect_code 1 git diff-index --quiet --cached HEAD^ >cnt &&
+	test_line_count = 0 cnt
 
-rm 'intent-to-add'
-ok 27 - remove intent-to-add file without --force
+ok 9 - git diff-index --cached HEAD^
 
 expecting success: 
-	mkdir -p frotz &&
-	echo qfwfq >frotz/nitfol &&
-	git add frotz &&
-	git commit -m "subdir test"
+	echo text >>b &&
+	echo 3 >c &&
+	git add . &&
+	test_expect_code 1 git diff-index --quiet --cached HEAD^ >cnt &&
+	test_line_count = 0 cnt
 
-[master b0dc8ca] subdir test
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+)
- rename baz => empty (100%)
- create mode 100644 frotz/nitfol
-ok 28 - Recursive test setup
+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.
+ok 10 - git diff-index --cached HEAD^
 
 expecting success: 
-	test_must_fail git rm frotz &&
-	test -d frotz &&
-	test -f frotz/nitfol
+	git commit -m "text in b" &&
+	test_expect_code 1 git diff-tree --quiet -Stext HEAD^ HEAD -- b >cnt &&
+	test_line_count = 0 cnt
 
-fatal: not removing 'frotz' recursively without -r
-ok 29 - Recursive without -r fails
+[master ab8a856] 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: 
-	echo qfwfq >>frotz/nitfol &&
-	test_must_fail git rm -r frotz &&
-	test -d frotz &&
-	test -f frotz/nitfol
+	test_expect_code 0 git diff-tree --quiet -Snot-found HEAD^ HEAD -- b >cnt &&
+	test_line_count = 0 cnt
 
-error: the following file has local modifications:
-    frotz/nitfol
-(use --cached to keep the file, or -f to force removal)
-ok 30 - Recursive with -r but dirty
+ok 12 - git diff-tree -Snot-found HEAD^ HEAD -- b
 
 expecting success: 
-	git rm -f -r frotz &&
-	! test -f frotz/nitfol &&
-	! test -d frotz
+	echo 3 >>c &&
+	test_expect_code 1 git diff-files --quiet >cnt &&
+	test_line_count = 0 cnt
 
-rm 'frotz/nitfol'
-ok 31 - Recursive with -r -f
+ok 13 - git diff-files
 
 expecting success: 
-	test_must_fail git rm nonexistent
+	git update-index c &&
+	test_expect_code 1 git diff-index --quiet --cached HEAD >cnt &&
+	test_line_count = 0 cnt
 
-fatal: pathspec 'nonexistent' did not match any files
-ok 32 - Remove nonexistent file returns nonzero exit status
+ok 14 - git diff-index --cached HEAD
 
 expecting success: 
-	mkdir repo &&
-	(cd repo &&
-	 git init &&
-	 echo something >somefile &&
-	 git add somefile &&
-	 git commit -m "add a file" &&
-	 (cd .. &&
-	  git --git-dir=repo/.git --work-tree=repo rm somefile) &&
-	test_must_fail git ls-files --error-unmatch somefile)
+	(
+		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
+	)
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3600-rm/repo/.git/
-[master (root-commit) 82953c5] add a file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 somefile
-rm 'somefile'
-error: pathspec 'somefile' did not match any file(s) known to git
-Did you forget to 'git add'?
-ok 33 - Call "rm" from outside the work tree
+ok 15 - git diff, one file outside repo
 
 expecting success: 
+	(
+		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
+	)
 
-	git reset --hard &&
-	test-tool chmtime -86400 frotz/nitfol &&
-	git rm frotz/nitfol &&
-	test ! -f frotz/nitfol
-
-
-HEAD is now at b0dc8ca subdir test
-rm 'frotz/nitfol'
-ok 34 - refresh index before checking if it is up-to-date
+ok 16 - git diff, both files outside repo
 
 expecting success: 
-	git reset -q --hard &&
-	test_when_finished "rm -f .git/index.lock && git reset -q --hard" &&
-	i=0 &&
-	while test $i -lt 12000
-	do
-	    echo "100644 1234567890123456789012345678901234567890 0	some-file-$i"
-	    i=$(( $i + 1 ))
-	done | git update-index --index-info &&
-	git rm -n "some-file-*" | : &&
-	test_path_is_missing .git/index.lock
+	(
+		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 35 - choking "git rm" should not let it die with cruft
+ok 17 - git diff --ignore-space-at-eol, one file outside repo
 
 expecting success: 
-	mkdir -p dir/subdir/subsubdir &&
-	echo content >dir/subdir/subsubdir/file &&
-	git add dir/subdir/subsubdir/file &&
-	git rm -f dir/subdir/subsubdir/file &&
-	! test -d dir
+	(
+		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
+	)
 
-rm 'dir/subdir/subsubdir/file'
-ok 36 - rm removes subdirectories recursively
+ok 18 - git diff --ignore-space-at-eol, both files outside repo
 
 expecting success: 
-	mkdir submod &&
-	git update-index --add --cacheinfo 160000 $(git rev-parse HEAD) submod &&
-	git config -f .gitmodules submodule.sub.url ./. &&
-	git config -f .gitmodules submodule.sub.path submod &&
-	git submodule init &&
-	git add .gitmodules &&
-	git commit -m "add submodule" &&
-	git rm submod &&
-	test ! -e submod &&
-	git status -s -uno --ignore-submodules=none >actual &&
-	test_cmp expect actual &&
-	test_must_fail git config -f .gitmodules submodule.sub.url &&
-	test_must_fail git config -f .gitmodules submodule.sub.path
+	(
+		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
+	)
 
-warning: could not look up configuration 'remote.origin.url'. Assuming this repository is its own authoritative upstream.
-Submodule 'sub' (/build/git-2.20.1/t/trash directory.t3600-rm/.) registered for path 'submod'
-[master a223e81] add submodule
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 submod
-rm 'submod'
-ok 37 - rm removes empty submodules from work tree
+ok 19 - git diff --ignore-all-space, one file outside repo
 
 expecting success: 
-	git reset --hard &&
-	git submodule update &&
-	rm -rf submod &&
-	git rm submod &&
-	git status -s -uno --ignore-submodules=none >actual &&
-	test_cmp expect actual &&
-	test_must_fail git config -f .gitmodules submodule.sub.url &&
-	test_must_fail git config -f .gitmodules submodule.sub.path
+	(
+		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
+	)
 
-HEAD is now at a223e81 add submodule
-Cloning into '/build/git-2.20.1/t/trash directory.t3600-rm/submod'...
-done.
-Submodule path 'submod': checked out 'b0dc8ca8718108cd6b20ffbba48535433c3a0f15'
-rm 'submod'
-ok 38 - rm removes removed submodule from index and .gitmodules
+ok 20 - git diff --ignore-all-space, both files outside repo
 
 expecting success: 
-	git reset --hard &&
-	git submodule update &&
-	git rm submod &&
-	test ! -d submod &&
-	git status -s -uno --ignore-submodules=none >actual &&
-	test_cmp expect actual &&
-	test_must_fail git config -f .gitmodules submodule.sub.url &&
-	test_must_fail git config -f .gitmodules submodule.sub.path
+	test-tool chmtime +10 a &&
+	echo modified >>b &&
+	test_expect_code 1 git diff --quiet
 
-HEAD is now at a223e81 add submodule
-Submodule path 'submod': checked out 'b0dc8ca8718108cd6b20ffbba48535433c3a0f15'
-rm 'submod'
-ok 39 - rm removes work tree of unmodified submodules
+ok 21 - git diff --quiet ignores stat-change only entries
 
 expecting success: 
-	git reset --hard &&
-	git submodule update &&
-	git rm submod/ &&
-	test ! -d submod &&
-	git status -s -uno --ignore-submodules=none >actual &&
-	test_cmp expect actual
-
-HEAD is now at a223e81 add submodule
-Submodule path 'submod': checked out 'b0dc8ca8718108cd6b20ffbba48535433c3a0f15'
-rm 'submod'
-ok 40 - rm removes a submodule with a trailing /
+	echo "crlf.txt text=auto" >.gitattributes &&
+	printf "Hello\r\nWorld\r\n" >crlf.txt &&
+	git add .gitattributes crlf.txt &&
 
-expecting success: 
-	test_must_fail git rm empty/
+	printf "Hello\r\nWorld\n" >crlf.txt &&
+	git diff --quiet crlf.txt
 
-fatal: pathspec 'empty/' did not match any files
-ok 41 - rm fails when given a file with a trailing /
+warning: CRLF will be replaced by LF in crlf.txt.
+The file will have its original line endings in your working directory
+warning: CRLF will be replaced by LF in crlf.txt.
+The file will have its original line endings in your working directory
+ok 22 - git diff --quiet on a path that need conversion
 
+# passed all 22 test(s)
+1..22
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t4032-diff-inter-hunk-context.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4032-diff-inter-hunk-context/.git/
 expecting success: 
-	git rm -r frotz/
-
-rm 'frotz/nitfol'
-ok 42 - rm succeeds when given a directory with a trailing /
+		test 2 = 2
+	
+ok 1 - diff -U0, 1 common line: count hunks (2)
 
 expecting success: 
-	git reset --hard &&
-	git submodule update &&
-	git -C submod checkout HEAD^ &&
-	test_must_fail git rm submod &&
-	test -d submod &&
-	test -f submod/.git &&
-	git status -s -uno --ignore-submodules=none >actual &&
-	test_cmp expect.modified actual &&
-	git rm -f submod &&
-	test ! -d submod &&
-	git status -s -uno --ignore-submodules=none >actual &&
-	test_cmp expect actual &&
-	test_must_fail git config -f .gitmodules submodule.sub.url &&
-	test_must_fail git config -f .gitmodules submodule.sub.path
-
-HEAD is now at a223e81 add submodule
-Submodule path 'submod': checked out 'b0dc8ca8718108cd6b20ffbba48535433c3a0f15'
-Previous HEAD position was b0dc8ca subdir test
-HEAD is now at ab86df4 remove file from rm --quiet test
-error: the following file has local modifications:
-    submod
-(use --cached to keep the file, or -f to force removal)
-rm 'submod'
-ok 43 - rm of a populated submodule with different HEAD fails unless forced
+		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: 
-	git reset --hard &&
-	git submodule update &&
-	git rm --cached submod &&
-	test -d submod &&
-	test -f submod/.git &&
-	git status -s -uno >actual &&
-	test_cmp expect.cached actual &&
-	git config -f .gitmodules submodule.sub.url &&
-	git config -f .gitmodules submodule.sub.path
-
-HEAD is now at a223e81 add submodule
-Submodule path 'submod': checked out 'b0dc8ca8718108cd6b20ffbba48535433c3a0f15'
-rm 'submod'
-./.
-submod
-ok 44 - rm --cached leaves work tree of populated submodules and .gitmodules alone
+		test 2 = 2
+	
+ok 3 - diff -U0 --inter-hunk-context=0, 1 common line: count hunks (2)
 
 expecting success: 
-	git reset --hard &&
-	git submodule update &&
-	git rm -n submod &&
-	test -f submod/.git &&
-	git diff-index --exit-code HEAD
-
-HEAD is now at a223e81 add submodule
-rm 'submod'
-ok 45 - rm --dry-run does not touch the submodule or .gitmodules
+		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: 
-	git reset --hard &&
-	git submodule update &&
-	git rm .gitmodules &&
-	git rm submod >actual 2>actual.err &&
-	test_must_be_empty actual.err &&
-	! test -d submod &&
-	! test -f submod/.git &&
-	git status -s -uno >actual &&
-	test_cmp expect.both_deleted actual
-
-HEAD is now at a223e81 add submodule
-rm '.gitmodules'
-ok 46 - rm does not complain when no .gitmodules file is found
+		test 1 = 1
+	
+ok 5 - diff -U0 --inter-hunk-context=1, 1 common line: count hunks (1)
 
 expecting success: 
-	git reset --hard &&
-	git submodule update &&
-	git config -f .gitmodules foo.bar true &&
-	test_must_fail git rm submod >actual 2>actual.err &&
-	test -s actual.err &&
-	test -d submod &&
-	test -f submod/.git &&
-	git diff-files --quiet -- submod &&
-	git add .gitmodules &&
-	git rm submod >actual 2>actual.err &&
-	test_must_be_empty actual.err &&
-	! test -d submod &&
-	! test -f submod/.git &&
-	git status -s -uno >actual &&
-	test_cmp expect actual
-
-HEAD is now at a223e81 add submodule
-Submodule path 'submod': checked out 'b0dc8ca8718108cd6b20ffbba48535433c3a0f15'
-ok 47 - rm will error out on a modified .gitmodules file unless staged
+		git diff -U0 --inter-hunk-context=1 f1 | grep -v '^index ' >actual &&
+		test_cmp expected.f1.0.1 actual
+	
+ok 6 - diff -U0 --inter-hunk-context=1, 1 common line: check output
 
 expecting success: 
-	git reset --hard &&
-	git submodule update &&
-	git config -f .gitmodules --remove-section submodule.sub &&
-	git add .gitmodules &&
-	echo "warning: Could not find section in .gitmodules where path=submod" >expect.err &&
-	git rm submod >actual 2>actual.err &&
-	test_i18ncmp expect.err actual.err &&
-	! test -d submod &&
-	! test -f submod/.git &&
-	git status -s -uno >actual &&
-	test_cmp expect actual
-
-HEAD is now at a223e81 add submodule
-Submodule path 'submod': checked out 'b0dc8ca8718108cd6b20ffbba48535433c3a0f15'
-ok 48 - rm issues a warning when section is not found in .gitmodules
+		test 1 = 1
+	
+ok 7 - diff -U0 --inter-hunk-context=2, 1 common line: count hunks (1)
 
 expecting success: 
-	git reset --hard &&
-	git submodule update &&
-	echo X >submod/empty &&
-	test_must_fail git rm submod &&
-	test -d submod &&
-	test -f submod/.git &&
-	git status -s -uno --ignore-submodules=none >actual &&
-	test_cmp expect.modified_inside actual &&
-	git rm -f submod &&
-	test ! -d submod &&
-	git status -s -uno --ignore-submodules=none >actual &&
-	test_cmp expect actual
-
-HEAD is now at a223e81 add submodule
-Submodule path 'submod': checked out 'b0dc8ca8718108cd6b20ffbba48535433c3a0f15'
-error: the following file has local modifications:
-    submod
-(use --cached to keep the file, or -f to force removal)
-rm 'submod'
-ok 49 - rm of a populated submodule with modifications fails unless forced
+		git diff -U0 --inter-hunk-context=2 f1 | grep -v '^index ' >actual &&
+		test_cmp expected.f1.0.1 actual
+	
+ok 8 - diff -U0 --inter-hunk-context=2, 1 common line: check output
 
 expecting success: 
-	git reset --hard &&
-	git submodule update &&
-	echo X >submod/untracked &&
-	test_must_fail git rm submod &&
-	test -d submod &&
-	test -f submod/.git &&
-	git status -s -uno --ignore-submodules=none >actual &&
-	test_cmp expect.modified_untracked actual &&
-	git rm -f submod &&
-	test ! -d submod &&
-	git status -s -uno --ignore-submodules=none >actual &&
-	test_cmp expect actual
-
-HEAD is now at a223e81 add submodule
-Submodule path 'submod': checked out 'b0dc8ca8718108cd6b20ffbba48535433c3a0f15'
-error: the following file has local modifications:
-    submod
-(use --cached to keep the file, or -f to force removal)
-rm 'submod'
-ok 50 - rm of a populated submodule with untracked files fails unless forced
+		test 1 = 1
+	
+ok 9 - diff -U1, 1 common line: count hunks (1)
 
 expecting success: 
-	git reset --hard &&
-	git submodule update &&
-	git checkout -b branch1 &&
-	echo 1 >nitfol &&
-	git add nitfol &&
-	git commit -m "added nitfol 1" &&
-	git checkout -b branch2 master &&
-	echo 2 >nitfol &&
-	git add nitfol &&
-	git commit -m "added nitfol 2" &&
-	git checkout -b conflict1 master &&
-	git -C submod fetch &&
-	git -C submod checkout branch1 &&
-	git add submod &&
-	git commit -m "submod 1" &&
-	git checkout -b conflict2 master &&
-	git -C submod checkout branch2 &&
-	git add submod &&
-	git commit -m "submod 2"
-
-HEAD is now at a223e81 add submodule
-Submodule path 'submod': checked out 'b0dc8ca8718108cd6b20ffbba48535433c3a0f15'
-Switched to a new branch 'branch1'
-[branch1 2722885] added nitfol 1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 nitfol
-Switched to a new branch 'branch2'
-[branch2 95fe0aa] added nitfol 2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 nitfol
-Switched to a new branch 'conflict1'
-From /build/git-2.20.1/t/trash directory.t3600-rm/.
- * [new branch]      branch1    -> origin/branch1
- * [new branch]      branch2    -> origin/branch2
- * [new branch]      conflict1  -> origin/conflict1
-Previous HEAD position was b0dc8ca subdir test
-Switched to a new branch 'branch1'
-Branch 'branch1' set up to track remote branch 'branch1' from 'origin'.
-[conflict1 3b6eeb2] submod 1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'conflict2'
-M	submod
-Switched to a new branch 'branch2'
-Branch 'branch2' set up to track remote branch 'branch2' from 'origin'.
-[conflict2 b29b5ae] submod 2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 51 - setup submodule conflict
+		test 2 = 2
+	
+ok 10 - diff -U0, 2 common lines: count hunks (2)
 
 expecting success: 
-	git checkout conflict1 &&
-	git reset --hard &&
-	git submodule update &&
-	test_must_fail git merge conflict2 &&
-	git rm submod &&
-	test ! -d submod &&
-	git status -s -uno --ignore-submodules=none >actual &&
-	test_cmp expect actual
-
-Switched to branch 'conflict1'
-M	submod
-HEAD is now at 3b6eeb2 submod 1
-Submodule path 'submod': checked out '2722885afbcbffbaf4e5d048de68730b723bbf06'
-Merging:
-3b6eeb2 submod 1
-virtual conflict2
-found 1 common ancestor:
-a223e81 add submodule
-Failed to merge submodule submod (merge following commits not found)
-Auto-merging submod
-CONFLICT (submodule): Merge conflict in submod
-Automatic merge failed; fix conflicts and then commit the result.
-submod: needs merge
-rm 'submod'
-ok 52 - rm removes work tree of unmodified conflicted submodule
+		test 2 = 2
+	
+ok 11 - diff -U0 --inter-hunk-context=0, 2 common lines: count hunks (2)
 
 expecting success: 
-	git checkout conflict1 &&
-	git reset --hard &&
-	git submodule update &&
-	git -C submod checkout HEAD^ &&
-	test_must_fail git merge conflict2 &&
-	test_must_fail git rm submod &&
-	test -d submod &&
-	test -f submod/.git &&
-	git status -s -uno --ignore-submodules=none >actual &&
-	test_cmp expect.conflict actual &&
-	git rm -f submod &&
-	test ! -d submod &&
-	git status -s -uno --ignore-submodules=none >actual &&
-	test_cmp expect actual &&
-	test_must_fail git config -f .gitmodules submodule.sub.url &&
-	test_must_fail git config -f .gitmodules submodule.sub.path
-
-Already on 'conflict1'
-M	.gitmodules
-D	submod
-HEAD is now at 3b6eeb2 submod 1
-Submodule path 'submod': checked out '2722885afbcbffbaf4e5d048de68730b723bbf06'
-Previous HEAD position was 2722885 added nitfol 1
-HEAD is now at a223e81 add submodule
-Merging:
-3b6eeb2 submod 1
-virtual conflict2
-found 1 common ancestor:
-a223e81 add submodule
-Failed to merge submodule submod (merge following commits not found)
-Auto-merging submod
-CONFLICT (submodule): Merge conflict in submod
-Automatic merge failed; fix conflicts and then commit the result.
-submod: needs merge
-error: the following file has local modifications:
-    submod
-(use --cached to keep the file, or -f to force removal)
-submod: needs merge
-rm 'submod'
-ok 53 - rm of a conflicted populated submodule with different HEAD fails unless forced
+		test 2 = 2
+	
+ok 12 - diff -U0 --inter-hunk-context=1, 2 common lines: count hunks (2)
 
 expecting success: 
-	git checkout conflict1 &&
-	git reset --hard &&
-	git submodule update &&
-	echo X >submod/empty &&
-	test_must_fail git merge conflict2 &&
-	test_must_fail git rm submod &&
-	test -d submod &&
-	test -f submod/.git &&
-	git status -s -uno --ignore-submodules=none >actual &&
-	test_cmp expect.conflict actual &&
-	git rm -f submod &&
-	test ! -d submod &&
-	git status -s -uno --ignore-submodules=none >actual &&
-	test_cmp expect actual &&
-	test_must_fail git config -f .gitmodules submodule.sub.url &&
-	test_must_fail git config -f .gitmodules submodule.sub.path
-
-Already on 'conflict1'
-M	.gitmodules
-D	submod
-HEAD is now at 3b6eeb2 submod 1
-Submodule path 'submod': checked out '2722885afbcbffbaf4e5d048de68730b723bbf06'
-Merging:
-3b6eeb2 submod 1
-virtual conflict2
-found 1 common ancestor:
-a223e81 add submodule
-Failed to merge submodule submod (merge following commits not found)
-Auto-merging submod
-CONFLICT (submodule): Merge conflict in submod
-Automatic merge failed; fix conflicts and then commit the result.
-submod: needs merge
-error: the following file has local modifications:
-    submod
-(use --cached to keep the file, or -f to force removal)
-submod: needs merge
-rm 'submod'
-ok 54 - rm of a conflicted populated submodule with modifications fails unless forced
+		test 1 = 1
+	
+ok 13 - diff -U0 --inter-hunk-context=2, 2 common lines: count hunks (1)
 
 expecting success: 
-	git checkout conflict1 &&
-	git reset --hard &&
-	git submodule update &&
-	echo X >submod/untracked &&
-	test_must_fail git merge conflict2 &&
-	test_must_fail git rm submod &&
-	test -d submod &&
-	test -f submod/.git &&
-	git status -s -uno --ignore-submodules=none >actual &&
-	test_cmp expect.conflict actual &&
-	git rm -f submod &&
-	test ! -d submod &&
-	git status -s -uno --ignore-submodules=none >actual &&
-	test_cmp expect actual
-
-Already on 'conflict1'
-M	.gitmodules
-D	submod
-HEAD is now at 3b6eeb2 submod 1
-Submodule path 'submod': checked out '2722885afbcbffbaf4e5d048de68730b723bbf06'
-Merging:
-3b6eeb2 submod 1
-virtual conflict2
-found 1 common ancestor:
-a223e81 add submodule
-Failed to merge submodule submod (merge following commits not found)
-Auto-merging submod
-CONFLICT (submodule): Merge conflict in submod
-Automatic merge failed; fix conflicts and then commit the result.
-submod: needs merge
-error: the following file has local modifications:
-    submod
-(use --cached to keep the file, or -f to force removal)
-submod: needs merge
-rm 'submod'
-ok 55 - rm of a conflicted populated submodule with untracked files fails unless forced
+		test 1 = 1
+	
+ok 14 - diff -U1, 2 common lines: count hunks (1)
 
 expecting success: 
-	git checkout conflict1 &&
-	git reset --hard &&
-	git submodule update &&
-	(cd submod &&
-		rm .git &&
-		cp -R ../.git/modules/sub .git &&
-		GIT_WORK_TREE=. git config --unset core.worktree
-	) &&
-	test_must_fail git merge conflict2 &&
-	test_must_fail git rm submod &&
-	test -d submod &&
-	test -d submod/.git &&
-	git status -s -uno --ignore-submodules=none >actual &&
-	test_cmp expect.conflict actual &&
-	test_must_fail git rm -f submod &&
-	test -d submod &&
-	test -d submod/.git &&
-	git status -s -uno --ignore-submodules=none >actual &&
-	test_cmp expect.conflict actual &&
-	git merge --abort &&
-	rm -rf submod
-
-Already on 'conflict1'
-M	.gitmodules
-D	submod
-HEAD is now at 3b6eeb2 submod 1
-Submodule path 'submod': checked out '2722885afbcbffbaf4e5d048de68730b723bbf06'
-Merging:
-3b6eeb2 submod 1
-virtual conflict2
-found 1 common ancestor:
-a223e81 add submodule
-Failed to merge submodule submod (merge following commits not found)
-Auto-merging submod
-CONFLICT (submodule): Merge conflict in submod
-Automatic merge failed; fix conflicts and then commit the result.
-Migrating git directory of 'submod' from
-'/build/git-2.20.1/t/trash directory.t3600-rm/submod/.git' to
-'/build/git-2.20.1/t/trash directory.t3600-rm/.git/modules/sub'
-fatal: could not migrate git directory from '/build/git-2.20.1/t/trash directory.t3600-rm/submod/.git' to '/build/git-2.20.1/t/trash directory.t3600-rm/.git/modules/sub': Directory not empty
-submod: needs merge
-Migrating git directory of 'submod' from
-'/build/git-2.20.1/t/trash directory.t3600-rm/submod/.git' to
-'/build/git-2.20.1/t/trash directory.t3600-rm/.git/modules/sub'
-fatal: could not migrate git directory from '/build/git-2.20.1/t/trash directory.t3600-rm/submod/.git' to '/build/git-2.20.1/t/trash directory.t3600-rm/.git/modules/sub': Directory not empty
-submod: needs merge
-ok 56 - rm of a conflicted populated submodule with a .git directory fails even when forced
+		test 2 = 2
+	
+ok 15 - diff -U1, 3 common lines: count hunks (2)
 
 expecting success: 
-	git checkout conflict1 &&
-	git reset --hard &&
-	test_must_fail git merge conflict2 &&
-	git rm submod &&
-	test ! -d submod &&
-	git status -s -uno --ignore-submodules=none >actual &&
-	test_cmp expect actual
-
-Already on 'conflict1'
-D	submod
-HEAD is now at 3b6eeb2 submod 1
-Merging:
-3b6eeb2 submod 1
-virtual conflict2
-found 1 common ancestor:
-a223e81 add submodule
-Failed to merge submodule submod (merge following commits not found)
-Auto-merging submod
-CONFLICT (submodule): Merge conflict in submod
-Automatic merge failed; fix conflicts and then commit the result.
-submod: needs merge
-rm 'submod'
-ok 57 - rm of a conflicted unpopulated submodule succeeds
+		test 2 = 2
+	
+ok 16 - diff -U1 --inter-hunk-context=0, 3 common lines: count hunks (2)
 
 expecting success: 
-	git checkout -f master &&
-	git reset --hard &&
-	git submodule update &&
-	(cd submod &&
-		rm .git &&
-		cp -R ../.git/modules/sub .git &&
-		GIT_WORK_TREE=. git config --unset core.worktree &&
-		rm -r ../.git/modules/sub
-	) &&
-	git rm submod 2>output.err &&
-	! test -d submod &&
-	! test -d submod/.git &&
-	git status -s -uno --ignore-submodules=none >actual &&
-	test -s actual &&
-	test_i18ngrep Migrating output.err
-
-Switched to branch 'master'
-HEAD is now at a223e81 add submodule
-Submodule path 'submod': checked out 'b0dc8ca8718108cd6b20ffbba48535433c3a0f15'
-rm 'submod'
-Migrating git directory of 'submod' from
-ok 58 - rm of a populated submodule with a .git directory migrates git dir
+		test 1 = 1
+	
+ok 17 - diff -U1 --inter-hunk-context=1, 3 common lines: count hunks (1)
 
 expecting success: 
-	git reset --hard &&
-	git submodule update &&
-	(cd submod &&
-		git update-index --add --cacheinfo 160000 $(git rev-parse HEAD) subsubmod &&
-		git config -f .gitmodules submodule.sub.url ../. &&
-		git config -f .gitmodules submodule.sub.path subsubmod &&
-		git submodule init &&
-		git add .gitmodules &&
-		git commit -m "add subsubmodule" &&
-		git submodule update subsubmod
-	) &&
-	git commit -a -m "added deep submodule"
-
-HEAD is now at a223e81 add submodule
-Submodule path 'submod': checked out 'b0dc8ca8718108cd6b20ffbba48535433c3a0f15'
-Submodule 'sub' (/build/git-2.20.1/t/trash directory.t3600-rm/.) registered for path 'subsubmod'
-[detached HEAD cbc6175] add subsubmodule
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 subsubmod
-Cloning into '/build/git-2.20.1/t/trash directory.t3600-rm/submod/subsubmod'...
-done.
-Submodule path 'subsubmod': checked out 'b0dc8ca8718108cd6b20ffbba48535433c3a0f15'
-[master de0e3b9] added deep submodule
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 59 - setup subsubmodule
+		test 1 = 1
+	
+ok 18 - diff -U1 --inter-hunk-context=2, 3 common lines: count hunks (1)
 
 expecting success: 
-	git rm submod &&
-	test ! -d submod &&
-	git status -s -uno --ignore-submodules=none >actual &&
-	test_cmp expect actual
-
-rm 'submod'
-ok 60 - rm recursively removes work tree of unmodified submodules
+		test 2 = 2
+	
+ok 19 - diff -U3, 9 common lines: count hunks (2)
 
 expecting success: 
-	git reset --hard &&
-	git submodule update --recursive &&
-	git -C submod/subsubmod checkout HEAD^ &&
-	test_must_fail git rm submod &&
-	test -d submod &&
-	test -f submod/.git &&
-	git status -s -uno --ignore-submodules=none >actual &&
-	test_cmp expect.modified_inside actual &&
-	git rm -f submod &&
-	test ! -d submod &&
-	git status -s -uno --ignore-submodules=none >actual &&
-	test_cmp expect actual
-
-HEAD is now at de0e3b9 added deep submodule
-Submodule path 'submod': checked out 'cbc61756c8748252e079a72a2214a921d7abd8cc'
-Submodule path 'submod/subsubmod': checked out 'b0dc8ca8718108cd6b20ffbba48535433c3a0f15'
-Previous HEAD position was b0dc8ca subdir test
-HEAD is now at ab86df4 remove file from rm --quiet test
-error: the following file has local modifications:
-    submod
-(use --cached to keep the file, or -f to force removal)
-rm 'submod'
-ok 61 - rm of a populated nested submodule with different nested HEAD fails unless forced
+		test 2 = 2
+	
+ok 20 - diff -U3 --inter-hunk-context=2, 9 common lines: count hunks (2)
 
 expecting success: 
-	git reset --hard &&
-	git submodule update --recursive &&
-	echo X >submod/subsubmod/empty &&
-	test_must_fail git rm submod &&
-	test -d submod &&
-	test -f submod/.git &&
-	git status -s -uno --ignore-submodules=none >actual &&
-	test_cmp expect.modified_inside actual &&
-	git rm -f submod &&
-	test ! -d submod &&
-	git status -s -uno --ignore-submodules=none >actual &&
-	test_cmp expect actual
-
-HEAD is now at de0e3b9 added deep submodule
-Submodule path 'submod': checked out 'cbc61756c8748252e079a72a2214a921d7abd8cc'
-Submodule path 'submod/subsubmod': checked out 'b0dc8ca8718108cd6b20ffbba48535433c3a0f15'
-error: the following file has local modifications:
-    submod
-(use --cached to keep the file, or -f to force removal)
-rm 'submod'
-ok 62 - rm of a populated nested submodule with nested modifications fails unless forced
+		test 1 = 1
+	
+ok 21 - diff -U3 --inter-hunk-context=3, 9 common lines: count hunks (1)
 
 expecting success: 
-	git reset --hard &&
-	git submodule update --recursive &&
-	echo X >submod/subsubmod/untracked &&
-	test_must_fail git rm submod &&
-	test -d submod &&
-	test -f submod/.git &&
-	git status -s -uno --ignore-submodules=none >actual &&
-	test_cmp expect.modified_untracked actual &&
-	git rm -f submod &&
-	test ! -d submod &&
-	git status -s -uno --ignore-submodules=none >actual &&
-	test_cmp expect actual
-
-HEAD is now at de0e3b9 added deep submodule
-Submodule path 'submod': checked out 'cbc61756c8748252e079a72a2214a921d7abd8cc'
-Submodule path 'submod/subsubmod': checked out 'b0dc8ca8718108cd6b20ffbba48535433c3a0f15'
-error: the following file has local modifications:
-    submod
-(use --cached to keep the file, or -f to force removal)
-rm 'submod'
-ok 63 - rm of a populated nested submodule with nested untracked files fails unless forced
+		test 2 = 2
+	
+ok 22 - (diff.interHunkContext=0) diff -U0, 1 common line: count hunks (2)
 
 expecting success: 
-	git reset --hard &&
-	git submodule update --recursive &&
-	(cd submod/subsubmod &&
-		rm .git &&
-		mv ../../.git/modules/sub/modules/sub .git &&
-		GIT_WORK_TREE=. git config --unset core.worktree
-	) &&
-	git rm submod 2>output.err &&
-	! test -d submod &&
-	! test -d submod/subsubmod/.git &&
-	git status -s -uno --ignore-submodules=none >actual &&
-	test -s actual &&
-	test_i18ngrep Migrating output.err
-
-HEAD is now at de0e3b9 added deep submodule
-Submodule path 'submod': checked out 'cbc61756c8748252e079a72a2214a921d7abd8cc'
-Submodule path 'submod/subsubmod': checked out 'b0dc8ca8718108cd6b20ffbba48535433c3a0f15'
-rm 'submod'
-Migrating git directory of 'submod/subsubmod' from
-ok 64 - rm absorbs submodule's nested .git directory
+		git diff -U0 f1 | grep -v '^index ' >actual &&
+		test_cmp expected.f1.0.2 actual
+	
+ok 23 - (diff.interHunkContext=0) diff -U0, 1 common line: check output
 
 expecting success: 
-	git commit -m "submodule removal" submod .gitmodules &&
-	git checkout HEAD^ &&
-	git submodule update &&
-	git checkout -q HEAD^ &&
-	git checkout -q master 2>actual &&
-	test_i18ngrep "^warning: unable to rmdir 'submod':" actual &&
-	git status -s submod >actual &&
-	echo "?? submod/" >expected &&
-	test_cmp expected actual &&
-	rm -rf submod &&
-	git status -s -uno --ignore-submodules=none >actual &&
-	test_must_be_empty actual
-
-[master 1898655] submodule removal
- Author: A U Thor <author@example.com>
- 2 files changed, 4 deletions(-)
- delete mode 160000 submod
-Note: checking out '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 performing another checkout.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
-
-  git checkout -b <new-branch-name>
-
-HEAD is now at de0e3b9 added deep submodule
-Submodule path 'submod': checked out 'cbc61756c8748252e079a72a2214a921d7abd8cc'
-warning: unable to rmdir 'submod': Directory not empty
-ok 65 - checking out a commit after submodule removal needs manual updates
+		test 1 = 1
+	
+ok 24 - (diff.interHunkContext=1) diff -U0, 1 common line: count hunks (1)
 
 expecting success: 
-	rm -rf d &&
-	mkdir d &&
-	>d/f &&
-	git add d &&
-	rm -rf d &&
-	>d &&
-	git rm d/f &&
-	test_must_fail git rev-parse --verify :d/f &&
-	test_path_is_file d
-
-rm 'd/f'
-fatal: Needed a single revision
-ok 66 - rm of d/f when d has become a non-directory
-
-checking prerequisite: SYMLINKS
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
-	# test whether the filesystem supports symbolic links
-	ln -s x y && test -h y
+		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
 
-)
-prerequisite SYMLINKS ok
 expecting success: 
-	rm -rf d &&
-	mkdir d &&
-	>d/f &&
-	git add d &&
-	rm -rf d &&
-	ln -s nonexistent d &&
-	git rm d/f &&
-	test_must_fail git rev-parse --verify :d/f &&
-	test -h d &&
-	test_path_is_missing d
-
-rm 'd/f'
-fatal: Needed a single revision
-ok 67 - rm of d/f when d has become a dangling symlink
+		test 1 = 1
+	
+ok 26 - (diff.interHunkContext=2) diff -U0, 1 common line: count hunks (1)
 
 expecting success: 
-	rm -rf d &&
-	>d &&
-	git add d &&
-	rm -f d &&
-	mkdir d &&
-	>d/f &&
-	test_must_fail git rm d &&
-	git rev-parse --verify :d &&
-	test_path_is_file d/f
-
-fatal: git rm: 'd': Is a directory
-rm 'd'
-e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
-ok 68 - rm of file when it has become a directory
+		git diff -U0 f1 | grep -v '^index ' >actual &&
+		test_cmp expected.f1.0.1 actual
+	
+ok 27 - (diff.interHunkContext=2) diff -U0, 1 common line: check output
 
 expecting success: 
-	rm -rf d e &&
-	mkdir e &&
-	echo content >e/f &&
-	ln -s e d &&
-	git add -A e d &&
-	git commit -m "symlink d to e, e/f exists" &&
-	test_must_fail git rm d/f &&
-	git rev-parse --verify :d &&
-	git rev-parse --verify :e/f &&
-	test -h d &&
-	test_path_is_file e/f
-
-[master 0f432e4] symlink d to e, e/f exists
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 120000 d
- create mode 100644 e/f
-fatal: pathspec 'd/f' did not match any files
-9cbe6ea56f225388ae614c419249bfc6d734cc30
-d95f3ad14dee633a758d2e331151e950dd13e4ed
-ok 69 - rm across a symlinked leading path (no index)
-
-checking known breakage: 
-	rm -rf d e &&
-	mkdir d &&
-	echo content >d/f &&
-	git add -A e d &&
-	git commit -m "d/f exists" &&
-	mv d e &&
-	ln -s e d &&
-	test_must_fail git rm d/f &&
-	git rev-parse --verify :d/f &&
-	test -h d &&
-	test_path_is_file e/f
-
-[master c0f26cd] d/f exists
- Author: A U Thor <author@example.com>
- 2 files changed, 1 deletion(-)
- delete mode 120000 d
- rename {e => d}/f (100%)
-rm 'd/f'
-test_must_fail: command succeeded: git rm d/f
-not ok 70 - rm across a symlinked leading path (w/ index) # TODO known breakage
+		test 1 = 1
+	
+ok 28 - (diff.interHunkContext=3) diff -U3, 9 common lines: count hunks (1)
 
 expecting success: 
-	>bar.txt &&
-	>foo.txt &&
-	git add bar.txt foo.txt
-
-ok 71 - setup for testing rm messages
+		test 2 = 2
+	
+ok 29 - (diff.interHunkContext=0) diff -U0, 2 common lines: count hunks (2)
 
 expecting success: 
-	cat >expect <<-\EOF &&
-	error: the following files have staged content different from both the
-	file and the HEAD:
-	    bar.txt
-	    foo.txt
-	(use -f to force removal)
-	EOF
-	echo content1 >foo.txt &&
-	echo content1 >bar.txt &&
-	test_must_fail git rm foo.txt bar.txt 2>actual &&
-	test_i18ncmp expect actual
-
-ok 72 - rm files with different staged content
+		test 2 = 2
+	
+ok 30 - (diff.interHunkContext=1) diff -U0, 2 common lines: count hunks (2)
 
 expecting success: 
-	cat >expect <<-\EOF &&
-	error: the following files have staged content different from both the
-	file and the HEAD:
-	    bar.txt
-	    foo.txt
-	EOF
-	echo content2 >foo.txt &&
-	echo content2 >bar.txt &&
-	test_must_fail git -c advice.rmhints=false rm foo.txt bar.txt 2>actual &&
-	test_i18ncmp expect actual
-
-ok 73 - rm files with different staged content without hints
+		test 1 = 1
+	
+ok 31 - (diff.interHunkContext=2) diff -U0, 2 common lines: count hunks (1)
 
 expecting success: 
-	cat >expect <<-\EOF &&
-	error: the following file has local modifications:
-	    foo.txt
-	(use --cached to keep the file, or -f to force removal)
-	EOF
-	git commit -m "testing rm 3" &&
-	echo content3 >foo.txt &&
-	test_must_fail git rm foo.txt 2>actual &&
-	test_i18ncmp expect actual
-
-[master ecdfca7] testing rm 3
- Author: A U Thor <author@example.com>
- 3 files changed, 1 deletion(-)
- create mode 100644 bar.txt
- delete mode 100644 d/f
- create mode 100644 foo.txt
-ok 74 - rm file with local modification
+		test 2 = 2
+	
+ok 32 - (diff.interHunkContext=0) diff -U1, 3 common lines: count hunks (2)
 
 expecting success: 
-	cat >expect <<-\EOF &&
-	error: the following file has local modifications:
-	    bar.txt
-	EOF
-	echo content4 >bar.txt &&
-	test_must_fail git -c advice.rmhints=false rm bar.txt 2>actual &&
-	test_i18ncmp expect actual
-
-ok 75 - rm file with local modification without hints
+		test 1 = 1
+	
+ok 33 - (diff.interHunkContext=1) diff -U1, 3 common lines: count hunks (1)
 
 expecting success: 
-	cat >expect <<-\EOF &&
-	error: the following file has changes staged in the index:
-	    foo.txt
-	(use --cached to keep the file, or -f to force removal)
-	EOF
-	git reset --hard &&
-	echo content5 >foo.txt &&
-	git add foo.txt &&
-	test_must_fail git rm foo.txt 2>actual &&
-	test_i18ncmp expect actual
-
-HEAD is now at ecdfca7 testing rm 3
-ok 76 - rm file with changes in the index
+		test 1 = 1
+	
+ok 34 - (diff.interHunkContext=2) diff -U1, 3 common lines: count hunks (1)
 
 expecting success: 
-	cat >expect <<-\EOF &&
-	error: the following file has changes staged in the index:
-	    foo.txt
-	EOF
-	test_must_fail git -c advice.rmhints=false rm foo.txt 2>actual &&
-	test_i18ncmp expect actual
-
-ok 77 - rm file with changes in the index without hints
+		test 2 = 2
+	
+ok 35 - (diff.interHunkContext=2) diff -U3, 9 common lines: count hunks (2)
 
 expecting success: 
-	cat >expect <<-\EOF &&
-	error: the following file has staged content different from both the
-	file and the HEAD:
-	    foo1.txt
-	(use -f to force removal)
-	error: the following file has changes staged in the index:
-	    bar1.txt
-	(use --cached to keep the file, or -f to force removal)
-	EOF
-	echo content >foo1.txt &&
-	git add foo1.txt &&
-	echo content6 >foo1.txt &&
-	echo content6 >bar1.txt &&
-	git add bar1.txt &&
-	test_must_fail git rm bar1.txt foo1.txt 2>actual &&
-	test_i18ncmp expect actual
-
-ok 78 - rm files with two different errors
+		test 1 = 1
+	
+ok 36 - (diff.interHunkContext=3) diff -U3, 9 common lines: count hunks (1)
 
 expecting success: 
-	test_must_fail git rm -rf ""
+	git config diff.interHunkContext asdf &&
+	test_must_fail git diff &&
+	git config diff.interHunkContext -1 &&
+	test_must_fail git diff
 
-fatal: empty string is not a valid pathspec. please use . instead if you meant to match all paths
-ok 79 - rm empty string should fail
+fatal: bad numeric config value 'asdf' for 'diff.interhunkcontext': invalid unit
+fatal: bad config variable 'diff.interhunkcontext' in file '.git/config' at line 7
+ok 37 - diff.interHunkContext invalid
 
-# still have 1 known breakage(s)
-# passed all remaining 78 test(s)
-1..79
+# passed all 37 test(s)
+1..37
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
 *** t4015-diff-whitespace.sh ***
@@ -103679,7 +103245,7 @@
 	echo "foo();" >x &&
 	git diff --check
 
-[master (root-commit) ee1dbbe] snapshot
+[master (root-commit) 9d566bc] snapshot
  Author: A U Thor <author@example.com>
  1 file changed, 16 insertions(+)
  create mode 100644 x
@@ -103796,7 +103362,7 @@
 	git commit -m "new commit" x &&
 	git diff-tree --check HEAD^ HEAD
 
-[master c97aed4] new commit
+[master 8f38262] new commit
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 16 deletions(-)
 ok 28 - check with no whitespace errors (diff-tree)
@@ -103806,7 +103372,7 @@
 	git commit -m "another commit" x &&
 	test_must_fail git diff-tree --check HEAD^ HEAD
 
-[master fc67916] another commit
+[master 728d0a5] another commit
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 x:1: trailing whitespace.
@@ -103819,7 +103385,7 @@
 	git commit -m "yet another" x &&
 	test_must_fail git diff-tree --check HEAD^ HEAD
 
-[master 854e841] yet another
+[master f71ebf9] yet another
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 x:1: space before tab in indent.
@@ -103842,13 +103408,13 @@
 	# without a worktree diff-tree still ignores the whitespace error
 	git -C .git diff-tree --root --check HEAD
 
-[master 38a8402] add trailing space
+[master 3a854ad] add trailing space
  Author: A U Thor <author@example.com>
  2 files changed, 2 insertions(+), 1 deletion(-)
  create mode 100644 .gitattributes
-38a84023eead924deaacd2193b7627f5ca5a8fe0
-38a84023eead924deaacd2193b7627f5ca5a8fe0
-HEAD is now at 854e841 yet another
+3a854ad8dcc803dec29f6611d0fa3b2aca60dd47
+3a854ad8dcc803dec29f6611d0fa3b2aca60dd47
+HEAD is now at f71ebf9 yet another
 ok 31 - check with ignored trailing whitespace attr (diff-tree)
 
 expecting success: 
@@ -104026,8 +103592,8 @@
 	git diff -b >actual &&
 	test_must_be_empty actual
 
-HEAD is now at 854e841 yet another
-[master 1a48174] hello 1
+HEAD is now at f71ebf9 yet another
+[master 784d6f6] hello 1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 ok 52 - whitespace-only changes not reported
@@ -104044,8 +103610,8 @@
 	sed -e "/^similarity index /s/[0-9][0-9]*/NUM/" >actual &&
 	test_cmp expect actual
 
-HEAD is now at 1a48174 hello 1
-[master 995bef1] base
+HEAD is now at 784d6f6 hello 1
+[master 1e09c78] base
  Author: A U Thor <author@example.com>
  1 file changed, 9 insertions(+), 1 deletion(-)
 rm 'x'
@@ -104060,8 +103626,8 @@
 	git diff -w --cached -M >current &&
 	test_cmp expected current
 
-HEAD is now at 995bef1 base
-[master 6bc3f70] empty
+HEAD is now at 1e09c78 base
+[master 8364e7b] empty
  Author: A U Thor <author@example.com>
  1 file changed, 0 insertions(+), 0 deletions(-)
  create mode 100644 empty
@@ -104082,8 +103648,8 @@
 	! grep "^-" actual
 
 
-HEAD is now at 6bc3f70 empty
-[master bf018c9] one side
+HEAD is now at 8364e7b empty
+[master 55c9302] one side
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 9 deletions(-)
 Note: checking out 'HEAD^'.
@@ -104097,15 +103663,15 @@
 
   git checkout -b <new-branch-name>
 
-HEAD is now at 6bc3f70 empty
-[detached HEAD 0a19d6a] the other side
+HEAD is now at 8364e7b empty
+[detached HEAD b7a3b39] the other side
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 9 deletions(-)
 Merging:
-0a19d6a the other side
+b7a3b39 the other side
 virtual master
 found 1 common ancestor:
-6bc3f70 empty
+8364e7b empty
 Auto-merging x
 CONFLICT (content): Merge conflict in x
 Automatic merge failed; fix conflicts and then commit the result.
@@ -104147,8 +103713,8 @@
 
 	test_cmp expected current
 
-HEAD is now at 0a19d6a the other side
-[detached HEAD 9e619a4] initial
+HEAD is now at b7a3b39 the other side
+[detached HEAD db06cec] initial
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 ok 57 - diff that introduces a line with only tabs
@@ -104183,8 +103749,8 @@
 
 	test_cmp expected current
 
-HEAD is now at 9e619a4 initial
-[detached HEAD 5a60ac1] preimage
+HEAD is now at db06cec initial
+[detached HEAD 5b72ccf] preimage
  Author: A U Thor <author@example.com>
  1 file changed, 2 insertions(+), 1 deletion(-)
 ok 58 - diff that introduces and removes ws breakages
@@ -104240,8 +103806,8 @@
 	EOF
 
 
-HEAD is now at 5a60ac1 preimage
-[detached HEAD 0e2b855] preimage
+HEAD is now at 5b72ccf preimage
+[detached HEAD 3601c36] preimage
  Author: A U Thor <author@example.com>
 ok 59 - ws-error-highlight test setup
 
@@ -104341,8 +103907,8 @@
 
 	test_cmp expected actual
 
-HEAD is now at 0e2b855 preimage
-[detached HEAD 49abb01] add main function
+HEAD is now at 3601c36 preimage
+[detached HEAD a9c9165] add main function
  Author: A U Thor <author@example.com>
  1 file changed, 5 insertions(+)
  create mode 100644 test.c
@@ -104462,8 +104028,8 @@
 
 	test_cmp expected actual
 
-HEAD is now at 49abb01 add main function
-[detached HEAD 4c2a1d1] add main and test file
+HEAD is now at a9c9165 add main function
+[detached HEAD 4a29da5] add main and test file
  Author: A U Thor <author@example.com>
  2 files changed, 25 insertions(+), 2 deletions(-)
  create mode 100644 main.c
@@ -104600,8 +104166,8 @@
 	test_cmp expected actual
 
 
-HEAD is now at 4c2a1d1 add main and test file
-[detached HEAD 7601204] add poetry
+HEAD is now at 4a29da5 add main and test file
+[detached HEAD 250683e] add poetry
  Author: A U Thor <author@example.com>
  1 file changed, 16 insertions(+)
  create mode 100644 lines.txt
@@ -104708,7 +104274,7 @@
 	git diff --word-diff >expect &&
 	test_cmp expect actual
 
-[detached HEAD 65e5fbf] clean state
+[detached HEAD d6600fe] clean state
  Author: A U Thor <author@example.com>
  2 files changed, 7 insertions(+), 6 deletions(-)
  create mode 100644 text.txt
@@ -104733,8 +104299,8 @@
 	git config color.diff.oldMoved "magenta" &&
 	git config color.diff.newMoved "cyan"
 
-HEAD is now at 65e5fbf clean state
-[detached HEAD ff81f93] add poetry
+HEAD is now at d6600fe clean state
+[detached HEAD 6109775] add poetry
  Author: A U Thor <author@example.com>
  1 file changed, 7 insertions(+), 14 deletions(-)
 ok 70 - set up whitespace tests
@@ -104862,7 +104428,7 @@
 	EOF
 	test_cmp expected actual
 
-HEAD is now at ff81f93 add poetry
+HEAD is now at 6109775 add poetry
 ok 72 - move detection ignoring whitespace changes
 
 expecting success: 
@@ -104930,7 +104496,7 @@
 	EOF
 	test_cmp expected actual
 
-HEAD is now at ff81f93 add poetry
+HEAD is now at 6109775 add poetry
 ok 73 - move detection ignoring whitespace at eol
 
 expecting success: 
@@ -104974,8 +104540,8 @@
 
 	test_cmp expected actual
 
-HEAD is now at ff81f93 add poetry
-[detached HEAD 4da8c73] x
+HEAD is now at 6109775 add poetry
+[detached HEAD f212f5c] x
  Author: A U Thor <author@example.com>
  2 files changed, 2 insertions(+)
  create mode 100644 bar
@@ -105021,8 +104587,8 @@
 
 	test_cmp expected actual
 
-HEAD is now at 4da8c73 x
-[detached HEAD 71bce19] x
+HEAD is now at f212f5c x
+[detached HEAD af97d7d] x
  Author: A U Thor <author@example.com>
  1 file changed, 2 insertions(+), 1 deletion(-)
 ok 76 - --color-moved respects MIN_ALNUM_COUNT
@@ -105070,8 +104636,8 @@
 
 	test_cmp expected actual
 
-HEAD is now at 71bce19 x
-[detached HEAD 64bc408] x
+HEAD is now at af97d7d x
+[detached HEAD 2045fa1] x
  Author: A U Thor <author@example.com>
  1 file changed, 3 insertions(+), 2 deletions(-)
 ok 77 - --color-moved treats adjacent blocks as separate for MIN_ALNUM_COUNT
@@ -105102,7 +104668,7 @@
 	git submodule deinit bananas
 
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4015-diff-whitespace/bananas/.git/
-[detached HEAD d07aa99] fruit
+[detached HEAD 75fb8d9] fruit
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 fruit.t
@@ -105112,7 +104678,7 @@
  create mode 100644 recipe
  create mode 100644 recipe.t
 Adding existing repo at 'bananas' to the index
-[detached HEAD dafaddd] bananas are like a heavy library?
+[detached HEAD eb256b9] bananas are like a heavy library?
  Author: A U Thor <author@example.com>
  4 files changed, 7 insertions(+), 3 deletions(-)
  create mode 100644 .gitmodules
@@ -105168,8 +104734,8 @@
 	EOF
 	test_cmp expected actual
 
-HEAD is now at dafaddd bananas are like a heavy library?
-[detached HEAD 2585976] add text
+HEAD is now at eb256b9 bananas are like a heavy library?
+[detached HEAD a2a6d29] add text
  Author: A U Thor <author@example.com>
  1 file changed, 3 insertions(+), 1 deletion(-)
 ok 79 - only move detection ignores white spaces
@@ -105254,8 +104820,8 @@
 
 	test_cmp expected actual
 
-HEAD is now at 2585976 add text
-[detached HEAD 79ccb93] add text.txt
+HEAD is now at a2a6d29 add text
+[detached HEAD ea9906a] add text.txt
  Author: A U Thor <author@example.com>
  1 file changed, 14 insertions(+), 3 deletions(-)
 ok 80 - compare whitespace delta across moved blocks
@@ -105273,855 +104839,1426 @@
 1..81
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t4039-diff-assume-unchanged.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4039-diff-assume-unchanged/.git/
-expecting success: 
-	echo zero > zero &&
-	git add zero &&
-	git commit -m zero &&
-	echo one > one &&
-	echo two > two &&
-	git add one two &&
-	git commit -m onetwo &&
-	git update-index --assume-unchanged one &&
-	echo borked >> one &&
-	test "$(git ls-files -v one)" = "h one"
-
-[master (root-commit) 2f3c7fa] zero
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 zero
-[master d349be8] onetwo
+*** t3600-rm.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3600-rm/.git/
+expecting success: touch -- foo bar baz 'space embedded' -q &&
+     git add -- foo bar baz 'space embedded' -q &&
+     git commit -m 'add normal files'
+[master (root-commit) 4b6d79e] add normal files
  Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 one
- create mode 100644 two
-ok 1 - setup
+ 5 files changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 -q
+ create mode 100644 bar
+ create mode 100644 baz
+ create mode 100644 foo
+ create mode 100644 space embedded
+ok 1 - Initialize test directory
 
-expecting success: 
-	git diff-index HEAD^ -- one | grep -q 5626abf0f72e58d7a153368ba57db4c673c0e171
+checking prerequisite: FUNNYNAMES
 
-ok 2 - diff-index does not examine assume-unchanged entries
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
+	test_have_prereq !MINGW &&
+	touch -- \
+		"FUNNYNAMES tab	embedded" \
+		"FUNNYNAMES \"quote embedded\"" \
+		"FUNNYNAMES newline
+embedded" 2>/dev/null &&
+	rm -- \
+		"FUNNYNAMES tab	embedded" \
+		"FUNNYNAMES \"quote embedded\"" \
+		"FUNNYNAMES newline
+embedded" 2>/dev/null
 
+)
+prerequisite FUNNYNAMES ok
 expecting success: 
-	rm one &&
-	test -z "$(git diff-files -- one)"
+     touch -- 'tab	embedded' 'newline
+embedded' &&
+     git add -- 'tab	embedded' 'newline
+embedded' &&
+     git commit -m 'add files with tabs and newlines'
 
-ok 3 - diff-files does not examine assume-unchanged entries
+[master eb97738] add files with tabs and newlines
+ Author: A U Thor <author@example.com>
+ 2 files changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 "newline\nembedded"
+ create mode 100644 "tab\tembedded"
+ok 2 - add files with funny names
 
-expecting success: 
-	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: [ -f foo ] && git ls-files --error-unmatch foo
+foo
+ok 3 - Pre-check that foo exists and is in index before git rm foo
+
+expecting success: git rm --cached foo
+rm 'foo'
+ok 4 - Test that git rm foo succeeds
+
+expecting success: echo content >foo &&
+     git add foo &&
+     git rm --cached foo
+rm 'foo'
+ok 5 - Test that git rm --cached foo succeeds if the index matches the file
 
-[master 5650dfb] exec
+expecting success: echo content >foo &&
+     git add foo &&
+     git commit -m foo &&
+     echo "other content" >foo &&
+     git rm --cached foo
+[master 59850f7] foo
  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
+rm 'foo'
+ok 6 - Test that git rm --cached foo succeeds if the index matches the file
 
-# passed all 4 test(s)
-1..4
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t4040-whitespace-status.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4040-whitespace-status/.git/
 expecting success: 
-	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
+     echo content >foo &&
+     git add foo &&
+     git commit -m foo --allow-empty &&
+     echo "other content" >foo &&
+     git add foo &&
+     echo "yet another content" >foo &&
+     test_must_fail git rm --cached foo
 
-[master (root-commit) b80f2e3] initial
- Author: A U Thor <author@example.com>
- 3 files changed, 3 insertions(+)
- create mode 100644 a/d
- create mode 100644 b/e
- create mode 100644 c
-[master 13a0478] second
+[master 24ed392] foo
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 1 - setup
+error: the following file has staged content different from both the
+file and the HEAD:
+    foo
+(use -f to force removal)
+ok 7 - Test that git rm --cached foo fails if the index matches neither the file nor HEAD
 
-expecting success: 
-	test_must_fail git diff --exit-code HEAD^ HEAD &&
-	test_must_fail git diff-tree --exit-code HEAD^ HEAD
+expecting success: echo content >foo &&
+     git add foo &&
+     git commit -m foo --allow-empty &&
+     echo "other content" >foo &&
+     git add foo &&
+     echo "yet another content" >foo &&
+     git rm --cached -f foo
+[master 350aae1] foo
+ Author: A U Thor <author@example.com>
+rm 'foo'
+ok 8 - Test that git rm --cached -f foo works in case where --cached only did not
 
-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: [ -f foo ] && test_must_fail git ls-files --error-unmatch foo
+error: pathspec 'foo' did not match any file(s) known to git
+Did you forget to 'git add'?
+ok 9 - Post-check that foo exists but is not in index after git rm foo
 
-expecting success: 
-	git diff -b --exit-code HEAD^ HEAD &&
-	git diff-tree -b -p --exit-code HEAD^ HEAD &&
-	git diff-tree -b --exit-code HEAD^ HEAD
+expecting success: [ -f bar ] && git ls-files --error-unmatch bar
+bar
+ok 10 - Pre-check that bar exists and is in index before "git rm bar"
 
-:040000 040000 13061aad4970f02b314943ec46981e9ef332cae2 ac592974c686387705f2617b895d6585cc0a0d46 M	a
-ok 3 - diff-tree -b --exit-code
+expecting success: git rm bar
+rm 'bar'
+ok 11 - Test that "git rm bar" succeeds
 
-expecting success: 
-	test_must_fail git diff --cached --exit-code HEAD &&
-	test_must_fail git diff-index --cached --exit-code HEAD
+expecting success: ! [ -f bar ] && test_must_fail git ls-files --error-unmatch bar
+error: pathspec 'bar' did not match any file(s) known to git
+Did you forget to 'git add'?
+ok 12 - Post-check that bar does not exist and is not in index after "git rm -f bar"
 
-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: git rm -- -q
+rm '-q'
+ok 13 - Test that "git rm -- -q" succeeds (remove a file that looks like an option)
 
-expecting success: 
-	git diff -b --cached --exit-code HEAD &&
-	git diff-index -b -p --cached --exit-code HEAD
+expecting success: git rm -f 'space embedded' 'tab	embedded' 'newline
+embedded'
+rm 'newline
+embedded'
+rm 'space embedded'
+rm 'tab	embedded'
+ok 14 - Test that "git rm -f" succeeds with embedded space, tab, or newline characters.
 
-ok 5 - diff-index -b -p --cached --exit-code
+checking prerequisite: SANITY
 
-expecting success: 
-	test_must_fail git diff --exit-code HEAD &&
-	test_must_fail git diff-index --exit-code HEAD
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
+	mkdir SANETESTD.1 SANETESTD.2 &&
 
-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
+	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: 
-	git diff -b --exit-code HEAD &&
-	git diff-index -b -p --exit-code HEAD
+	! test -r SANETESTD.1/x &&
+	! rm SANETESTD.1/x && ! test -f SANETESTD.2/x
+	status=$?
 
-ok 7 - diff-index -b -p --exit-code
+	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: 
-	test_must_fail git diff --exit-code &&
-	test_must_fail git diff-files --exit-code
-
-diff --git a/b/e b/b/e
-index 8b13789..8d1c8b6 100644
---- a/b/e
-+++ b/b/e
-@@ -1 +1 @@
--
-+ 
-:100644 100644 8b137891791fe96927ad78e64b0aad7bded08bdc 0000000000000000000000000000000000000000 M	b/e
-ok 8 - diff-files --exit-code
+	test_when_finished "chmod 775 ." &&
+	chmod a-w . &&
+	test_must_fail git rm -f baz
 
-expecting success: 
-	git diff -b --exit-code &&
-	git diff-files -b -p --exit-code
+fatal: git rm: 'baz': Permission denied
+rm 'baz'
+ok 15 - Test that "git rm -f" fails if its rm fails
 
-ok 9 - diff-files -b -p --exit-code
+expecting success: git ls-files --error-unmatch baz
+baz
+ok 16 - When the rm in "git rm -f" fails, it should not remove the file from the index
 
 expecting success: 
-	git reset --hard &&
-	rm a/d &&
-	echo x >>b/e &&
-	test_must_fail git diff-files --diff-filter=M --quiet
+	git rm --ignore-unmatch nonexistent
 
-HEAD is now at 13a0478 second
-ok 10 - diff-files --diff-filter --quiet
+ok 17 - Remove nonexistent file with --ignore-unmatch
 
 expecting success: 
-	git commit -a -m "worktree state" &&
-	test_must_fail git diff-tree --diff-filter=M --quiet HEAD^ HEAD
+	echo frotz >test-file &&
+	git add test-file &&
+	git commit -m "add file for rm test" &&
+	git rm test-file >rm-output &&
+	test $(grep "^rm " rm-output | wc -l) = 1 &&
+	rm -f test-file rm-output &&
+	git commit -m "remove file from rm test"
 
-[master c0a31dc] worktree state
+[master e3e264f] add file for rm test
  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
+ 7 files changed, 1 insertion(+), 1 deletion(-)
+ delete mode 100644 -q
+ delete mode 100644 bar
+ delete mode 100644 foo
+ delete mode 100644 "newline\nembedded"
+ delete mode 100644 space embedded
+ delete mode 100644 "tab\tembedded"
+ create mode 100644 test-file
+[master ed8cd80] remove file from rm test
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 test-file
+ok 18 - "rm" command printed
 
-# passed all 11 test(s)
-1..11
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t4035-diff-quiet.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4035-diff-quiet/.git/
 expecting success: 
-	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
-	)
+	echo frotz >test-file &&
+	git add test-file &&
+	git commit -m "add file for rm --quiet test" &&
+	git rm --quiet test-file >rm-output &&
+	test_must_be_empty rm-output &&
+	rm -f test-file rm-output &&
+	git commit -m "remove file from rm --quiet test"
 
-[master (root-commit) 0585c4f] first
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 a
-[master ff2e67e] second
+[master 68da86a] add file for rm --quiet test
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 b
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4035-diff-quiet/test-outside/repo/.git/
-[master (root-commit) 3109bf3] 1
+ create mode 100644 test-file
+[master e2e61f4] remove file from rm --quiet test
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 a
-ok 1 - setup
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 test-file
+ok 19 - "rm" command suppressed with --quiet
 
 expecting success: 
-	test_expect_code 1 git diff-tree --quiet HEAD^ HEAD >cnt &&
-	test_line_count = 0 cnt
+	git add foo baz &&
+	git ls-files --error-unmatch foo baz
 
-ok 2 - git diff-tree HEAD^ HEAD
+baz
+foo
+ok 20 - Re-add foo and baz
 
 expecting success: 
-	test_expect_code 0 git diff-tree --quiet HEAD^ HEAD -- a >cnt &&
-	test_line_count = 0 cnt
+	echo >>foo &&
+	test_must_fail git rm foo baz &&
+	test -f foo &&
+	test -f baz &&
+	git ls-files --error-unmatch foo baz
 
-ok 3 - git diff-tree HEAD^ HEAD -- a
+error: the following file has staged content different from both the
+file and the HEAD:
+    foo
+(use -f to force removal)
+baz
+foo
+ok 21 - Modify foo -- rm should refuse
 
 expecting success: 
-	test_expect_code 1 git diff-tree --quiet HEAD^ HEAD -- b >cnt &&
-	test_line_count = 0 cnt
+	git rm -f foo baz &&
+	test ! -f foo &&
+	test ! -f baz &&
+	test_must_fail git ls-files --error-unmatch foo &&
+	test_must_fail git ls-files --error-unmatch bar
 
-ok 4 - git diff-tree HEAD^ HEAD -- b
+rm 'baz'
+rm 'foo'
+error: pathspec 'foo' did not match any file(s) known to git
+Did you forget to 'git add'?
+error: pathspec 'bar' did not match any file(s) known to git
+Did you forget to 'git add'?
+ok 22 - Modified foo -- rm -f should work
 
 expecting success: 
-	echo $(git rev-parse HEAD) |
-	test_expect_code 1 git diff-tree --quiet --stdin >cnt &&
-	test_line_count = 1 cnt
+	echo frotz >foo &&
+	git checkout HEAD -- baz &&
+	git add foo baz &&
+	git ls-files --error-unmatch foo baz
 
-ok 5 - echo HEAD | git diff-tree --stdin
+baz
+foo
+ok 23 - Re-add foo and baz for HEAD tests
 
 expecting success: 
-	test_expect_code 0 git diff-tree --quiet HEAD HEAD >cnt &&
-	test_line_count = 0 cnt
+	test_must_fail git rm foo baz &&
+	test -f foo &&
+	test -f baz &&
+	git ls-files --error-unmatch foo baz
 
-ok 6 - git diff-tree HEAD HEAD
+error: the following file has changes staged in the index:
+    foo
+(use --cached to keep the file, or -f to force removal)
+baz
+foo
+ok 24 - foo is different in index from HEAD -- rm should refuse
 
 expecting success: 
-	test_expect_code 0 git diff-files --quiet >cnt &&
-	test_line_count = 0 cnt
+	git rm -f foo baz &&
+	test ! -f foo &&
+	test ! -f baz &&
+	test_must_fail git ls-files --error-unmatch foo &&
+	test_must_fail git ls-files --error-unmatch baz
 
-ok 7 - git diff-files
+rm 'baz'
+rm 'foo'
+error: pathspec 'foo' did not match any file(s) known to git
+Did you forget to 'git add'?
+error: pathspec 'baz' did not match any file(s) known to git
+Did you forget to 'git add'?
+ok 25 - but with -f it should work.
 
 expecting success: 
-	test_expect_code 0 git diff-index --quiet --cached HEAD >cnt &&
-	test_line_count = 0 cnt
+	>empty &&
+	git add empty &&
+	echo content >empty &&
+	test_must_fail git rm --cached empty
 
-ok 8 - git diff-index --cached HEAD
+error: the following file has staged content different from both the
+file and the HEAD:
+    empty
+(use -f to force removal)
+ok 26 - refuse to remove cached empty file with modifications
 
 expecting success: 
-	test_expect_code 1 git diff-index --quiet --cached HEAD^ >cnt &&
-	test_line_count = 0 cnt
+	echo content >intent-to-add &&
+	git add -N intent-to-add &&
+	git rm --cached intent-to-add
 
-ok 9 - git diff-index --cached HEAD^
+rm 'intent-to-add'
+ok 27 - remove intent-to-add file without --force
 
 expecting success: 
-	echo text >>b &&
-	echo 3 >c &&
-	git add . &&
-	test_expect_code 1 git diff-index --quiet --cached HEAD^ >cnt &&
-	test_line_count = 0 cnt
+	mkdir -p frotz &&
+	echo qfwfq >frotz/nitfol &&
+	git add frotz &&
+	git commit -m "subdir test"
 
-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.
-ok 10 - git diff-index --cached HEAD^
+[master a3ae6b0] subdir test
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+)
+ rename baz => empty (100%)
+ create mode 100644 frotz/nitfol
+ok 28 - Recursive test setup
 
 expecting success: 
-	git commit -m "text in b" &&
-	test_expect_code 1 git diff-tree --quiet -Stext HEAD^ HEAD -- b >cnt &&
-	test_line_count = 0 cnt
+	test_must_fail git rm frotz &&
+	test -d frotz &&
+	test -f frotz/nitfol
 
-[master 0d4ff35] 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
+fatal: not removing 'frotz' recursively without -r
+ok 29 - Recursive without -r fails
 
 expecting success: 
-	test_expect_code 0 git diff-tree --quiet -Snot-found HEAD^ HEAD -- b >cnt &&
-	test_line_count = 0 cnt
+	echo qfwfq >>frotz/nitfol &&
+	test_must_fail git rm -r frotz &&
+	test -d frotz &&
+	test -f frotz/nitfol
 
-ok 12 - git diff-tree -Snot-found HEAD^ HEAD -- b
+error: the following file has local modifications:
+    frotz/nitfol
+(use --cached to keep the file, or -f to force removal)
+ok 30 - Recursive with -r but dirty
 
 expecting success: 
-	echo 3 >>c &&
-	test_expect_code 1 git diff-files --quiet >cnt &&
-	test_line_count = 0 cnt
+	git rm -f -r frotz &&
+	! test -f frotz/nitfol &&
+	! test -d frotz
 
-ok 13 - git diff-files
+rm 'frotz/nitfol'
+ok 31 - Recursive with -r -f
 
 expecting success: 
-	git update-index c &&
-	test_expect_code 1 git diff-index --quiet --cached HEAD >cnt &&
-	test_line_count = 0 cnt
+	test_must_fail git rm nonexistent
 
-ok 14 - git diff-index --cached HEAD
+fatal: pathspec 'nonexistent' did not match any files
+ok 32 - Remove nonexistent file returns nonzero exit status
 
 expecting success: 
-	(
-		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
-	)
+	mkdir repo &&
+	(cd repo &&
+	 git init &&
+	 echo something >somefile &&
+	 git add somefile &&
+	 git commit -m "add a file" &&
+	 (cd .. &&
+	  git --git-dir=repo/.git --work-tree=repo rm somefile) &&
+	test_must_fail git ls-files --error-unmatch somefile)
 
-ok 15 - git diff, one file outside repo
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3600-rm/repo/.git/
+[master (root-commit) 8a766fd] add a file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 somefile
+rm 'somefile'
+error: pathspec 'somefile' did not match any file(s) known to git
+Did you forget to 'git add'?
+ok 33 - Call "rm" from outside the work tree
 
 expecting success: 
-	(
-		GIT_CEILING_DIRECTORIES="$TRASH_DIRECTORY/test-outside" &&
-		export GIT_CEILING_DIRECTORIES &&
-		cd test-outside/non/git &&
-		test_expect_code 0 git diff --quiet a matching-file &&
-		test_expect_code 1 git diff --quiet a extra-space
-	)
 
-ok 16 - git diff, both files outside repo
+	git reset --hard &&
+	test-tool chmtime -86400 frotz/nitfol &&
+	git rm frotz/nitfol &&
+	test ! -f frotz/nitfol
 
-expecting success: 
-	(
-		cd test-outside/repo &&
-		test_expect_code 0 git diff --quiet --ignore-space-at-eol a ../non/git/trailing-space &&
-		test_expect_code 1 git diff --quiet --ignore-space-at-eol a ../non/git/extra-space
-	)
 
-ok 17 - git diff --ignore-space-at-eol, one file outside repo
+HEAD is now at a3ae6b0 subdir test
+rm 'frotz/nitfol'
+ok 34 - refresh index before checking if it is up-to-date
 
 expecting success: 
-	(
-		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
-	)
+	git reset -q --hard &&
+	test_when_finished "rm -f .git/index.lock && git reset -q --hard" &&
+	i=0 &&
+	while test $i -lt 12000
+	do
+	    echo "100644 1234567890123456789012345678901234567890 0	some-file-$i"
+	    i=$(( $i + 1 ))
+	done | git update-index --index-info &&
+	git rm -n "some-file-*" | : &&
+	test_path_is_missing .git/index.lock
 
-ok 18 - git diff --ignore-space-at-eol, both files outside repo
+ok 35 - choking "git rm" should not let it die with cruft
 
 expecting success: 
-	(
-		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
-	)
+	mkdir -p dir/subdir/subsubdir &&
+	echo content >dir/subdir/subsubdir/file &&
+	git add dir/subdir/subsubdir/file &&
+	git rm -f dir/subdir/subsubdir/file &&
+	! test -d dir
 
-ok 19 - git diff --ignore-all-space, one file outside repo
+rm 'dir/subdir/subsubdir/file'
+ok 36 - rm removes subdirectories recursively
 
 expecting success: 
-	(
-		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
-	)
+	mkdir submod &&
+	git update-index --add --cacheinfo 160000 $(git rev-parse HEAD) submod &&
+	git config -f .gitmodules submodule.sub.url ./. &&
+	git config -f .gitmodules submodule.sub.path submod &&
+	git submodule init &&
+	git add .gitmodules &&
+	git commit -m "add submodule" &&
+	git rm submod &&
+	test ! -e submod &&
+	git status -s -uno --ignore-submodules=none >actual &&
+	test_cmp expect actual &&
+	test_must_fail git config -f .gitmodules submodule.sub.url &&
+	test_must_fail git config -f .gitmodules submodule.sub.path
 
-ok 20 - git diff --ignore-all-space, both files outside repo
+warning: could not look up configuration 'remote.origin.url'. Assuming this repository is its own authoritative upstream.
+Submodule 'sub' (/build/git-2.20.1/t/trash directory.t3600-rm/.) registered for path 'submod'
+[master 5c44702] add submodule
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 submod
+rm 'submod'
+ok 37 - rm removes empty submodules from work tree
 
 expecting success: 
-	test-tool chmtime +10 a &&
-	echo modified >>b &&
-	test_expect_code 1 git diff --quiet
+	git reset --hard &&
+	git submodule update &&
+	rm -rf submod &&
+	git rm submod &&
+	git status -s -uno --ignore-submodules=none >actual &&
+	test_cmp expect actual &&
+	test_must_fail git config -f .gitmodules submodule.sub.url &&
+	test_must_fail git config -f .gitmodules submodule.sub.path
 
-ok 21 - git diff --quiet ignores stat-change only entries
+HEAD is now at 5c44702 add submodule
+Cloning into '/build/git-2.20.1/t/trash directory.t3600-rm/submod'...
+done.
+Submodule path 'submod': checked out 'a3ae6b0081a921605b4e64cd8c5bb3d4866ab72f'
+rm 'submod'
+ok 38 - rm removes removed submodule from index and .gitmodules
 
 expecting success: 
-	echo "crlf.txt text=auto" >.gitattributes &&
-	printf "Hello\r\nWorld\r\n" >crlf.txt &&
-	git add .gitattributes crlf.txt &&
-
-	printf "Hello\r\nWorld\n" >crlf.txt &&
-	git diff --quiet crlf.txt
+	git reset --hard &&
+	git submodule update &&
+	git rm submod &&
+	test ! -d submod &&
+	git status -s -uno --ignore-submodules=none >actual &&
+	test_cmp expect actual &&
+	test_must_fail git config -f .gitmodules submodule.sub.url &&
+	test_must_fail git config -f .gitmodules submodule.sub.path
 
-warning: CRLF will be replaced by LF in crlf.txt.
-The file will have its original line endings in your working directory
-warning: CRLF will be replaced by LF in crlf.txt.
-The file will have its original line endings in your working directory
-ok 22 - git diff --quiet on a path that need conversion
+HEAD is now at 5c44702 add submodule
+Submodule path 'submod': checked out 'a3ae6b0081a921605b4e64cd8c5bb3d4866ab72f'
+rm 'submod'
+ok 39 - rm removes work tree of unmodified submodules
 
-# passed all 22 test(s)
-1..22
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t4043-diff-rename-binary.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4043-diff-rename-binary/.git/
 expecting success: 
-	git init &&
-	echo foo > foo &&
-	echo "barQ" | q_to_nul > bar &&
-	git add . &&
-	git commit -m "Initial commit"
+	git reset --hard &&
+	git submodule update &&
+	git rm submod/ &&
+	test ! -d submod &&
+	git status -s -uno --ignore-submodules=none >actual &&
+	test_cmp expect actual
 
-Reinitialized existing Git repository in /build/git-2.20.1/t/trash directory.t4043-diff-rename-binary/.git/
-[master (root-commit) 123d0fd] Initial commit
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+)
- create mode 100644 bar
- create mode 100644 foo
-ok 1 - prepare repository
+HEAD is now at 5c44702 add submodule
+Submodule path 'submod': checked out 'a3ae6b0081a921605b4e64cd8c5bb3d4866ab72f'
+rm 'submod'
+ok 40 - rm removes a submodule with a trailing /
 
 expecting success: 
-	mkdir sub &&
-	git mv bar foo sub/ &&
-	git commit -m "Moved to sub/"
+	test_must_fail git rm empty/
 
-[master 635bfbd] Moved to sub/
- Author: A U Thor <author@example.com>
- 2 files changed, 0 insertions(+), 0 deletions(-)
- rename bar => sub/bar (100%)
- rename foo => sub/foo (100%)
-ok 2 - move the files into a "sub" directory
+fatal: pathspec 'empty/' did not match any files
+ok 41 - rm fails when given a file with a trailing /
 
 expecting success: 
-	git show -C -C --raw --binary --numstat >patch-with-stat &&
-	tail -n 11 patch-with-stat >current &&
-	test_cmp expected current
+	git rm -r frotz/
 
-ok 3 - git show -C -C report renames
+rm 'frotz/nitfol'
+ok 42 - rm succeeds when given a directory with a trailing /
 
-# passed all 3 test(s)
-1..3
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t4044-diff-index-unique-abbrev.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4044-diff-index-unique-abbrev/.git/
-checking prerequisite: SHA1
+expecting success: 
+	git reset --hard &&
+	git submodule update &&
+	git -C submod checkout HEAD^ &&
+	test_must_fail git rm submod &&
+	test -d submod &&
+	test -f submod/.git &&
+	git status -s -uno --ignore-submodules=none >actual &&
+	test_cmp expect.modified actual &&
+	git rm -f submod &&
+	test ! -d submod &&
+	git status -s -uno --ignore-submodules=none >actual &&
+	test_cmp expect actual &&
+	test_must_fail git config -f .gitmodules submodule.sub.url &&
+	test_must_fail git config -f .gitmodules submodule.sub.path
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
-	test $(git hash-object /dev/null) = e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
+HEAD is now at 5c44702 add submodule
+Submodule path 'submod': checked out 'a3ae6b0081a921605b4e64cd8c5bb3d4866ab72f'
+Previous HEAD position was a3ae6b0 subdir test
+HEAD is now at e2e61f4 remove file from rm --quiet test
+error: the following file has local modifications:
+    submod
+(use --cached to keep the file, or -f to force removal)
+rm 'submod'
+ok 43 - rm of a populated submodule with different HEAD fails unless forced
 
-)
-prerequisite SHA1 ok
 expecting success: 
-	echo 4827 > foo &&
-	git add foo &&
-	git commit -m "initial" &&
-	git cat-file -p HEAD: > actual &&
-	test_cmp expect_initial actual &&
-	echo 11742 > foo &&
-	git commit -a -m "update" &&
-	git cat-file -p HEAD: > actual &&
-	test_cmp expect_update actual
+	git reset --hard &&
+	git submodule update &&
+	git rm --cached submod &&
+	test -d submod &&
+	test -f submod/.git &&
+	git status -s -uno >actual &&
+	test_cmp expect.cached actual &&
+	git config -f .gitmodules submodule.sub.url &&
+	git config -f .gitmodules submodule.sub.path
 
-[master (root-commit) 06a867e] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo
-[master 0b21549] update
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 1 - setup
+HEAD is now at 5c44702 add submodule
+Submodule path 'submod': checked out 'a3ae6b0081a921605b4e64cd8c5bb3d4866ab72f'
+rm 'submod'
+./.
+submod
+ok 44 - rm --cached leaves work tree of populated submodules and .gitmodules alone
 
 expecting success: 
-	git diff HEAD^..HEAD | grep index > actual &&
-	test_cmp expect actual
+	git reset --hard &&
+	git submodule update &&
+	git rm -n submod &&
+	test -f submod/.git &&
+	git diff-index --exit-code HEAD
 
-ok 2 - diff does not produce ambiguous index line
+HEAD is now at 5c44702 add submodule
+rm 'submod'
+ok 45 - rm --dry-run does not touch the submodule or .gitmodules
 
-# passed all 2 test(s)
-1..2
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t4042-diff-textconv-caching.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4042-diff-textconv-caching/.git/
 expecting success: 
-	echo foo content 1 >foo.bin &&
-	echo bar content 1 >bar.bin &&
-	git add . &&
-	git commit -m one &&
-	foo1=$(git rev-parse --short HEAD:foo.bin) &&
-	bar1=$(git rev-parse --short HEAD:bar.bin) &&
-	echo foo content 2 >foo.bin &&
-	echo bar content 2 >bar.bin &&
-	git commit -a -m two &&
-	foo2=$(git rev-parse --short HEAD:foo.bin) &&
-	bar2=$(git rev-parse --short HEAD:bar.bin) &&
-	echo "*.bin diff=magic" >.gitattributes &&
-	git config diff.magic.textconv ./helper &&
-	git config diff.magic.cachetextconv true
+	git reset --hard &&
+	git submodule update &&
+	git rm .gitmodules &&
+	git rm submod >actual 2>actual.err &&
+	test_must_be_empty actual.err &&
+	! test -d submod &&
+	! test -f submod/.git &&
+	git status -s -uno >actual &&
+	test_cmp expect.both_deleted actual
 
-[master (root-commit) ff0aeff] 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 d5b6351] two
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+), 2 deletions(-)
-ok 1 - setup
+HEAD is now at 5c44702 add submodule
+rm '.gitmodules'
+ok 46 - rm does not complain when no .gitmodules file is found
 
 expecting success: 
-	git diff HEAD^ HEAD >actual &&
+	git reset --hard &&
+	git submodule update &&
+	git config -f .gitmodules foo.bar true &&
+	test_must_fail git rm submod >actual 2>actual.err &&
+	test -s actual.err &&
+	test -d submod &&
+	test -f submod/.git &&
+	git diff-files --quiet -- submod &&
+	git add .gitmodules &&
+	git rm submod >actual 2>actual.err &&
+	test_must_be_empty actual.err &&
+	! test -d submod &&
+	! test -f submod/.git &&
+	git status -s -uno >actual &&
 	test_cmp expect actual
 
-ok 2 - first textconv works
+HEAD is now at 5c44702 add submodule
+Submodule path 'submod': checked out 'a3ae6b0081a921605b4e64cd8c5bb3d4866ab72f'
+ok 47 - rm will error out on a modified .gitmodules file unless staged
 
 expecting success: 
-	git diff HEAD^ HEAD >actual &&
+	git reset --hard &&
+	git submodule update &&
+	git config -f .gitmodules --remove-section submodule.sub &&
+	git add .gitmodules &&
+	echo "warning: Could not find section in .gitmodules where path=submod" >expect.err &&
+	git rm submod >actual 2>actual.err &&
+	test_i18ncmp expect.err actual.err &&
+	! test -d submod &&
+	! test -f submod/.git &&
+	git status -s -uno >actual &&
 	test_cmp expect actual
 
-ok 3 - cached textconv produces same output
+HEAD is now at 5c44702 add submodule
+Submodule path 'submod': checked out 'a3ae6b0081a921605b4e64cd8c5bb3d4866ab72f'
+ok 48 - rm issues a warning when section is not found in .gitmodules
 
 expecting success: 
-	rm -f helper.out &&
-	git diff HEAD^ HEAD >actual &&
-	test_cmp expect actual &&
-	! test -r helper.out
+	git reset --hard &&
+	git submodule update &&
+	echo X >submod/empty &&
+	test_must_fail git rm submod &&
+	test -d submod &&
+	test -f submod/.git &&
+	git status -s -uno --ignore-submodules=none >actual &&
+	test_cmp expect.modified_inside actual &&
+	git rm -f submod &&
+	test ! -d submod &&
+	git status -s -uno --ignore-submodules=none >actual &&
+	test_cmp expect actual
 
-ok 4 - cached textconv does not run helper
+HEAD is now at 5c44702 add submodule
+Submodule path 'submod': checked out 'a3ae6b0081a921605b4e64cd8c5bb3d4866ab72f'
+error: the following file has local modifications:
+    submod
+(use --cached to keep the file, or -f to force removal)
+rm 'submod'
+ok 49 - rm of a populated submodule with modifications fails unless forced
 
 expecting success: 
-	echo other >other &&
-	git config diff.magic.textconv "./helper other" &&
-	git diff HEAD^ HEAD >actual &&
+	git reset --hard &&
+	git submodule update &&
+	echo X >submod/untracked &&
+	test_must_fail git rm submod &&
+	test -d submod &&
+	test -f submod/.git &&
+	git status -s -uno --ignore-submodules=none >actual &&
+	test_cmp expect.modified_untracked actual &&
+	git rm -f submod &&
+	test ! -d submod &&
+	git status -s -uno --ignore-submodules=none >actual &&
 	test_cmp expect actual
 
-ok 5 - changing textconv invalidates cache
+HEAD is now at 5c44702 add submodule
+Submodule path 'submod': checked out 'a3ae6b0081a921605b4e64cd8c5bb3d4866ab72f'
+error: the following file has local modifications:
+    submod
+(use --cached to keep the file, or -f to force removal)
+rm 'submod'
+ok 50 - rm of a populated submodule with untracked files fails unless forced
 
 expecting success: 
-	git config diff.moremagic.textconv ./helper &&
-	echo foo.bin diff=moremagic >>.gitattributes &&
-	git diff HEAD^ HEAD >actual &&
-	test_cmp expect actual
+	git reset --hard &&
+	git submodule update &&
+	git checkout -b branch1 &&
+	echo 1 >nitfol &&
+	git add nitfol &&
+	git commit -m "added nitfol 1" &&
+	git checkout -b branch2 master &&
+	echo 2 >nitfol &&
+	git add nitfol &&
+	git commit -m "added nitfol 2" &&
+	git checkout -b conflict1 master &&
+	git -C submod fetch &&
+	git -C submod checkout branch1 &&
+	git add submod &&
+	git commit -m "submod 1" &&
+	git checkout -b conflict2 master &&
+	git -C submod checkout branch2 &&
+	git add submod &&
+	git commit -m "submod 2"
 
-ok 6 - switching diff driver produces correct results
+HEAD is now at 5c44702 add submodule
+Submodule path 'submod': checked out 'a3ae6b0081a921605b4e64cd8c5bb3d4866ab72f'
+Switched to a new branch 'branch1'
+[branch1 b3eaa7f] added nitfol 1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 nitfol
+Switched to a new branch 'branch2'
+[branch2 745e7a4] added nitfol 2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 nitfol
+Switched to a new branch 'conflict1'
+From /build/git-2.20.1/t/trash directory.t3600-rm/.
+ * [new branch]      branch1    -> origin/branch1
+ * [new branch]      branch2    -> origin/branch2
+ * [new branch]      conflict1  -> origin/conflict1
+Previous HEAD position was a3ae6b0 subdir test
+Switched to a new branch 'branch1'
+Branch 'branch1' set up to track remote branch 'branch1' from 'origin'.
+[conflict1 b4e0aeb] submod 1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'conflict2'
+M	submod
+Switched to a new branch 'branch2'
+Branch 'branch2' set up to track remote branch 'branch2' from 'origin'.
+[conflict2 82bb64a] submod 2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 51 - setup submodule conflict
 
 expecting success: 
-	git log --no-walk -p refs/notes/textconv/magic HEAD
+	git checkout conflict1 &&
+	git reset --hard &&
+	git submodule update &&
+	test_must_fail git merge conflict2 &&
+	git rm submod &&
+	test ! -d submod &&
+	git status -s -uno --ignore-submodules=none >actual &&
+	test_cmp expect actual
 
-commit 7a2319fbe681afd1cb89f8f0b28d15a1baaea4a4
-Author: A U Thor <author@example.com>
-Date:   Fri Dec 3 05:06:52 2021 +0000
-
-    ./helper other
+Switched to branch 'conflict1'
+M	submod
+HEAD is now at b4e0aeb submod 1
+Submodule path 'submod': checked out 'b3eaa7f9d03e31564e437aff1c738e0127139276'
+Merging:
+b4e0aeb submod 1
+virtual conflict2
+found 1 common ancestor:
+5c44702 add submodule
+Failed to merge submodule submod (merge following commits not found)
+Auto-merging submod
+CONFLICT (submodule): Merge conflict in submod
+Automatic merge failed; fix conflicts and then commit the result.
+submod: needs merge
+rm 'submod'
+ok 52 - rm removes work tree of unmodified conflicted submodule
 
-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: 
+	git checkout conflict1 &&
+	git reset --hard &&
+	git submodule update &&
+	git -C submod checkout HEAD^ &&
+	test_must_fail git merge conflict2 &&
+	test_must_fail git rm submod &&
+	test -d submod &&
+	test -f submod/.git &&
+	git status -s -uno --ignore-submodules=none >actual &&
+	test_cmp expect.conflict actual &&
+	git rm -f submod &&
+	test ! -d submod &&
+	git status -s -uno --ignore-submodules=none >actual &&
+	test_cmp expect actual &&
+	test_must_fail git config -f .gitmodules submodule.sub.url &&
+	test_must_fail git config -f .gitmodules submodule.sub.path
 
-commit d5b635158f092cb16ee2e34db8f24df9e3be46c7
-Author: A U Thor <author@example.com>
-Date:   Fri Dec 3 05:06:51 2021 +0000
+Already on 'conflict1'
+M	.gitmodules
+D	submod
+HEAD is now at b4e0aeb submod 1
+Submodule path 'submod': checked out 'b3eaa7f9d03e31564e437aff1c738e0127139276'
+Previous HEAD position was b3eaa7f added nitfol 1
+HEAD is now at 5c44702 add submodule
+Merging:
+b4e0aeb submod 1
+virtual conflict2
+found 1 common ancestor:
+5c44702 add submodule
+Failed to merge submodule submod (merge following commits not found)
+Auto-merging submod
+CONFLICT (submodule): Merge conflict in submod
+Automatic merge failed; fix conflicts and then commit the result.
+submod: needs merge
+error: the following file has local modifications:
+    submod
+(use --cached to keep the file, or -f to force removal)
+submod: needs merge
+rm 'submod'
+ok 53 - rm of a conflicted populated submodule with different HEAD fails unless forced
 
-    two
+expecting success: 
+	git checkout conflict1 &&
+	git reset --hard &&
+	git submodule update &&
+	echo X >submod/empty &&
+	test_must_fail git merge conflict2 &&
+	test_must_fail git rm submod &&
+	test -d submod &&
+	test -f submod/.git &&
+	git status -s -uno --ignore-submodules=none >actual &&
+	test_cmp expect.conflict actual &&
+	git rm -f submod &&
+	test ! -d submod &&
+	git status -s -uno --ignore-submodules=none >actual &&
+	test_cmp expect actual &&
+	test_must_fail git config -f .gitmodules submodule.sub.url &&
+	test_must_fail git config -f .gitmodules submodule.sub.path
 
-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
+Already on 'conflict1'
+M	.gitmodules
+D	submod
+HEAD is now at b4e0aeb submod 1
+Submodule path 'submod': checked out 'b3eaa7f9d03e31564e437aff1c738e0127139276'
+Merging:
+b4e0aeb submod 1
+virtual conflict2
+found 1 common ancestor:
+5c44702 add submodule
+Failed to merge submodule submod (merge following commits not found)
+Auto-merging submod
+CONFLICT (submodule): Merge conflict in submod
+Automatic merge failed; fix conflicts and then commit the result.
+submod: needs merge
+error: the following file has local modifications:
+    submod
+(use --cached to keep the file, or -f to force removal)
+submod: needs merge
+rm 'submod'
+ok 54 - rm of a conflicted populated submodule with modifications fails unless forced
 
-# passed all 7 test(s)
-1..7
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t4032-diff-inter-hunk-context.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4032-diff-inter-hunk-context/.git/
 expecting success: 
-		test 2 = 2
-	
-ok 1 - diff -U0, 1 common line: count hunks (2)
+	git checkout conflict1 &&
+	git reset --hard &&
+	git submodule update &&
+	echo X >submod/untracked &&
+	test_must_fail git merge conflict2 &&
+	test_must_fail git rm submod &&
+	test -d submod &&
+	test -f submod/.git &&
+	git status -s -uno --ignore-submodules=none >actual &&
+	test_cmp expect.conflict actual &&
+	git rm -f submod &&
+	test ! -d submod &&
+	git status -s -uno --ignore-submodules=none >actual &&
+	test_cmp expect actual
 
-expecting success: 
-		git diff -U0 f1 | grep -v '^index ' >actual &&
-		test_cmp expected.f1.0.2 actual
-	
-ok 2 - diff -U0, 1 common line: check output
+Already on 'conflict1'
+M	.gitmodules
+D	submod
+HEAD is now at b4e0aeb submod 1
+Submodule path 'submod': checked out 'b3eaa7f9d03e31564e437aff1c738e0127139276'
+Merging:
+b4e0aeb submod 1
+virtual conflict2
+found 1 common ancestor:
+5c44702 add submodule
+Failed to merge submodule submod (merge following commits not found)
+Auto-merging submod
+CONFLICT (submodule): Merge conflict in submod
+Automatic merge failed; fix conflicts and then commit the result.
+submod: needs merge
+error: the following file has local modifications:
+    submod
+(use --cached to keep the file, or -f to force removal)
+submod: needs merge
+rm 'submod'
+ok 55 - rm of a conflicted populated submodule with untracked files fails unless forced
 
 expecting success: 
-		test 2 = 2
-	
-ok 3 - diff -U0 --inter-hunk-context=0, 1 common line: count hunks (2)
+	git checkout conflict1 &&
+	git reset --hard &&
+	git submodule update &&
+	(cd submod &&
+		rm .git &&
+		cp -R ../.git/modules/sub .git &&
+		GIT_WORK_TREE=. git config --unset core.worktree
+	) &&
+	test_must_fail git merge conflict2 &&
+	test_must_fail git rm submod &&
+	test -d submod &&
+	test -d submod/.git &&
+	git status -s -uno --ignore-submodules=none >actual &&
+	test_cmp expect.conflict actual &&
+	test_must_fail git rm -f submod &&
+	test -d submod &&
+	test -d submod/.git &&
+	git status -s -uno --ignore-submodules=none >actual &&
+	test_cmp expect.conflict actual &&
+	git merge --abort &&
+	rm -rf submod
 
-expecting success: 
-		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
+Already on 'conflict1'
+M	.gitmodules
+D	submod
+HEAD is now at b4e0aeb submod 1
+Submodule path 'submod': checked out 'b3eaa7f9d03e31564e437aff1c738e0127139276'
+Merging:
+b4e0aeb submod 1
+virtual conflict2
+found 1 common ancestor:
+5c44702 add submodule
+Failed to merge submodule submod (merge following commits not found)
+Auto-merging submod
+CONFLICT (submodule): Merge conflict in submod
+Automatic merge failed; fix conflicts and then commit the result.
+Migrating git directory of 'submod' from
+'/build/git-2.20.1/t/trash directory.t3600-rm/submod/.git' to
+'/build/git-2.20.1/t/trash directory.t3600-rm/.git/modules/sub'
+fatal: could not migrate git directory from '/build/git-2.20.1/t/trash directory.t3600-rm/submod/.git' to '/build/git-2.20.1/t/trash directory.t3600-rm/.git/modules/sub': Directory not empty
+submod: needs merge
+Migrating git directory of 'submod' from
+'/build/git-2.20.1/t/trash directory.t3600-rm/submod/.git' to
+'/build/git-2.20.1/t/trash directory.t3600-rm/.git/modules/sub'
+fatal: could not migrate git directory from '/build/git-2.20.1/t/trash directory.t3600-rm/submod/.git' to '/build/git-2.20.1/t/trash directory.t3600-rm/.git/modules/sub': Directory not empty
+submod: needs merge
+ok 56 - rm of a conflicted populated submodule with a .git directory fails even when forced
 
 expecting success: 
-		test 1 = 1
-	
-ok 5 - diff -U0 --inter-hunk-context=1, 1 common line: count hunks (1)
+	git checkout conflict1 &&
+	git reset --hard &&
+	test_must_fail git merge conflict2 &&
+	git rm submod &&
+	test ! -d submod &&
+	git status -s -uno --ignore-submodules=none >actual &&
+	test_cmp expect actual
 
-expecting success: 
-		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
+Already on 'conflict1'
+D	submod
+HEAD is now at b4e0aeb submod 1
+Merging:
+b4e0aeb submod 1
+virtual conflict2
+found 1 common ancestor:
+5c44702 add submodule
+Failed to merge submodule submod (merge following commits not found)
+Auto-merging submod
+CONFLICT (submodule): Merge conflict in submod
+Automatic merge failed; fix conflicts and then commit the result.
+submod: needs merge
+rm 'submod'
+ok 57 - rm of a conflicted unpopulated submodule succeeds
 
 expecting success: 
-		test 1 = 1
-	
-ok 7 - diff -U0 --inter-hunk-context=2, 1 common line: count hunks (1)
+	git checkout -f master &&
+	git reset --hard &&
+	git submodule update &&
+	(cd submod &&
+		rm .git &&
+		cp -R ../.git/modules/sub .git &&
+		GIT_WORK_TREE=. git config --unset core.worktree &&
+		rm -r ../.git/modules/sub
+	) &&
+	git rm submod 2>output.err &&
+	! test -d submod &&
+	! test -d submod/.git &&
+	git status -s -uno --ignore-submodules=none >actual &&
+	test -s actual &&
+	test_i18ngrep Migrating output.err
 
-expecting success: 
-		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
+Switched to branch 'master'
+HEAD is now at 5c44702 add submodule
+Submodule path 'submod': checked out 'a3ae6b0081a921605b4e64cd8c5bb3d4866ab72f'
+rm 'submod'
+Migrating git directory of 'submod' from
+ok 58 - rm of a populated submodule with a .git directory migrates git dir
 
 expecting success: 
-		test 1 = 1
-	
-ok 9 - diff -U1, 1 common line: count hunks (1)
+	git reset --hard &&
+	git submodule update &&
+	(cd submod &&
+		git update-index --add --cacheinfo 160000 $(git rev-parse HEAD) subsubmod &&
+		git config -f .gitmodules submodule.sub.url ../. &&
+		git config -f .gitmodules submodule.sub.path subsubmod &&
+		git submodule init &&
+		git add .gitmodules &&
+		git commit -m "add subsubmodule" &&
+		git submodule update subsubmod
+	) &&
+	git commit -a -m "added deep submodule"
 
-expecting success: 
-		test 2 = 2
-	
-ok 10 - diff -U0, 2 common lines: count hunks (2)
+HEAD is now at 5c44702 add submodule
+Submodule path 'submod': checked out 'a3ae6b0081a921605b4e64cd8c5bb3d4866ab72f'
+Submodule 'sub' (/build/git-2.20.1/t/trash directory.t3600-rm/.) registered for path 'subsubmod'
+[detached HEAD 83e7be8] add subsubmodule
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 subsubmod
+Cloning into '/build/git-2.20.1/t/trash directory.t3600-rm/submod/subsubmod'...
+done.
+Submodule path 'subsubmod': checked out 'a3ae6b0081a921605b4e64cd8c5bb3d4866ab72f'
+[master 86b8e6c] added deep submodule
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 59 - setup subsubmodule
 
 expecting success: 
-		test 2 = 2
-	
-ok 11 - diff -U0 --inter-hunk-context=0, 2 common lines: count hunks (2)
+	git rm submod &&
+	test ! -d submod &&
+	git status -s -uno --ignore-submodules=none >actual &&
+	test_cmp expect actual
 
-expecting success: 
-		test 2 = 2
-	
-ok 12 - diff -U0 --inter-hunk-context=1, 2 common lines: count hunks (2)
+rm 'submod'
+ok 60 - rm recursively removes work tree of unmodified submodules
 
 expecting success: 
-		test 1 = 1
-	
-ok 13 - diff -U0 --inter-hunk-context=2, 2 common lines: count hunks (1)
+	git reset --hard &&
+	git submodule update --recursive &&
+	git -C submod/subsubmod checkout HEAD^ &&
+	test_must_fail git rm submod &&
+	test -d submod &&
+	test -f submod/.git &&
+	git status -s -uno --ignore-submodules=none >actual &&
+	test_cmp expect.modified_inside actual &&
+	git rm -f submod &&
+	test ! -d submod &&
+	git status -s -uno --ignore-submodules=none >actual &&
+	test_cmp expect actual
 
-expecting success: 
-		test 1 = 1
-	
-ok 14 - diff -U1, 2 common lines: count hunks (1)
+HEAD is now at 86b8e6c added deep submodule
+Submodule path 'submod': checked out '83e7be8b5130ab75d35176ac9ccd2324f9cf14b4'
+Submodule path 'submod/subsubmod': checked out 'a3ae6b0081a921605b4e64cd8c5bb3d4866ab72f'
+Previous HEAD position was a3ae6b0 subdir test
+HEAD is now at e2e61f4 remove file from rm --quiet test
+error: the following file has local modifications:
+    submod
+(use --cached to keep the file, or -f to force removal)
+rm 'submod'
+ok 61 - rm of a populated nested submodule with different nested HEAD fails unless forced
 
 expecting success: 
-		test 2 = 2
-	
-ok 15 - diff -U1, 3 common lines: count hunks (2)
+	git reset --hard &&
+	git submodule update --recursive &&
+	echo X >submod/subsubmod/empty &&
+	test_must_fail git rm submod &&
+	test -d submod &&
+	test -f submod/.git &&
+	git status -s -uno --ignore-submodules=none >actual &&
+	test_cmp expect.modified_inside actual &&
+	git rm -f submod &&
+	test ! -d submod &&
+	git status -s -uno --ignore-submodules=none >actual &&
+	test_cmp expect actual
 
-expecting success: 
-		test 2 = 2
-	
-ok 16 - diff -U1 --inter-hunk-context=0, 3 common lines: count hunks (2)
+HEAD is now at 86b8e6c added deep submodule
+Submodule path 'submod': checked out '83e7be8b5130ab75d35176ac9ccd2324f9cf14b4'
+Submodule path 'submod/subsubmod': checked out 'a3ae6b0081a921605b4e64cd8c5bb3d4866ab72f'
+error: the following file has local modifications:
+    submod
+(use --cached to keep the file, or -f to force removal)
+rm 'submod'
+ok 62 - rm of a populated nested submodule with nested modifications fails unless forced
 
 expecting success: 
-		test 1 = 1
-	
-ok 17 - diff -U1 --inter-hunk-context=1, 3 common lines: count hunks (1)
+	git reset --hard &&
+	git submodule update --recursive &&
+	echo X >submod/subsubmod/untracked &&
+	test_must_fail git rm submod &&
+	test -d submod &&
+	test -f submod/.git &&
+	git status -s -uno --ignore-submodules=none >actual &&
+	test_cmp expect.modified_untracked actual &&
+	git rm -f submod &&
+	test ! -d submod &&
+	git status -s -uno --ignore-submodules=none >actual &&
+	test_cmp expect actual
+
+HEAD is now at 86b8e6c added deep submodule
+Submodule path 'submod': checked out '83e7be8b5130ab75d35176ac9ccd2324f9cf14b4'
+Submodule path 'submod/subsubmod': checked out 'a3ae6b0081a921605b4e64cd8c5bb3d4866ab72f'
+error: the following file has local modifications:
+    submod
+(use --cached to keep the file, or -f to force removal)
+rm 'submod'
+ok 63 - rm of a populated nested submodule with nested untracked files fails unless forced
 
 expecting success: 
-		test 1 = 1
-	
-ok 18 - diff -U1 --inter-hunk-context=2, 3 common lines: count hunks (1)
+	git reset --hard &&
+	git submodule update --recursive &&
+	(cd submod/subsubmod &&
+		rm .git &&
+		mv ../../.git/modules/sub/modules/sub .git &&
+		GIT_WORK_TREE=. git config --unset core.worktree
+	) &&
+	git rm submod 2>output.err &&
+	! test -d submod &&
+	! test -d submod/subsubmod/.git &&
+	git status -s -uno --ignore-submodules=none >actual &&
+	test -s actual &&
+	test_i18ngrep Migrating output.err
+
+HEAD is now at 86b8e6c added deep submodule
+Submodule path 'submod': checked out '83e7be8b5130ab75d35176ac9ccd2324f9cf14b4'
+Submodule path 'submod/subsubmod': checked out 'a3ae6b0081a921605b4e64cd8c5bb3d4866ab72f'
+rm 'submod'
+Migrating git directory of 'submod/subsubmod' from
+ok 64 - rm absorbs submodule's nested .git directory
 
 expecting success: 
-		test 2 = 2
-	
-ok 19 - diff -U3, 9 common lines: count hunks (2)
+	git commit -m "submodule removal" submod .gitmodules &&
+	git checkout HEAD^ &&
+	git submodule update &&
+	git checkout -q HEAD^ &&
+	git checkout -q master 2>actual &&
+	test_i18ngrep "^warning: unable to rmdir 'submod':" actual &&
+	git status -s submod >actual &&
+	echo "?? submod/" >expected &&
+	test_cmp expected actual &&
+	rm -rf submod &&
+	git status -s -uno --ignore-submodules=none >actual &&
+	test_must_be_empty actual
+
+[master c4651bf] submodule removal
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 deletions(-)
+ delete mode 160000 submod
+Note: checking out '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 performing another checkout.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -b with the checkout command again. Example:
+
+  git checkout -b <new-branch-name>
+
+HEAD is now at 86b8e6c added deep submodule
+Submodule path 'submod': checked out '83e7be8b5130ab75d35176ac9ccd2324f9cf14b4'
+warning: unable to rmdir 'submod': Directory not empty
+ok 65 - checking out a commit after submodule removal needs manual updates
 
 expecting success: 
-		test 2 = 2
-	
-ok 20 - diff -U3 --inter-hunk-context=2, 9 common lines: count hunks (2)
+	rm -rf d &&
+	mkdir d &&
+	>d/f &&
+	git add d &&
+	rm -rf d &&
+	>d &&
+	git rm d/f &&
+	test_must_fail git rev-parse --verify :d/f &&
+	test_path_is_file d
+
+rm 'd/f'
+fatal: Needed a single revision
+ok 66 - rm of d/f when d has become a non-directory
+
+checking prerequisite: SYMLINKS
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
+	# test whether the filesystem supports symbolic links
+	ln -s x y && test -h y
 
+)
+prerequisite SYMLINKS ok
 expecting success: 
-		test 1 = 1
-	
-ok 21 - diff -U3 --inter-hunk-context=3, 9 common lines: count hunks (1)
+	rm -rf d &&
+	mkdir d &&
+	>d/f &&
+	git add d &&
+	rm -rf d &&
+	ln -s nonexistent d &&
+	git rm d/f &&
+	test_must_fail git rev-parse --verify :d/f &&
+	test -h d &&
+	test_path_is_missing d
+
+rm 'd/f'
+fatal: Needed a single revision
+ok 67 - rm of d/f when d has become a dangling symlink
 
 expecting success: 
-		test 2 = 2
-	
-ok 22 - (diff.interHunkContext=0) diff -U0, 1 common line: count hunks (2)
+	rm -rf d &&
+	>d &&
+	git add d &&
+	rm -f d &&
+	mkdir d &&
+	>d/f &&
+	test_must_fail git rm d &&
+	git rev-parse --verify :d &&
+	test_path_is_file d/f
+
+fatal: git rm: 'd': Is a directory
+rm 'd'
+e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
+ok 68 - rm of file when it has become a directory
 
 expecting success: 
-		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
+	rm -rf d e &&
+	mkdir e &&
+	echo content >e/f &&
+	ln -s e d &&
+	git add -A e d &&
+	git commit -m "symlink d to e, e/f exists" &&
+	test_must_fail git rm d/f &&
+	git rev-parse --verify :d &&
+	git rev-parse --verify :e/f &&
+	test -h d &&
+	test_path_is_file e/f
+
+[master ecfbad8] symlink d to e, e/f exists
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 120000 d
+ create mode 100644 e/f
+fatal: pathspec 'd/f' did not match any files
+9cbe6ea56f225388ae614c419249bfc6d734cc30
+d95f3ad14dee633a758d2e331151e950dd13e4ed
+ok 69 - rm across a symlinked leading path (no index)
+
+checking known breakage: 
+	rm -rf d e &&
+	mkdir d &&
+	echo content >d/f &&
+	git add -A e d &&
+	git commit -m "d/f exists" &&
+	mv d e &&
+	ln -s e d &&
+	test_must_fail git rm d/f &&
+	git rev-parse --verify :d/f &&
+	test -h d &&
+	test_path_is_file e/f
+
+[master 525b00a] d/f exists
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 deletion(-)
+ delete mode 120000 d
+ rename {e => d}/f (100%)
+rm 'd/f'
+test_must_fail: command succeeded: git rm d/f
+not ok 70 - rm across a symlinked leading path (w/ index) # TODO known breakage
 
 expecting success: 
-		test 1 = 1
-	
-ok 24 - (diff.interHunkContext=1) diff -U0, 1 common line: count hunks (1)
+	>bar.txt &&
+	>foo.txt &&
+	git add bar.txt foo.txt
+
+ok 71 - setup for testing rm messages
 
 expecting success: 
-		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
+	cat >expect <<-\EOF &&
+	error: the following files have staged content different from both the
+	file and the HEAD:
+	    bar.txt
+	    foo.txt
+	(use -f to force removal)
+	EOF
+	echo content1 >foo.txt &&
+	echo content1 >bar.txt &&
+	test_must_fail git rm foo.txt bar.txt 2>actual &&
+	test_i18ncmp expect actual
+
+ok 72 - rm files with different staged content
 
 expecting success: 
-		test 1 = 1
-	
-ok 26 - (diff.interHunkContext=2) diff -U0, 1 common line: count hunks (1)
+	cat >expect <<-\EOF &&
+	error: the following files have staged content different from both the
+	file and the HEAD:
+	    bar.txt
+	    foo.txt
+	EOF
+	echo content2 >foo.txt &&
+	echo content2 >bar.txt &&
+	test_must_fail git -c advice.rmhints=false rm foo.txt bar.txt 2>actual &&
+	test_i18ncmp expect actual
+
+ok 73 - rm files with different staged content without hints
 
 expecting success: 
-		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
+	cat >expect <<-\EOF &&
+	error: the following file has local modifications:
+	    foo.txt
+	(use --cached to keep the file, or -f to force removal)
+	EOF
+	git commit -m "testing rm 3" &&
+	echo content3 >foo.txt &&
+	test_must_fail git rm foo.txt 2>actual &&
+	test_i18ncmp expect actual
+
+[master 5e3c3fc] testing rm 3
+ Author: A U Thor <author@example.com>
+ 3 files changed, 1 deletion(-)
+ create mode 100644 bar.txt
+ delete mode 100644 d/f
+ create mode 100644 foo.txt
+ok 74 - rm file with local modification
 
 expecting success: 
-		test 1 = 1
-	
-ok 28 - (diff.interHunkContext=3) diff -U3, 9 common lines: count hunks (1)
+	cat >expect <<-\EOF &&
+	error: the following file has local modifications:
+	    bar.txt
+	EOF
+	echo content4 >bar.txt &&
+	test_must_fail git -c advice.rmhints=false rm bar.txt 2>actual &&
+	test_i18ncmp expect actual
+
+ok 75 - rm file with local modification without hints
 
 expecting success: 
-		test 2 = 2
-	
-ok 29 - (diff.interHunkContext=0) diff -U0, 2 common lines: count hunks (2)
+	cat >expect <<-\EOF &&
+	error: the following file has changes staged in the index:
+	    foo.txt
+	(use --cached to keep the file, or -f to force removal)
+	EOF
+	git reset --hard &&
+	echo content5 >foo.txt &&
+	git add foo.txt &&
+	test_must_fail git rm foo.txt 2>actual &&
+	test_i18ncmp expect actual
+
+HEAD is now at 5e3c3fc testing rm 3
+ok 76 - rm file with changes in the index
 
 expecting success: 
-		test 2 = 2
-	
-ok 30 - (diff.interHunkContext=1) diff -U0, 2 common lines: count hunks (2)
+	cat >expect <<-\EOF &&
+	error: the following file has changes staged in the index:
+	    foo.txt
+	EOF
+	test_must_fail git -c advice.rmhints=false rm foo.txt 2>actual &&
+	test_i18ncmp expect actual
+
+ok 77 - rm file with changes in the index without hints
 
 expecting success: 
-		test 1 = 1
-	
-ok 31 - (diff.interHunkContext=2) diff -U0, 2 common lines: count hunks (1)
+	cat >expect <<-\EOF &&
+	error: the following file has staged content different from both the
+	file and the HEAD:
+	    foo1.txt
+	(use -f to force removal)
+	error: the following file has changes staged in the index:
+	    bar1.txt
+	(use --cached to keep the file, or -f to force removal)
+	EOF
+	echo content >foo1.txt &&
+	git add foo1.txt &&
+	echo content6 >foo1.txt &&
+	echo content6 >bar1.txt &&
+	git add bar1.txt &&
+	test_must_fail git rm bar1.txt foo1.txt 2>actual &&
+	test_i18ncmp expect actual
+
+ok 78 - rm files with two different errors
 
 expecting success: 
-		test 2 = 2
-	
-ok 32 - (diff.interHunkContext=0) diff -U1, 3 common lines: count hunks (2)
+	test_must_fail git rm -rf ""
+
+fatal: empty string is not a valid pathspec. please use . instead if you meant to match all paths
+ok 79 - rm empty string should fail
 
+# still have 1 known breakage(s)
+# passed all remaining 78 test(s)
+1..79
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t4043-diff-rename-binary.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4043-diff-rename-binary/.git/
 expecting success: 
-		test 1 = 1
-	
-ok 33 - (diff.interHunkContext=1) diff -U1, 3 common lines: count hunks (1)
+	git init &&
+	echo foo > foo &&
+	echo "barQ" | q_to_nul > bar &&
+	git add . &&
+	git commit -m "Initial commit"
+
+Reinitialized existing Git repository in /build/git-2.20.1/t/trash directory.t4043-diff-rename-binary/.git/
+[master (root-commit) a688aae] Initial commit
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+)
+ create mode 100644 bar
+ create mode 100644 foo
+ok 1 - prepare repository
 
 expecting success: 
-		test 1 = 1
-	
-ok 34 - (diff.interHunkContext=2) diff -U1, 3 common lines: count hunks (1)
+	mkdir sub &&
+	git mv bar foo sub/ &&
+	git commit -m "Moved to sub/"
+
+[master 360fd5c] Moved to sub/
+ Author: A U Thor <author@example.com>
+ 2 files changed, 0 insertions(+), 0 deletions(-)
+ rename bar => sub/bar (100%)
+ rename foo => sub/foo (100%)
+ok 2 - move the files into a "sub" directory
 
 expecting success: 
-		test 2 = 2
-	
-ok 35 - (diff.interHunkContext=2) diff -U3, 9 common lines: count hunks (2)
+	git show -C -C --raw --binary --numstat >patch-with-stat &&
+	tail -n 11 patch-with-stat >current &&
+	test_cmp expected current
+
+ok 3 - git show -C -C report renames
+
+# passed all 3 test(s)
+1..3
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t4044-diff-index-unique-abbrev.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4044-diff-index-unique-abbrev/.git/
+checking prerequisite: SHA1
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
+	test $(git hash-object /dev/null) = e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
 
+)
+prerequisite SHA1 ok
 expecting success: 
-		test 1 = 1
-	
-ok 36 - (diff.interHunkContext=3) diff -U3, 9 common lines: count hunks (1)
+	echo 4827 > foo &&
+	git add foo &&
+	git commit -m "initial" &&
+	git cat-file -p HEAD: > actual &&
+	test_cmp expect_initial actual &&
+	echo 11742 > foo &&
+	git commit -a -m "update" &&
+	git cat-file -p HEAD: > actual &&
+	test_cmp expect_update actual
+
+[master (root-commit) 09a8b22] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo
+[master 7bcfae7] update
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 1 - setup
 
 expecting success: 
-	git config diff.interHunkContext asdf &&
-	test_must_fail git diff &&
-	git config diff.interHunkContext -1 &&
-	test_must_fail git diff
+	git diff HEAD^..HEAD | grep index > actual &&
+	test_cmp expect actual
 
-fatal: bad numeric config value 'asdf' for 'diff.interhunkcontext': invalid unit
-fatal: bad config variable 'diff.interhunkcontext' in file '.git/config' at line 7
-ok 37 - diff.interHunkContext invalid
+ok 2 - diff does not produce ambiguous index line
 
-# passed all 37 test(s)
-1..37
+# passed all 2 test(s)
+1..2
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
 *** t4046-diff-unmerged.sh ***
@@ -106216,6 +106353,140 @@
 1..5
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
+*** t4042-diff-textconv-caching.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4042-diff-textconv-caching/.git/
+expecting success: 
+	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) c3b7701] 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 f4fa677] two
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+ok 1 - setup
+
+expecting success: 
+	git diff HEAD^ HEAD >actual &&
+	test_cmp expect actual
+
+ok 2 - first textconv works
+
+expecting success: 
+	git diff HEAD^ HEAD >actual &&
+	test_cmp expect actual
+
+ok 3 - cached textconv produces same output
+
+expecting success: 
+	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: 
+	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: 
+	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: 
+	git log --no-walk -p refs/notes/textconv/magic HEAD
+
+commit 50c026f804f9873a6becb4d388d65dbcd81f7878
+Author: A U Thor <author@example.com>
+Date:   Thu Jan 5 11:48:41 2023 +0000
+
+    ./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 f4fa67766d455de0bdda8948e4fc7ab74e4695a1
+Author: A U Thor <author@example.com>
+Date:   Thu Jan 5 11:48:41 2023 +0000
+
+    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
+
+# passed all 7 test(s)
+1..7
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
 *** t4034-diff-words.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4034-diff-words/.git/
 expecting success: 
@@ -106668,12 +106939,12 @@
 	echo "a bx; c" >z.txt &&
 	git commit -mmodified -a
 
-[master (root-commit) 8b5b9d1] initial
+[master (root-commit) a0f59ff] initial
  Author: A U Thor <author@example.com>
  2 files changed, 2 insertions(+)
  create mode 100644 a.tex
  create mode 100644 z.txt
-[master 40b1c1f] modified
+[master 04915a5] modified
  Author: A U Thor <author@example.com>
  2 files changed, 2 insertions(+), 2 deletions(-)
 ok 40 - setup history with two files
@@ -106702,6 +106973,31 @@
 1..41
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
+*** t4050-diff-histogram.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4050-diff-histogram/.git/
+expecting success: 
+		test_must_fail git diff --no-index "--$STRATEGY" file1 file2 > output &&
+		test_cmp expect output
+	
+ok 1 - histogram diff
+
+expecting success: 
+		mv file2 expect &&
+		git apply < output &&
+		test_cmp expect file2
+	
+ok 2 - histogram diff output is valid
+
+expecting success: 
+		test_must_fail git diff --no-index "--$STRATEGY" uniq1 uniq2 > output &&
+		test_cmp expect output
+	
+ok 3 - completely different files
+
+# passed all 3 test(s)
+1..3
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
 *** t4049-diff-stat-count.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4049-diff-stat-count/.git/
 expecting success: 
@@ -106712,7 +107008,7 @@
 	git add a b c d &&
 	git commit -m initial
 
-[master (root-commit) ebc55d1] initial
+[master (root-commit) 362762b] initial
  Author: A U Thor <author@example.com>
  4 files changed, 0 insertions(+), 0 deletions(-)
  create mode 100644 a
@@ -106735,7 +107031,7 @@
 	git diff --stat --stat-count=2 HEAD >actual &&
 	test_i18ncmp expect actual
 
-HEAD is now at ebc55d1 initial
+HEAD is now at 362762b initial
 ok 2 - mode-only change show as a 0-line change
 
 expecting success: 
@@ -106752,7 +107048,7 @@
 	git diff --stat --stat-count=2 >actual &&
 	test_i18ncmp expect actual
 
-HEAD is now at ebc55d1 initial
+HEAD is now at 362762b initial
 ok 3 - binary changes do not count in lines
 
 expecting success: 
@@ -106776,7 +107072,7 @@
 	git diff --stat --stat-count=2 >actual &&
 	test_i18ncmp expect actual
 
-HEAD is now at ebc55d1 initial
+HEAD is now at 362762b initial
 rm 'd'
 ok 4 - exclude unmerged entries from total file count
 
@@ -106795,9 +107091,9 @@
 	git add . &&
 	git commit -m one
 
-[master (root-commit) 5bdd27b] empty
+[master (root-commit) 5d0667b] empty
  Author: A U Thor <author@example.com>
-[master 855dcd2] one
+[master c229652] one
  Author: A U Thor <author@example.com>
  2 files changed, 2 insertions(+)
  create mode 100644 file1
@@ -106908,31 +107204,6 @@
 1..17
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t4050-diff-histogram.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4050-diff-histogram/.git/
-expecting success: 
-		test_must_fail git diff --no-index "--$STRATEGY" file1 file2 > output &&
-		test_cmp expect output
-	
-ok 1 - histogram diff
-
-expecting success: 
-		mv file2 expect &&
-		git apply < output &&
-		test_cmp expect file2
-	
-ok 2 - histogram diff output is valid
-
-expecting success: 
-		test_must_fail git diff --no-index "--$STRATEGY" uniq1 uniq2 > output &&
-		test_cmp expect output
-	
-ok 3 - completely different files
-
-# passed all 3 test(s)
-1..3
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
 *** t4048-diff-combined-binary.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4048-diff-combined-binary/.git/
 expecting success: 
@@ -106948,27 +107219,27 @@
 	echo resolvedQhooray | q_to_nul >binary &&
 	git commit -a -m resolved
 
-[master (root-commit) 08d606e] one
+[master (root-commit) c3bc606] one
  Author: A U Thor <author@example.com>
  1 file changed, 0 insertions(+), 0 deletions(-)
  create mode 100644 binary
-[master faa1249] two
+[master 2b75925] two
  Author: A U Thor <author@example.com>
  1 file changed, 0 insertions(+), 0 deletions(-)
 Switched to a new branch 'branch-binary'
-[branch-binary 48fe7fd] three
+[branch-binary 7b84f05] three
  Author: A U Thor <author@example.com>
  1 file changed, 0 insertions(+), 0 deletions(-)
 warning: Cannot merge binary files: binary (HEAD vs. master)
 Merging:
-48fe7fd three
+7b84f05 three
 virtual master
 found 1 common ancestor:
-08d606e one
+c3bc606 one
 Auto-merging binary
 CONFLICT (content): Merge conflict in binary
 Automatic merge failed; fix conflicts and then commit the result.
-[branch-binary 55d2895] resolved
+[branch-binary ef28630] resolved
  Author: A U Thor <author@example.com>
 ok 1 - setup binary merge conflict
 
@@ -107001,26 +107272,26 @@
 	echo text -diff >.gitattributes
 
 Switched to branch 'master'
-[master abf9059] one
+[master da6c6ea] one
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 text
-[master 8f3210b] two
+[master 0491ff6] two
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 Switched to a new branch 'branch-text'
-[branch-text 92a5062] three
+[branch-text 5ac1283] three
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 Merging:
-92a5062 three
+5ac1283 three
 virtual master
 found 1 common ancestor:
-abf9059 one
+da6c6ea one
 Auto-merging text
 CONFLICT (content): Merge conflict in text
 Automatic merge failed; fix conflicts and then commit the result.
-[branch-text 20cc0a4] resolved
+[branch-text d8e0b48] resolved
  Author: A U Thor <author@example.com>
 ok 5 - setup non-binary with binary attribute
 
@@ -107079,12 +107350,12 @@
 	git diff >actual &&
 	test_cmp expect actual
 
-HEAD is now at 92a5062 three
+HEAD is now at 5ac1283 three
 Merging:
-92a5062 three
+5ac1283 three
 virtual master
 found 1 common ancestor:
-abf9059 one
+da6c6ea one
 Auto-merging text
 CONFLICT (content): Merge conflict in text
 Automatic merge failed; fix conflicts and then commit the result.
@@ -107094,6 +107365,107 @@
 1..14
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
+*** t4054-diff-bogus-tree.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4054-diff-bogus-tree/.git/
+expecting success: 
+	bogus_tree=$(
+		printf "100644 fooQQQQQQQQQQQQQQQQQQQQQ" |
+		q_to_nul |
+		git hash-object -w --stdin -t tree
+	)
+
+ok 1 - create bogus tree
+
+expecting success: 
+	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: 
+	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: 
+	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: 
+	echo ":100644 100644 $blob $ZERO_OID M	foo" >expect &&
+	git diff-tree $good_tree $bogus_tree >actual &&
+	test_cmp expect actual
+
+ok 5 - raw diff shows null sha1 (modification)
+
+expecting success: 
+	echo ":100644 100644 $ZERO_OID $blob M	foo" >expect &&
+	git diff-tree $bogus_tree $good_tree >actual &&
+	test_cmp expect actual
+
+ok 6 - raw diff shows null sha1 (other direction)
+
+expecting success: 
+	echo ":100644 100644 $ZERO_OID $blob M	foo" >expect &&
+	git diff-tree -R $good_tree $bogus_tree >actual &&
+	test_cmp expect actual
+
+ok 7 - raw diff shows null sha1 (reverse)
+
+expecting success: 
+	echo ":100644 100644 $ZERO_OID $blob M	foo" >expect &&
+	git diff-index $bogus_tree >actual &&
+	test_cmp expect actual
+
+ok 8 - raw diff shows null sha1 (index)
+
+expecting success: 
+	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: 
+	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: 
+	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: 
+	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: 
+	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: 
+	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/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
 *** t3906-stash-submodule.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3906-stash-submodule/.git/
 checking known breakage: 
@@ -107110,21 +107482,21 @@
 		)
 	
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3906-stash-submodule/submodule_update_sub1/.git/
-[master (root-commit) 0e62869] Base inside first submodule
+[master (root-commit) 38689ae] 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/git-2.20.1/t/trash directory.t3906-stash-submodule/submodule_update_sub2/.git/
-[master (root-commit) 1156551] nested submodule base
+[master (root-commit) b09f715] 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/git-2.20.1/t/trash directory.t3906-stash-submodule/submodule_update_repo/.git/
-[master (root-commit) 8fa9e5b] Base
+[master (root-commit) 1428bf8] Base
  Author: A U Thor <author@example.com>
  3 files changed, 4 insertions(+)
  create mode 100644 .gitignore
@@ -107135,7 +107507,7 @@
 done.
 Cloning into '/build/git-2.20.1/t/trash directory.t3906-stash-submodule/submodule_update_repo/uninitialized_sub'...
 done.
-[add_sub1 c92b64f] Add sub1
+[add_sub1 0a2a0a7] Add sub1
  Author: A U Thor <author@example.com>
  2 files changed, 8 insertions(+)
  create mode 100644 .gitmodules
@@ -107144,45 +107516,45 @@
 Removing uninitialized_sub
 Removing sub1
 Removing .gitmodules
-[remove_sub1 f83feba] Revert "Add sub1"
+[remove_sub1 01be79e] Revert "Add sub1"
  Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:06:33 2021 +0000
+ Date: Thu Jan 5 11:48:27 2023 +0000
  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 6a99306] modified file2 and added file3
+[modifications 0502cb6] 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/git-2.20.1/t/trash directory.t3906-stash-submodule/submodule_update_sub1
  * [new branch]      modifications -> modifications
-[modify_sub1 7f4d1b5] Modify sub1
+[modify_sub1 c034322] 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/git-2.20.1/t/trash directory.t3906-stash-submodule/submodule_update_repo/sub1/sub2'...
 done.
-[add_nested_sub ef3f804] add a nested submodule
+[add_nested_sub 8c01322] 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 54f2f17] update submodule, that updates a nested submodule
+[add_nested_sub 4bf12f1] 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 ab07fdd] make a change in nested sub
+[modify_sub1_recursively 1ac69e5] 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 1129056] update nested sub
+[modify_sub1_recursively 9418375] update nested sub
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-[modify_sub1_recursively 5d9121a] update sub1, that updates nested sub
+[modify_sub1_recursively 04febe6] update sub1, that updates nested sub
  Author: A U Thor <author@example.com>
 To /build/git-2.20.1/t/trash directory.t3906-stash-submodule/submodule_update_sub1
  * [new branch]      modify_sub1_recursively -> modify_sub1_recursively
@@ -107191,11 +107563,11 @@
 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 '0e628698621512039e8d8ede94087f4667bb6aa8'
-Previous HEAD position was 0e62869 Base inside first submodule
+Submodule path 'sub1': checked out '38689aea38861f1d6e7eb19b8cd44972f95e8f96'
+Previous HEAD position was 38689ae Base inside first submodule
 Switched to branch 'modifications'
 rm 'sub1'
-[replace_sub1_with_directory 0f12700] Replace sub1 with directory
+[replace_sub1_with_directory 06e3268] Replace sub1 with directory
  Author: A U Thor <author@example.com>
  5 files changed, 3 insertions(+), 5 deletions(-)
  delete mode 160000 sub1
@@ -107207,32 +107579,32 @@
 Removing sub1/file2
 Removing sub1/file1
 Adding sub1
-[replace_directory_with_sub1 7d95953] Revert "Replace sub1 with directory"
+[replace_directory_with_sub1 0e97bbf] Revert "Replace sub1 with directory"
  Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:06:35 2021 +0000
+ Date: Thu Jan 5 11:48:30 2023 +0000
  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 684b32c] Replace sub1 with file
+[replace_sub1_with_file f36ddfa] 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 437a2e4] Revert "Replace sub1 with file"
+[replace_file_with_sub1 55d321a] Revert "Replace sub1 with file"
  Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:06:36 2021 +0000
+ Date: Thu Jan 5 11:48:30 2023 +0000
  2 files changed, 5 insertions(+), 1 deletion(-)
  mode change 100644 => 160000 sub1
 Switched to a new branch 'invalid_sub1'
-[invalid_sub1 73cb4b5] Invalid sub1 commit
+[invalid_sub1 c34bdd8] Invalid sub1 commit
  Author: A U Thor <author@example.com>
 Switched to a new branch 'valid_sub1'
-[valid_sub1 3f31a7a] Revert "Invalid sub1 commit"
+[valid_sub1 8c6e2c1] Revert "Invalid sub1 commit"
  Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:06:36 2021 +0000
+ Date: Thu Jan 5 11:48:30 2023 +0000
 warning: unable to rmdir 'uninitialized_sub': Directory not empty
 Switched to branch 'master'
 Cloning into 'submodule_update'...
@@ -107240,7 +107612,7 @@
 Switched to a new branch 'no_submodule'
 Branch 'no_submodule' set up to track remote branch 'no_submodule' from 'origin'.
 Branch 'add_sub1' set up to track remote branch 'add_sub1' from 'origin'.
-Saved working directory and index state WIP on no_submodule: 8fa9e5b Base
+Saved working directory and index state WIP on no_submodule: 1428bf8 Base
 Merging Version stash was based on with Stashed changes
 Merging:
 virtual Version stash was based on
@@ -107271,9 +107643,9 @@
 Switched to a new branch 'no_submodule'
 Branch 'no_submodule' set up to track remote branch 'no_submodule' from 'origin'.
 Branch 'add_sub1' set up to track remote branch 'add_sub1' from 'origin'.
-Saved working directory and index state WIP on no_submodule: 8fa9e5b Base
---- expect	2021-12-03 05:06:37.293355155 +0000
-+++ actual	2021-12-03 05:06:37.717342805 +0000
+Saved working directory and index state WIP on no_submodule: 1428bf8 Base
+--- expect	2023-01-05 11:48:32.118868030 +0000
++++ actual	2023-01-05 11:48:32.690868030 +0000
 @@ -2,5 +2,3 @@
  expect
  file1
@@ -107301,13 +107673,13 @@
 Branch 'replace_sub1_with_file' set up to track remote branch 'replace_sub1_with_file' from 'origin'.
 fatal: Needed a single revision
 Branch 'replace_file_with_sub1' set up to track remote branch 'replace_file_with_sub1' from 'origin'.
-Saved working directory and index state WIP on replace_sub1_with_file: 684b32c Replace sub1 with file
+Saved working directory and index state WIP on replace_sub1_with_file: f36ddfa Replace sub1 with file
 Merging Version stash was based on with Stashed changes
 Merging:
 virtual Version stash was based on
 virtual Stashed changes
 found 1 common ancestor:
-virtual d43223bbfa2e98ea9fa66a49fe9f1ea48860cf4a
+virtual 3567e1f7aef5e034a8883ab70a5df2eecfd5c05e
 On branch replace_sub1_with_file
 Your branch is up to date with 'origin/replace_sub1_with_file'.
 
@@ -107321,7 +107693,7 @@
 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 0e628698621512039e8d8ede94087f4667bb6aa8 d95f3ad14dee633a758d2e331151e950dd13e4ed T	sub1
+:160000 100644 38689aea38861f1d6e7eb19b8cd44972f95e8f96 d95f3ad14dee633a758d2e331151e950dd13e4ed T	sub1
 not ok 3 - git_stash: replace tracked file with submodule creates empty directory # TODO known breakage
 
 checking known breakage: 
@@ -107343,13 +107715,13 @@
 Branch 'replace_sub1_with_directory' set up to track remote branch 'replace_sub1_with_directory' from 'origin'.
 fatal: Needed a single revision
 Branch 'replace_directory_with_sub1' set up to track remote branch 'replace_directory_with_sub1' from 'origin'.
-Saved working directory and index state WIP on replace_sub1_with_directory: 0f12700 Replace sub1 with directory
+Saved working directory and index state WIP on replace_sub1_with_directory: 06e3268 Replace sub1 with directory
 Merging Version stash was based on with Stashed changes
 Merging:
 virtual Version stash was based on
 virtual Stashed changes
 found 1 common ancestor:
-virtual 9ba3b742d2c3179cdc3aea817e7a626ef5a11d5d
+virtual a3810fe109046a251d1275f8cce4b25219666aef
 Removing sub1/file3
 Removing sub1/file2
 Removing sub1/file1
@@ -107392,16 +107764,16 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t3906-stash-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t3906-stash-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out '0e628698621512039e8d8ede94087f4667bb6aa8'
+Submodule path 'sub1': checked out '38689aea38861f1d6e7eb19b8cd44972f95e8f96'
 Branch 'remove_sub1' set up to track remote branch 'remove_sub1' from 'origin'.
 warning: unable to rmdir 'sub1': Directory not empty
-Saved working directory and index state WIP on add_sub1: c92b64f Add sub1
+Saved working directory and index state WIP on add_sub1: 0a2a0a7 Add sub1
 Merging Version stash was based on with Stashed changes
 Merging:
 virtual Version stash was based on
 virtual Stashed changes
 found 1 common ancestor:
-virtual 8fb22bc0443f3adf5213154ff07ce7680afa14ef
+virtual 35e1d035046a2eca5eb0cf2331fff20a7d409538
 Removing uninitialized_sub
 Removing sub1
 Removing .gitmodules
@@ -107417,7 +107789,7 @@
 no changes added to commit (use "git add" and/or "git commit -a")
 'actual' is not empty, it contains:
 :000000 100644 0000000000000000000000000000000000000000 af3a0c56edfba1a28f50ada5ec2832a7f2f9b907 A	.gitmodules
-:000000 160000 0000000000000000000000000000000000000000 0e628698621512039e8d8ede94087f4667bb6aa8 A	uninitialized_sub
+:000000 160000 0000000000000000000000000000000000000000 38689aea38861f1d6e7eb19b8cd44972f95e8f96 A	uninitialized_sub
 not ok 5 - git_stash: removed submodule leaves submodule directory and its contents in place # TODO known breakage
 
 checking known breakage: 
@@ -107440,16 +107812,16 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t3906-stash-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t3906-stash-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out '0e628698621512039e8d8ede94087f4667bb6aa8'
+Submodule path 'sub1': checked out '38689aea38861f1d6e7eb19b8cd44972f95e8f96'
 Branch 'remove_sub1' set up to track remote branch 'remove_sub1' from 'origin'.
 warning: unable to rmdir 'sub1': Directory not empty
-Saved working directory and index state WIP on add_sub1: c92b64f Add sub1
+Saved working directory and index state WIP on add_sub1: 0a2a0a7 Add sub1
 Merging Version stash was based on with Stashed changes
 Merging:
 virtual Version stash was based on
 virtual Stashed changes
 found 1 common ancestor:
-virtual 8fb22bc0443f3adf5213154ff07ce7680afa14ef
+virtual 35e1d035046a2eca5eb0cf2331fff20a7d409538
 Removing uninitialized_sub
 Removing sub1
 Removing .gitmodules
@@ -107465,7 +107837,7 @@
 no changes added to commit (use "git add" and/or "git commit -a")
 'actual' is not empty, it contains:
 :000000 100644 0000000000000000000000000000000000000000 af3a0c56edfba1a28f50ada5ec2832a7f2f9b907 A	.gitmodules
-:000000 160000 0000000000000000000000000000000000000000 0e628698621512039e8d8ede94087f4667bb6aa8 A	uninitialized_sub
+:000000 160000 0000000000000000000000000000000000000000 38689aea38861f1d6e7eb19b8cd44972f95e8f96 A	uninitialized_sub
 not ok 6 - git_stash: removed submodule leaves submodule containing a .git directory alone # TODO known breakage
 
 expecting success: 
@@ -107486,7 +107858,7 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t3906-stash-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t3906-stash-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out '0e628698621512039e8d8ede94087f4667bb6aa8'
+Submodule path 'sub1': checked out '38689aea38861f1d6e7eb19b8cd44972f95e8f96'
 Branch 'replace_sub1_with_directory' set up to track remote branch 'replace_sub1_with_directory' from 'origin'.
 error: Untracked working tree file 'sub1/file1' would be overwritten by merge.
 ok 7 - git_stash: replace submodule with a directory must fail
@@ -107511,7 +107883,7 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t3906-stash-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t3906-stash-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out '0e628698621512039e8d8ede94087f4667bb6aa8'
+Submodule path 'sub1': checked out '38689aea38861f1d6e7eb19b8cd44972f95e8f96'
 Branch 'replace_sub1_with_directory' set up to track remote branch 'replace_sub1_with_directory' from 'origin'.
 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
@@ -107534,11 +107906,11 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t3906-stash-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t3906-stash-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out '0e628698621512039e8d8ede94087f4667bb6aa8'
+Submodule path 'sub1': checked out '38689aea38861f1d6e7eb19b8cd44972f95e8f96'
 Branch 'replace_sub1_with_file' set up to track remote branch 'replace_sub1_with_file' from 'origin'.
-Saved working directory and index state WIP on add_sub1: c92b64f Add sub1
---- expect	2021-12-03 05:06:49.752992219 +0000
-+++ actual	2021-12-03 05:06:50.344974975 +0000
+Saved working directory and index state WIP on add_sub1: 0a2a0a7 Add sub1
+--- expect	2023-01-05 11:48:39.778868030 +0000
++++ actual	2023-01-05 11:48:40.142868030 +0000
 @@ -4,7 +4,5 @@
  file2
  
@@ -107570,11 +107942,11 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t3906-stash-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t3906-stash-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out '0e628698621512039e8d8ede94087f4667bb6aa8'
+Submodule path 'sub1': checked out '38689aea38861f1d6e7eb19b8cd44972f95e8f96'
 Branch 'replace_sub1_with_file' set up to track remote branch 'replace_sub1_with_file' from 'origin'.
-Saved working directory and index state WIP on add_sub1: c92b64f Add sub1
---- expect	2021-12-03 05:06:51.060954119 +0000
-+++ actual	2021-12-03 05:06:51.640937225 +0000
+Saved working directory and index state WIP on add_sub1: 0a2a0a7 Add sub1
+--- expect	2023-01-05 11:48:40.778868030 +0000
++++ actual	2023-01-05 11:48:41.198868030 +0000
 @@ -4,7 +4,5 @@
  file2
  
@@ -107606,11 +107978,11 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t3906-stash-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t3906-stash-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out '0e628698621512039e8d8ede94087f4667bb6aa8'
+Submodule path 'sub1': checked out '38689aea38861f1d6e7eb19b8cd44972f95e8f96'
 Branch 'modify_sub1' set up to track remote branch 'modify_sub1' from 'origin'.
 No local changes to save
---- expect	2021-12-03 05:06:52.248919515 +0000
-+++ actual	2021-12-03 05:06:52.468913107 +0000
+--- expect	2023-01-05 11:48:41.718868030 +0000
++++ actual	2023-01-05 11:48:41.910868030 +0000
 @@ -1,3 +1,4 @@
 +M  sub1
  actual
@@ -107638,11 +108010,11 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t3906-stash-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t3906-stash-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out '0e628698621512039e8d8ede94087f4667bb6aa8'
+Submodule path 'sub1': checked out '38689aea38861f1d6e7eb19b8cd44972f95e8f96'
 Branch 'invalid_sub1' set up to track remote branch 'invalid_sub1' from 'origin'.
 No local changes to save
---- expect	2021-12-03 05:06:53.028896795 +0000
-+++ actual	2021-12-03 05:06:53.280889455 +0000
+--- expect	2023-01-05 11:48:42.414868030 +0000
++++ actual	2023-01-05 11:48:42.590868030 +0000
 @@ -1,3 +1,4 @@
 +M  sub1
  actual
@@ -107670,8 +108042,8 @@
 fatal: Needed a single revision
 Branch 'valid_sub1' set up to track remote branch 'valid_sub1' from 'origin'.
 No local changes to save
---- expect	2021-12-03 05:06:53.480883629 +0000
-+++ actual	2021-12-03 05:06:53.712876871 +0000
+--- expect	2023-01-05 11:48:42.810868030 +0000
++++ actual	2023-01-05 11:48:43.066868030 +0000
 @@ -1,3 +1,4 @@
 +M  sub1
  actual
@@ -107857,107 +108229,6 @@
 1..13
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t4054-diff-bogus-tree.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4054-diff-bogus-tree/.git/
-expecting success: 
-	bogus_tree=$(
-		printf "100644 fooQQQQQQQQQQQQQQQQQQQQQ" |
-		q_to_nul |
-		git hash-object -w --stdin -t tree
-	)
-
-ok 1 - create bogus tree
-
-expecting success: 
-	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: 
-	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: 
-	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: 
-	echo ":100644 100644 $blob $ZERO_OID M	foo" >expect &&
-	git diff-tree $good_tree $bogus_tree >actual &&
-	test_cmp expect actual
-
-ok 5 - raw diff shows null sha1 (modification)
-
-expecting success: 
-	echo ":100644 100644 $ZERO_OID $blob M	foo" >expect &&
-	git diff-tree $bogus_tree $good_tree >actual &&
-	test_cmp expect actual
-
-ok 6 - raw diff shows null sha1 (other direction)
-
-expecting success: 
-	echo ":100644 100644 $ZERO_OID $blob M	foo" >expect &&
-	git diff-tree -R $good_tree $bogus_tree >actual &&
-	test_cmp expect actual
-
-ok 7 - raw diff shows null sha1 (reverse)
-
-expecting success: 
-	echo ":100644 100644 $ZERO_OID $blob M	foo" >expect &&
-	git diff-index $bogus_tree >actual &&
-	test_cmp expect actual
-
-ok 8 - raw diff shows null sha1 (index)
-
-expecting success: 
-	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: 
-	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: 
-	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: 
-	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: 
-	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: 
-	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/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
 *** t4055-diff-context.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4055-diff-context/.git/
 expecting success: 
@@ -107988,11 +108259,11 @@
 
 	sed "s/TARGET/MODIFIED/" >x <template
 
-[master (root-commit) b2570c0] initial
+[master (root-commit) 37c2538] initial
  Author: A U Thor <author@example.com>
  1 file changed, 14 insertions(+)
  create mode 100644 x
-[master ef07fc9] next
+[master 220969a] next
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 ok 1 - setup
@@ -108127,598 +108398,6 @@
 1..3
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t4041-diff-submodule-option.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4041-diff-submodule-option/.git/
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4041-diff-submodule-option/sm1/.git/
-expecting success: 
-	git add sm1 &&
-	git diff-index -p --submodule=log HEAD >actual &&
-	cat >expected <<-EOF &&
-	Submodule sm1 0000000...$head1 (new submodule)
-	EOF
-	test_cmp expected actual
-
-warning: adding embedded git repository: sm1
-hint: You've added another git repository inside your current repository.
-hint: Clones of the outer repository will not contain the contents of
-hint: the embedded repository and will not know how to obtain it.
-hint: If you meant to add a submodule, use:
-hint: 
-hint: 	git submodule add <url> sm1
-hint: 
-hint: If you added this path by mistake, you can remove it from the
-hint: index with:
-hint: 
-hint: 	git rm --cached sm1
-hint: 
-hint: See "git help submodule" for more information.
-ok 1 - added submodule
-
-expecting success: 
-	git config diff.submodule log &&
-	git add sm1 &&
-	git diff --cached >actual &&
-	cat >expected <<-EOF &&
-	Submodule sm1 0000000...$head1 (new submodule)
-	EOF
-	git config --unset diff.submodule &&
-	test_cmp expected actual
-
-ok 2 - added submodule, set diff.submodule
-
-expecting success: 
-	test_config diff.submodule log &&
-	git add sm1 &&
-	git diff --submodule=short --cached >actual &&
-	cat >expected <<-EOF &&
-	diff --git a/sm1 b/sm1
-	new file mode 160000
-	index 0000000..$head1
-	--- /dev/null
-	+++ b/sm1
-	@@ -0,0 +1 @@
-	+Subproject commit $fullhead1
-	EOF
-	test_cmp expected actual
-
-ok 3 - --submodule=short overrides diff.submodule
-
-expecting success: 
-	test_config diff.submodule log &&
-	git diff-index -p HEAD >actual &&
-	cat >expected <<-EOF &&
-	diff --git a/sm1 b/sm1
-	new file mode 160000
-	index 0000000..$head1
-	--- /dev/null
-	+++ b/sm1
-	@@ -0,0 +1 @@
-	+Subproject commit $fullhead1
-	EOF
-	test_cmp expected actual
-
-ok 4 - diff.submodule does not affect plumbing
-
-expecting success: 
-	git diff-index -p --submodule=log HEAD >actual &&
-	cat >expected <<-EOF &&
-	Submodule sm1 $head1..$head2:
-	  > Add foo3 ($added foo3)
-	EOF
-	test_cmp expected actual
-
-ok 5 - modified submodule(forward)
-
-expecting success: 
-	git diff --submodule=log >actual &&
-	cat >expected <<-EOF &&
-	Submodule sm1 $head1..$head2:
-	  > Add foo3 ($added foo3)
-	EOF
-	test_cmp expected actual
-
-ok 6 - modified submodule(forward)
-
-expecting success: 
-	git diff --submodule >actual &&
-	cat >expected <<-EOF &&
-	Submodule sm1 $head1..$head2:
-	  > Add foo3 ($added foo3)
-	EOF
-	test_cmp expected actual
-
-ok 7 - modified submodule(forward) --submodule
-
-expecting success: 
-	git diff --submodule=short >actual &&
-	cat >expected <<-EOF &&
-	diff --git a/sm1 b/sm1
-	index $head1..$head2 160000
-	--- a/sm1
-	+++ b/sm1
-	@@ -1 +1 @@
-	-Subproject commit $fullhead1
-	+Subproject commit $fullhead2
-	EOF
-	test_cmp expected actual
-
-ok 8 - modified submodule(forward) --submodule=short
-
-expecting success: 
-	git diff-index -p --submodule=log HEAD >actual &&
-	cat >expected <<-EOF &&
-	Submodule sm1 $head2..$head3 (rewind):
-	  < Add foo3 ($added foo3)
-	  < Add foo2 ($added foo2)
-	EOF
-	test_cmp expected actual
-
-ok 9 - modified submodule(backward)
-
-expecting success: 
-	git diff-index -p --submodule=log HEAD >actual &&
-	cat >expected <<-EOF &&
-	Submodule sm1 $head2...$head4:
-	  > Add foo5 ($added foo5)
-	  > Add foo4 ($added foo4)
-	  < Add foo3 ($added foo3)
-	  < Add foo2 ($added foo2)
-	EOF
-	test_cmp expected actual
-
-ok 10 - modified submodule(backward and forward)
-
-expecting success: 
-	git diff --submodule=log --cached >actual &&
-	cat >expected <<-EOF &&
-	Submodule sm1 $head4...0000000 (submodule deleted)
-	diff --git a/sm1 b/sm1
-	new file mode 100644
-	index 0000000..$head5
-	--- /dev/null
-	+++ b/sm1
-	@@ -0,0 +1 @@
-	+sm1
-	EOF
-	test_cmp expected actual
-
-ok 11 - typechanged submodule(submodule->blob), --cached
-
-expecting success: 
-	git diff --submodule=log >actual &&
-	cat >expected <<-EOF &&
-	diff --git a/sm1 b/sm1
-	deleted file mode 100644
-	index $head5..0000000
-	--- a/sm1
-	+++ /dev/null
-	@@ -1 +0,0 @@
-	-sm1
-	Submodule sm1 0000000...$head4 (new submodule)
-	EOF
-	test_cmp expected actual
-
-ok 12 - typechanged submodule(submodule->blob)
-
-expecting success: 
-	git diff-index -p --submodule=log HEAD >actual &&
-	cat >expected <<-EOF &&
-	Submodule sm1 $head4...0000000 (submodule deleted)
-	diff --git a/sm1 b/sm1
-	new file mode 100644
-	index 0000000..$head5
-	--- /dev/null
-	+++ b/sm1
-	@@ -0,0 +1 @@
-	+sm1
-	EOF
-	test_cmp expected actual
-
-ok 13 - typechanged submodule(submodule->blob)
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4041-diff-submodule-option/sm1/.git/
-expecting success: 
-	git diff-index -p --submodule=log HEAD >actual &&
-	cat >expected <<-EOF &&
-	Submodule sm1 $head4...$head6 (commits not present)
-	EOF
-	test_cmp expected actual
-
-ok 14 - nonexistent commit
-
-expecting success: 
-	git diff-index -p --submodule=log HEAD >actual &&
-	cat >expected <<-EOF &&
-	diff --git a/sm1 b/sm1
-	deleted file mode 100644
-	index $head5..0000000
-	--- a/sm1
-	+++ /dev/null
-	@@ -1 +0,0 @@
-	-sm1
-	Submodule sm1 0000000...$head6 (new submodule)
-	EOF
-	test_cmp expected actual
-
-ok 15 - typechanged submodule(blob->submodule)
-
-expecting success: 
-	git diff-index -p --submodule=log HEAD >actual &&
-	test_must_be_empty actual
-
-ok 16 - submodule is up to date
-
-expecting success: 
-	echo new > sm1/new-file &&
-	git diff-index -p --submodule=log HEAD >actual &&
-	cat >expected <<-EOF &&
-	Submodule sm1 contains untracked content
-	EOF
-	test_cmp expected actual
-
-ok 17 - submodule contains untracked content
-
-expecting success: 
-	git diff-index -p --ignore-submodules=untracked --submodule=log HEAD >actual &&
-	test_must_be_empty actual
-
-ok 18 - submodule contains untracked content (untracked ignored)
-
-expecting success: 
-	git diff-index -p --ignore-submodules=dirty --submodule=log HEAD >actual &&
-	test_must_be_empty actual
-
-ok 19 - submodule contains untracked content (dirty ignored)
-
-expecting success: 
-	git diff-index -p --ignore-submodules=all --submodule=log HEAD >actual &&
-	test_must_be_empty actual
-
-ok 20 - submodule contains untracked content (all ignored)
-
-expecting success: 
-	echo new > sm1/foo6 &&
-	git diff-index -p --submodule=log HEAD >actual &&
-	cat >expected <<-EOF &&
-	Submodule sm1 contains untracked content
-	Submodule sm1 contains modified content
-	EOF
-	test_cmp expected actual
-
-ok 21 - submodule contains untracked and modifed content
-
-expecting success: 
-	echo new > sm1/foo6 &&
-	git diff-index -p --ignore-submodules=untracked --submodule=log HEAD >actual &&
-	cat >expected <<-EOF &&
-	Submodule sm1 contains modified content
-	EOF
-	test_cmp expected actual
-
-ok 22 - submodule contains untracked and modifed content (untracked ignored)
-
-expecting success: 
-	echo new > sm1/foo6 &&
-	git diff-index -p --ignore-submodules=dirty --submodule=log HEAD >actual &&
-	test_must_be_empty actual
-
-ok 23 - submodule contains untracked and modifed content (dirty ignored)
-
-expecting success: 
-	echo new > sm1/foo6 &&
-	git diff-index -p --ignore-submodules --submodule=log HEAD >actual &&
-	test_must_be_empty actual
-
-ok 24 - submodule contains untracked and modifed content (all ignored)
-
-expecting success: 
-	rm -f sm1/new-file &&
-	git diff-index -p --submodule=log HEAD >actual &&
-	cat >expected <<-EOF &&
-	Submodule sm1 contains modified content
-	EOF
-	test_cmp expected actual
-
-ok 25 - submodule contains modifed content
-
-expecting success: 
-	git diff-index -p --submodule=log HEAD >actual &&
-	cat >expected <<-EOF &&
-	Submodule sm1 $head6..$head8:
-	  > change
-	EOF
-	test_cmp expected actual
-
-ok 26 - submodule is modified
-
-expecting success: 
-	echo new > sm1/new-file &&
-	git diff-index -p --submodule=log HEAD >actual &&
-	cat >expected <<-EOF &&
-	Submodule sm1 contains untracked content
-	Submodule sm1 $head6..$head8:
-	  > change
-	EOF
-	test_cmp expected actual
-
-ok 27 - modified submodule contains untracked content
-
-expecting success: 
-	git diff-index -p --ignore-submodules=untracked --submodule=log HEAD >actual &&
-	cat >expected <<-EOF &&
-	Submodule sm1 $head6..$head8:
-	  > change
-	EOF
-	test_cmp expected actual
-
-ok 28 - modified submodule contains untracked content (untracked ignored)
-
-expecting success: 
-	git diff-index -p --ignore-submodules=dirty --submodule=log HEAD >actual &&
-	cat >expected <<-EOF &&
-	Submodule sm1 $head6..$head8:
-	  > change
-	EOF
-	test_cmp expected actual
-
-ok 29 - modified submodule contains untracked content (dirty ignored)
-
-expecting success: 
-	git diff-index -p --ignore-submodules=all --submodule=log HEAD >actual &&
-	test_must_be_empty actual
-
-ok 30 - modified submodule contains untracked content (all ignored)
-
-expecting success: 
-	echo modification >> sm1/foo6 &&
-	git diff-index -p --submodule=log HEAD >actual &&
-	cat >expected <<-EOF &&
-	Submodule sm1 contains untracked content
-	Submodule sm1 contains modified content
-	Submodule sm1 $head6..$head8:
-	  > change
-	EOF
-	test_cmp expected actual
-
-ok 31 - modified submodule contains untracked and modifed content
-
-expecting success: 
-	echo modification >> sm1/foo6 &&
-	git diff-index -p --ignore-submodules=untracked --submodule=log HEAD >actual &&
-	cat >expected <<-EOF &&
-	Submodule sm1 contains modified content
-	Submodule sm1 $head6..$head8:
-	  > change
-	EOF
-	test_cmp expected actual
-
-ok 32 - modified submodule contains untracked and modifed content (untracked ignored)
-
-expecting success: 
-	echo modification >> sm1/foo6 &&
-	git diff-index -p --ignore-submodules=dirty --submodule=log HEAD >actual &&
-	cat >expected <<-EOF &&
-	Submodule sm1 $head6..$head8:
-	  > change
-	EOF
-	test_cmp expected actual
-
-ok 33 - modified submodule contains untracked and modifed content (dirty ignored)
-
-expecting success: 
-	echo modification >> sm1/foo6 &&
-	git diff-index -p --ignore-submodules --submodule=log HEAD >actual &&
-	test_must_be_empty actual
-
-ok 34 - modified submodule contains untracked and modifed content (all ignored)
-
-expecting success: 
-	rm -f sm1/new-file &&
-	git diff-index -p --submodule=log HEAD >actual &&
-	cat >expected <<-EOF &&
-	Submodule sm1 contains modified content
-	Submodule sm1 $head6..$head8:
-	  > change
-	EOF
-	test_cmp expected actual
-
-ok 35 - modified submodule contains modifed content
-
-expecting success: 
-	git diff-index -p --submodule=log HEAD >actual &&
-	cat >expected <<-EOF &&
-	Submodule sm1 $head6...0000000 (submodule deleted)
-	EOF
-	test_cmp expected actual
-
-ok 36 - deleted submodule
-
-expecting success: 
-	test_create_repo sm2 &&
-	head7=$(add_file sm2 foo8 foo9) &&
-	git add sm2
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4041-diff-submodule-option/sm2/.git/
-warning: adding embedded git repository: sm2
-hint: You've added another git repository inside your current repository.
-hint: Clones of the outer repository will not contain the contents of
-hint: the embedded repository and will not know how to obtain it.
-hint: If you meant to add a submodule, use:
-hint: 
-hint: 	git submodule add <url> sm2
-hint: 
-hint: If you added this path by mistake, you can remove it from the
-hint: index with:
-hint: 
-hint: 	git rm --cached sm2
-hint: 
-hint: See "git help submodule" for more information.
-ok 37 - create second submodule
-
-expecting success: 
-	git diff-index -p --submodule=log HEAD >actual &&
-	cat >expected <<-EOF &&
-	Submodule sm1 $head6...0000000 (submodule deleted)
-	Submodule sm2 0000000...$head7 (new submodule)
-	EOF
-	test_cmp expected actual
-
-ok 38 - multiple submodules
-
-expecting success: 
-	git diff-index -p --submodule=log HEAD sm2 >actual &&
-	cat >expected <<-EOF &&
-	Submodule sm2 0000000...$head7 (new submodule)
-	EOF
-	test_cmp expected actual
-
-ok 39 - path filter
-
-expecting success: 
-	git diff-index -p --submodule=log HEAD^ >actual &&
-	cat >expected <<-EOF &&
-	Submodule sm1 $head6...0000000 (submodule deleted)
-	Submodule sm2 0000000...$head7 (new submodule)
-	EOF
-	test_cmp expected actual
-
-ok 40 - given commit
-
-expecting success: 
-	git diff-index -p --submodule HEAD^ >actual &&
-	cat >expected <<-EOF &&
-	Submodule sm1 $head6...0000000 (submodule deleted)
-	Submodule sm2 0000000...$head7 (new submodule)
-	EOF
-	test_cmp expected actual
-
-ok 41 - given commit --submodule
-
-expecting success: 
-	git diff-index -p --submodule=short HEAD^ >actual &&
-	cat >expected <<-EOF &&
-	diff --git a/sm1 b/sm1
-	deleted file mode 160000
-	index $head6..0000000
-	--- a/sm1
-	+++ /dev/null
-	@@ -1 +0,0 @@
-	-Subproject commit $fullhead6
-	diff --git a/sm2 b/sm2
-	new file mode 160000
-	index 0000000..$head7
-	--- /dev/null
-	+++ b/sm2
-	@@ -0,0 +1 @@
-	+Subproject commit $fullhead7
-	EOF
-	test_cmp expected actual
-
-ok 42 - given commit --submodule=short
-
-expecting success: 
-	(cd sm2 &&
-	 REAL="$(pwd)/../.real" &&
-	 mv .git "$REAL" &&
-	 echo "gitdir: $REAL" >.git)
-
-ok 43 - setup .git file for sm2
-
-expecting success: 
-	git diff --submodule HEAD^ >actual &&
-	cat >expected <<-EOF &&
-	Submodule sm1 $head6...0000000 (submodule deleted)
-	Submodule sm2 0000000...$head7 (new submodule)
-	EOF
-	test_cmp expected actual
-
-ok 44 - diff --submodule with .git file
-
-expecting success: 
-	mkdir sub_alt &&
-	(cd sub_alt &&
-		git init &&
-		echo a >a &&
-		git add a &&
-		git commit -m a
-	) &&
-	mkdir super &&
-	(cd super &&
-		git clone -s ../sub_alt sub &&
-		git init &&
-		git add sub &&
-		git commit -m "sub a"
-	) &&
-	(cd sub_alt &&
-		sha1_before=$(git rev-parse --short HEAD) &&
-		echo b >b &&
-		git add b &&
-		git commit -m b &&
-		sha1_after=$(git rev-parse --short HEAD) &&
-		{
-			echo "Submodule sub $sha1_before..$sha1_after:" &&
-			echo "  > b"
-		} >../expected
-	) &&
-	(cd super &&
-		(cd sub &&
-			git fetch &&
-			git checkout origin/master
-		) &&
-		git diff --submodule > ../actual
-	) &&
-	test_cmp expected actual
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4041-diff-submodule-option/sub_alt/.git/
-[master (root-commit) b7442a0] a
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 a
-Cloning into 'sub'...
-done.
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4041-diff-submodule-option/super/.git/
-warning: adding embedded git repository: sub
-hint: You've added another git repository inside your current repository.
-hint: Clones of the outer repository will not contain the contents of
-hint: the embedded repository and will not know how to obtain it.
-hint: If you meant to add a submodule, use:
-hint: 
-hint: 	git submodule add <url> sub
-hint: 
-hint: If you added this path by mistake, you can remove it from the
-hint: index with:
-hint: 
-hint: 	git rm --cached sub
-hint: 
-hint: See "git help submodule" for more information.
-[master (root-commit) d9c5753] sub a
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 160000 sub
-[master 8e02ef5] b
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b
-From /build/git-2.20.1/t/trash directory.t4041-diff-submodule-option/super/../sub_alt
-   b7442a0..8e02ef5  master     -> origin/master
-Note: checking out 'origin/master'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by performing another checkout.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
-
-  git checkout -b <new-branch-name>
-
-HEAD is now at 8e02ef5 b
-ok 45 - diff --submodule with objects referenced by alternates
-
-# passed all 45 test(s)
-1..45
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
 *** t4038-diff-combined.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4038-diff-combined/.git/
 expecting success: 
@@ -109197,8 +108876,8 @@
 [detached HEAD 22de592] empty3
  Author: A U Thor <author@example.com>
  1 file changed, 5 insertions(+)
---- .tmp-1	2021-12-03 05:06:54.968840286 +0000
-+++ .tmp-2	2021-12-03 05:06:54.968840286 +0000
+--- .tmp-1	2023-01-05 11:48:43.686868030 +0000
++++ .tmp-2	2023-01-05 11:48:43.686868030 +0000
 @@ -1,8 +1,9 @@
  -- 3
  ---1
@@ -109384,7 +109063,7 @@
 	>diffc.expect &&
 	diffc_verify
 
-[master (root-commit) 969c2f5] init
+[master (root-commit) 1ddd20b] init
  Author: A U Thor <author@example.com>
  9 files changed, 9 insertions(+)
  create mode 100644 1.txt
@@ -109397,18 +109076,18 @@
  create mode 100644 8.txt
  create mode 100644 9.txt
 Switched to a new branch 'side'
-[side e55d93b] side 2-9
+[side 11560c4] side 2-9
  Author: A U Thor <author@example.com>
  8 files changed, 8 insertions(+)
 Switched to branch 'master'
-[master 6ae1ac6] master 1
+[master ab055b1] master 1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 Merging:
-6ae1ac6 master 1
+ab055b1 master 1
 virtual side
 found 1 common ancestor:
-969c2f5 init
+1ddd20b init
 Merge made by the 'recursive' strategy.
  2.txt | 1 +
  3.txt | 1 +
@@ -109450,22 +109129,22 @@
 	diffc_verify
 
 Switched to branch 'side'
-[side 9af1240] side 2-9 +4
+[side 64d1e86] side 2-9 +4
  Author: A U Thor <author@example.com>
  8 files changed, 9 insertions(+)
 Switched to branch 'master'
-[master 227ec39] master 1-9 +4
+[master 19a41cd] master 1-9 +4
  Author: A U Thor <author@example.com>
  9 files changed, 10 insertions(+)
 Merging:
-227ec39 master 1-9 +4
+19a41cd master 1-9 +4
 virtual side
 found 1 common ancestor:
-e55d93b side 2-9
+11560c4 side 2-9
 Auto-merging 4.txt
 CONFLICT (content): Merge conflict in 4.txt
 Automatic merge failed; fix conflicts and then commit the result.
-[master f6b95b8] merge side (2)
+[master b2f8f22] merge side (2)
  Author: A U Thor <author@example.com>
 ok 2 - only one trully conflicting path
 
@@ -109490,18 +109169,18 @@
 	diffc_verify
 
 Switched to branch 'side'
-[side 88e664d] side 5-9
+[side aa6d43b] side 5-9
  Author: A U Thor <author@example.com>
  5 files changed, 5 insertions(+)
 Switched to branch 'master'
-[master 263b740] master 1-3 +4hello
+[master 7ce96b6] master 1-3 +4hello
  Author: A U Thor <author@example.com>
  3 files changed, 3 insertions(+)
 Merging:
-263b740 master 1-3 +4hello
+7ce96b6 master 1-3 +4hello
 virtual side
 found 1 common ancestor:
-9af1240 side 2-9 +4
+64d1e86 side 2-9 +4
 Merge made by the 'recursive' strategy.
  5.txt | 1 +
  6.txt | 1 +
@@ -109509,9 +109188,9 @@
  8.txt | 1 +
  9.txt | 1 +
  5 files changed, 5 insertions(+)
-[master 0319656] Merge branch 'side'
+[master b7ad393] Merge branch 'side'
  Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:06:55 2021 +0000
+ Date: Thu Jan 5 11:48:44 2023 +0000
 ok 3 - merge introduces new file
 
 expecting success: 
@@ -109534,18 +109213,18 @@
 	diffc_verify
 
 Switched to branch 'side'
-[side 61a2bb1] side 5-9
+[side 1860da6] side 5-9
  Author: A U Thor <author@example.com>
  5 files changed, 5 insertions(+)
 Switched to branch 'master'
-[master 6a537c6] master 1-3
+[master 194011a] master 1-3
  Author: A U Thor <author@example.com>
  3 files changed, 3 insertions(+)
 Merging:
-6a537c6 master 1-3
+194011a master 1-3
 virtual side
 found 1 common ancestor:
-88e664d side 5-9
+aa6d43b side 5-9
 Merge made by the 'recursive' strategy.
  5.txt | 1 +
  6.txt | 1 +
@@ -109554,9 +109233,9 @@
  9.txt | 1 +
  5 files changed, 5 insertions(+)
 rm '4.txt'
-[master a4da9d8] Merge branch 'side'
+[master b78a378] Merge branch 'side'
  Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:06:55 2021 +0000
+ Date: Thu Jan 5 11:48:44 2023 +0000
 ok 4 - merge removed a file
 
 # passed all 4 test(s)
@@ -109603,14 +109282,14 @@
 	d.txt
 	EOF
 
-[master (root-commit) 14c59ba] 1
+[master (root-commit) e154e43] 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
-[master 70288bd] 2
+[master 8d23d04] 2
  Author: A U Thor <author@example.com>
  4 files changed, 4 insertions(+), 4 deletions(-)
 ok 1 - setup
@@ -109748,12 +109427,12 @@
 	create_files 5
 
 Switched to a new branch 'tmp'
-[tmp 819ca0d] 3
+[tmp 2a0345d] 3
  Author: A U Thor <author@example.com>
  4 files changed, 4 insertions(+), 4 deletions(-)
 Switched to branch 'master'
 Automatic merge went well; stopped before committing as requested
-[master 013847e] 5
+[master 2944da6] 5
  Author: A U Thor <author@example.com>
 ok 14 - setup for testing combine-diff order
 
@@ -109779,6 +109458,598 @@
 1..17
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
+*** t4041-diff-submodule-option.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4041-diff-submodule-option/.git/
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4041-diff-submodule-option/sm1/.git/
+expecting success: 
+	git add sm1 &&
+	git diff-index -p --submodule=log HEAD >actual &&
+	cat >expected <<-EOF &&
+	Submodule sm1 0000000...$head1 (new submodule)
+	EOF
+	test_cmp expected actual
+
+warning: adding embedded git repository: sm1
+hint: You've added another git repository inside your current repository.
+hint: Clones of the outer repository will not contain the contents of
+hint: the embedded repository and will not know how to obtain it.
+hint: If you meant to add a submodule, use:
+hint: 
+hint: 	git submodule add <url> sm1
+hint: 
+hint: If you added this path by mistake, you can remove it from the
+hint: index with:
+hint: 
+hint: 	git rm --cached sm1
+hint: 
+hint: See "git help submodule" for more information.
+ok 1 - added submodule
+
+expecting success: 
+	git config diff.submodule log &&
+	git add sm1 &&
+	git diff --cached >actual &&
+	cat >expected <<-EOF &&
+	Submodule sm1 0000000...$head1 (new submodule)
+	EOF
+	git config --unset diff.submodule &&
+	test_cmp expected actual
+
+ok 2 - added submodule, set diff.submodule
+
+expecting success: 
+	test_config diff.submodule log &&
+	git add sm1 &&
+	git diff --submodule=short --cached >actual &&
+	cat >expected <<-EOF &&
+	diff --git a/sm1 b/sm1
+	new file mode 160000
+	index 0000000..$head1
+	--- /dev/null
+	+++ b/sm1
+	@@ -0,0 +1 @@
+	+Subproject commit $fullhead1
+	EOF
+	test_cmp expected actual
+
+ok 3 - --submodule=short overrides diff.submodule
+
+expecting success: 
+	test_config diff.submodule log &&
+	git diff-index -p HEAD >actual &&
+	cat >expected <<-EOF &&
+	diff --git a/sm1 b/sm1
+	new file mode 160000
+	index 0000000..$head1
+	--- /dev/null
+	+++ b/sm1
+	@@ -0,0 +1 @@
+	+Subproject commit $fullhead1
+	EOF
+	test_cmp expected actual
+
+ok 4 - diff.submodule does not affect plumbing
+
+expecting success: 
+	git diff-index -p --submodule=log HEAD >actual &&
+	cat >expected <<-EOF &&
+	Submodule sm1 $head1..$head2:
+	  > Add foo3 ($added foo3)
+	EOF
+	test_cmp expected actual
+
+ok 5 - modified submodule(forward)
+
+expecting success: 
+	git diff --submodule=log >actual &&
+	cat >expected <<-EOF &&
+	Submodule sm1 $head1..$head2:
+	  > Add foo3 ($added foo3)
+	EOF
+	test_cmp expected actual
+
+ok 6 - modified submodule(forward)
+
+expecting success: 
+	git diff --submodule >actual &&
+	cat >expected <<-EOF &&
+	Submodule sm1 $head1..$head2:
+	  > Add foo3 ($added foo3)
+	EOF
+	test_cmp expected actual
+
+ok 7 - modified submodule(forward) --submodule
+
+expecting success: 
+	git diff --submodule=short >actual &&
+	cat >expected <<-EOF &&
+	diff --git a/sm1 b/sm1
+	index $head1..$head2 160000
+	--- a/sm1
+	+++ b/sm1
+	@@ -1 +1 @@
+	-Subproject commit $fullhead1
+	+Subproject commit $fullhead2
+	EOF
+	test_cmp expected actual
+
+ok 8 - modified submodule(forward) --submodule=short
+
+expecting success: 
+	git diff-index -p --submodule=log HEAD >actual &&
+	cat >expected <<-EOF &&
+	Submodule sm1 $head2..$head3 (rewind):
+	  < Add foo3 ($added foo3)
+	  < Add foo2 ($added foo2)
+	EOF
+	test_cmp expected actual
+
+ok 9 - modified submodule(backward)
+
+expecting success: 
+	git diff-index -p --submodule=log HEAD >actual &&
+	cat >expected <<-EOF &&
+	Submodule sm1 $head2...$head4:
+	  > Add foo5 ($added foo5)
+	  > Add foo4 ($added foo4)
+	  < Add foo3 ($added foo3)
+	  < Add foo2 ($added foo2)
+	EOF
+	test_cmp expected actual
+
+ok 10 - modified submodule(backward and forward)
+
+expecting success: 
+	git diff --submodule=log --cached >actual &&
+	cat >expected <<-EOF &&
+	Submodule sm1 $head4...0000000 (submodule deleted)
+	diff --git a/sm1 b/sm1
+	new file mode 100644
+	index 0000000..$head5
+	--- /dev/null
+	+++ b/sm1
+	@@ -0,0 +1 @@
+	+sm1
+	EOF
+	test_cmp expected actual
+
+ok 11 - typechanged submodule(submodule->blob), --cached
+
+expecting success: 
+	git diff --submodule=log >actual &&
+	cat >expected <<-EOF &&
+	diff --git a/sm1 b/sm1
+	deleted file mode 100644
+	index $head5..0000000
+	--- a/sm1
+	+++ /dev/null
+	@@ -1 +0,0 @@
+	-sm1
+	Submodule sm1 0000000...$head4 (new submodule)
+	EOF
+	test_cmp expected actual
+
+ok 12 - typechanged submodule(submodule->blob)
+
+expecting success: 
+	git diff-index -p --submodule=log HEAD >actual &&
+	cat >expected <<-EOF &&
+	Submodule sm1 $head4...0000000 (submodule deleted)
+	diff --git a/sm1 b/sm1
+	new file mode 100644
+	index 0000000..$head5
+	--- /dev/null
+	+++ b/sm1
+	@@ -0,0 +1 @@
+	+sm1
+	EOF
+	test_cmp expected actual
+
+ok 13 - typechanged submodule(submodule->blob)
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4041-diff-submodule-option/sm1/.git/
+expecting success: 
+	git diff-index -p --submodule=log HEAD >actual &&
+	cat >expected <<-EOF &&
+	Submodule sm1 $head4...$head6 (commits not present)
+	EOF
+	test_cmp expected actual
+
+ok 14 - nonexistent commit
+
+expecting success: 
+	git diff-index -p --submodule=log HEAD >actual &&
+	cat >expected <<-EOF &&
+	diff --git a/sm1 b/sm1
+	deleted file mode 100644
+	index $head5..0000000
+	--- a/sm1
+	+++ /dev/null
+	@@ -1 +0,0 @@
+	-sm1
+	Submodule sm1 0000000...$head6 (new submodule)
+	EOF
+	test_cmp expected actual
+
+ok 15 - typechanged submodule(blob->submodule)
+
+expecting success: 
+	git diff-index -p --submodule=log HEAD >actual &&
+	test_must_be_empty actual
+
+ok 16 - submodule is up to date
+
+expecting success: 
+	echo new > sm1/new-file &&
+	git diff-index -p --submodule=log HEAD >actual &&
+	cat >expected <<-EOF &&
+	Submodule sm1 contains untracked content
+	EOF
+	test_cmp expected actual
+
+ok 17 - submodule contains untracked content
+
+expecting success: 
+	git diff-index -p --ignore-submodules=untracked --submodule=log HEAD >actual &&
+	test_must_be_empty actual
+
+ok 18 - submodule contains untracked content (untracked ignored)
+
+expecting success: 
+	git diff-index -p --ignore-submodules=dirty --submodule=log HEAD >actual &&
+	test_must_be_empty actual
+
+ok 19 - submodule contains untracked content (dirty ignored)
+
+expecting success: 
+	git diff-index -p --ignore-submodules=all --submodule=log HEAD >actual &&
+	test_must_be_empty actual
+
+ok 20 - submodule contains untracked content (all ignored)
+
+expecting success: 
+	echo new > sm1/foo6 &&
+	git diff-index -p --submodule=log HEAD >actual &&
+	cat >expected <<-EOF &&
+	Submodule sm1 contains untracked content
+	Submodule sm1 contains modified content
+	EOF
+	test_cmp expected actual
+
+ok 21 - submodule contains untracked and modifed content
+
+expecting success: 
+	echo new > sm1/foo6 &&
+	git diff-index -p --ignore-submodules=untracked --submodule=log HEAD >actual &&
+	cat >expected <<-EOF &&
+	Submodule sm1 contains modified content
+	EOF
+	test_cmp expected actual
+
+ok 22 - submodule contains untracked and modifed content (untracked ignored)
+
+expecting success: 
+	echo new > sm1/foo6 &&
+	git diff-index -p --ignore-submodules=dirty --submodule=log HEAD >actual &&
+	test_must_be_empty actual
+
+ok 23 - submodule contains untracked and modifed content (dirty ignored)
+
+expecting success: 
+	echo new > sm1/foo6 &&
+	git diff-index -p --ignore-submodules --submodule=log HEAD >actual &&
+	test_must_be_empty actual
+
+ok 24 - submodule contains untracked and modifed content (all ignored)
+
+expecting success: 
+	rm -f sm1/new-file &&
+	git diff-index -p --submodule=log HEAD >actual &&
+	cat >expected <<-EOF &&
+	Submodule sm1 contains modified content
+	EOF
+	test_cmp expected actual
+
+ok 25 - submodule contains modifed content
+
+expecting success: 
+	git diff-index -p --submodule=log HEAD >actual &&
+	cat >expected <<-EOF &&
+	Submodule sm1 $head6..$head8:
+	  > change
+	EOF
+	test_cmp expected actual
+
+ok 26 - submodule is modified
+
+expecting success: 
+	echo new > sm1/new-file &&
+	git diff-index -p --submodule=log HEAD >actual &&
+	cat >expected <<-EOF &&
+	Submodule sm1 contains untracked content
+	Submodule sm1 $head6..$head8:
+	  > change
+	EOF
+	test_cmp expected actual
+
+ok 27 - modified submodule contains untracked content
+
+expecting success: 
+	git diff-index -p --ignore-submodules=untracked --submodule=log HEAD >actual &&
+	cat >expected <<-EOF &&
+	Submodule sm1 $head6..$head8:
+	  > change
+	EOF
+	test_cmp expected actual
+
+ok 28 - modified submodule contains untracked content (untracked ignored)
+
+expecting success: 
+	git diff-index -p --ignore-submodules=dirty --submodule=log HEAD >actual &&
+	cat >expected <<-EOF &&
+	Submodule sm1 $head6..$head8:
+	  > change
+	EOF
+	test_cmp expected actual
+
+ok 29 - modified submodule contains untracked content (dirty ignored)
+
+expecting success: 
+	git diff-index -p --ignore-submodules=all --submodule=log HEAD >actual &&
+	test_must_be_empty actual
+
+ok 30 - modified submodule contains untracked content (all ignored)
+
+expecting success: 
+	echo modification >> sm1/foo6 &&
+	git diff-index -p --submodule=log HEAD >actual &&
+	cat >expected <<-EOF &&
+	Submodule sm1 contains untracked content
+	Submodule sm1 contains modified content
+	Submodule sm1 $head6..$head8:
+	  > change
+	EOF
+	test_cmp expected actual
+
+ok 31 - modified submodule contains untracked and modifed content
+
+expecting success: 
+	echo modification >> sm1/foo6 &&
+	git diff-index -p --ignore-submodules=untracked --submodule=log HEAD >actual &&
+	cat >expected <<-EOF &&
+	Submodule sm1 contains modified content
+	Submodule sm1 $head6..$head8:
+	  > change
+	EOF
+	test_cmp expected actual
+
+ok 32 - modified submodule contains untracked and modifed content (untracked ignored)
+
+expecting success: 
+	echo modification >> sm1/foo6 &&
+	git diff-index -p --ignore-submodules=dirty --submodule=log HEAD >actual &&
+	cat >expected <<-EOF &&
+	Submodule sm1 $head6..$head8:
+	  > change
+	EOF
+	test_cmp expected actual
+
+ok 33 - modified submodule contains untracked and modifed content (dirty ignored)
+
+expecting success: 
+	echo modification >> sm1/foo6 &&
+	git diff-index -p --ignore-submodules --submodule=log HEAD >actual &&
+	test_must_be_empty actual
+
+ok 34 - modified submodule contains untracked and modifed content (all ignored)
+
+expecting success: 
+	rm -f sm1/new-file &&
+	git diff-index -p --submodule=log HEAD >actual &&
+	cat >expected <<-EOF &&
+	Submodule sm1 contains modified content
+	Submodule sm1 $head6..$head8:
+	  > change
+	EOF
+	test_cmp expected actual
+
+ok 35 - modified submodule contains modifed content
+
+expecting success: 
+	git diff-index -p --submodule=log HEAD >actual &&
+	cat >expected <<-EOF &&
+	Submodule sm1 $head6...0000000 (submodule deleted)
+	EOF
+	test_cmp expected actual
+
+ok 36 - deleted submodule
+
+expecting success: 
+	test_create_repo sm2 &&
+	head7=$(add_file sm2 foo8 foo9) &&
+	git add sm2
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4041-diff-submodule-option/sm2/.git/
+warning: adding embedded git repository: sm2
+hint: You've added another git repository inside your current repository.
+hint: Clones of the outer repository will not contain the contents of
+hint: the embedded repository and will not know how to obtain it.
+hint: If you meant to add a submodule, use:
+hint: 
+hint: 	git submodule add <url> sm2
+hint: 
+hint: If you added this path by mistake, you can remove it from the
+hint: index with:
+hint: 
+hint: 	git rm --cached sm2
+hint: 
+hint: See "git help submodule" for more information.
+ok 37 - create second submodule
+
+expecting success: 
+	git diff-index -p --submodule=log HEAD >actual &&
+	cat >expected <<-EOF &&
+	Submodule sm1 $head6...0000000 (submodule deleted)
+	Submodule sm2 0000000...$head7 (new submodule)
+	EOF
+	test_cmp expected actual
+
+ok 38 - multiple submodules
+
+expecting success: 
+	git diff-index -p --submodule=log HEAD sm2 >actual &&
+	cat >expected <<-EOF &&
+	Submodule sm2 0000000...$head7 (new submodule)
+	EOF
+	test_cmp expected actual
+
+ok 39 - path filter
+
+expecting success: 
+	git diff-index -p --submodule=log HEAD^ >actual &&
+	cat >expected <<-EOF &&
+	Submodule sm1 $head6...0000000 (submodule deleted)
+	Submodule sm2 0000000...$head7 (new submodule)
+	EOF
+	test_cmp expected actual
+
+ok 40 - given commit
+
+expecting success: 
+	git diff-index -p --submodule HEAD^ >actual &&
+	cat >expected <<-EOF &&
+	Submodule sm1 $head6...0000000 (submodule deleted)
+	Submodule sm2 0000000...$head7 (new submodule)
+	EOF
+	test_cmp expected actual
+
+ok 41 - given commit --submodule
+
+expecting success: 
+	git diff-index -p --submodule=short HEAD^ >actual &&
+	cat >expected <<-EOF &&
+	diff --git a/sm1 b/sm1
+	deleted file mode 160000
+	index $head6..0000000
+	--- a/sm1
+	+++ /dev/null
+	@@ -1 +0,0 @@
+	-Subproject commit $fullhead6
+	diff --git a/sm2 b/sm2
+	new file mode 160000
+	index 0000000..$head7
+	--- /dev/null
+	+++ b/sm2
+	@@ -0,0 +1 @@
+	+Subproject commit $fullhead7
+	EOF
+	test_cmp expected actual
+
+ok 42 - given commit --submodule=short
+
+expecting success: 
+	(cd sm2 &&
+	 REAL="$(pwd)/../.real" &&
+	 mv .git "$REAL" &&
+	 echo "gitdir: $REAL" >.git)
+
+ok 43 - setup .git file for sm2
+
+expecting success: 
+	git diff --submodule HEAD^ >actual &&
+	cat >expected <<-EOF &&
+	Submodule sm1 $head6...0000000 (submodule deleted)
+	Submodule sm2 0000000...$head7 (new submodule)
+	EOF
+	test_cmp expected actual
+
+ok 44 - diff --submodule with .git file
+
+expecting success: 
+	mkdir sub_alt &&
+	(cd sub_alt &&
+		git init &&
+		echo a >a &&
+		git add a &&
+		git commit -m a
+	) &&
+	mkdir super &&
+	(cd super &&
+		git clone -s ../sub_alt sub &&
+		git init &&
+		git add sub &&
+		git commit -m "sub a"
+	) &&
+	(cd sub_alt &&
+		sha1_before=$(git rev-parse --short HEAD) &&
+		echo b >b &&
+		git add b &&
+		git commit -m b &&
+		sha1_after=$(git rev-parse --short HEAD) &&
+		{
+			echo "Submodule sub $sha1_before..$sha1_after:" &&
+			echo "  > b"
+		} >../expected
+	) &&
+	(cd super &&
+		(cd sub &&
+			git fetch &&
+			git checkout origin/master
+		) &&
+		git diff --submodule > ../actual
+	) &&
+	test_cmp expected actual
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4041-diff-submodule-option/sub_alt/.git/
+[master (root-commit) b7442a0] a
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 a
+Cloning into 'sub'...
+done.
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4041-diff-submodule-option/super/.git/
+warning: adding embedded git repository: sub
+hint: You've added another git repository inside your current repository.
+hint: Clones of the outer repository will not contain the contents of
+hint: the embedded repository and will not know how to obtain it.
+hint: If you meant to add a submodule, use:
+hint: 
+hint: 	git submodule add <url> sub
+hint: 
+hint: If you added this path by mistake, you can remove it from the
+hint: index with:
+hint: 
+hint: 	git rm --cached sub
+hint: 
+hint: See "git help submodule" for more information.
+[master (root-commit) d9c5753] sub a
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 160000 sub
+[master 8e02ef5] b
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b
+From /build/git-2.20.1/t/trash directory.t4041-diff-submodule-option/super/../sub_alt
+   b7442a0..8e02ef5  master     -> origin/master
+Note: checking out 'origin/master'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by performing another checkout.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -b with the checkout command again. Example:
+
+  git checkout -b <new-branch-name>
+
+HEAD is now at 8e02ef5 b
+ok 45 - diff --submodule with objects referenced by alternates
+
+# passed all 45 test(s)
+1..45
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
 *** t4062-diff-pickaxe.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4062-diff-pickaxe/.git/
 expecting success: 
@@ -110174,6 +110445,1596 @@
 1..42
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
+*** t4063-diff-blobs.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4063-diff-blobs/.git/
+expecting success: 
+	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) be7c19a] 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: 
+	run_diff $sha1_one $sha1_two
+
+ok 2 - diff by sha1
+
+expecting success: 
+	check_index $sha1_one $sha1_two
+
+index 5626abf0f72e58d7a153368ba57db4c673c0e171..f719efd430d52bcfc8566a43b2eb655688d38871 100644
+ok 3 - index of sha1 diff
+
+expecting success: 
+	check_paths $sha1_one $sha1_two
+
+diff --git a/5626abf0f72e58d7a153368ba57db4c673c0e171 b/f719efd430d52bcfc8566a43b2eb655688d38871
+ok 4 - sha1 diff uses arguments as paths
+
+expecting success: 
+	! grep mode diff
+
+ok 5 - sha1 diff has no mode change
+
+expecting success: 
+	run_diff HEAD:one HEAD:two
+
+ok 6 - diff by tree:path (run)
+
+expecting success: 
+	check_index $sha1_one $sha1_two
+
+index 5626abf0f72e58d7a153368ba57db4c673c0e171..f719efd430d52bcfc8566a43b2eb655688d38871
+ok 7 - index of tree:path diff
+
+expecting success: 
+	check_paths one two
+
+diff --git a/one b/two
+ok 8 - tree:path diff uses filenames as paths
+
+expecting success: 
+	check_mode 100644 100755
+
+old mode 100644
+new mode 100755
+ok 9 - tree:path diff shows mode change
+
+expecting success: 
+	run_diff HEAD:one..HEAD:two
+
+ok 10 - diff by ranged tree:path
+
+expecting success: 
+	check_index $sha1_one $sha1_two
+
+index 5626abf0f72e58d7a153368ba57db4c673c0e171..f719efd430d52bcfc8566a43b2eb655688d38871
+ok 11 - index of ranged tree:path diff
+
+expecting success: 
+	check_paths one two
+
+diff --git a/one b/two
+ok 12 - ranged tree:path diff uses filenames as paths
+
+expecting success: 
+	check_mode 100644 100755
+
+old mode 100644
+new mode 100755
+ok 13 - ranged tree:path diff shows mode change
+
+expecting success: 
+	run_diff HEAD:one two
+
+ok 14 - diff blob against file
+
+expecting success: 
+	check_index $sha1_one $sha1_two
+
+index 5626abf0f72e58d7a153368ba57db4c673c0e171..f719efd430d52bcfc8566a43b2eb655688d38871
+ok 15 - index of blob-file diff
+
+expecting success: 
+	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" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
+	test "$(git config --bool core.filemode)" = true
+
+)
+prerequisite FILEMODE ok
+expecting success: 
+	check_mode 100644 100755
+
+old mode 100644
+new mode 100755
+ok 17 - blob-file diff shows mode change
+
+expecting success: 
+	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/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t4065-diff-anchored.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4065-diff-anchored/.git/
+expecting success: 
+	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: 
+	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: 
+	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: 
+	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: 
+	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: 
+	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: 
+	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) 74a6316] foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 3 insertions(+)
+ create mode 100644 file
+[master 6ff53b2] 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/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t4064-diff-oidfind.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4064-diff-oidfind/.git/
+expecting success: 
+	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) 72c497e] empty initial commit
+ Author: A U Thor <author@example.com>
+[master a379eaa] add the greeting blob
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 greeting
+[master 61d3628] unrelated history
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 unrelated
+Removing greeting
+[master fa619a7] Revert "add the greeting blob"
+ Author: A U Thor <author@example.com>
+ Date: Thu Jan 5 11:48:44 2023 +0000
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 greeting
+[master 1e0994b] another unrelated commit
+ Author: A U Thor <author@example.com>
+ok 1 - setup 
+
+expecting success: 
+	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: 
+	mkdir a &&
+	echo asdf >a/file &&
+	git add a/file &&
+	git commit -m "add a file in a subdirectory"
+
+[master 23b5c56] 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: 
+	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: 
+	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/git-2.20.1/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 d96124d] 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: 
+	cat >expect <<-EOF &&
+	add sub
+	EOF
+
+	git log --format=%s --find-object=HEAD:sub >actual &&
+
+	test_cmp expect actual
+
+ok 6 - find a submodule
+
+# passed all 6 test(s)
+1..6
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t4059-diff-submodule-not-initialized.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4059-diff-submodule-not-initialized/.git/
+expecting success: 
+	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/git-2.20.1/t/trash directory.t4059-diff-submodule-not-initialized/sm2/.git/
+36d39d8
+1beffeb
+ok 1 - setup - submodules
+
+expecting success: 
+	git 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/git-2.20.1/t/trash directory.t4059-diff-submodule-not-initialized/sm1'...
+done.
+ok 2 - setup - git submodule add
+
+expecting success: 
+	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: 
+	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: 
+	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: 
+	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: 
+	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: 
+	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/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t4100-apply-stat.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4100-apply-stat/.git/
+expecting success: 
+		git apply --stat --summary \
+			<"$TEST_DIRECTORY/t4100/t-apply-$num.patch" >current &&
+		test_i18ncmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current
+	
+ok 1 - rename
+
+expecting success: 
+		sed -e "$UNC" <"$TEST_DIRECTORY/t4100/t-apply-$num.patch" |
+		git apply --recount --stat --summary >current &&
+		test_i18ncmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current
+	
+ok 2 - rename with recount
+
+expecting success: 
+		git apply --stat --summary \
+			<"$TEST_DIRECTORY/t4100/t-apply-$num.patch" >current &&
+		test_i18ncmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current
+	
+ok 3 - copy
+
+expecting success: 
+		sed -e "$UNC" <"$TEST_DIRECTORY/t4100/t-apply-$num.patch" |
+		git apply --recount --stat --summary >current &&
+		test_i18ncmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current
+	
+ok 4 - copy with recount
+
+expecting success: 
+		git apply --stat --summary \
+			<"$TEST_DIRECTORY/t4100/t-apply-$num.patch" >current &&
+		test_i18ncmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current
+	
+ok 5 - rewrite
+
+expecting success: 
+		sed -e "$UNC" <"$TEST_DIRECTORY/t4100/t-apply-$num.patch" |
+		git apply --recount --stat --summary >current &&
+		test_i18ncmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current
+	
+ok 6 - rewrite with recount
+
+expecting success: 
+		git apply --stat --summary \
+			<"$TEST_DIRECTORY/t4100/t-apply-$num.patch" >current &&
+		test_i18ncmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current
+	
+ok 7 - mode
+
+expecting success: 
+		sed -e "$UNC" <"$TEST_DIRECTORY/t4100/t-apply-$num.patch" |
+		git apply --recount --stat --summary >current &&
+		test_i18ncmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current
+	
+ok 8 - mode with recount
+
+expecting success: 
+		git apply --stat --summary \
+			<"$TEST_DIRECTORY/t4100/t-apply-$num.patch" >current &&
+		test_i18ncmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current
+	
+ok 9 - non git (1)
+
+expecting success: 
+		sed -e "$UNC" <"$TEST_DIRECTORY/t4100/t-apply-$num.patch" |
+		git apply --recount --stat --summary >current &&
+		test_i18ncmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current
+	
+ok 10 - non git (1) with recount
+
+expecting success: 
+		git apply --stat --summary \
+			<"$TEST_DIRECTORY/t4100/t-apply-$num.patch" >current &&
+		test_i18ncmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current
+	
+ok 11 - non git (2)
+
+expecting success: 
+		sed -e "$UNC" <"$TEST_DIRECTORY/t4100/t-apply-$num.patch" |
+		git apply --recount --stat --summary >current &&
+		test_i18ncmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current
+	
+ok 12 - non git (2) with recount
+
+expecting success: 
+		git apply --stat --summary \
+			<"$TEST_DIRECTORY/t4100/t-apply-$num.patch" >current &&
+		test_i18ncmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current
+	
+ok 13 - non git (3)
+
+expecting success: 
+		sed -e "$UNC" <"$TEST_DIRECTORY/t4100/t-apply-$num.patch" |
+		git apply --recount --stat --summary >current &&
+		test_i18ncmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current
+	
+ok 14 - non git (3) with recount
+
+expecting success: 
+		git apply --stat --summary \
+			<"$TEST_DIRECTORY/t4100/t-apply-$num.patch" >current &&
+		test_i18ncmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current
+	
+ok 15 - incomplete (1)
+
+expecting success: 
+		sed -e "$UNC" <"$TEST_DIRECTORY/t4100/t-apply-$num.patch" |
+		git apply --recount --stat --summary >current &&
+		test_i18ncmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current
+	
+ok 16 - incomplete (1) with recount
+
+expecting success: 
+		git apply --stat --summary \
+			<"$TEST_DIRECTORY/t4100/t-apply-$num.patch" >current &&
+		test_i18ncmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current
+	
+ok 17 - incomplete (2)
+
+expecting success: 
+		sed -e "$UNC" <"$TEST_DIRECTORY/t4100/t-apply-$num.patch" |
+		git apply --recount --stat --summary >current &&
+		test_i18ncmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current
+	
+ok 18 - incomplete (2) with recount
+
+# passed all 18 test(s)
+1..18
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t4102-apply-rename.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4102-apply-rename/.git/
+expecting success: git update-index --add foo
+ok 1 - setup
+
+expecting success: 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" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
+	test "$(git config --bool core.filemode)" = true
+
+)
+prerequisite FILEMODE ok
+expecting success: test -f bar && ls -l bar | grep "^-..x......"
+-rwxrwxr-x 1 pbuilder2 pbuilder2 12 Jan  5 11:48 bar
+ok 3 - validate
+
+expecting success: 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: 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/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t4047-diff-dirstat.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4047-diff-dirstat/.git/
+expecting success: 
+	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
+
+[master (root-commit) c51befa] 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 5e5ed15] 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
+
+expecting success: 
+	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: 
+	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: 
+	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: 
+	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: 
+	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: 
+	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: 
+	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: 
+	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: 
+	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: 
+	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: 
+	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: 
+	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: 
+	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: 
+	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: 
+	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: 
+	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: 
+	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: 
+	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: 
+	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: 
+	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: 
+	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: 
+	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: 
+	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: 
+	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: 
+	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: 
+	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: 
+	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: 
+	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: 
+	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: 
+	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: 
+	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: 
+	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: 
+	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: 
+	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: 
+	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: 
+	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: 
+	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_i18ngrep -q "future_param" actual_error &&
+	test_i18ngrep -q "\--dirstat" actual_error
+
+ok 38 - --dirstat=future_param,lines,0 should fail loudly
+
+expecting success: 
+	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_i18ngrep -q "dummy1" actual_error &&
+	test_i18ngrep -q "2dummy" actual_error &&
+	test_i18ngrep -q "\--dirstat" actual_error
+
+ok 39 - --dirstat=dummy1,cumulative,2dummy should report both unrecognized parameters
+
+expecting success: 
+	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_i18ngrep -q "future_param" actual_error &&
+	test_i18ngrep -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_i18ngrep -q "future_param" actual_error &&
+	test_i18ngrep -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_i18ngrep -q "future_param" actual_error &&
+	test_i18ngrep -q "diff\\.dirstat" actual_error
+
+ok 40 - diff.dirstat=future_param,0,lines should warn, but still work
+
+expecting success: 
+	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/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t4101-apply-nonl.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4101-apply-nonl/.git/
+expecting success: 
+	git apply <"$TEST_DIRECTORY"/t4101/diff.$i-$j &&
+	test_cmp frotz.$j frotz
+    
+ok 1 - apply diff between 0 and 1
+
+expecting success: 
+	git apply <"$TEST_DIRECTORY"/t4101/diff.$i-$j &&
+	test_cmp frotz.$j frotz
+    
+ok 2 - apply diff between 0 and 2
+
+expecting success: 
+	git apply <"$TEST_DIRECTORY"/t4101/diff.$i-$j &&
+	test_cmp frotz.$j frotz
+    
+ok 3 - apply diff between 0 and 3
+
+expecting success: 
+	git apply <"$TEST_DIRECTORY"/t4101/diff.$i-$j &&
+	test_cmp frotz.$j frotz
+    
+ok 4 - apply diff between 1 and 0
+
+expecting success: 
+	git apply <"$TEST_DIRECTORY"/t4101/diff.$i-$j &&
+	test_cmp frotz.$j frotz
+    
+ok 5 - apply diff between 1 and 2
+
+expecting success: 
+	git apply <"$TEST_DIRECTORY"/t4101/diff.$i-$j &&
+	test_cmp frotz.$j frotz
+    
+ok 6 - apply diff between 1 and 3
+
+expecting success: 
+	git apply <"$TEST_DIRECTORY"/t4101/diff.$i-$j &&
+	test_cmp frotz.$j frotz
+    
+ok 7 - apply diff between 2 and 0
+
+expecting success: 
+	git apply <"$TEST_DIRECTORY"/t4101/diff.$i-$j &&
+	test_cmp frotz.$j frotz
+    
+ok 8 - apply diff between 2 and 1
+
+expecting success: 
+	git apply <"$TEST_DIRECTORY"/t4101/diff.$i-$j &&
+	test_cmp frotz.$j frotz
+    
+ok 9 - apply diff between 2 and 3
+
+expecting success: 
+	git apply <"$TEST_DIRECTORY"/t4101/diff.$i-$j &&
+	test_cmp frotz.$j frotz
+    
+ok 10 - apply diff between 3 and 0
+
+expecting success: 
+	git apply <"$TEST_DIRECTORY"/t4101/diff.$i-$j &&
+	test_cmp frotz.$j frotz
+    
+ok 11 - apply diff between 3 and 1
+
+expecting success: 
+	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/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t4106-apply-stdin.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4106-apply-stdin/.git/
+expecting success: 
+	echo hello >text &&
+	git add text &&
+	echo goodbye >text &&
+	git diff >patch
+
+ok 1 - setup
+
+expecting success: 
+	echo "1	1	text" >expect &&
+	git apply --numstat - <patch >actual &&
+	test_cmp expect actual
+
+ok 2 - git apply --numstat - < patch
+
+expecting success: 
+	for i in 1 2; do echo "1	1	text"; done >expect &&
+	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/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t4105-apply-fuzz.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4105-apply-fuzz/.git/
+expecting success: 
+
+	for i in 1 2 3 4 5 6 7 8 9 10 11 12
+	do
+		echo $i
+	done >file &&
+	git update-index --add file &&
+	for i in 1 2 3 4 5 6 7 a b c d e 8 9 10 11 12
+	do
+		echo $i
+	done >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: 
+		git checkout-index -f -q -u file &&
+		git apply O0.diff &&
+		test_cmp expect file
+	
+ok 2 - unmodified patch
+
+expecting success: 
+		git checkout-index -f -q -u file &&
+		git apply O1.diff &&
+		test_cmp expect file
+	
+ok 3 - minus offset
+
+expecting success: 
+		git checkout-index -f -q -u file &&
+		git apply O2.diff &&
+		test_cmp expect file
+	
+ok 4 - plus offset
+
+expecting success: 
+		git checkout-index -f -q -u file &&
+		git apply O3.diff &&
+		test_cmp expect file
+	
+ok 5 - big offset
+
+expecting success: 
+		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: 
+		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: 
+		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: 
+		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/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t4109-apply-multifrag.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4109-apply-multifrag/.git/
+expecting success: 
+	git apply patch1.patch patch2.patch &&
+	test_cmp "$TEST_DIRECTORY/t4109/expect-1" main.c
+
+patch1.patch:28: new blank line at EOF.
++
+patch2.patch:58: new blank line at EOF.
++
+warning: 2 lines add whitespace errors.
+ok 1 - git apply (1)
+
+expecting success: 
+	git apply patch1.patch patch2.patch patch3.patch &&
+	test_cmp "$TEST_DIRECTORY/t4109/expect-2" main.c
+
+patch1.patch:28: new blank line at EOF.
++
+patch2.patch:58: new blank line at EOF.
++
+warning: 2 lines add whitespace errors.
+ok 2 - git apply (2)
+
+expecting success: 
+	git apply patch1.patch patch4.patch &&
+	test_cmp "$TEST_DIRECTORY/t4109/expect-3" main.c
+
+patch1.patch:28: new blank line at EOF.
++
+warning: 1 line adds whitespace errors.
+ok 3 - git apply (3)
+
+# passed all 3 test(s)
+1..3
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t4110-apply-scan.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4110-apply-scan/.git/
+expecting success: 
+	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/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
 *** t4014-format-patch.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4014-format-patch/.git/
 expecting success: 
@@ -111112,6 +112973,7 @@
 		sh -c "test -t 1 && test -t 2"
 
 )
+died of signal 15 at /build/git-2.20.1/t/test-terminal.perl line 35.
 prerequisite TTY ok
 expecting success: 
 	rm -f pager_used &&
@@ -112901,1640 +114763,1120 @@
 1..147
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t4065-diff-anchored.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4065-diff-anchored/.git/
+*** t4107-apply-ignore-whitespace.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4107-apply-ignore-whitespace/.git/
 expecting success: 
-	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
+	git apply patch1.patch
 
-+c
-+a
-ok 1 - --anchored
+ok 1 - file creation
 
 expecting success: 
-	printf "a\nb\nc\nd\ne\nf\n" >pre &&
-	printf "c\na\nb\nf\nd\ne\n" >post &&
+	test_must_fail git apply patch2.patch
 
-	# 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 &&
+error: patch failed: main.c:10
+error: main.c: patch does not apply
+ok 2 - patch2 fails (retab)
 
-	# 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
+expecting success: 
+	git apply --ignore-whitespace patch2.patch
 
-+a
-+f
-+a
-+d
-ok 2 - --anchored multiple
+ok 3 - patch2 applies with --ignore-whitespace
 
 expecting success: 
-	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
+	git apply -R --ignore-space-change patch2.patch
 
-+c
-ok 3 - --anchored with nonexistent line has no effect
+ok 4 - patch2 reverse applies with --ignore-space-change
 
 expecting success: 
-	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
+	git apply patch2.patch &&
+	test_cmp main.c.final main.c
 
-+c
-ok 4 - --anchored with non-unique line has no effect
+ok 5 - patch2 applies (apply.ignorewhitespace = change)
 
 expecting success: 
-	printf "a\nb\nc\n" >pre &&
-	printf "c\na\nb\n" >post &&
+	test_must_fail git apply patch3.patch
 
-	test_expect_code 1 git diff --no-index --anchored=a --anchored=c pre post >diff &&
-	mv post expected_post &&
+error: patch failed: main.c:10
+error: main.c: patch does not apply
+ok 6 - patch3 fails (missing string at EOL)
 
-	# Ensure that the diff is correct by applying it and then
-	# comparing the result with the original
-	git apply diff &&
-	diff expected_post post
+expecting success: 
+	test_must_fail git apply patch4.patch
 
-ok 5 - diff still produced with impossible multiple --anchored
+error: patch failed: main.c:21
+error: main.c: patch does not apply
+ok 7 - patch4 fails (missing EOL at EOF)
 
 expecting success: 
-	printf "a\nb\nc\n" >pre &&
-	printf "c\na\nb\n" >post &&
+	test_must_fail git apply patch5.patch
 
-	test_expect_code 1 git diff --no-index --patience --anchored=c pre post >diff &&
-	grep "^+a" diff &&
+error: patch failed: main.c:2
+error: main.c: patch does not apply
+ok 8 - patch5 fails (leading whitespace differences matter)
 
-	test_expect_code 1 git diff --no-index --anchored=c --patience pre post >diff &&
-	grep "^+c" diff &&
+expecting success: 
+	rm -f main.c &&
+	git apply patch1.patch
 
-	test_expect_code 1 git diff --no-index --histogram --anchored=c pre post >diff &&
-	grep "^+a" diff &&
+ok 9 - re-create file (with --ignore-whitespace)
 
-	test_expect_code 1 git diff --no-index --anchored=c --histogram pre post >diff &&
-	grep "^+c" diff
+expecting success: 
+	test_must_fail git apply --no-ignore-whitespace patch5.patch
 
-+a
-+c
-+a
-+c
-ok 6 - later algorithm arguments override earlier ones
+error: patch failed: main.c:2
+error: main.c: patch does not apply
+ok 10 - patch5 fails (--no-ignore-whitespace)
 
 expecting success: 
-	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
+	echo 1 >file &&
+	git apply --ignore-space-change --inaccurate-eof <<-\EOF &&
+	diff --git a/file b/file
+	--- a/file
+	+++ b/file
+	@@ -1 +1 @@
+	-1
+	+2
+	EOF
+	printf 2 >expect &&
+	test_cmp expect file
 
-[master (root-commit) e66845a] foo
- Author: A U Thor <author@example.com>
- 1 file changed, 3 insertions(+)
- create mode 100644 file
-[master a703b2b] 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"
+ok 11 - apply --ignore-space-change --inaccurate-eof
 
-# passed all 7 test(s)
-1..7
+# passed all 11 test(s)
+1..11
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t4064-diff-oidfind.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4064-diff-oidfind/.git/
-expecting success: 
-	git commit --allow-empty -m "empty initial commit" &&
+*** t4113-apply-ending.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4113-apply-ending/.git/
+expecting success: git update-index --add file
+ok 1 - setup
 
-	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: test_must_fail git apply --index test-patch
+error: patch failed: file:1
+error: file: patch does not apply
+ok 2 - apply at the end
 
-	echo asdf >unrelated &&
-	git add unrelated &&
-	git commit -m "unrelated history" &&
+expecting success: test_must_fail git apply --index test-patch
+error: patch failed: file:1
+error: file: patch does not apply
+ok 3 - apply at the beginning
 
-	git revert HEAD^ &&
+# passed all 3 test(s)
+1..3
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t4112-apply-renames.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4112-apply-renames/.git/
+expecting success: git apply --check patch
+ok 1 - check rename/copy patch
 
-	git commit --allow-empty -m "another unrelated commit"
+expecting success: git apply --index patch
+ok 2 - apply rename/copy patch
+
+# passed all 2 test(s)
+1..2
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t4052-stat-output.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4052-stat-output/.git/
+expecting success: 
+	>"$name" &&
+	git add "$name" &&
+	git commit -m message &&
+	echo a >"$name" &&
+	git commit -m message "$name"
 
-[master (root-commit) 88ed087] empty initial commit
+[master (root-commit) cfab9f1] message
  Author: A U Thor <author@example.com>
-[master 2952ba9] add the greeting blob
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+[master 1bf0cb5] message
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 greeting
-[master 9ad996b] unrelated history
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 unrelated
-Removing greeting
-[master bdf7962] Revert "add the greeting blob"
- Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:06:56 2021 +0000
- 1 file changed, 1 deletion(-)
- delete mode 100644 greeting
-[master dccd6ec] another unrelated commit
- Author: A U Thor <author@example.com>
-ok 1 - setup 
+ok 1 - preparation
 
 expecting success: 
-	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
+	git format-patch -1 --stdout >output &&
+	grep " | " output >actual &&
+	test_cmp expect72 actual
 
-ok 2 - find the greeting blob
+ok 2 - format-patch: small change with long name gives more space to the name
 
 expecting success: 
-	mkdir a &&
-	echo asdf >a/file &&
-	git add a/file &&
-	git commit -m "add a file in a subdirectory"
-
-[master 903363b] 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
+		git $cmd $args >output &&
+		grep " | " output >actual &&
+		test_cmp expect80 actual
+	
+ok 3 - diff: small change with long name gives more space to the name
 
 expecting success: 
-	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
+		git $cmd $args >output &&
+		grep " | " output >actual &&
+		test_cmp expect80 actual
+	
+ok 4 - show: small change with long name gives more space to the name
 
 expecting success: 
-	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/git-2.20.1/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 5ebe1ae] 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
+		git $cmd $args >output &&
+		grep " | " output >actual &&
+		test_cmp expect80 actual
+	
+ok 5 - log: small change with long name gives more space to the name
 
 expecting success: 
-	cat >expect <<-EOF &&
-	add sub
-	EOF
-
-	git log --format=%s --find-object=HEAD:sub >actual &&
-
-	test_cmp expect actual
-
-ok 6 - find a submodule
+		git $cmd $args --stat=40 >output &&
+		grep " | " output >actual &&
+		test_cmp $expect.60 actual
+	
+ok 6 - format-patch --stat=width: a long name is given more room when the bar is short
 
-# passed all 6 test(s)
-1..6
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t4047-diff-dirstat.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4047-diff-dirstat/.git/
 expecting success: 
-	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
-
-[master (root-commit) 4fff32d] 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 7837bec] 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
+		git $cmd $args --stat-width=40 >output &&
+		grep " | " output >actual &&
+		test_cmp $expect.60 actual
+	
+ok 7 - format-patch --stat-width=width with long name
 
 expecting success: 
-	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)
+		git $cmd $args --stat=60,30 >output &&
+		grep " | " output >actual &&
+		test_cmp $expect.6030 actual
+	
+ok 8 - format-patch --stat=...,name-width with long name
 
 expecting success: 
-	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
+		git $cmd $args --stat-name-width=30 >output &&
+		grep " | " output >actual &&
+		test_cmp $expect.6030 actual
+	
+ok 9 - format-patch --stat-name-width with long name
 
 expecting success: 
-	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
+		git $cmd $args --stat=40 >output &&
+		grep " | " output >actual &&
+		test_cmp $expect.60 actual
+	
+ok 10 - diff --stat=width: a long name is given more room when the bar is short
 
 expecting success: 
-	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
+		git $cmd $args --stat-width=40 >output &&
+		grep " | " output >actual &&
+		test_cmp $expect.60 actual
+	
+ok 11 - diff --stat-width=width with long name
 
 expecting success: 
-	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
+		git $cmd $args --stat=60,30 >output &&
+		grep " | " output >actual &&
+		test_cmp $expect.6030 actual
+	
+ok 12 - diff --stat=...,name-width with long name
 
 expecting success: 
-	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
+		git $cmd $args --stat-name-width=30 >output &&
+		grep " | " output >actual &&
+		test_cmp $expect.6030 actual
+	
+ok 13 - diff --stat-name-width with long name
 
 expecting success: 
-	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:
+		git $cmd $args --stat=40 >output &&
+		grep " | " output >actual &&
+		test_cmp $expect.60 actual
+	
+ok 14 - show --stat=width: a long name is given more room when the bar is short
 
 expecting success: 
-	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
+		git $cmd $args --stat-width=40 >output &&
+		grep " | " output >actual &&
+		test_cmp $expect.60 actual
+	
+ok 15 - show --stat-width=width with long name
 
 expecting success: 
-	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
+		git $cmd $args --stat=60,30 >output &&
+		grep " | " output >actual &&
+		test_cmp $expect.6030 actual
+	
+ok 16 - show --stat=...,name-width with long name
 
 expecting success: 
-	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
+		git $cmd $args --stat-name-width=30 >output &&
+		grep " | " output >actual &&
+		test_cmp $expect.6030 actual
+	
+ok 17 - show --stat-name-width with long name
 
 expecting success: 
-	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
+		git $cmd $args --stat=40 >output &&
+		grep " | " output >actual &&
+		test_cmp $expect.60 actual
+	
+ok 18 - log --stat=width: a long name is given more room when the bar is short
 
 expecting success: 
-	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
+		git $cmd $args --stat-width=40 >output &&
+		grep " | " output >actual &&
+		test_cmp $expect.60 actual
+	
+ok 19 - log --stat-width=width with long name
 
 expecting success: 
-	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
+		git $cmd $args --stat=60,30 >output &&
+		grep " | " output >actual &&
+		test_cmp $expect.6030 actual
+	
+ok 20 - log --stat=...,name-width with long name
 
 expecting success: 
-	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
+		git $cmd $args --stat-name-width=30 >output &&
+		grep " | " output >actual &&
+		test_cmp $expect.6030 actual
+	
+ok 21 - log --stat-name-width with long name
 
 expecting success: 
-	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
+	>abcd &&
+	git add abcd &&
+	git commit -m message &&
+	i=0 &&
+	while test $i -lt 1000
+	do
+		echo $i && i=$(($i + 1))
+	done >abcd &&
+	git commit -m message abcd
 
-ok 16 - diff.dirstat=0,cumulative
+[master f9ec29b] message
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 abcd
+[master 07879e1] message
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1000 insertions(+)
+ok 22 - preparation for big change tests
 
 expecting success: 
-	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
+	COLUMNS=200 git format-patch -1 --stdout --cover-letter >output &&
+	grep " | " output >actual &&
+	test_cmp expect72 actual
 
-ok 17 - diff.dirstat=0 & --dirstat=cumulative
+ok 23 - format-patch --cover-letter ignores COLUMNS (big change)
 
 expecting success: 
-	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
+		COLUMNS=200 git $cmd $args >output &&
+		grep " | " output >actual &&
+		test_cmp "$expect" actual
+	
+ok 24 - format-patch ignores COLUMNS (big change)
 
 expecting success: 
-	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
+		COLUMNS=200 git $cmd $args --graph >output &&
+		grep " | " output >actual &&
+		test_cmp "$expect-graph" actual
+	
+ok 25 - format-patch --graph ignores COLUMNS (big change)
 
 expecting success: 
-	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
+		COLUMNS=200 git $cmd $args >output &&
+		grep " | " output >actual &&
+		test_cmp "$expect" actual
+	
+ok 26 - diff respects COLUMNS (big change)
 
 expecting success: 
-	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
+		COLUMNS=200 git $cmd $args >output &&
+		grep " | " output >actual &&
+		test_cmp "$expect" actual
+	
+ok 27 - show respects COLUMNS (big change)
 
 expecting success: 
-	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
+		COLUMNS=200 git $cmd $args >output &&
+		grep " | " output >actual &&
+		test_cmp "$expect" actual
+	
+ok 28 - log respects COLUMNS (big change)
 
 expecting success: 
-	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
+		COLUMNS=200 git $cmd $args --graph >output &&
+		grep " | " output >actual &&
+		test_cmp "$expect-graph" actual
+	
+ok 29 - log --graph respects COLUMNS (big change)
 
 expecting success: 
-	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
+		COLUMNS=40 git $cmd $args >output &&
+		grep " | " output >actual &&
+		test_cmp "$expect" actual
+	
+ok 30 - format-patch ignores not enough COLUMNS (big change)
 
 expecting success: 
-	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
+		COLUMNS=40 git $cmd $args --graph >output &&
+		grep " | " output >actual &&
+		test_cmp "$expect-graph" actual
+	
+ok 31 - format-patch --graph ignores not enough COLUMNS (big change)
 
 expecting success: 
-	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
+		COLUMNS=40 git $cmd $args >output &&
+		grep " | " output >actual &&
+		test_cmp "$expect" actual
+	
+ok 32 - diff respects not enough COLUMNS (big change)
 
 expecting success: 
-	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
+		COLUMNS=40 git $cmd $args >output &&
+		grep " | " output >actual &&
+		test_cmp "$expect" actual
+	
+ok 33 - show respects not enough COLUMNS (big change)
 
 expecting success: 
-	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
+		COLUMNS=40 git $cmd $args >output &&
+		grep " | " output >actual &&
+		test_cmp "$expect" actual
+	
+ok 34 - log respects not enough COLUMNS (big change)
 
 expecting success: 
-	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
+		COLUMNS=40 git $cmd $args --graph >output &&
+		grep " | " output >actual &&
+		test_cmp "$expect-graph" actual
+	
+ok 35 - log --graph respects not enough COLUMNS (big change)
 
 expecting success: 
-	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
+		git -c diff.statGraphWidth=26 $cmd $args >output &&
+		grep " | " output >actual &&
+		test_cmp "$expect" actual
+	
+ok 36 - format-patch ignores statGraphWidth config
 
 expecting success: 
-	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
+		git -c diff.statGraphWidth=26 $cmd $args --graph >output &&
+		grep " | " output >actual &&
+		test_cmp "$expect-graph" actual
+	
+ok 37 - format-patch --graph ignores statGraphWidth config
 
 expecting success: 
-	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
+		git -c diff.statGraphWidth=26 $cmd $args >output &&
+		grep " | " output >actual &&
+		test_cmp "$expect" actual
+	
+ok 38 - diff respects statGraphWidth config
 
 expecting success: 
-	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
+		git -c diff.statGraphWidth=26 $cmd $args >output &&
+		grep " | " output >actual &&
+		test_cmp "$expect" actual
+	
+ok 39 - show respects statGraphWidth config
 
 expecting success: 
-	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
+		git -c diff.statGraphWidth=26 $cmd $args >output &&
+		grep " | " output >actual &&
+		test_cmp "$expect" actual
+	
+ok 40 - log respects statGraphWidth config
 
 expecting success: 
-	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
+		git -c diff.statGraphWidth=26 $cmd $args --graph >output &&
+		grep " | " output >actual &&
+		test_cmp "$expect-graph" actual
+	
+ok 41 - log --graph respects statGraphWidth config
 
 expecting success: 
-	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
+		git $cmd $args --stat=40 >output &&
+		grep " | " output >actual &&
+		test_cmp expect actual
+	
+ok 42 - format-patch --stat=width with big change
 
 expecting success: 
-	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
+		git $cmd $args --stat-width=40 >output &&
+		grep " | " output >actual &&
+		test_cmp expect actual
+	
+ok 43 - format-patch --stat-width=width with big change
 
 expecting success: 
-	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_i18ngrep -q "future_param" actual_error &&
-	test_i18ngrep -q "\--dirstat" actual_error
-
-ok 38 - --dirstat=future_param,lines,0 should fail loudly
+		git $cmd $args --stat-graph-width=26 >output &&
+		grep " | " output >actual &&
+		test_cmp expect actual
+	
+ok 44 - format-patch --stat-graph-width with big change
 
 expecting success: 
-	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_i18ngrep -q "dummy1" actual_error &&
-	test_i18ngrep -q "2dummy" actual_error &&
-	test_i18ngrep -q "\--dirstat" actual_error
+		git $cmd $args --stat-width=40 --graph >output &&
+		grep " | " output >actual &&
+		test_cmp expect-graph actual
+	
+ok 45 - format-patch --stat-width=width --graph with big change
 
-ok 39 - --dirstat=dummy1,cumulative,2dummy should report both unrecognized parameters
+expecting success: 
+		git $cmd $args --stat-graph-width=26 --graph >output &&
+		grep " | " output >actual &&
+		test_cmp expect-graph actual
+	
+ok 46 - format-patch --stat-graph-width --graph with big change
 
 expecting success: 
-	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_i18ngrep -q "future_param" actual_error &&
-	test_i18ngrep -q "diff\\.dirstat" actual_error &&
+		git $cmd $args --stat=40 >output &&
+		grep " | " output >actual &&
+		test_cmp expect actual
+	
+ok 47 - diff --stat=width with big change
 
-	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_i18ngrep -q "future_param" actual_error &&
-	test_i18ngrep -q "diff\\.dirstat" actual_error &&
+expecting success: 
+		git $cmd $args --stat-width=40 >output &&
+		grep " | " output >actual &&
+		test_cmp expect actual
+	
+ok 48 - diff --stat-width=width with big change
 
-	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_i18ngrep -q "future_param" actual_error &&
-	test_i18ngrep -q "diff\\.dirstat" actual_error
+expecting success: 
+		git $cmd $args --stat-graph-width=26 >output &&
+		grep " | " output >actual &&
+		test_cmp expect actual
+	
+ok 49 - diff --stat-graph-width with big change
 
-ok 40 - diff.dirstat=future_param,0,lines should warn, but still work
+expecting success: 
+		git $cmd $args --stat=40 >output &&
+		grep " | " output >actual &&
+		test_cmp expect actual
+	
+ok 50 - show --stat=width with big change
 
 expecting success: 
-	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 $cmd $args --stat-width=40 >output &&
+		grep " | " output >actual &&
+		test_cmp expect actual
+	
+ok 51 - show --stat-width=width with big change
 
-	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: 
+		git $cmd $args --stat-graph-width=26 >output &&
+		grep " | " output >actual &&
+		test_cmp expect actual
+	
+ok 52 - show --stat-graph-width with big change
 
-	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: 
+		git $cmd $args --stat=40 >output &&
+		grep " | " output >actual &&
+		test_cmp expect actual
+	
+ok 53 - log --stat=width with big change
 
-ok 41 - --shortstat --dirstat should output only one dirstat
+expecting success: 
+		git $cmd $args --stat-width=40 >output &&
+		grep " | " output >actual &&
+		test_cmp expect actual
+	
+ok 54 - log --stat-width=width with big change
 
-# passed all 41 test(s)
-1..41
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t4063-diff-blobs.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4063-diff-blobs/.git/
 expecting success: 
-	echo one >one &&
-	echo two >two &&
-	chmod +x two &&
-	git add . &&
+		git $cmd $args --stat-graph-width=26 >output &&
+		grep " | " output >actual &&
+		test_cmp expect actual
+	
+ok 55 - log --stat-graph-width with big change
 
-	# cover systems where modes are ignored
-	git update-index --chmod=+x two &&
+expecting success: 
+		git $cmd $args --stat-width=40 --graph >output &&
+		grep " | " output >actual &&
+		test_cmp expect-graph actual
+	
+ok 56 - log --stat-width=width --graph with big change
 
-	git commit -m base &&
+expecting success: 
+		git $cmd $args --stat-graph-width=26 --graph >output &&
+		grep " | " output >actual &&
+		test_cmp expect-graph actual
+	
+ok 57 - log --stat-graph-width --graph with big change
 
-	sha1_one=$(git rev-parse HEAD:one) &&
-	sha1_two=$(git rev-parse HEAD:two)
+expecting success: 
+	cp abcd aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa &&
+	git add aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa &&
+	git commit -m message
 
-[master (root-commit) 379f91b] base
+[master 13b6c87] message
  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
+ 1 file changed, 1000 insertions(+)
+ create mode 100644 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+ok 58 - preparation for long filename tests
 
 expecting success: 
-	run_diff $sha1_one $sha1_two
-
-ok 2 - diff by sha1
+		git $cmd $args --stat-width=60 >output &&
+		grep " | " output >actual &&
+		test_cmp expect actual
+	
+ok 59 - format-patch --stat=width with big change is more balanced
 
 expecting success: 
-	check_index $sha1_one $sha1_two
-
-index 5626abf0f72e58d7a153368ba57db4c673c0e171..f719efd430d52bcfc8566a43b2eb655688d38871 100644
-ok 3 - index of sha1 diff
+		git $cmd $args --stat-width=60 --graph >output &&
+		grep " | " output >actual &&
+		test_cmp expect-graph actual
+	
+ok 60 - format-patch --stat=width --graph with big change is balanced
 
 expecting success: 
-	check_paths $sha1_one $sha1_two
-
-diff --git a/5626abf0f72e58d7a153368ba57db4c673c0e171 b/f719efd430d52bcfc8566a43b2eb655688d38871
-ok 4 - sha1 diff uses arguments as paths
+		git $cmd $args --stat-width=60 >output &&
+		grep " | " output >actual &&
+		test_cmp expect actual
+	
+ok 61 - diff --stat=width with big change is more balanced
 
 expecting success: 
-	! grep mode diff
-
-ok 5 - sha1 diff has no mode change
+		git $cmd $args --stat-width=60 >output &&
+		grep " | " output >actual &&
+		test_cmp expect actual
+	
+ok 62 - show --stat=width with big change is more balanced
 
 expecting success: 
-	run_diff HEAD:one HEAD:two
-
-ok 6 - diff by tree:path (run)
+		git $cmd $args --stat-width=60 >output &&
+		grep " | " output >actual &&
+		test_cmp expect actual
+	
+ok 63 - log --stat=width with big change is more balanced
 
 expecting success: 
-	check_index $sha1_one $sha1_two
-
-index 5626abf0f72e58d7a153368ba57db4c673c0e171..f719efd430d52bcfc8566a43b2eb655688d38871
-ok 7 - index of tree:path diff
+		git $cmd $args --stat-width=60 --graph >output &&
+		grep " | " output >actual &&
+		test_cmp expect-graph actual
+	
+ok 64 - log --stat=width --graph with big change is balanced
 
 expecting success: 
-	check_paths one two
-
-diff --git a/one b/two
-ok 8 - tree:path diff uses filenames as paths
+		COLUMNS=200 git $cmd $args >output &&
+		grep " | " output >actual &&
+		test_cmp "$expect" actual
+	
+ok 65 - format-patch ignores COLUMNS (long filename)
 
 expecting success: 
-	check_mode 100644 100755
-
-old mode 100644
-new mode 100755
-ok 9 - tree:path diff shows mode change
+		COLUMNS=200 git $cmd $args --graph >output &&
+		grep " | " output >actual &&
+		test_cmp "$expect-graph" actual
+	
+ok 66 - format-patch --graph ignores COLUMNS (long filename)
 
 expecting success: 
-	run_diff HEAD:one..HEAD:two
-
-ok 10 - diff by ranged tree:path
+		COLUMNS=200 git $cmd $args >output &&
+		grep " | " output >actual &&
+		test_cmp "$expect" actual
+	
+ok 67 - diff respects COLUMNS (long filename)
 
 expecting success: 
-	check_index $sha1_one $sha1_two
-
-index 5626abf0f72e58d7a153368ba57db4c673c0e171..f719efd430d52bcfc8566a43b2eb655688d38871
-ok 11 - index of ranged tree:path diff
+		COLUMNS=200 git $cmd $args >output &&
+		grep " | " output >actual &&
+		test_cmp "$expect" actual
+	
+ok 68 - show respects COLUMNS (long filename)
 
 expecting success: 
-	check_paths one two
-
-diff --git a/one b/two
-ok 12 - ranged tree:path diff uses filenames as paths
+		COLUMNS=200 git $cmd $args >output &&
+		grep " | " output >actual &&
+		test_cmp "$expect" actual
+	
+ok 69 - log respects COLUMNS (long filename)
 
 expecting success: 
-	check_mode 100644 100755
-
-old mode 100644
-new mode 100755
-ok 13 - ranged tree:path diff shows mode change
+		COLUMNS=200 git $cmd $args --graph >output &&
+		grep " | " output >actual &&
+		test_cmp "$expect-graph" actual
+	
+ok 70 - log --graph respects COLUMNS (long filename)
 
 expecting success: 
-	run_diff HEAD:one two
-
-ok 14 - diff blob against file
+		COLUMNS=1 git $cmd $args >output &&
+		grep " | " output >actual &&
+		test_cmp "$expect" actual
+	
+ok 71 - format-patch ignores prefix greater than COLUMNS (big change)
 
 expecting success: 
-	check_index $sha1_one $sha1_two
-
-index 5626abf0f72e58d7a153368ba57db4c673c0e171..f719efd430d52bcfc8566a43b2eb655688d38871
-ok 15 - index of blob-file diff
+		COLUMNS=1 git $cmd $args --graph >output &&
+		grep " | " output >actual &&
+		test_cmp "$expect-graph" actual
+	
+ok 72 - format-patch --graph ignores prefix greater than COLUMNS (big change)
 
 expecting success: 
-	check_paths one two
+		COLUMNS=1 git $cmd $args >output &&
+		grep " | " output >actual &&
+		test_cmp "$expect" actual
+	
+ok 73 - diff respects prefix greater than COLUMNS (big change)
 
-diff --git a/one b/two
-ok 16 - blob-file diff uses filename as paths
+expecting success: 
+		COLUMNS=1 git $cmd $args >output &&
+		grep " | " output >actual &&
+		test_cmp "$expect" actual
+	
+ok 74 - show respects prefix greater than COLUMNS (big change)
 
-checking prerequisite: FILEMODE
+expecting success: 
+		COLUMNS=1 git $cmd $args >output &&
+		grep " | " output >actual &&
+		test_cmp "$expect" actual
+	
+ok 75 - log respects prefix greater than COLUMNS (big change)
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
-	test "$(git config --bool core.filemode)" = true
+expecting success: 
+		COLUMNS=1 git $cmd $args --graph >output &&
+		grep " | " output >actual &&
+		test_cmp "$expect-graph" actual
+	
+ok 76 - log --graph respects prefix greater than COLUMNS (big change)
 
-)
-prerequisite FILEMODE ok
 expecting success: 
-	check_mode 100644 100755
+	git checkout -b branch HEAD^^ &&
+	COLUMNS=100 git merge --stat --no-ff master^ >output &&
+	grep " | " output >actual &&
+	test_cmp expect actual
 
-old mode 100644
-new mode 100755
-ok 17 - blob-file diff shows mode change
+Switched to a new branch 'branch'
+ok 77 - merge --stat respects COLUMNS (big change)
 
 expecting success: 
-	run_diff $sha1_one two &&
-	check_paths two two
+	COLUMNS=100 git merge --stat --no-ff master >output &&
+	grep " | " output >actual &&
+	test_cmp expect actual
 
-diff --git a/two b/two
-ok 18 - blob-file diff prefers filename to sha1
+ok 78 - merge --stat respects COLUMNS (long filename)
 
-# passed all 18 test(s)
-1..18
+# passed all 78 test(s)
+1..78
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t4059-diff-submodule-not-initialized.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4059-diff-submodule-not-initialized/.git/
+*** t4061-diff-indent.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4061-diff-indent/.git/
 expecting success: 
-	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/git-2.20.1/t/trash directory.t4059-diff-submodule-not-initialized/sm2/.git/
-36d39d8
-1beffeb
-ok 1 - setup - submodules
+	cat <<-\EOF >spaces.txt &&
+	1
+	2
+	a
 
-expecting success: 
-	git 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)
+	b
+	3
+	4
 	EOF
-	test_cmp expected actual
 
-Cloning into '/build/git-2.20.1/t/trash directory.t4059-diff-submodule-not-initialized/sm1'...
-done.
-ok 2 - setup - git submodule add
+	cat <<-\EOF >functions.c &&
+	1
+	2
+	/* function */
+	foo() {
+	    foo
+	}
 
-expecting success: 
-	rm -rf sm1 &&
-	git diff-tree -p --no-commit-id --submodule=log HEAD -- sm1 >actual &&
-	cat >expected <<-EOF &&
-	Submodule sm1 0000000...$smhead1 (new submodule)
+	3
+	4
 	EOF
-	test_cmp expected actual
 
-ok 3 - submodule directory removed
+	git add spaces.txt functions.c &&
+	test_tick &&
+	git commit -m initial &&
+	git branch old &&
 
-expecting success: 
-	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
+	cat <<-\EOF >spaces.txt &&
+	1
+	2
+	a
 
-Submodule path 'sm1': checked out '1beffeb46f4c598c329381e14c03d952fb2e60d8'
-ok 4 - setup - submodule multiple commits
+	b
+	a
 
-expecting success: 
-	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)
+	b
+	3
+	4
 	EOF
-	test_cmp expected actual
-
-ok 5 - submodule removed multiple commits
 
-expecting success: 
-	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
+	cat <<-\EOF >functions.c &&
+	1
+	2
+	/* function */
+	bar() {
+	    foo
+	}
 
-Cloning into 'sm3'...
-done.
-ok 6 - submodule not initialized in new clone
+	/* function */
+	foo() {
+	    foo
+	}
 
-expecting success: 
-	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)
+	3
+	4
 	EOF
-	test_cmp expected actual
 
-Submodule path 'sm1': checked out 'b762e6a22f976e7e5d55bfe47bb4c4694f97a64c'
-ok 7 - setup submodule moved
+	git add spaces.txt functions.c &&
+	test_tick &&
+	git commit -m initial &&
+	git branch new &&
 
-expecting success: 
-	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)
+	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
-	test_cmp expected actual
-
-ok 8 - submodule moved then removed
-
-# passed all 8 test(s)
-1..8
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t4102-apply-rename.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4102-apply-rename/.git/
-expecting success: git update-index --add foo
-ok 1 - setup
-
-expecting success: 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" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
-	test "$(git config --bool core.filemode)" = true
-
-)
-prerequisite FILEMODE ok
-expecting success: test -f bar && ls -l bar | grep "^-..x......"
--rwxr-xr-x 1 pbuilder1 pbuilder1 12 Dec  3 05:06 bar
-ok 3 - validate
-
-expecting success: 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: 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/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t4106-apply-stdin.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4106-apply-stdin/.git/
-expecting success: 
-	echo hello >text &&
-	git add text &&
-	echo goodbye >text &&
-	git diff >patch
-
-ok 1 - setup
 
-expecting success: 
-	echo "1	1	text" >expect &&
-	git apply --numstat - <patch >actual &&
-	test_cmp expect actual
+	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
 
-ok 2 - git apply --numstat - < patch
+	tr "_" " " <<-\EOF >functions-expect &&
+	diff --git a/functions.c b/functions.c
+	--- a/functions.c
+	+++ b/functions.c
+	@@ -1,6 +1,11 @@
+	 1
+	 2
+	 /* function */
+	+bar() {
+	+    foo
+	+}
+	+
+	+/* function */
+	 foo() {
+	     foo
+	 }
+	EOF
 
-expecting success: 
-	for i in 1 2; do echo "1	1	text"; done >expect &&
-	git apply --numstat - < patch patch >actual &&
-	test_cmp expect actual
+	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
 
-ok 3 - git apply --numstat - < patch patch
+[master (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
+[master cc6bd2a] initial
+ Author: A U Thor <author@example.com>
+ 2 files changed, 8 insertions(+)
+ok 1 - prepare
 
-# passed all 3 test(s)
-1..3
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t4101-apply-nonl.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4101-apply-nonl/.git/
 expecting success: 
-	git apply <"$TEST_DIRECTORY"/t4101/diff.$i-$j &&
-	test_cmp frotz.$j frotz
-    
-ok 1 - apply diff between 0 and 1
+	git diff --no-indent-heuristic old new -- spaces.txt >out &&
+	compare_diff spaces-expect out
 
-expecting success: 
-	git apply <"$TEST_DIRECTORY"/t4101/diff.$i-$j &&
-	test_cmp frotz.$j frotz
-    
-ok 2 - apply diff between 0 and 2
+ok 2 - diff: ugly spaces
 
 expecting success: 
-	git apply <"$TEST_DIRECTORY"/t4101/diff.$i-$j &&
-	test_cmp frotz.$j frotz
-    
-ok 3 - apply diff between 0 and 3
+	git -c diff.indentHeuristic=true diff --no-indent-heuristic old new -- spaces.txt >out2 &&
+	compare_diff spaces-expect out2
 
-expecting success: 
-	git apply <"$TEST_DIRECTORY"/t4101/diff.$i-$j &&
-	test_cmp frotz.$j frotz
-    
-ok 4 - apply diff between 1 and 0
+ok 3 - diff: --no-indent-heuristic overrides config
 
 expecting success: 
-	git apply <"$TEST_DIRECTORY"/t4101/diff.$i-$j &&
-	test_cmp frotz.$j frotz
-    
-ok 5 - apply diff between 1 and 2
+	git -c diff.indentHeuristic=false diff --indent-heuristic old new -- spaces.txt >out-compacted &&
+	compare_diff spaces-compacted-expect out-compacted
 
-expecting success: 
-	git apply <"$TEST_DIRECTORY"/t4101/diff.$i-$j &&
-	test_cmp frotz.$j frotz
-    
-ok 6 - apply diff between 1 and 3
+ok 4 - diff: nice spaces with --indent-heuristic
 
 expecting success: 
-	git apply <"$TEST_DIRECTORY"/t4101/diff.$i-$j &&
-	test_cmp frotz.$j frotz
-    
-ok 7 - apply diff between 2 and 0
+	git -c diff.indentHeuristic=true diff old new -- spaces.txt >out-compacted2 &&
+	compare_diff spaces-compacted-expect out-compacted2
 
-expecting success: 
-	git apply <"$TEST_DIRECTORY"/t4101/diff.$i-$j &&
-	test_cmp frotz.$j frotz
-    
-ok 8 - apply diff between 2 and 1
+ok 5 - diff: nice spaces with diff.indentHeuristic=true
 
 expecting success: 
-	git apply <"$TEST_DIRECTORY"/t4101/diff.$i-$j &&
-	test_cmp frotz.$j frotz
-    
-ok 9 - apply diff between 2 and 3
+	git diff --indent-heuristic --patience old new -- spaces.txt >out-compacted3 &&
+	compare_diff spaces-compacted-expect out-compacted3
 
-expecting success: 
-	git apply <"$TEST_DIRECTORY"/t4101/diff.$i-$j &&
-	test_cmp frotz.$j frotz
-    
-ok 10 - apply diff between 3 and 0
+ok 6 - diff: --indent-heuristic with --patience
 
 expecting success: 
-	git apply <"$TEST_DIRECTORY"/t4101/diff.$i-$j &&
-	test_cmp frotz.$j frotz
-    
-ok 11 - apply diff between 3 and 1
+	git diff --indent-heuristic --histogram old new -- spaces.txt >out-compacted4 &&
+	compare_diff spaces-compacted-expect out-compacted4
 
-expecting success: 
-	git apply <"$TEST_DIRECTORY"/t4101/diff.$i-$j &&
-	test_cmp frotz.$j frotz
-    
-ok 12 - apply diff between 3 and 2
+ok 7 - diff: --indent-heuristic with --histogram
 
-# passed all 12 test(s)
-1..12
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t4100-apply-stat.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4100-apply-stat/.git/
 expecting success: 
-		git apply --stat --summary \
-			<"$TEST_DIRECTORY/t4100/t-apply-$num.patch" >current &&
-		test_i18ncmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current
-	
-ok 1 - rename
+	git diff --no-indent-heuristic old new -- functions.c >out &&
+	compare_diff functions-expect out
 
-expecting success: 
-		sed -e "$UNC" <"$TEST_DIRECTORY/t4100/t-apply-$num.patch" |
-		git apply --recount --stat --summary >current &&
-		test_i18ncmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current
-	
-ok 2 - rename with recount
+ok 8 - diff: ugly functions
 
 expecting success: 
-		git apply --stat --summary \
-			<"$TEST_DIRECTORY/t4100/t-apply-$num.patch" >current &&
-		test_i18ncmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current
-	
-ok 3 - copy
+	git diff --indent-heuristic old new -- functions.c >out-compacted &&
+	compare_diff functions-compacted-expect out-compacted
 
-expecting success: 
-		sed -e "$UNC" <"$TEST_DIRECTORY/t4100/t-apply-$num.patch" |
-		git apply --recount --stat --summary >current &&
-		test_i18ncmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current
-	
-ok 4 - copy with recount
+ok 9 - diff: nice functions with --indent-heuristic
 
 expecting success: 
-		git apply --stat --summary \
-			<"$TEST_DIRECTORY/t4100/t-apply-$num.patch" >current &&
-		test_i18ncmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current
-	
-ok 5 - rewrite
+	git blame --indent-heuristic old..new -- spaces.txt >out-blame-compacted &&
+	compare_blame spaces-compacted-expect out-blame-compacted
 
-expecting success: 
-		sed -e "$UNC" <"$TEST_DIRECTORY/t4100/t-apply-$num.patch" |
-		git apply --recount --stat --summary >current &&
-		test_i18ncmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current
-	
-ok 6 - rewrite with recount
+ok 10 - blame: nice spaces with --indent-heuristic
 
 expecting success: 
-		git apply --stat --summary \
-			<"$TEST_DIRECTORY/t4100/t-apply-$num.patch" >current &&
-		test_i18ncmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current
-	
-ok 7 - mode
+	git -c diff.indentHeuristic=true blame old..new -- spaces.txt >out-blame-compacted2 &&
+	compare_blame spaces-compacted-expect out-blame-compacted2
 
-expecting success: 
-		sed -e "$UNC" <"$TEST_DIRECTORY/t4100/t-apply-$num.patch" |
-		git apply --recount --stat --summary >current &&
-		test_i18ncmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current
-	
-ok 8 - mode with recount
+ok 11 - blame: nice spaces with diff.indentHeuristic=true
 
 expecting success: 
-		git apply --stat --summary \
-			<"$TEST_DIRECTORY/t4100/t-apply-$num.patch" >current &&
-		test_i18ncmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current
-	
-ok 9 - non git (1)
+	git blame --no-indent-heuristic old..new -- spaces.txt >out-blame &&
+	compare_blame spaces-expect out-blame
 
-expecting success: 
-		sed -e "$UNC" <"$TEST_DIRECTORY/t4100/t-apply-$num.patch" |
-		git apply --recount --stat --summary >current &&
-		test_i18ncmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current
-	
-ok 10 - non git (1) with recount
+ok 12 - blame: ugly spaces with --no-indent-heuristic
 
 expecting success: 
-		git apply --stat --summary \
-			<"$TEST_DIRECTORY/t4100/t-apply-$num.patch" >current &&
-		test_i18ncmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current
-	
-ok 11 - non git (2)
+	git -c diff.indentHeuristic=false blame old..new -- spaces.txt >out-blame2 &&
+	compare_blame spaces-expect out-blame2
 
-expecting success: 
-		sed -e "$UNC" <"$TEST_DIRECTORY/t4100/t-apply-$num.patch" |
-		git apply --recount --stat --summary >current &&
-		test_i18ncmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current
-	
-ok 12 - non git (2) with recount
+ok 13 - blame: ugly spaces with diff.indentHeuristic=false
 
 expecting success: 
-		git apply --stat --summary \
-			<"$TEST_DIRECTORY/t4100/t-apply-$num.patch" >current &&
-		test_i18ncmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current
-	
-ok 13 - non git (3)
+	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: 
-		sed -e "$UNC" <"$TEST_DIRECTORY/t4100/t-apply-$num.patch" |
-		git apply --recount --stat --summary >current &&
-		test_i18ncmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current
-	
-ok 14 - non git (3) with recount
+ok 14 - blame: --no-indent-heuristic overrides config
 
 expecting success: 
-		git apply --stat --summary \
-			<"$TEST_DIRECTORY/t4100/t-apply-$num.patch" >current &&
-		test_i18ncmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current
-	
-ok 15 - incomplete (1)
+	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: 
-		sed -e "$UNC" <"$TEST_DIRECTORY/t4100/t-apply-$num.patch" |
-		git apply --recount --stat --summary >current &&
-		test_i18ncmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current
-	
-ok 16 - incomplete (1) with recount
+ok 15 - blame: --indent-heuristic overrides config
 
 expecting success: 
-		git apply --stat --summary \
-			<"$TEST_DIRECTORY/t4100/t-apply-$num.patch" >current &&
-		test_i18ncmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current
-	
-ok 17 - incomplete (2)
+	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: 
-		sed -e "$UNC" <"$TEST_DIRECTORY/t4100/t-apply-$num.patch" |
-		git apply --recount --stat --summary >current &&
-		test_i18ncmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current
-	
-ok 18 - incomplete (2) with recount
+ok 16 - diff-tree: nice spaces with --indent-heuristic
 
-# passed all 18 test(s)
-1..18
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t4105-apply-fuzz.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4105-apply-fuzz/.git/
 expecting success: 
+	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
 
-	for i in 1 2 3 4 5 6 7 8 9 10 11 12
-	do
-		echo $i
-	done >file &&
-	git update-index --add file &&
-	for i in 1 2 3 4 5 6 7 a b c d e 8 9 10 11 12
-	do
-		echo $i
-	done >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
+ok 17 - diff-tree: nice spaces with diff.indentHeuristic=true
 
 expecting success: 
-		git checkout-index -f -q -u file &&
-		git apply O0.diff &&
-		test_cmp expect file
-	
-ok 2 - unmodified patch
+	git diff-tree --no-indent-heuristic -p old new -- spaces.txt >out-diff-tree &&
+	compare_diff spaces-expect out-diff-tree
 
-expecting success: 
-		git checkout-index -f -q -u file &&
-		git apply O1.diff &&
-		test_cmp expect file
-	
-ok 3 - minus offset
+ok 18 - diff-tree: ugly spaces with --no-indent-heuristic
 
 expecting success: 
-		git checkout-index -f -q -u file &&
-		git apply O2.diff &&
-		test_cmp expect file
-	
-ok 4 - plus offset
+	git -c diff.indentHeuristic=false diff-tree -p old new -- spaces.txt >out-diff-tree2 &&
+	compare_diff spaces-expect out-diff-tree2
 
-expecting success: 
-		git checkout-index -f -q -u file &&
-		git apply O3.diff &&
-		test_cmp expect file
-	
-ok 5 - big offset
+ok 19 - diff-tree: ugly spaces with diff.indentHeuristic=false
 
 expecting success: 
-		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
+	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: 
-		git checkout-index -f -q -u file &&
-		git apply -C2 F1.diff &&
-		test_cmp expect file
-	
-Context reduced to (2/2) to apply fragment at 6
-ok 7 - fuzz with minus offset
+ok 20 - diff-tree: --indent-heuristic overrides config
 
 expecting success: 
-		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
+	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: 
-		git checkout-index -f -q -u file &&
-		git apply -C2 F3.diff &&
-		test_cmp expect file
-	
-Context reduced to (2/2) to apply fragment at 6
-ok 9 - fuzz with big offset
+ok 21 - diff-tree: --no-indent-heuristic overrides config
 
-# passed all 9 test(s)
-1..9
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t4110-apply-scan.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4110-apply-scan/.git/
 expecting success: 
-	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"
+	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 master
 
-ok 1 - git apply scan
+Switched to a new branch 'diff-index'
+Switched to branch 'master'
+ok 22 - diff-index: nice spaces with --indent-heuristic
 
-# passed all 1 test(s)
-1..1
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t4107-apply-ignore-whitespace.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4107-apply-ignore-whitespace/.git/
 expecting success: 
-	git apply patch1.patch
+	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 master
 
-ok 1 - file creation
+Switched to and reset branch 'diff-index'
+Switched to branch 'master'
+ok 23 - diff-index: nice spaces with diff.indentHeuristic=true
 
 expecting success: 
-	test_must_fail git apply patch2.patch
+	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 master
 
-error: patch failed: main.c:10
-error: main.c: patch does not apply
-ok 2 - patch2 fails (retab)
+Switched to and reset branch 'diff-index'
+Switched to branch 'master'
+ok 24 - diff-index: ugly spaces with --no-indent-heuristic
 
 expecting success: 
-	git apply --ignore-whitespace patch2.patch
+	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 master
 
-ok 3 - patch2 applies with --ignore-whitespace
+Switched to and reset branch 'diff-index'
+Switched to branch 'master'
+ok 25 - diff-index: ugly spaces with diff.indentHeuristic=false
 
 expecting success: 
-	git apply -R --ignore-space-change patch2.patch
+	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 master
 
-ok 4 - patch2 reverse applies with --ignore-space-change
+Switched to and reset branch 'diff-index'
+Switched to branch 'master'
+ok 26 - diff-index: --indent-heuristic overrides config
 
 expecting success: 
-	git apply patch2.patch &&
-	test_cmp main.c.final main.c
+	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 master
 
-ok 5 - patch2 applies (apply.ignorewhitespace = change)
+Switched to and reset branch 'diff-index'
+Switched to branch 'master'
+ok 27 - diff-index: --no-indent-heuristic overrides config
 
 expecting success: 
-	test_must_fail git apply patch3.patch
+	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 master
 
-error: patch failed: main.c:10
-error: main.c: patch does not apply
-ok 6 - patch3 fails (missing string at EOL)
+Switched to a new branch 'diff-files'
+Unstaged changes after reset:
+M	functions.c
+M	spaces.txt
+Switched to branch 'master'
+ok 28 - diff-files: nice spaces with --indent-heuristic
 
 expecting success: 
-	test_must_fail git apply patch4.patch
+	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 master
 
-error: patch failed: main.c:21
-error: main.c: patch does not apply
-ok 7 - patch4 fails (missing EOL at EOF)
+Switched to and reset branch 'diff-files'
+Unstaged changes after reset:
+M	functions.c
+M	spaces.txt
+Switched to branch 'master'
+ok 29 - diff-files: nice spaces with diff.indentHeuristic=true
 
 expecting success: 
-	test_must_fail git apply patch5.patch
+	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 master
 
-error: patch failed: main.c:2
-error: main.c: patch does not apply
-ok 8 - patch5 fails (leading whitespace differences matter)
+Switched to and reset branch 'diff-files'
+Unstaged changes after reset:
+M	functions.c
+M	spaces.txt
+Switched to branch 'master'
+ok 30 - diff-files: ugly spaces with --no-indent-heuristic
 
 expecting success: 
-	rm -f main.c &&
-	git apply patch1.patch
+	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 master
 
-ok 9 - re-create file (with --ignore-whitespace)
+Switched to and reset branch 'diff-files'
+Unstaged changes after reset:
+M	functions.c
+M	spaces.txt
+Switched to branch 'master'
+ok 31 - diff-files: ugly spaces with diff.indentHeuristic=false
 
 expecting success: 
-	test_must_fail git apply --no-ignore-whitespace patch5.patch
+	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 master
 
-error: patch failed: main.c:2
-error: main.c: patch does not apply
-ok 10 - patch5 fails (--no-ignore-whitespace)
+Switched to and reset branch 'diff-files'
+Unstaged changes after reset:
+M	functions.c
+M	spaces.txt
+Switched to branch 'master'
+ok 32 - diff-files: --indent-heuristic overrides config
 
 expecting success: 
-	echo 1 >file &&
-	git apply --ignore-space-change --inaccurate-eof <<-\EOF &&
-	diff --git a/file b/file
-	--- a/file
-	+++ b/file
-	@@ -1 +1 @@
-	-1
-	+2
-	EOF
-	printf 2 >expect &&
-	test_cmp expect file
+	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 master
 
-ok 11 - apply --ignore-space-change --inaccurate-eof
+Switched to and reset branch 'diff-files'
+Unstaged changes after reset:
+M	functions.c
+M	spaces.txt
+Switched to branch 'master'
+ok 33 - diff-files: --no-indent-heuristic overrides config
 
-# passed all 11 test(s)
-1..11
+# passed all 33 test(s)
+1..33
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
 *** t4013-diff-various.sh ***
@@ -119823,1074 +121165,320 @@
 1..176
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t4109-apply-multifrag.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4109-apply-multifrag/.git/
-expecting success: 
-	git apply patch1.patch patch2.patch &&
-	test_cmp "$TEST_DIRECTORY/t4109/expect-1" main.c
-
-patch1.patch:28: new blank line at EOF.
-+
-patch2.patch:58: new blank line at EOF.
-+
-warning: 2 lines add whitespace errors.
-ok 1 - git apply (1)
-
-expecting success: 
-	git apply patch1.patch patch2.patch patch3.patch &&
-	test_cmp "$TEST_DIRECTORY/t4109/expect-2" main.c
-
-patch1.patch:28: new blank line at EOF.
-+
-patch2.patch:58: new blank line at EOF.
-+
-warning: 2 lines add whitespace errors.
-ok 2 - git apply (2)
-
-expecting success: 
-	git apply patch1.patch patch4.patch &&
-	test_cmp "$TEST_DIRECTORY/t4109/expect-3" main.c
-
-patch1.patch:28: new blank line at EOF.
-+
-warning: 1 line adds whitespace errors.
-ok 3 - git apply (3)
-
-# passed all 3 test(s)
-1..3
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t4061-diff-indent.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4061-diff-indent/.git/
+*** t4115-apply-symlink.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4115-apply-symlink/.git/
 expecting success: 
-	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 &&
+	test_ln_s_add path1/path2/path3/path4/path5 link1 &&
 	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
-	}
+	git branch side &&
 
-	3
-	4
-	EOF
+	rm -f link? &&
 
-	git add spaces.txt functions.c &&
-	test_tick &&
-	git commit -m initial &&
-	git branch new &&
+	test_ln_s_add htap6 link1 &&
+	git commit -m second &&
 
-	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
+	git diff-tree -p HEAD^ HEAD >patch  &&
+	git apply --stat --summary patch
 
-	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
+checking prerequisite: SYMLINKS
 
-	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
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
+	# test whether the filesystem supports symbolic links
+	ln -s x y && test -h y
 
-[master (root-commit) a2a2312] initial
+)
+prerequisite SYMLINKS ok
+[master (root-commit) 5636614] initial
  Author: A U Thor <author@example.com>
- 2 files changed, 16 insertions(+)
- create mode 100644 functions.c
- create mode 100644 spaces.txt
-[master cc6bd2a] initial
+ 1 file changed, 1 insertion(+)
+ create mode 120000 link1
+[master 6b418df] second
  Author: A U Thor <author@example.com>
- 2 files changed, 8 insertions(+)
-ok 1 - prepare
-
-expecting success: 
-	git diff --no-indent-heuristic old new -- spaces.txt >out &&
-	compare_diff spaces-expect out
-
-ok 2 - diff: ugly spaces
-
-expecting success: 
-	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: 
-	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: 
-	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: 
-	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: 
-	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: 
-	git diff --no-indent-heuristic old new -- functions.c >out &&
-	compare_diff functions-expect out
-
-ok 8 - diff: ugly functions
-
-expecting success: 
-	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: 
-	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: 
-	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: 
-	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: 
-	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: 
-	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: 
-	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: 
-	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: 
-	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: 
-	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: 
-	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: 
-	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: 
-	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: 
-	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 master
-
-Switched to a new branch 'diff-index'
-Switched to branch 'master'
-ok 22 - diff-index: nice spaces with --indent-heuristic
-
-expecting success: 
-	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 master
-
-Switched to and reset branch 'diff-index'
-Switched to branch 'master'
-ok 23 - diff-index: nice spaces with diff.indentHeuristic=true
-
-expecting success: 
-	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 master
-
-Switched to and reset branch 'diff-index'
-Switched to branch 'master'
-ok 24 - diff-index: ugly spaces with --no-indent-heuristic
-
-expecting success: 
-	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 master
-
-Switched to and reset branch 'diff-index'
-Switched to branch 'master'
-ok 25 - diff-index: ugly spaces with diff.indentHeuristic=false
-
-expecting success: 
-	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 master
-
-Switched to and reset branch 'diff-index'
-Switched to branch 'master'
-ok 26 - diff-index: --indent-heuristic overrides config
-
-expecting success: 
-	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 master
-
-Switched to and reset branch 'diff-index'
-Switched to branch 'master'
-ok 27 - diff-index: --no-indent-heuristic overrides config
-
-expecting success: 
-	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 master
-
-Switched to a new branch 'diff-files'
-Unstaged changes after reset:
-M	functions.c
-M	spaces.txt
-Switched to branch 'master'
-ok 28 - diff-files: nice spaces with --indent-heuristic
-
-expecting success: 
-	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 master
-
-Switched to and reset branch 'diff-files'
-Unstaged changes after reset:
-M	functions.c
-M	spaces.txt
-Switched to branch 'master'
-ok 29 - diff-files: nice spaces with diff.indentHeuristic=true
-
-expecting success: 
-	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 master
-
-Switched to and reset branch 'diff-files'
-Unstaged changes after reset:
-M	functions.c
-M	spaces.txt
-Switched to branch 'master'
-ok 30 - diff-files: ugly spaces with --no-indent-heuristic
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ link1 |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 1 - setup
 
 expecting success: 
-	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 master
 
-Switched to and reset branch 'diff-files'
-Unstaged changes after reset:
-M	functions.c
-M	spaces.txt
-Switched to branch 'master'
-ok 31 - diff-files: ugly spaces with diff.indentHeuristic=false
+	git checkout side &&
+	git apply patch &&
+	git diff-files -p >patched &&
+	test_cmp patch patched
 
-expecting success: 
-	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 master
 
-Switched to and reset branch 'diff-files'
-Unstaged changes after reset:
-M	functions.c
-M	spaces.txt
-Switched to branch 'master'
-ok 32 - diff-files: --indent-heuristic overrides config
+Switched to branch 'side'
+ok 2 - apply symlink patch
 
 expecting success: 
-	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 master
-
-Switched to and reset branch 'diff-files'
-Unstaged changes after reset:
-M	functions.c
-M	spaces.txt
-Switched to branch 'master'
-ok 33 - diff-files: --no-indent-heuristic overrides config
-
-# passed all 33 test(s)
-1..33
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t4112-apply-renames.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4112-apply-renames/.git/
-expecting success: git apply --check patch
-ok 1 - check rename/copy patch
-
-expecting success: git apply --index patch
-ok 2 - apply rename/copy patch
 
-# passed all 2 test(s)
-1..2
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t4113-apply-ending.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4113-apply-ending/.git/
-expecting success: git update-index --add file
-ok 1 - setup
+	git checkout -f side &&
+	git apply --index patch &&
+	git diff-index --cached -p HEAD >patched &&
+	test_cmp patch patched
 
-expecting success: test_must_fail git apply --index test-patch
-error: patch failed: file:1
-error: file: patch does not apply
-ok 2 - apply at the end
 
-expecting success: test_must_fail git apply --index test-patch
-error: patch failed: file:1
-error: file: patch does not apply
-ok 3 - apply at the beginning
+Already on 'side'
+ok 3 - apply --index symlink patch
 
 # passed all 3 test(s)
 1..3
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t4052-stat-output.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4052-stat-output/.git/
-expecting success: 
-	>"$name" &&
-	git add "$name" &&
-	git commit -m message &&
-	echo a >"$name" &&
-	git commit -m message "$name"
-
-[master (root-commit) 10982d7] message
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-[master 5f7c51c] message
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 1 - preparation
-
-expecting success: 
-	git format-patch -1 --stdout >output &&
-	grep " | " output >actual &&
-	test_cmp expect72 actual
-
-ok 2 - format-patch: small change with long name gives more space to the name
-
-expecting success: 
-		git $cmd $args >output &&
-		grep " | " output >actual &&
-		test_cmp expect80 actual
-	
-ok 3 - diff: small change with long name gives more space to the name
-
-expecting success: 
-		git $cmd $args >output &&
-		grep " | " output >actual &&
-		test_cmp expect80 actual
-	
-ok 4 - show: small change with long name gives more space to the name
-
-expecting success: 
-		git $cmd $args >output &&
-		grep " | " output >actual &&
-		test_cmp expect80 actual
-	
-ok 5 - log: small change with long name gives more space to the name
-
-expecting success: 
-		git $cmd $args --stat=40 >output &&
-		grep " | " output >actual &&
-		test_cmp $expect.60 actual
-	
-ok 6 - format-patch --stat=width: a long name is given more room when the bar is short
-
-expecting success: 
-		git $cmd $args --stat-width=40 >output &&
-		grep " | " output >actual &&
-		test_cmp $expect.60 actual
-	
-ok 7 - format-patch --stat-width=width with long name
-
-expecting success: 
-		git $cmd $args --stat=60,30 >output &&
-		grep " | " output >actual &&
-		test_cmp $expect.6030 actual
-	
-ok 8 - format-patch --stat=...,name-width with long name
-
-expecting success: 
-		git $cmd $args --stat-name-width=30 >output &&
-		grep " | " output >actual &&
-		test_cmp $expect.6030 actual
-	
-ok 9 - format-patch --stat-name-width with long name
-
-expecting success: 
-		git $cmd $args --stat=40 >output &&
-		grep " | " output >actual &&
-		test_cmp $expect.60 actual
-	
-ok 10 - diff --stat=width: a long name is given more room when the bar is short
-
-expecting success: 
-		git $cmd $args --stat-width=40 >output &&
-		grep " | " output >actual &&
-		test_cmp $expect.60 actual
-	
-ok 11 - diff --stat-width=width with long name
-
-expecting success: 
-		git $cmd $args --stat=60,30 >output &&
-		grep " | " output >actual &&
-		test_cmp $expect.6030 actual
-	
-ok 12 - diff --stat=...,name-width with long name
-
-expecting success: 
-		git $cmd $args --stat-name-width=30 >output &&
-		grep " | " output >actual &&
-		test_cmp $expect.6030 actual
-	
-ok 13 - diff --stat-name-width with long name
-
-expecting success: 
-		git $cmd $args --stat=40 >output &&
-		grep " | " output >actual &&
-		test_cmp $expect.60 actual
-	
-ok 14 - show --stat=width: a long name is given more room when the bar is short
-
+*** t4103-apply-binary.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4103-apply-binary/.git/
 expecting success: 
-		git $cmd $args --stat-width=40 >output &&
-		grep " | " output >actual &&
-		test_cmp $expect.60 actual
-	
-ok 15 - show --stat-width=width with long name
+	cat >file1 <<-\EOF &&
+	A quick brown fox jumps over the lazy dog.
+	A tiny little penguin runs around in circles.
+	There is a flag with Linux written on it.
+	A slow black-and-white panda just sits there,
+	munching on his bamboo.
+	EOF
+	cat file1 >file2 &&
+	cat file1 >file4 &&
 
-expecting success: 
-		git $cmd $args --stat=60,30 >output &&
-		grep " | " output >actual &&
-		test_cmp $expect.6030 actual
-	
-ok 16 - show --stat=...,name-width with long name
+	git update-index --add --remove file1 file2 file4 &&
+	git commit -m "Initial Version" 2>/dev/null &&
 
-expecting success: 
-		git $cmd $args --stat-name-width=30 >output &&
-		grep " | " output >actual &&
-		test_cmp $expect.6030 actual
-	
-ok 17 - show --stat-name-width with long name
+	git checkout -b binary &&
+	perl -pe "y/x/\000/" <file1 >file3 &&
+	cat file3 >file4 &&
+	git add file2 &&
+	perl -pe "y/\000/v/" <file3 >file1 &&
+	rm -f file2 &&
+	git update-index --add --remove file1 file2 file3 file4 &&
+	git commit -m "Second Version" &&
 
-expecting success: 
-		git $cmd $args --stat=40 >output &&
-		grep " | " output >actual &&
-		test_cmp $expect.60 actual
-	
-ok 18 - log --stat=width: a long name is given more room when the bar is short
+	git diff-tree -p master binary >B.diff &&
+	git diff-tree -p -C master binary >C.diff &&
 
-expecting success: 
-		git $cmd $args --stat-width=40 >output &&
-		grep " | " output >actual &&
-		test_cmp $expect.60 actual
-	
-ok 19 - log --stat-width=width with long name
+	git diff-tree -p --binary master binary >BF.diff &&
+	git diff-tree -p --binary -C master binary >CF.diff &&
 
-expecting success: 
-		git $cmd $args --stat=60,30 >output &&
-		grep " | " output >actual &&
-		test_cmp $expect.6030 actual
-	
-ok 20 - log --stat=...,name-width with long name
+	git diff-tree -p --full-index master binary >B-index.diff &&
+	git diff-tree -p -C --full-index master binary >C-index.diff &&
 
-expecting success: 
-		git $cmd $args --stat-name-width=30 >output &&
-		grep " | " output >actual &&
-		test_cmp $expect.6030 actual
-	
-ok 21 - log --stat-name-width with long name
+	git diff-tree -p --binary --no-prefix master binary -- file3 >B0.diff &&
 
-expecting success: 
-	>abcd &&
-	git add abcd &&
-	git commit -m message &&
-	i=0 &&
-	while test $i -lt 1000
-	do
-		echo $i && i=$(($i + 1))
-	done >abcd &&
-	git commit -m message abcd
+	git init other-repo &&
+	(
+		cd other-repo &&
+		git fetch .. master &&
+		git reset --hard FETCH_HEAD
+	)
 
-[master 3cdaa6c] message
+[master (root-commit) e966055] Initial Version
  Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 abcd
-[master 7644e0a] message
+ 3 files changed, 15 insertions(+)
+ create mode 100644 file1
+ create mode 100644 file2
+ create mode 100644 file4
+Switched to a new branch 'binary'
+[binary 824c4cf] Second Version
  Author: A U Thor <author@example.com>
- 1 file changed, 1000 insertions(+)
-ok 22 - preparation for big change tests
-
-expecting success: 
-	COLUMNS=200 git format-patch -1 --stdout --cover-letter >output &&
-	grep " | " output >actual &&
-	test_cmp expect72 actual
-
-ok 23 - format-patch --cover-letter ignores COLUMNS (big change)
-
-expecting success: 
-		COLUMNS=200 git $cmd $args >output &&
-		grep " | " output >actual &&
-		test_cmp "$expect" actual
-	
-ok 24 - format-patch ignores COLUMNS (big change)
-
-expecting success: 
-		COLUMNS=200 git $cmd $args --graph >output &&
-		grep " | " output >actual &&
-		test_cmp "$expect-graph" actual
-	
-ok 25 - format-patch --graph ignores COLUMNS (big change)
-
-expecting success: 
-		COLUMNS=200 git $cmd $args >output &&
-		grep " | " output >actual &&
-		test_cmp "$expect" actual
-	
-ok 26 - diff respects COLUMNS (big change)
-
-expecting success: 
-		COLUMNS=200 git $cmd $args >output &&
-		grep " | " output >actual &&
-		test_cmp "$expect" actual
-	
-ok 27 - show respects COLUMNS (big change)
-
-expecting success: 
-		COLUMNS=200 git $cmd $args >output &&
-		grep " | " output >actual &&
-		test_cmp "$expect" actual
-	
-ok 28 - log respects COLUMNS (big change)
-
-expecting success: 
-		COLUMNS=200 git $cmd $args --graph >output &&
-		grep " | " output >actual &&
-		test_cmp "$expect-graph" actual
-	
-ok 29 - log --graph respects COLUMNS (big change)
-
-expecting success: 
-		COLUMNS=40 git $cmd $args >output &&
-		grep " | " output >actual &&
-		test_cmp "$expect" actual
-	
-ok 30 - format-patch ignores not enough COLUMNS (big change)
-
-expecting success: 
-		COLUMNS=40 git $cmd $args --graph >output &&
-		grep " | " output >actual &&
-		test_cmp "$expect-graph" actual
-	
-ok 31 - format-patch --graph ignores not enough COLUMNS (big change)
-
-expecting success: 
-		COLUMNS=40 git $cmd $args >output &&
-		grep " | " output >actual &&
-		test_cmp "$expect" actual
-	
-ok 32 - diff respects not enough COLUMNS (big change)
-
-expecting success: 
-		COLUMNS=40 git $cmd $args >output &&
-		grep " | " output >actual &&
-		test_cmp "$expect" actual
-	
-ok 33 - show respects not enough COLUMNS (big change)
-
-expecting success: 
-		COLUMNS=40 git $cmd $args >output &&
-		grep " | " output >actual &&
-		test_cmp "$expect" actual
-	
-ok 34 - log respects not enough COLUMNS (big change)
-
-expecting success: 
-		COLUMNS=40 git $cmd $args --graph >output &&
-		grep " | " output >actual &&
-		test_cmp "$expect-graph" actual
-	
-ok 35 - log --graph respects not enough COLUMNS (big change)
-
-expecting success: 
-		git -c diff.statGraphWidth=26 $cmd $args >output &&
-		grep " | " output >actual &&
-		test_cmp "$expect" actual
-	
-ok 36 - format-patch ignores statGraphWidth config
-
-expecting success: 
-		git -c diff.statGraphWidth=26 $cmd $args --graph >output &&
-		grep " | " output >actual &&
-		test_cmp "$expect-graph" actual
-	
-ok 37 - format-patch --graph ignores statGraphWidth config
-
-expecting success: 
-		git -c diff.statGraphWidth=26 $cmd $args >output &&
-		grep " | " output >actual &&
-		test_cmp "$expect" actual
-	
-ok 38 - diff respects statGraphWidth config
-
-expecting success: 
-		git -c diff.statGraphWidth=26 $cmd $args >output &&
-		grep " | " output >actual &&
-		test_cmp "$expect" actual
-	
-ok 39 - show respects statGraphWidth config
-
-expecting success: 
-		git -c diff.statGraphWidth=26 $cmd $args >output &&
-		grep " | " output >actual &&
-		test_cmp "$expect" actual
-	
-ok 40 - log respects statGraphWidth config
-
-expecting success: 
-		git -c diff.statGraphWidth=26 $cmd $args --graph >output &&
-		grep " | " output >actual &&
-		test_cmp "$expect-graph" actual
-	
-ok 41 - log --graph respects statGraphWidth config
-
-expecting success: 
-		git $cmd $args --stat=40 >output &&
-		grep " | " output >actual &&
-		test_cmp expect actual
-	
-ok 42 - format-patch --stat=width with big change
-
-expecting success: 
-		git $cmd $args --stat-width=40 >output &&
-		grep " | " output >actual &&
-		test_cmp expect actual
-	
-ok 43 - format-patch --stat-width=width with big change
-
-expecting success: 
-		git $cmd $args --stat-graph-width=26 >output &&
-		grep " | " output >actual &&
-		test_cmp expect actual
-	
-ok 44 - format-patch --stat-graph-width with big change
-
-expecting success: 
-		git $cmd $args --stat-width=40 --graph >output &&
-		grep " | " output >actual &&
-		test_cmp expect-graph actual
-	
-ok 45 - format-patch --stat-width=width --graph with big change
-
-expecting success: 
-		git $cmd $args --stat-graph-width=26 --graph >output &&
-		grep " | " output >actual &&
-		test_cmp expect-graph actual
-	
-ok 46 - format-patch --stat-graph-width --graph with big change
-
-expecting success: 
-		git $cmd $args --stat=40 >output &&
-		grep " | " output >actual &&
-		test_cmp expect actual
-	
-ok 47 - diff --stat=width with big change
-
-expecting success: 
-		git $cmd $args --stat-width=40 >output &&
-		grep " | " output >actual &&
-		test_cmp expect actual
-	
-ok 48 - diff --stat-width=width with big change
-
-expecting success: 
-		git $cmd $args --stat-graph-width=26 >output &&
-		grep " | " output >actual &&
-		test_cmp expect actual
-	
-ok 49 - diff --stat-graph-width with big change
-
-expecting success: 
-		git $cmd $args --stat=40 >output &&
-		grep " | " output >actual &&
-		test_cmp expect actual
-	
-ok 50 - show --stat=width with big change
-
-expecting success: 
-		git $cmd $args --stat-width=40 >output &&
-		grep " | " output >actual &&
-		test_cmp expect actual
-	
-ok 51 - show --stat-width=width with big change
-
-expecting success: 
-		git $cmd $args --stat-graph-width=26 >output &&
-		grep " | " output >actual &&
-		test_cmp expect actual
-	
-ok 52 - show --stat-graph-width with big change
-
-expecting success: 
-		git $cmd $args --stat=40 >output &&
-		grep " | " output >actual &&
-		test_cmp expect actual
-	
-ok 53 - log --stat=width with big change
+ 3 files changed, 2 insertions(+), 2 deletions(-)
+ rename file2 => file3 (57%)
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4103-apply-binary/other-repo/.git/
+From ..
+ * branch            master     -> FETCH_HEAD
+HEAD is now at e966055 Initial Version
+ok 1 - setup
 
-expecting success: 
-		git $cmd $args --stat-width=40 >output &&
-		grep " | " output >actual &&
-		test_cmp expect actual
-	
-ok 54 - log --stat-width=width with big change
+expecting success: git checkout master &&
+	 git apply --stat --summary B.diff
+Switched to branch 'master'
+ file1 |    4 ++--
+ file2 |    5 -----
+ file3 |  Bin
+ file4 |  Bin
+ 4 files changed, 2 insertions(+), 7 deletions(-)
+ delete mode 100644 file2
+ create mode 100644 file3
+ok 2 - stat binary diff -- should not fail.
 
 expecting success: 
-		git $cmd $args --stat-graph-width=26 >output &&
-		grep " | " output >actual &&
-		test_cmp expect actual
-	
-ok 55 - log --stat-graph-width with big change
+	 git checkout master &&
+	 git apply --stat -p0 B0.diff
 
-expecting success: 
-		git $cmd $args --stat-width=40 --graph >output &&
-		grep " | " output >actual &&
-		test_cmp expect-graph actual
-	
-ok 56 - log --stat-width=width --graph with big change
+Already on 'master'
+ file3 |  Bin
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ok 3 - stat binary -p0 diff -- should not fail.
 
-expecting success: 
-		git $cmd $args --stat-graph-width=26 --graph >output &&
-		grep " | " output >actual &&
-		test_cmp expect-graph actual
-	
-ok 57 - log --stat-graph-width --graph with big change
+expecting success: git checkout master &&
+	 git apply --stat --summary C.diff
+Already on 'master'
+ file1 |    4 ++--
+ file3 |  Bin
+ file4 |  Bin
+ 3 files changed, 2 insertions(+), 2 deletions(-)
+ rename file2 => file3 (57%)
+ok 4 - stat binary diff (copy) -- should not fail.
 
-expecting success: 
-	cp abcd aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa &&
-	git add aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa &&
-	git commit -m message
+expecting success: git checkout master &&
+	 test_must_fail git apply --check B.diff
+Already on 'master'
+error: cannot apply binary patch to 'file3' without full index line
+error: file3: patch does not apply
+error: cannot apply binary patch to 'file4' without full index line
+error: file4: patch does not apply
+ok 5 - check binary diff -- should fail.
 
-[master 164c9bc] message
- Author: A U Thor <author@example.com>
- 1 file changed, 1000 insertions(+)
- create mode 100644 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-ok 58 - preparation for long filename tests
+expecting success: git checkout master &&
+	 test_must_fail git apply --check C.diff
+Already on 'master'
+error: cannot apply binary patch to 'file2' without full index line
+error: file2: patch does not apply
+error: cannot apply binary patch to 'file4' without full index line
+error: file4: patch does not apply
+ok 6 - check binary diff (copy) -- should fail.
 
 expecting success: 
-		git $cmd $args --stat-width=60 >output &&
-		grep " | " output >actual &&
-		test_cmp expect actual
-	
-ok 59 - format-patch --stat=width with big change is more balanced
+	git checkout master &&
+	test_must_fail git apply --check --allow-binary-replacement B.diff
 
-expecting success: 
-		git $cmd $args --stat-width=60 --graph >output &&
-		grep " | " output >actual &&
-		test_cmp expect-graph actual
-	
-ok 60 - format-patch --stat=width --graph with big change is balanced
+Already on 'master'
+error: cannot apply binary patch to 'file3' without full index line
+error: file3: patch does not apply
+error: cannot apply binary patch to 'file4' without full index line
+error: file4: patch does not apply
+ok 7 - check incomplete binary diff with replacement -- should fail.
 
 expecting success: 
-		git $cmd $args --stat-width=60 >output &&
-		grep " | " output >actual &&
-		test_cmp expect actual
-	
-ok 61 - diff --stat=width with big change is more balanced
+	 git checkout master &&
+	 test_must_fail git apply --check --allow-binary-replacement C.diff
 
-expecting success: 
-		git $cmd $args --stat-width=60 >output &&
-		grep " | " output >actual &&
-		test_cmp expect actual
-	
-ok 62 - show --stat=width with big change is more balanced
+Already on 'master'
+error: cannot apply binary patch to 'file2' without full index line
+error: file2: patch does not apply
+error: cannot apply binary patch to 'file4' without full index line
+error: file4: patch does not apply
+ok 8 - check incomplete binary diff with replacement (copy) -- should fail.
 
-expecting success: 
-		git $cmd $args --stat-width=60 >output &&
-		grep " | " output >actual &&
-		test_cmp expect actual
-	
-ok 63 - log --stat=width with big change is more balanced
+expecting success: git checkout master &&
+	 git apply --check --allow-binary-replacement BF.diff
+Already on 'master'
+ok 9 - check binary diff with replacement.
 
-expecting success: 
-		git $cmd $args --stat-width=60 --graph >output &&
-		grep " | " output >actual &&
-		test_cmp expect-graph actual
-	
-ok 64 - log --stat=width --graph with big change is balanced
+expecting success: git checkout master &&
+	 git apply --check --allow-binary-replacement CF.diff
+Already on 'master'
+ok 10 - check binary diff with replacement (copy).
 
-expecting success: 
-		COLUMNS=200 git $cmd $args >output &&
-		grep " | " output >actual &&
-		test_cmp "$expect" actual
-	
-ok 65 - format-patch ignores COLUMNS (long filename)
+expecting success: do_reset &&
+	 test_must_fail git apply B.diff
+HEAD is now at e966055 Initial Version
+Already on 'master'
+error: cannot apply binary patch to 'file3' without full index line
+error: file3: patch does not apply
+error: cannot apply binary patch to 'file4' without full index line
+error: file4: patch does not apply
+ok 11 - apply binary diff -- should fail.
 
-expecting success: 
-		COLUMNS=200 git $cmd $args --graph >output &&
-		grep " | " output >actual &&
-		test_cmp "$expect-graph" actual
-	
-ok 66 - format-patch --graph ignores COLUMNS (long filename)
+expecting success: do_reset &&
+	 test_must_fail git apply --index B.diff
+HEAD is now at e966055 Initial Version
+Already on 'master'
+error: cannot apply binary patch to 'file3' without full index line
+error: file3: patch does not apply
+error: cannot apply binary patch to 'file4' without full index line
+error: file4: patch does not apply
+ok 12 - apply binary diff -- should fail.
 
-expecting success: 
-		COLUMNS=200 git $cmd $args >output &&
-		grep " | " output >actual &&
-		test_cmp "$expect" actual
-	
-ok 67 - diff respects COLUMNS (long filename)
+expecting success: do_reset &&
+	 test_must_fail git apply C.diff
+HEAD is now at e966055 Initial Version
+Already on 'master'
+error: cannot apply binary patch to 'file2' without full index line
+error: file2: patch does not apply
+error: cannot apply binary patch to 'file4' without full index line
+error: file4: patch does not apply
+ok 13 - apply binary diff (copy) -- should fail.
 
-expecting success: 
-		COLUMNS=200 git $cmd $args >output &&
-		grep " | " output >actual &&
-		test_cmp "$expect" actual
-	
-ok 68 - show respects COLUMNS (long filename)
+expecting success: do_reset &&
+	 test_must_fail git apply --index C.diff
+HEAD is now at e966055 Initial Version
+Already on 'master'
+error: cannot apply binary patch to 'file2' without full index line
+error: file2: patch does not apply
+error: cannot apply binary patch to 'file4' without full index line
+error: file4: patch does not apply
+ok 14 - apply binary diff (copy) -- should fail.
 
 expecting success: 
-		COLUMNS=200 git $cmd $args >output &&
-		grep " | " output >actual &&
-		test_cmp "$expect" actual
-	
-ok 69 - log respects COLUMNS (long filename)
+	do_reset &&
+	git apply B-index.diff
 
-expecting success: 
-		COLUMNS=200 git $cmd $args --graph >output &&
-		grep " | " output >actual &&
-		test_cmp "$expect-graph" actual
-	
-ok 70 - log --graph respects COLUMNS (long filename)
+HEAD is now at e966055 Initial Version
+Already on 'master'
+ok 15 - apply binary diff with full-index
 
 expecting success: 
-		COLUMNS=1 git $cmd $args >output &&
-		grep " | " output >actual &&
-		test_cmp "$expect" actual
-	
-ok 71 - format-patch ignores prefix greater than COLUMNS (big change)
+	do_reset &&
+	git apply C-index.diff
 
-expecting success: 
-		COLUMNS=1 git $cmd $args --graph >output &&
-		grep " | " output >actual &&
-		test_cmp "$expect-graph" actual
-	
-ok 72 - format-patch --graph ignores prefix greater than COLUMNS (big change)
+HEAD is now at e966055 Initial Version
+Already on 'master'
+ok 16 - apply binary diff with full-index (copy)
 
 expecting success: 
-		COLUMNS=1 git $cmd $args >output &&
-		grep " | " output >actual &&
-		test_cmp "$expect" actual
-	
-ok 73 - diff respects prefix greater than COLUMNS (big change)
+	(cd other-repo &&
+	 do_reset &&
+	 test_must_fail git apply ../B-index.diff)
 
-expecting success: 
-		COLUMNS=1 git $cmd $args >output &&
-		grep " | " output >actual &&
-		test_cmp "$expect" actual
-	
-ok 74 - show respects prefix greater than COLUMNS (big change)
+HEAD is now at e966055 Initial Version
+Already on 'master'
+error: missing binary patch data for 'file3'
+error: binary patch does not apply to 'file3'
+error: file3: patch does not apply
+error: missing binary patch data for 'file4'
+error: binary patch does not apply to 'file4'
+error: file4: patch does not apply
+ok 17 - apply full-index binary diff in new repo
 
-expecting success: 
-		COLUMNS=1 git $cmd $args >output &&
-		grep " | " output >actual &&
-		test_cmp "$expect" actual
-	
-ok 75 - log respects prefix greater than COLUMNS (big change)
+expecting success: do_reset &&
+	 git apply BF.diff
+HEAD is now at e966055 Initial Version
+Already on 'master'
+ok 18 - apply binary diff without replacement.
 
-expecting success: 
-		COLUMNS=1 git $cmd $args --graph >output &&
-		grep " | " output >actual &&
-		test_cmp "$expect-graph" actual
-	
-ok 76 - log --graph respects prefix greater than COLUMNS (big change)
+expecting success: do_reset &&
+	 git apply CF.diff
+HEAD is now at e966055 Initial Version
+Already on 'master'
+ok 19 - apply binary diff without replacement (copy).
 
-expecting success: 
-	git checkout -b branch HEAD^^ &&
-	COLUMNS=100 git merge --stat --no-ff master^ >output &&
-	grep " | " output >actual &&
-	test_cmp expect actual
+expecting success: do_reset &&
+	 git apply --allow-binary-replacement --index BF.diff &&
+	 test -z "$(git diff --name-status binary)"
+HEAD is now at e966055 Initial Version
+Already on 'master'
+ok 20 - apply binary diff.
 
-Switched to a new branch 'branch'
-ok 77 - merge --stat respects COLUMNS (big change)
+expecting success: do_reset &&
+	 git apply --allow-binary-replacement --index CF.diff &&
+	 test -z "$(git diff --name-status binary)"
+HEAD is now at e966055 Initial Version
+Already on 'master'
+ok 21 - apply binary diff (copy).
 
 expecting success: 
-	COLUMNS=100 git merge --stat --no-ff master >output &&
-	grep " | " output >actual &&
-	test_cmp expect actual
+	do_reset &&
+	git apply -p0 --index B0.diff &&
+	test -z "$(git diff --name-status binary -- file3)"
 
-ok 78 - merge --stat respects COLUMNS (long filename)
+HEAD is now at e966055 Initial Version
+Already on 'master'
+ok 22 - apply binary -p0 diff
 
-# passed all 78 test(s)
-1..78
+# passed all 22 test(s)
+1..22
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
 *** t4108-apply-threeway.sh ***
@@ -121165,599 +121753,6 @@
 1..7
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t4115-apply-symlink.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4115-apply-symlink/.git/
-expecting success: 
-
-	test_ln_s_add path1/path2/path3/path4/path5 link1 &&
-	git commit -m initial &&
-
-	git branch side &&
-
-	rm -f link? &&
-
-	test_ln_s_add htap6 link1 &&
-	git commit -m second &&
-
-	git diff-tree -p HEAD^ HEAD >patch  &&
-	git apply --stat --summary patch
-
-
-checking prerequisite: SYMLINKS
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
-	# test whether the filesystem supports symbolic links
-	ln -s x y && test -h y
-
-)
-prerequisite SYMLINKS ok
-[master (root-commit) 3bdccea] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 120000 link1
-[master a53a8f6] second
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
- link1 |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 1 - setup
-
-expecting success: 
-
-	git checkout side &&
-	git apply patch &&
-	git diff-files -p >patched &&
-	test_cmp patch patched
-
-
-Switched to branch 'side'
-ok 2 - apply symlink patch
-
-expecting success: 
-
-	git checkout -f side &&
-	git apply --index patch &&
-	git diff-index --cached -p HEAD >patched &&
-	test_cmp patch patched
-
-
-Already on 'side'
-ok 3 - apply --index symlink patch
-
-# passed all 3 test(s)
-1..3
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t4104-apply-boundary.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4104-apply-boundary/.git/
-expecting success: 
-	for i in b c d e f g h i j k l m n o p q r s t u v w x y
-	do
-		echo $i
-	done >victim &&
-	cat victim >original &&
-	git update-index --add victim &&
-
-	# add to the head
-	for i in 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
-	do
-		echo $i
-	done >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
-	for i in b a c d e f g h i j k l m n o p q r s t u v w x y
-	do
-		echo $i
-	done >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
-	for i in a c d e f g h i j k l m n o p q r s t u v w x y
-	do
-		echo $i
-	done >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
-	for i in c d e f g h i j k l m n o p q r s t u v w x y
-	do
-		echo $i
-	done >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
-	for i in 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
-	do
-		echo $i
-	done >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
-	for i in b c d e f g h i j k l m n o p q r s t u v w x z
-	do
-		echo $i
-	done >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
-	for i in b c d e f g h i j k l m n o p q r s t u v w x
-	do
-		echo $i
-	done >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: 
-			cat original >victim &&
-			git update-index victim &&
-			git apply --index add-a-patch.with &&
-			test_cmp add-a-expect victim
-		
-ok 2 - apply add-a-patch with context
-
-expecting success: 
-			cat original >victim &&
-			git update-index victim &&
-			git apply --index add-z-patch.with &&
-			test_cmp add-z-expect victim
-		
-ok 3 - apply add-z-patch with context
-
-expecting success: 
-			cat original >victim &&
-			git update-index victim &&
-			git apply --index insert-a-patch.with &&
-			test_cmp insert-a-expect victim
-		
-ok 4 - apply insert-a-patch with context
-
-expecting success: 
-			cat original >victim &&
-			git update-index victim &&
-			git apply --index mod-a-patch.with &&
-			test_cmp mod-a-expect victim
-		
-ok 5 - apply mod-a-patch with context
-
-expecting success: 
-			cat original >victim &&
-			git update-index victim &&
-			git apply --index mod-z-patch.with &&
-			test_cmp mod-z-expect victim
-		
-ok 6 - apply mod-z-patch with context
-
-expecting success: 
-			cat original >victim &&
-			git update-index victim &&
-			git apply --index del-a-patch.with &&
-			test_cmp del-a-expect victim
-		
-ok 7 - apply del-a-patch with context
-
-expecting success: 
-			cat original >victim &&
-			git update-index victim &&
-			git apply --index del-z-patch.with &&
-			test_cmp del-z-expect victim
-		
-ok 8 - apply del-z-patch with context
-
-expecting success: 
-			cat original >victim &&
-			git update-index victim &&
-			git apply --index --unidiff-zero add-a-patch.without &&
-			test_cmp add-a-expect victim
-		
-ok 9 - apply add-a-patch without context
-
-expecting success: 
-			cat original >victim &&
-			git update-index victim &&
-			git apply --index --unidiff-zero add-z-patch.without &&
-			test_cmp add-z-expect victim
-		
-ok 10 - apply add-z-patch without context
-
-expecting success: 
-			cat original >victim &&
-			git update-index victim &&
-			git apply --index --unidiff-zero insert-a-patch.without &&
-			test_cmp insert-a-expect victim
-		
-ok 11 - apply insert-a-patch without context
-
-expecting success: 
-			cat original >victim &&
-			git update-index victim &&
-			git apply --index --unidiff-zero mod-a-patch.without &&
-			test_cmp mod-a-expect victim
-		
-ok 12 - apply mod-a-patch without context
-
-expecting success: 
-			cat original >victim &&
-			git update-index victim &&
-			git apply --index --unidiff-zero mod-z-patch.without &&
-			test_cmp mod-z-expect victim
-		
-ok 13 - apply mod-z-patch without context
-
-expecting success: 
-			cat original >victim &&
-			git update-index victim &&
-			git apply --index --unidiff-zero del-a-patch.without &&
-			test_cmp del-a-expect victim
-		
-ok 14 - apply del-a-patch without context
-
-expecting success: 
-			cat original >victim &&
-			git update-index victim &&
-			git apply --index --unidiff-zero del-z-patch.without &&
-			test_cmp del-z-expect victim
-		
-ok 15 - apply del-z-patch without context
-
-expecting success: 
-		cat original >victim &&
-		git update-index victim &&
-		git apply --unidiff-zero --index add-a-ng.without &&
-		test_cmp add-a-expect victim
-	
-ok 16 - apply non-git add-a-patch without context
-
-expecting success: 
-		cat original >victim &&
-		git update-index victim &&
-		git apply --unidiff-zero --index add-z-ng.without &&
-		test_cmp add-z-expect victim
-	
-ok 17 - apply non-git add-z-patch without context
-
-expecting success: 
-		cat original >victim &&
-		git update-index victim &&
-		git apply --unidiff-zero --index insert-a-ng.without &&
-		test_cmp insert-a-expect victim
-	
-ok 18 - apply non-git insert-a-patch without context
-
-expecting success: 
-		cat original >victim &&
-		git update-index victim &&
-		git apply --unidiff-zero --index mod-a-ng.without &&
-		test_cmp mod-a-expect victim
-	
-ok 19 - apply non-git mod-a-patch without context
-
-expecting success: 
-		cat original >victim &&
-		git update-index victim &&
-		git apply --unidiff-zero --index mod-z-ng.without &&
-		test_cmp mod-z-expect victim
-	
-ok 20 - apply non-git mod-z-patch without context
-
-expecting success: 
-		cat original >victim &&
-		git update-index victim &&
-		git apply --unidiff-zero --index del-a-ng.without &&
-		test_cmp del-a-expect victim
-	
-ok 21 - apply non-git del-a-patch without context
-
-expecting success: 
-		cat original >victim &&
-		git update-index victim &&
-		git apply --unidiff-zero --index del-z-ng.without &&
-		test_cmp del-z-expect victim
-	
-ok 22 - apply non-git del-z-patch without context
-
-expecting success: 
-
-	>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: 
-	{ echo a; echo b; echo c; echo 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/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t4103-apply-binary.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4103-apply-binary/.git/
-expecting success: 
-	cat >file1 <<-\EOF &&
-	A quick brown fox jumps over the lazy dog.
-	A tiny little penguin runs around in circles.
-	There is a flag with Linux written on it.
-	A slow black-and-white panda just sits there,
-	munching on his bamboo.
-	EOF
-	cat file1 >file2 &&
-	cat file1 >file4 &&
-
-	git update-index --add --remove file1 file2 file4 &&
-	git commit -m "Initial Version" 2>/dev/null &&
-
-	git checkout -b binary &&
-	perl -pe "y/x/\000/" <file1 >file3 &&
-	cat file3 >file4 &&
-	git add file2 &&
-	perl -pe "y/\000/v/" <file3 >file1 &&
-	rm -f file2 &&
-	git update-index --add --remove file1 file2 file3 file4 &&
-	git commit -m "Second Version" &&
-
-	git diff-tree -p master binary >B.diff &&
-	git diff-tree -p -C master binary >C.diff &&
-
-	git diff-tree -p --binary master binary >BF.diff &&
-	git diff-tree -p --binary -C master binary >CF.diff &&
-
-	git diff-tree -p --full-index master binary >B-index.diff &&
-	git diff-tree -p -C --full-index master binary >C-index.diff &&
-
-	git diff-tree -p --binary --no-prefix master binary -- file3 >B0.diff &&
-
-	git init other-repo &&
-	(
-		cd other-repo &&
-		git fetch .. master &&
-		git reset --hard FETCH_HEAD
-	)
-
-[master (root-commit) 99dea2e] Initial Version
- Author: A U Thor <author@example.com>
- 3 files changed, 15 insertions(+)
- create mode 100644 file1
- create mode 100644 file2
- create mode 100644 file4
-Switched to a new branch 'binary'
-[binary a0e8b4b] Second Version
- Author: A U Thor <author@example.com>
- 3 files changed, 2 insertions(+), 2 deletions(-)
- rename file2 => file3 (57%)
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4103-apply-binary/other-repo/.git/
-From ..
- * branch            master     -> FETCH_HEAD
-HEAD is now at 99dea2e Initial Version
-ok 1 - setup
-
-expecting success: git checkout master &&
-	 git apply --stat --summary B.diff
-Switched to branch 'master'
- file1 |    4 ++--
- file2 |    5 -----
- file3 |  Bin
- file4 |  Bin
- 4 files changed, 2 insertions(+), 7 deletions(-)
- delete mode 100644 file2
- create mode 100644 file3
-ok 2 - stat binary diff -- should not fail.
-
-expecting success: 
-	 git checkout master &&
-	 git apply --stat -p0 B0.diff
-
-Already on 'master'
- file3 |  Bin
- 1 file changed, 0 insertions(+), 0 deletions(-)
-ok 3 - stat binary -p0 diff -- should not fail.
-
-expecting success: git checkout master &&
-	 git apply --stat --summary C.diff
-Already on 'master'
- file1 |    4 ++--
- file3 |  Bin
- file4 |  Bin
- 3 files changed, 2 insertions(+), 2 deletions(-)
- rename file2 => file3 (57%)
-ok 4 - stat binary diff (copy) -- should not fail.
-
-expecting success: git checkout master &&
-	 test_must_fail git apply --check B.diff
-Already on 'master'
-error: cannot apply binary patch to 'file3' without full index line
-error: file3: patch does not apply
-error: cannot apply binary patch to 'file4' without full index line
-error: file4: patch does not apply
-ok 5 - check binary diff -- should fail.
-
-expecting success: git checkout master &&
-	 test_must_fail git apply --check C.diff
-Already on 'master'
-error: cannot apply binary patch to 'file2' without full index line
-error: file2: patch does not apply
-error: cannot apply binary patch to 'file4' without full index line
-error: file4: patch does not apply
-ok 6 - check binary diff (copy) -- should fail.
-
-expecting success: 
-	git checkout master &&
-	test_must_fail git apply --check --allow-binary-replacement B.diff
-
-Already on 'master'
-error: cannot apply binary patch to 'file3' without full index line
-error: file3: patch does not apply
-error: cannot apply binary patch to 'file4' without full index line
-error: file4: patch does not apply
-ok 7 - check incomplete binary diff with replacement -- should fail.
-
-expecting success: 
-	 git checkout master &&
-	 test_must_fail git apply --check --allow-binary-replacement C.diff
-
-Already on 'master'
-error: cannot apply binary patch to 'file2' without full index line
-error: file2: patch does not apply
-error: cannot apply binary patch to 'file4' without full index line
-error: file4: patch does not apply
-ok 8 - check incomplete binary diff with replacement (copy) -- should fail.
-
-expecting success: git checkout master &&
-	 git apply --check --allow-binary-replacement BF.diff
-Already on 'master'
-ok 9 - check binary diff with replacement.
-
-expecting success: git checkout master &&
-	 git apply --check --allow-binary-replacement CF.diff
-Already on 'master'
-ok 10 - check binary diff with replacement (copy).
-
-expecting success: do_reset &&
-	 test_must_fail git apply B.diff
-HEAD is now at 99dea2e Initial Version
-Already on 'master'
-error: cannot apply binary patch to 'file3' without full index line
-error: file3: patch does not apply
-error: cannot apply binary patch to 'file4' without full index line
-error: file4: patch does not apply
-ok 11 - apply binary diff -- should fail.
-
-expecting success: do_reset &&
-	 test_must_fail git apply --index B.diff
-HEAD is now at 99dea2e Initial Version
-Already on 'master'
-error: cannot apply binary patch to 'file3' without full index line
-error: file3: patch does not apply
-error: cannot apply binary patch to 'file4' without full index line
-error: file4: patch does not apply
-ok 12 - apply binary diff -- should fail.
-
-expecting success: do_reset &&
-	 test_must_fail git apply C.diff
-HEAD is now at 99dea2e Initial Version
-Already on 'master'
-error: cannot apply binary patch to 'file2' without full index line
-error: file2: patch does not apply
-error: cannot apply binary patch to 'file4' without full index line
-error: file4: patch does not apply
-ok 13 - apply binary diff (copy) -- should fail.
-
-expecting success: do_reset &&
-	 test_must_fail git apply --index C.diff
-HEAD is now at 99dea2e Initial Version
-Already on 'master'
-error: cannot apply binary patch to 'file2' without full index line
-error: file2: patch does not apply
-error: cannot apply binary patch to 'file4' without full index line
-error: file4: patch does not apply
-ok 14 - apply binary diff (copy) -- should fail.
-
-expecting success: 
-	do_reset &&
-	git apply B-index.diff
-
-HEAD is now at 99dea2e Initial Version
-Already on 'master'
-ok 15 - apply binary diff with full-index
-
-expecting success: 
-	do_reset &&
-	git apply C-index.diff
-
-HEAD is now at 99dea2e Initial Version
-Already on 'master'
-ok 16 - apply binary diff with full-index (copy)
-
-expecting success: 
-	(cd other-repo &&
-	 do_reset &&
-	 test_must_fail git apply ../B-index.diff)
-
-HEAD is now at 99dea2e Initial Version
-Already on 'master'
-error: missing binary patch data for 'file3'
-error: binary patch does not apply to 'file3'
-error: file3: patch does not apply
-error: missing binary patch data for 'file4'
-error: binary patch does not apply to 'file4'
-error: file4: patch does not apply
-ok 17 - apply full-index binary diff in new repo
-
-expecting success: do_reset &&
-	 git apply BF.diff
-HEAD is now at 99dea2e Initial Version
-Already on 'master'
-ok 18 - apply binary diff without replacement.
-
-expecting success: do_reset &&
-	 git apply CF.diff
-HEAD is now at 99dea2e Initial Version
-Already on 'master'
-ok 19 - apply binary diff without replacement (copy).
-
-expecting success: do_reset &&
-	 git apply --allow-binary-replacement --index BF.diff &&
-	 test -z "$(git diff --name-status binary)"
-HEAD is now at 99dea2e Initial Version
-Already on 'master'
-ok 20 - apply binary diff.
-
-expecting success: do_reset &&
-	 git apply --allow-binary-replacement --index CF.diff &&
-	 test -z "$(git diff --name-status binary)"
-HEAD is now at 99dea2e Initial Version
-Already on 'master'
-ok 21 - apply binary diff (copy).
-
-expecting success: 
-	do_reset &&
-	git apply -p0 --index B0.diff &&
-	test -z "$(git diff --name-status binary -- file3)"
-
-HEAD is now at 99dea2e Initial Version
-Already on 'master'
-ok 22 - apply binary -p0 diff
-
-# passed all 22 test(s)
-1..22
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
 *** t4118-apply-empty-context.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4118-apply-empty-context/.git/
 expecting success: 
@@ -121810,30 +121805,6 @@
 1..3
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t4121-apply-diffs.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4121-apply-diffs/.git/
-expecting success: 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 master
-Switched to a new branch 'test'
-Switched to branch 'master'
-ok 1 - setup
-
-expecting success: ( 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/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
 *** t4116-apply-reverse.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4116-apply-reverse/.git/
 expecting success: 
@@ -121854,12 +121825,12 @@
 	git diff --binary initial second >patch
 
 
-[master (root-commit) e68a728] initial
+[master (root-commit) d71c6bc] initial
  Author: A U Thor <author@example.com>
  2 files changed, 14 insertions(+)
  create mode 100644 file1
  create mode 100644 file2
-[master f7411ec] second
+[master a5e50e2] second
  Author: A U Thor <author@example.com>
  2 files changed, 6 insertions(+), 6 deletions(-)
 ok 1 - setup
@@ -121872,7 +121843,7 @@
 	T1=$(git write-tree) &&
 	test "$T0" = "$T1"
 
-HEAD is now at e68a728 initial
+HEAD is now at d71c6bc initial
 ok 2 - apply in forward
 
 expecting success: 
@@ -121883,7 +121854,7 @@
 	test_must_be_empty diff
 
 
-HEAD is now at f7411ec second
+HEAD is now at a5e50e2 second
 ok 3 - apply in reverse
 
 expecting success: 
@@ -121938,162 +121909,6 @@
 1..7
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t4114-apply-typechange.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4114-apply-typechange/.git/
-expecting success: 
-	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) 689069b] 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" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
-	# test whether the filesystem supports symbolic links
-	ln -s x y && test -h y
-
-)
-prerequisite SYMLINKS ok
-[master 598898e] foo symlinked to bar
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
- rewrite foo (100%)
- mode change 100644 => 120000
-rm 'foo'
-[master 76c3534] foo back to file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
- rewrite foo (100%)
- mode change 120000 => 100644
-[master c77199b] foo becomes binary
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
-[master 0e91b49] 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 5ac072d] 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: 
-	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: 
-	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: 
-	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: 
-	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: 
-	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: 
-	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: 
-	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 8 - binary file becomes symlink
-
-expecting success: 
-	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 9 - symlink becomes binary file
-
-expecting success: 
-	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 10 - symlink becomes directory
-
-expecting success: 
-	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 11 - directory becomes symlink
-
-# passed all 11 test(s)
-1..11
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
 *** t4117-apply-reject.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4117-apply-reject/.git/
 expecting success: 
@@ -122132,7 +121947,7 @@
 
 	cat file1 >saved.file1
 
-[master (root-commit) 64e4e4f] initial
+[master (root-commit) 8c7d36f] initial
  Author: A U Thor <author@example.com>
  1 file changed, 21 insertions(+)
  create mode 100644 file1
@@ -122346,348 +122161,344 @@
 1..8
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t4123-apply-shrink.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4123-apply-shrink/.git/
-expecting success: 
-
-	git add F &&
-	mv F G &&
-	sed -e "s/1/11/" -e "s/999999/9/" -e "s/H/HH/" <G >F &&
-	git diff >patch &&
-	sed -e "/^\$/d" <G >F &&
-	git add F
-
-
+*** t4121-apply-diffs.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4121-apply-diffs/.git/
+expecting success: 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 master
+Switched to a new branch 'test'
+Switched to branch 'master'
 ok 1 - setup
 
-expecting success: 
-
-	if git apply --index patch
-	then
-		echo Oops, should not have succeeded
-		false
-	else
-		status=$?
-		echo "Status was $status"
-		if test -f .git/index.lock
-		then
-			echo Oops, should not have crashed
-			false
-		fi
-	fi
-
-error: patch failed: F:14
-error: F: patch does not apply
-Status was 1
-ok 2 - apply should fail gracefully
+expecting success: ( 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/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t4119-apply-config.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4119-apply-config/.git/
+*** t4104-apply-boundary.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4104-apply-boundary/.git/
 expecting success: 
-	mkdir sub &&
-	echo A >sub/file1 &&
-	cp sub/file1 saved &&
-	git add sub/file1 &&
-	echo "B " >sub/file1 &&
-	git diff >patch.file
+	for i in b c d e f g h i j k l m n o p q r s t u v w x y
+	do
+		echo $i
+	done >victim &&
+	cat victim >original &&
+	git update-index --add victim &&
 
-ok 1 - setup
+	# add to the head
+	for i in 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
+	do
+		echo $i
+	done >victim &&
+	cat victim >add-a-expect &&
+	git diff victim >add-a-patch.with &&
+	git diff --unified=0 >add-a-patch.without &&
 
-expecting success: 
+	# insert at line two
+	for i in b a c d e f g h i j k l m n o p q r s t u v w x y
+	do
+		echo $i
+	done >victim &&
+	cat victim >insert-a-expect &&
+	git diff victim >insert-a-patch.with &&
+	git diff --unified=0 >insert-a-patch.without &&
 
-	rm -f sub/file1 &&
-	cp saved sub/file1 &&
-	git update-index --refresh &&
+	# modify at the head
+	for i in a c d e f g h i j k l m n o p q r s t u v w x y
+	do
+		echo $i
+	done >victim &&
+	cat victim >mod-a-expect &&
+	git diff victim >mod-a-patch.with &&
+	git diff --unified=0 >mod-a-patch.without &&
 
-	git apply --whitespace=strip patch.file &&
-	check_result sub/file1
+	# remove from the head
+	for i in c d e f g h i j k l m n o p q r s t u v w x y
+	do
+		echo $i
+	done >victim &&
+	cat victim >del-a-expect &&
+	git diff victim >del-a-patch.with &&
+	git diff --unified=0 >del-a-patch.without &&
 
-patch.file:7: trailing whitespace.
-B 
-warning: 1 line applied after fixing whitespace errors.
-B
-Happy
-ok 2 - apply --whitespace=strip
+	# add to the tail
+	for i in 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
+	do
+		echo $i
+	done >victim &&
+	cat victim >add-z-expect &&
+	git diff victim >add-z-patch.with &&
+	git diff --unified=0 >add-z-patch.without &&
 
-expecting success: 
+	# modify at the tail
+	for i in b c d e f g h i j k l m n o p q r s t u v w x z
+	do
+		echo $i
+	done >victim &&
+	cat victim >mod-z-expect &&
+	git diff victim >mod-z-patch.with &&
+	git diff --unified=0 >mod-z-patch.without &&
 
-	rm -f sub/file1 &&
-	cp saved sub/file1 &&
-	git update-index --refresh &&
+	# remove from the tail
+	for i in b c d e f g h i j k l m n o p q r s t u v w x
+	do
+		echo $i
+	done >victim &&
+	cat victim >del-z-expect &&
+	git diff victim >del-z-patch.with &&
+	git diff --unified=0 >del-z-patch.without
 
-	git config apply.whitespace strip &&
-	git apply patch.file &&
-	check_result sub/file1
+	# done
 
-patch.file:7: trailing whitespace.
-B 
-warning: 1 line applied after fixing whitespace errors.
-B
-Happy
-ok 3 - apply --whitespace=strip from config
+ok 1 - setup
 
 expecting success: 
-
-	cd "$D" &&
-	git config --unset-all apply.whitespace &&
-	rm -f sub/file1 &&
-	cp saved sub/file1 &&
-	git update-index --refresh &&
-
-	cd sub &&
-	git apply --whitespace=strip ../patch.file &&
-	check_result file1
-
-sub/../patch.file:7: trailing whitespace.
-B 
-warning: 1 line applied after fixing whitespace errors.
-B
-Happy
-ok 4 - apply --whitespace=strip in subdir
+			cat original >victim &&
+			git update-index victim &&
+			git apply --index add-a-patch.with &&
+			test_cmp add-a-expect victim
+		
+ok 2 - apply add-a-patch with context
 
 expecting success: 
+			cat original >victim &&
+			git update-index victim &&
+			git apply --index add-z-patch.with &&
+			test_cmp add-z-expect victim
+		
+ok 3 - apply add-z-patch with context
 
-	cd "$D" &&
-	git config apply.whitespace strip &&
-	rm -f sub/file1 &&
-	cp saved sub/file1 &&
-	git update-index --refresh &&
-
-	cd sub &&
-	git apply ../patch.file &&
-	check_result file1
+expecting success: 
+			cat original >victim &&
+			git update-index victim &&
+			git apply --index insert-a-patch.with &&
+			test_cmp insert-a-expect victim
+		
+ok 4 - apply insert-a-patch with context
 
-sub/../patch.file:7: trailing whitespace.
-B 
-warning: 1 line applied after fixing whitespace errors.
-B
-Happy
-ok 5 - apply --whitespace=strip from config in subdir
+expecting success: 
+			cat original >victim &&
+			git update-index victim &&
+			git apply --index mod-a-patch.with &&
+			test_cmp mod-a-expect victim
+		
+ok 5 - apply mod-a-patch with context
 
 expecting success: 
-
-	cd "$D" &&
-	git config apply.whitespace strip &&
-	rm -f sub/file1 &&
-	cp saved sub/file1 &&
-	git update-index --refresh &&
-
-	cd sub &&
-	git apply ../gpatch.file &&
-	check_result file1
-
-sub/../gpatch.file:5: trailing whitespace.
-B 
-warning: 1 line applied after fixing whitespace errors.
-B
-Happy
-ok 6 - same in subdir but with traditional patch input
+			cat original >victim &&
+			git update-index victim &&
+			git apply --index mod-z-patch.with &&
+			test_cmp mod-z-expect victim
+		
+ok 6 - apply mod-z-patch with context
 
 expecting success: 
-
-	cd "$D" &&
-	git config apply.whitespace strip &&
-	rm -f sub/file1 &&
-	cp saved sub/file1 &&
-	git update-index --refresh &&
-
-	cd sub &&
-	git apply ../gpatch-sub.file &&
-	check_result file1
-
-sub/../gpatch-sub.file:5: trailing whitespace.
-B 
-warning: 1 line applied after fixing whitespace errors.
-B
-Happy
-ok 7 - same but with traditional patch input of depth 1
+			cat original >victim &&
+			git update-index victim &&
+			git apply --index del-a-patch.with &&
+			test_cmp del-a-expect victim
+		
+ok 7 - apply del-a-patch with context
 
 expecting success: 
-
-	cd "$D" &&
-	git config apply.whitespace strip &&
-	rm -f sub/file1 &&
-	cp saved sub/file1 &&
-	git update-index --refresh &&
-
-	cd sub &&
-	git apply ../gpatch-ab-sub.file &&
-	check_result file1
-
-sub/../gpatch-ab-sub.file:5: trailing whitespace.
-B 
-warning: 1 line applied after fixing whitespace errors.
-B
-Happy
-ok 8 - same but with traditional patch input of depth 2
+			cat original >victim &&
+			git update-index victim &&
+			git apply --index del-z-patch.with &&
+			test_cmp del-z-expect victim
+		
+ok 8 - apply del-z-patch with context
 
 expecting success: 
-
-	cd "$D" &&
-	git config apply.whitespace strip &&
-	rm -f sub/file1 &&
-	cp saved sub/file1 &&
-	git update-index --refresh &&
-
-	git apply -p0 gpatch-sub.file &&
-	check_result sub/file1
-
-gpatch-sub.file:5: trailing whitespace.
-B 
-warning: 1 line applied after fixing whitespace errors.
-B
-Happy
-ok 9 - same but with traditional patch input of depth 1
+			cat original >victim &&
+			git update-index victim &&
+			git apply --index --unidiff-zero add-a-patch.without &&
+			test_cmp add-a-expect victim
+		
+ok 9 - apply add-a-patch without context
 
 expecting success: 
+			cat original >victim &&
+			git update-index victim &&
+			git apply --index --unidiff-zero add-z-patch.without &&
+			test_cmp add-z-expect victim
+		
+ok 10 - apply add-z-patch without context
 
-	cd "$D" &&
-	git config apply.whitespace strip &&
-	rm -f sub/file1 &&
-	cp saved sub/file1 &&
-	git update-index --refresh &&
-
-	git apply gpatch-ab-sub.file &&
-	check_result sub/file1
+expecting success: 
+			cat original >victim &&
+			git update-index victim &&
+			git apply --index --unidiff-zero insert-a-patch.without &&
+			test_cmp insert-a-expect victim
+		
+ok 11 - apply insert-a-patch without context
 
-gpatch-ab-sub.file:5: trailing whitespace.
-B 
-warning: 1 line applied after fixing whitespace errors.
-B
-Happy
-ok 10 - same but with traditional patch input of depth 2
+expecting success: 
+			cat original >victim &&
+			git update-index victim &&
+			git apply --index --unidiff-zero mod-a-patch.without &&
+			test_cmp mod-a-expect victim
+		
+ok 12 - apply mod-a-patch without context
 
 expecting success: 
-	cd "$D" &&
-	git config apply.whitespace strip &&
-	cat >.gitattributes <<-EOF &&
-	/* whitespace=blank-at-eol
-	sub/* whitespace=-blank-at-eol
-	EOF
-	rm -f sub/file1 &&
-	cp saved sub/file1 &&
-	git update-index --refresh &&
+			cat original >victim &&
+			git update-index victim &&
+			git apply --index --unidiff-zero mod-z-patch.without &&
+			test_cmp mod-z-expect victim
+		
+ok 13 - apply mod-z-patch without context
 
-	cd sub &&
-	git apply ../gpatch.file &&
-	echo "B " >expect &&
-	test_cmp expect file1
+expecting success: 
+			cat original >victim &&
+			git update-index victim &&
+			git apply --index --unidiff-zero del-a-patch.without &&
+			test_cmp del-a-expect victim
+		
+ok 14 - apply del-a-patch without context
 
-ok 11 - in subdir with traditional patch input
+expecting success: 
+			cat original >victim &&
+			git update-index victim &&
+			git apply --index --unidiff-zero del-z-patch.without &&
+			test_cmp del-z-expect victim
+		
+ok 15 - apply del-z-patch without context
 
-# passed all 11 test(s)
-1..11
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t4120-apply-popt.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4120-apply-popt/.git/
 expecting success: 
-	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
+		cat original >victim &&
+		git update-index victim &&
+		git apply --unidiff-zero --index add-a-ng.without &&
+		test_cmp add-a-expect victim
+	
+ok 16 - apply non-git add-a-patch without context
 
-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: 
+		cat original >victim &&
+		git update-index victim &&
+		git apply --unidiff-zero --index add-z-ng.without &&
+		test_cmp add-z-expect victim
+	
+ok 17 - apply non-git add-z-patch without context
 
 expecting success: 
-	cp file1.saved file1 &&
-	git apply -p2 patch.file
+		cat original >victim &&
+		git update-index victim &&
+		git apply --unidiff-zero --index insert-a-ng.without &&
+		test_cmp insert-a-expect victim
+	
+ok 18 - apply non-git insert-a-patch without context
 
-ok 2 - apply git diff with -p2
+expecting success: 
+		cat original >victim &&
+		git update-index victim &&
+		git apply --unidiff-zero --index mod-a-ng.without &&
+		test_cmp mod-a-expect victim
+	
+ok 19 - apply non-git mod-a-patch without context
 
 expecting success: 
-	cp file1.saved file1 &&
-	test_must_fail git apply --stat -p3 patch.file 2>err &&
-	test_i18ngrep "removing 3 leading" err
+		cat original >victim &&
+		git update-index victim &&
+		git apply --unidiff-zero --index mod-z-ng.without &&
+		test_cmp mod-z-expect victim
+	
+ok 20 - apply non-git mod-z-patch without context
 
-error: git diff header lacks filename information when removing 3 leading pathname components (line 5)
-ok 3 - apply with too large -p
+expecting success: 
+		cat original >victim &&
+		git update-index victim &&
+		git apply --unidiff-zero --index del-a-ng.without &&
+		test_cmp del-a-expect victim
+	
+ok 21 - apply non-git del-a-patch without context
 
 expecting success: 
-	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 &&
+		cat original >victim &&
+		git update-index victim &&
+		git apply --unidiff-zero --index del-z-ng.without &&
+		test_cmp del-z-expect victim
+	
+ok 22 - apply non-git del-z-patch without context
 
-	cp file1.saved file1 &&
-	git apply -p2 patch.quotes &&
-	test_cmp expected file1
+expecting success: 
 
-ok 4 - apply (-p2) traditional diff with funny filenames
+	>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: 
-	cp file1.saved file1 &&
-	test_must_fail git apply --stat -p3 patch.escaped 2>err &&
-	test_i18ngrep "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
+error: patch failed: file:0
+error: file: patch does not apply
+ok 23 - two lines
 
 expecting success: 
-	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
+	{ echo a; echo b; echo c; echo d; } >file &&
+	git add file &&
+	echo e >>file &&
+	git diff >patch &&
+	>file &&
+	test_must_fail git apply patch
 
-ok 6 - apply (-p2) diff, mode change only
+error: patch failed: file:2
+error: file: patch does not apply
+ok 24 - apply patch with 3 context lines matching at end
 
-checking prerequisite: FILEMODE
+# passed all 24 test(s)
+1..24
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t4123-apply-shrink.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4123-apply-shrink/.git/
+expecting success: 
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
-	test "$(git config --bool core.filemode)" = true
+	git add F &&
+	mv F G &&
+	sed -e "s/1/11/" -e "s/999999/9/" -e "s/H/HH/" <G >F &&
+	git diff >patch &&
+	sed -e "/^\$/d" <G >F &&
+	git add F
 
-)
-prerequisite FILEMODE ok
-expecting success: 
-	test -x file1
 
-ok 7 - file mode was changed
+ok 1 - setup
 
 expecting success: 
-	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
+	if git apply --index patch
+	then
+		echo Oops, should not have succeeded
+		false
+	else
+		status=$?
+		echo "Status was $status"
+		if test -f .git/index.lock
+		then
+			echo Oops, should not have crashed
+			false
+		fi
+	fi
 
-ok 8 - apply (-p2) diff, rename
+error: patch failed: F:14
+error: F: patch does not apply
+Status was 1
+ok 2 - apply should fail gracefully
 
-# passed all 8 test(s)
-1..8
+# passed all 2 test(s)
+1..2
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
 *** t4111-apply-subdir.sh ***
@@ -122884,6 +122695,1229 @@
 1..10
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
+*** t4114-apply-typechange.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4114-apply-typechange/.git/
+expecting success: 
+	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) fb9a064] 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" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
+	# test whether the filesystem supports symbolic links
+	ln -s x y && test -h y
+
+)
+prerequisite SYMLINKS ok
+[master b8d3f85] foo symlinked to bar
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ rewrite foo (100%)
+ mode change 100644 => 120000
+rm 'foo'
+[master 21d13af] foo back to file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ rewrite foo (100%)
+ mode change 120000 => 100644
+[master cc18d20] foo becomes binary
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+[master 5316e49] 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 de4c6e6] 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: 
+	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: 
+	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: 
+	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: 
+	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: 
+	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: 
+	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: 
+	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 8 - binary file becomes symlink
+
+expecting success: 
+	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 9 - symlink becomes binary file
+
+expecting success: 
+	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 10 - symlink becomes directory
+
+expecting success: 
+	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 11 - directory becomes symlink
+
+# passed all 11 test(s)
+1..11
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t4120-apply-popt.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4120-apply-popt/.git/
+expecting success: 
+	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: 
+	cp file1.saved file1 &&
+	git apply -p2 patch.file
+
+ok 2 - apply git diff with -p2
+
+expecting success: 
+	cp file1.saved file1 &&
+	test_must_fail git apply --stat -p3 patch.file 2>err &&
+	test_i18ngrep "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: 
+	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: 
+	cp file1.saved file1 &&
+	test_must_fail git apply --stat -p3 patch.escaped 2>err &&
+	test_i18ngrep "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: 
+	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" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
+	test "$(git config --bool core.filemode)" = true
+
+)
+prerequisite FILEMODE ok
+expecting success: 
+	test -x file1
+
+ok 7 - file mode was changed
+
+expecting success: 
+	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/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t4119-apply-config.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4119-apply-config/.git/
+expecting success: 
+	mkdir sub &&
+	echo A >sub/file1 &&
+	cp sub/file1 saved &&
+	git add sub/file1 &&
+	echo "B " >sub/file1 &&
+	git diff >patch.file
+
+ok 1 - setup
+
+expecting success: 
+
+	rm -f sub/file1 &&
+	cp saved sub/file1 &&
+	git update-index --refresh &&
+
+	git apply --whitespace=strip patch.file &&
+	check_result sub/file1
+
+patch.file:7: trailing whitespace.
+B 
+warning: 1 line applied after fixing whitespace errors.
+B
+Happy
+ok 2 - apply --whitespace=strip
+
+expecting success: 
+
+	rm -f sub/file1 &&
+	cp saved sub/file1 &&
+	git update-index --refresh &&
+
+	git config apply.whitespace strip &&
+	git apply patch.file &&
+	check_result sub/file1
+
+patch.file:7: trailing whitespace.
+B 
+warning: 1 line applied after fixing whitespace errors.
+B
+Happy
+ok 3 - apply --whitespace=strip from config
+
+expecting success: 
+
+	cd "$D" &&
+	git config --unset-all apply.whitespace &&
+	rm -f sub/file1 &&
+	cp saved sub/file1 &&
+	git update-index --refresh &&
+
+	cd sub &&
+	git apply --whitespace=strip ../patch.file &&
+	check_result file1
+
+sub/../patch.file:7: trailing whitespace.
+B 
+warning: 1 line applied after fixing whitespace errors.
+B
+Happy
+ok 4 - apply --whitespace=strip in subdir
+
+expecting success: 
+
+	cd "$D" &&
+	git config apply.whitespace strip &&
+	rm -f sub/file1 &&
+	cp saved sub/file1 &&
+	git update-index --refresh &&
+
+	cd sub &&
+	git apply ../patch.file &&
+	check_result file1
+
+sub/../patch.file:7: trailing whitespace.
+B 
+warning: 1 line applied after fixing whitespace errors.
+B
+Happy
+ok 5 - apply --whitespace=strip from config in subdir
+
+expecting success: 
+
+	cd "$D" &&
+	git config apply.whitespace strip &&
+	rm -f sub/file1 &&
+	cp saved sub/file1 &&
+	git update-index --refresh &&
+
+	cd sub &&
+	git apply ../gpatch.file &&
+	check_result file1
+
+sub/../gpatch.file:5: trailing whitespace.
+B 
+warning: 1 line applied after fixing whitespace errors.
+B
+Happy
+ok 6 - same in subdir but with traditional patch input
+
+expecting success: 
+
+	cd "$D" &&
+	git config apply.whitespace strip &&
+	rm -f sub/file1 &&
+	cp saved sub/file1 &&
+	git update-index --refresh &&
+
+	cd sub &&
+	git apply ../gpatch-sub.file &&
+	check_result file1
+
+sub/../gpatch-sub.file:5: trailing whitespace.
+B 
+warning: 1 line applied after fixing whitespace errors.
+B
+Happy
+ok 7 - same but with traditional patch input of depth 1
+
+expecting success: 
+
+	cd "$D" &&
+	git config apply.whitespace strip &&
+	rm -f sub/file1 &&
+	cp saved sub/file1 &&
+	git update-index --refresh &&
+
+	cd sub &&
+	git apply ../gpatch-ab-sub.file &&
+	check_result file1
+
+sub/../gpatch-ab-sub.file:5: trailing whitespace.
+B 
+warning: 1 line applied after fixing whitespace errors.
+B
+Happy
+ok 8 - same but with traditional patch input of depth 2
+
+expecting success: 
+
+	cd "$D" &&
+	git config apply.whitespace strip &&
+	rm -f sub/file1 &&
+	cp saved sub/file1 &&
+	git update-index --refresh &&
+
+	git apply -p0 gpatch-sub.file &&
+	check_result sub/file1
+
+gpatch-sub.file:5: trailing whitespace.
+B 
+warning: 1 line applied after fixing whitespace errors.
+B
+Happy
+ok 9 - same but with traditional patch input of depth 1
+
+expecting success: 
+
+	cd "$D" &&
+	git config apply.whitespace strip &&
+	rm -f sub/file1 &&
+	cp saved sub/file1 &&
+	git update-index --refresh &&
+
+	git apply gpatch-ab-sub.file &&
+	check_result sub/file1
+
+gpatch-ab-sub.file:5: trailing whitespace.
+B 
+warning: 1 line applied after fixing whitespace errors.
+B
+Happy
+ok 10 - same but with traditional patch input of depth 2
+
+expecting success: 
+	cd "$D" &&
+	git config apply.whitespace strip &&
+	cat >.gitattributes <<-EOF &&
+	/* whitespace=blank-at-eol
+	sub/* whitespace=-blank-at-eol
+	EOF
+	rm -f sub/file1 &&
+	cp saved sub/file1 &&
+	git update-index --refresh &&
+
+	cd sub &&
+	git apply ../gpatch.file &&
+	echo "B " >expect &&
+	test_cmp expect file1
+
+ok 11 - in subdir with traditional patch input
+
+# passed all 11 test(s)
+1..11
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t4125-apply-ws-fuzz.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4125-apply-ws-fuzz/.git/
+expecting success: 
+
+	>file &&
+	git add file &&
+
+	# file-0 is full of whitespace breakages
+	for l in a bb c d eeee f ggg h
+	do
+		echo "$l "
+	done >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: 
+
+	>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: 
+
+	>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: 
+
+	>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	2023-01-05 11:48:47.594868030 +0000
++++ file-tail	2023-01-05 11:48:47.598868030 +0000
+@@ -1 +1 @@
+-h
++h 
+ok 4 - withfix (backward)
+
+# passed all 4 test(s)
+1..4
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t4126-apply-empty.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4126-apply-empty/.git/
+expecting success: 
+	>empty &&
+	git add empty &&
+	test_tick &&
+	git commit -m initial &&
+	for i in a b c d e
+	do
+		echo $i
+	done >empty &&
+	cat empty >expect &&
+	git diff |
+	sed -e "/^diff --git/d" \
+	    -e "/^index /d" \
+	    -e "s|a/empty|empty.orig|" \
+	    -e "s|b/empty|empty|" >patch0 &&
+	sed -e "s|empty|missing|" patch0 >patch1 &&
+	>empty &&
+	git update-index --refresh
+
+[master (root-commit) e3f79fd] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 empty
+ok 1 - setup
+
+expecting success: 
+	git reset --hard &&
+	rm -f missing &&
+	git apply patch0 &&
+	test_cmp expect empty
+
+HEAD is now at e3f79fd initial
+ok 2 - apply empty
+
+expecting success: 
+	git reset --hard &&
+	rm -f missing &&
+	git apply --index patch0 &&
+	test_cmp expect empty &&
+	git diff --exit-code
+
+HEAD is now at e3f79fd initial
+ok 3 - apply --index empty
+
+expecting success: 
+	git reset --hard &&
+	rm -f missing &&
+	git apply patch1 &&
+	test_cmp expect missing
+
+HEAD is now at e3f79fd initial
+ok 4 - apply create
+
+expecting success: 
+	git reset --hard &&
+	rm -f missing &&
+	git apply --index patch1 &&
+	test_cmp expect missing &&
+	git diff --exit-code
+
+HEAD is now at e3f79fd initial
+ok 5 - apply --index create
+
+# passed all 5 test(s)
+1..5
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t4134-apply-submodule.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4134-apply-submodule/.git/
+expecting success: 
+	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 0123456789abcdef0123456789abcdef01234567
+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 0123456789abcdef0123456789abcdef01234567
+EOF
+
+ok 1 - setup
+
+expecting success: 
+	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/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t4133-apply-filenames.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4133-apply-filenames/.git/
+expecting success: 
+	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: 
+	test_must_fail git apply bad1.patch 2>err &&
+	test_i18ngrep "inconsistent new filename" err &&
+	test_must_fail git apply bad2.patch 2>err &&
+	test_i18ngrep "inconsistent old filename" err
+
+error: git apply: bad git-diff - inconsistent new filename on line 5
+error: git apply: bad git-diff - inconsistent old filename on line 4
+ok 2 - apply diff with inconsistent filenames in headers
+
+expecting success: 
+	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_i18ngrep "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: 
+	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_i18ngrep "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/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t4128-apply-root.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4128-apply-root/.git/
+expecting success: 
+
+	mkdir -p some/sub/dir &&
+	echo Hello > some/sub/dir/file &&
+	git add some/sub/dir/file &&
+	git commit -m initial &&
+	git tag initial
+
+
+[master (root-commit) 4bfcac1] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 some/sub/dir/file
+ok 1 - setup
+
+expecting success: 
+
+	git apply --directory=some/sub -p3 --index patch &&
+	test Bello = $(git show :some/sub/dir/file) &&
+	test Bello = $(cat some/sub/dir/file)
+
+
+ok 2 - apply --directory -p (1)
+
+expecting success: 
+
+	git reset --hard initial &&
+	git apply --directory=some/sub/ -p3 --index patch &&
+	test Bello = $(git show :some/sub/dir/file) &&
+	test Bello = $(cat some/sub/dir/file)
+
+
+HEAD is now at 4bfcac1 initial
+ok 3 - apply --directory -p (2) 
+
+expecting success: 
+	git reset --hard initial &&
+	git apply --directory=some/sub/dir/ --index patch &&
+	test content = $(git show :some/sub/dir/newfile) &&
+	test content = $(cat some/sub/dir/newfile)
+
+HEAD is now at 4bfcac1 initial
+ok 4 - apply --directory (new file)
+
+expecting success: 
+	git reset --hard initial &&
+	git apply -p2 --directory=some/sub/dir/ --index patch &&
+	test content = $(git show :some/sub/dir/newfile2) &&
+	test content = $(cat some/sub/dir/newfile2)
+
+HEAD is now at 4bfcac1 initial
+ok 5 - apply --directory -p (new file)
+
+expecting success: 
+	git reset --hard initial &&
+	echo content >some/sub/dir/delfile &&
+	git add some/sub/dir/delfile &&
+	git apply --directory=some/sub/dir/ --index patch &&
+	! (git ls-files | grep delfile)
+
+HEAD is now at 4bfcac1 initial
+ok 6 - apply --directory (delete file)
+
+expecting success: 
+	git reset --hard initial &&
+	git apply --directory=some/sub/dir/ --index patch &&
+	test content = $(git show :some/sub/dir/quotefile) &&
+	test content = $(cat some/sub/dir/quotefile)
+
+HEAD is now at 4bfcac1 initial
+ok 7 - apply --directory (quoted filename)
+
+# passed all 7 test(s)
+1..7
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t4130-apply-criss-cross-rename.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4130-apply-criss-cross-rename/.git/
+expecting success: 
+	# 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) b20adf0] 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: 
+	mv file1 tmp &&
+	mv file2 file1 &&
+	mv tmp file2 &&
+	cp file1 file1-swapped &&
+	cp file2 file2-swapped
+
+ok 2 - criss-cross rename
+
+expecting success: 
+	git diff -M -B > diff &&
+	git reset --hard
+
+
+HEAD is now at b20adf0 1
+ok 3 - diff -M -B
+
+expecting success: 
+	git apply diff &&
+	test_cmp file1 file1-swapped &&
+	test_cmp file2 file2-swapped
+
+ok 4 - apply
+
+expecting success: 
+	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 b20adf0 1
+ok 5 - criss-cross rename
+
+expecting success: 
+	git diff -M -B > diff &&
+	git reset --hard
+
+HEAD is now at b20adf0 1
+ok 6 - diff -M -B
+
+expecting success: 
+	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/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t4122-apply-symlink-inside.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4122-apply-symlink-inside/.git/
+expecting success: 
+
+	mkdir -p arch/i386/boot arch/x86_64 &&
+	test_write_lines 1 2 3 4 5 >arch/i386/boot/Makefile &&
+	test_ln_s_add ../i386/boot arch/x86_64/boot &&
+	git add . &&
+	test_tick &&
+	git commit -m initial &&
+	git branch test &&
+
+	rm arch/x86_64/boot &&
+	mkdir arch/x86_64/boot &&
+	test_write_lines 2 3 4 5 6 >arch/x86_64/boot/Makefile &&
+	git add . &&
+	test_tick &&
+	git commit -a -m second &&
+
+	git format-patch --binary -1 --stdout >test.patch
+
+
+checking prerequisite: SYMLINKS
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
+	# test whether the filesystem supports symbolic links
+	ln -s x y && test -h y
+
+)
+prerequisite SYMLINKS ok
+[master (root-commit) f9acfaa] initial
+ Author: A U Thor <author@example.com>
+ 2 files changed, 6 insertions(+)
+ create mode 100644 arch/i386/boot/Makefile
+ create mode 120000 arch/x86_64/boot
+[master e8e99d5] second
+ Author: A U Thor <author@example.com>
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+ delete mode 120000 arch/x86_64/boot
+ create mode 100644 arch/x86_64/boot/Makefile
+ok 1 - setup
+
+expecting success: 
+
+	git checkout test &&
+	git diff --exit-code test &&
+	git diff --exit-code --cached test &&
+	git apply --index test.patch
+
+
+Switched to branch 'test'
+ok 2 - apply
+
+expecting success: 
+
+	git diff --exit-code master &&
+	git diff --exit-code --cached master &&
+	test_tick &&
+	git commit -m replay &&
+	T1=$(git rev-parse "master^{tree}") &&
+	T2=$(git rev-parse "HEAD^{tree}") &&
+	test "z$T1" = "z$T2"
+
+
+[test 66a4bdc] replay
+ Author: A U Thor <author@example.com>
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+ delete mode 120000 arch/x86_64/boot
+ create mode 100644 arch/x86_64/boot/Makefile
+ok 3 - check result
+
+expecting success: 
+	git reset --hard &&
+	mkdir -p arch/x86_64/dir &&
+	>arch/x86_64/dir/file &&
+	git add arch/x86_64/dir/file &&
+	echo line >arch/x86_64/dir/file &&
+	git diff >patch &&
+	git reset --hard &&
+
+	mkdir arch/i386/dir &&
+	>arch/i386/dir/file &&
+	ln -s ../i386/dir arch/x86_64/dir &&
+
+	test_must_fail git apply patch &&
+	test_must_fail git apply --cached patch &&
+	test_must_fail git apply --index patch
+
+
+HEAD is now at 66a4bdc replay
+HEAD is now at 66a4bdc replay
+error: affected file 'arch/x86_64/dir/file' is beyond a symbolic link
+error: arch/x86_64/dir/file: does not exist in index
+error: arch/x86_64/dir/file: does not exist in index
+ok 4 - do not read from beyond symbolic link
+
+expecting success: 
+
+	rm -rf arch/i386/dir arch/x86_64/dir &&
+	git reset --hard &&
+	ln -s ../i386/dir arch/x86_64/dir &&
+	git add arch/x86_64/dir &&
+	git diff HEAD >add_symlink.patch &&
+	git reset --hard &&
+
+	mkdir arch/x86_64/dir &&
+	>arch/x86_64/dir/file &&
+	git add arch/x86_64/dir/file &&
+	git diff HEAD >add_file.patch &&
+	git diff -R HEAD >del_file.patch &&
+	git reset --hard &&
+	rm -fr arch/x86_64/dir &&
+
+	cat add_symlink.patch add_file.patch >patch &&
+	cat add_symlink.patch del_file.patch >tricky_del &&
+
+	mkdir arch/i386/dir
+
+HEAD is now at 66a4bdc replay
+HEAD is now at 66a4bdc replay
+HEAD is now at 66a4bdc replay
+ok 5 - do not follow symbolic link (setup)
+
+expecting success: 
+
+	# same input creates a confusing symbolic link
+	test_must_fail git apply patch 2>error-wt &&
+	test_i18ngrep "beyond a symbolic link" error-wt &&
+	test_path_is_missing arch/x86_64/dir &&
+	test_path_is_missing arch/i386/dir/file &&
+
+	test_must_fail git apply --index patch 2>error-ix &&
+	test_i18ngrep "beyond a symbolic link" error-ix &&
+	test_path_is_missing arch/x86_64/dir &&
+	test_path_is_missing arch/i386/dir/file &&
+	test_must_fail git ls-files --error-unmatch arch/x86_64/dir &&
+	test_must_fail git ls-files --error-unmatch arch/i386/dir &&
+
+	test_must_fail git apply --cached patch 2>error-ct &&
+	test_i18ngrep "beyond a symbolic link" error-ct &&
+	test_must_fail git ls-files --error-unmatch arch/x86_64/dir &&
+	test_must_fail git ls-files --error-unmatch arch/i386/dir &&
+
+	>arch/i386/dir/file &&
+	git add arch/i386/dir/file &&
+
+	test_must_fail git apply tricky_del &&
+	test_path_is_file arch/i386/dir/file &&
+
+	test_must_fail git apply --index tricky_del &&
+	test_path_is_file arch/i386/dir/file &&
+	test_must_fail git ls-files --error-unmatch arch/x86_64/dir &&
+	git ls-files --error-unmatch arch/i386/dir &&
+
+	test_must_fail git apply --cached tricky_del &&
+	test_must_fail git ls-files --error-unmatch arch/x86_64/dir &&
+	git ls-files --error-unmatch arch/i386/dir
+
+error: affected file 'arch/x86_64/dir/file' is beyond a symbolic link
+error: affected file 'arch/x86_64/dir/file' is beyond a symbolic link
+error: pathspec 'arch/x86_64/dir' did not match any file(s) known to git
+Did you forget to 'git add'?
+error: pathspec 'arch/i386/dir' did not match any file(s) known to git
+Did you forget to 'git add'?
+error: affected file 'arch/x86_64/dir/file' is beyond a symbolic link
+error: pathspec 'arch/x86_64/dir' did not match any file(s) known to git
+Did you forget to 'git add'?
+error: pathspec 'arch/i386/dir' did not match any file(s) known to git
+Did you forget to 'git add'?
+error: arch/x86_64/dir/file: No such file or directory
+error: arch/x86_64/dir/file: does not exist in index
+error: pathspec 'arch/x86_64/dir' did not match any file(s) known to git
+Did you forget to 'git add'?
+arch/i386/dir/file
+error: arch/x86_64/dir/file: does not exist in index
+error: pathspec 'arch/x86_64/dir' did not match any file(s) known to git
+Did you forget to 'git add'?
+arch/i386/dir/file
+ok 6 - do not follow symbolic link (same input)
+
+expecting success: 
+
+	# existing symbolic link
+	git reset --hard &&
+	ln -s ../i386/dir arch/x86_64/dir &&
+	git add arch/x86_64/dir &&
+
+	test_must_fail git apply add_file.patch 2>error-wt-add &&
+	test_i18ngrep "beyond a symbolic link" error-wt-add &&
+	test_path_is_missing arch/i386/dir/file &&
+
+	mkdir arch/i386/dir &&
+	>arch/i386/dir/file &&
+	test_must_fail git apply del_file.patch 2>error-wt-del &&
+	test_i18ngrep "beyond a symbolic link" error-wt-del &&
+	test_path_is_file arch/i386/dir/file &&
+	rm arch/i386/dir/file &&
+
+	test_must_fail git apply --index add_file.patch 2>error-ix-add &&
+	test_i18ngrep "beyond a symbolic link" error-ix-add &&
+	test_path_is_missing arch/i386/dir/file &&
+	test_must_fail git ls-files --error-unmatch arch/i386/dir &&
+
+	test_must_fail git apply --cached add_file.patch 2>error-ct-file &&
+	test_i18ngrep "beyond a symbolic link" error-ct-file &&
+	test_must_fail git ls-files --error-unmatch arch/i386/dir
+
+HEAD is now at 66a4bdc replay
+error: affected file 'arch/x86_64/dir/file' is beyond a symbolic link
+error: reading from 'arch/x86_64/dir/file' beyond a symbolic link
+error: affected file 'arch/x86_64/dir/file' is beyond a symbolic link
+error: pathspec 'arch/i386/dir' did not match any file(s) known to git
+Did you forget to 'git add'?
+error: affected file 'arch/x86_64/dir/file' is beyond a symbolic link
+error: pathspec 'arch/i386/dir' did not match any file(s) known to git
+Did you forget to 'git add'?
+ok 7 - do not follow symbolic link (existing)
+
+# passed all 7 test(s)
+1..7
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t4131-apply-fake-ancestor.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4131-apply-fake-ancestor/.git/
+expecting success: 
+	test_commit 1 &&
+	test_commit 2 &&
+	mkdir sub &&
+	test_commit 3 sub/3.t &&
+	test_commit 4
+
+[master (root-commit) d0dcf97] 1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1.t
+[master 82335b2] 2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 2.t
+[master 0015c90] 3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 sub/3.t
+[master 8d74a78] 4
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 4.t
+ok 1 - setup
+
+expecting success: 
+	git checkout 2 &&
+	echo "A" > 1.t &&
+	git diff > 1.patch &&
+	git reset --hard &&
+	git checkout 1 &&
+	git apply --build-fake-ancestor 1.ancestor 1.patch
+
+Note: checking out '2'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by performing another checkout.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -b with the checkout command again. Example:
+
+  git checkout -b <new-branch-name>
+
+HEAD is now at 82335b2 2
+HEAD is now at 82335b2 2
+Previous HEAD position was 82335b2 2
+HEAD is now at d0dcf97 1
+ok 2 - apply --build-fake-ancestor
+
+expecting success: 
+	git checkout 3 &&
+	echo "C" > sub/3.t &&
+	git diff > 3.patch &&
+	git reset --hard &&
+	git checkout 4 &&
+	(
+		cd sub &&
+		git apply --build-fake-ancestor 3.ancestor ../3.patch &&
+		test -f 3.ancestor
+	) &&
+	git apply --build-fake-ancestor 3.ancestor 3.patch &&
+	test_cmp sub/3.ancestor 3.ancestor
+
+Previous HEAD position was d0dcf97 1
+HEAD is now at 0015c90 3
+HEAD is now at 0015c90 3
+Previous HEAD position was 0015c90 3
+HEAD is now at 8d74a78 4
+ok 3 - apply --build-fake-ancestor in a subdirectory
+
+# passed all 3 test(s)
+1..3
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
 *** t4060-diff-submodule-option-diff-format.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4060-diff-submodule-option-diff-format/.git/
 expecting success: 
@@ -123726,467 +124760,6 @@
 1..47
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t4126-apply-empty.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4126-apply-empty/.git/
-expecting success: 
-	>empty &&
-	git add empty &&
-	test_tick &&
-	git commit -m initial &&
-	for i in a b c d e
-	do
-		echo $i
-	done >empty &&
-	cat empty >expect &&
-	git diff |
-	sed -e "/^diff --git/d" \
-	    -e "/^index /d" \
-	    -e "s|a/empty|empty.orig|" \
-	    -e "s|b/empty|empty|" >patch0 &&
-	sed -e "s|empty|missing|" patch0 >patch1 &&
-	>empty &&
-	git update-index --refresh
-
-[master (root-commit) e3f79fd] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 empty
-ok 1 - setup
-
-expecting success: 
-	git reset --hard &&
-	rm -f missing &&
-	git apply patch0 &&
-	test_cmp expect empty
-
-HEAD is now at e3f79fd initial
-ok 2 - apply empty
-
-expecting success: 
-	git reset --hard &&
-	rm -f missing &&
-	git apply --index patch0 &&
-	test_cmp expect empty &&
-	git diff --exit-code
-
-HEAD is now at e3f79fd initial
-ok 3 - apply --index empty
-
-expecting success: 
-	git reset --hard &&
-	rm -f missing &&
-	git apply patch1 &&
-	test_cmp expect missing
-
-HEAD is now at e3f79fd initial
-ok 4 - apply create
-
-expecting success: 
-	git reset --hard &&
-	rm -f missing &&
-	git apply --index patch1 &&
-	test_cmp expect missing &&
-	git diff --exit-code
-
-HEAD is now at e3f79fd initial
-ok 5 - apply --index create
-
-# passed all 5 test(s)
-1..5
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t4128-apply-root.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4128-apply-root/.git/
-expecting success: 
-
-	mkdir -p some/sub/dir &&
-	echo Hello > some/sub/dir/file &&
-	git add some/sub/dir/file &&
-	git commit -m initial &&
-	git tag initial
-
-
-[master (root-commit) 3118820] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 some/sub/dir/file
-ok 1 - setup
-
-expecting success: 
-
-	git apply --directory=some/sub -p3 --index patch &&
-	test Bello = $(git show :some/sub/dir/file) &&
-	test Bello = $(cat some/sub/dir/file)
-
-
-ok 2 - apply --directory -p (1)
-
-expecting success: 
-
-	git reset --hard initial &&
-	git apply --directory=some/sub/ -p3 --index patch &&
-	test Bello = $(git show :some/sub/dir/file) &&
-	test Bello = $(cat some/sub/dir/file)
-
-
-HEAD is now at 3118820 initial
-ok 3 - apply --directory -p (2) 
-
-expecting success: 
-	git reset --hard initial &&
-	git apply --directory=some/sub/dir/ --index patch &&
-	test content = $(git show :some/sub/dir/newfile) &&
-	test content = $(cat some/sub/dir/newfile)
-
-HEAD is now at 3118820 initial
-ok 4 - apply --directory (new file)
-
-expecting success: 
-	git reset --hard initial &&
-	git apply -p2 --directory=some/sub/dir/ --index patch &&
-	test content = $(git show :some/sub/dir/newfile2) &&
-	test content = $(cat some/sub/dir/newfile2)
-
-HEAD is now at 3118820 initial
-ok 5 - apply --directory -p (new file)
-
-expecting success: 
-	git reset --hard initial &&
-	echo content >some/sub/dir/delfile &&
-	git add some/sub/dir/delfile &&
-	git apply --directory=some/sub/dir/ --index patch &&
-	! (git ls-files | grep delfile)
-
-HEAD is now at 3118820 initial
-ok 6 - apply --directory (delete file)
-
-expecting success: 
-	git reset --hard initial &&
-	git apply --directory=some/sub/dir/ --index patch &&
-	test content = $(git show :some/sub/dir/quotefile) &&
-	test content = $(cat some/sub/dir/quotefile)
-
-HEAD is now at 3118820 initial
-ok 7 - apply --directory (quoted filename)
-
-# passed all 7 test(s)
-1..7
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t4133-apply-filenames.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4133-apply-filenames/.git/
-expecting success: 
-	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: 
-	test_must_fail git apply bad1.patch 2>err &&
-	test_i18ngrep "inconsistent new filename" err &&
-	test_must_fail git apply bad2.patch 2>err &&
-	test_i18ngrep "inconsistent old filename" err
-
-error: git apply: bad git-diff - inconsistent new filename on line 5
-error: git apply: bad git-diff - inconsistent old filename on line 4
-ok 2 - apply diff with inconsistent filenames in headers
-
-expecting success: 
-	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_i18ngrep "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: 
-	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_i18ngrep "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/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t4134-apply-submodule.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4134-apply-submodule/.git/
-expecting success: 
-	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 0123456789abcdef0123456789abcdef01234567
-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 0123456789abcdef0123456789abcdef01234567
-EOF
-
-ok 1 - setup
-
-expecting success: 
-	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/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t4130-apply-criss-cross-rename.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4130-apply-criss-cross-rename/.git/
-expecting success: 
-	# 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) 1c2970e] 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: 
-	mv file1 tmp &&
-	mv file2 file1 &&
-	mv tmp file2 &&
-	cp file1 file1-swapped &&
-	cp file2 file2-swapped
-
-ok 2 - criss-cross rename
-
-expecting success: 
-	git diff -M -B > diff &&
-	git reset --hard
-
-
-HEAD is now at 1c2970e 1
-ok 3 - diff -M -B
-
-expecting success: 
-	git apply diff &&
-	test_cmp file1 file1-swapped &&
-	test_cmp file2 file2-swapped
-
-ok 4 - apply
-
-expecting success: 
-	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 1c2970e 1
-ok 5 - criss-cross rename
-
-expecting success: 
-	git diff -M -B > diff &&
-	git reset --hard
-
-HEAD is now at 1c2970e 1
-ok 6 - diff -M -B
-
-expecting success: 
-	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/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t4125-apply-ws-fuzz.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4125-apply-ws-fuzz/.git/
-expecting success: 
-
-	>file &&
-	git add file &&
-
-	# file-0 is full of whitespace breakages
-	for l in a bb c d eeee f ggg h
-	do
-		echo "$l "
-	done >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: 
-
-	>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: 
-
-	>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: 
-
-	>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	2021-12-03 05:07:23.236016895 +0000
-+++ file-tail	2021-12-03 05:07:23.244016662 +0000
-@@ -1 +1 @@
--h
-+h 
-ok 4 - withfix (backward)
-
-# passed all 4 test(s)
-1..4
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
 *** t4127-apply-same-fn.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4127-apply-same-fn/.git/
 expecting success: 
@@ -124198,7 +124771,7 @@
 	git add same_fn other_fn &&
 	git commit -m initial
 
-[master (root-commit) c41609e] initial
+[master (root-commit) 2c4918e] initial
  Author: A U Thor <author@example.com>
  2 files changed, 26 insertions(+)
  create mode 100644 other_fn
@@ -124216,7 +124789,7 @@
 	git apply patch0 &&
 	test_cmp same_fn same_fn2
 
-HEAD is now at c41609e initial
+HEAD is now at 2c4918e initial
 ok 2 - apply same filename with independent changes
 
 expecting success: 
@@ -124231,8 +124804,8 @@
 	git apply patch0 &&
 	test_cmp same_fn same_fn2
 
-HEAD is now at c41609e initial
-HEAD is now at c41609e initial
+HEAD is now at 2c4918e initial
+HEAD is now at 2c4918e initial
 ok 3 - apply same filename with overlapping changes
 
 expecting success: 
@@ -124248,8 +124821,8 @@
 	git apply --index patch1 &&
 	test_cmp new_fn new_fn2
 
-HEAD is now at c41609e initial
-HEAD is now at c41609e initial
+HEAD is now at 2c4918e initial
+HEAD is now at 2c4918e initial
 ok 4 - apply same new filename after rename
 
 expecting success: 
@@ -124264,8 +124837,8 @@
 	git reset --hard &&
 	test_must_fail git apply patch1
 
-HEAD is now at c41609e initial
-HEAD is now at c41609e initial
+HEAD is now at 2c4918e initial
+HEAD is now at 2c4918e initial
 error: path same_fn has been renamed/deleted
 ok 5 - apply same old filename after rename -- should fail.
 
@@ -124285,171 +124858,18 @@
 	git reset --hard HEAD^ &&
 	git apply patch1
 
-HEAD is now at c41609e initial
-[master f81de80] a rename
+HEAD is now at 2c4918e initial
+[master ddb54ee] a rename
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
  rename same_fn => new_fn (92%)
-HEAD is now at c41609e initial
+HEAD is now at 2c4918e initial
 ok 6 - apply A->B (rename), C->A (rename), A->A -- should pass.
 
 # passed all 6 test(s)
 1..6
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t4136-apply-check.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4136-apply-check/.git/
-expecting success: 
-	test_commit 1
-
-[master (root-commit) d0dcf97] 1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 1.t
-ok 1 - setup
-
-expecting success: 
-	test_must_fail git apply --check - <<-\EOF
-	I am not a patch
-	I look nothing like a patch
-	git apply must fail
-	EOF
-
-error: unrecognized input
-ok 2 - apply --check exits non-zero with unrecognized input
-
-expecting success: 
-	cat >input <<-\EOF &&
-	diff --get a/1 b/1
-	index 6696ea4..606eddd 100644
-	--- a/1
-	+++ b/1
-	@@ -1,1 +1,1 @@
-	 1
-	EOF
-	test_must_fail git apply --stat input &&
-	test_must_fail git apply --check input
-
-error: corrupt patch at line 7
-error: corrupt patch at line 7
-ok 3 - apply exits non-zero with no-op patch
-
-expecting success: 
-	echo 1 >1 &&
-	git apply --recount --check <<-\EOF
-	diff --get a/1 b/1
-	index 6696ea4..606eddd 100644
-	--- a/1
-	+++ b/1
-	@@ -1,1 +1,1 @@
-	 1
-	EOF
-
-ok 4 - `apply --recount` allows no-op patch
-
-expecting success: 
-	test_must_fail git apply --check - <<-\EOF
-	diff --git a/1 b/2
-	new file mode 100644
-	copy from 1
-	copy to 2
-	EOF
-
-error: inconsistent header lines 2 and 3
-ok 5 - invalid combination: create and copy
-
-expecting success: 
-	test_must_fail git apply --check - <<-\EOF
-	diff --git a/1 b/2
-	new file mode 100644
-	rename from 1
-	rename to 2
-	EOF
-
-error: inconsistent header lines 2 and 3
-ok 6 - invalid combination: create and rename
-
-# passed all 6 test(s)
-1..6
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t4131-apply-fake-ancestor.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4131-apply-fake-ancestor/.git/
-expecting success: 
-	test_commit 1 &&
-	test_commit 2 &&
-	mkdir sub &&
-	test_commit 3 sub/3.t &&
-	test_commit 4
-
-[master (root-commit) d0dcf97] 1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 1.t
-[master 82335b2] 2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 2.t
-[master 0015c90] 3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 sub/3.t
-[master 8d74a78] 4
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 4.t
-ok 1 - setup
-
-expecting success: 
-	git checkout 2 &&
-	echo "A" > 1.t &&
-	git diff > 1.patch &&
-	git reset --hard &&
-	git checkout 1 &&
-	git apply --build-fake-ancestor 1.ancestor 1.patch
-
-Note: checking out '2'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by performing another checkout.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
-
-  git checkout -b <new-branch-name>
-
-HEAD is now at 82335b2 2
-HEAD is now at 82335b2 2
-Previous HEAD position was 82335b2 2
-HEAD is now at d0dcf97 1
-ok 2 - apply --build-fake-ancestor
-
-expecting success: 
-	git checkout 3 &&
-	echo "C" > sub/3.t &&
-	git diff > 3.patch &&
-	git reset --hard &&
-	git checkout 4 &&
-	(
-		cd sub &&
-		git apply --build-fake-ancestor 3.ancestor ../3.patch &&
-		test -f 3.ancestor
-	) &&
-	git apply --build-fake-ancestor 3.ancestor 3.patch &&
-	test_cmp sub/3.ancestor 3.ancestor
-
-Previous HEAD position was d0dcf97 1
-HEAD is now at 0015c90 3
-HEAD is now at 0015c90 3
-Previous HEAD position was 0015c90 3
-HEAD is now at 8d74a78 4
-ok 3 - apply --build-fake-ancestor in a subdirectory
-
-# passed all 3 test(s)
-1..3
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
 *** t4129-apply-samemode.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4129-apply-samemode/.git/
 expecting success: 
@@ -124562,6 +124982,261 @@
 1..9
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
+*** t4136-apply-check.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4136-apply-check/.git/
+expecting success: 
+	test_commit 1
+
+[master (root-commit) d0dcf97] 1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1.t
+ok 1 - setup
+
+expecting success: 
+	test_must_fail git apply --check - <<-\EOF
+	I am not a patch
+	I look nothing like a patch
+	git apply must fail
+	EOF
+
+error: unrecognized input
+ok 2 - apply --check exits non-zero with unrecognized input
+
+expecting success: 
+	cat >input <<-\EOF &&
+	diff --get a/1 b/1
+	index 6696ea4..606eddd 100644
+	--- a/1
+	+++ b/1
+	@@ -1,1 +1,1 @@
+	 1
+	EOF
+	test_must_fail git apply --stat input &&
+	test_must_fail git apply --check input
+
+error: corrupt patch at line 7
+error: corrupt patch at line 7
+ok 3 - apply exits non-zero with no-op patch
+
+expecting success: 
+	echo 1 >1 &&
+	git apply --recount --check <<-\EOF
+	diff --get a/1 b/1
+	index 6696ea4..606eddd 100644
+	--- a/1
+	+++ b/1
+	@@ -1,1 +1,1 @@
+	 1
+	EOF
+
+ok 4 - `apply --recount` allows no-op patch
+
+expecting success: 
+	test_must_fail git apply --check - <<-\EOF
+	diff --git a/1 b/2
+	new file mode 100644
+	copy from 1
+	copy to 2
+	EOF
+
+error: inconsistent header lines 2 and 3
+ok 5 - invalid combination: create and copy
+
+expecting success: 
+	test_must_fail git apply --check - <<-\EOF
+	diff --git a/1 b/2
+	new file mode 100644
+	rename from 1
+	rename to 2
+	EOF
+
+error: inconsistent header lines 2 and 3
+ok 6 - invalid combination: create and rename
+
+# passed all 6 test(s)
+1..6
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t4138-apply-ws-expansion.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4138-apply-ws-expansion/.git/
+expecting success: 
+	#
+	## create test-N, patchN.patch, expect-N files
+	#
+
+	# test 1
+	printf "\t%s\n" 1 2 3 4 5 6 >before &&
+	printf "\t%s\n" 1 2 3 >after &&
+	printf "%64s\n" a b c >>after &&
+	printf "\t%s\n" 4 5 6 >>after &&
+	git diff --no-index before after |
+		sed -e "s/before/test-1/" -e "s/after/test-1/" >patch1.patch &&
+	printf "%64s\n" 1 2 3 4 5 6 >test-1 &&
+	printf "%64s\n" 1 2 3 a b c 4 5 6 >expect-1 &&
+
+	# test 2
+	printf "\t%s\n" a b c d e f >before &&
+	printf "\t%s\n" a b c >after &&
+	n=10 &&
+	x=1 &&
+	while test $x -lt $n
+	do
+		printf "%63s%d\n" "" $x >>after
+		x=$(( $x + 1 ))
+	done &&
+	printf "\t%s\n" d e f >>after &&
+	git diff --no-index before after |
+		sed -e "s/before/test-2/" -e "s/after/test-2/" >patch2.patch &&
+	printf "%64s\n" a b c d e f >test-2 &&
+	printf "%64s\n" a b c >expect-2 &&
+	x=1 &&
+	while test $x -lt $n
+	do
+		printf "%63s%d\n" "" $x >>expect-2
+		x=$(( $x + 1 ))
+	done &&
+	printf "%64s\n" d e f >>expect-2 &&
+
+	# test 3
+	printf "\t%s\n" a b c d e f >before &&
+	printf "\t%s\n" a b c >after &&
+	n=100 &&
+	x=0 &&
+	while test $x -lt $n
+	do
+		printf "%63s%02d\n" "" $x >>after
+		x=$(( $x + 1 ))
+	done &&
+	printf "\t%s\n" d e f >>after &&
+	git diff --no-index before after |
+	sed -e "s/before/test-3/" -e "s/after/test-3/" >patch3.patch &&
+	printf "%64s\n" a b c d e f >test-3 &&
+	printf "%64s\n" a b c >expect-3 &&
+	x=0 &&
+	while test $x -lt $n
+	do
+		printf "%63s%02d\n" "" $x >>expect-3
+		x=$(( $x + 1 ))
+	done &&
+	printf "%64s\n" d e f >>expect-3 &&
+
+	# test 4
+	>before &&
+	x=0 &&
+	while test $x -lt 50
+	do
+		printf "\t%02d\n" $x >>before
+		x=$(( $x + 1 ))
+	done &&
+	cat before >after &&
+	printf "%64s\n" a b c >>after &&
+	while test $x -lt 100
+	do
+		printf "\t%02d\n" $x >>before
+		printf "\t%02d\n" $x >>after
+		x=$(( $x + 1 ))
+	done &&
+	git diff --no-index before after |
+	sed -e "s/before/test-4/" -e "s/after/test-4/" >patch4.patch &&
+	>test-4 &&
+	x=0 &&
+	while test $x -lt 50
+	do
+		printf "%63s%02d\n" "" $x >>test-4
+		x=$(( $x + 1 ))
+	done &&
+	cat test-4 >expect-4 &&
+	printf "%64s\n" a b c >>expect-4 &&
+	while test $x -lt 100
+	do
+		printf "%63s%02d\n" "" $x >>test-4
+		printf "%63s%02d\n" "" $x >>expect-4
+		x=$(( $x + 1 ))
+	done &&
+
+	git config core.whitespace tab-in-indent,tabwidth=63 &&
+	git config apply.whitespace fix
+
+
+ok 1 - setup
+
+expecting success: 
+		git apply patch$t.patch &&
+		test_cmp expect-$t test-$t
+	
+patch1.patch:6: tab in indent.
+	1
+patch1.patch:7: tab in indent.
+	2
+patch1.patch:8: tab in indent.
+	3
+patch1.patch:12: tab in indent.
+	4
+patch1.patch:13: tab in indent.
+	5
+warning: squelched 1 whitespace error
+warning: 6 lines add whitespace errors.
+ok 2 - apply with ws expansion (t=$t)
+
+expecting success: 
+		git apply patch$t.patch &&
+		test_cmp expect-$t test-$t
+	
+patch2.patch:6: tab in indent.
+	a
+patch2.patch:7: tab in indent.
+	b
+patch2.patch:8: tab in indent.
+	c
+patch2.patch:18: tab in indent.
+	d
+patch2.patch:19: tab in indent.
+	e
+warning: squelched 1 whitespace error
+warning: 6 lines add whitespace errors.
+ok 3 - apply with ws expansion (t=$t)
+
+expecting success: 
+		git apply patch$t.patch &&
+		test_cmp expect-$t test-$t
+	
+patch3.patch:6: tab in indent.
+	a
+patch3.patch:7: tab in indent.
+	b
+patch3.patch:8: tab in indent.
+	c
+patch3.patch:109: tab in indent.
+	d
+patch3.patch:110: tab in indent.
+	e
+warning: squelched 1 whitespace error
+warning: 6 lines add whitespace errors.
+ok 4 - apply with ws expansion (t=$t)
+
+expecting success: 
+		git apply patch$t.patch &&
+		test_cmp expect-$t test-$t
+	
+patch4.patch:6: tab in indent.
+	47
+patch4.patch:7: tab in indent.
+	48
+patch4.patch:8: tab in indent.
+	49
+patch4.patch:12: tab in indent.
+	50
+patch4.patch:13: tab in indent.
+	51
+warning: squelched 1 whitespace error
+warning: 6 lines add whitespace errors.
+ok 5 - apply with ws expansion (t=$t)
+
+# passed all 5 test(s)
+1..5
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
 *** t4132-apply-removal.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4132-apply-removal/.git/
 expecting success: 
@@ -125125,206 +125800,68 @@
 1..14
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t4138-apply-ws-expansion.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4138-apply-ws-expansion/.git/
+*** t4139-apply-escape.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4139-apply-escape/.git/
 expecting success: 
-	#
-	## create test-N, patchN.patch, expect-N files
-	#
+	mkdir inside &&
+	mv .git inside/ &&
+	cd inside
 
-	# test 1
-	printf "\t%s\n" 1 2 3 4 5 6 >before &&
-	printf "\t%s\n" 1 2 3 >after &&
-	printf "%64s\n" a b c >>after &&
-	printf "\t%s\n" 4 5 6 >>after &&
-	git diff --no-index before after |
-		sed -e "s/before/test-1/" -e "s/after/test-1/" >patch1.patch &&
-	printf "%64s\n" 1 2 3 4 5 6 >test-1 &&
-	printf "%64s\n" 1 2 3 a b c 4 5 6 >expect-1 &&
+ok 1 - bump git repo one level down
 
-	# test 2
-	printf "\t%s\n" a b c d e f >before &&
-	printf "\t%s\n" a b c >after &&
-	n=10 &&
-	x=1 &&
-	while test $x -lt $n
-	do
-		printf "%63s%d\n" "" $x >>after
-		x=$(( $x + 1 ))
-	done &&
-	printf "\t%s\n" d e f >>after &&
-	git diff --no-index before after |
-		sed -e "s/before/test-2/" -e "s/after/test-2/" >patch2.patch &&
-	printf "%64s\n" a b c d e f >test-2 &&
-	printf "%64s\n" a b c >expect-2 &&
-	x=1 &&
-	while test $x -lt $n
-	do
-		printf "%63s%d\n" "" $x >>expect-2
-		x=$(( $x + 1 ))
-	done &&
-	printf "%64s\n" d e f >>expect-2 &&
+expecting success: 
+	mkpatch_add ../foo >patch &&
+	test_must_fail git apply patch &&
+	test_path_is_missing ../foo
 
-	# test 3
-	printf "\t%s\n" a b c d e f >before &&
-	printf "\t%s\n" a b c >after &&
-	n=100 &&
-	x=0 &&
-	while test $x -lt $n
-	do
-		printf "%63s%02d\n" "" $x >>after
-		x=$(( $x + 1 ))
-	done &&
-	printf "\t%s\n" d e f >>after &&
-	git diff --no-index before after |
-	sed -e "s/before/test-3/" -e "s/after/test-3/" >patch3.patch &&
-	printf "%64s\n" a b c d e f >test-3 &&
-	printf "%64s\n" a b c >expect-3 &&
-	x=0 &&
-	while test $x -lt $n
-	do
-		printf "%63s%02d\n" "" $x >>expect-3
-		x=$(( $x + 1 ))
-	done &&
-	printf "%64s\n" d e f >>expect-3 &&
+error: invalid path '../foo'
+ok 2 - cannot create file containing ..
 
-	# test 4
-	>before &&
-	x=0 &&
-	while test $x -lt 50
-	do
-		printf "\t%02d\n" $x >>before
-		x=$(( $x + 1 ))
-	done &&
-	cat before >after &&
-	printf "%64s\n" a b c >>after &&
-	while test $x -lt 100
-	do
-		printf "\t%02d\n" $x >>before
-		printf "\t%02d\n" $x >>after
-		x=$(( $x + 1 ))
-	done &&
-	git diff --no-index before after |
-	sed -e "s/before/test-4/" -e "s/after/test-4/" >patch4.patch &&
-	>test-4 &&
-	x=0 &&
-	while test $x -lt 50
-	do
-		printf "%63s%02d\n" "" $x >>test-4
-		x=$(( $x + 1 ))
-	done &&
-	cat test-4 >expect-4 &&
-	printf "%64s\n" a b c >>expect-4 &&
-	while test $x -lt 100
-	do
-		printf "%63s%02d\n" "" $x >>test-4
-		printf "%63s%02d\n" "" $x >>expect-4
-		x=$(( $x + 1 ))
-	done &&
+expecting success: 
+	mkpatch_add ../foo >patch &&
+	git apply --unsafe-paths patch &&
+	test_path_is_file ../foo
 
-	git config core.whitespace tab-in-indent,tabwidth=63 &&
-	git config apply.whitespace fix
+ok 3 - can create file containing .. with --unsafe-paths
 
+expecting success: 
+	mkpatch_add ../foo >patch &&
+	test_must_fail git apply --index patch &&
+	test_path_is_missing ../foo
 
-ok 1 - setup
+error: invalid path '../foo'
+ok 4 - cannot create file containing .. (index)
 
 expecting success: 
-		git apply patch$t.patch &&
-		test_cmp expect-$t test-$t
-	
-patch1.patch:6: tab in indent.
-	1
-patch1.patch:7: tab in indent.
-	2
-patch1.patch:8: tab in indent.
-	3
-patch1.patch:12: tab in indent.
-	4
-patch1.patch:13: tab in indent.
-	5
-warning: squelched 1 whitespace error
-warning: 6 lines add whitespace errors.
-ok 2 - apply with ws expansion (t=$t)
+	mkpatch_add ../foo >patch &&
+	test_must_fail git apply --index --unsafe-paths patch &&
+	test_path_is_missing ../foo
 
-expecting success: 
-		git apply patch$t.patch &&
-		test_cmp expect-$t test-$t
-	
-patch2.patch:6: tab in indent.
-	a
-patch2.patch:7: tab in indent.
-	b
-patch2.patch:8: tab in indent.
-	c
-patch2.patch:18: tab in indent.
-	d
-patch2.patch:19: tab in indent.
-	e
-warning: squelched 1 whitespace error
-warning: 6 lines add whitespace errors.
-ok 3 - apply with ws expansion (t=$t)
+error: invalid path '../foo'
+ok 5 - cannot create file containing .. with --unsafe-paths (index)
 
 expecting success: 
-		git apply patch$t.patch &&
-		test_cmp expect-$t test-$t
-	
-patch3.patch:6: tab in indent.
-	a
-patch3.patch:7: tab in indent.
-	b
-patch3.patch:8: tab in indent.
-	c
-patch3.patch:109: tab in indent.
-	d
-patch3.patch:110: tab in indent.
-	e
-warning: squelched 1 whitespace error
-warning: 6 lines add whitespace errors.
-ok 4 - apply with ws expansion (t=$t)
+	mkpatch_del ../foo >patch &&
+	test_must_fail git apply patch &&
+	test_path_is_file ../foo
 
-expecting success: 
-		git apply patch$t.patch &&
-		test_cmp expect-$t test-$t
-	
-patch4.patch:6: tab in indent.
-	47
-patch4.patch:7: tab in indent.
-	48
-patch4.patch:8: tab in indent.
-	49
-patch4.patch:12: tab in indent.
-	50
-patch4.patch:13: tab in indent.
-	51
-warning: squelched 1 whitespace error
-warning: 6 lines add whitespace errors.
-ok 5 - apply with ws expansion (t=$t)
+error: invalid path '../foo'
+ok 6 - cannot delete file containing ..
 
-# passed all 5 test(s)
-1..5
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t4122-apply-symlink-inside.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4122-apply-symlink-inside/.git/
 expecting success: 
+	mkpatch_del ../foo >patch &&
+	git apply --unsafe-paths patch &&
+	test_path_is_missing ../foo
 
-	mkdir -p arch/i386/boot arch/x86_64 &&
-	test_write_lines 1 2 3 4 5 >arch/i386/boot/Makefile &&
-	test_ln_s_add ../i386/boot arch/x86_64/boot &&
-	git add . &&
-	test_tick &&
-	git commit -m initial &&
-	git branch test &&
-
-	rm arch/x86_64/boot &&
-	mkdir arch/x86_64/boot &&
-	test_write_lines 2 3 4 5 6 >arch/x86_64/boot/Makefile &&
-	git add . &&
-	test_tick &&
-	git commit -a -m second &&
+ok 7 - can delete file containing .. with --unsafe-paths
 
-	git format-patch --binary -1 --stdout >test.patch
+expecting success: 
+	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
 
@@ -125336,196 +125873,443 @@
 
 )
 prerequisite SYMLINKS ok
-[master (root-commit) f9acfaa] initial
+expecting success: 
+	{
+		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: 
+	{
+		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: 
+	{
+		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: 
+	{
+		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/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t4152-am-subjects.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4152-am-subjects/.git/
+expecting success: 
+	test_commit baseline file
+
+[master (root-commit) 2f64c43] baseline
  Author: A U Thor <author@example.com>
- 2 files changed, 6 insertions(+)
- create mode 100644 arch/i386/boot/Makefile
- create mode 120000 arch/x86_64/boot
-[master e8e99d5] second
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+ok 1 - setup baseline commit
+
+expecting success: 
+		git reset --hard baseline &&
+		echo $type >file &&
+		git commit -a -m "$subject" &&
+		git format-patch -1 --stdout >$type.patch &&
+		git format-patch -1 --stdout -k >$type-k.patch
+	
+HEAD is now at 2f64c43 baseline
+[master 5d59063] short subject
  Author: A U Thor <author@example.com>
- 2 files changed, 5 insertions(+), 1 deletion(-)
- delete mode 120000 arch/x86_64/boot
- create mode 100644 arch/x86_64/boot/Makefile
-ok 1 - setup
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 2 - create patches with short subject
 
 expecting success: 
+		git reset --hard baseline &&
+		echo $type >file &&
+		git commit -a -m "$subject" &&
+		git format-patch -1 --stdout >$type.patch &&
+		git format-patch -1 --stdout -k >$type-k.patch
+	
+HEAD is now at 2f64c43 baseline
+[master 512ba33] this is a long subject that is virtually guaranteed to require wrapping via format-patch if it is all going to appear on a single line
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 3 - create patches with long subject
 
-	git checkout test &&
-	git diff --exit-code test &&
-	git diff --exit-code --cached test &&
-	git apply --index test.patch
+expecting success: 
+		git reset --hard baseline &&
+		echo $type >file &&
+		git commit -a -m "$subject" &&
+		git format-patch -1 --stdout >$type.patch &&
+		git format-patch -1 --stdout -k >$type-k.patch
+	
+HEAD is now at 2f64c43 baseline
+[master 230e818] this is a long subject that is virtually guaranteed to require wrapping via format-patch if it is all going to appear on a single line
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 4 - create patches with multiline subject
 
+expecting success: 
+	check_subject short
 
-Switched to branch 'test'
-ok 2 - apply
+HEAD is now at 2f64c43 baseline
+Applying: short subject
+ok 5 - short subject preserved (format-patch | am)
 
 expecting success: 
+	check_subject short-k
 
-	git diff --exit-code master &&
-	git diff --exit-code --cached master &&
+HEAD is now at 2f64c43 baseline
+Applying: short subject
+ok 6 - short subject preserved (format-patch -k | am)
+
+expecting success: 
+	check_subject short-k -k
+
+HEAD is now at 2f64c43 baseline
+Applying: short subject
+ok 7 - short subject preserved (format-patch -k | am -k)
+
+expecting success: 
+	check_subject long
+
+HEAD is now at 2f64c43 baseline
+Applying: this is a long subject that is virtually guaranteed to require wrapping via format-patch if it is all going to appear on a single line
+ok 8 - long subject preserved (format-patch | am)
+
+expecting success: 
+	check_subject long-k
+
+HEAD is now at 2f64c43 baseline
+Applying: this is a long subject that is virtually guaranteed to require wrapping via format-patch if it is all going to appear on a single line
+ok 9 - long subject preserved (format-patch -k | am)
+
+expecting success: 
+	check_subject long-k -k
+
+HEAD is now at 2f64c43 baseline
+Applying: this is a long subject that is virtually guaranteed to require wrapping via format-patch if it is all going to appear on a single line
+ok 10 - long subject preserved (format-patch -k | am -k)
+
+expecting success: 
+	check_subject multiline
+
+HEAD is now at 2f64c43 baseline
+Applying: this is a long subject that is virtually guaranteed to require wrapping via format-patch if it is all going to appear on a single line
+ok 11 - multiline subject unwrapped (format-patch | am)
+
+expecting success: 
+	check_subject multiline-k
+
+HEAD is now at 2f64c43 baseline
+Applying: this is a long subject that is virtually guaranteed to require wrapping via format-patch if it is all going to appear on a single line
+ok 12 - multiline subject unwrapped (format-patch -k | am)
+
+expecting success: 
+	check_subject multiline-k -k
+
+HEAD is now at 2f64c43 baseline
+Applying: this is a long subject that is virtually guaranteed
+ok 13 - multiline subject preserved (format-patch -k | am -k)
+
+# passed all 13 test(s)
+1..13
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t4153-am-resume-override-opts.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4153-am-resume-override-opts/.git/
+expecting success: 
+	test_commit initial file &&
+	test_commit first file &&
+
+	git checkout initial &&
+	git mv file file2 &&
 	test_tick &&
-	git commit -m replay &&
-	T1=$(git rev-parse "master^{tree}") &&
-	T2=$(git rev-parse "HEAD^{tree}") &&
-	test "z$T1" = "z$T2"
+	git commit -m renamed-file &&
+	git tag renamed-file &&
 
+	git checkout -b side initial &&
+	test_commit side1 file &&
+	test_commit side2 file &&
 
-[test 66a4bdc] replay
+	format_patch side1 &&
+	format_patch side2
+
+[master (root-commit) b6d2089] initial
  Author: A U Thor <author@example.com>
- 2 files changed, 5 insertions(+), 1 deletion(-)
- delete mode 120000 arch/x86_64/boot
- create mode 100644 arch/x86_64/boot/Makefile
-ok 3 - check result
+ 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: checking out '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 performing another checkout.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -b with the checkout command again. Example:
+
+  git checkout -b <new-branch-name>
+
+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
+
+checking prerequisite: TTY
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
+	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: 
+	rm -fr .git/rebase-apply &&
 	git reset --hard &&
-	mkdir -p arch/x86_64/dir &&
-	>arch/x86_64/dir/file &&
-	git add arch/x86_64/dir/file &&
-	echo line >arch/x86_64/dir/file &&
-	git diff >patch &&
-	git reset --hard &&
+	git checkout renamed-file &&
 
-	mkdir arch/i386/dir &&
-	>arch/i386/dir/file &&
-	ln -s ../i386/dir arch/x86_64/dir &&
+	# 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)" &&
 
-	test_must_fail git apply patch &&
-	test_must_fail git apply --cached patch &&
-	test_must_fail git apply --index patch
+	# 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: checking out 'renamed-file'.
 
-HEAD is now at 66a4bdc replay
-HEAD is now at 66a4bdc replay
-error: affected file 'arch/x86_64/dir/file' is beyond a symbolic link
-error: arch/x86_64/dir/file: does not exist in index
-error: arch/x86_64/dir/file: does not exist in index
-ok 4 - do not read from beyond symbolic link
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by performing another checkout.
 
-expecting success: 
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -b with the checkout command again. Example:
 
-	rm -rf arch/i386/dir arch/x86_64/dir &&
-	git reset --hard &&
-	ln -s ../i386/dir arch/x86_64/dir &&
-	git add arch/x86_64/dir &&
-	git diff HEAD >add_symlink.patch &&
-	git reset --hard &&
+  git checkout -b <new-branch-name>
 
-	mkdir arch/x86_64/dir &&
-	>arch/x86_64/dir/file &&
-	git add arch/x86_64/dir/file &&
-	git diff HEAD >add_file.patch &&
-	git diff -R HEAD >del_file.patch &&
+HEAD is now at 5e7fd8e renamed-file
+error: file: does not exist in index
+hint: Use 'git am --show-current-patch' to see the failed patch
+Applying: side1
+Patch failed at 0001 side1
+When you have resolved this problem, run "git am --continue".
+If you prefer to skip this patch, run "git am --skip" instead.
+To restore the original branch and stop patching, run "git am --abort".
+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
+When you have resolved this problem, run "git am --continue".
+If you prefer to skip this patch, run "git am --skip" instead.
+To restore the original branch and stop patching, run "git am --abort".
+error: file: does not exist in index
+hint: Use 'git am --show-current-patch' to see the failed patch
+died of signal 15 at /build/git-2.20.1/t/test-terminal.perl line 35.
+ok 2 - --3way overrides --no-3way
+
+expecting success: 
+	rm -fr .git/rebase-apply &&
 	git reset --hard &&
-	rm -fr arch/x86_64/dir &&
+	git checkout first &&
 
-	cat add_symlink.patch add_file.patch >patch &&
-	cat add_symlink.patch del_file.patch >tricky_del &&
+	# Applying side1 will be quiet.
+	test_must_fail git am --quiet side[123].eml >out &&
+	test_path_is_dir .git/rebase-apply &&
+	test_i18ngrep ! "^Applying: " out &&
+	echo side1 >file &&
+	git add file &&
 
-	mkdir arch/i386/dir
+	# Applying side1 will not be quiet.
+	# Applying side2 will be quiet.
+	git am --no-quiet --continue >out &&
+	echo "Applying: side1" >expected &&
+	test_i18ncmp expected out
 
-HEAD is now at 66a4bdc replay
-HEAD is now at 66a4bdc replay
-HEAD is now at 66a4bdc replay
-ok 5 - do not follow symbolic link (setup)
+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' to see the failed patch
+ok 3 - --no-quiet overrides --quiet
 
 expecting success: 
+	rm -fr .git/rebase-apply &&
+	git reset --hard &&
+	git checkout first &&
 
-	# same input creates a confusing symbolic link
-	test_must_fail git apply patch 2>error-wt &&
-	test_i18ngrep "beyond a symbolic link" error-wt &&
-	test_path_is_missing arch/x86_64/dir &&
-	test_path_is_missing arch/i386/dir/file &&
+	test_must_fail git am --no-signoff side[12].eml &&
+	test_path_is_dir .git/rebase-apply &&
+	echo side1 >file &&
+	git add file &&
+	git am --signoff --continue &&
 
-	test_must_fail git apply --index patch 2>error-ix &&
-	test_i18ngrep "beyond a symbolic link" error-ix &&
-	test_path_is_missing arch/x86_64/dir &&
-	test_path_is_missing arch/i386/dir/file &&
-	test_must_fail git ls-files --error-unmatch arch/x86_64/dir &&
-	test_must_fail git ls-files --error-unmatch arch/i386/dir &&
+	# 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 &&
 
-	test_must_fail git apply --cached patch 2>error-ct &&
-	test_i18ngrep "beyond a symbolic link" error-ct &&
-	test_must_fail git ls-files --error-unmatch arch/x86_64/dir &&
-	test_must_fail git ls-files --error-unmatch arch/i386/dir &&
+	# Applied side2 will not be signed off
+	test $(git cat-file commit HEAD | grep -c "Signed-off-by:") -eq 0
 
-	>arch/i386/dir/file &&
-	git add arch/i386/dir/file &&
+HEAD is now at 1d25943 side2
+Warning: you are leaving 2 commits behind, not connected to
+any of your branches:
 
-	test_must_fail git apply tricky_del &&
-	test_path_is_file arch/i386/dir/file &&
+  1d25943 side2
+  0400be0 side1
 
-	test_must_fail git apply --index tricky_del &&
-	test_path_is_file arch/i386/dir/file &&
-	test_must_fail git ls-files --error-unmatch arch/x86_64/dir &&
-	git ls-files --error-unmatch arch/i386/dir &&
+If you want to keep them by creating a new branch, this may be a good time
+to do so with:
 
-	test_must_fail git apply --cached tricky_del &&
-	test_must_fail git ls-files --error-unmatch arch/x86_64/dir &&
-	git ls-files --error-unmatch arch/i386/dir
+ git branch <new-branch-name> 1d25943
 
-error: affected file 'arch/x86_64/dir/file' is beyond a symbolic link
-error: affected file 'arch/x86_64/dir/file' is beyond a symbolic link
-error: pathspec 'arch/x86_64/dir' did not match any file(s) known to git
-Did you forget to 'git add'?
-error: pathspec 'arch/i386/dir' did not match any file(s) known to git
-Did you forget to 'git add'?
-error: affected file 'arch/x86_64/dir/file' is beyond a symbolic link
-error: pathspec 'arch/x86_64/dir' did not match any file(s) known to git
-Did you forget to 'git add'?
-error: pathspec 'arch/i386/dir' did not match any file(s) known to git
-Did you forget to 'git add'?
-error: arch/x86_64/dir/file: No such file or directory
-error: arch/x86_64/dir/file: does not exist in index
-error: pathspec 'arch/x86_64/dir' did not match any file(s) known to git
-Did you forget to 'git add'?
-arch/i386/dir/file
-error: arch/x86_64/dir/file: does not exist in index
-error: pathspec 'arch/x86_64/dir' did not match any file(s) known to git
-Did you forget to 'git add'?
-arch/i386/dir/file
-ok 6 - do not follow symbolic link (same input)
+HEAD is now at 3aaf771 first
+error: patch failed: file:1
+error: file: patch does not apply
+hint: Use 'git am --show-current-patch' to see the failed patch
+Applying: side1
+Patch failed at 0001 side1
+When you have resolved this problem, run "git am --continue".
+If you prefer to skip this patch, run "git am --skip" instead.
+To restore the original branch and stop patching, run "git am --abort".
+Applying: side1
+Applying: side2
+ok 4 - --signoff overrides --no-signoff
 
 expecting success: 
-
-	# existing symbolic link
+	rm -fr .git/rebase-apply &&
 	git reset --hard &&
-	ln -s ../i386/dir arch/x86_64/dir &&
-	git add arch/x86_64/dir &&
+	git checkout first &&
+	rm -f file.rej &&
 
-	test_must_fail git apply add_file.patch 2>error-wt-add &&
-	test_i18ngrep "beyond a symbolic link" error-wt-add &&
-	test_path_is_missing arch/i386/dir/file &&
+	test_must_fail git am --no-reject side1.eml &&
+	test_path_is_dir .git/rebase-apply &&
+	test_path_is_missing file.rej &&
 
-	mkdir arch/i386/dir &&
-	>arch/i386/dir/file &&
-	test_must_fail git apply del_file.patch 2>error-wt-del &&
-	test_i18ngrep "beyond a symbolic link" error-wt-del &&
-	test_path_is_file arch/i386/dir/file &&
-	rm arch/i386/dir/file &&
+	test_must_fail test_terminal git am --reject </dev/zero &&
+	test_path_is_dir .git/rebase-apply &&
+	test_path_is_file file.rej
 
-	test_must_fail git apply --index add_file.patch 2>error-ix-add &&
-	test_i18ngrep "beyond a symbolic link" error-ix-add &&
-	test_path_is_missing arch/i386/dir/file &&
-	test_must_fail git ls-files --error-unmatch arch/i386/dir &&
+HEAD is now at 4f3810f side2
+Warning: you are leaving 2 commits behind, not connected to
+any of your branches:
 
-	test_must_fail git apply --cached add_file.patch 2>error-ct-file &&
-	test_i18ngrep "beyond a symbolic link" error-ct-file &&
-	test_must_fail git ls-files --error-unmatch arch/i386/dir
+  4f3810f side2
+  deca85c side1
 
-HEAD is now at 66a4bdc replay
-error: affected file 'arch/x86_64/dir/file' is beyond a symbolic link
-error: reading from 'arch/x86_64/dir/file' beyond a symbolic link
-error: affected file 'arch/x86_64/dir/file' is beyond a symbolic link
-error: pathspec 'arch/i386/dir' did not match any file(s) known to git
-Did you forget to 'git add'?
-error: affected file 'arch/x86_64/dir/file' is beyond a symbolic link
-error: pathspec 'arch/i386/dir' did not match any file(s) known to git
-Did you forget to 'git add'?
-ok 7 - do not follow symbolic link (existing)
+If you want to keep them by creating a new branch, this may be a good time
+to do so with:
 
-# passed all 7 test(s)
-1..7
+ 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' to see the failed patch
+Applying: side1
+Patch failed at 0001 side1
+When you have resolved this problem, run "git am --continue".
+If you prefer to skip this patch, run "git am --skip" instead.
+To restore the original branch and stop patching, run "git am --abort".
+Checking patch file...
+error: while searching for:
+initial
+
+error: patch failed: file:1
+Applying: side1
+Patch failed at 0001 side1
+When you have resolved this problem, run "git am --continue".
+If you prefer to skip this patch, run "git am --skip" instead.
+To restore the original branch and stop patching, run "git am --abort".
+Applying patch file with 1 reject...
+Rejected hunk #1.
+hint: Use 'git am --show-current-patch' to see the failed patch
+died of signal 15 at /build/git-2.20.1/t/test-terminal.perl line 35.
+ok 5 - --reject overrides --no-reject
+
+# passed all 5 test(s)
+1..5
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
 *** t4135-apply-weird-filenames.sh ***
@@ -125801,131 +126585,6 @@
 1..20
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t4139-apply-escape.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4139-apply-escape/.git/
-expecting success: 
-	mkdir inside &&
-	mv .git inside/ &&
-	cd inside
-
-ok 1 - bump git repo one level down
-
-expecting success: 
-	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: 
-	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: 
-	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: 
-	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: 
-	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: 
-	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: 
-	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" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
-	# test whether the filesystem supports symbolic links
-	ln -s x y && test -h y
-
-)
-prerequisite SYMLINKS ok
-expecting success: 
-	{
-		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: 
-	{
-		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: 
-	{
-		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: 
-	{
-		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/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
 *** t4201-shortlog.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4201-shortlog/.git/
 expecting success: 
@@ -126160,393 +126819,1877 @@
 1..15
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t4153-am-resume-override-opts.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4153-am-resume-override-opts/.git/
-expecting success: 
-	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
+*** t4206-log-follow-harder-copies.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4206-log-follow-harder-copies/.git/
+expecting success: git add path0 &&
+     git commit -m "Add path0"
+[master (root-commit) 3ef4815] 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.
 
-[master (root-commit) b6d2089] initial
+expecting success: git add path0 &&
+     git commit -m "Change path0"
+[master 0ea0e83] Change path0
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-[master 3aaf771] first
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+ok 2 - Change path0.
+
+expecting success: git add path1 &&
+     git commit -m "Copy path1 from path0"
+[master ac3b668] Copy path1 from path0
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Note: checking out 'initial'.
+ 1 file changed, 4 insertions(+)
+ create mode 100644 path1
+ok 3 - copy path0 to path1.
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by performing another checkout.
+expecting success: git log --follow --name-status --pretty="format:%s"  path1 > current
+ok 4 - find the copy path0 -> path1 harder
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
+expecting success: compare_diff_patch current expected
+ok 5 - validate the output.
 
-  git checkout -b <new-branch-name>
+# passed all 5 test(s)
+1..5
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t4151-am-abort.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4151-am-abort/.git/
+expecting success: 
+	for i in a b c d e f g
+	do
+		echo $i
+	done >file-1 &&
+	cp file-1 file-2 &&
+	test_tick &&
+	git add file-1 file-2 &&
+	git commit -m initial &&
+	git tag initial &&
+	git format-patch --stdout --root initial >initial.patch &&
+	for i in 2 3 4 5 6
+	do
+		echo $i >>file-1 &&
+		echo $i >otherfile-$i &&
+		git add otherfile-$i &&
+		test_tick &&
+		git commit -a -m $i || return 1
+	done &&
+	git format-patch --no-numbered initial &&
+	git checkout -b side initial &&
+	echo local change >file-2-expect
 
-HEAD is now at b6d2089 initial
-[detached HEAD 5e7fd8e] renamed-file
+[master (root-commit) 1732241] initial
  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
+ 2 files changed, 14 insertions(+)
+ create mode 100644 file-1
+ create mode 100644 file-2
+[master a485f10] 2
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[side 58bd40e] side2
+ 2 files changed, 2 insertions(+)
+ create mode 100644 otherfile-2
+[master b72e0d7] 3
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ 2 files changed, 2 insertions(+)
+ create mode 100644 otherfile-3
+[master f1dbda2] 4
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 otherfile-4
+[master 73a4960] 5
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 otherfile-5
+[master 87a053c] 6
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 otherfile-6
+0001-2.patch
+0002-3.patch
+0003-4.patch
+0004-5.patch
+0005-6.patch
+Switched to a new branch 'side'
 ok 1 - setup
 
-checking prerequisite: TTY
+expecting success: 
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
-	test_have_prereq PERL &&
+		git reset --hard initial &&
+		cp file-2-expect file-2 &&
 
-	# 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 &&
+		test_must_fail git am$with3 000[1245]-*.patch &&
+		git log --pretty=tformat:%s >actual &&
+		for i in 3 2 initial
+		do
+			echo $i
+		done >expect &&
+		test_cmp expect actual
+	
+HEAD is now at 1732241 initial
+error: patch failed: file-1:8
+error: file-1: patch does not apply
+hint: Use 'git am --show-current-patch' to see the failed patch
+Applying: 2
+Applying: 3
+Applying: 5
+Patch failed at 0003 5
+When you have resolved this problem, run "git am --continue".
+If you prefer to skip this patch, run "git am --skip" instead.
+To restore the original branch and stop patching, run "git am --abort".
+ok 2 - am stops at a patch that does not apply
 
-	perl "$TEST_DIRECTORY"/test-terminal.perl \
-		sh -c "test -t 1 && test -t 2"
+expecting success: 
+		test_must_fail git am$with3 --skip >output &&
+		test_i18ngrep "^Applying: 6$" output &&
+		test_cmp file-2-expect file-2 &&
+		test ! -f .git/MERGE_RR
+	
+error: patch failed: file-1:9
+error: file-1: patch does not apply
+hint: Use 'git am --show-current-patch' to see the failed patch
+Applying: 6
+ok 3 - am --skip continue after failed am
 
-)
-prerequisite TTY ok
 expecting success: 
-	rm -fr .git/rebase-apply &&
-	git reset --hard &&
-	git checkout renamed-file &&
+		git am --abort &&
+		git rev-parse HEAD >actual &&
+		git rev-parse initial >expect &&
+		test_cmp expect actual &&
+		test_cmp file-2-expect file-2 &&
+		git diff-index --exit-code --cached HEAD &&
+		test ! -f .git/MERGE_RR
+	
+ok 4 - am --abort goes back after failed am
 
-	# 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)" &&
+expecting success: 
 
-	# 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)"
+		git reset --hard initial &&
+		cp file-2-expect file-2 &&
 
-HEAD is now at 58bd40e side2
-Note: checking out 'renamed-file'.
+		test_must_fail git am$with3 000[1245]-*.patch &&
+		git log --pretty=tformat:%s >actual &&
+		for i in 3 2 initial
+		do
+			echo $i
+		done >expect &&
+		test_cmp expect actual
+	
+HEAD is now at 1732241 initial
+Applying: 2
+Applying: 3
+Applying: 5
+Using index info to reconstruct a base tree...
+M	file-1
+Falling back to patching base and 3-way merge...
+Merging:
+62dd7f8 3
+virtual 5
+found 1 common ancestor:
+virtual 2e4b8a989c579cac9d3cc1897320a3e27805d080
+Auto-merging file-1
+CONFLICT (content): Merge conflict in file-1
+error: Failed to merge in the changes.
+hint: Use 'git am --show-current-patch' to see the failed patch
+Patch failed at 0003 5
+When you have resolved this problem, run "git am --continue".
+If you prefer to skip this patch, run "git am --skip" instead.
+To restore the original branch and stop patching, run "git am --abort".
+ok 5 - am -3 stops at a patch that does not apply
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by performing another checkout.
+expecting success: 
+		test_must_fail git am$with3 --skip >output &&
+		test_i18ngrep "^Applying: 6$" output &&
+		test_cmp file-2-expect file-2 &&
+		test ! -f .git/MERGE_RR
+	
+error: Failed to merge in the changes.
+hint: Use 'git am --show-current-patch' to see the failed patch
+Applying: 6
+ok 6 - am -3 --skip continue after failed am -3
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
+expecting success: 
+		git am --abort &&
+		git rev-parse HEAD >actual &&
+		git rev-parse initial >expect &&
+		test_cmp expect actual &&
+		test_cmp file-2-expect file-2 &&
+		git diff-index --exit-code --cached HEAD &&
+		test ! -f .git/MERGE_RR
+	
+ok 7 - am --abort goes back after failed am -3
 
-  git checkout -b <new-branch-name>
+expecting success: 
+	git reset --hard initial &&
+	test_must_fail git am -3 0003-*.patch &&
+	test 3 -eq $(git ls-files -u | wc -l) &&
+	test 4 = "$(cat otherfile-4)" &&
+	git am --skip &&
+	test_cmp_rev initial HEAD &&
+	test -z "$(git ls-files -u)" &&
+	test_path_is_missing otherfile-4
 
-HEAD is now at 5e7fd8e renamed-file
-error: file: does not exist in index
+HEAD is now at 1732241 initial
+Applying: 4
+Using index info to reconstruct a base tree...
+M	file-1
+Falling back to patching base and 3-way merge...
+Merging:
+1732241 initial
+virtual 4
+found 1 common ancestor:
+virtual ca28a003e7272ffcb030f00a3e373a07e49ce912
+Auto-merging file-1
+CONFLICT (content): Merge conflict in file-1
+error: Failed to merge in the changes.
 hint: Use 'git am --show-current-patch' to see the failed patch
-Applying: side1
-Patch failed at 0001 side1
+Patch failed at 0001 4
 When you have resolved this problem, run "git am --continue".
 If you prefer to skip this patch, run "git am --skip" instead.
 To restore the original branch and stop patching, run "git am --abort".
-Applying: side1
+ok 8 - am -3 --skip removes otherfile-4
+
+expecting success: 
+	git reset --hard initial &&
+	test_must_fail git am -3 0003-*.patch &&
+	test 3 -eq $(git ls-files -u | wc -l) &&
+	test 4 = "$(cat otherfile-4)" &&
+	git am --abort &&
+	test_cmp_rev initial HEAD &&
+	test -z "$(git ls-files -u)" &&
+	test_path_is_missing otherfile-4
+
+HEAD is now at 1732241 initial
+Applying: 4
 Using index info to reconstruct a base tree...
-A	file
+M	file-1
 Falling back to patching base and 3-way merge...
 Merging:
-5e7fd8e renamed-file
-virtual side1
+1732241 initial
+virtual 4
 found 1 common ancestor:
-virtual 99f2e3e1cb15f9b52fa29f66d380dda061d917ab
-Applying: side2
-Patch failed at 0002 side2
+virtual ca28a003e7272ffcb030f00a3e373a07e49ce912
+Auto-merging file-1
+CONFLICT (content): Merge conflict in file-1
+error: Failed to merge in the changes.
+hint: Use 'git am --show-current-patch' to see the failed patch
+Patch failed at 0001 4
 When you have resolved this problem, run "git am --continue".
-error: file: does not exist in index
-hint: Use 'git am --show-current-patch' to see the failed patch
 If you prefer to skip this patch, run "git am --skip" instead.
 To restore the original branch and stop patching, run "git am --abort".
-died of signal 15 at /build/git-2.20.1/t/test-terminal.perl line 35.
-ok 2 - --3way overrides --no-3way
+ok 9 - am -3 --abort removes otherfile-4
 
 expecting success: 
-	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_i18ngrep ! "^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_i18ncmp expected out
+	test_must_fail git am 0004-*.patch &&
+	test_commit unrelated &&
+	git rev-parse HEAD >expect &&
+	git am --abort &&
+	git rev-parse HEAD >actual &&
+	test_cmp expect actual
 
-HEAD is now at 8e08c98 side1
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+error: patch failed: file-1:8
+error: file-1: patch does not apply
+hint: Use 'git am --show-current-patch' to see the failed patch
+Applying: 5
+Patch failed at 0001 5
+When you have resolved this problem, run "git am --continue".
+If you prefer to skip this patch, run "git am --skip" instead.
+To restore the original branch and stop patching, run "git am --abort".
+[side f386b22] unrelated
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 unrelated.t
+warning: You seem to have moved HEAD since the last 'am' failure.
+Not rewinding to ORIG_HEAD
+ok 10 - am --abort will keep the local commits intact
 
-  8e08c98 side1
+expecting success: 
+	git reset --hard initial &&
+	echo dirtyfile >dirtyfile &&
+	cp dirtyfile dirtyfile.expected &&
+	git add dirtyfile &&
+	test_must_fail git am 0001-*.patch &&
+	test_cmp_rev initial HEAD &&
+	test_path_is_file dirtyfile &&
+	test_cmp dirtyfile.expected dirtyfile &&
+	git am --abort &&
+	test_cmp_rev initial HEAD &&
+	test_path_is_file dirtyfile &&
+	test_cmp dirtyfile.expected dirtyfile
 
-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 1732241 initial
+fatal: Dirty index: cannot apply patches (dirty: dirtyfile)
+ok 11 - am --abort will keep dirty index intact
 
- git branch <new-branch-name> 8e08c98
+expecting success: 
+	git checkout -f --orphan orphan &&
+	git reset &&
+	rm -f otherfile-4 &&
+	test_must_fail git am -3 0003-*.patch &&
+	test 2 -eq $(git ls-files -u | wc -l) &&
+	test 4 = "$(cat otherfile-4)"
 
-HEAD is now at 3aaf771 first
-error: patch failed: file:1
-error: file: patch does not apply
+Switched to a new branch 'orphan'
+Applying: 4
+Using index info to reconstruct a base tree...
+A	file-1
+Falling back to patching base and 3-way merge...
+Merging:
+virtual HEAD
+virtual 4
+found 1 common ancestor:
+virtual ca28a003e7272ffcb030f00a3e373a07e49ce912
+CONFLICT (modify/delete): file-1 deleted in HEAD and modified in 4. Version 4 of file-1 left in tree at file-1~4.
+error: Failed to merge in the changes.
 hint: Use 'git am --show-current-patch' to see the failed patch
-ok 3 - --no-quiet overrides --quiet
+Patch failed at 0001 4
+When you have resolved this problem, run "git am --continue".
+If you prefer to skip this patch, run "git am --skip" instead.
+To restore the original branch and stop patching, run "git am --abort".
+ok 12 - am -3 stops on conflict on unborn branch
 
 expecting success: 
-	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
+	echo tmpfile >tmpfile &&
+	git add tmpfile &&
+	git am --skip &&
+	test -z "$(git ls-files)" &&
+	test_path_is_missing otherfile-4 &&
+	test_path_is_missing tmpfile
 
-If you want to keep them by creating a new branch, this may be a good time
-to do so with:
+ok 13 - am -3 --skip clears index on unborn branch
 
- git branch <new-branch-name> 1d25943
+expecting success: 
+	git checkout -f --orphan orphan &&
+	git reset &&
+	rm -f otherfile-4 file-1 &&
+	test_must_fail git am -3 0003-*.patch &&
+	test 2 -eq $(git ls-files -u | wc -l) &&
+	test 4 = "$(cat otherfile-4)" &&
+	git am --abort &&
+	test -z "$(git ls-files -u)" &&
+	test_path_is_missing otherfile-4
 
-HEAD is now at 3aaf771 first
-error: patch failed: file:1
-error: file: patch does not apply
+Switched to a new branch 'orphan'
+Applying: 4
+Using index info to reconstruct a base tree...
+A	file-1
+Falling back to patching base and 3-way merge...
+Merging:
+virtual HEAD
+virtual 4
+found 1 common ancestor:
+virtual ca28a003e7272ffcb030f00a3e373a07e49ce912
+CONFLICT (modify/delete): file-1 deleted in HEAD and modified in 4. Version 4 of file-1 left in tree.
+error: Failed to merge in the changes.
 hint: Use 'git am --show-current-patch' to see the failed patch
-Applying: side1
-Patch failed at 0001 side1
+Patch failed at 0001 4
 When you have resolved this problem, run "git am --continue".
 If you prefer to skip this patch, run "git am --skip" instead.
 To restore the original branch and stop patching, run "git am --abort".
-Applying: side1
-Applying: side2
-ok 4 - --signoff overrides --no-signoff
+ok 14 - am -3 --abort removes otherfile-4 on unborn branch
 
 expecting success: 
-	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
+	git checkout -f --orphan orphan &&
+	git reset &&
+	rm -f otherfile-4 otherfile-2 file-1 file-2 &&
+	test_must_fail git am -3 initial.patch 0003-*.patch &&
+	test 3 -eq $(git ls-files -u | wc -l) &&
+	test 4 = "$(cat otherfile-4)" &&
+	git am --abort &&
+	test -z "$(git ls-files -u)" &&
+	test_path_is_missing otherfile-4 &&
+	test_path_is_missing file-1 &&
+	test_path_is_missing file-2 &&
+	test 0 -eq $(git log --oneline 2>/dev/null | wc -l) &&
+	test refs/heads/orphan = "$(git symbolic-ref HEAD)"
 
-HEAD is now at 4f3810f side2
-Warning: you are leaving 2 commits behind, not connected to
-any of your branches:
+Switched to a new branch 'orphan'
+applying to an empty history
+Applying: initial
+Applying: 4
+Using index info to reconstruct a base tree...
+M	file-1
+Falling back to patching base and 3-way merge...
+Merging:
+03bb45f initial
+virtual 4
+found 1 common ancestor:
+virtual ca28a003e7272ffcb030f00a3e373a07e49ce912
+Auto-merging file-1
+CONFLICT (content): Merge conflict in file-1
+error: Failed to merge in the changes.
+hint: Use 'git am --show-current-patch' to see the failed patch
+Patch failed at 0002 4
+When you have resolved this problem, run "git am --continue".
+If you prefer to skip this patch, run "git am --skip" instead.
+To restore the original branch and stop patching, run "git am --abort".
+ok 15 - am -3 --abort on unborn branch removes applied commits
 
-  4f3810f side2
-  deca85c side1
+expecting success: 
+	git checkout -f --orphan orphan &&
+	git reset &&
+	test_must_fail git am 0004-*.patch &&
+	test_commit unrelated2 &&
+	git rev-parse HEAD >expect &&
+	git am --abort &&
+	git rev-parse HEAD >actual &&
+	test_cmp expect actual
 
-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 'orphan'
+error: file-1: does not exist in index
+hint: Use 'git am --show-current-patch' to see the failed patch
+Applying: 5
+Patch failed at 0001 5
+When you have resolved this problem, run "git am --continue".
+If you prefer to skip this patch, run "git am --skip" instead.
+To restore the original branch and stop patching, run "git am --abort".
+[orphan (root-commit) 823805c] unrelated2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 unrelated2.t
+warning: You seem to have moved HEAD since the last 'am' failure.
+Not rewinding to ORIG_HEAD
+ok 16 - am --abort on unborn branch will keep local commits intact
 
- git branch <new-branch-name> 4f3810f
+expecting success: 
+	git checkout -f --orphan skip-stat-info &&
+	git reset &&
+	test_commit skip-should-be-untouched &&
+	test-tool chmtime =0 skip-should-be-untouched.t &&
+	git update-index --refresh &&
+	git diff-files --exit-code --quiet &&
+	test_must_fail git am 0001-*.patch &&
+	git am --skip &&
+	git diff-files --exit-code --quiet
 
-HEAD is now at 3aaf771 first
-error: patch failed: file:1
-error: file: patch does not apply
+Switched to a new branch 'skip-stat-info'
+[skip-stat-info (root-commit) 2297a89] skip-should-be-untouched
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 skip-should-be-untouched.t
+error: file-1: does not exist in index
 hint: Use 'git am --show-current-patch' to see the failed patch
-Applying: side1
-Patch failed at 0001 side1
+Applying: 2
+Patch failed at 0001 2
 When you have resolved this problem, run "git am --continue".
 If you prefer to skip this patch, run "git am --skip" instead.
 To restore the original branch and stop patching, run "git am --abort".
-Applying: side1
-Checking patch file...
-error: while searching for:
-initial
+ok 17 - am --skip leaves index stat info alone
 
-error: patch failed: file:1
-Applying patch file with 1 reject...
-Rejected hunk #1.
-Patch failed at 0001 side1
+expecting success: 
+	git checkout -f --orphan abort-stat-info &&
+	git reset &&
+	test_commit abort-should-be-untouched &&
+	test-tool chmtime =0 abort-should-be-untouched.t &&
+	git update-index --refresh &&
+	git diff-files --exit-code --quiet &&
+	test_must_fail git am 0001-*.patch &&
+	git am --abort &&
+	git diff-files --exit-code --quiet
+
+Switched to a new branch 'abort-stat-info'
+[abort-stat-info (root-commit) 3038985] abort-should-be-untouched
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 abort-should-be-untouched.t
+error: file-1: does not exist in index
+hint: Use 'git am --show-current-patch' to see the failed patch
+Applying: 2
+Patch failed at 0001 2
 When you have resolved this problem, run "git am --continue".
 If you prefer to skip this patch, run "git am --skip" instead.
 To restore the original branch and stop patching, run "git am --abort".
-hint: Use 'git am --show-current-patch' to see the failed patch
-died of signal 15 at /build/git-2.20.1/t/test-terminal.perl line 35.
-ok 5 - --reject overrides --no-reject
+ok 18 - am --abort leaves index stat info alone
 
-# passed all 5 test(s)
-1..5
+# passed all 18 test(s)
+1..18
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t4152-am-subjects.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4152-am-subjects/.git/
+*** t4207-log-decoration-colors.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4207-log-decoration-colors/.git/
 expecting success: 
-	test_commit baseline file
+	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.HEAD cyan &&
 
-[master (root-commit) 2f64c43] baseline
+	c_reset="<RESET>" &&
+
+	c_commit="<YELLOW>" &&
+	c_branch="<GREEN>" &&
+	c_remoteBranch="<RED>" &&
+	c_tag="<BOLD;REVERSE;YELLOW>" &&
+	c_stash="<MAGENTA>" &&
+	c_HEAD="<CYAN>" &&
+
+	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
+
+[master (root-commit) 0ddfaf1] A
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 file
-ok 1 - setup baseline commit
-
-expecting success: 
-		git reset --hard baseline &&
-		echo $type >file &&
-		git commit -a -m "$subject" &&
-		git format-patch -1 --stdout >$type.patch &&
-		git format-patch -1 --stdout -k >$type-k.patch
-	
-HEAD is now at 2f64c43 baseline
-[master 5d59063] short subject
+ create mode 100644 A.t
+Cloning into 'other'...
+done.
+[master ca6ed14] A1
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 2 - create patches with short subject
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A1.t
+Updating other
+From ./other
+ * [new branch]      master     -> other/master
+ * [new tag]         A1         -> A1
+[master 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 master: Changes to A.t
+ok 1 - setup
 
 expecting success: 
-		git reset --hard baseline &&
-		echo $type >file &&
-		git commit -a -m "$subject" &&
-		git format-patch -1 --stdout >$type.patch &&
-		git format-patch -1 --stdout -k >$type-k.patch
-	
-HEAD is now at 2f64c43 baseline
-[master 512ba33] this is a long subject that is virtually guaranteed to require wrapping via format-patch if it is all going to appear on a single line
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 3 - create patches with long subject
+	git log --first-parent --abbrev=10 --all --decorate --oneline --color=always |
+	sed "s/[0-9a-f]\{10,10\}/COMMIT_ID/" |
+	test_decode_color >out &&
+	test_cmp expected out
+
+ok 2 - Commit Decorations Colored Correctly
 
+# passed all 2 test(s)
+1..2
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t4203-mailmap.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4203-mailmap/.git/
 expecting success: 
-		git reset --hard baseline &&
-		echo $type >file &&
-		git commit -a -m "$subject" &&
-		git format-patch -1 --stdout >$type.patch &&
-		git format-patch -1 --stdout -k >$type-k.patch
-	
-HEAD is now at 2f64c43 baseline
-[master 230e818] this is a long subject that is virtually guaranteed to require wrapping via format-patch if it is all going to appear on a single line
+	cat >contacts <<-\EOF &&
+	A U Thor <author@example.com>
+	nick1 <bugs@company.xx>
+	EOF
+
+	echo one >one &&
+	git add one &&
+	test_tick &&
+	git commit -m initial &&
+	echo two >>one &&
+	git add one &&
+	test_tick &&
+	git commit --author "nick1 <bugs@company.xx>" -m second
+
+[master (root-commit) 3a2fdcb] initial
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 4 - create patches with multiline subject
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one
+[master e0f6049] second
+ Author: nick1 <bugs@company.xx>
+ 1 file changed, 1 insertion(+)
+ok 1 - setup
 
 expecting success: 
-	check_subject short
+	test_must_fail git check-mailmap
 
-HEAD is now at 2f64c43 baseline
-Applying: short subject
-ok 5 - short subject preserved (format-patch | am)
+fatal: no contacts specified
+ok 2 - check-mailmap no arguments
 
 expecting success: 
-	check_subject short-k
+	cat >expect <<-\EOF &&
+	A U Thor <author@example.com>
+	nick1 <bugs@company.xx>
+	EOF
+	git check-mailmap \
+		"A U Thor <author@example.com>" \
+		"nick1 <bugs@company.xx>" >actual &&
+	test_cmp expect actual
 
-HEAD is now at 2f64c43 baseline
-Applying: short subject
-ok 6 - short subject preserved (format-patch -k | am)
+ok 3 - check-mailmap arguments
 
 expecting success: 
-	check_subject short-k -k
+	cat >expect <<-\EOF &&
+	A U Thor <author@example.com>
+	nick1 <bugs@company.xx>
+	EOF
+	git check-mailmap --stdin <contacts >actual &&
+	test_cmp expect actual
 
-HEAD is now at 2f64c43 baseline
-Applying: short subject
-ok 7 - short subject preserved (format-patch -k | am -k)
+ok 4 - check-mailmap --stdin
 
 expecting success: 
-	check_subject long
+	cat >expect <<-\EOF &&
+	Internal Guy <bugs@company.xy>
+	EOF
+	cat <contacts >>expect &&
+	git check-mailmap --stdin "Internal Guy <bugs@company.xy>" \
+		<contacts >actual &&
+	test_cmp expect actual
 
-HEAD is now at 2f64c43 baseline
-Applying: this is a long subject that is virtually guaranteed to require wrapping via format-patch if it is all going to appear on a single line
-ok 8 - long subject preserved (format-patch | am)
+ok 5 - check-mailmap --stdin arguments
 
 expecting success: 
-	check_subject long-k
+	test_must_fail git check-mailmap bogus
 
-HEAD is now at 2f64c43 baseline
-Applying: this is a long subject that is virtually guaranteed to require wrapping via format-patch if it is all going to appear on a single line
-ok 9 - long subject preserved (format-patch -k | am)
+fatal: unable to parse contact: bogus
+ok 6 - check-mailmap bogus contact
 
 expecting success: 
-	check_subject long-k -k
+	git shortlog HEAD >actual &&
+	test_cmp expect actual
 
-HEAD is now at 2f64c43 baseline
-Applying: this is a long subject that is virtually guaranteed to require wrapping via format-patch if it is all going to appear on a single line
-ok 10 - long subject preserved (format-patch -k | am -k)
+ok 7 - No mailmap
 
 expecting success: 
-	check_subject multiline
+	echo "Repo Guy <author@example.com>" > .mailmap &&
+	git shortlog HEAD >actual &&
+	test_cmp expect actual
 
-HEAD is now at 2f64c43 baseline
-Applying: this is a long subject that is virtually guaranteed to require wrapping via format-patch if it is all going to appear on a single line
-ok 11 - multiline subject unwrapped (format-patch | am)
+ok 8 - default .mailmap
 
 expecting success: 
-	check_subject multiline-k
+	mkdir -p internal_mailmap &&
+	echo "Internal Guy <bugs@company.xx>" > internal_mailmap/.mailmap &&
+	git config mailmap.file internal_mailmap/.mailmap &&
+	git shortlog HEAD >actual &&
+	test_cmp expect actual
 
-HEAD is now at 2f64c43 baseline
-Applying: this is a long subject that is virtually guaranteed to require wrapping via format-patch if it is all going to appear on a single line
-ok 12 - multiline subject unwrapped (format-patch -k | am)
+ok 9 - mailmap.file set
 
 expecting success: 
-	check_subject multiline-k -k
+	echo "External Guy <author@example.com>" >> internal_mailmap/.mailmap &&
+	git config mailmap.file internal_mailmap/.mailmap &&
+	git shortlog HEAD >actual &&
+	test_cmp expect actual
 
-HEAD is now at 2f64c43 baseline
-Applying: this is a long subject that is virtually guaranteed
-ok 13 - multiline subject preserved (format-patch -k | am -k)
+ok 10 - mailmap.file override
 
-# passed all 13 test(s)
-1..13
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
+expecting success: 
+	rm internal_mailmap/.mailmap &&
+	rmdir internal_mailmap &&
+	git shortlog HEAD >actual &&
+	test_cmp expect actual
+
+ok 11 - mailmap.file non-existent
+
+expecting success: 
+	mkdir -p internal_mailmap &&
+	echo "<bugs@company.xy> <bugs@company.xx>" >internal_mailmap/.mailmap &&
+	echo "Internal Guy <bugs@company.xx>" >>internal_mailmap/.mailmap &&
+	git shortlog HEAD >actual &&
+	test_cmp expect actual
+
+ok 12 - name entry after email entry
+
+expecting success: 
+	mkdir -p internal_mailmap &&
+	echo "<bugs@company.xy> <bugs@company.xx>" >internal_mailmap/.mailmap &&
+	echo "Internal Guy <BUGS@Company.xx>" >>internal_mailmap/.mailmap &&
+	git shortlog HEAD >actual &&
+	test_cmp expect actual
+
+ok 13 - name entry after email entry, case-insensitive
+
+expecting success: 
+	rm -f .mailmap internal_mailmap/.mailmap &&
+	git shortlog HEAD >actual &&
+	test_cmp expect actual
+
+ok 14 - No mailmap files, but configured
+
+expecting success: 
+	git checkout -b map &&
+	test_when_finished "git checkout master" &&
+	cat >just-bugs <<-\EOF &&
+	Blob Guy <bugs@company.xx>
+	EOF
+	cat >both <<-\EOF &&
+	Blob Guy <author@example.com>
+	Blob Guy <bugs@company.xx>
+	EOF
+	printf "Tricky Guy <author@example.com>" >no-newline &&
+	git add just-bugs both no-newline &&
+	git commit -m "my mailmaps" &&
+	echo "Repo Guy <author@example.com>" >.mailmap &&
+	echo "Internal Guy <author@example.com>" >internal.map
+
+Switched to a new branch 'map'
+[map d53f9b1] my mailmaps
+ Author: A U Thor <author@example.com>
+ 3 files changed, 4 insertions(+)
+ create mode 100644 both
+ create mode 100644 just-bugs
+ create mode 100644 no-newline
+Switched to branch 'master'
+ok 15 - setup mailmap blob tests
+
+expecting success: 
+	cat >expect <<-\EOF &&
+	Blob Guy (1):
+	      second
+
+	Repo Guy (1):
+	      initial
+
+	EOF
+	git -c mailmap.blob=map:just-bugs shortlog HEAD >actual &&
+	test_cmp expect actual
+
+ok 16 - mailmap.blob set
+
+expecting success: 
+	cat >expect <<-\EOF &&
+	Blob Guy (2):
+	      initial
+	      second
+
+	EOF
+	git -c mailmap.blob=map:both shortlog HEAD >actual &&
+	test_cmp expect actual
+
+ok 17 - mailmap.blob overrides .mailmap
+
+expecting success: 
+	cat >expect <<-\EOF &&
+	Blob Guy (1):
+	      second
+
+	Internal Guy (1):
+	      initial
+
+	EOF
+	git \
+	  -c mailmap.blob=map:both \
+	  -c mailmap.file=internal.map \
+	  shortlog HEAD >actual &&
+	test_cmp expect actual
+
+ok 18 - mailmap.file overrides mailmap.blob
+
+expecting success: 
+	cat >expect <<-\EOF &&
+	Repo Guy (1):
+	      initial
+
+	nick1 (1):
+	      second
+
+	EOF
+	git -c mailmap.blob=map:nonexistent shortlog HEAD >actual &&
+	test_cmp expect actual
+
+ok 19 - mailmap.blob can be missing
+
+expecting success: 
+	git init non-bare &&
+	(
+		cd non-bare &&
+		test_commit one .mailmap "Fake Name <author@example.com>" &&
+		echo "     1	Fake Name" >expect &&
+		git shortlog -ns HEAD >actual &&
+		test_cmp expect actual &&
+		rm .mailmap &&
+		echo "     1	A U Thor" >expect &&
+		git shortlog -ns HEAD >actual &&
+		test_cmp expect actual
+	)
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4203-mailmap/non-bare/.git/
+[master (root-commit) c736a92] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 .mailmap
+ok 20 - mailmap.blob defaults to off in non-bare repo
+
+expecting success: 
+	git clone --bare non-bare bare &&
+	(
+		cd bare &&
+		echo "     1	Fake Name" >expect &&
+		git shortlog -ns HEAD >actual &&
+		test_cmp expect actual
+	)
+
+Cloning into bare repository 'bare'...
+done.
+ok 21 - mailmap.blob defaults to HEAD:.mailmap in bare repo
+
+expecting success: 
+	cat >expect <<-\EOF &&
+	Tricky Guy (1):
+	      initial
+
+	nick1 (1):
+	      second
+
+	EOF
+	git -c mailmap.blob=map:no-newline shortlog HEAD >actual &&
+	test_cmp expect actual
+
+ok 22 - mailmap.blob can handle blobs without trailing newline
+
+expecting success: 
+	rm -f .mailmap
+
+ok 23 - cleanup after mailmap.blob tests
+
+expecting success: 
+	echo "     1	A <author@example.com>" >expect &&
+	echo "     1	nick1 <bugs@company.xx>" >>expect &&
+	echo "A <author@example.com>" >.mailmap &&
+	test_when_finished "rm .mailmap" &&
+	git shortlog -es HEAD >actual &&
+	test_cmp expect actual
+
+ok 24 - single-character name
+
+expecting success: 
+	echo "     1	A U Thor <AUTHOR@example.com>" >expect &&
+	echo "     1	nick1 <bugs@company.xx>" >>expect &&
+	echo "<AUTHOR@example.com> <author@example.com>" >.mailmap &&
+	test_when_finished "rm .mailmap" &&
+	git shortlog -es HEAD >actual &&
+	test_cmp expect actual
+
+ok 25 - preserve canonical email case
+
+expecting success: 
+	echo three >>one &&
+	git add one &&
+	test_tick &&
+	git commit --author "nick2 <bugs@company.xx>" -m third &&
+
+	echo four >>one &&
+	git add one &&
+	test_tick &&
+	git commit --author "nick2 <nick2@company.xx>" -m fourth &&
+
+	echo five >>one &&
+	git add one &&
+	test_tick &&
+	git commit --author "santa <me@company.xx>" -m fifth &&
+
+	echo six >>one &&
+	git add one &&
+	test_tick &&
+	git commit --author "claus <me@company.xx>" -m sixth &&
+
+	echo seven >>one &&
+	git add one &&
+	test_tick &&
+	git commit --author "CTO <cto@coompany.xx>" -m seventh &&
+
+	mkdir -p internal_mailmap &&
+	echo "Committed <committer@example.com>" > internal_mailmap/.mailmap &&
+	echo "<cto@company.xx>                       <cto@coompany.xx>" >> internal_mailmap/.mailmap &&
+	echo "Some Dude <some@dude.xx>         nick1 <bugs@company.xx>" >> internal_mailmap/.mailmap &&
+	echo "Other Author <other@author.xx>   nick2 <bugs@company.xx>" >> internal_mailmap/.mailmap &&
+	echo "Other Author <other@author.xx>         <nick2@company.xx>" >> internal_mailmap/.mailmap &&
+	echo "Santa Claus <santa.claus@northpole.xx> <me@company.xx>" >> internal_mailmap/.mailmap &&
+	echo "Santa Claus <santa.claus@northpole.xx> <me@company.xx>" >> internal_mailmap/.mailmap &&
+
+	git shortlog -e HEAD >actual &&
+	test_cmp expect actual
+
+
+[master 4db1a3d] third
+ Author: nick2 <bugs@company.xx>
+ 1 file changed, 1 insertion(+)
+[master e371838] fourth
+ Author: nick2 <nick2@company.xx>
+ 1 file changed, 1 insertion(+)
+[master 25e4bf3] fifth
+ Author: santa <me@company.xx>
+ 1 file changed, 1 insertion(+)
+[master 17c3971] sixth
+ Author: claus <me@company.xx>
+ 1 file changed, 1 insertion(+)
+[master f399f22] seventh
+ Author: CTO <cto@coompany.xx>
+ 1 file changed, 1 insertion(+)
+ok 26 - Shortlog output (complex mapping)
+
+expecting success: 
+	git log --pretty=format:"Author %an <%ae> maps to %aN <%aE>%nCommitter %cn <%ce> maps to %cN <%cE>%n" >actual &&
+	test_cmp expect actual
+
+ok 27 - Log output (complex mapping)
+
+expecting success: 
+	git log --use-mailmap | grep Author >actual &&
+	test_cmp expect actual
+
+ok 28 - Log output with --use-mailmap
+
+expecting success: 
+	git -c log.mailmap=True log | grep Author >actual &&
+	test_cmp expect actual
+
+ok 29 - Log output with log.mailmap
+
+expecting success: 
+	git log --use-mailmap --author Santa | grep Author >actual &&
+	test_cmp expect actual
+
+ok 30 - Grep author with --use-mailmap
+
+expecting success: 
+	git -c log.mailmap=True log --author Santa | grep Author >actual &&
+	test_cmp expect actual
+
+ok 31 - Grep author with log.mailmap
+
+expecting success: 
+	git log --use-mailmap --author "<cto@coompany.xx>" >actual &&
+	test_must_be_empty actual
+
+ok 32 - Only grep replaced author with --use-mailmap
+
+expecting success: 
+	git blame one >actual &&
+	fuzz_blame actual >actual.fuzz &&
+	test_cmp expect actual.fuzz
+
+ok 33 - Blame output (complex mapping)
+
+expecting success: 
+	test_must_fail git commit --author "nick" --allow-empty -meight &&
+	git commit --author "Some Dude" --allow-empty -meight &&
+	git show --pretty=format:"%an <%ae>%n" >actual &&
+	test_cmp expect actual
+
+fatal: --author 'nick' is not 'Name <email>' and matches no existing author
+[master 41e4fcf] eight
+ Author: Some Dude <some@dude.xx>
+ok 34 - commit --author honors mailmap
+
+# passed all 34 test(s)
+1..34
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t4210-log-i18n.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4210-log-i18n/.git/
+expecting success: 
+	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: 
+	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: 
+	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: 
+	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: 
+	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)
+
+# passed all 5 test(s)
+1..5
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t4204-patch-id.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4204-patch-id/.git/
+expecting success: 
+	as="a a a a a a a a" && # eight a
+	test_write_lines $as >foo &&
+	test_write_lines $as >bar &&
+	git add foo bar &&
+	git commit -a -m initial &&
+	test_write_lines $as b >foo &&
+	test_write_lines $as b >bar &&
+	git commit -a -m first &&
+	git checkout -b same master &&
+	git commit --amend -m same-msg &&
+	git checkout -b notsame master &&
+	echo c >foo &&
+	echo c >bar &&
+	git commit --amend -a -m notsame-msg &&
+	test_write_lines bar foo >bar-then-foo &&
+	test_write_lines foo bar >foo-then-bar
+
+[master (root-commit) b3ca738] initial
+ Author: A U Thor <author@example.com>
+ 2 files changed, 16 insertions(+)
+ create mode 100644 bar
+ create mode 100644 foo
+[master 650fdd8] first
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+Switched to a new branch 'same'
+[same 33a8dfe] same-msg
+ Author: A U Thor <author@example.com>
+ Date: Thu Jan 5 11:48:49 2023 +0000
+ 2 files changed, 2 insertions(+)
+Switched to a new branch 'notsame'
+[notsame 5c73ddd] notsame-msg
+ Author: A U Thor <author@example.com>
+ Date: Thu Jan 5 11:48:49 2023 +0000
+ 2 files changed, 2 insertions(+), 16 deletions(-)
+ok 1 - setup
+
+expecting success: 
+	git log -p -1 | git patch-id >output &&
+	grep "^[a-f0-9]\{40\} $(git rev-parse HEAD)$" output
+
+f107563c3b906af306765d78fce3e3a7e121cb5d 5c73dddca820700d70160da38893fd3ace47a0c7
+ok 2 - patch-id output is well-formed
+
+expecting success: 
+	get_patch_id master &&
+	get_patch_id same &&
+	test_cmp patch-id_master patch-id_same
+
+ok 3 - patch-id detects equality
+
+expecting success: 
+	get_patch_id master &&
+	get_patch_id notsame &&
+	! test_cmp patch-id_master patch-id_notsame
+
+--- patch-id_master	2023-01-05 11:48:49.786868030 +0000
++++ patch-id_notsame	2023-01-05 11:48:49.830868030 +0000
+@@ -1 +1 @@
+-5d64663409e35f10b786d5942856240338437436
++f107563c3b906af306765d78fce3e3a7e121cb5d
+ok 4 - patch-id detects inequality
+
+expecting success: 
+	get_patch_id master &&
+	git checkout same &&
+	git format-patch -1 --stdout | calc_patch_id same &&
+	test_cmp patch-id_master patch-id_same &&
+	set $(git format-patch -1 --stdout | git patch-id) &&
+	test "$2" = $(git rev-parse HEAD)
+
+Switched to branch 'same'
+ok 5 - patch-id supports git-format-patch output
+
+expecting success: 
+	get_patch_id master &&
+	git checkout same &&
+	git format-patch -1 --stdout | sed "s/ \$//" | calc_patch_id same &&
+	test_cmp patch-id_master patch-id_same
+
+Already on 'same'
+ok 6 - whitespace is irrelevant in footer
+
+expecting success: 
+	test_patch_id_file_order irrelevant --stable --stable
+
+Already on 'same'
+ok 7 - file order is irrelevant with --stable
+
+expecting success: 
+	test_patch_id_file_order relevant --unstable --unstable
+
+Already on 'same'
+--- patch-id_order---unstable-relevant	2023-01-05 11:48:50.250868030 +0000
++++ patch-id_ordered-order---unstable-relevant	2023-01-05 11:48:50.298868030 +0000
+@@ -1 +1 @@
+-5d64663409e35f10b786d5942856240338437436
++cdb26c63dc1ab08a93181ff3446560b20801f812
+ok 8 - file order is relevant with --unstable
+
+expecting success: 
+	test_patch_id relevant default
+
+Already on 'same'
+--- patch-id_order-default-relevant	2023-01-05 11:48:50.354868030 +0000
++++ patch-id_ordered-order-default-relevant	2023-01-05 11:48:50.394868030 +0000
+@@ -1 +1 @@
+-5d64663409e35f10b786d5942856240338437436
++cdb26c63dc1ab08a93181ff3446560b20801f812
+ok 9 - default is unstable
+
+expecting success: 
+	test_config patchid.stable true &&
+	test_patch_id irrelevant patchid.stable=true
+
+Already on 'same'
+ok 10 - patchid.stable = true is stable
+
+expecting success: 
+	test_config patchid.stable false &&
+	test_patch_id relevant patchid.stable=false
+
+Already on 'same'
+--- patch-id_order-patchid.stable=false-relevant	2023-01-05 11:48:50.610868030 +0000
++++ patch-id_ordered-order-patchid.stable=false-relevant	2023-01-05 11:48:50.650868030 +0000
+@@ -1 +1 @@
+-5d64663409e35f10b786d5942856240338437436
++cdb26c63dc1ab08a93181ff3446560b20801f812
+ok 11 - patchid.stable = false is unstable
+
+expecting success: 
+	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	2023-01-05 11:48:50.746868030 +0000
++++ patch-id_ordered-order-patchid.stable=true--unstable-relevant	2023-01-05 11:48:50.790868030 +0000
+@@ -1 +1 @@
+-5d64663409e35f10b786d5942856240338437436
++cdb26c63dc1ab08a93181ff3446560b20801f812
+ok 12 - --unstable overrides patchid.stable = true
+
+expecting success: 
+	test_config patchid.stable false &&
+	test_patch_id irrelevant patchid.stable=false--stable --stable
+
+Already on 'same'
+ok 13 - --stable overrides patchid.stable = false
+
+expecting success: 
+	get_patch_id master &&
+	git checkout same &&
+	git format-patch -1 --attach --stdout | calc_patch_id same &&
+	test_cmp patch-id_master patch-id_same
+
+Already on 'same'
+ok 14 - patch-id supports git-format-patch MIME output
+
+expecting success: 
+	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 15 - patch-id respects config from subdir
+
+expecting success: 
+	cat nonl | calc_patch_id nonl &&
+	cat withnl | calc_patch_id withnl &&
+	test_cmp patch-id_nonl patch-id_withnl
+
+ok 16 - patch-id handles no-nl-at-eof markers
+
+# passed all 16 test(s)
+1..16
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t4208-log-magic-pathspec.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4208-log-magic-pathspec/.git/
+expecting success: 
+	test_commit initial &&
+	test_tick &&
+	git commit --allow-empty -m empty &&
+	mkdir sub
+
+[master (root-commit) 24b24cf] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+[master 41d179c] empty
+ Author: A U Thor <author@example.com>
+ok 1 - setup
+
+expecting success: 
+	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: 
+	: >a &&
+	test_must_fail git log :/a 2>error &&
+	test_i18ngrep 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: 
+	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: 
+	test_when_finished "git checkout master" &&
+	git checkout --detach &&
+	# Must manually call `test_tick` instead of using `test_commit`,
+	# because the latter additionally creates a tag, which would make
+	# the commit reachable not only via HEAD.
+	test_tick &&
+	git commit --allow-empty -m detached &&
+	test_tick &&
+	git commit --allow-empty -m something-else &&
+	git log :/detached --
+
+HEAD is now at 41d179c empty
+[detached HEAD 29f803f] detached
+ Author: A U Thor <author@example.com>
+[detached HEAD 1c7309e] something-else
+ Author: A U Thor <author@example.com>
+commit 29f803fa5dd3286073a333650848a30b4d2166d5
+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:
+
+  1c7309e something-else
+  29f803f 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> 1c7309e
+
+Switched to branch 'master'
+ok 5 - "git log :/detached -- " should find a commit only in HEAD
+
+expecting success: 
+	test_must_fail git log :/detached --
+
+fatal: bad revision ':/detached'
+ok 6 - "git log :/detached -- " should not find an orphaned commit
+
+expecting success: 
+	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: 
+	git log -- :/a
+
+ok 8 - "git log -- :/a" should not be ambiguous
+
+expecting success: 
+	git log :/in
+
+commit 24b24cf8a829f5b8c30dfc018b0a459a2ccaf380
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:13:13 2005 -0700
+
+    initial
+ok 9 - "git log :/in" should not be ambiguous
+
+expecting success: 
+	test_must_fail git log : 2>error &&
+	test_i18ngrep ambiguous error
+
+fatal: ambiguous argument ':': unknown revision or path not in the working tree.
+ok 10 - "git log :" should be ambiguous
+
+expecting success: 
+	git log -- :
+
+commit 24b24cf8a829f5b8c30dfc018b0a459a2ccaf380
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:13:13 2005 -0700
+
+    initial
+ok 11 - git log -- :
+
+expecting success: 
+	initial=$(git rev-parse --short HEAD^) &&
+	cat >expected <<-EOF &&
+	$initial initial
+	EOF
+	(cd sub && git log --oneline HEAD -- :/ >../actual) &&
+	test_cmp expected actual
+
+ok 12 - git log HEAD -- :/
+
+expecting success: 
+	git log :^sub
+
+commit 24b24cf8a829f5b8c30dfc018b0a459a2ccaf380
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:13:13 2005 -0700
+
+    initial
+ok 13 - "git log :^sub" is not ambiguous
+
+expecting success: 
+	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 14 - "git log :^does-not-exist" does not match anything
+
+expecting success: 
+	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 15 - "git log :!" behaves the same as :^
+
+expecting success: 
+	git log ":(exclude)sub"
+
+commit 24b24cf8a829f5b8c30dfc018b0a459a2ccaf380
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:13:13 2005 -0700
+
+    initial
+ok 16 - "git log :(exclude)sub" is not ambiguous
+
+expecting success: 
+	test_must_fail git log ":(exclude)sub" --
+
+fatal: bad revision ':(exclude)sub'
+ok 17 - "git log :(exclude)sub --" must resolve as an object
+
+expecting success: 
+	test_must_fail git log ":(unknown-magic)" 2>error &&
+	test_i18ngrep pathspec.magic error
+
+fatal: Invalid pathspec magic 'unknown-magic' in ':(unknown-magic)'
+ok 18 - "git log :(unknown-magic) complains of bogus magic
+
+expecting success: 
+	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 master &&
+	git add a &&
+	git log --merge -- a
+
+HEAD is now at 41d179c empty
+[master 520c03e] add an empty a
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 a
+[master 35b719c] update a to 1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Note: checking out '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 performing another checkout.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -b with the checkout command again. Example:
+
+  git checkout -b <new-branch-name>
+
+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(+)
+Merging:
+61d8fe9 update a to 2
+virtual master
+found 1 common ancestor:
+520c03e add an empty a
+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 19 - command line pathspec parsing for "git log"
+
+expecting success: 
+	test_when_finished "rm -rf repo submodule" &&
+	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/git-2.20.1/t/trash directory.t4208-log-magic-pathspec/submodule/.git/
+[master (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/git-2.20.1/t/trash directory.t4208-log-magic-pathspec/repo/.git/
+[master (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/git-2.20.1/t/trash directory.t4208-log-magic-pathspec/repo/submodule'...
+done.
+[master 2614379] submodule
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 submodule
+ok 20 - tree_entry_interesting does not match past submodule boundaries
+
+# passed all 20 test(s)
+1..20
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t4212-log-corrupt.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4212-log-corrupt/.git/
+expecting success: 
+	test_commit foo &&
+
+	git cat-file commit HEAD |
+	sed "/^author /s/>/>-<>/" >broken_email.commit &&
+	git hash-object -w -t commit broken_email.commit >broken_email.hash &&
+	git update-ref refs/heads/broken_email $(cat broken_email.hash)
+
+[master (root-commit) ddd63c9] foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo.t
+ok 1 - setup
+
+expecting success: 
+	test_must_fail git fsck 2>actual &&
+	test_i18ngrep invalid.author actual
+
+error in commit fb99366eaec195640f250774fc94d75e4f06f441: missingSpaceBeforeDate: invalid author/committer line - missing space before date
+ok 2 - fsck notices broken commit
+
+expecting success: 
+	{
+		echo commit $(cat broken_email.hash)
+		echo "Author: A U Thor <author@example.com>"
+		echo "Date:   Thu Apr 7 15:13:13 2005 -0700"
+		echo
+		echo "    foo"
+	} >expect.out &&
+
+	git log broken_email >actual.out 2>actual.err &&
+
+	test_cmp expect.out actual.out &&
+	test_must_be_empty actual.err
+
+ok 3 - git log with broken author email
+
+expecting success: 
+	echo "A U Thor+author@example.com+Thu Apr 7 15:13:13 2005 -0700" >expect.out &&
+
+	git log --format="%an+%ae+%ad" broken_email >actual.out 2>actual.err &&
+
+	test_cmp expect.out actual.out &&
+	test_must_be_empty actual.err
+
+ok 4 - git log --format with broken author email
+
+expecting success: 
+	commit=$(munge_author_date HEAD totally_bogus) &&
+	echo "Date:   Thu Jan 1 00:00:00 1970 +0000" >expect &&
+	git log -1 $commit >actual.full &&
+	grep Date <actual.full >actual &&
+	test_cmp expect actual
+
+ok 5 - unparsable dates produce sentinel value
+
+expecting success: 
+	commit=$(munge_author_date HEAD totally_bogus) &&
+	echo >expect &&
+	git log -1 --format=%ad $commit >actual &&
+	test_cmp expect actual
+
+ok 6 - unparsable dates produce sentinel value (%ad)
+
+expecting success: 
+	commit=$(munge_author_date HEAD 18446744073709551617) &&
+	echo "Thu Jan 1 00:00:00 1970 +0000" >expect &&
+	git log -1 --format=%ad $commit >actual &&
+	test_cmp expect actual
+
+ok 7 - date parser recognizes integer overflow
+
+expecting success: 
+	commit=$(munge_author_date HEAD 18446744073709551614) &&
+	echo "Thu Jan 1 00:00:00 1970 +0000" >expect &&
+	git log -1 --format=%ad $commit >actual &&
+	test_cmp expect actual
+
+ok 8 - date parser recognizes time_t overflow
+
+expecting success: 
+	commit=$(munge_author_date HEAD 999999999999999999) &&
+	git log -1 --format=%ad $commit
+
+Thu Jan 1 00:00:00 1970 +0000
+ok 9 - absurdly far-in-future date
+
+# passed all 9 test(s)
+1..9
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t4209-log-pickaxe.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4209-log-pickaxe/.git/
+expecting success: 
+	>expect_nomatch &&
+
+	>file &&
+	git add file &&
+	test_tick &&
+	git commit -m initial &&
+	git rev-parse --verify HEAD >expect_initial &&
+
+	echo Picked >file &&
+	git add file &&
+	test_tick &&
+	git commit --author="Another Person <another@example.com>" -m second &&
+	git rev-parse --verify HEAD >expect_second
+
+[master (root-commit) 1bd44cb] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 file
+[master 64f6655] second
+ Author: Another Person <another@example.com>
+ 1 file changed, 1 insertion(+)
+ok 1 - setup
+
+expecting success: 
+		git log  --grep=initial --format=%H >actual &&
+		test_cmp expect_initial actual
+	
+ok 2 - log --grep (match)
+
+expecting success: 
+		git log  --grep=InItial --format=%H >actual &&
+		test_cmp expect_nomatch actual
+	
+ok 3 - log --grep (nomatch)
+
+expecting success: 
+		git log --regexp-ignore-case --grep=InItial --format=%H >actual &&
+		test_cmp expect_initial actual
+	
+ok 4 - log --grep --regexp-ignore-case (match)
+
+expecting success: 
+		git log -i --grep=InItial --format=%H >actual &&
+		test_cmp expect_initial actual
+	
+ok 5 - log --grep -i (match)
+
+expecting success: 
+		git log --regexp-ignore-case --grep=initail --format=%H >actual &&
+		test_cmp expect_nomatch actual
+	
+ok 6 - log --grep --regexp-ignore-case (nomatch)
+
+expecting success: 
+		git log -i --grep=initail --format=%H >actual &&
+		test_cmp expect_nomatch actual
+	
+ok 7 - log --grep -i (nomatch)
+
+expecting success: 
+		git log  --author=Person --format=%H >actual &&
+		test_cmp expect_second actual
+	
+ok 8 - log --author (match)
+
+expecting success: 
+		git log  --author=person --format=%H >actual &&
+		test_cmp expect_nomatch actual
+	
+ok 9 - log --author (nomatch)
+
+expecting success: 
+		git log --regexp-ignore-case --author=person --format=%H >actual &&
+		test_cmp expect_second actual
+	
+ok 10 - log --author --regexp-ignore-case (match)
+
+expecting success: 
+		git log -i --author=person --format=%H >actual &&
+		test_cmp expect_second actual
+	
+ok 11 - log --author -i (match)
+
+expecting success: 
+		git log --regexp-ignore-case --author=spreon --format=%H >actual &&
+		test_cmp expect_nomatch actual
+	
+ok 12 - log --author --regexp-ignore-case (nomatch)
+
+expecting success: 
+		git log -i --author=spreon --format=%H >actual &&
+		test_cmp expect_nomatch actual
+	
+ok 13 - log --author -i (nomatch)
+
+expecting success: 
+		git log  -Gpicked --format=%H >actual &&
+		test_cmp expect_nomatch actual
+	
+ok 14 - log -G (nomatch)
+
+expecting success: 
+		git log  -GPicked --format=%H >actual &&
+		test_cmp expect_second actual
+	
+ok 15 - log -G (match)
+
+expecting success: 
+		git log --regexp-ignore-case -Gpickle --format=%H >actual &&
+		test_cmp expect_nomatch actual
+	
+ok 16 - log -G --regexp-ignore-case (nomatch)
+
+expecting success: 
+		git log -i -Gpickle --format=%H >actual &&
+		test_cmp expect_nomatch actual
+	
+ok 17 - log -G -i (nomatch)
+
+expecting success: 
+		git log --regexp-ignore-case -Gpicked --format=%H >actual &&
+		test_cmp expect_second actual
+	
+ok 18 - log -G --regexp-ignore-case (match)
+
+expecting success: 
+		git log -i -Gpicked --format=%H >actual &&
+		test_cmp expect_second actual
+	
+ok 19 - log -G -i (match)
+
+expecting success: 
+	echo "* diff=test" >.gitattributes &&
+	test_must_fail git -c diff.test.textconv=missing log -Gfoo &&
+	rm .gitattributes
+
+error: cannot run missing: No such file or directory
+fatal: unable to read files to diff
+ok 20 - log -G --textconv (missing textconv tool)
+
+expecting success: 
+	echo "* diff=test" >.gitattributes &&
+	git -c diff.test.textconv=missing log -Gfoo --no-textconv >actual &&
+	test_cmp expect_nomatch actual &&
+	rm .gitattributes
+
+ok 21 - log -G --no-textconv (missing textconv tool)
+
+expecting success: 
+		git log  -Spicked --format=%H >actual &&
+		test_cmp expect_nomatch actual
+	
+ok 22 - log -S (nomatch)
+
+expecting success: 
+		git log  -SPicked --format=%H >actual &&
+		test_cmp expect_second actual
+	
+ok 23 - log -S (match)
+
+expecting success: 
+		git log --regexp-ignore-case -Spicked --format=%H >actual &&
+		test_cmp expect_second actual
+	
+ok 24 - log -S --regexp-ignore-case (match)
+
+expecting success: 
+		git log -i -Spicked --format=%H >actual &&
+		test_cmp expect_second actual
+	
+ok 25 - log -S -i (match)
+
+expecting success: 
+		git log --regexp-ignore-case -Spickle --format=%H >actual &&
+		test_cmp expect_nomatch actual
+	
+ok 26 - log -S --regexp-ignore-case (nomatch)
+
+expecting success: 
+		git log -i -Spickle --format=%H >actual &&
+		test_cmp expect_nomatch actual
+	
+ok 27 - log -S -i (nomatch)
+
+expecting success: 
+		git log --pickaxe-regex -Sp.cked --format=%H >actual &&
+		test_cmp expect_nomatch actual
+	
+ok 28 - log -S --pickaxe-regex (nomatch)
+
+expecting success: 
+		git log --pickaxe-regex -SP.cked --format=%H >actual &&
+		test_cmp expect_second actual
+	
+ok 29 - log -S --pickaxe-regex (match)
+
+expecting success: 
+		git log --pickaxe-regex --regexp-ignore-case -Sp.cked --format=%H >actual &&
+		test_cmp expect_second actual
+	
+ok 30 - log -S --pickaxe-regex --regexp-ignore-case (match)
+
+expecting success: 
+		git log --pickaxe-regex -i -Sp.cked --format=%H >actual &&
+		test_cmp expect_second actual
+	
+ok 31 - log -S --pickaxe-regex -i (match)
+
+expecting success: 
+		git log --pickaxe-regex --regexp-ignore-case -Sp.ckle --format=%H >actual &&
+		test_cmp expect_nomatch actual
+	
+ok 32 - log -S --pickaxe-regex --regexp-ignore-case (nomatch)
+
+expecting success: 
+		git log --pickaxe-regex -i -Sp.ckle --format=%H >actual &&
+		test_cmp expect_nomatch actual
+	
+ok 33 - log -S --pickaxe-regex -i (nomatch)
+
+expecting success: 
+	echo "* diff=test" >.gitattributes &&
+	test_must_fail git -c diff.test.textconv=missing log -Sfoo &&
+	rm .gitattributes
+
+error: cannot run missing: No such file or directory
+fatal: unable to read files to diff
+ok 34 - log -S --textconv (missing textconv tool)
+
+expecting success: 
+	echo "* diff=test" >.gitattributes &&
+	git -c diff.test.textconv=missing log -Sfoo --no-textconv >actual &&
+	test_cmp expect_nomatch actual &&
+	rm .gitattributes
+
+ok 35 - log -S --no-textconv (missing textconv tool)
+
+# passed all 35 test(s)
+1..35
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
 *** t3425-rebase-topology-merges.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3425-rebase-topology-merges/.git/
 expecting success: 
@@ -127245,1548 +129388,529 @@
 1..29
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t4206-log-follow-harder-copies.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4206-log-follow-harder-copies/.git/
-expecting success: git add path0 &&
-     git commit -m "Add path0"
-[master (root-commit) b55a73f] 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: git add path0 &&
-     git commit -m "Change path0"
-[master cc9ec19] Change path0
- Author: A U Thor <author@example.com>
- 1 file changed, 3 insertions(+), 3 deletions(-)
-ok 2 - Change path0.
-
-expecting success: git add path1 &&
-     git commit -m "Copy path1 from path0"
-[master c4bd002] 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: git log --follow --name-status --pretty="format:%s"  path1 > current
-ok 4 - find the copy path0 -> path1 harder
-
-expecting success: compare_diff_patch current expected
-ok 5 - validate the output.
-
-# passed all 5 test(s)
-1..5
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t4151-am-abort.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4151-am-abort/.git/
+*** t4252-am-options.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4252-am-options/.git/
 expecting success: 
-	for i in a b c d e f g
-	do
-		echo $i
-	done >file-1 &&
-	cp file-1 file-2 &&
-	test_tick &&
+	cp "$tm/file-1-0" file-1 &&
+	cp "$tm/file-2-0" file-2 &&
 	git add file-1 file-2 &&
+	test_tick &&
 	git commit -m initial &&
-	git tag initial &&
-	git format-patch --stdout --root initial >initial.patch &&
-	for i in 2 3 4 5 6
-	do
-		echo $i >>file-1 &&
-		echo $i >otherfile-$i &&
-		git add otherfile-$i &&
-		test_tick &&
-		git commit -a -m $i || return 1
-	done &&
-	git format-patch --no-numbered initial &&
-	git checkout -b side initial &&
-	echo local change >file-2-expect
+	git tag initial
 
-[master (root-commit) 1732241] initial
+[master (root-commit) f06d5e1] initial
  Author: A U Thor <author@example.com>
  2 files changed, 14 insertions(+)
  create mode 100644 file-1
  create mode 100644 file-2
-[master a485f10] 2
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 otherfile-2
-[master b72e0d7] 3
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 otherfile-3
-[master f1dbda2] 4
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 otherfile-4
-[master 73a4960] 5
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 otherfile-5
-[master 87a053c] 6
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 otherfile-6
-0001-2.patch
-0002-3.patch
-0003-4.patch
-0004-5.patch
-0005-6.patch
-Switched to a new branch 'side'
 ok 1 - setup
 
 expecting success: 
+	rm -rf .git/rebase-apply &&
+	git reset --hard initial &&
+	test_must_fail git am --whitespace=fix "$tm"/am-test-1-? &&
+	git am --skip &&
+	grep 3 file-1 &&
+	grep "^Six$" file-2
 
-		git reset --hard initial &&
-		cp file-2-expect file-2 &&
-
-		test_must_fail git am$with3 000[1245]-*.patch &&
-		git log --pretty=tformat:%s >actual &&
-		for i in 3 2 initial
-		do
-			echo $i
-		done >expect &&
-		test_cmp expect actual
-	
-HEAD is now at 1732241 initial
-error: patch failed: file-1:8
+HEAD is now at f06d5e1 initial
+.git/rebase-apply/patch:9: trailing whitespace.
+Three 
+error: patch failed: file-1:1
 error: file-1: patch does not apply
 hint: Use 'git am --show-current-patch' to see the failed patch
-Applying: 2
-Applying: 3
-Applying: 5
-Patch failed at 0003 5
+Applying: Three
+Patch failed at 0001 Three
 When you have resolved this problem, run "git am --continue".
 If you prefer to skip this patch, run "git am --skip" instead.
 To restore the original branch and stop patching, run "git am --abort".
-ok 2 - am stops at a patch that does not apply
-
-expecting success: 
-		test_must_fail git am$with3 --skip >output &&
-		test_i18ngrep "^Applying: 6$" output &&
-		test_cmp file-2-expect file-2 &&
-		test ! -f .git/MERGE_RR
-	
-error: patch failed: file-1:9
-error: file-1: patch does not apply
-hint: Use 'git am --show-current-patch' to see the failed patch
-Applying: 6
-ok 3 - am --skip continue after failed am
-
-expecting success: 
-		git am --abort &&
-		git rev-parse HEAD >actual &&
-		git rev-parse initial >expect &&
-		test_cmp expect actual &&
-		test_cmp file-2-expect file-2 &&
-		git diff-index --exit-code --cached HEAD &&
-		test ! -f .git/MERGE_RR
-	
-ok 4 - am --abort goes back after failed am
+.git/rebase-apply/patch:13: trailing whitespace.
+Six 
+warning: 1 line applied after fixing whitespace errors.
+Applying: Six
+3
+Six
+ok 2 - interrupted am --whitespace=fix
 
 expecting success: 
+	rm -rf .git/rebase-apply &&
+	git reset --hard initial &&
+	test_must_fail git am -C1 "$tm"/am-test-2-? &&
+	git am --skip &&
+	grep 3 file-1 &&
+	grep "^Three$" file-2
 
-		git reset --hard initial &&
-		cp file-2-expect file-2 &&
-
-		test_must_fail git am$with3 000[1245]-*.patch &&
-		git log --pretty=tformat:%s >actual &&
-		for i in 3 2 initial
-		do
-			echo $i
-		done >expect &&
-		test_cmp expect actual
-	
-HEAD is now at 1732241 initial
-Applying: 2
-Applying: 3
-Applying: 5
-Using index info to reconstruct a base tree...
-M	file-1
-Falling back to patching base and 3-way merge...
-Merging:
-62dd7f8 3
-virtual 5
-found 1 common ancestor:
-virtual 2e4b8a989c579cac9d3cc1897320a3e27805d080
-Auto-merging file-1
-CONFLICT (content): Merge conflict in file-1
-error: Failed to merge in the changes.
+HEAD is now at f06d5e1 initial
+.git/rebase-apply/patch:9: trailing whitespace.
+Three 
+error: patch failed: file-1:1
+error: file-1: patch does not apply
 hint: Use 'git am --show-current-patch' to see the failed patch
-Patch failed at 0003 5
+Applying: Three
+Patch failed at 0001 Three
 When you have resolved this problem, run "git am --continue".
 If you prefer to skip this patch, run "git am --skip" instead.
 To restore the original branch and stop patching, run "git am --abort".
-ok 5 - am -3 stops at a patch that does not apply
-
-expecting success: 
-		test_must_fail git am$with3 --skip >output &&
-		test_i18ngrep "^Applying: 6$" output &&
-		test_cmp file-2-expect file-2 &&
-		test ! -f .git/MERGE_RR
-	
-error: Failed to merge in the changes.
-hint: Use 'git am --show-current-patch' to see the failed patch
-Applying: 6
-ok 6 - am -3 --skip continue after failed am -3
-
-expecting success: 
-		git am --abort &&
-		git rev-parse HEAD >actual &&
-		git rev-parse initial >expect &&
-		test_cmp expect actual &&
-		test_cmp file-2-expect file-2 &&
-		git diff-index --exit-code --cached HEAD &&
-		test ! -f .git/MERGE_RR
-	
-ok 7 - am --abort goes back after failed am -3
+Context reduced to (1/1) to apply fragment at 2
+Applying: Six
+3
+Three
+ok 3 - interrupted am -C1
 
 expecting success: 
+	rm -rf .git/rebase-apply &&
 	git reset --hard initial &&
-	test_must_fail git am -3 0003-*.patch &&
-	test 3 -eq $(git ls-files -u | wc -l) &&
-	test 4 = "$(cat otherfile-4)" &&
+	test_must_fail git am -p2 "$tm"/am-test-3-? &&
 	git am --skip &&
-	test_cmp_rev initial HEAD &&
-	test -z "$(git ls-files -u)" &&
-	test_path_is_missing otherfile-4
+	grep 3 file-1 &&
+	grep "^Three$" file-2
 
-HEAD is now at 1732241 initial
-Applying: 4
-Using index info to reconstruct a base tree...
-M	file-1
-Falling back to patching base and 3-way merge...
-Merging:
-1732241 initial
-virtual 4
-found 1 common ancestor:
-virtual ca28a003e7272ffcb030f00a3e373a07e49ce912
-Auto-merging file-1
-CONFLICT (content): Merge conflict in file-1
-error: Failed to merge in the changes.
+HEAD is now at f06d5e1 initial
+.git/rebase-apply/patch:9: trailing whitespace.
+Three 
+error: patch failed: file-1:1
+error: file-1: patch does not apply
 hint: Use 'git am --show-current-patch' to see the failed patch
-Patch failed at 0001 4
+Applying: Three
+Patch failed at 0001 Three
 When you have resolved this problem, run "git am --continue".
 If you prefer to skip this patch, run "git am --skip" instead.
 To restore the original branch and stop patching, run "git am --abort".
-ok 8 - am -3 --skip removes otherfile-4
+Applying: Six
+3
+Three
+ok 4 - interrupted am -p2
 
 expecting success: 
+	rm -rf .git/rebase-apply &&
 	git reset --hard initial &&
-	test_must_fail git am -3 0003-*.patch &&
-	test 3 -eq $(git ls-files -u | wc -l) &&
-	test 4 = "$(cat otherfile-4)" &&
-	git am --abort &&
-	test_cmp_rev initial HEAD &&
-	test -z "$(git ls-files -u)" &&
-	test_path_is_missing otherfile-4
+	test_must_fail git am -p2 -C1 "$tm"/am-test-4-? &&
+	git am --skip &&
+	grep 3 file-1 &&
+	grep "^Three$" file-2
 
-HEAD is now at 1732241 initial
-Applying: 4
-Using index info to reconstruct a base tree...
-M	file-1
-Falling back to patching base and 3-way merge...
-Merging:
-1732241 initial
-virtual 4
-found 1 common ancestor:
-virtual ca28a003e7272ffcb030f00a3e373a07e49ce912
-Auto-merging file-1
-CONFLICT (content): Merge conflict in file-1
-error: Failed to merge in the changes.
+HEAD is now at f06d5e1 initial
+.git/rebase-apply/patch:9: trailing whitespace.
+Three 
+error: patch failed: file-1:1
+error: file-1: patch does not apply
 hint: Use 'git am --show-current-patch' to see the failed patch
-Patch failed at 0001 4
+Applying: Three
+Patch failed at 0001 Three
 When you have resolved this problem, run "git am --continue".
 If you prefer to skip this patch, run "git am --skip" instead.
 To restore the original branch and stop patching, run "git am --abort".
-ok 9 - am -3 --abort removes otherfile-4
+Context reduced to (1/1) to apply fragment at 2
+Applying: Six
+3
+Three
+ok 5 - interrupted am -C1 -p2
 
 expecting success: 
-	test_must_fail git am 0004-*.patch &&
-	test_commit unrelated &&
-	git rev-parse HEAD >expect &&
-	git am --abort &&
-	git rev-parse HEAD >actual &&
-	test_cmp expect actual
+	rm -rf .git/rebase-apply &&
+	git reset --hard initial &&
+	test_must_fail git am --directory="frotz nitfol" "$tm"/am-test-5-? &&
+	git am --skip &&
+	grep One "frotz nitfol/file-5"
 
-error: patch failed: file-1:8
-error: file-1: patch does not apply
+HEAD is now at f06d5e1 initial
+error: frotz nitfol/junk/file-2: does not exist in index
 hint: Use 'git am --show-current-patch' to see the failed patch
-Applying: 5
-Patch failed at 0001 5
+Applying: Six
+Patch failed at 0001 Six
 When you have resolved this problem, run "git am --continue".
 If you prefer to skip this patch, run "git am --skip" instead.
 To restore the original branch and stop patching, run "git am --abort".
-[side f386b22] unrelated
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 unrelated.t
-warning: You seem to have moved HEAD since the last 'am' failure.
-Not rewinding to ORIG_HEAD
-ok 10 - am --abort will keep the local commits intact
+Applying: Six
+One
+ok 6 - interrupted am --directory="frotz nitfol"
 
 expecting success: 
+	with_sq="with'sq" &&
+	rm -fr .git/rebase-apply &&
 	git reset --hard initial &&
-	echo dirtyfile >dirtyfile &&
-	cp dirtyfile dirtyfile.expected &&
-	git add dirtyfile &&
-	test_must_fail git am 0001-*.patch &&
-	test_cmp_rev initial HEAD &&
-	test_path_is_file dirtyfile &&
-	test_cmp dirtyfile.expected dirtyfile &&
-	git am --abort &&
-	test_cmp_rev initial HEAD &&
-	test_path_is_file dirtyfile &&
-	test_cmp dirtyfile.expected dirtyfile
+	git am --directory="$with_sq" "$tm"/am-test-5-2 &&
+	test -f "$with_sq/file-5"
 
-HEAD is now at 1732241 initial
-fatal: Dirty index: cannot apply patches (dirty: dirtyfile)
-ok 11 - am --abort will keep dirty index intact
+HEAD is now at f06d5e1 initial
+Applying: Six
+ok 7 - apply to a funny path
 
 expecting success: 
-	git checkout -f --orphan orphan &&
-	git reset &&
-	rm -f otherfile-4 &&
-	test_must_fail git am -3 0003-*.patch &&
-	test 2 -eq $(git ls-files -u | wc -l) &&
-	test 4 = "$(cat otherfile-4)"
+	rm -rf .git/rebase-apply &&
+	git reset --hard initial &&
+	test_must_fail git am --reject "$tm"/am-test-6-1 &&
+	grep "@@ -1,3 +1,3 @@" file-2.rej &&
+	test_must_fail git diff-files --exit-code --quiet file-2 &&
+	grep "[-]-reject" .git/rebase-apply/apply-opt
 
-Switched to a new branch 'orphan'
-Applying: 4
-Using index info to reconstruct a base tree...
-A	file-1
-Falling back to patching base and 3-way merge...
-Merging:
-virtual HEAD
-virtual 4
-found 1 common ancestor:
-virtual ca28a003e7272ffcb030f00a3e373a07e49ce912
-CONFLICT (modify/delete): file-1 deleted in HEAD and modified in 4. Version 4 of file-1 left in tree at file-1~4.
-error: Failed to merge in the changes.
+HEAD is now at f06d5e1 initial
+Checking patch file-2...
+error: while searching for:
+0
+2
+3
+
+error: patch failed: file-2:1
+Applying patch file-2 with 1 reject...
+Rejected hunk #1.
+Hunk #2 applied cleanly.
 hint: Use 'git am --show-current-patch' to see the failed patch
-Patch failed at 0001 4
+Applying: Huh
+Patch failed at 0001 Huh
 When you have resolved this problem, run "git am --continue".
 If you prefer to skip this patch, run "git am --skip" instead.
 To restore the original branch and stop patching, run "git am --abort".
-ok 12 - am -3 stops on conflict on unborn branch
+@@ -1,3 +1,3 @@
+ '--reject'
+ok 8 - am --reject
 
+# passed all 8 test(s)
+1..8
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t4253-am-keep-cr-dos.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4253-am-keep-cr-dos/.git/
 expecting success: 
-	test_path_is_dir .git/rebase-apply &&
-	echo tmpfile >tmpfile &&
-	git add tmpfile &&
-	git am --skip &&
-	test -z "$(git ls-files)" &&
-	test_path_is_missing otherfile-4 &&
-	test_path_is_missing tmpfile
+	append_cr <file1 >file &&
+	git add file &&
+	git commit -m Initial &&
+	git tag initial &&
+	append_cr <file2 >file &&
+	git commit -a -m Second &&
+	append_cr <file3 >file &&
+	git commit -a -m Third
 
-ok 13 - am -3 --skip clears index on unborn branch
+[master (root-commit) 83683b0] Initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+[master b115b62] Second
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master c47734b] Third
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 1 - setup repository with dos files
 
 expecting success: 
-	git checkout -f --orphan orphan &&
-	git reset &&
-	rm -f otherfile-4 file-1 &&
-	test_must_fail git am -3 0003-*.patch &&
-	test 2 -eq $(git ls-files -u | wc -l) &&
-	test 4 = "$(cat otherfile-4)" &&
+	git checkout -b dosfiles initial &&
+	git format-patch -k initial..master &&
+	test_must_fail git am -k -3 000*.patch &&
 	git am --abort &&
-	test -z "$(git ls-files -u)" &&
-	test_path_is_missing otherfile-4
+	rm -rf .git/rebase-apply 000*.patch
 
-Switched to a new branch 'orphan'
-Applying: 4
-Using index info to reconstruct a base tree...
-A	file-1
-Falling back to patching base and 3-way merge...
-Merging:
-virtual HEAD
-virtual 4
-found 1 common ancestor:
-virtual ca28a003e7272ffcb030f00a3e373a07e49ce912
-CONFLICT (modify/delete): file-1 deleted in HEAD and modified in 4. Version 4 of file-1 left in tree.
-error: Failed to merge in the changes.
+Switched to a new branch 'dosfiles'
+0001-Second.patch
+0002-Third.patch
+Applying: Second
+error: patch failed: file:1
+error: file: patch does not apply
+error: Did you hand edit your patch?
+It does not apply to blobs recorded in its index.
 hint: Use 'git am --show-current-patch' to see the failed patch
-Patch failed at 0001 4
+Using index info to reconstruct a base tree...
+Patch failed at 0001 Second
 When you have resolved this problem, run "git am --continue".
 If you prefer to skip this patch, run "git am --skip" instead.
 To restore the original branch and stop patching, run "git am --abort".
-ok 14 - am -3 --abort removes otherfile-4 on unborn branch
+ok 2 - am with dos files without --keep-cr
 
 expecting success: 
-	git checkout -f --orphan orphan &&
-	git reset &&
-	rm -f otherfile-4 otherfile-2 file-1 file-2 &&
-	test_must_fail git am -3 initial.patch 0003-*.patch &&
-	test 3 -eq $(git ls-files -u | wc -l) &&
-	test 4 = "$(cat otherfile-4)" &&
-	git am --abort &&
-	test -z "$(git ls-files -u)" &&
-	test_path_is_missing otherfile-4 &&
-	test_path_is_missing file-1 &&
-	test_path_is_missing file-2 &&
-	test 0 -eq $(git log --oneline 2>/dev/null | wc -l) &&
-	test refs/heads/orphan = "$(git symbolic-ref HEAD)"
+	git checkout -b dosfiles-keep-cr initial &&
+	git format-patch -k --stdout initial..master | git am --keep-cr -k -3 &&
+	git diff --exit-code master
 
-Switched to a new branch 'orphan'
-applying to an empty history
-Applying: initial
-Applying: 4
-Using index info to reconstruct a base tree...
-M	file-1
-Falling back to patching base and 3-way merge...
-Merging:
-03bb45f initial
-virtual 4
-found 1 common ancestor:
-virtual ca28a003e7272ffcb030f00a3e373a07e49ce912
-Auto-merging file-1
-CONFLICT (content): Merge conflict in file-1
-error: Failed to merge in the changes.
-hint: Use 'git am --show-current-patch' to see the failed patch
-Patch failed at 0002 4
-When you have resolved this problem, run "git am --continue".
-If you prefer to skip this patch, run "git am --skip" instead.
-To restore the original branch and stop patching, run "git am --abort".
-ok 15 - am -3 --abort on unborn branch removes applied commits
+Switched to a new branch 'dosfiles-keep-cr'
+Applying: Second
+Applying: Third
+ok 3 - am with dos files with --keep-cr
 
 expecting success: 
-	git checkout -f --orphan orphan &&
-	git reset &&
-	test_must_fail git am 0004-*.patch &&
-	test_commit unrelated2 &&
-	git rev-parse HEAD >expect &&
-	git am --abort &&
-	git rev-parse HEAD >actual &&
-	test_cmp expect actual
+	git config am.keepcr 1 &&
+	git checkout -b dosfiles-conf-keepcr initial &&
+	git format-patch -k --stdout initial..master | git am -k -3 &&
+	git diff --exit-code master
 
-Switched to a new branch 'orphan'
-error: file-1: does not exist in index
-hint: Use 'git am --show-current-patch' to see the failed patch
-Applying: 5
-Patch failed at 0001 5
-When you have resolved this problem, run "git am --continue".
-If you prefer to skip this patch, run "git am --skip" instead.
-To restore the original branch and stop patching, run "git am --abort".
-[orphan (root-commit) 823805c] unrelated2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 unrelated2.t
-warning: You seem to have moved HEAD since the last 'am' failure.
-Not rewinding to ORIG_HEAD
-ok 16 - am --abort on unborn branch will keep local commits intact
+Switched to a new branch 'dosfiles-conf-keepcr'
+Applying: Second
+Applying: Third
+ok 4 - am with dos files config am.keepcr
 
 expecting success: 
-	git checkout -f --orphan skip-stat-info &&
-	git reset &&
-	test_commit skip-should-be-untouched &&
-	test-tool chmtime =0 skip-should-be-untouched.t &&
-	git update-index --refresh &&
-	git diff-files --exit-code --quiet &&
-	test_must_fail git am 0001-*.patch &&
-	git am --skip &&
-	git diff-files --exit-code --quiet
+	git config am.keepcr 1 &&
+	git checkout -b dosfiles-conf-keepcr-override initial &&
+	git format-patch -k initial..master &&
+	test_must_fail git am -k -3 --no-keep-cr 000*.patch &&
+	git am --abort &&
+	rm -rf .git/rebase-apply 000*.patch
 
-Switched to a new branch 'skip-stat-info'
-[skip-stat-info (root-commit) 2297a89] skip-should-be-untouched
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 skip-should-be-untouched.t
-error: file-1: does not exist in index
+Switched to a new branch 'dosfiles-conf-keepcr-override'
+0001-Second.patch
+0002-Third.patch
+Applying: Second
+error: patch failed: file:1
+error: file: patch does not apply
+error: Did you hand edit your patch?
+It does not apply to blobs recorded in its index.
 hint: Use 'git am --show-current-patch' to see the failed patch
-Applying: 2
-Patch failed at 0001 2
+Using index info to reconstruct a base tree...
+Patch failed at 0001 Second
 When you have resolved this problem, run "git am --continue".
 If you prefer to skip this patch, run "git am --skip" instead.
 To restore the original branch and stop patching, run "git am --abort".
-ok 17 - am --skip leaves index stat info alone
+ok 5 - am with dos files config am.keepcr overridden by --no-keep-cr
 
 expecting success: 
-	git checkout -f --orphan abort-stat-info &&
-	git reset &&
-	test_commit abort-should-be-untouched &&
-	test-tool chmtime =0 abort-should-be-untouched.t &&
-	git update-index --refresh &&
-	git diff-files --exit-code --quiet &&
-	test_must_fail git am 0001-*.patch &&
-	git am --abort &&
-	git diff-files --exit-code --quiet
+	git checkout -b dosfiles-keep-cr-continue initial &&
+	git format-patch -k initial..master &&
+	append_cr <file1a >file &&
+	git commit -m "different patch" file &&
+	test_must_fail git am --keep-cr -k -3 000*.patch &&
+	append_cr <file2 >file &&
+	git add file &&
+	git am -3 --resolved &&
+	git diff --exit-code master
 
-Switched to a new branch 'abort-stat-info'
-[abort-stat-info (root-commit) 3038985] abort-should-be-untouched
+Switched to a new branch 'dosfiles-keep-cr-continue'
+0001-Second.patch
+0002-Third.patch
+[dosfiles-keep-cr-continue 5999bf3] different patch
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 abort-should-be-untouched.t
-error: file-1: does not exist in index
+Applying: Second
+Using index info to reconstruct a base tree...
+M	file
+Falling back to patching base and 3-way merge...
+Merging:
+5999bf3 different patch
+virtual Second
+found 1 common ancestor:
+virtual 0626bbef2b13f86fc002fb580ec5fac3fd75fa44
+Auto-merging file
+CONFLICT (content): Merge conflict in file
+error: Failed to merge in the changes.
 hint: Use 'git am --show-current-patch' to see the failed patch
-Applying: 2
-Patch failed at 0001 2
+Patch failed at 0001 Second
 When you have resolved this problem, run "git am --continue".
 If you prefer to skip this patch, run "git am --skip" instead.
 To restore the original branch and stop patching, run "git am --abort".
-ok 18 - am --abort leaves index stat info alone
+Applying: Second
+Applying: Third
+ok 6 - am with dos files with --keep-cr continue
 
-# passed all 18 test(s)
-1..18
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t4204-patch-id.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4204-patch-id/.git/
 expecting success: 
-	as="a a a a a a a a" && # eight a
-	test_write_lines $as >foo &&
-	test_write_lines $as >bar &&
-	git add foo bar &&
-	git commit -a -m initial &&
-	test_write_lines $as b >foo &&
-	test_write_lines $as b >bar &&
-	git commit -a -m first &&
-	git checkout -b same master &&
-	git commit --amend -m same-msg &&
-	git checkout -b notsame master &&
-	echo c >foo &&
-	echo c >bar &&
-	git commit --amend -a -m notsame-msg &&
-	test_write_lines bar foo >bar-then-foo &&
-	test_write_lines foo bar >foo-then-bar
+	git config am.keepcr 1 &&
+	git checkout -b unixfiles-conf-keepcr-override initial &&
+	cp -f file1 file &&
+	git commit -m "line ending to unix" file &&
+	git format-patch -k initial..master &&
+	git am -k -3 --no-keep-cr 000*.patch &&
+	git diff --exit-code -w master
 
-[master (root-commit) 50160b3] initial
- Author: A U Thor <author@example.com>
- 2 files changed, 16 insertions(+)
- create mode 100644 bar
- create mode 100644 foo
-[master a55db7f] first
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
-Switched to a new branch 'same'
-[same 9884f14] same-msg
- Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:07:29 2021 +0000
- 2 files changed, 2 insertions(+)
-Switched to a new branch 'notsame'
-[notsame 99f7874] notsame-msg
+Switched to a new branch 'unixfiles-conf-keepcr-override'
+[unixfiles-conf-keepcr-override 852ac8e] line ending to unix
  Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:07:29 2021 +0000
- 2 files changed, 2 insertions(+), 16 deletions(-)
-ok 1 - setup
-
-expecting success: 
-	git log -p -1 | git patch-id >output &&
-	grep "^[a-f0-9]\{40\} $(git rev-parse HEAD)$" output
-
-f107563c3b906af306765d78fce3e3a7e121cb5d 99f78747e9ea57a8cd2dbd5a97d66938a5682a0c
-ok 2 - patch-id output is well-formed
-
-expecting success: 
-	get_patch_id master &&
-	get_patch_id same &&
-	test_cmp patch-id_master patch-id_same
-
-ok 3 - patch-id detects equality
-
-expecting success: 
-	get_patch_id master &&
-	get_patch_id notsame &&
-	! test_cmp patch-id_master patch-id_notsame
-
---- patch-id_master	2021-12-03 05:07:30.099816960 +0000
-+++ patch-id_notsame	2021-12-03 05:07:30.107816727 +0000
-@@ -1 +1 @@
--5d64663409e35f10b786d5942856240338437436
-+f107563c3b906af306765d78fce3e3a7e121cb5d
-ok 4 - patch-id detects inequality
-
-expecting success: 
-	get_patch_id master &&
-	git checkout same &&
-	git format-patch -1 --stdout | calc_patch_id same &&
-	test_cmp patch-id_master patch-id_same &&
-	set $(git format-patch -1 --stdout | git patch-id) &&
-	test "$2" = $(git rev-parse HEAD)
-
-Switched to branch 'same'
-ok 5 - patch-id supports git-format-patch output
-
-expecting success: 
-	get_patch_id master &&
-	git checkout same &&
-	git format-patch -1 --stdout | sed "s/ \$//" | calc_patch_id same &&
-	test_cmp patch-id_master patch-id_same
-
-Already on 'same'
-ok 6 - whitespace is irrelevant in footer
-
-expecting success: 
-	test_patch_id_file_order irrelevant --stable --stable
-
-Already on 'same'
-ok 7 - file order is irrelevant with --stable
-
-expecting success: 
-	test_patch_id_file_order relevant --unstable --unstable
-
-Already on 'same'
---- patch-id_order---unstable-relevant	2021-12-03 05:07:34.135699400 +0000
-+++ patch-id_ordered-order---unstable-relevant	2021-12-03 05:07:34.259695788 +0000
-@@ -1 +1 @@
--5d64663409e35f10b786d5942856240338437436
-+cdb26c63dc1ab08a93181ff3446560b20801f812
-ok 8 - file order is relevant with --unstable
-
-expecting success: 
-	test_patch_id relevant default
-
-Already on 'same'
---- patch-id_order-default-relevant	2021-12-03 05:07:34.427690894 +0000
-+++ patch-id_ordered-order-default-relevant	2021-12-03 05:07:34.511688448 +0000
-@@ -1 +1 @@
--5d64663409e35f10b786d5942856240338437436
-+cdb26c63dc1ab08a93181ff3446560b20801f812
-ok 9 - default is unstable
-
-expecting success: 
-	test_config patchid.stable true &&
-	test_patch_id irrelevant patchid.stable=true
-
-Already on 'same'
-ok 10 - patchid.stable = true is stable
-
-expecting success: 
-	test_config patchid.stable false &&
-	test_patch_id relevant patchid.stable=false
-
-Already on 'same'
---- patch-id_order-patchid.stable=false-relevant	2021-12-03 05:07:34.955675515 +0000
-+++ patch-id_ordered-order-patchid.stable=false-relevant	2021-12-03 05:07:36.823621103 +0000
-@@ -1 +1 @@
--5d64663409e35f10b786d5942856240338437436
-+cdb26c63dc1ab08a93181ff3446560b20801f812
-ok 11 - patchid.stable = false is unstable
-
-expecting success: 
-	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	2021-12-03 05:07:39.039556556 +0000
-+++ patch-id_ordered-order-patchid.stable=true--unstable-relevant	2021-12-03 05:07:39.055556090 +0000
-@@ -1 +1 @@
--5d64663409e35f10b786d5942856240338437436
-+cdb26c63dc1ab08a93181ff3446560b20801f812
-ok 12 - --unstable overrides patchid.stable = true
-
-expecting success: 
-	test_config patchid.stable false &&
-	test_patch_id irrelevant patchid.stable=false--stable --stable
-
-Already on 'same'
-ok 13 - --stable overrides patchid.stable = false
-
-expecting success: 
-	get_patch_id master &&
-	git checkout same &&
-	git format-patch -1 --attach --stdout | calc_patch_id same &&
-	test_cmp patch-id_master patch-id_same
-
-Already on 'same'
-ok 14 - patch-id supports git-format-patch MIME output
-
-expecting success: 
-	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 15 - patch-id respects config from subdir
-
-expecting success: 
-	cat nonl | calc_patch_id nonl &&
-	cat withnl | calc_patch_id withnl &&
-	test_cmp patch-id_nonl patch-id_withnl
-
-ok 16 - patch-id handles no-nl-at-eof markers
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+0001-Second.patch
+0002-Third.patch
+Applying: Second
+Applying: Third
+ok 7 - am with unix files config am.keepcr overridden by --no-keep-cr
 
-# passed all 16 test(s)
-1..16
+# passed all 7 test(s)
+1..7
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t4203-mailmap.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4203-mailmap/.git/
+*** t4214-log-graph-octopus.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4214-log-graph-octopus/.git/
 expecting success: 
-	cat >contacts <<-\EOF &&
-	A U Thor <author@example.com>
-	nick1 <bugs@company.xx>
+	cat >expect.uncolored <<-\EOF &&
+	* left
+	| *---.   octopus-merge
+	| |\ \ \
+	|/ / / /
+	| | | * 4
+	| | * | 3
+	| | |/
+	| * | 2
+	| |/
+	* | 1
+	|/
+	* initial
 	EOF
-
-	echo one >one &&
-	git add one &&
-	test_tick &&
-	git commit -m initial &&
-	echo two >>one &&
-	git add one &&
+	cat >expect.colors <<-\EOF &&
+	* left
+	<RED>|<RESET> *<BLUE>-<RESET><BLUE>-<RESET><MAGENTA>-<RESET><MAGENTA>.<RESET>   octopus-merge
+	<RED>|<RESET> <RED>|<RESET><YELLOW>\<RESET> <BLUE>\<RESET> <MAGENTA>\<RESET>
+	<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_commit initial &&
+	for i in 1 2 3 4 ; do
+		git checkout master -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_tick &&
-	git commit --author "nick1 <bugs@company.xx>" -m second
+	git merge -m octopus-merge 1 2 3 4 &&
+	git checkout 1 -b L &&
+	test_commit left
 
-[master (root-commit) 3a2fdcb] initial
+[master (root-commit) 24b24cf] initial
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 one
-[master e0f6049] second
- Author: nick1 <bugs@company.xx>
- 1 file changed, 1 insertion(+)
-ok 1 - setup
-
-expecting success: 
-	test_must_fail git check-mailmap
-
-fatal: no contacts specified
-ok 2 - check-mailmap no arguments
-
-expecting success: 
-	cat >expect <<-\EOF &&
-	A U Thor <author@example.com>
-	nick1 <bugs@company.xx>
-	EOF
-	git check-mailmap \
-		"A U Thor <author@example.com>" \
-		"nick1 <bugs@company.xx>" >actual &&
-	test_cmp expect actual
-
-ok 3 - check-mailmap arguments
-
-expecting success: 
-	cat >expect <<-\EOF &&
-	A U Thor <author@example.com>
-	nick1 <bugs@company.xx>
-	EOF
-	git check-mailmap --stdin <contacts >actual &&
-	test_cmp expect actual
-
-ok 4 - check-mailmap --stdin
-
-expecting success: 
-	cat >expect <<-\EOF &&
-	Internal Guy <bugs@company.xy>
-	EOF
-	cat <contacts >>expect &&
-	git check-mailmap --stdin "Internal Guy <bugs@company.xy>" \
-		<contacts >actual &&
-	test_cmp expect actual
-
-ok 5 - check-mailmap --stdin arguments
-
-expecting success: 
-	test_must_fail git check-mailmap bogus
-
-fatal: unable to parse contact: bogus
-ok 6 - check-mailmap bogus contact
-
-expecting success: 
-	git shortlog HEAD >actual &&
-	test_cmp expect actual
-
-ok 7 - No mailmap
-
-expecting success: 
-	echo "Repo Guy <author@example.com>" > .mailmap &&
-	git shortlog HEAD >actual &&
-	test_cmp expect actual
-
-ok 8 - default .mailmap
-
-expecting success: 
-	mkdir -p internal_mailmap &&
-	echo "Internal Guy <bugs@company.xx>" > internal_mailmap/.mailmap &&
-	git config mailmap.file internal_mailmap/.mailmap &&
-	git shortlog HEAD >actual &&
-	test_cmp expect actual
-
-ok 9 - mailmap.file set
-
-expecting success: 
-	echo "External Guy <author@example.com>" >> internal_mailmap/.mailmap &&
-	git config mailmap.file internal_mailmap/.mailmap &&
-	git shortlog HEAD >actual &&
-	test_cmp expect actual
-
-ok 10 - mailmap.file override
-
-expecting success: 
-	rm internal_mailmap/.mailmap &&
-	rmdir internal_mailmap &&
-	git shortlog HEAD >actual &&
-	test_cmp expect actual
-
-ok 11 - mailmap.file non-existent
-
-expecting success: 
-	mkdir -p internal_mailmap &&
-	echo "<bugs@company.xy> <bugs@company.xx>" >internal_mailmap/.mailmap &&
-	echo "Internal Guy <bugs@company.xx>" >>internal_mailmap/.mailmap &&
-	git shortlog HEAD >actual &&
-	test_cmp expect actual
-
-ok 12 - name entry after email entry
-
-expecting success: 
-	mkdir -p internal_mailmap &&
-	echo "<bugs@company.xy> <bugs@company.xx>" >internal_mailmap/.mailmap &&
-	echo "Internal Guy <BUGS@Company.xx>" >>internal_mailmap/.mailmap &&
-	git shortlog HEAD >actual &&
-	test_cmp expect actual
-
-ok 13 - name entry after email entry, case-insensitive
-
-expecting success: 
-	rm -f .mailmap internal_mailmap/.mailmap &&
-	git shortlog HEAD >actual &&
-	test_cmp expect actual
-
-ok 14 - No mailmap files, but configured
-
-expecting success: 
-	git checkout -b map &&
-	test_when_finished "git checkout master" &&
-	cat >just-bugs <<-\EOF &&
-	Blob Guy <bugs@company.xx>
-	EOF
-	cat >both <<-\EOF &&
-	Blob Guy <author@example.com>
-	Blob Guy <bugs@company.xx>
-	EOF
-	printf "Tricky Guy <author@example.com>" >no-newline &&
-	git add just-bugs both no-newline &&
-	git commit -m "my mailmaps" &&
-	echo "Repo Guy <author@example.com>" >.mailmap &&
-	echo "Internal Guy <author@example.com>" >internal.map
-
-Switched to a new branch 'map'
-[map d53f9b1] my mailmaps
- Author: A U Thor <author@example.com>
- 3 files changed, 4 insertions(+)
- create mode 100644 both
- create mode 100644 just-bugs
- create mode 100644 no-newline
-Switched to branch 'master'
-ok 15 - setup mailmap blob tests
-
-expecting success: 
-	cat >expect <<-\EOF &&
-	Blob Guy (1):
-	      second
-
-	Repo Guy (1):
-	      initial
-
-	EOF
-	git -c mailmap.blob=map:just-bugs shortlog HEAD >actual &&
-	test_cmp expect actual
-
-ok 16 - mailmap.blob set
-
-expecting success: 
-	cat >expect <<-\EOF &&
-	Blob Guy (2):
-	      initial
-	      second
-
-	EOF
-	git -c mailmap.blob=map:both shortlog HEAD >actual &&
-	test_cmp expect actual
-
-ok 17 - mailmap.blob overrides .mailmap
-
-expecting success: 
-	cat >expect <<-\EOF &&
-	Blob Guy (1):
-	      second
-
-	Internal Guy (1):
-	      initial
-
-	EOF
-	git \
-	  -c mailmap.blob=map:both \
-	  -c mailmap.file=internal.map \
-	  shortlog HEAD >actual &&
-	test_cmp expect actual
-
-ok 18 - mailmap.file overrides mailmap.blob
-
-expecting success: 
-	cat >expect <<-\EOF &&
-	Repo Guy (1):
-	      initial
-
-	nick1 (1):
-	      second
-
-	EOF
-	git -c mailmap.blob=map:nonexistent shortlog HEAD >actual &&
-	test_cmp expect actual
-
-ok 19 - mailmap.blob can be missing
-
-expecting success: 
-	git init non-bare &&
-	(
-		cd non-bare &&
-		test_commit one .mailmap "Fake Name <author@example.com>" &&
-		echo "     1	Fake Name" >expect &&
-		git shortlog -ns HEAD >actual &&
-		test_cmp expect actual &&
-		rm .mailmap &&
-		echo "     1	A U Thor" >expect &&
-		git shortlog -ns HEAD >actual &&
-		test_cmp expect actual
-	)
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4203-mailmap/non-bare/.git/
-[master (root-commit) c736a92] one
+ 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 .mailmap
-ok 20 - mailmap.blob defaults to off in non-bare repo
-
-expecting success: 
-	git clone --bare non-bare bare &&
-	(
-		cd bare &&
-		echo "     1	Fake Name" >expect &&
-		git shortlog -ns HEAD >actual &&
-		test_cmp expect actual
-	)
-
-Cloning into bare repository 'bare'...
-done.
-ok 21 - mailmap.blob defaults to HEAD:.mailmap in bare repo
-
-expecting success: 
-	cat >expect <<-\EOF &&
-	Tricky Guy (1):
-	      initial
-
-	nick1 (1):
-	      second
-
-	EOF
-	git -c mailmap.blob=map:no-newline shortlog HEAD >actual &&
-	test_cmp expect actual
-
-ok 22 - mailmap.blob can handle blobs without trailing newline
-
-expecting success: 
-	rm -f .mailmap
-
-ok 23 - cleanup after mailmap.blob tests
-
-expecting success: 
-	echo "     1	A <author@example.com>" >expect &&
-	echo "     1	nick1 <bugs@company.xx>" >>expect &&
-	echo "A <author@example.com>" >.mailmap &&
-	test_when_finished "rm .mailmap" &&
-	git shortlog -es HEAD >actual &&
-	test_cmp expect actual
-
-ok 24 - single-character name
-
-expecting success: 
-	echo "     1	A U Thor <AUTHOR@example.com>" >expect &&
-	echo "     1	nick1 <bugs@company.xx>" >>expect &&
-	echo "<AUTHOR@example.com> <author@example.com>" >.mailmap &&
-	test_when_finished "rm .mailmap" &&
-	git shortlog -es HEAD >actual &&
-	test_cmp expect actual
-
-ok 25 - preserve canonical email case
-
-expecting success: 
-	echo three >>one &&
-	git add one &&
-	test_tick &&
-	git commit --author "nick2 <bugs@company.xx>" -m third &&
-
-	echo four >>one &&
-	git add one &&
-	test_tick &&
-	git commit --author "nick2 <nick2@company.xx>" -m fourth &&
-
-	echo five >>one &&
-	git add one &&
-	test_tick &&
-	git commit --author "santa <me@company.xx>" -m fifth &&
-
-	echo six >>one &&
-	git add one &&
-	test_tick &&
-	git commit --author "claus <me@company.xx>" -m sixth &&
-
-	echo seven >>one &&
-	git add one &&
-	test_tick &&
-	git commit --author "CTO <cto@coompany.xx>" -m seventh &&
-
-	mkdir -p internal_mailmap &&
-	echo "Committed <committer@example.com>" > internal_mailmap/.mailmap &&
-	echo "<cto@company.xx>                       <cto@coompany.xx>" >> internal_mailmap/.mailmap &&
-	echo "Some Dude <some@dude.xx>         nick1 <bugs@company.xx>" >> internal_mailmap/.mailmap &&
-	echo "Other Author <other@author.xx>   nick2 <bugs@company.xx>" >> internal_mailmap/.mailmap &&
-	echo "Other Author <other@author.xx>         <nick2@company.xx>" >> internal_mailmap/.mailmap &&
-	echo "Santa Claus <santa.claus@northpole.xx> <me@company.xx>" >> internal_mailmap/.mailmap &&
-	echo "Santa Claus <santa.claus@northpole.xx> <me@company.xx>" >> internal_mailmap/.mailmap &&
-
-	git shortlog -e HEAD >actual &&
-	test_cmp expect actual
-
-
-[master 4db1a3d] third
- Author: nick2 <bugs@company.xx>
- 1 file changed, 1 insertion(+)
-[master e371838] fourth
- Author: nick2 <nick2@company.xx>
- 1 file changed, 1 insertion(+)
-[master 25e4bf3] fifth
- Author: santa <me@company.xx>
- 1 file changed, 1 insertion(+)
-[master 17c3971] sixth
- Author: claus <me@company.xx>
- 1 file changed, 1 insertion(+)
-[master f399f22] seventh
- Author: CTO <cto@coompany.xx>
+ 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(+)
-ok 26 - Shortlog output (complex mapping)
-
-expecting success: 
-	git log --pretty=format:"Author %an <%ae> maps to %aN <%aE>%nCommitter %cn <%ce> maps to %cN <%cE>%n" >actual &&
-	test_cmp expect actual
-
-ok 27 - Log output (complex mapping)
-
-expecting success: 
-	git log --use-mailmap | grep Author >actual &&
-	test_cmp expect actual
-
-ok 28 - Log output with --use-mailmap
-
-expecting success: 
-	git -c log.mailmap=True log | grep Author >actual &&
-	test_cmp expect actual
-
-ok 29 - Log output with log.mailmap
-
-expecting success: 
-	git log --use-mailmap --author Santa | grep Author >actual &&
-	test_cmp expect actual
-
-ok 30 - Grep author with --use-mailmap
-
-expecting success: 
-	git -c log.mailmap=True log --author Santa | grep Author >actual &&
-	test_cmp expect actual
-
-ok 31 - Grep author with log.mailmap
-
-expecting success: 
-	git log --use-mailmap --author "<cto@coompany.xx>" >actual &&
-	test_must_be_empty actual
-
-ok 32 - Only grep replaced author with --use-mailmap
-
-expecting success: 
-	git blame one >actual &&
-	fuzz_blame actual >actual.fuzz &&
-	test_cmp expect actual.fuzz
-
-ok 33 - Blame output (complex mapping)
-
-expecting success: 
-	test_must_fail git commit --author "nick" --allow-empty -meight &&
-	git commit --author "Some Dude" --allow-empty -meight &&
-	git show --pretty=format:"%an <%ae>%n" >actual &&
-	test_cmp expect actual
-
-fatal: --author 'nick' is not 'Name <email>' and matches no existing author
-[master 41e4fcf] eight
- Author: Some Dude <some@dude.xx>
-ok 34 - commit --author honors mailmap
-
-# passed all 34 test(s)
-1..34
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t4207-log-decoration-colors.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4207-log-decoration-colors/.git/
-expecting success: 
-	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.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>" &&
-
-	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
-
-[master (root-commit) 0ddfaf1] A
+ 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 A.t
-Cloning into 'other'...
-done.
-[master ca6ed14] A1
+ 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 A1.t
-Updating other
-From ./other
- * [new branch]      master     -> other/master
- * [new tag]         A1         -> A1
-[master d9df450] B
+ 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
+Switched to a new branch 'L'
+[L 4d89b91] left
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 B.t
-Saved working directory and index state On master: Changes to A.t
-ok 1 - setup
+ create mode 100644 left.t
+ok 1 - set up merge history
 
 expecting success: 
-	git log --first-parent --abbrev=10 --all --decorate --oneline --color=always |
-	sed "s/[0-9a-f]\{10,10\}/COMMIT_ID/" |
-	test_decode_color >out &&
-	test_cmp expected out
+	test_config log.graphColors red,green,yellow,blue,magenta,cyan &&
+	git log --color=always --graph --date-order --pretty=tformat:%s --all >actual.colors.raw &&
+	test_decode_color <actual.colors.raw | sed "s/ *\$//" >actual.colors &&
+	test_cmp expect.colors actual.colors
 
-ok 2 - Commit Decorations Colored Correctly
+ok 2 - log --graph with tricky octopus merge with colors
 
-# passed all 2 test(s)
-1..2
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t4210-log-i18n.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4210-log-i18n/.git/
 expecting success: 
-	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
+	git log --color=never --graph --date-order --pretty=tformat:%s --all >actual.raw &&
+	sed "s/ *\$//" actual.raw >actual &&
+	test_cmp expect.uncolored actual
 
-[master (root-commit) cbf2796] utf8
- Author: A U Thor <author@example.com>
- 1 file changed, 3 insertions(+)
- create mode 100644 msg
-[master b077cf9] latin1
- Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+), 2 deletions(-)
-ok 1 - create commits in different encodings
+ok 3 - log --graph with tricky octopus merge, no color
 
 expecting success: 
-	cat >expect <<-\EOF &&
-	latin1
-	utf8
+	cat >expect.uncolored <<-\EOF &&
+	*---.   octopus-merge
+	|\ \ \
+	| | | * 4
+	| | * | 3
+	| | |/
+	| * | 2
+	| |/
+	* | 1
+	|/
+	* initial
 	EOF
-	git log --encoding=utf8 --format=%s --grep=$utf8_e >actual &&
-	test_cmp expect actual
+	git log --color=never --graph --date-order --pretty=tformat:%s merge >actual.raw &&
+	sed "s/ *\$//" actual.raw >actual &&
+	test_cmp expect.uncolored actual
 
-ok 2 - log --grep searches in log output encoding (utf8)
+ok 4 - log --graph with normal octopus merge, no color
 
 expecting success: 
-	cat >expect <<-\EOF &&
-	latin1
-	utf8
+	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
-	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: 
-	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: 
-	git log --encoding=ISO-8859-1 --format=%s --grep=$utf8_e >actual &&
-	test_must_be_empty actual
+	test_config log.graphColors red,green,yellow,blue,magenta,cyan &&
+	git log --color=always --graph --date-order --pretty=tformat:%s merge >actual.colors.raw &&
+	test_decode_color <actual.colors.raw | sed "s/ *\$//" >actual.colors &&
+	test_cmp expect.colors actual.colors
 
-ok 5 - log --grep does not find non-reencoded values (latin1)
+ok 5 - log --graph with normal octopus merge with colors
 
 # passed all 5 test(s)
 1..5
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t4212-log-corrupt.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4212-log-corrupt/.git/
-expecting success: 
-	test_commit foo &&
-
-	git cat-file commit HEAD |
-	sed "/^author /s/>/>-<>/" >broken_email.commit &&
-	git hash-object -w -t commit broken_email.commit >broken_email.hash &&
-	git update-ref refs/heads/broken_email $(cat broken_email.hash)
-
-[master (root-commit) ddd63c9] foo
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo.t
-ok 1 - setup
-
-expecting success: 
-	test_must_fail git fsck 2>actual &&
-	test_i18ngrep invalid.author actual
-
-error in commit fb99366eaec195640f250774fc94d75e4f06f441: missingSpaceBeforeDate: invalid author/committer line - missing space before date
-ok 2 - fsck notices broken commit
-
-expecting success: 
-	{
-		echo commit $(cat broken_email.hash)
-		echo "Author: A U Thor <author@example.com>"
-		echo "Date:   Thu Apr 7 15:13:13 2005 -0700"
-		echo
-		echo "    foo"
-	} >expect.out &&
-
-	git log broken_email >actual.out 2>actual.err &&
-
-	test_cmp expect.out actual.out &&
-	test_must_be_empty actual.err
-
-ok 3 - git log with broken author email
-
-expecting success: 
-	echo "A U Thor+author@example.com+Thu Apr 7 15:13:13 2005 -0700" >expect.out &&
-
-	git log --format="%an+%ae+%ad" broken_email >actual.out 2>actual.err &&
-
-	test_cmp expect.out actual.out &&
-	test_must_be_empty actual.err
-
-ok 4 - git log --format with broken author email
-
-expecting success: 
-	commit=$(munge_author_date HEAD totally_bogus) &&
-	echo "Date:   Thu Jan 1 00:00:00 1970 +0000" >expect &&
-	git log -1 $commit >actual.full &&
-	grep Date <actual.full >actual &&
-	test_cmp expect actual
-
-ok 5 - unparsable dates produce sentinel value
-
-expecting success: 
-	commit=$(munge_author_date HEAD totally_bogus) &&
-	echo >expect &&
-	git log -1 --format=%ad $commit >actual &&
-	test_cmp expect actual
-
-ok 6 - unparsable dates produce sentinel value (%ad)
-
-expecting success: 
-	commit=$(munge_author_date HEAD 18446744073709551617) &&
-	echo "Thu Jan 1 00:00:00 1970 +0000" >expect &&
-	git log -1 --format=%ad $commit >actual &&
-	test_cmp expect actual
-
-ok 7 - date parser recognizes integer overflow
-
-expecting success: 
-	commit=$(munge_author_date HEAD 18446744073709551614) &&
-	echo "Thu Jan 1 00:00:00 1970 +0000" >expect &&
-	git log -1 --format=%ad $commit >actual &&
-	test_cmp expect actual
-
-ok 8 - date parser recognizes time_t overflow
-
-expecting success: 
-	commit=$(munge_author_date HEAD 999999999999999999) &&
-	git log -1 --format=%ad $commit
-
-Thu Jan 1 00:00:00 1970 +0000
-ok 9 - absurdly far-in-future date
-
-# passed all 9 test(s)
-1..9
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t4209-log-pickaxe.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4209-log-pickaxe/.git/
+*** t4254-am-corrupt.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4254-am-corrupt/.git/
 expecting success: 
-	>expect_nomatch &&
-
-	>file &&
-	git add file &&
-	test_tick &&
-	git commit -m initial &&
-	git rev-parse --verify HEAD >expect_initial &&
+	# Note the missing "+++" line:
+	cat >bad-patch.diff <<-\EOF &&
+	From: A U Thor <au.thor@example.com>
+	diff --git a/f b/f
+	index 7898192..6178079 100644
+	--- a/f
+	@@ -1 +1 @@
+	-a
+	+b
+	EOF
 
-	echo Picked >file &&
-	git add file &&
+	echo a >f &&
+	git add f &&
 	test_tick &&
-	git commit --author="Another Person <another@example.com>" -m second &&
-	git rev-parse --verify HEAD >expect_second
+	git commit -m initial
 
-[master (root-commit) 1bd44cb] initial
+[master (root-commit) 07398d1] initial
  Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 file
-[master 64f6655] second
- Author: Another Person <another@example.com>
  1 file changed, 1 insertion(+)
+ create mode 100644 f
 ok 1 - setup
 
 expecting success: 
-		git log  --grep=initial --format=%H >actual &&
-		test_cmp expect_initial actual
-	
-ok 2 - log --grep (match)
-
-expecting success: 
-		git log  --grep=InItial --format=%H >actual &&
-		test_cmp expect_nomatch actual
-	
-ok 3 - log --grep (nomatch)
-
-expecting success: 
-		git log --regexp-ignore-case --grep=InItial --format=%H >actual &&
-		test_cmp expect_initial actual
-	
-ok 4 - log --grep --regexp-ignore-case (match)
-
-expecting success: 
-		git log -i --grep=InItial --format=%H >actual &&
-		test_cmp expect_initial actual
-	
-ok 5 - log --grep -i (match)
-
-expecting success: 
-		git log --regexp-ignore-case --grep=initail --format=%H >actual &&
-		test_cmp expect_nomatch actual
-	
-ok 6 - log --grep --regexp-ignore-case (nomatch)
-
-expecting success: 
-		git log -i --grep=initail --format=%H >actual &&
-		test_cmp expect_nomatch actual
-	
-ok 7 - log --grep -i (nomatch)
-
-expecting success: 
-		git log  --author=Person --format=%H >actual &&
-		test_cmp expect_second actual
-	
-ok 8 - log --author (match)
-
-expecting success: 
-		git log  --author=person --format=%H >actual &&
-		test_cmp expect_nomatch actual
-	
-ok 9 - log --author (nomatch)
-
-expecting success: 
-		git log --regexp-ignore-case --author=person --format=%H >actual &&
-		test_cmp expect_second actual
-	
-ok 10 - log --author --regexp-ignore-case (match)
-
-expecting success: 
-		git log -i --author=person --format=%H >actual &&
-		test_cmp expect_second actual
-	
-ok 11 - log --author -i (match)
-
-expecting success: 
-		git log --regexp-ignore-case --author=spreon --format=%H >actual &&
-		test_cmp expect_nomatch actual
-	
-ok 12 - log --author --regexp-ignore-case (nomatch)
-
-expecting success: 
-		git log -i --author=spreon --format=%H >actual &&
-		test_cmp expect_nomatch actual
-	
-ok 13 - log --author -i (nomatch)
-
-expecting success: 
-		git log  -Gpicked --format=%H >actual &&
-		test_cmp expect_nomatch actual
-	
-ok 14 - log -G (nomatch)
-
-expecting success: 
-		git log  -GPicked --format=%H >actual &&
-		test_cmp expect_second actual
-	
-ok 15 - log -G (match)
-
-expecting success: 
-		git log --regexp-ignore-case -Gpickle --format=%H >actual &&
-		test_cmp expect_nomatch actual
-	
-ok 16 - log -G --regexp-ignore-case (nomatch)
-
-expecting success: 
-		git log -i -Gpickle --format=%H >actual &&
-		test_cmp expect_nomatch actual
-	
-ok 17 - log -G -i (nomatch)
-
-expecting success: 
-		git log --regexp-ignore-case -Gpicked --format=%H >actual &&
-		test_cmp expect_second actual
-	
-ok 18 - log -G --regexp-ignore-case (match)
-
-expecting success: 
-		git log -i -Gpicked --format=%H >actual &&
-		test_cmp expect_second actual
-	
-ok 19 - log -G -i (match)
-
-expecting success: 
-	echo "* diff=test" >.gitattributes &&
-	test_must_fail git -c diff.test.textconv=missing log -Gfoo &&
-	rm .gitattributes
-
-error: cannot run missing: No such file or directory
-fatal: unable to read files to diff
-ok 20 - log -G --textconv (missing textconv tool)
-
-expecting success: 
-	echo "* diff=test" >.gitattributes &&
-	git -c diff.test.textconv=missing log -Gfoo --no-textconv >actual &&
-	test_cmp expect_nomatch actual &&
-	rm .gitattributes
-
-ok 21 - log -G --no-textconv (missing textconv tool)
-
-expecting success: 
-		git log  -Spicked --format=%H >actual &&
-		test_cmp expect_nomatch actual
-	
-ok 22 - log -S (nomatch)
-
-expecting success: 
-		git log  -SPicked --format=%H >actual &&
-		test_cmp expect_second actual
-	
-ok 23 - log -S (match)
-
-expecting success: 
-		git log --regexp-ignore-case -Spicked --format=%H >actual &&
-		test_cmp expect_second actual
-	
-ok 24 - log -S --regexp-ignore-case (match)
-
-expecting success: 
-		git log -i -Spicked --format=%H >actual &&
-		test_cmp expect_second actual
-	
-ok 25 - log -S -i (match)
-
-expecting success: 
-		git log --regexp-ignore-case -Spickle --format=%H >actual &&
-		test_cmp expect_nomatch actual
-	
-ok 26 - log -S --regexp-ignore-case (nomatch)
-
-expecting success: 
-		git log -i -Spickle --format=%H >actual &&
-		test_cmp expect_nomatch actual
-	
-ok 27 - log -S -i (nomatch)
-
-expecting success: 
-		git log --pickaxe-regex -Sp.cked --format=%H >actual &&
-		test_cmp expect_nomatch actual
-	
-ok 28 - log -S --pickaxe-regex (nomatch)
-
-expecting success: 
-		git log --pickaxe-regex -SP.cked --format=%H >actual &&
-		test_cmp expect_second actual
-	
-ok 29 - log -S --pickaxe-regex (match)
-
-expecting success: 
-		git log --pickaxe-regex --regexp-ignore-case -Sp.cked --format=%H >actual &&
-		test_cmp expect_second actual
-	
-ok 30 - log -S --pickaxe-regex --regexp-ignore-case (match)
-
-expecting success: 
-		git log --pickaxe-regex -i -Sp.cked --format=%H >actual &&
-		test_cmp expect_second actual
-	
-ok 31 - log -S --pickaxe-regex -i (match)
-
-expecting success: 
-		git log --pickaxe-regex --regexp-ignore-case -Sp.ckle --format=%H >actual &&
-		test_cmp expect_nomatch actual
-	
-ok 32 - log -S --pickaxe-regex --regexp-ignore-case (nomatch)
-
-expecting success: 
-		git log --pickaxe-regex -i -Sp.ckle --format=%H >actual &&
-		test_cmp expect_nomatch actual
-	
-ok 33 - log -S --pickaxe-regex -i (nomatch)
-
-expecting success: 
-	echo "* diff=test" >.gitattributes &&
-	test_must_fail git -c diff.test.textconv=missing log -Sfoo &&
-	rm .gitattributes
+	test_must_fail git -c advice.amWorkDir=false am bad-patch.diff 2>actual
 
-error: cannot run missing: No such file or directory
-fatal: unable to read files to diff
-ok 34 - log -S --textconv (missing textconv tool)
+Applying: 
+Patch failed at 0001 
+When you have resolved this problem, run "git am --continue".
+If you prefer to skip this patch, run "git am --skip" instead.
+To restore the original branch and stop patching, run "git am --abort".
+ok 2 - try to apply corrupted patch
 
 expecting success: 
-	echo "* diff=test" >.gitattributes &&
-	git -c diff.test.textconv=missing log -Sfoo --no-textconv >actual &&
-	test_cmp expect_nomatch actual &&
-	rm .gitattributes
+	echo "error: git diff header lacks filename information (line 4)" >expected &&
+	test_path_is_file f &&
+	test_i18ncmp expected actual
 
-ok 35 - log -S --no-textconv (missing textconv tool)
+ok 3 - compare diagnostic; ensure file is still here
 
-# passed all 35 test(s)
-1..35
+# passed all 3 test(s)
+1..3
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
 *** t4211-line-log.sh ***
@@ -130020,16 +131144,16 @@
 	git commit -m "modify many lines" &&
 	git log $(for x in $(test_seq 200); do echo -L $((2*x)),+1:c.c; done)
 
-[parallel-change 6611312] many lines
+[parallel-change 3867e80] many lines
  Author: A U Thor <author@example.com>
  1 file changed, 500 insertions(+)
  create mode 100644 c.c
-[parallel-change fe0efde] modify many lines
+[parallel-change 455905f] modify many lines
  Author: A U Thor <author@example.com>
  1 file changed, 500 insertions(+)
-commit 66113128cdba993ba6019bbd40fe8db2f5fbcd24
+commit 3867e80230363a929a4c1fe5ccfac2fc49fdfc02
 Author: A U Thor <author@example.com>
-Date:   Fri Dec 3 05:07:45 2021 +0000
+Date:   Thu Jan 5 11:48:53 2023 +0000
 
     many lines
 
@@ -130044,703 +131168,684 @@
 1..36
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t4214-log-graph-octopus.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4214-log-graph-octopus/.git/
+*** t4205-log-pretty-formats.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4205-log-pretty-formats/.git/
 expecting success: 
-	cat >expect.uncolored <<-\EOF &&
-	* left
-	| *---.   octopus-merge
-	| |\ \ \
-	|/ / / /
-	| | | * 4
-	| | * | 3
-	| | |/
-	| * | 2
-	| |/
-	* | 1
-	|/
-	* initial
-	EOF
-	cat >expect.colors <<-\EOF &&
-	* left
-	<RED>|<RESET> *<BLUE>-<RESET><BLUE>-<RESET><MAGENTA>-<RESET><MAGENTA>.<RESET>   octopus-merge
-	<RED>|<RESET> <RED>|<RESET><YELLOW>\<RESET> <BLUE>\<RESET> <MAGENTA>\<RESET>
-	<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_commit initial &&
-	for i in 1 2 3 4 ; do
-		git checkout master -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 &&
+	>foo &&
+	>bar &&
+	git add foo &&
 	test_tick &&
-	git merge -m octopus-merge 1 2 3 4 &&
-	git checkout 1 -b L &&
-	test_commit left
+	git config i18n.commitEncoding $test_encoding &&
+	commit_msg $test_encoding | git commit -F - &&
+	git add bar &&
+	test_tick &&
+	git commit -m "add bar" &&
+	git config --unset i18n.commitEncoding
 
-[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 '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
+[master (root-commit) 4780d11] initial. anfänglich
  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
-Switched to a new branch 'L'
-[L 4d89b91] left
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 foo
+[master 91b4447] add bar
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 left.t
-ok 1 - set up merge history
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 bar
+ok 1 - set up basic repos
 
 expecting success: 
-	test_config log.graphColors red,green,yellow,blue,magenta,cyan &&
-	git log --color=always --graph --date-order --pretty=tformat:%s --all >actual.colors.raw &&
-	test_decode_color <actual.colors.raw | sed "s/ *\$//" >actual.colors &&
-	test_cmp expect.colors actual.colors
+	git log --pretty=oneline >expected &&
+	git config pretty.test-alias oneline &&
+	git log --pretty=test-alias >actual &&
+	test_cmp expected actual
 
-ok 2 - log --graph with tricky octopus merge with colors
+ok 2 - alias builtin format
 
 expecting success: 
-	git log --color=never --graph --date-order --pretty=tformat:%s --all >actual.raw &&
-	sed "s/ *\$//" actual.raw >actual &&
-	test_cmp expect.uncolored actual
+	git log --pretty=oneline >expected &&
+	git config pretty.oneline "%H" &&
+	git log --pretty=oneline >actual &&
+	test_cmp expected actual
 
-ok 3 - log --graph with tricky octopus merge, no color
+ok 3 - alias masking builtin format
 
 expecting success: 
-	cat >expect.uncolored <<-\EOF &&
-	*---.   octopus-merge
-	|\ \ \
-	| | | * 4
-	| | * | 3
-	| | |/
-	| * | 2
-	| |/
-	* | 1
-	|/
-	* initial
-	EOF
-	git log --color=never --graph --date-order --pretty=tformat:%s merge >actual.raw &&
-	sed "s/ *\$//" actual.raw >actual &&
-	test_cmp expect.uncolored actual
+	git log --pretty="format:%h" >expected &&
+	git config pretty.test-alias "format:%h" &&
+	git log --pretty=test-alias >actual &&
+	test_cmp expected actual
 
-ok 4 - log --graph with normal octopus merge, no color
+ok 4 - alias user-defined format
 
 expecting success: 
-	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 &&
-	git log --color=always --graph --date-order --pretty=tformat:%s merge >actual.colors.raw &&
-	test_decode_color <actual.colors.raw | sed "s/ *\$//" >actual.colors &&
-	test_cmp expect.colors actual.colors
+	git config i18n.logOutputEncoding $test_encoding &&
+	git log --oneline >expected-s &&
+	git log --pretty="tformat:%h %s" >actual-s &&
+	git config --unset i18n.logOutputEncoding &&
+	test_cmp expected-s actual-s
 
-ok 5 - log --graph with normal octopus merge with colors
+ok 5 - alias user-defined tformat with %s (ISO8859-1 encoding)
 
-# passed all 5 test(s)
-1..5
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t4208-log-magic-pathspec.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4208-log-magic-pathspec/.git/
 expecting success: 
-	test_commit initial &&
-	test_tick &&
-	git commit --allow-empty -m empty &&
-	mkdir sub
+	git log --oneline >expected-s &&
+	git log --pretty="tformat:%h %s" >actual-s &&
+	test_cmp expected-s actual-s
 
-[master (root-commit) 24b24cf] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-[master 41d179c] empty
- Author: A U Thor <author@example.com>
-ok 1 - setup
+ok 6 - alias user-defined tformat with %s (utf-8 encoding)
 
 expecting success: 
-	git log :/
-
-commit 24b24cf8a829f5b8c30dfc018b0a459a2ccaf380
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:13:13 2005 -0700
+	git log --pretty="tformat:%h" >expected &&
+	git config pretty.test-alias "tformat:%h" &&
+	git log --pretty=test-alias >actual &&
+	test_cmp expected actual
 
-    initial
-ok 2 - "git log :/" should not be ambiguous
+ok 7 - alias user-defined tformat
 
 expecting success: 
-	: >a &&
-	test_must_fail git log :/a 2>error &&
-	test_i18ngrep ambiguous error
+	git config pretty.test-alias format-that-will-never-exist &&
+	test_must_fail git log --pretty=test-alias
 
-fatal: ambiguous argument ':/a': both revision and filename
-ok 3 - "git log :/a" should be ambiguous (applied both rev and worktree)
+fatal: invalid --pretty format: test-alias
+ok 8 - alias non-existent format
 
 expecting success: 
-	git log :/a --
-
-commit 24b24cf8a829f5b8c30dfc018b0a459a2ccaf380
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:13:13 2005 -0700
+	git log --pretty="tformat:%h" >expected &&
+	git config pretty.test-foo "tformat:%h" &&
+	git config pretty.test-bar test-foo &&
+	git log --pretty=test-bar >actual && test_cmp expected actual
 
-    initial
-ok 4 - "git log :/a -- " should not be ambiguous
+ok 9 - alias of an alias
 
 expecting success: 
-	test_when_finished "git checkout master" &&
-	git checkout --detach &&
-	# Must manually call `test_tick` instead of using `test_commit`,
-	# because the latter additionally creates a tag, which would make
-	# the commit reachable not only via HEAD.
-	test_tick &&
-	git commit --allow-empty -m detached &&
-	test_tick &&
-	git commit --allow-empty -m something-else &&
-	git log :/detached --
-
-HEAD is now at 41d179c empty
-[detached HEAD 29f803f] detached
- Author: A U Thor <author@example.com>
-[detached HEAD 1c7309e] something-else
- Author: A U Thor <author@example.com>
-commit 29f803fa5dd3286073a333650848a30b4d2166d5
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:15:13 2005 -0700
+	git log --pretty=format:"Two %H" >expected &&
+	git config pretty.duplicate "format:One %H" &&
+	git config --add pretty.duplicate "format:Two %H" &&
+	git log --pretty=duplicate >actual &&
+	test_cmp expected actual
 
-    detached
+ok 10 - alias masking an alias
 
-commit 41d179cf92d6e064ff558d58ffa668d1ed939109
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:14:13 2005 -0700
+expecting success: 
+	git config pretty.test-foo test-bar &&
+	git config pretty.test-bar test-foo &&
+	test_must_fail git log --pretty=test-foo
 
-    empty
+fatal: invalid --pretty format: 'test-foo' references an alias which points to itself
+ok 11 - alias loop
 
-commit 24b24cf8a829f5b8c30dfc018b0a459a2ccaf380
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:13:13 2005 -0700
+expecting success: 
+	printf "add bar\0$(commit_msg)" >expected &&
+	git log -z --pretty="format:%s" >actual &&
+	test_cmp expected actual
 
-    initial
-Warning: you are leaving 2 commits behind, not connected to
-any of your branches:
+ok 12 - NUL separation
 
-  1c7309e something-else
-  29f803f detached
+expecting success: 
+	printf "add bar\0$(commit_msg)\0" >expected &&
+	git log -z --pretty="tformat:%s" >actual &&
+	test_cmp expected actual
 
-If you want to keep them by creating a new branch, this may be a good time
-to do so with:
+ok 13 - NUL termination
 
- git branch <new-branch-name> 1c7309e
+expecting success: 
+	stat0_part=$(git diff --stat HEAD^ HEAD) &&
+	stat1_part=$(git diff-tree --no-commit-id --stat --root HEAD^) &&
+	printf "add bar\n$stat0_part\n\0$(commit_msg)\n$stat1_part\n" >expected &&
+	git log -z --stat --pretty="format:%s" >actual &&
+	test_i18ncmp expected actual
 
-Switched to branch 'master'
-ok 5 - "git log :/detached -- " should find a commit only in HEAD
+ok 14 - NUL separation with --stat
 
-expecting success: 
-	test_must_fail git log :/detached --
+checking known breakage: 
+	stat0_part=$(git diff --stat HEAD^ HEAD) &&
+	stat1_part=$(git diff-tree --no-commit-id --stat --root HEAD^) &&
+	printf "add bar\n$stat0_part\n\0$(commit_msg)\n$stat1_part\n0" >expected &&
+	git log -z --stat --pretty="tformat:%s" >actual &&
+	test_cmp expected actual
 
-fatal: bad revision ':/detached'
-ok 6 - "git log :/detached -- " should not find an orphaned commit
+Binary files expected and actual differ
+not ok 15 - NUL termination with --stat # TODO known breakage
 
 expecting success: 
-	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 --
+	test_commit "message one" one one message-one &&
+	test_commit "message two" two two message-two &&
+	head1=$(git rev-parse --verify --short HEAD~0) &&
+	head2=$(git rev-parse --verify --short HEAD~1) &&
+	head3=$(git rev-parse --verify --short HEAD~2) &&
+	head4=$(git rev-parse --verify --short HEAD~3)
 
-Preparing worktree (detached HEAD 41d179c)
-HEAD is now at 41d179c empty
-HEAD is now at 41d179c empty
-[detached HEAD 690db08] other-detached
+[master 23ca4f5] message one
  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
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one
+[master a015cbe] message two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two
+ok 16 - setup more commits
 
-    other-detached
+expecting success: 
+	git log --pretty="tformat:%<(40)%s" >actual &&
+	qz_to_tab_space <<-EOF >expected &&
+	message two                            Z
+	message one                            Z
+	add bar                                Z
+	$(commit_msg)                    Z
+	EOF
+	test_cmp expected actual
 
-commit 41d179cf92d6e064ff558d58ffa668d1ed939109
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:14:13 2005 -0700
+ok 17 - left alignment formatting
 
-    empty
+expecting success: 
+	git -c i18n.logOutputEncoding=$test_encoding log --pretty="tformat:%<(40)%s" >actual &&
+	qz_to_tab_space <<-EOF | iconv -f utf-8 -t $test_encoding >expected &&
+	message two                            Z
+	message one                            Z
+	add bar                                Z
+	$(commit_msg)                    Z
+	EOF
+	test_cmp expected actual
 
-commit 24b24cf8a829f5b8c30dfc018b0a459a2ccaf380
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:13:13 2005 -0700
+ok 18 - left alignment formatting. i18n.logOutputEncoding
 
-    initial
-fatal: bad revision ':/other-detached'
-ok 7 - "git log :/detached -- " should find HEAD only of own worktree
+expecting success: 
+	git log --pretty="tformat:%h %<|(40)%s" >actual &&
+	qz_to_tab_space <<-EOF >expected &&
+	$head1 message two                    Z
+	$head2 message one                    Z
+	$head3 add bar                        Z
+	$head4 $(commit_msg)            Z
+	EOF
+	test_cmp expected actual
+
+ok 19 - left alignment formatting at the nth column
 
 expecting success: 
-	git log -- :/a
+	COLUMNS=50 git log --pretty="tformat:%h %<|(-10)%s" >actual &&
+	qz_to_tab_space <<-EOF >expected &&
+	$head1 message two                    Z
+	$head2 message one                    Z
+	$head3 add bar                        Z
+	$head4 $(commit_msg)            Z
+	EOF
+	test_cmp expected actual
 
-ok 8 - "git log -- :/a" should not be ambiguous
+ok 20 - left alignment formatting at the nth column
 
 expecting success: 
-	git log :/in
+	git -c i18n.logOutputEncoding=$test_encoding log --pretty="tformat:%h %<|(40)%s" >actual &&
+	qz_to_tab_space <<-EOF | iconv -f utf-8 -t $test_encoding >expected &&
+	$head1 message two                    Z
+	$head2 message one                    Z
+	$head3 add bar                        Z
+	$head4 $(commit_msg)            Z
+	EOF
+	test_cmp expected actual
 
-commit 24b24cf8a829f5b8c30dfc018b0a459a2ccaf380
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:13:13 2005 -0700
+ok 21 - left alignment formatting at the nth column. i18n.logOutputEncoding
 
-    initial
-ok 9 - "git log :/in" should not be ambiguous
+expecting success: 
+	git log --pretty="tformat:%<(1)%s" >actual &&
+	cat <<-EOF >expected &&
+	message two
+	message one
+	add bar
+	$(commit_msg)
+	EOF
+	test_cmp expected actual
+
+ok 22 - left alignment formatting with no padding
 
 expecting success: 
-	test_must_fail git log : 2>error &&
-	test_i18ngrep ambiguous error
+	git -c i18n.logOutputEncoding=$test_encoding log --pretty="tformat:%<(1)%s" >actual &&
+	cat <<-EOF | iconv -f utf-8 -t $test_encoding >expected &&
+	message two
+	message one
+	add bar
+	$(commit_msg)
+	EOF
+	test_cmp expected actual
 
-fatal: ambiguous argument ':': unknown revision or path not in the working tree.
-ok 10 - "git log :" should be ambiguous
+ok 23 - left alignment formatting with no padding. i18n.logOutputEncoding
 
 expecting success: 
-	git log -- :
+	git log --pretty="tformat:%<(10,trunc)%s" >actual &&
+	qz_to_tab_space <<-\EOF >expected &&
+	message ..
+	message ..
+	add bar  Z
+	initial...
+	EOF
+	test_cmp expected actual
 
-commit 24b24cf8a829f5b8c30dfc018b0a459a2ccaf380
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:13:13 2005 -0700
+ok 24 - left alignment formatting with trunc
 
-    initial
-ok 11 - git log -- :
+expecting success: 
+	git -c i18n.logOutputEncoding=$test_encoding log --pretty="tformat:%<(10,trunc)%s" >actual &&
+	qz_to_tab_space <<-\EOF | iconv -f utf-8 -t $test_encoding >expected &&
+	message ..
+	message ..
+	add bar  Z
+	initial...
+	EOF
+	test_cmp expected actual
+
+ok 25 - left alignment formatting with trunc. i18n.logOutputEncoding
 
 expecting success: 
-	initial=$(git rev-parse --short HEAD^) &&
-	cat >expected <<-EOF &&
-	$initial initial
+	git log --pretty="tformat:%<(10,ltrunc)%s" >actual &&
+	qz_to_tab_space <<-EOF >expected &&
+	..sage two
+	..sage one
+	add bar  Z
+	..${sample_utf8_part}lich
 	EOF
-	(cd sub && git log --oneline HEAD -- :/ >../actual) &&
 	test_cmp expected actual
 
-ok 12 - git log HEAD -- :/
+ok 26 - left alignment formatting with ltrunc
 
 expecting success: 
-	git log :^sub
+	git -c i18n.logOutputEncoding=$test_encoding log --pretty="tformat:%<(10,ltrunc)%s" >actual &&
+	qz_to_tab_space <<-EOF | iconv -f utf-8 -t $test_encoding >expected &&
+	..sage two
+	..sage one
+	add bar  Z
+	..${sample_utf8_part}lich
+	EOF
+	test_cmp expected actual
 
-commit 24b24cf8a829f5b8c30dfc018b0a459a2ccaf380
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:13:13 2005 -0700
+ok 27 - left alignment formatting with ltrunc. i18n.logOutputEncoding
 
-    initial
-ok 13 - "git log :^sub" is not ambiguous
+expecting success: 
+	git log --pretty="tformat:%<(10,mtrunc)%s" >actual &&
+	qz_to_tab_space <<-\EOF >expected &&
+	mess.. two
+	mess.. one
+	add bar  Z
+	init..lich
+	EOF
+	test_cmp expected actual
+
+ok 28 - left alignment formatting with mtrunc
 
 expecting success: 
-	test_must_fail git log :^does-not-exist
+	git -c i18n.logOutputEncoding=$test_encoding log --pretty="tformat:%<(10,mtrunc)%s" >actual &&
+	qz_to_tab_space <<-\EOF | iconv -f utf-8 -t $test_encoding >expected &&
+	mess.. two
+	mess.. one
+	add bar  Z
+	init..lich
+	EOF
+	test_cmp expected actual
 
-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 14 - "git log :^does-not-exist" does not match anything
+ok 29 - left alignment formatting with mtrunc. i18n.logOutputEncoding
 
 expecting success: 
-	git log :!sub &&
-	test_must_fail git log :!does-not-exist
+	git log --pretty="tformat:%>(40)%s" >actual &&
+	qz_to_tab_space <<-EOF >expected &&
+	Z                            message two
+	Z                            message one
+	Z                                add bar
+	Z                    $(commit_msg)
+	EOF
+	test_cmp expected actual
 
-commit 24b24cf8a829f5b8c30dfc018b0a459a2ccaf380
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:13:13 2005 -0700
+ok 30 - right alignment formatting
 
-    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 15 - "git log :!" behaves the same as :^
+expecting success: 
+	git -c i18n.logOutputEncoding=$test_encoding log --pretty="tformat:%>(40)%s" >actual &&
+	qz_to_tab_space <<-EOF | iconv -f utf-8 -t $test_encoding >expected &&
+	Z                            message two
+	Z                            message one
+	Z                                add bar
+	Z                    $(commit_msg)
+	EOF
+	test_cmp expected actual
+
+ok 31 - right alignment formatting. i18n.logOutputEncoding
 
 expecting success: 
-	git log ":(exclude)sub"
+	git log --pretty="tformat:%h %>|(40)%s" >actual &&
+	qz_to_tab_space <<-EOF >expected &&
+	$head1                      message two
+	$head2                      message one
+	$head3                          add bar
+	$head4              $(commit_msg)
+	EOF
+	test_cmp expected actual
 
-commit 24b24cf8a829f5b8c30dfc018b0a459a2ccaf380
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:13:13 2005 -0700
+ok 32 - right alignment formatting at the nth column
 
-    initial
-ok 16 - "git log :(exclude)sub" is not ambiguous
+expecting success: 
+	COLUMNS=50 git log --pretty="tformat:%h %>|(-10)%s" >actual &&
+	qz_to_tab_space <<-EOF >expected &&
+	$head1                      message two
+	$head2                      message one
+	$head3                          add bar
+	$head4              $(commit_msg)
+	EOF
+	test_cmp expected actual
+
+ok 33 - right alignment formatting at the nth column
 
 expecting success: 
-	test_must_fail git log ":(exclude)sub" --
+	git -c i18n.logOutputEncoding=$test_encoding log --pretty="tformat:%h %>|(40)%s" >actual &&
+	qz_to_tab_space <<-EOF | iconv -f utf-8 -t $test_encoding >expected &&
+	$head1                      message two
+	$head2                      message one
+	$head3                          add bar
+	$head4              $(commit_msg)
+	EOF
+	test_cmp expected actual
 
-fatal: bad revision ':(exclude)sub'
-ok 17 - "git log :(exclude)sub --" must resolve as an object
+ok 34 - right alignment formatting at the nth column. i18n.logOutputEncoding
 
 expecting success: 
-	test_must_fail git log ":(unknown-magic)" 2>error &&
-	test_i18ngrep pathspec.magic error
+	git -c i18n.logOutputEncoding=$test_encoding log --graph --pretty="tformat:%h %>|(40)%s" >actual &&
+	iconv -f utf-8 -t $test_encoding >expected <<-EOF &&
+	* $head1                    message two
+	* $head2                    message one
+	* $head3                        add bar
+	* $head4            $(commit_msg)
+	EOF
+	test_cmp expected actual
 
-fatal: Invalid pathspec magic 'unknown-magic' in ':(unknown-magic)'
-ok 18 - "git log :(unknown-magic) complains of bogus magic
+ok 35 - right alignment formatting at the nth column with --graph. i18n.logOutputEncoding
 
 expecting success: 
-	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 master &&
-	git add a &&
-	git log --merge -- a
+	git log --pretty="tformat:%>(1)%s" >actual &&
+	cat <<-EOF >expected &&
+	message two
+	message one
+	add bar
+	$(commit_msg)
+	EOF
+	test_cmp expected actual
 
-HEAD is now at 41d179c empty
-[master 520c03e] add an empty a
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 a
-[master 35b719c] update a to 1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Note: checking out 'HEAD^'.
+ok 36 - right alignment formatting with no padding
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by performing another checkout.
+expecting success: 
+	git log --graph --pretty="tformat:%>(1)%s" >actual &&
+	cat <<-EOF >expected &&
+	* message two
+	* message one
+	* add bar
+	* $(commit_msg)
+	EOF
+	test_cmp expected actual
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
+ok 37 - right alignment formatting with no padding and with --graph
 
-  git checkout -b <new-branch-name>
+expecting success: 
+	git -c i18n.logOutputEncoding=$test_encoding log --pretty="tformat:%>(1)%s" >actual &&
+	cat <<-EOF | iconv -f utf-8 -t $test_encoding >expected &&
+	message two
+	message one
+	add bar
+	$(commit_msg)
+	EOF
+	test_cmp expected actual
 
-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(+)
-Merging:
-61d8fe9 update a to 2
-virtual master
-found 1 common ancestor:
-520c03e add an empty a
-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
+ok 38 - right alignment formatting with no padding. i18n.logOutputEncoding
 
-    update a to 2
+expecting success: 
+	git log --pretty="tformat:%><(40)%s" >actual &&
+	qz_to_tab_space <<-EOF >expected &&
+	Z             message two              Z
+	Z             message one              Z
+	Z               add bar                Z
+	Z         $(commit_msg)          Z
+	EOF
+	test_cmp expected actual
 
-commit 35b719c5373bb94b370829ac90035e2cd80daaba
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:17:13 2005 -0700
+ok 39 - center alignment formatting
 
-    update a to 1
-ok 19 - command line pathspec parsing for "git log"
+expecting success: 
+	git -c i18n.logOutputEncoding=$test_encoding log --pretty="tformat:%><(40)%s" >actual &&
+	qz_to_tab_space <<-EOF | iconv -f utf-8 -t $test_encoding >expected &&
+	Z             message two              Z
+	Z             message one              Z
+	Z               add bar                Z
+	Z         $(commit_msg)          Z
+	EOF
+	test_cmp expected actual
+
+ok 40 - center alignment formatting. i18n.logOutputEncoding
 
 expecting success: 
-	test_when_finished "rm -rf repo submodule" &&
-	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 log --pretty="tformat:%h %><|(40)%s" >actual &&
+	qz_to_tab_space <<-EOF >expected &&
+	$head1           message two          Z
+	$head2           message one          Z
+	$head3             add bar            Z
+	$head4       $(commit_msg)      Z
+	EOF
+	test_cmp expected actual
 
-	git -C repo submodule add ../submodule &&
-	test_tick &&
-	git -C repo commit -m submodule &&
+ok 41 - center alignment formatting at the nth column
 
-	git -C repo rev-list HEAD -- "[bracket]" >actual &&
-	test_cmp expect actual
+expecting success: 
+	COLUMNS=70 git log --pretty="tformat:%h %><|(-30)%s" >actual &&
+	qz_to_tab_space <<-EOF >expected &&
+	$head1           message two          Z
+	$head2           message one          Z
+	$head3             add bar            Z
+	$head4       $(commit_msg)      Z
+	EOF
+	test_cmp expected actual
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4208-log-magic-pathspec/submodule/.git/
-[master (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/git-2.20.1/t/trash directory.t4208-log-magic-pathspec/repo/.git/
-[master (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/git-2.20.1/t/trash directory.t4208-log-magic-pathspec/repo/submodule'...
-done.
-[master 2614379] submodule
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 submodule
-ok 20 - tree_entry_interesting does not match past submodule boundaries
+ok 42 - center alignment formatting at the nth column
 
-# passed all 20 test(s)
-1..20
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t4252-am-options.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4252-am-options/.git/
 expecting success: 
-	cp "$tm/file-1-0" file-1 &&
-	cp "$tm/file-2-0" file-2 &&
-	git add file-1 file-2 &&
-	test_tick &&
-	git commit -m initial &&
-	git tag initial
+	git -c i18n.logOutputEncoding=$test_encoding log --pretty="tformat:%h %><|(40)%s" >actual &&
+	qz_to_tab_space <<-EOF | iconv -f utf-8 -t $test_encoding >expected &&
+	$head1           message two          Z
+	$head2           message one          Z
+	$head3             add bar            Z
+	$head4       $(commit_msg)      Z
+	EOF
+	test_cmp expected actual
 
-[master (root-commit) f06d5e1] initial
- Author: A U Thor <author@example.com>
- 2 files changed, 14 insertions(+)
- create mode 100644 file-1
- create mode 100644 file-2
-ok 1 - setup
+ok 43 - center alignment formatting at the nth column. i18n.logOutputEncoding
 
 expecting success: 
-	rm -rf .git/rebase-apply &&
-	git reset --hard initial &&
-	test_must_fail git am --whitespace=fix "$tm"/am-test-1-? &&
-	git am --skip &&
-	grep 3 file-1 &&
-	grep "^Six$" file-2
+	git log --pretty="tformat:%><(1)%s" >actual &&
+	cat <<-EOF >expected &&
+	message two
+	message one
+	add bar
+	$(commit_msg)
+	EOF
+	test_cmp expected actual
 
-HEAD is now at f06d5e1 initial
-.git/rebase-apply/patch:9: trailing whitespace.
-Three 
-error: patch failed: file-1:1
-error: file-1: patch does not apply
-hint: Use 'git am --show-current-patch' to see the failed patch
-Applying: Three
-Patch failed at 0001 Three
-When you have resolved this problem, run "git am --continue".
-If you prefer to skip this patch, run "git am --skip" instead.
-To restore the original branch and stop patching, run "git am --abort".
-.git/rebase-apply/patch:13: trailing whitespace.
-Six 
-warning: 1 line applied after fixing whitespace errors.
-Applying: Six
-3
-Six
-ok 2 - interrupted am --whitespace=fix
+ok 44 - center alignment formatting with no padding
 
 expecting success: 
-	rm -rf .git/rebase-apply &&
-	git reset --hard initial &&
-	test_must_fail git am -C1 "$tm"/am-test-2-? &&
-	git am --skip &&
-	grep 3 file-1 &&
-	grep "^Three$" file-2
+	git -c i18n.logOutputEncoding=$test_encoding log --pretty="tformat:%><(1)%s" >actual &&
+	cat <<-EOF | iconv -f utf-8 -t $test_encoding >expected &&
+	message two
+	message one
+	add bar
+	$(commit_msg)
+	EOF
+	test_cmp expected actual
 
-HEAD is now at f06d5e1 initial
-.git/rebase-apply/patch:9: trailing whitespace.
-Three 
-error: patch failed: file-1:1
-error: file-1: patch does not apply
-hint: Use 'git am --show-current-patch' to see the failed patch
-Applying: Three
-Patch failed at 0001 Three
-When you have resolved this problem, run "git am --continue".
-If you prefer to skip this patch, run "git am --skip" instead.
-To restore the original branch and stop patching, run "git am --abort".
-Context reduced to (1/1) to apply fragment at 2
-Applying: Six
-3
-Three
-ok 3 - interrupted am -C1
+ok 45 - center alignment formatting with no padding. i18n.logOutputEncoding
 
 expecting success: 
-	rm -rf .git/rebase-apply &&
-	git reset --hard initial &&
-	test_must_fail git am -p2 "$tm"/am-test-3-? &&
-	git am --skip &&
-	grep 3 file-1 &&
-	grep "^Three$" file-2
+	git commit --amend -m short --author "long long long <long@me.com>" &&
+	git log --pretty="tformat:%<(10,trunc)%s%>>(10,ltrunc)% an" >actual &&
+	cat <<-\EOF >expected &&
+	short long  long long
+	message ..   A U Thor
+	add bar      A U Thor
+	initial...   A U Thor
+	EOF
+	test_cmp expected actual
 
-HEAD is now at f06d5e1 initial
-.git/rebase-apply/patch:9: trailing whitespace.
-Three 
-error: patch failed: file-1:1
-error: file-1: patch does not apply
-hint: Use 'git am --show-current-patch' to see the failed patch
-Applying: Three
-Patch failed at 0001 Three
-When you have resolved this problem, run "git am --continue".
-If you prefer to skip this patch, run "git am --skip" instead.
-To restore the original branch and stop patching, run "git am --abort".
-Applying: Six
-3
-Three
-ok 4 - interrupted am -p2
+[master 2151238] short
+ Author: long long long <long@me.com>
+ Date: Thu Apr 7 15:16:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two
+ok 46 - left/right alignment formatting with stealing
 
 expecting success: 
-	rm -rf .git/rebase-apply &&
-	git reset --hard initial &&
-	test_must_fail git am -p2 -C1 "$tm"/am-test-4-? &&
-	git am --skip &&
-	grep 3 file-1 &&
-	grep "^Three$" file-2
+	git -c i18n.logOutputEncoding=$test_encoding log --pretty="tformat:%<(10,trunc)%s%>>(10,ltrunc)% an" >actual &&
+	cat <<-\EOF | iconv -f utf-8 -t $test_encoding >expected &&
+	short long  long long
+	message ..   A U Thor
+	add bar      A U Thor
+	initial...   A U Thor
+	EOF
+	test_cmp expected actual
 
-HEAD is now at f06d5e1 initial
-.git/rebase-apply/patch:9: trailing whitespace.
-Three 
-error: patch failed: file-1:1
-error: file-1: patch does not apply
-hint: Use 'git am --show-current-patch' to see the failed patch
-Applying: Three
-Patch failed at 0001 Three
-When you have resolved this problem, run "git am --continue".
-If you prefer to skip this patch, run "git am --skip" instead.
-To restore the original branch and stop patching, run "git am --abort".
-Context reduced to (1/1) to apply fragment at 2
-Applying: Six
-3
-Three
-ok 5 - interrupted am -C1 -p2
+ok 47 - left/right alignment formatting with stealing. i18n.logOutputEncoding
 
 expecting success: 
-	rm -rf .git/rebase-apply &&
-	git reset --hard initial &&
-	test_must_fail git am --directory="frotz nitfol" "$tm"/am-test-5-? &&
-	git am --skip &&
-	grep One "frotz nitfol/file-5"
+	git log --color --pretty="tformat:%<(10,trunc)%s%>>(10,ltrunc)%C(auto)%d" |
+		test_decode_color |
+		nul_to_q >actual &&
+	! grep Q actual
 
-HEAD is now at f06d5e1 initial
-error: frotz nitfol/junk/file-2: does not exist in index
-hint: Use 'git am --show-current-patch' to see the failed patch
-Applying: Six
-Patch failed at 0001 Six
-When you have resolved this problem, run "git am --continue".
-If you prefer to skip this patch, run "git am --skip" instead.
-To restore the original branch and stop patching, run "git am --abort".
-Applying: Six
-One
-ok 6 - interrupted am --directory="frotz nitfol"
+ok 48 - strbuf_utf8_replace() not producing NUL
 
 expecting success: 
-	with_sq="with'sq" &&
-	rm -fr .git/rebase-apply &&
-	git reset --hard initial &&
-	git am --directory="$with_sq" "$tm"/am-test-5-2 &&
-	test -f "$with_sq/file-5"
+	git log --format=%ai%n%ci |
+	sed -e "s/ /T/; s/ //; s/..\$/:&/" >expected &&
+	git log --format=%aI%n%cI >actual &&
+	test_cmp expected actual
 
-HEAD is now at f06d5e1 initial
-Applying: Six
-ok 7 - apply to a funny path
+ok 49 - ISO and ISO-strict date formats display the same values
 
 expecting success: 
-	rm -rf .git/rebase-apply &&
-	git reset --hard initial &&
-	test_must_fail git am --reject "$tm"/am-test-6-1 &&
-	grep "@@ -1,3 +1,3 @@" file-2.rej &&
-	test_must_fail git diff-files --exit-code --quiet file-2 &&
-	grep "[-]-reject" .git/rebase-apply/apply-opt
+	head1=$(git rev-parse --verify HEAD~0) &&
+	head2=$(git rev-parse --verify HEAD~1)
 
-HEAD is now at f06d5e1 initial
-Checking patch file-2...
-error: while searching for:
-0
-2
-3
+ok 50 - set up log decoration tests
 
-error: patch failed: file-2:1
-Applying patch file-2 with 1 reject...
-Rejected hunk #1.
-Hunk #2 applied cleanly.
-hint: Use 'git am --show-current-patch' to see the failed patch
-Applying: Huh
-Patch failed at 0001 Huh
-When you have resolved this problem, run "git am --continue".
-If you prefer to skip this patch, run "git am --skip" instead.
-To restore the original branch and stop patching, run "git am --abort".
-@@ -1,3 +1,3 @@
- '--reject'
-ok 8 - am --reject
+expecting success: 
+	git tag -a tag1 -m tag1 &&
+	git tag -a tag2 -m tag2 tag1 &&
+	git tag -d tag1 &&
+	git commit --amend -m shorter &&
+	git log --no-walk --tags --pretty="%H %d" --decorate=full >actual &&
+	cat <<-EOF >expected &&
+	$head2  (tag: refs/tags/message-one)
+	$old_head1  (tag: refs/tags/message-two)
+	$head1  (tag: refs/tags/tag2)
+	EOF
+	sort -k3 actual >actual1 &&
+	test_cmp expected actual1
+
+Deleted tag 'tag1' (was 3df4ac8)
+[master e1fa287] shorter
+ Author: long long long <long@me.com>
+ Date: Thu Apr 7 15:16:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two
+ok 51 - log decoration properly follows tag chain
 
-# passed all 8 test(s)
-1..8
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t4254-am-corrupt.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4254-am-corrupt/.git/
 expecting success: 
-	# Note the missing "+++" line:
-	cat >bad-patch.diff <<-\EOF &&
-	From: A U Thor <au.thor@example.com>
-	diff --git a/f b/f
-	index 7898192..6178079 100644
-	--- a/f
-	@@ -1 +1 @@
-	-a
-	+b
+	git log --no-walk --tags --pretty="%H %D" --decorate=full >actual &&
+	cat >expected <<-EOF &&
+	$head2 tag: refs/tags/message-one
+	$old_head1 tag: refs/tags/message-two
+	$head1 tag: refs/tags/tag2
 	EOF
+	sort -k3 actual >actual1 &&
+	test_cmp expected actual1
 
-	echo a >f &&
-	git add f &&
-	test_tick &&
-	git commit -m initial
+ok 52 - clean log decoration
 
-[master (root-commit) 07398d1] initial
+expecting success: 
+	echo "Some contents" >trailerfile &&
+	git add trailerfile &&
+	git commit -F - <<-EOF
+	trailers: this commit message has trailers
+
+	This commit is a test commit with trailers at the end. We parse this
+	message and display the trailers using %(trailers).
+
+	$(cat trailers)
+	EOF
+
+[master 6ec41af] trailers: this commit message has trailers
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 f
-ok 1 - setup
+ create mode 100644 trailerfile
+ok 53 - set up trailer tests
 
 expecting success: 
-	test_must_fail git -c advice.amWorkDir=false am bad-patch.diff 2>actual
+	git log --no-walk --pretty="%(trailers)" >actual &&
+	{
+		cat trailers &&
+		echo
+	} >expect &&
+	test_cmp expect actual
 
-Applying: 
-Patch failed at 0001 
-When you have resolved this problem, run "git am --continue".
-If you prefer to skip this patch, run "git am --skip" instead.
-To restore the original branch and stop patching, run "git am --abort".
-ok 2 - try to apply corrupted patch
+ok 54 - pretty format %(trailers) shows trailers
 
 expecting success: 
-	echo "error: git diff header lacks filename information (line 4)" >expected &&
-	test_path_is_file f &&
-	test_i18ncmp expected actual
+	git log --no-walk --pretty="%(trailers:only)" >actual &&
+	{
+		grep -v patch.description <trailers &&
+		echo
+	} >expect &&
+	test_cmp expect actual
 
-ok 3 - compare diagnostic; ensure file is still here
+ok 55 - %(trailers:only) shows only "key: value" trailers
 
-# passed all 3 test(s)
-1..3
+expecting success: 
+	git log --no-walk --pretty="%(trailers:unfold)" >actual &&
+	{
+		unfold <trailers &&
+		echo
+	} >expect &&
+	test_cmp expect actual
+
+ok 56 - %(trailers:unfold) unfolds trailers
+
+expecting success: 
+	git log --no-walk --pretty="%(trailers:only,unfold)" >actual &&
+	git log --no-walk --pretty="%(trailers:unfold,only)" >reverse &&
+	test_cmp actual reverse &&
+	{
+		grep -v patch.description <trailers | unfold &&
+		echo
+	} >expect &&
+	test_cmp expect actual
+
+ok 57 - :only and :unfold work together
+
+expecting success: 
+	git commit --allow-empty -F - <<-\EOF &&
+	this is the subject
+
+	This is the body. The message has a "---" line which would confuse a
+	message+patch parser. But here we know we have only a commit message,
+	so we get it right.
+
+	trailer: wrong
+	---
+	This is more body.
+
+	trailer: right
+	EOF
+
+	{
+		echo "trailer: right" &&
+		echo
+	} >expect &&
+	git log --no-walk --format="%(trailers)" >actual &&
+	test_cmp expect actual
+
+[master b140f84] this is the subject
+ Author: A U Thor <author@example.com>
+ok 58 - trailer parsing not fooled by --- line
+
+# still have 1 known breakage(s)
+# passed all remaining 57 test(s)
+1..58
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
 *** t4256-am-format-flowed.sh ***
@@ -130750,7 +131855,7 @@
 	git add mailinfo.c &&
 	git commit -m initial
 
-[master (root-commit) b7ffae6] initial
+[master (root-commit) 16e2c97] initial
  Author: A U Thor <author@example.com>
  1 file changed, 1185 insertions(+)
  create mode 100644 mailinfo.c
@@ -130768,35 +131873,1229 @@
 1..2
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t4124-apply-ws-rule.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4124-apply-ws-rule/.git/
+*** t4200-rerere.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4200-rerere/.git/
 expecting success: 
+	cat >a1 <<-\EOF &&
+	Some title
+	==========
+	Whether 'tis nobler in the mind to suffer
+	The slings and arrows of outrageous fortune,
+	Or to take arms against a sea of troubles,
+	And by opposing end them? To die: to sleep;
+	No more; and by a sleep to say we end
+	The heart-ache and the thousand natural shocks
+	That flesh is heir to, 'tis a consummation
+	Devoutly to be wish'd.
+	EOF
 
-	>file &&
-	git add file &&
-	prepare_test_file >file &&
-	git diff-files -p >patch &&
-	>target &&
-	git add target
-
-
-ok 1 - setup
+	git add a1 &&
+	test_tick &&
+	git commit -q -a -m initial &&
 
-expecting success: 
+	cat >>a1 <<-\EOF &&
+	Some title
+	==========
+	To die, to sleep;
+	To sleep: perchance to dream: ay, there's the rub;
+	For in that sleep of death what dreams may come
+	When we have shuffled off this mortal coil,
+	Must give us pause: there's the respect
+	That makes calamity of so long life;
+	EOF
 
-	apply_patch --whitespace=nowarn &&
-	test_cmp file target
+	git checkout -b first &&
+	test_tick &&
+	git commit -q -a -m first &&
 
+	git checkout -b second master &&
+	git show first:a1 |
+	sed -e "s/To die, t/To die! T/" -e "s/Some title/Some Title/" >a1 &&
+	echo "* END *" >>a1 &&
+	test_tick &&
+	git commit -q -a -m second
 
-ok 2 - whitespace=nowarn, default rule
+Switched to a new branch 'first'
+M	a1
+Switched to a new branch 'second'
+ok 1 - setup
 
 expecting success: 
+	rm -rf .git/rr-cache &&
+	git config rerere.enabled false &&
+	test_must_fail git merge first &&
+	! test -d .git/rr-cache
 
-	apply_patch --whitespace=warn &&
-	test_cmp file target
-
-
-<stdin>:8: space before tab in indent.
+Merging:
+fcd23fa second
+virtual first
+found 1 common ancestor:
+70749e0 initial
+Auto-merging a1
+CONFLICT (content): Merge conflict in a1
+Automatic merge failed; fix conflicts and then commit the result.
+ok 2 - nothing recorded without rerere
+
+expecting success: 
+	git reset --hard &&
+	mkdir .git/rr-cache &&
+	test_might_fail git config --unset rerere.enabled &&
+	test_must_fail git merge first &&
+
+	sha1=$(perl -pe "s/	.*//" .git/MERGE_RR) &&
+	rr=.git/rr-cache/$sha1 &&
+	grep "^=======\$" $rr/preimage &&
+	! test -f $rr/postimage &&
+	! test -f $rr/thisimage
+
+HEAD is now at fcd23fa second
+Merging:
+fcd23fa second
+virtual first
+found 1 common ancestor:
+70749e0 initial
+Auto-merging a1
+CONFLICT (content): Merge conflict in a1
+Recorded preimage for 'a1'
+Automatic merge failed; fix conflicts and then commit the result.
+=======
+=======
+ok 3 - activate rerere, old style (conflicting merge)
+
+expecting success: 
+	rm -rf .git/rr-cache &&
+	git config rerere.enabled true &&
+	git reset --hard &&
+	test_must_fail git merge first &&
+
+	sha1=$(perl -pe "s/	.*//" .git/MERGE_RR) &&
+	rr=.git/rr-cache/$sha1 &&
+	grep ^=======$ $rr/preimage
+
+HEAD is now at fcd23fa second
+Merging:
+fcd23fa second
+virtual first
+found 1 common ancestor:
+70749e0 initial
+Auto-merging a1
+CONFLICT (content): Merge conflict in a1
+Recorded preimage for 'a1'
+Automatic merge failed; fix conflicts and then commit the result.
+=======
+=======
+ok 4 - rerere.enabled works, too
+
+expecting success: 
+	rm -rf .git/rr-cache &&
+	git config rerere.enabled true &&
+	git reset --hard &&
+	test_must_fail git merge first &&
+	sha1=$(perl -pe "s/	.*//" .git/MERGE_RR) &&
+	rr=.git/rr-cache/$sha1
+
+HEAD is now at fcd23fa second
+Merging:
+fcd23fa second
+virtual first
+found 1 common ancestor:
+70749e0 initial
+Auto-merging a1
+CONFLICT (content): Merge conflict in a1
+Recorded preimage for 'a1'
+Automatic merge failed; fix conflicts and then commit the result.
+ok 5 - set up rr-cache
+
+expecting success: 
+	# no postimage or thisimage yet
+	! test -f $rr/postimage &&
+	! test -f $rr/thisimage &&
+
+	# preimage has right number of lines
+	cnt=$(sed -ne "/^<<<<<<</,/^>>>>>>>/p" $rr/preimage | wc -l) &&
+	echo $cnt &&
+	test $cnt = 13
+
+13
+ok 6 - rr-cache looks sane
+
+expecting success: 
+	git show first:a1 >a1 &&
+	cat >expect <<-\EOF &&
+	--- a/a1
+	+++ b/a1
+	@@ -1,4 +1,4 @@
+	-Some Title
+	+Some title
+	 ==========
+	 Whether 'tis nobler in the mind to suffer
+	 The slings and arrows of outrageous fortune,
+	@@ -8,21 +8,11 @@
+	 The heart-ache and the thousand natural shocks
+	 That flesh is heir to, 'tis a consummation
+	 Devoutly to be wish'd.
+	-<<<<<<<
+	-Some Title
+	-==========
+	-To die! To sleep;
+	-=======
+	 Some title
+	 ==========
+	 To die, to sleep;
+	->>>>>>>
+	 To sleep: perchance to dream: ay, there's the rub;
+	 For in that sleep of death what dreams may come
+	 When we have shuffled off this mortal coil,
+	 Must give us pause: there's the respect
+	 That makes calamity of so long life;
+	-<<<<<<<
+	-=======
+	-* END *
+	->>>>>>>
+	EOF
+	git rerere diff >out &&
+	test_cmp expect out
+
+ok 7 - rerere diff
+
+expecting success: 
+	echo a1 >expect &&
+	git rerere status >out &&
+	test_cmp expect out
+
+ok 8 - rerere status
+
+expecting success: 
+	git show first:a1 | sed "s/To die: t/To die! T/" >expect &&
+
+	git commit -q -a -m "prefer first over second" &&
+	test -f $rr/postimage &&
+
+	oldmtimepost=$(test-tool chmtime --get -60 $rr/postimage) &&
+
+	git checkout -b third master &&
+	git show second^:a1 | sed "s/To die: t/To die! T/" >a1 &&
+	git commit -q -a -m third &&
+
+	test_must_fail git merge first &&
+	# rerere kicked in
+	! grep "^=======\$" a1 &&
+	test_cmp expect a1
+
+Recorded resolution for 'a1'.
+Switched to a new branch 'third'
+Merging:
+40cb797 third
+virtual first
+found 1 common ancestor:
+70749e0 initial
+Auto-merging a1
+CONFLICT (content): Merge conflict in a1
+Resolved 'a1' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+ok 9 - first postimage wins
+
+expecting success: 
+	newmtimepost=$(test-tool chmtime --get $rr/postimage) &&
+	test $oldmtimepost -lt $newmtimepost
+
+ok 10 - rerere updates postimage timestamp
+
+expecting success: 
+	mv $rr/postimage .git/post-saved &&
+	echo "$sha1	a1" | perl -pe "y/\012/\000/" >.git/MERGE_RR &&
+	git rerere clear &&
+	! test -d $rr
+
+ok 11 - rerere clear
+
+expecting success: 
+	git reset --hard &&
+	mkdir -p $rr &&
+	test_must_fail git merge first &&
+	test -f $rr/preimage
+
+HEAD is now at 40cb797 third
+Merging:
+40cb797 third
+virtual first
+found 1 common ancestor:
+70749e0 initial
+Auto-merging a1
+CONFLICT (content): Merge conflict in a1
+Recorded preimage for 'a1'
+Automatic merge failed; fix conflicts and then commit the result.
+ok 12 - leftover directory
+
+expecting success: 
+	git reset --hard &&
+	mkdir -p $rr &&
+	cp .git/post-saved $rr/postimage &&
+	test_must_fail git merge first &&
+	test -f $rr/preimage
+
+HEAD is now at 40cb797 third
+Merging:
+40cb797 third
+virtual first
+found 1 common ancestor:
+70749e0 initial
+Auto-merging a1
+CONFLICT (content): Merge conflict in a1
+Resolved 'a1' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+ok 13 - missing preimage
+
+expecting success: 
+	mkdir -p $rr &&
+	echo Hello >$rr/preimage &&
+	echo World >$rr/postimage &&
+
+	sha2=4000000000000000000000000000000000000000 &&
+	rr2=.git/rr-cache/$sha2 &&
+	mkdir $rr2 &&
+	echo Hello >$rr2/preimage &&
+
+	almost_15_days_ago=$((60-15*86400)) &&
+	just_over_15_days_ago=$((-1-15*86400)) &&
+	almost_60_days_ago=$((60-60*86400)) &&
+	just_over_60_days_ago=$((-1-60*86400)) &&
+
+	test-tool chmtime =$just_over_60_days_ago $rr/preimage &&
+	test-tool chmtime =$almost_60_days_ago $rr/postimage &&
+	test-tool chmtime =$almost_15_days_ago $rr2/preimage
+
+ok 14 - set up for garbage collection tests
+
+expecting success: 
+	git rerere gc &&
+	test -f $rr/preimage &&
+	test -f $rr2/preimage
+
+ok 15 - gc preserves young or recently used records
+
+expecting success: 
+	test-tool chmtime =$just_over_60_days_ago $rr/postimage &&
+	test-tool chmtime =$just_over_15_days_ago $rr2/preimage &&
+	git rerere gc &&
+	! test -f $rr/preimage &&
+	! test -f $rr2/preimage
+
+ok 16 - old records rest in peace
+
+expecting success: 
+		rm -fr .git/rr-cache &&
+		rr=.git/rr-cache/$ZERO_OID &&
+		mkdir -p "$rr" &&
+		>"$rr/preimage" &&
+		>"$rr/postimage" &&
+
+		two_days_ago=$((-2*86400)) &&
+		test-tool chmtime =$two_days_ago "$rr/preimage" &&
+		test-tool chmtime =$two_days_ago "$rr/postimage" &&
+
+		find .git/rr-cache -type f | sort >original &&
+
+		git -c "gc.rerereresolved=$five_days" \
+		    -c "gc.rerereunresolved=$five_days" rerere gc &&
+		find .git/rr-cache -type f | sort >actual &&
+		test_cmp original actual &&
+
+		git -c "gc.rerereresolved=$five_days" \
+		    -c "gc.rerereunresolved=$right_now" rerere gc &&
+		find .git/rr-cache -type f | sort >actual &&
+		test_cmp original actual &&
+
+		git -c "gc.rerereresolved=$right_now" \
+		    -c "gc.rerereunresolved=$right_now" rerere gc &&
+		find .git/rr-cache -type f | sort >actual &&
+		test_must_be_empty actual
+	
+ok 17 - rerere gc with custom expiry (5, 0)
+
+expecting success: 
+		rm -fr .git/rr-cache &&
+		rr=.git/rr-cache/$ZERO_OID &&
+		mkdir -p "$rr" &&
+		>"$rr/preimage" &&
+		>"$rr/postimage" &&
+
+		two_days_ago=$((-2*86400)) &&
+		test-tool chmtime =$two_days_ago "$rr/preimage" &&
+		test-tool chmtime =$two_days_ago "$rr/postimage" &&
+
+		find .git/rr-cache -type f | sort >original &&
+
+		git -c "gc.rerereresolved=$five_days" \
+		    -c "gc.rerereunresolved=$five_days" rerere gc &&
+		find .git/rr-cache -type f | sort >actual &&
+		test_cmp original actual &&
+
+		git -c "gc.rerereresolved=$five_days" \
+		    -c "gc.rerereunresolved=$right_now" rerere gc &&
+		find .git/rr-cache -type f | sort >actual &&
+		test_cmp original actual &&
+
+		git -c "gc.rerereresolved=$right_now" \
+		    -c "gc.rerereunresolved=$right_now" rerere gc &&
+		find .git/rr-cache -type f | sort >actual &&
+		test_must_be_empty actual
+	
+ok 18 - rerere gc with custom expiry (5.days.ago, now)
+
+expecting success: 
+	git reset --hard &&
+
+	git checkout -b fourth &&
+	echo Hallo >file2 &&
+	git add file2 &&
+	test_tick &&
+	git commit -m version1 &&
+
+	git checkout third &&
+	echo Bello >file2 &&
+	git add file2 &&
+	test_tick &&
+	git commit -m version2 &&
+
+	test_must_fail git merge fourth &&
+	echo Cello >file2 &&
+	git add file2 &&
+	git commit -m resolution
+
+HEAD is now at 40cb797 third
+Switched to a new branch 'fourth'
+[fourth 26401ec] version1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file2
+Switched to branch 'third'
+[third 1f50303] version2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file2
+Merging:
+1f50303 version2
+virtual fourth
+found 1 common ancestor:
+40cb797 third
+Auto-merging file2
+CONFLICT (add/add): Merge conflict in file2
+Recorded preimage for 'file2'
+Automatic merge failed; fix conflicts and then commit the result.
+Recorded resolution for 'file2'.
+[third e9acb28] resolution
+ Author: A U Thor <author@example.com>
+ok 19 - setup: file2 added differently in two branches
+
+expecting success: 
+	echo Cello >expected &&
+
+	git reset --hard HEAD~2 &&
+	git checkout -b fifth &&
+
+	echo Hallo >file3 &&
+	git add file3 &&
+	test_tick &&
+	git commit -m version1 &&
+
+	git checkout third &&
+	echo Bello >file3 &&
+	git add file3 &&
+	test_tick &&
+	git commit -m version2 &&
+	git tag version2 &&
+
+	test_must_fail git merge fifth &&
+	test_cmp expected file3 &&
+	test_must_fail git update-index --refresh
+
+HEAD is now at 40cb797 third
+Switched to a new branch 'fifth'
+[fifth 9b6b3c4] version1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file3
+Switched to branch 'third'
+[third 7eec302] version2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file3
+Merging:
+7eec302 version2
+virtual fifth
+found 1 common ancestor:
+40cb797 third
+Auto-merging file3
+CONFLICT (add/add): Merge conflict in file3
+Resolved 'file3' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+file3: needs merge
+ok 20 - resolution was recorded properly
+
+expecting success: 
+	git config rerere.autoupdate true &&
+	git reset --hard &&
+	git checkout version2 &&
+	test_must_fail git merge fifth &&
+	git update-index --refresh
+
+HEAD is now at 7eec302 version2
+Note: checking out 'version2'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by performing another checkout.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -b with the checkout command again. Example:
+
+  git checkout -b <new-branch-name>
+
+HEAD is now at 7eec302 version2
+Merging:
+7eec302 version2
+virtual fifth
+found 1 common ancestor:
+40cb797 third
+Auto-merging file3
+CONFLICT (add/add): Merge conflict in file3
+Staged 'file3' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+ok 21 - rerere.autoupdate
+
+expecting success: 
+	test_might_fail git config --unset rerere.autoupdate &&
+	git reset --hard &&
+	git checkout version2 &&
+	test_must_fail git merge --rerere-autoupdate fifth &&
+	git update-index --refresh
+
+HEAD is now at 7eec302 version2
+HEAD is now at 7eec302 version2
+Merging:
+7eec302 version2
+virtual fifth
+found 1 common ancestor:
+40cb797 third
+Auto-merging file3
+CONFLICT (add/add): Merge conflict in file3
+Staged 'file3' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+ok 22 - merge --rerere-autoupdate
+
+expecting success: 
+	headblob=$(git rev-parse version2:file3) &&
+	mergeblob=$(git rev-parse fifth:file3) &&
+	cat >expected <<-EOF &&
+	100644 $headblob 2	file3
+	100644 $mergeblob 3	file3
+	EOF
+
+	git config rerere.autoupdate true &&
+	git reset --hard &&
+	git checkout version2 &&
+	test_must_fail git merge --no-rerere-autoupdate fifth &&
+	git ls-files -u >actual &&
+	test_cmp expected actual
+
+HEAD is now at 7eec302 version2
+HEAD is now at 7eec302 version2
+Merging:
+7eec302 version2
+virtual fifth
+found 1 common ancestor:
+40cb797 third
+Auto-merging file3
+CONFLICT (add/add): Merge conflict in file3
+Resolved 'file3' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+ok 23 - merge --no-rerere-autoupdate
+
+expecting success: 
+	headblob=$(git rev-parse version2:file3) &&
+	mergeblob=$(git rev-parse fifth:file3) &&
+	cat >expected.unresolved <<-EOF &&
+	100644 $headblob 2	file3
+	100644 $mergeblob 3	file3
+	EOF
+
+	test_might_fail git config --unset rerere.autoupdate &&
+	git reset --hard &&
+	git checkout version2 &&
+	fifth=$(git rev-parse fifth) &&
+	echo "$fifth		branch fifth of ." |
+	git fmt-merge-msg >msg &&
+	ancestor=$(git merge-base version2 fifth) &&
+	test_must_fail git merge-recursive "$ancestor" -- HEAD fifth &&
+
+	git ls-files --stage >failedmerge &&
+	cp file3 file3.conflict &&
+
+	git ls-files -u >actual &&
+	test_cmp expected.unresolved actual
+
+HEAD is now at 7eec302 version2
+HEAD is now at 7eec302 version2
+Merging HEAD with fifth
+Merging:
+7eec302 version2
+9b6b3c4 version1
+found 1 common ancestor:
+40cb797 third
+Auto-merging file3
+CONFLICT (add/add): Merge conflict in file3
+ok 24 - set up an unresolved merge
+
+expecting success: 
+	test_might_fail git config --unset rerere.autoupdate &&
+	git rm -fr --cached . &&
+	git update-index --index-info <failedmerge &&
+	cp file3.conflict file3 &&
+	test_must_fail git update-index --refresh -q &&
+
+	git rerere &&
+	git ls-files -u >actual &&
+	test_cmp expected.unresolved actual
+
+file3: needs merge
+rm 'a1'
+rm 'file3'
+rm 'file3'
+file3: needs merge
+Resolved 'file3' using previous resolution.
+ok 25 - explicit rerere
+
+expecting success: 
+	git config rerere.autoupdate true &&
+	git rm -fr --cached . &&
+	git update-index --index-info <failedmerge &&
+	cp file3.conflict file3 &&
+	test_must_fail git update-index --refresh -q &&
+
+	git rerere &&
+	git update-index --refresh
+
+file3: needs merge
+rm 'a1'
+rm 'file3'
+rm 'file3'
+file3: needs merge
+Staged 'file3' using previous resolution.
+ok 26 - explicit rerere with autoupdate
+
+expecting success: 
+	git config rerere.autoupdate false &&
+	git rm -fr --cached . &&
+	git update-index --index-info <failedmerge &&
+	cp file3.conflict file3 &&
+	git rerere &&
+	git ls-files -u >actual1 &&
+
+	git rm -fr --cached . &&
+	git update-index --index-info <failedmerge &&
+	cp file3.conflict file3 &&
+	git rerere --rerere-autoupdate &&
+	git update-index --refresh &&
+
+	git rm -fr --cached . &&
+	git update-index --index-info <failedmerge &&
+	cp file3.conflict file3 &&
+	git rerere --rerere-autoupdate --no-rerere-autoupdate &&
+	git ls-files -u >actual2 &&
+
+	git rm -fr --cached . &&
+	git update-index --index-info <failedmerge &&
+	cp file3.conflict file3 &&
+	git rerere --rerere-autoupdate --no-rerere-autoupdate --rerere-autoupdate &&
+	git update-index --refresh &&
+
+	test_cmp expected.unresolved actual1 &&
+	test_cmp expected.unresolved actual2
+
+rm 'a1'
+rm 'file3'
+Resolved 'file3' using previous resolution.
+file3: needs merge
+rm 'a1'
+rm 'file3'
+rm 'file3'
+Staged 'file3' using previous resolution.
+rm 'a1'
+rm 'file3'
+Resolved 'file3' using previous resolution.
+file3: needs merge
+rm 'a1'
+rm 'file3'
+rm 'file3'
+Staged 'file3' using previous resolution.
+ok 27 - explicit rerere --rerere-autoupdate overrides
+
+expecting success: 
+	git rm -fr --cached . &&
+	git update-index --index-info <failedmerge &&
+	cp file3.conflict file3 &&
+	test_must_fail git rerere --no-no-rerere-autoupdate 2>err &&
+	test_i18ngrep [Uu]sage err &&
+	test_must_fail git update-index --refresh
+
+rm 'a1'
+rm 'file3'
+usage: git rerere [clear | forget <path>... | status | remaining | diff | gc]
+file3: needs merge
+ok 28 - rerere --no-no-rerere-autoupdate
+
+expecting success: 
+	test_must_fail git rerere -h >help &&
+	test_i18ngrep [Uu]sage help
+
+usage: git rerere [clear | forget <path>... | status | remaining | diff | gc]
+ok 29 - rerere -h
+
+expecting success: 
+	rm -fr .git/rr-cache &&
+	mkdir .git/rr-cache &&
+	git reset --hard &&
+
+	test_seq 1 6 >early &&
+	>late &&
+	test_seq 11 15 >short &&
+	test_seq 111 120 >long &&
+	concat_insert short >file1 &&
+	concat_insert long >file2 &&
+	git add file1 file2 &&
+	git commit -m base &&
+	git tag base &&
+	git checkout -b six.1 &&
+	concat_insert short 6.1 >file1 &&
+	concat_insert long 6.1 >file2 &&
+	git add file1 file2 &&
+	git commit -m 6.1 &&
+	git checkout -b six.2 HEAD^ &&
+	concat_insert short 6.2 >file1 &&
+	concat_insert long 6.2 >file2 &&
+	git add file1 file2 &&
+	git commit -m 6.2 &&
+
+	# At this point, six.1 and six.2
+	# - derive from common ancestor that has two files
+	#   1...6 7 11..15 (file1) and 1...6 7 111..120 (file2)
+	# - six.1 replaces these 7s with 6.1
+	# - six.2 replaces these 7s with 6.2
+
+	merge_conflict_resolve &&
+
+	# Check that rerere knows that file1 and file2 have conflicts
+
+	printf "%s\n" file1 file2 >expect &&
+	git ls-files -u | sed -e "s/^.*	//" | sort -u >actual &&
+	test_cmp expect actual &&
+
+	git rerere status | sort >actual &&
+	test_cmp expect actual &&
+
+	git rerere remaining >actual &&
+	test_cmp expect actual &&
+
+	count_pre_post 2 0 &&
+
+	# Pretend that the conflicts were made quite some time ago
+	test-tool chmtime -172800 $(find .git/rr-cache/ -type f) &&
+
+	# Unresolved entries have not expired yet
+	git -c gc.rerereresolved=5 -c gc.rerereunresolved=5 rerere gc &&
+	count_pre_post 2 0 &&
+
+	# Unresolved entries have expired
+	git -c gc.rerereresolved=5 -c gc.rerereunresolved=1 rerere gc &&
+	count_pre_post 0 0 &&
+
+	# Recreate the conflicted state
+	merge_conflict_resolve &&
+	count_pre_post 2 0 &&
+
+	# Clear it
+	git rerere clear &&
+	count_pre_post 0 0 &&
+
+	# Recreate the conflicted state
+	merge_conflict_resolve &&
+	count_pre_post 2 0 &&
+
+	# We resolved file1 and file2
+	git rerere &&
+	git rerere remaining >actual &&
+	test_must_be_empty actual &&
+
+	# We must have recorded both of them
+	count_pre_post 2 2 &&
+
+	# Now we should be able to resolve them both
+	git reset --hard &&
+	test_must_fail git merge six.1 &&
+	git rerere &&
+
+	git rerere remaining >actual &&
+	test_must_be_empty actual &&
+
+	concat_insert short 6.1 6.2 >file1.expect &&
+	concat_insert long 6.1 6.2 >file2.expect &&
+	test_cmp file1.expect file1 &&
+	test_cmp file2.expect file2 &&
+
+	# Forget resolution for file2
+	git rerere forget file2 &&
+	echo file2 >expect &&
+	git rerere status >actual &&
+	test_cmp expect actual &&
+	count_pre_post 2 1 &&
+
+	# file2 already has correct resolution, so record it again
+	git rerere &&
+
+	# Pretend that the resolutions are old again
+	test-tool chmtime -172800 $(find .git/rr-cache/ -type f) &&
+
+	# Resolved entries have not expired yet
+	git -c gc.rerereresolved=5 -c gc.rerereunresolved=5 rerere gc &&
+
+	count_pre_post 2 2 &&
+
+	# Resolved entries have expired
+	git -c gc.rerereresolved=1 -c gc.rerereunresolved=5 rerere gc &&
+	count_pre_post 0 0
+
+HEAD is now at 7eec302 version2
+[detached HEAD 40e0609] base
+ Author: A U Thor <author@example.com>
+ 2 files changed, 29 insertions(+)
+ create mode 100644 file1
+ create mode 100644 file2
+Switched to a new branch 'six.1'
+[six.1 605006b] 6.1
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+Switched to a new branch 'six.2'
+[six.2 ba09fec] 6.2
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+HEAD is now at ba09fec 6.2
+Merging:
+ba09fec 6.2
+virtual six.1
+found 1 common ancestor:
+40e0609 base
+Auto-merging file2
+CONFLICT (content): Merge conflict in file2
+Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+Recorded preimage for 'file1'
+Recorded preimage for 'file2'
+Automatic merge failed; fix conflicts and then commit the result.
+HEAD is now at ba09fec 6.2
+Merging:
+ba09fec 6.2
+virtual six.1
+found 1 common ancestor:
+40e0609 base
+Auto-merging file2
+CONFLICT (content): Merge conflict in file2
+Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+Recorded preimage for 'file1'
+Recorded preimage for 'file2'
+Automatic merge failed; fix conflicts and then commit the result.
+HEAD is now at ba09fec 6.2
+Merging:
+ba09fec 6.2
+virtual six.1
+found 1 common ancestor:
+40e0609 base
+Auto-merging file2
+CONFLICT (content): Merge conflict in file2
+Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+Recorded preimage for 'file1'
+Recorded preimage for 'file2'
+Automatic merge failed; fix conflicts and then commit the result.
+Recorded resolution for 'file1'.
+Recorded resolution for 'file2'.
+HEAD is now at ba09fec 6.2
+Merging:
+ba09fec 6.2
+virtual six.1
+found 1 common ancestor:
+40e0609 base
+Auto-merging file2
+CONFLICT (content): Merge conflict in file2
+Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+Resolved 'file1' using previous resolution.
+Resolved 'file2' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+Updated preimage for 'file2'
+Forgot resolution for 'file2'
+Recorded resolution for 'file2'.
+ok 30 - multiple identical conflicts
+
+expecting success: 
+	git reset --hard &&
+
+	git checkout -b branch-1 master &&
+	echo "bar" >test &&
+	git add test &&
+	git commit -q -m two &&
+
+	git reset --hard &&
+	git checkout -b branch-2 master &&
+	echo "foo" >test &&
+	git add test &&
+	git commit -q -a -m one &&
+
+	test_must_fail git merge branch-1 &&
+	echo "<<<<<<< a" >test &&
+	git rerere &&
+
+	git rerere clear
+
+HEAD is now at ba09fec 6.2
+Switched to a new branch 'branch-1'
+HEAD is now at 5727ee8 two
+Switched to a new branch 'branch-2'
+Merging:
+95c3f31 one
+virtual branch-1
+found 1 common ancestor:
+70749e0 initial
+Auto-merging test
+CONFLICT (add/add): Merge conflict in test
+Recorded preimage for 'test'
+Automatic merge failed; fix conflicts and then commit the result.
+error: could not parse conflict hunks in 'test'
+ok 31 - rerere with unexpected conflict markers does not crash
+
+expecting success: 
+	git reset --hard &&
+
+	git checkout -b A master &&
+	echo "bar" >test &&
+	git add test &&
+	git commit -q -m two &&
+	echo "baz" >test &&
+	git add test &&
+	git commit -q -m three &&
+
+	git reset --hard &&
+	git checkout -b B master &&
+	echo "foo" >test &&
+	git add test &&
+	git commit -q -a -m one &&
+
+	test_must_fail git merge A~ &&
+	git add test &&
+	git commit -q -m "will solve conflicts later" &&
+	test_must_fail git merge A &&
+
+	echo "resolved" >test &&
+	git add test &&
+	git commit -q -m "solved conflict" &&
+
+	echo "resolved" >expect &&
+
+	git reset --hard HEAD~~ &&
+	test_must_fail git merge A~ &&
+	git add test &&
+	git commit -q -m "will solve conflicts later" &&
+	test_must_fail git merge A &&
+	cat test >actual &&
+	test_cmp expect actual &&
+
+	git add test &&
+	git commit -m "rerere solved conflict" &&
+	git reset --hard HEAD~ &&
+	test_must_fail git merge A &&
+	cat test >actual &&
+	test_cmp expect actual
+
+HEAD is now at 95c3f31 one
+Switched to a new branch 'A'
+HEAD is now at 8f8d617 three
+Switched to a new branch 'B'
+Merging:
+95c3f31 one
+virtual A~
+found 1 common ancestor:
+70749e0 initial
+Auto-merging test
+CONFLICT (add/add): Merge conflict in test
+Recorded preimage for 'test'
+Automatic merge failed; fix conflicts and then commit the result.
+Recorded preimage for 'test'
+Merging:
+35eb3e9 will solve conflicts later
+virtual A
+found 1 common ancestor:
+5727ee8 two
+Auto-merging test
+CONFLICT (content): Merge conflict in test
+Recorded preimage for 'test'
+Automatic merge failed; fix conflicts and then commit the result.
+Recorded resolution for 'test'.
+HEAD is now at 95c3f31 one
+Merging:
+95c3f31 one
+virtual A~
+found 1 common ancestor:
+70749e0 initial
+Auto-merging test
+CONFLICT (add/add): Merge conflict in test
+Recorded preimage for 'test'
+Automatic merge failed; fix conflicts and then commit the result.
+Recorded preimage for 'test'
+Merging:
+35eb3e9 will solve conflicts later
+virtual A
+found 1 common ancestor:
+5727ee8 two
+Auto-merging test
+CONFLICT (content): Merge conflict in test
+Resolved 'test' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+[B c1558e5] rerere solved conflict
+ Author: A U Thor <author@example.com>
+HEAD is now at 35eb3e9 will solve conflicts later
+Merging:
+35eb3e9 will solve conflicts later
+virtual A
+found 1 common ancestor:
+5727ee8 two
+Auto-merging test
+CONFLICT (content): Merge conflict in test
+Resolved 'test' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+ok 32 - rerere with inner conflict markers
+
+expecting success: 
+	test_create_repo stage_1_handling &&
+	(
+		cd stage_1_handling &&
+
+		test_seq 1 10 >original &&
+		git add original &&
+		git commit -m original &&
+
+		git checkout -b A master &&
+		git mv original A &&
+		git commit -m "rename to A" &&
+
+		git checkout -b B master &&
+		git mv original B &&
+		git commit -m "rename to B"
+	)
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4200-rerere/stage_1_handling/.git/
+[master (root-commit) 64a4a07] original
+ Author: A U Thor <author@example.com>
+ 1 file changed, 10 insertions(+)
+ create mode 100644 original
+Switched to a new branch 'A'
+[A cc792a7] rename to A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename original => A (100%)
+Switched to a new branch 'B'
+[B 02c49bb] rename to B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename original => B (100%)
+ok 33 - setup simple stage 1 handling
+
+expecting success: 
+	(
+		cd stage_1_handling &&
+
+		git config rerere.enabled true &&
+		git checkout A^0 &&
+		test_must_fail git merge B^0
+	)
+
+Note: checking out '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 performing another checkout.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -b with the checkout command again. Example:
+
+  git checkout -b <new-branch-name>
+
+HEAD is now at cc792a7 rename to A
+Merging:
+cc792a7 rename to A
+virtual B^0
+found 1 common ancestor:
+64a4a07 original
+CONFLICT (rename/rename): Rename "original"->"A" in branch "HEAD" rename "original"->"B" in "B^0"
+Automatic merge failed; fix conflicts and then commit the result.
+ok 34 - test simple stage 1 handling
+
+# passed all 34 test(s)
+1..34
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t5002-archive-attr-pattern.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5002-archive-attr-pattern/.git/
+expecting success: 
+	echo ignored >ignored &&
+	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 --bare . bare &&
+	cp .git/info/attributes bare/info/attributes
+
+[master (root-commit) d65bb9f] .
+ 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: 
+	git archive HEAD >archive.tar &&
+	(mkdir archive && cd archive && "$TAR" xf -) <archive.tar
+
+ok 2 - git archive
+
+expecting success: test ! -e archive/ignored
+ok 3 -  archive/ignored does not exist
+
+expecting success: test ! -e archive/not-ignored-dir/ignored
+ok 4 -  archive/not-ignored-dir/ignored does not exist
+
+expecting success: test -e archive/not-ignored-dir/ignored-only-if-dir
+ok 5 -  archive/not-ignored-dir/ignored-only-if-dir exists
+
+expecting success: test -e archive/not-ignored-dir/
+ok 6 -  archive/not-ignored-dir/ exists
+
+expecting success: test ! -e archive/ignored-only-if-dir/
+ok 7 -  archive/ignored-only-if-dir/ does not exist
+
+expecting success: 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: test ! -e archive/ignored-without-slash/
+ok 9 -  archive/ignored-without-slash/ does not exist
+
+expecting success: test ! -e archive/ignored-without-slash/foo
+ok 10 -  archive/ignored-without-slash/foo does not exist
+
+expecting success: test ! -e archive/wildcard-without-slash/
+ok 11 -  archive/wildcard-without-slash/ does not exist
+
+expecting success: test ! -e archive/wildcard-without-slash/foo
+ok 12 -  archive/wildcard-without-slash/foo does not exist
+
+expecting success: test ! -e archive/deep/and/slashless/
+ok 13 -  archive/deep/and/slashless/ does not exist
+
+expecting success: test ! -e archive/deep/and/slashless/foo
+ok 14 -  archive/deep/and/slashless/foo does not exist
+
+expecting success: test ! -e archive/deep/with/wildcard/
+ok 15 -  archive/deep/with/wildcard/ does not exist
+
+expecting success: test ! -e archive/deep/with/wildcard/foo
+ok 16 -  archive/deep/with/wildcard/foo does not exist
+
+expecting success: test ! -e archive/one-level-lower/
+ok 17 -  archive/one-level-lower/ does not exist
+
+expecting success: 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: 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/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t4124-apply-ws-rule.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4124-apply-ws-rule/.git/
+expecting success: 
+
+	>file &&
+	git add file &&
+	prepare_test_file >file &&
+	git diff-files -p >patch &&
+	>target &&
+	git add target
+
+
+ok 1 - setup
+
+expecting success: 
+
+	apply_patch --whitespace=nowarn &&
+	test_cmp file target
+
+
+ok 2 - whitespace=nowarn, default rule
+
+expecting success: 
+
+	apply_patch --whitespace=warn &&
+	test_cmp file target
+
+
+<stdin>:8: space before tab in indent.
  	A SP and a HT (@%).
 <stdin>:9: space before tab in indent.
  	 A SP, a HT and a SP (@%).
@@ -132082,2033 +134381,6 @@
 1..78
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t4205-log-pretty-formats.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4205-log-pretty-formats/.git/
-expecting success: 
-	>foo &&
-	>bar &&
-	git add foo &&
-	test_tick &&
-	git config i18n.commitEncoding $test_encoding &&
-	commit_msg $test_encoding | git commit -F - &&
-	git add bar &&
-	test_tick &&
-	git commit -m "add bar" &&
-	git config --unset i18n.commitEncoding
-
-[master (root-commit) 4780d11] initial. anfänglich
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 foo
-[master 91b4447] add bar
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 bar
-ok 1 - set up basic repos
-
-expecting success: 
-	git log --pretty=oneline >expected &&
-	git config pretty.test-alias oneline &&
-	git log --pretty=test-alias >actual &&
-	test_cmp expected actual
-
-ok 2 - alias builtin format
-
-expecting success: 
-	git log --pretty=oneline >expected &&
-	git config pretty.oneline "%H" &&
-	git log --pretty=oneline >actual &&
-	test_cmp expected actual
-
-ok 3 - alias masking builtin format
-
-expecting success: 
-	git log --pretty="format:%h" >expected &&
-	git config pretty.test-alias "format:%h" &&
-	git log --pretty=test-alias >actual &&
-	test_cmp expected actual
-
-ok 4 - alias user-defined format
-
-expecting success: 
-	git config i18n.logOutputEncoding $test_encoding &&
-	git log --oneline >expected-s &&
-	git log --pretty="tformat:%h %s" >actual-s &&
-	git config --unset i18n.logOutputEncoding &&
-	test_cmp expected-s actual-s
-
-ok 5 - alias user-defined tformat with %s (ISO8859-1 encoding)
-
-expecting success: 
-	git log --oneline >expected-s &&
-	git log --pretty="tformat:%h %s" >actual-s &&
-	test_cmp expected-s actual-s
-
-ok 6 - alias user-defined tformat with %s (utf-8 encoding)
-
-expecting success: 
-	git log --pretty="tformat:%h" >expected &&
-	git config pretty.test-alias "tformat:%h" &&
-	git log --pretty=test-alias >actual &&
-	test_cmp expected actual
-
-ok 7 - alias user-defined tformat
-
-expecting success: 
-	git config pretty.test-alias format-that-will-never-exist &&
-	test_must_fail git log --pretty=test-alias
-
-fatal: invalid --pretty format: test-alias
-ok 8 - alias non-existent format
-
-expecting success: 
-	git log --pretty="tformat:%h" >expected &&
-	git config pretty.test-foo "tformat:%h" &&
-	git config pretty.test-bar test-foo &&
-	git log --pretty=test-bar >actual && test_cmp expected actual
-
-ok 9 - alias of an alias
-
-expecting success: 
-	git log --pretty=format:"Two %H" >expected &&
-	git config pretty.duplicate "format:One %H" &&
-	git config --add pretty.duplicate "format:Two %H" &&
-	git log --pretty=duplicate >actual &&
-	test_cmp expected actual
-
-ok 10 - alias masking an alias
-
-expecting success: 
-	git config pretty.test-foo test-bar &&
-	git config pretty.test-bar test-foo &&
-	test_must_fail git log --pretty=test-foo
-
-fatal: invalid --pretty format: 'test-foo' references an alias which points to itself
-ok 11 - alias loop
-
-expecting success: 
-	printf "add bar\0$(commit_msg)" >expected &&
-	git log -z --pretty="format:%s" >actual &&
-	test_cmp expected actual
-
-ok 12 - NUL separation
-
-expecting success: 
-	printf "add bar\0$(commit_msg)\0" >expected &&
-	git log -z --pretty="tformat:%s" >actual &&
-	test_cmp expected actual
-
-ok 13 - NUL termination
-
-expecting success: 
-	stat0_part=$(git diff --stat HEAD^ HEAD) &&
-	stat1_part=$(git diff-tree --no-commit-id --stat --root HEAD^) &&
-	printf "add bar\n$stat0_part\n\0$(commit_msg)\n$stat1_part\n" >expected &&
-	git log -z --stat --pretty="format:%s" >actual &&
-	test_i18ncmp expected actual
-
-ok 14 - NUL separation with --stat
-
-checking known breakage: 
-	stat0_part=$(git diff --stat HEAD^ HEAD) &&
-	stat1_part=$(git diff-tree --no-commit-id --stat --root HEAD^) &&
-	printf "add bar\n$stat0_part\n\0$(commit_msg)\n$stat1_part\n0" >expected &&
-	git log -z --stat --pretty="tformat:%s" >actual &&
-	test_cmp expected actual
-
-Binary files expected and actual differ
-not ok 15 - NUL termination with --stat # TODO known breakage
-
-expecting success: 
-	test_commit "message one" one one message-one &&
-	test_commit "message two" two two message-two &&
-	head1=$(git rev-parse --verify --short HEAD~0) &&
-	head2=$(git rev-parse --verify --short HEAD~1) &&
-	head3=$(git rev-parse --verify --short HEAD~2) &&
-	head4=$(git rev-parse --verify --short HEAD~3)
-
-[master 23ca4f5] message one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one
-[master a015cbe] message two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 two
-ok 16 - setup more commits
-
-expecting success: 
-	git log --pretty="tformat:%<(40)%s" >actual &&
-	qz_to_tab_space <<-EOF >expected &&
-	message two                            Z
-	message one                            Z
-	add bar                                Z
-	$(commit_msg)                    Z
-	EOF
-	test_cmp expected actual
-
-ok 17 - left alignment formatting
-
-expecting success: 
-	git -c i18n.logOutputEncoding=$test_encoding log --pretty="tformat:%<(40)%s" >actual &&
-	qz_to_tab_space <<-EOF | iconv -f utf-8 -t $test_encoding >expected &&
-	message two                            Z
-	message one                            Z
-	add bar                                Z
-	$(commit_msg)                    Z
-	EOF
-	test_cmp expected actual
-
-ok 18 - left alignment formatting. i18n.logOutputEncoding
-
-expecting success: 
-	git log --pretty="tformat:%h %<|(40)%s" >actual &&
-	qz_to_tab_space <<-EOF >expected &&
-	$head1 message two                    Z
-	$head2 message one                    Z
-	$head3 add bar                        Z
-	$head4 $(commit_msg)            Z
-	EOF
-	test_cmp expected actual
-
-ok 19 - left alignment formatting at the nth column
-
-expecting success: 
-	COLUMNS=50 git log --pretty="tformat:%h %<|(-10)%s" >actual &&
-	qz_to_tab_space <<-EOF >expected &&
-	$head1 message two                    Z
-	$head2 message one                    Z
-	$head3 add bar                        Z
-	$head4 $(commit_msg)            Z
-	EOF
-	test_cmp expected actual
-
-ok 20 - left alignment formatting at the nth column
-
-expecting success: 
-	git -c i18n.logOutputEncoding=$test_encoding log --pretty="tformat:%h %<|(40)%s" >actual &&
-	qz_to_tab_space <<-EOF | iconv -f utf-8 -t $test_encoding >expected &&
-	$head1 message two                    Z
-	$head2 message one                    Z
-	$head3 add bar                        Z
-	$head4 $(commit_msg)            Z
-	EOF
-	test_cmp expected actual
-
-ok 21 - left alignment formatting at the nth column. i18n.logOutputEncoding
-
-expecting success: 
-	git log --pretty="tformat:%<(1)%s" >actual &&
-	cat <<-EOF >expected &&
-	message two
-	message one
-	add bar
-	$(commit_msg)
-	EOF
-	test_cmp expected actual
-
-ok 22 - left alignment formatting with no padding
-
-expecting success: 
-	git -c i18n.logOutputEncoding=$test_encoding log --pretty="tformat:%<(1)%s" >actual &&
-	cat <<-EOF | iconv -f utf-8 -t $test_encoding >expected &&
-	message two
-	message one
-	add bar
-	$(commit_msg)
-	EOF
-	test_cmp expected actual
-
-ok 23 - left alignment formatting with no padding. i18n.logOutputEncoding
-
-expecting success: 
-	git log --pretty="tformat:%<(10,trunc)%s" >actual &&
-	qz_to_tab_space <<-\EOF >expected &&
-	message ..
-	message ..
-	add bar  Z
-	initial...
-	EOF
-	test_cmp expected actual
-
-ok 24 - left alignment formatting with trunc
-
-expecting success: 
-	git -c i18n.logOutputEncoding=$test_encoding log --pretty="tformat:%<(10,trunc)%s" >actual &&
-	qz_to_tab_space <<-\EOF | iconv -f utf-8 -t $test_encoding >expected &&
-	message ..
-	message ..
-	add bar  Z
-	initial...
-	EOF
-	test_cmp expected actual
-
-ok 25 - left alignment formatting with trunc. i18n.logOutputEncoding
-
-expecting success: 
-	git log --pretty="tformat:%<(10,ltrunc)%s" >actual &&
-	qz_to_tab_space <<-EOF >expected &&
-	..sage two
-	..sage one
-	add bar  Z
-	..${sample_utf8_part}lich
-	EOF
-	test_cmp expected actual
-
-ok 26 - left alignment formatting with ltrunc
-
-expecting success: 
-	git -c i18n.logOutputEncoding=$test_encoding log --pretty="tformat:%<(10,ltrunc)%s" >actual &&
-	qz_to_tab_space <<-EOF | iconv -f utf-8 -t $test_encoding >expected &&
-	..sage two
-	..sage one
-	add bar  Z
-	..${sample_utf8_part}lich
-	EOF
-	test_cmp expected actual
-
-ok 27 - left alignment formatting with ltrunc. i18n.logOutputEncoding
-
-expecting success: 
-	git log --pretty="tformat:%<(10,mtrunc)%s" >actual &&
-	qz_to_tab_space <<-\EOF >expected &&
-	mess.. two
-	mess.. one
-	add bar  Z
-	init..lich
-	EOF
-	test_cmp expected actual
-
-ok 28 - left alignment formatting with mtrunc
-
-expecting success: 
-	git -c i18n.logOutputEncoding=$test_encoding log --pretty="tformat:%<(10,mtrunc)%s" >actual &&
-	qz_to_tab_space <<-\EOF | iconv -f utf-8 -t $test_encoding >expected &&
-	mess.. two
-	mess.. one
-	add bar  Z
-	init..lich
-	EOF
-	test_cmp expected actual
-
-ok 29 - left alignment formatting with mtrunc. i18n.logOutputEncoding
-
-expecting success: 
-	git log --pretty="tformat:%>(40)%s" >actual &&
-	qz_to_tab_space <<-EOF >expected &&
-	Z                            message two
-	Z                            message one
-	Z                                add bar
-	Z                    $(commit_msg)
-	EOF
-	test_cmp expected actual
-
-ok 30 - right alignment formatting
-
-expecting success: 
-	git -c i18n.logOutputEncoding=$test_encoding log --pretty="tformat:%>(40)%s" >actual &&
-	qz_to_tab_space <<-EOF | iconv -f utf-8 -t $test_encoding >expected &&
-	Z                            message two
-	Z                            message one
-	Z                                add bar
-	Z                    $(commit_msg)
-	EOF
-	test_cmp expected actual
-
-ok 31 - right alignment formatting. i18n.logOutputEncoding
-
-expecting success: 
-	git log --pretty="tformat:%h %>|(40)%s" >actual &&
-	qz_to_tab_space <<-EOF >expected &&
-	$head1                      message two
-	$head2                      message one
-	$head3                          add bar
-	$head4              $(commit_msg)
-	EOF
-	test_cmp expected actual
-
-ok 32 - right alignment formatting at the nth column
-
-expecting success: 
-	COLUMNS=50 git log --pretty="tformat:%h %>|(-10)%s" >actual &&
-	qz_to_tab_space <<-EOF >expected &&
-	$head1                      message two
-	$head2                      message one
-	$head3                          add bar
-	$head4              $(commit_msg)
-	EOF
-	test_cmp expected actual
-
-ok 33 - right alignment formatting at the nth column
-
-expecting success: 
-	git -c i18n.logOutputEncoding=$test_encoding log --pretty="tformat:%h %>|(40)%s" >actual &&
-	qz_to_tab_space <<-EOF | iconv -f utf-8 -t $test_encoding >expected &&
-	$head1                      message two
-	$head2                      message one
-	$head3                          add bar
-	$head4              $(commit_msg)
-	EOF
-	test_cmp expected actual
-
-ok 34 - right alignment formatting at the nth column. i18n.logOutputEncoding
-
-expecting success: 
-	git -c i18n.logOutputEncoding=$test_encoding log --graph --pretty="tformat:%h %>|(40)%s" >actual &&
-	iconv -f utf-8 -t $test_encoding >expected <<-EOF &&
-	* $head1                    message two
-	* $head2                    message one
-	* $head3                        add bar
-	* $head4            $(commit_msg)
-	EOF
-	test_cmp expected actual
-
-ok 35 - right alignment formatting at the nth column with --graph. i18n.logOutputEncoding
-
-expecting success: 
-	git log --pretty="tformat:%>(1)%s" >actual &&
-	cat <<-EOF >expected &&
-	message two
-	message one
-	add bar
-	$(commit_msg)
-	EOF
-	test_cmp expected actual
-
-ok 36 - right alignment formatting with no padding
-
-expecting success: 
-	git log --graph --pretty="tformat:%>(1)%s" >actual &&
-	cat <<-EOF >expected &&
-	* message two
-	* message one
-	* add bar
-	* $(commit_msg)
-	EOF
-	test_cmp expected actual
-
-ok 37 - right alignment formatting with no padding and with --graph
-
-expecting success: 
-	git -c i18n.logOutputEncoding=$test_encoding log --pretty="tformat:%>(1)%s" >actual &&
-	cat <<-EOF | iconv -f utf-8 -t $test_encoding >expected &&
-	message two
-	message one
-	add bar
-	$(commit_msg)
-	EOF
-	test_cmp expected actual
-
-ok 38 - right alignment formatting with no padding. i18n.logOutputEncoding
-
-expecting success: 
-	git log --pretty="tformat:%><(40)%s" >actual &&
-	qz_to_tab_space <<-EOF >expected &&
-	Z             message two              Z
-	Z             message one              Z
-	Z               add bar                Z
-	Z         $(commit_msg)          Z
-	EOF
-	test_cmp expected actual
-
-ok 39 - center alignment formatting
-
-expecting success: 
-	git -c i18n.logOutputEncoding=$test_encoding log --pretty="tformat:%><(40)%s" >actual &&
-	qz_to_tab_space <<-EOF | iconv -f utf-8 -t $test_encoding >expected &&
-	Z             message two              Z
-	Z             message one              Z
-	Z               add bar                Z
-	Z         $(commit_msg)          Z
-	EOF
-	test_cmp expected actual
-
-ok 40 - center alignment formatting. i18n.logOutputEncoding
-
-expecting success: 
-	git log --pretty="tformat:%h %><|(40)%s" >actual &&
-	qz_to_tab_space <<-EOF >expected &&
-	$head1           message two          Z
-	$head2           message one          Z
-	$head3             add bar            Z
-	$head4       $(commit_msg)      Z
-	EOF
-	test_cmp expected actual
-
-ok 41 - center alignment formatting at the nth column
-
-expecting success: 
-	COLUMNS=70 git log --pretty="tformat:%h %><|(-30)%s" >actual &&
-	qz_to_tab_space <<-EOF >expected &&
-	$head1           message two          Z
-	$head2           message one          Z
-	$head3             add bar            Z
-	$head4       $(commit_msg)      Z
-	EOF
-	test_cmp expected actual
-
-ok 42 - center alignment formatting at the nth column
-
-expecting success: 
-	git -c i18n.logOutputEncoding=$test_encoding log --pretty="tformat:%h %><|(40)%s" >actual &&
-	qz_to_tab_space <<-EOF | iconv -f utf-8 -t $test_encoding >expected &&
-	$head1           message two          Z
-	$head2           message one          Z
-	$head3             add bar            Z
-	$head4       $(commit_msg)      Z
-	EOF
-	test_cmp expected actual
-
-ok 43 - center alignment formatting at the nth column. i18n.logOutputEncoding
-
-expecting success: 
-	git log --pretty="tformat:%><(1)%s" >actual &&
-	cat <<-EOF >expected &&
-	message two
-	message one
-	add bar
-	$(commit_msg)
-	EOF
-	test_cmp expected actual
-
-ok 44 - center alignment formatting with no padding
-
-expecting success: 
-	git -c i18n.logOutputEncoding=$test_encoding log --pretty="tformat:%><(1)%s" >actual &&
-	cat <<-EOF | iconv -f utf-8 -t $test_encoding >expected &&
-	message two
-	message one
-	add bar
-	$(commit_msg)
-	EOF
-	test_cmp expected actual
-
-ok 45 - center alignment formatting with no padding. i18n.logOutputEncoding
-
-expecting success: 
-	git commit --amend -m short --author "long long long <long@me.com>" &&
-	git log --pretty="tformat:%<(10,trunc)%s%>>(10,ltrunc)% an" >actual &&
-	cat <<-\EOF >expected &&
-	short long  long long
-	message ..   A U Thor
-	add bar      A U Thor
-	initial...   A U Thor
-	EOF
-	test_cmp expected actual
-
-[master 2151238] short
- Author: long long long <long@me.com>
- Date: Thu Apr 7 15:16:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 two
-ok 46 - left/right alignment formatting with stealing
-
-expecting success: 
-	git -c i18n.logOutputEncoding=$test_encoding log --pretty="tformat:%<(10,trunc)%s%>>(10,ltrunc)% an" >actual &&
-	cat <<-\EOF | iconv -f utf-8 -t $test_encoding >expected &&
-	short long  long long
-	message ..   A U Thor
-	add bar      A U Thor
-	initial...   A U Thor
-	EOF
-	test_cmp expected actual
-
-ok 47 - left/right alignment formatting with stealing. i18n.logOutputEncoding
-
-expecting success: 
-	git log --color --pretty="tformat:%<(10,trunc)%s%>>(10,ltrunc)%C(auto)%d" |
-		test_decode_color |
-		nul_to_q >actual &&
-	! grep Q actual
-
-ok 48 - strbuf_utf8_replace() not producing NUL
-
-expecting success: 
-	git log --format=%ai%n%ci |
-	sed -e "s/ /T/; s/ //; s/..\$/:&/" >expected &&
-	git log --format=%aI%n%cI >actual &&
-	test_cmp expected actual
-
-ok 49 - ISO and ISO-strict date formats display the same values
-
-expecting success: 
-	head1=$(git rev-parse --verify HEAD~0) &&
-	head2=$(git rev-parse --verify HEAD~1)
-
-ok 50 - set up log decoration tests
-
-expecting success: 
-	git tag -a tag1 -m tag1 &&
-	git tag -a tag2 -m tag2 tag1 &&
-	git tag -d tag1 &&
-	git commit --amend -m shorter &&
-	git log --no-walk --tags --pretty="%H %d" --decorate=full >actual &&
-	cat <<-EOF >expected &&
-	$head2  (tag: refs/tags/message-one)
-	$old_head1  (tag: refs/tags/message-two)
-	$head1  (tag: refs/tags/tag2)
-	EOF
-	sort -k3 actual >actual1 &&
-	test_cmp expected actual1
-
-Deleted tag 'tag1' (was 3df4ac8)
-[master e1fa287] shorter
- Author: long long long <long@me.com>
- Date: Thu Apr 7 15:16:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 two
-ok 51 - log decoration properly follows tag chain
-
-expecting success: 
-	git log --no-walk --tags --pretty="%H %D" --decorate=full >actual &&
-	cat >expected <<-EOF &&
-	$head2 tag: refs/tags/message-one
-	$old_head1 tag: refs/tags/message-two
-	$head1 tag: refs/tags/tag2
-	EOF
-	sort -k3 actual >actual1 &&
-	test_cmp expected actual1
-
-ok 52 - clean log decoration
-
-expecting success: 
-	echo "Some contents" >trailerfile &&
-	git add trailerfile &&
-	git commit -F - <<-EOF
-	trailers: this commit message has trailers
-
-	This commit is a test commit with trailers at the end. We parse this
-	message and display the trailers using %(trailers).
-
-	$(cat trailers)
-	EOF
-
-[master 6ec41af] trailers: this commit message has trailers
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 trailerfile
-ok 53 - set up trailer tests
-
-expecting success: 
-	git log --no-walk --pretty="%(trailers)" >actual &&
-	{
-		cat trailers &&
-		echo
-	} >expect &&
-	test_cmp expect actual
-
-ok 54 - pretty format %(trailers) shows trailers
-
-expecting success: 
-	git log --no-walk --pretty="%(trailers:only)" >actual &&
-	{
-		grep -v patch.description <trailers &&
-		echo
-	} >expect &&
-	test_cmp expect actual
-
-ok 55 - %(trailers:only) shows only "key: value" trailers
-
-expecting success: 
-	git log --no-walk --pretty="%(trailers:unfold)" >actual &&
-	{
-		unfold <trailers &&
-		echo
-	} >expect &&
-	test_cmp expect actual
-
-ok 56 - %(trailers:unfold) unfolds trailers
-
-expecting success: 
-	git log --no-walk --pretty="%(trailers:only,unfold)" >actual &&
-	git log --no-walk --pretty="%(trailers:unfold,only)" >reverse &&
-	test_cmp actual reverse &&
-	{
-		grep -v patch.description <trailers | unfold &&
-		echo
-	} >expect &&
-	test_cmp expect actual
-
-ok 57 - :only and :unfold work together
-
-expecting success: 
-	git commit --allow-empty -F - <<-\EOF &&
-	this is the subject
-
-	This is the body. The message has a "---" line which would confuse a
-	message+patch parser. But here we know we have only a commit message,
-	so we get it right.
-
-	trailer: wrong
-	---
-	This is more body.
-
-	trailer: right
-	EOF
-
-	{
-		echo "trailer: right" &&
-		echo
-	} >expect &&
-	git log --no-walk --format="%(trailers)" >actual &&
-	test_cmp expect actual
-
-[master b140f84] this is the subject
- Author: A U Thor <author@example.com>
-ok 58 - trailer parsing not fooled by --- line
-
-# still have 1 known breakage(s)
-# passed all remaining 57 test(s)
-1..58
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t4253-am-keep-cr-dos.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4253-am-keep-cr-dos/.git/
-expecting success: 
-	append_cr <file1 >file &&
-	git add file &&
-	git commit -m Initial &&
-	git tag initial &&
-	append_cr <file2 >file &&
-	git commit -a -m Second &&
-	append_cr <file3 >file &&
-	git commit -a -m Third
-
-[master (root-commit) e8bda33] Initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-[master 911636b] Second
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[master 039c37b] Third
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 1 - setup repository with dos files
-
-expecting success: 
-	git checkout -b dosfiles initial &&
-	git format-patch -k initial..master &&
-	test_must_fail git am -k -3 000*.patch &&
-	git am --abort &&
-	rm -rf .git/rebase-apply 000*.patch
-
-Switched to a new branch 'dosfiles'
-0001-Second.patch
-0002-Third.patch
-Applying: Second
-error: patch failed: file:1
-error: file: patch does not apply
-error: Did you hand edit your patch?
-It does not apply to blobs recorded in its index.
-hint: Use 'git am --show-current-patch' to see the failed patch
-Using index info to reconstruct a base tree...
-Patch failed at 0001 Second
-When you have resolved this problem, run "git am --continue".
-If you prefer to skip this patch, run "git am --skip" instead.
-To restore the original branch and stop patching, run "git am --abort".
-ok 2 - am with dos files without --keep-cr
-
-expecting success: 
-	git checkout -b dosfiles-keep-cr initial &&
-	git format-patch -k --stdout initial..master | git am --keep-cr -k -3 &&
-	git diff --exit-code master
-
-Switched to a new branch 'dosfiles-keep-cr'
-Applying: Second
-Applying: Third
-ok 3 - am with dos files with --keep-cr
-
-expecting success: 
-	git config am.keepcr 1 &&
-	git checkout -b dosfiles-conf-keepcr initial &&
-	git format-patch -k --stdout initial..master | git am -k -3 &&
-	git diff --exit-code master
-
-Switched to a new branch 'dosfiles-conf-keepcr'
-Applying: Second
-Applying: Third
-ok 4 - am with dos files config am.keepcr
-
-expecting success: 
-	git config am.keepcr 1 &&
-	git checkout -b dosfiles-conf-keepcr-override initial &&
-	git format-patch -k initial..master &&
-	test_must_fail git am -k -3 --no-keep-cr 000*.patch &&
-	git am --abort &&
-	rm -rf .git/rebase-apply 000*.patch
-
-Switched to a new branch 'dosfiles-conf-keepcr-override'
-0001-Second.patch
-0002-Third.patch
-Applying: Second
-error: patch failed: file:1
-error: file: patch does not apply
-error: Did you hand edit your patch?
-It does not apply to blobs recorded in its index.
-hint: Use 'git am --show-current-patch' to see the failed patch
-Using index info to reconstruct a base tree...
-Patch failed at 0001 Second
-When you have resolved this problem, run "git am --continue".
-If you prefer to skip this patch, run "git am --skip" instead.
-To restore the original branch and stop patching, run "git am --abort".
-ok 5 - am with dos files config am.keepcr overridden by --no-keep-cr
-
-expecting success: 
-	git checkout -b dosfiles-keep-cr-continue initial &&
-	git format-patch -k initial..master &&
-	append_cr <file1a >file &&
-	git commit -m "different patch" file &&
-	test_must_fail git am --keep-cr -k -3 000*.patch &&
-	append_cr <file2 >file &&
-	git add file &&
-	git am -3 --resolved &&
-	git diff --exit-code master
-
-Switched to a new branch 'dosfiles-keep-cr-continue'
-0001-Second.patch
-0002-Third.patch
-[dosfiles-keep-cr-continue c038274] different patch
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Applying: Second
-Using index info to reconstruct a base tree...
-M	file
-Falling back to patching base and 3-way merge...
-Merging:
-c038274 different patch
-virtual Second
-found 1 common ancestor:
-virtual 0626bbef2b13f86fc002fb580ec5fac3fd75fa44
-Auto-merging file
-CONFLICT (content): Merge conflict in file
-error: Failed to merge in the changes.
-hint: Use 'git am --show-current-patch' to see the failed patch
-Patch failed at 0001 Second
-When you have resolved this problem, run "git am --continue".
-If you prefer to skip this patch, run "git am --skip" instead.
-To restore the original branch and stop patching, run "git am --abort".
-Applying: Second
-Applying: Third
-ok 6 - am with dos files with --keep-cr continue
-
-expecting success: 
-	git config am.keepcr 1 &&
-	git checkout -b unixfiles-conf-keepcr-override initial &&
-	cp -f file1 file &&
-	git commit -m "line ending to unix" file &&
-	git format-patch -k initial..master &&
-	git am -k -3 --no-keep-cr 000*.patch &&
-	git diff --exit-code -w master
-
-Switched to a new branch 'unixfiles-conf-keepcr-override'
-[unixfiles-conf-keepcr-override da30e87] line ending to unix
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-0001-Second.patch
-0002-Third.patch
-Applying: Second
-Applying: Third
-ok 7 - am with unix files config am.keepcr overridden by --no-keep-cr
-
-# passed all 7 test(s)
-1..7
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t4200-rerere.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4200-rerere/.git/
-expecting success: 
-	cat >a1 <<-\EOF &&
-	Some title
-	==========
-	Whether 'tis nobler in the mind to suffer
-	The slings and arrows of outrageous fortune,
-	Or to take arms against a sea of troubles,
-	And by opposing end them? To die: to sleep;
-	No more; and by a sleep to say we end
-	The heart-ache and the thousand natural shocks
-	That flesh is heir to, 'tis a consummation
-	Devoutly to be wish'd.
-	EOF
-
-	git add a1 &&
-	test_tick &&
-	git commit -q -a -m initial &&
-
-	cat >>a1 <<-\EOF &&
-	Some title
-	==========
-	To die, to sleep;
-	To sleep: perchance to dream: ay, there's the rub;
-	For in that sleep of death what dreams may come
-	When we have shuffled off this mortal coil,
-	Must give us pause: there's the respect
-	That makes calamity of so long life;
-	EOF
-
-	git checkout -b first &&
-	test_tick &&
-	git commit -q -a -m first &&
-
-	git checkout -b second master &&
-	git show first:a1 |
-	sed -e "s/To die, t/To die! T/" -e "s/Some title/Some Title/" >a1 &&
-	echo "* END *" >>a1 &&
-	test_tick &&
-	git commit -q -a -m second
-
-Switched to a new branch 'first'
-M	a1
-Switched to a new branch 'second'
-ok 1 - setup
-
-expecting success: 
-	rm -rf .git/rr-cache &&
-	git config rerere.enabled false &&
-	test_must_fail git merge first &&
-	! test -d .git/rr-cache
-
-Merging:
-fcd23fa second
-virtual first
-found 1 common ancestor:
-70749e0 initial
-Auto-merging a1
-CONFLICT (content): Merge conflict in a1
-Automatic merge failed; fix conflicts and then commit the result.
-ok 2 - nothing recorded without rerere
-
-expecting success: 
-	git reset --hard &&
-	mkdir .git/rr-cache &&
-	test_might_fail git config --unset rerere.enabled &&
-	test_must_fail git merge first &&
-
-	sha1=$(perl -pe "s/	.*//" .git/MERGE_RR) &&
-	rr=.git/rr-cache/$sha1 &&
-	grep "^=======\$" $rr/preimage &&
-	! test -f $rr/postimage &&
-	! test -f $rr/thisimage
-
-HEAD is now at fcd23fa second
-Merging:
-fcd23fa second
-virtual first
-found 1 common ancestor:
-70749e0 initial
-Auto-merging a1
-CONFLICT (content): Merge conflict in a1
-Recorded preimage for 'a1'
-Automatic merge failed; fix conflicts and then commit the result.
-=======
-=======
-ok 3 - activate rerere, old style (conflicting merge)
-
-expecting success: 
-	rm -rf .git/rr-cache &&
-	git config rerere.enabled true &&
-	git reset --hard &&
-	test_must_fail git merge first &&
-
-	sha1=$(perl -pe "s/	.*//" .git/MERGE_RR) &&
-	rr=.git/rr-cache/$sha1 &&
-	grep ^=======$ $rr/preimage
-
-HEAD is now at fcd23fa second
-Merging:
-fcd23fa second
-virtual first
-found 1 common ancestor:
-70749e0 initial
-Auto-merging a1
-CONFLICT (content): Merge conflict in a1
-Recorded preimage for 'a1'
-Automatic merge failed; fix conflicts and then commit the result.
-=======
-=======
-ok 4 - rerere.enabled works, too
-
-expecting success: 
-	rm -rf .git/rr-cache &&
-	git config rerere.enabled true &&
-	git reset --hard &&
-	test_must_fail git merge first &&
-	sha1=$(perl -pe "s/	.*//" .git/MERGE_RR) &&
-	rr=.git/rr-cache/$sha1
-
-HEAD is now at fcd23fa second
-Merging:
-fcd23fa second
-virtual first
-found 1 common ancestor:
-70749e0 initial
-Auto-merging a1
-CONFLICT (content): Merge conflict in a1
-Recorded preimage for 'a1'
-Automatic merge failed; fix conflicts and then commit the result.
-ok 5 - set up rr-cache
-
-expecting success: 
-	# no postimage or thisimage yet
-	! test -f $rr/postimage &&
-	! test -f $rr/thisimage &&
-
-	# preimage has right number of lines
-	cnt=$(sed -ne "/^<<<<<<</,/^>>>>>>>/p" $rr/preimage | wc -l) &&
-	echo $cnt &&
-	test $cnt = 13
-
-13
-ok 6 - rr-cache looks sane
-
-expecting success: 
-	git show first:a1 >a1 &&
-	cat >expect <<-\EOF &&
-	--- a/a1
-	+++ b/a1
-	@@ -1,4 +1,4 @@
-	-Some Title
-	+Some title
-	 ==========
-	 Whether 'tis nobler in the mind to suffer
-	 The slings and arrows of outrageous fortune,
-	@@ -8,21 +8,11 @@
-	 The heart-ache and the thousand natural shocks
-	 That flesh is heir to, 'tis a consummation
-	 Devoutly to be wish'd.
-	-<<<<<<<
-	-Some Title
-	-==========
-	-To die! To sleep;
-	-=======
-	 Some title
-	 ==========
-	 To die, to sleep;
-	->>>>>>>
-	 To sleep: perchance to dream: ay, there's the rub;
-	 For in that sleep of death what dreams may come
-	 When we have shuffled off this mortal coil,
-	 Must give us pause: there's the respect
-	 That makes calamity of so long life;
-	-<<<<<<<
-	-=======
-	-* END *
-	->>>>>>>
-	EOF
-	git rerere diff >out &&
-	test_cmp expect out
-
-ok 7 - rerere diff
-
-expecting success: 
-	echo a1 >expect &&
-	git rerere status >out &&
-	test_cmp expect out
-
-ok 8 - rerere status
-
-expecting success: 
-	git show first:a1 | sed "s/To die: t/To die! T/" >expect &&
-
-	git commit -q -a -m "prefer first over second" &&
-	test -f $rr/postimage &&
-
-	oldmtimepost=$(test-tool chmtime --get -60 $rr/postimage) &&
-
-	git checkout -b third master &&
-	git show second^:a1 | sed "s/To die: t/To die! T/" >a1 &&
-	git commit -q -a -m third &&
-
-	test_must_fail git merge first &&
-	# rerere kicked in
-	! grep "^=======\$" a1 &&
-	test_cmp expect a1
-
-Recorded resolution for 'a1'.
-Switched to a new branch 'third'
-Merging:
-40cb797 third
-virtual first
-found 1 common ancestor:
-70749e0 initial
-Auto-merging a1
-CONFLICT (content): Merge conflict in a1
-Resolved 'a1' using previous resolution.
-Automatic merge failed; fix conflicts and then commit the result.
-ok 9 - first postimage wins
-
-expecting success: 
-	newmtimepost=$(test-tool chmtime --get $rr/postimage) &&
-	test $oldmtimepost -lt $newmtimepost
-
-ok 10 - rerere updates postimage timestamp
-
-expecting success: 
-	mv $rr/postimage .git/post-saved &&
-	echo "$sha1	a1" | perl -pe "y/\012/\000/" >.git/MERGE_RR &&
-	git rerere clear &&
-	! test -d $rr
-
-ok 11 - rerere clear
-
-expecting success: 
-	git reset --hard &&
-	mkdir -p $rr &&
-	test_must_fail git merge first &&
-	test -f $rr/preimage
-
-HEAD is now at 40cb797 third
-Merging:
-40cb797 third
-virtual first
-found 1 common ancestor:
-70749e0 initial
-Auto-merging a1
-CONFLICT (content): Merge conflict in a1
-Recorded preimage for 'a1'
-Automatic merge failed; fix conflicts and then commit the result.
-ok 12 - leftover directory
-
-expecting success: 
-	git reset --hard &&
-	mkdir -p $rr &&
-	cp .git/post-saved $rr/postimage &&
-	test_must_fail git merge first &&
-	test -f $rr/preimage
-
-HEAD is now at 40cb797 third
-Merging:
-40cb797 third
-virtual first
-found 1 common ancestor:
-70749e0 initial
-Auto-merging a1
-CONFLICT (content): Merge conflict in a1
-Resolved 'a1' using previous resolution.
-Automatic merge failed; fix conflicts and then commit the result.
-ok 13 - missing preimage
-
-expecting success: 
-	mkdir -p $rr &&
-	echo Hello >$rr/preimage &&
-	echo World >$rr/postimage &&
-
-	sha2=4000000000000000000000000000000000000000 &&
-	rr2=.git/rr-cache/$sha2 &&
-	mkdir $rr2 &&
-	echo Hello >$rr2/preimage &&
-
-	almost_15_days_ago=$((60-15*86400)) &&
-	just_over_15_days_ago=$((-1-15*86400)) &&
-	almost_60_days_ago=$((60-60*86400)) &&
-	just_over_60_days_ago=$((-1-60*86400)) &&
-
-	test-tool chmtime =$just_over_60_days_ago $rr/preimage &&
-	test-tool chmtime =$almost_60_days_ago $rr/postimage &&
-	test-tool chmtime =$almost_15_days_ago $rr2/preimage
-
-ok 14 - set up for garbage collection tests
-
-expecting success: 
-	git rerere gc &&
-	test -f $rr/preimage &&
-	test -f $rr2/preimage
-
-ok 15 - gc preserves young or recently used records
-
-expecting success: 
-	test-tool chmtime =$just_over_60_days_ago $rr/postimage &&
-	test-tool chmtime =$just_over_15_days_ago $rr2/preimage &&
-	git rerere gc &&
-	! test -f $rr/preimage &&
-	! test -f $rr2/preimage
-
-ok 16 - old records rest in peace
-
-expecting success: 
-		rm -fr .git/rr-cache &&
-		rr=.git/rr-cache/$ZERO_OID &&
-		mkdir -p "$rr" &&
-		>"$rr/preimage" &&
-		>"$rr/postimage" &&
-
-		two_days_ago=$((-2*86400)) &&
-		test-tool chmtime =$two_days_ago "$rr/preimage" &&
-		test-tool chmtime =$two_days_ago "$rr/postimage" &&
-
-		find .git/rr-cache -type f | sort >original &&
-
-		git -c "gc.rerereresolved=$five_days" \
-		    -c "gc.rerereunresolved=$five_days" rerere gc &&
-		find .git/rr-cache -type f | sort >actual &&
-		test_cmp original actual &&
-
-		git -c "gc.rerereresolved=$five_days" \
-		    -c "gc.rerereunresolved=$right_now" rerere gc &&
-		find .git/rr-cache -type f | sort >actual &&
-		test_cmp original actual &&
-
-		git -c "gc.rerereresolved=$right_now" \
-		    -c "gc.rerereunresolved=$right_now" rerere gc &&
-		find .git/rr-cache -type f | sort >actual &&
-		test_must_be_empty actual
-	
-ok 17 - rerere gc with custom expiry (5, 0)
-
-expecting success: 
-		rm -fr .git/rr-cache &&
-		rr=.git/rr-cache/$ZERO_OID &&
-		mkdir -p "$rr" &&
-		>"$rr/preimage" &&
-		>"$rr/postimage" &&
-
-		two_days_ago=$((-2*86400)) &&
-		test-tool chmtime =$two_days_ago "$rr/preimage" &&
-		test-tool chmtime =$two_days_ago "$rr/postimage" &&
-
-		find .git/rr-cache -type f | sort >original &&
-
-		git -c "gc.rerereresolved=$five_days" \
-		    -c "gc.rerereunresolved=$five_days" rerere gc &&
-		find .git/rr-cache -type f | sort >actual &&
-		test_cmp original actual &&
-
-		git -c "gc.rerereresolved=$five_days" \
-		    -c "gc.rerereunresolved=$right_now" rerere gc &&
-		find .git/rr-cache -type f | sort >actual &&
-		test_cmp original actual &&
-
-		git -c "gc.rerereresolved=$right_now" \
-		    -c "gc.rerereunresolved=$right_now" rerere gc &&
-		find .git/rr-cache -type f | sort >actual &&
-		test_must_be_empty actual
-	
-ok 18 - rerere gc with custom expiry (5.days.ago, now)
-
-expecting success: 
-	git reset --hard &&
-
-	git checkout -b fourth &&
-	echo Hallo >file2 &&
-	git add file2 &&
-	test_tick &&
-	git commit -m version1 &&
-
-	git checkout third &&
-	echo Bello >file2 &&
-	git add file2 &&
-	test_tick &&
-	git commit -m version2 &&
-
-	test_must_fail git merge fourth &&
-	echo Cello >file2 &&
-	git add file2 &&
-	git commit -m resolution
-
-HEAD is now at 40cb797 third
-Switched to a new branch 'fourth'
-[fourth 26401ec] version1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file2
-Switched to branch 'third'
-[third 1f50303] version2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file2
-Merging:
-1f50303 version2
-virtual fourth
-found 1 common ancestor:
-40cb797 third
-Auto-merging file2
-CONFLICT (add/add): Merge conflict in file2
-Recorded preimage for 'file2'
-Automatic merge failed; fix conflicts and then commit the result.
-Recorded resolution for 'file2'.
-[third e9acb28] resolution
- Author: A U Thor <author@example.com>
-ok 19 - setup: file2 added differently in two branches
-
-expecting success: 
-	echo Cello >expected &&
-
-	git reset --hard HEAD~2 &&
-	git checkout -b fifth &&
-
-	echo Hallo >file3 &&
-	git add file3 &&
-	test_tick &&
-	git commit -m version1 &&
-
-	git checkout third &&
-	echo Bello >file3 &&
-	git add file3 &&
-	test_tick &&
-	git commit -m version2 &&
-	git tag version2 &&
-
-	test_must_fail git merge fifth &&
-	test_cmp expected file3 &&
-	test_must_fail git update-index --refresh
-
-HEAD is now at 40cb797 third
-Switched to a new branch 'fifth'
-[fifth 9b6b3c4] version1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file3
-Switched to branch 'third'
-[third 7eec302] version2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file3
-Merging:
-7eec302 version2
-virtual fifth
-found 1 common ancestor:
-40cb797 third
-Auto-merging file3
-CONFLICT (add/add): Merge conflict in file3
-Resolved 'file3' using previous resolution.
-Automatic merge failed; fix conflicts and then commit the result.
-file3: needs merge
-ok 20 - resolution was recorded properly
-
-expecting success: 
-	git config rerere.autoupdate true &&
-	git reset --hard &&
-	git checkout version2 &&
-	test_must_fail git merge fifth &&
-	git update-index --refresh
-
-HEAD is now at 7eec302 version2
-Note: checking out 'version2'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by performing another checkout.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
-
-  git checkout -b <new-branch-name>
-
-HEAD is now at 7eec302 version2
-Merging:
-7eec302 version2
-virtual fifth
-found 1 common ancestor:
-40cb797 third
-Auto-merging file3
-CONFLICT (add/add): Merge conflict in file3
-Staged 'file3' using previous resolution.
-Automatic merge failed; fix conflicts and then commit the result.
-ok 21 - rerere.autoupdate
-
-expecting success: 
-	test_might_fail git config --unset rerere.autoupdate &&
-	git reset --hard &&
-	git checkout version2 &&
-	test_must_fail git merge --rerere-autoupdate fifth &&
-	git update-index --refresh
-
-HEAD is now at 7eec302 version2
-HEAD is now at 7eec302 version2
-Merging:
-7eec302 version2
-virtual fifth
-found 1 common ancestor:
-40cb797 third
-Auto-merging file3
-CONFLICT (add/add): Merge conflict in file3
-Staged 'file3' using previous resolution.
-Automatic merge failed; fix conflicts and then commit the result.
-ok 22 - merge --rerere-autoupdate
-
-expecting success: 
-	headblob=$(git rev-parse version2:file3) &&
-	mergeblob=$(git rev-parse fifth:file3) &&
-	cat >expected <<-EOF &&
-	100644 $headblob 2	file3
-	100644 $mergeblob 3	file3
-	EOF
-
-	git config rerere.autoupdate true &&
-	git reset --hard &&
-	git checkout version2 &&
-	test_must_fail git merge --no-rerere-autoupdate fifth &&
-	git ls-files -u >actual &&
-	test_cmp expected actual
-
-HEAD is now at 7eec302 version2
-HEAD is now at 7eec302 version2
-Merging:
-7eec302 version2
-virtual fifth
-found 1 common ancestor:
-40cb797 third
-Auto-merging file3
-CONFLICT (add/add): Merge conflict in file3
-Resolved 'file3' using previous resolution.
-Automatic merge failed; fix conflicts and then commit the result.
-ok 23 - merge --no-rerere-autoupdate
-
-expecting success: 
-	headblob=$(git rev-parse version2:file3) &&
-	mergeblob=$(git rev-parse fifth:file3) &&
-	cat >expected.unresolved <<-EOF &&
-	100644 $headblob 2	file3
-	100644 $mergeblob 3	file3
-	EOF
-
-	test_might_fail git config --unset rerere.autoupdate &&
-	git reset --hard &&
-	git checkout version2 &&
-	fifth=$(git rev-parse fifth) &&
-	echo "$fifth		branch fifth of ." |
-	git fmt-merge-msg >msg &&
-	ancestor=$(git merge-base version2 fifth) &&
-	test_must_fail git merge-recursive "$ancestor" -- HEAD fifth &&
-
-	git ls-files --stage >failedmerge &&
-	cp file3 file3.conflict &&
-
-	git ls-files -u >actual &&
-	test_cmp expected.unresolved actual
-
-HEAD is now at 7eec302 version2
-HEAD is now at 7eec302 version2
-Merging HEAD with fifth
-Merging:
-7eec302 version2
-9b6b3c4 version1
-found 1 common ancestor:
-40cb797 third
-Auto-merging file3
-CONFLICT (add/add): Merge conflict in file3
-ok 24 - set up an unresolved merge
-
-expecting success: 
-	test_might_fail git config --unset rerere.autoupdate &&
-	git rm -fr --cached . &&
-	git update-index --index-info <failedmerge &&
-	cp file3.conflict file3 &&
-	test_must_fail git update-index --refresh -q &&
-
-	git rerere &&
-	git ls-files -u >actual &&
-	test_cmp expected.unresolved actual
-
-file3: needs merge
-rm 'a1'
-rm 'file3'
-rm 'file3'
-file3: needs merge
-Resolved 'file3' using previous resolution.
-ok 25 - explicit rerere
-
-expecting success: 
-	git config rerere.autoupdate true &&
-	git rm -fr --cached . &&
-	git update-index --index-info <failedmerge &&
-	cp file3.conflict file3 &&
-	test_must_fail git update-index --refresh -q &&
-
-	git rerere &&
-	git update-index --refresh
-
-file3: needs merge
-rm 'a1'
-rm 'file3'
-rm 'file3'
-file3: needs merge
-Staged 'file3' using previous resolution.
-ok 26 - explicit rerere with autoupdate
-
-expecting success: 
-	git config rerere.autoupdate false &&
-	git rm -fr --cached . &&
-	git update-index --index-info <failedmerge &&
-	cp file3.conflict file3 &&
-	git rerere &&
-	git ls-files -u >actual1 &&
-
-	git rm -fr --cached . &&
-	git update-index --index-info <failedmerge &&
-	cp file3.conflict file3 &&
-	git rerere --rerere-autoupdate &&
-	git update-index --refresh &&
-
-	git rm -fr --cached . &&
-	git update-index --index-info <failedmerge &&
-	cp file3.conflict file3 &&
-	git rerere --rerere-autoupdate --no-rerere-autoupdate &&
-	git ls-files -u >actual2 &&
-
-	git rm -fr --cached . &&
-	git update-index --index-info <failedmerge &&
-	cp file3.conflict file3 &&
-	git rerere --rerere-autoupdate --no-rerere-autoupdate --rerere-autoupdate &&
-	git update-index --refresh &&
-
-	test_cmp expected.unresolved actual1 &&
-	test_cmp expected.unresolved actual2
-
-rm 'a1'
-rm 'file3'
-Resolved 'file3' using previous resolution.
-file3: needs merge
-rm 'a1'
-rm 'file3'
-rm 'file3'
-Staged 'file3' using previous resolution.
-rm 'a1'
-rm 'file3'
-Resolved 'file3' using previous resolution.
-file3: needs merge
-rm 'a1'
-rm 'file3'
-rm 'file3'
-Staged 'file3' using previous resolution.
-ok 27 - explicit rerere --rerere-autoupdate overrides
-
-expecting success: 
-	git rm -fr --cached . &&
-	git update-index --index-info <failedmerge &&
-	cp file3.conflict file3 &&
-	test_must_fail git rerere --no-no-rerere-autoupdate 2>err &&
-	test_i18ngrep [Uu]sage err &&
-	test_must_fail git update-index --refresh
-
-rm 'a1'
-rm 'file3'
-usage: git rerere [clear | forget <path>... | status | remaining | diff | gc]
-file3: needs merge
-ok 28 - rerere --no-no-rerere-autoupdate
-
-expecting success: 
-	test_must_fail git rerere -h >help &&
-	test_i18ngrep [Uu]sage help
-
-usage: git rerere [clear | forget <path>... | status | remaining | diff | gc]
-ok 29 - rerere -h
-
-expecting success: 
-	rm -fr .git/rr-cache &&
-	mkdir .git/rr-cache &&
-	git reset --hard &&
-
-	test_seq 1 6 >early &&
-	>late &&
-	test_seq 11 15 >short &&
-	test_seq 111 120 >long &&
-	concat_insert short >file1 &&
-	concat_insert long >file2 &&
-	git add file1 file2 &&
-	git commit -m base &&
-	git tag base &&
-	git checkout -b six.1 &&
-	concat_insert short 6.1 >file1 &&
-	concat_insert long 6.1 >file2 &&
-	git add file1 file2 &&
-	git commit -m 6.1 &&
-	git checkout -b six.2 HEAD^ &&
-	concat_insert short 6.2 >file1 &&
-	concat_insert long 6.2 >file2 &&
-	git add file1 file2 &&
-	git commit -m 6.2 &&
-
-	# At this point, six.1 and six.2
-	# - derive from common ancestor that has two files
-	#   1...6 7 11..15 (file1) and 1...6 7 111..120 (file2)
-	# - six.1 replaces these 7s with 6.1
-	# - six.2 replaces these 7s with 6.2
-
-	merge_conflict_resolve &&
-
-	# Check that rerere knows that file1 and file2 have conflicts
-
-	printf "%s\n" file1 file2 >expect &&
-	git ls-files -u | sed -e "s/^.*	//" | sort -u >actual &&
-	test_cmp expect actual &&
-
-	git rerere status | sort >actual &&
-	test_cmp expect actual &&
-
-	git rerere remaining >actual &&
-	test_cmp expect actual &&
-
-	count_pre_post 2 0 &&
-
-	# Pretend that the conflicts were made quite some time ago
-	test-tool chmtime -172800 $(find .git/rr-cache/ -type f) &&
-
-	# Unresolved entries have not expired yet
-	git -c gc.rerereresolved=5 -c gc.rerereunresolved=5 rerere gc &&
-	count_pre_post 2 0 &&
-
-	# Unresolved entries have expired
-	git -c gc.rerereresolved=5 -c gc.rerereunresolved=1 rerere gc &&
-	count_pre_post 0 0 &&
-
-	# Recreate the conflicted state
-	merge_conflict_resolve &&
-	count_pre_post 2 0 &&
-
-	# Clear it
-	git rerere clear &&
-	count_pre_post 0 0 &&
-
-	# Recreate the conflicted state
-	merge_conflict_resolve &&
-	count_pre_post 2 0 &&
-
-	# We resolved file1 and file2
-	git rerere &&
-	git rerere remaining >actual &&
-	test_must_be_empty actual &&
-
-	# We must have recorded both of them
-	count_pre_post 2 2 &&
-
-	# Now we should be able to resolve them both
-	git reset --hard &&
-	test_must_fail git merge six.1 &&
-	git rerere &&
-
-	git rerere remaining >actual &&
-	test_must_be_empty actual &&
-
-	concat_insert short 6.1 6.2 >file1.expect &&
-	concat_insert long 6.1 6.2 >file2.expect &&
-	test_cmp file1.expect file1 &&
-	test_cmp file2.expect file2 &&
-
-	# Forget resolution for file2
-	git rerere forget file2 &&
-	echo file2 >expect &&
-	git rerere status >actual &&
-	test_cmp expect actual &&
-	count_pre_post 2 1 &&
-
-	# file2 already has correct resolution, so record it again
-	git rerere &&
-
-	# Pretend that the resolutions are old again
-	test-tool chmtime -172800 $(find .git/rr-cache/ -type f) &&
-
-	# Resolved entries have not expired yet
-	git -c gc.rerereresolved=5 -c gc.rerereunresolved=5 rerere gc &&
-
-	count_pre_post 2 2 &&
-
-	# Resolved entries have expired
-	git -c gc.rerereresolved=1 -c gc.rerereunresolved=5 rerere gc &&
-	count_pre_post 0 0
-
-HEAD is now at 7eec302 version2
-[detached HEAD 40e0609] base
- Author: A U Thor <author@example.com>
- 2 files changed, 29 insertions(+)
- create mode 100644 file1
- create mode 100644 file2
-Switched to a new branch 'six.1'
-[six.1 605006b] 6.1
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+), 2 deletions(-)
-Switched to a new branch 'six.2'
-[six.2 ba09fec] 6.2
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+), 2 deletions(-)
-HEAD is now at ba09fec 6.2
-Merging:
-ba09fec 6.2
-virtual six.1
-found 1 common ancestor:
-40e0609 base
-Auto-merging file2
-CONFLICT (content): Merge conflict in file2
-Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-Recorded preimage for 'file1'
-Recorded preimage for 'file2'
-Automatic merge failed; fix conflicts and then commit the result.
-HEAD is now at ba09fec 6.2
-Merging:
-ba09fec 6.2
-virtual six.1
-found 1 common ancestor:
-40e0609 base
-Auto-merging file2
-CONFLICT (content): Merge conflict in file2
-Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-Recorded preimage for 'file1'
-Recorded preimage for 'file2'
-Automatic merge failed; fix conflicts and then commit the result.
-HEAD is now at ba09fec 6.2
-Merging:
-ba09fec 6.2
-virtual six.1
-found 1 common ancestor:
-40e0609 base
-Auto-merging file2
-CONFLICT (content): Merge conflict in file2
-Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-Recorded preimage for 'file1'
-Recorded preimage for 'file2'
-Automatic merge failed; fix conflicts and then commit the result.
-Recorded resolution for 'file1'.
-Recorded resolution for 'file2'.
-HEAD is now at ba09fec 6.2
-Merging:
-ba09fec 6.2
-virtual six.1
-found 1 common ancestor:
-40e0609 base
-Auto-merging file2
-CONFLICT (content): Merge conflict in file2
-Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-Resolved 'file1' using previous resolution.
-Resolved 'file2' using previous resolution.
-Automatic merge failed; fix conflicts and then commit the result.
-Updated preimage for 'file2'
-Forgot resolution for 'file2'
-Recorded resolution for 'file2'.
-ok 30 - multiple identical conflicts
-
-expecting success: 
-	git reset --hard &&
-
-	git checkout -b branch-1 master &&
-	echo "bar" >test &&
-	git add test &&
-	git commit -q -m two &&
-
-	git reset --hard &&
-	git checkout -b branch-2 master &&
-	echo "foo" >test &&
-	git add test &&
-	git commit -q -a -m one &&
-
-	test_must_fail git merge branch-1 &&
-	echo "<<<<<<< a" >test &&
-	git rerere &&
-
-	git rerere clear
-
-HEAD is now at ba09fec 6.2
-Switched to a new branch 'branch-1'
-HEAD is now at 5727ee8 two
-Switched to a new branch 'branch-2'
-Merging:
-95c3f31 one
-virtual branch-1
-found 1 common ancestor:
-70749e0 initial
-Auto-merging test
-CONFLICT (add/add): Merge conflict in test
-Recorded preimage for 'test'
-Automatic merge failed; fix conflicts and then commit the result.
-error: could not parse conflict hunks in 'test'
-ok 31 - rerere with unexpected conflict markers does not crash
-
-expecting success: 
-	git reset --hard &&
-
-	git checkout -b A master &&
-	echo "bar" >test &&
-	git add test &&
-	git commit -q -m two &&
-	echo "baz" >test &&
-	git add test &&
-	git commit -q -m three &&
-
-	git reset --hard &&
-	git checkout -b B master &&
-	echo "foo" >test &&
-	git add test &&
-	git commit -q -a -m one &&
-
-	test_must_fail git merge A~ &&
-	git add test &&
-	git commit -q -m "will solve conflicts later" &&
-	test_must_fail git merge A &&
-
-	echo "resolved" >test &&
-	git add test &&
-	git commit -q -m "solved conflict" &&
-
-	echo "resolved" >expect &&
-
-	git reset --hard HEAD~~ &&
-	test_must_fail git merge A~ &&
-	git add test &&
-	git commit -q -m "will solve conflicts later" &&
-	test_must_fail git merge A &&
-	cat test >actual &&
-	test_cmp expect actual &&
-
-	git add test &&
-	git commit -m "rerere solved conflict" &&
-	git reset --hard HEAD~ &&
-	test_must_fail git merge A &&
-	cat test >actual &&
-	test_cmp expect actual
-
-HEAD is now at 95c3f31 one
-Switched to a new branch 'A'
-HEAD is now at 8f8d617 three
-Switched to a new branch 'B'
-Merging:
-95c3f31 one
-virtual A~
-found 1 common ancestor:
-70749e0 initial
-Auto-merging test
-CONFLICT (add/add): Merge conflict in test
-Recorded preimage for 'test'
-Automatic merge failed; fix conflicts and then commit the result.
-Recorded preimage for 'test'
-Merging:
-35eb3e9 will solve conflicts later
-virtual A
-found 1 common ancestor:
-5727ee8 two
-Auto-merging test
-CONFLICT (content): Merge conflict in test
-Recorded preimage for 'test'
-Automatic merge failed; fix conflicts and then commit the result.
-Recorded resolution for 'test'.
-HEAD is now at 95c3f31 one
-Merging:
-95c3f31 one
-virtual A~
-found 1 common ancestor:
-70749e0 initial
-Auto-merging test
-CONFLICT (add/add): Merge conflict in test
-Recorded preimage for 'test'
-Automatic merge failed; fix conflicts and then commit the result.
-Recorded preimage for 'test'
-Merging:
-35eb3e9 will solve conflicts later
-virtual A
-found 1 common ancestor:
-5727ee8 two
-Auto-merging test
-CONFLICT (content): Merge conflict in test
-Resolved 'test' using previous resolution.
-Automatic merge failed; fix conflicts and then commit the result.
-[B c1558e5] rerere solved conflict
- Author: A U Thor <author@example.com>
-HEAD is now at 35eb3e9 will solve conflicts later
-Merging:
-35eb3e9 will solve conflicts later
-virtual A
-found 1 common ancestor:
-5727ee8 two
-Auto-merging test
-CONFLICT (content): Merge conflict in test
-Resolved 'test' using previous resolution.
-Automatic merge failed; fix conflicts and then commit the result.
-ok 32 - rerere with inner conflict markers
-
-expecting success: 
-	test_create_repo stage_1_handling &&
-	(
-		cd stage_1_handling &&
-
-		test_seq 1 10 >original &&
-		git add original &&
-		git commit -m original &&
-
-		git checkout -b A master &&
-		git mv original A &&
-		git commit -m "rename to A" &&
-
-		git checkout -b B master &&
-		git mv original B &&
-		git commit -m "rename to B"
-	)
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4200-rerere/stage_1_handling/.git/
-[master (root-commit) 64a4a07] original
- Author: A U Thor <author@example.com>
- 1 file changed, 10 insertions(+)
- create mode 100644 original
-Switched to a new branch 'A'
-[A cc792a7] rename to A
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename original => A (100%)
-Switched to a new branch 'B'
-[B 02c49bb] rename to B
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename original => B (100%)
-ok 33 - setup simple stage 1 handling
-
-expecting success: 
-	(
-		cd stage_1_handling &&
-
-		git config rerere.enabled true &&
-		git checkout A^0 &&
-		test_must_fail git merge B^0
-	)
-
-Note: checking out '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 performing another checkout.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
-
-  git checkout -b <new-branch-name>
-
-HEAD is now at cc792a7 rename to A
-Merging:
-cc792a7 rename to A
-virtual B^0
-found 1 common ancestor:
-64a4a07 original
-CONFLICT (rename/rename): Rename "original"->"A" in branch "HEAD" rename "original"->"B" in "B^0"
-Automatic merge failed; fix conflicts and then commit the result.
-ok 34 - test simple stage 1 handling
-
-# passed all 34 test(s)
-1..34
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t5002-archive-attr-pattern.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5002-archive-attr-pattern/.git/
-expecting success: 
-	echo ignored >ignored &&
-	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 --bare . bare &&
-	cp .git/info/attributes bare/info/attributes
-
-[master (root-commit) 39484cd] .
- 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: 
-	git archive HEAD >archive.tar &&
-	(mkdir archive && cd archive && "$TAR" xf -) <archive.tar
-
-ok 2 - git archive
-
-expecting success: test ! -e archive/ignored
-ok 3 -  archive/ignored does not exist
-
-expecting success: test ! -e archive/not-ignored-dir/ignored
-ok 4 -  archive/not-ignored-dir/ignored does not exist
-
-expecting success: test -e archive/not-ignored-dir/ignored-only-if-dir
-ok 5 -  archive/not-ignored-dir/ignored-only-if-dir exists
-
-expecting success: test -e archive/not-ignored-dir/
-ok 6 -  archive/not-ignored-dir/ exists
-
-expecting success: test ! -e archive/ignored-only-if-dir/
-ok 7 -  archive/ignored-only-if-dir/ does not exist
-
-expecting success: 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: test ! -e archive/ignored-without-slash/
-ok 9 -  archive/ignored-without-slash/ does not exist
-
-expecting success: test ! -e archive/ignored-without-slash/foo
-ok 10 -  archive/ignored-without-slash/foo does not exist
-
-expecting success: test ! -e archive/wildcard-without-slash/
-ok 11 -  archive/wildcard-without-slash/ does not exist
-
-expecting success: test ! -e archive/wildcard-without-slash/foo
-ok 12 -  archive/wildcard-without-slash/foo does not exist
-
-expecting success: test ! -e archive/deep/and/slashless/
-ok 13 -  archive/deep/and/slashless/ does not exist
-
-expecting success: test ! -e archive/deep/and/slashless/foo
-ok 14 -  archive/deep/and/slashless/foo does not exist
-
-expecting success: test ! -e archive/deep/with/wildcard/
-ok 15 -  archive/deep/with/wildcard/ does not exist
-
-expecting success: test ! -e archive/deep/with/wildcard/foo
-ok 16 -  archive/deep/with/wildcard/foo does not exist
-
-expecting success: test ! -e archive/one-level-lower/
-ok 17 -  archive/one-level-lower/ does not exist
-
-expecting success: 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: 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/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
 *** t5001-archive-attr.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5001-archive-attr/.git/
 expecting success: 
@@ -134142,7 +134414,7 @@
 	git clone --bare . bare &&
 	cp .git/info/attributes bare/info/attributes
 
-[master (root-commit) acedd11] .
+[master (root-commit) be7f6a5] .
  Author: A U Thor <author@example.com>
  9 files changed, 8 insertions(+)
  create mode 100644 .gitattributes
@@ -134441,2713 +134713,416 @@
 1..9
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t4300-merge-tree.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4300-merge-tree/.git/
-expecting success: 
-	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
+*** t5301-sliding-window.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5301-sliding-window/.git/
+expecting success: 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: 
-	cat >expected <<\EXPECTED &&
-added in remote
-  their  100644 43d5a8ed6ef6c00ff775008633f95787d088285d ONE
-@@ -0,0 +1 @@
-+AAA
-EXPECTED
+expecting success: git verify-pack -v "$pack1"
+e628b397161cd042f8f5888abebff5248e7ebea1 commit 163 124 12
+d67b2ae81f0bd18212d239b6a965711041f73739 blob   32770 32789 136
+7c0c57f15aee3c4cbe243c44d3c01ecfa949bb25 blob   32770 32789 32925
+f76f6b9f6aed8209a40d300bf7dcb4fcf9863531 blob   32772 32791 65714
+556c804eac998cc8fa89f225a29870c3d873477b blob   10 22 98505 1 f76f6b9f6aed8209a40d300bf7dcb4fcf9863531
+b7fabea4d93049ea90d45d8252b9a4f8ee7c9c2c tree   116 115 98527
+non delta: 5 objects
+chain length = 1: 1 object
+.git/objects/pack/pack-d0c726ab46f1a45f627f696a3c30b92d3ab70745.pack: ok
+ok 2 - verify-pack -v, defaults
 
-	git reset --hard initial &&
-	test_commit "add-a-not-b" "ONE" "AAA" &&
-	git merge-tree initial initial add-a-not-b >actual &&
-	test_cmp expected actual
+expecting success: git config core.packedGitWindowSize 512 &&
+     git verify-pack -v "$pack1"
+e628b397161cd042f8f5888abebff5248e7ebea1 commit 163 124 12
+d67b2ae81f0bd18212d239b6a965711041f73739 blob   32770 32789 136
+7c0c57f15aee3c4cbe243c44d3c01ecfa949bb25 blob   32770 32789 32925
+f76f6b9f6aed8209a40d300bf7dcb4fcf9863531 blob   32772 32791 65714
+556c804eac998cc8fa89f225a29870c3d873477b blob   10 22 98505 1 f76f6b9f6aed8209a40d300bf7dcb4fcf9863531
+b7fabea4d93049ea90d45d8252b9a4f8ee7c9c2c tree   116 115 98527
+non delta: 5 objects
+chain length = 1: 1 object
+.git/objects/pack/pack-d0c726ab46f1a45f627f696a3c30b92d3ab70745.pack: ok
+ok 3 - verify-pack -v, packedGitWindowSize == 1 page
 
-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: git config core.packedGitWindowSize 512 &&
+     git config core.packedGitLimit 512 &&
+     git verify-pack -v "$pack1"
+e628b397161cd042f8f5888abebff5248e7ebea1 commit 163 124 12
+d67b2ae81f0bd18212d239b6a965711041f73739 blob   32770 32789 136
+7c0c57f15aee3c4cbe243c44d3c01ecfa949bb25 blob   32770 32789 32925
+f76f6b9f6aed8209a40d300bf7dcb4fcf9863531 blob   32772 32791 65714
+556c804eac998cc8fa89f225a29870c3d873477b blob   10 22 98505 1 f76f6b9f6aed8209a40d300bf7dcb4fcf9863531
+b7fabea4d93049ea90d45d8252b9a4f8ee7c9c2c tree   116 115 98527
+non delta: 5 objects
+chain length = 1: 1 object
+.git/objects/pack/pack-d0c726ab46f1a45f627f696a3c30b92d3ab70745.pack: ok
+ok 4 - verify-pack -v, packedGit{WindowSize,Limit} == 1 page
 
-expecting success: 
-	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
+expecting success: 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
 
-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: git config --unset core.packedGitWindowSize &&
+     git config --unset core.packedGitLimit &&
+     git verify-pack -v "$pack2"
+d3f3da8aa9a5476ecf7b52ed2975db24a4ab8bd6 commit 211 153 12
+e628b397161cd042f8f5888abebff5248e7ebea1 commit 9 20 165 1 d3f3da8aa9a5476ecf7b52ed2975db24a4ab8bd6
+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-17f39a433cbc2af396b5aa7e13012e02a8bb00d6.pack: ok
+ok 6 - verify-pack -v, defaults
 
+# passed all 6 test(s)
+1..6
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t4202-log.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4202-log/.git/
 expecting success: 
-	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)
+	echo one >one &&
+	git add one &&
+	test_tick &&
+	git commit -m initial &&
 
-expecting success: 
-	cat >expected <<\EXPECTED &&
-added in both
-  our    100644 43d5a8ed6ef6c00ff775008633f95787d088285d ONE
-  their  100644 ba629238ca89489f2b350e196ca445e09d8bb834 ONE
-@@ -1 +1,5 @@
-+<<<<<<< .our
- AAA
-+=======
-+BBB
-+>>>>>>> .their
-EXPECTED
+	echo ichi >one &&
+	git add one &&
+	test_tick &&
+	git commit -m second &&
 
-	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 &&
-	test_cmp expected actual
+	git mv one ichi &&
+	test_tick &&
+	git commit -m third &&
 
-HEAD is now at c1d16d8 initial
-[master 59aa417] add-a-b-diff-A
+	cp ichi ein &&
+	git add ein &&
+	test_tick &&
+	git commit -m fourth &&
+
+	mkdir a &&
+	echo ni >a/two &&
+	git add a/two &&
+	test_tick &&
+	git commit -m fifth  &&
+
+	git rm a/two &&
+	test_tick &&
+	git commit -m sixth
+
+
+[master (root-commit) 3a2fdcb] initial
  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
+ create mode 100644 one
+[master f7dab8e] second
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[master 2fbe8c0] third
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename one => ichi (100%)
+[master 5d31159] fourth
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 ONE
-ok 5 - file add A, B (different)
+ create mode 100644 ein
+[master 394ef78] fifth
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 a/two
+rm 'a/two'
+[master 804a787] sixth
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 a/two
+ok 1 - setup
 
 expecting success: 
-	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
+	git log --pretty="format:%s" > actual &&
+	test_cmp expect actual
+
+ok 2 - pretty
 
 expecting success: 
-	cat >expected <<\EXPECTED &&
-merged
-  result 100644 ba629238ca89489f2b350e196ca445e09d8bb834 initial-file
-  our    100644 e79c5e8f964493290a409888d5413a737e8e5dd5 initial-file
-@@ -1 +1 @@
--initial
-+BBB
-EXPECTED
 
-	git reset --hard initial &&
-	test_commit "change-not-a-b" "initial-file" "BBB" &&
-	git merge-tree initial initial change-not-a-b >actual &&
-	test_cmp expected actual
+	git log --pretty="tformat:%s" > actual &&
+	test_cmp expect 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
+ok 3 - pretty (tformat)
 
 expecting success: 
-	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 8 - file change A, B (same)
+	git log --pretty="%s" > actual &&
+	test_cmp expect actual
+
+ok 4 - pretty (shortcut)
 
 expecting success: 
-	cat >expected <<\EXPECTED &&
-changed in both
-  base   100644 e79c5e8f964493290a409888d5413a737e8e5dd5 initial-file
-  our    100644 43d5a8ed6ef6c00ff775008633f95787d088285d initial-file
-  their  100644 ba629238ca89489f2b350e196ca445e09d8bb834 initial-file
-@@ -1 +1,5 @@
-+<<<<<<< .our
- AAA
-+=======
-+BBB
-+>>>>>>> .their
-EXPECTED
 
-	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 &&
-	test_cmp expected actual
+	git log --format="%s" > actual &&
+	test_cmp expect 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 9 - file change A, B (different)
+ok 5 - format
 
 expecting success: 
-	cat >expected <<\EXPECTED &&
-changed in both
-  base   100644 f4f1f998c7776568c4ff38f516d77fef9399b5a7 ONE
-  our    100644 af14c2c3475337c73759d561ef70b59e5c731176 ONE
-  their  100644 372d761493f524d44d59bd24700c3bdf914c973c ONE
-@@ -7,7 +7,11 @@
- AAA
- AAA
- AAA
-+<<<<<<< .our
- BBB
-+=======
-+CCC
-+>>>>>>> .their
- AAA
- AAA
- AAA
-EXPECTED
 
-	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 &&
-	test_cmp expected actual
+	git log -2 --format="%w(11,1,2)This is the %s commit." > actual &&
+	test_cmp expect 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 10 - file change A, B (mixed)
+ok 6 - format %w(11,1,2)
 
 expecting success: 
-	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 11 - file remove A, !B
+	git log -2 --format="%w(,1,2)This is%nthe %s%ncommit." > actual &&
+	test_cmp expect actual
+
+ok 7 - format %w(,1,2)
 
 expecting success: 
-	cat >expected <<\EXPECTED &&
-removed in remote
-  base   100644 43d5a8ed6ef6c00ff775008633f95787d088285d ONE
-  our    100644 43d5a8ed6ef6c00ff775008633f95787d088285d ONE
-@@ -1 +0,0 @@
--AAA
-EXPECTED
 
-	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 &&
-	test_cmp expected actual
+	git log --oneline > actual &&
+	test_cmp expect 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 12 - file remove !A, B
+ok 8 - oneline
 
 expecting success: 
-	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 13 - file remove A, B (same)
+	git log --no-renames --pretty="format:%s" --diff-filter=A HEAD > actual &&
+	git log --no-renames --pretty="format:%s" --diff-filter A HEAD > actual-separate &&
+	printf "fifth\nfourth\nthird\ninitial" > expect &&
+	test_cmp expect actual &&
+	test_cmp expect actual-separate
+
+
+ok 9 - diff-filter=A
 
 expecting success: 
-	cat >expected <<\EXPECTED &&
-removed in remote
-  base   100644 43d5a8ed6ef6c00ff775008633f95787d088285d ONE
-  our    100644 ba629238ca89489f2b350e196ca445e09d8bb834 ONE
-@@ -1 +0,0 @@
--BBB
-EXPECTED
 
-	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 &&
-	test_cmp expected actual
+	actual=$(git log --pretty="format:%s" --diff-filter=M HEAD) &&
+	expect=$(echo second) &&
+	verbose test "$actual" = "$expect"
 
-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 14 - file change A, remove B
+
+ok 10 - diff-filter=M
 
 expecting success: 
-	cat >expected <<\EXPECTED &&
-removed in local
-  base   100644 43d5a8ed6ef6c00ff775008633f95787d088285d ONE
-  their  100644 ba629238ca89489f2b350e196ca445e09d8bb834 ONE
-EXPECTED
 
-	git reset --hard initial &&
-	test_commit "rm-a-change-b-base" "ONE" "AAA" &&
+	actual=$(git log --no-renames --pretty="format:%s" --diff-filter=D HEAD) &&
+	expect=$(echo sixth ; echo third) &&
+	verbose test "$actual" = "$expect"
 
-	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 &&
-	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 15 - file remove A, change B
+ok 11 - diff-filter=D
 
 expecting success: 
-	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 16 - tree add A, B (same)
+	actual=$(git log -M --pretty="format:%s" --diff-filter=R HEAD) &&
+	expect=$(echo third) &&
+	verbose test "$actual" = "$expect"
+
+
+ok 12 - diff-filter=R
 
 expecting success: 
-	cat >expect <<-\EOF &&
-	added in both
-	  our    100644 43d5a8ed6ef6c00ff775008633f95787d088285d sub/file
-	  their  100644 ba629238ca89489f2b350e196ca445e09d8bb834 sub/file
-	@@ -1 +1,5 @@
-	+<<<<<<< .our
-	 AAA
-	+=======
-	+BBB
-	+>>>>>>> .their
-	EOF
-	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 &&
-	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 17 - tree add A, B (different)
+	actual=$(git log -C -C --pretty="format:%s" --diff-filter=C HEAD) &&
+	expect=$(echo fourth) &&
+	verbose test "$actual" = "$expect"
+
+
+ok 13 - diff-filter=C
 
 expecting success: 
-	cat >expect <<-\EOF &&
-	removed in remote
-	  base   100644 43d5a8ed6ef6c00ff775008633f95787d088285d sub/file
-	  our    100644 43d5a8ed6ef6c00ff775008633f95787d088285d sub/file
-	@@ -1 +0,0 @@
-	-AAA
-	EOF
-	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 &&
-	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 18 - tree unchanged A, removed B
+	actual=$(git log --follow --pretty="format:%s" ichi) &&
+	expect=$(echo third ; echo second ; echo initial) &&
+	verbose test "$actual" = "$expect"
+
+ok 14 - git log --follow
 
 expecting success: 
-	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 43aa4fdec31eb92e1fdc2f0ce6ea9ddb7c32bcf7 initial-file/ONE
-	@@ -0,0 +1 @@
-	+CCC
-	removed in remote
-	  base   100644 e79c5e8f964493290a409888d5413a737e8e5dd5 initial-file
-	  our    100644 e79c5e8f964493290a409888d5413a737e8e5dd5 initial-file
-	@@ -1 +0,0 @@
-	-initial
-	EOF
-	test_cmp expect actual
+	test_config log.follow true &&
+	actual=$(git log --pretty="format:%s" ichi) &&
+	expect=$(echo third ; echo second ; echo initial) &&
+	verbose test "$actual" = "$expect"
 
-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 19 - turn file to tree
+ok 15 - git config log.follow works like --follow
 
 expecting success: 
-	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 43d5a8ed6ef6c00ff775008633f95787d088285d dir/path
-	  our    100644 43d5a8ed6ef6c00ff775008633f95787d088285d dir/path
-	@@ -1 +0,0 @@
-	-AAA
-	added in remote
-	  their  100644 43aa4fdec31eb92e1fdc2f0ce6ea9ddb7c32bcf7 dir
-	@@ -0,0 +1 @@
-	+CCC
-	EOF
-	test_cmp expect actual
+	test_config log.follow true &&
+	git log --pretty="format:%s" ichi ein
 
-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 20 - turn tree to file
+fourth
+thirdok 16 - git config log.follow does not die with multiple paths
 
-# passed all 20 test(s)
-1..20
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t4150-am.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4150-am/.git/
 expecting success: 
-	cat >msg <<-\EOF &&
-	second
+	test_config log.follow true &&
+	git log --
 
-	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.
+commit 804a7879c6cac637c9d34d1608e3e54867d90b7e
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:18:13 2005 -0700
 
-	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 &&
+    sixth
 
-	Lorem ipsum dolor sit amet,
-	consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut
-	laoreet dolore magna aliquam erat volutpat.
+commit 394ef780a000df496e0a8fdd648963c3f9d96f56
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:17:13 2005 -0700
 
-	  git
-	  ---
-	  +++
+    fifth
 
-	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.
+commit 5d311594784eefe7b43496741766fe058f1c91a1
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:16:13 2005 -0700
 
-	Reported-by: A N Other <a.n.other@example.com>
-	EOF
+    fourth
 
-	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
+commit 2fbe8c09c8e84c2346ba2ac744cb09a926773855
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:15:13 2005 -0700
 
-	Sometimes we have to find out that there's nothing left.
+    third
 
-	EOF
+commit f7dab8eda217fc1e06315e7c91b6bd7c2a56363a
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:14:13 2005 -0700
 
-	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>
+    second
 
-	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.
+commit 3a2fdcbc365f1f169c2d433dbb277d88b412d8c9
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:13:13 2005 -0700
 
-	EOF
+    initial
+ok 17 - git config log.follow does not die with no paths
 
-	cat >msg-without-scissors-line <<-\EOF &&
-	Test that git-am --scissors cuts at the scissors line
+expecting success: 
+	test_config log.follow true &&
+	actual=$(git log --no-follow --pretty="format:%s" ichi) &&
+	expect="third" &&
+	verbose test "$actual" = "$expect"
 
-	This line should be included in the commit message.
-	EOF
+ok 18 - git config log.follow is overridden by --no-follow
 
-	printf "Subject: " >subject-prefix &&
+expecting success: 
+	git log --no-walk --oneline 5d31159 804a787 394ef78 > actual &&
+	test_cmp expect actual
 
-	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.
+ok 19 - git log --no-walk <commits> sorts by commit time
 
-	 - - >8 - - remove everything above this line - - >8 - -
+expecting success: 
+	git log --no-walk=sorted --oneline 5d31159 804a787 394ef78 > actual &&
+	test_cmp expect actual
 
-	EOF
+ok 20 - git log --no-walk=sorted <commits> sorts by commit time
 
-	signoff="Signed-off-by: $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>"
+expecting success: 
+	git log --line-prefix="=== " --no-walk --oneline 5d31159 804a787 394ef78 > actual &&
+	test_cmp expect actual
 
-ok 1 - setup: messages
+ok 21 - git log --line-prefix="=== " --no-walk <commits> sorts by commit time
 
 expecting success: 
-	echo hello >file &&
-	git add file &&
-	test_tick &&
-	git commit -m first &&
-	git tag first &&
+	git log --no-walk=unsorted --oneline 5d31159 804a787 394ef78 > actual &&
+	test_cmp expect actual
 
-	echo world >>file &&
-	git add file &&
+ok 22 - git log --no-walk=unsorted <commits> leaves list of commits as given
+
+expecting success: 
+	git show --oneline -s 5d31159 804a787 394ef78 > actual &&
+	test_cmp expect actual
+
+ok 23 - git show <commits> leaves list of commits as given
+
+expecting success: 
+	echo case >one &&
 	test_tick &&
-	git commit -F msg &&
-	git tag second &&
+	git add one &&
+	git commit -a -m 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 &&
+[master e9e4904] Second
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one
+ok 24 - setup case sensitivity tests
 
+expecting success: 
+	echo second >expect &&
+	git log -1 --pretty="tformat:%s" --grep=sec >actual &&
+	test_cmp expect actual
 
-	echo file >file &&
-	git add file &&
-	git commit -F msg-without-scissors-line &&
-	git tag expected-for-scissors &&
-	git reset --hard HEAD^ &&
+ok 25 - log --grep
 
-	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^ &&
+expecting success: 
+	# Fixed
+	git -c grep.patternType=fixed log --pretty="tformat:%s" --invert-grep --grep=th --grep=Sec >actual &&
+	test_cmp expect actual &&
 
-	sed -n -e "3,\$p" msg >file &&
-	git add file &&
-	test_tick &&
-	git commit -m third &&
+	# POSIX basic
+	git -c grep.patternType=basic log --pretty="tformat:%s" --invert-grep --grep=t[h] --grep=S[e]c >actual &&
+	test_cmp expect actual &&
 
-	git format-patch --stdout first >patch2	&&
+	# POSIX extended
+	git -c grep.patternType=basic log --pretty="tformat:%s" --invert-grep --grep=t[h] --grep=S[e]c >actual &&
+	test_cmp expect actual &&
 
-	git checkout -b lorem &&
-	sed -n -e "11,\$p" msg >file &&
-	head -n 9 msg >>file &&
-	test_tick &&
-	git commit -a -m "moved stuff" &&
+	# PCRE
+	if test_have_prereq PCRE
+	then
+		git -c grep.patternType=perl log --pretty="tformat:%s" --invert-grep --grep=t[h] --grep=S[e]c >actual &&
+		test_cmp expect actual
+	fi
 
-	echo goodbye >another &&
-	git add another &&
-	test_tick &&
-	git commit -m "added another file" &&
+ok 26 - log --invert-grep --grep
 
-	git format-patch --stdout master >lorem-move.patch &&
-	git format-patch --no-prefix --stdout master >lorem-zero.patch &&
+expecting success: 
+	echo initial >expect &&
 
-	git checkout -b rename &&
-	git mv file renamed &&
-	git commit -m "renamed a file" &&
+	# Fixed
+	git -c grep.patternType=fixed log --pretty="tformat:%s" --invert-grep -i --grep=th --grep=Sec >actual &&
+	test_cmp expect actual &&
 
-	git format-patch -M --stdout lorem >rename.patch &&
+	# POSIX basic
+	git -c grep.patternType=basic log --pretty="tformat:%s" --invert-grep -i --grep=t[h] --grep=S[e]c >actual &&
+	test_cmp expect actual &&
 
-	git reset --soft lorem^ &&
-	git commit -m "renamed a file and added another" &&
+	# POSIX extended
+	git -c grep.patternType=extended log --pretty="tformat:%s" --invert-grep -i --grep=t[h] --grep=S[e]c >actual &&
+	test_cmp expect actual &&
 
-	git format-patch -M --stdout lorem^ >rename-add.patch &&
+	# PCRE
+	if test_have_prereq PCRE
+	then
+		git -c grep.patternType=perl log --pretty="tformat:%s" --invert-grep -i --grep=t[h] --grep=S[e]c >actual &&
+		test_cmp expect actual
+	fi
 
-	# reset time
-	sane_unset test_tick &&
-	test_tick
-
-[master (root-commit) 6b2d93f] first
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-[master 88f8893] second
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[master 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
-[master 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
-[master 7179449] third
- Author: A U Thor <author@example.com>
- 1 file changed, 30 insertions(+), 2 deletions(-)
- rewrite file (100%)
-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%)
-ok 2 - setup
-
-expecting success: 
-	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 756adf8 renamed a file and added another
-Note: checking out '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 performing another checkout.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
-
-  git checkout -b <new-branch-name>
-
-HEAD is now at 6b2d93f first
-Applying: second
-ok 3 - am applies patch correctly
-
-expecting success: 
-	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: 
-	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: 
-	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: 
-	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: 
-	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: 
-	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: 
-	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: 
-	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: 
-	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: 
-	test_when_finished "rm -f .git/hooks/applypatch-msg" &&
-	rm -fr .git/rebase-apply &&
-	git reset --hard &&
-	git checkout first &&
-	mkdir -p .git/hooks &&
-	write_script .git/hooks/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: 
-	test_when_finished "rm -f .git/hooks/applypatch-msg" &&
-	rm -fr .git/rebase-apply &&
-	git reset --hard &&
-	git checkout first &&
-	mkdir -p .git/hooks &&
-	write_script .git/hooks/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: 
-	test_when_finished "rm -f .git/hooks/pre-applypatch" &&
-	rm -fr .git/rebase-apply &&
-	git reset --hard &&
-	git checkout first &&
-	mkdir -p .git/hooks &&
-	write_script .git/hooks/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 6b2d93f first
-HEAD is now at 6b2d93f first
-Applying: second
-ok 15 - am with pre-applypatch hook
-
-expecting success: 
-	test_when_finished "rm -f .git/hooks/pre-applypatch" &&
-	rm -fr .git/rebase-apply &&
-	git reset --hard &&
-	git checkout first &&
-	mkdir -p .git/hooks &&
-	write_script .git/hooks/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 16 - am with failing pre-applypatch hook
-
-expecting success: 
-	test_when_finished "rm -f .git/hooks/post-applypatch" &&
-	rm -fr .git/rebase-apply &&
-	git reset --hard &&
-	git checkout first &&
-	mkdir -p .git/hooks &&
-	write_script .git/hooks/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 6b2d93f first
-HEAD is now at 6b2d93f first
-Applying: second
-ok 17 - am with post-applypatch hook
-
-expecting success: 
-	test_when_finished "rm -f .git/hooks/post-applypatch" &&
-	rm -fr .git/rebase-apply &&
-	git reset --hard &&
-	git checkout first &&
-	mkdir -p .git/hooks &&
-	write_script .git/hooks/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 18 - am with failing post-applypatch hook
-
-expecting success: 
-	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 19 - am --scissors cuts the message at the scissors line
-
-expecting success: 
-	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 20 - am --no-scissors overrides mailinfo.scissors
-
-expecting success: 
-	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 21 - setup: new author and committer
-
-expecting success: 
-	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 master^^)" = "$(git rev-parse HEAD^^)" &&
-	git diff --exit-code master..HEAD &&
-	git diff --exit-code master^..HEAD^ &&
-	compare author master HEAD &&
-	compare author master^ 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 22 - am changes committer and keeps author
-
-expecting success: 
-	rm -fr .git/rebase-apply &&
-	git reset --hard &&
-	git checkout -b master2 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 'master2'
-Applying: second
-Applying: third
-ok 23 - am --signoff adds Signed-off-by: line
-
-expecting success: 
-	echo refs/heads/master2 >expected &&
-	git symbolic-ref HEAD >actual &&
-	test_cmp expected actual
-
-ok 24 - am stays in branch
-
-expecting success: 
-	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 25 - am --signoff does not add Signed-off-by: line if already there
-
-expecting success: 
-	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 26 - am --signoff adds Signed-off-by: if another author is preset
-
-expecting success: 
-	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 27 - am --signoff duplicates Signed-off-by: if it is not the last one
-
-expecting success: 
-	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 master2 >actual &&
-	test_cmp expected actual
-
-HEAD is now at b55fe7d second
-Applying: third
-ok 28 - am without --keep removes Re: and [PATCH] stuff
-
-expecting success: 
-	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: checking out '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 performing another checkout.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
-
-  git checkout -b <new-branch-name>
-
-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 29 - am --keep really keeps the subject
-
-expecting success: 
-	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 30 - am --keep-non-patch really keeps the non-patch part
-
-expecting success: 
-	rm -fr .git/rebase-apply &&
-	git reset --hard &&
-	git checkout -b base3way master2 &&
-	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 31 - setup am -3
-
-expecting success: 
-	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 32 - am -3 falls back to 3-way merge
-
-expecting success: 
-	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 33 - am -3 -p0 can read --no-prefix patch
-
-expecting success: 
-	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 34 - am with config am.threeWay falls back to 3-way merge
-
-expecting success: 
-	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' to see the failed patch
-Applying: moved stuff
-Patch failed at 0001 moved stuff
-When you have resolved this problem, run "git am --continue".
-If you prefer to skip this patch, run "git am --skip" instead.
-To restore the original branch and stop patching, run "git am --abort".
-ok 35 - am with config am.threeWay overridden by --no-3way
-
-expecting success: 
-	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: checking out '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 performing another checkout.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
-
-  git checkout -b <new-branch-name>
-
-HEAD is now at 1048ce6 added another file
-Applying: renamed a file
-ok 36 - am can rename a file
-
-expecting success: 
-	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 37 - am -3 can rename a file
-
-expecting success: 
-	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 38 - am -3 can rename a file after falling back to 3-way merge
-
-expecting success: 
-	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 39 - am -3 -q is quiet
-
-expecting success: 
-	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: checking out '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 performing another checkout.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
-
-  git checkout -b <new-branch-name>
-
-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' to see the failed patch
-Applying: moved stuff
-Patch failed at 0001 moved stuff
-When you have resolved this problem, run "git am --continue".
-If you prefer to skip this patch, run "git am --skip" instead.
-To restore the original branch and stop patching, run "git am --abort".
-ok 40 - am pauses on conflict
-
-expecting success: 
-	git am --show-current-patch >actual.patch &&
-	test_cmp .git/rebase-apply/0001 actual.patch
-
-ok 41 - am --show-current-patch
-
-expecting success: 
-	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 42 - am --skip works
-
-expecting success: 
-	mkdir .git/rebase-apply &&
-	git am --abort &&
-	test_path_is_missing .git/rebase-apply
-
-ok 43 - am --abort removes a stray directory
-
-expecting success: 
-	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' to see the failed patch
-Applying: moved stuff
-Patch failed at 0001 moved stuff
-When you have resolved this problem, run "git am --continue".
-If you prefer to skip this patch, run "git am --skip" instead.
-To restore the original branch and stop patching, run "git am --abort".
-fatal: previous rebase directory .git/rebase-apply still exists but mbox given.
-ok 44 - am refuses patches when paused
-
-expecting success: 
-	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' to see the failed patch
-Applying: moved stuff
-Patch failed at 0001 moved stuff
-When you have resolved this problem, run "git am --continue".
-If you prefer to skip this patch, run "git am --skip" instead.
-To restore the original branch and stop patching, run "git am --abort".
-Applying: moved stuff
-Applying: added another file
-ok 45 - am --resolved works
-
-expecting success: 
-	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' to see the failed patch
-Applying: moved stuff
-Patch failed at 0001 moved stuff
-When you have resolved this problem, run "git am --continue".
-If you prefer to skip this patch, run "git am --skip" instead.
-To restore the original branch and stop patching, run "git am --abort".
-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.
-When you have resolved this problem, run "git am --continue".
-If you prefer to skip this patch, run "git am --skip" instead.
-To restore the original branch and stop patching, run "git am --abort".
-ok 46 - am --resolved fails if index has no changes
-
-expecting success: 
-	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_i18ngrep "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' to see the failed patch
-Patch failed at 0001 moved stuff
-When you have resolved this problem, run "git am --continue".
-If you prefer to skip this patch, run "git am --skip" instead.
-To restore the original branch and stop patching, run "git am --abort".
-You still have unmerged paths in your index.
-ok 47 - am --resolved fails if index has unmerged entries
-
-expecting success: 
-	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 master^..HEAD
-
-HEAD is now at 88f8893 second
-Previous HEAD position was 88f8893 second
-HEAD is now at 6b2d93f first
-Applying: second
-ok 48 - am takes patches from a Pine mailbox
-
-expecting success: 
-	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
-Patch is empty.
-When you have resolved this problem, run "git am --continue".
-If you prefer to skip this patch, run "git am --skip" instead.
-To restore the original branch and stop patching, run "git am --abort".
-ok 49 - am fails on mail without patch
-
-expecting success: 
-	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: unrecognized input
-hint: Use 'git am --show-current-patch' to see the failed patch
-Applying: git-foo.sh
-Patch failed at 0001 git-foo.sh
-When you have resolved this problem, run "git am --continue".
-If you prefer to skip this patch, run "git am --skip" instead.
-To restore the original branch and stop patching, run "git am --abort".
-ok 50 - am fails on empty patch
-
-expecting success: 
-	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 51 - am works from stdin in subdirectory
-
-expecting success: 
-	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 52 - am works from file (relative path given) in subdirectory
-
-expecting success: 
-	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 53 - am works from file (absolute path given) in subdirectory
-
-expecting success: 
-	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
-
-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 54 - am --committer-date-is-author-date
-
-expecting success: 
-	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
-
-HEAD is now at 5709bd2 second
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  5709bd2 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> 5709bd2
-
-HEAD is now at 6b2d93f first
-Applying: second
---- at	2021-12-03 05:07:49.155261897 +0000
-+++ ct	2021-12-03 05:07:49.167261547 +0000
-@@ -1 +1 @@
--1112912053 -0700
-+1112912293 -0700
-ok 55 - am without --committer-date-is-author-date
-
-expecting success: 
-	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
-
-HEAD is now at 9fa39e1 second
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  9fa39e1 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> 9fa39e1
-
-HEAD is now at 6b2d93f first
-Applying: second
-1638508069 +0000
-ok 56 - am --ignore-date
-
-expecting success: 
-	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
-
-HEAD is now at 3af1832 second
-subdir/1
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4150-am/subdir/.git/
-applying to an empty history
-Applying: first
-ok 57 - am into an unborn branch
-
-expecting success: 
-	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_i18ngrep "^Applying: second \\\n foo$" output.out
-
-HEAD is now at 3af1832 second
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  3af1832 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> 3af1832
-
-HEAD is now at 6b2d93f first
-Applying: second \n foo
-ok 58 - am newline in subject
-
-expecting success: 
-	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 59 - am -q is quiet
-
-expecting success: 
-	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_i18ncmp expected actual
-
-HEAD is now at 0b3df7d second
-ok 60 - am empty-file does not infloop
-
-expecting success: 
-	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 61 - am --message-id really adds the message id
-
-expecting success: 
-	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 9b1f34c second
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  9b1f34c 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> 9b1f34c
-
-HEAD is now at 6b2d93f first
-Applying: second
-ok 62 - am.messageid really adds the message id
-
-expecting success: 
-	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 9b1f34c second
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  9b1f34c 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> 9b1f34c
-
-HEAD is now at 6b2d93f first
-Applying: second
-ok 63 - am --message-id -s signs off after the message id
-
-expecting success: 
-	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 58671be second
-[detached HEAD c69a679] one
- Author: Another Thor <a.thor@example.com>
- 1 file changed, 1 insertion(+), 2 deletions(-)
-[detached HEAD 5302f0e] two
- Author: Another Thor <a.thor@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[detached HEAD e05c5d4] three
- Author: Another Thor <a.thor@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-HEAD is now at c69a679 one
-[detached HEAD 8ec6c25] 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:
-8ec6c25 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' to see the failed patch
-Patch failed at 0001 two
-When you have resolved this problem, run "git am --continue".
-If you prefer to skip this patch, run "git am --skip" instead.
-To restore the original branch and stop patching, run "git am --abort".
-Applying: three
-Using index info to reconstruct a base tree...
-M	file
-Falling back to patching base and 3-way merge...
-Merging:
-8ec6c25 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' to see the failed patch
-Patch failed at 0002 three
-When you have resolved this problem, run "git am --continue".
-If you prefer to skip this patch, run "git am --skip" instead.
-To restore the original branch and stop patching, run "git am --abort".
-Recorded resolution for 'file'.
-Applying: three
-HEAD is now at 8ec6c25 other
-Applying: two
-Using index info to reconstruct a base tree...
-M	file
-Falling back to patching base and 3-way merge...
-Merging:
-8ec6c25 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' to see the failed patch
-Patch failed at 0001 two
-When you have resolved this problem, run "git am --continue".
-If you prefer to skip this patch, run "git am --skip" instead.
-To restore the original branch and stop patching, run "git am --abort".
-Applying: three
-Using index info to reconstruct a base tree...
-M	file
-Falling back to patching base and 3-way merge...
-Merging:
-8ec6c25 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' to see the failed patch
-Patch failed at 0002 three
-When you have resolved this problem, run "git am --continue".
-If you prefer to skip this patch, run "git am --skip" instead.
-To restore the original branch and stop patching, run "git am --abort".
-ok 64 - am -3 works with rerere
-
-expecting success: 
-	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
-	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 8ec6c25 other
-[detached HEAD aae1281] subject here
- Author: Another Thor <a.thor@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-HEAD is now at 8ec6c25 other
-Applying: subject here
-Unstaged changes after reset:
-M	file
-[detached HEAD 683db8c] subject here
- Author: Another Thor <a.thor@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-HEAD is now at 8ec6c25 other
-Applying: subject here
-ok 65 - am -s unexpected trailer block
-
-expecting success: 
-	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 format-patch --pretty=mboxrd --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:
-
-  f8e9fae 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> f8e9fae
-
-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 66 - am --patch-format=mboxrd handles mboxrd
-
-expecting success: 
-	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 67 - am works with multi-line in-body headers
-
-expecting success: 
-	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 68 - am --quit keeps HEAD where it is
-
-# passed all 68 test(s)
-1..68
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t4202-log.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4202-log/.git/
-expecting success: 
-
-	echo one >one &&
-	git add one &&
-	test_tick &&
-	git commit -m initial &&
-
-	echo ichi >one &&
-	git add one &&
-	test_tick &&
-	git commit -m second &&
-
-	git mv one ichi &&
-	test_tick &&
-	git commit -m third &&
-
-	cp ichi ein &&
-	git add ein &&
-	test_tick &&
-	git commit -m fourth &&
-
-	mkdir a &&
-	echo ni >a/two &&
-	git add a/two &&
-	test_tick &&
-	git commit -m fifth  &&
-
-	git rm a/two &&
-	test_tick &&
-	git commit -m sixth
-
-
-[master (root-commit) 3a2fdcb] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one
-[master f7dab8e] second
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[master 2fbe8c0] third
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename one => ichi (100%)
-[master 5d31159] fourth
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 ein
-[master 394ef78] fifth
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 a/two
-rm 'a/two'
-[master 804a787] sixth
- Author: A U Thor <author@example.com>
- 1 file changed, 1 deletion(-)
- delete mode 100644 a/two
-ok 1 - setup
-
-expecting success: 
-
-	git log --pretty="format:%s" > actual &&
-	test_cmp expect actual
-
-ok 2 - pretty
-
-expecting success: 
-
-	git log --pretty="tformat:%s" > actual &&
-	test_cmp expect actual
-
-ok 3 - pretty (tformat)
-
-expecting success: 
-
-	git log --pretty="%s" > actual &&
-	test_cmp expect actual
-
-ok 4 - pretty (shortcut)
-
-expecting success: 
-
-	git log --format="%s" > actual &&
-	test_cmp expect actual
-
-ok 5 - format
-
-expecting success: 
-
-	git log -2 --format="%w(11,1,2)This is the %s commit." > actual &&
-	test_cmp expect actual
-
-ok 6 - format %w(11,1,2)
-
-expecting success: 
-
-	git log -2 --format="%w(,1,2)This is%nthe %s%ncommit." > actual &&
-	test_cmp expect actual
-
-ok 7 - format %w(,1,2)
-
-expecting success: 
-
-	git log --oneline > actual &&
-	test_cmp expect actual
-
-ok 8 - oneline
-
-expecting success: 
-
-	git log --no-renames --pretty="format:%s" --diff-filter=A HEAD > actual &&
-	git log --no-renames --pretty="format:%s" --diff-filter A HEAD > actual-separate &&
-	printf "fifth\nfourth\nthird\ninitial" > expect &&
-	test_cmp expect actual &&
-	test_cmp expect actual-separate
-
-
-ok 9 - diff-filter=A
-
-expecting success: 
-
-	actual=$(git log --pretty="format:%s" --diff-filter=M HEAD) &&
-	expect=$(echo second) &&
-	verbose test "$actual" = "$expect"
-
-
-ok 10 - diff-filter=M
-
-expecting success: 
-
-	actual=$(git log --no-renames --pretty="format:%s" --diff-filter=D HEAD) &&
-	expect=$(echo sixth ; echo third) &&
-	verbose test "$actual" = "$expect"
-
-
-ok 11 - diff-filter=D
-
-expecting success: 
-
-	actual=$(git log -M --pretty="format:%s" --diff-filter=R HEAD) &&
-	expect=$(echo third) &&
-	verbose test "$actual" = "$expect"
-
-
-ok 12 - diff-filter=R
-
-expecting success: 
-
-	actual=$(git log -C -C --pretty="format:%s" --diff-filter=C HEAD) &&
-	expect=$(echo fourth) &&
-	verbose test "$actual" = "$expect"
-
-
-ok 13 - diff-filter=C
-
-expecting success: 
-
-	actual=$(git log --follow --pretty="format:%s" ichi) &&
-	expect=$(echo third ; echo second ; echo initial) &&
-	verbose test "$actual" = "$expect"
-
-ok 14 - git log --follow
-
-expecting success: 
-	test_config log.follow true &&
-	actual=$(git log --pretty="format:%s" ichi) &&
-	expect=$(echo third ; echo second ; echo initial) &&
-	verbose test "$actual" = "$expect"
-
-ok 15 - git config log.follow works like --follow
-
-expecting success: 
-	test_config log.follow true &&
-	git log --pretty="format:%s" ichi ein
-
-fourth
-thirdok 16 - git config log.follow does not die with multiple paths
-
-expecting success: 
-	test_config log.follow true &&
-	git log --
-
-commit 804a7879c6cac637c9d34d1608e3e54867d90b7e
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:18:13 2005 -0700
-
-    sixth
-
-commit 394ef780a000df496e0a8fdd648963c3f9d96f56
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:17:13 2005 -0700
-
-    fifth
-
-commit 5d311594784eefe7b43496741766fe058f1c91a1
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:16:13 2005 -0700
-
-    fourth
-
-commit 2fbe8c09c8e84c2346ba2ac744cb09a926773855
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:15:13 2005 -0700
-
-    third
-
-commit f7dab8eda217fc1e06315e7c91b6bd7c2a56363a
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:14:13 2005 -0700
-
-    second
-
-commit 3a2fdcbc365f1f169c2d433dbb277d88b412d8c9
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:13:13 2005 -0700
-
-    initial
-ok 17 - git config log.follow does not die with no paths
-
-expecting success: 
-	test_config log.follow true &&
-	actual=$(git log --no-follow --pretty="format:%s" ichi) &&
-	expect="third" &&
-	verbose test "$actual" = "$expect"
-
-ok 18 - git config log.follow is overridden by --no-follow
-
-expecting success: 
-	git log --no-walk --oneline 5d31159 804a787 394ef78 > actual &&
-	test_cmp expect actual
-
-ok 19 - git log --no-walk <commits> sorts by commit time
-
-expecting success: 
-	git log --no-walk=sorted --oneline 5d31159 804a787 394ef78 > actual &&
-	test_cmp expect actual
-
-ok 20 - git log --no-walk=sorted <commits> sorts by commit time
-
-expecting success: 
-	git log --line-prefix="=== " --no-walk --oneline 5d31159 804a787 394ef78 > actual &&
-	test_cmp expect actual
-
-ok 21 - git log --line-prefix="=== " --no-walk <commits> sorts by commit time
-
-expecting success: 
-	git log --no-walk=unsorted --oneline 5d31159 804a787 394ef78 > actual &&
-	test_cmp expect actual
-
-ok 22 - git log --no-walk=unsorted <commits> leaves list of commits as given
-
-expecting success: 
-	git show --oneline -s 5d31159 804a787 394ef78 > actual &&
-	test_cmp expect actual
-
-ok 23 - git show <commits> leaves list of commits as given
-
-expecting success: 
-	echo case >one &&
-	test_tick &&
-	git add one &&
-	git commit -a -m Second
-
-[master e9e4904] Second
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one
-ok 24 - setup case sensitivity tests
-
-expecting success: 
-	echo second >expect &&
-	git log -1 --pretty="tformat:%s" --grep=sec >actual &&
-	test_cmp expect actual
-
-ok 25 - log --grep
-
-expecting success: 
-	# Fixed
-	git -c grep.patternType=fixed log --pretty="tformat:%s" --invert-grep --grep=th --grep=Sec >actual &&
-	test_cmp expect actual &&
-
-	# POSIX basic
-	git -c grep.patternType=basic log --pretty="tformat:%s" --invert-grep --grep=t[h] --grep=S[e]c >actual &&
-	test_cmp expect actual &&
-
-	# POSIX extended
-	git -c grep.patternType=basic log --pretty="tformat:%s" --invert-grep --grep=t[h] --grep=S[e]c >actual &&
-	test_cmp expect actual &&
-
-	# PCRE
-	if test_have_prereq PCRE
-	then
-		git -c grep.patternType=perl log --pretty="tformat:%s" --invert-grep --grep=t[h] --grep=S[e]c >actual &&
-		test_cmp expect actual
-	fi
-
-ok 26 - log --invert-grep --grep
-
-expecting success: 
-	echo initial >expect &&
-
-	# Fixed
-	git -c grep.patternType=fixed log --pretty="tformat:%s" --invert-grep -i --grep=th --grep=Sec >actual &&
-	test_cmp expect actual &&
-
-	# POSIX basic
-	git -c grep.patternType=basic log --pretty="tformat:%s" --invert-grep -i --grep=t[h] --grep=S[e]c >actual &&
-	test_cmp expect actual &&
-
-	# POSIX extended
-	git -c grep.patternType=extended log --pretty="tformat:%s" --invert-grep -i --grep=t[h] --grep=S[e]c >actual &&
-	test_cmp expect actual &&
-
-	# PCRE
-	if test_have_prereq PCRE
-	then
-		git -c grep.patternType=perl log --pretty="tformat:%s" --invert-grep -i --grep=t[h] --grep=S[e]c >actual &&
-		test_cmp expect actual
-	fi
-
-ok 27 - log --invert-grep --grep -i
+ok 27 - log --invert-grep --grep -i
 
 expecting success: 
 	echo second >expect &&
@@ -138177,1333 +136152,530 @@
 1..84
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t5301-sliding-window.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5301-sliding-window/.git/
-expecting success: 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: git verify-pack -v "$pack1"
-5e6d8173c39380e507623d03a77e07cdd050837c commit 163 124 12
-d67b2ae81f0bd18212d239b6a965711041f73739 blob   32770 32789 136
-7c0c57f15aee3c4cbe243c44d3c01ecfa949bb25 blob   32770 32789 32925
-f76f6b9f6aed8209a40d300bf7dcb4fcf9863531 blob   32772 32791 65714
-556c804eac998cc8fa89f225a29870c3d873477b blob   10 22 98505 1 f76f6b9f6aed8209a40d300bf7dcb4fcf9863531
-b7fabea4d93049ea90d45d8252b9a4f8ee7c9c2c tree   116 115 98527
-non delta: 5 objects
-chain length = 1: 1 object
-.git/objects/pack/pack-f1238cb69a8ea03e35fccfc5e16456d9d2a9138d.pack: ok
-ok 2 - verify-pack -v, defaults
-
-expecting success: git config core.packedGitWindowSize 512 &&
-     git verify-pack -v "$pack1"
-5e6d8173c39380e507623d03a77e07cdd050837c commit 163 124 12
-d67b2ae81f0bd18212d239b6a965711041f73739 blob   32770 32789 136
-7c0c57f15aee3c4cbe243c44d3c01ecfa949bb25 blob   32770 32789 32925
-f76f6b9f6aed8209a40d300bf7dcb4fcf9863531 blob   32772 32791 65714
-556c804eac998cc8fa89f225a29870c3d873477b blob   10 22 98505 1 f76f6b9f6aed8209a40d300bf7dcb4fcf9863531
-b7fabea4d93049ea90d45d8252b9a4f8ee7c9c2c tree   116 115 98527
-non delta: 5 objects
-chain length = 1: 1 object
-.git/objects/pack/pack-f1238cb69a8ea03e35fccfc5e16456d9d2a9138d.pack: ok
-ok 3 - verify-pack -v, packedGitWindowSize == 1 page
-
-expecting success: git config core.packedGitWindowSize 512 &&
-     git config core.packedGitLimit 512 &&
-     git verify-pack -v "$pack1"
-5e6d8173c39380e507623d03a77e07cdd050837c commit 163 124 12
-d67b2ae81f0bd18212d239b6a965711041f73739 blob   32770 32789 136
-7c0c57f15aee3c4cbe243c44d3c01ecfa949bb25 blob   32770 32789 32925
-f76f6b9f6aed8209a40d300bf7dcb4fcf9863531 blob   32772 32791 65714
-556c804eac998cc8fa89f225a29870c3d873477b blob   10 22 98505 1 f76f6b9f6aed8209a40d300bf7dcb4fcf9863531
-b7fabea4d93049ea90d45d8252b9a4f8ee7c9c2c tree   116 115 98527
-non delta: 5 objects
-chain length = 1: 1 object
-.git/objects/pack/pack-f1238cb69a8ea03e35fccfc5e16456d9d2a9138d.pack: ok
-ok 4 - verify-pack -v, packedGit{WindowSize,Limit} == 1 page
-
-expecting success: 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: git config --unset core.packedGitWindowSize &&
-     git config --unset core.packedGitLimit &&
-     git verify-pack -v "$pack2"
-69ed524d4e970bb36b4921363d15bb44c0fc39ad commit 211 152 12
-5e6d8173c39380e507623d03a77e07cdd050837c commit 9 20 164 1 69ed524d4e970bb36b4921363d15bb44c0fc39ad
-d67b2ae81f0bd18212d239b6a965711041f73739 blob   32770 32789 184
-7c0c57f15aee3c4cbe243c44d3c01ecfa949bb25 blob   32770 32789 32973
-f76f6b9f6aed8209a40d300bf7dcb4fcf9863531 blob   32772 32791 65762
-556c804eac998cc8fa89f225a29870c3d873477b blob   10 22 98553 1 f76f6b9f6aed8209a40d300bf7dcb4fcf9863531
-b7fabea4d93049ea90d45d8252b9a4f8ee7c9c2c tree   116 115 98575
-non delta: 5 objects
-chain length = 1: 2 objects
-.git/objects/pack/pack-43b034acc5388cb1516e5844fc39bbc510518219.pack: ok
-ok 6 - verify-pack -v, defaults
-
-# passed all 6 test(s)
-1..6
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t5003-archive-zip.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5003-archive-zip/.git/
-expecting success: 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; done &&
-      echo text >file_with_long_path)
-
-ok 1 - populate workdir
-
-checking prerequisite: SYMLINKS
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
-	# 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" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
-	(
-		mkdir unzip-symlinks &&
-		cd unzip-symlinks &&
-		"$GIT_UNZIP" "$TEST_DIRECTORY"/t5003/infozip-symlinks.zip &&
-		test -h symlink
-	)
-
-)
-Archive:  /build/git-2.20.1/t/t5003/infozip-symlinks.zip
- extracting: textfile                
-    linking: symlink                 -> textfile 
-finishing deferred symbolic links:
-  symlink                -> textfile
-prerequisite UNZIP_SYMLINKS ok
-expecting success: 
-	ln -s a a/symlink_to_a
-
-ok 2 - add symlink
-
-expecting success: 
-	(cd a && find .) | sort >a.lst
-
-ok 3 - prepare file list
-
-expecting success: echo ignore me >a/ignored &&
-     echo ignored export-ignore >.git/info/attributes
-ok 4 - add ignored file
-
+*** t4300-merge-tree.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4300-merge-tree/.git/
 expecting success: 
-	git add a &&
-	GIT_COMMITTER_DATE="2005-05-27 22:00" git commit -m initial
+	test_commit "initial" "initial-file" "initial"
 
-[master (root-commit) 987ca5b] initial
+[master (root-commit) c1d16d8] 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: 
-	echo "a/nodiff.* -diff" >>.git/info/attributes &&
-	echo "a/diff.* diff" >>.git/info/attributes &&
-	echo "a/custom.* diff=custom" >>.git/info/attributes &&
-	git config diff.custom.binary true &&
-	echo "substfile?" export-subst >>.git/info/attributes &&
-	git log --max-count=1 "--pretty=format:A${SUBSTFORMAT}O" HEAD \
-		>a/substfile1
-
-ok 6 - setup export-subst and diff attributes
-
-expecting success: 
-	git clone --bare . bare.git &&
-	cp .git/info/attributes bare.git/info/attributes &&
-	# Recreate our changes to .git/config rather than just copying it, as
-	# we do not want to clobber core.bare or other settings.
-	git -C bare.git config diff.custom.binary true
-
-Cloning into bare repository 'bare.git'...
-done.
-ok 7 - create bare clone
-
-expecting success: rm a/ignored
-ok 8 - remove ignored file
-
-expecting success: git archive --format=zip HEAD >d.zip
-ok 9 - git archive --format=zip
-
-checking prerequisite: UNZIP
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
-	"$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 8.3.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.6, 6-Sept-2010)
-        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: 
-		(mkdir $dir && cd $dir && "$GIT_UNZIP" ../$zipfile)
-	
-Archive:  ../d.zip
-987ca5b738cf49cd6468de7473e2ed5b24aba2a6
-   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: 
-		(cd d/a && find .) | sort >d.lst &&
-		test_cmp a.lst d.lst
-	
-ok 11 -  validate filenames
-
-expecting success: 
-		diff -r a d/a
-	
-ok 12 -  validate file contents
-
-expecting success: 
-		(mkdir $dir && cd $dir && "$GIT_UNZIP" -a ../$zipfile)
-	
-Archive:  ../d.zip
-987ca5b738cf49cd6468de7473e2ed5b24aba2a6
-   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: 
-		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: 
-		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: 
-		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: 
-		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: 
-		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: (cd bare.git && git archive --format=zip HEAD) >d1.zip
-ok 19 - git archive --format=zip in a bare repo
-
-expecting success: test_cmp_bin d.zip d1.zip
-ok 20 - git archive --format=zip vs. the same in a bare repo
-
-expecting success: 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: 
-	git archive --output=d3.zip HEAD &&
-	test_cmp_bin d.zip d3.zip
-
-ok 22 - git archive with --output, inferring format (local)
-
-expecting success: 
-	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: git archive --format=zip --prefix=prefix/ HEAD >e.zip
-ok 24 - git archive --format=zip with prefix
-
-expecting success: 
-		(mkdir $dir && cd $dir && "$GIT_UNZIP" ../$zipfile)
-	
-Archive:  ../e.zip
-987ca5b738cf49cd6468de7473e2ed5b24aba2a6
-   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: 
-		(cd e/prefix/a && find .) | sort >e.lst &&
-		test_cmp a.lst e.lst
-	
-ok 26 -  validate filenames
-
-expecting success: 
-		diff -r a e/prefix/a
-	
-ok 27 -  validate file contents
-
-expecting success: 
-		(mkdir $dir && cd $dir && "$GIT_UNZIP" -a ../$zipfile)
-	
-Archive:  ../e.zip
-987ca5b738cf49cd6468de7473e2ed5b24aba2a6
-   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: 
-		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: 
-		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: 
-		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: 
-		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: 
-		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: 
-	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: 
-		(mkdir $dir && cd $dir && "$GIT_UNZIP" ../$zipfile)
-	
-Archive:  ../large.zip
-987ca5b738cf49cd6468de7473e2ed5b24aba2a6
-   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: 
-		(cd large/a && find .) | sort >large.lst &&
-		test_cmp a.lst large.lst
-	
-ok 36 -  validate filenames
-
-expecting success: 
-		diff -r a large/a
-	
-ok 37 -  validate file contents
-
-expecting success: 
-		(mkdir $dir && cd $dir && "$GIT_UNZIP" -a ../$zipfile)
-	
-Archive:  ../large.zip
-987ca5b738cf49cd6468de7473e2ed5b24aba2a6
-   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: 
-		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: 
-		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: 
-		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: 
-		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: 
-		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: 
-	test_config core.bigfilethreshold 1 &&
-	git archive --format=zip HEAD >large-compressed.zip
-
-ok 44 - git archive --format=zip on large files
-
-expecting success: 
-		(mkdir $dir && cd $dir && "$GIT_UNZIP" ../$zipfile)
-	
-Archive:  ../large-compressed.zip
-987ca5b738cf49cd6468de7473e2ed5b24aba2a6
-   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: 
-		(cd large-compressed/a && find .) | sort >large-compressed.lst &&
-		test_cmp a.lst large-compressed.lst
-	
-ok 46 -  validate filenames
-
-expecting success: 
-		diff -r a large-compressed/a
-	
-ok 47 -  validate file contents
-
-expecting success: 
-		(mkdir $dir && cd $dir && "$GIT_UNZIP" -a ../$zipfile)
-	
-Archive:  ../large-compressed.zip
-987ca5b738cf49cd6468de7473e2ed5b24aba2a6
-   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: 
-		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: 
-		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: 
-		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: 
-		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
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial-file
+ok 1 - setup
 
 expecting success: 
-		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 
-
-# passed all 53 test(s)
-1..53
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t5000-tar-tree.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5000-tar-tree/.git/
-expecting success: mkdir a &&
-     echo simple textfile >a/a &&
-     ten=0123456789 && hundred=$ten$ten$ten$ten$ten$ten$ten$ten$ten$ten &&
-     echo long filename >a/four$hundred &&
-     mkdir a/bin &&
-     test-tool genrandom "frotz" 500000 >a/bin/sh &&
-     printf "A\$Format:%s\$O" "$SUBSTFORMAT" >a/substfile1 &&
-     printf "A not substituted O" >a/substfile2 &&
-     if test_have_prereq SYMLINKS; then
-	ln -s a a/l1
-     else
-	printf %s a > a/l1
-     fi &&
-     (p=long_path_to_a_file && cd a &&
-      for depth in 1 2 3 4 5; do mkdir $p && cd $p; done &&
-      echo text >file_with_long_path) &&
-     (cd a && find .) | sort >a.lst
-checking prerequisite: SYMLINKS
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
-	# test whether the filesystem supports symbolic links
-	ln -s x y && test -h y
-
-)
-prerequisite SYMLINKS ok
-ok 1 - populate workdir
-
-expecting success: echo ignore me >a/ignored &&
-     echo ignored export-ignore >.git/info/attributes
-ok 2 - add ignored file
+	cat >expected <<\EXPECTED &&
+added in remote
+  their  100644 43d5a8ed6ef6c00ff775008633f95787d088285d ONE
+@@ -0,0 +1 @@
++AAA
+EXPECTED
 
-expecting success: 
-	git add a &&
-	GIT_COMMITTER_DATE="2005-05-27 22:00" git commit -m initial
+	git reset --hard initial &&
+	test_commit "add-a-not-b" "ONE" "AAA" &&
+	git merge-tree initial initial add-a-not-b >actual &&
+	test_cmp expected actual
 
-[master (root-commit) 6c89890] initial
+HEAD is now at c1d16d8 initial
+[master e55b628] add-a-not-b
  Author: A U Thor <author@example.com>
- 8 files changed, 7 insertions(+)
- create mode 100644 a/a
- create mode 100644 a/bin/sh
- create mode 100644 a/four0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789
- create mode 100644 a/ignored
- create mode 120000 a/l1
- create mode 100644 a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/file_with_long_path
- create mode 100644 a/substfile1
- create mode 100644 a/substfile2
-ok 3 - add files to repository
-
-expecting success: 
-	echo "substfile?" export-subst >>.git/info/attributes &&
-	git log --max-count=1 "--pretty=format:A${SUBSTFORMAT}O" HEAD \
-		>a/substfile1
-
-ok 4 - setup export-subst
-
-expecting success: git clone --bare . bare.git &&
-     cp .git/info/attributes bare.git/info/attributes
-Cloning into bare repository 'bare.git'...
-done.
-ok 5 - create bare clone
-
-expecting success: rm a/ignored
-ok 6 - remove ignored file
-
-expecting success: git archive HEAD >b.tar
-ok 7 - git archive
-
-expecting success: 
-		(mkdir $dir && cd $dir && "$TAR" xf -) <$tarfile
-	
-ok 8 -  extract tar archive
-
-checking prerequisite: TAR_NEEDS_PAX_FALLBACK
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
-	(
-		mkdir pax &&
-		cd pax &&
-		"$TAR" xf "$TEST_DIRECTORY"/t5000/pax.tar &&
-		test -f PaxHeaders.1791/file
-	)
-
-)
-prerequisite TAR_NEEDS_PAX_FALLBACK not satisfied
-skipping test:  interpret pax headers 
-		(
-			cd $dir &&
-			for header in *.paxheader
-			do
-				data=${header%.paxheader}.data &&
-				if test -h $data || test -e $data
-				then
-					path=$(get_pax_header $header path) &&
-					if test -n "$path"
-					then
-						mv "$data" "$path"
-					fi
-				fi
-			done
-		)
-	
-ok 9 # skip  interpret pax headers (missing TAR_NEEDS_PAX_FALLBACK)
+ 1 file changed, 1 insertion(+)
+ create mode 100644 ONE
+ok 2 - file add A, !B
 
 expecting success: 
-		(cd ${dir_with_prefix}a && find .) | sort >$listfile &&
-		test_cmp a.lst $listfile
-	
-ok 10 -  validate filenames
+	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
 
-expecting success: 
-		diff -r a ${dir_with_prefix}a
-	
-ok 11 -  validate file contents
+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: 
-	git archive --prefix=prefix/ HEAD >with_prefix.tar
+	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
 
-ok 12 - git archive --prefix=prefix/
+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: 
-		(mkdir $dir && cd $dir && "$TAR" xf -) <$tarfile
-	
-ok 13 -  extract tar archive
-
-skipping test:  interpret pax headers 
-		(
-			cd $dir &&
-			for header in *.paxheader
-			do
-				data=${header%.paxheader}.data &&
-				if test -h $data || test -e $data
-				then
-					path=$(get_pax_header $header path) &&
-					if test -n "$path"
-					then
-						mv "$data" "$path"
-					fi
-				fi
-			done
-		)
-	
-ok 14 # skip  interpret pax headers (missing TAR_NEEDS_PAX_FALLBACK)
+	cat >expected <<\EXPECTED &&
+added in both
+  our    100644 43d5a8ed6ef6c00ff775008633f95787d088285d ONE
+  their  100644 ba629238ca89489f2b350e196ca445e09d8bb834 ONE
+@@ -1 +1,5 @@
++<<<<<<< .our
+ AAA
++=======
++BBB
++>>>>>>> .their
+EXPECTED
 
-expecting success: 
-		(cd ${dir_with_prefix}a && find .) | sort >$listfile &&
-		test_cmp a.lst $listfile
-	
-ok 15 -  validate filenames
+	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 &&
+	test_cmp expected actual
 
-expecting success: 
-		diff -r a ${dir_with_prefix}a
-	
-ok 16 -  validate file contents
+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: 
-	git archive --prefix=olde- HEAD >with_olde-prefix.tar
+	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
 
-ok 17 - git-archive --prefix=olde-
+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: 
-		(mkdir $dir && cd $dir && "$TAR" xf -) <$tarfile
-	
-ok 18 -  extract tar archive
-
-skipping test:  interpret pax headers 
-		(
-			cd $dir &&
-			for header in *.paxheader
-			do
-				data=${header%.paxheader}.data &&
-				if test -h $data || test -e $data
-				then
-					path=$(get_pax_header $header path) &&
-					if test -n "$path"
-					then
-						mv "$data" "$path"
-					fi
-				fi
-			done
-		)
-	
-ok 19 # skip  interpret pax headers (missing TAR_NEEDS_PAX_FALLBACK)
+	cat >expected <<\EXPECTED &&
+merged
+  result 100644 ba629238ca89489f2b350e196ca445e09d8bb834 initial-file
+  our    100644 e79c5e8f964493290a409888d5413a737e8e5dd5 initial-file
+@@ -1 +1 @@
+-initial
++BBB
+EXPECTED
 
-expecting success: 
-		(cd ${dir_with_prefix}a && find .) | sort >$listfile &&
-		test_cmp a.lst $listfile
-	
-ok 20 -  validate filenames
+	git reset --hard initial &&
+	test_commit "change-not-a-b" "initial-file" "BBB" &&
+	git merge-tree initial initial change-not-a-b >actual &&
+	test_cmp expected actual
 
-expecting success: 
-		diff -r a ${dir_with_prefix}a
-	
-ok 21 -  validate file contents
+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: 
-    test_config core.bigfilethreshold 1 &&
-    git archive HEAD >b3.tar &&
-    test_cmp_bin b.tar b3.tar
-
-ok 22 - git archive on large files
-
-expecting success: (cd bare.git && git archive HEAD) >b3.tar
-ok 23 - git archive in a bare repo
-
-expecting success: test_cmp_bin b.tar b3.tar
-ok 24 - git archive vs. the same in a bare repo
-
-expecting success: git archive --output=b4.tar HEAD &&
-    test_cmp_bin b.tar b4.tar
-ok 25 - git archive with --output
+	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
 
-expecting success: git archive --remote=. HEAD >b5.tar &&
-    test_cmp_bin b.tar b5.tar
-ok 26 - git archive --remote
+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 8 - file change A, B (same)
 
 expecting success: 
-	git config remote.foo.url . &&
-	(
-		cd a &&
-		git archive --remote=foo --output=../b5-nick.tar HEAD
-	) &&
-	test_cmp_bin b.tar b5-nick.tar
-
-ok 27 - git archive --remote with configured remote
+	cat >expected <<\EXPECTED &&
+changed in both
+  base   100644 e79c5e8f964493290a409888d5413a737e8e5dd5 initial-file
+  our    100644 43d5a8ed6ef6c00ff775008633f95787d088285d initial-file
+  their  100644 ba629238ca89489f2b350e196ca445e09d8bb834 initial-file
+@@ -1 +1,5 @@
++<<<<<<< .our
+ AAA
++=======
++BBB
++>>>>>>> .their
+EXPECTED
 
-expecting success: mkdir extract &&
-     "$TAR" xf b.tar -C extract a/a &&
-     test-tool chmtime --get extract/a/a >b.mtime &&
-     echo "1117231200" >expected.mtime &&
-     test_cmp expected.mtime b.mtime
-ok 28 - validate file modification time
+	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 &&
+	test_cmp expected actual
 
-expecting success: git get-tar-commit-id <b.tar >b.commitid &&
-     test_cmp .git/$(git symbolic-ref HEAD) b.commitid
-ok 29 - git get-tar-commit-id
+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 9 - file change A, B (different)
 
 expecting success: 
-	git archive --format=tar --output=d4.zip HEAD &&
-	test_cmp_bin b.tar d4.zip
-
-ok 30 - git archive with --output, override inferred format
-
-checking prerequisite: GZIP
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir" &&gzip --version
-)
-gzip 1.9
-Copyright (C) 2017 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.
+	cat >expected <<\EXPECTED &&
+changed in both
+  base   100644 f4f1f998c7776568c4ff38f516d77fef9399b5a7 ONE
+  our    100644 af14c2c3475337c73759d561ef70b59e5c731176 ONE
+  their  100644 372d761493f524d44d59bd24700c3bdf914c973c ONE
+@@ -7,7 +7,11 @@
+ AAA
+ AAA
+ AAA
++<<<<<<< .our
+ BBB
++=======
++CCC
++>>>>>>> .their
+ AAA
+ AAA
+ AAA
+EXPECTED
 
-Written by Jean-loup Gailly.
-prerequisite GZIP ok
-expecting success: 
-	git archive --output=d5.tgz --remote=. HEAD &&
-	gzip -d -c <d5.tgz >d5.tar &&
-	test_cmp_bin b.tar d5.tar
+	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 &&
+	test_cmp expected actual
 
-ok 31 - git archive with --output and --remote creates .tgz
+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 10 - file change A, B (mixed)
 
 expecting success: 
-	nongit git archive --list
+	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
 
-tar
-tgz
-tar.gz
-zip
-ok 32 - git archive --list outside of a git repo
+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 11 - file remove A, !B
 
 expecting success: 
-	git archive HEAD >expect.tar &&
-	nongit git archive --remote="$PWD" HEAD >actual.tar &&
-	test_cmp_bin expect.tar actual.tar
-
-ok 33 - git archive --remote outside of a git repo
+	cat >expected <<\EXPECTED &&
+removed in remote
+  base   100644 43d5a8ed6ef6c00ff775008633f95787d088285d ONE
+  our    100644 43d5a8ed6ef6c00ff775008633f95787d088285d ONE
+@@ -1 +0,0 @@
+-AAA
+EXPECTED
 
-expecting success: 
-	test_commit unreachable &&
-	sha1=$(git rev-parse HEAD) &&
-	git reset --hard HEAD^ &&
-	git archive $sha1 >remote.tar &&
-	test_must_fail git archive --remote=. $sha1 >remote.tar
+	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 &&
+	test_cmp expected actual
 
-[master 9665edc] unreachable
+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 unreachable.t
-HEAD is now at 6c89890 initial
-fatal: sent error to the client: git upload-archive: archiver died with error
-remote: fatal: no such ref: 9665edc1c895cecf75f02b23131f37f7c3b8f29f        
-remote: git upload-archive: archiver died with error
-ok 34 - clients cannot access unreachable commits
+ 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 12 - file remove !A, B
 
 expecting success: 
-	test_commit unreachable1 &&
-	sha1=$(git rev-parse HEAD) &&
-	git reset --hard HEAD^ &&
-	git archive $sha1 >remote.tar &&
-	test_config uploadarchive.allowUnreachable true &&
-	git archive --remote=. $sha1 >remote.tar
+	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
 
-[master 3eb539b] unreachable1
+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 unreachable1.t
-HEAD is now at 6c89890 initial
-ok 35 - upload-archive can allow unreachable commits
-
-expecting success: 
-	git config tar.tar.foo.command "tr ab ba" &&
-	git config tar.bar.command "tr ab ba" &&
-	git config tar.bar.remote true &&
-	git config tar.invalid baz
-
-ok 36 - setup tar filters
-
-expecting success: 
-	git archive --list >output &&
-	grep "^tar\.foo\$" output &&
-	grep "^bar\$" output
-
-tar.foo
-bar
-ok 37 - archive --list mentions user filter
-
-expecting success: 
-	git archive --list --remote=. >output &&
-	! grep "^tar\.foo\$" output &&
-	grep "^bar\$" output
-
-bar
-ok 38 - archive --list shows only enabled remote filters
-
-expecting success: 
-	git archive --format=tar.foo HEAD >config.tar.foo &&
-	tr ab ba <config.tar.foo >config.tar &&
-	test_cmp_bin b.tar config.tar &&
-	git archive --format=bar HEAD >config.bar &&
-	tr ab ba <config.bar >config.tar &&
-	test_cmp_bin b.tar config.tar
-
-ok 39 - invoke tar filter by format
-
-expecting success: 
-	git archive -o config-implicit.tar.foo HEAD &&
-	test_cmp_bin config.tar.foo config-implicit.tar.foo &&
-	git archive -o config-implicit.bar HEAD &&
-	test_cmp_bin config.tar.foo config-implicit.bar
-
-ok 40 - invoke tar filter by extension
-
-expecting success: 
-	git archive -o config-implicit.baz HEAD &&
-	test_cmp_bin b.tar config-implicit.baz
-
-ok 41 - default output format remains tar
-
-expecting success: 
-	git archive -o config-implicittar.foo HEAD &&
-	test_cmp_bin b.tar config-implicittar.foo
-
-ok 42 - extension matching requires dot
-
-expecting success: 
-	test_must_fail git archive --remote=. --format=tar.foo HEAD \
-		>remote.tar.foo &&
-	git archive --remote=. --format=bar >remote.bar HEAD &&
-	test_cmp_bin remote.bar config.bar
-
-fatal: sent error to the client: git upload-archive: archiver died with error
-remote: fatal: Unknown archive format 'tar.foo'        
-remote: git upload-archive: archiver died with error
-ok 43 - only enabled filters are available remotely
-
-expecting success: 
-	git archive --format=tgz HEAD >j.tgz
-
-ok 44 - git archive --format=tgz
-
-expecting success: 
-	git archive --format=tar.gz HEAD >j1.tar.gz &&
-	test_cmp_bin j.tgz j1.tar.gz
-
-ok 45 - git archive --format=tar.gz
+ 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 13 - file remove A, B (same)
 
 expecting success: 
-	git archive --output=j2.tgz HEAD &&
-	test_cmp_bin j.tgz j2.tgz
-
-ok 46 - infer tgz from .tgz filename
+	cat >expected <<\EXPECTED &&
+removed in remote
+  base   100644 43d5a8ed6ef6c00ff775008633f95787d088285d ONE
+  our    100644 ba629238ca89489f2b350e196ca445e09d8bb834 ONE
+@@ -1 +0,0 @@
+-BBB
+EXPECTED
 
-expecting success: 
-	git archive --output=j3.tar.gz HEAD &&
-	test_cmp_bin j.tgz j3.tar.gz
+	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 &&
+	test_cmp expected actual
 
-ok 47 - infer tgz from .tar.gz filename
+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 14 - file change A, remove B
 
 expecting success: 
-	gzip -d -c <j.tgz >j.tar &&
-	test_cmp_bin b.tar j.tar
+	cat >expected <<\EXPECTED &&
+removed in local
+  base   100644 43d5a8ed6ef6c00ff775008633f95787d088285d ONE
+  their  100644 ba629238ca89489f2b350e196ca445e09d8bb834 ONE
+EXPECTED
 
-ok 48 - extract tgz file
+	git reset --hard initial &&
+	test_commit "rm-a-change-b-base" "ONE" "AAA" &&
 
-expecting success: 
-	git archive --remote=. --format=tar.gz HEAD >remote.tar.gz &&
-	test_cmp_bin j.tgz remote.tar.gz
+	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 &&
+	test_cmp expected actual
 
-ok 49 - remote tar.gz is allowed by default
+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 15 - file remove A, change B
 
 expecting success: 
-	git config tar.tar.gz.remote false &&
-	test_must_fail git archive --remote=. --format=tar.gz HEAD \
-		>remote.tar.gz
+	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
 
-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 50 - remote tar.gz can be disabled
+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 16 - tree add A, B (same)
 
 expecting success: 
-	git archive -v HEAD -- ":(glob)**/sh" >/dev/null 2>actual &&
-	cat >expect <<EOF &&
-a/
-a/bin/
-a/bin/sh
-EOF
+	cat >expect <<-\EOF &&
+	added in both
+	  our    100644 43d5a8ed6ef6c00ff775008633f95787d088285d sub/file
+	  their  100644 ba629238ca89489f2b350e196ca445e09d8bb834 sub/file
+	@@ -1 +1,5 @@
+	+<<<<<<< .our
+	 AAA
+	+=======
+	+BBB
+	+>>>>>>> .their
+	EOF
+	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 &&
 	test_cmp expect actual
 
-ok 51 - archive and :(glob)
-
-expecting success: 
-	test_must_fail git archive -v HEAD -- "*.abc" >/dev/null
-
-fatal: pathspec '*.abc' did not match any files
-ok 52 - catch non-matching pathspec
-
-checking prerequisite: LONG_IS_64BIT
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
-	test 8 -le "$(build_option sizeof-long)"
-
-)
-prerequisite LONG_IS_64BIT ok
-expecting success: 
-	obj_d=19 &&
-	obj_f=f9c8273ec45a8938e6999cb59b3ff66739902a &&
-	obj=${obj_d}${obj_f} &&
-	mkdir -p .git/objects/$obj_d &&
-	cp "$TEST_DIRECTORY"/t5000/$obj .git/objects/$obj_d/$obj_f &&
-	rm -f .git/index &&
-	git update-index --add --cacheinfo 100644,$obj,huge &&
-	git commit -m huge
-
-[master f6ab230] huge
+HEAD is now at c1d16d8 initial
+[master 278e538] add sub/file
  Author: A U Thor <author@example.com>
- 9 files changed, 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 huge
-ok 53 - set up repository with huge blob
-
-expecting success: 
-	{
-		git archive HEAD
-		echo $? >exit-code
-	} | test_copy_bytes 4096 >huge.tar &&
-	echo 141 >expect &&
-	test_cmp expect exit-code
-
-ok 54 - generate tar with huge size
-
-checking prerequisite: TAR_HUGE
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
-	echo "68719476737 4147" >expect &&
-	tar_info "$TEST_DIRECTORY"/t5000/huge-and-future.tar >actual &&
-	test_cmp expect actual
+ 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 17 - tree add A, B (different)
 
-)
-tar: rmtlseek not stopped at a record boundary
-tar: Error is not recoverable: exiting now
-prerequisite TAR_HUGE ok
 expecting success: 
-	echo 68719476737 >expect &&
-	tar_info huge.tar | cut -d" " -f1 >actual &&
+	cat >expect <<-\EOF &&
+	removed in remote
+	  base   100644 43d5a8ed6ef6c00ff775008633f95787d088285d sub/file
+	  our    100644 43d5a8ed6ef6c00ff775008633f95787d088285d sub/file
+	@@ -1 +0,0 @@
+	-AAA
+	EOF
+	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 &&
 	test_cmp expect actual
 
-tar: rmtlseek not stopped at a record boundary
-tar: Error is not recoverable: exiting now
-ok 55 - system tar can read our huge size
-
-checking prerequisite: TIME_IS_64BIT
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir" &&test-tool date is64bit
-)
-prerequisite TIME_IS_64BIT ok
-expecting success: 
-	rm -f .git/index &&
-	echo content >file &&
-	git add file &&
-	GIT_COMMITTER_DATE="@68719476737 +0000" \
-		git commit -m "tempori parendum"
-
-[master bea82ec] tempori parendum
+HEAD is now at c1d16d8 initial
+[master 06f44d6] add sub/file
  Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+)
- create mode 100644 file
- delete mode 100644 huge
-ok 56 - set up repository with far-future commit
+ 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 18 - tree unchanged A, removed B
 
 expecting success: 
-	git archive HEAD >future.tar
-
-ok 57 - generate tar with future mtime
+	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 43aa4fdec31eb92e1fdc2f0ce6ea9ddb7c32bcf7 initial-file/ONE
+	@@ -0,0 +1 @@
+	+CCC
+	removed in remote
+	  base   100644 e79c5e8f964493290a409888d5413a737e8e5dd5 initial-file
+	  our    100644 e79c5e8f964493290a409888d5413a737e8e5dd5 initial-file
+	@@ -1 +0,0 @@
+	-initial
+	EOF
+	test_cmp expect actual
 
-checking prerequisite: TIME_T_IS_64BIT
+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 19 - turn file to tree
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir" &&test-tool date time_t-is64bit
-)
-prerequisite TIME_T_IS_64BIT ok
 expecting success: 
-	echo 4147 >expect &&
-	tar_info future.tar | cut -d" " -f2 >actual &&
+	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 43d5a8ed6ef6c00ff775008633f95787d088285d dir/path
+	  our    100644 43d5a8ed6ef6c00ff775008633f95787d088285d dir/path
+	@@ -1 +0,0 @@
+	-AAA
+	added in remote
+	  their  100644 43aa4fdec31eb92e1fdc2f0ce6ea9ddb7c32bcf7 dir
+	@@ -0,0 +1 @@
+	+CCC
+	EOF
 	test_cmp expect actual
 
-ok 58 - system tar can read our future mtime
+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 20 - turn tree to file
 
-# passed all 58 test(s)
-1..58
+# passed all 20 test(s)
+1..20
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
 *** t5100-mailinfo.sh ***
@@ -140168,12 +137340,401 @@
 1..47
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
+*** t5150-request-pull.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5150-request-pull/.git/
+expecting success: 
+
+	git init --bare upstream.git &&
+	git init --bare downstream.git &&
+	git clone upstream.git upstream-private &&
+	git clone downstream.git local &&
+
+	trash_url="file://$TRASH_DIRECTORY" &&
+	downstream_url="$trash_url/downstream.git/" &&
+	upstream_url="$trash_url/upstream.git/" &&
+
+	(
+		cd upstream-private &&
+		cat <<-\EOT >mnemonic.txt &&
+		Thirtey days hath November,
+		Aprile, June, and September:
+		EOT
+		git add mnemonic.txt &&
+		test_tick &&
+		git commit -m "\"Thirty days\", a reminder of month lengths" &&
+		git tag -m "version 1" -a initial &&
+		git push --tags origin master
+	) &&
+	(
+		cd local &&
+		git remote add upstream "$trash_url/upstream.git" &&
+		git fetch upstream &&
+		git pull upstream master &&
+		cat <<-\EOT >>mnemonic.txt &&
+		Of twyecescore-eightt is but eine,
+		And all the remnante be thrycescore-eine.
+		O’course Leap yare comes an’pynes,
+		Ev’rie foure yares, gote it ryghth.
+		An’twyecescore-eight is but twyecescore-nyne.
+		EOT
+		git add mnemonic.txt &&
+		test_tick &&
+		git commit -m "More detail" &&
+		git tag -m "version 2" -a full &&
+		git checkout -b simplify HEAD^ &&
+		mv mnemonic.txt mnemonic.standard &&
+		cat <<-\EOT >mnemonic.clarified &&
+		Thirty days has September,
+		All the rest I can’t remember.
+		EOT
+		git add -N mnemonic.standard mnemonic.clarified &&
+		git commit -a -m "Adapt to use modern, simpler English
+
+But keep the old version, too, in case some people prefer it." &&
+		git checkout master
+	)
+
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5150-request-pull/upstream.git/
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5150-request-pull/downstream.git/
+Cloning into 'upstream-private'...
+warning: You appear to have cloned an empty repository.
+done.
+Cloning into 'local'...
+warning: You appear to have cloned an empty repository.
+done.
+[master (root-commit) 7244768] "Thirty days", a reminder of month lengths
+ Author: A U Thor <author@example.com>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 mnemonic.txt
+To /build/git-2.20.1/t/trash directory.t5150-request-pull/upstream.git
+ * [new branch]      master -> master
+ * [new tag]         initial -> initial
+From file:///build/git-2.20.1/t/trash directory.t5150-request-pull/upstream
+ * [new branch]      master     -> upstream/master
+ * [new tag]         initial    -> initial
+From file:///build/git-2.20.1/t/trash directory.t5150-request-pull/upstream
+ * branch            master     -> FETCH_HEAD
+[master cc0f4ce] More detail
+ Author: A U Thor <author@example.com>
+ 1 file changed, 5 insertions(+)
+Switched to a new branch 'simplify'
+[simplify 6fa5b4f] Adapt to use modern, simpler English
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 mnemonic.clarified
+ rename mnemonic.txt => mnemonic.standard (100%)
+Switched to branch 'master'
+Your branch is based on 'origin/master', but the upstream is gone.
+  (use "git branch --unset-upstream" to fixup)
+ok 1 - setup
+
+expecting success: 
+
+	downstream_url_for_sed=$(
+		printf "%s\n" "$downstream_url" |
+		sed -e 's/\\/\\\\/g' -e 's/[[/.*^$]/\\&/g'
+	) &&
+
+	cat <<-\EOT >read-request.sed &&
+	#!/bin/sed -nf
+	# Note that a request could ask for "tag $tagname"
+	/ in the Git repository at:$/!d
+	n
+	/^$/ n
+	s/ tag \([^ ]*\)$/ tag--\1/
+	s/^[ 	]*\(.*\) \([^ ]*\)/please pull\
+	\1\
+	\2/p
+	q
+	EOT
+
+	cat <<-EOT >fuzz.sed
+	#!/bin/sed -nf
+	s/$downstream_url_for_sed/URL/g
+	s/$OID_REGEX/OBJECT_NAME/g
+	s/A U Thor/AUTHOR/g
+	s/[-0-9]\{10\} [:0-9]\{8\} [-+][0-9]\{4\}/DATE/g
+	s/        [^ ].*/        SUBJECT/g
+	s/  [^ ].* (DATE)/  SUBJECT (DATE)/g
+	s|tags/full|BRANCH|g
+	s/mnemonic.txt/FILENAME/g
+	s/^version [0-9]/VERSION/
+	/^ FILENAME | *[0-9]* [-+]*\$/ b diffstat
+	/^AUTHOR ([0-9]*):\$/ b shortlog
+	p
+	b
+	: diffstat
+	n
+	/ [0-9]* files* changed/ {
+		a\\
+	DIFFSTAT
+		b
+	}
+	b diffstat
+	: shortlog
+	/^        [a-zA-Z]/ n
+	/^[a-zA-Z]* ([0-9]*):\$/ n
+	/^\$/ N
+	/^\n[a-zA-Z]* ([0-9]*):\$/!{
+		a\\
+	SHORTLOG
+		D
+	}
+	n
+	b shortlog
+	EOT
+
+
+ok 2 - setup: two scripts for reading pull requests
+
+expecting success: 
+
+	rm -fr downstream.git &&
+	git init --bare downstream.git &&
+	(
+		cd local &&
+		git checkout initial &&
+		git merge --ff-only master &&
+		test_must_fail git request-pull initial "$downstream_url" \
+			2>../err
+	) &&
+	grep "No match for commit .*" err &&
+	grep "Are you sure you pushed" err
+
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5150-request-pull/downstream.git/
+Note: checking out '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 performing another checkout.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -b with the checkout command again. Example:
+
+  git checkout -b <new-branch-name>
+
+HEAD is now at 7244768 "Thirty days", a reminder of month lengths
+Updating 7244768..cc0f4ce
+Fast-forward
+ mnemonic.txt | 5 +++++
+ 1 file changed, 5 insertions(+)
+The following changes since commit 7244768f7e34b5fbdf65e26dda6c138d29596555:
+
+  "Thirty days", a reminder of month lengths (2005-04-07 15:13:13 -0700)
+
+are available in the Git repository at:
+
+  file:///build/git-2.20.1/t/trash directory.t5150-request-pull/downstream.git/ 
+
+for you to fetch changes up to cc0f4cedef2d8246b90a5255caa6a61ad760ad56:
+
+  More detail (2005-04-07 15:13:13 -0700)
+
+----------------------------------------------------------------
+A U Thor (1):
+      More detail
+
+ mnemonic.txt | 5 +++++
+ 1 file changed, 5 insertions(+)
+warn: No match for commit cc0f4cedef2d8246b90a5255caa6a61ad760ad56 found at file:///build/git-2.20.1/t/trash directory.t5150-request-pull/downstream.git/
+warn: Are you sure you pushed 'HEAD' there?
+ok 3 - pull request when forgot to push
+
+expecting success: 
+
+	rm -fr downstream.git &&
+	git init --bare downstream.git &&
+	(
+		cd local &&
+		git checkout initial &&
+		git merge --ff-only master &&
+		git push origin master:for-upstream &&
+		git request-pull initial origin master:for-upstream >../request
+	) &&
+	sed -nf read-request.sed <request >digest &&
+	cat digest &&
+	{
+		read task &&
+		read repository &&
+		read branch
+	} <digest &&
+	(
+		cd upstream-private &&
+		git checkout initial &&
+		git pull --ff-only "$repository" "$branch"
+	) &&
+	test "$branch" = for-upstream &&
+	test_cmp local/mnemonic.txt upstream-private/mnemonic.txt
+
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5150-request-pull/downstream.git/
+Previous HEAD position was cc0f4ce More detail
+HEAD is now at 7244768 "Thirty days", a reminder of month lengths
+Updating 7244768..cc0f4ce
+Fast-forward
+ mnemonic.txt | 5 +++++
+ 1 file changed, 5 insertions(+)
+To /build/git-2.20.1/t/trash directory.t5150-request-pull/downstream.git
+ * [new branch]      master -> for-upstream
+please pull
+/build/git-2.20.1/t/trash directory.t5150-request-pull/downstream.git
+for-upstream
+Note: checking out '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 performing another checkout.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -b with the checkout command again. Example:
+
+  git checkout -b <new-branch-name>
+
+HEAD is now at 7244768 "Thirty days", a reminder of month lengths
+From /build/git-2.20.1/t/trash directory.t5150-request-pull/downstream
+ * branch            for-upstream -> FETCH_HEAD
+Updating 7244768..cc0f4ce
+Fast-forward
+ mnemonic.txt | 5 +++++
+ 1 file changed, 5 insertions(+)
+ok 4 - pull request after push
+
+expecting success: 
+
+	rm -fr downstream.git &&
+	git init --bare downstream.git &&
+	(
+		cd local &&
+		git checkout initial &&
+		git merge --ff-only master &&
+		git push --tags origin master simplify &&
+		git push origin master:for-upstream &&
+		git request-pull initial "$downstream_url" >../request
+	) &&
+	sed -nf read-request.sed <request >digest &&
+	cat digest &&
+	{
+		read task &&
+		read repository &&
+		read branch
+	} <digest &&
+	test -z "$branch"
+
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5150-request-pull/downstream.git/
+Previous HEAD position was cc0f4ce More detail
+HEAD is now at 7244768 "Thirty days", a reminder of month lengths
+Updating 7244768..cc0f4ce
+Fast-forward
+ mnemonic.txt | 5 +++++
+ 1 file changed, 5 insertions(+)
+To /build/git-2.20.1/t/trash directory.t5150-request-pull/downstream.git
+ * [new branch]      master -> master
+ * [new branch]      simplify -> simplify
+ * [new tag]         full -> full
+ * [new tag]         initial -> initial
+To /build/git-2.20.1/t/trash directory.t5150-request-pull/downstream.git
+ * [new branch]      master -> for-upstream
+please pull
+file:///build/git-2.20.1/t/trash directory.t5150-request-pull/downstream.git/
+
+ok 5 - request asks HEAD to be pulled
+
+expecting success: 
+
+	rm -fr downstream.git &&
+	git init --bare downstream.git &&
+	cat <<-\EOT >expect &&
+	The following changes since commit OBJECT_NAME:
+
+	  SUBJECT (DATE)
+
+	are available in the Git repository at:
+
+	  URL BRANCH
+
+	for you to fetch changes up to OBJECT_NAME:
+
+	  SUBJECT (DATE)
+
+	----------------------------------------------------------------
+	VERSION
+
+	----------------------------------------------------------------
+	SHORTLOG
+
+	DIFFSTAT
+	EOT
+	(
+		cd local &&
+		git checkout initial &&
+		git merge --ff-only master &&
+		git push origin tags/full &&
+		git request-pull initial "$downstream_url" tags/full >../request
+	) &&
+	<request sed -nf fuzz.sed >request.fuzzy &&
+	test_i18ncmp expect request.fuzzy &&
+
+	(
+		cd local &&
+		git request-pull initial "$downstream_url" tags/full:refs/tags/full
+	) >request &&
+	sed -nf fuzz.sed <request >request.fuzzy &&
+	test_i18ncmp expect request.fuzzy &&
+
+	(
+		cd local &&
+		git request-pull initial "$downstream_url" full
+	) >request &&
+	grep " tags/full\$" request
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5150-request-pull/downstream.git/
+Previous HEAD position was cc0f4ce More detail
+HEAD is now at 7244768 "Thirty days", a reminder of month lengths
+Updating 7244768..cc0f4ce
+Fast-forward
+ mnemonic.txt | 5 +++++
+ 1 file changed, 5 insertions(+)
+To /build/git-2.20.1/t/trash directory.t5150-request-pull/downstream.git
+ * [new tag]         full -> full
+  file:///build/git-2.20.1/t/trash directory.t5150-request-pull/downstream.git/ tags/full
+ok 6 - pull request format
+
+expecting success: 
+
+	(
+		cd local &&
+		OPTIONS_KEEPDASHDASH=Yes &&
+		export OPTIONS_KEEPDASHDASH &&
+		git checkout initial &&
+		git merge --ff-only master &&
+		git push origin master:for-upstream &&
+		git request-pull -- initial "$downstream_url" master:for-upstream >../request
+	)
+
+
+Previous HEAD position was cc0f4ce More detail
+HEAD is now at 7244768 "Thirty days", a reminder of month lengths
+Updating 7244768..cc0f4ce
+Fast-forward
+ mnemonic.txt | 5 +++++
+ 1 file changed, 5 insertions(+)
+To /build/git-2.20.1/t/trash directory.t5150-request-pull/downstream.git
+ * [new branch]      master -> for-upstream
+ok 7 - request-pull ignores OPTIONS_KEEPDASHDASH poison
+
+# passed all 7 test(s)
+1..7
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
 *** t5004-archive-corner-cases.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5004-archive-corner-cases/.git/
 expecting success: 
 	git commit --allow-empty -m foo
 
-[master (root-commit) 7a3b298] foo
+[master (root-commit) 0ff3c76] foo
  Author: A U Thor <author@example.com>
 ok 1 - create commit with empty tree
 
@@ -140268,7 +137829,7 @@
 fc8e0d59c1cc5c14b6919fb2006b27fe337e7d0e
 warning [/build/git-2.20.1/t/t5004/empty.zip]:  zipfile is empty
 Archive:  ../empty.zip
-7a3b298e4a55271dc9fd3379d8a233a0d28023e5
+0ff3c765b7749e1753845d73df7ad76c0db14e18
 warning [../empty.zip]:  zipfile is empty
 ok 5 - zip archive of empty tree is empty
 
@@ -140284,7 +137845,7 @@
 	check_dir extract foo
 
 Archive:  ../prefix.zip
-7a3b298e4a55271dc9fd3379d8a233a0d28023e5
+0ff3c765b7749e1753845d73df7ad76c0db14e18
    creating: foo/
 ok 6 - zip archive of empty tree with prefix
 
@@ -140358,7 +137919,7 @@
 	"$ZIPINFO" many.zip | head -2 | sed -n "2s/.* //p" >actual &&
 	test_cmp expect actual
 
-[master c1675dd] 256 files in 1 directory
+[master 405594b] 256 files in 1 directory
  Author: A U Thor <author@example.com>
  256 files changed, 0 insertions(+), 0 deletions(-)
  create mode 100644 00/00
@@ -140698,249 +138259,811 @@
 1..13
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t5306-pack-nobase.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5306-pack-nobase/.git/
-expecting success: for a in a b c d e f g h i; do echo $a >>text; done &&
-     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
+*** t5000-tar-tree.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5000-tar-tree/.git/
+expecting success: mkdir a &&
+     echo simple textfile >a/a &&
+     ten=0123456789 && hundred=$ten$ten$ten$ten$ten$ten$ten$ten$ten$ten &&
+     echo long filename >a/four$hundred &&
+     mkdir a/bin &&
+     test-tool genrandom "frotz" 500000 >a/bin/sh &&
+     printf "A\$Format:%s\$O" "$SUBSTFORMAT" >a/substfile1 &&
+     printf "A not substituted O" >a/substfile2 &&
+     if test_have_prereq SYMLINKS; then
+	ln -s a a/l1
+     else
+	printf %s a > a/l1
+     fi &&
+     (p=long_path_to_a_file && cd a &&
+      for depth in 1 2 3 4 5; do mkdir $p && cd $p; done &&
+      echo text >file_with_long_path) &&
+     (cd a && find .) | sort >a.lst
+checking prerequisite: SYMLINKS
 
-expecting success: 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 &&
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
+	# test whether the filesystem supports symbolic links
+	ln -s x y && test -h y
 
-      git --git-dir=../.git cat-file commit $B |
-      git hash-object -t commit -w --stdin &&
+)
+prerequisite SYMLINKS ok
+ok 1 - populate workdir
 
-      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/git-2.20.1/t/trash directory.t5306-pack-nobase/patch_clone/.git/
-78bbda9091c9ff60ce7ed1ea58a19b6cff381eec
-f9037bf6e8d95d31af48907ab2c93c2d6c2c7fcd
-ok 2 - setup patch_clone
+expecting success: echo ignore me >a/ignored &&
+     echo ignored export-ignore >.git/info/attributes
+ok 2 - add ignored file
 
-expecting success: (mkdir user_clone &&
-      cd user_clone &&
-      git init &&
-      git pull ../.git &&
-      test $(git rev-parse HEAD) = $B &&
+expecting success: 
+	git add a &&
+	GIT_COMMITTER_DATE="2005-05-27 22:00" git commit -m initial
 
-      git pull ../patch_clone/.git &&
-      test $(git rev-parse HEAD) = $C
-     )
-    
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5306-pack-nobase/user_clone/.git/
-From ../
- * branch            HEAD       -> FETCH_HEAD
-From ../patch_clone/
- * branch            HEAD       -> FETCH_HEAD
-Updating 78bbda9..f8701aa
-Fast-forward
- text | 11 +----------
- 1 file changed, 1 insertion(+), 10 deletions(-)
-ok 3 - indirectly clone patch_clone
+[master (root-commit) 0f378a9] initial
+ Author: A U Thor <author@example.com>
+ 8 files changed, 7 insertions(+)
+ create mode 100644 a/a
+ create mode 100644 a/bin/sh
+ create mode 100644 a/four0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789
+ create mode 100644 a/ignored
+ create mode 120000 a/l1
+ create mode 100644 a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/file_with_long_path
+ create mode 100644 a/substfile1
+ create mode 100644 a/substfile2
+ok 3 - add files to repository
 
-expecting success: (mkdir user_direct &&
-      cd user_direct &&
-      git init &&
-      test_must_fail git fetch ../patch_clone/.git
-     )
-    
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5306-pack-nobase/user_direct/.git/
-remote: error: Could not read 6af52a7c782596e28adfd1dbd9e8f65756fd974b        
-remote: fatal: Failed to traverse parents of commit 78bbda9091c9ff60ce7ed1ea58a19b6cff381eec        
-error: git upload-pack: git-pack-objects died with error.
-fatal: git upload-pack: aborting due to possible repository corruption on the remote side.
-remote: aborting due to possible repository corruption on the remote side.
-fatal: protocol error: bad pack header
-ok 4 - clone of patch_clone is incomplete
+expecting success: 
+	echo "substfile?" export-subst >>.git/info/attributes &&
+	git log --max-count=1 "--pretty=format:A${SUBSTFORMAT}O" HEAD \
+		>a/substfile1
+
+ok 4 - setup export-subst
+
+expecting success: git clone --bare . bare.git &&
+     cp .git/info/attributes bare.git/info/attributes
+Cloning into bare repository 'bare.git'...
+done.
+ok 5 - create bare clone
+
+expecting success: rm a/ignored
+ok 6 - remove ignored file
+
+expecting success: git archive HEAD >b.tar
+ok 7 - git archive
 
-# passed all 4 test(s)
-1..4
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t5150-request-pull.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5150-request-pull/.git/
 expecting success: 
+		(mkdir $dir && cd $dir && "$TAR" xf -) <$tarfile
+	
+ok 8 -  extract tar archive
 
-	git init --bare upstream.git &&
-	git init --bare downstream.git &&
-	git clone upstream.git upstream-private &&
-	git clone downstream.git local &&
+checking prerequisite: TAR_NEEDS_PAX_FALLBACK
 
-	trash_url="file://$TRASH_DIRECTORY" &&
-	downstream_url="$trash_url/downstream.git/" &&
-	upstream_url="$trash_url/upstream.git/" &&
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
+	(
+		mkdir pax &&
+		cd pax &&
+		"$TAR" xf "$TEST_DIRECTORY"/t5000/pax.tar &&
+		test -f PaxHeaders.1791/file
+	)
+
+)
+prerequisite TAR_NEEDS_PAX_FALLBACK not satisfied
+skipping test:  interpret pax headers 
+		(
+			cd $dir &&
+			for header in *.paxheader
+			do
+				data=${header%.paxheader}.data &&
+				if test -h $data || test -e $data
+				then
+					path=$(get_pax_header $header path) &&
+					if test -n "$path"
+					then
+						mv "$data" "$path"
+					fi
+				fi
+			done
+		)
+	
+ok 9 # skip  interpret pax headers (missing TAR_NEEDS_PAX_FALLBACK)
+
+expecting success: 
+		(cd ${dir_with_prefix}a && find .) | sort >$listfile &&
+		test_cmp a.lst $listfile
+	
+ok 10 -  validate filenames
+
+expecting success: 
+		diff -r a ${dir_with_prefix}a
+	
+ok 11 -  validate file contents
+
+expecting success: 
+	git archive --prefix=prefix/ HEAD >with_prefix.tar
+
+ok 12 - git archive --prefix=prefix/
+
+expecting success: 
+		(mkdir $dir && cd $dir && "$TAR" xf -) <$tarfile
+	
+ok 13 -  extract tar archive
+
+skipping test:  interpret pax headers 
+		(
+			cd $dir &&
+			for header in *.paxheader
+			do
+				data=${header%.paxheader}.data &&
+				if test -h $data || test -e $data
+				then
+					path=$(get_pax_header $header path) &&
+					if test -n "$path"
+					then
+						mv "$data" "$path"
+					fi
+				fi
+			done
+		)
+	
+ok 14 # skip  interpret pax headers (missing TAR_NEEDS_PAX_FALLBACK)
+
+expecting success: 
+		(cd ${dir_with_prefix}a && find .) | sort >$listfile &&
+		test_cmp a.lst $listfile
+	
+ok 15 -  validate filenames
+
+expecting success: 
+		diff -r a ${dir_with_prefix}a
+	
+ok 16 -  validate file contents
+
+expecting success: 
+	git archive --prefix=olde- HEAD >with_olde-prefix.tar
+
+ok 17 - git-archive --prefix=olde-
+
+expecting success: 
+		(mkdir $dir && cd $dir && "$TAR" xf -) <$tarfile
+	
+ok 18 -  extract tar archive
+
+skipping test:  interpret pax headers 
+		(
+			cd $dir &&
+			for header in *.paxheader
+			do
+				data=${header%.paxheader}.data &&
+				if test -h $data || test -e $data
+				then
+					path=$(get_pax_header $header path) &&
+					if test -n "$path"
+					then
+						mv "$data" "$path"
+					fi
+				fi
+			done
+		)
+	
+ok 19 # skip  interpret pax headers (missing TAR_NEEDS_PAX_FALLBACK)
+
+expecting success: 
+		(cd ${dir_with_prefix}a && find .) | sort >$listfile &&
+		test_cmp a.lst $listfile
+	
+ok 20 -  validate filenames
+
+expecting success: 
+		diff -r a ${dir_with_prefix}a
+	
+ok 21 -  validate file contents
+
+expecting success: 
+    test_config core.bigfilethreshold 1 &&
+    git archive HEAD >b3.tar &&
+    test_cmp_bin b.tar b3.tar
+
+ok 22 - git archive on large files
+
+expecting success: (cd bare.git && git archive HEAD) >b3.tar
+ok 23 - git archive in a bare repo
+
+expecting success: test_cmp_bin b.tar b3.tar
+ok 24 - git archive vs. the same in a bare repo
+
+expecting success: git archive --output=b4.tar HEAD &&
+    test_cmp_bin b.tar b4.tar
+ok 25 - git archive with --output
+
+expecting success: git archive --remote=. HEAD >b5.tar &&
+    test_cmp_bin b.tar b5.tar
+ok 26 - git archive --remote
 
+expecting success: 
+	git config remote.foo.url . &&
 	(
-		cd upstream-private &&
-		cat <<-\EOT >mnemonic.txt &&
-		Thirtey days hath November,
-		Aprile, June, and September:
-		EOT
-		git add mnemonic.txt &&
-		test_tick &&
-		git commit -m "\"Thirty days\", a reminder of month lengths" &&
-		git tag -m "version 1" -a initial &&
-		git push --tags origin master
+		cd a &&
+		git archive --remote=foo --output=../b5-nick.tar HEAD
 	) &&
-	(
-		cd local &&
-		git remote add upstream "$trash_url/upstream.git" &&
-		git fetch upstream &&
-		git pull upstream master &&
-		cat <<-\EOT >>mnemonic.txt &&
-		Of twyecescore-eightt is but eine,
-		And all the remnante be thrycescore-eine.
-		O’course Leap yare comes an’pynes,
-		Ev’rie foure yares, gote it ryghth.
-		An’twyecescore-eight is but twyecescore-nyne.
-		EOT
-		git add mnemonic.txt &&
-		test_tick &&
-		git commit -m "More detail" &&
-		git tag -m "version 2" -a full &&
-		git checkout -b simplify HEAD^ &&
-		mv mnemonic.txt mnemonic.standard &&
-		cat <<-\EOT >mnemonic.clarified &&
-		Thirty days has September,
-		All the rest I can’t remember.
-		EOT
-		git add -N mnemonic.standard mnemonic.clarified &&
-		git commit -a -m "Adapt to use modern, simpler English
+	test_cmp_bin b.tar b5-nick.tar
 
-But keep the old version, too, in case some people prefer it." &&
-		git checkout master
-	)
+ok 27 - git archive --remote with configured remote
+
+expecting success: mkdir extract &&
+     "$TAR" xf b.tar -C extract a/a &&
+     test-tool chmtime --get extract/a/a >b.mtime &&
+     echo "1117231200" >expected.mtime &&
+     test_cmp expected.mtime b.mtime
+ok 28 - validate file modification time
 
+expecting success: git get-tar-commit-id <b.tar >b.commitid &&
+     test_cmp .git/$(git symbolic-ref HEAD) b.commitid
+ok 29 - git get-tar-commit-id
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5150-request-pull/upstream.git/
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5150-request-pull/downstream.git/
-Cloning into 'upstream-private'...
-warning: You appear to have cloned an empty repository.
-done.
-Cloning into 'local'...
-warning: You appear to have cloned an empty repository.
-done.
-[master (root-commit) 7244768] "Thirty days", a reminder of month lengths
+expecting success: 
+	git archive --format=tar --output=d4.zip HEAD &&
+	test_cmp_bin b.tar d4.zip
+
+ok 30 - git archive with --output, override inferred format
+
+checking prerequisite: GZIP
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir" &&gzip --version
+)
+gzip 1.9
+Copyright (C) 2017 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: 
+	git archive --output=d5.tgz --remote=. HEAD &&
+	gzip -d -c <d5.tgz >d5.tar &&
+	test_cmp_bin b.tar d5.tar
+
+ok 31 - git archive with --output and --remote creates .tgz
+
+expecting success: 
+	nongit git archive --list
+
+tar
+tgz
+tar.gz
+zip
+ok 32 - git archive --list outside of a git repo
+
+expecting success: 
+	git archive HEAD >expect.tar &&
+	nongit git archive --remote="$PWD" HEAD >actual.tar &&
+	test_cmp_bin expect.tar actual.tar
+
+ok 33 - git archive --remote outside of a git repo
+
+expecting success: 
+	test_commit unreachable &&
+	sha1=$(git rev-parse HEAD) &&
+	git reset --hard HEAD^ &&
+	git archive $sha1 >remote.tar &&
+	test_must_fail git archive --remote=. $sha1 >remote.tar
+
+[master 89a4606] unreachable
  Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+)
- create mode 100644 mnemonic.txt
-To /build/git-2.20.1/t/trash directory.t5150-request-pull/upstream.git
- * [new branch]      master -> master
- * [new tag]         initial -> initial
-From file:///build/git-2.20.1/t/trash directory.t5150-request-pull/upstream
- * [new branch]      master     -> upstream/master
- * [new tag]         initial    -> initial
-From file:///build/git-2.20.1/t/trash directory.t5150-request-pull/upstream
- * branch            master     -> FETCH_HEAD
-[master cc0f4ce] More detail
+ 1 file changed, 1 insertion(+)
+ create mode 100644 unreachable.t
+HEAD is now at 0f378a9 initial
+fatal: sent error to the client: git upload-archive: archiver died with error
+remote: fatal: no such ref: 89a4606095d90a19bd9702315b998897a7d0d4d1        
+remote: git upload-archive: archiver died with error
+ok 34 - clients cannot access unreachable commits
+
+expecting success: 
+	test_commit unreachable1 &&
+	sha1=$(git rev-parse HEAD) &&
+	git reset --hard HEAD^ &&
+	git archive $sha1 >remote.tar &&
+	test_config uploadarchive.allowUnreachable true &&
+	git archive --remote=. $sha1 >remote.tar
+
+[master c638a29] unreachable1
  Author: A U Thor <author@example.com>
- 1 file changed, 5 insertions(+)
-Switched to a new branch 'simplify'
-[simplify 6fa5b4f] Adapt to use modern, simpler English
+ 1 file changed, 1 insertion(+)
+ create mode 100644 unreachable1.t
+HEAD is now at 0f378a9 initial
+ok 35 - upload-archive can allow unreachable commits
+
+expecting success: 
+	git config tar.tar.foo.command "tr ab ba" &&
+	git config tar.bar.command "tr ab ba" &&
+	git config tar.bar.remote true &&
+	git config tar.invalid baz
+
+ok 36 - setup tar filters
+
+expecting success: 
+	git archive --list >output &&
+	grep "^tar\.foo\$" output &&
+	grep "^bar\$" output
+
+tar.foo
+bar
+ok 37 - archive --list mentions user filter
+
+expecting success: 
+	git archive --list --remote=. >output &&
+	! grep "^tar\.foo\$" output &&
+	grep "^bar\$" output
+
+bar
+ok 38 - archive --list shows only enabled remote filters
+
+expecting success: 
+	git archive --format=tar.foo HEAD >config.tar.foo &&
+	tr ab ba <config.tar.foo >config.tar &&
+	test_cmp_bin b.tar config.tar &&
+	git archive --format=bar HEAD >config.bar &&
+	tr ab ba <config.bar >config.tar &&
+	test_cmp_bin b.tar config.tar
+
+ok 39 - invoke tar filter by format
+
+expecting success: 
+	git archive -o config-implicit.tar.foo HEAD &&
+	test_cmp_bin config.tar.foo config-implicit.tar.foo &&
+	git archive -o config-implicit.bar HEAD &&
+	test_cmp_bin config.tar.foo config-implicit.bar
+
+ok 40 - invoke tar filter by extension
+
+expecting success: 
+	git archive -o config-implicit.baz HEAD &&
+	test_cmp_bin b.tar config-implicit.baz
+
+ok 41 - default output format remains tar
+
+expecting success: 
+	git archive -o config-implicittar.foo HEAD &&
+	test_cmp_bin b.tar config-implicittar.foo
+
+ok 42 - extension matching requires dot
+
+expecting success: 
+	test_must_fail git archive --remote=. --format=tar.foo HEAD \
+		>remote.tar.foo &&
+	git archive --remote=. --format=bar >remote.bar HEAD &&
+	test_cmp_bin remote.bar config.bar
+
+fatal: sent error to the client: git upload-archive: archiver died with error
+remote: fatal: Unknown archive format 'tar.foo'        
+remote: git upload-archive: archiver died with error
+ok 43 - only enabled filters are available remotely
+
+expecting success: 
+	git archive --format=tgz HEAD >j.tgz
+
+ok 44 - git archive --format=tgz
+
+expecting success: 
+	git archive --format=tar.gz HEAD >j1.tar.gz &&
+	test_cmp_bin j.tgz j1.tar.gz
+
+ok 45 - git archive --format=tar.gz
+
+expecting success: 
+	git archive --output=j2.tgz HEAD &&
+	test_cmp_bin j.tgz j2.tgz
+
+ok 46 - infer tgz from .tgz filename
+
+expecting success: 
+	git archive --output=j3.tar.gz HEAD &&
+	test_cmp_bin j.tgz j3.tar.gz
+
+ok 47 - infer tgz from .tar.gz filename
+
+expecting success: 
+	gzip -d -c <j.tgz >j.tar &&
+	test_cmp_bin b.tar j.tar
+
+ok 48 - extract tgz file
+
+expecting success: 
+	git archive --remote=. --format=tar.gz HEAD >remote.tar.gz &&
+	test_cmp_bin j.tgz remote.tar.gz
+
+ok 49 - remote tar.gz is allowed by default
+
+expecting success: 
+	git config tar.tar.gz.remote false &&
+	test_must_fail git archive --remote=. --format=tar.gz HEAD \
+		>remote.tar.gz
+
+fatal: sent error to the client: git upload-archive: archiver died with error
+remote: fatal: Unknown archive format 'tar.gz'        
+remote: git upload-archive: archiver died with error
+ok 50 - remote tar.gz can be disabled
+
+expecting success: 
+	git archive -v HEAD -- ":(glob)**/sh" >/dev/null 2>actual &&
+	cat >expect <<EOF &&
+a/
+a/bin/
+a/bin/sh
+EOF
+	test_cmp expect actual
+
+ok 51 - archive and :(glob)
+
+expecting success: 
+	test_must_fail git archive -v HEAD -- "*.abc" >/dev/null
+
+fatal: pathspec '*.abc' did not match any files
+ok 52 - catch non-matching pathspec
+
+checking prerequisite: LONG_IS_64BIT
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
+	test 8 -le "$(build_option sizeof-long)"
+
+)
+prerequisite LONG_IS_64BIT ok
+expecting success: 
+	obj_d=19 &&
+	obj_f=f9c8273ec45a8938e6999cb59b3ff66739902a &&
+	obj=${obj_d}${obj_f} &&
+	mkdir -p .git/objects/$obj_d &&
+	cp "$TEST_DIRECTORY"/t5000/$obj .git/objects/$obj_d/$obj_f &&
+	rm -f .git/index &&
+	git update-index --add --cacheinfo 100644,$obj,huge &&
+	git commit -m huge
+
+[master 4b69856] huge
  Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 mnemonic.clarified
- rename mnemonic.txt => mnemonic.standard (100%)
-Switched to branch 'master'
-Your branch is based on 'origin/master', but the upstream is gone.
-  (use "git branch --unset-upstream" to fixup)
-ok 1 - setup
+ 9 files changed, 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 huge
+ok 53 - set up repository with huge blob
 
 expecting success: 
+	{
+		git archive HEAD
+		echo $? >exit-code
+	} | test_copy_bytes 4096 >huge.tar &&
+	echo 141 >expect &&
+	test_cmp expect exit-code
 
-	downstream_url_for_sed=$(
-		printf "%s\n" "$downstream_url" |
-		sed -e 's/\\/\\\\/g' -e 's/[[/.*^$]/\\&/g'
-	) &&
+ok 54 - generate tar with huge size
 
-	cat <<-\EOT >read-request.sed &&
-	#!/bin/sed -nf
-	# Note that a request could ask for "tag $tagname"
-	/ in the Git repository at:$/!d
-	n
-	/^$/ n
-	s/ tag \([^ ]*\)$/ tag--\1/
-	s/^[ 	]*\(.*\) \([^ ]*\)/please pull\
-	\1\
-	\2/p
-	q
-	EOT
+checking prerequisite: TAR_HUGE
 
-	cat <<-EOT >fuzz.sed
-	#!/bin/sed -nf
-	s/$downstream_url_for_sed/URL/g
-	s/$OID_REGEX/OBJECT_NAME/g
-	s/A U Thor/AUTHOR/g
-	s/[-0-9]\{10\} [:0-9]\{8\} [-+][0-9]\{4\}/DATE/g
-	s/        [^ ].*/        SUBJECT/g
-	s/  [^ ].* (DATE)/  SUBJECT (DATE)/g
-	s|tags/full|BRANCH|g
-	s/mnemonic.txt/FILENAME/g
-	s/^version [0-9]/VERSION/
-	/^ FILENAME | *[0-9]* [-+]*\$/ b diffstat
-	/^AUTHOR ([0-9]*):\$/ b shortlog
-	p
-	b
-	: diffstat
-	n
-	/ [0-9]* files* changed/ {
-		a\\
-	DIFFSTAT
-		b
-	}
-	b diffstat
-	: shortlog
-	/^        [a-zA-Z]/ n
-	/^[a-zA-Z]* ([0-9]*):\$/ n
-	/^\$/ N
-	/^\n[a-zA-Z]* ([0-9]*):\$/!{
-		a\\
-	SHORTLOG
-		D
-	}
-	n
-	b shortlog
-	EOT
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
+	echo "68719476737 4147" >expect &&
+	tar_info "$TEST_DIRECTORY"/t5000/huge-and-future.tar >actual &&
+	test_cmp expect actual
+
+)
+tar: rmtlseek not stopped at a record boundary
+tar: Error is not recoverable: exiting now
+prerequisite TAR_HUGE ok
+expecting success: 
+	echo 68719476737 >expect &&
+	tar_info huge.tar | cut -d" " -f1 >actual &&
+	test_cmp expect actual
 
+tar: rmtlseek not stopped at a record boundary
+tar: Error is not recoverable: exiting now
+ok 55 - system tar can read our huge size
 
-ok 2 - setup: two scripts for reading pull requests
+checking prerequisite: TIME_IS_64BIT
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir" &&test-tool date is64bit
+)
+prerequisite TIME_IS_64BIT ok
+expecting success: 
+	rm -f .git/index &&
+	echo content >file &&
+	git add file &&
+	GIT_COMMITTER_DATE="@68719476737 +0000" \
+		git commit -m "tempori parendum"
+
+[master 92bd4c4] tempori parendum
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+)
+ create mode 100644 file
+ delete mode 100644 huge
+ok 56 - set up repository with far-future commit
 
 expecting success: 
+	git archive HEAD >future.tar
 
-	rm -fr downstream.git &&
-	git init --bare downstream.git &&
-	(
-		cd local &&
-		git checkout initial &&
-		git merge --ff-only master &&
-		test_must_fail git request-pull initial "$downstream_url" \
-			2>../err
-	) &&
-	grep "No match for commit .*" err &&
-	grep "Are you sure you pushed" err
+ok 57 - generate tar with future mtime
 
+checking prerequisite: TIME_T_IS_64BIT
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5150-request-pull/downstream.git/
-Note: checking out 'initial'.
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir" &&test-tool date time_t-is64bit
+)
+prerequisite TIME_T_IS_64BIT ok
+expecting success: 
+	echo 4147 >expect &&
+	tar_info future.tar | cut -d" " -f2 >actual &&
+	test_cmp expect actual
+
+ok 58 - system tar can read our future mtime
+
+# passed all 58 test(s)
+1..58
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t4150-am.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4150-am/.git/
+expecting success: 
+	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
+
+	signoff="Signed-off-by: $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>"
+
+ok 1 - setup: messages
+
+expecting success: 
+	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 master >lorem-move.patch &&
+	git format-patch --no-prefix --stdout master >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 &&
+
+	# reset time
+	sane_unset test_tick &&
+	test_tick
+
+[master (root-commit) 6b2d93f] first
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+[master 88f8893] second
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master 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
+[master 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
+[master 7179449] third
+ Author: A U Thor <author@example.com>
+ 1 file changed, 30 insertions(+), 2 deletions(-)
+ rewrite file (100%)
+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%)
+ok 2 - setup
+
+expecting success: 
+	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 756adf8 renamed a file and added another
+Note: checking out '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
@@ -140951,73 +139074,472 @@
 
   git checkout -b <new-branch-name>
 
-HEAD is now at 7244768 "Thirty days", a reminder of month lengths
-Updating 7244768..cc0f4ce
-Fast-forward
- mnemonic.txt | 5 +++++
- 1 file changed, 5 insertions(+)
-The following changes since commit 7244768f7e34b5fbdf65e26dda6c138d29596555:
+HEAD is now at 6b2d93f first
+Applying: second
+ok 3 - am applies patch correctly
 
-  "Thirty days", a reminder of month lengths (2005-04-07 15:13:13 -0700)
+expecting success: 
+	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
 
-are available in the Git repository at:
+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
 
-  file:///build/git-2.20.1/t/trash directory.t5150-request-pull/downstream.git/ 
+expecting success: 
+	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^)"
 
-for you to fetch changes up to cc0f4cedef2d8246b90a5255caa6a61ad760ad56:
+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
 
-  More detail (2005-04-07 15:13:13 -0700)
+expecting success: 
+	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^)"
 
-----------------------------------------------------------------
-A U Thor (1):
-      More detail
+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
 
- mnemonic.txt | 5 +++++
- 1 file changed, 5 insertions(+)
-warn: No match for commit cc0f4cedef2d8246b90a5255caa6a61ad760ad56 found at file:///build/git-2.20.1/t/trash directory.t5150-request-pull/downstream.git/
-warn: Are you sure you pushed 'HEAD' there?
-ok 3 - pull request when forgot to push
+expecting success: 
+	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: 
+	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^
 
-	rm -fr downstream.git &&
-	git init --bare downstream.git &&
-	(
-		cd local &&
-		git checkout initial &&
-		git merge --ff-only master &&
-		git push origin master:for-upstream &&
-		git request-pull initial origin master:for-upstream >../request
-	) &&
-	sed -nf read-request.sed <request >digest &&
-	cat digest &&
+Previous HEAD position was 88f8893 second
+HEAD is now at 6b2d93f first
+Applying: second
+ok 8 - am applies stgit patch
+
+expecting success: 
+	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: 
+	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: 
+	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: 
+	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: 
+	test_when_finished "rm -f .git/hooks/applypatch-msg" &&
+	rm -fr .git/rebase-apply &&
+	git reset --hard &&
+	git checkout first &&
+	mkdir -p .git/hooks &&
+	write_script .git/hooks/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: 
+	test_when_finished "rm -f .git/hooks/applypatch-msg" &&
+	rm -fr .git/rebase-apply &&
+	git reset --hard &&
+	git checkout first &&
+	mkdir -p .git/hooks &&
+	write_script .git/hooks/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: 
+	test_when_finished "rm -f .git/hooks/pre-applypatch" &&
+	rm -fr .git/rebase-apply &&
+	git reset --hard &&
+	git checkout first &&
+	mkdir -p .git/hooks &&
+	write_script .git/hooks/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 6b2d93f first
+HEAD is now at 6b2d93f first
+Applying: second
+ok 15 - am with pre-applypatch hook
+
+expecting success: 
+	test_when_finished "rm -f .git/hooks/pre-applypatch" &&
+	rm -fr .git/rebase-apply &&
+	git reset --hard &&
+	git checkout first &&
+	mkdir -p .git/hooks &&
+	write_script .git/hooks/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 16 - am with failing pre-applypatch hook
+
+expecting success: 
+	test_when_finished "rm -f .git/hooks/post-applypatch" &&
+	rm -fr .git/rebase-apply &&
+	git reset --hard &&
+	git checkout first &&
+	mkdir -p .git/hooks &&
+	write_script .git/hooks/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 6b2d93f first
+HEAD is now at 6b2d93f first
+Applying: second
+ok 17 - am with post-applypatch hook
+
+expecting success: 
+	test_when_finished "rm -f .git/hooks/post-applypatch" &&
+	rm -fr .git/rebase-apply &&
+	git reset --hard &&
+	git checkout first &&
+	mkdir -p .git/hooks &&
+	write_script .git/hooks/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 18 - am with failing post-applypatch hook
+
+expecting success: 
+	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 19 - am --scissors cuts the message at the scissors line
+
+expecting success: 
+	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 20 - am --no-scissors overrides mailinfo.scissors
+
+expecting success: 
+	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 21 - setup: new author and committer
+
+expecting success: 
+	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 master^^)" = "$(git rev-parse HEAD^^)" &&
+	git diff --exit-code master..HEAD &&
+	git diff --exit-code master^..HEAD^ &&
+	compare author master HEAD &&
+	compare author master^ 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 22 - am changes committer and keeps author
+
+expecting success: 
+	rm -fr .git/rebase-apply &&
+	git reset --hard &&
+	git checkout -b master2 first &&
+	git am --signoff <patch2 &&
 	{
-		read task &&
-		read repository &&
-		read branch
-	} <digest &&
-	(
-		cd upstream-private &&
-		git checkout initial &&
-		git pull --ff-only "$repository" "$branch"
-	) &&
-	test "$branch" = for-upstream &&
-	test_cmp local/mnemonic.txt upstream-private/mnemonic.txt
+		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:
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5150-request-pull/downstream.git/
-Previous HEAD position was cc0f4ce More detail
-HEAD is now at 7244768 "Thirty days", a reminder of month lengths
-Updating 7244768..cc0f4ce
-Fast-forward
- mnemonic.txt | 5 +++++
- 1 file changed, 5 insertions(+)
-To /build/git-2.20.1/t/trash directory.t5150-request-pull/downstream.git
- * [new branch]      master -> for-upstream
-please pull
-/build/git-2.20.1/t/trash directory.t5150-request-pull/downstream.git
-for-upstream
-Note: checking out 'initial'.
+  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 'master2'
+Applying: second
+Applying: third
+ok 23 - am --signoff adds Signed-off-by: line
+
+expecting success: 
+	echo refs/heads/master2 >expected &&
+	git symbolic-ref HEAD >actual &&
+	test_cmp expected actual
+
+ok 24 - am stays in branch
+
+expecting success: 
+	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 25 - am --signoff does not add Signed-off-by: line if already there
+
+expecting success: 
+	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 26 - am --signoff adds Signed-off-by: if another author is preset
+
+expecting success: 
+	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 27 - am --signoff duplicates Signed-off-by: if it is not the last one
+
+expecting success: 
+	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 master2 >actual &&
+	test_cmp expected actual
+
+HEAD is now at b55fe7d second
+Applying: third
+ok 28 - am without --keep removes Re: and [PATCH] stuff
+
+expecting success: 
+	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: checking out '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
@@ -141028,141 +139550,1813 @@
 
   git checkout -b <new-branch-name>
 
-HEAD is now at 7244768 "Thirty days", a reminder of month lengths
-From /build/git-2.20.1/t/trash directory.t5150-request-pull/downstream
- * branch            for-upstream -> FETCH_HEAD
-Updating 7244768..cc0f4ce
-Fast-forward
- mnemonic.txt | 5 +++++
- 1 file changed, 5 insertions(+)
-ok 4 - pull request after push
+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 29 - am --keep really keeps the subject
 
 expecting success: 
+	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
 
-	rm -fr downstream.git &&
-	git init --bare downstream.git &&
+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 30 - am --keep-non-patch really keeps the non-patch part
+
+expecting success: 
+	rm -fr .git/rebase-apply &&
+	git reset --hard &&
+	git checkout -b base3way master2 &&
+	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 31 - setup am -3
+
+expecting success: 
+	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 32 - am -3 falls back to 3-way merge
+
+expecting success: 
+	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 33 - am -3 -p0 can read --no-prefix patch
+
+expecting success: 
+	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 34 - am with config am.threeWay falls back to 3-way merge
+
+expecting success: 
+	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' to see the failed patch
+Applying: moved stuff
+Patch failed at 0001 moved stuff
+When you have resolved this problem, run "git am --continue".
+If you prefer to skip this patch, run "git am --skip" instead.
+To restore the original branch and stop patching, run "git am --abort".
+ok 35 - am with config am.threeWay overridden by --no-3way
+
+expecting success: 
+	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: checking out '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 performing another checkout.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -b with the checkout command again. Example:
+
+  git checkout -b <new-branch-name>
+
+HEAD is now at 1048ce6 added another file
+Applying: renamed a file
+ok 36 - am can rename a file
+
+expecting success: 
+	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 37 - am -3 can rename a file
+
+expecting success: 
+	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 38 - am -3 can rename a file after falling back to 3-way merge
+
+expecting success: 
+	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 39 - am -3 -q is quiet
+
+expecting success: 
+	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: checking out '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 performing another checkout.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -b with the checkout command again. Example:
+
+  git checkout -b <new-branch-name>
+
+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' to see the failed patch
+Applying: moved stuff
+Patch failed at 0001 moved stuff
+When you have resolved this problem, run "git am --continue".
+If you prefer to skip this patch, run "git am --skip" instead.
+To restore the original branch and stop patching, run "git am --abort".
+ok 40 - am pauses on conflict
+
+expecting success: 
+	git am --show-current-patch >actual.patch &&
+	test_cmp .git/rebase-apply/0001 actual.patch
+
+ok 41 - am --show-current-patch
+
+expecting success: 
+	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 42 - am --skip works
+
+expecting success: 
+	mkdir .git/rebase-apply &&
+	git am --abort &&
+	test_path_is_missing .git/rebase-apply
+
+ok 43 - am --abort removes a stray directory
+
+expecting success: 
+	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' to see the failed patch
+Applying: moved stuff
+Patch failed at 0001 moved stuff
+When you have resolved this problem, run "git am --continue".
+If you prefer to skip this patch, run "git am --skip" instead.
+To restore the original branch and stop patching, run "git am --abort".
+fatal: previous rebase directory .git/rebase-apply still exists but mbox given.
+ok 44 - am refuses patches when paused
+
+expecting success: 
+	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' to see the failed patch
+Applying: moved stuff
+Patch failed at 0001 moved stuff
+When you have resolved this problem, run "git am --continue".
+If you prefer to skip this patch, run "git am --skip" instead.
+To restore the original branch and stop patching, run "git am --abort".
+Applying: moved stuff
+Applying: added another file
+ok 45 - am --resolved works
+
+expecting success: 
+	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' to see the failed patch
+Applying: moved stuff
+Patch failed at 0001 moved stuff
+When you have resolved this problem, run "git am --continue".
+If you prefer to skip this patch, run "git am --skip" instead.
+To restore the original branch and stop patching, run "git am --abort".
+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.
+When you have resolved this problem, run "git am --continue".
+If you prefer to skip this patch, run "git am --skip" instead.
+To restore the original branch and stop patching, run "git am --abort".
+ok 46 - am --resolved fails if index has no changes
+
+expecting success: 
+	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_i18ngrep "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' to see the failed patch
+Patch failed at 0001 moved stuff
+When you have resolved this problem, run "git am --continue".
+If you prefer to skip this patch, run "git am --skip" instead.
+To restore the original branch and stop patching, run "git am --abort".
+You still have unmerged paths in your index.
+ok 47 - am --resolved fails if index has unmerged entries
+
+expecting success: 
+	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 master^..HEAD
+
+HEAD is now at 88f8893 second
+Previous HEAD position was 88f8893 second
+HEAD is now at 6b2d93f first
+Applying: second
+ok 48 - am takes patches from a Pine mailbox
+
+expecting success: 
+	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
+Patch is empty.
+When you have resolved this problem, run "git am --continue".
+If you prefer to skip this patch, run "git am --skip" instead.
+To restore the original branch and stop patching, run "git am --abort".
+ok 49 - am fails on mail without patch
+
+expecting success: 
+	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: unrecognized input
+hint: Use 'git am --show-current-patch' to see the failed patch
+Applying: git-foo.sh
+Patch failed at 0001 git-foo.sh
+When you have resolved this problem, run "git am --continue".
+If you prefer to skip this patch, run "git am --skip" instead.
+To restore the original branch and stop patching, run "git am --abort".
+ok 50 - am fails on empty patch
+
+expecting success: 
+	rm -fr subdir &&
+	rm -fr .git/rebase-apply &&
+	git reset --hard &&
+	git checkout first &&
 	(
-		cd local &&
-		git checkout initial &&
-		git merge --ff-only master &&
-		git push --tags origin master simplify &&
-		git push origin master:for-upstream &&
-		git request-pull initial "$downstream_url" >../request
+		mkdir -p subdir &&
+		cd subdir &&
+		git am <../patch1
 	) &&
-	sed -nf read-request.sed <request >digest &&
-	cat digest &&
-	{
-		read task &&
-		read repository &&
-		read branch
-	} <digest &&
-	test -z "$branch"
+	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:
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5150-request-pull/downstream.git/
-Previous HEAD position was cc0f4ce More detail
-HEAD is now at 7244768 "Thirty days", a reminder of month lengths
-Updating 7244768..cc0f4ce
-Fast-forward
- mnemonic.txt | 5 +++++
- 1 file changed, 5 insertions(+)
-To /build/git-2.20.1/t/trash directory.t5150-request-pull/downstream.git
- * [new branch]      master -> master
- * [new branch]      simplify -> simplify
- * [new tag]         full -> full
- * [new tag]         initial -> initial
-To /build/git-2.20.1/t/trash directory.t5150-request-pull/downstream.git
- * [new branch]      master -> for-upstream
-please pull
-file:///build/git-2.20.1/t/trash directory.t5150-request-pull/downstream.git/
+  7ce6dd8 second
 
-ok 5 - request asks HEAD to be pulled
+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 51 - am works from stdin in subdirectory
 
 expecting success: 
+	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
 
-	rm -fr downstream.git &&
-	git init --bare downstream.git &&
-	cat <<-\EOT >expect &&
-	The following changes since commit OBJECT_NAME:
+HEAD is now at 7ce6dd8 second
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-	  SUBJECT (DATE)
+  7ce6dd8 second
 
-	are available in the Git repository at:
+If you want to keep it by creating a new branch, this may be a good time
+to do so with:
 
-	  URL BRANCH
+ git branch <new-branch-name> 7ce6dd8
 
-	for you to fetch changes up to OBJECT_NAME:
+HEAD is now at 6b2d93f first
+Applying: second
+ok 52 - am works from file (relative path given) in subdirectory
 
-	  SUBJECT (DATE)
+expecting success: 
+	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
 
-	----------------------------------------------------------------
-	VERSION
+HEAD is now at 7ce6dd8 second
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-	----------------------------------------------------------------
-	SHORTLOG
+  7ce6dd8 second
 
-	DIFFSTAT
-	EOT
+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 53 - am works from file (absolute path given) in subdirectory
+
+expecting success: 
+	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
+
+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 54 - am --committer-date-is-author-date
+
+expecting success: 
+	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
+
+HEAD is now at 5709bd2 second
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  5709bd2 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> 5709bd2
+
+HEAD is now at 6b2d93f first
+Applying: second
+--- at	2023-01-05 11:48:55.534868030 +0000
++++ ct	2023-01-05 11:48:55.542868030 +0000
+@@ -1 +1 @@
+-1112912053 -0700
++1112912293 -0700
+ok 55 - am without --committer-date-is-author-date
+
+expecting success: 
+	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
+
+HEAD is now at 9fa39e1 second
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  9fa39e1 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> 9fa39e1
+
+HEAD is now at 6b2d93f first
+Applying: second
+1672919335 +0000
+ok 56 - am --ignore-date
+
+expecting success: 
+	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 local &&
-		git checkout initial &&
-		git merge --ff-only master &&
-		git push origin tags/full &&
-		git request-pull initial "$downstream_url" tags/full >../request
+		cd subdir &&
+		git init &&
+		git am 1
 	) &&
-	<request sed -nf fuzz.sed >request.fuzzy &&
-	test_i18ncmp expect request.fuzzy &&
+	(
+		cd subdir &&
+		git rev-parse HEAD^{tree} >../actual
+	) &&
+	test_cmp expected actual
+
+HEAD is now at df55397 second
+subdir/1
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4150-am/subdir/.git/
+applying to an empty history
+Applying: first
+ok 57 - am into an unborn branch
+
+expecting success: 
+	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_i18ngrep "^Applying: second \\\n foo$" output.out
+
+HEAD is now at df55397 second
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  df55397 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> df55397
+
+HEAD is now at 6b2d93f first
+Applying: second \n foo
+ok 58 - am newline in subject
+
+expecting success: 
+	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 59 - am -q is quiet
+
+expecting success: 
+	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_i18ncmp expected actual
+
+HEAD is now at 0b3df7d second
+ok 60 - am empty-file does not infloop
+
+expecting success: 
+	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 61 - am --message-id really adds the message id
+
+expecting success: 
+	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 9b1f34c second
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  9b1f34c 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> 9b1f34c
+
+HEAD is now at 6b2d93f first
+Applying: second
+ok 62 - am.messageid really adds the message id
+
+expecting success: 
+	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 9b1f34c second
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  9b1f34c 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> 9b1f34c
+
+HEAD is now at 6b2d93f first
+Applying: second
+ok 63 - am --message-id -s signs off after the message id
+
+expecting success: 
+	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 58671be second
+[detached HEAD c69a679] one
+ Author: Another Thor <a.thor@example.com>
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+[detached HEAD 5302f0e] two
+ Author: Another Thor <a.thor@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[detached HEAD e05c5d4] three
+ Author: Another Thor <a.thor@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+HEAD is now at c69a679 one
+[detached HEAD 8ec6c25] 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:
+8ec6c25 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' to see the failed patch
+Patch failed at 0001 two
+When you have resolved this problem, run "git am --continue".
+If you prefer to skip this patch, run "git am --skip" instead.
+To restore the original branch and stop patching, run "git am --abort".
+Applying: three
+Using index info to reconstruct a base tree...
+M	file
+Falling back to patching base and 3-way merge...
+Merging:
+8ec6c25 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' to see the failed patch
+Patch failed at 0002 three
+When you have resolved this problem, run "git am --continue".
+If you prefer to skip this patch, run "git am --skip" instead.
+To restore the original branch and stop patching, run "git am --abort".
+Recorded resolution for 'file'.
+Applying: three
+HEAD is now at 8ec6c25 other
+Applying: two
+Using index info to reconstruct a base tree...
+M	file
+Falling back to patching base and 3-way merge...
+Merging:
+8ec6c25 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' to see the failed patch
+Patch failed at 0001 two
+When you have resolved this problem, run "git am --continue".
+If you prefer to skip this patch, run "git am --skip" instead.
+To restore the original branch and stop patching, run "git am --abort".
+Applying: three
+Using index info to reconstruct a base tree...
+M	file
+Falling back to patching base and 3-way merge...
+Merging:
+8ec6c25 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' to see the failed patch
+Patch failed at 0002 three
+When you have resolved this problem, run "git am --continue".
+If you prefer to skip this patch, run "git am --skip" instead.
+To restore the original branch and stop patching, run "git am --abort".
+ok 64 - am -3 works with rerere
+
+expecting success: 
+	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
+	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 &&
 	(
-		cd local &&
-		git request-pull initial "$downstream_url" tags/full:refs/tags/full
-	) >request &&
-	sed -nf fuzz.sed <request >request.fuzzy &&
-	test_i18ncmp expect request.fuzzy &&
+		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 &&
 
 	(
-		cd local &&
-		git request-pull initial "$downstream_url" full
-	) >request &&
-	grep " tags/full\$" request
+		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
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5150-request-pull/downstream.git/
-Previous HEAD position was cc0f4ce More detail
-HEAD is now at 7244768 "Thirty days", a reminder of month lengths
-Updating 7244768..cc0f4ce
-Fast-forward
- mnemonic.txt | 5 +++++
- 1 file changed, 5 insertions(+)
-To /build/git-2.20.1/t/trash directory.t5150-request-pull/downstream.git
- * [new tag]         full -> full
-  file:///build/git-2.20.1/t/trash directory.t5150-request-pull/downstream.git/ tags/full
-ok 6 - pull request format
+HEAD is now at 8ec6c25 other
+[detached HEAD aae1281] subject here
+ Author: Another Thor <a.thor@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+HEAD is now at 8ec6c25 other
+Applying: subject here
+Unstaged changes after reset:
+M	file
+[detached HEAD 683db8c] subject here
+ Author: Another Thor <a.thor@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+HEAD is now at 8ec6c25 other
+Applying: subject here
+ok 65 - am -s unexpected trailer block
+
+expecting success: 
+	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 format-patch --pretty=mboxrd --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:
+
+  f8e9fae 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> f8e9fae
+
+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 66 - am --patch-format=mboxrd handles mboxrd
+
+expecting success: 
+	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 67 - am works with multi-line in-body headers
 
 expecting success: 
+	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 68 - am --quit keeps HEAD where it is
+
+# passed all 68 test(s)
+1..68
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t5003-archive-zip.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5003-archive-zip/.git/
+expecting success: 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; done &&
+      echo text >file_with_long_path)
+
+ok 1 - populate workdir
+
+checking prerequisite: SYMLINKS
 
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
+	# 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" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
 	(
-		cd local &&
-		OPTIONS_KEEPDASHDASH=Yes &&
-		export OPTIONS_KEEPDASHDASH &&
-		git checkout initial &&
-		git merge --ff-only master &&
-		git push origin master:for-upstream &&
-		git request-pull -- initial "$downstream_url" master:for-upstream >../request
+		mkdir unzip-symlinks &&
+		cd unzip-symlinks &&
+		"$GIT_UNZIP" "$TEST_DIRECTORY"/t5003/infozip-symlinks.zip &&
+		test -h symlink
 	)
 
+)
+Archive:  /build/git-2.20.1/t/t5003/infozip-symlinks.zip
+ extracting: textfile                
+    linking: symlink                 -> textfile 
+finishing deferred symbolic links:
+  symlink                -> textfile
+prerequisite UNZIP_SYMLINKS ok
+expecting success: 
+	ln -s a a/symlink_to_a
+
+ok 2 - add symlink
 
-Previous HEAD position was cc0f4ce More detail
-HEAD is now at 7244768 "Thirty days", a reminder of month lengths
-Updating 7244768..cc0f4ce
-Fast-forward
- mnemonic.txt | 5 +++++
- 1 file changed, 5 insertions(+)
-To /build/git-2.20.1/t/trash directory.t5150-request-pull/downstream.git
- * [new branch]      master -> for-upstream
-ok 7 - request-pull ignores OPTIONS_KEEPDASHDASH poison
+expecting success: 
+	(cd a && find .) | sort >a.lst
 
-# passed all 7 test(s)
-1..7
+ok 3 - prepare file list
+
+expecting success: echo ignore me >a/ignored &&
+     echo ignored export-ignore >.git/info/attributes
+ok 4 - add ignored file
+
+expecting success: 
+	git add a &&
+	GIT_COMMITTER_DATE="2005-05-27 22:00" git commit -m initial
+
+[master (root-commit) c5f0dbc] 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: 
+	echo "a/nodiff.* -diff" >>.git/info/attributes &&
+	echo "a/diff.* diff" >>.git/info/attributes &&
+	echo "a/custom.* diff=custom" >>.git/info/attributes &&
+	git config diff.custom.binary true &&
+	echo "substfile?" export-subst >>.git/info/attributes &&
+	git log --max-count=1 "--pretty=format:A${SUBSTFORMAT}O" HEAD \
+		>a/substfile1
+
+ok 6 - setup export-subst and diff attributes
+
+expecting success: 
+	git clone --bare . bare.git &&
+	cp .git/info/attributes bare.git/info/attributes &&
+	# Recreate our changes to .git/config rather than just copying it, as
+	# we do not want to clobber core.bare or other settings.
+	git -C bare.git config diff.custom.binary true
+
+Cloning into bare repository 'bare.git'...
+done.
+ok 7 - create bare clone
+
+expecting success: rm a/ignored
+ok 8 - remove ignored file
+
+expecting success: git archive --format=zip HEAD >d.zip
+ok 9 - git archive --format=zip
+
+checking prerequisite: UNZIP
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
+	"$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 8.3.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.6, 6-Sept-2010)
+        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: 
+		(mkdir $dir && cd $dir && "$GIT_UNZIP" ../$zipfile)
+	
+Archive:  ../d.zip
+c5f0dbcf0c0c0f6f5a61ee25630a5f3b4c648a8e
+   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: 
+		(cd d/a && find .) | sort >d.lst &&
+		test_cmp a.lst d.lst
+	
+ok 11 -  validate filenames
+
+expecting success: 
+		diff -r a d/a
+	
+ok 12 -  validate file contents
+
+expecting success: 
+		(mkdir $dir && cd $dir && "$GIT_UNZIP" -a ../$zipfile)
+	
+Archive:  ../d.zip
+c5f0dbcf0c0c0f6f5a61ee25630a5f3b4c648a8e
+   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: 
+		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: 
+		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: 
+		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: 
+		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: 
+		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: (cd bare.git && git archive --format=zip HEAD) >d1.zip
+ok 19 - git archive --format=zip in a bare repo
+
+expecting success: test_cmp_bin d.zip d1.zip
+ok 20 - git archive --format=zip vs. the same in a bare repo
+
+expecting success: 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: 
+	git archive --output=d3.zip HEAD &&
+	test_cmp_bin d.zip d3.zip
+
+ok 22 - git archive with --output, inferring format (local)
+
+expecting success: 
+	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: git archive --format=zip --prefix=prefix/ HEAD >e.zip
+ok 24 - git archive --format=zip with prefix
+
+expecting success: 
+		(mkdir $dir && cd $dir && "$GIT_UNZIP" ../$zipfile)
+	
+Archive:  ../e.zip
+c5f0dbcf0c0c0f6f5a61ee25630a5f3b4c648a8e
+   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: 
+		(cd e/prefix/a && find .) | sort >e.lst &&
+		test_cmp a.lst e.lst
+	
+ok 26 -  validate filenames
+
+expecting success: 
+		diff -r a e/prefix/a
+	
+ok 27 -  validate file contents
+
+expecting success: 
+		(mkdir $dir && cd $dir && "$GIT_UNZIP" -a ../$zipfile)
+	
+Archive:  ../e.zip
+c5f0dbcf0c0c0f6f5a61ee25630a5f3b4c648a8e
+   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: 
+		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: 
+		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: 
+		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: 
+		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: 
+		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: 
+	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: 
+		(mkdir $dir && cd $dir && "$GIT_UNZIP" ../$zipfile)
+	
+Archive:  ../large.zip
+c5f0dbcf0c0c0f6f5a61ee25630a5f3b4c648a8e
+   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: 
+		(cd large/a && find .) | sort >large.lst &&
+		test_cmp a.lst large.lst
+	
+ok 36 -  validate filenames
+
+expecting success: 
+		diff -r a large/a
+	
+ok 37 -  validate file contents
+
+expecting success: 
+		(mkdir $dir && cd $dir && "$GIT_UNZIP" -a ../$zipfile)
+	
+Archive:  ../large.zip
+c5f0dbcf0c0c0f6f5a61ee25630a5f3b4c648a8e
+   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: 
+		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: 
+		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: 
+		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: 
+		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: 
+		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: 
+	test_config core.bigfilethreshold 1 &&
+	git archive --format=zip HEAD >large-compressed.zip
+
+ok 44 - git archive --format=zip on large files
+
+expecting success: 
+		(mkdir $dir && cd $dir && "$GIT_UNZIP" ../$zipfile)
+	
+Archive:  ../large-compressed.zip
+c5f0dbcf0c0c0f6f5a61ee25630a5f3b4c648a8e
+   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: 
+		(cd large-compressed/a && find .) | sort >large-compressed.lst &&
+		test_cmp a.lst large-compressed.lst
+	
+ok 46 -  validate filenames
+
+expecting success: 
+		diff -r a large-compressed/a
+	
+ok 47 -  validate file contents
+
+expecting success: 
+		(mkdir $dir && cd $dir && "$GIT_UNZIP" -a ../$zipfile)
+	
+Archive:  ../large-compressed.zip
+c5f0dbcf0c0c0f6f5a61ee25630a5f3b4c648a8e
+   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: 
+		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: 
+		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: 
+		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: 
+		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: 
+		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 
+
+# passed all 53 test(s)
+1..53
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
 *** t5307-pack-missing-commit.sh ***
@@ -141245,6 +141439,243 @@
 1..5
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
+*** t5308-pack-detect-duplicates.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5308-pack-detect-duplicates/.git/
+checking prerequisite: SHA1
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
+	test $(git hash-object /dev/null) = e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
+
+)
+prerequisite SHA1 ok
+expecting success: 
+	create_pack no-dups.pack 1 &&
+	git index-pack --stdin <no-dups.pack
+
+pack	2b6334c837f829fc85b8483b099737d46872fcf1
+ok 1 - pack with no duplicates
+
+expecting success: 
+	clear_packs &&
+	create_pack dups.pack 100 &&
+	git index-pack --stdin <dups.pack
+
+pack	9452d1779e83b02a99c82f7dd97a9ed27464a46e
+ok 2 - index-pack will allow duplicate objects by default
+
+expecting success: 
+	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 3 - create batch-check test vectors
+
+expecting success: 
+	git cat-file --batch-check <input >actual &&
+	test_cmp expect actual
+
+ok 4 - lookup in duplicated pack
+
+expecting success: 
+	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 5 - index-pack can reject packs with duplicates
+
+# passed all 5 test(s)
+1..5
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t5306-pack-nobase.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5306-pack-nobase/.git/
+expecting success: for a in a b c d e f g h i; do echo $a >>text; done &&
+     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: 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/git-2.20.1/t/trash directory.t5306-pack-nobase/patch_clone/.git/
+e7abdab0f3c5ab309336e143f3d6b42d048ece07
+f9037bf6e8d95d31af48907ab2c93c2d6c2c7fcd
+ok 2 - setup patch_clone
+
+expecting success: (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/git-2.20.1/t/trash directory.t5306-pack-nobase/user_clone/.git/
+From ../
+ * branch            HEAD       -> FETCH_HEAD
+From ../patch_clone/
+ * branch            HEAD       -> FETCH_HEAD
+Updating e7abdab..2ebb794
+Fast-forward
+ text | 11 +----------
+ 1 file changed, 1 insertion(+), 10 deletions(-)
+ok 3 - indirectly clone patch_clone
+
+expecting success: (mkdir user_direct &&
+      cd user_direct &&
+      git init &&
+      test_must_fail git fetch ../patch_clone/.git
+     )
+    
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5306-pack-nobase/user_direct/.git/
+remote: error: Could not read eb0fdbccaebe2b78b63cd0eeab0cdba49a71d67e        
+remote: fatal: Failed to traverse parents of commit e7abdab0f3c5ab309336e143f3d6b42d048ece07        
+error: git upload-pack: git-pack-objects died with error.
+fatal: git upload-pack: aborting due to possible repository corruption on the remote side.
+remote: aborting due to possible repository corruption on the remote side.
+fatal: protocol error: bad pack header
+ok 4 - clone of patch_clone is incomplete
+
+# passed all 4 test(s)
+1..4
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t5309-pack-delta-cycles.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5309-pack-delta-cycles/.git/
+checking prerequisite: SHA1
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
+	test $(git hash-object /dev/null) = e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
+
+)
+prerequisite SHA1 ok
+expecting success: 
+	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: 
+	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: 
+	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: 
+	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
+
+checking known breakage: 
+	clear_packs &&
+	git index-pack --stdin <ab.pack &&
+	git index-pack --stdin --fix-thin <cycle.pack
+
+pack	8af524300e46c11647862073e882d467bc0dd22d
+BUG: builtin/index-pack.c:997: child->real_type != OBJ_REF_DELTA
+./test-lib.sh: line 685: 2663100 Aborted                 git index-pack --stdin --fix-thin < cycle.pack
+not ok 5 - failover to an object in another pack # TODO known breakage
+
+checking known breakage: 
+	clear_packs &&
+	{
+		pack_header 3 &&
+		pack_obj $A $B &&
+		pack_obj $B $A &&
+		pack_obj $A
+	} >recoverable.pack &&
+	pack_trailer recoverable.pack &&
+	git index-pack --fix-thin --stdin <recoverable.pack
+
+BUG: builtin/index-pack.c:997: child->real_type != OBJ_REF_DELTA
+./test-lib.sh: line 691: 2663319 Aborted                 git index-pack --fix-thin --stdin < recoverable.pack
+not ok 6 - failover to a duplicate object in the same pack # TODO known breakage
+
+# still have 2 known breakage(s)
+# passed all remaining 4 test(s)
+1..6
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
 *** t5305-include-tag.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5305-include-tag/.git/
 expecting success: 
@@ -141397,65 +141828,6 @@
 1..15
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t5308-pack-detect-duplicates.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5308-pack-detect-duplicates/.git/
-checking prerequisite: SHA1
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
-	test $(git hash-object /dev/null) = e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
-
-)
-prerequisite SHA1 ok
-expecting success: 
-	create_pack no-dups.pack 1 &&
-	git index-pack --stdin <no-dups.pack
-
-pack	2b6334c837f829fc85b8483b099737d46872fcf1
-ok 1 - pack with no duplicates
-
-expecting success: 
-	clear_packs &&
-	create_pack dups.pack 100 &&
-	git index-pack --stdin <dups.pack
-
-pack	9452d1779e83b02a99c82f7dd97a9ed27464a46e
-ok 2 - index-pack will allow duplicate objects by default
-
-expecting success: 
-	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 3 - create batch-check test vectors
-
-expecting success: 
-	git cat-file --batch-check <input >actual &&
-	test_cmp expect actual
-
-ok 4 - lookup in duplicated pack
-
-expecting success: 
-	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 5 - index-pack can reject packs with duplicates
-
-# passed all 5 test(s)
-1..5
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
 *** t5311-pack-bitmaps-shallow.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5311-pack-bitmaps-shallow/.git/
 expecting success: 
@@ -141468,15 +141840,15 @@
 	echo 1 >file &&
 	git commit -a -m repeat
 
-[master (root-commit) 0f18f56] orig
+[master (root-commit) ff666cc] orig
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 file
-[master ccacbf7] update
+[master d2f13dd] update
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 Cloning into bare repository 'shallow.git'...
-[master b7bb7d7] repeat
+[master eda902c] repeat
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 ok 1 - setup shallow repo
@@ -141497,106 +141869,6 @@
 1..3
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t5309-pack-delta-cycles.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5309-pack-delta-cycles/.git/
-checking prerequisite: SHA1
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
-	test $(git hash-object /dev/null) = e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
-
-)
-prerequisite SHA1 ok
-expecting success: 
-	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: 
-	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: 
-	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: 
-	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
-
-checking known breakage: 
-	clear_packs &&
-	git index-pack --stdin <ab.pack &&
-	git index-pack --stdin --fix-thin <cycle.pack
-
-pack	8af524300e46c11647862073e882d467bc0dd22d
-BUG: builtin/index-pack.c:997: child->real_type != OBJ_REF_DELTA
-Aborted
-not ok 5 - failover to an object in another pack # TODO known breakage
-
-checking known breakage: 
-	clear_packs &&
-	{
-		pack_header 3 &&
-		pack_obj $A $B &&
-		pack_obj $B $A &&
-		pack_obj $A
-	} >recoverable.pack &&
-	pack_trailer recoverable.pack &&
-	git index-pack --fix-thin --stdin <recoverable.pack
-
-BUG: builtin/index-pack.c:997: child->real_type != OBJ_REF_DELTA
-Aborted
-not ok 6 - failover to a duplicate object in the same pack # TODO known breakage
-
-# still have 2 known breakage(s)
-# passed all remaining 4 test(s)
-1..6
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
 *** t5314-pack-cycle-detection.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5314-pack-cycle-detection/.git/
 expecting success: 
@@ -141774,6 +142046,118 @@
 1..12
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
+*** t5315-pack-objects-compression.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5315-pack-objects-compression/.git/
+expecting success: 
+	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: 
+		test_when_finished "rm -f pack-*.*" &&
+		git $config pack-objects pack <object-name &&
+		sz=$(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: 
+		test_when_finished "rm -f pack-*.*" &&
+		git $config pack-objects pack <object-name &&
+		sz=$(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: 
+		test_when_finished "rm -f pack-*.*" &&
+		git $config pack-objects pack <object-name &&
+		sz=$(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: 
+		test_when_finished "rm -f pack-*.*" &&
+		git $config pack-objects pack <object-name &&
+		sz=$(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: 
+		test_when_finished "rm -f pack-*.*" &&
+		git $config pack-objects pack <object-name &&
+		sz=$(file_size pack-*.pack) &&
+		case "$expect" in
+		small) test "$sz" -le 100000 ;;
+		large) test "$sz" -ge 100000 ;;
+		esac
+	
+deee478811b863f9bb7b87717ddca65a1d6c6e18
+ok 6 - pack-objects with -c core.compression=0 -c pack.compression=9
+
+expecting success: 
+		test_when_finished "rm -f pack-*.*" &&
+		git $config pack-objects pack <object-name &&
+		sz=$(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: 
+		test_when_finished "rm -f pack-*.*" &&
+		git $config pack-objects pack <object-name &&
+		sz=$(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: 
+		test_when_finished "rm -f pack-*.*" &&
+		git $config pack-objects pack <object-name &&
+		sz=$(file_size pack-*.pack) &&
+		case "$expect" in
+		small) test "$sz" -le 100000 ;;
+		large) test "$sz" -ge 100000 ;;
+		esac
+	
+deee478811b863f9bb7b87717ddca65a1d6c6e18
+ok 9 - pack-objects with -c pack.compression=9
+
+# passed all 9 test(s)
+1..9
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
 *** t5313-pack-bounds-checks.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5313-pack-bounds-checks/.git/
 expecting success: 
@@ -141789,7 +142173,7 @@
 	cp $base base-backup/ &&
 	object=$(git rev-parse HEAD:file)
 
-[master (root-commit) 6290b9b] base
+[master (root-commit) e7e1ce3] base
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 file
@@ -141820,7 +142204,7 @@
 
 4+0 records in
 4+0 records out
-4 bytes copied, 6.9337e-05 s, 57.7 kB/s
+4 bytes copied, 7.124e-05 s, 56.1 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
@@ -141855,10 +142239,10 @@
 
 4+0 records in
 4+0 records out
-4 bytes copied, 7.0257e-05 s, 56.9 kB/s
+4 bytes copied, 0.00723017 s, 0.6 kB/s
 4+0 records in
 4+0 records out
-4 bytes copied, 7.241e-05 s, 55.2 kB/s
+4 bytes copied, 5.8715e-05 s, 68.1 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
@@ -141868,7 +142252,6 @@
 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 3 - matched bogus object count
 
@@ -141881,7 +142264,7 @@
 
 4+0 records in
 4+0 records out
-4 bytes copied, 7.3275e-05 s, 54.6 kB/s
+4 bytes copied, 6.6518e-05 s, 60.1 kB/s
 fatal: offset beyond end of packfile (truncated pack?)
 fatal: offset beyond end of packfile (truncated pack?)
 ok 4 - bogus object offset (v1)
@@ -141895,7 +142278,7 @@
 
 4+0 records in
 4+0 records out
-4 bytes copied, 6.666e-05 s, 60.0 kB/s
+4 bytes copied, 0.00335239 s, 1.2 kB/s
 fatal: offset beyond end of packfile (truncated pack?)
 fatal: offset beyond end of packfile (truncated pack?)
 ok 5 - bogus object offset (v2, no msb)
@@ -141909,7 +142292,7 @@
 
 4+0 records in
 4+0 records out
-4 bytes copied, 0.0070016 s, 0.6 kB/s
+4 bytes copied, 0.0192184 s, 0.2 kB/s
 fatal: offset beyond end of pack index for .git/objects/pack/pack-67be769e2843d598c78218852612520795998892.pack (truncated index?)
 fatal: offset beyond end of pack index for .git/objects/pack/pack-67be769e2843d598c78218852612520795998892.pack (truncated index?)
 ok 6 - bogus offset into v2 extended table
@@ -141940,10 +142323,10 @@
 
 1084+0 records in
 1084+0 records out
-1084 bytes (1.1 kB, 1.1 KiB) copied, 0.00178005 s, 609 kB/s
+1084 bytes (1.1 kB, 1.1 KiB) copied, 0.00176288 s, 615 kB/s
 40+0 records in
 40+0 records out
-40 bytes copied, 0.000114664 s, 349 kB/s
+40 bytes copied, 0.000114038 s, 351 kB/s
 fatal: offset beyond end of packfile (truncated pack?)
 fatal: offset beyond end of packfile (truncated pack?)
 ok 7 - bogus offset inside v2 extended table
@@ -141970,7 +142353,7 @@
 
 2+0 records in
 2+0 records out
-2 bytes copied, 6.0624e-05 s, 33.0 kB/s
+2 bytes copied, 5.7522e-05 s, 34.8 kB/s
 error: bad offset for revindex
 fatal: packed object 49fca29a258fafab9eb7e08a4325c335fa999cb6 (stored in .git/objects/pack/pack-8b2bcfe25ac8b931c950b271f97a8d767c427364.pack) is corrupt
 ok 8 - bogus OFS_DELTA in packfile
@@ -141979,118 +142362,6 @@
 1..8
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t5315-pack-objects-compression.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5315-pack-objects-compression/.git/
-expecting success: 
-	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: 
-		test_when_finished "rm -f pack-*.*" &&
-		git $config pack-objects pack <object-name &&
-		sz=$(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: 
-		test_when_finished "rm -f pack-*.*" &&
-		git $config pack-objects pack <object-name &&
-		sz=$(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: 
-		test_when_finished "rm -f pack-*.*" &&
-		git $config pack-objects pack <object-name &&
-		sz=$(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: 
-		test_when_finished "rm -f pack-*.*" &&
-		git $config pack-objects pack <object-name &&
-		sz=$(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: 
-		test_when_finished "rm -f pack-*.*" &&
-		git $config pack-objects pack <object-name &&
-		sz=$(file_size pack-*.pack) &&
-		case "$expect" in
-		small) test "$sz" -le 100000 ;;
-		large) test "$sz" -ge 100000 ;;
-		esac
-	
-deee478811b863f9bb7b87717ddca65a1d6c6e18
-ok 6 - pack-objects with -c core.compression=0 -c pack.compression=9
-
-expecting success: 
-		test_when_finished "rm -f pack-*.*" &&
-		git $config pack-objects pack <object-name &&
-		sz=$(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: 
-		test_when_finished "rm -f pack-*.*" &&
-		git $config pack-objects pack <object-name &&
-		sz=$(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: 
-		test_when_finished "rm -f pack-*.*" &&
-		git $config pack-objects pack <object-name &&
-		sz=$(file_size pack-*.pack) &&
-		case "$expect" in
-		small) test "$sz" -le 100000 ;;
-		large) test "$sz" -ge 100000 ;;
-		esac
-	
-deee478811b863f9bb7b87717ddca65a1d6c6e18
-ok 9 - pack-objects with -c pack.compression=9
-
-# passed all 9 test(s)
-1..9
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
 *** t5316-pack-delta-depth.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5316-pack-delta-depth/.git/
 expecting success: 
@@ -142112,44 +142383,44 @@
 		prev=$cur
 	done
 
-[master (root-commit) 98d6d3d] 1
+[master (root-commit) 1018276] 1
  Author: A U Thor <author@example.com>
  1 file changed, 0 insertions(+), 0 deletions(-)
  create mode 100644 file
 pack	88638646d0a7f1051038ae78ad0195c19aa7c5c8
-[master 4aa81a5] 2
+[master e644f37] 2
  Author: A U Thor <author@example.com>
  1 file changed, 0 insertions(+), 0 deletions(-)
 pack	711435b7279aca4d33efb91db771f9cf7725ff05
-[master ab4c2ac] 3
+[master 54cfa4e] 3
  Author: A U Thor <author@example.com>
  1 file changed, 0 insertions(+), 0 deletions(-)
 pack	46e7d03099b67170a542956fe351ceef9e70ff92
-[master 74c5519] 4
+[master a82d4d4] 4
  Author: A U Thor <author@example.com>
  1 file changed, 0 insertions(+), 0 deletions(-)
 pack	30ce91502db16f0438633eccad0bf358e5ade542
-[master 5b50c0d] 5
+[master ac73463] 5
  Author: A U Thor <author@example.com>
  1 file changed, 0 insertions(+), 0 deletions(-)
 pack	8cab6f2a4762ee6565a978b114f2cc3b20dbb987
-[master d10a2df] 6
+[master 5d18492] 6
  Author: A U Thor <author@example.com>
  1 file changed, 0 insertions(+), 0 deletions(-)
 pack	36e62c0a922f9fdd0eaa885dbbd08ea34de4ecc9
-[master a04a08d] 7
+[master e599e7e] 7
  Author: A U Thor <author@example.com>
  1 file changed, 0 insertions(+), 0 deletions(-)
 pack	07f2e882a14adf7568f1e390177bbf8f9731ef78
-[master 84b74a1] 8
+[master 88affb9] 8
  Author: A U Thor <author@example.com>
  1 file changed, 0 insertions(+), 0 deletions(-)
 pack	9514d2d071de63aee58c0b845108590565255b15
-[master b7fbe71] 9
+[master e8340e3] 9
  Author: A U Thor <author@example.com>
  1 file changed, 0 insertions(+), 0 deletions(-)
 pack	b604d4190b1d2a96d6304eb045f3fbc6f2f9ab97
-[master 9e105d8] 10
+[master 99d9389] 10
  Author: A U Thor <author@example.com>
  1 file changed, 0 insertions(+), 0 deletions(-)
 pack	83f4c28b023cb2892e2574bcca33931b75bc600a
@@ -142177,6 +142448,32 @@
 1..3
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
+*** t5321-pack-large-objects.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5321-pack-large-objects/.git/
+expecting success: 
+	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: 
+	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/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
 *** t5303-pack-corruption-resilience.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5303-pack-corruption-resilience/.git/
 expecting success: create_test_files &&
@@ -142201,7 +142498,7 @@
      test_must_fail git cat-file blob $blob_3 > /dev/null
 1+0 records in
 1+0 records out
-1 byte copied, 5.345e-05 s, 18.7 kB/s
+1 byte copied, 4.1179e-05 s, 24.3 kB/s
 fatal: pack has bad object at offset 12: unknown object type 0
 error: unknown object type 0 at offset 12 in .git/objects/pack/pack-bbfb7489c21eaac49a086215e1c3699ef989f595.pack
 fatal: packed object 06686a2094b7518d92cd6e26efaab209b398ebd3 (stored in .git/objects/pack/pack-bbfb7489c21eaac49a086215e1c3699ef989f595.pack) is corrupt
@@ -142317,7 +142614,7 @@
 .git/objects/pack/pack-bbfb7489c21eaac49a086215e1c3699ef989f595.pack: ok
 1+0 records in
 1+0 records out
-1 byte copied, 5.2143e-05 s, 19.2 kB/s
+1 byte copied, 3.9429e-05 s, 25.4 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
@@ -142411,7 +142708,7 @@
 .git/objects/pack/pack-bbfb7489c21eaac49a086215e1c3699ef989f595.pack: ok
 1+0 records in
 1+0 records out
-1 byte copied, 6.168e-05 s, 16.2 kB/s
+1 byte copied, 4.3582e-05 s, 22.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
@@ -142452,7 +142749,7 @@
 .git/objects/pack/pack-417bd5d650269e28ec8026312b966d0bf1dab469.pack: ok
 1+0 records in
 1+0 records out
-1 byte copied, 5.201e-05 s, 19.2 kB/s
+1 byte copied, 0.000137958 s, 7.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
@@ -142494,7 +142791,7 @@
 .git/objects/pack/pack-417bd5d650269e28ec8026312b966d0bf1dab469.pack: ok
 1+0 records in
 1+0 records out
-1 byte copied, 4.9918e-05 s, 20.0 kB/s
+1 byte copied, 4.5588e-05 s, 21.9 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
@@ -142545,7 +142842,7 @@
      git cat-file blob $blob_3 > /dev/null
 1+0 records in
 1+0 records out
-1 byte copied, 4.3185e-05 s, 23.2 kB/s
+1 byte copied, 4.7851e-05 s, 20.9 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
@@ -142572,7 +142869,7 @@
 .git/objects/pack/pack-417bd5d650269e28ec8026312b966d0bf1dab469.pack: ok
 2+0 records in
 2+0 records out
-2 bytes copied, 5.2287e-05 s, 38.3 kB/s
+2 bytes copied, 4.9336e-05 s, 40.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
@@ -142613,7 +142910,7 @@
 .git/objects/pack/pack-bbfb7489c21eaac49a086215e1c3699ef989f595.pack: ok
 2+0 records in
 2+0 records out
-2 bytes copied, 5.0539e-05 s, 39.6 kB/s
+2 bytes copied, 4.2731e-05 s, 46.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
@@ -143111,1540 +143408,89 @@
 1..26
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t5321-pack-large-objects.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5321-pack-large-objects/.git/
+*** t5402-post-merge-hook.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5402-post-merge-hook/.git/
 expecting success: 
-	clear_packs &&
-	{
-		pack_header 2 &&
-		pack_obj $A $B &&
-		pack_obj $B
-	} >ab.pack &&
-	pack_trailer ab.pack &&
-	git index-pack --stdin <ab.pack
+	echo Data for commit0. >a &&
+	git update-index --add a &&
+	tree0=$(git write-tree) &&
+	commit0=$(echo setup | git commit-tree $tree0) &&
+	echo Changed data for commit1. >a &&
+	git update-index a &&
+	tree1=$(git write-tree) &&
+	commit1=$(echo modify | git commit-tree $tree1 -p $commit0) &&
+        git update-ref refs/heads/master $commit0 &&
+	git clone ./. clone1 &&
+	GIT_DIR=clone1/.git git update-index --add a &&
+	git clone ./. clone2 &&
+	GIT_DIR=clone2/.git git update-index --add a
 
-pack	8af524300e46c11647862073e882d467bc0dd22d
+Cloning into 'clone1'...
+done.
+Cloning into 'clone2'...
+done.
 ok 1 - setup
 
 expecting success: 
-	printf "%s\\n" $A $B |
-	GIT_TEST_OE_DELTA_SIZE=2 git pack-objects tmp-pack
+        GIT_DIR=clone1/.git git merge $commit0 &&
+	! test -f clone1/.git/post-merge.args
 
-aee080dc5b8a48f951541c0ad63f65af48847a6f
-ok 2 - repack large deltas
+Already up to date.
+ok 2 - post-merge does not run for up-to-date 
 
-# passed all 2 test(s)
-1..2
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t3421-rebase-topology-linear.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3421-rebase-topology-linear/.git/
 expecting success: 
-	test_commit a &&
-	test_commit b &&
-	test_commit c &&
-	git checkout b &&
-	test_commit d &&
-	test_commit e
+        GIT_DIR=clone1/.git git merge $commit1 &&
+	test -e clone1/.git/post-merge.args
 
-[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: checking out 'b'.
+Updating de4f33a..1f7c8b3
+Fast-forward
+ a | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 3 - post-merge runs as expected 
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by performing another checkout.
+expecting success: 
+        grep 0 clone1/.git/post-merge.args
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
+0
+ok 4 - post-merge from normal merge receives the right argument 
 
-  git checkout -b <new-branch-name>
+expecting success: 
+        GIT_DIR=clone2/.git git merge --squash $commit1 &&
+	test -e clone2/.git/post-merge.args
 
-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
+Updating de4f33a..1f7c8b3
+Fast-forward
+Squash commit -- not updating HEAD
+ a | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 5 - post-merge from squash merge runs as expected 
 
 expecting success: 
-		reset_rebase &&
-		git rebase  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 
+        grep 1 clone2/.git/post-merge.args
 
-expecting success: 
-		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
-First, rewinding head to replay your work on top of it...
-Merging c with HEAD~1
-Merging:
-d9ea348 c
-1bd0260 d
-found 1 common ancestor:
-020ea9b b
-[detached HEAD 73a53c6] d
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:16:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 d.t
-Committed: 0001 d
-Merging c with HEAD~0
-Merging:
-73a53c6 d
-67a7211 e
-found 1 common ancestor:
-1bd0260 d
-[detached HEAD 7d728d6] e
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:17:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 e.t
-Committed: 0002 e
-All done.
-ok 3 - simple rebase -m
+1
+ok 6 - post-merge from squash merge receives the right argument 
 
+# passed all 6 test(s)
+1..6
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t5320-delta-islands.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5320-delta-islands/.git/
 expecting success: 
-		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
-
-checking prerequisite: REBASE_P
+	commit one seed 1 &&
+	commit two seed 12
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
-	test -z "$GIT_TEST_SKIP_REBASE_P"
+one=babc1f87e2baa9f6ad764af981fccdd2da48016e
+two=ce1aaaff2e8846bd2f36b1a0317cacaec6fc257e
+ok 1 - setup commits
 
-)
-prerequisite REBASE_P ok
 expecting success: 
-		reset_rebase &&
-		git rebase -p 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 5 - simple rebase -p
-
-expecting success: 
-		reset_rebase &&
-		git rebase  b e &&
-		test_cmp_rev e HEAD
-	
-fatal: No rebase in progress?
-HEAD is now at 7d728d6 e
-Current branch e is up to date.
-ok 6 - rebase  is no-op if upstream is an ancestor
-
-expecting success: 
-		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: 
-		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: 
-		reset_rebase &&
-		git rebase -p b e &&
-		test_cmp_rev e HEAD
-	
-fatal: No rebase in progress?
-HEAD is now at 67a7211 e
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated detached HEAD.
-ok 9 - rebase -p is no-op if upstream is an ancestor
-
-expecting success: 
-		reset_rebase &&
-		git rebase  -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
-error: two revisions point to different objects:
-  'e': 67a72118d5806fada2b50e3a56bde3a2b3e5bc77
-  'HEAD': 354afb0674237d49586fff12326488e8e1d7737f
-ok 10 - rebase  -f rewrites even if upstream is an ancestor
-
-expecting success: 
-		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.
-First, rewinding head to replay your work on top of it...
-Merging b with HEAD~1
-Merging:
-020ea9b b
-1bd0260 d
-found 1 common ancestor:
-020ea9b b
-[detached HEAD ab4ddfd] d
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:16:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 d.t
-Committed: 0001 d
-Merging b with HEAD~0
-Merging:
-ab4ddfd d
-67a7211 e
-found 1 common ancestor:
-1bd0260 d
-[detached HEAD 354afb0] e
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:17:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 e.t
-Committed: 0002 e
-All done.
-error: two revisions point to different objects:
-  'e': 67a72118d5806fada2b50e3a56bde3a2b3e5bc77
-  'HEAD': 354afb0674237d49586fff12326488e8e1d7737f
-ok 11 - rebase -m -f rewrites even if upstream is an ancestor
-
-expecting success: 
-		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.
-error: two revisions point to different objects:
-  'e': 67a72118d5806fada2b50e3a56bde3a2b3e5bc77
-  'HEAD': 354afb0674237d49586fff12326488e8e1d7737f
-ok 12 - rebase -i -f rewrites even if upstream is an ancestor
-
-checking known breakage: 
-		reset_rebase &&
-		git rebase -p -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.
-not ok 13 - rebase -p -f rewrites even if upstream is an ancestor # TODO known breakage
-
-expecting success: 
-		reset_rebase &&
-		git rebase  e b &&
-		test_cmp_rev e HEAD
-	
-fatal: No rebase in progress?
-HEAD is now at 67a7211 e
-First, rewinding head to replay your work on top of it...
-Fast-forwarded b to e.
-ok 14 - rebase  fast-forwards from ancestor of upstream
-
-expecting success: 
-		reset_rebase &&
-		git rebase -m e b &&
-		test_cmp_rev e HEAD
-	
-fatal: No rebase in progress?
-HEAD is now at 67a7211 e
-First, rewinding head to replay your work on top of it...
-Fast-forwarded b to e.
-ok 15 - rebase -m fast-forwards from ancestor of upstream
-
-expecting success: 
-		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 16 - rebase -i fast-forwards from ancestor of upstream
-
-expecting success: 
-		reset_rebase &&
-		git rebase -p e b &&
-		test_cmp_rev e HEAD
-	
-fatal: No rebase in progress?
-HEAD is now at 67a7211 e
-Rebasing (1/1)
Successfully rebased and updated detached HEAD.
-ok 17 - rebase -p fast-forwards from ancestor of upstream
-
-expecting success: 
-	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
-Removing 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 18 - setup of linear history for range selection tests
-
-expecting success: 
-		reset_rebase &&
-		git rebase  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 19 - rebase  drops patches in upstream
-
-checking known breakage: 
-		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
-First, rewinding head to replay your work on top of it...
-Merging h with HEAD~2
-Merging:
-09e6546 h
-1bd0260 d
-found 1 common ancestor:
-020ea9b b
-[detached HEAD e937a8e] d
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:16:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 d.t
-Committed: 0001 d
-Merging h with HEAD~1
-Merging:
-e937a8e d
-00eccdb gp
-found 1 common ancestor:
-1bd0260 d
-[detached HEAD 4a12efe] gp
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:18:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 g.t
-Committed: 0002 gp
-Merging h with HEAD~0
-Merging:
-4a12efe gp
-3317c29 i
-found 1 common ancestor:
-00eccdb gp
-[detached HEAD bbe8f41] i
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:19:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 i.t
-Committed: 0003 i
-All done.
-error: two revisions point to different objects:
-  'h': 09e6546083fde009871b0716b2797b792e65e541
-  'HEAD~2': e937a8e882fbebb0b2205dd9459e6ecb99b2ab16
-not ok 20 - rebase -m drops patches in upstream # TODO known breakage
-
-expecting success: 
-		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 bbe8f41 i
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated detached HEAD.
-ok 21 - rebase -i drops patches in upstream
-
-expecting success: 
-		reset_rebase &&
-		git rebase -p 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
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated detached HEAD.
-ok 22 - rebase -p drops patches in upstream
-
-expecting success: 
-		reset_rebase &&
-		git rebase  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 23 - rebase  can drop last patch if in upstream
-
-checking known breakage: 
-		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
-First, rewinding head to replay your work on top of it...
-Merging h with HEAD~1
-Merging:
-09e6546 h
-1bd0260 d
-found 1 common ancestor:
-020ea9b b
-[detached HEAD e937a8e] d
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:16:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 d.t
-Committed: 0001 d
-Merging h with HEAD~0
-Merging:
-e937a8e d
-00eccdb gp
-found 1 common ancestor:
-1bd0260 d
-[detached HEAD 4a12efe] gp
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:18:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 g.t
-Committed: 0002 gp
-All done.
-error: two revisions point to different objects:
-  'h': 09e6546083fde009871b0716b2797b792e65e541
-  'HEAD^': e937a8e882fbebb0b2205dd9459e6ecb99b2ab16
-not ok 24 - rebase -m can drop last patch if in upstream # TODO known breakage
-
-expecting success: 
-		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 4a12efe gp
-Rebasing (1/1)
Successfully rebased and updated detached HEAD.
-ok 25 - rebase -i can drop last patch if in upstream
-
-expecting success: 
-		reset_rebase &&
-		git rebase -p h gp &&
-		test_cmp_rev h HEAD^ &&
-		test_linear_range 'd' h..
-	
-fatal: No rebase in progress?
-HEAD is now at e937a8e d
-Rebasing (1/1)
Successfully rebased and updated detached HEAD.
-ok 26 - rebase -p can drop last patch if in upstream
-
-expecting success: 
-		reset_rebase &&
-		git rebase  --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 27 - rebase  --onto drops patches in upstream
-
-checking known breakage: 
-		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
-First, rewinding head to replay your work on top of it...
-Merging f with HEAD~2
-Merging:
-09e072f f
-1bd0260 d
-found 1 common ancestor:
-020ea9b b
-[detached HEAD 1c3eee5] d
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:16:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 d.t
-Committed: 0001 d
-Merging f with HEAD~1
-Merging:
-1c3eee5 d
-00eccdb gp
-found 1 common ancestor:
-1bd0260 d
-[detached HEAD 348de6f] gp
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:18:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 g.t
-Committed: 0002 gp
-Merging f with HEAD~0
-Merging:
-348de6f gp
-3317c29 i
-found 1 common ancestor:
-00eccdb gp
-[detached HEAD 8a25459] i
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:19:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 i.t
-Committed: 0003 i
-All done.
-error: two revisions point to different objects:
-  'f': 09e072f8a9ef7b761fc545eb973e8013e674eb45
-  'HEAD~2': 1c3eee5a4db088a4573dc7e31a5817d3fc9323bd
-not ok 28 - rebase -m --onto drops patches in upstream # TODO known breakage
-
-expecting success: 
-		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 8a25459 i
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated detached HEAD.
-ok 29 - rebase -i --onto drops patches in upstream
-
-expecting success: 
-		reset_rebase &&
-		git rebase -p --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
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated detached HEAD.
-ok 30 - rebase -p --onto drops patches in upstream
-
-expecting success: 
-		reset_rebase &&
-		git rebase  --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  --onto does not drop patches in onto
-
-expecting success: 
-		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
-First, rewinding head to replay your work on top of it...
-Merging h with HEAD~2
-Merging:
-09e6546 h
-1bd0260 d
-found 1 common ancestor:
-020ea9b b
-[detached HEAD e937a8e] d
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:16:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 d.t
-Committed: 0001 d
-Merging h with HEAD~1
-Merging:
-e937a8e d
-00eccdb gp
-found 1 common ancestor:
-1bd0260 d
-[detached HEAD 4a12efe] gp
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:18:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 g.t
-Committed: 0002 gp
-Merging h with HEAD~0
-Merging:
-4a12efe gp
-3317c29 i
-found 1 common ancestor:
-00eccdb gp
-[detached HEAD bbe8f41] i
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:19:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 i.t
-Committed: 0003 i
-All done.
-ok 32 - rebase -m --onto does not drop patches in onto
-
-expecting success: 
-		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: 
-		reset_rebase &&
-		git rebase -p --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 34 - rebase -p --onto does not drop patches in onto
-
-expecting success: 
-	git checkout c &&
-	make_empty j &&
-	git checkout d &&
-	make_empty k &&
-	test_commit l
-
-Warning: you are leaving 3 commits behind, not connected to
-any of your branches:
-
-  bbe8f41 i
-  4a12efe gp
-  e937a8e d
-
-If you want to keep them by creating a new branch, this may be a good time
-to do so with:
-
- git branch <new-branch-name> bbe8f41
-
-HEAD is now at d9ea348 c
-[detached HEAD 5b67321] j
- Author: A U Thor <author@example.com>
-Previous HEAD position was 5b67321 j
-HEAD is now at 1bd0260 d
-[detached HEAD 753370d] k
- Author: A U Thor <author@example.com>
-[detached HEAD 49cf309] l
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 l.t
-ok 35 - setup of linear history for empty commit tests
-
-expecting success: 
-		reset_rebase &&
-		git rebase  c l &&
-		test_cmp_rev c HEAD~2 &&
-		test_linear_range 'd 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
-ok 36 - rebase  drops empty commit
-
-expecting success: 
-		reset_rebase &&
-		git rebase -m 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
-First, rewinding head to replay your work on top of it...
-Merging c with HEAD~2
-Merging:
-d9ea348 c
-1bd0260 d
-found 1 common ancestor:
-020ea9b b
-[detached HEAD bd3422f] d
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:16:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 d.t
-Committed: 0001 d
-Merging c with HEAD~1
-Merging:
-bd3422f d
-753370d k
-found 1 common ancestor:
-1bd0260 d
-Already up to date!
-Already applied: 0002 k
-Merging c with HEAD~0
-Merging:
-bd3422f d
-49cf309 l
-found 1 common ancestor:
-753370d k
-[detached HEAD ef60b8d] l
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:21:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 l.t
-Committed: 0003 l
-All done.
-ok 37 - rebase -m drops empty commit
-
-expecting success: 
-		reset_rebase &&
-		git rebase -i 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 38 - rebase -i drops empty commit
-
-expecting success: 
-		reset_rebase &&
-		git rebase -p 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 -p drops empty commit
-
-expecting success: 
-		reset_rebase &&
-		git rebase  --keep-empty c l &&
-		test_cmp_rev c HEAD~3 &&
-		test_linear_range 'd k l' c..
-	
-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  --keep-empty
-
-expecting success: 
-		reset_rebase &&
-		git rebase -m --keep-empty c l &&
-		test_cmp_rev c HEAD~3 &&
-		test_linear_range 'd k l' c..
-	
-fatal: No rebase in progress?
-HEAD is now at f90e7ce l
-Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated detached HEAD.
-ok 41 - rebase -m --keep-empty
-
-expecting success: 
-		reset_rebase &&
-		git rebase -i --keep-empty c l &&
-		test_cmp_rev c HEAD~3 &&
-		test_linear_range 'd k l' c..
-	
-fatal: No rebase in progress?
-HEAD is now at f90e7ce l
-Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated detached HEAD.
-ok 42 - rebase -i --keep-empty
-
-checking known breakage: 
-		reset_rebase &&
-		git rebase -p --keep-empty c l &&
-		test_cmp_rev c HEAD~3 &&
-		test_linear_range 'd k l' c..
-	
-fatal: No rebase in progress?
-HEAD is now at f90e7ce l
-Rebasing (1/3)
Rebasing (2/3)
Already up to date!
-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 reset'
-interactive rebase in progress; onto d9ea348
-Last commands done (2 commands done):
-   pick 1bd0260 d
-   pick 753370d k
-Next command to do (1 remaining command):
-   pick 49cf309 l
-You are currently rebasing.
-
-nothing to commit, working tree clean
-Could not pick 753370ddaccf1cee7fe7a98997789c7c2de20f79
-not ok 43 - rebase -p --keep-empty # TODO known breakage
-
-expecting success: 
-		reset_rebase &&
-		git rebase  --keep-empty j l &&
-		test_cmp_rev j HEAD~3 &&
-		test_linear_range 'd k l' j..
-	
-HEAD is now at 49cf309 l
-Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated detached HEAD.
-ok 44 - rebase  --keep-empty keeps empty even if already in upstream
-
-expecting success: 
-		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 5395ede l
-Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated detached HEAD.
-ok 45 - rebase -m --keep-empty keeps empty even if already in upstream
-
-expecting success: 
-		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 46 - rebase -i --keep-empty keeps empty even if already in upstream
-
-checking known breakage: 
-		reset_rebase &&
-		git rebase -p --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/2)
Rebasing (2/2)
Successfully rebased and updated detached HEAD.
-error: two revisions point to different objects:
-  'j': 5b67321bb4e1ef5cbccc64d00cd3c3f7768ff359
-  'HEAD~3': d9ea348e0fe8827f205c231ed0a5b8258841fd37
-not ok 47 - rebase -p --keep-empty keeps empty even if already in upstream # TODO known breakage
-
-expecting success: 
-		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 1612308 l
-Rebasing (1/5)
Rebasing (2/5)
Rebasing (3/5)
Rebasing (4/5)
Rebasing (5/5)
Successfully rebased and updated detached HEAD.
-ok 48 - rebase --rebase-merges --keep-empty keeps empty even if already in upstream
-
-expecting success: 
-	git checkout b &&
-	revert m b &&
-	git checkout --orphan disjoint &&
-	git rm -rf . &&
-	test_commit x &&
-	test_commit y &&
-	cherry_pick bp b
-
-Warning: you are leaving 3 commits behind, not connected to
-any of your branches:
-
-  5395ede l
-  9a731c2 k
-  60768b3 d
-
-If you want to keep them by creating a new branch, this may be a good time
-to do so with:
-
- git branch <new-branch-name> 5395ede
-
-HEAD is now at 020ea9b b
-Removing b.t
-[detached HEAD 6db5543] m
- Author: A U Thor <author@example.com>
- 1 file changed, 1 deletion(-)
- delete mode 100644 b.t
-Switched to a new branch 'disjoint'
-rm 'a.t'
-[disjoint (root-commit) 059091f] x
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 x.t
-[disjoint be1e399] y
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 y.t
-[disjoint b7cb922] bp
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b.t
-ok 49 - setup of linear history for test involving root
-
-expecting success: 
-		reset_rebase &&
-		git rebase  --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 50 - rebase  --onto --root
-
-expecting success: 
-		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
-First, rewinding head to replay your work on top of it...
-Merging c with HEAD~1
-Merging:
-d9ea348 c
-059091f x
-found 0 common ancestors:
-[detached HEAD ee9ba54] x
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:22:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 x.t
-Committed: 0001 x
-Merging c with HEAD~0
-Merging:
-ee9ba54 x
-be1e399 y
-found 1 common ancestor:
-059091f x
-[detached HEAD 7e2f0ad] y
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:23:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 y.t
-Committed: 0002 y
-All done.
-ok 51 - rebase -m --onto --root
-
-expecting success: 
-		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 52 - rebase -i --onto --root
-
-expecting success: 
-		reset_rebase &&
-		git rebase -p --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 53 - rebase -p --onto --root
-
-expecting success: 
-		reset_rebase &&
-		git rebase  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 54 - rebase  without --onto --root with disjoint history
-
-expecting success: 
-		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
-First, rewinding head to replay your work on top of it...
-Merging c with HEAD~1
-Merging:
-d9ea348 c
-059091f x
-found 0 common ancestors:
-[detached HEAD ee9ba54] x
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:22:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 x.t
-Committed: 0001 x
-Merging c with HEAD~0
-Merging:
-ee9ba54 x
-be1e399 y
-found 1 common ancestor:
-059091f x
-[detached HEAD 7e2f0ad] y
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:23:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 y.t
-Committed: 0002 y
-All done.
-ok 55 - rebase -m without --onto --root with disjoint history
-
-expecting success: 
-		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 56 - rebase -i without --onto --root with disjoint history
-
-checking known breakage: 
-		reset_rebase &&
-		git rebase -p 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/1)
Successfully rebased and updated detached HEAD.
-error: two revisions point to different objects:
-  'c': d9ea348e0fe8827f205c231ed0a5b8258841fd37
-  'HEAD~2': ce450c7fd6766cb1f2df873857da7b928ff743a8
-not ok 57 - rebase -p without --onto --root with disjoint history # TODO known breakage
-
-expecting success: 
-		reset_rebase &&
-		git rebase  --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 d9ea348 c
-First, rewinding head to replay your work on top of it...
-Applying: x
-Applying: y
-ok 58 - rebase  --onto --root drops patch in onto
-
-checking known breakage: 
-		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
-First, rewinding head to replay your work on top of it...
-Merging m with HEAD~2
-Merging:
-6db5543 m
-059091f x
-found 0 common ancestors:
-[detached HEAD b7663de] x
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:22:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 x.t
-Committed: 0001 x
-Merging m with HEAD~1
-Merging:
-b7663de x
-be1e399 y
-found 1 common ancestor:
-059091f x
-[detached HEAD 1daea3a] y
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:23:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 y.t
-Committed: 0002 y
-Merging m with HEAD~0
-Merging:
-1daea3a y
-b7cb922 bp
-found 1 common ancestor:
-be1e399 y
-[detached HEAD 1502f56] bp
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:23:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 b.t
-Committed: 0003 bp
-All done.
-error: two revisions point to different objects:
-  'm': 6db5543d43a2166fae6f6d320a0b715c6c1c4278
-  'HEAD~2': b7663de6ab4faf45f5f3c4005913aa77602cd1c5
-not ok 59 - rebase -m --onto --root drops patch in onto # TODO known breakage
-
-expecting success: 
-		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 1502f56 bp
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated detached HEAD.
-ok 60 - rebase -i --onto --root drops patch in onto
-
-expecting success: 
-		reset_rebase &&
-		git rebase -p --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
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated detached HEAD.
-ok 61 - rebase -p --onto --root drops patch in onto
-
-expecting success: 
-		reset_rebase &&
-		git rebase  --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 62 - rebase  --onto --root with merge-base does not go to root
-
-expecting success: 
-		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
-First, rewinding head to replay your work on top of it...
-Merging m with HEAD~1
-Merging:
-6db5543 m
-d9ea348 c
-found 1 common ancestor:
-020ea9b b
-[detached HEAD 68cd74b] c
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:15:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 c.t
-Committed: 0001 c
-Merging m with HEAD~0
-Merging:
-68cd74b c
-5573dba g
-found 1 common ancestor:
-d9ea348 c
-[detached HEAD 9921398] g
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:18:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 g.t
-Committed: 0002 g
-All done.
-ok 63 - rebase -m --onto --root with merge-base does not go to root
-
-expecting success: 
-		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 64 - rebase -i --onto --root with merge-base does not go to root
-
-checking known breakage: 
-		reset_rebase &&
-		git rebase -p --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.
-error: two revisions point to different objects:
-  'm': 6db5543d43a2166fae6f6d320a0b715c6c1c4278
-  'HEAD~2': 020ea9b5b2051d958f4737afacdc8821a33ac9a9
-not ok 65 - rebase -p --onto --root with merge-base does not go to root # TODO known breakage
-
-expecting success: 
-		reset_rebase &&
-		git rebase  m bp &&
-		test_cmp_rev m HEAD~2 &&
-		test_linear_range 'x y' m..
-	
-fatal: No rebase in progress?
-HEAD is now at 5573dba g
-First, rewinding head to replay your work on top of it...
-Applying: x
-Applying: y
-ok 66 - rebase  without --onto --root with disjoint history drops patch in onto
-
-checking known breakage: 
-		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
-First, rewinding head to replay your work on top of it...
-Merging m with HEAD~2
-Merging:
-6db5543 m
-059091f x
-found 0 common ancestors:
-[detached HEAD b7663de] x
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:22:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 x.t
-Committed: 0001 x
-Merging m with HEAD~1
-Merging:
-b7663de x
-be1e399 y
-found 1 common ancestor:
-059091f x
-[detached HEAD 1daea3a] y
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:23:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 y.t
-Committed: 0002 y
-Merging m with HEAD~0
-Merging:
-1daea3a y
-b7cb922 bp
-found 1 common ancestor:
-be1e399 y
-[detached HEAD 1502f56] bp
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:23:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 b.t
-Committed: 0003 bp
-All done.
-error: two revisions point to different objects:
-  'm': 6db5543d43a2166fae6f6d320a0b715c6c1c4278
-  'HEAD~2': b7663de6ab4faf45f5f3c4005913aa77602cd1c5
-not ok 67 - rebase -m without --onto --root with disjoint history drops patch in onto # TODO known breakage
-
-expecting success: 
-		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 1502f56 bp
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated detached HEAD.
-ok 68 - rebase -i without --onto --root with disjoint history drops patch in onto
-
-checking known breakage: 
-		reset_rebase &&
-		git rebase -p 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
-Rebasing (1/1)
Successfully rebased and updated detached HEAD.
-error: two revisions point to different objects:
-  'm': 6db5543d43a2166fae6f6d320a0b715c6c1c4278
-  'HEAD~2': ce450c7fd6766cb1f2df873857da7b928ff743a8
-not ok 69 - rebase -p without --onto --root with disjoint history drops patch in onto # TODO known breakage
-
-expecting success: 
-		reset_rebase &&
-		git rebase  --root c &&
-		test_cmp_rev c HEAD
-	
-fatal: No rebase in progress?
-HEAD is now at 6db5543 m
-Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated detached HEAD.
-ok 70 - rebase  --root on linear history is a no-op
-
-expecting success: 
-		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 71 - rebase -m --root on linear history is a no-op
-
-expecting success: 
-		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 72 - rebase -i --root on linear history is a no-op
-
-checking known breakage: 
-		reset_rebase &&
-		git rebase -p --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.
-error: two revisions point to different objects:
-  'c': d9ea348e0fe8827f205c231ed0a5b8258841fd37
-  'HEAD': 8b0b08f11e6fffcd7a364144d5399bf69ae313f5
-not ok 73 - rebase -p --root on linear history is a no-op # TODO known breakage
-
-expecting success: 
-		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 8b0b08f c
-Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated detached HEAD.
-error: two revisions point to different objects:
-  'a': ce450c7fd6766cb1f2df873857da7b928ff743a8
-  'HEAD~2': 060c4193c2500f886c89b8fa8d63916f8aa4d912
-ok 74 - rebase  -f --root on linear history causes re-write
-
-expecting success: 
-		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.
-error: two revisions point to different objects:
-  'a': ce450c7fd6766cb1f2df873857da7b928ff743a8
-  'HEAD~2': 060c4193c2500f886c89b8fa8d63916f8aa4d912
-ok 75 - rebase -m -f --root on linear history causes re-write
-
-expecting success: 
-		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.
-error: two revisions point to different objects:
-  'a': ce450c7fd6766cb1f2df873857da7b928ff743a8
-  'HEAD~2': 060c4193c2500f886c89b8fa8d63916f8aa4d912
-ok 76 - rebase -i -f --root on linear history causes re-write
-
-expecting success: 
-		reset_rebase &&
-		git rebase -p -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.
-error: two revisions point to different objects:
-  'a': ce450c7fd6766cb1f2df873857da7b928ff743a8
-  'HEAD~2': 060c4193c2500f886c89b8fa8d63916f8aa4d912
-ok 77 - rebase -p -f --root on linear history causes re-write
-
-# still have 12 known breakage(s)
-# passed all remaining 65 test(s)
-1..77
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t5402-post-merge-hook.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5402-post-merge-hook/.git/
-expecting success: 
-	echo Data for commit0. >a &&
-	git update-index --add a &&
-	tree0=$(git write-tree) &&
-	commit0=$(echo setup | git commit-tree $tree0) &&
-	echo Changed data for commit1. >a &&
-	git update-index a &&
-	tree1=$(git write-tree) &&
-	commit1=$(echo modify | git commit-tree $tree1 -p $commit0) &&
-        git update-ref refs/heads/master $commit0 &&
-	git clone ./. clone1 &&
-	GIT_DIR=clone1/.git git update-index --add a &&
-	git clone ./. clone2 &&
-	GIT_DIR=clone2/.git git update-index --add a
-
-Cloning into 'clone1'...
-done.
-Cloning into 'clone2'...
-done.
-ok 1 - setup
-
-expecting success: 
-        GIT_DIR=clone1/.git git merge $commit0 &&
-	! test -f clone1/.git/post-merge.args
-
-Already up to date.
-ok 2 - post-merge does not run for up-to-date 
-
-expecting success: 
-        GIT_DIR=clone1/.git git merge $commit1 &&
-	test -e clone1/.git/post-merge.args
-
-Updating 59a7d66..0d5e9b2
-Fast-forward
- a | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 3 - post-merge runs as expected 
-
-expecting success: 
-        grep 0 clone1/.git/post-merge.args
-
-0
-ok 4 - post-merge from normal merge receives the right argument 
-
-expecting success: 
-        GIT_DIR=clone2/.git git merge --squash $commit1 &&
-	test -e clone2/.git/post-merge.args
-
-Updating 59a7d66..0d5e9b2
-Fast-forward
-Squash commit -- not updating HEAD
- a | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 5 - post-merge from squash merge runs as expected 
-
-expecting success: 
-        grep 1 clone2/.git/post-merge.args
-
-1
-ok 6 - post-merge from squash merge receives the right argument 
-
-# passed all 6 test(s)
-1..6
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t5320-delta-islands.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5320-delta-islands/.git/
-expecting success: 
-	commit one seed 1 &&
-	commit two seed 12
-
-one=babc1f87e2baa9f6ad764af981fccdd2da48016e
-two=ce1aaaff2e8846bd2f36b1a0317cacaec6fc257e
-ok 1 - setup commits
-
-expecting success: 
-	git repack -adf &&
-	is_delta_base $one $two
-
-babc1f87e2baa9f6ad764af981fccdd2da48016e has base ce1aaaff2e8846bd2f36b1a0317cacaec6fc257e
-ok 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: 
 	git repack -adfi &&
@@ -144800,7 +143646,7 @@
 done.
 Cloning into 'clone2'...
 done.
-[master d66d6da] new2
+[master 015a428] new2
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 clone2/b
@@ -144871,72 +143717,6 @@
 1..8
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t5405-send-pack-rewind.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5405-send-pack-rewind/.git/
-expecting success: 
-
-	>file1 && git add file1 && test_tick &&
-	git commit -m Initial &&
-	git config receive.denyCurrentBranch warn &&
-
-	mkdir another && (
-		cd another &&
-		git init &&
-		git fetch --update-head-ok .. master:master
-	) &&
-
-	>file2 && git add file2 && test_tick &&
-	git commit -m Second
-
-
-[master (root-commit) de5945f] Initial
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 file1
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5405-send-pack-rewind/another/.git/
-From ..
- * [new branch]      master     -> master
-[master 3dc47c1] Second
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 file2
-ok 1 - setup
-
-expecting success: 
-
-	(
-		cd another &&
-		test_must_fail git push .. master:master
-	)
-
-
-To ..
- ! [rejected]        master -> master (fetch first)
-error: failed to push some refs to '..'
-hint: Updates were rejected because the remote contains work that you do
-hint: not have locally. This is usually caused by another repository pushing
-hint: to the same ref. You may want to first integrate the remote changes
-hint: (e.g., 'git pull ...') before pushing again.
-hint: See the 'Note about fast-forwards' in 'git push --help' for details.
-ok 2 - non forced push should die not segfault
-
-expecting success: 
-
-	(
-		cd another &&
-		git push .. +master:master
-	)
-
-
-remote: warning: updating the current branch        
-To ..
- + 3dc47c1...de5945f master -> master (forced update)
-ok 3 - forced push should succeed
-
-# passed all 3 test(s)
-1..3
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
 *** t5404-tracking-branches.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5404-tracking-branches/.git/
 expecting success: 
@@ -144954,18 +143734,18 @@
 	echo b2 >>file &&
 	git commit -a -m b2
 
-[master (root-commit) 4b20061] 1
+[master (root-commit) 1e11c97] 1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 file
 Cloning into 'aa'...
 done.
 Switched to branch 'b1'
-[b1 b7388b5] b1
+[b1 47d8870] b1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 Switched to branch 'b2'
-[b2 c6fd403] b2
+[b2 afb97bb] b2
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 ok 1 - setup
@@ -144986,17 +143766,17 @@
 
 Switched to a new branch 'b1'
 Branch 'b1' set up to track remote branch 'b1' from 'origin'.
-[b1 8f131fb] aa-b1
+[b1 4098788] aa-b1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 Switched to a new branch 'b2'
 Branch 'b2' set up to track remote branch 'b2' from 'origin'.
-[b2 8e6ee96] aa-b2
+[b2 ca0a8b4] aa-b2
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 Switched to branch 'master'
 Your branch is up to date with 'origin/master'.
-[master d1fc555] aa-master
+[master 32eccd9] aa-master
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 ok 2 - prepare pushable branches
@@ -145005,7 +143785,7 @@
 	test_must_fail git push origin :
 
 To /build/git-2.20.1/t/trash directory.t5404-tracking-branches/.
-   4b20061..d1fc555  master -> master
+   1e11c97..32eccd9  master -> master
  ! [rejected]        b1 -> b1 (fetch first)
  ! [rejected]        b2 -> b2 (fetch first)
 error: failed to push some refs to '/build/git-2.20.1/t/trash directory.t5404-tracking-branches/.'
@@ -145043,13 +143823,79 @@
 	git push origin :b3 >output 2>&1 &&
 	! grep "^error: " output
 
-Deleted remote-tracking branch origin/b3 (was 4b20061).
+Deleted remote-tracking branch origin/b3 (was 1e11c97).
 ok 7 - already deleted tracking branches ignored
 
 # passed all 7 test(s)
 1..7
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
+*** t5405-send-pack-rewind.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5405-send-pack-rewind/.git/
+expecting success: 
+
+	>file1 && git add file1 && test_tick &&
+	git commit -m Initial &&
+	git config receive.denyCurrentBranch warn &&
+
+	mkdir another && (
+		cd another &&
+		git init &&
+		git fetch --update-head-ok .. master:master
+	) &&
+
+	>file2 && git add file2 && test_tick &&
+	git commit -m Second
+
+
+[master (root-commit) de5945f] Initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 file1
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5405-send-pack-rewind/another/.git/
+From ..
+ * [new branch]      master     -> master
+[master 3dc47c1] Second
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 file2
+ok 1 - setup
+
+expecting success: 
+
+	(
+		cd another &&
+		test_must_fail git push .. master:master
+	)
+
+
+To ..
+ ! [rejected]        master -> master (fetch first)
+error: failed to push some refs to '..'
+hint: Updates were rejected because the remote contains work that you do
+hint: not have locally. This is usually caused by another repository pushing
+hint: to the same ref. You may want to first integrate the remote changes
+hint: (e.g., 'git pull ...') before pushing again.
+hint: See the 'Note about fast-forwards' in 'git push --help' for details.
+ok 2 - non forced push should die not segfault
+
+expecting success: 
+
+	(
+		cd another &&
+		git push .. +master:master
+	)
+
+
+remote: warning: updating the current branch        
+To ..
+ + 3dc47c1...de5945f master -> master (forced update)
+ok 3 - forced push should succeed
+
+# passed all 3 test(s)
+1..3
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
 *** t5406-remote-rejects.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5406-remote-rejects/.git/
 expecting success: 
@@ -145065,13 +143911,13 @@
 	echo 2 >file &&
 	git commit -a -m 2
 
-[master (root-commit) ff33fe0] 1
+[master (root-commit) f93386f] 1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 file
 Cloning into 'child'...
 done.
-[master 052cd0d] 2
+[master 6bf329e] 2
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 ok 1 - setup
@@ -145102,23 +143948,23 @@
 	done
 
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5317-pack-objects-filter-objects/r1/.git/
-[master (root-commit) f522de7] 1
+[master (root-commit) a2b9a77] 1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 file.1
-[master b23dbe3] 2
+[master cb85db8] 2
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 file.2
-[master 9b1f4ec] 3
+[master 2678983] 3
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 file.3
-[master 326732d] 4
+[master 6802e69] 4
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 file.4
-[master e97b25b] 5
+[master a11cc5a] 5
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 file.5
@@ -145142,7 +143988,7 @@
 
 	test_cmp expected observed
 
-0e984f27ce48a09317c73df10b607a5b2a9e9823
+295f8843b76cfc71f3a1eb83f2d0c41e7e6a61a0
 ok 2 - verify blob count in normal packfile
 
 expecting success: 
@@ -145159,7 +144005,7 @@
 	nr=$(wc -l <observed) &&
 	test 0 -eq $nr
 
-d9af2ca72d8971ee8f9c4bc4b133ba4ce621d6cb
+00c33293d68c568bc9644a458ab6d384db5026ee
 ok 3 - verify blob:none packfile has no blobs
 
 expecting success: 
@@ -145190,7 +144036,7 @@
 	grep "bad tree object" bad_tree
 
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5317-pack-objects-filter-objects/r5/.git/
-[master (root-commit) a56ef76] foo
+[master (root-commit) 2a3bdd5] foo
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 foo
@@ -145203,7 +144049,7 @@
 	git -C r1 add subtree/file &&
 	git -C r1 commit -m subtree
 
-[master abe6cad] subtree
+[master f3f59a6] subtree
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 subtree/file
@@ -145217,7 +144063,7 @@
 	git -C r1 verify-pack -v ../commitsonly.pack >objs &&
 	! grep -E "tree|blob" objs
 
-bc1e8a07bf68ab6519e60bdddcc3cc27a74a14ce
+95f1823c97b5d0cbe9dbbb9ceebaa4e0423192a2
 ok 7 - verify tree:0 packfile has no blobs or trees
 
 expecting success: 
@@ -145244,11 +144090,11 @@
 	done
 
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5317-pack-objects-filter-objects/r2/.git/
-[master (root-commit) b8da5a0] 1000
+[master (root-commit) e095ddd] 1000
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 large.1000
-[master a2472e1] 10000
+[master 880657e] 10000
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 large.10000
@@ -145271,7 +144117,7 @@
 
 	test_cmp expected observed
 
-05ce26fd2dfe70dd6e6452591d89a9158b17fbd4
+8411819efed7e933decb4233be7b4b2eaa4eae62
 ok 10 - verify blob count in normal packfile
 
 expecting success: 
@@ -145288,7 +144134,7 @@
 	nr=$(wc -l <observed) &&
 	test 0 -eq $nr
 
-d6b3a9156fe7438b54918cb07a0128f234228fdd
+690b004c58261cd47f0035544f70c57b25af8407
 ok 11 - verify blob:limit=500 omits all blobs
 
 expecting success: 
@@ -145305,7 +144151,7 @@
 	nr=$(wc -l <observed) &&
 	test 0 -eq $nr
 
-d6b3a9156fe7438b54918cb07a0128f234228fdd
+690b004c58261cd47f0035544f70c57b25af8407
 ok 12 - verify blob:limit=1000
 
 expecting success: 
@@ -145325,7 +144171,7 @@
 
 	test_cmp expected observed
 
-d6d3fe862730e67f400f6ab8c98e1c37dcf97df4
+f8ef969fec8e8db2a9a1e8f4c0c2985792e8d180
 ok 13 - verify blob:limit=1001
 
 expecting success: 
@@ -145345,7 +144191,7 @@
 
 	test_cmp expected observed
 
-05ce26fd2dfe70dd6e6452591d89a9158b17fbd4
+8411819efed7e933decb4233be7b4b2eaa4eae62
 ok 14 - verify blob:limit=10001
 
 expecting success: 
@@ -145365,7 +144211,7 @@
 
 	test_cmp expected observed
 
-d6d3fe862730e67f400f6ab8c98e1c37dcf97df4
+f8ef969fec8e8db2a9a1e8f4c0c2985792e8d180
 ok 15 - verify blob:limit=1k
 
 expecting success: 
@@ -145386,7 +144232,7 @@
 
 	test_cmp expected observed
 
-82fcc0695da46de3373127beb02278a96d54cf98
+9f56ffb6c07c4adbb8f09efc6e9733a0a30da9e9
 ok 16 - verify explicitly specifying oversized blob in input
 
 expecting success: 
@@ -145406,7 +144252,7 @@
 
 	test_cmp expected observed
 
-05ce26fd2dfe70dd6e6452591d89a9158b17fbd4
+8411819efed7e933decb4233be7b4b2eaa4eae62
 ok 17 - verify blob:limit=1m
 
 expecting success: 
@@ -145439,7 +144285,7 @@
 	echo sparse1 >pattern2
 
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5317-pack-objects-filter-objects/r3/.git/
-[master (root-commit) 55ea5d3] sparse
+[master (root-commit) 031ab5e] sparse
  Author: A U Thor <author@example.com>
  4 files changed, 4 insertions(+)
  create mode 100644 dir1/sparse1
@@ -145466,7 +144312,7 @@
 
 	test_cmp expected observed
 
-ee226ab766f20793ec8f26e91ac3746252cca172
+b32f57c5f27cad074f8a6d44534c15d331673df0
 ok 20 - verify blob count in normal packfile
 
 expecting success: 
@@ -145486,7 +144332,7 @@
 
 	test_cmp expected observed
 
-2d551e659bdbd0f0444d95fc7336377731c5de3d
+058a18a0c00bb978ed2d2ff5546d0b7ba7156321
 ok 21 - verify sparse:path=pattern1
 
 expecting success: 
@@ -145521,7 +144367,7 @@
 
 	test_cmp expected observed
 
-6952c0d0c31b444f191e5af08783558c36ba0bee
+51ea583a04c3d2712bee419fef80420e738765af
 ok 23 - verify sparse:path=pattern2
 
 expecting success: 
@@ -145554,7 +144400,7 @@
 	git -C r4 commit -m "pattern"
 
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5317-pack-objects-filter-objects/r4/.git/
-[master (root-commit) 6ad5850] pattern
+[master (root-commit) 7c794a1] pattern
  Author: A U Thor <author@example.com>
  5 files changed, 5 insertions(+)
  create mode 100644 dir1/sparse1
@@ -145582,7 +144428,7 @@
 
 	test_cmp expected observed
 
-8aacc0844c9171a682914bb8c2893c2035269231
+692d9f21b6b58c4cf03b3e3233fd48dd0dba8946
 ok 26 - verify blob count in normal packfile
 
 expecting success: 
@@ -145603,7 +144449,7 @@
 
 	test_cmp expected observed
 
-f63e9289e5f51fb69e0be4da38b636faf7581360
+776e4671dffc9ac2cd01ba9eb91c43404fc0731a
 ok 27 - verify sparse:oid=OID
 
 expecting success: 
@@ -145623,7 +144469,7 @@
 
 	test_cmp expected observed
 
-f63e9289e5f51fb69e0be4da38b636faf7581360
+776e4671dffc9ac2cd01ba9eb91c43404fc0731a
 ok 28 - verify sparse:oid=oid-ish
 
 expecting success: 
@@ -145666,6 +144512,392 @@
 1..32
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
+*** t5408-send-pack-stdin.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5408-send-pack-stdin/.git/
+expecting success: 
+	cat >refs <<-\EOF &&
+	refs/heads/A
+	refs/heads/C
+	refs/tags/D
+	refs/heads/B
+	refs/tags/E
+	EOF
+	for i in $(cat refs); do
+		create_ref $i || return 1
+	done
+
+ok 1 - setup refs
+
+expecting success: 
+	clear_remote &&
+	git send-pack remote.git $(cat refs) &&
+	for i in $(cat refs); do
+		verify_push $i || return 1
+	done
+
+Initialized empty Git repository in /build/git-2.20.1/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: 
+	clear_remote &&
+	git send-pack remote.git --stdin <refs &&
+	for i in $(cat refs); do
+		verify_push $i || return 1
+	done
+
+Initialized empty Git repository in /build/git-2.20.1/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: 
+	clear_remote &&
+	echo "A:other" >input &&
+	git send-pack remote.git --stdin <input &&
+	verify_push refs/heads/A refs/heads/other
+
+Initialized empty Git repository in /build/git-2.20.1/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: 
+	clear_remote &&
+	echo A >input &&
+	git send-pack remote.git --stdin B <input &&
+	verify_push A &&
+	verify_push B
+
+Initialized empty Git repository in /build/git-2.20.1/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: 
+	clear_remote &&
+	test_must_fail git send-pack remote.git A:foo B:foo &&
+	verify_push A foo
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5408-send-pack-stdin/remote.git/
+remote: error: cannot lock ref 'refs/heads/foo': reference already exists        
+To remote.git
+ * [new branch]      A -> foo
+ ! [remote rejected] B -> foo (failed to update ref)
+ok 6 - cmdline refs written in order
+
+expecting success: 
+	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/git-2.20.1/t/trash directory.t5408-send-pack-stdin/remote.git/
+remote: error: cannot lock ref 'refs/heads/foo': reference already exists        
+To remote.git
+ * [new branch]      B -> foo
+ ! [remote rejected] A -> foo (failed to update ref)
+ok 7 - --stdin refs come after cmdline
+
+expecting success: 
+	clear_remote &&
+	test_must_fail git send-pack remote.git --mirror $(cat refs)
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5408-send-pack-stdin/remote.git/
+usage: git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> [<ref>...]
+  --all and explicit <ref> specification are mutually exclusive.
+
+    -v, --verbose         be more verbose
+    -q, --quiet           be more quiet
+    --receive-pack <receive-pack>
+                          receive pack program
+    --exec <receive-pack>
+                          receive pack program
+    --remote <remote>     remote name
+    --all                 push all refs
+    -n, --dry-run         dry run
+    --mirror              mirror all refs
+    -f, --force           force updates
+    --signed[=(yes|no|if-asked)]
+                          GPG sign the push
+    --push-option <server-specific>
+                          option to transmit
+    --progress            force progress reporting
+    --thin                use thin pack
+    --atomic              request atomic transaction on remote side
+    --stateless-rpc       use stateless RPC protocol
+    --stdin               read refs from stdin
+    --helper-status       print status from remote helper
+    --force-with-lease[=<refname>:<expect>]
+                          require old value of ref to be at this value
+
+ok 8 - refspecs and --mirror do not mix (cmdline)
+
+expecting success: 
+	clear_remote &&
+	test_must_fail git send-pack remote.git --mirror --stdin <refs
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5408-send-pack-stdin/remote.git/
+usage: git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> [<ref>...]
+  --all and explicit <ref> specification are mutually exclusive.
+
+    -v, --verbose         be more verbose
+    -q, --quiet           be more quiet
+    --receive-pack <receive-pack>
+                          receive pack program
+    --exec <receive-pack>
+                          receive pack program
+    --remote <remote>     remote name
+    --all                 push all refs
+    -n, --dry-run         dry run
+    --mirror              mirror all refs
+    -f, --force           force updates
+    --signed[=(yes|no|if-asked)]
+                          GPG sign the push
+    --push-option <server-specific>
+                          option to transmit
+    --progress            force progress reporting
+    --thin                use thin pack
+    --atomic              request atomic transaction on remote side
+    --stateless-rpc       use stateless RPC protocol
+    --stdin               read refs from stdin
+    --helper-status       print status from remote helper
+    --force-with-lease[=<refname>:<expect>]
+                          require old value of ref to be at this value
+
+ok 9 - refspecs and --mirror do not mix (stdin)
+
+# passed all 9 test(s)
+1..9
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t5409-colorize-remote-messages.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5409-colorize-remote-messages/.git/
+expecting success: 
+	mkdir .git/hooks &&
+	write_script .git/hooks/update <<-\EOF &&
+	echo error: error
+	echo ERROR: also highlighted
+	echo hint: hint
+	echo hinting: not highlighted
+	echo success: success
+	echo warning: warning
+	echo prefixerror: error
+	echo " " "error: leading space"
+	echo "    "
+	echo Err
+	exit 0
+	EOF
+	echo 1 >file &&
+	git add file &&
+	git commit -m 1 &&
+	git clone . child &&
+	(
+		cd child &&
+		test_commit message2 file content2
+	)
+
+[master (root-commit) f93386f] 1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+Cloning into 'child'...
+done.
+[master 8b3d96c] message2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 1 - setup
+
+expecting success: 
+	git --git-dir child/.git -c color.remote=always push -f origin HEAD:refs/heads/keywords 2>output &&
+	test_decode_color <output >decoded &&
+	grep "<BOLD;RED>error<RESET>: error" decoded &&
+	grep "<YELLOW>hint<RESET>:" decoded &&
+	grep "<BOLD;GREEN>success<RESET>:" decoded &&
+	grep "<BOLD;YELLOW>warning<RESET>:" decoded
+
+remote: <BOLD;RED>error<RESET>: error        
+remote: <YELLOW>hint<RESET>: hint        
+remote: <BOLD;GREEN>success<RESET>: success        
+remote: <BOLD;YELLOW>warning<RESET>: warning        
+ok 2 - keywords
+
+expecting success: 
+	git --git-dir child/.git -c color.remote=always push -f origin HEAD:refs/heads/whole-words 2>output &&
+	test_decode_color <output >decoded &&
+	grep "<YELLOW>hint<RESET>:" decoded &&
+	grep "hinting: not highlighted" decoded &&
+	grep "prefixerror: error" decoded
+
+remote: <YELLOW>hint<RESET>: hint        
+remote: hinting: not highlighted        
+remote: prefixerror: error        
+ok 3 - whole words at line start
+
+expecting success: 
+	git -C child -c color.remote=always push -f origin HEAD:short-line 2>output &&
+	test_decode_color <output >decoded &&
+	grep "remote: Err" decoded
+
+remote: Err        
+ok 4 - short line
+
+expecting success: 
+	git --git-dir child/.git -c color.remote=always push -f origin HEAD:refs/heads/case-insensitive 2>output &&
+	cat output &&
+	test_decode_color <output >decoded &&
+	grep "<BOLD;RED>error<RESET>: error" decoded &&
+	grep "<BOLD;RED>ERROR<RESET>: also highlighted" decoded
+
+remote: error: error        
+remote: ERROR: also highlighted        
+remote: hint: hint        
+remote: hinting: not highlighted        
+remote: success: success        
+remote: warning: warning        
+remote: prefixerror: error        
+remote:   error: leading space        
+remote:             
+remote: Err        
+To /build/git-2.20.1/t/trash directory.t5409-colorize-remote-messages/.
+ * [new branch]      HEAD -> case-insensitive
+remote: <BOLD;RED>error<RESET>: error        
+remote: <BOLD;RED>ERROR<RESET>: also highlighted        
+ok 5 - case-insensitive
+
+expecting success: 
+	git --git-dir child/.git -c color.remote=always push -f origin HEAD:refs/heads/leading-space 2>output &&        cat output &&
+	test_decode_color <output >decoded &&
+	grep "  <BOLD;RED>error<RESET>: leading space" decoded
+
+remote: error: error        
+remote: ERROR: also highlighted        
+remote: hint: hint        
+remote: hinting: not highlighted        
+remote: success: success        
+remote: warning: warning        
+remote: prefixerror: error        
+remote:   error: leading space        
+remote:             
+remote: Err        
+To /build/git-2.20.1/t/trash directory.t5409-colorize-remote-messages/.
+ * [new branch]      HEAD -> leading-space
+remote:   <BOLD;RED>error<RESET>: leading space        
+ok 6 - leading space
+
+expecting success: 
+	git -C child -c color.remote=always push -f origin HEAD:only-space 2>output &&
+	test_decode_color <output >decoded &&
+	grep "remote:     " decoded
+
+remote:             
+ok 7 - spaces only
+
+expecting success: 
+	git --git-dir child/.git push -f origin HEAD:refs/heads/redirected-output 2>output &&
+	test_decode_color <output >decoded &&
+	grep "error: error" decoded
+
+remote: error: error        
+remote: prefixerror: error        
+ok 8 - no coloring for redirected output
+
+expecting success: 
+	git --git-dir child/.git -c color.remote=always -c color.remote.error=blue push -f origin HEAD:refs/heads/customized-color 2>output &&
+	test_decode_color <output >decoded &&
+	grep "<BLUE>error<RESET>:" decoded &&
+	grep "<BOLD;GREEN>success<RESET>:" decoded
+
+remote: <BLUE>error<RESET>: error        
+remote:   <BLUE>error<RESET>: leading space        
+remote: <BOLD;GREEN>success<RESET>: success        
+ok 9 - push with customized color
+
+expecting success: 
+	git --git-dir child/.git -c color.remote=always -c color.remote.error=i-am-not-a-color push -f origin HEAD:refs/heads/error-customized-color 2>output &&
+	test_decode_color <output >decoded &&
+	grep "<BOLD;GREEN>success<RESET>:" decoded
+
+remote: <BOLD;GREEN>success<RESET>: success        
+ok 10 - error in customized color
+
+expecting success: 
+	git --git-dir child/.git -c color.ui=always push -f origin HEAD:refs/heads/fallback-color-ui 2>output &&
+	test_decode_color <output >decoded &&
+	grep "<BOLD;RED>error<RESET>: error" decoded
+
+remote: <BOLD;RED>error<RESET>: error        
+ok 11 - fallback to color.ui
+
+# passed all 11 test(s)
+1..11
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t5410-receive-pack-alternates.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5410-receive-pack-alternates/.git/
+expecting success: 
+	test_commit base &&
+	git clone -s --bare . fork &&
+	git checkout -b public/branch master &&
+	test_commit public &&
+	git checkout -b private/branch master &&
+	test_commit private
+
+[master (root-commit) d1ff1c9] base
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 base.t
+Cloning into bare repository 'fork'...
+done.
+Switched to a new branch 'public/branch'
+[public/branch d7bb355] public
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 public.t
+Switched to a new branch 'private/branch'
+[private/branch 9725dbe] private
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 private.t
+ok 1 - setup
+
+expecting success: 
+	write_script fork/alternate-refs <<-\EOF &&
+		git --git-dir="$1" for-each-ref \
+			--format="%(objectname)" \
+			refs/heads/public/
+	EOF
+	test_config -C fork core.alternateRefsCommand ./alternate-refs &&
+	git rev-parse public/branch >expect &&
+	printf "0000" | git receive-pack fork >actual &&
+	extract_haves <actual >actual.haves &&
+	test_cmp expect actual.haves
+
+ok 2 - with core.alternateRefsCommand
+
+expecting success: 
+	test_config -C fork core.alternateRefsPrefixes "refs/heads/private" &&
+	git rev-parse private/branch >expect &&
+	printf "0000" | git receive-pack fork >actual &&
+	extract_haves <actual >actual.haves &&
+	test_cmp expect actual.haves
+
+ok 3 - with core.alternateRefsPrefixes
+
+# passed all 3 test(s)
+1..3
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
 *** t5310-pack-bitmaps.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5310-pack-bitmaps/.git/
 expecting success: 
@@ -146163,7 +145395,7 @@
 	type jgit
 
 )
-jgit: not found
+./test-lib.sh: line 686: type: jgit: not found
 prerequisite JGIT not satisfied
 skipping test: we can read jgit bitmaps 
 	git clone --bare . compat-jgit.git &&
@@ -146406,392 +145638,6 @@
 1..46
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t5408-send-pack-stdin.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5408-send-pack-stdin/.git/
-expecting success: 
-	cat >refs <<-\EOF &&
-	refs/heads/A
-	refs/heads/C
-	refs/tags/D
-	refs/heads/B
-	refs/tags/E
-	EOF
-	for i in $(cat refs); do
-		create_ref $i || return 1
-	done
-
-ok 1 - setup refs
-
-expecting success: 
-	clear_remote &&
-	git send-pack remote.git $(cat refs) &&
-	for i in $(cat refs); do
-		verify_push $i || return 1
-	done
-
-Initialized empty Git repository in /build/git-2.20.1/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: 
-	clear_remote &&
-	git send-pack remote.git --stdin <refs &&
-	for i in $(cat refs); do
-		verify_push $i || return 1
-	done
-
-Initialized empty Git repository in /build/git-2.20.1/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: 
-	clear_remote &&
-	echo "A:other" >input &&
-	git send-pack remote.git --stdin <input &&
-	verify_push refs/heads/A refs/heads/other
-
-Initialized empty Git repository in /build/git-2.20.1/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: 
-	clear_remote &&
-	echo A >input &&
-	git send-pack remote.git --stdin B <input &&
-	verify_push A &&
-	verify_push B
-
-Initialized empty Git repository in /build/git-2.20.1/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: 
-	clear_remote &&
-	test_must_fail git send-pack remote.git A:foo B:foo &&
-	verify_push A foo
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5408-send-pack-stdin/remote.git/
-remote: error: cannot lock ref 'refs/heads/foo': reference already exists        
-To remote.git
- * [new branch]      A -> foo
- ! [remote rejected] B -> foo (failed to update ref)
-ok 6 - cmdline refs written in order
-
-expecting success: 
-	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/git-2.20.1/t/trash directory.t5408-send-pack-stdin/remote.git/
-remote: error: cannot lock ref 'refs/heads/foo': reference already exists        
-To remote.git
- * [new branch]      B -> foo
- ! [remote rejected] A -> foo (failed to update ref)
-ok 7 - --stdin refs come after cmdline
-
-expecting success: 
-	clear_remote &&
-	test_must_fail git send-pack remote.git --mirror $(cat refs)
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5408-send-pack-stdin/remote.git/
-usage: git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> [<ref>...]
-  --all and explicit <ref> specification are mutually exclusive.
-
-    -v, --verbose         be more verbose
-    -q, --quiet           be more quiet
-    --receive-pack <receive-pack>
-                          receive pack program
-    --exec <receive-pack>
-                          receive pack program
-    --remote <remote>     remote name
-    --all                 push all refs
-    -n, --dry-run         dry run
-    --mirror              mirror all refs
-    -f, --force           force updates
-    --signed[=(yes|no|if-asked)]
-                          GPG sign the push
-    --push-option <server-specific>
-                          option to transmit
-    --progress            force progress reporting
-    --thin                use thin pack
-    --atomic              request atomic transaction on remote side
-    --stateless-rpc       use stateless RPC protocol
-    --stdin               read refs from stdin
-    --helper-status       print status from remote helper
-    --force-with-lease[=<refname>:<expect>]
-                          require old value of ref to be at this value
-
-ok 8 - refspecs and --mirror do not mix (cmdline)
-
-expecting success: 
-	clear_remote &&
-	test_must_fail git send-pack remote.git --mirror --stdin <refs
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5408-send-pack-stdin/remote.git/
-usage: git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> [<ref>...]
-  --all and explicit <ref> specification are mutually exclusive.
-
-    -v, --verbose         be more verbose
-    -q, --quiet           be more quiet
-    --receive-pack <receive-pack>
-                          receive pack program
-    --exec <receive-pack>
-                          receive pack program
-    --remote <remote>     remote name
-    --all                 push all refs
-    -n, --dry-run         dry run
-    --mirror              mirror all refs
-    -f, --force           force updates
-    --signed[=(yes|no|if-asked)]
-                          GPG sign the push
-    --push-option <server-specific>
-                          option to transmit
-    --progress            force progress reporting
-    --thin                use thin pack
-    --atomic              request atomic transaction on remote side
-    --stateless-rpc       use stateless RPC protocol
-    --stdin               read refs from stdin
-    --helper-status       print status from remote helper
-    --force-with-lease[=<refname>:<expect>]
-                          require old value of ref to be at this value
-
-ok 9 - refspecs and --mirror do not mix (stdin)
-
-# passed all 9 test(s)
-1..9
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t5409-colorize-remote-messages.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5409-colorize-remote-messages/.git/
-expecting success: 
-	mkdir .git/hooks &&
-	write_script .git/hooks/update <<-\EOF &&
-	echo error: error
-	echo ERROR: also highlighted
-	echo hint: hint
-	echo hinting: not highlighted
-	echo success: success
-	echo warning: warning
-	echo prefixerror: error
-	echo " " "error: leading space"
-	echo "    "
-	echo Err
-	exit 0
-	EOF
-	echo 1 >file &&
-	git add file &&
-	git commit -m 1 &&
-	git clone . child &&
-	(
-		cd child &&
-		test_commit message2 file content2
-	)
-
-[master (root-commit) 825ec43] 1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-Cloning into 'child'...
-done.
-[master 769f53e] message2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 1 - setup
-
-expecting success: 
-	git --git-dir child/.git -c color.remote=always push -f origin HEAD:refs/heads/keywords 2>output &&
-	test_decode_color <output >decoded &&
-	grep "<BOLD;RED>error<RESET>: error" decoded &&
-	grep "<YELLOW>hint<RESET>:" decoded &&
-	grep "<BOLD;GREEN>success<RESET>:" decoded &&
-	grep "<BOLD;YELLOW>warning<RESET>:" decoded
-
-remote: <BOLD;RED>error<RESET>: error        
-remote: <YELLOW>hint<RESET>: hint        
-remote: <BOLD;GREEN>success<RESET>: success        
-remote: <BOLD;YELLOW>warning<RESET>: warning        
-ok 2 - keywords
-
-expecting success: 
-	git --git-dir child/.git -c color.remote=always push -f origin HEAD:refs/heads/whole-words 2>output &&
-	test_decode_color <output >decoded &&
-	grep "<YELLOW>hint<RESET>:" decoded &&
-	grep "hinting: not highlighted" decoded &&
-	grep "prefixerror: error" decoded
-
-remote: <YELLOW>hint<RESET>: hint        
-remote: hinting: not highlighted        
-remote: prefixerror: error        
-ok 3 - whole words at line start
-
-expecting success: 
-	git -C child -c color.remote=always push -f origin HEAD:short-line 2>output &&
-	test_decode_color <output >decoded &&
-	grep "remote: Err" decoded
-
-remote: Err        
-ok 4 - short line
-
-expecting success: 
-	git --git-dir child/.git -c color.remote=always push -f origin HEAD:refs/heads/case-insensitive 2>output &&
-	cat output &&
-	test_decode_color <output >decoded &&
-	grep "<BOLD;RED>error<RESET>: error" decoded &&
-	grep "<BOLD;RED>ERROR<RESET>: also highlighted" decoded
-
-remote: error: error        
-remote: ERROR: also highlighted        
-remote: hint: hint        
-remote: hinting: not highlighted        
-remote: success: success        
-remote: warning: warning        
-remote: prefixerror: error        
-remote:   error: leading space        
-remote:             
-remote: Err        
-To /build/git-2.20.1/t/trash directory.t5409-colorize-remote-messages/.
- * [new branch]      HEAD -> case-insensitive
-remote: <BOLD;RED>error<RESET>: error        
-remote: <BOLD;RED>ERROR<RESET>: also highlighted        
-ok 5 - case-insensitive
-
-expecting success: 
-	git --git-dir child/.git -c color.remote=always push -f origin HEAD:refs/heads/leading-space 2>output &&        cat output &&
-	test_decode_color <output >decoded &&
-	grep "  <BOLD;RED>error<RESET>: leading space" decoded
-
-remote: error: error        
-remote: ERROR: also highlighted        
-remote: hint: hint        
-remote: hinting: not highlighted        
-remote: success: success        
-remote: warning: warning        
-remote: prefixerror: error        
-remote:   error: leading space        
-remote:             
-remote: Err        
-To /build/git-2.20.1/t/trash directory.t5409-colorize-remote-messages/.
- * [new branch]      HEAD -> leading-space
-remote:   <BOLD;RED>error<RESET>: leading space        
-ok 6 - leading space
-
-expecting success: 
-	git -C child -c color.remote=always push -f origin HEAD:only-space 2>output &&
-	test_decode_color <output >decoded &&
-	grep "remote:     " decoded
-
-remote:             
-ok 7 - spaces only
-
-expecting success: 
-	git --git-dir child/.git push -f origin HEAD:refs/heads/redirected-output 2>output &&
-	test_decode_color <output >decoded &&
-	grep "error: error" decoded
-
-remote: error: error        
-remote: prefixerror: error        
-ok 8 - no coloring for redirected output
-
-expecting success: 
-	git --git-dir child/.git -c color.remote=always -c color.remote.error=blue push -f origin HEAD:refs/heads/customized-color 2>output &&
-	test_decode_color <output >decoded &&
-	grep "<BLUE>error<RESET>:" decoded &&
-	grep "<BOLD;GREEN>success<RESET>:" decoded
-
-remote: <BLUE>error<RESET>: error        
-remote:   <BLUE>error<RESET>: leading space        
-remote: <BOLD;GREEN>success<RESET>: success        
-ok 9 - push with customized color
-
-expecting success: 
-	git --git-dir child/.git -c color.remote=always -c color.remote.error=i-am-not-a-color push -f origin HEAD:refs/heads/error-customized-color 2>output &&
-	test_decode_color <output >decoded &&
-	grep "<BOLD;GREEN>success<RESET>:" decoded
-
-remote: <BOLD;GREEN>success<RESET>: success        
-ok 10 - error in customized color
-
-expecting success: 
-	git --git-dir child/.git -c color.ui=always push -f origin HEAD:refs/heads/fallback-color-ui 2>output &&
-	test_decode_color <output >decoded &&
-	grep "<BOLD;RED>error<RESET>: error" decoded
-
-remote: <BOLD;RED>error<RESET>: error        
-ok 11 - fallback to color.ui
-
-# passed all 11 test(s)
-1..11
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t5410-receive-pack-alternates.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5410-receive-pack-alternates/.git/
-expecting success: 
-	test_commit base &&
-	git clone -s --bare . fork &&
-	git checkout -b public/branch master &&
-	test_commit public &&
-	git checkout -b private/branch master &&
-	test_commit private
-
-[master (root-commit) d1ff1c9] base
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 base.t
-Cloning into bare repository 'fork'...
-done.
-Switched to a new branch 'public/branch'
-[public/branch d7bb355] public
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 public.t
-Switched to a new branch 'private/branch'
-[private/branch 9725dbe] private
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 private.t
-ok 1 - setup
-
-expecting success: 
-	write_script fork/alternate-refs <<-\EOF &&
-		git --git-dir="$1" for-each-ref \
-			--format="%(objectname)" \
-			refs/heads/public/
-	EOF
-	test_config -C fork core.alternateRefsCommand ./alternate-refs &&
-	git rev-parse public/branch >expect &&
-	printf "0000" | git receive-pack fork >actual &&
-	extract_haves <actual >actual.haves &&
-	test_cmp expect actual.haves
-
-ok 2 - with core.alternateRefsCommand
-
-expecting success: 
-	test_config -C fork core.alternateRefsPrefixes "refs/heads/private" &&
-	git rev-parse private/branch >expect &&
-	printf "0000" | git receive-pack fork >actual &&
-	extract_haves <actual >actual.haves &&
-	test_cmp expect actual.haves
-
-ok 3 - with core.alternateRefsPrefixes
-
-# passed all 3 test(s)
-1..3
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
 *** t5502-quickfetch.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5502-quickfetch/.git/
 expecting success: 
@@ -147958,752 +146804,1478 @@
 1..7
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t5319-multi-pack-index.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5319-multi-pack-index/.git/
-expecting success: 
-	test_when_finished rm -f pack/multi-pack-index &&
-	git multi-pack-index --object-dir=. write &&
-	midx_read_expect 0 0 4 .
-
-ok 1 - write midx with no packs
-
+*** t3421-rebase-topology-linear.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3421-rebase-topology-linear/.git/
 expecting success: 
-	test_commit initial &&
-	for i in $(test_seq 1 5)
-	do
-		generate_objects $i
-	done &&
-	commit_and_list_objects
+	test_commit a &&
+	test_commit b &&
+	test_commit c &&
+	git checkout b &&
+	test_commit d &&
+	test_commit e
 
-[master (root-commit) 24b24cf] initial
+[master (root-commit) ce450c7] a
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-HEAD is now at cd0747a
-ok 2 - create objects
+ 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: checking out 'b'.
 
-expecting success: 
-	pack=$(git pack-objects --index-version=1 $objdir/pack/test <obj-list) &&
-	test_when_finished rm $objdir/pack/test-$pack.pack \
-		$objdir/pack/test-$pack.idx $objdir/pack/multi-pack-index &&
-	git multi-pack-index --object-dir=$objdir write &&
-	midx_read_expect 1 18 4 $objdir
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by performing another checkout.
 
-ok 3 - write midx with one v1 pack
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -b with the checkout command again. Example:
 
-expecting success: 
-	git pack-objects --index-version=2,0x40 $objdir/pack/test <obj-list &&
-	git multi-pack-index --object-dir=$objdir write &&
-	midx_read_expect 1 18 4 $objdir
+  git checkout -b <new-branch-name>
 
-a10c8cef352773b1f1b38ecc868f417f3d6029c9
-ok 4 - write midx with one v2 pack
+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: 
-		midx_git_two_modes "rev-list --objects --all" &&
-		midx_git_two_modes "log --raw" &&
-		midx_git_two_modes "count-objects --verbose" &&
-		midx_git_two_modes "cat-file --batch-all-objects --buffer --batch-check" &&
-		midx_git_two_modes "cat-file --batch-all-objects --buffer --batch-check --unsorted" sorted
+		reset_rebase &&
+		git rebase  c e &&
+		test_cmp_rev c HEAD~2 &&
+		test_linear_range 'd e' c..
 	
-error: unknown option `unsorted'
-usage: git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -p | <type> | --textconv | --filters) [--path=<path>] <object>
-   or: git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --filters]
+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 
 
-<type> can be one of: blob, tree, commit, tag
-    -t                    show object type
-    -s                    show object size
-    -e                    exit with zero when there's no error
-    -p                    pretty-print object's content
-    --textconv            for blob objects, run textconv on object's content
-    --filters             for blob objects, run filters on object's content
-    --path <blob>         use a specific path for --textconv/--filters
-    --allow-unknown-type  allow -s and -t to work with broken/corrupt objects
-    --buffer              buffer --batch output
-    --batch[=<format>]    show info and content of objects fed from the standard input
-    --batch-check[=<format>]
-                          show info about objects fed from the standard input
-    --follow-symlinks     follow in-tree symlinks (used with --batch or --batch-check)
-    --batch-all-objects   show all objects with --batch or --batch-check
-    --unordered           do not order --batch-all-objects output
+expecting success: 
+		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
+First, rewinding head to replay your work on top of it...
+Merging c with HEAD~1
+Merging:
+d9ea348 c
+1bd0260 d
+found 1 common ancestor:
+020ea9b b
+[detached HEAD 73a53c6] d
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:16:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 d.t
+Committed: 0001 d
+Merging c with HEAD~0
+Merging:
+73a53c6 d
+67a7211 e
+found 1 common ancestor:
+1bd0260 d
+[detached HEAD 7d728d6] e
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:17:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 e.t
+Committed: 0002 e
+All done.
+ok 3 - simple rebase -m
 
-error: unknown option `unsorted'
-usage: git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -p | <type> | --textconv | --filters) [--path=<path>] <object>
-   or: git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --filters]
+expecting success: 
+		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
 
-<type> can be one of: blob, tree, commit, tag
-    -t                    show object type
-    -s                    show object size
-    -e                    exit with zero when there's no error
-    -p                    pretty-print object's content
-    --textconv            for blob objects, run textconv on object's content
-    --filters             for blob objects, run filters on object's content
-    --path <blob>         use a specific path for --textconv/--filters
-    --allow-unknown-type  allow -s and -t to work with broken/corrupt objects
-    --buffer              buffer --batch output
-    --batch[=<format>]    show info and content of objects fed from the standard input
-    --batch-check[=<format>]
-                          show info about objects fed from the standard input
-    --follow-symlinks     follow in-tree symlinks (used with --batch or --batch-check)
-    --batch-all-objects   show all objects with --batch or --batch-check
-    --unordered           do not order --batch-all-objects output
+checking prerequisite: REBASE_P
 
-ok 5 - check normal git operations: one v2 pack
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
+	test -z "$GIT_TEST_SKIP_REBASE_P"
 
+)
+prerequisite REBASE_P ok
 expecting success: 
-	for i in $(test_seq 6 10)
-	do
-		generate_objects $i
-	done &&
-	commit_and_list_objects
-
-HEAD is now at 9650f03
-ok 6 - add more objects
+		reset_rebase &&
+		git rebase -p 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 5 - simple rebase -p
 
 expecting success: 
-	git pack-objects --index-version=1 $objdir/pack/test-2 <obj-list &&
-	git multi-pack-index --object-dir=$objdir write &&
-	midx_read_expect 2 34 4 $objdir
-
-0994129a102d56705c119b91822cbd6ef1599f8f
-ok 7 - write midx with two packs
+		reset_rebase &&
+		git rebase  b e &&
+		test_cmp_rev e HEAD
+	
+fatal: No rebase in progress?
+HEAD is now at 7d728d6 e
+Current branch e is up to date.
+ok 6 - rebase  is no-op if upstream is an ancestor
 
 expecting success: 
-		midx_git_two_modes "rev-list --objects --all" &&
-		midx_git_two_modes "log --raw" &&
-		midx_git_two_modes "count-objects --verbose" &&
-		midx_git_two_modes "cat-file --batch-all-objects --buffer --batch-check" &&
-		midx_git_two_modes "cat-file --batch-all-objects --buffer --batch-check --unsorted" sorted
+		reset_rebase &&
+		git rebase -m b e &&
+		test_cmp_rev e HEAD
 	
-error: unknown option `unsorted'
-usage: git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -p | <type> | --textconv | --filters) [--path=<path>] <object>
-   or: git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --filters]
+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
 
-<type> can be one of: blob, tree, commit, tag
-    -t                    show object type
-    -s                    show object size
-    -e                    exit with zero when there's no error
-    -p                    pretty-print object's content
-    --textconv            for blob objects, run textconv on object's content
-    --filters             for blob objects, run filters on object's content
-    --path <blob>         use a specific path for --textconv/--filters
-    --allow-unknown-type  allow -s and -t to work with broken/corrupt objects
-    --buffer              buffer --batch output
-    --batch[=<format>]    show info and content of objects fed from the standard input
-    --batch-check[=<format>]
-                          show info about objects fed from the standard input
-    --follow-symlinks     follow in-tree symlinks (used with --batch or --batch-check)
-    --batch-all-objects   show all objects with --batch or --batch-check
-    --unordered           do not order --batch-all-objects output
+expecting success: 
+		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
 
-error: unknown option `unsorted'
-usage: git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -p | <type> | --textconv | --filters) [--path=<path>] <object>
-   or: git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --filters]
+expecting success: 
+		reset_rebase &&
+		git rebase -p b e &&
+		test_cmp_rev e HEAD
+	
+fatal: No rebase in progress?
+HEAD is now at 67a7211 e
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated detached HEAD.
+ok 9 - rebase -p is no-op if upstream is an ancestor
 
-<type> can be one of: blob, tree, commit, tag
-    -t                    show object type
-    -s                    show object size
-    -e                    exit with zero when there's no error
-    -p                    pretty-print object's content
-    --textconv            for blob objects, run textconv on object's content
-    --filters             for blob objects, run filters on object's content
-    --path <blob>         use a specific path for --textconv/--filters
-    --allow-unknown-type  allow -s and -t to work with broken/corrupt objects
-    --buffer              buffer --batch output
-    --batch[=<format>]    show info and content of objects fed from the standard input
-    --batch-check[=<format>]
-                          show info about objects fed from the standard input
-    --follow-symlinks     follow in-tree symlinks (used with --batch or --batch-check)
-    --batch-all-objects   show all objects with --batch or --batch-check
-    --unordered           do not order --batch-all-objects output
+expecting success: 
+		reset_rebase &&
+		git rebase  -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
+error: two revisions point to different objects:
+  'e': 67a72118d5806fada2b50e3a56bde3a2b3e5bc77
+  'HEAD': 354afb0674237d49586fff12326488e8e1d7737f
+ok 10 - rebase  -f rewrites even if upstream is an ancestor
 
-ok 8 - check normal git operations: two packs
+expecting success: 
+		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.
+First, rewinding head to replay your work on top of it...
+Merging b with HEAD~1
+Merging:
+020ea9b b
+1bd0260 d
+found 1 common ancestor:
+020ea9b b
+[detached HEAD ab4ddfd] d
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:16:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 d.t
+Committed: 0001 d
+Merging b with HEAD~0
+Merging:
+ab4ddfd d
+67a7211 e
+found 1 common ancestor:
+1bd0260 d
+[detached HEAD 354afb0] e
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:17:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 e.t
+Committed: 0002 e
+All done.
+error: two revisions point to different objects:
+  'e': 67a72118d5806fada2b50e3a56bde3a2b3e5bc77
+  'HEAD': 354afb0674237d49586fff12326488e8e1d7737f
+ok 11 - rebase -m -f rewrites even if upstream is an ancestor
 
 expecting success: 
-	for j in $(test_seq 11 20)
-	do
-		generate_objects $j &&
-		commit_and_list_objects &&
-		git pack-objects --index-version=2 $objdir/pack/test-pack <obj-list
-	done
+		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.
+error: two revisions point to different objects:
+  'e': 67a72118d5806fada2b50e3a56bde3a2b3e5bc77
+  'HEAD': 354afb0674237d49586fff12326488e8e1d7737f
+ok 12 - rebase -i -f rewrites even if upstream is an ancestor
 
-HEAD is now at b415cb4
-4c6d8ddb029b2809c9258616e15d919036135381
-HEAD is now at 3e2c62c
-1d8476b3e6c9041b953f8d970be906a61d86e9b3
-HEAD is now at 07c6d1f
-d2e5559686bb7fa03381e06d89e575c002e7877a
-HEAD is now at e2467d3
-4885e9566d4b7767d46a2de15594b706a00227ad
-HEAD is now at 047779e
-711553cae61e2a02b26974c7b6367f9dd8a2dd9e
-HEAD is now at 449cf21
-44a23559d57770dcd870b620d9c90b83b8b1dd7d
-HEAD is now at c4c6a87
-0329a72b9cac741e369a25111f9a7141e7af5809
-HEAD is now at 66c7cd9
-481644606c70ac050f24a3f7a78d1d12407e24cd
-HEAD is now at 523abe2
-1b5ae1b8c7f825dd70c1b2bd9d38143b8d9093e8
-HEAD is now at 552d56d
-283663f1cf4f2bfdb8d263c035369396648a8162
-ok 9 - add more packs
+checking known breakage: 
+		reset_rebase &&
+		git rebase -p -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.
+not ok 13 - rebase -p -f rewrites even if upstream is an ancestor # TODO known breakage
 
 expecting success: 
-		midx_git_two_modes "rev-list --objects --all" &&
-		midx_git_two_modes "log --raw" &&
-		midx_git_two_modes "count-objects --verbose" &&
-		midx_git_two_modes "cat-file --batch-all-objects --buffer --batch-check" &&
-		midx_git_two_modes "cat-file --batch-all-objects --buffer --batch-check --unsorted" sorted
+		reset_rebase &&
+		git rebase  e b &&
+		test_cmp_rev e HEAD
 	
-error: unknown option `unsorted'
-usage: git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -p | <type> | --textconv | --filters) [--path=<path>] <object>
-   or: git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --filters]
-
-<type> can be one of: blob, tree, commit, tag
-    -t                    show object type
-    -s                    show object size
-    -e                    exit with zero when there's no error
-    -p                    pretty-print object's content
-    --textconv            for blob objects, run textconv on object's content
-    --filters             for blob objects, run filters on object's content
-    --path <blob>         use a specific path for --textconv/--filters
-    --allow-unknown-type  allow -s and -t to work with broken/corrupt objects
-    --buffer              buffer --batch output
-    --batch[=<format>]    show info and content of objects fed from the standard input
-    --batch-check[=<format>]
-                          show info about objects fed from the standard input
-    --follow-symlinks     follow in-tree symlinks (used with --batch or --batch-check)
-    --batch-all-objects   show all objects with --batch or --batch-check
-    --unordered           do not order --batch-all-objects output
+fatal: No rebase in progress?
+HEAD is now at 67a7211 e
+First, rewinding head to replay your work on top of it...
+Fast-forwarded b to e.
+ok 14 - rebase  fast-forwards from ancestor of upstream
 
-error: unknown option `unsorted'
-usage: git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -p | <type> | --textconv | --filters) [--path=<path>] <object>
-   or: git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --filters]
+expecting success: 
+		reset_rebase &&
+		git rebase -m e b &&
+		test_cmp_rev e HEAD
+	
+fatal: No rebase in progress?
+HEAD is now at 67a7211 e
+First, rewinding head to replay your work on top of it...
+Fast-forwarded b to e.
+ok 15 - rebase -m fast-forwards from ancestor of upstream
 
-<type> can be one of: blob, tree, commit, tag
-    -t                    show object type
-    -s                    show object size
-    -e                    exit with zero when there's no error
-    -p                    pretty-print object's content
-    --textconv            for blob objects, run textconv on object's content
-    --filters             for blob objects, run filters on object's content
-    --path <blob>         use a specific path for --textconv/--filters
-    --allow-unknown-type  allow -s and -t to work with broken/corrupt objects
-    --buffer              buffer --batch output
-    --batch[=<format>]    show info and content of objects fed from the standard input
-    --batch-check[=<format>]
-                          show info about objects fed from the standard input
-    --follow-symlinks     follow in-tree symlinks (used with --batch or --batch-check)
-    --batch-all-objects   show all objects with --batch or --batch-check
-    --unordered           do not order --batch-all-objects output
+expecting success: 
+		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 16 - rebase -i fast-forwards from ancestor of upstream
 
-ok 10 - check normal git operations: mixed mode (two packs + extra)
+expecting success: 
+		reset_rebase &&
+		git rebase -p e b &&
+		test_cmp_rev e HEAD
+	
+fatal: No rebase in progress?
+HEAD is now at 67a7211 e
+Rebasing (1/1)
Successfully rebased and updated detached HEAD.
+ok 17 - rebase -p fast-forwards from ancestor of upstream
 
 expecting success: 
-	git multi-pack-index --object-dir=$objdir write &&
-	midx_read_expect 12 74 4 $objdir
+	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
 
-ok 11 - write midx with twelve packs
+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
+Removing 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 18 - setup of linear history for range selection tests
 
 expecting success: 
-		midx_git_two_modes "rev-list --objects --all" &&
-		midx_git_two_modes "log --raw" &&
-		midx_git_two_modes "count-objects --verbose" &&
-		midx_git_two_modes "cat-file --batch-all-objects --buffer --batch-check" &&
-		midx_git_two_modes "cat-file --batch-all-objects --buffer --batch-check --unsorted" sorted
+		reset_rebase &&
+		git rebase  h i &&
+		test_cmp_rev h HEAD~2 &&
+		test_linear_range 'd i' h..
 	
-error: unknown option `unsorted'
-usage: git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -p | <type> | --textconv | --filters) [--path=<path>] <object>
-   or: git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --filters]
-
-<type> can be one of: blob, tree, commit, tag
-    -t                    show object type
-    -s                    show object size
-    -e                    exit with zero when there's no error
-    -p                    pretty-print object's content
-    --textconv            for blob objects, run textconv on object's content
-    --filters             for blob objects, run filters on object's content
-    --path <blob>         use a specific path for --textconv/--filters
-    --allow-unknown-type  allow -s and -t to work with broken/corrupt objects
-    --buffer              buffer --batch output
-    --batch[=<format>]    show info and content of objects fed from the standard input
-    --batch-check[=<format>]
-                          show info about objects fed from the standard input
-    --follow-symlinks     follow in-tree symlinks (used with --batch or --batch-check)
-    --batch-all-objects   show all objects with --batch or --batch-check
-    --unordered           do not order --batch-all-objects output
+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 19 - rebase  drops patches in upstream
 
-error: unknown option `unsorted'
-usage: git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -p | <type> | --textconv | --filters) [--path=<path>] <object>
-   or: git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --filters]
+checking known breakage: 
+		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
+First, rewinding head to replay your work on top of it...
+Merging h with HEAD~2
+Merging:
+09e6546 h
+1bd0260 d
+found 1 common ancestor:
+020ea9b b
+[detached HEAD e937a8e] d
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:16:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 d.t
+Committed: 0001 d
+Merging h with HEAD~1
+Merging:
+e937a8e d
+00eccdb gp
+found 1 common ancestor:
+1bd0260 d
+[detached HEAD 4a12efe] gp
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:18:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 g.t
+Committed: 0002 gp
+Merging h with HEAD~0
+Merging:
+4a12efe gp
+3317c29 i
+found 1 common ancestor:
+00eccdb gp
+[detached HEAD bbe8f41] i
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:19:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 i.t
+Committed: 0003 i
+All done.
+error: two revisions point to different objects:
+  'h': 09e6546083fde009871b0716b2797b792e65e541
+  'HEAD~2': e937a8e882fbebb0b2205dd9459e6ecb99b2ab16
+not ok 20 - rebase -m drops patches in upstream # TODO known breakage
 
-<type> can be one of: blob, tree, commit, tag
-    -t                    show object type
-    -s                    show object size
-    -e                    exit with zero when there's no error
-    -p                    pretty-print object's content
-    --textconv            for blob objects, run textconv on object's content
-    --filters             for blob objects, run filters on object's content
-    --path <blob>         use a specific path for --textconv/--filters
-    --allow-unknown-type  allow -s and -t to work with broken/corrupt objects
-    --buffer              buffer --batch output
-    --batch[=<format>]    show info and content of objects fed from the standard input
-    --batch-check[=<format>]
-                          show info about objects fed from the standard input
-    --follow-symlinks     follow in-tree symlinks (used with --batch or --batch-check)
-    --batch-all-objects   show all objects with --batch or --batch-check
-    --unordered           do not order --batch-all-objects output
+expecting success: 
+		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 bbe8f41 i
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated detached HEAD.
+ok 21 - rebase -i drops patches in upstream
 
-ok 12 - check normal git operations: twelve packs
+expecting success: 
+		reset_rebase &&
+		git rebase -p 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
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated detached HEAD.
+ok 22 - rebase -p drops patches in upstream
 
 expecting success: 
-	git multi-pack-index verify --object-dir=$objdir
+		reset_rebase &&
+		git rebase  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 23 - rebase  can drop last patch if in upstream
 
-Verifying object offsets:   1% (1/74)   
Verifying object offsets:   2% (2/74)   
Verifying object offsets:   4% (3/74)   
Verifying object offsets:   5% (4/74)   
Verifying object offsets:   6% (5/74)   
Verifying object offsets:   8% (6/74)   
Verifying object offsets:   9% (7/74)   
Verifying object offsets:  10% (8/74)   
Verifying object offsets:  12% (9/74)   
Verifying object offsets:  13% (10/74)   
Verifying object offsets:  14% (11/74)   
Verifying object offsets:  16% (12/74)   
Verifying object offsets:  17% (13/74)   
Verifying object offsets:  18% (14/74)   
Verifying object offsets:  20% (15/74)   
Verifying object offsets:  21% (16/74)   
Verifying object offsets:  22% (17/74)   
Verifying object offsets:  24% (18/74)   
Verifying object offsets:  25% (19/74)   
Verifying object offsets:  27% (20/74)   
Verifying object offsets:  28% (21/74)   
Verifying object offsets:  29% (22/74)   
Verifying object offsets:  31% (23/74)   
Verifying object offsets:  32% (24/74)   
Verifying object offsets:  33% (25/74)   
Verifying object offsets:  35% (26/74)   
Verifying object offsets:  36% (27/74)   
Verifying object offsets:  37% (28/74)   
Verifying object offsets:  39% (29/74)   
Verifying object offsets:  40% (30/74)   
Verifying object offsets:  41% (31/74)   
Verifying object offsets:  43% (32/74)   
Verifying object offsets:  44% (33/74)   
Verifying object offsets:  45% (34/74)   
Verifying object offsets:  47% (35/74)   
Verifying object offsets:  48% (36/74)   
Verifying object offsets:  50% (37/74)   
Verifying object offsets:  51% (38/74)   
Verifying object offsets:  52% (39/74)   
Verifying object offsets:  54% (40/74)   
Verifying object offsets:  55% (41/74)   
Verifying object offsets:  56% (42/74)   
Verifying object offsets:  58% (43/74)   
Verifying object offsets:  59% (44/74)   
Verifying object offsets:  60% (45/74)   
Verifying object offsets:  62% (46/74)   
Verifying object offsets:  63% (47/74)   
Verifying object offsets:  64% (48/74)   
Verifying object offsets:  66% (49/74)   
Verifying object offsets:  67% (50/74)   
Verifying object offsets:  68% (51/74)   
Verifying object offsets:  70% (52/74)   
Verifying object offsets:  71% (53/74)   
Verifying object offsets:  72% (54/74)   
Verifying object offsets:  74% (55/74)   
Verifying object offsets:  75% (56/74)   
Verifying object offsets:  77% (57/74)   
Verifying object offsets:  78% (58/74)   
Verifying object offsets:  79% (59/74)   
Verifying object offsets:  81% (60/74)   
Verifying object offsets:  82% (61/74)   
Verifying object offsets:  83% (62/74)   
Verifying object offsets:  85% (63/74)   
Verifying object offsets:  86% (64/74)   
Verifying object offsets:  87% (65/74)   
Verifying object offsets:  89% (66/74)   
Verifying object offsets:  90% (67/74)   
Verifying object offsets:  91% (68/74)   
Verifying object offsets:  93% (69/74)   
Verifying object offsets:  94% (70/74)   
Verifying object offsets:  95% (71/74)   
Verifying object offsets:  97% (72/74)   
Verifying object offsets:  98% (73/74)   
Verifying object offsets: 100% (74/74)   
Verifying object offsets: 100% (74/74), done.
-ok 13 - verify multi-pack-index success
+checking known breakage: 
+		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
+First, rewinding head to replay your work on top of it...
+Merging h with HEAD~1
+Merging:
+09e6546 h
+1bd0260 d
+found 1 common ancestor:
+020ea9b b
+[detached HEAD e937a8e] d
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:16:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 d.t
+Committed: 0001 d
+Merging h with HEAD~0
+Merging:
+e937a8e d
+00eccdb gp
+found 1 common ancestor:
+1bd0260 d
+[detached HEAD 4a12efe] gp
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:18:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 g.t
+Committed: 0002 gp
+All done.
+error: two revisions point to different objects:
+  'h': 09e6546083fde009871b0716b2797b792e65e541
+  'HEAD^': e937a8e882fbebb0b2205dd9459e6ecb99b2ab16
+not ok 24 - rebase -m can drop last patch if in upstream # TODO known breakage
 
 expecting success: 
-	corrupt_midx_and_verify 0 "\00" $objdir \
-		"multi-pack-index signature"
+		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 4a12efe gp
+Rebasing (1/1)
Successfully rebased and updated detached HEAD.
+ok 25 - rebase -i can drop last patch if in upstream
 
-1+0 records in
-1+0 records out
-1 byte copied, 0.00263415 s, 0.4 kB/s
-fatal: multi-pack-index signature 0x00494458 does not match signature 0x4d494458
-ok 14 - verify bad signature
+expecting success: 
+		reset_rebase &&
+		git rebase -p h gp &&
+		test_cmp_rev h HEAD^ &&
+		test_linear_range 'd' h..
+	
+fatal: No rebase in progress?
+HEAD is now at e937a8e d
+Rebasing (1/1)
Successfully rebased and updated detached HEAD.
+ok 26 - rebase -p can drop last patch if in upstream
 
 expecting success: 
-	corrupt_midx_and_verify $MIDX_BYTE_VERSION "\00" $objdir \
-		"multi-pack-index version"
+		reset_rebase &&
+		git rebase  --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 27 - rebase  --onto drops patches in upstream
 
-1+0 records in
-1+0 records out
-1 byte copied, 6.6218e-05 s, 15.1 kB/s
-fatal: multi-pack-index version 0 not recognized
-ok 15 - verify bad version
+checking known breakage: 
+		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
+First, rewinding head to replay your work on top of it...
+Merging f with HEAD~2
+Merging:
+09e072f f
+1bd0260 d
+found 1 common ancestor:
+020ea9b b
+[detached HEAD 1c3eee5] d
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:16:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 d.t
+Committed: 0001 d
+Merging f with HEAD~1
+Merging:
+1c3eee5 d
+00eccdb gp
+found 1 common ancestor:
+1bd0260 d
+[detached HEAD 348de6f] gp
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:18:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 g.t
+Committed: 0002 gp
+Merging f with HEAD~0
+Merging:
+348de6f gp
+3317c29 i
+found 1 common ancestor:
+00eccdb gp
+[detached HEAD 8a25459] i
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:19:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 i.t
+Committed: 0003 i
+All done.
+error: two revisions point to different objects:
+  'f': 09e072f8a9ef7b761fc545eb973e8013e674eb45
+  'HEAD~2': 1c3eee5a4db088a4573dc7e31a5817d3fc9323bd
+not ok 28 - rebase -m --onto drops patches in upstream # TODO known breakage
 
 expecting success: 
-	corrupt_midx_and_verify $MIDX_BYTE_OID_VERSION "\02" $objdir \
-		"hash version"
+		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 8a25459 i
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated detached HEAD.
+ok 29 - rebase -i --onto drops patches in upstream
 
-1+0 records in
-1+0 records out
-1 byte copied, 6.6206e-05 s, 15.1 kB/s
-fatal: hash version 2 does not match
-ok 16 - verify bad OID version
+expecting success: 
+		reset_rebase &&
+		git rebase -p --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
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated detached HEAD.
+ok 30 - rebase -p --onto drops patches in upstream
 
 expecting success: 
-	corrupt_midx_and_verify $MIDX_BYTE_CHUNK_COUNT "\01" $objdir \
-		"missing required"
+		reset_rebase &&
+		git rebase  --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  --onto does not drop patches in onto
 
-1+0 records in
-1+0 records out
-1 byte copied, 6.7862e-05 s, 14.7 kB/s
-fatal: multi-pack-index missing required OID fanout chunk
-ok 17 - verify truncated chunk count
+expecting success: 
+		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
+First, rewinding head to replay your work on top of it...
+Merging h with HEAD~2
+Merging:
+09e6546 h
+1bd0260 d
+found 1 common ancestor:
+020ea9b b
+[detached HEAD e937a8e] d
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:16:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 d.t
+Committed: 0001 d
+Merging h with HEAD~1
+Merging:
+e937a8e d
+00eccdb gp
+found 1 common ancestor:
+1bd0260 d
+[detached HEAD 4a12efe] gp
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:18:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 g.t
+Committed: 0002 gp
+Merging h with HEAD~0
+Merging:
+4a12efe gp
+3317c29 i
+found 1 common ancestor:
+00eccdb gp
+[detached HEAD bbe8f41] i
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:19:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 i.t
+Committed: 0003 i
+All done.
+ok 32 - rebase -m --onto does not drop patches in onto
 
 expecting success: 
-	corrupt_midx_and_verify $MIDX_BYTE_CHUNK_COUNT "\07" $objdir \
-		"terminating multi-pack-index chunk id appears earlier than expected"
+		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
 
-1+0 records in
-1+0 records out
-1 byte copied, 6.3834e-05 s, 15.7 kB/s
-fatal: terminating multi-pack-index chunk id appears earlier than expected
-ok 18 - verify extended chunk count
+expecting success: 
+		reset_rebase &&
+		git rebase -p --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 34 - rebase -p --onto does not drop patches in onto
 
 expecting success: 
-	corrupt_midx_and_verify $MIDX_BYTE_CHUNK_ID "\01" $objdir \
-		"missing required"
+	git checkout c &&
+	make_empty j &&
+	git checkout d &&
+	make_empty k &&
+	test_commit l
 
-1+0 records in
-1+0 records out
-1 byte copied, 0.00343439 s, 0.3 kB/s
-fatal: multi-pack-index missing required pack-name chunk
-ok 19 - verify missing required chunk
+Warning: you are leaving 3 commits behind, not connected to
+any of your branches:
 
-expecting success: 
-	corrupt_midx_and_verify $MIDX_BYTE_CHUNK_OFFSET "\01" $objdir \
-		"invalid chunk offset (too large)"
+  bbe8f41 i
+  4a12efe gp
+  e937a8e d
 
-1+0 records in
-1+0 records out
-1 byte copied, 6.4825e-05 s, 15.4 kB/s
-fatal: invalid chunk offset (too large)
-ok 20 - verify invalid chunk offset
+If you want to keep them by creating a new branch, this may be a good time
+to do so with:
 
-expecting success: 
-	corrupt_midx_and_verify $MIDX_BYTE_PACKNAME_ORDER "z" $objdir \
-		"pack names out of order"
+ git branch <new-branch-name> bbe8f41
 
-1+0 records in
-1+0 records out
-1 byte copied, 0.00577804 s, 0.2 kB/s
-fatal: multi-pack-index pack names out of order: 'tezt-2-0994129a102d56705c119b91822cbd6ef1599f8f.idx' before 'test-a10c8cef352773b1f1b38ecc868f417f3d6029c9.idx'
-ok 21 - verify packnames out of order
+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 35 - setup of linear history for empty commit tests
 
 expecting success: 
-	corrupt_midx_and_verify $MIDX_BYTE_PACKNAME_ORDER "a" $objdir \
-		"failed to load pack"
+		reset_rebase &&
+		git rebase  c l &&
+		test_cmp_rev c HEAD~2 &&
+		test_linear_range 'd 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
+ok 36 - rebase  drops empty commit
 
-1+0 records in
-1+0 records out
-1 byte copied, 6.6215e-05 s, 15.1 kB/s
-failed to load pack in position 0
-ok 22 - verify packnames out of order
+expecting success: 
+		reset_rebase &&
+		git rebase -m 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
+First, rewinding head to replay your work on top of it...
+Merging c with HEAD~2
+Merging:
+d9ea348 c
+1bd0260 d
+found 1 common ancestor:
+020ea9b b
+[detached HEAD bd3422f] d
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:16:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 d.t
+Committed: 0001 d
+Merging c with HEAD~1
+Merging:
+bd3422f d
+753370d k
+found 1 common ancestor:
+1bd0260 d
+Already up to date!
+Already applied: 0002 k
+Merging c with HEAD~0
+Merging:
+bd3422f d
+49cf309 l
+found 1 common ancestor:
+753370d k
+[detached HEAD ef60b8d] l
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:21:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 l.t
+Committed: 0003 l
+All done.
+ok 37 - rebase -m drops empty commit
 
 expecting success: 
-	corrupt_midx_and_verify $MIDX_BYTE_OID_FANOUT_ORDER "\01" $objdir \
-		"oid fanout out of order"
+		reset_rebase &&
+		git rebase -i 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 38 - rebase -i drops empty commit
 
-1+0 records in
-1+0 records out
-1 byte copied, 8.9891e-05 s, 11.1 kB/s
-oid fanout out of order: fanout[250] = 1004a > 4a = fanout[251]
-ok 23 - verify oid fanout out of order
+expecting success: 
+		reset_rebase &&
+		git rebase -p 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 -p drops empty commit
 
 expecting success: 
-	corrupt_midx_and_verify $MIDX_BYTE_OID_LOOKUP "\00" $objdir \
-		"oid lookup out of order"
+		reset_rebase &&
+		git rebase  --keep-empty c l &&
+		test_cmp_rev c HEAD~3 &&
+		test_linear_range 'd k l' c..
+	
+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  --keep-empty
 
-1+0 records in
-1+0 records out
-1 byte copied, 7.2377e-05 s, 13.8 kB/s
-oid lookup out of order: oid[15] = 2f695f39a9ae90106abc3a1efc22b6cfe2522e89 >= 005f923c2d2e1fff9ec067b42443fff88aeebc67 = oid[16]
-ok 24 - verify oid lookup out of order
+expecting success: 
+		reset_rebase &&
+		git rebase -m --keep-empty c l &&
+		test_cmp_rev c HEAD~3 &&
+		test_linear_range 'd k l' c..
+	
+fatal: No rebase in progress?
+HEAD is now at f90e7ce l
+Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated detached HEAD.
+ok 41 - rebase -m --keep-empty
 
 expecting success: 
-	corrupt_midx_and_verify $MIDX_BYTE_PACK_INT_ID "\07" $objdir \
-		"bad pack-int-id"
+		reset_rebase &&
+		git rebase -i --keep-empty c l &&
+		test_cmp_rev c HEAD~3 &&
+		test_linear_range 'd k l' c..
+	
+fatal: No rebase in progress?
+HEAD is now at f90e7ce l
+Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated detached HEAD.
+ok 42 - rebase -i --keep-empty
 
-1+0 records in
-1+0 records out
-1 byte copied, 5.8236e-05 s, 17.2 kB/s
-Verifying object offsets:   1% (1/74)   
Verifying object offsets:   2% (2/74)   
Verifying object offsets:   4% (3/74)   
Verifying object offsets:   5% (4/74)   
Verifying object offsets:   6% (5/74)   
Verifying object offsets:   8% (6/74)   
Verifying object offsets:   9% (7/74)   
Verifying object offsets:  10% (8/74)   
Verifying object offsets:  12% (9/74)   
Verifying object offsets:  13% (10/74)   
Verifying object offsets:  14% (11/74)   
Verifying object offsets:  16% (12/74)   
Verifying object offsets:  17% (13/74)   
Verifying object offsets:  18% (14/74)   
Verifying object offsets:  20% (15/74)   
Verifying object offsets:  21% (16/74)   
fatal: bad pack-int-id: 1795 (12 total packs)
-ok 25 - verify incorrect pack-int-id
+checking known breakage: 
+		reset_rebase &&
+		git rebase -p --keep-empty c l &&
+		test_cmp_rev c HEAD~3 &&
+		test_linear_range 'd k l' c..
+	
+fatal: No rebase in progress?
+HEAD is now at f90e7ce l
+Rebasing (1/3)
Rebasing (2/3)
Already up to date!
+The previous cherry-pick is now empty, possibly due to conflict resolution.
+If you wish to commit it anyway, use:
 
-expecting success: 
-	corrupt_midx_and_verify $MIDX_BYTE_OFFSET "\07" $objdir \
-		"incorrect object offset"
+    git commit --allow-empty
 
-1+0 records in
-1+0 records out
-1 byte copied, 6.9483e-05 s, 14.4 kB/s
-Verifying object offsets:   1% (1/74)   
Verifying object offsets:   2% (2/74)   
Verifying object offsets:   4% (3/74)   
Verifying object offsets:   5% (4/74)   
Verifying object offsets:   6% (5/74)   
Verifying object offsets:   8% (6/74)   
Verifying object offsets:   9% (7/74)   
Verifying object offsets:  10% (8/74)   
Verifying object offsets:  12% (9/74)   
Verifying object offsets:  13% (10/74)   
Verifying object offsets:  14% (11/74)   
Verifying object offsets:  16% (12/74)   
Verifying object offsets:  17% (13/74)   
Verifying object offsets:  18% (14/74)   
Verifying object offsets:  20% (15/74)   
Verifying object offsets:  21% (16/74)   
incorrect object offset for oid[16] = 305f923c2d2e1fff9ec067b42443fff88aeebc67: 744 != 1344
-ok 26 - verify incorrect offset
+Otherwise, please use 'git reset'
+interactive rebase in progress; onto d9ea348
+Last commands done (2 commands done):
+   pick 1bd0260 d
+   pick 753370d k
+Next command to do (1 remaining command):
+   pick 49cf309 l
+You are currently rebasing.
+
+nothing to commit, working tree clean
+Could not pick 753370ddaccf1cee7fe7a98997789c7c2de20f79
+not ok 43 - rebase -p --keep-empty # TODO known breakage
 
 expecting success: 
-	corrupt_midx_and_verify $MIDX_BYTE_OFFSET "\07" $objdir \
-		"incorrect object offset" \
-		"git -c core.multipackindex=true fsck"
+		reset_rebase &&
+		git rebase  --keep-empty j l &&
+		test_cmp_rev j HEAD~3 &&
+		test_linear_range 'd k l' j..
+	
+HEAD is now at 49cf309 l
+Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated detached HEAD.
+ok 44 - rebase  --keep-empty keeps empty even if already in upstream
 
-1+0 records in
-1+0 records out
-1 byte copied, 6.7807e-05 s, 14.7 kB/s
-Verifying object offsets:   1% (1/74)   
Verifying object offsets:   2% (2/74)   
Verifying object offsets:   4% (3/74)   
Verifying object offsets:   5% (4/74)   
Verifying object offsets:   6% (5/74)   
Verifying object offsets:   8% (6/74)   
Verifying object offsets:   9% (7/74)   
Verifying object offsets:  10% (8/74)   
Verifying object offsets:  12% (9/74)   
Verifying object offsets:  13% (10/74)   
Verifying object offsets:  14% (11/74)   
Verifying object offsets:  16% (12/74)   
Verifying object offsets:  17% (13/74)   
Verifying object offsets:  18% (14/74)   
Verifying object offsets:  20% (15/74)   
Verifying object offsets:  21% (16/74)   
incorrect object offset for oid[16] = 305f923c2d2e1fff9ec067b42443fff88aeebc67: 744 != 1344
-ok 27 - git-fsck incorrect offset
+expecting success: 
+		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 5395ede l
+Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated detached HEAD.
+ok 45 - rebase -m --keep-empty keeps empty even if already in upstream
 
 expecting success: 
-	test_path_is_file $objdir/pack/multi-pack-index &&
-	GIT_TEST_MULTI_PACK_INDEX=0 git repack -adf &&
-	test_path_is_missing $objdir/pack/multi-pack-index
+		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 46 - rebase -i --keep-empty keeps empty even if already in upstream
 
-ok 28 - repack removes multi-pack-index
+checking known breakage: 
+		reset_rebase &&
+		git rebase -p --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/2)
Rebasing (2/2)
Successfully rebased and updated detached HEAD.
+error: two revisions point to different objects:
+  'j': 5b67321bb4e1ef5cbccc64d00cd3c3f7768ff359
+  'HEAD~3': d9ea348e0fe8827f205c231ed0a5b8258841fd37
+not ok 47 - rebase -p --keep-empty keeps empty even if already in upstream # TODO known breakage
 
 expecting success: 
-		midx_git_two_modes "rev-list --objects --all" &&
-		midx_git_two_modes "log --raw" &&
-		midx_git_two_modes "count-objects --verbose" &&
-		midx_git_two_modes "cat-file --batch-all-objects --buffer --batch-check" &&
-		midx_git_two_modes "cat-file --batch-all-objects --buffer --batch-check --unsorted" sorted
+		reset_rebase &&
+		git rebase --rebase-merges --keep-empty j l &&
+		test_cmp_rev j HEAD~3 &&
+		test_linear_range 'd k l' j..
 	
-error: unknown option `unsorted'
-usage: git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -p | <type> | --textconv | --filters) [--path=<path>] <object>
-   or: git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --filters]
+fatal: No rebase in progress?
+HEAD is now at 1612308 l
+Rebasing (1/5)
Rebasing (2/5)
Rebasing (3/5)
Rebasing (4/5)
Rebasing (5/5)
Successfully rebased and updated detached HEAD.
+ok 48 - rebase --rebase-merges --keep-empty keeps empty even if already in upstream
 
-<type> can be one of: blob, tree, commit, tag
-    -t                    show object type
-    -s                    show object size
-    -e                    exit with zero when there's no error
-    -p                    pretty-print object's content
-    --textconv            for blob objects, run textconv on object's content
-    --filters             for blob objects, run filters on object's content
-    --path <blob>         use a specific path for --textconv/--filters
-    --allow-unknown-type  allow -s and -t to work with broken/corrupt objects
-    --buffer              buffer --batch output
-    --batch[=<format>]    show info and content of objects fed from the standard input
-    --batch-check[=<format>]
-                          show info about objects fed from the standard input
-    --follow-symlinks     follow in-tree symlinks (used with --batch or --batch-check)
-    --batch-all-objects   show all objects with --batch or --batch-check
-    --unordered           do not order --batch-all-objects output
+expecting success: 
+	git checkout b &&
+	revert m b &&
+	git checkout --orphan disjoint &&
+	git rm -rf . &&
+	test_commit x &&
+	test_commit y &&
+	cherry_pick bp b
 
-error: unknown option `unsorted'
-usage: git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -p | <type> | --textconv | --filters) [--path=<path>] <object>
-   or: git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --filters]
+Warning: you are leaving 3 commits behind, not connected to
+any of your branches:
 
-<type> can be one of: blob, tree, commit, tag
-    -t                    show object type
-    -s                    show object size
-    -e                    exit with zero when there's no error
-    -p                    pretty-print object's content
-    --textconv            for blob objects, run textconv on object's content
-    --filters             for blob objects, run filters on object's content
-    --path <blob>         use a specific path for --textconv/--filters
-    --allow-unknown-type  allow -s and -t to work with broken/corrupt objects
-    --buffer              buffer --batch output
-    --batch[=<format>]    show info and content of objects fed from the standard input
-    --batch-check[=<format>]
-                          show info about objects fed from the standard input
-    --follow-symlinks     follow in-tree symlinks (used with --batch or --batch-check)
-    --batch-all-objects   show all objects with --batch or --batch-check
-    --unordered           do not order --batch-all-objects output
+  5395ede l
+  9a731c2 k
+  60768b3 d
 
-ok 29 - check normal git operations: after repack
+If you want to keep them by creating a new branch, this may be a good time
+to do so with:
 
-expecting success: 
-	git -c repack.writeBitmaps=true repack -ad &&
-	git multi-pack-index write &&
-	git rev-list --test-bitmap HEAD
+ git branch <new-branch-name> 5395ede
 
-Bitmap v1 test (13 entries loaded)
-Found bitmap for 552d56d6820f11b3931f91152c2ecf1a11fc074f. 128 bits / e6cc631c checksum
-Verifying bitmap entries:   1% (1/88)   
Verifying bitmap entries:   2% (2/88)   
Verifying bitmap entries:   3% (3/88)   
Verifying bitmap entries:   4% (4/88)   
Verifying bitmap entries:   5% (5/88)   
Verifying bitmap entries:   6% (6/88)   
Verifying bitmap entries:   7% (7/88)   
Verifying bitmap entries:   9% (8/88)   
Verifying bitmap entries:  10% (9/88)   
Verifying bitmap entries:  11% (10/88)   
Verifying bitmap entries:  12% (11/88)   
Verifying bitmap entries:  13% (12/88)   
Verifying bitmap entries:  14% (13/88)   
Verifying bitmap entries:  15% (14/88)   
Verifying bitmap entries:  17% (15/88)   
Verifying bitmap entries:  18% (16/88)   
Verifying bitmap entries:  19% (17/88)   
Verifying bitmap entries:  20% (18/88)   
Verifying bitmap entries:  21% (19/88)   
Verifying bitmap entries:  22% (20/88)   
Verifying bitmap entries:  23% (21/88)   
Verifying bitmap entries:  25% (22/88)   
Verifying bitmap entries:  26% (23/88)   
Verifying bitmap entries:  27% (24/88)   
Verifying bitmap entries:  28% (25/88)   
Verifying bitmap entries:  29% (26/88)   
Verifying bitmap entries:  30% (27/88)   
Verifying bitmap entries:  31% (28/88)   
Verifying bitmap entries:  32% (29/88)   
Verifying bitmap entries:  34% (30/88)   
Verifying bitmap entries:  35% (31/88)   
Verifying bitmap entries:  36% (32/88)   
Verifying bitmap entries:  37% (33/88)   
Verifying bitmap entries:  38% (34/88)   
Verifying bitmap entries:  39% (35/88)   
Verifying bitmap entries:  40% (36/88)   
Verifying bitmap entries:  42% (37/88)   
Verifying bitmap entries:  43% (38/88)   
Verifying bitmap entries:  44% (39/88)   
Verifying bitmap entries:  45% (40/88)   
Verifying bitmap entries:  46% (41/88)   
Verifying bitmap entries:  47% (42/88)   
Verifying bitmap entries:  48% (43/88)   
Verifying bitmap entries:  50% (44/88)   
Verifying bitmap entries:  51% (45/88)   
Verifying bitmap entries:  52% (46/88)   
Verifying bitmap entries:  53% (47/88)   
Verifying bitmap entries:  54% (48/88)   
Verifying bitmap entries:  55% (49/88)   
Verifying bitmap entries:  56% (50/88)   
Verifying bitmap entries:  57% (51/88)   
Verifying bitmap entries:  59% (52/88)   
Verifying bitmap entries:  60% (53/88)   
Verifying bitmap entries:  61% (54/88)   
Verifying bitmap entries:  62% (55/88)   
Verifying bitmap entries:  63% (56/88)   
Verifying bitmap entries:  64% (57/88)   
Verifying bitmap entries:  65% (58/88)   
Verifying bitmap entries:  67% (59/88)   
Verifying bitmap entries:  68% (60/88)   
Verifying bitmap entries:  69% (61/88)   
Verifying bitmap entries:  70% (62/88)   
Verifying bitmap entries:  71% (63/88)   
Verifying bitmap entries:  72% (64/88)   
Verifying bitmap entries:  73% (65/88)   
Verifying bitmap entries:  75% (66/88)   
Verifying bitmap entries:  76% (67/88)   
Verifying bitmap entries:  77% (68/88)   
Verifying bitmap entries:  78% (69/88)   
Verifying bitmap entries:  79% (70/88)   
Verifying bitmap entries:  80% (71/88)   
Verifying bitmap entries:  81% (72/88)   
Verifying bitmap entries:  82% (73/88)   
Verifying bitmap entries:  84% (74/88)   
Verifying bitmap entries:  85% (75/88)   
Verifying bitmap entries:  86% (76/88)   
Verifying bitmap entries:  87% (77/88)   
Verifying bitmap entries:  88% (78/88)   
Verifying bitmap entries:  89% (79/88)   
Verifying bitmap entries:  90% (80/88)   
Verifying bitmap entries:  92% (81/88)   
Verifying bitmap entries:  93% (82/88)   
Verifying bitmap entries:  94% (83/88)   
Verifying bitmap entries:  95% (84/88)   
Verifying bitmap entries:  96% (85/88)   
Verifying bitmap entries:  97% (86/88)   
Verifying bitmap entries:  98% (87/88)   
Verifying bitmap entries: 100% (88/88)   
Verifying bitmap entries: 100% (88/88), done.
-OK!
-ok 30 - multi-pack-index and pack-bitmap
+HEAD is now at 020ea9b b
+Removing b.t
+[detached HEAD 6db5543] m
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 b.t
+Switched to a new branch 'disjoint'
+rm 'a.t'
+[disjoint (root-commit) 059091f] x
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 x.t
+[disjoint be1e399] y
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 y.t
+[disjoint b7cb922] bp
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b.t
+ok 49 - setup of linear history for test involving root
 
 expecting success: 
-	git init --bare alt.git &&
-	echo $(pwd)/alt.git/objects >.git/objects/info/alternates &&
-	echo content1 >file1 &&
-	altblob=$(GIT_DIR=alt.git git hash-object -w file1) &&
-	git cat-file blob $altblob &&
-	git rev-list --all
+		reset_rebase &&
+		git rebase  --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 50 - rebase  --onto --root
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5319-multi-pack-index/alt.git/
-content1
-552d56d6820f11b3931f91152c2ecf1a11fc074f
-24b24cf8a829f5b8c30dfc018b0a459a2ccaf380
-523abe232fb4b7b686a145aa302ea4a19e94f75f
-66c7cd909447f8f29bd3553b0fb2f6512d8e6752
-c4c6a878655615fb0e9fa97b0473c1fbdb0b298b
-449cf2153bd5dd5a5dad8bbc707653502e036576
-047779e14850a36f69fefa6343e0f8a567e1a73e
-e2467d303a5f701dd2748207035e3d6fb96f865b
-07c6d1f0c163edff34bac6da1fea4dcf321e55fa
-3e2c62cf4a31af79719533e93d0acbbaf3a77688
-b415cb40170102eb11cb275c506470a89d8cd0e5
-9650f031c9f135ac62532bbe0d0c31c73d1bb7fb
-cd0747a9352b58d112f0010134351efc7bbad4a6
-ok 31 - multi-pack-index and alternates
+expecting success: 
+		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
+First, rewinding head to replay your work on top of it...
+Merging c with HEAD~1
+Merging:
+d9ea348 c
+059091f x
+found 0 common ancestors:
+[detached HEAD ee9ba54] x
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:22:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 x.t
+Committed: 0001 x
+Merging c with HEAD~0
+Merging:
+ee9ba54 x
+be1e399 y
+found 1 common ancestor:
+059091f x
+[detached HEAD 7e2f0ad] y
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:23:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 y.t
+Committed: 0002 y
+All done.
+ok 51 - rebase -m --onto --root
 
 expecting success: 
-		midx_git_two_modes "rev-list --objects --all" &&
-		midx_git_two_modes "log --raw" &&
-		midx_git_two_modes "count-objects --verbose" &&
-		midx_git_two_modes "cat-file --batch-all-objects --buffer --batch-check" &&
-		midx_git_two_modes "cat-file --batch-all-objects --buffer --batch-check --unsorted" sorted
+		reset_rebase &&
+		git rebase -i --onto c --root y &&
+		test_cmp_rev c HEAD~2 &&
+		test_linear_range 'x y' c..
 	
-error: unknown option `unsorted'
-usage: git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -p | <type> | --textconv | --filters) [--path=<path>] <object>
-   or: git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --filters]
+fatal: No rebase in progress?
+HEAD is now at 7e2f0ad y
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated detached HEAD.
+ok 52 - rebase -i --onto --root
 
-<type> can be one of: blob, tree, commit, tag
-    -t                    show object type
-    -s                    show object size
-    -e                    exit with zero when there's no error
-    -p                    pretty-print object's content
-    --textconv            for blob objects, run textconv on object's content
-    --filters             for blob objects, run filters on object's content
-    --path <blob>         use a specific path for --textconv/--filters
-    --allow-unknown-type  allow -s and -t to work with broken/corrupt objects
-    --buffer              buffer --batch output
-    --batch[=<format>]    show info and content of objects fed from the standard input
-    --batch-check[=<format>]
-                          show info about objects fed from the standard input
-    --follow-symlinks     follow in-tree symlinks (used with --batch or --batch-check)
-    --batch-all-objects   show all objects with --batch or --batch-check
-    --unordered           do not order --batch-all-objects output
+expecting success: 
+		reset_rebase &&
+		git rebase -p --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 53 - rebase -p --onto --root
 
-error: unknown option `unsorted'
-usage: git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -p | <type> | --textconv | --filters) [--path=<path>] <object>
-   or: git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --filters]
+expecting success: 
+		reset_rebase &&
+		git rebase  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 54 - rebase  without --onto --root with disjoint history
 
-<type> can be one of: blob, tree, commit, tag
-    -t                    show object type
-    -s                    show object size
-    -e                    exit with zero when there's no error
-    -p                    pretty-print object's content
-    --textconv            for blob objects, run textconv on object's content
-    --filters             for blob objects, run filters on object's content
-    --path <blob>         use a specific path for --textconv/--filters
-    --allow-unknown-type  allow -s and -t to work with broken/corrupt objects
-    --buffer              buffer --batch output
-    --batch[=<format>]    show info and content of objects fed from the standard input
-    --batch-check[=<format>]
-                          show info about objects fed from the standard input
-    --follow-symlinks     follow in-tree symlinks (used with --batch or --batch-check)
-    --batch-all-objects   show all objects with --batch or --batch-check
-    --unordered           do not order --batch-all-objects output
+expecting success: 
+		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
+First, rewinding head to replay your work on top of it...
+Merging c with HEAD~1
+Merging:
+d9ea348 c
+059091f x
+found 0 common ancestors:
+[detached HEAD ee9ba54] x
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:22:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 x.t
+Committed: 0001 x
+Merging c with HEAD~0
+Merging:
+ee9ba54 x
+be1e399 y
+found 1 common ancestor:
+059091f x
+[detached HEAD 7e2f0ad] y
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:23:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 y.t
+Committed: 0002 y
+All done.
+ok 55 - rebase -m without --onto --root with disjoint history
 
-ok 32 - check normal git operations: with alternate (local midx)
+expecting success: 
+		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 56 - rebase -i without --onto --root with disjoint history
+
+checking known breakage: 
+		reset_rebase &&
+		git rebase -p 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/1)
Successfully rebased and updated detached HEAD.
+error: two revisions point to different objects:
+  'c': d9ea348e0fe8827f205c231ed0a5b8258841fd37
+  'HEAD~2': ce450c7fd6766cb1f2df873857da7b928ff743a8
+not ok 57 - rebase -p without --onto --root with disjoint history # TODO known breakage
 
 expecting success: 
-	mv .git/objects/pack/* alt.git/objects/pack &&
-	test_commit add_local_objects &&
-	git repack --local &&
-	git multi-pack-index write &&
-	midx_read_expect 1 3 4 $objdir &&
-	git reset --hard HEAD~1 &&
-	rm -f .git/objects/pack/*
+		reset_rebase &&
+		git rebase  --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 d9ea348 c
+First, rewinding head to replay your work on top of it...
+Applying: x
+Applying: y
+ok 58 - rebase  --onto --root drops patch in onto
 
-[master 705a1ea] add_local_objects
+checking known breakage: 
+		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
+First, rewinding head to replay your work on top of it...
+Merging m with HEAD~2
+Merging:
+6db5543 m
+059091f x
+found 0 common ancestors:
+[detached HEAD b7663de] x
  Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:22:13 2005 -0700
  1 file changed, 1 insertion(+)
- create mode 100644 add_local_objects.t
-HEAD is now at 552d56d
-ok 33 - multi-pack-index in an alternate
+ create mode 100644 x.t
+Committed: 0001 x
+Merging m with HEAD~1
+Merging:
+b7663de x
+be1e399 y
+found 1 common ancestor:
+059091f x
+[detached HEAD 1daea3a] y
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:23:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 y.t
+Committed: 0002 y
+Merging m with HEAD~0
+Merging:
+1daea3a y
+b7cb922 bp
+found 1 common ancestor:
+be1e399 y
+[detached HEAD 1502f56] bp
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:23:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b.t
+Committed: 0003 bp
+All done.
+error: two revisions point to different objects:
+  'm': 6db5543d43a2166fae6f6d320a0b715c6c1c4278
+  'HEAD~2': b7663de6ab4faf45f5f3c4005913aa77602cd1c5
+not ok 59 - rebase -m --onto --root drops patch in onto # TODO known breakage
 
 expecting success: 
-		midx_git_two_modes "rev-list --objects --all" &&
-		midx_git_two_modes "log --raw" &&
-		midx_git_two_modes "count-objects --verbose" &&
-		midx_git_two_modes "cat-file --batch-all-objects --buffer --batch-check" &&
-		midx_git_two_modes "cat-file --batch-all-objects --buffer --batch-check --unsorted" sorted
+		reset_rebase &&
+		git rebase -i --onto m --root bp &&
+		test_cmp_rev m HEAD~2 &&
+		test_linear_range 'x y' m..
 	
-error: unknown option `unsorted'
-usage: git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -p | <type> | --textconv | --filters) [--path=<path>] <object>
-   or: git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --filters]
-
-<type> can be one of: blob, tree, commit, tag
-    -t                    show object type
-    -s                    show object size
-    -e                    exit with zero when there's no error
-    -p                    pretty-print object's content
-    --textconv            for blob objects, run textconv on object's content
-    --filters             for blob objects, run filters on object's content
-    --path <blob>         use a specific path for --textconv/--filters
-    --allow-unknown-type  allow -s and -t to work with broken/corrupt objects
-    --buffer              buffer --batch output
-    --batch[=<format>]    show info and content of objects fed from the standard input
-    --batch-check[=<format>]
-                          show info about objects fed from the standard input
-    --follow-symlinks     follow in-tree symlinks (used with --batch or --batch-check)
-    --batch-all-objects   show all objects with --batch or --batch-check
-    --unordered           do not order --batch-all-objects output
+fatal: No rebase in progress?
+HEAD is now at 1502f56 bp
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated detached HEAD.
+ok 60 - rebase -i --onto --root drops patch in onto
 
-error: unknown option `unsorted'
-usage: git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -p | <type> | --textconv | --filters) [--path=<path>] <object>
-   or: git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --filters]
+expecting success: 
+		reset_rebase &&
+		git rebase -p --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
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated detached HEAD.
+ok 61 - rebase -p --onto --root drops patch in onto
 
-<type> can be one of: blob, tree, commit, tag
-    -t                    show object type
-    -s                    show object size
-    -e                    exit with zero when there's no error
-    -p                    pretty-print object's content
-    --textconv            for blob objects, run textconv on object's content
-    --filters             for blob objects, run filters on object's content
-    --path <blob>         use a specific path for --textconv/--filters
-    --allow-unknown-type  allow -s and -t to work with broken/corrupt objects
-    --buffer              buffer --batch output
-    --batch[=<format>]    show info and content of objects fed from the standard input
-    --batch-check[=<format>]
-                          show info about objects fed from the standard input
-    --follow-symlinks     follow in-tree symlinks (used with --batch or --batch-check)
-    --batch-all-objects   show all objects with --batch or --batch-check
-    --unordered           do not order --batch-all-objects output
+expecting success: 
+		reset_rebase &&
+		git rebase  --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 62 - rebase  --onto --root with merge-base does not go to root
 
-ok 34 - check normal git operations: with alternate (remote midx)
+expecting success: 
+		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
+First, rewinding head to replay your work on top of it...
+Merging m with HEAD~1
+Merging:
+6db5543 m
+d9ea348 c
+found 1 common ancestor:
+020ea9b b
+[detached HEAD 68cd74b] c
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:15:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c.t
+Committed: 0001 c
+Merging m with HEAD~0
+Merging:
+68cd74b c
+5573dba g
+found 1 common ancestor:
+d9ea348 c
+[detached HEAD 9921398] g
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:18:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 g.t
+Committed: 0002 g
+All done.
+ok 63 - rebase -m --onto --root with merge-base does not go to root
 
 expecting success: 
-	mkdir objects64 &&
-	mkdir objects64/pack &&
-	for i in $(test_seq 1 11)
-	do
-		generate_objects 11
-	done &&
-	commit_and_list_objects &&
-	pack64=$(git pack-objects --index-version=2,0x40 objects64/pack/test-64 <obj-list) &&
-	idx64=objects64/pack/test-64-$pack64.idx &&
-	chmod u+w $idx64 &&
-	corrupt_data $idx64 2999 "\02" &&
-	midx64=$(git multi-pack-index --object-dir=objects64 write) &&
-	midx_read_expect 1 63 5 objects64 " large-offsets"
+		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 64 - rebase -i --onto --root with merge-base does not go to root
 
-HEAD is now at 287f5d9
-1+0 records in
-1+0 records out
-1 byte copied, 6.6818e-05 s, 15.0 kB/s
-ok 35 - force some 64-bit offsets with pack-objects
+checking known breakage: 
+		reset_rebase &&
+		git rebase -p --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.
+error: two revisions point to different objects:
+  'm': 6db5543d43a2166fae6f6d320a0b715c6c1c4278
+  'HEAD~2': 020ea9b5b2051d958f4737afacdc8821a33ac9a9
+not ok 65 - rebase -p --onto --root with merge-base does not go to root # TODO known breakage
 
 expecting success: 
-	git multi-pack-index verify --object-dir=objects64
+		reset_rebase &&
+		git rebase  m bp &&
+		test_cmp_rev m HEAD~2 &&
+		test_linear_range 'x y' m..
+	
+fatal: No rebase in progress?
+HEAD is now at 5573dba g
+First, rewinding head to replay your work on top of it...
+Applying: x
+Applying: y
+ok 66 - rebase  without --onto --root with disjoint history drops patch in onto
 
-Verifying object offsets:   1% (1/63)   
Verifying object offsets:   3% (2/63)   
Verifying object offsets:   4% (3/63)   
Verifying object offsets:   6% (4/63)   
Verifying object offsets:   7% (5/63)   
Verifying object offsets:   9% (6/63)   
Verifying object offsets:  11% (7/63)   
Verifying object offsets:  12% (8/63)   
Verifying object offsets:  14% (9/63)   
Verifying object offsets:  15% (10/63)   
Verifying object offsets:  17% (11/63)   
Verifying object offsets:  19% (12/63)   
Verifying object offsets:  20% (13/63)   
Verifying object offsets:  22% (14/63)   
Verifying object offsets:  23% (15/63)   
Verifying object offsets:  25% (16/63)   
Verifying object offsets:  26% (17/63)   
Verifying object offsets:  28% (18/63)   
Verifying object offsets:  30% (19/63)   
Verifying object offsets:  31% (20/63)   
Verifying object offsets:  33% (21/63)   
Verifying object offsets:  34% (22/63)   
Verifying object offsets:  36% (23/63)   
Verifying object offsets:  38% (24/63)   
Verifying object offsets:  39% (25/63)   
Verifying object offsets:  41% (26/63)   
Verifying object offsets:  42% (27/63)   
Verifying object offsets:  44% (28/63)   
Verifying object offsets:  46% (29/63)   
Verifying object offsets:  47% (30/63)   
Verifying object offsets:  49% (31/63)   
Verifying object offsets:  50% (32/63)   
Verifying object offsets:  52% (33/63)   
Verifying object offsets:  53% (34/63)   
Verifying object offsets:  55% (35/63)   
Verifying object offsets:  57% (36/63)   
Verifying object offsets:  58% (37/63)   
Verifying object offsets:  60% (38/63)   
Verifying object offsets:  61% (39/63)   
Verifying object offsets:  63% (40/63)   
Verifying object offsets:  65% (41/63)   
Verifying object offsets:  66% (42/63)   
Verifying object offsets:  68% (43/63)   
Verifying object offsets:  69% (44/63)   
Verifying object offsets:  71% (45/63)   
Verifying object offsets:  73% (46/63)   
Verifying object offsets:  74% (47/63)   
Verifying object offsets:  76% (48/63)   
Verifying object offsets:  77% (49/63)   
Verifying object offsets:  79% (50/63)   
Verifying object offsets:  80% (51/63)   
Verifying object offsets:  82% (52/63)   
Verifying object offsets:  84% (53/63)   
Verifying object offsets:  85% (54/63)   
Verifying object offsets:  87% (55/63)   
Verifying object offsets:  88% (56/63)   
Verifying object offsets:  90% (57/63)   
Verifying object offsets:  92% (58/63)   
Verifying object offsets:  93% (59/63)   
Verifying object offsets:  95% (60/63)   
Verifying object offsets:  96% (61/63)   
Verifying object offsets:  98% (62/63)   
Verifying object offsets: 100% (63/63)   
Verifying object offsets: 100% (63/63), done.
-ok 36 - verify multi-pack-index with 64-bit offsets
+checking known breakage: 
+		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
+First, rewinding head to replay your work on top of it...
+Merging m with HEAD~2
+Merging:
+6db5543 m
+059091f x
+found 0 common ancestors:
+[detached HEAD b7663de] x
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:22:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 x.t
+Committed: 0001 x
+Merging m with HEAD~1
+Merging:
+b7663de x
+be1e399 y
+found 1 common ancestor:
+059091f x
+[detached HEAD 1daea3a] y
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:23:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 y.t
+Committed: 0002 y
+Merging m with HEAD~0
+Merging:
+1daea3a y
+b7cb922 bp
+found 1 common ancestor:
+be1e399 y
+[detached HEAD 1502f56] bp
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:23:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b.t
+Committed: 0003 bp
+All done.
+error: two revisions point to different objects:
+  'm': 6db5543d43a2166fae6f6d320a0b715c6c1c4278
+  'HEAD~2': b7663de6ab4faf45f5f3c4005913aa77602cd1c5
+not ok 67 - rebase -m without --onto --root with disjoint history drops patch in onto # TODO known breakage
 
 expecting success: 
-	corrupt_midx_and_verify $MIDX_BYTE_LARGE_OFFSET "\07" objects64 \
-		"incorrect object offset"
+		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 1502f56 bp
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated detached HEAD.
+ok 68 - rebase -i without --onto --root with disjoint history drops patch in onto
 
-1+0 records in
-1+0 records out
-1 byte copied, 0.00109828 s, 0.9 kB/s
-Verifying object offsets:   1% (1/63)   
Verifying object offsets:   3% (2/63)   
Verifying object offsets:   4% (3/63)   
Verifying object offsets:   6% (4/63)   
Verifying object offsets:   7% (5/63)   
Verifying object offsets:   9% (6/63)   
Verifying object offsets:  11% (7/63)   
Verifying object offsets:  12% (8/63)   
Verifying object offsets:  14% (9/63)   
Verifying object offsets:  15% (10/63)   
Verifying object offsets:  17% (11/63)   
Verifying object offsets:  19% (12/63)   
Verifying object offsets:  20% (13/63)   
Verifying object offsets:  22% (14/63)   
Verifying object offsets:  23% (15/63)   
Verifying object offsets:  25% (16/63)   
Verifying object offsets:  26% (17/63)   
Verifying object offsets:  28% (18/63)   
Verifying object offsets:  30% (19/63)   
Verifying object offsets:  31% (20/63)   
Verifying object offsets:  33% (21/63)   
Verifying object offsets:  34% (22/63)   
Verifying object offsets:  36% (23/63)   
Verifying object offsets:  38% (24/63)   
Verifying object offsets:  39% (25/63)   
Verifying object offsets:  41% (26/63)   
Verifying object offsets:  42% (27/63)   
Verifying object offsets:  44% (28/63)   
Verifying object offsets:  46% (29/63)   
Verifying object offsets:  47% (30/63)   
Verifying object offsets:  49% (31/63)   
Verifying object offsets:  50% (32/63)   
Verifying object offsets:  52% (33/63)   
Verifying object offsets:  53% (34/63)   
Verifying object offsets:  55% (35/63)   
Verifying object offsets:  57% (36/63)   
Verifying object offsets:  58% (37/63)   
Verifying object offsets:  60% (38/63)   
Verifying object offsets:  61% (39/63)   
Verifying object offsets:  63% (40/63)   
Verifying object offsets:  65% (41/63)   
Verifying object offsets:  66% (42/63)   
Verifying object offsets:  68% (43/63)   
Verifying object offsets:  69% (44/63)   
Verifying object offsets:  71% (45/63)   
Verifying object offsets:  73% (46/63)   
Verifying object offsets:  74% (47/63)   
Verifying object offsets:  76% (48/63)   
Verifying object offsets:  77% (49/63)   
Verifying object offsets:  79% (50/63)   
Verifying object offsets:  80% (51/63)   
Verifying object offsets:  82% (52/63)   
Verifying object offsets:  84% (53/63)   
Verifying object offsets:  85% (54/63)   
Verifying object offsets:  87% (55/63)   
Verifying object offsets:  88% (56/63)   
Verifying object offsets:  90% (57/63)   
Verifying object offsets:  92% (58/63)   
Verifying object offsets:  93% (59/63)   
Verifying object offsets:  95% (60/63)   
Verifying object offsets:  96% (61/63)   
incorrect object offset for oid[61] = f2377b316d0d92e3c29a2d6dba598ca02fb80e9c: 70be4 != be4
-ok 37 - verify incorrect 64-bit offset
+checking known breakage: 
+		reset_rebase &&
+		git rebase -p 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
+Rebasing (1/1)
Successfully rebased and updated detached HEAD.
+error: two revisions point to different objects:
+  'm': 6db5543d43a2166fae6f6d320a0b715c6c1c4278
+  'HEAD~2': ce450c7fd6766cb1f2df873857da7b928ff743a8
+not ok 69 - rebase -p without --onto --root with disjoint history drops patch in onto # TODO known breakage
 
-# passed all 37 test(s)
-1..37
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t5300-pack-object.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5300-pack-object/.git/
-expecting success: rm -f .git/index* &&
-     perl -e "print \"a\" x 4096;" > a &&
-     perl -e "print \"b\" x 4096;" > b &&
-     perl -e "print \"c\" x 4096;" > c &&
-     test-tool genrandom "seed a" 2097152 > a_big &&
-     test-tool genrandom "seed b" 2097152 > b_big &&
-     git update-index --add a a_big b b_big c &&
-     cat c >d && echo foo >>d && git update-index --add d &&
-     tree=$(git write-tree) &&
-     commit=$(git commit-tree $tree </dev/null) && {
-	 echo $tree &&
-	 echo $commit &&
-	 git ls-tree $tree | sed -e "s/.* \\([0-9a-f]*\\)	.*/\\1/"
-     } >obj-list && {
-	 git diff-tree --root -p $commit &&
-	 while read object
-	 do
-	    t=$(git cat-file -t $object) &&
-	    git cat-file $t $object || return 1
-	 done <obj-list
-     } >expect
-ok 1 - setup
+expecting success: 
+		reset_rebase &&
+		git rebase  --root c &&
+		test_cmp_rev c HEAD
+	
+fatal: No rebase in progress?
+HEAD is now at 6db5543 m
+Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated detached HEAD.
+ok 70 - rebase  --root on linear history is a no-op
 
-expecting success: packname_1=$(git pack-objects --window=0 test-1 <obj-list)
-ok 2 - pack without delta
+expecting success: 
+		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 71 - rebase -m --root on linear history is a no-op
 
-expecting success: 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>]
+expecting success: 
+		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 72 - rebase -i --root on linear history is a no-op
 
-    -q, --quiet           do not show progress meter
-    --progress            show progress meter
-    --all-progress        show progress meter during object writing phase
-    --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
-    --local               ignore borrowed objects from alternate object store
-    --incremental         ignore packed objects
-    --window <n>          limit pack window by objects
-    --window-memory <n>   limit pack window by memory in addition to object limit
-    --depth <n>           maximum length of delta chain allowed in the resulting pack
-    --reuse-delta         reuse existing deltas
-    --reuse-object        reuse existing objects
+checking known breakage: 
+		reset_rebase &&
+		git rebase -p --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.
+error: two revisions point to different objects:
+  'c': d9ea348e0fe8827f205c231ed0a5b8258841fd37
+  'HEAD': 8b0b08f11e6fffcd7a364144d5399bf69ae313f5
+not ok 73 - rebase -p --root on linear history is a no-op # TODO known breakage
+
+expecting success: 
+		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 8b0b08f c
+Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated detached HEAD.
+error: two revisions point to different objects:
+  'a': ce450c7fd6766cb1f2df873857da7b928ff743a8
+  'HEAD~2': 060c4193c2500f886c89b8fa8d63916f8aa4d912
+ok 74 - rebase  -f --root on linear history causes re-write
+
+expecting success: 
+		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.
+error: two revisions point to different objects:
+  'a': ce450c7fd6766cb1f2df873857da7b928ff743a8
+  'HEAD~2': 060c4193c2500f886c89b8fa8d63916f8aa4d912
+ok 75 - rebase -m -f --root on linear history causes re-write
+
+expecting success: 
+		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.
+error: two revisions point to different objects:
+  'a': ce450c7fd6766cb1f2df873857da7b928ff743a8
+  'HEAD~2': 060c4193c2500f886c89b8fa8d63916f8aa4d912
+ok 76 - rebase -i -f --root on linear history causes re-write
+
+expecting success: 
+		reset_rebase &&
+		git rebase -p -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.
+error: two revisions point to different objects:
+  'a': ce450c7fd6766cb1f2df873857da7b928ff743a8
+  'HEAD~2': 060c4193c2500f886c89b8fa8d63916f8aa4d912
+ok 77 - rebase -p -f --root on linear history causes re-write
+
+# still have 12 known breakage(s)
+# passed all remaining 65 test(s)
+1..77
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t5300-pack-object.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5300-pack-object/.git/
+expecting success: rm -f .git/index* &&
+     perl -e "print \"a\" x 4096;" > a &&
+     perl -e "print \"b\" x 4096;" > b &&
+     perl -e "print \"c\" x 4096;" > c &&
+     test-tool genrandom "seed a" 2097152 > a_big &&
+     test-tool genrandom "seed b" 2097152 > b_big &&
+     git update-index --add a a_big b b_big c &&
+     cat c >d && echo foo >>d && git update-index --add d &&
+     tree=$(git write-tree) &&
+     commit=$(git commit-tree $tree </dev/null) && {
+	 echo $tree &&
+	 echo $commit &&
+	 git ls-tree $tree | sed -e "s/.* \\([0-9a-f]*\\)	.*/\\1/"
+     } >obj-list && {
+	 git diff-tree --root -p $commit &&
+	 while read object
+	 do
+	    t=$(git cat-file -t $object) &&
+	    git cat-file $t $object || return 1
+	 done <obj-list
+     } >expect
+ok 1 - setup
+
+expecting success: packname_1=$(git pack-objects --window=0 test-1 <obj-list)
+ok 2 - pack without delta
+
+expecting success: 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, --quiet           do not show progress meter
+    --progress            show progress meter
+    --all-progress        show progress meter during object writing phase
+    --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
+    --local               ignore borrowed objects from alternate object store
+    --incremental         ignore packed objects
+    --window <n>          limit pack window by objects
+    --window-memory <n>   limit pack window by memory in addition to object limit
+    --depth <n>           maximum length of delta chain allowed in the resulting pack
+    --reuse-delta         reuse existing deltas
+    --reuse-object        reuse existing objects
     --delta-base-offset   use OFS_DELTA objects
     --threads <n>         use threads when searching for best delta matches
     --non-empty           do not create an empty pack output
@@ -148738,8 +148310,8 @@
 expecting success: GIT_OBJECT_DIRECTORY=.git2/objects &&
      export GIT_OBJECT_DIRECTORY &&
      git init &&
-     git unpack-objects -n <test-1-a3ef152d452f133a5f62f6bbc8faeb703e4313c2.pack &&
-     git unpack-objects <test-1-a3ef152d452f133a5f62f6bbc8faeb703e4313c2.pack
+     git unpack-objects -n <test-1-b6103970030a2467f25bf076c1a5d6c57ae544a1.pack &&
+     git unpack-objects <test-1-b6103970030a2467f25bf076c1a5d6c57ae544a1.pack
 Reinitialized existing Git repository in /build/git-2.20.1/t/trash directory.t5300-pack-object/.git/
 ok 4 - unpack without delta
 
@@ -148867,7 +148439,7 @@
 	)
 
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5300-pack-object/missing-pack/.git/
-keep	14c0de0c923262893ebceead6bbbf3571609c742
+keep	71e7595859d3075c4d0a4d1a3b9129a64ef4ef04
 ok 16 - survive missing objects/pack directory
 
 expecting success: git verify-pack	test-1-${packname_1}.idx \
@@ -148879,7 +148451,7 @@
 			test-2-${packname_2}.idx \
 			test-3-${packname_3}.idx
 3c5699c72c7dae4ca3b3ca9de37d68a592b50a45 tree   182 169 12
-9645cb3420e6a02cd81d754787d7ded4cf6223d0 commit 163 124 181
+d3c9d8a03cd4bcaa952deb6a40fa4b2a2f9b3fa2 commit 163 124 181
 9d235ed07cd19811a6ceb342de82f190e49c9f68 blob   4096 31 305
 012b05d476b4ffc9e62d036156b99467206f1efa blob   2097152 2097802 336
 c82de19312b6c3695c0c18f70709a6c535682a67 blob   4096 31 2098138
@@ -148887,9 +148459,9 @@
 0be779221aca65277fd447c8207e1b3c2706ae20 blob   4096 31 4195971
 b010fe5253f7dc59c6605dacb92fcea00d199d4e blob   4100 36 4196002
 non delta: 8 objects
-test-1-a3ef152d452f133a5f62f6bbc8faeb703e4313c2.pack: ok
+test-1-b6103970030a2467f25bf076c1a5d6c57ae544a1.pack: ok
 3c5699c72c7dae4ca3b3ca9de37d68a592b50a45 tree   182 169 12
-9645cb3420e6a02cd81d754787d7ded4cf6223d0 commit 163 124 181
+d3c9d8a03cd4bcaa952deb6a40fa4b2a2f9b3fa2 commit 163 124 181
 9d235ed07cd19811a6ceb342de82f190e49c9f68 blob   4096 31 305
 012b05d476b4ffc9e62d036156b99467206f1efa blob   2097152 2097802 336
 c82de19312b6c3695c0c18f70709a6c535682a67 blob   4096 31 2098138
@@ -148898,9 +148470,9 @@
 0be779221aca65277fd447c8207e1b3c2706ae20 blob   6 35 4196007 1 b010fe5253f7dc59c6605dacb92fcea00d199d4e
 non delta: 7 objects
 chain length = 1: 1 object
-test-2-746459ee1d7b0b9344cef13dff23076fa3992468.pack: ok
+test-2-9b2e71ebe72eb0ec118e1b53e9db70ad40a0092c.pack: ok
 3c5699c72c7dae4ca3b3ca9de37d68a592b50a45 tree   182 169 12
-9645cb3420e6a02cd81d754787d7ded4cf6223d0 commit 163 124 181
+d3c9d8a03cd4bcaa952deb6a40fa4b2a2f9b3fa2 commit 163 124 181
 9d235ed07cd19811a6ceb342de82f190e49c9f68 blob   4096 31 305
 012b05d476b4ffc9e62d036156b99467206f1efa blob   2097152 2097802 336
 c82de19312b6c3695c0c18f70709a6c535682a67 blob   4096 31 2098138
@@ -148909,7 +148481,7 @@
 0be779221aca65277fd447c8207e1b3c2706ae20 blob   6 16 4196007 1 b010fe5253f7dc59c6605dacb92fcea00d199d4e
 non delta: 7 objects
 chain length = 1: 1 object
-test-3-14c0de0c923262893ebceead6bbbf3571609c742.pack: ok
+test-3-71e7595859d3075c4d0a4d1a3b9129a64ef4ef04.pack: ok
 ok 18 - verify pack -v
 
 expecting success: cat test-1-${packname_1}.idx >test-3.idx &&
@@ -148929,7 +148501,7 @@
      fi
 1+0 records in
 1+0 records out
-1 byte copied, 0.000788199 s, 1.3 kB/s
+1 byte copied, 5.0255e-05 s, 19.9 kB/s
 fatal: pack signature mismatch
 ok 20 - verify-pack catches a corrupted pack signature
 
@@ -148941,7 +148513,7 @@
      fi
 1+0 records in
 1+0 records out
-1 byte copied, 0.0227305 s, 0.0 kB/s
+1 byte copied, 0.00440015 s, 0.2 kB/s
 fatal: pack version 10 unsupported
 ok 21 - verify-pack catches a corrupted pack version
 
@@ -148953,7 +148525,7 @@
      fi
 1+0 records in
 1+0 records out
-1 byte copied, 6.561e-05 s, 15.2 kB/s
+1 byte copied, 0.00490617 s, 0.2 kB/s
 fatal: pack has bad object at offset 12: unknown object type 0
 ok 22 - verify-pack catches a corrupted type/size of the 1st packed object data
 
@@ -148967,7 +148539,7 @@
      fi
 20+0 records in
 20+0 records out
-20 bytes copied, 0.00674142 s, 3.0 kB/s
+20 bytes copied, 7.438e-05 s, 269 kB/s
 fatal: sha1 file 'test-3.idx' validation error
 ok 23 - verify-pack catches a corrupted sum of the index file itself
 
@@ -148999,13 +148571,13 @@
      test -f test-4.keep &&
 
      :
-a3ef152d452f133a5f62f6bbc8faeb703e4313c2
-a3ef152d452f133a5f62f6bbc8faeb703e4313c2
-746459ee1d7b0b9344cef13dff23076fa3992468
-746459ee1d7b0b9344cef13dff23076fa3992468
-14c0de0c923262893ebceead6bbbf3571609c742
-14c0de0c923262893ebceead6bbbf3571609c742
-a3ef152d452f133a5f62f6bbc8faeb703e4313c2
+b6103970030a2467f25bf076c1a5d6c57ae544a1
+b6103970030a2467f25bf076c1a5d6c57ae544a1
+9b2e71ebe72eb0ec118e1b53e9db70ad40a0092c
+9b2e71ebe72eb0ec118e1b53e9db70ad40a0092c
+71e7595859d3075c4d0a4d1a3b9129a64ef4ef04
+71e7595859d3075c4d0a4d1a3b9129a64ef4ef04
+b6103970030a2467f25bf076c1a5d6c57ae544a1
 ok 24 - build pack index for an existing pack
 
 expecting success: 
@@ -149334,7 +148906,7 @@
 	nongit git index-pack ../foo.pack &&
 	test_path_is_file foo.idx
 
-a3ef152d452f133a5f62f6bbc8faeb703e4313c2
+b6103970030a2467f25bf076c1a5d6c57ae544a1
 ok 33 - index-pack <pack> works in non-repo
 
 expecting success: 
@@ -149342,7 +148914,7 @@
 	nongit git index-pack --strict ../foo.pack &&
 	test_path_is_file foo.idx
 
-a3ef152d452f133a5f62f6bbc8faeb703e4313c2
+b6103970030a2467f25bf076c1a5d6c57ae544a1
 ok 34 - index-pack --strict <pack> works in non-repo
 
 skipping test: index-pack --threads=N or pack.threads=N warns when no pthreads 
@@ -149390,7 +148962,7 @@
 warning: minimum pack size limit is 1 MiB
 notice: HEAD points to an unborn branch (master)
 notice: No default references
-dangling commit 9645cb3420e6a02cd81d754787d7ded4cf6223d0
+dangling commit d3c9d8a03cd4bcaa952deb6a40fa4b2a2f9b3fa2
 dangling tree ebe633107a37152edb13864b30d6878084f68c92
 dangling tree eb486020614a4c764f9df37263317ed4ea372ef8
 ok 37 - pack-objects in too-many-packs mode
@@ -149433,189 +149005,703 @@
 1..40
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t5503-tagfollow.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5503-tagfollow/.git/
+*** t5319-multi-pack-index.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5319-multi-pack-index/.git/
 expecting success: 
-	test_tick &&
-	echo ichi >file &&
-	git add file &&
-	git commit -m L &&
-	L=$(git rev-parse --verify HEAD) &&
+	test_when_finished rm -f pack/multi-pack-index &&
+	git multi-pack-index --object-dir=. write &&
+	midx_read_expect 0 0 4 .
 
-	(
-		mkdir cloned &&
-		cd cloned &&
-		git init-db &&
-		git remote add -f origin ..
-	) &&
+ok 1 - write midx with no packs
 
-	test_tick &&
-	echo A >file &&
-	git add file &&
-	git commit -m A &&
-	A=$(git rev-parse --verify HEAD)
+expecting success: 
+	test_commit initial &&
+	for i in $(test_seq 1 5)
+	do
+		generate_objects $i
+	done &&
+	commit_and_list_objects
 
-[master (root-commit) 6a9c5e4] L
+[master (root-commit) 24b24cf] initial
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 file
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5503-tagfollow/cloned/.git/
-Updating origin
-From ..
- * [new branch]      master     -> origin/master
-[master c06aaaf] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 1 - setup
+ create mode 100644 initial.t
+HEAD is now at cd0747a
+ok 2 - create objects
 
 expecting success: 
-cat - <<EOF >expect
-want $A
-EOF
+	pack=$(git pack-objects --index-version=1 $objdir/pack/test <obj-list) &&
+	test_when_finished rm $objdir/pack/test-$pack.pack \
+		$objdir/pack/test-$pack.idx $objdir/pack/multi-pack-index &&
+	git multi-pack-index --object-dir=$objdir write &&
+	midx_read_expect 1 18 4 $objdir
 
-ok 2 - setup expect
+ok 3 - write midx with one v1 pack
 
 expecting success: 
-	rm -f $U &&
-	(
-		cd cloned &&
-		GIT_TRACE_PACKET=$UPATH git fetch &&
-		test $A = $(git rev-parse --verify origin/master)
-	) &&
-	get_needs $U >actual &&
-	test_cmp expect actual
+	git pack-objects --index-version=2,0x40 $objdir/pack/test <obj-list &&
+	git multi-pack-index --object-dir=$objdir write &&
+	midx_read_expect 1 18 4 $objdir
 
-From ..
-   6a9c5e4..c06aaaf  master     -> origin/master
-ok 3 - fetch A (new commit : 1 connection)
+a10c8cef352773b1f1b38ecc868f417f3d6029c9
+ok 4 - write midx with one v2 pack
 
 expecting success: 
-	git tag -a -m tag1 tag1 $A &&
-	T=$(git rev-parse --verify tag1) &&
+		midx_git_two_modes "rev-list --objects --all" &&
+		midx_git_two_modes "log --raw" &&
+		midx_git_two_modes "count-objects --verbose" &&
+		midx_git_two_modes "cat-file --batch-all-objects --buffer --batch-check" &&
+		midx_git_two_modes "cat-file --batch-all-objects --buffer --batch-check --unsorted" sorted
+	
+error: unknown option `unsorted'
+usage: git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -p | <type> | --textconv | --filters) [--path=<path>] <object>
+   or: git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --filters]
 
-	git checkout -b cat &&
-	echo C >file &&
-	git add file &&
-	git commit -m C &&
-	C=$(git rev-parse --verify HEAD) &&
-	git checkout master
+<type> can be one of: blob, tree, commit, tag
+    -t                    show object type
+    -s                    show object size
+    -e                    exit with zero when there's no error
+    -p                    pretty-print object's content
+    --textconv            for blob objects, run textconv on object's content
+    --filters             for blob objects, run filters on object's content
+    --path <blob>         use a specific path for --textconv/--filters
+    --allow-unknown-type  allow -s and -t to work with broken/corrupt objects
+    --buffer              buffer --batch output
+    --batch[=<format>]    show info and content of objects fed from the standard input
+    --batch-check[=<format>]
+                          show info about objects fed from the standard input
+    --follow-symlinks     follow in-tree symlinks (used with --batch or --batch-check)
+    --batch-all-objects   show all objects with --batch or --batch-check
+    --unordered           do not order --batch-all-objects output
 
-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 'master'
-ok 4 - create tag T on A, create C on branch cat
+error: unknown option `unsorted'
+usage: git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -p | <type> | --textconv | --filters) [--path=<path>] <object>
+   or: git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --filters]
+
+<type> can be one of: blob, tree, commit, tag
+    -t                    show object type
+    -s                    show object size
+    -e                    exit with zero when there's no error
+    -p                    pretty-print object's content
+    --textconv            for blob objects, run textconv on object's content
+    --filters             for blob objects, run filters on object's content
+    --path <blob>         use a specific path for --textconv/--filters
+    --allow-unknown-type  allow -s and -t to work with broken/corrupt objects
+    --buffer              buffer --batch output
+    --batch[=<format>]    show info and content of objects fed from the standard input
+    --batch-check[=<format>]
+                          show info about objects fed from the standard input
+    --follow-symlinks     follow in-tree symlinks (used with --batch or --batch-check)
+    --batch-all-objects   show all objects with --batch or --batch-check
+    --unordered           do not order --batch-all-objects output
+
+ok 5 - check normal git operations: one v2 pack
 
 expecting success: 
-cat - <<EOF >expect
-want $C
-want $T
-EOF
+	for i in $(test_seq 6 10)
+	do
+		generate_objects $i
+	done &&
+	commit_and_list_objects
 
-ok 5 - setup expect
+HEAD is now at 9650f03
+ok 6 - add more objects
 
 expecting success: 
-	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
+	git pack-objects --index-version=1 $objdir/pack/test-2 <obj-list &&
+	git multi-pack-index --object-dir=$objdir write &&
+	midx_read_expect 2 34 4 $objdir
 
-From ..
- * [new branch]      cat        -> origin/cat
- * [new tag]         tag1       -> tag1
-ok 6 - fetch C, T (new branch, tag : 1 connection)
+0994129a102d56705c119b91822cbd6ef1599f8f
+ok 7 - write midx with two packs
 
 expecting success: 
-	test_tick &&
-	echo O >file &&
-	git add file &&
-	git commit -m O &&
+		midx_git_two_modes "rev-list --objects --all" &&
+		midx_git_two_modes "log --raw" &&
+		midx_git_two_modes "count-objects --verbose" &&
+		midx_git_two_modes "cat-file --batch-all-objects --buffer --batch-check" &&
+		midx_git_two_modes "cat-file --batch-all-objects --buffer --batch-check --unsorted" sorted
+	
+error: unknown option `unsorted'
+usage: git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -p | <type> | --textconv | --filters) [--path=<path>] <object>
+   or: git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --filters]
 
-	test_tick &&
-	echo B >file &&
-	git add file &&
-	git commit -m B &&
-	B=$(git rev-parse --verify HEAD) &&
+<type> can be one of: blob, tree, commit, tag
+    -t                    show object type
+    -s                    show object size
+    -e                    exit with zero when there's no error
+    -p                    pretty-print object's content
+    --textconv            for blob objects, run textconv on object's content
+    --filters             for blob objects, run filters on object's content
+    --path <blob>         use a specific path for --textconv/--filters
+    --allow-unknown-type  allow -s and -t to work with broken/corrupt objects
+    --buffer              buffer --batch output
+    --batch[=<format>]    show info and content of objects fed from the standard input
+    --batch-check[=<format>]
+                          show info about objects fed from the standard input
+    --follow-symlinks     follow in-tree symlinks (used with --batch or --batch-check)
+    --batch-all-objects   show all objects with --batch or --batch-check
+    --unordered           do not order --batch-all-objects output
 
-	git tag -a -m tag2 tag2 $B &&
-	S=$(git rev-parse --verify tag2)
+error: unknown option `unsorted'
+usage: git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -p | <type> | --textconv | --filters) [--path=<path>] <object>
+   or: git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --filters]
 
-[master 0129221] O
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[master 8e10cf4] B
+<type> can be one of: blob, tree, commit, tag
+    -t                    show object type
+    -s                    show object size
+    -e                    exit with zero when there's no error
+    -p                    pretty-print object's content
+    --textconv            for blob objects, run textconv on object's content
+    --filters             for blob objects, run filters on object's content
+    --path <blob>         use a specific path for --textconv/--filters
+    --allow-unknown-type  allow -s and -t to work with broken/corrupt objects
+    --buffer              buffer --batch output
+    --batch[=<format>]    show info and content of objects fed from the standard input
+    --batch-check[=<format>]
+                          show info about objects fed from the standard input
+    --follow-symlinks     follow in-tree symlinks (used with --batch or --batch-check)
+    --batch-all-objects   show all objects with --batch or --batch-check
+    --unordered           do not order --batch-all-objects output
+
+ok 8 - check normal git operations: two packs
+
+expecting success: 
+	for j in $(test_seq 11 20)
+	do
+		generate_objects $j &&
+		commit_and_list_objects &&
+		git pack-objects --index-version=2 $objdir/pack/test-pack <obj-list
+	done
+
+HEAD is now at b415cb4
+4c6d8ddb029b2809c9258616e15d919036135381
+HEAD is now at 3e2c62c
+1d8476b3e6c9041b953f8d970be906a61d86e9b3
+HEAD is now at 07c6d1f
+d2e5559686bb7fa03381e06d89e575c002e7877a
+HEAD is now at e2467d3
+4885e9566d4b7767d46a2de15594b706a00227ad
+HEAD is now at 047779e
+711553cae61e2a02b26974c7b6367f9dd8a2dd9e
+HEAD is now at 449cf21
+44a23559d57770dcd870b620d9c90b83b8b1dd7d
+HEAD is now at c4c6a87
+0329a72b9cac741e369a25111f9a7141e7af5809
+HEAD is now at 66c7cd9
+481644606c70ac050f24a3f7a78d1d12407e24cd
+HEAD is now at 523abe2
+1b5ae1b8c7f825dd70c1b2bd9d38143b8d9093e8
+HEAD is now at 552d56d
+283663f1cf4f2bfdb8d263c035369396648a8162
+ok 9 - add more packs
+
+expecting success: 
+		midx_git_two_modes "rev-list --objects --all" &&
+		midx_git_two_modes "log --raw" &&
+		midx_git_two_modes "count-objects --verbose" &&
+		midx_git_two_modes "cat-file --batch-all-objects --buffer --batch-check" &&
+		midx_git_two_modes "cat-file --batch-all-objects --buffer --batch-check --unsorted" sorted
+	
+error: unknown option `unsorted'
+usage: git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -p | <type> | --textconv | --filters) [--path=<path>] <object>
+   or: git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --filters]
+
+<type> can be one of: blob, tree, commit, tag
+    -t                    show object type
+    -s                    show object size
+    -e                    exit with zero when there's no error
+    -p                    pretty-print object's content
+    --textconv            for blob objects, run textconv on object's content
+    --filters             for blob objects, run filters on object's content
+    --path <blob>         use a specific path for --textconv/--filters
+    --allow-unknown-type  allow -s and -t to work with broken/corrupt objects
+    --buffer              buffer --batch output
+    --batch[=<format>]    show info and content of objects fed from the standard input
+    --batch-check[=<format>]
+                          show info about objects fed from the standard input
+    --follow-symlinks     follow in-tree symlinks (used with --batch or --batch-check)
+    --batch-all-objects   show all objects with --batch or --batch-check
+    --unordered           do not order --batch-all-objects output
+
+error: unknown option `unsorted'
+usage: git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -p | <type> | --textconv | --filters) [--path=<path>] <object>
+   or: git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --filters]
+
+<type> can be one of: blob, tree, commit, tag
+    -t                    show object type
+    -s                    show object size
+    -e                    exit with zero when there's no error
+    -p                    pretty-print object's content
+    --textconv            for blob objects, run textconv on object's content
+    --filters             for blob objects, run filters on object's content
+    --path <blob>         use a specific path for --textconv/--filters
+    --allow-unknown-type  allow -s and -t to work with broken/corrupt objects
+    --buffer              buffer --batch output
+    --batch[=<format>]    show info and content of objects fed from the standard input
+    --batch-check[=<format>]
+                          show info about objects fed from the standard input
+    --follow-symlinks     follow in-tree symlinks (used with --batch or --batch-check)
+    --batch-all-objects   show all objects with --batch or --batch-check
+    --unordered           do not order --batch-all-objects output
+
+ok 10 - check normal git operations: mixed mode (two packs + extra)
+
+expecting success: 
+	git multi-pack-index --object-dir=$objdir write &&
+	midx_read_expect 12 74 4 $objdir
+
+ok 11 - write midx with twelve packs
+
+expecting success: 
+		midx_git_two_modes "rev-list --objects --all" &&
+		midx_git_two_modes "log --raw" &&
+		midx_git_two_modes "count-objects --verbose" &&
+		midx_git_two_modes "cat-file --batch-all-objects --buffer --batch-check" &&
+		midx_git_two_modes "cat-file --batch-all-objects --buffer --batch-check --unsorted" sorted
+	
+error: unknown option `unsorted'
+usage: git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -p | <type> | --textconv | --filters) [--path=<path>] <object>
+   or: git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --filters]
+
+<type> can be one of: blob, tree, commit, tag
+    -t                    show object type
+    -s                    show object size
+    -e                    exit with zero when there's no error
+    -p                    pretty-print object's content
+    --textconv            for blob objects, run textconv on object's content
+    --filters             for blob objects, run filters on object's content
+    --path <blob>         use a specific path for --textconv/--filters
+    --allow-unknown-type  allow -s and -t to work with broken/corrupt objects
+    --buffer              buffer --batch output
+    --batch[=<format>]    show info and content of objects fed from the standard input
+    --batch-check[=<format>]
+                          show info about objects fed from the standard input
+    --follow-symlinks     follow in-tree symlinks (used with --batch or --batch-check)
+    --batch-all-objects   show all objects with --batch or --batch-check
+    --unordered           do not order --batch-all-objects output
+
+error: unknown option `unsorted'
+usage: git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -p | <type> | --textconv | --filters) [--path=<path>] <object>
+   or: git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --filters]
+
+<type> can be one of: blob, tree, commit, tag
+    -t                    show object type
+    -s                    show object size
+    -e                    exit with zero when there's no error
+    -p                    pretty-print object's content
+    --textconv            for blob objects, run textconv on object's content
+    --filters             for blob objects, run filters on object's content
+    --path <blob>         use a specific path for --textconv/--filters
+    --allow-unknown-type  allow -s and -t to work with broken/corrupt objects
+    --buffer              buffer --batch output
+    --batch[=<format>]    show info and content of objects fed from the standard input
+    --batch-check[=<format>]
+                          show info about objects fed from the standard input
+    --follow-symlinks     follow in-tree symlinks (used with --batch or --batch-check)
+    --batch-all-objects   show all objects with --batch or --batch-check
+    --unordered           do not order --batch-all-objects output
+
+ok 12 - check normal git operations: twelve packs
+
+expecting success: 
+	git multi-pack-index verify --object-dir=$objdir
+
+Verifying object offsets:   1% (1/74)   
Verifying object offsets:   2% (2/74)   
Verifying object offsets:   4% (3/74)   
Verifying object offsets:   5% (4/74)   
Verifying object offsets:   6% (5/74)   
Verifying object offsets:   8% (6/74)   
Verifying object offsets:   9% (7/74)   
Verifying object offsets:  10% (8/74)   
Verifying object offsets:  12% (9/74)   
Verifying object offsets:  13% (10/74)   
Verifying object offsets:  14% (11/74)   
Verifying object offsets:  16% (12/74)   
Verifying object offsets:  17% (13/74)   
Verifying object offsets:  18% (14/74)   
Verifying object offsets:  20% (15/74)   
Verifying object offsets:  21% (16/74)   
Verifying object offsets:  22% (17/74)   
Verifying object offsets:  24% (18/74)   
Verifying object offsets:  25% (19/74)   
Verifying object offsets:  27% (20/74)   
Verifying object offsets:  28% (21/74)   
Verifying object offsets:  29% (22/74)   
Verifying object offsets:  31% (23/74)   
Verifying object offsets:  32% (24/74)   
Verifying object offsets:  33% (25/74)   
Verifying object offsets:  35% (26/74)   
Verifying object offsets:  36% (27/74)   
Verifying object offsets:  37% (28/74)   
Verifying object offsets:  39% (29/74)   
Verifying object offsets:  40% (30/74)   
Verifying object offsets:  41% (31/74)   
Verifying object offsets:  43% (32/74)   
Verifying object offsets:  44% (33/74)   
Verifying object offsets:  45% (34/74)   
Verifying object offsets:  47% (35/74)   
Verifying object offsets:  48% (36/74)   
Verifying object offsets:  50% (37/74)   
Verifying object offsets:  51% (38/74)   
Verifying object offsets:  52% (39/74)   
Verifying object offsets:  54% (40/74)   
Verifying object offsets:  55% (41/74)   
Verifying object offsets:  56% (42/74)   
Verifying object offsets:  58% (43/74)   
Verifying object offsets:  59% (44/74)   
Verifying object offsets:  60% (45/74)   
Verifying object offsets:  62% (46/74)   
Verifying object offsets:  63% (47/74)   
Verifying object offsets:  64% (48/74)   
Verifying object offsets:  66% (49/74)   
Verifying object offsets:  67% (50/74)   
Verifying object offsets:  68% (51/74)   
Verifying object offsets:  70% (52/74)   
Verifying object offsets:  71% (53/74)   
Verifying object offsets:  72% (54/74)   
Verifying object offsets:  74% (55/74)   
Verifying object offsets:  75% (56/74)   
Verifying object offsets:  77% (57/74)   
Verifying object offsets:  78% (58/74)   
Verifying object offsets:  79% (59/74)   
Verifying object offsets:  81% (60/74)   
Verifying object offsets:  82% (61/74)   
Verifying object offsets:  83% (62/74)   
Verifying object offsets:  85% (63/74)   
Verifying object offsets:  86% (64/74)   
Verifying object offsets:  87% (65/74)   
Verifying object offsets:  89% (66/74)   
Verifying object offsets:  90% (67/74)   
Verifying object offsets:  91% (68/74)   
Verifying object offsets:  93% (69/74)   
Verifying object offsets:  94% (70/74)   
Verifying object offsets:  95% (71/74)   
Verifying object offsets:  97% (72/74)   
Verifying object offsets:  98% (73/74)   
Verifying object offsets: 100% (74/74)   
Verifying object offsets: 100% (74/74), done.
+ok 13 - verify multi-pack-index success
+
+expecting success: 
+	corrupt_midx_and_verify 0 "\00" $objdir \
+		"multi-pack-index signature"
+
+1+0 records in
+1+0 records out
+1 byte copied, 0.000696739 s, 1.4 kB/s
+fatal: multi-pack-index signature 0x00494458 does not match signature 0x4d494458
+ok 14 - verify bad signature
+
+expecting success: 
+	corrupt_midx_and_verify $MIDX_BYTE_VERSION "\00" $objdir \
+		"multi-pack-index version"
+
+1+0 records in
+1+0 records out
+1 byte copied, 0.00124445 s, 0.8 kB/s
+fatal: multi-pack-index version 0 not recognized
+ok 15 - verify bad version
+
+expecting success: 
+	corrupt_midx_and_verify $MIDX_BYTE_OID_VERSION "\02" $objdir \
+		"hash version"
+
+1+0 records in
+1+0 records out
+1 byte copied, 0.00319836 s, 0.3 kB/s
+fatal: hash version 2 does not match
+ok 16 - verify bad OID version
+
+expecting success: 
+	corrupt_midx_and_verify $MIDX_BYTE_CHUNK_COUNT "\01" $objdir \
+		"missing required"
+
+1+0 records in
+1+0 records out
+1 byte copied, 0.000886372 s, 1.1 kB/s
+fatal: multi-pack-index missing required OID fanout chunk
+ok 17 - verify truncated chunk count
+
+expecting success: 
+	corrupt_midx_and_verify $MIDX_BYTE_CHUNK_COUNT "\07" $objdir \
+		"terminating multi-pack-index chunk id appears earlier than expected"
+
+1+0 records in
+1+0 records out
+1 byte copied, 0.00294662 s, 0.3 kB/s
+fatal: terminating multi-pack-index chunk id appears earlier than expected
+ok 18 - verify extended chunk count
+
+expecting success: 
+	corrupt_midx_and_verify $MIDX_BYTE_CHUNK_ID "\01" $objdir \
+		"missing required"
+
+1+0 records in
+1+0 records out
+1 byte copied, 0.00433722 s, 0.2 kB/s
+fatal: multi-pack-index missing required pack-name chunk
+ok 19 - verify missing required chunk
+
+expecting success: 
+	corrupt_midx_and_verify $MIDX_BYTE_CHUNK_OFFSET "\01" $objdir \
+		"invalid chunk offset (too large)"
+
+1+0 records in
+1+0 records out
+1 byte copied, 8.9594e-05 s, 11.2 kB/s
+fatal: invalid chunk offset (too large)
+ok 20 - verify invalid chunk offset
+
+expecting success: 
+	corrupt_midx_and_verify $MIDX_BYTE_PACKNAME_ORDER "z" $objdir \
+		"pack names out of order"
+
+1+0 records in
+1+0 records out
+1 byte copied, 5.2843e-05 s, 18.9 kB/s
+fatal: multi-pack-index pack names out of order: 'tezt-2-0994129a102d56705c119b91822cbd6ef1599f8f.idx' before 'test-a10c8cef352773b1f1b38ecc868f417f3d6029c9.idx'
+ok 21 - verify packnames out of order
+
+expecting success: 
+	corrupt_midx_and_verify $MIDX_BYTE_PACKNAME_ORDER "a" $objdir \
+		"failed to load pack"
+
+1+0 records in
+1+0 records out
+1 byte copied, 5.6483e-05 s, 17.7 kB/s
+failed to load pack in position 0
+ok 22 - verify packnames out of order
+
+expecting success: 
+	corrupt_midx_and_verify $MIDX_BYTE_OID_FANOUT_ORDER "\01" $objdir \
+		"oid fanout out of order"
+
+1+0 records in
+1+0 records out
+1 byte copied, 5.3209e-05 s, 18.8 kB/s
+oid fanout out of order: fanout[250] = 1004a > 4a = fanout[251]
+ok 23 - verify oid fanout out of order
+
+expecting success: 
+	corrupt_midx_and_verify $MIDX_BYTE_OID_LOOKUP "\00" $objdir \
+		"oid lookup out of order"
+
+1+0 records in
+1+0 records out
+1 byte copied, 5.3133e-05 s, 18.8 kB/s
+oid lookup out of order: oid[15] = 2f695f39a9ae90106abc3a1efc22b6cfe2522e89 >= 005f923c2d2e1fff9ec067b42443fff88aeebc67 = oid[16]
+ok 24 - verify oid lookup out of order
+
+expecting success: 
+	corrupt_midx_and_verify $MIDX_BYTE_PACK_INT_ID "\07" $objdir \
+		"bad pack-int-id"
+
+1+0 records in
+1+0 records out
+1 byte copied, 0.00426693 s, 0.2 kB/s
+Verifying object offsets:   1% (1/74)   
Verifying object offsets:   2% (2/74)   
Verifying object offsets:   4% (3/74)   
Verifying object offsets:   5% (4/74)   
Verifying object offsets:   6% (5/74)   
Verifying object offsets:   8% (6/74)   
Verifying object offsets:   9% (7/74)   
Verifying object offsets:  10% (8/74)   
Verifying object offsets:  12% (9/74)   
Verifying object offsets:  13% (10/74)   
Verifying object offsets:  14% (11/74)   
Verifying object offsets:  16% (12/74)   
Verifying object offsets:  17% (13/74)   
Verifying object offsets:  18% (14/74)   
Verifying object offsets:  20% (15/74)   
Verifying object offsets:  21% (16/74)   
fatal: bad pack-int-id: 1795 (12 total packs)
+ok 25 - verify incorrect pack-int-id
+
+expecting success: 
+	corrupt_midx_and_verify $MIDX_BYTE_OFFSET "\07" $objdir \
+		"incorrect object offset"
+
+1+0 records in
+1+0 records out
+1 byte copied, 6.5449e-05 s, 15.3 kB/s
+Verifying object offsets:   1% (1/74)   
Verifying object offsets:   2% (2/74)   
Verifying object offsets:   4% (3/74)   
Verifying object offsets:   5% (4/74)   
Verifying object offsets:   6% (5/74)   
Verifying object offsets:   8% (6/74)   
Verifying object offsets:   9% (7/74)   
Verifying object offsets:  10% (8/74)   
Verifying object offsets:  12% (9/74)   
Verifying object offsets:  13% (10/74)   
Verifying object offsets:  14% (11/74)   
Verifying object offsets:  16% (12/74)   
Verifying object offsets:  17% (13/74)   
Verifying object offsets:  18% (14/74)   
Verifying object offsets:  20% (15/74)   
Verifying object offsets:  21% (16/74)   
incorrect object offset for oid[16] = 305f923c2d2e1fff9ec067b42443fff88aeebc67: 744 != 1344
+ok 26 - verify incorrect offset
+
+expecting success: 
+	corrupt_midx_and_verify $MIDX_BYTE_OFFSET "\07" $objdir \
+		"incorrect object offset" \
+		"git -c core.multipackindex=true fsck"
+
+1+0 records in
+1+0 records out
+1 byte copied, 5.6728e-05 s, 17.6 kB/s
+Verifying object offsets:   1% (1/74)   
Verifying object offsets:   2% (2/74)   
Verifying object offsets:   4% (3/74)   
Verifying object offsets:   5% (4/74)   
Verifying object offsets:   6% (5/74)   
Verifying object offsets:   8% (6/74)   
Verifying object offsets:   9% (7/74)   
Verifying object offsets:  10% (8/74)   
Verifying object offsets:  12% (9/74)   
Verifying object offsets:  13% (10/74)   
Verifying object offsets:  14% (11/74)   
Verifying object offsets:  16% (12/74)   
Verifying object offsets:  17% (13/74)   
Verifying object offsets:  18% (14/74)   
Verifying object offsets:  20% (15/74)   
Verifying object offsets:  21% (16/74)   
incorrect object offset for oid[16] = 305f923c2d2e1fff9ec067b42443fff88aeebc67: 744 != 1344
+ok 27 - git-fsck incorrect offset
+
+expecting success: 
+	test_path_is_file $objdir/pack/multi-pack-index &&
+	GIT_TEST_MULTI_PACK_INDEX=0 git repack -adf &&
+	test_path_is_missing $objdir/pack/multi-pack-index
+
+ok 28 - repack removes multi-pack-index
+
+expecting success: 
+		midx_git_two_modes "rev-list --objects --all" &&
+		midx_git_two_modes "log --raw" &&
+		midx_git_two_modes "count-objects --verbose" &&
+		midx_git_two_modes "cat-file --batch-all-objects --buffer --batch-check" &&
+		midx_git_two_modes "cat-file --batch-all-objects --buffer --batch-check --unsorted" sorted
+	
+error: unknown option `unsorted'
+usage: git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -p | <type> | --textconv | --filters) [--path=<path>] <object>
+   or: git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --filters]
+
+<type> can be one of: blob, tree, commit, tag
+    -t                    show object type
+    -s                    show object size
+    -e                    exit with zero when there's no error
+    -p                    pretty-print object's content
+    --textconv            for blob objects, run textconv on object's content
+    --filters             for blob objects, run filters on object's content
+    --path <blob>         use a specific path for --textconv/--filters
+    --allow-unknown-type  allow -s and -t to work with broken/corrupt objects
+    --buffer              buffer --batch output
+    --batch[=<format>]    show info and content of objects fed from the standard input
+    --batch-check[=<format>]
+                          show info about objects fed from the standard input
+    --follow-symlinks     follow in-tree symlinks (used with --batch or --batch-check)
+    --batch-all-objects   show all objects with --batch or --batch-check
+    --unordered           do not order --batch-all-objects output
+
+error: unknown option `unsorted'
+usage: git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -p | <type> | --textconv | --filters) [--path=<path>] <object>
+   or: git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --filters]
+
+<type> can be one of: blob, tree, commit, tag
+    -t                    show object type
+    -s                    show object size
+    -e                    exit with zero when there's no error
+    -p                    pretty-print object's content
+    --textconv            for blob objects, run textconv on object's content
+    --filters             for blob objects, run filters on object's content
+    --path <blob>         use a specific path for --textconv/--filters
+    --allow-unknown-type  allow -s and -t to work with broken/corrupt objects
+    --buffer              buffer --batch output
+    --batch[=<format>]    show info and content of objects fed from the standard input
+    --batch-check[=<format>]
+                          show info about objects fed from the standard input
+    --follow-symlinks     follow in-tree symlinks (used with --batch or --batch-check)
+    --batch-all-objects   show all objects with --batch or --batch-check
+    --unordered           do not order --batch-all-objects output
+
+ok 29 - check normal git operations: after repack
+
+expecting success: 
+	git -c repack.writeBitmaps=true repack -ad &&
+	git multi-pack-index write &&
+	git rev-list --test-bitmap HEAD
+
+Bitmap v1 test (13 entries loaded)
+Found bitmap for 552d56d6820f11b3931f91152c2ecf1a11fc074f. 128 bits / e6cc631c checksum
+Verifying bitmap entries:   1% (1/88)   
Verifying bitmap entries:   2% (2/88)   
Verifying bitmap entries:   3% (3/88)   
Verifying bitmap entries:   4% (4/88)   
Verifying bitmap entries:   5% (5/88)   
Verifying bitmap entries:   6% (6/88)   
Verifying bitmap entries:   7% (7/88)   
Verifying bitmap entries:   9% (8/88)   
Verifying bitmap entries:  10% (9/88)   
Verifying bitmap entries:  11% (10/88)   
Verifying bitmap entries:  12% (11/88)   
Verifying bitmap entries:  13% (12/88)   
Verifying bitmap entries:  14% (13/88)   
Verifying bitmap entries:  15% (14/88)   
Verifying bitmap entries:  17% (15/88)   
Verifying bitmap entries:  18% (16/88)   
Verifying bitmap entries:  19% (17/88)   
Verifying bitmap entries:  20% (18/88)   
Verifying bitmap entries:  21% (19/88)   
Verifying bitmap entries:  22% (20/88)   
Verifying bitmap entries:  23% (21/88)   
Verifying bitmap entries:  25% (22/88)   
Verifying bitmap entries:  26% (23/88)   
Verifying bitmap entries:  27% (24/88)   
Verifying bitmap entries:  28% (25/88)   
Verifying bitmap entries:  29% (26/88)   
Verifying bitmap entries:  30% (27/88)   
Verifying bitmap entries:  31% (28/88)   
Verifying bitmap entries:  32% (29/88)   
Verifying bitmap entries:  34% (30/88)   
Verifying bitmap entries:  35% (31/88)   
Verifying bitmap entries:  36% (32/88)   
Verifying bitmap entries:  37% (33/88)   
Verifying bitmap entries:  38% (34/88)   
Verifying bitmap entries:  39% (35/88)   
Verifying bitmap entries:  40% (36/88)   
Verifying bitmap entries:  42% (37/88)   
Verifying bitmap entries:  43% (38/88)   
Verifying bitmap entries:  44% (39/88)   
Verifying bitmap entries:  45% (40/88)   
Verifying bitmap entries:  46% (41/88)   
Verifying bitmap entries:  47% (42/88)   
Verifying bitmap entries:  48% (43/88)   
Verifying bitmap entries:  50% (44/88)   
Verifying bitmap entries:  51% (45/88)   
Verifying bitmap entries:  52% (46/88)   
Verifying bitmap entries:  53% (47/88)   
Verifying bitmap entries:  54% (48/88)   
Verifying bitmap entries:  55% (49/88)   
Verifying bitmap entries:  56% (50/88)   
Verifying bitmap entries:  57% (51/88)   
Verifying bitmap entries:  59% (52/88)   
Verifying bitmap entries:  60% (53/88)   
Verifying bitmap entries:  61% (54/88)   
Verifying bitmap entries:  62% (55/88)   
Verifying bitmap entries:  63% (56/88)   
Verifying bitmap entries:  64% (57/88)   
Verifying bitmap entries:  65% (58/88)   
Verifying bitmap entries:  67% (59/88)   
Verifying bitmap entries:  68% (60/88)   
Verifying bitmap entries:  69% (61/88)   
Verifying bitmap entries:  70% (62/88)   
Verifying bitmap entries:  71% (63/88)   
Verifying bitmap entries:  72% (64/88)   
Verifying bitmap entries:  73% (65/88)   
Verifying bitmap entries:  75% (66/88)   
Verifying bitmap entries:  76% (67/88)   
Verifying bitmap entries:  77% (68/88)   
Verifying bitmap entries:  78% (69/88)   
Verifying bitmap entries:  79% (70/88)   
Verifying bitmap entries:  80% (71/88)   
Verifying bitmap entries:  81% (72/88)   
Verifying bitmap entries:  82% (73/88)   
Verifying bitmap entries:  84% (74/88)   
Verifying bitmap entries:  85% (75/88)   
Verifying bitmap entries:  86% (76/88)   
Verifying bitmap entries:  87% (77/88)   
Verifying bitmap entries:  88% (78/88)   
Verifying bitmap entries:  89% (79/88)   
Verifying bitmap entries:  90% (80/88)   
Verifying bitmap entries:  92% (81/88)   
Verifying bitmap entries:  93% (82/88)   
Verifying bitmap entries:  94% (83/88)   
Verifying bitmap entries:  95% (84/88)   
Verifying bitmap entries:  96% (85/88)   
Verifying bitmap entries:  97% (86/88)   
Verifying bitmap entries:  98% (87/88)   
Verifying bitmap entries: 100% (88/88)   
Verifying bitmap entries: 100% (88/88), done.
+OK!
+ok 30 - multi-pack-index and pack-bitmap
+
+expecting success: 
+	git init --bare alt.git &&
+	echo $(pwd)/alt.git/objects >.git/objects/info/alternates &&
+	echo content1 >file1 &&
+	altblob=$(GIT_DIR=alt.git git hash-object -w file1) &&
+	git cat-file blob $altblob &&
+	git rev-list --all
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5319-multi-pack-index/alt.git/
+content1
+552d56d6820f11b3931f91152c2ecf1a11fc074f
+24b24cf8a829f5b8c30dfc018b0a459a2ccaf380
+523abe232fb4b7b686a145aa302ea4a19e94f75f
+66c7cd909447f8f29bd3553b0fb2f6512d8e6752
+c4c6a878655615fb0e9fa97b0473c1fbdb0b298b
+449cf2153bd5dd5a5dad8bbc707653502e036576
+047779e14850a36f69fefa6343e0f8a567e1a73e
+e2467d303a5f701dd2748207035e3d6fb96f865b
+07c6d1f0c163edff34bac6da1fea4dcf321e55fa
+3e2c62cf4a31af79719533e93d0acbbaf3a77688
+b415cb40170102eb11cb275c506470a89d8cd0e5
+9650f031c9f135ac62532bbe0d0c31c73d1bb7fb
+cd0747a9352b58d112f0010134351efc7bbad4a6
+ok 31 - multi-pack-index and alternates
+
+expecting success: 
+		midx_git_two_modes "rev-list --objects --all" &&
+		midx_git_two_modes "log --raw" &&
+		midx_git_two_modes "count-objects --verbose" &&
+		midx_git_two_modes "cat-file --batch-all-objects --buffer --batch-check" &&
+		midx_git_two_modes "cat-file --batch-all-objects --buffer --batch-check --unsorted" sorted
+	
+error: unknown option `unsorted'
+usage: git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -p | <type> | --textconv | --filters) [--path=<path>] <object>
+   or: git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --filters]
+
+<type> can be one of: blob, tree, commit, tag
+    -t                    show object type
+    -s                    show object size
+    -e                    exit with zero when there's no error
+    -p                    pretty-print object's content
+    --textconv            for blob objects, run textconv on object's content
+    --filters             for blob objects, run filters on object's content
+    --path <blob>         use a specific path for --textconv/--filters
+    --allow-unknown-type  allow -s and -t to work with broken/corrupt objects
+    --buffer              buffer --batch output
+    --batch[=<format>]    show info and content of objects fed from the standard input
+    --batch-check[=<format>]
+                          show info about objects fed from the standard input
+    --follow-symlinks     follow in-tree symlinks (used with --batch or --batch-check)
+    --batch-all-objects   show all objects with --batch or --batch-check
+    --unordered           do not order --batch-all-objects output
+
+error: unknown option `unsorted'
+usage: git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -p | <type> | --textconv | --filters) [--path=<path>] <object>
+   or: git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --filters]
+
+<type> can be one of: blob, tree, commit, tag
+    -t                    show object type
+    -s                    show object size
+    -e                    exit with zero when there's no error
+    -p                    pretty-print object's content
+    --textconv            for blob objects, run textconv on object's content
+    --filters             for blob objects, run filters on object's content
+    --path <blob>         use a specific path for --textconv/--filters
+    --allow-unknown-type  allow -s and -t to work with broken/corrupt objects
+    --buffer              buffer --batch output
+    --batch[=<format>]    show info and content of objects fed from the standard input
+    --batch-check[=<format>]
+                          show info about objects fed from the standard input
+    --follow-symlinks     follow in-tree symlinks (used with --batch or --batch-check)
+    --batch-all-objects   show all objects with --batch or --batch-check
+    --unordered           do not order --batch-all-objects output
+
+ok 32 - check normal git operations: with alternate (local midx)
+
+expecting success: 
+	mv .git/objects/pack/* alt.git/objects/pack &&
+	test_commit add_local_objects &&
+	git repack --local &&
+	git multi-pack-index write &&
+	midx_read_expect 1 3 4 $objdir &&
+	git reset --hard HEAD~1 &&
+	rm -f .git/objects/pack/*
+
+[master 705a1ea] add_local_objects
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 7 - create commits O, B, tag S on B
+ 1 file changed, 1 insertion(+)
+ create mode 100644 add_local_objects.t
+HEAD is now at 552d56d
+ok 33 - multi-pack-index in an alternate
 
 expecting success: 
-cat - <<EOF >expect
-want $B
-want $S
-EOF
+		midx_git_two_modes "rev-list --objects --all" &&
+		midx_git_two_modes "log --raw" &&
+		midx_git_two_modes "count-objects --verbose" &&
+		midx_git_two_modes "cat-file --batch-all-objects --buffer --batch-check" &&
+		midx_git_two_modes "cat-file --batch-all-objects --buffer --batch-check --unsorted" sorted
+	
+error: unknown option `unsorted'
+usage: git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -p | <type> | --textconv | --filters) [--path=<path>] <object>
+   or: git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --filters]
 
-ok 8 - setup expect
+<type> can be one of: blob, tree, commit, tag
+    -t                    show object type
+    -s                    show object size
+    -e                    exit with zero when there's no error
+    -p                    pretty-print object's content
+    --textconv            for blob objects, run textconv on object's content
+    --filters             for blob objects, run filters on object's content
+    --path <blob>         use a specific path for --textconv/--filters
+    --allow-unknown-type  allow -s and -t to work with broken/corrupt objects
+    --buffer              buffer --batch output
+    --batch[=<format>]    show info and content of objects fed from the standard input
+    --batch-check[=<format>]
+                          show info about objects fed from the standard input
+    --follow-symlinks     follow in-tree symlinks (used with --batch or --batch-check)
+    --batch-all-objects   show all objects with --batch or --batch-check
+    --unordered           do not order --batch-all-objects output
+
+error: unknown option `unsorted'
+usage: git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -p | <type> | --textconv | --filters) [--path=<path>] <object>
+   or: git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --filters]
+
+<type> can be one of: blob, tree, commit, tag
+    -t                    show object type
+    -s                    show object size
+    -e                    exit with zero when there's no error
+    -p                    pretty-print object's content
+    --textconv            for blob objects, run textconv on object's content
+    --filters             for blob objects, run filters on object's content
+    --path <blob>         use a specific path for --textconv/--filters
+    --allow-unknown-type  allow -s and -t to work with broken/corrupt objects
+    --buffer              buffer --batch output
+    --batch[=<format>]    show info and content of objects fed from the standard input
+    --batch-check[=<format>]
+                          show info about objects fed from the standard input
+    --follow-symlinks     follow in-tree symlinks (used with --batch or --batch-check)
+    --batch-all-objects   show all objects with --batch or --batch-check
+    --unordered           do not order --batch-all-objects output
+
+ok 34 - check normal git operations: with alternate (remote midx)
 
 expecting success: 
-	rm -f $U &&
-	(
-		cd cloned &&
-		GIT_TRACE_PACKET=$UPATH git fetch &&
-		test $B = $(git rev-parse --verify origin/master) &&
-		test $B = $(git rev-parse --verify tag2^0) &&
-		test $S = $(git rev-parse --verify tag2)
-	) &&
-	get_needs $U >actual &&
-	test_cmp expect actual
+	mkdir objects64 &&
+	mkdir objects64/pack &&
+	for i in $(test_seq 1 11)
+	do
+		generate_objects 11
+	done &&
+	commit_and_list_objects &&
+	pack64=$(git pack-objects --index-version=2,0x40 objects64/pack/test-64 <obj-list) &&
+	idx64=objects64/pack/test-64-$pack64.idx &&
+	chmod u+w $idx64 &&
+	corrupt_data $idx64 2999 "\02" &&
+	midx64=$(git multi-pack-index --object-dir=objects64 write) &&
+	midx_read_expect 1 63 5 objects64 " large-offsets"
 
-From ..
-   c06aaaf..8e10cf4  master     -> origin/master
- * [new tag]         tag2       -> tag2
-ok 9 - fetch B, S (commit and tag : 1 connection)
+HEAD is now at 287f5d9
+1+0 records in
+1+0 records out
+1 byte copied, 5.1646e-05 s, 19.4 kB/s
+ok 35 - force some 64-bit offsets with pack-objects
 
 expecting success: 
-cat - <<EOF >expect
-want $B
-want $S
-EOF
+	git multi-pack-index verify --object-dir=objects64
 
-ok 10 - setup expect
+Verifying object offsets:   1% (1/63)   
Verifying object offsets:   3% (2/63)   
Verifying object offsets:   4% (3/63)   
Verifying object offsets:   6% (4/63)   
Verifying object offsets:   7% (5/63)   
Verifying object offsets:   9% (6/63)   
Verifying object offsets:  11% (7/63)   
Verifying object offsets:  12% (8/63)   
Verifying object offsets:  14% (9/63)   
Verifying object offsets:  15% (10/63)   
Verifying object offsets:  17% (11/63)   
Verifying object offsets:  19% (12/63)   
Verifying object offsets:  20% (13/63)   
Verifying object offsets:  22% (14/63)   
Verifying object offsets:  23% (15/63)   
Verifying object offsets:  25% (16/63)   
Verifying object offsets:  26% (17/63)   
Verifying object offsets:  28% (18/63)   
Verifying object offsets:  30% (19/63)   
Verifying object offsets:  31% (20/63)   
Verifying object offsets:  33% (21/63)   
Verifying object offsets:  34% (22/63)   
Verifying object offsets:  36% (23/63)   
Verifying object offsets:  38% (24/63)   
Verifying object offsets:  39% (25/63)   
Verifying object offsets:  41% (26/63)   
Verifying object offsets:  42% (27/63)   
Verifying object offsets:  44% (28/63)   
Verifying object offsets:  46% (29/63)   
Verifying object offsets:  47% (30/63)   
Verifying object offsets:  49% (31/63)   
Verifying object offsets:  50% (32/63)   
Verifying object offsets:  52% (33/63)   
Verifying object offsets:  53% (34/63)   
Verifying object offsets:  55% (35/63)   
Verifying object offsets:  57% (36/63)   
Verifying object offsets:  58% (37/63)   
Verifying object offsets:  60% (38/63)   
Verifying object offsets:  61% (39/63)   
Verifying object offsets:  63% (40/63)   
Verifying object offsets:  65% (41/63)   
Verifying object offsets:  66% (42/63)   
Verifying object offsets:  68% (43/63)   
Verifying object offsets:  69% (44/63)   
Verifying object offsets:  71% (45/63)   
Verifying object offsets:  73% (46/63)   
Verifying object offsets:  74% (47/63)   
Verifying object offsets:  76% (48/63)   
Verifying object offsets:  77% (49/63)   
Verifying object offsets:  79% (50/63)   
Verifying object offsets:  80% (51/63)   
Verifying object offsets:  82% (52/63)   
Verifying object offsets:  84% (53/63)   
Verifying object offsets:  85% (54/63)   
Verifying object offsets:  87% (55/63)   
Verifying object offsets:  88% (56/63)   
Verifying object offsets:  90% (57/63)   
Verifying object offsets:  92% (58/63)   
Verifying object offsets:  93% (59/63)   
Verifying object offsets:  95% (60/63)   
Verifying object offsets:  96% (61/63)   
Verifying object offsets:  98% (62/63)   
Verifying object offsets: 100% (63/63)   
Verifying object offsets: 100% (63/63), done.
+ok 36 - verify multi-pack-index with 64-bit offsets
 
 expecting success: 
-	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/master) &&
-		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
+	corrupt_midx_and_verify $MIDX_BYTE_LARGE_OFFSET "\07" objects64 \
+		"incorrect object offset"
 
-Deleted branch cat (was f888ed6).
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5503-tagfollow/clone2/.git/
-From ..
- * [new branch]      master     -> origin/master
- * [new tag]         tag2       -> tag2
- * [new tag]         tag1       -> tag1
-ok 11 - new clone fetch master and tags
+1+0 records in
+1+0 records out
+1 byte copied, 4.5487e-05 s, 22.0 kB/s
+Verifying object offsets:   1% (1/63)   
Verifying object offsets:   3% (2/63)   
Verifying object offsets:   4% (3/63)   
Verifying object offsets:   6% (4/63)   
Verifying object offsets:   7% (5/63)   
Verifying object offsets:   9% (6/63)   
Verifying object offsets:  11% (7/63)   
Verifying object offsets:  12% (8/63)   
Verifying object offsets:  14% (9/63)   
Verifying object offsets:  15% (10/63)   
Verifying object offsets:  17% (11/63)   
Verifying object offsets:  19% (12/63)   
Verifying object offsets:  20% (13/63)   
Verifying object offsets:  22% (14/63)   
Verifying object offsets:  23% (15/63)   
Verifying object offsets:  25% (16/63)   
Verifying object offsets:  26% (17/63)   
Verifying object offsets:  28% (18/63)   
Verifying object offsets:  30% (19/63)   
Verifying object offsets:  31% (20/63)   
Verifying object offsets:  33% (21/63)   
Verifying object offsets:  34% (22/63)   
Verifying object offsets:  36% (23/63)   
Verifying object offsets:  38% (24/63)   
Verifying object offsets:  39% (25/63)   
Verifying object offsets:  41% (26/63)   
Verifying object offsets:  42% (27/63)   
Verifying object offsets:  44% (28/63)   
Verifying object offsets:  46% (29/63)   
Verifying object offsets:  47% (30/63)   
Verifying object offsets:  49% (31/63)   
Verifying object offsets:  50% (32/63)   
Verifying object offsets:  52% (33/63)   
Verifying object offsets:  53% (34/63)   
Verifying object offsets:  55% (35/63)   
Verifying object offsets:  57% (36/63)   
Verifying object offsets:  58% (37/63)   
Verifying object offsets:  60% (38/63)   
Verifying object offsets:  61% (39/63)   
Verifying object offsets:  63% (40/63)   
Verifying object offsets:  65% (41/63)   
Verifying object offsets:  66% (42/63)   
Verifying object offsets:  68% (43/63)   
Verifying object offsets:  69% (44/63)   
Verifying object offsets:  71% (45/63)   
Verifying object offsets:  73% (46/63)   
Verifying object offsets:  74% (47/63)   
Verifying object offsets:  76% (48/63)   
Verifying object offsets:  77% (49/63)   
Verifying object offsets:  79% (50/63)   
Verifying object offsets:  80% (51/63)   
Verifying object offsets:  82% (52/63)   
Verifying object offsets:  84% (53/63)   
Verifying object offsets:  85% (54/63)   
Verifying object offsets:  87% (55/63)   
Verifying object offsets:  88% (56/63)   
Verifying object offsets:  90% (57/63)   
Verifying object offsets:  92% (58/63)   
Verifying object offsets:  93% (59/63)   
Verifying object offsets:  95% (60/63)   
Verifying object offsets:  96% (61/63)   
incorrect object offset for oid[61] = f2377b316d0d92e3c29a2d6dba598ca02fb80e9c: 70be4 != be4
+ok 37 - verify incorrect 64-bit offset
 
-# passed all 11 test(s)
-1..11
+# passed all 37 test(s)
+1..37
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
 *** t5407-post-rewrite-hook.sh ***
@@ -150160,6 +150246,285 @@
 1..14
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
+*** t5503-tagfollow.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5503-tagfollow/.git/
+expecting success: 
+	test_tick &&
+	echo ichi >file &&
+	git add file &&
+	git commit -m L &&
+	L=$(git rev-parse --verify HEAD) &&
+
+	(
+		mkdir cloned &&
+		cd cloned &&
+		git init-db &&
+		git remote add -f origin ..
+	) &&
+
+	test_tick &&
+	echo A >file &&
+	git add file &&
+	git commit -m A &&
+	A=$(git rev-parse --verify HEAD)
+
+[master (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/git-2.20.1/t/trash directory.t5503-tagfollow/cloned/.git/
+Updating origin
+From ..
+ * [new branch]      master     -> origin/master
+[master c06aaaf] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 1 - setup
+
+expecting success: 
+cat - <<EOF >expect
+want $A
+EOF
+
+ok 2 - setup expect
+
+expecting success: 
+	rm -f $U &&
+	(
+		cd cloned &&
+		GIT_TRACE_PACKET=$UPATH git fetch &&
+		test $A = $(git rev-parse --verify origin/master)
+	) &&
+	get_needs $U >actual &&
+	test_cmp expect actual
+
+From ..
+   6a9c5e4..c06aaaf  master     -> origin/master
+ok 3 - fetch A (new commit : 1 connection)
+
+expecting success: 
+	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 master
+
+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 'master'
+ok 4 - create tag T on A, create C on branch cat
+
+expecting success: 
+cat - <<EOF >expect
+want $C
+want $T
+EOF
+
+ok 5 - setup expect
+
+expecting success: 
+	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
+
+From ..
+ * [new branch]      cat        -> origin/cat
+ * [new tag]         tag1       -> tag1
+ok 6 - fetch C, T (new branch, tag : 1 connection)
+
+expecting success: 
+	test_tick &&
+	echo O >file &&
+	git add file &&
+	git commit -m O &&
+
+	test_tick &&
+	echo B >file &&
+	git add file &&
+	git commit -m B &&
+	B=$(git rev-parse --verify HEAD) &&
+
+	git tag -a -m tag2 tag2 $B &&
+	S=$(git rev-parse --verify tag2)
+
+[master 0129221] O
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[master 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: 
+cat - <<EOF >expect
+want $B
+want $S
+EOF
+
+ok 8 - setup expect
+
+expecting success: 
+	rm -f $U &&
+	(
+		cd cloned &&
+		GIT_TRACE_PACKET=$UPATH git fetch &&
+		test $B = $(git rev-parse --verify origin/master) &&
+		test $B = $(git rev-parse --verify tag2^0) &&
+		test $S = $(git rev-parse --verify tag2)
+	) &&
+	get_needs $U >actual &&
+	test_cmp expect actual
+
+From ..
+   c06aaaf..8e10cf4  master     -> origin/master
+ * [new tag]         tag2       -> tag2
+ok 9 - fetch B, S (commit and tag : 1 connection)
+
+expecting success: 
+cat - <<EOF >expect
+want $B
+want $S
+EOF
+
+ok 10 - setup expect
+
+expecting success: 
+	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/master) &&
+		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
+
+Deleted branch cat (was f888ed6).
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5503-tagfollow/clone2/.git/
+From ..
+ * [new branch]      master     -> origin/master
+ * [new tag]         tag2       -> tag2
+ * [new tag]         tag1       -> tag1
+ok 11 - new clone fetch master and tags
+
+# passed all 11 test(s)
+1..11
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t5507-remote-environment.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5507-remote-environment/.git/
+expecting success: 
+	test_commit one &&
+	git config push.default current &&
+	git init remote
+
+[master (root-commit) d79ce16] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5507-remote-environment/remote/.git/
+ok 1 - set up "remote" push situation
+
+expecting success: 
+	GIT_SSH_COMMAND="f() {
+		cd \"\$TRASH_DIRECTORY\" &&
+		eval \"\$2\"
+	}; f" &&
+	export GIT_SSH_COMMAND &&
+	export TRASH_DIRECTORY
+
+ok 2 - set up fake ssh
+
+expecting success: 
+	test_must_fail git push remote
+
+remote: error: refusing to update checked out branch: refs/heads/master        
+remote: error: By default, updating the current branch in a non-bare repository        
+remote: is denied, because it will make the index and work tree inconsistent        
+remote: with what you pushed, and will require 'git reset --hard' to match        
+remote: the work tree to HEAD.        
+remote: 
+remote: You can set the 'receive.denyCurrentBranch' configuration variable        
+remote: to 'ignore' or 'warn' in the remote repository to allow pushing into        
+remote: its current branch; however, this is not recommended unless you        
+remote: arranged to update its work tree to match what you pushed in some        
+remote: other way.        
+remote: 
+remote: To squelch this message and still keep the default behaviour, set        
+remote: 'receive.denyCurrentBranch' configuration variable to 'refuse'.        
+To remote
+ ! [remote rejected] master -> master (branch is currently checked out)
+error: failed to push some refs to 'remote'
+ok 3 - confirm default push fails
+
+expecting success: 
+	test_must_fail git -c receive.denyCurrentBranch=false push remote
+
+remote: error: refusing to update checked out branch: refs/heads/master        
+remote: error: By default, updating the current branch in a non-bare repository        
+remote: is denied, because it will make the index and work tree inconsistent        
+remote: with what you pushed, and will require 'git reset --hard' to match        
+remote: the work tree to HEAD.        
+remote: 
+remote: You can set the 'receive.denyCurrentBranch' configuration variable        
+remote: to 'ignore' or 'warn' in the remote repository to allow pushing into        
+remote: its current branch; however, this is not recommended unless you        
+remote: arranged to update its work tree to match what you pushed in some        
+remote: other way.        
+remote: 
+remote: To squelch this message and still keep the default behaviour, set        
+remote: 'receive.denyCurrentBranch' configuration variable to 'refuse'.        
+To remote
+ ! [remote rejected] master -> master (branch is currently checked out)
+error: failed to push some refs to 'remote'
+ok 4 - config does not travel over same-machine push
+
+expecting success: 
+	test_must_fail git -c receive.denyCurrentBranch=false push host:remote
+
+remote: error: refusing to update checked out branch: refs/heads/master        
+remote: error: By default, updating the current branch in a non-bare repository        
+remote: is denied, because it will make the index and work tree inconsistent        
+remote: with what you pushed, and will require 'git reset --hard' to match        
+remote: the work tree to HEAD.        
+remote: 
+remote: You can set the 'receive.denyCurrentBranch' configuration variable        
+remote: to 'ignore' or 'warn' in the remote repository to allow pushing into        
+remote: its current branch; however, this is not recommended unless you        
+remote: arranged to update its work tree to match what you pushed in some        
+remote: other way.        
+remote: 
+remote: To squelch this message and still keep the default behaviour, set        
+remote: 'receive.denyCurrentBranch' configuration variable to 'refuse'.        
+To host:remote
+ ! [remote rejected] master -> master (branch is currently checked out)
+error: failed to push some refs to 'host:remote'
+ok 5 - config does not travel over ssh push
+
+# passed all 5 test(s)
+1..5
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
 *** t5501-fetch-push-alternates.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5501-fetch-push-alternates/.git/
 expecting success: 
@@ -150190,312 +150555,312 @@
 	echo "$A" >fetcher/.git/objects/info/alternates
 
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5501-fetch-push-alternates/original/.git/
-[master (root-commit) bee08cc] 0
+[master (root-commit) ef3b604] 0
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 count
-[master f418143] 1
+[master 8fb824a] 1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-[master 3732717] 2
+[master 9c7eaf6] 2
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-[master 23fe25a] 3
+[master 52303cd] 3
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-[master ac88b92] 4
+[master 5259a03] 4
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-[master c7edd8a] 5
+[master 4b06802] 5
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-[master e13c714] 6
+[master af7a0aa] 6
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-[master 9daf6c2] 7
+[master 897e1ad] 7
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-[master 22df53e] 8
+[master e61286b] 8
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-[master 06e296e] 9
+[master b8bdd8d] 9
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-[master 90ba895] 10
+[master 6ebcabb] 10
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-[master 8219b2f] 11
+[master 06036cc] 11
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-[master 59ab584] 12
+[master 6c0a7e3] 12
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-[master 90c3e56] 13
+[master 55c52d0] 13
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-[master ab7389b] 14
+[master 50c9a4c] 14
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-[master 52a002c] 15
+[master b1c8681] 15
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-[master 6351499] 16
+[master ed17f5e] 16
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-[master 9157baa] 17
+[master 0b7e776] 17
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-[master 3d263f0] 18
+[master a56c28a] 18
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-[master 342b379] 19
+[master ca5aa58] 19
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-[master d3241b0] 20
+[master 38a6548] 20
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-[master 32b9a82] 21
+[master 709c71a] 21
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-[master 6faa78f] 22
+[master 001e29f] 22
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-[master 108b2a0] 23
+[master 8ede24b] 23
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-[master 44bf285] 24
+[master f60afe9] 24
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-[master 5f2456f] 25
+[master a396fe1] 25
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-[master 3593525] 26
+[master a66f41c] 26
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-[master 71995ef] 27
+[master 7e95ca4] 27
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-[master ac195e7] 28
+[master 2288ecd] 28
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-[master 610a3c1] 29
+[master f65a696] 29
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-[master bca9245] 30
+[master 675cfec] 30
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-[master 16c9a82] 31
+[master 01f106f] 31
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-[master a21d753] 32
+[master b2846a5] 32
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-[master 1752d85] 33
+[master cd3184b] 33
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-[master ab65866] 34
+[master 16d1073] 34
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-[master f446e45] 35
+[master d3ad60b] 35
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-[master f5116e9] 36
+[master 9b1d73a] 36
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-[master ecaf9d1] 37
+[master a47d759] 37
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-[master 084fc65] 38
+[master dcaf8e6] 38
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-[master f05d203] 39
+[master 323da35] 39
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-[master b9637ad] 40
+[master b47a4b3] 40
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-[master cf050cf] 41
+[master 54834e2] 41
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-[master 3cf57c1] 42
+[master dbaa2a0] 42
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-[master ed2cd6a] 43
+[master 147f58a] 43
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-[master c6766e8] 44
+[master 8a6e9c6] 44
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-[master b83a8d5] 45
+[master 23b3bbb] 45
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-[master 8f7caa4] 46
+[master ea4bbeb] 46
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-[master a320530] 47
+[master ff48230] 47
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-[master 3cb7dde] 48
+[master 284ca9b] 48
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-[master 50e49f0] 49
+[master a00bd1d] 49
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-[master f0e71ba] 50
+[master 030cbcf] 50
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-[master 7319a1c] 51
+[master 7f941ea] 51
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-[master b5c34b7] 52
+[master fce7ee1] 52
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-[master d8be29e] 53
+[master 5d5cd18] 53
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-[master b9936c4] 54
+[master 6baf32d] 54
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-[master 6c52d93] 55
+[master ece6a2c] 55
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-[master 629c765] 56
+[master cf4bbce] 56
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-[master 728ebbc] 57
+[master 271c5de] 57
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-[master de5ead5] 58
+[master d105dc9] 58
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-[master d01bcdd] 59
+[master b770bef] 59
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-[master 4cc2a1e] 60
+[master d7009da] 60
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-[master a1287e7] 61
+[master b2de001] 61
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-[master 9c10120] 62
+[master 7e35e11] 62
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-[master bec5933] 63
+[master 91666ee] 63
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-[master ac535c7] 64
+[master bfc1b0d] 64
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-[master c3114f0] 65
+[master 2c43b8b] 65
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-[master 8fd4c04] 66
+[master 1a3bcfd] 66
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-[master 217912a] 67
+[master 2c713fb] 67
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-[master 5c5bd1d] 68
+[master 3ce8268] 68
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-[master 35e62e8] 69
+[master a7039d2] 69
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-[master 82d4402] 70
+[master c0e7634] 70
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-[master 24e90bd] 71
+[master aa1c8f1] 71
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-[master f2b4b18] 72
+[master 2139515] 72
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-[master 4af371b] 73
+[master 24a5aab] 73
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-[master 4b20c92] 74
+[master becca14] 74
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-[master 62d81ee] 75
+[master 35813b9] 75
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-[master 409fe20] 76
+[master 63e5b03] 76
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-[master fbc2ef9] 77
+[master f61e0ab] 77
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-[master 7e4cad8] 78
+[master 97ea880] 78
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-[master 6e2233a] 79
+[master 4cffcd3] 79
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-[master efc8dc7] 80
+[master 9801739] 80
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-[master 1f5788c] 81
+[master 9651ec9] 81
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-[master ca4397e] 82
+[master 96ddc3c] 82
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-[master da1be7a] 83
+[master f5fed6c] 83
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-[master fa353b6] 84
+[master 0aa9a81] 84
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-[master 95cb2da] 85
+[master 69dd70e] 85
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-[master 354898c] 86
+[master d770c94] 86
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-[master 7019e7f] 87
+[master 3d283eb] 87
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-[master 508f05f] 88
+[master 8f08f96] 88
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-[master c3022fd] 89
+[master 7e757f6] 89
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-[master f3632d1] 90
+[master c2e95ac] 90
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-[master 1d971d8] 91
+[master f03bb72] 91
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-[master 602fa84] 92
+[master 064d3e7] 92
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-[master 9988889] 93
+[master 3e36f61] 93
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-[master aae2d01] 94
+[master c83ab50] 94
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-[master 6559350] 95
+[master 0ffecd1] 95
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-[master f27af69] 96
+[master 9a5d8b1] 96
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-[master f79f734] 97
+[master 194a7dc] 97
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-[master 618f431] 98
+[master ba99a77] 98
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-[master 6039e56] 99
+[master ec44e52] 99
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-[master 4200551] 100
+[master 4bff3f7] 100
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 Cloning into 'one'...
-[master 889cf3a] Z
+[master cff071d] Z
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5501-fetch-push-alternates/receiver/.git/
@@ -151190,7 +151555,7 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 5.8223e-05 s, 17.2 kB/s
+1 byte copied, 4.6993e-05 s, 21.3 kB/s
 error: graph signature 475048 does not match signature 43475048
 ok 46 - detect bad signature
 
@@ -151200,7 +151565,7 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 6.236e-05 s, 16.0 kB/s
+1 byte copied, 0.000851594 s, 1.2 kB/s
 error: graph version 2 does not match version 1
 ok 47 - detect bad version
 
@@ -151210,7 +151575,7 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 5.7644e-05 s, 17.3 kB/s
+1 byte copied, 0.000960356 s, 1.0 kB/s
 error: hash version 2 does not match version 1
 ok 48 - detect bad hash version
 
@@ -151220,7 +151585,7 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 5.6787e-05 s, 17.6 kB/s
+1 byte copied, 0.000830794 s, 1.2 kB/s
 commit-graph is missing the Commit Data chunk
 ok 49 - detect low chunk count
 
@@ -151230,7 +151595,7 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 5.9195e-05 s, 16.9 kB/s
+1 byte copied, 0.000678177 s, 1.5 kB/s
 commit-graph is missing the OID Fanout chunk
 ok 50 - detect missing OID fanout chunk
 
@@ -151240,7 +151605,7 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 6.4844e-05 s, 15.4 kB/s
+1 byte copied, 6.2167e-05 s, 16.1 kB/s
 commit-graph is missing the OID Lookup chunk
 ok 51 - detect missing OID lookup chunk
 
@@ -151250,7 +151615,7 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 5.9304e-05 s, 16.9 kB/s
+1 byte copied, 0.00117095 s, 0.9 kB/s
 commit-graph is missing the Commit Data chunk
 ok 52 - detect missing commit data chunk
 
@@ -151260,7 +151625,7 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 0.0072746 s, 0.1 kB/s
+1 byte copied, 6.3408e-05 s, 15.8 kB/s
 commit-graph has incorrect fanout value: fanout[4] = 16777216 != 0
 ok 53 - detect incorrect fanout
 
@@ -151270,7 +151635,7 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 6.8938e-05 s, 14.5 kB/s
+1 byte copied, 0.00161101 s, 0.6 kB/s
 commit-graph has incorrect fanout value: fanout[255] = 16777225 != 9
 ok 54 - detect incorrect fanout final value
 
@@ -151280,7 +151645,7 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 6.4026e-05 s, 15.6 kB/s
+1 byte copied, 5.2488e-05 s, 19.1 kB/s
 commit-graph has incorrect OID order: d0dcf978085b712ac89a73020e40fb8b7e540ec4 then 01c8575ed6fc205127629848895ac35ba7529ace
 ok 55 - detect incorrect OID order
 
@@ -151290,7 +151655,7 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 5.9586e-05 s, 16.8 kB/s
+1 byte copied, 5.5734e-05 s, 17.9 kB/s
 failed to parse 76c4cb0cede3ceaca44a01b27edce46ba498dfad from object database
 ok 56 - detect OID not in object database
 
@@ -151300,7 +151665,7 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 6.4147e-05 s, 15.6 kB/s
+1 byte copied, 0.000824472 s, 1.2 kB/s
 Verifying commits in commit graph:  11% (1/9)   
root tree OID for commit 12a06f3a2c235980d878903e940b0570ddda4359 in commit-graph is 016f0284c84f93b3e8df8c402054b760afac7e76 != 566f0284c84f93b3e8df8c402054b760afac7e76
 ok 57 - detect incorrect tree OID
 
@@ -151310,7 +151675,7 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 6.7247e-05 s, 14.9 kB/s
+1 byte copied, 0.00474756 s, 0.2 kB/s
 fatal: invalid parent position 16777220
 ok 58 - detect incorrect parent int-id
 
@@ -151320,7 +151685,7 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 5.7757e-05 s, 17.3 kB/s
+1 byte copied, 5.0115e-05 s, 20.0 kB/s
 Verifying commits in commit graph:  11% (1/9)   
commit-graph parent list for commit 12a06f3a2c235980d878903e940b0570ddda4359 is too long
 ok 59 - detect extra parent int-id
 
@@ -151330,7 +151695,7 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 6.2482e-05 s, 16.0 kB/s
+1 byte copied, 5.5087e-05 s, 18.2 kB/s
 Verifying commits in commit graph:  11% (1/9)   
commit-graph parent for 12a06f3a2c235980d878903e940b0570ddda4359 is 2c45687afab8ea0442fe2feb61881deac6f37339 != 76c4cb0cede3ceaca44a1bb27edce46ba498dfad
 ok 60 - detect wrong parent
 
@@ -151340,7 +151705,7 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 5.5442e-05 s, 18.0 kB/s
+1 byte copied, 5.8095e-05 s, 17.2 kB/s
 Verifying commits in commit graph:  11% (1/9)   
commit-graph generation for commit 12a06f3a2c235980d878903e940b0570ddda4359 is 14 != 4
 Verifying commits in commit graph:  22% (2/9)   
Verifying commits in commit graph:  33% (3/9)   
commit-graph generation for commit 2ff07863aadb0941159dda60d980783f6b7c6213 is 5 != 15
 ok 61 - detect incorrect generation number
@@ -151351,7 +151716,7 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 0.00663151 s, 0.2 kB/s
+1 byte copied, 5.55e-05 s, 18.0 kB/s
 Verifying commits in commit graph:  11% (1/9)   
Verifying commits in commit graph:  22% (2/9)   
commit-graph has non-zero generation number for commit 2c45687afab8ea0442fe2feb61881deac6f37339, but zero elsewhere
 Verifying commits in commit graph:  33% (3/9)   
commit-graph has non-zero generation number for commit 2ff07863aadb0941159dda60d980783f6b7c6213, but zero elsewhere
 Verifying commits in commit graph:  44% (4/9)   
commit-graph has non-zero generation number for commit 6efda21b208586f8c4843ba0dac4f2717254a2fc, but zero elsewhere
@@ -151368,7 +151733,7 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 0.0149085 s, 0.1 kB/s
+1 byte copied, 5.2049e-05 s, 19.2 kB/s
 Verifying commits in commit graph:  11% (1/9)   
commit date for commit 12a06f3a2c235980d878903e940b0570ddda4359 in commit-graph is 22393313 != 1112912353
 ok 63 - detect incorrect commit date
 
@@ -151378,7 +151743,7 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 6.8924e-05 s, 14.5 kB/s
+1 byte copied, 5.0895e-05 s, 19.6 kB/s
 fatal: invalid parent position 16777216
 ok 64 - detect incorrect parent for octopus merge
 
@@ -151388,7 +151753,7 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 0.00828028 s, 0.1 kB/s
+1 byte copied, 0.00731104 s, 0.1 kB/s
 the commit-graph file has incorrect checksum and is likely corrupt
 ok 65 - detect invalid checksum hash
 
@@ -151404,7 +151769,7 @@
 Verifying commits in commit graph:  11% (1/9)   
Verifying commits in commit graph:  22% (2/9)   
Verifying commits in commit graph:  33% (3/9)   
Verifying commits in commit graph:  44% (4/9)   
Verifying commits in commit graph:  55% (5/9)   
Verifying commits in commit graph:  66% (6/9)   
Verifying commits in commit graph:  77% (7/9)   
Verifying commits in commit graph:  88% (8/9)   
Verifying commits in commit graph: 100% (9/9)   
Verifying commits in commit graph: 100% (9/9), done.
 1+0 records in
 1+0 records out
-1 byte copied, 6.1415e-05 s, 16.3 kB/s
+1 byte copied, 5.5115e-05 s, 18.1 kB/s
 the commit-graph file has incorrect checksum and is likely corrupt
 dangling tree 40771367e5b0a0c62eafabaac4494d311c5834b7
 dangling commit 63d6d7935dc7a26dbeede4b52105dd78e9a0c6c9
@@ -151466,98 +151831,164 @@
 1..69
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t5507-remote-environment.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5507-remote-environment/.git/
+*** t5509-fetch-push-namespaces.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5509-fetch-push-namespaces/.git/
 expecting success: 
-	test_commit one &&
-	git config push.default current &&
-	git init remote
+	git config --global protocol.ext.allow user &&
+	test_tick &&
+	git init original &&
+	(
+		cd original &&
+		echo 0 >count &&
+		git add count &&
+		test_commit 0 &&
+		echo 1 >count &&
+		git add count &&
+		test_commit 1 &&
+		git remote add pushee-namespaced "ext::git --namespace=namespace %s ../pushee" &&
+		git remote add pushee-unnamespaced ../pushee
+	) &&
+	commit0=$(cd original && git rev-parse HEAD^) &&
+	commit1=$(cd original && git rev-parse HEAD) &&
+	git init pushee &&
+	git init puller
 
-[master (root-commit) d79ce16] one
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5509-fetch-push-namespaces/original/.git/
+[master (root-commit) fbdf431] 0
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5507-remote-environment/remote/.git/
-ok 1 - set up "remote" push situation
+ 2 files changed, 2 insertions(+)
+ create mode 100644 0.t
+ create mode 100644 count
+[master dc65a2e] 1
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+ create mode 100644 1.t
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5509-fetch-push-namespaces/pushee/.git/
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5509-fetch-push-namespaces/puller/.git/
+ok 1 - setup
 
 expecting success: 
-	GIT_SSH_COMMAND="f() {
-		cd \"\$TRASH_DIRECTORY\" &&
-		eval \"\$2\"
-	}; f" &&
-	export GIT_SSH_COMMAND &&
-	export TRASH_DIRECTORY
+	(
+		cd original &&
+		git push pushee-namespaced master &&
+		git ls-remote pushee-namespaced >actual &&
+		printf "$commit1\trefs/heads/master\n" >expected &&
+		test_cmp expected actual &&
+		git push pushee-namespaced --tags &&
+		git ls-remote pushee-namespaced >actual &&
+		printf "$commit0\trefs/tags/0\n" >>expected &&
+		printf "$commit1\trefs/tags/1\n" >>expected &&
+		test_cmp expected actual &&
+		# Verify that the GIT_NAMESPACE environment variable works as well
+		GIT_NAMESPACE=namespace git ls-remote "ext::git %s ../pushee" >actual &&
+		test_cmp expected actual &&
+		# Verify that --namespace overrides GIT_NAMESPACE
+		GIT_NAMESPACE=garbage git ls-remote pushee-namespaced >actual &&
+		test_cmp expected actual &&
+		# Try a namespace with no content
+		git ls-remote "ext::git --namespace=garbage %s ../pushee" >actual &&
+		test_must_be_empty actual &&
+		git ls-remote pushee-unnamespaced >actual &&
+		sed -e "s|refs/|refs/namespaces/namespace/refs/|" expected >expected.unnamespaced &&
+		test_cmp expected.unnamespaced actual
+	)
 
-ok 2 - set up fake ssh
+To ext::git --namespace=namespace %s ../pushee
+ * [new branch]      master -> master
+To ext::git --namespace=namespace %s ../pushee
+ * [new tag]         0 -> 0
+ * [new tag]         1 -> 1
+ok 2 - pushing into a repository using a ref namespace
 
 expecting success: 
-	test_must_fail git push remote
+	(
+		cd puller &&
+		git remote add -f pushee-namespaced "ext::git --namespace=namespace %s ../pushee" &&
+		git for-each-ref refs/ >actual &&
+		printf "$commit1 commit\trefs/remotes/pushee-namespaced/master\n" >expected &&
+		printf "$commit0 commit\trefs/tags/0\n" >>expected &&
+		printf "$commit1 commit\trefs/tags/1\n" >>expected &&
+		test_cmp expected actual
+	)
 
-remote: error: refusing to update checked out branch: refs/heads/master        
-remote: error: By default, updating the current branch in a non-bare repository        
-remote: is denied, because it will make the index and work tree inconsistent        
-remote: with what you pushed, and will require 'git reset --hard' to match        
-remote: the work tree to HEAD.        
-remote: 
-remote: You can set the 'receive.denyCurrentBranch' configuration variable        
-remote: to 'ignore' or 'warn' in the remote repository to allow pushing into        
-remote: its current branch; however, this is not recommended unless you        
-remote: arranged to update its work tree to match what you pushed in some        
-remote: other way.        
-remote: 
-remote: To squelch this message and still keep the default behaviour, set        
-remote: 'receive.denyCurrentBranch' configuration variable to 'refuse'.        
-To remote
- ! [remote rejected] master -> master (branch is currently checked out)
-error: failed to push some refs to 'remote'
-ok 3 - confirm default push fails
+Updating pushee-namespaced
+From ext::git --namespace=namespace %s ../pushee
+ * [new branch]      master     -> pushee-namespaced/master
+ * [new tag]         1          -> 1
+ * [new tag]         0          -> 0
+Bad commandok 3 - pulling from a repository using a ref namespace
 
 expecting success: 
-	test_must_fail git -c receive.denyCurrentBranch=false push remote
+	git clone --mirror pushee mirror &&
+	(
+		cd mirror &&
+		git for-each-ref refs/ >actual &&
+		printf "$commit1 commit\trefs/namespaces/namespace/refs/heads/master\n" >expected &&
+		printf "$commit0 commit\trefs/namespaces/namespace/refs/tags/0\n" >>expected &&
+		printf "$commit1 commit\trefs/namespaces/namespace/refs/tags/1\n" >>expected &&
+		test_cmp expected actual
+	)
 
-remote: error: refusing to update checked out branch: refs/heads/master        
-remote: error: By default, updating the current branch in a non-bare repository        
-remote: is denied, because it will make the index and work tree inconsistent        
-remote: with what you pushed, and will require 'git reset --hard' to match        
-remote: the work tree to HEAD.        
-remote: 
-remote: You can set the 'receive.denyCurrentBranch' configuration variable        
-remote: to 'ignore' or 'warn' in the remote repository to allow pushing into        
-remote: its current branch; however, this is not recommended unless you        
-remote: arranged to update its work tree to match what you pushed in some        
-remote: other way.        
-remote: 
-remote: To squelch this message and still keep the default behaviour, set        
-remote: 'receive.denyCurrentBranch' configuration variable to 'refuse'.        
-To remote
- ! [remote rejected] master -> master (branch is currently checked out)
-error: failed to push some refs to 'remote'
-ok 4 - config does not travel over same-machine push
+Cloning into bare repository 'mirror'...
+done.
+ok 4 - mirroring a repository using a ref namespace
 
 expecting success: 
-	test_must_fail git -c receive.denyCurrentBranch=false push host:remote
+	GIT_NAMESPACE=namespace \
+		git -C pushee -c transfer.hideRefs=refs/tags \
+		ls-remote "ext::git %s ." >actual &&
+	printf "$commit1\trefs/heads/master\n" >expected &&
+	test_cmp expected actual
 
-remote: error: refusing to update checked out branch: refs/heads/master        
-remote: error: By default, updating the current branch in a non-bare repository        
-remote: is denied, because it will make the index and work tree inconsistent        
-remote: with what you pushed, and will require 'git reset --hard' to match        
-remote: the work tree to HEAD.        
-remote: 
-remote: You can set the 'receive.denyCurrentBranch' configuration variable        
-remote: to 'ignore' or 'warn' in the remote repository to allow pushing into        
-remote: its current branch; however, this is not recommended unless you        
-remote: arranged to update its work tree to match what you pushed in some        
-remote: other way.        
-remote: 
-remote: To squelch this message and still keep the default behaviour, set        
-remote: 'receive.denyCurrentBranch' configuration variable to 'refuse'.        
-To host:remote
- ! [remote rejected] master -> master (branch is currently checked out)
-error: failed to push some refs to 'host:remote'
-ok 5 - config does not travel over ssh push
+ok 5 - hide namespaced refs with transfer.hideRefs
 
-# passed all 5 test(s)
-1..5
+expecting success: 
+	GIT_NAMESPACE=namespace \
+		git -C pushee -c transfer.hideRefs=refs/namespaces/namespace/refs/tags \
+		ls-remote "ext::git %s ." >actual &&
+	printf "$commit1\trefs/heads/master\n" >expected &&
+	printf "$commit0\trefs/tags/0\n" >>expected &&
+	printf "$commit1\trefs/tags/1\n" >>expected &&
+	test_cmp expected actual
+
+ok 6 - check that transfer.hideRefs does not match unstripped refs
+
+expecting success: 
+	GIT_NAMESPACE=namespace \
+		git -C pushee -c transfer.hideRefs="^refs/namespaces/namespace/refs/tags" \
+		ls-remote "ext::git %s ." >actual &&
+	printf "$commit1\trefs/heads/master\n" >expected &&
+	test_cmp expected actual
+
+ok 7 - hide full refs with transfer.hideRefs
+
+expecting success: 
+	test_config -C pushee transfer.hideRefs refs/heads/master &&
+	test_must_fail git -C original push pushee-namespaced master
+
+To ext::git --namespace=namespace %s ../pushee
+ ! [remote rejected] master -> master (deny updating a hidden ref)
+error: failed to push some refs to 'ext::git --namespace=namespace %s ../pushee'
+ok 8 - try to update a hidden ref
+
+expecting success: 
+	test_config -C pushee transfer.hideRefs refs/namespaces/namespace/refs/heads/master &&
+	git -C original push pushee-namespaced master
+
+Everything up-to-date
+ok 9 - try to update a ref that is not hidden
+
+expecting success: 
+	test_config -C pushee transfer.hideRefs "^refs/namespaces/namespace/refs/heads/master" &&
+	test_must_fail git -C original push pushee-namespaced master
+
+To ext::git --namespace=namespace %s ../pushee
+ ! [remote rejected] master -> master (deny updating a hidden ref)
+error: failed to push some refs to 'ext::git --namespace=namespace %s ../pushee'
+ok 10 - try to update a hidden full ref
+
+# passed all 10 test(s)
+1..10
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
 *** t5506-remote-groups.sh ***
@@ -151579,11 +152010,11 @@
 	repo_fetched one &&
 	repo_fetched two
 
-[master (root-commit) 283e6df] update-all
+[master (root-commit) b99dfaf] update-all
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 file
-[master (root-commit) 283e6df] update-all
+[master (root-commit) b99dfaf] update-all
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 file
@@ -151604,10 +152035,10 @@
 	! repo_fetched one &&
 	! repo_fetched two
 
-[master 60704fe] nonexistent
+[master afa9ae9] nonexistent
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[master 60704fe] nonexistent
+[master afa9ae9] nonexistent
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 fatal: No such remote or remote group: nonexistent
@@ -151624,18 +152055,18 @@
 	repo_fetched one &&
 	repo_fetched two
 
-[master d8b94a9] group-all
+[master fd7ab50] group-all
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[master d8b94a9] group-all
+[master fd7ab50] group-all
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 Fetching one
 From one
-   283e6df..d8b94a9  master     -> one/master
+   b99dfaf..fd7ab50  master     -> one/master
 Fetching two
 From two
-   283e6df..d8b94a9  master     -> two/master
+   b99dfaf..fd7ab50  master     -> two/master
 repo was fetched: one
 repo was fetched: two
 ok 4 - updating group updates all members (remote update)
@@ -151647,18 +152078,18 @@
 	repo_fetched one &&
 	repo_fetched two
 
-[master fcf2e78] fetch-group-all
+[master 8cf4c2d] fetch-group-all
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[master fb49a43] fetch-group-all
+[master 8cf4c2d] fetch-group-all
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 Fetching one
 From one
-   d8b94a9..fcf2e78  master     -> one/master
+   fd7ab50..8cf4c2d  master     -> one/master
 Fetching two
 From two
-   d8b94a9..fb49a43  master     -> two/master
+   fd7ab50..8cf4c2d  master     -> two/master
 repo was fetched: one
 repo was fetched: two
 ok 5 - updating group updates all members (fetch)
@@ -151671,15 +152102,15 @@
 	repo_fetched one &&
 	! repo_fetched two
 
-[master 6b434a6] group-some
+[master 05a1303] group-some
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[master da062ec] group-some
+[master 05a1303] group-some
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 Fetching one
 From one
-   fcf2e78..6b434a6  master     -> one/master
+   8cf4c2d..05a1303  master     -> one/master
 repo was fetched: one
 repo was not fetched: two
 ok 6 - updating group does not update non-members (remote update)
@@ -151692,15 +152123,15 @@
 	repo_fetched one &&
 	! repo_fetched two
 
-[master c44390e] fetch-group-some
+[master a7b68ed] fetch-group-some
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[master c64c4dd] fetch-group-some
+[master a7b68ed] fetch-group-some
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 Fetching one
 From one
-   6b434a6..c44390e  master     -> one/master
+   05a1303..a7b68ed  master     -> one/master
 Fetching one
 repo was fetched: one
 repo was not fetched: two
@@ -151713,15 +152144,15 @@
 	repo_fetched one &&
 	! repo_fetched two
 
-[master 9d45262] remote-name
+[master 99e029f] remote-name
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[master bfd1839] remote-name
+[master 99e029f] remote-name
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 Fetching one
 From one
-   c44390e..9d45262  master     -> one/master
+   a7b68ed..99e029f  master     -> one/master
 repo was fetched: one
 repo was not fetched: two
 ok 8 - updating remote name updates that remote
@@ -151730,6 +152161,536 @@
 1..8
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
+*** t5513-fetch-track.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5513-fetch-track/.git/
+expecting success: 
+	>file &&
+	git add . &&
+	test_tick &&
+	git commit -m Initial &&
+	git branch b-0 &&
+	git branch b1 &&
+	git branch b/one &&
+	test_create_repo other &&
+	(
+		cd other &&
+		git config remote.origin.url .. &&
+		git config remote.origin.fetch "+refs/heads/b/*:refs/remotes/b/*"
+	)
+
+[master (root-commit) 9d34b14] Initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 file
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5513-fetch-track/other/.git/
+ok 1 - setup
+
+expecting success: 
+	(
+		cd other && git fetch origin &&
+		test "$(git for-each-ref --format="%(refname)")" = refs/remotes/b/one
+	)
+
+From ..
+ * [new branch]      b/one      -> b/one
+ok 2 - fetch
+
+# passed all 2 test(s)
+1..2
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t5504-fetch-receive-strict.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5504-fetch-receive-strict/.git/
+expecting success: 
+	echo hello >greetings &&
+	git add greetings &&
+	git commit -m greetings &&
+
+	S=$(git rev-parse :greetings | sed -e "s|^..|&/|") &&
+	X=$(echo bye | git hash-object -w --stdin | sed -e "s|^..|&/|") &&
+	echo $S >S &&
+	echo $X >X &&
+	cp .git/objects/$S .git/objects/$S.back &&
+	mv -f .git/objects/$X .git/objects/$S &&
+
+	test_must_fail git fsck
+
+[master (root-commit) e7cb80e] greetings
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 greetings
+error: sha1 mismatch for .git/objects/ce/013625030ba8dba906f756967f9e9ca394464a (expected ce013625030ba8dba906f756967f9e9ca394464a)
+error: ce013625030ba8dba906f756967f9e9ca394464a: object corrupt or missing: .git/objects/ce/013625030ba8dba906f756967f9e9ca394464a
+bad sha1 file: .git/objects/ce/013625030ba8dba906f756967f9e9ca394464a.back
+missing blob ce013625030ba8dba906f756967f9e9ca394464a
+ok 1 - setup and inject "corrupt or missing" object
+
+expecting success: 
+	rm -rf dst &&
+	git init dst &&
+	(
+		cd dst &&
+		git config fetch.fsckobjects false &&
+		git config transfer.fsckobjects false &&
+		test_must_fail git fetch ../.git master
+	)
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5504-fetch-receive-strict/dst/.git/
+fatal: missing blob object 'ce013625030ba8dba906f756967f9e9ca394464a'
+error: ../.git did not send all necessary objects
+
+ok 2 - fetch without strict
+
+expecting success: 
+	rm -rf dst &&
+	git init dst &&
+	(
+		cd dst &&
+		git config fetch.fsckobjects false &&
+		git config transfer.fsckobjects true &&
+		test_must_fail git fetch ../.git master
+	)
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5504-fetch-receive-strict/dst/.git/
+fatal: missing blob object 'ce013625030ba8dba906f756967f9e9ca394464a'
+error: ../.git did not send all necessary objects
+
+ok 3 - fetch with !fetch.fsckobjects
+
+expecting success: 
+	rm -rf dst &&
+	git init dst &&
+	(
+		cd dst &&
+		git config fetch.fsckobjects true &&
+		git config transfer.fsckobjects false &&
+		test_must_fail git fetch ../.git master
+	)
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5504-fetch-receive-strict/dst/.git/
+fatal: object of unexpected type
+fatal: unpack-objects failed
+ok 4 - fetch with fetch.fsckobjects
+
+expecting success: 
+	rm -rf dst &&
+	git init dst &&
+	(
+		cd dst &&
+		git config transfer.fsckobjects true &&
+		test_must_fail git fetch ../.git master
+	)
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5504-fetch-receive-strict/dst/.git/
+fatal: object of unexpected type
+fatal: unpack-objects failed
+ok 5 - fetch with transfer.fsckobjects
+
+expecting success: 
+	rm -rf dst &&
+	git init dst &&
+	(
+		cd dst &&
+		git config fetch.fsckobjects false &&
+		git config transfer.fsckobjects false
+	) &&
+	test_must_fail git push --porcelain dst master:refs/heads/test >act &&
+	test_cmp exp act
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5504-fetch-receive-strict/dst/.git/
+remote: fatal: missing blob object 'ce013625030ba8dba906f756967f9e9ca394464a'        
+fatal: missing blob object 'ce013625030ba8dba906f756967f9e9ca394464a'
+error: failed to push some refs to 'dst'
+ok 6 - push without strict
+
+expecting success: 
+	rm -rf dst &&
+	git init dst &&
+	(
+		cd dst &&
+		git config receive.fsckobjects false &&
+		git config transfer.fsckobjects true
+	) &&
+	test_must_fail git push --porcelain dst master:refs/heads/test >act &&
+	test_cmp exp act
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5504-fetch-receive-strict/dst/.git/
+remote: fatal: missing blob object 'ce013625030ba8dba906f756967f9e9ca394464a'        
+fatal: missing blob object 'ce013625030ba8dba906f756967f9e9ca394464a'
+error: failed to push some refs to 'dst'
+ok 7 - push with !receive.fsckobjects
+
+expecting success: 
+	rm -rf dst &&
+	git init dst &&
+	(
+		cd dst &&
+		git config receive.fsckobjects true &&
+		git config transfer.fsckobjects false
+	) &&
+	test_must_fail git push --porcelain dst master:refs/heads/test >act &&
+	test_cmp exp act
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5504-fetch-receive-strict/dst/.git/
+remote: fatal: object of unexpected type        
+error: remote unpack failed: unpack-objects abnormal exit
+error: failed to push some refs to 'dst'
+ok 8 - push with receive.fsckobjects
+
+expecting success: 
+	rm -rf dst &&
+	git init dst &&
+	(
+		cd dst &&
+		git config transfer.fsckobjects true
+	) &&
+	test_must_fail git push --porcelain dst master:refs/heads/test >act &&
+	test_cmp exp act
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5504-fetch-receive-strict/dst/.git/
+remote: fatal: object of unexpected type        
+error: remote unpack failed: unpack-objects abnormal exit
+error: failed to push some refs to 'dst'
+ok 9 - push with transfer.fsckobjects
+
+expecting success: 
+	mv -f .git/objects/$(cat S) .git/objects/$(cat X) &&
+	mv .git/objects/$(cat S).back .git/objects/$(cat S) &&
+	rm -rf .git/objects/$(cat X) &&
+	git fsck
+
+ok 10 - repair the "corrupt or missing" object
+
+expecting success: 
+	commit="$(git hash-object -t commit -w --stdin <bogus-commit)"
+
+ok 11 - setup bogus commit
+
+expecting success: 
+	test_must_fail git fsck 2>err &&
+	test_i18ngrep "missingEmail" err
+
+dangling commit 6516fe4a6d0c9202861748d549d2e2b20e5210c9
+error in commit 6516fe4a6d0c9202861748d549d2e2b20e5210c9: missingEmail: invalid author/committer line - missing email
+ok 12 - fsck with no skipList input
+
+expecting success: 
+	cat >SKIP.unsorted <<-EOF &&
+	0000000000000000000000000000000000000004
+	0000000000000000000000000000000000000002
+	$commit
+	0000000000000000000000000000000000000001
+	0000000000000000000000000000000000000003
+	EOF
+	sort SKIP.unsorted >SKIP.sorted
+
+ok 13 - setup sorted and unsorted skipLists
+
+expecting success: 
+	git -c fsck.skipList=SKIP.sorted fsck
+
+dangling commit 6516fe4a6d0c9202861748d549d2e2b20e5210c9
+ok 14 - fsck with sorted skipList
+
+expecting success: 
+	git -c fsck.skipList=SKIP.unsorted fsck
+
+dangling commit 6516fe4a6d0c9202861748d549d2e2b20e5210c9
+ok 15 - fsck with unsorted skipList
+
+expecting success: 
+	git -c fsck.skipList=/dev/null -c fsck.missingEmail=ignore fsck &&
+	test_must_fail git -c fsck.skipList=does-not-exist -c fsck.missingEmail=ignore fsck 2>err &&
+	test_i18ngrep "Could not open skip list: does-not-exist" err &&
+	test_must_fail git -c fsck.skipList=.git/config -c fsck.missingEmail=ignore fsck 2>err &&
+	test_i18ngrep "Invalid SHA-1: \[core\]" err
+
+dangling commit 6516fe4a6d0c9202861748d549d2e2b20e5210c9
+fatal: Could not open skip list: does-not-exist
+fatal: Invalid SHA-1: [core]
+ok 16 - fsck with invalid or bogus skipList input
+
+expecting success: 
+	cat >SKIP.with-comment <<-EOF &&
+	# Some bad commit
+	0000000000000000000000000000000000000001
+	EOF
+	test_must_fail git -c fsck.skipList=SKIP.with-comment fsck 2>err-with-comment &&
+	test_i18ngrep "missingEmail" err-with-comment &&
+	cat >SKIP.with-empty-line <<-EOF &&
+	0000000000000000000000000000000000000001
+
+	0000000000000000000000000000000000000002
+	EOF
+	test_must_fail git -c fsck.skipList=SKIP.with-empty-line fsck 2>err-with-empty-line &&
+	test_i18ngrep "missingEmail" err-with-empty-line
+
+dangling commit 6516fe4a6d0c9202861748d549d2e2b20e5210c9
+error in commit 6516fe4a6d0c9202861748d549d2e2b20e5210c9: missingEmail: invalid author/committer line - missing email
+dangling commit 6516fe4a6d0c9202861748d549d2e2b20e5210c9
+error in commit 6516fe4a6d0c9202861748d549d2e2b20e5210c9: missingEmail: invalid author/committer line - missing email
+ok 17 - fsck with other accepted skipList input (comments & empty lines)
+
+expecting success: 
+	test_line_count = 1 err-with-comment &&
+	test_line_count = 1 err-with-empty-line
+
+ok 18 - fsck no garbage output from comments & empty lines errors
+
+expecting success: 
+	echo $commit | test_copy_bytes 20 >SKIP.abbreviated &&
+	test_must_fail git -c fsck.skipList=SKIP.abbreviated fsck 2>err-abbreviated &&
+	test_i18ngrep "^fatal: Invalid SHA-1: " err-abbreviated
+
+fatal: Invalid SHA-1: 6516fe4a6d0c92028617
+ok 19 - fsck with invalid abbreviated skipList input
+
+expecting success: 
+	>SKIP.exhaustive &&
+	echo "# A commented line" >>SKIP.exhaustive &&
+	echo "" >>SKIP.exhaustive &&
+	echo " " >>SKIP.exhaustive &&
+	echo " # Comment after whitespace" >>SKIP.exhaustive &&
+	echo "$commit # Our bad commit (with leading whitespace and trailing comment)" >>SKIP.exhaustive &&
+	echo "# Some bad commit (leading whitespace)" >>SKIP.exhaustive &&
+	echo "  0000000000000000000000000000000000000001" >>SKIP.exhaustive &&
+	git -c fsck.skipList=SKIP.exhaustive fsck 2>err &&
+	test_must_be_empty err
+
+dangling commit 6516fe4a6d0c9202861748d549d2e2b20e5210c9
+ok 20 - fsck with exhaustive accepted skipList input (various types of comments etc.)
+
+expecting success: 
+	git push . $commit:refs/heads/bogus &&
+	rm -rf dst &&
+	git init dst &&
+	git --git-dir=dst/.git config receive.fsckObjects true &&
+	test_must_fail git push --porcelain dst bogus &&
+	echo $commit >dst/.git/SKIP &&
+
+	# receive.fsck.* does not fall back on fsck.*
+	git --git-dir=dst/.git config fsck.skipList SKIP &&
+	test_must_fail git push --porcelain dst bogus &&
+
+	# Invalid and/or bogus skipList input
+	git --git-dir=dst/.git config receive.fsck.skipList /dev/null &&
+	test_must_fail git push --porcelain dst bogus &&
+	git --git-dir=dst/.git config receive.fsck.skipList does-not-exist &&
+	test_must_fail git push --porcelain dst bogus 2>err &&
+	test_i18ngrep "Could not open skip list: does-not-exist" err &&
+	git --git-dir=dst/.git config receive.fsck.skipList config &&
+	test_must_fail git push --porcelain dst bogus 2>err &&
+	test_i18ngrep "Invalid SHA-1: \[core\]" err &&
+
+	git --git-dir=dst/.git config receive.fsck.skipList SKIP &&
+	git push --porcelain dst bogus
+
+To .
+ * [new branch]      6516fe4a6d0c9202861748d549d2e2b20e5210c9 -> bogus
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5504-fetch-receive-strict/dst/.git/
+remote: error: object 6516fe4a6d0c9202861748d549d2e2b20e5210c9: missingEmail: invalid author/committer line - missing email        
+remote: fatal: fsck error in packed object        
+error: remote unpack failed: unpack-objects abnormal exit
+error: failed to push some refs to 'dst'
+To dst
+!	refs/heads/bogus:refs/heads/bogus	[remote rejected] (unpacker error)
+remote: error: object 6516fe4a6d0c9202861748d549d2e2b20e5210c9: missingEmail: invalid author/committer line - missing email        
+remote: fatal: fsck error in packed object        
+error: remote unpack failed: unpack-objects abnormal exit
+error: failed to push some refs to 'dst'
+To dst
+!	refs/heads/bogus:refs/heads/bogus	[remote rejected] (unpacker error)
+remote: error: object 6516fe4a6d0c9202861748d549d2e2b20e5210c9: missingEmail: invalid author/committer line - missing email        
+remote: fatal: fsck error in packed object        
+error: remote unpack failed: unpack-objects abnormal exit
+error: failed to push some refs to 'dst'
+To dst
+!	refs/heads/bogus:refs/heads/bogus	[remote rejected] (unpacker error)
+To dst
+!	refs/heads/bogus:refs/heads/bogus	[remote rejected] (unpacker error)
+remote: fatal: Could not open skip list: does-not-exist        
+To dst
+!	refs/heads/bogus:refs/heads/bogus	[remote rejected] (unpacker error)
+remote: fatal: Invalid SHA-1: [core]        
+To dst
+*	refs/heads/bogus:refs/heads/bogus	[new branch]
+Done
+ok 21 - push with receive.fsck.skipList
+
+expecting success: 
+	refspec=refs/heads/bogus:refs/heads/bogus &&
+	git push . $commit:refs/heads/bogus &&
+	rm -rf dst &&
+	git init dst &&
+	git --git-dir=dst/.git config fetch.fsckObjects true &&
+	test_must_fail git --git-dir=dst/.git fetch "file://$(pwd)" $refspec &&
+	git --git-dir=dst/.git config fetch.fsck.skipList /dev/null &&
+	test_must_fail git --git-dir=dst/.git fetch "file://$(pwd)" $refspec &&
+	echo $commit >dst/.git/SKIP &&
+
+	# fetch.fsck.* does not fall back on fsck.*
+	git --git-dir=dst/.git config fsck.skipList dst/.git/SKIP &&
+	test_must_fail git --git-dir=dst/.git fetch "file://$(pwd)" $refspec &&
+
+	# Invalid and/or bogus skipList input
+	git --git-dir=dst/.git config fetch.fsck.skipList /dev/null &&
+	test_must_fail git --git-dir=dst/.git fetch "file://$(pwd)" $refspec &&
+	git --git-dir=dst/.git config fetch.fsck.skipList does-not-exist &&
+	test_must_fail git --git-dir=dst/.git fetch "file://$(pwd)" $refspec 2>err &&
+	test_i18ngrep "Could not open skip list: does-not-exist" err &&
+	git --git-dir=dst/.git config fetch.fsck.skipList dst/.git/config &&
+	test_must_fail git --git-dir=dst/.git fetch "file://$(pwd)" $refspec 2>err &&
+	test_i18ngrep "Invalid SHA-1: \[core\]" err &&
+
+	git --git-dir=dst/.git config fetch.fsck.skipList dst/.git/SKIP &&
+	git --git-dir=dst/.git fetch "file://$(pwd)" $refspec
+
+Everything up-to-date
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5504-fetch-receive-strict/dst/.git/
+error: object 6516fe4a6d0c9202861748d549d2e2b20e5210c9: missingEmail: invalid author/committer line - missing email
+fatal: fsck error in packed object
+fatal: unpack-objects failed
+error: object 6516fe4a6d0c9202861748d549d2e2b20e5210c9: missingEmail: invalid author/committer line - missing email
+fatal: fsck error in packed object
+fatal: unpack-objects failed
+error: object 6516fe4a6d0c9202861748d549d2e2b20e5210c9: missingEmail: invalid author/committer line - missing email
+fatal: fsck error in packed object
+fatal: unpack-objects failed
+error: object 6516fe4a6d0c9202861748d549d2e2b20e5210c9: missingEmail: invalid author/committer line - missing email
+fatal: fsck error in packed object
+fatal: unpack-objects failed
+fatal: Could not open skip list: does-not-exist
+fatal: Invalid SHA-1: [core]
+From file:///build/git-2.20.1/t/trash directory.t5504-fetch-receive-strict
+ * [new branch]      bogus      -> bogus
+ok 22 - fetch with fetch.fsck.skipList
+
+expecting success: 
+	test_must_fail git -c fsck.whatEver=ignore fsck 2>err &&
+	test_i18ngrep "Unhandled message id: whatever" err
+
+fatal: Unhandled message id: whatever
+ok 23 - fsck.<unknownmsg-id> dies
+
+expecting success: 
+	git push . $commit:refs/heads/bogus &&
+	rm -rf dst &&
+	git init dst &&
+	git --git-dir=dst/.git config receive.fsckobjects true &&
+	test_must_fail git push --porcelain dst bogus &&
+
+	# receive.fsck.<msg-id> does not fall back on fsck.<msg-id>
+	git --git-dir=dst/.git config fsck.missingEmail warn &&
+	test_must_fail git push --porcelain dst bogus &&
+
+	# receive.fsck.<unknownmsg-id> warns
+	git --git-dir=dst/.git config \
+		receive.fsck.whatEver error &&
+
+	git --git-dir=dst/.git config \
+		receive.fsck.missingEmail warn &&
+	git push --porcelain dst bogus >act 2>&1 &&
+	grep "missingEmail" act &&
+	test_i18ngrep "Skipping unknown msg id.*whatever" act &&
+	git --git-dir=dst/.git branch -D bogus &&
+	git --git-dir=dst/.git config --add \
+		receive.fsck.missingEmail ignore &&
+	git push --porcelain dst bogus >act 2>&1 &&
+	! grep "missingEmail" act
+
+Everything up-to-date
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5504-fetch-receive-strict/dst/.git/
+remote: error: object 6516fe4a6d0c9202861748d549d2e2b20e5210c9: missingEmail: invalid author/committer line - missing email        
+remote: fatal: fsck error in packed object        
+error: remote unpack failed: unpack-objects abnormal exit
+error: failed to push some refs to 'dst'
+To dst
+!	refs/heads/bogus:refs/heads/bogus	[remote rejected] (unpacker error)
+remote: error: object 6516fe4a6d0c9202861748d549d2e2b20e5210c9: missingEmail: invalid author/committer line - missing email        
+remote: fatal: fsck error in packed object        
+error: remote unpack failed: unpack-objects abnormal exit
+error: failed to push some refs to 'dst'
+To dst
+!	refs/heads/bogus:refs/heads/bogus	[remote rejected] (unpacker error)
+remote: warning: object 6516fe4a6d0c9202861748d549d2e2b20e5210c9: missingEmail: invalid author/committer line - missing email        
+warning: Skipping unknown msg id 'whatever'
+Deleted branch bogus (was 6516fe4).
+ok 24 - push with receive.fsck.missingEmail=warn
+
+expecting success: 
+	refspec=refs/heads/bogus:refs/heads/bogus &&
+	git push . $commit:refs/heads/bogus &&
+	rm -rf dst &&
+	git init dst &&
+	git --git-dir=dst/.git config fetch.fsckobjects true &&
+	test_must_fail git --git-dir=dst/.git fetch "file://$(pwd)" $refspec &&
+
+	# fetch.fsck.<msg-id> does not fall back on fsck.<msg-id>
+	git --git-dir=dst/.git config fsck.missingEmail warn &&
+	test_must_fail git --git-dir=dst/.git fetch "file://$(pwd)" $refspec &&
+
+	# receive.fsck.<unknownmsg-id> warns
+	git --git-dir=dst/.git config \
+		fetch.fsck.whatEver error &&
+
+	git --git-dir=dst/.git config \
+		fetch.fsck.missingEmail warn &&
+	git --git-dir=dst/.git fetch "file://$(pwd)" $refspec >act 2>&1 &&
+	grep "missingEmail" act &&
+	test_i18ngrep "Skipping unknown msg id.*whatever" act &&
+	rm -rf dst &&
+	git init dst &&
+	git --git-dir=dst/.git config fetch.fsckobjects true &&
+	git --git-dir=dst/.git config \
+		fetch.fsck.missingEmail ignore &&
+	git --git-dir=dst/.git fetch "file://$(pwd)" $refspec >act 2>&1 &&
+	! grep "missingEmail" act
+
+Everything up-to-date
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5504-fetch-receive-strict/dst/.git/
+error: object 6516fe4a6d0c9202861748d549d2e2b20e5210c9: missingEmail: invalid author/committer line - missing email
+fatal: fsck error in packed object
+fatal: unpack-objects failed
+error: object 6516fe4a6d0c9202861748d549d2e2b20e5210c9: missingEmail: invalid author/committer line - missing email
+fatal: fsck error in packed object
+fatal: unpack-objects failed
+warning: object 6516fe4a6d0c9202861748d549d2e2b20e5210c9: missingEmail: invalid author/committer line - missing email
+warning: Skipping unknown msg id 'whatever'
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5504-fetch-receive-strict/dst/.git/
+ok 25 - fetch with fetch.fsck.missingEmail=warn
+
+expecting success: 
+	rm -rf dst &&
+	git init dst &&
+	git --git-dir=dst/.git config receive.fsckobjects true &&
+	git --git-dir=dst/.git config \
+		receive.fsck.unterminatedheader warn &&
+	test_must_fail git push --porcelain dst HEAD >act 2>&1 &&
+	grep "Cannot demote unterminatedheader" act
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5504-fetch-receive-strict/dst/.git/
+remote: fatal: Cannot demote unterminatedheader to warn        
+ok 26 - receive.fsck.unterminatedHeader=warn triggers error
+
+expecting success: 
+	rm -rf dst &&
+	git init dst &&
+	git --git-dir=dst/.git config fetch.fsckobjects true &&
+	git --git-dir=dst/.git config \
+		fetch.fsck.unterminatedheader warn &&
+	test_must_fail git --git-dir=dst/.git fetch "file://$(pwd)" HEAD &&
+	grep "Cannot demote unterminatedheader" act
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5504-fetch-receive-strict/dst/.git/
+fatal: Cannot demote unterminatedheader to warn
+fatal: unpack-objects failed
+remote: fatal: Cannot demote unterminatedheader to warn        
+ok 27 - fetch.fsck.unterminatedHeader=warn triggers error
+
+# passed all 27 test(s)
+1..27
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
 *** t5400-send-pack.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5400-send-pack/.git/
 expecting success: 
@@ -152909,164 +153870,710 @@
 1..16
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t5509-fetch-push-namespaces.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5509-fetch-push-namespaces/.git/
+*** t5512-ls-remote.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5512-ls-remote/.git/
 expecting success: 
-	git config --global protocol.ext.allow user &&
+	>file &&
+	git add file &&
 	test_tick &&
-	git init original &&
+	git commit -m initial &&
+	git tag mark &&
+	git tag mark1.1 &&
+	git tag mark1.2 &&
+	git tag mark1.10 &&
+	git show-ref --tags -d | sed -e "s/ /	/" >expected.tag &&
 	(
-		cd original &&
-		echo 0 >count &&
-		git add count &&
-		test_commit 0 &&
-		echo 1 >count &&
-		git add count &&
-		test_commit 1 &&
-		git remote add pushee-namespaced "ext::git --namespace=namespace %s ../pushee" &&
-		git remote add pushee-unnamespaced ../pushee
-	) &&
-	commit0=$(cd original && git rev-parse HEAD^) &&
-	commit1=$(cd original && git rev-parse HEAD) &&
-	git init pushee &&
-	git init puller
+		echo "$(git rev-parse HEAD)	HEAD" &&
+		git show-ref -d	| sed -e "s/ /	/"
+	) >expected.all &&
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5509-fetch-push-namespaces/original/.git/
-[master (root-commit) fbdf431] 0
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 0.t
- create mode 100644 count
-[master dc65a2e] 1
+	git remote add self "$(pwd)/.git"
+
+[master (root-commit) 1bd44cb] initial
  Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+), 1 deletion(-)
- create mode 100644 1.t
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5509-fetch-push-namespaces/pushee/.git/
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5509-fetch-push-namespaces/puller/.git/
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 file
 ok 1 - setup
 
 expecting success: 
-	(
-		cd original &&
-		git push pushee-namespaced master &&
-		git ls-remote pushee-namespaced >actual &&
-		printf "$commit1\trefs/heads/master\n" >expected &&
-		test_cmp expected actual &&
-		git push pushee-namespaced --tags &&
-		git ls-remote pushee-namespaced >actual &&
-		printf "$commit0\trefs/tags/0\n" >>expected &&
-		printf "$commit1\trefs/tags/1\n" >>expected &&
-		test_cmp expected actual &&
-		# Verify that the GIT_NAMESPACE environment variable works as well
-		GIT_NAMESPACE=namespace git ls-remote "ext::git %s ../pushee" >actual &&
-		test_cmp expected actual &&
-		# Verify that --namespace overrides GIT_NAMESPACE
-		GIT_NAMESPACE=garbage git ls-remote pushee-namespaced >actual &&
-		test_cmp expected actual &&
-		# Try a namespace with no content
-		git ls-remote "ext::git --namespace=garbage %s ../pushee" >actual &&
-		test_must_be_empty actual &&
-		git ls-remote pushee-unnamespaced >actual &&
-		sed -e "s|refs/|refs/namespaces/namespace/refs/|" expected >expected.unnamespaced &&
-		test_cmp expected.unnamespaced actual
-	)
+	git ls-remote --tags .git >actual &&
+	test_cmp expected.tag actual
 
-To ext::git --namespace=namespace %s ../pushee
- * [new branch]      master -> master
-To ext::git --namespace=namespace %s ../pushee
- * [new tag]         0 -> 0
- * [new tag]         1 -> 1
-ok 2 - pushing into a repository using a ref namespace
+ok 2 - ls-remote --tags .git
+
+expecting success: 
+	git ls-remote .git >actual &&
+	test_cmp expected.all actual
+
+ok 3 - ls-remote .git
+
+expecting success: 
+	git ls-remote --tags self >actual &&
+	test_cmp expected.tag actual
+
+ok 4 - ls-remote --tags self
+
+expecting success: 
+	git ls-remote self >actual &&
+	test_cmp expected.all actual
+
+ok 5 - ls-remote self
+
+expecting success: 
+	cat >expect <<-EOF &&
+	$(git rev-parse mark)	refs/tags/mark
+	$(git rev-parse mark1.1)	refs/tags/mark1.1
+	$(git rev-parse mark1.2)	refs/tags/mark1.2
+	$(git rev-parse mark1.10)	refs/tags/mark1.10
+	EOF
+	git ls-remote --sort="version:refname" --tags self >actual &&
+	test_cmp expect actual
+
+ok 6 - ls-remote --sort="version:refname" --tags self
+
+expecting success: 
+	cat >expect <<-EOF &&
+	$(git rev-parse mark1.10)	refs/tags/mark1.10
+	$(git rev-parse mark1.2)	refs/tags/mark1.2
+	$(git rev-parse mark1.1)	refs/tags/mark1.1
+	$(git rev-parse mark)	refs/tags/mark
+	EOF
+	git ls-remote --sort="-version:refname" --tags self >actual &&
+	test_cmp expect actual
+
+ok 7 - ls-remote --sort="-version:refname" --tags self
+
+expecting success: 
+	cat >expect <<-EOF &&
+	$(git rev-parse mark1.2)	refs/tags/mark1.2
+	$(git rev-parse mark1.10)	refs/tags/mark1.10
+	$(git rev-parse mark1.1)	refs/tags/mark1.1
+	$(git rev-parse mark)	refs/tags/mark
+	EOF
+	git ls-remote --sort="-refname" --tags self >actual &&
+	test_cmp expect actual
+
+ok 8 - ls-remote --sort="-refname" --tags self
+
+expecting success: 
+	test_must_fail git ls-remote
+
+fatal: No remote configured to list refs from.
+ok 9 - dies when no remote specified and no default remotes found
+
+expecting success: 
+	URL="$(pwd)/.git" &&
+	echo "From $URL" >exp_err &&
+
+	git remote add origin "$URL" &&
+	git ls-remote 2>actual_err >actual &&
+
+	test_cmp exp_err actual_err &&
+	test_cmp expected.all actual
+
+ok 10 - use "origin" when no remote specified
+
+expecting success: 
+	git ls-remote -q 2>actual_err &&
+	test_must_fail test_cmp exp_err actual_err
+
+1bd44cb9d13204b0fe1958db0082f5028a16eb3a	HEAD
+1bd44cb9d13204b0fe1958db0082f5028a16eb3a	refs/heads/master
+1bd44cb9d13204b0fe1958db0082f5028a16eb3a	refs/tags/mark
+1bd44cb9d13204b0fe1958db0082f5028a16eb3a	refs/tags/mark1.1
+1bd44cb9d13204b0fe1958db0082f5028a16eb3a	refs/tags/mark1.10
+1bd44cb9d13204b0fe1958db0082f5028a16eb3a	refs/tags/mark1.2
+--- exp_err	2023-01-05 11:49:10.622868030 +0000
++++ actual_err	2023-01-05 11:49:10.670868030 +0000
+@@ -1 +0,0 @@
+-From /build/git-2.20.1/t/trash directory.t5512-ls-remote/.git
+ok 11 - suppress "From <url>" with -q
 
 expecting success: 
+	#
+	# Test that we are indeed using branch.<name>.remote, not "origin", even
+	# though the "origin" remote has been set.
+	#
+
+	# setup a new remote to differentiate from "origin"
+	git clone . other.git &&
 	(
-		cd puller &&
-		git remote add -f pushee-namespaced "ext::git --namespace=namespace %s ../pushee" &&
-		git for-each-ref refs/ >actual &&
-		printf "$commit1 commit\trefs/remotes/pushee-namespaced/master\n" >expected &&
-		printf "$commit0 commit\trefs/tags/0\n" >>expected &&
-		printf "$commit1 commit\trefs/tags/1\n" >>expected &&
-		test_cmp expected actual
-	)
+		cd other.git &&
+		echo "$(git rev-parse HEAD)	HEAD" &&
+		git show-ref	| sed -e "s/ /	/"
+	) >exp &&
 
-Updating pushee-namespaced
-From ext::git --namespace=namespace %s ../pushee
- * [new branch]      master     -> pushee-namespaced/master
- * [new tag]         1          -> 1
- * [new tag]         0          -> 0
-Bad commandok 3 - pulling from a repository using a ref namespace
+	URL="other.git" &&
+	echo "From $URL" >exp_err &&
+
+	git remote add other $URL &&
+	git config branch.master.remote other &&
+
+	git ls-remote 2>actual_err >actual &&
+	test_cmp exp_err actual_err &&
+	test_cmp exp actual
+
+Cloning into 'other.git'...
+done.
+ok 12 - use branch.<name>.remote if possible
 
 expecting success: 
-	git clone --mirror pushee mirror &&
+	if test_have_prereq MINGW
+	then
+		# Windows does not like asterisks in pathname
+		does_not_exist=master
+	else
+		does_not_exist="refs*master"
+	fi &&
+	cat >exp <<-EOF &&
+	fatal: '$does_not_exist' does not appear to be a git repository
+	fatal: Could not read from remote repository.
+
+	Please make sure you have the correct access rights
+	and the repository exists.
+	EOF
+	#
+	# Do not expect "git ls-remote <pattern>" to work; ls-remote needs
+	# <remote> if you want to feed <pattern>, just like you cannot say
+	# fetch <branch>.
+	# We could just as easily have used "master"; the "*" emphasizes its
+	# role as a pattern.
+	test_must_fail git ls-remote "$does_not_exist" >actual 2>&1 &&
+	test_i18ncmp exp actual
+
+ok 13 - confuses pattern as remote when no remote specified
+
+expecting success: 
+	{
+		git ls-remote --exit-code ./no-such-repository
+		status=$?
+	} &&
+	test $status != 2 && test $status != 0
+
+fatal: './no-such-repository' 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 14 - die with non-2 for wrong repository even with --exit-code
+
+expecting success: 
+	git ls-remote other.git "refs/nsn/*" >actual &&
+	test_must_be_empty actual
+
+ok 15 - Report success even when nothing matches
+
+expecting success: 
+	test_expect_code 2 git ls-remote --exit-code other.git "refs/nsn/*" >actual &&
+	test_must_be_empty actual
+
+ok 16 - Report no-match with --exit-code
+
+expecting success: 
+	git ls-remote --exit-code other.git "refs/tags/*" >actual &&
+	git ls-remote . tags/mark* >expect &&
+	test_cmp expect actual
+
+ok 17 - Report match with --exit-code
+
+expecting success: 
+	git tag magic/one &&
+	git tag magic/two
+
+ok 18 - set up some extra tags for ref hiding
+
+expecting success: 
+		test_config $configsection.hiderefs refs/tags &&
+		git ls-remote . >actual &&
+		test_unconfig $configsection.hiderefs &&
+		git ls-remote . |
+		sed -e "/	refs\/tags\//d" >expect &&
+		test_cmp expect actual
+	
+ok 19 - Hide some refs with transfer.hiderefs
+
+expecting success: 
+		test_when_finished "test_unconfig $configsection.hiderefs" &&
+		git config --add $configsection.hiderefs refs/tags &&
+		git config --add $configsection.hiderefs "!refs/tags/magic" &&
+		git config --add $configsection.hiderefs refs/tags/magic/one &&
+		git ls-remote . >actual &&
+		grep refs/tags/magic/two actual &&
+		! grep refs/tags/magic/one actual
+	
+1bd44cb9d13204b0fe1958db0082f5028a16eb3a	refs/tags/magic/two
+ok 20 - Override hiding of transfer.hiderefs
+
+expecting success: 
+		test_config $configsection.hiderefs refs/tags &&
+		git ls-remote . >actual &&
+		test_unconfig $configsection.hiderefs &&
+		git ls-remote . |
+		sed -e "/	refs\/tags\//d" >expect &&
+		test_cmp expect actual
+	
+ok 21 - Hide some refs with uploadpack.hiderefs
+
+expecting success: 
+		test_when_finished "test_unconfig $configsection.hiderefs" &&
+		git config --add $configsection.hiderefs refs/tags &&
+		git config --add $configsection.hiderefs "!refs/tags/magic" &&
+		git config --add $configsection.hiderefs refs/tags/magic/one &&
+		git ls-remote . >actual &&
+		grep refs/tags/magic/two actual &&
+		! grep refs/tags/magic/one actual
+	
+1bd44cb9d13204b0fe1958db0082f5028a16eb3a	refs/tags/magic/two
+ok 22 - Override hiding of uploadpack.hiderefs
+
+expecting success: 
+	test_config uploadpack.hiderefs refs/tags &&
+	test_config transfer.hiderefs "!refs/tags/magic" &&
+	git ls-remote . >actual &&
+	grep refs/tags/magic actual
+
+1bd44cb9d13204b0fe1958db0082f5028a16eb3a	refs/tags/magic/one
+1bd44cb9d13204b0fe1958db0082f5028a16eb3a	refs/tags/magic/two
+ok 23 - overrides work between mixed transfer/upload-pack hideRefs
+
+expecting success: 
+	git fetch origin &&
+	cat >expect <<-EOF &&
+	ref: refs/heads/master	HEAD
+	$(git rev-parse HEAD)	HEAD
+	$(git rev-parse refs/heads/master)	refs/heads/master
+	$(git rev-parse HEAD)	refs/remotes/origin/HEAD
+	$(git rev-parse refs/remotes/origin/master)	refs/remotes/origin/master
+	$(git rev-parse refs/tags/mark)	refs/tags/mark
+	$(git rev-parse refs/tags/mark1.1)	refs/tags/mark1.1
+	$(git rev-parse refs/tags/mark1.10)	refs/tags/mark1.10
+	$(git rev-parse refs/tags/mark1.2)	refs/tags/mark1.2
+	EOF
+	git ls-remote --symref >actual &&
+	test_cmp expect actual
+
+From /build/git-2.20.1/t/trash directory.t5512-ls-remote/
+ * [new branch]      master     -> origin/master
+From other.git
+ok 24 - ls-remote --symref
+
+expecting success: 
+	cat >expect <<-\EOF &&
+	ref: refs/heads/master	HEAD
+	1bd44cb9d13204b0fe1958db0082f5028a16eb3a	HEAD
+	EOF
+	git ls-remote --symref . HEAD >actual &&
+	test_cmp expect actual
+
+ok 25 - ls-remote with filtered symref (refname)
+
+checking known breakage: 
+	git symbolic-ref refs/heads/foo refs/tags/mark &&
+	cat >expect <<-\EOF &&
+	ref: refs/tags/mark	refs/heads/foo
+	1bd44cb9d13204b0fe1958db0082f5028a16eb3a	refs/heads/foo
+	1bd44cb9d13204b0fe1958db0082f5028a16eb3a	refs/heads/master
+	EOF
+	git ls-remote --symref --heads . >actual &&
+	test_cmp expect actual
+
+--- expect	2023-01-05 11:49:11.714868030 +0000
++++ actual	2023-01-05 11:49:11.726868030 +0000
+@@ -1,3 +1,2 @@
+-ref: refs/tags/mark	refs/heads/foo
+ 1bd44cb9d13204b0fe1958db0082f5028a16eb3a	refs/heads/foo
+ 1bd44cb9d13204b0fe1958db0082f5028a16eb3a	refs/heads/master
+not ok 26 - ls-remote with filtered symref (--heads) # TODO known breakage
+
+expecting success: 
+	cat >expect <<-\EOF &&
+	1bd44cb9d13204b0fe1958db0082f5028a16eb3a	refs/heads/foo
+	1bd44cb9d13204b0fe1958db0082f5028a16eb3a	refs/heads/master
+	EOF
+	git ls-remote --symref --heads . >actual &&
+	test_cmp expect actual &&
+	git ls-remote --symref . "refs/heads/*" >actual &&
+	test_cmp expect actual
+
+ok 27 - ls-remote --symref omits filtered-out matches
+
+checking prerequisite: PIPE
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
+	# test whether the filesystem supports FIFOs
+	test_have_prereq !MINGW,!CYGWIN &&
+	rm -f testfifo && mkfifo testfifo
+
+)
+prerequisite PIPE ok
+checking prerequisite: JGIT
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
+	type jgit
+
+)
+./test-lib.sh: line 686: type: jgit: not found
+prerequisite JGIT not satisfied
+checking prerequisite: GIT_DAEMON
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
+	test_tristate GIT_TEST_GIT_DAEMON &&
+	test "$GIT_TEST_GIT_DAEMON" != false
+
+)
+prerequisite GIT_DAEMON ok
+skipping test: indicate no refs in standards-compliant empty remote 
+	JGIT_DAEMON_PORT=${JGIT_DAEMON_PORT-${this_test#t}} &&
+	JGIT_DAEMON_PID= &&
+	git init --bare empty.git &&
+	>empty.git/git-daemon-export-ok &&
+	mkfifo jgit_daemon_output &&
+	{
+		jgit daemon --port="$JGIT_DAEMON_PORT" . >jgit_daemon_output &
+		JGIT_DAEMON_PID=$!
+	} &&
+	test_when_finished kill "$JGIT_DAEMON_PID" &&
+	{
+		read line &&
+		case $line in
+		Exporting*)
+			;;
+		*)
+			echo "Expected: Exporting" &&
+			false;;
+		esac &&
+		read line &&
+		case $line in
+		"Listening on"*)
+			;;
+		*)
+			echo "Expected: Listening on" &&
+			false;;
+		esac
+	} <jgit_daemon_output &&
+	# --exit-code asks the command to exit with 2 when no
+	# matching refs are found.
+	test_expect_code 2 git ls-remote --exit-code git://localhost:$JGIT_DAEMON_PORT/empty.git
+
+ok 28 # skip indicate no refs in standards-compliant empty remote (missing JGIT of PIPE,JGIT,GIT_DAEMON)
+
+expecting success: 
+	# It is important for this repo to be inside the nongit
+	# area, as we want a repo name that does not include
+	# slashes (because those inhibit some of our configuration
+	# lookups).
+	nongit git init --bare dst.git &&
+	nongit git ls-remote dst.git
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5512-ls-remote/non-repo/dst.git/
+ok 29 - ls-remote works outside repository
+
+expecting success: 
+	# Use a sort key that requires access to the referenced objects.
+	nongit test_must_fail git ls-remote --sort=authordate "$TRASH_DIRECTORY" 2>err &&
+	test_i18ngrep "^fatal: not a git repository, but the field 'authordate' requires access to object data" err
+
+fatal: not a git repository, but the field 'authordate' requires access to object data
+ok 30 - ls-remote --sort fails gracefully outside repository
+
+expecting success: 
+	git for-each-ref --format="%(objectname)	%(refname)" \
+		refs/heads/master refs/remotes/origin/master >expect &&
+	git -c protocol.version=1 ls-remote . master >actual.v1 &&
+	test_cmp expect actual.v1 &&
+	git -c protocol.version=2 ls-remote . master >actual.v2 &&
+	test_cmp expect actual.v2
+
+ok 31 - ls-remote patterns work with all protocol versions
+
+expecting success: 
+	git for-each-ref --format="%(objectname)	%(refname)" \
+		refs/heads/ refs/tags/ >expect &&
+	git -c protocol.version=1 ls-remote --heads --tags . >actual.v1 &&
+	test_cmp expect actual.v1 &&
+	git -c protocol.version=2 ls-remote --heads --tags . >actual.v2 &&
+	test_cmp expect actual.v2
+
+ok 32 - ls-remote prefixes work with all protocol versions
+
+# still have 1 known breakage(s)
+# passed all remaining 31 test(s)
+1..32
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t5514-fetch-multiple.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5514-fetch-multiple/.git/
+expecting success: 
+	setup_repository one &&
+	setup_repository two &&
 	(
-		cd mirror &&
-		git for-each-ref refs/ >actual &&
-		printf "$commit1 commit\trefs/namespaces/namespace/refs/heads/master\n" >expected &&
-		printf "$commit0 commit\trefs/namespaces/namespace/refs/tags/0\n" >>expected &&
-		printf "$commit1 commit\trefs/namespaces/namespace/refs/tags/1\n" >>expected &&
-		test_cmp expected actual
-	)
+		cd two && git branch another
+	) &&
+	git clone --mirror two three &&
+	git clone one test
 
-Cloning into bare repository 'mirror'...
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5514-fetch-multiple/one/.git/
+[master (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 'master'
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5514-fetch-multiple/two/.git/
+[master (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 'master'
+Cloning into bare repository 'three'...
 done.
-ok 4 - mirroring a repository using a ref namespace
+Cloning into 'test'...
+done.
+ok 1 - setup
 
 expecting success: 
-	GIT_NAMESPACE=namespace \
-		git -C pushee -c transfer.hideRefs=refs/tags \
-		ls-remote "ext::git %s ." >actual &&
-	printf "$commit1\trefs/heads/master\n" >expected &&
-	test_cmp expected actual
+	(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)
 
-ok 5 - hide namespaced refs with transfer.hideRefs
+Fetching origin
+Fetching one
+From ../one
+ * [new branch]      master     -> one/master
+ * [new branch]      side       -> one/side
+Fetching two
+From ../two
+ * [new branch]      another    -> two/another
+ * [new branch]      master     -> two/master
+ * [new branch]      side       -> two/side
+Fetching three
+From ../three
+ * [new branch]      another    -> three/another
+ * [new branch]      master     -> three/master
+ * [new branch]      side       -> three/side
+ok 2 - git fetch --all
 
 expecting success: 
-	GIT_NAMESPACE=namespace \
-		git -C pushee -c transfer.hideRefs=refs/namespaces/namespace/refs/tags \
-		ls-remote "ext::git %s ." >actual &&
-	printf "$commit1\trefs/heads/master\n" >expected &&
-	printf "$commit0\trefs/tags/0\n" >>expected &&
-	printf "$commit1\trefs/tags/1\n" >>expected &&
-	test_cmp expected actual
+	(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)
 
-ok 6 - check that transfer.hideRefs does not match unstripped refs
+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]      master     -> one/master
+ * [new branch]      side       -> one/side
+Fetching two
+From ../two
+ * [new branch]      another    -> two/another
+ * [new branch]      master     -> two/master
+ * [new branch]      side       -> two/side
+Fetching three
+From ../three
+ * [new branch]      another    -> three/another
+ * [new branch]      master     -> three/master
+ * [new branch]      side       -> three/side
+ok 3 - git fetch --all should continue if a remote has errors
 
 expecting success: 
-	GIT_NAMESPACE=namespace \
-		git -C pushee -c transfer.hideRefs="^refs/namespaces/namespace/refs/tags" \
-		ls-remote "ext::git %s ." >actual &&
-	printf "$commit1\trefs/heads/master\n" >expected &&
-	test_cmp expected actual
+	(cd test &&
+	 test_must_fail git fetch --all origin &&
+	 test_must_fail git fetch --all origin master)
 
-ok 7 - hide full refs with transfer.hideRefs
+fatal: fetch --all does not take a repository argument
+fatal: fetch --all does not make sense with refspecs
+ok 4 - git fetch --all does not allow non-option arguments
 
 expecting success: 
-	test_config -C pushee transfer.hideRefs refs/heads/master &&
-	test_must_fail git -C original push pushee-namespaced master
+	(git clone one test3 &&
+	 cd test3 &&
+	 git remote add three ../three &&
+	 git fetch --multiple three &&
+	 git branch -r > output &&
+	 test_cmp ../expect output)
 
-To ext::git --namespace=namespace %s ../pushee
- ! [remote rejected] master -> master (deny updating a hidden ref)
-error: failed to push some refs to 'ext::git --namespace=namespace %s ../pushee'
-ok 8 - try to update a hidden ref
+Cloning into 'test3'...
+done.
+Fetching three
+From ../three
+ * [new branch]      another    -> three/another
+ * [new branch]      master     -> three/master
+ * [new branch]      side       -> three/side
+ok 5 - git fetch --multiple (but only one remote)
 
 expecting success: 
-	test_config -C pushee transfer.hideRefs refs/namespaces/namespace/refs/heads/master &&
-	git -C original push pushee-namespaced master
+	(git clone one test4 &&
+	 cd test4 &&
+	 git remote rm origin &&
+	 git remote add one ../one &&
+	 git remote add two ../two &&
+	 git fetch --multiple one two &&
+	 git branch -r > output &&
+	 test_cmp ../expect output)
 
-Everything up-to-date
-ok 9 - try to update a ref that is not hidden
+Cloning into 'test4'...
+done.
+Fetching one
+From ../one
+ * [new branch]      master     -> one/master
+ * [new branch]      side       -> one/side
+Fetching two
+From ../two
+ * [new branch]      another    -> two/another
+ * [new branch]      master     -> two/master
+ * [new branch]      side       -> two/side
+ok 6 - git fetch --multiple (two remotes)
 
 expecting success: 
-	test_config -C pushee transfer.hideRefs "^refs/namespaces/namespace/refs/heads/master" &&
-	test_must_fail git -C original push pushee-namespaced master
+	(cd test4 &&
+	 test_must_fail git fetch --multiple four)
 
-To ext::git --namespace=namespace %s ../pushee
- ! [remote rejected] master -> master (deny updating a hidden ref)
-error: failed to push some refs to 'ext::git --namespace=namespace %s ../pushee'
-ok 10 - try to update a hidden full ref
+fatal: No such remote or remote group: four
+ok 7 - git fetch --multiple (bad remote names)
 
-# passed all 10 test(s)
-1..10
+expecting success: 
+	(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/master (was 9d34b14).
+Deleted remote-tracking branch one/side (was 2ce9c50).
+Deleted remote-tracking branch two/another (was 9d34b14).
+Deleted remote-tracking branch two/master (was 9d34b14).
+Deleted remote-tracking branch two/side (was 2ce9c50).
+Fetching one
+From ../one
+ * [new branch]      master     -> one/master
+ * [new branch]      side       -> one/side
+Fetching two
+From ../two
+ * [new branch]      another    -> two/another
+ * [new branch]      master     -> two/master
+ * [new branch]      side       -> two/side
+ok 8 - git fetch --all (skipFetchAll)
+
+expecting success: 
+	(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/master (was 9d34b14).
+Deleted remote-tracking branch one/side (was 2ce9c50).
+Deleted remote-tracking branch two/another (was 9d34b14).
+Deleted remote-tracking branch two/master (was 9d34b14).
+Deleted remote-tracking branch two/side (was 2ce9c50).
+Fetching one
+From ../one
+ * [new branch]      master     -> one/master
+ * [new branch]      side       -> one/side
+Fetching two
+From ../two
+ * [new branch]      another    -> two/another
+ * [new branch]      master     -> two/master
+ * [new branch]      side       -> two/side
+Fetching three
+From ../three
+ * [new branch]      another    -> three/another
+ * [new branch]      master     -> three/master
+ * [new branch]      side       -> three/side
+ok 9 - git fetch --multiple (ignoring skipFetchAll)
+
+expecting success: 
+	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.
+Fetching origin
+ok 10 - git fetch --all --no-tags
+
+expecting success: 
+	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.
+[master 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
+Fetching origin
+From /build/git-2.20.1/t/trash directory.t5514-fetch-multiple/test7
+ * [new tag]         test-tag   -> test-tag
+ok 11 - git fetch --all --tags
+
+# passed all 11 test(s)
+1..11
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
 *** t5401-update-hooks.sh ***
@@ -153179,7 +154686,7 @@
 remote: STDOUT post-receive        
 remote: STDERR post-receive        
 To ./victim.git
- + 32ba2dc...bb34c79 tofail -> tofail (forced update)
+ + c99bb57...136f0c8 tofail -> tofail (forced update)
  * [new branch]      branch_100 -> branch_100
  * [new branch]      branch_101 -> branch_101
  * [new branch]      branch_102 -> branch_102
@@ -155147,7 +156654,7 @@
      git cat-file blob $sha1_101 > file_101_foo1
 20+0 records in
 20+0 records out
-20 bytes copied, 8.8118e-05 s, 227 kB/s
+20 bytes copied, 7.1696e-05 s, 279 kB/s
 ok 20 - [index v1] 2) create a stealth corruption in a delta base reference
 
 expecting success: test -f file_101_foo1 && ! cmp file_101 file_101_foo1
@@ -155503,7 +157010,7 @@
      git cat-file blob $sha1_101 > file_101_foo2
 20+0 records in
 20+0 records out
-20 bytes copied, 9.5158e-05 s, 210 kB/s
+20 bytes copied, 8.6348e-05 s, 232 kB/s
 ok 26 - [index v2] 2) create a stealth corruption in a delta base reference
 
 expecting success: test -f file_101_foo2 && ! cmp file_101 file_101_foo2
@@ -155541,7 +157048,7 @@
 pack	1c54d893dd9bf6645ecee2886ea72f2c2030bea1
 4+0 records in
 4+0 records out
-4 bytes copied, 6.6894e-05 s, 59.8 kB/s
+4 bytes copied, 7.1201e-05 s, 56.2 kB/s
 fatal: sha1 file '.git/objects/pack/pack-1c54d893dd9bf6645ecee2886ea72f2c2030bea1.idx' validation error
 ok 30 - [index v2] 6) verify-pack detects CRC mismatch
 
@@ -155576,552 +157083,22 @@
     grep "^warning:.* expected .tagger. line" err
 
 remove tag object
-b2e8d5d14904dae0b869e49a5a8fef3cab833c07
-warning: object 08285a436eaebeac2378b3d4c2d3f2a2f0a25dcf: missingTaggerEntry: invalid format - expected 'tagger' line
+e7b188a7c3925b76281f30ba800563c84a81cc15
+warning: object c2fff9dd0cff83b7da93c4bed681e55d9b0a5317: missingTaggerEntry: invalid format - expected 'tagger' line
 ok 32 - index-pack --strict warns upon missing tagger in tag
 
 expecting success: 
     git index-pack --fsck-objects tag-test-${pack1}.pack 2>err &&
     grep "^warning:.* expected .tagger. line" err
 
-b2e8d5d14904dae0b869e49a5a8fef3cab833c07
-warning: object 08285a436eaebeac2378b3d4c2d3f2a2f0a25dcf: missingTaggerEntry: invalid format - expected 'tagger' line
+e7b188a7c3925b76281f30ba800563c84a81cc15
+warning: object c2fff9dd0cff83b7da93c4bed681e55d9b0a5317: missingTaggerEntry: invalid format - expected 'tagger' line
 ok 33 - index-pack --fsck-objects also warns upon missing tagger in tag
 
 # passed all 33 test(s)
 1..33
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t5513-fetch-track.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5513-fetch-track/.git/
-expecting success: 
-	>file &&
-	git add . &&
-	test_tick &&
-	git commit -m Initial &&
-	git branch b-0 &&
-	git branch b1 &&
-	git branch b/one &&
-	test_create_repo other &&
-	(
-		cd other &&
-		git config remote.origin.url .. &&
-		git config remote.origin.fetch "+refs/heads/b/*:refs/remotes/b/*"
-	)
-
-[master (root-commit) 9d34b14] Initial
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 file
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5513-fetch-track/other/.git/
-ok 1 - setup
-
-expecting success: 
-	(
-		cd other && git fetch origin &&
-		test "$(git for-each-ref --format="%(refname)")" = refs/remotes/b/one
-	)
-
-From ..
- * [new branch]      b/one      -> b/one
-ok 2 - fetch
-
-# passed all 2 test(s)
-1..2
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t5504-fetch-receive-strict.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5504-fetch-receive-strict/.git/
-expecting success: 
-	echo hello >greetings &&
-	git add greetings &&
-	git commit -m greetings &&
-
-	S=$(git rev-parse :greetings | sed -e "s|^..|&/|") &&
-	X=$(echo bye | git hash-object -w --stdin | sed -e "s|^..|&/|") &&
-	echo $S >S &&
-	echo $X >X &&
-	cp .git/objects/$S .git/objects/$S.back &&
-	mv -f .git/objects/$X .git/objects/$S &&
-
-	test_must_fail git fsck
-
-[master (root-commit) 71d7937] greetings
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 greetings
-error: sha1 mismatch for .git/objects/ce/013625030ba8dba906f756967f9e9ca394464a (expected ce013625030ba8dba906f756967f9e9ca394464a)
-error: ce013625030ba8dba906f756967f9e9ca394464a: object corrupt or missing: .git/objects/ce/013625030ba8dba906f756967f9e9ca394464a
-bad sha1 file: .git/objects/ce/013625030ba8dba906f756967f9e9ca394464a.back
-missing blob ce013625030ba8dba906f756967f9e9ca394464a
-ok 1 - setup and inject "corrupt or missing" object
-
-expecting success: 
-	rm -rf dst &&
-	git init dst &&
-	(
-		cd dst &&
-		git config fetch.fsckobjects false &&
-		git config transfer.fsckobjects false &&
-		test_must_fail git fetch ../.git master
-	)
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5504-fetch-receive-strict/dst/.git/
-fatal: missing blob object 'ce013625030ba8dba906f756967f9e9ca394464a'
-error: ../.git did not send all necessary objects
-
-ok 2 - fetch without strict
-
-expecting success: 
-	rm -rf dst &&
-	git init dst &&
-	(
-		cd dst &&
-		git config fetch.fsckobjects false &&
-		git config transfer.fsckobjects true &&
-		test_must_fail git fetch ../.git master
-	)
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5504-fetch-receive-strict/dst/.git/
-fatal: missing blob object 'ce013625030ba8dba906f756967f9e9ca394464a'
-error: ../.git did not send all necessary objects
-
-ok 3 - fetch with !fetch.fsckobjects
-
-expecting success: 
-	rm -rf dst &&
-	git init dst &&
-	(
-		cd dst &&
-		git config fetch.fsckobjects true &&
-		git config transfer.fsckobjects false &&
-		test_must_fail git fetch ../.git master
-	)
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5504-fetch-receive-strict/dst/.git/
-fatal: object of unexpected type
-fatal: unpack-objects failed
-ok 4 - fetch with fetch.fsckobjects
-
-expecting success: 
-	rm -rf dst &&
-	git init dst &&
-	(
-		cd dst &&
-		git config transfer.fsckobjects true &&
-		test_must_fail git fetch ../.git master
-	)
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5504-fetch-receive-strict/dst/.git/
-fatal: object of unexpected type
-fatal: unpack-objects failed
-ok 5 - fetch with transfer.fsckobjects
-
-expecting success: 
-	rm -rf dst &&
-	git init dst &&
-	(
-		cd dst &&
-		git config fetch.fsckobjects false &&
-		git config transfer.fsckobjects false
-	) &&
-	test_must_fail git push --porcelain dst master:refs/heads/test >act &&
-	test_cmp exp act
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5504-fetch-receive-strict/dst/.git/
-remote: fatal: missing blob object 'ce013625030ba8dba906f756967f9e9ca394464a'        
-fatal: missing blob object 'ce013625030ba8dba906f756967f9e9ca394464a'
-error: failed to push some refs to 'dst'
-ok 6 - push without strict
-
-expecting success: 
-	rm -rf dst &&
-	git init dst &&
-	(
-		cd dst &&
-		git config receive.fsckobjects false &&
-		git config transfer.fsckobjects true
-	) &&
-	test_must_fail git push --porcelain dst master:refs/heads/test >act &&
-	test_cmp exp act
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5504-fetch-receive-strict/dst/.git/
-remote: fatal: missing blob object 'ce013625030ba8dba906f756967f9e9ca394464a'        
-fatal: missing blob object 'ce013625030ba8dba906f756967f9e9ca394464a'
-error: failed to push some refs to 'dst'
-ok 7 - push with !receive.fsckobjects
-
-expecting success: 
-	rm -rf dst &&
-	git init dst &&
-	(
-		cd dst &&
-		git config receive.fsckobjects true &&
-		git config transfer.fsckobjects false
-	) &&
-	test_must_fail git push --porcelain dst master:refs/heads/test >act &&
-	test_cmp exp act
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5504-fetch-receive-strict/dst/.git/
-remote: fatal: object of unexpected type        
-error: remote unpack failed: unpack-objects abnormal exit
-error: failed to push some refs to 'dst'
-ok 8 - push with receive.fsckobjects
-
-expecting success: 
-	rm -rf dst &&
-	git init dst &&
-	(
-		cd dst &&
-		git config transfer.fsckobjects true
-	) &&
-	test_must_fail git push --porcelain dst master:refs/heads/test >act &&
-	test_cmp exp act
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5504-fetch-receive-strict/dst/.git/
-remote: fatal: object of unexpected type        
-error: remote unpack failed: unpack-objects abnormal exit
-error: failed to push some refs to 'dst'
-ok 9 - push with transfer.fsckobjects
-
-expecting success: 
-	mv -f .git/objects/$(cat S) .git/objects/$(cat X) &&
-	mv .git/objects/$(cat S).back .git/objects/$(cat S) &&
-	rm -rf .git/objects/$(cat X) &&
-	git fsck
-
-ok 10 - repair the "corrupt or missing" object
-
-expecting success: 
-	commit="$(git hash-object -t commit -w --stdin <bogus-commit)"
-
-ok 11 - setup bogus commit
-
-expecting success: 
-	test_must_fail git fsck 2>err &&
-	test_i18ngrep "missingEmail" err
-
-dangling commit 6516fe4a6d0c9202861748d549d2e2b20e5210c9
-error in commit 6516fe4a6d0c9202861748d549d2e2b20e5210c9: missingEmail: invalid author/committer line - missing email
-ok 12 - fsck with no skipList input
-
-expecting success: 
-	cat >SKIP.unsorted <<-EOF &&
-	0000000000000000000000000000000000000004
-	0000000000000000000000000000000000000002
-	$commit
-	0000000000000000000000000000000000000001
-	0000000000000000000000000000000000000003
-	EOF
-	sort SKIP.unsorted >SKIP.sorted
-
-ok 13 - setup sorted and unsorted skipLists
-
-expecting success: 
-	git -c fsck.skipList=SKIP.sorted fsck
-
-dangling commit 6516fe4a6d0c9202861748d549d2e2b20e5210c9
-ok 14 - fsck with sorted skipList
-
-expecting success: 
-	git -c fsck.skipList=SKIP.unsorted fsck
-
-dangling commit 6516fe4a6d0c9202861748d549d2e2b20e5210c9
-ok 15 - fsck with unsorted skipList
-
-expecting success: 
-	git -c fsck.skipList=/dev/null -c fsck.missingEmail=ignore fsck &&
-	test_must_fail git -c fsck.skipList=does-not-exist -c fsck.missingEmail=ignore fsck 2>err &&
-	test_i18ngrep "Could not open skip list: does-not-exist" err &&
-	test_must_fail git -c fsck.skipList=.git/config -c fsck.missingEmail=ignore fsck 2>err &&
-	test_i18ngrep "Invalid SHA-1: \[core\]" err
-
-dangling commit 6516fe4a6d0c9202861748d549d2e2b20e5210c9
-fatal: Could not open skip list: does-not-exist
-fatal: Invalid SHA-1: [core]
-ok 16 - fsck with invalid or bogus skipList input
-
-expecting success: 
-	cat >SKIP.with-comment <<-EOF &&
-	# Some bad commit
-	0000000000000000000000000000000000000001
-	EOF
-	test_must_fail git -c fsck.skipList=SKIP.with-comment fsck 2>err-with-comment &&
-	test_i18ngrep "missingEmail" err-with-comment &&
-	cat >SKIP.with-empty-line <<-EOF &&
-	0000000000000000000000000000000000000001
-
-	0000000000000000000000000000000000000002
-	EOF
-	test_must_fail git -c fsck.skipList=SKIP.with-empty-line fsck 2>err-with-empty-line &&
-	test_i18ngrep "missingEmail" err-with-empty-line
-
-dangling commit 6516fe4a6d0c9202861748d549d2e2b20e5210c9
-error in commit 6516fe4a6d0c9202861748d549d2e2b20e5210c9: missingEmail: invalid author/committer line - missing email
-dangling commit 6516fe4a6d0c9202861748d549d2e2b20e5210c9
-error in commit 6516fe4a6d0c9202861748d549d2e2b20e5210c9: missingEmail: invalid author/committer line - missing email
-ok 17 - fsck with other accepted skipList input (comments & empty lines)
-
-expecting success: 
-	test_line_count = 1 err-with-comment &&
-	test_line_count = 1 err-with-empty-line
-
-ok 18 - fsck no garbage output from comments & empty lines errors
-
-expecting success: 
-	echo $commit | test_copy_bytes 20 >SKIP.abbreviated &&
-	test_must_fail git -c fsck.skipList=SKIP.abbreviated fsck 2>err-abbreviated &&
-	test_i18ngrep "^fatal: Invalid SHA-1: " err-abbreviated
-
-fatal: Invalid SHA-1: 6516fe4a6d0c92028617
-ok 19 - fsck with invalid abbreviated skipList input
-
-expecting success: 
-	>SKIP.exhaustive &&
-	echo "# A commented line" >>SKIP.exhaustive &&
-	echo "" >>SKIP.exhaustive &&
-	echo " " >>SKIP.exhaustive &&
-	echo " # Comment after whitespace" >>SKIP.exhaustive &&
-	echo "$commit # Our bad commit (with leading whitespace and trailing comment)" >>SKIP.exhaustive &&
-	echo "# Some bad commit (leading whitespace)" >>SKIP.exhaustive &&
-	echo "  0000000000000000000000000000000000000001" >>SKIP.exhaustive &&
-	git -c fsck.skipList=SKIP.exhaustive fsck 2>err &&
-	test_must_be_empty err
-
-dangling commit 6516fe4a6d0c9202861748d549d2e2b20e5210c9
-ok 20 - fsck with exhaustive accepted skipList input (various types of comments etc.)
-
-expecting success: 
-	git push . $commit:refs/heads/bogus &&
-	rm -rf dst &&
-	git init dst &&
-	git --git-dir=dst/.git config receive.fsckObjects true &&
-	test_must_fail git push --porcelain dst bogus &&
-	echo $commit >dst/.git/SKIP &&
-
-	# receive.fsck.* does not fall back on fsck.*
-	git --git-dir=dst/.git config fsck.skipList SKIP &&
-	test_must_fail git push --porcelain dst bogus &&
-
-	# Invalid and/or bogus skipList input
-	git --git-dir=dst/.git config receive.fsck.skipList /dev/null &&
-	test_must_fail git push --porcelain dst bogus &&
-	git --git-dir=dst/.git config receive.fsck.skipList does-not-exist &&
-	test_must_fail git push --porcelain dst bogus 2>err &&
-	test_i18ngrep "Could not open skip list: does-not-exist" err &&
-	git --git-dir=dst/.git config receive.fsck.skipList config &&
-	test_must_fail git push --porcelain dst bogus 2>err &&
-	test_i18ngrep "Invalid SHA-1: \[core\]" err &&
-
-	git --git-dir=dst/.git config receive.fsck.skipList SKIP &&
-	git push --porcelain dst bogus
-
-To .
- * [new branch]      6516fe4a6d0c9202861748d549d2e2b20e5210c9 -> bogus
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5504-fetch-receive-strict/dst/.git/
-remote: error: object 6516fe4a6d0c9202861748d549d2e2b20e5210c9: missingEmail: invalid author/committer line - missing email        
-remote: fatal: fsck error in packed object        
-error: remote unpack failed: unpack-objects abnormal exit
-error: failed to push some refs to 'dst'
-To dst
-!	refs/heads/bogus:refs/heads/bogus	[remote rejected] (unpacker error)
-remote: error: object 6516fe4a6d0c9202861748d549d2e2b20e5210c9: missingEmail: invalid author/committer line - missing email        
-remote: fatal: fsck error in packed object        
-error: remote unpack failed: unpack-objects abnormal exit
-error: failed to push some refs to 'dst'
-To dst
-!	refs/heads/bogus:refs/heads/bogus	[remote rejected] (unpacker error)
-remote: error: object 6516fe4a6d0c9202861748d549d2e2b20e5210c9: missingEmail: invalid author/committer line - missing email        
-remote: fatal: fsck error in packed object        
-error: remote unpack failed: unpack-objects abnormal exit
-error: failed to push some refs to 'dst'
-To dst
-!	refs/heads/bogus:refs/heads/bogus	[remote rejected] (unpacker error)
-To dst
-!	refs/heads/bogus:refs/heads/bogus	[remote rejected] (unpacker error)
-remote: fatal: Could not open skip list: does-not-exist        
-To dst
-!	refs/heads/bogus:refs/heads/bogus	[remote rejected] (unpacker error)
-remote: fatal: Invalid SHA-1: [core]        
-To dst
-*	refs/heads/bogus:refs/heads/bogus	[new branch]
-Done
-ok 21 - push with receive.fsck.skipList
-
-expecting success: 
-	refspec=refs/heads/bogus:refs/heads/bogus &&
-	git push . $commit:refs/heads/bogus &&
-	rm -rf dst &&
-	git init dst &&
-	git --git-dir=dst/.git config fetch.fsckObjects true &&
-	test_must_fail git --git-dir=dst/.git fetch "file://$(pwd)" $refspec &&
-	git --git-dir=dst/.git config fetch.fsck.skipList /dev/null &&
-	test_must_fail git --git-dir=dst/.git fetch "file://$(pwd)" $refspec &&
-	echo $commit >dst/.git/SKIP &&
-
-	# fetch.fsck.* does not fall back on fsck.*
-	git --git-dir=dst/.git config fsck.skipList dst/.git/SKIP &&
-	test_must_fail git --git-dir=dst/.git fetch "file://$(pwd)" $refspec &&
-
-	# Invalid and/or bogus skipList input
-	git --git-dir=dst/.git config fetch.fsck.skipList /dev/null &&
-	test_must_fail git --git-dir=dst/.git fetch "file://$(pwd)" $refspec &&
-	git --git-dir=dst/.git config fetch.fsck.skipList does-not-exist &&
-	test_must_fail git --git-dir=dst/.git fetch "file://$(pwd)" $refspec 2>err &&
-	test_i18ngrep "Could not open skip list: does-not-exist" err &&
-	git --git-dir=dst/.git config fetch.fsck.skipList dst/.git/config &&
-	test_must_fail git --git-dir=dst/.git fetch "file://$(pwd)" $refspec 2>err &&
-	test_i18ngrep "Invalid SHA-1: \[core\]" err &&
-
-	git --git-dir=dst/.git config fetch.fsck.skipList dst/.git/SKIP &&
-	git --git-dir=dst/.git fetch "file://$(pwd)" $refspec
-
-Everything up-to-date
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5504-fetch-receive-strict/dst/.git/
-error: object 6516fe4a6d0c9202861748d549d2e2b20e5210c9: missingEmail: invalid author/committer line - missing email
-fatal: fsck error in packed object
-fatal: unpack-objects failed
-error: object 6516fe4a6d0c9202861748d549d2e2b20e5210c9: missingEmail: invalid author/committer line - missing email
-fatal: fsck error in packed object
-fatal: unpack-objects failed
-error: object 6516fe4a6d0c9202861748d549d2e2b20e5210c9: missingEmail: invalid author/committer line - missing email
-fatal: fsck error in packed object
-fatal: unpack-objects failed
-error: object 6516fe4a6d0c9202861748d549d2e2b20e5210c9: missingEmail: invalid author/committer line - missing email
-fatal: fsck error in packed object
-fatal: unpack-objects failed
-fatal: Could not open skip list: does-not-exist
-fatal: Invalid SHA-1: [core]
-From file:///build/git-2.20.1/t/trash directory.t5504-fetch-receive-strict
- * [new branch]      bogus      -> bogus
-ok 22 - fetch with fetch.fsck.skipList
-
-expecting success: 
-	test_must_fail git -c fsck.whatEver=ignore fsck 2>err &&
-	test_i18ngrep "Unhandled message id: whatever" err
-
-fatal: Unhandled message id: whatever
-ok 23 - fsck.<unknownmsg-id> dies
-
-expecting success: 
-	git push . $commit:refs/heads/bogus &&
-	rm -rf dst &&
-	git init dst &&
-	git --git-dir=dst/.git config receive.fsckobjects true &&
-	test_must_fail git push --porcelain dst bogus &&
-
-	# receive.fsck.<msg-id> does not fall back on fsck.<msg-id>
-	git --git-dir=dst/.git config fsck.missingEmail warn &&
-	test_must_fail git push --porcelain dst bogus &&
-
-	# receive.fsck.<unknownmsg-id> warns
-	git --git-dir=dst/.git config \
-		receive.fsck.whatEver error &&
-
-	git --git-dir=dst/.git config \
-		receive.fsck.missingEmail warn &&
-	git push --porcelain dst bogus >act 2>&1 &&
-	grep "missingEmail" act &&
-	test_i18ngrep "Skipping unknown msg id.*whatever" act &&
-	git --git-dir=dst/.git branch -D bogus &&
-	git --git-dir=dst/.git config --add \
-		receive.fsck.missingEmail ignore &&
-	git push --porcelain dst bogus >act 2>&1 &&
-	! grep "missingEmail" act
-
-Everything up-to-date
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5504-fetch-receive-strict/dst/.git/
-remote: error: object 6516fe4a6d0c9202861748d549d2e2b20e5210c9: missingEmail: invalid author/committer line - missing email        
-remote: fatal: fsck error in packed object        
-error: remote unpack failed: unpack-objects abnormal exit
-error: failed to push some refs to 'dst'
-To dst
-!	refs/heads/bogus:refs/heads/bogus	[remote rejected] (unpacker error)
-remote: error: object 6516fe4a6d0c9202861748d549d2e2b20e5210c9: missingEmail: invalid author/committer line - missing email        
-remote: fatal: fsck error in packed object        
-error: remote unpack failed: unpack-objects abnormal exit
-error: failed to push some refs to 'dst'
-To dst
-!	refs/heads/bogus:refs/heads/bogus	[remote rejected] (unpacker error)
-remote: warning: object 6516fe4a6d0c9202861748d549d2e2b20e5210c9: missingEmail: invalid author/committer line - missing email        
-warning: Skipping unknown msg id 'whatever'
-Deleted branch bogus (was 6516fe4).
-ok 24 - push with receive.fsck.missingEmail=warn
-
-expecting success: 
-	refspec=refs/heads/bogus:refs/heads/bogus &&
-	git push . $commit:refs/heads/bogus &&
-	rm -rf dst &&
-	git init dst &&
-	git --git-dir=dst/.git config fetch.fsckobjects true &&
-	test_must_fail git --git-dir=dst/.git fetch "file://$(pwd)" $refspec &&
-
-	# fetch.fsck.<msg-id> does not fall back on fsck.<msg-id>
-	git --git-dir=dst/.git config fsck.missingEmail warn &&
-	test_must_fail git --git-dir=dst/.git fetch "file://$(pwd)" $refspec &&
-
-	# receive.fsck.<unknownmsg-id> warns
-	git --git-dir=dst/.git config \
-		fetch.fsck.whatEver error &&
-
-	git --git-dir=dst/.git config \
-		fetch.fsck.missingEmail warn &&
-	git --git-dir=dst/.git fetch "file://$(pwd)" $refspec >act 2>&1 &&
-	grep "missingEmail" act &&
-	test_i18ngrep "Skipping unknown msg id.*whatever" act &&
-	rm -rf dst &&
-	git init dst &&
-	git --git-dir=dst/.git config fetch.fsckobjects true &&
-	git --git-dir=dst/.git config \
-		fetch.fsck.missingEmail ignore &&
-	git --git-dir=dst/.git fetch "file://$(pwd)" $refspec >act 2>&1 &&
-	! grep "missingEmail" act
-
-Everything up-to-date
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5504-fetch-receive-strict/dst/.git/
-error: object 6516fe4a6d0c9202861748d549d2e2b20e5210c9: missingEmail: invalid author/committer line - missing email
-fatal: fsck error in packed object
-fatal: unpack-objects failed
-error: object 6516fe4a6d0c9202861748d549d2e2b20e5210c9: missingEmail: invalid author/committer line - missing email
-fatal: fsck error in packed object
-fatal: unpack-objects failed
-warning: object 6516fe4a6d0c9202861748d549d2e2b20e5210c9: missingEmail: invalid author/committer line - missing email
-warning: Skipping unknown msg id 'whatever'
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5504-fetch-receive-strict/dst/.git/
-ok 25 - fetch with fetch.fsck.missingEmail=warn
-
-expecting success: 
-	rm -rf dst &&
-	git init dst &&
-	git --git-dir=dst/.git config receive.fsckobjects true &&
-	git --git-dir=dst/.git config \
-		receive.fsck.unterminatedheader warn &&
-	test_must_fail git push --porcelain dst HEAD >act 2>&1 &&
-	grep "Cannot demote unterminatedheader" act
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5504-fetch-receive-strict/dst/.git/
-remote: fatal: Cannot demote unterminatedheader to warn        
-ok 26 - receive.fsck.unterminatedHeader=warn triggers error
-
-expecting success: 
-	rm -rf dst &&
-	git init dst &&
-	git --git-dir=dst/.git config fetch.fsckobjects true &&
-	git --git-dir=dst/.git config \
-		fetch.fsck.unterminatedheader warn &&
-	test_must_fail git --git-dir=dst/.git fetch "file://$(pwd)" HEAD &&
-	grep "Cannot demote unterminatedheader" act
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5504-fetch-receive-strict/dst/.git/
-fatal: Cannot demote unterminatedheader to warn
-fatal: unpack-objects failed
-remote: fatal: Cannot demote unterminatedheader to warn        
-ok 27 - fetch.fsck.unterminatedHeader=warn triggers error
-
-# passed all 27 test(s)
-1..27
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
 *** t5518-fetch-exit-status.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5518-fetch-exit-status/.git/
 expecting success: 
@@ -156138,16 +157115,16 @@
 	echo next >file &&
 	git commit -a -m next
 
-[master (root-commit) fa8799f] initial
+[master (root-commit) e444c8f] 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 92d2422] side
+[side cd485f6] side
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 Switched to branch 'master'
-[master c287f3a] next
+[master fad200e] next
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 ok 1 - setup
@@ -156167,7 +157144,7 @@
 
 
 From .
- + 92d2422...c287f3a master     -> side  (forced update)
+ + cd485f6...fad200e master     -> side  (forced update)
 ok 3 - forced update
 
 # passed all 3 test(s)
@@ -156190,21 +157167,21 @@
 		)
 	
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4137-apply-submodule/submodule_update_sub1/.git/
-[master (root-commit) 9a73238] Base inside first submodule
+[master (root-commit) d8d94d3] 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/git-2.20.1/t/trash directory.t4137-apply-submodule/submodule_update_sub2/.git/
-[master (root-commit) 74ad47f] nested submodule base
+[master (root-commit) 4e6ea9d] 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/git-2.20.1/t/trash directory.t4137-apply-submodule/submodule_update_repo/.git/
-[master (root-commit) f7c1090] Base
+[master (root-commit) 29aac1f] Base
  Author: A U Thor <author@example.com>
  3 files changed, 4 insertions(+)
  create mode 100644 .gitignore
@@ -156215,7 +157192,7 @@
 done.
 Cloning into '/build/git-2.20.1/t/trash directory.t4137-apply-submodule/submodule_update_repo/uninitialized_sub'...
 done.
-[add_sub1 2082392] Add sub1
+[add_sub1 743597e] Add sub1
  Author: A U Thor <author@example.com>
  2 files changed, 8 insertions(+)
  create mode 100644 .gitmodules
@@ -156224,45 +157201,45 @@
 Removing uninitialized_sub
 Removing sub1
 Removing .gitmodules
-[remove_sub1 8b0bc78] Revert "Add sub1"
+[remove_sub1 28e8328] Revert "Add sub1"
  Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:07:28 2021 +0000
+ Date: Thu Jan 5 11:48:48 2023 +0000
  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 c5f984a] modified file2 and added file3
+[modifications 1c7845d] 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/git-2.20.1/t/trash directory.t4137-apply-submodule/submodule_update_sub1
  * [new branch]      modifications -> modifications
-[modify_sub1 71772cc] Modify sub1
+[modify_sub1 999dda0] 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/git-2.20.1/t/trash directory.t4137-apply-submodule/submodule_update_repo/sub1/sub2'...
 done.
-[add_nested_sub fe580a8] add a nested submodule
+[add_nested_sub 583ce16] 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 740d289] update submodule, that updates a nested submodule
+[add_nested_sub b6c17b8] 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 25072a0] make a change in nested sub
+[modify_sub1_recursively 76b222d] 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 edf55a4] update nested sub
+[modify_sub1_recursively 901c451] update nested sub
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-[modify_sub1_recursively a50d516] update sub1, that updates nested sub
+[modify_sub1_recursively 26da7ed] update sub1, that updates nested sub
  Author: A U Thor <author@example.com>
 To /build/git-2.20.1/t/trash directory.t4137-apply-submodule/submodule_update_sub1
  * [new branch]      modify_sub1_recursively -> modify_sub1_recursively
@@ -156271,11 +157248,11 @@
 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 '9a73238a45527d1f93c05b0e61fdaa0a2733baab'
-Previous HEAD position was 9a73238 Base inside first submodule
+Submodule path 'sub1': checked out 'd8d94d3586e9178b257bab5ec9eadd4cb7a8c931'
+Previous HEAD position was d8d94d3 Base inside first submodule
 Switched to branch 'modifications'
 rm 'sub1'
-[replace_sub1_with_directory cd32d57] Replace sub1 with directory
+[replace_sub1_with_directory 6088e63] Replace sub1 with directory
  Author: A U Thor <author@example.com>
  5 files changed, 3 insertions(+), 5 deletions(-)
  delete mode 160000 sub1
@@ -156287,32 +157264,32 @@
 Removing sub1/file2
 Removing sub1/file1
 Adding sub1
-[replace_directory_with_sub1 a2dfe5d] Revert "Replace sub1 with directory"
+[replace_directory_with_sub1 32baa78] Revert "Replace sub1 with directory"
  Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:07:39 2021 +0000
+ Date: Thu Jan 5 11:48:50 2023 +0000
  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 ee94d4b] Replace sub1 with file
+[replace_sub1_with_file 94b0194] 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 79f4132] Revert "Replace sub1 with file"
+[replace_file_with_sub1 948f793] Revert "Replace sub1 with file"
  Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:07:39 2021 +0000
+ Date: Thu Jan 5 11:48:50 2023 +0000
  2 files changed, 5 insertions(+), 1 deletion(-)
  mode change 100644 => 160000 sub1
 Switched to a new branch 'invalid_sub1'
-[invalid_sub1 c695903] Invalid sub1 commit
+[invalid_sub1 99b663b] Invalid sub1 commit
  Author: A U Thor <author@example.com>
 Switched to a new branch 'valid_sub1'
-[valid_sub1 f1a55f9] Revert "Invalid sub1 commit"
+[valid_sub1 e8416c3] Revert "Invalid sub1 commit"
  Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:07:43 2021 +0000
+ Date: Thu Jan 5 11:48:50 2023 +0000
 warning: unable to rmdir 'uninitialized_sub': Directory not empty
 Switched to branch 'master'
 Cloning into 'submodule_update'...
@@ -156326,8 +157303,8 @@
 done.
 Cloning into '/build/git-2.20.1/t/trash directory.t4137-apply-submodule/submodule_update/uninitialized_sub'...
 done.
-Submodule path 'sub1': checked out '9a73238a45527d1f93c05b0e61fdaa0a2733baab'
-Submodule path 'uninitialized_sub': checked out '9a73238a45527d1f93c05b0e61fdaa0a2733baab'
+Submodule path 'sub1': checked out 'd8d94d3586e9178b257bab5ec9eadd4cb7a8c931'
+Submodule path 'uninitialized_sub': checked out 'd8d94d3586e9178b257bab5ec9eadd4cb7a8c931'
 ok 1 - apply_index: added submodule creates empty directory
 
 expecting success: 
@@ -156355,8 +157332,8 @@
 done.
 Cloning into '/build/git-2.20.1/t/trash directory.t4137-apply-submodule/submodule_update/uninitialized_sub'...
 done.
-Submodule path 'sub1': checked out '9a73238a45527d1f93c05b0e61fdaa0a2733baab'
-Submodule path 'uninitialized_sub': checked out '9a73238a45527d1f93c05b0e61fdaa0a2733baab'
+Submodule path 'sub1': checked out 'd8d94d3586e9178b257bab5ec9eadd4cb7a8c931'
+Submodule path 'uninitialized_sub': checked out 'd8d94d3586e9178b257bab5ec9eadd4cb7a8c931'
 ok 2 - apply_index: added submodule leaves existing empty directory alone
 
 expecting success: 
@@ -156384,8 +157361,8 @@
 done.
 Cloning into '/build/git-2.20.1/t/trash directory.t4137-apply-submodule/submodule_update/uninitialized_sub'...
 done.
-Submodule path 'sub1': checked out '9a73238a45527d1f93c05b0e61fdaa0a2733baab'
-Submodule path 'uninitialized_sub': checked out '9a73238a45527d1f93c05b0e61fdaa0a2733baab'
+Submodule path 'sub1': checked out 'd8d94d3586e9178b257bab5ec9eadd4cb7a8c931'
+Submodule path 'uninitialized_sub': checked out 'd8d94d3586e9178b257bab5ec9eadd4cb7a8c931'
 ok 3 - apply_index: replace tracked file with submodule creates empty directory
 
 expecting success: 
@@ -156413,8 +157390,8 @@
 done.
 Cloning into '/build/git-2.20.1/t/trash directory.t4137-apply-submodule/submodule_update/uninitialized_sub'...
 done.
-Submodule path 'sub1': checked out '9a73238a45527d1f93c05b0e61fdaa0a2733baab'
-Submodule path 'uninitialized_sub': checked out '9a73238a45527d1f93c05b0e61fdaa0a2733baab'
+Submodule path 'sub1': checked out 'd8d94d3586e9178b257bab5ec9eadd4cb7a8c931'
+Submodule path 'uninitialized_sub': checked out 'd8d94d3586e9178b257bab5ec9eadd4cb7a8c931'
 ok 4 - apply_index: replace directory with submodule
 
 expecting success: 
@@ -156435,7 +157412,7 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t4137-apply-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t4137-apply-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out '9a73238a45527d1f93c05b0e61fdaa0a2733baab'
+Submodule path 'sub1': checked out 'd8d94d3586e9178b257bab5ec9eadd4cb7a8c931'
 Branch 'remove_sub1' set up to track remote branch 'remove_sub1' from 'origin'.
 warning: unable to rmdir 'sub1': Directory not empty
 ok 5 - apply_index: removed submodule leaves submodule directory and its contents in place
@@ -156460,7 +157437,7 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t4137-apply-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t4137-apply-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out '9a73238a45527d1f93c05b0e61fdaa0a2733baab'
+Submodule path 'sub1': checked out 'd8d94d3586e9178b257bab5ec9eadd4cb7a8c931'
 Branch 'remove_sub1' set up to track remote branch 'remove_sub1' from 'origin'.
 warning: unable to rmdir 'sub1': Directory not empty
 ok 6 - apply_index: removed submodule leaves submodule containing a .git directory alone
@@ -156483,7 +157460,7 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t4137-apply-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t4137-apply-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out '9a73238a45527d1f93c05b0e61fdaa0a2733baab'
+Submodule path 'sub1': checked out 'd8d94d3586e9178b257bab5ec9eadd4cb7a8c931'
 Branch 'replace_sub1_with_directory' set up to track remote branch 'replace_sub1_with_directory' from 'origin'.
 error: sub1/file1: already exists in working directory
 error: sub1/file2: already exists in working directory
@@ -156509,7 +157486,7 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t4137-apply-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t4137-apply-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out '9a73238a45527d1f93c05b0e61fdaa0a2733baab'
+Submodule path 'sub1': checked out 'd8d94d3586e9178b257bab5ec9eadd4cb7a8c931'
 Branch 'replace_sub1_with_directory' set up to track remote branch 'replace_sub1_with_directory' from 'origin'.
 error: sub1/file1: already exists in working directory
 error: sub1/file2: already exists in working directory
@@ -156533,7 +157510,7 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t4137-apply-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t4137-apply-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out '9a73238a45527d1f93c05b0e61fdaa0a2733baab'
+Submodule path 'sub1': checked out 'd8d94d3586e9178b257bab5ec9eadd4cb7a8c931'
 Branch 'replace_sub1_with_file' set up to track remote branch 'replace_sub1_with_file' from 'origin'.
 warning: unable to rmdir 'sub1': Directory not empty
 error: unable to write file 'sub1' mode 100644: Directory not empty
@@ -156561,7 +157538,7 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t4137-apply-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t4137-apply-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out '9a73238a45527d1f93c05b0e61fdaa0a2733baab'
+Submodule path 'sub1': checked out 'd8d94d3586e9178b257bab5ec9eadd4cb7a8c931'
 Branch 'replace_sub1_with_file' set up to track remote branch 'replace_sub1_with_file' from 'origin'.
 warning: unable to rmdir 'sub1': Directory not empty
 error: unable to write file 'sub1' mode 100644: Directory not empty
@@ -156589,10 +157566,10 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t4137-apply-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t4137-apply-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out '9a73238a45527d1f93c05b0e61fdaa0a2733baab'
+Submodule path 'sub1': checked out 'd8d94d3586e9178b257bab5ec9eadd4cb7a8c931'
 Branch 'modify_sub1' set up to track remote branch 'modify_sub1' from 'origin'.
 warning: unable to rmdir 'sub1': Directory not empty
-Submodule path 'sub1': checked out 'c5f984a1d3cc1630acff447725363149ae6821e8'
+Submodule path 'sub1': checked out '1c7845d3c552a3d603101f63443c1a936ff6b0e2'
 ok 11 - apply_index: modified submodule does not update submodule work tree
 
 expecting success: 
@@ -156615,7 +157592,7 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t4137-apply-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t4137-apply-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out '9a73238a45527d1f93c05b0e61fdaa0a2733baab'
+Submodule path 'sub1': checked out 'd8d94d3586e9178b257bab5ec9eadd4cb7a8c931'
 Branch 'invalid_sub1' set up to track remote branch 'invalid_sub1' from 'origin'.
 warning: unable to rmdir 'sub1': Directory not empty
 error: Server does not allow request for unadvertised object 0123456789012345678901234567890123456789
@@ -156647,8 +157624,8 @@
 done.
 Cloning into '/build/git-2.20.1/t/trash directory.t4137-apply-submodule/submodule_update/uninitialized_sub'...
 done.
-Submodule path 'sub1': checked out '9a73238a45527d1f93c05b0e61fdaa0a2733baab'
-Submodule path 'uninitialized_sub': checked out '9a73238a45527d1f93c05b0e61fdaa0a2733baab'
+Submodule path 'sub1': checked out 'd8d94d3586e9178b257bab5ec9eadd4cb7a8c931'
+Submodule path 'uninitialized_sub': checked out 'd8d94d3586e9178b257bab5ec9eadd4cb7a8c931'
 ok 13 - apply_index: modified submodule does not update submodule work tree from invalid commit
 
 expecting success: 
@@ -156695,8 +157672,8 @@
 done.
 Cloning into '/build/git-2.20.1/t/trash directory.t4137-apply-submodule/submodule_update/uninitialized_sub'...
 done.
-Submodule path 'sub1': checked out '9a73238a45527d1f93c05b0e61fdaa0a2733baab'
-Submodule path 'uninitialized_sub': checked out '9a73238a45527d1f93c05b0e61fdaa0a2733baab'
+Submodule path 'sub1': checked out 'd8d94d3586e9178b257bab5ec9eadd4cb7a8c931'
+Submodule path 'uninitialized_sub': checked out 'd8d94d3586e9178b257bab5ec9eadd4cb7a8c931'
 ok 15 - apply_3way: added submodule creates empty directory
 
 expecting success: 
@@ -156724,8 +157701,8 @@
 done.
 Cloning into '/build/git-2.20.1/t/trash directory.t4137-apply-submodule/submodule_update/uninitialized_sub'...
 done.
-Submodule path 'sub1': checked out '9a73238a45527d1f93c05b0e61fdaa0a2733baab'
-Submodule path 'uninitialized_sub': checked out '9a73238a45527d1f93c05b0e61fdaa0a2733baab'
+Submodule path 'sub1': checked out 'd8d94d3586e9178b257bab5ec9eadd4cb7a8c931'
+Submodule path 'uninitialized_sub': checked out 'd8d94d3586e9178b257bab5ec9eadd4cb7a8c931'
 ok 16 - apply_3way: added submodule leaves existing empty directory alone
 
 expecting success: 
@@ -156753,8 +157730,8 @@
 done.
 Cloning into '/build/git-2.20.1/t/trash directory.t4137-apply-submodule/submodule_update/uninitialized_sub'...
 done.
-Submodule path 'sub1': checked out '9a73238a45527d1f93c05b0e61fdaa0a2733baab'
-Submodule path 'uninitialized_sub': checked out '9a73238a45527d1f93c05b0e61fdaa0a2733baab'
+Submodule path 'sub1': checked out 'd8d94d3586e9178b257bab5ec9eadd4cb7a8c931'
+Submodule path 'uninitialized_sub': checked out 'd8d94d3586e9178b257bab5ec9eadd4cb7a8c931'
 ok 17 - apply_3way: replace tracked file with submodule creates empty directory
 
 expecting success: 
@@ -156782,8 +157759,8 @@
 done.
 Cloning into '/build/git-2.20.1/t/trash directory.t4137-apply-submodule/submodule_update/uninitialized_sub'...
 done.
-Submodule path 'sub1': checked out '9a73238a45527d1f93c05b0e61fdaa0a2733baab'
-Submodule path 'uninitialized_sub': checked out '9a73238a45527d1f93c05b0e61fdaa0a2733baab'
+Submodule path 'sub1': checked out 'd8d94d3586e9178b257bab5ec9eadd4cb7a8c931'
+Submodule path 'uninitialized_sub': checked out 'd8d94d3586e9178b257bab5ec9eadd4cb7a8c931'
 ok 18 - apply_3way: replace directory with submodule
 
 expecting success: 
@@ -156804,7 +157781,7 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t4137-apply-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t4137-apply-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out '9a73238a45527d1f93c05b0e61fdaa0a2733baab'
+Submodule path 'sub1': checked out 'd8d94d3586e9178b257bab5ec9eadd4cb7a8c931'
 Branch 'remove_sub1' set up to track remote branch 'remove_sub1' from 'origin'.
 warning: unable to rmdir 'sub1': Directory not empty
 ok 19 - apply_3way: removed submodule leaves submodule directory and its contents in place
@@ -156829,7 +157806,7 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t4137-apply-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t4137-apply-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out '9a73238a45527d1f93c05b0e61fdaa0a2733baab'
+Submodule path 'sub1': checked out 'd8d94d3586e9178b257bab5ec9eadd4cb7a8c931'
 Branch 'remove_sub1' set up to track remote branch 'remove_sub1' from 'origin'.
 warning: unable to rmdir 'sub1': Directory not empty
 ok 20 - apply_3way: removed submodule leaves submodule containing a .git directory alone
@@ -156852,7 +157829,7 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t4137-apply-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t4137-apply-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out '9a73238a45527d1f93c05b0e61fdaa0a2733baab'
+Submodule path 'sub1': checked out 'd8d94d3586e9178b257bab5ec9eadd4cb7a8c931'
 Branch 'replace_sub1_with_directory' set up to track remote branch 'replace_sub1_with_directory' from 'origin'.
 Falling back to three-way merge...
 error: sub1/file1: does not exist in index
@@ -156884,7 +157861,7 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t4137-apply-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t4137-apply-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out '9a73238a45527d1f93c05b0e61fdaa0a2733baab'
+Submodule path 'sub1': checked out 'd8d94d3586e9178b257bab5ec9eadd4cb7a8c931'
 Branch 'replace_sub1_with_directory' set up to track remote branch 'replace_sub1_with_directory' from 'origin'.
 Falling back to three-way merge...
 error: sub1/file1: does not exist in index
@@ -156914,7 +157891,7 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t4137-apply-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t4137-apply-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out '9a73238a45527d1f93c05b0e61fdaa0a2733baab'
+Submodule path 'sub1': checked out 'd8d94d3586e9178b257bab5ec9eadd4cb7a8c931'
 Branch 'replace_sub1_with_file' set up to track remote branch 'replace_sub1_with_file' from 'origin'.
 warning: unable to rmdir 'sub1': Directory not empty
 error: unable to write file 'sub1' mode 100644: Directory not empty
@@ -156942,7 +157919,7 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t4137-apply-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t4137-apply-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out '9a73238a45527d1f93c05b0e61fdaa0a2733baab'
+Submodule path 'sub1': checked out 'd8d94d3586e9178b257bab5ec9eadd4cb7a8c931'
 Branch 'replace_sub1_with_file' set up to track remote branch 'replace_sub1_with_file' from 'origin'.
 warning: unable to rmdir 'sub1': Directory not empty
 error: unable to write file 'sub1' mode 100644: Directory not empty
@@ -156970,10 +157947,10 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t4137-apply-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t4137-apply-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out '9a73238a45527d1f93c05b0e61fdaa0a2733baab'
+Submodule path 'sub1': checked out 'd8d94d3586e9178b257bab5ec9eadd4cb7a8c931'
 Branch 'modify_sub1' set up to track remote branch 'modify_sub1' from 'origin'.
 warning: unable to rmdir 'sub1': Directory not empty
-Submodule path 'sub1': checked out 'c5f984a1d3cc1630acff447725363149ae6821e8'
+Submodule path 'sub1': checked out '1c7845d3c552a3d603101f63443c1a936ff6b0e2'
 ok 25 - apply_3way: modified submodule does not update submodule work tree
 
 expecting success: 
@@ -156996,7 +157973,7 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t4137-apply-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t4137-apply-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out '9a73238a45527d1f93c05b0e61fdaa0a2733baab'
+Submodule path 'sub1': checked out 'd8d94d3586e9178b257bab5ec9eadd4cb7a8c931'
 Branch 'invalid_sub1' set up to track remote branch 'invalid_sub1' from 'origin'.
 warning: unable to rmdir 'sub1': Directory not empty
 error: Server does not allow request for unadvertised object 0123456789012345678901234567890123456789
@@ -157028,8 +158005,8 @@
 done.
 Cloning into '/build/git-2.20.1/t/trash directory.t4137-apply-submodule/submodule_update/uninitialized_sub'...
 done.
-Submodule path 'sub1': checked out '9a73238a45527d1f93c05b0e61fdaa0a2733baab'
-Submodule path 'uninitialized_sub': checked out '9a73238a45527d1f93c05b0e61fdaa0a2733baab'
+Submodule path 'sub1': checked out 'd8d94d3586e9178b257bab5ec9eadd4cb7a8c931'
+Submodule path 'uninitialized_sub': checked out 'd8d94d3586e9178b257bab5ec9eadd4cb7a8c931'
 ok 27 - apply_3way: modified submodule does not update submodule work tree from invalid commit
 
 expecting success: 
@@ -157221,273 +158198,219 @@
 1..45
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t5514-fetch-multiple.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5514-fetch-multiple/.git/
+*** t5522-pull-symlink.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5522-pull-symlink/.git/
+checking prerequisite: SYMLINKS
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
+	# test whether the filesystem supports symbolic links
+	ln -s x y && test -h y
+
+)
+prerequisite SYMLINKS ok
 expecting success: 
-	setup_repository one &&
-	setup_repository two &&
+	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 two && git branch another
+		cd clone-repo &&
+		git config receive.denyCurrentBranch warn
 	) &&
-	git clone --mirror two three &&
-	git clone one test
+	git config receive.denyCurrentBranch warn
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5514-fetch-multiple/one/.git/
-[master (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 'master'
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5514-fetch-multiple/two/.git/
-[master (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 'master'
-Cloning into bare repository 'three'...
-done.
-Cloning into 'test'...
-done.
 ok 1 - setup
 
 expecting success: 
-	(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)
+	(
+		echo real >subdir/file &&
+		git commit -m real subdir/file &&
+		cd clone-repo/subdir/ &&
+		git pull &&
+		test real = $(cat file)
+	)
 
-Fetching origin
-Fetching one
-From ../one
- * [new branch]      master     -> one/master
- * [new branch]      side       -> one/side
-Fetching two
-From ../two
- * [new branch]      another    -> two/another
- * [new branch]      master     -> two/master
- * [new branch]      side       -> two/side
-Fetching three
-From ../three
- * [new branch]      another    -> three/another
- * [new branch]      master     -> three/master
- * [new branch]      side       -> three/side
-ok 2 - git fetch --all
+[master 890550f] real
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+From /build/git-2.20.1/t/trash directory.t5522-pull-symlink/.
+   922eb79..890550f  master     -> origin/master
+Updating 922eb79..890550f
+Fast-forward
+ subdir/file | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 2 - pulling from real subdir
 
 expecting success: 
-	(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.
+	(
+		echo link >subdir/file &&
+		git commit -m link subdir/file &&
+		cd subdir-link/ &&
+		git pull &&
+		test link = $(cat file)
+	)
 
-Please make sure you have the correct access rights
-and the repository exists.
-error: Could not fetch bad
-Fetching one
-From ../one
- * [new branch]      master     -> one/master
- * [new branch]      side       -> one/side
-Fetching two
-From ../two
- * [new branch]      another    -> two/another
- * [new branch]      master     -> two/master
- * [new branch]      side       -> two/side
-Fetching three
-From ../three
- * [new branch]      another    -> three/another
- * [new branch]      master     -> three/master
- * [new branch]      side       -> three/side
-ok 3 - git fetch --all should continue if a remote has errors
+[master c637c1f] link
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+From /build/git-2.20.1/t/trash directory.t5522-pull-symlink/.
+   890550f..c637c1f  master     -> origin/master
+Updating 890550f..c637c1f
+Fast-forward
+ subdir/file | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 3 - pulling from symlinked subdir
 
 expecting success: 
-	(cd test &&
-	 test_must_fail git fetch --all origin &&
-	 test_must_fail git fetch --all origin master)
+	(
+		cd subdir-link/ &&
+		echo push >file &&
+		git commit -m push ./file &&
+		git push
+	) &&
+	test push = $(git show HEAD:subdir/file)
 
-fatal: fetch --all does not take a repository argument
-fatal: fetch --all does not make sense with refspecs
-ok 4 - git fetch --all does not allow non-option arguments
+[master d8f7e4a] push
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+remote: warning: updating the current branch        
+To /build/git-2.20.1/t/trash directory.t5522-pull-symlink/.
+   c637c1f..d8f7e4a  master -> master
+ok 4 - pushing from symlinked subdir
 
+# passed all 4 test(s)
+1..4
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t5524-pull-msg.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5524-pull-msg/.git/
 expecting success: 
-	(git clone one test3 &&
-	 cd test3 &&
-	 git remote add three ../three &&
-	 git fetch --multiple three &&
-	 git branch -r > output &&
-	 test_cmp ../expect output)
+	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"
 
-Cloning into 'test3'...
+[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.
-Fetching three
-From ../three
- * [new branch]      another    -> three/another
- * [new branch]      master     -> three/master
- * [new branch]      side       -> three/side
-ok 5 - git fetch --multiple (but only one remote)
+[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: 
-	(git clone one test4 &&
-	 cd test4 &&
-	 git remote rm origin &&
-	 git remote add one ../one &&
-	 git remote add two ../two &&
-	 git fetch --multiple one two &&
-	 git branch -r > output &&
-	 test_cmp ../expect output)
-
-Cloning into 'test4'...
-done.
-Fetching one
-From ../one
- * [new branch]      master     -> one/master
- * [new branch]      side       -> one/side
-Fetching two
-From ../two
- * [new branch]      another    -> two/another
- * [new branch]      master     -> two/master
- * [new branch]      side       -> two/side
-ok 6 - git fetch --multiple (two remotes)
+(
+	cd cloned &&
+	git pull --log &&
+	git log -2 &&
+	git cat-file commit HEAD >result &&
+	grep Dollar result
+)
 
-expecting success: 
-	(cd test4 &&
-	 test_must_fail git fetch --multiple four)
+From /build/git-2.20.1/t/trash directory.t5524-pull-msg/.
+   f176df3..8393f95  master     -> origin/master
+Merging:
+1facbb5 add bfile
+virtual 8393f95971e86cb10f5e23411fa764a2751859f1
+found 1 common ancestor:
+f176df3 initial
+Merge made by the 'recursive' strategy.
+ afile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+commit bbad6f3c20eb1fac7202926ce521072481b039f0
+Merge: 1facbb5 8393f95
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:15:13 2005 -0700
 
-fatal: No such remote or remote group: four
-ok 7 - git fetch --multiple (bad remote names)
+    Merge branch 'master' of /build/git-2.20.1/t/trash directory.t5524-pull-msg/.
+    
+    * 'master' of /build/git-2.20.1/t/trash directory.t5524-pull-msg/.:
+      do not clobber $Dollar signs
+      second commit
 
-expecting success: 
-	(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)
+commit 8393f95971e86cb10f5e23411fa764a2751859f1
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:15:13 2005 -0700
 
-Deleted remote-tracking branch one/master (was 9d34b14).
-Deleted remote-tracking branch one/side (was 2ce9c50).
-Deleted remote-tracking branch two/another (was 9d34b14).
-Deleted remote-tracking branch two/master (was 9d34b14).
-Deleted remote-tracking branch two/side (was 2ce9c50).
-Fetching one
-From ../one
- * [new branch]      master     -> one/master
- * [new branch]      side       -> one/side
-Fetching two
-From ../two
- * [new branch]      another    -> two/another
- * [new branch]      master     -> two/master
- * [new branch]      side       -> two/side
-ok 8 - git fetch --all (skipFetchAll)
+    do not clobber $Dollar signs
+  do not clobber $Dollar signs
+ok 2 - pull
 
 expecting success: 
-	(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)
+(
+	cd cloned &&
+	git reset --hard HEAD^ &&
+	test "$(cat afile)" = original &&
+	test "$(cat bfile)" = added &&
+	git pull --log=1 &&
+	git log -3 &&
+	git cat-file commit HEAD >result &&
+	grep Dollar result &&
+	! grep "second commit" result
+)
 
-Deleted remote-tracking branch one/master (was 9d34b14).
-Deleted remote-tracking branch one/side (was 2ce9c50).
-Deleted remote-tracking branch two/another (was 9d34b14).
-Deleted remote-tracking branch two/master (was 9d34b14).
-Deleted remote-tracking branch two/side (was 2ce9c50).
-Fetching one
-From ../one
- * [new branch]      master     -> one/master
- * [new branch]      side       -> one/side
-Fetching two
-From ../two
- * [new branch]      another    -> two/another
- * [new branch]      master     -> two/master
- * [new branch]      side       -> two/side
-Fetching three
-From ../three
- * [new branch]      another    -> three/another
- * [new branch]      master     -> three/master
- * [new branch]      side       -> three/side
-ok 9 - git fetch --multiple (ignoring skipFetchAll)
+HEAD is now at 1facbb5 add bfile
+Merging:
+1facbb5 add bfile
+virtual 8393f95971e86cb10f5e23411fa764a2751859f1
+found 1 common ancestor:
+f176df3 initial
+Merge made by the 'recursive' strategy.
+ afile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+commit f2348b4ec5269fbcf682159a4a2f5cda9a74c190
+Merge: 1facbb5 8393f95
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:15:13 2005 -0700
 
-expecting success: 
-	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
+    Merge branch 'master' of /build/git-2.20.1/t/trash directory.t5524-pull-msg/.
+    
+    * 'master' of /build/git-2.20.1/t/trash directory.t5524-pull-msg/.: (2 commits)
+      do not clobber $Dollar signs
+      ...
 
-Cloning into 'test5'...
-done.
-Cloning into 'test6'...
-done.
-Fetching origin
-ok 10 - git fetch --all --no-tags
+commit 8393f95971e86cb10f5e23411fa764a2751859f1
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:15:13 2005 -0700
 
-expecting success: 
-	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
+    do not clobber $Dollar signs
 
-Cloning into 'test7'...
-done.
-Cloning into 'test8'...
-done.
-[master 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
-Fetching origin
-From /build/git-2.20.1/t/trash directory.t5514-fetch-multiple/test7
- * [new tag]         test-tag   -> test-tag
-ok 11 - git fetch --all --tags
+commit 4db85b7332a1f2dd47ed83e51fbde7f24b2baa43
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:15:13 2005 -0700
 
-# passed all 11 test(s)
-1..11
+    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/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
 *** t5519-push-alternates.sh ***
@@ -157524,7 +158447,7 @@
 
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5519-push-alternates/alice-pub/
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5519-push-alternates/alice-work/.git/
-[master (root-commit) 16b69fa] initial
+[master (root-commit) e444c8f] initial
  Author: A U Thor <author@example.com>
  1 file changed, 0 insertions(+), 0 deletions(-)
  create mode 100644 file
@@ -157545,11 +158468,11 @@
 		git push ../alice-pub :
 	)
 
-[master e33b0aa] second
+[master c666671] second
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 To ../alice-pub
-   16b69fa..e33b0aa  master -> master
+   e444c8f..c666671  master -> master
 ok 2 - alice works and pushes
 
 expecting success: 
@@ -157580,15 +158503,15 @@
 
 From ../alice-pub
  * branch            master     -> FETCH_HEAD
-Updating 16b69fa..e33b0aa
+Updating e444c8f..c666671
 Fast-forward
  file | 1 +
  1 file changed, 1 insertion(+)
-[master 0b18d5b] third
+[master 3347bf1] third
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 To ../bob-pub
-   16b69fa..0b18d5b  master -> master
+   e444c8f..3347bf1  master -> master
 fatal: git cat-file: could not get object info
 ok 3 - bob fetches from alice, works and pushes
 
@@ -157611,11 +158534,11 @@
 		git push ../alice-pub :
 	)
 
-[master 05c5589] fourth
+[master 2bd90ae] fourth
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 To ../alice-pub
-   e33b0aa..05c5589  master -> master
+   c666671..2bd90ae  master -> master
 ok 5 - alice works and pushes again
 
 expecting success: 
@@ -157630,11 +158553,11 @@
 		git push ../bob-pub :
 	)
 
-[master cd808fa] fifth
+[master ac75ffa] fifth
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 To ../bob-pub
-   0b18d5b..cd808fa  master -> master
+   3347bf1..ac75ffa  master -> master
 ok 6 - bob works and pushes
 
 expecting success: 
@@ -157652,17 +158575,17 @@
 		git push ../alice-pub :
 	)
 
-[master e694b14] sixth.1
+[master 4dbfe2c] sixth.1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-[master cd06c10] sixth.2
+[master 4a77674] sixth.2
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[master 963ff98] sixth.3
+[master 1578d00] sixth.3
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 To ../alice-pub
-   05c5589..963ff98  master -> master
+   2bd90ae..1578d00  master -> master
 ok 7 - alice works and pushes yet again
 
 expecting success: 
@@ -157685,789 +158608,386 @@
 		git push ../bob-pub :
 	)
 
-963ff98bedee5dcb8073ce3cdb5b46b1f8899cb9
-[master d60b95e] seventh
+1578d008f7874c304e0a06cfa3916e0e2d4abacb
+[master 4b107a8] seventh
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 To ../bob-pub
-   cd808fa..d60b95e  master -> master
+   ac75ffa..4b107a8  master -> master
 ok 8 - bob works and pushes again
 
 # passed all 8 test(s)
 1..8
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t5512-ls-remote.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5512-ls-remote/.git/
+*** t5525-fetch-tagopt.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5525-fetch-tagopt/.git/
 expecting success: 
-	>file &&
-	git add file &&
-	test_tick &&
-	git commit -m initial &&
-	git tag mark &&
-	git tag mark1.1 &&
-	git tag mark1.2 &&
-	git tag mark1.10 &&
-	git show-ref --tags -d | sed -e "s/ /	/" >expected.tag &&
-	(
-		echo "$(git rev-parse HEAD)	HEAD" &&
-		git show-ref -d	| sed -e "s/ /	/"
-	) >expected.all &&
-
-	git remote add self "$(pwd)/.git"
-
-[master (root-commit) 1bd44cb] initial
+	test_commit test &&
+	setup_clone one &&
+	git config remote.remote_one.tagopt --no-tags &&
+	setup_clone two &&
+	git config remote.remote_two.tagopt --tags
+	
+[master (root-commit) 14f901a] test
  Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 file
+ 1 file changed, 1 insertion(+)
+ create mode 100644 test.t
+Cloning into bare repository 'one'...
+done.
+Branch 'branch_one' set up to track remote branch 'master' from 'origin'.
+Cloning into bare repository 'two'...
+done.
+Branch 'branch_two' set up to track remote branch 'master' from 'origin'.
 ok 1 - setup
 
 expecting success: 
-	git ls-remote --tags .git >actual &&
-	test_cmp expected.tag actual
+	git fetch remote_one &&
+	test_must_fail git show-ref tag_one &&
+	git show-ref remote_one/branch_one
+	
+From one
+ * [new branch]      branch_one -> remote_one/branch_one
+ * [new branch]      master     -> remote_one/master
+14f901a95ebae912feb4805f40ef68f15b0192c2 refs/remotes/remote_one/branch_one
+ok 2 - fetch with tagopt=--no-tags does not get tag
 
-ok 2 - ls-remote --tags .git
+expecting success: 
+	(
+		cd one &&
+		git branch second_branch_one
+	) &&
+	git fetch --tags remote_one &&
+	git show-ref tag_one &&
+	git show-ref remote_one/second_branch_one
+	
+Branch 'second_branch_one' set up to track remote branch 'master' from 'origin'.
+From one
+ * [new branch]      second_branch_one -> remote_one/second_branch_one
+ * [new tag]         tag_one           -> tag_one
+14f901a95ebae912feb4805f40ef68f15b0192c2 refs/tags/tag_one
+14f901a95ebae912feb4805f40ef68f15b0192c2 refs/remotes/remote_one/second_branch_one
+ok 3 - fetch --tags with tagopt=--no-tags gets tag
 
 expecting success: 
-	git ls-remote .git >actual &&
-	test_cmp expected.all actual
+	git fetch --no-tags remote_two &&
+	test_must_fail git show-ref tag_two &&
+	git show-ref remote_two/branch_two
+	
+From two
+ * [new branch]      branch_two -> remote_two/branch_two
+ * [new branch]      master     -> remote_two/master
+14f901a95ebae912feb4805f40ef68f15b0192c2 refs/remotes/remote_two/branch_two
+ok 4 - fetch --no-tags with tagopt=--tags does not get tag
 
-ok 3 - ls-remote .git
+expecting success: 
+	(
+		cd two &&
+		git branch second_branch_two
+	) &&
+	git fetch remote_two &&
+	git show-ref tag_two &&
+	git show-ref remote_two/second_branch_two
+	
+Branch 'second_branch_two' set up to track remote branch 'master' from 'origin'.
+From two
+ * [new branch]      second_branch_two -> remote_two/second_branch_two
+ * [new tag]         tag_two           -> tag_two
+14f901a95ebae912feb4805f40ef68f15b0192c2 refs/tags/tag_two
+14f901a95ebae912feb4805f40ef68f15b0192c2 refs/remotes/remote_two/second_branch_two
+ok 5 - fetch with tagopt=--tags gets tag
 
+# passed all 5 test(s)
+1..5
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t5527-fetch-odd-refs.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5527-fetch-odd-refs/.git/
 expecting success: 
-	git ls-remote --tags self >actual &&
-	test_cmp expected.tag actual
+	echo content >file &&
+	git add . &&
+	git commit -m one &&
+	git update-ref refs/for/refs/heads/master HEAD &&
+	echo content >>file &&
+	git commit -a -m two &&
+	echo content >>file &&
+	git commit -a -m three &&
+	git checkout HEAD^
 
-ok 4 - ls-remote --tags self
+[master (root-commit) c99202c] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+[master 3156dbd] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master a415c4d] three
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Note: checking out 'HEAD^'.
 
-expecting success: 
-	git ls-remote self >actual &&
-	test_cmp expected.all 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 performing another checkout.
 
-ok 5 - ls-remote self
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -b with the checkout command again. Example:
+
+  git checkout -b <new-branch-name>
+
+HEAD is now at 3156dbd two
+ok 1 - setup repo with odd suffix ref
 
 expecting success: 
-	cat >expect <<-EOF &&
-	$(git rev-parse mark)	refs/tags/mark
-	$(git rev-parse mark1.1)	refs/tags/mark1.1
-	$(git rev-parse mark1.2)	refs/tags/mark1.2
-	$(git rev-parse mark1.10)	refs/tags/mark1.10
-	EOF
-	git ls-remote --sort="version:refname" --tags self >actual &&
+	git clone --bare file://"$PWD" suffix &&
+	echo three >expect &&
+	git --git-dir=suffix log -1 --format=%s refs/heads/master >actual &&
 	test_cmp expect actual
 
-ok 6 - ls-remote --sort="version:refname" --tags self
+Cloning into bare repository 'suffix'...
+ok 2 - suffix ref is ignored during fetch
 
 expecting success: 
-	cat >expect <<-EOF &&
-	$(git rev-parse mark1.10)	refs/tags/mark1.10
-	$(git rev-parse mark1.2)	refs/tags/mark1.2
-	$(git rev-parse mark1.1)	refs/tags/mark1.1
-	$(git rev-parse mark)	refs/tags/mark
-	EOF
-	git ls-remote --sort="-version:refname" --tags self >actual &&
-	test_cmp expect actual
+	ref240=$ZERO_OID/$ZERO_OID/$ZERO_OID/$ZERO_OID/$ZERO_OID/$ZERO_OID &&
+	ref1440=$ref240/$ref240/$ref240/$ref240/$ref240/$ref240 &&
+	git init long &&
+	(
+		cd long &&
+		test_commit long &&
+		test_commit master
+	) &&
+	if git -C long update-ref refs/heads/$ref1440 long; then
+		test_set_prereq LONG_REF
+	else
+		echo >&2 "long refs not supported"
+	fi
 
-ok 7 - ls-remote --sort="-version:refname" --tags self
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5527-fetch-odd-refs/long/.git/
+[master (root-commit) 92be28b] long
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 long.t
+[master f3bdd7b] master
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 master.t
+ok 3 - try to create repo with absurdly long refname
 
 expecting success: 
-	cat >expect <<-EOF &&
-	$(git rev-parse mark1.2)	refs/tags/mark1.2
-	$(git rev-parse mark1.10)	refs/tags/mark1.10
-	$(git rev-parse mark1.1)	refs/tags/mark1.1
-	$(git rev-parse mark)	refs/tags/mark
+	git fetch long refs/heads/*:refs/remotes/long/* &&
+	cat >expect <<-\EOF &&
+	long
+	master
 	EOF
-	git ls-remote --sort="-refname" --tags self >actual &&
+	git for-each-ref --format="%(subject)" refs/remotes/long >actual &&
 	test_cmp expect actual
 
-ok 8 - ls-remote --sort="-refname" --tags self
+warning: no common commits
+From long
+ * [new branch]      0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000 -> long/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000
+ * [new branch]      master     -> long/master
+ * [new tag]         long       -> long
+ * [new tag]         master     -> master
+ok 4 - fetch handles extremely long refname
 
 expecting success: 
-	test_must_fail git ls-remote
+	git push long :refs/heads/$ref1440 &&
+	git -C long for-each-ref --format="%(subject)" refs/heads >actual &&
+	echo master >expect &&
+	test_cmp expect actual
 
-fatal: No remote configured to list refs from.
-ok 9 - dies when no remote specified and no default remotes found
+To long
+ - [deleted]         0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000
+ok 5 - push handles extremely long refname
 
+# passed all 5 test(s)
+1..5
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t5529-push-errors.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5529-push-errors/.git/
 expecting success: 
-	URL="$(pwd)/.git" &&
-	echo "From $URL" >exp_err &&
+	test_commit one
 
-	git remote add origin "$URL" &&
-	git ls-remote 2>actual_err >actual &&
+[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
 
-	test_cmp exp_err actual_err &&
-	test_cmp expected.all actual
+expecting success: 
+	git init --bare remote.git &&
+	git remote add origin remote.git
 
-ok 10 - use "origin" when no remote specified
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5529-push-errors/remote.git/
+ok 2 - setup remote
 
 expecting success: 
-	git ls-remote -q 2>actual_err &&
-	test_must_fail test_cmp exp_err actual_err
+	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\""
 
-1bd44cb9d13204b0fe1958db0082f5028a16eb3a	HEAD
-1bd44cb9d13204b0fe1958db0082f5028a16eb3a	refs/heads/master
-1bd44cb9d13204b0fe1958db0082f5028a16eb3a	refs/tags/mark
-1bd44cb9d13204b0fe1958db0082f5028a16eb3a	refs/tags/mark1.1
-1bd44cb9d13204b0fe1958db0082f5028a16eb3a	refs/tags/mark1.10
-1bd44cb9d13204b0fe1958db0082f5028a16eb3a	refs/tags/mark1.2
---- exp_err	2021-12-03 05:08:21.910309177 +0000
-+++ actual_err	2021-12-03 05:08:22.102303596 +0000
-@@ -1 +0,0 @@
--From /build/git-2.20.1/t/trash directory.t5512-ls-remote/.git
-ok 11 - suppress "From <url>" with -q
+ok 3 - setup fake receive-pack
 
 expecting success: 
-	#
-	# Test that we are indeed using branch.<name>.remote, not "origin", even
-	# though the "origin" remote has been set.
-	#
+	echo no >rp-ran &&
+	echo no >expect &&
+	test_must_fail git push origin missing &&
+	test_cmp expect rp-ran
 
-	# setup a new remote to differentiate from "origin"
-	git clone . other.git &&
-	(
-		cd other.git &&
-		echo "$(git rev-parse HEAD)	HEAD" &&
-		git show-ref	| sed -e "s/ /	/"
-	) >exp &&
+error: src refspec missing does not match any.
+error: failed to push some refs to 'remote.git'
+ok 4 - detect missing branches early
 
-	URL="other.git" &&
-	echo "From $URL" >exp_err &&
+expecting success: 
+	echo no >rp-ran &&
+	echo no >expect &&
+	test_must_fail git push origin master~2:master &&
+	test_cmp expect rp-ran
 
-	git remote add other $URL &&
-	git config branch.master.remote other &&
+error: src refspec master~2 does not match any.
+error: failed to push some refs to 'remote.git'
+ok 5 - detect missing sha1 expressions early
 
-	git ls-remote 2>actual_err >actual &&
-	test_cmp exp_err actual_err &&
-	test_cmp exp actual
+expecting success: 
+	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
 
-Cloning into 'other.git'...
-done.
-ok 12 - use branch.<name>.remote if possible
+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/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t5517-push-mirror.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5517-push-mirror/.git/
 expecting success: 
-	if test_have_prereq MINGW
-	then
-		# Windows does not like asterisks in pathname
-		does_not_exist=master
-	else
-		does_not_exist="refs*master"
-	fi &&
-	cat >exp <<-EOF &&
-	fatal: '$does_not_exist' does not appear to be a git repository
-	fatal: Could not read from remote repository.
 
-	Please make sure you have the correct access rights
-	and the repository exists.
-	EOF
-	#
-	# Do not expect "git ls-remote <pattern>" to work; ls-remote needs
-	# <remote> if you want to feed <pattern>, just like you cannot say
-	# fetch <branch>.
-	# We could just as easily have used "master"; the "*" emphasizes its
-	# role as a pattern.
-	test_must_fail git ls-remote "$does_not_exist" >actual 2>&1 &&
-	test_i18ncmp exp actual
+	mk_repo_pair &&
+	(
+		cd master &&
+		echo one >foo && git add foo && git commit -m one &&
+		git push --mirror up
+	) &&
+	master_master=$(cd master && git show-ref -s --verify refs/heads/master) &&
+	mirror_master=$(cd mirror && git show-ref -s --verify refs/heads/master) &&
+	test "$master_master" = "$mirror_master"
 
-ok 13 - confuses pattern as remote when no remote specified
 
-expecting success: 
-	{
-		git ls-remote --exit-code ./no-such-repository
-		status=$?
-	} &&
-	test $status != 2 && test $status != 0
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5517-push-mirror/mirror/.git/
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5517-push-mirror/master/.git/
+[master (root-commit) d9ab012] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo
+remote: warning: updating the current branch        
+To ../mirror
+ * [new branch]      master -> master
+ok 1 - push mirror creates new branches
 
-fatal: './no-such-repository' does not appear to be a git repository
-fatal: Could not read from remote repository.
+expecting success: 
 
-Please make sure you have the correct access rights
-and the repository exists.
-ok 14 - die with non-2 for wrong repository even with --exit-code
+	mk_repo_pair &&
+	(
+		cd master &&
+		echo one >foo && git add foo && git commit -m one &&
+		git push --mirror up &&
+		echo two >foo && git add foo && git commit -m two &&
+		git push --mirror up
+	) &&
+	master_master=$(cd master && git show-ref -s --verify refs/heads/master) &&
+	mirror_master=$(cd mirror && git show-ref -s --verify refs/heads/master) &&
+	test "$master_master" = "$mirror_master"
 
-expecting success: 
-	git ls-remote other.git "refs/nsn/*" >actual &&
-	test_must_be_empty actual
 
-ok 15 - Report success even when nothing matches
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5517-push-mirror/mirror/.git/
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5517-push-mirror/master/.git/
+[master (root-commit) d9ab012] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo
+remote: warning: updating the current branch        
+To ../mirror
+ * [new branch]      master -> master
+[master 194b500] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+remote: warning: updating the current branch        
+To ../mirror
+   d9ab012..194b500  master -> master
+ * [new branch]      up/master -> up/master
+ok 2 - push mirror updates existing branches
 
 expecting success: 
-	test_expect_code 2 git ls-remote --exit-code other.git "refs/nsn/*" >actual &&
-	test_must_be_empty actual
 
-ok 16 - Report no-match with --exit-code
+	mk_repo_pair &&
+	(
+		cd master &&
+		echo one >foo && git add foo && git commit -m one &&
+		git push --mirror up &&
+		echo two >foo && git add foo && git commit -m two &&
+		git push --mirror up &&
+		git reset --hard HEAD^ &&
+		git push --mirror up
+	) &&
+	master_master=$(cd master && git show-ref -s --verify refs/heads/master) &&
+	mirror_master=$(cd mirror && git show-ref -s --verify refs/heads/master) &&
+	test "$master_master" = "$mirror_master"
 
-expecting success: 
-	git ls-remote --exit-code other.git "refs/tags/*" >actual &&
-	git ls-remote . tags/mark* >expect &&
-	test_cmp expect actual
 
-ok 17 - Report match with --exit-code
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5517-push-mirror/mirror/.git/
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5517-push-mirror/master/.git/
+[master (root-commit) d9ab012] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo
+remote: warning: updating the current branch        
+To ../mirror
+ * [new branch]      master -> master
+[master 194b500] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+remote: warning: updating the current branch        
+To ../mirror
+   d9ab012..194b500  master -> master
+ * [new branch]      up/master -> up/master
+HEAD is now at d9ab012 one
+remote: warning: updating the current branch        
+To ../mirror
+ + 194b500...d9ab012 master -> master (forced update)
+   d9ab012..194b500  up/master -> up/master
+ok 3 - push mirror force updates existing branches
 
 expecting success: 
-	git tag magic/one &&
-	git tag magic/two
 
-ok 18 - set up some extra tags for ref hiding
-
-expecting success: 
-		test_config $configsection.hiderefs refs/tags &&
-		git ls-remote . >actual &&
-		test_unconfig $configsection.hiderefs &&
-		git ls-remote . |
-		sed -e "/	refs\/tags\//d" >expect &&
-		test_cmp expect actual
-	
-ok 19 - Hide some refs with transfer.hiderefs
-
-expecting success: 
-		test_when_finished "test_unconfig $configsection.hiderefs" &&
-		git config --add $configsection.hiderefs refs/tags &&
-		git config --add $configsection.hiderefs "!refs/tags/magic" &&
-		git config --add $configsection.hiderefs refs/tags/magic/one &&
-		git ls-remote . >actual &&
-		grep refs/tags/magic/two actual &&
-		! grep refs/tags/magic/one actual
-	
-1bd44cb9d13204b0fe1958db0082f5028a16eb3a	refs/tags/magic/two
-ok 20 - Override hiding of transfer.hiderefs
-
-expecting success: 
-		test_config $configsection.hiderefs refs/tags &&
-		git ls-remote . >actual &&
-		test_unconfig $configsection.hiderefs &&
-		git ls-remote . |
-		sed -e "/	refs\/tags\//d" >expect &&
-		test_cmp expect actual
-	
-ok 21 - Hide some refs with uploadpack.hiderefs
-
-expecting success: 
-		test_when_finished "test_unconfig $configsection.hiderefs" &&
-		git config --add $configsection.hiderefs refs/tags &&
-		git config --add $configsection.hiderefs "!refs/tags/magic" &&
-		git config --add $configsection.hiderefs refs/tags/magic/one &&
-		git ls-remote . >actual &&
-		grep refs/tags/magic/two actual &&
-		! grep refs/tags/magic/one actual
-	
-1bd44cb9d13204b0fe1958db0082f5028a16eb3a	refs/tags/magic/two
-ok 22 - Override hiding of uploadpack.hiderefs
-
-expecting success: 
-	test_config uploadpack.hiderefs refs/tags &&
-	test_config transfer.hiderefs "!refs/tags/magic" &&
-	git ls-remote . >actual &&
-	grep refs/tags/magic actual
-
-1bd44cb9d13204b0fe1958db0082f5028a16eb3a	refs/tags/magic/one
-1bd44cb9d13204b0fe1958db0082f5028a16eb3a	refs/tags/magic/two
-ok 23 - overrides work between mixed transfer/upload-pack hideRefs
-
-expecting success: 
-	git fetch origin &&
-	cat >expect <<-EOF &&
-	ref: refs/heads/master	HEAD
-	$(git rev-parse HEAD)	HEAD
-	$(git rev-parse refs/heads/master)	refs/heads/master
-	$(git rev-parse HEAD)	refs/remotes/origin/HEAD
-	$(git rev-parse refs/remotes/origin/master)	refs/remotes/origin/master
-	$(git rev-parse refs/tags/mark)	refs/tags/mark
-	$(git rev-parse refs/tags/mark1.1)	refs/tags/mark1.1
-	$(git rev-parse refs/tags/mark1.10)	refs/tags/mark1.10
-	$(git rev-parse refs/tags/mark1.2)	refs/tags/mark1.2
-	EOF
-	git ls-remote --symref >actual &&
-	test_cmp expect actual
-
-From /build/git-2.20.1/t/trash directory.t5512-ls-remote/
- * [new branch]      master     -> origin/master
-From other.git
-ok 24 - ls-remote --symref
-
-expecting success: 
-	cat >expect <<-\EOF &&
-	ref: refs/heads/master	HEAD
-	1bd44cb9d13204b0fe1958db0082f5028a16eb3a	HEAD
-	EOF
-	git ls-remote --symref . HEAD >actual &&
-	test_cmp expect actual
-
-ok 25 - ls-remote with filtered symref (refname)
-
-checking known breakage: 
-	git symbolic-ref refs/heads/foo refs/tags/mark &&
-	cat >expect <<-\EOF &&
-	ref: refs/tags/mark	refs/heads/foo
-	1bd44cb9d13204b0fe1958db0082f5028a16eb3a	refs/heads/foo
-	1bd44cb9d13204b0fe1958db0082f5028a16eb3a	refs/heads/master
-	EOF
-	git ls-remote --symref --heads . >actual &&
-	test_cmp expect actual
-
---- expect	2021-12-03 05:08:25.426206977 +0000
-+++ actual	2021-12-03 05:08:25.470205697 +0000
-@@ -1,3 +1,2 @@
--ref: refs/tags/mark	refs/heads/foo
- 1bd44cb9d13204b0fe1958db0082f5028a16eb3a	refs/heads/foo
- 1bd44cb9d13204b0fe1958db0082f5028a16eb3a	refs/heads/master
-not ok 26 - ls-remote with filtered symref (--heads) # TODO known breakage
-
-expecting success: 
-	cat >expect <<-\EOF &&
-	1bd44cb9d13204b0fe1958db0082f5028a16eb3a	refs/heads/foo
-	1bd44cb9d13204b0fe1958db0082f5028a16eb3a	refs/heads/master
-	EOF
-	git ls-remote --symref --heads . >actual &&
-	test_cmp expect actual &&
-	git ls-remote --symref . "refs/heads/*" >actual &&
-	test_cmp expect actual
-
-ok 27 - ls-remote --symref omits filtered-out matches
-
-checking prerequisite: PIPE
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
-	# test whether the filesystem supports FIFOs
-	test_have_prereq !MINGW,!CYGWIN &&
-	rm -f testfifo && mkfifo testfifo
-
-)
-prerequisite PIPE ok
-checking prerequisite: JGIT
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
-	type jgit
-
-)
-jgit: not found
-prerequisite JGIT not satisfied
-checking prerequisite: GIT_DAEMON
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
-	test_tristate GIT_TEST_GIT_DAEMON &&
-	test "$GIT_TEST_GIT_DAEMON" != false
-
-)
-prerequisite GIT_DAEMON ok
-skipping test: indicate no refs in standards-compliant empty remote 
-	JGIT_DAEMON_PORT=${JGIT_DAEMON_PORT-${this_test#t}} &&
-	JGIT_DAEMON_PID= &&
-	git init --bare empty.git &&
-	>empty.git/git-daemon-export-ok &&
-	mkfifo jgit_daemon_output &&
-	{
-		jgit daemon --port="$JGIT_DAEMON_PORT" . >jgit_daemon_output &
-		JGIT_DAEMON_PID=$!
-	} &&
-	test_when_finished kill "$JGIT_DAEMON_PID" &&
-	{
-		read line &&
-		case $line in
-		Exporting*)
-			;;
-		*)
-			echo "Expected: Exporting" &&
-			false;;
-		esac &&
-		read line &&
-		case $line in
-		"Listening on"*)
-			;;
-		*)
-			echo "Expected: Listening on" &&
-			false;;
-		esac
-	} <jgit_daemon_output &&
-	# --exit-code asks the command to exit with 2 when no
-	# matching refs are found.
-	test_expect_code 2 git ls-remote --exit-code git://localhost:$JGIT_DAEMON_PORT/empty.git
-
-ok 28 # skip indicate no refs in standards-compliant empty remote (missing JGIT of PIPE,JGIT,GIT_DAEMON)
-
-expecting success: 
-	# It is important for this repo to be inside the nongit
-	# area, as we want a repo name that does not include
-	# slashes (because those inhibit some of our configuration
-	# lookups).
-	nongit git init --bare dst.git &&
-	nongit git ls-remote dst.git
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5512-ls-remote/non-repo/dst.git/
-ok 29 - ls-remote works outside repository
-
-expecting success: 
-	# Use a sort key that requires access to the referenced objects.
-	nongit test_must_fail git ls-remote --sort=authordate "$TRASH_DIRECTORY" 2>err &&
-	test_i18ngrep "^fatal: not a git repository, but the field 'authordate' requires access to object data" err
-
-fatal: not a git repository, but the field 'authordate' requires access to object data
-ok 30 - ls-remote --sort fails gracefully outside repository
-
-expecting success: 
-	git for-each-ref --format="%(objectname)	%(refname)" \
-		refs/heads/master refs/remotes/origin/master >expect &&
-	git -c protocol.version=1 ls-remote . master >actual.v1 &&
-	test_cmp expect actual.v1 &&
-	git -c protocol.version=2 ls-remote . master >actual.v2 &&
-	test_cmp expect actual.v2
-
-ok 31 - ls-remote patterns work with all protocol versions
-
-expecting success: 
-	git for-each-ref --format="%(objectname)	%(refname)" \
-		refs/heads/ refs/tags/ >expect &&
-	git -c protocol.version=1 ls-remote --heads --tags . >actual.v1 &&
-	test_cmp expect actual.v1 &&
-	git -c protocol.version=2 ls-remote --heads --tags . >actual.v2 &&
-	test_cmp expect actual.v2
-
-ok 32 - ls-remote prefixes work with all protocol versions
-
-# still have 1 known breakage(s)
-# passed all remaining 31 test(s)
-1..32
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t5522-pull-symlink.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5522-pull-symlink/.git/
-checking prerequisite: SYMLINKS
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
-	# test whether the filesystem supports symbolic links
-	ln -s x y && test -h y
-
-)
-prerequisite SYMLINKS ok
-expecting success: 
-	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: 
-	(
-		echo real >subdir/file &&
-		git commit -m real subdir/file &&
-		cd clone-repo/subdir/ &&
-		git pull &&
-		test real = $(cat file)
-	)
-
-[master c05fec9] real
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-From /build/git-2.20.1/t/trash directory.t5522-pull-symlink/.
-   03ffacb..c05fec9  master     -> origin/master
-Updating 03ffacb..c05fec9
-Fast-forward
- subdir/file | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 2 - pulling from real subdir
-
-expecting success: 
-	(
-		echo link >subdir/file &&
-		git commit -m link subdir/file &&
-		cd subdir-link/ &&
-		git pull &&
-		test link = $(cat file)
-	)
-
-[master 31d6391] link
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-From /build/git-2.20.1/t/trash directory.t5522-pull-symlink/.
-   c05fec9..31d6391  master     -> origin/master
-Updating c05fec9..31d6391
-Fast-forward
- subdir/file | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 3 - pulling from symlinked subdir
-
-expecting success: 
-	(
-		cd subdir-link/ &&
-		echo push >file &&
-		git commit -m push ./file &&
-		git push
-	) &&
-	test push = $(git show HEAD:subdir/file)
-
-[master 687522b] push
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-remote: warning: updating the current branch        
-To /build/git-2.20.1/t/trash directory.t5522-pull-symlink/.
-   31d6391..687522b  master -> master
-ok 4 - pushing from symlinked subdir
-
-# passed all 4 test(s)
-1..4
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t5524-pull-msg.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5524-pull-msg/.git/
-expecting success: 
-	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: 
-(
-	cd cloned &&
-	git pull --log &&
-	git log -2 &&
-	git cat-file commit HEAD >result &&
-	grep Dollar result
-)
-
-From /build/git-2.20.1/t/trash directory.t5524-pull-msg/.
-   f176df3..8393f95  master     -> origin/master
-Merging:
-1facbb5 add bfile
-virtual 8393f95971e86cb10f5e23411fa764a2751859f1
-found 1 common ancestor:
-f176df3 initial
-Merge made by the 'recursive' strategy.
- afile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-commit bbad6f3c20eb1fac7202926ce521072481b039f0
-Merge: 1facbb5 8393f95
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:15:13 2005 -0700
-
-    Merge branch 'master' of /build/git-2.20.1/t/trash directory.t5524-pull-msg/.
-    
-    * 'master' of /build/git-2.20.1/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: 
-(
-	cd cloned &&
-	git reset --hard HEAD^ &&
-	test "$(cat afile)" = original &&
-	test "$(cat bfile)" = added &&
-	git pull --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
-Merging:
-1facbb5 add bfile
-virtual 8393f95971e86cb10f5e23411fa764a2751859f1
-found 1 common ancestor:
-f176df3 initial
-Merge made by the 'recursive' strategy.
- afile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-commit f2348b4ec5269fbcf682159a4a2f5cda9a74c190
-Merge: 1facbb5 8393f95
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:15:13 2005 -0700
-
-    Merge branch 'master' of /build/git-2.20.1/t/trash directory.t5524-pull-msg/.
-    
-    * 'master' of /build/git-2.20.1/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/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t5517-push-mirror.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5517-push-mirror/.git/
-expecting success: 
-
-	mk_repo_pair &&
-	(
-		cd master &&
-		echo one >foo && git add foo && git commit -m one &&
-		git push --mirror up
-	) &&
-	master_master=$(cd master && git show-ref -s --verify refs/heads/master) &&
-	mirror_master=$(cd mirror && git show-ref -s --verify refs/heads/master) &&
-	test "$master_master" = "$mirror_master"
-
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5517-push-mirror/mirror/.git/
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5517-push-mirror/master/.git/
-[master (root-commit) a1c156c] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo
-remote: warning: updating the current branch        
-To ../mirror
- * [new branch]      master -> master
-ok 1 - push mirror creates new branches
-
-expecting success: 
-
-	mk_repo_pair &&
-	(
-		cd master &&
-		echo one >foo && git add foo && git commit -m one &&
-		git push --mirror up &&
-		echo two >foo && git add foo && git commit -m two &&
-		git push --mirror up
-	) &&
-	master_master=$(cd master && git show-ref -s --verify refs/heads/master) &&
-	mirror_master=$(cd mirror && git show-ref -s --verify refs/heads/master) &&
-	test "$master_master" = "$mirror_master"
-
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5517-push-mirror/mirror/.git/
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5517-push-mirror/master/.git/
-[master (root-commit) e51d92c] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo
-remote: warning: updating the current branch        
-To ../mirror
- * [new branch]      master -> master
-[master 69e7184] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-remote: warning: updating the current branch        
-To ../mirror
-   e51d92c..69e7184  master -> master
- * [new branch]      up/master -> up/master
-ok 2 - push mirror updates existing branches
-
-expecting success: 
-
-	mk_repo_pair &&
-	(
-		cd master &&
-		echo one >foo && git add foo && git commit -m one &&
-		git push --mirror up &&
-		echo two >foo && git add foo && git commit -m two &&
-		git push --mirror up &&
-		git reset --hard HEAD^ &&
-		git push --mirror up
-	) &&
-	master_master=$(cd master && git show-ref -s --verify refs/heads/master) &&
-	mirror_master=$(cd mirror && git show-ref -s --verify refs/heads/master) &&
-	test "$master_master" = "$mirror_master"
-
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5517-push-mirror/mirror/.git/
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5517-push-mirror/master/.git/
-[master (root-commit) e51d92c] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo
-remote: warning: updating the current branch        
-To ../mirror
- * [new branch]      master -> master
-[master 69e7184] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-remote: warning: updating the current branch        
-To ../mirror
-   e51d92c..69e7184  master -> master
- * [new branch]      up/master -> up/master
-HEAD is now at e51d92c one
-remote: warning: updating the current branch        
-To ../mirror
- + 69e7184...e51d92c master -> master (forced update)
-   e51d92c..69e7184  up/master -> up/master
-ok 3 - push mirror force updates existing branches
-
-expecting success: 
-
-	mk_repo_pair &&
-	(
-		cd master &&
-		echo one >foo && git add foo && git commit -m one &&
-		git branch remove master &&
-		git push --mirror up &&
-		git branch -D remove &&
-		git push --mirror up
-	) &&
-	(
-		cd mirror &&
-		invert git show-ref -s --verify refs/heads/remove
-	)
+	mk_repo_pair &&
+	(
+		cd master &&
+		echo one >foo && git add foo && git commit -m one &&
+		git branch remove master &&
+		git push --mirror up &&
+		git branch -D remove &&
+		git push --mirror up
+	) &&
+	(
+		cd mirror &&
+		invert git show-ref -s --verify refs/heads/remove
+	)
 
 
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5517-push-mirror/mirror/.git/
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5517-push-mirror/master/.git/
-[master (root-commit) e8457b9] one
+[master (root-commit) 6030375] one
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 foo
@@ -158475,7 +158995,7 @@
 To ../mirror
  * [new branch]      master -> master
  * [new branch]      remove -> remove
-Deleted branch remove (was e8457b9).
+Deleted branch remove (was 6030375).
 To ../mirror
  - [deleted]         remove
  * [new branch]      up/master -> up/master
@@ -158510,7 +159030,7 @@
 
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5517-push-mirror/mirror/.git/
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5517-push-mirror/master/.git/
-[master (root-commit) 614a4bd] one
+[master (root-commit) 6030375] one
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 foo
@@ -158518,13 +159038,13 @@
 To ../mirror
  * [new branch]      master -> master
  * [new branch]      remove -> remove
-Deleted branch remove (was 614a4bd).
-[master be385dc] two
+Deleted branch remove (was 6030375).
+[master 4a0f23b] two
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 remote: warning: updating the current branch        
 To ../mirror
-   614a4bd..be385dc  master -> master
+   6030375..4a0f23b  master -> master
  - [deleted]         remove
  * [new branch]      add -> add
  * [new branch]      up/master -> up/master
@@ -158548,7 +159068,7 @@
 
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5517-push-mirror/mirror/.git/
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5517-push-mirror/master/.git/
-[master (root-commit) 614a4bd] one
+[master (root-commit) 6030375] one
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 foo
@@ -158577,7 +159097,7 @@
 
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5517-push-mirror/mirror/.git/
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5517-push-mirror/master/.git/
-[master (root-commit) 18d2734] one
+[master (root-commit) 6030375] one
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 foo
@@ -158585,14 +159105,14 @@
 To ../mirror
  * [new branch]      master -> master
  * [new tag]         tmaster -> tmaster
-[master 37446f7] two
+[master 4a0f23b] two
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-Updated tag 'tmaster' (was 18d2734)
+Updated tag 'tmaster' (was 6030375)
 remote: warning: updating the current branch        
 To ../mirror
-   18d2734..37446f7  master -> master
- + 18d2734...37446f7 tmaster -> tmaster (forced update)
+   6030375..4a0f23b  master -> master
+ + 6030375...4a0f23b tmaster -> tmaster (forced update)
  * [new branch]      up/master -> up/master
 ok 7 - push mirror updates existing tags
 
@@ -158618,7 +159138,7 @@
 
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5517-push-mirror/mirror/.git/
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5517-push-mirror/master/.git/
-[master (root-commit) 7eeec9b] one
+[master (root-commit) 4a249b3] one
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 foo
@@ -158626,22 +159146,22 @@
 To ../mirror
  * [new branch]      master -> master
  * [new tag]         tmaster -> tmaster
-[master 6f2ec08] two
+[master 7a37f80] two
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-Updated tag 'tmaster' (was 7eeec9b)
+Updated tag 'tmaster' (was 4a249b3)
 remote: warning: updating the current branch        
 To ../mirror
-   7eeec9b..6f2ec08  master -> master
- + 7eeec9b...6f2ec08 tmaster -> tmaster (forced update)
+   4a249b3..7a37f80  master -> master
+ + 4a249b3...7a37f80 tmaster -> tmaster (forced update)
  * [new branch]      up/master -> up/master
-HEAD is now at 7eeec9b one
-Updated tag 'tmaster' (was 6f2ec08)
+HEAD is now at 4a249b3 one
+Updated tag 'tmaster' (was 7a37f80)
 remote: warning: updating the current branch        
 To ../mirror
- + 6f2ec08...7eeec9b master -> master (forced update)
-   7eeec9b..6f2ec08  up/master -> up/master
- + 6f2ec08...7eeec9b tmaster -> tmaster (forced update)
+ + 7a37f80...4a249b3 master -> master (forced update)
+   4a249b3..7a37f80  up/master -> up/master
+ + 7a37f80...4a249b3 tmaster -> tmaster (forced update)
 ok 8 - push mirror force updates existing tags
 
 expecting success: 
@@ -158663,7 +159183,7 @@
 
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5517-push-mirror/mirror/.git/
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5517-push-mirror/master/.git/
-[master (root-commit) 7eeec9b] one
+[master (root-commit) 4a249b3] one
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 foo
@@ -158671,7 +159191,7 @@
 To ../mirror
  * [new branch]      master -> master
  * [new tag]         tremove -> tremove
-Deleted tag 'tremove' (was 7eeec9b)
+Deleted tag 'tremove' (was 4a249b3)
 To ../mirror
  - [deleted]         tremove
  * [new branch]      up/master -> up/master
@@ -158707,7 +159227,7 @@
 
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5517-push-mirror/mirror/.git/
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5517-push-mirror/master/.git/
-[master (root-commit) f64574d] one
+[master (root-commit) 4a249b3] one
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 foo
@@ -158716,15 +159236,15 @@
  * [new branch]      master -> master
  * [new tag]         tmaster -> tmaster
  * [new tag]         tremove -> tremove
-Deleted tag 'tremove' (was f64574d)
-[master 1be2ebd] two
+Deleted tag 'tremove' (was 4a249b3)
+[master 7a37f80] two
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-Updated tag 'tmaster' (was f64574d)
+Updated tag 'tmaster' (was 4a249b3)
 remote: warning: updating the current branch        
 To ../mirror
-   f64574d..1be2ebd  master -> master
- + f64574d...1be2ebd tmaster -> tmaster (forced update)
+   4a249b3..7a37f80  master -> master
+ + 4a249b3...7a37f80 tmaster -> tmaster (forced update)
  - [deleted]         tremove
  * [new branch]      up/master -> up/master
  * [new tag]         tadd -> tadd
@@ -158754,7 +159274,7 @@
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5517-push-mirror/master/.git/
 warning: --mirror is dangerous and deprecated; please
 	 use --mirror=fetch or --mirror=push instead
-[master (root-commit) 2df9e91] one
+[master (root-commit) 4a249b3] one
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 foo
@@ -158765,10 +159285,10 @@
  * [new branch]      keep -> keep
  * [new branch]      master -> master
  * [new branch]      remove -> remove
-Deleted branch remove (was 2df9e91).
+Deleted branch remove (was 4a249b3).
 To ../mirror
  - [deleted]         remove
-2df9e919f90e12d68ab13802ca32081ca3d43a34
+4a249b3c4ef909edbd0395802e3e6876aa0a3eb8
 fatal: 'refs/heads/remove' - not a valid ref
 ok 11 - remote.foo.mirror adds and removes branches
 
@@ -158792,7 +159312,7 @@
 
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5517-push-mirror/mirror/.git/
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5517-push-mirror/master/.git/
-[master (root-commit) 2df9e91] one
+[master (root-commit) 3f51c38] one
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 foo
@@ -158800,199 +159320,15 @@
 To ../mirror
  * [new branch]      keep -> keep
  * [new branch]      master -> master
-Deleted branch keep (was 2df9e91).
+Deleted branch keep (was 3f51c38).
 Everything up-to-date
-2df9e919f90e12d68ab13802ca32081ca3d43a34
+3f51c3896132dc516b9ae5116b23b1d1c776aa26
 ok 12 - remote.foo.mirror=no has no effect
 
 # passed all 12 test(s)
 1..12
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t5525-fetch-tagopt.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5525-fetch-tagopt/.git/
-expecting success: 
-	test_commit test &&
-	setup_clone one &&
-	git config remote.remote_one.tagopt --no-tags &&
-	setup_clone two &&
-	git config remote.remote_two.tagopt --tags
-	
-[master (root-commit) 14f901a] test
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 test.t
-Cloning into bare repository 'one'...
-done.
-Branch 'branch_one' set up to track remote branch 'master' from 'origin'.
-Cloning into bare repository 'two'...
-done.
-Branch 'branch_two' set up to track remote branch 'master' from 'origin'.
-ok 1 - setup
-
-expecting success: 
-	git fetch remote_one &&
-	test_must_fail git show-ref tag_one &&
-	git show-ref remote_one/branch_one
-	
-From one
- * [new branch]      branch_one -> remote_one/branch_one
- * [new branch]      master     -> remote_one/master
-14f901a95ebae912feb4805f40ef68f15b0192c2 refs/remotes/remote_one/branch_one
-ok 2 - fetch with tagopt=--no-tags does not get tag
-
-expecting success: 
-	(
-		cd one &&
-		git branch second_branch_one
-	) &&
-	git fetch --tags remote_one &&
-	git show-ref tag_one &&
-	git show-ref remote_one/second_branch_one
-	
-Branch 'second_branch_one' set up to track remote branch 'master' from 'origin'.
-From one
- * [new branch]      second_branch_one -> remote_one/second_branch_one
- * [new tag]         tag_one           -> tag_one
-14f901a95ebae912feb4805f40ef68f15b0192c2 refs/tags/tag_one
-14f901a95ebae912feb4805f40ef68f15b0192c2 refs/remotes/remote_one/second_branch_one
-ok 3 - fetch --tags with tagopt=--no-tags gets tag
-
-expecting success: 
-	git fetch --no-tags remote_two &&
-	test_must_fail git show-ref tag_two &&
-	git show-ref remote_two/branch_two
-	
-From two
- * [new branch]      branch_two -> remote_two/branch_two
- * [new branch]      master     -> remote_two/master
-14f901a95ebae912feb4805f40ef68f15b0192c2 refs/remotes/remote_two/branch_two
-ok 4 - fetch --no-tags with tagopt=--tags does not get tag
-
-expecting success: 
-	(
-		cd two &&
-		git branch second_branch_two
-	) &&
-	git fetch remote_two &&
-	git show-ref tag_two &&
-	git show-ref remote_two/second_branch_two
-	
-Branch 'second_branch_two' set up to track remote branch 'master' from 'origin'.
-From two
- * [new branch]      second_branch_two -> remote_two/second_branch_two
- * [new tag]         tag_two           -> tag_two
-14f901a95ebae912feb4805f40ef68f15b0192c2 refs/tags/tag_two
-14f901a95ebae912feb4805f40ef68f15b0192c2 refs/remotes/remote_two/second_branch_two
-ok 5 - fetch with tagopt=--tags gets tag
-
-# passed all 5 test(s)
-1..5
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t5527-fetch-odd-refs.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5527-fetch-odd-refs/.git/
-expecting success: 
-	echo content >file &&
-	git add . &&
-	git commit -m one &&
-	git update-ref refs/for/refs/heads/master HEAD &&
-	echo content >>file &&
-	git commit -a -m two &&
-	echo content >>file &&
-	git commit -a -m three &&
-	git checkout HEAD^
-
-[master (root-commit) 1479ab8] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-[master 707a562] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[master 9738f6f] three
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Note: checking out '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 performing another checkout.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
-
-  git checkout -b <new-branch-name>
-
-HEAD is now at 707a562 two
-ok 1 - setup repo with odd suffix ref
-
-expecting success: 
-	git clone --bare file://"$PWD" suffix &&
-	echo three >expect &&
-	git --git-dir=suffix log -1 --format=%s refs/heads/master >actual &&
-	test_cmp expect actual
-
-Cloning into bare repository 'suffix'...
-ok 2 - suffix ref is ignored during fetch
-
-expecting success: 
-	ref240=$ZERO_OID/$ZERO_OID/$ZERO_OID/$ZERO_OID/$ZERO_OID/$ZERO_OID &&
-	ref1440=$ref240/$ref240/$ref240/$ref240/$ref240/$ref240 &&
-	git init long &&
-	(
-		cd long &&
-		test_commit long &&
-		test_commit master
-	) &&
-	if git -C long update-ref refs/heads/$ref1440 long; then
-		test_set_prereq LONG_REF
-	else
-		echo >&2 "long refs not supported"
-	fi
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5527-fetch-odd-refs/long/.git/
-[master (root-commit) 92be28b] long
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 long.t
-[master f3bdd7b] master
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 master.t
-ok 3 - try to create repo with absurdly long refname
-
-expecting success: 
-	git fetch long refs/heads/*:refs/remotes/long/* &&
-	cat >expect <<-\EOF &&
-	long
-	master
-	EOF
-	git for-each-ref --format="%(subject)" refs/remotes/long >actual &&
-	test_cmp expect actual
-
-warning: no common commits
-From long
- * [new branch]      0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000 -> long/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000
- * [new branch]      master     -> long/master
- * [new tag]         long       -> long
- * [new tag]         master     -> master
-ok 4 - fetch handles extremely long refname
-
-expecting success: 
-	git push long :refs/heads/$ref1440 &&
-	git -C long for-each-ref --format="%(subject)" refs/heads >actual &&
-	echo master >expect &&
-	test_cmp expect actual
-
-To long
- - [deleted]         0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000/0000000000000000000000000000000000000000
-ok 5 - push handles extremely long refname
-
-# passed all 5 test(s)
-1..5
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
 *** t5523-push-upstream.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5523-push-upstream/.git/
 expecting success: 
@@ -159007,7 +159343,7 @@
 	git add file &&
 	git commit -m one
 
-[master (root-commit) a5eda28] one
+[master (root-commit) 214e728] one
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 file
@@ -159186,69 +159522,187 @@
 1..16
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t5529-push-errors.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5529-push-errors/.git/
+*** t5532-fetch-proxy.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5532-fetch-proxy/.git/
 expecting success: 
-	test_commit one
+	git init remote &&
+	(cd remote &&
+	 echo content >file &&
+	 git add file &&
+	 git commit -m one
+	)
 
-[master (root-commit) d79ce16] one
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5532-fetch-proxy/remote/.git/
+[master (root-commit) 10a9f96] one
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 one.t
-ok 1 - setup commits
+ create mode 100644 file
+ok 1 - setup remote repo
 
 expecting success: 
-	git init --bare remote.git &&
-	git remote add origin remote.git
+	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
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5529-push-errors/remote.git/
-ok 2 - setup remote
+	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: 
-	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\""
+	git remote add fake git://example.com/remote &&
+	git config core.gitproxy ./proxy
 
-ok 3 - setup fake receive-pack
+ok 3 - setup local repo
 
 expecting success: 
-	echo no >rp-ran &&
-	echo no >expect &&
-	test_must_fail git push origin missing &&
-	test_cmp expect rp-ran
+	git fetch fake &&
+	echo one >expect &&
+	git log -1 --format=%s FETCH_HEAD >actual &&
+	test_cmp expect actual
 
-error: src refspec missing does not match any.
-error: failed to push some refs to 'remote.git'
-ok 4 - detect missing branches early
+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: 
-	echo no >rp-ran &&
-	echo no >expect &&
-	test_must_fail git push origin master~2:master &&
-	test_cmp expect rp-ran
+	test_must_fail git fetch git://-remote/repo.git 2>stderr &&
+	! grep "proxying for" stderr
 
-error: src refspec master~2 does not match any.
-error: failed to push some refs to 'remote.git'
-ok 5 - detect missing sha1 expressions early
+ok 5 - funny hostnames are rejected before running proxy
 
+# passed all 5 test(s)
+1..5
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t5530-upload-pack-error.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5530-upload-pack-error/.git/
 expecting success: 
-	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
+	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
 
-# passed all 6 test(s)
-1..6
+
+f73f3093ff865c514c6c51f867e35f693487d0d3
+[master (root-commit) 6fcd50f] original
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+[master cec90b1] changed
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 1 - setup and corrupt repository
+
+expecting success: 
+	test_must_fail git fsck
+
+missing blob 5ea2ed416fbd4a4cbe227b75fe255dd7fa6bd4d6
+ok 2 - fsck fails
+
+expecting success: 
+
+	printf "0032want %s\n00000009done\n0000" \
+		$(git rev-parse HEAD) >input &&
+	test_must_fail git upload-pack . <input >/dev/null 2>output.err &&
+	test_i18ngrep "unable to read" output.err &&
+	test_i18ngrep "pack-objects died" output.err
+
+Binary file output.err matches
+Binary file output.err matches
+ok 3 - upload-pack fails due to error in pack-objects packing
+
+expecting success: 
+
+	git hash-object -w file &&
+	corrupt_repo HEAD^^{tree}
+
+
+5ea2ed416fbd4a4cbe227b75fe255dd7fa6bd4d6
+ok 4 - corrupt repo differently
+
+expecting success: 
+	test_must_fail git fsck
+
+broken link from  commit 6fcd50fe47a87a4328a32d65e39bd6cffd9b21a7
+              to    tree bec63e37d08c454ad3a60cde90b70f3f7d077852
+dangling blob f73f3093ff865c514c6c51f867e35f693487d0d3
+missing tree bec63e37d08c454ad3a60cde90b70f3f7d077852
+ok 5 - fsck fails
+
+expecting success: 
+
+	printf "0032want %s\n0034shallow %s00000009done\n0000" \
+		$(git rev-parse HEAD) $(git rev-parse HEAD^) >input &&
+	test_must_fail git upload-pack . <input >/dev/null 2>output.err &&
+	grep "bad tree object" output.err
+
+Binary file output.err matches
+ok 6 - upload-pack fails due to error in rev-list
+
+expecting success: 
+
+	printf "0045want %s multi_ack_detailed\n00000009done\n0000" \
+		"deadbeefdeadbeefdeadbeefdeadbeefdeadbeef" >input &&
+	test_must_fail git upload-pack . <input >output 2>output.err &&
+	grep -q "not our ref" output.err &&
+	! grep -q multi_ack_detailed output.err
+
+ok 7 - upload-pack error message when bad ref requested
+
+expecting success: 
+
+	printf "0032want %s\n00000009done\n0000" \
+		$(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
+
+Binary file output.err matches
+Binary file output.err matches
+ok 8 - upload-pack fails due to error in pack-objects enumeration
+
+expecting success: 
+
+	mkdir foo &&
+	cd foo &&
+	git init
+
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5530-upload-pack-error/foo/.git/
+ok 9 - create empty repository
+
+expecting success: 
+
+	test_must_fail git fetch .. master
+
+
+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: bad tree object bec63e37d08c454ad3a60cde90b70f3f7d077852        
+remote: aborting due to possible repository corruption on the remote side.
+fatal: protocol error: bad pack header
+ok 10 - fetch fails
+
+# passed all 10 test(s)
+1..10
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
 *** t5521-pull-options.sh ***
@@ -159260,7 +159714,7 @@
 	 git commit -m one)
 
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5521-pull-options/parent/.git/
-[master (root-commit) 172c0af] one
+[master (root-commit) c6c2806] one
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 file
@@ -159372,7 +159826,7 @@
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5521-pull-options/clonedoldstyle/.git/
 From ../parent
  * [new branch]      master     -> origin
-[master 48d3ced] A
+[master d6ef198] A
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 A.t
@@ -159381,7 +159835,7 @@
  * [new branch]      master     -> mirror
 Fetching two
 From ../parent
- + 48d3ced...172c0af master     -> origin  (forced update)
+ + d6ef198...c6c2806 master     -> origin  (forced update)
 Already up to date.
 ok 10 - git pull --force
 
@@ -159644,14393 +160098,13288 @@
 1..18
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t5530-upload-pack-error.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5530-upload-pack-error/.git/
+*** t5534-push-signed.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5534-push-signed/.git/
 expecting success: 
+	# master, ff and noff branches pointing at the same commit
+	test_tick &&
+	git commit --allow-empty -m initial &&
 
-	echo file >file &&
-	git add file &&
-	git rev-parse :file &&
-	git commit -a -m original &&
+	git checkout -b noop &&
+	git checkout -b ff &&
+	git checkout -b noff &&
+
+	# noop stays the same, ff advances, noff rewrites
 	test_tick &&
-	echo changed >file &&
-	git commit -a -m changed &&
-	corrupt_repo HEAD:file
+	git commit --allow-empty --amend -m rewritten &&
+	git checkout ff &&
 
+	test_tick &&
+	git commit --allow-empty -m second
 
-f73f3093ff865c514c6c51f867e35f693487d0d3
-[master (root-commit) 306cdf8] original
+[master (root-commit) 66fe8b3] initial
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-[master 1dfee25] changed
+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>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 1 - setup and corrupt repository
+ 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: 
-	test_must_fail git fsck
+	prepare_dst &&
+	mkdir -p dst/.git/hooks &&
+	write_script dst/.git/hooks/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
 
-missing blob 5ea2ed416fbd4a4cbe227b75fe255dd7fa6bd4d6
-ok 2 - fsck fails
+	git push dst noop ff +noff &&
+	! test -f dst/push-cert
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5534-push-signed/dst/.git/
+To dst
+ * [new branch]      master -> noop
+ * [new branch]      master -> ff
+ * [new branch]      master -> noff
+To dst
+   66fe8b3..566fbd3  ff -> ff
+ + 66fe8b3...6391b7f noff -> noff (forced update)
+ok 2 - unsigned push does not send push certificate
 
 expecting success: 
+	prepare_dst &&
+	mkdir -p dst/.git/hooks &&
+	write_script dst/.git/hooks/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
 
-	printf "0032want %s\n00000009done\n0000" \
-		$(git rev-parse HEAD) >input &&
-	test_must_fail git upload-pack . <input >/dev/null 2>output.err &&
-	test_i18ngrep "unable to read" output.err &&
-	test_i18ngrep "pack-objects died" output.err
+	git push dst noop ff +noff &&
+	! test -f dst/push-cert
 
-Binary file output.err matches
-Binary file output.err matches
-ok 3 - upload-pack fails due to error in pack-objects packing
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5534-push-signed/dst/.git/
+To dst
+ * [new branch]      master -> noop
+ * [new branch]      master -> ff
+ * [new branch]      master -> 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: 
+	prepare_dst &&
+	mkdir -p dst/.git/hooks &&
+	test_must_fail git push --signed dst noop ff +noff 2>err &&
+	test_i18ngrep "the receiving end does not support" err
 
-	git hash-object -w file &&
-	corrupt_repo HEAD^^{tree}
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5534-push-signed/dst/.git/
+To dst
+ * [new branch]      master -> noop
+ * [new branch]      master -> ff
+ * [new branch]      master -> noff
+fatal: the receiving end does not support --signed push
+ok 4 - push --signed fails with a receiver without push certificate support
 
+expecting success: 
+	prepare_dst &&
+	mkdir -p dst/.git/hooks &&
+	test_must_fail git push --signed=1 dst noop ff +noff 2>err &&
+	test_i18ngrep "the receiving end does not support" err
 
-5ea2ed416fbd4a4cbe227b75fe255dd7fa6bd4d6
-ok 4 - corrupt repo differently
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5534-push-signed/dst/.git/
+To dst
+ * [new branch]      master -> noop
+ * [new branch]      master -> ff
+ * [new branch]      master -> noff
+fatal: the receiving end does not support --signed push
+ok 5 - push --signed=1 is accepted
 
-expecting success: 
-	test_must_fail git fsck
+skipping test: no certificate for a signed push with no update 
+	prepare_dst &&
+	mkdir -p dst/.git/hooks &&
+	write_script dst/.git/hooks/post-receive <<-\EOF &&
+	if test -n "${GIT_PUSH_CERT-}"
+	then
+		git cat-file blob $GIT_PUSH_CERT >../push-cert
+	fi
+	EOF
+	git push dst noop &&
+	! test -f dst/push-cert
 
-broken link from  commit 306cdf8fb659404c01a7096c40c846854f67d411
-              to    tree bec63e37d08c454ad3a60cde90b70f3f7d077852
-dangling blob f73f3093ff865c514c6c51f867e35f693487d0d3
-missing tree bec63e37d08c454ad3a60cde90b70f3f7d077852
-ok 5 - fsck fails
+ok 6 # skip no certificate for a signed push with no update (missing GPG)
 
-expecting success: 
+skipping test: signed push sends push certificate 
+	prepare_dst &&
+	mkdir -p dst/.git/hooks &&
+	git -C dst config receive.certnonceseed sekrit &&
+	write_script dst/.git/hooks/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 &&
 
-	printf "0032want %s\n0034shallow %s00000009done\n0000" \
-		$(git rev-parse HEAD) $(git rev-parse HEAD^) >input &&
-	test_must_fail git upload-pack . <input >/dev/null 2>output.err &&
-	grep "bad tree object" output.err
+	cat >../push-cert-status <<E_O_F
+	SIGNER=${GIT_PUSH_CERT_SIGNER-nobody}
+	KEY=${GIT_PUSH_CERT_KEY-nokey}
+	STATUS=${GIT_PUSH_CERT_STATUS-nostatus}
+	NONCE_STATUS=${GIT_PUSH_CERT_NONCE_STATUS-nononcestatus}
+	NONCE=${GIT_PUSH_CERT_NONCE-nononce}
+	E_O_F
 
-Binary file output.err matches
-ok 6 - upload-pack fails due to error in rev-list
+	EOF
 
-expecting success: 
+	git push --signed dst noop ff +noff &&
 
-	printf "0045want %s multi_ack_detailed\n00000009done\n0000" \
-		"deadbeefdeadbeefdeadbeefdeadbeefdeadbeef" >input &&
-	test_must_fail git upload-pack . <input >output 2>output.err &&
-	grep -q "not our ref" output.err &&
-	! grep -q multi_ack_detailed output.err
+	(
+		cat <<-\EOF &&
+		SIGNER=C O Mitter <committer@example.com>
+		KEY=13B6F51ECDDE430D
+		STATUS=G
+		NONCE_STATUS=OK
+		EOF
+		sed -n -e "s/^nonce /NONCE=/p" -e "/^$/q" dst/push-cert
+	) >expect &&
 
-ok 7 - upload-pack error message when bad ref requested
+	noop=$(git rev-parse noop) &&
+	ff=$(git rev-parse ff) &&
+	noff=$(git rev-parse noff) &&
+	grep "$noop $ff refs/heads/ff" dst/push-cert &&
+	grep "$noop $noff refs/heads/noff" dst/push-cert &&
+	test_cmp expect dst/push-cert-status
 
-expecting success: 
+ok 7 # skip signed push sends push certificate (missing GPG)
 
-	printf "0032want %s\n00000009done\n0000" \
-		$(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
+skipping test: inconsistent push options in signed push not allowed 
+	# First, invoke receive-pack with dummy input to obtain its preamble.
+	prepare_dst &&
+	git -C dst config receive.certnonceseed sekrit &&
+	git -C dst config receive.advertisepushoptions 1 &&
+	printf xxxx | test_might_fail git receive-pack dst >preamble &&
 
-Binary file output.err matches
-Binary file output.err matches
-ok 8 - upload-pack fails due to error in pack-objects enumeration
+	# Then, invoke push. Simulate a receive-pack that sends the preamble we
+	# obtained, followed by a dummy packet.
+	write_script myscript <<-\EOF &&
+		cat preamble &&
+		printf xxxx &&
+		cat >push
+	EOF
+	test_might_fail git push --push-option="foo" --push-option="bar" \
+		--receive-pack="\"$(pwd)/myscript\"" --signed dst --delete ff &&
 
-expecting success: 
+	# Replay the push output on a fresh dst, checking that ff is truly
+	# deleted.
+	prepare_dst &&
+	git -C dst config receive.certnonceseed sekrit &&
+	git -C dst config receive.advertisepushoptions 1 &&
+	git receive-pack dst <push &&
+	test_must_fail git -C dst rev-parse ff &&
 
-	mkdir foo &&
-	cd foo &&
-	git init
+	# Tweak the push output to make the push option outside the cert
+	# different, then replay it on a fresh dst, checking that ff is not
+	# deleted.
+	perl -pe "s/([^ ])bar/\$1baz/" push >push.tweak &&
+	prepare_dst &&
+	git -C dst config receive.certnonceseed sekrit &&
+	git -C dst config receive.advertisepushoptions 1 &&
+	git receive-pack dst <push.tweak >out &&
+	git -C dst rev-parse ff &&
+	grep "inconsistent push options" out
 
+ok 8 # skip inconsistent push options in signed push not allowed (missing GPG)
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5530-upload-pack-error/foo/.git/
-ok 9 - create empty repository
+skipping test: fail without key and heed user.signingkey 
+	prepare_dst &&
+	mkdir -p dst/.git/hooks &&
+	git -C dst config receive.certnonceseed sekrit &&
+	write_script dst/.git/hooks/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 &&
 
-expecting success: 
+	cat >../push-cert-status <<E_O_F
+	SIGNER=${GIT_PUSH_CERT_SIGNER-nobody}
+	KEY=${GIT_PUSH_CERT_KEY-nokey}
+	STATUS=${GIT_PUSH_CERT_STATUS-nostatus}
+	NONCE_STATUS=${GIT_PUSH_CERT_NONCE_STATUS-nononcestatus}
+	NONCE=${GIT_PUSH_CERT_NONCE-nononce}
+	E_O_F
 
-	test_must_fail git fetch .. master
+	EOF
 
+	test_config user.email hasnokey@nowhere.com &&
+	(
+		sane_unset GIT_COMMITTER_EMAIL &&
+		test_must_fail git push --signed dst noop ff +noff
+	) &&
+	test_config user.signingkey $GIT_COMMITTER_EMAIL &&
+	git push --signed dst noop ff +noff &&
 
-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: bad tree object bec63e37d08c454ad3a60cde90b70f3f7d077852        
-remote: aborting due to possible repository corruption on the remote side.
-fatal: protocol error: bad pack header
-ok 10 - fetch fails
+	(
+		cat <<-\EOF &&
+		SIGNER=C O Mitter <committer@example.com>
+		KEY=13B6F51ECDDE430D
+		STATUS=G
+		NONCE_STATUS=OK
+		EOF
+		sed -n -e "s/^nonce /NONCE=/p" -e "/^$/q" dst/push-cert
+	) >expect &&
+
+	noop=$(git rev-parse noop) &&
+	ff=$(git rev-parse ff) &&
+	noff=$(git rev-parse noff) &&
+	grep "$noop $ff refs/heads/ff" dst/push-cert &&
+	grep "$noop $noff refs/heads/noff" dst/push-cert &&
+	test_cmp expect dst/push-cert-status
+
+ok 9 # skip fail without key and heed user.signingkey (missing GPG)
+
+skipping test: fail without key and heed user.signingkey x509 
+	test_config gpg.format x509 &&
+	prepare_dst &&
+	mkdir -p dst/.git/hooks &&
+	git -C dst config receive.certnonceseed sekrit &&
+	write_script dst/.git/hooks/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 &&
+
+	cat >../push-cert-status <<E_O_F
+	SIGNER=${GIT_PUSH_CERT_SIGNER-nobody}
+	KEY=${GIT_PUSH_CERT_KEY-nokey}
+	STATUS=${GIT_PUSH_CERT_STATUS-nostatus}
+	NONCE_STATUS=${GIT_PUSH_CERT_NONCE_STATUS-nononcestatus}
+	NONCE=${GIT_PUSH_CERT_NONCE-nononce}
+	E_O_F
+
+	EOF
+
+	test_config user.email hasnokey@nowhere.com &&
+	test_config user.signingkey "" &&
+	(
+		sane_unset GIT_COMMITTER_EMAIL &&
+		test_must_fail git push --signed dst noop ff +noff
+	) &&
+	test_config user.signingkey $GIT_COMMITTER_EMAIL &&
+	git push --signed dst noop ff +noff &&
+
+	(
+		cat <<-\EOF &&
+		SIGNER=/CN=C O Mitter/O=Example/SN=C O/GN=Mitter
+		KEY=
+		STATUS=G
+		NONCE_STATUS=OK
+		EOF
+		sed -n -e "s/^nonce /NONCE=/p" -e "/^$/q" dst/push-cert
+	) >expect.in &&
+	key=$(cat "${GNUPGHOME}/trustlist.txt" | cut -d" " -f1 | tr -d ":") &&
+	sed -e "s/^KEY=/KEY=${key}/" expect.in >expect &&
+
+	noop=$(git rev-parse noop) &&
+	ff=$(git rev-parse ff) &&
+	noff=$(git rev-parse noff) &&
+	grep "$noop $ff refs/heads/ff" dst/push-cert &&
+	grep "$noop $noff refs/heads/noff" dst/push-cert &&
+	test_cmp expect dst/push-cert-status
+
+ok 10 # skip fail without key and heed user.signingkey x509 (missing GPGSM)
 
 # passed all 10 test(s)
 1..10
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t5532-fetch-proxy.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5532-fetch-proxy/.git/
+*** t5535-fetch-push-symref.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5535-fetch-push-symref/.git/
 expecting success: 
-	git init remote &&
-	(cd remote &&
-	 echo content >file &&
-	 git add file &&
-	 git commit -m one
-	)
+	test_commit one &&
+	git clone . src &&
+	git clone src dst1 &&
+	git clone src dst2 &&
+	test_commit two &&
+	( cd src && git pull )
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5532-fetch-proxy/remote/.git/
-[master (root-commit) 84dfdda] one
+[master (root-commit) d79ce16] one
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 file
-ok 1 - setup remote repo
+ 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/git-2.20.1/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: 
-	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
+	(
+		cd src &&
+		git push ../dst1 "refs/remotes/*:refs/remotes/*"
+	) &&
+	git ls-remote src "refs/remotes/*" >expect &&
+	git ls-remote dst1 "refs/remotes/*" >actual &&
+	test_cmp expect actual &&
+	( cd src && git symbolic-ref refs/remotes/origin/HEAD ) >expect &&
+	( cd dst1 && git symbolic-ref refs/remotes/origin/HEAD ) >actual &&
+	test_cmp expect actual
 
-ok 2 - setup proxy script
+To ../dst1
+   d79ce16..139b20d  origin/HEAD -> origin/HEAD
+   d79ce16..139b20d  origin/master -> origin/master
+ok 2 - push
 
 expecting success: 
-	git remote add fake git://example.com/remote &&
-	git config core.gitproxy ./proxy
+	(
+		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
 
-ok 3 - setup local repo
+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/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t5536-fetch-conflicts.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5536-fetch-conflicts/.git/
 expecting success: 
-	git fetch fake &&
-	echo one >expect &&
-	git log -1 --format=%s FETCH_HEAD >actual &&
-	test_cmp expect actual
+	git commit --allow-empty -m "Initial" &&
+	git branch branch1 &&
+	git tag tag1 &&
+	git commit --allow-empty -m "First" &&
+	git branch branch2 &&
+	git tag tag2
 
-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
+[master (root-commit) 30eef0e] Initial
+ Author: A U Thor <author@example.com>
+[master e9324d6] First
+ Author: A U Thor <author@example.com>
+ok 1 - setup
 
 expecting success: 
-	test_must_fail git fetch git://-remote/repo.git 2>stderr &&
-	! grep "proxying for" stderr
+	setup_repository ok "+refs/heads/*:refs/remotes/origin/*" && (
+		cd ok &&
+		git fetch origin
+	)
 
-ok 5 - funny hostnames are rejected before running proxy
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5536-fetch-conflicts/ok/.git/
+From /build/git-2.20.1/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
 
-# passed all 5 test(s)
-1..5
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t3070-wildmatch.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3070-wildmatch/.git/
-checking prerequisite: EXPENSIVE_ON_WINDOWS
+expecting success: 
+	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_i18ngrep "fatal: Cannot fetch both refs/heads/branch1 and refs/heads/branch2 to refs/remotes/origin/branch1" error
+	)
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
-	test_have_prereq EXPENSIVE || test_have_prereq !MINGW,!CYGWIN
+Initialized empty Git repository in /build/git-2.20.1/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
 
-)
-checking prerequisite: EXPENSIVE
+expecting success: 
+	setup_repository dcc \
+		"+refs/heads/*:refs/remotes/origin/*" \
+		"+refs/heads/branch1:refs/remotes/origin/branch1" && (
+		cd dcc &&
+		git fetch origin
+	)
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
-	test -n "$GIT_TEST_LONG"
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5536-fetch-conflicts/dcc/.git/
+From /build/git-2.20.1/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
 
-)
-prerequisite EXPENSIVE not satisfied
-prerequisite EXPENSIVE_ON_WINDOWS ok
 expecting success: 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-ok 1 - cleanup after previous file test
+	setup_repository aoc \
+		"+refs/heads/*:refs/remotes/origin/*" && (
+		cd aoc &&
+		git fetch origin refs/heads/branch2:refs/remotes/origin/branch1
+	)
 
-expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git 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
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5536-fetch-conflicts/aoc/.git/
+From /build/git-2.20.1/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: 
-			test-tool wildmatch wildmatch 'foo' 'foo'
-		
-ok 3 - wildmatch: match 'foo' 'foo'
+	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_i18ngrep "fatal: Cannot fetch both refs/heads/branch1 and refs/heads/branch2 to refs/remotes/origin/branch1" error
+	)
 
-expecting success: 
-				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'
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5536-fetch-conflicts/caa/.git/
+fatal: Cannot fetch both refs/heads/branch1 and refs/heads/branch2 to refs/remotes/origin/branch1
+ok 6 - fetch conflict: arg vs. arg
 
 expecting success: 
-			test-tool wildmatch iwildmatch 'foo' 'foo'
-		
-ok 5 - iwildmatch: match 'foo' 'foo'
+	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_i18ngrep "warning: refs/remotes/origin/branch1 usually tracks refs/heads/branch1, not refs/heads/branch2" error &&
+		test_i18ngrep "warning: refs/remotes/origin/branch2 usually tracks refs/heads/branch2, not refs/heads/branch1" error
+	)
 
-expecting success: 
-				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'
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5536-fetch-conflicts/xaa/.git/
+warning: refs/remotes/origin/branch1 usually tracks refs/heads/branch1, not refs/heads/branch2
+warning: refs/remotes/origin/branch2 usually tracks refs/heads/branch2, not refs/heads/branch1
+ok 7 - fetch conflict: criss-cross args
 
+# passed all 7 test(s)
+1..7
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t5505-remote.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5505-remote/.git/
 expecting success: 
-			test-tool wildmatch pathmatch 'foo' 'foo'
-		
-ok 7 - pathmatch: match 'foo' 'foo'
+	setup_repository one &&
+	setup_repository two &&
+	(
+		cd two &&
+		git branch another
+	) &&
+	git clone one test
 
-expecting success: 
-				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'
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5505-remote/one/.git/
+[master (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 'master'
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5505-remote/two/.git/
+[master (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 'master'
+Cloning into 'test'...
+done.
+ok 1 - setup
 
 expecting success: 
-			test-tool wildmatch ipathmatch 'foo' 'foo'
-		
-ok 9 - ipathmatch: match 'foo' 'foo'
+	test_config url.git@host.com:team/repo.git.insteadOf myremote &&
+	git remote add myremote git@host.com:team/repo.git
 
-expecting success: 
-				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'
+ok 2 - add remote whose URL agrees with url.<...>.insteadOf
 
 expecting success: 
-		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
+	(
+		cd test &&
+		tokens_match origin "$(git remote)" &&
+		check_remote_track origin master side &&
+		check_tracking_branch origin HEAD master side
+	)
 
-expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git 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
+ok 3 - remote information for the origin
 
 expecting success: 
-			test_must_fail test-tool wildmatch wildmatch 'foo' 'bar'
-		
-ok 13 - wildmatch: no match 'foo' 'bar'
+	(
+		cd test &&
+		git remote add -f second ../two &&
+		tokens_match "origin second" "$(git remote)" &&
+		check_tracking_branch second master side another &&
+		git for-each-ref "--format=%(refname)" refs/remotes |
+		sed -e "/^refs\/remotes\/origin\//d" \
+		    -e "/^refs\/remotes\/second\//d" >actual &&
+		test_must_be_empty actual
+	)
 
-expecting success: 
-				>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'
+Updating second
+From ../two
+ * [new branch]      another    -> second/another
+ * [new branch]      master     -> second/master
+ * [new branch]      side       -> second/side
+ok 4 - add another remote
 
 expecting success: 
-			test_must_fail test-tool wildmatch iwildmatch 'foo' 'bar'
-		
-ok 15 - iwildmatch: no match 'foo' 'bar'
+	(
+		cd test &&
+		check_remote_track origin master side &&
+		check_remote_track second master side another
+	)
 
-expecting success: 
-				>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'
+ok 5 - check remote-tracking
 
 expecting success: 
-			test_must_fail test-tool wildmatch pathmatch 'foo' 'bar'
-		
-ok 17 - pathmatch: no match 'foo' 'bar'
+	(
+		cd test &&
+		case $(git config remote.second.fetch) in
+		+*) true ;;
+		 *) false ;;
+		esac
+	)
 
-expecting success: 
-				>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'
+ok 6 - remote forces tracking branches
 
 expecting success: 
-			test_must_fail test-tool wildmatch ipathmatch 'foo' 'bar'
-		
-ok 19 - ipathmatch: no match 'foo' 'bar'
+	(
+		cd test &&
+		git symbolic-ref refs/remotes/second/HEAD refs/remotes/second/master &&
+		git remote rm second
+	)
 
-expecting success: 
-				>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'
+ok 7 - remove remote
 
 expecting success: 
-		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
+	(
+		cd test &&
+		tokens_match origin "$(git remote)" &&
+		check_remote_track origin master side &&
+		git for-each-ref "--format=%(refname)" refs/remotes |
+		sed -e "/^refs\/remotes\/origin\//d" >actual &&
+		test_must_be_empty actual
+	)
 
-expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git 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 
+ok 8 - remove remote
 
 expecting success: 
-			test-tool wildmatch wildmatch '' ''
-		
-ok 23 - wildmatch: match '' ''
+	(
+		cd test &&
+		cat >expect1 <<-\EOF &&
+		Note: A branch outside the refs/remotes/ hierarchy was not removed;
+		to delete it, use:
+		  git branch -d master
+		EOF
+		cat >expect2 <<-\EOF &&
+		Note: Some branches outside the refs/remotes/ hierarchy were not removed;
+		to delete them, use:
+		  git branch -d foobranch
+		  git branch -d master
+		EOF
+		git tag footag &&
+		git config --add remote.oops.fetch "+refs/*:refs/*" &&
+		git remote remove oops 2>actual1 &&
+		git branch foobranch &&
+		git config --add remote.oops.fetch "+refs/*:refs/*" &&
+		git remote rm oops 2>actual2 &&
+		git branch -d foobranch &&
+		git tag -d footag &&
+		test_i18ncmp expect1 actual1 &&
+		test_i18ncmp expect2 actual2
+	)
 
-checking known breakage: false
-not ok 24 - wildmatch (via ls-files): match skip '' '' # TODO known breakage
+Deleted branch foobranch (was 9d34b14).
+Deleted tag 'footag' (was 9d34b14)
+ok 9 - remove remote protects local branches
 
 expecting success: 
-			test-tool wildmatch iwildmatch '' ''
-		
-ok 25 - iwildmatch: match '' ''
+	(
+		cd test &&
+		echo "fatal: No such remote: 'foo'" >expect &&
+		test_must_fail git remote rm foo 2>actual &&
+		test_i18ncmp expect actual
+	)
 
-checking known breakage: false
-not ok 26 - iwildmatch (via ls-files): match skip '' '' # TODO known breakage
+ok 10 - remove errors out early when deleting non-existent branch
 
 expecting success: 
-			test-tool wildmatch pathmatch '' ''
-		
-ok 27 - pathmatch: match '' ''
+	test_when_finished "(
+		git -C test checkout master;
+		git -C test branch -D two;
+		git -C test config --remove-section remote.two;
+		git -C test config --remove-section branch.second;
+		true
+	)" &&
+	(
+		cd test &&
+		git remote add two ../two &&
+		git fetch two &&
+		git checkout -b second two/master^0 &&
+		git config branch.second.remote two &&
+		git checkout master &&
+		git remote rm two
+	)
 
-checking known breakage: false
-not ok 28 - pathmatch (via ls-files): match skip '' '' # TODO known breakage
+From ../two
+ * [new branch]      another    -> two/another
+ * [new branch]      master     -> two/master
+ * [new branch]      side       -> two/side
+Switched to a new branch 'second'
+Switched to branch 'master'
+Your branch is up to date with 'origin/master'.
+Already on 'master'
+Your branch is up to date with 'origin/master'.
+error: branch 'two' not found.
+fatal: no such section: remote.two
+fatal: no such section: branch.second
+ok 11 - remove remote with a branch without configured merge
 
 expecting success: 
-			test-tool wildmatch ipathmatch '' ''
-		
-ok 29 - ipathmatch: match '' ''
+	(
+		cd test &&
+		echo "fatal: No such remote: 'foo'" >expect &&
+		test_must_fail git remote rename foo bar 2>actual &&
+		test_i18ncmp expect actual
+	)
 
-checking known breakage: false
-not ok 30 - ipathmatch (via ls-files): match skip '' '' # TODO known breakage
+ok 12 - rename errors out early when deleting non-existent branch
 
 expecting success: 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-ok 31 - cleanup after previous file test
+	test_config remote.foo.vcs bar &&
+	echo "fatal: remote foo already exists." >expect &&
+	test_must_fail git remote add foo bar 2>actual &&
+	test_i18ncmp expect actual
 
-expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git 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
+ok 13 - add existing foreign_vcs remote
 
 expecting success: 
-			test-tool wildmatch wildmatch 'foo' '???'
-		
-ok 33 - wildmatch: match 'foo' '???'
+	test_config remote.foo.vcs bar &&
+	test_config remote.bar.vcs bar &&
+	echo "fatal: remote bar already exists." >expect &&
+	test_must_fail git remote rename foo bar 2>actual &&
+	test_i18ncmp expect actual
 
-expecting success: 
-				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'
+ok 14 - add existing foreign_vcs remote
 
 expecting success: 
-			test-tool wildmatch iwildmatch 'foo' '???'
-		
-ok 35 - iwildmatch: match 'foo' '???'
+	(
+		cd test &&
+		git config --add remote.origin.fetch refs/heads/master:refs/heads/upstream &&
+		git fetch &&
+		git checkout -b ahead origin/master &&
+		echo 1 >>file &&
+		test_tick &&
+		git commit -m update file &&
+		git checkout master &&
+		git branch --track octopus origin/master &&
+		git branch --track rebase origin/master &&
+		git branch -d -r origin/master &&
+		git config --add remote.two.url ../two &&
+		git config --add remote.two.pushurl ../three &&
+		git config branch.rebase.rebase true &&
+		git config branch.octopus.merge "topic-a topic-b topic-c" &&
+		(
+			cd ../one &&
+			echo 1 >file &&
+			test_tick &&
+			git commit -m update file
+		) &&
+		git config --add remote.origin.push : &&
+		git config --add remote.origin.push refs/heads/master:refs/heads/upstream &&
+		git config --add remote.origin.push +refs/tags/lastbackup &&
+		git config --add remote.two.push +refs/heads/ahead:refs/heads/master &&
+		git config --add remote.two.push refs/heads/master:refs/heads/another &&
+		git remote show origin two >output &&
+		git branch -d rebase octopus &&
+		test_i18ncmp expect output
+	)
 
-expecting success: 
-				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'
+From /build/git-2.20.1/t/trash directory.t5505-remote/one
+ * [new branch]      master     -> upstream
+Switched to a new branch 'ahead'
+Branch 'ahead' set up to track remote branch 'master' from 'origin'.
+[ahead 847549e] update
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Switched to branch 'master'
+Your branch is up to date with 'origin/master'.
+Branch 'octopus' set up to track remote branch 'master' from 'origin'.
+Branch 'rebase' set up to track remote branch 'master' from 'origin'.
+Deleted remote-tracking branch origin/master (was 9d34b14).
+[master 6329a3c] update
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+error: src refspec refs/tags/lastbackup does not match any.
+Deleted branch rebase (was 9d34b14).
+Deleted branch octopus (was 9d34b14).
+ok 15 - show
 
 expecting success: 
-			test-tool wildmatch pathmatch 'foo' '???'
-		
-ok 37 - pathmatch: match 'foo' '???'
+	mv one one.unreachable &&
+	(
+		cd test &&
+		git remote show -n origin >output &&
+		mv ../one.unreachable ../one &&
+		test_i18ncmp expect output
+	)
 
-expecting success: 
-				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'
+ok 16 - show -n
 
 expecting success: 
-			test-tool wildmatch ipathmatch 'foo' '???'
-		
-ok 39 - ipathmatch: match 'foo' '???'
+	(
+		cd one &&
+		git branch -m side side2
+	) &&
+	(
+		cd test &&
+		git fetch origin &&
+		git remote prune origin &&
+		git rev-parse refs/remotes/origin/side2 &&
+		test_must_fail git rev-parse refs/remotes/origin/side
+	)
 
-expecting success: 
-				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'
+From /build/git-2.20.1/t/trash directory.t5505-remote/one
+ * [new branch]      master     -> origin/master
+ * [new branch]      side2      -> origin/side2
+   9d34b14..6329a3c  master     -> upstream
+Pruning origin
+URL: /build/git-2.20.1/t/trash directory.t5505-remote/one
+ * [pruned] origin/side
+2ce9c504874e3f0ce77f83c0bb0b1024c7a6387f
+fatal: ambiguous argument 'refs/remotes/origin/side': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+refs/remotes/origin/side
+ok 17 - prune
 
 expecting success: 
-		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
+	(
+		cd test &&
+		git symbolic-ref refs/remotes/origin/HEAD &&
+		git remote set-head --delete origin &&
+		test_must_fail git symbolic-ref refs/remotes/origin/HEAD
+	)
 
-expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git 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
+refs/remotes/origin/master
+fatal: ref refs/remotes/origin/HEAD is not a symbolic ref
+ok 18 - set-head --delete
 
 expecting success: 
-			test_must_fail test-tool wildmatch wildmatch 'foo' '??'
-		
-ok 43 - wildmatch: no match 'foo' '??'
+	(
+		cd test &&
+		git remote set-head --auto origin &&
+		echo refs/remotes/origin/master >expect &&
+		git symbolic-ref refs/remotes/origin/HEAD >output &&
+		test_cmp expect output
+	)
 
-expecting success: 
-				>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'
+origin/HEAD set to master
+ok 19 - set-head --auto
 
 expecting success: 
-			test_must_fail test-tool wildmatch iwildmatch 'foo' '??'
-		
-ok 45 - iwildmatch: no match 'foo' '??'
+	(
+		cd test &&
+		git fetch two "refs/heads/*:refs/remotes/two/*" &&
+		git remote set-head --auto two >output 2>&1 &&
+		echo "two/HEAD set to master" >expect &&
+		test_i18ncmp expect output
+	)
 
-expecting success: 
-				>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'
+From ../two
+ * [new branch]      another    -> two/another
+ * [new branch]      master     -> two/master
+ * [new branch]      side       -> two/side
+ok 20 - set-head --auto has no problem w/multiple HEADs
 
 expecting success: 
-			test_must_fail test-tool wildmatch pathmatch 'foo' '??'
-		
-ok 47 - pathmatch: no match 'foo' '??'
+	(
+		cd test &&
+		git remote set-head origin side2 &&
+		git symbolic-ref refs/remotes/origin/HEAD >output &&
+		git remote set-head origin master &&
+		test_cmp expect output
+	)
 
-expecting success: 
-				>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'
+ok 21 - set-head explicit
 
 expecting success: 
-			test_must_fail test-tool wildmatch ipathmatch 'foo' '??'
-		
-ok 49 - ipathmatch: no match 'foo' '??'
+	git -C one branch -m side2 side &&
+	test_when_finished "git -C one branch -m side side2" &&
+	(
+		cd test &&
+		git remote prune --dry-run origin >output &&
+		git rev-parse refs/remotes/origin/side2 &&
+		test_must_fail git rev-parse refs/remotes/origin/side &&
+		test_i18ncmp expect output
+	)
 
-expecting success: 
-				>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'
+2ce9c504874e3f0ce77f83c0bb0b1024c7a6387f
+fatal: ambiguous argument 'refs/remotes/origin/side': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+refs/remotes/origin/side
+ok 22 - prune --dry-run
 
 expecting success: 
-		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
+	mkdir mirror &&
+	(
+		cd mirror &&
+		git init --bare &&
+		git remote add --mirror -f origin ../one
+	) &&
+	(
+		cd one &&
+		git branch -m side2 side
+	) &&
+	(
+		cd mirror &&
+		git rev-parse --verify refs/heads/side2 &&
+		test_must_fail git rev-parse --verify refs/heads/side &&
+		git fetch origin &&
+		git remote prune origin &&
+		test_must_fail git rev-parse --verify refs/heads/side2 &&
+		git rev-parse --verify refs/heads/side
+	)
 
-expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 52 - setup match file test for foo
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5505-remote/mirror/
+warning: --mirror is dangerous and deprecated; please
+	 use --mirror=fetch or --mirror=push instead
+Updating origin
+From ../one
+ * [new branch]      master     -> master
+ * [new branch]      side2      -> side2
+2ce9c504874e3f0ce77f83c0bb0b1024c7a6387f
+fatal: Needed a single revision
+From ../one
+ * [new branch]      side       -> side
+Pruning origin
+URL: ../one
+ * [pruned] refs/heads/side2
+fatal: Needed a single revision
+2ce9c504874e3f0ce77f83c0bb0b1024c7a6387f
+ok 23 - add --mirror && prune
 
 expecting success: 
-			test-tool wildmatch wildmatch 'foo' '*'
-		
-ok 53 - wildmatch: match 'foo' '*'
+	mkdir mirror-fetch &&
+	git init mirror-fetch/parent &&
+	(
+		cd mirror-fetch/parent &&
+		test_commit one
+	) &&
+	git init --bare mirror-fetch/child &&
+	(
+		cd mirror-fetch/child &&
+		git remote add --mirror=fetch -f parent ../parent
+	)
 
-expecting success: 
-				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'
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5505-remote/mirror-fetch/parent/.git/
+[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/git-2.20.1/t/trash directory.t5505-remote/mirror-fetch/child/
+Updating parent
+From ../parent
+ * [new branch]      master     -> master
+ * [new tag]         one        -> one
+ok 24 - add --mirror=fetch
 
 expecting success: 
-			test-tool wildmatch iwildmatch 'foo' '*'
-		
-ok 55 - iwildmatch: match 'foo' '*'
+	(
+		cd mirror-fetch/parent &&
+		git branch new &&
+		git branch -m master renamed
+	) &&
+	(
+		cd mirror-fetch/child &&
+		git fetch parent &&
+		git rev-parse --verify refs/heads/new &&
+		git rev-parse --verify refs/heads/renamed
+	)
 
-expecting success: 
-				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'
+From ../parent
+ * [new branch]      new        -> new
+ * [new branch]      renamed    -> renamed
+d79ce1670bdcb76e6d1da2ae095e890ccb326ae9
+d79ce1670bdcb76e6d1da2ae095e890ccb326ae9
+ok 25 - fetch mirrors act as mirrors during fetch
 
 expecting success: 
-			test-tool wildmatch pathmatch 'foo' '*'
-		
-ok 57 - pathmatch: match 'foo' '*'
+	(
+		cd mirror-fetch/child &&
+		git remote prune parent &&
+		test_must_fail git rev-parse --verify refs/heads/master
+	)
 
-expecting success: 
-				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'
+Pruning parent
+URL: ../parent
+ * [pruned] refs/heads/master
+fatal: Needed a single revision
+ok 26 - fetch mirrors can prune
 
 expecting success: 
-			test-tool wildmatch ipathmatch 'foo' '*'
-		
-ok 59 - ipathmatch: match 'foo' '*'
+	(
+		cd mirror-fetch/parent &&
+		git checkout HEAD^0
+	) &&
+	(
+		cd mirror-fetch/child &&
+		git branch -m renamed renamed2 &&
+		git push parent :
+	) &&
+	(
+		cd mirror-fetch/parent &&
+		git rev-parse --verify renamed &&
+		test_must_fail git rev-parse --verify refs/heads/renamed2
+	)
 
-expecting success: 
-				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'
+Note: checking out 'HEAD^0'.
 
-expecting success: 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-Removing foo
-ok 61 - cleanup after previous file test
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by performing another checkout.
 
-expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git 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
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -b with the checkout command again. Example:
 
-expecting success: 
-			test-tool wildmatch wildmatch 'foo' 'f*'
-		
-ok 63 - wildmatch: match 'foo' 'f*'
+  git checkout -b <new-branch-name>
 
-expecting success: 
-				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'
+HEAD is now at d79ce16 one
+Everything up-to-date
+d79ce1670bdcb76e6d1da2ae095e890ccb326ae9
+fatal: Needed a single revision
+ok 27 - fetch mirrors do not act as mirrors during push
 
 expecting success: 
-			test-tool wildmatch iwildmatch 'foo' 'f*'
-		
-ok 65 - iwildmatch: match 'foo' 'f*'
+	git init --bare mirror-fetch/track &&
+	(
+		cd mirror-fetch/track &&
+		git remote add --mirror=fetch -t heads/new parent ../parent
+	)
 
-expecting success: 
-				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'
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5505-remote/mirror-fetch/track/
+ok 28 - add fetch mirror with specific branches
 
 expecting success: 
-			test-tool wildmatch pathmatch 'foo' 'f*'
-		
-ok 67 - pathmatch: match 'foo' 'f*'
+	(
+		cd mirror-fetch/track &&
+		git fetch parent &&
+		git rev-parse --verify refs/heads/new &&
+		test_must_fail git rev-parse --verify refs/heads/renamed
+	)
 
-expecting success: 
-				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'
+From ../parent
+ * [new branch]      new        -> new
+ * [new tag]         one        -> one
+d79ce1670bdcb76e6d1da2ae095e890ccb326ae9
+fatal: Needed a single revision
+ok 29 - fetch mirror respects specific branches
 
 expecting success: 
-			test-tool wildmatch ipathmatch 'foo' 'f*'
-		
-ok 69 - ipathmatch: match 'foo' 'f*'
+	mkdir mirror-push &&
+	git init --bare mirror-push/public &&
+	git init mirror-push/private &&
+	(
+		cd mirror-push/private &&
+		test_commit one &&
+		git remote add --mirror=push public ../public
+	)
 
-expecting success: 
-				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'
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5505-remote/mirror-push/public/
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5505-remote/mirror-push/private/.git/
+[master (root-commit) d79ce16] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+ok 30 - add --mirror=push
 
 expecting success: 
-		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
+	(
+		cd mirror-push/private &&
+		git branch new &&
+		git branch -m master renamed &&
+		git push public
+	) &&
+	(
+		cd mirror-push/private &&
+		git rev-parse --verify refs/heads/new &&
+		git rev-parse --verify refs/heads/renamed &&
+		test_must_fail git rev-parse --verify refs/heads/master
+	)
 
-expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git 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
+To ../public
+ * [new branch]      new -> new
+ * [new branch]      renamed -> renamed
+ * [new tag]         one -> one
+d79ce1670bdcb76e6d1da2ae095e890ccb326ae9
+d79ce1670bdcb76e6d1da2ae095e890ccb326ae9
+fatal: Needed a single revision
+ok 31 - push mirrors act as mirrors during push
 
 expecting success: 
-			test_must_fail test-tool wildmatch wildmatch 'foo' '*f'
-		
-ok 73 - wildmatch: no match 'foo' '*f'
+	(
+		cd mirror-push/public &&
+		git branch -m renamed renamed2 &&
+		git symbolic-ref HEAD refs/heads/renamed2
+	) &&
+	(
+		cd mirror-push/private &&
+		git fetch public &&
+		git rev-parse --verify refs/heads/renamed &&
+		test_must_fail git rev-parse --verify refs/heads/renamed2
+	)
 
-expecting success: 
-				>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'
+From ../public
+ * branch            HEAD       -> FETCH_HEAD
+d79ce1670bdcb76e6d1da2ae095e890ccb326ae9
+fatal: Needed a single revision
+ok 32 - push mirrors do not act as mirrors during fetch
 
 expecting success: 
-			test_must_fail test-tool wildmatch iwildmatch 'foo' '*f'
-		
-ok 75 - iwildmatch: no match 'foo' '*f'
+	git init mirror-push/track &&
+	(
+		cd mirror-push/track &&
+		test_must_fail git remote add --mirror=push -t new public ../public
+	)
 
-expecting success: 
-				>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'
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5505-remote/mirror-push/track/.git/
+fatal: specifying branches to track makes sense only with fetch mirrors
+ok 33 - push mirrors do not allow you to specify refs
 
 expecting success: 
-			test_must_fail test-tool wildmatch pathmatch 'foo' '*f'
-		
-ok 77 - pathmatch: no match 'foo' '*f'
+	mkdir alttst &&
+	(
+		cd alttst &&
+		git init &&
+		git remote add -f origin ../one &&
+		git config remote.alt.url ../one &&
+		git config remote.alt.fetch "+refs/heads/*:refs/remotes/origin/*"
+	) &&
+	(
+		cd one &&
+		git branch -m side side2
+	) &&
+	(
+		cd alttst &&
+		git rev-parse --verify refs/remotes/origin/side &&
+		test_must_fail git rev-parse --verify refs/remotes/origin/side2 &&
+		git fetch alt &&
+		git remote prune alt &&
+		test_must_fail git rev-parse --verify refs/remotes/origin/side &&
+		git rev-parse --verify refs/remotes/origin/side2
+	)
 
-expecting success: 
-				>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'
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5505-remote/alttst/.git/
+Updating origin
+From ../one
+ * [new branch]      master     -> origin/master
+ * [new branch]      side       -> origin/side
+2ce9c504874e3f0ce77f83c0bb0b1024c7a6387f
+fatal: Needed a single revision
+From ../one
+ * [new branch]      side2      -> origin/side2
+Pruning alt
+URL: ../one
+ * [pruned] origin/side
+fatal: Needed a single revision
+2ce9c504874e3f0ce77f83c0bb0b1024c7a6387f
+ok 34 - add alt && prune
 
 expecting success: 
-			test_must_fail test-tool wildmatch ipathmatch 'foo' '*f'
-		
-ok 79 - ipathmatch: no match 'foo' '*f'
+	(
+		cd one &&
+		>foobar &&
+		git add foobar &&
+		git commit -m "Foobar" &&
+		git tag -a -m "Foobar tag" foobar-tag &&
+		git reset --hard HEAD~1 &&
+		git tag -a -m "Some tag" some-tag
+	) &&
+	mkdir add-tags &&
+	(
+		cd add-tags &&
+		git init &&
+		git remote add -f origin ../one &&
+		git tag -l some-tag >../test/output &&
+		git tag -l foobar-tag >>../test/output &&
+		test_must_fail git config remote.origin.tagopt
+	) &&
+	test_cmp test/expect test/output
 
-expecting success: 
-				>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'
+[master bb94d49] Foobar
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 foobar
+HEAD is now at 6329a3c update
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5505-remote/add-tags/.git/
+Updating origin
+From ../one
+ * [new branch]      master     -> origin/master
+ * [new branch]      side2      -> origin/side2
+ * [new tag]         some-tag   -> some-tag
+ok 35 - add with reachable tags (default)
 
 expecting success: 
-		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
+	rm -rf add-tags &&
+	(
+		mkdir add-tags &&
+		cd add-tags &&
+		git init &&
+		git remote add -f --tags origin ../one &&
+		git tag -l some-tag >../test/output &&
+		git tag -l foobar-tag >>../test/output &&
+		git config remote.origin.tagopt >>../test/output
+	) &&
+	test_cmp test/expect test/output
 
-expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git 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
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5505-remote/add-tags/.git/
+Updating origin
+From ../one
+ * [new branch]      master     -> origin/master
+ * [new branch]      side2      -> origin/side2
+ * [new tag]         foobar-tag -> foobar-tag
+ * [new tag]         some-tag   -> some-tag
+ok 36 - add --tags
 
 expecting success: 
-			test-tool wildmatch wildmatch 'foo' '*foo*'
-		
-ok 83 - wildmatch: match 'foo' '*foo*'
+	rm -rf add-tags &&
+	(
+		mkdir add-no-tags &&
+		cd add-no-tags &&
+		git init &&
+		git remote add -f --no-tags origin ../one &&
+		git tag -l some-tag >../test/output &&
+		git tag -l foobar-tag >../test/output &&
+		git config remote.origin.tagopt >>../test/output
+	) &&
+	(
+		cd one &&
+		git tag -d some-tag foobar-tag
+	) &&
+	test_cmp test/expect test/output
 
-expecting success: 
-				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'
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5505-remote/add-no-tags/.git/
+Updating origin
+From ../one
+ * [new branch]      master     -> origin/master
+ * [new branch]      side2      -> origin/side2
+Deleted tag 'some-tag' (was 3fa95a6)
+Deleted tag 'foobar-tag' (was 31470dd)
+ok 37 - add --no-tags
 
 expecting success: 
-			test-tool wildmatch iwildmatch 'foo' '*foo*'
-		
-ok 85 - iwildmatch: match 'foo' '*foo*'
+	(
+		cd add-no-tags &&
+		test_must_fail git remote add -f --no-no-tags neworigin ../one
+	)
 
-expecting success: 
-				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'
+error: unknown option `no-no-tags'
+usage: git remote add [<options>] <name> <url>
 
-expecting success: 
-			test-tool wildmatch pathmatch 'foo' '*foo*'
-		
-ok 87 - pathmatch: match 'foo' '*foo*'
+    -f, --fetch           fetch the remote branches
+    --tags                import all tags and associated objects when fetching
+                          or do not fetch any tag at all (--no-tags)
+    -t, --track <branch>  branch(es) to track
+    -m, --master <branch>
+                          master branch
+    --mirror[=(push|fetch)]
+                          set up remote as a mirror to push to or fetch from
 
-expecting success: 
-				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'
+ok 38 - reject --no-no-tags
 
 expecting success: 
-			test-tool wildmatch ipathmatch 'foo' '*foo*'
-		
-ok 89 - ipathmatch: match 'foo' '*foo*'
+	(
+		cd one &&
+		git remote add drosophila ../two &&
+		git remote add apis ../mirror &&
+		git remote update &&
+		git branch -r >output &&
+		test_cmp expect output
+	)
 
-expecting success: 
-				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'
+Fetching drosophila
+From ../two
+ * [new branch]      another    -> drosophila/another
+ * [new branch]      master     -> drosophila/master
+ * [new branch]      side       -> drosophila/side
+Fetching apis
+From ../mirror
+ * [new branch]      master     -> apis/master
+ * [new branch]      side       -> apis/side
+ok 39 - update
 
 expecting success: 
-		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
+	(
+		cd one &&
+		for b in $(git branch -r)
+		do
+		git branch -r -d $b || exit 1
+		done &&
+		git remote add manduca ../mirror &&
+		git remote add megaloprepus ../mirror &&
+		git config remotes.phobaeticus "drosophila megaloprepus" &&
+		git config remotes.titanus manduca &&
+		git remote update phobaeticus titanus &&
+		git branch -r >output &&
+		test_cmp expect output
+	)
 
-expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git 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
+Deleted remote-tracking branch apis/master (was 6329a3c).
+Deleted remote-tracking branch apis/side (was 2ce9c50).
+Deleted remote-tracking branch drosophila/another (was 9d34b14).
+Deleted remote-tracking branch drosophila/master (was 9d34b14).
+Deleted remote-tracking branch drosophila/side (was 2ce9c50).
+Fetching drosophila
+From ../two
+ * [new branch]      another    -> drosophila/another
+ * [new branch]      master     -> drosophila/master
+ * [new branch]      side       -> drosophila/side
+Fetching megaloprepus
+From ../mirror
+ * [new branch]      master     -> megaloprepus/master
+ * [new branch]      side       -> megaloprepus/side
+Fetching manduca
+From ../mirror
+ * [new branch]      master     -> manduca/master
+ * [new branch]      side       -> manduca/side
+ok 40 - update with arguments
 
 expecting success: 
-			test-tool wildmatch wildmatch 'foobar' '*ob*a*r*'
-		
-ok 93 - wildmatch: match 'foobar' '*ob*a*r*'
+	(
+		cd one &&
+		git branch -m side2 side3
+	) &&
+	(
+		cd test &&
+		git remote update --prune &&
+		(
+			cd ../one &&
+			git branch -m side3 side2
+		) &&
+		git rev-parse refs/remotes/origin/side3 &&
+		test_must_fail git rev-parse refs/remotes/origin/side2
+	)
 
-expecting success: 
-				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'
+Fetching origin
+From /build/git-2.20.1/t/trash directory.t5505-remote/one
+ - [deleted]         (none)     -> origin/side2
+ * [new branch]      side3      -> origin/side3
+Fetching two
+From ../two
+ * branch            HEAD       -> FETCH_HEAD
+2ce9c504874e3f0ce77f83c0bb0b1024c7a6387f
+fatal: ambiguous argument 'refs/remotes/origin/side2': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+refs/remotes/origin/side2
+ok 41 - update --prune
 
 expecting success: 
-			test-tool wildmatch iwildmatch 'foobar' '*ob*a*r*'
-		
-ok 95 - iwildmatch: match 'foobar' '*ob*a*r*'
+	(
+		cd one &&
+		for b in $(git branch -r)
+		do
+		git branch -r -d $b || exit 1
+		done &&
+		git config remote.drosophila.skipDefaultUpdate true &&
+		git remote update default &&
+		git branch -r >output &&
+		test_cmp expect output
+	)
 
-expecting success: 
-				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'
+Deleted remote-tracking branch drosophila/another (was 9d34b14).
+Deleted remote-tracking branch drosophila/master (was 9d34b14).
+Deleted remote-tracking branch drosophila/side (was 2ce9c50).
+Deleted remote-tracking branch manduca/master (was 6329a3c).
+Deleted remote-tracking branch manduca/side (was 2ce9c50).
+Deleted remote-tracking branch megaloprepus/master (was 6329a3c).
+Deleted remote-tracking branch megaloprepus/side (was 2ce9c50).
+Fetching apis
+From ../mirror
+ * [new branch]      master     -> apis/master
+ * [new branch]      side       -> apis/side
+Fetching manduca
+From ../mirror
+ * [new branch]      master     -> manduca/master
+ * [new branch]      side       -> manduca/side
+Fetching megaloprepus
+From ../mirror
+ * [new branch]      master     -> megaloprepus/master
+ * [new branch]      side       -> megaloprepus/side
+ok 42 - update default
 
 expecting success: 
-			test-tool wildmatch pathmatch 'foobar' '*ob*a*r*'
-		
-ok 97 - pathmatch: match 'foobar' '*ob*a*r*'
+	(
+		cd one &&
+		for b in $(git branch -r)
+		do
+		git branch -r -d $b || exit 1
+		done &&
+		git config remotes.default "$(printf "\t drosophila  \n")" &&
+		git remote update default &&
+		git branch -r >output &&
+		test_cmp expect output
+	)
 
-expecting success: 
-				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'
+Deleted remote-tracking branch apis/master (was 6329a3c).
+Deleted remote-tracking branch apis/side (was 2ce9c50).
+Deleted remote-tracking branch manduca/master (was 6329a3c).
+Deleted remote-tracking branch manduca/side (was 2ce9c50).
+Deleted remote-tracking branch megaloprepus/master (was 6329a3c).
+Deleted remote-tracking branch megaloprepus/side (was 2ce9c50).
+Fetching drosophila
+From ../two
+ * [new branch]      another    -> drosophila/another
+ * [new branch]      master     -> drosophila/master
+ * [new branch]      side       -> drosophila/side
+ok 43 - update default (overridden, with funny whitespace)
 
 expecting success: 
-			test-tool wildmatch ipathmatch 'foobar' '*ob*a*r*'
-		
-ok 99 - ipathmatch: match 'foobar' '*ob*a*r*'
+	(
+		cd one &&
+		for b in $(git branch -r)
+		do
+		git branch -r -d $b || exit 1
+		done &&
+		git config remotes.default "drosophila" &&
+		git remote update &&
+		git branch -r >output &&
+		test_cmp expect output
+	)
 
-expecting success: 
-				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'
+Deleted remote-tracking branch drosophila/another (was 9d34b14).
+Deleted remote-tracking branch drosophila/master (was 9d34b14).
+Deleted remote-tracking branch drosophila/side (was 2ce9c50).
+Fetching drosophila
+From ../two
+ * [new branch]      another    -> drosophila/another
+ * [new branch]      master     -> drosophila/master
+ * [new branch]      side       -> drosophila/side
+ok 44 - update (with remotes.default defined)
 
 expecting success: 
-		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
+	git clone one three &&
+	(
+		cd three &&
+		git remote show origin >output &&
+		! grep "^ *HEAD$" < output &&
+		! grep -i stale < output
+	)
 
-expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git 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
+Cloning into 'three'...
+done.
+ok 45 - "remote show" does not show symbolic refs
 
 expecting success: 
-			test-tool wildmatch wildmatch 'aaaaaaabababab' '*ab'
-		
-ok 103 - wildmatch: match 'aaaaaaabababab' '*ab'
+	test_must_fail git remote add some:url desired-name
 
-expecting success: 
-				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'
+fatal: 'some:url' is not a valid remote name
+ok 46 - reject adding remote with an invalid name
 
 expecting success: 
-			test-tool wildmatch iwildmatch 'aaaaaaabababab' '*ab'
-		
-ok 105 - iwildmatch: match 'aaaaaaabababab' '*ab'
+	git clone one four &&
+	(
+		cd four &&
+		git remote rename origin upstream &&
+		test -z "$(git for-each-ref refs/remotes/origin)" &&
+		test "$(git symbolic-ref refs/remotes/upstream/HEAD)" = "refs/remotes/upstream/master" &&
+		test "$(git rev-parse upstream/master)" = "$(git rev-parse master)" &&
+		test "$(git config remote.upstream.fetch)" = "+refs/heads/*:refs/remotes/upstream/*" &&
+		test "$(git config branch.master.remote)" = "upstream"
+	)
 
-expecting success: 
-				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'
+Cloning into 'four'...
+done.
+ok 47 - rename a remote
 
 expecting success: 
-			test-tool wildmatch pathmatch 'aaaaaaabababab' '*ab'
-		
-ok 107 - pathmatch: match 'aaaaaaabababab' '*ab'
+	git clone one four.one &&
+	(
+		cd four.one &&
+		git config remote.origin.fetch +refs/heads/*:refs/heads/origin/* &&
+		git remote rename origin upstream &&
+		test "$(git config remote.upstream.fetch)" = "+refs/heads/*:refs/heads/origin/*" &&
+		git rev-parse -q origin/master
+	)
 
-expecting success: 
-				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'
+Cloning into 'four.one'...
+done.
+warning: Not updating non-default fetch refspec
+	+refs/heads/*:refs/heads/origin/*
+	Please update the configuration manually if necessary.
+6329a3ca5268a0b28a1dc29b602e8b72a0bc1b37
+ok 48 - rename does not update a non-default fetch refspec
 
 expecting success: 
-			test-tool wildmatch ipathmatch 'aaaaaaabababab' '*ab'
-		
-ok 109 - ipathmatch: match 'aaaaaaabababab' '*ab'
+	git clone one four.two &&
+	(
+		cd four.two &&
+		git remote rename origin remote &&
+		git remote rename remote upstream &&
+		test "$(git config remote.upstream.fetch)" = "+refs/heads/*:refs/remotes/upstream/*"
+	)
 
-expecting success: 
-				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'
+Cloning into 'four.two'...
+done.
+ok 49 - rename a remote with name part of fetch spec
 
 expecting success: 
-		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
+	git clone one four.three &&
+	(
+		cd four.three &&
+		git remote add o git://example.com/repo.git &&
+		git remote rename o upstream &&
+		test "$(git rev-parse origin/master)" = "$(git rev-parse master)"
+	)
 
-expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git 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*
+Cloning into 'four.three'...
+done.
+ok 50 - rename a remote with name prefix of other remote
 
 expecting success: 
-			test-tool wildmatch wildmatch 'foo*' 'foo\*'
-		
-ok 113 - wildmatch: match 'foo*' 'foo\*'
+	git clone one four.four &&
+	test_when_finished git config --global --unset remote.upstream.prune &&
+	git config --global remote.upstream.prune true &&
+	git -C four.four remote rename origin upstream
 
-expecting success: 
-				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*'
+Cloning into 'four.four'...
+done.
+ok 51 - rename succeeds with existing remote.<target>.prune
 
 expecting success: 
-			test-tool wildmatch iwildmatch 'foo*' 'foo\*'
-		
-ok 115 - iwildmatch: match 'foo*' 'foo\*'
+	git clone one five &&
+	origin_url=$(pwd)/one &&
+	(
+		cd five &&
+		git remote remove origin &&
+		mkdir -p .git/remotes &&
+		cat ../remotes_origin >.git/remotes/origin &&
+		git remote rename origin origin &&
+		test_path_is_missing .git/remotes/origin &&
+		test "$(git config remote.origin.url)" = "$origin_url" &&
+		cat >push_expected <<-\EOF &&
+		refs/heads/master:refs/heads/upstream
+		refs/heads/next:refs/heads/upstream2
+		EOF
+		cat >fetch_expected <<-\EOF &&
+		refs/heads/master:refs/heads/origin
+		refs/heads/next:refs/heads/origin2
+		EOF
+		git config --get-all remote.origin.push >push_actual &&
+		git config --get-all remote.origin.fetch >fetch_actual &&
+		test_cmp push_expected push_actual &&
+		test_cmp fetch_expected fetch_actual
+	)
 
-expecting success: 
-				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*'
+Cloning into 'five'...
+done.
+ok 52 - migrate a remote from named file in $GIT_DIR/remotes
 
 expecting success: 
-			test-tool wildmatch pathmatch 'foo*' 'foo\*'
-		
-ok 117 - pathmatch: match 'foo*' 'foo\*'
+	git clone one six &&
+	origin_url=$(pwd)/one &&
+	(
+		cd six &&
+		git remote rm origin &&
+		echo "$origin_url" >.git/branches/origin &&
+		git remote rename origin origin &&
+		test_path_is_missing .git/branches/origin &&
+		test "$(git config remote.origin.url)" = "$origin_url" &&
+		test "$(git config remote.origin.fetch)" = "refs/heads/master:refs/heads/origin" &&
+		test "$(git config remote.origin.push)" = "HEAD:refs/heads/master"
+	)
 
-expecting success: 
-				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*'
+Cloning into 'six'...
+done.
+ok 53 - migrate a remote from named file in $GIT_DIR/branches
 
 expecting success: 
-			test-tool wildmatch ipathmatch 'foo*' 'foo\*'
-		
-ok 119 - ipathmatch: match 'foo*' 'foo\*'
+	git clone one seven &&
+	(
+		cd seven &&
+		git remote rm origin &&
+		echo "quux#foom" > .git/branches/origin &&
+		git remote rename origin origin &&
+		test_path_is_missing .git/branches/origin &&
+		test "$(git config remote.origin.url)" = "quux" &&
+		test "$(git config remote.origin.fetch)" = "refs/heads/foom:refs/heads/origin" &&
+		test "$(git config remote.origin.push)" = "HEAD:refs/heads/foom"
+	)
 
-expecting success: 
-				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*'
+Cloning into 'seven'...
+done.
+ok 54 - migrate a remote from named file in $GIT_DIR/branches (2)
 
 expecting success: 
-		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
+	git clone one eight &&
+	(
+		cd one &&
+		git checkout side2 &&
+		git branch -D master
+	) &&
+	(
+		cd eight &&
+		git remote prune origin
+	) >err 2>&1 &&
+	test_i18ngrep "has become dangling" err &&
 
-expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git 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
+	: And the dangling symref will not cause other annoying errors &&
+	(
+		cd eight &&
+		git branch -a
+	) 2>err &&
+	! grep "points nowhere" err &&
+	(
+		cd eight &&
+		test_must_fail git branch nomore origin
+	) 2>err &&
+	test_i18ngrep "dangling symref" err
 
-expecting success: 
-			test_must_fail test-tool wildmatch wildmatch 'foobar' 'foo\*bar'
-		
-ok 123 - wildmatch: no match 'foobar' 'foo\*bar'
+Cloning into 'eight'...
+done.
+Switched to branch 'side2'
+Deleted branch master (was 6329a3c).
+ refs/remotes/origin/HEAD has become dangling!
+* master
+  remotes/origin/side2
+warning: ignoring dangling symref refs/remotes/origin/HEAD
+ok 55 - remote prune to cause a dangling symref
 
 expecting success: 
-				>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'
+	test_create_repo empty &&
+	git clone empty empty-clone &&
+	(
+		cd empty-clone &&
+		git remote show origin
+	)
 
-expecting success: 
-			test_must_fail test-tool wildmatch iwildmatch 'foobar' 'foo\*bar'
-		
-ok 125 - iwildmatch: no match 'foobar' 'foo\*bar'
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5505-remote/empty/.git/
+Cloning into 'empty-clone'...
+warning: You appear to have cloned an empty repository.
+done.
+* remote origin
+  Fetch URL: /build/git-2.20.1/t/trash directory.t5505-remote/empty
+  Push  URL: /build/git-2.20.1/t/trash directory.t5505-remote/empty
+  HEAD branch: (unknown)
+  Local branch configured for 'git pull':
+    master merges with remote master
+ok 56 - show empty remote
 
 expecting success: 
-				>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'
+	test_must_fail git remote set-branches &&
+	test_must_fail git remote set-branches --add
 
-expecting success: 
-			test_must_fail test-tool wildmatch pathmatch 'foobar' 'foo\*bar'
-		
-ok 127 - pathmatch: no match 'foobar' 'foo\*bar'
+error: no remote specified
+usage: git remote set-branches <name> <branch>...
+   or: git remote set-branches --add <name> <branch>...
 
-expecting success: 
-				>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'
+    --add                 add branch
 
-expecting success: 
-			test_must_fail test-tool wildmatch ipathmatch 'foobar' 'foo\*bar'
-		
-ok 129 - ipathmatch: no match 'foobar' 'foo\*bar'
+error: no remote specified
+usage: git remote set-branches <name> <branch>...
+   or: git remote set-branches --add <name> <branch>...
 
-expecting success: 
-				>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'
+    --add                 add branch
 
-expecting success: 
-		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
+ok 57 - remote set-branches requires a remote
 
 expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git 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
+	echo "+refs/heads/*:refs/remotes/scratch/*" >expect.initial &&
+	sort <<-\EOF >expect.add &&
+	+refs/heads/*:refs/remotes/scratch/*
+	+refs/heads/other:refs/remotes/scratch/other
+	EOF
+	sort <<-\EOF >expect.replace &&
+	+refs/heads/maint:refs/remotes/scratch/maint
+	+refs/heads/master:refs/remotes/scratch/master
+	+refs/heads/next:refs/remotes/scratch/next
+	EOF
+	sort <<-\EOF >expect.add-two &&
+	+refs/heads/maint:refs/remotes/scratch/maint
+	+refs/heads/master:refs/remotes/scratch/master
+	+refs/heads/next:refs/remotes/scratch/next
+	+refs/heads/pu:refs/remotes/scratch/pu
+	+refs/heads/t/topic:refs/remotes/scratch/t/topic
+	EOF
+	sort <<-\EOF >expect.setup-ffonly &&
+	refs/heads/master:refs/remotes/scratch/master
+	+refs/heads/next:refs/remotes/scratch/next
+	EOF
+	sort <<-\EOF >expect.respect-ffonly &&
+	refs/heads/master:refs/remotes/scratch/master
+	+refs/heads/next:refs/remotes/scratch/next
+	+refs/heads/pu:refs/remotes/scratch/pu
+	EOF
 
-expecting success: 
-			test-tool wildmatch wildmatch 'f\oo' 'f\\oo'
-		
-ok 133 - wildmatch: match 'f\oo' 'f\\oo'
+	git clone .git/ setbranches &&
+	(
+		cd setbranches &&
+		git remote rename origin scratch &&
+		git config --get-all remote.scratch.fetch >config-result &&
+		sort <config-result >../actual.initial &&
 
-expecting success: 
-				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 remote set-branches scratch --add other &&
+		git config --get-all remote.scratch.fetch >config-result &&
+		sort <config-result >../actual.add &&
 
-expecting success: 
-			test-tool wildmatch iwildmatch 'f\oo' 'f\\oo'
-		
-ok 135 - iwildmatch: match 'f\oo' 'f\\oo'
+		git remote set-branches scratch maint master next &&
+		git config --get-all remote.scratch.fetch >config-result &&
+		sort <config-result >../actual.replace &&
 
-expecting success: 
-				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'
+		git remote set-branches --add scratch pu t/topic &&
+		git config --get-all remote.scratch.fetch >config-result &&
+		sort <config-result >../actual.add-two &&
 
-expecting success: 
-			test-tool wildmatch pathmatch 'f\oo' 'f\\oo'
-		
-ok 137 - pathmatch: match 'f\oo' 'f\\oo'
+		git config --unset-all remote.scratch.fetch &&
+		git config remote.scratch.fetch \
+			refs/heads/master:refs/remotes/scratch/master &&
+		git config --add remote.scratch.fetch \
+			+refs/heads/next:refs/remotes/scratch/next &&
+		git config --get-all remote.scratch.fetch >config-result &&
+		sort <config-result >../actual.setup-ffonly &&
 
-expecting success: 
-				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 remote set-branches --add scratch pu &&
+		git config --get-all remote.scratch.fetch >config-result &&
+		sort <config-result >../actual.respect-ffonly
+	) &&
+	test_cmp expect.initial actual.initial &&
+	test_cmp expect.add actual.add &&
+	test_cmp expect.replace actual.replace &&
+	test_cmp expect.add-two actual.add-two &&
+	test_cmp expect.setup-ffonly actual.setup-ffonly &&
+	test_cmp expect.respect-ffonly actual.respect-ffonly
 
-expecting success: 
-			test-tool wildmatch ipathmatch 'f\oo' 'f\\oo'
-		
-ok 139 - ipathmatch: match 'f\oo' 'f\\oo'
+Cloning into 'setbranches'...
+warning: You appear to have cloned an empty repository.
+done.
+ok 58 - remote set-branches
 
 expecting success: 
-				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'
+	echo "+refs/*:refs/*" >expect.initial &&
+	echo "+refs/heads/master:refs/heads/master" >expect.replace &&
+	git clone --mirror .git/ setbranches-mirror &&
+	(
+		cd setbranches-mirror &&
+		git remote rename origin scratch &&
+		git config --get-all remote.scratch.fetch >../actual.initial &&
 
-expecting success: 
-		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
+		git remote set-branches scratch heads/master &&
+		git config --get-all remote.scratch.fetch >../actual.replace
+	) &&
+	test_cmp expect.initial actual.initial &&
+	test_cmp expect.replace actual.replace
 
-expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git 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
+Cloning into bare repository 'setbranches-mirror'...
+warning: You appear to have cloned an empty repository.
+done.
+warning: Not updating non-default fetch refspec
+	+refs/*:refs/*
+	Please update the configuration manually if necessary.
+ok 59 - remote set-branches with --mirror
 
 expecting success: 
-			test-tool wildmatch wildmatch 'ball' '*[al]?'
-		
-ok 143 - wildmatch: match 'ball' '*[al]?'
+	git remote add someremote foo &&
+	echo foo >expect &&
+	git config --get-all remote.someremote.url >actual &&
+	cmp expect actual
 
-expecting success: 
-				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'
+ok 60 - new remote
 
 expecting success: 
-			test-tool wildmatch iwildmatch 'ball' '*[al]?'
-		
-ok 145 - iwildmatch: match 'ball' '*[al]?'
+	echo foo | get_url_test someremote &&
+	echo foo | get_url_test --all someremote &&
+	echo foo | get_url_test --push someremote &&
+	echo foo | get_url_test --push --all someremote
 
-expecting success: 
-				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'
+ok 61 - get-url on new remote
 
 expecting success: 
-			test-tool wildmatch pathmatch 'ball' '*[al]?'
-		
-ok 147 - pathmatch: match 'ball' '*[al]?'
+	test_when_finished "rm -f .git/config.lock" &&
+	git config --get-all remote.someremote.url >expect &&
+	>.git/config.lock &&
+	test_must_fail git remote set-url someremote baz &&
+	git config --get-all remote.someremote.url >actual &&
+	cmp expect actual
 
-expecting success: 
-				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'
+error: could not lock config file .git/config: File exists
+fatal: could not set 'remote.someremote.url' to 'baz'
+ok 62 - remote set-url with locked config
 
 expecting success: 
-			test-tool wildmatch ipathmatch 'ball' '*[al]?'
-		
-ok 149 - ipathmatch: match 'ball' '*[al]?'
+	git remote set-url someremote bar &&
+	echo bar >expect &&
+	git config --get-all remote.someremote.url >actual &&
+	cmp expect actual
 
-expecting success: 
-				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'
+ok 63 - remote set-url bar
 
 expecting success: 
-		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
+	git remote set-url someremote baz bar &&
+	echo baz >expect &&
+	git config --get-all remote.someremote.url >actual &&
+	cmp expect actual
+
+ok 64 - remote set-url baz bar
 
 expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git 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
+	test_must_fail git remote set-url someremote zot bar &&
+	echo baz >expect &&
+	git config --get-all remote.someremote.url >actual &&
+	cmp expect actual
+
+fatal: No such URL found: bar
+ok 65 - remote set-url zot bar
 
 expecting success: 
-			test_must_fail test-tool wildmatch wildmatch 'ten' '[ten]'
-		
-ok 153 - wildmatch: no match 'ten' '[ten]'
+	test_must_fail git remote set-url --push someremote zot baz &&
+	echo "YYY" >expect &&
+	echo baz >>expect &&
+	test_must_fail git config --get-all remote.someremote.pushurl >actual &&
+	echo "YYY" >>actual &&
+	git config --get-all remote.someremote.url >>actual &&
+	cmp expect actual
+
+fatal: No such URL found: baz
+ok 66 - remote set-url --push zot baz
 
 expecting success: 
-				>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'
+	git remote set-url --push someremote zot &&
+	echo zot >expect &&
+	echo "YYY" >>expect &&
+	echo baz >>expect &&
+	git config --get-all remote.someremote.pushurl >actual &&
+	echo "YYY" >>actual &&
+	git config --get-all remote.someremote.url >>actual &&
+	cmp expect actual
+
+ok 67 - remote set-url --push zot
 
 expecting success: 
-			test_must_fail test-tool wildmatch iwildmatch 'ten' '[ten]'
-		
-ok 155 - iwildmatch: no match 'ten' '[ten]'
+	echo baz | get_url_test someremote &&
+	echo baz | get_url_test --all someremote &&
+	echo zot | get_url_test --push someremote &&
+	echo zot | get_url_test --push --all someremote
+
+ok 68 - get-url with different urls
 
 expecting success: 
-				>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'
+	git remote set-url --push someremote qux zot &&
+	echo qux >expect &&
+	echo "YYY" >>expect &&
+	echo baz >>expect &&
+	git config --get-all remote.someremote.pushurl >actual &&
+	echo "YYY" >>actual &&
+	git config --get-all remote.someremote.url >>actual &&
+	cmp expect actual
+
+ok 69 - remote set-url --push qux zot
 
 expecting success: 
-			test_must_fail test-tool wildmatch pathmatch 'ten' '[ten]'
-		
-ok 157 - pathmatch: no match 'ten' '[ten]'
+	git remote set-url --push someremote foo qu+x &&
+	echo foo >expect &&
+	echo "YYY" >>expect &&
+	echo baz >>expect &&
+	git config --get-all remote.someremote.pushurl >actual &&
+	echo "YYY" >>actual &&
+	git config --get-all remote.someremote.url >>actual &&
+	cmp expect actual
+
+ok 70 - remote set-url --push foo qu+x
 
 expecting success: 
-				>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'
+	git remote set-url --push --add someremote aaa &&
+	echo foo >expect &&
+	echo aaa >>expect &&
+	echo "YYY" >>expect &&
+	echo baz >>expect &&
+	git config --get-all remote.someremote.pushurl >actual &&
+	echo "YYY" >>actual &&
+	git config --get-all remote.someremote.url >>actual &&
+	cmp expect actual
+
+ok 71 - remote set-url --push --add aaa
 
 expecting success: 
-			test_must_fail test-tool wildmatch ipathmatch 'ten' '[ten]'
-		
-ok 159 - ipathmatch: no match 'ten' '[ten]'
+	echo foo | get_url_test --push someremote &&
+	get_url_test --push --all someremote <<-\EOF
+	foo
+	aaa
+	EOF
+
+ok 72 - get-url on multi push remote
 
 expecting success: 
-				>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'
+	git remote set-url --push someremote bar aaa &&
+	echo foo >expect &&
+	echo bar >>expect &&
+	echo "YYY" >>expect &&
+	echo baz >>expect &&
+	git config --get-all remote.someremote.pushurl >actual &&
+	echo "YYY" >>actual &&
+	git config --get-all remote.someremote.url >>actual &&
+	cmp expect actual
+
+ok 73 - remote set-url --push bar aaa
 
 expecting success: 
-		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
+	git remote set-url --push --delete someremote bar &&
+	echo foo >expect &&
+	echo "YYY" >>expect &&
+	echo baz >>expect &&
+	git config --get-all remote.someremote.pushurl >actual &&
+	echo "YYY" >>actual &&
+	git config --get-all remote.someremote.url >>actual &&
+	cmp expect actual
+
+ok 74 - remote set-url --push --delete bar
 
 expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git 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
+	git remote set-url --push --delete someremote foo &&
+	echo "YYY" >expect &&
+	echo baz >>expect &&
+	test_must_fail git config --get-all remote.someremote.pushurl >actual &&
+	echo "YYY" >>actual &&
+	git config --get-all remote.someremote.url >>actual &&
+	cmp expect actual
+
+ok 75 - remote set-url --push --delete foo
 
 expecting success: 
-			test-tool wildmatch wildmatch 'ten' '**[!te]'
-		
-ok 163 - wildmatch: match 'ten' '**[!te]'
+	git remote set-url --add someremote bbb &&
+	echo "YYY" >expect &&
+	echo baz >>expect &&
+	echo bbb >>expect &&
+	test_must_fail git config --get-all remote.someremote.pushurl >actual &&
+	echo "YYY" >>actual &&
+	git config --get-all remote.someremote.url >>actual &&
+	cmp expect actual
+
+ok 76 - remote set-url --add bbb
 
 expecting success: 
-				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'
+	echo baz | get_url_test someremote &&
+	get_url_test --all someremote <<-\EOF
+	baz
+	bbb
+	EOF
+
+ok 77 - get-url on multi fetch remote
 
 expecting success: 
-			test-tool wildmatch iwildmatch 'ten' '**[!te]'
-		
-ok 165 - iwildmatch: match 'ten' '**[!te]'
+	test_must_fail git remote set-url --delete someremote .\* &&
+	echo "YYY" >expect &&
+	echo baz >>expect &&
+	echo bbb >>expect &&
+	test_must_fail git config --get-all remote.someremote.pushurl >actual &&
+	echo "YYY" >>actual &&
+	git config --get-all remote.someremote.url >>actual &&
+	cmp expect actual
+
+fatal: Will not delete all non-push URLs
+ok 78 - remote set-url --delete .*
 
 expecting success: 
-				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'
+	git remote set-url --delete someremote bbb &&
+	echo "YYY" >expect &&
+	echo baz >>expect &&
+	test_must_fail git config --get-all remote.someremote.pushurl >actual &&
+	echo "YYY" >>actual &&
+	git config --get-all remote.someremote.url >>actual &&
+	cmp expect actual
+
+ok 79 - remote set-url --delete bbb
 
 expecting success: 
-			test-tool wildmatch pathmatch 'ten' '**[!te]'
-		
-ok 167 - pathmatch: match 'ten' '**[!te]'
+	test_must_fail git remote set-url --delete someremote baz &&
+	echo "YYY" >expect &&
+	echo baz >>expect &&
+	test_must_fail git config --get-all remote.someremote.pushurl >actual &&
+	echo "YYY" >>actual &&
+	git config --get-all remote.someremote.url >>actual &&
+	cmp expect actual
+
+fatal: Will not delete all non-push URLs
+ok 80 - remote set-url --delete baz
 
 expecting success: 
-				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'
+	git remote set-url --add someremote ccc &&
+	echo "YYY" >expect &&
+	echo baz >>expect &&
+	echo ccc >>expect &&
+	test_must_fail git config --get-all remote.someremote.pushurl >actual &&
+	echo "YYY" >>actual &&
+	git config --get-all remote.someremote.url >>actual &&
+	cmp expect actual
+
+ok 81 - remote set-url --add ccc
 
 expecting success: 
-			test-tool wildmatch ipathmatch 'ten' '**[!te]'
-		
-ok 169 - ipathmatch: match 'ten' '**[!te]'
+	git remote set-url --delete someremote baz &&
+	echo "YYY" >expect &&
+	echo ccc >>expect &&
+	test_must_fail git config --get-all remote.someremote.pushurl >actual &&
+	echo "YYY" >>actual &&
+	git config --get-all remote.someremote.url >>actual &&
+	cmp expect actual
+
+ok 82 - remote set-url --delete baz
 
 expecting success: 
-				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'
+	# add a dummy origin so that this does not trigger failure
+	git remote add origin .
+
+ok 83 - extra args: setup
 
 expecting success: 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
+		test_must_fail git remote add nick url bogus_extra_arg 2>actual &&
+		test_i18ngrep '^usage:' actual
 	
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-Removing ten
-ok 171 - cleanup after previous file test
+usage: git remote add [<options>] <name> <url>
+ok 84 - extra args: add nick url
 
 expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
+		test_must_fail git remote rename origin newname bogus_extra_arg 2>actual &&
+		test_i18ngrep '^usage:' actual
 	
-ok 172 - setup match file test for ten
+usage: git remote rename <old> <new>
+ok 85 - extra args: rename origin newname
 
 expecting success: 
-			test_must_fail test-tool wildmatch wildmatch 'ten' '**[!ten]'
-		
-ok 173 - wildmatch: no match 'ten' '**[!ten]'
+		test_must_fail git remote remove origin bogus_extra_arg 2>actual &&
+		test_i18ngrep '^usage:' actual
+	
+usage: git remote remove <name>
+ok 86 - extra args: remove origin
 
 expecting success: 
-				>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'
+		test_must_fail git remote set-head origin master bogus_extra_arg 2>actual &&
+		test_i18ngrep '^usage:' actual
+	
+usage: git remote set-head <name> (-a | --auto | -d | --delete | <branch>)
+ok 87 - extra args: set-head origin master
 
 expecting success: 
-			test_must_fail test-tool wildmatch iwildmatch 'ten' '**[!ten]'
-		
-ok 175 - iwildmatch: no match 'ten' '**[!ten]'
+		test_must_fail git remote get-url origin newurl bogus_extra_arg 2>actual &&
+		test_i18ngrep '^usage:' actual
+	
+usage: git remote get-url [--push] [--all] <name>
+ok 88 - extra args: get-url origin newurl
 
 expecting success: 
-				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '**[!ten]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 176 - iwildmatch (via ls-files): no match '**[!ten]' 'ten'
+		test_must_fail git remote set-url origin newurl oldurl bogus_extra_arg 2>actual &&
+		test_i18ngrep '^usage:' actual
+	
+usage: git remote set-url [--push] <name> <newurl> [<oldurl>]
+ok 89 - extra args: set-url origin newurl oldurl
 
 expecting success: 
-			test_must_fail test-tool wildmatch pathmatch 'ten' '**[!ten]'
-		
-ok 177 - pathmatch: no match 'ten' '**[!ten]'
+	git config url.xyz@example.com.insteadOf backup &&
+	git remote add backup xyz@example.com
 
+ok 90 - add remote matching the "insteadOf" URL
+
+# passed all 90 test(s)
+1..90
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t5539-fetch-http-shallow.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5539-fetch-http-shallow/.git/
+checking prerequisite: NOT_ROOT
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
+	uid=$(id -u) &&
+	test "$uid" != 0
+
+)
+prerequisite NOT_ROOT ok
+1..0 # SKIP no web server found at '/usr/sbin/apache2'
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t5540-http-push-webdav.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5540-http-push-webdav/.git/
+checking prerequisite: NOT_ROOT
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
+	uid=$(id -u) &&
+	test "$uid" != 0
+
+)
+prerequisite NOT_ROOT ok
+1..0 # SKIP no web server found at '/usr/sbin/apache2'
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t5541-http-push-smart.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5541-http-push-smart/.git/
+checking prerequisite: NOT_ROOT
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
+	uid=$(id -u) &&
+	test "$uid" != 0
+
+)
+prerequisite NOT_ROOT ok
+1..0 # SKIP no web server found at '/usr/sbin/apache2'
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t5542-push-http-shallow.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5542-push-http-shallow/.git/
+checking prerequisite: NOT_ROOT
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
+	uid=$(id -u) &&
+	test "$uid" != 0
+
+)
+prerequisite NOT_ROOT ok
+1..0 # SKIP no web server found at '/usr/sbin/apache2'
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t5538-push-shallow.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5538-push-shallow/.git/
 expecting success: 
-				>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'
+	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
+
+[master (root-commit) 79a4b72] 1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 tracked
+[master 5cd449e] 2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[master acb54bb] 3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[master ed2ec4d] 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/git-2.20.1/t/trash directory.t5538-push-shallow/full-abc/.git/
+[master (root-commit) a5a62fa] a
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 tracked
+[master 4aeff11] b
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[master 2f5f728] c
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Cloning into 'shallow'...
+Cloning into 'shallow2'...
+ok 1 - setup
 
 expecting success: 
-			test_must_fail test-tool wildmatch ipathmatch 'ten' '**[!ten]'
-		
-ok 179 - ipathmatch: no match 'ten' '**[!ten]'
+	(
+	cd shallow &&
+	commit 5 &&
+	git push ../.git +master:refs/remotes/shallow/master
+	) &&
+	git log --format=%s shallow/master >actual &&
+	git fsck &&
+	cat <<EOF >expect &&
+5
+4
+3
+2
+1
+EOF
+	test_cmp expect actual
+
+[master 67eff3f] 5
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+To ../.git
+ * [new branch]      master -> shallow/master
+ok 2 - push from shallow clone
 
 expecting success: 
-				>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'
+	(
+	cd shallow2 &&
+	test_must_fail git push ../.git +master:refs/remotes/shallow2/master 2>err &&
+	grep "shallow2/master.*shallow update not allowed" err
+	) &&
+	test_must_fail git rev-parse shallow2/master &&
+	git fsck
+
+ ! [remote rejected] master -> shallow2/master (shallow update not allowed)
+fatal: ambiguous argument 'shallow2/master': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+shallow2/master
+dangling commit 2f5f728a8aca9e3d464080044479b7bc5318e923
+ok 3 - push from shallow clone, with grafted roots
 
 expecting success: 
-		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
+	test_config receive.shallowupdate true &&
+	(
+	cd shallow2 &&
+	git push ../.git +master:refs/remotes/shallow2/master
+	) &&
+	git log --format=%s shallow2/master >actual &&
+	git fsck &&
+	cat <<EOF >expect &&
+c
+b
+EOF
+	test_cmp expect actual
+
+error: Could not read a5a62faf4710d25cd4056d1b8fa2c27189d34429
+To ../.git
+ * [new branch]      master -> shallow2/master
+ok 4 - add new shallow root with receive.updateshallow on
 
 expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git 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
+	(
+	cd shallow &&
+	git --git-dir=../shallow2/.git config receive.shallowupdate true &&
+	git push ../shallow2/.git +master:refs/remotes/shallow/master &&
+	git --git-dir=../shallow2/.git config receive.shallowupdate false
+	) &&
+	(
+	cd shallow2 &&
+	git log --format=%s shallow/master >actual &&
+	git fsck &&
+	cat <<EOF >expect &&
+5
+4
+3
+EOF
+	test_cmp expect actual
+	)
+
+To ../shallow2/.git
+ * [new branch]      master -> shallow/master
+ok 5 - push from shallow to shallow
 
 expecting success: 
-			test-tool wildmatch wildmatch 'ten' 't[a-g]n'
-		
-ok 183 - wildmatch: match 'ten' 't[a-g]n'
+	! git --git-dir=shallow2/.git cat-file blob $(echo 1|git hash-object --stdin) &&
+	commit 1 &&
+	git push shallow2/.git +master:refs/remotes/top/master &&
+	(
+	cd shallow2 &&
+	git log --format=%s top/master >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
+[master 4630771] 1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+To shallow2/.git
+ * [new branch]      master -> top/master
+ok 6 - push from full to shallow
 
+# passed all 6 test(s)
+1..6
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t5528-push-default.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5528-push-default/.git/
 expecting success: 
-				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'
+	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/git-2.20.1/t/trash directory.t5528-push-default/repo1/
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5528-push-default/repo2/
+[master (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 -> master
+To repo2
+ * [new branch]      HEAD -> master
+ok 1 - setup bare remotes
 
 expecting success: 
-			test-tool wildmatch iwildmatch 'ten' 't[a-g]n'
-		
-ok 185 - iwildmatch: match 'ten' 't[a-g]n'
+	git checkout master &&
+	test_config branch.master.remote parent1 &&
+	test_config branch.master.merge refs/heads/foo &&
+	test_commit two &&
+	test_push_success upstream foo
+
+Already on 'master'
+[master 139b20d] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+To repo1
+ * [new branch]      master -> foo
+ok 2 - "upstream" pushes to configured upstream
 
 expecting success: 
-				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'
+	git checkout master &&
+	test_unconfig branch.master.remote &&
+	test_commit three &&
+	test_push_failure upstream
+
+Already on 'master'
+[master 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: 
-			test-tool wildmatch pathmatch 'ten' 't[a-g]n'
-		
-ok 187 - pathmatch: match 'ten' 't[a-g]n'
+	git checkout master &&
+	test_config branch.master.remote parent1 &&
+	test_unconfig branch.master.merge &&
+	test_commit four &&
+	test_push_failure upstream
+
+Already on 'master'
+[master fd8d77e] four
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 four.t
+fatal: The current branch master has no upstream branch.
+To push the current branch and set the remote as upstream, use
+
+    git push --set-upstream parent1 master
+
+ok 4 - "upstream" does not push on unconfigured branch
 
 expecting success: 
-				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'
+	git checkout master &&
+	test_config branch.master.remote parent1 &&
+	test_config branch.master.merge refs/heads/foo &&
+	test_config push.default upstream &&
+	test_commit five &&
+	test_must_fail git push parent2
+
+Already on 'master'
+[master 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 'master', without telling me what to push
+to update which remote branch.
+ok 5 - "upstream" does not push when remotes do not match
 
 expecting success: 
-			test-tool wildmatch ipathmatch 'ten' 't[a-g]n'
-		
-ok 189 - ipathmatch: match 'ten' 't[a-g]n'
+	git checkout -b new-branch &&
+	test_push_failure simple &&
+	test_push_failure matching &&
+	test_push_failure upstream
+
+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>
+
+ok 6 - push from/to new branch with upstream, matching and simple
 
 expecting success: 
-				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'
+	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
+To repo1
+   d79ce16..a383792  master -> master
+Everything up-to-date
+ok 7 - push ambiguously named branch with upstream, matching and simple
 
 expecting success: 
-		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
+	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 8 - push from/to new branch with current creates remote branch
 
 expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 192 - setup match file test for ten
+	test_config branch.master.remote repo1 &&
+	git checkout master &&
+	test_push_failure simple &&
+	test_push_failure upstream
+
+Switched to branch 'master'
+fatal: The current branch master has no upstream branch.
+To push the current branch and set the remote as upstream, use
+
+    git push --set-upstream repo1 master
+
+fatal: The current branch master has no upstream branch.
+To push the current branch and set the remote as upstream, use
+
+    git push --set-upstream repo1 master
+
+ok 9 - push to existing branch, with no upstream configured
 
 expecting success: 
-			test_must_fail test-tool wildmatch wildmatch 'ten' 't[!a-g]n'
-		
-ok 193 - wildmatch: no match 'ten' 't[!a-g]n'
+	test_config branch.master.remote repo1 &&
+	test_config branch.master.merge refs/heads/master &&
+	git checkout master &&
+	test_commit six &&
+	test_push_success upstream master &&
+	test_commit seven &&
+	test_push_success simple master
+
+Already on 'master'
+[master 5891a38] six
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 six.t
+To repo1
+   a383792..5891a38  master -> master
+[master c9b0832] seven
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 seven.t
+To repo1
+   5891a38..c9b0832  master -> master
+ok 10 - push to existing branch, upstream configured with same name
 
 expecting success: 
-				>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'
+	test_config branch.master.remote repo1 &&
+	test_config branch.master.merge refs/heads/other-name &&
+	git checkout master &&
+	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 master &&
+	git --git-dir=repo1 log -1 --format="%h %s" "other-name" >actual-other-name &&
+	test_cmp expect-other-name actual-other-name
+
+Already on 'master'
+[master 6d8952b] eight
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 eight.t
+To repo1
+ * [new branch]      master -> other-name
+[master e7406c7] 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 repo1
+   c9b0832..e7406c7  master -> master
+ok 11 - push to existing branch, upstream configured with different name
 
 expecting success: 
-			test_must_fail test-tool wildmatch iwildmatch 'ten' 't[!a-g]n'
-		
-ok 195 - iwildmatch: no match 'ten' 't[!a-g]n'
+		test_config branch.master.remote parent1 &&
+		test_config branch.master.merge refs/heads/foo &&
+		test_config remote.pushdefault parent1 &&
+		test_commit commit-for-current &&
+		test_push_success current master 
+	
+[master f3846c5] commit-for-current
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 commit-for-current.t
+To repo1
+   e7406c7..f3846c5  master -> master
+ok 12 - push.default = current success in central workflows
 
 expecting success: 
-				>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'
+		test_config branch.master.remote parent1 &&
+		test_config branch.master.merge refs/heads/foo &&
+		test_config remote.pushdefault parent1 &&
+		test_commit commit-for-upstream &&
+		test_push_success upstream foo 
+	
+[master 4cda86c] 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..4cda86c  master -> foo
+ok 13 - push.default = upstream success in central workflows
 
 expecting success: 
-			test_must_fail test-tool wildmatch pathmatch 'ten' 't[!a-g]n'
-		
-ok 197 - pathmatch: no match 'ten' 't[!a-g]n'
+		test_config branch.master.remote parent1 &&
+		test_config branch.master.merge refs/heads/foo &&
+		test_config remote.pushdefault parent1 &&
+		test_commit commit-for-simple &&
+		test_push_failure simple master 
+	
+[master c70813c] 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
+
+ok 14 - push.default = simple failure in central workflows
 
 expecting success: 
-				>expect &&
-				git ls-files -z -- 't[!a-g]n' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 198 - pathmatch (via ls-files): no match 't[!a-g]n' 'ten'
+		test_config branch.master.remote parent1 &&
+		test_config branch.master.merge refs/heads/foo &&
+		test_config remote.pushdefault parent1 &&
+		test_commit commit-for-matching &&
+		test_push_success matching master 
+	
+[master 5b5f0b1] commit-for-matching
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 commit-for-matching.t
+To repo1
+   f3846c5..5b5f0b1  master -> master
+ok 15 - push.default = matching success in central workflows
 
 expecting success: 
-			test_must_fail test-tool wildmatch ipathmatch 'ten' 't[!a-g]n'
-		
-ok 199 - ipathmatch: no match 'ten' 't[!a-g]n'
+		test_config branch.master.remote parent1 &&
+		test_config branch.master.merge refs/heads/foo &&
+		test_config remote.pushdefault parent2 &&
+		test_commit commit-for-current-triangular &&
+		test_push_success current master repo2
+	
+[master 851f765] 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
+   d79ce16..851f765  master -> master
+ok 16 - push.default = current success in triangular workflows
 
 expecting success: 
-				>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'
+		test_config branch.master.remote parent1 &&
+		test_config branch.master.merge refs/heads/foo &&
+		test_config remote.pushdefault parent2 &&
+		test_commit commit-for-upstream-triangular &&
+		test_push_failure upstream foo repo2
+	
+[master 5aea25e] 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 'master', without telling me what to push
+to update which remote branch.
+ok 17 - push.default = upstream failure in triangular workflows
 
 expecting success: 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
+		test_config branch.master.remote parent1 &&
+		test_config branch.master.merge refs/heads/foo &&
+		test_config remote.pushdefault parent2 &&
+		test_commit commit-for-simple-triangular &&
+		test_push_success simple master repo2
 	
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-Removing ten
-ok 201 - cleanup after previous file test
+[master 19194cb] 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
+   851f765..19194cb  master -> master
+ok 18 - push.default = simple success in triangular workflows
 
 expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
+		test_config branch.master.remote parent1 &&
+		test_config branch.master.merge refs/heads/foo &&
+		test_config remote.pushdefault parent2 &&
+		test_commit commit-for-matching-triangular &&
+		test_push_success matching master repo2
 	
-ok 202 - setup match file test for ton
+[master 8956523] 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
+   19194cb..8956523  master -> master
+ok 19 - push.default = matching success in triangular workflows
 
 expecting success: 
-			test-tool wildmatch wildmatch 'ton' 't[!a-g]n'
-		
-ok 203 - wildmatch: match 'ton' 't[!a-g]n'
+	test_config branch.master.remote parent1 &&
+	test_config branch.master.merge refs/heads/master &&
+	test_config remote.pushdefault parent1 &&
+	test_commit default-master-master &&
+	test_push_success "" master
+
+[master f163556] default-master-master
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 default-master-master.t
+To repo1
+   5b5f0b1..f163556  master -> master
+ok 20 - default behavior allows "simple" push
 
 expecting success: 
-				printf '%s' 'ton' >expect &&
-				git --glob-pathspecs ls-files -z -- 't[!a-g]n' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 204 - wildmatch (via ls-files): match 't[!a-g]n' 'ton'
+	test_config branch.master.remote parent1 &&
+	test_config branch.master.merge refs/heads/foo &&
+	test_config remote.pushdefault parent1 &&
+	test_commit default-master-foo &&
+	test_push_failure ""
+
+[master accfd16] default-master-foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 default-master-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'.
+ok 21 - default behavior rejects non-simple push
 
 expecting success: 
-			test-tool wildmatch iwildmatch 'ton' 't[!a-g]n'
-		
-ok 205 - iwildmatch: match 'ton' 't[!a-g]n'
+	test_config branch.master.remote parent1 &&
+	test_config branch.master.merge refs/heads/foo &&
+	test_config remote.pushdefault parent2 &&
+	test_commit default-triangular &&
+	test_push_success "" master repo2
+
+[master 0f29fa4] default-triangular
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 default-triangular.t
+To repo2
+   8956523..0f29fa4  master -> master
+ok 22 - default triangular behavior acts like "current"
 
+# passed all 22 test(s)
+1..22
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t5537-fetch-shallow.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5537-fetch-shallow/.git/
 expecting success: 
-				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'
+	commit 1 &&
+	commit 2 &&
+	commit 3 &&
+	commit 4 &&
+	git config --global transfer.fsckObjects true
+
+[master (root-commit) a0ec30a] 1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 tracked
+[master 673c6eb] 2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[master 3e6583c] 3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[master d8c8359] 4
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 1 - setup
 
 expecting success: 
-			test-tool wildmatch pathmatch 'ton' 't[!a-g]n'
-		
-ok 207 - pathmatch: match 'ton' 't[!a-g]n'
+	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
+
+Cloning into 'shallow'...
+ok 2 - setup shallow clone
 
 expecting success: 
-				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'
+	git clone --no-local shallow shallow2 &&
+	(
+	cd shallow2 &&
+	git fsck &&
+	git log --format=%s >actual &&
+	cat <<EOF >expect &&
+4
+3
+EOF
+	test_cmp expect actual
+	)
+
+Cloning into 'shallow2'...
+ok 3 - clone from shallow clone
 
 expecting success: 
-			test-tool wildmatch ipathmatch 'ton' 't[!a-g]n'
-		
-ok 209 - ipathmatch: match 'ton' 't[!a-g]n'
+	(
+	cd shallow &&
+	commit 5
+	) &&
+	(
+	cd shallow2 &&
+	git fetch &&
+	git fsck &&
+	git log --format=%s origin/master >actual &&
+	cat <<EOF >expect &&
+5
+4
+3
+EOF
+	test_cmp expect actual
+	)
+
+[master 796674c] 5
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+From /build/git-2.20.1/t/trash directory.t5537-fetch-shallow/shallow
+   d8c8359..796674c  master     -> origin/master
+ok 4 - fetch from shallow clone
 
 expecting success: 
-				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'
+	(
+	cd shallow &&
+	commit 6
+	) &&
+	(
+	cd shallow2 &&
+	git fetch --depth=2 &&
+	git fsck &&
+	git log --format=%s origin/master >actual &&
+	cat <<EOF >expect &&
+6
+5
+EOF
+	test_cmp expect actual
+	)
+
+[master 0f52702] 6
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+From /build/git-2.20.1/t/trash directory.t5537-fetch-shallow/shallow
+   796674c..0f52702  master     -> origin/master
+ok 5 - fetch --depth from shallow clone
 
 expecting success: 
-		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
+	(
+	cd shallow2 &&
+	git fetch --unshallow &&
+	git fsck &&
+	git log --format=%s origin/master >actual &&
+	cat <<EOF >expect &&
+6
+5
+4
+3
+EOF
+	test_cmp expect actual
+	)
+
+ok 6 - fetch --unshallow from shallow clone
 
 expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git 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
+	# 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/master:refs/remotes/top/master &&
+	git fsck &&
+	git log --format=%s top/master >actual &&
+	cat <<EOF >expect &&
+add-1-back
+4
+3
+EOF
+	test_cmp expect actual
+	) &&
+	git --git-dir=shallow2/.git cat-file blob $(echo 1|git hash-object --stdin) >/dev/null
+
+
+fatal: git cat-file d00491fd7e5bb6fa28c517a0bb32b8b506539d4d: bad file
+[master 78236af] add-1-back
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1.t
+From ../
+ * [new branch]      master     -> top/master
+ok 7 - fetch something upstream has but hidden by clients shallow boundaries
 
 expecting success: 
-			test-tool wildmatch wildmatch 'ton' 't[^a-g]n'
-		
-ok 213 - wildmatch: match 'ton' 't[^a-g]n'
+	(
+	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 &&
+	cat <<EOF >expect.refs &&
+refs/remotes/shallow/no-shallow
+EOF
+	test_cmp expect.refs actual.refs &&
+	git log --format=%s shallow/no-shallow >actual &&
+	cat <<EOF >expect &&
+no-shallow
+EOF
+	test_cmp expect actual
+	)
+
+Switched to a new branch 'no-shallow'
+[no-shallow (root-commit) 2269ce0] no-shallow
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 tracked
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5537-fetch-shallow/notshallow/.git/
+warning: reject refs/remotes/shallow/master because shallow roots are not allowed to be updated
+From ../shallow/
+ * [new branch]      no-shallow -> shallow/no-shallow
+ok 8 - fetch that requires changes in .git/shallow is filtered
 
 expecting success: 
-				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'
+	(
+	cd shallow &&
+	git checkout master &&
+	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/master
+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/master >actual &&
+	cat <<EOF >expect &&
+7
+6
+5
+4
+3
+EOF
+	test_cmp expect actual
+	)
+
+Switched to branch 'master'
+Your branch is ahead of 'origin/master' by 2 commits.
+  (use "git push" to publish your local commits)
+[master d4029d4] 7
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+error: Could not read 673c6eb4145e648ad02c95ec906f843e0d34689d
+From ../shallow/
+ * [new branch]      master     -> shallow/master
+ * [new tag]         heavy-tag  -> heavy-tag
+ * [new tag]         light-tag  -> light-tag
+notice: HEAD points to an unborn branch (master)
+ok 9 - fetch --update-shallow
+
+checking prerequisite: SANITY
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
+	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: 
-			test-tool wildmatch iwildmatch 'ton' 't[^a-g]n'
-		
-ok 215 - iwildmatch: match 'ton' 't[^a-g]n'
+	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 &&
+	cat >expect <<EOF &&
+add-1-back
+4
+EOF
+	test_cmp expect actual
+
+Cloning into 'from-read-only'...
+ok 10 - shallow fetch from a read-only repo
 
 expecting success: 
-				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'
+	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 master &&
+
+	git clone --depth=1 --no-tags --no-single-branch \
+		"file://$PWD/shallow-server" shallow-client &&
+
+	: now remove the branch and fetch with prune &&
+	git -C shallow-server branch -D branch &&
+	git -C shallow-client fetch --prune --depth=1 \
+		origin "+refs/heads/*:refs/remotes/origin/*" &&
+	git -C shallow-client repack -adfl &&
+	test_must_fail git -C shallow-client rev-parse --verify $d^0 &&
+	! grep $d shallow-client/.git/shallow &&
+
+	git -C shallow-server branch branch-orig $d &&
+	git -C shallow-client fetch --prune --depth=2 \
+		origin "+refs/heads/*:refs/remotes/origin/*"
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5537-fetch-shallow/shallow-server/.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
+Switched to a new branch 'branch'
+[branch 35a8500] C
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 C.t
+[branch 3e7056f] E
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 E.t
+[branch ab50130] D
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 D.t
+Switched to branch 'master'
+Cloning into 'shallow-client'...
+Deleted branch branch (was ab50130).
+From file:///build/git-2.20.1/t/trash directory.t5537-fetch-shallow/shallow-server
+ - [deleted]         (none)     -> origin/branch
+fatal: Needed a single revision
+From file:///build/git-2.20.1/t/trash directory.t5537-fetch-shallow/shallow-server
+ * [new branch]      branch-orig -> origin/branch-orig
+ok 11 - .git/shallow is edited by repack
+
+checking prerequisite: NOT_ROOT
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
+	uid=$(id -u) &&
+	test "$uid" != 0
 
+)
+prerequisite NOT_ROOT ok
+# passed all 11 test(s)
+# SKIP no web server found at '/usr/sbin/apache2'
+1..11
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t5544-pack-objects-hook.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5544-pack-objects-hook/.git/
 expecting success: 
-			test-tool wildmatch pathmatch 'ton' 't[^a-g]n'
-		
-ok 217 - pathmatch: match 'ton' 't[^a-g]n'
+	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: 
-				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'
+	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: 
-			test-tool wildmatch ipathmatch 'ton' 't[^a-g]n'
-		
-ok 219 - ipathmatch: match 'ton' 't[^a-g]n'
+	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: 
-				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'
+	# 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: 
-		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
+	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: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git 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
+	clear_hook_results &&
+	test_config uploadpack.packObjectsHook "./hook" &&
+	git clone --no-local . dst.git 2>stderr &&
+	! grep "hook running" stderr &&
+	test_path_is_missing .git/hook.args &&
+	test_path_is_missing .git/hook.stdin &&
+	test_path_is_missing .git/hook.stdout
 
+ok 6 - hook does not run from repo config
+
+# passed all 6 test(s)
+1..6
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t0027-auto-crlf.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t0027-auto-crlf/.git/
 expecting success: 
-			test-tool wildmatch wildmatch 'a]b' 'a[]]b'
-		
-ok 223 - wildmatch: match 'a]b' 'a[]]b'
+	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 |
+	sed -n -e "/TeBi_/{s!attr/[	]*!!g
+	s!	! !g
+	s!  *! !g
+	p
+	}" | sort >actual &&
+	test_cmp expect actual
+
+ok 1 - ls-files --eol -o Text/Binary
 
 expecting success: 
-				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'
+	echo >.gitattributes &&
+	git checkout -b master &&
+	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
+
+Switched to a new branch 'master'
+[master (root-commit) e71ea79] add .gitattributes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 .gitattributes
+[master 80db553] 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 master
 
 expecting success: 
-			test-tool wildmatch iwildmatch 'a]b' 'a[]]b'
-		
-ok 225 - iwildmatch: match 'a]b' 'a[]]b'
+	commit_check_warn false ""     ""        ""        ""        ""        "" &&
+	commit_check_warn true  ""     "LF_CRLF" ""        "LF_CRLF" ""        "" &&
+	commit_check_warn input ""     ""        "CRLF_LF" "CRLF_LF" ""        ""
+
+[master 2c95c86] 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
+[master e5b5c31] 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
+[master 59ee4cb] 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: 
-				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'
+	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" ""        ""
+
+[master 55ce6d7] 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
+[master c457366] 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
+[master fbfc73f] 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: 
-			test-tool wildmatch pathmatch 'a]b' 'a[]]b'
-		
-ok 227 - pathmatch: match 'a]b' 'a[]]b'
+	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"
+
+[master fa32cdc] 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
+[master 880a075] 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
+[master f0a26f9] 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: 
-				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'
+	commit_check_warn false "-text" ""       ""        ""        ""        "" &&
+	commit_check_warn true  "-text" ""       ""        ""        ""        "" &&
+	commit_check_warn input "-text" ""       ""        ""        ""        ""
+
+[master ff6fe9d] 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
+[master 7a516db] 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
+[master e9a3c00] 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: 
-			test-tool wildmatch ipathmatch 'a]b' 'a[]]b'
-		
-ok 229 - ipathmatch: match 'a]b' 'a[]]b'
+	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"
+
+[master 656e89a] 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
+[master 4202320] 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
+[master 020900c] 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: 
-				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'
+	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" ""
+
+[master c873a1c] 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
+[master b54645e] 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
+[master 248ef70] 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: 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
+		check_warning "$lfwarn" ${pfx}_LF.err
 	
-Removing a]b
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 231 - cleanup after previous file test
+ok 9 - commit file with mixed EOL onto LF crlf=false attr=
 
 expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			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_warning "$crlfwarn" ${pfx}_CRLF.err
 	
-ok 232 - setup match file test for a-b
+ok 10 - commit file with mixed EOL onto CLRF attr= aeol= crlf=false
 
 expecting success: 
-			test-tool wildmatch wildmatch 'a-b' 'a[]-]b'
-		
-ok 233 - wildmatch: match 'a-b' 'a[]-]b'
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
+	
+ok 11 - commit file with mixed EOL onto CRLF_mix_LF attr= aeol= crlf=false
 
 expecting success: 
-				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'
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
+	
+ok 12 - commit file with mixed EOL onto LF_mix_cr attr= aeol= crlf=false 
 
 expecting success: 
-			test-tool wildmatch iwildmatch 'a-b' 'a[]-]b'
-		
-ok 235 - iwildmatch: match 'a-b' 'a[]-]b'
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
+	
+ok 13 - commit file with mixed EOL onto CRLF_nul attr= aeol= crlf=false
 
 expecting success: 
-				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'
+		check_warning "$lfwarn" ${pfx}_LF.err
+	
+ok 14 - commit file with mixed EOL onto LF crlf=true attr=
 
 expecting success: 
-			test-tool wildmatch pathmatch 'a-b' 'a[]-]b'
-		
-ok 237 - pathmatch: match 'a-b' 'a[]-]b'
+		check_warning "$crlfwarn" ${pfx}_CRLF.err
+	
+ok 15 - commit file with mixed EOL onto CLRF attr= aeol= crlf=true
 
 expecting success: 
-				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'
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
+	
+ok 16 - commit file with mixed EOL onto CRLF_mix_LF attr= aeol= crlf=true
 
 expecting success: 
-			test-tool wildmatch ipathmatch 'a-b' 'a[]-]b'
-		
-ok 239 - ipathmatch: match 'a-b' 'a[]-]b'
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
+	
+ok 17 - commit file with mixed EOL onto LF_mix_cr attr= aeol= crlf=true 
 
 expecting success: 
-				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'
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
+	
+ok 18 - commit file with mixed EOL onto CRLF_nul attr= aeol= crlf=true
 
 expecting success: 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
+		check_warning "$lfwarn" ${pfx}_LF.err
 	
-Removing a-b
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 241 - cleanup after previous file test
+ok 19 - commit file with mixed EOL onto LF crlf=input attr=
 
 expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			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_warning "$crlfwarn" ${pfx}_CRLF.err
 	
-ok 242 - setup match file test for a]b
+ok 20 - commit file with mixed EOL onto CLRF attr= aeol= crlf=input
 
 expecting success: 
-			test-tool wildmatch wildmatch 'a]b' 'a[]-]b'
-		
-ok 243 - wildmatch: match 'a]b' 'a[]-]b'
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
+	
+ok 21 - commit file with mixed EOL onto CRLF_mix_LF attr= aeol= crlf=input
 
 expecting success: 
-				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'
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
+	
+ok 22 - commit file with mixed EOL onto LF_mix_cr attr= aeol= crlf=input 
 
 expecting success: 
-			test-tool wildmatch iwildmatch 'a]b' 'a[]-]b'
-		
-ok 245 - iwildmatch: match 'a]b' 'a[]-]b'
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
+	
+ok 23 - commit file with mixed EOL onto CRLF_nul attr= aeol= crlf=input
 
 expecting success: 
-				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'
+		check_warning "$lfwarn" ${pfx}_LF.err
+	
+ok 24 - commit file with mixed EOL onto LF crlf=false attr=auto
 
 expecting success: 
-			test-tool wildmatch pathmatch 'a]b' 'a[]-]b'
-		
-ok 247 - pathmatch: match 'a]b' 'a[]-]b'
+		check_warning "$crlfwarn" ${pfx}_CRLF.err
+	
+ok 25 - commit file with mixed EOL onto CLRF attr=auto aeol= crlf=false
 
 expecting success: 
-				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'
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
+	
+ok 26 - commit file with mixed EOL onto CRLF_mix_LF attr=auto aeol= crlf=false
 
 expecting success: 
-			test-tool wildmatch ipathmatch 'a]b' 'a[]-]b'
-		
-ok 249 - ipathmatch: match 'a]b' 'a[]-]b'
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
+	
+ok 27 - commit file with mixed EOL onto LF_mix_cr attr=auto aeol= crlf=false 
 
 expecting success: 
-				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'
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
+	
+ok 28 - commit file with mixed EOL onto CRLF_nul attr=auto aeol= crlf=false
 
 expecting success: 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
+		check_warning "$lfwarn" ${pfx}_LF.err
 	
-Removing a]b
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 251 - cleanup after previous file test
+ok 29 - commit file with mixed EOL onto LF crlf=true attr=auto
 
 expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			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_warning "$crlfwarn" ${pfx}_CRLF.err
 	
-ok 252 - setup match file test for aab
+ok 30 - commit file with mixed EOL onto CLRF attr=auto aeol= crlf=true
 
 expecting success: 
-			test_must_fail test-tool wildmatch wildmatch 'aab' 'a[]-]b'
-		
-ok 253 - wildmatch: no match 'aab' 'a[]-]b'
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
+	
+ok 31 - commit file with mixed EOL onto CRLF_mix_LF attr=auto aeol= crlf=true
 
 expecting success: 
-				>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'
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
+	
+ok 32 - commit file with mixed EOL onto LF_mix_cr attr=auto aeol= crlf=true 
 
 expecting success: 
-			test_must_fail test-tool wildmatch iwildmatch 'aab' 'a[]-]b'
-		
-ok 255 - iwildmatch: no match 'aab' 'a[]-]b'
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
+	
+ok 33 - commit file with mixed EOL onto CRLF_nul attr=auto aeol= crlf=true
 
 expecting success: 
-				>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'
+		check_warning "$lfwarn" ${pfx}_LF.err
+	
+ok 34 - commit file with mixed EOL onto LF crlf=input attr=auto
 
 expecting success: 
-			test_must_fail test-tool wildmatch pathmatch 'aab' 'a[]-]b'
-		
-ok 257 - pathmatch: no match 'aab' 'a[]-]b'
+		check_warning "$crlfwarn" ${pfx}_CRLF.err
+	
+ok 35 - commit file with mixed EOL onto CLRF attr=auto aeol= crlf=input
 
 expecting success: 
-				>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'
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
+	
+ok 36 - commit file with mixed EOL onto CRLF_mix_LF attr=auto aeol= crlf=input
 
 expecting success: 
-			test_must_fail test-tool wildmatch ipathmatch 'aab' 'a[]-]b'
-		
-ok 259 - ipathmatch: no match 'aab' 'a[]-]b'
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
+	
+ok 37 - commit file with mixed EOL onto LF_mix_cr attr=auto aeol= crlf=input 
 
 expecting success: 
-				>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'
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
+	
+ok 38 - commit file with mixed EOL onto CRLF_nul attr=auto aeol= crlf=input
 
 expecting success: 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
+		check_warning "$lfwarn" ${pfx}_LF.err
 	
-Removing aab
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 261 - cleanup after previous file test
+ok 39 - commit NNO files crlf=false attr= LF
 
 expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			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_warning "$crlfwarn" ${pfx}_CRLF.err
 	
-ok 262 - setup match file test for aab
+ok 40 - commit NNO files attr= aeol= crlf=false CRLF
 
 expecting success: 
-			test-tool wildmatch wildmatch 'aab' 'a[]a-]b'
-		
-ok 263 - wildmatch: match 'aab' 'a[]a-]b'
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
+	
+ok 41 - commit NNO files attr= aeol= crlf=false CRLF_mix_LF
 
 expecting success: 
-				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_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
+	
+ok 42 - commit NNO files attr= aeol= crlf=false LF_mix_cr
 
 expecting success: 
-			test-tool wildmatch iwildmatch 'aab' 'a[]a-]b'
-		
-ok 265 - iwildmatch: match 'aab' 'a[]a-]b'
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
+	
+ok 43 - commit NNO files attr= aeol= crlf=false CRLF_nul
 
 expecting success: 
-				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'
+		check_warning "$lfwarn" ${pfx}_LF.err
+	
+ok 44 - commit NNO files crlf=true attr= LF
 
 expecting success: 
-			test-tool wildmatch pathmatch 'aab' 'a[]a-]b'
-		
-ok 267 - pathmatch: match 'aab' 'a[]a-]b'
+		check_warning "$crlfwarn" ${pfx}_CRLF.err
+	
+ok 45 - commit NNO files attr= aeol= crlf=true CRLF
 
 expecting success: 
-				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'
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
+	
+ok 46 - commit NNO files attr= aeol= crlf=true CRLF_mix_LF
 
 expecting success: 
-			test-tool wildmatch ipathmatch 'aab' 'a[]a-]b'
-		
-ok 269 - ipathmatch: match 'aab' 'a[]a-]b'
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
+	
+ok 47 - commit NNO files attr= aeol= crlf=true LF_mix_cr
 
 expecting success: 
-				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'
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
+	
+ok 48 - commit NNO files attr= aeol= crlf=true CRLF_nul
 
 expecting success: 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
+		check_warning "$lfwarn" ${pfx}_LF.err
 	
-Removing aab
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 271 - cleanup after previous file test
+ok 49 - commit NNO files crlf=input attr= LF
 
 expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			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_warning "$crlfwarn" ${pfx}_CRLF.err
 	
-ok 272 - setup match file test for ]
+ok 50 - commit NNO files attr= aeol= crlf=input CRLF
 
 expecting success: 
-			test-tool wildmatch wildmatch ']' ']'
-		
-ok 273 - wildmatch: match ']' ']'
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
+	
+ok 51 - commit NNO files attr= aeol= crlf=input CRLF_mix_LF
 
 expecting success: 
-				printf '%s' ']' >expect &&
-				git --glob-pathspecs ls-files -z -- ']' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 274 - wildmatch (via ls-files): match ']' ']'
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
+	
+ok 52 - commit NNO files attr= aeol= crlf=input LF_mix_cr
 
 expecting success: 
-			test-tool wildmatch iwildmatch ']' ']'
-		
-ok 275 - iwildmatch: match ']' ']'
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
+	
+ok 53 - commit NNO files attr= aeol= crlf=input CRLF_nul
 
 expecting success: 
-				printf '%s' ']' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- ']' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 276 - iwildmatch (via ls-files): match ']' ']'
+		check_warning "$lfwarn" ${pfx}_LF.err
+	
+ok 54 - commit NNO files crlf=false attr=auto LF
 
 expecting success: 
-			test-tool wildmatch pathmatch ']' ']'
-		
-ok 277 - pathmatch: match ']' ']'
+		check_warning "$crlfwarn" ${pfx}_CRLF.err
+	
+ok 55 - commit NNO files attr=auto aeol= crlf=false CRLF
 
 expecting success: 
-				printf '%s' ']' >expect &&
-				git ls-files -z -- ']' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 278 - pathmatch (via ls-files): match ']' ']'
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
+	
+ok 56 - commit NNO files attr=auto aeol= crlf=false CRLF_mix_LF
 
 expecting success: 
-			test-tool wildmatch ipathmatch ']' ']'
-		
-ok 279 - ipathmatch: match ']' ']'
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
+	
+ok 57 - commit NNO files attr=auto aeol= crlf=false LF_mix_cr
 
 expecting success: 
-				printf '%s' ']' >expect &&
-				git --icase-pathspecs ls-files -z -- ']' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 280 - ipathmatch (via ls-files): match ']' ']'
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
+	
+ok 58 - commit NNO files attr=auto aeol= crlf=false CRLF_nul
 
 expecting success: 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
+		check_warning "$lfwarn" ${pfx}_LF.err
 	
-Removing ]
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 281 - cleanup after previous file test
+ok 59 - commit NNO files crlf=true attr=auto LF
 
 expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			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_warning "$crlfwarn" ${pfx}_CRLF.err
 	
-ok 282 - setup match file test for foo/baz/bar
+ok 60 - commit NNO files attr=auto aeol= crlf=true CRLF
 
 expecting success: 
-			test_must_fail test-tool wildmatch wildmatch 'foo/baz/bar' 'foo*bar'
-		
-ok 283 - wildmatch: no match 'foo/baz/bar' 'foo*bar'
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
+	
+ok 61 - commit NNO files attr=auto aeol= crlf=true CRLF_mix_LF
 
 expecting success: 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- 'foo*bar' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 284 - wildmatch (via ls-files): no match 'foo*bar' 'foo/baz/bar'
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
+	
+ok 62 - commit NNO files attr=auto aeol= crlf=true LF_mix_cr
 
 expecting success: 
-			test_must_fail test-tool wildmatch iwildmatch 'foo/baz/bar' 'foo*bar'
-		
-ok 285 - iwildmatch: no match 'foo/baz/bar' 'foo*bar'
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
+	
+ok 63 - commit NNO files attr=auto aeol= crlf=true CRLF_nul
 
 expecting success: 
-				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'foo*bar' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 286 - iwildmatch (via ls-files): no match 'foo*bar' 'foo/baz/bar'
+		check_warning "$lfwarn" ${pfx}_LF.err
+	
+ok 64 - commit NNO files crlf=input attr=auto LF
 
 expecting success: 
-			test-tool wildmatch pathmatch 'foo/baz/bar' 'foo*bar'
-		
-ok 287 - pathmatch: match 'foo/baz/bar' 'foo*bar'
+		check_warning "$crlfwarn" ${pfx}_CRLF.err
+	
+ok 65 - commit NNO files attr=auto aeol= crlf=input CRLF
 
 expecting success: 
-				printf '%s' 'foo/baz/bar' >expect &&
-				git ls-files -z -- 'foo*bar' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 288 - pathmatch (via ls-files): match 'foo*bar' 'foo/baz/bar'
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
+	
+ok 66 - commit NNO files attr=auto aeol= crlf=input CRLF_mix_LF
 
 expecting success: 
-			test-tool wildmatch ipathmatch 'foo/baz/bar' 'foo*bar'
-		
-ok 289 - ipathmatch: match 'foo/baz/bar' 'foo*bar'
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
+	
+ok 67 - commit NNO files attr=auto aeol= crlf=input LF_mix_cr
 
 expecting success: 
-				printf '%s' 'foo/baz/bar' >expect &&
-				git --icase-pathspecs ls-files -z -- 'foo*bar' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 290 - ipathmatch (via ls-files): match 'foo*bar' 'foo/baz/bar'
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
+	
+ok 68 - commit NNO files attr=auto aeol= crlf=input CRLF_nul
 
 expecting success: 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
+		check_warning "$lfwarn" ${pfx}_LF.err
 	
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-Removing foo/
-ok 291 - cleanup after previous file test
+ok 69 - commit NNO files crlf=true attr=-text LF
 
 expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			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_warning "$crlfwarn" ${pfx}_CRLF.err
 	
-ok 292 - setup match file test for foo/baz/bar
+ok 70 - commit NNO files attr=-text aeol= crlf=true CRLF
 
 expecting success: 
-			test_must_fail test-tool wildmatch wildmatch 'foo/baz/bar' 'foo**bar'
-		
-ok 293 - wildmatch: no match 'foo/baz/bar' 'foo**bar'
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
+	
+ok 71 - commit NNO files attr=-text aeol= crlf=true CRLF_mix_LF
 
 expecting success: 
-				>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'
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
+	
+ok 72 - commit NNO files attr=-text aeol= crlf=true LF_mix_cr
 
 expecting success: 
-			test_must_fail test-tool wildmatch iwildmatch 'foo/baz/bar' 'foo**bar'
-		
-ok 295 - iwildmatch: no match 'foo/baz/bar' 'foo**bar'
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
+	
+ok 73 - commit NNO files attr=-text aeol= crlf=true CRLF_nul
 
 expecting success: 
-				>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'
+		check_warning "$lfwarn" ${pfx}_LF.err
+	
+ok 74 - commit NNO files crlf=true attr=-text LF
 
 expecting success: 
-			test-tool wildmatch pathmatch 'foo/baz/bar' 'foo**bar'
-		
-ok 297 - pathmatch: match 'foo/baz/bar' 'foo**bar'
+		check_warning "$crlfwarn" ${pfx}_CRLF.err
+	
+ok 75 - commit NNO files attr=-text aeol=lf crlf=true CRLF
 
 expecting success: 
-				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'
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
+	
+ok 76 - commit NNO files attr=-text aeol=lf crlf=true CRLF_mix_LF
 
 expecting success: 
-			test-tool wildmatch ipathmatch 'foo/baz/bar' 'foo**bar'
-		
-ok 299 - ipathmatch: match 'foo/baz/bar' 'foo**bar'
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
+	
+ok 77 - commit NNO files attr=-text aeol=lf crlf=true LF_mix_cr
 
 expecting success: 
-				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'
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
+	
+ok 78 - commit NNO files attr=-text aeol=lf crlf=true CRLF_nul
 
 expecting success: 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
+		check_warning "$lfwarn" ${pfx}_LF.err
 	
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-Removing foo/
-ok 301 - cleanup after previous file test
+ok 79 - commit NNO files crlf=true attr=-text LF
 
 expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			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_warning "$crlfwarn" ${pfx}_CRLF.err
 	
-ok 302 - setup match file test for foobazbar
+ok 80 - commit NNO files attr=-text aeol=crlf crlf=true CRLF
 
 expecting success: 
-			test-tool wildmatch wildmatch 'foobazbar' 'foo**bar'
-		
-ok 303 - wildmatch: match 'foobazbar' 'foo**bar'
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
+	
+ok 81 - commit NNO files attr=-text aeol=crlf crlf=true CRLF_mix_LF
 
 expecting success: 
-				printf '%s' 'foobazbar' >expect &&
-				git --glob-pathspecs ls-files -z -- 'foo**bar' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 304 - wildmatch (via ls-files): match 'foo**bar' 'foobazbar'
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
+	
+ok 82 - commit NNO files attr=-text aeol=crlf crlf=true LF_mix_cr
 
 expecting success: 
-			test-tool wildmatch iwildmatch 'foobazbar' 'foo**bar'
-		
-ok 305 - iwildmatch: match 'foobazbar' 'foo**bar'
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
+	
+ok 83 - commit NNO files attr=-text aeol=crlf crlf=true CRLF_nul
 
 expecting success: 
-				printf '%s' 'foobazbar' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'foo**bar' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 306 - iwildmatch (via ls-files): match 'foo**bar' 'foobazbar'
+		check_warning "$lfwarn" ${pfx}_LF.err
+	
+ok 84 - commit NNO files crlf=true attr= LF
 
 expecting success: 
-			test-tool wildmatch pathmatch 'foobazbar' 'foo**bar'
-		
-ok 307 - pathmatch: match 'foobazbar' 'foo**bar'
+		check_warning "$crlfwarn" ${pfx}_CRLF.err
+	
+ok 85 - commit NNO files attr= aeol=lf crlf=true CRLF
 
 expecting success: 
-				printf '%s' 'foobazbar' >expect &&
-				git ls-files -z -- 'foo**bar' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 308 - pathmatch (via ls-files): match 'foo**bar' 'foobazbar'
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
+	
+ok 86 - commit NNO files attr= aeol=lf crlf=true CRLF_mix_LF
 
 expecting success: 
-			test-tool wildmatch ipathmatch 'foobazbar' 'foo**bar'
-		
-ok 309 - ipathmatch: match 'foobazbar' 'foo**bar'
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
+	
+ok 87 - commit NNO files attr= aeol=lf crlf=true LF_mix_cr
 
 expecting success: 
-				printf '%s' 'foobazbar' >expect &&
-				git --icase-pathspecs ls-files -z -- 'foo**bar' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 310 - ipathmatch (via ls-files): match 'foo**bar' 'foobazbar'
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
+	
+ok 88 - commit NNO files attr= aeol=lf crlf=true CRLF_nul
 
 expecting success: 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
+		check_warning "$lfwarn" ${pfx}_LF.err
 	
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-Removing foobazbar
-ok 311 - cleanup after previous file test
+ok 89 - commit NNO files crlf=true attr= LF
 
 expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			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_warning "$crlfwarn" ${pfx}_CRLF.err
 	
-ok 312 - setup match file test for foo/baz/bar
+ok 90 - commit NNO files attr= aeol=crlf crlf=true CRLF
 
 expecting success: 
-			test-tool wildmatch wildmatch 'foo/baz/bar' 'foo/**/bar'
-		
-ok 313 - wildmatch: match 'foo/baz/bar' 'foo/**/bar'
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
+	
+ok 91 - commit NNO files attr= aeol=crlf crlf=true CRLF_mix_LF
 
 expecting success: 
-				printf '%s' 'foo/baz/bar' >expect &&
-				git --glob-pathspecs ls-files -z -- 'foo/**/bar' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 314 - wildmatch (via ls-files): match 'foo/**/bar' 'foo/baz/bar'
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
+	
+ok 92 - commit NNO files attr= aeol=crlf crlf=true LF_mix_cr
 
 expecting success: 
-			test-tool wildmatch iwildmatch 'foo/baz/bar' 'foo/**/bar'
-		
-ok 315 - iwildmatch: match 'foo/baz/bar' 'foo/**/bar'
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
+	
+ok 93 - commit NNO files attr= aeol=crlf crlf=true CRLF_nul
 
 expecting success: 
-				printf '%s' 'foo/baz/bar' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'foo/**/bar' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 316 - iwildmatch (via ls-files): match 'foo/**/bar' 'foo/baz/bar'
+		check_warning "$lfwarn" ${pfx}_LF.err
+	
+ok 94 - commit NNO files crlf=true attr=auto LF
 
 expecting success: 
-			test-tool wildmatch pathmatch 'foo/baz/bar' 'foo/**/bar'
-		
-ok 317 - pathmatch: match 'foo/baz/bar' 'foo/**/bar'
+		check_warning "$crlfwarn" ${pfx}_CRLF.err
+	
+ok 95 - commit NNO files attr=auto aeol=lf crlf=true CRLF
 
 expecting success: 
-				printf '%s' 'foo/baz/bar' >expect &&
-				git ls-files -z -- 'foo/**/bar' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 318 - pathmatch (via ls-files): match 'foo/**/bar' 'foo/baz/bar'
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
+	
+ok 96 - commit NNO files attr=auto aeol=lf crlf=true CRLF_mix_LF
 
 expecting success: 
-			test-tool wildmatch ipathmatch 'foo/baz/bar' 'foo/**/bar'
-		
-ok 319 - ipathmatch: match 'foo/baz/bar' 'foo/**/bar'
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
+	
+ok 97 - commit NNO files attr=auto aeol=lf crlf=true LF_mix_cr
 
 expecting success: 
-				printf '%s' 'foo/baz/bar' >expect &&
-				git --icase-pathspecs ls-files -z -- 'foo/**/bar' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 320 - ipathmatch (via ls-files): match 'foo/**/bar' 'foo/baz/bar'
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
+	
+ok 98 - commit NNO files attr=auto aeol=lf crlf=true CRLF_nul
 
 expecting success: 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
+		check_warning "$lfwarn" ${pfx}_LF.err
 	
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-Removing foo/
-ok 321 - cleanup after previous file test
+ok 99 - commit NNO files crlf=true attr=auto LF
 
 expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			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_warning "$crlfwarn" ${pfx}_CRLF.err
 	
-ok 322 - setup match file test for foo/baz/bar
+ok 100 - commit NNO files attr=auto aeol=crlf crlf=true CRLF
 
 expecting success: 
-			test-tool wildmatch wildmatch 'foo/baz/bar' 'foo/**/**/bar'
-		
-ok 323 - wildmatch: match 'foo/baz/bar' 'foo/**/**/bar'
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
+	
+ok 101 - commit NNO files attr=auto aeol=crlf crlf=true CRLF_mix_LF
 
 expecting success: 
-				printf '%s' 'foo/baz/bar' >expect &&
-				git --glob-pathspecs ls-files -z -- 'foo/**/**/bar' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 324 - wildmatch (via ls-files): match 'foo/**/**/bar' 'foo/baz/bar'
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
+	
+ok 102 - commit NNO files attr=auto aeol=crlf crlf=true LF_mix_cr
 
 expecting success: 
-			test-tool wildmatch iwildmatch 'foo/baz/bar' 'foo/**/**/bar'
-		
-ok 325 - iwildmatch: match 'foo/baz/bar' 'foo/**/**/bar'
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
+	
+ok 103 - commit NNO files attr=auto aeol=crlf crlf=true CRLF_nul
 
 expecting success: 
-				printf '%s' 'foo/baz/bar' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'foo/**/**/bar' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 326 - iwildmatch (via ls-files): match 'foo/**/**/bar' 'foo/baz/bar'
+		check_warning "$lfwarn" ${pfx}_LF.err
+	
+ok 104 - commit NNO files crlf=true attr=text LF
 
 expecting success: 
-			test_must_fail test-tool wildmatch pathmatch 'foo/baz/bar' 'foo/**/**/bar'
-		
-ok 327 - pathmatch: no match 'foo/baz/bar' 'foo/**/**/bar'
+		check_warning "$crlfwarn" ${pfx}_CRLF.err
+	
+ok 105 - commit NNO files attr=text aeol=lf crlf=true CRLF
 
 expecting success: 
-				>expect &&
-				git ls-files -z -- 'foo/**/**/bar' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 328 - pathmatch (via ls-files): no match 'foo/**/**/bar' 'foo/baz/bar'
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
+	
+ok 106 - commit NNO files attr=text aeol=lf crlf=true CRLF_mix_LF
 
 expecting success: 
-			test_must_fail test-tool wildmatch ipathmatch 'foo/baz/bar' 'foo/**/**/bar'
-		
-ok 329 - ipathmatch: no match 'foo/baz/bar' 'foo/**/**/bar'
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
+	
+ok 107 - commit NNO files attr=text aeol=lf crlf=true LF_mix_cr
 
 expecting success: 
-				>expect &&
-				git --icase-pathspecs ls-files -z -- 'foo/**/**/bar' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 330 - ipathmatch (via ls-files): no match 'foo/**/**/bar' 'foo/baz/bar'
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
+	
+ok 108 - commit NNO files attr=text aeol=lf crlf=true CRLF_nul
 
 expecting success: 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
+		check_warning "$lfwarn" ${pfx}_LF.err
 	
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-Removing foo/
-ok 331 - cleanup after previous file test
+ok 109 - commit NNO files crlf=true attr=text LF
 
 expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			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_warning "$crlfwarn" ${pfx}_CRLF.err
 	
-ok 332 - setup match file test for foo/b/a/z/bar
+ok 110 - commit NNO files attr=text aeol=crlf crlf=true CRLF
 
 expecting success: 
-			test-tool wildmatch wildmatch 'foo/b/a/z/bar' 'foo/**/bar'
-		
-ok 333 - wildmatch: match 'foo/b/a/z/bar' 'foo/**/bar'
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
+	
+ok 111 - commit NNO files attr=text aeol=crlf crlf=true CRLF_mix_LF
 
 expecting success: 
-				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'
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
+	
+ok 112 - commit NNO files attr=text aeol=crlf crlf=true LF_mix_cr
 
 expecting success: 
-			test-tool wildmatch iwildmatch 'foo/b/a/z/bar' 'foo/**/bar'
-		
-ok 335 - iwildmatch: match 'foo/b/a/z/bar' 'foo/**/bar'
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
+	
+ok 113 - commit NNO files attr=text aeol=crlf crlf=true CRLF_nul
 
 expecting success: 
-				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'
+		check_warning "$lfwarn" ${pfx}_LF.err
+	
+ok 114 - commit NNO files crlf=false attr=-text LF
 
 expecting success: 
-			test-tool wildmatch pathmatch 'foo/b/a/z/bar' 'foo/**/bar'
-		
-ok 337 - pathmatch: match 'foo/b/a/z/bar' 'foo/**/bar'
+		check_warning "$crlfwarn" ${pfx}_CRLF.err
+	
+ok 115 - commit NNO files attr=-text aeol= crlf=false CRLF
 
 expecting success: 
-				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'
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
+	
+ok 116 - commit NNO files attr=-text aeol= crlf=false CRLF_mix_LF
 
 expecting success: 
-			test-tool wildmatch ipathmatch 'foo/b/a/z/bar' 'foo/**/bar'
-		
-ok 339 - ipathmatch: match 'foo/b/a/z/bar' 'foo/**/bar'
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
+	
+ok 117 - commit NNO files attr=-text aeol= crlf=false LF_mix_cr
 
 expecting success: 
-				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'
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
+	
+ok 118 - commit NNO files attr=-text aeol= crlf=false CRLF_nul
 
 expecting success: 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
+		check_warning "$lfwarn" ${pfx}_LF.err
 	
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-Removing foo/
-ok 341 - cleanup after previous file test
+ok 119 - commit NNO files crlf=false attr=-text LF
 
 expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			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_warning "$crlfwarn" ${pfx}_CRLF.err
 	
-ok 342 - setup match file test for foo/b/a/z/bar
+ok 120 - commit NNO files attr=-text aeol=lf crlf=false CRLF
 
 expecting success: 
-			test-tool wildmatch wildmatch 'foo/b/a/z/bar' 'foo/**/**/bar'
-		
-ok 343 - wildmatch: match 'foo/b/a/z/bar' 'foo/**/**/bar'
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
+	
+ok 121 - commit NNO files attr=-text aeol=lf crlf=false CRLF_mix_LF
 
 expecting success: 
-				printf '%s' 'foo/b/a/z/bar' >expect &&
-				git --glob-pathspecs ls-files -z -- 'foo/**/**/bar' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 344 - wildmatch (via ls-files): match 'foo/**/**/bar' 'foo/b/a/z/bar'
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
+	
+ok 122 - commit NNO files attr=-text aeol=lf crlf=false LF_mix_cr
 
 expecting success: 
-			test-tool wildmatch iwildmatch 'foo/b/a/z/bar' 'foo/**/**/bar'
-		
-ok 345 - iwildmatch: match 'foo/b/a/z/bar' 'foo/**/**/bar'
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
+	
+ok 123 - commit NNO files attr=-text aeol=lf crlf=false CRLF_nul
 
 expecting success: 
-				printf '%s' 'foo/b/a/z/bar' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'foo/**/**/bar' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 346 - iwildmatch (via ls-files): match 'foo/**/**/bar' 'foo/b/a/z/bar'
+		check_warning "$lfwarn" ${pfx}_LF.err
+	
+ok 124 - commit NNO files crlf=false attr=-text LF
 
 expecting success: 
-			test-tool wildmatch pathmatch 'foo/b/a/z/bar' 'foo/**/**/bar'
-		
-ok 347 - pathmatch: match 'foo/b/a/z/bar' 'foo/**/**/bar'
+		check_warning "$crlfwarn" ${pfx}_CRLF.err
+	
+ok 125 - commit NNO files attr=-text aeol=crlf crlf=false CRLF
 
 expecting success: 
-				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'
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
+	
+ok 126 - commit NNO files attr=-text aeol=crlf crlf=false CRLF_mix_LF
 
 expecting success: 
-			test-tool wildmatch ipathmatch 'foo/b/a/z/bar' 'foo/**/**/bar'
-		
-ok 349 - ipathmatch: match 'foo/b/a/z/bar' 'foo/**/**/bar'
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
+	
+ok 127 - commit NNO files attr=-text aeol=crlf crlf=false LF_mix_cr
 
 expecting success: 
-				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'
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
+	
+ok 128 - commit NNO files attr=-text aeol=crlf crlf=false CRLF_nul
 
 expecting success: 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
+		check_warning "$lfwarn" ${pfx}_LF.err
 	
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-Removing foo/
-ok 351 - cleanup after previous file test
+ok 129 - commit NNO files crlf=false attr= LF
 
 expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			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_warning "$crlfwarn" ${pfx}_CRLF.err
 	
-ok 352 - setup match file test for foo/bar
+ok 130 - commit NNO files attr= aeol=lf crlf=false CRLF
 
 expecting success: 
-			test-tool wildmatch wildmatch 'foo/bar' 'foo/**/bar'
-		
-ok 353 - wildmatch: match 'foo/bar' 'foo/**/bar'
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
+	
+ok 131 - commit NNO files attr= aeol=lf crlf=false CRLF_mix_LF
 
 expecting success: 
-				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'
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
+	
+ok 132 - commit NNO files attr= aeol=lf crlf=false LF_mix_cr
 
 expecting success: 
-			test-tool wildmatch iwildmatch 'foo/bar' 'foo/**/bar'
-		
-ok 355 - iwildmatch: match 'foo/bar' 'foo/**/bar'
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
+	
+ok 133 - commit NNO files attr= aeol=lf crlf=false CRLF_nul
 
 expecting success: 
-				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'
+		check_warning "$lfwarn" ${pfx}_LF.err
+	
+ok 134 - commit NNO files crlf=false attr= LF
 
 expecting success: 
-			test_must_fail test-tool wildmatch pathmatch 'foo/bar' 'foo/**/bar'
-		
-ok 357 - pathmatch: no match 'foo/bar' 'foo/**/bar'
+		check_warning "$crlfwarn" ${pfx}_CRLF.err
+	
+ok 135 - commit NNO files attr= aeol=crlf crlf=false CRLF
 
 expecting success: 
-				>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'
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
+	
+ok 136 - commit NNO files attr= aeol=crlf crlf=false CRLF_mix_LF
 
 expecting success: 
-			test_must_fail test-tool wildmatch ipathmatch 'foo/bar' 'foo/**/bar'
-		
-ok 359 - ipathmatch: no match 'foo/bar' 'foo/**/bar'
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
+	
+ok 137 - commit NNO files attr= aeol=crlf crlf=false LF_mix_cr
 
 expecting success: 
-				>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'
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
+	
+ok 138 - commit NNO files attr= aeol=crlf crlf=false CRLF_nul
 
 expecting success: 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
+		check_warning "$lfwarn" ${pfx}_LF.err
 	
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-Removing foo/
-ok 361 - cleanup after previous file test
+ok 139 - commit NNO files crlf=false attr=auto LF
 
 expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			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_warning "$crlfwarn" ${pfx}_CRLF.err
 	
-ok 362 - setup match file test for foo/bar
+ok 140 - commit NNO files attr=auto aeol=lf crlf=false CRLF
 
 expecting success: 
-			test-tool wildmatch wildmatch 'foo/bar' 'foo/**/**/bar'
-		
-ok 363 - wildmatch: match 'foo/bar' 'foo/**/**/bar'
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
+	
+ok 141 - commit NNO files attr=auto aeol=lf crlf=false CRLF_mix_LF
 
 expecting success: 
-				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'
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
+	
+ok 142 - commit NNO files attr=auto aeol=lf crlf=false LF_mix_cr
 
 expecting success: 
-			test-tool wildmatch iwildmatch 'foo/bar' 'foo/**/**/bar'
-		
-ok 365 - iwildmatch: match 'foo/bar' 'foo/**/**/bar'
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
+	
+ok 143 - commit NNO files attr=auto aeol=lf crlf=false CRLF_nul
 
 expecting success: 
-				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'
+		check_warning "$lfwarn" ${pfx}_LF.err
+	
+ok 144 - commit NNO files crlf=false attr=auto LF
 
 expecting success: 
-			test_must_fail test-tool wildmatch pathmatch 'foo/bar' 'foo/**/**/bar'
-		
-ok 367 - pathmatch: no match 'foo/bar' 'foo/**/**/bar'
+		check_warning "$crlfwarn" ${pfx}_CRLF.err
+	
+ok 145 - commit NNO files attr=auto aeol=crlf crlf=false CRLF
 
 expecting success: 
-				>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'
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
+	
+ok 146 - commit NNO files attr=auto aeol=crlf crlf=false CRLF_mix_LF
 
 expecting success: 
-			test_must_fail test-tool wildmatch ipathmatch 'foo/bar' 'foo/**/**/bar'
-		
-ok 369 - ipathmatch: no match 'foo/bar' 'foo/**/**/bar'
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
+	
+ok 147 - commit NNO files attr=auto aeol=crlf crlf=false LF_mix_cr
 
 expecting success: 
-				>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'
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
+	
+ok 148 - commit NNO files attr=auto aeol=crlf crlf=false CRLF_nul
 
 expecting success: 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
+		check_warning "$lfwarn" ${pfx}_LF.err
 	
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-Removing foo/
-ok 371 - cleanup after previous file test
+ok 149 - commit NNO files crlf=false attr=text LF
 
 expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			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_warning "$crlfwarn" ${pfx}_CRLF.err
 	
-ok 372 - setup match file test for foo/bar
+ok 150 - commit NNO files attr=text aeol=lf crlf=false CRLF
 
 expecting success: 
-			test_must_fail test-tool wildmatch wildmatch 'foo/bar' 'foo?bar'
-		
-ok 373 - wildmatch: no match 'foo/bar' 'foo?bar'
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
+	
+ok 151 - commit NNO files attr=text aeol=lf crlf=false CRLF_mix_LF
 
 expecting success: 
-				>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'
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
+	
+ok 152 - commit NNO files attr=text aeol=lf crlf=false LF_mix_cr
 
 expecting success: 
-			test_must_fail test-tool wildmatch iwildmatch 'foo/bar' 'foo?bar'
-		
-ok 375 - iwildmatch: no match 'foo/bar' 'foo?bar'
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
+	
+ok 153 - commit NNO files attr=text aeol=lf crlf=false CRLF_nul
 
 expecting success: 
-				>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'
+		check_warning "$lfwarn" ${pfx}_LF.err
+	
+ok 154 - commit NNO files crlf=false attr=text LF
 
 expecting success: 
-			test-tool wildmatch pathmatch 'foo/bar' 'foo?bar'
-		
-ok 377 - pathmatch: match 'foo/bar' 'foo?bar'
+		check_warning "$crlfwarn" ${pfx}_CRLF.err
+	
+ok 155 - commit NNO files attr=text aeol=crlf crlf=false CRLF
 
 expecting success: 
-				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'
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
+	
+ok 156 - commit NNO files attr=text aeol=crlf crlf=false CRLF_mix_LF
 
 expecting success: 
-			test-tool wildmatch ipathmatch 'foo/bar' 'foo?bar'
-		
-ok 379 - ipathmatch: match 'foo/bar' 'foo?bar'
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
+	
+ok 157 - commit NNO files attr=text aeol=crlf crlf=false LF_mix_cr
 
 expecting success: 
-				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'
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
+	
+ok 158 - commit NNO files attr=text aeol=crlf crlf=false CRLF_nul
 
 expecting success: 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
+		check_warning "$lfwarn" ${pfx}_LF.err
 	
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-Removing foo/
-ok 381 - cleanup after previous file test
+ok 159 - commit NNO files crlf=input attr=-text LF
 
 expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			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_warning "$crlfwarn" ${pfx}_CRLF.err
 	
-ok 382 - setup match file test for foo/bar
+ok 160 - commit NNO files attr=-text aeol= crlf=input CRLF
 
 expecting success: 
-			test_must_fail test-tool wildmatch wildmatch 'foo/bar' 'foo[/]bar'
-		
-ok 383 - wildmatch: no match 'foo/bar' 'foo[/]bar'
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
+	
+ok 161 - commit NNO files attr=-text aeol= crlf=input CRLF_mix_LF
 
 expecting success: 
-				>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'
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
+	
+ok 162 - commit NNO files attr=-text aeol= crlf=input LF_mix_cr
 
 expecting success: 
-			test_must_fail test-tool wildmatch iwildmatch 'foo/bar' 'foo[/]bar'
-		
-ok 385 - iwildmatch: no match 'foo/bar' 'foo[/]bar'
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
+	
+ok 163 - commit NNO files attr=-text aeol= crlf=input CRLF_nul
 
 expecting success: 
-				>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'
+		check_warning "$lfwarn" ${pfx}_LF.err
+	
+ok 164 - commit NNO files crlf=input attr=-text LF
 
 expecting success: 
-			test-tool wildmatch pathmatch 'foo/bar' 'foo[/]bar'
-		
-ok 387 - pathmatch: match 'foo/bar' 'foo[/]bar'
+		check_warning "$crlfwarn" ${pfx}_CRLF.err
+	
+ok 165 - commit NNO files attr=-text aeol=lf crlf=input CRLF
 
 expecting success: 
-				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'
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
+	
+ok 166 - commit NNO files attr=-text aeol=lf crlf=input CRLF_mix_LF
 
 expecting success: 
-			test-tool wildmatch ipathmatch 'foo/bar' 'foo[/]bar'
-		
-ok 389 - ipathmatch: match 'foo/bar' 'foo[/]bar'
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
+	
+ok 167 - commit NNO files attr=-text aeol=lf crlf=input LF_mix_cr
 
 expecting success: 
-				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'
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
+	
+ok 168 - commit NNO files attr=-text aeol=lf crlf=input CRLF_nul
 
 expecting success: 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
+		check_warning "$lfwarn" ${pfx}_LF.err
 	
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-Removing foo/
-ok 391 - cleanup after previous file test
+ok 169 - commit NNO files crlf=input attr=-text LF
 
 expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			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_warning "$crlfwarn" ${pfx}_CRLF.err
 	
-ok 392 - setup match file test for foo/bar
+ok 170 - commit NNO files attr=-text aeol=crlf crlf=input CRLF
 
 expecting success: 
-			test_must_fail test-tool wildmatch wildmatch 'foo/bar' 'foo[^a-z]bar'
-		
-ok 393 - wildmatch: no match 'foo/bar' 'foo[^a-z]bar'
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
+	
+ok 171 - commit NNO files attr=-text aeol=crlf crlf=input CRLF_mix_LF
 
 expecting success: 
-				>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'
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
+	
+ok 172 - commit NNO files attr=-text aeol=crlf crlf=input LF_mix_cr
 
 expecting success: 
-			test_must_fail test-tool wildmatch iwildmatch 'foo/bar' 'foo[^a-z]bar'
-		
-ok 395 - iwildmatch: no match 'foo/bar' 'foo[^a-z]bar'
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
+	
+ok 173 - commit NNO files attr=-text aeol=crlf crlf=input CRLF_nul
 
 expecting success: 
-				>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'
+		check_warning "$lfwarn" ${pfx}_LF.err
+	
+ok 174 - commit NNO files crlf=input attr= LF
 
 expecting success: 
-			test-tool wildmatch pathmatch 'foo/bar' 'foo[^a-z]bar'
-		
-ok 397 - pathmatch: match 'foo/bar' 'foo[^a-z]bar'
+		check_warning "$crlfwarn" ${pfx}_CRLF.err
+	
+ok 175 - commit NNO files attr= aeol=lf crlf=input CRLF
 
 expecting success: 
-				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'
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
+	
+ok 176 - commit NNO files attr= aeol=lf crlf=input CRLF_mix_LF
 
 expecting success: 
-			test-tool wildmatch ipathmatch 'foo/bar' 'foo[^a-z]bar'
-		
-ok 399 - ipathmatch: match 'foo/bar' 'foo[^a-z]bar'
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
+	
+ok 177 - commit NNO files attr= aeol=lf crlf=input LF_mix_cr
 
 expecting success: 
-				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'
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
+	
+ok 178 - commit NNO files attr= aeol=lf crlf=input CRLF_nul
 
 expecting success: 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
+		check_warning "$lfwarn" ${pfx}_LF.err
 	
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-Removing foo/
-ok 401 - cleanup after previous file test
+ok 179 - commit NNO files crlf=input attr= LF
 
 expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			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_warning "$crlfwarn" ${pfx}_CRLF.err
 	
-ok 402 - setup match file test for foo/bar
+ok 180 - commit NNO files attr= aeol=crlf crlf=input CRLF
 
 expecting success: 
-			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'
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
+	
+ok 181 - commit NNO files attr= aeol=crlf crlf=input CRLF_mix_LF
 
 expecting success: 
-				>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'
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
+	
+ok 182 - commit NNO files attr= aeol=crlf crlf=input LF_mix_cr
 
 expecting success: 
-			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'
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
+	
+ok 183 - commit NNO files attr= aeol=crlf crlf=input CRLF_nul
 
 expecting success: 
-				>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'
+		check_warning "$lfwarn" ${pfx}_LF.err
+	
+ok 184 - commit NNO files crlf=input attr=auto LF
 
 expecting success: 
-			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'
+		check_warning "$crlfwarn" ${pfx}_CRLF.err
+	
+ok 185 - commit NNO files attr=auto aeol=lf crlf=input CRLF
 
 expecting success: 
-				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'
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
+	
+ok 186 - commit NNO files attr=auto aeol=lf crlf=input CRLF_mix_LF
 
 expecting success: 
-			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'
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
+	
+ok 187 - commit NNO files attr=auto aeol=lf crlf=input LF_mix_cr
 
 expecting success: 
-				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'
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
+	
+ok 188 - commit NNO files attr=auto aeol=lf crlf=input CRLF_nul
 
 expecting success: 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
+		check_warning "$lfwarn" ${pfx}_LF.err
 	
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-Removing foo/
-ok 411 - cleanup after previous file test
+ok 189 - commit NNO files crlf=input attr=auto LF
 
 expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			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_warning "$crlfwarn" ${pfx}_CRLF.err
 	
-ok 412 - setup match file test for foo-bar
+ok 190 - commit NNO files attr=auto aeol=crlf crlf=input CRLF
 
 expecting success: 
-			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'
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
+	
+ok 191 - commit NNO files attr=auto aeol=crlf crlf=input CRLF_mix_LF
 
 expecting success: 
-				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'
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
+	
+ok 192 - commit NNO files attr=auto aeol=crlf crlf=input LF_mix_cr
 
 expecting success: 
-			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'
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
+	
+ok 193 - commit NNO files attr=auto aeol=crlf crlf=input CRLF_nul
 
 expecting success: 
-				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'
+		check_warning "$lfwarn" ${pfx}_LF.err
+	
+ok 194 - commit NNO files crlf=input attr=text LF
 
 expecting success: 
-			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'
+		check_warning "$crlfwarn" ${pfx}_CRLF.err
+	
+ok 195 - commit NNO files attr=text aeol=lf crlf=input CRLF
 
 expecting success: 
-				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'
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
+	
+ok 196 - commit NNO files attr=text aeol=lf crlf=input CRLF_mix_LF
 
 expecting success: 
-			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'
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
+	
+ok 197 - commit NNO files attr=text aeol=lf crlf=input LF_mix_cr
 
 expecting success: 
-				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'
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
+	
+ok 198 - commit NNO files attr=text aeol=lf crlf=input CRLF_nul
 
 expecting success: 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
+		check_warning "$lfwarn" ${pfx}_LF.err
 	
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-Removing foo-bar
-ok 421 - cleanup after previous file test
+ok 199 - commit NNO files crlf=input attr=text LF
 
 expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			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_warning "$crlfwarn" ${pfx}_CRLF.err
 	
-ok 422 - setup match file test for foo
+ok 200 - commit NNO files attr=text aeol=crlf crlf=input CRLF
 
 expecting success: 
-			test-tool wildmatch wildmatch 'foo' '**/foo'
-		
-ok 423 - wildmatch: match 'foo' '**/foo'
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
+	
+ok 201 - commit NNO files attr=text aeol=crlf crlf=input CRLF_mix_LF
 
 expecting success: 
-				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'
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
+	
+ok 202 - commit NNO files attr=text aeol=crlf crlf=input LF_mix_cr
 
 expecting success: 
-			test-tool wildmatch iwildmatch 'foo' '**/foo'
-		
-ok 425 - iwildmatch: match 'foo' '**/foo'
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
+	
+ok 203 - commit NNO files attr=text aeol=crlf crlf=input CRLF_nul
 
 expecting success: 
-				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'
+		check_warning "$lfwarn" ${pfx}_LF.err
+	
+ok 204 - commit NNO files crlf=false attr=text LF
 
 expecting success: 
-			test_must_fail test-tool wildmatch pathmatch 'foo' '**/foo'
-		
-ok 427 - pathmatch: no match 'foo' '**/foo'
+		check_warning "$crlfwarn" ${pfx}_CRLF.err
+	
+ok 205 - commit NNO files attr=text aeol= crlf=false CRLF
 
 expecting success: 
-				>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'
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
+	
+ok 206 - commit NNO files attr=text aeol= crlf=false CRLF_mix_LF
 
 expecting success: 
-			test_must_fail test-tool wildmatch ipathmatch 'foo' '**/foo'
-		
-ok 429 - ipathmatch: no match 'foo' '**/foo'
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
+	
+ok 207 - commit NNO files attr=text aeol= crlf=false LF_mix_cr
 
 expecting success: 
-				>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'
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
+	
+ok 208 - commit NNO files attr=text aeol= crlf=false CRLF_nul
 
 expecting success: 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
+		check_warning "$lfwarn" ${pfx}_LF.err
 	
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-Removing foo
-ok 431 - cleanup after previous file test
+ok 209 - commit NNO files crlf=true attr=text LF
 
 expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			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_warning "$crlfwarn" ${pfx}_CRLF.err
 	
-ok 432 - setup match file test for XXX/foo
+ok 210 - commit NNO files attr=text aeol= crlf=true CRLF
 
 expecting success: 
-			test-tool wildmatch wildmatch 'XXX/foo' '**/foo'
-		
-ok 433 - wildmatch: match 'XXX/foo' '**/foo'
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
+	
+ok 211 - commit NNO files attr=text aeol= crlf=true CRLF_mix_LF
 
 expecting success: 
-				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'
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
+	
+ok 212 - commit NNO files attr=text aeol= crlf=true LF_mix_cr
 
 expecting success: 
-			test-tool wildmatch iwildmatch 'XXX/foo' '**/foo'
-		
-ok 435 - iwildmatch: match 'XXX/foo' '**/foo'
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
+	
+ok 213 - commit NNO files attr=text aeol= crlf=true CRLF_nul
 
 expecting success: 
-				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'
+		check_warning "$lfwarn" ${pfx}_LF.err
+	
+ok 214 - commit NNO files crlf=input attr=text LF
 
 expecting success: 
-			test-tool wildmatch pathmatch 'XXX/foo' '**/foo'
-		
-ok 437 - pathmatch: match 'XXX/foo' '**/foo'
+		check_warning "$crlfwarn" ${pfx}_CRLF.err
+	
+ok 215 - commit NNO files attr=text aeol= crlf=input CRLF
 
 expecting success: 
-				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'
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
+	
+ok 216 - commit NNO files attr=text aeol= crlf=input CRLF_mix_LF
 
 expecting success: 
-			test-tool wildmatch ipathmatch 'XXX/foo' '**/foo'
-		
-ok 439 - ipathmatch: match 'XXX/foo' '**/foo'
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
+	
+ok 217 - commit NNO files attr=text aeol= crlf=input LF_mix_cr
 
 expecting success: 
-				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'
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
+	
+ok 218 - commit NNO files attr=text aeol= crlf=input CRLF_nul
 
 expecting success: 
-		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
+	git commit -m "commit files on top of NNO" &&
+	rm -f *.txt &&
+	git -c core.autocrlf=false reset --hard
+
+[master 4808a9b] commit files on top of NNO
+ Author: A U Thor <author@example.com>
+ 210 files changed, 332 insertions(+), 362 deletions(-)
+HEAD is now at 4808a9b commit files on top of NNO
+ok 219 - commit NNO and cleanup
 
 expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git 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
+	check_files_in_repo false ""      LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul &&
+	check_files_in_repo true  ""      LF LF   LF          LF_mix_CR CRLF_nul &&
+	check_files_in_repo input ""      LF LF   LF          LF_mix_CR CRLF_nul
 
-expecting success: 
-			test-tool wildmatch wildmatch 'bar/baz/foo' '**/foo'
-		
-ok 443 - wildmatch: match 'bar/baz/foo' '**/foo'
+ok 220 - commit empty gitattribues
 
 expecting success: 
-				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'
+	check_files_in_repo false "auto"  LF LF   LF          LF_mix_CR CRLF_nul &&
+	check_files_in_repo true  "auto"  LF LF   LF          LF_mix_CR CRLF_nul &&
+	check_files_in_repo input "auto"  LF LF   LF          LF_mix_CR CRLF_nul
 
-expecting success: 
-			test-tool wildmatch iwildmatch 'bar/baz/foo' '**/foo'
-		
-ok 445 - iwildmatch: match 'bar/baz/foo' '**/foo'
+ok 221 - commit text=auto
 
 expecting success: 
-				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'
+	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
 
-expecting success: 
-			test-tool wildmatch pathmatch 'bar/baz/foo' '**/foo'
-		
-ok 447 - pathmatch: match 'bar/baz/foo' '**/foo'
+ok 222 - commit text
 
 expecting success: 
-				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'
+	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
 
-expecting success: 
-			test-tool wildmatch ipathmatch 'bar/baz/foo' '**/foo'
-		
-ok 449 - ipathmatch: match 'bar/baz/foo' '**/foo'
+ok 223 - commit -text
 
 expecting success: 
-				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'
+		compare_files $lfname ${pfx}_LF.txt
+	
+ok 224 - compare_files LF NNO_attr__aeol__true_LF.txt
 
 expecting success: 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
+		compare_files $crlfname ${pfx}_CRLF.txt
 	
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing bar/
-Removing expect
-ok 451 - cleanup after previous file test
+ok 225 - compare_files CRLF NNO_attr__aeol__true_CRLF.txt
 
 expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
+		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
 	
-ok 452 - setup match file test for bar/baz/foo
+ok 226 - compare_files CRLF_mix_LF NNO_attr__aeol__true_CRLF_mix_LF.txt
 
 expecting success: 
-			test_must_fail test-tool wildmatch wildmatch 'bar/baz/foo' '*/foo'
-		
-ok 453 - wildmatch: no match 'bar/baz/foo' '*/foo'
+		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
+	
+ok 227 - compare_files LF_mix_CR NNO_attr__aeol__true_LF_mix_CR.txt
 
 expecting success: 
-				>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'
+		compare_files $crlfnul ${pfx}_CRLF_nul.txt
+	
+ok 228 - compare_files CRLF_nul NNO_attr__aeol__true_CRLF_nul.txt
 
 expecting success: 
-			test_must_fail test-tool wildmatch iwildmatch 'bar/baz/foo' '*/foo'
-		
-ok 455 - iwildmatch: no match 'bar/baz/foo' '*/foo'
+		compare_files $lfname ${pfx}_LF.txt
+	
+ok 229 - compare_files LF NNO_attr_-text_aeol__true_LF.txt
 
 expecting success: 
-				>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'
+		compare_files $crlfname ${pfx}_CRLF.txt
+	
+ok 230 - compare_files CRLF NNO_attr_-text_aeol__true_CRLF.txt
 
 expecting success: 
-			test-tool wildmatch pathmatch 'bar/baz/foo' '*/foo'
-		
-ok 457 - pathmatch: match 'bar/baz/foo' '*/foo'
+		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
+	
+ok 231 - compare_files CRLF_mix_LF NNO_attr_-text_aeol__true_CRLF_mix_LF.txt
 
 expecting success: 
-				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'
+		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
+	
+ok 232 - compare_files LF_mix_CR NNO_attr_-text_aeol__true_LF_mix_CR.txt
 
 expecting success: 
-			test-tool wildmatch ipathmatch 'bar/baz/foo' '*/foo'
-		
-ok 459 - ipathmatch: match 'bar/baz/foo' '*/foo'
+		compare_files $crlfnul ${pfx}_CRLF_nul.txt
+	
+ok 233 - compare_files CRLF_nul NNO_attr_-text_aeol__true_CRLF_nul.txt
 
 expecting success: 
-				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'
+		compare_files $lfname ${pfx}_LF.txt
+	
+ok 234 - compare_files LF NNO_attr_-text_aeol_lf_true_LF.txt
 
 expecting success: 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
+		compare_files $crlfname ${pfx}_CRLF.txt
 	
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing bar/
-Removing expect
-ok 461 - cleanup after previous file test
+ok 235 - compare_files CRLF NNO_attr_-text_aeol_lf_true_CRLF.txt
 
 expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
+		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
 	
-ok 462 - setup match file test for foo/bar/baz
+ok 236 - compare_files CRLF_mix_LF NNO_attr_-text_aeol_lf_true_CRLF_mix_LF.txt
 
 expecting success: 
-			test_must_fail test-tool wildmatch wildmatch 'foo/bar/baz' '**/bar*'
-		
-ok 463 - wildmatch: no match 'foo/bar/baz' '**/bar*'
+		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
+	
+ok 237 - compare_files LF_mix_CR NNO_attr_-text_aeol_lf_true_LF_mix_CR.txt
 
 expecting success: 
-				>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'
+		compare_files $crlfnul ${pfx}_CRLF_nul.txt
+	
+ok 238 - compare_files CRLF_nul NNO_attr_-text_aeol_lf_true_CRLF_nul.txt
 
 expecting success: 
-			test_must_fail test-tool wildmatch iwildmatch 'foo/bar/baz' '**/bar*'
-		
-ok 465 - iwildmatch: no match 'foo/bar/baz' '**/bar*'
+		compare_files $lfname ${pfx}_LF.txt
+	
+ok 239 - compare_files LF NNO_attr_-text_aeol_crlf_true_LF.txt
 
 expecting success: 
-				>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'
+		compare_files $crlfname ${pfx}_CRLF.txt
+	
+ok 240 - compare_files CRLF NNO_attr_-text_aeol_crlf_true_CRLF.txt
 
 expecting success: 
-			test-tool wildmatch pathmatch 'foo/bar/baz' '**/bar*'
-		
-ok 467 - pathmatch: match 'foo/bar/baz' '**/bar*'
+		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
+	
+ok 241 - compare_files CRLF_mix_LF NNO_attr_-text_aeol_crlf_true_CRLF_mix_LF.txt
 
 expecting success: 
-				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'
+		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
+	
+ok 242 - compare_files LF_mix_CR NNO_attr_-text_aeol_crlf_true_LF_mix_CR.txt
 
 expecting success: 
-			test-tool wildmatch ipathmatch 'foo/bar/baz' '**/bar*'
-		
-ok 469 - ipathmatch: match 'foo/bar/baz' '**/bar*'
+		compare_files $crlfnul ${pfx}_CRLF_nul.txt
+	
+ok 243 - compare_files CRLF_nul NNO_attr_-text_aeol_crlf_true_CRLF_nul.txt
 
 expecting success: 
-				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'
+		compare_files $lfname ${pfx}_LF.txt
+	
+ok 244 - compare_files LF NNO_attr_auto_aeol__true_LF.txt
 
 expecting success: 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
+		compare_files $crlfname ${pfx}_CRLF.txt
 	
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-Removing foo/
-ok 471 - cleanup after previous file test
+ok 245 - compare_files CRLF NNO_attr_auto_aeol__true_CRLF.txt
 
 expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
+		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
 	
-ok 472 - setup match file test for deep/foo/bar/baz
+ok 246 - compare_files CRLF_mix_LF NNO_attr_auto_aeol__true_CRLF_mix_LF.txt
 
 expecting success: 
-			test-tool wildmatch wildmatch 'deep/foo/bar/baz' '**/bar/*'
-		
-ok 473 - wildmatch: match 'deep/foo/bar/baz' '**/bar/*'
+		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
+	
+ok 247 - compare_files LF_mix_CR NNO_attr_auto_aeol__true_LF_mix_CR.txt
 
 expecting success: 
-				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'
+		compare_files $crlfnul ${pfx}_CRLF_nul.txt
+	
+ok 248 - compare_files CRLF_nul NNO_attr_auto_aeol__true_CRLF_nul.txt
 
 expecting success: 
-			test-tool wildmatch iwildmatch 'deep/foo/bar/baz' '**/bar/*'
-		
-ok 475 - iwildmatch: match 'deep/foo/bar/baz' '**/bar/*'
+		compare_files $lfname ${pfx}_LF.txt
+	
+ok 249 - compare_files LF NNO_attr_auto_aeol_lf_true_LF.txt
 
 expecting success: 
-				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'
+		compare_files $crlfname ${pfx}_CRLF.txt
+	
+ok 250 - compare_files CRLF NNO_attr_auto_aeol_lf_true_CRLF.txt
 
 expecting success: 
-			test-tool wildmatch pathmatch 'deep/foo/bar/baz' '**/bar/*'
-		
-ok 477 - pathmatch: match 'deep/foo/bar/baz' '**/bar/*'
+		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
+	
+ok 251 - compare_files CRLF_mix_LF NNO_attr_auto_aeol_lf_true_CRLF_mix_LF.txt
 
 expecting success: 
-				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'
+		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
+	
+ok 252 - compare_files LF_mix_CR NNO_attr_auto_aeol_lf_true_LF_mix_CR.txt
 
 expecting success: 
-			test-tool wildmatch ipathmatch 'deep/foo/bar/baz' '**/bar/*'
-		
-ok 479 - ipathmatch: match 'deep/foo/bar/baz' '**/bar/*'
+		compare_files $crlfnul ${pfx}_CRLF_nul.txt
+	
+ok 253 - compare_files CRLF_nul NNO_attr_auto_aeol_lf_true_CRLF_nul.txt
 
 expecting success: 
-				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'
+		compare_files $lfname ${pfx}_LF.txt
+	
+ok 254 - compare_files LF NNO_attr_auto_aeol_crlf_true_LF.txt
 
 expecting success: 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
+		compare_files $crlfname ${pfx}_CRLF.txt
 	
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing deep/
-Removing expect
-ok 481 - cleanup after previous file test
+ok 255 - compare_files CRLF NNO_attr_auto_aeol_crlf_true_CRLF.txt
 
 expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
+		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
 	
-ok 482 - setup match file test for deep/foo/bar/baz/
+ok 256 - compare_files CRLF_mix_LF NNO_attr_auto_aeol_crlf_true_CRLF_mix_LF.txt
 
 expecting success: 
-			test_must_fail test-tool wildmatch wildmatch 'deep/foo/bar/baz/' '**/bar/*'
-		
-ok 483 - wildmatch: no match 'deep/foo/bar/baz/' '**/bar/*'
+		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
+	
+ok 257 - compare_files LF_mix_CR NNO_attr_auto_aeol_crlf_true_LF_mix_CR.txt
 
-checking known breakage: false
-not ok 484 - wildmatch (via ls-files): no match skip '**/bar/*' 'deep/foo/bar/baz/' # TODO known breakage
+expecting success: 
+		compare_files $crlfnul ${pfx}_CRLF_nul.txt
+	
+ok 258 - compare_files CRLF_nul NNO_attr_auto_aeol_crlf_true_CRLF_nul.txt
 
 expecting success: 
-			test_must_fail test-tool wildmatch iwildmatch 'deep/foo/bar/baz/' '**/bar/*'
-		
-ok 485 - iwildmatch: no match 'deep/foo/bar/baz/' '**/bar/*'
+		compare_files $lfname ${pfx}_LF.txt
+	
+ok 259 - compare_files LF NNO_attr_text_aeol__true_LF.txt
 
-checking known breakage: false
-not ok 486 - iwildmatch (via ls-files): no match skip '**/bar/*' 'deep/foo/bar/baz/' # TODO known breakage
+expecting success: 
+		compare_files $crlfname ${pfx}_CRLF.txt
+	
+ok 260 - compare_files LF NNO_attr_text_aeol__true_CRLF.txt
 
 expecting success: 
-			test-tool wildmatch pathmatch 'deep/foo/bar/baz/' '**/bar/*'
-		
-ok 487 - pathmatch: match 'deep/foo/bar/baz/' '**/bar/*'
+		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
+	
+ok 261 - compare_files LF NNO_attr_text_aeol__true_CRLF_mix_LF.txt
 
-checking known breakage: false
-not ok 488 - pathmatch (via ls-files): match skip '**/bar/*' 'deep/foo/bar/baz/' # TODO known breakage
+expecting success: 
+		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
+	
+ok 262 - compare_files LF_mix_CR NNO_attr_text_aeol__true_LF_mix_CR.txt
 
 expecting success: 
-			test-tool wildmatch ipathmatch 'deep/foo/bar/baz/' '**/bar/*'
-		
-ok 489 - ipathmatch: match 'deep/foo/bar/baz/' '**/bar/*'
+		compare_files $crlfnul ${pfx}_CRLF_nul.txt
+	
+ok 263 - compare_files LF_nul NNO_attr_text_aeol__true_CRLF_nul.txt
 
-checking known breakage: false
-not ok 490 - ipathmatch (via ls-files): match skip '**/bar/*' 'deep/foo/bar/baz/' # TODO known breakage
+expecting success: 
+		compare_files $lfname ${pfx}_LF.txt
+	
+ok 264 - compare_files LF NNO_attr_text_aeol_lf_true_LF.txt
 
 expecting success: 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
+		compare_files $crlfname ${pfx}_CRLF.txt
 	
-ok 491 - cleanup after previous file test
+ok 265 - compare_files LF NNO_attr_text_aeol_lf_true_CRLF.txt
 
 expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
+		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
 	
-ok 492 - setup match file test for deep/foo/bar/baz/
+ok 266 - compare_files LF NNO_attr_text_aeol_lf_true_CRLF_mix_LF.txt
 
 expecting success: 
-			test-tool wildmatch wildmatch 'deep/foo/bar/baz/' '**/bar/**'
-		
-ok 493 - wildmatch: match 'deep/foo/bar/baz/' '**/bar/**'
+		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
+	
+ok 267 - compare_files LF_mix_CR NNO_attr_text_aeol_lf_true_LF_mix_CR.txt
 
-checking known breakage: false
-not ok 494 - wildmatch (via ls-files): match skip '**/bar/**' 'deep/foo/bar/baz/' # TODO known breakage
+expecting success: 
+		compare_files $crlfnul ${pfx}_CRLF_nul.txt
+	
+ok 268 - compare_files LF_nul NNO_attr_text_aeol_lf_true_CRLF_nul.txt
 
 expecting success: 
-			test-tool wildmatch iwildmatch 'deep/foo/bar/baz/' '**/bar/**'
-		
-ok 495 - iwildmatch: match 'deep/foo/bar/baz/' '**/bar/**'
+		compare_files $lfname ${pfx}_LF.txt
+	
+ok 269 - compare_files LF NNO_attr_text_aeol_crlf_true_LF.txt
 
-checking known breakage: false
-not ok 496 - iwildmatch (via ls-files): match skip '**/bar/**' 'deep/foo/bar/baz/' # TODO known breakage
+expecting success: 
+		compare_files $crlfname ${pfx}_CRLF.txt
+	
+ok 270 - compare_files LF NNO_attr_text_aeol_crlf_true_CRLF.txt
 
 expecting success: 
-			test-tool wildmatch pathmatch 'deep/foo/bar/baz/' '**/bar/**'
-		
-ok 497 - pathmatch: match 'deep/foo/bar/baz/' '**/bar/**'
+		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
+	
+ok 271 - compare_files LF NNO_attr_text_aeol_crlf_true_CRLF_mix_LF.txt
 
-checking known breakage: false
-not ok 498 - pathmatch (via ls-files): match skip '**/bar/**' 'deep/foo/bar/baz/' # TODO known breakage
+expecting success: 
+		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
+	
+ok 272 - compare_files LF_mix_CR NNO_attr_text_aeol_crlf_true_LF_mix_CR.txt
 
 expecting success: 
-			test-tool wildmatch ipathmatch 'deep/foo/bar/baz/' '**/bar/**'
-		
-ok 499 - ipathmatch: match 'deep/foo/bar/baz/' '**/bar/**'
+		compare_files $crlfnul ${pfx}_CRLF_nul.txt
+	
+ok 273 - compare_files LF_nul NNO_attr_text_aeol_crlf_true_CRLF_nul.txt
 
-checking known breakage: false
-not ok 500 - ipathmatch (via ls-files): match skip '**/bar/**' 'deep/foo/bar/baz/' # TODO known breakage
+expecting success: 
+		compare_files $lfname ${pfx}_LF.txt
+	
+ok 274 - compare_files LF NNO_attr__aeol__false_LF.txt
 
 expecting success: 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
+		compare_files $crlfname ${pfx}_CRLF.txt
 	
-ok 501 - cleanup after previous file test
+ok 275 - compare_files CRLF NNO_attr__aeol__false_CRLF.txt
 
 expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
+		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
 	
-ok 502 - setup match file test for deep/foo/bar
+ok 276 - compare_files CRLF_mix_LF NNO_attr__aeol__false_CRLF_mix_LF.txt
 
 expecting success: 
-			test_must_fail test-tool wildmatch wildmatch 'deep/foo/bar' '**/bar/*'
-		
-ok 503 - wildmatch: no match 'deep/foo/bar' '**/bar/*'
+		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
+	
+ok 277 - compare_files LF_mix_CR NNO_attr__aeol__false_LF_mix_CR.txt
 
 expecting success: 
-				>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'
+		compare_files $crlfnul ${pfx}_CRLF_nul.txt
+	
+ok 278 - compare_files CRLF_nul NNO_attr__aeol__false_CRLF_nul.txt
 
 expecting success: 
-			test_must_fail test-tool wildmatch iwildmatch 'deep/foo/bar' '**/bar/*'
-		
-ok 505 - iwildmatch: no match 'deep/foo/bar' '**/bar/*'
+		compare_files $lfname ${pfx}_LF.txt
+	
+ok 279 - compare_files LF NNO_attr_-text_aeol__false_LF.txt
 
 expecting success: 
-				>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'
+		compare_files $crlfname ${pfx}_CRLF.txt
+	
+ok 280 - compare_files CRLF NNO_attr_-text_aeol__false_CRLF.txt
 
 expecting success: 
-			test_must_fail test-tool wildmatch pathmatch 'deep/foo/bar' '**/bar/*'
-		
-ok 507 - pathmatch: no match 'deep/foo/bar' '**/bar/*'
+		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
+	
+ok 281 - compare_files CRLF_mix_LF NNO_attr_-text_aeol__false_CRLF_mix_LF.txt
 
 expecting success: 
-				>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'
+		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
+	
+ok 282 - compare_files LF_mix_CR NNO_attr_-text_aeol__false_LF_mix_CR.txt
 
 expecting success: 
-			test_must_fail test-tool wildmatch ipathmatch 'deep/foo/bar' '**/bar/*'
-		
-ok 509 - ipathmatch: no match 'deep/foo/bar' '**/bar/*'
+		compare_files $crlfnul ${pfx}_CRLF_nul.txt
+	
+ok 283 - compare_files CRLF_nul NNO_attr_-text_aeol__false_CRLF_nul.txt
 
 expecting success: 
-				>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'
+		compare_files $lfname ${pfx}_LF.txt
+	
+ok 284 - compare_files LF NNO_attr_-text_aeol_lf_false_LF.txt
 
 expecting success: 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
+		compare_files $crlfname ${pfx}_CRLF.txt
 	
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing deep/
-Removing expect
-ok 511 - cleanup after previous file test
+ok 285 - compare_files CRLF NNO_attr_-text_aeol_lf_false_CRLF.txt
 
 expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
+		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
 	
-ok 512 - setup match file test for deep/foo/bar/
+ok 286 - compare_files CRLF_mix_LF NNO_attr_-text_aeol_lf_false_CRLF_mix_LF.txt
 
 expecting success: 
-			test-tool wildmatch wildmatch 'deep/foo/bar/' '**/bar/**'
-		
-ok 513 - wildmatch: match 'deep/foo/bar/' '**/bar/**'
+		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
+	
+ok 287 - compare_files LF_mix_CR NNO_attr_-text_aeol_lf_false_LF_mix_CR.txt
 
-checking known breakage: false
-not ok 514 - wildmatch (via ls-files): match skip '**/bar/**' 'deep/foo/bar/' # TODO known breakage
+expecting success: 
+		compare_files $crlfnul ${pfx}_CRLF_nul.txt
+	
+ok 288 - compare_files CRLF_nul NNO_attr_-text_aeol_lf_false_CRLF_nul.txt
 
 expecting success: 
-			test-tool wildmatch iwildmatch 'deep/foo/bar/' '**/bar/**'
-		
-ok 515 - iwildmatch: match 'deep/foo/bar/' '**/bar/**'
+		compare_files $lfname ${pfx}_LF.txt
+	
+ok 289 - compare_files LF NNO_attr_-text_aeol_crlf_false_LF.txt
 
-checking known breakage: false
-not ok 516 - iwildmatch (via ls-files): match skip '**/bar/**' 'deep/foo/bar/' # TODO known breakage
+expecting success: 
+		compare_files $crlfname ${pfx}_CRLF.txt
+	
+ok 290 - compare_files CRLF NNO_attr_-text_aeol_crlf_false_CRLF.txt
 
 expecting success: 
-			test-tool wildmatch pathmatch 'deep/foo/bar/' '**/bar/**'
-		
-ok 517 - pathmatch: match 'deep/foo/bar/' '**/bar/**'
+		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
+	
+ok 291 - compare_files CRLF_mix_LF NNO_attr_-text_aeol_crlf_false_CRLF_mix_LF.txt
 
-checking known breakage: false
-not ok 518 - pathmatch (via ls-files): match skip '**/bar/**' 'deep/foo/bar/' # TODO known breakage
+expecting success: 
+		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
+	
+ok 292 - compare_files LF_mix_CR NNO_attr_-text_aeol_crlf_false_LF_mix_CR.txt
 
 expecting success: 
-			test-tool wildmatch ipathmatch 'deep/foo/bar/' '**/bar/**'
-		
-ok 519 - ipathmatch: match 'deep/foo/bar/' '**/bar/**'
+		compare_files $crlfnul ${pfx}_CRLF_nul.txt
+	
+ok 293 - compare_files CRLF_nul NNO_attr_-text_aeol_crlf_false_CRLF_nul.txt
 
-checking known breakage: false
-not ok 520 - ipathmatch (via ls-files): match skip '**/bar/**' 'deep/foo/bar/' # TODO known breakage
+expecting success: 
+		compare_files $lfname ${pfx}_LF.txt
+	
+ok 294 - compare_files LF NNO_attr_auto_aeol__false_LF.txt
 
 expecting success: 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
+		compare_files $crlfname ${pfx}_CRLF.txt
 	
-ok 521 - cleanup after previous file test
+ok 295 - compare_files CRLF NNO_attr_auto_aeol__false_CRLF.txt
 
 expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
+		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
 	
-ok 522 - setup match file test for foo/bar/baz
+ok 296 - compare_files CRLF_mix_LF NNO_attr_auto_aeol__false_CRLF_mix_LF.txt
 
 expecting success: 
-			test_must_fail test-tool wildmatch wildmatch 'foo/bar/baz' '**/bar**'
-		
-ok 523 - wildmatch: no match 'foo/bar/baz' '**/bar**'
+		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
+	
+ok 297 - compare_files LF_mix_CR NNO_attr_auto_aeol__false_LF_mix_CR.txt
 
 expecting success: 
-				>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'
+		compare_files $crlfnul ${pfx}_CRLF_nul.txt
+	
+ok 298 - compare_files CRLF_nul NNO_attr_auto_aeol__false_CRLF_nul.txt
 
 expecting success: 
-			test_must_fail test-tool wildmatch iwildmatch 'foo/bar/baz' '**/bar**'
-		
-ok 525 - iwildmatch: no match 'foo/bar/baz' '**/bar**'
+		compare_files $lfname ${pfx}_LF.txt
+	
+ok 299 - compare_files LF NNO_attr_auto_aeol_lf_false_LF.txt
 
 expecting success: 
-				>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'
+		compare_files $crlfname ${pfx}_CRLF.txt
+	
+ok 300 - compare_files CRLF NNO_attr_auto_aeol_lf_false_CRLF.txt
 
 expecting success: 
-			test-tool wildmatch pathmatch 'foo/bar/baz' '**/bar**'
-		
-ok 527 - pathmatch: match 'foo/bar/baz' '**/bar**'
+		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
+	
+ok 301 - compare_files CRLF_mix_LF NNO_attr_auto_aeol_lf_false_CRLF_mix_LF.txt
 
 expecting success: 
-				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'
+		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
+	
+ok 302 - compare_files LF_mix_CR NNO_attr_auto_aeol_lf_false_LF_mix_CR.txt
 
 expecting success: 
-			test-tool wildmatch ipathmatch 'foo/bar/baz' '**/bar**'
-		
-ok 529 - ipathmatch: match 'foo/bar/baz' '**/bar**'
+		compare_files $crlfnul ${pfx}_CRLF_nul.txt
+	
+ok 303 - compare_files CRLF_nul NNO_attr_auto_aeol_lf_false_CRLF_nul.txt
 
 expecting success: 
-				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'
+		compare_files $lfname ${pfx}_LF.txt
+	
+ok 304 - compare_files LF NNO_attr_auto_aeol_crlf_false_LF.txt
 
 expecting success: 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
+		compare_files $crlfname ${pfx}_CRLF.txt
 	
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-Removing foo/
-ok 531 - cleanup after previous file test
+ok 305 - compare_files CRLF NNO_attr_auto_aeol_crlf_false_CRLF.txt
 
 expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
+		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
 	
-ok 532 - setup match file test for foo/bar/baz/x
+ok 306 - compare_files CRLF_mix_LF NNO_attr_auto_aeol_crlf_false_CRLF_mix_LF.txt
 
 expecting success: 
-			test-tool wildmatch wildmatch 'foo/bar/baz/x' '*/bar/**'
-		
-ok 533 - wildmatch: match 'foo/bar/baz/x' '*/bar/**'
+		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
+	
+ok 307 - compare_files LF_mix_CR NNO_attr_auto_aeol_crlf_false_LF_mix_CR.txt
 
 expecting success: 
-				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'
+		compare_files $crlfnul ${pfx}_CRLF_nul.txt
+	
+ok 308 - compare_files CRLF_nul NNO_attr_auto_aeol_crlf_false_CRLF_nul.txt
 
 expecting success: 
-			test-tool wildmatch iwildmatch 'foo/bar/baz/x' '*/bar/**'
-		
-ok 535 - iwildmatch: match 'foo/bar/baz/x' '*/bar/**'
+		compare_files $lfname ${pfx}_LF.txt
+	
+ok 309 - compare_files LF NNO_attr_text_aeol__false_LF.txt
 
 expecting success: 
-				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'
+		compare_files $crlfname ${pfx}_CRLF.txt
+	
+ok 310 - compare_files LF NNO_attr_text_aeol__false_CRLF.txt
 
 expecting success: 
-			test-tool wildmatch pathmatch 'foo/bar/baz/x' '*/bar/**'
-		
-ok 537 - pathmatch: match 'foo/bar/baz/x' '*/bar/**'
+		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
+	
+ok 311 - compare_files LF NNO_attr_text_aeol__false_CRLF_mix_LF.txt
 
 expecting success: 
-				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'
+		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
+	
+ok 312 - compare_files LF_mix_CR NNO_attr_text_aeol__false_LF_mix_CR.txt
 
 expecting success: 
-			test-tool wildmatch ipathmatch 'foo/bar/baz/x' '*/bar/**'
-		
-ok 539 - ipathmatch: match 'foo/bar/baz/x' '*/bar/**'
+		compare_files $crlfnul ${pfx}_CRLF_nul.txt
+	
+ok 313 - compare_files LF_nul NNO_attr_text_aeol__false_CRLF_nul.txt
 
 expecting success: 
-				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'
+		compare_files $lfname ${pfx}_LF.txt
+	
+ok 314 - compare_files LF NNO_attr_text_aeol_lf_false_LF.txt
 
 expecting success: 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
+		compare_files $crlfname ${pfx}_CRLF.txt
 	
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-Removing foo/
-ok 541 - cleanup after previous file test
+ok 315 - compare_files LF NNO_attr_text_aeol_lf_false_CRLF.txt
 
 expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
+		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
 	
-ok 542 - setup match file test for deep/foo/bar/baz/x
+ok 316 - compare_files LF NNO_attr_text_aeol_lf_false_CRLF_mix_LF.txt
 
 expecting success: 
-			test_must_fail test-tool wildmatch wildmatch 'deep/foo/bar/baz/x' '*/bar/**'
-		
-ok 543 - wildmatch: no match 'deep/foo/bar/baz/x' '*/bar/**'
+		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
+	
+ok 317 - compare_files LF_mix_CR NNO_attr_text_aeol_lf_false_LF_mix_CR.txt
 
 expecting success: 
-				>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'
+		compare_files $crlfnul ${pfx}_CRLF_nul.txt
+	
+ok 318 - compare_files LF_nul NNO_attr_text_aeol_lf_false_CRLF_nul.txt
 
 expecting success: 
-			test_must_fail test-tool wildmatch iwildmatch 'deep/foo/bar/baz/x' '*/bar/**'
-		
-ok 545 - iwildmatch: no match 'deep/foo/bar/baz/x' '*/bar/**'
+		compare_files $lfname ${pfx}_LF.txt
+	
+ok 319 - compare_files LF NNO_attr_text_aeol_crlf_false_LF.txt
 
 expecting success: 
-				>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'
+		compare_files $crlfname ${pfx}_CRLF.txt
+	
+ok 320 - compare_files LF NNO_attr_text_aeol_crlf_false_CRLF.txt
 
 expecting success: 
-			test-tool wildmatch pathmatch 'deep/foo/bar/baz/x' '*/bar/**'
-		
-ok 547 - pathmatch: match 'deep/foo/bar/baz/x' '*/bar/**'
+		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
+	
+ok 321 - compare_files LF NNO_attr_text_aeol_crlf_false_CRLF_mix_LF.txt
 
 expecting success: 
-				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'
+		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
+	
+ok 322 - compare_files LF_mix_CR NNO_attr_text_aeol_crlf_false_LF_mix_CR.txt
 
 expecting success: 
-			test-tool wildmatch ipathmatch 'deep/foo/bar/baz/x' '*/bar/**'
-		
-ok 549 - ipathmatch: match 'deep/foo/bar/baz/x' '*/bar/**'
+		compare_files $crlfnul ${pfx}_CRLF_nul.txt
+	
+ok 323 - compare_files LF_nul NNO_attr_text_aeol_crlf_false_CRLF_nul.txt
 
 expecting success: 
-				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'
+		compare_files $lfname ${pfx}_LF.txt
+	
+ok 324 - compare_files LF NNO_attr__aeol__input_LF.txt
 
 expecting success: 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
+		compare_files $crlfname ${pfx}_CRLF.txt
 	
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing deep/
-Removing expect
-ok 551 - cleanup after previous file test
+ok 325 - compare_files CRLF NNO_attr__aeol__input_CRLF.txt
 
 expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
+		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
 	
-ok 552 - setup match file test for deep/foo/bar/baz/x
+ok 326 - compare_files CRLF_mix_LF NNO_attr__aeol__input_CRLF_mix_LF.txt
 
 expecting success: 
-			test-tool wildmatch wildmatch 'deep/foo/bar/baz/x' '**/bar/*/*'
-		
-ok 553 - wildmatch: match 'deep/foo/bar/baz/x' '**/bar/*/*'
+		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
+	
+ok 327 - compare_files LF_mix_CR NNO_attr__aeol__input_LF_mix_CR.txt
 
 expecting success: 
-				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'
+		compare_files $crlfnul ${pfx}_CRLF_nul.txt
+	
+ok 328 - compare_files CRLF_nul NNO_attr__aeol__input_CRLF_nul.txt
 
 expecting success: 
-			test-tool wildmatch iwildmatch 'deep/foo/bar/baz/x' '**/bar/*/*'
-		
-ok 555 - iwildmatch: match 'deep/foo/bar/baz/x' '**/bar/*/*'
+		compare_files $lfname ${pfx}_LF.txt
+	
+ok 329 - compare_files LF NNO_attr_-text_aeol__input_LF.txt
 
 expecting success: 
-				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'
+		compare_files $crlfname ${pfx}_CRLF.txt
+	
+ok 330 - compare_files CRLF NNO_attr_-text_aeol__input_CRLF.txt
 
 expecting success: 
-			test-tool wildmatch pathmatch 'deep/foo/bar/baz/x' '**/bar/*/*'
-		
-ok 557 - pathmatch: match 'deep/foo/bar/baz/x' '**/bar/*/*'
+		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
+	
+ok 331 - compare_files CRLF_mix_LF NNO_attr_-text_aeol__input_CRLF_mix_LF.txt
 
 expecting success: 
-				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'
+		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
+	
+ok 332 - compare_files LF_mix_CR NNO_attr_-text_aeol__input_LF_mix_CR.txt
 
 expecting success: 
-			test-tool wildmatch ipathmatch 'deep/foo/bar/baz/x' '**/bar/*/*'
-		
-ok 559 - ipathmatch: match 'deep/foo/bar/baz/x' '**/bar/*/*'
+		compare_files $crlfnul ${pfx}_CRLF_nul.txt
+	
+ok 333 - compare_files CRLF_nul NNO_attr_-text_aeol__input_CRLF_nul.txt
 
 expecting success: 
-				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'
+		compare_files $lfname ${pfx}_LF.txt
+	
+ok 334 - compare_files LF NNO_attr_-text_aeol_lf_input_LF.txt
 
 expecting success: 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
+		compare_files $crlfname ${pfx}_CRLF.txt
 	
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing deep/
-Removing expect
-ok 561 - cleanup after previous file test
+ok 335 - compare_files CRLF NNO_attr_-text_aeol_lf_input_CRLF.txt
 
 expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
+		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
 	
-ok 562 - setup match file test for acrt
+ok 336 - compare_files CRLF_mix_LF NNO_attr_-text_aeol_lf_input_CRLF_mix_LF.txt
 
 expecting success: 
-			test_must_fail test-tool wildmatch wildmatch 'acrt' 'a[c-c]st'
-		
-ok 563 - wildmatch: no match 'acrt' 'a[c-c]st'
+		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
+	
+ok 337 - compare_files LF_mix_CR NNO_attr_-text_aeol_lf_input_LF_mix_CR.txt
 
 expecting success: 
-				>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'
+		compare_files $crlfnul ${pfx}_CRLF_nul.txt
+	
+ok 338 - compare_files CRLF_nul NNO_attr_-text_aeol_lf_input_CRLF_nul.txt
 
 expecting success: 
-			test_must_fail test-tool wildmatch iwildmatch 'acrt' 'a[c-c]st'
-		
-ok 565 - iwildmatch: no match 'acrt' 'a[c-c]st'
+		compare_files $lfname ${pfx}_LF.txt
+	
+ok 339 - compare_files LF NNO_attr_-text_aeol_crlf_input_LF.txt
 
 expecting success: 
-				>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'
+		compare_files $crlfname ${pfx}_CRLF.txt
+	
+ok 340 - compare_files CRLF NNO_attr_-text_aeol_crlf_input_CRLF.txt
 
 expecting success: 
-			test_must_fail test-tool wildmatch pathmatch 'acrt' 'a[c-c]st'
-		
-ok 567 - pathmatch: no match 'acrt' 'a[c-c]st'
+		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
+	
+ok 341 - compare_files CRLF_mix_LF NNO_attr_-text_aeol_crlf_input_CRLF_mix_LF.txt
 
 expecting success: 
-				>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'
+		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
+	
+ok 342 - compare_files LF_mix_CR NNO_attr_-text_aeol_crlf_input_LF_mix_CR.txt
 
 expecting success: 
-			test_must_fail test-tool wildmatch ipathmatch 'acrt' 'a[c-c]st'
-		
-ok 569 - ipathmatch: no match 'acrt' 'a[c-c]st'
+		compare_files $crlfnul ${pfx}_CRLF_nul.txt
+	
+ok 343 - compare_files CRLF_nul NNO_attr_-text_aeol_crlf_input_CRLF_nul.txt
 
 expecting success: 
-				>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'
+		compare_files $lfname ${pfx}_LF.txt
+	
+ok 344 - compare_files LF NNO_attr_auto_aeol__input_LF.txt
 
 expecting success: 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
+		compare_files $crlfname ${pfx}_CRLF.txt
 	
-Removing acrt
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 571 - cleanup after previous file test
+ok 345 - compare_files CRLF NNO_attr_auto_aeol__input_CRLF.txt
 
 expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
+		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
 	
-ok 572 - setup match file test for acrt
+ok 346 - compare_files CRLF_mix_LF NNO_attr_auto_aeol__input_CRLF_mix_LF.txt
 
 expecting success: 
-			test-tool wildmatch wildmatch 'acrt' 'a[c-c]rt'
-		
-ok 573 - wildmatch: match 'acrt' 'a[c-c]rt'
+		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
+	
+ok 347 - compare_files LF_mix_CR NNO_attr_auto_aeol__input_LF_mix_CR.txt
 
 expecting success: 
-				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'
+		compare_files $crlfnul ${pfx}_CRLF_nul.txt
+	
+ok 348 - compare_files CRLF_nul NNO_attr_auto_aeol__input_CRLF_nul.txt
 
 expecting success: 
-			test-tool wildmatch iwildmatch 'acrt' 'a[c-c]rt'
-		
-ok 575 - iwildmatch: match 'acrt' 'a[c-c]rt'
+		compare_files $lfname ${pfx}_LF.txt
+	
+ok 349 - compare_files LF NNO_attr_auto_aeol_lf_input_LF.txt
 
 expecting success: 
-				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'
+		compare_files $crlfname ${pfx}_CRLF.txt
+	
+ok 350 - compare_files CRLF NNO_attr_auto_aeol_lf_input_CRLF.txt
 
 expecting success: 
-			test-tool wildmatch pathmatch 'acrt' 'a[c-c]rt'
-		
-ok 577 - pathmatch: match 'acrt' 'a[c-c]rt'
+		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
+	
+ok 351 - compare_files CRLF_mix_LF NNO_attr_auto_aeol_lf_input_CRLF_mix_LF.txt
 
 expecting success: 
-				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'
+		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
+	
+ok 352 - compare_files LF_mix_CR NNO_attr_auto_aeol_lf_input_LF_mix_CR.txt
 
 expecting success: 
-			test-tool wildmatch ipathmatch 'acrt' 'a[c-c]rt'
-		
-ok 579 - ipathmatch: match 'acrt' 'a[c-c]rt'
+		compare_files $crlfnul ${pfx}_CRLF_nul.txt
+	
+ok 353 - compare_files CRLF_nul NNO_attr_auto_aeol_lf_input_CRLF_nul.txt
 
 expecting success: 
-				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'
+		compare_files $lfname ${pfx}_LF.txt
+	
+ok 354 - compare_files LF NNO_attr_auto_aeol_crlf_input_LF.txt
 
 expecting success: 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
+		compare_files $crlfname ${pfx}_CRLF.txt
 	
-Removing acrt
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 581 - cleanup after previous file test
+ok 355 - compare_files CRLF NNO_attr_auto_aeol_crlf_input_CRLF.txt
 
 expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
+		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
 	
-ok 582 - setup match file test for ]
+ok 356 - compare_files CRLF_mix_LF NNO_attr_auto_aeol_crlf_input_CRLF_mix_LF.txt
 
 expecting success: 
-			test_must_fail test-tool wildmatch wildmatch ']' '[!]-]'
-		
-ok 583 - wildmatch: no match ']' '[!]-]'
+		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
+	
+ok 357 - compare_files LF_mix_CR NNO_attr_auto_aeol_crlf_input_LF_mix_CR.txt
 
 expecting success: 
-				>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 '[!]-]' ']'
+		compare_files $crlfnul ${pfx}_CRLF_nul.txt
+	
+ok 358 - compare_files CRLF_nul NNO_attr_auto_aeol_crlf_input_CRLF_nul.txt
 
 expecting success: 
-			test_must_fail test-tool wildmatch iwildmatch ']' '[!]-]'
-		
-ok 585 - iwildmatch: no match ']' '[!]-]'
+		compare_files $lfname ${pfx}_LF.txt
+	
+ok 359 - compare_files LF NNO_attr_text_aeol__input_LF.txt
 
 expecting success: 
-				>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 '[!]-]' ']'
+		compare_files $crlfname ${pfx}_CRLF.txt
+	
+ok 360 - compare_files LF NNO_attr_text_aeol__input_CRLF.txt
 
 expecting success: 
-			test_must_fail test-tool wildmatch pathmatch ']' '[!]-]'
-		
-ok 587 - pathmatch: no match ']' '[!]-]'
+		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
+	
+ok 361 - compare_files LF NNO_attr_text_aeol__input_CRLF_mix_LF.txt
 
 expecting success: 
-				>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 '[!]-]' ']'
+		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
+	
+ok 362 - compare_files LF_mix_CR NNO_attr_text_aeol__input_LF_mix_CR.txt
 
 expecting success: 
-			test_must_fail test-tool wildmatch ipathmatch ']' '[!]-]'
-		
-ok 589 - ipathmatch: no match ']' '[!]-]'
+		compare_files $crlfnul ${pfx}_CRLF_nul.txt
+	
+ok 363 - compare_files LF_nul NNO_attr_text_aeol__input_CRLF_nul.txt
 
 expecting success: 
-				>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 '[!]-]' ']'
+		compare_files $lfname ${pfx}_LF.txt
+	
+ok 364 - compare_files LF NNO_attr_text_aeol_lf_input_LF.txt
 
 expecting success: 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
+		compare_files $crlfname ${pfx}_CRLF.txt
 	
-Removing ]
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 591 - cleanup after previous file test
+ok 365 - compare_files LF NNO_attr_text_aeol_lf_input_CRLF.txt
 
 expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
+		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
 	
-ok 592 - setup match file test for a
+ok 366 - compare_files LF NNO_attr_text_aeol_lf_input_CRLF_mix_LF.txt
 
 expecting success: 
-			test-tool wildmatch wildmatch 'a' '[!]-]'
-		
-ok 593 - wildmatch: match 'a' '[!]-]'
+		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
+	
+ok 367 - compare_files LF_mix_CR NNO_attr_text_aeol_lf_input_LF_mix_CR.txt
 
 expecting success: 
-				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'
+		compare_files $crlfnul ${pfx}_CRLF_nul.txt
+	
+ok 368 - compare_files LF_nul NNO_attr_text_aeol_lf_input_CRLF_nul.txt
 
 expecting success: 
-			test-tool wildmatch iwildmatch 'a' '[!]-]'
-		
-ok 595 - iwildmatch: match 'a' '[!]-]'
+		compare_files $lfname ${pfx}_LF.txt
+	
+ok 369 - compare_files LF NNO_attr_text_aeol_crlf_input_LF.txt
 
 expecting success: 
-				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'
+		compare_files $crlfname ${pfx}_CRLF.txt
+	
+ok 370 - compare_files LF NNO_attr_text_aeol_crlf_input_CRLF.txt
 
 expecting success: 
-			test-tool wildmatch pathmatch 'a' '[!]-]'
-		
-ok 597 - pathmatch: match 'a' '[!]-]'
+		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
+	
+ok 371 - compare_files LF NNO_attr_text_aeol_crlf_input_CRLF_mix_LF.txt
 
 expecting success: 
-				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'
+		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
+	
+ok 372 - compare_files LF_mix_CR NNO_attr_text_aeol_crlf_input_LF_mix_CR.txt
 
 expecting success: 
-			test-tool wildmatch ipathmatch 'a' '[!]-]'
-		
-ok 599 - ipathmatch: match 'a' '[!]-]'
+		compare_files $crlfnul ${pfx}_CRLF_nul.txt
+	
+ok 373 - compare_files LF_nul NNO_attr_text_aeol_crlf_input_CRLF_nul.txt
 
 expecting success: 
-				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_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
 		test_cmp expect actual
-			
-ok 600 - ipathmatch (via ls-files): match '[!]-]' 'a'
+	
+ok 374 - ls-files --eol attr=-text  aeol= core.autocrlf=true core.eol=lf
 
 expecting success: 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
+		compare_ws_file eol_lf_crlf_true_attr_-text_ LF    crlf_false_attr__LF.txt
 	
-Removing a
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 601 - cleanup after previous file test
+ok 375 - checkout attr=-text  aeol= core.autocrlf=true core.eol=lf file=LF
 
 expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
+		compare_ws_file eol_lf_crlf_true_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 602 - setup match file test for 
+ok 376 - checkout attr=-text  aeol= core.autocrlf=true core.eol=lf file=CRLF
 
 expecting success: 
-			test_must_fail test-tool wildmatch wildmatch '' '\'
-		
-ok 603 - wildmatch: no match '' '\'
+		compare_ws_file eol_lf_crlf_true_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 377 - checkout attr=-text  aeol= core.autocrlf=true core.eol=lf file=CRLF_mix_LF
 
-checking known breakage: false
-not ok 604 - wildmatch (via ls-files): no match skip '\' '' # TODO known breakage
+expecting success: 
+		compare_ws_file eol_lf_crlf_true_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 378 - checkout attr=-text  aeol= core.autocrlf=true core.eol=lf file=LF_mix_CR
 
 expecting success: 
-			test_must_fail test-tool wildmatch iwildmatch '' '\'
-		
-ok 605 - iwildmatch: no match '' '\'
+		compare_ws_file eol_lf_crlf_true_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 379 - checkout attr=-text  aeol= core.autocrlf=true core.eol=lf file=LF_nul
 
-checking known breakage: false
-not ok 606 - iwildmatch (via ls-files): no match skip '\' '' # TODO known breakage
+expecting success: 
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
+		test_cmp expect actual
+	
+ok 380 - ls-files --eol attr=-text  aeol=lf core.autocrlf=true core.eol=lf
 
 expecting success: 
-			test_must_fail test-tool wildmatch pathmatch '' '\'
-		
-ok 607 - pathmatch: no match '' '\'
+		compare_ws_file eol_lf_crlf_true_attr_-text_ LF    crlf_false_attr__LF.txt
+	
+ok 381 - checkout attr=-text  aeol=lf core.autocrlf=true core.eol=lf file=LF
 
-checking known breakage: false
-not ok 608 - pathmatch (via ls-files): no match skip '\' '' # TODO known breakage
+expecting success: 
+		compare_ws_file eol_lf_crlf_true_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 382 - checkout attr=-text  aeol=lf core.autocrlf=true core.eol=lf file=CRLF
 
 expecting success: 
-			test_must_fail test-tool wildmatch ipathmatch '' '\'
-		
-ok 609 - ipathmatch: no match '' '\'
+		compare_ws_file eol_lf_crlf_true_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 383 - checkout attr=-text  aeol=lf core.autocrlf=true core.eol=lf file=CRLF_mix_LF
 
-checking known breakage: false
-not ok 610 - ipathmatch (via ls-files): no match skip '\' '' # TODO known breakage
+expecting success: 
+		compare_ws_file eol_lf_crlf_true_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 384 - checkout attr=-text  aeol=lf core.autocrlf=true core.eol=lf file=LF_mix_CR
 
 expecting success: 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
+		compare_ws_file eol_lf_crlf_true_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
 	
-ok 611 - cleanup after previous file test
+ok 385 - checkout attr=-text  aeol=lf core.autocrlf=true core.eol=lf file=LF_nul
 
 expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
+		test_cmp expect actual
 	
-ok 612 - setup match file test for \
+ok 386 - ls-files --eol attr=-text  aeol=crlf core.autocrlf=true core.eol=lf
 
 expecting success: 
-			test_must_fail test-tool wildmatch wildmatch '\' '\'
-		
-ok 613 - wildmatch: no match '\' '\'
+		compare_ws_file eol_lf_crlf_true_attr_-text_ LF    crlf_false_attr__LF.txt
+	
+ok 387 - checkout attr=-text  aeol=crlf core.autocrlf=true core.eol=lf file=LF
 
 expecting success: 
-				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 '\' '\'
+		compare_ws_file eol_lf_crlf_true_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 388 - checkout attr=-text  aeol=crlf core.autocrlf=true core.eol=lf file=CRLF
 
 expecting success: 
-			test_must_fail test-tool wildmatch iwildmatch '\' '\'
-		
-ok 615 - iwildmatch: no match '\' '\'
+		compare_ws_file eol_lf_crlf_true_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 389 - checkout attr=-text  aeol=crlf core.autocrlf=true core.eol=lf file=CRLF_mix_LF
 
 expecting success: 
-				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 '\' '\'
+		compare_ws_file eol_lf_crlf_true_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 390 - checkout attr=-text  aeol=crlf core.autocrlf=true core.eol=lf file=LF_mix_CR
 
 expecting success: 
-			test_must_fail test-tool wildmatch pathmatch '\' '\'
-		
-ok 617 - pathmatch: no match '\' '\'
+		compare_ws_file eol_lf_crlf_true_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 391 - checkout attr=-text  aeol=crlf core.autocrlf=true core.eol=lf file=LF_nul
 
 expecting success: 
-				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_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
 		test_cmp expect actual
-			
-ok 618 - pathmatch (via ls-files): match '\' '\'
+	
+ok 392 - ls-files --eol attr=text  aeol=lf core.autocrlf=true core.eol=lf
 
 expecting success: 
-			test_must_fail test-tool wildmatch ipathmatch '\' '\'
-		
-ok 619 - ipathmatch: no match '\' '\'
+		compare_ws_file eol_lf_crlf_true_attr_text_ LF    crlf_false_attr__LF.txt
+	
+ok 393 - checkout attr=text  aeol=lf core.autocrlf=true core.eol=lf file=LF
 
 expecting success: 
-				printf '%s' '\' >expect &&
-				git --icase-pathspecs ls-files -z -- '\' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 620 - ipathmatch (via ls-files): match '\' '\'
+		compare_ws_file eol_lf_crlf_true_attr_text_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 394 - checkout attr=text  aeol=lf core.autocrlf=true core.eol=lf file=CRLF
 
 expecting success: 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
+		compare_ws_file eol_lf_crlf_true_attr_text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
 	
-Removing "\\"
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 621 - cleanup after previous file test
+ok 395 - checkout attr=text  aeol=lf core.autocrlf=true core.eol=lf file=CRLF_mix_LF
 
 expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
+		compare_ws_file eol_lf_crlf_true_attr_text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 622 - setup match file test for XXX/\
+ok 396 - checkout attr=text  aeol=lf core.autocrlf=true core.eol=lf file=LF_mix_CR
 
 expecting success: 
-			test_must_fail test-tool wildmatch wildmatch 'XXX/\' '*/\'
-		
-ok 623 - wildmatch: no match 'XXX/\' '*/\'
+		compare_ws_file eol_lf_crlf_true_attr_text_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 397 - checkout attr=text  aeol=lf core.autocrlf=true core.eol=lf file=LF_nul
 
 expecting success: 
-				>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_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
 		test_cmp expect actual
-			
-ok 624 - wildmatch (via ls-files): no match '*/\' 'XXX/\'
+	
+ok 398 - ls-files --eol attr=text  aeol=crlf core.autocrlf=true core.eol=lf
 
 expecting success: 
-			test_must_fail test-tool wildmatch iwildmatch 'XXX/\' '*/\'
-		
-ok 625 - iwildmatch: no match 'XXX/\' '*/\'
+		compare_ws_file eol_lf_crlf_true_attr_text_ CRLF    crlf_false_attr__LF.txt
+	
+ok 399 - checkout attr=text  aeol=crlf core.autocrlf=true core.eol=lf file=LF
 
 expecting success: 
-				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '*/\' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 626 - iwildmatch (via ls-files): no match '*/\' 'XXX/\'
+		compare_ws_file eol_lf_crlf_true_attr_text_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 400 - checkout attr=text  aeol=crlf core.autocrlf=true core.eol=lf file=CRLF
 
 expecting success: 
-			test_must_fail test-tool wildmatch pathmatch 'XXX/\' '*/\'
-		
-ok 627 - pathmatch: no match 'XXX/\' '*/\'
+		compare_ws_file eol_lf_crlf_true_attr_text_ CRLF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 401 - checkout attr=text  aeol=crlf core.autocrlf=true core.eol=lf file=CRLF_mix_LF
 
 expecting success: 
-				>expect &&
-				git ls-files -z -- '*/\' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 628 - pathmatch (via ls-files): no match '*/\' 'XXX/\'
+		compare_ws_file eol_lf_crlf_true_attr_text_ CRLF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 402 - checkout attr=text  aeol=crlf core.autocrlf=true core.eol=lf file=LF_mix_CR
 
 expecting success: 
-			test_must_fail test-tool wildmatch ipathmatch 'XXX/\' '*/\'
-		
-ok 629 - ipathmatch: no match 'XXX/\' '*/\'
+		compare_ws_file eol_lf_crlf_true_attr_text_ CRLF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 403 - checkout attr=text  aeol=crlf core.autocrlf=true core.eol=lf file=LF_nul
 
 expecting success: 
-				>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_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
 		test_cmp expect actual
-			
-ok 630 - ipathmatch (via ls-files): no match '*/\' 'XXX/\'
+	
+ok 404 - ls-files --eol attr=auto  aeol=lf core.autocrlf=true core.eol=lf
 
 expecting success: 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
+		compare_ws_file eol_lf_crlf_true_attr_auto_ LF    crlf_false_attr__LF.txt
 	
-Removing XXX/
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 631 - cleanup after previous file test
+ok 405 - checkout attr=auto  aeol=lf core.autocrlf=true core.eol=lf file=LF
 
 expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
+		compare_ws_file eol_lf_crlf_true_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 632 - setup match file test for XXX/\
+ok 406 - checkout attr=auto  aeol=lf core.autocrlf=true core.eol=lf file=CRLF
 
 expecting success: 
-			test-tool wildmatch wildmatch 'XXX/\' '*/\\'
-		
-ok 633 - wildmatch: match 'XXX/\' '*/\\'
+		compare_ws_file eol_lf_crlf_true_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 407 - checkout attr=auto  aeol=lf core.autocrlf=true core.eol=lf file=CRLF_mix_LF
 
 expecting success: 
-				printf '%s' 'XXX/\' >expect &&
-				git --glob-pathspecs ls-files -z -- '*/\\' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 634 - wildmatch (via ls-files): match '*/\\' 'XXX/\'
+		compare_ws_file eol_lf_crlf_true_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 408 - checkout attr=auto  aeol=lf core.autocrlf=true core.eol=lf file=LF_mix_CR
 
 expecting success: 
-			test-tool wildmatch iwildmatch 'XXX/\' '*/\\'
-		
-ok 635 - iwildmatch: match 'XXX/\' '*/\\'
+		compare_ws_file eol_lf_crlf_true_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 409 - checkout attr=auto  aeol=lf core.autocrlf=true core.eol=lf file=LF_nul
 
 expecting success: 
-				printf '%s' 'XXX/\' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '*/\\' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
 		test_cmp expect actual
-			
-ok 636 - iwildmatch (via ls-files): match '*/\\' 'XXX/\'
+	
+ok 410 - ls-files --eol attr=auto  aeol=crlf core.autocrlf=true core.eol=lf
 
 expecting success: 
-			test-tool wildmatch pathmatch 'XXX/\' '*/\\'
-		
-ok 637 - pathmatch: match 'XXX/\' '*/\\'
+		compare_ws_file eol_lf_crlf_true_attr_auto_ CRLF    crlf_false_attr__LF.txt
+	
+ok 411 - checkout attr=auto  aeol=crlf core.autocrlf=true core.eol=lf file=LF
 
 expecting success: 
-				printf '%s' 'XXX/\' >expect &&
-				git ls-files -z -- '*/\\' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 638 - pathmatch (via ls-files): match '*/\\' 'XXX/\'
+		compare_ws_file eol_lf_crlf_true_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 412 - checkout attr=auto  aeol=crlf core.autocrlf=true core.eol=lf file=CRLF
 
 expecting success: 
-			test-tool wildmatch ipathmatch 'XXX/\' '*/\\'
-		
-ok 639 - ipathmatch: match 'XXX/\' '*/\\'
+		compare_ws_file eol_lf_crlf_true_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 413 - checkout attr=auto  aeol=crlf core.autocrlf=true core.eol=lf file=CRLF_mix_LF
 
 expecting success: 
-				printf '%s' 'XXX/\' >expect &&
-				git --icase-pathspecs ls-files -z -- '*/\\' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 640 - ipathmatch (via ls-files): match '*/\\' 'XXX/\'
+		compare_ws_file eol_lf_crlf_true_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 414 - checkout attr=auto  aeol=crlf core.autocrlf=true core.eol=lf file=LF_mix_CR
 
 expecting success: 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
+		compare_ws_file eol_lf_crlf_true_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
 	
-Removing XXX/
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 641 - cleanup after previous file test
+ok 415 - checkout attr=auto  aeol=crlf core.autocrlf=true core.eol=lf file=LF_nul
 
 expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
+		test_cmp expect actual
 	
-ok 642 - setup match file test for foo
+ok 416 - ls-files --eol attr=-text  aeol= core.autocrlf=false core.eol=lf
 
 expecting success: 
-			test-tool wildmatch wildmatch 'foo' 'foo'
-		
-ok 643 - wildmatch: match 'foo' 'foo'
+		compare_ws_file eol_lf_crlf_false_attr_-text_ LF    crlf_false_attr__LF.txt
+	
+ok 417 - checkout attr=-text  aeol= core.autocrlf=false core.eol=lf file=LF
 
 expecting success: 
-				printf '%s' 'foo' >expect &&
-				git --glob-pathspecs ls-files -z -- 'foo' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 644 - wildmatch (via ls-files): match 'foo' 'foo'
+		compare_ws_file eol_lf_crlf_false_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 418 - checkout attr=-text  aeol= core.autocrlf=false core.eol=lf file=CRLF
 
 expecting success: 
-			test-tool wildmatch iwildmatch 'foo' 'foo'
-		
-ok 645 - iwildmatch: match 'foo' 'foo'
+		compare_ws_file eol_lf_crlf_false_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 419 - checkout attr=-text  aeol= core.autocrlf=false core.eol=lf file=CRLF_mix_LF
 
 expecting success: 
-				printf '%s' 'foo' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'foo' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 646 - iwildmatch (via ls-files): match 'foo' 'foo'
+		compare_ws_file eol_lf_crlf_false_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 420 - checkout attr=-text  aeol= core.autocrlf=false core.eol=lf file=LF_mix_CR
 
 expecting success: 
-			test-tool wildmatch pathmatch 'foo' 'foo'
-		
-ok 647 - pathmatch: match 'foo' 'foo'
+		compare_ws_file eol_lf_crlf_false_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 421 - checkout attr=-text  aeol= core.autocrlf=false core.eol=lf file=LF_nul
 
 expecting success: 
-				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_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
 		test_cmp expect actual
-			
-ok 648 - pathmatch (via ls-files): match 'foo' 'foo'
+	
+ok 422 - ls-files --eol attr=-text  aeol=lf core.autocrlf=false core.eol=lf
 
 expecting success: 
-			test-tool wildmatch ipathmatch 'foo' 'foo'
-		
-ok 649 - ipathmatch: match 'foo' 'foo'
+		compare_ws_file eol_lf_crlf_false_attr_-text_ LF    crlf_false_attr__LF.txt
+	
+ok 423 - checkout attr=-text  aeol=lf core.autocrlf=false core.eol=lf file=LF
 
 expecting success: 
-				printf '%s' 'foo' >expect &&
-				git --icase-pathspecs ls-files -z -- 'foo' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 650 - ipathmatch (via ls-files): match 'foo' 'foo'
+		compare_ws_file eol_lf_crlf_false_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 424 - checkout attr=-text  aeol=lf core.autocrlf=false core.eol=lf file=CRLF
 
 expecting success: 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
+		compare_ws_file eol_lf_crlf_false_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
 	
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-Removing foo
-ok 651 - cleanup after previous file test
+ok 425 - checkout attr=-text  aeol=lf core.autocrlf=false core.eol=lf file=CRLF_mix_LF
 
 expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
+		compare_ws_file eol_lf_crlf_false_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 652 - setup match file test for @foo
+ok 426 - checkout attr=-text  aeol=lf core.autocrlf=false core.eol=lf file=LF_mix_CR
 
 expecting success: 
-			test-tool wildmatch wildmatch '@foo' '@foo'
-		
-ok 653 - wildmatch: match '@foo' '@foo'
+		compare_ws_file eol_lf_crlf_false_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 427 - checkout attr=-text  aeol=lf core.autocrlf=false core.eol=lf file=LF_nul
 
 expecting success: 
-				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_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
 		test_cmp expect actual
-			
-ok 654 - wildmatch (via ls-files): match '@foo' '@foo'
+	
+ok 428 - ls-files --eol attr=-text  aeol=crlf core.autocrlf=false core.eol=lf
 
 expecting success: 
-			test-tool wildmatch iwildmatch '@foo' '@foo'
-		
-ok 655 - iwildmatch: match '@foo' '@foo'
+		compare_ws_file eol_lf_crlf_false_attr_-text_ LF    crlf_false_attr__LF.txt
+	
+ok 429 - checkout attr=-text  aeol=crlf core.autocrlf=false core.eol=lf file=LF
 
 expecting success: 
-				printf '%s' '@foo' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '@foo' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 656 - iwildmatch (via ls-files): match '@foo' '@foo'
+		compare_ws_file eol_lf_crlf_false_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 430 - checkout attr=-text  aeol=crlf core.autocrlf=false core.eol=lf file=CRLF
 
 expecting success: 
-			test-tool wildmatch pathmatch '@foo' '@foo'
-		
-ok 657 - pathmatch: match '@foo' '@foo'
+		compare_ws_file eol_lf_crlf_false_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 431 - checkout attr=-text  aeol=crlf core.autocrlf=false core.eol=lf file=CRLF_mix_LF
 
 expecting success: 
-				printf '%s' '@foo' >expect &&
-				git ls-files -z -- '@foo' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 658 - pathmatch (via ls-files): match '@foo' '@foo'
+		compare_ws_file eol_lf_crlf_false_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 432 - checkout attr=-text  aeol=crlf core.autocrlf=false core.eol=lf file=LF_mix_CR
 
 expecting success: 
-			test-tool wildmatch ipathmatch '@foo' '@foo'
-		
-ok 659 - ipathmatch: match '@foo' '@foo'
+		compare_ws_file eol_lf_crlf_false_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 433 - checkout attr=-text  aeol=crlf core.autocrlf=false core.eol=lf file=LF_nul
 
 expecting success: 
-				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_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
 		test_cmp expect actual
-			
-ok 660 - ipathmatch (via ls-files): match '@foo' '@foo'
+	
+ok 434 - ls-files --eol attr=text  aeol=lf core.autocrlf=false core.eol=lf
 
 expecting success: 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
+		compare_ws_file eol_lf_crlf_false_attr_text_ LF    crlf_false_attr__LF.txt
 	
-Removing @foo
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 661 - cleanup after previous file test
+ok 435 - checkout attr=text  aeol=lf core.autocrlf=false core.eol=lf file=LF
 
 expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
+		compare_ws_file eol_lf_crlf_false_attr_text_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 662 - setup match file test for foo
+ok 436 - checkout attr=text  aeol=lf core.autocrlf=false core.eol=lf file=CRLF
 
 expecting success: 
-			test_must_fail test-tool wildmatch wildmatch 'foo' '@foo'
-		
-ok 663 - wildmatch: no match 'foo' '@foo'
+		compare_ws_file eol_lf_crlf_false_attr_text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 437 - checkout attr=text  aeol=lf core.autocrlf=false core.eol=lf file=CRLF_mix_LF
 
 expecting success: 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- '@foo' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 664 - wildmatch (via ls-files): no match '@foo' 'foo'
+		compare_ws_file eol_lf_crlf_false_attr_text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 438 - checkout attr=text  aeol=lf core.autocrlf=false core.eol=lf file=LF_mix_CR
 
 expecting success: 
-			test_must_fail test-tool wildmatch iwildmatch 'foo' '@foo'
-		
-ok 665 - iwildmatch: no match 'foo' '@foo'
+		compare_ws_file eol_lf_crlf_false_attr_text_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 439 - checkout attr=text  aeol=lf core.autocrlf=false core.eol=lf file=LF_nul
 
 expecting success: 
-				>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_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
 		test_cmp expect actual
-			
-ok 666 - iwildmatch (via ls-files): no match '@foo' 'foo'
+	
+ok 440 - ls-files --eol attr=text  aeol=crlf core.autocrlf=false core.eol=lf
 
 expecting success: 
-			test_must_fail test-tool wildmatch pathmatch 'foo' '@foo'
-		
-ok 667 - pathmatch: no match 'foo' '@foo'
+		compare_ws_file eol_lf_crlf_false_attr_text_ CRLF    crlf_false_attr__LF.txt
+	
+ok 441 - checkout attr=text  aeol=crlf core.autocrlf=false core.eol=lf file=LF
 
 expecting success: 
-				>expect &&
-				git ls-files -z -- '@foo' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 668 - pathmatch (via ls-files): no match '@foo' 'foo'
+		compare_ws_file eol_lf_crlf_false_attr_text_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 442 - checkout attr=text  aeol=crlf core.autocrlf=false core.eol=lf file=CRLF
 
 expecting success: 
-			test_must_fail test-tool wildmatch ipathmatch 'foo' '@foo'
-		
-ok 669 - ipathmatch: no match 'foo' '@foo'
+		compare_ws_file eol_lf_crlf_false_attr_text_ CRLF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 443 - checkout attr=text  aeol=crlf core.autocrlf=false core.eol=lf file=CRLF_mix_LF
 
 expecting success: 
-				>expect &&
-				git --icase-pathspecs ls-files -z -- '@foo' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 670 - ipathmatch (via ls-files): no match '@foo' 'foo'
+		compare_ws_file eol_lf_crlf_false_attr_text_ CRLF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 444 - checkout attr=text  aeol=crlf core.autocrlf=false core.eol=lf file=LF_mix_CR
 
 expecting success: 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
+		compare_ws_file eol_lf_crlf_false_attr_text_ CRLF_nul   crlf_false_attr__LF_nul.txt
 	
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-Removing foo
-ok 671 - cleanup after previous file test
+ok 445 - checkout attr=text  aeol=crlf core.autocrlf=false core.eol=lf file=LF_nul
 
 expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
+		test_cmp expect actual
 	
-ok 672 - setup match file test for [ab]
+ok 446 - ls-files --eol attr=auto  aeol=lf core.autocrlf=false core.eol=lf
 
 expecting success: 
-			test-tool wildmatch wildmatch '[ab]' '\[ab]'
-		
-ok 673 - wildmatch: match '[ab]' '\[ab]'
+		compare_ws_file eol_lf_crlf_false_attr_auto_ LF    crlf_false_attr__LF.txt
+	
+ok 447 - checkout attr=auto  aeol=lf core.autocrlf=false core.eol=lf file=LF
 
 expecting success: 
-				printf '%s' '[ab]' >expect &&
-				git --glob-pathspecs ls-files -z -- '\[ab]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 674 - wildmatch (via ls-files): match '\[ab]' '[ab]'
+		compare_ws_file eol_lf_crlf_false_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 448 - checkout attr=auto  aeol=lf core.autocrlf=false core.eol=lf file=CRLF
 
 expecting success: 
-			test-tool wildmatch iwildmatch '[ab]' '\[ab]'
-		
-ok 675 - iwildmatch: match '[ab]' '\[ab]'
+		compare_ws_file eol_lf_crlf_false_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 449 - checkout attr=auto  aeol=lf core.autocrlf=false core.eol=lf file=CRLF_mix_LF
 
 expecting success: 
-				printf '%s' '[ab]' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '\[ab]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 676 - iwildmatch (via ls-files): match '\[ab]' '[ab]'
+		compare_ws_file eol_lf_crlf_false_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 450 - checkout attr=auto  aeol=lf core.autocrlf=false core.eol=lf file=LF_mix_CR
 
 expecting success: 
-			test-tool wildmatch pathmatch '[ab]' '\[ab]'
-		
-ok 677 - pathmatch: match '[ab]' '\[ab]'
+		compare_ws_file eol_lf_crlf_false_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 451 - checkout attr=auto  aeol=lf core.autocrlf=false core.eol=lf file=LF_nul
 
 expecting success: 
-				printf '%s' '[ab]' >expect &&
-				git ls-files -z -- '\[ab]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
 		test_cmp expect actual
-			
-ok 678 - pathmatch (via ls-files): match '\[ab]' '[ab]'
+	
+ok 452 - ls-files --eol attr=auto  aeol=crlf core.autocrlf=false core.eol=lf
 
 expecting success: 
-			test-tool wildmatch ipathmatch '[ab]' '\[ab]'
-		
-ok 679 - ipathmatch: match '[ab]' '\[ab]'
+		compare_ws_file eol_lf_crlf_false_attr_auto_ CRLF    crlf_false_attr__LF.txt
+	
+ok 453 - checkout attr=auto  aeol=crlf core.autocrlf=false core.eol=lf file=LF
 
 expecting success: 
-				printf '%s' '[ab]' >expect &&
-				git --icase-pathspecs ls-files -z -- '\[ab]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 680 - ipathmatch (via ls-files): match '\[ab]' '[ab]'
+		compare_ws_file eol_lf_crlf_false_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 454 - checkout attr=auto  aeol=crlf core.autocrlf=false core.eol=lf file=CRLF
 
 expecting success: 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
+		compare_ws_file eol_lf_crlf_false_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
 	
-Removing [ab]
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 681 - cleanup after previous file test
+ok 455 - checkout attr=auto  aeol=crlf core.autocrlf=false core.eol=lf file=CRLF_mix_LF
 
 expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
+		compare_ws_file eol_lf_crlf_false_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 682 - setup match file test for [ab]
+ok 456 - checkout attr=auto  aeol=crlf core.autocrlf=false core.eol=lf file=LF_mix_CR
 
 expecting success: 
-			test-tool wildmatch wildmatch '[ab]' '[[]ab]'
-		
-ok 683 - wildmatch: match '[ab]' '[[]ab]'
+		compare_ws_file eol_lf_crlf_false_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 457 - checkout attr=auto  aeol=crlf core.autocrlf=false core.eol=lf file=LF_nul
 
 expecting success: 
-				printf '%s' '[ab]' >expect &&
-				git --glob-pathspecs ls-files -z -- '[[]ab]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
 		test_cmp expect actual
-			
-ok 684 - wildmatch (via ls-files): match '[[]ab]' '[ab]'
+	
+ok 458 - ls-files --eol attr=-text  aeol= core.autocrlf=input core.eol=lf
 
 expecting success: 
-			test-tool wildmatch iwildmatch '[ab]' '[[]ab]'
-		
-ok 685 - iwildmatch: match '[ab]' '[[]ab]'
+		compare_ws_file eol_lf_crlf_input_attr_-text_ LF    crlf_false_attr__LF.txt
+	
+ok 459 - checkout attr=-text  aeol= core.autocrlf=input core.eol=lf file=LF
 
 expecting success: 
-				printf '%s' '[ab]' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[[]ab]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 686 - iwildmatch (via ls-files): match '[[]ab]' '[ab]'
+		compare_ws_file eol_lf_crlf_input_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 460 - checkout attr=-text  aeol= core.autocrlf=input core.eol=lf file=CRLF
 
 expecting success: 
-			test-tool wildmatch pathmatch '[ab]' '[[]ab]'
-		
-ok 687 - pathmatch: match '[ab]' '[[]ab]'
+		compare_ws_file eol_lf_crlf_input_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 461 - checkout attr=-text  aeol= core.autocrlf=input core.eol=lf file=CRLF_mix_LF
 
 expecting success: 
-				printf '%s' '[ab]' >expect &&
-				git ls-files -z -- '[[]ab]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 688 - pathmatch (via ls-files): match '[[]ab]' '[ab]'
+		compare_ws_file eol_lf_crlf_input_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 462 - checkout attr=-text  aeol= core.autocrlf=input core.eol=lf file=LF_mix_CR
 
 expecting success: 
-			test-tool wildmatch ipathmatch '[ab]' '[[]ab]'
-		
-ok 689 - ipathmatch: match '[ab]' '[[]ab]'
+		compare_ws_file eol_lf_crlf_input_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 463 - checkout attr=-text  aeol= core.autocrlf=input core.eol=lf file=LF_nul
 
 expecting success: 
-				printf '%s' '[ab]' >expect &&
-				git --icase-pathspecs ls-files -z -- '[[]ab]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
 		test_cmp expect actual
-			
-ok 690 - ipathmatch (via ls-files): match '[[]ab]' '[ab]'
+	
+ok 464 - ls-files --eol attr=-text  aeol=lf core.autocrlf=input core.eol=lf
 
 expecting success: 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
+		compare_ws_file eol_lf_crlf_input_attr_-text_ LF    crlf_false_attr__LF.txt
 	
-Removing [ab]
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 691 - cleanup after previous file test
+ok 465 - checkout attr=-text  aeol=lf core.autocrlf=input core.eol=lf file=LF
 
 expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
+		compare_ws_file eol_lf_crlf_input_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 692 - setup match file test for [ab]
+ok 466 - checkout attr=-text  aeol=lf core.autocrlf=input core.eol=lf file=CRLF
 
 expecting success: 
-			test-tool wildmatch wildmatch '[ab]' '[[:]ab]'
-		
-ok 693 - wildmatch: match '[ab]' '[[:]ab]'
+		compare_ws_file eol_lf_crlf_input_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 467 - checkout attr=-text  aeol=lf core.autocrlf=input core.eol=lf file=CRLF_mix_LF
 
 expecting success: 
-				printf '%s' '[ab]' >expect &&
-				git --glob-pathspecs ls-files -z -- '[[:]ab]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 694 - wildmatch (via ls-files): match '[[:]ab]' '[ab]'
+		compare_ws_file eol_lf_crlf_input_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 468 - checkout attr=-text  aeol=lf core.autocrlf=input core.eol=lf file=LF_mix_CR
 
 expecting success: 
-			test-tool wildmatch iwildmatch '[ab]' '[[:]ab]'
-		
-ok 695 - iwildmatch: match '[ab]' '[[:]ab]'
+		compare_ws_file eol_lf_crlf_input_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 469 - checkout attr=-text  aeol=lf core.autocrlf=input core.eol=lf file=LF_nul
 
 expecting success: 
-				printf '%s' '[ab]' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[[:]ab]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
 		test_cmp expect actual
-			
-ok 696 - iwildmatch (via ls-files): match '[[:]ab]' '[ab]'
+	
+ok 470 - ls-files --eol attr=-text  aeol=crlf core.autocrlf=input core.eol=lf
 
 expecting success: 
-			test-tool wildmatch pathmatch '[ab]' '[[:]ab]'
-		
-ok 697 - pathmatch: match '[ab]' '[[:]ab]'
+		compare_ws_file eol_lf_crlf_input_attr_-text_ LF    crlf_false_attr__LF.txt
+	
+ok 471 - checkout attr=-text  aeol=crlf core.autocrlf=input core.eol=lf file=LF
 
 expecting success: 
-				printf '%s' '[ab]' >expect &&
-				git ls-files -z -- '[[:]ab]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 698 - pathmatch (via ls-files): match '[[:]ab]' '[ab]'
+		compare_ws_file eol_lf_crlf_input_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 472 - checkout attr=-text  aeol=crlf core.autocrlf=input core.eol=lf file=CRLF
 
 expecting success: 
-			test-tool wildmatch ipathmatch '[ab]' '[[:]ab]'
-		
-ok 699 - ipathmatch: match '[ab]' '[[:]ab]'
+		compare_ws_file eol_lf_crlf_input_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 473 - checkout attr=-text  aeol=crlf core.autocrlf=input core.eol=lf file=CRLF_mix_LF
 
 expecting success: 
-				printf '%s' '[ab]' >expect &&
-				git --icase-pathspecs ls-files -z -- '[[:]ab]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 700 - ipathmatch (via ls-files): match '[[:]ab]' '[ab]'
+		compare_ws_file eol_lf_crlf_input_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 474 - checkout attr=-text  aeol=crlf core.autocrlf=input core.eol=lf file=LF_mix_CR
 
 expecting success: 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
+		compare_ws_file eol_lf_crlf_input_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
 	
-Removing [ab]
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 701 - cleanup after previous file test
+ok 475 - checkout attr=-text  aeol=crlf core.autocrlf=input core.eol=lf file=LF_nul
 
 expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
+		test_cmp expect actual
 	
-ok 702 - setup match file test for [ab]
+ok 476 - ls-files --eol attr=text  aeol=lf core.autocrlf=input core.eol=lf
 
 expecting success: 
-			test_must_fail test-tool wildmatch wildmatch '[ab]' '[[::]ab]'
-		
-ok 703 - wildmatch: no match '[ab]' '[[::]ab]'
+		compare_ws_file eol_lf_crlf_input_attr_text_ LF    crlf_false_attr__LF.txt
+	
+ok 477 - checkout attr=text  aeol=lf core.autocrlf=input core.eol=lf file=LF
 
 expecting success: 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- '[[::]ab]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 704 - wildmatch (via ls-files): no match '[[::]ab]' '[ab]'
+		compare_ws_file eol_lf_crlf_input_attr_text_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 478 - checkout attr=text  aeol=lf core.autocrlf=input core.eol=lf file=CRLF
 
 expecting success: 
-			test_must_fail test-tool wildmatch iwildmatch '[ab]' '[[::]ab]'
-		
-ok 705 - iwildmatch: no match '[ab]' '[[::]ab]'
+		compare_ws_file eol_lf_crlf_input_attr_text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 479 - checkout attr=text  aeol=lf core.autocrlf=input core.eol=lf file=CRLF_mix_LF
 
 expecting success: 
-				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[[::]ab]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 706 - iwildmatch (via ls-files): no match '[[::]ab]' '[ab]'
+		compare_ws_file eol_lf_crlf_input_attr_text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 480 - checkout attr=text  aeol=lf core.autocrlf=input core.eol=lf file=LF_mix_CR
 
 expecting success: 
-			test_must_fail test-tool wildmatch pathmatch '[ab]' '[[::]ab]'
-		
-ok 707 - pathmatch: no match '[ab]' '[[::]ab]'
+		compare_ws_file eol_lf_crlf_input_attr_text_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 481 - checkout attr=text  aeol=lf core.autocrlf=input core.eol=lf file=LF_nul
 
 expecting success: 
-				>expect &&
-				git ls-files -z -- '[[::]ab]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
 		test_cmp expect actual
-			
-ok 708 - pathmatch (via ls-files): no match '[[::]ab]' '[ab]'
+	
+ok 482 - ls-files --eol attr=text  aeol=crlf core.autocrlf=input core.eol=lf
 
 expecting success: 
-			test_must_fail test-tool wildmatch ipathmatch '[ab]' '[[::]ab]'
-		
-ok 709 - ipathmatch: no match '[ab]' '[[::]ab]'
+		compare_ws_file eol_lf_crlf_input_attr_text_ CRLF    crlf_false_attr__LF.txt
+	
+ok 483 - checkout attr=text  aeol=crlf core.autocrlf=input core.eol=lf file=LF
 
 expecting success: 
-				>expect &&
-				git --icase-pathspecs ls-files -z -- '[[::]ab]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 710 - ipathmatch (via ls-files): no match '[[::]ab]' '[ab]'
+		compare_ws_file eol_lf_crlf_input_attr_text_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 484 - checkout attr=text  aeol=crlf core.autocrlf=input core.eol=lf file=CRLF
 
 expecting success: 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
+		compare_ws_file eol_lf_crlf_input_attr_text_ CRLF crlf_false_attr__CRLF_mix_LF.txt
 	
-Removing [ab]
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 711 - cleanup after previous file test
+ok 485 - checkout attr=text  aeol=crlf core.autocrlf=input core.eol=lf file=CRLF_mix_LF
 
 expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
+		compare_ws_file eol_lf_crlf_input_attr_text_ CRLF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 712 - setup match file test for [ab]
+ok 486 - checkout attr=text  aeol=crlf core.autocrlf=input core.eol=lf file=LF_mix_CR
 
 expecting success: 
-			test-tool wildmatch wildmatch '[ab]' '[[:digit]ab]'
-		
-ok 713 - wildmatch: match '[ab]' '[[:digit]ab]'
+		compare_ws_file eol_lf_crlf_input_attr_text_ CRLF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 487 - checkout attr=text  aeol=crlf core.autocrlf=input core.eol=lf file=LF_nul
 
 expecting success: 
-				printf '%s' '[ab]' >expect &&
-				git --glob-pathspecs ls-files -z -- '[[:digit]ab]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
 		test_cmp expect actual
-			
-ok 714 - wildmatch (via ls-files): match '[[:digit]ab]' '[ab]'
+	
+ok 488 - ls-files --eol attr=auto  aeol=lf core.autocrlf=input core.eol=lf
 
 expecting success: 
-			test-tool wildmatch iwildmatch '[ab]' '[[:digit]ab]'
-		
-ok 715 - iwildmatch: match '[ab]' '[[:digit]ab]'
+		compare_ws_file eol_lf_crlf_input_attr_auto_ LF    crlf_false_attr__LF.txt
+	
+ok 489 - checkout attr=auto  aeol=lf core.autocrlf=input core.eol=lf file=LF
 
 expecting success: 
-				printf '%s' '[ab]' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[[:digit]ab]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 716 - iwildmatch (via ls-files): match '[[:digit]ab]' '[ab]'
+		compare_ws_file eol_lf_crlf_input_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 490 - checkout attr=auto  aeol=lf core.autocrlf=input core.eol=lf file=CRLF
 
 expecting success: 
-			test-tool wildmatch pathmatch '[ab]' '[[:digit]ab]'
-		
-ok 717 - pathmatch: match '[ab]' '[[:digit]ab]'
+		compare_ws_file eol_lf_crlf_input_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 491 - checkout attr=auto  aeol=lf core.autocrlf=input core.eol=lf file=CRLF_mix_LF
 
 expecting success: 
-				printf '%s' '[ab]' >expect &&
-				git ls-files -z -- '[[:digit]ab]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 718 - pathmatch (via ls-files): match '[[:digit]ab]' '[ab]'
+		compare_ws_file eol_lf_crlf_input_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 492 - checkout attr=auto  aeol=lf core.autocrlf=input core.eol=lf file=LF_mix_CR
 
 expecting success: 
-			test-tool wildmatch ipathmatch '[ab]' '[[:digit]ab]'
-		
-ok 719 - ipathmatch: match '[ab]' '[[:digit]ab]'
+		compare_ws_file eol_lf_crlf_input_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 493 - checkout attr=auto  aeol=lf core.autocrlf=input core.eol=lf file=LF_nul
 
 expecting success: 
-				printf '%s' '[ab]' >expect &&
-				git --icase-pathspecs ls-files -z -- '[[:digit]ab]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
 		test_cmp expect actual
-			
-ok 720 - ipathmatch (via ls-files): match '[[:digit]ab]' '[ab]'
+	
+ok 494 - ls-files --eol attr=auto  aeol=crlf core.autocrlf=input core.eol=lf
 
 expecting success: 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
+		compare_ws_file eol_lf_crlf_input_attr_auto_ CRLF    crlf_false_attr__LF.txt
 	
-Removing [ab]
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 721 - cleanup after previous file test
+ok 495 - checkout attr=auto  aeol=crlf core.autocrlf=input core.eol=lf file=LF
 
 expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
+		compare_ws_file eol_lf_crlf_input_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 722 - setup match file test for [ab]
+ok 496 - checkout attr=auto  aeol=crlf core.autocrlf=input core.eol=lf file=CRLF
 
 expecting success: 
-			test-tool wildmatch wildmatch '[ab]' '[\[:]ab]'
-		
-ok 723 - wildmatch: match '[ab]' '[\[:]ab]'
+		compare_ws_file eol_lf_crlf_input_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 497 - checkout attr=auto  aeol=crlf core.autocrlf=input core.eol=lf file=CRLF_mix_LF
 
 expecting success: 
-				printf '%s' '[ab]' >expect &&
-				git --glob-pathspecs ls-files -z -- '[\[:]ab]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 724 - wildmatch (via ls-files): match '[\[:]ab]' '[ab]'
+		compare_ws_file eol_lf_crlf_input_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 498 - checkout attr=auto  aeol=crlf core.autocrlf=input core.eol=lf file=LF_mix_CR
 
 expecting success: 
-			test-tool wildmatch iwildmatch '[ab]' '[\[:]ab]'
-		
-ok 725 - iwildmatch: match '[ab]' '[\[:]ab]'
+		compare_ws_file eol_lf_crlf_input_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 499 - checkout attr=auto  aeol=crlf core.autocrlf=input core.eol=lf file=LF_nul
 
 expecting success: 
-				printf '%s' '[ab]' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[\[:]ab]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
 		test_cmp expect actual
-			
-ok 726 - iwildmatch (via ls-files): match '[\[:]ab]' '[ab]'
+	
+ok 500 - ls-files --eol attr=  aeol= core.autocrlf=false core.eol=lf
 
 expecting success: 
-			test-tool wildmatch pathmatch '[ab]' '[\[:]ab]'
-		
-ok 727 - pathmatch: match '[ab]' '[\[:]ab]'
+		compare_ws_file eol_lf_crlf_false_attr__ LF    crlf_false_attr__LF.txt
+	
+ok 501 - checkout attr=  aeol= core.autocrlf=false core.eol=lf file=LF
 
 expecting success: 
-				printf '%s' '[ab]' >expect &&
-				git ls-files -z -- '[\[:]ab]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 728 - pathmatch (via ls-files): match '[\[:]ab]' '[ab]'
+		compare_ws_file eol_lf_crlf_false_attr__ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 502 - checkout attr=  aeol= core.autocrlf=false core.eol=lf file=CRLF
 
 expecting success: 
-			test-tool wildmatch ipathmatch '[ab]' '[\[:]ab]'
-		
-ok 729 - ipathmatch: match '[ab]' '[\[:]ab]'
+		compare_ws_file eol_lf_crlf_false_attr__ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 503 - checkout attr=  aeol= core.autocrlf=false core.eol=lf file=CRLF_mix_LF
 
 expecting success: 
-				printf '%s' '[ab]' >expect &&
-				git --icase-pathspecs ls-files -z -- '[\[:]ab]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 730 - ipathmatch (via ls-files): match '[\[:]ab]' '[ab]'
+		compare_ws_file eol_lf_crlf_false_attr__ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 504 - checkout attr=  aeol= core.autocrlf=false core.eol=lf file=LF_mix_CR
 
 expecting success: 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
+		compare_ws_file eol_lf_crlf_false_attr__ LF_nul   crlf_false_attr__LF_nul.txt
 	
-Removing [ab]
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 731 - cleanup after previous file test
+ok 505 - checkout attr=  aeol= core.autocrlf=false core.eol=lf file=LF_nul
 
 expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
+		test_cmp expect actual
 	
-ok 732 - setup match file test for ?a?b
+ok 506 - ls-files --eol attr=  aeol= core.autocrlf=true core.eol=lf
 
 expecting success: 
-			test-tool wildmatch wildmatch '?a?b' '\??\?b'
-		
-ok 733 - wildmatch: match '?a?b' '\??\?b'
+		compare_ws_file eol_lf_crlf_true_attr__ CRLF    crlf_false_attr__LF.txt
+	
+ok 507 - checkout attr=  aeol= core.autocrlf=true core.eol=lf file=LF
 
 expecting success: 
-				printf '%s' '?a?b' >expect &&
-				git --glob-pathspecs ls-files -z -- '\??\?b' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 734 - wildmatch (via ls-files): match '\??\?b' '?a?b'
+		compare_ws_file eol_lf_crlf_true_attr__ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 508 - checkout attr=  aeol= core.autocrlf=true core.eol=lf file=CRLF
 
 expecting success: 
-			test-tool wildmatch iwildmatch '?a?b' '\??\?b'
-		
-ok 735 - iwildmatch: match '?a?b' '\??\?b'
+		compare_ws_file eol_lf_crlf_true_attr__ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 509 - checkout attr=  aeol= core.autocrlf=true core.eol=lf file=CRLF_mix_LF
 
 expecting success: 
-				printf '%s' '?a?b' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '\??\?b' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 736 - iwildmatch (via ls-files): match '\??\?b' '?a?b'
+		compare_ws_file eol_lf_crlf_true_attr__ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 510 - checkout attr=  aeol= core.autocrlf=true core.eol=lf file=LF_mix_CR
 
 expecting success: 
-			test-tool wildmatch pathmatch '?a?b' '\??\?b'
-		
-ok 737 - pathmatch: match '?a?b' '\??\?b'
+		compare_ws_file eol_lf_crlf_true_attr__ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 511 - checkout attr=  aeol= core.autocrlf=true core.eol=lf file=LF_nul
 
 expecting success: 
-				printf '%s' '?a?b' >expect &&
-				git ls-files -z -- '\??\?b' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
 		test_cmp expect actual
-			
-ok 738 - pathmatch (via ls-files): match '\??\?b' '?a?b'
+	
+ok 512 - ls-files --eol attr=auto  aeol= core.autocrlf=true core.eol=lf
 
 expecting success: 
-			test-tool wildmatch ipathmatch '?a?b' '\??\?b'
-		
-ok 739 - ipathmatch: match '?a?b' '\??\?b'
+		compare_ws_file eol_lf_crlf_true_attr_auto_ CRLF    crlf_false_attr__LF.txt
+	
+ok 513 - checkout attr=auto  aeol= core.autocrlf=true core.eol=lf file=LF
 
 expecting success: 
-				printf '%s' '?a?b' >expect &&
-				git --icase-pathspecs ls-files -z -- '\??\?b' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 740 - ipathmatch (via ls-files): match '\??\?b' '?a?b'
+		compare_ws_file eol_lf_crlf_true_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 514 - checkout attr=auto  aeol= core.autocrlf=true core.eol=lf file=CRLF
 
 expecting success: 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
+		compare_ws_file eol_lf_crlf_true_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
 	
-Removing ?a?b
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 741 - cleanup after previous file test
+ok 515 - checkout attr=auto  aeol= core.autocrlf=true core.eol=lf file=CRLF_mix_LF
 
 expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
+		compare_ws_file eol_lf_crlf_true_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 742 - setup match file test for abc
+ok 516 - checkout attr=auto  aeol= core.autocrlf=true core.eol=lf file=LF_mix_CR
 
 expecting success: 
-			test-tool wildmatch wildmatch 'abc' '\a\b\c'
-		
-ok 743 - wildmatch: match 'abc' '\a\b\c'
+		compare_ws_file eol_lf_crlf_true_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 517 - checkout attr=auto  aeol= core.autocrlf=true core.eol=lf file=LF_nul
 
 expecting success: 
-				printf '%s' 'abc' >expect &&
-				git --glob-pathspecs ls-files -z -- '\a\b\c' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
 		test_cmp expect actual
-			
-ok 744 - wildmatch (via ls-files): match '\a\b\c' 'abc'
+	
+ok 518 - ls-files --eol attr=text  aeol= core.autocrlf=true core.eol=lf
 
 expecting success: 
-			test-tool wildmatch iwildmatch 'abc' '\a\b\c'
-		
-ok 745 - iwildmatch: match 'abc' '\a\b\c'
+		compare_ws_file eol_lf_crlf_true_attr_text_ CRLF    crlf_false_attr__LF.txt
+	
+ok 519 - checkout attr=text  aeol= core.autocrlf=true core.eol=lf file=LF
 
 expecting success: 
-				printf '%s' 'abc' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '\a\b\c' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 746 - iwildmatch (via ls-files): match '\a\b\c' 'abc'
+		compare_ws_file eol_lf_crlf_true_attr_text_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 520 - checkout attr=text  aeol= core.autocrlf=true core.eol=lf file=CRLF
 
 expecting success: 
-			test-tool wildmatch pathmatch 'abc' '\a\b\c'
-		
-ok 747 - pathmatch: match 'abc' '\a\b\c'
+		compare_ws_file eol_lf_crlf_true_attr_text_ CRLF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 521 - checkout attr=text  aeol= core.autocrlf=true core.eol=lf file=CRLF_mix_LF
 
 expecting success: 
-				printf '%s' 'abc' >expect &&
-				git ls-files -z -- '\a\b\c' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 748 - pathmatch (via ls-files): match '\a\b\c' 'abc'
+		compare_ws_file eol_lf_crlf_true_attr_text_ CRLF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 522 - checkout attr=text  aeol= core.autocrlf=true core.eol=lf file=LF_mix_CR
 
 expecting success: 
-			test-tool wildmatch ipathmatch 'abc' '\a\b\c'
-		
-ok 749 - ipathmatch: match 'abc' '\a\b\c'
+		compare_ws_file eol_lf_crlf_true_attr_text_ CRLF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 523 - checkout attr=text  aeol= core.autocrlf=true core.eol=lf file=LF_nul
 
 expecting success: 
-				printf '%s' 'abc' >expect &&
-				git --icase-pathspecs ls-files -z -- '\a\b\c' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
 		test_cmp expect actual
-			
-ok 750 - ipathmatch (via ls-files): match '\a\b\c' 'abc'
+	
+ok 524 - ls-files --eol attr=text  aeol= core.autocrlf=input core.eol=lf
 
 expecting success: 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
+		compare_ws_file eol_lf_crlf_input_attr_text_ LF    crlf_false_attr__LF.txt
 	
-Removing abc
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 751 - cleanup after previous file test
+ok 525 - checkout attr=text  aeol= core.autocrlf=input core.eol=lf file=LF
 
 expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
+		compare_ws_file eol_lf_crlf_input_attr_text_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 752 - setup match file test for foo
+ok 526 - checkout attr=text  aeol= core.autocrlf=input core.eol=lf file=CRLF
 
 expecting success: 
-			test_must_fail test-tool wildmatch wildmatch 'foo' ''
-		
-ok 753 - wildmatch: no match 'foo' ''
+		compare_ws_file eol_lf_crlf_input_attr_text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 527 - checkout attr=text  aeol= core.autocrlf=input core.eol=lf file=CRLF_mix_LF
 
 expecting success: 
-				printf '%s' 'foo' >expect &&
-				test_must_fail git --glob-pathspecs ls-files -z -- ''
-			
-fatal: empty string is not a valid pathspec. please use . instead if you meant to match all paths
-ok 754 - wildmatch (via ls-files): match dies on '' 'foo'
+		compare_ws_file eol_lf_crlf_input_attr_text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 528 - checkout attr=text  aeol= core.autocrlf=input core.eol=lf file=LF_mix_CR
 
 expecting success: 
-			test_must_fail test-tool wildmatch iwildmatch 'foo' ''
-		
-ok 755 - iwildmatch: no match 'foo' ''
+		compare_ws_file eol_lf_crlf_input_attr_text_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 529 - checkout attr=text  aeol= core.autocrlf=input core.eol=lf file=LF_nul
 
 expecting success: 
-				printf '%s' 'foo' >expect &&
-				test_must_fail git --glob-pathspecs --icase-pathspecs ls-files -z -- ''
-			
-fatal: empty string is not a valid pathspec. please use . instead if you meant to match all paths
-ok 756 - iwildmatch (via ls-files): match dies on '' 'foo'
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
+		test_cmp expect actual
+	
+ok 530 - ls-files --eol attr=auto  aeol= core.autocrlf=input core.eol=lf
 
 expecting success: 
-			test_must_fail test-tool wildmatch pathmatch 'foo' ''
-		
-ok 757 - pathmatch: no match 'foo' ''
+		compare_ws_file eol_lf_crlf_input_attr_auto_ LF    crlf_false_attr__LF.txt
+	
+ok 531 - checkout attr=auto  aeol= core.autocrlf=input core.eol=lf file=LF
 
 expecting success: 
-				printf '%s' 'foo' >expect &&
-				test_must_fail git ls-files -z -- ''
-			
-fatal: empty string is not a valid pathspec. please use . instead if you meant to match all paths
-ok 758 - pathmatch (via ls-files): match dies on '' 'foo'
+		compare_ws_file eol_lf_crlf_input_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 532 - checkout attr=auto  aeol= core.autocrlf=input core.eol=lf file=CRLF
 
 expecting success: 
-			test_must_fail test-tool wildmatch ipathmatch 'foo' ''
-		
-ok 759 - ipathmatch: no match 'foo' ''
+		compare_ws_file eol_lf_crlf_input_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 533 - checkout attr=auto  aeol= core.autocrlf=input core.eol=lf file=CRLF_mix_LF
 
 expecting success: 
-				printf '%s' 'foo' >expect &&
-				test_must_fail git --icase-pathspecs ls-files -z -- ''
-			
-fatal: empty string is not a valid pathspec. please use . instead if you meant to match all paths
-ok 760 - ipathmatch (via ls-files): match dies on '' 'foo'
+		compare_ws_file eol_lf_crlf_input_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 534 - checkout attr=auto  aeol= core.autocrlf=input core.eol=lf file=LF_mix_CR
 
 expecting success: 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
+		compare_ws_file eol_lf_crlf_input_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
 	
-Removing expect
-Removing foo
-ok 761 - cleanup after previous file test
+ok 535 - checkout attr=auto  aeol= core.autocrlf=input core.eol=lf file=LF_nul
 
 expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
+		test_cmp expect actual
 	
-ok 762 - setup match file test for foo/bar/baz/to
+ok 536 - ls-files --eol attr=-text  aeol= core.autocrlf=true core.eol=crlf
 
 expecting success: 
-			test-tool wildmatch wildmatch 'foo/bar/baz/to' '**/t[o]'
-		
-ok 763 - wildmatch: match 'foo/bar/baz/to' '**/t[o]'
+		compare_ws_file eol_crlf_crlf_true_attr_-text_ LF    crlf_false_attr__LF.txt
+	
+ok 537 - checkout attr=-text  aeol= core.autocrlf=true core.eol=crlf file=LF
 
 expecting success: 
-				printf '%s' 'foo/bar/baz/to' >expect &&
-				git --glob-pathspecs ls-files -z -- '**/t[o]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 764 - wildmatch (via ls-files): match '**/t[o]' 'foo/bar/baz/to'
+		compare_ws_file eol_crlf_crlf_true_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 538 - checkout attr=-text  aeol= core.autocrlf=true core.eol=crlf file=CRLF
 
 expecting success: 
-			test-tool wildmatch iwildmatch 'foo/bar/baz/to' '**/t[o]'
-		
-ok 765 - iwildmatch: match 'foo/bar/baz/to' '**/t[o]'
+		compare_ws_file eol_crlf_crlf_true_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 539 - checkout attr=-text  aeol= core.autocrlf=true core.eol=crlf file=CRLF_mix_LF
 
 expecting success: 
-				printf '%s' 'foo/bar/baz/to' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '**/t[o]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 766 - iwildmatch (via ls-files): match '**/t[o]' 'foo/bar/baz/to'
+		compare_ws_file eol_crlf_crlf_true_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 540 - checkout attr=-text  aeol= core.autocrlf=true core.eol=crlf file=LF_mix_CR
 
 expecting success: 
-			test-tool wildmatch pathmatch 'foo/bar/baz/to' '**/t[o]'
-		
-ok 767 - pathmatch: match 'foo/bar/baz/to' '**/t[o]'
+		compare_ws_file eol_crlf_crlf_true_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 541 - checkout attr=-text  aeol= core.autocrlf=true core.eol=crlf file=LF_nul
 
 expecting success: 
-				printf '%s' 'foo/bar/baz/to' >expect &&
-				git ls-files -z -- '**/t[o]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
 		test_cmp expect actual
-			
-ok 768 - pathmatch (via ls-files): match '**/t[o]' 'foo/bar/baz/to'
+	
+ok 542 - ls-files --eol attr=-text  aeol=lf core.autocrlf=true core.eol=crlf
 
 expecting success: 
-			test-tool wildmatch ipathmatch 'foo/bar/baz/to' '**/t[o]'
-		
-ok 769 - ipathmatch: match 'foo/bar/baz/to' '**/t[o]'
+		compare_ws_file eol_crlf_crlf_true_attr_-text_ LF    crlf_false_attr__LF.txt
+	
+ok 543 - checkout attr=-text  aeol=lf core.autocrlf=true core.eol=crlf file=LF
 
 expecting success: 
-				printf '%s' 'foo/bar/baz/to' >expect &&
-				git --icase-pathspecs ls-files -z -- '**/t[o]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 770 - ipathmatch (via ls-files): match '**/t[o]' 'foo/bar/baz/to'
+		compare_ws_file eol_crlf_crlf_true_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 544 - checkout attr=-text  aeol=lf core.autocrlf=true core.eol=crlf file=CRLF
 
 expecting success: 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
+		compare_ws_file eol_crlf_crlf_true_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
 	
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-Removing foo/
-ok 771 - cleanup after previous file test
+ok 545 - checkout attr=-text  aeol=lf core.autocrlf=true core.eol=crlf file=CRLF_mix_LF
 
 expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
+		compare_ws_file eol_crlf_crlf_true_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 772 - setup match file test for a1B
+ok 546 - checkout attr=-text  aeol=lf core.autocrlf=true core.eol=crlf file=LF_mix_CR
 
 expecting success: 
-			test-tool wildmatch wildmatch 'a1B' '[[:alpha:]][[:digit:]][[:upper:]]'
-		
-ok 773 - wildmatch: match 'a1B' '[[:alpha:]][[:digit:]][[:upper:]]'
+		compare_ws_file eol_crlf_crlf_true_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 547 - checkout attr=-text  aeol=lf core.autocrlf=true core.eol=crlf file=LF_nul
 
 expecting success: 
-				printf '%s' 'a1B' >expect &&
-				git --glob-pathspecs ls-files -z -- '[[:alpha:]][[:digit:]][[:upper:]]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
 		test_cmp expect actual
-			
-ok 774 - wildmatch (via ls-files): match '[[:alpha:]][[:digit:]][[:upper:]]' 'a1B'
+	
+ok 548 - ls-files --eol attr=-text  aeol=crlf core.autocrlf=true core.eol=crlf
 
 expecting success: 
-			test-tool wildmatch iwildmatch 'a1B' '[[:alpha:]][[:digit:]][[:upper:]]'
-		
-ok 775 - iwildmatch: match 'a1B' '[[:alpha:]][[:digit:]][[:upper:]]'
+		compare_ws_file eol_crlf_crlf_true_attr_-text_ LF    crlf_false_attr__LF.txt
+	
+ok 549 - checkout attr=-text  aeol=crlf core.autocrlf=true core.eol=crlf file=LF
 
 expecting success: 
-				printf '%s' 'a1B' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[[:alpha:]][[:digit:]][[:upper:]]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 776 - iwildmatch (via ls-files): match '[[:alpha:]][[:digit:]][[:upper:]]' 'a1B'
+		compare_ws_file eol_crlf_crlf_true_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 550 - checkout attr=-text  aeol=crlf core.autocrlf=true core.eol=crlf file=CRLF
 
 expecting success: 
-			test-tool wildmatch pathmatch 'a1B' '[[:alpha:]][[:digit:]][[:upper:]]'
-		
-ok 777 - pathmatch: match 'a1B' '[[:alpha:]][[:digit:]][[:upper:]]'
+		compare_ws_file eol_crlf_crlf_true_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 551 - checkout attr=-text  aeol=crlf core.autocrlf=true core.eol=crlf file=CRLF_mix_LF
 
 expecting success: 
-				printf '%s' 'a1B' >expect &&
-				git ls-files -z -- '[[:alpha:]][[:digit:]][[:upper:]]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 778 - pathmatch (via ls-files): match '[[:alpha:]][[:digit:]][[:upper:]]' 'a1B'
+		compare_ws_file eol_crlf_crlf_true_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 552 - checkout attr=-text  aeol=crlf core.autocrlf=true core.eol=crlf file=LF_mix_CR
 
 expecting success: 
-			test-tool wildmatch ipathmatch 'a1B' '[[:alpha:]][[:digit:]][[:upper:]]'
-		
-ok 779 - ipathmatch: match 'a1B' '[[:alpha:]][[:digit:]][[:upper:]]'
+		compare_ws_file eol_crlf_crlf_true_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 553 - checkout attr=-text  aeol=crlf core.autocrlf=true core.eol=crlf file=LF_nul
 
 expecting success: 
-				printf '%s' 'a1B' >expect &&
-				git --icase-pathspecs ls-files -z -- '[[:alpha:]][[:digit:]][[:upper:]]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
 		test_cmp expect actual
-			
-ok 780 - ipathmatch (via ls-files): match '[[:alpha:]][[:digit:]][[:upper:]]' 'a1B'
+	
+ok 554 - ls-files --eol attr=text  aeol=lf core.autocrlf=true core.eol=crlf
 
 expecting success: 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
+		compare_ws_file eol_crlf_crlf_true_attr_text_ LF    crlf_false_attr__LF.txt
 	
-Removing a1B
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 781 - cleanup after previous file test
+ok 555 - checkout attr=text  aeol=lf core.autocrlf=true core.eol=crlf file=LF
 
 expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
+		compare_ws_file eol_crlf_crlf_true_attr_text_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 782 - setup match file test for a
+ok 556 - checkout attr=text  aeol=lf core.autocrlf=true core.eol=crlf file=CRLF
 
 expecting success: 
-			test_must_fail test-tool wildmatch wildmatch 'a' '[[:digit:][:upper:][:space:]]'
-		
-ok 783 - wildmatch: no match 'a' '[[:digit:][:upper:][:space:]]'
+		compare_ws_file eol_crlf_crlf_true_attr_text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 557 - checkout attr=text  aeol=lf core.autocrlf=true core.eol=crlf file=CRLF_mix_LF
 
 expecting success: 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- '[[:digit:][:upper:][:space:]]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 784 - wildmatch (via ls-files): no match '[[:digit:][:upper:][:space:]]' 'a'
+		compare_ws_file eol_crlf_crlf_true_attr_text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 558 - checkout attr=text  aeol=lf core.autocrlf=true core.eol=crlf file=LF_mix_CR
 
 expecting success: 
-			test-tool wildmatch iwildmatch 'a' '[[:digit:][:upper:][:space:]]'
-		
-ok 785 - iwildmatch: match 'a' '[[:digit:][:upper:][:space:]]'
+		compare_ws_file eol_crlf_crlf_true_attr_text_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 559 - checkout attr=text  aeol=lf core.autocrlf=true core.eol=crlf file=LF_nul
 
 expecting success: 
-				printf '%s' 'a' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[[:digit:][:upper:][:space:]]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
 		test_cmp expect actual
-			
-ok 786 - iwildmatch (via ls-files): match '[[:digit:][:upper:][:space:]]' 'a'
+	
+ok 560 - ls-files --eol attr=text  aeol=crlf core.autocrlf=true core.eol=crlf
 
 expecting success: 
-			test_must_fail test-tool wildmatch pathmatch 'a' '[[:digit:][:upper:][:space:]]'
-		
-ok 787 - pathmatch: no match 'a' '[[:digit:][:upper:][:space:]]'
+		compare_ws_file eol_crlf_crlf_true_attr_text_ CRLF    crlf_false_attr__LF.txt
+	
+ok 561 - checkout attr=text  aeol=crlf core.autocrlf=true core.eol=crlf file=LF
 
 expecting success: 
-				>expect &&
-				git ls-files -z -- '[[:digit:][:upper:][:space:]]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 788 - pathmatch (via ls-files): no match '[[:digit:][:upper:][:space:]]' 'a'
+		compare_ws_file eol_crlf_crlf_true_attr_text_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 562 - checkout attr=text  aeol=crlf core.autocrlf=true core.eol=crlf file=CRLF
 
 expecting success: 
-			test-tool wildmatch ipathmatch 'a' '[[:digit:][:upper:][:space:]]'
-		
-ok 789 - ipathmatch: match 'a' '[[:digit:][:upper:][:space:]]'
+		compare_ws_file eol_crlf_crlf_true_attr_text_ CRLF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 563 - checkout attr=text  aeol=crlf core.autocrlf=true core.eol=crlf file=CRLF_mix_LF
 
 expecting success: 
-				printf '%s' 'a' >expect &&
-				git --icase-pathspecs ls-files -z -- '[[:digit:][:upper:][:space:]]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 790 - ipathmatch (via ls-files): match '[[:digit:][:upper:][:space:]]' 'a'
+		compare_ws_file eol_crlf_crlf_true_attr_text_ CRLF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 564 - checkout attr=text  aeol=crlf core.autocrlf=true core.eol=crlf file=LF_mix_CR
 
 expecting success: 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
+		compare_ws_file eol_crlf_crlf_true_attr_text_ CRLF_nul   crlf_false_attr__LF_nul.txt
 	
-Removing a
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 791 - cleanup after previous file test
+ok 565 - checkout attr=text  aeol=crlf core.autocrlf=true core.eol=crlf file=LF_nul
 
 expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
+		test_cmp expect actual
 	
-ok 792 - setup match file test for A
+ok 566 - ls-files --eol attr=auto  aeol=lf core.autocrlf=true core.eol=crlf
 
 expecting success: 
-			test-tool wildmatch wildmatch 'A' '[[:digit:][:upper:][:space:]]'
-		
-ok 793 - wildmatch: match 'A' '[[:digit:][:upper:][:space:]]'
+		compare_ws_file eol_crlf_crlf_true_attr_auto_ LF    crlf_false_attr__LF.txt
+	
+ok 567 - checkout attr=auto  aeol=lf core.autocrlf=true core.eol=crlf file=LF
 
 expecting success: 
-				printf '%s' 'A' >expect &&
-				git --glob-pathspecs ls-files -z -- '[[:digit:][:upper:][:space:]]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 794 - wildmatch (via ls-files): match '[[:digit:][:upper:][:space:]]' 'A'
+		compare_ws_file eol_crlf_crlf_true_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 568 - checkout attr=auto  aeol=lf core.autocrlf=true core.eol=crlf file=CRLF
 
 expecting success: 
-			test-tool wildmatch iwildmatch 'A' '[[:digit:][:upper:][:space:]]'
-		
-ok 795 - iwildmatch: match 'A' '[[:digit:][:upper:][:space:]]'
+		compare_ws_file eol_crlf_crlf_true_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 569 - checkout attr=auto  aeol=lf core.autocrlf=true core.eol=crlf file=CRLF_mix_LF
 
 expecting success: 
-				printf '%s' 'A' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[[:digit:][:upper:][:space:]]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 796 - iwildmatch (via ls-files): match '[[:digit:][:upper:][:space:]]' 'A'
+		compare_ws_file eol_crlf_crlf_true_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 570 - checkout attr=auto  aeol=lf core.autocrlf=true core.eol=crlf file=LF_mix_CR
 
 expecting success: 
-			test-tool wildmatch pathmatch 'A' '[[:digit:][:upper:][:space:]]'
-		
-ok 797 - pathmatch: match 'A' '[[:digit:][:upper:][:space:]]'
+		compare_ws_file eol_crlf_crlf_true_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 571 - checkout attr=auto  aeol=lf core.autocrlf=true core.eol=crlf file=LF_nul
 
 expecting success: 
-				printf '%s' 'A' >expect &&
-				git ls-files -z -- '[[:digit:][:upper:][:space:]]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
 		test_cmp expect actual
-			
-ok 798 - pathmatch (via ls-files): match '[[:digit:][:upper:][:space:]]' 'A'
+	
+ok 572 - ls-files --eol attr=auto  aeol=crlf core.autocrlf=true core.eol=crlf
 
 expecting success: 
-			test-tool wildmatch ipathmatch 'A' '[[:digit:][:upper:][:space:]]'
-		
-ok 799 - ipathmatch: match 'A' '[[:digit:][:upper:][:space:]]'
+		compare_ws_file eol_crlf_crlf_true_attr_auto_ CRLF    crlf_false_attr__LF.txt
+	
+ok 573 - checkout attr=auto  aeol=crlf core.autocrlf=true core.eol=crlf file=LF
 
 expecting success: 
-				printf '%s' 'A' >expect &&
-				git --icase-pathspecs ls-files -z -- '[[:digit:][:upper:][:space:]]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 800 - ipathmatch (via ls-files): match '[[:digit:][:upper:][:space:]]' 'A'
+		compare_ws_file eol_crlf_crlf_true_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 574 - checkout attr=auto  aeol=crlf core.autocrlf=true core.eol=crlf file=CRLF
 
 expecting success: 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
+		compare_ws_file eol_crlf_crlf_true_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
 	
-Removing A
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 801 - cleanup after previous file test
+ok 575 - checkout attr=auto  aeol=crlf core.autocrlf=true core.eol=crlf file=CRLF_mix_LF
 
 expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
+		compare_ws_file eol_crlf_crlf_true_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 802 - setup match file test for 1
+ok 576 - checkout attr=auto  aeol=crlf core.autocrlf=true core.eol=crlf file=LF_mix_CR
 
 expecting success: 
-			test-tool wildmatch wildmatch '1' '[[:digit:][:upper:][:space:]]'
-		
-ok 803 - wildmatch: match '1' '[[:digit:][:upper:][:space:]]'
+		compare_ws_file eol_crlf_crlf_true_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 577 - checkout attr=auto  aeol=crlf core.autocrlf=true core.eol=crlf file=LF_nul
 
 expecting success: 
-				printf '%s' '1' >expect &&
-				git --glob-pathspecs ls-files -z -- '[[:digit:][:upper:][:space:]]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
 		test_cmp expect actual
-			
-ok 804 - wildmatch (via ls-files): match '[[:digit:][:upper:][:space:]]' '1'
+	
+ok 578 - ls-files --eol attr=-text  aeol= core.autocrlf=false core.eol=crlf
 
 expecting success: 
-			test-tool wildmatch iwildmatch '1' '[[:digit:][:upper:][:space:]]'
-		
-ok 805 - iwildmatch: match '1' '[[:digit:][:upper:][:space:]]'
+		compare_ws_file eol_crlf_crlf_false_attr_-text_ LF    crlf_false_attr__LF.txt
+	
+ok 579 - checkout attr=-text  aeol= core.autocrlf=false core.eol=crlf file=LF
 
 expecting success: 
-				printf '%s' '1' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[[:digit:][:upper:][:space:]]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 806 - iwildmatch (via ls-files): match '[[:digit:][:upper:][:space:]]' '1'
+		compare_ws_file eol_crlf_crlf_false_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 580 - checkout attr=-text  aeol= core.autocrlf=false core.eol=crlf file=CRLF
 
 expecting success: 
-			test-tool wildmatch pathmatch '1' '[[:digit:][:upper:][:space:]]'
-		
-ok 807 - pathmatch: match '1' '[[:digit:][:upper:][:space:]]'
+		compare_ws_file eol_crlf_crlf_false_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 581 - checkout attr=-text  aeol= core.autocrlf=false core.eol=crlf file=CRLF_mix_LF
 
 expecting success: 
-				printf '%s' '1' >expect &&
-				git ls-files -z -- '[[:digit:][:upper:][:space:]]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 808 - pathmatch (via ls-files): match '[[:digit:][:upper:][:space:]]' '1'
+		compare_ws_file eol_crlf_crlf_false_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 582 - checkout attr=-text  aeol= core.autocrlf=false core.eol=crlf file=LF_mix_CR
 
 expecting success: 
-			test-tool wildmatch ipathmatch '1' '[[:digit:][:upper:][:space:]]'
-		
-ok 809 - ipathmatch: match '1' '[[:digit:][:upper:][:space:]]'
+		compare_ws_file eol_crlf_crlf_false_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 583 - checkout attr=-text  aeol= core.autocrlf=false core.eol=crlf file=LF_nul
 
 expecting success: 
-				printf '%s' '1' >expect &&
-				git --icase-pathspecs ls-files -z -- '[[:digit:][:upper:][:space:]]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
 		test_cmp expect actual
-			
-ok 810 - ipathmatch (via ls-files): match '[[:digit:][:upper:][:space:]]' '1'
+	
+ok 584 - ls-files --eol attr=-text  aeol=lf core.autocrlf=false core.eol=crlf
 
 expecting success: 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
+		compare_ws_file eol_crlf_crlf_false_attr_-text_ LF    crlf_false_attr__LF.txt
 	
-Removing 1
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 811 - cleanup after previous file test
+ok 585 - checkout attr=-text  aeol=lf core.autocrlf=false core.eol=crlf file=LF
 
 expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
+		compare_ws_file eol_crlf_crlf_false_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 812 - setup match file test for 1
+ok 586 - checkout attr=-text  aeol=lf core.autocrlf=false core.eol=crlf file=CRLF
 
 expecting success: 
-			test_must_fail test-tool wildmatch wildmatch '1' '[[:digit:][:upper:][:spaci:]]'
-		
-ok 813 - wildmatch: no match '1' '[[:digit:][:upper:][:spaci:]]'
+		compare_ws_file eol_crlf_crlf_false_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 587 - checkout attr=-text  aeol=lf core.autocrlf=false core.eol=crlf file=CRLF_mix_LF
 
 expecting success: 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- '[[:digit:][:upper:][:spaci:]]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 814 - wildmatch (via ls-files): no match '[[:digit:][:upper:][:spaci:]]' '1'
+		compare_ws_file eol_crlf_crlf_false_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 588 - checkout attr=-text  aeol=lf core.autocrlf=false core.eol=crlf file=LF_mix_CR
 
 expecting success: 
-			test_must_fail test-tool wildmatch iwildmatch '1' '[[:digit:][:upper:][:spaci:]]'
-		
-ok 815 - iwildmatch: no match '1' '[[:digit:][:upper:][:spaci:]]'
+		compare_ws_file eol_crlf_crlf_false_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 589 - checkout attr=-text  aeol=lf core.autocrlf=false core.eol=crlf file=LF_nul
 
 expecting success: 
-				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[[:digit:][:upper:][:spaci:]]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
 		test_cmp expect actual
-			
-ok 816 - iwildmatch (via ls-files): no match '[[:digit:][:upper:][:spaci:]]' '1'
+	
+ok 590 - ls-files --eol attr=-text  aeol=crlf core.autocrlf=false core.eol=crlf
 
 expecting success: 
-			test_must_fail test-tool wildmatch pathmatch '1' '[[:digit:][:upper:][:spaci:]]'
-		
-ok 817 - pathmatch: no match '1' '[[:digit:][:upper:][:spaci:]]'
+		compare_ws_file eol_crlf_crlf_false_attr_-text_ LF    crlf_false_attr__LF.txt
+	
+ok 591 - checkout attr=-text  aeol=crlf core.autocrlf=false core.eol=crlf file=LF
 
 expecting success: 
-				>expect &&
-				git ls-files -z -- '[[:digit:][:upper:][:spaci:]]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 818 - pathmatch (via ls-files): no match '[[:digit:][:upper:][:spaci:]]' '1'
+		compare_ws_file eol_crlf_crlf_false_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 592 - checkout attr=-text  aeol=crlf core.autocrlf=false core.eol=crlf file=CRLF
 
 expecting success: 
-			test_must_fail test-tool wildmatch ipathmatch '1' '[[:digit:][:upper:][:spaci:]]'
-		
-ok 819 - ipathmatch: no match '1' '[[:digit:][:upper:][:spaci:]]'
+		compare_ws_file eol_crlf_crlf_false_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 593 - checkout attr=-text  aeol=crlf core.autocrlf=false core.eol=crlf file=CRLF_mix_LF
 
 expecting success: 
-				>expect &&
-				git --icase-pathspecs ls-files -z -- '[[:digit:][:upper:][:spaci:]]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 820 - ipathmatch (via ls-files): no match '[[:digit:][:upper:][:spaci:]]' '1'
+		compare_ws_file eol_crlf_crlf_false_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 594 - checkout attr=-text  aeol=crlf core.autocrlf=false core.eol=crlf file=LF_mix_CR
 
 expecting success: 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
+		compare_ws_file eol_crlf_crlf_false_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
 	
-Removing 1
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 821 - cleanup after previous file test
+ok 595 - checkout attr=-text  aeol=crlf core.autocrlf=false core.eol=crlf file=LF_nul
 
 expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
+		test_cmp expect actual
 	
-ok 822 - setup match file test for  
+ok 596 - ls-files --eol attr=text  aeol=lf core.autocrlf=false core.eol=crlf
 
 expecting success: 
-			test-tool wildmatch wildmatch ' ' '[[:digit:][:upper:][:space:]]'
-		
-ok 823 - wildmatch: match ' ' '[[:digit:][:upper:][:space:]]'
+		compare_ws_file eol_crlf_crlf_false_attr_text_ LF    crlf_false_attr__LF.txt
+	
+ok 597 - checkout attr=text  aeol=lf core.autocrlf=false core.eol=crlf file=LF
 
 expecting success: 
-				printf '%s' ' ' >expect &&
-				git --glob-pathspecs ls-files -z -- '[[:digit:][:upper:][:space:]]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 824 - wildmatch (via ls-files): match '[[:digit:][:upper:][:space:]]' ' '
+		compare_ws_file eol_crlf_crlf_false_attr_text_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 598 - checkout attr=text  aeol=lf core.autocrlf=false core.eol=crlf file=CRLF
 
 expecting success: 
-			test-tool wildmatch iwildmatch ' ' '[[:digit:][:upper:][:space:]]'
-		
-ok 825 - iwildmatch: match ' ' '[[:digit:][:upper:][:space:]]'
+		compare_ws_file eol_crlf_crlf_false_attr_text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 599 - checkout attr=text  aeol=lf core.autocrlf=false core.eol=crlf file=CRLF_mix_LF
 
 expecting success: 
-				printf '%s' ' ' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[[:digit:][:upper:][:space:]]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 826 - iwildmatch (via ls-files): match '[[:digit:][:upper:][:space:]]' ' '
+		compare_ws_file eol_crlf_crlf_false_attr_text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 600 - checkout attr=text  aeol=lf core.autocrlf=false core.eol=crlf file=LF_mix_CR
 
 expecting success: 
-			test-tool wildmatch pathmatch ' ' '[[:digit:][:upper:][:space:]]'
-		
-ok 827 - pathmatch: match ' ' '[[:digit:][:upper:][:space:]]'
+		compare_ws_file eol_crlf_crlf_false_attr_text_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 601 - checkout attr=text  aeol=lf core.autocrlf=false core.eol=crlf file=LF_nul
 
 expecting success: 
-				printf '%s' ' ' >expect &&
-				git ls-files -z -- '[[:digit:][:upper:][:space:]]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
 		test_cmp expect actual
-			
-ok 828 - pathmatch (via ls-files): match '[[:digit:][:upper:][:space:]]' ' '
+	
+ok 602 - ls-files --eol attr=text  aeol=crlf core.autocrlf=false core.eol=crlf
 
 expecting success: 
-			test-tool wildmatch ipathmatch ' ' '[[:digit:][:upper:][:space:]]'
-		
-ok 829 - ipathmatch: match ' ' '[[:digit:][:upper:][:space:]]'
+		compare_ws_file eol_crlf_crlf_false_attr_text_ CRLF    crlf_false_attr__LF.txt
+	
+ok 603 - checkout attr=text  aeol=crlf core.autocrlf=false core.eol=crlf file=LF
 
 expecting success: 
-				printf '%s' ' ' >expect &&
-				git --icase-pathspecs ls-files -z -- '[[:digit:][:upper:][:space:]]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 830 - ipathmatch (via ls-files): match '[[:digit:][:upper:][:space:]]' ' '
+		compare_ws_file eol_crlf_crlf_false_attr_text_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 604 - checkout attr=text  aeol=crlf core.autocrlf=false core.eol=crlf file=CRLF
 
 expecting success: 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
+		compare_ws_file eol_crlf_crlf_false_attr_text_ CRLF crlf_false_attr__CRLF_mix_LF.txt
 	
-Removing  
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 831 - cleanup after previous file test
+ok 605 - checkout attr=text  aeol=crlf core.autocrlf=false core.eol=crlf file=CRLF_mix_LF
 
 expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
+		compare_ws_file eol_crlf_crlf_false_attr_text_ CRLF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 832 - setup match file test for .
+ok 606 - checkout attr=text  aeol=crlf core.autocrlf=false core.eol=crlf file=LF_mix_CR
 
 expecting success: 
-			test_must_fail test-tool wildmatch wildmatch '.' '[[:digit:][:upper:][:space:]]'
-		
-ok 833 - wildmatch: no match '.' '[[:digit:][:upper:][:space:]]'
-
-checking known breakage: false
-not ok 834 - wildmatch (via ls-files): no match skip '[[:digit:][:upper:][:space:]]' '.' # TODO known breakage
+		compare_ws_file eol_crlf_crlf_false_attr_text_ CRLF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 607 - checkout attr=text  aeol=crlf core.autocrlf=false core.eol=crlf file=LF_nul
 
 expecting success: 
-			test_must_fail test-tool wildmatch iwildmatch '.' '[[:digit:][:upper:][:space:]]'
-		
-ok 835 - iwildmatch: no match '.' '[[:digit:][:upper:][:space:]]'
-
-checking known breakage: false
-not ok 836 - iwildmatch (via ls-files): no match skip '[[:digit:][:upper:][:space:]]' '.' # TODO known breakage
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
+		test_cmp expect actual
+	
+ok 608 - ls-files --eol attr=auto  aeol=lf core.autocrlf=false core.eol=crlf
 
 expecting success: 
-			test_must_fail test-tool wildmatch pathmatch '.' '[[:digit:][:upper:][:space:]]'
-		
-ok 837 - pathmatch: no match '.' '[[:digit:][:upper:][:space:]]'
+		compare_ws_file eol_crlf_crlf_false_attr_auto_ LF    crlf_false_attr__LF.txt
+	
+ok 609 - checkout attr=auto  aeol=lf core.autocrlf=false core.eol=crlf file=LF
 
-checking known breakage: false
-not ok 838 - pathmatch (via ls-files): no match skip '[[:digit:][:upper:][:space:]]' '.' # TODO known breakage
+expecting success: 
+		compare_ws_file eol_crlf_crlf_false_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 610 - checkout attr=auto  aeol=lf core.autocrlf=false core.eol=crlf file=CRLF
 
 expecting success: 
-			test_must_fail test-tool wildmatch ipathmatch '.' '[[:digit:][:upper:][:space:]]'
-		
-ok 839 - ipathmatch: no match '.' '[[:digit:][:upper:][:space:]]'
+		compare_ws_file eol_crlf_crlf_false_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 611 - checkout attr=auto  aeol=lf core.autocrlf=false core.eol=crlf file=CRLF_mix_LF
 
-checking known breakage: false
-not ok 840 - ipathmatch (via ls-files): no match skip '[[:digit:][:upper:][:space:]]' '.' # TODO known breakage
+expecting success: 
+		compare_ws_file eol_crlf_crlf_false_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 612 - checkout attr=auto  aeol=lf core.autocrlf=false core.eol=crlf file=LF_mix_CR
 
 expecting success: 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
+		compare_ws_file eol_crlf_crlf_false_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
 	
-ok 841 - cleanup after previous file test
+ok 613 - checkout attr=auto  aeol=lf core.autocrlf=false core.eol=crlf file=LF_nul
 
 expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
+		test_cmp expect actual
 	
-ok 842 - setup match file test for .
+ok 614 - ls-files --eol attr=auto  aeol=crlf core.autocrlf=false core.eol=crlf
 
 expecting success: 
-			test-tool wildmatch wildmatch '.' '[[:digit:][:punct:][:space:]]'
-		
-ok 843 - wildmatch: match '.' '[[:digit:][:punct:][:space:]]'
+		compare_ws_file eol_crlf_crlf_false_attr_auto_ CRLF    crlf_false_attr__LF.txt
+	
+ok 615 - checkout attr=auto  aeol=crlf core.autocrlf=false core.eol=crlf file=LF
 
-checking known breakage: false
-not ok 844 - wildmatch (via ls-files): match skip '[[:digit:][:punct:][:space:]]' '.' # TODO known breakage
+expecting success: 
+		compare_ws_file eol_crlf_crlf_false_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 616 - checkout attr=auto  aeol=crlf core.autocrlf=false core.eol=crlf file=CRLF
 
 expecting success: 
-			test-tool wildmatch iwildmatch '.' '[[:digit:][:punct:][:space:]]'
-		
-ok 845 - iwildmatch: match '.' '[[:digit:][:punct:][:space:]]'
+		compare_ws_file eol_crlf_crlf_false_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 617 - checkout attr=auto  aeol=crlf core.autocrlf=false core.eol=crlf file=CRLF_mix_LF
 
-checking known breakage: false
-not ok 846 - iwildmatch (via ls-files): match skip '[[:digit:][:punct:][:space:]]' '.' # TODO known breakage
+expecting success: 
+		compare_ws_file eol_crlf_crlf_false_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 618 - checkout attr=auto  aeol=crlf core.autocrlf=false core.eol=crlf file=LF_mix_CR
 
 expecting success: 
-			test-tool wildmatch pathmatch '.' '[[:digit:][:punct:][:space:]]'
-		
-ok 847 - pathmatch: match '.' '[[:digit:][:punct:][:space:]]'
+		compare_ws_file eol_crlf_crlf_false_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 619 - checkout attr=auto  aeol=crlf core.autocrlf=false core.eol=crlf file=LF_nul
 
-checking known breakage: false
-not ok 848 - pathmatch (via ls-files): match skip '[[:digit:][:punct:][:space:]]' '.' # TODO known breakage
+expecting success: 
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
+		test_cmp expect actual
+	
+ok 620 - ls-files --eol attr=-text  aeol= core.autocrlf=input core.eol=crlf
 
 expecting success: 
-			test-tool wildmatch ipathmatch '.' '[[:digit:][:punct:][:space:]]'
-		
-ok 849 - ipathmatch: match '.' '[[:digit:][:punct:][:space:]]'
+		compare_ws_file eol_crlf_crlf_input_attr_-text_ LF    crlf_false_attr__LF.txt
+	
+ok 621 - checkout attr=-text  aeol= core.autocrlf=input core.eol=crlf file=LF
 
-checking known breakage: false
-not ok 850 - ipathmatch (via ls-files): match skip '[[:digit:][:punct:][:space:]]' '.' # TODO known breakage
+expecting success: 
+		compare_ws_file eol_crlf_crlf_input_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 622 - checkout attr=-text  aeol= core.autocrlf=input core.eol=crlf file=CRLF
 
 expecting success: 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
+		compare_ws_file eol_crlf_crlf_input_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
 	
-ok 851 - cleanup after previous file test
+ok 623 - checkout attr=-text  aeol= core.autocrlf=input core.eol=crlf file=CRLF_mix_LF
 
 expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
+		compare_ws_file eol_crlf_crlf_input_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 852 - setup match file test for 5
+ok 624 - checkout attr=-text  aeol= core.autocrlf=input core.eol=crlf file=LF_mix_CR
 
 expecting success: 
-			test-tool wildmatch wildmatch '5' '[[:xdigit:]]'
-		
-ok 853 - wildmatch: match '5' '[[:xdigit:]]'
+		compare_ws_file eol_crlf_crlf_input_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 625 - checkout attr=-text  aeol= core.autocrlf=input core.eol=crlf file=LF_nul
 
 expecting success: 
-				printf '%s' '5' >expect &&
-				git --glob-pathspecs ls-files -z -- '[[:xdigit:]]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
 		test_cmp expect actual
-			
-ok 854 - wildmatch (via ls-files): match '[[:xdigit:]]' '5'
+	
+ok 626 - ls-files --eol attr=-text  aeol=lf core.autocrlf=input core.eol=crlf
 
 expecting success: 
-			test-tool wildmatch iwildmatch '5' '[[:xdigit:]]'
-		
-ok 855 - iwildmatch: match '5' '[[:xdigit:]]'
+		compare_ws_file eol_crlf_crlf_input_attr_-text_ LF    crlf_false_attr__LF.txt
+	
+ok 627 - checkout attr=-text  aeol=lf core.autocrlf=input core.eol=crlf file=LF
 
 expecting success: 
-				printf '%s' '5' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[[:xdigit:]]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 856 - iwildmatch (via ls-files): match '[[:xdigit:]]' '5'
+		compare_ws_file eol_crlf_crlf_input_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 628 - checkout attr=-text  aeol=lf core.autocrlf=input core.eol=crlf file=CRLF
 
 expecting success: 
-			test-tool wildmatch pathmatch '5' '[[:xdigit:]]'
-		
-ok 857 - pathmatch: match '5' '[[:xdigit:]]'
+		compare_ws_file eol_crlf_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=crlf file=CRLF_mix_LF
 
 expecting success: 
-				printf '%s' '5' >expect &&
-				git ls-files -z -- '[[:xdigit:]]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 858 - pathmatch (via ls-files): match '[[:xdigit:]]' '5'
+		compare_ws_file eol_crlf_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=crlf file=LF_mix_CR
 
 expecting success: 
-			test-tool wildmatch ipathmatch '5' '[[:xdigit:]]'
-		
-ok 859 - ipathmatch: match '5' '[[:xdigit:]]'
+		compare_ws_file eol_crlf_crlf_input_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 631 - checkout attr=-text  aeol=lf core.autocrlf=input core.eol=crlf file=LF_nul
 
 expecting success: 
-				printf '%s' '5' >expect &&
-				git --icase-pathspecs ls-files -z -- '[[:xdigit:]]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
 		test_cmp expect actual
-			
-ok 860 - ipathmatch (via ls-files): match '[[:xdigit:]]' '5'
+	
+ok 632 - ls-files --eol attr=-text  aeol=crlf core.autocrlf=input core.eol=crlf
 
 expecting success: 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
+		compare_ws_file eol_crlf_crlf_input_attr_-text_ LF    crlf_false_attr__LF.txt
 	
-Removing 5
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 861 - cleanup after previous file test
+ok 633 - checkout attr=-text  aeol=crlf core.autocrlf=input core.eol=crlf file=LF
 
 expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
+		compare_ws_file eol_crlf_crlf_input_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 862 - setup match file test for f
+ok 634 - checkout attr=-text  aeol=crlf core.autocrlf=input core.eol=crlf file=CRLF
 
 expecting success: 
-			test-tool wildmatch wildmatch 'f' '[[:xdigit:]]'
-		
-ok 863 - wildmatch: match 'f' '[[:xdigit:]]'
+		compare_ws_file eol_crlf_crlf_input_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 635 - checkout attr=-text  aeol=crlf core.autocrlf=input core.eol=crlf file=CRLF_mix_LF
 
 expecting success: 
-				printf '%s' 'f' >expect &&
-				git --glob-pathspecs ls-files -z -- '[[:xdigit:]]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 864 - wildmatch (via ls-files): match '[[:xdigit:]]' 'f'
+		compare_ws_file eol_crlf_crlf_input_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 636 - checkout attr=-text  aeol=crlf core.autocrlf=input core.eol=crlf file=LF_mix_CR
 
 expecting success: 
-			test-tool wildmatch iwildmatch 'f' '[[:xdigit:]]'
-		
-ok 865 - iwildmatch: match 'f' '[[:xdigit:]]'
+		compare_ws_file eol_crlf_crlf_input_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 637 - checkout attr=-text  aeol=crlf core.autocrlf=input core.eol=crlf file=LF_nul
 
 expecting success: 
-				printf '%s' 'f' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[[:xdigit:]]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
 		test_cmp expect actual
-			
-ok 866 - iwildmatch (via ls-files): match '[[:xdigit:]]' 'f'
+	
+ok 638 - ls-files --eol attr=text  aeol=lf core.autocrlf=input core.eol=crlf
 
 expecting success: 
-			test-tool wildmatch pathmatch 'f' '[[:xdigit:]]'
-		
-ok 867 - pathmatch: match 'f' '[[:xdigit:]]'
+		compare_ws_file eol_crlf_crlf_input_attr_text_ LF    crlf_false_attr__LF.txt
+	
+ok 639 - checkout attr=text  aeol=lf core.autocrlf=input core.eol=crlf file=LF
 
 expecting success: 
-				printf '%s' 'f' >expect &&
-				git ls-files -z -- '[[:xdigit:]]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 868 - pathmatch (via ls-files): match '[[:xdigit:]]' 'f'
+		compare_ws_file eol_crlf_crlf_input_attr_text_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 640 - checkout attr=text  aeol=lf core.autocrlf=input core.eol=crlf file=CRLF
 
 expecting success: 
-			test-tool wildmatch ipathmatch 'f' '[[:xdigit:]]'
-		
-ok 869 - ipathmatch: match 'f' '[[:xdigit:]]'
+		compare_ws_file eol_crlf_crlf_input_attr_text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 641 - checkout attr=text  aeol=lf core.autocrlf=input core.eol=crlf file=CRLF_mix_LF
 
 expecting success: 
-				printf '%s' 'f' >expect &&
-				git --icase-pathspecs ls-files -z -- '[[:xdigit:]]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 870 - ipathmatch (via ls-files): match '[[:xdigit:]]' 'f'
+		compare_ws_file eol_crlf_crlf_input_attr_text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 642 - checkout attr=text  aeol=lf core.autocrlf=input core.eol=crlf file=LF_mix_CR
 
 expecting success: 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
+		compare_ws_file eol_crlf_crlf_input_attr_text_ LF_nul   crlf_false_attr__LF_nul.txt
 	
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-Removing f
-ok 871 - cleanup after previous file test
+ok 643 - checkout attr=text  aeol=lf core.autocrlf=input core.eol=crlf file=LF_nul
 
 expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
+		test_cmp expect actual
 	
-ok 872 - setup match file test for D
+ok 644 - ls-files --eol attr=text  aeol=crlf core.autocrlf=input core.eol=crlf
 
 expecting success: 
-			test-tool wildmatch wildmatch 'D' '[[:xdigit:]]'
-		
-ok 873 - wildmatch: match 'D' '[[:xdigit:]]'
+		compare_ws_file eol_crlf_crlf_input_attr_text_ CRLF    crlf_false_attr__LF.txt
+	
+ok 645 - checkout attr=text  aeol=crlf core.autocrlf=input core.eol=crlf file=LF
 
 expecting success: 
-				printf '%s' 'D' >expect &&
-				git --glob-pathspecs ls-files -z -- '[[:xdigit:]]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 874 - wildmatch (via ls-files): match '[[:xdigit:]]' 'D'
+		compare_ws_file eol_crlf_crlf_input_attr_text_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 646 - checkout attr=text  aeol=crlf core.autocrlf=input core.eol=crlf file=CRLF
 
 expecting success: 
-			test-tool wildmatch iwildmatch 'D' '[[:xdigit:]]'
-		
-ok 875 - iwildmatch: match 'D' '[[:xdigit:]]'
+		compare_ws_file eol_crlf_crlf_input_attr_text_ CRLF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 647 - checkout attr=text  aeol=crlf core.autocrlf=input core.eol=crlf file=CRLF_mix_LF
 
 expecting success: 
-				printf '%s' 'D' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[[:xdigit:]]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 876 - iwildmatch (via ls-files): match '[[:xdigit:]]' 'D'
+		compare_ws_file eol_crlf_crlf_input_attr_text_ CRLF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 648 - checkout attr=text  aeol=crlf core.autocrlf=input core.eol=crlf file=LF_mix_CR
 
 expecting success: 
-			test-tool wildmatch pathmatch 'D' '[[:xdigit:]]'
-		
-ok 877 - pathmatch: match 'D' '[[:xdigit:]]'
+		compare_ws_file eol_crlf_crlf_input_attr_text_ CRLF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 649 - checkout attr=text  aeol=crlf core.autocrlf=input core.eol=crlf file=LF_nul
 
 expecting success: 
-				printf '%s' 'D' >expect &&
-				git ls-files -z -- '[[:xdigit:]]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
 		test_cmp expect actual
-			
-ok 878 - pathmatch (via ls-files): match '[[:xdigit:]]' 'D'
+	
+ok 650 - ls-files --eol attr=auto  aeol=lf core.autocrlf=input core.eol=crlf
 
 expecting success: 
-			test-tool wildmatch ipathmatch 'D' '[[:xdigit:]]'
-		
-ok 879 - ipathmatch: match 'D' '[[:xdigit:]]'
+		compare_ws_file eol_crlf_crlf_input_attr_auto_ LF    crlf_false_attr__LF.txt
+	
+ok 651 - checkout attr=auto  aeol=lf core.autocrlf=input core.eol=crlf file=LF
 
 expecting success: 
-				printf '%s' 'D' >expect &&
-				git --icase-pathspecs ls-files -z -- '[[:xdigit:]]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 880 - ipathmatch (via ls-files): match '[[:xdigit:]]' 'D'
+		compare_ws_file eol_crlf_crlf_input_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 652 - checkout attr=auto  aeol=lf core.autocrlf=input core.eol=crlf file=CRLF
 
 expecting success: 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
+		compare_ws_file eol_crlf_crlf_input_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
 	
-Removing D
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 881 - cleanup after previous file test
+ok 653 - checkout attr=auto  aeol=lf core.autocrlf=input core.eol=crlf file=CRLF_mix_LF
 
 expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
+		compare_ws_file eol_crlf_crlf_input_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 882 - setup match file test for _
+ok 654 - checkout attr=auto  aeol=lf core.autocrlf=input core.eol=crlf file=LF_mix_CR
 
 expecting success: 
-			test-tool wildmatch wildmatch '_' '[[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:graph:][:lower:][:print:][:punct:][:space:][:upper:][:xdigit:]]'
-		
-ok 883 - wildmatch: match '_' '[[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:graph:][:lower:][:print:][:punct:][:space:][:upper:][:xdigit:]]'
+		compare_ws_file eol_crlf_crlf_input_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 655 - checkout attr=auto  aeol=lf core.autocrlf=input core.eol=crlf file=LF_nul
 
 expecting success: 
-				printf '%s' '_' >expect &&
-				git --glob-pathspecs ls-files -z -- '[[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:graph:][:lower:][:print:][:punct:][:space:][:upper:][:xdigit:]]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
 		test_cmp expect actual
-			
-ok 884 - wildmatch (via ls-files): match '[[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:graph:][:lower:][:print:][:punct:][:space:][:upper:][:xdigit:]]' '_'
+	
+ok 656 - ls-files --eol attr=auto  aeol=crlf core.autocrlf=input core.eol=crlf
 
 expecting success: 
-			test-tool wildmatch iwildmatch '_' '[[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:graph:][:lower:][:print:][:punct:][:space:][:upper:][:xdigit:]]'
-		
-ok 885 - iwildmatch: match '_' '[[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:graph:][:lower:][:print:][:punct:][:space:][:upper:][:xdigit:]]'
+		compare_ws_file eol_crlf_crlf_input_attr_auto_ CRLF    crlf_false_attr__LF.txt
+	
+ok 657 - checkout attr=auto  aeol=crlf core.autocrlf=input core.eol=crlf file=LF
 
 expecting success: 
-				printf '%s' '_' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:graph:][:lower:][:print:][:punct:][:space:][:upper:][:xdigit:]]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 886 - iwildmatch (via ls-files): match '[[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:graph:][:lower:][:print:][:punct:][:space:][:upper:][:xdigit:]]' '_'
+		compare_ws_file eol_crlf_crlf_input_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 658 - checkout attr=auto  aeol=crlf core.autocrlf=input core.eol=crlf file=CRLF
 
 expecting success: 
-			test-tool wildmatch pathmatch '_' '[[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:graph:][:lower:][:print:][:punct:][:space:][:upper:][:xdigit:]]'
-		
-ok 887 - pathmatch: match '_' '[[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:graph:][:lower:][:print:][:punct:][:space:][:upper:][:xdigit:]]'
+		compare_ws_file eol_crlf_crlf_input_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 659 - checkout attr=auto  aeol=crlf core.autocrlf=input core.eol=crlf file=CRLF_mix_LF
 
 expecting success: 
-				printf '%s' '_' >expect &&
-				git ls-files -z -- '[[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:graph:][:lower:][:print:][:punct:][:space:][:upper:][:xdigit:]]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 888 - pathmatch (via ls-files): match '[[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:graph:][:lower:][:print:][:punct:][:space:][:upper:][:xdigit:]]' '_'
+		compare_ws_file eol_crlf_crlf_input_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 660 - checkout attr=auto  aeol=crlf core.autocrlf=input core.eol=crlf file=LF_mix_CR
 
 expecting success: 
-			test-tool wildmatch ipathmatch '_' '[[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:graph:][:lower:][:print:][:punct:][:space:][:upper:][:xdigit:]]'
-		
-ok 889 - ipathmatch: match '_' '[[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:graph:][:lower:][:print:][:punct:][:space:][:upper:][:xdigit:]]'
+		compare_ws_file eol_crlf_crlf_input_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 661 - checkout attr=auto  aeol=crlf core.autocrlf=input core.eol=crlf file=LF_nul
 
 expecting success: 
-				printf '%s' '_' >expect &&
-				git --icase-pathspecs ls-files -z -- '[[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:graph:][:lower:][:print:][:punct:][:space:][:upper:][:xdigit:]]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
 		test_cmp expect actual
-			
-ok 890 - ipathmatch (via ls-files): match '[[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:graph:][:lower:][:print:][:punct:][:space:][:upper:][:xdigit:]]' '_'
+	
+ok 662 - ls-files --eol attr=  aeol= core.autocrlf=false core.eol=crlf
 
 expecting success: 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
+		compare_ws_file eol_crlf_crlf_false_attr__ LF    crlf_false_attr__LF.txt
 	
-Removing _
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 891 - cleanup after previous file test
+ok 663 - checkout attr=  aeol= core.autocrlf=false core.eol=crlf file=LF
 
 expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
+		compare_ws_file eol_crlf_crlf_false_attr__ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 892 - setup match file test for .
+ok 664 - checkout attr=  aeol= core.autocrlf=false core.eol=crlf file=CRLF
 
 expecting success: 
-			test-tool wildmatch wildmatch '.' '[^[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:lower:][:space:][:upper:][:xdigit:]]'
-		
-ok 893 - wildmatch: match '.' '[^[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:lower:][:space:][:upper:][:xdigit:]]'
-
-checking known breakage: false
-not ok 894 - wildmatch (via ls-files): match skip '[^[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:lower:][:space:][:upper:][:xdigit:]]' '.' # TODO known breakage
+		compare_ws_file eol_crlf_crlf_false_attr__ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 665 - checkout attr=  aeol= core.autocrlf=false core.eol=crlf file=CRLF_mix_LF
 
 expecting success: 
-			test-tool wildmatch iwildmatch '.' '[^[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:lower:][:space:][:upper:][:xdigit:]]'
-		
-ok 895 - iwildmatch: match '.' '[^[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:lower:][:space:][:upper:][:xdigit:]]'
-
-checking known breakage: false
-not ok 896 - iwildmatch (via ls-files): match skip '[^[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:lower:][:space:][:upper:][:xdigit:]]' '.' # TODO known breakage
+		compare_ws_file eol_crlf_crlf_false_attr__ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 666 - checkout attr=  aeol= core.autocrlf=false core.eol=crlf file=LF_mix_CR
 
 expecting success: 
-			test-tool wildmatch pathmatch '.' '[^[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:lower:][:space:][:upper:][:xdigit:]]'
-		
-ok 897 - pathmatch: match '.' '[^[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:lower:][:space:][:upper:][:xdigit:]]'
+		compare_ws_file eol_crlf_crlf_false_attr__ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 667 - checkout attr=  aeol= core.autocrlf=false core.eol=crlf file=LF_nul
 
-checking known breakage: false
-not ok 898 - pathmatch (via ls-files): match skip '[^[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:lower:][:space:][:upper:][:xdigit:]]' '.' # TODO known breakage
+expecting success: 
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
+		test_cmp expect actual
+	
+ok 668 - ls-files --eol attr=  aeol= core.autocrlf=true core.eol=crlf
 
 expecting success: 
-			test-tool wildmatch ipathmatch '.' '[^[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:lower:][:space:][:upper:][:xdigit:]]'
-		
-ok 899 - ipathmatch: match '.' '[^[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:lower:][:space:][:upper:][:xdigit:]]'
+		compare_ws_file eol_crlf_crlf_true_attr__ CRLF    crlf_false_attr__LF.txt
+	
+ok 669 - checkout attr=  aeol= core.autocrlf=true core.eol=crlf file=LF
 
-checking known breakage: false
-not ok 900 - ipathmatch (via ls-files): match skip '[^[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:lower:][:space:][:upper:][:xdigit:]]' '.' # TODO known breakage
+expecting success: 
+		compare_ws_file eol_crlf_crlf_true_attr__ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 670 - checkout attr=  aeol= core.autocrlf=true core.eol=crlf file=CRLF
 
 expecting success: 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
+		compare_ws_file eol_crlf_crlf_true_attr__ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
 	
-ok 901 - cleanup after previous file test
+ok 671 - checkout attr=  aeol= core.autocrlf=true core.eol=crlf file=CRLF_mix_LF
 
 expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
+		compare_ws_file eol_crlf_crlf_true_attr__ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 902 - setup match file test for 5
+ok 672 - checkout attr=  aeol= core.autocrlf=true core.eol=crlf file=LF_mix_CR
 
 expecting success: 
-			test-tool wildmatch wildmatch '5' '[a-c[:digit:]x-z]'
-		
-ok 903 - wildmatch: match '5' '[a-c[:digit:]x-z]'
+		compare_ws_file eol_crlf_crlf_true_attr__ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 673 - checkout attr=  aeol= core.autocrlf=true core.eol=crlf file=LF_nul
 
 expecting success: 
-				printf '%s' '5' >expect &&
-				git --glob-pathspecs ls-files -z -- '[a-c[:digit:]x-z]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
 		test_cmp expect actual
-			
-ok 904 - wildmatch (via ls-files): match '[a-c[:digit:]x-z]' '5'
+	
+ok 674 - ls-files --eol attr=auto  aeol= core.autocrlf=true core.eol=crlf
 
 expecting success: 
-			test-tool wildmatch iwildmatch '5' '[a-c[:digit:]x-z]'
-		
-ok 905 - iwildmatch: match '5' '[a-c[:digit:]x-z]'
+		compare_ws_file eol_crlf_crlf_true_attr_auto_ CRLF    crlf_false_attr__LF.txt
+	
+ok 675 - checkout attr=auto  aeol= core.autocrlf=true core.eol=crlf file=LF
 
 expecting success: 
-				printf '%s' '5' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[a-c[:digit:]x-z]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 906 - iwildmatch (via ls-files): match '[a-c[:digit:]x-z]' '5'
+		compare_ws_file eol_crlf_crlf_true_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 676 - checkout attr=auto  aeol= core.autocrlf=true core.eol=crlf file=CRLF
 
 expecting success: 
-			test-tool wildmatch pathmatch '5' '[a-c[:digit:]x-z]'
-		
-ok 907 - pathmatch: match '5' '[a-c[:digit:]x-z]'
+		compare_ws_file eol_crlf_crlf_true_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 677 - checkout attr=auto  aeol= core.autocrlf=true core.eol=crlf file=CRLF_mix_LF
 
 expecting success: 
-				printf '%s' '5' >expect &&
-				git ls-files -z -- '[a-c[:digit:]x-z]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 908 - pathmatch (via ls-files): match '[a-c[:digit:]x-z]' '5'
+		compare_ws_file eol_crlf_crlf_true_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 678 - checkout attr=auto  aeol= core.autocrlf=true core.eol=crlf file=LF_mix_CR
 
 expecting success: 
-			test-tool wildmatch ipathmatch '5' '[a-c[:digit:]x-z]'
-		
-ok 909 - ipathmatch: match '5' '[a-c[:digit:]x-z]'
+		compare_ws_file eol_crlf_crlf_true_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 679 - checkout attr=auto  aeol= core.autocrlf=true core.eol=crlf file=LF_nul
 
 expecting success: 
-				printf '%s' '5' >expect &&
-				git --icase-pathspecs ls-files -z -- '[a-c[:digit:]x-z]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
 		test_cmp expect actual
-			
-ok 910 - ipathmatch (via ls-files): match '[a-c[:digit:]x-z]' '5'
+	
+ok 680 - ls-files --eol attr=text  aeol= core.autocrlf=true core.eol=crlf
 
 expecting success: 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
+		compare_ws_file eol_crlf_crlf_true_attr_text_ CRLF    crlf_false_attr__LF.txt
 	
-Removing 5
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 911 - cleanup after previous file test
+ok 681 - checkout attr=text  aeol= core.autocrlf=true core.eol=crlf file=LF
 
 expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
+		compare_ws_file eol_crlf_crlf_true_attr_text_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 912 - setup match file test for b
+ok 682 - checkout attr=text  aeol= core.autocrlf=true core.eol=crlf file=CRLF
 
 expecting success: 
-			test-tool wildmatch wildmatch 'b' '[a-c[:digit:]x-z]'
-		
-ok 913 - wildmatch: match 'b' '[a-c[:digit:]x-z]'
+		compare_ws_file eol_crlf_crlf_true_attr_text_ CRLF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 683 - checkout attr=text  aeol= core.autocrlf=true core.eol=crlf file=CRLF_mix_LF
 
 expecting success: 
-				printf '%s' 'b' >expect &&
-				git --glob-pathspecs ls-files -z -- '[a-c[:digit:]x-z]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 914 - wildmatch (via ls-files): match '[a-c[:digit:]x-z]' 'b'
+		compare_ws_file eol_crlf_crlf_true_attr_text_ CRLF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 684 - checkout attr=text  aeol= core.autocrlf=true core.eol=crlf file=LF_mix_CR
 
 expecting success: 
-			test-tool wildmatch iwildmatch 'b' '[a-c[:digit:]x-z]'
-		
-ok 915 - iwildmatch: match 'b' '[a-c[:digit:]x-z]'
+		compare_ws_file eol_crlf_crlf_true_attr_text_ CRLF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 685 - checkout attr=text  aeol= core.autocrlf=true core.eol=crlf file=LF_nul
 
 expecting success: 
-				printf '%s' 'b' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[a-c[:digit:]x-z]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
 		test_cmp expect actual
-			
-ok 916 - iwildmatch (via ls-files): match '[a-c[:digit:]x-z]' 'b'
+	
+ok 686 - ls-files --eol attr=text  aeol= core.autocrlf=input core.eol=crlf
 
 expecting success: 
-			test-tool wildmatch pathmatch 'b' '[a-c[:digit:]x-z]'
-		
-ok 917 - pathmatch: match 'b' '[a-c[:digit:]x-z]'
+		compare_ws_file eol_crlf_crlf_input_attr_text_ LF    crlf_false_attr__LF.txt
+	
+ok 687 - checkout attr=text  aeol= core.autocrlf=input core.eol=crlf file=LF
 
 expecting success: 
-				printf '%s' 'b' >expect &&
-				git ls-files -z -- '[a-c[:digit:]x-z]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 918 - pathmatch (via ls-files): match '[a-c[:digit:]x-z]' 'b'
+		compare_ws_file eol_crlf_crlf_input_attr_text_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 688 - checkout attr=text  aeol= core.autocrlf=input core.eol=crlf file=CRLF
 
 expecting success: 
-			test-tool wildmatch ipathmatch 'b' '[a-c[:digit:]x-z]'
-		
-ok 919 - ipathmatch: match 'b' '[a-c[:digit:]x-z]'
+		compare_ws_file eol_crlf_crlf_input_attr_text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 689 - checkout attr=text  aeol= core.autocrlf=input core.eol=crlf file=CRLF_mix_LF
 
 expecting success: 
-				printf '%s' 'b' >expect &&
-				git --icase-pathspecs ls-files -z -- '[a-c[:digit:]x-z]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 920 - ipathmatch (via ls-files): match '[a-c[:digit:]x-z]' 'b'
+		compare_ws_file eol_crlf_crlf_input_attr_text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 690 - checkout attr=text  aeol= core.autocrlf=input core.eol=crlf file=LF_mix_CR
 
 expecting success: 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
+		compare_ws_file eol_crlf_crlf_input_attr_text_ LF_nul   crlf_false_attr__LF_nul.txt
 	
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing b
-Removing expect
-ok 921 - cleanup after previous file test
+ok 691 - checkout attr=text  aeol= core.autocrlf=input core.eol=crlf file=LF_nul
 
 expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
+		test_cmp expect actual
 	
-ok 922 - setup match file test for y
+ok 692 - ls-files --eol attr=auto  aeol= core.autocrlf=input core.eol=crlf
 
 expecting success: 
-			test-tool wildmatch wildmatch 'y' '[a-c[:digit:]x-z]'
-		
-ok 923 - wildmatch: match 'y' '[a-c[:digit:]x-z]'
+		compare_ws_file eol_crlf_crlf_input_attr_auto_ LF    crlf_false_attr__LF.txt
+	
+ok 693 - checkout attr=auto  aeol= core.autocrlf=input core.eol=crlf file=LF
 
 expecting success: 
-				printf '%s' 'y' >expect &&
-				git --glob-pathspecs ls-files -z -- '[a-c[:digit:]x-z]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 924 - wildmatch (via ls-files): match '[a-c[:digit:]x-z]' 'y'
+		compare_ws_file eol_crlf_crlf_input_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 694 - checkout attr=auto  aeol= core.autocrlf=input core.eol=crlf file=CRLF
 
 expecting success: 
-			test-tool wildmatch iwildmatch 'y' '[a-c[:digit:]x-z]'
-		
-ok 925 - iwildmatch: match 'y' '[a-c[:digit:]x-z]'
+		compare_ws_file eol_crlf_crlf_input_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 695 - checkout attr=auto  aeol= core.autocrlf=input core.eol=crlf file=CRLF_mix_LF
 
 expecting success: 
-				printf '%s' 'y' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[a-c[:digit:]x-z]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 926 - iwildmatch (via ls-files): match '[a-c[:digit:]x-z]' 'y'
+		compare_ws_file eol_crlf_crlf_input_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 696 - checkout attr=auto  aeol= core.autocrlf=input core.eol=crlf file=LF_mix_CR
 
 expecting success: 
-			test-tool wildmatch pathmatch 'y' '[a-c[:digit:]x-z]'
-		
-ok 927 - pathmatch: match 'y' '[a-c[:digit:]x-z]'
+		compare_ws_file eol_crlf_crlf_input_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 697 - checkout attr=auto  aeol= core.autocrlf=input core.eol=crlf file=LF_nul
 
 expecting success: 
-				printf '%s' 'y' >expect &&
-				git ls-files -z -- '[a-c[:digit:]x-z]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
 		test_cmp expect actual
-			
-ok 928 - pathmatch (via ls-files): match '[a-c[:digit:]x-z]' 'y'
+	
+ok 698 - ls-files --eol attr=-text  aeol= core.autocrlf=true core.eol=native
 
 expecting success: 
-			test-tool wildmatch ipathmatch 'y' '[a-c[:digit:]x-z]'
-		
-ok 929 - ipathmatch: match 'y' '[a-c[:digit:]x-z]'
+		compare_ws_file eol_native_crlf_true_attr_-text_ LF    crlf_false_attr__LF.txt
+	
+ok 699 - checkout attr=-text  aeol= core.autocrlf=true core.eol=native file=LF
 
 expecting success: 
-				printf '%s' 'y' >expect &&
-				git --icase-pathspecs ls-files -z -- '[a-c[:digit:]x-z]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 930 - ipathmatch (via ls-files): match '[a-c[:digit:]x-z]' 'y'
+		compare_ws_file eol_native_crlf_true_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 700 - checkout attr=-text  aeol= core.autocrlf=true core.eol=native file=CRLF
 
 expecting success: 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
+		compare_ws_file eol_native_crlf_true_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
 	
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-Removing y
-ok 931 - cleanup after previous file test
+ok 701 - checkout attr=-text  aeol= core.autocrlf=true core.eol=native file=CRLF_mix_LF
 
 expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
+		compare_ws_file eol_native_crlf_true_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 932 - setup match file test for q
+ok 702 - checkout attr=-text  aeol= core.autocrlf=true core.eol=native file=LF_mix_CR
 
 expecting success: 
-			test_must_fail test-tool wildmatch wildmatch 'q' '[a-c[:digit:]x-z]'
-		
-ok 933 - wildmatch: no match 'q' '[a-c[:digit:]x-z]'
+		compare_ws_file eol_native_crlf_true_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 703 - checkout attr=-text  aeol= core.autocrlf=true core.eol=native file=LF_nul
 
 expecting success: 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- '[a-c[:digit:]x-z]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
 		test_cmp expect actual
-			
-ok 934 - wildmatch (via ls-files): no match '[a-c[:digit:]x-z]' 'q'
+	
+ok 704 - ls-files --eol attr=-text  aeol=lf core.autocrlf=true core.eol=native
 
 expecting success: 
-			test_must_fail test-tool wildmatch iwildmatch 'q' '[a-c[:digit:]x-z]'
-		
-ok 935 - iwildmatch: no match 'q' '[a-c[:digit:]x-z]'
+		compare_ws_file eol_native_crlf_true_attr_-text_ LF    crlf_false_attr__LF.txt
+	
+ok 705 - checkout attr=-text  aeol=lf core.autocrlf=true core.eol=native file=LF
 
 expecting success: 
-				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[a-c[:digit:]x-z]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 936 - iwildmatch (via ls-files): no match '[a-c[:digit:]x-z]' 'q'
+		compare_ws_file eol_native_crlf_true_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 706 - checkout attr=-text  aeol=lf core.autocrlf=true core.eol=native file=CRLF
 
 expecting success: 
-			test_must_fail test-tool wildmatch pathmatch 'q' '[a-c[:digit:]x-z]'
-		
-ok 937 - pathmatch: no match 'q' '[a-c[:digit:]x-z]'
+		compare_ws_file eol_native_crlf_true_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 707 - checkout attr=-text  aeol=lf core.autocrlf=true core.eol=native file=CRLF_mix_LF
 
 expecting success: 
-				>expect &&
-				git ls-files -z -- '[a-c[:digit:]x-z]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 938 - pathmatch (via ls-files): no match '[a-c[:digit:]x-z]' 'q'
+		compare_ws_file eol_native_crlf_true_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 708 - checkout attr=-text  aeol=lf core.autocrlf=true core.eol=native file=LF_mix_CR
 
 expecting success: 
-			test_must_fail test-tool wildmatch ipathmatch 'q' '[a-c[:digit:]x-z]'
-		
-ok 939 - ipathmatch: no match 'q' '[a-c[:digit:]x-z]'
+		compare_ws_file eol_native_crlf_true_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 709 - checkout attr=-text  aeol=lf core.autocrlf=true core.eol=native file=LF_nul
 
 expecting success: 
-				>expect &&
-				git --icase-pathspecs ls-files -z -- '[a-c[:digit:]x-z]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
 		test_cmp expect actual
-			
-ok 940 - ipathmatch (via ls-files): no match '[a-c[:digit:]x-z]' 'q'
+	
+ok 710 - ls-files --eol attr=-text  aeol=crlf core.autocrlf=true core.eol=native
 
 expecting success: 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
+		compare_ws_file eol_native_crlf_true_attr_-text_ LF    crlf_false_attr__LF.txt
 	
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-Removing q
-ok 941 - cleanup after previous file test
+ok 711 - checkout attr=-text  aeol=crlf core.autocrlf=true core.eol=native file=LF
 
 expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
+		compare_ws_file eol_native_crlf_true_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 942 - setup match file test for ]
+ok 712 - checkout attr=-text  aeol=crlf core.autocrlf=true core.eol=native file=CRLF
 
 expecting success: 
-			test-tool wildmatch wildmatch ']' '[\\-^]'
-		
-ok 943 - wildmatch: match ']' '[\\-^]'
+		compare_ws_file eol_native_crlf_true_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 713 - checkout attr=-text  aeol=crlf core.autocrlf=true core.eol=native file=CRLF_mix_LF
 
 expecting success: 
-				printf '%s' ']' >expect &&
-				git --glob-pathspecs ls-files -z -- '[\\-^]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 944 - wildmatch (via ls-files): match '[\\-^]' ']'
+		compare_ws_file eol_native_crlf_true_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 714 - checkout attr=-text  aeol=crlf core.autocrlf=true core.eol=native file=LF_mix_CR
 
 expecting success: 
-			test-tool wildmatch iwildmatch ']' '[\\-^]'
-		
-ok 945 - iwildmatch: match ']' '[\\-^]'
+		compare_ws_file eol_native_crlf_true_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 715 - checkout attr=-text  aeol=crlf core.autocrlf=true core.eol=native file=LF_nul
 
 expecting success: 
-				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_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
 		test_cmp expect actual
-			
-ok 946 - iwildmatch (via ls-files): match '[\\-^]' ']'
+	
+ok 716 - ls-files --eol attr=text  aeol=lf core.autocrlf=true core.eol=native
 
 expecting success: 
-			test-tool wildmatch pathmatch ']' '[\\-^]'
-		
-ok 947 - pathmatch: match ']' '[\\-^]'
+		compare_ws_file eol_native_crlf_true_attr_text_ LF    crlf_false_attr__LF.txt
+	
+ok 717 - checkout attr=text  aeol=lf core.autocrlf=true core.eol=native file=LF
 
 expecting success: 
-				printf '%s' ']' >expect &&
-				git ls-files -z -- '[\\-^]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 948 - pathmatch (via ls-files): match '[\\-^]' ']'
+		compare_ws_file eol_native_crlf_true_attr_text_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 718 - checkout attr=text  aeol=lf core.autocrlf=true core.eol=native file=CRLF
 
 expecting success: 
-			test-tool wildmatch ipathmatch ']' '[\\-^]'
-		
-ok 949 - ipathmatch: match ']' '[\\-^]'
+		compare_ws_file eol_native_crlf_true_attr_text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 719 - checkout attr=text  aeol=lf core.autocrlf=true core.eol=native file=CRLF_mix_LF
 
 expecting success: 
-				printf '%s' ']' >expect &&
-				git --icase-pathspecs ls-files -z -- '[\\-^]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 950 - ipathmatch (via ls-files): match '[\\-^]' ']'
+		compare_ws_file eol_native_crlf_true_attr_text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 720 - checkout attr=text  aeol=lf core.autocrlf=true core.eol=native file=LF_mix_CR
 
 expecting success: 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
+		compare_ws_file eol_native_crlf_true_attr_text_ LF_nul   crlf_false_attr__LF_nul.txt
 	
-Removing ]
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 951 - cleanup after previous file test
+ok 721 - checkout attr=text  aeol=lf core.autocrlf=true core.eol=native file=LF_nul
 
 expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
+		test_cmp expect actual
 	
-ok 952 - setup match file test for [
+ok 722 - ls-files --eol attr=text  aeol=crlf core.autocrlf=true core.eol=native
 
 expecting success: 
-			test_must_fail test-tool wildmatch wildmatch '[' '[\\-^]'
-		
-ok 953 - wildmatch: no match '[' '[\\-^]'
+		compare_ws_file eol_native_crlf_true_attr_text_ CRLF    crlf_false_attr__LF.txt
+	
+ok 723 - checkout attr=text  aeol=crlf core.autocrlf=true core.eol=native file=LF
 
 expecting success: 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- '[\\-^]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 954 - wildmatch (via ls-files): no match '[\\-^]' '['
+		compare_ws_file eol_native_crlf_true_attr_text_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 724 - checkout attr=text  aeol=crlf core.autocrlf=true core.eol=native file=CRLF
 
 expecting success: 
-			test_must_fail test-tool wildmatch iwildmatch '[' '[\\-^]'
-		
-ok 955 - iwildmatch: no match '[' '[\\-^]'
+		compare_ws_file eol_native_crlf_true_attr_text_ CRLF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 725 - checkout attr=text  aeol=crlf core.autocrlf=true core.eol=native file=CRLF_mix_LF
 
 expecting success: 
-				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[\\-^]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 956 - iwildmatch (via ls-files): no match '[\\-^]' '['
+		compare_ws_file eol_native_crlf_true_attr_text_ CRLF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 726 - checkout attr=text  aeol=crlf core.autocrlf=true core.eol=native file=LF_mix_CR
 
 expecting success: 
-			test_must_fail test-tool wildmatch pathmatch '[' '[\\-^]'
-		
-ok 957 - pathmatch: no match '[' '[\\-^]'
+		compare_ws_file eol_native_crlf_true_attr_text_ CRLF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 727 - checkout attr=text  aeol=crlf core.autocrlf=true core.eol=native file=LF_nul
 
 expecting success: 
-				>expect &&
-				git ls-files -z -- '[\\-^]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
 		test_cmp expect actual
-			
-ok 958 - pathmatch (via ls-files): no match '[\\-^]' '['
+	
+ok 728 - ls-files --eol attr=auto  aeol=lf core.autocrlf=true core.eol=native
 
 expecting success: 
-			test_must_fail test-tool wildmatch ipathmatch '[' '[\\-^]'
-		
-ok 959 - ipathmatch: no match '[' '[\\-^]'
+		compare_ws_file eol_native_crlf_true_attr_auto_ LF    crlf_false_attr__LF.txt
+	
+ok 729 - checkout attr=auto  aeol=lf core.autocrlf=true core.eol=native file=LF
 
 expecting success: 
-				>expect &&
-				git --icase-pathspecs ls-files -z -- '[\\-^]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 960 - ipathmatch (via ls-files): no match '[\\-^]' '['
+		compare_ws_file eol_native_crlf_true_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 730 - checkout attr=auto  aeol=lf core.autocrlf=true core.eol=native file=CRLF
 
 expecting success: 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
+		compare_ws_file eol_native_crlf_true_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
 	
-Removing [
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 961 - cleanup after previous file test
+ok 731 - checkout attr=auto  aeol=lf core.autocrlf=true core.eol=native file=CRLF_mix_LF
 
 expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
+		compare_ws_file eol_native_crlf_true_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 962 - setup match file test for -
+ok 732 - checkout attr=auto  aeol=lf core.autocrlf=true core.eol=native file=LF_mix_CR
 
 expecting success: 
-			test-tool wildmatch wildmatch '-' '[\-_]'
-		
-ok 963 - wildmatch: match '-' '[\-_]'
+		compare_ws_file eol_native_crlf_true_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 733 - checkout attr=auto  aeol=lf core.autocrlf=true core.eol=native file=LF_nul
 
 expecting success: 
-				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_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
 		test_cmp expect actual
-			
-ok 964 - wildmatch (via ls-files): match '[\-_]' '-'
+	
+ok 734 - ls-files --eol attr=auto  aeol=crlf core.autocrlf=true core.eol=native
 
 expecting success: 
-			test-tool wildmatch iwildmatch '-' '[\-_]'
-		
-ok 965 - iwildmatch: match '-' '[\-_]'
+		compare_ws_file eol_native_crlf_true_attr_auto_ CRLF    crlf_false_attr__LF.txt
+	
+ok 735 - checkout attr=auto  aeol=crlf core.autocrlf=true core.eol=native file=LF
 
 expecting success: 
-				printf '%s' '-' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[\-_]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 966 - iwildmatch (via ls-files): match '[\-_]' '-'
+		compare_ws_file eol_native_crlf_true_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 736 - checkout attr=auto  aeol=crlf core.autocrlf=true core.eol=native file=CRLF
 
 expecting success: 
-			test-tool wildmatch pathmatch '-' '[\-_]'
-		
-ok 967 - pathmatch: match '-' '[\-_]'
+		compare_ws_file eol_native_crlf_true_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 737 - checkout attr=auto  aeol=crlf core.autocrlf=true core.eol=native file=CRLF_mix_LF
 
 expecting success: 
-				printf '%s' '-' >expect &&
-				git ls-files -z -- '[\-_]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 968 - pathmatch (via ls-files): match '[\-_]' '-'
+		compare_ws_file eol_native_crlf_true_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 738 - checkout attr=auto  aeol=crlf core.autocrlf=true core.eol=native file=LF_mix_CR
 
 expecting success: 
-			test-tool wildmatch ipathmatch '-' '[\-_]'
-		
-ok 969 - ipathmatch: match '-' '[\-_]'
+		compare_ws_file eol_native_crlf_true_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 739 - checkout attr=auto  aeol=crlf core.autocrlf=true core.eol=native file=LF_nul
 
 expecting success: 
-				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_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
 		test_cmp expect actual
-			
-ok 970 - ipathmatch (via ls-files): match '[\-_]' '-'
+	
+ok 740 - ls-files --eol attr=-text  aeol= core.autocrlf=false core.eol=native
 
 expecting success: 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
+		compare_ws_file eol_native_crlf_false_attr_-text_ LF    crlf_false_attr__LF.txt
 	
-Removing -
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 971 - cleanup after previous file test
+ok 741 - checkout attr=-text  aeol= core.autocrlf=false core.eol=native file=LF
 
 expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
+		compare_ws_file eol_native_crlf_false_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 972 - setup match file test for ]
+ok 742 - checkout attr=-text  aeol= core.autocrlf=false core.eol=native file=CRLF
 
 expecting success: 
-			test-tool wildmatch wildmatch ']' '[\]]'
-		
-ok 973 - wildmatch: match ']' '[\]]'
+		compare_ws_file eol_native_crlf_false_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 743 - checkout attr=-text  aeol= core.autocrlf=false core.eol=native file=CRLF_mix_LF
 
 expecting success: 
-				printf '%s' ']' >expect &&
-				git --glob-pathspecs ls-files -z -- '[\]]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 974 - wildmatch (via ls-files): match '[\]]' ']'
+		compare_ws_file eol_native_crlf_false_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 744 - checkout attr=-text  aeol= core.autocrlf=false core.eol=native file=LF_mix_CR
 
 expecting success: 
-			test-tool wildmatch iwildmatch ']' '[\]]'
-		
-ok 975 - iwildmatch: match ']' '[\]]'
+		compare_ws_file eol_native_crlf_false_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 745 - checkout attr=-text  aeol= core.autocrlf=false core.eol=native file=LF_nul
 
 expecting success: 
-				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_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
 		test_cmp expect actual
-			
-ok 976 - iwildmatch (via ls-files): match '[\]]' ']'
+	
+ok 746 - ls-files --eol attr=-text  aeol=lf core.autocrlf=false core.eol=native
 
 expecting success: 
-			test-tool wildmatch pathmatch ']' '[\]]'
-		
-ok 977 - pathmatch: match ']' '[\]]'
+		compare_ws_file eol_native_crlf_false_attr_-text_ LF    crlf_false_attr__LF.txt
+	
+ok 747 - checkout attr=-text  aeol=lf core.autocrlf=false core.eol=native file=LF
 
 expecting success: 
-				printf '%s' ']' >expect &&
-				git ls-files -z -- '[\]]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 978 - pathmatch (via ls-files): match '[\]]' ']'
+		compare_ws_file eol_native_crlf_false_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 748 - checkout attr=-text  aeol=lf core.autocrlf=false core.eol=native file=CRLF
 
 expecting success: 
-			test-tool wildmatch ipathmatch ']' '[\]]'
-		
-ok 979 - ipathmatch: match ']' '[\]]'
+		compare_ws_file eol_native_crlf_false_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 749 - checkout attr=-text  aeol=lf core.autocrlf=false core.eol=native file=CRLF_mix_LF
 
 expecting success: 
-				printf '%s' ']' >expect &&
-				git --icase-pathspecs ls-files -z -- '[\]]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 980 - ipathmatch (via ls-files): match '[\]]' ']'
+		compare_ws_file eol_native_crlf_false_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 750 - checkout attr=-text  aeol=lf core.autocrlf=false core.eol=native file=LF_mix_CR
 
 expecting success: 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
+		compare_ws_file eol_native_crlf_false_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
 	
-Removing ]
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 981 - cleanup after previous file test
+ok 751 - checkout attr=-text  aeol=lf core.autocrlf=false core.eol=native file=LF_nul
 
 expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
+		test_cmp expect actual
 	
-ok 982 - setup match file test for \]
+ok 752 - ls-files --eol attr=-text  aeol=crlf core.autocrlf=false core.eol=native
 
 expecting success: 
-			test_must_fail test-tool wildmatch wildmatch '\]' '[\]]'
-		
-ok 983 - wildmatch: no match '\]' '[\]]'
+		compare_ws_file eol_native_crlf_false_attr_-text_ LF    crlf_false_attr__LF.txt
+	
+ok 753 - checkout attr=-text  aeol=crlf core.autocrlf=false core.eol=native file=LF
 
 expecting success: 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- '[\]]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 984 - wildmatch (via ls-files): no match '[\]]' '\]'
+		compare_ws_file eol_native_crlf_false_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 754 - checkout attr=-text  aeol=crlf core.autocrlf=false core.eol=native file=CRLF
 
 expecting success: 
-			test_must_fail test-tool wildmatch iwildmatch '\]' '[\]]'
-		
-ok 985 - iwildmatch: no match '\]' '[\]]'
+		compare_ws_file eol_native_crlf_false_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 755 - checkout attr=-text  aeol=crlf core.autocrlf=false core.eol=native file=CRLF_mix_LF
 
 expecting success: 
-				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[\]]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 986 - iwildmatch (via ls-files): no match '[\]]' '\]'
+		compare_ws_file eol_native_crlf_false_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 756 - checkout attr=-text  aeol=crlf core.autocrlf=false core.eol=native file=LF_mix_CR
 
 expecting success: 
-			test_must_fail test-tool wildmatch pathmatch '\]' '[\]]'
-		
-ok 987 - pathmatch: no match '\]' '[\]]'
+		compare_ws_file eol_native_crlf_false_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 757 - checkout attr=-text  aeol=crlf core.autocrlf=false core.eol=native file=LF_nul
 
 expecting success: 
-				>expect &&
-				git ls-files -z -- '[\]]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
 		test_cmp expect actual
-			
-ok 988 - pathmatch (via ls-files): no match '[\]]' '\]'
+	
+ok 758 - ls-files --eol attr=text  aeol=lf core.autocrlf=false core.eol=native
 
 expecting success: 
-			test_must_fail test-tool wildmatch ipathmatch '\]' '[\]]'
-		
-ok 989 - ipathmatch: no match '\]' '[\]]'
+		compare_ws_file eol_native_crlf_false_attr_text_ LF    crlf_false_attr__LF.txt
+	
+ok 759 - checkout attr=text  aeol=lf core.autocrlf=false core.eol=native file=LF
 
 expecting success: 
-				>expect &&
-				git --icase-pathspecs ls-files -z -- '[\]]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 990 - ipathmatch (via ls-files): no match '[\]]' '\]'
+		compare_ws_file eol_native_crlf_false_attr_text_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 760 - checkout attr=text  aeol=lf core.autocrlf=false core.eol=native file=CRLF
 
 expecting success: 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
+		compare_ws_file eol_native_crlf_false_attr_text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
 	
-Removing "\\]"
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 991 - cleanup after previous file test
+ok 761 - checkout attr=text  aeol=lf core.autocrlf=false core.eol=native file=CRLF_mix_LF
 
 expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
+		compare_ws_file eol_native_crlf_false_attr_text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 992 - setup match file test for \
+ok 762 - checkout attr=text  aeol=lf core.autocrlf=false core.eol=native file=LF_mix_CR
 
 expecting success: 
-			test_must_fail test-tool wildmatch wildmatch '\' '[\]]'
-		
-ok 993 - wildmatch: no match '\' '[\]]'
+		compare_ws_file eol_native_crlf_false_attr_text_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 763 - checkout attr=text  aeol=lf core.autocrlf=false core.eol=native file=LF_nul
 
 expecting success: 
-				>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_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
 		test_cmp expect actual
-			
-ok 994 - wildmatch (via ls-files): no match '[\]]' '\'
+	
+ok 764 - ls-files --eol attr=text  aeol=crlf core.autocrlf=false core.eol=native
 
 expecting success: 
-			test_must_fail test-tool wildmatch iwildmatch '\' '[\]]'
-		
-ok 995 - iwildmatch: no match '\' '[\]]'
+		compare_ws_file eol_native_crlf_false_attr_text_ CRLF    crlf_false_attr__LF.txt
+	
+ok 765 - checkout attr=text  aeol=crlf core.autocrlf=false core.eol=native file=LF
 
 expecting success: 
-				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[\]]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 996 - iwildmatch (via ls-files): no match '[\]]' '\'
+		compare_ws_file eol_native_crlf_false_attr_text_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 766 - checkout attr=text  aeol=crlf core.autocrlf=false core.eol=native file=CRLF
 
 expecting success: 
-			test_must_fail test-tool wildmatch pathmatch '\' '[\]]'
-		
-ok 997 - pathmatch: no match '\' '[\]]'
+		compare_ws_file eol_native_crlf_false_attr_text_ CRLF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 767 - checkout attr=text  aeol=crlf core.autocrlf=false core.eol=native file=CRLF_mix_LF
 
 expecting success: 
-				>expect &&
-				git ls-files -z -- '[\]]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 998 - pathmatch (via ls-files): no match '[\]]' '\'
+		compare_ws_file eol_native_crlf_false_attr_text_ CRLF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 768 - checkout attr=text  aeol=crlf core.autocrlf=false core.eol=native file=LF_mix_CR
 
 expecting success: 
-			test_must_fail test-tool wildmatch ipathmatch '\' '[\]]'
-		
-ok 999 - ipathmatch: no match '\' '[\]]'
+		compare_ws_file eol_native_crlf_false_attr_text_ CRLF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 769 - checkout attr=text  aeol=crlf core.autocrlf=false core.eol=native file=LF_nul
 
 expecting success: 
-				>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_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
 		test_cmp expect actual
-			
-ok 1000 - ipathmatch (via ls-files): no match '[\]]' '\'
+	
+ok 770 - ls-files --eol attr=auto  aeol=lf core.autocrlf=false core.eol=native
 
 expecting success: 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
+		compare_ws_file eol_native_crlf_false_attr_auto_ LF    crlf_false_attr__LF.txt
 	
-Removing "\\"
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 1001 - cleanup after previous file test
+ok 771 - checkout attr=auto  aeol=lf core.autocrlf=false core.eol=native file=LF
 
 expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
+		compare_ws_file eol_native_crlf_false_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 1002 - setup match file test for ab
+ok 772 - checkout attr=auto  aeol=lf core.autocrlf=false core.eol=native file=CRLF
 
 expecting success: 
-			test_must_fail test-tool wildmatch wildmatch 'ab' 'a[]b'
-		
-ok 1003 - wildmatch: no match 'ab' 'a[]b'
+		compare_ws_file eol_native_crlf_false_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 773 - checkout attr=auto  aeol=lf core.autocrlf=false core.eol=native file=CRLF_mix_LF
 
 expecting success: 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- 'a[]b' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1004 - wildmatch (via ls-files): no match 'a[]b' 'ab'
+		compare_ws_file eol_native_crlf_false_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 774 - checkout attr=auto  aeol=lf core.autocrlf=false core.eol=native file=LF_mix_CR
 
 expecting success: 
-			test_must_fail test-tool wildmatch iwildmatch 'ab' 'a[]b'
-		
-ok 1005 - iwildmatch: no match 'ab' 'a[]b'
+		compare_ws_file eol_native_crlf_false_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 775 - checkout attr=auto  aeol=lf core.autocrlf=false core.eol=native file=LF_nul
 
 expecting success: 
-				>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_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
 		test_cmp expect actual
-			
-ok 1006 - iwildmatch (via ls-files): no match 'a[]b' 'ab'
+	
+ok 776 - ls-files --eol attr=auto  aeol=crlf core.autocrlf=false core.eol=native
 
 expecting success: 
-			test_must_fail test-tool wildmatch pathmatch 'ab' 'a[]b'
-		
-ok 1007 - pathmatch: no match 'ab' 'a[]b'
+		compare_ws_file eol_native_crlf_false_attr_auto_ CRLF    crlf_false_attr__LF.txt
+	
+ok 777 - checkout attr=auto  aeol=crlf core.autocrlf=false core.eol=native file=LF
 
 expecting success: 
-				>expect &&
-				git ls-files -z -- 'a[]b' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1008 - pathmatch (via ls-files): no match 'a[]b' 'ab'
+		compare_ws_file eol_native_crlf_false_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 778 - checkout attr=auto  aeol=crlf core.autocrlf=false core.eol=native file=CRLF
 
 expecting success: 
-			test_must_fail test-tool wildmatch ipathmatch 'ab' 'a[]b'
-		
-ok 1009 - ipathmatch: no match 'ab' 'a[]b'
+		compare_ws_file eol_native_crlf_false_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 779 - checkout attr=auto  aeol=crlf core.autocrlf=false core.eol=native file=CRLF_mix_LF
 
 expecting success: 
-				>expect &&
-				git --icase-pathspecs ls-files -z -- 'a[]b' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1010 - ipathmatch (via ls-files): no match 'a[]b' 'ab'
+		compare_ws_file eol_native_crlf_false_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 780 - checkout attr=auto  aeol=crlf core.autocrlf=false core.eol=native file=LF_mix_CR
 
 expecting success: 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
+		compare_ws_file eol_native_crlf_false_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
 	
-Removing ab
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 1011 - cleanup after previous file test
+ok 781 - checkout attr=auto  aeol=crlf core.autocrlf=false core.eol=native file=LF_nul
 
 expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
+		test_cmp expect actual
 	
-ok 1012 - setup match file test for a[]b
+ok 782 - ls-files --eol attr=-text  aeol= core.autocrlf=input core.eol=native
 
 expecting success: 
-			test_must_fail test-tool wildmatch wildmatch 'a[]b' 'a[]b'
-		
-ok 1013 - wildmatch: no match 'a[]b' 'a[]b'
+		compare_ws_file eol_native_crlf_input_attr_-text_ LF    crlf_false_attr__LF.txt
+	
+ok 783 - checkout attr=-text  aeol= core.autocrlf=input core.eol=native file=LF
 
 expecting success: 
-				printf '%s' 'a[]b' >expect &&
-				git --glob-pathspecs ls-files -z -- 'a[]b' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1014 - wildmatch (via ls-files): match 'a[]b' 'a[]b'
+		compare_ws_file eol_native_crlf_input_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 784 - checkout attr=-text  aeol= core.autocrlf=input core.eol=native file=CRLF
 
 expecting success: 
-			test_must_fail test-tool wildmatch iwildmatch 'a[]b' 'a[]b'
-		
-ok 1015 - iwildmatch: no match 'a[]b' 'a[]b'
+		compare_ws_file eol_native_crlf_input_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 785 - checkout attr=-text  aeol= core.autocrlf=input core.eol=native file=CRLF_mix_LF
 
 expecting success: 
-				printf '%s' 'a[]b' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'a[]b' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1016 - iwildmatch (via ls-files): match 'a[]b' 'a[]b'
+		compare_ws_file eol_native_crlf_input_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 786 - checkout attr=-text  aeol= core.autocrlf=input core.eol=native file=LF_mix_CR
 
 expecting success: 
-			test_must_fail test-tool wildmatch pathmatch 'a[]b' 'a[]b'
-		
-ok 1017 - pathmatch: no match 'a[]b' 'a[]b'
+		compare_ws_file eol_native_crlf_input_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 787 - checkout attr=-text  aeol= core.autocrlf=input core.eol=native file=LF_nul
 
 expecting success: 
-				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_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
 		test_cmp expect actual
-			
-ok 1018 - pathmatch (via ls-files): match 'a[]b' 'a[]b'
+	
+ok 788 - ls-files --eol attr=-text  aeol=lf core.autocrlf=input core.eol=native
 
 expecting success: 
-			test_must_fail test-tool wildmatch ipathmatch 'a[]b' 'a[]b'
-		
-ok 1019 - ipathmatch: no match 'a[]b' 'a[]b'
+		compare_ws_file eol_native_crlf_input_attr_-text_ LF    crlf_false_attr__LF.txt
+	
+ok 789 - checkout attr=-text  aeol=lf core.autocrlf=input core.eol=native file=LF
 
 expecting success: 
-				printf '%s' 'a[]b' >expect &&
-				git --icase-pathspecs ls-files -z -- 'a[]b' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1020 - ipathmatch (via ls-files): match 'a[]b' 'a[]b'
+		compare_ws_file eol_native_crlf_input_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 790 - checkout attr=-text  aeol=lf core.autocrlf=input core.eol=native file=CRLF
 
 expecting success: 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
+		compare_ws_file eol_native_crlf_input_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
 	
-Removing a[]b
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 1021 - cleanup after previous file test
+ok 791 - checkout attr=-text  aeol=lf core.autocrlf=input core.eol=native file=CRLF_mix_LF
 
 expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
+		compare_ws_file eol_native_crlf_input_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 1022 - setup match file test for ab[
+ok 792 - checkout attr=-text  aeol=lf core.autocrlf=input core.eol=native file=LF_mix_CR
 
 expecting success: 
-			test_must_fail test-tool wildmatch wildmatch 'ab[' 'ab['
-		
-ok 1023 - wildmatch: no match 'ab[' 'ab['
+		compare_ws_file eol_native_crlf_input_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 793 - checkout attr=-text  aeol=lf core.autocrlf=input core.eol=native file=LF_nul
 
 expecting success: 
-				printf '%s' 'ab[' >expect &&
-				git --glob-pathspecs ls-files -z -- 'ab[' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
 		test_cmp expect actual
-			
-ok 1024 - wildmatch (via ls-files): match 'ab[' 'ab['
+	
+ok 794 - ls-files --eol attr=-text  aeol=crlf core.autocrlf=input core.eol=native
 
 expecting success: 
-			test_must_fail test-tool wildmatch iwildmatch 'ab[' 'ab['
-		
-ok 1025 - iwildmatch: no match 'ab[' 'ab['
+		compare_ws_file eol_native_crlf_input_attr_-text_ LF    crlf_false_attr__LF.txt
+	
+ok 795 - checkout attr=-text  aeol=crlf core.autocrlf=input core.eol=native file=LF
 
 expecting success: 
-				printf '%s' 'ab[' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'ab[' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1026 - iwildmatch (via ls-files): match 'ab[' 'ab['
+		compare_ws_file eol_native_crlf_input_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 796 - checkout attr=-text  aeol=crlf core.autocrlf=input core.eol=native file=CRLF
 
 expecting success: 
-			test_must_fail test-tool wildmatch pathmatch 'ab[' 'ab['
-		
-ok 1027 - pathmatch: no match 'ab[' 'ab['
+		compare_ws_file eol_native_crlf_input_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 797 - checkout attr=-text  aeol=crlf core.autocrlf=input core.eol=native file=CRLF_mix_LF
 
 expecting success: 
-				printf '%s' 'ab[' >expect &&
-				git ls-files -z -- 'ab[' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1028 - pathmatch (via ls-files): match 'ab[' 'ab['
+		compare_ws_file eol_native_crlf_input_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 798 - checkout attr=-text  aeol=crlf core.autocrlf=input core.eol=native file=LF_mix_CR
 
 expecting success: 
-			test_must_fail test-tool wildmatch ipathmatch 'ab[' 'ab['
-		
-ok 1029 - ipathmatch: no match 'ab[' 'ab['
+		compare_ws_file eol_native_crlf_input_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 799 - checkout attr=-text  aeol=crlf core.autocrlf=input core.eol=native file=LF_nul
 
 expecting success: 
-				printf '%s' 'ab[' >expect &&
-				git --icase-pathspecs ls-files -z -- 'ab[' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
 		test_cmp expect actual
-			
-ok 1030 - ipathmatch (via ls-files): match 'ab[' 'ab['
+	
+ok 800 - ls-files --eol attr=text  aeol=lf core.autocrlf=input core.eol=native
 
 expecting success: 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
+		compare_ws_file eol_native_crlf_input_attr_text_ LF    crlf_false_attr__LF.txt
 	
-Removing ab[
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 1031 - cleanup after previous file test
+ok 801 - checkout attr=text  aeol=lf core.autocrlf=input core.eol=native file=LF
 
 expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
+		compare_ws_file eol_native_crlf_input_attr_text_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 1032 - setup match file test for ab
+ok 802 - checkout attr=text  aeol=lf core.autocrlf=input core.eol=native file=CRLF
 
 expecting success: 
-			test_must_fail test-tool wildmatch wildmatch 'ab' '[!'
-		
-ok 1033 - wildmatch: no match 'ab' '[!'
+		compare_ws_file eol_native_crlf_input_attr_text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 803 - checkout attr=text  aeol=lf core.autocrlf=input core.eol=native file=CRLF_mix_LF
 
 expecting success: 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- '[!' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1034 - wildmatch (via ls-files): no match '[!' 'ab'
+		compare_ws_file eol_native_crlf_input_attr_text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 804 - checkout attr=text  aeol=lf core.autocrlf=input core.eol=native file=LF_mix_CR
 
 expecting success: 
-			test_must_fail test-tool wildmatch iwildmatch 'ab' '[!'
-		
-ok 1035 - iwildmatch: no match 'ab' '[!'
+		compare_ws_file eol_native_crlf_input_attr_text_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 805 - checkout attr=text  aeol=lf core.autocrlf=input core.eol=native file=LF_nul
 
 expecting success: 
-				>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_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
 		test_cmp expect actual
-			
-ok 1036 - iwildmatch (via ls-files): no match '[!' 'ab'
+	
+ok 806 - ls-files --eol attr=text  aeol=crlf core.autocrlf=input core.eol=native
 
 expecting success: 
-			test_must_fail test-tool wildmatch pathmatch 'ab' '[!'
-		
-ok 1037 - pathmatch: no match 'ab' '[!'
+		compare_ws_file eol_native_crlf_input_attr_text_ CRLF    crlf_false_attr__LF.txt
+	
+ok 807 - checkout attr=text  aeol=crlf core.autocrlf=input core.eol=native file=LF
 
 expecting success: 
-				>expect &&
-				git ls-files -z -- '[!' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1038 - pathmatch (via ls-files): no match '[!' 'ab'
+		compare_ws_file eol_native_crlf_input_attr_text_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 808 - checkout attr=text  aeol=crlf core.autocrlf=input core.eol=native file=CRLF
 
 expecting success: 
-			test_must_fail test-tool wildmatch ipathmatch 'ab' '[!'
-		
-ok 1039 - ipathmatch: no match 'ab' '[!'
+		compare_ws_file eol_native_crlf_input_attr_text_ CRLF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 809 - checkout attr=text  aeol=crlf core.autocrlf=input core.eol=native file=CRLF_mix_LF
 
 expecting success: 
-				>expect &&
-				git --icase-pathspecs ls-files -z -- '[!' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1040 - ipathmatch (via ls-files): no match '[!' 'ab'
+		compare_ws_file eol_native_crlf_input_attr_text_ CRLF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 810 - checkout attr=text  aeol=crlf core.autocrlf=input core.eol=native file=LF_mix_CR
 
 expecting success: 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
+		compare_ws_file eol_native_crlf_input_attr_text_ CRLF_nul   crlf_false_attr__LF_nul.txt
 	
-Removing ab
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 1041 - cleanup after previous file test
+ok 811 - checkout attr=text  aeol=crlf core.autocrlf=input core.eol=native file=LF_nul
 
 expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
+		test_cmp expect actual
 	
-ok 1042 - setup match file test for ab
+ok 812 - ls-files --eol attr=auto  aeol=lf core.autocrlf=input core.eol=native
 
 expecting success: 
-			test_must_fail test-tool wildmatch wildmatch 'ab' '[-'
-		
-ok 1043 - wildmatch: no match 'ab' '[-'
+		compare_ws_file eol_native_crlf_input_attr_auto_ LF    crlf_false_attr__LF.txt
+	
+ok 813 - checkout attr=auto  aeol=lf core.autocrlf=input core.eol=native file=LF
 
 expecting success: 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- '[-' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1044 - wildmatch (via ls-files): no match '[-' 'ab'
+		compare_ws_file eol_native_crlf_input_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 814 - checkout attr=auto  aeol=lf core.autocrlf=input core.eol=native file=CRLF
 
 expecting success: 
-			test_must_fail test-tool wildmatch iwildmatch 'ab' '[-'
-		
-ok 1045 - iwildmatch: no match 'ab' '[-'
+		compare_ws_file eol_native_crlf_input_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 815 - checkout attr=auto  aeol=lf core.autocrlf=input core.eol=native file=CRLF_mix_LF
 
 expecting success: 
-				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[-' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1046 - iwildmatch (via ls-files): no match '[-' 'ab'
+		compare_ws_file eol_native_crlf_input_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 816 - checkout attr=auto  aeol=lf core.autocrlf=input core.eol=native file=LF_mix_CR
 
 expecting success: 
-			test_must_fail test-tool wildmatch pathmatch 'ab' '[-'
-		
-ok 1047 - pathmatch: no match 'ab' '[-'
+		compare_ws_file eol_native_crlf_input_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 817 - checkout attr=auto  aeol=lf core.autocrlf=input core.eol=native file=LF_nul
 
 expecting success: 
-				>expect &&
-				git ls-files -z -- '[-' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
 		test_cmp expect actual
-			
-ok 1048 - pathmatch (via ls-files): no match '[-' 'ab'
+	
+ok 818 - ls-files --eol attr=auto  aeol=crlf core.autocrlf=input core.eol=native
 
 expecting success: 
-			test_must_fail test-tool wildmatch ipathmatch 'ab' '[-'
-		
-ok 1049 - ipathmatch: no match 'ab' '[-'
+		compare_ws_file eol_native_crlf_input_attr_auto_ CRLF    crlf_false_attr__LF.txt
+	
+ok 819 - checkout attr=auto  aeol=crlf core.autocrlf=input core.eol=native file=LF
 
 expecting success: 
-				>expect &&
-				git --icase-pathspecs ls-files -z -- '[-' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1050 - ipathmatch (via ls-files): no match '[-' 'ab'
+		compare_ws_file eol_native_crlf_input_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 820 - checkout attr=auto  aeol=crlf core.autocrlf=input core.eol=native file=CRLF
 
 expecting success: 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
+		compare_ws_file eol_native_crlf_input_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
 	
-Removing ab
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 1051 - cleanup after previous file test
+ok 821 - checkout attr=auto  aeol=crlf core.autocrlf=input core.eol=native file=CRLF_mix_LF
 
 expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
+		compare_ws_file eol_native_crlf_input_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 1052 - setup match file test for -
+ok 822 - checkout attr=auto  aeol=crlf core.autocrlf=input core.eol=native file=LF_mix_CR
 
 expecting success: 
-			test-tool wildmatch wildmatch '-' '[-]'
-		
-ok 1053 - wildmatch: match '-' '[-]'
+		compare_ws_file eol_native_crlf_input_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 823 - checkout attr=auto  aeol=crlf core.autocrlf=input core.eol=native file=LF_nul
 
 expecting success: 
-				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_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
 		test_cmp expect actual
-			
-ok 1054 - wildmatch (via ls-files): match '[-]' '-'
+	
+ok 824 - ls-files --eol attr=  aeol= core.autocrlf=false core.eol=native
 
 expecting success: 
-			test-tool wildmatch iwildmatch '-' '[-]'
-		
-ok 1055 - iwildmatch: match '-' '[-]'
+		compare_ws_file eol_native_crlf_false_attr__ LF    crlf_false_attr__LF.txt
+	
+ok 825 - checkout attr=  aeol= core.autocrlf=false core.eol=native file=LF
 
 expecting success: 
-				printf '%s' '-' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[-]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1056 - iwildmatch (via ls-files): match '[-]' '-'
+		compare_ws_file eol_native_crlf_false_attr__ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 826 - checkout attr=  aeol= core.autocrlf=false core.eol=native file=CRLF
 
 expecting success: 
-			test-tool wildmatch pathmatch '-' '[-]'
-		
-ok 1057 - pathmatch: match '-' '[-]'
+		compare_ws_file eol_native_crlf_false_attr__ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 827 - checkout attr=  aeol= core.autocrlf=false core.eol=native file=CRLF_mix_LF
 
 expecting success: 
-				printf '%s' '-' >expect &&
-				git ls-files -z -- '[-]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1058 - pathmatch (via ls-files): match '[-]' '-'
+		compare_ws_file eol_native_crlf_false_attr__ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 828 - checkout attr=  aeol= core.autocrlf=false core.eol=native file=LF_mix_CR
 
 expecting success: 
-			test-tool wildmatch ipathmatch '-' '[-]'
-		
-ok 1059 - ipathmatch: match '-' '[-]'
+		compare_ws_file eol_native_crlf_false_attr__ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 829 - checkout attr=  aeol= core.autocrlf=false core.eol=native file=LF_nul
 
 expecting success: 
-				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_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
 		test_cmp expect actual
-			
-ok 1060 - ipathmatch (via ls-files): match '[-]' '-'
+	
+ok 830 - ls-files --eol attr=  aeol= core.autocrlf=true core.eol=native
 
 expecting success: 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
+		compare_ws_file eol_native_crlf_true_attr__ CRLF    crlf_false_attr__LF.txt
 	
-Removing -
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 1061 - cleanup after previous file test
+ok 831 - checkout attr=  aeol= core.autocrlf=true core.eol=native file=LF
 
 expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
+		compare_ws_file eol_native_crlf_true_attr__ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 1062 - setup match file test for -
+ok 832 - checkout attr=  aeol= core.autocrlf=true core.eol=native file=CRLF
 
 expecting success: 
-			test_must_fail test-tool wildmatch wildmatch '-' '[a-'
-		
-ok 1063 - wildmatch: no match '-' '[a-'
+		compare_ws_file eol_native_crlf_true_attr__ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 833 - checkout attr=  aeol= core.autocrlf=true core.eol=native file=CRLF_mix_LF
 
 expecting success: 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- '[a-' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1064 - wildmatch (via ls-files): no match '[a-' '-'
+		compare_ws_file eol_native_crlf_true_attr__ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 834 - checkout attr=  aeol= core.autocrlf=true core.eol=native file=LF_mix_CR
 
 expecting success: 
-			test_must_fail test-tool wildmatch iwildmatch '-' '[a-'
-		
-ok 1065 - iwildmatch: no match '-' '[a-'
+		compare_ws_file eol_native_crlf_true_attr__ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 835 - checkout attr=  aeol= core.autocrlf=true core.eol=native file=LF_nul
 
 expecting success: 
-				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[a-' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
 		test_cmp expect actual
-			
-ok 1066 - iwildmatch (via ls-files): no match '[a-' '-'
+	
+ok 836 - ls-files --eol attr=auto  aeol= core.autocrlf=true core.eol=native
 
 expecting success: 
-			test_must_fail test-tool wildmatch pathmatch '-' '[a-'
-		
-ok 1067 - pathmatch: no match '-' '[a-'
+		compare_ws_file eol_native_crlf_true_attr_auto_ CRLF    crlf_false_attr__LF.txt
+	
+ok 837 - checkout attr=auto  aeol= core.autocrlf=true core.eol=native file=LF
 
 expecting success: 
-				>expect &&
-				git ls-files -z -- '[a-' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1068 - pathmatch (via ls-files): no match '[a-' '-'
+		compare_ws_file eol_native_crlf_true_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 838 - checkout attr=auto  aeol= core.autocrlf=true core.eol=native file=CRLF
 
 expecting success: 
-			test_must_fail test-tool wildmatch ipathmatch '-' '[a-'
-		
-ok 1069 - ipathmatch: no match '-' '[a-'
+		compare_ws_file eol_native_crlf_true_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 839 - checkout attr=auto  aeol= core.autocrlf=true core.eol=native file=CRLF_mix_LF
 
 expecting success: 
-				>expect &&
-				git --icase-pathspecs ls-files -z -- '[a-' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1070 - ipathmatch (via ls-files): no match '[a-' '-'
+		compare_ws_file eol_native_crlf_true_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 840 - checkout attr=auto  aeol= core.autocrlf=true core.eol=native file=LF_mix_CR
 
 expecting success: 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
+		compare_ws_file eol_native_crlf_true_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
 	
-Removing -
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 1071 - cleanup after previous file test
+ok 841 - checkout attr=auto  aeol= core.autocrlf=true core.eol=native file=LF_nul
 
 expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
+		test_cmp expect actual
 	
-ok 1072 - setup match file test for -
+ok 842 - ls-files --eol attr=text  aeol= core.autocrlf=true core.eol=native
 
 expecting success: 
-			test_must_fail test-tool wildmatch wildmatch '-' '[!a-'
-		
-ok 1073 - wildmatch: no match '-' '[!a-'
+		compare_ws_file eol_native_crlf_true_attr_text_ CRLF    crlf_false_attr__LF.txt
+	
+ok 843 - checkout attr=text  aeol= core.autocrlf=true core.eol=native file=LF
 
 expecting success: 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- '[!a-' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1074 - wildmatch (via ls-files): no match '[!a-' '-'
+		compare_ws_file eol_native_crlf_true_attr_text_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 844 - checkout attr=text  aeol= core.autocrlf=true core.eol=native file=CRLF
 
 expecting success: 
-			test_must_fail test-tool wildmatch iwildmatch '-' '[!a-'
-		
-ok 1075 - iwildmatch: no match '-' '[!a-'
+		compare_ws_file eol_native_crlf_true_attr_text_ CRLF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 845 - checkout attr=text  aeol= core.autocrlf=true core.eol=native file=CRLF_mix_LF
 
 expecting success: 
-				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[!a-' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1076 - iwildmatch (via ls-files): no match '[!a-' '-'
+		compare_ws_file eol_native_crlf_true_attr_text_ CRLF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 846 - checkout attr=text  aeol= core.autocrlf=true core.eol=native file=LF_mix_CR
 
 expecting success: 
-			test_must_fail test-tool wildmatch pathmatch '-' '[!a-'
-		
-ok 1077 - pathmatch: no match '-' '[!a-'
+		compare_ws_file eol_native_crlf_true_attr_text_ CRLF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 847 - checkout attr=text  aeol= core.autocrlf=true core.eol=native file=LF_nul
 
 expecting success: 
-				>expect &&
-				git ls-files -z -- '[!a-' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
 		test_cmp expect actual
-			
-ok 1078 - pathmatch (via ls-files): no match '[!a-' '-'
+	
+ok 848 - ls-files --eol attr=text  aeol= core.autocrlf=input core.eol=native
 
 expecting success: 
-			test_must_fail test-tool wildmatch ipathmatch '-' '[!a-'
-		
-ok 1079 - ipathmatch: no match '-' '[!a-'
+		compare_ws_file eol_native_crlf_input_attr_text_ LF    crlf_false_attr__LF.txt
+	
+ok 849 - checkout attr=text  aeol= core.autocrlf=input core.eol=native file=LF
 
 expecting success: 
-				>expect &&
-				git --icase-pathspecs ls-files -z -- '[!a-' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1080 - ipathmatch (via ls-files): no match '[!a-' '-'
+		compare_ws_file eol_native_crlf_input_attr_text_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 850 - checkout attr=text  aeol= core.autocrlf=input core.eol=native file=CRLF
 
 expecting success: 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
+		compare_ws_file eol_native_crlf_input_attr_text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
 	
-Removing -
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 1081 - cleanup after previous file test
+ok 851 - checkout attr=text  aeol= core.autocrlf=input core.eol=native file=CRLF_mix_LF
 
 expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
+		compare_ws_file eol_native_crlf_input_attr_text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 1082 - setup match file test for -
+ok 852 - checkout attr=text  aeol= core.autocrlf=input core.eol=native file=LF_mix_CR
 
 expecting success: 
-			test-tool wildmatch wildmatch '-' '[--A]'
-		
-ok 1083 - wildmatch: match '-' '[--A]'
+		compare_ws_file eol_native_crlf_input_attr_text_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 853 - checkout attr=text  aeol= core.autocrlf=input core.eol=native file=LF_nul
 
 expecting success: 
-				printf '%s' '-' >expect &&
-				git --glob-pathspecs ls-files -z -- '[--A]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
 		test_cmp expect actual
-			
-ok 1084 - wildmatch (via ls-files): match '[--A]' '-'
+	
+ok 854 - ls-files --eol attr=auto  aeol= core.autocrlf=input core.eol=native
 
 expecting success: 
-			test-tool wildmatch iwildmatch '-' '[--A]'
-		
-ok 1085 - iwildmatch: match '-' '[--A]'
+		compare_ws_file eol_native_crlf_input_attr_auto_ LF    crlf_false_attr__LF.txt
+	
+ok 855 - checkout attr=auto  aeol= core.autocrlf=input core.eol=native file=LF
 
 expecting success: 
-				printf '%s' '-' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[--A]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1086 - iwildmatch (via ls-files): match '[--A]' '-'
+		compare_ws_file eol_native_crlf_input_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 856 - checkout attr=auto  aeol= core.autocrlf=input core.eol=native file=CRLF
 
 expecting success: 
-			test-tool wildmatch pathmatch '-' '[--A]'
-		
-ok 1087 - pathmatch: match '-' '[--A]'
+		compare_ws_file eol_native_crlf_input_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 857 - checkout attr=auto  aeol= core.autocrlf=input core.eol=native file=CRLF_mix_LF
 
 expecting success: 
-				printf '%s' '-' >expect &&
-				git ls-files -z -- '[--A]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1088 - pathmatch (via ls-files): match '[--A]' '-'
+		compare_ws_file eol_native_crlf_input_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 858 - checkout attr=auto  aeol= core.autocrlf=input core.eol=native file=LF_mix_CR
 
 expecting success: 
-			test-tool wildmatch ipathmatch '-' '[--A]'
-		
-ok 1089 - ipathmatch: match '-' '[--A]'
+		compare_ws_file eol_native_crlf_input_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 859 - checkout attr=auto  aeol= core.autocrlf=input core.eol=native file=LF_nul
 
 expecting success: 
-				printf '%s' '-' >expect &&
-				git --icase-pathspecs ls-files -z -- '[--A]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
 		test_cmp expect actual
-			
-ok 1090 - ipathmatch (via ls-files): match '[--A]' '-'
+	
+ok 860 - ls-files --eol attr=text  aeol= core.autocrlf=false core.eol=crlf
 
 expecting success: 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
+		compare_ws_file eol_crlf_crlf_false_attr_text_ CRLF    crlf_false_attr__LF.txt
 	
-Removing -
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 1091 - cleanup after previous file test
+ok 861 - checkout attr=text  aeol= core.autocrlf=false core.eol=crlf file=LF
 
 expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
+		compare_ws_file eol_crlf_crlf_false_attr_text_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 1092 - setup match file test for 5
+ok 862 - checkout attr=text  aeol= core.autocrlf=false core.eol=crlf file=CRLF
 
 expecting success: 
-			test-tool wildmatch wildmatch '5' '[--A]'
-		
-ok 1093 - wildmatch: match '5' '[--A]'
+		compare_ws_file eol_crlf_crlf_false_attr_text_ CRLF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 863 - checkout attr=text  aeol= core.autocrlf=false core.eol=crlf file=CRLF_mix_LF
 
 expecting success: 
-				printf '%s' '5' >expect &&
-				git --glob-pathspecs ls-files -z -- '[--A]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1094 - wildmatch (via ls-files): match '[--A]' '5'
+		compare_ws_file eol_crlf_crlf_false_attr_text_ CRLF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 864 - checkout attr=text  aeol= core.autocrlf=false core.eol=crlf file=LF_mix_CR
 
 expecting success: 
-			test-tool wildmatch iwildmatch '5' '[--A]'
-		
-ok 1095 - iwildmatch: match '5' '[--A]'
+		compare_ws_file eol_crlf_crlf_false_attr_text_ CRLF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 865 - checkout attr=text  aeol= core.autocrlf=false core.eol=crlf file=LF_nul
 
 expecting success: 
-				printf '%s' '5' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[--A]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
 		test_cmp expect actual
-			
-ok 1096 - iwildmatch (via ls-files): match '[--A]' '5'
+	
+ok 866 - ls-files --eol attr=text  aeol= core.autocrlf=false core.eol=lf
 
 expecting success: 
-			test-tool wildmatch pathmatch '5' '[--A]'
-		
-ok 1097 - pathmatch: match '5' '[--A]'
+		compare_ws_file eol_lf_crlf_false_attr_text_ LF    crlf_false_attr__LF.txt
+	
+ok 867 - checkout attr=text  aeol= core.autocrlf=false core.eol=lf file=LF
 
 expecting success: 
-				printf '%s' '5' >expect &&
-				git ls-files -z -- '[--A]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1098 - pathmatch (via ls-files): match '[--A]' '5'
+		compare_ws_file eol_lf_crlf_false_attr_text_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 868 - checkout attr=text  aeol= core.autocrlf=false core.eol=lf file=CRLF
 
 expecting success: 
-			test-tool wildmatch ipathmatch '5' '[--A]'
-		
-ok 1099 - ipathmatch: match '5' '[--A]'
+		compare_ws_file eol_lf_crlf_false_attr_text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 869 - checkout attr=text  aeol= core.autocrlf=false core.eol=lf file=CRLF_mix_LF
 
 expecting success: 
-				printf '%s' '5' >expect &&
-				git --icase-pathspecs ls-files -z -- '[--A]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1100 - ipathmatch (via ls-files): match '[--A]' '5'
+		compare_ws_file eol_lf_crlf_false_attr_text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 870 - checkout attr=text  aeol= core.autocrlf=false core.eol=lf file=LF_mix_CR
 
 expecting success: 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
+		compare_ws_file eol_lf_crlf_false_attr_text_ LF_nul   crlf_false_attr__LF_nul.txt
 	
-Removing 5
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 1101 - cleanup after previous file test
+ok 871 - checkout attr=text  aeol= core.autocrlf=false core.eol=lf file=LF_nul
 
 expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
+		test_cmp expect actual
 	
-ok 1102 - setup match file test for  
+ok 872 - ls-files --eol attr=text  aeol= core.autocrlf=false core.eol=
 
 expecting success: 
-			test-tool wildmatch wildmatch ' ' '[ --]'
-		
-ok 1103 - wildmatch: match ' ' '[ --]'
+		compare_ws_file eol__crlf_false_attr_text_ LF    crlf_false_attr__LF.txt
+	
+ok 873 - checkout attr=text  aeol= core.autocrlf=false core.eol= file=LF
 
 expecting success: 
-				printf '%s' ' ' >expect &&
-				git --glob-pathspecs ls-files -z -- '[ --]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1104 - wildmatch (via ls-files): match '[ --]' ' '
+		compare_ws_file eol__crlf_false_attr_text_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 874 - checkout attr=text  aeol= core.autocrlf=false core.eol= file=CRLF
 
 expecting success: 
-			test-tool wildmatch iwildmatch ' ' '[ --]'
-		
-ok 1105 - iwildmatch: match ' ' '[ --]'
+		compare_ws_file eol__crlf_false_attr_text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 875 - checkout attr=text  aeol= core.autocrlf=false core.eol= file=CRLF_mix_LF
 
 expecting success: 
-				printf '%s' ' ' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[ --]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1106 - iwildmatch (via ls-files): match '[ --]' ' '
+		compare_ws_file eol__crlf_false_attr_text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 876 - checkout attr=text  aeol= core.autocrlf=false core.eol= file=LF_mix_CR
 
 expecting success: 
-			test-tool wildmatch pathmatch ' ' '[ --]'
-		
-ok 1107 - pathmatch: match ' ' '[ --]'
+		compare_ws_file eol__crlf_false_attr_text_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 877 - checkout attr=text  aeol= core.autocrlf=false core.eol= file=LF_nul
 
 expecting success: 
-				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_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
 		test_cmp expect actual
-			
-ok 1108 - pathmatch (via ls-files): match '[ --]' ' '
+	
+ok 878 - ls-files --eol attr=text  aeol= core.autocrlf=false core.eol=native
 
 expecting success: 
-			test-tool wildmatch ipathmatch ' ' '[ --]'
-		
-ok 1109 - ipathmatch: match ' ' '[ --]'
+		compare_ws_file eol_native_crlf_false_attr_text_ LF    crlf_false_attr__LF.txt
+	
+ok 879 - checkout attr=text  aeol= core.autocrlf=false core.eol=native file=LF
 
 expecting success: 
-				printf '%s' ' ' >expect &&
-				git --icase-pathspecs ls-files -z -- '[ --]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1110 - ipathmatch (via ls-files): match '[ --]' ' '
+		compare_ws_file eol_native_crlf_false_attr_text_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 880 - checkout attr=text  aeol= core.autocrlf=false core.eol=native file=CRLF
 
 expecting success: 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
+		compare_ws_file eol_native_crlf_false_attr_text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
 	
-Removing  
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 1111 - cleanup after previous file test
+ok 881 - checkout attr=text  aeol= core.autocrlf=false core.eol=native file=CRLF_mix_LF
 
 expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
+		compare_ws_file eol_native_crlf_false_attr_text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 1112 - setup match file test for $
+ok 882 - checkout attr=text  aeol= core.autocrlf=false core.eol=native file=LF_mix_CR
 
 expecting success: 
-			test-tool wildmatch wildmatch '$' '[ --]'
-		
-ok 1113 - wildmatch: match '$' '[ --]'
+		compare_ws_file eol_native_crlf_false_attr_text_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 883 - checkout attr=text  aeol= core.autocrlf=false core.eol=native file=LF_nul
 
 expecting success: 
-				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_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
 		test_cmp expect actual
-			
-ok 1114 - wildmatch (via ls-files): match '[ --]' '$'
+	
+ok 884 - ls-files --eol attr=auto  aeol= core.autocrlf=false core.eol=
 
 expecting success: 
-			test-tool wildmatch iwildmatch '$' '[ --]'
-		
-ok 1115 - iwildmatch: match '$' '[ --]'
+		compare_ws_file eol__crlf_false_attr_auto_ LF    crlf_false_attr__LF.txt
+	
+ok 885 - checkout attr=auto  aeol= core.autocrlf=false core.eol= file=LF
 
 expecting success: 
-				printf '%s' '$' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[ --]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1116 - iwildmatch (via ls-files): match '[ --]' '$'
+		compare_ws_file eol__crlf_false_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 886 - checkout attr=auto  aeol= core.autocrlf=false core.eol= file=CRLF
 
 expecting success: 
-			test-tool wildmatch pathmatch '$' '[ --]'
-		
-ok 1117 - pathmatch: match '$' '[ --]'
+		compare_ws_file eol__crlf_false_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 887 - checkout attr=auto  aeol= core.autocrlf=false core.eol= file=CRLF_mix_LF
 
 expecting success: 
-				printf '%s' '$' >expect &&
-				git ls-files -z -- '[ --]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1118 - pathmatch (via ls-files): match '[ --]' '$'
+		compare_ws_file eol__crlf_false_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 888 - checkout attr=auto  aeol= core.autocrlf=false core.eol= file=LF_mix_CR
 
 expecting success: 
-			test-tool wildmatch ipathmatch '$' '[ --]'
-		
-ok 1119 - ipathmatch: match '$' '[ --]'
+		compare_ws_file eol__crlf_false_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 889 - checkout attr=auto  aeol= core.autocrlf=false core.eol= file=LF_nul
 
 expecting success: 
-				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_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
 		test_cmp expect actual
-			
-ok 1120 - ipathmatch (via ls-files): match '[ --]' '$'
+	
+ok 890 - ls-files --eol attr=auto  aeol= core.autocrlf=false core.eol=native
 
 expecting success: 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
+		compare_ws_file eol_native_crlf_false_attr_auto_ LF    crlf_false_attr__LF.txt
 	
-Removing $
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 1121 - cleanup after previous file test
+ok 891 - checkout attr=auto  aeol= core.autocrlf=false core.eol=native file=LF
 
 expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
+		compare_ws_file eol_native_crlf_false_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 1122 - setup match file test for -
+ok 892 - checkout attr=auto  aeol= core.autocrlf=false core.eol=native file=CRLF
 
 expecting success: 
-			test-tool wildmatch wildmatch '-' '[ --]'
-		
-ok 1123 - wildmatch: match '-' '[ --]'
+		compare_ws_file eol_native_crlf_false_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 893 - checkout attr=auto  aeol= core.autocrlf=false core.eol=native file=CRLF_mix_LF
 
 expecting success: 
-				printf '%s' '-' >expect &&
-				git --glob-pathspecs ls-files -z -- '[ --]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1124 - wildmatch (via ls-files): match '[ --]' '-'
+		compare_ws_file eol_native_crlf_false_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 894 - checkout attr=auto  aeol= core.autocrlf=false core.eol=native file=LF_mix_CR
 
 expecting success: 
-			test-tool wildmatch iwildmatch '-' '[ --]'
-		
-ok 1125 - iwildmatch: match '-' '[ --]'
+		compare_ws_file eol_native_crlf_false_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 895 - checkout attr=auto  aeol= core.autocrlf=false core.eol=native file=LF_nul
 
 expecting success: 
-				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_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
 		test_cmp expect actual
-			
-ok 1126 - iwildmatch (via ls-files): match '[ --]' '-'
+	
+ok 896 - ls-files --eol attr=-text ident aeol= core.autocrlf=true core.eol=lf
 
 expecting success: 
-			test-tool wildmatch pathmatch '-' '[ --]'
-		
-ok 1127 - pathmatch: match '-' '[ --]'
+		compare_ws_file eol_lf_crlf_true_attr_-text_ LF    crlf_false_attr__LF.txt
+	
+ok 897 - checkout attr=-text ident aeol= core.autocrlf=true core.eol=lf file=LF
 
 expecting success: 
-				printf '%s' '-' >expect &&
-				git ls-files -z -- '[ --]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1128 - pathmatch (via ls-files): match '[ --]' '-'
+		compare_ws_file eol_lf_crlf_true_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 898 - checkout attr=-text ident aeol= core.autocrlf=true core.eol=lf file=CRLF
 
 expecting success: 
-			test-tool wildmatch ipathmatch '-' '[ --]'
-		
-ok 1129 - ipathmatch: match '-' '[ --]'
+		compare_ws_file eol_lf_crlf_true_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 899 - checkout attr=-text ident aeol= core.autocrlf=true core.eol=lf file=CRLF_mix_LF
 
 expecting success: 
-				printf '%s' '-' >expect &&
-				git --icase-pathspecs ls-files -z -- '[ --]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1130 - ipathmatch (via ls-files): match '[ --]' '-'
+		compare_ws_file eol_lf_crlf_true_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 900 - checkout attr=-text ident aeol= core.autocrlf=true core.eol=lf file=LF_mix_CR
 
 expecting success: 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
+		compare_ws_file eol_lf_crlf_true_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
 	
-Removing -
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 1131 - cleanup after previous file test
+ok 901 - checkout attr=-text ident aeol= core.autocrlf=true core.eol=lf file=LF_nul
 
 expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
+		test_cmp expect actual
 	
-ok 1132 - setup match file test for 0
+ok 902 - ls-files --eol attr=-text ident aeol=lf core.autocrlf=true core.eol=lf
 
 expecting success: 
-			test_must_fail test-tool wildmatch wildmatch '0' '[ --]'
-		
-ok 1133 - wildmatch: no match '0' '[ --]'
+		compare_ws_file eol_lf_crlf_true_attr_-text_ LF    crlf_false_attr__LF.txt
+	
+ok 903 - checkout attr=-text ident aeol=lf core.autocrlf=true core.eol=lf file=LF
 
 expecting success: 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- '[ --]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1134 - wildmatch (via ls-files): no match '[ --]' '0'
+		compare_ws_file eol_lf_crlf_true_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 904 - checkout attr=-text ident aeol=lf core.autocrlf=true core.eol=lf file=CRLF
 
 expecting success: 
-			test_must_fail test-tool wildmatch iwildmatch '0' '[ --]'
-		
-ok 1135 - iwildmatch: no match '0' '[ --]'
+		compare_ws_file eol_lf_crlf_true_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 905 - checkout attr=-text ident aeol=lf core.autocrlf=true core.eol=lf file=CRLF_mix_LF
 
 expecting success: 
-				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[ --]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1136 - iwildmatch (via ls-files): no match '[ --]' '0'
+		compare_ws_file eol_lf_crlf_true_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 906 - checkout attr=-text ident aeol=lf core.autocrlf=true core.eol=lf file=LF_mix_CR
 
 expecting success: 
-			test_must_fail test-tool wildmatch pathmatch '0' '[ --]'
-		
-ok 1137 - pathmatch: no match '0' '[ --]'
+		compare_ws_file eol_lf_crlf_true_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 907 - checkout attr=-text ident aeol=lf core.autocrlf=true core.eol=lf file=LF_nul
 
 expecting success: 
-				>expect &&
-				git ls-files -z -- '[ --]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
 		test_cmp expect actual
-			
-ok 1138 - pathmatch (via ls-files): no match '[ --]' '0'
+	
+ok 908 - ls-files --eol attr=-text ident aeol=crlf core.autocrlf=true core.eol=lf
 
 expecting success: 
-			test_must_fail test-tool wildmatch ipathmatch '0' '[ --]'
-		
-ok 1139 - ipathmatch: no match '0' '[ --]'
+		compare_ws_file eol_lf_crlf_true_attr_-text_ LF    crlf_false_attr__LF.txt
+	
+ok 909 - checkout attr=-text ident aeol=crlf core.autocrlf=true core.eol=lf file=LF
 
 expecting success: 
-				>expect &&
-				git --icase-pathspecs ls-files -z -- '[ --]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1140 - ipathmatch (via ls-files): no match '[ --]' '0'
+		compare_ws_file eol_lf_crlf_true_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 910 - checkout attr=-text ident aeol=crlf core.autocrlf=true core.eol=lf file=CRLF
 
 expecting success: 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
+		compare_ws_file eol_lf_crlf_true_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
 	
-Removing 0
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 1141 - cleanup after previous file test
+ok 911 - checkout attr=-text ident aeol=crlf core.autocrlf=true core.eol=lf file=CRLF_mix_LF
 
 expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
+		compare_ws_file eol_lf_crlf_true_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 1142 - setup match file test for -
+ok 912 - checkout attr=-text ident aeol=crlf core.autocrlf=true core.eol=lf file=LF_mix_CR
 
 expecting success: 
-			test-tool wildmatch wildmatch '-' '[---]'
-		
-ok 1143 - wildmatch: match '-' '[---]'
+		compare_ws_file eol_lf_crlf_true_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 913 - checkout attr=-text ident aeol=crlf core.autocrlf=true core.eol=lf file=LF_nul
 
 expecting success: 
-				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_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
 		test_cmp expect actual
-			
-ok 1144 - wildmatch (via ls-files): match '[---]' '-'
+	
+ok 914 - ls-files --eol attr=text ident aeol=lf core.autocrlf=true core.eol=lf
 
 expecting success: 
-			test-tool wildmatch iwildmatch '-' '[---]'
-		
-ok 1145 - iwildmatch: match '-' '[---]'
+		compare_ws_file eol_lf_crlf_true_attr_text_ LF    crlf_false_attr__LF.txt
+	
+ok 915 - checkout attr=text ident aeol=lf core.autocrlf=true core.eol=lf file=LF
 
 expecting success: 
-				printf '%s' '-' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[---]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1146 - iwildmatch (via ls-files): match '[---]' '-'
+		compare_ws_file eol_lf_crlf_true_attr_text_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 916 - checkout attr=text ident aeol=lf core.autocrlf=true core.eol=lf file=CRLF
 
 expecting success: 
-			test-tool wildmatch pathmatch '-' '[---]'
-		
-ok 1147 - pathmatch: match '-' '[---]'
+		compare_ws_file eol_lf_crlf_true_attr_text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 917 - checkout attr=text ident aeol=lf core.autocrlf=true core.eol=lf file=CRLF_mix_LF
 
 expecting success: 
-				printf '%s' '-' >expect &&
-				git ls-files -z -- '[---]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1148 - pathmatch (via ls-files): match '[---]' '-'
+		compare_ws_file eol_lf_crlf_true_attr_text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 918 - checkout attr=text ident aeol=lf core.autocrlf=true core.eol=lf file=LF_mix_CR
 
 expecting success: 
-			test-tool wildmatch ipathmatch '-' '[---]'
-		
-ok 1149 - ipathmatch: match '-' '[---]'
+		compare_ws_file eol_lf_crlf_true_attr_text_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 919 - checkout attr=text ident aeol=lf core.autocrlf=true core.eol=lf file=LF_nul
 
 expecting success: 
-				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_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
 		test_cmp expect actual
-			
-ok 1150 - ipathmatch (via ls-files): match '[---]' '-'
+	
+ok 920 - ls-files --eol attr=text ident aeol=crlf core.autocrlf=true core.eol=lf
 
 expecting success: 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
+		compare_ws_file eol_lf_crlf_true_attr_text_ CRLF    crlf_false_attr__LF.txt
 	
-Removing -
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 1151 - cleanup after previous file test
+ok 921 - checkout attr=text ident aeol=crlf core.autocrlf=true core.eol=lf file=LF
 
 expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
+		compare_ws_file eol_lf_crlf_true_attr_text_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 1152 - setup match file test for -
+ok 922 - checkout attr=text ident aeol=crlf core.autocrlf=true core.eol=lf file=CRLF
 
 expecting success: 
-			test-tool wildmatch wildmatch '-' '[------]'
-		
-ok 1153 - wildmatch: match '-' '[------]'
+		compare_ws_file eol_lf_crlf_true_attr_text_ CRLF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 923 - checkout attr=text ident aeol=crlf core.autocrlf=true core.eol=lf file=CRLF_mix_LF
 
 expecting success: 
-				printf '%s' '-' >expect &&
-				git --glob-pathspecs ls-files -z -- '[------]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1154 - wildmatch (via ls-files): match '[------]' '-'
+		compare_ws_file eol_lf_crlf_true_attr_text_ CRLF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 924 - checkout attr=text ident aeol=crlf core.autocrlf=true core.eol=lf file=LF_mix_CR
 
 expecting success: 
-			test-tool wildmatch iwildmatch '-' '[------]'
-		
-ok 1155 - iwildmatch: match '-' '[------]'
+		compare_ws_file eol_lf_crlf_true_attr_text_ CRLF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 925 - checkout attr=text ident aeol=crlf core.autocrlf=true core.eol=lf file=LF_nul
 
 expecting success: 
-				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_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
 		test_cmp expect actual
-			
-ok 1156 - iwildmatch (via ls-files): match '[------]' '-'
+	
+ok 926 - ls-files --eol attr=auto ident aeol=lf core.autocrlf=true core.eol=lf
 
 expecting success: 
-			test-tool wildmatch pathmatch '-' '[------]'
-		
-ok 1157 - pathmatch: match '-' '[------]'
+		compare_ws_file eol_lf_crlf_true_attr_auto_ LF    crlf_false_attr__LF.txt
+	
+ok 927 - checkout attr=auto ident aeol=lf core.autocrlf=true core.eol=lf file=LF
 
 expecting success: 
-				printf '%s' '-' >expect &&
-				git ls-files -z -- '[------]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1158 - pathmatch (via ls-files): match '[------]' '-'
+		compare_ws_file eol_lf_crlf_true_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 928 - checkout attr=auto ident aeol=lf core.autocrlf=true core.eol=lf file=CRLF
 
 expecting success: 
-			test-tool wildmatch ipathmatch '-' '[------]'
-		
-ok 1159 - ipathmatch: match '-' '[------]'
+		compare_ws_file eol_lf_crlf_true_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 929 - checkout attr=auto ident aeol=lf core.autocrlf=true core.eol=lf file=CRLF_mix_LF
 
 expecting success: 
-				printf '%s' '-' >expect &&
-				git --icase-pathspecs ls-files -z -- '[------]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1160 - ipathmatch (via ls-files): match '[------]' '-'
+		compare_ws_file eol_lf_crlf_true_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 930 - checkout attr=auto ident aeol=lf core.autocrlf=true core.eol=lf file=LF_mix_CR
 
 expecting success: 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
+		compare_ws_file eol_lf_crlf_true_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
 	
-Removing -
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 1161 - cleanup after previous file test
+ok 931 - checkout attr=auto ident aeol=lf core.autocrlf=true core.eol=lf file=LF_nul
 
 expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
+		test_cmp expect actual
 	
-ok 1162 - setup match file test for j
+ok 932 - ls-files --eol attr=auto ident aeol=crlf core.autocrlf=true core.eol=lf
 
 expecting success: 
-			test_must_fail test-tool wildmatch wildmatch 'j' '[a-e-n]'
-		
-ok 1163 - wildmatch: no match 'j' '[a-e-n]'
+		compare_ws_file eol_lf_crlf_true_attr_auto_ CRLF    crlf_false_attr__LF.txt
+	
+ok 933 - checkout attr=auto ident aeol=crlf core.autocrlf=true core.eol=lf file=LF
 
 expecting success: 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- '[a-e-n]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1164 - wildmatch (via ls-files): no match '[a-e-n]' 'j'
+		compare_ws_file eol_lf_crlf_true_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 934 - checkout attr=auto ident aeol=crlf core.autocrlf=true core.eol=lf file=CRLF
 
 expecting success: 
-			test_must_fail test-tool wildmatch iwildmatch 'j' '[a-e-n]'
-		
-ok 1165 - iwildmatch: no match 'j' '[a-e-n]'
+		compare_ws_file eol_lf_crlf_true_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 935 - checkout attr=auto ident aeol=crlf core.autocrlf=true core.eol=lf file=CRLF_mix_LF
 
 expecting success: 
-				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[a-e-n]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1166 - iwildmatch (via ls-files): no match '[a-e-n]' 'j'
+		compare_ws_file eol_lf_crlf_true_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 936 - checkout attr=auto ident aeol=crlf core.autocrlf=true core.eol=lf file=LF_mix_CR
 
 expecting success: 
-			test_must_fail test-tool wildmatch pathmatch 'j' '[a-e-n]'
-		
-ok 1167 - pathmatch: no match 'j' '[a-e-n]'
+		compare_ws_file eol_lf_crlf_true_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 937 - checkout attr=auto ident aeol=crlf core.autocrlf=true core.eol=lf file=LF_nul
 
 expecting success: 
-				>expect &&
-				git ls-files -z -- '[a-e-n]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
 		test_cmp expect actual
-			
-ok 1168 - pathmatch (via ls-files): no match '[a-e-n]' 'j'
+	
+ok 938 - ls-files --eol attr=-text ident aeol= core.autocrlf=false core.eol=lf
 
 expecting success: 
-			test_must_fail test-tool wildmatch ipathmatch 'j' '[a-e-n]'
-		
-ok 1169 - ipathmatch: no match 'j' '[a-e-n]'
+		compare_ws_file eol_lf_crlf_false_attr_-text_ LF    crlf_false_attr__LF.txt
+	
+ok 939 - checkout attr=-text ident aeol= core.autocrlf=false core.eol=lf file=LF
 
 expecting success: 
-				>expect &&
-				git --icase-pathspecs ls-files -z -- '[a-e-n]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1170 - ipathmatch (via ls-files): no match '[a-e-n]' 'j'
+		compare_ws_file eol_lf_crlf_false_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 940 - checkout attr=-text ident aeol= core.autocrlf=false core.eol=lf file=CRLF
 
 expecting success: 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
+		compare_ws_file eol_lf_crlf_false_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
 	
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-Removing j
-ok 1171 - cleanup after previous file test
+ok 941 - checkout attr=-text ident aeol= core.autocrlf=false core.eol=lf file=CRLF_mix_LF
 
 expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
+		compare_ws_file eol_lf_crlf_false_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 1172 - setup match file test for -
+ok 942 - checkout attr=-text ident aeol= core.autocrlf=false core.eol=lf file=LF_mix_CR
 
 expecting success: 
-			test-tool wildmatch wildmatch '-' '[a-e-n]'
-		
-ok 1173 - wildmatch: match '-' '[a-e-n]'
+		compare_ws_file eol_lf_crlf_false_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 943 - checkout attr=-text ident aeol= core.autocrlf=false core.eol=lf file=LF_nul
 
 expecting success: 
-				printf '%s' '-' >expect &&
-				git --glob-pathspecs ls-files -z -- '[a-e-n]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
 		test_cmp expect actual
-			
-ok 1174 - wildmatch (via ls-files): match '[a-e-n]' '-'
+	
+ok 944 - ls-files --eol attr=-text ident aeol=lf core.autocrlf=false core.eol=lf
 
 expecting success: 
-			test-tool wildmatch iwildmatch '-' '[a-e-n]'
-		
-ok 1175 - iwildmatch: match '-' '[a-e-n]'
+		compare_ws_file eol_lf_crlf_false_attr_-text_ LF    crlf_false_attr__LF.txt
+	
+ok 945 - checkout attr=-text ident aeol=lf core.autocrlf=false core.eol=lf file=LF
 
 expecting success: 
-				printf '%s' '-' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[a-e-n]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1176 - iwildmatch (via ls-files): match '[a-e-n]' '-'
+		compare_ws_file eol_lf_crlf_false_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 946 - checkout attr=-text ident aeol=lf core.autocrlf=false core.eol=lf file=CRLF
 
 expecting success: 
-			test-tool wildmatch pathmatch '-' '[a-e-n]'
-		
-ok 1177 - pathmatch: match '-' '[a-e-n]'
+		compare_ws_file eol_lf_crlf_false_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 947 - checkout attr=-text ident aeol=lf core.autocrlf=false core.eol=lf file=CRLF_mix_LF
 
 expecting success: 
-				printf '%s' '-' >expect &&
-				git ls-files -z -- '[a-e-n]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1178 - pathmatch (via ls-files): match '[a-e-n]' '-'
+		compare_ws_file eol_lf_crlf_false_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 948 - checkout attr=-text ident aeol=lf core.autocrlf=false core.eol=lf file=LF_mix_CR
 
 expecting success: 
-			test-tool wildmatch ipathmatch '-' '[a-e-n]'
-		
-ok 1179 - ipathmatch: match '-' '[a-e-n]'
+		compare_ws_file eol_lf_crlf_false_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 949 - checkout attr=-text ident aeol=lf core.autocrlf=false core.eol=lf file=LF_nul
 
 expecting success: 
-				printf '%s' '-' >expect &&
-				git --icase-pathspecs ls-files -z -- '[a-e-n]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
 		test_cmp expect actual
-			
-ok 1180 - ipathmatch (via ls-files): match '[a-e-n]' '-'
+	
+ok 950 - ls-files --eol attr=-text ident aeol=crlf core.autocrlf=false core.eol=lf
 
 expecting success: 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
+		compare_ws_file eol_lf_crlf_false_attr_-text_ LF    crlf_false_attr__LF.txt
 	
-Removing -
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 1181 - cleanup after previous file test
+ok 951 - checkout attr=-text ident aeol=crlf core.autocrlf=false core.eol=lf file=LF
 
 expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
+		compare_ws_file eol_lf_crlf_false_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 1182 - setup match file test for a
+ok 952 - checkout attr=-text ident aeol=crlf core.autocrlf=false core.eol=lf file=CRLF
 
 expecting success: 
-			test-tool wildmatch wildmatch 'a' '[!------]'
-		
-ok 1183 - wildmatch: match 'a' '[!------]'
+		compare_ws_file eol_lf_crlf_false_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 953 - checkout attr=-text ident aeol=crlf core.autocrlf=false core.eol=lf file=CRLF_mix_LF
 
 expecting success: 
-				printf '%s' 'a' >expect &&
-				git --glob-pathspecs ls-files -z -- '[!------]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1184 - wildmatch (via ls-files): match '[!------]' 'a'
+		compare_ws_file eol_lf_crlf_false_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 954 - checkout attr=-text ident aeol=crlf core.autocrlf=false core.eol=lf file=LF_mix_CR
 
 expecting success: 
-			test-tool wildmatch iwildmatch 'a' '[!------]'
-		
-ok 1185 - iwildmatch: match 'a' '[!------]'
+		compare_ws_file eol_lf_crlf_false_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 955 - checkout attr=-text ident aeol=crlf core.autocrlf=false core.eol=lf file=LF_nul
 
 expecting success: 
-				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_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
 		test_cmp expect actual
-			
-ok 1186 - iwildmatch (via ls-files): match '[!------]' 'a'
+	
+ok 956 - ls-files --eol attr=text ident aeol=lf core.autocrlf=false core.eol=lf
 
 expecting success: 
-			test-tool wildmatch pathmatch 'a' '[!------]'
-		
-ok 1187 - pathmatch: match 'a' '[!------]'
+		compare_ws_file eol_lf_crlf_false_attr_text_ LF    crlf_false_attr__LF.txt
+	
+ok 957 - checkout attr=text ident aeol=lf core.autocrlf=false core.eol=lf file=LF
 
 expecting success: 
-				printf '%s' 'a' >expect &&
-				git ls-files -z -- '[!------]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1188 - pathmatch (via ls-files): match '[!------]' 'a'
+		compare_ws_file eol_lf_crlf_false_attr_text_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 958 - checkout attr=text ident aeol=lf core.autocrlf=false core.eol=lf file=CRLF
 
 expecting success: 
-			test-tool wildmatch ipathmatch 'a' '[!------]'
-		
-ok 1189 - ipathmatch: match 'a' '[!------]'
+		compare_ws_file eol_lf_crlf_false_attr_text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 959 - checkout attr=text ident aeol=lf core.autocrlf=false core.eol=lf file=CRLF_mix_LF
 
 expecting success: 
-				printf '%s' 'a' >expect &&
-				git --icase-pathspecs ls-files -z -- '[!------]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1190 - ipathmatch (via ls-files): match '[!------]' 'a'
+		compare_ws_file eol_lf_crlf_false_attr_text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 960 - checkout attr=text ident aeol=lf core.autocrlf=false core.eol=lf file=LF_mix_CR
 
 expecting success: 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
+		compare_ws_file eol_lf_crlf_false_attr_text_ LF_nul   crlf_false_attr__LF_nul.txt
 	
-Removing a
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 1191 - cleanup after previous file test
+ok 961 - checkout attr=text ident aeol=lf core.autocrlf=false core.eol=lf file=LF_nul
 
 expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
+		test_cmp expect actual
 	
-ok 1192 - setup match file test for [
+ok 962 - ls-files --eol attr=text ident aeol=crlf core.autocrlf=false core.eol=lf
 
 expecting success: 
-			test_must_fail test-tool wildmatch wildmatch '[' '[]-a]'
-		
-ok 1193 - wildmatch: no match '[' '[]-a]'
+		compare_ws_file eol_lf_crlf_false_attr_text_ CRLF    crlf_false_attr__LF.txt
+	
+ok 963 - checkout attr=text ident aeol=crlf core.autocrlf=false core.eol=lf file=LF
 
 expecting success: 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- '[]-a]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1194 - wildmatch (via ls-files): no match '[]-a]' '['
+		compare_ws_file eol_lf_crlf_false_attr_text_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 964 - checkout attr=text ident aeol=crlf core.autocrlf=false core.eol=lf file=CRLF
 
 expecting success: 
-			test_must_fail test-tool wildmatch iwildmatch '[' '[]-a]'
-		
-ok 1195 - iwildmatch: no match '[' '[]-a]'
+		compare_ws_file eol_lf_crlf_false_attr_text_ CRLF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 965 - checkout attr=text ident aeol=crlf core.autocrlf=false core.eol=lf file=CRLF_mix_LF
 
 expecting success: 
-				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[]-a]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1196 - iwildmatch (via ls-files): no match '[]-a]' '['
+		compare_ws_file eol_lf_crlf_false_attr_text_ CRLF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 966 - checkout attr=text ident aeol=crlf core.autocrlf=false core.eol=lf file=LF_mix_CR
 
 expecting success: 
-			test_must_fail test-tool wildmatch pathmatch '[' '[]-a]'
-		
-ok 1197 - pathmatch: no match '[' '[]-a]'
+		compare_ws_file eol_lf_crlf_false_attr_text_ CRLF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 967 - checkout attr=text ident aeol=crlf core.autocrlf=false core.eol=lf file=LF_nul
 
 expecting success: 
-				>expect &&
-				git ls-files -z -- '[]-a]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
 		test_cmp expect actual
-			
-ok 1198 - pathmatch (via ls-files): no match '[]-a]' '['
+	
+ok 968 - ls-files --eol attr=auto ident aeol=lf core.autocrlf=false core.eol=lf
 
 expecting success: 
-			test_must_fail test-tool wildmatch ipathmatch '[' '[]-a]'
-		
-ok 1199 - ipathmatch: no match '[' '[]-a]'
+		compare_ws_file eol_lf_crlf_false_attr_auto_ LF    crlf_false_attr__LF.txt
+	
+ok 969 - checkout attr=auto ident aeol=lf core.autocrlf=false core.eol=lf file=LF
 
 expecting success: 
-				>expect &&
-				git --icase-pathspecs ls-files -z -- '[]-a]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1200 - ipathmatch (via ls-files): no match '[]-a]' '['
+		compare_ws_file eol_lf_crlf_false_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 970 - checkout attr=auto ident aeol=lf core.autocrlf=false core.eol=lf file=CRLF
 
 expecting success: 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
+		compare_ws_file eol_lf_crlf_false_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
 	
-Removing [
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 1201 - cleanup after previous file test
+ok 971 - checkout attr=auto ident aeol=lf core.autocrlf=false core.eol=lf file=CRLF_mix_LF
 
 expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
+		compare_ws_file eol_lf_crlf_false_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 1202 - setup match file test for ^
+ok 972 - checkout attr=auto ident aeol=lf core.autocrlf=false core.eol=lf file=LF_mix_CR
 
 expecting success: 
-			test-tool wildmatch wildmatch '^' '[]-a]'
-		
-ok 1203 - wildmatch: match '^' '[]-a]'
+		compare_ws_file eol_lf_crlf_false_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 973 - checkout attr=auto ident aeol=lf core.autocrlf=false core.eol=lf file=LF_nul
 
 expecting success: 
-				printf '%s' '^' >expect &&
-				git --glob-pathspecs ls-files -z -- '[]-a]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
 		test_cmp expect actual
-			
-ok 1204 - wildmatch (via ls-files): match '[]-a]' '^'
+	
+ok 974 - ls-files --eol attr=auto ident aeol=crlf core.autocrlf=false core.eol=lf
 
 expecting success: 
-			test-tool wildmatch iwildmatch '^' '[]-a]'
-		
-ok 1205 - iwildmatch: match '^' '[]-a]'
+		compare_ws_file eol_lf_crlf_false_attr_auto_ CRLF    crlf_false_attr__LF.txt
+	
+ok 975 - checkout attr=auto ident aeol=crlf core.autocrlf=false core.eol=lf file=LF
 
 expecting success: 
-				printf '%s' '^' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[]-a]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1206 - iwildmatch (via ls-files): match '[]-a]' '^'
+		compare_ws_file eol_lf_crlf_false_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 976 - checkout attr=auto ident aeol=crlf core.autocrlf=false core.eol=lf file=CRLF
 
 expecting success: 
-			test-tool wildmatch pathmatch '^' '[]-a]'
-		
-ok 1207 - pathmatch: match '^' '[]-a]'
+		compare_ws_file eol_lf_crlf_false_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 977 - checkout attr=auto ident aeol=crlf core.autocrlf=false core.eol=lf file=CRLF_mix_LF
 
 expecting success: 
-				printf '%s' '^' >expect &&
-				git ls-files -z -- '[]-a]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1208 - pathmatch (via ls-files): match '[]-a]' '^'
+		compare_ws_file eol_lf_crlf_false_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 978 - checkout attr=auto ident aeol=crlf core.autocrlf=false core.eol=lf file=LF_mix_CR
 
 expecting success: 
-			test-tool wildmatch ipathmatch '^' '[]-a]'
-		
-ok 1209 - ipathmatch: match '^' '[]-a]'
+		compare_ws_file eol_lf_crlf_false_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 979 - checkout attr=auto ident aeol=crlf core.autocrlf=false core.eol=lf file=LF_nul
 
 expecting success: 
-				printf '%s' '^' >expect &&
-				git --icase-pathspecs ls-files -z -- '[]-a]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
 		test_cmp expect actual
-			
-ok 1210 - ipathmatch (via ls-files): match '[]-a]' '^'
+	
+ok 980 - ls-files --eol attr=-text ident aeol= core.autocrlf=input core.eol=lf
 
 expecting success: 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
+		compare_ws_file eol_lf_crlf_input_attr_-text_ LF    crlf_false_attr__LF.txt
 	
-Removing ^
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 1211 - cleanup after previous file test
+ok 981 - checkout attr=-text ident aeol= core.autocrlf=input core.eol=lf file=LF
 
 expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
+		compare_ws_file eol_lf_crlf_input_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 1212 - setup match file test for ^
+ok 982 - checkout attr=-text ident aeol= core.autocrlf=input core.eol=lf file=CRLF
 
 expecting success: 
-			test_must_fail test-tool wildmatch wildmatch '^' '[!]-a]'
-		
-ok 1213 - wildmatch: no match '^' '[!]-a]'
+		compare_ws_file eol_lf_crlf_input_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 983 - checkout attr=-text ident aeol= core.autocrlf=input core.eol=lf file=CRLF_mix_LF
 
 expecting success: 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- '[!]-a]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1214 - wildmatch (via ls-files): no match '[!]-a]' '^'
+		compare_ws_file eol_lf_crlf_input_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 984 - checkout attr=-text ident aeol= core.autocrlf=input core.eol=lf file=LF_mix_CR
 
 expecting success: 
-			test_must_fail test-tool wildmatch iwildmatch '^' '[!]-a]'
-		
-ok 1215 - iwildmatch: no match '^' '[!]-a]'
+		compare_ws_file eol_lf_crlf_input_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 985 - checkout attr=-text ident aeol= core.autocrlf=input core.eol=lf file=LF_nul
 
 expecting success: 
-				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[!]-a]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
 		test_cmp expect actual
-			
-ok 1216 - iwildmatch (via ls-files): no match '[!]-a]' '^'
+	
+ok 986 - ls-files --eol attr=-text ident aeol=lf core.autocrlf=input core.eol=lf
 
 expecting success: 
-			test_must_fail test-tool wildmatch pathmatch '^' '[!]-a]'
-		
-ok 1217 - pathmatch: no match '^' '[!]-a]'
+		compare_ws_file eol_lf_crlf_input_attr_-text_ LF    crlf_false_attr__LF.txt
+	
+ok 987 - checkout attr=-text ident aeol=lf core.autocrlf=input core.eol=lf file=LF
 
 expecting success: 
-				>expect &&
-				git ls-files -z -- '[!]-a]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1218 - pathmatch (via ls-files): no match '[!]-a]' '^'
+		compare_ws_file eol_lf_crlf_input_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 988 - checkout attr=-text ident aeol=lf core.autocrlf=input core.eol=lf file=CRLF
 
 expecting success: 
-			test_must_fail test-tool wildmatch ipathmatch '^' '[!]-a]'
-		
-ok 1219 - ipathmatch: no match '^' '[!]-a]'
+		compare_ws_file eol_lf_crlf_input_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 989 - checkout attr=-text ident aeol=lf core.autocrlf=input core.eol=lf file=CRLF_mix_LF
 
 expecting success: 
-				>expect &&
-				git --icase-pathspecs ls-files -z -- '[!]-a]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1220 - ipathmatch (via ls-files): no match '[!]-a]' '^'
+		compare_ws_file eol_lf_crlf_input_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 990 - checkout attr=-text ident aeol=lf core.autocrlf=input core.eol=lf file=LF_mix_CR
 
 expecting success: 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
+		compare_ws_file eol_lf_crlf_input_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
 	
-Removing ^
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 1221 - cleanup after previous file test
+ok 991 - checkout attr=-text ident aeol=lf core.autocrlf=input core.eol=lf file=LF_nul
 
 expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
+		test_cmp expect actual
 	
-ok 1222 - setup match file test for [
+ok 992 - ls-files --eol attr=-text ident aeol=crlf core.autocrlf=input core.eol=lf
 
 expecting success: 
-			test-tool wildmatch wildmatch '[' '[!]-a]'
-		
-ok 1223 - wildmatch: match '[' '[!]-a]'
+		compare_ws_file eol_lf_crlf_input_attr_-text_ LF    crlf_false_attr__LF.txt
+	
+ok 993 - checkout attr=-text ident aeol=crlf core.autocrlf=input core.eol=lf file=LF
 
 expecting success: 
-				printf '%s' '[' >expect &&
-				git --glob-pathspecs ls-files -z -- '[!]-a]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1224 - wildmatch (via ls-files): match '[!]-a]' '['
+		compare_ws_file eol_lf_crlf_input_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 994 - checkout attr=-text ident aeol=crlf core.autocrlf=input core.eol=lf file=CRLF
 
 expecting success: 
-			test-tool wildmatch iwildmatch '[' '[!]-a]'
-		
-ok 1225 - iwildmatch: match '[' '[!]-a]'
+		compare_ws_file eol_lf_crlf_input_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 995 - checkout attr=-text ident aeol=crlf core.autocrlf=input core.eol=lf file=CRLF_mix_LF
 
 expecting success: 
-				printf '%s' '[' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[!]-a]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1226 - iwildmatch (via ls-files): match '[!]-a]' '['
+		compare_ws_file eol_lf_crlf_input_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 996 - checkout attr=-text ident aeol=crlf core.autocrlf=input core.eol=lf file=LF_mix_CR
 
 expecting success: 
-			test-tool wildmatch pathmatch '[' '[!]-a]'
-		
-ok 1227 - pathmatch: match '[' '[!]-a]'
+		compare_ws_file eol_lf_crlf_input_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 997 - checkout attr=-text ident aeol=crlf core.autocrlf=input core.eol=lf file=LF_nul
 
 expecting success: 
-				printf '%s' '[' >expect &&
-				git ls-files -z -- '[!]-a]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
 		test_cmp expect actual
-			
-ok 1228 - pathmatch (via ls-files): match '[!]-a]' '['
+	
+ok 998 - ls-files --eol attr=text ident aeol=lf core.autocrlf=input core.eol=lf
 
 expecting success: 
-			test-tool wildmatch ipathmatch '[' '[!]-a]'
-		
-ok 1229 - ipathmatch: match '[' '[!]-a]'
+		compare_ws_file eol_lf_crlf_input_attr_text_ LF    crlf_false_attr__LF.txt
+	
+ok 999 - checkout attr=text ident aeol=lf core.autocrlf=input core.eol=lf file=LF
 
 expecting success: 
-				printf '%s' '[' >expect &&
-				git --icase-pathspecs ls-files -z -- '[!]-a]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1230 - ipathmatch (via ls-files): match '[!]-a]' '['
+		compare_ws_file eol_lf_crlf_input_attr_text_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 1000 - checkout attr=text ident aeol=lf core.autocrlf=input core.eol=lf file=CRLF
 
 expecting success: 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
+		compare_ws_file eol_lf_crlf_input_attr_text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
 	
-Removing [
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 1231 - cleanup after previous file test
+ok 1001 - checkout attr=text ident aeol=lf core.autocrlf=input core.eol=lf file=CRLF_mix_LF
 
 expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
+		compare_ws_file eol_lf_crlf_input_attr_text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 1232 - setup match file test for ^
+ok 1002 - checkout attr=text ident aeol=lf core.autocrlf=input core.eol=lf file=LF_mix_CR
 
 expecting success: 
-			test-tool wildmatch wildmatch '^' '[a^bc]'
-		
-ok 1233 - wildmatch: match '^' '[a^bc]'
+		compare_ws_file eol_lf_crlf_input_attr_text_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 1003 - checkout attr=text ident aeol=lf core.autocrlf=input core.eol=lf file=LF_nul
 
 expecting success: 
-				printf '%s' '^' >expect &&
-				git --glob-pathspecs ls-files -z -- '[a^bc]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
 		test_cmp expect actual
-			
-ok 1234 - wildmatch (via ls-files): match '[a^bc]' '^'
+	
+ok 1004 - ls-files --eol attr=text ident aeol=crlf core.autocrlf=input core.eol=lf
 
 expecting success: 
-			test-tool wildmatch iwildmatch '^' '[a^bc]'
-		
-ok 1235 - iwildmatch: match '^' '[a^bc]'
+		compare_ws_file eol_lf_crlf_input_attr_text_ CRLF    crlf_false_attr__LF.txt
+	
+ok 1005 - checkout attr=text ident aeol=crlf core.autocrlf=input core.eol=lf file=LF
 
 expecting success: 
-				printf '%s' '^' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[a^bc]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1236 - iwildmatch (via ls-files): match '[a^bc]' '^'
+		compare_ws_file eol_lf_crlf_input_attr_text_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 1006 - checkout attr=text ident aeol=crlf core.autocrlf=input core.eol=lf file=CRLF
 
 expecting success: 
-			test-tool wildmatch pathmatch '^' '[a^bc]'
-		
-ok 1237 - pathmatch: match '^' '[a^bc]'
+		compare_ws_file eol_lf_crlf_input_attr_text_ CRLF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 1007 - checkout attr=text ident aeol=crlf core.autocrlf=input core.eol=lf file=CRLF_mix_LF
 
 expecting success: 
-				printf '%s' '^' >expect &&
-				git ls-files -z -- '[a^bc]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1238 - pathmatch (via ls-files): match '[a^bc]' '^'
+		compare_ws_file eol_lf_crlf_input_attr_text_ CRLF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 1008 - checkout attr=text ident aeol=crlf core.autocrlf=input core.eol=lf file=LF_mix_CR
 
 expecting success: 
-			test-tool wildmatch ipathmatch '^' '[a^bc]'
-		
-ok 1239 - ipathmatch: match '^' '[a^bc]'
+		compare_ws_file eol_lf_crlf_input_attr_text_ CRLF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 1009 - checkout attr=text ident aeol=crlf core.autocrlf=input core.eol=lf file=LF_nul
 
 expecting success: 
-				printf '%s' '^' >expect &&
-				git --icase-pathspecs ls-files -z -- '[a^bc]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
 		test_cmp expect actual
-			
-ok 1240 - ipathmatch (via ls-files): match '[a^bc]' '^'
+	
+ok 1010 - ls-files --eol attr=auto ident aeol=lf core.autocrlf=input core.eol=lf
 
 expecting success: 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
+		compare_ws_file eol_lf_crlf_input_attr_auto_ LF    crlf_false_attr__LF.txt
 	
-Removing ^
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 1241 - cleanup after previous file test
+ok 1011 - checkout attr=auto ident aeol=lf core.autocrlf=input core.eol=lf file=LF
 
 expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
+		compare_ws_file eol_lf_crlf_input_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 1242 - setup match file test for -b]
+ok 1012 - checkout attr=auto ident aeol=lf core.autocrlf=input core.eol=lf file=CRLF
 
 expecting success: 
-			test-tool wildmatch wildmatch '-b]' '[a-]b]'
-		
-ok 1243 - wildmatch: match '-b]' '[a-]b]'
+		compare_ws_file eol_lf_crlf_input_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 1013 - checkout attr=auto ident aeol=lf core.autocrlf=input core.eol=lf file=CRLF_mix_LF
 
 expecting success: 
-				printf '%s' '-b]' >expect &&
-				git --glob-pathspecs ls-files -z -- '[a-]b]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1244 - wildmatch (via ls-files): match '[a-]b]' '-b]'
+		compare_ws_file eol_lf_crlf_input_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 1014 - checkout attr=auto ident aeol=lf core.autocrlf=input core.eol=lf file=LF_mix_CR
 
 expecting success: 
-			test-tool wildmatch iwildmatch '-b]' '[a-]b]'
-		
-ok 1245 - iwildmatch: match '-b]' '[a-]b]'
+		compare_ws_file eol_lf_crlf_input_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 1015 - checkout attr=auto ident aeol=lf core.autocrlf=input core.eol=lf file=LF_nul
 
 expecting success: 
-				printf '%s' '-b]' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[a-]b]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
 		test_cmp expect actual
-			
-ok 1246 - iwildmatch (via ls-files): match '[a-]b]' '-b]'
+	
+ok 1016 - ls-files --eol attr=auto ident aeol=crlf core.autocrlf=input core.eol=lf
 
 expecting success: 
-			test-tool wildmatch pathmatch '-b]' '[a-]b]'
-		
-ok 1247 - pathmatch: match '-b]' '[a-]b]'
+		compare_ws_file eol_lf_crlf_input_attr_auto_ CRLF    crlf_false_attr__LF.txt
+	
+ok 1017 - checkout attr=auto ident aeol=crlf core.autocrlf=input core.eol=lf file=LF
 
 expecting success: 
-				printf '%s' '-b]' >expect &&
-				git ls-files -z -- '[a-]b]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1248 - pathmatch (via ls-files): match '[a-]b]' '-b]'
+		compare_ws_file eol_lf_crlf_input_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 1018 - checkout attr=auto ident aeol=crlf core.autocrlf=input core.eol=lf file=CRLF
 
 expecting success: 
-			test-tool wildmatch ipathmatch '-b]' '[a-]b]'
-		
-ok 1249 - ipathmatch: match '-b]' '[a-]b]'
+		compare_ws_file eol_lf_crlf_input_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 1019 - checkout attr=auto ident aeol=crlf core.autocrlf=input core.eol=lf file=CRLF_mix_LF
 
 expecting success: 
-				printf '%s' '-b]' >expect &&
-				git --icase-pathspecs ls-files -z -- '[a-]b]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1250 - ipathmatch (via ls-files): match '[a-]b]' '-b]'
+		compare_ws_file eol_lf_crlf_input_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 1020 - checkout attr=auto ident aeol=crlf core.autocrlf=input core.eol=lf file=LF_mix_CR
 
 expecting success: 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
+		compare_ws_file eol_lf_crlf_input_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
 	
-Removing -b]
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 1251 - cleanup after previous file test
+ok 1021 - checkout attr=auto ident aeol=crlf core.autocrlf=input core.eol=lf file=LF_nul
 
 expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
+		test_cmp expect actual
 	
-ok 1252 - setup match file test for \
+ok 1022 - ls-files --eol attr= ident aeol= core.autocrlf=false core.eol=lf
 
 expecting success: 
-			test_must_fail test-tool wildmatch wildmatch '\' '[\]'
-		
-ok 1253 - wildmatch: no match '\' '[\]'
+		compare_ws_file eol_lf_crlf_false_attr__ LF    crlf_false_attr__LF.txt
+	
+ok 1023 - checkout attr= ident aeol= core.autocrlf=false core.eol=lf file=LF
 
 expecting success: 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- '[\]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1254 - wildmatch (via ls-files): no match '[\]' '\'
+		compare_ws_file eol_lf_crlf_false_attr__ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 1024 - checkout attr= ident aeol= core.autocrlf=false core.eol=lf file=CRLF
 
 expecting success: 
-			test_must_fail test-tool wildmatch iwildmatch '\' '[\]'
-		
-ok 1255 - iwildmatch: no match '\' '[\]'
+		compare_ws_file eol_lf_crlf_false_attr__ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 1025 - checkout attr= ident aeol= core.autocrlf=false core.eol=lf file=CRLF_mix_LF
 
 expecting success: 
-				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[\]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1256 - iwildmatch (via ls-files): no match '[\]' '\'
+		compare_ws_file eol_lf_crlf_false_attr__ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 1026 - checkout attr= ident aeol= core.autocrlf=false core.eol=lf file=LF_mix_CR
 
 expecting success: 
-			test_must_fail test-tool wildmatch pathmatch '\' '[\]'
-		
-ok 1257 - pathmatch: no match '\' '[\]'
+		compare_ws_file eol_lf_crlf_false_attr__ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 1027 - checkout attr= ident aeol= core.autocrlf=false core.eol=lf file=LF_nul
 
 expecting success: 
-				>expect &&
-				git ls-files -z -- '[\]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
 		test_cmp expect actual
-			
-ok 1258 - pathmatch (via ls-files): no match '[\]' '\'
+	
+ok 1028 - ls-files --eol attr= ident aeol= core.autocrlf=true core.eol=lf
 
 expecting success: 
-			test_must_fail test-tool wildmatch ipathmatch '\' '[\]'
-		
-ok 1259 - ipathmatch: no match '\' '[\]'
+		compare_ws_file eol_lf_crlf_true_attr__ CRLF    crlf_false_attr__LF.txt
+	
+ok 1029 - checkout attr= ident aeol= core.autocrlf=true core.eol=lf file=LF
 
 expecting success: 
-				>expect &&
-				git --icase-pathspecs ls-files -z -- '[\]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1260 - ipathmatch (via ls-files): no match '[\]' '\'
+		compare_ws_file eol_lf_crlf_true_attr__ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 1030 - checkout attr= ident aeol= core.autocrlf=true core.eol=lf file=CRLF
 
 expecting success: 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
+		compare_ws_file eol_lf_crlf_true_attr__ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
 	
-Removing "\\"
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 1261 - cleanup after previous file test
+ok 1031 - checkout attr= ident aeol= core.autocrlf=true core.eol=lf file=CRLF_mix_LF
 
 expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
+		compare_ws_file eol_lf_crlf_true_attr__ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 1262 - setup match file test for \
+ok 1032 - checkout attr= ident aeol= core.autocrlf=true core.eol=lf file=LF_mix_CR
 
 expecting success: 
-			test-tool wildmatch wildmatch '\' '[\\]'
-		
-ok 1263 - wildmatch: match '\' '[\\]'
+		compare_ws_file eol_lf_crlf_true_attr__ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 1033 - checkout attr= ident aeol= core.autocrlf=true core.eol=lf file=LF_nul
 
 expecting success: 
-				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_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
 		test_cmp expect actual
-			
-ok 1264 - wildmatch (via ls-files): match '[\\]' '\'
+	
+ok 1034 - ls-files --eol attr=auto ident aeol= core.autocrlf=true core.eol=lf
 
 expecting success: 
-			test-tool wildmatch iwildmatch '\' '[\\]'
-		
-ok 1265 - iwildmatch: match '\' '[\\]'
+		compare_ws_file eol_lf_crlf_true_attr_auto_ CRLF    crlf_false_attr__LF.txt
+	
+ok 1035 - checkout attr=auto ident aeol= core.autocrlf=true core.eol=lf file=LF
 
 expecting success: 
-				printf '%s' '\' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[\\]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1266 - iwildmatch (via ls-files): match '[\\]' '\'
+		compare_ws_file eol_lf_crlf_true_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 1036 - checkout attr=auto ident aeol= core.autocrlf=true core.eol=lf file=CRLF
 
 expecting success: 
-			test-tool wildmatch pathmatch '\' '[\\]'
-		
-ok 1267 - pathmatch: match '\' '[\\]'
+		compare_ws_file eol_lf_crlf_true_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 1037 - checkout attr=auto ident aeol= core.autocrlf=true core.eol=lf file=CRLF_mix_LF
 
 expecting success: 
-				printf '%s' '\' >expect &&
-				git ls-files -z -- '[\\]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1268 - pathmatch (via ls-files): match '[\\]' '\'
+		compare_ws_file eol_lf_crlf_true_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 1038 - checkout attr=auto ident aeol= core.autocrlf=true core.eol=lf file=LF_mix_CR
 
 expecting success: 
-			test-tool wildmatch ipathmatch '\' '[\\]'
-		
-ok 1269 - ipathmatch: match '\' '[\\]'
+		compare_ws_file eol_lf_crlf_true_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 1039 - checkout attr=auto ident aeol= core.autocrlf=true core.eol=lf file=LF_nul
 
 expecting success: 
-				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_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
 		test_cmp expect actual
-			
-ok 1270 - ipathmatch (via ls-files): match '[\\]' '\'
+	
+ok 1040 - ls-files --eol attr=text ident aeol= core.autocrlf=true core.eol=lf
 
 expecting success: 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
+		compare_ws_file eol_lf_crlf_true_attr_text_ CRLF    crlf_false_attr__LF.txt
 	
-Removing "\\"
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 1271 - cleanup after previous file test
+ok 1041 - checkout attr=text ident aeol= core.autocrlf=true core.eol=lf file=LF
 
 expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
+		compare_ws_file eol_lf_crlf_true_attr_text_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 1272 - setup match file test for \
+ok 1042 - checkout attr=text ident aeol= core.autocrlf=true core.eol=lf file=CRLF
 
 expecting success: 
-			test_must_fail test-tool wildmatch wildmatch '\' '[!\\]'
-		
-ok 1273 - wildmatch: no match '\' '[!\\]'
+		compare_ws_file eol_lf_crlf_true_attr_text_ CRLF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 1043 - checkout attr=text ident aeol= core.autocrlf=true core.eol=lf file=CRLF_mix_LF
 
 expecting success: 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- '[!\\]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1274 - wildmatch (via ls-files): no match '[!\\]' '\'
+		compare_ws_file eol_lf_crlf_true_attr_text_ CRLF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 1044 - checkout attr=text ident aeol= core.autocrlf=true core.eol=lf file=LF_mix_CR
 
 expecting success: 
-			test_must_fail test-tool wildmatch iwildmatch '\' '[!\\]'
-		
-ok 1275 - iwildmatch: no match '\' '[!\\]'
+		compare_ws_file eol_lf_crlf_true_attr_text_ CRLF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 1045 - checkout attr=text ident aeol= core.autocrlf=true core.eol=lf file=LF_nul
 
 expecting success: 
-				>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_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
 		test_cmp expect actual
-			
-ok 1276 - iwildmatch (via ls-files): no match '[!\\]' '\'
+	
+ok 1046 - ls-files --eol attr=text ident aeol= core.autocrlf=input core.eol=lf
 
 expecting success: 
-			test_must_fail test-tool wildmatch pathmatch '\' '[!\\]'
-		
-ok 1277 - pathmatch: no match '\' '[!\\]'
+		compare_ws_file eol_lf_crlf_input_attr_text_ LF    crlf_false_attr__LF.txt
+	
+ok 1047 - checkout attr=text ident aeol= core.autocrlf=input core.eol=lf file=LF
 
 expecting success: 
-				>expect &&
-				git ls-files -z -- '[!\\]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1278 - pathmatch (via ls-files): no match '[!\\]' '\'
+		compare_ws_file eol_lf_crlf_input_attr_text_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 1048 - checkout attr=text ident aeol= core.autocrlf=input core.eol=lf file=CRLF
 
 expecting success: 
-			test_must_fail test-tool wildmatch ipathmatch '\' '[!\\]'
-		
-ok 1279 - ipathmatch: no match '\' '[!\\]'
+		compare_ws_file eol_lf_crlf_input_attr_text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 1049 - checkout attr=text ident aeol= core.autocrlf=input core.eol=lf file=CRLF_mix_LF
 
 expecting success: 
-				>expect &&
-				git --icase-pathspecs ls-files -z -- '[!\\]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1280 - ipathmatch (via ls-files): no match '[!\\]' '\'
+		compare_ws_file eol_lf_crlf_input_attr_text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 1050 - checkout attr=text ident aeol= core.autocrlf=input core.eol=lf file=LF_mix_CR
 
 expecting success: 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
+		compare_ws_file eol_lf_crlf_input_attr_text_ LF_nul   crlf_false_attr__LF_nul.txt
 	
-Removing "\\"
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 1281 - cleanup after previous file test
+ok 1051 - checkout attr=text ident aeol= core.autocrlf=input core.eol=lf file=LF_nul
 
 expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
+		test_cmp expect actual
 	
-ok 1282 - setup match file test for G
+ok 1052 - ls-files --eol attr=auto ident aeol= core.autocrlf=input core.eol=lf
 
 expecting success: 
-			test-tool wildmatch wildmatch 'G' '[A-\\]'
-		
-ok 1283 - wildmatch: match 'G' '[A-\\]'
+		compare_ws_file eol_lf_crlf_input_attr_auto_ LF    crlf_false_attr__LF.txt
+	
+ok 1053 - checkout attr=auto ident aeol= core.autocrlf=input core.eol=lf file=LF
 
 expecting success: 
-				printf '%s' 'G' >expect &&
-				git --glob-pathspecs ls-files -z -- '[A-\\]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1284 - wildmatch (via ls-files): match '[A-\\]' 'G'
+		compare_ws_file eol_lf_crlf_input_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 1054 - checkout attr=auto ident aeol= core.autocrlf=input core.eol=lf file=CRLF
 
 expecting success: 
-			test-tool wildmatch iwildmatch 'G' '[A-\\]'
-		
-ok 1285 - iwildmatch: match 'G' '[A-\\]'
+		compare_ws_file eol_lf_crlf_input_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 1055 - checkout attr=auto ident aeol= core.autocrlf=input core.eol=lf file=CRLF_mix_LF
 
 expecting success: 
-				printf '%s' 'G' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[A-\\]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1286 - iwildmatch (via ls-files): match '[A-\\]' 'G'
+		compare_ws_file eol_lf_crlf_input_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 1056 - checkout attr=auto ident aeol= core.autocrlf=input core.eol=lf file=LF_mix_CR
 
 expecting success: 
-			test-tool wildmatch pathmatch 'G' '[A-\\]'
-		
-ok 1287 - pathmatch: match 'G' '[A-\\]'
+		compare_ws_file eol_lf_crlf_input_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 1057 - checkout attr=auto ident aeol= core.autocrlf=input core.eol=lf file=LF_nul
 
 expecting success: 
-				printf '%s' 'G' >expect &&
-				git ls-files -z -- '[A-\\]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
 		test_cmp expect actual
-			
-ok 1288 - pathmatch (via ls-files): match '[A-\\]' 'G'
+	
+ok 1058 - ls-files --eol attr=-text ident aeol= core.autocrlf=true core.eol=crlf
 
 expecting success: 
-			test-tool wildmatch ipathmatch 'G' '[A-\\]'
-		
-ok 1289 - ipathmatch: match 'G' '[A-\\]'
+		compare_ws_file eol_crlf_crlf_true_attr_-text_ LF    crlf_false_attr__LF.txt
+	
+ok 1059 - checkout attr=-text ident aeol= core.autocrlf=true core.eol=crlf file=LF
 
 expecting success: 
-				printf '%s' 'G' >expect &&
-				git --icase-pathspecs ls-files -z -- '[A-\\]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1290 - ipathmatch (via ls-files): match '[A-\\]' 'G'
+		compare_ws_file eol_crlf_crlf_true_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 1060 - checkout attr=-text ident aeol= core.autocrlf=true core.eol=crlf file=CRLF
 
 expecting success: 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
+		compare_ws_file eol_crlf_crlf_true_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
 	
-Removing G
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 1291 - cleanup after previous file test
+ok 1061 - checkout attr=-text ident aeol= core.autocrlf=true core.eol=crlf file=CRLF_mix_LF
 
 expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
+		compare_ws_file eol_crlf_crlf_true_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 1292 - setup match file test for aaabbb
+ok 1062 - checkout attr=-text ident aeol= core.autocrlf=true core.eol=crlf file=LF_mix_CR
 
 expecting success: 
-			test_must_fail test-tool wildmatch wildmatch 'aaabbb' 'b*a'
-		
-ok 1293 - wildmatch: no match 'aaabbb' 'b*a'
+		compare_ws_file eol_crlf_crlf_true_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 1063 - checkout attr=-text ident aeol= core.autocrlf=true core.eol=crlf file=LF_nul
 
 expecting success: 
-				>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_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
 		test_cmp expect actual
-			
-ok 1294 - wildmatch (via ls-files): no match 'b*a' 'aaabbb'
+	
+ok 1064 - ls-files --eol attr=-text ident aeol=lf core.autocrlf=true core.eol=crlf
 
 expecting success: 
-			test_must_fail test-tool wildmatch iwildmatch 'aaabbb' 'b*a'
-		
-ok 1295 - iwildmatch: no match 'aaabbb' 'b*a'
+		compare_ws_file eol_crlf_crlf_true_attr_-text_ LF    crlf_false_attr__LF.txt
+	
+ok 1065 - checkout attr=-text ident aeol=lf core.autocrlf=true core.eol=crlf file=LF
 
 expecting success: 
-				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'b*a' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1296 - iwildmatch (via ls-files): no match 'b*a' 'aaabbb'
+		compare_ws_file eol_crlf_crlf_true_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 1066 - checkout attr=-text ident aeol=lf core.autocrlf=true core.eol=crlf file=CRLF
 
 expecting success: 
-			test_must_fail test-tool wildmatch pathmatch 'aaabbb' 'b*a'
-		
-ok 1297 - pathmatch: no match 'aaabbb' 'b*a'
+		compare_ws_file eol_crlf_crlf_true_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 1067 - checkout attr=-text ident aeol=lf core.autocrlf=true core.eol=crlf file=CRLF_mix_LF
 
 expecting success: 
-				>expect &&
-				git ls-files -z -- 'b*a' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1298 - pathmatch (via ls-files): no match 'b*a' 'aaabbb'
+		compare_ws_file eol_crlf_crlf_true_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 1068 - checkout attr=-text ident aeol=lf core.autocrlf=true core.eol=crlf file=LF_mix_CR
 
 expecting success: 
-			test_must_fail test-tool wildmatch ipathmatch 'aaabbb' 'b*a'
-		
-ok 1299 - ipathmatch: no match 'aaabbb' 'b*a'
+		compare_ws_file eol_crlf_crlf_true_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 1069 - checkout attr=-text ident aeol=lf core.autocrlf=true core.eol=crlf file=LF_nul
 
 expecting success: 
-				>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_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
 		test_cmp expect actual
-			
-ok 1300 - ipathmatch (via ls-files): no match 'b*a' 'aaabbb'
+	
+ok 1070 - ls-files --eol attr=-text ident aeol=crlf core.autocrlf=true core.eol=crlf
 
 expecting success: 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
+		compare_ws_file eol_crlf_crlf_true_attr_-text_ LF    crlf_false_attr__LF.txt
 	
-Removing aaabbb
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 1301 - cleanup after previous file test
+ok 1071 - checkout attr=-text ident aeol=crlf core.autocrlf=true core.eol=crlf file=LF
 
 expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
+		compare_ws_file eol_crlf_crlf_true_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 1302 - setup match file test for aabcaa
+ok 1072 - checkout attr=-text ident aeol=crlf core.autocrlf=true core.eol=crlf file=CRLF
 
 expecting success: 
-			test_must_fail test-tool wildmatch wildmatch 'aabcaa' '*ba*'
-		
-ok 1303 - wildmatch: no match 'aabcaa' '*ba*'
+		compare_ws_file eol_crlf_crlf_true_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 1073 - checkout attr=-text ident aeol=crlf core.autocrlf=true core.eol=crlf file=CRLF_mix_LF
 
 expecting success: 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- '*ba*' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1304 - wildmatch (via ls-files): no match '*ba*' 'aabcaa'
+		compare_ws_file eol_crlf_crlf_true_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 1074 - checkout attr=-text ident aeol=crlf core.autocrlf=true core.eol=crlf file=LF_mix_CR
 
 expecting success: 
-			test_must_fail test-tool wildmatch iwildmatch 'aabcaa' '*ba*'
-		
-ok 1305 - iwildmatch: no match 'aabcaa' '*ba*'
+		compare_ws_file eol_crlf_crlf_true_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 1075 - checkout attr=-text ident aeol=crlf core.autocrlf=true core.eol=crlf file=LF_nul
 
 expecting success: 
-				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '*ba*' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
 		test_cmp expect actual
-			
-ok 1306 - iwildmatch (via ls-files): no match '*ba*' 'aabcaa'
+	
+ok 1076 - ls-files --eol attr=text ident aeol=lf core.autocrlf=true core.eol=crlf
 
 expecting success: 
-			test_must_fail test-tool wildmatch pathmatch 'aabcaa' '*ba*'
-		
-ok 1307 - pathmatch: no match 'aabcaa' '*ba*'
+		compare_ws_file eol_crlf_crlf_true_attr_text_ LF    crlf_false_attr__LF.txt
+	
+ok 1077 - checkout attr=text ident aeol=lf core.autocrlf=true core.eol=crlf file=LF
 
 expecting success: 
-				>expect &&
-				git ls-files -z -- '*ba*' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1308 - pathmatch (via ls-files): no match '*ba*' 'aabcaa'
+		compare_ws_file eol_crlf_crlf_true_attr_text_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 1078 - checkout attr=text ident aeol=lf core.autocrlf=true core.eol=crlf file=CRLF
 
 expecting success: 
-			test_must_fail test-tool wildmatch ipathmatch 'aabcaa' '*ba*'
-		
-ok 1309 - ipathmatch: no match 'aabcaa' '*ba*'
+		compare_ws_file eol_crlf_crlf_true_attr_text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 1079 - checkout attr=text ident aeol=lf core.autocrlf=true core.eol=crlf file=CRLF_mix_LF
 
 expecting success: 
-				>expect &&
-				git --icase-pathspecs ls-files -z -- '*ba*' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1310 - ipathmatch (via ls-files): no match '*ba*' 'aabcaa'
+		compare_ws_file eol_crlf_crlf_true_attr_text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 1080 - checkout attr=text ident aeol=lf core.autocrlf=true core.eol=crlf file=LF_mix_CR
 
 expecting success: 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
+		compare_ws_file eol_crlf_crlf_true_attr_text_ LF_nul   crlf_false_attr__LF_nul.txt
 	
-Removing aabcaa
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 1311 - cleanup after previous file test
+ok 1081 - checkout attr=text ident aeol=lf core.autocrlf=true core.eol=crlf file=LF_nul
 
 expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
+		test_cmp expect actual
 	
-ok 1312 - setup match file test for ,
+ok 1082 - ls-files --eol attr=text ident aeol=crlf core.autocrlf=true core.eol=crlf
 
 expecting success: 
-			test-tool wildmatch wildmatch ',' '[,]'
-		
-ok 1313 - wildmatch: match ',' '[,]'
+		compare_ws_file eol_crlf_crlf_true_attr_text_ CRLF    crlf_false_attr__LF.txt
+	
+ok 1083 - checkout attr=text ident aeol=crlf core.autocrlf=true core.eol=crlf file=LF
 
 expecting success: 
-				printf '%s' ',' >expect &&
-				git --glob-pathspecs ls-files -z -- '[,]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1314 - wildmatch (via ls-files): match '[,]' ','
+		compare_ws_file eol_crlf_crlf_true_attr_text_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 1084 - checkout attr=text ident aeol=crlf core.autocrlf=true core.eol=crlf file=CRLF
 
 expecting success: 
-			test-tool wildmatch iwildmatch ',' '[,]'
-		
-ok 1315 - iwildmatch: match ',' '[,]'
+		compare_ws_file eol_crlf_crlf_true_attr_text_ CRLF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 1085 - checkout attr=text ident aeol=crlf core.autocrlf=true core.eol=crlf file=CRLF_mix_LF
 
 expecting success: 
-				printf '%s' ',' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[,]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1316 - iwildmatch (via ls-files): match '[,]' ','
+		compare_ws_file eol_crlf_crlf_true_attr_text_ CRLF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 1086 - checkout attr=text ident aeol=crlf core.autocrlf=true core.eol=crlf file=LF_mix_CR
 
 expecting success: 
-			test-tool wildmatch pathmatch ',' '[,]'
-		
-ok 1317 - pathmatch: match ',' '[,]'
+		compare_ws_file eol_crlf_crlf_true_attr_text_ CRLF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 1087 - checkout attr=text ident aeol=crlf core.autocrlf=true core.eol=crlf file=LF_nul
 
 expecting success: 
-				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_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
 		test_cmp expect actual
-			
-ok 1318 - pathmatch (via ls-files): match '[,]' ','
+	
+ok 1088 - ls-files --eol attr=auto ident aeol=lf core.autocrlf=true core.eol=crlf
 
 expecting success: 
-			test-tool wildmatch ipathmatch ',' '[,]'
-		
-ok 1319 - ipathmatch: match ',' '[,]'
+		compare_ws_file eol_crlf_crlf_true_attr_auto_ LF    crlf_false_attr__LF.txt
+	
+ok 1089 - checkout attr=auto ident aeol=lf core.autocrlf=true core.eol=crlf file=LF
 
 expecting success: 
-				printf '%s' ',' >expect &&
-				git --icase-pathspecs ls-files -z -- '[,]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1320 - ipathmatch (via ls-files): match '[,]' ','
+		compare_ws_file eol_crlf_crlf_true_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 1090 - checkout attr=auto ident aeol=lf core.autocrlf=true core.eol=crlf file=CRLF
 
 expecting success: 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
+		compare_ws_file eol_crlf_crlf_true_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
 	
-Removing ,
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 1321 - cleanup after previous file test
+ok 1091 - checkout attr=auto ident aeol=lf core.autocrlf=true core.eol=crlf file=CRLF_mix_LF
 
 expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
+		compare_ws_file eol_crlf_crlf_true_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 1322 - setup match file test for ,
+ok 1092 - checkout attr=auto ident aeol=lf core.autocrlf=true core.eol=crlf file=LF_mix_CR
 
 expecting success: 
-			test-tool wildmatch wildmatch ',' '[\\,]'
-		
-ok 1323 - wildmatch: match ',' '[\\,]'
+		compare_ws_file eol_crlf_crlf_true_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 1093 - checkout attr=auto ident aeol=lf core.autocrlf=true core.eol=crlf file=LF_nul
 
 expecting success: 
-				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_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
 		test_cmp expect actual
-			
-ok 1324 - wildmatch (via ls-files): match '[\\,]' ','
+	
+ok 1094 - ls-files --eol attr=auto ident aeol=crlf core.autocrlf=true core.eol=crlf
 
 expecting success: 
-			test-tool wildmatch iwildmatch ',' '[\\,]'
-		
-ok 1325 - iwildmatch: match ',' '[\\,]'
+		compare_ws_file eol_crlf_crlf_true_attr_auto_ CRLF    crlf_false_attr__LF.txt
+	
+ok 1095 - checkout attr=auto ident aeol=crlf core.autocrlf=true core.eol=crlf file=LF
 
 expecting success: 
-				printf '%s' ',' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[\\,]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1326 - iwildmatch (via ls-files): match '[\\,]' ','
+		compare_ws_file eol_crlf_crlf_true_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 1096 - checkout attr=auto ident aeol=crlf core.autocrlf=true core.eol=crlf file=CRLF
 
 expecting success: 
-			test-tool wildmatch pathmatch ',' '[\\,]'
-		
-ok 1327 - pathmatch: match ',' '[\\,]'
+		compare_ws_file eol_crlf_crlf_true_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 1097 - checkout attr=auto ident aeol=crlf core.autocrlf=true core.eol=crlf file=CRLF_mix_LF
 
 expecting success: 
-				printf '%s' ',' >expect &&
-				git ls-files -z -- '[\\,]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1328 - pathmatch (via ls-files): match '[\\,]' ','
+		compare_ws_file eol_crlf_crlf_true_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 1098 - checkout attr=auto ident aeol=crlf core.autocrlf=true core.eol=crlf file=LF_mix_CR
 
 expecting success: 
-			test-tool wildmatch ipathmatch ',' '[\\,]'
-		
-ok 1329 - ipathmatch: match ',' '[\\,]'
+		compare_ws_file eol_crlf_crlf_true_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 1099 - checkout attr=auto ident aeol=crlf core.autocrlf=true core.eol=crlf file=LF_nul
 
 expecting success: 
-				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_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
 		test_cmp expect actual
-			
-ok 1330 - ipathmatch (via ls-files): match '[\\,]' ','
+	
+ok 1100 - ls-files --eol attr=-text ident aeol= core.autocrlf=false core.eol=crlf
 
 expecting success: 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
+		compare_ws_file eol_crlf_crlf_false_attr_-text_ LF    crlf_false_attr__LF.txt
 	
-Removing ,
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 1331 - cleanup after previous file test
+ok 1101 - checkout attr=-text ident aeol= core.autocrlf=false core.eol=crlf file=LF
 
 expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
+		compare_ws_file eol_crlf_crlf_false_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 1332 - setup match file test for \
+ok 1102 - checkout attr=-text ident aeol= core.autocrlf=false core.eol=crlf file=CRLF
 
 expecting success: 
-			test-tool wildmatch wildmatch '\' '[\\,]'
-		
-ok 1333 - wildmatch: match '\' '[\\,]'
+		compare_ws_file eol_crlf_crlf_false_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 1103 - checkout attr=-text ident aeol= core.autocrlf=false core.eol=crlf file=CRLF_mix_LF
 
 expecting success: 
-				printf '%s' '\' >expect &&
-				git --glob-pathspecs ls-files -z -- '[\\,]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1334 - wildmatch (via ls-files): match '[\\,]' '\'
+		compare_ws_file eol_crlf_crlf_false_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 1104 - checkout attr=-text ident aeol= core.autocrlf=false core.eol=crlf file=LF_mix_CR
 
 expecting success: 
-			test-tool wildmatch iwildmatch '\' '[\\,]'
-		
-ok 1335 - iwildmatch: match '\' '[\\,]'
+		compare_ws_file eol_crlf_crlf_false_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 1105 - checkout attr=-text ident aeol= core.autocrlf=false core.eol=crlf file=LF_nul
 
 expecting success: 
-				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_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
 		test_cmp expect actual
-			
-ok 1336 - iwildmatch (via ls-files): match '[\\,]' '\'
+	
+ok 1106 - ls-files --eol attr=-text ident aeol=lf core.autocrlf=false core.eol=crlf
 
 expecting success: 
-			test-tool wildmatch pathmatch '\' '[\\,]'
-		
-ok 1337 - pathmatch: match '\' '[\\,]'
+		compare_ws_file eol_crlf_crlf_false_attr_-text_ LF    crlf_false_attr__LF.txt
+	
+ok 1107 - checkout attr=-text ident aeol=lf core.autocrlf=false core.eol=crlf file=LF
 
 expecting success: 
-				printf '%s' '\' >expect &&
-				git ls-files -z -- '[\\,]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1338 - pathmatch (via ls-files): match '[\\,]' '\'
+		compare_ws_file eol_crlf_crlf_false_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 1108 - checkout attr=-text ident aeol=lf core.autocrlf=false core.eol=crlf file=CRLF
 
 expecting success: 
-			test-tool wildmatch ipathmatch '\' '[\\,]'
-		
-ok 1339 - ipathmatch: match '\' '[\\,]'
+		compare_ws_file eol_crlf_crlf_false_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 1109 - checkout attr=-text ident aeol=lf core.autocrlf=false core.eol=crlf file=CRLF_mix_LF
 
 expecting success: 
-				printf '%s' '\' >expect &&
-				git --icase-pathspecs ls-files -z -- '[\\,]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1340 - ipathmatch (via ls-files): match '[\\,]' '\'
+		compare_ws_file eol_crlf_crlf_false_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 1110 - checkout attr=-text ident aeol=lf core.autocrlf=false core.eol=crlf file=LF_mix_CR
 
 expecting success: 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
+		compare_ws_file eol_crlf_crlf_false_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
 	
-Removing "\\"
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 1341 - cleanup after previous file test
+ok 1111 - checkout attr=-text ident aeol=lf core.autocrlf=false core.eol=crlf file=LF_nul
 
 expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
+		test_cmp expect actual
 	
-ok 1342 - setup match file test for -
+ok 1112 - ls-files --eol attr=-text ident aeol=crlf core.autocrlf=false core.eol=crlf
 
 expecting success: 
-			test-tool wildmatch wildmatch '-' '[,-.]'
-		
-ok 1343 - wildmatch: match '-' '[,-.]'
+		compare_ws_file eol_crlf_crlf_false_attr_-text_ LF    crlf_false_attr__LF.txt
+	
+ok 1113 - checkout attr=-text ident aeol=crlf core.autocrlf=false core.eol=crlf file=LF
 
 expecting success: 
-				printf '%s' '-' >expect &&
-				git --glob-pathspecs ls-files -z -- '[,-.]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1344 - wildmatch (via ls-files): match '[,-.]' '-'
+		compare_ws_file eol_crlf_crlf_false_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 1114 - checkout attr=-text ident aeol=crlf core.autocrlf=false core.eol=crlf file=CRLF
 
 expecting success: 
-			test-tool wildmatch iwildmatch '-' '[,-.]'
-		
-ok 1345 - iwildmatch: match '-' '[,-.]'
+		compare_ws_file eol_crlf_crlf_false_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 1115 - checkout attr=-text ident aeol=crlf core.autocrlf=false core.eol=crlf file=CRLF_mix_LF
 
 expecting success: 
-				printf '%s' '-' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[,-.]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1346 - iwildmatch (via ls-files): match '[,-.]' '-'
+		compare_ws_file eol_crlf_crlf_false_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 1116 - checkout attr=-text ident aeol=crlf core.autocrlf=false core.eol=crlf file=LF_mix_CR
 
 expecting success: 
-			test-tool wildmatch pathmatch '-' '[,-.]'
-		
-ok 1347 - pathmatch: match '-' '[,-.]'
+		compare_ws_file eol_crlf_crlf_false_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 1117 - checkout attr=-text ident aeol=crlf core.autocrlf=false core.eol=crlf file=LF_nul
 
 expecting success: 
-				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_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
 		test_cmp expect actual
-			
-ok 1348 - pathmatch (via ls-files): match '[,-.]' '-'
+	
+ok 1118 - ls-files --eol attr=text ident aeol=lf core.autocrlf=false core.eol=crlf
 
 expecting success: 
-			test-tool wildmatch ipathmatch '-' '[,-.]'
-		
-ok 1349 - ipathmatch: match '-' '[,-.]'
+		compare_ws_file eol_crlf_crlf_false_attr_text_ LF    crlf_false_attr__LF.txt
+	
+ok 1119 - checkout attr=text ident aeol=lf core.autocrlf=false core.eol=crlf file=LF
 
 expecting success: 
-				printf '%s' '-' >expect &&
-				git --icase-pathspecs ls-files -z -- '[,-.]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1350 - ipathmatch (via ls-files): match '[,-.]' '-'
+		compare_ws_file eol_crlf_crlf_false_attr_text_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 1120 - checkout attr=text ident aeol=lf core.autocrlf=false core.eol=crlf file=CRLF
 
 expecting success: 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
+		compare_ws_file eol_crlf_crlf_false_attr_text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
 	
-Removing -
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 1351 - cleanup after previous file test
+ok 1121 - checkout attr=text ident aeol=lf core.autocrlf=false core.eol=crlf file=CRLF_mix_LF
 
 expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
+		compare_ws_file eol_crlf_crlf_false_attr_text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 1352 - setup match file test for +
+ok 1122 - checkout attr=text ident aeol=lf core.autocrlf=false core.eol=crlf file=LF_mix_CR
 
 expecting success: 
-			test_must_fail test-tool wildmatch wildmatch '+' '[,-.]'
-		
-ok 1353 - wildmatch: no match '+' '[,-.]'
+		compare_ws_file eol_crlf_crlf_false_attr_text_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 1123 - checkout attr=text ident aeol=lf core.autocrlf=false core.eol=crlf file=LF_nul
 
 expecting success: 
-				>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_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
 		test_cmp expect actual
-			
-ok 1354 - wildmatch (via ls-files): no match '[,-.]' '+'
+	
+ok 1124 - ls-files --eol attr=text ident aeol=crlf core.autocrlf=false core.eol=crlf
 
 expecting success: 
-			test_must_fail test-tool wildmatch iwildmatch '+' '[,-.]'
-		
-ok 1355 - iwildmatch: no match '+' '[,-.]'
+		compare_ws_file eol_crlf_crlf_false_attr_text_ CRLF    crlf_false_attr__LF.txt
+	
+ok 1125 - checkout attr=text ident aeol=crlf core.autocrlf=false core.eol=crlf file=LF
 
 expecting success: 
-				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[,-.]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1356 - iwildmatch (via ls-files): no match '[,-.]' '+'
+		compare_ws_file eol_crlf_crlf_false_attr_text_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 1126 - checkout attr=text ident aeol=crlf core.autocrlf=false core.eol=crlf file=CRLF
 
 expecting success: 
-			test_must_fail test-tool wildmatch pathmatch '+' '[,-.]'
-		
-ok 1357 - pathmatch: no match '+' '[,-.]'
+		compare_ws_file eol_crlf_crlf_false_attr_text_ CRLF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 1127 - checkout attr=text ident aeol=crlf core.autocrlf=false core.eol=crlf file=CRLF_mix_LF
 
 expecting success: 
-				>expect &&
-				git ls-files -z -- '[,-.]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1358 - pathmatch (via ls-files): no match '[,-.]' '+'
+		compare_ws_file eol_crlf_crlf_false_attr_text_ CRLF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 1128 - checkout attr=text ident aeol=crlf core.autocrlf=false core.eol=crlf file=LF_mix_CR
 
 expecting success: 
-			test_must_fail test-tool wildmatch ipathmatch '+' '[,-.]'
-		
-ok 1359 - ipathmatch: no match '+' '[,-.]'
+		compare_ws_file eol_crlf_crlf_false_attr_text_ CRLF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 1129 - checkout attr=text ident aeol=crlf core.autocrlf=false core.eol=crlf file=LF_nul
 
 expecting success: 
-				>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_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
 		test_cmp expect actual
-			
-ok 1360 - ipathmatch (via ls-files): no match '[,-.]' '+'
+	
+ok 1130 - ls-files --eol attr=auto ident aeol=lf core.autocrlf=false core.eol=crlf
 
 expecting success: 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
+		compare_ws_file eol_crlf_crlf_false_attr_auto_ LF    crlf_false_attr__LF.txt
 	
-Removing +
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 1361 - cleanup after previous file test
+ok 1131 - checkout attr=auto ident aeol=lf core.autocrlf=false core.eol=crlf file=LF
 
 expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
+		compare_ws_file eol_crlf_crlf_false_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 1362 - setup match file test for -.]
+ok 1132 - checkout attr=auto ident aeol=lf core.autocrlf=false core.eol=crlf file=CRLF
 
 expecting success: 
-			test_must_fail test-tool wildmatch wildmatch '-.]' '[,-.]'
-		
-ok 1363 - wildmatch: no match '-.]' '[,-.]'
+		compare_ws_file eol_crlf_crlf_false_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 1133 - checkout attr=auto ident aeol=lf core.autocrlf=false core.eol=crlf file=CRLF_mix_LF
 
 expecting success: 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- '[,-.]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1364 - wildmatch (via ls-files): no match '[,-.]' '-.]'
+		compare_ws_file eol_crlf_crlf_false_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 1134 - checkout attr=auto ident aeol=lf core.autocrlf=false core.eol=crlf file=LF_mix_CR
 
 expecting success: 
-			test_must_fail test-tool wildmatch iwildmatch '-.]' '[,-.]'
-		
-ok 1365 - iwildmatch: no match '-.]' '[,-.]'
+		compare_ws_file eol_crlf_crlf_false_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 1135 - checkout attr=auto ident aeol=lf core.autocrlf=false core.eol=crlf file=LF_nul
 
 expecting success: 
-				>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_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
 		test_cmp expect actual
-			
-ok 1366 - iwildmatch (via ls-files): no match '[,-.]' '-.]'
+	
+ok 1136 - ls-files --eol attr=auto ident aeol=crlf core.autocrlf=false core.eol=crlf
 
 expecting success: 
-			test_must_fail test-tool wildmatch pathmatch '-.]' '[,-.]'
-		
-ok 1367 - pathmatch: no match '-.]' '[,-.]'
+		compare_ws_file eol_crlf_crlf_false_attr_auto_ CRLF    crlf_false_attr__LF.txt
+	
+ok 1137 - checkout attr=auto ident aeol=crlf core.autocrlf=false core.eol=crlf file=LF
 
 expecting success: 
-				>expect &&
-				git ls-files -z -- '[,-.]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1368 - pathmatch (via ls-files): no match '[,-.]' '-.]'
+		compare_ws_file eol_crlf_crlf_false_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 1138 - checkout attr=auto ident aeol=crlf core.autocrlf=false core.eol=crlf file=CRLF
 
 expecting success: 
-			test_must_fail test-tool wildmatch ipathmatch '-.]' '[,-.]'
-		
-ok 1369 - ipathmatch: no match '-.]' '[,-.]'
+		compare_ws_file eol_crlf_crlf_false_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 1139 - checkout attr=auto ident aeol=crlf core.autocrlf=false core.eol=crlf file=CRLF_mix_LF
 
 expecting success: 
-				>expect &&
-				git --icase-pathspecs ls-files -z -- '[,-.]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1370 - ipathmatch (via ls-files): no match '[,-.]' '-.]'
+		compare_ws_file eol_crlf_crlf_false_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 1140 - checkout attr=auto ident aeol=crlf core.autocrlf=false core.eol=crlf file=LF_mix_CR
 
 expecting success: 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
+		compare_ws_file eol_crlf_crlf_false_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
 	
-Removing -.]
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 1371 - cleanup after previous file test
+ok 1141 - checkout attr=auto ident aeol=crlf core.autocrlf=false core.eol=crlf file=LF_nul
 
 expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
+		test_cmp expect actual
 	
-ok 1372 - setup match file test for 2
+ok 1142 - ls-files --eol attr=-text ident aeol= core.autocrlf=input core.eol=crlf
 
 expecting success: 
-			test-tool wildmatch wildmatch '2' '[\1-\3]'
-		
-ok 1373 - wildmatch: match '2' '[\1-\3]'
+		compare_ws_file eol_crlf_crlf_input_attr_-text_ LF    crlf_false_attr__LF.txt
+	
+ok 1143 - checkout attr=-text ident aeol= core.autocrlf=input core.eol=crlf file=LF
 
 expecting success: 
-				printf '%s' '2' >expect &&
-				git --glob-pathspecs ls-files -z -- '[\1-\3]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1374 - wildmatch (via ls-files): match '[\1-\3]' '2'
+		compare_ws_file eol_crlf_crlf_input_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 1144 - checkout attr=-text ident aeol= core.autocrlf=input core.eol=crlf file=CRLF
 
 expecting success: 
-			test-tool wildmatch iwildmatch '2' '[\1-\3]'
-		
-ok 1375 - iwildmatch: match '2' '[\1-\3]'
+		compare_ws_file eol_crlf_crlf_input_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 1145 - checkout attr=-text ident aeol= core.autocrlf=input core.eol=crlf file=CRLF_mix_LF
 
 expecting success: 
-				printf '%s' '2' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[\1-\3]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1376 - iwildmatch (via ls-files): match '[\1-\3]' '2'
+		compare_ws_file eol_crlf_crlf_input_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 1146 - checkout attr=-text ident aeol= core.autocrlf=input core.eol=crlf file=LF_mix_CR
 
 expecting success: 
-			test-tool wildmatch pathmatch '2' '[\1-\3]'
-		
-ok 1377 - pathmatch: match '2' '[\1-\3]'
+		compare_ws_file eol_crlf_crlf_input_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 1147 - checkout attr=-text ident aeol= core.autocrlf=input core.eol=crlf file=LF_nul
 
 expecting success: 
-				printf '%s' '2' >expect &&
-				git ls-files -z -- '[\1-\3]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
 		test_cmp expect actual
-			
-ok 1378 - pathmatch (via ls-files): match '[\1-\3]' '2'
+	
+ok 1148 - ls-files --eol attr=-text ident aeol=lf core.autocrlf=input core.eol=crlf
 
 expecting success: 
-			test-tool wildmatch ipathmatch '2' '[\1-\3]'
-		
-ok 1379 - ipathmatch: match '2' '[\1-\3]'
+		compare_ws_file eol_crlf_crlf_input_attr_-text_ LF    crlf_false_attr__LF.txt
+	
+ok 1149 - checkout attr=-text ident aeol=lf core.autocrlf=input core.eol=crlf file=LF
 
 expecting success: 
-				printf '%s' '2' >expect &&
-				git --icase-pathspecs ls-files -z -- '[\1-\3]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1380 - ipathmatch (via ls-files): match '[\1-\3]' '2'
+		compare_ws_file eol_crlf_crlf_input_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 1150 - checkout attr=-text ident aeol=lf core.autocrlf=input core.eol=crlf file=CRLF
 
 expecting success: 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
+		compare_ws_file eol_crlf_crlf_input_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
 	
-Removing 2
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 1381 - cleanup after previous file test
+ok 1151 - checkout attr=-text ident aeol=lf core.autocrlf=input core.eol=crlf file=CRLF_mix_LF
 
 expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
+		compare_ws_file eol_crlf_crlf_input_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 1382 - setup match file test for 3
+ok 1152 - checkout attr=-text ident aeol=lf core.autocrlf=input core.eol=crlf file=LF_mix_CR
 
 expecting success: 
-			test-tool wildmatch wildmatch '3' '[\1-\3]'
-		
-ok 1383 - wildmatch: match '3' '[\1-\3]'
+		compare_ws_file eol_crlf_crlf_input_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 1153 - checkout attr=-text ident aeol=lf core.autocrlf=input core.eol=crlf file=LF_nul
 
 expecting success: 
-				printf '%s' '3' >expect &&
-				git --glob-pathspecs ls-files -z -- '[\1-\3]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
 		test_cmp expect actual
-			
-ok 1384 - wildmatch (via ls-files): match '[\1-\3]' '3'
+	
+ok 1154 - ls-files --eol attr=-text ident aeol=crlf core.autocrlf=input core.eol=crlf
 
 expecting success: 
-			test-tool wildmatch iwildmatch '3' '[\1-\3]'
-		
-ok 1385 - iwildmatch: match '3' '[\1-\3]'
+		compare_ws_file eol_crlf_crlf_input_attr_-text_ LF    crlf_false_attr__LF.txt
+	
+ok 1155 - checkout attr=-text ident aeol=crlf core.autocrlf=input core.eol=crlf file=LF
 
 expecting success: 
-				printf '%s' '3' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[\1-\3]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1386 - iwildmatch (via ls-files): match '[\1-\3]' '3'
+		compare_ws_file eol_crlf_crlf_input_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 1156 - checkout attr=-text ident aeol=crlf core.autocrlf=input core.eol=crlf file=CRLF
 
 expecting success: 
-			test-tool wildmatch pathmatch '3' '[\1-\3]'
-		
-ok 1387 - pathmatch: match '3' '[\1-\3]'
+		compare_ws_file eol_crlf_crlf_input_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 1157 - checkout attr=-text ident aeol=crlf core.autocrlf=input core.eol=crlf file=CRLF_mix_LF
 
 expecting success: 
-				printf '%s' '3' >expect &&
-				git ls-files -z -- '[\1-\3]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1388 - pathmatch (via ls-files): match '[\1-\3]' '3'
+		compare_ws_file eol_crlf_crlf_input_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 1158 - checkout attr=-text ident aeol=crlf core.autocrlf=input core.eol=crlf file=LF_mix_CR
 
 expecting success: 
-			test-tool wildmatch ipathmatch '3' '[\1-\3]'
-		
-ok 1389 - ipathmatch: match '3' '[\1-\3]'
+		compare_ws_file eol_crlf_crlf_input_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 1159 - checkout attr=-text ident aeol=crlf core.autocrlf=input core.eol=crlf file=LF_nul
 
 expecting success: 
-				printf '%s' '3' >expect &&
-				git --icase-pathspecs ls-files -z -- '[\1-\3]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
 		test_cmp expect actual
-			
-ok 1390 - ipathmatch (via ls-files): match '[\1-\3]' '3'
+	
+ok 1160 - ls-files --eol attr=text ident aeol=lf core.autocrlf=input core.eol=crlf
 
 expecting success: 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
+		compare_ws_file eol_crlf_crlf_input_attr_text_ LF    crlf_false_attr__LF.txt
 	
-Removing 3
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 1391 - cleanup after previous file test
+ok 1161 - checkout attr=text ident aeol=lf core.autocrlf=input core.eol=crlf file=LF
 
 expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
+		compare_ws_file eol_crlf_crlf_input_attr_text_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 1392 - setup match file test for 4
+ok 1162 - checkout attr=text ident aeol=lf core.autocrlf=input core.eol=crlf file=CRLF
 
 expecting success: 
-			test_must_fail test-tool wildmatch wildmatch '4' '[\1-\3]'
-		
-ok 1393 - wildmatch: no match '4' '[\1-\3]'
+		compare_ws_file eol_crlf_crlf_input_attr_text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 1163 - checkout attr=text ident aeol=lf core.autocrlf=input core.eol=crlf file=CRLF_mix_LF
 
 expecting success: 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- '[\1-\3]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1394 - wildmatch (via ls-files): no match '[\1-\3]' '4'
+		compare_ws_file eol_crlf_crlf_input_attr_text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 1164 - checkout attr=text ident aeol=lf core.autocrlf=input core.eol=crlf file=LF_mix_CR
 
 expecting success: 
-			test_must_fail test-tool wildmatch iwildmatch '4' '[\1-\3]'
-		
-ok 1395 - iwildmatch: no match '4' '[\1-\3]'
+		compare_ws_file eol_crlf_crlf_input_attr_text_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 1165 - checkout attr=text ident aeol=lf core.autocrlf=input core.eol=crlf file=LF_nul
 
 expecting success: 
-				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[\1-\3]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
 		test_cmp expect actual
-			
-ok 1396 - iwildmatch (via ls-files): no match '[\1-\3]' '4'
+	
+ok 1166 - ls-files --eol attr=text ident aeol=crlf core.autocrlf=input core.eol=crlf
 
 expecting success: 
-			test_must_fail test-tool wildmatch pathmatch '4' '[\1-\3]'
-		
-ok 1397 - pathmatch: no match '4' '[\1-\3]'
+		compare_ws_file eol_crlf_crlf_input_attr_text_ CRLF    crlf_false_attr__LF.txt
+	
+ok 1167 - checkout attr=text ident aeol=crlf core.autocrlf=input core.eol=crlf file=LF
 
 expecting success: 
-				>expect &&
-				git ls-files -z -- '[\1-\3]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1398 - pathmatch (via ls-files): no match '[\1-\3]' '4'
+		compare_ws_file eol_crlf_crlf_input_attr_text_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 1168 - checkout attr=text ident aeol=crlf core.autocrlf=input core.eol=crlf file=CRLF
 
 expecting success: 
-			test_must_fail test-tool wildmatch ipathmatch '4' '[\1-\3]'
-		
-ok 1399 - ipathmatch: no match '4' '[\1-\3]'
+		compare_ws_file eol_crlf_crlf_input_attr_text_ CRLF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 1169 - checkout attr=text ident aeol=crlf core.autocrlf=input core.eol=crlf file=CRLF_mix_LF
 
 expecting success: 
-				>expect &&
-				git --icase-pathspecs ls-files -z -- '[\1-\3]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1400 - ipathmatch (via ls-files): no match '[\1-\3]' '4'
+		compare_ws_file eol_crlf_crlf_input_attr_text_ CRLF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 1170 - checkout attr=text ident aeol=crlf core.autocrlf=input core.eol=crlf file=LF_mix_CR
 
 expecting success: 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
+		compare_ws_file eol_crlf_crlf_input_attr_text_ CRLF_nul   crlf_false_attr__LF_nul.txt
 	
-Removing 4
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 1401 - cleanup after previous file test
+ok 1171 - checkout attr=text ident aeol=crlf core.autocrlf=input core.eol=crlf file=LF_nul
 
 expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
+		test_cmp expect actual
 	
-ok 1402 - setup match file test for \
+ok 1172 - ls-files --eol attr=auto ident aeol=lf core.autocrlf=input core.eol=crlf
 
 expecting success: 
-			test-tool wildmatch wildmatch '\' '[[-\]]'
-		
-ok 1403 - wildmatch: match '\' '[[-\]]'
+		compare_ws_file eol_crlf_crlf_input_attr_auto_ LF    crlf_false_attr__LF.txt
+	
+ok 1173 - checkout attr=auto ident aeol=lf core.autocrlf=input core.eol=crlf file=LF
 
 expecting success: 
-				printf '%s' '\' >expect &&
-				git --glob-pathspecs ls-files -z -- '[[-\]]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1404 - wildmatch (via ls-files): match '[[-\]]' '\'
+		compare_ws_file eol_crlf_crlf_input_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 1174 - checkout attr=auto ident aeol=lf core.autocrlf=input core.eol=crlf file=CRLF
 
 expecting success: 
-			test-tool wildmatch iwildmatch '\' '[[-\]]'
-		
-ok 1405 - iwildmatch: match '\' '[[-\]]'
+		compare_ws_file eol_crlf_crlf_input_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 1175 - checkout attr=auto ident aeol=lf core.autocrlf=input core.eol=crlf file=CRLF_mix_LF
 
 expecting success: 
-				printf '%s' '\' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[[-\]]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1406 - iwildmatch (via ls-files): match '[[-\]]' '\'
+		compare_ws_file eol_crlf_crlf_input_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 1176 - checkout attr=auto ident aeol=lf core.autocrlf=input core.eol=crlf file=LF_mix_CR
 
 expecting success: 
-			test-tool wildmatch pathmatch '\' '[[-\]]'
-		
-ok 1407 - pathmatch: match '\' '[[-\]]'
+		compare_ws_file eol_crlf_crlf_input_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 1177 - checkout attr=auto ident aeol=lf core.autocrlf=input core.eol=crlf file=LF_nul
 
 expecting success: 
-				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_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
 		test_cmp expect actual
-			
-ok 1408 - pathmatch (via ls-files): match '[[-\]]' '\'
+	
+ok 1178 - ls-files --eol attr=auto ident aeol=crlf core.autocrlf=input core.eol=crlf
 
 expecting success: 
-			test-tool wildmatch ipathmatch '\' '[[-\]]'
-		
-ok 1409 - ipathmatch: match '\' '[[-\]]'
+		compare_ws_file eol_crlf_crlf_input_attr_auto_ CRLF    crlf_false_attr__LF.txt
+	
+ok 1179 - checkout attr=auto ident aeol=crlf core.autocrlf=input core.eol=crlf file=LF
 
 expecting success: 
-				printf '%s' '\' >expect &&
-				git --icase-pathspecs ls-files -z -- '[[-\]]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1410 - ipathmatch (via ls-files): match '[[-\]]' '\'
+		compare_ws_file eol_crlf_crlf_input_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 1180 - checkout attr=auto ident aeol=crlf core.autocrlf=input core.eol=crlf file=CRLF
 
 expecting success: 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
+		compare_ws_file eol_crlf_crlf_input_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
 	
-Removing "\\"
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 1411 - cleanup after previous file test
+ok 1181 - checkout attr=auto ident aeol=crlf core.autocrlf=input core.eol=crlf file=CRLF_mix_LF
 
 expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
+		compare_ws_file eol_crlf_crlf_input_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 1412 - setup match file test for [
+ok 1182 - checkout attr=auto ident aeol=crlf core.autocrlf=input core.eol=crlf file=LF_mix_CR
 
 expecting success: 
-			test-tool wildmatch wildmatch '[' '[[-\]]'
-		
-ok 1413 - wildmatch: match '[' '[[-\]]'
+		compare_ws_file eol_crlf_crlf_input_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 1183 - checkout attr=auto ident aeol=crlf core.autocrlf=input core.eol=crlf file=LF_nul
 
 expecting success: 
-				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_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
 		test_cmp expect actual
-			
-ok 1414 - wildmatch (via ls-files): match '[[-\]]' '['
+	
+ok 1184 - ls-files --eol attr= ident aeol= core.autocrlf=false core.eol=crlf
 
 expecting success: 
-			test-tool wildmatch iwildmatch '[' '[[-\]]'
-		
-ok 1415 - iwildmatch: match '[' '[[-\]]'
+		compare_ws_file eol_crlf_crlf_false_attr__ LF    crlf_false_attr__LF.txt
+	
+ok 1185 - checkout attr= ident aeol= core.autocrlf=false core.eol=crlf file=LF
 
 expecting success: 
-				printf '%s' '[' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[[-\]]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1416 - iwildmatch (via ls-files): match '[[-\]]' '['
+		compare_ws_file eol_crlf_crlf_false_attr__ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 1186 - checkout attr= ident aeol= core.autocrlf=false core.eol=crlf file=CRLF
 
 expecting success: 
-			test-tool wildmatch pathmatch '[' '[[-\]]'
-		
-ok 1417 - pathmatch: match '[' '[[-\]]'
+		compare_ws_file eol_crlf_crlf_false_attr__ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 1187 - checkout attr= ident aeol= core.autocrlf=false core.eol=crlf file=CRLF_mix_LF
 
 expecting success: 
-				printf '%s' '[' >expect &&
-				git ls-files -z -- '[[-\]]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1418 - pathmatch (via ls-files): match '[[-\]]' '['
+		compare_ws_file eol_crlf_crlf_false_attr__ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 1188 - checkout attr= ident aeol= core.autocrlf=false core.eol=crlf file=LF_mix_CR
 
 expecting success: 
-			test-tool wildmatch ipathmatch '[' '[[-\]]'
-		
-ok 1419 - ipathmatch: match '[' '[[-\]]'
+		compare_ws_file eol_crlf_crlf_false_attr__ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 1189 - checkout attr= ident aeol= core.autocrlf=false core.eol=crlf file=LF_nul
 
 expecting success: 
-				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_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
 		test_cmp expect actual
-			
-ok 1420 - ipathmatch (via ls-files): match '[[-\]]' '['
+	
+ok 1190 - ls-files --eol attr= ident aeol= core.autocrlf=true core.eol=crlf
 
 expecting success: 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
+		compare_ws_file eol_crlf_crlf_true_attr__ CRLF    crlf_false_attr__LF.txt
 	
-Removing [
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 1421 - cleanup after previous file test
+ok 1191 - checkout attr= ident aeol= core.autocrlf=true core.eol=crlf file=LF
 
 expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
+		compare_ws_file eol_crlf_crlf_true_attr__ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 1422 - setup match file test for ]
+ok 1192 - checkout attr= ident aeol= core.autocrlf=true core.eol=crlf file=CRLF
 
 expecting success: 
-			test-tool wildmatch wildmatch ']' '[[-\]]'
-		
-ok 1423 - wildmatch: match ']' '[[-\]]'
+		compare_ws_file eol_crlf_crlf_true_attr__ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 1193 - checkout attr= ident aeol= core.autocrlf=true core.eol=crlf file=CRLF_mix_LF
 
 expecting success: 
-				printf '%s' ']' >expect &&
-				git --glob-pathspecs ls-files -z -- '[[-\]]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1424 - wildmatch (via ls-files): match '[[-\]]' ']'
+		compare_ws_file eol_crlf_crlf_true_attr__ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 1194 - checkout attr= ident aeol= core.autocrlf=true core.eol=crlf file=LF_mix_CR
 
 expecting success: 
-			test-tool wildmatch iwildmatch ']' '[[-\]]'
-		
-ok 1425 - iwildmatch: match ']' '[[-\]]'
+		compare_ws_file eol_crlf_crlf_true_attr__ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 1195 - checkout attr= ident aeol= core.autocrlf=true core.eol=crlf file=LF_nul
 
 expecting success: 
-				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_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
 		test_cmp expect actual
-			
-ok 1426 - iwildmatch (via ls-files): match '[[-\]]' ']'
+	
+ok 1196 - ls-files --eol attr=auto ident aeol= core.autocrlf=true core.eol=crlf
 
 expecting success: 
-			test-tool wildmatch pathmatch ']' '[[-\]]'
-		
-ok 1427 - pathmatch: match ']' '[[-\]]'
+		compare_ws_file eol_crlf_crlf_true_attr_auto_ CRLF    crlf_false_attr__LF.txt
+	
+ok 1197 - checkout attr=auto ident aeol= core.autocrlf=true core.eol=crlf file=LF
 
 expecting success: 
-				printf '%s' ']' >expect &&
-				git ls-files -z -- '[[-\]]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1428 - pathmatch (via ls-files): match '[[-\]]' ']'
+		compare_ws_file eol_crlf_crlf_true_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 1198 - checkout attr=auto ident aeol= core.autocrlf=true core.eol=crlf file=CRLF
 
 expecting success: 
-			test-tool wildmatch ipathmatch ']' '[[-\]]'
-		
-ok 1429 - ipathmatch: match ']' '[[-\]]'
+		compare_ws_file eol_crlf_crlf_true_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 1199 - checkout attr=auto ident aeol= core.autocrlf=true core.eol=crlf file=CRLF_mix_LF
 
 expecting success: 
-				printf '%s' ']' >expect &&
-				git --icase-pathspecs ls-files -z -- '[[-\]]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1430 - ipathmatch (via ls-files): match '[[-\]]' ']'
+		compare_ws_file eol_crlf_crlf_true_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 1200 - checkout attr=auto ident aeol= core.autocrlf=true core.eol=crlf file=LF_mix_CR
 
 expecting success: 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
+		compare_ws_file eol_crlf_crlf_true_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
 	
-Removing ]
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 1431 - cleanup after previous file test
+ok 1201 - checkout attr=auto ident aeol= core.autocrlf=true core.eol=crlf file=LF_nul
 
 expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
+		test_cmp expect actual
 	
-ok 1432 - setup match file test for -
+ok 1202 - ls-files --eol attr=text ident aeol= core.autocrlf=true core.eol=crlf
 
 expecting success: 
-			test_must_fail test-tool wildmatch wildmatch '-' '[[-\]]'
-		
-ok 1433 - wildmatch: no match '-' '[[-\]]'
+		compare_ws_file eol_crlf_crlf_true_attr_text_ CRLF    crlf_false_attr__LF.txt
+	
+ok 1203 - checkout attr=text ident aeol= core.autocrlf=true core.eol=crlf file=LF
 
 expecting success: 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- '[[-\]]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1434 - wildmatch (via ls-files): no match '[[-\]]' '-'
+		compare_ws_file eol_crlf_crlf_true_attr_text_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 1204 - checkout attr=text ident aeol= core.autocrlf=true core.eol=crlf file=CRLF
 
 expecting success: 
-			test_must_fail test-tool wildmatch iwildmatch '-' '[[-\]]'
-		
-ok 1435 - iwildmatch: no match '-' '[[-\]]'
+		compare_ws_file eol_crlf_crlf_true_attr_text_ CRLF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 1205 - checkout attr=text ident aeol= core.autocrlf=true core.eol=crlf file=CRLF_mix_LF
 
 expecting success: 
-				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[[-\]]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1436 - iwildmatch (via ls-files): no match '[[-\]]' '-'
+		compare_ws_file eol_crlf_crlf_true_attr_text_ CRLF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 1206 - checkout attr=text ident aeol= core.autocrlf=true core.eol=crlf file=LF_mix_CR
 
 expecting success: 
-			test_must_fail test-tool wildmatch pathmatch '-' '[[-\]]'
-		
-ok 1437 - pathmatch: no match '-' '[[-\]]'
+		compare_ws_file eol_crlf_crlf_true_attr_text_ CRLF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 1207 - checkout attr=text ident aeol= core.autocrlf=true core.eol=crlf file=LF_nul
 
 expecting success: 
-				>expect &&
-				git ls-files -z -- '[[-\]]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
 		test_cmp expect actual
-			
-ok 1438 - pathmatch (via ls-files): no match '[[-\]]' '-'
+	
+ok 1208 - ls-files --eol attr=text ident aeol= core.autocrlf=input core.eol=crlf
 
 expecting success: 
-			test_must_fail test-tool wildmatch ipathmatch '-' '[[-\]]'
-		
-ok 1439 - ipathmatch: no match '-' '[[-\]]'
+		compare_ws_file eol_crlf_crlf_input_attr_text_ LF    crlf_false_attr__LF.txt
+	
+ok 1209 - checkout attr=text ident aeol= core.autocrlf=input core.eol=crlf file=LF
 
 expecting success: 
-				>expect &&
-				git --icase-pathspecs ls-files -z -- '[[-\]]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1440 - ipathmatch (via ls-files): no match '[[-\]]' '-'
+		compare_ws_file eol_crlf_crlf_input_attr_text_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 1210 - checkout attr=text ident aeol= core.autocrlf=input core.eol=crlf file=CRLF
 
 expecting success: 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
+		compare_ws_file eol_crlf_crlf_input_attr_text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
 	
-Removing -
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 1441 - cleanup after previous file test
+ok 1211 - checkout attr=text ident aeol= core.autocrlf=input core.eol=crlf file=CRLF_mix_LF
 
 expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
+		compare_ws_file eol_crlf_crlf_input_attr_text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 1442 - setup match file test for -adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1
+ok 1212 - checkout attr=text ident aeol= core.autocrlf=input core.eol=crlf file=LF_mix_CR
 
 expecting success: 
-			test-tool wildmatch wildmatch '-adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
-		
-ok 1443 - wildmatch: match '-adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
+		compare_ws_file eol_crlf_crlf_input_attr_text_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 1213 - checkout attr=text ident aeol= core.autocrlf=input core.eol=crlf file=LF_nul
 
 expecting success: 
-				printf '%s' '-adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1' >expect &&
-				git --glob-pathspecs ls-files -z -- '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
 		test_cmp expect actual
-			
-ok 1444 - wildmatch (via ls-files): match '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' '-adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1'
+	
+ok 1214 - ls-files --eol attr=auto ident aeol= core.autocrlf=input core.eol=crlf
 
 expecting success: 
-			test-tool wildmatch iwildmatch '-adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
-		
-ok 1445 - iwildmatch: match '-adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
+		compare_ws_file eol_crlf_crlf_input_attr_auto_ LF    crlf_false_attr__LF.txt
+	
+ok 1215 - checkout attr=auto ident aeol= core.autocrlf=input core.eol=crlf file=LF
 
 expecting success: 
-				printf '%s' '-adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1446 - iwildmatch (via ls-files): match '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' '-adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1'
+		compare_ws_file eol_crlf_crlf_input_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 1216 - checkout attr=auto ident aeol= core.autocrlf=input core.eol=crlf file=CRLF
 
 expecting success: 
-			test-tool wildmatch pathmatch '-adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
-		
-ok 1447 - pathmatch: match '-adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
+		compare_ws_file eol_crlf_crlf_input_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 1217 - checkout attr=auto ident aeol= core.autocrlf=input core.eol=crlf file=CRLF_mix_LF
 
 expecting success: 
-				printf '%s' '-adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1' >expect &&
-				git ls-files -z -- '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1448 - pathmatch (via ls-files): match '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' '-adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1'
+		compare_ws_file eol_crlf_crlf_input_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 1218 - checkout attr=auto ident aeol= core.autocrlf=input core.eol=crlf file=LF_mix_CR
 
 expecting success: 
-			test-tool wildmatch ipathmatch '-adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
-		
-ok 1449 - ipathmatch: match '-adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
+		compare_ws_file eol_crlf_crlf_input_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 1219 - checkout attr=auto ident aeol= core.autocrlf=input core.eol=crlf file=LF_nul
 
 expecting success: 
-				printf '%s' '-adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1' >expect &&
-				git --icase-pathspecs ls-files -z -- '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
 		test_cmp expect actual
-			
-ok 1450 - ipathmatch (via ls-files): match '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' '-adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1'
+	
+ok 1220 - ls-files --eol attr=-text ident aeol= core.autocrlf=true core.eol=native
 
 expecting success: 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
+		compare_ws_file eol_native_crlf_true_attr_-text_ LF    crlf_false_attr__LF.txt
 	
-Removing -adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 1451 - cleanup after previous file test
+ok 1221 - checkout attr=-text ident aeol= core.autocrlf=true core.eol=native file=LF
 
 expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
+		compare_ws_file eol_native_crlf_true_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 1452 - setup match file test for -adobe-courier-bold-o-normal--12-120-75-75-X-70-iso8859-1
+ok 1222 - checkout attr=-text ident aeol= core.autocrlf=true core.eol=native file=CRLF
 
 expecting success: 
-			test_must_fail test-tool wildmatch wildmatch '-adobe-courier-bold-o-normal--12-120-75-75-X-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
-		
-ok 1453 - wildmatch: no match '-adobe-courier-bold-o-normal--12-120-75-75-X-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
+		compare_ws_file eol_native_crlf_true_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 1223 - checkout attr=-text ident aeol= core.autocrlf=true core.eol=native file=CRLF_mix_LF
 
 expecting success: 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1454 - wildmatch (via ls-files): no match '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' '-adobe-courier-bold-o-normal--12-120-75-75-X-70-iso8859-1'
+		compare_ws_file eol_native_crlf_true_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 1224 - checkout attr=-text ident aeol= core.autocrlf=true core.eol=native file=LF_mix_CR
 
 expecting success: 
-			test_must_fail test-tool wildmatch iwildmatch '-adobe-courier-bold-o-normal--12-120-75-75-X-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
-		
-ok 1455 - iwildmatch: no match '-adobe-courier-bold-o-normal--12-120-75-75-X-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
+		compare_ws_file eol_native_crlf_true_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 1225 - checkout attr=-text ident aeol= core.autocrlf=true core.eol=native file=LF_nul
 
 expecting success: 
-				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
 		test_cmp expect actual
-			
-ok 1456 - iwildmatch (via ls-files): no match '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' '-adobe-courier-bold-o-normal--12-120-75-75-X-70-iso8859-1'
+	
+ok 1226 - ls-files --eol attr=-text ident aeol=lf core.autocrlf=true core.eol=native
 
 expecting success: 
-			test_must_fail test-tool wildmatch pathmatch '-adobe-courier-bold-o-normal--12-120-75-75-X-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
-		
-ok 1457 - pathmatch: no match '-adobe-courier-bold-o-normal--12-120-75-75-X-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
+		compare_ws_file eol_native_crlf_true_attr_-text_ LF    crlf_false_attr__LF.txt
+	
+ok 1227 - checkout attr=-text ident aeol=lf core.autocrlf=true core.eol=native file=LF
 
 expecting success: 
-				>expect &&
-				git ls-files -z -- '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1458 - pathmatch (via ls-files): no match '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' '-adobe-courier-bold-o-normal--12-120-75-75-X-70-iso8859-1'
+		compare_ws_file eol_native_crlf_true_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 1228 - checkout attr=-text ident aeol=lf core.autocrlf=true core.eol=native file=CRLF
 
 expecting success: 
-			test_must_fail test-tool wildmatch ipathmatch '-adobe-courier-bold-o-normal--12-120-75-75-X-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
-		
-ok 1459 - ipathmatch: no match '-adobe-courier-bold-o-normal--12-120-75-75-X-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
+		compare_ws_file eol_native_crlf_true_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 1229 - checkout attr=-text ident aeol=lf core.autocrlf=true core.eol=native file=CRLF_mix_LF
 
 expecting success: 
-				>expect &&
-				git --icase-pathspecs ls-files -z -- '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1460 - ipathmatch (via ls-files): no match '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' '-adobe-courier-bold-o-normal--12-120-75-75-X-70-iso8859-1'
+		compare_ws_file eol_native_crlf_true_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 1230 - checkout attr=-text ident aeol=lf core.autocrlf=true core.eol=native file=LF_mix_CR
 
 expecting success: 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
+		compare_ws_file eol_native_crlf_true_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
 	
-Removing -adobe-courier-bold-o-normal--12-120-75-75-X-70-iso8859-1
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 1461 - cleanup after previous file test
+ok 1231 - checkout attr=-text ident aeol=lf core.autocrlf=true core.eol=native file=LF_nul
 
 expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
+		test_cmp expect actual
 	
-ok 1462 - setup match file test for -adobe-courier-bold-o-normal--12-120-75-75-/-70-iso8859-1
+ok 1232 - ls-files --eol attr=-text ident aeol=crlf core.autocrlf=true core.eol=native
 
 expecting success: 
-			test_must_fail test-tool wildmatch wildmatch '-adobe-courier-bold-o-normal--12-120-75-75-/-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
-		
-ok 1463 - wildmatch: no match '-adobe-courier-bold-o-normal--12-120-75-75-/-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
+		compare_ws_file eol_native_crlf_true_attr_-text_ LF    crlf_false_attr__LF.txt
+	
+ok 1233 - checkout attr=-text ident aeol=crlf core.autocrlf=true core.eol=native file=LF
 
 expecting success: 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1464 - wildmatch (via ls-files): no match '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' '-adobe-courier-bold-o-normal--12-120-75-75-/-70-iso8859-1'
+		compare_ws_file eol_native_crlf_true_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 1234 - checkout attr=-text ident aeol=crlf core.autocrlf=true core.eol=native file=CRLF
 
 expecting success: 
-			test_must_fail test-tool wildmatch iwildmatch '-adobe-courier-bold-o-normal--12-120-75-75-/-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
-		
-ok 1465 - iwildmatch: no match '-adobe-courier-bold-o-normal--12-120-75-75-/-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
+		compare_ws_file eol_native_crlf_true_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 1235 - checkout attr=-text ident aeol=crlf core.autocrlf=true core.eol=native file=CRLF_mix_LF
 
 expecting success: 
-				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1466 - iwildmatch (via ls-files): no match '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' '-adobe-courier-bold-o-normal--12-120-75-75-/-70-iso8859-1'
+		compare_ws_file eol_native_crlf_true_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 1236 - checkout attr=-text ident aeol=crlf core.autocrlf=true core.eol=native file=LF_mix_CR
 
 expecting success: 
-			test_must_fail test-tool wildmatch pathmatch '-adobe-courier-bold-o-normal--12-120-75-75-/-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
-		
-ok 1467 - pathmatch: no match '-adobe-courier-bold-o-normal--12-120-75-75-/-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
+		compare_ws_file eol_native_crlf_true_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 1237 - checkout attr=-text ident aeol=crlf core.autocrlf=true core.eol=native file=LF_nul
 
 expecting success: 
-				>expect &&
-				git ls-files -z -- '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
 		test_cmp expect actual
-			
-ok 1468 - pathmatch (via ls-files): no match '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' '-adobe-courier-bold-o-normal--12-120-75-75-/-70-iso8859-1'
+	
+ok 1238 - ls-files --eol attr=text ident aeol=lf core.autocrlf=true core.eol=native
 
 expecting success: 
-			test_must_fail test-tool wildmatch ipathmatch '-adobe-courier-bold-o-normal--12-120-75-75-/-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
-		
-ok 1469 - ipathmatch: no match '-adobe-courier-bold-o-normal--12-120-75-75-/-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
+		compare_ws_file eol_native_crlf_true_attr_text_ LF    crlf_false_attr__LF.txt
+	
+ok 1239 - checkout attr=text ident aeol=lf core.autocrlf=true core.eol=native file=LF
 
 expecting success: 
-				>expect &&
-				git --icase-pathspecs ls-files -z -- '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1470 - ipathmatch (via ls-files): no match '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' '-adobe-courier-bold-o-normal--12-120-75-75-/-70-iso8859-1'
+		compare_ws_file eol_native_crlf_true_attr_text_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 1240 - checkout attr=text ident aeol=lf core.autocrlf=true core.eol=native file=CRLF
 
 expecting success: 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
+		compare_ws_file eol_native_crlf_true_attr_text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
 	
-Removing -adobe-courier-bold-o-normal--12-120-75-75-/
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 1471 - cleanup after previous file test
+ok 1241 - checkout attr=text ident aeol=lf core.autocrlf=true core.eol=native file=CRLF_mix_LF
 
 expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
+		compare_ws_file eol_native_crlf_true_attr_text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 1472 - setup match file test for XXX/adobe/courier/bold/o/normal//12/120/75/75/m/70/iso8859/1
+ok 1242 - checkout attr=text ident aeol=lf core.autocrlf=true core.eol=native file=LF_mix_CR
 
 expecting success: 
-			test-tool wildmatch wildmatch 'XXX/adobe/courier/bold/o/normal//12/120/75/75/m/70/iso8859/1' 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*'
-		
-ok 1473 - wildmatch: match 'XXX/adobe/courier/bold/o/normal//12/120/75/75/m/70/iso8859/1' 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*'
-
-checking known breakage: false
-not ok 1474 - wildmatch (via ls-files): match skip 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*' 'XXX/adobe/courier/bold/o/normal//12/120/75/75/m/70/iso8859/1' # TODO known breakage
+		compare_ws_file eol_native_crlf_true_attr_text_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 1243 - checkout attr=text ident aeol=lf core.autocrlf=true core.eol=native file=LF_nul
 
 expecting success: 
-			test-tool wildmatch iwildmatch 'XXX/adobe/courier/bold/o/normal//12/120/75/75/m/70/iso8859/1' 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*'
-		
-ok 1475 - iwildmatch: match 'XXX/adobe/courier/bold/o/normal//12/120/75/75/m/70/iso8859/1' 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*'
-
-checking known breakage: false
-not ok 1476 - iwildmatch (via ls-files): match skip 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*' 'XXX/adobe/courier/bold/o/normal//12/120/75/75/m/70/iso8859/1' # TODO known breakage
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
+		test_cmp expect actual
+	
+ok 1244 - ls-files --eol attr=text ident aeol=crlf core.autocrlf=true core.eol=native
 
 expecting success: 
-			test-tool wildmatch pathmatch 'XXX/adobe/courier/bold/o/normal//12/120/75/75/m/70/iso8859/1' 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*'
-		
-ok 1477 - pathmatch: match 'XXX/adobe/courier/bold/o/normal//12/120/75/75/m/70/iso8859/1' 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*'
-
-checking known breakage: false
-not ok 1478 - pathmatch (via ls-files): match skip 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*' 'XXX/adobe/courier/bold/o/normal//12/120/75/75/m/70/iso8859/1' # TODO known breakage
+		compare_ws_file eol_native_crlf_true_attr_text_ CRLF    crlf_false_attr__LF.txt
+	
+ok 1245 - checkout attr=text ident aeol=crlf core.autocrlf=true core.eol=native file=LF
 
 expecting success: 
-			test-tool wildmatch ipathmatch 'XXX/adobe/courier/bold/o/normal//12/120/75/75/m/70/iso8859/1' 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*'
-		
-ok 1479 - ipathmatch: match 'XXX/adobe/courier/bold/o/normal//12/120/75/75/m/70/iso8859/1' 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*'
-
-checking known breakage: false
-not ok 1480 - ipathmatch (via ls-files): match skip 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*' 'XXX/adobe/courier/bold/o/normal//12/120/75/75/m/70/iso8859/1' # TODO known breakage
+		compare_ws_file eol_native_crlf_true_attr_text_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 1246 - checkout attr=text ident aeol=crlf core.autocrlf=true core.eol=native file=CRLF
 
 expecting success: 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
+		compare_ws_file eol_native_crlf_true_attr_text_ CRLF crlf_false_attr__CRLF_mix_LF.txt
 	
-ok 1481 - cleanup after previous file test
+ok 1247 - checkout attr=text ident aeol=crlf core.autocrlf=true core.eol=native file=CRLF_mix_LF
 
 expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
+		compare_ws_file eol_native_crlf_true_attr_text_ CRLF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 1482 - setup match file test for XXX/adobe/courier/bold/o/normal//12/120/75/75/X/70/iso8859/1
+ok 1248 - checkout attr=text ident aeol=crlf core.autocrlf=true core.eol=native file=LF_mix_CR
 
 expecting success: 
-			test_must_fail test-tool wildmatch wildmatch 'XXX/adobe/courier/bold/o/normal//12/120/75/75/X/70/iso8859/1' 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*'
-		
-ok 1483 - wildmatch: no match 'XXX/adobe/courier/bold/o/normal//12/120/75/75/X/70/iso8859/1' 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*'
+		compare_ws_file eol_native_crlf_true_attr_text_ CRLF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 1249 - checkout attr=text ident aeol=crlf core.autocrlf=true core.eol=native file=LF_nul
 
-checking known breakage: false
-not ok 1484 - wildmatch (via ls-files): no match skip 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*' 'XXX/adobe/courier/bold/o/normal//12/120/75/75/X/70/iso8859/1' # TODO known breakage
+expecting success: 
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
+		test_cmp expect actual
+	
+ok 1250 - ls-files --eol attr=auto ident aeol=lf core.autocrlf=true core.eol=native
 
 expecting success: 
-			test_must_fail test-tool wildmatch iwildmatch 'XXX/adobe/courier/bold/o/normal//12/120/75/75/X/70/iso8859/1' 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*'
-		
-ok 1485 - iwildmatch: no match 'XXX/adobe/courier/bold/o/normal//12/120/75/75/X/70/iso8859/1' 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*'
+		compare_ws_file eol_native_crlf_true_attr_auto_ LF    crlf_false_attr__LF.txt
+	
+ok 1251 - checkout attr=auto ident aeol=lf core.autocrlf=true core.eol=native file=LF
 
-checking known breakage: false
-not ok 1486 - iwildmatch (via ls-files): no match skip 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*' 'XXX/adobe/courier/bold/o/normal//12/120/75/75/X/70/iso8859/1' # TODO known breakage
+expecting success: 
+		compare_ws_file eol_native_crlf_true_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 1252 - checkout attr=auto ident aeol=lf core.autocrlf=true core.eol=native file=CRLF
 
 expecting success: 
-			test_must_fail test-tool wildmatch pathmatch 'XXX/adobe/courier/bold/o/normal//12/120/75/75/X/70/iso8859/1' 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*'
-		
-ok 1487 - pathmatch: no match 'XXX/adobe/courier/bold/o/normal//12/120/75/75/X/70/iso8859/1' 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*'
+		compare_ws_file eol_native_crlf_true_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 1253 - checkout attr=auto ident aeol=lf core.autocrlf=true core.eol=native file=CRLF_mix_LF
 
-checking known breakage: false
-not ok 1488 - pathmatch (via ls-files): no match skip 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*' 'XXX/adobe/courier/bold/o/normal//12/120/75/75/X/70/iso8859/1' # TODO known breakage
+expecting success: 
+		compare_ws_file eol_native_crlf_true_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 1254 - checkout attr=auto ident aeol=lf core.autocrlf=true core.eol=native file=LF_mix_CR
 
 expecting success: 
-			test_must_fail test-tool wildmatch ipathmatch 'XXX/adobe/courier/bold/o/normal//12/120/75/75/X/70/iso8859/1' 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*'
-		
-ok 1489 - ipathmatch: no match 'XXX/adobe/courier/bold/o/normal//12/120/75/75/X/70/iso8859/1' 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*'
+		compare_ws_file eol_native_crlf_true_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 1255 - checkout attr=auto ident aeol=lf core.autocrlf=true core.eol=native file=LF_nul
 
-checking known breakage: false
-not ok 1490 - ipathmatch (via ls-files): no match skip 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*' 'XXX/adobe/courier/bold/o/normal//12/120/75/75/X/70/iso8859/1' # TODO known breakage
+expecting success: 
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
+		test_cmp expect actual
+	
+ok 1256 - ls-files --eol attr=auto ident aeol=crlf core.autocrlf=true core.eol=native
 
 expecting success: 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
+		compare_ws_file eol_native_crlf_true_attr_auto_ CRLF    crlf_false_attr__LF.txt
 	
-ok 1491 - cleanup after previous file test
+ok 1257 - checkout attr=auto ident aeol=crlf core.autocrlf=true core.eol=native file=LF
 
 expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
+		compare_ws_file eol_native_crlf_true_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 1492 - setup match file test for abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt
+ok 1258 - checkout attr=auto ident aeol=crlf core.autocrlf=true core.eol=native file=CRLF
 
 expecting success: 
-			test-tool wildmatch wildmatch 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt' '**/*a*b*g*n*t'
-		
-ok 1493 - wildmatch: match 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt' '**/*a*b*g*n*t'
+		compare_ws_file eol_native_crlf_true_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 1259 - checkout attr=auto ident aeol=crlf core.autocrlf=true core.eol=native file=CRLF_mix_LF
 
 expecting success: 
-				printf '%s' 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt' >expect &&
-				git --glob-pathspecs ls-files -z -- '**/*a*b*g*n*t' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1494 - wildmatch (via ls-files): match '**/*a*b*g*n*t' 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt'
+		compare_ws_file eol_native_crlf_true_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 1260 - checkout attr=auto ident aeol=crlf core.autocrlf=true core.eol=native file=LF_mix_CR
 
 expecting success: 
-			test-tool wildmatch iwildmatch 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt' '**/*a*b*g*n*t'
-		
-ok 1495 - iwildmatch: match 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt' '**/*a*b*g*n*t'
+		compare_ws_file eol_native_crlf_true_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 1261 - checkout attr=auto ident aeol=crlf core.autocrlf=true core.eol=native file=LF_nul
 
 expecting success: 
-				printf '%s' 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '**/*a*b*g*n*t' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
 		test_cmp expect actual
-			
-ok 1496 - iwildmatch (via ls-files): match '**/*a*b*g*n*t' 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt'
+	
+ok 1262 - ls-files --eol attr=-text ident aeol= core.autocrlf=false core.eol=native
 
 expecting success: 
-			test-tool wildmatch pathmatch 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt' '**/*a*b*g*n*t'
-		
-ok 1497 - pathmatch: match 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt' '**/*a*b*g*n*t'
+		compare_ws_file eol_native_crlf_false_attr_-text_ LF    crlf_false_attr__LF.txt
+	
+ok 1263 - checkout attr=-text ident aeol= core.autocrlf=false core.eol=native file=LF
 
 expecting success: 
-				printf '%s' 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt' >expect &&
-				git ls-files -z -- '**/*a*b*g*n*t' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1498 - pathmatch (via ls-files): match '**/*a*b*g*n*t' 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt'
+		compare_ws_file eol_native_crlf_false_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 1264 - checkout attr=-text ident aeol= core.autocrlf=false core.eol=native file=CRLF
 
 expecting success: 
-			test-tool wildmatch ipathmatch 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt' '**/*a*b*g*n*t'
-		
-ok 1499 - ipathmatch: match 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt' '**/*a*b*g*n*t'
+		compare_ws_file eol_native_crlf_false_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 1265 - checkout attr=-text ident aeol= core.autocrlf=false core.eol=native file=CRLF_mix_LF
 
 expecting success: 
-				printf '%s' 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt' >expect &&
-				git --icase-pathspecs ls-files -z -- '**/*a*b*g*n*t' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1500 - ipathmatch (via ls-files): match '**/*a*b*g*n*t' 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt'
+		compare_ws_file eol_native_crlf_false_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 1266 - checkout attr=-text ident aeol= core.autocrlf=false core.eol=native file=LF_mix_CR
 
 expecting success: 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
+		compare_ws_file eol_native_crlf_false_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
 	
-Removing abcd/
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 1501 - cleanup after previous file test
+ok 1267 - checkout attr=-text ident aeol= core.autocrlf=false core.eol=native file=LF_nul
 
 expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
+		test_cmp expect actual
 	
-ok 1502 - setup match file test for abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txtz
+ok 1268 - ls-files --eol attr=-text ident aeol=lf core.autocrlf=false core.eol=native
 
 expecting success: 
-			test_must_fail test-tool wildmatch wildmatch 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txtz' '**/*a*b*g*n*t'
-		
-ok 1503 - wildmatch: no match 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txtz' '**/*a*b*g*n*t'
+		compare_ws_file eol_native_crlf_false_attr_-text_ LF    crlf_false_attr__LF.txt
+	
+ok 1269 - checkout attr=-text ident aeol=lf core.autocrlf=false core.eol=native file=LF
 
 expecting success: 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- '**/*a*b*g*n*t' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1504 - wildmatch (via ls-files): no match '**/*a*b*g*n*t' 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txtz'
+		compare_ws_file eol_native_crlf_false_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 1270 - checkout attr=-text ident aeol=lf core.autocrlf=false core.eol=native file=CRLF
 
 expecting success: 
-			test_must_fail test-tool wildmatch iwildmatch 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txtz' '**/*a*b*g*n*t'
-		
-ok 1505 - iwildmatch: no match 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txtz' '**/*a*b*g*n*t'
+		compare_ws_file eol_native_crlf_false_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 1271 - checkout attr=-text ident aeol=lf core.autocrlf=false core.eol=native file=CRLF_mix_LF
 
 expecting success: 
-				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '**/*a*b*g*n*t' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1506 - iwildmatch (via ls-files): no match '**/*a*b*g*n*t' 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txtz'
+		compare_ws_file eol_native_crlf_false_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 1272 - checkout attr=-text ident aeol=lf core.autocrlf=false core.eol=native file=LF_mix_CR
 
 expecting success: 
-			test_must_fail test-tool wildmatch pathmatch 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txtz' '**/*a*b*g*n*t'
-		
-ok 1507 - pathmatch: no match 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txtz' '**/*a*b*g*n*t'
+		compare_ws_file eol_native_crlf_false_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 1273 - checkout attr=-text ident aeol=lf core.autocrlf=false core.eol=native file=LF_nul
 
 expecting success: 
-				>expect &&
-				git ls-files -z -- '**/*a*b*g*n*t' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
 		test_cmp expect actual
-			
-ok 1508 - pathmatch (via ls-files): no match '**/*a*b*g*n*t' 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txtz'
+	
+ok 1274 - ls-files --eol attr=-text ident aeol=crlf core.autocrlf=false core.eol=native
 
 expecting success: 
-			test_must_fail test-tool wildmatch ipathmatch 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txtz' '**/*a*b*g*n*t'
-		
-ok 1509 - ipathmatch: no match 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txtz' '**/*a*b*g*n*t'
+		compare_ws_file eol_native_crlf_false_attr_-text_ LF    crlf_false_attr__LF.txt
+	
+ok 1275 - checkout attr=-text ident aeol=crlf core.autocrlf=false core.eol=native file=LF
 
 expecting success: 
-				>expect &&
-				git --icase-pathspecs ls-files -z -- '**/*a*b*g*n*t' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1510 - ipathmatch (via ls-files): no match '**/*a*b*g*n*t' 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txtz'
+		compare_ws_file eol_native_crlf_false_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 1276 - checkout attr=-text ident aeol=crlf core.autocrlf=false core.eol=native file=CRLF
 
 expecting success: 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
+		compare_ws_file eol_native_crlf_false_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
 	
-Removing abcd/
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 1511 - cleanup after previous file test
+ok 1277 - checkout attr=-text ident aeol=crlf core.autocrlf=false core.eol=native file=CRLF_mix_LF
 
 expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
+		compare_ws_file eol_native_crlf_false_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
 	
-ok 1512 - setup match file test for foo
+ok 1278 - checkout attr=-text ident aeol=crlf core.autocrlf=false core.eol=native file=LF_mix_CR
 
 expecting success: 
-			test_must_fail test-tool wildmatch wildmatch 'foo' '*/*/*'
-		
-ok 1513 - wildmatch: no match 'foo' '*/*/*'
+		compare_ws_file eol_native_crlf_false_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 1279 - checkout attr=-text ident aeol=crlf core.autocrlf=false core.eol=native file=LF_nul
 
 expecting success: 
-				>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_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
 		test_cmp expect actual
-			
-ok 1514 - wildmatch (via ls-files): no match '*/*/*' 'foo'
+	
+ok 1280 - ls-files --eol attr=text ident aeol=lf core.autocrlf=false core.eol=native
 
 expecting success: 
-			test_must_fail test-tool wildmatch iwildmatch 'foo' '*/*/*'
-		
-ok 1515 - iwildmatch: no match 'foo' '*/*/*'
+		compare_ws_file eol_native_crlf_false_attr_text_ LF    crlf_false_attr__LF.txt
+	
+ok 1281 - checkout attr=text ident aeol=lf core.autocrlf=false core.eol=native file=LF
 
 expecting success: 
-				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '*/*/*' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1516 - iwildmatch (via ls-files): no match '*/*/*' 'foo'
+		compare_ws_file eol_native_crlf_false_attr_text_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 1282 - checkout attr=text ident aeol=lf core.autocrlf=false core.eol=native file=CRLF
 
 expecting success: 
-			test_must_fail test-tool wildmatch pathmatch 'foo' '*/*/*'
-		
-ok 1517 - pathmatch: no match 'foo' '*/*/*'
+		compare_ws_file eol_native_crlf_false_attr_text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 1283 - checkout attr=text ident aeol=lf core.autocrlf=false core.eol=native file=CRLF_mix_LF
 
 expecting success: 
-				>expect &&
-				git ls-files -z -- '*/*/*' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1518 - pathmatch (via ls-files): no match '*/*/*' 'foo'
+		compare_ws_file eol_native_crlf_false_attr_text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 1284 - checkout attr=text ident aeol=lf core.autocrlf=false core.eol=native file=LF_mix_CR
 
 expecting success: 
-			test_must_fail test-tool wildmatch ipathmatch 'foo' '*/*/*'
-		
-ok 1519 - ipathmatch: no match 'foo' '*/*/*'
+		compare_ws_file eol_native_crlf_false_attr_text_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 1285 - checkout attr=text ident aeol=lf core.autocrlf=false core.eol=native file=LF_nul
 
 expecting success: 
-				>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_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
 		test_cmp expect actual
-			
-ok 1520 - ipathmatch (via ls-files): no match '*/*/*' 'foo'
+	
+ok 1286 - ls-files --eol attr=text ident aeol=crlf core.autocrlf=false core.eol=native
 
 expecting success: 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
+		compare_ws_file eol_native_crlf_false_attr_text_ CRLF    crlf_false_attr__LF.txt
 	
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-Removing foo
-ok 1521 - cleanup after previous file test
+ok 1287 - checkout attr=text ident aeol=crlf core.autocrlf=false core.eol=native file=LF
 
 expecting success: 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*}
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
+		compare_ws_file eol_native_crlf_false_attr_text_ CRLF  crlf_false_attr__CRLF.txt
 	
-ok 1522 - setup match file test for foo/bar
+ok 1288 - checkout attr=text ident aeol=crlf core.autocrlf=false core.eol=native file=CRLF
 
 expecting success: 
-			test_must_fail test-tool wildmatch wildmatch 'foo/bar' '*/*/*'
-		
-ok 1523 - wildmatch: no match 'foo/bar' '*/*/*'
+		compare_ws_file eol_native_crlf_false_attr_text_ CRLF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 1289 - checkout attr=text ident aeol=crlf core.autocrlf=false core.eol=native file=CRLF_mix_LF
 
 expecting success: 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- '*/*/*' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1524 - wildmatch (via ls-files): no match '*/*/*' 'foo/bar'
+		compare_ws_file eol_native_crlf_false_attr_text_ CRLF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 1290 - checkout attr=text ident aeol=crlf core.autocrlf=false core.eol=native file=LF_mix_CR
 
 expecting success: 
-			test_must_fail test-tool wildmatch iwildmatch 'foo/bar' '*/*/*'
-		
-ok 1525 - iwildmatch: no match 'foo/bar' '*/*/*'
+		compare_ws_file eol_native_crlf_false_attr_text_ CRLF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 1291 - checkout attr=text ident aeol=crlf core.autocrlf=false core.eol=native file=LF_nul
 
 expecting success: 
-				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '*/*/*' >actual.raw 2>actual.err &&
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
+		test_cmp expect actual
+	
+ok 1292 - ls-files --eol attr=auto ident aeol=lf core.autocrlf=false core.eol=native
+
+expecting success: 
+		compare_ws_file eol_native_crlf_false_attr_auto_ LF    crlf_false_attr__LF.txt
+	
+ok 1293 - checkout attr=auto ident aeol=lf core.autocrlf=false core.eol=native file=LF
+
+expecting success: 
+		compare_ws_file eol_native_crlf_false_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 1294 - checkout attr=auto ident aeol=lf core.autocrlf=false core.eol=native file=CRLF
+
+expecting success: 
+		compare_ws_file eol_native_crlf_false_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 1295 - checkout attr=auto ident aeol=lf core.autocrlf=false core.eol=native file=CRLF_mix_LF
+
+expecting success: 
+		compare_ws_file eol_native_crlf_false_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 1296 - checkout attr=auto ident aeol=lf core.autocrlf=false core.eol=native file=LF_mix_CR
+
+expecting success: 
+		compare_ws_file eol_native_crlf_false_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 1297 - checkout attr=auto ident aeol=lf core.autocrlf=false core.eol=native file=LF_nul
+
+expecting success: 
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
+		test_cmp expect actual
+	
+ok 1298 - ls-files --eol attr=auto ident aeol=crlf core.autocrlf=false core.eol=native
+
+expecting success: 
+		compare_ws_file eol_native_crlf_false_attr_auto_ CRLF    crlf_false_attr__LF.txt
+	
+ok 1299 - checkout attr=auto ident aeol=crlf core.autocrlf=false core.eol=native file=LF
+
+expecting success: 
+		compare_ws_file eol_native_crlf_false_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 1300 - checkout attr=auto ident aeol=crlf core.autocrlf=false core.eol=native file=CRLF
+
+expecting success: 
+		compare_ws_file eol_native_crlf_false_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 1301 - checkout attr=auto ident aeol=crlf core.autocrlf=false core.eol=native file=CRLF_mix_LF
+
+expecting success: 
+		compare_ws_file eol_native_crlf_false_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 1302 - checkout attr=auto ident aeol=crlf core.autocrlf=false core.eol=native file=LF_mix_CR
+
+expecting success: 
+		compare_ws_file eol_native_crlf_false_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 1303 - checkout attr=auto ident aeol=crlf core.autocrlf=false core.eol=native file=LF_nul
+
+expecting success: 
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
+		test_cmp expect actual
+	
+ok 1304 - ls-files --eol attr=-text ident aeol= core.autocrlf=input core.eol=native
+
+expecting success: 
+		compare_ws_file eol_native_crlf_input_attr_-text_ LF    crlf_false_attr__LF.txt
+	
+ok 1305 - checkout attr=-text ident aeol= core.autocrlf=input core.eol=native file=LF
+
+expecting success: 
+		compare_ws_file eol_native_crlf_input_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 1306 - checkout attr=-text ident aeol= core.autocrlf=input core.eol=native file=CRLF
+
+expecting success: 
+		compare_ws_file eol_native_crlf_input_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 1307 - checkout attr=-text ident aeol= core.autocrlf=input core.eol=native file=CRLF_mix_LF
+
+expecting success: 
+		compare_ws_file eol_native_crlf_input_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 1308 - checkout attr=-text ident aeol= core.autocrlf=input core.eol=native file=LF_mix_CR
+
+expecting success: 
+		compare_ws_file eol_native_crlf_input_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 1309 - checkout attr=-text ident aeol= core.autocrlf=input core.eol=native file=LF_nul
+
+expecting success: 
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
+		test_cmp expect actual
+	
+ok 1310 - ls-files --eol attr=-text ident aeol=lf core.autocrlf=input core.eol=native
+
+expecting success: 
+		compare_ws_file eol_native_crlf_input_attr_-text_ LF    crlf_false_attr__LF.txt
+	
+ok 1311 - checkout attr=-text ident aeol=lf core.autocrlf=input core.eol=native file=LF
+
+expecting success: 
+		compare_ws_file eol_native_crlf_input_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 1312 - checkout attr=-text ident aeol=lf core.autocrlf=input core.eol=native file=CRLF
+
+expecting success: 
+		compare_ws_file eol_native_crlf_input_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 1313 - checkout attr=-text ident aeol=lf core.autocrlf=input core.eol=native file=CRLF_mix_LF
+
+expecting success: 
+		compare_ws_file eol_native_crlf_input_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 1314 - checkout attr=-text ident aeol=lf core.autocrlf=input core.eol=native file=LF_mix_CR
+
+expecting success: 
+		compare_ws_file eol_native_crlf_input_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 1315 - checkout attr=-text ident aeol=lf core.autocrlf=input core.eol=native file=LF_nul
+
+expecting success: 
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
+		test_cmp expect actual
+	
+ok 1316 - ls-files --eol attr=-text ident aeol=crlf core.autocrlf=input core.eol=native
+
+expecting success: 
+		compare_ws_file eol_native_crlf_input_attr_-text_ LF    crlf_false_attr__LF.txt
+	
+ok 1317 - checkout attr=-text ident aeol=crlf core.autocrlf=input core.eol=native file=LF
+
+expecting success: 
+		compare_ws_file eol_native_crlf_input_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 1318 - checkout attr=-text ident aeol=crlf core.autocrlf=input core.eol=native file=CRLF
+
+expecting success: 
+		compare_ws_file eol_native_crlf_input_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 1319 - checkout attr=-text ident aeol=crlf core.autocrlf=input core.eol=native file=CRLF_mix_LF
+
+expecting success: 
+		compare_ws_file eol_native_crlf_input_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 1320 - checkout attr=-text ident aeol=crlf core.autocrlf=input core.eol=native file=LF_mix_CR
+
+expecting success: 
+		compare_ws_file eol_native_crlf_input_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 1321 - checkout attr=-text ident aeol=crlf core.autocrlf=input core.eol=native file=LF_nul
+
+expecting success: 
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
+		test_cmp expect actual
+	
+ok 1322 - ls-files --eol attr=text ident aeol=lf core.autocrlf=input core.eol=native
+
+expecting success: 
+		compare_ws_file eol_native_crlf_input_attr_text_ LF    crlf_false_attr__LF.txt
+	
+ok 1323 - checkout attr=text ident aeol=lf core.autocrlf=input core.eol=native file=LF
+
+expecting success: 
+		compare_ws_file eol_native_crlf_input_attr_text_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 1324 - checkout attr=text ident aeol=lf core.autocrlf=input core.eol=native file=CRLF
+
+expecting success: 
+		compare_ws_file eol_native_crlf_input_attr_text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 1325 - checkout attr=text ident aeol=lf core.autocrlf=input core.eol=native file=CRLF_mix_LF
+
+expecting success: 
+		compare_ws_file eol_native_crlf_input_attr_text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 1326 - checkout attr=text ident aeol=lf core.autocrlf=input core.eol=native file=LF_mix_CR
+
+expecting success: 
+		compare_ws_file eol_native_crlf_input_attr_text_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 1327 - checkout attr=text ident aeol=lf core.autocrlf=input core.eol=native file=LF_nul
+
+expecting success: 
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
+		test_cmp expect actual
+	
+ok 1328 - ls-files --eol attr=text ident aeol=crlf core.autocrlf=input core.eol=native
+
+expecting success: 
+		compare_ws_file eol_native_crlf_input_attr_text_ CRLF    crlf_false_attr__LF.txt
+	
+ok 1329 - checkout attr=text ident aeol=crlf core.autocrlf=input core.eol=native file=LF
+
+expecting success: 
+		compare_ws_file eol_native_crlf_input_attr_text_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 1330 - checkout attr=text ident aeol=crlf core.autocrlf=input core.eol=native file=CRLF
+
+expecting success: 
+		compare_ws_file eol_native_crlf_input_attr_text_ CRLF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 1331 - checkout attr=text ident aeol=crlf core.autocrlf=input core.eol=native file=CRLF_mix_LF
+
+expecting success: 
+		compare_ws_file eol_native_crlf_input_attr_text_ CRLF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 1332 - checkout attr=text ident aeol=crlf core.autocrlf=input core.eol=native file=LF_mix_CR
+
+expecting success: 
+		compare_ws_file eol_native_crlf_input_attr_text_ CRLF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 1333 - checkout attr=text ident aeol=crlf core.autocrlf=input core.eol=native file=LF_nul
+
+expecting success: 
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
+		test_cmp expect actual
+	
+ok 1334 - ls-files --eol attr=auto ident aeol=lf core.autocrlf=input core.eol=native
+
+expecting success: 
+		compare_ws_file eol_native_crlf_input_attr_auto_ LF    crlf_false_attr__LF.txt
+	
+ok 1335 - checkout attr=auto ident aeol=lf core.autocrlf=input core.eol=native file=LF
+
+expecting success: 
+		compare_ws_file eol_native_crlf_input_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 1336 - checkout attr=auto ident aeol=lf core.autocrlf=input core.eol=native file=CRLF
+
+expecting success: 
+		compare_ws_file eol_native_crlf_input_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 1337 - checkout attr=auto ident aeol=lf core.autocrlf=input core.eol=native file=CRLF_mix_LF
+
+expecting success: 
+		compare_ws_file eol_native_crlf_input_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 1338 - checkout attr=auto ident aeol=lf core.autocrlf=input core.eol=native file=LF_mix_CR
+
+expecting success: 
+		compare_ws_file eol_native_crlf_input_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 1339 - checkout attr=auto ident aeol=lf core.autocrlf=input core.eol=native file=LF_nul
+
+expecting success: 
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
+		test_cmp expect actual
+	
+ok 1340 - ls-files --eol attr=auto ident aeol=crlf core.autocrlf=input core.eol=native
+
+expecting success: 
+		compare_ws_file eol_native_crlf_input_attr_auto_ CRLF    crlf_false_attr__LF.txt
+	
+ok 1341 - checkout attr=auto ident aeol=crlf core.autocrlf=input core.eol=native file=LF
+
+expecting success: 
+		compare_ws_file eol_native_crlf_input_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 1342 - checkout attr=auto ident aeol=crlf core.autocrlf=input core.eol=native file=CRLF
+
+expecting success: 
+		compare_ws_file eol_native_crlf_input_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 1343 - checkout attr=auto ident aeol=crlf core.autocrlf=input core.eol=native file=CRLF_mix_LF
+
+expecting success: 
+		compare_ws_file eol_native_crlf_input_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 1344 - checkout attr=auto ident aeol=crlf core.autocrlf=input core.eol=native file=LF_mix_CR
+
+expecting success: 
+		compare_ws_file eol_native_crlf_input_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 1345 - checkout attr=auto ident aeol=crlf core.autocrlf=input core.eol=native file=LF_nul
+
+expecting success: 
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
+		test_cmp expect actual
+	
+ok 1346 - ls-files --eol attr= ident aeol= core.autocrlf=false core.eol=native
+
+expecting success: 
+		compare_ws_file eol_native_crlf_false_attr__ LF    crlf_false_attr__LF.txt
+	
+ok 1347 - checkout attr= ident aeol= core.autocrlf=false core.eol=native file=LF
+
+expecting success: 
+		compare_ws_file eol_native_crlf_false_attr__ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 1348 - checkout attr= ident aeol= core.autocrlf=false core.eol=native file=CRLF
+
+expecting success: 
+		compare_ws_file eol_native_crlf_false_attr__ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 1349 - checkout attr= ident aeol= core.autocrlf=false core.eol=native file=CRLF_mix_LF
+
+expecting success: 
+		compare_ws_file eol_native_crlf_false_attr__ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 1350 - checkout attr= ident aeol= core.autocrlf=false core.eol=native file=LF_mix_CR
+
+expecting success: 
+		compare_ws_file eol_native_crlf_false_attr__ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 1351 - checkout attr= ident aeol= core.autocrlf=false core.eol=native file=LF_nul
+
+expecting success: 
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
+		test_cmp expect actual
+	
+ok 1352 - ls-files --eol attr= ident aeol= core.autocrlf=true core.eol=native
+
+expecting success: 
+		compare_ws_file eol_native_crlf_true_attr__ CRLF    crlf_false_attr__LF.txt
+	
+ok 1353 - checkout attr= ident aeol= core.autocrlf=true core.eol=native file=LF
+
+expecting success: 
+		compare_ws_file eol_native_crlf_true_attr__ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 1354 - checkout attr= ident aeol= core.autocrlf=true core.eol=native file=CRLF
+
+expecting success: 
+		compare_ws_file eol_native_crlf_true_attr__ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 1355 - checkout attr= ident aeol= core.autocrlf=true core.eol=native file=CRLF_mix_LF
+
+expecting success: 
+		compare_ws_file eol_native_crlf_true_attr__ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 1356 - checkout attr= ident aeol= core.autocrlf=true core.eol=native file=LF_mix_CR
+
+expecting success: 
+		compare_ws_file eol_native_crlf_true_attr__ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 1357 - checkout attr= ident aeol= core.autocrlf=true core.eol=native file=LF_nul
+
+expecting success: 
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
+		test_cmp expect actual
+	
+ok 1358 - ls-files --eol attr=auto ident aeol= core.autocrlf=true core.eol=native
+
+expecting success: 
+		compare_ws_file eol_native_crlf_true_attr_auto_ CRLF    crlf_false_attr__LF.txt
+	
+ok 1359 - checkout attr=auto ident aeol= core.autocrlf=true core.eol=native file=LF
+
+expecting success: 
+		compare_ws_file eol_native_crlf_true_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 1360 - checkout attr=auto ident aeol= core.autocrlf=true core.eol=native file=CRLF
+
+expecting success: 
+		compare_ws_file eol_native_crlf_true_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 1361 - checkout attr=auto ident aeol= core.autocrlf=true core.eol=native file=CRLF_mix_LF
+
+expecting success: 
+		compare_ws_file eol_native_crlf_true_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 1362 - checkout attr=auto ident aeol= core.autocrlf=true core.eol=native file=LF_mix_CR
+
+expecting success: 
+		compare_ws_file eol_native_crlf_true_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 1363 - checkout attr=auto ident aeol= core.autocrlf=true core.eol=native file=LF_nul
+
+expecting success: 
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
+		test_cmp expect actual
+	
+ok 1364 - ls-files --eol attr=text ident aeol= core.autocrlf=true core.eol=native
+
+expecting success: 
+		compare_ws_file eol_native_crlf_true_attr_text_ CRLF    crlf_false_attr__LF.txt
+	
+ok 1365 - checkout attr=text ident aeol= core.autocrlf=true core.eol=native file=LF
+
+expecting success: 
+		compare_ws_file eol_native_crlf_true_attr_text_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 1366 - checkout attr=text ident aeol= core.autocrlf=true core.eol=native file=CRLF
+
+expecting success: 
+		compare_ws_file eol_native_crlf_true_attr_text_ CRLF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 1367 - checkout attr=text ident aeol= core.autocrlf=true core.eol=native file=CRLF_mix_LF
+
+expecting success: 
+		compare_ws_file eol_native_crlf_true_attr_text_ CRLF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 1368 - checkout attr=text ident aeol= core.autocrlf=true core.eol=native file=LF_mix_CR
+
+expecting success: 
+		compare_ws_file eol_native_crlf_true_attr_text_ CRLF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 1369 - checkout attr=text ident aeol= core.autocrlf=true core.eol=native file=LF_nul
+
+expecting success: 
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
+		test_cmp expect actual
+	
+ok 1370 - ls-files --eol attr=text ident aeol= core.autocrlf=input core.eol=native
+
+expecting success: 
+		compare_ws_file eol_native_crlf_input_attr_text_ LF    crlf_false_attr__LF.txt
+	
+ok 1371 - checkout attr=text ident aeol= core.autocrlf=input core.eol=native file=LF
+
+expecting success: 
+		compare_ws_file eol_native_crlf_input_attr_text_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 1372 - checkout attr=text ident aeol= core.autocrlf=input core.eol=native file=CRLF
+
+expecting success: 
+		compare_ws_file eol_native_crlf_input_attr_text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 1373 - checkout attr=text ident aeol= core.autocrlf=input core.eol=native file=CRLF_mix_LF
+
+expecting success: 
+		compare_ws_file eol_native_crlf_input_attr_text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 1374 - checkout attr=text ident aeol= core.autocrlf=input core.eol=native file=LF_mix_CR
+
+expecting success: 
+		compare_ws_file eol_native_crlf_input_attr_text_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 1375 - checkout attr=text ident aeol= core.autocrlf=input core.eol=native file=LF_nul
+
+expecting success: 
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
+		test_cmp expect actual
+	
+ok 1376 - ls-files --eol attr=auto ident aeol= core.autocrlf=input core.eol=native
+
+expecting success: 
+		compare_ws_file eol_native_crlf_input_attr_auto_ LF    crlf_false_attr__LF.txt
+	
+ok 1377 - checkout attr=auto ident aeol= core.autocrlf=input core.eol=native file=LF
+
+expecting success: 
+		compare_ws_file eol_native_crlf_input_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 1378 - checkout attr=auto ident aeol= core.autocrlf=input core.eol=native file=CRLF
+
+expecting success: 
+		compare_ws_file eol_native_crlf_input_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 1379 - checkout attr=auto ident aeol= core.autocrlf=input core.eol=native file=CRLF_mix_LF
+
+expecting success: 
+		compare_ws_file eol_native_crlf_input_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 1380 - checkout attr=auto ident aeol= core.autocrlf=input core.eol=native file=LF_mix_CR
+
+expecting success: 
+		compare_ws_file eol_native_crlf_input_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 1381 - checkout attr=auto ident aeol= core.autocrlf=input core.eol=native file=LF_nul
+
+expecting success: 
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
+		test_cmp expect actual
+	
+ok 1382 - ls-files --eol attr=text ident aeol= core.autocrlf=false core.eol=crlf
+
+expecting success: 
+		compare_ws_file eol_crlf_crlf_false_attr_text_ CRLF    crlf_false_attr__LF.txt
+	
+ok 1383 - checkout attr=text ident aeol= core.autocrlf=false core.eol=crlf file=LF
+
+expecting success: 
+		compare_ws_file eol_crlf_crlf_false_attr_text_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 1384 - checkout attr=text ident aeol= core.autocrlf=false core.eol=crlf file=CRLF
+
+expecting success: 
+		compare_ws_file eol_crlf_crlf_false_attr_text_ CRLF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 1385 - checkout attr=text ident aeol= core.autocrlf=false core.eol=crlf file=CRLF_mix_LF
+
+expecting success: 
+		compare_ws_file eol_crlf_crlf_false_attr_text_ CRLF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 1386 - checkout attr=text ident aeol= core.autocrlf=false core.eol=crlf file=LF_mix_CR
+
+expecting success: 
+		compare_ws_file eol_crlf_crlf_false_attr_text_ CRLF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 1387 - checkout attr=text ident aeol= core.autocrlf=false core.eol=crlf file=LF_nul
+
+expecting success: 
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
+		test_cmp expect actual
+	
+ok 1388 - ls-files --eol attr=text ident aeol= core.autocrlf=false core.eol=lf
+
+expecting success: 
+		compare_ws_file eol_lf_crlf_false_attr_text_ LF    crlf_false_attr__LF.txt
+	
+ok 1389 - checkout attr=text ident aeol= core.autocrlf=false core.eol=lf file=LF
+
+expecting success: 
+		compare_ws_file eol_lf_crlf_false_attr_text_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 1390 - checkout attr=text ident aeol= core.autocrlf=false core.eol=lf file=CRLF
+
+expecting success: 
+		compare_ws_file eol_lf_crlf_false_attr_text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 1391 - checkout attr=text ident aeol= core.autocrlf=false core.eol=lf file=CRLF_mix_LF
+
+expecting success: 
+		compare_ws_file eol_lf_crlf_false_attr_text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 1392 - checkout attr=text ident aeol= core.autocrlf=false core.eol=lf file=LF_mix_CR
+
+expecting success: 
+		compare_ws_file eol_lf_crlf_false_attr_text_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 1393 - checkout attr=text ident aeol= core.autocrlf=false core.eol=lf file=LF_nul
+
+expecting success: 
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
+		test_cmp expect actual
+	
+ok 1394 - ls-files --eol attr=text ident aeol= core.autocrlf=false core.eol=
+
+expecting success: 
+		compare_ws_file eol__crlf_false_attr_text_ LF    crlf_false_attr__LF.txt
+	
+ok 1395 - checkout attr=text ident aeol= core.autocrlf=false core.eol= file=LF
+
+expecting success: 
+		compare_ws_file eol__crlf_false_attr_text_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 1396 - checkout attr=text ident aeol= core.autocrlf=false core.eol= file=CRLF
+
+expecting success: 
+		compare_ws_file eol__crlf_false_attr_text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 1397 - checkout attr=text ident aeol= core.autocrlf=false core.eol= file=CRLF_mix_LF
+
+expecting success: 
+		compare_ws_file eol__crlf_false_attr_text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 1398 - checkout attr=text ident aeol= core.autocrlf=false core.eol= file=LF_mix_CR
+
+expecting success: 
+		compare_ws_file eol__crlf_false_attr_text_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 1399 - checkout attr=text ident aeol= core.autocrlf=false core.eol= file=LF_nul
+
+expecting success: 
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
+		test_cmp expect actual
+	
+ok 1400 - ls-files --eol attr=text ident aeol= core.autocrlf=false core.eol=native
+
+expecting success: 
+		compare_ws_file eol_native_crlf_false_attr_text_ LF    crlf_false_attr__LF.txt
+	
+ok 1401 - checkout attr=text ident aeol= core.autocrlf=false core.eol=native file=LF
+
+expecting success: 
+		compare_ws_file eol_native_crlf_false_attr_text_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 1402 - checkout attr=text ident aeol= core.autocrlf=false core.eol=native file=CRLF
+
+expecting success: 
+		compare_ws_file eol_native_crlf_false_attr_text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 1403 - checkout attr=text ident aeol= core.autocrlf=false core.eol=native file=CRLF_mix_LF
+
+expecting success: 
+		compare_ws_file eol_native_crlf_false_attr_text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 1404 - checkout attr=text ident aeol= core.autocrlf=false core.eol=native file=LF_mix_CR
+
+expecting success: 
+		compare_ws_file eol_native_crlf_false_attr_text_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 1405 - checkout attr=text ident aeol= core.autocrlf=false core.eol=native file=LF_nul
+
+expecting success: 
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
+		test_cmp expect actual
+	
+ok 1406 - ls-files --eol attr=auto ident aeol= core.autocrlf=false core.eol=
+
+expecting success: 
+		compare_ws_file eol__crlf_false_attr_auto_ LF    crlf_false_attr__LF.txt
+	
+ok 1407 - checkout attr=auto ident aeol= core.autocrlf=false core.eol= file=LF
+
+expecting success: 
+		compare_ws_file eol__crlf_false_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 1408 - checkout attr=auto ident aeol= core.autocrlf=false core.eol= file=CRLF
+
+expecting success: 
+		compare_ws_file eol__crlf_false_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 1409 - checkout attr=auto ident aeol= core.autocrlf=false core.eol= file=CRLF_mix_LF
+
+expecting success: 
+		compare_ws_file eol__crlf_false_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 1410 - checkout attr=auto ident aeol= core.autocrlf=false core.eol= file=LF_mix_CR
+
+expecting success: 
+		compare_ws_file eol__crlf_false_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 1411 - checkout attr=auto ident aeol= core.autocrlf=false core.eol= file=LF_nul
+
+expecting success: 
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* |
+		sed -e "s/	/ /g" -e "s/  */ /g" |
+		sort >actual &&
+		test_cmp expect actual
+	
+ok 1412 - ls-files --eol attr=auto ident aeol= core.autocrlf=false core.eol=native
+
+expecting success: 
+		compare_ws_file eol_native_crlf_false_attr_auto_ LF    crlf_false_attr__LF.txt
+	
+ok 1413 - checkout attr=auto ident aeol= core.autocrlf=false core.eol=native file=LF
+
+expecting success: 
+		compare_ws_file eol_native_crlf_false_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 1414 - checkout attr=auto ident aeol= core.autocrlf=false core.eol=native file=CRLF
+
+expecting success: 
+		compare_ws_file eol_native_crlf_false_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 1415 - checkout attr=auto ident aeol= core.autocrlf=false core.eol=native file=CRLF_mix_LF
+
+expecting success: 
+		compare_ws_file eol_native_crlf_false_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 1416 - checkout attr=auto ident aeol= core.autocrlf=false core.eol=native file=LF_mix_CR
+
+expecting success: 
+		compare_ws_file eol_native_crlf_false_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 1417 - checkout attr=auto ident aeol= core.autocrlf=false core.eol=native file=LF_nul
+
+expecting success: 
+	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 |
+	sed -e "s!attr/[^	]*!!g" -e "s/	/ /g" -e "s/  */ /g" |
+	sort >actual &&
+	test_cmp expect actual
+
+ok 1418 - ls-files --eol -d -z
+
+# passed all 1418 test(s)
+1..1418
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t5546-receive-limits.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5546-receive-limits/.git/
+expecting success: 
+	test-tool genrandom foo 1024 >one-k &&
+	git add one-k &&
+	test_commit one-k
+
+[master (root-commit) cba7046] one-k
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+)
+ create mode 100644 one-k
+ create mode 100644 one-k.t
+ok 1 - create known-size (1024 bytes) commit
+
+expecting success: 
+		rm -fr dest &&
+		git --bare init dest
+	
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5546-receive-limits/dest/
+ok 2 - prepare destination repository
+
+expecting success: 
+		git --git-dir=dest config receive.unpacklimit "$unpack_limit"
+	
+ok 3 - set unpacklimit to 1
+
+expecting success: 
+		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: 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: 
+		git --git-dir=dest config receive.maxInputSize 4k &&
+		git push dest HEAD
+	
+To dest
+ * [new branch]      HEAD -> master
+ok 5 - bumping limit to 4k allows push
+
+expecting success: 
+		rm -fr dest &&
+		git --bare init dest
+	
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5546-receive-limits/dest/
+ok 6 - prepare destination repository (again)
+
+expecting success: 
+		git --git-dir=dest config receive.maxInputSize 0 &&
+		git push dest HEAD
+	
+To dest
+ * [new branch]      HEAD -> master
+ok 7 - lifting the limit allows push
+
+expecting success: 
+		rm -fr dest &&
+		git --bare init dest
+	
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5546-receive-limits/dest/
+ok 8 - prepare destination repository
+
+expecting success: 
+		git --git-dir=dest config receive.unpacklimit "$unpack_limit"
+	
+ok 9 - set unpacklimit to 10000
+
+expecting success: 
+		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 10 - setting receive.maxInputSize to 512 rejects push
+
+expecting success: 
+		git --git-dir=dest config receive.maxInputSize 4k &&
+		git push dest HEAD
+	
+To dest
+ * [new branch]      HEAD -> master
+ok 11 - bumping limit to 4k allows push
+
+expecting success: 
+		rm -fr dest &&
+		git --bare init dest
+	
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5546-receive-limits/dest/
+ok 12 - prepare destination repository (again)
+
+expecting success: 
+		git --git-dir=dest config receive.maxInputSize 0 &&
+		git push dest HEAD
+	
+To dest
+ * [new branch]      HEAD -> master
+ok 13 - lifting the limit allows push
+
+# passed all 13 test(s)
+1..13
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t5550-http-fetch-dumb.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5550-http-fetch-dumb/.git/
+checking prerequisite: NOT_ROOT
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
+	uid=$(id -u) &&
+	test "$uid" != 0
+
+)
+prerequisite NOT_ROOT ok
+1..0 # SKIP no web server found at '/usr/sbin/apache2'
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t5551-http-fetch-smart.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5551-http-fetch-smart/.git/
+checking prerequisite: NOT_ROOT
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
+	uid=$(id -u) &&
+	test "$uid" != 0
+
+)
+prerequisite NOT_ROOT ok
+1..0 # SKIP no web server found at '/usr/sbin/apache2'
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t5547-push-quarantine.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5547-push-quarantine/.git/
+expecting success: 
+	git init --bare dest.git &&
+	write_script dest.git/hooks/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/git-2.20.1/t/trash directory.t5547-push-quarantine/dest.git/
+ok 1 - create picky dest repo
+
+expecting success: 
+	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: 
+	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: 
+	echo "incoming-*" >expect &&
+	(cd dest.git/objects && echo incoming-*) >actual &&
+	test_cmp expect actual
+
+ok 4 - rejected objects are removed
+
+expecting success: 
+	# 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/git-2.20.1/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: 
+	git init --bare update.git &&
+	write_script update.git/hooks/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/git-2.20.1/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/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t5561-http-backend.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5561-http-backend/.git/
+checking prerequisite: NOT_ROOT
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
+	uid=$(id -u) &&
+	test "$uid" != 0
+
+)
+prerequisite NOT_ROOT ok
+1..0 # SKIP no web server found at '/usr/sbin/apache2'
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t3070-wildmatch.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3070-wildmatch/.git/
+checking prerequisite: EXPENSIVE_ON_WINDOWS
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
+	test_have_prereq EXPENSIVE || test_have_prereq !MINGW,!CYGWIN
+
+)
+checking prerequisite: EXPENSIVE
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
+	test -n "$GIT_TEST_LONG"
+
+)
+prerequisite EXPENSIVE not satisfied
+prerequisite EXPENSIVE_ON_WINDOWS ok
+expecting success: 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+ok 1 - cleanup after previous file test
+
+expecting success: 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 2 - setup match file test for foo
+
+expecting success: 
+			test-tool wildmatch wildmatch 'foo' 'foo'
+		
+ok 3 - wildmatch: match 'foo' 'foo'
+
+expecting success: 
+				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 1526 - iwildmatch (via ls-files): no match '*/*/*' 'foo/bar'
+ok 4 - wildmatch (via ls-files): match 'foo' 'foo'
 
 expecting success: 
-			test_must_fail test-tool wildmatch pathmatch 'foo/bar' '*/*/*'
+			test-tool wildmatch iwildmatch 'foo' 'foo'
 		
-ok 1527 - pathmatch: no match 'foo/bar' '*/*/*'
+ok 5 - iwildmatch: match 'foo' 'foo'
 
 expecting success: 
-				>expect &&
-				git ls-files -z -- '*/*/*' >actual.raw 2>actual.err &&
+				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 1528 - pathmatch (via ls-files): no match '*/*/*' 'foo/bar'
+ok 6 - iwildmatch (via ls-files): match 'foo' 'foo'
 
 expecting success: 
-			test_must_fail test-tool wildmatch ipathmatch 'foo/bar' '*/*/*'
+			test-tool wildmatch pathmatch 'foo' 'foo'
 		
-ok 1529 - ipathmatch: no match 'foo/bar' '*/*/*'
+ok 7 - pathmatch: match 'foo' 'foo'
 
 expecting success: 
-				>expect &&
-				git --icase-pathspecs ls-files -z -- '*/*/*' >actual.raw 2>actual.err &&
+				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 1530 - ipathmatch (via ls-files): no match '*/*/*' 'foo/bar'
+ok 8 - pathmatch (via ls-files): match 'foo' 'foo'
+
+expecting success: 
+			test-tool wildmatch ipathmatch 'foo' 'foo'
+		
+ok 9 - ipathmatch: match 'foo' 'foo'
+
+expecting success: 
+				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: 
 		if test -e .git/created_test_file
@@ -174043,8 +173392,8 @@
 Removing actual.err
 Removing actual.raw
 Removing expect
-Removing foo/
-ok 1531 - cleanup after previous file test
+Removing foo
+ok 11 - cleanup after previous file test
 
 expecting success: 
 		file=$(cat .git/expected_test_file) &&
@@ -174065,67 +173414,67 @@
 			rm .git/created_test_file
 		fi
 	
-ok 1532 - setup match file test for foo/bba/arr
+ok 12 - setup match file test for foo
 
 expecting success: 
-			test-tool wildmatch wildmatch 'foo/bba/arr' '*/*/*'
+			test_must_fail test-tool wildmatch wildmatch 'foo' 'bar'
 		
-ok 1533 - wildmatch: match 'foo/bba/arr' '*/*/*'
+ok 13 - wildmatch: no match 'foo' 'bar'
 
 expecting success: 
-				printf '%s' 'foo/bba/arr' >expect &&
-				git --glob-pathspecs ls-files -z -- '*/*/*' >actual.raw 2>actual.err &&
+				>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 1534 - wildmatch (via ls-files): match '*/*/*' 'foo/bba/arr'
+ok 14 - wildmatch (via ls-files): no match 'bar' 'foo'
 
 expecting success: 
-			test-tool wildmatch iwildmatch 'foo/bba/arr' '*/*/*'
+			test_must_fail test-tool wildmatch iwildmatch 'foo' 'bar'
 		
-ok 1535 - iwildmatch: match 'foo/bba/arr' '*/*/*'
+ok 15 - iwildmatch: no match 'foo' 'bar'
 
 expecting success: 
-				printf '%s' 'foo/bba/arr' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '*/*/*' >actual.raw 2>actual.err &&
+				>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 1536 - iwildmatch (via ls-files): match '*/*/*' 'foo/bba/arr'
+ok 16 - iwildmatch (via ls-files): no match 'bar' 'foo'
 
 expecting success: 
-			test-tool wildmatch pathmatch 'foo/bba/arr' '*/*/*'
+			test_must_fail test-tool wildmatch pathmatch 'foo' 'bar'
 		
-ok 1537 - pathmatch: match 'foo/bba/arr' '*/*/*'
+ok 17 - pathmatch: no match 'foo' 'bar'
 
 expecting success: 
-				printf '%s' 'foo/bba/arr' >expect &&
-				git ls-files -z -- '*/*/*' >actual.raw 2>actual.err &&
+				>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 1538 - pathmatch (via ls-files): match '*/*/*' 'foo/bba/arr'
+ok 18 - pathmatch (via ls-files): no match 'bar' 'foo'
 
 expecting success: 
-			test-tool wildmatch ipathmatch 'foo/bba/arr' '*/*/*'
+			test_must_fail test-tool wildmatch ipathmatch 'foo' 'bar'
 		
-ok 1539 - ipathmatch: match 'foo/bba/arr' '*/*/*'
+ok 19 - ipathmatch: no match 'foo' 'bar'
 
 expecting success: 
-				printf '%s' 'foo/bba/arr' >expect &&
-				git --icase-pathspecs ls-files -z -- '*/*/*' >actual.raw 2>actual.err &&
+				>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 1540 - ipathmatch (via ls-files): match '*/*/*' 'foo/bba/arr'
+ok 20 - ipathmatch (via ls-files): no match 'bar' 'foo'
 
 expecting success: 
 		if test -e .git/created_test_file
@@ -174138,8 +173487,8 @@
 Removing actual.err
 Removing actual.raw
 Removing expect
-Removing foo/
-ok 1541 - cleanup after previous file test
+Removing foo
+ok 21 - cleanup after previous file test
 
 expecting success: 
 		file=$(cat .git/expected_test_file) &&
@@ -174160,67 +173509,129 @@
 			rm .git/created_test_file
 		fi
 	
-ok 1542 - setup match file test for foo/bb/aa/rr
+ok 22 - setup match file test for 
 
 expecting success: 
-			test_must_fail test-tool wildmatch wildmatch 'foo/bb/aa/rr' '*/*/*'
+			test-tool wildmatch wildmatch '' ''
 		
-ok 1543 - wildmatch: no match 'foo/bb/aa/rr' '*/*/*'
+ok 23 - wildmatch: match '' ''
+
+checking known breakage: false
+not ok 24 - wildmatch (via ls-files): match skip '' '' # TODO known breakage
 
 expecting success: 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- '*/*/*' >actual.raw 2>actual.err &&
+			test-tool wildmatch iwildmatch '' ''
+		
+ok 25 - iwildmatch: match '' ''
+
+checking known breakage: false
+not ok 26 - iwildmatch (via ls-files): match skip '' '' # TODO known breakage
+
+expecting success: 
+			test-tool wildmatch pathmatch '' ''
+		
+ok 27 - pathmatch: match '' ''
+
+checking known breakage: false
+not ok 28 - pathmatch (via ls-files): match skip '' '' # TODO known breakage
+
+expecting success: 
+			test-tool wildmatch ipathmatch '' ''
+		
+ok 29 - ipathmatch: match '' ''
+
+checking known breakage: false
+not ok 30 - ipathmatch (via ls-files): match skip '' '' # TODO known breakage
+
+expecting success: 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+ok 31 - cleanup after previous file test
+
+expecting success: 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git 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
+
+expecting success: 
+			test-tool wildmatch wildmatch 'foo' '???'
+		
+ok 33 - wildmatch: match 'foo' '???'
+
+expecting success: 
+				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 1544 - wildmatch (via ls-files): no match '*/*/*' 'foo/bb/aa/rr'
+ok 34 - wildmatch (via ls-files): match '???' 'foo'
 
 expecting success: 
-			test_must_fail test-tool wildmatch iwildmatch 'foo/bb/aa/rr' '*/*/*'
+			test-tool wildmatch iwildmatch 'foo' '???'
 		
-ok 1545 - iwildmatch: no match 'foo/bb/aa/rr' '*/*/*'
+ok 35 - iwildmatch: match 'foo' '???'
 
 expecting success: 
-				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '*/*/*' >actual.raw 2>actual.err &&
+				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 1546 - iwildmatch (via ls-files): no match '*/*/*' 'foo/bb/aa/rr'
+ok 36 - iwildmatch (via ls-files): match '???' 'foo'
 
 expecting success: 
-			test-tool wildmatch pathmatch 'foo/bb/aa/rr' '*/*/*'
+			test-tool wildmatch pathmatch 'foo' '???'
 		
-ok 1547 - pathmatch: match 'foo/bb/aa/rr' '*/*/*'
+ok 37 - pathmatch: match 'foo' '???'
 
 expecting success: 
-				printf '%s' 'foo/bb/aa/rr' >expect &&
-				git ls-files -z -- '*/*/*' >actual.raw 2>actual.err &&
+				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 1548 - pathmatch (via ls-files): match '*/*/*' 'foo/bb/aa/rr'
+ok 38 - pathmatch (via ls-files): match '???' 'foo'
 
 expecting success: 
-			test-tool wildmatch ipathmatch 'foo/bb/aa/rr' '*/*/*'
+			test-tool wildmatch ipathmatch 'foo' '???'
 		
-ok 1549 - ipathmatch: match 'foo/bb/aa/rr' '*/*/*'
+ok 39 - ipathmatch: match 'foo' '???'
 
 expecting success: 
-				printf '%s' 'foo/bb/aa/rr' >expect &&
-				git --icase-pathspecs ls-files -z -- '*/*/*' >actual.raw 2>actual.err &&
+				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 1550 - ipathmatch (via ls-files): match '*/*/*' 'foo/bb/aa/rr'
+ok 40 - ipathmatch (via ls-files): match '???' 'foo'
 
 expecting success: 
 		if test -e .git/created_test_file
@@ -174233,8 +173644,8 @@
 Removing actual.err
 Removing actual.raw
 Removing expect
-Removing foo/
-ok 1551 - cleanup after previous file test
+Removing foo
+ok 41 - cleanup after previous file test
 
 expecting success: 
 		file=$(cat .git/expected_test_file) &&
@@ -174255,67 +173666,67 @@
 			rm .git/created_test_file
 		fi
 	
-ok 1552 - setup match file test for foo/bb/aa/rr
+ok 42 - setup match file test for foo
 
 expecting success: 
-			test-tool wildmatch wildmatch 'foo/bb/aa/rr' '**/**/**'
+			test_must_fail test-tool wildmatch wildmatch 'foo' '??'
 		
-ok 1553 - wildmatch: match 'foo/bb/aa/rr' '**/**/**'
+ok 43 - wildmatch: no match 'foo' '??'
 
 expecting success: 
-				printf '%s' 'foo/bb/aa/rr' >expect &&
-				git --glob-pathspecs ls-files -z -- '**/**/**' >actual.raw 2>actual.err &&
+				>expect &&
+				git --glob-pathspecs ls-files -z -- '??' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1554 - wildmatch (via ls-files): match '**/**/**' 'foo/bb/aa/rr'
+ok 44 - wildmatch (via ls-files): no match '??' 'foo'
 
 expecting success: 
-			test-tool wildmatch iwildmatch 'foo/bb/aa/rr' '**/**/**'
+			test_must_fail test-tool wildmatch iwildmatch 'foo' '??'
 		
-ok 1555 - iwildmatch: match 'foo/bb/aa/rr' '**/**/**'
+ok 45 - iwildmatch: no match 'foo' '??'
 
 expecting success: 
-				printf '%s' 'foo/bb/aa/rr' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '**/**/**' >actual.raw 2>actual.err &&
+				>expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '??' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1556 - iwildmatch (via ls-files): match '**/**/**' 'foo/bb/aa/rr'
+ok 46 - iwildmatch (via ls-files): no match '??' 'foo'
 
 expecting success: 
-			test-tool wildmatch pathmatch 'foo/bb/aa/rr' '**/**/**'
+			test_must_fail test-tool wildmatch pathmatch 'foo' '??'
 		
-ok 1557 - pathmatch: match 'foo/bb/aa/rr' '**/**/**'
+ok 47 - pathmatch: no match 'foo' '??'
 
 expecting success: 
-				printf '%s' 'foo/bb/aa/rr' >expect &&
-				git ls-files -z -- '**/**/**' >actual.raw 2>actual.err &&
+				>expect &&
+				git ls-files -z -- '??' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1558 - pathmatch (via ls-files): match '**/**/**' 'foo/bb/aa/rr'
+ok 48 - pathmatch (via ls-files): no match '??' 'foo'
 
 expecting success: 
-			test-tool wildmatch ipathmatch 'foo/bb/aa/rr' '**/**/**'
+			test_must_fail test-tool wildmatch ipathmatch 'foo' '??'
 		
-ok 1559 - ipathmatch: match 'foo/bb/aa/rr' '**/**/**'
+ok 49 - ipathmatch: no match 'foo' '??'
 
 expecting success: 
-				printf '%s' 'foo/bb/aa/rr' >expect &&
-				git --icase-pathspecs ls-files -z -- '**/**/**' >actual.raw 2>actual.err &&
+				>expect &&
+				git --icase-pathspecs ls-files -z -- '??' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1560 - ipathmatch (via ls-files): match '**/**/**' 'foo/bb/aa/rr'
+ok 50 - ipathmatch (via ls-files): no match '??' 'foo'
 
 expecting success: 
 		if test -e .git/created_test_file
@@ -174328,8 +173739,8 @@
 Removing actual.err
 Removing actual.raw
 Removing expect
-Removing foo/
-ok 1561 - cleanup after previous file test
+Removing foo
+ok 51 - cleanup after previous file test
 
 expecting success: 
 		file=$(cat .git/expected_test_file) &&
@@ -174350,67 +173761,67 @@
 			rm .git/created_test_file
 		fi
 	
-ok 1562 - setup match file test for abcXdefXghi
+ok 52 - setup match file test for foo
 
 expecting success: 
-			test-tool wildmatch wildmatch 'abcXdefXghi' '*X*i'
+			test-tool wildmatch wildmatch 'foo' '*'
 		
-ok 1563 - wildmatch: match 'abcXdefXghi' '*X*i'
+ok 53 - wildmatch: match 'foo' '*'
 
 expecting success: 
-				printf '%s' 'abcXdefXghi' >expect &&
-				git --glob-pathspecs ls-files -z -- '*X*i' >actual.raw 2>actual.err &&
+				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 1564 - wildmatch (via ls-files): match '*X*i' 'abcXdefXghi'
+ok 54 - wildmatch (via ls-files): match '*' 'foo'
 
 expecting success: 
-			test-tool wildmatch iwildmatch 'abcXdefXghi' '*X*i'
+			test-tool wildmatch iwildmatch 'foo' '*'
 		
-ok 1565 - iwildmatch: match 'abcXdefXghi' '*X*i'
+ok 55 - iwildmatch: match 'foo' '*'
 
 expecting success: 
-				printf '%s' 'abcXdefXghi' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '*X*i' >actual.raw 2>actual.err &&
+				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 1566 - iwildmatch (via ls-files): match '*X*i' 'abcXdefXghi'
+ok 56 - iwildmatch (via ls-files): match '*' 'foo'
 
 expecting success: 
-			test-tool wildmatch pathmatch 'abcXdefXghi' '*X*i'
+			test-tool wildmatch pathmatch 'foo' '*'
 		
-ok 1567 - pathmatch: match 'abcXdefXghi' '*X*i'
+ok 57 - pathmatch: match 'foo' '*'
 
 expecting success: 
-				printf '%s' 'abcXdefXghi' >expect &&
-				git ls-files -z -- '*X*i' >actual.raw 2>actual.err &&
+				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 1568 - pathmatch (via ls-files): match '*X*i' 'abcXdefXghi'
+ok 58 - pathmatch (via ls-files): match '*' 'foo'
 
 expecting success: 
-			test-tool wildmatch ipathmatch 'abcXdefXghi' '*X*i'
+			test-tool wildmatch ipathmatch 'foo' '*'
 		
-ok 1569 - ipathmatch: match 'abcXdefXghi' '*X*i'
+ok 59 - ipathmatch: match 'foo' '*'
 
 expecting success: 
-				printf '%s' 'abcXdefXghi' >expect &&
-				git --icase-pathspecs ls-files -z -- '*X*i' >actual.raw 2>actual.err &&
+				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 1570 - ipathmatch (via ls-files): match '*X*i' 'abcXdefXghi'
+ok 60 - ipathmatch (via ls-files): match '*' 'foo'
 
 expecting success: 
 		if test -e .git/created_test_file
@@ -174419,12 +173830,12 @@
 			git clean -df
 		fi
 	
-Removing abcXdefXghi
 Removing actual
 Removing actual.err
 Removing actual.raw
 Removing expect
-ok 1571 - cleanup after previous file test
+Removing foo
+ok 61 - cleanup after previous file test
 
 expecting success: 
 		file=$(cat .git/expected_test_file) &&
@@ -174445,67 +173856,67 @@
 			rm .git/created_test_file
 		fi
 	
-ok 1572 - setup match file test for ab/cXd/efXg/hi
+ok 62 - setup match file test for foo
 
 expecting success: 
-			test_must_fail test-tool wildmatch wildmatch 'ab/cXd/efXg/hi' '*X*i'
+			test-tool wildmatch wildmatch 'foo' 'f*'
 		
-ok 1573 - wildmatch: no match 'ab/cXd/efXg/hi' '*X*i'
+ok 63 - wildmatch: match 'foo' 'f*'
 
 expecting success: 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- '*X*i' >actual.raw 2>actual.err &&
+				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 1574 - wildmatch (via ls-files): no match '*X*i' 'ab/cXd/efXg/hi'
+ok 64 - wildmatch (via ls-files): match 'f*' 'foo'
 
 expecting success: 
-			test_must_fail test-tool wildmatch iwildmatch 'ab/cXd/efXg/hi' '*X*i'
+			test-tool wildmatch iwildmatch 'foo' 'f*'
 		
-ok 1575 - iwildmatch: no match 'ab/cXd/efXg/hi' '*X*i'
+ok 65 - iwildmatch: match 'foo' 'f*'
 
 expecting success: 
-				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '*X*i' >actual.raw 2>actual.err &&
+				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 1576 - iwildmatch (via ls-files): no match '*X*i' 'ab/cXd/efXg/hi'
+ok 66 - iwildmatch (via ls-files): match 'f*' 'foo'
 
 expecting success: 
-			test-tool wildmatch pathmatch 'ab/cXd/efXg/hi' '*X*i'
+			test-tool wildmatch pathmatch 'foo' 'f*'
 		
-ok 1577 - pathmatch: match 'ab/cXd/efXg/hi' '*X*i'
+ok 67 - pathmatch: match 'foo' 'f*'
 
 expecting success: 
-				printf '%s' 'ab/cXd/efXg/hi' >expect &&
-				git ls-files -z -- '*X*i' >actual.raw 2>actual.err &&
+				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 1578 - pathmatch (via ls-files): match '*X*i' 'ab/cXd/efXg/hi'
+ok 68 - pathmatch (via ls-files): match 'f*' 'foo'
 
 expecting success: 
-			test-tool wildmatch ipathmatch 'ab/cXd/efXg/hi' '*X*i'
+			test-tool wildmatch ipathmatch 'foo' 'f*'
 		
-ok 1579 - ipathmatch: match 'ab/cXd/efXg/hi' '*X*i'
+ok 69 - ipathmatch: match 'foo' 'f*'
 
 expecting success: 
-				printf '%s' 'ab/cXd/efXg/hi' >expect &&
-				git --icase-pathspecs ls-files -z -- '*X*i' >actual.raw 2>actual.err &&
+				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 1580 - ipathmatch (via ls-files): match '*X*i' 'ab/cXd/efXg/hi'
+ok 70 - ipathmatch (via ls-files): match 'f*' 'foo'
 
 expecting success: 
 		if test -e .git/created_test_file
@@ -174514,12 +173925,12 @@
 			git clean -df
 		fi
 	
-Removing ab/
 Removing actual
 Removing actual.err
 Removing actual.raw
 Removing expect
-ok 1581 - cleanup after previous file test
+Removing foo
+ok 71 - cleanup after previous file test
 
 expecting success: 
 		file=$(cat .git/expected_test_file) &&
@@ -174540,67 +173951,67 @@
 			rm .git/created_test_file
 		fi
 	
-ok 1582 - setup match file test for ab/cXd/efXg/hi
+ok 72 - setup match file test for foo
 
 expecting success: 
-			test-tool wildmatch wildmatch 'ab/cXd/efXg/hi' '*/*X*/*/*i'
+			test_must_fail test-tool wildmatch wildmatch 'foo' '*f'
 		
-ok 1583 - wildmatch: match 'ab/cXd/efXg/hi' '*/*X*/*/*i'
+ok 73 - wildmatch: no match 'foo' '*f'
 
 expecting success: 
-				printf '%s' 'ab/cXd/efXg/hi' >expect &&
-				git --glob-pathspecs ls-files -z -- '*/*X*/*/*i' >actual.raw 2>actual.err &&
+				>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 1584 - wildmatch (via ls-files): match '*/*X*/*/*i' 'ab/cXd/efXg/hi'
+ok 74 - wildmatch (via ls-files): no match '*f' 'foo'
 
 expecting success: 
-			test-tool wildmatch iwildmatch 'ab/cXd/efXg/hi' '*/*X*/*/*i'
+			test_must_fail test-tool wildmatch iwildmatch 'foo' '*f'
 		
-ok 1585 - iwildmatch: match 'ab/cXd/efXg/hi' '*/*X*/*/*i'
+ok 75 - iwildmatch: no match 'foo' '*f'
 
 expecting success: 
-				printf '%s' 'ab/cXd/efXg/hi' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '*/*X*/*/*i' >actual.raw 2>actual.err &&
+				>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 1586 - iwildmatch (via ls-files): match '*/*X*/*/*i' 'ab/cXd/efXg/hi'
+ok 76 - iwildmatch (via ls-files): no match '*f' 'foo'
 
 expecting success: 
-			test-tool wildmatch pathmatch 'ab/cXd/efXg/hi' '*/*X*/*/*i'
+			test_must_fail test-tool wildmatch pathmatch 'foo' '*f'
 		
-ok 1587 - pathmatch: match 'ab/cXd/efXg/hi' '*/*X*/*/*i'
+ok 77 - pathmatch: no match 'foo' '*f'
 
 expecting success: 
-				printf '%s' 'ab/cXd/efXg/hi' >expect &&
-				git ls-files -z -- '*/*X*/*/*i' >actual.raw 2>actual.err &&
+				>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 1588 - pathmatch (via ls-files): match '*/*X*/*/*i' 'ab/cXd/efXg/hi'
+ok 78 - pathmatch (via ls-files): no match '*f' 'foo'
 
 expecting success: 
-			test-tool wildmatch ipathmatch 'ab/cXd/efXg/hi' '*/*X*/*/*i'
+			test_must_fail test-tool wildmatch ipathmatch 'foo' '*f'
 		
-ok 1589 - ipathmatch: match 'ab/cXd/efXg/hi' '*/*X*/*/*i'
+ok 79 - ipathmatch: no match 'foo' '*f'
 
 expecting success: 
-				printf '%s' 'ab/cXd/efXg/hi' >expect &&
-				git --icase-pathspecs ls-files -z -- '*/*X*/*/*i' >actual.raw 2>actual.err &&
+				>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 1590 - ipathmatch (via ls-files): match '*/*X*/*/*i' 'ab/cXd/efXg/hi'
+ok 80 - ipathmatch (via ls-files): no match '*f' 'foo'
 
 expecting success: 
 		if test -e .git/created_test_file
@@ -174609,12 +174020,12 @@
 			git clean -df
 		fi
 	
-Removing ab/
 Removing actual
 Removing actual.err
 Removing actual.raw
 Removing expect
-ok 1591 - cleanup after previous file test
+Removing foo
+ok 81 - cleanup after previous file test
 
 expecting success: 
 		file=$(cat .git/expected_test_file) &&
@@ -174635,67 +174046,67 @@
 			rm .git/created_test_file
 		fi
 	
-ok 1592 - setup match file test for ab/cXd/efXg/hi
+ok 82 - setup match file test for foo
 
 expecting success: 
-			test-tool wildmatch wildmatch 'ab/cXd/efXg/hi' '**/*X*/**/*i'
+			test-tool wildmatch wildmatch 'foo' '*foo*'
 		
-ok 1593 - wildmatch: match 'ab/cXd/efXg/hi' '**/*X*/**/*i'
+ok 83 - wildmatch: match 'foo' '*foo*'
 
 expecting success: 
-				printf '%s' 'ab/cXd/efXg/hi' >expect &&
-				git --glob-pathspecs ls-files -z -- '**/*X*/**/*i' >actual.raw 2>actual.err &&
+				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 1594 - wildmatch (via ls-files): match '**/*X*/**/*i' 'ab/cXd/efXg/hi'
+ok 84 - wildmatch (via ls-files): match '*foo*' 'foo'
 
 expecting success: 
-			test-tool wildmatch iwildmatch 'ab/cXd/efXg/hi' '**/*X*/**/*i'
+			test-tool wildmatch iwildmatch 'foo' '*foo*'
 		
-ok 1595 - iwildmatch: match 'ab/cXd/efXg/hi' '**/*X*/**/*i'
+ok 85 - iwildmatch: match 'foo' '*foo*'
 
 expecting success: 
-				printf '%s' 'ab/cXd/efXg/hi' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '**/*X*/**/*i' >actual.raw 2>actual.err &&
+				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 1596 - iwildmatch (via ls-files): match '**/*X*/**/*i' 'ab/cXd/efXg/hi'
+ok 86 - iwildmatch (via ls-files): match '*foo*' 'foo'
 
 expecting success: 
-			test-tool wildmatch pathmatch 'ab/cXd/efXg/hi' '**/*X*/**/*i'
+			test-tool wildmatch pathmatch 'foo' '*foo*'
 		
-ok 1597 - pathmatch: match 'ab/cXd/efXg/hi' '**/*X*/**/*i'
+ok 87 - pathmatch: match 'foo' '*foo*'
 
 expecting success: 
-				printf '%s' 'ab/cXd/efXg/hi' >expect &&
-				git ls-files -z -- '**/*X*/**/*i' >actual.raw 2>actual.err &&
+				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 1598 - pathmatch (via ls-files): match '**/*X*/**/*i' 'ab/cXd/efXg/hi'
+ok 88 - pathmatch (via ls-files): match '*foo*' 'foo'
 
 expecting success: 
-			test-tool wildmatch ipathmatch 'ab/cXd/efXg/hi' '**/*X*/**/*i'
+			test-tool wildmatch ipathmatch 'foo' '*foo*'
 		
-ok 1599 - ipathmatch: match 'ab/cXd/efXg/hi' '**/*X*/**/*i'
+ok 89 - ipathmatch: match 'foo' '*foo*'
 
 expecting success: 
-				printf '%s' 'ab/cXd/efXg/hi' >expect &&
-				git --icase-pathspecs ls-files -z -- '**/*X*/**/*i' >actual.raw 2>actual.err &&
+				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 1600 - ipathmatch (via ls-files): match '**/*X*/**/*i' 'ab/cXd/efXg/hi'
+ok 90 - ipathmatch (via ls-files): match '*foo*' 'foo'
 
 expecting success: 
 		if test -e .git/created_test_file
@@ -174704,12 +174115,12 @@
 			git clean -df
 		fi
 	
-Removing ab/
 Removing actual
 Removing actual.err
 Removing actual.raw
 Removing expect
-ok 1601 - cleanup after previous file test
+Removing foo
+ok 91 - cleanup after previous file test
 
 expecting success: 
 		file=$(cat .git/expected_test_file) &&
@@ -174730,67 +174141,67 @@
 			rm .git/created_test_file
 		fi
 	
-ok 1602 - setup match file test for foo
+ok 92 - setup match file test for foobar
 
 expecting success: 
-			test_must_fail test-tool wildmatch wildmatch 'foo' 'fo'
+			test-tool wildmatch wildmatch 'foobar' '*ob*a*r*'
 		
-ok 1603 - wildmatch: no match 'foo' 'fo'
+ok 93 - wildmatch: match 'foobar' '*ob*a*r*'
 
 expecting success: 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- 'fo' >actual.raw 2>actual.err &&
+				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 1604 - wildmatch (via ls-files): no match 'fo' 'foo'
+ok 94 - wildmatch (via ls-files): match '*ob*a*r*' 'foobar'
 
 expecting success: 
-			test_must_fail test-tool wildmatch iwildmatch 'foo' 'fo'
+			test-tool wildmatch iwildmatch 'foobar' '*ob*a*r*'
 		
-ok 1605 - iwildmatch: no match 'foo' 'fo'
+ok 95 - iwildmatch: match 'foobar' '*ob*a*r*'
 
 expecting success: 
-				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'fo' >actual.raw 2>actual.err &&
+				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 1606 - iwildmatch (via ls-files): no match 'fo' 'foo'
+ok 96 - iwildmatch (via ls-files): match '*ob*a*r*' 'foobar'
 
 expecting success: 
-			test_must_fail test-tool wildmatch pathmatch 'foo' 'fo'
+			test-tool wildmatch pathmatch 'foobar' '*ob*a*r*'
 		
-ok 1607 - pathmatch: no match 'foo' 'fo'
+ok 97 - pathmatch: match 'foobar' '*ob*a*r*'
 
 expecting success: 
-				>expect &&
-				git ls-files -z -- 'fo' >actual.raw 2>actual.err &&
+				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 1608 - pathmatch (via ls-files): no match 'fo' 'foo'
+ok 98 - pathmatch (via ls-files): match '*ob*a*r*' 'foobar'
 
 expecting success: 
-			test_must_fail test-tool wildmatch ipathmatch 'foo' 'fo'
+			test-tool wildmatch ipathmatch 'foobar' '*ob*a*r*'
 		
-ok 1609 - ipathmatch: no match 'foo' 'fo'
+ok 99 - ipathmatch: match 'foobar' '*ob*a*r*'
 
 expecting success: 
-				>expect &&
-				git --icase-pathspecs ls-files -z -- 'fo' >actual.raw 2>actual.err &&
+				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 1610 - ipathmatch (via ls-files): no match 'fo' 'foo'
+ok 100 - ipathmatch (via ls-files): match '*ob*a*r*' 'foobar'
 
 expecting success: 
 		if test -e .git/created_test_file
@@ -174803,8 +174214,8 @@
 Removing actual.err
 Removing actual.raw
 Removing expect
-Removing foo
-ok 1611 - cleanup after previous file test
+Removing foobar
+ok 101 - cleanup after previous file test
 
 expecting success: 
 		file=$(cat .git/expected_test_file) &&
@@ -174825,67 +174236,67 @@
 			rm .git/created_test_file
 		fi
 	
-ok 1612 - setup match file test for foo/bar
+ok 102 - setup match file test for aaaaaaabababab
 
 expecting success: 
-			test-tool wildmatch wildmatch 'foo/bar' 'foo/bar'
+			test-tool wildmatch wildmatch 'aaaaaaabababab' '*ab'
 		
-ok 1613 - wildmatch: match 'foo/bar' 'foo/bar'
+ok 103 - wildmatch: match 'aaaaaaabababab' '*ab'
 
 expecting success: 
-				printf '%s' 'foo/bar' >expect &&
-				git --glob-pathspecs ls-files -z -- 'foo/bar' >actual.raw 2>actual.err &&
+				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 1614 - wildmatch (via ls-files): match 'foo/bar' 'foo/bar'
+ok 104 - wildmatch (via ls-files): match '*ab' 'aaaaaaabababab'
 
 expecting success: 
-			test-tool wildmatch iwildmatch 'foo/bar' 'foo/bar'
+			test-tool wildmatch iwildmatch 'aaaaaaabababab' '*ab'
 		
-ok 1615 - iwildmatch: match 'foo/bar' 'foo/bar'
+ok 105 - iwildmatch: match 'aaaaaaabababab' '*ab'
 
 expecting success: 
-				printf '%s' 'foo/bar' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'foo/bar' >actual.raw 2>actual.err &&
+				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 1616 - iwildmatch (via ls-files): match 'foo/bar' 'foo/bar'
+ok 106 - iwildmatch (via ls-files): match '*ab' 'aaaaaaabababab'
 
 expecting success: 
-			test-tool wildmatch pathmatch 'foo/bar' 'foo/bar'
+			test-tool wildmatch pathmatch 'aaaaaaabababab' '*ab'
 		
-ok 1617 - pathmatch: match 'foo/bar' 'foo/bar'
+ok 107 - pathmatch: match 'aaaaaaabababab' '*ab'
 
 expecting success: 
-				printf '%s' 'foo/bar' >expect &&
-				git ls-files -z -- 'foo/bar' >actual.raw 2>actual.err &&
+				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 1618 - pathmatch (via ls-files): match 'foo/bar' 'foo/bar'
+ok 108 - pathmatch (via ls-files): match '*ab' 'aaaaaaabababab'
 
 expecting success: 
-			test-tool wildmatch ipathmatch 'foo/bar' 'foo/bar'
+			test-tool wildmatch ipathmatch 'aaaaaaabababab' '*ab'
 		
-ok 1619 - ipathmatch: match 'foo/bar' 'foo/bar'
+ok 109 - ipathmatch: match 'aaaaaaabababab' '*ab'
 
 expecting success: 
-				printf '%s' 'foo/bar' >expect &&
-				git --icase-pathspecs ls-files -z -- 'foo/bar' >actual.raw 2>actual.err &&
+				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 1620 - ipathmatch (via ls-files): match 'foo/bar' 'foo/bar'
+ok 110 - ipathmatch (via ls-files): match '*ab' 'aaaaaaabababab'
 
 expecting success: 
 		if test -e .git/created_test_file
@@ -174894,12 +174305,12 @@
 			git clean -df
 		fi
 	
+Removing aaaaaaabababab
 Removing actual
 Removing actual.err
 Removing actual.raw
 Removing expect
-Removing foo/
-ok 1621 - cleanup after previous file test
+ok 111 - cleanup after previous file test
 
 expecting success: 
 		file=$(cat .git/expected_test_file) &&
@@ -174920,67 +174331,67 @@
 			rm .git/created_test_file
 		fi
 	
-ok 1622 - setup match file test for foo/bar
+ok 112 - setup match file test for foo*
 
 expecting success: 
-			test-tool wildmatch wildmatch 'foo/bar' 'foo/*'
+			test-tool wildmatch wildmatch 'foo*' 'foo\*'
 		
-ok 1623 - wildmatch: match 'foo/bar' 'foo/*'
+ok 113 - wildmatch: match 'foo*' 'foo\*'
 
 expecting success: 
-				printf '%s' 'foo/bar' >expect &&
-				git --glob-pathspecs ls-files -z -- 'foo/*' >actual.raw 2>actual.err &&
+				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 1624 - wildmatch (via ls-files): match 'foo/*' 'foo/bar'
+ok 114 - wildmatch (via ls-files): match 'foo\*' 'foo*'
 
 expecting success: 
-			test-tool wildmatch iwildmatch 'foo/bar' 'foo/*'
+			test-tool wildmatch iwildmatch 'foo*' 'foo\*'
 		
-ok 1625 - iwildmatch: match 'foo/bar' 'foo/*'
+ok 115 - iwildmatch: match 'foo*' 'foo\*'
 
 expecting success: 
-				printf '%s' 'foo/bar' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'foo/*' >actual.raw 2>actual.err &&
+				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 1626 - iwildmatch (via ls-files): match 'foo/*' 'foo/bar'
+ok 116 - iwildmatch (via ls-files): match 'foo\*' 'foo*'
 
 expecting success: 
-			test-tool wildmatch pathmatch 'foo/bar' 'foo/*'
+			test-tool wildmatch pathmatch 'foo*' 'foo\*'
 		
-ok 1627 - pathmatch: match 'foo/bar' 'foo/*'
+ok 117 - pathmatch: match 'foo*' 'foo\*'
 
 expecting success: 
-				printf '%s' 'foo/bar' >expect &&
-				git ls-files -z -- 'foo/*' >actual.raw 2>actual.err &&
+				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 1628 - pathmatch (via ls-files): match 'foo/*' 'foo/bar'
+ok 118 - pathmatch (via ls-files): match 'foo\*' 'foo*'
 
 expecting success: 
-			test-tool wildmatch ipathmatch 'foo/bar' 'foo/*'
+			test-tool wildmatch ipathmatch 'foo*' 'foo\*'
 		
-ok 1629 - ipathmatch: match 'foo/bar' 'foo/*'
+ok 119 - ipathmatch: match 'foo*' 'foo\*'
 
 expecting success: 
-				printf '%s' 'foo/bar' >expect &&
-				git --icase-pathspecs ls-files -z -- 'foo/*' >actual.raw 2>actual.err &&
+				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 1630 - ipathmatch (via ls-files): match 'foo/*' 'foo/bar'
+ok 120 - ipathmatch (via ls-files): match 'foo\*' 'foo*'
 
 expecting success: 
 		if test -e .git/created_test_file
@@ -174993,8 +174404,8 @@
 Removing actual.err
 Removing actual.raw
 Removing expect
-Removing foo/
-ok 1631 - cleanup after previous file test
+Removing foo*
+ok 121 - cleanup after previous file test
 
 expecting success: 
 		file=$(cat .git/expected_test_file) &&
@@ -175015,67 +174426,67 @@
 			rm .git/created_test_file
 		fi
 	
-ok 1632 - setup match file test for foo/bba/arr
+ok 122 - setup match file test for foobar
 
 expecting success: 
-			test_must_fail test-tool wildmatch wildmatch 'foo/bba/arr' 'foo/*'
+			test_must_fail test-tool wildmatch wildmatch 'foobar' 'foo\*bar'
 		
-ok 1633 - wildmatch: no match 'foo/bba/arr' 'foo/*'
+ok 123 - wildmatch: no match 'foobar' 'foo\*bar'
 
 expecting success: 
 				>expect &&
-				git --glob-pathspecs ls-files -z -- 'foo/*' >actual.raw 2>actual.err &&
+				git --glob-pathspecs ls-files -z -- 'foo\*bar' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1634 - wildmatch (via ls-files): no match 'foo/*' 'foo/bba/arr'
+ok 124 - wildmatch (via ls-files): no match 'foo\*bar' 'foobar'
 
 expecting success: 
-			test_must_fail test-tool wildmatch iwildmatch 'foo/bba/arr' 'foo/*'
+			test_must_fail test-tool wildmatch iwildmatch 'foobar' 'foo\*bar'
 		
-ok 1635 - iwildmatch: no match 'foo/bba/arr' 'foo/*'
+ok 125 - iwildmatch: no match 'foobar' 'foo\*bar'
 
 expecting success: 
 				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'foo/*' >actual.raw 2>actual.err &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'foo\*bar' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1636 - iwildmatch (via ls-files): no match 'foo/*' 'foo/bba/arr'
+ok 126 - iwildmatch (via ls-files): no match 'foo\*bar' 'foobar'
 
 expecting success: 
-			test-tool wildmatch pathmatch 'foo/bba/arr' 'foo/*'
+			test_must_fail test-tool wildmatch pathmatch 'foobar' 'foo\*bar'
 		
-ok 1637 - pathmatch: match 'foo/bba/arr' 'foo/*'
+ok 127 - pathmatch: no match 'foobar' 'foo\*bar'
 
 expecting success: 
-				printf '%s' 'foo/bba/arr' >expect &&
-				git ls-files -z -- 'foo/*' >actual.raw 2>actual.err &&
+				>expect &&
+				git ls-files -z -- 'foo\*bar' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1638 - pathmatch (via ls-files): match 'foo/*' 'foo/bba/arr'
+ok 128 - pathmatch (via ls-files): no match 'foo\*bar' 'foobar'
 
 expecting success: 
-			test-tool wildmatch ipathmatch 'foo/bba/arr' 'foo/*'
+			test_must_fail test-tool wildmatch ipathmatch 'foobar' 'foo\*bar'
 		
-ok 1639 - ipathmatch: match 'foo/bba/arr' 'foo/*'
+ok 129 - ipathmatch: no match 'foobar' 'foo\*bar'
 
 expecting success: 
-				printf '%s' 'foo/bba/arr' >expect &&
-				git --icase-pathspecs ls-files -z -- 'foo/*' >actual.raw 2>actual.err &&
+				>expect &&
+				git --icase-pathspecs ls-files -z -- 'foo\*bar' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1640 - ipathmatch (via ls-files): match 'foo/*' 'foo/bba/arr'
+ok 130 - ipathmatch (via ls-files): no match 'foo\*bar' 'foobar'
 
 expecting success: 
 		if test -e .git/created_test_file
@@ -175088,8 +174499,8 @@
 Removing actual.err
 Removing actual.raw
 Removing expect
-Removing foo/
-ok 1641 - cleanup after previous file test
+Removing foobar
+ok 131 - cleanup after previous file test
 
 expecting success: 
 		file=$(cat .git/expected_test_file) &&
@@ -175110,67 +174521,67 @@
 			rm .git/created_test_file
 		fi
 	
-ok 1642 - setup match file test for foo/bba/arr
+ok 132 - setup match file test for f\oo
 
 expecting success: 
-			test-tool wildmatch wildmatch 'foo/bba/arr' 'foo/**'
+			test-tool wildmatch wildmatch 'f\oo' 'f\\oo'
 		
-ok 1643 - wildmatch: match 'foo/bba/arr' 'foo/**'
+ok 133 - wildmatch: match 'f\oo' 'f\\oo'
 
 expecting success: 
-				printf '%s' 'foo/bba/arr' >expect &&
-				git --glob-pathspecs ls-files -z -- 'foo/**' >actual.raw 2>actual.err &&
+				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 1644 - wildmatch (via ls-files): match 'foo/**' 'foo/bba/arr'
+ok 134 - wildmatch (via ls-files): match 'f\\oo' 'f\oo'
 
 expecting success: 
-			test-tool wildmatch iwildmatch 'foo/bba/arr' 'foo/**'
+			test-tool wildmatch iwildmatch 'f\oo' 'f\\oo'
 		
-ok 1645 - iwildmatch: match 'foo/bba/arr' 'foo/**'
+ok 135 - iwildmatch: match 'f\oo' 'f\\oo'
 
 expecting success: 
-				printf '%s' 'foo/bba/arr' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'foo/**' >actual.raw 2>actual.err &&
+				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 1646 - iwildmatch (via ls-files): match 'foo/**' 'foo/bba/arr'
+ok 136 - iwildmatch (via ls-files): match 'f\\oo' 'f\oo'
 
 expecting success: 
-			test-tool wildmatch pathmatch 'foo/bba/arr' 'foo/**'
+			test-tool wildmatch pathmatch 'f\oo' 'f\\oo'
 		
-ok 1647 - pathmatch: match 'foo/bba/arr' 'foo/**'
+ok 137 - pathmatch: match 'f\oo' 'f\\oo'
 
 expecting success: 
-				printf '%s' 'foo/bba/arr' >expect &&
-				git ls-files -z -- 'foo/**' >actual.raw 2>actual.err &&
+				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 1648 - pathmatch (via ls-files): match 'foo/**' 'foo/bba/arr'
+ok 138 - pathmatch (via ls-files): match 'f\\oo' 'f\oo'
 
 expecting success: 
-			test-tool wildmatch ipathmatch 'foo/bba/arr' 'foo/**'
+			test-tool wildmatch ipathmatch 'f\oo' 'f\\oo'
 		
-ok 1649 - ipathmatch: match 'foo/bba/arr' 'foo/**'
+ok 139 - ipathmatch: match 'f\oo' 'f\\oo'
 
 expecting success: 
-				printf '%s' 'foo/bba/arr' >expect &&
-				git --icase-pathspecs ls-files -z -- 'foo/**' >actual.raw 2>actual.err &&
+				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 1650 - ipathmatch (via ls-files): match 'foo/**' 'foo/bba/arr'
+ok 140 - ipathmatch (via ls-files): match 'f\\oo' 'f\oo'
 
 expecting success: 
 		if test -e .git/created_test_file
@@ -175183,8 +174594,8 @@
 Removing actual.err
 Removing actual.raw
 Removing expect
-Removing foo/
-ok 1651 - cleanup after previous file test
+Removing "f\\oo"
+ok 141 - cleanup after previous file test
 
 expecting success: 
 		file=$(cat .git/expected_test_file) &&
@@ -175205,67 +174616,67 @@
 			rm .git/created_test_file
 		fi
 	
-ok 1652 - setup match file test for foo/bba/arr
+ok 142 - setup match file test for ball
 
 expecting success: 
-			test_must_fail test-tool wildmatch wildmatch 'foo/bba/arr' 'foo*'
+			test-tool wildmatch wildmatch 'ball' '*[al]?'
 		
-ok 1653 - wildmatch: no match 'foo/bba/arr' 'foo*'
+ok 143 - wildmatch: match 'ball' '*[al]?'
 
 expecting success: 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- 'foo*' >actual.raw 2>actual.err &&
+				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 1654 - wildmatch (via ls-files): no match 'foo*' 'foo/bba/arr'
+ok 144 - wildmatch (via ls-files): match '*[al]?' 'ball'
 
 expecting success: 
-			test_must_fail test-tool wildmatch iwildmatch 'foo/bba/arr' 'foo*'
+			test-tool wildmatch iwildmatch 'ball' '*[al]?'
 		
-ok 1655 - iwildmatch: no match 'foo/bba/arr' 'foo*'
+ok 145 - iwildmatch: match 'ball' '*[al]?'
 
 expecting success: 
-				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'foo*' >actual.raw 2>actual.err &&
+				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 1656 - iwildmatch (via ls-files): no match 'foo*' 'foo/bba/arr'
+ok 146 - iwildmatch (via ls-files): match '*[al]?' 'ball'
 
 expecting success: 
-			test-tool wildmatch pathmatch 'foo/bba/arr' 'foo*'
+			test-tool wildmatch pathmatch 'ball' '*[al]?'
 		
-ok 1657 - pathmatch: match 'foo/bba/arr' 'foo*'
+ok 147 - pathmatch: match 'ball' '*[al]?'
 
 expecting success: 
-				printf '%s' 'foo/bba/arr' >expect &&
-				git ls-files -z -- 'foo*' >actual.raw 2>actual.err &&
+				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 1658 - pathmatch (via ls-files): match 'foo*' 'foo/bba/arr'
+ok 148 - pathmatch (via ls-files): match '*[al]?' 'ball'
 
 expecting success: 
-			test-tool wildmatch ipathmatch 'foo/bba/arr' 'foo*'
+			test-tool wildmatch ipathmatch 'ball' '*[al]?'
 		
-ok 1659 - ipathmatch: match 'foo/bba/arr' 'foo*'
+ok 149 - ipathmatch: match 'ball' '*[al]?'
 
 expecting success: 
-				printf '%s' 'foo/bba/arr' >expect &&
-				git --icase-pathspecs ls-files -z -- 'foo*' >actual.raw 2>actual.err &&
+				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 1660 - ipathmatch (via ls-files): match 'foo*' 'foo/bba/arr'
+ok 150 - ipathmatch (via ls-files): match '*[al]?' 'ball'
 
 expecting success: 
 		if test -e .git/created_test_file
@@ -175277,9 +174688,9 @@
 Removing actual
 Removing actual.err
 Removing actual.raw
+Removing ball
 Removing expect
-Removing foo/
-ok 1661 - cleanup after previous file test
+ok 151 - cleanup after previous file test
 
 expecting success: 
 		file=$(cat .git/expected_test_file) &&
@@ -175300,67 +174711,67 @@
 			rm .git/created_test_file
 		fi
 	
-ok 1662 - setup match file test for foo/bba/arr
+ok 152 - setup match file test for ten
 
 expecting success: 
-			test_must_fail test-tool wildmatch wildmatch 'foo/bba/arr' 'foo**'
+			test_must_fail test-tool wildmatch wildmatch 'ten' '[ten]'
 		
-ok 1663 - wildmatch: no match 'foo/bba/arr' 'foo**'
+ok 153 - wildmatch: no match 'ten' '[ten]'
 
 expecting success: 
-				printf '%s' 'foo/bba/arr' >expect &&
-				git --glob-pathspecs ls-files -z -- 'foo**' >actual.raw 2>actual.err &&
+				>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 1664 - wildmatch (via ls-files): match 'foo**' 'foo/bba/arr'
+ok 154 - wildmatch (via ls-files): no match '[ten]' 'ten'
 
 expecting success: 
-			test_must_fail test-tool wildmatch iwildmatch 'foo/bba/arr' 'foo**'
+			test_must_fail test-tool wildmatch iwildmatch 'ten' '[ten]'
 		
-ok 1665 - iwildmatch: no match 'foo/bba/arr' 'foo**'
+ok 155 - iwildmatch: no match 'ten' '[ten]'
 
 expecting success: 
-				printf '%s' 'foo/bba/arr' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'foo**' >actual.raw 2>actual.err &&
+				>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 1666 - iwildmatch (via ls-files): match 'foo**' 'foo/bba/arr'
+ok 156 - iwildmatch (via ls-files): no match '[ten]' 'ten'
 
 expecting success: 
-			test-tool wildmatch pathmatch 'foo/bba/arr' 'foo**'
+			test_must_fail test-tool wildmatch pathmatch 'ten' '[ten]'
 		
-ok 1667 - pathmatch: match 'foo/bba/arr' 'foo**'
+ok 157 - pathmatch: no match 'ten' '[ten]'
 
 expecting success: 
-				printf '%s' 'foo/bba/arr' >expect &&
-				git ls-files -z -- 'foo**' >actual.raw 2>actual.err &&
+				>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 1668 - pathmatch (via ls-files): match 'foo**' 'foo/bba/arr'
+ok 158 - pathmatch (via ls-files): no match '[ten]' 'ten'
 
 expecting success: 
-			test-tool wildmatch ipathmatch 'foo/bba/arr' 'foo**'
+			test_must_fail test-tool wildmatch ipathmatch 'ten' '[ten]'
 		
-ok 1669 - ipathmatch: match 'foo/bba/arr' 'foo**'
+ok 159 - ipathmatch: no match 'ten' '[ten]'
 
 expecting success: 
-				printf '%s' 'foo/bba/arr' >expect &&
-				git --icase-pathspecs ls-files -z -- 'foo**' >actual.raw 2>actual.err &&
+				>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 1670 - ipathmatch (via ls-files): match 'foo**' 'foo/bba/arr'
+ok 160 - ipathmatch (via ls-files): no match '[ten]' 'ten'
 
 expecting success: 
 		if test -e .git/created_test_file
@@ -175373,8 +174784,8 @@
 Removing actual.err
 Removing actual.raw
 Removing expect
-Removing foo/
-ok 1671 - cleanup after previous file test
+Removing ten
+ok 161 - cleanup after previous file test
 
 expecting success: 
 		file=$(cat .git/expected_test_file) &&
@@ -175395,67 +174806,67 @@
 			rm .git/created_test_file
 		fi
 	
-ok 1672 - setup match file test for foo/bba/arr
+ok 162 - setup match file test for ten
 
 expecting success: 
-			test_must_fail test-tool wildmatch wildmatch 'foo/bba/arr' 'foo/*arr'
+			test-tool wildmatch wildmatch 'ten' '**[!te]'
 		
-ok 1673 - wildmatch: no match 'foo/bba/arr' 'foo/*arr'
+ok 163 - wildmatch: match 'ten' '**[!te]'
 
 expecting success: 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- 'foo/*arr' >actual.raw 2>actual.err &&
+				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 1674 - wildmatch (via ls-files): no match 'foo/*arr' 'foo/bba/arr'
+ok 164 - wildmatch (via ls-files): match '**[!te]' 'ten'
 
 expecting success: 
-			test_must_fail test-tool wildmatch iwildmatch 'foo/bba/arr' 'foo/*arr'
+			test-tool wildmatch iwildmatch 'ten' '**[!te]'
 		
-ok 1675 - iwildmatch: no match 'foo/bba/arr' 'foo/*arr'
+ok 165 - iwildmatch: match 'ten' '**[!te]'
 
 expecting success: 
-				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'foo/*arr' >actual.raw 2>actual.err &&
+				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 1676 - iwildmatch (via ls-files): no match 'foo/*arr' 'foo/bba/arr'
+ok 166 - iwildmatch (via ls-files): match '**[!te]' 'ten'
 
 expecting success: 
-			test-tool wildmatch pathmatch 'foo/bba/arr' 'foo/*arr'
+			test-tool wildmatch pathmatch 'ten' '**[!te]'
 		
-ok 1677 - pathmatch: match 'foo/bba/arr' 'foo/*arr'
+ok 167 - pathmatch: match 'ten' '**[!te]'
 
 expecting success: 
-				printf '%s' 'foo/bba/arr' >expect &&
-				git ls-files -z -- 'foo/*arr' >actual.raw 2>actual.err &&
+				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 1678 - pathmatch (via ls-files): match 'foo/*arr' 'foo/bba/arr'
+ok 168 - pathmatch (via ls-files): match '**[!te]' 'ten'
 
 expecting success: 
-			test-tool wildmatch ipathmatch 'foo/bba/arr' 'foo/*arr'
+			test-tool wildmatch ipathmatch 'ten' '**[!te]'
 		
-ok 1679 - ipathmatch: match 'foo/bba/arr' 'foo/*arr'
+ok 169 - ipathmatch: match 'ten' '**[!te]'
 
 expecting success: 
-				printf '%s' 'foo/bba/arr' >expect &&
-				git --icase-pathspecs ls-files -z -- 'foo/*arr' >actual.raw 2>actual.err &&
+				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 1680 - ipathmatch (via ls-files): match 'foo/*arr' 'foo/bba/arr'
+ok 170 - ipathmatch (via ls-files): match '**[!te]' 'ten'
 
 expecting success: 
 		if test -e .git/created_test_file
@@ -175468,8 +174879,8 @@
 Removing actual.err
 Removing actual.raw
 Removing expect
-Removing foo/
-ok 1681 - cleanup after previous file test
+Removing ten
+ok 171 - cleanup after previous file test
 
 expecting success: 
 		file=$(cat .git/expected_test_file) &&
@@ -175490,67 +174901,67 @@
 			rm .git/created_test_file
 		fi
 	
-ok 1682 - setup match file test for foo/bba/arr
+ok 172 - setup match file test for ten
 
 expecting success: 
-			test_must_fail test-tool wildmatch wildmatch 'foo/bba/arr' 'foo/**arr'
+			test_must_fail test-tool wildmatch wildmatch 'ten' '**[!ten]'
 		
-ok 1683 - wildmatch: no match 'foo/bba/arr' 'foo/**arr'
+ok 173 - wildmatch: no match 'ten' '**[!ten]'
 
 expecting success: 
 				>expect &&
-				git --glob-pathspecs ls-files -z -- 'foo/**arr' >actual.raw 2>actual.err &&
+				git --glob-pathspecs ls-files -z -- '**[!ten]' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1684 - wildmatch (via ls-files): no match 'foo/**arr' 'foo/bba/arr'
+ok 174 - wildmatch (via ls-files): no match '**[!ten]' 'ten'
 
 expecting success: 
-			test_must_fail test-tool wildmatch iwildmatch 'foo/bba/arr' 'foo/**arr'
+			test_must_fail test-tool wildmatch iwildmatch 'ten' '**[!ten]'
 		
-ok 1685 - iwildmatch: no match 'foo/bba/arr' 'foo/**arr'
+ok 175 - iwildmatch: no match 'ten' '**[!ten]'
 
 expecting success: 
 				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'foo/**arr' >actual.raw 2>actual.err &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '**[!ten]' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1686 - iwildmatch (via ls-files): no match 'foo/**arr' 'foo/bba/arr'
+ok 176 - iwildmatch (via ls-files): no match '**[!ten]' 'ten'
 
 expecting success: 
-			test-tool wildmatch pathmatch 'foo/bba/arr' 'foo/**arr'
+			test_must_fail test-tool wildmatch pathmatch 'ten' '**[!ten]'
 		
-ok 1687 - pathmatch: match 'foo/bba/arr' 'foo/**arr'
+ok 177 - pathmatch: no match 'ten' '**[!ten]'
 
 expecting success: 
-				printf '%s' 'foo/bba/arr' >expect &&
-				git ls-files -z -- 'foo/**arr' >actual.raw 2>actual.err &&
+				>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 1688 - pathmatch (via ls-files): match 'foo/**arr' 'foo/bba/arr'
+ok 178 - pathmatch (via ls-files): no match '**[!ten]' 'ten'
 
 expecting success: 
-			test-tool wildmatch ipathmatch 'foo/bba/arr' 'foo/**arr'
+			test_must_fail test-tool wildmatch ipathmatch 'ten' '**[!ten]'
 		
-ok 1689 - ipathmatch: match 'foo/bba/arr' 'foo/**arr'
+ok 179 - ipathmatch: no match 'ten' '**[!ten]'
 
 expecting success: 
-				printf '%s' 'foo/bba/arr' >expect &&
-				git --icase-pathspecs ls-files -z -- 'foo/**arr' >actual.raw 2>actual.err &&
+				>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 1690 - ipathmatch (via ls-files): match 'foo/**arr' 'foo/bba/arr'
+ok 180 - ipathmatch (via ls-files): no match '**[!ten]' 'ten'
 
 expecting success: 
 		if test -e .git/created_test_file
@@ -175563,8 +174974,8 @@
 Removing actual.err
 Removing actual.raw
 Removing expect
-Removing foo/
-ok 1691 - cleanup after previous file test
+Removing ten
+ok 181 - cleanup after previous file test
 
 expecting success: 
 		file=$(cat .git/expected_test_file) &&
@@ -175585,67 +174996,67 @@
 			rm .git/created_test_file
 		fi
 	
-ok 1692 - setup match file test for foo/bba/arr
+ok 182 - setup match file test for ten
 
 expecting success: 
-			test_must_fail test-tool wildmatch wildmatch 'foo/bba/arr' 'foo/*z'
+			test-tool wildmatch wildmatch 'ten' 't[a-g]n'
 		
-ok 1693 - wildmatch: no match 'foo/bba/arr' 'foo/*z'
+ok 183 - wildmatch: match 'ten' 't[a-g]n'
 
 expecting success: 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- 'foo/*z' >actual.raw 2>actual.err &&
+				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 1694 - wildmatch (via ls-files): no match 'foo/*z' 'foo/bba/arr'
+ok 184 - wildmatch (via ls-files): match 't[a-g]n' 'ten'
 
 expecting success: 
-			test_must_fail test-tool wildmatch iwildmatch 'foo/bba/arr' 'foo/*z'
+			test-tool wildmatch iwildmatch 'ten' 't[a-g]n'
 		
-ok 1695 - iwildmatch: no match 'foo/bba/arr' 'foo/*z'
+ok 185 - iwildmatch: match 'ten' 't[a-g]n'
 
 expecting success: 
-				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'foo/*z' >actual.raw 2>actual.err &&
+				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 1696 - iwildmatch (via ls-files): no match 'foo/*z' 'foo/bba/arr'
+ok 186 - iwildmatch (via ls-files): match 't[a-g]n' 'ten'
 
 expecting success: 
-			test_must_fail test-tool wildmatch pathmatch 'foo/bba/arr' 'foo/*z'
+			test-tool wildmatch pathmatch 'ten' 't[a-g]n'
 		
-ok 1697 - pathmatch: no match 'foo/bba/arr' 'foo/*z'
+ok 187 - pathmatch: match 'ten' 't[a-g]n'
 
 expecting success: 
-				>expect &&
-				git ls-files -z -- 'foo/*z' >actual.raw 2>actual.err &&
+				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 1698 - pathmatch (via ls-files): no match 'foo/*z' 'foo/bba/arr'
+ok 188 - pathmatch (via ls-files): match 't[a-g]n' 'ten'
 
 expecting success: 
-			test_must_fail test-tool wildmatch ipathmatch 'foo/bba/arr' 'foo/*z'
+			test-tool wildmatch ipathmatch 'ten' 't[a-g]n'
 		
-ok 1699 - ipathmatch: no match 'foo/bba/arr' 'foo/*z'
+ok 189 - ipathmatch: match 'ten' 't[a-g]n'
 
 expecting success: 
-				>expect &&
-				git --icase-pathspecs ls-files -z -- 'foo/*z' >actual.raw 2>actual.err &&
+				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 1700 - ipathmatch (via ls-files): no match 'foo/*z' 'foo/bba/arr'
+ok 190 - ipathmatch (via ls-files): match 't[a-g]n' 'ten'
 
 expecting success: 
 		if test -e .git/created_test_file
@@ -175658,8 +175069,8 @@
 Removing actual.err
 Removing actual.raw
 Removing expect
-Removing foo/
-ok 1701 - cleanup after previous file test
+Removing ten
+ok 191 - cleanup after previous file test
 
 expecting success: 
 		file=$(cat .git/expected_test_file) &&
@@ -175680,67 +175091,67 @@
 			rm .git/created_test_file
 		fi
 	
-ok 1702 - setup match file test for foo/bba/arr
+ok 192 - setup match file test for ten
 
 expecting success: 
-			test_must_fail test-tool wildmatch wildmatch 'foo/bba/arr' 'foo/**z'
+			test_must_fail test-tool wildmatch wildmatch 'ten' 't[!a-g]n'
 		
-ok 1703 - wildmatch: no match 'foo/bba/arr' 'foo/**z'
+ok 193 - wildmatch: no match 'ten' 't[!a-g]n'
 
 expecting success: 
 				>expect &&
-				git --glob-pathspecs ls-files -z -- 'foo/**z' >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 1704 - wildmatch (via ls-files): no match 'foo/**z' 'foo/bba/arr'
+ok 194 - wildmatch (via ls-files): no match 't[!a-g]n' 'ten'
 
 expecting success: 
-			test_must_fail test-tool wildmatch iwildmatch 'foo/bba/arr' 'foo/**z'
+			test_must_fail test-tool wildmatch iwildmatch 'ten' 't[!a-g]n'
 		
-ok 1705 - iwildmatch: no match 'foo/bba/arr' 'foo/**z'
+ok 195 - iwildmatch: no match 'ten' 't[!a-g]n'
 
 expecting success: 
 				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'foo/**z' >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 1706 - iwildmatch (via ls-files): no match 'foo/**z' 'foo/bba/arr'
+ok 196 - iwildmatch (via ls-files): no match 't[!a-g]n' 'ten'
 
 expecting success: 
-			test_must_fail test-tool wildmatch pathmatch 'foo/bba/arr' 'foo/**z'
+			test_must_fail test-tool wildmatch pathmatch 'ten' 't[!a-g]n'
 		
-ok 1707 - pathmatch: no match 'foo/bba/arr' 'foo/**z'
+ok 197 - pathmatch: no match 'ten' 't[!a-g]n'
 
 expecting success: 
 				>expect &&
-				git ls-files -z -- 'foo/**z' >actual.raw 2>actual.err &&
+				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 1708 - pathmatch (via ls-files): no match 'foo/**z' 'foo/bba/arr'
+ok 198 - pathmatch (via ls-files): no match 't[!a-g]n' 'ten'
 
 expecting success: 
-			test_must_fail test-tool wildmatch ipathmatch 'foo/bba/arr' 'foo/**z'
+			test_must_fail test-tool wildmatch ipathmatch 'ten' 't[!a-g]n'
 		
-ok 1709 - ipathmatch: no match 'foo/bba/arr' 'foo/**z'
+ok 199 - ipathmatch: no match 'ten' 't[!a-g]n'
 
 expecting success: 
 				>expect &&
-				git --icase-pathspecs ls-files -z -- 'foo/**z' >actual.raw 2>actual.err &&
+				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 1710 - ipathmatch (via ls-files): no match 'foo/**z' 'foo/bba/arr'
+ok 200 - ipathmatch (via ls-files): no match 't[!a-g]n' 'ten'
 
 expecting success: 
 		if test -e .git/created_test_file
@@ -175753,8 +175164,8 @@
 Removing actual.err
 Removing actual.raw
 Removing expect
-Removing foo/
-ok 1711 - cleanup after previous file test
+Removing ten
+ok 201 - cleanup after previous file test
 
 expecting success: 
 		file=$(cat .git/expected_test_file) &&
@@ -175775,67 +175186,67 @@
 			rm .git/created_test_file
 		fi
 	
-ok 1712 - setup match file test for foo/bar
+ok 202 - setup match file test for ton
 
 expecting success: 
-			test_must_fail test-tool wildmatch wildmatch 'foo/bar' 'foo?bar'
+			test-tool wildmatch wildmatch 'ton' 't[!a-g]n'
 		
-ok 1713 - wildmatch: no match 'foo/bar' 'foo?bar'
+ok 203 - wildmatch: match 'ton' 't[!a-g]n'
 
 expecting success: 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- 'foo?bar' >actual.raw 2>actual.err &&
+				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 1714 - wildmatch (via ls-files): no match 'foo?bar' 'foo/bar'
+ok 204 - wildmatch (via ls-files): match 't[!a-g]n' 'ton'
 
 expecting success: 
-			test_must_fail test-tool wildmatch iwildmatch 'foo/bar' 'foo?bar'
+			test-tool wildmatch iwildmatch 'ton' 't[!a-g]n'
 		
-ok 1715 - iwildmatch: no match 'foo/bar' 'foo?bar'
+ok 205 - iwildmatch: match 'ton' 't[!a-g]n'
 
 expecting success: 
-				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'foo?bar' >actual.raw 2>actual.err &&
+				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 1716 - iwildmatch (via ls-files): no match 'foo?bar' 'foo/bar'
+ok 206 - iwildmatch (via ls-files): match 't[!a-g]n' 'ton'
 
 expecting success: 
-			test-tool wildmatch pathmatch 'foo/bar' 'foo?bar'
+			test-tool wildmatch pathmatch 'ton' 't[!a-g]n'
 		
-ok 1717 - pathmatch: match 'foo/bar' 'foo?bar'
+ok 207 - pathmatch: match 'ton' 't[!a-g]n'
 
 expecting success: 
-				printf '%s' 'foo/bar' >expect &&
-				git ls-files -z -- 'foo?bar' >actual.raw 2>actual.err &&
+				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 1718 - pathmatch (via ls-files): match 'foo?bar' 'foo/bar'
+ok 208 - pathmatch (via ls-files): match 't[!a-g]n' 'ton'
 
 expecting success: 
-			test-tool wildmatch ipathmatch 'foo/bar' 'foo?bar'
+			test-tool wildmatch ipathmatch 'ton' 't[!a-g]n'
 		
-ok 1719 - ipathmatch: match 'foo/bar' 'foo?bar'
+ok 209 - ipathmatch: match 'ton' 't[!a-g]n'
 
 expecting success: 
-				printf '%s' 'foo/bar' >expect &&
-				git --icase-pathspecs ls-files -z -- 'foo?bar' >actual.raw 2>actual.err &&
+				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 1720 - ipathmatch (via ls-files): match 'foo?bar' 'foo/bar'
+ok 210 - ipathmatch (via ls-files): match 't[!a-g]n' 'ton'
 
 expecting success: 
 		if test -e .git/created_test_file
@@ -175848,8 +175259,8 @@
 Removing actual.err
 Removing actual.raw
 Removing expect
-Removing foo/
-ok 1721 - cleanup after previous file test
+Removing ton
+ok 211 - cleanup after previous file test
 
 expecting success: 
 		file=$(cat .git/expected_test_file) &&
@@ -175870,67 +175281,67 @@
 			rm .git/created_test_file
 		fi
 	
-ok 1722 - setup match file test for foo/bar
+ok 212 - setup match file test for ton
 
 expecting success: 
-			test_must_fail test-tool wildmatch wildmatch 'foo/bar' 'foo[/]bar'
+			test-tool wildmatch wildmatch 'ton' 't[^a-g]n'
 		
-ok 1723 - wildmatch: no match 'foo/bar' 'foo[/]bar'
+ok 213 - wildmatch: match 'ton' 't[^a-g]n'
 
 expecting success: 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- 'foo[/]bar' >actual.raw 2>actual.err &&
+				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 1724 - wildmatch (via ls-files): no match 'foo[/]bar' 'foo/bar'
+ok 214 - wildmatch (via ls-files): match 't[^a-g]n' 'ton'
 
 expecting success: 
-			test_must_fail test-tool wildmatch iwildmatch 'foo/bar' 'foo[/]bar'
+			test-tool wildmatch iwildmatch 'ton' 't[^a-g]n'
 		
-ok 1725 - iwildmatch: no match 'foo/bar' 'foo[/]bar'
+ok 215 - iwildmatch: match 'ton' 't[^a-g]n'
 
 expecting success: 
-				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'foo[/]bar' >actual.raw 2>actual.err &&
+				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 1726 - iwildmatch (via ls-files): no match 'foo[/]bar' 'foo/bar'
+ok 216 - iwildmatch (via ls-files): match 't[^a-g]n' 'ton'
 
 expecting success: 
-			test-tool wildmatch pathmatch 'foo/bar' 'foo[/]bar'
+			test-tool wildmatch pathmatch 'ton' 't[^a-g]n'
 		
-ok 1727 - pathmatch: match 'foo/bar' 'foo[/]bar'
+ok 217 - pathmatch: match 'ton' 't[^a-g]n'
 
 expecting success: 
-				printf '%s' 'foo/bar' >expect &&
-				git ls-files -z -- 'foo[/]bar' >actual.raw 2>actual.err &&
+				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 1728 - pathmatch (via ls-files): match 'foo[/]bar' 'foo/bar'
+ok 218 - pathmatch (via ls-files): match 't[^a-g]n' 'ton'
 
 expecting success: 
-			test-tool wildmatch ipathmatch 'foo/bar' 'foo[/]bar'
+			test-tool wildmatch ipathmatch 'ton' 't[^a-g]n'
 		
-ok 1729 - ipathmatch: match 'foo/bar' 'foo[/]bar'
+ok 219 - ipathmatch: match 'ton' 't[^a-g]n'
 
 expecting success: 
-				printf '%s' 'foo/bar' >expect &&
-				git --icase-pathspecs ls-files -z -- 'foo[/]bar' >actual.raw 2>actual.err &&
+				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 1730 - ipathmatch (via ls-files): match 'foo[/]bar' 'foo/bar'
+ok 220 - ipathmatch (via ls-files): match 't[^a-g]n' 'ton'
 
 expecting success: 
 		if test -e .git/created_test_file
@@ -175943,8 +175354,8 @@
 Removing actual.err
 Removing actual.raw
 Removing expect
-Removing foo/
-ok 1731 - cleanup after previous file test
+Removing ton
+ok 221 - cleanup after previous file test
 
 expecting success: 
 		file=$(cat .git/expected_test_file) &&
@@ -175965,67 +175376,67 @@
 			rm .git/created_test_file
 		fi
 	
-ok 1732 - setup match file test for foo/bar
+ok 222 - setup match file test for a]b
 
 expecting success: 
-			test_must_fail test-tool wildmatch wildmatch 'foo/bar' 'foo[^a-z]bar'
+			test-tool wildmatch wildmatch 'a]b' 'a[]]b'
 		
-ok 1733 - wildmatch: no match 'foo/bar' 'foo[^a-z]bar'
+ok 223 - wildmatch: match 'a]b' 'a[]]b'
 
 expecting success: 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- 'foo[^a-z]bar' >actual.raw 2>actual.err &&
+				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 1734 - wildmatch (via ls-files): no match 'foo[^a-z]bar' 'foo/bar'
+ok 224 - wildmatch (via ls-files): match 'a[]]b' 'a]b'
 
 expecting success: 
-			test_must_fail test-tool wildmatch iwildmatch 'foo/bar' 'foo[^a-z]bar'
+			test-tool wildmatch iwildmatch 'a]b' 'a[]]b'
 		
-ok 1735 - iwildmatch: no match 'foo/bar' 'foo[^a-z]bar'
+ok 225 - iwildmatch: match 'a]b' 'a[]]b'
 
 expecting success: 
-				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'foo[^a-z]bar' >actual.raw 2>actual.err &&
+				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 1736 - iwildmatch (via ls-files): no match 'foo[^a-z]bar' 'foo/bar'
+ok 226 - iwildmatch (via ls-files): match 'a[]]b' 'a]b'
 
 expecting success: 
-			test-tool wildmatch pathmatch 'foo/bar' 'foo[^a-z]bar'
+			test-tool wildmatch pathmatch 'a]b' 'a[]]b'
 		
-ok 1737 - pathmatch: match 'foo/bar' 'foo[^a-z]bar'
+ok 227 - pathmatch: match 'a]b' 'a[]]b'
 
 expecting success: 
-				printf '%s' 'foo/bar' >expect &&
-				git ls-files -z -- 'foo[^a-z]bar' >actual.raw 2>actual.err &&
+				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 1738 - pathmatch (via ls-files): match 'foo[^a-z]bar' 'foo/bar'
+ok 228 - pathmatch (via ls-files): match 'a[]]b' 'a]b'
 
 expecting success: 
-			test-tool wildmatch ipathmatch 'foo/bar' 'foo[^a-z]bar'
+			test-tool wildmatch ipathmatch 'a]b' 'a[]]b'
 		
-ok 1739 - ipathmatch: match 'foo/bar' 'foo[^a-z]bar'
+ok 229 - ipathmatch: match 'a]b' 'a[]]b'
 
 expecting success: 
-				printf '%s' 'foo/bar' >expect &&
-				git --icase-pathspecs ls-files -z -- 'foo[^a-z]bar' >actual.raw 2>actual.err &&
+				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 1740 - ipathmatch (via ls-files): match 'foo[^a-z]bar' 'foo/bar'
+ok 230 - ipathmatch (via ls-files): match 'a[]]b' 'a]b'
 
 expecting success: 
 		if test -e .git/created_test_file
@@ -176034,12 +175445,12 @@
 			git clean -df
 		fi
 	
+Removing a]b
 Removing actual
 Removing actual.err
 Removing actual.raw
 Removing expect
-Removing foo/
-ok 1741 - cleanup after previous file test
+ok 231 - cleanup after previous file test
 
 expecting success: 
 		file=$(cat .git/expected_test_file) &&
@@ -176060,67 +175471,67 @@
 			rm .git/created_test_file
 		fi
 	
-ok 1742 - setup match file test for ab/cXd/efXg/hi
+ok 232 - setup match file test for a-b
 
 expecting success: 
-			test_must_fail test-tool wildmatch wildmatch 'ab/cXd/efXg/hi' '*Xg*i'
+			test-tool wildmatch wildmatch 'a-b' 'a[]-]b'
 		
-ok 1743 - wildmatch: no match 'ab/cXd/efXg/hi' '*Xg*i'
+ok 233 - wildmatch: match 'a-b' 'a[]-]b'
 
 expecting success: 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- '*Xg*i' >actual.raw 2>actual.err &&
+				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 1744 - wildmatch (via ls-files): no match '*Xg*i' 'ab/cXd/efXg/hi'
+ok 234 - wildmatch (via ls-files): match 'a[]-]b' 'a-b'
 
 expecting success: 
-			test_must_fail test-tool wildmatch iwildmatch 'ab/cXd/efXg/hi' '*Xg*i'
+			test-tool wildmatch iwildmatch 'a-b' 'a[]-]b'
 		
-ok 1745 - iwildmatch: no match 'ab/cXd/efXg/hi' '*Xg*i'
+ok 235 - iwildmatch: match 'a-b' 'a[]-]b'
 
 expecting success: 
-				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '*Xg*i' >actual.raw 2>actual.err &&
+				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 1746 - iwildmatch (via ls-files): no match '*Xg*i' 'ab/cXd/efXg/hi'
+ok 236 - iwildmatch (via ls-files): match 'a[]-]b' 'a-b'
 
 expecting success: 
-			test-tool wildmatch pathmatch 'ab/cXd/efXg/hi' '*Xg*i'
+			test-tool wildmatch pathmatch 'a-b' 'a[]-]b'
 		
-ok 1747 - pathmatch: match 'ab/cXd/efXg/hi' '*Xg*i'
+ok 237 - pathmatch: match 'a-b' 'a[]-]b'
 
 expecting success: 
-				printf '%s' 'ab/cXd/efXg/hi' >expect &&
-				git ls-files -z -- '*Xg*i' >actual.raw 2>actual.err &&
+				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 1748 - pathmatch (via ls-files): match '*Xg*i' 'ab/cXd/efXg/hi'
+ok 238 - pathmatch (via ls-files): match 'a[]-]b' 'a-b'
 
 expecting success: 
-			test-tool wildmatch ipathmatch 'ab/cXd/efXg/hi' '*Xg*i'
+			test-tool wildmatch ipathmatch 'a-b' 'a[]-]b'
 		
-ok 1749 - ipathmatch: match 'ab/cXd/efXg/hi' '*Xg*i'
+ok 239 - ipathmatch: match 'a-b' 'a[]-]b'
 
 expecting success: 
-				printf '%s' 'ab/cXd/efXg/hi' >expect &&
-				git --icase-pathspecs ls-files -z -- '*Xg*i' >actual.raw 2>actual.err &&
+				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 1750 - ipathmatch (via ls-files): match '*Xg*i' 'ab/cXd/efXg/hi'
+ok 240 - ipathmatch (via ls-files): match 'a[]-]b' 'a-b'
 
 expecting success: 
 		if test -e .git/created_test_file
@@ -176129,12 +175540,12 @@
 			git clean -df
 		fi
 	
-Removing ab/
+Removing a-b
 Removing actual
 Removing actual.err
 Removing actual.raw
 Removing expect
-ok 1751 - cleanup after previous file test
+ok 241 - cleanup after previous file test
 
 expecting success: 
 		file=$(cat .git/expected_test_file) &&
@@ -176155,67 +175566,67 @@
 			rm .git/created_test_file
 		fi
 	
-ok 1752 - setup match file test for a
+ok 242 - setup match file test for a]b
 
 expecting success: 
-			test_must_fail test-tool wildmatch wildmatch 'a' '[A-Z]'
+			test-tool wildmatch wildmatch 'a]b' 'a[]-]b'
 		
-ok 1753 - wildmatch: no match 'a' '[A-Z]'
+ok 243 - wildmatch: match 'a]b' 'a[]-]b'
 
 expecting success: 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- '[A-Z]' >actual.raw 2>actual.err &&
+				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 1754 - wildmatch (via ls-files): no match '[A-Z]' 'a'
+ok 244 - wildmatch (via ls-files): match 'a[]-]b' 'a]b'
 
 expecting success: 
-			test-tool wildmatch iwildmatch 'a' '[A-Z]'
+			test-tool wildmatch iwildmatch 'a]b' 'a[]-]b'
 		
-ok 1755 - iwildmatch: match 'a' '[A-Z]'
+ok 245 - iwildmatch: match 'a]b' 'a[]-]b'
 
 expecting success: 
-				printf '%s' 'a' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[A-Z]' >actual.raw 2>actual.err &&
+				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 1756 - iwildmatch (via ls-files): match '[A-Z]' 'a'
+ok 246 - iwildmatch (via ls-files): match 'a[]-]b' 'a]b'
 
 expecting success: 
-			test_must_fail test-tool wildmatch pathmatch 'a' '[A-Z]'
+			test-tool wildmatch pathmatch 'a]b' 'a[]-]b'
 		
-ok 1757 - pathmatch: no match 'a' '[A-Z]'
+ok 247 - pathmatch: match 'a]b' 'a[]-]b'
 
 expecting success: 
-				>expect &&
-				git ls-files -z -- '[A-Z]' >actual.raw 2>actual.err &&
+				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 1758 - pathmatch (via ls-files): no match '[A-Z]' 'a'
+ok 248 - pathmatch (via ls-files): match 'a[]-]b' 'a]b'
 
 expecting success: 
-			test-tool wildmatch ipathmatch 'a' '[A-Z]'
+			test-tool wildmatch ipathmatch 'a]b' 'a[]-]b'
 		
-ok 1759 - ipathmatch: match 'a' '[A-Z]'
+ok 249 - ipathmatch: match 'a]b' 'a[]-]b'
 
 expecting success: 
-				printf '%s' 'a' >expect &&
-				git --icase-pathspecs ls-files -z -- '[A-Z]' >actual.raw 2>actual.err &&
+				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 1760 - ipathmatch (via ls-files): match '[A-Z]' 'a'
+ok 250 - ipathmatch (via ls-files): match 'a[]-]b' 'a]b'
 
 expecting success: 
 		if test -e .git/created_test_file
@@ -176224,12 +175635,12 @@
 			git clean -df
 		fi
 	
-Removing a
+Removing a]b
 Removing actual
 Removing actual.err
 Removing actual.raw
 Removing expect
-ok 1761 - cleanup after previous file test
+ok 251 - cleanup after previous file test
 
 expecting success: 
 		file=$(cat .git/expected_test_file) &&
@@ -176250,67 +175661,67 @@
 			rm .git/created_test_file
 		fi
 	
-ok 1762 - setup match file test for A
+ok 252 - setup match file test for aab
 
 expecting success: 
-			test-tool wildmatch wildmatch 'A' '[A-Z]'
+			test_must_fail test-tool wildmatch wildmatch 'aab' 'a[]-]b'
 		
-ok 1763 - wildmatch: match 'A' '[A-Z]'
+ok 253 - wildmatch: no match 'aab' 'a[]-]b'
 
 expecting success: 
-				printf '%s' 'A' >expect &&
-				git --glob-pathspecs ls-files -z -- '[A-Z]' >actual.raw 2>actual.err &&
+				>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 1764 - wildmatch (via ls-files): match '[A-Z]' 'A'
+ok 254 - wildmatch (via ls-files): no match 'a[]-]b' 'aab'
 
 expecting success: 
-			test-tool wildmatch iwildmatch 'A' '[A-Z]'
+			test_must_fail test-tool wildmatch iwildmatch 'aab' 'a[]-]b'
 		
-ok 1765 - iwildmatch: match 'A' '[A-Z]'
+ok 255 - iwildmatch: no match 'aab' 'a[]-]b'
 
 expecting success: 
-				printf '%s' 'A' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[A-Z]' >actual.raw 2>actual.err &&
+				>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 1766 - iwildmatch (via ls-files): match '[A-Z]' 'A'
+ok 256 - iwildmatch (via ls-files): no match 'a[]-]b' 'aab'
 
 expecting success: 
-			test-tool wildmatch pathmatch 'A' '[A-Z]'
+			test_must_fail test-tool wildmatch pathmatch 'aab' 'a[]-]b'
 		
-ok 1767 - pathmatch: match 'A' '[A-Z]'
+ok 257 - pathmatch: no match 'aab' 'a[]-]b'
 
 expecting success: 
-				printf '%s' 'A' >expect &&
-				git ls-files -z -- '[A-Z]' >actual.raw 2>actual.err &&
+				>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 1768 - pathmatch (via ls-files): match '[A-Z]' 'A'
+ok 258 - pathmatch (via ls-files): no match 'a[]-]b' 'aab'
 
 expecting success: 
-			test-tool wildmatch ipathmatch 'A' '[A-Z]'
+			test_must_fail test-tool wildmatch ipathmatch 'aab' 'a[]-]b'
 		
-ok 1769 - ipathmatch: match 'A' '[A-Z]'
+ok 259 - ipathmatch: no match 'aab' 'a[]-]b'
 
 expecting success: 
-				printf '%s' 'A' >expect &&
-				git --icase-pathspecs ls-files -z -- '[A-Z]' >actual.raw 2>actual.err &&
+				>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 1770 - ipathmatch (via ls-files): match '[A-Z]' 'A'
+ok 260 - ipathmatch (via ls-files): no match 'a[]-]b' 'aab'
 
 expecting success: 
 		if test -e .git/created_test_file
@@ -176319,12 +175730,12 @@
 			git clean -df
 		fi
 	
-Removing A
+Removing aab
 Removing actual
 Removing actual.err
 Removing actual.raw
 Removing expect
-ok 1771 - cleanup after previous file test
+ok 261 - cleanup after previous file test
 
 expecting success: 
 		file=$(cat .git/expected_test_file) &&
@@ -176345,67 +175756,67 @@
 			rm .git/created_test_file
 		fi
 	
-ok 1772 - setup match file test for A
+ok 262 - setup match file test for aab
 
 expecting success: 
-			test_must_fail test-tool wildmatch wildmatch 'A' '[a-z]'
+			test-tool wildmatch wildmatch 'aab' 'a[]a-]b'
 		
-ok 1773 - wildmatch: no match 'A' '[a-z]'
+ok 263 - wildmatch: match 'aab' 'a[]a-]b'
 
 expecting success: 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- '[a-z]' >actual.raw 2>actual.err &&
+				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 1774 - wildmatch (via ls-files): no match '[a-z]' 'A'
+ok 264 - wildmatch (via ls-files): match 'a[]a-]b' 'aab'
 
 expecting success: 
-			test-tool wildmatch iwildmatch 'A' '[a-z]'
+			test-tool wildmatch iwildmatch 'aab' 'a[]a-]b'
 		
-ok 1775 - iwildmatch: match 'A' '[a-z]'
+ok 265 - iwildmatch: match 'aab' 'a[]a-]b'
 
 expecting success: 
-				printf '%s' 'A' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[a-z]' >actual.raw 2>actual.err &&
+				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 1776 - iwildmatch (via ls-files): match '[a-z]' 'A'
+ok 266 - iwildmatch (via ls-files): match 'a[]a-]b' 'aab'
 
 expecting success: 
-			test_must_fail test-tool wildmatch pathmatch 'A' '[a-z]'
+			test-tool wildmatch pathmatch 'aab' 'a[]a-]b'
 		
-ok 1777 - pathmatch: no match 'A' '[a-z]'
+ok 267 - pathmatch: match 'aab' 'a[]a-]b'
 
 expecting success: 
-				>expect &&
-				git ls-files -z -- '[a-z]' >actual.raw 2>actual.err &&
+				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 1778 - pathmatch (via ls-files): no match '[a-z]' 'A'
+ok 268 - pathmatch (via ls-files): match 'a[]a-]b' 'aab'
 
 expecting success: 
-			test-tool wildmatch ipathmatch 'A' '[a-z]'
+			test-tool wildmatch ipathmatch 'aab' 'a[]a-]b'
 		
-ok 1779 - ipathmatch: match 'A' '[a-z]'
+ok 269 - ipathmatch: match 'aab' 'a[]a-]b'
 
 expecting success: 
-				printf '%s' 'A' >expect &&
-				git --icase-pathspecs ls-files -z -- '[a-z]' >actual.raw 2>actual.err &&
+				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 1780 - ipathmatch (via ls-files): match '[a-z]' 'A'
+ok 270 - ipathmatch (via ls-files): match 'a[]a-]b' 'aab'
 
 expecting success: 
 		if test -e .git/created_test_file
@@ -176414,12 +175825,12 @@
 			git clean -df
 		fi
 	
-Removing A
+Removing aab
 Removing actual
 Removing actual.err
 Removing actual.raw
 Removing expect
-ok 1781 - cleanup after previous file test
+ok 271 - cleanup after previous file test
 
 expecting success: 
 		file=$(cat .git/expected_test_file) &&
@@ -176440,67 +175851,67 @@
 			rm .git/created_test_file
 		fi
 	
-ok 1782 - setup match file test for a
+ok 272 - setup match file test for ]
 
 expecting success: 
-			test-tool wildmatch wildmatch 'a' '[a-z]'
+			test-tool wildmatch wildmatch ']' ']'
 		
-ok 1783 - wildmatch: match 'a' '[a-z]'
+ok 273 - wildmatch: match ']' ']'
 
 expecting success: 
-				printf '%s' 'a' >expect &&
-				git --glob-pathspecs ls-files -z -- '[a-z]' >actual.raw 2>actual.err &&
+				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 1784 - wildmatch (via ls-files): match '[a-z]' 'a'
+ok 274 - wildmatch (via ls-files): match ']' ']'
 
 expecting success: 
-			test-tool wildmatch iwildmatch 'a' '[a-z]'
+			test-tool wildmatch iwildmatch ']' ']'
 		
-ok 1785 - iwildmatch: match 'a' '[a-z]'
+ok 275 - iwildmatch: match ']' ']'
 
 expecting success: 
-				printf '%s' 'a' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[a-z]' >actual.raw 2>actual.err &&
+				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 1786 - iwildmatch (via ls-files): match '[a-z]' 'a'
+ok 276 - iwildmatch (via ls-files): match ']' ']'
 
 expecting success: 
-			test-tool wildmatch pathmatch 'a' '[a-z]'
+			test-tool wildmatch pathmatch ']' ']'
 		
-ok 1787 - pathmatch: match 'a' '[a-z]'
+ok 277 - pathmatch: match ']' ']'
 
 expecting success: 
-				printf '%s' 'a' >expect &&
-				git ls-files -z -- '[a-z]' >actual.raw 2>actual.err &&
+				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 1788 - pathmatch (via ls-files): match '[a-z]' 'a'
+ok 278 - pathmatch (via ls-files): match ']' ']'
 
 expecting success: 
-			test-tool wildmatch ipathmatch 'a' '[a-z]'
+			test-tool wildmatch ipathmatch ']' ']'
 		
-ok 1789 - ipathmatch: match 'a' '[a-z]'
+ok 279 - ipathmatch: match ']' ']'
 
 expecting success: 
-				printf '%s' 'a' >expect &&
-				git --icase-pathspecs ls-files -z -- '[a-z]' >actual.raw 2>actual.err &&
+				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 1790 - ipathmatch (via ls-files): match '[a-z]' 'a'
+ok 280 - ipathmatch (via ls-files): match ']' ']'
 
 expecting success: 
 		if test -e .git/created_test_file
@@ -176509,12 +175920,12 @@
 			git clean -df
 		fi
 	
-Removing a
+Removing ]
 Removing actual
 Removing actual.err
 Removing actual.raw
 Removing expect
-ok 1791 - cleanup after previous file test
+ok 281 - cleanup after previous file test
 
 expecting success: 
 		file=$(cat .git/expected_test_file) &&
@@ -176535,67 +175946,67 @@
 			rm .git/created_test_file
 		fi
 	
-ok 1792 - setup match file test for a
+ok 282 - setup match file test for foo/baz/bar
 
 expecting success: 
-			test_must_fail test-tool wildmatch wildmatch 'a' '[[:upper:]]'
+			test_must_fail test-tool wildmatch wildmatch 'foo/baz/bar' 'foo*bar'
 		
-ok 1793 - wildmatch: no match 'a' '[[:upper:]]'
+ok 283 - wildmatch: no match 'foo/baz/bar' 'foo*bar'
 
 expecting success: 
 				>expect &&
-				git --glob-pathspecs ls-files -z -- '[[:upper:]]' >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 1794 - wildmatch (via ls-files): no match '[[:upper:]]' 'a'
+ok 284 - wildmatch (via ls-files): no match 'foo*bar' 'foo/baz/bar'
 
 expecting success: 
-			test-tool wildmatch iwildmatch 'a' '[[:upper:]]'
+			test_must_fail test-tool wildmatch iwildmatch 'foo/baz/bar' 'foo*bar'
 		
-ok 1795 - iwildmatch: match 'a' '[[:upper:]]'
+ok 285 - iwildmatch: no match 'foo/baz/bar' 'foo*bar'
 
 expecting success: 
-				printf '%s' 'a' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[[:upper:]]' >actual.raw 2>actual.err &&
+				>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 1796 - iwildmatch (via ls-files): match '[[:upper:]]' 'a'
+ok 286 - iwildmatch (via ls-files): no match 'foo*bar' 'foo/baz/bar'
 
 expecting success: 
-			test_must_fail test-tool wildmatch pathmatch 'a' '[[:upper:]]'
+			test-tool wildmatch pathmatch 'foo/baz/bar' 'foo*bar'
 		
-ok 1797 - pathmatch: no match 'a' '[[:upper:]]'
+ok 287 - pathmatch: match 'foo/baz/bar' 'foo*bar'
 
 expecting success: 
-				>expect &&
-				git ls-files -z -- '[[:upper:]]' >actual.raw 2>actual.err &&
+				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 1798 - pathmatch (via ls-files): no match '[[:upper:]]' 'a'
+ok 288 - pathmatch (via ls-files): match 'foo*bar' 'foo/baz/bar'
 
 expecting success: 
-			test-tool wildmatch ipathmatch 'a' '[[:upper:]]'
+			test-tool wildmatch ipathmatch 'foo/baz/bar' 'foo*bar'
 		
-ok 1799 - ipathmatch: match 'a' '[[:upper:]]'
+ok 289 - ipathmatch: match 'foo/baz/bar' 'foo*bar'
 
 expecting success: 
-				printf '%s' 'a' >expect &&
-				git --icase-pathspecs ls-files -z -- '[[:upper:]]' >actual.raw 2>actual.err &&
+				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 1800 - ipathmatch (via ls-files): match '[[:upper:]]' 'a'
+ok 290 - ipathmatch (via ls-files): match 'foo*bar' 'foo/baz/bar'
 
 expecting success: 
 		if test -e .git/created_test_file
@@ -176604,12 +176015,12 @@
 			git clean -df
 		fi
 	
-Removing a
 Removing actual
 Removing actual.err
 Removing actual.raw
 Removing expect
-ok 1801 - cleanup after previous file test
+Removing foo/
+ok 291 - cleanup after previous file test
 
 expecting success: 
 		file=$(cat .git/expected_test_file) &&
@@ -176630,67 +176041,67 @@
 			rm .git/created_test_file
 		fi
 	
-ok 1802 - setup match file test for A
+ok 292 - setup match file test for foo/baz/bar
 
 expecting success: 
-			test-tool wildmatch wildmatch 'A' '[[:upper:]]'
+			test_must_fail test-tool wildmatch wildmatch 'foo/baz/bar' 'foo**bar'
 		
-ok 1803 - wildmatch: match 'A' '[[:upper:]]'
+ok 293 - wildmatch: no match 'foo/baz/bar' 'foo**bar'
 
 expecting success: 
-				printf '%s' 'A' >expect &&
-				git --glob-pathspecs ls-files -z -- '[[:upper:]]' >actual.raw 2>actual.err &&
+				>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 1804 - wildmatch (via ls-files): match '[[:upper:]]' 'A'
+ok 294 - wildmatch (via ls-files): no match 'foo**bar' 'foo/baz/bar'
 
 expecting success: 
-			test-tool wildmatch iwildmatch 'A' '[[:upper:]]'
+			test_must_fail test-tool wildmatch iwildmatch 'foo/baz/bar' 'foo**bar'
 		
-ok 1805 - iwildmatch: match 'A' '[[:upper:]]'
+ok 295 - iwildmatch: no match 'foo/baz/bar' 'foo**bar'
 
 expecting success: 
-				printf '%s' 'A' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[[:upper:]]' >actual.raw 2>actual.err &&
+				>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 1806 - iwildmatch (via ls-files): match '[[:upper:]]' 'A'
+ok 296 - iwildmatch (via ls-files): no match 'foo**bar' 'foo/baz/bar'
 
 expecting success: 
-			test-tool wildmatch pathmatch 'A' '[[:upper:]]'
+			test-tool wildmatch pathmatch 'foo/baz/bar' 'foo**bar'
 		
-ok 1807 - pathmatch: match 'A' '[[:upper:]]'
+ok 297 - pathmatch: match 'foo/baz/bar' 'foo**bar'
 
 expecting success: 
-				printf '%s' 'A' >expect &&
-				git ls-files -z -- '[[:upper:]]' >actual.raw 2>actual.err &&
+				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 1808 - pathmatch (via ls-files): match '[[:upper:]]' 'A'
+ok 298 - pathmatch (via ls-files): match 'foo**bar' 'foo/baz/bar'
 
 expecting success: 
-			test-tool wildmatch ipathmatch 'A' '[[:upper:]]'
+			test-tool wildmatch ipathmatch 'foo/baz/bar' 'foo**bar'
 		
-ok 1809 - ipathmatch: match 'A' '[[:upper:]]'
+ok 299 - ipathmatch: match 'foo/baz/bar' 'foo**bar'
 
 expecting success: 
-				printf '%s' 'A' >expect &&
-				git --icase-pathspecs ls-files -z -- '[[:upper:]]' >actual.raw 2>actual.err &&
+				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 1810 - ipathmatch (via ls-files): match '[[:upper:]]' 'A'
+ok 300 - ipathmatch (via ls-files): match 'foo**bar' 'foo/baz/bar'
 
 expecting success: 
 		if test -e .git/created_test_file
@@ -176699,12 +176110,12 @@
 			git clean -df
 		fi
 	
-Removing A
 Removing actual
 Removing actual.err
 Removing actual.raw
 Removing expect
-ok 1811 - cleanup after previous file test
+Removing foo/
+ok 301 - cleanup after previous file test
 
 expecting success: 
 		file=$(cat .git/expected_test_file) &&
@@ -176725,67 +176136,67 @@
 			rm .git/created_test_file
 		fi
 	
-ok 1812 - setup match file test for A
+ok 302 - setup match file test for foobazbar
 
 expecting success: 
-			test_must_fail test-tool wildmatch wildmatch 'A' '[[:lower:]]'
+			test-tool wildmatch wildmatch 'foobazbar' 'foo**bar'
 		
-ok 1813 - wildmatch: no match 'A' '[[:lower:]]'
+ok 303 - wildmatch: match 'foobazbar' 'foo**bar'
 
 expecting success: 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- '[[:lower:]]' >actual.raw 2>actual.err &&
+				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 1814 - wildmatch (via ls-files): no match '[[:lower:]]' 'A'
+ok 304 - wildmatch (via ls-files): match 'foo**bar' 'foobazbar'
 
 expecting success: 
-			test-tool wildmatch iwildmatch 'A' '[[:lower:]]'
+			test-tool wildmatch iwildmatch 'foobazbar' 'foo**bar'
 		
-ok 1815 - iwildmatch: match 'A' '[[:lower:]]'
+ok 305 - iwildmatch: match 'foobazbar' 'foo**bar'
 
 expecting success: 
-				printf '%s' 'A' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[[:lower:]]' >actual.raw 2>actual.err &&
+				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 1816 - iwildmatch (via ls-files): match '[[:lower:]]' 'A'
+ok 306 - iwildmatch (via ls-files): match 'foo**bar' 'foobazbar'
 
 expecting success: 
-			test_must_fail test-tool wildmatch pathmatch 'A' '[[:lower:]]'
+			test-tool wildmatch pathmatch 'foobazbar' 'foo**bar'
 		
-ok 1817 - pathmatch: no match 'A' '[[:lower:]]'
+ok 307 - pathmatch: match 'foobazbar' 'foo**bar'
 
 expecting success: 
-				>expect &&
-				git ls-files -z -- '[[:lower:]]' >actual.raw 2>actual.err &&
+				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 1818 - pathmatch (via ls-files): no match '[[:lower:]]' 'A'
+ok 308 - pathmatch (via ls-files): match 'foo**bar' 'foobazbar'
 
 expecting success: 
-			test-tool wildmatch ipathmatch 'A' '[[:lower:]]'
+			test-tool wildmatch ipathmatch 'foobazbar' 'foo**bar'
 		
-ok 1819 - ipathmatch: match 'A' '[[:lower:]]'
+ok 309 - ipathmatch: match 'foobazbar' 'foo**bar'
 
 expecting success: 
-				printf '%s' 'A' >expect &&
-				git --icase-pathspecs ls-files -z -- '[[:lower:]]' >actual.raw 2>actual.err &&
+				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 1820 - ipathmatch (via ls-files): match '[[:lower:]]' 'A'
+ok 310 - ipathmatch (via ls-files): match 'foo**bar' 'foobazbar'
 
 expecting success: 
 		if test -e .git/created_test_file
@@ -176794,12 +176205,12 @@
 			git clean -df
 		fi
 	
-Removing A
 Removing actual
 Removing actual.err
 Removing actual.raw
 Removing expect
-ok 1821 - cleanup after previous file test
+Removing foobazbar
+ok 311 - cleanup after previous file test
 
 expecting success: 
 		file=$(cat .git/expected_test_file) &&
@@ -176820,67 +176231,67 @@
 			rm .git/created_test_file
 		fi
 	
-ok 1822 - setup match file test for a
+ok 312 - setup match file test for foo/baz/bar
 
 expecting success: 
-			test-tool wildmatch wildmatch 'a' '[[:lower:]]'
+			test-tool wildmatch wildmatch 'foo/baz/bar' 'foo/**/bar'
 		
-ok 1823 - wildmatch: match 'a' '[[:lower:]]'
+ok 313 - wildmatch: match 'foo/baz/bar' 'foo/**/bar'
 
 expecting success: 
-				printf '%s' 'a' >expect &&
-				git --glob-pathspecs ls-files -z -- '[[:lower:]]' >actual.raw 2>actual.err &&
+				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 1824 - wildmatch (via ls-files): match '[[:lower:]]' 'a'
+ok 314 - wildmatch (via ls-files): match 'foo/**/bar' 'foo/baz/bar'
 
 expecting success: 
-			test-tool wildmatch iwildmatch 'a' '[[:lower:]]'
+			test-tool wildmatch iwildmatch 'foo/baz/bar' 'foo/**/bar'
 		
-ok 1825 - iwildmatch: match 'a' '[[:lower:]]'
+ok 315 - iwildmatch: match 'foo/baz/bar' 'foo/**/bar'
 
 expecting success: 
-				printf '%s' 'a' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[[:lower:]]' >actual.raw 2>actual.err &&
+				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 1826 - iwildmatch (via ls-files): match '[[:lower:]]' 'a'
+ok 316 - iwildmatch (via ls-files): match 'foo/**/bar' 'foo/baz/bar'
 
 expecting success: 
-			test-tool wildmatch pathmatch 'a' '[[:lower:]]'
+			test-tool wildmatch pathmatch 'foo/baz/bar' 'foo/**/bar'
 		
-ok 1827 - pathmatch: match 'a' '[[:lower:]]'
+ok 317 - pathmatch: match 'foo/baz/bar' 'foo/**/bar'
 
 expecting success: 
-				printf '%s' 'a' >expect &&
-				git ls-files -z -- '[[:lower:]]' >actual.raw 2>actual.err &&
+				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 1828 - pathmatch (via ls-files): match '[[:lower:]]' 'a'
+ok 318 - pathmatch (via ls-files): match 'foo/**/bar' 'foo/baz/bar'
 
 expecting success: 
-			test-tool wildmatch ipathmatch 'a' '[[:lower:]]'
+			test-tool wildmatch ipathmatch 'foo/baz/bar' 'foo/**/bar'
 		
-ok 1829 - ipathmatch: match 'a' '[[:lower:]]'
+ok 319 - ipathmatch: match 'foo/baz/bar' 'foo/**/bar'
 
 expecting success: 
-				printf '%s' 'a' >expect &&
-				git --icase-pathspecs ls-files -z -- '[[:lower:]]' >actual.raw 2>actual.err &&
+				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 1830 - ipathmatch (via ls-files): match '[[:lower:]]' 'a'
+ok 320 - ipathmatch (via ls-files): match 'foo/**/bar' 'foo/baz/bar'
 
 expecting success: 
 		if test -e .git/created_test_file
@@ -176889,12 +176300,12 @@
 			git clean -df
 		fi
 	
-Removing a
 Removing actual
 Removing actual.err
 Removing actual.raw
 Removing expect
-ok 1831 - cleanup after previous file test
+Removing foo/
+ok 321 - cleanup after previous file test
 
 expecting success: 
 		file=$(cat .git/expected_test_file) &&
@@ -176915,67 +176326,67 @@
 			rm .git/created_test_file
 		fi
 	
-ok 1832 - setup match file test for A
+ok 322 - setup match file test for foo/baz/bar
 
 expecting success: 
-			test_must_fail test-tool wildmatch wildmatch 'A' '[B-Za]'
+			test-tool wildmatch wildmatch 'foo/baz/bar' 'foo/**/**/bar'
 		
-ok 1833 - wildmatch: no match 'A' '[B-Za]'
+ok 323 - wildmatch: match 'foo/baz/bar' 'foo/**/**/bar'
 
 expecting success: 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- '[B-Za]' >actual.raw 2>actual.err &&
+				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 1834 - wildmatch (via ls-files): no match '[B-Za]' 'A'
+ok 324 - wildmatch (via ls-files): match 'foo/**/**/bar' 'foo/baz/bar'
 
 expecting success: 
-			test-tool wildmatch iwildmatch 'A' '[B-Za]'
+			test-tool wildmatch iwildmatch 'foo/baz/bar' 'foo/**/**/bar'
 		
-ok 1835 - iwildmatch: match 'A' '[B-Za]'
+ok 325 - iwildmatch: match 'foo/baz/bar' 'foo/**/**/bar'
 
 expecting success: 
-				printf '%s' 'A' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[B-Za]' >actual.raw 2>actual.err &&
+				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 1836 - iwildmatch (via ls-files): match '[B-Za]' 'A'
+ok 326 - iwildmatch (via ls-files): match 'foo/**/**/bar' 'foo/baz/bar'
 
 expecting success: 
-			test_must_fail test-tool wildmatch pathmatch 'A' '[B-Za]'
+			test_must_fail test-tool wildmatch pathmatch 'foo/baz/bar' 'foo/**/**/bar'
 		
-ok 1837 - pathmatch: no match 'A' '[B-Za]'
+ok 327 - pathmatch: no match 'foo/baz/bar' 'foo/**/**/bar'
 
 expecting success: 
 				>expect &&
-				git ls-files -z -- '[B-Za]' >actual.raw 2>actual.err &&
+				git ls-files -z -- 'foo/**/**/bar' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1838 - pathmatch (via ls-files): no match '[B-Za]' 'A'
+ok 328 - pathmatch (via ls-files): no match 'foo/**/**/bar' 'foo/baz/bar'
 
 expecting success: 
-			test-tool wildmatch ipathmatch 'A' '[B-Za]'
+			test_must_fail test-tool wildmatch ipathmatch 'foo/baz/bar' 'foo/**/**/bar'
 		
-ok 1839 - ipathmatch: match 'A' '[B-Za]'
+ok 329 - ipathmatch: no match 'foo/baz/bar' 'foo/**/**/bar'
 
 expecting success: 
-				printf '%s' 'A' >expect &&
-				git --icase-pathspecs ls-files -z -- '[B-Za]' >actual.raw 2>actual.err &&
+				>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 1840 - ipathmatch (via ls-files): match '[B-Za]' 'A'
+ok 330 - ipathmatch (via ls-files): no match 'foo/**/**/bar' 'foo/baz/bar'
 
 expecting success: 
 		if test -e .git/created_test_file
@@ -176984,12 +176395,12 @@
 			git clean -df
 		fi
 	
-Removing A
 Removing actual
 Removing actual.err
 Removing actual.raw
 Removing expect
-ok 1841 - cleanup after previous file test
+Removing foo/
+ok 331 - cleanup after previous file test
 
 expecting success: 
 		file=$(cat .git/expected_test_file) &&
@@ -177010,67 +176421,67 @@
 			rm .git/created_test_file
 		fi
 	
-ok 1842 - setup match file test for a
+ok 332 - setup match file test for foo/b/a/z/bar
 
 expecting success: 
-			test-tool wildmatch wildmatch 'a' '[B-Za]'
+			test-tool wildmatch wildmatch 'foo/b/a/z/bar' 'foo/**/bar'
 		
-ok 1843 - wildmatch: match 'a' '[B-Za]'
+ok 333 - wildmatch: match 'foo/b/a/z/bar' 'foo/**/bar'
 
 expecting success: 
-				printf '%s' 'a' >expect &&
-				git --glob-pathspecs ls-files -z -- '[B-Za]' >actual.raw 2>actual.err &&
+				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 1844 - wildmatch (via ls-files): match '[B-Za]' 'a'
+ok 334 - wildmatch (via ls-files): match 'foo/**/bar' 'foo/b/a/z/bar'
 
 expecting success: 
-			test-tool wildmatch iwildmatch 'a' '[B-Za]'
+			test-tool wildmatch iwildmatch 'foo/b/a/z/bar' 'foo/**/bar'
 		
-ok 1845 - iwildmatch: match 'a' '[B-Za]'
+ok 335 - iwildmatch: match 'foo/b/a/z/bar' 'foo/**/bar'
 
 expecting success: 
-				printf '%s' 'a' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[B-Za]' >actual.raw 2>actual.err &&
+				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 1846 - iwildmatch (via ls-files): match '[B-Za]' 'a'
+ok 336 - iwildmatch (via ls-files): match 'foo/**/bar' 'foo/b/a/z/bar'
 
 expecting success: 
-			test-tool wildmatch pathmatch 'a' '[B-Za]'
+			test-tool wildmatch pathmatch 'foo/b/a/z/bar' 'foo/**/bar'
 		
-ok 1847 - pathmatch: match 'a' '[B-Za]'
+ok 337 - pathmatch: match 'foo/b/a/z/bar' 'foo/**/bar'
 
 expecting success: 
-				printf '%s' 'a' >expect &&
-				git ls-files -z -- '[B-Za]' >actual.raw 2>actual.err &&
+				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 1848 - pathmatch (via ls-files): match '[B-Za]' 'a'
+ok 338 - pathmatch (via ls-files): match 'foo/**/bar' 'foo/b/a/z/bar'
 
 expecting success: 
-			test-tool wildmatch ipathmatch 'a' '[B-Za]'
+			test-tool wildmatch ipathmatch 'foo/b/a/z/bar' 'foo/**/bar'
 		
-ok 1849 - ipathmatch: match 'a' '[B-Za]'
+ok 339 - ipathmatch: match 'foo/b/a/z/bar' 'foo/**/bar'
 
 expecting success: 
-				printf '%s' 'a' >expect &&
-				git --icase-pathspecs ls-files -z -- '[B-Za]' >actual.raw 2>actual.err &&
+				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 1850 - ipathmatch (via ls-files): match '[B-Za]' 'a'
+ok 340 - ipathmatch (via ls-files): match 'foo/**/bar' 'foo/b/a/z/bar'
 
 expecting success: 
 		if test -e .git/created_test_file
@@ -177079,12 +176490,12 @@
 			git clean -df
 		fi
 	
-Removing a
 Removing actual
 Removing actual.err
 Removing actual.raw
 Removing expect
-ok 1851 - cleanup after previous file test
+Removing foo/
+ok 341 - cleanup after previous file test
 
 expecting success: 
 		file=$(cat .git/expected_test_file) &&
@@ -177105,67 +176516,67 @@
 			rm .git/created_test_file
 		fi
 	
-ok 1852 - setup match file test for A
+ok 342 - setup match file test for foo/b/a/z/bar
 
 expecting success: 
-			test_must_fail test-tool wildmatch wildmatch 'A' '[B-a]'
+			test-tool wildmatch wildmatch 'foo/b/a/z/bar' 'foo/**/**/bar'
 		
-ok 1853 - wildmatch: no match 'A' '[B-a]'
+ok 343 - wildmatch: match 'foo/b/a/z/bar' 'foo/**/**/bar'
 
 expecting success: 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- '[B-a]' >actual.raw 2>actual.err &&
+				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 1854 - wildmatch (via ls-files): no match '[B-a]' 'A'
+ok 344 - wildmatch (via ls-files): match 'foo/**/**/bar' 'foo/b/a/z/bar'
 
 expecting success: 
-			test-tool wildmatch iwildmatch 'A' '[B-a]'
+			test-tool wildmatch iwildmatch 'foo/b/a/z/bar' 'foo/**/**/bar'
 		
-ok 1855 - iwildmatch: match 'A' '[B-a]'
+ok 345 - iwildmatch: match 'foo/b/a/z/bar' 'foo/**/**/bar'
 
 expecting success: 
-				printf '%s' 'A' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[B-a]' >actual.raw 2>actual.err &&
+				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 1856 - iwildmatch (via ls-files): match '[B-a]' 'A'
+ok 346 - iwildmatch (via ls-files): match 'foo/**/**/bar' 'foo/b/a/z/bar'
 
 expecting success: 
-			test_must_fail test-tool wildmatch pathmatch 'A' '[B-a]'
+			test-tool wildmatch pathmatch 'foo/b/a/z/bar' 'foo/**/**/bar'
 		
-ok 1857 - pathmatch: no match 'A' '[B-a]'
+ok 347 - pathmatch: match 'foo/b/a/z/bar' 'foo/**/**/bar'
 
 expecting success: 
-				>expect &&
-				git ls-files -z -- '[B-a]' >actual.raw 2>actual.err &&
+				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 1858 - pathmatch (via ls-files): no match '[B-a]' 'A'
+ok 348 - pathmatch (via ls-files): match 'foo/**/**/bar' 'foo/b/a/z/bar'
 
 expecting success: 
-			test-tool wildmatch ipathmatch 'A' '[B-a]'
+			test-tool wildmatch ipathmatch 'foo/b/a/z/bar' 'foo/**/**/bar'
 		
-ok 1859 - ipathmatch: match 'A' '[B-a]'
+ok 349 - ipathmatch: match 'foo/b/a/z/bar' 'foo/**/**/bar'
 
 expecting success: 
-				printf '%s' 'A' >expect &&
-				git --icase-pathspecs ls-files -z -- '[B-a]' >actual.raw 2>actual.err &&
+				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 1860 - ipathmatch (via ls-files): match '[B-a]' 'A'
+ok 350 - ipathmatch (via ls-files): match 'foo/**/**/bar' 'foo/b/a/z/bar'
 
 expecting success: 
 		if test -e .git/created_test_file
@@ -177174,12 +176585,12 @@
 			git clean -df
 		fi
 	
-Removing A
 Removing actual
 Removing actual.err
 Removing actual.raw
 Removing expect
-ok 1861 - cleanup after previous file test
+Removing foo/
+ok 351 - cleanup after previous file test
 
 expecting success: 
 		file=$(cat .git/expected_test_file) &&
@@ -177200,67 +176611,67 @@
 			rm .git/created_test_file
 		fi
 	
-ok 1862 - setup match file test for a
+ok 352 - setup match file test for foo/bar
 
 expecting success: 
-			test-tool wildmatch wildmatch 'a' '[B-a]'
+			test-tool wildmatch wildmatch 'foo/bar' 'foo/**/bar'
 		
-ok 1863 - wildmatch: match 'a' '[B-a]'
+ok 353 - wildmatch: match 'foo/bar' 'foo/**/bar'
 
 expecting success: 
-				printf '%s' 'a' >expect &&
-				git --glob-pathspecs ls-files -z -- '[B-a]' >actual.raw 2>actual.err &&
+				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 1864 - wildmatch (via ls-files): match '[B-a]' 'a'
+ok 354 - wildmatch (via ls-files): match 'foo/**/bar' 'foo/bar'
 
 expecting success: 
-			test-tool wildmatch iwildmatch 'a' '[B-a]'
+			test-tool wildmatch iwildmatch 'foo/bar' 'foo/**/bar'
 		
-ok 1865 - iwildmatch: match 'a' '[B-a]'
+ok 355 - iwildmatch: match 'foo/bar' 'foo/**/bar'
 
 expecting success: 
-				printf '%s' 'a' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[B-a]' >actual.raw 2>actual.err &&
+				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 1866 - iwildmatch (via ls-files): match '[B-a]' 'a'
+ok 356 - iwildmatch (via ls-files): match 'foo/**/bar' 'foo/bar'
 
 expecting success: 
-			test-tool wildmatch pathmatch 'a' '[B-a]'
+			test_must_fail test-tool wildmatch pathmatch 'foo/bar' 'foo/**/bar'
 		
-ok 1867 - pathmatch: match 'a' '[B-a]'
+ok 357 - pathmatch: no match 'foo/bar' 'foo/**/bar'
 
 expecting success: 
-				printf '%s' 'a' >expect &&
-				git ls-files -z -- '[B-a]' >actual.raw 2>actual.err &&
+				>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 1868 - pathmatch (via ls-files): match '[B-a]' 'a'
+ok 358 - pathmatch (via ls-files): no match 'foo/**/bar' 'foo/bar'
 
 expecting success: 
-			test-tool wildmatch ipathmatch 'a' '[B-a]'
+			test_must_fail test-tool wildmatch ipathmatch 'foo/bar' 'foo/**/bar'
 		
-ok 1869 - ipathmatch: match 'a' '[B-a]'
+ok 359 - ipathmatch: no match 'foo/bar' 'foo/**/bar'
 
 expecting success: 
-				printf '%s' 'a' >expect &&
-				git --icase-pathspecs ls-files -z -- '[B-a]' >actual.raw 2>actual.err &&
+				>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 1870 - ipathmatch (via ls-files): match '[B-a]' 'a'
+ok 360 - ipathmatch (via ls-files): no match 'foo/**/bar' 'foo/bar'
 
 expecting success: 
 		if test -e .git/created_test_file
@@ -177269,12 +176680,12 @@
 			git clean -df
 		fi
 	
-Removing a
 Removing actual
 Removing actual.err
 Removing actual.raw
 Removing expect
-ok 1871 - cleanup after previous file test
+Removing foo/
+ok 361 - cleanup after previous file test
 
 expecting success: 
 		file=$(cat .git/expected_test_file) &&
@@ -177295,67 +176706,67 @@
 			rm .git/created_test_file
 		fi
 	
-ok 1872 - setup match file test for z
+ok 362 - setup match file test for foo/bar
 
 expecting success: 
-			test_must_fail test-tool wildmatch wildmatch 'z' '[Z-y]'
+			test-tool wildmatch wildmatch 'foo/bar' 'foo/**/**/bar'
 		
-ok 1873 - wildmatch: no match 'z' '[Z-y]'
+ok 363 - wildmatch: match 'foo/bar' 'foo/**/**/bar'
 
 expecting success: 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- '[Z-y]' >actual.raw 2>actual.err &&
+				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 1874 - wildmatch (via ls-files): no match '[Z-y]' 'z'
+ok 364 - wildmatch (via ls-files): match 'foo/**/**/bar' 'foo/bar'
 
 expecting success: 
-			test-tool wildmatch iwildmatch 'z' '[Z-y]'
+			test-tool wildmatch iwildmatch 'foo/bar' 'foo/**/**/bar'
 		
-ok 1875 - iwildmatch: match 'z' '[Z-y]'
+ok 365 - iwildmatch: match 'foo/bar' 'foo/**/**/bar'
 
 expecting success: 
-				printf '%s' 'z' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[Z-y]' >actual.raw 2>actual.err &&
+				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 1876 - iwildmatch (via ls-files): match '[Z-y]' 'z'
+ok 366 - iwildmatch (via ls-files): match 'foo/**/**/bar' 'foo/bar'
 
 expecting success: 
-			test_must_fail test-tool wildmatch pathmatch 'z' '[Z-y]'
+			test_must_fail test-tool wildmatch pathmatch 'foo/bar' 'foo/**/**/bar'
 		
-ok 1877 - pathmatch: no match 'z' '[Z-y]'
+ok 367 - pathmatch: no match 'foo/bar' 'foo/**/**/bar'
 
 expecting success: 
 				>expect &&
-				git ls-files -z -- '[Z-y]' >actual.raw 2>actual.err &&
+				git ls-files -z -- 'foo/**/**/bar' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 1878 - pathmatch (via ls-files): no match '[Z-y]' 'z'
+ok 368 - pathmatch (via ls-files): no match 'foo/**/**/bar' 'foo/bar'
 
 expecting success: 
-			test-tool wildmatch ipathmatch 'z' '[Z-y]'
+			test_must_fail test-tool wildmatch ipathmatch 'foo/bar' 'foo/**/**/bar'
 		
-ok 1879 - ipathmatch: match 'z' '[Z-y]'
+ok 369 - ipathmatch: no match 'foo/bar' 'foo/**/**/bar'
 
 expecting success: 
-				printf '%s' 'z' >expect &&
-				git --icase-pathspecs ls-files -z -- '[Z-y]' >actual.raw 2>actual.err &&
+				>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 1880 - ipathmatch (via ls-files): match '[Z-y]' 'z'
+ok 370 - ipathmatch (via ls-files): no match 'foo/**/**/bar' 'foo/bar'
 
 expecting success: 
 		if test -e .git/created_test_file
@@ -177368,8 +176779,8 @@
 Removing actual.err
 Removing actual.raw
 Removing expect
-Removing z
-ok 1881 - cleanup after previous file test
+Removing foo/
+ok 371 - cleanup after previous file test
 
 expecting success: 
 		file=$(cat .git/expected_test_file) &&
@@ -177390,15569 +176801,16019 @@
 			rm .git/created_test_file
 		fi
 	
-ok 1882 - setup match file test for Z
+ok 372 - setup match file test for foo/bar
 
 expecting success: 
-			test-tool wildmatch wildmatch 'Z' '[Z-y]'
+			test_must_fail test-tool wildmatch wildmatch 'foo/bar' 'foo?bar'
 		
-ok 1883 - wildmatch: match 'Z' '[Z-y]'
+ok 373 - wildmatch: no match 'foo/bar' 'foo?bar'
 
 expecting success: 
-				printf '%s' 'Z' >expect &&
-				git --glob-pathspecs ls-files -z -- '[Z-y]' >actual.raw 2>actual.err &&
+				>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 1884 - wildmatch (via ls-files): match '[Z-y]' 'Z'
+ok 374 - wildmatch (via ls-files): no match 'foo?bar' 'foo/bar'
 
 expecting success: 
-			test-tool wildmatch iwildmatch 'Z' '[Z-y]'
+			test_must_fail test-tool wildmatch iwildmatch 'foo/bar' 'foo?bar'
 		
-ok 1885 - iwildmatch: match 'Z' '[Z-y]'
+ok 375 - iwildmatch: no match 'foo/bar' 'foo?bar'
 
 expecting success: 
-				printf '%s' 'Z' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[Z-y]' >actual.raw 2>actual.err &&
+				>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 1886 - iwildmatch (via ls-files): match '[Z-y]' 'Z'
+ok 376 - iwildmatch (via ls-files): no match 'foo?bar' 'foo/bar'
 
 expecting success: 
-			test-tool wildmatch pathmatch 'Z' '[Z-y]'
+			test-tool wildmatch pathmatch 'foo/bar' 'foo?bar'
 		
-ok 1887 - pathmatch: match 'Z' '[Z-y]'
+ok 377 - pathmatch: match 'foo/bar' 'foo?bar'
 
 expecting success: 
-				printf '%s' 'Z' >expect &&
-				git ls-files -z -- '[Z-y]' >actual.raw 2>actual.err &&
+				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 1888 - pathmatch (via ls-files): match '[Z-y]' 'Z'
+ok 378 - pathmatch (via ls-files): match 'foo?bar' 'foo/bar'
 
 expecting success: 
-			test-tool wildmatch ipathmatch 'Z' '[Z-y]'
+			test-tool wildmatch ipathmatch 'foo/bar' 'foo?bar'
 		
-ok 1889 - ipathmatch: match 'Z' '[Z-y]'
+ok 379 - ipathmatch: match 'foo/bar' 'foo?bar'
 
 expecting success: 
-				printf '%s' 'Z' >expect &&
-				git --icase-pathspecs ls-files -z -- '[Z-y]' >actual.raw 2>actual.err &&
+				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 1890 - ipathmatch (via ls-files): match '[Z-y]' 'Z'
+ok 380 - ipathmatch (via ls-files): match 'foo?bar' 'foo/bar'
 
-# still have 40 known breakage(s)
-# passed all remaining 1850 test(s)
-1..1890
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t5534-push-signed.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5534-push-signed/.git/
 expecting success: 
-	# master, 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 &&
+		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
 
-	test_tick &&
-	git commit --allow-empty -m second
+expecting success: 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git 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
 
-[master (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: 
+			test_must_fail test-tool wildmatch wildmatch 'foo/bar' 'foo[/]bar'
+		
+ok 383 - wildmatch: no match 'foo/bar' 'foo[/]bar'
 
 expecting success: 
-	prepare_dst &&
-	mkdir -p dst/.git/hooks &&
-	write_script dst/.git/hooks/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
+				>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'
 
-	git push dst noop ff +noff &&
-	! test -f dst/push-cert
+expecting success: 
+			test_must_fail test-tool wildmatch iwildmatch 'foo/bar' 'foo[/]bar'
+		
+ok 385 - iwildmatch: no match 'foo/bar' 'foo[/]bar'
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5534-push-signed/dst/.git/
-To dst
- * [new branch]      master -> noop
- * [new branch]      master -> ff
- * [new branch]      master -> noff
-To dst
-   66fe8b3..566fbd3  ff -> ff
- + 66fe8b3...6391b7f noff -> noff (forced update)
-ok 2 - unsigned push does not send push certificate
+expecting success: 
+				>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: 
-	prepare_dst &&
-	mkdir -p dst/.git/hooks &&
-	write_script dst/.git/hooks/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
+			test-tool wildmatch pathmatch 'foo/bar' 'foo[/]bar'
+		
+ok 387 - pathmatch: match 'foo/bar' 'foo[/]bar'
 
-	git push dst noop ff +noff &&
-	! test -f dst/push-cert
+expecting success: 
+				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'
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5534-push-signed/dst/.git/
-To dst
- * [new branch]      master -> noop
- * [new branch]      master -> ff
- * [new branch]      master -> 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: 
+			test-tool wildmatch ipathmatch 'foo/bar' 'foo[/]bar'
+		
+ok 389 - ipathmatch: match 'foo/bar' 'foo[/]bar'
 
 expecting success: 
-	prepare_dst &&
-	mkdir -p dst/.git/hooks &&
-	test_must_fail git push --signed dst noop ff +noff 2>err &&
-	test_i18ngrep "the receiving end does not support" err
+				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'
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5534-push-signed/dst/.git/
-To dst
- * [new branch]      master -> noop
- * [new branch]      master -> ff
- * [new branch]      master -> noff
-fatal: the receiving end does not support --signed push
-ok 4 - push --signed fails with a receiver without push certificate support
+expecting success: 
+		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: 
-	prepare_dst &&
-	mkdir -p dst/.git/hooks &&
-	test_must_fail git push --signed=1 dst noop ff +noff 2>err &&
-	test_i18ngrep "the receiving end does not support" err
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git 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
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5534-push-signed/dst/.git/
-To dst
- * [new branch]      master -> noop
- * [new branch]      master -> ff
- * [new branch]      master -> noff
-fatal: the receiving end does not support --signed push
-ok 5 - push --signed=1 is accepted
+expecting success: 
+			test_must_fail test-tool wildmatch wildmatch 'foo/bar' 'foo[^a-z]bar'
+		
+ok 393 - wildmatch: no match 'foo/bar' 'foo[^a-z]bar'
 
-skipping test: no certificate for a signed push with no update 
-	prepare_dst &&
-	mkdir -p dst/.git/hooks &&
-	write_script dst/.git/hooks/post-receive <<-\EOF &&
-	if test -n "${GIT_PUSH_CERT-}"
-	then
-		git cat-file blob $GIT_PUSH_CERT >../push-cert
-	fi
-	EOF
-	git push dst noop &&
-	! test -f dst/push-cert
+expecting success: 
+				>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'
 
-ok 6 # skip no certificate for a signed push with no update (missing GPG)
+expecting success: 
+			test_must_fail test-tool wildmatch iwildmatch 'foo/bar' 'foo[^a-z]bar'
+		
+ok 395 - iwildmatch: no match 'foo/bar' 'foo[^a-z]bar'
 
-skipping test: signed push sends push certificate 
-	prepare_dst &&
-	mkdir -p dst/.git/hooks &&
-	git -C dst config receive.certnonceseed sekrit &&
-	write_script dst/.git/hooks/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 &&
+expecting success: 
+				>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'
 
-	cat >../push-cert-status <<E_O_F
-	SIGNER=${GIT_PUSH_CERT_SIGNER-nobody}
-	KEY=${GIT_PUSH_CERT_KEY-nokey}
-	STATUS=${GIT_PUSH_CERT_STATUS-nostatus}
-	NONCE_STATUS=${GIT_PUSH_CERT_NONCE_STATUS-nononcestatus}
-	NONCE=${GIT_PUSH_CERT_NONCE-nononce}
-	E_O_F
+expecting success: 
+			test-tool wildmatch pathmatch 'foo/bar' 'foo[^a-z]bar'
+		
+ok 397 - pathmatch: match 'foo/bar' 'foo[^a-z]bar'
 
-	EOF
+expecting success: 
+				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'
 
-	git push --signed dst noop ff +noff &&
+expecting success: 
+			test-tool wildmatch ipathmatch 'foo/bar' 'foo[^a-z]bar'
+		
+ok 399 - ipathmatch: match 'foo/bar' 'foo[^a-z]bar'
 
-	(
-		cat <<-\EOF &&
-		SIGNER=C O Mitter <committer@example.com>
-		KEY=13B6F51ECDDE430D
-		STATUS=G
-		NONCE_STATUS=OK
-		EOF
-		sed -n -e "s/^nonce /NONCE=/p" -e "/^$/q" dst/push-cert
-	) >expect &&
+expecting success: 
+				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'
 
-	noop=$(git rev-parse noop) &&
-	ff=$(git rev-parse ff) &&
-	noff=$(git rev-parse noff) &&
-	grep "$noop $ff refs/heads/ff" dst/push-cert &&
-	grep "$noop $noff refs/heads/noff" dst/push-cert &&
-	test_cmp expect dst/push-cert-status
+expecting success: 
+		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
 
-ok 7 # skip signed push sends push certificate (missing GPG)
+expecting success: 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git 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
 
-skipping test: inconsistent push options in signed push not allowed 
-	# First, invoke receive-pack with dummy input to obtain its preamble.
-	prepare_dst &&
-	git -C dst config receive.certnonceseed sekrit &&
-	git -C dst config receive.advertisepushoptions 1 &&
-	printf xxxx | test_might_fail git receive-pack dst >preamble &&
+expecting success: 
+			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'
 
-	# Then, invoke push. Simulate a receive-pack that sends the preamble we
-	# obtained, followed by a dummy packet.
-	write_script myscript <<-\EOF &&
-		cat preamble &&
-		printf xxxx &&
-		cat >push
-	EOF
-	test_might_fail git push --push-option="foo" --push-option="bar" \
-		--receive-pack="\"$(pwd)/myscript\"" --signed dst --delete ff &&
+expecting success: 
+				>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'
 
-	# Replay the push output on a fresh dst, checking that ff is truly
-	# deleted.
-	prepare_dst &&
-	git -C dst config receive.certnonceseed sekrit &&
-	git -C dst config receive.advertisepushoptions 1 &&
-	git receive-pack dst <push &&
-	test_must_fail git -C dst rev-parse ff &&
+expecting success: 
+			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'
 
-	# Tweak the push output to make the push option outside the cert
-	# different, then replay it on a fresh dst, checking that ff is not
-	# deleted.
-	perl -pe "s/([^ ])bar/\$1baz/" push >push.tweak &&
-	prepare_dst &&
-	git -C dst config receive.certnonceseed sekrit &&
-	git -C dst config receive.advertisepushoptions 1 &&
-	git receive-pack dst <push.tweak >out &&
-	git -C dst rev-parse ff &&
-	grep "inconsistent push options" out
+expecting success: 
+				>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'
 
-ok 8 # skip inconsistent push options in signed push not allowed (missing GPG)
+expecting success: 
+			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'
 
-skipping test: fail without key and heed user.signingkey 
-	prepare_dst &&
-	mkdir -p dst/.git/hooks &&
-	git -C dst config receive.certnonceseed sekrit &&
-	write_script dst/.git/hooks/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 &&
+expecting success: 
+				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'
 
-	cat >../push-cert-status <<E_O_F
-	SIGNER=${GIT_PUSH_CERT_SIGNER-nobody}
-	KEY=${GIT_PUSH_CERT_KEY-nokey}
-	STATUS=${GIT_PUSH_CERT_STATUS-nostatus}
-	NONCE_STATUS=${GIT_PUSH_CERT_NONCE_STATUS-nononcestatus}
-	NONCE=${GIT_PUSH_CERT_NONCE-nononce}
-	E_O_F
+expecting success: 
+			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'
 
-	EOF
+expecting success: 
+				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'
 
-	test_config user.email hasnokey@nowhere.com &&
-	(
-		sane_unset GIT_COMMITTER_EMAIL &&
-		test_must_fail git push --signed dst noop ff +noff
-	) &&
-	test_config user.signingkey $GIT_COMMITTER_EMAIL &&
-	git push --signed dst noop ff +noff &&
+expecting success: 
+		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
 
-	(
-		cat <<-\EOF &&
-		SIGNER=C O Mitter <committer@example.com>
-		KEY=13B6F51ECDDE430D
-		STATUS=G
-		NONCE_STATUS=OK
-		EOF
-		sed -n -e "s/^nonce /NONCE=/p" -e "/^$/q" dst/push-cert
-	) >expect &&
+expecting success: 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git 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
 
-	noop=$(git rev-parse noop) &&
-	ff=$(git rev-parse ff) &&
-	noff=$(git rev-parse noff) &&
-	grep "$noop $ff refs/heads/ff" dst/push-cert &&
-	grep "$noop $noff refs/heads/noff" dst/push-cert &&
-	test_cmp expect dst/push-cert-status
+expecting success: 
+			test-tool wildmatch wildmatch 'foo-bar' 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r'
+		
+ok 413 - wildmatch: match 'foo-bar' 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r'
 
-ok 9 # skip fail without key and heed user.signingkey (missing GPG)
+expecting success: 
+				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'
 
-skipping test: fail without key and heed user.signingkey x509 
-	test_config gpg.format x509 &&
-	prepare_dst &&
-	mkdir -p dst/.git/hooks &&
-	git -C dst config receive.certnonceseed sekrit &&
-	write_script dst/.git/hooks/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 &&
+expecting success: 
+			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'
 
-	cat >../push-cert-status <<E_O_F
-	SIGNER=${GIT_PUSH_CERT_SIGNER-nobody}
-	KEY=${GIT_PUSH_CERT_KEY-nokey}
-	STATUS=${GIT_PUSH_CERT_STATUS-nostatus}
-	NONCE_STATUS=${GIT_PUSH_CERT_NONCE_STATUS-nononcestatus}
-	NONCE=${GIT_PUSH_CERT_NONCE-nononce}
-	E_O_F
+expecting success: 
+				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'
 
-	EOF
+expecting success: 
+			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'
 
-	test_config user.email hasnokey@nowhere.com &&
-	test_config user.signingkey "" &&
-	(
-		sane_unset GIT_COMMITTER_EMAIL &&
-		test_must_fail git push --signed dst noop ff +noff
-	) &&
-	test_config user.signingkey $GIT_COMMITTER_EMAIL &&
-	git push --signed dst noop ff +noff &&
+expecting success: 
+				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'
 
-	(
-		cat <<-\EOF &&
-		SIGNER=/CN=C O Mitter/O=Example/SN=C O/GN=Mitter
-		KEY=
-		STATUS=G
-		NONCE_STATUS=OK
-		EOF
-		sed -n -e "s/^nonce /NONCE=/p" -e "/^$/q" dst/push-cert
-	) >expect.in &&
-	key=$(cat "${GNUPGHOME}/trustlist.txt" | cut -d" " -f1 | tr -d ":") &&
-	sed -e "s/^KEY=/KEY=${key}/" expect.in >expect &&
+expecting success: 
+			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'
 
-	noop=$(git rev-parse noop) &&
-	ff=$(git rev-parse ff) &&
-	noff=$(git rev-parse noff) &&
-	grep "$noop $ff refs/heads/ff" dst/push-cert &&
-	grep "$noop $noff refs/heads/noff" dst/push-cert &&
-	test_cmp expect dst/push-cert-status
+expecting success: 
+				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'
 
-ok 10 # skip fail without key and heed user.signingkey x509 (missing GPGSM)
+expecting success: 
+		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
 
-# passed all 10 test(s)
-1..10
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t5535-fetch-push-symref.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5535-fetch-push-symref/.git/
 expecting success: 
-	test_commit one &&
-	git clone . src &&
-	git clone src dst1 &&
-	git clone src dst2 &&
-	test_commit two &&
-	( cd src && git pull )
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git 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
 
-[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/git-2.20.1/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: 
+			test-tool wildmatch wildmatch 'foo' '**/foo'
+		
+ok 423 - wildmatch: match 'foo' '**/foo'
 
 expecting success: 
-	(
-		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
+				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'
 
-To ../dst1
-   d79ce16..139b20d  origin/HEAD -> origin/HEAD
-   d79ce16..139b20d  origin/master -> origin/master
-ok 2 - push
+expecting success: 
+			test-tool wildmatch iwildmatch 'foo' '**/foo'
+		
+ok 425 - iwildmatch: match 'foo' '**/foo'
 
 expecting success: 
-	(
-		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
+				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'
 
-From ../src
-   d79ce16..139b20d  origin/master -> origin/master
- * [new tag]         two           -> two
-ok 3 - fetch
+expecting success: 
+			test_must_fail test-tool wildmatch pathmatch 'foo' '**/foo'
+		
+ok 427 - pathmatch: no match 'foo' '**/foo'
 
-# passed all 3 test(s)
-1..3
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t5505-remote.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5505-remote/.git/
 expecting success: 
-	setup_repository one &&
-	setup_repository two &&
-	(
-		cd two &&
-		git branch another
-	) &&
-	git clone one test
+				>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'
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5505-remote/one/.git/
-[master (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 'master'
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5505-remote/two/.git/
-[master (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 'master'
-Cloning into 'test'...
-done.
-ok 1 - setup
+expecting success: 
+			test_must_fail test-tool wildmatch ipathmatch 'foo' '**/foo'
+		
+ok 429 - ipathmatch: no match 'foo' '**/foo'
 
 expecting success: 
-	test_config url.git@host.com:team/repo.git.insteadOf myremote &&
-	git remote add myremote git@host.com:team/repo.git
+				>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'
 
-ok 2 - add remote whose URL agrees with url.<...>.insteadOf
+expecting success: 
+		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: 
-	(
-		cd test &&
-		tokens_match origin "$(git remote)" &&
-		check_remote_track origin master side &&
-		check_tracking_branch origin HEAD master side
-	)
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git 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
 
-ok 3 - remote information for the origin
+expecting success: 
+			test-tool wildmatch wildmatch 'XXX/foo' '**/foo'
+		
+ok 433 - wildmatch: match 'XXX/foo' '**/foo'
 
 expecting success: 
-	(
-		cd test &&
-		git remote add -f second ../two &&
-		tokens_match "origin second" "$(git remote)" &&
-		check_tracking_branch second master side another &&
-		git for-each-ref "--format=%(refname)" refs/remotes |
-		sed -e "/^refs\/remotes\/origin\//d" \
-		    -e "/^refs\/remotes\/second\//d" >actual &&
-		test_must_be_empty actual
-	)
+				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'
 
-Updating second
-From ../two
- * [new branch]      another    -> second/another
- * [new branch]      master     -> second/master
- * [new branch]      side       -> second/side
-ok 4 - add another remote
+expecting success: 
+			test-tool wildmatch iwildmatch 'XXX/foo' '**/foo'
+		
+ok 435 - iwildmatch: match 'XXX/foo' '**/foo'
 
 expecting success: 
-	(
-		cd test &&
-		check_remote_track origin master side &&
-		check_remote_track second master side another
-	)
+				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'
 
-ok 5 - check remote-tracking
+expecting success: 
+			test-tool wildmatch pathmatch 'XXX/foo' '**/foo'
+		
+ok 437 - pathmatch: match 'XXX/foo' '**/foo'
 
 expecting success: 
-	(
-		cd test &&
-		case $(git config remote.second.fetch) in
-		+*) true ;;
-		 *) false ;;
-		esac
-	)
+				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'
 
-ok 6 - remote forces tracking branches
+expecting success: 
+			test-tool wildmatch ipathmatch 'XXX/foo' '**/foo'
+		
+ok 439 - ipathmatch: match 'XXX/foo' '**/foo'
 
 expecting success: 
-	(
-		cd test &&
-		git symbolic-ref refs/remotes/second/HEAD refs/remotes/second/master &&
-		git remote rm second
-	)
+				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'
 
-ok 7 - remove remote
+expecting success: 
+		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: 
-	(
-		cd test &&
-		tokens_match origin "$(git remote)" &&
-		check_remote_track origin master side &&
-		git for-each-ref "--format=%(refname)" refs/remotes |
-		sed -e "/^refs\/remotes\/origin\//d" >actual &&
-		test_must_be_empty actual
-	)
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git 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
 
-ok 8 - remove remote
+expecting success: 
+			test-tool wildmatch wildmatch 'bar/baz/foo' '**/foo'
+		
+ok 443 - wildmatch: match 'bar/baz/foo' '**/foo'
 
 expecting success: 
-	(
-		cd test &&
-		cat >expect1 <<-\EOF &&
-		Note: A branch outside the refs/remotes/ hierarchy was not removed;
-		to delete it, use:
-		  git branch -d master
-		EOF
-		cat >expect2 <<-\EOF &&
-		Note: Some branches outside the refs/remotes/ hierarchy were not removed;
-		to delete them, use:
-		  git branch -d foobranch
-		  git branch -d master
-		EOF
-		git tag footag &&
-		git config --add remote.oops.fetch "+refs/*:refs/*" &&
-		git remote remove oops 2>actual1 &&
-		git branch foobranch &&
-		git config --add remote.oops.fetch "+refs/*:refs/*" &&
-		git remote rm oops 2>actual2 &&
-		git branch -d foobranch &&
-		git tag -d footag &&
-		test_i18ncmp expect1 actual1 &&
-		test_i18ncmp expect2 actual2
-	)
+				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'
 
-Deleted branch foobranch (was 9d34b14).
-Deleted tag 'footag' (was 9d34b14)
-ok 9 - remove remote protects local branches
+expecting success: 
+			test-tool wildmatch iwildmatch 'bar/baz/foo' '**/foo'
+		
+ok 445 - iwildmatch: match 'bar/baz/foo' '**/foo'
 
 expecting success: 
-	(
-		cd test &&
-		echo "fatal: No such remote: 'foo'" >expect &&
-		test_must_fail git remote rm foo 2>actual &&
-		test_i18ncmp expect actual
-	)
+				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'
 
-ok 10 - remove errors out early when deleting non-existent branch
+expecting success: 
+			test-tool wildmatch pathmatch 'bar/baz/foo' '**/foo'
+		
+ok 447 - pathmatch: match 'bar/baz/foo' '**/foo'
 
 expecting success: 
-	test_when_finished "(
-		git -C test checkout master;
-		git -C test branch -D two;
-		git -C test config --remove-section remote.two;
-		git -C test config --remove-section branch.second;
-		true
-	)" &&
-	(
-		cd test &&
-		git remote add two ../two &&
-		git fetch two &&
-		git checkout -b second two/master^0 &&
-		git config branch.second.remote two &&
-		git checkout master &&
-		git remote rm two
-	)
+				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'
 
-From ../two
- * [new branch]      another    -> two/another
- * [new branch]      master     -> two/master
- * [new branch]      side       -> two/side
-Switched to a new branch 'second'
-Switched to branch 'master'
-Your branch is up to date with 'origin/master'.
-Already on 'master'
-Your branch is up to date with 'origin/master'.
-error: branch 'two' not found.
-fatal: no such section: remote.two
-fatal: no such section: branch.second
-ok 11 - remove remote with a branch without configured merge
+expecting success: 
+			test-tool wildmatch ipathmatch 'bar/baz/foo' '**/foo'
+		
+ok 449 - ipathmatch: match 'bar/baz/foo' '**/foo'
 
 expecting success: 
-	(
-		cd test &&
-		echo "fatal: No such remote: 'foo'" >expect &&
-		test_must_fail git remote rename foo bar 2>actual &&
-		test_i18ncmp expect actual
-	)
+				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'
 
-ok 12 - rename errors out early when deleting non-existent branch
+expecting success: 
+		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: 
-	test_config remote.foo.vcs bar &&
-	echo "fatal: remote foo already exists." >expect &&
-	test_must_fail git remote add foo bar 2>actual &&
-	test_i18ncmp expect actual
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git 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
 
-ok 13 - add existing foreign_vcs remote
+expecting success: 
+			test_must_fail test-tool wildmatch wildmatch 'bar/baz/foo' '*/foo'
+		
+ok 453 - wildmatch: no match 'bar/baz/foo' '*/foo'
 
 expecting success: 
-	test_config remote.foo.vcs bar &&
-	test_config remote.bar.vcs bar &&
-	echo "fatal: remote bar already exists." >expect &&
-	test_must_fail git remote rename foo bar 2>actual &&
-	test_i18ncmp expect actual
+				>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'
 
-ok 14 - add existing foreign_vcs remote
+expecting success: 
+			test_must_fail test-tool wildmatch iwildmatch 'bar/baz/foo' '*/foo'
+		
+ok 455 - iwildmatch: no match 'bar/baz/foo' '*/foo'
 
 expecting success: 
-	(
-		cd test &&
-		git config --add remote.origin.fetch refs/heads/master:refs/heads/upstream &&
-		git fetch &&
-		git checkout -b ahead origin/master &&
-		echo 1 >>file &&
-		test_tick &&
-		git commit -m update file &&
-		git checkout master &&
-		git branch --track octopus origin/master &&
-		git branch --track rebase origin/master &&
-		git branch -d -r origin/master &&
-		git config --add remote.two.url ../two &&
-		git config --add remote.two.pushurl ../three &&
-		git config branch.rebase.rebase true &&
-		git config branch.octopus.merge "topic-a topic-b topic-c" &&
-		(
-			cd ../one &&
-			echo 1 >file &&
-			test_tick &&
-			git commit -m update file
-		) &&
-		git config --add remote.origin.push : &&
-		git config --add remote.origin.push refs/heads/master:refs/heads/upstream &&
-		git config --add remote.origin.push +refs/tags/lastbackup &&
-		git config --add remote.two.push +refs/heads/ahead:refs/heads/master &&
-		git config --add remote.two.push refs/heads/master:refs/heads/another &&
-		git remote show origin two >output &&
-		git branch -d rebase octopus &&
-		test_i18ncmp expect output
-	)
-
-From /build/git-2.20.1/t/trash directory.t5505-remote/one
- * [new branch]      master     -> upstream
-Switched to a new branch 'ahead'
-Branch 'ahead' set up to track remote branch 'master' from 'origin'.
-[ahead 847549e] update
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Switched to branch 'master'
-Your branch is up to date with 'origin/master'.
-Branch 'octopus' set up to track remote branch 'master' from 'origin'.
-Branch 'rebase' set up to track remote branch 'master' from 'origin'.
-Deleted remote-tracking branch origin/master (was 9d34b14).
-[master 6329a3c] update
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-error: src refspec refs/tags/lastbackup does not match any.
-Deleted branch rebase (was 9d34b14).
-Deleted branch octopus (was 9d34b14).
-ok 15 - show
+				>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: 
-	mv one one.unreachable &&
-	(
-		cd test &&
-		git remote show -n origin >output &&
-		mv ../one.unreachable ../one &&
-		test_i18ncmp expect output
-	)
+			test-tool wildmatch pathmatch 'bar/baz/foo' '*/foo'
+		
+ok 457 - pathmatch: match 'bar/baz/foo' '*/foo'
 
-ok 16 - show -n
+expecting success: 
+				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: 
-	(
-		cd one &&
-		git branch -m side side2
-	) &&
-	(
-		cd test &&
-		git fetch origin &&
-		git remote prune origin &&
-		git rev-parse refs/remotes/origin/side2 &&
-		test_must_fail git rev-parse refs/remotes/origin/side
-	)
+			test-tool wildmatch ipathmatch 'bar/baz/foo' '*/foo'
+		
+ok 459 - ipathmatch: match 'bar/baz/foo' '*/foo'
 
-From /build/git-2.20.1/t/trash directory.t5505-remote/one
- * [new branch]      master     -> origin/master
- * [new branch]      side2      -> origin/side2
-   9d34b14..6329a3c  master     -> upstream
-Pruning origin
-URL: /build/git-2.20.1/t/trash directory.t5505-remote/one
- * [pruned] origin/side
-2ce9c504874e3f0ce77f83c0bb0b1024c7a6387f
-fatal: ambiguous argument 'refs/remotes/origin/side': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-refs/remotes/origin/side
-ok 17 - prune
+expecting success: 
+				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: 
-	(
-		cd test &&
-		git symbolic-ref refs/remotes/origin/HEAD &&
-		git remote set-head --delete origin &&
-		test_must_fail git symbolic-ref refs/remotes/origin/HEAD
-	)
+		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
 
-refs/remotes/origin/master
-fatal: ref refs/remotes/origin/HEAD is not a symbolic ref
-ok 18 - set-head --delete
+expecting success: 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git 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: 
-	(
-		cd test &&
-		git remote set-head --auto origin &&
-		echo refs/remotes/origin/master >expect &&
-		git symbolic-ref refs/remotes/origin/HEAD >output &&
-		test_cmp expect output
-	)
+			test_must_fail test-tool wildmatch wildmatch 'foo/bar/baz' '**/bar*'
+		
+ok 463 - wildmatch: no match 'foo/bar/baz' '**/bar*'
 
-origin/HEAD set to master
-ok 19 - set-head --auto
+expecting success: 
+				>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: 
-	(
-		cd test &&
-		git fetch two "refs/heads/*:refs/remotes/two/*" &&
-		git remote set-head --auto two >output 2>&1 &&
-		echo "two/HEAD set to master" >expect &&
-		test_i18ncmp expect output
-	)
+			test_must_fail test-tool wildmatch iwildmatch 'foo/bar/baz' '**/bar*'
+		
+ok 465 - iwildmatch: no match 'foo/bar/baz' '**/bar*'
 
-From ../two
- * [new branch]      another    -> two/another
- * [new branch]      master     -> two/master
- * [new branch]      side       -> two/side
-ok 20 - set-head --auto has no problem w/multiple HEADs
+expecting success: 
+				>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: 
-	(
-		cd test &&
-		git remote set-head origin side2 &&
-		git symbolic-ref refs/remotes/origin/HEAD >output &&
-		git remote set-head origin master &&
-		test_cmp expect output
-	)
+			test-tool wildmatch pathmatch 'foo/bar/baz' '**/bar*'
+		
+ok 467 - pathmatch: match 'foo/bar/baz' '**/bar*'
 
-ok 21 - set-head explicit
+expecting success: 
+				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: 
-	git -C one branch -m side2 side &&
-	test_when_finished "git -C one branch -m side side2" &&
-	(
-		cd test &&
-		git remote prune --dry-run origin >output &&
-		git rev-parse refs/remotes/origin/side2 &&
-		test_must_fail git rev-parse refs/remotes/origin/side &&
-		test_i18ncmp expect output
-	)
+			test-tool wildmatch ipathmatch 'foo/bar/baz' '**/bar*'
+		
+ok 469 - ipathmatch: match 'foo/bar/baz' '**/bar*'
 
-2ce9c504874e3f0ce77f83c0bb0b1024c7a6387f
-fatal: ambiguous argument 'refs/remotes/origin/side': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-refs/remotes/origin/side
-ok 22 - prune --dry-run
+expecting success: 
+				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: 
-	mkdir mirror &&
-	(
-		cd mirror &&
-		git init --bare &&
-		git remote add --mirror -f origin ../one
-	) &&
-	(
-		cd one &&
-		git branch -m side2 side
-	) &&
-	(
-		cd mirror &&
-		git rev-parse --verify refs/heads/side2 &&
-		test_must_fail git rev-parse --verify refs/heads/side &&
-		git fetch origin &&
-		git remote prune origin &&
-		test_must_fail git rev-parse --verify refs/heads/side2 &&
-		git rev-parse --verify refs/heads/side
-	)
+		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
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5505-remote/mirror/
-warning: --mirror is dangerous and deprecated; please
-	 use --mirror=fetch or --mirror=push instead
-Updating origin
-From ../one
- * [new branch]      master     -> master
- * [new branch]      side2      -> side2
-2ce9c504874e3f0ce77f83c0bb0b1024c7a6387f
-fatal: Needed a single revision
-From ../one
- * [new branch]      side       -> side
-Pruning origin
-URL: ../one
- * [pruned] refs/heads/side2
-fatal: Needed a single revision
-2ce9c504874e3f0ce77f83c0bb0b1024c7a6387f
-ok 23 - add --mirror && prune
+expecting success: 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git 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: 
-	mkdir mirror-fetch &&
-	git init mirror-fetch/parent &&
-	(
-		cd mirror-fetch/parent &&
-		test_commit one
-	) &&
-	git init --bare mirror-fetch/child &&
-	(
-		cd mirror-fetch/child &&
-		git remote add --mirror=fetch -f parent ../parent
-	)
+			test-tool wildmatch wildmatch 'deep/foo/bar/baz' '**/bar/*'
+		
+ok 473 - wildmatch: match 'deep/foo/bar/baz' '**/bar/*'
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5505-remote/mirror-fetch/parent/.git/
-[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/git-2.20.1/t/trash directory.t5505-remote/mirror-fetch/child/
-Updating parent
-From ../parent
- * [new branch]      master     -> master
- * [new tag]         one        -> one
-ok 24 - add --mirror=fetch
+expecting success: 
+				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: 
-	(
-		cd mirror-fetch/parent &&
-		git branch new &&
-		git branch -m master renamed
-	) &&
-	(
-		cd mirror-fetch/child &&
-		git fetch parent &&
-		git rev-parse --verify refs/heads/new &&
-		git rev-parse --verify refs/heads/renamed
-	)
+			test-tool wildmatch iwildmatch 'deep/foo/bar/baz' '**/bar/*'
+		
+ok 475 - iwildmatch: match 'deep/foo/bar/baz' '**/bar/*'
 
-From ../parent
- * [new branch]      new        -> new
- * [new branch]      renamed    -> renamed
-d79ce1670bdcb76e6d1da2ae095e890ccb326ae9
-d79ce1670bdcb76e6d1da2ae095e890ccb326ae9
-ok 25 - fetch mirrors act as mirrors during fetch
+expecting success: 
+				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: 
-	(
-		cd mirror-fetch/child &&
-		git remote prune parent &&
-		test_must_fail git rev-parse --verify refs/heads/master
-	)
+			test-tool wildmatch pathmatch 'deep/foo/bar/baz' '**/bar/*'
+		
+ok 477 - pathmatch: match 'deep/foo/bar/baz' '**/bar/*'
 
-Pruning parent
-URL: ../parent
- * [pruned] refs/heads/master
-fatal: Needed a single revision
-ok 26 - fetch mirrors can prune
+expecting success: 
+				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: 
-	(
-		cd mirror-fetch/parent &&
-		git checkout HEAD^0
-	) &&
-	(
-		cd mirror-fetch/child &&
-		git branch -m renamed renamed2 &&
-		git push parent :
-	) &&
-	(
-		cd mirror-fetch/parent &&
-		git rev-parse --verify renamed &&
-		test_must_fail git rev-parse --verify refs/heads/renamed2
-	)
+			test-tool wildmatch ipathmatch 'deep/foo/bar/baz' '**/bar/*'
+		
+ok 479 - ipathmatch: match 'deep/foo/bar/baz' '**/bar/*'
 
-Note: checking out 'HEAD^0'.
+expecting success: 
+				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'
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by performing another checkout.
+expecting success: 
+		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
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
+expecting success: 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git 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/
 
-  git checkout -b <new-branch-name>
+expecting success: 
+			test_must_fail test-tool wildmatch wildmatch 'deep/foo/bar/baz/' '**/bar/*'
+		
+ok 483 - wildmatch: no match 'deep/foo/bar/baz/' '**/bar/*'
 
-HEAD is now at d79ce16 one
-Everything up-to-date
-d79ce1670bdcb76e6d1da2ae095e890ccb326ae9
-fatal: Needed a single revision
-ok 27 - fetch mirrors do not act as mirrors during push
+checking known breakage: false
+not ok 484 - wildmatch (via ls-files): no match skip '**/bar/*' 'deep/foo/bar/baz/' # TODO known breakage
 
 expecting success: 
-	git init --bare mirror-fetch/track &&
-	(
-		cd mirror-fetch/track &&
-		git remote add --mirror=fetch -t heads/new parent ../parent
-	)
+			test_must_fail test-tool wildmatch iwildmatch 'deep/foo/bar/baz/' '**/bar/*'
+		
+ok 485 - iwildmatch: no match 'deep/foo/bar/baz/' '**/bar/*'
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5505-remote/mirror-fetch/track/
-ok 28 - add fetch mirror with specific branches
+checking known breakage: false
+not ok 486 - iwildmatch (via ls-files): no match skip '**/bar/*' 'deep/foo/bar/baz/' # TODO known breakage
 
 expecting success: 
-	(
-		cd mirror-fetch/track &&
-		git fetch parent &&
-		git rev-parse --verify refs/heads/new &&
-		test_must_fail git rev-parse --verify refs/heads/renamed
-	)
+			test-tool wildmatch pathmatch 'deep/foo/bar/baz/' '**/bar/*'
+		
+ok 487 - pathmatch: match 'deep/foo/bar/baz/' '**/bar/*'
 
-From ../parent
- * [new branch]      new        -> new
- * [new tag]         one        -> one
-d79ce1670bdcb76e6d1da2ae095e890ccb326ae9
-fatal: Needed a single revision
-ok 29 - fetch mirror respects specific branches
+checking known breakage: false
+not ok 488 - pathmatch (via ls-files): match skip '**/bar/*' 'deep/foo/bar/baz/' # TODO known breakage
 
 expecting success: 
-	mkdir mirror-push &&
-	git init --bare mirror-push/public &&
-	git init mirror-push/private &&
-	(
-		cd mirror-push/private &&
-		test_commit one &&
-		git remote add --mirror=push public ../public
-	)
+			test-tool wildmatch ipathmatch 'deep/foo/bar/baz/' '**/bar/*'
+		
+ok 489 - ipathmatch: match 'deep/foo/bar/baz/' '**/bar/*'
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5505-remote/mirror-push/public/
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5505-remote/mirror-push/private/.git/
-[master (root-commit) d79ce16] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-ok 30 - add --mirror=push
+checking known breakage: false
+not ok 490 - ipathmatch (via ls-files): match skip '**/bar/*' 'deep/foo/bar/baz/' # TODO known breakage
 
 expecting success: 
-	(
-		cd mirror-push/private &&
-		git branch new &&
-		git branch -m master renamed &&
-		git push public
-	) &&
-	(
-		cd mirror-push/private &&
-		git rev-parse --verify refs/heads/new &&
-		git rev-parse --verify refs/heads/renamed &&
-		test_must_fail git rev-parse --verify refs/heads/master
-	)
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+ok 491 - cleanup after previous file test
 
-To ../public
- * [new branch]      new -> new
- * [new branch]      renamed -> renamed
- * [new tag]         one -> one
-d79ce1670bdcb76e6d1da2ae095e890ccb326ae9
-d79ce1670bdcb76e6d1da2ae095e890ccb326ae9
-fatal: Needed a single revision
-ok 31 - push mirrors act as mirrors during push
+expecting success: 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git 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: 
-	(
-		cd mirror-push/public &&
-		git branch -m renamed renamed2 &&
-		git symbolic-ref HEAD refs/heads/renamed2
-	) &&
-	(
-		cd mirror-push/private &&
-		git fetch public &&
-		git rev-parse --verify refs/heads/renamed &&
-		test_must_fail git rev-parse --verify refs/heads/renamed2
-	)
+			test-tool wildmatch wildmatch 'deep/foo/bar/baz/' '**/bar/**'
+		
+ok 493 - wildmatch: match 'deep/foo/bar/baz/' '**/bar/**'
 
-From ../public
- * branch            HEAD       -> FETCH_HEAD
-d79ce1670bdcb76e6d1da2ae095e890ccb326ae9
-fatal: Needed a single revision
-ok 32 - push mirrors do not act as mirrors during fetch
+checking known breakage: false
+not ok 494 - wildmatch (via ls-files): match skip '**/bar/**' 'deep/foo/bar/baz/' # TODO known breakage
 
 expecting success: 
-	git init mirror-push/track &&
-	(
-		cd mirror-push/track &&
-		test_must_fail git remote add --mirror=push -t new public ../public
-	)
+			test-tool wildmatch iwildmatch 'deep/foo/bar/baz/' '**/bar/**'
+		
+ok 495 - iwildmatch: match 'deep/foo/bar/baz/' '**/bar/**'
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5505-remote/mirror-push/track/.git/
-fatal: specifying branches to track makes sense only with fetch mirrors
-ok 33 - push mirrors do not allow you to specify refs
+checking known breakage: false
+not ok 496 - iwildmatch (via ls-files): match skip '**/bar/**' 'deep/foo/bar/baz/' # TODO known breakage
 
 expecting success: 
-	mkdir alttst &&
-	(
-		cd alttst &&
-		git init &&
-		git remote add -f origin ../one &&
-		git config remote.alt.url ../one &&
-		git config remote.alt.fetch "+refs/heads/*:refs/remotes/origin/*"
-	) &&
-	(
-		cd one &&
-		git branch -m side side2
-	) &&
-	(
-		cd alttst &&
-		git rev-parse --verify refs/remotes/origin/side &&
-		test_must_fail git rev-parse --verify refs/remotes/origin/side2 &&
-		git fetch alt &&
-		git remote prune alt &&
-		test_must_fail git rev-parse --verify refs/remotes/origin/side &&
-		git rev-parse --verify refs/remotes/origin/side2
-	)
+			test-tool wildmatch pathmatch 'deep/foo/bar/baz/' '**/bar/**'
+		
+ok 497 - pathmatch: match 'deep/foo/bar/baz/' '**/bar/**'
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5505-remote/alttst/.git/
-Updating origin
-From ../one
- * [new branch]      master     -> origin/master
- * [new branch]      side       -> origin/side
-2ce9c504874e3f0ce77f83c0bb0b1024c7a6387f
-fatal: Needed a single revision
-From ../one
- * [new branch]      side2      -> origin/side2
-Pruning alt
-URL: ../one
- * [pruned] origin/side
-fatal: Needed a single revision
-2ce9c504874e3f0ce77f83c0bb0b1024c7a6387f
-ok 34 - add alt && prune
+checking known breakage: false
+not ok 498 - pathmatch (via ls-files): match skip '**/bar/**' 'deep/foo/bar/baz/' # TODO known breakage
 
 expecting success: 
-	(
-		cd one &&
-		>foobar &&
-		git add foobar &&
-		git commit -m "Foobar" &&
-		git tag -a -m "Foobar tag" foobar-tag &&
-		git reset --hard HEAD~1 &&
-		git tag -a -m "Some tag" some-tag
-	) &&
-	mkdir add-tags &&
-	(
-		cd add-tags &&
-		git init &&
-		git remote add -f origin ../one &&
-		git tag -l some-tag >../test/output &&
-		git tag -l foobar-tag >>../test/output &&
-		test_must_fail git config remote.origin.tagopt
-	) &&
-	test_cmp test/expect test/output
+			test-tool wildmatch ipathmatch 'deep/foo/bar/baz/' '**/bar/**'
+		
+ok 499 - ipathmatch: match 'deep/foo/bar/baz/' '**/bar/**'
 
-[master 934c37f] Foobar
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 foobar
-HEAD is now at 6329a3c update
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5505-remote/add-tags/.git/
-Updating origin
-From ../one
- * [new branch]      master     -> origin/master
- * [new branch]      side2      -> origin/side2
- * [new tag]         some-tag   -> some-tag
-ok 35 - add with reachable tags (default)
+checking known breakage: false
+not ok 500 - ipathmatch (via ls-files): match skip '**/bar/**' 'deep/foo/bar/baz/' # TODO known breakage
 
 expecting success: 
-	rm -rf add-tags &&
-	(
-		mkdir add-tags &&
-		cd add-tags &&
-		git init &&
-		git remote add -f --tags origin ../one &&
-		git tag -l some-tag >../test/output &&
-		git tag -l foobar-tag >>../test/output &&
-		git config remote.origin.tagopt >>../test/output
-	) &&
-	test_cmp test/expect test/output
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+ok 501 - cleanup after previous file test
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5505-remote/add-tags/.git/
-Updating origin
-From ../one
- * [new branch]      master     -> origin/master
- * [new branch]      side2      -> origin/side2
- * [new tag]         foobar-tag -> foobar-tag
- * [new tag]         some-tag   -> some-tag
-ok 36 - add --tags
+expecting success: 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git 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: 
-	rm -rf add-tags &&
-	(
-		mkdir add-no-tags &&
-		cd add-no-tags &&
-		git init &&
-		git remote add -f --no-tags origin ../one &&
-		git tag -l some-tag >../test/output &&
-		git tag -l foobar-tag >../test/output &&
-		git config remote.origin.tagopt >>../test/output
-	) &&
-	(
-		cd one &&
-		git tag -d some-tag foobar-tag
-	) &&
-	test_cmp test/expect test/output
+			test_must_fail test-tool wildmatch wildmatch 'deep/foo/bar' '**/bar/*'
+		
+ok 503 - wildmatch: no match 'deep/foo/bar' '**/bar/*'
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5505-remote/add-no-tags/.git/
-Updating origin
-From ../one
- * [new branch]      master     -> origin/master
- * [new branch]      side2      -> origin/side2
-Deleted tag 'some-tag' (was 217f71b)
-Deleted tag 'foobar-tag' (was 582b5b8)
-ok 37 - add --no-tags
+expecting success: 
+				>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: 
-	(
-		cd add-no-tags &&
-		test_must_fail git remote add -f --no-no-tags neworigin ../one
-	)
+			test_must_fail test-tool wildmatch iwildmatch 'deep/foo/bar' '**/bar/*'
+		
+ok 505 - iwildmatch: no match 'deep/foo/bar' '**/bar/*'
 
-error: unknown option `no-no-tags'
-usage: git remote add [<options>] <name> <url>
+expecting success: 
+				>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'
 
-    -f, --fetch           fetch the remote branches
-    --tags                import all tags and associated objects when fetching
-                          or do not fetch any tag at all (--no-tags)
-    -t, --track <branch>  branch(es) to track
-    -m, --master <branch>
-                          master branch
-    --mirror[=(push|fetch)]
-                          set up remote as a mirror to push to or fetch from
+expecting success: 
+			test_must_fail test-tool wildmatch pathmatch 'deep/foo/bar' '**/bar/*'
+		
+ok 507 - pathmatch: no match 'deep/foo/bar' '**/bar/*'
 
-ok 38 - reject --no-no-tags
+expecting success: 
+				>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: 
-	(
-		cd one &&
-		git remote add drosophila ../two &&
-		git remote add apis ../mirror &&
-		git remote update &&
-		git branch -r >output &&
-		test_cmp expect output
-	)
+			test_must_fail test-tool wildmatch ipathmatch 'deep/foo/bar' '**/bar/*'
+		
+ok 509 - ipathmatch: no match 'deep/foo/bar' '**/bar/*'
 
-Fetching drosophila
-From ../two
- * [new branch]      another    -> drosophila/another
- * [new branch]      master     -> drosophila/master
- * [new branch]      side       -> drosophila/side
-Fetching apis
-From ../mirror
- * [new branch]      master     -> apis/master
- * [new branch]      side       -> apis/side
-ok 39 - update
+expecting success: 
+				>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: 
-	(
-		cd one &&
-		for b in $(git branch -r)
-		do
-		git branch -r -d $b || exit 1
-		done &&
-		git remote add manduca ../mirror &&
-		git remote add megaloprepus ../mirror &&
-		git config remotes.phobaeticus "drosophila megaloprepus" &&
-		git config remotes.titanus manduca &&
-		git remote update phobaeticus titanus &&
-		git branch -r >output &&
-		test_cmp expect output
-	)
+		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
 
-Deleted remote-tracking branch apis/master (was 6329a3c).
-Deleted remote-tracking branch apis/side (was 2ce9c50).
-Deleted remote-tracking branch drosophila/another (was 9d34b14).
-Deleted remote-tracking branch drosophila/master (was 9d34b14).
-Deleted remote-tracking branch drosophila/side (was 2ce9c50).
-Fetching drosophila
-From ../two
- * [new branch]      another    -> drosophila/another
- * [new branch]      master     -> drosophila/master
- * [new branch]      side       -> drosophila/side
-Fetching megaloprepus
-From ../mirror
- * [new branch]      master     -> megaloprepus/master
- * [new branch]      side       -> megaloprepus/side
-Fetching manduca
-From ../mirror
- * [new branch]      master     -> manduca/master
- * [new branch]      side       -> manduca/side
-ok 40 - update with arguments
+expecting success: 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git 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: 
-	(
-		cd one &&
-		git branch -m side2 side3
-	) &&
-	(
-		cd test &&
-		git remote update --prune &&
-		(
-			cd ../one &&
-			git branch -m side3 side2
-		) &&
-		git rev-parse refs/remotes/origin/side3 &&
-		test_must_fail git rev-parse refs/remotes/origin/side2
-	)
+			test-tool wildmatch wildmatch 'deep/foo/bar/' '**/bar/**'
+		
+ok 513 - wildmatch: match 'deep/foo/bar/' '**/bar/**'
 
-Fetching origin
-From /build/git-2.20.1/t/trash directory.t5505-remote/one
- - [deleted]         (none)     -> origin/side2
- * [new branch]      side3      -> origin/side3
-Fetching two
-From ../two
- * branch            HEAD       -> FETCH_HEAD
-2ce9c504874e3f0ce77f83c0bb0b1024c7a6387f
-fatal: ambiguous argument 'refs/remotes/origin/side2': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-refs/remotes/origin/side2
-ok 41 - update --prune
+checking known breakage: false
+not ok 514 - wildmatch (via ls-files): match skip '**/bar/**' 'deep/foo/bar/' # TODO known breakage
 
 expecting success: 
-	(
-		cd one &&
-		for b in $(git branch -r)
-		do
-		git branch -r -d $b || exit 1
-		done &&
-		git config remote.drosophila.skipDefaultUpdate true &&
-		git remote update default &&
-		git branch -r >output &&
-		test_cmp expect output
-	)
+			test-tool wildmatch iwildmatch 'deep/foo/bar/' '**/bar/**'
+		
+ok 515 - iwildmatch: match 'deep/foo/bar/' '**/bar/**'
 
-Deleted remote-tracking branch drosophila/another (was 9d34b14).
-Deleted remote-tracking branch drosophila/master (was 9d34b14).
-Deleted remote-tracking branch drosophila/side (was 2ce9c50).
-Deleted remote-tracking branch manduca/master (was 6329a3c).
-Deleted remote-tracking branch manduca/side (was 2ce9c50).
-Deleted remote-tracking branch megaloprepus/master (was 6329a3c).
-Deleted remote-tracking branch megaloprepus/side (was 2ce9c50).
-Fetching apis
-From ../mirror
- * [new branch]      master     -> apis/master
- * [new branch]      side       -> apis/side
-Fetching manduca
-From ../mirror
- * [new branch]      master     -> manduca/master
- * [new branch]      side       -> manduca/side
-Fetching megaloprepus
-From ../mirror
- * [new branch]      master     -> megaloprepus/master
- * [new branch]      side       -> megaloprepus/side
-ok 42 - update default
+checking known breakage: false
+not ok 516 - iwildmatch (via ls-files): match skip '**/bar/**' 'deep/foo/bar/' # TODO known breakage
 
 expecting success: 
-	(
-		cd one &&
-		for b in $(git branch -r)
-		do
-		git branch -r -d $b || exit 1
-		done &&
-		git config remotes.default "$(printf "\t drosophila  \n")" &&
-		git remote update default &&
-		git branch -r >output &&
-		test_cmp expect output
-	)
+			test-tool wildmatch pathmatch 'deep/foo/bar/' '**/bar/**'
+		
+ok 517 - pathmatch: match 'deep/foo/bar/' '**/bar/**'
 
-Deleted remote-tracking branch apis/master (was 6329a3c).
-Deleted remote-tracking branch apis/side (was 2ce9c50).
-Deleted remote-tracking branch manduca/master (was 6329a3c).
-Deleted remote-tracking branch manduca/side (was 2ce9c50).
-Deleted remote-tracking branch megaloprepus/master (was 6329a3c).
-Deleted remote-tracking branch megaloprepus/side (was 2ce9c50).
-Fetching drosophila
-From ../two
- * [new branch]      another    -> drosophila/another
- * [new branch]      master     -> drosophila/master
- * [new branch]      side       -> drosophila/side
-ok 43 - update default (overridden, with funny whitespace)
+checking known breakage: false
+not ok 518 - pathmatch (via ls-files): match skip '**/bar/**' 'deep/foo/bar/' # TODO known breakage
 
 expecting success: 
-	(
-		cd one &&
-		for b in $(git branch -r)
-		do
-		git branch -r -d $b || exit 1
-		done &&
-		git config remotes.default "drosophila" &&
-		git remote update &&
-		git branch -r >output &&
-		test_cmp expect output
-	)
+			test-tool wildmatch ipathmatch 'deep/foo/bar/' '**/bar/**'
+		
+ok 519 - ipathmatch: match 'deep/foo/bar/' '**/bar/**'
 
-Deleted remote-tracking branch drosophila/another (was 9d34b14).
-Deleted remote-tracking branch drosophila/master (was 9d34b14).
-Deleted remote-tracking branch drosophila/side (was 2ce9c50).
-Fetching drosophila
-From ../two
- * [new branch]      another    -> drosophila/another
- * [new branch]      master     -> drosophila/master
- * [new branch]      side       -> drosophila/side
-ok 44 - update (with remotes.default defined)
+checking known breakage: false
+not ok 520 - ipathmatch (via ls-files): match skip '**/bar/**' 'deep/foo/bar/' # TODO known breakage
 
 expecting success: 
-	git clone one three &&
-	(
-		cd three &&
-		git remote show origin >output &&
-		! grep "^ *HEAD$" < output &&
-		! grep -i stale < output
-	)
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+ok 521 - cleanup after previous file test
 
-Cloning into 'three'...
-done.
-ok 45 - "remote show" does not show symbolic refs
+expecting success: 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git 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: 
-	test_must_fail git remote add some:url desired-name
+			test_must_fail test-tool wildmatch wildmatch 'foo/bar/baz' '**/bar**'
+		
+ok 523 - wildmatch: no match 'foo/bar/baz' '**/bar**'
 
-fatal: 'some:url' is not a valid remote name
-ok 46 - reject adding remote with an invalid name
+expecting success: 
+				>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: 
-	git clone one four &&
-	(
-		cd four &&
-		git remote rename origin upstream &&
-		test -z "$(git for-each-ref refs/remotes/origin)" &&
-		test "$(git symbolic-ref refs/remotes/upstream/HEAD)" = "refs/remotes/upstream/master" &&
-		test "$(git rev-parse upstream/master)" = "$(git rev-parse master)" &&
-		test "$(git config remote.upstream.fetch)" = "+refs/heads/*:refs/remotes/upstream/*" &&
-		test "$(git config branch.master.remote)" = "upstream"
-	)
+			test_must_fail test-tool wildmatch iwildmatch 'foo/bar/baz' '**/bar**'
+		
+ok 525 - iwildmatch: no match 'foo/bar/baz' '**/bar**'
 
-Cloning into 'four'...
-done.
-ok 47 - rename a remote
+expecting success: 
+				>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: 
-	git clone one four.one &&
-	(
-		cd four.one &&
-		git config remote.origin.fetch +refs/heads/*:refs/heads/origin/* &&
-		git remote rename origin upstream &&
-		test "$(git config remote.upstream.fetch)" = "+refs/heads/*:refs/heads/origin/*" &&
-		git rev-parse -q origin/master
-	)
+			test-tool wildmatch pathmatch 'foo/bar/baz' '**/bar**'
+		
+ok 527 - pathmatch: match 'foo/bar/baz' '**/bar**'
 
-Cloning into 'four.one'...
-done.
-warning: Not updating non-default fetch refspec
-	+refs/heads/*:refs/heads/origin/*
-	Please update the configuration manually if necessary.
-6329a3ca5268a0b28a1dc29b602e8b72a0bc1b37
-ok 48 - rename does not update a non-default fetch refspec
+expecting success: 
+				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: 
-	git clone one four.two &&
-	(
-		cd four.two &&
-		git remote rename origin remote &&
-		git remote rename remote upstream &&
-		test "$(git config remote.upstream.fetch)" = "+refs/heads/*:refs/remotes/upstream/*"
-	)
+			test-tool wildmatch ipathmatch 'foo/bar/baz' '**/bar**'
+		
+ok 529 - ipathmatch: match 'foo/bar/baz' '**/bar**'
 
-Cloning into 'four.two'...
-done.
-ok 49 - rename a remote with name part of fetch spec
+expecting success: 
+				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: 
-	git clone one four.three &&
-	(
-		cd four.three &&
-		git remote add o git://example.com/repo.git &&
-		git remote rename o upstream &&
-		test "$(git rev-parse origin/master)" = "$(git rev-parse master)"
-	)
+		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
 
-Cloning into 'four.three'...
-done.
-ok 50 - rename a remote with name prefix of other remote
+expecting success: 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git 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: 
-	git clone one four.four &&
-	test_when_finished git config --global --unset remote.upstream.prune &&
-	git config --global remote.upstream.prune true &&
-	git -C four.four remote rename origin upstream
+			test-tool wildmatch wildmatch 'foo/bar/baz/x' '*/bar/**'
+		
+ok 533 - wildmatch: match 'foo/bar/baz/x' '*/bar/**'
 
-Cloning into 'four.four'...
-done.
-ok 51 - rename succeeds with existing remote.<target>.prune
+expecting success: 
+				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: 
-	git clone one five &&
-	origin_url=$(pwd)/one &&
-	(
-		cd five &&
-		git remote remove origin &&
-		mkdir -p .git/remotes &&
-		cat ../remotes_origin >.git/remotes/origin &&
-		git remote rename origin origin &&
-		test_path_is_missing .git/remotes/origin &&
-		test "$(git config remote.origin.url)" = "$origin_url" &&
-		cat >push_expected <<-\EOF &&
-		refs/heads/master:refs/heads/upstream
-		refs/heads/next:refs/heads/upstream2
-		EOF
-		cat >fetch_expected <<-\EOF &&
-		refs/heads/master:refs/heads/origin
-		refs/heads/next:refs/heads/origin2
-		EOF
-		git config --get-all remote.origin.push >push_actual &&
-		git config --get-all remote.origin.fetch >fetch_actual &&
-		test_cmp push_expected push_actual &&
-		test_cmp fetch_expected fetch_actual
-	)
+			test-tool wildmatch iwildmatch 'foo/bar/baz/x' '*/bar/**'
+		
+ok 535 - iwildmatch: match 'foo/bar/baz/x' '*/bar/**'
 
-Cloning into 'five'...
-done.
-ok 52 - migrate a remote from named file in $GIT_DIR/remotes
+expecting success: 
+				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: 
-	git clone one six &&
-	origin_url=$(pwd)/one &&
-	(
-		cd six &&
-		git remote rm origin &&
-		echo "$origin_url" >.git/branches/origin &&
-		git remote rename origin origin &&
-		test_path_is_missing .git/branches/origin &&
-		test "$(git config remote.origin.url)" = "$origin_url" &&
-		test "$(git config remote.origin.fetch)" = "refs/heads/master:refs/heads/origin" &&
-		test "$(git config remote.origin.push)" = "HEAD:refs/heads/master"
-	)
+			test-tool wildmatch pathmatch 'foo/bar/baz/x' '*/bar/**'
+		
+ok 537 - pathmatch: match 'foo/bar/baz/x' '*/bar/**'
 
-Cloning into 'six'...
-done.
-ok 53 - migrate a remote from named file in $GIT_DIR/branches
+expecting success: 
+				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: 
-	git clone one seven &&
-	(
-		cd seven &&
-		git remote rm origin &&
-		echo "quux#foom" > .git/branches/origin &&
-		git remote rename origin origin &&
-		test_path_is_missing .git/branches/origin &&
-		test "$(git config remote.origin.url)" = "quux" &&
-		test "$(git config remote.origin.fetch)" = "refs/heads/foom:refs/heads/origin" &&
-		test "$(git config remote.origin.push)" = "HEAD:refs/heads/foom"
-	)
+			test-tool wildmatch ipathmatch 'foo/bar/baz/x' '*/bar/**'
+		
+ok 539 - ipathmatch: match 'foo/bar/baz/x' '*/bar/**'
 
-Cloning into 'seven'...
-done.
-ok 54 - migrate a remote from named file in $GIT_DIR/branches (2)
+expecting success: 
+				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: 
-	git clone one eight &&
-	(
-		cd one &&
-		git checkout side2 &&
-		git branch -D master
-	) &&
-	(
-		cd eight &&
-		git remote prune origin
-	) >err 2>&1 &&
-	test_i18ngrep "has become dangling" err &&
+		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
 
-	: And the dangling symref will not cause other annoying errors &&
-	(
-		cd eight &&
-		git branch -a
-	) 2>err &&
-	! grep "points nowhere" err &&
-	(
-		cd eight &&
-		test_must_fail git branch nomore origin
-	) 2>err &&
-	test_i18ngrep "dangling symref" err
+expecting success: 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git 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
 
-Cloning into 'eight'...
-done.
-Switched to branch 'side2'
-Deleted branch master (was 6329a3c).
- refs/remotes/origin/HEAD has become dangling!
-* master
-  remotes/origin/side2
-warning: ignoring dangling symref refs/remotes/origin/HEAD
-ok 55 - remote prune to cause a dangling symref
+expecting success: 
+			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: 
-	test_create_repo empty &&
-	git clone empty empty-clone &&
-	(
-		cd empty-clone &&
-		git remote show origin
-	)
+				>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'
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5505-remote/empty/.git/
-Cloning into 'empty-clone'...
-warning: You appear to have cloned an empty repository.
-done.
-* remote origin
-  Fetch URL: /build/git-2.20.1/t/trash directory.t5505-remote/empty
-  Push  URL: /build/git-2.20.1/t/trash directory.t5505-remote/empty
-  HEAD branch: (unknown)
-  Local branch configured for 'git pull':
-    master merges with remote master
-ok 56 - show empty remote
+expecting success: 
+			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: 
-	test_must_fail git remote set-branches &&
-	test_must_fail git remote set-branches --add
+				>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'
 
-error: no remote specified
-usage: git remote set-branches <name> <branch>...
-   or: git remote set-branches --add <name> <branch>...
+expecting success: 
+			test-tool wildmatch pathmatch 'deep/foo/bar/baz/x' '*/bar/**'
+		
+ok 547 - pathmatch: match 'deep/foo/bar/baz/x' '*/bar/**'
 
-    --add                 add branch
+expecting success: 
+				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'
 
-error: no remote specified
-usage: git remote set-branches <name> <branch>...
-   or: git remote set-branches --add <name> <branch>...
+expecting success: 
+			test-tool wildmatch ipathmatch 'deep/foo/bar/baz/x' '*/bar/**'
+		
+ok 549 - ipathmatch: match 'deep/foo/bar/baz/x' '*/bar/**'
 
-    --add                 add branch
+expecting success: 
+				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'
 
-ok 57 - remote set-branches requires a remote
+expecting success: 
+		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: 
-	echo "+refs/heads/*:refs/remotes/scratch/*" >expect.initial &&
-	sort <<-\EOF >expect.add &&
-	+refs/heads/*:refs/remotes/scratch/*
-	+refs/heads/other:refs/remotes/scratch/other
-	EOF
-	sort <<-\EOF >expect.replace &&
-	+refs/heads/maint:refs/remotes/scratch/maint
-	+refs/heads/master:refs/remotes/scratch/master
-	+refs/heads/next:refs/remotes/scratch/next
-	EOF
-	sort <<-\EOF >expect.add-two &&
-	+refs/heads/maint:refs/remotes/scratch/maint
-	+refs/heads/master:refs/remotes/scratch/master
-	+refs/heads/next:refs/remotes/scratch/next
-	+refs/heads/pu:refs/remotes/scratch/pu
-	+refs/heads/t/topic:refs/remotes/scratch/t/topic
-	EOF
-	sort <<-\EOF >expect.setup-ffonly &&
-	refs/heads/master:refs/remotes/scratch/master
-	+refs/heads/next:refs/remotes/scratch/next
-	EOF
-	sort <<-\EOF >expect.respect-ffonly &&
-	refs/heads/master:refs/remotes/scratch/master
-	+refs/heads/next:refs/remotes/scratch/next
-	+refs/heads/pu:refs/remotes/scratch/pu
-	EOF
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git 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
 
-	git clone .git/ setbranches &&
-	(
-		cd setbranches &&
-		git remote rename origin scratch &&
-		git config --get-all remote.scratch.fetch >config-result &&
-		sort <config-result >../actual.initial &&
+expecting success: 
+			test-tool wildmatch wildmatch 'deep/foo/bar/baz/x' '**/bar/*/*'
+		
+ok 553 - wildmatch: match 'deep/foo/bar/baz/x' '**/bar/*/*'
 
-		git remote set-branches scratch --add other &&
-		git config --get-all remote.scratch.fetch >config-result &&
-		sort <config-result >../actual.add &&
+expecting success: 
+				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'
 
-		git remote set-branches scratch maint master next &&
-		git config --get-all remote.scratch.fetch >config-result &&
-		sort <config-result >../actual.replace &&
+expecting success: 
+			test-tool wildmatch iwildmatch 'deep/foo/bar/baz/x' '**/bar/*/*'
+		
+ok 555 - iwildmatch: match 'deep/foo/bar/baz/x' '**/bar/*/*'
 
-		git remote set-branches --add scratch pu t/topic &&
-		git config --get-all remote.scratch.fetch >config-result &&
-		sort <config-result >../actual.add-two &&
+expecting success: 
+				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'
 
-		git config --unset-all remote.scratch.fetch &&
-		git config remote.scratch.fetch \
-			refs/heads/master:refs/remotes/scratch/master &&
-		git config --add remote.scratch.fetch \
-			+refs/heads/next:refs/remotes/scratch/next &&
-		git config --get-all remote.scratch.fetch >config-result &&
-		sort <config-result >../actual.setup-ffonly &&
+expecting success: 
+			test-tool wildmatch pathmatch 'deep/foo/bar/baz/x' '**/bar/*/*'
+		
+ok 557 - pathmatch: match 'deep/foo/bar/baz/x' '**/bar/*/*'
 
-		git remote set-branches --add scratch pu &&
-		git config --get-all remote.scratch.fetch >config-result &&
-		sort <config-result >../actual.respect-ffonly
-	) &&
-	test_cmp expect.initial actual.initial &&
-	test_cmp expect.add actual.add &&
-	test_cmp expect.replace actual.replace &&
-	test_cmp expect.add-two actual.add-two &&
-	test_cmp expect.setup-ffonly actual.setup-ffonly &&
-	test_cmp expect.respect-ffonly actual.respect-ffonly
+expecting success: 
+				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'
 
-Cloning into 'setbranches'...
-warning: You appear to have cloned an empty repository.
-done.
-ok 58 - remote set-branches
+expecting success: 
+			test-tool wildmatch ipathmatch 'deep/foo/bar/baz/x' '**/bar/*/*'
+		
+ok 559 - ipathmatch: match 'deep/foo/bar/baz/x' '**/bar/*/*'
 
 expecting success: 
-	echo "+refs/*:refs/*" >expect.initial &&
-	echo "+refs/heads/master:refs/heads/master" >expect.replace &&
-	git clone --mirror .git/ setbranches-mirror &&
-	(
-		cd setbranches-mirror &&
-		git remote rename origin scratch &&
-		git config --get-all remote.scratch.fetch >../actual.initial &&
+				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'
 
-		git remote set-branches scratch heads/master &&
-		git config --get-all remote.scratch.fetch >../actual.replace
-	) &&
-	test_cmp expect.initial actual.initial &&
-	test_cmp expect.replace actual.replace
+expecting success: 
+		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
 
-Cloning into bare repository 'setbranches-mirror'...
-warning: You appear to have cloned an empty repository.
-done.
-warning: Not updating non-default fetch refspec
-	+refs/*:refs/*
-	Please update the configuration manually if necessary.
-ok 59 - remote set-branches with --mirror
+expecting success: 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git 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: 
-	git remote add someremote foo &&
-	echo foo >expect &&
-	git config --get-all remote.someremote.url >actual &&
-	cmp expect actual
+			test_must_fail test-tool wildmatch wildmatch 'acrt' 'a[c-c]st'
+		
+ok 563 - wildmatch: no match 'acrt' 'a[c-c]st'
 
-ok 60 - new remote
+expecting success: 
+				>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: 
-	echo foo | get_url_test someremote &&
-	echo foo | get_url_test --all someremote &&
-	echo foo | get_url_test --push someremote &&
-	echo foo | get_url_test --push --all someremote
+			test_must_fail test-tool wildmatch iwildmatch 'acrt' 'a[c-c]st'
+		
+ok 565 - iwildmatch: no match 'acrt' 'a[c-c]st'
 
-ok 61 - get-url on new remote
+expecting success: 
+				>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: 
-	test_when_finished "rm -f .git/config.lock" &&
-	git config --get-all remote.someremote.url >expect &&
-	>.git/config.lock &&
-	test_must_fail git remote set-url someremote baz &&
-	git config --get-all remote.someremote.url >actual &&
-	cmp expect actual
+			test_must_fail test-tool wildmatch pathmatch 'acrt' 'a[c-c]st'
+		
+ok 567 - pathmatch: no match 'acrt' 'a[c-c]st'
 
-error: could not lock config file .git/config: File exists
-fatal: could not set 'remote.someremote.url' to 'baz'
-ok 62 - remote set-url with locked config
+expecting success: 
+				>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: 
-	git remote set-url someremote bar &&
-	echo bar >expect &&
-	git config --get-all remote.someremote.url >actual &&
-	cmp expect actual
+			test_must_fail test-tool wildmatch ipathmatch 'acrt' 'a[c-c]st'
+		
+ok 569 - ipathmatch: no match 'acrt' 'a[c-c]st'
 
-ok 63 - remote set-url bar
+expecting success: 
+				>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: 
-	git remote set-url someremote baz bar &&
-	echo baz >expect &&
-	git config --get-all remote.someremote.url >actual &&
-	cmp expect actual
+		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
 
-ok 64 - remote set-url baz bar
+expecting success: 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git 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: 
-	test_must_fail git remote set-url someremote zot bar &&
-	echo baz >expect &&
-	git config --get-all remote.someremote.url >actual &&
-	cmp expect actual
+			test-tool wildmatch wildmatch 'acrt' 'a[c-c]rt'
+		
+ok 573 - wildmatch: match 'acrt' 'a[c-c]rt'
 
-fatal: No such URL found: bar
-ok 65 - remote set-url zot bar
+expecting success: 
+				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: 
-	test_must_fail git remote set-url --push someremote zot baz &&
-	echo "YYY" >expect &&
-	echo baz >>expect &&
-	test_must_fail git config --get-all remote.someremote.pushurl >actual &&
-	echo "YYY" >>actual &&
-	git config --get-all remote.someremote.url >>actual &&
-	cmp expect actual
+			test-tool wildmatch iwildmatch 'acrt' 'a[c-c]rt'
+		
+ok 575 - iwildmatch: match 'acrt' 'a[c-c]rt'
 
-fatal: No such URL found: baz
-ok 66 - remote set-url --push zot baz
+expecting success: 
+				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: 
-	git remote set-url --push someremote zot &&
-	echo zot >expect &&
-	echo "YYY" >>expect &&
-	echo baz >>expect &&
-	git config --get-all remote.someremote.pushurl >actual &&
-	echo "YYY" >>actual &&
-	git config --get-all remote.someremote.url >>actual &&
-	cmp expect actual
+			test-tool wildmatch pathmatch 'acrt' 'a[c-c]rt'
+		
+ok 577 - pathmatch: match 'acrt' 'a[c-c]rt'
 
-ok 67 - remote set-url --push zot
+expecting success: 
+				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: 
-	echo baz | get_url_test someremote &&
-	echo baz | get_url_test --all someremote &&
-	echo zot | get_url_test --push someremote &&
-	echo zot | get_url_test --push --all someremote
+			test-tool wildmatch ipathmatch 'acrt' 'a[c-c]rt'
+		
+ok 579 - ipathmatch: match 'acrt' 'a[c-c]rt'
 
-ok 68 - get-url with different urls
+expecting success: 
+				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: 
-	git remote set-url --push someremote qux zot &&
-	echo qux >expect &&
-	echo "YYY" >>expect &&
-	echo baz >>expect &&
-	git config --get-all remote.someremote.pushurl >actual &&
-	echo "YYY" >>actual &&
-	git config --get-all remote.someremote.url >>actual &&
-	cmp expect actual
+		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
 
-ok 69 - remote set-url --push qux zot
+expecting success: 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git 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: 
-	git remote set-url --push someremote foo qu+x &&
-	echo foo >expect &&
-	echo "YYY" >>expect &&
-	echo baz >>expect &&
-	git config --get-all remote.someremote.pushurl >actual &&
-	echo "YYY" >>actual &&
-	git config --get-all remote.someremote.url >>actual &&
-	cmp expect actual
+			test_must_fail test-tool wildmatch wildmatch ']' '[!]-]'
+		
+ok 583 - wildmatch: no match ']' '[!]-]'
 
-ok 70 - remote set-url --push foo qu+x
+expecting success: 
+				>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: 
-	git remote set-url --push --add someremote aaa &&
-	echo foo >expect &&
-	echo aaa >>expect &&
-	echo "YYY" >>expect &&
-	echo baz >>expect &&
-	git config --get-all remote.someremote.pushurl >actual &&
-	echo "YYY" >>actual &&
-	git config --get-all remote.someremote.url >>actual &&
-	cmp expect actual
+			test_must_fail test-tool wildmatch iwildmatch ']' '[!]-]'
+		
+ok 585 - iwildmatch: no match ']' '[!]-]'
 
-ok 71 - remote set-url --push --add aaa
+expecting success: 
+				>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: 
-	echo foo | get_url_test --push someremote &&
-	get_url_test --push --all someremote <<-\EOF
-	foo
-	aaa
-	EOF
+			test_must_fail test-tool wildmatch pathmatch ']' '[!]-]'
+		
+ok 587 - pathmatch: no match ']' '[!]-]'
 
-ok 72 - get-url on multi push remote
+expecting success: 
+				>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: 
-	git remote set-url --push someremote bar aaa &&
-	echo foo >expect &&
-	echo bar >>expect &&
-	echo "YYY" >>expect &&
-	echo baz >>expect &&
-	git config --get-all remote.someremote.pushurl >actual &&
-	echo "YYY" >>actual &&
-	git config --get-all remote.someremote.url >>actual &&
-	cmp expect actual
+			test_must_fail test-tool wildmatch ipathmatch ']' '[!]-]'
+		
+ok 589 - ipathmatch: no match ']' '[!]-]'
 
-ok 73 - remote set-url --push bar aaa
+expecting success: 
+				>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: 
-	git remote set-url --push --delete someremote bar &&
-	echo foo >expect &&
-	echo "YYY" >>expect &&
-	echo baz >>expect &&
-	git config --get-all remote.someremote.pushurl >actual &&
-	echo "YYY" >>actual &&
-	git config --get-all remote.someremote.url >>actual &&
-	cmp expect actual
+		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
 
-ok 74 - remote set-url --push --delete bar
+expecting success: 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git 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: 
-	git remote set-url --push --delete someremote foo &&
-	echo "YYY" >expect &&
-	echo baz >>expect &&
-	test_must_fail git config --get-all remote.someremote.pushurl >actual &&
-	echo "YYY" >>actual &&
-	git config --get-all remote.someremote.url >>actual &&
-	cmp expect actual
+			test-tool wildmatch wildmatch 'a' '[!]-]'
+		
+ok 593 - wildmatch: match 'a' '[!]-]'
 
-ok 75 - remote set-url --push --delete foo
+expecting success: 
+				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: 
-	git remote set-url --add someremote bbb &&
-	echo "YYY" >expect &&
-	echo baz >>expect &&
-	echo bbb >>expect &&
-	test_must_fail git config --get-all remote.someremote.pushurl >actual &&
-	echo "YYY" >>actual &&
-	git config --get-all remote.someremote.url >>actual &&
-	cmp expect actual
+			test-tool wildmatch iwildmatch 'a' '[!]-]'
+		
+ok 595 - iwildmatch: match 'a' '[!]-]'
 
-ok 76 - remote set-url --add bbb
+expecting success: 
+				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: 
-	echo baz | get_url_test someremote &&
-	get_url_test --all someremote <<-\EOF
-	baz
-	bbb
-	EOF
+			test-tool wildmatch pathmatch 'a' '[!]-]'
+		
+ok 597 - pathmatch: match 'a' '[!]-]'
 
-ok 77 - get-url on multi fetch remote
+expecting success: 
+				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: 
-	test_must_fail git remote set-url --delete someremote .\* &&
-	echo "YYY" >expect &&
-	echo baz >>expect &&
-	echo bbb >>expect &&
-	test_must_fail git config --get-all remote.someremote.pushurl >actual &&
-	echo "YYY" >>actual &&
-	git config --get-all remote.someremote.url >>actual &&
-	cmp expect actual
+			test-tool wildmatch ipathmatch 'a' '[!]-]'
+		
+ok 599 - ipathmatch: match 'a' '[!]-]'
 
-fatal: Will not delete all non-push URLs
-ok 78 - remote set-url --delete .*
+expecting success: 
+				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: 
-	git remote set-url --delete someremote bbb &&
-	echo "YYY" >expect &&
-	echo baz >>expect &&
-	test_must_fail git config --get-all remote.someremote.pushurl >actual &&
-	echo "YYY" >>actual &&
-	git config --get-all remote.someremote.url >>actual &&
-	cmp expect actual
+		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
 
-ok 79 - remote set-url --delete bbb
+expecting success: 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git 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: 
-	test_must_fail git remote set-url --delete someremote baz &&
-	echo "YYY" >expect &&
-	echo baz >>expect &&
-	test_must_fail git config --get-all remote.someremote.pushurl >actual &&
-	echo "YYY" >>actual &&
-	git config --get-all remote.someremote.url >>actual &&
-	cmp expect actual
+			test_must_fail test-tool wildmatch wildmatch '' '\'
+		
+ok 603 - wildmatch: no match '' '\'
 
-fatal: Will not delete all non-push URLs
-ok 80 - remote set-url --delete baz
+checking known breakage: false
+not ok 604 - wildmatch (via ls-files): no match skip '\' '' # TODO known breakage
 
 expecting success: 
-	git remote set-url --add someremote ccc &&
-	echo "YYY" >expect &&
-	echo baz >>expect &&
-	echo ccc >>expect &&
-	test_must_fail git config --get-all remote.someremote.pushurl >actual &&
-	echo "YYY" >>actual &&
-	git config --get-all remote.someremote.url >>actual &&
-	cmp expect actual
+			test_must_fail test-tool wildmatch iwildmatch '' '\'
+		
+ok 605 - iwildmatch: no match '' '\'
 
-ok 81 - remote set-url --add ccc
+checking known breakage: false
+not ok 606 - iwildmatch (via ls-files): no match skip '\' '' # TODO known breakage
 
 expecting success: 
-	git remote set-url --delete someremote baz &&
-	echo "YYY" >expect &&
-	echo ccc >>expect &&
-	test_must_fail git config --get-all remote.someremote.pushurl >actual &&
-	echo "YYY" >>actual &&
-	git config --get-all remote.someremote.url >>actual &&
-	cmp expect actual
+			test_must_fail test-tool wildmatch pathmatch '' '\'
+		
+ok 607 - pathmatch: no match '' '\'
 
-ok 82 - remote set-url --delete baz
+checking known breakage: false
+not ok 608 - pathmatch (via ls-files): no match skip '\' '' # TODO known breakage
 
 expecting success: 
-	# add a dummy origin so that this does not trigger failure
-	git remote add origin .
+			test_must_fail test-tool wildmatch ipathmatch '' '\'
+		
+ok 609 - ipathmatch: no match '' '\'
 
-ok 83 - extra args: setup
+checking known breakage: false
+not ok 610 - ipathmatch (via ls-files): no match skip '\' '' # TODO known breakage
 
 expecting success: 
-		test_must_fail git remote add nick url bogus_extra_arg 2>actual &&
-		test_i18ngrep '^usage:' actual
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
 	
-usage: git remote add [<options>] <name> <url>
-ok 84 - extra args: add nick url
+ok 611 - cleanup after previous file test
 
 expecting success: 
-		test_must_fail git remote rename origin newname bogus_extra_arg 2>actual &&
-		test_i18ngrep '^usage:' actual
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
 	
-usage: git remote rename <old> <new>
-ok 85 - extra args: rename origin newname
+ok 612 - setup match file test for \
 
 expecting success: 
-		test_must_fail git remote remove origin bogus_extra_arg 2>actual &&
-		test_i18ngrep '^usage:' actual
-	
-usage: git remote remove <name>
-ok 86 - extra args: remove origin
+			test_must_fail test-tool wildmatch wildmatch '\' '\'
+		
+ok 613 - wildmatch: no match '\' '\'
 
 expecting success: 
-		test_must_fail git remote set-head origin master bogus_extra_arg 2>actual &&
-		test_i18ngrep '^usage:' actual
-	
-usage: git remote set-head <name> (-a | --auto | -d | --delete | <branch>)
-ok 87 - extra args: set-head origin master
+				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: 
-		test_must_fail git remote get-url origin newurl bogus_extra_arg 2>actual &&
-		test_i18ngrep '^usage:' actual
-	
-usage: git remote get-url [--push] [--all] <name>
-ok 88 - extra args: get-url origin newurl
+			test_must_fail test-tool wildmatch iwildmatch '\' '\'
+		
+ok 615 - iwildmatch: no match '\' '\'
 
 expecting success: 
-		test_must_fail git remote set-url origin newurl oldurl bogus_extra_arg 2>actual &&
-		test_i18ngrep '^usage:' actual
-	
-usage: git remote set-url [--push] <name> <newurl> [<oldurl>]
-ok 89 - extra args: set-url origin newurl oldurl
+				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: 
-	git config url.xyz@example.com.insteadOf backup &&
-	git remote add backup xyz@example.com
+			test_must_fail test-tool wildmatch pathmatch '\' '\'
+		
+ok 617 - pathmatch: no match '\' '\'
 
-ok 90 - add remote matching the "insteadOf" URL
+expecting success: 
+				printf '%s' '\' >expect &&
+				git ls-files -z -- '\' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 618 - pathmatch (via ls-files): match '\' '\'
 
-# passed all 90 test(s)
-1..90
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t5536-fetch-conflicts.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5536-fetch-conflicts/.git/
 expecting success: 
-	git commit --allow-empty -m "Initial" &&
-	git branch branch1 &&
-	git tag tag1 &&
-	git commit --allow-empty -m "First" &&
-	git branch branch2 &&
-	git tag tag2
+			test_must_fail test-tool wildmatch ipathmatch '\' '\'
+		
+ok 619 - ipathmatch: no match '\' '\'
 
-[master (root-commit) 174e926] Initial
- Author: A U Thor <author@example.com>
-[master 1b68fd3] First
- Author: A U Thor <author@example.com>
-ok 1 - setup
+expecting success: 
+				printf '%s' '\' >expect &&
+				git --icase-pathspecs ls-files -z -- '\' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 620 - ipathmatch (via ls-files): match '\' '\'
 
 expecting success: 
-	setup_repository ok "+refs/heads/*:refs/remotes/origin/*" && (
-		cd ok &&
-		git fetch origin
-	)
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing "\\"
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 621 - cleanup after previous file test
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5536-fetch-conflicts/ok/.git/
-From /build/git-2.20.1/t/trash directory.t5536-fetch-conflicts
- * [new branch]      branch1    -> origin/branch1
- * [new branch]      branch2    -> origin/branch2
- * [new branch]      master     -> origin/master
- * [new tag]         tag1       -> tag1
- * [new tag]         tag2       -> tag2
-ok 2 - fetch with no conflict
+expecting success: 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 622 - setup match file test for XXX/\
 
 expecting success: 
-	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_i18ngrep "fatal: Cannot fetch both refs/heads/branch1 and refs/heads/branch2 to refs/remotes/origin/branch1" error
-	)
+			test_must_fail test-tool wildmatch wildmatch 'XXX/\' '*/\'
+		
+ok 623 - wildmatch: no match 'XXX/\' '*/\'
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5536-fetch-conflicts/ccc/.git/
-fatal: Cannot fetch both refs/heads/branch1 and refs/heads/branch2 to refs/remotes/origin/branch1
-ok 3 - fetch conflict: config vs. config
+expecting success: 
+				>expect &&
+				git --glob-pathspecs ls-files -z -- '*/\' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 624 - wildmatch (via ls-files): no match '*/\' 'XXX/\'
 
 expecting success: 
-	setup_repository dcc \
-		"+refs/heads/*:refs/remotes/origin/*" \
-		"+refs/heads/branch1:refs/remotes/origin/branch1" && (
-		cd dcc &&
-		git fetch origin
-	)
+			test_must_fail test-tool wildmatch iwildmatch 'XXX/\' '*/\'
+		
+ok 625 - iwildmatch: no match 'XXX/\' '*/\'
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5536-fetch-conflicts/dcc/.git/
-From /build/git-2.20.1/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: 
+				>expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '*/\' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 626 - iwildmatch (via ls-files): no match '*/\' 'XXX/\'
 
 expecting success: 
-	setup_repository aoc \
-		"+refs/heads/*:refs/remotes/origin/*" && (
-		cd aoc &&
-		git fetch origin refs/heads/branch2:refs/remotes/origin/branch1
-	)
+			test_must_fail test-tool wildmatch pathmatch 'XXX/\' '*/\'
+		
+ok 627 - pathmatch: no match 'XXX/\' '*/\'
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5536-fetch-conflicts/aoc/.git/
-From /build/git-2.20.1/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: 
+				>expect &&
+				git ls-files -z -- '*/\' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 628 - pathmatch (via ls-files): no match '*/\' 'XXX/\'
 
 expecting success: 
-	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_i18ngrep "fatal: Cannot fetch both refs/heads/branch1 and refs/heads/branch2 to refs/remotes/origin/branch1" error
-	)
+			test_must_fail test-tool wildmatch ipathmatch 'XXX/\' '*/\'
+		
+ok 629 - ipathmatch: no match 'XXX/\' '*/\'
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5536-fetch-conflicts/caa/.git/
-fatal: Cannot fetch both refs/heads/branch1 and refs/heads/branch2 to refs/remotes/origin/branch1
-ok 6 - fetch conflict: arg vs. arg
+expecting success: 
+				>expect &&
+				git --icase-pathspecs ls-files -z -- '*/\' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 630 - ipathmatch (via ls-files): no match '*/\' 'XXX/\'
 
 expecting success: 
-	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_i18ngrep "warning: refs/remotes/origin/branch1 usually tracks refs/heads/branch1, not refs/heads/branch2" error &&
-		test_i18ngrep "warning: refs/remotes/origin/branch2 usually tracks refs/heads/branch2, not refs/heads/branch1" error
-	)
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing XXX/
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 631 - cleanup after previous file test
 
-Initialized empty Git repository in /build/git-2.20.1/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: 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 632 - setup match file test for XXX/\
 
-# passed all 7 test(s)
-1..7
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t5539-fetch-http-shallow.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5539-fetch-http-shallow/.git/
-checking prerequisite: NOT_ROOT
+expecting success: 
+			test-tool wildmatch wildmatch 'XXX/\' '*/\\'
+		
+ok 633 - wildmatch: match 'XXX/\' '*/\\'
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
-	uid=$(id -u) &&
-	test "$uid" != 0
+expecting success: 
+				printf '%s' 'XXX/\' >expect &&
+				git --glob-pathspecs ls-files -z -- '*/\\' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 634 - wildmatch (via ls-files): match '*/\\' 'XXX/\'
 
-)
-prerequisite NOT_ROOT ok
-1..0 # SKIP no web server found at '/usr/sbin/apache2'
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t5540-http-push-webdav.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5540-http-push-webdav/.git/
-checking prerequisite: NOT_ROOT
+expecting success: 
+			test-tool wildmatch iwildmatch 'XXX/\' '*/\\'
+		
+ok 635 - iwildmatch: match 'XXX/\' '*/\\'
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
-	uid=$(id -u) &&
-	test "$uid" != 0
+expecting success: 
+				printf '%s' 'XXX/\' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '*/\\' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 636 - iwildmatch (via ls-files): match '*/\\' 'XXX/\'
 
-)
-prerequisite NOT_ROOT ok
-1..0 # SKIP no web server found at '/usr/sbin/apache2'
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t5541-http-push-smart.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5541-http-push-smart/.git/
-checking prerequisite: NOT_ROOT
+expecting success: 
+			test-tool wildmatch pathmatch 'XXX/\' '*/\\'
+		
+ok 637 - pathmatch: match 'XXX/\' '*/\\'
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
-	uid=$(id -u) &&
-	test "$uid" != 0
+expecting success: 
+				printf '%s' 'XXX/\' >expect &&
+				git ls-files -z -- '*/\\' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 638 - pathmatch (via ls-files): match '*/\\' 'XXX/\'
 
-)
-prerequisite NOT_ROOT ok
-1..0 # SKIP no web server found at '/usr/sbin/apache2'
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t5528-push-default.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5528-push-default/.git/
 expecting success: 
-	git init --bare repo1 &&
-	git remote add parent1 repo1 &&
-	git init --bare repo2 &&
-	git remote add parent2 repo2 &&
-	test_commit one &&
-	git push parent1 HEAD &&
-	git push parent2 HEAD
+			test-tool wildmatch ipathmatch 'XXX/\' '*/\\'
+		
+ok 639 - ipathmatch: match 'XXX/\' '*/\\'
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5528-push-default/repo1/
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5528-push-default/repo2/
-[master (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 -> master
-To repo2
- * [new branch]      HEAD -> master
-ok 1 - setup bare remotes
+expecting success: 
+				printf '%s' 'XXX/\' >expect &&
+				git --icase-pathspecs ls-files -z -- '*/\\' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 640 - ipathmatch (via ls-files): match '*/\\' 'XXX/\'
 
 expecting success: 
-	git checkout master &&
-	test_config branch.master.remote parent1 &&
-	test_config branch.master.merge refs/heads/foo &&
-	test_commit two &&
-	test_push_success upstream foo
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing XXX/
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 641 - cleanup after previous file test
 
-Already on 'master'
-[master 139b20d] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-To repo1
- * [new branch]      master -> foo
-ok 2 - "upstream" pushes to configured upstream
+expecting success: 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 642 - setup match file test for foo
 
 expecting success: 
-	git checkout master &&
-	test_unconfig branch.master.remote &&
-	test_commit three &&
-	test_push_failure upstream
+			test-tool wildmatch wildmatch 'foo' 'foo'
+		
+ok 643 - wildmatch: match 'foo' 'foo'
 
-Already on 'master'
-[master 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
+expecting success: 
+				printf '%s' 'foo' >expect &&
+				git --glob-pathspecs ls-files -z -- 'foo' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 644 - wildmatch (via ls-files): match 'foo' 'foo'
 
-    git remote add <name> <url>
+expecting success: 
+			test-tool wildmatch iwildmatch 'foo' 'foo'
+		
+ok 645 - iwildmatch: match 'foo' 'foo'
 
-and then push using the remote name
+expecting success: 
+				printf '%s' 'foo' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'foo' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 646 - iwildmatch (via ls-files): match 'foo' 'foo'
 
-    git push <name>
+expecting success: 
+			test-tool wildmatch pathmatch 'foo' 'foo'
+		
+ok 647 - pathmatch: match 'foo' 'foo'
 
-ok 3 - "upstream" does not push on unconfigured remote
+expecting success: 
+				printf '%s' 'foo' >expect &&
+				git ls-files -z -- 'foo' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 648 - pathmatch (via ls-files): match 'foo' 'foo'
 
 expecting success: 
-	git checkout master &&
-	test_config branch.master.remote parent1 &&
-	test_unconfig branch.master.merge &&
-	test_commit four &&
-	test_push_failure upstream
+			test-tool wildmatch ipathmatch 'foo' 'foo'
+		
+ok 649 - ipathmatch: match 'foo' 'foo'
 
-Already on 'master'
-[master fd8d77e] four
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 four.t
-fatal: The current branch master has no upstream branch.
-To push the current branch and set the remote as upstream, use
+expecting success: 
+				printf '%s' 'foo' >expect &&
+				git --icase-pathspecs ls-files -z -- 'foo' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 650 - ipathmatch (via ls-files): match 'foo' 'foo'
 
-    git push --set-upstream parent1 master
+expecting success: 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+Removing foo
+ok 651 - cleanup after previous file test
 
-ok 4 - "upstream" does not push on unconfigured branch
+expecting success: 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 652 - setup match file test for @foo
 
 expecting success: 
-	git checkout master &&
-	test_config branch.master.remote parent1 &&
-	test_config branch.master.merge refs/heads/foo &&
-	test_config push.default upstream &&
-	test_commit five &&
-	test_must_fail git push parent2
+			test-tool wildmatch wildmatch '@foo' '@foo'
+		
+ok 653 - wildmatch: match '@foo' '@foo'
 
-Already on 'master'
-[master 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 'master', without telling me what to push
-to update which remote branch.
-ok 5 - "upstream" does not push when remotes do not match
+expecting success: 
+				printf '%s' '@foo' >expect &&
+				git --glob-pathspecs ls-files -z -- '@foo' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 654 - wildmatch (via ls-files): match '@foo' '@foo'
 
 expecting success: 
-	git checkout -b new-branch &&
-	test_push_failure simple &&
-	test_push_failure matching &&
-	test_push_failure upstream
+			test-tool wildmatch iwildmatch '@foo' '@foo'
+		
+ok 655 - iwildmatch: match '@foo' '@foo'
 
-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
+expecting success: 
+				printf '%s' '@foo' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '@foo' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 656 - iwildmatch (via ls-files): match '@foo' '@foo'
 
-    git remote add <name> <url>
+expecting success: 
+			test-tool wildmatch pathmatch '@foo' '@foo'
+		
+ok 657 - pathmatch: match '@foo' '@foo'
 
-and then push using the remote name
+expecting success: 
+				printf '%s' '@foo' >expect &&
+				git ls-files -z -- '@foo' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 658 - pathmatch (via ls-files): match '@foo' '@foo'
 
-    git push <name>
+expecting success: 
+			test-tool wildmatch ipathmatch '@foo' '@foo'
+		
+ok 659 - ipathmatch: match '@foo' '@foo'
 
-fatal: No configured push destination.
-Either specify the URL from the command-line or configure a remote repository using
+expecting success: 
+				printf '%s' '@foo' >expect &&
+				git --icase-pathspecs ls-files -z -- '@foo' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 660 - ipathmatch (via ls-files): match '@foo' '@foo'
 
-    git remote add <name> <url>
+expecting success: 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing @foo
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 661 - cleanup after previous file test
 
-and then push using the remote name
+expecting success: 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 662 - setup match file test for foo
 
-    git push <name>
+expecting success: 
+			test_must_fail test-tool wildmatch wildmatch 'foo' '@foo'
+		
+ok 663 - wildmatch: no match 'foo' '@foo'
 
-fatal: No configured push destination.
-Either specify the URL from the command-line or configure a remote repository using
+expecting success: 
+				>expect &&
+				git --glob-pathspecs ls-files -z -- '@foo' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 664 - wildmatch (via ls-files): no match '@foo' 'foo'
 
-    git remote add <name> <url>
+expecting success: 
+			test_must_fail test-tool wildmatch iwildmatch 'foo' '@foo'
+		
+ok 665 - iwildmatch: no match 'foo' '@foo'
 
-and then push using the remote name
+expecting success: 
+				>expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '@foo' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 666 - iwildmatch (via ls-files): no match '@foo' 'foo'
 
-    git push <name>
+expecting success: 
+			test_must_fail test-tool wildmatch pathmatch 'foo' '@foo'
+		
+ok 667 - pathmatch: no match 'foo' '@foo'
 
-ok 6 - push from/to new branch with upstream, matching and simple
+expecting success: 
+				>expect &&
+				git ls-files -z -- '@foo' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 668 - pathmatch (via ls-files): no match '@foo' 'foo'
 
 expecting success: 
-	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
+			test_must_fail test-tool wildmatch ipathmatch 'foo' '@foo'
+		
+ok 669 - ipathmatch: no match 'foo' '@foo'
 
-Switched to a new branch 'ambiguous'
-To repo1
- * [new branch]      ambiguous -> ambiguous
-To repo1
-   d79ce16..a383792  master -> master
-Everything up-to-date
-ok 7 - push ambiguously named branch with upstream, matching and simple
+expecting success: 
+				>expect &&
+				git --icase-pathspecs ls-files -z -- '@foo' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 670 - ipathmatch (via ls-files): no match '@foo' 'foo'
 
 expecting success: 
-	test_config branch.new-branch.remote repo1 &&
-	git checkout new-branch &&
-	test_push_success current new-branch
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+Removing foo
+ok 671 - cleanup after previous file test
 
-Switched to branch 'new-branch'
-To repo1
- * [new branch]      new-branch -> new-branch
-ok 8 - push from/to new branch with current creates remote branch
+expecting success: 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 672 - setup match file test for [ab]
 
 expecting success: 
-	test_config branch.master.remote repo1 &&
-	git checkout master &&
-	test_push_failure simple &&
-	test_push_failure upstream
+			test-tool wildmatch wildmatch '[ab]' '\[ab]'
+		
+ok 673 - wildmatch: match '[ab]' '\[ab]'
 
-Switched to branch 'master'
-fatal: The current branch master has no upstream branch.
-To push the current branch and set the remote as upstream, use
+expecting success: 
+				printf '%s' '[ab]' >expect &&
+				git --glob-pathspecs ls-files -z -- '\[ab]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 674 - wildmatch (via ls-files): match '\[ab]' '[ab]'
 
-    git push --set-upstream repo1 master
+expecting success: 
+			test-tool wildmatch iwildmatch '[ab]' '\[ab]'
+		
+ok 675 - iwildmatch: match '[ab]' '\[ab]'
 
-fatal: The current branch master has no upstream branch.
-To push the current branch and set the remote as upstream, use
+expecting success: 
+				printf '%s' '[ab]' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '\[ab]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 676 - iwildmatch (via ls-files): match '\[ab]' '[ab]'
 
-    git push --set-upstream repo1 master
+expecting success: 
+			test-tool wildmatch pathmatch '[ab]' '\[ab]'
+		
+ok 677 - pathmatch: match '[ab]' '\[ab]'
 
-ok 9 - push to existing branch, with no upstream configured
+expecting success: 
+				printf '%s' '[ab]' >expect &&
+				git ls-files -z -- '\[ab]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 678 - pathmatch (via ls-files): match '\[ab]' '[ab]'
 
 expecting success: 
-	test_config branch.master.remote repo1 &&
-	test_config branch.master.merge refs/heads/master &&
-	git checkout master &&
-	test_commit six &&
-	test_push_success upstream master &&
-	test_commit seven &&
-	test_push_success simple master
+			test-tool wildmatch ipathmatch '[ab]' '\[ab]'
+		
+ok 679 - ipathmatch: match '[ab]' '\[ab]'
 
-Already on 'master'
-[master 5891a38] six
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 six.t
-To repo1
-   a383792..5891a38  master -> master
-[master c9b0832] seven
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 seven.t
-To repo1
-   5891a38..c9b0832  master -> master
-ok 10 - push to existing branch, upstream configured with same name
+expecting success: 
+				printf '%s' '[ab]' >expect &&
+				git --icase-pathspecs ls-files -z -- '\[ab]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 680 - ipathmatch (via ls-files): match '\[ab]' '[ab]'
 
 expecting success: 
-	test_config branch.master.remote repo1 &&
-	test_config branch.master.merge refs/heads/other-name &&
-	git checkout master &&
-	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 master &&
-	git --git-dir=repo1 log -1 --format="%h %s" "other-name" >actual-other-name &&
-	test_cmp expect-other-name actual-other-name
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing [ab]
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 681 - cleanup after previous file test
 
-Already on 'master'
-[master 6d8952b] eight
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 eight.t
-To repo1
- * [new branch]      master -> other-name
-[master e7406c7] nine
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 nine.t
-fatal: The upstream branch of your current branch does not match
-the name of your current branch.  To push to the upstream branch
-on the remote, use
+expecting success: 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 682 - setup match file test for [ab]
 
-    git push repo1 HEAD:other-name
+expecting success: 
+			test-tool wildmatch wildmatch '[ab]' '[[]ab]'
+		
+ok 683 - wildmatch: match '[ab]' '[[]ab]'
 
-To push to the branch of the same name on the remote, use
+expecting success: 
+				printf '%s' '[ab]' >expect &&
+				git --glob-pathspecs ls-files -z -- '[[]ab]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 684 - wildmatch (via ls-files): match '[[]ab]' '[ab]'
 
-    git push repo1 HEAD
+expecting success: 
+			test-tool wildmatch iwildmatch '[ab]' '[[]ab]'
+		
+ok 685 - iwildmatch: match '[ab]' '[[]ab]'
 
-To repo1
-   c9b0832..e7406c7  master -> master
-ok 11 - push to existing branch, upstream configured with different name
+expecting success: 
+				printf '%s' '[ab]' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[[]ab]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 686 - iwildmatch (via ls-files): match '[[]ab]' '[ab]'
 
 expecting success: 
-		test_config branch.master.remote parent1 &&
-		test_config branch.master.merge refs/heads/foo &&
-		test_config remote.pushdefault parent1 &&
-		test_commit commit-for-current &&
-		test_push_success current master 
-	
-[master f3846c5] commit-for-current
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 commit-for-current.t
-To repo1
-   e7406c7..f3846c5  master -> master
-ok 12 - push.default = current success in central workflows
+			test-tool wildmatch pathmatch '[ab]' '[[]ab]'
+		
+ok 687 - pathmatch: match '[ab]' '[[]ab]'
 
 expecting success: 
-		test_config branch.master.remote parent1 &&
-		test_config branch.master.merge refs/heads/foo &&
-		test_config remote.pushdefault parent1 &&
-		test_commit commit-for-upstream &&
-		test_push_success upstream foo 
+				printf '%s' '[ab]' >expect &&
+				git ls-files -z -- '[[]ab]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 688 - pathmatch (via ls-files): match '[[]ab]' '[ab]'
+
+expecting success: 
+			test-tool wildmatch ipathmatch '[ab]' '[[]ab]'
+		
+ok 689 - ipathmatch: match '[ab]' '[[]ab]'
+
+expecting success: 
+				printf '%s' '[ab]' >expect &&
+				git --icase-pathspecs ls-files -z -- '[[]ab]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 690 - ipathmatch (via ls-files): match '[[]ab]' '[ab]'
+
+expecting success: 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
 	
-[master 4cda86c] 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..4cda86c  master -> foo
-ok 13 - push.default = upstream success in central workflows
+Removing [ab]
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 691 - cleanup after previous file test
 
 expecting success: 
-		test_config branch.master.remote parent1 &&
-		test_config branch.master.merge refs/heads/foo &&
-		test_config remote.pushdefault parent1 &&
-		test_commit commit-for-simple &&
-		test_push_failure simple master 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
 	
-[master c70813c] 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
+ok 692 - setup match file test for [ab]
 
-    git push parent1 HEAD:foo
+expecting success: 
+			test-tool wildmatch wildmatch '[ab]' '[[:]ab]'
+		
+ok 693 - wildmatch: match '[ab]' '[[:]ab]'
 
-To push to the branch of the same name on the remote, use
+expecting success: 
+				printf '%s' '[ab]' >expect &&
+				git --glob-pathspecs ls-files -z -- '[[:]ab]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 694 - wildmatch (via ls-files): match '[[:]ab]' '[ab]'
 
-    git push parent1 HEAD
+expecting success: 
+			test-tool wildmatch iwildmatch '[ab]' '[[:]ab]'
+		
+ok 695 - iwildmatch: match '[ab]' '[[:]ab]'
 
-ok 14 - push.default = simple failure in central workflows
+expecting success: 
+				printf '%s' '[ab]' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[[:]ab]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 696 - iwildmatch (via ls-files): match '[[:]ab]' '[ab]'
 
 expecting success: 
-		test_config branch.master.remote parent1 &&
-		test_config branch.master.merge refs/heads/foo &&
-		test_config remote.pushdefault parent1 &&
-		test_commit commit-for-matching &&
-		test_push_success matching master 
-	
-[master 5b5f0b1] commit-for-matching
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 commit-for-matching.t
-To repo1
-   f3846c5..5b5f0b1  master -> master
-ok 15 - push.default = matching success in central workflows
+			test-tool wildmatch pathmatch '[ab]' '[[:]ab]'
+		
+ok 697 - pathmatch: match '[ab]' '[[:]ab]'
 
 expecting success: 
-		test_config branch.master.remote parent1 &&
-		test_config branch.master.merge refs/heads/foo &&
-		test_config remote.pushdefault parent2 &&
-		test_commit commit-for-current-triangular &&
-		test_push_success current master repo2
-	
-[master 851f765] 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
-   d79ce16..851f765  master -> master
-ok 16 - push.default = current success in triangular workflows
+				printf '%s' '[ab]' >expect &&
+				git ls-files -z -- '[[:]ab]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 698 - pathmatch (via ls-files): match '[[:]ab]' '[ab]'
 
 expecting success: 
-		test_config branch.master.remote parent1 &&
-		test_config branch.master.merge refs/heads/foo &&
-		test_config remote.pushdefault parent2 &&
-		test_commit commit-for-upstream-triangular &&
-		test_push_failure upstream foo repo2
-	
-[master 5aea25e] 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 'master', without telling me what to push
-to update which remote branch.
-ok 17 - push.default = upstream failure in triangular workflows
+			test-tool wildmatch ipathmatch '[ab]' '[[:]ab]'
+		
+ok 699 - ipathmatch: match '[ab]' '[[:]ab]'
 
 expecting success: 
-		test_config branch.master.remote parent1 &&
-		test_config branch.master.merge refs/heads/foo &&
-		test_config remote.pushdefault parent2 &&
-		test_commit commit-for-simple-triangular &&
-		test_push_success simple master repo2
+				printf '%s' '[ab]' >expect &&
+				git --icase-pathspecs ls-files -z -- '[[:]ab]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 700 - ipathmatch (via ls-files): match '[[:]ab]' '[ab]'
+
+expecting success: 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
 	
-[master 19194cb] 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
-   851f765..19194cb  master -> master
-ok 18 - push.default = simple success in triangular workflows
+Removing [ab]
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 701 - cleanup after previous file test
 
 expecting success: 
-		test_config branch.master.remote parent1 &&
-		test_config branch.master.merge refs/heads/foo &&
-		test_config remote.pushdefault parent2 &&
-		test_commit commit-for-matching-triangular &&
-		test_push_success matching master repo2
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
 	
-[master 8956523] 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
-   19194cb..8956523  master -> master
-ok 19 - push.default = matching success in triangular workflows
+ok 702 - setup match file test for [ab]
 
 expecting success: 
-	test_config branch.master.remote parent1 &&
-	test_config branch.master.merge refs/heads/master &&
-	test_config remote.pushdefault parent1 &&
-	test_commit default-master-master &&
-	test_push_success "" master
+			test_must_fail test-tool wildmatch wildmatch '[ab]' '[[::]ab]'
+		
+ok 703 - wildmatch: no match '[ab]' '[[::]ab]'
 
-[master f163556] default-master-master
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 default-master-master.t
-To repo1
-   5b5f0b1..f163556  master -> master
-ok 20 - default behavior allows "simple" push
+expecting success: 
+				>expect &&
+				git --glob-pathspecs ls-files -z -- '[[::]ab]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 704 - wildmatch (via ls-files): no match '[[::]ab]' '[ab]'
 
 expecting success: 
-	test_config branch.master.remote parent1 &&
-	test_config branch.master.merge refs/heads/foo &&
-	test_config remote.pushdefault parent1 &&
-	test_commit default-master-foo &&
-	test_push_failure ""
+			test_must_fail test-tool wildmatch iwildmatch '[ab]' '[[::]ab]'
+		
+ok 705 - iwildmatch: no match '[ab]' '[[::]ab]'
 
-[master accfd16] default-master-foo
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 default-master-foo.t
-fatal: The upstream branch of your current branch does not match
-the name of your current branch.  To push to the upstream branch
-on the remote, use
+expecting success: 
+				>expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[[::]ab]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 706 - iwildmatch (via ls-files): no match '[[::]ab]' '[ab]'
 
-    git push parent1 HEAD:foo
+expecting success: 
+			test_must_fail test-tool wildmatch pathmatch '[ab]' '[[::]ab]'
+		
+ok 707 - pathmatch: no match '[ab]' '[[::]ab]'
 
-To push to the branch of the same name on the remote, use
+expecting success: 
+				>expect &&
+				git ls-files -z -- '[[::]ab]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 708 - pathmatch (via ls-files): no match '[[::]ab]' '[ab]'
 
-    git push parent1 HEAD
+expecting success: 
+			test_must_fail test-tool wildmatch ipathmatch '[ab]' '[[::]ab]'
+		
+ok 709 - ipathmatch: no match '[ab]' '[[::]ab]'
 
-To choose either option permanently, see push.default in 'git help config'.
-ok 21 - default behavior rejects non-simple push
+expecting success: 
+				>expect &&
+				git --icase-pathspecs ls-files -z -- '[[::]ab]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 710 - ipathmatch (via ls-files): no match '[[::]ab]' '[ab]'
 
 expecting success: 
-	test_config branch.master.remote parent1 &&
-	test_config branch.master.merge refs/heads/foo &&
-	test_config remote.pushdefault parent2 &&
-	test_commit default-triangular &&
-	test_push_success "" master repo2
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing [ab]
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 711 - cleanup after previous file test
 
-[master 0f29fa4] default-triangular
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 default-triangular.t
-To repo2
-   8956523..0f29fa4  master -> master
-ok 22 - default triangular behavior acts like "current"
+expecting success: 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 712 - setup match file test for [ab]
 
-# passed all 22 test(s)
-1..22
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t5542-push-http-shallow.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5542-push-http-shallow/.git/
-checking prerequisite: NOT_ROOT
+expecting success: 
+			test-tool wildmatch wildmatch '[ab]' '[[:digit]ab]'
+		
+ok 713 - wildmatch: match '[ab]' '[[:digit]ab]'
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
-	uid=$(id -u) &&
-	test "$uid" != 0
+expecting success: 
+				printf '%s' '[ab]' >expect &&
+				git --glob-pathspecs ls-files -z -- '[[:digit]ab]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 714 - wildmatch (via ls-files): match '[[:digit]ab]' '[ab]'
 
-)
-prerequisite NOT_ROOT ok
-1..0 # SKIP no web server found at '/usr/sbin/apache2'
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t5538-push-shallow.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5538-push-shallow/.git/
 expecting success: 
-	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
+			test-tool wildmatch iwildmatch '[ab]' '[[:digit]ab]'
+		
+ok 715 - iwildmatch: match '[ab]' '[[:digit]ab]'
 
-[master (root-commit) d47fd0f] 1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 tracked
-[master 9e8cdb9] 2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[master 5323012] 3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[master 03bbc7c] 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/git-2.20.1/t/trash directory.t5538-push-shallow/full-abc/.git/
-[master (root-commit) 14b7e9d] a
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 tracked
-[master 87297fd] b
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[master 252e330] c
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Cloning into 'shallow'...
-Cloning into 'shallow2'...
-ok 1 - setup
+expecting success: 
+				printf '%s' '[ab]' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[[:digit]ab]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 716 - iwildmatch (via ls-files): match '[[:digit]ab]' '[ab]'
 
 expecting success: 
-	(
-	cd shallow &&
-	commit 5 &&
-	git push ../.git +master:refs/remotes/shallow/master
-	) &&
-	git log --format=%s shallow/master >actual &&
-	git fsck &&
-	cat <<EOF >expect &&
-5
-4
-3
-2
-1
-EOF
-	test_cmp expect actual
+			test-tool wildmatch pathmatch '[ab]' '[[:digit]ab]'
+		
+ok 717 - pathmatch: match '[ab]' '[[:digit]ab]'
 
-[master a4aa2b7] 5
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-To ../.git
- * [new branch]      master -> shallow/master
-ok 2 - push from shallow clone
+expecting success: 
+				printf '%s' '[ab]' >expect &&
+				git ls-files -z -- '[[:digit]ab]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 718 - pathmatch (via ls-files): match '[[:digit]ab]' '[ab]'
 
 expecting success: 
-	(
-	cd shallow2 &&
-	test_must_fail git push ../.git +master:refs/remotes/shallow2/master 2>err &&
-	grep "shallow2/master.*shallow update not allowed" err
-	) &&
-	test_must_fail git rev-parse shallow2/master &&
-	git fsck
+			test-tool wildmatch ipathmatch '[ab]' '[[:digit]ab]'
+		
+ok 719 - ipathmatch: match '[ab]' '[[:digit]ab]'
 
- ! [remote rejected] master -> shallow2/master (shallow update not allowed)
-fatal: ambiguous argument 'shallow2/master': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-shallow2/master
-dangling commit 252e33070c0dd453e3f12312db22821e80386b11
-ok 3 - push from shallow clone, with grafted roots
+expecting success: 
+				printf '%s' '[ab]' >expect &&
+				git --icase-pathspecs ls-files -z -- '[[:digit]ab]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 720 - ipathmatch (via ls-files): match '[[:digit]ab]' '[ab]'
 
 expecting success: 
-	test_config receive.shallowupdate true &&
-	(
-	cd shallow2 &&
-	git push ../.git +master:refs/remotes/shallow2/master
-	) &&
-	git log --format=%s shallow2/master >actual &&
-	git fsck &&
-	cat <<EOF >expect &&
-c
-b
-EOF
-	test_cmp expect actual
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing [ab]
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 721 - cleanup after previous file test
 
-error: Could not read 14b7e9d32788d671df1cf8a6b77fec6016b6f03e
-To ../.git
- * [new branch]      master -> shallow2/master
-ok 4 - add new shallow root with receive.updateshallow on
+expecting success: 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 722 - setup match file test for [ab]
 
 expecting success: 
-	(
-	cd shallow &&
-	git --git-dir=../shallow2/.git config receive.shallowupdate true &&
-	git push ../shallow2/.git +master:refs/remotes/shallow/master &&
-	git --git-dir=../shallow2/.git config receive.shallowupdate false
-	) &&
-	(
-	cd shallow2 &&
-	git log --format=%s shallow/master >actual &&
-	git fsck &&
-	cat <<EOF >expect &&
-5
-4
-3
-EOF
-	test_cmp expect actual
-	)
+			test-tool wildmatch wildmatch '[ab]' '[\[:]ab]'
+		
+ok 723 - wildmatch: match '[ab]' '[\[:]ab]'
 
-To ../shallow2/.git
- * [new branch]      master -> shallow/master
-ok 5 - push from shallow to shallow
+expecting success: 
+				printf '%s' '[ab]' >expect &&
+				git --glob-pathspecs ls-files -z -- '[\[:]ab]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 724 - wildmatch (via ls-files): match '[\[:]ab]' '[ab]'
 
 expecting success: 
-	! git --git-dir=shallow2/.git cat-file blob $(echo 1|git hash-object --stdin) &&
-	commit 1 &&
-	git push shallow2/.git +master:refs/remotes/top/master &&
-	(
-	cd shallow2 &&
-	git log --format=%s top/master >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
-	)
+			test-tool wildmatch iwildmatch '[ab]' '[\[:]ab]'
+		
+ok 725 - iwildmatch: match '[ab]' '[\[:]ab]'
 
-fatal: git cat-file d00491fd7e5bb6fa28c517a0bb32b8b506539d4d: bad file
-[master b9f9f97] 1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-To shallow2/.git
- * [new branch]      master -> top/master
-ok 6 - push from full to shallow
+expecting success: 
+				printf '%s' '[ab]' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[\[:]ab]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 726 - iwildmatch (via ls-files): match '[\[:]ab]' '[ab]'
 
-# passed all 6 test(s)
-1..6
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t4255-am-submodule.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4255-am-submodule/.git/
 expecting success: 
-		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/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update_sub1/.git/
-[master (root-commit) cb2c808] 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/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update_sub2/.git/
-[master (root-commit) 41a4c31] 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/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update_repo/.git/
-[master (root-commit) 36b43a5] 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/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update_repo/sub1'...
-done.
-Cloning into '/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update_repo/uninitialized_sub'...
-done.
-[add_sub1 9fcbdb8] 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'
-Removing uninitialized_sub
-Removing sub1
-Removing .gitmodules
-[remove_sub1 fa518c0] Revert "Add sub1"
- Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:07:48 2021 +0000
- 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 6e7d73e] 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/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update_sub1
- * [new branch]      modifications -> modifications
-[modify_sub1 36dfdb7] 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/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update_repo/sub1/sub2'...
-done.
-[add_nested_sub 25456fd] 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 7869752] 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 b338c6a] 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 d6e5724] update nested sub
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[modify_sub1_recursively 0b8097e] update sub1, that updates nested sub
- Author: A U Thor <author@example.com>
-To /build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update_sub1
- * [new branch]      modify_sub1_recursively -> modify_sub1_recursively
-To /build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update_sub2
- * [new branch]      modify_sub1_recursively -> modify_sub1_recursively
-Cleared directory 'sub2'
-Submodule 'sub2' (../submodule_update_sub2) unregistered for path 'sub2'
-Switched to a new branch 'replace_sub1_with_directory'
-Submodule path 'sub1': checked out 'cb2c808efe154ce76d5ab92b0c746719f3bab4a1'
-Previous HEAD position was cb2c808 Base inside first submodule
-Switched to branch 'modifications'
-rm 'sub1'
-[replace_sub1_with_directory 33ca002] 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'
-Removing sub1/file3
-Removing sub1/file2
-Removing sub1/file1
-Adding sub1
-[replace_directory_with_sub1 719e7aa] Revert "Replace sub1 with directory"
- Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:07:52 2021 +0000
- 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 292a7a8] 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 9e4958b] Revert "Replace sub1 with file"
- Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:07:52 2021 +0000
- 2 files changed, 5 insertions(+), 1 deletion(-)
- mode change 100644 => 160000 sub1
-Switched to a new branch 'invalid_sub1'
-[invalid_sub1 88157c2] Invalid sub1 commit
- Author: A U Thor <author@example.com>
-Switched to a new branch 'valid_sub1'
-[valid_sub1 d8449fe] Revert "Invalid sub1 commit"
- Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:07:52 2021 +0000
-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 remote branch 'no_submodule' from 'origin'.
-Branch 'add_sub1' set up to track remote branch 'add_sub1' from 'origin'.
-Applying: Add sub1
-Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out 'cb2c808efe154ce76d5ab92b0c746719f3bab4a1'
-Submodule path 'uninitialized_sub': checked out 'cb2c808efe154ce76d5ab92b0c746719f3bab4a1'
-ok 1 - am: added submodule creates empty directory
+			test-tool wildmatch pathmatch '[ab]' '[\[:]ab]'
+		
+ok 727 - pathmatch: match '[ab]' '[\[:]ab]'
 
 expecting success: 
-		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 remote branch 'no_submodule' from 'origin'.
-Branch 'add_sub1' set up to track remote branch 'add_sub1' from 'origin'.
-Applying: Add sub1
-Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out 'cb2c808efe154ce76d5ab92b0c746719f3bab4a1'
-Submodule path 'uninitialized_sub': checked out 'cb2c808efe154ce76d5ab92b0c746719f3bab4a1'
-ok 2 - am: added submodule leaves existing empty directory alone
+				printf '%s' '[ab]' >expect &&
+				git ls-files -z -- '[\[:]ab]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 728 - pathmatch (via ls-files): match '[\[:]ab]' '[ab]'
 
 expecting success: 
-		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 remote branch 'replace_sub1_with_file' from 'origin'.
-fatal: Needed a single revision
-Branch 'replace_file_with_sub1' set up to track remote branch 'replace_file_with_sub1' from 'origin'.
-Applying: Revert "Replace sub1 with file"
-Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out 'cb2c808efe154ce76d5ab92b0c746719f3bab4a1'
-Submodule path 'uninitialized_sub': checked out 'cb2c808efe154ce76d5ab92b0c746719f3bab4a1'
-ok 3 - am: replace tracked file with submodule creates empty directory
+			test-tool wildmatch ipathmatch '[ab]' '[\[:]ab]'
+		
+ok 729 - ipathmatch: match '[ab]' '[\[:]ab]'
 
 expecting success: 
-		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 remote branch 'replace_sub1_with_directory' from 'origin'.
-fatal: Needed a single revision
-Branch 'replace_directory_with_sub1' set up to track remote branch 'replace_directory_with_sub1' from 'origin'.
-Applying: Revert "Replace sub1 with directory"
-Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out 'cb2c808efe154ce76d5ab92b0c746719f3bab4a1'
-Submodule path 'uninitialized_sub': checked out 'cb2c808efe154ce76d5ab92b0c746719f3bab4a1'
-ok 4 - am: replace directory with submodule
+				printf '%s' '[ab]' >expect &&
+				git --icase-pathspecs ls-files -z -- '[\[:]ab]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 730 - ipathmatch (via ls-files): match '[\[:]ab]' '[ab]'
 
 expecting success: 
-		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
-		)
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
 	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-Branch 'add_sub1' set up to track remote branch 'add_sub1' from 'origin'.
-Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out 'cb2c808efe154ce76d5ab92b0c746719f3bab4a1'
-Branch 'remove_sub1' set up to track remote branch 'remove_sub1' from 'origin'.
-warning: unable to rmdir 'sub1': Directory not empty
-Applying: Revert "Add sub1"
-ok 5 - am: removed submodule leaves submodule directory and its contents in place
+Removing [ab]
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 731 - cleanup after previous file test
 
 expecting success: 
-		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
-		)
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
 	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-Branch 'add_sub1' set up to track remote branch 'add_sub1' from 'origin'.
-Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out 'cb2c808efe154ce76d5ab92b0c746719f3bab4a1'
-Branch 'remove_sub1' set up to track remote branch 'remove_sub1' from 'origin'.
-warning: unable to rmdir 'sub1': Directory not empty
-Applying: Revert "Add sub1"
-ok 6 - am: removed submodule leaves submodule containing a .git directory alone
+ok 732 - setup match file test for ?a?b
 
 expecting success: 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
-			test_must_fail $command replace_sub1_with_directory &&
-			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 remote branch 'add_sub1' from 'origin'.
-Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out 'cb2c808efe154ce76d5ab92b0c746719f3bab4a1'
-Branch 'replace_sub1_with_directory' set up to track remote branch 'replace_sub1_with_directory' from 'origin'.
-error: sub1/file1: already exists in working directory
-error: sub1/file2: already exists in working directory
-hint: Use 'git am --show-current-patch' to see the failed patch
-Applying: Replace sub1 with directory
-Patch failed at 0001 Replace sub1 with directory
-When you have resolved this problem, run "git am --continue".
-If you prefer to skip this patch, run "git am --skip" instead.
-To restore the original branch and stop patching, run "git am --abort".
-ok 7 - am: replace submodule with a directory must fail
+			test-tool wildmatch wildmatch '?a?b' '\??\?b'
+		
+ok 733 - wildmatch: match '?a?b' '\??\?b'
 
 expecting success: 
-		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 &&
-			test_must_fail $command replace_sub1_with_directory &&
-			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 remote branch 'add_sub1' from 'origin'.
-Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out 'cb2c808efe154ce76d5ab92b0c746719f3bab4a1'
-Branch 'replace_sub1_with_directory' set up to track remote branch 'replace_sub1_with_directory' from 'origin'.
-error: sub1/file1: already exists in working directory
-error: sub1/file2: already exists in working directory
-hint: Use 'git am --show-current-patch' to see the failed patch
-Applying: Replace sub1 with directory
-Patch failed at 0001 Replace sub1 with directory
-When you have resolved this problem, run "git am --continue".
-If you prefer to skip this patch, run "git am --skip" instead.
-To restore the original branch and stop patching, run "git am --abort".
-ok 8 - am: replace submodule containing a .git directory with a directory must fail
-
-checking known breakage: 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
-			test_must_fail $command replace_sub1_with_file &&
-			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 remote branch 'add_sub1' from 'origin'.
-Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out 'cb2c808efe154ce76d5ab92b0c746719f3bab4a1'
-Branch 'replace_sub1_with_file' set up to track remote branch 'replace_sub1_with_file' from 'origin'.
-warning: unable to rmdir 'sub1': Directory not empty
-error: unable to write file 'sub1' mode 100644: Directory not empty
-hint: Use 'git am --show-current-patch' to see the failed patch
-Applying: Replace sub1 with file
-Patch failed at 0001 Replace sub1 with file
-When you have resolved this problem, run "git am --continue".
-If you prefer to skip this patch, run "git am --skip" instead.
-To restore the original branch and stop patching, run "git am --abort".
-'actual' is not empty, it contains:
-:100644 100644 af3a0c56edfba1a28f50ada5ec2832a7f2f9b907 0000000000000000000000000000000000000000 M	.gitmodules
-not ok 9 - am: replace submodule with a file must fail # TODO known breakage
-
-checking known breakage: 
-		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 &&
-			test_must_fail $command replace_sub1_with_file &&
-			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 remote branch 'add_sub1' from 'origin'.
-Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out 'cb2c808efe154ce76d5ab92b0c746719f3bab4a1'
-Branch 'replace_sub1_with_file' set up to track remote branch 'replace_sub1_with_file' from 'origin'.
-warning: unable to rmdir 'sub1': Directory not empty
-error: unable to write file 'sub1' mode 100644: Directory not empty
-hint: Use 'git am --show-current-patch' to see the failed patch
-Applying: Replace sub1 with file
-Patch failed at 0001 Replace sub1 with file
-When you have resolved this problem, run "git am --continue".
-If you prefer to skip this patch, run "git am --skip" instead.
-To restore the original branch and stop patching, run "git am --abort".
-'actual' is not empty, it contains:
-:100644 100644 af3a0c56edfba1a28f50ada5ec2832a7f2f9b907 0000000000000000000000000000000000000000 M	.gitmodules
-not ok 10 - am: replace submodule containing a .git directory with a file must fail # TODO known breakage
+				printf '%s' '?a?b' >expect &&
+				git --glob-pathspecs ls-files -z -- '\??\?b' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 734 - wildmatch (via ls-files): match '\??\?b' '?a?b'
 
 expecting success: 
-		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 remote branch 'add_sub1' from 'origin'.
-Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out 'cb2c808efe154ce76d5ab92b0c746719f3bab4a1'
-Branch 'modify_sub1' set up to track remote branch 'modify_sub1' from 'origin'.
-warning: unable to rmdir 'sub1': Directory not empty
-Applying: Modify sub1
-Submodule path 'sub1': checked out '6e7d73e427c64685ce1ce1f2a621a7876d027692'
-ok 11 - am: modified submodule does not update submodule work tree
+			test-tool wildmatch iwildmatch '?a?b' '\??\?b'
+		
+ok 735 - iwildmatch: match '?a?b' '\??\?b'
 
 expecting success: 
-		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 remote branch 'add_sub1' from 'origin'.
-Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out 'cb2c808efe154ce76d5ab92b0c746719f3bab4a1'
-Branch 'invalid_sub1' set up to track remote branch 'invalid_sub1' from 'origin'.
-warning: unable to rmdir 'sub1': Directory not empty
-Applying: Invalid sub1 commit
-error: Server does not allow request for unadvertised object 0123456789012345678901234567890123456789
-Fetched in submodule path 'sub1', but it did not contain 0123456789012345678901234567890123456789. Direct fetching of that commit failed.
-ok 12 - am: modified submodule does not update submodule work tree to invalid commit
+				printf '%s' '?a?b' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '\??\?b' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 736 - iwildmatch (via ls-files): match '\??\?b' '?a?b'
 
 expecting success: 
-		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 remote branch 'invalid_sub1' from 'origin'.
-fatal: Needed a single revision
-Branch 'valid_sub1' set up to track remote branch 'valid_sub1' from 'origin'.
-Applying: Revert "Invalid sub1 commit"
-Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out 'cb2c808efe154ce76d5ab92b0c746719f3bab4a1'
-Submodule path 'uninitialized_sub': checked out 'cb2c808efe154ce76d5ab92b0c746719f3bab4a1'
-ok 13 - am: modified submodule does not update submodule work tree from invalid commit
+			test-tool wildmatch pathmatch '?a?b' '\??\?b'
+		
+ok 737 - pathmatch: match '?a?b' '\??\?b'
 
 expecting success: 
-		prolog &&
-		reset_work_tree_to 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 remote branch 'no_submodule' from 'origin'.
-Branch 'add_sub1' set up to track remote branch 'add_sub1' from 'origin'.
-error: sub1: already exists in working directory
-hint: Use 'git am --show-current-patch' to see the failed patch
-Applying: Add sub1
-Patch failed at 0001 Add sub1
-When you have resolved this problem, run "git am --continue".
-If you prefer to skip this patch, run "git am --skip" instead.
-To restore the original branch and stop patching, run "git am --abort".
-ok 14 - am: added submodule doesn't remove untracked unignored file with same name
+				printf '%s' '?a?b' >expect &&
+				git ls-files -z -- '\??\?b' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 738 - pathmatch (via ls-files): match '\??\?b' '?a?b'
 
 expecting success: 
-		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 remote branch 'no_submodule' from 'origin'.
-Branch 'add_sub1' set up to track remote branch 'add_sub1' from 'origin'.
-Applying: Add sub1
-Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out 'cb2c808efe154ce76d5ab92b0c746719f3bab4a1'
-Submodule path 'uninitialized_sub': checked out 'cb2c808efe154ce76d5ab92b0c746719f3bab4a1'
-ok 15 - am_3way: added submodule creates empty directory
+			test-tool wildmatch ipathmatch '?a?b' '\??\?b'
+		
+ok 739 - ipathmatch: match '?a?b' '\??\?b'
 
 expecting success: 
-		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 remote branch 'no_submodule' from 'origin'.
-Branch 'add_sub1' set up to track remote branch 'add_sub1' from 'origin'.
-Applying: Add sub1
-Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out 'cb2c808efe154ce76d5ab92b0c746719f3bab4a1'
-Submodule path 'uninitialized_sub': checked out 'cb2c808efe154ce76d5ab92b0c746719f3bab4a1'
-ok 16 - am_3way: added submodule leaves existing empty directory alone
+				printf '%s' '?a?b' >expect &&
+				git --icase-pathspecs ls-files -z -- '\??\?b' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 740 - ipathmatch (via ls-files): match '\??\?b' '?a?b'
 
 expecting success: 
-		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
-		)
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
 	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'replace_sub1_with_file'
-Branch 'replace_sub1_with_file' set up to track remote branch 'replace_sub1_with_file' from 'origin'.
-fatal: Needed a single revision
-Branch 'replace_file_with_sub1' set up to track remote branch 'replace_file_with_sub1' from 'origin'.
-Applying: Revert "Replace sub1 with file"
-Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out 'cb2c808efe154ce76d5ab92b0c746719f3bab4a1'
-Submodule path 'uninitialized_sub': checked out 'cb2c808efe154ce76d5ab92b0c746719f3bab4a1'
-ok 17 - am_3way: replace tracked file with submodule creates empty directory
+Removing ?a?b
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 741 - cleanup after previous file test
 
 expecting success: 
-		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
-		)
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
 	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'replace_sub1_with_directory'
-Branch 'replace_sub1_with_directory' set up to track remote branch 'replace_sub1_with_directory' from 'origin'.
-fatal: Needed a single revision
-Branch 'replace_directory_with_sub1' set up to track remote branch 'replace_directory_with_sub1' from 'origin'.
-Applying: Revert "Replace sub1 with directory"
-Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out 'cb2c808efe154ce76d5ab92b0c746719f3bab4a1'
-Submodule path 'uninitialized_sub': checked out 'cb2c808efe154ce76d5ab92b0c746719f3bab4a1'
-ok 18 - am_3way: replace directory with submodule
+ok 742 - setup match file test for abc
 
 expecting success: 
-		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 remote branch 'add_sub1' from 'origin'.
-Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out 'cb2c808efe154ce76d5ab92b0c746719f3bab4a1'
-Branch 'remove_sub1' set up to track remote branch 'remove_sub1' from 'origin'.
-Applying: Revert "Add sub1"
-ok 19 - am_3way: removed submodule leaves submodule directory and its contents in place
+			test-tool wildmatch wildmatch 'abc' '\a\b\c'
+		
+ok 743 - wildmatch: match 'abc' '\a\b\c'
 
 expecting success: 
-		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 remote branch 'add_sub1' from 'origin'.
-Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out 'cb2c808efe154ce76d5ab92b0c746719f3bab4a1'
-Branch 'remove_sub1' set up to track remote branch 'remove_sub1' from 'origin'.
-Applying: Revert "Add sub1"
-ok 20 - am_3way: removed submodule leaves submodule containing a .git directory alone
+				printf '%s' 'abc' >expect &&
+				git --glob-pathspecs ls-files -z -- '\a\b\c' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 744 - wildmatch (via ls-files): match '\a\b\c' 'abc'
 
-checking known breakage: 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
-			test_must_fail $command replace_sub1_with_directory &&
-			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 remote branch 'add_sub1' from 'origin'.
-Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out 'cb2c808efe154ce76d5ab92b0c746719f3bab4a1'
-Branch 'replace_sub1_with_directory' set up to track remote branch 'replace_sub1_with_directory' from 'origin'.
-Applying: Replace sub1 with directory
-error: refusing to lose untracked file at 'sub1/file2'
-error: refusing to lose untracked file at 'sub1/file1'
-Using index info to reconstruct a base tree...
-Falling back to patching base and 3-way merge...
-Merging:
-9fcbdb8 Add sub1
-virtual Replace sub1 with directory
-found 1 common ancestor:
-virtual cd9f2278a908ef35bd98ee463d254701afc9a0eb
-Adding sub1/file3
-Adding sub1/file2
-Adding sub1/file1
-Removing sub1
-test_must_fail: command succeeded: am_3way replace_sub1_with_directory
-not ok 21 - am_3way: replace submodule with a directory must fail # TODO known breakage
+expecting success: 
+			test-tool wildmatch iwildmatch 'abc' '\a\b\c'
+		
+ok 745 - iwildmatch: match 'abc' '\a\b\c'
 
-checking known breakage: 
-		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 &&
-			test_must_fail $command replace_sub1_with_directory &&
-			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 remote branch 'add_sub1' from 'origin'.
-Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out 'cb2c808efe154ce76d5ab92b0c746719f3bab4a1'
-Branch 'replace_sub1_with_directory' set up to track remote branch 'replace_sub1_with_directory' from 'origin'.
-Applying: Replace sub1 with directory
-error: refusing to lose untracked file at 'sub1/file2'
-error: refusing to lose untracked file at 'sub1/file1'
-Using index info to reconstruct a base tree...
-Falling back to patching base and 3-way merge...
-Merging:
-9fcbdb8 Add sub1
-virtual Replace sub1 with directory
-found 1 common ancestor:
-virtual cd9f2278a908ef35bd98ee463d254701afc9a0eb
-Adding sub1/file3
-Adding sub1/file2
-Adding sub1/file1
-Removing sub1
-test_must_fail: command succeeded: am_3way replace_sub1_with_directory
-not ok 22 - am_3way: replace submodule containing a .git directory with a directory must fail # TODO known breakage
+expecting success: 
+				printf '%s' 'abc' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '\a\b\c' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 746 - iwildmatch (via ls-files): match '\a\b\c' 'abc'
 
-checking known breakage: 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
-			test_must_fail $command replace_sub1_with_file &&
-			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 remote branch 'add_sub1' from 'origin'.
-Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out 'cb2c808efe154ce76d5ab92b0c746719f3bab4a1'
-Branch 'replace_sub1_with_file' set up to track remote branch 'replace_sub1_with_file' from 'origin'.
-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 2d0e9d64e7ab1e7c2743224afe32d415b67d5421 and 0c5fb3d7a7f38842873e1ae04f0d84f622ff7d20 failed
-error: Failed to merge in the changes.
-hint: Use 'git am --show-current-patch' to see the failed patch
-Using index info to reconstruct a base tree...
-Falling back to patching base and 3-way merge...
-Merging:
-9fcbdb8 Add sub1
-virtual Replace sub1 with file
-found 1 common ancestor:
-virtual cd9f2278a908ef35bd98ee463d254701afc9a0eb
-Patch failed at 0001 Replace sub1 with file
-When you have resolved this problem, run "git am --continue".
-If you prefer to skip this patch, run "git am --skip" instead.
-To restore the original branch and stop patching, run "git am --abort".
-'actual' is not empty, it contains:
-:100644 100644 af3a0c56edfba1a28f50ada5ec2832a7f2f9b907 0000000000000000000000000000000000000000 M	.gitmodules
-not ok 23 - am_3way: replace submodule with a file must fail # TODO known breakage
+expecting success: 
+			test-tool wildmatch pathmatch 'abc' '\a\b\c'
+		
+ok 747 - pathmatch: match 'abc' '\a\b\c'
 
-checking known breakage: 
-		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 &&
-			test_must_fail $command replace_sub1_with_file &&
-			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 remote branch 'add_sub1' from 'origin'.
-Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out 'cb2c808efe154ce76d5ab92b0c746719f3bab4a1'
-Branch 'replace_sub1_with_file' set up to track remote branch 'replace_sub1_with_file' from 'origin'.
-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 2d0e9d64e7ab1e7c2743224afe32d415b67d5421 and 0c5fb3d7a7f38842873e1ae04f0d84f622ff7d20 failed
-error: Failed to merge in the changes.
-hint: Use 'git am --show-current-patch' to see the failed patch
-Using index info to reconstruct a base tree...
-Falling back to patching base and 3-way merge...
-Merging:
-9fcbdb8 Add sub1
-virtual Replace sub1 with file
-found 1 common ancestor:
-virtual cd9f2278a908ef35bd98ee463d254701afc9a0eb
-Patch failed at 0001 Replace sub1 with file
-When you have resolved this problem, run "git am --continue".
-If you prefer to skip this patch, run "git am --skip" instead.
-To restore the original branch and stop patching, run "git am --abort".
-'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: 
+				printf '%s' 'abc' >expect &&
+				git ls-files -z -- '\a\b\c' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 748 - pathmatch (via ls-files): match '\a\b\c' 'abc'
 
 expecting success: 
-		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 remote branch 'add_sub1' from 'origin'.
-Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out 'cb2c808efe154ce76d5ab92b0c746719f3bab4a1'
-Branch 'modify_sub1' set up to track remote branch 'modify_sub1' from 'origin'.
-Applying: Modify sub1
-Submodule path 'sub1': checked out '6e7d73e427c64685ce1ce1f2a621a7876d027692'
-ok 25 - am_3way: modified submodule does not update submodule work tree
+			test-tool wildmatch ipathmatch 'abc' '\a\b\c'
+		
+ok 749 - ipathmatch: match 'abc' '\a\b\c'
 
 expecting success: 
-		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 remote branch 'add_sub1' from 'origin'.
-Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out 'cb2c808efe154ce76d5ab92b0c746719f3bab4a1'
-Branch 'invalid_sub1' set up to track remote branch 'invalid_sub1' from 'origin'.
-Applying: Invalid sub1 commit
-error: Server does not allow request for unadvertised object 0123456789012345678901234567890123456789
-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
+				printf '%s' 'abc' >expect &&
+				git --icase-pathspecs ls-files -z -- '\a\b\c' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 750 - ipathmatch (via ls-files): match '\a\b\c' 'abc'
 
 expecting success: 
-		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
-		)
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
 	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'invalid_sub1'
-Branch 'invalid_sub1' set up to track remote branch 'invalid_sub1' from 'origin'.
-fatal: Needed a single revision
-Branch 'valid_sub1' set up to track remote branch 'valid_sub1' from 'origin'.
-Applying: Revert "Invalid sub1 commit"
-Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out 'cb2c808efe154ce76d5ab92b0c746719f3bab4a1'
-Submodule path 'uninitialized_sub': checked out 'cb2c808efe154ce76d5ab92b0c746719f3bab4a1'
-ok 27 - am_3way: modified submodule does not update submodule work tree from invalid commit
+Removing abc
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 751 - cleanup after previous file test
 
 expecting success: 
-		prolog &&
-		reset_work_tree_to 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
-		)
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
 	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'no_submodule'
-Branch 'no_submodule' set up to track remote branch 'no_submodule' from 'origin'.
-Branch 'add_sub1' set up to track remote branch 'add_sub1' from 'origin'.
-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 a6f757ba6332a280967ab9d7f6b2b2c74784a5c9 failed
-error: Failed to merge in the changes.
-hint: Use 'git am --show-current-patch' to see the failed patch
-Using index info to reconstruct a base tree...
-Falling back to patching base and 3-way merge...
-Merging:
-36b43a5 Base
-virtual Add sub1
-found 1 common ancestor:
-virtual 4b825dc642cb6eb9a060e54bf8d69288fbee4904
-Patch failed at 0001 Add sub1
-When you have resolved this problem, run "git am --continue".
-If you prefer to skip this patch, run "git am --skip" instead.
-To restore the original branch and stop patching, run "git am --abort".
-ok 28 - am_3way: added submodule doesn't remove untracked unignored file with same name
+ok 752 - setup match file test for foo
 
 expecting success: 
-	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/git-2.20.1/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
+			test_must_fail test-tool wildmatch wildmatch 'foo' ''
+		
+ok 753 - wildmatch: no match 'foo' ''
 
 expecting success: 
-	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
+				printf '%s' 'foo' >expect &&
+				test_must_fail git --glob-pathspecs ls-files -z -- ''
+			
+fatal: empty string is not a valid pathspec. please use . instead if you meant to match all paths
+ok 754 - wildmatch (via ls-files): match dies on '' 'foo'
 
 expecting success: 
-	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
+			test_must_fail test-tool wildmatch iwildmatch 'foo' ''
+		
+ok 755 - iwildmatch: no match 'foo' ''
 
 expecting success: 
-	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
+				printf '%s' 'foo' >expect &&
+				test_must_fail git --glob-pathspecs --icase-pathspecs ls-files -z -- ''
+			
+fatal: empty string is not a valid pathspec. please use . instead if you meant to match all paths
+ok 756 - iwildmatch (via ls-files): match dies on '' 'foo'
 
 expecting success: 
-	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
+			test_must_fail test-tool wildmatch pathmatch 'foo' ''
+		
+ok 757 - pathmatch: no match 'foo' ''
 
-# still have 6 known breakage(s)
-# passed all remaining 27 test(s)
-1..33
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t5544-pack-objects-hook.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5544-pack-objects-hook/.git/
 expecting success: 
-	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
+				printf '%s' 'foo' >expect &&
+				test_must_fail git ls-files -z -- ''
+			
+fatal: empty string is not a valid pathspec. please use . instead if you meant to match all paths
+ok 758 - pathmatch (via ls-files): match dies on '' 'foo'
 
 expecting success: 
-	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
+			test_must_fail test-tool wildmatch ipathmatch 'foo' ''
+		
+ok 759 - ipathmatch: no match 'foo' ''
 
 expecting success: 
-	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
+				printf '%s' 'foo' >expect &&
+				test_must_fail git --icase-pathspecs ls-files -z -- ''
+			
+fatal: empty string is not a valid pathspec. please use . instead if you meant to match all paths
+ok 760 - ipathmatch (via ls-files): match dies on '' 'foo'
 
 expecting success: 
-	# 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
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing expect
+Removing foo
+ok 761 - cleanup after previous file test
 
 expecting success: 
-	clear_hook_results &&
-	git clone --no-local \
-	  -u "git -c uploadpack.packObjectsHook=./hook upload-pack" \
-	  . dst.git 2>stderr &&
-	grep "hook running" stderr
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 762 - setup match file test for foo/bar/baz/to
 
-remote: hook running        
-ok 5 - hook runs from -c config
+expecting success: 
+			test-tool wildmatch wildmatch 'foo/bar/baz/to' '**/t[o]'
+		
+ok 763 - wildmatch: match 'foo/bar/baz/to' '**/t[o]'
 
 expecting success: 
-	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
+				printf '%s' 'foo/bar/baz/to' >expect &&
+				git --glob-pathspecs ls-files -z -- '**/t[o]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 764 - wildmatch (via ls-files): match '**/t[o]' 'foo/bar/baz/to'
 
-ok 6 - hook does not run from repo config
+expecting success: 
+			test-tool wildmatch iwildmatch 'foo/bar/baz/to' '**/t[o]'
+		
+ok 765 - iwildmatch: match 'foo/bar/baz/to' '**/t[o]'
 
-# passed all 6 test(s)
-1..6
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t5537-fetch-shallow.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5537-fetch-shallow/.git/
 expecting success: 
-	commit 1 &&
-	commit 2 &&
-	commit 3 &&
-	commit 4 &&
-	git config --global transfer.fsckObjects true
+				printf '%s' 'foo/bar/baz/to' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '**/t[o]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 766 - iwildmatch (via ls-files): match '**/t[o]' 'foo/bar/baz/to'
 
-[master (root-commit) 8c9283e] 1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 tracked
-[master e3cca0a] 2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[master 89777f4] 3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[master 8296bb8] 4
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 1 - setup
+expecting success: 
+			test-tool wildmatch pathmatch 'foo/bar/baz/to' '**/t[o]'
+		
+ok 767 - pathmatch: match 'foo/bar/baz/to' '**/t[o]'
 
 expecting success: 
-	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
+				printf '%s' 'foo/bar/baz/to' >expect &&
+				git ls-files -z -- '**/t[o]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 768 - pathmatch (via ls-files): match '**/t[o]' 'foo/bar/baz/to'
 
-Cloning into 'shallow'...
-ok 2 - setup shallow clone
+expecting success: 
+			test-tool wildmatch ipathmatch 'foo/bar/baz/to' '**/t[o]'
+		
+ok 769 - ipathmatch: match 'foo/bar/baz/to' '**/t[o]'
 
 expecting success: 
-	git clone --no-local shallow shallow2 &&
-	(
-	cd shallow2 &&
-	git fsck &&
-	git log --format=%s >actual &&
-	cat <<EOF >expect &&
-4
-3
-EOF
-	test_cmp expect actual
-	)
+				printf '%s' 'foo/bar/baz/to' >expect &&
+				git --icase-pathspecs ls-files -z -- '**/t[o]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 770 - ipathmatch (via ls-files): match '**/t[o]' 'foo/bar/baz/to'
 
-Cloning into 'shallow2'...
-ok 3 - clone from shallow clone
+expecting success: 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+Removing foo/
+ok 771 - cleanup after previous file test
 
 expecting success: 
-	(
-	cd shallow &&
-	commit 5
-	) &&
-	(
-	cd shallow2 &&
-	git fetch &&
-	git fsck &&
-	git log --format=%s origin/master >actual &&
-	cat <<EOF >expect &&
-5
-4
-3
-EOF
-	test_cmp expect actual
-	)
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 772 - setup match file test for a1B
 
-[master ef5e558] 5
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-From /build/git-2.20.1/t/trash directory.t5537-fetch-shallow/shallow
-   8296bb8..ef5e558  master     -> origin/master
-ok 4 - fetch from shallow clone
+expecting success: 
+			test-tool wildmatch wildmatch 'a1B' '[[:alpha:]][[:digit:]][[:upper:]]'
+		
+ok 773 - wildmatch: match 'a1B' '[[:alpha:]][[:digit:]][[:upper:]]'
 
 expecting success: 
-	(
-	cd shallow &&
-	commit 6
-	) &&
-	(
-	cd shallow2 &&
-	git fetch --depth=2 &&
-	git fsck &&
-	git log --format=%s origin/master >actual &&
-	cat <<EOF >expect &&
-6
-5
-EOF
-	test_cmp expect actual
-	)
+				printf '%s' 'a1B' >expect &&
+				git --glob-pathspecs ls-files -z -- '[[:alpha:]][[:digit:]][[:upper:]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 774 - wildmatch (via ls-files): match '[[:alpha:]][[:digit:]][[:upper:]]' 'a1B'
 
-[master 67c41b6] 6
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-From /build/git-2.20.1/t/trash directory.t5537-fetch-shallow/shallow
-   ef5e558..67c41b6  master     -> origin/master
-ok 5 - fetch --depth from shallow clone
+expecting success: 
+			test-tool wildmatch iwildmatch 'a1B' '[[:alpha:]][[:digit:]][[:upper:]]'
+		
+ok 775 - iwildmatch: match 'a1B' '[[:alpha:]][[:digit:]][[:upper:]]'
 
 expecting success: 
-	(
-	cd shallow2 &&
-	git fetch --unshallow &&
-	git fsck &&
-	git log --format=%s origin/master >actual &&
-	cat <<EOF >expect &&
-6
-5
-4
-3
-EOF
-	test_cmp expect actual
-	)
+				printf '%s' 'a1B' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[[:alpha:]][[:digit:]][[:upper:]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 776 - iwildmatch (via ls-files): match '[[:alpha:]][[:digit:]][[:upper:]]' 'a1B'
 
-ok 6 - fetch --unshallow from shallow clone
+expecting success: 
+			test-tool wildmatch pathmatch 'a1B' '[[:alpha:]][[:digit:]][[:upper:]]'
+		
+ok 777 - pathmatch: match 'a1B' '[[:alpha:]][[:digit:]][[:upper:]]'
 
 expecting success: 
-	# 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/master:refs/remotes/top/master &&
-	git fsck &&
-	git log --format=%s top/master >actual &&
-	cat <<EOF >expect &&
-add-1-back
-4
-3
-EOF
-	test_cmp expect actual
-	) &&
-	git --git-dir=shallow2/.git cat-file blob $(echo 1|git hash-object --stdin) >/dev/null
+				printf '%s' 'a1B' >expect &&
+				git ls-files -z -- '[[:alpha:]][[:digit:]][[:upper:]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 778 - pathmatch (via ls-files): match '[[:alpha:]][[:digit:]][[:upper:]]' 'a1B'
 
+expecting success: 
+			test-tool wildmatch ipathmatch 'a1B' '[[:alpha:]][[:digit:]][[:upper:]]'
+		
+ok 779 - ipathmatch: match 'a1B' '[[:alpha:]][[:digit:]][[:upper:]]'
 
-fatal: git cat-file d00491fd7e5bb6fa28c517a0bb32b8b506539d4d: bad file
-[master 6d3ef40] add-1-back
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 1.t
-From ../
- * [new branch]      master     -> top/master
-ok 7 - fetch something upstream has but hidden by clients shallow boundaries
+expecting success: 
+				printf '%s' 'a1B' >expect &&
+				git --icase-pathspecs ls-files -z -- '[[:alpha:]][[:digit:]][[:upper:]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 780 - ipathmatch (via ls-files): match '[[:alpha:]][[:digit:]][[:upper:]]' 'a1B'
 
 expecting success: 
-	(
-	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 &&
-	cat <<EOF >expect.refs &&
-refs/remotes/shallow/no-shallow
-EOF
-	test_cmp expect.refs actual.refs &&
-	git log --format=%s shallow/no-shallow >actual &&
-	cat <<EOF >expect &&
-no-shallow
-EOF
-	test_cmp expect actual
-	)
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing a1B
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 781 - cleanup after previous file test
 
-Switched to a new branch 'no-shallow'
-[no-shallow (root-commit) 77b8766] no-shallow
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 tracked
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5537-fetch-shallow/notshallow/.git/
-warning: reject refs/remotes/shallow/master because shallow roots are not allowed to be updated
-From ../shallow/
- * [new branch]      no-shallow -> shallow/no-shallow
-ok 8 - fetch that requires changes in .git/shallow is filtered
+expecting success: 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 782 - setup match file test for a
 
 expecting success: 
-	(
-	cd shallow &&
-	git checkout master &&
-	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/master
-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/master >actual &&
-	cat <<EOF >expect &&
-7
-6
-5
-4
-3
-EOF
-	test_cmp expect actual
-	)
+			test_must_fail test-tool wildmatch wildmatch 'a' '[[:digit:][:upper:][:space:]]'
+		
+ok 783 - wildmatch: no match 'a' '[[:digit:][:upper:][:space:]]'
 
-Switched to branch 'master'
-Your branch is ahead of 'origin/master' by 2 commits.
-  (use "git push" to publish your local commits)
-[master 0f0ecf6] 7
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-error: Could not read e3cca0a44c8d61c1b2aaf4e9dacb73ae79795feb
-From ../shallow/
- * [new branch]      master     -> shallow/master
- * [new tag]         heavy-tag  -> heavy-tag
- * [new tag]         light-tag  -> light-tag
-notice: HEAD points to an unborn branch (master)
-ok 9 - fetch --update-shallow
+expecting success: 
+				>expect &&
+				git --glob-pathspecs ls-files -z -- '[[:digit:][:upper:][:space:]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 784 - wildmatch (via ls-files): no match '[[:digit:][:upper:][:space:]]' 'a'
 
-checking prerequisite: SANITY
+expecting success: 
+			test-tool wildmatch iwildmatch 'a' '[[:digit:][:upper:][:space:]]'
+		
+ok 785 - iwildmatch: match 'a' '[[:digit:][:upper:][:space:]]'
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
-	mkdir SANETESTD.1 SANETESTD.2 &&
+expecting success: 
+				printf '%s' 'a' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[[:digit:][:upper:][:space:]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 786 - iwildmatch (via ls-files): match '[[:digit:][:upper:][:space:]]' 'a'
 
-	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: 
+			test_must_fail test-tool wildmatch pathmatch 'a' '[[:digit:][:upper:][:space:]]'
+		
+ok 787 - pathmatch: no match 'a' '[[:digit:][:upper:][:space:]]'
 
-	! test -r SANETESTD.1/x &&
-	! rm SANETESTD.1/x && ! test -f SANETESTD.2/x
-	status=$?
+expecting success: 
+				>expect &&
+				git ls-files -z -- '[[:digit:][:upper:][:space:]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 788 - pathmatch (via ls-files): no match '[[:digit:][:upper:][:space:]]' 'a'
 
-	chmod +rwx SANETESTD.1 SANETESTD.2 &&
-	rm -rf SANETESTD.1 SANETESTD.2 ||
-	BUG "cannot clean SANETESTD"
-	return $status
+expecting success: 
+			test-tool wildmatch ipathmatch 'a' '[[:digit:][:upper:][:space:]]'
+		
+ok 789 - ipathmatch: match 'a' '[[:digit:][:upper:][:space:]]'
 
-)
-rm: cannot remove 'SANETESTD.1/x': Permission denied
-prerequisite SANITY ok
 expecting success: 
-	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 &&
-	cat >expect <<EOF &&
-add-1-back
-4
-EOF
-	test_cmp expect actual
+				printf '%s' 'a' >expect &&
+				git --icase-pathspecs ls-files -z -- '[[:digit:][:upper:][:space:]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 790 - ipathmatch (via ls-files): match '[[:digit:][:upper:][:space:]]' 'a'
 
-Cloning into 'from-read-only'...
-ok 10 - shallow fetch from a read-only repo
+expecting success: 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing a
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 791 - cleanup after previous file test
 
 expecting success: 
-	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 master &&
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 792 - setup match file test for A
 
-	git clone --depth=1 --no-tags --no-single-branch \
-		"file://$PWD/shallow-server" shallow-client &&
+expecting success: 
+			test-tool wildmatch wildmatch 'A' '[[:digit:][:upper:][:space:]]'
+		
+ok 793 - wildmatch: match 'A' '[[:digit:][:upper:][:space:]]'
 
-	: 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 &&
+expecting success: 
+				printf '%s' 'A' >expect &&
+				git --glob-pathspecs ls-files -z -- '[[:digit:][:upper:][:space:]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 794 - wildmatch (via ls-files): match '[[:digit:][:upper:][:space:]]' 'A'
 
-	git -C shallow-server branch branch-orig $d &&
-	git -C shallow-client fetch --prune --depth=2 \
-		origin "+refs/heads/*:refs/remotes/origin/*"
+expecting success: 
+			test-tool wildmatch iwildmatch 'A' '[[:digit:][:upper:][:space:]]'
+		
+ok 795 - iwildmatch: match 'A' '[[:digit:][:upper:][:space:]]'
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5537-fetch-shallow/shallow-server/.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
-Switched to a new branch 'branch'
-[branch 35a8500] C
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 C.t
-[branch 3e7056f] E
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 E.t
-[branch ab50130] D
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 D.t
-Switched to branch 'master'
-Cloning into 'shallow-client'...
-Deleted branch branch (was ab50130).
-From file:///build/git-2.20.1/t/trash directory.t5537-fetch-shallow/shallow-server
- - [deleted]         (none)     -> origin/branch
-fatal: Needed a single revision
-From file:///build/git-2.20.1/t/trash directory.t5537-fetch-shallow/shallow-server
- * [new branch]      branch-orig -> origin/branch-orig
-ok 11 - .git/shallow is edited by repack
+expecting success: 
+				printf '%s' 'A' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[[:digit:][:upper:][:space:]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 796 - iwildmatch (via ls-files): match '[[:digit:][:upper:][:space:]]' 'A'
 
-checking prerequisite: NOT_ROOT
+expecting success: 
+			test-tool wildmatch pathmatch 'A' '[[:digit:][:upper:][:space:]]'
+		
+ok 797 - pathmatch: match 'A' '[[:digit:][:upper:][:space:]]'
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
-	uid=$(id -u) &&
-	test "$uid" != 0
+expecting success: 
+				printf '%s' 'A' >expect &&
+				git ls-files -z -- '[[:digit:][:upper:][:space:]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 798 - pathmatch (via ls-files): match '[[:digit:][:upper:][:space:]]' 'A'
 
-)
-prerequisite NOT_ROOT ok
-# passed all 11 test(s)
-# SKIP no web server found at '/usr/sbin/apache2'
-1..11
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t5550-http-fetch-dumb.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5550-http-fetch-dumb/.git/
-checking prerequisite: NOT_ROOT
+expecting success: 
+			test-tool wildmatch ipathmatch 'A' '[[:digit:][:upper:][:space:]]'
+		
+ok 799 - ipathmatch: match 'A' '[[:digit:][:upper:][:space:]]'
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
-	uid=$(id -u) &&
-	test "$uid" != 0
+expecting success: 
+				printf '%s' 'A' >expect &&
+				git --icase-pathspecs ls-files -z -- '[[:digit:][:upper:][:space:]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 800 - ipathmatch (via ls-files): match '[[:digit:][:upper:][:space:]]' 'A'
 
-)
-prerequisite NOT_ROOT ok
-1..0 # SKIP no web server found at '/usr/sbin/apache2'
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t5551-http-fetch-smart.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5551-http-fetch-smart/.git/
-checking prerequisite: NOT_ROOT
+expecting success: 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing A
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 801 - cleanup after previous file test
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
-	uid=$(id -u) &&
-	test "$uid" != 0
+expecting success: 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 802 - setup match file test for 1
 
-)
-prerequisite NOT_ROOT ok
-1..0 # SKIP no web server found at '/usr/sbin/apache2'
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t5547-push-quarantine.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5547-push-quarantine/.git/
 expecting success: 
-	git init --bare dest.git &&
-	write_script dest.git/hooks/pre-receive <<-\EOF
-	while read old new ref; do
-		test "$(git log -1 --format=%s $new)" = reject && exit 1
-	done
-	exit 0
-	EOF
+			test-tool wildmatch wildmatch '1' '[[:digit:][:upper:][:space:]]'
+		
+ok 803 - wildmatch: match '1' '[[:digit:][:upper:][:space:]]'
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5547-push-quarantine/dest.git/
-ok 1 - create picky dest repo
+expecting success: 
+				printf '%s' '1' >expect &&
+				git --glob-pathspecs ls-files -z -- '[[:digit:][:upper:][:space:]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 804 - wildmatch (via ls-files): match '[[:digit:][:upper:][:space:]]' '1'
 
 expecting success: 
-	test_commit ok &&
-	git push dest.git HEAD &&
-	commit=$(git rev-parse HEAD) &&
-	git --git-dir=dest.git cat-file commit $commit
+			test-tool wildmatch iwildmatch '1' '[[:digit:][:upper:][:space:]]'
+		
+ok 805 - iwildmatch: match '1' '[[:digit:][:upper:][:space:]]'
 
-[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
+expecting success: 
+				printf '%s' '1' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[[:digit:][:upper:][:space:]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 806 - iwildmatch (via ls-files): match '[[:digit:][:upper:][:space:]]' '1'
 
-ok
-ok 2 - accepted objects work
+expecting success: 
+			test-tool wildmatch pathmatch '1' '[[:digit:][:upper:][:space:]]'
+		
+ok 807 - pathmatch: match '1' '[[:digit:][:upper:][:space:]]'
 
 expecting success: 
-	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
+				printf '%s' '1' >expect &&
+				git ls-files -z -- '[[:digit:][:upper:][:space:]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 808 - pathmatch (via ls-files): match '[[:digit:][:upper:][:space:]]' '1'
 
-[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: 
+			test-tool wildmatch ipathmatch '1' '[[:digit:][:upper:][:space:]]'
+		
+ok 809 - ipathmatch: match '1' '[[:digit:][:upper:][:space:]]'
 
 expecting success: 
-	echo "incoming-*" >expect &&
-	(cd dest.git/objects && echo incoming-*) >actual &&
-	test_cmp expect actual
+				printf '%s' '1' >expect &&
+				git --icase-pathspecs ls-files -z -- '[[:digit:][:upper:][:space:]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 810 - ipathmatch (via ls-files): match '[[:digit:][:upper:][:space:]]' '1'
 
-ok 4 - rejected objects are removed
+expecting success: 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing 1
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 811 - cleanup after previous file test
 
 expecting success: 
-	# 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.
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 812 - setup match file test for 1
 
-	test-tool genrandom foo 4096 >file.bin &&
-	git add file.bin &&
-	git commit -m bin &&
+expecting success: 
+			test_must_fail test-tool wildmatch wildmatch '1' '[[:digit:][:upper:][:spaci:]]'
+		
+ok 813 - wildmatch: no match '1' '[[:digit:][:upper:][:spaci:]]'
 
-	if test_have_prereq MINGW
-	then
-		pathsep=";"
-	else
-		pathsep=":"
-	fi &&
-	git clone --bare . "xxx${pathsep}yyy.git" &&
+expecting success: 
+				>expect &&
+				git --glob-pathspecs ls-files -z -- '[[:digit:][:upper:][:spaci:]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 814 - wildmatch (via ls-files): no match '[[:digit:][:upper:][:spaci:]]' '1'
 
-	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
+expecting success: 
+			test_must_fail test-tool wildmatch iwildmatch '1' '[[:digit:][:upper:][:spaci:]]'
+		
+ok 815 - iwildmatch: no match '1' '[[:digit:][:upper:][:spaci:]]'
 
-[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/git-2.20.1/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: 
+				>expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[[:digit:][:upper:][:spaci:]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 816 - iwildmatch (via ls-files): no match '[[:digit:][:upper:][:spaci:]]' '1'
 
 expecting success: 
-	git init --bare update.git &&
-	write_script update.git/hooks/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
+			test_must_fail test-tool wildmatch pathmatch '1' '[[:digit:][:upper:][:spaci:]]'
+		
+ok 817 - pathmatch: no match '1' '[[:digit:][:upper:][:spaci:]]'
 
-Initialized empty Git repository in /build/git-2.20.1/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
+expecting success: 
+				>expect &&
+				git ls-files -z -- '[[:digit:][:upper:][:spaci:]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 818 - pathmatch (via ls-files): no match '[[:digit:][:upper:][:spaci:]]' '1'
 
-# passed all 6 test(s)
-1..6
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t5546-receive-limits.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5546-receive-limits/.git/
 expecting success: 
-	test-tool genrandom foo 1024 >one-k &&
-	git add one-k &&
-	test_commit one-k
+			test_must_fail test-tool wildmatch ipathmatch '1' '[[:digit:][:upper:][:spaci:]]'
+		
+ok 819 - ipathmatch: no match '1' '[[:digit:][:upper:][:spaci:]]'
 
-[master (root-commit) cba7046] one-k
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+)
- create mode 100644 one-k
- create mode 100644 one-k.t
-ok 1 - create known-size (1024 bytes) commit
+expecting success: 
+				>expect &&
+				git --icase-pathspecs ls-files -z -- '[[:digit:][:upper:][:spaci:]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 820 - ipathmatch (via ls-files): no match '[[:digit:][:upper:][:spaci:]]' '1'
 
 expecting success: 
-		rm -fr dest &&
-		git --bare init dest
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
 	
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5546-receive-limits/dest/
-ok 2 - prepare destination repository
+Removing 1
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 821 - cleanup after previous file test
 
 expecting success: 
-		git --git-dir=dest config receive.unpacklimit "$unpack_limit"
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
 	
-ok 3 - set unpacklimit to 1
+ok 822 - setup match file test for  
 
 expecting success: 
-		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: 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
+			test-tool wildmatch wildmatch ' ' '[[:digit:][:upper:][:space:]]'
+		
+ok 823 - wildmatch: match ' ' '[[:digit:][:upper:][:space:]]'
 
 expecting success: 
-		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
+				printf '%s' ' ' >expect &&
+				git --glob-pathspecs ls-files -z -- '[[:digit:][:upper:][:space:]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 824 - wildmatch (via ls-files): match '[[:digit:][:upper:][:space:]]' ' '
 
 expecting success: 
-		rm -fr dest &&
-		git --bare init dest
-	
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5546-receive-limits/dest/
-ok 6 - prepare destination repository (again)
+			test-tool wildmatch iwildmatch ' ' '[[:digit:][:upper:][:space:]]'
+		
+ok 825 - iwildmatch: match ' ' '[[:digit:][:upper:][:space:]]'
 
 expecting success: 
-		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
+				printf '%s' ' ' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[[:digit:][:upper:][:space:]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 826 - iwildmatch (via ls-files): match '[[:digit:][:upper:][:space:]]' ' '
 
 expecting success: 
-		rm -fr dest &&
-		git --bare init dest
-	
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5546-receive-limits/dest/
-ok 8 - prepare destination repository
+			test-tool wildmatch pathmatch ' ' '[[:digit:][:upper:][:space:]]'
+		
+ok 827 - pathmatch: match ' ' '[[:digit:][:upper:][:space:]]'
 
 expecting success: 
-		git --git-dir=dest config receive.unpacklimit "$unpack_limit"
-	
-ok 9 - set unpacklimit to 10000
+				printf '%s' ' ' >expect &&
+				git ls-files -z -- '[[:digit:][:upper:][:space:]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 828 - pathmatch (via ls-files): match '[[:digit:][:upper:][:space:]]' ' '
 
 expecting success: 
-		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 10 - setting receive.maxInputSize to 512 rejects push
+			test-tool wildmatch ipathmatch ' ' '[[:digit:][:upper:][:space:]]'
+		
+ok 829 - ipathmatch: match ' ' '[[:digit:][:upper:][:space:]]'
 
 expecting success: 
-		git --git-dir=dest config receive.maxInputSize 4k &&
-		git push dest HEAD
-	
-To dest
- * [new branch]      HEAD -> master
-ok 11 - bumping limit to 4k allows push
+				printf '%s' ' ' >expect &&
+				git --icase-pathspecs ls-files -z -- '[[:digit:][:upper:][:space:]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 830 - ipathmatch (via ls-files): match '[[:digit:][:upper:][:space:]]' ' '
 
 expecting success: 
-		rm -fr dest &&
-		git --bare init dest
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
 	
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5546-receive-limits/dest/
-ok 12 - prepare destination repository (again)
+Removing  
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 831 - cleanup after previous file test
 
 expecting success: 
-		git --git-dir=dest config receive.maxInputSize 0 &&
-		git push dest HEAD
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
 	
-To dest
- * [new branch]      HEAD -> master
-ok 13 - lifting the limit allows push
-
-# passed all 13 test(s)
-1..13
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t5561-http-backend.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5561-http-backend/.git/
-checking prerequisite: NOT_ROOT
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
-	uid=$(id -u) &&
-	test "$uid" != 0
+ok 832 - setup match file test for .
 
-)
-prerequisite NOT_ROOT ok
-1..0 # SKIP no web server found at '/usr/sbin/apache2'
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t5533-push-cas.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5533-push-cas/.git/
 expecting success: 
-	# create template repository
-	test_commit A &&
-	test_commit B &&
-	test_commit C
+			test_must_fail test-tool wildmatch wildmatch '.' '[[:digit:][:upper:][:space:]]'
+		
+ok 833 - wildmatch: no match '.' '[[:digit:][:upper:][:space:]]'
 
-[master (root-commit) 0ddfaf1] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.t
-[master d9df450] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 B.t
-[master 35a8500] C
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 C.t
-ok 1 - setup
+checking known breakage: false
+not ok 834 - wildmatch (via ls-files): no match skip '[[:digit:][:upper:][:space:]]' '.' # TODO known breakage
 
 expecting success: 
-	setup_srcdst_basic &&
-	(
-		cd dst &&
-		test_commit D &&
-		test_must_fail git push --force-with-lease=master:master origin master 2>err &&
-		grep "stale info" err
-	) &&
-	git ls-remote . refs/heads/master >expect &&
-	git ls-remote src refs/heads/master >actual &&
-	test_cmp expect actual
+			test_must_fail test-tool wildmatch iwildmatch '.' '[[:digit:][:upper:][:space:]]'
+		
+ok 835 - iwildmatch: no match '.' '[[:digit:][:upper:][:space:]]'
 
-Cloning into 'src'...
-Cloning into 'dst'...
-Note: checking out 'HEAD^0'.
+checking known breakage: false
+not ok 836 - iwildmatch (via ls-files): no match skip '[[:digit:][:upper:][:space:]]' '.' # 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 performing another checkout.
+expecting success: 
+			test_must_fail test-tool wildmatch pathmatch '.' '[[:digit:][:upper:][:space:]]'
+		
+ok 837 - pathmatch: no match '.' '[[:digit:][:upper:][:space:]]'
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
+checking known breakage: false
+not ok 838 - pathmatch (via ls-files): no match skip '[[:digit:][:upper:][:space:]]' '.' # TODO known breakage
 
-  git checkout -b <new-branch-name>
+expecting success: 
+			test_must_fail test-tool wildmatch ipathmatch '.' '[[:digit:][:upper:][:space:]]'
+		
+ok 839 - ipathmatch: no match '.' '[[:digit:][:upper:][:space:]]'
 
-HEAD is now at 35a8500 C
-[master be8f64f] D
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 D.t
- ! [rejected]        master -> master (stale info)
-ok 2 - push to update (protected)
+checking known breakage: false
+not ok 840 - ipathmatch (via ls-files): no match skip '[[:digit:][:upper:][:space:]]' '.' # TODO known breakage
 
 expecting success: 
-	setup_srcdst_basic &&
-	(
-		cd dst &&
-		test_commit D &&
-		git push --force --force-with-lease=master:master origin master 2>err &&
-		grep "forced update" err
-	) &&
-	git ls-remote dst refs/heads/master >expect &&
-	git ls-remote src refs/heads/master >actual &&
-	test_cmp expect actual
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+ok 841 - cleanup after previous file test
 
-Cloning into 'src'...
-Cloning into 'dst'...
-Note: checking out 'HEAD^0'.
+expecting success: 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 842 - setup match file test for .
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by performing another checkout.
+expecting success: 
+			test-tool wildmatch wildmatch '.' '[[:digit:][:punct:][:space:]]'
+		
+ok 843 - wildmatch: match '.' '[[:digit:][:punct:][:space:]]'
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
+checking known breakage: false
+not ok 844 - wildmatch (via ls-files): match skip '[[:digit:][:punct:][:space:]]' '.' # TODO known breakage
 
-  git checkout -b <new-branch-name>
+expecting success: 
+			test-tool wildmatch iwildmatch '.' '[[:digit:][:punct:][:space:]]'
+		
+ok 845 - iwildmatch: match '.' '[[:digit:][:punct:][:space:]]'
 
-HEAD is now at 35a8500 C
-[master be8f64f] D
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 D.t
- + 35a8500...be8f64f master -> master (forced update)
-ok 3 - push to update (protected, forced)
+checking known breakage: false
+not ok 846 - iwildmatch (via ls-files): match skip '[[:digit:][:punct:][:space:]]' '.' # TODO known breakage
 
 expecting success: 
-	setup_srcdst_basic &&
-	(
-		cd src &&
-		git checkout master &&
-		test_commit D &&
-		git checkout HEAD^0
-	) &&
-	git ls-remote src refs/heads/master >expect &&
-	(
-		cd dst &&
-		test_commit E &&
-		git ls-remote . refs/remotes/origin/master >expect &&
-		test_must_fail git push --force-with-lease=master origin master &&
-		git ls-remote . refs/remotes/origin/master >actual &&
-		test_cmp expect actual
-	) &&
-	git ls-remote src refs/heads/master >actual &&
-	test_cmp expect actual
+			test-tool wildmatch pathmatch '.' '[[:digit:][:punct:][:space:]]'
+		
+ok 847 - pathmatch: match '.' '[[:digit:][:punct:][:space:]]'
 
-Cloning into 'src'...
-Cloning into 'dst'...
-Note: checking out 'HEAD^0'.
+checking known breakage: false
+not ok 848 - pathmatch (via ls-files): match skip '[[:digit:][:punct:][:space:]]' '.' # 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 performing another checkout.
+expecting success: 
+			test-tool wildmatch ipathmatch '.' '[[:digit:][:punct:][:space:]]'
+		
+ok 849 - ipathmatch: match '.' '[[:digit:][:punct:][:space:]]'
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
+checking known breakage: false
+not ok 850 - ipathmatch (via ls-files): match skip '[[:digit:][:punct:][:space:]]' '.' # TODO known breakage
 
-  git checkout -b <new-branch-name>
+expecting success: 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+ok 851 - cleanup after previous file test
 
-HEAD is now at 35a8500 C
-Switched to branch 'master'
-Your branch is up to date with 'origin/master'.
-[master be8f64f] D
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 D.t
-Note: checking out 'HEAD^0'.
+expecting success: 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 852 - setup match file test for 5
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by performing another checkout.
+expecting success: 
+			test-tool wildmatch wildmatch '5' '[[:xdigit:]]'
+		
+ok 853 - wildmatch: match '5' '[[:xdigit:]]'
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
+expecting success: 
+				printf '%s' '5' >expect &&
+				git --glob-pathspecs ls-files -z -- '[[:xdigit:]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 854 - wildmatch (via ls-files): match '[[:xdigit:]]' '5'
 
-  git checkout -b <new-branch-name>
+expecting success: 
+			test-tool wildmatch iwildmatch '5' '[[:xdigit:]]'
+		
+ok 855 - iwildmatch: match '5' '[[:xdigit:]]'
 
-HEAD is now at be8f64f D
-[master 3e7056f] E
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 E.t
-To /build/git-2.20.1/t/trash directory.t5533-push-cas/src
- ! [rejected]        master -> master (stale info)
-error: failed to push some refs to '/build/git-2.20.1/t/trash directory.t5533-push-cas/src'
-ok 4 - push to update (protected, tracking)
+expecting success: 
+				printf '%s' '5' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[[:xdigit:]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 856 - iwildmatch (via ls-files): match '[[:xdigit:]]' '5'
 
 expecting success: 
-	setup_srcdst_basic &&
-	(
-		cd src &&
-		git checkout master &&
-		test_commit D &&
-		git checkout HEAD^0
-	) &&
-	(
-		cd dst &&
-		test_commit E &&
-		git ls-remote . refs/remotes/origin/master >expect &&
-		git push --force --force-with-lease=master origin master
-	) &&
-	git ls-remote dst refs/heads/master >expect &&
-	git ls-remote src refs/heads/master >actual &&
-	test_cmp expect actual
+			test-tool wildmatch pathmatch '5' '[[:xdigit:]]'
+		
+ok 857 - pathmatch: match '5' '[[:xdigit:]]'
 
-Cloning into 'src'...
-Cloning into 'dst'...
-Note: checking out 'HEAD^0'.
+expecting success: 
+				printf '%s' '5' >expect &&
+				git ls-files -z -- '[[:xdigit:]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 858 - pathmatch (via ls-files): match '[[:xdigit:]]' '5'
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by performing another checkout.
+expecting success: 
+			test-tool wildmatch ipathmatch '5' '[[:xdigit:]]'
+		
+ok 859 - ipathmatch: match '5' '[[:xdigit:]]'
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
+expecting success: 
+				printf '%s' '5' >expect &&
+				git --icase-pathspecs ls-files -z -- '[[:xdigit:]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 860 - ipathmatch (via ls-files): match '[[:xdigit:]]' '5'
 
-  git checkout -b <new-branch-name>
+expecting success: 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing 5
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 861 - cleanup after previous file test
 
-HEAD is now at 35a8500 C
-Switched to branch 'master'
-Your branch is up to date with 'origin/master'.
-[master be8f64f] D
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 D.t
-Note: checking out 'HEAD^0'.
+expecting success: 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 862 - setup match file test for f
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by performing another checkout.
+expecting success: 
+			test-tool wildmatch wildmatch 'f' '[[:xdigit:]]'
+		
+ok 863 - wildmatch: match 'f' '[[:xdigit:]]'
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
+expecting success: 
+				printf '%s' 'f' >expect &&
+				git --glob-pathspecs ls-files -z -- '[[:xdigit:]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 864 - wildmatch (via ls-files): match '[[:xdigit:]]' 'f'
 
-  git checkout -b <new-branch-name>
+expecting success: 
+			test-tool wildmatch iwildmatch 'f' '[[:xdigit:]]'
+		
+ok 865 - iwildmatch: match 'f' '[[:xdigit:]]'
 
-HEAD is now at be8f64f D
-[master 3e7056f] E
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 E.t
-To /build/git-2.20.1/t/trash directory.t5533-push-cas/src
- + be8f64f...3e7056f master -> master (forced update)
-ok 5 - push to update (protected, tracking, forced)
+expecting success: 
+				printf '%s' 'f' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[[:xdigit:]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 866 - iwildmatch (via ls-files): match '[[:xdigit:]]' 'f'
 
 expecting success: 
-	setup_srcdst_basic &&
-	(
-		cd dst &&
-		test_commit D &&
-		git push --force-with-lease=master:master^ origin master
-	) &&
-	git ls-remote dst refs/heads/master >expect &&
-	git ls-remote src refs/heads/master >actual &&
-	test_cmp expect actual
+			test-tool wildmatch pathmatch 'f' '[[:xdigit:]]'
+		
+ok 867 - pathmatch: match 'f' '[[:xdigit:]]'
 
-Cloning into 'src'...
-Cloning into 'dst'...
-Note: checking out 'HEAD^0'.
+expecting success: 
+				printf '%s' 'f' >expect &&
+				git ls-files -z -- '[[:xdigit:]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 868 - pathmatch (via ls-files): match '[[:xdigit:]]' 'f'
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by performing another checkout.
+expecting success: 
+			test-tool wildmatch ipathmatch 'f' '[[:xdigit:]]'
+		
+ok 869 - ipathmatch: match 'f' '[[:xdigit:]]'
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
+expecting success: 
+				printf '%s' 'f' >expect &&
+				git --icase-pathspecs ls-files -z -- '[[:xdigit:]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 870 - ipathmatch (via ls-files): match '[[:xdigit:]]' 'f'
 
-  git checkout -b <new-branch-name>
+expecting success: 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+Removing f
+ok 871 - cleanup after previous file test
 
-HEAD is now at 35a8500 C
-[master be8f64f] D
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 D.t
-To /build/git-2.20.1/t/trash directory.t5533-push-cas/src
-   35a8500..be8f64f  master -> master
-ok 6 - push to update (allowed)
+expecting success: 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 872 - setup match file test for D
 
 expecting success: 
-	setup_srcdst_basic &&
-	(
-		cd dst &&
-		test_commit D &&
-		git push --force-with-lease=master origin master 2>err &&
-		! grep "forced update" err
-	) &&
-	git ls-remote dst refs/heads/master >expect &&
-	git ls-remote src refs/heads/master >actual &&
-	test_cmp expect actual
+			test-tool wildmatch wildmatch 'D' '[[:xdigit:]]'
+		
+ok 873 - wildmatch: match 'D' '[[:xdigit:]]'
 
-Cloning into 'src'...
-Cloning into 'dst'...
-Note: checking out 'HEAD^0'.
+expecting success: 
+				printf '%s' 'D' >expect &&
+				git --glob-pathspecs ls-files -z -- '[[:xdigit:]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 874 - wildmatch (via ls-files): match '[[:xdigit:]]' 'D'
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by performing another checkout.
+expecting success: 
+			test-tool wildmatch iwildmatch 'D' '[[:xdigit:]]'
+		
+ok 875 - iwildmatch: match 'D' '[[:xdigit:]]'
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
+expecting success: 
+				printf '%s' 'D' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[[:xdigit:]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 876 - iwildmatch (via ls-files): match '[[:xdigit:]]' 'D'
 
-  git checkout -b <new-branch-name>
+expecting success: 
+			test-tool wildmatch pathmatch 'D' '[[:xdigit:]]'
+		
+ok 877 - pathmatch: match 'D' '[[:xdigit:]]'
 
-HEAD is now at 35a8500 C
-[master be8f64f] D
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 D.t
-ok 7 - push to update (allowed, tracking)
+expecting success: 
+				printf '%s' 'D' >expect &&
+				git ls-files -z -- '[[:xdigit:]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 878 - pathmatch (via ls-files): match '[[:xdigit:]]' 'D'
 
 expecting success: 
-	setup_srcdst_basic &&
-	(
-		cd dst &&
-		git reset --hard HEAD^ &&
-		test_commit D &&
-		git push --force-with-lease=master origin master 2>err &&
-		grep "forced update" err
-	) &&
-	git ls-remote dst refs/heads/master >expect &&
-	git ls-remote src refs/heads/master >actual &&
-	test_cmp expect actual
+			test-tool wildmatch ipathmatch 'D' '[[:xdigit:]]'
+		
+ok 879 - ipathmatch: match 'D' '[[:xdigit:]]'
 
-Cloning into 'src'...
-Cloning into 'dst'...
-Note: checking out 'HEAD^0'.
+expecting success: 
+				printf '%s' 'D' >expect &&
+				git --icase-pathspecs ls-files -z -- '[[:xdigit:]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 880 - ipathmatch (via ls-files): match '[[:xdigit:]]' 'D'
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by performing another checkout.
+expecting success: 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing D
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 881 - cleanup after previous file test
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
+expecting success: 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 882 - setup match file test for _
 
-  git checkout -b <new-branch-name>
+expecting success: 
+			test-tool wildmatch wildmatch '_' '[[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:graph:][:lower:][:print:][:punct:][:space:][:upper:][:xdigit:]]'
+		
+ok 883 - wildmatch: match '_' '[[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:graph:][:lower:][:print:][:punct:][:space:][:upper:][:xdigit:]]'
 
-HEAD is now at 35a8500 C
-HEAD is now at d9df450 B
-[master 3e6e33e] D
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 D.t
- + 35a8500...3e6e33e master -> master (forced update)
-ok 8 - push to update (allowed even though no-ff)
+expecting success: 
+				printf '%s' '_' >expect &&
+				git --glob-pathspecs ls-files -z -- '[[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:graph:][:lower:][:print:][:punct:][:space:][:upper:][:xdigit:]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 884 - wildmatch (via ls-files): match '[[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:graph:][:lower:][:print:][:punct:][:space:][:upper:][:xdigit:]]' '_'
 
 expecting success: 
-	setup_srcdst_basic &&
-	git ls-remote src refs/heads/master >expect &&
-	(
-		cd dst &&
-		test_must_fail git push --force-with-lease=master:master^ origin :master
-	) &&
-	git ls-remote src refs/heads/master >actual &&
-	test_cmp expect actual
+			test-tool wildmatch iwildmatch '_' '[[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:graph:][:lower:][:print:][:punct:][:space:][:upper:][:xdigit:]]'
+		
+ok 885 - iwildmatch: match '_' '[[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:graph:][:lower:][:print:][:punct:][:space:][:upper:][:xdigit:]]'
 
-Cloning into 'src'...
-Cloning into 'dst'...
-Note: checking out 'HEAD^0'.
+expecting success: 
+				printf '%s' '_' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:graph:][:lower:][:print:][:punct:][:space:][:upper:][:xdigit:]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 886 - iwildmatch (via ls-files): match '[[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:graph:][:lower:][:print:][:punct:][:space:][:upper:][:xdigit:]]' '_'
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by performing another checkout.
+expecting success: 
+			test-tool wildmatch pathmatch '_' '[[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:graph:][:lower:][:print:][:punct:][:space:][:upper:][:xdigit:]]'
+		
+ok 887 - pathmatch: match '_' '[[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:graph:][:lower:][:print:][:punct:][:space:][:upper:][:xdigit:]]'
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
+expecting success: 
+				printf '%s' '_' >expect &&
+				git ls-files -z -- '[[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:graph:][:lower:][:print:][:punct:][:space:][:upper:][:xdigit:]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 888 - pathmatch (via ls-files): match '[[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:graph:][:lower:][:print:][:punct:][:space:][:upper:][:xdigit:]]' '_'
 
-  git checkout -b <new-branch-name>
+expecting success: 
+			test-tool wildmatch ipathmatch '_' '[[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:graph:][:lower:][:print:][:punct:][:space:][:upper:][:xdigit:]]'
+		
+ok 889 - ipathmatch: match '_' '[[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:graph:][:lower:][:print:][:punct:][:space:][:upper:][:xdigit:]]'
 
-HEAD is now at 35a8500 C
-To /build/git-2.20.1/t/trash directory.t5533-push-cas/src
- ! [rejected]        (delete) -> master (stale info)
-error: failed to push some refs to '/build/git-2.20.1/t/trash directory.t5533-push-cas/src'
-ok 9 - push to delete (protected)
+expecting success: 
+				printf '%s' '_' >expect &&
+				git --icase-pathspecs ls-files -z -- '[[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:graph:][:lower:][:print:][:punct:][:space:][:upper:][:xdigit:]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 890 - ipathmatch (via ls-files): match '[[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:graph:][:lower:][:print:][:punct:][:space:][:upper:][:xdigit:]]' '_'
 
 expecting success: 
-	setup_srcdst_basic &&
-	(
-		cd dst &&
-		git push --force --force-with-lease=master:master^ origin :master
-	) &&
-	git ls-remote src refs/heads/master >actual &&
-	test_must_be_empty actual
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing _
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 891 - cleanup after previous file test
 
-Cloning into 'src'...
-Cloning into 'dst'...
-Note: checking out 'HEAD^0'.
+expecting success: 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 892 - setup match file test for .
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by performing another checkout.
+expecting success: 
+			test-tool wildmatch wildmatch '.' '[^[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:lower:][:space:][:upper:][:xdigit:]]'
+		
+ok 893 - wildmatch: match '.' '[^[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:lower:][:space:][:upper:][:xdigit:]]'
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
+checking known breakage: false
+not ok 894 - wildmatch (via ls-files): match skip '[^[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:lower:][:space:][:upper:][:xdigit:]]' '.' # TODO known breakage
 
-  git checkout -b <new-branch-name>
+expecting success: 
+			test-tool wildmatch iwildmatch '.' '[^[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:lower:][:space:][:upper:][:xdigit:]]'
+		
+ok 895 - iwildmatch: match '.' '[^[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:lower:][:space:][:upper:][:xdigit:]]'
 
-HEAD is now at 35a8500 C
-To /build/git-2.20.1/t/trash directory.t5533-push-cas/src
- - [deleted]         master
-ok 10 - push to delete (protected, forced)
+checking known breakage: false
+not ok 896 - iwildmatch (via ls-files): match skip '[^[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:lower:][:space:][:upper:][:xdigit:]]' '.' # TODO known breakage
 
 expecting success: 
-	setup_srcdst_basic &&
-	(
-		cd dst &&
-		git push --force-with-lease=master origin :master 2>err &&
-		grep deleted err
-	) &&
-	git ls-remote src refs/heads/master >actual &&
-	test_must_be_empty actual
-
-Cloning into 'src'...
-Cloning into 'dst'...
-Note: checking out 'HEAD^0'.
+			test-tool wildmatch pathmatch '.' '[^[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:lower:][:space:][:upper:][:xdigit:]]'
+		
+ok 897 - pathmatch: match '.' '[^[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:lower:][:space:][:upper:][:xdigit:]]'
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by performing another checkout.
+checking known breakage: false
+not ok 898 - pathmatch (via ls-files): match skip '[^[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:lower:][:space:][:upper:][:xdigit:]]' '.' # TODO known breakage
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
+expecting success: 
+			test-tool wildmatch ipathmatch '.' '[^[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:lower:][:space:][:upper:][:xdigit:]]'
+		
+ok 899 - ipathmatch: match '.' '[^[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:lower:][:space:][:upper:][:xdigit:]]'
 
-  git checkout -b <new-branch-name>
+checking known breakage: false
+not ok 900 - ipathmatch (via ls-files): match skip '[^[:alnum:][:alpha:][:blank:][:cntrl:][:digit:][:lower:][:space:][:upper:][:xdigit:]]' '.' # TODO known breakage
 
-HEAD is now at 35a8500 C
- - [deleted]         master
-ok 11 - push to delete (allowed)
+expecting success: 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+ok 901 - cleanup after previous file test
 
 expecting success: 
-	setup_srcdst_basic &&
-	(
-		cd src &&
-		git branch naster master^
-	) &&
-	git ls-remote src refs/heads/\* >expect &&
-	(
-		cd dst &&
-		test_must_fail git push --force-with-lease origin master master:naster
-	) &&
-	git ls-remote src refs/heads/\* >actual &&
-	test_cmp expect actual
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 902 - setup match file test for 5
 
-Cloning into 'src'...
-Cloning into 'dst'...
-Note: checking out 'HEAD^0'.
+expecting success: 
+			test-tool wildmatch wildmatch '5' '[a-c[:digit:]x-z]'
+		
+ok 903 - wildmatch: match '5' '[a-c[:digit:]x-z]'
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by performing another checkout.
+expecting success: 
+				printf '%s' '5' >expect &&
+				git --glob-pathspecs ls-files -z -- '[a-c[:digit:]x-z]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 904 - wildmatch (via ls-files): match '[a-c[:digit:]x-z]' '5'
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
+expecting success: 
+			test-tool wildmatch iwildmatch '5' '[a-c[:digit:]x-z]'
+		
+ok 905 - iwildmatch: match '5' '[a-c[:digit:]x-z]'
 
-  git checkout -b <new-branch-name>
+expecting success: 
+				printf '%s' '5' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[a-c[:digit:]x-z]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 906 - iwildmatch (via ls-files): match '[a-c[:digit:]x-z]' '5'
 
-HEAD is now at 35a8500 C
-To /build/git-2.20.1/t/trash directory.t5533-push-cas/src
- ! [rejected]        master -> naster (stale info)
-error: failed to push some refs to '/build/git-2.20.1/t/trash directory.t5533-push-cas/src'
-ok 12 - cover everything with default force-with-lease (protected)
+expecting success: 
+			test-tool wildmatch pathmatch '5' '[a-c[:digit:]x-z]'
+		
+ok 907 - pathmatch: match '5' '[a-c[:digit:]x-z]'
 
 expecting success: 
-	setup_srcdst_basic &&
-	(
-		cd src &&
-		git branch naster master^
-	) &&
-	(
-		cd dst &&
-		git fetch &&
-		git push --force-with-lease origin master master:naster
-	) &&
-	git ls-remote dst refs/heads/master |
-	sed -e "s/master/naster/" >expect &&
-	git ls-remote src refs/heads/naster >actual &&
-	test_cmp expect actual
+				printf '%s' '5' >expect &&
+				git ls-files -z -- '[a-c[:digit:]x-z]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 908 - pathmatch (via ls-files): match '[a-c[:digit:]x-z]' '5'
 
-Cloning into 'src'...
-Cloning into 'dst'...
-Note: checking out 'HEAD^0'.
+expecting success: 
+			test-tool wildmatch ipathmatch '5' '[a-c[:digit:]x-z]'
+		
+ok 909 - ipathmatch: match '5' '[a-c[:digit:]x-z]'
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by performing another checkout.
+expecting success: 
+				printf '%s' '5' >expect &&
+				git --icase-pathspecs ls-files -z -- '[a-c[:digit:]x-z]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 910 - ipathmatch (via ls-files): match '[a-c[:digit:]x-z]' '5'
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
+expecting success: 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing 5
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 911 - cleanup after previous file test
 
-  git checkout -b <new-branch-name>
+expecting success: 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 912 - setup match file test for b
 
-HEAD is now at 35a8500 C
-From /build/git-2.20.1/t/trash directory.t5533-push-cas/src
- * [new branch]      naster     -> origin/naster
-To /build/git-2.20.1/t/trash directory.t5533-push-cas/src
-   d9df450..35a8500  master -> naster
-ok 13 - cover everything with default force-with-lease (allowed)
+expecting success: 
+			test-tool wildmatch wildmatch 'b' '[a-c[:digit:]x-z]'
+		
+ok 913 - wildmatch: match 'b' '[a-c[:digit:]x-z]'
 
 expecting success: 
-	setup_srcdst_basic &&
-	(
-		cd dst &&
-		git branch branch master &&
-		git push --force-with-lease=branch origin branch
-	) &&
-	git ls-remote dst refs/heads/branch >expect &&
-	git ls-remote src refs/heads/branch >actual &&
-	test_cmp expect actual
+				printf '%s' 'b' >expect &&
+				git --glob-pathspecs ls-files -z -- '[a-c[:digit:]x-z]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 914 - wildmatch (via ls-files): match '[a-c[:digit:]x-z]' 'b'
 
-Cloning into 'src'...
-Cloning into 'dst'...
-Note: checking out 'HEAD^0'.
+expecting success: 
+			test-tool wildmatch iwildmatch 'b' '[a-c[:digit:]x-z]'
+		
+ok 915 - iwildmatch: match 'b' '[a-c[:digit:]x-z]'
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by performing another checkout.
+expecting success: 
+				printf '%s' 'b' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[a-c[:digit:]x-z]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 916 - iwildmatch (via ls-files): match '[a-c[:digit:]x-z]' 'b'
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
+expecting success: 
+			test-tool wildmatch pathmatch 'b' '[a-c[:digit:]x-z]'
+		
+ok 917 - pathmatch: match 'b' '[a-c[:digit:]x-z]'
 
-  git checkout -b <new-branch-name>
+expecting success: 
+				printf '%s' 'b' >expect &&
+				git ls-files -z -- '[a-c[:digit:]x-z]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 918 - pathmatch (via ls-files): match '[a-c[:digit:]x-z]' 'b'
 
-HEAD is now at 35a8500 C
-To /build/git-2.20.1/t/trash directory.t5533-push-cas/src
- * [new branch]      branch -> branch
-ok 14 - new branch covered by force-with-lease
+expecting success: 
+			test-tool wildmatch ipathmatch 'b' '[a-c[:digit:]x-z]'
+		
+ok 919 - ipathmatch: match 'b' '[a-c[:digit:]x-z]'
 
 expecting success: 
-	setup_srcdst_basic &&
-	(
-		cd dst &&
-		git branch branch master &&
-		git push --force-with-lease=branch: origin branch
-	) &&
-	git ls-remote dst refs/heads/branch >expect &&
-	git ls-remote src refs/heads/branch >actual &&
-	test_cmp expect actual
+				printf '%s' 'b' >expect &&
+				git --icase-pathspecs ls-files -z -- '[a-c[:digit:]x-z]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 920 - ipathmatch (via ls-files): match '[a-c[:digit:]x-z]' 'b'
 
-Cloning into 'src'...
-Cloning into 'dst'...
-Note: checking out 'HEAD^0'.
+expecting success: 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing b
+Removing expect
+ok 921 - cleanup after previous file test
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by performing another checkout.
+expecting success: 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 922 - setup match file test for y
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
+expecting success: 
+			test-tool wildmatch wildmatch 'y' '[a-c[:digit:]x-z]'
+		
+ok 923 - wildmatch: match 'y' '[a-c[:digit:]x-z]'
 
-  git checkout -b <new-branch-name>
+expecting success: 
+				printf '%s' 'y' >expect &&
+				git --glob-pathspecs ls-files -z -- '[a-c[:digit:]x-z]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 924 - wildmatch (via ls-files): match '[a-c[:digit:]x-z]' 'y'
 
-HEAD is now at 35a8500 C
-To /build/git-2.20.1/t/trash directory.t5533-push-cas/src
- * [new branch]      branch -> branch
-ok 15 - new branch covered by force-with-lease (explicit)
+expecting success: 
+			test-tool wildmatch iwildmatch 'y' '[a-c[:digit:]x-z]'
+		
+ok 925 - iwildmatch: match 'y' '[a-c[:digit:]x-z]'
 
 expecting success: 
-	setup_srcdst_basic &&
-	(
-		cd src &&
-		git checkout -b branch master &&
-		test_commit F
-	) &&
-	(
-		cd dst &&
-		git branch branch master &&
-		test_must_fail git push --force-with-lease=branch: origin branch
-	)
+				printf '%s' 'y' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[a-c[:digit:]x-z]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 926 - iwildmatch (via ls-files): match '[a-c[:digit:]x-z]' 'y'
 
-Cloning into 'src'...
-Cloning into 'dst'...
-Note: checking out 'HEAD^0'.
+expecting success: 
+			test-tool wildmatch pathmatch 'y' '[a-c[:digit:]x-z]'
+		
+ok 927 - pathmatch: match 'y' '[a-c[:digit:]x-z]'
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by performing another checkout.
+expecting success: 
+				printf '%s' 'y' >expect &&
+				git ls-files -z -- '[a-c[:digit:]x-z]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 928 - pathmatch (via ls-files): match '[a-c[:digit:]x-z]' 'y'
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
+expecting success: 
+			test-tool wildmatch ipathmatch 'y' '[a-c[:digit:]x-z]'
+		
+ok 929 - ipathmatch: match 'y' '[a-c[:digit:]x-z]'
 
-  git checkout -b <new-branch-name>
+expecting success: 
+				printf '%s' 'y' >expect &&
+				git --icase-pathspecs ls-files -z -- '[a-c[:digit:]x-z]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 930 - ipathmatch (via ls-files): match '[a-c[:digit:]x-z]' 'y'
 
-HEAD is now at 35a8500 C
-Switched to a new branch 'branch'
-[branch b6ba73d] F
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 F.t
-To /build/git-2.20.1/t/trash directory.t5533-push-cas/src
- ! [rejected]        branch -> branch (stale info)
-error: failed to push some refs to '/build/git-2.20.1/t/trash directory.t5533-push-cas/src'
-ok 16 - new branch already exists
+expecting success: 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+Removing y
+ok 931 - cleanup after previous file test
 
 expecting success: 
-	rm -rf src dst &&
-	git init --bare src.bare &&
-	test_when_finished "rm -rf src.bare" &&
-	git clone --no-local src.bare dst &&
-	test_when_finished "rm -rf dst" &&
-	(
-		cd dst &&
-		test_commit G &&
-		git remote add origin-push ../src.bare &&
-		git push origin-push master:master
-	) &&
-	git clone --no-local src.bare dst2 &&
-	test_when_finished "rm -rf dst2" &&
-	(
-		cd dst2 &&
-		test_commit H &&
-		git push
-	) &&
-	(
-		cd dst &&
-		test_commit I &&
-		git fetch origin &&
-		test_must_fail git push --force-with-lease origin-push &&
-		git fetch origin-push &&
-		git push --force-with-lease origin-push
-	)
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 932 - setup match file test for q
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5533-push-cas/src.bare/
-Cloning into 'dst'...
-warning: You appear to have cloned an empty repository.
-[master (root-commit) c0a8953] G
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 G.t
-To ../src.bare
- * [new branch]      master -> master
-Cloning into 'dst2'...
-[master d19f4d4] H
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 H.t
-To /build/git-2.20.1/t/trash directory.t5533-push-cas/src.bare
-   c0a8953..d19f4d4  master -> master
-[master 91bb270] I
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 I.t
-From /build/git-2.20.1/t/trash directory.t5533-push-cas/src.bare
- * [new branch]      master     -> origin/master
-To ../src.bare
- ! [rejected]        master -> master (stale info)
-error: failed to push some refs to '../src.bare'
-From ../src.bare
-   c0a8953..d19f4d4  master     -> origin-push/master
-To ../src.bare
- + d19f4d4...91bb270 master -> master (forced update)
-ok 17 - background updates of REMOTE can be mitigated with a non-updated REMOTE-push
+expecting success: 
+			test_must_fail test-tool wildmatch wildmatch 'q' '[a-c[:digit:]x-z]'
+		
+ok 933 - wildmatch: no match 'q' '[a-c[:digit:]x-z]'
 
-# passed all 17 test(s)
-1..17
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t5543-atomic-push.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5543-atomic-push/.git/
 expecting success: 
-	mk_repo_pair &&
-	(
-		cd workbench &&
-		test_commit one &&
-		git push --mirror up &&
-		test_commit two &&
-		git push --atomic up master
-	) &&
-	test_refs master master
+				>expect &&
+				git --glob-pathspecs ls-files -z -- '[a-c[:digit:]x-z]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 934 - wildmatch (via ls-files): no match '[a-c[:digit:]x-z]' 'q'
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5543-atomic-push/upstream/.git/
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5543-atomic-push/workbench/.git/
-[master (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]      master -> master
- * [new tag]         one -> one
-[master 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  master -> master
-ok 1 - atomic push works for a single branch
+expecting success: 
+			test_must_fail test-tool wildmatch iwildmatch 'q' '[a-c[:digit:]x-z]'
+		
+ok 935 - iwildmatch: no match 'q' '[a-c[:digit:]x-z]'
 
 expecting success: 
-	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 master second
-	) &&
-	test_refs master master &&
-	test_refs second second
+				>expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[a-c[:digit:]x-z]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 936 - iwildmatch (via ls-files): no match '[a-c[:digit:]x-z]' 'q'
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5543-atomic-push/upstream/.git/
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5543-atomic-push/workbench/.git/
-[master (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]      master -> master
- * [new branch]      second -> second
- * [new tag]         one -> one
-[master 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  master -> master
-   d79ce16..897c206  second -> second
-ok 2 - atomic push works for two branches
+expecting success: 
+			test_must_fail test-tool wildmatch pathmatch 'q' '[a-c[:digit:]x-z]'
+		
+ok 937 - pathmatch: no match 'q' '[a-c[:digit:]x-z]'
 
 expecting success: 
-	mk_repo_pair &&
-	(
-		cd workbench &&
-		test_commit one &&
-		git checkout -b second &&
-		test_commit two &&
-		git push --atomic --mirror up
-	) &&
-	test_refs master master &&
-	test_refs second second
+				>expect &&
+				git ls-files -z -- '[a-c[:digit:]x-z]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 938 - pathmatch (via ls-files): no match '[a-c[:digit:]x-z]' 'q'
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5543-atomic-push/upstream/.git/
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5543-atomic-push/workbench/.git/
-[master (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]      master -> master
- * [new branch]      second -> second
- * [new tag]         one -> one
- * [new tag]         two -> two
-ok 3 - atomic push works in combination with --mirror
+expecting success: 
+			test_must_fail test-tool wildmatch ipathmatch 'q' '[a-c[:digit:]x-z]'
+		
+ok 939 - ipathmatch: no match 'q' '[a-c[:digit:]x-z]'
 
 expecting success: 
-	mk_repo_pair &&
-	(
-		cd workbench &&
-		test_commit one &&
-		git branch second master &&
-		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 master &&
-		test_commit three_a &&
-		git checkout second &&
-		git reset --hard HEAD^ &&
-		git push --force --atomic up master second
-	) &&
-	test_refs master master &&
-	test_refs second second
+				>expect &&
+				git --icase-pathspecs ls-files -z -- '[a-c[:digit:]x-z]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 940 - ipathmatch (via ls-files): no match '[a-c[:digit:]x-z]' 'q'
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5543-atomic-push/upstream/.git/
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5543-atomic-push/workbench/.git/
-[master (root-commit) d79ce16] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-[master 0fd3f08] two_a
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 two_a.t
-Switched to branch 'second'
-[second 476acd6] two_b
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 two_b.t
-[second 04c72ee] three_b
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 three_b.t
-[second f7b7ae4] four
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 four.t
-remote: warning: updating the current branch        
-To ../upstream
- * [new branch]      master -> master
- * [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 'master'
-[master 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  master -> master
- + f7b7ae4...04c72ee second -> second (forced update)
-ok 4 - atomic push works in combination with --force
+expecting success: 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+Removing q
+ok 941 - cleanup after previous file test
 
 expecting success: 
-	mk_repo_pair &&
-	(
-		cd workbench &&
-		test_commit one &&
-		git checkout -b second master &&
-		test_commit two &&
-		test_commit three &&
-		test_commit four &&
-		git push --mirror up &&
-		git reset --hard HEAD~2 &&
-		test_commit five &&
-		git checkout master &&
-		test_commit six &&
-		test_must_fail git push --atomic --all up
-	) &&
-	test_refs master HEAD@{7} &&
-	test_refs second HEAD@{4}
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 942 - setup match file test for ]
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5543-atomic-push/upstream/.git/
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5543-atomic-push/workbench/.git/
-[master (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]      master -> master
- * [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 'master'
-[master 29c9ea2] six
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 six.t
-error: atomic push failed for ref refs/heads/second. status: 2
+expecting success: 
+			test-tool wildmatch wildmatch ']' '[\\-^]'
+		
+ok 943 - wildmatch: match ']' '[\\-^]'
 
-fatal: the remote end hung up unexpectedly
-To ../upstream
- ! [rejected]        master -> master (atomic push failed)
- ! [rejected]        second -> second (non-fast-forward)
-error: failed to push some refs to '../upstream'
-hint: Updates were rejected because a pushed branch tip is behind its remote
-hint: counterpart. Check out this branch and integrate the remote changes
-hint: (e.g. 'git pull ...') before pushing again.
-hint: See the 'Note about fast-forwards' in 'git push --help' for details.
-ok 5 - atomic push fails if one branch fails
+expecting success: 
+				printf '%s' ']' >expect &&
+				git --glob-pathspecs ls-files -z -- '[\\-^]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 944 - wildmatch (via ls-files): match '[\\-^]' ']'
 
 expecting success: 
-	# prepare the repo
-	mk_repo_pair &&
-	(
-		cd workbench &&
-		test_commit one &&
-		git checkout -b second master &&
-		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 master &&
-		test_commit three &&
-		git checkout second &&
-		test_commit four &&
-		git tag test_tag &&
-		test_must_fail git push --tags --atomic up master second
-	) &&
-	test_refs master HEAD@{3} &&
-	test_refs second HEAD@{1}
+			test-tool wildmatch iwildmatch ']' '[\\-^]'
+		
+ok 945 - iwildmatch: match ']' '[\\-^]'
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5543-atomic-push/upstream/.git/
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5543-atomic-push/workbench/.git/
-[master (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]      master -> master
- * [new branch]      second -> second
- * [new tag]         one -> one
- * [new tag]         two -> two
-Switched to branch 'second'
-Switched to branch 'master'
-[master 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
+expecting success: 
+				printf '%s' ']' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[\\-^]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 946 - iwildmatch (via ls-files): match '[\\-^]' ']'
 
-fatal: the remote end hung up unexpectedly
-To ../upstream
- ! [rejected]        master -> master (atomic push failed)
- ! [rejected]        second -> second (atomic push failed)
- ! [rejected]        test_tag -> test_tag (already exists)
-error: failed to push some refs to '../upstream'
-hint: Updates were rejected because the tag already exists in the remote.
-ok 6 - atomic push fails if one tag fails remotely
+expecting success: 
+			test-tool wildmatch pathmatch ']' '[\\-^]'
+		
+ok 947 - pathmatch: match ']' '[\\-^]'
 
 expecting success: 
-	mk_repo_pair &&
-	(
-		cd workbench &&
-		test_commit one &&
-		git checkout -b second master &&
-		test_commit two &&
-		git push --mirror up
-	) &&
-	(
-		cd upstream &&
-		HOOKDIR="$(git rev-parse --git-dir)/hooks" &&
-		HOOK="$HOOKDIR/update" &&
-		mkdir -p "$HOOKDIR" &&
-		write_script "$HOOK" <<-\EOF
-			# only allow update to master from now on
-			test "$1" = "refs/heads/master"
-		EOF
-	) &&
-	(
-		cd workbench &&
-		git checkout master &&
-		test_commit three &&
-		git checkout second &&
-		test_commit four &&
-		test_must_fail git push --atomic up master second
-	) &&
-	test_refs master HEAD@{3} &&
-	test_refs second HEAD@{1}
+				printf '%s' ']' >expect &&
+				git ls-files -z -- '[\\-^]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 948 - pathmatch (via ls-files): match '[\\-^]' ']'
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5543-atomic-push/upstream/.git/
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5543-atomic-push/workbench/.git/
-[master (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]      master -> master
- * [new branch]      second -> second
- * [new tag]         one -> one
- * [new tag]         two -> two
-Switched to branch 'master'
-[master 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] master -> master (atomic push failure)
- ! [remote rejected] second -> second (hook declined)
-error: failed to push some refs to '../upstream'
-ok 7 - atomic push obeys update hook preventing a branch to be pushed
+expecting success: 
+			test-tool wildmatch ipathmatch ']' '[\\-^]'
+		
+ok 949 - ipathmatch: match ']' '[\\-^]'
 
 expecting success: 
-	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 master
-	) &&
-	test_refs master HEAD@{1}
+				printf '%s' ']' >expect &&
+				git --icase-pathspecs ls-files -z -- '[\\-^]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 950 - ipathmatch (via ls-files): match '[\\-^]' ']'
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5543-atomic-push/upstream/.git/
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5543-atomic-push/workbench/.git/
-[master (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]      master -> master
- * [new tag]         one -> one
-[master 139b20d] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-fatal: the receiving end does not support --atomic push
-fatal: the remote end hung up unexpectedly
-ok 8 - atomic push is not advertised if configured
+expecting success: 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing ]
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 951 - cleanup after previous file test
 
-# passed all 8 test(s)
-1..8
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t5562-http-backend-content-length.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5562-http-backend-content-length/.git/
 expecting success: 
-	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) &&
-	printf "want %s" "$hash_head" | packetize >fetch_body &&
-	printf 0000 >>fetch_body &&
-	printf "have %s" "$hash_prev" | packetize >>fetch_body &&
-	printf done | packetize >>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\\n" "$_z40" "$hash_next" | packetize >push_body &&
-	printf 0000 >>push_body &&
-	echo "$hash_next" | git pack-objects --stdout >>push_body &&
-	test_copy_bytes 10 <push_body >push_body.trunc &&
-	: >empty_body
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 952 - setup match file test for [
 
-[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
+expecting success: 
+			test_must_fail test-tool wildmatch wildmatch '[' '[\\-^]'
+		
+ok 953 - wildmatch: no match '[' '[\\-^]'
 
-checking prerequisite: GZIP
+expecting success: 
+				>expect &&
+				git --glob-pathspecs ls-files -z -- '[\\-^]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 954 - wildmatch (via ls-files): no match '[\\-^]' '['
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir" &&gzip --version
-)
-gzip 1.9
-Copyright (C) 2017 Free Software Foundation, Inc.
-Copyright (C) 1993 Jean-loup Gailly.
-This is free software.  You may redistribute copies of it under the terms of
-the GNU General Public License <https://www.gnu.org/licenses/gpl.html>.
-There is NO WARRANTY, to the extent permitted by law.
+expecting success: 
+			test_must_fail test-tool wildmatch iwildmatch '[' '[\\-^]'
+		
+ok 955 - iwildmatch: no match '[' '[\\-^]'
 
-Written by Jean-loup Gailly.
-prerequisite GZIP ok
 expecting success: 
-	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
+				>expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[\\-^]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 956 - iwildmatch (via ls-files): no match '[\\-^]' '['
 
-ok 2 - setup, compression related
+expecting success: 
+			test_must_fail test-tool wildmatch pathmatch '[' '[\\-^]'
+		
+ok 957 - pathmatch: no match '[' '[\\-^]'
 
 expecting success: 
-	test_http_env upload fetch_body &&
-	verify_http_result "200 OK"
+				>expect &&
+				git ls-files -z -- '[\\-^]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 958 - pathmatch (via ls-files): no match '[\\-^]' '['
 
-ok 3 - fetch plain
+expecting success: 
+			test_must_fail test-tool wildmatch ipathmatch '[' '[\\-^]'
+		
+ok 959 - ipathmatch: no match '[' '[\\-^]'
 
 expecting success: 
-	test_http_env upload fetch_body.trunc &&
-	! verify_http_result "200 OK"
+				>expect &&
+				git --icase-pathspecs ls-files -z -- '[\\-^]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 960 - ipathmatch (via ls-files): no match '[\\-^]' '['
 
-fatal: the remote end hung up unexpectedly
-ok 4 - fetch plain truncated
+expecting success: 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing [
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 961 - cleanup after previous file test
 
 expecting success: 
-	test_http_env upload empty_body &&
-	! verify_http_result "200 OK"
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 962 - setup match file test for -
 
-fatal: the remote end hung up unexpectedly
-ok 5 - fetch plain empty
+expecting success: 
+			test-tool wildmatch wildmatch '-' '[\-_]'
+		
+ok 963 - wildmatch: match '-' '[\-_]'
 
 expecting success: 
-	test_env HTTP_CONTENT_ENCODING="gzip" test_http_env upload fetch_body.gz &&
-	verify_http_result "200 OK"
+				printf '%s' '-' >expect &&
+				git --glob-pathspecs ls-files -z -- '[\-_]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 964 - wildmatch (via ls-files): match '[\-_]' '-'
 
-ok 6 - fetch gzipped
+expecting success: 
+			test-tool wildmatch iwildmatch '-' '[\-_]'
+		
+ok 965 - iwildmatch: match '-' '[\-_]'
 
 expecting success: 
-	test_env HTTP_CONTENT_ENCODING="gzip" test_http_env upload fetch_body.gz.trunc &&
-	! verify_http_result "200 OK"
+				printf '%s' '-' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[\-_]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 966 - iwildmatch (via ls-files): match '[\-_]' '-'
 
-fatal: request ended in the middle of the gzip stream
-fatal: the remote end hung up unexpectedly
-ok 7 - fetch gzipped truncated
+expecting success: 
+			test-tool wildmatch pathmatch '-' '[\-_]'
+		
+ok 967 - pathmatch: match '-' '[\-_]'
 
 expecting success: 
-	test_env HTTP_CONTENT_ENCODING="gzip" test_http_env upload empty_body &&
-	! verify_http_result "200 OK"
+				printf '%s' '-' >expect &&
+				git ls-files -z -- '[\-_]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 968 - pathmatch (via ls-files): match '[\-_]' '-'
 
-fatal: request ended in the middle of the gzip stream
-fatal: the remote end hung up unexpectedly
-ok 8 - fetch gzipped empty
+expecting success: 
+			test-tool wildmatch ipathmatch '-' '[\-_]'
+		
+ok 969 - ipathmatch: match '-' '[\-_]'
 
 expecting success: 
-	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
+				printf '%s' '-' >expect &&
+				git --icase-pathspecs ls-files -z -- '[\-_]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 970 - ipathmatch (via ls-files): match '[\-_]' '-'
 
-Deleted branch newbranch (was d8aa3fa).
-ok 9 - push plain
+expecting success: 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing -
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 971 - cleanup after previous file test
 
 expecting success: 
-	test_http_env receive push_body.trunc &&
-	! verify_http_result "200 OK"
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 972 - setup match file test for ]
 
-fatal: the remote end hung up unexpectedly
-ok 10 - push plain truncated
+expecting success: 
+			test-tool wildmatch wildmatch ']' '[\]]'
+		
+ok 973 - wildmatch: match ']' '[\]]'
 
 expecting success: 
-	test_http_env receive empty_body &&
-	! verify_http_result "200 OK"
+				printf '%s' ']' >expect &&
+				git --glob-pathspecs ls-files -z -- '[\]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 974 - wildmatch (via ls-files): match '[\]]' ']'
 
-fatal: the remote end hung up unexpectedly
-ok 11 - push plain empty
+expecting success: 
+			test-tool wildmatch iwildmatch ']' '[\]]'
+		
+ok 975 - iwildmatch: match ']' '[\]]'
 
 expecting success: 
-	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
+				printf '%s' ']' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[\]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 976 - iwildmatch (via ls-files): match '[\]]' ']'
 
-Deleted branch newbranch (was d8aa3fa).
-ok 12 - push gzipped
+expecting success: 
+			test-tool wildmatch pathmatch ']' '[\]]'
+		
+ok 977 - pathmatch: match ']' '[\]]'
 
 expecting success: 
-	test_env HTTP_CONTENT_ENCODING="gzip" test_http_env receive push_body.gz.trunc &&
-	! verify_http_result "200 OK"
+				printf '%s' ']' >expect &&
+				git ls-files -z -- '[\]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 978 - pathmatch (via ls-files): match '[\]]' ']'
 
-fatal: request ended in the middle of the gzip stream
-fatal: the remote end hung up unexpectedly
-ok 13 - push gzipped truncated
+expecting success: 
+			test-tool wildmatch ipathmatch ']' '[\]]'
+		
+ok 979 - ipathmatch: match ']' '[\]]'
 
 expecting success: 
-	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
-fatal: the remote end hung up unexpectedly
-ok 14 - push gzipped empty
+				printf '%s' ']' >expect &&
+				git --icase-pathspecs ls-files -z -- '[\]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 980 - ipathmatch (via ls-files): match '[\]]' ']'
 
 expecting success: 
-	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/zero >/dev/null 2>err &&
-	grep "fatal:.*CONTENT_LENGTH" err
-
-fatal: failed to parse CONTENT_LENGTH: 9223372036854775808
-ok 15 - CONTENT_LENGTH overflow ssite_t
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing ]
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 981 - cleanup after previous file test
 
 expecting success: 
-	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 2>act.err &&
-	verify_http_result "200 OK"
-
-ok 16 - empty CONTENT_LENGTH
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 982 - setup match file test for \]
 
-# passed all 16 test(s)
-1..16
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t0027-auto-crlf.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t0027-auto-crlf/.git/
 expecting success: 
-	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 |
-	sed -n -e "/TeBi_/{s!attr/[	]*!!g
-	s!	! !g
-	s!  *! !g
-	p
-	}" | sort >actual &&
-	test_cmp expect actual
-
-ok 1 - ls-files --eol -o Text/Binary
+			test_must_fail test-tool wildmatch wildmatch '\]' '[\]]'
+		
+ok 983 - wildmatch: no match '\]' '[\]]'
 
 expecting success: 
-	echo >.gitattributes &&
-	git checkout -b master &&
-	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
-
-Switched to a new branch 'master'
-[master (root-commit) ba22c4a] add .gitattributes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 .gitattributes
-[master d14231f] 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 master
+				>expect &&
+				git --glob-pathspecs ls-files -z -- '[\]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 984 - wildmatch (via ls-files): no match '[\]]' '\]'
 
 expecting success: 
-	commit_check_warn false ""     ""        ""        ""        ""        "" &&
-	commit_check_warn true  ""     "LF_CRLF" ""        "LF_CRLF" ""        "" &&
-	commit_check_warn input ""     ""        "CRLF_LF" "CRLF_LF" ""        ""
-
-[master 51176c5] 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
-[master bed2885] 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
-[master f9a1b43] 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
+			test_must_fail test-tool wildmatch iwildmatch '\]' '[\]]'
+		
+ok 985 - iwildmatch: no match '\]' '[\]]'
 
 expecting success: 
-	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" ""        ""
-
-[master fe385e2] 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
-[master 2ad7506] 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
-[master b12edb5] 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
+				>expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[\]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 986 - iwildmatch (via ls-files): no match '[\]]' '\]'
 
 expecting success: 
-	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"
-
-[master 260d248] 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
-[master 3f83c0d] 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
-[master 1c40329] 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
+			test_must_fail test-tool wildmatch pathmatch '\]' '[\]]'
+		
+ok 987 - pathmatch: no match '\]' '[\]]'
 
 expecting success: 
-	commit_check_warn false "-text" ""       ""        ""        ""        "" &&
-	commit_check_warn true  "-text" ""       ""        ""        ""        "" &&
-	commit_check_warn input "-text" ""       ""        ""        ""        ""
-
-[master 662ee1f] 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
-[master 56eddf9] 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
-[master 71275c1] 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
+				>expect &&
+				git ls-files -z -- '[\]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 988 - pathmatch (via ls-files): no match '[\]]' '\]'
 
 expecting success: 
-	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"
-
-[master 4dab551] 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
-[master ee0a20c] 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
-[master 9fe3cd8] 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
+			test_must_fail test-tool wildmatch ipathmatch '\]' '[\]]'
+		
+ok 989 - ipathmatch: no match '\]' '[\]]'
 
 expecting success: 
-	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" ""
-
-[master 56298ec] 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
-[master d6e23d4] 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
-[master 7f0ab90] 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
+				>expect &&
+				git --icase-pathspecs ls-files -z -- '[\]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 990 - ipathmatch (via ls-files): no match '[\]]' '\]'
 
 expecting success: 
-		check_warning "$lfwarn" ${pfx}_LF.err
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
 	
-ok 9 - commit file with mixed EOL onto LF crlf=false attr=
+Removing "\\]"
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 991 - cleanup after previous file test
 
 expecting success: 
-		check_warning "$crlfwarn" ${pfx}_CRLF.err
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
 	
-ok 10 - commit file with mixed EOL onto CLRF attr= aeol= crlf=false
+ok 992 - setup match file test for \
 
 expecting success: 
-		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
-	
-ok 11 - commit file with mixed EOL onto CRLF_mix_LF attr= aeol= crlf=false
+			test_must_fail test-tool wildmatch wildmatch '\' '[\]]'
+		
+ok 993 - wildmatch: no match '\' '[\]]'
 
 expecting success: 
-		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
-	
-ok 12 - commit file with mixed EOL onto LF_mix_cr attr= aeol= crlf=false 
+				>expect &&
+				git --glob-pathspecs ls-files -z -- '[\]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 994 - wildmatch (via ls-files): no match '[\]]' '\'
 
 expecting success: 
-		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
-	
-ok 13 - commit file with mixed EOL onto CRLF_nul attr= aeol= crlf=false
+			test_must_fail test-tool wildmatch iwildmatch '\' '[\]]'
+		
+ok 995 - iwildmatch: no match '\' '[\]]'
 
 expecting success: 
-		check_warning "$lfwarn" ${pfx}_LF.err
-	
-ok 14 - commit file with mixed EOL onto LF crlf=true attr=
+				>expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[\]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 996 - iwildmatch (via ls-files): no match '[\]]' '\'
 
 expecting success: 
-		check_warning "$crlfwarn" ${pfx}_CRLF.err
-	
-ok 15 - commit file with mixed EOL onto CLRF attr= aeol= crlf=true
+			test_must_fail test-tool wildmatch pathmatch '\' '[\]]'
+		
+ok 997 - pathmatch: no match '\' '[\]]'
 
 expecting success: 
-		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
-	
-ok 16 - commit file with mixed EOL onto CRLF_mix_LF attr= aeol= crlf=true
+				>expect &&
+				git ls-files -z -- '[\]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 998 - pathmatch (via ls-files): no match '[\]]' '\'
 
 expecting success: 
-		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
-	
-ok 17 - commit file with mixed EOL onto LF_mix_cr attr= aeol= crlf=true 
+			test_must_fail test-tool wildmatch ipathmatch '\' '[\]]'
+		
+ok 999 - ipathmatch: no match '\' '[\]]'
 
 expecting success: 
-		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
-	
-ok 18 - commit file with mixed EOL onto CRLF_nul attr= aeol= crlf=true
+				>expect &&
+				git --icase-pathspecs ls-files -z -- '[\]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1000 - ipathmatch (via ls-files): no match '[\]]' '\'
 
 expecting success: 
-		check_warning "$lfwarn" ${pfx}_LF.err
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
 	
-ok 19 - commit file with mixed EOL onto LF crlf=input attr=
+Removing "\\"
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1001 - cleanup after previous file test
 
 expecting success: 
-		check_warning "$crlfwarn" ${pfx}_CRLF.err
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
 	
-ok 20 - commit file with mixed EOL onto CLRF attr= aeol= crlf=input
+ok 1002 - setup match file test for ab
 
 expecting success: 
-		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
-	
-ok 21 - commit file with mixed EOL onto CRLF_mix_LF attr= aeol= crlf=input
+			test_must_fail test-tool wildmatch wildmatch 'ab' 'a[]b'
+		
+ok 1003 - wildmatch: no match 'ab' 'a[]b'
 
 expecting success: 
-		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
-	
-ok 22 - commit file with mixed EOL onto LF_mix_cr attr= aeol= crlf=input 
+				>expect &&
+				git --glob-pathspecs ls-files -z -- 'a[]b' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1004 - wildmatch (via ls-files): no match 'a[]b' 'ab'
 
 expecting success: 
-		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
-	
-ok 23 - commit file with mixed EOL onto CRLF_nul attr= aeol= crlf=input
+			test_must_fail test-tool wildmatch iwildmatch 'ab' 'a[]b'
+		
+ok 1005 - iwildmatch: no match 'ab' 'a[]b'
 
 expecting success: 
-		check_warning "$lfwarn" ${pfx}_LF.err
-	
-ok 24 - commit file with mixed EOL onto LF crlf=false attr=auto
+				>expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'a[]b' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1006 - iwildmatch (via ls-files): no match 'a[]b' 'ab'
 
 expecting success: 
-		check_warning "$crlfwarn" ${pfx}_CRLF.err
-	
-ok 25 - commit file with mixed EOL onto CLRF attr=auto aeol= crlf=false
+			test_must_fail test-tool wildmatch pathmatch 'ab' 'a[]b'
+		
+ok 1007 - pathmatch: no match 'ab' 'a[]b'
 
 expecting success: 
-		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
-	
-ok 26 - commit file with mixed EOL onto CRLF_mix_LF attr=auto aeol= crlf=false
+				>expect &&
+				git ls-files -z -- 'a[]b' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1008 - pathmatch (via ls-files): no match 'a[]b' 'ab'
 
 expecting success: 
-		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
-	
-ok 27 - commit file with mixed EOL onto LF_mix_cr attr=auto aeol= crlf=false 
+			test_must_fail test-tool wildmatch ipathmatch 'ab' 'a[]b'
+		
+ok 1009 - ipathmatch: no match 'ab' 'a[]b'
 
 expecting success: 
-		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
-	
-ok 28 - commit file with mixed EOL onto CRLF_nul attr=auto aeol= crlf=false
+				>expect &&
+				git --icase-pathspecs ls-files -z -- 'a[]b' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1010 - ipathmatch (via ls-files): no match 'a[]b' 'ab'
 
 expecting success: 
-		check_warning "$lfwarn" ${pfx}_LF.err
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
 	
-ok 29 - commit file with mixed EOL onto LF crlf=true attr=auto
+Removing ab
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1011 - cleanup after previous file test
 
 expecting success: 
-		check_warning "$crlfwarn" ${pfx}_CRLF.err
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
 	
-ok 30 - commit file with mixed EOL onto CLRF attr=auto aeol= crlf=true
+ok 1012 - setup match file test for a[]b
 
 expecting success: 
-		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
-	
-ok 31 - commit file with mixed EOL onto CRLF_mix_LF attr=auto aeol= crlf=true
+			test_must_fail test-tool wildmatch wildmatch 'a[]b' 'a[]b'
+		
+ok 1013 - wildmatch: no match 'a[]b' 'a[]b'
 
 expecting success: 
-		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
-	
-ok 32 - commit file with mixed EOL onto LF_mix_cr attr=auto aeol= crlf=true 
+				printf '%s' 'a[]b' >expect &&
+				git --glob-pathspecs ls-files -z -- 'a[]b' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1014 - wildmatch (via ls-files): match 'a[]b' 'a[]b'
 
 expecting success: 
-		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
-	
-ok 33 - commit file with mixed EOL onto CRLF_nul attr=auto aeol= crlf=true
+			test_must_fail test-tool wildmatch iwildmatch 'a[]b' 'a[]b'
+		
+ok 1015 - iwildmatch: no match 'a[]b' 'a[]b'
 
 expecting success: 
-		check_warning "$lfwarn" ${pfx}_LF.err
-	
-ok 34 - commit file with mixed EOL onto LF crlf=input attr=auto
+				printf '%s' 'a[]b' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'a[]b' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1016 - iwildmatch (via ls-files): match 'a[]b' 'a[]b'
 
 expecting success: 
-		check_warning "$crlfwarn" ${pfx}_CRLF.err
-	
-ok 35 - commit file with mixed EOL onto CLRF attr=auto aeol= crlf=input
+			test_must_fail test-tool wildmatch pathmatch 'a[]b' 'a[]b'
+		
+ok 1017 - pathmatch: no match 'a[]b' 'a[]b'
 
 expecting success: 
-		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
-	
-ok 36 - commit file with mixed EOL onto CRLF_mix_LF attr=auto aeol= crlf=input
+				printf '%s' 'a[]b' >expect &&
+				git ls-files -z -- 'a[]b' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1018 - pathmatch (via ls-files): match 'a[]b' 'a[]b'
 
 expecting success: 
-		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
-	
-ok 37 - commit file with mixed EOL onto LF_mix_cr attr=auto aeol= crlf=input 
+			test_must_fail test-tool wildmatch ipathmatch 'a[]b' 'a[]b'
+		
+ok 1019 - ipathmatch: no match 'a[]b' 'a[]b'
 
 expecting success: 
-		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
-	
-ok 38 - commit file with mixed EOL onto CRLF_nul attr=auto aeol= crlf=input
+				printf '%s' 'a[]b' >expect &&
+				git --icase-pathspecs ls-files -z -- 'a[]b' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1020 - ipathmatch (via ls-files): match 'a[]b' 'a[]b'
 
 expecting success: 
-		check_warning "$lfwarn" ${pfx}_LF.err
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
 	
-ok 39 - commit NNO files crlf=false attr= LF
+Removing a[]b
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1021 - cleanup after previous file test
 
 expecting success: 
-		check_warning "$crlfwarn" ${pfx}_CRLF.err
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
 	
-ok 40 - commit NNO files attr= aeol= crlf=false CRLF
+ok 1022 - setup match file test for ab[
 
 expecting success: 
-		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
-	
-ok 41 - commit NNO files attr= aeol= crlf=false CRLF_mix_LF
+			test_must_fail test-tool wildmatch wildmatch 'ab[' 'ab['
+		
+ok 1023 - wildmatch: no match 'ab[' 'ab['
 
 expecting success: 
-		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
-	
-ok 42 - commit NNO files attr= aeol= crlf=false LF_mix_cr
+				printf '%s' 'ab[' >expect &&
+				git --glob-pathspecs ls-files -z -- 'ab[' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1024 - wildmatch (via ls-files): match 'ab[' 'ab['
 
 expecting success: 
-		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
-	
-ok 43 - commit NNO files attr= aeol= crlf=false CRLF_nul
+			test_must_fail test-tool wildmatch iwildmatch 'ab[' 'ab['
+		
+ok 1025 - iwildmatch: no match 'ab[' 'ab['
 
 expecting success: 
-		check_warning "$lfwarn" ${pfx}_LF.err
-	
-ok 44 - commit NNO files crlf=true attr= LF
+				printf '%s' 'ab[' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'ab[' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1026 - iwildmatch (via ls-files): match 'ab[' 'ab['
 
 expecting success: 
-		check_warning "$crlfwarn" ${pfx}_CRLF.err
-	
-ok 45 - commit NNO files attr= aeol= crlf=true CRLF
+			test_must_fail test-tool wildmatch pathmatch 'ab[' 'ab['
+		
+ok 1027 - pathmatch: no match 'ab[' 'ab['
 
 expecting success: 
-		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
-	
-ok 46 - commit NNO files attr= aeol= crlf=true CRLF_mix_LF
+				printf '%s' 'ab[' >expect &&
+				git ls-files -z -- 'ab[' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1028 - pathmatch (via ls-files): match 'ab[' 'ab['
 
 expecting success: 
-		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
-	
-ok 47 - commit NNO files attr= aeol= crlf=true LF_mix_cr
+			test_must_fail test-tool wildmatch ipathmatch 'ab[' 'ab['
+		
+ok 1029 - ipathmatch: no match 'ab[' 'ab['
 
 expecting success: 
-		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
-	
-ok 48 - commit NNO files attr= aeol= crlf=true CRLF_nul
+				printf '%s' 'ab[' >expect &&
+				git --icase-pathspecs ls-files -z -- 'ab[' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1030 - ipathmatch (via ls-files): match 'ab[' 'ab['
 
 expecting success: 
-		check_warning "$lfwarn" ${pfx}_LF.err
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
 	
-ok 49 - commit NNO files crlf=input attr= LF
+Removing ab[
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1031 - cleanup after previous file test
 
 expecting success: 
-		check_warning "$crlfwarn" ${pfx}_CRLF.err
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
 	
-ok 50 - commit NNO files attr= aeol= crlf=input CRLF
+ok 1032 - setup match file test for ab
 
 expecting success: 
-		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
-	
-ok 51 - commit NNO files attr= aeol= crlf=input CRLF_mix_LF
+			test_must_fail test-tool wildmatch wildmatch 'ab' '[!'
+		
+ok 1033 - wildmatch: no match 'ab' '[!'
 
 expecting success: 
-		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
-	
-ok 52 - commit NNO files attr= aeol= crlf=input LF_mix_cr
+				>expect &&
+				git --glob-pathspecs ls-files -z -- '[!' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1034 - wildmatch (via ls-files): no match '[!' 'ab'
 
 expecting success: 
-		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
-	
-ok 53 - commit NNO files attr= aeol= crlf=input CRLF_nul
+			test_must_fail test-tool wildmatch iwildmatch 'ab' '[!'
+		
+ok 1035 - iwildmatch: no match 'ab' '[!'
 
 expecting success: 
-		check_warning "$lfwarn" ${pfx}_LF.err
-	
-ok 54 - commit NNO files crlf=false attr=auto LF
+				>expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[!' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1036 - iwildmatch (via ls-files): no match '[!' 'ab'
 
 expecting success: 
-		check_warning "$crlfwarn" ${pfx}_CRLF.err
-	
-ok 55 - commit NNO files attr=auto aeol= crlf=false CRLF
+			test_must_fail test-tool wildmatch pathmatch 'ab' '[!'
+		
+ok 1037 - pathmatch: no match 'ab' '[!'
 
 expecting success: 
-		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
-	
-ok 56 - commit NNO files attr=auto aeol= crlf=false CRLF_mix_LF
+				>expect &&
+				git ls-files -z -- '[!' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1038 - pathmatch (via ls-files): no match '[!' 'ab'
 
 expecting success: 
-		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
-	
-ok 57 - commit NNO files attr=auto aeol= crlf=false LF_mix_cr
+			test_must_fail test-tool wildmatch ipathmatch 'ab' '[!'
+		
+ok 1039 - ipathmatch: no match 'ab' '[!'
 
 expecting success: 
-		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
-	
-ok 58 - commit NNO files attr=auto aeol= crlf=false CRLF_nul
+				>expect &&
+				git --icase-pathspecs ls-files -z -- '[!' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1040 - ipathmatch (via ls-files): no match '[!' 'ab'
 
 expecting success: 
-		check_warning "$lfwarn" ${pfx}_LF.err
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
 	
-ok 59 - commit NNO files crlf=true attr=auto LF
+Removing ab
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1041 - cleanup after previous file test
 
 expecting success: 
-		check_warning "$crlfwarn" ${pfx}_CRLF.err
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
 	
-ok 60 - commit NNO files attr=auto aeol= crlf=true CRLF
+ok 1042 - setup match file test for ab
 
 expecting success: 
-		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
-	
-ok 61 - commit NNO files attr=auto aeol= crlf=true CRLF_mix_LF
+			test_must_fail test-tool wildmatch wildmatch 'ab' '[-'
+		
+ok 1043 - wildmatch: no match 'ab' '[-'
 
 expecting success: 
-		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
-	
-ok 62 - commit NNO files attr=auto aeol= crlf=true LF_mix_cr
+				>expect &&
+				git --glob-pathspecs ls-files -z -- '[-' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1044 - wildmatch (via ls-files): no match '[-' 'ab'
 
 expecting success: 
-		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
-	
-ok 63 - commit NNO files attr=auto aeol= crlf=true CRLF_nul
+			test_must_fail test-tool wildmatch iwildmatch 'ab' '[-'
+		
+ok 1045 - iwildmatch: no match 'ab' '[-'
 
 expecting success: 
-		check_warning "$lfwarn" ${pfx}_LF.err
-	
-ok 64 - commit NNO files crlf=input attr=auto LF
+				>expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[-' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1046 - iwildmatch (via ls-files): no match '[-' 'ab'
 
 expecting success: 
-		check_warning "$crlfwarn" ${pfx}_CRLF.err
-	
-ok 65 - commit NNO files attr=auto aeol= crlf=input CRLF
+			test_must_fail test-tool wildmatch pathmatch 'ab' '[-'
+		
+ok 1047 - pathmatch: no match 'ab' '[-'
 
 expecting success: 
-		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
-	
-ok 66 - commit NNO files attr=auto aeol= crlf=input CRLF_mix_LF
+				>expect &&
+				git ls-files -z -- '[-' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1048 - pathmatch (via ls-files): no match '[-' 'ab'
 
 expecting success: 
-		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
-	
-ok 67 - commit NNO files attr=auto aeol= crlf=input LF_mix_cr
+			test_must_fail test-tool wildmatch ipathmatch 'ab' '[-'
+		
+ok 1049 - ipathmatch: no match 'ab' '[-'
 
 expecting success: 
-		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
-	
-ok 68 - commit NNO files attr=auto aeol= crlf=input CRLF_nul
+				>expect &&
+				git --icase-pathspecs ls-files -z -- '[-' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1050 - ipathmatch (via ls-files): no match '[-' 'ab'
 
 expecting success: 
-		check_warning "$lfwarn" ${pfx}_LF.err
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
 	
-ok 69 - commit NNO files crlf=true attr=-text LF
+Removing ab
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1051 - cleanup after previous file test
 
 expecting success: 
-		check_warning "$crlfwarn" ${pfx}_CRLF.err
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
 	
-ok 70 - commit NNO files attr=-text aeol= crlf=true CRLF
+ok 1052 - setup match file test for -
 
 expecting success: 
-		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
-	
-ok 71 - commit NNO files attr=-text aeol= crlf=true CRLF_mix_LF
+			test-tool wildmatch wildmatch '-' '[-]'
+		
+ok 1053 - wildmatch: match '-' '[-]'
 
 expecting success: 
-		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
-	
-ok 72 - commit NNO files attr=-text aeol= crlf=true LF_mix_cr
+				printf '%s' '-' >expect &&
+				git --glob-pathspecs ls-files -z -- '[-]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1054 - wildmatch (via ls-files): match '[-]' '-'
 
 expecting success: 
-		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
-	
-ok 73 - commit NNO files attr=-text aeol= crlf=true CRLF_nul
+			test-tool wildmatch iwildmatch '-' '[-]'
+		
+ok 1055 - iwildmatch: match '-' '[-]'
 
 expecting success: 
-		check_warning "$lfwarn" ${pfx}_LF.err
-	
-ok 74 - commit NNO files crlf=true attr=-text LF
+				printf '%s' '-' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[-]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1056 - iwildmatch (via ls-files): match '[-]' '-'
 
 expecting success: 
-		check_warning "$crlfwarn" ${pfx}_CRLF.err
-	
-ok 75 - commit NNO files attr=-text aeol=lf crlf=true CRLF
+			test-tool wildmatch pathmatch '-' '[-]'
+		
+ok 1057 - pathmatch: match '-' '[-]'
 
 expecting success: 
-		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
-	
-ok 76 - commit NNO files attr=-text aeol=lf crlf=true CRLF_mix_LF
+				printf '%s' '-' >expect &&
+				git ls-files -z -- '[-]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1058 - pathmatch (via ls-files): match '[-]' '-'
 
 expecting success: 
-		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
-	
-ok 77 - commit NNO files attr=-text aeol=lf crlf=true LF_mix_cr
+			test-tool wildmatch ipathmatch '-' '[-]'
+		
+ok 1059 - ipathmatch: match '-' '[-]'
 
 expecting success: 
-		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
-	
-ok 78 - commit NNO files attr=-text aeol=lf crlf=true CRLF_nul
+				printf '%s' '-' >expect &&
+				git --icase-pathspecs ls-files -z -- '[-]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1060 - ipathmatch (via ls-files): match '[-]' '-'
 
 expecting success: 
-		check_warning "$lfwarn" ${pfx}_LF.err
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
 	
-ok 79 - commit NNO files crlf=true attr=-text LF
+Removing -
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1061 - cleanup after previous file test
 
 expecting success: 
-		check_warning "$crlfwarn" ${pfx}_CRLF.err
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
 	
-ok 80 - commit NNO files attr=-text aeol=crlf crlf=true CRLF
+ok 1062 - setup match file test for -
 
 expecting success: 
-		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
-	
-ok 81 - commit NNO files attr=-text aeol=crlf crlf=true CRLF_mix_LF
+			test_must_fail test-tool wildmatch wildmatch '-' '[a-'
+		
+ok 1063 - wildmatch: no match '-' '[a-'
 
 expecting success: 
-		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
-	
-ok 82 - commit NNO files attr=-text aeol=crlf crlf=true LF_mix_cr
+				>expect &&
+				git --glob-pathspecs ls-files -z -- '[a-' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1064 - wildmatch (via ls-files): no match '[a-' '-'
 
 expecting success: 
-		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
-	
-ok 83 - commit NNO files attr=-text aeol=crlf crlf=true CRLF_nul
+			test_must_fail test-tool wildmatch iwildmatch '-' '[a-'
+		
+ok 1065 - iwildmatch: no match '-' '[a-'
 
 expecting success: 
-		check_warning "$lfwarn" ${pfx}_LF.err
-	
-ok 84 - commit NNO files crlf=true attr= LF
+				>expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[a-' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1066 - iwildmatch (via ls-files): no match '[a-' '-'
 
 expecting success: 
-		check_warning "$crlfwarn" ${pfx}_CRLF.err
-	
-ok 85 - commit NNO files attr= aeol=lf crlf=true CRLF
+			test_must_fail test-tool wildmatch pathmatch '-' '[a-'
+		
+ok 1067 - pathmatch: no match '-' '[a-'
 
 expecting success: 
-		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
-	
-ok 86 - commit NNO files attr= aeol=lf crlf=true CRLF_mix_LF
+				>expect &&
+				git ls-files -z -- '[a-' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1068 - pathmatch (via ls-files): no match '[a-' '-'
 
 expecting success: 
-		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
-	
-ok 87 - commit NNO files attr= aeol=lf crlf=true LF_mix_cr
+			test_must_fail test-tool wildmatch ipathmatch '-' '[a-'
+		
+ok 1069 - ipathmatch: no match '-' '[a-'
 
 expecting success: 
-		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
-	
-ok 88 - commit NNO files attr= aeol=lf crlf=true CRLF_nul
+				>expect &&
+				git --icase-pathspecs ls-files -z -- '[a-' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1070 - ipathmatch (via ls-files): no match '[a-' '-'
 
 expecting success: 
-		check_warning "$lfwarn" ${pfx}_LF.err
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
 	
-ok 89 - commit NNO files crlf=true attr= LF
+Removing -
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1071 - cleanup after previous file test
 
 expecting success: 
-		check_warning "$crlfwarn" ${pfx}_CRLF.err
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
 	
-ok 90 - commit NNO files attr= aeol=crlf crlf=true CRLF
+ok 1072 - setup match file test for -
 
 expecting success: 
-		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
-	
-ok 91 - commit NNO files attr= aeol=crlf crlf=true CRLF_mix_LF
+			test_must_fail test-tool wildmatch wildmatch '-' '[!a-'
+		
+ok 1073 - wildmatch: no match '-' '[!a-'
 
 expecting success: 
-		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
-	
-ok 92 - commit NNO files attr= aeol=crlf crlf=true LF_mix_cr
+				>expect &&
+				git --glob-pathspecs ls-files -z -- '[!a-' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1074 - wildmatch (via ls-files): no match '[!a-' '-'
 
 expecting success: 
-		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
-	
-ok 93 - commit NNO files attr= aeol=crlf crlf=true CRLF_nul
+			test_must_fail test-tool wildmatch iwildmatch '-' '[!a-'
+		
+ok 1075 - iwildmatch: no match '-' '[!a-'
 
 expecting success: 
-		check_warning "$lfwarn" ${pfx}_LF.err
-	
-ok 94 - commit NNO files crlf=true attr=auto LF
+				>expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[!a-' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1076 - iwildmatch (via ls-files): no match '[!a-' '-'
 
 expecting success: 
-		check_warning "$crlfwarn" ${pfx}_CRLF.err
-	
-ok 95 - commit NNO files attr=auto aeol=lf crlf=true CRLF
+			test_must_fail test-tool wildmatch pathmatch '-' '[!a-'
+		
+ok 1077 - pathmatch: no match '-' '[!a-'
 
 expecting success: 
-		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
-	
-ok 96 - commit NNO files attr=auto aeol=lf crlf=true CRLF_mix_LF
+				>expect &&
+				git ls-files -z -- '[!a-' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1078 - pathmatch (via ls-files): no match '[!a-' '-'
 
 expecting success: 
-		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
-	
-ok 97 - commit NNO files attr=auto aeol=lf crlf=true LF_mix_cr
+			test_must_fail test-tool wildmatch ipathmatch '-' '[!a-'
+		
+ok 1079 - ipathmatch: no match '-' '[!a-'
 
 expecting success: 
-		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
-	
-ok 98 - commit NNO files attr=auto aeol=lf crlf=true CRLF_nul
+				>expect &&
+				git --icase-pathspecs ls-files -z -- '[!a-' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1080 - ipathmatch (via ls-files): no match '[!a-' '-'
 
 expecting success: 
-		check_warning "$lfwarn" ${pfx}_LF.err
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
 	
-ok 99 - commit NNO files crlf=true attr=auto LF
+Removing -
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1081 - cleanup after previous file test
 
 expecting success: 
-		check_warning "$crlfwarn" ${pfx}_CRLF.err
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
 	
-ok 100 - commit NNO files attr=auto aeol=crlf crlf=true CRLF
+ok 1082 - setup match file test for -
 
 expecting success: 
-		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
-	
-ok 101 - commit NNO files attr=auto aeol=crlf crlf=true CRLF_mix_LF
+			test-tool wildmatch wildmatch '-' '[--A]'
+		
+ok 1083 - wildmatch: match '-' '[--A]'
 
 expecting success: 
-		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
-	
-ok 102 - commit NNO files attr=auto aeol=crlf crlf=true LF_mix_cr
+				printf '%s' '-' >expect &&
+				git --glob-pathspecs ls-files -z -- '[--A]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1084 - wildmatch (via ls-files): match '[--A]' '-'
 
 expecting success: 
-		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
-	
-ok 103 - commit NNO files attr=auto aeol=crlf crlf=true CRLF_nul
+			test-tool wildmatch iwildmatch '-' '[--A]'
+		
+ok 1085 - iwildmatch: match '-' '[--A]'
 
 expecting success: 
-		check_warning "$lfwarn" ${pfx}_LF.err
-	
-ok 104 - commit NNO files crlf=true attr=text LF
+				printf '%s' '-' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[--A]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1086 - iwildmatch (via ls-files): match '[--A]' '-'
 
 expecting success: 
-		check_warning "$crlfwarn" ${pfx}_CRLF.err
-	
-ok 105 - commit NNO files attr=text aeol=lf crlf=true CRLF
+			test-tool wildmatch pathmatch '-' '[--A]'
+		
+ok 1087 - pathmatch: match '-' '[--A]'
 
 expecting success: 
-		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
-	
-ok 106 - commit NNO files attr=text aeol=lf crlf=true CRLF_mix_LF
+				printf '%s' '-' >expect &&
+				git ls-files -z -- '[--A]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1088 - pathmatch (via ls-files): match '[--A]' '-'
 
 expecting success: 
-		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
-	
-ok 107 - commit NNO files attr=text aeol=lf crlf=true LF_mix_cr
+			test-tool wildmatch ipathmatch '-' '[--A]'
+		
+ok 1089 - ipathmatch: match '-' '[--A]'
 
 expecting success: 
-		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
-	
-ok 108 - commit NNO files attr=text aeol=lf crlf=true CRLF_nul
+				printf '%s' '-' >expect &&
+				git --icase-pathspecs ls-files -z -- '[--A]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1090 - ipathmatch (via ls-files): match '[--A]' '-'
 
 expecting success: 
-		check_warning "$lfwarn" ${pfx}_LF.err
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
 	
-ok 109 - commit NNO files crlf=true attr=text LF
+Removing -
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1091 - cleanup after previous file test
 
 expecting success: 
-		check_warning "$crlfwarn" ${pfx}_CRLF.err
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
 	
-ok 110 - commit NNO files attr=text aeol=crlf crlf=true CRLF
+ok 1092 - setup match file test for 5
 
 expecting success: 
-		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
-	
-ok 111 - commit NNO files attr=text aeol=crlf crlf=true CRLF_mix_LF
+			test-tool wildmatch wildmatch '5' '[--A]'
+		
+ok 1093 - wildmatch: match '5' '[--A]'
 
 expecting success: 
-		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
-	
-ok 112 - commit NNO files attr=text aeol=crlf crlf=true LF_mix_cr
+				printf '%s' '5' >expect &&
+				git --glob-pathspecs ls-files -z -- '[--A]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1094 - wildmatch (via ls-files): match '[--A]' '5'
 
 expecting success: 
-		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
-	
-ok 113 - commit NNO files attr=text aeol=crlf crlf=true CRLF_nul
+			test-tool wildmatch iwildmatch '5' '[--A]'
+		
+ok 1095 - iwildmatch: match '5' '[--A]'
 
 expecting success: 
-		check_warning "$lfwarn" ${pfx}_LF.err
-	
-ok 114 - commit NNO files crlf=false attr=-text LF
+				printf '%s' '5' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[--A]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1096 - iwildmatch (via ls-files): match '[--A]' '5'
 
 expecting success: 
-		check_warning "$crlfwarn" ${pfx}_CRLF.err
-	
-ok 115 - commit NNO files attr=-text aeol= crlf=false CRLF
+			test-tool wildmatch pathmatch '5' '[--A]'
+		
+ok 1097 - pathmatch: match '5' '[--A]'
 
 expecting success: 
-		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
-	
-ok 116 - commit NNO files attr=-text aeol= crlf=false CRLF_mix_LF
+				printf '%s' '5' >expect &&
+				git ls-files -z -- '[--A]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1098 - pathmatch (via ls-files): match '[--A]' '5'
 
 expecting success: 
-		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
-	
-ok 117 - commit NNO files attr=-text aeol= crlf=false LF_mix_cr
+			test-tool wildmatch ipathmatch '5' '[--A]'
+		
+ok 1099 - ipathmatch: match '5' '[--A]'
 
 expecting success: 
-		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
-	
-ok 118 - commit NNO files attr=-text aeol= crlf=false CRLF_nul
+				printf '%s' '5' >expect &&
+				git --icase-pathspecs ls-files -z -- '[--A]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1100 - ipathmatch (via ls-files): match '[--A]' '5'
 
 expecting success: 
-		check_warning "$lfwarn" ${pfx}_LF.err
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
 	
-ok 119 - commit NNO files crlf=false attr=-text LF
+Removing 5
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1101 - cleanup after previous file test
 
 expecting success: 
-		check_warning "$crlfwarn" ${pfx}_CRLF.err
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
 	
-ok 120 - commit NNO files attr=-text aeol=lf crlf=false CRLF
+ok 1102 - setup match file test for  
 
 expecting success: 
-		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
-	
-ok 121 - commit NNO files attr=-text aeol=lf crlf=false CRLF_mix_LF
+			test-tool wildmatch wildmatch ' ' '[ --]'
+		
+ok 1103 - wildmatch: match ' ' '[ --]'
 
 expecting success: 
-		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
-	
-ok 122 - commit NNO files attr=-text aeol=lf crlf=false LF_mix_cr
+				printf '%s' ' ' >expect &&
+				git --glob-pathspecs ls-files -z -- '[ --]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1104 - wildmatch (via ls-files): match '[ --]' ' '
 
 expecting success: 
-		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
-	
-ok 123 - commit NNO files attr=-text aeol=lf crlf=false CRLF_nul
+			test-tool wildmatch iwildmatch ' ' '[ --]'
+		
+ok 1105 - iwildmatch: match ' ' '[ --]'
 
 expecting success: 
-		check_warning "$lfwarn" ${pfx}_LF.err
-	
-ok 124 - commit NNO files crlf=false attr=-text LF
+				printf '%s' ' ' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[ --]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1106 - iwildmatch (via ls-files): match '[ --]' ' '
 
 expecting success: 
-		check_warning "$crlfwarn" ${pfx}_CRLF.err
-	
-ok 125 - commit NNO files attr=-text aeol=crlf crlf=false CRLF
+			test-tool wildmatch pathmatch ' ' '[ --]'
+		
+ok 1107 - pathmatch: match ' ' '[ --]'
 
 expecting success: 
-		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
-	
-ok 126 - commit NNO files attr=-text aeol=crlf crlf=false CRLF_mix_LF
+				printf '%s' ' ' >expect &&
+				git ls-files -z -- '[ --]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1108 - pathmatch (via ls-files): match '[ --]' ' '
 
 expecting success: 
-		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
-	
-ok 127 - commit NNO files attr=-text aeol=crlf crlf=false LF_mix_cr
+			test-tool wildmatch ipathmatch ' ' '[ --]'
+		
+ok 1109 - ipathmatch: match ' ' '[ --]'
 
 expecting success: 
-		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
-	
-ok 128 - commit NNO files attr=-text aeol=crlf crlf=false CRLF_nul
+				printf '%s' ' ' >expect &&
+				git --icase-pathspecs ls-files -z -- '[ --]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1110 - ipathmatch (via ls-files): match '[ --]' ' '
 
 expecting success: 
-		check_warning "$lfwarn" ${pfx}_LF.err
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
 	
-ok 129 - commit NNO files crlf=false attr= LF
+Removing  
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1111 - cleanup after previous file test
 
 expecting success: 
-		check_warning "$crlfwarn" ${pfx}_CRLF.err
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
 	
-ok 130 - commit NNO files attr= aeol=lf crlf=false CRLF
+ok 1112 - setup match file test for $
 
 expecting success: 
-		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
-	
-ok 131 - commit NNO files attr= aeol=lf crlf=false CRLF_mix_LF
+			test-tool wildmatch wildmatch '$' '[ --]'
+		
+ok 1113 - wildmatch: match '$' '[ --]'
 
 expecting success: 
-		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
-	
-ok 132 - commit NNO files attr= aeol=lf crlf=false LF_mix_cr
+				printf '%s' '$' >expect &&
+				git --glob-pathspecs ls-files -z -- '[ --]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1114 - wildmatch (via ls-files): match '[ --]' '$'
 
 expecting success: 
-		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
-	
-ok 133 - commit NNO files attr= aeol=lf crlf=false CRLF_nul
+			test-tool wildmatch iwildmatch '$' '[ --]'
+		
+ok 1115 - iwildmatch: match '$' '[ --]'
 
 expecting success: 
-		check_warning "$lfwarn" ${pfx}_LF.err
-	
-ok 134 - commit NNO files crlf=false attr= LF
+				printf '%s' '$' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[ --]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1116 - iwildmatch (via ls-files): match '[ --]' '$'
 
 expecting success: 
-		check_warning "$crlfwarn" ${pfx}_CRLF.err
-	
-ok 135 - commit NNO files attr= aeol=crlf crlf=false CRLF
+			test-tool wildmatch pathmatch '$' '[ --]'
+		
+ok 1117 - pathmatch: match '$' '[ --]'
 
 expecting success: 
-		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
-	
-ok 136 - commit NNO files attr= aeol=crlf crlf=false CRLF_mix_LF
+				printf '%s' '$' >expect &&
+				git ls-files -z -- '[ --]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1118 - pathmatch (via ls-files): match '[ --]' '$'
 
 expecting success: 
-		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
-	
-ok 137 - commit NNO files attr= aeol=crlf crlf=false LF_mix_cr
+			test-tool wildmatch ipathmatch '$' '[ --]'
+		
+ok 1119 - ipathmatch: match '$' '[ --]'
 
 expecting success: 
-		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
-	
-ok 138 - commit NNO files attr= aeol=crlf crlf=false CRLF_nul
+				printf '%s' '$' >expect &&
+				git --icase-pathspecs ls-files -z -- '[ --]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1120 - ipathmatch (via ls-files): match '[ --]' '$'
 
 expecting success: 
-		check_warning "$lfwarn" ${pfx}_LF.err
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
 	
-ok 139 - commit NNO files crlf=false attr=auto LF
+Removing $
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1121 - cleanup after previous file test
 
 expecting success: 
-		check_warning "$crlfwarn" ${pfx}_CRLF.err
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
 	
-ok 140 - commit NNO files attr=auto aeol=lf crlf=false CRLF
+ok 1122 - setup match file test for -
 
 expecting success: 
-		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
-	
-ok 141 - commit NNO files attr=auto aeol=lf crlf=false CRLF_mix_LF
+			test-tool wildmatch wildmatch '-' '[ --]'
+		
+ok 1123 - wildmatch: match '-' '[ --]'
 
 expecting success: 
-		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
-	
-ok 142 - commit NNO files attr=auto aeol=lf crlf=false LF_mix_cr
+				printf '%s' '-' >expect &&
+				git --glob-pathspecs ls-files -z -- '[ --]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1124 - wildmatch (via ls-files): match '[ --]' '-'
 
 expecting success: 
-		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
-	
-ok 143 - commit NNO files attr=auto aeol=lf crlf=false CRLF_nul
+			test-tool wildmatch iwildmatch '-' '[ --]'
+		
+ok 1125 - iwildmatch: match '-' '[ --]'
 
 expecting success: 
-		check_warning "$lfwarn" ${pfx}_LF.err
-	
-ok 144 - commit NNO files crlf=false attr=auto LF
+				printf '%s' '-' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[ --]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1126 - iwildmatch (via ls-files): match '[ --]' '-'
 
 expecting success: 
-		check_warning "$crlfwarn" ${pfx}_CRLF.err
-	
-ok 145 - commit NNO files attr=auto aeol=crlf crlf=false CRLF
+			test-tool wildmatch pathmatch '-' '[ --]'
+		
+ok 1127 - pathmatch: match '-' '[ --]'
 
 expecting success: 
-		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
-	
-ok 146 - commit NNO files attr=auto aeol=crlf crlf=false CRLF_mix_LF
+				printf '%s' '-' >expect &&
+				git ls-files -z -- '[ --]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1128 - pathmatch (via ls-files): match '[ --]' '-'
 
 expecting success: 
-		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
-	
-ok 147 - commit NNO files attr=auto aeol=crlf crlf=false LF_mix_cr
+			test-tool wildmatch ipathmatch '-' '[ --]'
+		
+ok 1129 - ipathmatch: match '-' '[ --]'
 
 expecting success: 
-		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
-	
-ok 148 - commit NNO files attr=auto aeol=crlf crlf=false CRLF_nul
+				printf '%s' '-' >expect &&
+				git --icase-pathspecs ls-files -z -- '[ --]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1130 - ipathmatch (via ls-files): match '[ --]' '-'
 
 expecting success: 
-		check_warning "$lfwarn" ${pfx}_LF.err
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
 	
-ok 149 - commit NNO files crlf=false attr=text LF
+Removing -
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1131 - cleanup after previous file test
 
 expecting success: 
-		check_warning "$crlfwarn" ${pfx}_CRLF.err
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
 	
-ok 150 - commit NNO files attr=text aeol=lf crlf=false CRLF
+ok 1132 - setup match file test for 0
 
 expecting success: 
-		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
-	
-ok 151 - commit NNO files attr=text aeol=lf crlf=false CRLF_mix_LF
+			test_must_fail test-tool wildmatch wildmatch '0' '[ --]'
+		
+ok 1133 - wildmatch: no match '0' '[ --]'
 
 expecting success: 
-		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
-	
-ok 152 - commit NNO files attr=text aeol=lf crlf=false LF_mix_cr
+				>expect &&
+				git --glob-pathspecs ls-files -z -- '[ --]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1134 - wildmatch (via ls-files): no match '[ --]' '0'
 
 expecting success: 
-		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
-	
-ok 153 - commit NNO files attr=text aeol=lf crlf=false CRLF_nul
+			test_must_fail test-tool wildmatch iwildmatch '0' '[ --]'
+		
+ok 1135 - iwildmatch: no match '0' '[ --]'
 
 expecting success: 
-		check_warning "$lfwarn" ${pfx}_LF.err
-	
-ok 154 - commit NNO files crlf=false attr=text LF
+				>expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[ --]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1136 - iwildmatch (via ls-files): no match '[ --]' '0'
 
 expecting success: 
-		check_warning "$crlfwarn" ${pfx}_CRLF.err
-	
-ok 155 - commit NNO files attr=text aeol=crlf crlf=false CRLF
+			test_must_fail test-tool wildmatch pathmatch '0' '[ --]'
+		
+ok 1137 - pathmatch: no match '0' '[ --]'
 
 expecting success: 
-		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
-	
-ok 156 - commit NNO files attr=text aeol=crlf crlf=false CRLF_mix_LF
+				>expect &&
+				git ls-files -z -- '[ --]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1138 - pathmatch (via ls-files): no match '[ --]' '0'
 
 expecting success: 
-		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
-	
-ok 157 - commit NNO files attr=text aeol=crlf crlf=false LF_mix_cr
+			test_must_fail test-tool wildmatch ipathmatch '0' '[ --]'
+		
+ok 1139 - ipathmatch: no match '0' '[ --]'
 
 expecting success: 
-		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
-	
-ok 158 - commit NNO files attr=text aeol=crlf crlf=false CRLF_nul
+				>expect &&
+				git --icase-pathspecs ls-files -z -- '[ --]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1140 - ipathmatch (via ls-files): no match '[ --]' '0'
 
 expecting success: 
-		check_warning "$lfwarn" ${pfx}_LF.err
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
 	
-ok 159 - commit NNO files crlf=input attr=-text LF
+Removing 0
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1141 - cleanup after previous file test
 
 expecting success: 
-		check_warning "$crlfwarn" ${pfx}_CRLF.err
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
 	
-ok 160 - commit NNO files attr=-text aeol= crlf=input CRLF
+ok 1142 - setup match file test for -
 
 expecting success: 
-		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
-	
-ok 161 - commit NNO files attr=-text aeol= crlf=input CRLF_mix_LF
+			test-tool wildmatch wildmatch '-' '[---]'
+		
+ok 1143 - wildmatch: match '-' '[---]'
 
 expecting success: 
-		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
-	
-ok 162 - commit NNO files attr=-text aeol= crlf=input LF_mix_cr
+				printf '%s' '-' >expect &&
+				git --glob-pathspecs ls-files -z -- '[---]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1144 - wildmatch (via ls-files): match '[---]' '-'
 
 expecting success: 
-		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
-	
-ok 163 - commit NNO files attr=-text aeol= crlf=input CRLF_nul
+			test-tool wildmatch iwildmatch '-' '[---]'
+		
+ok 1145 - iwildmatch: match '-' '[---]'
 
 expecting success: 
-		check_warning "$lfwarn" ${pfx}_LF.err
-	
-ok 164 - commit NNO files crlf=input attr=-text LF
+				printf '%s' '-' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[---]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1146 - iwildmatch (via ls-files): match '[---]' '-'
 
 expecting success: 
-		check_warning "$crlfwarn" ${pfx}_CRLF.err
-	
-ok 165 - commit NNO files attr=-text aeol=lf crlf=input CRLF
+			test-tool wildmatch pathmatch '-' '[---]'
+		
+ok 1147 - pathmatch: match '-' '[---]'
 
 expecting success: 
-		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
-	
-ok 166 - commit NNO files attr=-text aeol=lf crlf=input CRLF_mix_LF
+				printf '%s' '-' >expect &&
+				git ls-files -z -- '[---]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1148 - pathmatch (via ls-files): match '[---]' '-'
 
 expecting success: 
-		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
-	
-ok 167 - commit NNO files attr=-text aeol=lf crlf=input LF_mix_cr
+			test-tool wildmatch ipathmatch '-' '[---]'
+		
+ok 1149 - ipathmatch: match '-' '[---]'
 
 expecting success: 
-		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
-	
-ok 168 - commit NNO files attr=-text aeol=lf crlf=input CRLF_nul
+				printf '%s' '-' >expect &&
+				git --icase-pathspecs ls-files -z -- '[---]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1150 - ipathmatch (via ls-files): match '[---]' '-'
 
 expecting success: 
-		check_warning "$lfwarn" ${pfx}_LF.err
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
 	
-ok 169 - commit NNO files crlf=input attr=-text LF
+Removing -
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1151 - cleanup after previous file test
 
 expecting success: 
-		check_warning "$crlfwarn" ${pfx}_CRLF.err
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
 	
-ok 170 - commit NNO files attr=-text aeol=crlf crlf=input CRLF
+ok 1152 - setup match file test for -
 
 expecting success: 
-		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
-	
-ok 171 - commit NNO files attr=-text aeol=crlf crlf=input CRLF_mix_LF
+			test-tool wildmatch wildmatch '-' '[------]'
+		
+ok 1153 - wildmatch: match '-' '[------]'
 
 expecting success: 
-		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
-	
-ok 172 - commit NNO files attr=-text aeol=crlf crlf=input LF_mix_cr
+				printf '%s' '-' >expect &&
+				git --glob-pathspecs ls-files -z -- '[------]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1154 - wildmatch (via ls-files): match '[------]' '-'
 
 expecting success: 
-		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
-	
-ok 173 - commit NNO files attr=-text aeol=crlf crlf=input CRLF_nul
+			test-tool wildmatch iwildmatch '-' '[------]'
+		
+ok 1155 - iwildmatch: match '-' '[------]'
 
 expecting success: 
-		check_warning "$lfwarn" ${pfx}_LF.err
-	
-ok 174 - commit NNO files crlf=input attr= LF
+				printf '%s' '-' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[------]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1156 - iwildmatch (via ls-files): match '[------]' '-'
 
 expecting success: 
-		check_warning "$crlfwarn" ${pfx}_CRLF.err
-	
-ok 175 - commit NNO files attr= aeol=lf crlf=input CRLF
+			test-tool wildmatch pathmatch '-' '[------]'
+		
+ok 1157 - pathmatch: match '-' '[------]'
 
 expecting success: 
-		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
-	
-ok 176 - commit NNO files attr= aeol=lf crlf=input CRLF_mix_LF
+				printf '%s' '-' >expect &&
+				git ls-files -z -- '[------]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1158 - pathmatch (via ls-files): match '[------]' '-'
 
 expecting success: 
-		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
-	
-ok 177 - commit NNO files attr= aeol=lf crlf=input LF_mix_cr
+			test-tool wildmatch ipathmatch '-' '[------]'
+		
+ok 1159 - ipathmatch: match '-' '[------]'
 
 expecting success: 
-		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
-	
-ok 178 - commit NNO files attr= aeol=lf crlf=input CRLF_nul
+				printf '%s' '-' >expect &&
+				git --icase-pathspecs ls-files -z -- '[------]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1160 - ipathmatch (via ls-files): match '[------]' '-'
 
 expecting success: 
-		check_warning "$lfwarn" ${pfx}_LF.err
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
 	
-ok 179 - commit NNO files crlf=input attr= LF
+Removing -
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1161 - cleanup after previous file test
 
 expecting success: 
-		check_warning "$crlfwarn" ${pfx}_CRLF.err
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
 	
-ok 180 - commit NNO files attr= aeol=crlf crlf=input CRLF
+ok 1162 - setup match file test for j
 
 expecting success: 
-		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
-	
-ok 181 - commit NNO files attr= aeol=crlf crlf=input CRLF_mix_LF
+			test_must_fail test-tool wildmatch wildmatch 'j' '[a-e-n]'
+		
+ok 1163 - wildmatch: no match 'j' '[a-e-n]'
 
 expecting success: 
-		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
-	
-ok 182 - commit NNO files attr= aeol=crlf crlf=input LF_mix_cr
+				>expect &&
+				git --glob-pathspecs ls-files -z -- '[a-e-n]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1164 - wildmatch (via ls-files): no match '[a-e-n]' 'j'
 
 expecting success: 
-		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
-	
-ok 183 - commit NNO files attr= aeol=crlf crlf=input CRLF_nul
+			test_must_fail test-tool wildmatch iwildmatch 'j' '[a-e-n]'
+		
+ok 1165 - iwildmatch: no match 'j' '[a-e-n]'
 
 expecting success: 
-		check_warning "$lfwarn" ${pfx}_LF.err
-	
-ok 184 - commit NNO files crlf=input attr=auto LF
+				>expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[a-e-n]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1166 - iwildmatch (via ls-files): no match '[a-e-n]' 'j'
 
 expecting success: 
-		check_warning "$crlfwarn" ${pfx}_CRLF.err
-	
-ok 185 - commit NNO files attr=auto aeol=lf crlf=input CRLF
+			test_must_fail test-tool wildmatch pathmatch 'j' '[a-e-n]'
+		
+ok 1167 - pathmatch: no match 'j' '[a-e-n]'
 
 expecting success: 
-		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
-	
-ok 186 - commit NNO files attr=auto aeol=lf crlf=input CRLF_mix_LF
+				>expect &&
+				git ls-files -z -- '[a-e-n]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1168 - pathmatch (via ls-files): no match '[a-e-n]' 'j'
 
 expecting success: 
-		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
-	
-ok 187 - commit NNO files attr=auto aeol=lf crlf=input LF_mix_cr
+			test_must_fail test-tool wildmatch ipathmatch 'j' '[a-e-n]'
+		
+ok 1169 - ipathmatch: no match 'j' '[a-e-n]'
 
 expecting success: 
-		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
-	
-ok 188 - commit NNO files attr=auto aeol=lf crlf=input CRLF_nul
+				>expect &&
+				git --icase-pathspecs ls-files -z -- '[a-e-n]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1170 - ipathmatch (via ls-files): no match '[a-e-n]' 'j'
 
 expecting success: 
-		check_warning "$lfwarn" ${pfx}_LF.err
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
 	
-ok 189 - commit NNO files crlf=input attr=auto LF
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+Removing j
+ok 1171 - cleanup after previous file test
 
 expecting success: 
-		check_warning "$crlfwarn" ${pfx}_CRLF.err
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
 	
-ok 190 - commit NNO files attr=auto aeol=crlf crlf=input CRLF
+ok 1172 - setup match file test for -
 
 expecting success: 
-		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
-	
-ok 191 - commit NNO files attr=auto aeol=crlf crlf=input CRLF_mix_LF
+			test-tool wildmatch wildmatch '-' '[a-e-n]'
+		
+ok 1173 - wildmatch: match '-' '[a-e-n]'
 
 expecting success: 
-		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
-	
-ok 192 - commit NNO files attr=auto aeol=crlf crlf=input LF_mix_cr
+				printf '%s' '-' >expect &&
+				git --glob-pathspecs ls-files -z -- '[a-e-n]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1174 - wildmatch (via ls-files): match '[a-e-n]' '-'
 
 expecting success: 
-		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
-	
-ok 193 - commit NNO files attr=auto aeol=crlf crlf=input CRLF_nul
+			test-tool wildmatch iwildmatch '-' '[a-e-n]'
+		
+ok 1175 - iwildmatch: match '-' '[a-e-n]'
 
 expecting success: 
-		check_warning "$lfwarn" ${pfx}_LF.err
-	
-ok 194 - commit NNO files crlf=input attr=text LF
+				printf '%s' '-' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[a-e-n]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1176 - iwildmatch (via ls-files): match '[a-e-n]' '-'
 
 expecting success: 
-		check_warning "$crlfwarn" ${pfx}_CRLF.err
-	
-ok 195 - commit NNO files attr=text aeol=lf crlf=input CRLF
+			test-tool wildmatch pathmatch '-' '[a-e-n]'
+		
+ok 1177 - pathmatch: match '-' '[a-e-n]'
 
 expecting success: 
-		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
-	
-ok 196 - commit NNO files attr=text aeol=lf crlf=input CRLF_mix_LF
+				printf '%s' '-' >expect &&
+				git ls-files -z -- '[a-e-n]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1178 - pathmatch (via ls-files): match '[a-e-n]' '-'
 
 expecting success: 
-		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
-	
-ok 197 - commit NNO files attr=text aeol=lf crlf=input LF_mix_cr
+			test-tool wildmatch ipathmatch '-' '[a-e-n]'
+		
+ok 1179 - ipathmatch: match '-' '[a-e-n]'
 
 expecting success: 
-		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
-	
-ok 198 - commit NNO files attr=text aeol=lf crlf=input CRLF_nul
+				printf '%s' '-' >expect &&
+				git --icase-pathspecs ls-files -z -- '[a-e-n]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1180 - ipathmatch (via ls-files): match '[a-e-n]' '-'
 
 expecting success: 
-		check_warning "$lfwarn" ${pfx}_LF.err
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
 	
-ok 199 - commit NNO files crlf=input attr=text LF
+Removing -
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1181 - cleanup after previous file test
 
 expecting success: 
-		check_warning "$crlfwarn" ${pfx}_CRLF.err
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
 	
-ok 200 - commit NNO files attr=text aeol=crlf crlf=input CRLF
+ok 1182 - setup match file test for a
 
 expecting success: 
-		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
-	
-ok 201 - commit NNO files attr=text aeol=crlf crlf=input CRLF_mix_LF
+			test-tool wildmatch wildmatch 'a' '[!------]'
+		
+ok 1183 - wildmatch: match 'a' '[!------]'
 
 expecting success: 
-		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
-	
-ok 202 - commit NNO files attr=text aeol=crlf crlf=input LF_mix_cr
+				printf '%s' 'a' >expect &&
+				git --glob-pathspecs ls-files -z -- '[!------]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1184 - wildmatch (via ls-files): match '[!------]' 'a'
 
 expecting success: 
-		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
-	
-ok 203 - commit NNO files attr=text aeol=crlf crlf=input CRLF_nul
+			test-tool wildmatch iwildmatch 'a' '[!------]'
+		
+ok 1185 - iwildmatch: match 'a' '[!------]'
 
 expecting success: 
-		check_warning "$lfwarn" ${pfx}_LF.err
-	
-ok 204 - commit NNO files crlf=false attr=text LF
+				printf '%s' 'a' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[!------]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1186 - iwildmatch (via ls-files): match '[!------]' 'a'
 
 expecting success: 
-		check_warning "$crlfwarn" ${pfx}_CRLF.err
-	
-ok 205 - commit NNO files attr=text aeol= crlf=false CRLF
+			test-tool wildmatch pathmatch 'a' '[!------]'
+		
+ok 1187 - pathmatch: match 'a' '[!------]'
 
 expecting success: 
-		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
-	
-ok 206 - commit NNO files attr=text aeol= crlf=false CRLF_mix_LF
+				printf '%s' 'a' >expect &&
+				git ls-files -z -- '[!------]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1188 - pathmatch (via ls-files): match '[!------]' 'a'
 
 expecting success: 
-		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
-	
-ok 207 - commit NNO files attr=text aeol= crlf=false LF_mix_cr
+			test-tool wildmatch ipathmatch 'a' '[!------]'
+		
+ok 1189 - ipathmatch: match 'a' '[!------]'
 
 expecting success: 
-		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
-	
-ok 208 - commit NNO files attr=text aeol= crlf=false CRLF_nul
+				printf '%s' 'a' >expect &&
+				git --icase-pathspecs ls-files -z -- '[!------]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1190 - ipathmatch (via ls-files): match '[!------]' 'a'
 
 expecting success: 
-		check_warning "$lfwarn" ${pfx}_LF.err
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
 	
-ok 209 - commit NNO files crlf=true attr=text LF
+Removing a
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1191 - cleanup after previous file test
 
 expecting success: 
-		check_warning "$crlfwarn" ${pfx}_CRLF.err
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
 	
-ok 210 - commit NNO files attr=text aeol= crlf=true CRLF
+ok 1192 - setup match file test for [
 
 expecting success: 
-		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
-	
-ok 211 - commit NNO files attr=text aeol= crlf=true CRLF_mix_LF
+			test_must_fail test-tool wildmatch wildmatch '[' '[]-a]'
+		
+ok 1193 - wildmatch: no match '[' '[]-a]'
 
 expecting success: 
-		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
-	
-ok 212 - commit NNO files attr=text aeol= crlf=true LF_mix_cr
+				>expect &&
+				git --glob-pathspecs ls-files -z -- '[]-a]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1194 - wildmatch (via ls-files): no match '[]-a]' '['
 
 expecting success: 
-		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
-	
-ok 213 - commit NNO files attr=text aeol= crlf=true CRLF_nul
+			test_must_fail test-tool wildmatch iwildmatch '[' '[]-a]'
+		
+ok 1195 - iwildmatch: no match '[' '[]-a]'
 
 expecting success: 
-		check_warning "$lfwarn" ${pfx}_LF.err
-	
-ok 214 - commit NNO files crlf=input attr=text LF
+				>expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[]-a]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1196 - iwildmatch (via ls-files): no match '[]-a]' '['
 
 expecting success: 
-		check_warning "$crlfwarn" ${pfx}_CRLF.err
-	
-ok 215 - commit NNO files attr=text aeol= crlf=input CRLF
+			test_must_fail test-tool wildmatch pathmatch '[' '[]-a]'
+		
+ok 1197 - pathmatch: no match '[' '[]-a]'
 
 expecting success: 
-		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
-	
-ok 216 - commit NNO files attr=text aeol= crlf=input CRLF_mix_LF
+				>expect &&
+				git ls-files -z -- '[]-a]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1198 - pathmatch (via ls-files): no match '[]-a]' '['
 
 expecting success: 
-		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
-	
-ok 217 - commit NNO files attr=text aeol= crlf=input LF_mix_cr
+			test_must_fail test-tool wildmatch ipathmatch '[' '[]-a]'
+		
+ok 1199 - ipathmatch: no match '[' '[]-a]'
 
 expecting success: 
-		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
-	
-ok 218 - commit NNO files attr=text aeol= crlf=input CRLF_nul
+				>expect &&
+				git --icase-pathspecs ls-files -z -- '[]-a]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1200 - ipathmatch (via ls-files): no match '[]-a]' '['
 
 expecting success: 
-	git commit -m "commit files on top of NNO" &&
-	rm -f *.txt &&
-	git -c core.autocrlf=false reset --hard
-
-[master 3a6b7a5] commit files on top of NNO
- Author: A U Thor <author@example.com>
- 210 files changed, 332 insertions(+), 362 deletions(-)
-HEAD is now at 3a6b7a5 commit files on top of NNO
-ok 219 - commit NNO and cleanup
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing [
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1201 - cleanup after previous file test
 
 expecting success: 
-	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 220 - commit empty gitattribues
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 1202 - setup match file test for ^
 
 expecting success: 
-	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 221 - commit text=auto
+			test-tool wildmatch wildmatch '^' '[]-a]'
+		
+ok 1203 - wildmatch: match '^' '[]-a]'
 
 expecting success: 
-	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 222 - commit text
+				printf '%s' '^' >expect &&
+				git --glob-pathspecs ls-files -z -- '[]-a]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1204 - wildmatch (via ls-files): match '[]-a]' '^'
 
 expecting success: 
-	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 223 - commit -text
+			test-tool wildmatch iwildmatch '^' '[]-a]'
+		
+ok 1205 - iwildmatch: match '^' '[]-a]'
 
 expecting success: 
-		compare_files $lfname ${pfx}_LF.txt
-	
-ok 224 - compare_files LF NNO_attr__aeol__true_LF.txt
+				printf '%s' '^' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[]-a]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1206 - iwildmatch (via ls-files): match '[]-a]' '^'
 
 expecting success: 
-		compare_files $crlfname ${pfx}_CRLF.txt
-	
-ok 225 - compare_files CRLF NNO_attr__aeol__true_CRLF.txt
+			test-tool wildmatch pathmatch '^' '[]-a]'
+		
+ok 1207 - pathmatch: match '^' '[]-a]'
 
 expecting success: 
-		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
-	
-ok 226 - compare_files CRLF_mix_LF NNO_attr__aeol__true_CRLF_mix_LF.txt
+				printf '%s' '^' >expect &&
+				git ls-files -z -- '[]-a]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1208 - pathmatch (via ls-files): match '[]-a]' '^'
 
 expecting success: 
-		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
-	
-ok 227 - compare_files LF_mix_CR NNO_attr__aeol__true_LF_mix_CR.txt
+			test-tool wildmatch ipathmatch '^' '[]-a]'
+		
+ok 1209 - ipathmatch: match '^' '[]-a]'
 
 expecting success: 
-		compare_files $crlfnul ${pfx}_CRLF_nul.txt
-	
-ok 228 - compare_files CRLF_nul NNO_attr__aeol__true_CRLF_nul.txt
+				printf '%s' '^' >expect &&
+				git --icase-pathspecs ls-files -z -- '[]-a]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1210 - ipathmatch (via ls-files): match '[]-a]' '^'
 
 expecting success: 
-		compare_files $lfname ${pfx}_LF.txt
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
 	
-ok 229 - compare_files LF NNO_attr_-text_aeol__true_LF.txt
+Removing ^
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1211 - cleanup after previous file test
 
 expecting success: 
-		compare_files $crlfname ${pfx}_CRLF.txt
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
 	
-ok 230 - compare_files CRLF NNO_attr_-text_aeol__true_CRLF.txt
+ok 1212 - setup match file test for ^
 
 expecting success: 
-		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
-	
-ok 231 - compare_files CRLF_mix_LF NNO_attr_-text_aeol__true_CRLF_mix_LF.txt
+			test_must_fail test-tool wildmatch wildmatch '^' '[!]-a]'
+		
+ok 1213 - wildmatch: no match '^' '[!]-a]'
 
 expecting success: 
-		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
-	
-ok 232 - compare_files LF_mix_CR NNO_attr_-text_aeol__true_LF_mix_CR.txt
+				>expect &&
+				git --glob-pathspecs ls-files -z -- '[!]-a]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1214 - wildmatch (via ls-files): no match '[!]-a]' '^'
 
 expecting success: 
-		compare_files $crlfnul ${pfx}_CRLF_nul.txt
-	
-ok 233 - compare_files CRLF_nul NNO_attr_-text_aeol__true_CRLF_nul.txt
+			test_must_fail test-tool wildmatch iwildmatch '^' '[!]-a]'
+		
+ok 1215 - iwildmatch: no match '^' '[!]-a]'
 
 expecting success: 
-		compare_files $lfname ${pfx}_LF.txt
-	
-ok 234 - compare_files LF NNO_attr_-text_aeol_lf_true_LF.txt
+				>expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[!]-a]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1216 - iwildmatch (via ls-files): no match '[!]-a]' '^'
 
 expecting success: 
-		compare_files $crlfname ${pfx}_CRLF.txt
-	
-ok 235 - compare_files CRLF NNO_attr_-text_aeol_lf_true_CRLF.txt
+			test_must_fail test-tool wildmatch pathmatch '^' '[!]-a]'
+		
+ok 1217 - pathmatch: no match '^' '[!]-a]'
 
 expecting success: 
-		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
-	
-ok 236 - compare_files CRLF_mix_LF NNO_attr_-text_aeol_lf_true_CRLF_mix_LF.txt
+				>expect &&
+				git ls-files -z -- '[!]-a]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1218 - pathmatch (via ls-files): no match '[!]-a]' '^'
 
 expecting success: 
-		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
-	
-ok 237 - compare_files LF_mix_CR NNO_attr_-text_aeol_lf_true_LF_mix_CR.txt
+			test_must_fail test-tool wildmatch ipathmatch '^' '[!]-a]'
+		
+ok 1219 - ipathmatch: no match '^' '[!]-a]'
 
 expecting success: 
-		compare_files $crlfnul ${pfx}_CRLF_nul.txt
-	
-ok 238 - compare_files CRLF_nul NNO_attr_-text_aeol_lf_true_CRLF_nul.txt
+				>expect &&
+				git --icase-pathspecs ls-files -z -- '[!]-a]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1220 - ipathmatch (via ls-files): no match '[!]-a]' '^'
 
 expecting success: 
-		compare_files $lfname ${pfx}_LF.txt
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
 	
-ok 239 - compare_files LF NNO_attr_-text_aeol_crlf_true_LF.txt
+Removing ^
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1221 - cleanup after previous file test
 
 expecting success: 
-		compare_files $crlfname ${pfx}_CRLF.txt
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
 	
-ok 240 - compare_files CRLF NNO_attr_-text_aeol_crlf_true_CRLF.txt
+ok 1222 - setup match file test for [
 
 expecting success: 
-		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
-	
-ok 241 - compare_files CRLF_mix_LF NNO_attr_-text_aeol_crlf_true_CRLF_mix_LF.txt
+			test-tool wildmatch wildmatch '[' '[!]-a]'
+		
+ok 1223 - wildmatch: match '[' '[!]-a]'
 
 expecting success: 
-		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
-	
-ok 242 - compare_files LF_mix_CR NNO_attr_-text_aeol_crlf_true_LF_mix_CR.txt
+				printf '%s' '[' >expect &&
+				git --glob-pathspecs ls-files -z -- '[!]-a]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1224 - wildmatch (via ls-files): match '[!]-a]' '['
 
 expecting success: 
-		compare_files $crlfnul ${pfx}_CRLF_nul.txt
-	
-ok 243 - compare_files CRLF_nul NNO_attr_-text_aeol_crlf_true_CRLF_nul.txt
+			test-tool wildmatch iwildmatch '[' '[!]-a]'
+		
+ok 1225 - iwildmatch: match '[' '[!]-a]'
 
 expecting success: 
-		compare_files $lfname ${pfx}_LF.txt
-	
-ok 244 - compare_files LF NNO_attr_auto_aeol__true_LF.txt
+				printf '%s' '[' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[!]-a]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1226 - iwildmatch (via ls-files): match '[!]-a]' '['
 
 expecting success: 
-		compare_files $crlfname ${pfx}_CRLF.txt
-	
-ok 245 - compare_files CRLF NNO_attr_auto_aeol__true_CRLF.txt
+			test-tool wildmatch pathmatch '[' '[!]-a]'
+		
+ok 1227 - pathmatch: match '[' '[!]-a]'
 
 expecting success: 
-		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
-	
-ok 246 - compare_files CRLF_mix_LF NNO_attr_auto_aeol__true_CRLF_mix_LF.txt
+				printf '%s' '[' >expect &&
+				git ls-files -z -- '[!]-a]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1228 - pathmatch (via ls-files): match '[!]-a]' '['
 
 expecting success: 
-		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
-	
-ok 247 - compare_files LF_mix_CR NNO_attr_auto_aeol__true_LF_mix_CR.txt
+			test-tool wildmatch ipathmatch '[' '[!]-a]'
+		
+ok 1229 - ipathmatch: match '[' '[!]-a]'
 
 expecting success: 
-		compare_files $crlfnul ${pfx}_CRLF_nul.txt
-	
-ok 248 - compare_files CRLF_nul NNO_attr_auto_aeol__true_CRLF_nul.txt
+				printf '%s' '[' >expect &&
+				git --icase-pathspecs ls-files -z -- '[!]-a]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1230 - ipathmatch (via ls-files): match '[!]-a]' '['
 
 expecting success: 
-		compare_files $lfname ${pfx}_LF.txt
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
 	
-ok 249 - compare_files LF NNO_attr_auto_aeol_lf_true_LF.txt
+Removing [
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1231 - cleanup after previous file test
 
 expecting success: 
-		compare_files $crlfname ${pfx}_CRLF.txt
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
 	
-ok 250 - compare_files CRLF NNO_attr_auto_aeol_lf_true_CRLF.txt
+ok 1232 - setup match file test for ^
 
 expecting success: 
-		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
-	
-ok 251 - compare_files CRLF_mix_LF NNO_attr_auto_aeol_lf_true_CRLF_mix_LF.txt
+			test-tool wildmatch wildmatch '^' '[a^bc]'
+		
+ok 1233 - wildmatch: match '^' '[a^bc]'
 
 expecting success: 
-		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
-	
-ok 252 - compare_files LF_mix_CR NNO_attr_auto_aeol_lf_true_LF_mix_CR.txt
+				printf '%s' '^' >expect &&
+				git --glob-pathspecs ls-files -z -- '[a^bc]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1234 - wildmatch (via ls-files): match '[a^bc]' '^'
 
 expecting success: 
-		compare_files $crlfnul ${pfx}_CRLF_nul.txt
-	
-ok 253 - compare_files CRLF_nul NNO_attr_auto_aeol_lf_true_CRLF_nul.txt
+			test-tool wildmatch iwildmatch '^' '[a^bc]'
+		
+ok 1235 - iwildmatch: match '^' '[a^bc]'
 
 expecting success: 
-		compare_files $lfname ${pfx}_LF.txt
-	
-ok 254 - compare_files LF NNO_attr_auto_aeol_crlf_true_LF.txt
+				printf '%s' '^' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[a^bc]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1236 - iwildmatch (via ls-files): match '[a^bc]' '^'
 
 expecting success: 
-		compare_files $crlfname ${pfx}_CRLF.txt
-	
-ok 255 - compare_files CRLF NNO_attr_auto_aeol_crlf_true_CRLF.txt
+			test-tool wildmatch pathmatch '^' '[a^bc]'
+		
+ok 1237 - pathmatch: match '^' '[a^bc]'
 
 expecting success: 
-		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
-	
-ok 256 - compare_files CRLF_mix_LF NNO_attr_auto_aeol_crlf_true_CRLF_mix_LF.txt
+				printf '%s' '^' >expect &&
+				git ls-files -z -- '[a^bc]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1238 - pathmatch (via ls-files): match '[a^bc]' '^'
 
 expecting success: 
-		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
-	
-ok 257 - compare_files LF_mix_CR NNO_attr_auto_aeol_crlf_true_LF_mix_CR.txt
+			test-tool wildmatch ipathmatch '^' '[a^bc]'
+		
+ok 1239 - ipathmatch: match '^' '[a^bc]'
 
 expecting success: 
-		compare_files $crlfnul ${pfx}_CRLF_nul.txt
-	
-ok 258 - compare_files CRLF_nul NNO_attr_auto_aeol_crlf_true_CRLF_nul.txt
+				printf '%s' '^' >expect &&
+				git --icase-pathspecs ls-files -z -- '[a^bc]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1240 - ipathmatch (via ls-files): match '[a^bc]' '^'
 
 expecting success: 
-		compare_files $lfname ${pfx}_LF.txt
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
 	
-ok 259 - compare_files LF NNO_attr_text_aeol__true_LF.txt
+Removing ^
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1241 - cleanup after previous file test
 
 expecting success: 
-		compare_files $crlfname ${pfx}_CRLF.txt
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
 	
-ok 260 - compare_files LF NNO_attr_text_aeol__true_CRLF.txt
+ok 1242 - setup match file test for -b]
 
 expecting success: 
-		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
-	
-ok 261 - compare_files LF NNO_attr_text_aeol__true_CRLF_mix_LF.txt
+			test-tool wildmatch wildmatch '-b]' '[a-]b]'
+		
+ok 1243 - wildmatch: match '-b]' '[a-]b]'
 
 expecting success: 
-		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
-	
-ok 262 - compare_files LF_mix_CR NNO_attr_text_aeol__true_LF_mix_CR.txt
+				printf '%s' '-b]' >expect &&
+				git --glob-pathspecs ls-files -z -- '[a-]b]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1244 - wildmatch (via ls-files): match '[a-]b]' '-b]'
 
 expecting success: 
-		compare_files $crlfnul ${pfx}_CRLF_nul.txt
-	
-ok 263 - compare_files LF_nul NNO_attr_text_aeol__true_CRLF_nul.txt
+			test-tool wildmatch iwildmatch '-b]' '[a-]b]'
+		
+ok 1245 - iwildmatch: match '-b]' '[a-]b]'
 
 expecting success: 
-		compare_files $lfname ${pfx}_LF.txt
-	
-ok 264 - compare_files LF NNO_attr_text_aeol_lf_true_LF.txt
+				printf '%s' '-b]' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[a-]b]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1246 - iwildmatch (via ls-files): match '[a-]b]' '-b]'
 
 expecting success: 
-		compare_files $crlfname ${pfx}_CRLF.txt
-	
-ok 265 - compare_files LF NNO_attr_text_aeol_lf_true_CRLF.txt
+			test-tool wildmatch pathmatch '-b]' '[a-]b]'
+		
+ok 1247 - pathmatch: match '-b]' '[a-]b]'
 
 expecting success: 
-		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
-	
-ok 266 - compare_files LF NNO_attr_text_aeol_lf_true_CRLF_mix_LF.txt
+				printf '%s' '-b]' >expect &&
+				git ls-files -z -- '[a-]b]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1248 - pathmatch (via ls-files): match '[a-]b]' '-b]'
 
 expecting success: 
-		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
-	
-ok 267 - compare_files LF_mix_CR NNO_attr_text_aeol_lf_true_LF_mix_CR.txt
+			test-tool wildmatch ipathmatch '-b]' '[a-]b]'
+		
+ok 1249 - ipathmatch: match '-b]' '[a-]b]'
 
 expecting success: 
-		compare_files $crlfnul ${pfx}_CRLF_nul.txt
-	
-ok 268 - compare_files LF_nul NNO_attr_text_aeol_lf_true_CRLF_nul.txt
+				printf '%s' '-b]' >expect &&
+				git --icase-pathspecs ls-files -z -- '[a-]b]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1250 - ipathmatch (via ls-files): match '[a-]b]' '-b]'
 
 expecting success: 
-		compare_files $lfname ${pfx}_LF.txt
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
 	
-ok 269 - compare_files LF NNO_attr_text_aeol_crlf_true_LF.txt
+Removing -b]
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1251 - cleanup after previous file test
 
 expecting success: 
-		compare_files $crlfname ${pfx}_CRLF.txt
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
 	
-ok 270 - compare_files LF NNO_attr_text_aeol_crlf_true_CRLF.txt
+ok 1252 - setup match file test for \
 
 expecting success: 
-		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
-	
-ok 271 - compare_files LF NNO_attr_text_aeol_crlf_true_CRLF_mix_LF.txt
+			test_must_fail test-tool wildmatch wildmatch '\' '[\]'
+		
+ok 1253 - wildmatch: no match '\' '[\]'
 
 expecting success: 
-		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
-	
-ok 272 - compare_files LF_mix_CR NNO_attr_text_aeol_crlf_true_LF_mix_CR.txt
+				>expect &&
+				git --glob-pathspecs ls-files -z -- '[\]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1254 - wildmatch (via ls-files): no match '[\]' '\'
 
 expecting success: 
-		compare_files $crlfnul ${pfx}_CRLF_nul.txt
-	
-ok 273 - compare_files LF_nul NNO_attr_text_aeol_crlf_true_CRLF_nul.txt
+			test_must_fail test-tool wildmatch iwildmatch '\' '[\]'
+		
+ok 1255 - iwildmatch: no match '\' '[\]'
 
 expecting success: 
-		compare_files $lfname ${pfx}_LF.txt
-	
-ok 274 - compare_files LF NNO_attr__aeol__false_LF.txt
+				>expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[\]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1256 - iwildmatch (via ls-files): no match '[\]' '\'
 
 expecting success: 
-		compare_files $crlfname ${pfx}_CRLF.txt
-	
-ok 275 - compare_files CRLF NNO_attr__aeol__false_CRLF.txt
+			test_must_fail test-tool wildmatch pathmatch '\' '[\]'
+		
+ok 1257 - pathmatch: no match '\' '[\]'
 
 expecting success: 
-		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
-	
-ok 276 - compare_files CRLF_mix_LF NNO_attr__aeol__false_CRLF_mix_LF.txt
+				>expect &&
+				git ls-files -z -- '[\]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1258 - pathmatch (via ls-files): no match '[\]' '\'
 
 expecting success: 
-		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
-	
-ok 277 - compare_files LF_mix_CR NNO_attr__aeol__false_LF_mix_CR.txt
+			test_must_fail test-tool wildmatch ipathmatch '\' '[\]'
+		
+ok 1259 - ipathmatch: no match '\' '[\]'
 
 expecting success: 
-		compare_files $crlfnul ${pfx}_CRLF_nul.txt
-	
-ok 278 - compare_files CRLF_nul NNO_attr__aeol__false_CRLF_nul.txt
+				>expect &&
+				git --icase-pathspecs ls-files -z -- '[\]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1260 - ipathmatch (via ls-files): no match '[\]' '\'
 
 expecting success: 
-		compare_files $lfname ${pfx}_LF.txt
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
 	
-ok 279 - compare_files LF NNO_attr_-text_aeol__false_LF.txt
+Removing "\\"
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1261 - cleanup after previous file test
 
 expecting success: 
-		compare_files $crlfname ${pfx}_CRLF.txt
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
 	
-ok 280 - compare_files CRLF NNO_attr_-text_aeol__false_CRLF.txt
+ok 1262 - setup match file test for \
 
 expecting success: 
-		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
-	
-ok 281 - compare_files CRLF_mix_LF NNO_attr_-text_aeol__false_CRLF_mix_LF.txt
+			test-tool wildmatch wildmatch '\' '[\\]'
+		
+ok 1263 - wildmatch: match '\' '[\\]'
 
 expecting success: 
-		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
-	
-ok 282 - compare_files LF_mix_CR NNO_attr_-text_aeol__false_LF_mix_CR.txt
+				printf '%s' '\' >expect &&
+				git --glob-pathspecs ls-files -z -- '[\\]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1264 - wildmatch (via ls-files): match '[\\]' '\'
 
 expecting success: 
-		compare_files $crlfnul ${pfx}_CRLF_nul.txt
-	
-ok 283 - compare_files CRLF_nul NNO_attr_-text_aeol__false_CRLF_nul.txt
+			test-tool wildmatch iwildmatch '\' '[\\]'
+		
+ok 1265 - iwildmatch: match '\' '[\\]'
 
 expecting success: 
-		compare_files $lfname ${pfx}_LF.txt
-	
-ok 284 - compare_files LF NNO_attr_-text_aeol_lf_false_LF.txt
+				printf '%s' '\' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[\\]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1266 - iwildmatch (via ls-files): match '[\\]' '\'
 
 expecting success: 
-		compare_files $crlfname ${pfx}_CRLF.txt
-	
-ok 285 - compare_files CRLF NNO_attr_-text_aeol_lf_false_CRLF.txt
+			test-tool wildmatch pathmatch '\' '[\\]'
+		
+ok 1267 - pathmatch: match '\' '[\\]'
 
 expecting success: 
-		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
-	
-ok 286 - compare_files CRLF_mix_LF NNO_attr_-text_aeol_lf_false_CRLF_mix_LF.txt
+				printf '%s' '\' >expect &&
+				git ls-files -z -- '[\\]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1268 - pathmatch (via ls-files): match '[\\]' '\'
 
 expecting success: 
-		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
-	
-ok 287 - compare_files LF_mix_CR NNO_attr_-text_aeol_lf_false_LF_mix_CR.txt
+			test-tool wildmatch ipathmatch '\' '[\\]'
+		
+ok 1269 - ipathmatch: match '\' '[\\]'
 
 expecting success: 
-		compare_files $crlfnul ${pfx}_CRLF_nul.txt
-	
-ok 288 - compare_files CRLF_nul NNO_attr_-text_aeol_lf_false_CRLF_nul.txt
+				printf '%s' '\' >expect &&
+				git --icase-pathspecs ls-files -z -- '[\\]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1270 - ipathmatch (via ls-files): match '[\\]' '\'
 
 expecting success: 
-		compare_files $lfname ${pfx}_LF.txt
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
 	
-ok 289 - compare_files LF NNO_attr_-text_aeol_crlf_false_LF.txt
+Removing "\\"
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1271 - cleanup after previous file test
 
 expecting success: 
-		compare_files $crlfname ${pfx}_CRLF.txt
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
 	
-ok 290 - compare_files CRLF NNO_attr_-text_aeol_crlf_false_CRLF.txt
+ok 1272 - setup match file test for \
 
 expecting success: 
-		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
-	
-ok 291 - compare_files CRLF_mix_LF NNO_attr_-text_aeol_crlf_false_CRLF_mix_LF.txt
+			test_must_fail test-tool wildmatch wildmatch '\' '[!\\]'
+		
+ok 1273 - wildmatch: no match '\' '[!\\]'
 
 expecting success: 
-		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
-	
-ok 292 - compare_files LF_mix_CR NNO_attr_-text_aeol_crlf_false_LF_mix_CR.txt
+				>expect &&
+				git --glob-pathspecs ls-files -z -- '[!\\]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1274 - wildmatch (via ls-files): no match '[!\\]' '\'
 
 expecting success: 
-		compare_files $crlfnul ${pfx}_CRLF_nul.txt
-	
-ok 293 - compare_files CRLF_nul NNO_attr_-text_aeol_crlf_false_CRLF_nul.txt
+			test_must_fail test-tool wildmatch iwildmatch '\' '[!\\]'
+		
+ok 1275 - iwildmatch: no match '\' '[!\\]'
 
 expecting success: 
-		compare_files $lfname ${pfx}_LF.txt
-	
-ok 294 - compare_files LF NNO_attr_auto_aeol__false_LF.txt
+				>expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[!\\]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1276 - iwildmatch (via ls-files): no match '[!\\]' '\'
 
 expecting success: 
-		compare_files $crlfname ${pfx}_CRLF.txt
-	
-ok 295 - compare_files CRLF NNO_attr_auto_aeol__false_CRLF.txt
+			test_must_fail test-tool wildmatch pathmatch '\' '[!\\]'
+		
+ok 1277 - pathmatch: no match '\' '[!\\]'
 
 expecting success: 
-		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
-	
-ok 296 - compare_files CRLF_mix_LF NNO_attr_auto_aeol__false_CRLF_mix_LF.txt
+				>expect &&
+				git ls-files -z -- '[!\\]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1278 - pathmatch (via ls-files): no match '[!\\]' '\'
 
 expecting success: 
-		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
-	
-ok 297 - compare_files LF_mix_CR NNO_attr_auto_aeol__false_LF_mix_CR.txt
+			test_must_fail test-tool wildmatch ipathmatch '\' '[!\\]'
+		
+ok 1279 - ipathmatch: no match '\' '[!\\]'
 
 expecting success: 
-		compare_files $crlfnul ${pfx}_CRLF_nul.txt
-	
-ok 298 - compare_files CRLF_nul NNO_attr_auto_aeol__false_CRLF_nul.txt
+				>expect &&
+				git --icase-pathspecs ls-files -z -- '[!\\]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1280 - ipathmatch (via ls-files): no match '[!\\]' '\'
 
 expecting success: 
-		compare_files $lfname ${pfx}_LF.txt
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
 	
-ok 299 - compare_files LF NNO_attr_auto_aeol_lf_false_LF.txt
+Removing "\\"
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1281 - cleanup after previous file test
 
 expecting success: 
-		compare_files $crlfname ${pfx}_CRLF.txt
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
 	
-ok 300 - compare_files CRLF NNO_attr_auto_aeol_lf_false_CRLF.txt
+ok 1282 - setup match file test for G
 
 expecting success: 
-		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
-	
-ok 301 - compare_files CRLF_mix_LF NNO_attr_auto_aeol_lf_false_CRLF_mix_LF.txt
+			test-tool wildmatch wildmatch 'G' '[A-\\]'
+		
+ok 1283 - wildmatch: match 'G' '[A-\\]'
 
 expecting success: 
-		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
-	
-ok 302 - compare_files LF_mix_CR NNO_attr_auto_aeol_lf_false_LF_mix_CR.txt
+				printf '%s' 'G' >expect &&
+				git --glob-pathspecs ls-files -z -- '[A-\\]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1284 - wildmatch (via ls-files): match '[A-\\]' 'G'
 
 expecting success: 
-		compare_files $crlfnul ${pfx}_CRLF_nul.txt
-	
-ok 303 - compare_files CRLF_nul NNO_attr_auto_aeol_lf_false_CRLF_nul.txt
+			test-tool wildmatch iwildmatch 'G' '[A-\\]'
+		
+ok 1285 - iwildmatch: match 'G' '[A-\\]'
 
 expecting success: 
-		compare_files $lfname ${pfx}_LF.txt
-	
-ok 304 - compare_files LF NNO_attr_auto_aeol_crlf_false_LF.txt
+				printf '%s' 'G' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[A-\\]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1286 - iwildmatch (via ls-files): match '[A-\\]' 'G'
 
 expecting success: 
-		compare_files $crlfname ${pfx}_CRLF.txt
-	
-ok 305 - compare_files CRLF NNO_attr_auto_aeol_crlf_false_CRLF.txt
+			test-tool wildmatch pathmatch 'G' '[A-\\]'
+		
+ok 1287 - pathmatch: match 'G' '[A-\\]'
 
 expecting success: 
-		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
-	
-ok 306 - compare_files CRLF_mix_LF NNO_attr_auto_aeol_crlf_false_CRLF_mix_LF.txt
+				printf '%s' 'G' >expect &&
+				git ls-files -z -- '[A-\\]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1288 - pathmatch (via ls-files): match '[A-\\]' 'G'
 
 expecting success: 
-		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
-	
-ok 307 - compare_files LF_mix_CR NNO_attr_auto_aeol_crlf_false_LF_mix_CR.txt
+			test-tool wildmatch ipathmatch 'G' '[A-\\]'
+		
+ok 1289 - ipathmatch: match 'G' '[A-\\]'
 
 expecting success: 
-		compare_files $crlfnul ${pfx}_CRLF_nul.txt
-	
-ok 308 - compare_files CRLF_nul NNO_attr_auto_aeol_crlf_false_CRLF_nul.txt
+				printf '%s' 'G' >expect &&
+				git --icase-pathspecs ls-files -z -- '[A-\\]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1290 - ipathmatch (via ls-files): match '[A-\\]' 'G'
 
 expecting success: 
-		compare_files $lfname ${pfx}_LF.txt
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
 	
-ok 309 - compare_files LF NNO_attr_text_aeol__false_LF.txt
+Removing G
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1291 - cleanup after previous file test
 
 expecting success: 
-		compare_files $crlfname ${pfx}_CRLF.txt
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
 	
-ok 310 - compare_files LF NNO_attr_text_aeol__false_CRLF.txt
+ok 1292 - setup match file test for aaabbb
 
 expecting success: 
-		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
-	
-ok 311 - compare_files LF NNO_attr_text_aeol__false_CRLF_mix_LF.txt
+			test_must_fail test-tool wildmatch wildmatch 'aaabbb' 'b*a'
+		
+ok 1293 - wildmatch: no match 'aaabbb' 'b*a'
 
 expecting success: 
-		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
-	
-ok 312 - compare_files LF_mix_CR NNO_attr_text_aeol__false_LF_mix_CR.txt
+				>expect &&
+				git --glob-pathspecs ls-files -z -- 'b*a' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1294 - wildmatch (via ls-files): no match 'b*a' 'aaabbb'
 
 expecting success: 
-		compare_files $crlfnul ${pfx}_CRLF_nul.txt
-	
-ok 313 - compare_files LF_nul NNO_attr_text_aeol__false_CRLF_nul.txt
+			test_must_fail test-tool wildmatch iwildmatch 'aaabbb' 'b*a'
+		
+ok 1295 - iwildmatch: no match 'aaabbb' 'b*a'
 
 expecting success: 
-		compare_files $lfname ${pfx}_LF.txt
-	
-ok 314 - compare_files LF NNO_attr_text_aeol_lf_false_LF.txt
+				>expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'b*a' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1296 - iwildmatch (via ls-files): no match 'b*a' 'aaabbb'
 
 expecting success: 
-		compare_files $crlfname ${pfx}_CRLF.txt
-	
-ok 315 - compare_files LF NNO_attr_text_aeol_lf_false_CRLF.txt
+			test_must_fail test-tool wildmatch pathmatch 'aaabbb' 'b*a'
+		
+ok 1297 - pathmatch: no match 'aaabbb' 'b*a'
 
 expecting success: 
-		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
-	
-ok 316 - compare_files LF NNO_attr_text_aeol_lf_false_CRLF_mix_LF.txt
+				>expect &&
+				git ls-files -z -- 'b*a' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1298 - pathmatch (via ls-files): no match 'b*a' 'aaabbb'
 
 expecting success: 
-		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
-	
-ok 317 - compare_files LF_mix_CR NNO_attr_text_aeol_lf_false_LF_mix_CR.txt
+			test_must_fail test-tool wildmatch ipathmatch 'aaabbb' 'b*a'
+		
+ok 1299 - ipathmatch: no match 'aaabbb' 'b*a'
 
 expecting success: 
-		compare_files $crlfnul ${pfx}_CRLF_nul.txt
-	
-ok 318 - compare_files LF_nul NNO_attr_text_aeol_lf_false_CRLF_nul.txt
+				>expect &&
+				git --icase-pathspecs ls-files -z -- 'b*a' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1300 - ipathmatch (via ls-files): no match 'b*a' 'aaabbb'
 
 expecting success: 
-		compare_files $lfname ${pfx}_LF.txt
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
 	
-ok 319 - compare_files LF NNO_attr_text_aeol_crlf_false_LF.txt
+Removing aaabbb
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1301 - cleanup after previous file test
 
 expecting success: 
-		compare_files $crlfname ${pfx}_CRLF.txt
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
 	
-ok 320 - compare_files LF NNO_attr_text_aeol_crlf_false_CRLF.txt
+ok 1302 - setup match file test for aabcaa
 
 expecting success: 
-		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
-	
-ok 321 - compare_files LF NNO_attr_text_aeol_crlf_false_CRLF_mix_LF.txt
+			test_must_fail test-tool wildmatch wildmatch 'aabcaa' '*ba*'
+		
+ok 1303 - wildmatch: no match 'aabcaa' '*ba*'
 
 expecting success: 
-		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
-	
-ok 322 - compare_files LF_mix_CR NNO_attr_text_aeol_crlf_false_LF_mix_CR.txt
+				>expect &&
+				git --glob-pathspecs ls-files -z -- '*ba*' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1304 - wildmatch (via ls-files): no match '*ba*' 'aabcaa'
 
 expecting success: 
-		compare_files $crlfnul ${pfx}_CRLF_nul.txt
-	
-ok 323 - compare_files LF_nul NNO_attr_text_aeol_crlf_false_CRLF_nul.txt
+			test_must_fail test-tool wildmatch iwildmatch 'aabcaa' '*ba*'
+		
+ok 1305 - iwildmatch: no match 'aabcaa' '*ba*'
 
 expecting success: 
-		compare_files $lfname ${pfx}_LF.txt
-	
-ok 324 - compare_files LF NNO_attr__aeol__input_LF.txt
+				>expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '*ba*' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1306 - iwildmatch (via ls-files): no match '*ba*' 'aabcaa'
 
 expecting success: 
-		compare_files $crlfname ${pfx}_CRLF.txt
-	
-ok 325 - compare_files CRLF NNO_attr__aeol__input_CRLF.txt
+			test_must_fail test-tool wildmatch pathmatch 'aabcaa' '*ba*'
+		
+ok 1307 - pathmatch: no match 'aabcaa' '*ba*'
 
 expecting success: 
-		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
-	
-ok 326 - compare_files CRLF_mix_LF NNO_attr__aeol__input_CRLF_mix_LF.txt
+				>expect &&
+				git ls-files -z -- '*ba*' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1308 - pathmatch (via ls-files): no match '*ba*' 'aabcaa'
 
 expecting success: 
-		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
-	
-ok 327 - compare_files LF_mix_CR NNO_attr__aeol__input_LF_mix_CR.txt
+			test_must_fail test-tool wildmatch ipathmatch 'aabcaa' '*ba*'
+		
+ok 1309 - ipathmatch: no match 'aabcaa' '*ba*'
 
 expecting success: 
-		compare_files $crlfnul ${pfx}_CRLF_nul.txt
-	
-ok 328 - compare_files CRLF_nul NNO_attr__aeol__input_CRLF_nul.txt
+				>expect &&
+				git --icase-pathspecs ls-files -z -- '*ba*' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1310 - ipathmatch (via ls-files): no match '*ba*' 'aabcaa'
 
 expecting success: 
-		compare_files $lfname ${pfx}_LF.txt
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
 	
-ok 329 - compare_files LF NNO_attr_-text_aeol__input_LF.txt
+Removing aabcaa
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1311 - cleanup after previous file test
 
 expecting success: 
-		compare_files $crlfname ${pfx}_CRLF.txt
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
 	
-ok 330 - compare_files CRLF NNO_attr_-text_aeol__input_CRLF.txt
+ok 1312 - setup match file test for ,
 
 expecting success: 
-		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
-	
-ok 331 - compare_files CRLF_mix_LF NNO_attr_-text_aeol__input_CRLF_mix_LF.txt
+			test-tool wildmatch wildmatch ',' '[,]'
+		
+ok 1313 - wildmatch: match ',' '[,]'
 
 expecting success: 
-		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
-	
-ok 332 - compare_files LF_mix_CR NNO_attr_-text_aeol__input_LF_mix_CR.txt
+				printf '%s' ',' >expect &&
+				git --glob-pathspecs ls-files -z -- '[,]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1314 - wildmatch (via ls-files): match '[,]' ','
 
 expecting success: 
-		compare_files $crlfnul ${pfx}_CRLF_nul.txt
-	
-ok 333 - compare_files CRLF_nul NNO_attr_-text_aeol__input_CRLF_nul.txt
+			test-tool wildmatch iwildmatch ',' '[,]'
+		
+ok 1315 - iwildmatch: match ',' '[,]'
 
 expecting success: 
-		compare_files $lfname ${pfx}_LF.txt
-	
-ok 334 - compare_files LF NNO_attr_-text_aeol_lf_input_LF.txt
+				printf '%s' ',' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[,]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1316 - iwildmatch (via ls-files): match '[,]' ','
 
 expecting success: 
-		compare_files $crlfname ${pfx}_CRLF.txt
-	
-ok 335 - compare_files CRLF NNO_attr_-text_aeol_lf_input_CRLF.txt
+			test-tool wildmatch pathmatch ',' '[,]'
+		
+ok 1317 - pathmatch: match ',' '[,]'
 
 expecting success: 
-		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
-	
-ok 336 - compare_files CRLF_mix_LF NNO_attr_-text_aeol_lf_input_CRLF_mix_LF.txt
+				printf '%s' ',' >expect &&
+				git ls-files -z -- '[,]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1318 - pathmatch (via ls-files): match '[,]' ','
 
 expecting success: 
-		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
-	
-ok 337 - compare_files LF_mix_CR NNO_attr_-text_aeol_lf_input_LF_mix_CR.txt
+			test-tool wildmatch ipathmatch ',' '[,]'
+		
+ok 1319 - ipathmatch: match ',' '[,]'
 
 expecting success: 
-		compare_files $crlfnul ${pfx}_CRLF_nul.txt
-	
-ok 338 - compare_files CRLF_nul NNO_attr_-text_aeol_lf_input_CRLF_nul.txt
+				printf '%s' ',' >expect &&
+				git --icase-pathspecs ls-files -z -- '[,]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1320 - ipathmatch (via ls-files): match '[,]' ','
 
 expecting success: 
-		compare_files $lfname ${pfx}_LF.txt
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
 	
-ok 339 - compare_files LF NNO_attr_-text_aeol_crlf_input_LF.txt
+Removing ,
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1321 - cleanup after previous file test
 
 expecting success: 
-		compare_files $crlfname ${pfx}_CRLF.txt
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
 	
-ok 340 - compare_files CRLF NNO_attr_-text_aeol_crlf_input_CRLF.txt
+ok 1322 - setup match file test for ,
 
 expecting success: 
-		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
-	
-ok 341 - compare_files CRLF_mix_LF NNO_attr_-text_aeol_crlf_input_CRLF_mix_LF.txt
+			test-tool wildmatch wildmatch ',' '[\\,]'
+		
+ok 1323 - wildmatch: match ',' '[\\,]'
 
 expecting success: 
-		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
-	
-ok 342 - compare_files LF_mix_CR NNO_attr_-text_aeol_crlf_input_LF_mix_CR.txt
+				printf '%s' ',' >expect &&
+				git --glob-pathspecs ls-files -z -- '[\\,]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1324 - wildmatch (via ls-files): match '[\\,]' ','
 
 expecting success: 
-		compare_files $crlfnul ${pfx}_CRLF_nul.txt
-	
-ok 343 - compare_files CRLF_nul NNO_attr_-text_aeol_crlf_input_CRLF_nul.txt
+			test-tool wildmatch iwildmatch ',' '[\\,]'
+		
+ok 1325 - iwildmatch: match ',' '[\\,]'
 
 expecting success: 
-		compare_files $lfname ${pfx}_LF.txt
-	
-ok 344 - compare_files LF NNO_attr_auto_aeol__input_LF.txt
+				printf '%s' ',' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[\\,]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1326 - iwildmatch (via ls-files): match '[\\,]' ','
 
 expecting success: 
-		compare_files $crlfname ${pfx}_CRLF.txt
-	
-ok 345 - compare_files CRLF NNO_attr_auto_aeol__input_CRLF.txt
+			test-tool wildmatch pathmatch ',' '[\\,]'
+		
+ok 1327 - pathmatch: match ',' '[\\,]'
 
 expecting success: 
-		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
-	
-ok 346 - compare_files CRLF_mix_LF NNO_attr_auto_aeol__input_CRLF_mix_LF.txt
+				printf '%s' ',' >expect &&
+				git ls-files -z -- '[\\,]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1328 - pathmatch (via ls-files): match '[\\,]' ','
 
 expecting success: 
-		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
-	
-ok 347 - compare_files LF_mix_CR NNO_attr_auto_aeol__input_LF_mix_CR.txt
+			test-tool wildmatch ipathmatch ',' '[\\,]'
+		
+ok 1329 - ipathmatch: match ',' '[\\,]'
 
 expecting success: 
-		compare_files $crlfnul ${pfx}_CRLF_nul.txt
-	
-ok 348 - compare_files CRLF_nul NNO_attr_auto_aeol__input_CRLF_nul.txt
+				printf '%s' ',' >expect &&
+				git --icase-pathspecs ls-files -z -- '[\\,]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1330 - ipathmatch (via ls-files): match '[\\,]' ','
 
 expecting success: 
-		compare_files $lfname ${pfx}_LF.txt
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
 	
-ok 349 - compare_files LF NNO_attr_auto_aeol_lf_input_LF.txt
+Removing ,
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1331 - cleanup after previous file test
 
 expecting success: 
-		compare_files $crlfname ${pfx}_CRLF.txt
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
 	
-ok 350 - compare_files CRLF NNO_attr_auto_aeol_lf_input_CRLF.txt
+ok 1332 - setup match file test for \
 
 expecting success: 
-		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
-	
-ok 351 - compare_files CRLF_mix_LF NNO_attr_auto_aeol_lf_input_CRLF_mix_LF.txt
+			test-tool wildmatch wildmatch '\' '[\\,]'
+		
+ok 1333 - wildmatch: match '\' '[\\,]'
 
 expecting success: 
-		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
-	
-ok 352 - compare_files LF_mix_CR NNO_attr_auto_aeol_lf_input_LF_mix_CR.txt
+				printf '%s' '\' >expect &&
+				git --glob-pathspecs ls-files -z -- '[\\,]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1334 - wildmatch (via ls-files): match '[\\,]' '\'
 
 expecting success: 
-		compare_files $crlfnul ${pfx}_CRLF_nul.txt
-	
-ok 353 - compare_files CRLF_nul NNO_attr_auto_aeol_lf_input_CRLF_nul.txt
+			test-tool wildmatch iwildmatch '\' '[\\,]'
+		
+ok 1335 - iwildmatch: match '\' '[\\,]'
 
 expecting success: 
-		compare_files $lfname ${pfx}_LF.txt
-	
-ok 354 - compare_files LF NNO_attr_auto_aeol_crlf_input_LF.txt
+				printf '%s' '\' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[\\,]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1336 - iwildmatch (via ls-files): match '[\\,]' '\'
 
 expecting success: 
-		compare_files $crlfname ${pfx}_CRLF.txt
-	
-ok 355 - compare_files CRLF NNO_attr_auto_aeol_crlf_input_CRLF.txt
+			test-tool wildmatch pathmatch '\' '[\\,]'
+		
+ok 1337 - pathmatch: match '\' '[\\,]'
 
 expecting success: 
-		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
-	
-ok 356 - compare_files CRLF_mix_LF NNO_attr_auto_aeol_crlf_input_CRLF_mix_LF.txt
+				printf '%s' '\' >expect &&
+				git ls-files -z -- '[\\,]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1338 - pathmatch (via ls-files): match '[\\,]' '\'
 
 expecting success: 
-		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
-	
-ok 357 - compare_files LF_mix_CR NNO_attr_auto_aeol_crlf_input_LF_mix_CR.txt
+			test-tool wildmatch ipathmatch '\' '[\\,]'
+		
+ok 1339 - ipathmatch: match '\' '[\\,]'
 
 expecting success: 
-		compare_files $crlfnul ${pfx}_CRLF_nul.txt
-	
-ok 358 - compare_files CRLF_nul NNO_attr_auto_aeol_crlf_input_CRLF_nul.txt
+				printf '%s' '\' >expect &&
+				git --icase-pathspecs ls-files -z -- '[\\,]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1340 - ipathmatch (via ls-files): match '[\\,]' '\'
 
 expecting success: 
-		compare_files $lfname ${pfx}_LF.txt
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
 	
-ok 359 - compare_files LF NNO_attr_text_aeol__input_LF.txt
+Removing "\\"
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1341 - cleanup after previous file test
 
 expecting success: 
-		compare_files $crlfname ${pfx}_CRLF.txt
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
 	
-ok 360 - compare_files LF NNO_attr_text_aeol__input_CRLF.txt
+ok 1342 - setup match file test for -
 
 expecting success: 
-		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
-	
-ok 361 - compare_files LF NNO_attr_text_aeol__input_CRLF_mix_LF.txt
+			test-tool wildmatch wildmatch '-' '[,-.]'
+		
+ok 1343 - wildmatch: match '-' '[,-.]'
 
 expecting success: 
-		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
-	
-ok 362 - compare_files LF_mix_CR NNO_attr_text_aeol__input_LF_mix_CR.txt
+				printf '%s' '-' >expect &&
+				git --glob-pathspecs ls-files -z -- '[,-.]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1344 - wildmatch (via ls-files): match '[,-.]' '-'
 
 expecting success: 
-		compare_files $crlfnul ${pfx}_CRLF_nul.txt
-	
-ok 363 - compare_files LF_nul NNO_attr_text_aeol__input_CRLF_nul.txt
+			test-tool wildmatch iwildmatch '-' '[,-.]'
+		
+ok 1345 - iwildmatch: match '-' '[,-.]'
 
 expecting success: 
-		compare_files $lfname ${pfx}_LF.txt
-	
-ok 364 - compare_files LF NNO_attr_text_aeol_lf_input_LF.txt
+				printf '%s' '-' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[,-.]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1346 - iwildmatch (via ls-files): match '[,-.]' '-'
 
 expecting success: 
-		compare_files $crlfname ${pfx}_CRLF.txt
-	
-ok 365 - compare_files LF NNO_attr_text_aeol_lf_input_CRLF.txt
+			test-tool wildmatch pathmatch '-' '[,-.]'
+		
+ok 1347 - pathmatch: match '-' '[,-.]'
 
 expecting success: 
-		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
-	
-ok 366 - compare_files LF NNO_attr_text_aeol_lf_input_CRLF_mix_LF.txt
+				printf '%s' '-' >expect &&
+				git ls-files -z -- '[,-.]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1348 - pathmatch (via ls-files): match '[,-.]' '-'
 
 expecting success: 
-		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
-	
-ok 367 - compare_files LF_mix_CR NNO_attr_text_aeol_lf_input_LF_mix_CR.txt
+			test-tool wildmatch ipathmatch '-' '[,-.]'
+		
+ok 1349 - ipathmatch: match '-' '[,-.]'
 
 expecting success: 
-		compare_files $crlfnul ${pfx}_CRLF_nul.txt
-	
-ok 368 - compare_files LF_nul NNO_attr_text_aeol_lf_input_CRLF_nul.txt
+				printf '%s' '-' >expect &&
+				git --icase-pathspecs ls-files -z -- '[,-.]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1350 - ipathmatch (via ls-files): match '[,-.]' '-'
 
 expecting success: 
-		compare_files $lfname ${pfx}_LF.txt
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
 	
-ok 369 - compare_files LF NNO_attr_text_aeol_crlf_input_LF.txt
+Removing -
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1351 - cleanup after previous file test
 
 expecting success: 
-		compare_files $crlfname ${pfx}_CRLF.txt
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
 	
-ok 370 - compare_files LF NNO_attr_text_aeol_crlf_input_CRLF.txt
+ok 1352 - setup match file test for +
 
 expecting success: 
-		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
-	
-ok 371 - compare_files LF NNO_attr_text_aeol_crlf_input_CRLF_mix_LF.txt
+			test_must_fail test-tool wildmatch wildmatch '+' '[,-.]'
+		
+ok 1353 - wildmatch: no match '+' '[,-.]'
 
 expecting success: 
-		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
-	
-ok 372 - compare_files LF_mix_CR NNO_attr_text_aeol_crlf_input_LF_mix_CR.txt
+				>expect &&
+				git --glob-pathspecs ls-files -z -- '[,-.]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1354 - wildmatch (via ls-files): no match '[,-.]' '+'
 
 expecting success: 
-		compare_files $crlfnul ${pfx}_CRLF_nul.txt
-	
-ok 373 - compare_files LF_nul NNO_attr_text_aeol_crlf_input_CRLF_nul.txt
+			test_must_fail test-tool wildmatch iwildmatch '+' '[,-.]'
+		
+ok 1355 - iwildmatch: no match '+' '[,-.]'
 
 expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
+				>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 374 - ls-files --eol attr=-text  aeol= core.autocrlf=true core.eol=lf
+			
+ok 1356 - iwildmatch (via ls-files): no match '[,-.]' '+'
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_true_attr_-text_ LF    crlf_false_attr__LF.txt
-	
-ok 375 - checkout attr=-text  aeol= core.autocrlf=true core.eol=lf file=LF
+			test_must_fail test-tool wildmatch pathmatch '+' '[,-.]'
+		
+ok 1357 - pathmatch: no match '+' '[,-.]'
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_true_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 376 - checkout attr=-text  aeol= core.autocrlf=true core.eol=lf file=CRLF
+				>expect &&
+				git ls-files -z -- '[,-.]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1358 - pathmatch (via ls-files): no match '[,-.]' '+'
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_true_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 377 - checkout attr=-text  aeol= core.autocrlf=true core.eol=lf file=CRLF_mix_LF
+			test_must_fail test-tool wildmatch ipathmatch '+' '[,-.]'
+		
+ok 1359 - ipathmatch: no match '+' '[,-.]'
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_true_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 378 - checkout attr=-text  aeol= core.autocrlf=true core.eol=lf file=LF_mix_CR
+				>expect &&
+				git --icase-pathspecs ls-files -z -- '[,-.]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1360 - ipathmatch (via ls-files): no match '[,-.]' '+'
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_true_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
 	
-ok 379 - checkout attr=-text  aeol= core.autocrlf=true core.eol=lf file=LF_nul
+Removing +
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1361 - cleanup after previous file test
 
 expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
-		test_cmp expect actual
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
 	
-ok 380 - ls-files --eol attr=-text  aeol=lf core.autocrlf=true core.eol=lf
+ok 1362 - setup match file test for -.]
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_true_attr_-text_ LF    crlf_false_attr__LF.txt
-	
-ok 381 - checkout attr=-text  aeol=lf core.autocrlf=true core.eol=lf file=LF
+			test_must_fail test-tool wildmatch wildmatch '-.]' '[,-.]'
+		
+ok 1363 - wildmatch: no match '-.]' '[,-.]'
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_true_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 382 - checkout attr=-text  aeol=lf core.autocrlf=true core.eol=lf file=CRLF
+				>expect &&
+				git --glob-pathspecs ls-files -z -- '[,-.]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1364 - wildmatch (via ls-files): no match '[,-.]' '-.]'
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_true_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 383 - checkout attr=-text  aeol=lf core.autocrlf=true core.eol=lf file=CRLF_mix_LF
+			test_must_fail test-tool wildmatch iwildmatch '-.]' '[,-.]'
+		
+ok 1365 - iwildmatch: no match '-.]' '[,-.]'
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_true_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 384 - checkout attr=-text  aeol=lf core.autocrlf=true core.eol=lf file=LF_mix_CR
+				>expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[,-.]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1366 - iwildmatch (via ls-files): no match '[,-.]' '-.]'
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_true_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 385 - checkout attr=-text  aeol=lf core.autocrlf=true core.eol=lf file=LF_nul
+			test_must_fail test-tool wildmatch pathmatch '-.]' '[,-.]'
+		
+ok 1367 - pathmatch: no match '-.]' '[,-.]'
 
 expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
+				>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 386 - ls-files --eol attr=-text  aeol=crlf core.autocrlf=true core.eol=lf
+			
+ok 1368 - pathmatch (via ls-files): no match '[,-.]' '-.]'
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_true_attr_-text_ LF    crlf_false_attr__LF.txt
-	
-ok 387 - checkout attr=-text  aeol=crlf core.autocrlf=true core.eol=lf file=LF
+			test_must_fail test-tool wildmatch ipathmatch '-.]' '[,-.]'
+		
+ok 1369 - ipathmatch: no match '-.]' '[,-.]'
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_true_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 388 - checkout attr=-text  aeol=crlf core.autocrlf=true core.eol=lf file=CRLF
+				>expect &&
+				git --icase-pathspecs ls-files -z -- '[,-.]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1370 - ipathmatch (via ls-files): no match '[,-.]' '-.]'
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_true_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
 	
-ok 389 - checkout attr=-text  aeol=crlf core.autocrlf=true core.eol=lf file=CRLF_mix_LF
+Removing -.]
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1371 - cleanup after previous file test
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_true_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
 	
-ok 390 - checkout attr=-text  aeol=crlf core.autocrlf=true core.eol=lf file=LF_mix_CR
+ok 1372 - setup match file test for 2
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_true_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 391 - checkout attr=-text  aeol=crlf core.autocrlf=true core.eol=lf file=LF_nul
+			test-tool wildmatch wildmatch '2' '[\1-\3]'
+		
+ok 1373 - wildmatch: match '2' '[\1-\3]'
 
 expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
+				printf '%s' '2' >expect &&
+				git --glob-pathspecs ls-files -z -- '[\1-\3]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
 		test_cmp expect actual
-	
-ok 392 - ls-files --eol attr=text  aeol=lf core.autocrlf=true core.eol=lf
+			
+ok 1374 - wildmatch (via ls-files): match '[\1-\3]' '2'
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_true_attr_text_ LF    crlf_false_attr__LF.txt
-	
-ok 393 - checkout attr=text  aeol=lf core.autocrlf=true core.eol=lf file=LF
+			test-tool wildmatch iwildmatch '2' '[\1-\3]'
+		
+ok 1375 - iwildmatch: match '2' '[\1-\3]'
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_true_attr_text_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 394 - checkout attr=text  aeol=lf core.autocrlf=true core.eol=lf file=CRLF
+				printf '%s' '2' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[\1-\3]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1376 - iwildmatch (via ls-files): match '[\1-\3]' '2'
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_true_attr_text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 395 - checkout attr=text  aeol=lf core.autocrlf=true core.eol=lf file=CRLF_mix_LF
+			test-tool wildmatch pathmatch '2' '[\1-\3]'
+		
+ok 1377 - pathmatch: match '2' '[\1-\3]'
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_true_attr_text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 396 - checkout attr=text  aeol=lf core.autocrlf=true core.eol=lf file=LF_mix_CR
+				printf '%s' '2' >expect &&
+				git ls-files -z -- '[\1-\3]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1378 - pathmatch (via ls-files): match '[\1-\3]' '2'
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_true_attr_text_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 397 - checkout attr=text  aeol=lf core.autocrlf=true core.eol=lf file=LF_nul
+			test-tool wildmatch ipathmatch '2' '[\1-\3]'
+		
+ok 1379 - ipathmatch: match '2' '[\1-\3]'
 
 expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
+				printf '%s' '2' >expect &&
+				git --icase-pathspecs ls-files -z -- '[\1-\3]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
 		test_cmp expect actual
-	
-ok 398 - ls-files --eol attr=text  aeol=crlf core.autocrlf=true core.eol=lf
+			
+ok 1380 - ipathmatch (via ls-files): match '[\1-\3]' '2'
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_true_attr_text_ CRLF    crlf_false_attr__LF.txt
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
 	
-ok 399 - checkout attr=text  aeol=crlf core.autocrlf=true core.eol=lf file=LF
+Removing 2
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1381 - cleanup after previous file test
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_true_attr_text_ CRLF  crlf_false_attr__CRLF.txt
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
 	
-ok 400 - checkout attr=text  aeol=crlf core.autocrlf=true core.eol=lf file=CRLF
+ok 1382 - setup match file test for 3
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_true_attr_text_ CRLF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 401 - checkout attr=text  aeol=crlf core.autocrlf=true core.eol=lf file=CRLF_mix_LF
+			test-tool wildmatch wildmatch '3' '[\1-\3]'
+		
+ok 1383 - wildmatch: match '3' '[\1-\3]'
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_true_attr_text_ CRLF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 402 - checkout attr=text  aeol=crlf core.autocrlf=true core.eol=lf file=LF_mix_CR
+				printf '%s' '3' >expect &&
+				git --glob-pathspecs ls-files -z -- '[\1-\3]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1384 - wildmatch (via ls-files): match '[\1-\3]' '3'
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_true_attr_text_ CRLF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 403 - checkout attr=text  aeol=crlf core.autocrlf=true core.eol=lf file=LF_nul
+			test-tool wildmatch iwildmatch '3' '[\1-\3]'
+		
+ok 1385 - iwildmatch: match '3' '[\1-\3]'
 
 expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
+				printf '%s' '3' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[\1-\3]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
 		test_cmp expect actual
-	
-ok 404 - ls-files --eol attr=auto  aeol=lf core.autocrlf=true core.eol=lf
+			
+ok 1386 - iwildmatch (via ls-files): match '[\1-\3]' '3'
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_true_attr_auto_ LF    crlf_false_attr__LF.txt
-	
-ok 405 - checkout attr=auto  aeol=lf core.autocrlf=true core.eol=lf file=LF
+			test-tool wildmatch pathmatch '3' '[\1-\3]'
+		
+ok 1387 - pathmatch: match '3' '[\1-\3]'
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_true_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 406 - checkout attr=auto  aeol=lf core.autocrlf=true core.eol=lf file=CRLF
+				printf '%s' '3' >expect &&
+				git ls-files -z -- '[\1-\3]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1388 - pathmatch (via ls-files): match '[\1-\3]' '3'
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_true_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 407 - checkout attr=auto  aeol=lf core.autocrlf=true core.eol=lf file=CRLF_mix_LF
+			test-tool wildmatch ipathmatch '3' '[\1-\3]'
+		
+ok 1389 - ipathmatch: match '3' '[\1-\3]'
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_true_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 408 - checkout attr=auto  aeol=lf core.autocrlf=true core.eol=lf file=LF_mix_CR
+				printf '%s' '3' >expect &&
+				git --icase-pathspecs ls-files -z -- '[\1-\3]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1390 - ipathmatch (via ls-files): match '[\1-\3]' '3'
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_true_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
 	
-ok 409 - checkout attr=auto  aeol=lf core.autocrlf=true core.eol=lf file=LF_nul
+Removing 3
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1391 - cleanup after previous file test
 
 expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
-		test_cmp expect actual
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
 	
-ok 410 - ls-files --eol attr=auto  aeol=crlf core.autocrlf=true core.eol=lf
+ok 1392 - setup match file test for 4
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_true_attr_auto_ CRLF    crlf_false_attr__LF.txt
-	
-ok 411 - checkout attr=auto  aeol=crlf core.autocrlf=true core.eol=lf file=LF
+			test_must_fail test-tool wildmatch wildmatch '4' '[\1-\3]'
+		
+ok 1393 - wildmatch: no match '4' '[\1-\3]'
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_true_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 412 - checkout attr=auto  aeol=crlf core.autocrlf=true core.eol=lf file=CRLF
+				>expect &&
+				git --glob-pathspecs ls-files -z -- '[\1-\3]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1394 - wildmatch (via ls-files): no match '[\1-\3]' '4'
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_true_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 413 - checkout attr=auto  aeol=crlf core.autocrlf=true core.eol=lf file=CRLF_mix_LF
+			test_must_fail test-tool wildmatch iwildmatch '4' '[\1-\3]'
+		
+ok 1395 - iwildmatch: no match '4' '[\1-\3]'
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_true_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 414 - checkout attr=auto  aeol=crlf core.autocrlf=true core.eol=lf file=LF_mix_CR
+				>expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[\1-\3]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1396 - iwildmatch (via ls-files): no match '[\1-\3]' '4'
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_true_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 415 - checkout attr=auto  aeol=crlf core.autocrlf=true core.eol=lf file=LF_nul
+			test_must_fail test-tool wildmatch pathmatch '4' '[\1-\3]'
+		
+ok 1397 - pathmatch: no match '4' '[\1-\3]'
 
 expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
+				>expect &&
+				git ls-files -z -- '[\1-\3]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
 		test_cmp expect actual
-	
-ok 416 - ls-files --eol attr=-text  aeol= core.autocrlf=false core.eol=lf
+			
+ok 1398 - pathmatch (via ls-files): no match '[\1-\3]' '4'
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_false_attr_-text_ LF    crlf_false_attr__LF.txt
-	
-ok 417 - checkout attr=-text  aeol= core.autocrlf=false core.eol=lf file=LF
+			test_must_fail test-tool wildmatch ipathmatch '4' '[\1-\3]'
+		
+ok 1399 - ipathmatch: no match '4' '[\1-\3]'
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_false_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 418 - checkout attr=-text  aeol= core.autocrlf=false core.eol=lf file=CRLF
+				>expect &&
+				git --icase-pathspecs ls-files -z -- '[\1-\3]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1400 - ipathmatch (via ls-files): no match '[\1-\3]' '4'
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_false_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
 	
-ok 419 - checkout attr=-text  aeol= core.autocrlf=false core.eol=lf file=CRLF_mix_LF
+Removing 4
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1401 - cleanup after previous file test
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_false_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
 	
-ok 420 - checkout attr=-text  aeol= core.autocrlf=false core.eol=lf file=LF_mix_CR
+ok 1402 - setup match file test for \
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_false_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 421 - checkout attr=-text  aeol= core.autocrlf=false core.eol=lf file=LF_nul
+			test-tool wildmatch wildmatch '\' '[[-\]]'
+		
+ok 1403 - wildmatch: match '\' '[[-\]]'
 
 expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
+				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 422 - ls-files --eol attr=-text  aeol=lf core.autocrlf=false core.eol=lf
+			
+ok 1404 - wildmatch (via ls-files): match '[[-\]]' '\'
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_false_attr_-text_ LF    crlf_false_attr__LF.txt
-	
-ok 423 - checkout attr=-text  aeol=lf core.autocrlf=false core.eol=lf file=LF
+			test-tool wildmatch iwildmatch '\' '[[-\]]'
+		
+ok 1405 - iwildmatch: match '\' '[[-\]]'
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_false_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 424 - checkout attr=-text  aeol=lf core.autocrlf=false core.eol=lf file=CRLF
+				printf '%s' '\' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[[-\]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1406 - iwildmatch (via ls-files): match '[[-\]]' '\'
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_false_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 425 - checkout attr=-text  aeol=lf core.autocrlf=false core.eol=lf file=CRLF_mix_LF
+			test-tool wildmatch pathmatch '\' '[[-\]]'
+		
+ok 1407 - pathmatch: match '\' '[[-\]]'
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_false_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 426 - checkout attr=-text  aeol=lf core.autocrlf=false core.eol=lf file=LF_mix_CR
+				printf '%s' '\' >expect &&
+				git ls-files -z -- '[[-\]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1408 - pathmatch (via ls-files): match '[[-\]]' '\'
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_false_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 427 - checkout attr=-text  aeol=lf core.autocrlf=false core.eol=lf file=LF_nul
+			test-tool wildmatch ipathmatch '\' '[[-\]]'
+		
+ok 1409 - ipathmatch: match '\' '[[-\]]'
 
 expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
+				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 428 - ls-files --eol attr=-text  aeol=crlf core.autocrlf=false core.eol=lf
+			
+ok 1410 - ipathmatch (via ls-files): match '[[-\]]' '\'
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_false_attr_-text_ LF    crlf_false_attr__LF.txt
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
 	
-ok 429 - checkout attr=-text  aeol=crlf core.autocrlf=false core.eol=lf file=LF
+Removing "\\"
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1411 - cleanup after previous file test
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_false_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
 	
-ok 430 - checkout attr=-text  aeol=crlf core.autocrlf=false core.eol=lf file=CRLF
+ok 1412 - setup match file test for [
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_false_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 431 - checkout attr=-text  aeol=crlf core.autocrlf=false core.eol=lf file=CRLF_mix_LF
+			test-tool wildmatch wildmatch '[' '[[-\]]'
+		
+ok 1413 - wildmatch: match '[' '[[-\]]'
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_false_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 432 - checkout attr=-text  aeol=crlf core.autocrlf=false core.eol=lf file=LF_mix_CR
+				printf '%s' '[' >expect &&
+				git --glob-pathspecs ls-files -z -- '[[-\]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1414 - wildmatch (via ls-files): match '[[-\]]' '['
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_false_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 433 - checkout attr=-text  aeol=crlf core.autocrlf=false core.eol=lf file=LF_nul
+			test-tool wildmatch iwildmatch '[' '[[-\]]'
+		
+ok 1415 - iwildmatch: match '[' '[[-\]]'
 
 expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
+				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 434 - ls-files --eol attr=text  aeol=lf core.autocrlf=false core.eol=lf
+			
+ok 1416 - iwildmatch (via ls-files): match '[[-\]]' '['
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_false_attr_text_ LF    crlf_false_attr__LF.txt
-	
-ok 435 - checkout attr=text  aeol=lf core.autocrlf=false core.eol=lf file=LF
+			test-tool wildmatch pathmatch '[' '[[-\]]'
+		
+ok 1417 - pathmatch: match '[' '[[-\]]'
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_false_attr_text_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 436 - checkout attr=text  aeol=lf core.autocrlf=false core.eol=lf file=CRLF
+				printf '%s' '[' >expect &&
+				git ls-files -z -- '[[-\]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1418 - pathmatch (via ls-files): match '[[-\]]' '['
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_false_attr_text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 437 - checkout attr=text  aeol=lf core.autocrlf=false core.eol=lf file=CRLF_mix_LF
+			test-tool wildmatch ipathmatch '[' '[[-\]]'
+		
+ok 1419 - ipathmatch: match '[' '[[-\]]'
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_false_attr_text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 438 - checkout attr=text  aeol=lf core.autocrlf=false core.eol=lf file=LF_mix_CR
+				printf '%s' '[' >expect &&
+				git --icase-pathspecs ls-files -z -- '[[-\]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1420 - ipathmatch (via ls-files): match '[[-\]]' '['
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_false_attr_text_ LF_nul   crlf_false_attr__LF_nul.txt
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
 	
-ok 439 - checkout attr=text  aeol=lf core.autocrlf=false core.eol=lf file=LF_nul
+Removing [
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1421 - cleanup after previous file test
 
 expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
-		test_cmp expect actual
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
 	
-ok 440 - ls-files --eol attr=text  aeol=crlf core.autocrlf=false core.eol=lf
+ok 1422 - setup match file test for ]
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_false_attr_text_ CRLF    crlf_false_attr__LF.txt
-	
-ok 441 - checkout attr=text  aeol=crlf core.autocrlf=false core.eol=lf file=LF
+			test-tool wildmatch wildmatch ']' '[[-\]]'
+		
+ok 1423 - wildmatch: match ']' '[[-\]]'
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_false_attr_text_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 442 - checkout attr=text  aeol=crlf core.autocrlf=false core.eol=lf file=CRLF
+				printf '%s' ']' >expect &&
+				git --glob-pathspecs ls-files -z -- '[[-\]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1424 - wildmatch (via ls-files): match '[[-\]]' ']'
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_false_attr_text_ CRLF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 443 - checkout attr=text  aeol=crlf core.autocrlf=false core.eol=lf file=CRLF_mix_LF
+			test-tool wildmatch iwildmatch ']' '[[-\]]'
+		
+ok 1425 - iwildmatch: match ']' '[[-\]]'
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_false_attr_text_ CRLF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 444 - checkout attr=text  aeol=crlf core.autocrlf=false core.eol=lf file=LF_mix_CR
+				printf '%s' ']' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[[-\]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1426 - iwildmatch (via ls-files): match '[[-\]]' ']'
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_false_attr_text_ CRLF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 445 - checkout attr=text  aeol=crlf core.autocrlf=false core.eol=lf file=LF_nul
+			test-tool wildmatch pathmatch ']' '[[-\]]'
+		
+ok 1427 - pathmatch: match ']' '[[-\]]'
 
 expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
+				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 446 - ls-files --eol attr=auto  aeol=lf core.autocrlf=false core.eol=lf
+			
+ok 1428 - pathmatch (via ls-files): match '[[-\]]' ']'
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_false_attr_auto_ LF    crlf_false_attr__LF.txt
-	
-ok 447 - checkout attr=auto  aeol=lf core.autocrlf=false core.eol=lf file=LF
+			test-tool wildmatch ipathmatch ']' '[[-\]]'
+		
+ok 1429 - ipathmatch: match ']' '[[-\]]'
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_false_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 448 - checkout attr=auto  aeol=lf core.autocrlf=false core.eol=lf file=CRLF
+				printf '%s' ']' >expect &&
+				git --icase-pathspecs ls-files -z -- '[[-\]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1430 - ipathmatch (via ls-files): match '[[-\]]' ']'
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_false_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
 	
-ok 449 - checkout attr=auto  aeol=lf core.autocrlf=false core.eol=lf file=CRLF_mix_LF
+Removing ]
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1431 - cleanup after previous file test
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_false_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
 	
-ok 450 - checkout attr=auto  aeol=lf core.autocrlf=false core.eol=lf file=LF_mix_CR
+ok 1432 - setup match file test for -
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_false_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 451 - checkout attr=auto  aeol=lf core.autocrlf=false core.eol=lf file=LF_nul
+			test_must_fail test-tool wildmatch wildmatch '-' '[[-\]]'
+		
+ok 1433 - wildmatch: no match '-' '[[-\]]'
 
 expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
+				>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 452 - ls-files --eol attr=auto  aeol=crlf core.autocrlf=false core.eol=lf
+			
+ok 1434 - wildmatch (via ls-files): no match '[[-\]]' '-'
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_false_attr_auto_ CRLF    crlf_false_attr__LF.txt
-	
-ok 453 - checkout attr=auto  aeol=crlf core.autocrlf=false core.eol=lf file=LF
+			test_must_fail test-tool wildmatch iwildmatch '-' '[[-\]]'
+		
+ok 1435 - iwildmatch: no match '-' '[[-\]]'
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_false_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 454 - checkout attr=auto  aeol=crlf core.autocrlf=false core.eol=lf file=CRLF
+				>expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[[-\]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1436 - iwildmatch (via ls-files): no match '[[-\]]' '-'
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_false_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 455 - checkout attr=auto  aeol=crlf core.autocrlf=false core.eol=lf file=CRLF_mix_LF
+			test_must_fail test-tool wildmatch pathmatch '-' '[[-\]]'
+		
+ok 1437 - pathmatch: no match '-' '[[-\]]'
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_false_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 456 - checkout attr=auto  aeol=crlf core.autocrlf=false core.eol=lf file=LF_mix_CR
+				>expect &&
+				git ls-files -z -- '[[-\]]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1438 - pathmatch (via ls-files): no match '[[-\]]' '-'
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_false_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 457 - checkout attr=auto  aeol=crlf core.autocrlf=false core.eol=lf file=LF_nul
+			test_must_fail test-tool wildmatch ipathmatch '-' '[[-\]]'
+		
+ok 1439 - ipathmatch: no match '-' '[[-\]]'
 
 expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
+				>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 458 - ls-files --eol attr=-text  aeol= core.autocrlf=input core.eol=lf
+			
+ok 1440 - ipathmatch (via ls-files): no match '[[-\]]' '-'
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_input_attr_-text_ LF    crlf_false_attr__LF.txt
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
 	
-ok 459 - checkout attr=-text  aeol= core.autocrlf=input core.eol=lf file=LF
+Removing -
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1441 - cleanup after previous file test
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_input_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
 	
-ok 460 - checkout attr=-text  aeol= core.autocrlf=input core.eol=lf file=CRLF
+ok 1442 - setup match file test for -adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_input_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 461 - checkout attr=-text  aeol= core.autocrlf=input core.eol=lf file=CRLF_mix_LF
+			test-tool wildmatch wildmatch '-adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
+		
+ok 1443 - wildmatch: match '-adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_input_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 462 - checkout attr=-text  aeol= core.autocrlf=input core.eol=lf file=LF_mix_CR
+				printf '%s' '-adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1' >expect &&
+				git --glob-pathspecs ls-files -z -- '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1444 - wildmatch (via ls-files): match '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' '-adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1'
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_input_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 463 - checkout attr=-text  aeol= core.autocrlf=input core.eol=lf file=LF_nul
+			test-tool wildmatch iwildmatch '-adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
+		
+ok 1445 - iwildmatch: match '-adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
 
 expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
+				printf '%s' '-adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
 		test_cmp expect actual
-	
-ok 464 - ls-files --eol attr=-text  aeol=lf core.autocrlf=input core.eol=lf
+			
+ok 1446 - iwildmatch (via ls-files): match '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' '-adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1'
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_input_attr_-text_ LF    crlf_false_attr__LF.txt
-	
-ok 465 - checkout attr=-text  aeol=lf core.autocrlf=input core.eol=lf file=LF
+			test-tool wildmatch pathmatch '-adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
+		
+ok 1447 - pathmatch: match '-adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_input_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 466 - checkout attr=-text  aeol=lf core.autocrlf=input core.eol=lf file=CRLF
+				printf '%s' '-adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1' >expect &&
+				git ls-files -z -- '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1448 - pathmatch (via ls-files): match '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' '-adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1'
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_input_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 467 - checkout attr=-text  aeol=lf core.autocrlf=input core.eol=lf file=CRLF_mix_LF
+			test-tool wildmatch ipathmatch '-adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
+		
+ok 1449 - ipathmatch: match '-adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_input_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 468 - checkout attr=-text  aeol=lf core.autocrlf=input core.eol=lf file=LF_mix_CR
+				printf '%s' '-adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1' >expect &&
+				git --icase-pathspecs ls-files -z -- '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1450 - ipathmatch (via ls-files): match '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' '-adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1'
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_input_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
 	
-ok 469 - checkout attr=-text  aeol=lf core.autocrlf=input core.eol=lf file=LF_nul
+Removing -adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1451 - cleanup after previous file test
 
 expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
-		test_cmp expect actual
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
 	
-ok 470 - ls-files --eol attr=-text  aeol=crlf core.autocrlf=input core.eol=lf
+ok 1452 - setup match file test for -adobe-courier-bold-o-normal--12-120-75-75-X-70-iso8859-1
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_input_attr_-text_ LF    crlf_false_attr__LF.txt
-	
-ok 471 - checkout attr=-text  aeol=crlf core.autocrlf=input core.eol=lf file=LF
+			test_must_fail test-tool wildmatch wildmatch '-adobe-courier-bold-o-normal--12-120-75-75-X-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
+		
+ok 1453 - wildmatch: no match '-adobe-courier-bold-o-normal--12-120-75-75-X-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_input_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 472 - checkout attr=-text  aeol=crlf core.autocrlf=input core.eol=lf file=CRLF
+				>expect &&
+				git --glob-pathspecs ls-files -z -- '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1454 - wildmatch (via ls-files): no match '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' '-adobe-courier-bold-o-normal--12-120-75-75-X-70-iso8859-1'
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_input_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 473 - checkout attr=-text  aeol=crlf core.autocrlf=input core.eol=lf file=CRLF_mix_LF
+			test_must_fail test-tool wildmatch iwildmatch '-adobe-courier-bold-o-normal--12-120-75-75-X-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
+		
+ok 1455 - iwildmatch: no match '-adobe-courier-bold-o-normal--12-120-75-75-X-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_input_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 474 - checkout attr=-text  aeol=crlf core.autocrlf=input core.eol=lf file=LF_mix_CR
+				>expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1456 - iwildmatch (via ls-files): no match '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' '-adobe-courier-bold-o-normal--12-120-75-75-X-70-iso8859-1'
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_input_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 475 - checkout attr=-text  aeol=crlf core.autocrlf=input core.eol=lf file=LF_nul
+			test_must_fail test-tool wildmatch pathmatch '-adobe-courier-bold-o-normal--12-120-75-75-X-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
+		
+ok 1457 - pathmatch: no match '-adobe-courier-bold-o-normal--12-120-75-75-X-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
 
 expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
+				>expect &&
+				git ls-files -z -- '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
 		test_cmp expect actual
-	
-ok 476 - ls-files --eol attr=text  aeol=lf core.autocrlf=input core.eol=lf
+			
+ok 1458 - pathmatch (via ls-files): no match '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' '-adobe-courier-bold-o-normal--12-120-75-75-X-70-iso8859-1'
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_input_attr_text_ LF    crlf_false_attr__LF.txt
-	
-ok 477 - checkout attr=text  aeol=lf core.autocrlf=input core.eol=lf file=LF
+			test_must_fail test-tool wildmatch ipathmatch '-adobe-courier-bold-o-normal--12-120-75-75-X-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
+		
+ok 1459 - ipathmatch: no match '-adobe-courier-bold-o-normal--12-120-75-75-X-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_input_attr_text_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 478 - checkout attr=text  aeol=lf core.autocrlf=input core.eol=lf file=CRLF
+				>expect &&
+				git --icase-pathspecs ls-files -z -- '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1460 - ipathmatch (via ls-files): no match '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' '-adobe-courier-bold-o-normal--12-120-75-75-X-70-iso8859-1'
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_input_attr_text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
 	
-ok 479 - checkout attr=text  aeol=lf core.autocrlf=input core.eol=lf file=CRLF_mix_LF
+Removing -adobe-courier-bold-o-normal--12-120-75-75-X-70-iso8859-1
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1461 - cleanup after previous file test
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_input_attr_text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
 	
-ok 480 - checkout attr=text  aeol=lf core.autocrlf=input core.eol=lf file=LF_mix_CR
+ok 1462 - setup match file test for -adobe-courier-bold-o-normal--12-120-75-75-/-70-iso8859-1
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_input_attr_text_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 481 - checkout attr=text  aeol=lf core.autocrlf=input core.eol=lf file=LF_nul
+			test_must_fail test-tool wildmatch wildmatch '-adobe-courier-bold-o-normal--12-120-75-75-/-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
+		
+ok 1463 - wildmatch: no match '-adobe-courier-bold-o-normal--12-120-75-75-/-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
 
 expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
+				>expect &&
+				git --glob-pathspecs ls-files -z -- '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
 		test_cmp expect actual
-	
-ok 482 - ls-files --eol attr=text  aeol=crlf core.autocrlf=input core.eol=lf
+			
+ok 1464 - wildmatch (via ls-files): no match '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' '-adobe-courier-bold-o-normal--12-120-75-75-/-70-iso8859-1'
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_input_attr_text_ CRLF    crlf_false_attr__LF.txt
-	
-ok 483 - checkout attr=text  aeol=crlf core.autocrlf=input core.eol=lf file=LF
+			test_must_fail test-tool wildmatch iwildmatch '-adobe-courier-bold-o-normal--12-120-75-75-/-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
+		
+ok 1465 - iwildmatch: no match '-adobe-courier-bold-o-normal--12-120-75-75-/-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_input_attr_text_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 484 - checkout attr=text  aeol=crlf core.autocrlf=input core.eol=lf file=CRLF
+				>expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1466 - iwildmatch (via ls-files): no match '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' '-adobe-courier-bold-o-normal--12-120-75-75-/-70-iso8859-1'
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_input_attr_text_ CRLF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 485 - checkout attr=text  aeol=crlf core.autocrlf=input core.eol=lf file=CRLF_mix_LF
+			test_must_fail test-tool wildmatch pathmatch '-adobe-courier-bold-o-normal--12-120-75-75-/-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
+		
+ok 1467 - pathmatch: no match '-adobe-courier-bold-o-normal--12-120-75-75-/-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_input_attr_text_ CRLF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 486 - checkout attr=text  aeol=crlf core.autocrlf=input core.eol=lf file=LF_mix_CR
+				>expect &&
+				git ls-files -z -- '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1468 - pathmatch (via ls-files): no match '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' '-adobe-courier-bold-o-normal--12-120-75-75-/-70-iso8859-1'
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_input_attr_text_ CRLF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 487 - checkout attr=text  aeol=crlf core.autocrlf=input core.eol=lf file=LF_nul
+			test_must_fail test-tool wildmatch ipathmatch '-adobe-courier-bold-o-normal--12-120-75-75-/-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
+		
+ok 1469 - ipathmatch: no match '-adobe-courier-bold-o-normal--12-120-75-75-/-70-iso8859-1' '-*-*-*-*-*-*-12-*-*-*-m-*-*-*'
 
 expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
+				>expect &&
+				git --icase-pathspecs ls-files -z -- '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
 		test_cmp expect actual
-	
-ok 488 - ls-files --eol attr=auto  aeol=lf core.autocrlf=input core.eol=lf
+			
+ok 1470 - ipathmatch (via ls-files): no match '-*-*-*-*-*-*-12-*-*-*-m-*-*-*' '-adobe-courier-bold-o-normal--12-120-75-75-/-70-iso8859-1'
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_input_attr_auto_ LF    crlf_false_attr__LF.txt
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
 	
-ok 489 - checkout attr=auto  aeol=lf core.autocrlf=input core.eol=lf file=LF
+Removing -adobe-courier-bold-o-normal--12-120-75-75-/
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1471 - cleanup after previous file test
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_input_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
 	
-ok 490 - checkout attr=auto  aeol=lf core.autocrlf=input core.eol=lf file=CRLF
+ok 1472 - setup match file test for XXX/adobe/courier/bold/o/normal//12/120/75/75/m/70/iso8859/1
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_input_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 491 - checkout attr=auto  aeol=lf core.autocrlf=input core.eol=lf file=CRLF_mix_LF
+			test-tool wildmatch wildmatch 'XXX/adobe/courier/bold/o/normal//12/120/75/75/m/70/iso8859/1' 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*'
+		
+ok 1473 - wildmatch: match 'XXX/adobe/courier/bold/o/normal//12/120/75/75/m/70/iso8859/1' 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*'
 
-expecting success: 
-		compare_ws_file eol_lf_crlf_input_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 492 - checkout attr=auto  aeol=lf core.autocrlf=input core.eol=lf file=LF_mix_CR
+checking known breakage: false
+not ok 1474 - wildmatch (via ls-files): match skip 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*' 'XXX/adobe/courier/bold/o/normal//12/120/75/75/m/70/iso8859/1' # TODO known breakage
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_input_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 493 - checkout attr=auto  aeol=lf core.autocrlf=input core.eol=lf file=LF_nul
+			test-tool wildmatch iwildmatch 'XXX/adobe/courier/bold/o/normal//12/120/75/75/m/70/iso8859/1' 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*'
+		
+ok 1475 - iwildmatch: match 'XXX/adobe/courier/bold/o/normal//12/120/75/75/m/70/iso8859/1' 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*'
 
-expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
-		test_cmp expect actual
-	
-ok 494 - ls-files --eol attr=auto  aeol=crlf core.autocrlf=input core.eol=lf
+checking known breakage: false
+not ok 1476 - iwildmatch (via ls-files): match skip 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*' 'XXX/adobe/courier/bold/o/normal//12/120/75/75/m/70/iso8859/1' # TODO known breakage
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_input_attr_auto_ CRLF    crlf_false_attr__LF.txt
-	
-ok 495 - checkout attr=auto  aeol=crlf core.autocrlf=input core.eol=lf file=LF
+			test-tool wildmatch pathmatch 'XXX/adobe/courier/bold/o/normal//12/120/75/75/m/70/iso8859/1' 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*'
+		
+ok 1477 - pathmatch: match 'XXX/adobe/courier/bold/o/normal//12/120/75/75/m/70/iso8859/1' 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*'
 
-expecting success: 
-		compare_ws_file eol_lf_crlf_input_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 496 - checkout attr=auto  aeol=crlf core.autocrlf=input core.eol=lf file=CRLF
+checking known breakage: false
+not ok 1478 - pathmatch (via ls-files): match skip 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*' 'XXX/adobe/courier/bold/o/normal//12/120/75/75/m/70/iso8859/1' # TODO known breakage
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_input_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 497 - checkout attr=auto  aeol=crlf core.autocrlf=input core.eol=lf file=CRLF_mix_LF
+			test-tool wildmatch ipathmatch 'XXX/adobe/courier/bold/o/normal//12/120/75/75/m/70/iso8859/1' 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*'
+		
+ok 1479 - ipathmatch: match 'XXX/adobe/courier/bold/o/normal//12/120/75/75/m/70/iso8859/1' 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*'
 
-expecting success: 
-		compare_ws_file eol_lf_crlf_input_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 498 - checkout attr=auto  aeol=crlf core.autocrlf=input core.eol=lf file=LF_mix_CR
+checking known breakage: false
+not ok 1480 - ipathmatch (via ls-files): match skip 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*' 'XXX/adobe/courier/bold/o/normal//12/120/75/75/m/70/iso8859/1' # TODO known breakage
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_input_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
 	
-ok 499 - checkout attr=auto  aeol=crlf core.autocrlf=input core.eol=lf file=LF_nul
+ok 1481 - cleanup after previous file test
 
 expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
-		test_cmp expect actual
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
 	
-ok 500 - ls-files --eol attr=  aeol= core.autocrlf=false core.eol=lf
+ok 1482 - setup match file test for XXX/adobe/courier/bold/o/normal//12/120/75/75/X/70/iso8859/1
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_false_attr__ LF    crlf_false_attr__LF.txt
-	
-ok 501 - checkout attr=  aeol= core.autocrlf=false core.eol=lf file=LF
+			test_must_fail test-tool wildmatch wildmatch 'XXX/adobe/courier/bold/o/normal//12/120/75/75/X/70/iso8859/1' 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*'
+		
+ok 1483 - wildmatch: no match 'XXX/adobe/courier/bold/o/normal//12/120/75/75/X/70/iso8859/1' 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*'
 
-expecting success: 
-		compare_ws_file eol_lf_crlf_false_attr__ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 502 - checkout attr=  aeol= core.autocrlf=false core.eol=lf file=CRLF
+checking known breakage: false
+not ok 1484 - wildmatch (via ls-files): no match skip 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*' 'XXX/adobe/courier/bold/o/normal//12/120/75/75/X/70/iso8859/1' # TODO known breakage
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_false_attr__ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 503 - checkout attr=  aeol= core.autocrlf=false core.eol=lf file=CRLF_mix_LF
+			test_must_fail test-tool wildmatch iwildmatch 'XXX/adobe/courier/bold/o/normal//12/120/75/75/X/70/iso8859/1' 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*'
+		
+ok 1485 - iwildmatch: no match 'XXX/adobe/courier/bold/o/normal//12/120/75/75/X/70/iso8859/1' 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*'
 
-expecting success: 
-		compare_ws_file eol_lf_crlf_false_attr__ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 504 - checkout attr=  aeol= core.autocrlf=false core.eol=lf file=LF_mix_CR
+checking known breakage: false
+not ok 1486 - iwildmatch (via ls-files): no match skip 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*' 'XXX/adobe/courier/bold/o/normal//12/120/75/75/X/70/iso8859/1' # TODO known breakage
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_false_attr__ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 505 - checkout attr=  aeol= core.autocrlf=false core.eol=lf file=LF_nul
+			test_must_fail test-tool wildmatch pathmatch 'XXX/adobe/courier/bold/o/normal//12/120/75/75/X/70/iso8859/1' 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*'
+		
+ok 1487 - pathmatch: no match 'XXX/adobe/courier/bold/o/normal//12/120/75/75/X/70/iso8859/1' 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*'
 
-expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
-		test_cmp expect actual
-	
-ok 506 - ls-files --eol attr=  aeol= core.autocrlf=true core.eol=lf
+checking known breakage: false
+not ok 1488 - pathmatch (via ls-files): no match skip 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*' 'XXX/adobe/courier/bold/o/normal//12/120/75/75/X/70/iso8859/1' # TODO known breakage
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_true_attr__ CRLF    crlf_false_attr__LF.txt
-	
-ok 507 - checkout attr=  aeol= core.autocrlf=true core.eol=lf file=LF
+			test_must_fail test-tool wildmatch ipathmatch 'XXX/adobe/courier/bold/o/normal//12/120/75/75/X/70/iso8859/1' 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*'
+		
+ok 1489 - ipathmatch: no match 'XXX/adobe/courier/bold/o/normal//12/120/75/75/X/70/iso8859/1' 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*'
 
-expecting success: 
-		compare_ws_file eol_lf_crlf_true_attr__ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 508 - checkout attr=  aeol= core.autocrlf=true core.eol=lf file=CRLF
+checking known breakage: false
+not ok 1490 - ipathmatch (via ls-files): no match skip 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*' 'XXX/adobe/courier/bold/o/normal//12/120/75/75/X/70/iso8859/1' # TODO known breakage
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_true_attr__ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
 	
-ok 509 - checkout attr=  aeol= core.autocrlf=true core.eol=lf file=CRLF_mix_LF
+ok 1491 - cleanup after previous file test
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_true_attr__ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
 	
-ok 510 - checkout attr=  aeol= core.autocrlf=true core.eol=lf file=LF_mix_CR
+ok 1492 - setup match file test for abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_true_attr__ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 511 - checkout attr=  aeol= core.autocrlf=true core.eol=lf file=LF_nul
+			test-tool wildmatch wildmatch 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt' '**/*a*b*g*n*t'
+		
+ok 1493 - wildmatch: match 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt' '**/*a*b*g*n*t'
 
 expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
+				printf '%s' 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt' >expect &&
+				git --glob-pathspecs ls-files -z -- '**/*a*b*g*n*t' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
 		test_cmp expect actual
-	
-ok 512 - ls-files --eol attr=auto  aeol= core.autocrlf=true core.eol=lf
+			
+ok 1494 - wildmatch (via ls-files): match '**/*a*b*g*n*t' 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt'
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_true_attr_auto_ CRLF    crlf_false_attr__LF.txt
-	
-ok 513 - checkout attr=auto  aeol= core.autocrlf=true core.eol=lf file=LF
+			test-tool wildmatch iwildmatch 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt' '**/*a*b*g*n*t'
+		
+ok 1495 - iwildmatch: match 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt' '**/*a*b*g*n*t'
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_true_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 514 - checkout attr=auto  aeol= core.autocrlf=true core.eol=lf file=CRLF
+				printf '%s' 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '**/*a*b*g*n*t' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1496 - iwildmatch (via ls-files): match '**/*a*b*g*n*t' 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt'
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_true_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 515 - checkout attr=auto  aeol= core.autocrlf=true core.eol=lf file=CRLF_mix_LF
+			test-tool wildmatch pathmatch 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt' '**/*a*b*g*n*t'
+		
+ok 1497 - pathmatch: match 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt' '**/*a*b*g*n*t'
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_true_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 516 - checkout attr=auto  aeol= core.autocrlf=true core.eol=lf file=LF_mix_CR
+				printf '%s' 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt' >expect &&
+				git ls-files -z -- '**/*a*b*g*n*t' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1498 - pathmatch (via ls-files): match '**/*a*b*g*n*t' 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt'
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_true_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 517 - checkout attr=auto  aeol= core.autocrlf=true core.eol=lf file=LF_nul
+			test-tool wildmatch ipathmatch 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt' '**/*a*b*g*n*t'
+		
+ok 1499 - ipathmatch: match 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt' '**/*a*b*g*n*t'
 
 expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
+				printf '%s' 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt' >expect &&
+				git --icase-pathspecs ls-files -z -- '**/*a*b*g*n*t' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
 		test_cmp expect actual
-	
-ok 518 - ls-files --eol attr=text  aeol= core.autocrlf=true core.eol=lf
+			
+ok 1500 - ipathmatch (via ls-files): match '**/*a*b*g*n*t' 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt'
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_true_attr_text_ CRLF    crlf_false_attr__LF.txt
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
 	
-ok 519 - checkout attr=text  aeol= core.autocrlf=true core.eol=lf file=LF
+Removing abcd/
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1501 - cleanup after previous file test
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_true_attr_text_ CRLF  crlf_false_attr__CRLF.txt
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
 	
-ok 520 - checkout attr=text  aeol= core.autocrlf=true core.eol=lf file=CRLF
+ok 1502 - setup match file test for abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txtz
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_true_attr_text_ CRLF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 521 - checkout attr=text  aeol= core.autocrlf=true core.eol=lf file=CRLF_mix_LF
+			test_must_fail test-tool wildmatch wildmatch 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txtz' '**/*a*b*g*n*t'
+		
+ok 1503 - wildmatch: no match 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txtz' '**/*a*b*g*n*t'
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_true_attr_text_ CRLF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 522 - checkout attr=text  aeol= core.autocrlf=true core.eol=lf file=LF_mix_CR
+				>expect &&
+				git --glob-pathspecs ls-files -z -- '**/*a*b*g*n*t' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1504 - wildmatch (via ls-files): no match '**/*a*b*g*n*t' 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txtz'
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_true_attr_text_ CRLF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 523 - checkout attr=text  aeol= core.autocrlf=true core.eol=lf file=LF_nul
+			test_must_fail test-tool wildmatch iwildmatch 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txtz' '**/*a*b*g*n*t'
+		
+ok 1505 - iwildmatch: no match 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txtz' '**/*a*b*g*n*t'
 
 expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
+				>expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '**/*a*b*g*n*t' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
 		test_cmp expect actual
-	
-ok 524 - ls-files --eol attr=text  aeol= core.autocrlf=input core.eol=lf
+			
+ok 1506 - iwildmatch (via ls-files): no match '**/*a*b*g*n*t' 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txtz'
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_input_attr_text_ LF    crlf_false_attr__LF.txt
-	
-ok 525 - checkout attr=text  aeol= core.autocrlf=input core.eol=lf file=LF
+			test_must_fail test-tool wildmatch pathmatch 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txtz' '**/*a*b*g*n*t'
+		
+ok 1507 - pathmatch: no match 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txtz' '**/*a*b*g*n*t'
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_input_attr_text_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 526 - checkout attr=text  aeol= core.autocrlf=input core.eol=lf file=CRLF
+				>expect &&
+				git ls-files -z -- '**/*a*b*g*n*t' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1508 - pathmatch (via ls-files): no match '**/*a*b*g*n*t' 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txtz'
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_input_attr_text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 527 - checkout attr=text  aeol= core.autocrlf=input core.eol=lf file=CRLF_mix_LF
+			test_must_fail test-tool wildmatch ipathmatch 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txtz' '**/*a*b*g*n*t'
+		
+ok 1509 - ipathmatch: no match 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txtz' '**/*a*b*g*n*t'
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_input_attr_text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 528 - checkout attr=text  aeol= core.autocrlf=input core.eol=lf file=LF_mix_CR
+				>expect &&
+				git --icase-pathspecs ls-files -z -- '**/*a*b*g*n*t' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1510 - ipathmatch (via ls-files): no match '**/*a*b*g*n*t' 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txtz'
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_input_attr_text_ LF_nul   crlf_false_attr__LF_nul.txt
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
 	
-ok 529 - checkout attr=text  aeol= core.autocrlf=input core.eol=lf file=LF_nul
+Removing abcd/
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1511 - cleanup after previous file test
 
 expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
-		test_cmp expect actual
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
 	
-ok 530 - ls-files --eol attr=auto  aeol= core.autocrlf=input core.eol=lf
+ok 1512 - setup match file test for foo
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_input_attr_auto_ LF    crlf_false_attr__LF.txt
-	
-ok 531 - checkout attr=auto  aeol= core.autocrlf=input core.eol=lf file=LF
+			test_must_fail test-tool wildmatch wildmatch 'foo' '*/*/*'
+		
+ok 1513 - wildmatch: no match 'foo' '*/*/*'
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_input_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 532 - checkout attr=auto  aeol= core.autocrlf=input core.eol=lf file=CRLF
+				>expect &&
+				git --glob-pathspecs ls-files -z -- '*/*/*' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1514 - wildmatch (via ls-files): no match '*/*/*' 'foo'
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_input_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 533 - checkout attr=auto  aeol= core.autocrlf=input core.eol=lf file=CRLF_mix_LF
+			test_must_fail test-tool wildmatch iwildmatch 'foo' '*/*/*'
+		
+ok 1515 - iwildmatch: no match 'foo' '*/*/*'
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_input_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 534 - checkout attr=auto  aeol= core.autocrlf=input core.eol=lf file=LF_mix_CR
+				>expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '*/*/*' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1516 - iwildmatch (via ls-files): no match '*/*/*' 'foo'
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_input_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 535 - checkout attr=auto  aeol= core.autocrlf=input core.eol=lf file=LF_nul
+			test_must_fail test-tool wildmatch pathmatch 'foo' '*/*/*'
+		
+ok 1517 - pathmatch: no match 'foo' '*/*/*'
 
 expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
+				>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 536 - ls-files --eol attr=-text  aeol= core.autocrlf=true core.eol=crlf
+			
+ok 1518 - pathmatch (via ls-files): no match '*/*/*' 'foo'
 
 expecting success: 
-		compare_ws_file eol_crlf_crlf_true_attr_-text_ LF    crlf_false_attr__LF.txt
-	
-ok 537 - checkout attr=-text  aeol= core.autocrlf=true core.eol=crlf file=LF
+			test_must_fail test-tool wildmatch ipathmatch 'foo' '*/*/*'
+		
+ok 1519 - ipathmatch: no match 'foo' '*/*/*'
 
 expecting success: 
-		compare_ws_file eol_crlf_crlf_true_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 538 - checkout attr=-text  aeol= core.autocrlf=true core.eol=crlf file=CRLF
+				>expect &&
+				git --icase-pathspecs ls-files -z -- '*/*/*' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1520 - ipathmatch (via ls-files): no match '*/*/*' 'foo'
 
 expecting success: 
-		compare_ws_file eol_crlf_crlf_true_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
 	
-ok 539 - checkout attr=-text  aeol= core.autocrlf=true core.eol=crlf file=CRLF_mix_LF
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+Removing foo
+ok 1521 - cleanup after previous file test
 
 expecting success: 
-		compare_ws_file eol_crlf_crlf_true_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
 	
-ok 540 - checkout attr=-text  aeol= core.autocrlf=true core.eol=crlf file=LF_mix_CR
+ok 1522 - setup match file test for foo/bar
 
 expecting success: 
-		compare_ws_file eol_crlf_crlf_true_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 541 - checkout attr=-text  aeol= core.autocrlf=true core.eol=crlf file=LF_nul
+			test_must_fail test-tool wildmatch wildmatch 'foo/bar' '*/*/*'
+		
+ok 1523 - wildmatch: no match 'foo/bar' '*/*/*'
 
 expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
+				>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 542 - ls-files --eol attr=-text  aeol=lf core.autocrlf=true core.eol=crlf
+			
+ok 1524 - wildmatch (via ls-files): no match '*/*/*' 'foo/bar'
 
 expecting success: 
-		compare_ws_file eol_crlf_crlf_true_attr_-text_ LF    crlf_false_attr__LF.txt
-	
-ok 543 - checkout attr=-text  aeol=lf core.autocrlf=true core.eol=crlf file=LF
+			test_must_fail test-tool wildmatch iwildmatch 'foo/bar' '*/*/*'
+		
+ok 1525 - iwildmatch: no match 'foo/bar' '*/*/*'
 
 expecting success: 
-		compare_ws_file eol_crlf_crlf_true_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 544 - checkout attr=-text  aeol=lf core.autocrlf=true core.eol=crlf file=CRLF
+				>expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '*/*/*' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1526 - iwildmatch (via ls-files): no match '*/*/*' 'foo/bar'
 
 expecting success: 
-		compare_ws_file eol_crlf_crlf_true_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 545 - checkout attr=-text  aeol=lf core.autocrlf=true core.eol=crlf file=CRLF_mix_LF
+			test_must_fail test-tool wildmatch pathmatch 'foo/bar' '*/*/*'
+		
+ok 1527 - pathmatch: no match 'foo/bar' '*/*/*'
 
 expecting success: 
-		compare_ws_file eol_crlf_crlf_true_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 546 - checkout attr=-text  aeol=lf core.autocrlf=true core.eol=crlf file=LF_mix_CR
+				>expect &&
+				git ls-files -z -- '*/*/*' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1528 - pathmatch (via ls-files): no match '*/*/*' 'foo/bar'
 
 expecting success: 
-		compare_ws_file eol_crlf_crlf_true_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 547 - checkout attr=-text  aeol=lf core.autocrlf=true core.eol=crlf file=LF_nul
+			test_must_fail test-tool wildmatch ipathmatch 'foo/bar' '*/*/*'
+		
+ok 1529 - ipathmatch: no match 'foo/bar' '*/*/*'
 
 expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
+				>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 548 - ls-files --eol attr=-text  aeol=crlf core.autocrlf=true core.eol=crlf
+			
+ok 1530 - ipathmatch (via ls-files): no match '*/*/*' 'foo/bar'
 
 expecting success: 
-		compare_ws_file eol_crlf_crlf_true_attr_-text_ LF    crlf_false_attr__LF.txt
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
 	
-ok 549 - checkout attr=-text  aeol=crlf core.autocrlf=true core.eol=crlf file=LF
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+Removing foo/
+ok 1531 - cleanup after previous file test
 
 expecting success: 
-		compare_ws_file eol_crlf_crlf_true_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
 	
-ok 550 - checkout attr=-text  aeol=crlf core.autocrlf=true core.eol=crlf file=CRLF
+ok 1532 - setup match file test for foo/bba/arr
 
 expecting success: 
-		compare_ws_file eol_crlf_crlf_true_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 551 - checkout attr=-text  aeol=crlf core.autocrlf=true core.eol=crlf file=CRLF_mix_LF
+			test-tool wildmatch wildmatch 'foo/bba/arr' '*/*/*'
+		
+ok 1533 - wildmatch: match 'foo/bba/arr' '*/*/*'
 
 expecting success: 
-		compare_ws_file eol_crlf_crlf_true_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 552 - checkout attr=-text  aeol=crlf core.autocrlf=true core.eol=crlf file=LF_mix_CR
+				printf '%s' 'foo/bba/arr' >expect &&
+				git --glob-pathspecs ls-files -z -- '*/*/*' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1534 - wildmatch (via ls-files): match '*/*/*' 'foo/bba/arr'
 
 expecting success: 
-		compare_ws_file eol_crlf_crlf_true_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 553 - checkout attr=-text  aeol=crlf core.autocrlf=true core.eol=crlf file=LF_nul
+			test-tool wildmatch iwildmatch 'foo/bba/arr' '*/*/*'
+		
+ok 1535 - iwildmatch: match 'foo/bba/arr' '*/*/*'
 
 expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
+				printf '%s' 'foo/bba/arr' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '*/*/*' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
 		test_cmp expect actual
-	
-ok 554 - ls-files --eol attr=text  aeol=lf core.autocrlf=true core.eol=crlf
+			
+ok 1536 - iwildmatch (via ls-files): match '*/*/*' 'foo/bba/arr'
 
 expecting success: 
-		compare_ws_file eol_crlf_crlf_true_attr_text_ LF    crlf_false_attr__LF.txt
-	
-ok 555 - checkout attr=text  aeol=lf core.autocrlf=true core.eol=crlf file=LF
+			test-tool wildmatch pathmatch 'foo/bba/arr' '*/*/*'
+		
+ok 1537 - pathmatch: match 'foo/bba/arr' '*/*/*'
 
 expecting success: 
-		compare_ws_file eol_crlf_crlf_true_attr_text_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 556 - checkout attr=text  aeol=lf core.autocrlf=true core.eol=crlf file=CRLF
+				printf '%s' 'foo/bba/arr' >expect &&
+				git ls-files -z -- '*/*/*' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1538 - pathmatch (via ls-files): match '*/*/*' 'foo/bba/arr'
 
 expecting success: 
-		compare_ws_file eol_crlf_crlf_true_attr_text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 557 - checkout attr=text  aeol=lf core.autocrlf=true core.eol=crlf file=CRLF_mix_LF
+			test-tool wildmatch ipathmatch 'foo/bba/arr' '*/*/*'
+		
+ok 1539 - ipathmatch: match 'foo/bba/arr' '*/*/*'
 
 expecting success: 
-		compare_ws_file eol_crlf_crlf_true_attr_text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 558 - checkout attr=text  aeol=lf core.autocrlf=true core.eol=crlf file=LF_mix_CR
+				printf '%s' 'foo/bba/arr' >expect &&
+				git --icase-pathspecs ls-files -z -- '*/*/*' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1540 - ipathmatch (via ls-files): match '*/*/*' 'foo/bba/arr'
 
 expecting success: 
-		compare_ws_file eol_crlf_crlf_true_attr_text_ LF_nul   crlf_false_attr__LF_nul.txt
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
 	
-ok 559 - checkout attr=text  aeol=lf core.autocrlf=true core.eol=crlf file=LF_nul
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+Removing foo/
+ok 1541 - cleanup after previous file test
 
 expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
-		test_cmp expect actual
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
 	
-ok 560 - ls-files --eol attr=text  aeol=crlf core.autocrlf=true core.eol=crlf
+ok 1542 - setup match file test for foo/bb/aa/rr
 
 expecting success: 
-		compare_ws_file eol_crlf_crlf_true_attr_text_ CRLF    crlf_false_attr__LF.txt
-	
-ok 561 - checkout attr=text  aeol=crlf core.autocrlf=true core.eol=crlf file=LF
+			test_must_fail test-tool wildmatch wildmatch 'foo/bb/aa/rr' '*/*/*'
+		
+ok 1543 - wildmatch: no match 'foo/bb/aa/rr' '*/*/*'
 
 expecting success: 
-		compare_ws_file eol_crlf_crlf_true_attr_text_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 562 - checkout attr=text  aeol=crlf core.autocrlf=true core.eol=crlf file=CRLF
+				>expect &&
+				git --glob-pathspecs ls-files -z -- '*/*/*' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1544 - wildmatch (via ls-files): no match '*/*/*' 'foo/bb/aa/rr'
 
 expecting success: 
-		compare_ws_file eol_crlf_crlf_true_attr_text_ CRLF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 563 - checkout attr=text  aeol=crlf core.autocrlf=true core.eol=crlf file=CRLF_mix_LF
+			test_must_fail test-tool wildmatch iwildmatch 'foo/bb/aa/rr' '*/*/*'
+		
+ok 1545 - iwildmatch: no match 'foo/bb/aa/rr' '*/*/*'
 
 expecting success: 
-		compare_ws_file eol_crlf_crlf_true_attr_text_ CRLF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 564 - checkout attr=text  aeol=crlf core.autocrlf=true core.eol=crlf file=LF_mix_CR
+				>expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '*/*/*' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1546 - iwildmatch (via ls-files): no match '*/*/*' 'foo/bb/aa/rr'
 
 expecting success: 
-		compare_ws_file eol_crlf_crlf_true_attr_text_ CRLF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 565 - checkout attr=text  aeol=crlf core.autocrlf=true core.eol=crlf file=LF_nul
+			test-tool wildmatch pathmatch 'foo/bb/aa/rr' '*/*/*'
+		
+ok 1547 - pathmatch: match 'foo/bb/aa/rr' '*/*/*'
 
 expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
+				printf '%s' 'foo/bb/aa/rr' >expect &&
+				git ls-files -z -- '*/*/*' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
 		test_cmp expect actual
-	
-ok 566 - ls-files --eol attr=auto  aeol=lf core.autocrlf=true core.eol=crlf
+			
+ok 1548 - pathmatch (via ls-files): match '*/*/*' 'foo/bb/aa/rr'
 
 expecting success: 
-		compare_ws_file eol_crlf_crlf_true_attr_auto_ LF    crlf_false_attr__LF.txt
-	
-ok 567 - checkout attr=auto  aeol=lf core.autocrlf=true core.eol=crlf file=LF
+			test-tool wildmatch ipathmatch 'foo/bb/aa/rr' '*/*/*'
+		
+ok 1549 - ipathmatch: match 'foo/bb/aa/rr' '*/*/*'
 
 expecting success: 
-		compare_ws_file eol_crlf_crlf_true_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 568 - checkout attr=auto  aeol=lf core.autocrlf=true core.eol=crlf file=CRLF
+				printf '%s' 'foo/bb/aa/rr' >expect &&
+				git --icase-pathspecs ls-files -z -- '*/*/*' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1550 - ipathmatch (via ls-files): match '*/*/*' 'foo/bb/aa/rr'
 
 expecting success: 
-		compare_ws_file eol_crlf_crlf_true_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
 	
-ok 569 - checkout attr=auto  aeol=lf core.autocrlf=true core.eol=crlf file=CRLF_mix_LF
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+Removing foo/
+ok 1551 - cleanup after previous file test
 
 expecting success: 
-		compare_ws_file eol_crlf_crlf_true_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
 	
-ok 570 - checkout attr=auto  aeol=lf core.autocrlf=true core.eol=crlf file=LF_mix_CR
+ok 1552 - setup match file test for foo/bb/aa/rr
 
 expecting success: 
-		compare_ws_file eol_crlf_crlf_true_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 571 - checkout attr=auto  aeol=lf core.autocrlf=true core.eol=crlf file=LF_nul
+			test-tool wildmatch wildmatch 'foo/bb/aa/rr' '**/**/**'
+		
+ok 1553 - wildmatch: match 'foo/bb/aa/rr' '**/**/**'
 
 expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
+				printf '%s' 'foo/bb/aa/rr' >expect &&
+				git --glob-pathspecs ls-files -z -- '**/**/**' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
 		test_cmp expect actual
-	
-ok 572 - ls-files --eol attr=auto  aeol=crlf core.autocrlf=true core.eol=crlf
+			
+ok 1554 - wildmatch (via ls-files): match '**/**/**' 'foo/bb/aa/rr'
 
 expecting success: 
-		compare_ws_file eol_crlf_crlf_true_attr_auto_ CRLF    crlf_false_attr__LF.txt
-	
-ok 573 - checkout attr=auto  aeol=crlf core.autocrlf=true core.eol=crlf file=LF
+			test-tool wildmatch iwildmatch 'foo/bb/aa/rr' '**/**/**'
+		
+ok 1555 - iwildmatch: match 'foo/bb/aa/rr' '**/**/**'
 
 expecting success: 
-		compare_ws_file eol_crlf_crlf_true_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 574 - checkout attr=auto  aeol=crlf core.autocrlf=true core.eol=crlf file=CRLF
+				printf '%s' 'foo/bb/aa/rr' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '**/**/**' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1556 - iwildmatch (via ls-files): match '**/**/**' 'foo/bb/aa/rr'
 
 expecting success: 
-		compare_ws_file eol_crlf_crlf_true_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 575 - checkout attr=auto  aeol=crlf core.autocrlf=true core.eol=crlf file=CRLF_mix_LF
+			test-tool wildmatch pathmatch 'foo/bb/aa/rr' '**/**/**'
+		
+ok 1557 - pathmatch: match 'foo/bb/aa/rr' '**/**/**'
 
 expecting success: 
-		compare_ws_file eol_crlf_crlf_true_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 576 - checkout attr=auto  aeol=crlf core.autocrlf=true core.eol=crlf file=LF_mix_CR
+				printf '%s' 'foo/bb/aa/rr' >expect &&
+				git ls-files -z -- '**/**/**' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1558 - pathmatch (via ls-files): match '**/**/**' 'foo/bb/aa/rr'
 
 expecting success: 
-		compare_ws_file eol_crlf_crlf_true_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 577 - checkout attr=auto  aeol=crlf core.autocrlf=true core.eol=crlf file=LF_nul
+			test-tool wildmatch ipathmatch 'foo/bb/aa/rr' '**/**/**'
+		
+ok 1559 - ipathmatch: match 'foo/bb/aa/rr' '**/**/**'
 
 expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
+				printf '%s' 'foo/bb/aa/rr' >expect &&
+				git --icase-pathspecs ls-files -z -- '**/**/**' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
 		test_cmp expect actual
-	
-ok 578 - ls-files --eol attr=-text  aeol= core.autocrlf=false core.eol=crlf
+			
+ok 1560 - ipathmatch (via ls-files): match '**/**/**' 'foo/bb/aa/rr'
 
 expecting success: 
-		compare_ws_file eol_crlf_crlf_false_attr_-text_ LF    crlf_false_attr__LF.txt
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
 	
-ok 579 - checkout attr=-text  aeol= core.autocrlf=false core.eol=crlf file=LF
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+Removing foo/
+ok 1561 - cleanup after previous file test
 
 expecting success: 
-		compare_ws_file eol_crlf_crlf_false_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
 	
-ok 580 - checkout attr=-text  aeol= core.autocrlf=false core.eol=crlf file=CRLF
+ok 1562 - setup match file test for abcXdefXghi
 
 expecting success: 
-		compare_ws_file eol_crlf_crlf_false_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 581 - checkout attr=-text  aeol= core.autocrlf=false core.eol=crlf file=CRLF_mix_LF
+			test-tool wildmatch wildmatch 'abcXdefXghi' '*X*i'
+		
+ok 1563 - wildmatch: match 'abcXdefXghi' '*X*i'
 
 expecting success: 
-		compare_ws_file eol_crlf_crlf_false_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 582 - checkout attr=-text  aeol= core.autocrlf=false core.eol=crlf file=LF_mix_CR
+				printf '%s' 'abcXdefXghi' >expect &&
+				git --glob-pathspecs ls-files -z -- '*X*i' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1564 - wildmatch (via ls-files): match '*X*i' 'abcXdefXghi'
 
 expecting success: 
-		compare_ws_file eol_crlf_crlf_false_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 583 - checkout attr=-text  aeol= core.autocrlf=false core.eol=crlf file=LF_nul
+			test-tool wildmatch iwildmatch 'abcXdefXghi' '*X*i'
+		
+ok 1565 - iwildmatch: match 'abcXdefXghi' '*X*i'
 
 expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
+				printf '%s' 'abcXdefXghi' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '*X*i' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
 		test_cmp expect actual
-	
-ok 584 - ls-files --eol attr=-text  aeol=lf core.autocrlf=false core.eol=crlf
+			
+ok 1566 - iwildmatch (via ls-files): match '*X*i' 'abcXdefXghi'
 
 expecting success: 
-		compare_ws_file eol_crlf_crlf_false_attr_-text_ LF    crlf_false_attr__LF.txt
-	
-ok 585 - checkout attr=-text  aeol=lf core.autocrlf=false core.eol=crlf file=LF
+			test-tool wildmatch pathmatch 'abcXdefXghi' '*X*i'
+		
+ok 1567 - pathmatch: match 'abcXdefXghi' '*X*i'
 
 expecting success: 
-		compare_ws_file eol_crlf_crlf_false_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 586 - checkout attr=-text  aeol=lf core.autocrlf=false core.eol=crlf file=CRLF
+				printf '%s' 'abcXdefXghi' >expect &&
+				git ls-files -z -- '*X*i' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1568 - pathmatch (via ls-files): match '*X*i' 'abcXdefXghi'
 
 expecting success: 
-		compare_ws_file eol_crlf_crlf_false_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 587 - checkout attr=-text  aeol=lf core.autocrlf=false core.eol=crlf file=CRLF_mix_LF
+			test-tool wildmatch ipathmatch 'abcXdefXghi' '*X*i'
+		
+ok 1569 - ipathmatch: match 'abcXdefXghi' '*X*i'
 
 expecting success: 
-		compare_ws_file eol_crlf_crlf_false_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 588 - checkout attr=-text  aeol=lf core.autocrlf=false core.eol=crlf file=LF_mix_CR
+				printf '%s' 'abcXdefXghi' >expect &&
+				git --icase-pathspecs ls-files -z -- '*X*i' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1570 - ipathmatch (via ls-files): match '*X*i' 'abcXdefXghi'
 
 expecting success: 
-		compare_ws_file eol_crlf_crlf_false_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
 	
-ok 589 - checkout attr=-text  aeol=lf core.autocrlf=false core.eol=crlf file=LF_nul
+Removing abcXdefXghi
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1571 - cleanup after previous file test
 
 expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
-		test_cmp expect actual
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
 	
-ok 590 - ls-files --eol attr=-text  aeol=crlf core.autocrlf=false core.eol=crlf
+ok 1572 - setup match file test for ab/cXd/efXg/hi
 
 expecting success: 
-		compare_ws_file eol_crlf_crlf_false_attr_-text_ LF    crlf_false_attr__LF.txt
-	
-ok 591 - checkout attr=-text  aeol=crlf core.autocrlf=false core.eol=crlf file=LF
+			test_must_fail test-tool wildmatch wildmatch 'ab/cXd/efXg/hi' '*X*i'
+		
+ok 1573 - wildmatch: no match 'ab/cXd/efXg/hi' '*X*i'
 
 expecting success: 
-		compare_ws_file eol_crlf_crlf_false_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 592 - checkout attr=-text  aeol=crlf core.autocrlf=false core.eol=crlf file=CRLF
+				>expect &&
+				git --glob-pathspecs ls-files -z -- '*X*i' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1574 - wildmatch (via ls-files): no match '*X*i' 'ab/cXd/efXg/hi'
 
 expecting success: 
-		compare_ws_file eol_crlf_crlf_false_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 593 - checkout attr=-text  aeol=crlf core.autocrlf=false core.eol=crlf file=CRLF_mix_LF
+			test_must_fail test-tool wildmatch iwildmatch 'ab/cXd/efXg/hi' '*X*i'
+		
+ok 1575 - iwildmatch: no match 'ab/cXd/efXg/hi' '*X*i'
 
 expecting success: 
-		compare_ws_file eol_crlf_crlf_false_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 594 - checkout attr=-text  aeol=crlf core.autocrlf=false core.eol=crlf file=LF_mix_CR
+				>expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '*X*i' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1576 - iwildmatch (via ls-files): no match '*X*i' 'ab/cXd/efXg/hi'
 
 expecting success: 
-		compare_ws_file eol_crlf_crlf_false_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 595 - checkout attr=-text  aeol=crlf core.autocrlf=false core.eol=crlf file=LF_nul
+			test-tool wildmatch pathmatch 'ab/cXd/efXg/hi' '*X*i'
+		
+ok 1577 - pathmatch: match 'ab/cXd/efXg/hi' '*X*i'
 
 expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
+				printf '%s' 'ab/cXd/efXg/hi' >expect &&
+				git ls-files -z -- '*X*i' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
 		test_cmp expect actual
-	
-ok 596 - ls-files --eol attr=text  aeol=lf core.autocrlf=false core.eol=crlf
+			
+ok 1578 - pathmatch (via ls-files): match '*X*i' 'ab/cXd/efXg/hi'
 
 expecting success: 
-		compare_ws_file eol_crlf_crlf_false_attr_text_ LF    crlf_false_attr__LF.txt
-	
-ok 597 - checkout attr=text  aeol=lf core.autocrlf=false core.eol=crlf file=LF
+			test-tool wildmatch ipathmatch 'ab/cXd/efXg/hi' '*X*i'
+		
+ok 1579 - ipathmatch: match 'ab/cXd/efXg/hi' '*X*i'
 
 expecting success: 
-		compare_ws_file eol_crlf_crlf_false_attr_text_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 598 - checkout attr=text  aeol=lf core.autocrlf=false core.eol=crlf file=CRLF
+				printf '%s' 'ab/cXd/efXg/hi' >expect &&
+				git --icase-pathspecs ls-files -z -- '*X*i' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1580 - ipathmatch (via ls-files): match '*X*i' 'ab/cXd/efXg/hi'
 
 expecting success: 
-		compare_ws_file eol_crlf_crlf_false_attr_text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
 	
-ok 599 - checkout attr=text  aeol=lf core.autocrlf=false core.eol=crlf file=CRLF_mix_LF
+Removing ab/
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1581 - cleanup after previous file test
 
 expecting success: 
-		compare_ws_file eol_crlf_crlf_false_attr_text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
 	
-ok 600 - checkout attr=text  aeol=lf core.autocrlf=false core.eol=crlf file=LF_mix_CR
+ok 1582 - setup match file test for ab/cXd/efXg/hi
 
 expecting success: 
-		compare_ws_file eol_crlf_crlf_false_attr_text_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 601 - checkout attr=text  aeol=lf core.autocrlf=false core.eol=crlf file=LF_nul
+			test-tool wildmatch wildmatch 'ab/cXd/efXg/hi' '*/*X*/*/*i'
+		
+ok 1583 - wildmatch: match 'ab/cXd/efXg/hi' '*/*X*/*/*i'
 
 expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
+				printf '%s' 'ab/cXd/efXg/hi' >expect &&
+				git --glob-pathspecs ls-files -z -- '*/*X*/*/*i' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
 		test_cmp expect actual
-	
-ok 602 - ls-files --eol attr=text  aeol=crlf core.autocrlf=false core.eol=crlf
+			
+ok 1584 - wildmatch (via ls-files): match '*/*X*/*/*i' 'ab/cXd/efXg/hi'
 
 expecting success: 
-		compare_ws_file eol_crlf_crlf_false_attr_text_ CRLF    crlf_false_attr__LF.txt
-	
-ok 603 - checkout attr=text  aeol=crlf core.autocrlf=false core.eol=crlf file=LF
+			test-tool wildmatch iwildmatch 'ab/cXd/efXg/hi' '*/*X*/*/*i'
+		
+ok 1585 - iwildmatch: match 'ab/cXd/efXg/hi' '*/*X*/*/*i'
 
 expecting success: 
-		compare_ws_file eol_crlf_crlf_false_attr_text_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 604 - checkout attr=text  aeol=crlf core.autocrlf=false core.eol=crlf file=CRLF
+				printf '%s' 'ab/cXd/efXg/hi' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '*/*X*/*/*i' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1586 - iwildmatch (via ls-files): match '*/*X*/*/*i' 'ab/cXd/efXg/hi'
 
 expecting success: 
-		compare_ws_file eol_crlf_crlf_false_attr_text_ CRLF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 605 - checkout attr=text  aeol=crlf core.autocrlf=false core.eol=crlf file=CRLF_mix_LF
+			test-tool wildmatch pathmatch 'ab/cXd/efXg/hi' '*/*X*/*/*i'
+		
+ok 1587 - pathmatch: match 'ab/cXd/efXg/hi' '*/*X*/*/*i'
 
 expecting success: 
-		compare_ws_file eol_crlf_crlf_false_attr_text_ CRLF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 606 - checkout attr=text  aeol=crlf core.autocrlf=false core.eol=crlf file=LF_mix_CR
+				printf '%s' 'ab/cXd/efXg/hi' >expect &&
+				git ls-files -z -- '*/*X*/*/*i' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1588 - pathmatch (via ls-files): match '*/*X*/*/*i' 'ab/cXd/efXg/hi'
 
 expecting success: 
-		compare_ws_file eol_crlf_crlf_false_attr_text_ CRLF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 607 - checkout attr=text  aeol=crlf core.autocrlf=false core.eol=crlf file=LF_nul
+			test-tool wildmatch ipathmatch 'ab/cXd/efXg/hi' '*/*X*/*/*i'
+		
+ok 1589 - ipathmatch: match 'ab/cXd/efXg/hi' '*/*X*/*/*i'
 
 expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
+				printf '%s' 'ab/cXd/efXg/hi' >expect &&
+				git --icase-pathspecs ls-files -z -- '*/*X*/*/*i' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
 		test_cmp expect actual
-	
-ok 608 - ls-files --eol attr=auto  aeol=lf core.autocrlf=false core.eol=crlf
+			
+ok 1590 - ipathmatch (via ls-files): match '*/*X*/*/*i' 'ab/cXd/efXg/hi'
 
 expecting success: 
-		compare_ws_file eol_crlf_crlf_false_attr_auto_ LF    crlf_false_attr__LF.txt
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
 	
-ok 609 - checkout attr=auto  aeol=lf core.autocrlf=false core.eol=crlf file=LF
+Removing ab/
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1591 - cleanup after previous file test
 
 expecting success: 
-		compare_ws_file eol_crlf_crlf_false_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
 	
-ok 610 - checkout attr=auto  aeol=lf core.autocrlf=false core.eol=crlf file=CRLF
+ok 1592 - setup match file test for ab/cXd/efXg/hi
 
 expecting success: 
-		compare_ws_file eol_crlf_crlf_false_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 611 - checkout attr=auto  aeol=lf core.autocrlf=false core.eol=crlf file=CRLF_mix_LF
+			test-tool wildmatch wildmatch 'ab/cXd/efXg/hi' '**/*X*/**/*i'
+		
+ok 1593 - wildmatch: match 'ab/cXd/efXg/hi' '**/*X*/**/*i'
 
 expecting success: 
-		compare_ws_file eol_crlf_crlf_false_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 612 - checkout attr=auto  aeol=lf core.autocrlf=false core.eol=crlf file=LF_mix_CR
+				printf '%s' 'ab/cXd/efXg/hi' >expect &&
+				git --glob-pathspecs ls-files -z -- '**/*X*/**/*i' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1594 - wildmatch (via ls-files): match '**/*X*/**/*i' 'ab/cXd/efXg/hi'
 
 expecting success: 
-		compare_ws_file eol_crlf_crlf_false_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 613 - checkout attr=auto  aeol=lf core.autocrlf=false core.eol=crlf file=LF_nul
+			test-tool wildmatch iwildmatch 'ab/cXd/efXg/hi' '**/*X*/**/*i'
+		
+ok 1595 - iwildmatch: match 'ab/cXd/efXg/hi' '**/*X*/**/*i'
 
 expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
+				printf '%s' 'ab/cXd/efXg/hi' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '**/*X*/**/*i' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
 		test_cmp expect actual
-	
-ok 614 - ls-files --eol attr=auto  aeol=crlf core.autocrlf=false core.eol=crlf
+			
+ok 1596 - iwildmatch (via ls-files): match '**/*X*/**/*i' 'ab/cXd/efXg/hi'
 
 expecting success: 
-		compare_ws_file eol_crlf_crlf_false_attr_auto_ CRLF    crlf_false_attr__LF.txt
-	
-ok 615 - checkout attr=auto  aeol=crlf core.autocrlf=false core.eol=crlf file=LF
+			test-tool wildmatch pathmatch 'ab/cXd/efXg/hi' '**/*X*/**/*i'
+		
+ok 1597 - pathmatch: match 'ab/cXd/efXg/hi' '**/*X*/**/*i'
 
 expecting success: 
-		compare_ws_file eol_crlf_crlf_false_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 616 - checkout attr=auto  aeol=crlf core.autocrlf=false core.eol=crlf file=CRLF
+				printf '%s' 'ab/cXd/efXg/hi' >expect &&
+				git ls-files -z -- '**/*X*/**/*i' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1598 - pathmatch (via ls-files): match '**/*X*/**/*i' 'ab/cXd/efXg/hi'
 
 expecting success: 
-		compare_ws_file eol_crlf_crlf_false_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 617 - checkout attr=auto  aeol=crlf core.autocrlf=false core.eol=crlf file=CRLF_mix_LF
+			test-tool wildmatch ipathmatch 'ab/cXd/efXg/hi' '**/*X*/**/*i'
+		
+ok 1599 - ipathmatch: match 'ab/cXd/efXg/hi' '**/*X*/**/*i'
 
 expecting success: 
-		compare_ws_file eol_crlf_crlf_false_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 618 - checkout attr=auto  aeol=crlf core.autocrlf=false core.eol=crlf file=LF_mix_CR
+				printf '%s' 'ab/cXd/efXg/hi' >expect &&
+				git --icase-pathspecs ls-files -z -- '**/*X*/**/*i' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1600 - ipathmatch (via ls-files): match '**/*X*/**/*i' 'ab/cXd/efXg/hi'
 
 expecting success: 
-		compare_ws_file eol_crlf_crlf_false_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
 	
-ok 619 - checkout attr=auto  aeol=crlf core.autocrlf=false core.eol=crlf file=LF_nul
+Removing ab/
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1601 - cleanup after previous file test
 
 expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
-		test_cmp expect actual
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
 	
-ok 620 - ls-files --eol attr=-text  aeol= core.autocrlf=input core.eol=crlf
+ok 1602 - setup match file test for foo
 
 expecting success: 
-		compare_ws_file eol_crlf_crlf_input_attr_-text_ LF    crlf_false_attr__LF.txt
-	
-ok 621 - checkout attr=-text  aeol= core.autocrlf=input core.eol=crlf file=LF
+			test_must_fail test-tool wildmatch wildmatch 'foo' 'fo'
+		
+ok 1603 - wildmatch: no match 'foo' 'fo'
 
 expecting success: 
-		compare_ws_file eol_crlf_crlf_input_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 622 - checkout attr=-text  aeol= core.autocrlf=input core.eol=crlf file=CRLF
+				>expect &&
+				git --glob-pathspecs ls-files -z -- 'fo' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1604 - wildmatch (via ls-files): no match 'fo' 'foo'
 
 expecting success: 
-		compare_ws_file eol_crlf_crlf_input_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 623 - checkout attr=-text  aeol= core.autocrlf=input core.eol=crlf file=CRLF_mix_LF
+			test_must_fail test-tool wildmatch iwildmatch 'foo' 'fo'
+		
+ok 1605 - iwildmatch: no match 'foo' 'fo'
 
 expecting success: 
-		compare_ws_file eol_crlf_crlf_input_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 624 - checkout attr=-text  aeol= core.autocrlf=input core.eol=crlf file=LF_mix_CR
+				>expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'fo' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1606 - iwildmatch (via ls-files): no match 'fo' 'foo'
 
 expecting success: 
-		compare_ws_file eol_crlf_crlf_input_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 625 - checkout attr=-text  aeol= core.autocrlf=input core.eol=crlf file=LF_nul
+			test_must_fail test-tool wildmatch pathmatch 'foo' 'fo'
+		
+ok 1607 - pathmatch: no match 'foo' 'fo'
 
 expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
+				>expect &&
+				git ls-files -z -- 'fo' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
 		test_cmp expect actual
-	
-ok 626 - ls-files --eol attr=-text  aeol=lf core.autocrlf=input core.eol=crlf
+			
+ok 1608 - pathmatch (via ls-files): no match 'fo' 'foo'
 
 expecting success: 
-		compare_ws_file eol_crlf_crlf_input_attr_-text_ LF    crlf_false_attr__LF.txt
-	
-ok 627 - checkout attr=-text  aeol=lf core.autocrlf=input core.eol=crlf file=LF
+			test_must_fail test-tool wildmatch ipathmatch 'foo' 'fo'
+		
+ok 1609 - ipathmatch: no match 'foo' 'fo'
 
 expecting success: 
-		compare_ws_file eol_crlf_crlf_input_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 628 - checkout attr=-text  aeol=lf core.autocrlf=input core.eol=crlf file=CRLF
+				>expect &&
+				git --icase-pathspecs ls-files -z -- 'fo' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1610 - ipathmatch (via ls-files): no match 'fo' 'foo'
 
 expecting success: 
-		compare_ws_file eol_crlf_crlf_input_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
 	
-ok 629 - checkout attr=-text  aeol=lf core.autocrlf=input core.eol=crlf file=CRLF_mix_LF
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+Removing foo
+ok 1611 - cleanup after previous file test
 
 expecting success: 
-		compare_ws_file eol_crlf_crlf_input_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
 	
-ok 630 - checkout attr=-text  aeol=lf core.autocrlf=input core.eol=crlf file=LF_mix_CR
+ok 1612 - setup match file test for foo/bar
 
 expecting success: 
-		compare_ws_file eol_crlf_crlf_input_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 631 - checkout attr=-text  aeol=lf core.autocrlf=input core.eol=crlf file=LF_nul
+			test-tool wildmatch wildmatch 'foo/bar' 'foo/bar'
+		
+ok 1613 - wildmatch: match 'foo/bar' 'foo/bar'
 
 expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
+				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 632 - ls-files --eol attr=-text  aeol=crlf core.autocrlf=input core.eol=crlf
+			
+ok 1614 - wildmatch (via ls-files): match 'foo/bar' 'foo/bar'
 
 expecting success: 
-		compare_ws_file eol_crlf_crlf_input_attr_-text_ LF    crlf_false_attr__LF.txt
-	
-ok 633 - checkout attr=-text  aeol=crlf core.autocrlf=input core.eol=crlf file=LF
+			test-tool wildmatch iwildmatch 'foo/bar' 'foo/bar'
+		
+ok 1615 - iwildmatch: match 'foo/bar' 'foo/bar'
 
 expecting success: 
-		compare_ws_file eol_crlf_crlf_input_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 634 - checkout attr=-text  aeol=crlf core.autocrlf=input core.eol=crlf file=CRLF
+				printf '%s' 'foo/bar' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'foo/bar' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1616 - iwildmatch (via ls-files): match 'foo/bar' 'foo/bar'
 
 expecting success: 
-		compare_ws_file eol_crlf_crlf_input_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 635 - checkout attr=-text  aeol=crlf core.autocrlf=input core.eol=crlf file=CRLF_mix_LF
+			test-tool wildmatch pathmatch 'foo/bar' 'foo/bar'
+		
+ok 1617 - pathmatch: match 'foo/bar' 'foo/bar'
 
 expecting success: 
-		compare_ws_file eol_crlf_crlf_input_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 636 - checkout attr=-text  aeol=crlf core.autocrlf=input core.eol=crlf file=LF_mix_CR
+				printf '%s' 'foo/bar' >expect &&
+				git ls-files -z -- 'foo/bar' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1618 - pathmatch (via ls-files): match 'foo/bar' 'foo/bar'
 
 expecting success: 
-		compare_ws_file eol_crlf_crlf_input_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 637 - checkout attr=-text  aeol=crlf core.autocrlf=input core.eol=crlf file=LF_nul
+			test-tool wildmatch ipathmatch 'foo/bar' 'foo/bar'
+		
+ok 1619 - ipathmatch: match 'foo/bar' 'foo/bar'
 
 expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
+				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 638 - ls-files --eol attr=text  aeol=lf core.autocrlf=input core.eol=crlf
+			
+ok 1620 - ipathmatch (via ls-files): match 'foo/bar' 'foo/bar'
 
 expecting success: 
-		compare_ws_file eol_crlf_crlf_input_attr_text_ LF    crlf_false_attr__LF.txt
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
 	
-ok 639 - checkout attr=text  aeol=lf core.autocrlf=input core.eol=crlf file=LF
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+Removing foo/
+ok 1621 - cleanup after previous file test
 
 expecting success: 
-		compare_ws_file eol_crlf_crlf_input_attr_text_ CRLF  crlf_false_attr__CRLF.txt
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
 	
-ok 640 - checkout attr=text  aeol=lf core.autocrlf=input core.eol=crlf file=CRLF
+ok 1622 - setup match file test for foo/bar
 
 expecting success: 
-		compare_ws_file eol_crlf_crlf_input_attr_text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 641 - checkout attr=text  aeol=lf core.autocrlf=input core.eol=crlf file=CRLF_mix_LF
+			test-tool wildmatch wildmatch 'foo/bar' 'foo/*'
+		
+ok 1623 - wildmatch: match 'foo/bar' 'foo/*'
 
 expecting success: 
-		compare_ws_file eol_crlf_crlf_input_attr_text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 642 - checkout attr=text  aeol=lf core.autocrlf=input core.eol=crlf file=LF_mix_CR
+				printf '%s' 'foo/bar' >expect &&
+				git --glob-pathspecs ls-files -z -- 'foo/*' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1624 - wildmatch (via ls-files): match 'foo/*' 'foo/bar'
 
 expecting success: 
-		compare_ws_file eol_crlf_crlf_input_attr_text_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 643 - checkout attr=text  aeol=lf core.autocrlf=input core.eol=crlf file=LF_nul
+			test-tool wildmatch iwildmatch 'foo/bar' 'foo/*'
+		
+ok 1625 - iwildmatch: match 'foo/bar' 'foo/*'
 
 expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
+				printf '%s' 'foo/bar' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'foo/*' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
 		test_cmp expect actual
-	
-ok 644 - ls-files --eol attr=text  aeol=crlf core.autocrlf=input core.eol=crlf
+			
+ok 1626 - iwildmatch (via ls-files): match 'foo/*' 'foo/bar'
 
 expecting success: 
-		compare_ws_file eol_crlf_crlf_input_attr_text_ CRLF    crlf_false_attr__LF.txt
-	
-ok 645 - checkout attr=text  aeol=crlf core.autocrlf=input core.eol=crlf file=LF
+			test-tool wildmatch pathmatch 'foo/bar' 'foo/*'
+		
+ok 1627 - pathmatch: match 'foo/bar' 'foo/*'
 
 expecting success: 
-		compare_ws_file eol_crlf_crlf_input_attr_text_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 646 - checkout attr=text  aeol=crlf core.autocrlf=input core.eol=crlf file=CRLF
+				printf '%s' 'foo/bar' >expect &&
+				git ls-files -z -- 'foo/*' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1628 - pathmatch (via ls-files): match 'foo/*' 'foo/bar'
 
 expecting success: 
-		compare_ws_file eol_crlf_crlf_input_attr_text_ CRLF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 647 - checkout attr=text  aeol=crlf core.autocrlf=input core.eol=crlf file=CRLF_mix_LF
+			test-tool wildmatch ipathmatch 'foo/bar' 'foo/*'
+		
+ok 1629 - ipathmatch: match 'foo/bar' 'foo/*'
 
 expecting success: 
-		compare_ws_file eol_crlf_crlf_input_attr_text_ CRLF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 648 - checkout attr=text  aeol=crlf core.autocrlf=input core.eol=crlf file=LF_mix_CR
+				printf '%s' 'foo/bar' >expect &&
+				git --icase-pathspecs ls-files -z -- 'foo/*' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1630 - ipathmatch (via ls-files): match 'foo/*' 'foo/bar'
 
 expecting success: 
-		compare_ws_file eol_crlf_crlf_input_attr_text_ CRLF_nul   crlf_false_attr__LF_nul.txt
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
 	
-ok 649 - checkout attr=text  aeol=crlf core.autocrlf=input core.eol=crlf file=LF_nul
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+Removing foo/
+ok 1631 - cleanup after previous file test
 
 expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
-		test_cmp expect actual
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
 	
-ok 650 - ls-files --eol attr=auto  aeol=lf core.autocrlf=input core.eol=crlf
+ok 1632 - setup match file test for foo/bba/arr
 
 expecting success: 
-		compare_ws_file eol_crlf_crlf_input_attr_auto_ LF    crlf_false_attr__LF.txt
-	
-ok 651 - checkout attr=auto  aeol=lf core.autocrlf=input core.eol=crlf file=LF
+			test_must_fail test-tool wildmatch wildmatch 'foo/bba/arr' 'foo/*'
+		
+ok 1633 - wildmatch: no match 'foo/bba/arr' 'foo/*'
 
 expecting success: 
-		compare_ws_file eol_crlf_crlf_input_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 652 - checkout attr=auto  aeol=lf core.autocrlf=input core.eol=crlf file=CRLF
+				>expect &&
+				git --glob-pathspecs ls-files -z -- 'foo/*' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1634 - wildmatch (via ls-files): no match 'foo/*' 'foo/bba/arr'
 
 expecting success: 
-		compare_ws_file eol_crlf_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=crlf file=CRLF_mix_LF
+			test_must_fail test-tool wildmatch iwildmatch 'foo/bba/arr' 'foo/*'
+		
+ok 1635 - iwildmatch: no match 'foo/bba/arr' 'foo/*'
 
 expecting success: 
-		compare_ws_file eol_crlf_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=crlf file=LF_mix_CR
+				>expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'foo/*' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1636 - iwildmatch (via ls-files): no match 'foo/*' 'foo/bba/arr'
 
 expecting success: 
-		compare_ws_file eol_crlf_crlf_input_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 655 - checkout attr=auto  aeol=lf core.autocrlf=input core.eol=crlf file=LF_nul
+			test-tool wildmatch pathmatch 'foo/bba/arr' 'foo/*'
+		
+ok 1637 - pathmatch: match 'foo/bba/arr' 'foo/*'
 
 expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
+				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 656 - ls-files --eol attr=auto  aeol=crlf core.autocrlf=input core.eol=crlf
+			
+ok 1638 - pathmatch (via ls-files): match 'foo/*' 'foo/bba/arr'
 
 expecting success: 
-		compare_ws_file eol_crlf_crlf_input_attr_auto_ CRLF    crlf_false_attr__LF.txt
-	
-ok 657 - checkout attr=auto  aeol=crlf core.autocrlf=input core.eol=crlf file=LF
+			test-tool wildmatch ipathmatch 'foo/bba/arr' 'foo/*'
+		
+ok 1639 - ipathmatch: match 'foo/bba/arr' 'foo/*'
 
 expecting success: 
-		compare_ws_file eol_crlf_crlf_input_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 658 - checkout attr=auto  aeol=crlf core.autocrlf=input core.eol=crlf file=CRLF
+				printf '%s' 'foo/bba/arr' >expect &&
+				git --icase-pathspecs ls-files -z -- 'foo/*' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1640 - ipathmatch (via ls-files): match 'foo/*' 'foo/bba/arr'
 
 expecting success: 
-		compare_ws_file eol_crlf_crlf_input_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
 	
-ok 659 - checkout attr=auto  aeol=crlf core.autocrlf=input core.eol=crlf file=CRLF_mix_LF
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+Removing foo/
+ok 1641 - cleanup after previous file test
 
 expecting success: 
-		compare_ws_file eol_crlf_crlf_input_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
 	
-ok 660 - checkout attr=auto  aeol=crlf core.autocrlf=input core.eol=crlf file=LF_mix_CR
+ok 1642 - setup match file test for foo/bba/arr
 
 expecting success: 
-		compare_ws_file eol_crlf_crlf_input_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 661 - checkout attr=auto  aeol=crlf core.autocrlf=input core.eol=crlf file=LF_nul
+			test-tool wildmatch wildmatch 'foo/bba/arr' 'foo/**'
+		
+ok 1643 - wildmatch: match 'foo/bba/arr' 'foo/**'
 
 expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
+				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 662 - ls-files --eol attr=  aeol= core.autocrlf=false core.eol=crlf
+			
+ok 1644 - wildmatch (via ls-files): match 'foo/**' 'foo/bba/arr'
 
 expecting success: 
-		compare_ws_file eol_crlf_crlf_false_attr__ LF    crlf_false_attr__LF.txt
-	
-ok 663 - checkout attr=  aeol= core.autocrlf=false core.eol=crlf file=LF
+			test-tool wildmatch iwildmatch 'foo/bba/arr' 'foo/**'
+		
+ok 1645 - iwildmatch: match 'foo/bba/arr' 'foo/**'
 
 expecting success: 
-		compare_ws_file eol_crlf_crlf_false_attr__ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 664 - checkout attr=  aeol= core.autocrlf=false core.eol=crlf file=CRLF
+				printf '%s' 'foo/bba/arr' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'foo/**' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1646 - iwildmatch (via ls-files): match 'foo/**' 'foo/bba/arr'
 
 expecting success: 
-		compare_ws_file eol_crlf_crlf_false_attr__ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 665 - checkout attr=  aeol= core.autocrlf=false core.eol=crlf file=CRLF_mix_LF
+			test-tool wildmatch pathmatch 'foo/bba/arr' 'foo/**'
+		
+ok 1647 - pathmatch: match 'foo/bba/arr' 'foo/**'
 
 expecting success: 
-		compare_ws_file eol_crlf_crlf_false_attr__ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 666 - checkout attr=  aeol= core.autocrlf=false core.eol=crlf file=LF_mix_CR
+				printf '%s' 'foo/bba/arr' >expect &&
+				git ls-files -z -- 'foo/**' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1648 - pathmatch (via ls-files): match 'foo/**' 'foo/bba/arr'
 
 expecting success: 
-		compare_ws_file eol_crlf_crlf_false_attr__ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 667 - checkout attr=  aeol= core.autocrlf=false core.eol=crlf file=LF_nul
+			test-tool wildmatch ipathmatch 'foo/bba/arr' 'foo/**'
+		
+ok 1649 - ipathmatch: match 'foo/bba/arr' 'foo/**'
 
 expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
+				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 668 - ls-files --eol attr=  aeol= core.autocrlf=true core.eol=crlf
+			
+ok 1650 - ipathmatch (via ls-files): match 'foo/**' 'foo/bba/arr'
 
 expecting success: 
-		compare_ws_file eol_crlf_crlf_true_attr__ CRLF    crlf_false_attr__LF.txt
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
 	
-ok 669 - checkout attr=  aeol= core.autocrlf=true core.eol=crlf file=LF
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+Removing foo/
+ok 1651 - cleanup after previous file test
 
 expecting success: 
-		compare_ws_file eol_crlf_crlf_true_attr__ CRLF  crlf_false_attr__CRLF.txt
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
 	
-ok 670 - checkout attr=  aeol= core.autocrlf=true core.eol=crlf file=CRLF
+ok 1652 - setup match file test for foo/bba/arr
 
 expecting success: 
-		compare_ws_file eol_crlf_crlf_true_attr__ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 671 - checkout attr=  aeol= core.autocrlf=true core.eol=crlf file=CRLF_mix_LF
+			test_must_fail test-tool wildmatch wildmatch 'foo/bba/arr' 'foo*'
+		
+ok 1653 - wildmatch: no match 'foo/bba/arr' 'foo*'
 
 expecting success: 
-		compare_ws_file eol_crlf_crlf_true_attr__ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 672 - checkout attr=  aeol= core.autocrlf=true core.eol=crlf file=LF_mix_CR
+				>expect &&
+				git --glob-pathspecs ls-files -z -- 'foo*' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1654 - wildmatch (via ls-files): no match 'foo*' 'foo/bba/arr'
 
 expecting success: 
-		compare_ws_file eol_crlf_crlf_true_attr__ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 673 - checkout attr=  aeol= core.autocrlf=true core.eol=crlf file=LF_nul
+			test_must_fail test-tool wildmatch iwildmatch 'foo/bba/arr' 'foo*'
+		
+ok 1655 - iwildmatch: no match 'foo/bba/arr' 'foo*'
 
 expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
+				>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 674 - ls-files --eol attr=auto  aeol= core.autocrlf=true core.eol=crlf
+			
+ok 1656 - iwildmatch (via ls-files): no match 'foo*' 'foo/bba/arr'
 
 expecting success: 
-		compare_ws_file eol_crlf_crlf_true_attr_auto_ CRLF    crlf_false_attr__LF.txt
-	
-ok 675 - checkout attr=auto  aeol= core.autocrlf=true core.eol=crlf file=LF
+			test-tool wildmatch pathmatch 'foo/bba/arr' 'foo*'
+		
+ok 1657 - pathmatch: match 'foo/bba/arr' 'foo*'
 
 expecting success: 
-		compare_ws_file eol_crlf_crlf_true_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 676 - checkout attr=auto  aeol= core.autocrlf=true core.eol=crlf file=CRLF
+				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: 
-		compare_ws_file eol_crlf_crlf_true_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 677 - checkout attr=auto  aeol= core.autocrlf=true core.eol=crlf file=CRLF_mix_LF
+			test-tool wildmatch ipathmatch 'foo/bba/arr' 'foo*'
+		
+ok 1659 - ipathmatch: match 'foo/bba/arr' 'foo*'
 
 expecting success: 
-		compare_ws_file eol_crlf_crlf_true_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 678 - checkout attr=auto  aeol= core.autocrlf=true core.eol=crlf file=LF_mix_CR
+				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: 
-		compare_ws_file eol_crlf_crlf_true_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
 	
-ok 679 - checkout attr=auto  aeol= core.autocrlf=true core.eol=crlf file=LF_nul
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+Removing foo/
+ok 1661 - cleanup after previous file test
 
 expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
-		test_cmp expect actual
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
 	
-ok 680 - ls-files --eol attr=text  aeol= core.autocrlf=true core.eol=crlf
+ok 1662 - setup match file test for foo/bba/arr
 
 expecting success: 
-		compare_ws_file eol_crlf_crlf_true_attr_text_ CRLF    crlf_false_attr__LF.txt
-	
-ok 681 - checkout attr=text  aeol= core.autocrlf=true core.eol=crlf file=LF
+			test_must_fail test-tool wildmatch wildmatch 'foo/bba/arr' 'foo**'
+		
+ok 1663 - wildmatch: no match 'foo/bba/arr' 'foo**'
 
 expecting success: 
-		compare_ws_file eol_crlf_crlf_true_attr_text_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 682 - checkout attr=text  aeol= core.autocrlf=true core.eol=crlf file=CRLF
+				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: 
-		compare_ws_file eol_crlf_crlf_true_attr_text_ CRLF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 683 - checkout attr=text  aeol= core.autocrlf=true core.eol=crlf file=CRLF_mix_LF
+			test_must_fail test-tool wildmatch iwildmatch 'foo/bba/arr' 'foo**'
+		
+ok 1665 - iwildmatch: no match 'foo/bba/arr' 'foo**'
 
 expecting success: 
-		compare_ws_file eol_crlf_crlf_true_attr_text_ CRLF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 684 - checkout attr=text  aeol= core.autocrlf=true core.eol=crlf file=LF_mix_CR
+				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: 
-		compare_ws_file eol_crlf_crlf_true_attr_text_ CRLF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 685 - checkout attr=text  aeol= core.autocrlf=true core.eol=crlf file=LF_nul
+			test-tool wildmatch pathmatch 'foo/bba/arr' 'foo**'
+		
+ok 1667 - pathmatch: match 'foo/bba/arr' 'foo**'
 
 expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
+				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 686 - ls-files --eol attr=text  aeol= core.autocrlf=input core.eol=crlf
+			
+ok 1668 - pathmatch (via ls-files): match 'foo**' 'foo/bba/arr'
 
 expecting success: 
-		compare_ws_file eol_crlf_crlf_input_attr_text_ LF    crlf_false_attr__LF.txt
-	
-ok 687 - checkout attr=text  aeol= core.autocrlf=input core.eol=crlf file=LF
+			test-tool wildmatch ipathmatch 'foo/bba/arr' 'foo**'
+		
+ok 1669 - ipathmatch: match 'foo/bba/arr' 'foo**'
 
 expecting success: 
-		compare_ws_file eol_crlf_crlf_input_attr_text_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 688 - checkout attr=text  aeol= core.autocrlf=input core.eol=crlf file=CRLF
+				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: 
-		compare_ws_file eol_crlf_crlf_input_attr_text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
 	
-ok 689 - checkout attr=text  aeol= core.autocrlf=input core.eol=crlf file=CRLF_mix_LF
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+Removing foo/
+ok 1671 - cleanup after previous file test
 
 expecting success: 
-		compare_ws_file eol_crlf_crlf_input_attr_text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
 	
-ok 690 - checkout attr=text  aeol= core.autocrlf=input core.eol=crlf file=LF_mix_CR
+ok 1672 - setup match file test for foo/bba/arr
 
 expecting success: 
-		compare_ws_file eol_crlf_crlf_input_attr_text_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 691 - checkout attr=text  aeol= core.autocrlf=input core.eol=crlf file=LF_nul
+			test_must_fail test-tool wildmatch wildmatch 'foo/bba/arr' 'foo/*arr'
+		
+ok 1673 - wildmatch: no match 'foo/bba/arr' 'foo/*arr'
 
 expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
+				>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 692 - ls-files --eol attr=auto  aeol= core.autocrlf=input core.eol=crlf
+			
+ok 1674 - wildmatch (via ls-files): no match 'foo/*arr' 'foo/bba/arr'
 
 expecting success: 
-		compare_ws_file eol_crlf_crlf_input_attr_auto_ LF    crlf_false_attr__LF.txt
-	
-ok 693 - checkout attr=auto  aeol= core.autocrlf=input core.eol=crlf file=LF
+			test_must_fail test-tool wildmatch iwildmatch 'foo/bba/arr' 'foo/*arr'
+		
+ok 1675 - iwildmatch: no match 'foo/bba/arr' 'foo/*arr'
 
 expecting success: 
-		compare_ws_file eol_crlf_crlf_input_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 694 - checkout attr=auto  aeol= core.autocrlf=input core.eol=crlf file=CRLF
+				>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: 
-		compare_ws_file eol_crlf_crlf_input_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 695 - checkout attr=auto  aeol= core.autocrlf=input core.eol=crlf file=CRLF_mix_LF
+			test-tool wildmatch pathmatch 'foo/bba/arr' 'foo/*arr'
+		
+ok 1677 - pathmatch: match 'foo/bba/arr' 'foo/*arr'
 
 expecting success: 
-		compare_ws_file eol_crlf_crlf_input_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 696 - checkout attr=auto  aeol= core.autocrlf=input core.eol=crlf file=LF_mix_CR
+				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: 
-		compare_ws_file eol_crlf_crlf_input_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 697 - checkout attr=auto  aeol= core.autocrlf=input core.eol=crlf file=LF_nul
+			test-tool wildmatch ipathmatch 'foo/bba/arr' 'foo/*arr'
+		
+ok 1679 - ipathmatch: match 'foo/bba/arr' 'foo/*arr'
 
 expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
+				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 698 - ls-files --eol attr=-text  aeol= core.autocrlf=true core.eol=native
+			
+ok 1680 - ipathmatch (via ls-files): match 'foo/*arr' 'foo/bba/arr'
 
 expecting success: 
-		compare_ws_file eol_native_crlf_true_attr_-text_ LF    crlf_false_attr__LF.txt
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
 	
-ok 699 - checkout attr=-text  aeol= core.autocrlf=true core.eol=native file=LF
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+Removing foo/
+ok 1681 - cleanup after previous file test
 
 expecting success: 
-		compare_ws_file eol_native_crlf_true_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
 	
-ok 700 - checkout attr=-text  aeol= core.autocrlf=true core.eol=native file=CRLF
+ok 1682 - setup match file test for foo/bba/arr
 
 expecting success: 
-		compare_ws_file eol_native_crlf_true_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 701 - checkout attr=-text  aeol= core.autocrlf=true core.eol=native file=CRLF_mix_LF
+			test_must_fail test-tool wildmatch wildmatch 'foo/bba/arr' 'foo/**arr'
+		
+ok 1683 - wildmatch: no match 'foo/bba/arr' 'foo/**arr'
 
 expecting success: 
-		compare_ws_file eol_native_crlf_true_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 702 - checkout attr=-text  aeol= core.autocrlf=true core.eol=native file=LF_mix_CR
+				>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: 
-		compare_ws_file eol_native_crlf_true_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 703 - checkout attr=-text  aeol= core.autocrlf=true core.eol=native file=LF_nul
+			test_must_fail test-tool wildmatch iwildmatch 'foo/bba/arr' 'foo/**arr'
+		
+ok 1685 - iwildmatch: no match 'foo/bba/arr' 'foo/**arr'
 
 expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
+				>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 704 - ls-files --eol attr=-text  aeol=lf core.autocrlf=true core.eol=native
+			
+ok 1686 - iwildmatch (via ls-files): no match 'foo/**arr' 'foo/bba/arr'
 
 expecting success: 
-		compare_ws_file eol_native_crlf_true_attr_-text_ LF    crlf_false_attr__LF.txt
-	
-ok 705 - checkout attr=-text  aeol=lf core.autocrlf=true core.eol=native file=LF
+			test-tool wildmatch pathmatch 'foo/bba/arr' 'foo/**arr'
+		
+ok 1687 - pathmatch: match 'foo/bba/arr' 'foo/**arr'
 
 expecting success: 
-		compare_ws_file eol_native_crlf_true_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 706 - checkout attr=-text  aeol=lf core.autocrlf=true core.eol=native file=CRLF
+				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: 
-		compare_ws_file eol_native_crlf_true_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 707 - checkout attr=-text  aeol=lf core.autocrlf=true core.eol=native file=CRLF_mix_LF
+			test-tool wildmatch ipathmatch 'foo/bba/arr' 'foo/**arr'
+		
+ok 1689 - ipathmatch: match 'foo/bba/arr' 'foo/**arr'
 
 expecting success: 
-		compare_ws_file eol_native_crlf_true_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 708 - checkout attr=-text  aeol=lf core.autocrlf=true core.eol=native file=LF_mix_CR
+				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: 
-		compare_ws_file eol_native_crlf_true_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
 	
-ok 709 - checkout attr=-text  aeol=lf core.autocrlf=true core.eol=native file=LF_nul
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+Removing foo/
+ok 1691 - cleanup after previous file test
 
 expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
-		test_cmp expect actual
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
 	
-ok 710 - ls-files --eol attr=-text  aeol=crlf core.autocrlf=true core.eol=native
+ok 1692 - setup match file test for foo/bba/arr
 
 expecting success: 
-		compare_ws_file eol_native_crlf_true_attr_-text_ LF    crlf_false_attr__LF.txt
-	
-ok 711 - checkout attr=-text  aeol=crlf core.autocrlf=true core.eol=native file=LF
+			test_must_fail test-tool wildmatch wildmatch 'foo/bba/arr' 'foo/*z'
+		
+ok 1693 - wildmatch: no match 'foo/bba/arr' 'foo/*z'
 
 expecting success: 
-		compare_ws_file eol_native_crlf_true_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 712 - checkout attr=-text  aeol=crlf core.autocrlf=true core.eol=native file=CRLF
+				>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: 
-		compare_ws_file eol_native_crlf_true_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 713 - checkout attr=-text  aeol=crlf core.autocrlf=true core.eol=native file=CRLF_mix_LF
+			test_must_fail test-tool wildmatch iwildmatch 'foo/bba/arr' 'foo/*z'
+		
+ok 1695 - iwildmatch: no match 'foo/bba/arr' 'foo/*z'
 
 expecting success: 
-		compare_ws_file eol_native_crlf_true_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 714 - checkout attr=-text  aeol=crlf core.autocrlf=true core.eol=native file=LF_mix_CR
+				>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: 
-		compare_ws_file eol_native_crlf_true_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 715 - checkout attr=-text  aeol=crlf core.autocrlf=true core.eol=native file=LF_nul
+			test_must_fail test-tool wildmatch pathmatch 'foo/bba/arr' 'foo/*z'
+		
+ok 1697 - pathmatch: no match 'foo/bba/arr' 'foo/*z'
 
 expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
+				>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 716 - ls-files --eol attr=text  aeol=lf core.autocrlf=true core.eol=native
+			
+ok 1698 - pathmatch (via ls-files): no match 'foo/*z' 'foo/bba/arr'
 
 expecting success: 
-		compare_ws_file eol_native_crlf_true_attr_text_ LF    crlf_false_attr__LF.txt
-	
-ok 717 - checkout attr=text  aeol=lf core.autocrlf=true core.eol=native file=LF
+			test_must_fail test-tool wildmatch ipathmatch 'foo/bba/arr' 'foo/*z'
+		
+ok 1699 - ipathmatch: no match 'foo/bba/arr' 'foo/*z'
 
 expecting success: 
-		compare_ws_file eol_native_crlf_true_attr_text_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 718 - checkout attr=text  aeol=lf core.autocrlf=true core.eol=native file=CRLF
+				>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: 
-		compare_ws_file eol_native_crlf_true_attr_text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
 	
-ok 719 - checkout attr=text  aeol=lf core.autocrlf=true core.eol=native file=CRLF_mix_LF
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+Removing foo/
+ok 1701 - cleanup after previous file test
 
 expecting success: 
-		compare_ws_file eol_native_crlf_true_attr_text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
 	
-ok 720 - checkout attr=text  aeol=lf core.autocrlf=true core.eol=native file=LF_mix_CR
+ok 1702 - setup match file test for foo/bba/arr
 
 expecting success: 
-		compare_ws_file eol_native_crlf_true_attr_text_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 721 - checkout attr=text  aeol=lf core.autocrlf=true core.eol=native file=LF_nul
+			test_must_fail test-tool wildmatch wildmatch 'foo/bba/arr' 'foo/**z'
+		
+ok 1703 - wildmatch: no match 'foo/bba/arr' 'foo/**z'
 
 expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
+				>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 722 - ls-files --eol attr=text  aeol=crlf core.autocrlf=true core.eol=native
+			
+ok 1704 - wildmatch (via ls-files): no match 'foo/**z' 'foo/bba/arr'
 
 expecting success: 
-		compare_ws_file eol_native_crlf_true_attr_text_ CRLF    crlf_false_attr__LF.txt
-	
-ok 723 - checkout attr=text  aeol=crlf core.autocrlf=true core.eol=native file=LF
+			test_must_fail test-tool wildmatch iwildmatch 'foo/bba/arr' 'foo/**z'
+		
+ok 1705 - iwildmatch: no match 'foo/bba/arr' 'foo/**z'
 
 expecting success: 
-		compare_ws_file eol_native_crlf_true_attr_text_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 724 - checkout attr=text  aeol=crlf core.autocrlf=true core.eol=native file=CRLF
+				>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: 
-		compare_ws_file eol_native_crlf_true_attr_text_ CRLF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 725 - checkout attr=text  aeol=crlf core.autocrlf=true core.eol=native file=CRLF_mix_LF
+			test_must_fail test-tool wildmatch pathmatch 'foo/bba/arr' 'foo/**z'
+		
+ok 1707 - pathmatch: no match 'foo/bba/arr' 'foo/**z'
 
 expecting success: 
-		compare_ws_file eol_native_crlf_true_attr_text_ CRLF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 726 - checkout attr=text  aeol=crlf core.autocrlf=true core.eol=native file=LF_mix_CR
+				>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: 
-		compare_ws_file eol_native_crlf_true_attr_text_ CRLF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 727 - checkout attr=text  aeol=crlf core.autocrlf=true core.eol=native file=LF_nul
+			test_must_fail test-tool wildmatch ipathmatch 'foo/bba/arr' 'foo/**z'
+		
+ok 1709 - ipathmatch: no match 'foo/bba/arr' 'foo/**z'
 
 expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
+				>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 728 - ls-files --eol attr=auto  aeol=lf core.autocrlf=true core.eol=native
+			
+ok 1710 - ipathmatch (via ls-files): no match 'foo/**z' 'foo/bba/arr'
 
 expecting success: 
-		compare_ws_file eol_native_crlf_true_attr_auto_ LF    crlf_false_attr__LF.txt
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
 	
-ok 729 - checkout attr=auto  aeol=lf core.autocrlf=true core.eol=native file=LF
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+Removing foo/
+ok 1711 - cleanup after previous file test
 
 expecting success: 
-		compare_ws_file eol_native_crlf_true_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
 	
-ok 730 - checkout attr=auto  aeol=lf core.autocrlf=true core.eol=native file=CRLF
+ok 1712 - setup match file test for foo/bar
 
 expecting success: 
-		compare_ws_file eol_native_crlf_true_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 731 - checkout attr=auto  aeol=lf core.autocrlf=true core.eol=native file=CRLF_mix_LF
+			test_must_fail test-tool wildmatch wildmatch 'foo/bar' 'foo?bar'
+		
+ok 1713 - wildmatch: no match 'foo/bar' 'foo?bar'
 
 expecting success: 
-		compare_ws_file eol_native_crlf_true_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 732 - checkout attr=auto  aeol=lf core.autocrlf=true core.eol=native file=LF_mix_CR
+				>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: 
-		compare_ws_file eol_native_crlf_true_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 733 - checkout attr=auto  aeol=lf core.autocrlf=true core.eol=native file=LF_nul
+			test_must_fail test-tool wildmatch iwildmatch 'foo/bar' 'foo?bar'
+		
+ok 1715 - iwildmatch: no match 'foo/bar' 'foo?bar'
 
 expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
+				>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 734 - ls-files --eol attr=auto  aeol=crlf core.autocrlf=true core.eol=native
+			
+ok 1716 - iwildmatch (via ls-files): no match 'foo?bar' 'foo/bar'
 
 expecting success: 
-		compare_ws_file eol_native_crlf_true_attr_auto_ CRLF    crlf_false_attr__LF.txt
-	
-ok 735 - checkout attr=auto  aeol=crlf core.autocrlf=true core.eol=native file=LF
+			test-tool wildmatch pathmatch 'foo/bar' 'foo?bar'
+		
+ok 1717 - pathmatch: match 'foo/bar' 'foo?bar'
 
 expecting success: 
-		compare_ws_file eol_native_crlf_true_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 736 - checkout attr=auto  aeol=crlf core.autocrlf=true core.eol=native file=CRLF
+				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: 
-		compare_ws_file eol_native_crlf_true_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 737 - checkout attr=auto  aeol=crlf core.autocrlf=true core.eol=native file=CRLF_mix_LF
+			test-tool wildmatch ipathmatch 'foo/bar' 'foo?bar'
+		
+ok 1719 - ipathmatch: match 'foo/bar' 'foo?bar'
 
 expecting success: 
-		compare_ws_file eol_native_crlf_true_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 738 - checkout attr=auto  aeol=crlf core.autocrlf=true core.eol=native file=LF_mix_CR
+				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: 
-		compare_ws_file eol_native_crlf_true_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
 	
-ok 739 - checkout attr=auto  aeol=crlf core.autocrlf=true core.eol=native file=LF_nul
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+Removing foo/
+ok 1721 - cleanup after previous file test
 
 expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
-		test_cmp expect actual
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
 	
-ok 740 - ls-files --eol attr=-text  aeol= core.autocrlf=false core.eol=native
+ok 1722 - setup match file test for foo/bar
 
 expecting success: 
-		compare_ws_file eol_native_crlf_false_attr_-text_ LF    crlf_false_attr__LF.txt
-	
-ok 741 - checkout attr=-text  aeol= core.autocrlf=false core.eol=native file=LF
+			test_must_fail test-tool wildmatch wildmatch 'foo/bar' 'foo[/]bar'
+		
+ok 1723 - wildmatch: no match 'foo/bar' 'foo[/]bar'
 
 expecting success: 
-		compare_ws_file eol_native_crlf_false_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 742 - checkout attr=-text  aeol= core.autocrlf=false core.eol=native file=CRLF
+				>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: 
-		compare_ws_file eol_native_crlf_false_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 743 - checkout attr=-text  aeol= core.autocrlf=false core.eol=native file=CRLF_mix_LF
+			test_must_fail test-tool wildmatch iwildmatch 'foo/bar' 'foo[/]bar'
+		
+ok 1725 - iwildmatch: no match 'foo/bar' 'foo[/]bar'
 
 expecting success: 
-		compare_ws_file eol_native_crlf_false_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 744 - checkout attr=-text  aeol= core.autocrlf=false core.eol=native file=LF_mix_CR
+				>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: 
-		compare_ws_file eol_native_crlf_false_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 745 - checkout attr=-text  aeol= core.autocrlf=false core.eol=native file=LF_nul
+			test-tool wildmatch pathmatch 'foo/bar' 'foo[/]bar'
+		
+ok 1727 - pathmatch: match 'foo/bar' 'foo[/]bar'
 
 expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
+				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 746 - ls-files --eol attr=-text  aeol=lf core.autocrlf=false core.eol=native
+			
+ok 1728 - pathmatch (via ls-files): match 'foo[/]bar' 'foo/bar'
 
 expecting success: 
-		compare_ws_file eol_native_crlf_false_attr_-text_ LF    crlf_false_attr__LF.txt
-	
-ok 747 - checkout attr=-text  aeol=lf core.autocrlf=false core.eol=native file=LF
+			test-tool wildmatch ipathmatch 'foo/bar' 'foo[/]bar'
+		
+ok 1729 - ipathmatch: match 'foo/bar' 'foo[/]bar'
 
 expecting success: 
-		compare_ws_file eol_native_crlf_false_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 748 - checkout attr=-text  aeol=lf core.autocrlf=false core.eol=native file=CRLF
+				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: 
-		compare_ws_file eol_native_crlf_false_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
 	
-ok 749 - checkout attr=-text  aeol=lf core.autocrlf=false core.eol=native file=CRLF_mix_LF
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+Removing foo/
+ok 1731 - cleanup after previous file test
 
 expecting success: 
-		compare_ws_file eol_native_crlf_false_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
 	
-ok 750 - checkout attr=-text  aeol=lf core.autocrlf=false core.eol=native file=LF_mix_CR
+ok 1732 - setup match file test for foo/bar
 
 expecting success: 
-		compare_ws_file eol_native_crlf_false_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 751 - checkout attr=-text  aeol=lf core.autocrlf=false core.eol=native file=LF_nul
+			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: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
+				>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 752 - ls-files --eol attr=-text  aeol=crlf core.autocrlf=false core.eol=native
+			
+ok 1734 - wildmatch (via ls-files): no match 'foo[^a-z]bar' 'foo/bar'
 
 expecting success: 
-		compare_ws_file eol_native_crlf_false_attr_-text_ LF    crlf_false_attr__LF.txt
-	
-ok 753 - checkout attr=-text  aeol=crlf core.autocrlf=false core.eol=native file=LF
+			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: 
-		compare_ws_file eol_native_crlf_false_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 754 - checkout attr=-text  aeol=crlf core.autocrlf=false core.eol=native file=CRLF
+				>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: 
-		compare_ws_file eol_native_crlf_false_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 755 - checkout attr=-text  aeol=crlf core.autocrlf=false core.eol=native file=CRLF_mix_LF
+			test-tool wildmatch pathmatch 'foo/bar' 'foo[^a-z]bar'
+		
+ok 1737 - pathmatch: match 'foo/bar' 'foo[^a-z]bar'
 
 expecting success: 
-		compare_ws_file eol_native_crlf_false_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 756 - checkout attr=-text  aeol=crlf core.autocrlf=false core.eol=native file=LF_mix_CR
+				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: 
-		compare_ws_file eol_native_crlf_false_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 757 - checkout attr=-text  aeol=crlf core.autocrlf=false core.eol=native file=LF_nul
+			test-tool wildmatch ipathmatch 'foo/bar' 'foo[^a-z]bar'
+		
+ok 1739 - ipathmatch: match 'foo/bar' 'foo[^a-z]bar'
 
 expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
+				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 758 - ls-files --eol attr=text  aeol=lf core.autocrlf=false core.eol=native
+			
+ok 1740 - ipathmatch (via ls-files): match 'foo[^a-z]bar' 'foo/bar'
 
 expecting success: 
-		compare_ws_file eol_native_crlf_false_attr_text_ LF    crlf_false_attr__LF.txt
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
 	
-ok 759 - checkout attr=text  aeol=lf core.autocrlf=false core.eol=native file=LF
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+Removing foo/
+ok 1741 - cleanup after previous file test
 
 expecting success: 
-		compare_ws_file eol_native_crlf_false_attr_text_ CRLF  crlf_false_attr__CRLF.txt
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
 	
-ok 760 - checkout attr=text  aeol=lf core.autocrlf=false core.eol=native file=CRLF
+ok 1742 - setup match file test for ab/cXd/efXg/hi
 
 expecting success: 
-		compare_ws_file eol_native_crlf_false_attr_text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 761 - checkout attr=text  aeol=lf core.autocrlf=false core.eol=native file=CRLF_mix_LF
+			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: 
-		compare_ws_file eol_native_crlf_false_attr_text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 762 - checkout attr=text  aeol=lf core.autocrlf=false core.eol=native file=LF_mix_CR
+				>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: 
-		compare_ws_file eol_native_crlf_false_attr_text_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 763 - checkout attr=text  aeol=lf core.autocrlf=false core.eol=native file=LF_nul
+			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: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
+				>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 764 - ls-files --eol attr=text  aeol=crlf core.autocrlf=false core.eol=native
+			
+ok 1746 - iwildmatch (via ls-files): no match '*Xg*i' 'ab/cXd/efXg/hi'
 
 expecting success: 
-		compare_ws_file eol_native_crlf_false_attr_text_ CRLF    crlf_false_attr__LF.txt
-	
-ok 765 - checkout attr=text  aeol=crlf core.autocrlf=false core.eol=native file=LF
+			test-tool wildmatch pathmatch 'ab/cXd/efXg/hi' '*Xg*i'
+		
+ok 1747 - pathmatch: match 'ab/cXd/efXg/hi' '*Xg*i'
 
 expecting success: 
-		compare_ws_file eol_native_crlf_false_attr_text_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 766 - checkout attr=text  aeol=crlf core.autocrlf=false core.eol=native file=CRLF
+				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: 
-		compare_ws_file eol_native_crlf_false_attr_text_ CRLF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 767 - checkout attr=text  aeol=crlf core.autocrlf=false core.eol=native file=CRLF_mix_LF
+			test-tool wildmatch ipathmatch 'ab/cXd/efXg/hi' '*Xg*i'
+		
+ok 1749 - ipathmatch: match 'ab/cXd/efXg/hi' '*Xg*i'
 
 expecting success: 
-		compare_ws_file eol_native_crlf_false_attr_text_ CRLF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 768 - checkout attr=text  aeol=crlf core.autocrlf=false core.eol=native file=LF_mix_CR
+				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: 
-		compare_ws_file eol_native_crlf_false_attr_text_ CRLF_nul   crlf_false_attr__LF_nul.txt
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
 	
-ok 769 - checkout attr=text  aeol=crlf core.autocrlf=false core.eol=native file=LF_nul
+Removing ab/
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1751 - cleanup after previous file test
 
 expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
-		test_cmp expect actual
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
 	
-ok 770 - ls-files --eol attr=auto  aeol=lf core.autocrlf=false core.eol=native
+ok 1752 - setup match file test for a
 
 expecting success: 
-		compare_ws_file eol_native_crlf_false_attr_auto_ LF    crlf_false_attr__LF.txt
-	
-ok 771 - checkout attr=auto  aeol=lf core.autocrlf=false core.eol=native file=LF
+			test_must_fail test-tool wildmatch wildmatch 'a' '[A-Z]'
+		
+ok 1753 - wildmatch: no match 'a' '[A-Z]'
 
 expecting success: 
-		compare_ws_file eol_native_crlf_false_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 772 - checkout attr=auto  aeol=lf core.autocrlf=false core.eol=native file=CRLF
+				>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: 
-		compare_ws_file eol_native_crlf_false_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 773 - checkout attr=auto  aeol=lf core.autocrlf=false core.eol=native file=CRLF_mix_LF
+			test-tool wildmatch iwildmatch 'a' '[A-Z]'
+		
+ok 1755 - iwildmatch: match 'a' '[A-Z]'
 
 expecting success: 
-		compare_ws_file eol_native_crlf_false_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 774 - checkout attr=auto  aeol=lf core.autocrlf=false core.eol=native file=LF_mix_CR
+				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: 
-		compare_ws_file eol_native_crlf_false_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 775 - checkout attr=auto  aeol=lf core.autocrlf=false core.eol=native file=LF_nul
+			test_must_fail test-tool wildmatch pathmatch 'a' '[A-Z]'
+		
+ok 1757 - pathmatch: no match 'a' '[A-Z]'
 
 expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
+				>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 776 - ls-files --eol attr=auto  aeol=crlf core.autocrlf=false core.eol=native
+			
+ok 1758 - pathmatch (via ls-files): no match '[A-Z]' 'a'
 
 expecting success: 
-		compare_ws_file eol_native_crlf_false_attr_auto_ CRLF    crlf_false_attr__LF.txt
-	
-ok 777 - checkout attr=auto  aeol=crlf core.autocrlf=false core.eol=native file=LF
+			test-tool wildmatch ipathmatch 'a' '[A-Z]'
+		
+ok 1759 - ipathmatch: match 'a' '[A-Z]'
 
 expecting success: 
-		compare_ws_file eol_native_crlf_false_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 778 - checkout attr=auto  aeol=crlf core.autocrlf=false core.eol=native file=CRLF
+				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: 
-		compare_ws_file eol_native_crlf_false_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
 	
-ok 779 - checkout attr=auto  aeol=crlf core.autocrlf=false core.eol=native file=CRLF_mix_LF
+Removing a
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1761 - cleanup after previous file test
 
 expecting success: 
-		compare_ws_file eol_native_crlf_false_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
 	
-ok 780 - checkout attr=auto  aeol=crlf core.autocrlf=false core.eol=native file=LF_mix_CR
+ok 1762 - setup match file test for A
 
 expecting success: 
-		compare_ws_file eol_native_crlf_false_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 781 - checkout attr=auto  aeol=crlf core.autocrlf=false core.eol=native file=LF_nul
+			test-tool wildmatch wildmatch 'A' '[A-Z]'
+		
+ok 1763 - wildmatch: match 'A' '[A-Z]'
 
 expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
+				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 782 - ls-files --eol attr=-text  aeol= core.autocrlf=input core.eol=native
+			
+ok 1764 - wildmatch (via ls-files): match '[A-Z]' 'A'
 
 expecting success: 
-		compare_ws_file eol_native_crlf_input_attr_-text_ LF    crlf_false_attr__LF.txt
-	
-ok 783 - checkout attr=-text  aeol= core.autocrlf=input core.eol=native file=LF
+			test-tool wildmatch iwildmatch 'A' '[A-Z]'
+		
+ok 1765 - iwildmatch: match 'A' '[A-Z]'
 
 expecting success: 
-		compare_ws_file eol_native_crlf_input_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 784 - checkout attr=-text  aeol= core.autocrlf=input core.eol=native file=CRLF
+				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: 
-		compare_ws_file eol_native_crlf_input_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 785 - checkout attr=-text  aeol= core.autocrlf=input core.eol=native file=CRLF_mix_LF
+			test-tool wildmatch pathmatch 'A' '[A-Z]'
+		
+ok 1767 - pathmatch: match 'A' '[A-Z]'
 
 expecting success: 
-		compare_ws_file eol_native_crlf_input_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 786 - checkout attr=-text  aeol= core.autocrlf=input core.eol=native file=LF_mix_CR
+				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: 
-		compare_ws_file eol_native_crlf_input_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 787 - checkout attr=-text  aeol= core.autocrlf=input core.eol=native file=LF_nul
+			test-tool wildmatch ipathmatch 'A' '[A-Z]'
+		
+ok 1769 - ipathmatch: match 'A' '[A-Z]'
 
 expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
+				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 788 - ls-files --eol attr=-text  aeol=lf core.autocrlf=input core.eol=native
+			
+ok 1770 - ipathmatch (via ls-files): match '[A-Z]' 'A'
 
 expecting success: 
-		compare_ws_file eol_native_crlf_input_attr_-text_ LF    crlf_false_attr__LF.txt
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
 	
-ok 789 - checkout attr=-text  aeol=lf core.autocrlf=input core.eol=native file=LF
+Removing A
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1771 - cleanup after previous file test
 
 expecting success: 
-		compare_ws_file eol_native_crlf_input_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
 	
-ok 790 - checkout attr=-text  aeol=lf core.autocrlf=input core.eol=native file=CRLF
+ok 1772 - setup match file test for A
 
 expecting success: 
-		compare_ws_file eol_native_crlf_input_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 791 - checkout attr=-text  aeol=lf core.autocrlf=input core.eol=native file=CRLF_mix_LF
+			test_must_fail test-tool wildmatch wildmatch 'A' '[a-z]'
+		
+ok 1773 - wildmatch: no match 'A' '[a-z]'
 
 expecting success: 
-		compare_ws_file eol_native_crlf_input_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 792 - checkout attr=-text  aeol=lf core.autocrlf=input core.eol=native file=LF_mix_CR
+				>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: 
-		compare_ws_file eol_native_crlf_input_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 793 - checkout attr=-text  aeol=lf core.autocrlf=input core.eol=native file=LF_nul
+			test-tool wildmatch iwildmatch 'A' '[a-z]'
+		
+ok 1775 - iwildmatch: match 'A' '[a-z]'
 
 expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
+				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 794 - ls-files --eol attr=-text  aeol=crlf core.autocrlf=input core.eol=native
+			
+ok 1776 - iwildmatch (via ls-files): match '[a-z]' 'A'
 
 expecting success: 
-		compare_ws_file eol_native_crlf_input_attr_-text_ LF    crlf_false_attr__LF.txt
-	
-ok 795 - checkout attr=-text  aeol=crlf core.autocrlf=input core.eol=native file=LF
+			test_must_fail test-tool wildmatch pathmatch 'A' '[a-z]'
+		
+ok 1777 - pathmatch: no match 'A' '[a-z]'
 
 expecting success: 
-		compare_ws_file eol_native_crlf_input_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 796 - checkout attr=-text  aeol=crlf core.autocrlf=input core.eol=native file=CRLF
+				>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: 
-		compare_ws_file eol_native_crlf_input_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 797 - checkout attr=-text  aeol=crlf core.autocrlf=input core.eol=native file=CRLF_mix_LF
+			test-tool wildmatch ipathmatch 'A' '[a-z]'
+		
+ok 1779 - ipathmatch: match 'A' '[a-z]'
 
 expecting success: 
-		compare_ws_file eol_native_crlf_input_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 798 - checkout attr=-text  aeol=crlf core.autocrlf=input core.eol=native file=LF_mix_CR
+				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: 
-		compare_ws_file eol_native_crlf_input_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
 	
-ok 799 - checkout attr=-text  aeol=crlf core.autocrlf=input core.eol=native file=LF_nul
+Removing A
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1781 - cleanup after previous file test
 
 expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
-		test_cmp expect actual
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
 	
-ok 800 - ls-files --eol attr=text  aeol=lf core.autocrlf=input core.eol=native
+ok 1782 - setup match file test for a
 
 expecting success: 
-		compare_ws_file eol_native_crlf_input_attr_text_ LF    crlf_false_attr__LF.txt
-	
-ok 801 - checkout attr=text  aeol=lf core.autocrlf=input core.eol=native file=LF
+			test-tool wildmatch wildmatch 'a' '[a-z]'
+		
+ok 1783 - wildmatch: match 'a' '[a-z]'
 
 expecting success: 
-		compare_ws_file eol_native_crlf_input_attr_text_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 802 - checkout attr=text  aeol=lf core.autocrlf=input core.eol=native file=CRLF
+				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: 
-		compare_ws_file eol_native_crlf_input_attr_text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 803 - checkout attr=text  aeol=lf core.autocrlf=input core.eol=native file=CRLF_mix_LF
+			test-tool wildmatch iwildmatch 'a' '[a-z]'
+		
+ok 1785 - iwildmatch: match 'a' '[a-z]'
 
 expecting success: 
-		compare_ws_file eol_native_crlf_input_attr_text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 804 - checkout attr=text  aeol=lf core.autocrlf=input core.eol=native file=LF_mix_CR
+				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: 
-		compare_ws_file eol_native_crlf_input_attr_text_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 805 - checkout attr=text  aeol=lf core.autocrlf=input core.eol=native file=LF_nul
+			test-tool wildmatch pathmatch 'a' '[a-z]'
+		
+ok 1787 - pathmatch: match 'a' '[a-z]'
 
 expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
+				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 806 - ls-files --eol attr=text  aeol=crlf core.autocrlf=input core.eol=native
+			
+ok 1788 - pathmatch (via ls-files): match '[a-z]' 'a'
 
 expecting success: 
-		compare_ws_file eol_native_crlf_input_attr_text_ CRLF    crlf_false_attr__LF.txt
-	
-ok 807 - checkout attr=text  aeol=crlf core.autocrlf=input core.eol=native file=LF
+			test-tool wildmatch ipathmatch 'a' '[a-z]'
+		
+ok 1789 - ipathmatch: match 'a' '[a-z]'
 
 expecting success: 
-		compare_ws_file eol_native_crlf_input_attr_text_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 808 - checkout attr=text  aeol=crlf core.autocrlf=input core.eol=native file=CRLF
+				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: 
-		compare_ws_file eol_native_crlf_input_attr_text_ CRLF crlf_false_attr__CRLF_mix_LF.txt
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
 	
-ok 809 - checkout attr=text  aeol=crlf core.autocrlf=input core.eol=native file=CRLF_mix_LF
+Removing a
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1791 - cleanup after previous file test
 
 expecting success: 
-		compare_ws_file eol_native_crlf_input_attr_text_ CRLF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
 	
-ok 810 - checkout attr=text  aeol=crlf core.autocrlf=input core.eol=native file=LF_mix_CR
+ok 1792 - setup match file test for a
 
 expecting success: 
-		compare_ws_file eol_native_crlf_input_attr_text_ CRLF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 811 - checkout attr=text  aeol=crlf core.autocrlf=input core.eol=native file=LF_nul
+			test_must_fail test-tool wildmatch wildmatch 'a' '[[:upper:]]'
+		
+ok 1793 - wildmatch: no match 'a' '[[:upper:]]'
 
 expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
+				>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 812 - ls-files --eol attr=auto  aeol=lf core.autocrlf=input core.eol=native
+			
+ok 1794 - wildmatch (via ls-files): no match '[[:upper:]]' 'a'
 
 expecting success: 
-		compare_ws_file eol_native_crlf_input_attr_auto_ LF    crlf_false_attr__LF.txt
-	
-ok 813 - checkout attr=auto  aeol=lf core.autocrlf=input core.eol=native file=LF
+			test-tool wildmatch iwildmatch 'a' '[[:upper:]]'
+		
+ok 1795 - iwildmatch: match 'a' '[[:upper:]]'
 
 expecting success: 
-		compare_ws_file eol_native_crlf_input_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 814 - checkout attr=auto  aeol=lf core.autocrlf=input core.eol=native file=CRLF
+				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: 
-		compare_ws_file eol_native_crlf_input_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 815 - checkout attr=auto  aeol=lf core.autocrlf=input core.eol=native file=CRLF_mix_LF
+			test_must_fail test-tool wildmatch pathmatch 'a' '[[:upper:]]'
+		
+ok 1797 - pathmatch: no match 'a' '[[:upper:]]'
 
 expecting success: 
-		compare_ws_file eol_native_crlf_input_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 816 - checkout attr=auto  aeol=lf core.autocrlf=input core.eol=native file=LF_mix_CR
+				>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: 
-		compare_ws_file eol_native_crlf_input_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 817 - checkout attr=auto  aeol=lf core.autocrlf=input core.eol=native file=LF_nul
+			test-tool wildmatch ipathmatch 'a' '[[:upper:]]'
+		
+ok 1799 - ipathmatch: match 'a' '[[:upper:]]'
 
 expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
+				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 818 - ls-files --eol attr=auto  aeol=crlf core.autocrlf=input core.eol=native
+			
+ok 1800 - ipathmatch (via ls-files): match '[[:upper:]]' 'a'
 
 expecting success: 
-		compare_ws_file eol_native_crlf_input_attr_auto_ CRLF    crlf_false_attr__LF.txt
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
 	
-ok 819 - checkout attr=auto  aeol=crlf core.autocrlf=input core.eol=native file=LF
+Removing a
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1801 - cleanup after previous file test
 
 expecting success: 
-		compare_ws_file eol_native_crlf_input_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
 	
-ok 820 - checkout attr=auto  aeol=crlf core.autocrlf=input core.eol=native file=CRLF
+ok 1802 - setup match file test for A
 
 expecting success: 
-		compare_ws_file eol_native_crlf_input_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 821 - checkout attr=auto  aeol=crlf core.autocrlf=input core.eol=native file=CRLF_mix_LF
+			test-tool wildmatch wildmatch 'A' '[[:upper:]]'
+		
+ok 1803 - wildmatch: match 'A' '[[:upper:]]'
 
 expecting success: 
-		compare_ws_file eol_native_crlf_input_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 822 - checkout attr=auto  aeol=crlf core.autocrlf=input core.eol=native file=LF_mix_CR
+				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: 
-		compare_ws_file eol_native_crlf_input_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 823 - checkout attr=auto  aeol=crlf core.autocrlf=input core.eol=native file=LF_nul
+			test-tool wildmatch iwildmatch 'A' '[[:upper:]]'
+		
+ok 1805 - iwildmatch: match 'A' '[[:upper:]]'
 
 expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
+				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 824 - ls-files --eol attr=  aeol= core.autocrlf=false core.eol=native
+			
+ok 1806 - iwildmatch (via ls-files): match '[[:upper:]]' 'A'
 
 expecting success: 
-		compare_ws_file eol_native_crlf_false_attr__ LF    crlf_false_attr__LF.txt
-	
-ok 825 - checkout attr=  aeol= core.autocrlf=false core.eol=native file=LF
+			test-tool wildmatch pathmatch 'A' '[[:upper:]]'
+		
+ok 1807 - pathmatch: match 'A' '[[:upper:]]'
 
 expecting success: 
-		compare_ws_file eol_native_crlf_false_attr__ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 826 - checkout attr=  aeol= core.autocrlf=false core.eol=native file=CRLF
+				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: 
-		compare_ws_file eol_native_crlf_false_attr__ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 827 - checkout attr=  aeol= core.autocrlf=false core.eol=native file=CRLF_mix_LF
+			test-tool wildmatch ipathmatch 'A' '[[:upper:]]'
+		
+ok 1809 - ipathmatch: match 'A' '[[:upper:]]'
 
 expecting success: 
-		compare_ws_file eol_native_crlf_false_attr__ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 828 - checkout attr=  aeol= core.autocrlf=false core.eol=native file=LF_mix_CR
+				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: 
-		compare_ws_file eol_native_crlf_false_attr__ LF_nul   crlf_false_attr__LF_nul.txt
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
 	
-ok 829 - checkout attr=  aeol= core.autocrlf=false core.eol=native file=LF_nul
+Removing A
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1811 - cleanup after previous file test
 
 expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
-		test_cmp expect actual
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
 	
-ok 830 - ls-files --eol attr=  aeol= core.autocrlf=true core.eol=native
+ok 1812 - setup match file test for A
 
 expecting success: 
-		compare_ws_file eol_native_crlf_true_attr__ CRLF    crlf_false_attr__LF.txt
-	
-ok 831 - checkout attr=  aeol= core.autocrlf=true core.eol=native file=LF
+			test_must_fail test-tool wildmatch wildmatch 'A' '[[:lower:]]'
+		
+ok 1813 - wildmatch: no match 'A' '[[:lower:]]'
 
 expecting success: 
-		compare_ws_file eol_native_crlf_true_attr__ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 832 - checkout attr=  aeol= core.autocrlf=true core.eol=native file=CRLF
+				>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: 
-		compare_ws_file eol_native_crlf_true_attr__ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 833 - checkout attr=  aeol= core.autocrlf=true core.eol=native file=CRLF_mix_LF
+			test-tool wildmatch iwildmatch 'A' '[[:lower:]]'
+		
+ok 1815 - iwildmatch: match 'A' '[[:lower:]]'
 
 expecting success: 
-		compare_ws_file eol_native_crlf_true_attr__ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 834 - checkout attr=  aeol= core.autocrlf=true core.eol=native file=LF_mix_CR
+				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: 
-		compare_ws_file eol_native_crlf_true_attr__ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 835 - checkout attr=  aeol= core.autocrlf=true core.eol=native file=LF_nul
+			test_must_fail test-tool wildmatch pathmatch 'A' '[[:lower:]]'
+		
+ok 1817 - pathmatch: no match 'A' '[[:lower:]]'
 
 expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
+				>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 836 - ls-files --eol attr=auto  aeol= core.autocrlf=true core.eol=native
+			
+ok 1818 - pathmatch (via ls-files): no match '[[:lower:]]' 'A'
 
 expecting success: 
-		compare_ws_file eol_native_crlf_true_attr_auto_ CRLF    crlf_false_attr__LF.txt
-	
-ok 837 - checkout attr=auto  aeol= core.autocrlf=true core.eol=native file=LF
+			test-tool wildmatch ipathmatch 'A' '[[:lower:]]'
+		
+ok 1819 - ipathmatch: match 'A' '[[:lower:]]'
 
 expecting success: 
-		compare_ws_file eol_native_crlf_true_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 838 - checkout attr=auto  aeol= core.autocrlf=true core.eol=native file=CRLF
+				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: 
-		compare_ws_file eol_native_crlf_true_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
 	
-ok 839 - checkout attr=auto  aeol= core.autocrlf=true core.eol=native file=CRLF_mix_LF
+Removing A
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1821 - cleanup after previous file test
 
 expecting success: 
-		compare_ws_file eol_native_crlf_true_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
 	
-ok 840 - checkout attr=auto  aeol= core.autocrlf=true core.eol=native file=LF_mix_CR
+ok 1822 - setup match file test for a
 
 expecting success: 
-		compare_ws_file eol_native_crlf_true_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 841 - checkout attr=auto  aeol= core.autocrlf=true core.eol=native file=LF_nul
+			test-tool wildmatch wildmatch 'a' '[[:lower:]]'
+		
+ok 1823 - wildmatch: match 'a' '[[:lower:]]'
 
 expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
+				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 842 - ls-files --eol attr=text  aeol= core.autocrlf=true core.eol=native
+			
+ok 1824 - wildmatch (via ls-files): match '[[:lower:]]' 'a'
 
 expecting success: 
-		compare_ws_file eol_native_crlf_true_attr_text_ CRLF    crlf_false_attr__LF.txt
-	
-ok 843 - checkout attr=text  aeol= core.autocrlf=true core.eol=native file=LF
+			test-tool wildmatch iwildmatch 'a' '[[:lower:]]'
+		
+ok 1825 - iwildmatch: match 'a' '[[:lower:]]'
 
 expecting success: 
-		compare_ws_file eol_native_crlf_true_attr_text_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 844 - checkout attr=text  aeol= core.autocrlf=true core.eol=native file=CRLF
+				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: 
-		compare_ws_file eol_native_crlf_true_attr_text_ CRLF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 845 - checkout attr=text  aeol= core.autocrlf=true core.eol=native file=CRLF_mix_LF
+			test-tool wildmatch pathmatch 'a' '[[:lower:]]'
+		
+ok 1827 - pathmatch: match 'a' '[[:lower:]]'
 
 expecting success: 
-		compare_ws_file eol_native_crlf_true_attr_text_ CRLF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 846 - checkout attr=text  aeol= core.autocrlf=true core.eol=native file=LF_mix_CR
+				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: 
-		compare_ws_file eol_native_crlf_true_attr_text_ CRLF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 847 - checkout attr=text  aeol= core.autocrlf=true core.eol=native file=LF_nul
+			test-tool wildmatch ipathmatch 'a' '[[:lower:]]'
+		
+ok 1829 - ipathmatch: match 'a' '[[:lower:]]'
 
 expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
+				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 848 - ls-files --eol attr=text  aeol= core.autocrlf=input core.eol=native
+			
+ok 1830 - ipathmatch (via ls-files): match '[[:lower:]]' 'a'
 
 expecting success: 
-		compare_ws_file eol_native_crlf_input_attr_text_ LF    crlf_false_attr__LF.txt
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
 	
-ok 849 - checkout attr=text  aeol= core.autocrlf=input core.eol=native file=LF
+Removing a
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1831 - cleanup after previous file test
 
 expecting success: 
-		compare_ws_file eol_native_crlf_input_attr_text_ CRLF  crlf_false_attr__CRLF.txt
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
 	
-ok 850 - checkout attr=text  aeol= core.autocrlf=input core.eol=native file=CRLF
+ok 1832 - setup match file test for A
 
 expecting success: 
-		compare_ws_file eol_native_crlf_input_attr_text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 851 - checkout attr=text  aeol= core.autocrlf=input core.eol=native file=CRLF_mix_LF
+			test_must_fail test-tool wildmatch wildmatch 'A' '[B-Za]'
+		
+ok 1833 - wildmatch: no match 'A' '[B-Za]'
 
 expecting success: 
-		compare_ws_file eol_native_crlf_input_attr_text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 852 - checkout attr=text  aeol= core.autocrlf=input core.eol=native file=LF_mix_CR
+				>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: 
-		compare_ws_file eol_native_crlf_input_attr_text_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 853 - checkout attr=text  aeol= core.autocrlf=input core.eol=native file=LF_nul
+			test-tool wildmatch iwildmatch 'A' '[B-Za]'
+		
+ok 1835 - iwildmatch: match 'A' '[B-Za]'
 
 expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
+				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 854 - ls-files --eol attr=auto  aeol= core.autocrlf=input core.eol=native
+			
+ok 1836 - iwildmatch (via ls-files): match '[B-Za]' 'A'
 
 expecting success: 
-		compare_ws_file eol_native_crlf_input_attr_auto_ LF    crlf_false_attr__LF.txt
-	
-ok 855 - checkout attr=auto  aeol= core.autocrlf=input core.eol=native file=LF
+			test_must_fail test-tool wildmatch pathmatch 'A' '[B-Za]'
+		
+ok 1837 - pathmatch: no match 'A' '[B-Za]'
 
 expecting success: 
-		compare_ws_file eol_native_crlf_input_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 856 - checkout attr=auto  aeol= core.autocrlf=input core.eol=native file=CRLF
+				>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: 
-		compare_ws_file eol_native_crlf_input_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 857 - checkout attr=auto  aeol= core.autocrlf=input core.eol=native file=CRLF_mix_LF
+			test-tool wildmatch ipathmatch 'A' '[B-Za]'
+		
+ok 1839 - ipathmatch: match 'A' '[B-Za]'
 
 expecting success: 
-		compare_ws_file eol_native_crlf_input_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 858 - checkout attr=auto  aeol= core.autocrlf=input core.eol=native file=LF_mix_CR
+				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: 
-		compare_ws_file eol_native_crlf_input_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
 	
-ok 859 - checkout attr=auto  aeol= core.autocrlf=input core.eol=native file=LF_nul
+Removing A
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1841 - cleanup after previous file test
 
 expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
-		test_cmp expect actual
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
 	
-ok 860 - ls-files --eol attr=text  aeol= core.autocrlf=false core.eol=crlf
+ok 1842 - setup match file test for a
 
 expecting success: 
-		compare_ws_file eol_crlf_crlf_false_attr_text_ CRLF    crlf_false_attr__LF.txt
-	
-ok 861 - checkout attr=text  aeol= core.autocrlf=false core.eol=crlf file=LF
+			test-tool wildmatch wildmatch 'a' '[B-Za]'
+		
+ok 1843 - wildmatch: match 'a' '[B-Za]'
 
 expecting success: 
-		compare_ws_file eol_crlf_crlf_false_attr_text_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 862 - checkout attr=text  aeol= core.autocrlf=false core.eol=crlf file=CRLF
+				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: 
-		compare_ws_file eol_crlf_crlf_false_attr_text_ CRLF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 863 - checkout attr=text  aeol= core.autocrlf=false core.eol=crlf file=CRLF_mix_LF
+			test-tool wildmatch iwildmatch 'a' '[B-Za]'
+		
+ok 1845 - iwildmatch: match 'a' '[B-Za]'
 
 expecting success: 
-		compare_ws_file eol_crlf_crlf_false_attr_text_ CRLF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 864 - checkout attr=text  aeol= core.autocrlf=false core.eol=crlf file=LF_mix_CR
+				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: 
-		compare_ws_file eol_crlf_crlf_false_attr_text_ CRLF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 865 - checkout attr=text  aeol= core.autocrlf=false core.eol=crlf file=LF_nul
+			test-tool wildmatch pathmatch 'a' '[B-Za]'
+		
+ok 1847 - pathmatch: match 'a' '[B-Za]'
 
 expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
+				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 866 - ls-files --eol attr=text  aeol= core.autocrlf=false core.eol=lf
+			
+ok 1848 - pathmatch (via ls-files): match '[B-Za]' 'a'
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_false_attr_text_ LF    crlf_false_attr__LF.txt
-	
-ok 867 - checkout attr=text  aeol= core.autocrlf=false core.eol=lf file=LF
+			test-tool wildmatch ipathmatch 'a' '[B-Za]'
+		
+ok 1849 - ipathmatch: match 'a' '[B-Za]'
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_false_attr_text_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 868 - checkout attr=text  aeol= core.autocrlf=false core.eol=lf file=CRLF
+				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: 
-		compare_ws_file eol_lf_crlf_false_attr_text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
 	
-ok 869 - checkout attr=text  aeol= core.autocrlf=false core.eol=lf file=CRLF_mix_LF
+Removing a
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1851 - cleanup after previous file test
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_false_attr_text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
 	
-ok 870 - checkout attr=text  aeol= core.autocrlf=false core.eol=lf file=LF_mix_CR
+ok 1852 - setup match file test for A
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_false_attr_text_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 871 - checkout attr=text  aeol= core.autocrlf=false core.eol=lf file=LF_nul
+			test_must_fail test-tool wildmatch wildmatch 'A' '[B-a]'
+		
+ok 1853 - wildmatch: no match 'A' '[B-a]'
 
 expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
+				>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 872 - ls-files --eol attr=text  aeol= core.autocrlf=false core.eol=
+			
+ok 1854 - wildmatch (via ls-files): no match '[B-a]' 'A'
 
 expecting success: 
-		compare_ws_file eol__crlf_false_attr_text_ LF    crlf_false_attr__LF.txt
-	
-ok 873 - checkout attr=text  aeol= core.autocrlf=false core.eol= file=LF
+			test-tool wildmatch iwildmatch 'A' '[B-a]'
+		
+ok 1855 - iwildmatch: match 'A' '[B-a]'
 
 expecting success: 
-		compare_ws_file eol__crlf_false_attr_text_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 874 - checkout attr=text  aeol= core.autocrlf=false core.eol= file=CRLF
+				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: 
-		compare_ws_file eol__crlf_false_attr_text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 875 - checkout attr=text  aeol= core.autocrlf=false core.eol= file=CRLF_mix_LF
+			test_must_fail test-tool wildmatch pathmatch 'A' '[B-a]'
+		
+ok 1857 - pathmatch: no match 'A' '[B-a]'
 
 expecting success: 
-		compare_ws_file eol__crlf_false_attr_text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 876 - checkout attr=text  aeol= core.autocrlf=false core.eol= file=LF_mix_CR
+				>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: 
-		compare_ws_file eol__crlf_false_attr_text_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 877 - checkout attr=text  aeol= core.autocrlf=false core.eol= file=LF_nul
+			test-tool wildmatch ipathmatch 'A' '[B-a]'
+		
+ok 1859 - ipathmatch: match 'A' '[B-a]'
 
 expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
+				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 878 - ls-files --eol attr=text  aeol= core.autocrlf=false core.eol=native
+			
+ok 1860 - ipathmatch (via ls-files): match '[B-a]' 'A'
 
 expecting success: 
-		compare_ws_file eol_native_crlf_false_attr_text_ LF    crlf_false_attr__LF.txt
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
 	
-ok 879 - checkout attr=text  aeol= core.autocrlf=false core.eol=native file=LF
+Removing A
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1861 - cleanup after previous file test
 
 expecting success: 
-		compare_ws_file eol_native_crlf_false_attr_text_ CRLF  crlf_false_attr__CRLF.txt
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
 	
-ok 880 - checkout attr=text  aeol= core.autocrlf=false core.eol=native file=CRLF
+ok 1862 - setup match file test for a
 
 expecting success: 
-		compare_ws_file eol_native_crlf_false_attr_text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 881 - checkout attr=text  aeol= core.autocrlf=false core.eol=native file=CRLF_mix_LF
+			test-tool wildmatch wildmatch 'a' '[B-a]'
+		
+ok 1863 - wildmatch: match 'a' '[B-a]'
 
 expecting success: 
-		compare_ws_file eol_native_crlf_false_attr_text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 882 - checkout attr=text  aeol= core.autocrlf=false core.eol=native file=LF_mix_CR
+				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: 
-		compare_ws_file eol_native_crlf_false_attr_text_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 883 - checkout attr=text  aeol= core.autocrlf=false core.eol=native file=LF_nul
+			test-tool wildmatch iwildmatch 'a' '[B-a]'
+		
+ok 1865 - iwildmatch: match 'a' '[B-a]'
 
 expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
+				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 884 - ls-files --eol attr=auto  aeol= core.autocrlf=false core.eol=
+			
+ok 1866 - iwildmatch (via ls-files): match '[B-a]' 'a'
 
 expecting success: 
-		compare_ws_file eol__crlf_false_attr_auto_ LF    crlf_false_attr__LF.txt
-	
-ok 885 - checkout attr=auto  aeol= core.autocrlf=false core.eol= file=LF
+			test-tool wildmatch pathmatch 'a' '[B-a]'
+		
+ok 1867 - pathmatch: match 'a' '[B-a]'
 
 expecting success: 
-		compare_ws_file eol__crlf_false_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 886 - checkout attr=auto  aeol= core.autocrlf=false core.eol= file=CRLF
+				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: 
-		compare_ws_file eol__crlf_false_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 887 - checkout attr=auto  aeol= core.autocrlf=false core.eol= file=CRLF_mix_LF
+			test-tool wildmatch ipathmatch 'a' '[B-a]'
+		
+ok 1869 - ipathmatch: match 'a' '[B-a]'
 
 expecting success: 
-		compare_ws_file eol__crlf_false_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 888 - checkout attr=auto  aeol= core.autocrlf=false core.eol= file=LF_mix_CR
+				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: 
-		compare_ws_file eol__crlf_false_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
 	
-ok 889 - checkout attr=auto  aeol= core.autocrlf=false core.eol= file=LF_nul
+Removing a
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1871 - cleanup after previous file test
 
 expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
-		test_cmp expect actual
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
 	
-ok 890 - ls-files --eol attr=auto  aeol= core.autocrlf=false core.eol=native
+ok 1872 - setup match file test for z
 
 expecting success: 
-		compare_ws_file eol_native_crlf_false_attr_auto_ LF    crlf_false_attr__LF.txt
-	
-ok 891 - checkout attr=auto  aeol= core.autocrlf=false core.eol=native file=LF
+			test_must_fail test-tool wildmatch wildmatch 'z' '[Z-y]'
+		
+ok 1873 - wildmatch: no match 'z' '[Z-y]'
 
 expecting success: 
-		compare_ws_file eol_native_crlf_false_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 892 - checkout attr=auto  aeol= core.autocrlf=false core.eol=native file=CRLF
+				>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: 
-		compare_ws_file eol_native_crlf_false_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 893 - checkout attr=auto  aeol= core.autocrlf=false core.eol=native file=CRLF_mix_LF
+			test-tool wildmatch iwildmatch 'z' '[Z-y]'
+		
+ok 1875 - iwildmatch: match 'z' '[Z-y]'
 
 expecting success: 
-		compare_ws_file eol_native_crlf_false_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 894 - checkout attr=auto  aeol= core.autocrlf=false core.eol=native file=LF_mix_CR
+				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: 
-		compare_ws_file eol_native_crlf_false_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 895 - checkout attr=auto  aeol= core.autocrlf=false core.eol=native file=LF_nul
+			test_must_fail test-tool wildmatch pathmatch 'z' '[Z-y]'
+		
+ok 1877 - pathmatch: no match 'z' '[Z-y]'
 
 expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
+				>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 896 - ls-files --eol attr=-text ident aeol= core.autocrlf=true core.eol=lf
+			
+ok 1878 - pathmatch (via ls-files): no match '[Z-y]' 'z'
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_true_attr_-text_ LF    crlf_false_attr__LF.txt
-	
-ok 897 - checkout attr=-text ident aeol= core.autocrlf=true core.eol=lf file=LF
+			test-tool wildmatch ipathmatch 'z' '[Z-y]'
+		
+ok 1879 - ipathmatch: match 'z' '[Z-y]'
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_true_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 898 - checkout attr=-text ident aeol= core.autocrlf=true core.eol=lf file=CRLF
+				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: 
-		compare_ws_file eol_lf_crlf_true_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
 	
-ok 899 - checkout attr=-text ident aeol= core.autocrlf=true core.eol=lf file=CRLF_mix_LF
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+Removing z
+ok 1881 - cleanup after previous file test
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_true_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*}
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
 	
-ok 900 - checkout attr=-text ident aeol= core.autocrlf=true core.eol=lf file=LF_mix_CR
+ok 1882 - setup match file test for Z
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_true_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 901 - checkout attr=-text ident aeol= core.autocrlf=true core.eol=lf file=LF_nul
+			test-tool wildmatch wildmatch 'Z' '[Z-y]'
+		
+ok 1883 - wildmatch: match 'Z' '[Z-y]'
 
 expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
+				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 902 - ls-files --eol attr=-text ident aeol=lf core.autocrlf=true core.eol=lf
+			
+ok 1884 - wildmatch (via ls-files): match '[Z-y]' 'Z'
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_true_attr_-text_ LF    crlf_false_attr__LF.txt
-	
-ok 903 - checkout attr=-text ident aeol=lf core.autocrlf=true core.eol=lf file=LF
+			test-tool wildmatch iwildmatch 'Z' '[Z-y]'
+		
+ok 1885 - iwildmatch: match 'Z' '[Z-y]'
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_true_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 904 - checkout attr=-text ident aeol=lf core.autocrlf=true core.eol=lf file=CRLF
+				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: 
-		compare_ws_file eol_lf_crlf_true_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 905 - checkout attr=-text ident aeol=lf core.autocrlf=true core.eol=lf file=CRLF_mix_LF
+			test-tool wildmatch pathmatch 'Z' '[Z-y]'
+		
+ok 1887 - pathmatch: match 'Z' '[Z-y]'
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_true_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 906 - checkout attr=-text ident aeol=lf core.autocrlf=true core.eol=lf file=LF_mix_CR
+				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: 
-		compare_ws_file eol_lf_crlf_true_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 907 - checkout attr=-text ident aeol=lf core.autocrlf=true core.eol=lf file=LF_nul
+			test-tool wildmatch ipathmatch 'Z' '[Z-y]'
+		
+ok 1889 - ipathmatch: match 'Z' '[Z-y]'
 
 expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
+				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 908 - ls-files --eol attr=-text ident aeol=crlf core.autocrlf=true core.eol=lf
+			
+ok 1890 - ipathmatch (via ls-files): match '[Z-y]' 'Z'
 
+# still have 40 known breakage(s)
+# passed all remaining 1850 test(s)
+1..1890
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t5533-push-cas.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5533-push-cas/.git/
 expecting success: 
-		compare_ws_file eol_lf_crlf_true_attr_-text_ LF    crlf_false_attr__LF.txt
-	
-ok 909 - checkout attr=-text ident aeol=crlf core.autocrlf=true core.eol=lf file=LF
+	# create template repository
+	test_commit A &&
+	test_commit B &&
+	test_commit C
 
-expecting success: 
-		compare_ws_file eol_lf_crlf_true_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 910 - checkout attr=-text ident aeol=crlf core.autocrlf=true core.eol=lf file=CRLF
+[master (root-commit) 0ddfaf1] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A.t
+[master d9df450] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 B.t
+[master 35a8500] C
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 C.t
+ok 1 - setup
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_true_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 911 - checkout attr=-text ident aeol=crlf core.autocrlf=true core.eol=lf file=CRLF_mix_LF
+	setup_srcdst_basic &&
+	(
+		cd dst &&
+		test_commit D &&
+		test_must_fail git push --force-with-lease=master:master origin master 2>err &&
+		grep "stale info" err
+	) &&
+	git ls-remote . refs/heads/master >expect &&
+	git ls-remote src refs/heads/master >actual &&
+	test_cmp expect actual
 
-expecting success: 
-		compare_ws_file eol_lf_crlf_true_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 912 - checkout attr=-text ident aeol=crlf core.autocrlf=true core.eol=lf file=LF_mix_CR
+Cloning into 'src'...
+Cloning into 'dst'...
+Note: checking out 'HEAD^0'.
 
-expecting success: 
-		compare_ws_file eol_lf_crlf_true_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 913 - checkout attr=-text ident aeol=crlf core.autocrlf=true core.eol=lf 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 performing another checkout.
 
-expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
-		test_cmp expect actual
-	
-ok 914 - ls-files --eol attr=text ident aeol=lf core.autocrlf=true 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 -b with the checkout command again. Example:
 
-expecting success: 
-		compare_ws_file eol_lf_crlf_true_attr_text_ LF    crlf_false_attr__LF.txt
-	
-ok 915 - checkout attr=text ident aeol=lf core.autocrlf=true core.eol=lf file=LF
+  git checkout -b <new-branch-name>
 
-expecting success: 
-		compare_ws_file eol_lf_crlf_true_attr_text_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 916 - checkout attr=text ident aeol=lf core.autocrlf=true core.eol=lf file=CRLF
+HEAD is now at 35a8500 C
+[master be8f64f] D
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 D.t
+ ! [rejected]        master -> master (stale info)
+ok 2 - push to update (protected)
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_true_attr_text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 917 - checkout attr=text ident aeol=lf core.autocrlf=true core.eol=lf file=CRLF_mix_LF
+	setup_srcdst_basic &&
+	(
+		cd dst &&
+		test_commit D &&
+		git push --force --force-with-lease=master:master origin master 2>err &&
+		grep "forced update" err
+	) &&
+	git ls-remote dst refs/heads/master >expect &&
+	git ls-remote src refs/heads/master >actual &&
+	test_cmp expect actual
 
-expecting success: 
-		compare_ws_file eol_lf_crlf_true_attr_text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 918 - checkout attr=text ident aeol=lf core.autocrlf=true core.eol=lf file=LF_mix_CR
+Cloning into 'src'...
+Cloning into 'dst'...
+Note: checking out 'HEAD^0'.
 
-expecting success: 
-		compare_ws_file eol_lf_crlf_true_attr_text_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 919 - checkout attr=text ident aeol=lf core.autocrlf=true core.eol=lf 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 performing another checkout.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -b with the checkout command again. Example:
+
+  git checkout -b <new-branch-name>
+
+HEAD is now at 35a8500 C
+[master be8f64f] D
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 D.t
+ + 35a8500...be8f64f master -> master (forced update)
+ok 3 - push to update (protected, forced)
 
 expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
+	setup_srcdst_basic &&
+	(
+		cd src &&
+		git checkout master &&
+		test_commit D &&
+		git checkout HEAD^0
+	) &&
+	git ls-remote src refs/heads/master >expect &&
+	(
+		cd dst &&
+		test_commit E &&
+		git ls-remote . refs/remotes/origin/master >expect &&
+		test_must_fail git push --force-with-lease=master origin master &&
+		git ls-remote . refs/remotes/origin/master >actual &&
 		test_cmp expect actual
-	
-ok 920 - ls-files --eol attr=text ident aeol=crlf core.autocrlf=true core.eol=lf
+	) &&
+	git ls-remote src refs/heads/master >actual &&
+	test_cmp expect actual
 
-expecting success: 
-		compare_ws_file eol_lf_crlf_true_attr_text_ CRLF    crlf_false_attr__LF.txt
-	
-ok 921 - checkout attr=text ident aeol=crlf core.autocrlf=true core.eol=lf file=LF
+Cloning into 'src'...
+Cloning into 'dst'...
+Note: checking out 'HEAD^0'.
 
-expecting success: 
-		compare_ws_file eol_lf_crlf_true_attr_text_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 922 - checkout attr=text ident aeol=crlf core.autocrlf=true core.eol=lf file=CRLF
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by performing another checkout.
 
-expecting success: 
-		compare_ws_file eol_lf_crlf_true_attr_text_ CRLF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 923 - checkout attr=text ident aeol=crlf core.autocrlf=true core.eol=lf file=CRLF_mix_LF
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -b with the checkout command again. Example:
 
-expecting success: 
-		compare_ws_file eol_lf_crlf_true_attr_text_ CRLF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 924 - checkout attr=text ident aeol=crlf core.autocrlf=true core.eol=lf file=LF_mix_CR
+  git checkout -b <new-branch-name>
 
-expecting success: 
-		compare_ws_file eol_lf_crlf_true_attr_text_ CRLF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 925 - checkout attr=text ident aeol=crlf core.autocrlf=true core.eol=lf file=LF_nul
+HEAD is now at 35a8500 C
+Switched to branch 'master'
+Your branch is up to date with 'origin/master'.
+[master be8f64f] D
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 D.t
+Note: checking out 'HEAD^0'.
 
-expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
-		test_cmp expect actual
-	
-ok 926 - ls-files --eol attr=auto ident aeol=lf core.autocrlf=true 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 performing another checkout.
 
-expecting success: 
-		compare_ws_file eol_lf_crlf_true_attr_auto_ LF    crlf_false_attr__LF.txt
-	
-ok 927 - checkout attr=auto ident aeol=lf core.autocrlf=true 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 -b with the checkout command again. Example:
 
-expecting success: 
-		compare_ws_file eol_lf_crlf_true_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 928 - checkout attr=auto ident aeol=lf core.autocrlf=true core.eol=lf file=CRLF
+  git checkout -b <new-branch-name>
 
-expecting success: 
-		compare_ws_file eol_lf_crlf_true_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 929 - checkout attr=auto ident aeol=lf core.autocrlf=true core.eol=lf file=CRLF_mix_LF
+HEAD is now at be8f64f D
+[master 3e7056f] E
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 E.t
+To /build/git-2.20.1/t/trash directory.t5533-push-cas/src
+ ! [rejected]        master -> master (stale info)
+error: failed to push some refs to '/build/git-2.20.1/t/trash directory.t5533-push-cas/src'
+ok 4 - push to update (protected, tracking)
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_true_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 930 - checkout attr=auto ident aeol=lf core.autocrlf=true core.eol=lf file=LF_mix_CR
+	setup_srcdst_basic &&
+	(
+		cd src &&
+		git checkout master &&
+		test_commit D &&
+		git checkout HEAD^0
+	) &&
+	(
+		cd dst &&
+		test_commit E &&
+		git ls-remote . refs/remotes/origin/master >expect &&
+		git push --force --force-with-lease=master origin master
+	) &&
+	git ls-remote dst refs/heads/master >expect &&
+	git ls-remote src refs/heads/master >actual &&
+	test_cmp expect actual
 
-expecting success: 
-		compare_ws_file eol_lf_crlf_true_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 931 - checkout attr=auto ident aeol=lf core.autocrlf=true core.eol=lf file=LF_nul
+Cloning into 'src'...
+Cloning into 'dst'...
+Note: checking out 'HEAD^0'.
 
-expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
-		test_cmp expect actual
-	
-ok 932 - ls-files --eol attr=auto ident aeol=crlf core.autocrlf=true 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 performing another checkout.
 
-expecting success: 
-		compare_ws_file eol_lf_crlf_true_attr_auto_ CRLF    crlf_false_attr__LF.txt
-	
-ok 933 - checkout attr=auto ident aeol=crlf core.autocrlf=true 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 -b with the checkout command again. Example:
 
-expecting success: 
-		compare_ws_file eol_lf_crlf_true_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 934 - checkout attr=auto ident aeol=crlf core.autocrlf=true core.eol=lf file=CRLF
+  git checkout -b <new-branch-name>
 
-expecting success: 
-		compare_ws_file eol_lf_crlf_true_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 935 - checkout attr=auto ident aeol=crlf core.autocrlf=true core.eol=lf file=CRLF_mix_LF
+HEAD is now at 35a8500 C
+Switched to branch 'master'
+Your branch is up to date with 'origin/master'.
+[master be8f64f] D
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 D.t
+Note: checking out 'HEAD^0'.
 
-expecting success: 
-		compare_ws_file eol_lf_crlf_true_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 936 - checkout attr=auto ident aeol=crlf core.autocrlf=true 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 performing another checkout.
 
-expecting success: 
-		compare_ws_file eol_lf_crlf_true_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 937 - checkout attr=auto ident aeol=crlf core.autocrlf=true 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 -b with the checkout command again. Example:
 
-expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
-		test_cmp expect actual
-	
-ok 938 - ls-files --eol attr=-text ident aeol= core.autocrlf=false core.eol=lf
+  git checkout -b <new-branch-name>
 
-expecting success: 
-		compare_ws_file eol_lf_crlf_false_attr_-text_ LF    crlf_false_attr__LF.txt
-	
-ok 939 - checkout attr=-text ident aeol= core.autocrlf=false core.eol=lf file=LF
+HEAD is now at be8f64f D
+[master 3e7056f] E
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 E.t
+To /build/git-2.20.1/t/trash directory.t5533-push-cas/src
+ + be8f64f...3e7056f master -> master (forced update)
+ok 5 - push to update (protected, tracking, forced)
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_false_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 940 - checkout attr=-text ident aeol= core.autocrlf=false core.eol=lf file=CRLF
+	setup_srcdst_basic &&
+	(
+		cd dst &&
+		test_commit D &&
+		git push --force-with-lease=master:master^ origin master
+	) &&
+	git ls-remote dst refs/heads/master >expect &&
+	git ls-remote src refs/heads/master >actual &&
+	test_cmp expect actual
 
-expecting success: 
-		compare_ws_file eol_lf_crlf_false_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 941 - checkout attr=-text ident aeol= core.autocrlf=false core.eol=lf file=CRLF_mix_LF
+Cloning into 'src'...
+Cloning into 'dst'...
+Note: checking out 'HEAD^0'.
 
-expecting success: 
-		compare_ws_file eol_lf_crlf_false_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 942 - checkout attr=-text ident aeol= core.autocrlf=false 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 performing another checkout.
 
-expecting success: 
-		compare_ws_file eol_lf_crlf_false_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 943 - checkout attr=-text ident aeol= core.autocrlf=false 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 -b with the checkout command again. Example:
 
-expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
-		test_cmp expect actual
-	
-ok 944 - ls-files --eol attr=-text ident aeol=lf core.autocrlf=false core.eol=lf
+  git checkout -b <new-branch-name>
 
-expecting success: 
-		compare_ws_file eol_lf_crlf_false_attr_-text_ LF    crlf_false_attr__LF.txt
-	
-ok 945 - checkout attr=-text ident aeol=lf core.autocrlf=false core.eol=lf file=LF
+HEAD is now at 35a8500 C
+[master be8f64f] D
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 D.t
+To /build/git-2.20.1/t/trash directory.t5533-push-cas/src
+   35a8500..be8f64f  master -> master
+ok 6 - push to update (allowed)
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_false_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 946 - checkout attr=-text ident aeol=lf core.autocrlf=false core.eol=lf file=CRLF
+	setup_srcdst_basic &&
+	(
+		cd dst &&
+		test_commit D &&
+		git push --force-with-lease=master origin master 2>err &&
+		! grep "forced update" err
+	) &&
+	git ls-remote dst refs/heads/master >expect &&
+	git ls-remote src refs/heads/master >actual &&
+	test_cmp expect actual
 
-expecting success: 
-		compare_ws_file eol_lf_crlf_false_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 947 - checkout attr=-text ident aeol=lf core.autocrlf=false core.eol=lf file=CRLF_mix_LF
+Cloning into 'src'...
+Cloning into 'dst'...
+Note: checking out 'HEAD^0'.
 
-expecting success: 
-		compare_ws_file eol_lf_crlf_false_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 948 - checkout attr=-text ident aeol=lf core.autocrlf=false 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 performing another checkout.
 
-expecting success: 
-		compare_ws_file eol_lf_crlf_false_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 949 - checkout attr=-text ident aeol=lf core.autocrlf=false 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 -b with the checkout command again. Example:
 
-expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
-		test_cmp expect actual
-	
-ok 950 - ls-files --eol attr=-text ident aeol=crlf core.autocrlf=false core.eol=lf
+  git checkout -b <new-branch-name>
 
-expecting success: 
-		compare_ws_file eol_lf_crlf_false_attr_-text_ LF    crlf_false_attr__LF.txt
-	
-ok 951 - checkout attr=-text ident aeol=crlf core.autocrlf=false core.eol=lf file=LF
+HEAD is now at 35a8500 C
+[master be8f64f] D
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 D.t
+ok 7 - push to update (allowed, tracking)
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_false_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 952 - checkout attr=-text ident aeol=crlf core.autocrlf=false core.eol=lf file=CRLF
+	setup_srcdst_basic &&
+	(
+		cd dst &&
+		git reset --hard HEAD^ &&
+		test_commit D &&
+		git push --force-with-lease=master origin master 2>err &&
+		grep "forced update" err
+	) &&
+	git ls-remote dst refs/heads/master >expect &&
+	git ls-remote src refs/heads/master >actual &&
+	test_cmp expect actual
 
-expecting success: 
-		compare_ws_file eol_lf_crlf_false_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 953 - checkout attr=-text ident aeol=crlf core.autocrlf=false core.eol=lf file=CRLF_mix_LF
+Cloning into 'src'...
+Cloning into 'dst'...
+Note: checking out 'HEAD^0'.
 
-expecting success: 
-		compare_ws_file eol_lf_crlf_false_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 954 - checkout attr=-text ident aeol=crlf core.autocrlf=false 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 performing another checkout.
 
-expecting success: 
-		compare_ws_file eol_lf_crlf_false_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 955 - checkout attr=-text ident aeol=crlf core.autocrlf=false 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 -b with the checkout command again. Example:
 
-expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
-		test_cmp expect actual
-	
-ok 956 - ls-files --eol attr=text ident aeol=lf core.autocrlf=false core.eol=lf
+  git checkout -b <new-branch-name>
 
-expecting success: 
-		compare_ws_file eol_lf_crlf_false_attr_text_ LF    crlf_false_attr__LF.txt
-	
-ok 957 - checkout attr=text ident aeol=lf core.autocrlf=false core.eol=lf file=LF
+HEAD is now at 35a8500 C
+HEAD is now at d9df450 B
+[master 3e6e33e] D
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 D.t
+ + 35a8500...3e6e33e master -> master (forced update)
+ok 8 - push to update (allowed even though no-ff)
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_false_attr_text_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 958 - checkout attr=text ident aeol=lf core.autocrlf=false core.eol=lf file=CRLF
+	setup_srcdst_basic &&
+	git ls-remote src refs/heads/master >expect &&
+	(
+		cd dst &&
+		test_must_fail git push --force-with-lease=master:master^ origin :master
+	) &&
+	git ls-remote src refs/heads/master >actual &&
+	test_cmp expect actual
 
-expecting success: 
-		compare_ws_file eol_lf_crlf_false_attr_text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 959 - checkout attr=text ident aeol=lf core.autocrlf=false core.eol=lf file=CRLF_mix_LF
+Cloning into 'src'...
+Cloning into 'dst'...
+Note: checking out 'HEAD^0'.
 
-expecting success: 
-		compare_ws_file eol_lf_crlf_false_attr_text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 960 - checkout attr=text ident aeol=lf core.autocrlf=false 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 performing another checkout.
 
-expecting success: 
-		compare_ws_file eol_lf_crlf_false_attr_text_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 961 - checkout attr=text ident aeol=lf core.autocrlf=false 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 -b with the checkout command again. Example:
 
-expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
-		test_cmp expect actual
-	
-ok 962 - ls-files --eol attr=text ident aeol=crlf core.autocrlf=false core.eol=lf
+  git checkout -b <new-branch-name>
 
-expecting success: 
-		compare_ws_file eol_lf_crlf_false_attr_text_ CRLF    crlf_false_attr__LF.txt
-	
-ok 963 - checkout attr=text ident aeol=crlf core.autocrlf=false core.eol=lf file=LF
+HEAD is now at 35a8500 C
+To /build/git-2.20.1/t/trash directory.t5533-push-cas/src
+ ! [rejected]        (delete) -> master (stale info)
+error: failed to push some refs to '/build/git-2.20.1/t/trash directory.t5533-push-cas/src'
+ok 9 - push to delete (protected)
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_false_attr_text_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 964 - checkout attr=text ident aeol=crlf core.autocrlf=false core.eol=lf file=CRLF
+	setup_srcdst_basic &&
+	(
+		cd dst &&
+		git push --force --force-with-lease=master:master^ origin :master
+	) &&
+	git ls-remote src refs/heads/master >actual &&
+	test_must_be_empty actual
 
-expecting success: 
-		compare_ws_file eol_lf_crlf_false_attr_text_ CRLF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 965 - checkout attr=text ident aeol=crlf core.autocrlf=false core.eol=lf file=CRLF_mix_LF
+Cloning into 'src'...
+Cloning into 'dst'...
+Note: checking out 'HEAD^0'.
 
-expecting success: 
-		compare_ws_file eol_lf_crlf_false_attr_text_ CRLF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 966 - checkout attr=text ident aeol=crlf core.autocrlf=false 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 performing another checkout.
 
-expecting success: 
-		compare_ws_file eol_lf_crlf_false_attr_text_ CRLF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 967 - checkout attr=text ident aeol=crlf core.autocrlf=false 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 -b with the checkout command again. Example:
 
-expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
-		test_cmp expect actual
-	
-ok 968 - ls-files --eol attr=auto ident aeol=lf core.autocrlf=false core.eol=lf
+  git checkout -b <new-branch-name>
 
-expecting success: 
-		compare_ws_file eol_lf_crlf_false_attr_auto_ LF    crlf_false_attr__LF.txt
-	
-ok 969 - checkout attr=auto ident aeol=lf core.autocrlf=false core.eol=lf file=LF
+HEAD is now at 35a8500 C
+To /build/git-2.20.1/t/trash directory.t5533-push-cas/src
+ - [deleted]         master
+ok 10 - push to delete (protected, forced)
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_false_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 970 - checkout attr=auto ident aeol=lf core.autocrlf=false core.eol=lf file=CRLF
+	setup_srcdst_basic &&
+	(
+		cd dst &&
+		git push --force-with-lease=master origin :master 2>err &&
+		grep deleted err
+	) &&
+	git ls-remote src refs/heads/master >actual &&
+	test_must_be_empty actual
 
-expecting success: 
-		compare_ws_file eol_lf_crlf_false_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 971 - checkout attr=auto ident aeol=lf core.autocrlf=false core.eol=lf file=CRLF_mix_LF
+Cloning into 'src'...
+Cloning into 'dst'...
+Note: checking out 'HEAD^0'.
 
-expecting success: 
-		compare_ws_file eol_lf_crlf_false_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 972 - checkout attr=auto ident aeol=lf core.autocrlf=false 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 performing another checkout.
 
-expecting success: 
-		compare_ws_file eol_lf_crlf_false_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 973 - checkout attr=auto ident aeol=lf core.autocrlf=false 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 -b with the checkout command again. Example:
 
-expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
-		test_cmp expect actual
-	
-ok 974 - ls-files --eol attr=auto ident aeol=crlf core.autocrlf=false core.eol=lf
+  git checkout -b <new-branch-name>
 
-expecting success: 
-		compare_ws_file eol_lf_crlf_false_attr_auto_ CRLF    crlf_false_attr__LF.txt
-	
-ok 975 - checkout attr=auto ident aeol=crlf core.autocrlf=false core.eol=lf file=LF
+HEAD is now at 35a8500 C
+ - [deleted]         master
+ok 11 - push to delete (allowed)
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_false_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 976 - checkout attr=auto ident aeol=crlf core.autocrlf=false core.eol=lf file=CRLF
+	setup_srcdst_basic &&
+	(
+		cd src &&
+		git branch naster master^
+	) &&
+	git ls-remote src refs/heads/\* >expect &&
+	(
+		cd dst &&
+		test_must_fail git push --force-with-lease origin master master:naster
+	) &&
+	git ls-remote src refs/heads/\* >actual &&
+	test_cmp expect actual
 
-expecting success: 
-		compare_ws_file eol_lf_crlf_false_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 977 - checkout attr=auto ident aeol=crlf core.autocrlf=false core.eol=lf file=CRLF_mix_LF
+Cloning into 'src'...
+Cloning into 'dst'...
+Note: checking out 'HEAD^0'.
 
-expecting success: 
-		compare_ws_file eol_lf_crlf_false_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 978 - checkout attr=auto ident aeol=crlf core.autocrlf=false 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 performing another checkout.
 
-expecting success: 
-		compare_ws_file eol_lf_crlf_false_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 979 - checkout attr=auto ident aeol=crlf core.autocrlf=false 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 -b with the checkout command again. Example:
 
-expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
-		test_cmp expect actual
-	
-ok 980 - ls-files --eol attr=-text ident aeol= core.autocrlf=input core.eol=lf
+  git checkout -b <new-branch-name>
 
-expecting success: 
-		compare_ws_file eol_lf_crlf_input_attr_-text_ LF    crlf_false_attr__LF.txt
-	
-ok 981 - checkout attr=-text ident aeol= core.autocrlf=input core.eol=lf file=LF
+HEAD is now at 35a8500 C
+To /build/git-2.20.1/t/trash directory.t5533-push-cas/src
+ ! [rejected]        master -> naster (stale info)
+error: failed to push some refs to '/build/git-2.20.1/t/trash directory.t5533-push-cas/src'
+ok 12 - cover everything with default force-with-lease (protected)
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_input_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 982 - checkout attr=-text ident aeol= core.autocrlf=input core.eol=lf file=CRLF
+	setup_srcdst_basic &&
+	(
+		cd src &&
+		git branch naster master^
+	) &&
+	(
+		cd dst &&
+		git fetch &&
+		git push --force-with-lease origin master master:naster
+	) &&
+	git ls-remote dst refs/heads/master |
+	sed -e "s/master/naster/" >expect &&
+	git ls-remote src refs/heads/naster >actual &&
+	test_cmp expect actual
 
-expecting success: 
-		compare_ws_file eol_lf_crlf_input_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 983 - checkout attr=-text ident aeol= core.autocrlf=input core.eol=lf file=CRLF_mix_LF
+Cloning into 'src'...
+Cloning into 'dst'...
+Note: checking out 'HEAD^0'.
 
-expecting success: 
-		compare_ws_file eol_lf_crlf_input_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 984 - checkout attr=-text ident aeol= 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 performing another checkout.
 
-expecting success: 
-		compare_ws_file eol_lf_crlf_input_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 985 - checkout attr=-text ident aeol= 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 -b with the checkout command again. Example:
 
-expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
-		test_cmp expect actual
-	
-ok 986 - ls-files --eol attr=-text ident aeol=lf core.autocrlf=input core.eol=lf
+  git checkout -b <new-branch-name>
 
-expecting success: 
-		compare_ws_file eol_lf_crlf_input_attr_-text_ LF    crlf_false_attr__LF.txt
-	
-ok 987 - checkout attr=-text ident aeol=lf core.autocrlf=input core.eol=lf file=LF
+HEAD is now at 35a8500 C
+From /build/git-2.20.1/t/trash directory.t5533-push-cas/src
+ * [new branch]      naster     -> origin/naster
+To /build/git-2.20.1/t/trash directory.t5533-push-cas/src
+   d9df450..35a8500  master -> naster
+ok 13 - cover everything with default force-with-lease (allowed)
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_input_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 988 - checkout attr=-text ident aeol=lf core.autocrlf=input core.eol=lf file=CRLF
+	setup_srcdst_basic &&
+	(
+		cd dst &&
+		git branch branch master &&
+		git push --force-with-lease=branch origin branch
+	) &&
+	git ls-remote dst refs/heads/branch >expect &&
+	git ls-remote src refs/heads/branch >actual &&
+	test_cmp expect actual
 
-expecting success: 
-		compare_ws_file eol_lf_crlf_input_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 989 - checkout attr=-text ident aeol=lf core.autocrlf=input core.eol=lf file=CRLF_mix_LF
+Cloning into 'src'...
+Cloning into 'dst'...
+Note: checking out 'HEAD^0'.
 
-expecting success: 
-		compare_ws_file eol_lf_crlf_input_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 990 - 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 performing another checkout.
 
-expecting success: 
-		compare_ws_file eol_lf_crlf_input_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 991 - 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 -b with the checkout command again. Example:
 
-expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
-		test_cmp expect actual
-	
-ok 992 - ls-files --eol attr=-text ident aeol=crlf core.autocrlf=input core.eol=lf
+  git checkout -b <new-branch-name>
 
-expecting success: 
-		compare_ws_file eol_lf_crlf_input_attr_-text_ LF    crlf_false_attr__LF.txt
-	
-ok 993 - checkout attr=-text ident aeol=crlf core.autocrlf=input core.eol=lf file=LF
+HEAD is now at 35a8500 C
+To /build/git-2.20.1/t/trash directory.t5533-push-cas/src
+ * [new branch]      branch -> branch
+ok 14 - new branch covered by force-with-lease
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_input_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 994 - checkout attr=-text ident aeol=crlf core.autocrlf=input core.eol=lf file=CRLF
+	setup_srcdst_basic &&
+	(
+		cd dst &&
+		git branch branch master &&
+		git push --force-with-lease=branch: origin branch
+	) &&
+	git ls-remote dst refs/heads/branch >expect &&
+	git ls-remote src refs/heads/branch >actual &&
+	test_cmp expect actual
 
-expecting success: 
-		compare_ws_file eol_lf_crlf_input_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 995 - checkout attr=-text ident aeol=crlf core.autocrlf=input core.eol=lf file=CRLF_mix_LF
+Cloning into 'src'...
+Cloning into 'dst'...
+Note: checking out 'HEAD^0'.
 
-expecting success: 
-		compare_ws_file eol_lf_crlf_input_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 996 - checkout attr=-text ident aeol=crlf 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 performing another checkout.
 
-expecting success: 
-		compare_ws_file eol_lf_crlf_input_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 997 - checkout attr=-text ident aeol=crlf 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 -b with the checkout command again. Example:
 
-expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
-		test_cmp expect actual
-	
-ok 998 - ls-files --eol attr=text ident aeol=lf core.autocrlf=input core.eol=lf
+  git checkout -b <new-branch-name>
 
-expecting success: 
-		compare_ws_file eol_lf_crlf_input_attr_text_ LF    crlf_false_attr__LF.txt
-	
-ok 999 - checkout attr=text ident aeol=lf core.autocrlf=input core.eol=lf file=LF
+HEAD is now at 35a8500 C
+To /build/git-2.20.1/t/trash directory.t5533-push-cas/src
+ * [new branch]      branch -> branch
+ok 15 - new branch covered by force-with-lease (explicit)
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_input_attr_text_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 1000 - checkout attr=text ident aeol=lf core.autocrlf=input core.eol=lf file=CRLF
+	setup_srcdst_basic &&
+	(
+		cd src &&
+		git checkout -b branch master &&
+		test_commit F
+	) &&
+	(
+		cd dst &&
+		git branch branch master &&
+		test_must_fail git push --force-with-lease=branch: origin branch
+	)
 
-expecting success: 
-		compare_ws_file eol_lf_crlf_input_attr_text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 1001 - checkout attr=text ident aeol=lf core.autocrlf=input core.eol=lf file=CRLF_mix_LF
+Cloning into 'src'...
+Cloning into 'dst'...
+Note: checking out 'HEAD^0'.
 
-expecting success: 
-		compare_ws_file eol_lf_crlf_input_attr_text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 1002 - 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 performing another checkout.
 
-expecting success: 
-		compare_ws_file eol_lf_crlf_input_attr_text_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 1003 - 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 -b with the checkout command again. Example:
 
-expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
-		test_cmp expect actual
-	
-ok 1004 - ls-files --eol attr=text ident aeol=crlf core.autocrlf=input core.eol=lf
+  git checkout -b <new-branch-name>
 
-expecting success: 
-		compare_ws_file eol_lf_crlf_input_attr_text_ CRLF    crlf_false_attr__LF.txt
-	
-ok 1005 - checkout attr=text ident aeol=crlf core.autocrlf=input core.eol=lf file=LF
+HEAD is now at 35a8500 C
+Switched to a new branch 'branch'
+[branch b6ba73d] F
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 F.t
+To /build/git-2.20.1/t/trash directory.t5533-push-cas/src
+ ! [rejected]        branch -> branch (stale info)
+error: failed to push some refs to '/build/git-2.20.1/t/trash directory.t5533-push-cas/src'
+ok 16 - new branch already exists
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_input_attr_text_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 1006 - checkout attr=text ident aeol=crlf core.autocrlf=input core.eol=lf file=CRLF
+	rm -rf src dst &&
+	git init --bare src.bare &&
+	test_when_finished "rm -rf src.bare" &&
+	git clone --no-local src.bare dst &&
+	test_when_finished "rm -rf dst" &&
+	(
+		cd dst &&
+		test_commit G &&
+		git remote add origin-push ../src.bare &&
+		git push origin-push master:master
+	) &&
+	git clone --no-local src.bare dst2 &&
+	test_when_finished "rm -rf dst2" &&
+	(
+		cd dst2 &&
+		test_commit H &&
+		git push
+	) &&
+	(
+		cd dst &&
+		test_commit I &&
+		git fetch origin &&
+		test_must_fail git push --force-with-lease origin-push &&
+		git fetch origin-push &&
+		git push --force-with-lease origin-push
+	)
 
-expecting success: 
-		compare_ws_file eol_lf_crlf_input_attr_text_ CRLF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 1007 - checkout attr=text ident aeol=crlf core.autocrlf=input core.eol=lf file=CRLF_mix_LF
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5533-push-cas/src.bare/
+Cloning into 'dst'...
+warning: You appear to have cloned an empty repository.
+[master (root-commit) c0a8953] G
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 G.t
+To ../src.bare
+ * [new branch]      master -> master
+Cloning into 'dst2'...
+[master d19f4d4] H
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 H.t
+To /build/git-2.20.1/t/trash directory.t5533-push-cas/src.bare
+   c0a8953..d19f4d4  master -> master
+[master 91bb270] I
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 I.t
+From /build/git-2.20.1/t/trash directory.t5533-push-cas/src.bare
+ * [new branch]      master     -> origin/master
+To ../src.bare
+ ! [rejected]        master -> master (stale info)
+error: failed to push some refs to '../src.bare'
+From ../src.bare
+   c0a8953..d19f4d4  master     -> origin-push/master
+To ../src.bare
+ + d19f4d4...91bb270 master -> master (forced update)
+ok 17 - background updates of REMOTE can be mitigated with a non-updated REMOTE-push
 
+# passed all 17 test(s)
+1..17
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t4255-am-submodule.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4255-am-submodule/.git/
 expecting success: 
-		compare_ws_file eol_lf_crlf_input_attr_text_ CRLF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+		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 1008 - checkout attr=text ident aeol=crlf core.autocrlf=input core.eol=lf file=LF_mix_CR
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update_sub1/.git/
+[master (root-commit) 2a793c1] 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/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update_sub2/.git/
+[master (root-commit) d02b0bf] 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/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update_repo/.git/
+[master (root-commit) 9cbdc86] 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/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update_repo/sub1'...
+done.
+Cloning into '/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update_repo/uninitialized_sub'...
+done.
+[add_sub1 552163f] 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'
+Removing uninitialized_sub
+Removing sub1
+Removing .gitmodules
+[remove_sub1 dc9220a] Revert "Add sub1"
+ Author: A U Thor <author@example.com>
+ Date: Thu Jan 5 11:48:54 2023 +0000
+ 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 494eb2a] 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/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update_sub1
+ * [new branch]      modifications -> modifications
+[modify_sub1 f79e1e4] 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/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update_repo/sub1/sub2'...
+done.
+[add_nested_sub c701429] 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 25eac46] 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 fd1e224] 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 a51d01c] update nested sub
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[modify_sub1_recursively 87a7e70] update sub1, that updates nested sub
+ Author: A U Thor <author@example.com>
+To /build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update_sub1
+ * [new branch]      modify_sub1_recursively -> modify_sub1_recursively
+To /build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update_sub2
+ * [new branch]      modify_sub1_recursively -> modify_sub1_recursively
+Cleared directory 'sub2'
+Submodule 'sub2' (../submodule_update_sub2) unregistered for path 'sub2'
+Switched to a new branch 'replace_sub1_with_directory'
+Submodule path 'sub1': checked out '2a793c129c336f679fd70ee3f690305cd58b4eaa'
+Previous HEAD position was 2a793c1 Base inside first submodule
+Switched to branch 'modifications'
+rm 'sub1'
+[replace_sub1_with_directory 358dcc8] 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'
+Removing sub1/file3
+Removing sub1/file2
+Removing sub1/file1
+Adding sub1
+[replace_directory_with_sub1 1d18e75] Revert "Replace sub1 with directory"
+ Author: A U Thor <author@example.com>
+ Date: Thu Jan 5 11:48:56 2023 +0000
+ 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 7db9198] 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 c29c4aa] Revert "Replace sub1 with file"
+ Author: A U Thor <author@example.com>
+ Date: Thu Jan 5 11:48:56 2023 +0000
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+ mode change 100644 => 160000 sub1
+Switched to a new branch 'invalid_sub1'
+[invalid_sub1 88a3e1b] Invalid sub1 commit
+ Author: A U Thor <author@example.com>
+Switched to a new branch 'valid_sub1'
+[valid_sub1 69dfb80] Revert "Invalid sub1 commit"
+ Author: A U Thor <author@example.com>
+ Date: Thu Jan 5 11:48:56 2023 +0000
+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 remote branch 'no_submodule' from 'origin'.
+Branch 'add_sub1' set up to track remote branch 'add_sub1' from 'origin'.
+Applying: Add sub1
+Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '2a793c129c336f679fd70ee3f690305cd58b4eaa'
+Submodule path 'uninitialized_sub': checked out '2a793c129c336f679fd70ee3f690305cd58b4eaa'
+ok 1 - am: added submodule creates empty directory
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_input_attr_text_ CRLF_nul   crlf_false_attr__LF_nul.txt
+		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 1009 - checkout attr=text ident aeol=crlf core.autocrlf=input 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 remote branch 'no_submodule' from 'origin'.
+Branch 'add_sub1' set up to track remote branch 'add_sub1' from 'origin'.
+Applying: Add sub1
+Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '2a793c129c336f679fd70ee3f690305cd58b4eaa'
+Submodule path 'uninitialized_sub': checked out '2a793c129c336f679fd70ee3f690305cd58b4eaa'
+ok 2 - am: added submodule leaves existing empty directory alone
 
 expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
-		test_cmp expect actual
+		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 1010 - ls-files --eol attr=auto ident aeol=lf core.autocrlf=input 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 remote branch 'replace_sub1_with_file' from 'origin'.
+fatal: Needed a single revision
+Branch 'replace_file_with_sub1' set up to track remote branch 'replace_file_with_sub1' from 'origin'.
+Applying: Revert "Replace sub1 with file"
+Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '2a793c129c336f679fd70ee3f690305cd58b4eaa'
+Submodule path 'uninitialized_sub': checked out '2a793c129c336f679fd70ee3f690305cd58b4eaa'
+ok 3 - am: replace tracked file with submodule creates empty directory
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_input_attr_auto_ LF    crlf_false_attr__LF.txt
+		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 1011 - checkout attr=auto ident aeol=lf core.autocrlf=input 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 remote branch 'replace_sub1_with_directory' from 'origin'.
+fatal: Needed a single revision
+Branch 'replace_directory_with_sub1' set up to track remote branch 'replace_directory_with_sub1' from 'origin'.
+Applying: Revert "Replace sub1 with directory"
+Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '2a793c129c336f679fd70ee3f690305cd58b4eaa'
+Submodule path 'uninitialized_sub': checked out '2a793c129c336f679fd70ee3f690305cd58b4eaa'
+ok 4 - am: replace directory with submodule
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_input_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
+		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 1012 - checkout attr=auto ident aeol=lf core.autocrlf=input core.eol=lf file=CRLF
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+Branch 'add_sub1' set up to track remote branch 'add_sub1' from 'origin'.
+Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '2a793c129c336f679fd70ee3f690305cd58b4eaa'
+Branch 'remove_sub1' set up to track remote branch 'remove_sub1' from 'origin'.
+warning: unable to rmdir 'sub1': Directory not empty
+Applying: Revert "Add sub1"
+ok 5 - am: removed submodule leaves submodule directory and its contents in place
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_input_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+		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 1013 - checkout attr=auto ident aeol=lf core.autocrlf=input 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 remote branch 'add_sub1' from 'origin'.
+Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '2a793c129c336f679fd70ee3f690305cd58b4eaa'
+Branch 'remove_sub1' set up to track remote branch 'remove_sub1' from 'origin'.
+warning: unable to rmdir 'sub1': Directory not empty
+Applying: Revert "Add sub1"
+ok 6 - am: removed submodule leaves submodule containing a .git directory alone
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_input_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
+			test_must_fail $command replace_sub1_with_directory &&
+			test_superproject_content origin/add_sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
 	
-ok 1014 - checkout attr=auto ident aeol=lf core.autocrlf=input 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 remote branch 'add_sub1' from 'origin'.
+Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '2a793c129c336f679fd70ee3f690305cd58b4eaa'
+Branch 'replace_sub1_with_directory' set up to track remote branch 'replace_sub1_with_directory' from 'origin'.
+error: sub1/file1: already exists in working directory
+error: sub1/file2: already exists in working directory
+hint: Use 'git am --show-current-patch' to see the failed patch
+Applying: Replace sub1 with directory
+Patch failed at 0001 Replace sub1 with directory
+When you have resolved this problem, run "git am --continue".
+If you prefer to skip this patch, run "git am --skip" instead.
+To restore the original branch and stop patching, run "git am --abort".
+ok 7 - am: replace submodule with a directory must fail
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_input_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
+		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 &&
+			test_must_fail $command replace_sub1_with_directory &&
+			test_superproject_content origin/add_sub1 &&
+			test_git_directory_is_unchanged sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
 	
-ok 1015 - checkout attr=auto ident aeol=lf core.autocrlf=input 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 remote branch 'add_sub1' from 'origin'.
+Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '2a793c129c336f679fd70ee3f690305cd58b4eaa'
+Branch 'replace_sub1_with_directory' set up to track remote branch 'replace_sub1_with_directory' from 'origin'.
+error: sub1/file1: already exists in working directory
+error: sub1/file2: already exists in working directory
+hint: Use 'git am --show-current-patch' to see the failed patch
+Applying: Replace sub1 with directory
+Patch failed at 0001 Replace sub1 with directory
+When you have resolved this problem, run "git am --continue".
+If you prefer to skip this patch, run "git am --skip" instead.
+To restore the original branch and stop patching, run "git am --abort".
+ok 8 - am: replace submodule containing a .git directory with a directory must fail
 
-expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
-		test_cmp expect actual
+checking known breakage: 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
+			test_must_fail $command replace_sub1_with_file &&
+			test_superproject_content origin/add_sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
 	
-ok 1016 - ls-files --eol attr=auto ident aeol=crlf core.autocrlf=input core.eol=lf
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+Branch 'add_sub1' set up to track remote branch 'add_sub1' from 'origin'.
+Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '2a793c129c336f679fd70ee3f690305cd58b4eaa'
+Branch 'replace_sub1_with_file' set up to track remote branch 'replace_sub1_with_file' from 'origin'.
+warning: unable to rmdir 'sub1': Directory not empty
+error: unable to write file 'sub1' mode 100644: Directory not empty
+hint: Use 'git am --show-current-patch' to see the failed patch
+Applying: Replace sub1 with file
+Patch failed at 0001 Replace sub1 with file
+When you have resolved this problem, run "git am --continue".
+If you prefer to skip this patch, run "git am --skip" instead.
+To restore the original branch and stop patching, run "git am --abort".
+'actual' is not empty, it contains:
+:100644 100644 af3a0c56edfba1a28f50ada5ec2832a7f2f9b907 0000000000000000000000000000000000000000 M	.gitmodules
+not ok 9 - am: replace submodule with a file must fail # TODO known breakage
 
-expecting success: 
-		compare_ws_file eol_lf_crlf_input_attr_auto_ CRLF    crlf_false_attr__LF.txt
+checking known breakage: 
+		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 &&
+			test_must_fail $command replace_sub1_with_file &&
+			test_superproject_content origin/add_sub1 &&
+			test_git_directory_is_unchanged sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
 	
-ok 1017 - checkout attr=auto ident aeol=crlf core.autocrlf=input core.eol=lf file=LF
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+Branch 'add_sub1' set up to track remote branch 'add_sub1' from 'origin'.
+Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '2a793c129c336f679fd70ee3f690305cd58b4eaa'
+Branch 'replace_sub1_with_file' set up to track remote branch 'replace_sub1_with_file' from 'origin'.
+warning: unable to rmdir 'sub1': Directory not empty
+error: unable to write file 'sub1' mode 100644: Directory not empty
+hint: Use 'git am --show-current-patch' to see the failed patch
+Applying: Replace sub1 with file
+Patch failed at 0001 Replace sub1 with file
+When you have resolved this problem, run "git am --continue".
+If you prefer to skip this patch, run "git am --skip" instead.
+To restore the original branch and stop patching, run "git am --abort".
+'actual' is not empty, it contains:
+:100644 100644 af3a0c56edfba1a28f50ada5ec2832a7f2f9b907 0000000000000000000000000000000000000000 M	.gitmodules
+not ok 10 - am: replace submodule containing a .git directory with a file must fail # TODO known breakage
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_input_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
+		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 1018 - checkout attr=auto ident aeol=crlf core.autocrlf=input core.eol=lf file=CRLF
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+Branch 'add_sub1' set up to track remote branch 'add_sub1' from 'origin'.
+Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '2a793c129c336f679fd70ee3f690305cd58b4eaa'
+Branch 'modify_sub1' set up to track remote branch 'modify_sub1' from 'origin'.
+warning: unable to rmdir 'sub1': Directory not empty
+Applying: Modify sub1
+Submodule path 'sub1': checked out '494eb2a8d8ee6f634e1b7f2249668b241961c12c'
+ok 11 - am: modified submodule does not update submodule work tree
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_input_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+		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 1019 - checkout attr=auto ident aeol=crlf core.autocrlf=input 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 remote branch 'add_sub1' from 'origin'.
+Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '2a793c129c336f679fd70ee3f690305cd58b4eaa'
+Branch 'invalid_sub1' set up to track remote branch 'invalid_sub1' from 'origin'.
+warning: unable to rmdir 'sub1': Directory not empty
+Applying: Invalid sub1 commit
+error: Server does not allow request for unadvertised object 0123456789012345678901234567890123456789
+Fetched in submodule path 'sub1', but it did not contain 0123456789012345678901234567890123456789. Direct fetching of that commit failed.
+ok 12 - am: modified submodule does not update submodule work tree to invalid commit
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_input_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+		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 1020 - checkout attr=auto ident aeol=crlf core.autocrlf=input core.eol=lf file=LF_mix_CR
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'invalid_sub1'
+Branch 'invalid_sub1' set up to track remote branch 'invalid_sub1' from 'origin'.
+fatal: Needed a single revision
+Branch 'valid_sub1' set up to track remote branch 'valid_sub1' from 'origin'.
+Applying: Revert "Invalid sub1 commit"
+Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '2a793c129c336f679fd70ee3f690305cd58b4eaa'
+Submodule path 'uninitialized_sub': checked out '2a793c129c336f679fd70ee3f690305cd58b4eaa'
+ok 13 - am: modified submodule does not update submodule work tree from invalid commit
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_input_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
+		prolog &&
+		reset_work_tree_to 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 1021 - checkout attr=auto ident aeol=crlf core.autocrlf=input 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 remote branch 'no_submodule' from 'origin'.
+Branch 'add_sub1' set up to track remote branch 'add_sub1' from 'origin'.
+error: sub1: already exists in working directory
+hint: Use 'git am --show-current-patch' to see the failed patch
+Applying: Add sub1
+Patch failed at 0001 Add sub1
+When you have resolved this problem, run "git am --continue".
+If you prefer to skip this patch, run "git am --skip" instead.
+To restore the original branch and stop patching, run "git am --abort".
+ok 14 - am: added submodule doesn't remove untracked unignored file with same name
 
 expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
-		test_cmp expect actual
-	
-ok 1022 - ls-files --eol attr= ident aeol= core.autocrlf=false core.eol=lf
-
-expecting success: 
-		compare_ws_file eol_lf_crlf_false_attr__ LF    crlf_false_attr__LF.txt
-	
-ok 1023 - checkout attr= ident aeol= core.autocrlf=false core.eol=lf file=LF
-
-expecting success: 
-		compare_ws_file eol_lf_crlf_false_attr__ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 1024 - checkout attr= ident aeol= core.autocrlf=false core.eol=lf file=CRLF
-
-expecting success: 
-		compare_ws_file eol_lf_crlf_false_attr__ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 1025 - checkout attr= ident aeol= core.autocrlf=false core.eol=lf file=CRLF_mix_LF
-
-expecting success: 
-		compare_ws_file eol_lf_crlf_false_attr__ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 1026 - checkout attr= ident aeol= core.autocrlf=false core.eol=lf file=LF_mix_CR
-
-expecting success: 
-		compare_ws_file eol_lf_crlf_false_attr__ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 1027 - checkout attr= ident aeol= core.autocrlf=false core.eol=lf file=LF_nul
-
-expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
-		test_cmp expect actual
-	
-ok 1028 - ls-files --eol attr= ident aeol= core.autocrlf=true core.eol=lf
-
-expecting success: 
-		compare_ws_file eol_lf_crlf_true_attr__ CRLF    crlf_false_attr__LF.txt
-	
-ok 1029 - checkout attr= ident aeol= core.autocrlf=true core.eol=lf file=LF
-
-expecting success: 
-		compare_ws_file eol_lf_crlf_true_attr__ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 1030 - checkout attr= ident aeol= core.autocrlf=true core.eol=lf file=CRLF
-
-expecting success: 
-		compare_ws_file eol_lf_crlf_true_attr__ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 1031 - checkout attr= ident aeol= core.autocrlf=true core.eol=lf file=CRLF_mix_LF
-
-expecting success: 
-		compare_ws_file eol_lf_crlf_true_attr__ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 1032 - checkout attr= ident aeol= core.autocrlf=true core.eol=lf file=LF_mix_CR
-
-expecting success: 
-		compare_ws_file eol_lf_crlf_true_attr__ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 1033 - checkout attr= ident aeol= core.autocrlf=true core.eol=lf file=LF_nul
-
-expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
-		test_cmp expect actual
-	
-ok 1034 - ls-files --eol attr=auto ident aeol= core.autocrlf=true core.eol=lf
-
-expecting success: 
-		compare_ws_file eol_lf_crlf_true_attr_auto_ CRLF    crlf_false_attr__LF.txt
-	
-ok 1035 - checkout attr=auto ident aeol= core.autocrlf=true core.eol=lf file=LF
-
-expecting success: 
-		compare_ws_file eol_lf_crlf_true_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 1036 - checkout attr=auto ident aeol= core.autocrlf=true core.eol=lf file=CRLF
-
-expecting success: 
-		compare_ws_file eol_lf_crlf_true_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 1037 - checkout attr=auto ident aeol= core.autocrlf=true core.eol=lf file=CRLF_mix_LF
-
-expecting success: 
-		compare_ws_file eol_lf_crlf_true_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 1038 - checkout attr=auto ident aeol= core.autocrlf=true core.eol=lf file=LF_mix_CR
-
-expecting success: 
-		compare_ws_file eol_lf_crlf_true_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 1039 - checkout attr=auto ident aeol= core.autocrlf=true core.eol=lf file=LF_nul
-
-expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
-		test_cmp expect actual
-	
-ok 1040 - ls-files --eol attr=text ident aeol= core.autocrlf=true core.eol=lf
-
-expecting success: 
-		compare_ws_file eol_lf_crlf_true_attr_text_ CRLF    crlf_false_attr__LF.txt
-	
-ok 1041 - checkout attr=text ident aeol= core.autocrlf=true core.eol=lf file=LF
-
-expecting success: 
-		compare_ws_file eol_lf_crlf_true_attr_text_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 1042 - checkout attr=text ident aeol= core.autocrlf=true core.eol=lf file=CRLF
-
-expecting success: 
-		compare_ws_file eol_lf_crlf_true_attr_text_ CRLF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 1043 - checkout attr=text ident aeol= core.autocrlf=true core.eol=lf file=CRLF_mix_LF
-
-expecting success: 
-		compare_ws_file eol_lf_crlf_true_attr_text_ CRLF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 1044 - checkout attr=text ident aeol= core.autocrlf=true core.eol=lf file=LF_mix_CR
-
-expecting success: 
-		compare_ws_file eol_lf_crlf_true_attr_text_ CRLF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 1045 - checkout attr=text ident aeol= core.autocrlf=true core.eol=lf file=LF_nul
-
-expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
-		test_cmp expect actual
-	
-ok 1046 - ls-files --eol attr=text ident aeol= core.autocrlf=input core.eol=lf
-
-expecting success: 
-		compare_ws_file eol_lf_crlf_input_attr_text_ LF    crlf_false_attr__LF.txt
-	
-ok 1047 - checkout attr=text ident aeol= core.autocrlf=input core.eol=lf file=LF
-
-expecting success: 
-		compare_ws_file eol_lf_crlf_input_attr_text_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 1048 - checkout attr=text ident aeol= core.autocrlf=input core.eol=lf file=CRLF
-
-expecting success: 
-		compare_ws_file eol_lf_crlf_input_attr_text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 1049 - checkout attr=text ident aeol= core.autocrlf=input core.eol=lf file=CRLF_mix_LF
-
-expecting success: 
-		compare_ws_file eol_lf_crlf_input_attr_text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 1050 - checkout attr=text ident aeol= core.autocrlf=input core.eol=lf file=LF_mix_CR
-
-expecting success: 
-		compare_ws_file eol_lf_crlf_input_attr_text_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 1051 - checkout attr=text ident aeol= core.autocrlf=input core.eol=lf file=LF_nul
-
-expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
-		test_cmp expect actual
-	
-ok 1052 - ls-files --eol attr=auto ident aeol= core.autocrlf=input core.eol=lf
-
-expecting success: 
-		compare_ws_file eol_lf_crlf_input_attr_auto_ LF    crlf_false_attr__LF.txt
-	
-ok 1053 - checkout attr=auto ident aeol= core.autocrlf=input core.eol=lf file=LF
-
-expecting success: 
-		compare_ws_file eol_lf_crlf_input_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 1054 - checkout attr=auto ident aeol= core.autocrlf=input core.eol=lf file=CRLF
-
-expecting success: 
-		compare_ws_file eol_lf_crlf_input_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 1055 - checkout attr=auto ident aeol= core.autocrlf=input core.eol=lf file=CRLF_mix_LF
-
-expecting success: 
-		compare_ws_file eol_lf_crlf_input_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 1056 - checkout attr=auto ident aeol= core.autocrlf=input core.eol=lf file=LF_mix_CR
-
-expecting success: 
-		compare_ws_file eol_lf_crlf_input_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 1057 - checkout attr=auto ident aeol= core.autocrlf=input core.eol=lf file=LF_nul
-
-expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
-		test_cmp expect actual
-	
-ok 1058 - ls-files --eol attr=-text ident aeol= core.autocrlf=true core.eol=crlf
-
-expecting success: 
-		compare_ws_file eol_crlf_crlf_true_attr_-text_ LF    crlf_false_attr__LF.txt
-	
-ok 1059 - checkout attr=-text ident aeol= core.autocrlf=true core.eol=crlf file=LF
-
-expecting success: 
-		compare_ws_file eol_crlf_crlf_true_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 1060 - checkout attr=-text ident aeol= core.autocrlf=true core.eol=crlf file=CRLF
-
-expecting success: 
-		compare_ws_file eol_crlf_crlf_true_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 1061 - checkout attr=-text ident aeol= core.autocrlf=true core.eol=crlf file=CRLF_mix_LF
-
-expecting success: 
-		compare_ws_file eol_crlf_crlf_true_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 1062 - checkout attr=-text ident aeol= core.autocrlf=true core.eol=crlf file=LF_mix_CR
-
-expecting success: 
-		compare_ws_file eol_crlf_crlf_true_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 1063 - checkout attr=-text ident aeol= core.autocrlf=true core.eol=crlf file=LF_nul
-
-expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
-		test_cmp expect actual
-	
-ok 1064 - ls-files --eol attr=-text ident aeol=lf core.autocrlf=true core.eol=crlf
-
-expecting success: 
-		compare_ws_file eol_crlf_crlf_true_attr_-text_ LF    crlf_false_attr__LF.txt
-	
-ok 1065 - checkout attr=-text ident aeol=lf core.autocrlf=true core.eol=crlf file=LF
-
-expecting success: 
-		compare_ws_file eol_crlf_crlf_true_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 1066 - checkout attr=-text ident aeol=lf core.autocrlf=true core.eol=crlf file=CRLF
-
-expecting success: 
-		compare_ws_file eol_crlf_crlf_true_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 1067 - checkout attr=-text ident aeol=lf core.autocrlf=true core.eol=crlf file=CRLF_mix_LF
-
-expecting success: 
-		compare_ws_file eol_crlf_crlf_true_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 1068 - checkout attr=-text ident aeol=lf core.autocrlf=true core.eol=crlf file=LF_mix_CR
-
-expecting success: 
-		compare_ws_file eol_crlf_crlf_true_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 1069 - checkout attr=-text ident aeol=lf core.autocrlf=true core.eol=crlf file=LF_nul
-
-expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
-		test_cmp expect actual
-	
-ok 1070 - ls-files --eol attr=-text ident aeol=crlf core.autocrlf=true core.eol=crlf
-
-expecting success: 
-		compare_ws_file eol_crlf_crlf_true_attr_-text_ LF    crlf_false_attr__LF.txt
-	
-ok 1071 - checkout attr=-text ident aeol=crlf core.autocrlf=true core.eol=crlf file=LF
-
-expecting success: 
-		compare_ws_file eol_crlf_crlf_true_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 1072 - checkout attr=-text ident aeol=crlf core.autocrlf=true core.eol=crlf file=CRLF
-
-expecting success: 
-		compare_ws_file eol_crlf_crlf_true_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 1073 - checkout attr=-text ident aeol=crlf core.autocrlf=true core.eol=crlf file=CRLF_mix_LF
-
-expecting success: 
-		compare_ws_file eol_crlf_crlf_true_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 1074 - checkout attr=-text ident aeol=crlf core.autocrlf=true core.eol=crlf file=LF_mix_CR
-
-expecting success: 
-		compare_ws_file eol_crlf_crlf_true_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 1075 - checkout attr=-text ident aeol=crlf core.autocrlf=true core.eol=crlf file=LF_nul
-
-expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
-		test_cmp expect actual
-	
-ok 1076 - ls-files --eol attr=text ident aeol=lf core.autocrlf=true core.eol=crlf
-
-expecting success: 
-		compare_ws_file eol_crlf_crlf_true_attr_text_ LF    crlf_false_attr__LF.txt
-	
-ok 1077 - checkout attr=text ident aeol=lf core.autocrlf=true core.eol=crlf file=LF
-
-expecting success: 
-		compare_ws_file eol_crlf_crlf_true_attr_text_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 1078 - checkout attr=text ident aeol=lf core.autocrlf=true core.eol=crlf file=CRLF
-
-expecting success: 
-		compare_ws_file eol_crlf_crlf_true_attr_text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 1079 - checkout attr=text ident aeol=lf core.autocrlf=true core.eol=crlf file=CRLF_mix_LF
-
-expecting success: 
-		compare_ws_file eol_crlf_crlf_true_attr_text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 1080 - checkout attr=text ident aeol=lf core.autocrlf=true core.eol=crlf file=LF_mix_CR
-
-expecting success: 
-		compare_ws_file eol_crlf_crlf_true_attr_text_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 1081 - checkout attr=text ident aeol=lf core.autocrlf=true core.eol=crlf file=LF_nul
-
-expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
-		test_cmp expect actual
-	
-ok 1082 - ls-files --eol attr=text ident aeol=crlf core.autocrlf=true core.eol=crlf
-
-expecting success: 
-		compare_ws_file eol_crlf_crlf_true_attr_text_ CRLF    crlf_false_attr__LF.txt
-	
-ok 1083 - checkout attr=text ident aeol=crlf core.autocrlf=true core.eol=crlf file=LF
-
-expecting success: 
-		compare_ws_file eol_crlf_crlf_true_attr_text_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 1084 - checkout attr=text ident aeol=crlf core.autocrlf=true core.eol=crlf file=CRLF
-
-expecting success: 
-		compare_ws_file eol_crlf_crlf_true_attr_text_ CRLF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 1085 - checkout attr=text ident aeol=crlf core.autocrlf=true core.eol=crlf file=CRLF_mix_LF
-
-expecting success: 
-		compare_ws_file eol_crlf_crlf_true_attr_text_ CRLF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 1086 - checkout attr=text ident aeol=crlf core.autocrlf=true core.eol=crlf file=LF_mix_CR
-
-expecting success: 
-		compare_ws_file eol_crlf_crlf_true_attr_text_ CRLF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 1087 - checkout attr=text ident aeol=crlf core.autocrlf=true core.eol=crlf file=LF_nul
-
-expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
-		test_cmp expect actual
-	
-ok 1088 - ls-files --eol attr=auto ident aeol=lf core.autocrlf=true core.eol=crlf
-
-expecting success: 
-		compare_ws_file eol_crlf_crlf_true_attr_auto_ LF    crlf_false_attr__LF.txt
-	
-ok 1089 - checkout attr=auto ident aeol=lf core.autocrlf=true core.eol=crlf file=LF
-
-expecting success: 
-		compare_ws_file eol_crlf_crlf_true_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 1090 - checkout attr=auto ident aeol=lf core.autocrlf=true core.eol=crlf file=CRLF
-
-expecting success: 
-		compare_ws_file eol_crlf_crlf_true_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 1091 - checkout attr=auto ident aeol=lf core.autocrlf=true core.eol=crlf file=CRLF_mix_LF
-
-expecting success: 
-		compare_ws_file eol_crlf_crlf_true_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 1092 - checkout attr=auto ident aeol=lf core.autocrlf=true core.eol=crlf file=LF_mix_CR
-
-expecting success: 
-		compare_ws_file eol_crlf_crlf_true_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 1093 - checkout attr=auto ident aeol=lf core.autocrlf=true core.eol=crlf file=LF_nul
-
-expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
-		test_cmp expect actual
-	
-ok 1094 - ls-files --eol attr=auto ident aeol=crlf core.autocrlf=true core.eol=crlf
-
-expecting success: 
-		compare_ws_file eol_crlf_crlf_true_attr_auto_ CRLF    crlf_false_attr__LF.txt
-	
-ok 1095 - checkout attr=auto ident aeol=crlf core.autocrlf=true core.eol=crlf file=LF
-
-expecting success: 
-		compare_ws_file eol_crlf_crlf_true_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 1096 - checkout attr=auto ident aeol=crlf core.autocrlf=true core.eol=crlf file=CRLF
-
-expecting success: 
-		compare_ws_file eol_crlf_crlf_true_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 1097 - checkout attr=auto ident aeol=crlf core.autocrlf=true core.eol=crlf file=CRLF_mix_LF
-
-expecting success: 
-		compare_ws_file eol_crlf_crlf_true_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 1098 - checkout attr=auto ident aeol=crlf core.autocrlf=true core.eol=crlf file=LF_mix_CR
-
-expecting success: 
-		compare_ws_file eol_crlf_crlf_true_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 1099 - checkout attr=auto ident aeol=crlf core.autocrlf=true core.eol=crlf file=LF_nul
-
-expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
-		test_cmp expect actual
-	
-ok 1100 - ls-files --eol attr=-text ident aeol= core.autocrlf=false core.eol=crlf
-
-expecting success: 
-		compare_ws_file eol_crlf_crlf_false_attr_-text_ LF    crlf_false_attr__LF.txt
-	
-ok 1101 - checkout attr=-text ident aeol= core.autocrlf=false core.eol=crlf file=LF
-
-expecting success: 
-		compare_ws_file eol_crlf_crlf_false_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 1102 - checkout attr=-text ident aeol= core.autocrlf=false core.eol=crlf file=CRLF
-
-expecting success: 
-		compare_ws_file eol_crlf_crlf_false_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 1103 - checkout attr=-text ident aeol= core.autocrlf=false core.eol=crlf file=CRLF_mix_LF
-
-expecting success: 
-		compare_ws_file eol_crlf_crlf_false_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 1104 - checkout attr=-text ident aeol= core.autocrlf=false core.eol=crlf file=LF_mix_CR
-
-expecting success: 
-		compare_ws_file eol_crlf_crlf_false_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 1105 - checkout attr=-text ident aeol= core.autocrlf=false core.eol=crlf file=LF_nul
-
-expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
-		test_cmp expect actual
-	
-ok 1106 - ls-files --eol attr=-text ident aeol=lf core.autocrlf=false core.eol=crlf
-
-expecting success: 
-		compare_ws_file eol_crlf_crlf_false_attr_-text_ LF    crlf_false_attr__LF.txt
-	
-ok 1107 - checkout attr=-text ident aeol=lf core.autocrlf=false core.eol=crlf file=LF
-
-expecting success: 
-		compare_ws_file eol_crlf_crlf_false_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 1108 - checkout attr=-text ident aeol=lf core.autocrlf=false core.eol=crlf file=CRLF
-
-expecting success: 
-		compare_ws_file eol_crlf_crlf_false_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 1109 - checkout attr=-text ident aeol=lf core.autocrlf=false core.eol=crlf file=CRLF_mix_LF
-
-expecting success: 
-		compare_ws_file eol_crlf_crlf_false_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 1110 - checkout attr=-text ident aeol=lf core.autocrlf=false core.eol=crlf file=LF_mix_CR
-
-expecting success: 
-		compare_ws_file eol_crlf_crlf_false_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 1111 - checkout attr=-text ident aeol=lf core.autocrlf=false core.eol=crlf file=LF_nul
-
-expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
-		test_cmp expect actual
-	
-ok 1112 - ls-files --eol attr=-text ident aeol=crlf core.autocrlf=false core.eol=crlf
-
-expecting success: 
-		compare_ws_file eol_crlf_crlf_false_attr_-text_ LF    crlf_false_attr__LF.txt
-	
-ok 1113 - checkout attr=-text ident aeol=crlf core.autocrlf=false core.eol=crlf file=LF
-
-expecting success: 
-		compare_ws_file eol_crlf_crlf_false_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 1114 - checkout attr=-text ident aeol=crlf core.autocrlf=false core.eol=crlf file=CRLF
-
-expecting success: 
-		compare_ws_file eol_crlf_crlf_false_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 1115 - checkout attr=-text ident aeol=crlf core.autocrlf=false core.eol=crlf file=CRLF_mix_LF
-
-expecting success: 
-		compare_ws_file eol_crlf_crlf_false_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 1116 - checkout attr=-text ident aeol=crlf core.autocrlf=false core.eol=crlf file=LF_mix_CR
-
-expecting success: 
-		compare_ws_file eol_crlf_crlf_false_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 1117 - checkout attr=-text ident aeol=crlf core.autocrlf=false core.eol=crlf file=LF_nul
-
-expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
-		test_cmp expect actual
-	
-ok 1118 - ls-files --eol attr=text ident aeol=lf core.autocrlf=false core.eol=crlf
-
-expecting success: 
-		compare_ws_file eol_crlf_crlf_false_attr_text_ LF    crlf_false_attr__LF.txt
-	
-ok 1119 - checkout attr=text ident aeol=lf core.autocrlf=false core.eol=crlf file=LF
-
-expecting success: 
-		compare_ws_file eol_crlf_crlf_false_attr_text_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 1120 - checkout attr=text ident aeol=lf core.autocrlf=false core.eol=crlf file=CRLF
-
-expecting success: 
-		compare_ws_file eol_crlf_crlf_false_attr_text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 1121 - checkout attr=text ident aeol=lf core.autocrlf=false core.eol=crlf file=CRLF_mix_LF
-
-expecting success: 
-		compare_ws_file eol_crlf_crlf_false_attr_text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 1122 - checkout attr=text ident aeol=lf core.autocrlf=false core.eol=crlf file=LF_mix_CR
-
-expecting success: 
-		compare_ws_file eol_crlf_crlf_false_attr_text_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 1123 - checkout attr=text ident aeol=lf core.autocrlf=false core.eol=crlf file=LF_nul
-
-expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
-		test_cmp expect actual
-	
-ok 1124 - ls-files --eol attr=text ident aeol=crlf core.autocrlf=false core.eol=crlf
-
-expecting success: 
-		compare_ws_file eol_crlf_crlf_false_attr_text_ CRLF    crlf_false_attr__LF.txt
-	
-ok 1125 - checkout attr=text ident aeol=crlf core.autocrlf=false core.eol=crlf file=LF
-
-expecting success: 
-		compare_ws_file eol_crlf_crlf_false_attr_text_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 1126 - checkout attr=text ident aeol=crlf core.autocrlf=false core.eol=crlf file=CRLF
-
-expecting success: 
-		compare_ws_file eol_crlf_crlf_false_attr_text_ CRLF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 1127 - checkout attr=text ident aeol=crlf core.autocrlf=false core.eol=crlf file=CRLF_mix_LF
-
-expecting success: 
-		compare_ws_file eol_crlf_crlf_false_attr_text_ CRLF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 1128 - checkout attr=text ident aeol=crlf core.autocrlf=false core.eol=crlf file=LF_mix_CR
-
-expecting success: 
-		compare_ws_file eol_crlf_crlf_false_attr_text_ CRLF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 1129 - checkout attr=text ident aeol=crlf core.autocrlf=false core.eol=crlf file=LF_nul
-
-expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
-		test_cmp expect actual
-	
-ok 1130 - ls-files --eol attr=auto ident aeol=lf core.autocrlf=false core.eol=crlf
-
-expecting success: 
-		compare_ws_file eol_crlf_crlf_false_attr_auto_ LF    crlf_false_attr__LF.txt
-	
-ok 1131 - checkout attr=auto ident aeol=lf core.autocrlf=false core.eol=crlf file=LF
-
-expecting success: 
-		compare_ws_file eol_crlf_crlf_false_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 1132 - checkout attr=auto ident aeol=lf core.autocrlf=false core.eol=crlf file=CRLF
-
-expecting success: 
-		compare_ws_file eol_crlf_crlf_false_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 1133 - checkout attr=auto ident aeol=lf core.autocrlf=false core.eol=crlf file=CRLF_mix_LF
-
-expecting success: 
-		compare_ws_file eol_crlf_crlf_false_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 1134 - checkout attr=auto ident aeol=lf core.autocrlf=false core.eol=crlf file=LF_mix_CR
-
-expecting success: 
-		compare_ws_file eol_crlf_crlf_false_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 1135 - checkout attr=auto ident aeol=lf core.autocrlf=false core.eol=crlf file=LF_nul
-
-expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
-		test_cmp expect actual
-	
-ok 1136 - ls-files --eol attr=auto ident aeol=crlf core.autocrlf=false core.eol=crlf
-
-expecting success: 
-		compare_ws_file eol_crlf_crlf_false_attr_auto_ CRLF    crlf_false_attr__LF.txt
-	
-ok 1137 - checkout attr=auto ident aeol=crlf core.autocrlf=false core.eol=crlf file=LF
-
-expecting success: 
-		compare_ws_file eol_crlf_crlf_false_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 1138 - checkout attr=auto ident aeol=crlf core.autocrlf=false core.eol=crlf file=CRLF
-
-expecting success: 
-		compare_ws_file eol_crlf_crlf_false_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 1139 - checkout attr=auto ident aeol=crlf core.autocrlf=false core.eol=crlf file=CRLF_mix_LF
-
-expecting success: 
-		compare_ws_file eol_crlf_crlf_false_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 1140 - checkout attr=auto ident aeol=crlf core.autocrlf=false core.eol=crlf file=LF_mix_CR
-
-expecting success: 
-		compare_ws_file eol_crlf_crlf_false_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 1141 - checkout attr=auto ident aeol=crlf core.autocrlf=false core.eol=crlf file=LF_nul
-
-expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
-		test_cmp expect actual
-	
-ok 1142 - ls-files --eol attr=-text ident aeol= core.autocrlf=input core.eol=crlf
-
-expecting success: 
-		compare_ws_file eol_crlf_crlf_input_attr_-text_ LF    crlf_false_attr__LF.txt
-	
-ok 1143 - checkout attr=-text ident aeol= core.autocrlf=input core.eol=crlf file=LF
-
-expecting success: 
-		compare_ws_file eol_crlf_crlf_input_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 1144 - checkout attr=-text ident aeol= core.autocrlf=input core.eol=crlf file=CRLF
-
-expecting success: 
-		compare_ws_file eol_crlf_crlf_input_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 1145 - checkout attr=-text ident aeol= core.autocrlf=input core.eol=crlf file=CRLF_mix_LF
-
-expecting success: 
-		compare_ws_file eol_crlf_crlf_input_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 1146 - checkout attr=-text ident aeol= core.autocrlf=input core.eol=crlf file=LF_mix_CR
-
-expecting success: 
-		compare_ws_file eol_crlf_crlf_input_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 1147 - checkout attr=-text ident aeol= core.autocrlf=input core.eol=crlf file=LF_nul
-
-expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
-		test_cmp expect actual
-	
-ok 1148 - ls-files --eol attr=-text ident aeol=lf core.autocrlf=input core.eol=crlf
-
-expecting success: 
-		compare_ws_file eol_crlf_crlf_input_attr_-text_ LF    crlf_false_attr__LF.txt
-	
-ok 1149 - checkout attr=-text ident aeol=lf core.autocrlf=input core.eol=crlf file=LF
-
-expecting success: 
-		compare_ws_file eol_crlf_crlf_input_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 1150 - checkout attr=-text ident aeol=lf core.autocrlf=input core.eol=crlf file=CRLF
-
-expecting success: 
-		compare_ws_file eol_crlf_crlf_input_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 1151 - checkout attr=-text ident aeol=lf core.autocrlf=input core.eol=crlf file=CRLF_mix_LF
-
-expecting success: 
-		compare_ws_file eol_crlf_crlf_input_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 1152 - checkout attr=-text ident aeol=lf core.autocrlf=input core.eol=crlf file=LF_mix_CR
-
-expecting success: 
-		compare_ws_file eol_crlf_crlf_input_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 1153 - checkout attr=-text ident aeol=lf core.autocrlf=input core.eol=crlf file=LF_nul
-
-expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
-		test_cmp expect actual
-	
-ok 1154 - ls-files --eol attr=-text ident aeol=crlf core.autocrlf=input core.eol=crlf
-
-expecting success: 
-		compare_ws_file eol_crlf_crlf_input_attr_-text_ LF    crlf_false_attr__LF.txt
-	
-ok 1155 - checkout attr=-text ident aeol=crlf core.autocrlf=input core.eol=crlf file=LF
-
-expecting success: 
-		compare_ws_file eol_crlf_crlf_input_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 1156 - checkout attr=-text ident aeol=crlf core.autocrlf=input core.eol=crlf file=CRLF
-
-expecting success: 
-		compare_ws_file eol_crlf_crlf_input_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 1157 - checkout attr=-text ident aeol=crlf core.autocrlf=input core.eol=crlf file=CRLF_mix_LF
-
-expecting success: 
-		compare_ws_file eol_crlf_crlf_input_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 1158 - checkout attr=-text ident aeol=crlf core.autocrlf=input core.eol=crlf file=LF_mix_CR
-
-expecting success: 
-		compare_ws_file eol_crlf_crlf_input_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 1159 - checkout attr=-text ident aeol=crlf core.autocrlf=input core.eol=crlf file=LF_nul
-
-expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
-		test_cmp expect actual
-	
-ok 1160 - ls-files --eol attr=text ident aeol=lf core.autocrlf=input core.eol=crlf
-
-expecting success: 
-		compare_ws_file eol_crlf_crlf_input_attr_text_ LF    crlf_false_attr__LF.txt
-	
-ok 1161 - checkout attr=text ident aeol=lf core.autocrlf=input core.eol=crlf file=LF
-
-expecting success: 
-		compare_ws_file eol_crlf_crlf_input_attr_text_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 1162 - checkout attr=text ident aeol=lf core.autocrlf=input core.eol=crlf file=CRLF
-
-expecting success: 
-		compare_ws_file eol_crlf_crlf_input_attr_text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 1163 - checkout attr=text ident aeol=lf core.autocrlf=input core.eol=crlf file=CRLF_mix_LF
-
-expecting success: 
-		compare_ws_file eol_crlf_crlf_input_attr_text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 1164 - checkout attr=text ident aeol=lf core.autocrlf=input core.eol=crlf file=LF_mix_CR
-
-expecting success: 
-		compare_ws_file eol_crlf_crlf_input_attr_text_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 1165 - checkout attr=text ident aeol=lf core.autocrlf=input core.eol=crlf file=LF_nul
-
-expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
-		test_cmp expect actual
-	
-ok 1166 - ls-files --eol attr=text ident aeol=crlf core.autocrlf=input core.eol=crlf
-
-expecting success: 
-		compare_ws_file eol_crlf_crlf_input_attr_text_ CRLF    crlf_false_attr__LF.txt
-	
-ok 1167 - checkout attr=text ident aeol=crlf core.autocrlf=input core.eol=crlf file=LF
-
-expecting success: 
-		compare_ws_file eol_crlf_crlf_input_attr_text_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 1168 - checkout attr=text ident aeol=crlf core.autocrlf=input core.eol=crlf file=CRLF
-
-expecting success: 
-		compare_ws_file eol_crlf_crlf_input_attr_text_ CRLF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 1169 - checkout attr=text ident aeol=crlf core.autocrlf=input core.eol=crlf file=CRLF_mix_LF
-
-expecting success: 
-		compare_ws_file eol_crlf_crlf_input_attr_text_ CRLF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 1170 - checkout attr=text ident aeol=crlf core.autocrlf=input core.eol=crlf file=LF_mix_CR
-
-expecting success: 
-		compare_ws_file eol_crlf_crlf_input_attr_text_ CRLF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 1171 - checkout attr=text ident aeol=crlf core.autocrlf=input core.eol=crlf file=LF_nul
-
-expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
-		test_cmp expect actual
-	
-ok 1172 - ls-files --eol attr=auto ident aeol=lf core.autocrlf=input core.eol=crlf
-
-expecting success: 
-		compare_ws_file eol_crlf_crlf_input_attr_auto_ LF    crlf_false_attr__LF.txt
-	
-ok 1173 - checkout attr=auto ident aeol=lf core.autocrlf=input core.eol=crlf file=LF
-
-expecting success: 
-		compare_ws_file eol_crlf_crlf_input_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 1174 - checkout attr=auto ident aeol=lf core.autocrlf=input core.eol=crlf file=CRLF
-
-expecting success: 
-		compare_ws_file eol_crlf_crlf_input_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 1175 - checkout attr=auto ident aeol=lf core.autocrlf=input core.eol=crlf file=CRLF_mix_LF
-
-expecting success: 
-		compare_ws_file eol_crlf_crlf_input_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 1176 - checkout attr=auto ident aeol=lf core.autocrlf=input core.eol=crlf file=LF_mix_CR
-
-expecting success: 
-		compare_ws_file eol_crlf_crlf_input_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 1177 - checkout attr=auto ident aeol=lf core.autocrlf=input core.eol=crlf file=LF_nul
-
-expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
-		test_cmp expect actual
-	
-ok 1178 - ls-files --eol attr=auto ident aeol=crlf core.autocrlf=input core.eol=crlf
-
-expecting success: 
-		compare_ws_file eol_crlf_crlf_input_attr_auto_ CRLF    crlf_false_attr__LF.txt
-	
-ok 1179 - checkout attr=auto ident aeol=crlf core.autocrlf=input core.eol=crlf file=LF
-
-expecting success: 
-		compare_ws_file eol_crlf_crlf_input_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 1180 - checkout attr=auto ident aeol=crlf core.autocrlf=input core.eol=crlf file=CRLF
-
-expecting success: 
-		compare_ws_file eol_crlf_crlf_input_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 1181 - checkout attr=auto ident aeol=crlf core.autocrlf=input core.eol=crlf file=CRLF_mix_LF
-
-expecting success: 
-		compare_ws_file eol_crlf_crlf_input_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 1182 - checkout attr=auto ident aeol=crlf core.autocrlf=input core.eol=crlf file=LF_mix_CR
-
-expecting success: 
-		compare_ws_file eol_crlf_crlf_input_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 1183 - checkout attr=auto ident aeol=crlf core.autocrlf=input core.eol=crlf file=LF_nul
-
-expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
-		test_cmp expect actual
-	
-ok 1184 - ls-files --eol attr= ident aeol= core.autocrlf=false core.eol=crlf
-
-expecting success: 
-		compare_ws_file eol_crlf_crlf_false_attr__ LF    crlf_false_attr__LF.txt
-	
-ok 1185 - checkout attr= ident aeol= core.autocrlf=false core.eol=crlf file=LF
-
-expecting success: 
-		compare_ws_file eol_crlf_crlf_false_attr__ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 1186 - checkout attr= ident aeol= core.autocrlf=false core.eol=crlf file=CRLF
-
-expecting success: 
-		compare_ws_file eol_crlf_crlf_false_attr__ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 1187 - checkout attr= ident aeol= core.autocrlf=false core.eol=crlf file=CRLF_mix_LF
-
-expecting success: 
-		compare_ws_file eol_crlf_crlf_false_attr__ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 1188 - checkout attr= ident aeol= core.autocrlf=false core.eol=crlf file=LF_mix_CR
-
-expecting success: 
-		compare_ws_file eol_crlf_crlf_false_attr__ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 1189 - checkout attr= ident aeol= core.autocrlf=false core.eol=crlf file=LF_nul
-
-expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
-		test_cmp expect actual
-	
-ok 1190 - ls-files --eol attr= ident aeol= core.autocrlf=true core.eol=crlf
-
-expecting success: 
-		compare_ws_file eol_crlf_crlf_true_attr__ CRLF    crlf_false_attr__LF.txt
-	
-ok 1191 - checkout attr= ident aeol= core.autocrlf=true core.eol=crlf file=LF
-
-expecting success: 
-		compare_ws_file eol_crlf_crlf_true_attr__ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 1192 - checkout attr= ident aeol= core.autocrlf=true core.eol=crlf file=CRLF
-
-expecting success: 
-		compare_ws_file eol_crlf_crlf_true_attr__ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 1193 - checkout attr= ident aeol= core.autocrlf=true core.eol=crlf file=CRLF_mix_LF
-
-expecting success: 
-		compare_ws_file eol_crlf_crlf_true_attr__ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 1194 - checkout attr= ident aeol= core.autocrlf=true core.eol=crlf file=LF_mix_CR
-
-expecting success: 
-		compare_ws_file eol_crlf_crlf_true_attr__ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 1195 - checkout attr= ident aeol= core.autocrlf=true core.eol=crlf file=LF_nul
-
-expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
-		test_cmp expect actual
-	
-ok 1196 - ls-files --eol attr=auto ident aeol= core.autocrlf=true core.eol=crlf
-
-expecting success: 
-		compare_ws_file eol_crlf_crlf_true_attr_auto_ CRLF    crlf_false_attr__LF.txt
-	
-ok 1197 - checkout attr=auto ident aeol= core.autocrlf=true core.eol=crlf file=LF
-
-expecting success: 
-		compare_ws_file eol_crlf_crlf_true_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 1198 - checkout attr=auto ident aeol= core.autocrlf=true core.eol=crlf file=CRLF
-
-expecting success: 
-		compare_ws_file eol_crlf_crlf_true_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 1199 - checkout attr=auto ident aeol= core.autocrlf=true core.eol=crlf file=CRLF_mix_LF
-
-expecting success: 
-		compare_ws_file eol_crlf_crlf_true_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 1200 - checkout attr=auto ident aeol= core.autocrlf=true core.eol=crlf file=LF_mix_CR
-
-expecting success: 
-		compare_ws_file eol_crlf_crlf_true_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 1201 - checkout attr=auto ident aeol= core.autocrlf=true core.eol=crlf file=LF_nul
-
-expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
-		test_cmp expect actual
-	
-ok 1202 - ls-files --eol attr=text ident aeol= core.autocrlf=true core.eol=crlf
-
-expecting success: 
-		compare_ws_file eol_crlf_crlf_true_attr_text_ CRLF    crlf_false_attr__LF.txt
-	
-ok 1203 - checkout attr=text ident aeol= core.autocrlf=true core.eol=crlf file=LF
-
-expecting success: 
-		compare_ws_file eol_crlf_crlf_true_attr_text_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 1204 - checkout attr=text ident aeol= core.autocrlf=true core.eol=crlf file=CRLF
-
-expecting success: 
-		compare_ws_file eol_crlf_crlf_true_attr_text_ CRLF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 1205 - checkout attr=text ident aeol= core.autocrlf=true core.eol=crlf file=CRLF_mix_LF
-
-expecting success: 
-		compare_ws_file eol_crlf_crlf_true_attr_text_ CRLF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 1206 - checkout attr=text ident aeol= core.autocrlf=true core.eol=crlf file=LF_mix_CR
-
-expecting success: 
-		compare_ws_file eol_crlf_crlf_true_attr_text_ CRLF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 1207 - checkout attr=text ident aeol= core.autocrlf=true core.eol=crlf file=LF_nul
-
-expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
-		test_cmp expect actual
-	
-ok 1208 - ls-files --eol attr=text ident aeol= core.autocrlf=input core.eol=crlf
-
-expecting success: 
-		compare_ws_file eol_crlf_crlf_input_attr_text_ LF    crlf_false_attr__LF.txt
-	
-ok 1209 - checkout attr=text ident aeol= core.autocrlf=input core.eol=crlf file=LF
-
-expecting success: 
-		compare_ws_file eol_crlf_crlf_input_attr_text_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 1210 - checkout attr=text ident aeol= core.autocrlf=input core.eol=crlf file=CRLF
-
-expecting success: 
-		compare_ws_file eol_crlf_crlf_input_attr_text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 1211 - checkout attr=text ident aeol= core.autocrlf=input core.eol=crlf file=CRLF_mix_LF
-
-expecting success: 
-		compare_ws_file eol_crlf_crlf_input_attr_text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 1212 - checkout attr=text ident aeol= core.autocrlf=input core.eol=crlf file=LF_mix_CR
-
-expecting success: 
-		compare_ws_file eol_crlf_crlf_input_attr_text_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 1213 - checkout attr=text ident aeol= core.autocrlf=input core.eol=crlf file=LF_nul
-
-expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
-		test_cmp expect actual
-	
-ok 1214 - ls-files --eol attr=auto ident aeol= core.autocrlf=input core.eol=crlf
-
-expecting success: 
-		compare_ws_file eol_crlf_crlf_input_attr_auto_ LF    crlf_false_attr__LF.txt
-	
-ok 1215 - checkout attr=auto ident aeol= core.autocrlf=input core.eol=crlf file=LF
-
-expecting success: 
-		compare_ws_file eol_crlf_crlf_input_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 1216 - checkout attr=auto ident aeol= core.autocrlf=input core.eol=crlf file=CRLF
-
-expecting success: 
-		compare_ws_file eol_crlf_crlf_input_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 1217 - checkout attr=auto ident aeol= core.autocrlf=input core.eol=crlf file=CRLF_mix_LF
-
-expecting success: 
-		compare_ws_file eol_crlf_crlf_input_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 1218 - checkout attr=auto ident aeol= core.autocrlf=input core.eol=crlf file=LF_mix_CR
-
-expecting success: 
-		compare_ws_file eol_crlf_crlf_input_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 1219 - checkout attr=auto ident aeol= core.autocrlf=input core.eol=crlf file=LF_nul
-
-expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
-		test_cmp expect actual
-	
-ok 1220 - ls-files --eol attr=-text ident aeol= core.autocrlf=true core.eol=native
-
-expecting success: 
-		compare_ws_file eol_native_crlf_true_attr_-text_ LF    crlf_false_attr__LF.txt
-	
-ok 1221 - checkout attr=-text ident aeol= core.autocrlf=true core.eol=native file=LF
-
-expecting success: 
-		compare_ws_file eol_native_crlf_true_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 1222 - checkout attr=-text ident aeol= core.autocrlf=true core.eol=native file=CRLF
-
-expecting success: 
-		compare_ws_file eol_native_crlf_true_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 1223 - checkout attr=-text ident aeol= core.autocrlf=true core.eol=native file=CRLF_mix_LF
-
-expecting success: 
-		compare_ws_file eol_native_crlf_true_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 1224 - checkout attr=-text ident aeol= core.autocrlf=true core.eol=native file=LF_mix_CR
-
-expecting success: 
-		compare_ws_file eol_native_crlf_true_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 1225 - checkout attr=-text ident aeol= core.autocrlf=true core.eol=native file=LF_nul
-
-expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
-		test_cmp expect actual
-	
-ok 1226 - ls-files --eol attr=-text ident aeol=lf core.autocrlf=true core.eol=native
-
-expecting success: 
-		compare_ws_file eol_native_crlf_true_attr_-text_ LF    crlf_false_attr__LF.txt
-	
-ok 1227 - checkout attr=-text ident aeol=lf core.autocrlf=true core.eol=native file=LF
-
-expecting success: 
-		compare_ws_file eol_native_crlf_true_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 1228 - checkout attr=-text ident aeol=lf core.autocrlf=true core.eol=native file=CRLF
-
-expecting success: 
-		compare_ws_file eol_native_crlf_true_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 1229 - checkout attr=-text ident aeol=lf core.autocrlf=true core.eol=native file=CRLF_mix_LF
-
-expecting success: 
-		compare_ws_file eol_native_crlf_true_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 1230 - checkout attr=-text ident aeol=lf core.autocrlf=true core.eol=native file=LF_mix_CR
-
-expecting success: 
-		compare_ws_file eol_native_crlf_true_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 1231 - checkout attr=-text ident aeol=lf core.autocrlf=true core.eol=native file=LF_nul
-
-expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
-		test_cmp expect actual
-	
-ok 1232 - ls-files --eol attr=-text ident aeol=crlf core.autocrlf=true core.eol=native
-
-expecting success: 
-		compare_ws_file eol_native_crlf_true_attr_-text_ LF    crlf_false_attr__LF.txt
-	
-ok 1233 - checkout attr=-text ident aeol=crlf core.autocrlf=true core.eol=native file=LF
-
-expecting success: 
-		compare_ws_file eol_native_crlf_true_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 1234 - checkout attr=-text ident aeol=crlf core.autocrlf=true core.eol=native file=CRLF
-
-expecting success: 
-		compare_ws_file eol_native_crlf_true_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 1235 - checkout attr=-text ident aeol=crlf core.autocrlf=true core.eol=native file=CRLF_mix_LF
-
-expecting success: 
-		compare_ws_file eol_native_crlf_true_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 1236 - checkout attr=-text ident aeol=crlf core.autocrlf=true core.eol=native file=LF_mix_CR
-
-expecting success: 
-		compare_ws_file eol_native_crlf_true_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 1237 - checkout attr=-text ident aeol=crlf core.autocrlf=true core.eol=native file=LF_nul
-
-expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
-		test_cmp expect actual
-	
-ok 1238 - ls-files --eol attr=text ident aeol=lf core.autocrlf=true core.eol=native
-
-expecting success: 
-		compare_ws_file eol_native_crlf_true_attr_text_ LF    crlf_false_attr__LF.txt
-	
-ok 1239 - checkout attr=text ident aeol=lf core.autocrlf=true core.eol=native file=LF
-
-expecting success: 
-		compare_ws_file eol_native_crlf_true_attr_text_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 1240 - checkout attr=text ident aeol=lf core.autocrlf=true core.eol=native file=CRLF
-
-expecting success: 
-		compare_ws_file eol_native_crlf_true_attr_text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 1241 - checkout attr=text ident aeol=lf core.autocrlf=true core.eol=native file=CRLF_mix_LF
-
-expecting success: 
-		compare_ws_file eol_native_crlf_true_attr_text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 1242 - checkout attr=text ident aeol=lf core.autocrlf=true core.eol=native file=LF_mix_CR
-
-expecting success: 
-		compare_ws_file eol_native_crlf_true_attr_text_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 1243 - checkout attr=text ident aeol=lf core.autocrlf=true core.eol=native file=LF_nul
-
-expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
-		test_cmp expect actual
-	
-ok 1244 - ls-files --eol attr=text ident aeol=crlf core.autocrlf=true core.eol=native
-
-expecting success: 
-		compare_ws_file eol_native_crlf_true_attr_text_ CRLF    crlf_false_attr__LF.txt
-	
-ok 1245 - checkout attr=text ident aeol=crlf core.autocrlf=true core.eol=native file=LF
-
-expecting success: 
-		compare_ws_file eol_native_crlf_true_attr_text_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 1246 - checkout attr=text ident aeol=crlf core.autocrlf=true core.eol=native file=CRLF
-
-expecting success: 
-		compare_ws_file eol_native_crlf_true_attr_text_ CRLF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 1247 - checkout attr=text ident aeol=crlf core.autocrlf=true core.eol=native file=CRLF_mix_LF
-
-expecting success: 
-		compare_ws_file eol_native_crlf_true_attr_text_ CRLF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 1248 - checkout attr=text ident aeol=crlf core.autocrlf=true core.eol=native file=LF_mix_CR
-
-expecting success: 
-		compare_ws_file eol_native_crlf_true_attr_text_ CRLF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 1249 - checkout attr=text ident aeol=crlf core.autocrlf=true core.eol=native file=LF_nul
-
-expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
-		test_cmp expect actual
-	
-ok 1250 - ls-files --eol attr=auto ident aeol=lf core.autocrlf=true core.eol=native
-
-expecting success: 
-		compare_ws_file eol_native_crlf_true_attr_auto_ LF    crlf_false_attr__LF.txt
-	
-ok 1251 - checkout attr=auto ident aeol=lf core.autocrlf=true core.eol=native file=LF
-
-expecting success: 
-		compare_ws_file eol_native_crlf_true_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 1252 - checkout attr=auto ident aeol=lf core.autocrlf=true core.eol=native file=CRLF
-
-expecting success: 
-		compare_ws_file eol_native_crlf_true_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 1253 - checkout attr=auto ident aeol=lf core.autocrlf=true core.eol=native file=CRLF_mix_LF
-
-expecting success: 
-		compare_ws_file eol_native_crlf_true_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 1254 - checkout attr=auto ident aeol=lf core.autocrlf=true core.eol=native file=LF_mix_CR
-
-expecting success: 
-		compare_ws_file eol_native_crlf_true_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 1255 - checkout attr=auto ident aeol=lf core.autocrlf=true core.eol=native file=LF_nul
-
-expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
-		test_cmp expect actual
-	
-ok 1256 - ls-files --eol attr=auto ident aeol=crlf core.autocrlf=true core.eol=native
-
-expecting success: 
-		compare_ws_file eol_native_crlf_true_attr_auto_ CRLF    crlf_false_attr__LF.txt
-	
-ok 1257 - checkout attr=auto ident aeol=crlf core.autocrlf=true core.eol=native file=LF
-
-expecting success: 
-		compare_ws_file eol_native_crlf_true_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 1258 - checkout attr=auto ident aeol=crlf core.autocrlf=true core.eol=native file=CRLF
-
-expecting success: 
-		compare_ws_file eol_native_crlf_true_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 1259 - checkout attr=auto ident aeol=crlf core.autocrlf=true core.eol=native file=CRLF_mix_LF
-
-expecting success: 
-		compare_ws_file eol_native_crlf_true_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 1260 - checkout attr=auto ident aeol=crlf core.autocrlf=true core.eol=native file=LF_mix_CR
-
-expecting success: 
-		compare_ws_file eol_native_crlf_true_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 1261 - checkout attr=auto ident aeol=crlf core.autocrlf=true core.eol=native file=LF_nul
-
-expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
-		test_cmp expect actual
-	
-ok 1262 - ls-files --eol attr=-text ident aeol= core.autocrlf=false core.eol=native
-
-expecting success: 
-		compare_ws_file eol_native_crlf_false_attr_-text_ LF    crlf_false_attr__LF.txt
-	
-ok 1263 - checkout attr=-text ident aeol= core.autocrlf=false core.eol=native file=LF
-
-expecting success: 
-		compare_ws_file eol_native_crlf_false_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 1264 - checkout attr=-text ident aeol= core.autocrlf=false core.eol=native file=CRLF
-
-expecting success: 
-		compare_ws_file eol_native_crlf_false_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 1265 - checkout attr=-text ident aeol= core.autocrlf=false core.eol=native file=CRLF_mix_LF
-
-expecting success: 
-		compare_ws_file eol_native_crlf_false_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 1266 - checkout attr=-text ident aeol= core.autocrlf=false core.eol=native file=LF_mix_CR
-
-expecting success: 
-		compare_ws_file eol_native_crlf_false_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 1267 - checkout attr=-text ident aeol= core.autocrlf=false core.eol=native file=LF_nul
-
-expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
-		test_cmp expect actual
-	
-ok 1268 - ls-files --eol attr=-text ident aeol=lf core.autocrlf=false core.eol=native
-
-expecting success: 
-		compare_ws_file eol_native_crlf_false_attr_-text_ LF    crlf_false_attr__LF.txt
-	
-ok 1269 - checkout attr=-text ident aeol=lf core.autocrlf=false core.eol=native file=LF
-
-expecting success: 
-		compare_ws_file eol_native_crlf_false_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 1270 - checkout attr=-text ident aeol=lf core.autocrlf=false core.eol=native file=CRLF
-
-expecting success: 
-		compare_ws_file eol_native_crlf_false_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 1271 - checkout attr=-text ident aeol=lf core.autocrlf=false core.eol=native file=CRLF_mix_LF
-
-expecting success: 
-		compare_ws_file eol_native_crlf_false_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 1272 - checkout attr=-text ident aeol=lf core.autocrlf=false core.eol=native file=LF_mix_CR
-
-expecting success: 
-		compare_ws_file eol_native_crlf_false_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 1273 - checkout attr=-text ident aeol=lf core.autocrlf=false core.eol=native file=LF_nul
-
-expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
-		test_cmp expect actual
-	
-ok 1274 - ls-files --eol attr=-text ident aeol=crlf core.autocrlf=false core.eol=native
-
-expecting success: 
-		compare_ws_file eol_native_crlf_false_attr_-text_ LF    crlf_false_attr__LF.txt
-	
-ok 1275 - checkout attr=-text ident aeol=crlf core.autocrlf=false core.eol=native file=LF
-
-expecting success: 
-		compare_ws_file eol_native_crlf_false_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 1276 - checkout attr=-text ident aeol=crlf core.autocrlf=false core.eol=native file=CRLF
-
-expecting success: 
-		compare_ws_file eol_native_crlf_false_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 1277 - checkout attr=-text ident aeol=crlf core.autocrlf=false core.eol=native file=CRLF_mix_LF
-
-expecting success: 
-		compare_ws_file eol_native_crlf_false_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 1278 - checkout attr=-text ident aeol=crlf core.autocrlf=false core.eol=native file=LF_mix_CR
-
-expecting success: 
-		compare_ws_file eol_native_crlf_false_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 1279 - checkout attr=-text ident aeol=crlf core.autocrlf=false core.eol=native file=LF_nul
-
-expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
-		test_cmp expect actual
-	
-ok 1280 - ls-files --eol attr=text ident aeol=lf core.autocrlf=false core.eol=native
-
-expecting success: 
-		compare_ws_file eol_native_crlf_false_attr_text_ LF    crlf_false_attr__LF.txt
-	
-ok 1281 - checkout attr=text ident aeol=lf core.autocrlf=false core.eol=native file=LF
-
-expecting success: 
-		compare_ws_file eol_native_crlf_false_attr_text_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 1282 - checkout attr=text ident aeol=lf core.autocrlf=false core.eol=native file=CRLF
-
-expecting success: 
-		compare_ws_file eol_native_crlf_false_attr_text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 1283 - checkout attr=text ident aeol=lf core.autocrlf=false core.eol=native file=CRLF_mix_LF
-
-expecting success: 
-		compare_ws_file eol_native_crlf_false_attr_text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 1284 - checkout attr=text ident aeol=lf core.autocrlf=false core.eol=native file=LF_mix_CR
-
-expecting success: 
-		compare_ws_file eol_native_crlf_false_attr_text_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 1285 - checkout attr=text ident aeol=lf core.autocrlf=false core.eol=native file=LF_nul
-
-expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
-		test_cmp expect actual
-	
-ok 1286 - ls-files --eol attr=text ident aeol=crlf core.autocrlf=false core.eol=native
-
-expecting success: 
-		compare_ws_file eol_native_crlf_false_attr_text_ CRLF    crlf_false_attr__LF.txt
-	
-ok 1287 - checkout attr=text ident aeol=crlf core.autocrlf=false core.eol=native file=LF
-
-expecting success: 
-		compare_ws_file eol_native_crlf_false_attr_text_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 1288 - checkout attr=text ident aeol=crlf core.autocrlf=false core.eol=native file=CRLF
-
-expecting success: 
-		compare_ws_file eol_native_crlf_false_attr_text_ CRLF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 1289 - checkout attr=text ident aeol=crlf core.autocrlf=false core.eol=native file=CRLF_mix_LF
-
-expecting success: 
-		compare_ws_file eol_native_crlf_false_attr_text_ CRLF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 1290 - checkout attr=text ident aeol=crlf core.autocrlf=false core.eol=native file=LF_mix_CR
-
-expecting success: 
-		compare_ws_file eol_native_crlf_false_attr_text_ CRLF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 1291 - checkout attr=text ident aeol=crlf core.autocrlf=false core.eol=native file=LF_nul
-
-expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
-		test_cmp expect actual
-	
-ok 1292 - ls-files --eol attr=auto ident aeol=lf core.autocrlf=false core.eol=native
-
-expecting success: 
-		compare_ws_file eol_native_crlf_false_attr_auto_ LF    crlf_false_attr__LF.txt
-	
-ok 1293 - checkout attr=auto ident aeol=lf core.autocrlf=false core.eol=native file=LF
-
-expecting success: 
-		compare_ws_file eol_native_crlf_false_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 1294 - checkout attr=auto ident aeol=lf core.autocrlf=false core.eol=native file=CRLF
-
-expecting success: 
-		compare_ws_file eol_native_crlf_false_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 1295 - checkout attr=auto ident aeol=lf core.autocrlf=false core.eol=native file=CRLF_mix_LF
-
-expecting success: 
-		compare_ws_file eol_native_crlf_false_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 1296 - checkout attr=auto ident aeol=lf core.autocrlf=false core.eol=native file=LF_mix_CR
-
-expecting success: 
-		compare_ws_file eol_native_crlf_false_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 1297 - checkout attr=auto ident aeol=lf core.autocrlf=false core.eol=native file=LF_nul
-
-expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
-		test_cmp expect actual
-	
-ok 1298 - ls-files --eol attr=auto ident aeol=crlf core.autocrlf=false core.eol=native
-
-expecting success: 
-		compare_ws_file eol_native_crlf_false_attr_auto_ CRLF    crlf_false_attr__LF.txt
-	
-ok 1299 - checkout attr=auto ident aeol=crlf core.autocrlf=false core.eol=native file=LF
-
-expecting success: 
-		compare_ws_file eol_native_crlf_false_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 1300 - checkout attr=auto ident aeol=crlf core.autocrlf=false core.eol=native file=CRLF
-
-expecting success: 
-		compare_ws_file eol_native_crlf_false_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 1301 - checkout attr=auto ident aeol=crlf core.autocrlf=false core.eol=native file=CRLF_mix_LF
-
-expecting success: 
-		compare_ws_file eol_native_crlf_false_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 1302 - checkout attr=auto ident aeol=crlf core.autocrlf=false core.eol=native file=LF_mix_CR
-
-expecting success: 
-		compare_ws_file eol_native_crlf_false_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 1303 - checkout attr=auto ident aeol=crlf core.autocrlf=false core.eol=native file=LF_nul
-
-expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
-		test_cmp expect actual
-	
-ok 1304 - ls-files --eol attr=-text ident aeol= core.autocrlf=input core.eol=native
-
-expecting success: 
-		compare_ws_file eol_native_crlf_input_attr_-text_ LF    crlf_false_attr__LF.txt
-	
-ok 1305 - checkout attr=-text ident aeol= core.autocrlf=input core.eol=native file=LF
-
-expecting success: 
-		compare_ws_file eol_native_crlf_input_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 1306 - checkout attr=-text ident aeol= core.autocrlf=input core.eol=native file=CRLF
-
-expecting success: 
-		compare_ws_file eol_native_crlf_input_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 1307 - checkout attr=-text ident aeol= core.autocrlf=input core.eol=native file=CRLF_mix_LF
-
-expecting success: 
-		compare_ws_file eol_native_crlf_input_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 1308 - checkout attr=-text ident aeol= core.autocrlf=input core.eol=native file=LF_mix_CR
-
-expecting success: 
-		compare_ws_file eol_native_crlf_input_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 1309 - checkout attr=-text ident aeol= core.autocrlf=input core.eol=native file=LF_nul
-
-expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
-		test_cmp expect actual
-	
-ok 1310 - ls-files --eol attr=-text ident aeol=lf core.autocrlf=input core.eol=native
-
-expecting success: 
-		compare_ws_file eol_native_crlf_input_attr_-text_ LF    crlf_false_attr__LF.txt
-	
-ok 1311 - checkout attr=-text ident aeol=lf core.autocrlf=input core.eol=native file=LF
-
-expecting success: 
-		compare_ws_file eol_native_crlf_input_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 1312 - checkout attr=-text ident aeol=lf core.autocrlf=input core.eol=native file=CRLF
-
-expecting success: 
-		compare_ws_file eol_native_crlf_input_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 1313 - checkout attr=-text ident aeol=lf core.autocrlf=input core.eol=native file=CRLF_mix_LF
-
-expecting success: 
-		compare_ws_file eol_native_crlf_input_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 1314 - checkout attr=-text ident aeol=lf core.autocrlf=input core.eol=native file=LF_mix_CR
-
-expecting success: 
-		compare_ws_file eol_native_crlf_input_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 1315 - checkout attr=-text ident aeol=lf core.autocrlf=input core.eol=native file=LF_nul
-
-expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
-		test_cmp expect actual
-	
-ok 1316 - ls-files --eol attr=-text ident aeol=crlf core.autocrlf=input core.eol=native
-
-expecting success: 
-		compare_ws_file eol_native_crlf_input_attr_-text_ LF    crlf_false_attr__LF.txt
-	
-ok 1317 - checkout attr=-text ident aeol=crlf core.autocrlf=input core.eol=native file=LF
-
-expecting success: 
-		compare_ws_file eol_native_crlf_input_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 1318 - checkout attr=-text ident aeol=crlf core.autocrlf=input core.eol=native file=CRLF
-
-expecting success: 
-		compare_ws_file eol_native_crlf_input_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 1319 - checkout attr=-text ident aeol=crlf core.autocrlf=input core.eol=native file=CRLF_mix_LF
-
-expecting success: 
-		compare_ws_file eol_native_crlf_input_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 1320 - checkout attr=-text ident aeol=crlf core.autocrlf=input core.eol=native file=LF_mix_CR
-
-expecting success: 
-		compare_ws_file eol_native_crlf_input_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 1321 - checkout attr=-text ident aeol=crlf core.autocrlf=input core.eol=native file=LF_nul
-
-expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
-		test_cmp expect actual
-	
-ok 1322 - ls-files --eol attr=text ident aeol=lf core.autocrlf=input core.eol=native
-
-expecting success: 
-		compare_ws_file eol_native_crlf_input_attr_text_ LF    crlf_false_attr__LF.txt
-	
-ok 1323 - checkout attr=text ident aeol=lf core.autocrlf=input core.eol=native file=LF
-
-expecting success: 
-		compare_ws_file eol_native_crlf_input_attr_text_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 1324 - checkout attr=text ident aeol=lf core.autocrlf=input core.eol=native file=CRLF
-
-expecting success: 
-		compare_ws_file eol_native_crlf_input_attr_text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 1325 - checkout attr=text ident aeol=lf core.autocrlf=input core.eol=native file=CRLF_mix_LF
-
-expecting success: 
-		compare_ws_file eol_native_crlf_input_attr_text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 1326 - checkout attr=text ident aeol=lf core.autocrlf=input core.eol=native file=LF_mix_CR
-
-expecting success: 
-		compare_ws_file eol_native_crlf_input_attr_text_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 1327 - checkout attr=text ident aeol=lf core.autocrlf=input core.eol=native file=LF_nul
-
-expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
-		test_cmp expect actual
-	
-ok 1328 - ls-files --eol attr=text ident aeol=crlf core.autocrlf=input core.eol=native
-
-expecting success: 
-		compare_ws_file eol_native_crlf_input_attr_text_ CRLF    crlf_false_attr__LF.txt
-	
-ok 1329 - checkout attr=text ident aeol=crlf core.autocrlf=input core.eol=native file=LF
-
-expecting success: 
-		compare_ws_file eol_native_crlf_input_attr_text_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 1330 - checkout attr=text ident aeol=crlf core.autocrlf=input core.eol=native file=CRLF
-
-expecting success: 
-		compare_ws_file eol_native_crlf_input_attr_text_ CRLF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 1331 - checkout attr=text ident aeol=crlf core.autocrlf=input core.eol=native file=CRLF_mix_LF
-
-expecting success: 
-		compare_ws_file eol_native_crlf_input_attr_text_ CRLF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 1332 - checkout attr=text ident aeol=crlf core.autocrlf=input core.eol=native file=LF_mix_CR
-
-expecting success: 
-		compare_ws_file eol_native_crlf_input_attr_text_ CRLF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 1333 - checkout attr=text ident aeol=crlf core.autocrlf=input core.eol=native file=LF_nul
-
-expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
-		test_cmp expect actual
-	
-ok 1334 - ls-files --eol attr=auto ident aeol=lf core.autocrlf=input core.eol=native
-
-expecting success: 
-		compare_ws_file eol_native_crlf_input_attr_auto_ LF    crlf_false_attr__LF.txt
-	
-ok 1335 - checkout attr=auto ident aeol=lf core.autocrlf=input core.eol=native file=LF
-
-expecting success: 
-		compare_ws_file eol_native_crlf_input_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 1336 - checkout attr=auto ident aeol=lf core.autocrlf=input core.eol=native file=CRLF
-
-expecting success: 
-		compare_ws_file eol_native_crlf_input_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 1337 - checkout attr=auto ident aeol=lf core.autocrlf=input core.eol=native file=CRLF_mix_LF
-
-expecting success: 
-		compare_ws_file eol_native_crlf_input_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 1338 - checkout attr=auto ident aeol=lf core.autocrlf=input core.eol=native file=LF_mix_CR
-
-expecting success: 
-		compare_ws_file eol_native_crlf_input_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 1339 - checkout attr=auto ident aeol=lf core.autocrlf=input core.eol=native file=LF_nul
-
-expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
-		test_cmp expect actual
-	
-ok 1340 - ls-files --eol attr=auto ident aeol=crlf core.autocrlf=input core.eol=native
-
-expecting success: 
-		compare_ws_file eol_native_crlf_input_attr_auto_ CRLF    crlf_false_attr__LF.txt
-	
-ok 1341 - checkout attr=auto ident aeol=crlf core.autocrlf=input core.eol=native file=LF
-
-expecting success: 
-		compare_ws_file eol_native_crlf_input_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 1342 - checkout attr=auto ident aeol=crlf core.autocrlf=input core.eol=native file=CRLF
-
-expecting success: 
-		compare_ws_file eol_native_crlf_input_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 1343 - checkout attr=auto ident aeol=crlf core.autocrlf=input core.eol=native file=CRLF_mix_LF
-
-expecting success: 
-		compare_ws_file eol_native_crlf_input_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 1344 - checkout attr=auto ident aeol=crlf core.autocrlf=input core.eol=native file=LF_mix_CR
-
-expecting success: 
-		compare_ws_file eol_native_crlf_input_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 1345 - checkout attr=auto ident aeol=crlf core.autocrlf=input core.eol=native file=LF_nul
-
-expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
-		test_cmp expect actual
-	
-ok 1346 - ls-files --eol attr= ident aeol= core.autocrlf=false core.eol=native
-
-expecting success: 
-		compare_ws_file eol_native_crlf_false_attr__ LF    crlf_false_attr__LF.txt
-	
-ok 1347 - checkout attr= ident aeol= core.autocrlf=false core.eol=native file=LF
-
-expecting success: 
-		compare_ws_file eol_native_crlf_false_attr__ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 1348 - checkout attr= ident aeol= core.autocrlf=false core.eol=native file=CRLF
-
-expecting success: 
-		compare_ws_file eol_native_crlf_false_attr__ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 1349 - checkout attr= ident aeol= core.autocrlf=false core.eol=native file=CRLF_mix_LF
-
-expecting success: 
-		compare_ws_file eol_native_crlf_false_attr__ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 1350 - checkout attr= ident aeol= core.autocrlf=false core.eol=native file=LF_mix_CR
-
-expecting success: 
-		compare_ws_file eol_native_crlf_false_attr__ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 1351 - checkout attr= ident aeol= core.autocrlf=false core.eol=native file=LF_nul
-
-expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
-		test_cmp expect actual
-	
-ok 1352 - ls-files --eol attr= ident aeol= core.autocrlf=true core.eol=native
-
-expecting success: 
-		compare_ws_file eol_native_crlf_true_attr__ CRLF    crlf_false_attr__LF.txt
-	
-ok 1353 - checkout attr= ident aeol= core.autocrlf=true core.eol=native file=LF
-
-expecting success: 
-		compare_ws_file eol_native_crlf_true_attr__ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 1354 - checkout attr= ident aeol= core.autocrlf=true core.eol=native file=CRLF
-
-expecting success: 
-		compare_ws_file eol_native_crlf_true_attr__ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 1355 - checkout attr= ident aeol= core.autocrlf=true core.eol=native file=CRLF_mix_LF
-
-expecting success: 
-		compare_ws_file eol_native_crlf_true_attr__ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 1356 - checkout attr= ident aeol= core.autocrlf=true core.eol=native file=LF_mix_CR
-
-expecting success: 
-		compare_ws_file eol_native_crlf_true_attr__ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 1357 - checkout attr= ident aeol= core.autocrlf=true core.eol=native file=LF_nul
-
-expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
-		test_cmp expect actual
-	
-ok 1358 - ls-files --eol attr=auto ident aeol= core.autocrlf=true core.eol=native
-
-expecting success: 
-		compare_ws_file eol_native_crlf_true_attr_auto_ CRLF    crlf_false_attr__LF.txt
+		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 1359 - checkout attr=auto ident aeol= core.autocrlf=true core.eol=native file=LF
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+Branch 'no_submodule' set up to track remote branch 'no_submodule' from 'origin'.
+Branch 'add_sub1' set up to track remote branch 'add_sub1' from 'origin'.
+Applying: Add sub1
+Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '2a793c129c336f679fd70ee3f690305cd58b4eaa'
+Submodule path 'uninitialized_sub': checked out '2a793c129c336f679fd70ee3f690305cd58b4eaa'
+ok 15 - am_3way: added submodule creates empty directory
 
 expecting success: 
-		compare_ws_file eol_native_crlf_true_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
+		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 1360 - checkout attr=auto ident aeol= core.autocrlf=true core.eol=native file=CRLF
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+Branch 'no_submodule' set up to track remote branch 'no_submodule' from 'origin'.
+Branch 'add_sub1' set up to track remote branch 'add_sub1' from 'origin'.
+Applying: Add sub1
+Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '2a793c129c336f679fd70ee3f690305cd58b4eaa'
+Submodule path 'uninitialized_sub': checked out '2a793c129c336f679fd70ee3f690305cd58b4eaa'
+ok 16 - am_3way: added submodule leaves existing empty directory alone
 
 expecting success: 
-		compare_ws_file eol_native_crlf_true_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+		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 1361 - checkout attr=auto ident aeol= core.autocrlf=true core.eol=native file=CRLF_mix_LF
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'replace_sub1_with_file'
+Branch 'replace_sub1_with_file' set up to track remote branch 'replace_sub1_with_file' from 'origin'.
+fatal: Needed a single revision
+Branch 'replace_file_with_sub1' set up to track remote branch 'replace_file_with_sub1' from 'origin'.
+Applying: Revert "Replace sub1 with file"
+Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '2a793c129c336f679fd70ee3f690305cd58b4eaa'
+Submodule path 'uninitialized_sub': checked out '2a793c129c336f679fd70ee3f690305cd58b4eaa'
+ok 17 - am_3way: replace tracked file with submodule creates empty directory
 
 expecting success: 
-		compare_ws_file eol_native_crlf_true_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+		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 1362 - checkout attr=auto ident aeol= core.autocrlf=true core.eol=native file=LF_mix_CR
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'replace_sub1_with_directory'
+Branch 'replace_sub1_with_directory' set up to track remote branch 'replace_sub1_with_directory' from 'origin'.
+fatal: Needed a single revision
+Branch 'replace_directory_with_sub1' set up to track remote branch 'replace_directory_with_sub1' from 'origin'.
+Applying: Revert "Replace sub1 with directory"
+Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '2a793c129c336f679fd70ee3f690305cd58b4eaa'
+Submodule path 'uninitialized_sub': checked out '2a793c129c336f679fd70ee3f690305cd58b4eaa'
+ok 18 - am_3way: replace directory with submodule
 
 expecting success: 
-		compare_ws_file eol_native_crlf_true_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
+		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 1363 - checkout attr=auto ident aeol= core.autocrlf=true core.eol=native file=LF_nul
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+Branch 'add_sub1' set up to track remote branch 'add_sub1' from 'origin'.
+Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '2a793c129c336f679fd70ee3f690305cd58b4eaa'
+Branch 'remove_sub1' set up to track remote branch 'remove_sub1' from 'origin'.
+Applying: Revert "Add sub1"
+ok 19 - am_3way: removed submodule leaves submodule directory and its contents in place
 
 expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
-		test_cmp expect actual
+		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 1364 - ls-files --eol attr=text ident aeol= core.autocrlf=true core.eol=native
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+Branch 'add_sub1' set up to track remote branch 'add_sub1' from 'origin'.
+Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '2a793c129c336f679fd70ee3f690305cd58b4eaa'
+Branch 'remove_sub1' set up to track remote branch 'remove_sub1' from 'origin'.
+Applying: Revert "Add sub1"
+ok 20 - am_3way: removed submodule leaves submodule containing a .git directory alone
 
-expecting success: 
-		compare_ws_file eol_native_crlf_true_attr_text_ CRLF    crlf_false_attr__LF.txt
+checking known breakage: 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
+			test_must_fail $command replace_sub1_with_directory &&
+			test_superproject_content origin/add_sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
 	
-ok 1365 - checkout attr=text ident aeol= core.autocrlf=true core.eol=native file=LF
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+Branch 'add_sub1' set up to track remote branch 'add_sub1' from 'origin'.
+Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '2a793c129c336f679fd70ee3f690305cd58b4eaa'
+Branch 'replace_sub1_with_directory' set up to track remote branch 'replace_sub1_with_directory' from 'origin'.
+Applying: Replace sub1 with directory
+error: refusing to lose untracked file at 'sub1/file2'
+error: refusing to lose untracked file at 'sub1/file1'
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+Merging:
+552163f Add sub1
+virtual Replace sub1 with directory
+found 1 common ancestor:
+virtual 621080215a92ca24bedad87b2ce44af0a2ed3f7a
+Adding sub1/file3
+Adding sub1/file2
+Adding sub1/file1
+Removing sub1
+test_must_fail: command succeeded: am_3way replace_sub1_with_directory
+not ok 21 - am_3way: replace submodule with a directory must fail # TODO known breakage
 
-expecting success: 
-		compare_ws_file eol_native_crlf_true_attr_text_ CRLF  crlf_false_attr__CRLF.txt
+checking known breakage: 
+		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 &&
+			test_must_fail $command replace_sub1_with_directory &&
+			test_superproject_content origin/add_sub1 &&
+			test_git_directory_is_unchanged sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
 	
-ok 1366 - checkout attr=text ident aeol= core.autocrlf=true core.eol=native file=CRLF
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+Branch 'add_sub1' set up to track remote branch 'add_sub1' from 'origin'.
+Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '2a793c129c336f679fd70ee3f690305cd58b4eaa'
+Branch 'replace_sub1_with_directory' set up to track remote branch 'replace_sub1_with_directory' from 'origin'.
+Applying: Replace sub1 with directory
+error: refusing to lose untracked file at 'sub1/file2'
+error: refusing to lose untracked file at 'sub1/file1'
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+Merging:
+552163f Add sub1
+virtual Replace sub1 with directory
+found 1 common ancestor:
+virtual 621080215a92ca24bedad87b2ce44af0a2ed3f7a
+Adding sub1/file3
+Adding sub1/file2
+Adding sub1/file1
+Removing sub1
+test_must_fail: command succeeded: am_3way replace_sub1_with_directory
+not ok 22 - am_3way: replace submodule containing a .git directory with a directory must fail # TODO known breakage
 
-expecting success: 
-		compare_ws_file eol_native_crlf_true_attr_text_ CRLF crlf_false_attr__CRLF_mix_LF.txt
+checking known breakage: 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
+			test_must_fail $command replace_sub1_with_file &&
+			test_superproject_content origin/add_sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
 	
-ok 1367 - checkout attr=text ident aeol= core.autocrlf=true core.eol=native file=CRLF_mix_LF
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+Branch 'add_sub1' set up to track remote branch 'add_sub1' from 'origin'.
+Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '2a793c129c336f679fd70ee3f690305cd58b4eaa'
+Branch 'replace_sub1_with_file' set up to track remote branch 'replace_sub1_with_file' from 'origin'.
+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 d6f6dd76118cda58eb95755a2298f8657f2cceeb and 0c5fb3d7a7f38842873e1ae04f0d84f622ff7d20 failed
+error: Failed to merge in the changes.
+hint: Use 'git am --show-current-patch' to see the failed patch
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+Merging:
+552163f Add sub1
+virtual Replace sub1 with file
+found 1 common ancestor:
+virtual 621080215a92ca24bedad87b2ce44af0a2ed3f7a
+Patch failed at 0001 Replace sub1 with file
+When you have resolved this problem, run "git am --continue".
+If you prefer to skip this patch, run "git am --skip" instead.
+To restore the original branch and stop patching, run "git am --abort".
+'actual' is not empty, it contains:
+:100644 100644 af3a0c56edfba1a28f50ada5ec2832a7f2f9b907 0000000000000000000000000000000000000000 M	.gitmodules
+not ok 23 - am_3way: replace submodule with a file must fail # TODO known breakage
 
-expecting success: 
-		compare_ws_file eol_native_crlf_true_attr_text_ CRLF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+checking known breakage: 
+		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 &&
+			test_must_fail $command replace_sub1_with_file &&
+			test_superproject_content origin/add_sub1 &&
+			test_git_directory_is_unchanged sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
 	
-ok 1368 - checkout attr=text ident aeol= core.autocrlf=true core.eol=native file=LF_mix_CR
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+Branch 'add_sub1' set up to track remote branch 'add_sub1' from 'origin'.
+Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '2a793c129c336f679fd70ee3f690305cd58b4eaa'
+Branch 'replace_sub1_with_file' set up to track remote branch 'replace_sub1_with_file' from 'origin'.
+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 d6f6dd76118cda58eb95755a2298f8657f2cceeb and 0c5fb3d7a7f38842873e1ae04f0d84f622ff7d20 failed
+error: Failed to merge in the changes.
+hint: Use 'git am --show-current-patch' to see the failed patch
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+Merging:
+552163f Add sub1
+virtual Replace sub1 with file
+found 1 common ancestor:
+virtual 621080215a92ca24bedad87b2ce44af0a2ed3f7a
+Patch failed at 0001 Replace sub1 with file
+When you have resolved this problem, run "git am --continue".
+If you prefer to skip this patch, run "git am --skip" instead.
+To restore the original branch and stop patching, run "git am --abort".
+'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: 
-		compare_ws_file eol_native_crlf_true_attr_text_ CRLF_nul   crlf_false_attr__LF_nul.txt
+		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 1369 - checkout attr=text ident aeol= core.autocrlf=true core.eol=native file=LF_nul
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+Branch 'add_sub1' set up to track remote branch 'add_sub1' from 'origin'.
+Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '2a793c129c336f679fd70ee3f690305cd58b4eaa'
+Branch 'modify_sub1' set up to track remote branch 'modify_sub1' from 'origin'.
+Applying: Modify sub1
+Submodule path 'sub1': checked out '494eb2a8d8ee6f634e1b7f2249668b241961c12c'
+ok 25 - am_3way: modified submodule does not update submodule work tree
 
 expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
-		test_cmp expect actual
+		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 1370 - ls-files --eol attr=text ident aeol= core.autocrlf=input core.eol=native
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+Branch 'add_sub1' set up to track remote branch 'add_sub1' from 'origin'.
+Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '2a793c129c336f679fd70ee3f690305cd58b4eaa'
+Branch 'invalid_sub1' set up to track remote branch 'invalid_sub1' from 'origin'.
+Applying: Invalid sub1 commit
+error: Server does not allow request for unadvertised object 0123456789012345678901234567890123456789
+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: 
-		compare_ws_file eol_native_crlf_input_attr_text_ LF    crlf_false_attr__LF.txt
+		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 1371 - checkout attr=text ident aeol= core.autocrlf=input core.eol=native file=LF
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'invalid_sub1'
+Branch 'invalid_sub1' set up to track remote branch 'invalid_sub1' from 'origin'.
+fatal: Needed a single revision
+Branch 'valid_sub1' set up to track remote branch 'valid_sub1' from 'origin'.
+Applying: Revert "Invalid sub1 commit"
+Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/git-2.20.1/t/trash directory.t4255-am-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '2a793c129c336f679fd70ee3f690305cd58b4eaa'
+Submodule path 'uninitialized_sub': checked out '2a793c129c336f679fd70ee3f690305cd58b4eaa'
+ok 27 - am_3way: modified submodule does not update submodule work tree from invalid commit
 
 expecting success: 
-		compare_ws_file eol_native_crlf_input_attr_text_ CRLF  crlf_false_attr__CRLF.txt
+		prolog &&
+		reset_work_tree_to 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 1372 - checkout attr=text ident aeol= core.autocrlf=input core.eol=native file=CRLF
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+Branch 'no_submodule' set up to track remote branch 'no_submodule' from 'origin'.
+Branch 'add_sub1' set up to track remote branch 'add_sub1' from 'origin'.
+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 faf22e05098cf30ce5ab531e20eab3dcc813f88a failed
+error: Failed to merge in the changes.
+hint: Use 'git am --show-current-patch' to see the failed patch
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+Merging:
+9cbdc86 Base
+virtual Add sub1
+found 1 common ancestor:
+virtual 4b825dc642cb6eb9a060e54bf8d69288fbee4904
+Patch failed at 0001 Add sub1
+When you have resolved this problem, run "git am --continue".
+If you prefer to skip this patch, run "git am --skip" instead.
+To restore the original branch and stop patching, run "git am --abort".
+ok 28 - am_3way: added submodule doesn't remove untracked unignored file with same name
 
 expecting success: 
-		compare_ws_file eol_native_crlf_input_attr_text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 1373 - checkout attr=text ident aeol= core.autocrlf=input core.eol=native file=CRLF_mix_LF
+	test_commit one &&
+	INITIAL=$(git rev-parse HEAD) &&
 
-expecting success: 
-		compare_ws_file eol_native_crlf_input_attr_text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 1374 - checkout attr=text ident aeol= core.autocrlf=input core.eol=native file=LF_mix_CR
+	git init submodule &&
+	(
+		cd submodule &&
+		test_commit two &&
+		git rev-parse HEAD >../initial-submodule
+	) &&
+	git submodule add ./submodule &&
+	git commit -m first &&
 
-expecting success: 
-		compare_ws_file eol_native_crlf_input_attr_text_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 1375 - checkout attr=text ident aeol= core.autocrlf=input core.eol=native file=LF_nul
+	(
+		cd submodule &&
+		test_commit three &&
+		git rev-parse HEAD >../first-submodule
+	) &&
+	git add submodule &&
+	git commit -m second &&
+	SECOND=$(git rev-parse HEAD) &&
 
-expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
-		test_cmp expect actual
-	
-ok 1376 - ls-files --eol attr=auto ident aeol= core.autocrlf=input core.eol=native
+	(
+		cd submodule &&
+		git mv two.t four.t &&
+		git commit -m "second submodule" &&
+		git rev-parse HEAD >../second-submodule
+	) &&
+	test_commit four &&
+	git add submodule &&
+	git commit --amend --no-edit &&
+	THIRD=$(git rev-parse HEAD) &&
+	git submodule update --init
 
-expecting success: 
-		compare_ws_file eol_native_crlf_input_attr_auto_ LF    crlf_false_attr__LF.txt
-	
-ok 1377 - checkout attr=auto ident aeol= core.autocrlf=input core.eol=native file=LF
+[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/git-2.20.1/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: 
-		compare_ws_file eol_native_crlf_input_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 1378 - checkout attr=auto ident aeol= core.autocrlf=input core.eol=native file=CRLF
+	test_unconfig diff.submodule &&
+	run_test $SECOND first-submodule
 
-expecting success: 
-		compare_ws_file eol_native_crlf_input_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 1379 - checkout attr=auto ident aeol= core.autocrlf=input core.eol=native file=CRLF_mix_LF
+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: 
-		compare_ws_file eol_native_crlf_input_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 1380 - checkout attr=auto ident aeol= core.autocrlf=input core.eol=native file=LF_mix_CR
+	test_unconfig diff.submodule &&
+	run_test $THIRD second-submodule
 
-expecting success: 
-		compare_ws_file eol_native_crlf_input_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 1381 - checkout attr=auto ident aeol= core.autocrlf=input core.eol=native file=LF_nul
+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: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
-		test_cmp expect actual
-	
-ok 1382 - ls-files --eol attr=text ident aeol= core.autocrlf=false core.eol=crlf
+	test_config diff.submodule log &&
+	run_test $SECOND first-submodule
 
-expecting success: 
-		compare_ws_file eol_crlf_crlf_false_attr_text_ CRLF    crlf_false_attr__LF.txt
-	
-ok 1383 - checkout attr=text ident aeol= core.autocrlf=false core.eol=crlf file=LF
+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: 
-		compare_ws_file eol_crlf_crlf_false_attr_text_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 1384 - checkout attr=text ident aeol= core.autocrlf=false core.eol=crlf file=CRLF
+	test_config diff.submodule log &&
+	run_test $THIRD second-submodule
 
-expecting success: 
-		compare_ws_file eol_crlf_crlf_false_attr_text_ CRLF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 1385 - checkout attr=text ident aeol= core.autocrlf=false core.eol=crlf file=CRLF_mix_LF
+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/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t5562-http-backend-content-length.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5562-http-backend-content-length/.git/
 expecting success: 
-		compare_ws_file eol_crlf_crlf_false_attr_text_ CRLF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 1386 - checkout attr=text ident aeol= core.autocrlf=false core.eol=crlf file=LF_mix_CR
+	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) &&
+	printf "want %s" "$hash_head" | packetize >fetch_body &&
+	printf 0000 >>fetch_body &&
+	printf "have %s" "$hash_prev" | packetize >>fetch_body &&
+	printf done | packetize >>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\\n" "$_z40" "$hash_next" | packetize >push_body &&
+	printf 0000 >>push_body &&
+	echo "$hash_next" | git pack-objects --stdout >>push_body &&
+	test_copy_bytes 10 <push_body >push_body.trunc &&
+	: >empty_body
 
-expecting success: 
-		compare_ws_file eol_crlf_crlf_false_attr_text_ CRLF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 1387 - checkout attr=text ident aeol= core.autocrlf=false core.eol=crlf file=LF_nul
+[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
 
-expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
-		test_cmp expect actual
-	
-ok 1388 - ls-files --eol attr=text ident aeol= core.autocrlf=false core.eol=lf
+checking prerequisite: GZIP
 
-expecting success: 
-		compare_ws_file eol_lf_crlf_false_attr_text_ LF    crlf_false_attr__LF.txt
-	
-ok 1389 - checkout attr=text ident aeol= core.autocrlf=false core.eol=lf file=LF
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir" &&gzip --version
+)
+gzip 1.9
+Copyright (C) 2017 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: 
-		compare_ws_file eol_lf_crlf_false_attr_text_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 1390 - checkout attr=text ident aeol= core.autocrlf=false core.eol=lf file=CRLF
+	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
 
-expecting success: 
-		compare_ws_file eol_lf_crlf_false_attr_text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 1391 - checkout attr=text ident aeol= core.autocrlf=false core.eol=lf file=CRLF_mix_LF
+ok 2 - setup, compression related
 
 expecting success: 
-		compare_ws_file eol_lf_crlf_false_attr_text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 1392 - checkout attr=text ident aeol= core.autocrlf=false core.eol=lf file=LF_mix_CR
+	test_http_env upload fetch_body &&
+	verify_http_result "200 OK"
 
-expecting success: 
-		compare_ws_file eol_lf_crlf_false_attr_text_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 1393 - checkout attr=text ident aeol= core.autocrlf=false core.eol=lf file=LF_nul
+ok 3 - fetch plain
 
 expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
-		test_cmp expect actual
-	
-ok 1394 - ls-files --eol attr=text ident aeol= core.autocrlf=false core.eol=
+	test_http_env upload fetch_body.trunc &&
+	! verify_http_result "200 OK"
 
-expecting success: 
-		compare_ws_file eol__crlf_false_attr_text_ LF    crlf_false_attr__LF.txt
-	
-ok 1395 - checkout attr=text ident aeol= core.autocrlf=false core.eol= file=LF
+fatal: the remote end hung up unexpectedly
+ok 4 - fetch plain truncated
 
 expecting success: 
-		compare_ws_file eol__crlf_false_attr_text_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 1396 - checkout attr=text ident aeol= core.autocrlf=false core.eol= file=CRLF
+	test_http_env upload empty_body &&
+	! verify_http_result "200 OK"
 
-expecting success: 
-		compare_ws_file eol__crlf_false_attr_text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 1397 - checkout attr=text ident aeol= core.autocrlf=false core.eol= file=CRLF_mix_LF
+fatal: the remote end hung up unexpectedly
+ok 5 - fetch plain empty
 
 expecting success: 
-		compare_ws_file eol__crlf_false_attr_text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 1398 - checkout attr=text ident aeol= core.autocrlf=false core.eol= file=LF_mix_CR
+	test_env HTTP_CONTENT_ENCODING="gzip" test_http_env upload fetch_body.gz &&
+	verify_http_result "200 OK"
 
-expecting success: 
-		compare_ws_file eol__crlf_false_attr_text_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 1399 - checkout attr=text ident aeol= core.autocrlf=false core.eol= file=LF_nul
+ok 6 - fetch gzipped
 
 expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
-		test_cmp expect actual
-	
-ok 1400 - ls-files --eol attr=text ident aeol= core.autocrlf=false core.eol=native
+	test_env HTTP_CONTENT_ENCODING="gzip" test_http_env upload fetch_body.gz.trunc &&
+	! verify_http_result "200 OK"
 
-expecting success: 
-		compare_ws_file eol_native_crlf_false_attr_text_ LF    crlf_false_attr__LF.txt
-	
-ok 1401 - checkout attr=text ident aeol= core.autocrlf=false core.eol=native file=LF
+fatal: request ended in the middle of the gzip stream
+fatal: the remote end hung up unexpectedly
+ok 7 - fetch gzipped truncated
 
 expecting success: 
-		compare_ws_file eol_native_crlf_false_attr_text_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 1402 - checkout attr=text ident aeol= core.autocrlf=false core.eol=native file=CRLF
+	test_env HTTP_CONTENT_ENCODING="gzip" test_http_env upload empty_body &&
+	! verify_http_result "200 OK"
 
-expecting success: 
-		compare_ws_file eol_native_crlf_false_attr_text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 1403 - checkout attr=text ident aeol= core.autocrlf=false core.eol=native file=CRLF_mix_LF
+fatal: request ended in the middle of the gzip stream
+fatal: the remote end hung up unexpectedly
+ok 8 - fetch gzipped empty
 
 expecting success: 
-		compare_ws_file eol_native_crlf_false_attr_text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 1404 - checkout attr=text ident aeol= core.autocrlf=false core.eol=native file=LF_mix_CR
+	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
 
-expecting success: 
-		compare_ws_file eol_native_crlf_false_attr_text_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 1405 - checkout attr=text ident aeol= core.autocrlf=false core.eol=native file=LF_nul
+Deleted branch newbranch (was d8aa3fa).
+ok 9 - push plain
 
 expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
-		test_cmp expect actual
-	
-ok 1406 - ls-files --eol attr=auto ident aeol= core.autocrlf=false core.eol=
+	test_http_env receive push_body.trunc &&
+	! verify_http_result "200 OK"
 
-expecting success: 
-		compare_ws_file eol__crlf_false_attr_auto_ LF    crlf_false_attr__LF.txt
-	
-ok 1407 - checkout attr=auto ident aeol= core.autocrlf=false core.eol= file=LF
+fatal: the remote end hung up unexpectedly
+ok 10 - push plain truncated
 
 expecting success: 
-		compare_ws_file eol__crlf_false_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 1408 - checkout attr=auto ident aeol= core.autocrlf=false core.eol= file=CRLF
+	test_http_env receive empty_body &&
+	! verify_http_result "200 OK"
 
-expecting success: 
-		compare_ws_file eol__crlf_false_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 1409 - checkout attr=auto ident aeol= core.autocrlf=false core.eol= file=CRLF_mix_LF
+fatal: the remote end hung up unexpectedly
+ok 11 - push plain empty
 
 expecting success: 
-		compare_ws_file eol__crlf_false_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 1410 - checkout attr=auto ident aeol= core.autocrlf=false core.eol= file=LF_mix_CR
+	test_when_finished "git branch -D newbranch" &&
+	test_env HTTP_CONTENT_ENCODING="gzip" test_http_env receive push_body.gz &&
+	verify_http_result "200 OK" &&
+	git rev-parse newbranch >act.head &&
+	echo "$hash_next" >exp.head &&
+	test_cmp act.head exp.head
 
-expecting success: 
-		compare_ws_file eol__crlf_false_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 1411 - checkout attr=auto ident aeol= core.autocrlf=false core.eol= file=LF_nul
+Deleted branch newbranch (was d8aa3fa).
+ok 12 - push gzipped
 
 expecting success: 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* |
-		sed -e "s/	/ /g" -e "s/  */ /g" |
-		sort >actual &&
-		test_cmp expect actual
-	
-ok 1412 - ls-files --eol attr=auto ident aeol= core.autocrlf=false core.eol=native
+	test_env HTTP_CONTENT_ENCODING="gzip" test_http_env receive push_body.gz.trunc &&
+	! verify_http_result "200 OK"
 
-expecting success: 
-		compare_ws_file eol_native_crlf_false_attr_auto_ LF    crlf_false_attr__LF.txt
-	
-ok 1413 - checkout attr=auto ident aeol= core.autocrlf=false core.eol=native file=LF
+fatal: request ended in the middle of the gzip stream
+fatal: the remote end hung up unexpectedly
+ok 13 - push gzipped truncated
 
 expecting success: 
-		compare_ws_file eol_native_crlf_false_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 1414 - checkout attr=auto ident aeol= core.autocrlf=false core.eol=native file=CRLF
+	test_env HTTP_CONTENT_ENCODING="gzip" test_http_env receive empty_body &&
+	! verify_http_result "200 OK"
 
-expecting success: 
-		compare_ws_file eol_native_crlf_false_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 1415 - checkout attr=auto ident aeol= core.autocrlf=false core.eol=native file=CRLF_mix_LF
+fatal: request ended in the middle of the gzip stream
+fatal: the remote end hung up unexpectedly
+ok 14 - push gzipped empty
 
 expecting success: 
-		compare_ws_file eol_native_crlf_false_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 1416 - checkout attr=auto ident aeol= core.autocrlf=false core.eol=native file=LF_mix_CR
+	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/zero >/dev/null 2>err &&
+	grep "fatal:.*CONTENT_LENGTH" err
 
-expecting success: 
-		compare_ws_file eol_native_crlf_false_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 1417 - checkout attr=auto ident aeol= core.autocrlf=false core.eol=native file=LF_nul
+fatal: failed to parse CONTENT_LENGTH: 9223372036854775808
+ok 15 - CONTENT_LENGTH overflow ssite_t
 
 expecting success: 
-	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 |
-	sed -e "s!attr/[^	]*!!g" -e "s/	/ /g" -e "s/  */ /g" |
-	sort >actual &&
-	test_cmp expect actual
+	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 2>act.err &&
+	verify_http_result "200 OK"
 
-ok 1418 - ls-files --eol -d -z
+ok 16 - empty CONTENT_LENGTH
 
-# passed all 1418 test(s)
-1..1418
+# passed all 16 test(s)
+1..16
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
 *** t5573-pull-verify-signatures.sh ***
@@ -193050,6 +192911,421 @@
 1..8
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
+*** t5580-clone-push-unc.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5580-clone-push-unc/.git/
+1..0 # SKIP skipping Windows-only path tests
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t5543-atomic-push.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5543-atomic-push/.git/
+expecting success: 
+	mk_repo_pair &&
+	(
+		cd workbench &&
+		test_commit one &&
+		git push --mirror up &&
+		test_commit two &&
+		git push --atomic up master
+	) &&
+	test_refs master master
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5543-atomic-push/upstream/.git/
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5543-atomic-push/workbench/.git/
+[master (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]      master -> master
+ * [new tag]         one -> one
+[master 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  master -> master
+ok 1 - atomic push works for a single branch
+
+expecting success: 
+	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 master second
+	) &&
+	test_refs master master &&
+	test_refs second second
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5543-atomic-push/upstream/.git/
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5543-atomic-push/workbench/.git/
+[master (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]      master -> master
+ * [new branch]      second -> second
+ * [new tag]         one -> one
+[master 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  master -> master
+   d79ce16..897c206  second -> second
+ok 2 - atomic push works for two branches
+
+expecting success: 
+	mk_repo_pair &&
+	(
+		cd workbench &&
+		test_commit one &&
+		git checkout -b second &&
+		test_commit two &&
+		git push --atomic --mirror up
+	) &&
+	test_refs master master &&
+	test_refs second second
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5543-atomic-push/upstream/.git/
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5543-atomic-push/workbench/.git/
+[master (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]      master -> master
+ * [new branch]      second -> second
+ * [new tag]         one -> one
+ * [new tag]         two -> two
+ok 3 - atomic push works in combination with --mirror
+
+expecting success: 
+	mk_repo_pair &&
+	(
+		cd workbench &&
+		test_commit one &&
+		git branch second master &&
+		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 master &&
+		test_commit three_a &&
+		git checkout second &&
+		git reset --hard HEAD^ &&
+		git push --force --atomic up master second
+	) &&
+	test_refs master master &&
+	test_refs second second
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5543-atomic-push/upstream/.git/
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5543-atomic-push/workbench/.git/
+[master (root-commit) d79ce16] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+[master 0fd3f08] two_a
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two_a.t
+Switched to branch 'second'
+[second 476acd6] two_b
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two_b.t
+[second 04c72ee] three_b
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 three_b.t
+[second f7b7ae4] four
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 four.t
+remote: warning: updating the current branch        
+To ../upstream
+ * [new branch]      master -> master
+ * [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 'master'
+[master 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  master -> master
+ + f7b7ae4...04c72ee second -> second (forced update)
+ok 4 - atomic push works in combination with --force
+
+expecting success: 
+	mk_repo_pair &&
+	(
+		cd workbench &&
+		test_commit one &&
+		git checkout -b second master &&
+		test_commit two &&
+		test_commit three &&
+		test_commit four &&
+		git push --mirror up &&
+		git reset --hard HEAD~2 &&
+		test_commit five &&
+		git checkout master &&
+		test_commit six &&
+		test_must_fail git push --atomic --all up
+	) &&
+	test_refs master HEAD@{7} &&
+	test_refs second HEAD@{4}
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5543-atomic-push/upstream/.git/
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5543-atomic-push/workbench/.git/
+[master (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]      master -> master
+ * [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 'master'
+[master 29c9ea2] six
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 six.t
+error: atomic push failed for ref refs/heads/second. status: 2
+
+fatal: the remote end hung up unexpectedly
+To ../upstream
+ ! [rejected]        master -> master (atomic push failed)
+ ! [rejected]        second -> second (non-fast-forward)
+error: failed to push some refs to '../upstream'
+hint: Updates were rejected because a pushed branch tip is behind its remote
+hint: counterpart. Check out this branch and integrate the remote changes
+hint: (e.g. 'git pull ...') before pushing again.
+hint: See the 'Note about fast-forwards' in 'git push --help' for details.
+ok 5 - atomic push fails if one branch fails
+
+expecting success: 
+	# prepare the repo
+	mk_repo_pair &&
+	(
+		cd workbench &&
+		test_commit one &&
+		git checkout -b second master &&
+		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 master &&
+		test_commit three &&
+		git checkout second &&
+		test_commit four &&
+		git tag test_tag &&
+		test_must_fail git push --tags --atomic up master second
+	) &&
+	test_refs master HEAD@{3} &&
+	test_refs second HEAD@{1}
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5543-atomic-push/upstream/.git/
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5543-atomic-push/workbench/.git/
+[master (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]      master -> master
+ * [new branch]      second -> second
+ * [new tag]         one -> one
+ * [new tag]         two -> two
+Switched to branch 'second'
+Switched to branch 'master'
+[master 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
+
+fatal: the remote end hung up unexpectedly
+To ../upstream
+ ! [rejected]        master -> master (atomic push failed)
+ ! [rejected]        second -> second (atomic push failed)
+ ! [rejected]        test_tag -> test_tag (already exists)
+error: failed to push some refs to '../upstream'
+hint: Updates were rejected because the tag already exists in the remote.
+ok 6 - atomic push fails if one tag fails remotely
+
+expecting success: 
+	mk_repo_pair &&
+	(
+		cd workbench &&
+		test_commit one &&
+		git checkout -b second master &&
+		test_commit two &&
+		git push --mirror up
+	) &&
+	(
+		cd upstream &&
+		HOOKDIR="$(git rev-parse --git-dir)/hooks" &&
+		HOOK="$HOOKDIR/update" &&
+		mkdir -p "$HOOKDIR" &&
+		write_script "$HOOK" <<-\EOF
+			# only allow update to master from now on
+			test "$1" = "refs/heads/master"
+		EOF
+	) &&
+	(
+		cd workbench &&
+		git checkout master &&
+		test_commit three &&
+		git checkout second &&
+		test_commit four &&
+		test_must_fail git push --atomic up master second
+	) &&
+	test_refs master HEAD@{3} &&
+	test_refs second HEAD@{1}
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5543-atomic-push/upstream/.git/
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5543-atomic-push/workbench/.git/
+[master (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]      master -> master
+ * [new branch]      second -> second
+ * [new tag]         one -> one
+ * [new tag]         two -> two
+Switched to branch 'master'
+[master 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] master -> master (atomic push failure)
+ ! [remote rejected] second -> second (hook declined)
+error: failed to push some refs to '../upstream'
+ok 7 - atomic push obeys update hook preventing a branch to be pushed
+
+expecting success: 
+	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 master
+	) &&
+	test_refs master HEAD@{1}
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5543-atomic-push/upstream/.git/
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5543-atomic-push/workbench/.git/
+[master (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]      master -> master
+ * [new tag]         one -> one
+[master 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
+
+# passed all 8 test(s)
+1..8
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
 *** t5560-http-backend-noserver.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5560-http-backend-noserver/.git/
 expecting success: 
@@ -193079,18 +193355,18 @@
 	PACK_URL=$(find_file objects/pack/*.pack) &&
 	IDX_URL=$(find_file objects/pack/*.idx)
 
-[master (root-commit) 48bb4b8] one
+[master (root-commit) 1193028] one
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 file
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5560-http-backend-noserver/repo.git/
 To /build/git-2.20.1/t/trash directory.t5560-http-backend-noserver/repo.git
  * [new branch]      master -> master
-[master 7687cb2] two
+[master fff5ea7] two
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 To /build/git-2.20.1/t/trash directory.t5560-http-backend-noserver/repo.git
-   48bb4b8..7687cb2  master -> master
+   1193028..fff5ea7  master -> master
 ok 1 - setup repository
 
 expecting success: 
@@ -193180,36 +193456,36 @@
 	expect_aliased 1 /etc/./passwd &&
 	expect_aliased 1 //domain/data.txt
 
---- exp.err	2021-12-03 05:08:45.709617374 +0000
-+++ act.err	2021-12-03 05:08:45.697617722 +0000
+--- exp.err	2023-01-05 11:49:20.006868030 +0000
++++ act.err	2023-01-05 11:49:19.998868030 +0000
 @@ -1 +0,0 @@
 -fatal: '/repo.git/../HEAD': aliased
---- exp.err	2021-12-03 05:08:45.729616793 +0000
-+++ act.err	2021-12-03 05:08:45.725616909 +0000
+--- exp.err	2023-01-05 11:49:20.022868030 +0000
++++ act.err	2023-01-05 11:49:20.018868030 +0000
 @@ -1 +1 @@
 -fatal: '/../etc/passwd': aliased
 +Request not supported: '/build/git-2.20.1/t/trash directory.t5560-http-backend-noserver//../etc/passwd'
 \ No newline at end of file
---- exp.err	2021-12-03 05:08:45.749616211 +0000
-+++ act.err	2021-12-03 05:08:45.749616211 +0000
+--- exp.err	2023-01-05 11:49:20.038868030 +0000
++++ act.err	2023-01-05 11:49:20.034868030 +0000
 @@ -1 +1 @@
 -fatal: '../etc/passwd': aliased
 +Request not supported: '/build/git-2.20.1/t/trash directory.t5560-http-backend-noserver/../etc/passwd'
 \ No newline at end of file
---- exp.err	2021-12-03 05:08:45.781615281 +0000
-+++ act.err	2021-12-03 05:08:45.777615398 +0000
+--- exp.err	2023-01-05 11:49:20.054868030 +0000
++++ act.err	2023-01-05 11:49:20.050868030 +0000
 @@ -1 +1 @@
 -fatal: '/etc//passwd': aliased
 +Request not supported: '/build/git-2.20.1/t/trash directory.t5560-http-backend-noserver//etc//passwd'
 \ No newline at end of file
---- exp.err	2021-12-03 05:08:45.805614584 +0000
-+++ act.err	2021-12-03 05:08:45.801614700 +0000
+--- exp.err	2023-01-05 11:49:20.066868030 +0000
++++ act.err	2023-01-05 11:49:20.062868030 +0000
 @@ -1 +1 @@
 -fatal: '/etc/./passwd': aliased
 +Request not supported: '/build/git-2.20.1/t/trash directory.t5560-http-backend-noserver//etc/./passwd'
 \ No newline at end of file
---- exp.err	2021-12-03 05:08:45.825614002 +0000
-+++ act.err	2021-12-03 05:08:45.821614119 +0000
+--- exp.err	2023-01-05 11:49:20.086868030 +0000
++++ act.err	2023-01-05 11:49:20.086868030 +0000
 @@ -1 +1 @@
 -fatal: '//domain/data.txt': aliased
 +Request not supported: '/build/git-2.20.1/t/trash directory.t5560-http-backend-noserver///domain/data.txt'
@@ -193220,1762 +193496,145 @@
 1..14
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t5580-clone-push-unc.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5580-clone-push-unc/.git/
-1..0 # SKIP skipping Windows-only path tests
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t5531-deep-submodule-push.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5531-deep-submodule-push/.git/
+*** t5602-clone-remote-exec.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5602-clone-remote-exec/.git/
 expecting success: 
-	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"
-	)
+	echo "#!/bin/sh" > not_ssh &&
+	echo "echo \"\$*\" > not_ssh_output" >> not_ssh &&
+	echo "exit 1" >> not_ssh &&
+	chmod +x not_ssh
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5531-deep-submodule-push/pub.git/
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5531-deep-submodule-push/work/.git/
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5531-deep-submodule-push/work/gar/bage/.git/
-[master (root-commit) dd484b2] 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.
-[master (root-commit) 45986a8] Initial superproject
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 160000 gar/bage
 ok 1 - setup
 
 expecting success: 
-	(
-		cd work &&
-		git push ../pub.git master
-	)
-
-To ../pub.git
- * [new branch]      master -> master
-ok 2 - push works with recorded gitlink
+	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
 
-expecting success: 
-	(
-		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 master
-	)
+Cloning into 'junk'...
+fatal: Could not read from remote repository.
 
-[master 1d64c27] Second junk
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 junk2
-[master 292b072] Second commit for gar/bage
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-To ../pub.git
-   45986a8..292b072  master -> master
-ok 3 - push if submodule has no remote
+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: 
-	(
-		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 master &&
-
-		# ...or if specified in the configuration..
-		test_must_fail git -c push.recurseSubmodules=check push ../pub.git master
-	)
-
-Cloning into bare repository '../../submodule.git'...
-done.
-From ../../../submodule
- * [new branch]      master     -> origin/master
-[master 453f787] Third junk
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 junk3
-[master f7735a9] Third commit for gar/bage
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-The following submodule paths contain changes that can
-not be found on any remote:
-  gar/bage
-
-Please try
-
-	git push --recurse-submodules=on-demand
-
-or cd to the path and use
-
-	git push
+	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
 
-to push them to a remote.
+Cloning into 'junk'...
+fatal: Could not read from remote repository.
 
-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 make sure you have the correct access rights
+and the repository exists.
+ok 3 - clone calls specified git upload-pack with -u option
 
-Please try
+# passed all 3 test(s)
+1..3
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t5571-pre-push-hook.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5571-pre-push-hook/.git/
+expecting success: 
+	git config push.default upstream &&
+	git init --bare repo1 &&
+	git remote add parent1 repo1 &&
+	test_commit one &&
+	git push parent1 HEAD:foreign
 
-	git push --recurse-submodules=on-demand
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5571-pre-push-hook/repo1/
+[master (root-commit) d79ce16] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+To repo1
+ * [new branch]      HEAD -> foreign
+ok 1 - setup
 
-or cd to the path and use
+expecting success: 
+	test_commit two &&
+	test_must_fail git push parent1 HEAD
 
-	git push
+[master 139b20d] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+error: failed to push some refs to 'repo1'
+ok 2 - push with failing hook
 
-to push them to a remote.
+expecting success: 
+	git push --no-verify parent1 HEAD
 
-fatal: Aborting.
-fatal: the remote end hung up unexpectedly
-ok 4 - push fails if submodule commit not on remote
+To repo1
+ * [new branch]      HEAD -> master
+ok 3 - --no-verify bypasses hook
 
 expecting success: 
-	(
-		cd work/gar/bage &&
-		git push origin master
-	) &&
-	(
-		cd work &&
-		git push --recurse-submodules=check ../pub.git master
-	)
+	git push parent1 master:foreign &&
+	diff expected actual
 
-To ../../../submodule.git
-   1d64c27..453f787  master -> master
-To ../pub.git
-   292b072..f7735a9  master -> master
-ok 5 - push succeeds after commit was pushed to remote
+To repo1
+   d79ce16..139b20d  master -> foreign
+ok 4 - push with hook
 
 expecting success: 
-	(
-		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 master &&
-		# Check that the supermodule commit got there
-		git fetch ../pub.git &&
-		git diff --quiet FETCH_HEAD master &&
-		# Check that the submodule commit got there too
-		cd gar/bage &&
-		git diff --quiet origin/master master
-	)
+	git checkout -b other parent1/foreign &&
+	test_commit three
 
-[master 6a15a69] 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
-[master edb42bc] Recurse on-demand on command line for gar/bage
+Switched to a new branch 'other'
+Branch 'other' set up to track remote branch 'foreign' from 'parent1'.
+[other 7c7cd71] three
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Pushing submodule 'gar/bage'
-To ../../../submodule.git
-   453f787..6a15a69  master -> master
-To ../pub.git
-   f7735a9..edb42bc  master -> master
-From ../pub
- * branch            HEAD       -> FETCH_HEAD
-ok 6 - push succeeds if submodule commit not on remote but using on-demand on command line
+ 1 file changed, 1 insertion(+)
+ create mode 100644 three.t
+ok 5 - add a branch
 
 expecting success: 
-	(
-		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 master &&
-		# Check that the supermodule commit got there
-		git fetch ../pub.git &&
-		git diff --quiet FETCH_HEAD master &&
-		# Check that the submodule commit got there too
-		cd gar/bage &&
-		git diff --quiet origin/master master
-	)
+	git push &&
+	diff expected actual
 
-[master edaaef8] 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
-[master a658d01] 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
-   6a15a69..edaaef8  master -> master
-To ../pub.git
-   edb42bc..a658d01  master -> master
-From ../pub
- * branch            HEAD       -> FETCH_HEAD
-ok 7 - push succeeds if submodule commit not on remote but using on-demand from config
+To repo1
+   139b20d..7c7cd71  other -> foreign
+ok 6 - push to default
 
 expecting success: 
-	(
-		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 master &&
-		# Check that the supermodule commit got there
-		git fetch ../pub.git &&
-		git diff --quiet FETCH_HEAD master &&
-		# Check that the submodule commit got there too
-		cd gar/bage &&
-		git diff --quiet origin/master master
-	)
+	git push parent1 one:tag1 HEAD~:refs/heads/prev &&
+	diff expected actual
 
-[master 6bb567f] 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
-[master c34f2ed] 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
-   edaaef8..6bb567f  master -> master
-To ../pub.git
-   a658d01..c34f2ed  master -> master
-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
+To repo1
+ * [new tag]         one -> tag1
+ * [new branch]      HEAD~ -> prev
+ok 7 - push non-branches
 
 expecting success: 
-	(
-		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" &&
+	git push parent1 :prev &&
+	diff expected actual
 
-		# Ensure that we can override on-demand in the config
-		# to just check submodules
-		test_must_fail git -c push.recurseSubmodules=on-demand push --recurse-submodules=check ../pub.git master &&
-		# Check that the supermodule commit did not get there
-		git fetch ../pub.git &&
-		git diff --quiet FETCH_HEAD master^ &&
-		# Check that the submodule commit did not get there
-		(cd gar/bage && git diff --quiet origin/master master^) &&
+To repo1
+ - [deleted]         prev
+ok 8 - push delete
 
-		# Ensure that we can override check in the config to
-		# disable submodule recursion entirely
-		(cd gar/bage && git diff --quiet origin/master master^) &&
-		git -c push.recurseSubmodules=on-demand push --recurse-submodules=no ../pub.git master &&
-		git fetch ../pub.git &&
-		git diff --quiet FETCH_HEAD master &&
-		(cd gar/bage && git diff --quiet origin/master master^) &&
+expecting success: 
+	git push repo1 HEAD &&
+	diff expected actual
 
-		# 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 master &&
-		git fetch ../pub.git &&
-		git diff --quiet FETCH_HEAD master &&
-		(cd gar/bage && git diff --quiet origin/master master^) &&
+To repo1
+ * [new branch]      HEAD -> other
+ok 9 - push to URL
 
-		# 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 master &&
-		git fetch ../pub.git &&
-		git diff --quiet FETCH_HEAD master &&
-		(cd gar/bage && git diff --quiet origin/master master)
-	)
+expecting success: 
+	{
+		nr=1000
+		while test $nr -lt 2000
+		do
+			nr=$(( $nr + 1 ))
+			echo "create refs/heads/b/$nr $COMMIT3"
+		done
+	} | git update-ref --stdin
 
-[master 2fe82e9] 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
-[master 81d0dce] Recurse on command-line overriding config for gar/bage
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-The following submodule paths contain changes that can
-not be found on any remote:
-  gar/bage
-
-Please try
-
-	git push --recurse-submodules=on-demand
-
-or cd to the path and use
-
-	git push
-
-to push them to a remote.
-
-fatal: Aborting.
-fatal: the remote end hung up unexpectedly
-From ../pub
- * branch            HEAD       -> FETCH_HEAD
-To ../pub.git
-   c34f2ed..81d0dce  master -> master
-From ../pub
- * branch            HEAD       -> FETCH_HEAD
-Everything up-to-date
-From ../pub
- * branch            HEAD       -> FETCH_HEAD
-Pushing submodule 'gar/bage'
-To ../../../submodule.git
-   6bb567f..2fe82e9  master -> master
-Everything up-to-date
-From ../pub
- * branch            HEAD       -> FETCH_HEAD
-ok 9 - push recurse-submodules on command line overrides config
-
-expecting success: 
-	(
-		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 master &&
-		# Check that the supermodule commit did not get there
-		git fetch ../pub.git &&
-		git diff --quiet FETCH_HEAD master^ &&
-		# Check that the submodule commit did not get there
-		(cd gar/bage && git diff --quiet origin/master master^) &&
-
-		# should result in "no"
-		git push --recurse-submodules=on-demand --recurse-submodules=no ../pub.git master &&
-		# Check that the supermodule commit did get there
-		git fetch ../pub.git &&
-		git diff --quiet FETCH_HEAD master &&
-		# Check that the submodule commit did not get there
-		(cd gar/bage && git diff --quiet origin/master master^) &&
-
-		# should result in "no"
-		git push --recurse-submodules=on-demand --no-recurse-submodules ../pub.git master &&
-		# Check that the submodule commit did not get there
-		(cd gar/bage && git diff --quiet origin/master master^) &&
-
-		# But the options in the other order should push the submodule
-		git push --recurse-submodules=check --recurse-submodules=on-demand ../pub.git master &&
-		# Check that the submodule commit did get there
-		git fetch ../pub.git &&
-		(cd gar/bage && git diff --quiet origin/master master)
-	)
-
-[master e5331a6] 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
-[master 8cd56b7] Recurse on command-line overriding earlier command-line for gar/bage
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-The following submodule paths contain changes that can
-not be found on any remote:
-  gar/bage
-
-Please try
-
-	git push --recurse-submodules=on-demand
-
-or cd to the path and use
-
-	git push
-
-to push them to a remote.
-
-fatal: Aborting.
-fatal: the remote end hung up unexpectedly
-From ../pub
- * branch            HEAD       -> FETCH_HEAD
-To ../pub.git
-   81d0dce..8cd56b7  master -> master
-From ../pub
- * branch            HEAD       -> FETCH_HEAD
-Everything up-to-date
-Pushing submodule 'gar/bage'
-To ../../../submodule.git
-   2fe82e9..e5331a6  master -> master
-Everything up-to-date
-From ../pub
- * branch            HEAD       -> FETCH_HEAD
-ok 10 - push recurse-submodules last one wins on command line
-
-expecting success: 
-	(
-		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 master &&
-		# Check that the supermodule commit got there
-		git fetch ../pub.git &&
-		git diff --quiet FETCH_HEAD master &&
-		# Check that the submodule commit got there
-		cd gar/bage &&
-		git diff --quiet origin/master master
-	)
-
-[master a9f6c31] 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
-[master 81cc59a] Recurse on-demand on command-line overriding config for gar/bage
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Pushing submodule 'gar/bage'
-To ../../../submodule.git
-   e5331a6..a9f6c31  master -> master
-To ../pub.git
-   8cd56b7..81cc59a  master -> master
-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: 
-	(
-		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 master &&
-		# Check that the supermodule commit got there
-		git fetch ../pub.git &&
-		git diff --quiet FETCH_HEAD master &&
-		# But that the submodule commit did not
-		( cd gar/bage && git diff --quiet origin/master master^ ) &&
-		# Now push it to avoid confusing future tests
-		git push --recurse-submodules=on-demand ../pub.git master
-	)
-
-[master 8930ec8] 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
-[master f19343b] Recurse disable on command-line overriding config for gar/bage
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-To ../pub.git
-   81cc59a..f19343b  master -> master
-From ../pub
- * branch            HEAD       -> FETCH_HEAD
-Pushing submodule 'gar/bage'
-To ../../../submodule.git
-   a9f6c31..8930ec8  master -> master
-Everything up-to-date
-ok 12 - push succeeds if submodule commit disabling recursion from cmdline overriding config
-
-expecting success: 
-	(
-		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 master &&
-		# Check that the supermodule commit got there
-		git fetch ../pub.git &&
-		git diff --quiet FETCH_HEAD master &&
-		# But that the submodule commit did not
-		( cd gar/bage && git diff --quiet origin/master master^ ) &&
-		# Now push it to avoid confusing future tests
-		git push --recurse-submodules=on-demand ../pub.git master
-	)
-
-[master 8ae60d7] 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
-[master b491286] Recurse disable on command-line alternative overriding config for gar/bage
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-To ../pub.git
-   f19343b..b491286  master -> master
-From ../pub
- * branch            HEAD       -> FETCH_HEAD
-Pushing submodule 'gar/bage'
-To ../../../submodule.git
-   8930ec8..8ae60d7  master -> master
-Everything up-to-date
-ok 13 - push succeeds if submodule commit disabling recursion from cmdline (alternative form) overriding config
-
-expecting success: 
-	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 master 2>err &&
-	test_i18ngrep "is a tag, not a commit" err
-
-[master fd7fd7c] bad commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-fatal: submodule entry 'gar/bage' (7d29585980c7948c6159a2272431b4377822ccdd) is a tag, not a commit
-HEAD is now at b491286 Recurse disable on command-line alternative overriding config for gar/bage
-ok 14 - submodule entry pointing at a tag is error
-
-expecting success: 
-	(
-		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 master &&
-		test_must_fail git -c push.recurseSubmodules=yes push ../pub.git master &&
-		git push --recurse-submodules=on-demand ../pub.git master
-	)
-
-[master 05cc3ef] 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
-[master c9f85f5] 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
-   8ae60d7..05cc3ef  master -> master
-To ../pub.git
-   b491286..c9f85f5  master -> master
-ok 15 - push fails if recurse submodules option passed as yes
-
-expecting success: 
-	(
-		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
-	)
-
-[master 70e7d04] Fourth junk
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 junk4
-[master 2063c12] Fourth commit for gar/bage
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to branch 'branch2'
-M	gar/bage
-Note: checking out '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 performing another checkout.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
-
-  git checkout -b <new-branch-name>
-
-HEAD is now at 05cc3ef Recurse push fails if recurse submodules option passed as yes
-[branch2 dcd0bef] First junk
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 junk1
-The following submodule paths contain changes that can
-not be found on any remote:
-  gar/bage
-
-Please try
-
-	git push --recurse-submodules=on-demand
-
-or cd to the path and use
-
-	git push
-
-to push them to a remote.
-
-fatal: Aborting.
-fatal: the remote end hung up unexpectedly
-ok 16 - push fails when commit on multiple branches if one branch has no remote
-
-expecting success: 
-	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-submodule=check origin master
-	)
-
-Initialized empty Git repository in /build/git-2.20.1/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/git-2.20.1/t/trash directory.t5531-deep-submodule-push/a1/b/.git/
-[master (root-commit) c8996b0] 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.
-[master (root-commit) f9f292d] added submodule
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 160000 b
-To /build/git-2.20.1/t/trash directory.t5531-deep-submodule-push/a
- * [new branch]      master -> master
-ok 17 - push succeeds if submodule has no remote and is on the first superproject commit
-
-expecting success: 
-	(
-		cd work &&
-		(
-			cd gar/bage &&
-			git checkout master &&
-			>junk5 &&
-			git add junk5 &&
-			git commit -m "Fifth junk" &&
-			git push &&
-			git rev-parse origin/master >../../../expected
-		) &&
-		git checkout master &&
-		git add gar/bage &&
-		git commit -m "Fifth commit for gar/bage" &&
-		git push --recurse-submodules=on-demand ../pub.git master
-	) &&
-	(
-		cd submodule.git &&
-		git rev-parse master >../actual
-	) &&
-	test_cmp expected actual
-
-Previous HEAD position was 05cc3ef Recurse push fails if recurse submodules option passed as yes
-Switched to branch 'master'
-[master b114b03] Fifth junk
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 junk5
-To ../../../submodule.git
-   05cc3ef..b114b03  master -> master
-Switched to branch 'master'
-M	gar/bage
-[master 738aebc] Fifth commit for gar/bage
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-To ../pub.git
-   c9f85f5..738aebc  master -> master
-ok 18 - push unpushed submodules when not needed
-
-expecting success: 
-	(
-		cd submodule.git &&
-		git rev-parse master >../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 master
-	) &&
-	(
-		cd submodule.git &&
-		git rev-parse master >../actual
-	) &&
-	test_cmp expected actual
-
-[master 9da7ce0] Sixth junk
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 junk6
-[master 3ae0d25] Second junk for work
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 junk2
-To ../pub.git
-   738aebc..3ae0d25  master -> master
-ok 19 - push unpushed submodules when not needed 2
-
-expecting success: 
-	(
-		cd work &&
-		(
-			cd gar/bage &&
-			git checkout master &&
-			> junk7 &&
-			git add junk7 &&
-			git commit -m "Seventh junk" &&
-			git rev-parse master >../../../expected
-		) &&
-		git checkout master &&
-		git add gar/bage &&
-		git commit -m "Seventh commit for gar/bage" &&
-		git push --recurse-submodules=on-demand ../pub.git master
-	) &&
-	(
-		cd submodule.git &&
-		git rev-parse master >../actual
-	) &&
-	test_cmp expected actual
-
-Already on 'master'
-[master 1fe17e2] Seventh junk
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 junk7
-Already on 'master'
-M	gar/bage
-[master 960ff13] 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
-   b114b03..1fe17e2  master -> master
-To ../pub.git
-   3ae0d25..960ff13  master -> master
-ok 20 - push unpushed submodules recursively
-
-expecting success: 
-	(
-		cd work &&
-		(
-			cd gar/bage &&
-			git rev-parse origin/master >../../../expected &&
-			git checkout master~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 master
-	) &&
-	(
-		cd submodule.git &&
-		git rev-parse master >../actual
-	) &&
-	test_when_finished git -C work reset --hard master^ &&
-	test_cmp expected actual
-
-Note: checking out 'master~0'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by performing another checkout.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
-
-  git checkout -b <new-branch-name>
-
-HEAD is now at 1fe17e2 Seventh junk
-[detached HEAD 46cc576] Eighth junk
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 junk8
-[master 77393ac] Eighth commit for gar/bage
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Pushing submodule 'gar/bage'
-Everything up-to-date
-The following submodule paths contain changes that can
-not be found on any remote:
-  gar/bage
-
-Please try
-
-	git push --recurse-submodules=on-demand
-
-or cd to the path and use
-
-	git push
-
-to push them to a remote.
-
-fatal: Aborting.
-fatal: the remote end hung up unexpectedly
-HEAD is now at 960ff13 Seventh commit for gar/bage
-ok 21 - push unpushable submodule recursively fails
-
-expecting success: 
-	(
-		cd work/gar/bage &&
-		git checkout master &&
-		git rev-parse master >../../../expected_submodule &&
-		> junk9 &&
-		git add junk9 &&
-		git commit -m "Ninth junk" &&
-
-		# Go up to work directory
-		cd ../.. &&
-		git checkout master &&
-		git rev-parse master >../expected_pub &&
-		git add gar/bage &&
-		git commit -m "Ninth commit for gar/bage" &&
-		git push --dry-run --recurse-submodules=on-demand ../pub.git master
-	) &&
-	git -C submodule.git rev-parse master >actual_submodule &&
-	git -C pub.git rev-parse master >actual_pub &&
-	test_cmp expected_pub actual_pub &&
-	test_cmp expected_submodule actual_submodule
-
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  46cc576 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> 46cc576
-
-Switched to branch 'master'
-[master e743754] Ninth junk
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 junk9
-Already on 'master'
-M	gar/bage
-[master 99e97ed] 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
-   1fe17e2..e743754  master -> master
-To ../pub.git
-   960ff13..99e97ed  master -> master
-ok 22 - push --dry-run does not recursively update submodules
-
-expecting success: 
-	git -C work push --dry-run --recurse-submodules=only ../pub.git master &&
-
-	git -C submodule.git rev-parse master >actual_submodule &&
-	git -C pub.git rev-parse master >actual_pub &&
-	test_cmp expected_pub actual_pub &&
-	test_cmp expected_submodule actual_submodule
-
-Pushing submodule 'gar/bage'
-To ../../../submodule.git
-   1fe17e2..e743754  master -> master
-Everything up-to-date
-ok 23 - push --dry-run does not recursively update submodules
-
-expecting success: 
-	git -C work/gar/bage rev-parse master >expected_submodule &&
-	git -C pub.git rev-parse master >expected_pub &&
-
-	git -C work push --recurse-submodules=only ../pub.git master &&
-
-	git -C submodule.git rev-parse master >actual_submodule &&
-	git -C pub.git rev-parse master >actual_pub &&
-	test_cmp expected_submodule actual_submodule &&
-	test_cmp expected_pub actual_pub
-
-Pushing submodule 'gar/bage'
-To ../../../submodule.git
-   1fe17e2..e743754  master -> master
-Everything up-to-date
-ok 24 - push only unpushed submodules recursively
-
-expecting success: 
-	git -C work remote add origin ../pub.git &&
-	git -C work remote add pub ../pub.git &&
-
-	> work/gar/bage/junk10 &&
-	git -C work/gar/bage add junk10 &&
-	git -C work/gar/bage commit -m "Tenth junk" &&
-	git -C work add gar/bage &&
-	git -C work commit -m "Tenth junk added to gar/bage" &&
-
-	# Fails when submodule does not have a matching remote
-	test_must_fail git -C work push --recurse-submodules=on-demand pub master &&
-	# Succeeds when submodules has matching remote and refspec
-	git -C work push --recurse-submodules=on-demand origin master &&
-
-	git -C submodule.git rev-parse master >actual_submodule &&
-	git -C pub.git rev-parse master >actual_pub &&
-	git -C work/gar/bage rev-parse master >expected_submodule &&
-	git -C work rev-parse master >expected_pub &&
-	test_cmp expected_submodule actual_submodule &&
-	test_cmp expected_pub actual_pub
-
-[master b6a2315] Tenth junk
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 junk10
-[master 63d2e49] 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
-   e743754..b6a2315  master -> master
-To ../pub.git
-   960ff13..63d2e49  master -> master
-ok 25 - push propagating the remotes name to a submodule
-
-expecting success: 
-	> work/gar/bage/junk11 &&
-	git -C work/gar/bage add junk11 &&
-	git -C work/gar/bage commit -m "Eleventh junk" &&
-
-	git -C work checkout branch2 &&
-	git -C work add gar/bage &&
-	git -C work commit -m "updating gar/bage in branch2" &&
-
-	# Fails when submodule does not have a matching branch
-	test_must_fail git -C work push --recurse-submodules=on-demand origin branch2 &&
-	# Fails when refspec includes an object id
-	test_must_fail git -C work push --recurse-submodules=on-demand origin \
-		"$(git -C work rev-parse branch2):refs/heads/branch2" &&
-	# Fails when refspec includes HEAD and parent and submodule do not
-	# have the same named branch checked out
-	test_must_fail git -C work push --recurse-submodules=on-demand origin \
-		HEAD:refs/heads/branch2 &&
-
-	git -C work/gar/bage branch branch2 master &&
-	git -C work push --recurse-submodules=on-demand origin branch2 &&
-
-	git -C submodule.git rev-parse branch2 >actual_submodule &&
-	git -C pub.git rev-parse branch2 >actual_pub &&
-	git -C work/gar/bage rev-parse branch2 >expected_submodule &&
-	git -C work rev-parse branch2 >expected_pub &&
-	test_cmp expected_submodule actual_submodule &&
-	test_cmp expected_pub actual_pub
-
-[master f3cb483] 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 a141425] 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 'a141425e0dbd96f078321ef9aeec67ed8f4dbd60' 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 26 - push propagating refspec to a submodule
-
-expecting success: 
-	git -C work/gar/bage checkout branch2 &&
-	> work/gar/bage/junk12 &&
-	git -C work/gar/bage add junk12 &&
-	git -C work/gar/bage commit -m "Twelfth junk" &&
-
-	git -C work checkout branch2 &&
-	git -C work add gar/bage &&
-	git -C work commit -m "updating gar/bage in branch2" &&
-
-	# Passes since the superproject and submodules HEAD are both on branch2
-	git -C work push --recurse-submodules=on-demand origin \
-		HEAD:refs/heads/branch2 &&
-
-	git -C submodule.git rev-parse branch2 >actual_submodule &&
-	git -C pub.git rev-parse branch2 >actual_pub &&
-	git -C work/gar/bage rev-parse branch2 >expected_submodule &&
-	git -C work rev-parse branch2 >expected_pub &&
-	test_cmp expected_submodule actual_submodule &&
-	test_cmp expected_pub actual_pub
-
-Switched to branch 'branch2'
-[branch2 632f5dc] 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 7a60ce0] 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
-   f3cb483..632f5dc  HEAD -> branch2
-To ../pub.git
-   a141425..7a60ce0  HEAD -> branch2
-ok 27 - push propagating HEAD refspec to a submodule
-
-# passed all 27 test(s)
-1..27
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t5602-clone-remote-exec.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5602-clone-remote-exec/.git/
-expecting success: 
-	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: 
-	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: 
-	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/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t5545-push-options.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5545-push-options/.git/
-expecting success: 
-	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 master
-	) &&
-	test_refs master master &&
-	echo "asdf" >expect &&
-	test_cmp expect upstream/.git/hooks/pre-receive.push_options &&
-	test_cmp expect upstream/.git/hooks/post-receive.push_options
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5545-push-options/upstream/.git/
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5545-push-options/workbench/.git/
-[master (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]      master -> master
- * [new tag]         one -> one
-[master 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  master -> master
-ok 1 - one push option works for a single branch
-
-expecting success: 
-	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 master
-	) &&
-	test_refs master HEAD@{1}
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5545-push-options/upstream/.git/
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5545-push-options/workbench/.git/
-[master (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]      master -> master
- * [new tag]         one -> one
-[master 139b20d] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-fatal: the receiving end does not support push options
-fatal: the remote end hung up unexpectedly
-ok 2 - push option denied by remote
-
-expecting success: 
-	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 master
-	) &&
-	test_refs master master &&
-	printf "asdf\nmore structured text\n" >expect &&
-	test_cmp expect upstream/.git/hooks/pre-receive.push_options &&
-	test_cmp expect upstream/.git/hooks/post-receive.push_options
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5545-push-options/upstream/.git/
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5545-push-options/workbench/.git/
-[master (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]      master -> master
- * [new tag]         one -> one
-[master 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  master -> master
-ok 3 - two push options work
-
-expecting success: 
-	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 &&
-
-	git -C parent submodule add ../upstream workbench &&
-	git -C parent/workbench remote add up ../../upstream &&
-	git -C parent commit -m "add submoule" &&
-
-	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 master &&
-
-	git -C upstream rev-parse --verify master >expect &&
-	git -C parent/workbench rev-parse --verify master >actual &&
-	test_cmp expect actual &&
-
-	git -C parent_upstream rev-parse --verify master >expect &&
-	git -C parent rev-parse --verify master >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/git-2.20.1/t/trash directory.t5545-push-options/upstream/.git/
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5545-push-options/workbench/.git/
-[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/git-2.20.1/t/trash directory.t5545-push-options/parent/.git/
-[master (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]      master -> master
- * [new tag]         one -> one
-Cloning into '/build/git-2.20.1/t/trash directory.t5545-push-options/parent/workbench'...
-done.
-[master f3f0fa6] add submoule
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 workbench
-[master 8f1d4ef] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-[master 4bd3bdf] update workbench
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Pushing submodule 'workbench'
-remote: warning: updating the current branch        
-To ../../upstream
-   d79ce16..8f1d4ef  master -> master
-remote: warning: updating the current branch        
-To ../parent_upstream
-   b838542..4bd3bdf  master -> master
-ok 4 - push options and submodules
-
-expecting success: 
-	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 master
-	) &&
-	test_refs master master &&
-	echo "default" >expect &&
-	test_cmp expect upstream/.git/hooks/pre-receive.push_options &&
-	test_cmp expect upstream/.git/hooks/post-receive.push_options
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5545-push-options/upstream/.git/
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5545-push-options/workbench/.git/
-[master (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]      master -> master
- * [new tag]         one -> one
-[master 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  master -> master
-ok 5 - default push option
-
-expecting success: 
-	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 master
-	) &&
-	test_refs master master &&
-	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/git-2.20.1/t/trash directory.t5545-push-options/upstream/.git/
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5545-push-options/workbench/.git/
-[master (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]      master -> master
- * [new tag]         one -> one
-[master 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  master -> master
-ok 6 - two default push options
-
-expecting success: 
-	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 master
-	) &&
-	test_refs master master &&
-	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/git-2.20.1/t/trash directory.t5545-push-options/upstream/.git/
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5545-push-options/workbench/.git/
-[master (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]      master -> master
- * [new tag]         one -> one
-[master 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  master -> master
-ok 7 - push option from command line overrides from-config push option
-
-expecting success: 
-	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 master
-	) &&
-	test_refs master master &&
-	echo "default2" >expect &&
-	test_cmp expect upstream/.git/hooks/pre-receive.push_options &&
-	test_cmp expect upstream/.git/hooks/post-receive.push_options
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5545-push-options/upstream/.git/
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5545-push-options/workbench/.git/
-[master (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]      master -> master
- * [new tag]         one -> one
-[master 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  master -> master
-ok 8 - empty value of push.pushOption in config clears the list
-
-expecting success: 
-	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 master
-	) &&
-	test_refs master HEAD@{1}
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5545-push-options/upstream/.git/
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5545-push-options/workbench/.git/
-[master (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]      master -> master
- * [new tag]         one -> one
-[master 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: 
-	mk_repo_pair &&
-	git -C upstream config receive.advertisePushOptions true &&
-	test_commit -C workbench one &&
-	git -C workbench push --push-option="\"embedded quotes\"" up master &&
-	echo "\"embedded quotes\"" >expect &&
-	test_cmp expect upstream/.git/hooks/pre-receive.push_options
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5545-push-options/upstream/.git/
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5545-push-options/workbench/.git/
-[master (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]      master -> master
-ok 10 - push options keep quoted characters intact (direct)
-
-checking prerequisite: NOT_ROOT
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
-	uid=$(id -u) &&
-	test "$uid" != 0
-
-)
-prerequisite NOT_ROOT ok
-# passed all 10 test(s)
-# SKIP no web server found at '/usr/sbin/apache2'
-1..10
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t5600-clone-fail-cleanup.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5600-clone-fail-cleanup/.git/
-expecting success: 
-	test_must_fail git clone foo bar
-
-fatal: repository 'foo' does not exist
-ok 1 - clone of non-existent source should fail
-
-expecting success: 
-	test_path_is_missing bar
-
-ok 2 - failed clone should not leave a directory
-
-expecting success: 
-	test_create_repo foo
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5600-clone-fail-cleanup/foo/.git/
-ok 3 - create a repo to clone
-
-expecting success: 
-	test_commit -C foo file
-
-[master (root-commit) 4c1911f] file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file.t
-ok 4 - create objects in repo for later corruption
-
-expecting success: 
-	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: 
-	git clone foo bar
-
-Cloning into 'bar'...
-done.
-ok 6 - clone should work now that source exists
-
-expecting success: 
-	test_path_is_dir bar
-
-ok 7 - successful clone must leave the directory
-
-expecting success: 
-	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'...
-error: refs/heads/master does not point to a valid object!
-error: refs/tags/file does not point to a valid object!
-done.
-fatal: update_ref failed for ref 'HEAD': cannot update ref 'HEAD': trying to write ref 'HEAD' with nonexistent object 4c1911ffa61819af2268cf7c64ef8f9aa3c96d97
-fatal: the remote end hung up unexpectedly
-ok 8 - failed clone --separate-git-dir should not leave any directories
-
-expecting success: 
-	mkdir -p empty &&
-	corrupt_repo &&
-	test_must_fail git clone foo empty &&
-	test_dir_is_empty empty
-
-Cloning into 'empty'...
-error: refs/heads/master does not point to a valid object!
-error: refs/tags/file does not point to a valid object!
-done.
-fatal: update_ref failed for ref 'HEAD': cannot update ref 'HEAD': trying to write ref 'HEAD' with nonexistent object 4c1911ffa61819af2268cf7c64ef8f9aa3c96d97
-fatal: the remote end hung up unexpectedly
-ok 9 - failed clone into empty leaves directory (vanilla)
-
-expecting success: 
-	mkdir -p empty &&
-	corrupt_repo &&
-	test_must_fail git clone --bare foo empty &&
-	test_dir_is_empty empty
-
-Cloning into bare repository 'empty'...
-error: refs/heads/master does not point to a valid object!
-error: refs/tags/file does not point to a valid object!
-done.
-fatal: update_ref failed for ref 'HEAD': cannot update ref 'HEAD': trying to write ref 'HEAD' with nonexistent object 4c1911ffa61819af2268cf7c64ef8f9aa3c96d97
-fatal: the remote end hung up unexpectedly
-ok 10 - failed clone into empty leaves directory (bare)
-
-expecting success: 
-	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: 
-	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: 
-	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'...
-error: refs/heads/master does not point to a valid object!
-error: refs/tags/file does not point to a valid object!
-done.
-fatal: update_ref failed for ref 'HEAD': cannot update ref 'HEAD': trying to write ref 'HEAD' with nonexistent object 4c1911ffa61819af2268cf7c64ef8f9aa3c96d97
-fatal: the remote end hung up unexpectedly
-ok 13 - failed clone into empty leaves directory (separate, wt)
-
-# passed all 13 test(s)
-1..13
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t5571-pre-push-hook.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5571-pre-push-hook/.git/
-expecting success: 
-	git config push.default upstream &&
-	git init --bare repo1 &&
-	git remote add parent1 repo1 &&
-	test_commit one &&
-	git push parent1 HEAD:foreign
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5571-pre-push-hook/repo1/
-[master (root-commit) d79ce16] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-To repo1
- * [new branch]      HEAD -> foreign
-ok 1 - setup
-
-expecting success: 
-	test_commit two &&
-	test_must_fail git push parent1 HEAD
-
-[master 139b20d] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-error: failed to push some refs to 'repo1'
-ok 2 - push with failing hook
-
-expecting success: 
-	git push --no-verify parent1 HEAD
-
-To repo1
- * [new branch]      HEAD -> master
-ok 3 - --no-verify bypasses hook
-
-expecting success: 
-	git push parent1 master:foreign &&
-	diff expected actual
-
-To repo1
-   d79ce16..139b20d  master -> foreign
-ok 4 - push with hook
-
-expecting success: 
-	git checkout -b other parent1/foreign &&
-	test_commit three
-
-Switched to a new branch 'other'
-Branch 'other' set up to track remote branch 'foreign' from 'parent1'.
-[other 7c7cd71] three
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 three.t
-ok 5 - add a branch
-
-expecting success: 
-	git push &&
-	diff expected actual
-
-To repo1
-   139b20d..7c7cd71  other -> foreign
-ok 6 - push to default
-
-expecting success: 
-	git push parent1 one:tag1 HEAD~:refs/heads/prev &&
-	diff expected actual
-
-To repo1
- * [new tag]         one -> tag1
- * [new branch]      HEAD~ -> prev
-ok 7 - push non-branches
-
-expecting success: 
-	git push parent1 :prev &&
-	diff expected actual
-
-To repo1
- - [deleted]         prev
-ok 8 - push delete
-
-expecting success: 
-	git push repo1 HEAD &&
-	diff expected actual
-
-To repo1
- * [new branch]      HEAD -> other
-ok 9 - push to URL
-
-expecting success: 
-	{
-		nr=1000
-		while test $nr -lt 2000
-		do
-			nr=$(( $nr + 1 ))
-			echo "create refs/heads/b/$nr $COMMIT3"
-		done
-	} | git update-ref --stdin
-
-ok 10 - set up many-ref tests
+ok 10 - set up many-ref tests
 
 expecting success: 
 	echo "exit 0" | write_script "$HOOK" &&
@@ -195988,6 +194647,1241 @@
 1..11
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
+*** t5600-clone-fail-cleanup.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5600-clone-fail-cleanup/.git/
+expecting success: 
+	test_must_fail git clone foo bar
+
+fatal: repository 'foo' does not exist
+ok 1 - clone of non-existent source should fail
+
+expecting success: 
+	test_path_is_missing bar
+
+ok 2 - failed clone should not leave a directory
+
+expecting success: 
+	test_create_repo foo
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5600-clone-fail-cleanup/foo/.git/
+ok 3 - create a repo to clone
+
+expecting success: 
+	test_commit -C foo file
+
+[master (root-commit) 4c1911f] file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file.t
+ok 4 - create objects in repo for later corruption
+
+expecting success: 
+	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: 
+	git clone foo bar
+
+Cloning into 'bar'...
+done.
+ok 6 - clone should work now that source exists
+
+expecting success: 
+	test_path_is_dir bar
+
+ok 7 - successful clone must leave the directory
+
+expecting success: 
+	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'...
+error: refs/heads/master does not point to a valid object!
+error: refs/tags/file does not point to a valid object!
+done.
+fatal: update_ref failed for ref 'HEAD': cannot update ref 'HEAD': trying to write ref 'HEAD' with nonexistent object 4c1911ffa61819af2268cf7c64ef8f9aa3c96d97
+fatal: the remote end hung up unexpectedly
+ok 8 - failed clone --separate-git-dir should not leave any directories
+
+expecting success: 
+	mkdir -p empty &&
+	corrupt_repo &&
+	test_must_fail git clone foo empty &&
+	test_dir_is_empty empty
+
+Cloning into 'empty'...
+error: refs/heads/master does not point to a valid object!
+error: refs/tags/file does not point to a valid object!
+done.
+fatal: update_ref failed for ref 'HEAD': cannot update ref 'HEAD': trying to write ref 'HEAD' with nonexistent object 4c1911ffa61819af2268cf7c64ef8f9aa3c96d97
+fatal: the remote end hung up unexpectedly
+ok 9 - failed clone into empty leaves directory (vanilla)
+
+expecting success: 
+	mkdir -p empty &&
+	corrupt_repo &&
+	test_must_fail git clone --bare foo empty &&
+	test_dir_is_empty empty
+
+Cloning into bare repository 'empty'...
+error: refs/heads/master does not point to a valid object!
+error: refs/tags/file does not point to a valid object!
+done.
+fatal: update_ref failed for ref 'HEAD': cannot update ref 'HEAD': trying to write ref 'HEAD' with nonexistent object 4c1911ffa61819af2268cf7c64ef8f9aa3c96d97
+fatal: the remote end hung up unexpectedly
+ok 10 - failed clone into empty leaves directory (bare)
+
+expecting success: 
+	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: 
+	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: 
+	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'...
+error: refs/heads/master does not point to a valid object!
+error: refs/tags/file does not point to a valid object!
+done.
+fatal: update_ref failed for ref 'HEAD': cannot update ref 'HEAD': trying to write ref 'HEAD' with nonexistent object 4c1911ffa61819af2268cf7c64ef8f9aa3c96d97
+fatal: the remote end hung up unexpectedly
+ok 13 - failed clone into empty leaves directory (separate, wt)
+
+# passed all 13 test(s)
+1..13
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t5531-deep-submodule-push.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5531-deep-submodule-push/.git/
+expecting success: 
+	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/git-2.20.1/t/trash directory.t5531-deep-submodule-push/pub.git/
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5531-deep-submodule-push/work/.git/
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5531-deep-submodule-push/work/gar/bage/.git/
+[master (root-commit) 50f62ad] 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.
+[master (root-commit) d83dd6c] Initial superproject
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 160000 gar/bage
+ok 1 - setup
+
+expecting success: 
+	(
+		cd work &&
+		git push ../pub.git master
+	)
+
+To ../pub.git
+ * [new branch]      master -> master
+ok 2 - push works with recorded gitlink
+
+expecting success: 
+	(
+		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 master
+	)
+
+[master 55ef453] Second junk
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 junk2
+[master 7e68e2b] Second commit for gar/bage
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+To ../pub.git
+   d83dd6c..7e68e2b  master -> master
+ok 3 - push if submodule has no remote
+
+expecting success: 
+	(
+		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 master &&
+
+		# ...or if specified in the configuration..
+		test_must_fail git -c push.recurseSubmodules=check push ../pub.git master
+	)
+
+Cloning into bare repository '../../submodule.git'...
+done.
+From ../../../submodule
+ * [new branch]      master     -> origin/master
+[master 0142cc8] Third junk
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 junk3
+[master 1bcccaf] Third commit for gar/bage
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+The following submodule paths contain changes that can
+not be found on any remote:
+  gar/bage
+
+Please try
+
+	git push --recurse-submodules=on-demand
+
+or cd to the path and use
+
+	git push
+
+to push them to a remote.
+
+fatal: Aborting.
+fatal: the remote end hung up unexpectedly
+The following submodule paths contain changes that can
+not be found on any remote:
+  gar/bage
+
+Please try
+
+	git push --recurse-submodules=on-demand
+
+or cd to the path and use
+
+	git push
+
+to push them to a remote.
+
+fatal: Aborting.
+fatal: the remote end hung up unexpectedly
+ok 4 - push fails if submodule commit not on remote
+
+expecting success: 
+	(
+		cd work/gar/bage &&
+		git push origin master
+	) &&
+	(
+		cd work &&
+		git push --recurse-submodules=check ../pub.git master
+	)
+
+To ../../../submodule.git
+   55ef453..0142cc8  master -> master
+To ../pub.git
+   7e68e2b..1bcccaf  master -> master
+ok 5 - push succeeds after commit was pushed to remote
+
+expecting success: 
+	(
+		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 master &&
+		# Check that the supermodule commit got there
+		git fetch ../pub.git &&
+		git diff --quiet FETCH_HEAD master &&
+		# Check that the submodule commit got there too
+		cd gar/bage &&
+		git diff --quiet origin/master master
+	)
+
+[master b609798] 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
+[master 8f1a2fb] 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
+   0142cc8..b609798  master -> master
+To ../pub.git
+   1bcccaf..8f1a2fb  master -> master
+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: 
+	(
+		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 master &&
+		# Check that the supermodule commit got there
+		git fetch ../pub.git &&
+		git diff --quiet FETCH_HEAD master &&
+		# Check that the submodule commit got there too
+		cd gar/bage &&
+		git diff --quiet origin/master master
+	)
+
+[master 23c13d5] 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
+[master 212ee8b] 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
+   b609798..23c13d5  master -> master
+To ../pub.git
+   8f1a2fb..212ee8b  master -> master
+From ../pub
+ * branch            HEAD       -> FETCH_HEAD
+ok 7 - push succeeds if submodule commit not on remote but using on-demand from config
+
+expecting success: 
+	(
+		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 master &&
+		# Check that the supermodule commit got there
+		git fetch ../pub.git &&
+		git diff --quiet FETCH_HEAD master &&
+		# Check that the submodule commit got there too
+		cd gar/bage &&
+		git diff --quiet origin/master master
+	)
+
+[master fdd3404] 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
+[master fb1ca79] 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
+   23c13d5..fdd3404  master -> master
+To ../pub.git
+   212ee8b..fb1ca79  master -> master
+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: 
+	(
+		cd work/gar/bage &&
+		>recurse-check-on-command-line-overriding-config &&
+		git add recurse-check-on-command-line-overriding-config &&
+		git commit -m "Recurse on command-line overriding config junk"
+	) &&
+	(
+		cd work &&
+		git add gar/bage &&
+		git commit -m "Recurse on command-line overriding config for gar/bage" &&
+
+		# Ensure that we can override on-demand in the config
+		# to just check submodules
+		test_must_fail git -c push.recurseSubmodules=on-demand push --recurse-submodules=check ../pub.git master &&
+		# Check that the supermodule commit did not get there
+		git fetch ../pub.git &&
+		git diff --quiet FETCH_HEAD master^ &&
+		# Check that the submodule commit did not get there
+		(cd gar/bage && git diff --quiet origin/master master^) &&
+
+		# Ensure that we can override check in the config to
+		# disable submodule recursion entirely
+		(cd gar/bage && git diff --quiet origin/master master^) &&
+		git -c push.recurseSubmodules=on-demand push --recurse-submodules=no ../pub.git master &&
+		git fetch ../pub.git &&
+		git diff --quiet FETCH_HEAD master &&
+		(cd gar/bage && git diff --quiet origin/master master^) &&
+
+		# 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 master &&
+		git fetch ../pub.git &&
+		git diff --quiet FETCH_HEAD master &&
+		(cd gar/bage && git diff --quiet origin/master master^) &&
+
+		# 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 master &&
+		git fetch ../pub.git &&
+		git diff --quiet FETCH_HEAD master &&
+		(cd gar/bage && git diff --quiet origin/master master)
+	)
+
+[master cbba269] 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
+[master 56fa4dc] Recurse on command-line overriding config for gar/bage
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+The following submodule paths contain changes that can
+not be found on any remote:
+  gar/bage
+
+Please try
+
+	git push --recurse-submodules=on-demand
+
+or cd to the path and use
+
+	git push
+
+to push them to a remote.
+
+fatal: Aborting.
+fatal: the remote end hung up unexpectedly
+From ../pub
+ * branch            HEAD       -> FETCH_HEAD
+To ../pub.git
+   fb1ca79..56fa4dc  master -> master
+From ../pub
+ * branch            HEAD       -> FETCH_HEAD
+Everything up-to-date
+From ../pub
+ * branch            HEAD       -> FETCH_HEAD
+Pushing submodule 'gar/bage'
+To ../../../submodule.git
+   fdd3404..cbba269  master -> master
+Everything up-to-date
+From ../pub
+ * branch            HEAD       -> FETCH_HEAD
+ok 9 - push recurse-submodules on command line overrides config
+
+expecting success: 
+	(
+		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 master &&
+		# Check that the supermodule commit did not get there
+		git fetch ../pub.git &&
+		git diff --quiet FETCH_HEAD master^ &&
+		# Check that the submodule commit did not get there
+		(cd gar/bage && git diff --quiet origin/master master^) &&
+
+		# should result in "no"
+		git push --recurse-submodules=on-demand --recurse-submodules=no ../pub.git master &&
+		# Check that the supermodule commit did get there
+		git fetch ../pub.git &&
+		git diff --quiet FETCH_HEAD master &&
+		# Check that the submodule commit did not get there
+		(cd gar/bage && git diff --quiet origin/master master^) &&
+
+		# should result in "no"
+		git push --recurse-submodules=on-demand --no-recurse-submodules ../pub.git master &&
+		# Check that the submodule commit did not get there
+		(cd gar/bage && git diff --quiet origin/master master^) &&
+
+		# But the options in the other order should push the submodule
+		git push --recurse-submodules=check --recurse-submodules=on-demand ../pub.git master &&
+		# Check that the submodule commit did get there
+		git fetch ../pub.git &&
+		(cd gar/bage && git diff --quiet origin/master master)
+	)
+
+[master 96cdfaa] 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
+[master faf2ea1] Recurse on command-line overriding earlier command-line for gar/bage
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+The following submodule paths contain changes that can
+not be found on any remote:
+  gar/bage
+
+Please try
+
+	git push --recurse-submodules=on-demand
+
+or cd to the path and use
+
+	git push
+
+to push them to a remote.
+
+fatal: Aborting.
+fatal: the remote end hung up unexpectedly
+From ../pub
+ * branch            HEAD       -> FETCH_HEAD
+To ../pub.git
+   56fa4dc..faf2ea1  master -> master
+From ../pub
+ * branch            HEAD       -> FETCH_HEAD
+Everything up-to-date
+Pushing submodule 'gar/bage'
+To ../../../submodule.git
+   cbba269..96cdfaa  master -> master
+Everything up-to-date
+From ../pub
+ * branch            HEAD       -> FETCH_HEAD
+ok 10 - push recurse-submodules last one wins on command line
+
+expecting success: 
+	(
+		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 master &&
+		# Check that the supermodule commit got there
+		git fetch ../pub.git &&
+		git diff --quiet FETCH_HEAD master &&
+		# Check that the submodule commit got there
+		cd gar/bage &&
+		git diff --quiet origin/master master
+	)
+
+[master d638927] 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
+[master c4f89d5] Recurse on-demand on command-line overriding config for gar/bage
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Pushing submodule 'gar/bage'
+To ../../../submodule.git
+   96cdfaa..d638927  master -> master
+To ../pub.git
+   faf2ea1..c4f89d5  master -> master
+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: 
+	(
+		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 master &&
+		# Check that the supermodule commit got there
+		git fetch ../pub.git &&
+		git diff --quiet FETCH_HEAD master &&
+		# But that the submodule commit did not
+		( cd gar/bage && git diff --quiet origin/master master^ ) &&
+		# Now push it to avoid confusing future tests
+		git push --recurse-submodules=on-demand ../pub.git master
+	)
+
+[master 97771ab] 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
+[master 59c4b22] Recurse disable on command-line overriding config for gar/bage
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+To ../pub.git
+   c4f89d5..59c4b22  master -> master
+From ../pub
+ * branch            HEAD       -> FETCH_HEAD
+Pushing submodule 'gar/bage'
+To ../../../submodule.git
+   d638927..97771ab  master -> master
+Everything up-to-date
+ok 12 - push succeeds if submodule commit disabling recursion from cmdline overriding config
+
+expecting success: 
+	(
+		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 master &&
+		# Check that the supermodule commit got there
+		git fetch ../pub.git &&
+		git diff --quiet FETCH_HEAD master &&
+		# But that the submodule commit did not
+		( cd gar/bage && git diff --quiet origin/master master^ ) &&
+		# Now push it to avoid confusing future tests
+		git push --recurse-submodules=on-demand ../pub.git master
+	)
+
+[master 9b98f07] 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
+[master 3d31429] Recurse disable on command-line alternative overriding config for gar/bage
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+To ../pub.git
+   59c4b22..3d31429  master -> master
+From ../pub
+ * branch            HEAD       -> FETCH_HEAD
+Pushing submodule 'gar/bage'
+To ../../../submodule.git
+   97771ab..9b98f07  master -> master
+Everything up-to-date
+ok 13 - push succeeds if submodule commit disabling recursion from cmdline (alternative form) overriding config
+
+expecting success: 
+	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 master 2>err &&
+	test_i18ngrep "is a tag, not a commit" err
+
+[master 236d184] bad commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+fatal: submodule entry 'gar/bage' (a3bce02024098bc5ca29eb6b323c870a9140b25a) is a tag, not a commit
+HEAD is now at 3d31429 Recurse disable on command-line alternative overriding config for gar/bage
+ok 14 - submodule entry pointing at a tag is error
+
+expecting success: 
+	(
+		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 master &&
+		test_must_fail git -c push.recurseSubmodules=yes push ../pub.git master &&
+		git push --recurse-submodules=on-demand ../pub.git master
+	)
+
+[master 734fd4f] 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
+[master f6c48df] 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
+   9b98f07..734fd4f  master -> master
+To ../pub.git
+   3d31429..f6c48df  master -> master
+ok 15 - push fails if recurse submodules option passed as yes
+
+expecting success: 
+	(
+		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
+	)
+
+[master 7967dd2] Fourth junk
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 junk4
+[master 1afd07d] Fourth commit for gar/bage
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to branch 'branch2'
+M	gar/bage
+Note: checking out '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 performing another checkout.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -b with the checkout command again. Example:
+
+  git checkout -b <new-branch-name>
+
+HEAD is now at 734fd4f Recurse push fails if recurse submodules option passed as yes
+[branch2 adadbbe] First junk
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 junk1
+The following submodule paths contain changes that can
+not be found on any remote:
+  gar/bage
+
+Please try
+
+	git push --recurse-submodules=on-demand
+
+or cd to the path and use
+
+	git push
+
+to push them to a remote.
+
+fatal: Aborting.
+fatal: the remote end hung up unexpectedly
+ok 16 - push fails when commit on multiple branches if one branch has no remote
+
+expecting success: 
+	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-submodule=check origin master
+	)
+
+Initialized empty Git repository in /build/git-2.20.1/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/git-2.20.1/t/trash directory.t5531-deep-submodule-push/a1/b/.git/
+[master (root-commit) 438b5f1] 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.
+[master (root-commit) f8eb90f] added submodule
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 160000 b
+To /build/git-2.20.1/t/trash directory.t5531-deep-submodule-push/a
+ * [new branch]      master -> master
+ok 17 - push succeeds if submodule has no remote and is on the first superproject commit
+
+expecting success: 
+	(
+		cd work &&
+		(
+			cd gar/bage &&
+			git checkout master &&
+			>junk5 &&
+			git add junk5 &&
+			git commit -m "Fifth junk" &&
+			git push &&
+			git rev-parse origin/master >../../../expected
+		) &&
+		git checkout master &&
+		git add gar/bage &&
+		git commit -m "Fifth commit for gar/bage" &&
+		git push --recurse-submodules=on-demand ../pub.git master
+	) &&
+	(
+		cd submodule.git &&
+		git rev-parse master >../actual
+	) &&
+	test_cmp expected actual
+
+Previous HEAD position was 734fd4f Recurse push fails if recurse submodules option passed as yes
+Switched to branch 'master'
+[master 8e8b1be] Fifth junk
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 junk5
+To ../../../submodule.git
+   734fd4f..8e8b1be  master -> master
+Switched to branch 'master'
+M	gar/bage
+[master 561c4bb] Fifth commit for gar/bage
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+To ../pub.git
+   f6c48df..561c4bb  master -> master
+ok 18 - push unpushed submodules when not needed
+
+expecting success: 
+	(
+		cd submodule.git &&
+		git rev-parse master >../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 master
+	) &&
+	(
+		cd submodule.git &&
+		git rev-parse master >../actual
+	) &&
+	test_cmp expected actual
+
+[master 7947423] Sixth junk
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 junk6
+[master a542265] Second junk for work
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 junk2
+To ../pub.git
+   561c4bb..a542265  master -> master
+ok 19 - push unpushed submodules when not needed 2
+
+expecting success: 
+	(
+		cd work &&
+		(
+			cd gar/bage &&
+			git checkout master &&
+			> junk7 &&
+			git add junk7 &&
+			git commit -m "Seventh junk" &&
+			git rev-parse master >../../../expected
+		) &&
+		git checkout master &&
+		git add gar/bage &&
+		git commit -m "Seventh commit for gar/bage" &&
+		git push --recurse-submodules=on-demand ../pub.git master
+	) &&
+	(
+		cd submodule.git &&
+		git rev-parse master >../actual
+	) &&
+	test_cmp expected actual
+
+Already on 'master'
+[master 0307a30] Seventh junk
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 junk7
+Already on 'master'
+M	gar/bage
+[master ce8c7c9] 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
+   8e8b1be..0307a30  master -> master
+To ../pub.git
+   a542265..ce8c7c9  master -> master
+ok 20 - push unpushed submodules recursively
+
+expecting success: 
+	(
+		cd work &&
+		(
+			cd gar/bage &&
+			git rev-parse origin/master >../../../expected &&
+			git checkout master~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 master
+	) &&
+	(
+		cd submodule.git &&
+		git rev-parse master >../actual
+	) &&
+	test_when_finished git -C work reset --hard master^ &&
+	test_cmp expected actual
+
+Note: checking out 'master~0'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by performing another checkout.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -b with the checkout command again. Example:
+
+  git checkout -b <new-branch-name>
+
+HEAD is now at 0307a30 Seventh junk
+[detached HEAD 1230e9c] Eighth junk
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 junk8
+[master db92692] Eighth commit for gar/bage
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Pushing submodule 'gar/bage'
+Everything up-to-date
+The following submodule paths contain changes that can
+not be found on any remote:
+  gar/bage
+
+Please try
+
+	git push --recurse-submodules=on-demand
+
+or cd to the path and use
+
+	git push
+
+to push them to a remote.
+
+fatal: Aborting.
+fatal: the remote end hung up unexpectedly
+HEAD is now at ce8c7c9 Seventh commit for gar/bage
+ok 21 - push unpushable submodule recursively fails
+
+expecting success: 
+	(
+		cd work/gar/bage &&
+		git checkout master &&
+		git rev-parse master >../../../expected_submodule &&
+		> junk9 &&
+		git add junk9 &&
+		git commit -m "Ninth junk" &&
+
+		# Go up to work directory
+		cd ../.. &&
+		git checkout master &&
+		git rev-parse master >../expected_pub &&
+		git add gar/bage &&
+		git commit -m "Ninth commit for gar/bage" &&
+		git push --dry-run --recurse-submodules=on-demand ../pub.git master
+	) &&
+	git -C submodule.git rev-parse master >actual_submodule &&
+	git -C pub.git rev-parse master >actual_pub &&
+	test_cmp expected_pub actual_pub &&
+	test_cmp expected_submodule actual_submodule
+
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  1230e9c 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> 1230e9c
+
+Switched to branch 'master'
+[master 3fd25b6] Ninth junk
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 junk9
+Already on 'master'
+M	gar/bage
+[master cfd3282] 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
+   0307a30..3fd25b6  master -> master
+To ../pub.git
+   ce8c7c9..cfd3282  master -> master
+ok 22 - push --dry-run does not recursively update submodules
+
+expecting success: 
+	git -C work push --dry-run --recurse-submodules=only ../pub.git master &&
+
+	git -C submodule.git rev-parse master >actual_submodule &&
+	git -C pub.git rev-parse master >actual_pub &&
+	test_cmp expected_pub actual_pub &&
+	test_cmp expected_submodule actual_submodule
+
+Pushing submodule 'gar/bage'
+To ../../../submodule.git
+   0307a30..3fd25b6  master -> master
+Everything up-to-date
+ok 23 - push --dry-run does not recursively update submodules
+
+expecting success: 
+	git -C work/gar/bage rev-parse master >expected_submodule &&
+	git -C pub.git rev-parse master >expected_pub &&
+
+	git -C work push --recurse-submodules=only ../pub.git master &&
+
+	git -C submodule.git rev-parse master >actual_submodule &&
+	git -C pub.git rev-parse master >actual_pub &&
+	test_cmp expected_submodule actual_submodule &&
+	test_cmp expected_pub actual_pub
+
+Pushing submodule 'gar/bage'
+To ../../../submodule.git
+   0307a30..3fd25b6  master -> master
+Everything up-to-date
+ok 24 - push only unpushed submodules recursively
+
+expecting success: 
+	git -C work remote add origin ../pub.git &&
+	git -C work remote add pub ../pub.git &&
+
+	> work/gar/bage/junk10 &&
+	git -C work/gar/bage add junk10 &&
+	git -C work/gar/bage commit -m "Tenth junk" &&
+	git -C work add gar/bage &&
+	git -C work commit -m "Tenth junk added to gar/bage" &&
+
+	# Fails when submodule does not have a matching remote
+	test_must_fail git -C work push --recurse-submodules=on-demand pub master &&
+	# Succeeds when submodules has matching remote and refspec
+	git -C work push --recurse-submodules=on-demand origin master &&
+
+	git -C submodule.git rev-parse master >actual_submodule &&
+	git -C pub.git rev-parse master >actual_pub &&
+	git -C work/gar/bage rev-parse master >expected_submodule &&
+	git -C work rev-parse master >expected_pub &&
+	test_cmp expected_submodule actual_submodule &&
+	test_cmp expected_pub actual_pub
+
+[master 04e7c08] Tenth junk
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 junk10
+[master 2b7592f] 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
+   3fd25b6..04e7c08  master -> master
+To ../pub.git
+   ce8c7c9..2b7592f  master -> master
+ok 25 - push propagating the remotes name to a submodule
+
+expecting success: 
+	> work/gar/bage/junk11 &&
+	git -C work/gar/bage add junk11 &&
+	git -C work/gar/bage commit -m "Eleventh junk" &&
+
+	git -C work checkout branch2 &&
+	git -C work add gar/bage &&
+	git -C work commit -m "updating gar/bage in branch2" &&
+
+	# Fails when submodule does not have a matching branch
+	test_must_fail git -C work push --recurse-submodules=on-demand origin branch2 &&
+	# Fails when refspec includes an object id
+	test_must_fail git -C work push --recurse-submodules=on-demand origin \
+		"$(git -C work rev-parse branch2):refs/heads/branch2" &&
+	# Fails when refspec includes HEAD and parent and submodule do not
+	# have the same named branch checked out
+	test_must_fail git -C work push --recurse-submodules=on-demand origin \
+		HEAD:refs/heads/branch2 &&
+
+	git -C work/gar/bage branch branch2 master &&
+	git -C work push --recurse-submodules=on-demand origin branch2 &&
+
+	git -C submodule.git rev-parse branch2 >actual_submodule &&
+	git -C pub.git rev-parse branch2 >actual_pub &&
+	git -C work/gar/bage rev-parse branch2 >expected_submodule &&
+	git -C work rev-parse branch2 >expected_pub &&
+	test_cmp expected_submodule actual_submodule &&
+	test_cmp expected_pub actual_pub
+
+[master 3a660c9] 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 f82d2a1] 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 'f82d2a1f9e8815d537c7b472164b6f34e05e2f0a' 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 26 - push propagating refspec to a submodule
+
+expecting success: 
+	git -C work/gar/bage checkout branch2 &&
+	> work/gar/bage/junk12 &&
+	git -C work/gar/bage add junk12 &&
+	git -C work/gar/bage commit -m "Twelfth junk" &&
+
+	git -C work checkout branch2 &&
+	git -C work add gar/bage &&
+	git -C work commit -m "updating gar/bage in branch2" &&
+
+	# Passes since the superproject and submodules HEAD are both on branch2
+	git -C work push --recurse-submodules=on-demand origin \
+		HEAD:refs/heads/branch2 &&
+
+	git -C submodule.git rev-parse branch2 >actual_submodule &&
+	git -C pub.git rev-parse branch2 >actual_pub &&
+	git -C work/gar/bage rev-parse branch2 >expected_submodule &&
+	git -C work rev-parse branch2 >expected_pub &&
+	test_cmp expected_submodule actual_submodule &&
+	test_cmp expected_pub actual_pub
+
+Switched to branch 'branch2'
+[branch2 f0f7189] 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 b0452fa] 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
+   3a660c9..f0f7189  HEAD -> branch2
+To ../pub.git
+   f82d2a1..b0452fa  HEAD -> branch2
+ok 27 - push propagating HEAD refspec to a submodule
+
+# passed all 27 test(s)
+1..27
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
 *** t5570-git-daemon.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5570-git-daemon/.git/
 checking prerequisite: PIPE
@@ -196002,14 +195896,14 @@
 )
 prerequisite PIPE ok
 Starting git daemon ...
-[3288504] Ready to rumble
+[2717983] Ready to rumble
 expecting success: 
 	git config push.default matching &&
 	echo content >file &&
 	git add file &&
 	git commit -m one
 
-[master (root-commit) 0723b92] one
+[master (root-commit) 583f3ec] one
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 file
@@ -196034,10 +195928,10 @@
 	check_verbose_connect &&
 	test_cmp file clone/file
 
-[3289245] Connection from 127.0.0.1:39876
-[3289245] Extended attribute "host": 127.0.0.1:5570
-[3289245] Request upload-pack for '/repo.git'
-[3288504] [3289245] Disconnected
+[2718481] Connection from 127.0.0.1:60700
+[2718481] Extended attribute "host": 127.0.0.1:5570
+[2718481] Request upload-pack for '/repo.git'
+[2717983] [2718481] 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.
@@ -196052,16 +195946,16 @@
 	check_verbose_connect &&
 	test_cmp file clone/file
 
-[master 58952a4] two
+[master 375d09b] two
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 To /build/git-2.20.1/t/trash directory.t5570-git-daemon/repo/repo.git
-   0723b92..58952a4  master -> master
-[3289841] Connection from 127.0.0.1:39878
-[3289841] Extended attribute "host": 127.0.0.1:5570
-[3289841] Request upload-pack for '/repo.git'
-[3288504] [3289841] Disconnected
-Updating 0723b92..58952a4
+   583f3ec..375d09b  master -> master
+[2718938] Connection from 127.0.0.1:60702
+[2718938] Extended attribute "host": 127.0.0.1:5570
+[2718938] Request upload-pack for '/repo.git'
+[2717983] [2718938] Disconnected
+Updating 583f3ec..375d09b
 Fast-forward
  file | 1 +
  1 file changed, 1 insertion(+)
@@ -196075,10 +195969,10 @@
 	(cd clone && git fetch -v) 2>stderr &&
 	check_verbose_connect
 
-[3290190] Connection from 127.0.0.1:39880
-[3290190] Extended attribute "host": 127.0.0.1:5570
-[3290190] Request upload-pack for '/repo.git'
-[3288504] [3290190] Disconnected
+[2719240] Connection from 127.0.0.1:60704
+[2719240] Extended attribute "host": 127.0.0.1:5570
+[2719240] Request upload-pack for '/repo.git'
+[2717983] [2719240] 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.
@@ -196089,10 +195983,10 @@
 	(cd clone && git fetch 2>../stderr) &&
 	test_must_be_empty stderr
 
-[3290381] Connection from 127.0.0.1:39882
-[3290381] Extended attribute "host": 127.0.0.1:5570
-[3290381] Request upload-pack for '/repo.git'
-[3288504] [3290381] Disconnected
+[2719482] Connection from 127.0.0.1:60706
+[2719482] Extended attribute "host": 127.0.0.1:5570
+[2719482] Request upload-pack for '/repo.git'
+[2717983] [2719482] Disconnected
 ok 6 - no-op fetch without "-v" is quiet
 
 expecting success: 
@@ -196107,11 +196001,11 @@
 
 To /build/git-2.20.1/t/trash directory.t5570-git-daemon/repo/repo.git
  * [new branch]      master -> other
-[3290774] Connection from 127.0.0.1:39884
-[3290774] Extended attribute "host": 127.0.0.1:5570
-[3290774] Request upload-pack for '/repo.git'
+[2719779] Connection from 127.0.0.1:60708
+[2719779] Extended attribute "host": 127.0.0.1:5570
+[2719779] Request upload-pack for '/repo.git'
 origin/HEAD set to master
-[3288504] [3290774] Disconnected
+[2717983] [2719779] Disconnected
 ok 7 - remote detects correct HEAD
 
 expecting success: 
@@ -196138,25 +196032,25 @@
 
 1+0 records in
 1+0 records out
-256 bytes copied, 0.0078409 s, 32.6 kB/s
+256 bytes copied, 5.7408e-05 s, 4.5 MB/s
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5570-git-daemon/repo_bad1.git/
-[3291342] Connection from 127.0.0.1:39886
-[3291342] Extended attribute "host": 127.0.0.1:5570
-[3291342] Request upload-pack for '/repo_bad1.git'
-[3291342] error: packfile ./objects/pack/pack-bfcf90d025f471f92b2e4f7b3a836d1c9b1b9586.pack does not match index
-[3291342] error: packfile ./objects/pack/pack-bfcf90d025f471f92b2e4f7b3a836d1c9b1b9586.pack does not match index
-[3291342] error: packfile ./objects/pack/pack-bfcf90d025f471f92b2e4f7b3a836d1c9b1b9586.pack does not match index
-[3291342] error: packfile ./objects/pack/pack-bfcf90d025f471f92b2e4f7b3a836d1c9b1b9586.pack does not match index
-[3291342] error: refs/heads/master does not point to a valid object!
-[3291342] error: packfile ./objects/pack/pack-bfcf90d025f471f92b2e4f7b3a836d1c9b1b9586.pack does not match index
-[3291342] error: packfile ./objects/pack/pack-bfcf90d025f471f92b2e4f7b3a836d1c9b1b9586.pack does not match index
-[3291342] error: refs/heads/other does not point to a valid object!
-fatal: remote error: upload-pack: not our ref 58952a444ac7637d9cd9ea905d67cf67af96fa3a
-[3291342] error: packfile ./objects/pack/pack-bfcf90d025f471f92b2e4f7b3a836d1c9b1b9586.pack does not match index
-[3291342] error: packfile ./objects/pack/pack-bfcf90d025f471f92b2e4f7b3a836d1c9b1b9586.pack does not match index
-[3291342] fatal: git upload-pack: not our ref 58952a444ac7637d9cd9ea905d67cf67af96fa3a
-[3288504] [3291342] Disconnected (with error)
+[2720328] Connection from 127.0.0.1:60710
+[2720328] Extended attribute "host": 127.0.0.1:5570
+[2720328] Request upload-pack for '/repo_bad1.git'
+fatal: remote error: upload-pack: not our ref 375d09bab22cc53e86826f9350288a9d4f4a56f7
+[2720328] error: packfile ./objects/pack/pack-d0fffde5b2c7a87a87a43048c15047b0c3a5e494.pack does not match index
+[2720328] error: packfile ./objects/pack/pack-d0fffde5b2c7a87a87a43048c15047b0c3a5e494.pack does not match index
+[2720328] error: packfile ./objects/pack/pack-d0fffde5b2c7a87a87a43048c15047b0c3a5e494.pack does not match index
+[2720328] error: packfile ./objects/pack/pack-d0fffde5b2c7a87a87a43048c15047b0c3a5e494.pack does not match index
+[2720328] error: refs/heads/master does not point to a valid object!
+[2720328] error: packfile ./objects/pack/pack-d0fffde5b2c7a87a87a43048c15047b0c3a5e494.pack does not match index
+[2720328] error: packfile ./objects/pack/pack-d0fffde5b2c7a87a87a43048c15047b0c3a5e494.pack does not match index
+[2720328] error: refs/heads/other does not point to a valid object!
+[2720328] error: packfile ./objects/pack/pack-d0fffde5b2c7a87a87a43048c15047b0c3a5e494.pack does not match index
 ls: cannot access 'objects/pack/pack-*.pack': No such file or directory
+[2720328] error: packfile ./objects/pack/pack-d0fffde5b2c7a87a87a43048c15047b0c3a5e494.pack does not match index
+[2720328] fatal: git upload-pack: not our ref 375d09bab22cc53e86826f9350288a9d4f4a56f7
+[2717983] [2720328] Disconnected (with error)
 ok 9 - fetch notices corrupt pack
 
 expecting success: 
@@ -196175,104 +196069,104 @@
 
 1+0 records in
 1+0 records out
-256 bytes copied, 0.00684919 s, 37.4 kB/s
+256 bytes copied, 6.1618e-05 s, 4.2 MB/s
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5570-git-daemon/repo_bad2.git/
-[3291640] Connection from 127.0.0.1:39888
-[3291640] Extended attribute "host": 127.0.0.1:5570
-[3291640] Request upload-pack for '/repo_bad2.git'
-fatal: remote error: upload-pack: not our ref 58952a444ac7637d9cd9ea905d67cf67af96fa3a
-[3291640] error: non-monotonic index ./objects/pack/pack-bfcf90d025f471f92b2e4f7b3a836d1c9b1b9586.idx
-[3291640] error: non-monotonic index ./objects/pack/pack-bfcf90d025f471f92b2e4f7b3a836d1c9b1b9586.idx
-[3291640] error: non-monotonic index ./objects/pack/pack-bfcf90d025f471f92b2e4f7b3a836d1c9b1b9586.idx
-[3291640] error: non-monotonic index ./objects/pack/pack-bfcf90d025f471f92b2e4f7b3a836d1c9b1b9586.idx
-[3291640] error: refs/heads/master does not point to a valid object!
-[3291640] error: non-monotonic index ./objects/pack/pack-bfcf90d025f471f92b2e4f7b3a836d1c9b1b9586.idx
-[3291640] error: non-monotonic index ./objects/pack/pack-bfcf90d025f471f92b2e4f7b3a836d1c9b1b9586.idx
-[3291640] error: refs/heads/other does not point to a valid object!
-[3291640] error: non-monotonic index ./objects/pack/pack-bfcf90d025f471f92b2e4f7b3a836d1c9b1b9586.idx
-[3291640] error: non-monotonic index ./objects/pack/pack-bfcf90d025f471f92b2e4f7b3a836d1c9b1b9586.idx
-[3291640] fatal: git upload-pack: not our ref 58952a444ac7637d9cd9ea905d67cf67af96fa3a
-[3288504] [3291640] Disconnected (with error)
+[2720619] Connection from 127.0.0.1:60712
+[2720619] Extended attribute "host": 127.0.0.1:5570
+[2720619] Request upload-pack for '/repo_bad2.git'
+[2720619] error: non-monotonic index ./objects/pack/pack-d0fffde5b2c7a87a87a43048c15047b0c3a5e494.idx
+[2720619] error: non-monotonic index ./objects/pack/pack-d0fffde5b2c7a87a87a43048c15047b0c3a5e494.idx
+[2720619] error: non-monotonic index ./objects/pack/pack-d0fffde5b2c7a87a87a43048c15047b0c3a5e494.idx
+[2720619] error: non-monotonic index ./objects/pack/pack-d0fffde5b2c7a87a87a43048c15047b0c3a5e494.idx
+[2720619] error: refs/heads/master does not point to a valid object!
+[2720619] error: non-monotonic index ./objects/pack/pack-d0fffde5b2c7a87a87a43048c15047b0c3a5e494.idx
+[2720619] error: non-monotonic index ./objects/pack/pack-d0fffde5b2c7a87a87a43048c15047b0c3a5e494.idx
+[2720619] error: refs/heads/other does not point to a valid object!
+fatal: remote error: upload-pack: not our ref 375d09bab22cc53e86826f9350288a9d4f4a56f7
+[2720619] error: non-monotonic index ./objects/pack/pack-d0fffde5b2c7a87a87a43048c15047b0c3a5e494.idx
+[2720619] error: non-monotonic index ./objects/pack/pack-d0fffde5b2c7a87a87a43048c15047b0c3a5e494.idx
+[2720619] fatal: git upload-pack: not our ref 375d09bab22cc53e86826f9350288a9d4f4a56f7
+[2717983] [2720619] Disconnected (with error)
 ok 10 - fetch notices corrupt idx
 
 expecting success: test_remote_error    'access denied or repository not exported' clone nowhere.git    
-[3291874] Connection from 127.0.0.1:39890
-[3291874] Extended attribute "host": 127.0.0.1:5570
-[3291874] Request upload-pack for '/nowhere.git'
-[3291874] '/build/git-2.20.1/t/trash directory.t5570-git-daemon/repo/nowhere.git' does not appear to be a git repository
-[3288504] [3291874] Disconnected (with error)
+[2720843] Connection from 127.0.0.1:60716
+[2720843] Extended attribute "host": 127.0.0.1:5570
+[2720843] Request upload-pack for '/nowhere.git'
+[2720843] '/build/git-2.20.1/t/trash directory.t5570-git-daemon/repo/nowhere.git' does not appear to be a git repository
+[2717983] [2720843] Disconnected (with error)
 fatal: remote error: access denied or repository not exported: /nowhere.git
 ok 11 - clone non-existent
 
 expecting success: test_remote_error    'access denied or repository not exported' push  repo.git master
-[3292089] Connection from 127.0.0.1:39892
-[3292089] Extended attribute "host": 127.0.0.1:5570
-[3292089] Request receive-pack for '/repo.git'
-[3292089] 'receive-pack': service not enabled for '/build/git-2.20.1/t/trash directory.t5570-git-daemon/repo/repo.git'
-[3288504] [3292089] Disconnected (with error)
+[2720998] Connection from 127.0.0.1:60718
+[2720998] Extended attribute "host": 127.0.0.1:5570
+[2720998] Request receive-pack for '/repo.git'
+[2720998] 'receive-pack': service not enabled for '/build/git-2.20.1/t/trash directory.t5570-git-daemon/repo/repo.git'
+[2717983] [2720998] Disconnected (with error)
 fatal: remote error: access denied or repository not exported: /repo.git
 ok 12 - push disabled
 
 expecting success: test_remote_error -x 'access denied or repository not exported' fetch repo.git       
-[3292318] Connection from 127.0.0.1:39894
-[3292318] Extended attribute "host": 127.0.0.1:5570
-[3292318] Request upload-pack for '/repo.git'
-[3292318] '/build/git-2.20.1/t/trash directory.t5570-git-daemon/repo/repo.git' does not appear to be a git repository
-[3288504] [3292318] Disconnected (with error)
+[2721180] Connection from 127.0.0.1:60720
+[2721180] Extended attribute "host": 127.0.0.1:5570
+[2721180] Request upload-pack for '/repo.git'
+[2721180] '/build/git-2.20.1/t/trash directory.t5570-git-daemon/repo/repo.git' does not appear to be a git repository
+[2717983] [2721180] Disconnected (with error)
 fatal: remote error: access denied or repository not exported: /repo.git
 ok 13 - read access denied
 
 expecting success: test_remote_error -n 'access denied or repository not exported' fetch repo.git       
-[3292466] Connection from 127.0.0.1:39896
-[3292466] Extended attribute "host": 127.0.0.1:5570
-[3292466] Request upload-pack for '/repo.git'
-[3292466] '/build/git-2.20.1/t/trash directory.t5570-git-daemon/repo/repo.git': repository not exported.
-[3288504] [3292466] Disconnected (with error)
+[2721345] Connection from 127.0.0.1:60722
+[2721345] Extended attribute "host": 127.0.0.1:5570
+[2721345] Request upload-pack for '/repo.git'
+[2721345] '/build/git-2.20.1/t/trash directory.t5570-git-daemon/repo/repo.git': repository not exported.
+[2717983] [2721345] Disconnected (with error)
 fatal: remote error: access denied or repository not exported: /repo.git
 ok 14 - not exported
 
 Stopping git daemon ...
 Starting git daemon ...
-[3292662] Ready to rumble
+[2721484] Ready to rumble
 expecting success: test_remote_error    'no such repository'      clone nowhere.git    
-[3292783] Connection from 127.0.0.1:39898
-[3292783] Extended attribute "host": 127.0.0.1:5570
-[3292783] Request upload-pack for '/nowhere.git'
-[3292783] '/build/git-2.20.1/t/trash directory.t5570-git-daemon/repo/nowhere.git' does not appear to be a git repository
-[3292662] [3292783] Disconnected (with error)
+[2721616] Connection from 127.0.0.1:60724
+[2721616] Extended attribute "host": 127.0.0.1:5570
+[2721616] Request upload-pack for '/nowhere.git'
+[2721616] '/build/git-2.20.1/t/trash directory.t5570-git-daemon/repo/nowhere.git' does not appear to be a git repository
+[2721484] [2721616] Disconnected (with error)
 fatal: remote error: no such repository: /nowhere.git
 ok 15 - clone non-existent
 
 expecting success: test_remote_error    'service not enabled'     push  repo.git master
-[3292926] Connection from 127.0.0.1:39900
-[3292926] Extended attribute "host": 127.0.0.1:5570
-[3292926] Request receive-pack for '/repo.git'
-[3292926] 'receive-pack': service not enabled for '/build/git-2.20.1/t/trash directory.t5570-git-daemon/repo/repo.git'
+[2721741] Connection from 127.0.0.1:60726
+[2721741] Extended attribute "host": 127.0.0.1:5570
+[2721741] Request receive-pack for '/repo.git'
+[2721741] 'receive-pack': service not enabled for '/build/git-2.20.1/t/trash directory.t5570-git-daemon/repo/repo.git'
+[2721484] [2721741] Disconnected (with error)
 fatal: remote error: service not enabled: /repo.git
-[3292662] [3292926] Disconnected (with error)
 ok 16 - push disabled
 
 expecting success: test_remote_error -x 'no such repository'      fetch repo.git       
-[3293054] Connection from 127.0.0.1:39902
-[3293054] Extended attribute "host": 127.0.0.1:5570
-[3293054] Request upload-pack for '/repo.git'
-[3293054] '/build/git-2.20.1/t/trash directory.t5570-git-daemon/repo/repo.git' does not appear to be a git repository
-[3292662] [3293054] Disconnected (with error)
+[2721913] Connection from 127.0.0.1:60728
+[2721913] Extended attribute "host": 127.0.0.1:5570
+[2721913] Request upload-pack for '/repo.git'
+[2721913] '/build/git-2.20.1/t/trash directory.t5570-git-daemon/repo/repo.git' does not appear to be a git repository
+[2721484] [2721913] Disconnected (with error)
 fatal: remote error: no such repository: /repo.git
 ok 17 - read access denied
 
 expecting success: test_remote_error -n 'repository not exported' fetch repo.git       
-[3293261] Connection from 127.0.0.1:39904
-[3293261] Extended attribute "host": 127.0.0.1:5570
-[3293261] Request upload-pack for '/repo.git'
-[3293261] '/build/git-2.20.1/t/trash directory.t5570-git-daemon/repo/repo.git': repository not exported.
-[3292662] [3293261] Disconnected (with error)
+[2722059] Connection from 127.0.0.1:60730
+[2722059] Extended attribute "host": 127.0.0.1:5570
+[2722059] Request upload-pack for '/repo.git'
+[2722059] '/build/git-2.20.1/t/trash directory.t5570-git-daemon/repo/repo.git': repository not exported.
+[2721484] [2722059] Disconnected (with error)
 fatal: remote error: repository not exported: /repo.git
 ok 18 - not exported
 
 Stopping git daemon ...
 Starting git daemon ...
-[3293369] Ready to rumble
+[2722177] Ready to rumble
 expecting success: 
 	repo="$GIT_DAEMON_DOCUMENT_ROOT_PATH/localhost/interp.git" &&
 	git init --bare "$repo" &&
@@ -196286,19 +196180,19 @@
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5570-git-daemon/repo/localhost/interp.git/
 To /build/git-2.20.1/t/trash directory.t5570-git-daemon/repo/localhost/interp.git
  * [new branch]      HEAD -> master
-[3293745] Connection from 127.0.0.1:39906
-[3293745] Extended attribute "host": localhost
-[3293745] Request upload-pack for '/interp.git'
-[3293745] Interpolated dir '/build/git-2.20.1/t/trash directory.t5570-git-daemon/repo/localhost/interp.git'
-58952a444ac7637d9cd9ea905d67cf67af96fa3a	HEAD
-58952a444ac7637d9cd9ea905d67cf67af96fa3a	refs/heads/master
-[3293369] [3293745] Disconnected
-[3293819] Connection from 127.0.0.1:39908
-[3293819] Extended attribute "host": LOCALHOST
-[3293819] Request upload-pack for '/interp.git'
-[3293819] Interpolated dir '/build/git-2.20.1/t/trash directory.t5570-git-daemon/repo/localhost/interp.git'
-58952a444ac7637d9cd9ea905d67cf67af96fa3a	HEAD
-58952a444ac7637d9cd9ea905d67cf67af96fa3a	refs/heads/master
+[2722452] Connection from 127.0.0.1:60734
+[2722452] Extended attribute "host": localhost
+[2722452] Request upload-pack for '/interp.git'
+[2722452] Interpolated dir '/build/git-2.20.1/t/trash directory.t5570-git-daemon/repo/localhost/interp.git'
+375d09bab22cc53e86826f9350288a9d4f4a56f7	HEAD
+375d09bab22cc53e86826f9350288a9d4f4a56f7	refs/heads/master
+[2722177] [2722452] Disconnected
+[2722498] Connection from 127.0.0.1:60736
+[2722498] Extended attribute "host": LOCALHOST
+[2722498] Request upload-pack for '/interp.git'
+[2722498] Interpolated dir '/build/git-2.20.1/t/trash directory.t5570-git-daemon/repo/localhost/interp.git'
+375d09bab22cc53e86826f9350288a9d4f4a56f7	HEAD
+375d09bab22cc53e86826f9350288a9d4f4a56f7	refs/heads/master
 ok 19 - access repo via interpolated hostname
 
 expecting success: 
@@ -196310,16 +196204,17 @@
 		env GIT_OVERRIDE_VIRTUAL_HOST=.. \
 		git ls-remote "$GIT_DAEMON_URL/escape.git"
 
-[3293369] [3293819] Disconnected
+[2722177] [2722498] Disconnected
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5570-git-daemon/escape.git/
 To /build/git-2.20.1/t/trash directory.t5570-git-daemon/repo/../escape.git
  * [new branch]      HEAD -> master
-[3294172] Connection from 127.0.0.1:39910
-[3294172] Extended attribute "host": ..
-[3294172] Request upload-pack for '/escape.git'
-[3294172] Interpolated dir '/build/git-2.20.1/t/trash directory.t5570-git-daemon/repo//escape.git'
 fatal: remote error: access denied or repository not exported: /escape.git
-[3294172] '/build/git-2.20.1/t/trash directory.t5570-git-daemon/repo//escape.git' does not appear to be a git repository
+[2722855] Connection from 127.0.0.1:60738
+[2722855] Extended attribute "host": ..
+[2722855] Request upload-pack for '/escape.git'
+[2722855] Interpolated dir '/build/git-2.20.1/t/trash directory.t5570-git-daemon/repo//escape.git'
+[2722855] '/build/git-2.20.1/t/trash directory.t5570-git-daemon/repo//escape.git' does not appear to be a git repository
+[2722177] [2722855] Disconnected (with error)
 ok 20 - hostname cannot break out of directory
 
 expecting success: 
@@ -196334,15 +196229,14 @@
 	grep -i extended.attribute daemon.log | cut -d" " -f2- >actual &&
 	test_cmp expect actual
 
-[3293369] [3294172] Disconnected (with error)
-[3294280] Connection from 127.0.0.1:39912
-[3294280] Extended attribute "host": localhost
-[3294280] Extended attribute "protocol": version=1
-[3294280] Request upload-pack for '/interp.git'
-[3294280] Interpolated dir '/build/git-2.20.1/t/trash directory.t5570-git-daemon/repo/localhost/interp.git'
-58952a444ac7637d9cd9ea905d67cf67af96fa3a	HEAD
-58952a444ac7637d9cd9ea905d67cf67af96fa3a	refs/heads/master
-[3293369] [3294280] Disconnected
+[2723040] Connection from 127.0.0.1:60740
+[2723040] Extended attribute "host": localhost
+[2723040] Extended attribute "protocol": version=1
+[2723040] Request upload-pack for '/interp.git'
+[2723040] Interpolated dir '/build/git-2.20.1/t/trash directory.t5570-git-daemon/repo/localhost/interp.git'
+375d09bab22cc53e86826f9350288a9d4f4a56f7	HEAD
+375d09bab22cc53e86826f9350288a9d4f4a56f7	refs/heads/master
+[2722177] [2723040] Disconnected
 ok 21 - daemon log records all attributes
 
 checking prerequisite: FAKENC
@@ -196368,11 +196262,11 @@
 	git -C "$repo" rev-parse master >expect &&
 	test_cmp expect actual
 
-[3294876] Connection from 127.0.0.1:39914
-[3294876] Extended attribute "host": localhost
-[3294876] Request upload-pack for '/interp.git'
-[3294876] Interpolated dir '/build/git-2.20.1/t/trash directory.t5570-git-daemon/repo/localhost/interp.git'
-[3293369] [3294876] Disconnected
+[2723687] Connection from 127.0.0.1:60742
+[2723687] Extended attribute "host": localhost
+[2723687] Request upload-pack for '/interp.git'
+[2723687] Interpolated dir '/build/git-2.20.1/t/trash directory.t5570-git-daemon/repo/localhost/interp.git'
+[2722177] [2723687] Disconnected
 ok 22 - hostname interpolation works after LF-stripping
 
 Stopping git daemon ...
@@ -196380,56 +196274,381 @@
 1..22
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t5606-clone-options.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5606-clone-options/.git/
+*** t5545-push-options.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5545-push-options/.git/
 expecting success: 
+	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 master
+	) &&
+	test_refs master master &&
+	echo "asdf" >expect &&
+	test_cmp expect upstream/.git/hooks/pre-receive.push_options &&
+	test_cmp expect upstream/.git/hooks/post-receive.push_options
 
-	mkdir parent &&
-	(cd parent && git init &&
-	 echo one >file && git add file &&
-	 git commit -m one)
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5545-push-options/upstream/.git/
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5545-push-options/workbench/.git/
+[master (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]      master -> master
+ * [new tag]         one -> one
+[master 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  master -> master
+ok 1 - one push option works for a single branch
 
+expecting success: 
+	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 master
+	) &&
+	test_refs master HEAD@{1}
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5606-clone-options/parent/.git/
-[master (root-commit) 43e4eee] one
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5545-push-options/upstream/.git/
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5545-push-options/workbench/.git/
+[master (root-commit) d79ce16] one
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 file
-ok 1 - setup
+ create mode 100644 one.t
+remote: warning: updating the current branch        
+To ../upstream
+ * [new branch]      master -> master
+ * [new tag]         one -> one
+[master 139b20d] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+fatal: the receiving end does not support push options
+fatal: the remote end hung up unexpectedly
+ok 2 - push option denied by remote
 
 expecting success: 
+	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 master
+	) &&
+	test_refs master master &&
+	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 clone -o foo parent clone-o &&
-	(cd clone-o && git rev-parse --verify refs/remotes/foo/master)
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5545-push-options/upstream/.git/
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5545-push-options/workbench/.git/
+[master (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]      master -> master
+ * [new tag]         one -> one
+[master 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  master -> master
+ok 3 - two push options work
 
+expecting success: 
+	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 &&
 
-Cloning into 'clone-o'...
+	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 parent submodule add ../upstream workbench &&
+	git -C parent/workbench remote add up ../../upstream &&
+	git -C parent commit -m "add submoule" &&
+
+	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 master &&
+
+	git -C upstream rev-parse --verify master >expect &&
+	git -C parent/workbench rev-parse --verify master >actual &&
+	test_cmp expect actual &&
+
+	git -C parent_upstream rev-parse --verify master >expect &&
+	git -C parent rev-parse --verify master >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/git-2.20.1/t/trash directory.t5545-push-options/upstream/.git/
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5545-push-options/workbench/.git/
+[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/git-2.20.1/t/trash directory.t5545-push-options/parent/.git/
+[master (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]      master -> master
+ * [new tag]         one -> one
+Cloning into '/build/git-2.20.1/t/trash directory.t5545-push-options/parent/workbench'...
 done.
-43e4eeedaf88203d7995b0155d141002caeecdbe
-ok 2 - clone -o
+[master f3f0fa6] add submoule
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 workbench
+[master 8f1d4ef] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+[master 4bd3bdf] update workbench
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Pushing submodule 'workbench'
+remote: warning: updating the current branch        
+To ../../upstream
+   d79ce16..8f1d4ef  master -> master
+remote: warning: updating the current branch        
+To ../parent_upstream
+   b838542..4bd3bdf  master -> master
+ok 4 - push options and submodules
 
 expecting success: 
+	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 master
+	) &&
+	test_refs master master &&
+	echo "default" >expect &&
+	test_cmp expect upstream/.git/hooks/pre-receive.push_options &&
+	test_cmp expect upstream/.git/hooks/post-receive.push_options
 
-	git clone "file://$(pwd)/parent" clone-redirected >out 2>err &&
-	! grep % err &&
-	test_i18ngrep ! "Checking connectivity" err
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5545-push-options/upstream/.git/
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5545-push-options/workbench/.git/
+[master (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]      master -> master
+ * [new tag]         one -> one
+[master 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  master -> master
+ok 5 - default push option
 
+expecting success: 
+	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 master
+	) &&
+	test_refs master master &&
+	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 - redirected clone does not show progress
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5545-push-options/upstream/.git/
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5545-push-options/workbench/.git/
+[master (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]      master -> master
+ * [new tag]         one -> one
+[master 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  master -> master
+ok 6 - two default push options
 
 expecting success: 
+	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 master
+	) &&
+	test_refs master master &&
+	echo "manual" >expect &&
+	test_cmp expect upstream/.git/hooks/pre-receive.push_options &&
+	test_cmp expect upstream/.git/hooks/post-receive.push_options
 
-	git clone --progress "file://$(pwd)/parent" clone-redirected-progress \
-		>out 2>err &&
-	grep % err
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5545-push-options/upstream/.git/
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5545-push-options/workbench/.git/
+[master (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]      master -> master
+ * [new tag]         one -> one
+[master 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  master -> master
+ok 7 - push option from command line overrides from-config push option
 
+expecting success: 
+	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 master
+	) &&
+	test_refs master master &&
+	echo "default2" >expect &&
+	test_cmp expect upstream/.git/hooks/pre-receive.push_options &&
+	test_cmp expect upstream/.git/hooks/post-receive.push_options
 
-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 4 - redirected clone -v does show progress
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5545-push-options/upstream/.git/
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5545-push-options/workbench/.git/
+[master (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]      master -> master
+ * [new tag]         one -> one
+[master 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  master -> master
+ok 8 - empty value of push.pushOption in config clears the list
 
-# passed all 4 test(s)
-1..4
+expecting success: 
+	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 master
+	) &&
+	test_refs master HEAD@{1}
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5545-push-options/upstream/.git/
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5545-push-options/workbench/.git/
+[master (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]      master -> master
+ * [new tag]         one -> one
+[master 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: 
+	mk_repo_pair &&
+	git -C upstream config receive.advertisePushOptions true &&
+	test_commit -C workbench one &&
+	git -C workbench push --push-option="\"embedded quotes\"" up master &&
+	echo "\"embedded quotes\"" >expect &&
+	test_cmp expect upstream/.git/hooks/pre-receive.push_options
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5545-push-options/upstream/.git/
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5545-push-options/workbench/.git/
+[master (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]      master -> master
+ok 10 - push options keep quoted characters intact (direct)
+
+checking prerequisite: NOT_ROOT
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
+	uid=$(id -u) &&
+	test "$uid" != 0
+
+)
+prerequisite NOT_ROOT ok
+# passed all 10 test(s)
+# SKIP no web server found at '/usr/sbin/apache2'
+1..10
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
 *** t5608-clone-2gb.sh ***
@@ -196482,6 +196701,58 @@
 1..3
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
+*** t5606-clone-options.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5606-clone-options/.git/
+expecting success: 
+
+	mkdir parent &&
+	(cd parent && git init &&
+	 echo one >file && git add file &&
+	 git commit -m one)
+
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5606-clone-options/parent/.git/
+[master (root-commit) c401c73] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+ok 1 - setup
+
+expecting success: 
+
+	git clone -o foo parent clone-o &&
+	(cd clone-o && git rev-parse --verify refs/remotes/foo/master)
+
+
+Cloning into 'clone-o'...
+done.
+c401c735d055b4d4a3966663da200461cdab3353
+ok 2 - clone -o
+
+expecting success: 
+
+	git clone "file://$(pwd)/parent" clone-redirected >out 2>err &&
+	! grep % err &&
+	test_i18ngrep ! "Checking connectivity" err
+
+
+ok 3 - redirected clone does not show progress
+
+expecting success: 
+
+	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 4 - redirected clone -v does show progress
+
+# passed all 4 test(s)
+1..4
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
 *** t5609-clone-branch.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5609-clone-branch/.git/
 expecting success: 
@@ -196495,12 +196766,12 @@
 	(cd empty && git init)
 
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5609-clone-branch/parent/.git/
-[master (root-commit) 1b92f86] one
+[master (root-commit) 109536b] one
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 file
 Switched to a new branch 'two'
-[two cf63c56] two
+[two cb51c2f] two
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 Switched to branch 'master'
@@ -196554,12 +196825,12 @@
 
 Cloning into 'clone-bogus'...
 fatal: Remote branch bogus not found in upstream origin
+fatal: the remote end hung up unexpectedly
 ok 6 - clone -b with bogus branch
 
 expecting success: 
 	test_must_fail git clone -b branch empty clone-branch-empty
 
-fatal: the remote end hung up unexpectedly
 Cloning into 'clone-branch-empty'...
 fatal: Remote branch branch not found in upstream origin
 ok 7 - clone -b not allowed with empty repos
@@ -196569,6 +196840,397 @@
 1..7
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
+*** t5607-clone-bundle.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5607-clone-bundle/.git/
+expecting success: 
+	test_commit initial &&
+	test_tick &&
+	git tag -m tag tag &&
+	test_commit second &&
+	test_commit third &&
+	git tag -d initial &&
+	git tag -d second &&
+	git tag -d third
+
+[master (root-commit) 24b24cf] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+[master 21f74a9] second
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 second.t
+[master d31729a] third
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 third.t
+Deleted tag 'initial' (was 24b24cf)
+Deleted tag 'second' (was 21f74a9)
+Deleted tag 'third' (was d31729a)
+ok 1 - setup
+
+expecting success: 
+	git bundle create bundle --all --since=7.Apr.2005.15:14:00.-0700 &&
+	git ls-remote bundle > output &&
+	grep tag output &&
+	git bundle create bundle --all --since=7.Apr.2005.15:16:00.-0700 &&
+	git ls-remote bundle > output &&
+	! grep tag output
+
+e01ff0465079785b971390644b3ef4ec3a910f75	refs/tags/tag
+ok 2 - annotated tags can be excluded by rev-list options
+
+expecting success: 
+	mkdir adir &&
+	test_must_fail git bundle create adir --all
+
+fatal: cannot create 'adir': Is a directory
+ok 3 - die if bundle file cannot be created
+
+checking known breakage: 
+	echo master | git bundle create stdin-bundle.bdl --stdin &&
+	git ls-remote stdin-bundle.bdl >output &&
+	grep master output
+
+fatal: Refusing to create empty bundle.
+not ok 4 - bundle --stdin # TODO known breakage
+
+checking known breakage: 
+	echo master | git bundle create hybrid-bundle.bdl --stdin tag &&
+	git ls-remote hybrid-bundle.bdl >output &&
+	grep master output
+
+not ok 5 - bundle --stdin <rev-list options> # TODO known breakage
+
+expecting success: 
+	: >empty-bundle &&
+	test_must_fail git fetch empty-bundle
+
+fatal: invalid gitfile format: empty-bundle
+fatal: Could not read from remote repository.
+
+Please make sure you have the correct access rights
+and the repository exists.
+ok 6 - empty bundle file is rejected
+
+expecting success: 
+	: >file4 &&
+	test_tick &&
+	git add file4 &&
+	printf "%01200d\n" 0 | git commit -F - &&
+	test_commit fifth &&
+	git bundle create long-subject-bundle.bdl HEAD^..HEAD &&
+	git bundle list-heads long-subject-bundle.bdl >heads &&
+	test -s heads &&
+	git fetch long-subject-bundle.bdl &&
+	sed -n "/^-/{p;q;}" long-subject-bundle.bdl >boundary &&
+	grep "^-[0-9a-f]\\{40\\} " boundary
+
+[master 731e220] 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 file4
+[master fc029ac] fifth
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 fifth.t
+From long-subject-bundle.bdl
+ * branch            HEAD       -> FETCH_HEAD
+-731e22069f935c2baa02a907c08e20d012404511 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+ok 7 - ridiculously long subject in boundary
+
+expecting success: 
+	: >file1 &&
+	git add file1 &&
+	test_tick &&
+	git commit --allow-empty-message -m "" &&
+	test_commit file2 &&
+	git bundle create bundle HEAD^.. &&
+	git bundle verify bundle
+
+[master 1e44ac2] 
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 file1
+[master 3fdaba7] file2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file2.t
+bundle is okay
+The bundle contains this ref:
+3fdaba71a8ccb4d44ffe75938a9a115cfea4806a HEAD
+The bundle requires this ref:
+1e44ac2f9ccb8d3590010e3ee941dc1d4be2e304 
+ok 8 - prerequisites with an empty commit message
+
+expecting success: 
+	# This fails because the bundle would be empty.
+	test_must_fail git bundle create fail.bundle master..master &&
+	test_path_is_missing fail.bundle.lock
+
+fatal: Refusing to create empty bundle.
+ok 9 - failed bundle creation does not leave cruft
+
+# still have 2 known breakage(s)
+# passed all remaining 7 test(s)
+1..9
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t5610-clone-detached.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5610-clone-detached/.git/
+expecting success: 
+	echo one >file &&
+	git add file &&
+	git commit -m one &&
+	echo two >file &&
+	git commit -a -m two &&
+	git tag two &&
+	echo three >file &&
+	git commit -a -m three
+
+[master (root-commit) 109536b] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+[master cb51c2f] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[master 5e859c3] three
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 1 - setup
+
+expecting success: 
+	git checkout master^0 &&
+	git clone "file://$PWD" detached-branch
+
+Note: checking out 'master^0'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by performing another checkout.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -b with the checkout command again. Example:
+
+  git checkout -b <new-branch-name>
+
+HEAD is now at 5e859c3 three
+Cloning into 'detached-branch'...
+ok 2 - clone repo (detached HEAD points to branch)
+
+expecting success: 
+	echo three >expect &&
+	git --git-dir=detached-branch/.git log -1 --format=%s >actual &&
+	test_cmp expect actual
+
+ok 3 - cloned HEAD matches
+
+checking known breakage: 
+	head_is_detached detached-branch
+
+5e859c3e4442660d624879be38c0d3863ba25a47
+refs/heads/master
+test_must_fail: command succeeded: git --git-dir=detached-branch/.git symbolic-ref HEAD
+not ok 4 - cloned HEAD is detached # TODO known breakage
+
+expecting success: 
+	git checkout two^0 &&
+	git clone "file://$PWD" detached-tag
+
+Previous HEAD position was 5e859c3 three
+HEAD is now at cb51c2f two
+Cloning into 'detached-tag'...
+Note: checking out 'cb51c2f840ca7832ee32621023d982b783c94213'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by performing another checkout.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -b with the checkout command again. Example:
+
+  git checkout -b <new-branch-name>
+
+ok 5 - clone repo (detached HEAD points to tag)
+
+expecting success: 
+	echo two >expect &&
+	git --git-dir=detached-tag/.git log -1 --format=%s >actual &&
+	test_cmp expect actual
+
+ok 6 - cloned HEAD matches
+
+expecting success: 
+	head_is_detached detached-tag
+
+cb51c2f840ca7832ee32621023d982b783c94213
+fatal: ref HEAD is not a symbolic ref
+ok 7 - cloned HEAD is detached
+
+expecting success: 
+	git checkout two^ &&
+	git clone "file://$PWD" detached-history
+
+Previous HEAD position was cb51c2f two
+HEAD is now at 109536b one
+Cloning into 'detached-history'...
+Note: checking out '109536b57dec4e1961d5589e15b31eb6a2e09899'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by performing another checkout.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -b with the checkout command again. Example:
+
+  git checkout -b <new-branch-name>
+
+ok 8 - clone repo (detached HEAD points to history)
+
+expecting success: 
+	echo one >expect &&
+	git --git-dir=detached-history/.git log -1 --format=%s >actual &&
+	test_cmp expect actual
+
+ok 9 - cloned HEAD matches
+
+expecting success: 
+	head_is_detached detached-history
+
+109536b57dec4e1961d5589e15b31eb6a2e09899
+fatal: ref HEAD is not a symbolic ref
+ok 10 - cloned HEAD is detached
+
+expecting success: 
+	git checkout master^0 &&
+	echo four >file &&
+	git commit -a -m four &&
+	git clone "file://$PWD" detached-orphan
+
+Previous HEAD position was 109536b one
+HEAD is now at 5e859c3 three
+[detached HEAD 8b09f06] four
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Cloning into 'detached-orphan'...
+Note: checking out '8b09f06851a0aefd75cc2409801d2888b6ebf276'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by performing another checkout.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -b with the checkout command again. Example:
+
+  git checkout -b <new-branch-name>
+
+ok 11 - clone repo (orphan detached HEAD)
+
+expecting success: 
+	echo four >expect &&
+	git --git-dir=detached-orphan/.git log -1 --format=%s >actual &&
+	test_cmp expect actual
+
+ok 12 - cloned HEAD matches
+
+expecting success: 
+	head_is_detached detached-orphan
+
+8b09f06851a0aefd75cc2409801d2888b6ebf276
+fatal: ref HEAD is not a symbolic ref
+ok 13 - cloned HEAD is detached
+
+# still have 1 known breakage(s)
+# passed all remaining 12 test(s)
+1..13
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t5611-clone-config.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5611-clone-config/.git/
+expecting success: 
+	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: 
+	rm -rf child &&
+	git clone -c core.foo=bar -c core.foo=baz . child &&
+	{ echo bar; echo 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: 
+	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: 
+	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: 
+	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
+
+[master (root-commit) c2ac0aa] 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
+
+skipping test: clone -c core.hideDotFiles 
+	test_commit attributes .gitattributes "" &&
+	rm -rf child &&
+	git clone -c core.hideDotFiles=false . child &&
+	! is_hidden child/.gitattributes &&
+	rm -rf child &&
+	git clone -c core.hideDotFiles=dotGitOnly . child &&
+	! is_hidden child/.gitattributes &&
+	rm -rf child &&
+	git clone -c core.hideDotFiles=true . child &&
+	is_hidden child/.gitattributes
+
+ok 6 # skip clone -c core.hideDotFiles (missing MINGW)
+
+# passed all 6 test(s)
+1..6
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
 *** t5526-fetch-submodules.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5526-fetch-submodules/.git/
 expecting success: 
@@ -196598,21 +197260,21 @@
 	)
 
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5526-fetch-submodules/deepsubmodule/.git/
-[master (root-commit) 1e196cd] new
+[master (root-commit) 201a31b] new
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 deepsubfile
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5526-fetch-submodules/submodule/.git/
 Cloning into '/build/git-2.20.1/t/trash directory.t5526-fetch-submodules/submodule/subdir/deepsubmodule'...
 done.
-[master (root-commit) 5f7d13d] new
+[master (root-commit) eaa24e3] new
  Author: A U Thor <author@example.com>
  3 files changed, 5 insertions(+)
  create mode 100644 .gitmodules
  create mode 160000 subdir/deepsubmodule
  create mode 100644 subfile
 Adding existing repo at 'submodule' to the index
-[master (root-commit) 3dff0b7] initial
+[master (root-commit) ca1a31a] initial
  Author: A U Thor <author@example.com>
  2 files changed, 4 insertions(+)
  create mode 100644 .gitmodules
@@ -196622,11 +197284,11 @@
 Submodule 'submodule' (/build/git-2.20.1/t/trash directory.t5526-fetch-submodules/submodule) registered for path 'submodule'
 Cloning into '/build/git-2.20.1/t/trash directory.t5526-fetch-submodules/downstream/submodule'...
 done.
-Submodule path 'submodule': checked out '5f7d13d398d6483d2f7eb695a10b68a259b56e60'
+Submodule path 'submodule': checked out 'eaa24e33b1d3c4f282369670315822d6c6a2e6bd'
 Submodule 'subdir/deepsubmodule' (/build/git-2.20.1/t/trash directory.t5526-fetch-submodules/deepsubmodule) registered for path 'submodule/subdir/deepsubmodule'
 Cloning into '/build/git-2.20.1/t/trash directory.t5526-fetch-submodules/downstream/submodule/subdir/deepsubmodule'...
 done.
-Submodule path 'submodule/subdir/deepsubmodule': checked out '1e196cdd49bacc10759360b90d0f4ff7b04cc025'
+Submodule path 'submodule/subdir/deepsubmodule': checked out '201a31bf8007afd7f35d89f18ec341a9fe3bee10'
 ok 1 - setup
 
 expecting success: 
@@ -196638,10 +197300,10 @@
 	test_must_be_empty actual.out &&
 	test_i18ncmp expect.err actual.err
 
-[master 5c4d636] new
+[master 4364674] new
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[master 2043ad7] new
+[master ada886a] new
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 ok 2 - fetch --recurse-submodules recurses into submodules
@@ -196655,10 +197317,10 @@
 	test_must_be_empty actual.out &&
 	test_i18ncmp expect.err actual.err
 
-[master b7e89ab] new
+[master 9bd8269] new
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[master b7ea4c8] new
+[master 1fbf790] new
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 ok 3 - submodule.recurse option triggers recursive fetch
@@ -196673,10 +197335,10 @@
 	test_i18ncmp expect.err actual.err &&
 	grep "2 tasks" trace.out
 
-[master 114adb4] new
+[master f7b27db] new
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[master 0470658] new
+[master 97e2d94] new
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 run_processes_parallel: preparing to run up to 2 tasks
@@ -196691,10 +197353,10 @@
 	test_must_be_empty actual.out &&
 	test_must_be_empty actual.err
 
-[master d3f9a5c] new
+[master 8cc61e6] new
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[master b4ae87f] new
+[master 7da8bea] new
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 ok 5 - fetch alone only fetches superproject
@@ -196729,10 +197391,10 @@
 	test_must_be_empty actual.out &&
 	test_must_be_empty actual.err
 
-[master 6177f95] new
+[master 2115218] new
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[master ded5f91] new
+[master e6007b0] new
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 ok 8 - --no-recurse-submodules overrides .gitmodules config
@@ -196789,10 +197451,10 @@
 	test_must_be_empty actual.out &&
 	test_i18ncmp expect.err actual.err
 
-[master 18dfd8d] new
+[master 02151e1] new
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[master c330c5a] new
+[master ffb39ba] new
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 ok 13 - --dry-run propagates to submodules
@@ -196817,10 +197479,10 @@
 	test_must_be_empty actual.out &&
 	test_i18ncmp expect.err actual.err
 
-[master 5158b47] new
+[master d259ea1] new
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[master 6df62b8] new
+[master 60a7b31] new
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 ok 15 - recurseSubmodules=true propagates into submodules
@@ -196838,10 +197500,10 @@
 	test_must_be_empty actual.out &&
 	test_i18ncmp expect.err actual.err
 
-[master 3576e27] new
+[master 167cd81] new
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[master de63402] new
+[master 63fd2bd] new
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 ok 16 - --recurse-submodules overrides config in submodule
@@ -196856,10 +197518,10 @@
 	test_must_be_empty actual.out &&
 	test_must_be_empty actual.err
 
-[master 2f66d3a] new
+[master 266f0b9] new
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[master 4e9851b] new
+[master cec3c2e] new
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 ok 17 - --no-recurse-submodules overrides config setting
@@ -196894,7 +197556,7 @@
 	test_i18ncmp expect.err.sub actual.err &&
 	test_must_be_empty actual.out
 
-[master 258fe88] new submodule
+[master 0eeae44] new submodule
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 ok 19 - Recursion stops when no new submodule commits are fetched
@@ -196915,13 +197577,13 @@
 	test_must_be_empty actual.out &&
 	test_i18ncmp expect.err.file actual.err
 
-[master 237db07] new
+[master 9ef0f36] new
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[master 95e2933] new
+[master 54b5578] new
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[master f4a7ff5] new file
+[master 3d7ea69] new file
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 file
@@ -196957,17 +197619,17 @@
 
 Fetching submodule submodule
 From /build/git-2.20.1/t/trash directory.t5526-fetch-submodules/submodule
-   2f66d3a..237db07  master     -> origin/master
+   266f0b9..9ef0f36  master     -> origin/master
 Fetching submodule submodule/subdir/deepsubmodule
 From /build/git-2.20.1/t/trash directory.t5526-fetch-submodules/deepsubmodule
-   de63402..95e2933  master     -> origin/master
-[master ffb1c3e] new
+   63fd2bd..54b5578  master     -> origin/master
+[master 510bed3] new
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[master 537bf40] new
+[master c4f742d] new
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[master 0ce2cf6] new submodule
+[master 0cfcade] new submodule
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 ok 21 - Recursion picks up config in submodule
@@ -197004,18 +197666,18 @@
 	test_i18ncmp expect.err.2 actual.err &&
 	test_must_be_empty actual.out
 
-[master 0ff551e] new
+[master 7cc924a] new
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[master 2635c8e] new
+[master 3262a64] new
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 From /build/git-2.20.1/t/trash directory.t5526-fetch-submodules/deepsubmodule
-   1e196cd..2635c8e  master     -> origin/master
-[master 163c558] new deepsubmodule
+   201a31b..3262a64  master     -> origin/master
+[master aac60e1] new deepsubmodule
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-[master a567018] new submodule
+[master be3bcf3] new submodule
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 ok 22 - Recursion picks up all submodules when necessary
@@ -197046,15 +197708,15 @@
 	test_must_be_empty actual.out &&
 	test_must_be_empty actual.err
 
-[master 247d400] new
+[master 1717e4d] new
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[master d21fd08] new
+[master a2c4f81] new
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 From /build/git-2.20.1/t/trash directory.t5526-fetch-submodules/deepsubmodule
-   2635c8e..d21fd08  master     -> origin/master
-[master f5ba82d] new deepsubmodule
+   3262a64..a2c4f81  master     -> origin/master
+[master dd5cbba] new deepsubmodule
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 ok 23 - '--recurse-submodules=on-demand' doesn't recurse when no new commits are fetched in the superproject (and ignores config)
@@ -197086,7 +197748,7 @@
 	test_must_be_empty actual.out &&
 	test_i18ncmp expect.err actual.err
 
-[master 8ff3dda] new submodule
+[master 252acc4] new submodule
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 ok 24 - '--recurse-submodules=on-demand' recurses as deep as necessary (and ignores config)
@@ -197107,13 +197769,13 @@
 	test_must_be_empty actual.out &&
 	test_i18ncmp expect.err.file actual.err
 
-[master 3bd8242] new
+[master e170976] new
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[master 9dc53c6] new
+[master 8ce3a6b] new
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[master a801382] new file
+[master c94c909] new file
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 ok 25 - '--recurse-submodules=on-demand' stops when no new submodule commits are found in the superproject (and ignores config)
@@ -197147,17 +197809,17 @@
 
 Fetching submodule submodule
 From /build/git-2.20.1/t/trash directory.t5526-fetch-submodules/submodule
-   f5ba82d..3bd8242  master     -> origin/master
+   dd5cbba..e170976  master     -> origin/master
 Fetching submodule submodule/subdir/deepsubmodule
 From /build/git-2.20.1/t/trash directory.t5526-fetch-submodules/deepsubmodule
-   d21fd08..9dc53c6  master     -> origin/master
-[master bb003fc] new
+   a2c4f81..8ce3a6b  master     -> origin/master
+[master c9fe75b] new
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[master 5afad78] new
+[master ce58819] new
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[master 5cbf9ee] new submodule
+[master ece91b1] new submodule
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 ok 26 - 'fetch.recurseSubmodules=on-demand' overrides global config
@@ -197192,14 +197854,14 @@
 Fetching submodule submodule
 Fetching submodule submodule/subdir/deepsubmodule
 From /build/git-2.20.1/t/trash directory.t5526-fetch-submodules/deepsubmodule
-   9dc53c6..5afad78  master     -> origin/master
-[master 1f8b0e8] new
+   8ce3a6b..ce58819  master     -> origin/master
+[master a9c0dbc] new
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[master 20e488b] new
+[master 81391fe] new
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[master 9bef331] new submodule
+[master fe6aa8e] new submodule
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 ok 27 - 'submodule.<sub>.fetchRecurseSubmodules=on-demand' overrides fetch.recurseSubmodules
@@ -197226,7 +197888,7 @@
 		git checkout -q master
 	)
 
-[master c9cb02f] submodule rewound
+[master 5e157bc] submodule rewound
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 ok 28 - don't fetch submodule when newly recorded commits are already present
@@ -197268,20 +197930,20 @@
 Fetching submodule submodule
 Fetching submodule submodule/subdir/deepsubmodule
 From /build/git-2.20.1/t/trash directory.t5526-fetch-submodules/deepsubmodule
-   5afad78..20e488b  master     -> origin/master
-[master 939677d] new
+   ce58819..81391fe  master     -> origin/master
+[master 0682d6a] new
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[master 4ef59ad] new
+[master 6a679c0] new
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 rm '.gitmodules'
-[master 903175b] new submodule without .gitmodules
+[master b7e2674] new submodule without .gitmodules
  Author: A U Thor <author@example.com>
  2 files changed, 1 insertion(+), 4 deletions(-)
  delete mode 100644 .gitmodules
-HEAD is now at 3dff0b7 initial
-[master 1ee8c0b] new submodule restored .gitmodules
+HEAD is now at ca1a31a initial
+[master e5b7ca2] new submodule restored .gitmodules
  Author: A U Thor <author@example.com>
  1 file changed, 3 insertions(+)
  create mode 100644 .gitmodules
@@ -197301,7 +197963,7 @@
 	)
 
 From /build/git-2.20.1/t/trash directory.t5526-fetch-submodules/.
-   903175b..1ee8c0b  master     -> origin/master
+   b7e2674..e5b7ca2  master     -> origin/master
 run_processes_parallel: preparing to run up to 7 tasks
 run_processes_parallel: preparing to run up to 8 tasks
 run_processes_parallel: preparing to run up to 9 tasks
@@ -197343,10 +198005,10 @@
 
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5526-fetch-submodules/src/.git/
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5526-fetch-submodules/src/sub/.git/
-[master (root-commit) fd07224] initial in sub
+[master (root-commit) 17379de] initial in sub
  Author: A U Thor <author@example.com>
 Adding existing repo at 'sub' to the index
-[master (root-commit) 1682f5f] initial in top
+[master (root-commit) 842897a] initial in top
  Author: A U Thor <author@example.com>
  2 files changed, 4 insertions(+)
  create mode 100644 .gitmodules
@@ -197401,20 +198063,20 @@
 Submodule 'submodule' (/build/git-2.20.1/t/trash directory.t5526-fetch-submodules/submodule) registered for path 'submodule'
 Cloning into '/build/git-2.20.1/t/trash directory.t5526-fetch-submodules/downstream_rename/submodule'...
 done.
-Submodule path 'submodule': checked out '939677d1c2045d107d24c20fdb9b031c74779aff'
+Submodule path 'submodule': checked out '0682d6a58a31c1f9e732c65484484cc41eb2fd6d'
 Submodule 'subdir/deepsubmodule' (/build/git-2.20.1/t/trash directory.t5526-fetch-submodules/deepsubmodule) registered for path 'submodule/subdir/deepsubmodule'
 Cloning into '/build/git-2.20.1/t/trash directory.t5526-fetch-submodules/downstream_rename/submodule/subdir/deepsubmodule'...
 done.
-Submodule path 'submodule/subdir/deepsubmodule': checked out 'd21fd08256fcfd8a432d345e5728ed871d9bd07f'
+Submodule path 'submodule/subdir/deepsubmodule': checked out 'a2c4f81e8035131e9426b93946509222d43d9f50'
 Switched to a new branch 'rename'
 Switched to a new branch 'rename_sub'
-[rename_sub b40d1ba] a
+[rename_sub ac15336] a
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 a
 To /build/git-2.20.1/t/trash directory.t5526-fetch-submodules/submodule
  * [new branch]      rename_sub -> rename_sub
-[rename f0710f3] update renamed submodule
+[rename 07b3ae2] update renamed submodule
  Author: A U Thor <author@example.com>
  3 files changed, 2 insertions(+), 2 deletions(-)
  delete mode 160000 submodule
@@ -197432,225 +198094,227 @@
 1..32
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t5607-clone-bundle.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5607-clone-bundle/.git/
+*** t5605-clone-local.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5605-clone-local/.git/
 expecting success: 
-	test_commit initial &&
-	test_tick &&
-	git tag -m tag tag &&
-	test_commit second &&
-	test_commit third &&
-	git tag -d initial &&
-	git tag -d second &&
-	git tag -d third
+	: >file && git add . && git commit -m1 &&
+	git clone --bare . a.git &&
+	git clone --bare . x &&
+	test "$(cd a.git && git config --bool core.bare)" = true &&
+	test "$(cd x && git config --bool core.bare)" = true &&
+	git bundle create b1.bundle --all &&
+	git bundle create b2.bundle master &&
+	mkdir dir &&
+	cp b1.bundle dir/b3 &&
+	cp b1.bundle b4
 
-[master (root-commit) 24b24cf] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-[master 21f74a9] second
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 second.t
-[master d31729a] third
+[master (root-commit) 518b96c] 1
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 third.t
-Deleted tag 'initial' (was 24b24cf)
-Deleted tag 'second' (was 21f74a9)
-Deleted tag 'third' (was d31729a)
-ok 1 - setup
+ 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: 
-	git bundle create bundle --all --since=7.Apr.2005.15:14:00.-0700 &&
-	git ls-remote bundle > output &&
-	grep tag output &&
-	git bundle create bundle --all --since=7.Apr.2005.15:16:00.-0700 &&
-	git ls-remote bundle > output &&
-	! grep tag output
+	git clone -l -s a b &&
+	(cd b &&
+	test "$(git config --bool core.bare)" = false &&
+	git fetch)
 
-e01ff0465079785b971390644b3ef4ec3a910f75	refs/tags/tag
-ok 2 - annotated tags can be excluded by rev-list options
+Cloning into 'b'...
+done.
+ok 2 - local clone without .git suffix
 
 expecting success: 
-	mkdir adir &&
-	test_must_fail git bundle create adir --all
+	git clone -l -s a.git c &&
+	(cd c && git fetch)
 
-fatal: cannot create 'adir': Is a directory
-ok 3 - die if bundle file cannot be created
+Cloning into 'c'...
+done.
+ok 3 - local clone with .git suffix
 
-checking known breakage: 
-	echo master | git bundle create stdin-bundle.bdl --stdin &&
-	git ls-remote stdin-bundle.bdl >output &&
-	grep master output
+expecting success: 
+	git clone -l -s x y &&
+	(cd y && git fetch)
 
-fatal: Refusing to create empty bundle.
-not ok 4 - bundle --stdin # TODO known breakage
+Cloning into 'y'...
+done.
+ok 4 - local clone from x
 
-checking known breakage: 
-	echo master | git bundle create hybrid-bundle.bdl --stdin tag &&
-	git ls-remote hybrid-bundle.bdl >output &&
-	grep master output
+expecting success: 
+	test_must_fail git clone -l -s x.git z
 
-not ok 5 - bundle --stdin <rev-list options> # TODO known breakage
+fatal: repository 'x.git' does not exist
+ok 5 - local clone from x.git that does not exist
 
 expecting success: 
-	: >empty-bundle &&
-	test_must_fail git fetch empty-bundle
+	git clone --bare --no-hardlinks x w &&
+	! repo_is_hardlinked w
 
-fatal: invalid gitfile format: empty-bundle
-fatal: Could not read from remote repository.
+Cloning into bare repository 'w'...
+done.
+test_line_count: line count for output != 0
+w/objects/51/8b96c1a61d24d83c1e5bc67e4343f8fd321014
+w/objects/df/2b8fc99e1c1d4dbc0a854d9f72157f1d6ea078
+w/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391
+ok 6 - With -no-hardlinks, local will make a copy
 
-Please make sure you have the correct access rights
-and the repository exists.
-ok 6 - empty bundle file is rejected
+expecting success: 
+	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: 
-	: >file4 &&
-	test_tick &&
-	git add file4 &&
-	printf "%01200d\n" 0 | git commit -F - &&
-	test_commit fifth &&
-	git bundle create long-subject-bundle.bdl HEAD^..HEAD &&
-	git bundle list-heads long-subject-bundle.bdl >heads &&
-	test -s heads &&
-	git fetch long-subject-bundle.bdl &&
-	sed -n "/^-/{p;q;}" long-subject-bundle.bdl >boundary &&
-	grep "^-[0-9a-f]\\{40\\} " boundary
+	echo "ref: refs/heads/nonexistent" > a.git/HEAD &&
+	git clone a d &&
+	(cd d &&
+	git fetch &&
+	test ! -e .git/refs/remotes/origin/HEAD)
 
-[master 731e220] 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 file4
-[master fc029ac] fifth
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 fifth.t
-From long-subject-bundle.bdl
- * branch            HEAD       -> FETCH_HEAD
--731e22069f935c2baa02a907c08e20d012404511 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-ok 7 - ridiculously long subject in boundary
+Cloning into 'd'...
+done.
+warning: remote HEAD refers to nonexistent ref, unable to checkout.
+
+ok 8 - local clone of repo with nonexistent ref in HEAD
 
 expecting success: 
-	: >file1 &&
-	git add file1 &&
-	test_tick &&
-	git commit --allow-empty-message -m "" &&
-	test_commit file2 &&
-	git bundle create bundle HEAD^.. &&
-	git bundle verify bundle
+	git clone dir/b3 &&
+	(cd b3 && git fetch)
 
-[master 1e44ac2] 
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 file1
-[master 3fdaba7] file2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file2.t
-bundle is okay
-The bundle contains this ref:
-3fdaba71a8ccb4d44ffe75938a9a115cfea4806a HEAD
-The bundle requires this ref:
-1e44ac2f9ccb8d3590010e3ee941dc1d4be2e304 
-ok 8 - prerequisites with an empty commit message
+Cloning into 'b3'...
+ok 9 - bundle clone without .bundle suffix
 
 expecting success: 
-	# This fails because the bundle would be empty.
-	test_must_fail git bundle create fail.bundle master..master &&
-	test_path_is_missing fail.bundle.lock
+	git clone b1.bundle &&
+	(cd b1 && git fetch)
 
-fatal: Refusing to create empty bundle.
-ok 9 - failed bundle creation does not leave cruft
+Cloning into 'b1'...
+ok 10 - bundle clone with .bundle suffix
 
-# still have 2 known breakage(s)
-# passed all remaining 7 test(s)
-1..9
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t5611-clone-config.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5611-clone-config/.git/
 expecting success: 
-	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
+	git clone b4 bdl &&
+	(cd bdl && git fetch)
 
-Cloning into 'child'...
-warning: You appear to have cloned an empty repository.
-done.
-ok 1 - clone -c sets config in cloned repo
+Cloning into 'bdl'...
+ok 11 - bundle clone from b4
 
 expecting success: 
-	rm -rf child &&
-	git clone -c core.foo=bar -c core.foo=baz . child &&
-	{ echo bar; echo baz; } >expect &&
-	git --git-dir=child/.git config --get-all core.foo >actual &&
-	test_cmp expect actual
+	test_must_fail git clone b4.bundle bb
 
-Cloning into 'child'...
-warning: You appear to have cloned an empty repository.
-done.
-ok 2 - clone -c can set multi-keys
+fatal: repository 'b4.bundle' does not exist
+ok 12 - bundle clone from b4.bundle that does not exist
 
 expecting success: 
-	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
+	git clone b2.bundle b2 &&
+	(cd b2 &&
+	git fetch &&
+	test_must_fail git rev-parse --verify refs/heads/master)
 
-Cloning into 'child'...
+Cloning into 'b2'...
+warning: remote HEAD refers to nonexistent ref, unable to checkout.
+
+fatal: Needed a single revision
+ok 13 - bundle clone with nonexistent HEAD
+
+expecting success: 
+	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 master &&
+	 expected=$(git rev-parse master) &&
+	 actual=$(git --git-dir=../empty/.git rev-parse master) &&
+	 test $actual = $expected)
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5605-clone-local/empty/.git/
+Cloning into 'empty-clone'...
 warning: You appear to have cloned an empty repository.
 done.
-ok 3 - clone -c can set multi-keys, including some empty
+[master (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/git-2.20.1/t/trash directory.t5605-clone-local/empty
+ * [new branch]      master -> master
+ok 14 - clone empty repository
 
 expecting success: 
-	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
+	rm -fr empty/ empty-clone/ &&
+	mkdir empty &&
+	(cd empty && git init) &&
+	git clone empty empty-clone &&
+	(cd empty-clone &&
+	test_must_fail git push)
 
-Cloning into 'child'...
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5605-clone-local/empty/.git/
+Cloning into 'empty-clone'...
 warning: You appear to have cloned an empty repository.
 done.
-ok 4 - clone -c without a value is boolean true
+error: src refspec refs/heads/master does not match any.
+error: failed to push some refs to '/build/git-2.20.1/t/trash directory.t5605-clone-local/empty'
+ok 15 - clone empty repository, and then push should not segfault.
 
 expecting success: 
-	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
+	rm -rf does-not-exist &&
+	test_must_fail git clone does-not-exist
 
-[master (root-commit) 87f1cf4] 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
+fatal: repository 'does-not-exist' does not exist
+ok 16 - cloning non-existent directory fails
 
-skipping test: clone -c core.hideDotFiles 
-	test_commit attributes .gitattributes "" &&
-	rm -rf child &&
-	git clone -c core.hideDotFiles=false . child &&
-	! is_hidden child/.gitattributes &&
-	rm -rf child &&
-	git clone -c core.hideDotFiles=dotGitOnly . child &&
-	! is_hidden child/.gitattributes &&
-	rm -rf child &&
-	git clone -c core.hideDotFiles=true . child &&
-	is_hidden child/.gitattributes
+expecting success: 
+	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
 
-ok 6 # skip clone -c core.hideDotFiles (missing MINGW)
+fatal: repository 'not-a-git-repo' does not exist
+ok 17 - cloning non-git directory fails
 
-# passed all 6 test(s)
-1..6
+expecting success: 
+	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-d07f030c5f68f9eb66e05f4cc48883e8682beed8.idx
+non-local/objects/pack/pack-d07f030c5f68f9eb66e05f4cc48883e8682beed8.pack
+ok 18 - cloning file:// does not hardlink
+
+expecting success: 
+	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-d07f030c5f68f9eb66e05f4cc48883e8682beed8.idx
+force-nonlocal/objects/pack/pack-d07f030c5f68f9eb66e05f4cc48883e8682beed8.pack
+ok 19 - cloning a local path with --no-local does not hardlink
+
+expecting success: 
+	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 20 - cloning locally respects "-u" for fetching refs
+
+# passed all 20 test(s)
+1..20
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
 *** t5515-fetch-merge-logic.sh ***
@@ -200699,229 +201363,6 @@
 1..65
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t5605-clone-local.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5605-clone-local/.git/
-expecting success: 
-	: >file && git add . && git commit -m1 &&
-	git clone --bare . a.git &&
-	git clone --bare . x &&
-	test "$(cd a.git && git config --bool core.bare)" = true &&
-	test "$(cd x && git config --bool core.bare)" = true &&
-	git bundle create b1.bundle --all &&
-	git bundle create b2.bundle master &&
-	mkdir dir &&
-	cp b1.bundle dir/b3 &&
-	cp b1.bundle b4
-
-[master (root-commit) 1a0bd73] 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: 
-	git clone -l -s a b &&
-	(cd b &&
-	test "$(git config --bool core.bare)" = false &&
-	git fetch)
-
-Cloning into 'b'...
-done.
-ok 2 - local clone without .git suffix
-
-expecting success: 
-	git clone -l -s a.git c &&
-	(cd c && git fetch)
-
-Cloning into 'c'...
-done.
-ok 3 - local clone with .git suffix
-
-expecting success: 
-	git clone -l -s x y &&
-	(cd y && git fetch)
-
-Cloning into 'y'...
-done.
-ok 4 - local clone from x
-
-expecting success: 
-	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: 
-	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/1a/0bd7306fd8146d5a6c354f01b8badeb1f07380
-w/objects/df/2b8fc99e1c1d4dbc0a854d9f72157f1d6ea078
-w/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391
-ok 6 - With -no-hardlinks, local will make a copy
-
-expecting success: 
-	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: 
-	echo "ref: refs/heads/nonexistent" > a.git/HEAD &&
-	git clone a d &&
-	(cd d &&
-	git fetch &&
-	test ! -e .git/refs/remotes/origin/HEAD)
-
-Cloning into 'd'...
-done.
-warning: remote HEAD refers to nonexistent ref, unable to checkout.
-
-ok 8 - local clone of repo with nonexistent ref in HEAD
-
-expecting success: 
-	git clone dir/b3 &&
-	(cd b3 && git fetch)
-
-Cloning into 'b3'...
-ok 9 - bundle clone without .bundle suffix
-
-expecting success: 
-	git clone b1.bundle &&
-	(cd b1 && git fetch)
-
-Cloning into 'b1'...
-ok 10 - bundle clone with .bundle suffix
-
-expecting success: 
-	git clone b4 bdl &&
-	(cd bdl && git fetch)
-
-Cloning into 'bdl'...
-ok 11 - bundle clone from b4
-
-expecting success: 
-	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: 
-	git clone b2.bundle b2 &&
-	(cd b2 &&
-	git fetch &&
-	test_must_fail git rev-parse --verify refs/heads/master)
-
-Cloning into 'b2'...
-warning: remote HEAD refers to nonexistent ref, unable to checkout.
-
-fatal: Needed a single revision
-ok 13 - bundle clone with nonexistent HEAD
-
-expecting success: 
-	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 master &&
-	 expected=$(git rev-parse master) &&
-	 actual=$(git --git-dir=../empty/.git rev-parse master) &&
-	 test $actual = $expected)
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5605-clone-local/empty/.git/
-Cloning into 'empty-clone'...
-warning: You appear to have cloned an empty repository.
-done.
-[master (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/git-2.20.1/t/trash directory.t5605-clone-local/empty
- * [new branch]      master -> master
-ok 14 - clone empty repository
-
-expecting success: 
-	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/git-2.20.1/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/master does not match any.
-error: failed to push some refs to '/build/git-2.20.1/t/trash directory.t5605-clone-local/empty'
-ok 15 - clone empty repository, and then push should not segfault.
-
-expecting success: 
-	rm -rf does-not-exist &&
-	test_must_fail git clone does-not-exist
-
-fatal: repository 'does-not-exist' does not exist
-ok 16 - cloning non-existent directory fails
-
-expecting success: 
-	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 17 - cloning non-git directory fails
-
-expecting success: 
-	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-0bd7bc98ec9c238aaeaf5eaf3f3ed9b349f0de3a.idx
-non-local/objects/pack/pack-0bd7bc98ec9c238aaeaf5eaf3f3ed9b349f0de3a.pack
-ok 18 - cloning file:// does not hardlink
-
-expecting success: 
-	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-0bd7bc98ec9c238aaeaf5eaf3f3ed9b349f0de3a.idx
-force-nonlocal/objects/pack/pack-0bd7bc98ec9c238aaeaf5eaf3f3ed9b349f0de3a.pack
-ok 19 - cloning a local path with --no-local does not hardlink
-
-expecting success: 
-	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 20 - cloning locally respects "-u" for fetching refs
-
-# passed all 20 test(s)
-1..20
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
 *** t5603-clone-dirname.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5603-clone-dirname/.git/
 expecting success: 
@@ -201354,174 +201795,86 @@
 1..47
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t5610-clone-detached.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5610-clone-detached/.git/
-expecting success: 
-	echo one >file &&
-	git add file &&
-	git commit -m one &&
-	echo two >file &&
-	git commit -a -m two &&
-	git tag two &&
-	echo three >file &&
-	git commit -a -m three
-
-[master (root-commit) 1b92f86] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-[master cf63c56] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[master 9672648] three
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 1 - setup
-
-expecting success: 
-	git checkout master^0 &&
-	git clone "file://$PWD" detached-branch
-
-Note: checking out 'master^0'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by performing another checkout.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
-
-  git checkout -b <new-branch-name>
-
-HEAD is now at 9672648 three
-Cloning into 'detached-branch'...
-ok 2 - clone repo (detached HEAD points to branch)
-
-expecting success: 
-	echo three >expect &&
-	git --git-dir=detached-branch/.git log -1 --format=%s >actual &&
-	test_cmp expect actual
-
-ok 3 - cloned HEAD matches
-
-checking known breakage: 
-	head_is_detached detached-branch
-
-96726485bd33e06dc70ac98bace50b8dec1d1e42
-refs/heads/master
-test_must_fail: command succeeded: git --git-dir=detached-branch/.git symbolic-ref HEAD
-not ok 4 - cloned HEAD is detached # TODO known breakage
-
+*** t5615-alternate-env.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5615-alternate-env/.git/
 expecting success: 
-	git checkout two^0 &&
-	git clone "file://$PWD" detached-tag
-
-Previous HEAD position was 9672648 three
-HEAD is now at cf63c56 two
-Cloning into 'detached-tag'...
-Note: checking out 'cf63c5689a810ecec479ecac10398456f8c1df17'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by performing another checkout.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
-
-  git checkout -b <new-branch-name>
+	git init --bare one.git &&
+	one=$(echo one | git -C one.git hash-object -w --stdin) &&
+	git init --bare two.git &&
+	two=$(echo two | git -C two.git hash-object -w --stdin)
 
-ok 5 - clone repo (detached HEAD points to tag)
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5615-alternate-env/one.git/
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5615-alternate-env/two.git/
+ok 1 - create alternate repositories
 
 expecting success: 
-	echo two >expect &&
-	git --git-dir=detached-tag/.git log -1 --format=%s >actual &&
-	test_cmp expect actual
+	check_obj "" <<-EOF
+	$one missing
+	$two missing
+	EOF
 
-ok 6 - cloned HEAD matches
+ok 2 - objects inaccessible without alternates
 
 expecting success: 
-	head_is_detached detached-tag
+	check_obj "$PWD/one.git/objects" <<-EOF
+	$one blob
+	$two missing
+	EOF
 
-cf63c5689a810ecec479ecac10398456f8c1df17
-fatal: ref HEAD is not a symbolic ref
-ok 7 - cloned HEAD is detached
+ok 3 - access alternate via absolute path
 
 expecting success: 
-	git checkout two^ &&
-	git clone "file://$PWD" detached-history
-
-Previous HEAD position was cf63c56 two
-HEAD is now at 1b92f86 one
-Cloning into 'detached-history'...
-Note: checking out '1b92f86567c6ace908df93921586dce513559a3c'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by performing another checkout.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
-
-  git checkout -b <new-branch-name>
+	check_obj "$PWD/one.git/objects:$PWD/two.git/objects" <<-EOF
+	$one blob
+	$two blob
+	EOF
 
-ok 8 - clone repo (detached HEAD points to history)
+ok 4 - access multiple alternates
 
 expecting success: 
-	echo one >expect &&
-	git --git-dir=detached-history/.git log -1 --format=%s >actual &&
-	test_cmp expect actual
+	git init --bare bare.git &&
+	check_obj "../one.git/objects" -C bare.git <<-EOF
+	$one blob
+	EOF
 
-ok 9 - cloned HEAD matches
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5615-alternate-env/bare.git/
+ok 5 - access alternate via relative path (bare)
 
 expecting success: 
-	head_is_detached detached-history
+	git init worktree &&
+	check_obj "../one.git/objects" -C worktree <<-EOF
+	$one blob
+	EOF
 
-1b92f86567c6ace908df93921586dce513559a3c
-fatal: ref HEAD is not a symbolic ref
-ok 10 - cloned HEAD is detached
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5615-alternate-env/worktree/.git/
+ok 6 - access alternate via relative path (worktree)
 
 expecting success: 
-	git checkout master^0 &&
-	echo four >file &&
-	git commit -a -m four &&
-	git clone "file://$PWD" detached-orphan
-
-Previous HEAD position was 1b92f86 one
-HEAD is now at 9672648 three
-[detached HEAD f038726] four
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Cloning into 'detached-orphan'...
-Note: checking out 'f0387266fc5214a2a31d9efab2fad573bab7ed5e'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by performing another checkout.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
-
-  git checkout -b <new-branch-name>
+	mkdir subdir &&
+	check_obj "one.git/objects" -C subdir <<-EOF
+	$one blob
+	EOF
 
-ok 11 - clone repo (orphan detached HEAD)
+ok 7 - access alternate via relative path (subdir)
 
 expecting success: 
-	echo four >expect &&
-	git --git-dir=detached-orphan/.git log -1 --format=%s >actual &&
-	test_cmp expect actual
+	check_obj "$quoted:$unquoted" <<-EOF
+	$one blob
+	$two blob
+	EOF
 
-ok 12 - cloned HEAD matches
+ok 8 - mix of quoted and unquoted alternates
 
 expecting success: 
-	head_is_detached detached-orphan
+	mv one.git \"one.git &&
+	check_obj \"one.git/objects <<-EOF
+	$one blob
+	EOF
 
-f0387266fc5214a2a31d9efab2fad573bab7ed5e
-fatal: ref HEAD is not a symbolic ref
-ok 13 - cloned HEAD is detached
+ok 9 - broken quoting falls back to interpreting raw
 
-# still have 1 known breakage(s)
-# passed all remaining 12 test(s)
-1..13
+# passed all 9 test(s)
+1..9
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
 *** t5604-clone-reference.sh ***
@@ -201531,7 +201884,7 @@
 	commit_in A file1
 
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5604-clone-reference/A/.git/
-[master (root-commit) 688d2ba] file1
+[master (root-commit) 6229a03] file1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 file1
@@ -201545,7 +201898,7 @@
 
 Cloning into 'B'...
 done.
-[master 312995f] file2
+[master ab2fe62] file2
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 file2
@@ -201568,7 +201921,7 @@
 
 From ../B
  * branch            master     -> FETCH_HEAD
-Updating 688d2ba..312995f
+Updating 6229a03..ab2fe62
 Fast-forward
  file2 | 1 +
  1 file changed, 1 insertion(+)
@@ -201602,7 +201955,7 @@
 
 From ../B
  * branch            master     -> FETCH_HEAD
-Updating 688d2ba..312995f
+Updating 6229a03..ab2fe62
 Fast-forward
  file2 | 1 +
  1 file changed, 1 insertion(+)
@@ -201619,7 +201972,7 @@
 	git -C A repack -ad &&
 	git -C A prune
 
-[master 7cb0bda] file3
+[master fd15ba4] file3
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 file3
@@ -201629,12 +201982,12 @@
 	git -C C pull origin
 
 From /build/git-2.20.1/t/trash directory.t5604-clone-reference/A
-   688d2ba..7cb0bda  master     -> origin/master
+   6229a03..fd15ba4  master     -> origin/master
 Merging:
-312995f file2
-virtual 7cb0bda097e0991f7d78f086a2dbce1ae7048972
+ab2fe62 file2
+virtual fd15ba45a0d807a1ca9bd359e2cbc8f974c28527
 found 1 common ancestor:
-688d2ba file1
+6229a03 file1
 Merge made by the 'recursive' strategy.
  file3 | 1 +
  1 file changed, 1 insertion(+)
@@ -201650,12 +202003,12 @@
 	git -C D pull origin
 
 From file:///build/git-2.20.1/t/trash directory.t5604-clone-reference/A
-   688d2ba..7cb0bda  master     -> origin/master
+   6229a03..fd15ba4  master     -> origin/master
 Merging:
-312995f file2
-virtual 7cb0bda097e0991f7d78f086a2dbce1ae7048972
+ab2fe62 file2
+virtual fd15ba45a0d807a1ca9bd359e2cbc8f974c28527
 found 1 common ancestor:
-688d2ba file1
+6229a03 file1
 Merge made by the 'recursive' strategy.
  file3 | 1 +
  1 file changed, 1 insertion(+)
@@ -201672,7 +202025,7 @@
 	commit_in F file1
 
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5604-clone-reference/F/.git/
-[master (root-commit) c66158f] file1
+[master (root-commit) 73eb7e9] file1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 file1
@@ -201684,7 +202037,7 @@
 
 Cloning into 'G'...
 done.
-[master 5f94edf] file2
+[master f80dfe9] file2
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 file2
@@ -201739,7 +202092,7 @@
 warning: refname 'HEAD' is ambiguous.
 warning: refname 'HEAD' is ambiguous.
 warning: refname 'HEAD' is ambiguous.
-[other c7c0d33] other
+[other 6300632] other
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 otherfile
@@ -201878,7 +202231,7 @@
 	( cd C && git fsck )
 
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5604-clone-reference/A/.git/
-[master (root-commit) 853a882] file1
+[master (root-commit) c168ad4] file1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 file1
@@ -201892,142 +202245,60 @@
 1..29
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t5615-alternate-env.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5615-alternate-env/.git/
+*** t5613-info-alternate.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5613-info-alternate/.git/
 expecting success: 
-	git init --bare one.git &&
-	one=$(echo one | git -C one.git hash-object -w --stdin) &&
-	git init --bare two.git &&
-	two=$(echo two | git -C two.git hash-object -w --stdin)
+	test_create_repo A && (
+		cd A &&
+		echo "Hello World" > file1 &&
+		git add file1 &&
+		git commit -m "Initial commit" file1 &&
+		git repack -a -d &&
+		git prune
+	)
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5615-alternate-env/one.git/
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5615-alternate-env/two.git/
-ok 1 - create alternate repositories
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5613-info-alternate/A/.git/
+[master (root-commit) 7ff30cc] Initial commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file1
+ok 1 - preparing first repository
 
 expecting success: 
-	check_obj "" <<-EOF
-	$one missing
-	$two missing
-	EOF
+	git clone -l -s A B && (
+		cd B &&
+		echo "foo bar" > file2 &&
+		git add file2 &&
+		git commit -m "next commit" file2 &&
+		git repack -a -d -l &&
+		git prune
+	)
 
-ok 2 - objects inaccessible without alternates
+Cloning into 'B'...
+done.
+[master f9a34f4] next commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file2
+ok 2 - preparing second repository
 
 expecting success: 
-	check_obj "$PWD/one.git/objects" <<-EOF
-	$one blob
-	$two missing
-	EOF
+	git clone -l -s B C && (
+		cd C &&
+		echo "Goodbye, cruel world" > file3 &&
+		git add file3 &&
+		git commit -m "one more" file3 &&
+		git repack -a -d -l &&
+		git prune
+	)
 
-ok 3 - access alternate via absolute path
-
-expecting success: 
-	check_obj "$PWD/one.git/objects:$PWD/two.git/objects" <<-EOF
-	$one blob
-	$two blob
-	EOF
-
-ok 4 - access multiple alternates
-
-expecting success: 
-	git init --bare bare.git &&
-	check_obj "../one.git/objects" -C bare.git <<-EOF
-	$one blob
-	EOF
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5615-alternate-env/bare.git/
-ok 5 - access alternate via relative path (bare)
-
-expecting success: 
-	git init worktree &&
-	check_obj "../one.git/objects" -C worktree <<-EOF
-	$one blob
-	EOF
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5615-alternate-env/worktree/.git/
-ok 6 - access alternate via relative path (worktree)
-
-expecting success: 
-	mkdir subdir &&
-	check_obj "one.git/objects" -C subdir <<-EOF
-	$one blob
-	EOF
-
-ok 7 - access alternate via relative path (subdir)
-
-expecting success: 
-	check_obj "$quoted:$unquoted" <<-EOF
-	$one blob
-	$two blob
-	EOF
-
-ok 8 - mix of quoted and unquoted alternates
-
-expecting success: 
-	mv one.git \"one.git &&
-	check_obj \"one.git/objects <<-EOF
-	$one blob
-	EOF
-
-ok 9 - broken quoting falls back to interpreting raw
-
-# passed all 9 test(s)
-1..9
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t5613-info-alternate.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5613-info-alternate/.git/
-expecting success: 
-	test_create_repo A && (
-		cd A &&
-		echo "Hello World" > file1 &&
-		git add file1 &&
-		git commit -m "Initial commit" file1 &&
-		git repack -a -d &&
-		git prune
-	)
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5613-info-alternate/A/.git/
-[master (root-commit) 006340c] Initial commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file1
-ok 1 - preparing first repository
-
-expecting success: 
-	git clone -l -s A B && (
-		cd B &&
-		echo "foo bar" > file2 &&
-		git add file2 &&
-		git commit -m "next commit" file2 &&
-		git repack -a -d -l &&
-		git prune
-	)
-
-Cloning into 'B'...
-done.
-[master 86aa603] next commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file2
-ok 2 - preparing second repository
-
-expecting success: 
-	git clone -l -s B C && (
-		cd C &&
-		echo "Goodbye, cruel world" > file3 &&
-		git add file3 &&
-		git commit -m "one more" file3 &&
-		git repack -a -d -l &&
-		git prune
-	)
-
-Cloning into 'C'...
-done.
-[master 5cf042e] one more
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file3
-ok 3 - preparing third repository
+Cloning into 'C'...
+done.
+[master eef8a0c] one more
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file3
+ok 3 - preparing third repository
 
 expecting success: 
 	cat >expect <<-EOF &&
@@ -202069,12 +202340,12 @@
 	test_must_fail git -C H fsck
 
 error: /build/git-2.20.1/t/trash directory.t5613-info-alternate/B/.git/objects: ignoring alternate object stores, nesting too deep
-broken link from  commit 86aa6032dbec7985ecdbe4719c9215a408149c77
-              to  commit 006340c6a8f68233f08232495a84d85338083854
+broken link from  commit f9a34f46ce897c450444f9ff1206fc08f8421e77
+              to  commit 7ff30cc11aebe36470f5f4ba0aae77eba5896956
 broken link from    tree a34a1216018cdd9b811a02de226d708856167e0e
               to    blob 557db03de997c86a4a028e1ebd3a1ceb225be238
-missing commit 006340c6a8f68233f08232495a84d85338083854
 missing blob 557db03de997c86a4a028e1ebd3a1ceb225be238
+missing commit 7ff30cc11aebe36470f5f4ba0aae77eba5896956
 ok 7 - invalidity of eighth repository
 
 expecting success: 
@@ -202087,18 +202358,18 @@
 	rm -f C/.git/objects/info/alternates &&
 	test_must_fail git -C C fsck
 
-error: refs/remotes/origin/HEAD: invalid sha1 pointer 86aa6032dbec7985ecdbe4719c9215a408149c77
-error: refs/remotes/origin/master: invalid sha1 pointer 86aa6032dbec7985ecdbe4719c9215a408149c77
-error: HEAD: invalid reflog entry 86aa6032dbec7985ecdbe4719c9215a408149c77
-error: HEAD: invalid reflog entry 86aa6032dbec7985ecdbe4719c9215a408149c77
-error: refs/heads/master: invalid reflog entry 86aa6032dbec7985ecdbe4719c9215a408149c77
-error: refs/heads/master: invalid reflog entry 86aa6032dbec7985ecdbe4719c9215a408149c77
-error: refs/remotes/origin/HEAD: invalid reflog entry 86aa6032dbec7985ecdbe4719c9215a408149c77
-broken link from  commit 5cf042e81b94dd12c8500bd00adcef2f70fdbbed
-              to  commit 86aa6032dbec7985ecdbe4719c9215a408149c77
-missing commit 86aa6032dbec7985ecdbe4719c9215a408149c77
+error: refs/remotes/origin/HEAD: invalid sha1 pointer f9a34f46ce897c450444f9ff1206fc08f8421e77
+error: refs/remotes/origin/master: invalid sha1 pointer f9a34f46ce897c450444f9ff1206fc08f8421e77
+error: HEAD: invalid reflog entry f9a34f46ce897c450444f9ff1206fc08f8421e77
+error: HEAD: invalid reflog entry f9a34f46ce897c450444f9ff1206fc08f8421e77
+error: refs/heads/master: invalid reflog entry f9a34f46ce897c450444f9ff1206fc08f8421e77
+error: refs/heads/master: invalid reflog entry f9a34f46ce897c450444f9ff1206fc08f8421e77
+error: refs/remotes/origin/HEAD: invalid reflog entry f9a34f46ce897c450444f9ff1206fc08f8421e77
+broken link from  commit eef8a0c74f5cb8ba35889d2b0b5e43d929b5ca66
+              to  commit f9a34f46ce897c450444f9ff1206fc08f8421e77
 missing blob 557db03de997c86a4a028e1ebd3a1ceb225be238
 missing blob d675fa44e50606caa705c3f48de02cf129c7f9a2
+missing commit f9a34f46ce897c450444f9ff1206fc08f8421e77
 ok 9 - that info/alternates is necessary
 
 expecting success: 
@@ -202465,18 +202736,18 @@
 	# update tag
 	git tag -d two && git tag two
 
-[master (root-commit) 1b92f86] one
+[master (root-commit) 109536b] one
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 file
-[master cf63c56] two
+[master cb51c2f] two
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-[master 9672648] three
+[master 5e859c3] three
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 Switched to a new branch 'side'
-[side 4b23a75] four
+[side 8b09f06] four
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 Switched to branch 'master'
@@ -202509,10 +202780,10 @@
 
   git checkout -b <new-branch-name>
 
-HEAD is now at 1b92f86 one
+HEAD is now at 109536b one
 Cloning into 'dir_detached'...
 done.
-Note: checking out '1b92f86567c6ace908df93921586dce513559a3c'.
+Note: checking out '109536b57dec4e1961d5589e15b31eb6a2e09899'.
 
 You are in 'detached HEAD' state. You can look around, make experimental
 changes and commit them, and you can discard any commits you make in this
@@ -202525,7 +202796,7 @@
 
 Cloning into 'dir_tag'...
 done.
-Note: checking out 'cf63c5689a810ecec479ecac10398456f8c1df17'.
+Note: checking out 'cb51c2f840ca7832ee32621023d982b783c94213'.
 
 You are in 'detached HEAD' state. You can look around, make experimental
 changes and commit them, and you can discard any commits you make in this
@@ -202538,7 +202809,7 @@
 
 Cloning into 'dir_tag_no_tags'...
 done.
-Note: checking out 'cf63c5689a810ecec479ecac10398456f8c1df17'.
+Note: checking out 'cb51c2f840ca7832ee32621023d982b783c94213'.
 
 You are in 'detached HEAD' state. You can look around, make experimental
 changes and commit them, and you can discard any commits you make in this
@@ -202549,16 +202820,16 @@
 
   git checkout -b <new-branch-name>
 
-Previous HEAD position was 1b92f86 one
+Previous HEAD position was 109536b one
 Switched to branch 'side'
-[side 63d7fe7] five
+[side e35f4ab] five
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 Switched to branch 'master'
-[master 8bebfac] six
+[master 8d7daa7] six
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-Deleted tag 'two' (was cf63c56)
+Deleted tag 'two' (was cb51c2f)
 ok 1 - setup
 
 expecting success: 
@@ -202574,8 +202845,8 @@
 	test_cmp expect actual
 
 From /build/git-2.20.1/t/trash directory.t5612-clone-refspec/.
-   9672648..8bebfac  master     -> origin/master
-   4b23a75..63d7fe7  side       -> origin/side
+   5e859c3..8d7daa7  master     -> origin/master
+   8b09f06..e35f4ab  side       -> origin/side
 ok 2 - by default all branches will be kept updated
 
 expecting success: 
@@ -202588,12 +202859,12 @@
 	test_must_fail test_cmp expect actual &&
 	test_line_count = 2 actual
 
---- expect	2021-12-03 05:08:48.481536798 +0000
-+++ actual	2021-12-03 05:08:48.473537031 +0000
+--- expect	2023-01-05 11:49:22.446868030 +0000
++++ actual	2023-01-05 11:49:22.438868030 +0000
 @@ -1,2 +1,2 @@
- 96726485bd33e06dc70ac98bace50b8dec1d1e42 commit	refs/tags/five
--8bebfac885a6bb847395a73a1a97028e9d0001b2 commit	refs/tags/two
-+cf63c5689a810ecec479ecac10398456f8c1df17 commit	refs/tags/two
+ 5e859c3e4442660d624879be38c0d3863ba25a47 commit	refs/tags/five
+-8d7daa7ead1b396fa4e75b4086187f23b63a9250 commit	refs/tags/two
++cb51c2f840ca7832ee32621023d982b783c94213 commit	refs/tags/two
 ok 3 - by default no tags will be kept updated
 
 expecting success: 
@@ -202605,8 +202876,8 @@
 	test_must_be_empty actual
 
 From /build/git-2.20.1/t/trash directory.t5612-clone-refspec/.
-   9672648..8bebfac  master     -> origin/master
-   4b23a75..63d7fe7  side       -> origin/side
+   5e859c3..8d7daa7  master     -> origin/master
+   8b09f06..e35f4ab  side       -> origin/side
 ok 4 - clone with --no-tags
 
 expecting success: 
@@ -202631,7 +202902,7 @@
 	test_line_count = 2 actual
 
 From /build/git-2.20.1/t/trash directory.t5612-clone-refspec/.
-   9672648..8bebfac  master     -> origin/master
+   5e859c3..8d7daa7  master     -> origin/master
 From /build/git-2.20.1/t/trash directory.t5612-clone-refspec/.
  t [tag update]      two        -> two
 ok 5 - --single-branch while HEAD pointing at master
@@ -202666,7 +202937,7 @@
 	test_line_count = 2 actual
 
 From /build/git-2.20.1/t/trash directory.t5612-clone-refspec/.
-   9672648..8bebfac  master     -> origin/master
+   5e859c3..8d7daa7  master     -> origin/master
 From /build/git-2.20.1/t/trash directory.t5612-clone-refspec/.
  * [new tag]         five       -> five
  * [new tag]         two        -> two
@@ -202685,7 +202956,7 @@
 	test_cmp expect actual
 
 From /build/git-2.20.1/t/trash directory.t5612-clone-refspec/.
-   4b23a75..63d7fe7  side       -> origin/side
+   8b09f06..e35f4ab  side       -> origin/side
 ok 7 - --single-branch while HEAD pointing at side
 
 expecting success: 
@@ -202701,7 +202972,7 @@
 	test_cmp expect actual
 
 From /build/git-2.20.1/t/trash directory.t5612-clone-refspec/.
-   4b23a75..63d7fe7  side       -> origin/side
+   8b09f06..e35f4ab  side       -> origin/side
 ok 8 - --single-branch with explicit --branch side
 
 expecting success: 
@@ -202741,7 +203012,7 @@
 	test_cmp expect actual
 
 From /build/git-2.20.1/t/trash directory.t5612-clone-refspec/.
-   9672648..8bebfac  master     -> master
+   5e859c3..8d7daa7  master     -> master
  * [new branch]      side       -> side
  t [tag update]      two        -> two
 ok 11 - --single-branch with --mirror
@@ -202757,7 +203028,7 @@
 
 From /build/git-2.20.1/t/trash directory.t5612-clone-refspec/.
  * [new branch]      master     -> master
-   4b23a75..63d7fe7  side       -> side
+   8b09f06..e35f4ab  side       -> side
  t [tag update]      two        -> two
 ok 12 - --single-branch with explicit --branch and --mirror
 
@@ -202974,7 +203245,7 @@
 )
 prerequisite PIPE ok
 Starting git daemon ...
-[3300496] Ready to rumble
+[2729363] Ready to rumble
 expecting success: 
 	git init "$daemon_parent" &&
 	test_commit -C "$daemon_parent" one
@@ -202999,11 +203270,11 @@
 	# Server responded using protocol v1
 	grep "clone< version 1" log
 
-[3300860] Connection from 127.0.0.1:37126
-[3300860] Extended attribute "host": 127.0.0.1:5700
-[3300860] Extended attribute "protocol": version=1
-[3300860] Request upload-pack for '/parent'
-[3300496] [3300860] Disconnected
+[2729664] Connection from 127.0.0.1:42442
+[2729664] Extended attribute "host": 127.0.0.1:5700
+[2729664] Extended attribute "protocol": version=1
+[2729664] Request upload-pack for '/parent'
+[2729363] [2729664] 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
@@ -203027,11 +203298,11 @@
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 two.t
-[3301414] Connection from 127.0.0.1:37128
-[3301414] Extended attribute "host": 127.0.0.1:5700
-[3301414] Extended attribute "protocol": version=1
-[3301414] Request upload-pack for '/parent'
-[3300496] [3301414] Disconnected
+[2730066] Connection from 127.0.0.1:42444
+[2730066] Extended attribute "host": 127.0.0.1:5700
+[2730066] Extended attribute "protocol": version=1
+[2730066] Request upload-pack for '/parent'
+[2729363] [2730066] 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
@@ -203049,11 +203320,11 @@
 	# Server responded using protocol v1
 	grep "fetch< version 1" log
 
-[3301803] Connection from 127.0.0.1:37130
-[3301803] Extended attribute "host": 127.0.0.1:5700
-[3301803] Extended attribute "protocol": version=1
-[3301803] Request upload-pack for '/parent'
-[3300496] [3301803] Disconnected
+[2730470] Connection from 127.0.0.1:42446
+[2730470] Extended attribute "host": 127.0.0.1:5700
+[2730470] Extended attribute "protocol": version=1
+[2730470] Request upload-pack for '/parent'
+[2729363] [2730470] Disconnected
 Updating d79ce16..139b20d
 Fast-forward
  two.t | 1 +
@@ -203084,11 +203355,11 @@
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 three.t
-[3302503] Connection from 127.0.0.1:37136
-[3302503] Extended attribute "host": 127.0.0.1:5700
-[3302503] Extended attribute "protocol": version=1
-[3302503] Request receive-pack for '/parent'
-[3300496] [3302503] Disconnected
+[2730946] Connection from 127.0.0.1:42448
+[2730946] Extended attribute "host": 127.0.0.1:5700
+[2730946] Extended attribute "protocol": version=1
+[2730946] Request receive-pack for '/parent'
+[2729363] [2730946] 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
@@ -203438,6 +203709,330 @@
 1..8
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
+*** t5812-proto-disable-http.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5812-proto-disable-http/.git/
+checking prerequisite: NOT_ROOT
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
+	uid=$(id -u) &&
+	test "$uid" != 0
+
+)
+prerequisite NOT_ROOT ok
+1..0 # SKIP no web server found at '/usr/sbin/apache2'
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t5811-proto-disable-git.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5811-proto-disable-git/.git/
+checking prerequisite: PIPE
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
+	# test whether the filesystem supports FIFOs
+	test_have_prereq !MINGW,!CYGWIN &&
+	rm -f testfifo && mkfifo testfifo
+
+)
+prerequisite PIPE ok
+Starting git daemon ...
+[2734326] Ready to rumble
+expecting success: 
+	bare="$GIT_DAEMON_DOCUMENT_ROOT_PATH/repo.git" &&
+	test_commit one &&
+	git --bare init "$bare" &&
+	git push "$bare" HEAD &&
+	>"$bare/git-daemon-export-ok" &&
+	git -C "$bare" config daemon.receivepack true
+
+[master (root-commit) d79ce16] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5811-proto-disable-git/repo/repo.git/
+To /build/git-2.20.1/t/trash directory.t5811-proto-disable-git/repo/repo.git
+ * [new branch]      HEAD -> master
+ok 1 - create git-accessible repo
+
+expecting success: 
+		rm -rf tmp.git &&
+		(
+			GIT_ALLOW_PROTOCOL=$proto &&
+			export GIT_ALLOW_PROTOCOL &&
+			git clone --bare "$url" tmp.git
+		)
+	
+Cloning into bare repository 'tmp.git'...
+[2734952] Connection from 127.0.0.1:40774
+[2734952] Extended attribute "host": 127.0.0.1:5811
+[2734952] Request upload-pack for '/repo.git'
+[2734326] [2734952] Disconnected
+ok 2 - clone git:// (enabled)
+
+expecting success: 
+		(
+			cd tmp.git &&
+			GIT_ALLOW_PROTOCOL=$proto &&
+			export GIT_ALLOW_PROTOCOL &&
+			git fetch
+		)
+	
+[2735207] Connection from 127.0.0.1:40776
+[2735207] Extended attribute "host": 127.0.0.1:5811
+[2735207] Request upload-pack for '/repo.git'
+From git://127.0.0.1:5811/repo
+ * branch            HEAD       -> FETCH_HEAD
+[2734326] [2735207] Disconnected
+ok 3 - fetch git:// (enabled)
+
+expecting success: 
+		(
+			cd tmp.git &&
+			GIT_ALLOW_PROTOCOL=$proto &&
+			export GIT_ALLOW_PROTOCOL &&
+			git push origin HEAD:pushed
+		)
+	
+[2735473] Connection from 127.0.0.1:40780
+[2735473] Extended attribute "host": 127.0.0.1:5811
+[2735473] Request receive-pack for '/repo.git'
+To git://127.0.0.1:5811/repo.git
+ * [new branch]      HEAD -> pushed
+[2734326] [2735473] Disconnected
+ok 4 - push git:// (enabled)
+
+expecting success: 
+		(
+			cd tmp.git &&
+			GIT_ALLOW_PROTOCOL=none &&
+			export GIT_ALLOW_PROTOCOL &&
+			test_must_fail git push origin HEAD:pushed
+		)
+	
+fatal: transport 'git' not allowed
+ok 5 - push git:// (disabled)
+
+expecting success: 
+		(
+			cd tmp.git &&
+			GIT_ALLOW_PROTOCOL=none &&
+			export GIT_ALLOW_PROTOCOL &&
+			test_must_fail git fetch
+		)
+	
+fatal: transport 'git' not allowed
+ok 6 - fetch git:// (disabled)
+
+expecting success: 
+		rm -rf tmp.git &&
+		(
+			GIT_ALLOW_PROTOCOL=none &&
+			export GIT_ALLOW_PROTOCOL &&
+			test_must_fail git clone --bare "$url" tmp.git
+		)
+	
+Cloning into bare repository 'tmp.git'...
+fatal: transport 'git' not allowed
+ok 7 - clone git:// (disabled)
+
+expecting success: 
+		rm -rf tmp.git &&
+		(
+			GIT_ALLOW_PROTOCOL=none &&
+			export GIT_ALLOW_PROTOCOL &&
+			test_must_fail git -c protocol.allow=always clone --bare "$url" tmp.git &&
+			test_must_fail git -c protocol.$proto.allow=always clone --bare "$url" tmp.git
+		)
+	
+Cloning into bare repository 'tmp.git'...
+fatal: transport 'git' not allowed
+Cloning into bare repository 'tmp.git'...
+fatal: transport 'git' not allowed
+ok 8 - clone git:// (env var has precedence)
+
+expecting success: 
+		rm -rf tmp.git &&
+		git -c protocol.$proto.allow=always clone --bare "$url" tmp.git
+	
+Cloning into bare repository 'tmp.git'...
+[2736269] Connection from 127.0.0.1:40782
+[2736269] Extended attribute "host": 127.0.0.1:5811
+[2736269] Request upload-pack for '/repo.git'
+[2734326] [2736269] Disconnected
+ok 9 - clone git:// (enabled with config)
+
+expecting success: 
+		git -C tmp.git -c protocol.$proto.allow=always fetch
+	
+[2736453] Connection from 127.0.0.1:40784
+[2736453] Extended attribute "host": 127.0.0.1:5811
+[2736453] Request upload-pack for '/repo.git'
+From git://127.0.0.1:5811/repo
+ * branch            HEAD       -> FETCH_HEAD
+[2734326] [2736453] Disconnected
+ok 10 - fetch git:// (enabled)
+
+expecting success: 
+		git -C tmp.git -c protocol.$proto.allow=always  push origin HEAD:pushed
+	
+[2736619] Connection from 127.0.0.1:40786
+[2736619] Extended attribute "host": 127.0.0.1:5811
+[2736619] Request receive-pack for '/repo.git'
+Everything up-to-date
+ok 11 - push git:// (enabled)
+
+expecting success: 
+		test_must_fail git -C tmp.git -c protocol.$proto.allow=never push origin HEAD:pushed
+	
+[2734326] [2736619] Disconnected
+fatal: transport 'git' not allowed
+ok 12 - push git:// (disabled)
+
+expecting success: 
+		test_must_fail git -C tmp.git -c protocol.$proto.allow=never fetch
+	
+fatal: transport 'git' not allowed
+ok 13 - fetch git:// (disabled)
+
+expecting success: 
+		rm -rf tmp.git &&
+		test_must_fail git -c protocol.$proto.allow=never clone --bare "$url" tmp.git
+	
+Cloning into bare repository 'tmp.git'...
+fatal: transport 'git' not allowed
+ok 14 - clone git:// (disabled)
+
+expecting success: 
+		rm -rf tmp.git &&
+		git -c protocol.$proto.allow=user clone --bare "$url" tmp.git
+	
+Cloning into bare repository 'tmp.git'...
+[2737035] Connection from 127.0.0.1:40788
+[2737035] Extended attribute "host": 127.0.0.1:5811
+[2737035] Request upload-pack for '/repo.git'
+[2734326] [2737035] Disconnected
+ok 15 - clone git:// (enabled)
+
+expecting success: 
+		git -C tmp.git -c protocol.$proto.allow=user fetch
+	
+[2737203] Connection from 127.0.0.1:40792
+[2737203] Extended attribute "host": 127.0.0.1:5811
+[2737203] Request upload-pack for '/repo.git'
+From git://127.0.0.1:5811/repo
+ * branch            HEAD       -> FETCH_HEAD
+ok 16 - fetch git:// (enabled)
+
+expecting success: 
+		git -C tmp.git -c protocol.$proto.allow=user push origin HEAD:pushed
+	
+[2734326] [2737203] Disconnected
+Everything up-to-date
+[2737382] Connection from 127.0.0.1:40796
+[2737382] Extended attribute "host": 127.0.0.1:5811
+[2737382] Request receive-pack for '/repo.git'
+ok 17 - push git:// (enabled)
+
+expecting success: 
+		(
+			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
+		)
+	
+[2734326] [2737382] Disconnected
+fatal: transport 'git' not allowed
+ok 18 - push git:// (disabled)
+
+expecting success: 
+		(
+			cd tmp.git &&
+			GIT_PROTOCOL_FROM_USER=0 &&
+			export GIT_PROTOCOL_FROM_USER &&
+			test_must_fail git -c protocol.$proto.allow=user fetch
+		)
+	
+fatal: transport 'git' not allowed
+ok 19 - fetch git:// (disabled)
+
+expecting success: 
+		rm -rf tmp.git &&
+		(
+			GIT_PROTOCOL_FROM_USER=0 &&
+			export GIT_PROTOCOL_FROM_USER &&
+			test_must_fail git -c protocol.$proto.allow=user clone --bare "$url" tmp.git
+		)
+	
+Cloning into bare repository 'tmp.git'...
+fatal: transport 'git' not allowed
+ok 20 - clone git:// (disabled)
+
+expecting success: 
+		rm -rf tmp.git &&
+		test_config_global protocol.allow always &&
+		git clone --bare "$url" tmp.git
+	
+Cloning into bare repository 'tmp.git'...
+[2737871] Connection from 127.0.0.1:40798
+[2737871] Extended attribute "host": 127.0.0.1:5811
+[2737871] Request upload-pack for '/repo.git'
+[2734326] [2737871] Disconnected
+ok 21 - clone git:// (enabled)
+
+expecting success: 
+		test_config_global protocol.allow always &&
+		git -C tmp.git fetch
+	
+[2738121] Connection from 127.0.0.1:40800
+[2738121] Extended attribute "host": 127.0.0.1:5811
+[2738121] Request upload-pack for '/repo.git'
+From git://127.0.0.1:5811/repo
+ * branch            HEAD       -> FETCH_HEAD
+[2734326] [2738121] Disconnected
+ok 22 - fetch git:// (enabled)
+
+expecting success: 
+		test_config_global protocol.allow always &&
+		git -C tmp.git push origin HEAD:pushed
+	
+[2738350] Connection from 127.0.0.1:40802
+[2738350] Extended attribute "host": 127.0.0.1:5811
+[2738350] Request receive-pack for '/repo.git'
+Everything up-to-date
+[2734326] [2738350] Disconnected
+ok 23 - push git:// (enabled)
+
+expecting success: 
+		test_config_global protocol.allow never &&
+		test_must_fail git -C tmp.git push origin HEAD:pushed
+	
+fatal: transport 'git' not allowed
+ok 24 - push git:// (disabled)
+
+expecting success: 
+		test_config_global protocol.allow never &&
+		test_must_fail git -C tmp.git fetch
+	
+fatal: transport 'git' not allowed
+ok 25 - fetch git:// (disabled)
+
+expecting success: 
+		rm -rf tmp.git &&
+		test_config_global protocol.allow never &&
+		test_must_fail git clone --bare "$url" tmp.git
+	
+Cloning into bare repository 'tmp.git'...
+fatal: transport 'git' not allowed
+ok 26 - clone git:// (disabled)
+
+# passed all 26 test(s)
+1..26
+Stopping git daemon ...
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
 *** t3903-stash.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t3903-stash/.git/
 expecting success: 
@@ -205935,330 +206530,6 @@
 1..90
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t5812-proto-disable-http.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5812-proto-disable-http/.git/
-checking prerequisite: NOT_ROOT
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
-	uid=$(id -u) &&
-	test "$uid" != 0
-
-)
-prerequisite NOT_ROOT ok
-1..0 # SKIP no web server found at '/usr/sbin/apache2'
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t5811-proto-disable-git.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5811-proto-disable-git/.git/
-checking prerequisite: PIPE
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
-	# test whether the filesystem supports FIFOs
-	test_have_prereq !MINGW,!CYGWIN &&
-	rm -f testfifo && mkfifo testfifo
-
-)
-prerequisite PIPE ok
-Starting git daemon ...
-[3307116] Ready to rumble
-expecting success: 
-	bare="$GIT_DAEMON_DOCUMENT_ROOT_PATH/repo.git" &&
-	test_commit one &&
-	git --bare init "$bare" &&
-	git push "$bare" HEAD &&
-	>"$bare/git-daemon-export-ok" &&
-	git -C "$bare" config daemon.receivepack true
-
-[master (root-commit) d79ce16] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5811-proto-disable-git/repo/repo.git/
-To /build/git-2.20.1/t/trash directory.t5811-proto-disable-git/repo/repo.git
- * [new branch]      HEAD -> master
-ok 1 - create git-accessible repo
-
-expecting success: 
-		rm -rf tmp.git &&
-		(
-			GIT_ALLOW_PROTOCOL=$proto &&
-			export GIT_ALLOW_PROTOCOL &&
-			git clone --bare "$url" tmp.git
-		)
-	
-Cloning into bare repository 'tmp.git'...
-[3307548] Connection from 127.0.0.1:43892
-[3307548] Extended attribute "host": 127.0.0.1:5811
-[3307548] Request upload-pack for '/repo.git'
-[3307116] [3307548] Disconnected
-ok 2 - clone git:// (enabled)
-
-expecting success: 
-		(
-			cd tmp.git &&
-			GIT_ALLOW_PROTOCOL=$proto &&
-			export GIT_ALLOW_PROTOCOL &&
-			git fetch
-		)
-	
-[3307738] Connection from 127.0.0.1:43894
-[3307738] Extended attribute "host": 127.0.0.1:5811
-[3307738] Request upload-pack for '/repo.git'
-From git://127.0.0.1:5811/repo
- * branch            HEAD       -> FETCH_HEAD
-[3307116] [3307738] Disconnected
-ok 3 - fetch git:// (enabled)
-
-expecting success: 
-		(
-			cd tmp.git &&
-			GIT_ALLOW_PROTOCOL=$proto &&
-			export GIT_ALLOW_PROTOCOL &&
-			git push origin HEAD:pushed
-		)
-	
-[3307930] Connection from 127.0.0.1:43896
-[3307930] Extended attribute "host": 127.0.0.1:5811
-[3307930] Request receive-pack for '/repo.git'
-To git://127.0.0.1:5811/repo.git
- * [new branch]      HEAD -> pushed
-ok 4 - push git:// (enabled)
-
-expecting success: 
-		(
-			cd tmp.git &&
-			GIT_ALLOW_PROTOCOL=none &&
-			export GIT_ALLOW_PROTOCOL &&
-			test_must_fail git push origin HEAD:pushed
-		)
-	
-[3307116] [3307930] Disconnected
-fatal: transport 'git' not allowed
-ok 5 - push git:// (disabled)
-
-expecting success: 
-		(
-			cd tmp.git &&
-			GIT_ALLOW_PROTOCOL=none &&
-			export GIT_ALLOW_PROTOCOL &&
-			test_must_fail git fetch
-		)
-	
-fatal: transport 'git' not allowed
-ok 6 - fetch git:// (disabled)
-
-expecting success: 
-		rm -rf tmp.git &&
-		(
-			GIT_ALLOW_PROTOCOL=none &&
-			export GIT_ALLOW_PROTOCOL &&
-			test_must_fail git clone --bare "$url" tmp.git
-		)
-	
-Cloning into bare repository 'tmp.git'...
-fatal: transport 'git' not allowed
-ok 7 - clone git:// (disabled)
-
-expecting success: 
-		rm -rf tmp.git &&
-		(
-			GIT_ALLOW_PROTOCOL=none &&
-			export GIT_ALLOW_PROTOCOL &&
-			test_must_fail git -c protocol.allow=always clone --bare "$url" tmp.git &&
-			test_must_fail git -c protocol.$proto.allow=always clone --bare "$url" tmp.git
-		)
-	
-Cloning into bare repository 'tmp.git'...
-fatal: transport 'git' not allowed
-Cloning into bare repository 'tmp.git'...
-fatal: transport 'git' not allowed
-ok 8 - clone git:// (env var has precedence)
-
-expecting success: 
-		rm -rf tmp.git &&
-		git -c protocol.$proto.allow=always clone --bare "$url" tmp.git
-	
-Cloning into bare repository 'tmp.git'...
-[3308568] Connection from 127.0.0.1:43900
-[3308568] Extended attribute "host": 127.0.0.1:5811
-[3308568] Request upload-pack for '/repo.git'
-[3307116] [3308568] Disconnected
-ok 9 - clone git:// (enabled with config)
-
-expecting success: 
-		git -C tmp.git -c protocol.$proto.allow=always fetch
-	
-[3308774] Connection from 127.0.0.1:43902
-[3308774] Extended attribute "host": 127.0.0.1:5811
-[3308774] Request upload-pack for '/repo.git'
-From git://127.0.0.1:5811/repo
- * branch            HEAD       -> FETCH_HEAD
-[3307116] [3308774] Disconnected
-ok 10 - fetch git:// (enabled)
-
-expecting success: 
-		git -C tmp.git -c protocol.$proto.allow=always  push origin HEAD:pushed
-	
-[3309020] Connection from 127.0.0.1:43904
-[3309020] Extended attribute "host": 127.0.0.1:5811
-[3309020] Request receive-pack for '/repo.git'
-Everything up-to-date
-ok 11 - push git:// (enabled)
-
-expecting success: 
-		test_must_fail git -C tmp.git -c protocol.$proto.allow=never push origin HEAD:pushed
-	
-[3307116] [3309020] Disconnected
-fatal: transport 'git' not allowed
-ok 12 - push git:// (disabled)
-
-expecting success: 
-		test_must_fail git -C tmp.git -c protocol.$proto.allow=never fetch
-	
-fatal: transport 'git' not allowed
-ok 13 - fetch git:// (disabled)
-
-expecting success: 
-		rm -rf tmp.git &&
-		test_must_fail git -c protocol.$proto.allow=never clone --bare "$url" tmp.git
-	
-Cloning into bare repository 'tmp.git'...
-fatal: transport 'git' not allowed
-ok 14 - clone git:// (disabled)
-
-expecting success: 
-		rm -rf tmp.git &&
-		git -c protocol.$proto.allow=user clone --bare "$url" tmp.git
-	
-Cloning into bare repository 'tmp.git'...
-[3309422] Connection from 127.0.0.1:43906
-[3309422] Extended attribute "host": 127.0.0.1:5811
-[3309422] Request upload-pack for '/repo.git'
-[3307116] [3309422] Disconnected
-ok 15 - clone git:// (enabled)
-
-expecting success: 
-		git -C tmp.git -c protocol.$proto.allow=user fetch
-	
-[3309613] Connection from 127.0.0.1:43908
-[3309613] Extended attribute "host": 127.0.0.1:5811
-[3309613] Request upload-pack for '/repo.git'
-From git://127.0.0.1:5811/repo
- * branch            HEAD       -> FETCH_HEAD
-[3307116] [3309613] Disconnected
-ok 16 - fetch git:// (enabled)
-
-expecting success: 
-		git -C tmp.git -c protocol.$proto.allow=user push origin HEAD:pushed
-	
-[3309851] Connection from 127.0.0.1:43910
-[3309851] Extended attribute "host": 127.0.0.1:5811
-[3309851] Request receive-pack for '/repo.git'
-Everything up-to-date
-ok 17 - push git:// (enabled)
-
-expecting success: 
-		(
-			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
-		)
-	
-[3307116] [3309851] Disconnected
-fatal: transport 'git' not allowed
-ok 18 - push git:// (disabled)
-
-expecting success: 
-		(
-			cd tmp.git &&
-			GIT_PROTOCOL_FROM_USER=0 &&
-			export GIT_PROTOCOL_FROM_USER &&
-			test_must_fail git -c protocol.$proto.allow=user fetch
-		)
-	
-fatal: transport 'git' not allowed
-ok 19 - fetch git:// (disabled)
-
-expecting success: 
-		rm -rf tmp.git &&
-		(
-			GIT_PROTOCOL_FROM_USER=0 &&
-			export GIT_PROTOCOL_FROM_USER &&
-			test_must_fail git -c protocol.$proto.allow=user clone --bare "$url" tmp.git
-		)
-	
-Cloning into bare repository 'tmp.git'...
-fatal: transport 'git' not allowed
-ok 20 - clone git:// (disabled)
-
-expecting success: 
-		rm -rf tmp.git &&
-		test_config_global protocol.allow always &&
-		git clone --bare "$url" tmp.git
-	
-Cloning into bare repository 'tmp.git'...
-[3310216] Connection from 127.0.0.1:43912
-[3310216] Extended attribute "host": 127.0.0.1:5811
-[3310216] Request upload-pack for '/repo.git'
-[3307116] [3310216] Disconnected
-ok 21 - clone git:// (enabled)
-
-expecting success: 
-		test_config_global protocol.allow always &&
-		git -C tmp.git fetch
-	
-[3310421] Connection from 127.0.0.1:43914
-[3310421] Extended attribute "host": 127.0.0.1:5811
-[3310421] Request upload-pack for '/repo.git'
-From git://127.0.0.1:5811/repo
- * branch            HEAD       -> FETCH_HEAD
-[3307116] [3310421] Disconnected
-ok 22 - fetch git:// (enabled)
-
-expecting success: 
-		test_config_global protocol.allow always &&
-		git -C tmp.git push origin HEAD:pushed
-	
-[3310591] Connection from 127.0.0.1:43916
-[3310591] Extended attribute "host": 127.0.0.1:5811
-[3310591] Request receive-pack for '/repo.git'
-Everything up-to-date
-[3307116] [3310591] Disconnected
-ok 23 - push git:// (enabled)
-
-expecting success: 
-		test_config_global protocol.allow never &&
-		test_must_fail git -C tmp.git push origin HEAD:pushed
-	
-fatal: transport 'git' not allowed
-ok 24 - push git:// (disabled)
-
-expecting success: 
-		test_config_global protocol.allow never &&
-		test_must_fail git -C tmp.git fetch
-	
-fatal: transport 'git' not allowed
-ok 25 - fetch git:// (disabled)
-
-expecting success: 
-		rm -rf tmp.git &&
-		test_config_global protocol.allow never &&
-		test_must_fail git clone --bare "$url" tmp.git
-	
-Cloning into bare repository 'tmp.git'...
-fatal: transport 'git' not allowed
-ok 26 - clone git:// (disabled)
-
-# passed all 26 test(s)
-1..26
-Stopping git daemon ...
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
 *** t5614-clone-submodules-shallow.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5614-clone-submodules-shallow/.git/
 expecting success: 
@@ -206453,33 +206724,16 @@
 1..9
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t5814-proto-disable-ext.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5814-proto-disable-ext/.git/
-expecting success: 
-		write_script fake-remote <<-\EOF &&
-		echo >&2 "fake-remote: $*"
-		cd "$TRASH_DIRECTORY/remote" &&
-		eval "$*"
-		EOF
-		PATH=$TRASH_DIRECTORY:$PATH &&
-		export TRASH_DIRECTORY
-	
-ok 1 - setup ext wrapper
-
+*** t5810-proto-disable-local.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5810-proto-disable-local/.git/
 expecting success: 
-	test_commit one &&
-	mkdir remote &&
-	git init --bare remote/repo.git &&
-	git push remote/repo.git HEAD
+	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
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5814-proto-disable-ext/remote/repo.git/
-To remote/repo.git
- * [new branch]      HEAD -> master
-ok 2 - setup repository to clone
+ok 1 - setup repository to clone
 
 expecting success: 
 		rm -rf tmp.git &&
@@ -206490,8 +206744,7 @@
 		)
 	
 Cloning into bare repository 'tmp.git'...
-fake-remote: git-upload-pack repo.git
-ok 3 - clone remote-helper (enabled)
+ok 2 - clone file:// (enabled)
 
 expecting success: 
 		(
@@ -206501,10 +206754,9 @@
 			git fetch
 		)
 	
-fake-remote: git-upload-pack repo.git
-From ext::fake-remote %S repo
+From file:///build/git-2.20.1/t/trash directory.t5810-proto-disable-local
  * branch            HEAD       -> FETCH_HEAD
-ok 4 - fetch remote-helper (enabled)
+ok 3 - fetch file:// (enabled)
 
 expecting success: 
 		(
@@ -206514,10 +206766,9 @@
 			git push origin HEAD:pushed
 		)
 	
-fake-remote: git-receive-pack repo.git
-To ext::fake-remote %S repo.git
+To file:///build/git-2.20.1/t/trash directory.t5810-proto-disable-local
  * [new branch]      HEAD -> pushed
-ok 5 - push remote-helper (enabled)
+ok 4 - push file:// (enabled)
 
 expecting success: 
 		(
@@ -206527,8 +206778,8 @@
 			test_must_fail git push origin HEAD:pushed
 		)
 	
-fatal: transport 'ext' not allowed
-ok 6 - push remote-helper (disabled)
+fatal: transport 'file' not allowed
+ok 5 - push file:// (disabled)
 
 expecting success: 
 		(
@@ -206538,8 +206789,8 @@
 			test_must_fail git fetch
 		)
 	
-fatal: transport 'ext' not allowed
-ok 7 - fetch remote-helper (disabled)
+fatal: transport 'file' not allowed
+ok 6 - fetch file:// (disabled)
 
 expecting success: 
 		rm -rf tmp.git &&
@@ -206550,8 +206801,8 @@
 		)
 	
 Cloning into bare repository 'tmp.git'...
-fatal: transport 'ext' not allowed
-ok 8 - clone remote-helper (disabled)
+fatal: transport 'file' not allowed
+ok 7 - clone file:// (disabled)
 
 expecting success: 
 		rm -rf tmp.git &&
@@ -206563,76 +206814,70 @@
 		)
 	
 Cloning into bare repository 'tmp.git'...
-fatal: transport 'ext' not allowed
+fatal: transport 'file' not allowed
 Cloning into bare repository 'tmp.git'...
-fatal: transport 'ext' not allowed
-ok 9 - clone remote-helper (env var has precedence)
+fatal: transport 'file' not allowed
+ok 8 - clone file:// (env var has precedence)
 
 expecting success: 
 		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)
+ok 9 - clone file:// (enabled with config)
 
 expecting success: 
 		git -C tmp.git -c protocol.$proto.allow=always fetch
 	
-fake-remote: git-upload-pack repo.git
-From ext::fake-remote %S repo
+From file:///build/git-2.20.1/t/trash directory.t5810-proto-disable-local
  * branch            HEAD       -> FETCH_HEAD
-ok 11 - fetch remote-helper (enabled)
+ok 10 - fetch file:// (enabled)
 
 expecting success: 
 		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)
+ok 11 - push file:// (enabled)
 
 expecting success: 
 		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)
+fatal: transport 'file' not allowed
+ok 12 - push file:// (disabled)
 
 expecting success: 
 		test_must_fail git -C tmp.git -c protocol.$proto.allow=never fetch
 	
-fatal: transport 'ext' not allowed
-ok 14 - fetch remote-helper (disabled)
+fatal: transport 'file' not allowed
+ok 13 - fetch file:// (disabled)
 
 expecting success: 
 		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)
+fatal: transport 'file' not allowed
+ok 14 - clone file:// (disabled)
 
 expecting success: 
 		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)
+ok 15 - clone file:// (enabled)
 
 expecting success: 
 		git -C tmp.git -c protocol.$proto.allow=user fetch
 	
-fake-remote: git-upload-pack repo.git
-From ext::fake-remote %S repo
+From file:///build/git-2.20.1/t/trash directory.t5810-proto-disable-local
  * branch            HEAD       -> FETCH_HEAD
-ok 17 - fetch remote-helper (enabled)
+ok 16 - fetch file:// (enabled)
 
 expecting success: 
 		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)
+ok 17 - push file:// (enabled)
 
 expecting success: 
 		(
@@ -206642,8 +206887,8 @@
 			test_must_fail git -c protocol.$proto.allow=user push origin HEAD:pushed
 		)
 	
-fatal: transport 'ext' not allowed
-ok 19 - push remote-helper (disabled)
+fatal: transport 'file' not allowed
+ok 18 - push file:// (disabled)
 
 expecting success: 
 		(
@@ -206653,8 +206898,8 @@
 			test_must_fail git -c protocol.$proto.allow=user fetch
 		)
 	
-fatal: transport 'ext' not allowed
-ok 20 - fetch remote-helper (disabled)
+fatal: transport 'file' not allowed
+ok 19 - fetch file:// (disabled)
 
 expecting success: 
 		rm -rf tmp.git &&
@@ -206665,8 +206910,8 @@
 		)
 	
 Cloning into bare repository 'tmp.git'...
-fatal: transport 'ext' not allowed
-ok 21 - clone remote-helper (disabled)
+fatal: transport 'file' not allowed
+ok 20 - clone file:// (disabled)
 
 expecting success: 
 		rm -rf tmp.git &&
@@ -206674,39 +206919,36 @@
 		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)
+ok 21 - clone file:// (enabled)
 
 expecting success: 
 		test_config_global protocol.allow always &&
 		git -C tmp.git fetch
 	
-fake-remote: git-upload-pack repo.git
-From ext::fake-remote %S repo
+From file:///build/git-2.20.1/t/trash directory.t5810-proto-disable-local
  * branch            HEAD       -> FETCH_HEAD
-ok 23 - fetch remote-helper (enabled)
+ok 22 - fetch file:// (enabled)
 
 expecting success: 
 		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)
+ok 23 - push file:// (enabled)
 
 expecting success: 
 		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)
+fatal: transport 'file' not allowed
+ok 24 - push file:// (disabled)
 
 expecting success: 
 		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)
+fatal: transport 'file' not allowed
+ok 25 - fetch file:// (disabled)
 
 expecting success: 
 		rm -rf tmp.git &&
@@ -206714,23 +206956,8 @@
 		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/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t5810-proto-disable-local.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5810-proto-disable-local/.git/
-expecting success: 
-	test_commit one
-
-[master (root-commit) d79ce16] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-ok 1 - setup repository to clone
+fatal: transport 'file' not allowed
+ok 26 - clone file:// (disabled)
 
 expecting success: 
 		rm -rf tmp.git &&
@@ -206741,7 +206968,8 @@
 		)
 	
 Cloning into bare repository 'tmp.git'...
-ok 2 - clone file:// (enabled)
+done.
+ok 27 - clone path (enabled)
 
 expecting success: 
 		(
@@ -206751,9 +206979,9 @@
 			git fetch
 		)
 	
-From file:///build/git-2.20.1/t/trash directory.t5810-proto-disable-local
+From /build/git-2.20.1/t/trash directory.t5810-proto-disable-local/.
  * branch            HEAD       -> FETCH_HEAD
-ok 3 - fetch file:// (enabled)
+ok 28 - fetch path (enabled)
 
 expecting success: 
 		(
@@ -206763,9 +206991,8 @@
 			git push origin HEAD:pushed
 		)
 	
-To file:///build/git-2.20.1/t/trash directory.t5810-proto-disable-local
- * [new branch]      HEAD -> pushed
-ok 4 - push file:// (enabled)
+Everything up-to-date
+ok 29 - push path (enabled)
 
 expecting success: 
 		(
@@ -206776,7 +207003,7 @@
 		)
 	
 fatal: transport 'file' not allowed
-ok 5 - push file:// (disabled)
+ok 30 - push path (disabled)
 
 expecting success: 
 		(
@@ -206787,7 +207014,7 @@
 		)
 	
 fatal: transport 'file' not allowed
-ok 6 - fetch file:// (disabled)
+ok 31 - fetch path (disabled)
 
 expecting success: 
 		rm -rf tmp.git &&
@@ -206799,7 +207026,7 @@
 	
 Cloning into bare repository 'tmp.git'...
 fatal: transport 'file' not allowed
-ok 7 - clone file:// (disabled)
+ok 32 - clone path (disabled)
 
 expecting success: 
 		rm -rf tmp.git &&
@@ -206814,39 +207041,40 @@
 fatal: transport 'file' not allowed
 Cloning into bare repository 'tmp.git'...
 fatal: transport 'file' not allowed
-ok 8 - clone file:// (env var has precedence)
+ok 33 - clone path (env var has precedence)
 
 expecting success: 
 		rm -rf tmp.git &&
 		git -c protocol.$proto.allow=always clone --bare "$url" tmp.git
 	
 Cloning into bare repository 'tmp.git'...
-ok 9 - clone file:// (enabled with config)
+done.
+ok 34 - clone path (enabled with config)
 
 expecting success: 
 		git -C tmp.git -c protocol.$proto.allow=always fetch
 	
-From file:///build/git-2.20.1/t/trash directory.t5810-proto-disable-local
+From /build/git-2.20.1/t/trash directory.t5810-proto-disable-local/.
  * branch            HEAD       -> FETCH_HEAD
-ok 10 - fetch file:// (enabled)
+ok 35 - fetch path (enabled)
 
 expecting success: 
 		git -C tmp.git -c protocol.$proto.allow=always  push origin HEAD:pushed
 	
 Everything up-to-date
-ok 11 - push file:// (enabled)
+ok 36 - push path (enabled)
 
 expecting success: 
 		test_must_fail git -C tmp.git -c protocol.$proto.allow=never push origin HEAD:pushed
 	
 fatal: transport 'file' not allowed
-ok 12 - push file:// (disabled)
+ok 37 - push path (disabled)
 
 expecting success: 
 		test_must_fail git -C tmp.git -c protocol.$proto.allow=never fetch
 	
 fatal: transport 'file' not allowed
-ok 13 - fetch file:// (disabled)
+ok 38 - fetch path (disabled)
 
 expecting success: 
 		rm -rf tmp.git &&
@@ -206854,27 +207082,28 @@
 	
 Cloning into bare repository 'tmp.git'...
 fatal: transport 'file' not allowed
-ok 14 - clone file:// (disabled)
+ok 39 - clone path (disabled)
 
 expecting success: 
 		rm -rf tmp.git &&
 		git -c protocol.$proto.allow=user clone --bare "$url" tmp.git
 	
 Cloning into bare repository 'tmp.git'...
-ok 15 - clone file:// (enabled)
+done.
+ok 40 - clone path (enabled)
 
 expecting success: 
 		git -C tmp.git -c protocol.$proto.allow=user fetch
 	
-From file:///build/git-2.20.1/t/trash directory.t5810-proto-disable-local
+From /build/git-2.20.1/t/trash directory.t5810-proto-disable-local/.
  * branch            HEAD       -> FETCH_HEAD
-ok 16 - fetch file:// (enabled)
+ok 41 - fetch path (enabled)
 
 expecting success: 
 		git -C tmp.git -c protocol.$proto.allow=user push origin HEAD:pushed
 	
 Everything up-to-date
-ok 17 - push file:// (enabled)
+ok 42 - push path (enabled)
 
 expecting success: 
 		(
@@ -206885,7 +207114,7 @@
 		)
 	
 fatal: transport 'file' not allowed
-ok 18 - push file:// (disabled)
+ok 43 - push path (disabled)
 
 expecting success: 
 		(
@@ -206896,7 +207125,7 @@
 		)
 	
 fatal: transport 'file' not allowed
-ok 19 - fetch file:// (disabled)
+ok 44 - fetch path (disabled)
 
 expecting success: 
 		rm -rf tmp.git &&
@@ -206908,7 +207137,7 @@
 	
 Cloning into bare repository 'tmp.git'...
 fatal: transport 'file' not allowed
-ok 20 - clone file:// (disabled)
+ok 45 - clone path (disabled)
 
 expecting success: 
 		rm -rf tmp.git &&
@@ -206916,36 +207145,37 @@
 		git clone --bare "$url" tmp.git
 	
 Cloning into bare repository 'tmp.git'...
-ok 21 - clone file:// (enabled)
+done.
+ok 46 - clone path (enabled)
 
 expecting success: 
 		test_config_global protocol.allow always &&
 		git -C tmp.git fetch
 	
-From file:///build/git-2.20.1/t/trash directory.t5810-proto-disable-local
+From /build/git-2.20.1/t/trash directory.t5810-proto-disable-local/.
  * branch            HEAD       -> FETCH_HEAD
-ok 22 - fetch file:// (enabled)
+ok 47 - fetch path (enabled)
 
 expecting success: 
 		test_config_global protocol.allow always &&
 		git -C tmp.git push origin HEAD:pushed
 	
 Everything up-to-date
-ok 23 - push file:// (enabled)
+ok 48 - push path (enabled)
 
 expecting success: 
 		test_config_global protocol.allow never &&
 		test_must_fail git -C tmp.git push origin HEAD:pushed
 	
 fatal: transport 'file' not allowed
-ok 24 - push file:// (disabled)
+ok 49 - push path (disabled)
 
 expecting success: 
 		test_config_global protocol.allow never &&
 		test_must_fail git -C tmp.git fetch
 	
 fatal: transport 'file' not allowed
-ok 25 - fetch file:// (disabled)
+ok 50 - fetch path (disabled)
 
 expecting success: 
 		rm -rf tmp.git &&
@@ -206954,7 +207184,64 @@
 	
 Cloning into bare repository 'tmp.git'...
 fatal: transport 'file' not allowed
-ok 26 - clone file:// (disabled)
+ok 51 - clone path (disabled)
+
+expecting success: 
+	git init --bare repo.git &&
+	git push repo.git HEAD &&
+	mv repo.git "$PWD/-repo.git"
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5810-proto-disable-local/repo.git/
+To repo.git
+ * [new branch]      HEAD -> master
+ok 52 - setup repo with dash
+
+expecting success: 
+	rm -f trace.out &&
+	test_must_fail env GIT_TRACE="$PWD/trace.out" git fetch -- -repo.git &&
+	! grep upload-pack trace.out
+
+fatal: strange pathname '-repo.git' blocked
+ok 53 - repo names starting with dash are rejected
+
+expecting success: 
+	git fetch "$PWD/-repo.git"
+
+From /build/git-2.20.1/t/trash directory.t5810-proto-disable-local/-repo
+ * branch            HEAD       -> FETCH_HEAD
+ok 54 - full paths still work
+
+# passed all 54 test(s)
+1..54
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t5814-proto-disable-ext.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5814-proto-disable-ext/.git/
+expecting success: 
+		write_script fake-remote <<-\EOF &&
+		echo >&2 "fake-remote: $*"
+		cd "$TRASH_DIRECTORY/remote" &&
+		eval "$*"
+		EOF
+		PATH=$TRASH_DIRECTORY:$PATH &&
+		export TRASH_DIRECTORY
+	
+ok 1 - setup ext wrapper
+
+expecting success: 
+	test_commit one &&
+	mkdir remote &&
+	git init --bare remote/repo.git &&
+	git push remote/repo.git HEAD
+
+[master (root-commit) d79ce16] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5814-proto-disable-ext/remote/repo.git/
+To remote/repo.git
+ * [new branch]      HEAD -> master
+ok 2 - setup repository to clone
 
 expecting success: 
 		rm -rf tmp.git &&
@@ -206965,8 +207252,8 @@
 		)
 	
 Cloning into bare repository 'tmp.git'...
-done.
-ok 27 - clone path (enabled)
+fake-remote: git-upload-pack repo.git
+ok 3 - clone remote-helper (enabled)
 
 expecting success: 
 		(
@@ -206976,9 +207263,10 @@
 			git fetch
 		)
 	
-From /build/git-2.20.1/t/trash directory.t5810-proto-disable-local/.
+fake-remote: git-upload-pack repo.git
+From ext::fake-remote %S repo
  * branch            HEAD       -> FETCH_HEAD
-ok 28 - fetch path (enabled)
+ok 4 - fetch remote-helper (enabled)
 
 expecting success: 
 		(
@@ -206988,8 +207276,10 @@
 			git push origin HEAD:pushed
 		)
 	
-Everything up-to-date
-ok 29 - push path (enabled)
+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: 
 		(
@@ -206999,8 +207289,8 @@
 			test_must_fail git push origin HEAD:pushed
 		)
 	
-fatal: transport 'file' not allowed
-ok 30 - push path (disabled)
+fatal: transport 'ext' not allowed
+ok 6 - push remote-helper (disabled)
 
 expecting success: 
 		(
@@ -207010,8 +207300,8 @@
 			test_must_fail git fetch
 		)
 	
-fatal: transport 'file' not allowed
-ok 31 - fetch path (disabled)
+fatal: transport 'ext' not allowed
+ok 7 - fetch remote-helper (disabled)
 
 expecting success: 
 		rm -rf tmp.git &&
@@ -207022,8 +207312,8 @@
 		)
 	
 Cloning into bare repository 'tmp.git'...
-fatal: transport 'file' not allowed
-ok 32 - clone path (disabled)
+fatal: transport 'ext' not allowed
+ok 8 - clone remote-helper (disabled)
 
 expecting success: 
 		rm -rf tmp.git &&
@@ -207035,72 +207325,76 @@
 		)
 	
 Cloning into bare repository 'tmp.git'...
-fatal: transport 'file' not allowed
+fatal: transport 'ext' not allowed
 Cloning into bare repository 'tmp.git'...
-fatal: transport 'file' not allowed
-ok 33 - clone path (env var has precedence)
+fatal: transport 'ext' not allowed
+ok 9 - clone remote-helper (env var has precedence)
 
 expecting success: 
 		rm -rf tmp.git &&
 		git -c protocol.$proto.allow=always clone --bare "$url" tmp.git
 	
 Cloning into bare repository 'tmp.git'...
-done.
-ok 34 - clone path (enabled with config)
+fake-remote: git-upload-pack repo.git
+ok 10 - clone remote-helper (enabled with config)
 
 expecting success: 
 		git -C tmp.git -c protocol.$proto.allow=always fetch
 	
-From /build/git-2.20.1/t/trash directory.t5810-proto-disable-local/.
+fake-remote: git-upload-pack repo.git
+From ext::fake-remote %S repo
  * branch            HEAD       -> FETCH_HEAD
-ok 35 - fetch path (enabled)
+ok 11 - fetch remote-helper (enabled)
 
 expecting success: 
 		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 36 - push path (enabled)
+ok 12 - push remote-helper (enabled)
 
 expecting success: 
 		test_must_fail git -C tmp.git -c protocol.$proto.allow=never push origin HEAD:pushed
 	
-fatal: transport 'file' not allowed
-ok 37 - push path (disabled)
+fatal: transport 'ext' not allowed
+ok 13 - push remote-helper (disabled)
 
 expecting success: 
 		test_must_fail git -C tmp.git -c protocol.$proto.allow=never fetch
 	
-fatal: transport 'file' not allowed
-ok 38 - fetch path (disabled)
+fatal: transport 'ext' not allowed
+ok 14 - fetch remote-helper (disabled)
 
 expecting success: 
 		rm -rf tmp.git &&
 		test_must_fail git -c protocol.$proto.allow=never clone --bare "$url" tmp.git
 	
 Cloning into bare repository 'tmp.git'...
-fatal: transport 'file' not allowed
-ok 39 - clone path (disabled)
+fatal: transport 'ext' not allowed
+ok 15 - clone remote-helper (disabled)
 
 expecting success: 
 		rm -rf tmp.git &&
 		git -c protocol.$proto.allow=user clone --bare "$url" tmp.git
 	
 Cloning into bare repository 'tmp.git'...
-done.
-ok 40 - clone path (enabled)
+fake-remote: git-upload-pack repo.git
+ok 16 - clone remote-helper (enabled)
 
 expecting success: 
 		git -C tmp.git -c protocol.$proto.allow=user fetch
 	
-From /build/git-2.20.1/t/trash directory.t5810-proto-disable-local/.
+fake-remote: git-upload-pack repo.git
+From ext::fake-remote %S repo
  * branch            HEAD       -> FETCH_HEAD
-ok 41 - fetch path (enabled)
+ok 17 - fetch remote-helper (enabled)
 
 expecting success: 
 		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 42 - push path (enabled)
+ok 18 - push remote-helper (enabled)
 
 expecting success: 
 		(
@@ -207110,8 +207404,8 @@
 			test_must_fail git -c protocol.$proto.allow=user push origin HEAD:pushed
 		)
 	
-fatal: transport 'file' not allowed
-ok 43 - push path (disabled)
+fatal: transport 'ext' not allowed
+ok 19 - push remote-helper (disabled)
 
 expecting success: 
 		(
@@ -207121,8 +207415,8 @@
 			test_must_fail git -c protocol.$proto.allow=user fetch
 		)
 	
-fatal: transport 'file' not allowed
-ok 44 - fetch path (disabled)
+fatal: transport 'ext' not allowed
+ok 20 - fetch remote-helper (disabled)
 
 expecting success: 
 		rm -rf tmp.git &&
@@ -207133,8 +207427,8 @@
 		)
 	
 Cloning into bare repository 'tmp.git'...
-fatal: transport 'file' not allowed
-ok 45 - clone path (disabled)
+fatal: transport 'ext' not allowed
+ok 21 - clone remote-helper (disabled)
 
 expecting success: 
 		rm -rf tmp.git &&
@@ -207142,37 +207436,39 @@
 		git clone --bare "$url" tmp.git
 	
 Cloning into bare repository 'tmp.git'...
-done.
-ok 46 - clone path (enabled)
+fake-remote: git-upload-pack repo.git
+ok 22 - clone remote-helper (enabled)
 
 expecting success: 
 		test_config_global protocol.allow always &&
 		git -C tmp.git fetch
 	
-From /build/git-2.20.1/t/trash directory.t5810-proto-disable-local/.
+fake-remote: git-upload-pack repo.git
+From ext::fake-remote %S repo
  * branch            HEAD       -> FETCH_HEAD
-ok 47 - fetch path (enabled)
+ok 23 - fetch remote-helper (enabled)
 
 expecting success: 
 		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 48 - push path (enabled)
+ok 24 - push remote-helper (enabled)
 
 expecting success: 
 		test_config_global protocol.allow never &&
 		test_must_fail git -C tmp.git push origin HEAD:pushed
 	
-fatal: transport 'file' not allowed
-ok 49 - push path (disabled)
+fatal: transport 'ext' not allowed
+ok 25 - push remote-helper (disabled)
 
 expecting success: 
 		test_config_global protocol.allow never &&
 		test_must_fail git -C tmp.git fetch
 	
-fatal: transport 'file' not allowed
-ok 50 - fetch path (disabled)
+fatal: transport 'ext' not allowed
+ok 26 - fetch remote-helper (disabled)
 
 expecting success: 
 		rm -rf tmp.git &&
@@ -207180,36 +207476,11 @@
 		test_must_fail git clone --bare "$url" tmp.git
 	
 Cloning into bare repository 'tmp.git'...
-fatal: transport 'file' not allowed
-ok 51 - clone path (disabled)
-
-expecting success: 
-	git init --bare repo.git &&
-	git push repo.git HEAD &&
-	mv repo.git "$PWD/-repo.git"
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5810-proto-disable-local/repo.git/
-To repo.git
- * [new branch]      HEAD -> master
-ok 52 - setup repo with dash
-
-expecting success: 
-	rm -f trace.out &&
-	test_must_fail env GIT_TRACE="$PWD/trace.out" git fetch -- -repo.git &&
-	! grep upload-pack trace.out
-
-fatal: strange pathname '-repo.git' blocked
-ok 53 - repo names starting with dash are rejected
-
-expecting success: 
-	git fetch "$PWD/-repo.git"
-
-From /build/git-2.20.1/t/trash directory.t5810-proto-disable-local/-repo
- * branch            HEAD       -> FETCH_HEAD
-ok 54 - full paths still work
+fatal: transport 'ext' not allowed
+ok 27 - clone remote-helper (disabled)
 
-# passed all 54 test(s)
-1..54
+# passed all 27 test(s)
+1..27
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
 *** t6000-rev-list-misc.sh ***
@@ -207220,7 +207491,7 @@
 	git add wanted_file unwanted_file &&
 	git commit -m one
 
-[master (root-commit) a0da48b] one
+[master (root-commit) 3e10311] one
  Author: A U Thor <author@example.com>
  2 files changed, 2 insertions(+)
  create mode 100644 unwanted_file
@@ -207248,7 +207519,7 @@
 	grep foo/file output &&
 	! grep unwanted_file output
 
-[master 1ac3113] two
+[master 0e24c30] two
  Author: A U Thor <author@example.com>
  1 file changed, 0 insertions(+), 0 deletions(-)
  create mode 100644 foo/file
@@ -207371,393 +207642,6 @@
 1..11
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t5616-partial-clone.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5616-partial-clone/.git/
-expecting success: 
-	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
-	done &&
-	awk -f print_2.awk <temp | sort >expect_1.oids &&
-	test_line_count = 4 expect_1.oids
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5616-partial-clone/src/.git/
-[master (root-commit) d80e399] file 1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file.1.txt
-[master 67bf7ae] file 2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file.2.txt
-[master 2cbeb32] file 3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file.3.txt
-[master 4df21e5] 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: 
-	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: 
-	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 extensions.partialclone)" = "origin" &&
-	test "$(git -C pc1 config --local core.partialclonefilter)" = "blob:none"
-
-Cloning into 'pc1'...
-ok 3 - do partial clone 1
-
-expecting success: 
-	git -C pc1 rev-list --quiet --objects --missing=print HEAD >observed &&
-	test_line_count = 4 observed &&
-	git -C pc1 checkout master &&
-	git -C pc1 rev-list --quiet --objects --missing=print HEAD >observed &&
-	test_line_count = 0 observed
-
-Already on 'master'
-Your branch is up to date with 'origin/master'.
-ok 4 - verify checkout with dynamic object fetch
-
-expecting success: 
-	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"
-	done &&
-	git -C src blame master -- file.1.txt >expect.blame &&
-	git -C src push -u srv master
-
-[master 394d7c7] mod a
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[master f08a3d0] mod b
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[master 90b4d21] mod c
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[master c65df07] mod d
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[master f4c24c0] mod e
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-To file:///build/git-2.20.1/t/trash directory.t5616-partial-clone/srv.bare
-   4df21e5..f4c24c0  master -> master
-Branch 'master' set up to track remote branch 'master' from 'srv'.
-ok 5 - push new commits to server
-
-expecting success: 
-	git -C pc1 fetch origin &&
-	git -C pc1 rev-list --quiet --objects --missing=print \
-		master..origin/master >observed &&
-	test_line_count = 5 observed
-
-From file:///build/git-2.20.1/t/trash directory.t5616-partial-clone/srv.bare
-   4df21e5..f4c24c0  master     -> origin/master
-ok 6 - partial fetch inherits filter settings
-
-expecting success: 
-	git -C pc1 diff master..origin/master -- file.1.txt &&
-	git -C pc1 rev-list --quiet --objects --missing=print \
-		 master..origin/master >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 7 - verify diff causes dynamic object fetch
-
-expecting success: 
-	git -C pc1 blame origin/master -- file.1.txt >observed.blame &&
-	test_cmp expect.blame observed.blame &&
-	git -C pc1 rev-list --quiet --objects --missing=print \
-		master..origin/master >observed &&
-	test_line_count = 0 observed
-
-ok 8 - verify blame causes dynamic object fetch
-
-expecting success: 
-	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"
-	done &&
-	git -C src push -u srv master
-
-[master cacb351] mod a
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[master cd515b6] mod b
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[master 4abb7a8] mod c
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[master c090e46] mod d
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[master 7d25199] mod e
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[master 9c7d4e2] mod f
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-To file:///build/git-2.20.1/t/trash directory.t5616-partial-clone/srv.bare
-   f4c24c0..9c7d4e2  master -> master
-Branch 'master' set up to track remote branch 'master' from 'srv'.
-ok 9 - push new commits to server for file.2.txt
-
-expecting success: 
-	git -C pc1 fetch --no-filter origin &&
-	git -C pc1 rev-list --quiet --objects --missing=print \
-		master..origin/master >observed &&
-	test_line_count = 0 observed
-
-From file:///build/git-2.20.1/t/trash directory.t5616-partial-clone/srv.bare
-   f4c24c0..9c7d4e2  master     -> origin/master
-ok 10 - override inherited filter-spec using --no-filter
-
-expecting success: 
-	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"
-	done &&
-	git -C src push -u srv master
-
-[master ee520d1] mod a
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[master f839785] mod b
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[master 3f8ff93] mod c
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[master 31c4a21] mod d
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[master d028be2] mod e
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[master e0cc649] mod f
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-To file:///build/git-2.20.1/t/trash directory.t5616-partial-clone/srv.bare
-   9c7d4e2..e0cc649  master -> master
-Branch 'master' set up to track remote branch 'master' from 'srv'.
-ok 11 - push new commits to server for file.3.txt
-
-expecting success: 
-	git -C pc1 fetch --filter=blob:none origin &&
-
-	git -C pc1 rev-list --quiet --objects --missing=print \
-		 master..origin/master >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 \
-		master..origin/master >revs &&
-	awk -f print_1.awk revs |
-	sed "s/?//" |
-	sort >observed.oids &&
-
-	test_line_count = 0 observed.oids
-
-From file:///build/git-2.20.1/t/trash directory.t5616-partial-clone/srv.bare
-   9c7d4e2..e0cc649  master     -> origin/master
-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)        
-7724cffe11579f391f6c098265878597ecd1ca74 7724cffe11579f391f6c098265878597ecd1ca74
-7c22d416ccef0f2e04b1909d448fa12714ed0c5a 7c22d416ccef0f2e04b1909d448fa12714ed0c5a
-7d87eff241fc01757db1d4f2f4710fbaeacd9950 7d87eff241fc01757db1d4f2f4710fbaeacd9950
-9f8a0fb67784f4d9b9f81d22baf14c5bead82c7d 9f8a0fb67784f4d9b9f81d22baf14c5bead82c7d
-a5e78dc6f3d20c8de85b54d4596946979a89d383 a5e78dc6f3d20c8de85b54d4596946979a89d383
-e5f3bec205041acafa4538978741f185e437e1ee e5f3bec205041acafa4538978741f185e437e1ee
-ok 12 - manual prefetch of missing objects
-
-expecting success: 
-	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/git-2.20.1/t/trash directory.t5616-partial-clone/src/.git/
-[master 525a54e] 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 3306790 on ionos1-amd64' --promisor --fsck-objects
-trace: built-in: git index-pack --stdin --fix-thin '--keep=fetch-pack 3306790 on ionos1-amd64' --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 13 - partial clone with transfer.fsckobjects=1 uses index-pack --fsck-objects
-
-expecting success: 
-	# 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 master &&
-	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 master \
-		>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 master >fetched_objects &&
-	test_line_count = 70 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
-
-[master 1c513ed] file in dir
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 dir/file.txt
-To file:///build/git-2.20.1/t/trash directory.t5616-partial-clone/srv.bare
-   e0cc649..1c513ed  master -> master
-Branch 'master' set up to track remote branch 'master' from 'srv'.
-Cloning into 'dst'...
-100644 blob d2cebd4f0a9e97a48a6139d09cafdb513ad8fee3	file.txt
-dangling tree bc1967ebf96a4e914801c7ef8328140456a10f41
-ok 14 - use fsck before and after manually fetching a missing subtree
-
-expecting success: 
-	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/git-2.20.1/t/trash directory.t5616-partial-clone/src/.git/
-[master (root-commit) 6f481db] x
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 x.t
-ok 15 - partial clone fetches blobs pointed to by refs even if normally filtered out
-
-expecting success: 
-	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/git-2.20.1/t/trash directory.t5616-partial-clone/src/.git/
-[master (root-commit) 31f3b95] 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/git-2.20.1/t/trash directory.t5616-partial-clone/src
- * branch            257cc5642cb1a054f08cc83f2d943e56fd3ebe99 -> FETCH_HEAD
-ok 16 - fetch what is specified on CLI even if already promised
-
-checking prerequisite: NOT_ROOT
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
-	uid=$(id -u) &&
-	test "$uid" != 0
-
-)
-prerequisite NOT_ROOT ok
-# passed all 16 test(s)
-# SKIP no web server found at '/usr/sbin/apache2'
-1..16
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
 *** t5801-remote-helpers.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5801-remote-helpers/.git/
 expecting success: 
@@ -207768,7 +207652,7 @@
 	 git commit -m one)
 
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5801-remote-helpers/server/.git/
-[master (root-commit) 2d91bcf] one
+[master (root-commit) 4e2fa6b] one
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 file
@@ -207786,7 +207670,7 @@
 	 echo content >>file &&
 	 git commit -a -m two)
 
-[master d2b5afc] two
+[master b160260] two
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 ok 3 - create new commit on remote
@@ -207796,8 +207680,8 @@
 	test_cmp server/file local/file
 
 From testgit::/build/git-2.20.1/t/trash directory.t5801-remote-helpers/server
-   2d91bcf..d2b5afc  master     -> origin/master
-Updating 2d91bcf..d2b5afc
+   4e2fa6b..b160260  master     -> origin/master
+Updating 4e2fa6b..b160260
 Fast-forward
  file | 1 +
  1 file changed, 1 insertion(+)
@@ -207810,11 +207694,11 @@
 	git push) &&
 	compare_refs local HEAD server HEAD
 
-[master 1bbc544] three
+[master 8d1bea0] three
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 To testgit::/build/git-2.20.1/t/trash directory.t5801-remote-helpers/server
-   d2b5afc..1bbc544  master -> master
+   b160260..8d1bea0  master -> master
 ok 5 - pushing to local repo
 
 expecting success: 
@@ -207829,9 +207713,9 @@
 	) &&
 	compare_refs server HEAD local FETCH_HEAD
 
-HEAD is now at 1bbc544 three
+HEAD is now at 8d1bea0 three
 Switched to a new branch 'new'
-[new 1319c62] five
+[new 18b6239] five
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 From testgit::/build/git-2.20.1/t/trash directory.t5801-remote-helpers/server
@@ -207857,12 +207741,12 @@
 	) &&
 	compare_refs local master server master
 
-HEAD is now at 1bbc544 three
-[master d01f475] six
+HEAD is now at 8d1bea0 three
+[master 7077284] six
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 To testgit::/build/git-2.20.1/t/trash directory.t5801-remote-helpers/server
-   1bbc544..d01f475  master -> master
+   8d1bea0..7077284  master -> master
 ok 8 - push when remote has extra refs
 
 expecting success: 
@@ -207875,7 +207759,7 @@
 	compare_refs local HEAD server refs/heads/new-name
 
 Switched to a new branch 'new-name'
-[new-name 330a896] seven
+[new-name 9a94c13] seven
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 To testgit::/build/git-2.20.1/t/trash directory.t5801-remote-helpers/server
@@ -207928,17 +207812,17 @@
 	compare_refs local refs/heads/force-test server refs/heads/force-test
 
 Switched to a new branch 'force-test'
-[force-test 9b3e045] eight
+[force-test e9097ae] eight
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 To testgit::/build/git-2.20.1/t/trash directory.t5801-remote-helpers/server
  * [new branch]      force-test -> force-test
-[force-test 31417f1] eight-modified
+[force-test 69f8ca2] eight-modified
  Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:08:54 2021 +0000
+ Date: Thu Jan 5 11:49:25 2023 +0000
  1 file changed, 2 insertions(+)
 To testgit::/build/git-2.20.1/t/trash directory.t5801-remote-helpers/server
-   9b3e045..31417f1  force-test -> force-test
+   e9097ae..69f8ca2  force-test -> force-test
 ok 13 - forced push
 
 expecting success: 
@@ -207957,7 +207841,7 @@
 	test_i18ngrep "this remote helper should implement refspec capability" error &&
 	compare_refs local2 HEAD server HEAD
 
-HEAD is now at 1319c62 five
+HEAD is now at 18b6239 five
 Already up to date.
 warning: this remote helper should implement refspec capability
 ok 15 - pulling without refspecs
@@ -207972,11 +207856,11 @@
 	test_must_fail git push 2>../error) &&
 	test_i18ngrep "remote-helper doesn.t support push; refspec needed" error
 
-[new 6f1f9e8] ten
+[new 67f027c] 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 1319c62 five
+HEAD is now at 18b6239 five
 ok 16 - pushing without refspecs
 
 expecting success: 
@@ -207995,17 +207879,17 @@
 	GIT_REMOTE_TESTGIT_NO_MARKS=1 git push) &&
 	compare_refs local2 HEAD server HEAD
 
-[new 306bede] twelve
+[new e1ef1e2] twelve
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-warning: Not updating refs/heads/new (new tip e087e2e49af51812f67baa0d283d0e399e45b456 does not contain 1319c626ccb8422f4e4aecd131ec68920dc8d7e9)
+warning: Not updating refs/heads/new (new tip 68e98f7e1d252805dce8ba6783230076bb1c7334 does not contain 18b6239eecce144501bcea532aa3c8b8ca86cd54)
 Everything up-to-date
---- expect	2021-12-03 05:08:55.865322163 +0000
-+++ actual	2021-12-03 05:08:55.873321931 +0000
+--- expect	2023-01-05 11:49:26.822868030 +0000
++++ actual	2023-01-05 11:49:26.830868030 +0000
 @@ -1 +1 @@
--306bedeb1cca0a23e953f94911eeef178f19333c
-+1319c626ccb8422f4e4aecd131ec68920dc8d7e9
-HEAD is now at 1319c62 five
+-e1ef1e286bda9ecd32f710e608c659a546aef8b2
++18b6239eecce144501bcea532aa3c8b8ca86cd54
+HEAD is now at 18b6239 five
 not ok 18 - pushing without marks # TODO known breakage
 
 expecting success: 
@@ -208017,7 +207901,7 @@
 
 To testgit::/build/git-2.20.1/t/trash directory.t5801-remote-helpers/server
  * [new branch]      dup2 -> dup2
-   330a896..330a896  new-name -> new-name
+   9a94c13..9a94c13  new-name -> new-name
 ok 19 - push all with existing object
 
 expecting success: 
@@ -208064,7 +207948,7 @@
 	)
 
 Switched to a new branch 'update'
-[update 01db8fd] update
+[update 35322a0] update
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 To testgit::/build/git-2.20.1/t/trash directory.t5801-remote-helpers/server
@@ -208081,11 +207965,11 @@
 	test_cmp expect actual
 	)
 
-[update 16244ee] more-update
+[update db031bf] more-update
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 To testgit::/build/git-2.20.1/t/trash directory.t5801-remote-helpers/server
-   01db8fd..16244ee  update -> update
+   35322a0..db031bf  update -> update
 ok 24 - push update refs disabled by no-private-update
 
 expecting success: 
@@ -208101,7 +207985,7 @@
 	)
 
 Already on 'update'
-[update 63e0faf] update fail
+[update fb91be8] update fail
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 error: failed to push some refs to 'testgit::/build/git-2.20.1/t/trash directory.t5801-remote-helpers/server'
@@ -208115,7 +207999,7 @@
 	)
 
 fatal: stream ends early
-fast-import: dumping crash report to .git/fast_import_crash_3313699
+fast-import: dumping crash report to .git/fast_import_crash_2740299
 fatal: error while running fast-import
 ok 26 - proper failure checks for fetching
 
@@ -208132,7 +208016,7 @@
 	)
 
 Switched to a new branch 'crash'
-[crash ff4f4fd] crash
+[crash c5944c4] crash
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 error: failed to push some refs to 'testgit::/build/git-2.20.1/t/trash directory.t5801-remote-helpers/server'
@@ -208152,12 +208036,12 @@
 	)
 
 Switched to a new branch 'new_branch'
-[new_branch fa15eba] new
+[new_branch efb2fc7] new
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 To testgit::/build/git-2.20.1/t/trash directory.t5801-remote-helpers/server
  * [new branch]      new_branch -> new_branch
-[new_branch b39ed66] new
+[new_branch 1be2856] new
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 ok 28 - push messages
@@ -208174,7 +208058,7 @@
 	compare_refs server HEAD local FETCH_HEAD
 
 Switched to branch 'master'
-[master f7bf46b] more
+[master 8ec7863] more
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 From testgit::/build/git-2.20.1/t/trash directory.t5801-remote-helpers/server
@@ -208193,7 +208077,7 @@
 	compare_refs server HEAD local FETCH_HEAD
 
 Already on 'master'
-[master ab01478] more
+[master 89d634f] more
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 From testgit::/build/git-2.20.1/t/trash directory.t5801-remote-helpers/local/../server
@@ -208205,264 +208089,391 @@
 1..30
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t5815-submodule-protos.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5815-submodule-protos/.git/
+*** t5616-partial-clone.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5616-partial-clone/.git/
 expecting success: 
-		write_script fake-remote <<-\EOF &&
-		echo >&2 "fake-remote: $*"
-		cd "$TRASH_DIRECTORY/remote" &&
-		eval "$*"
-		EOF
-		PATH=$TRASH_DIRECTORY:$PATH &&
-		export TRASH_DIRECTORY
-	
-ok 1 - setup ext wrapper
+	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
+	done &&
+	awk -f print_2.awk <temp | sort >expect_1.oids &&
+	test_line_count = 4 expect_1.oids
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5616-partial-clone/src/.git/
+[master (root-commit) 01cf349] file 1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file.1.txt
+[master 10548b7] file 2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file.2.txt
+[master db1b059] file 3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file.3.txt
+[master f063386] 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: 
-		write_script ssh-wrapper <<-\EOF &&
-		echo >&2 "ssh: $*"
-		host=$1; shift
-		cd "$TRASH_DIRECTORY/$host" &&
-		eval "$*"
-		EOF
-		GIT_SSH="$PWD/ssh-wrapper" &&
-		export GIT_SSH &&
-		export TRASH_DIRECTORY
-	
-ok 2 - setup ssh wrapper
+	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: 
-	mkdir remote &&
-	git init remote/repo.git &&
-	(cd remote/repo.git && test_commit one) &&
-	# submodule-add should probably trust what we feed it on the cmdline,
-	# but its implementation is overly conservative.
-	GIT_ALLOW_PROTOCOL=ssh git submodule add remote:repo.git ssh-module &&
-	GIT_ALLOW_PROTOCOL=ext git submodule add "ext::fake-remote %S repo.git" ext-module &&
-	git commit -m "add submodules"
+	git clone --no-checkout --filter=blob:none "file://$(pwd)/srv.bare" pc1 &&
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5815-submodule-protos/remote/repo.git/.git/
-[master (root-commit) d79ce16] one
+	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 extensions.partialclone)" = "origin" &&
+	test "$(git -C pc1 config --local core.partialclonefilter)" = "blob:none"
+
+Cloning into 'pc1'...
+ok 3 - do partial clone 1
+
+expecting success: 
+	git -C pc1 rev-list --quiet --objects --missing=print HEAD >observed &&
+	test_line_count = 4 observed &&
+	git -C pc1 checkout master &&
+	git -C pc1 rev-list --quiet --objects --missing=print HEAD >observed &&
+	test_line_count = 0 observed
+
+Already on 'master'
+Your branch is up to date with 'origin/master'.
+ok 4 - verify checkout with dynamic object fetch
+
+expecting success: 
+	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"
+	done &&
+	git -C src blame master -- file.1.txt >expect.blame &&
+	git -C src push -u srv master
+
+[master fe1a3b1] mod a
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 one.t
-Cloning into '/build/git-2.20.1/t/trash directory.t5815-submodule-protos/ssh-module'...
-ssh: remote git-upload-pack 'repo.git'
-Cloning into '/build/git-2.20.1/t/trash directory.t5815-submodule-protos/ext-module'...
-fake-remote: git-upload-pack repo.git
-[master (root-commit) 0e918f1] add submodules
+[master ace3888] mod b
  Author: A U Thor <author@example.com>
- 3 files changed, 8 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 ext-module
- create mode 160000 ssh-module
-ok 3 - setup repository with submodules
+ 1 file changed, 1 insertion(+)
+[master 51f13c2] mod c
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master 7dd10b2] mod d
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master 4a2992a] mod e
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+To file:///build/git-2.20.1/t/trash directory.t5616-partial-clone/srv.bare
+   f063386..4a2992a  master -> master
+Branch 'master' set up to track remote branch 'master' from 'srv'.
+ok 5 - push new commits to server
 
 expecting success: 
-	test_must_fail git clone --recurse-submodules . dst
+	git -C pc1 fetch origin &&
+	git -C pc1 rev-list --quiet --objects --missing=print \
+		master..origin/master >observed &&
+	test_line_count = 5 observed
 
-Cloning into 'dst'...
-done.
-Submodule 'ext-module' (ext::fake-remote %S repo.git) registered for path 'ext-module'
-Submodule 'ssh-module' (remote:repo.git) registered for path 'ssh-module'
-Cloning into '/build/git-2.20.1/t/trash directory.t5815-submodule-protos/dst/ext-module'...
-fatal: transport 'ext' not allowed
-fatal: clone of 'ext::fake-remote %S repo.git' into submodule path '/build/git-2.20.1/t/trash directory.t5815-submodule-protos/dst/ext-module' failed
-Failed to clone 'ext-module'. Retry scheduled
-Cloning into '/build/git-2.20.1/t/trash directory.t5815-submodule-protos/dst/ssh-module'...
-ssh: remote git-upload-pack 'repo.git'
-Cloning into '/build/git-2.20.1/t/trash directory.t5815-submodule-protos/dst/ext-module'...
-fatal: transport 'ext' not allowed
-fatal: clone of 'ext::fake-remote %S repo.git' into submodule path '/build/git-2.20.1/t/trash directory.t5815-submodule-protos/dst/ext-module' failed
-Failed to clone 'ext-module' a second time, aborting
-ok 4 - clone with recurse-submodules fails
+From file:///build/git-2.20.1/t/trash directory.t5616-partial-clone/srv.bare
+   f063386..4a2992a  master     -> origin/master
+ok 6 - partial fetch inherits filter settings
 
 expecting success: 
-	rm -rf dst &&
-	git clone . dst &&
-	git -C dst submodule init
+	git -C pc1 diff master..origin/master -- file.1.txt &&
+	git -C pc1 rev-list --quiet --objects --missing=print \
+		 master..origin/master >observed &&
+	test_line_count = 4 observed
 
-Cloning into 'dst'...
-done.
-Submodule 'ext-module' (ext::fake-remote %S repo.git) registered for path 'ext-module'
-Submodule 'ssh-module' (remote:repo.git) registered for path 'ssh-module'
-ok 5 - setup individual updates
+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 7 - verify diff causes dynamic object fetch
 
 expecting success: 
-	git -C dst submodule update ssh-module
+	git -C pc1 blame origin/master -- file.1.txt >observed.blame &&
+	test_cmp expect.blame observed.blame &&
+	git -C pc1 rev-list --quiet --objects --missing=print \
+		master..origin/master >observed &&
+	test_line_count = 0 observed
 
-Cloning into '/build/git-2.20.1/t/trash directory.t5815-submodule-protos/dst/ssh-module'...
-ssh: remote git-upload-pack 'repo.git'
-Submodule path 'ssh-module': checked out 'd79ce1670bdcb76e6d1da2ae095e890ccb326ae9'
-ok 6 - update of ssh allowed
+ok 8 - verify blame causes dynamic object fetch
 
 expecting success: 
-	test_must_fail git -C dst submodule update ext-module
+	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"
+	done &&
+	git -C src push -u srv master
 
-Cloning into '/build/git-2.20.1/t/trash directory.t5815-submodule-protos/dst/ext-module'...
-fatal: transport 'ext' not allowed
-fatal: clone of 'ext::fake-remote %S repo.git' into submodule path '/build/git-2.20.1/t/trash directory.t5815-submodule-protos/dst/ext-module' failed
-Failed to clone 'ext-module'. Retry scheduled
-Cloning into '/build/git-2.20.1/t/trash directory.t5815-submodule-protos/dst/ext-module'...
-fatal: transport 'ext' not allowed
-fatal: clone of 'ext::fake-remote %S repo.git' into submodule path '/build/git-2.20.1/t/trash directory.t5815-submodule-protos/dst/ext-module' failed
-Failed to clone 'ext-module' a second time, aborting
-ok 7 - update of ext not allowed
+[master 89bffc3] mod a
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master 9d889d2] mod b
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master 32bda0c] mod c
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master a9f033b] mod d
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master 2666edf] mod e
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master 00bf0ae] mod f
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+To file:///build/git-2.20.1/t/trash directory.t5616-partial-clone/srv.bare
+   4a2992a..00bf0ae  master -> master
+Branch 'master' set up to track remote branch 'master' from 'srv'.
+ok 9 - push new commits to server for file.2.txt
 
 expecting success: 
-	GIT_ALLOW_PROTOCOL=ext git -C dst submodule update ext-module
+	git -C pc1 fetch --no-filter origin &&
+	git -C pc1 rev-list --quiet --objects --missing=print \
+		master..origin/master >observed &&
+	test_line_count = 0 observed
 
-Cloning into '/build/git-2.20.1/t/trash directory.t5815-submodule-protos/dst/ext-module'...
-fake-remote: git-upload-pack repo.git
-Submodule path 'ext-module': checked out 'd79ce1670bdcb76e6d1da2ae095e890ccb326ae9'
-ok 8 - user can override whitelist
+From file:///build/git-2.20.1/t/trash directory.t5616-partial-clone/srv.bare
+   4a2992a..00bf0ae  master     -> origin/master
+ok 10 - override inherited filter-spec using --no-filter
 
-# passed all 8 test(s)
-1..8
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t5900-repo-selection.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5900-repo-selection/.git/
 expecting success: 
-	reset &&
-	make_tree foo &&
-	get foo &&
-	check foo
+	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"
+	done &&
+	git -C src push -u srv master
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5900-repo-selection/foo/.git/
-[master (root-commit) ddd63c9] foo
+[master 6149a4f] mod a
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 foo.t
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5900-repo-selection/fetch/
-From ../foo
- * branch            HEAD       -> FETCH_HEAD
-Cloning into 'clone'...
-done.
-ok 1 - find .git dir in worktree
+[master 10e1003] mod b
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master d10626f] mod c
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master d224c1a] mod d
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master abfcf99] mod e
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master 343f988] mod f
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+To file:///build/git-2.20.1/t/trash directory.t5616-partial-clone/srv.bare
+   00bf0ae..343f988  master -> master
+Branch 'master' set up to track remote branch 'master' from 'srv'.
+ok 11 - push new commits to server for file.3.txt
 
 expecting success: 
-	reset &&
-	make_bare foo.git &&
-	get foo &&
-	check foo.git
+	git -C pc1 fetch --filter=blob:none origin &&
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5900-repo-selection/foo.git/
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5900-repo-selection/fetch/
-From ../foo
- * branch            HEAD       -> FETCH_HEAD
-Cloning into 'clone'...
-done.
-ok 2 - automagically add .git suffix
+	git -C pc1 rev-list --quiet --objects --missing=print \
+		 master..origin/master >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 \
+		master..origin/master >revs &&
+	awk -f print_1.awk revs |
+	sed "s/?//" |
+	sort >observed.oids &&
+
+	test_line_count = 0 observed.oids
+
+From file:///build/git-2.20.1/t/trash directory.t5616-partial-clone/srv.bare
+   00bf0ae..343f988  master     -> origin/master
+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)        
+7724cffe11579f391f6c098265878597ecd1ca74 7724cffe11579f391f6c098265878597ecd1ca74
+7c22d416ccef0f2e04b1909d448fa12714ed0c5a 7c22d416ccef0f2e04b1909d448fa12714ed0c5a
+7d87eff241fc01757db1d4f2f4710fbaeacd9950 7d87eff241fc01757db1d4f2f4710fbaeacd9950
+9f8a0fb67784f4d9b9f81d22baf14c5bead82c7d 9f8a0fb67784f4d9b9f81d22baf14c5bead82c7d
+a5e78dc6f3d20c8de85b54d4596946979a89d383 a5e78dc6f3d20c8de85b54d4596946979a89d383
+e5f3bec205041acafa4538978741f185e437e1ee e5f3bec205041acafa4538978741f185e437e1ee
+ok 12 - manual prefetch of missing objects
 
 expecting success: 
-	reset &&
-	make_tree foo.git &&
-	get foo &&
-	check foo.git
+	git init src &&
+	test_commit -C src x &&
+	test_config -C src uploadpack.allowfilter 1 &&
+	test_config -C src uploadpack.allowanysha1inwant 1 &&
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5900-repo-selection/foo.git/.git/
-[master (root-commit) 98b6c1b] foo.git
+	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/git-2.20.1/t/trash directory.t5616-partial-clone/src/.git/
+[master 59a7378] x
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 foo.git.t
-Initialized empty Git repository in /build/git-2.20.1/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
+ create mode 100644 x.t
+Cloning into 'dst'...
+trace: run_command: git index-pack --stdin --fix-thin '--keep=fetch-pack 2734322 on i-capture-the-hostname' --promisor --fsck-objects
+trace: built-in: git index-pack --stdin --fix-thin '--keep=fetch-pack 2734322 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 13 - partial clone with transfer.fsckobjects=1 uses index-pack --fsck-objects
 
 expecting success: 
-	reset &&
-	make_tree foo &&
-	make_bare foo.git &&
-	get foo &&
-	check foo
+	# 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 master &&
+	SUBTREE=$(git -C src rev-parse HEAD:dir) &&
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5900-repo-selection/foo/.git/
-[master (root-commit) ddd63c9] foo
+	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 master \
+		>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 master >fetched_objects &&
+	test_line_count = 70 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
+
+[master 73c28fd] file in dir
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 foo.t
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5900-repo-selection/foo.git/
-Initialized empty Git repository in /build/git-2.20.1/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
+ create mode 100644 dir/file.txt
+To file:///build/git-2.20.1/t/trash directory.t5616-partial-clone/srv.bare
+   343f988..73c28fd  master -> master
+Branch 'master' set up to track remote branch 'master' from 'srv'.
+Cloning into 'dst'...
+100644 blob d2cebd4f0a9e97a48a6139d09cafdb513ad8fee3	file.txt
+dangling tree bc1967ebf96a4e914801c7ef8328140456a10f41
+ok 14 - use fsck before and after manually fetching a missing subtree
 
 expecting success: 
-	reset &&
-	make_bare foo &&
-	make_bare foo.git &&
-	get foo &&
-	check foo
+	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 &&
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5900-repo-selection/foo/
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5900-repo-selection/foo.git/
-Initialized empty Git repository in /build/git-2.20.1/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
+	# 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: 
-	reset &&
-	make_bare foo &&
-	make_bare foo.git &&
-	get foo.git &&
-	check foo.git
+	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/git-2.20.1/t/trash directory.t5900-repo-selection/foo/
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5900-repo-selection/foo.git/
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5900-repo-selection/fetch/
-From ../foo
- * branch            HEAD       -> FETCH_HEAD
-Cloning into 'clone'...
-done.
-ok 6 - disambiguate with full foo.git
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5616-partial-clone/src/.git/
+[master (root-commit) 6f481db] x
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 x.t
+ok 15 - partial clone fetches blobs pointed to by refs even if normally filtered out
 
 expecting success: 
-	reset &&
-	make_bare foo.git &&
-	mkdir foo &&
-	get foo &&
-	check foo.git
+	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 &&
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5900-repo-selection/foo.git/
-Initialized empty Git repository in /build/git-2.20.1/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
+	git hash-object --stdin <src/foo.t >blob &&
 
-expecting success: 
-	reset &&
-	make_tree foo &&
-	make_bare foo.git &&
-	mv foo/.git foo.git &&
-	get foo.git &&
-	check foo
+	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/git-2.20.1/t/trash directory.t5900-repo-selection/foo/.git/
-[master (root-commit) ddd63c9] foo
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5616-partial-clone/src/.git/
+[master (root-commit) 31f3b95] foo
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 foo.t
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5900-repo-selection/foo.git/
-Initialized empty Git repository in /build/git-2.20.1/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
+Cloning into bare repository 'dst.git'...
+?257cc5642cb1a054f08cc83f2d943e56fd3ebe99
+From file:///build/git-2.20.1/t/trash directory.t5616-partial-clone/src
+ * branch            257cc5642cb1a054f08cc83f2d943e56fd3ebe99 -> FETCH_HEAD
+ok 16 - fetch what is specified on CLI even if already promised
 
-# passed all 8 test(s)
-1..8
+checking prerequisite: NOT_ROOT
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
+	uid=$(id -u) &&
+	test "$uid" != 0
+
+)
+prerequisite NOT_ROOT ok
+# passed all 16 test(s)
+# SKIP no web server found at '/usr/sbin/apache2'
+1..16
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
 *** t6001-rev-list-graft.sh ***
@@ -208500,39 +208511,39 @@
 	B2=$(git rev-parse --verify HEAD) &&
 	: done
 
-[master (root-commit) da4c90d] Initial in one history.
+[master (root-commit) d6c86e5] Initial in one history.
  Author: A U Thor <author@example.com>
  2 files changed, 2 insertions(+)
  create mode 100644 fileA
  create mode 100644 subdir/fileB
-[master c1e68de] Second in one history.
+[master 0d9017e] Second in one history.
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-[master 3f5b0f3] Third in one history.
+[master d604640] Third in one history.
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-[master (root-commit) 27fc2a0] Initial in alternate history.
+[master (root-commit) 1c63ffc] Initial in alternate history.
  Author: A U Thor <author@example.com>
  2 files changed, 2 insertions(+)
  create mode 100644 fileA
  create mode 100644 subdir/fileB
-[master 4e4bafe] Second in alternate history.
+[master 6829dc3] Second in alternate history.
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-[master a4511ba] Third in alternate history.
+[master 67a4232] Third in alternate history.
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 ok 1 - setup
 
 expecting success: 
 		rm -f .git/info/grafts &&
-		check basic a4511ba454ab2dac4e5e286b837234c03564ef16 -- a4511ba454ab2dac4e5e286b837234c03564ef16 4e4bafe08585510cfb89ae06e72b21cd3e9a01cf 27fc2a040849d6cb9624f60c6309f7dcc8168780
+		check basic 67a4232f299672a6586a2c2948158e175f69ef1e -- 67a4232f299672a6586a2c2948158e175f69ef1e 6829dc3f146960a110ab1101d0d7b35141f42087 1c63ffcd824d07ce3adabfdfebbd4a1527631a79
 	
 ok 2 - without grafts
 
 expecting success: 
-		echo '27fc2a040849d6cb9624f60c6309f7dcc8168780 3f5b0f391e4445a3caa14149e414da9920a07586' >.git/info/grafts &&
-		check basic a4511ba454ab2dac4e5e286b837234c03564ef16 -- a4511ba454ab2dac4e5e286b837234c03564ef16 4e4bafe08585510cfb89ae06e72b21cd3e9a01cf 27fc2a040849d6cb9624f60c6309f7dcc8168780 3f5b0f391e4445a3caa14149e414da9920a07586 c1e68de9beb902d5f39356333c044bb2cfaa0a2a da4c90db9be088eadd58d181af734aee482f933c
+		echo '1c63ffcd824d07ce3adabfdfebbd4a1527631a79 d60464023e402dd7eec5fcb755c625a9f8e1f26b' >.git/info/grafts &&
+		check basic 67a4232f299672a6586a2c2948158e175f69ef1e -- 67a4232f299672a6586a2c2948158e175f69ef1e 6829dc3f146960a110ab1101d0d7b35141f42087 1c63ffcd824d07ce3adabfdfebbd4a1527631a79 d60464023e402dd7eec5fcb755c625a9f8e1f26b 0d9017e18cf6001e5ba2b1b5f342e933157318d1 d6c86e5ee4c07591a21a5b8784f1a5e9d1441472
 	
 hint: Support for <GIT_DIR>/info/grafts is deprecated
 hint: and will be removed in a future Git version.
@@ -208546,13 +208557,13 @@
 
 expecting success: 
 		rm -f .git/info/grafts &&
-		check basic a4511ba454ab2dac4e5e286b837234c03564ef16 subdir -- a4511ba454ab2dac4e5e286b837234c03564ef16 27fc2a040849d6cb9624f60c6309f7dcc8168780
+		check basic 67a4232f299672a6586a2c2948158e175f69ef1e subdir -- 67a4232f299672a6586a2c2948158e175f69ef1e 1c63ffcd824d07ce3adabfdfebbd4a1527631a79
 	
 ok 4 - without grafts, with pathlimit
 
 expecting success: 
-		echo '27fc2a040849d6cb9624f60c6309f7dcc8168780 3f5b0f391e4445a3caa14149e414da9920a07586' >.git/info/grafts &&
-		check basic a4511ba454ab2dac4e5e286b837234c03564ef16 subdir -- a4511ba454ab2dac4e5e286b837234c03564ef16 27fc2a040849d6cb9624f60c6309f7dcc8168780 3f5b0f391e4445a3caa14149e414da9920a07586 da4c90db9be088eadd58d181af734aee482f933c
+		echo '1c63ffcd824d07ce3adabfdfebbd4a1527631a79 d60464023e402dd7eec5fcb755c625a9f8e1f26b' >.git/info/grafts &&
+		check basic 67a4232f299672a6586a2c2948158e175f69ef1e subdir -- 67a4232f299672a6586a2c2948158e175f69ef1e 1c63ffcd824d07ce3adabfdfebbd4a1527631a79 d60464023e402dd7eec5fcb755c625a9f8e1f26b d6c86e5ee4c07591a21a5b8784f1a5e9d1441472
 	
 hint: Support for <GIT_DIR>/info/grafts is deprecated
 hint: and will be removed in a future Git version.
@@ -208566,13 +208577,13 @@
 
 expecting success: 
 		rm -f .git/info/grafts &&
-		check parents a4511ba454ab2dac4e5e286b837234c03564ef16 -- a4511ba454ab2dac4e5e286b837234c03564ef16 4e4bafe08585510cfb89ae06e72b21cd3e9a01cf 27fc2a040849d6cb9624f60c6309f7dcc8168780
+		check parents 67a4232f299672a6586a2c2948158e175f69ef1e -- 67a4232f299672a6586a2c2948158e175f69ef1e 6829dc3f146960a110ab1101d0d7b35141f42087 1c63ffcd824d07ce3adabfdfebbd4a1527631a79
 	
 ok 6 - without grafts
 
 expecting success: 
-		echo '27fc2a040849d6cb9624f60c6309f7dcc8168780 3f5b0f391e4445a3caa14149e414da9920a07586' >.git/info/grafts &&
-		check parents a4511ba454ab2dac4e5e286b837234c03564ef16 -- a4511ba454ab2dac4e5e286b837234c03564ef16 4e4bafe08585510cfb89ae06e72b21cd3e9a01cf 27fc2a040849d6cb9624f60c6309f7dcc8168780 3f5b0f391e4445a3caa14149e414da9920a07586 c1e68de9beb902d5f39356333c044bb2cfaa0a2a da4c90db9be088eadd58d181af734aee482f933c
+		echo '1c63ffcd824d07ce3adabfdfebbd4a1527631a79 d60464023e402dd7eec5fcb755c625a9f8e1f26b' >.git/info/grafts &&
+		check parents 67a4232f299672a6586a2c2948158e175f69ef1e -- 67a4232f299672a6586a2c2948158e175f69ef1e 6829dc3f146960a110ab1101d0d7b35141f42087 1c63ffcd824d07ce3adabfdfebbd4a1527631a79 d60464023e402dd7eec5fcb755c625a9f8e1f26b 0d9017e18cf6001e5ba2b1b5f342e933157318d1 d6c86e5ee4c07591a21a5b8784f1a5e9d1441472
 	
 hint: Support for <GIT_DIR>/info/grafts is deprecated
 hint: and will be removed in a future Git version.
@@ -208586,13 +208597,13 @@
 
 expecting success: 
 		rm -f .git/info/grafts &&
-		check parents a4511ba454ab2dac4e5e286b837234c03564ef16 subdir -- a4511ba454ab2dac4e5e286b837234c03564ef16 27fc2a040849d6cb9624f60c6309f7dcc8168780
+		check parents 67a4232f299672a6586a2c2948158e175f69ef1e subdir -- 67a4232f299672a6586a2c2948158e175f69ef1e 1c63ffcd824d07ce3adabfdfebbd4a1527631a79
 	
 ok 8 - without grafts, with pathlimit
 
 expecting success: 
-		echo '27fc2a040849d6cb9624f60c6309f7dcc8168780 3f5b0f391e4445a3caa14149e414da9920a07586' >.git/info/grafts &&
-		check parents a4511ba454ab2dac4e5e286b837234c03564ef16 subdir -- a4511ba454ab2dac4e5e286b837234c03564ef16 27fc2a040849d6cb9624f60c6309f7dcc8168780 3f5b0f391e4445a3caa14149e414da9920a07586 da4c90db9be088eadd58d181af734aee482f933c
+		echo '1c63ffcd824d07ce3adabfdfebbd4a1527631a79 d60464023e402dd7eec5fcb755c625a9f8e1f26b' >.git/info/grafts &&
+		check parents 67a4232f299672a6586a2c2948158e175f69ef1e subdir -- 67a4232f299672a6586a2c2948158e175f69ef1e 1c63ffcd824d07ce3adabfdfebbd4a1527631a79 d60464023e402dd7eec5fcb755c625a9f8e1f26b d6c86e5ee4c07591a21a5b8784f1a5e9d1441472
 	
 hint: Support for <GIT_DIR>/info/grafts is deprecated
 hint: and will be removed in a future Git version.
@@ -208606,13 +208617,13 @@
 
 expecting success: 
 		rm -f .git/info/grafts &&
-		check parents-raw a4511ba454ab2dac4e5e286b837234c03564ef16 -- a4511ba454ab2dac4e5e286b837234c03564ef16 4e4bafe08585510cfb89ae06e72b21cd3e9a01cf 27fc2a040849d6cb9624f60c6309f7dcc8168780
+		check parents-raw 67a4232f299672a6586a2c2948158e175f69ef1e -- 67a4232f299672a6586a2c2948158e175f69ef1e 6829dc3f146960a110ab1101d0d7b35141f42087 1c63ffcd824d07ce3adabfdfebbd4a1527631a79
 	
 ok 10 - without grafts
 
 expecting success: 
-		echo '27fc2a040849d6cb9624f60c6309f7dcc8168780 3f5b0f391e4445a3caa14149e414da9920a07586' >.git/info/grafts &&
-		check parents-raw a4511ba454ab2dac4e5e286b837234c03564ef16 -- a4511ba454ab2dac4e5e286b837234c03564ef16 4e4bafe08585510cfb89ae06e72b21cd3e9a01cf 27fc2a040849d6cb9624f60c6309f7dcc8168780 3f5b0f391e4445a3caa14149e414da9920a07586 c1e68de9beb902d5f39356333c044bb2cfaa0a2a da4c90db9be088eadd58d181af734aee482f933c
+		echo '1c63ffcd824d07ce3adabfdfebbd4a1527631a79 d60464023e402dd7eec5fcb755c625a9f8e1f26b' >.git/info/grafts &&
+		check parents-raw 67a4232f299672a6586a2c2948158e175f69ef1e -- 67a4232f299672a6586a2c2948158e175f69ef1e 6829dc3f146960a110ab1101d0d7b35141f42087 1c63ffcd824d07ce3adabfdfebbd4a1527631a79 d60464023e402dd7eec5fcb755c625a9f8e1f26b 0d9017e18cf6001e5ba2b1b5f342e933157318d1 d6c86e5ee4c07591a21a5b8784f1a5e9d1441472
 	
 hint: Support for <GIT_DIR>/info/grafts is deprecated
 hint: and will be removed in a future Git version.
@@ -208626,13 +208637,13 @@
 
 expecting success: 
 		rm -f .git/info/grafts &&
-		check parents-raw a4511ba454ab2dac4e5e286b837234c03564ef16 subdir -- a4511ba454ab2dac4e5e286b837234c03564ef16 27fc2a040849d6cb9624f60c6309f7dcc8168780
+		check parents-raw 67a4232f299672a6586a2c2948158e175f69ef1e subdir -- 67a4232f299672a6586a2c2948158e175f69ef1e 1c63ffcd824d07ce3adabfdfebbd4a1527631a79
 	
 ok 12 - without grafts, with pathlimit
 
 expecting success: 
-		echo '27fc2a040849d6cb9624f60c6309f7dcc8168780 3f5b0f391e4445a3caa14149e414da9920a07586' >.git/info/grafts &&
-		check parents-raw a4511ba454ab2dac4e5e286b837234c03564ef16 subdir -- a4511ba454ab2dac4e5e286b837234c03564ef16 27fc2a040849d6cb9624f60c6309f7dcc8168780 3f5b0f391e4445a3caa14149e414da9920a07586 da4c90db9be088eadd58d181af734aee482f933c
+		echo '1c63ffcd824d07ce3adabfdfebbd4a1527631a79 d60464023e402dd7eec5fcb755c625a9f8e1f26b' >.git/info/grafts &&
+		check parents-raw 67a4232f299672a6586a2c2948158e175f69ef1e subdir -- 67a4232f299672a6586a2c2948158e175f69ef1e 1c63ffcd824d07ce3adabfdfebbd4a1527631a79 d60464023e402dd7eec5fcb755c625a9f8e1f26b d6c86e5ee4c07591a21a5b8784f1a5e9d1441472
 	
 hint: Support for <GIT_DIR>/info/grafts is deprecated
 hint: and will be removed in a future Git version.
@@ -208651,9 +208662,9 @@
 	git show HEAD 2>err &&
 	test_i18ngrep ! "git replace" err
 
-commit a4511ba454ab2dac4e5e286b837234c03564ef16
+commit 67a4232f299672a6586a2c2948158e175f69ef1e
 Author: A U Thor <author@example.com>
-Date:   Fri Dec 3 05:08:57 2021 +0000
+Date:   Thu Jan 5 11:49:28 2023 +0000
 
     Third in alternate history.
 
@@ -208665,9 +208676,9 @@
 -fileB again
 +fileB modified in alternate history
 hint: Please use "git replace --convert-graft-file"
-commit a4511ba454ab2dac4e5e286b837234c03564ef16
+commit 67a4232f299672a6586a2c2948158e175f69ef1e
 Author: A U Thor <author@example.com>
-Date:   Fri Dec 3 05:08:57 2021 +0000
+Date:   Thu Jan 5 11:49:28 2023 +0000
 
     Third in alternate history.
 
@@ -208684,1346 +208695,464 @@
 1..14
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t5552-skipping-fetch-negotiator.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5552-skipping-fetch-negotiator/.git/
+*** t5815-submodule-protos.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5815-submodule-protos/.git/
 expecting success: 
-	git init server &&
-	test_commit -C server to_fetch &&
+		write_script fake-remote <<-\EOF &&
+		echo >&2 "fake-remote: $*"
+		cd "$TRASH_DIRECTORY/remote" &&
+		eval "$*"
+		EOF
+		PATH=$TRASH_DIRECTORY:$PATH &&
+		export TRASH_DIRECTORY
+	
+ok 1 - setup ext wrapper
 
-	git init client &&
-	for i in $(test_seq 7)
-	do
-		test_commit -C client c$i
-	done &&
+expecting success: 
+		write_script ssh-wrapper <<-\EOF &&
+		echo >&2 "ssh: $*"
+		host=$1; shift
+		cd "$TRASH_DIRECTORY/$host" &&
+		eval "$*"
+		EOF
+		GIT_SSH="$PWD/ssh-wrapper" &&
+		export GIT_SSH &&
+		export TRASH_DIRECTORY
+	
+ok 2 - setup ssh wrapper
 
-	# We send: "c7" (skip 1) "c5" (skip 2) "c2" (skip 4). After that, since
-	# "c1" has no parent, it is still sent as "have" even though it would
-	# normally be skipped.
-	test_config -C client fetch.negotiationalgorithm skipping &&
-	trace_fetch client "$(pwd)/server" &&
-	have_sent c7 c5 c2 c1 &&
-	have_not_sent c6 c4 c3
+expecting success: 
+	mkdir remote &&
+	git init remote/repo.git &&
+	(cd remote/repo.git && test_commit one) &&
+	# submodule-add should probably trust what we feed it on the cmdline,
+	# but its implementation is overly conservative.
+	GIT_ALLOW_PROTOCOL=ssh git submodule add remote:repo.git ssh-module &&
+	GIT_ALLOW_PROTOCOL=ext git submodule add "ext::fake-remote %S repo.git" ext-module &&
+	git commit -m "add submodules"
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5552-skipping-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/git-2.20.1/t/trash directory.t5552-skipping-fetch-negotiator/client/.git/
-[master (root-commit) 9e22a6c] c1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c1.t
-[master 0d7e994] c2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c2.t
-[master 85a1cf7] c3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c3.t
-[master 0849982] c4
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c4.t
-[master 0abab02] c5
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c5.t
-[master 796a96a] c6
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5815-submodule-protos/remote/repo.git/.git/
+[master (root-commit) d79ce16] one
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 c6.t
-[master 9b13844] c7
+ create mode 100644 one.t
+Cloning into '/build/git-2.20.1/t/trash directory.t5815-submodule-protos/ssh-module'...
+ssh: remote git-upload-pack 'repo.git'
+Cloning into '/build/git-2.20.1/t/trash directory.t5815-submodule-protos/ext-module'...
+fake-remote: git-upload-pack repo.git
+[master (root-commit) 5b91cb1] add submodules
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c7.t
-warning: no common commits
-From /build/git-2.20.1/t/trash directory.t5552-skipping-fetch-negotiator/server
- * branch            HEAD       -> FETCH_HEAD
-packet:        fetch> have 9b13844ba1d52a28bb9487107b41cce9916b74c9
-packet:        fetch> have 0abab022ac7e07f16265106cf36faf7cb5d87ab3
-packet:        fetch> have 0d7e994c092abbb0a21e7d243114efa5ba452b8c
-packet:        fetch> have 9e22a6c1b441ee1bcd54b8da801261ba8b15eac9
-ok 1 - commits with no parents are sent regardless of skip distance
+ 3 files changed, 8 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 ext-module
+ create mode 160000 ssh-module
+ok 3 - setup repository with submodules
 
 expecting success: 
-	rm -rf server client trace &&
-	git init server &&
-	test_commit -C server to_fetch &&
+	test_must_fail git clone --recurse-submodules . dst
 
-	git init client &&
-	test_commit -C client on_client &&
-	git -C client checkout on_client &&
+Cloning into 'dst'...
+done.
+Submodule 'ext-module' (ext::fake-remote %S repo.git) registered for path 'ext-module'
+Submodule 'ssh-module' (remote:repo.git) registered for path 'ssh-module'
+Cloning into '/build/git-2.20.1/t/trash directory.t5815-submodule-protos/dst/ext-module'...
+fatal: transport 'ext' not allowed
+fatal: clone of 'ext::fake-remote %S repo.git' into submodule path '/build/git-2.20.1/t/trash directory.t5815-submodule-protos/dst/ext-module' failed
+Failed to clone 'ext-module'. Retry scheduled
+Cloning into '/build/git-2.20.1/t/trash directory.t5815-submodule-protos/dst/ssh-module'...
+ssh: remote git-upload-pack 'repo.git'
+Cloning into '/build/git-2.20.1/t/trash directory.t5815-submodule-protos/dst/ext-module'...
+fatal: transport 'ext' not allowed
+fatal: clone of 'ext::fake-remote %S repo.git' into submodule path '/build/git-2.20.1/t/trash directory.t5815-submodule-protos/dst/ext-module' failed
+Failed to clone 'ext-module' a second time, aborting
+ok 4 - clone with recurse-submodules fails
 
-	test_config -C client fetch.negotiationAlgorithm invalid &&
-	test_must_fail git -C client fetch "$(pwd)/server" 2>err &&
-	test_i18ngrep "unknown fetch negotiation algorithm" err &&
+expecting success: 
+	rm -rf dst &&
+	git clone . dst &&
+	git -C dst submodule init
 
-	# Explicit "default" value
-	test_config -C client fetch.negotiationAlgorithm default &&
-	git -C client -c fetch.negotiationAlgorithm=default fetch "$(pwd)/server" &&
+Cloning into 'dst'...
+done.
+Submodule 'ext-module' (ext::fake-remote %S repo.git) registered for path 'ext-module'
+Submodule 'ssh-module' (remote:repo.git) registered for path 'ssh-module'
+ok 5 - setup individual updates
 
-	# Implementation detail: If there is nothing to fetch, we will not error out
-	test_config -C client fetch.negotiationAlgorithm invalid &&
-	git -C client fetch "$(pwd)/server" 2>err &&
-	test_i18ngrep ! "unknown fetch negotiation algorithm" err
+expecting success: 
+	git -C dst submodule update ssh-module
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5552-skipping-fetch-negotiator/server/.git/
-[master (root-commit) 64a1f76] 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/git-2.20.1/t/trash directory.t5552-skipping-fetch-negotiator/client/.git/
-[master (root-commit) 6d60c89] on_client
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 on_client.t
-Note: checking out 'on_client'.
+Cloning into '/build/git-2.20.1/t/trash directory.t5815-submodule-protos/dst/ssh-module'...
+ssh: remote git-upload-pack 'repo.git'
+Submodule path 'ssh-module': checked out 'd79ce1670bdcb76e6d1da2ae095e890ccb326ae9'
+ok 6 - update of ssh allowed
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by performing another checkout.
+expecting success: 
+	test_must_fail git -C dst submodule update ext-module
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
+Cloning into '/build/git-2.20.1/t/trash directory.t5815-submodule-protos/dst/ext-module'...
+fatal: transport 'ext' not allowed
+fatal: clone of 'ext::fake-remote %S repo.git' into submodule path '/build/git-2.20.1/t/trash directory.t5815-submodule-protos/dst/ext-module' failed
+Failed to clone 'ext-module'. Retry scheduled
+Cloning into '/build/git-2.20.1/t/trash directory.t5815-submodule-protos/dst/ext-module'...
+fatal: transport 'ext' not allowed
+fatal: clone of 'ext::fake-remote %S repo.git' into submodule path '/build/git-2.20.1/t/trash directory.t5815-submodule-protos/dst/ext-module' failed
+Failed to clone 'ext-module' a second time, aborting
+ok 7 - update of ext not allowed
 
-  git checkout -b <new-branch-name>
+expecting success: 
+	GIT_ALLOW_PROTOCOL=ext git -C dst submodule update ext-module
 
-HEAD is now at 6d60c89 on_client
-fatal: unknown fetch negotiation algorithm 'invalid'
-warning: no common commits
-From /build/git-2.20.1/t/trash directory.t5552-skipping-fetch-negotiator/server
- * branch            HEAD       -> FETCH_HEAD
-ok 2 - unknown fetch.negotiationAlgorithm values error out
+Cloning into '/build/git-2.20.1/t/trash directory.t5815-submodule-protos/dst/ext-module'...
+fake-remote: git-upload-pack repo.git
+Submodule path 'ext-module': checked out 'd79ce1670bdcb76e6d1da2ae095e890ccb326ae9'
+ok 8 - user can override whitelist
 
+# passed all 8 test(s)
+1..8
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t6004-rev-list-path-optim.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6004-rev-list-path-optim/.git/
 expecting success: 
-	rm -rf server client trace &&
-	git init server &&
-	test_commit -C server to_fetch &&
+	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
 
-	git init client &&
-	for i in $(test_seq 11)
-	do
-		test_commit -C client c$i
-	done &&
-	git -C client checkout c5 &&
-	test_commit -C client c5side &&
+[master (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
 
-	# Before reaching c5, we send "c5side" (skip 1) and "c11" (skip 1) "c9"
-	# (skip 2) "c6" (skip 4). The larger skip (skip 4) takes precedence, so
-	# the next "have" sent will be "c1" (from "c6" skip 4) and not "c4"
-	# (from "c5side" skip 1).
-	test_config -C client fetch.negotiationalgorithm skipping &&
-	trace_fetch client "$(pwd)/server" &&
-	have_sent c5side c11 c9 c6 c1 &&
-	have_not_sent c10 c8 c7 c5 c4 c3 c2
+expecting success: 
+	test_tick &&
+	commit=$(echo "Unchanged tree" | git commit-tree "HEAD^{tree}" -p HEAD) &&
+	test $(git rev-list $commit | wc -l) = 2 &&
+	test $(git rev-list $commit -- . | wc -l) = 1
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5552-skipping-fetch-negotiator/server/.git/
-[master (root-commit) 3bc19e6] 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/git-2.20.1/t/trash directory.t5552-skipping-fetch-negotiator/client/.git/
-[master (root-commit) 73c9691] c1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c1.t
-[master 3e97f74] c2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c2.t
-[master 40cabae] c3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c3.t
-[master 7106bbb] c4
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c4.t
-[master 2a51269] c5
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c5.t
-[master 591084c] c6
+ok 2 - path-optimization
+
+expecting success: 
+	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 master &&
+	echo Another >b &&
+	echo Munged >d/z &&
+	git add b d/z &&
+	test_tick &&
+	git commit -m "Master touches b" &&
+	git tag master_b0 &&
+	git merge side &&
+	echo Touched >b &&
+	git add b &&
+	test_tick &&
+	git commit -m "Master touches b again"
+
+Switched to a new branch 'side'
+[side d02d707] Side makes an irrelevant commit
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c6.t
-[master 86cf406] c7
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+ create mode 100644 c
+[side 381f63c] Side makes another irrelevant commit
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c7.t
-[master cd20934] c8
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[side e8cf16f] Side touches a
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c8.t
-[master 6d58a2d] c9
+ 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(+)
- create mode 100644 c9.t
-[master 9fa7b54] c10
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to branch 'master'
+[master 4417088] Master touches b
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c10.t
-[master 71dd193] c11
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+ create mode 100644 b
+Merging:
+4417088 Master touches b
+virtual side
+found 1 common ancestor:
+5c8df84 Initial commit
+Merge made by the 'recursive' strategy.
+ a   | 2 +-
+ c   | 1 +
+ d/f | 2 +-
+ 3 files changed, 3 insertions(+), 2 deletions(-)
+ create mode 100644 c
+[master 6a8c990] Master touches b again
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c11.t
-Note: checking out 'c5'.
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 3 - further setup
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by performing another checkout.
+expecting success: 
+	git rev-parse side_a1 initial >expected &&
+	git rev-list HEAD -- a >actual &&
+	test_cmp expected actual
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
+ok 4 - path optimization 2
 
-  git checkout -b <new-branch-name>
+expecting success: 
+	git rev-parse master^ master_b0 side_c0 initial >expected &&
+	git rev-list HEAD -- d >actual &&
+	test_cmp expected actual
 
-HEAD is now at 2a51269 c5
-[detached HEAD 5bb2674] c5side
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c5side.t
-warning: no common commits
-From /build/git-2.20.1/t/trash directory.t5552-skipping-fetch-negotiator/server
- * branch            HEAD       -> FETCH_HEAD
-packet:        fetch> have 5bb26742f0d19e4c8eb1d1c6b4ad095643276f17
-packet:        fetch> have 71dd1938ab184b2c161869e75d3d67ab6f43f2ad
-packet:        fetch> have 6d58a2de92cca4528034ca2f9a1c205bc6850c1d
-packet:        fetch> have 591084cc9129e52445472ffcd274d61cb8468867
-packet:        fetch> have 73c9691b10107e4c472cac321722d49cc664e3e6
-ok 3 - when two skips collide, favor the larger one
+ok 5 - pathspec with leading path
 
 expecting success: 
-	rm -rf server client trace &&
-	git init server &&
-	test_commit -C server c1 &&
-	test_commit -C server c2 &&
-	test_commit -C server c3 &&
-	git -C server tag -d c1 c2 c3 &&
+	git rev-parse master^ master_b0 side_c0 initial >expected &&
+	git rev-list HEAD -- "d/*" >actual &&
+	test_cmp expected actual
 
-	git clone server client &&
-	test_commit -C client c4 &&
-	test_commit -C client c5 &&
-	git -C client checkout c4^^ &&
-	test_commit -C client c2side &&
+ok 6 - pathspec with glob (1)
 
-	git -C server checkout --orphan anotherbranch &&
-	test_commit -C server to_fetch &&
+expecting success: 
+	git rev-parse side_c0 initial >expected &&
+	git rev-list HEAD -- "d/[a-m]*" >actual &&
+	test_cmp expected actual
 
-	# The server advertising "c3" (as "refs/heads/master") means that we do
-	# not need to send any ancestors of "c3", but we still need to send "c3"
-	# itself.
-	test_config -C client fetch.negotiationalgorithm skipping &&
-	trace_fetch client origin to_fetch &&
-	have_sent c5 c4^ c2side &&
-	have_not_sent c4 c4^^ c4^^^
+ok 7 - pathspec with glob (2)
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5552-skipping-fetch-negotiator/server/.git/
-[master (root-commit) 47f2535] c1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c1.t
-[master dd0ac24] c2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c2.t
-[master b554ada] c3
+# passed all 7 test(s)
+1..7
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t5900-repo-selection.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5900-repo-selection/.git/
+expecting success: 
+	reset &&
+	make_tree foo &&
+	get foo &&
+	check foo
+
+Initialized empty Git repository in /build/git-2.20.1/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 c3.t
-Deleted tag 'c1' (was 47f2535)
-Deleted tag 'c2' (was dd0ac24)
-Deleted tag 'c3' (was b554ada)
-Cloning into 'client'...
+ create mode 100644 foo.t
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5900-repo-selection/fetch/
+From ../foo
+ * branch            HEAD       -> FETCH_HEAD
+Cloning into 'clone'...
 done.
-[master 15c2709] c4
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c4.t
-[master 14537eb] c5
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c5.t
-Note: checking out 'c4^^'.
+ok 1 - find .git dir in worktree
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by performing another checkout.
+expecting success: 
+	reset &&
+	make_bare foo.git &&
+	get foo &&
+	check foo.git
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5900-repo-selection/foo.git/
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5900-repo-selection/fetch/
+From ../foo
+ * branch            HEAD       -> FETCH_HEAD
+Cloning into 'clone'...
+done.
+ok 2 - automagically add .git suffix
 
-  git checkout -b <new-branch-name>
+expecting success: 
+	reset &&
+	make_tree foo.git &&
+	get foo &&
+	check foo.git
 
-HEAD is now at dd0ac24 c2
-[detached HEAD 3409843] c2side
+Initialized empty Git repository in /build/git-2.20.1/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 c2side.t
-Switched to a new branch 'anotherbranch'
-[anotherbranch (root-commit) ed0e66c] to_fetch
- Author: A U Thor <author@example.com>
- 4 files changed, 4 insertions(+)
- create mode 100644 c1.t
- create mode 100644 c2.t
- create mode 100644 c3.t
- create mode 100644 to_fetch.t
-From /build/git-2.20.1/t/trash directory.t5552-skipping-fetch-negotiator/server
- * tag               to_fetch   -> FETCH_HEAD
-packet:        fetch> have 14537ebb3063f1a5d49e3e3eac10cc6e900a9c3a
-packet:        fetch> have b554adabfc933db0071191b38e163057f45d7dee
-packet:        fetch> have 3409843ec3ac9e67b951a36aae634d4ff9ec378d
-ok 4 - use ref advertisement to filter out commits
+ create mode 100644 foo.git.t
+Initialized empty Git repository in /build/git-2.20.1/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: 
-	rm -rf server client trace &&
-	git init server &&
-	test_commit -C server to_fetch &&
+	reset &&
+	make_tree foo &&
+	make_bare foo.git &&
+	get foo &&
+	check foo
 
-	git init client &&
+Initialized empty Git repository in /build/git-2.20.1/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/git-2.20.1/t/trash directory.t5900-repo-selection/foo.git/
+Initialized empty Git repository in /build/git-2.20.1/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
 
-	# 2 regular commits
-	test_tick=2000000000 &&
-	test_commit -C client c1 &&
-	test_commit -C client c2 &&
+expecting success: 
+	reset &&
+	make_bare foo &&
+	make_bare foo.git &&
+	get foo &&
+	check foo
 
-	# 4 old commits
-	test_tick=1000000000 &&
-	git -C client checkout c1 &&
-	test_commit -C client old1 &&
-	test_commit -C client old2 &&
-	test_commit -C client old3 &&
-	test_commit -C client old4 &&
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5900-repo-selection/foo/
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5900-repo-selection/foo.git/
+Initialized empty Git repository in /build/git-2.20.1/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
 
-	# "c2" and "c1" are popped first, then "old4" to "old1". "old1" would
-	# normally be skipped, but is treated as a commit without a parent here
-	# and sent, because (due to clock skew) its only parent has already been
-	# popped off the priority queue.
-	test_config -C client fetch.negotiationalgorithm skipping &&
-	trace_fetch client "$(pwd)/server" &&
-	have_sent c2 c1 old4 old2 old1 &&
-	have_not_sent old3
+expecting success: 
+	reset &&
+	make_bare foo &&
+	make_bare foo.git &&
+	get foo.git &&
+	check foo.git
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5552-skipping-fetch-negotiator/server/.git/
-[master (root-commit) 8324fbb] 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/git-2.20.1/t/trash directory.t5552-skipping-fetch-negotiator/client/.git/
-[master (root-commit) dc824fa] c1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c1.t
-[master 9ab4692] c2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c2.t
-Note: checking out 'c1'.
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5900-repo-selection/foo/
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5900-repo-selection/foo.git/
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5900-repo-selection/fetch/
+From ../foo
+ * branch            HEAD       -> FETCH_HEAD
+Cloning into 'clone'...
+done.
+ok 6 - disambiguate with full foo.git
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by performing another checkout.
+expecting success: 
+	reset &&
+	make_bare foo.git &&
+	mkdir foo &&
+	get foo &&
+	check foo.git
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5900-repo-selection/foo.git/
+Initialized empty Git repository in /build/git-2.20.1/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
 
-  git checkout -b <new-branch-name>
+expecting success: 
+	reset &&
+	make_tree foo &&
+	make_bare foo.git &&
+	mv foo/.git foo.git &&
+	get foo.git &&
+	check foo
 
-HEAD is now at dc824fa c1
-[detached HEAD e9a2c09] old1
+Initialized empty Git repository in /build/git-2.20.1/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 old1.t
-[detached HEAD 41bd8dc] old2
+ create mode 100644 foo.t
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5900-repo-selection/foo.git/
+Initialized empty Git repository in /build/git-2.20.1/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/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t6005-rev-list-count.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6005-rev-list-count/.git/
+expecting success: 
+    for n in 1 2 3 4 5 ; do \
+        echo $n > a ; \
+        git add a ; \
+        git commit -m "$n" ; \
+    done
+
+[master (root-commit) 4bb0992] 1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 old2.t
-[detached HEAD 4ff0db5] old3
+ create mode 100644 a
+[master 7581550] 2
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 old3.t
-[detached HEAD caef059] old4
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[master a6d9ae1] 3
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 old4.t
-warning: no common commits
-From /build/git-2.20.1/t/trash directory.t5552-skipping-fetch-negotiator/server
- * branch            HEAD       -> FETCH_HEAD
-packet:        fetch> have 9ab46928dc282aa09f4dbf96893a252e058e7e8e
-packet:        fetch> have dc824fafb05f3229aedf1f320bbe572e35364dfe
-packet:        fetch> have caef059de69917b9119176a11b88afcef769331d
-packet:        fetch> have 41bd8dc092ee110ba80e350a346ec507ab2e42a0
-packet:        fetch> have e9a2c092a8e911567a377c881a7f6031e7f892ea
-ok 5 - handle clock skew
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[master 0158da9] 4
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[master 4fd4c34] 5
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 1 - setup
 
 expecting success: 
-	rm -rf server client trace &&
-	git init server &&
-	test_commit -C server to_fetch &&
+    test $(git rev-list HEAD | wc -l) = 5
 
-	git init client &&
-	for i in $(test_seq 8)
-	do
-		git -C client checkout --orphan b$i &&
-		test_commit -C client b$i.c0
-	done &&
-	for j in $(test_seq 19)
-	do
-		for i in $(test_seq 8)
-		do
-			git -C client checkout b$i &&
-			test_commit -C client b$i.c$j
-		done
-	done &&
+ok 2 - no options
 
-	# Copy this branch over to the server and add a commit on it so that it
-	# is reachable but not advertised.
-	git -C server fetch --no-tags "$(pwd)/client" b1:refs/heads/b1 &&
-	git -C server checkout b1 &&
-	test_commit -C server commit-on-b1 &&
+expecting success: 
+    test $(git rev-list HEAD --max-count=0 | wc -l) = 0 &&
+    test $(git rev-list HEAD --max-count=3 | wc -l) = 3 &&
+    test $(git rev-list HEAD --max-count=5 | wc -l) = 5 &&
+    test $(git rev-list HEAD --max-count=10 | wc -l) = 5
 
-	test_config -C client fetch.negotiationalgorithm skipping &&
-	trace_fetch client "$(pwd)/server" to_fetch &&
-	grep "  fetch" trace &&
+ok 3 - --max-count
 
-	# fetch-pack sends 2 requests each containing 16 "have" lines before
-	# processing the first response. In these 2 requests, 4 commits from
-	# each branch are sent. Just check the first branch.
-	have_sent b1.c19 b1.c17 b1.c14 b1.c9 &&
-	have_not_sent b1.c18 b1.c16 b1.c15 b1.c13 b1.c12 b1.c11 b1.c10 &&
+expecting success: 
+    test $(git rev-list HEAD --max-count=1 | wc -l) = 1 &&
+    test $(git rev-list HEAD -1 | wc -l) = 1 &&
+    test $(git rev-list HEAD -n1 | wc -l) = 1 &&
+    test $(git rev-list HEAD -n 1 | wc -l) = 1
 
-	# While fetch-pack is processing the first response, it should read that
-	# the server ACKs b1.c19 and b1.c17.
-	grep "fetch< ACK $(git -C client rev-parse b1.c19) common" trace &&
-	grep "fetch< ACK $(git -C client rev-parse b1.c17) common" trace &&
+ok 4 - --max-count all forms
 
-	# fetch-pack should thus not send any more commits in the b1 branch, but
-	# should still send the others (in this test, just check b2).
-	for i in $(test_seq 0 8)
-	do
-		have_not_sent b1.c$i
-	done &&
-	have_sent b2.c1 b2.c0
+expecting success: 
+    test $(git rev-list HEAD --skip=0 | wc -l) = 5 &&
+    test $(git rev-list HEAD --skip=3 | wc -l) = 2 &&
+    test $(git rev-list HEAD --skip=5 | wc -l) = 0 &&
+    test $(git rev-list HEAD --skip=10 | wc -l) = 0
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5552-skipping-fetch-negotiator/server/.git/
-[master (root-commit) 184bd23] 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/git-2.20.1/t/trash directory.t5552-skipping-fetch-negotiator/client/.git/
-Switched to a new branch 'b1'
-[b1 (root-commit) f66d2ca] b1.c0
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b1.c0.t
-Switched to a new branch 'b2'
-[b2 (root-commit) c402344] b2.c0
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 b1.c0.t
- create mode 100644 b2.c0.t
-Switched to a new branch 'b3'
-[b3 (root-commit) 8252af3] b3.c0
- Author: A U Thor <author@example.com>
- 3 files changed, 3 insertions(+)
- create mode 100644 b1.c0.t
- create mode 100644 b2.c0.t
- create mode 100644 b3.c0.t
-Switched to a new branch 'b4'
-[b4 (root-commit) 8bffdf8] b4.c0
- Author: A U Thor <author@example.com>
- 4 files changed, 4 insertions(+)
- create mode 100644 b1.c0.t
- create mode 100644 b2.c0.t
- create mode 100644 b3.c0.t
- create mode 100644 b4.c0.t
-Switched to a new branch 'b5'
-[b5 (root-commit) ece05e8] b5.c0
- Author: A U Thor <author@example.com>
- 5 files changed, 5 insertions(+)
- create mode 100644 b1.c0.t
- create mode 100644 b2.c0.t
- create mode 100644 b3.c0.t
- create mode 100644 b4.c0.t
- create mode 100644 b5.c0.t
-Switched to a new branch 'b6'
-[b6 (root-commit) ca6bc33] b6.c0
- Author: A U Thor <author@example.com>
- 6 files changed, 6 insertions(+)
- create mode 100644 b1.c0.t
- create mode 100644 b2.c0.t
- create mode 100644 b3.c0.t
- create mode 100644 b4.c0.t
- create mode 100644 b5.c0.t
- create mode 100644 b6.c0.t
-Switched to a new branch 'b7'
-[b7 (root-commit) 063e256] b7.c0
- Author: A U Thor <author@example.com>
- 7 files changed, 7 insertions(+)
- create mode 100644 b1.c0.t
- create mode 100644 b2.c0.t
- create mode 100644 b3.c0.t
- create mode 100644 b4.c0.t
- create mode 100644 b5.c0.t
- create mode 100644 b6.c0.t
- create mode 100644 b7.c0.t
-Switched to a new branch 'b8'
-[b8 (root-commit) 9f605c2] b8.c0
- Author: A U Thor <author@example.com>
- 8 files changed, 8 insertions(+)
- create mode 100644 b1.c0.t
- create mode 100644 b2.c0.t
- create mode 100644 b3.c0.t
- create mode 100644 b4.c0.t
- create mode 100644 b5.c0.t
- create mode 100644 b6.c0.t
- create mode 100644 b7.c0.t
- create mode 100644 b8.c0.t
-Switched to branch 'b1'
-[b1 3f095eb] b1.c1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b1.c1.t
-Switched to branch 'b2'
-[b2 89ecd55] b2.c1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b2.c1.t
-Switched to branch 'b3'
-[b3 6592e0b] b3.c1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b3.c1.t
-Switched to branch 'b4'
-[b4 4426873] b4.c1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b4.c1.t
-Switched to branch 'b5'
-[b5 dbb467e] b5.c1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b5.c1.t
-Switched to branch 'b6'
-[b6 6b911cf] b6.c1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b6.c1.t
-Switched to branch 'b7'
-[b7 2414896] b7.c1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b7.c1.t
-Switched to branch 'b8'
-[b8 768bfc5] b8.c1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b8.c1.t
-Switched to branch 'b1'
-[b1 e885a48] b1.c2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b1.c2.t
-Switched to branch 'b2'
-[b2 7c818a7] b2.c2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b2.c2.t
-Switched to branch 'b3'
-[b3 871f49f] b3.c2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b3.c2.t
-Switched to branch 'b4'
-[b4 72680bb] b4.c2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b4.c2.t
-Switched to branch 'b5'
-[b5 b4557a1] b5.c2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b5.c2.t
-Switched to branch 'b6'
-[b6 6ca2925] b6.c2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b6.c2.t
-Switched to branch 'b7'
-[b7 7b661b8] b7.c2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b7.c2.t
-Switched to branch 'b8'
-[b8 2ecc389] b8.c2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b8.c2.t
-Switched to branch 'b1'
-[b1 5c8f104] b1.c3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b1.c3.t
-Switched to branch 'b2'
-[b2 4a25303] b2.c3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b2.c3.t
-Switched to branch 'b3'
-[b3 53d0287] b3.c3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b3.c3.t
-Switched to branch 'b4'
-[b4 6a982e3] b4.c3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b4.c3.t
-Switched to branch 'b5'
-[b5 beacf7c] b5.c3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b5.c3.t
-Switched to branch 'b6'
-[b6 645ec77] b6.c3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b6.c3.t
-Switched to branch 'b7'
-[b7 c245fa6] b7.c3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b7.c3.t
-Switched to branch 'b8'
-[b8 e7e7720] b8.c3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b8.c3.t
-Switched to branch 'b1'
-[b1 42fd38e] b1.c4
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b1.c4.t
-Switched to branch 'b2'
-[b2 b2c5e5b] b2.c4
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b2.c4.t
-Switched to branch 'b3'
-[b3 f0835ff] b3.c4
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b3.c4.t
-Switched to branch 'b4'
-[b4 b60c575] b4.c4
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b4.c4.t
-Switched to branch 'b5'
-[b5 4981e16] b5.c4
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b5.c4.t
-Switched to branch 'b6'
-[b6 3b4c6b7] b6.c4
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b6.c4.t
-Switched to branch 'b7'
-[b7 500474e] b7.c4
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b7.c4.t
-Switched to branch 'b8'
-[b8 54ca498] b8.c4
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b8.c4.t
-Switched to branch 'b1'
-[b1 3accc66] b1.c5
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b1.c5.t
-Switched to branch 'b2'
-[b2 82dee3b] b2.c5
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b2.c5.t
-Switched to branch 'b3'
-[b3 be215b2] b3.c5
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b3.c5.t
-Switched to branch 'b4'
-[b4 dabc132] b4.c5
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b4.c5.t
-Switched to branch 'b5'
-[b5 8561b1c] b5.c5
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b5.c5.t
-Switched to branch 'b6'
-[b6 318c581] b6.c5
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b6.c5.t
-Switched to branch 'b7'
-[b7 92d192b] b7.c5
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b7.c5.t
-Switched to branch 'b8'
-[b8 ea98a5a] b8.c5
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b8.c5.t
-Switched to branch 'b1'
-[b1 4f95974] b1.c6
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b1.c6.t
-Switched to branch 'b2'
-[b2 c6b69d0] b2.c6
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b2.c6.t
-Switched to branch 'b3'
-[b3 0c5d942] b3.c6
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b3.c6.t
-Switched to branch 'b4'
-[b4 46bd8d8] b4.c6
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b4.c6.t
-Switched to branch 'b5'
-[b5 3eb11ae] b5.c6
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b5.c6.t
-Switched to branch 'b6'
-[b6 77cb153] b6.c6
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b6.c6.t
-Switched to branch 'b7'
-[b7 1fa72fc] b7.c6
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b7.c6.t
-Switched to branch 'b8'
-[b8 ddd2755] b8.c6
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b8.c6.t
-Switched to branch 'b1'
-[b1 318aa43] b1.c7
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b1.c7.t
-Switched to branch 'b2'
-[b2 5e7b2f0] b2.c7
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b2.c7.t
-Switched to branch 'b3'
-[b3 9bf9a83] b3.c7
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b3.c7.t
-Switched to branch 'b4'
-[b4 794bc8f] b4.c7
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b4.c7.t
-Switched to branch 'b5'
-[b5 69fe812] b5.c7
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b5.c7.t
-Switched to branch 'b6'
-[b6 97ae47d] b6.c7
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b6.c7.t
-Switched to branch 'b7'
-[b7 403ab1f] b7.c7
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b7.c7.t
-Switched to branch 'b8'
-[b8 cff31fa] b8.c7
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b8.c7.t
-Switched to branch 'b1'
-[b1 eccb3a8] b1.c8
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b1.c8.t
-Switched to branch 'b2'
-[b2 6e4ea02] b2.c8
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b2.c8.t
-Switched to branch 'b3'
-[b3 37e9829] b3.c8
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b3.c8.t
-Switched to branch 'b4'
-[b4 9ff00cf] b4.c8
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b4.c8.t
-Switched to branch 'b5'
-[b5 a42de58] b5.c8
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b5.c8.t
-Switched to branch 'b6'
-[b6 8fce737] b6.c8
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b6.c8.t
-Switched to branch 'b7'
-[b7 8a6b38a] b7.c8
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b7.c8.t
-Switched to branch 'b8'
-[b8 4e6a712] b8.c8
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b8.c8.t
-Switched to branch 'b1'
-[b1 b76868e] b1.c9
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b1.c9.t
-Switched to branch 'b2'
-[b2 770eae6] b2.c9
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b2.c9.t
-Switched to branch 'b3'
-[b3 83458c8] b3.c9
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b3.c9.t
-Switched to branch 'b4'
-[b4 49c8cda] b4.c9
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b4.c9.t
-Switched to branch 'b5'
-[b5 0ed227c] b5.c9
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b5.c9.t
-Switched to branch 'b6'
-[b6 91e9203] b6.c9
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b6.c9.t
-Switched to branch 'b7'
-[b7 5f1aa7f] b7.c9
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b7.c9.t
-Switched to branch 'b8'
-[b8 e4190b4] b8.c9
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b8.c9.t
-Switched to branch 'b1'
-[b1 431681a] b1.c10
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b1.c10.t
-Switched to branch 'b2'
-[b2 cdc2fe7] b2.c10
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b2.c10.t
-Switched to branch 'b3'
-[b3 04d742f] b3.c10
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b3.c10.t
-Switched to branch 'b4'
-[b4 a03b044] b4.c10
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b4.c10.t
-Switched to branch 'b5'
-[b5 1636ce4] b5.c10
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b5.c10.t
-Switched to branch 'b6'
-[b6 5636f71] b6.c10
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b6.c10.t
-Switched to branch 'b7'
-[b7 a986247] b7.c10
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b7.c10.t
-Switched to branch 'b8'
-[b8 3c735f4] b8.c10
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b8.c10.t
-Switched to branch 'b1'
-[b1 d2b5e73] b1.c11
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b1.c11.t
-Switched to branch 'b2'
-[b2 f9d95c1] b2.c11
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b2.c11.t
-Switched to branch 'b3'
-[b3 62a89df] b3.c11
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b3.c11.t
-Switched to branch 'b4'
-[b4 ad26868] b4.c11
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b4.c11.t
-Switched to branch 'b5'
-[b5 5a4dfb9] b5.c11
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b5.c11.t
-Switched to branch 'b6'
-[b6 dc8930a] b6.c11
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b6.c11.t
-Switched to branch 'b7'
-[b7 3b76e60] b7.c11
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b7.c11.t
-Switched to branch 'b8'
-[b8 2ba6a3d] b8.c11
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b8.c11.t
-Switched to branch 'b1'
-[b1 b8e826f] b1.c12
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b1.c12.t
-Switched to branch 'b2'
-[b2 4234dfd] b2.c12
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b2.c12.t
-Switched to branch 'b3'
-[b3 342bc7b] b3.c12
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b3.c12.t
-Switched to branch 'b4'
-[b4 108c1a4] b4.c12
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b4.c12.t
-Switched to branch 'b5'
-[b5 9a28ede] b5.c12
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b5.c12.t
-Switched to branch 'b6'
-[b6 3f5ace9] b6.c12
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b6.c12.t
-Switched to branch 'b7'
-[b7 93c4bac] b7.c12
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b7.c12.t
-Switched to branch 'b8'
-[b8 baa7561] b8.c12
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b8.c12.t
-Switched to branch 'b1'
-[b1 95bc4bb] b1.c13
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b1.c13.t
-Switched to branch 'b2'
-[b2 8489a1d] b2.c13
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b2.c13.t
-Switched to branch 'b3'
-[b3 64d34a0] b3.c13
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b3.c13.t
-Switched to branch 'b4'
-[b4 bac01a4] b4.c13
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b4.c13.t
-Switched to branch 'b5'
-[b5 e86f129] b5.c13
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b5.c13.t
-Switched to branch 'b6'
-[b6 699548c] b6.c13
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b6.c13.t
-Switched to branch 'b7'
-[b7 103bf10] b7.c13
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b7.c13.t
-Switched to branch 'b8'
-[b8 c26a4fc] b8.c13
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b8.c13.t
-Switched to branch 'b1'
-[b1 b89f649] b1.c14
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b1.c14.t
-Switched to branch 'b2'
-[b2 fe51ff5] b2.c14
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b2.c14.t
-Switched to branch 'b3'
-[b3 fc1ea38] b3.c14
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b3.c14.t
-Switched to branch 'b4'
-[b4 2b6a82d] b4.c14
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b4.c14.t
-Switched to branch 'b5'
-[b5 bd4af3f] b5.c14
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b5.c14.t
-Switched to branch 'b6'
-[b6 15633e6] b6.c14
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b6.c14.t
-Switched to branch 'b7'
-[b7 b2e9b68] b7.c14
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b7.c14.t
-Switched to branch 'b8'
-[b8 a1d75da] b8.c14
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b8.c14.t
-Switched to branch 'b1'
-[b1 5e97e7c] b1.c15
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b1.c15.t
-Switched to branch 'b2'
-[b2 1c61ed4] b2.c15
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b2.c15.t
-Switched to branch 'b3'
-[b3 19afa9a] b3.c15
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b3.c15.t
-Switched to branch 'b4'
-[b4 9c413e1] b4.c15
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b4.c15.t
-Switched to branch 'b5'
-[b5 d014f6a] b5.c15
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b5.c15.t
-Switched to branch 'b6'
-[b6 f8c4313] b6.c15
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b6.c15.t
-Switched to branch 'b7'
-[b7 682d1c2] b7.c15
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b7.c15.t
-Switched to branch 'b8'
-[b8 d06805d] b8.c15
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b8.c15.t
-Switched to branch 'b1'
-[b1 6280c6c] b1.c16
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b1.c16.t
-Switched to branch 'b2'
-[b2 54730b4] b2.c16
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b2.c16.t
-Switched to branch 'b3'
-[b3 450e72c] b3.c16
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b3.c16.t
-Switched to branch 'b4'
-[b4 1d556dd] b4.c16
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b4.c16.t
-Switched to branch 'b5'
-[b5 30d8e5b] b5.c16
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b5.c16.t
-Switched to branch 'b6'
-[b6 7b79d49] b6.c16
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b6.c16.t
-Switched to branch 'b7'
-[b7 15da705] b7.c16
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b7.c16.t
-Switched to branch 'b8'
-[b8 83492f9] b8.c16
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b8.c16.t
-Switched to branch 'b1'
-[b1 17639a0] b1.c17
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b1.c17.t
-Switched to branch 'b2'
-[b2 0e8fe67] b2.c17
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b2.c17.t
-Switched to branch 'b3'
-[b3 a33f3b9] b3.c17
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b3.c17.t
-Switched to branch 'b4'
-[b4 bf65a8f] b4.c17
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b4.c17.t
-Switched to branch 'b5'
-[b5 d9ed2b1] b5.c17
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b5.c17.t
-Switched to branch 'b6'
-[b6 48b167c] b6.c17
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b6.c17.t
-Switched to branch 'b7'
-[b7 7f5656e] b7.c17
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b7.c17.t
-Switched to branch 'b8'
-[b8 e7bb01c] b8.c17
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b8.c17.t
-Switched to branch 'b1'
-[b1 ea1e457] b1.c18
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b1.c18.t
-Switched to branch 'b2'
-[b2 611613a] b2.c18
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b2.c18.t
-Switched to branch 'b3'
-[b3 7497b4a] b3.c18
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b3.c18.t
-Switched to branch 'b4'
-[b4 b5d9485] b4.c18
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b4.c18.t
-Switched to branch 'b5'
-[b5 d9fd7d4] b5.c18
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b5.c18.t
-Switched to branch 'b6'
-[b6 f5d257d] b6.c18
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b6.c18.t
-Switched to branch 'b7'
-[b7 ca45808] b7.c18
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b7.c18.t
-Switched to branch 'b8'
-[b8 76929ae] b8.c18
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b8.c18.t
-Switched to branch 'b1'
-[b1 e3496f0] b1.c19
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b1.c19.t
-Switched to branch 'b2'
-[b2 124ff4f] b2.c19
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b2.c19.t
-Switched to branch 'b3'
-[b3 155cfe5] b3.c19
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b3.c19.t
-Switched to branch 'b4'
-[b4 29f3488] b4.c19
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b4.c19.t
-Switched to branch 'b5'
-[b5 b722512] b5.c19
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b5.c19.t
-Switched to branch 'b6'
-[b6 eb0ead1] b6.c19
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b6.c19.t
-Switched to branch 'b7'
-[b7 334d40a] b7.c19
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b7.c19.t
-Switched to branch 'b8'
-[b8 f65fc9b] b8.c19
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b8.c19.t
-warning: no common commits
-From /build/git-2.20.1/t/trash directory.t5552-skipping-fetch-negotiator/client
- * [new branch]      b1         -> b1
-Switched to branch 'b1'
-[b1 4fc6b0b] commit-on-b1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 commit-on-b1.t
-From /build/git-2.20.1/t/trash directory.t5552-skipping-fetch-negotiator/server
- * tag               to_fetch   -> FETCH_HEAD
-packet:        fetch< 4fc6b0b77cfa2370eb0c417e5e26e40a980884fe HEAD\0multi_ack thin-pack side-band side-band-64k ofs-delta shallow deepen-since deepen-not deepen-relative no-progress include-tag multi_ack_detailed symref=HEAD:refs/heads/b1 agent=git/2.20.1
-packet:        fetch< 4fc6b0b77cfa2370eb0c417e5e26e40a980884fe refs/heads/b1
-packet:        fetch< 184bd23dc533e1e63153e7e181411bd29acca918 refs/heads/master
-packet:        fetch< 4fc6b0b77cfa2370eb0c417e5e26e40a980884fe refs/tags/commit-on-b1
-packet:        fetch< 184bd23dc533e1e63153e7e181411bd29acca918 refs/tags/to_fetch
-packet:        fetch< 0000
-packet:        fetch> want 184bd23dc533e1e63153e7e181411bd29acca918 multi_ack_detailed side-band-64k thin-pack no-progress ofs-delta deepen-since deepen-not agent=git/2.20.1
-packet:        fetch> 0000
-packet:        fetch> have f65fc9b4d5c1cb76494a7f8df0230d8d29a33e67
-packet:        fetch> have 334d40a157dec5d93023976c30cd22b24bdc279a
-packet:        fetch> have eb0ead13281c18fd207283425897500ff37b58a0
-packet:        fetch> have b722512541a1c484f0269dbb06e0ebe809126be7
-packet:        fetch> have 29f348829e91209e05b0f7277512e3815fd33d66
-packet:        fetch> have 155cfe5fba134b2a3f290da550e227776793d1c5
-packet:        fetch> have 124ff4f891c3955a682247533ec290603f9df504
-packet:        fetch> have e3496f08debed7528bd7e4c4a12b71d1a99d697f
-packet:        fetch> have e7bb01cb25bebd0341c9d62f4c7e929a99b6ed4b
-packet:        fetch> have 7f5656e94770d527d4f909fd5e2ea274ec63177a
-packet:        fetch> have 48b167c8c363708a36d20637466781d435df923e
-packet:        fetch> have d9ed2b16325a06a2cc5061533b4935c526e4e64d
-packet:        fetch> have bf65a8f944c8cdbf9d31b2f8656b07b1f3b7daf4
-packet:        fetch> have a33f3b91e50fa0ce528590623af68f075a7d7f13
-packet:        fetch> have 0e8fe67b3355336aecfc08fdd26397774c64247a
-packet:        fetch> have 17639a004fe8511fe1de57dd9ddabf2ee0de902d
-packet:        fetch> 0000
-packet:        fetch> have a1d75daa2f482f89171f092778da506803e54531
-packet:        fetch> have b2e9b68d2650b77283421888be8a950c18bab29d
-packet:        fetch> have 15633e66d344ed5bf98eebac690942c9cb93d182
-packet:        fetch> have bd4af3f8e2999e978ad2b792b1815f78f91a81d8
-packet:        fetch> have 2b6a82df34178b75c650082ccc76cab0bc2d2537
-packet:        fetch> have fc1ea38ba267d192a042f8c6efb76b4b37a3cd59
-packet:        fetch> have fe51ff519f033bfe0b49a646f58762e393bdbd1d
-packet:        fetch> have b89f6499d7cee40ef422edb15433a10f82de0206
-packet:        fetch> have e4190b433240834c895347214d29426a094f2fe2
-packet:        fetch> have 5f1aa7f016defcf74e5e1d4991342987c9d4b447
-packet:        fetch> have 91e920349cc8fc80c282e69da054c2bfa3346e03
-packet:        fetch> have 0ed227c5105634ad47b6e4351cb4933656eb6c83
-packet:        fetch> have 49c8cda191a8dc56e3e99fe3207882c2409ecab9
-packet:        fetch> have 83458c83eb7fd3f865319fc6c6436caa2268401c
-packet:        fetch> have 770eae6e9055970583428d6c1ac289cec76525a9
-packet:        fetch> have b76868e654ce45adb9e06f638e48a72556843361
-packet:        fetch> 0000
-packet:        fetch< ACK e3496f08debed7528bd7e4c4a12b71d1a99d697f common
-packet:        fetch< ACK 17639a004fe8511fe1de57dd9ddabf2ee0de902d common
-packet:        fetch< NAK
-packet:        fetch> have 768bfc586d66909db8c6f75f809ecf54f353d2cb
-packet:        fetch> have 2414896148937fcc3df5ca53e846ebd2481945b3
-packet:        fetch> have 6b911cfac437ae1c8a0db544afef1c4dba87d26d
-packet:        fetch> have dbb467e9a5ddb4b8148e8b7f214ceed3c4e0e71a
-packet:        fetch> have 44268733d7e0371a0129a3776faa39beee58d3fe
-packet:        fetch> have 6592e0bbee4f972ca359f25206af69a9962aac1c
-packet:        fetch> have 89ecd55a5a20b633c82b7fbf2491660b45b37f5f
-packet:        fetch> have 9f605c21b07f8dd321aa26907043464e8a8eb40d
-packet:        fetch> have 063e25688044f8baf7ce6ce7bfb87ced658844c8
-packet:        fetch> have ca6bc330e163fe097fd075d037ceacbdafee00f3
-packet:        fetch> have ece05e896e3c6aaa553cb541f15203bcadc24468
-packet:        fetch> have 8bffdf81ad07c0f1bb4beaab6f4db452cc745dd6
-packet:        fetch> have 8252af32268388cf5b0de476a87325cfff99c560
-packet:        fetch> have c402344c412528d24d8381cf5cc66e6c5df54169
-packet:        fetch> done
-packet:        fetch< ACK b89f6499d7cee40ef422edb15433a10f82de0206 common
-packet:        fetch< ACK b76868e654ce45adb9e06f638e48a72556843361 common
-packet:        fetch< NAK
-packet:        fetch< ACK b76868e654ce45adb9e06f638e48a72556843361
-packet:        fetch> have e3496f08debed7528bd7e4c4a12b71d1a99d697f
-packet:        fetch> have 17639a004fe8511fe1de57dd9ddabf2ee0de902d
-packet:        fetch> have b89f6499d7cee40ef422edb15433a10f82de0206
-packet:        fetch> have b76868e654ce45adb9e06f638e48a72556843361
-packet:        fetch< ACK e3496f08debed7528bd7e4c4a12b71d1a99d697f common
-packet:        fetch< ACK 17639a004fe8511fe1de57dd9ddabf2ee0de902d common
-packet:        fetch> have 89ecd55a5a20b633c82b7fbf2491660b45b37f5f
-packet:        fetch> have c402344c412528d24d8381cf5cc66e6c5df54169
-ok 6 - do not send "have" with ancestors of commits that server ACKed
+ok 5 - --skip
+
+expecting success: 
+    test $(git rev-list HEAD --skip=0 --max-count=0 | wc -l) = 0 &&
+    test $(git rev-list HEAD --skip=0 --max-count=10 | wc -l) = 5 &&
+    test $(git rev-list HEAD --skip=3 --max-count=0 | wc -l) = 0 &&
+    test $(git rev-list HEAD --skip=3 --max-count=1 | wc -l) = 1 &&
+    test $(git rev-list HEAD --skip=3 --max-count=2 | wc -l) = 2 &&
+    test $(git rev-list HEAD --skip=3 --max-count=10 | wc -l) = 2 &&
+    test $(git rev-list HEAD --skip=5 --max-count=10 | wc -l) = 0 &&
+    test $(git rev-list HEAD --skip=10 --max-count=10 | wc -l) = 0
+
+ok 6 - --skip --max-count
 
 # passed all 6 test(s)
 1..6
@@ -210042,7 +209171,7 @@
 )
 prerequisite PIPE ok
 Starting git daemon ...
-[3301869] Ready to rumble
+[2729539] Ready to rumble
 expecting success: 
 	git init "$daemon_parent" &&
 	test_commit -C "$daemon_parent" one
@@ -210068,17 +209197,17 @@
 	git ls-remote --symref "$GIT_DAEMON_URL/parent" >expect &&
 	test_cmp expect actual
 
-[3302239] Connection from 127.0.0.1:40382
-[3302239] Extended attribute "host": 127.0.0.1:5702
-[3302239] Extended attribute "protocol": version=2
-[3302239] Request upload-pack for '/parent'
-[3301869] [3302239] Disconnected
+[2729875] Connection from 127.0.0.1:54732
+[2729875] Extended attribute "host": 127.0.0.1:5702
+[2729875] Extended attribute "protocol": version=2
+[2729875] Request upload-pack for '/parent'
+[2729539] [2729875] Disconnected
 packet:          git> git-upload-pack /parent\0host=127.0.0.1:5702\0\0version=2\0
 packet:          git< version 2
-[3302333] Connection from 127.0.0.1:40384
-[3302333] Extended attribute "host": 127.0.0.1:5702
-[3302333] Request upload-pack for '/parent'
-[3301869] [3302333] Disconnected
+[2729946] Connection from 127.0.0.1:54734
+[2729946] Extended attribute "host": 127.0.0.1:5702
+[2729946] Request upload-pack for '/parent'
+[2729539] [2729946] Disconnected
 ok 2 - list refs with git:// using protocol v2
 
 expecting success: 
@@ -210093,11 +209222,11 @@
 
 	test_cmp expect actual
 
-[3302576] Connection from 127.0.0.1:40388
-[3302576] Extended attribute "host": 127.0.0.1:5702
-[3302576] Extended attribute "protocol": version=2
-[3302576] Request upload-pack for '/parent'
-[3301869] [3302576] Disconnected
+[2730112] Connection from 127.0.0.1:54736
+[2730112] Extended attribute "host": 127.0.0.1:5702
+[2730112] Extended attribute "protocol": version=2
+[2730112] Request upload-pack for '/parent'
+[2729539] [2730112] Disconnected
 ok 3 - ref advertisment is filtered with ls-remote using protocol v2
 
 expecting success: 
@@ -210116,11 +209245,11 @@
 	grep "clone< version 2" log
 
 Cloning into 'daemon_child'...
-[3302865] Connection from 127.0.0.1:40390
-[3302865] Extended attribute "host": 127.0.0.1:5702
-[3302865] Extended attribute "protocol": version=2
-[3302865] Request upload-pack for '/parent'
-[3301869] [3302865] Disconnected
+[2730318] Connection from 127.0.0.1:54740
+[2730318] Extended attribute "host": 127.0.0.1:5702
+[2730318] Extended attribute "protocol": version=2
+[2730318] Request upload-pack for '/parent'
+[2729539] [2730318] 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
@@ -210146,11 +209275,11 @@
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 two.t
-[3303366] Connection from 127.0.0.1:40392
-[3303366] Extended attribute "host": 127.0.0.1:5702
-[3303366] Extended attribute "protocol": version=2
-[3303366] Request upload-pack for '/parent'
-[3301869] [3303366] Disconnected
+[2730743] Connection from 127.0.0.1:54742
+[2730743] Extended attribute "host": 127.0.0.1:5702
+[2730743] Extended attribute "protocol": version=2
+[2730743] Request upload-pack for '/parent'
+[2729539] [2730743] Disconnected
 From git://127.0.0.1:5702/parent
    d79ce16..139b20d  master     -> origin/master
  * [new tag]         two        -> two
@@ -210174,11 +209303,11 @@
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 two_a.t
-[3303860] Connection from 127.0.0.1:40394
-[3303860] Extended attribute "host": 127.0.0.1:5702
-[3303860] Extended attribute "protocol": version=2
-[3303860] Request upload-pack for '/parent'
-[3301869] [3303860] Disconnected
+[2731306] Connection from 127.0.0.1:54746
+[2731306] Extended attribute "host": 127.0.0.1:5702
+[2731306] Extended attribute "protocol": version=2
+[2731306] Request upload-pack for '/parent'
+[2729539] [2731306] Disconnected
 From git://127.0.0.1:5702/parent
  * branch            7e9f7d092ed45f242659c87db76fd08923e99801 -> FETCH_HEAD
 packet:        fetch< version 2
@@ -210199,14 +209328,14 @@
 	# Server responded using protocol v2
 	grep "fetch< version 2" log
 
-[3304198] Connection from 127.0.0.1:40396
-[3304198] Extended attribute "host": 127.0.0.1:5702
-[3304198] Extended attribute "protocol": version=2
-[3304198] Request upload-pack for '/parent'
+[2731610] Connection from 127.0.0.1:54748
+[2731610] Extended attribute "host": 127.0.0.1:5702
+[2731610] Extended attribute "protocol": version=2
+[2731610] Request upload-pack for '/parent'
 From git://127.0.0.1:5702/parent
    139b20d..7e9f7d0  master     -> origin/master
  * [new tag]         two_a      -> two_a
-[3301869] [3304198] Disconnected
+[2729539] [2731610] Disconnected
 Updating d79ce16..7e9f7d0
 Fast-forward
  two.t   | 1 +
@@ -210245,12 +209374,12 @@
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 three.t
-[3304700] Connection from 127.0.0.1:40398
-[3304700] Extended attribute "host": 127.0.0.1:5702
-[3304700] Request receive-pack for '/parent'
-[3301869] [3304700] Disconnected
+[2732128] Connection from 127.0.0.1:54750
+[2732128] Extended attribute "host": 127.0.0.1:5702
+[2732128] Request receive-pack for '/parent'
 To git://127.0.0.1:5702/parent
  * [new branch]      HEAD -> client_branch
+[2729539] [2732128] Disconnected
 ok 8 - push with git:// and a config of v2 does not request v2
 
 Stopping git daemon ...
@@ -210906,209 +210035,6 @@
 1..29
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t6004-rev-list-path-optim.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6004-rev-list-path-optim/.git/
-expecting success: 
-	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
-
-[master (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: 
-	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: 
-	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 master &&
-	echo Another >b &&
-	echo Munged >d/z &&
-	git add b d/z &&
-	test_tick &&
-	git commit -m "Master touches b" &&
-	git tag master_b0 &&
-	git merge side &&
-	echo Touched >b &&
-	git add b &&
-	test_tick &&
-	git commit -m "Master 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 'master'
-[master 4417088] Master touches b
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+), 1 deletion(-)
- create mode 100644 b
-Merging:
-4417088 Master touches b
-virtual side
-found 1 common ancestor:
-5c8df84 Initial commit
-Merge made by the 'recursive' strategy.
- a   | 2 +-
- c   | 1 +
- d/f | 2 +-
- 3 files changed, 3 insertions(+), 2 deletions(-)
- create mode 100644 c
-[master 6a8c990] Master touches b again
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 3 - further setup
-
-expecting success: 
-	git rev-parse side_a1 initial >expected &&
-	git rev-list HEAD -- a >actual &&
-	test_cmp expected actual
-
-ok 4 - path optimization 2
-
-expecting success: 
-	git rev-parse master^ master_b0 side_c0 initial >expected &&
-	git rev-list HEAD -- d >actual &&
-	test_cmp expected actual
-
-ok 5 - pathspec with leading path
-
-expecting success: 
-	git rev-parse master^ master_b0 side_c0 initial >expected &&
-	git rev-list HEAD -- "d/*" >actual &&
-	test_cmp expected actual
-
-ok 6 - pathspec with glob (1)
-
-expecting success: 
-	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/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t6005-rev-list-count.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6005-rev-list-count/.git/
-expecting success: 
-    for n in 1 2 3 4 5 ; do \
-        echo $n > a ; \
-        git add a ; \
-        git commit -m "$n" ; \
-    done
-
-[master (root-commit) ade96f6] 1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 a
-[master 9c2b7ef] 2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[master 92eaea4] 3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[master aca1224] 4
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[master 26c0a98] 5
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 1 - setup
-
-expecting success: 
-    test $(git rev-list HEAD | wc -l) = 5
-
-ok 2 - no options
-
-expecting success: 
-    test $(git rev-list HEAD --max-count=0 | wc -l) = 0 &&
-    test $(git rev-list HEAD --max-count=3 | wc -l) = 3 &&
-    test $(git rev-list HEAD --max-count=5 | wc -l) = 5 &&
-    test $(git rev-list HEAD --max-count=10 | wc -l) = 5
-
-ok 3 - --max-count
-
-expecting success: 
-    test $(git rev-list HEAD --max-count=1 | wc -l) = 1 &&
-    test $(git rev-list HEAD -1 | wc -l) = 1 &&
-    test $(git rev-list HEAD -n1 | wc -l) = 1 &&
-    test $(git rev-list HEAD -n 1 | wc -l) = 1
-
-ok 4 - --max-count all forms
-
-expecting success: 
-    test $(git rev-list HEAD --skip=0 | wc -l) = 5 &&
-    test $(git rev-list HEAD --skip=3 | wc -l) = 2 &&
-    test $(git rev-list HEAD --skip=5 | wc -l) = 0 &&
-    test $(git rev-list HEAD --skip=10 | wc -l) = 0
-
-ok 5 - --skip
-
-expecting success: 
-    test $(git rev-list HEAD --skip=0 --max-count=0 | wc -l) = 0 &&
-    test $(git rev-list HEAD --skip=0 --max-count=10 | wc -l) = 5 &&
-    test $(git rev-list HEAD --skip=3 --max-count=0 | wc -l) = 0 &&
-    test $(git rev-list HEAD --skip=3 --max-count=1 | wc -l) = 1 &&
-    test $(git rev-list HEAD --skip=3 --max-count=2 | wc -l) = 2 &&
-    test $(git rev-list HEAD --skip=3 --max-count=10 | wc -l) = 2 &&
-    test $(git rev-list HEAD --skip=5 --max-count=10 | wc -l) = 0 &&
-    test $(git rev-list HEAD --skip=10 --max-count=10 | wc -l) = 0
-
-ok 6 - --skip --max-count
-
-# passed all 6 test(s)
-1..6
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
 *** t6008-rev-list-submodule.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6008-rev-list-submodule/.git/
 expecting success: 
@@ -211204,19 +210130,19 @@
    git repack -a -f -d
    
 Reinitialized existing Git repository in /build/git-2.20.1/t/trash directory.t6011-rev-list-with-bad-commit/.git/
-[master (root-commit) 685a734] first commit
+[master (root-commit) 277f351] first commit
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 foo
-[master 094892c] second commit
+[master 7e66ad5] second commit
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 bar
-[master 5edcfa4] third commit
+[master 7e828e4] third commit
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 baz
-[master 4d0219b] fourth commit
+[master f852c03] fourth commit
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 ok 1 - setup
@@ -211232,11 +210158,11 @@
    perl -i.bak -pe "s/second commit/socond commit/" .git/objects/pack/*.pack &&
    test_must_fail git fsck --full
    
-error: .git/objects/pack/pack-b313bf0132fb67593597e67c57c4289e92b071a9.pack pack checksum mismatch
-error: index CRC mismatch for object 094892cc4cbf62f1ffcc2c9264dfc1a5159fab73 from .git/objects/pack/pack-b313bf0132fb67593597e67c57c4289e92b071a9.pack at offset 487
+error: .git/objects/pack/pack-a113ea125c34993b9acf0181263d888446d5caec.pack pack checksum mismatch
+error: index CRC mismatch for object 7e66ad577d9a63c9ab37aa9cdc84225881cb23e0 from .git/objects/pack/pack-a113ea125c34993b9acf0181263d888446d5caec.pack at offset 487
 error: inflate: data stream error (incorrect data check)
-error: cannot unpack 094892cc4cbf62f1ffcc2c9264dfc1a5159fab73 from .git/objects/pack/pack-b313bf0132fb67593597e67c57c4289e92b071a9.pack at offset 487
-dangling commit 685a73416db14e5f94ab648ac30c83baa2f168cb
+error: cannot unpack 7e66ad577d9a63c9ab37aa9cdc84225881cb23e0 from .git/objects/pack/pack-a113ea125c34993b9acf0181263d888446d5caec.pack at offset 487
+dangling commit 277f351f0ba77b79c11dcb27bcc85155be9056f7
 dangling tree 89ff1a2aefcbff0f09197f0fd8beeb19a7b6e51c
 ok 3 - corrupt second commit object
 
@@ -211244,22 +210170,22 @@
 	test_must_fail env GIT_TEST_COMMIT_GRAPH=0 git rev-list --all > /dev/null
 
 error: inflate: data stream error (incorrect data check)
-fatal: packed object 094892cc4cbf62f1ffcc2c9264dfc1a5159fab73 (stored in .git/objects/pack/pack-b313bf0132fb67593597e67c57c4289e92b071a9.pack) is corrupt
+fatal: packed object 7e66ad577d9a63c9ab37aa9cdc84225881cb23e0 (stored in .git/objects/pack/pack-a113ea125c34993b9acf0181263d888446d5caec.pack) is corrupt
 ok 4 - rev-list should fail
 
 expecting success: 
    test_must_fail git repack -a -f -d
    
 error: inflate: data stream error (incorrect data check)
-fatal: packed object 094892cc4cbf62f1ffcc2c9264dfc1a5159fab73 (stored in .git/objects/pack/pack-b313bf0132fb67593597e67c57c4289e92b071a9.pack) is corrupt
+fatal: packed object 7e66ad577d9a63c9ab37aa9cdc84225881cb23e0 (stored in .git/objects/pack/pack-a113ea125c34993b9acf0181263d888446d5caec.pack) is corrupt
 ok 5 - git repack _MUST_ fail
 
 expecting success: 
    git log $first_commit
    
-commit 685a73416db14e5f94ab648ac30c83baa2f168cb
+commit 277f351f0ba77b79c11dcb27bcc85155be9056f7
 Author: A U Thor <author@example.com>
-Date:   Fri Dec 3 05:08:58 2021 +0000
+Date:   Thu Jan 5 11:49:29 2023 +0000
 
     first commit
 ok 6 - first commit is still available
@@ -211268,6 +210194,314 @@
 1..6
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
+*** t6013-rev-list-reverse-parents.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6013-rev-list-reverse-parents/.git/
+expecting success: 
+	commit one &&
+	git tag root &&
+	commit two &&
+	git checkout -b side HEAD^ &&
+	commit three &&
+	git checkout master &&
+	git merge -s ours side &&
+	commit five
+	
+[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(-)
+Switched to a new branch 'side'
+[side 0fcb03e] three
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to branch 'master'
+Merge made by the 'ours' strategy.
+[master 2ed4a76] five
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 1 - set up --reverse example
+
+expecting success: 
+	git rev-list --parents --full-history master -- foo |
+		perl -e "print reverse <>" > expected &&
+	git rev-list --reverse --parents --full-history master -- foo \
+		> actual &&
+	test_cmp expected actual
+	
+ok 2 - --reverse --parents --full-history combines correctly
+
+expecting success: 
+	git rev-list --boundary --parents --full-history master ^root -- foo |
+		perl -e "print reverse <>" > expected &&
+	git rev-list --boundary --reverse --parents --full-history \
+		master ^root -- foo > actual &&
+	test_cmp expected actual
+	
+ok 3 - --boundary does too
+
+# passed all 3 test(s)
+1..3
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t6007-rev-list-cherry-pick-file.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6007-rev-list-cherry-pick-file/.git/
+expecting success: 
+	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 master &&
+	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
+
+[master (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 'master'
+[master 9e00a87] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[master 9c68531] D
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 bar
+[master 555ccf5] F
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 1 - setup
+
+expecting success: 
+	git rev-list --left-right B...C > actual &&
+	git name-rev --stdin --name-only --refs="*tags/*" \
+		< actual > actual.named &&
+	test_cmp expect actual.named
+
+ok 2 - --left-right
+
+expecting success: 
+	git rev-list --count B...C > actual &&
+	test "$(cat actual)" = 2
+
+ok 3 - --count
+
+expecting success: 
+	test -z "$(git rev-list --left-right --cherry-pick B...C -- foo)"
+
+ok 4 - --cherry-pick foo comes up empty
+
+expecting success: 
+	git rev-list --left-right --cherry-pick B...C -- bar > actual &&
+	git name-rev --stdin --name-only --refs="*tags/*" \
+		< actual > actual.named &&
+	test_cmp expect actual.named
+
+ok 5 - --cherry-pick bar does not come up empty
+
+expecting success: 
+	git rev-list --left-right B...C -- bar > actual &&
+	git name-rev --stdin --name-only --refs="*tags/*" \
+		< actual > actual.named &&
+	test_cmp expect actual.named
+
+ok 6 - bar does not come up empty
+
+expecting success: 
+	git rev-list --left-right --cherry-pick F...E -- bar > actual &&
+	git name-rev --stdin --name-only --refs="*tags/*" \
+		< actual > actual.named &&
+	test_cmp expect actual.named
+
+ok 7 - --cherry-pick bar does not come up empty (II)
+
+expecting success: 
+	git rev-list --left-right --cherry-pick F...E -- bar >actual &&
+	git name-rev --stdin --name-only --refs="*tags/F" --refs="*tags/E" \
+		<actual >actual.named &&
+	test_cmp expect actual.named
+
+ok 8 - name-rev multiple --refs combine inclusive
+
+expecting success: 
+	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 --stdin --name-only --refs="*tags/F" \
+		<actual >actual.named &&
+	test_cmp expect actual.named
+
+ok 9 - name-rev --refs excludes non-matched patterns
+
+expecting success: 
+	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 --stdin --name-only --refs="*tags/*" --exclude="*E" \
+		<actual >actual.named &&
+	test_cmp expect actual.named
+
+ok 10 - name-rev --exclude excludes matched patterns
+
+expecting success: 
+	git rev-list --left-right --cherry-pick F...E -- bar >expect &&
+	git name-rev --stdin --name-only --refs="*tags/F" --refs="*tags/E" --no-refs --refs="*tags/G" \
+		<expect >actual &&
+	test_cmp expect actual
+
+ok 11 - name-rev --no-refs clears the refs list
+
+expecting success: 
+	git rev-list --cherry-mark F...E -- bar > actual &&
+	git name-rev --stdin --name-only --refs="*tags/*" \
+		< actual > actual.named &&
+	test_cmp expect actual.named
+
+ok 12 - --cherry-mark
+
+expecting success: 
+	git rev-list --cherry-mark --left-right F...E -- bar > actual &&
+	git name-rev --stdin --name-only --refs="*tags/*" \
+		< actual > actual.named &&
+	test_cmp expect actual.named
+
+ok 13 - --cherry-mark --left-right
+
+expecting success: 
+	git rev-list --cherry-pick --right-only F...E -- bar > actual &&
+	git name-rev --stdin --name-only --refs="*tags/*" \
+		< actual > actual.named &&
+	test_cmp expect actual.named
+
+ok 14 - --cherry-pick --right-only
+
+expecting success: 
+	git rev-list --cherry-pick --left-only E...F -- bar > actual &&
+	git name-rev --stdin --name-only --refs="*tags/*" \
+		< actual > actual.named &&
+	test_cmp expect actual.named
+
+ok 15 - --cherry-pick --left-only
+
+expecting success: 
+	git rev-list --cherry F...E -- bar > actual &&
+	git name-rev --stdin --name-only --refs="*tags/*" \
+		< actual > actual.named &&
+	test_cmp expect actual.named
+
+ok 16 - --cherry
+
+expecting success: 
+	git rev-list --cherry --count F...E -- bar > actual &&
+	test_cmp expect actual
+
+ok 17 - --cherry --count
+
+expecting success: 
+	git rev-list --cherry-mark --count F...E -- bar > actual &&
+	test_cmp expect actual
+
+ok 18 - --cherry-mark --count
+
+expecting success: 
+	git rev-list --cherry-mark --left-right --count F...E -- bar > actual &&
+	test_cmp expect actual
+
+ok 19 - --cherry-mark --left-right --count
+
+expecting success: 
+	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...master -- foo)"
+
+[independent (root-commit) 5da548c] independent
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo
+[independent de095d9] independent, too
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 20 - --cherry-pick with independent, but identical branches
+
+expecting success: 
+	git rev-list --count --left-right C...D > actual &&
+	test_cmp expect actual
+
+ok 21 - --count --left-right
+
+expecting success: 
+	git checkout -b shy-diff &&
+	test_commit dont-look-at-me &&
+	echo Hello >dont-look-at-me.t &&
+	test_tick &&
+	git commit -m tip dont-look-at-me.t &&
+	git checkout -b mainline HEAD^ &&
+	test_commit to-cherry-pick &&
+	remove_loose_object shy-diff^:dont-look-at-me.t &&
+	git rev-list --cherry-pick ...shy-diff
+
+Switched to a new branch 'shy-diff'
+[shy-diff 38fbe57] 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 f065567] tip
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'mainline'
+[mainline 7b441fd] to-cherry-pick
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 to-cherry-pick.t
+7b441fdb48b15549aa518c0e9aef495001ae11cd
+f065567c34afb81b41cc75716781105f7fc57824
+ok 22 - --cherry-pick avoids looking at full diffs
+
+# passed all 22 test(s)
+1..22
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
 *** t5601-clone.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5601-clone/.git/
 expecting success: 
@@ -211286,11 +210520,11 @@
 
 
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5601-clone/src/.git/
-[master (root-commit) 87c071a] initial
+[master (root-commit) 01c69ae] initial
  Author: A U Thor <author@example.com>
  1 file changed, 0 insertions(+), 0 deletions(-)
  create mode 100644 file
-[master 673142e] updated
+[master 792e9f0] updated
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 ok 1 - setup
@@ -211524,10 +210758,10 @@
 
   git checkout -b <new-branch-name>
 
-HEAD is now at 87c071a initial
+HEAD is now at 01c69ae initial
 Cloning into bare repository 'mirror.detached'...
 done.
-Previous HEAD position was 87c071a initial
+Previous HEAD position was 01c69ae initial
 Switched to branch 'master'
 ok 12 - clone --mirror with detached HEAD
 
@@ -211551,10 +210785,10 @@
 
   git checkout -b <new-branch-name>
 
-HEAD is now at 87c071a initial
+HEAD is now at 01c69ae initial
 Cloning into bare repository 'bare.detached'...
 done.
-Previous HEAD position was 87c071a initial
+Previous HEAD position was 01c69ae initial
 Switched to branch 'master'
 ok 13 - clone --bare with detached HEAD
 
@@ -211581,7 +210815,7 @@
 
 Cloning into bare repository 'mirror2'...
 done.
-673142e6d111e54069f95b9ba79065fedee62a41 refs/tags/some-tag
+792e9f0a99aaf7959c63077214f973fdffb3f9d6 refs/tags/some-tag
 ok 15 - clone --mirror does not repeat tags
 
 expecting success: 
@@ -211816,7 +211050,7 @@
 
 Cloning into 'dst.tag'...
 done.
-Note: checking out '673142e6d111e54069f95b9ba79065fedee62a41'.
+Note: checking out '792e9f0a99aaf7959c63077214f973fdffb3f9d6'.
 
 You are in 'detached HEAD' state. You can look around, make experimental
 changes and commit them, and you can discard any commits you make in this
@@ -212462,7 +211696,7 @@
 Cloning into bare repository 'dst.git'...
 Initialized empty Git repository in /build/git-2.20.1/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	21a7caa9251da700f013982af8d95142e3a8ceba
+pack	d3bbe50e6626835335238b620b277aaed5506b09
 ok 97 - GIT_TRACE_PACKFILE produces a usable pack
 
 expecting success: 
@@ -212651,1636 +211885,38 @@
 1..103
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t5520-pull.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5520-pull/.git/
+*** t6014-rev-list-all.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6014-rev-list-all/.git/
 expecting success: 
-	echo file >file &&
-	git add file &&
-	git commit -a -m original
 
-[master (root-commit) f09d68d] original
+	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
-ok 1 - setup
-
-expecting success: 
-	git init cloned &&
-	(
-		cd cloned &&
-		git pull ..
-	) &&
-	test -f file &&
-	test -f cloned/file &&
-	test_cmp file cloned/file
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5520-pull/cloned/.git/
-From ..
- * branch            HEAD       -> FETCH_HEAD
-ok 2 - pulling into void
-
-expecting success: 
-	git init cloned-uho &&
-	(
-		cd cloned-uho &&
-		git pull .. master:master
-	) &&
-	test -f file &&
-	test -f cloned-uho/file &&
-	test_cmp file cloned-uho/file
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5520-pull/cloned-uho/.git/
-From ..
- * [new branch]      master     -> master
-ok 3 - pulling into void using master:master
-
-expecting success: 
-	git init cloned-untracked &&
-	(
-		cd cloned-untracked &&
-		echo untracked >file &&
-		test_must_fail git pull .. master &&
-		echo untracked >expect &&
-		test_cmp expect file
-	)
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5520-pull/cloned-untracked/.git/
-From ..
- * branch            master     -> FETCH_HEAD
-error: The following untracked working tree files would be overwritten by merge:
-	file
-Please move or remove them before you merge.
-Aborting
-ok 4 - pulling into void does not overwrite untracked files
-
-expecting success: 
-	git init cloned-staged-colliding &&
-	(
-		cd cloned-staged-colliding &&
-		echo "alternate content" >file &&
-		git add file &&
-		test_must_fail git pull .. master &&
-		echo "alternate content" >expect &&
-		test_cmp expect file &&
-		git cat-file blob :file >file.index &&
-		test_cmp expect file.index
-	)
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5520-pull/cloned-staged-colliding/.git/
-From ..
- * branch            master     -> FETCH_HEAD
-error: Your local changes to the following files would be overwritten by merge:
-	file
-Please commit your changes or stash them before you merge.
-Aborting
-ok 5 - pulling into void does not overwrite staged files
-
-expecting success: 
-	git init cloned-staged-new &&
-	(
-		cd cloned-staged-new &&
-		echo "new tracked file" >newfile &&
-		git add newfile &&
-		git pull .. master &&
-		echo "new tracked file" >expect &&
-		test_cmp expect newfile &&
-		git cat-file blob :newfile >newfile.index &&
-		test_cmp expect newfile.index
-	)
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5520-pull/cloned-staged-new/.git/
-From ..
- * branch            master     -> FETCH_HEAD
-ok 6 - pulling into void does not remove new staged files
-
-expecting success: 
-	git init cloned-octopus &&
-	(
-		cd cloned-octopus &&
-		test_must_fail git pull .. master master &&
-		! test -f file
-	)
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5520-pull/cloned-octopus/.git/
-From ..
- * branch            master     -> FETCH_HEAD
- * branch            master     -> FETCH_HEAD
-fatal: Cannot merge multiple branches into empty head.
-ok 7 - pulling into void must not create an octopus
-
-expecting success: 
-	git branch copy master &&
-	git config branch.copy.remote . &&
-	git config branch.copy.merge refs/heads/master &&
-	echo updated >file &&
-	git commit -a -m updated &&
-	git checkout copy &&
-	test "$(cat file)" = file &&
-	git pull &&
-	test "$(cat file)" = updated &&
-	git reflog -1 >reflog.actual &&
-	sed "s/^[0-9a-f][0-9a-f]*/OBJID/" reflog.actual >reflog.fuzzy &&
-	echo "OBJID HEAD@{0}: pull: Fast-forward" >reflog.expected &&
-	test_cmp reflog.expected reflog.fuzzy
-
-[master 7b15a4f] updated
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to branch 'copy'
-Your branch is behind 'master' by 1 commit, and can be fast-forwarded.
-  (use "git pull" to update your local branch)
-From .
- * branch            master     -> FETCH_HEAD
-Updating f09d68d..7b15a4f
-Fast-forward
- file | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 8 - test . as a remote
-
-expecting success: 
-	git checkout -b second master^ &&
-	echo modified >file &&
-	git commit -a -m modified &&
-	git checkout copy &&
-	git reset --hard HEAD^ &&
-	test "$(cat file)" = file &&
-	git pull . second &&
-	test "$(cat file)" = modified &&
-	git reflog -1 >reflog.actual &&
-	sed "s/^[0-9a-f][0-9a-f]*/OBJID/" reflog.actual >reflog.fuzzy &&
-	echo "OBJID HEAD@{0}: pull . second: Fast-forward" >reflog.expected &&
-	test_cmp reflog.expected reflog.fuzzy
-
-Switched to a new branch 'second'
-[second 054c464] modified
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to branch 'copy'
-Your branch is up to date with 'master'.
-HEAD is now at f09d68d original
-From .
- * branch            second     -> FETCH_HEAD
-Updating f09d68d..054c464
-Fast-forward
- file | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 9 - the default remote . should not break explicit pull
-
-expecting success: 
-	git checkout -b test copy^ &&
-	test_when_finished "git checkout -f copy && git branch -D test" &&
-	test "$(cat file)" = file &&
-	test_must_fail git pull . "refs/nonexisting1/*:refs/nonexisting2/*" 2>err &&
-	test_i18ngrep "no candidates for merging" err &&
-	test "$(cat file)" = file
-
-Switched to a new branch 'test'
-There are no candidates for merging among the refs that you just fetched.
-Switched to branch 'copy'
-Your branch and 'master' have diverged,
-and have 1 and 1 different commits each, respectively.
-  (use "git pull" to merge the remote branch into yours)
-Deleted branch test (was f09d68d).
-ok 10 - fail if wildcard spec does not match any refs
-
-expecting success: 
-	git remote add test_remote . &&
-	test_when_finished "git remote remove test_remote" &&
-	git checkout -b test copy^ &&
-	test_when_finished "git checkout -f copy && git branch -D test" &&
-	test "$(cat file)" = file &&
-	test_config branch.test.remote origin &&
-	test_must_fail git pull test_remote 2>err &&
-	test_i18ngrep "specify a branch on the command line" err &&
-	test "$(cat file)" = file
-
-Switched to a new branch 'test'
-for your current branch, you must specify a branch on the command line.
-Switched to branch 'copy'
-Your branch and 'master' have diverged,
-and have 1 and 1 different commits each, respectively.
-  (use "git pull" to merge the remote branch into yours)
-Deleted branch test (was f09d68d).
-ok 11 - fail if no branches specified with non-default remote
-
-expecting success: 
-	git remote add origin . &&
-	test_when_finished "git remote remove origin" &&
-	git checkout HEAD^ &&
-	test_when_finished "git checkout -f copy" &&
-	test "$(cat file)" = file &&
-	test_must_fail git pull 2>err &&
-	test_i18ngrep "not currently on a branch" err &&
-	test "$(cat file)" = file
-
-Note: checking out '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 performing another checkout.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
-
-  git checkout -b <new-branch-name>
-
-HEAD is now at f09d68d original
-You are not currently on a branch.
-Previous HEAD position was f09d68d original
-Switched to branch 'copy'
-Your branch and 'master' have diverged,
-and have 1 and 1 different commits each, respectively.
-  (use "git pull" to merge the remote branch into yours)
-ok 12 - fail if not on a branch
-
-expecting success: 
-	git remote add test_remote . &&
-	test_when_finished "git remote remove test_remote" &&
-	git checkout -b test copy^ &&
-	test_when_finished "git checkout -f copy && git branch -D test" &&
-	test_config branch.test.remote test_remote &&
-	test "$(cat file)" = file &&
-	test_must_fail git pull 2>err &&
-	test_i18ngrep "no tracking information" err &&
-	test "$(cat file)" = file
-
-Switched to a new branch 'test'
-There is no tracking information for the current branch.
-Switched to branch 'copy'
-Your branch and 'master' have diverged,
-and have 1 and 1 different commits each, respectively.
-  (use "git pull" to merge the remote branch into yours)
-Deleted branch test (was f09d68d).
-ok 13 - fail if no configuration for current branch
-
-expecting success: 
-	git remote add test_remote . &&
-	test_when_finished "git remote remove test_remote" &&
-	git checkout -b test copy^ &&
-	test_when_finished "git checkout -f copy && git branch -D test" &&
-	test_config branch.test.remote test_remote &&
-	test "$(cat file)" = file &&
-	test_must_fail git pull --all 2>err &&
-	test_i18ngrep "There is no tracking information" err &&
-	test "$(cat file)" = file
-
-Switched to a new branch 'test'
-Fetching test_remote
-There is no tracking information for the current branch.
-Switched to branch 'copy'
-Your branch and 'master' have diverged,
-and have 1 and 1 different commits each, respectively.
-  (use "git pull" to merge the remote branch into yours)
-Deleted branch test (was f09d68d).
-ok 14 - pull --all: fail if no configuration for current branch
-
-expecting success: 
-	git checkout -b test copy^ &&
-	test_when_finished "git checkout -f copy && git branch -D test" &&
-	test_config branch.test.remote . &&
-	test_config branch.test.merge refs/heads/nonexisting &&
-	test "$(cat file)" = file &&
-	test_must_fail git pull 2>err &&
-	test_i18ngrep "no such ref was fetched" err &&
-	test "$(cat file)" = file
-
-Switched to a new branch 'test'
-from the remote, but no such ref was fetched.
-Switched to branch 'copy'
-Your branch and 'master' have diverged,
-and have 1 and 1 different commits each, respectively.
-  (use "git pull" to merge the remote branch into yours)
-Deleted branch test (was f09d68d).
-ok 15 - fail if upstream branch does not exist
-
-expecting success: 
-	git checkout -b third second^ &&
-	test_when_finished "git checkout -f copy && git branch -D third" &&
-	test "$(cat file)" = file &&
-	test_commit modified2 file &&
-	test -z "$(git ls-files -u)" &&
-	test_must_fail git pull . second &&
-	test -n "$(git ls-files -u)" &&
-	cp file expected &&
-	test_must_fail git pull . second 2>err &&
-	test_i18ngrep "Pulling is not possible because you have unmerged files." err &&
-	test_cmp expected file &&
-	git add file &&
-	test -z "$(git ls-files -u)" &&
-	test_must_fail git pull . second 2>err &&
-	test_i18ngrep "You have not concluded your merge" err &&
-	test_cmp expected file
-
-Switched to a new branch 'third'
-[third 7e118a8] modified2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-From .
- * branch            second     -> FETCH_HEAD
-Merging:
-7e118a8 modified2
-virtual 054c46430629a49dd3eefbf8af9e41d1898ffc41
-found 1 common ancestor:
-f09d68d original
-Auto-merging file
-CONFLICT (content): Merge conflict in file
-Automatic merge failed; fix conflicts and then commit the result.
-error: Pulling is not possible because you have unmerged files.
-error: You have not concluded your merge (MERGE_HEAD exists).
-Switched to branch 'copy'
-Your branch and 'master' have diverged,
-and have 1 and 1 different commits each, respectively.
-  (use "git pull" to merge the remote branch into yours)
-Deleted branch third (was 7e118a8).
-ok 16 - fail if the index has unresolved entries
-
-expecting success: 
-	git checkout -b third second^ &&
-	test_when_finished "git checkout -f copy && git branch -D third" &&
-	test "$(cat file)" = file &&
-	git pull . second:third 2>err &&
-	test_i18ngrep "fetch updated the current branch head" err &&
-	test "$(cat file)" = modified &&
-	test "$(git rev-parse third)" = "$(git rev-parse second)"
-
-Switched to a new branch 'third'
-Already up to date.
-warning: fetch updated the current branch head.
-Switched to branch 'copy'
-Your branch and 'master' have diverged,
-and have 1 and 1 different commits each, respectively.
-  (use "git pull" to merge the remote branch into yours)
-Deleted branch third (was 054c464).
-ok 17 - fast-forwards working tree if branch head is updated
-
-expecting success: 
-	git checkout -b third second^ &&
-	test_when_finished "git checkout -f copy && git branch -D third" &&
-	test "$(cat file)" = file &&
-	echo conflict >file &&
-	test_must_fail git pull . second:third 2>err &&
-	test_i18ngrep "Cannot fast-forward your working tree" err &&
-	test "$(cat file)" = conflict &&
-	test "$(git rev-parse third)" = "$(git rev-parse second)"
-
-Switched to a new branch 'third'
-fatal: Cannot fast-forward your working tree.
-Switched to branch 'copy'
-Your branch and 'master' have diverged,
-and have 1 and 1 different commits each, respectively.
-  (use "git pull" to merge the remote branch into yours)
-Deleted branch third (was 054c464).
-ok 18 - fast-forward fails with conflicting work tree
-
-expecting success: 
-	git branch to-rebase &&
-	echo modified again > file &&
-	git commit -m file file &&
-	git checkout to-rebase &&
-	echo new > file2 &&
-	git add file2 &&
-	git commit -m "new file" &&
-	git tag before-rebase &&
-	git pull --rebase . copy &&
-	test "$(git rev-parse HEAD^)" = "$(git rev-parse copy)" &&
-	test new = "$(git show HEAD:file2)"
-
-[copy f38c19f] file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to branch 'to-rebase'
-[to-rebase 9742838] new file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file2
-From .
- * branch            copy       -> FETCH_HEAD
-First, rewinding head to replay your work on top of it...
-Applying: new file
-ok 19 - --rebase
-
-expecting success: 
-	git reset --hard before-rebase &&
-	git checkout -b ff &&
-	echo another modification >file &&
-	git commit -m third file &&
-
-	git checkout to-rebase &&
-	git pull --rebase . ff &&
-	test "$(git rev-parse HEAD)" = "$(git rev-parse ff)" &&
-
-	# The above only validates the result.  Did we actually bypass rebase?
-	git reflog -1 >reflog.actual &&
-	sed "s/^[0-9a-f][0-9a-f]*/OBJID/" reflog.actual >reflog.fuzzy &&
-	echo "OBJID HEAD@{0}: pull --rebase . ff: Fast-forward" >reflog.expected &&
-	test_cmp reflog.expected reflog.fuzzy
-
-HEAD is now at 9742838 new file
-Switched to a new branch 'ff'
-[ff 17083b0] third
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to branch 'to-rebase'
-From .
- * branch            ff         -> FETCH_HEAD
-Updating 9742838..17083b0
-Fast-forward
- file | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Current branch to-rebase is up to date.
-ok 20 - --rebase fast forward
-
-expecting success: 
-	test_when_finished "
-		git reset --hard
-		git checkout to-rebase
-		git branch -D to-rebase-ff
-		git branch -D behind" &&
-	git branch behind &&
-	git checkout -b to-rebase-ff &&
-	echo another modification >>file &&
-	git add file &&
-	git commit -m mod &&
-
-	git checkout behind &&
-	echo dirty >file &&
-	git pull --rebase --autostash . to-rebase-ff &&
-	test "$(git rev-parse HEAD)" = "$(git rev-parse to-rebase-ff)"
-
-Switched to a new branch 'to-rebase-ff'
-[to-rebase-ff 9ad3931] mod
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Switched to branch 'behind'
-From .
- * branch            to-rebase-ff -> FETCH_HEAD
-Created autostash: 97538ff
-HEAD is now at 17083b0 third
-First, rewinding head to replay your work on top of it...
-Fast-forwarded behind to 9ad39313f715a7b2ac3740e46f1dc923f190e017.
-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.
-HEAD is now at 9ad3931 mod
-Switched to branch 'to-rebase'
-Deleted branch to-rebase-ff (was 9ad3931).
-Deleted branch behind (was 9ad3931).
-ok 21 - --rebase --autostash fast forward
-
-expecting success: 
-	test_when_finished "git rebase --abort; git checkout -f to-rebase" &&
-	git checkout -b seq &&
-	test_seq 5 >seq.txt &&
-	git add seq.txt &&
-	test_tick &&
-	git commit -m "Add seq.txt" &&
-	echo 6 >>seq.txt &&
-	test_tick &&
-	git commit -m "Append to seq.txt" seq.txt &&
-	git checkout -b with-conflicts HEAD^ &&
-	echo conflicting >>seq.txt &&
-	test_tick &&
-	git commit -m "Create conflict" seq.txt &&
-	test_must_fail git pull --rebase . seq 2>err >out &&
-	test_i18ngrep "Resolve all conflicts manually" out
-
-Switched to a new branch 'seq'
-[seq d79963b] Add seq.txt
- Author: A U Thor <author@example.com>
- 1 file changed, 5 insertions(+)
- create mode 100644 seq.txt
-[seq 2fce746] Append to seq.txt
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Switched to a new branch 'with-conflicts'
-[with-conflicts a06bd6c] Create conflict
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Resolve all conflicts manually, mark them as resolved with
-Switched to branch 'to-rebase'
-ok 22 - --rebase with conflicts shows advice
-
-expecting success: 
-	test_when_finished "git rebase --abort; git checkout -f to-rebase" &&
-	git checkout -b diverging &&
-	test_commit attributes .gitattributes "* text=auto" attrs &&
-	sha1="$(printf "1\\r\\n" | git hash-object -w --stdin)" &&
-	git update-index --cacheinfo 0644 $sha1 file &&
-	git commit -m v1-with-cr &&
-	# force checkout because `git reset --hard` will not leave clean `file`
-	git checkout -f -b fails-to-rebase HEAD^ &&
-	test_commit v2-without-cr file "2" file2-lf &&
-	test_must_fail git pull --rebase . diverging 2>err >out &&
-	test_i18ngrep "Resolve all conflicts manually" out
-
-Switched to a new branch 'diverging'
-[diverging 6c67d51] attributes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 .gitattributes
-[diverging c8b1ad0] v1-with-cr
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'fails-to-rebase'
-[fails-to-rebase 64d05bb] v2-without-cr
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Resolve all conflicts manually, mark them as resolved with
-Switched to branch 'to-rebase'
-ok 23 - failed --rebase shows advice
-
-expecting success: 
-	git reset --hard before-rebase &&
-	test_must_fail git pull --rebase . copy master 2>err &&
-	test "$(git rev-parse HEAD)" = "$(git rev-parse before-rebase)" &&
-	test_i18ngrep "Cannot rebase onto multiple branches" err &&
-	test modified = "$(git show HEAD:file)"
-
-HEAD is now at 9742838 new file
-fatal: Cannot rebase onto multiple branches.
-ok 24 - --rebase fails with multiple branches
-
-expecting success: 
-	test_config rebase.autostash true &&
-	test_pull_autostash --rebase
-
-HEAD is now at 9742838 new file
-From .
- * branch            copy       -> FETCH_HEAD
-Created autostash: 99aa80f
-HEAD is now at 9742838 new file
-First, rewinding head to replay your work on top of it...
-Applying: new file
-Applied autostash.
-ok 25 - pull --rebase succeeds with dirty working directory and rebase.autostash set
-
-expecting success: 
-	test_config rebase.autostash true &&
-	test_pull_autostash --rebase --autostash
-
-HEAD is now at 9742838 new file
-From .
- * branch            copy       -> FETCH_HEAD
-Created autostash: 99aa80f
-HEAD is now at 9742838 new file
-First, rewinding head to replay your work on top of it...
-Applying: new file
-Applied autostash.
-ok 26 - pull --rebase --autostash & rebase.autostash=true
-
-expecting success: 
-	test_config rebase.autostash false &&
-	test_pull_autostash --rebase --autostash
-
-HEAD is now at 9742838 new file
-From .
- * branch            copy       -> FETCH_HEAD
-Created autostash: 99aa80f
-HEAD is now at 9742838 new file
-First, rewinding head to replay your work on top of it...
-Applying: new file
-Applied autostash.
-ok 27 - pull --rebase --autostash & rebase.autostash=false
-
-expecting success: 
-	test_unconfig rebase.autostash &&
-	test_pull_autostash --rebase --autostash
-
-HEAD is now at 9742838 new file
-From .
- * branch            copy       -> FETCH_HEAD
-Created autostash: 99aa80f
-HEAD is now at 9742838 new file
-First, rewinding head to replay your work on top of it...
-Applying: new file
-Applied autostash.
-ok 28 - pull --rebase --autostash & rebase.autostash unset
-
-expecting success: 
-	test_config rebase.autostash true &&
-	test_pull_autostash_fail --rebase --no-autostash
-
-HEAD is now at 9742838 new file
-error: cannot pull with rebase: Your index contains uncommitted changes.
-ok 29 - pull --rebase --no-autostash & rebase.autostash=true
-
-expecting success: 
-	test_config rebase.autostash false &&
-	test_pull_autostash_fail --rebase --no-autostash
-
-HEAD is now at 9742838 new file
-error: cannot pull with rebase: Your index contains uncommitted changes.
-ok 30 - pull --rebase --no-autostash & rebase.autostash=false
-
-expecting success: 
-	test_unconfig rebase.autostash &&
-	test_pull_autostash_fail --rebase --no-autostash
-
-HEAD is now at 9742838 new file
-error: cannot pull with rebase: Your index contains uncommitted changes.
-ok 31 - pull --rebase --no-autostash & rebase.autostash unset
-
-expecting success: 
-		test_must_fail git pull $i . copy 2>err &&
-		test_i18ngrep "only valid with --rebase" err
-	
-fatal: --[no-]autostash option is only valid with --rebase.
-ok 32 - pull --autostash (without --rebase) is illegal
-
-expecting success: 
-		test_must_fail git pull $i . copy 2>err &&
-		test_i18ngrep "only valid with --rebase" err
-	
-fatal: --[no-]autostash option is only valid with --rebase.
-ok 33 - pull --no-autostash (without --rebase) is illegal
-
-expecting success: 
-	git reset --hard before-rebase &&
-	test_config pull.rebase true &&
-	git pull . copy &&
-	test "$(git rev-parse HEAD^)" = "$(git rev-parse copy)" &&
-	test new = "$(git show HEAD:file2)"
-
-HEAD is now at 9742838 new file
-From .
- * branch            copy       -> FETCH_HEAD
-First, rewinding head to replay your work on top of it...
-Applying: new file
-ok 34 - pull.rebase
-
-expecting success: 
-	test_config pull.rebase true &&
-	test_pull_autostash --autostash
-
-HEAD is now at 9742838 new file
-From .
- * branch            copy       -> FETCH_HEAD
-Created autostash: 99aa80f
-HEAD is now at 9742838 new file
-First, rewinding head to replay your work on top of it...
-Applying: new file
-Applied autostash.
-ok 35 - pull --autostash & pull.rebase=true
-
-expecting success: 
-	test_config pull.rebase true &&
-	test_pull_autostash_fail --no-autostash
-
-HEAD is now at 9742838 new file
-error: cannot pull with rebase: Your index contains uncommitted changes.
-ok 36 - pull --no-autostash & pull.rebase=true
-
-expecting success: 
-	git reset --hard before-rebase &&
-	test_config branch.to-rebase.rebase true &&
-	git pull . copy &&
-	test "$(git rev-parse HEAD^)" = "$(git rev-parse copy)" &&
-	test new = "$(git show HEAD:file2)"
-
-HEAD is now at 9742838 new file
-From .
- * branch            copy       -> FETCH_HEAD
-First, rewinding head to replay your work on top of it...
-Applying: new file
-ok 37 - branch.to-rebase.rebase
-
-expecting success: 
-	git reset --hard before-rebase &&
-	test_config pull.rebase true &&
-	test_config branch.to-rebase.rebase false &&
-	git pull . copy &&
-	test "$(git rev-parse HEAD^)" != "$(git rev-parse copy)" &&
-	test new = "$(git show HEAD:file2)"
-
-HEAD is now at 9742838 new file
-From .
- * branch            copy       -> FETCH_HEAD
-Merging:
-9742838 new file
-virtual f38c19f62ae796d3abcc3054ebf3081e19ccadb7
-found 1 common ancestor:
-054c464 modified
-Merge made by the 'recursive' strategy.
- file | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 38 - branch.to-rebase.rebase should override pull.rebase
-
-expecting success: 
-	git reset --hard before-rebase &&
-	git pull --rebase --verify-signatures . copy 2>err &&
-	test "$(git rev-parse HEAD^)" = "$(git rev-parse copy)" &&
-	test new = "$(git show HEAD:file2)" &&
-	test_i18ngrep "ignoring --verify-signatures for rebase" err
-
-HEAD is now at 9742838 new file
-First, rewinding head to replay your work on top of it...
-Applying: new file
-warning: ignoring --verify-signatures for rebase
-ok 39 - pull --rebase warns on --verify-signatures
-
-expecting success: 
-	git reset --hard before-rebase &&
-	git pull --rebase --no-verify-signatures . copy 2>err &&
-	test "$(git rev-parse HEAD^)" = "$(git rev-parse copy)" &&
-	test new = "$(git show HEAD:file2)" &&
-	test_i18ngrep ! "verify-signatures" err
-
-HEAD is now at 9742838 new file
-First, rewinding head to replay your work on top of it...
-Applying: new file
-ok 40 - pull --rebase does not warn on --no-verify-signatures
-
-expecting success: 
-	git reset --hard before-rebase &&
-	git checkout -b keep-merge second^ &&
-	test_commit file3 &&
-	git checkout to-rebase &&
-	git merge keep-merge &&
-	git tag before-preserve-rebase
-
-HEAD is now at 9742838 new file
-Switched to a new branch 'keep-merge'
-[keep-merge 7117712] file3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file3.t
-Switched to branch 'to-rebase'
-Merging:
-9742838 new file
-virtual keep-merge
-found 1 common ancestor:
-f09d68d original
-Merge made by the 'recursive' strategy.
- file3.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 file3.t
-ok 41 - preserve merge setup
-
-expecting success: 
-	git reset --hard before-preserve-rebase &&
-	test_config pull.rebase false &&
-	git pull . copy &&
-	test "$(git rev-parse HEAD^1)" = "$(git rev-parse before-preserve-rebase)" &&
-	test "$(git rev-parse HEAD^2)" = "$(git rev-parse copy)" &&
-	test file3 = "$(git show HEAD:file3.t)"
-
-HEAD is now at 457c2e2 Merge branch 'keep-merge' into to-rebase
-From .
- * branch            copy       -> FETCH_HEAD
-Merging:
-457c2e2 Merge branch 'keep-merge' into to-rebase
-virtual f38c19f62ae796d3abcc3054ebf3081e19ccadb7
-found 1 common ancestor:
-054c464 modified
-Merge made by the 'recursive' strategy.
- file | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 42 - pull.rebase=false create a new merge commit
-
-expecting success: 
-	git reset --hard before-preserve-rebase &&
-	test_config pull.rebase true &&
-	git pull . copy &&
-	test "$(git rev-parse HEAD^^)" = "$(git rev-parse copy)" &&
-	test file3 = "$(git show HEAD:file3.t)"
-
-HEAD is now at 457c2e2 Merge branch 'keep-merge' into to-rebase
-From .
- * branch            copy       -> FETCH_HEAD
-First, rewinding head to replay your work on top of it...
-Applying: new file
-Applying: file3
-ok 43 - pull.rebase=true flattens keep-merge
-
-expecting success: 
-	git reset --hard before-preserve-rebase &&
-	test_config pull.rebase 1 &&
-	git pull . copy &&
-	test "$(git rev-parse HEAD^^)" = "$(git rev-parse copy)" &&
-	test file3 = "$(git show HEAD:file3.t)"
-
-HEAD is now at 457c2e2 Merge branch 'keep-merge' into to-rebase
-From .
- * branch            copy       -> FETCH_HEAD
-First, rewinding head to replay your work on top of it...
-Applying: new file
-Applying: file3
-ok 44 - pull.rebase=1 is treated as true and flattens keep-merge
-
-checking prerequisite: REBASE_P
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
-	test -z "$GIT_TEST_SKIP_REBASE_P"
-
-)
-prerequisite REBASE_P ok
-expecting success: 
-	git reset --hard before-preserve-rebase &&
-	test_config pull.rebase preserve &&
-	git pull . copy &&
-	test "$(git rev-parse HEAD^^)" = "$(git rev-parse copy)" &&
-	test "$(git rev-parse HEAD^2)" = "$(git rev-parse keep-merge)"
-
-HEAD is now at 457c2e2 Merge branch 'keep-merge' into to-rebase
-From .
- * branch            copy       -> FETCH_HEAD
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/to-rebase.
-ok 45 - pull.rebase=preserve rebases and merges keep-merge
-
-expecting success: 
-	write_script "$TRASH_DIRECTORY/fake-editor" <<-\EOF &&
-	echo I was here >fake.out &&
-	false
-	EOF
-	test_set_editor "$TRASH_DIRECTORY/fake-editor" &&
-	test_when_finished "test_might_fail git rebase --abort" &&
-	test_must_fail git pull --rebase=interactive . copy &&
-	test "I was here" = "$(cat fake.out)"
-
-From .
- * branch            copy       -> FETCH_HEAD
-error: There was a problem with the editor '"$FAKE_EDITOR"'.
-fatal: No rebase in progress?
-ok 46 - pull.rebase=interactive
-
-expecting success: 
-	write_script "$TRASH_DIRECTORY/fake-editor" <<-\EOF &&
-	echo I was here, too >fake.out &&
-	false
-	EOF
-	test_set_editor "$TRASH_DIRECTORY/fake-editor" &&
-	test_when_finished "test_might_fail git rebase --abort" &&
-	test_must_fail git pull --rebase=i . copy &&
-	test "I was here, too" = "$(cat fake.out)"
-
-From .
- * branch            copy       -> FETCH_HEAD
-error: There was a problem with the editor '"$FAKE_EDITOR"'.
-fatal: No rebase in progress?
-ok 47 - pull --rebase=i
-
-expecting success: 
-	git reset --hard before-preserve-rebase &&
-	test_config pull.rebase invalid &&
-	! git pull . copy
-
-HEAD is now at 457c2e2 Merge branch 'keep-merge' into to-rebase
-fatal: Invalid value for pull.rebase: invalid
-ok 48 - pull.rebase=invalid fails
-
-expecting success: 
-	git reset --hard before-preserve-rebase &&
-	test_config pull.rebase true &&
-	git pull --rebase=false . copy &&
-	test "$(git rev-parse HEAD^1)" = "$(git rev-parse before-preserve-rebase)" &&
-	test "$(git rev-parse HEAD^2)" = "$(git rev-parse copy)" &&
-	test file3 = "$(git show HEAD:file3.t)"
-
-HEAD is now at 457c2e2 Merge branch 'keep-merge' into to-rebase
-From .
- * branch            copy       -> FETCH_HEAD
-Merging:
-457c2e2 Merge branch 'keep-merge' into to-rebase
-virtual f38c19f62ae796d3abcc3054ebf3081e19ccadb7
-found 1 common ancestor:
-054c464 modified
-Merge made by the 'recursive' strategy.
- file | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 49 - --rebase=false create a new merge commit
-
-expecting success: 
-	git reset --hard before-preserve-rebase &&
-	test_config pull.rebase preserve &&
-	git pull --rebase=true . copy &&
-	test "$(git rev-parse HEAD^^)" = "$(git rev-parse copy)" &&
-	test file3 = "$(git show HEAD:file3.t)"
-
-HEAD is now at 457c2e2 Merge branch 'keep-merge' into to-rebase
-From .
- * branch            copy       -> FETCH_HEAD
-First, rewinding head to replay your work on top of it...
-Applying: new file
-Applying: file3
-ok 50 - --rebase=true rebases and flattens keep-merge
-
-expecting success: 
-	git reset --hard before-preserve-rebase &&
-	test_config pull.rebase true &&
-	git pull --rebase=preserve . copy &&
-	test "$(git rev-parse HEAD^^)" = "$(git rev-parse copy)" &&
-	test "$(git rev-parse HEAD^2)" = "$(git rev-parse keep-merge)"
-
-HEAD is now at 457c2e2 Merge branch 'keep-merge' into to-rebase
-From .
- * branch            copy       -> FETCH_HEAD
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/to-rebase.
-ok 51 - --rebase=preserve rebases and merges keep-merge
-
-expecting success: 
-	git reset --hard before-preserve-rebase &&
-	! git pull --rebase=invalid . copy
-
-HEAD is now at 457c2e2 Merge branch 'keep-merge' into to-rebase
-error: Invalid value for --rebase: invalid
-ok 52 - --rebase=invalid fails
-
-expecting success: 
-	git reset --hard before-preserve-rebase &&
-	test_config pull.rebase preserve &&
-	git pull --rebase . copy &&
-	test "$(git rev-parse HEAD^^)" = "$(git rev-parse copy)" &&
-	test file3 = "$(git show HEAD:file3.t)"
-
-HEAD is now at 457c2e2 Merge branch 'keep-merge' into to-rebase
-From .
- * branch            copy       -> FETCH_HEAD
-First, rewinding head to replay your work on top of it...
-Applying: new file
-Applying: file3
-ok 53 - --rebase overrides pull.rebase=preserve and flattens keep-merge
-
-expecting success: 
-
-	git remote add -f me . &&
-	git checkout copy &&
-	git tag copy-orig &&
-	git reset --hard HEAD^ &&
-	echo conflicting modification > file &&
-	git commit -m conflict file &&
-	git checkout to-rebase &&
-	echo file > file2 &&
-	git commit -m to-rebase file2 &&
-	git tag to-rebase-orig &&
-	git pull --rebase me copy &&
-	test "conflicting modification" = "$(cat file)" &&
-	test file = "$(cat file2)"
-
-
-Updating me
-From .
- * [new branch]      copy            -> me/copy
- * [new branch]      diverging       -> me/diverging
- * [new branch]      fails-to-rebase -> me/fails-to-rebase
- * [new branch]      ff              -> me/ff
- * [new branch]      keep-merge      -> me/keep-merge
- * [new branch]      master          -> me/master
- * [new branch]      second          -> me/second
- * [new branch]      seq             -> me/seq
- * [new branch]      to-rebase       -> me/to-rebase
- * [new branch]      with-conflicts  -> me/with-conflicts
-Switched to branch 'copy'
-Your branch and 'master' have diverged,
-and have 2 and 1 different commits each, respectively.
-  (use "git pull" to merge the remote branch into yours)
-HEAD is now at 054c464 modified
-[copy 4c8a989] conflict
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to branch 'to-rebase'
-[to-rebase db1be75] to-rebase
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-From .
- * branch            copy       -> FETCH_HEAD
- + f38c19f...4c8a989 copy       -> me/copy  (forced update)
-First, rewinding head to replay your work on top of it...
-Applying: new file
-Applying: file3
-Applying: to-rebase
-ok 54 - --rebase with rebased upstream
-
-expecting success: 
-	test_when_finished "test_might_fail git rebase --abort" &&
-	git reset --hard to-rebase-orig &&
-	git pull --rebase -f me copy &&
-	test "conflicting modification" = "$(cat file)" &&
-	test file = "$(cat file2)"
-
-HEAD is now at db1be75 to-rebase
-From .
- * branch            copy       -> FETCH_HEAD
-First, rewinding head to replay your work on top of it...
-Applying: new file
-Applying: file3
-Applying: to-rebase
-fatal: No rebase in progress?
-ok 55 - --rebase -f with rebased upstream
-
-expecting success: 
-
-	git update-ref refs/remotes/me/copy copy-orig &&
-	git checkout --track -b to-rebase2 me/copy &&
-	git reset --hard to-rebase-orig &&
-	git pull --rebase &&
-	test "conflicting modification" = "$(cat file)" &&
-	test file = "$(cat file2)"
-
-
-Switched to a new branch 'to-rebase2'
-Branch 'to-rebase2' set up to track remote branch 'copy' from 'me'.
-HEAD is now at db1be75 to-rebase
-From .
- + f38c19f...4c8a989 copy       -> me/copy  (forced update)
- + 0069d45...cd4b138 to-rebase  -> me/to-rebase  (forced update)
- * [new branch]      to-rebase2 -> me/to-rebase2
-First, rewinding head to replay your work on top of it...
-Applying: new file
-Applying: file3
-Applying: to-rebase
-ok 56 - --rebase with rebased default upstream
-
-expecting success: 
-
-	git update-ref refs/remotes/me/copy copy-orig &&
-	git reset --hard to-rebase-orig &&
-	git checkout --track -b to-rebase3 me/copy &&
-	git reset --hard to-rebase-orig &&
-	git fetch &&
-	git pull --rebase &&
-	test "conflicting modification" = "$(cat file)" &&
-	test file = "$(cat file2)"
-
-
-HEAD is now at db1be75 to-rebase
-Switched to a new branch 'to-rebase3'
-Branch 'to-rebase3' set up to track remote branch 'copy' from 'me'.
-HEAD is now at db1be75 to-rebase
-From .
- + f38c19f...4c8a989 copy       -> me/copy  (forced update)
- * [new branch]      to-rebase3 -> me/to-rebase3
-First, rewinding head to replay your work on top of it...
-Applying: new file
-Applying: file3
-Applying: to-rebase
-ok 57 - rebased upstream + fetch + pull --rebase
-
-expecting success: 
-
-	git checkout to-rebase &&
-	git update-ref refs/remotes/me/copy copy^ &&
-	COPY="$(git rev-parse --verify me/copy)" &&
-	git rebase --onto $COPY copy &&
-	test_config branch.to-rebase.remote me &&
-	test_config branch.to-rebase.merge refs/heads/copy &&
-	test_config branch.to-rebase.rebase true &&
-	echo dirty >> file &&
-	git add file &&
-	test_must_fail git pull &&
-	test "$COPY" = "$(git rev-parse --verify me/copy)" &&
-	git checkout HEAD -- file &&
-	git pull &&
-	test "$COPY" != "$(git rev-parse --verify me/copy)"
-
-
-Switched to branch 'to-rebase'
-First, rewinding head to replay your work on top of it...
-Applying: new file
-Applying: file3
-Applying: to-rebase
-error: cannot pull with rebase: Your index contains uncommitted changes.
-error: please commit or stash them.
-From .
-   054c464..4c8a989  copy       -> me/copy
- + cd4b138...2674178 to-rebase  -> me/to-rebase  (forced update)
- + db1be75...cd4b138 to-rebase3 -> me/to-rebase3  (forced update)
-First, rewinding head to replay your work on top of it...
-Applying: new file
-Applying: file3
-Applying: to-rebase
-ok 58 - pull --rebase dies early with dirty working directory
-
-expecting success: 
-	git rev-parse master >expect &&
-	mkdir empty_repo &&
-	(cd empty_repo &&
-	 git init &&
-	 git pull --rebase .. master &&
-	 git rev-parse HEAD >../actual
-	) &&
-	test_cmp expect actual
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5520-pull/empty_repo/.git/
-From ..
- * branch            master     -> FETCH_HEAD
-ok 59 - pull --rebase works on branch yet to be born
-
-expecting success: 
-	test_when_finished "rm -rf empty_repo2" &&
-	git init empty_repo2 &&
-	(
-		cd empty_repo2 &&
-		echo staged-file >staged-file &&
-		git add staged-file &&
-		test "$(git ls-files)" = staged-file &&
-		test_must_fail git pull --rebase .. master 2>err &&
-		test "$(git ls-files)" = staged-file &&
-		test "$(git show :staged-file)" = staged-file &&
-		test_i18ngrep "unborn branch with changes added to the index" err
-	)
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5520-pull/empty_repo2/.git/
-fatal: Updating an unborn branch with changes added to the index.
-ok 60 - pull --rebase fails on unborn branch with staged changes
-
-expecting success: 
-	test_when_finished "rm -rf corrupt" &&
-	git init corrupt &&
-	(
-		cd corrupt &&
-		test_commit one &&
-		obj=$(git rev-parse --verify HEAD | sed "s#^..#&/#") &&
-		rm -f .git/objects/$obj &&
-		test_must_fail git pull --rebase
-	)
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5520-pull/corrupt/.git/
-[master (root-commit) d944c64] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-error: cannot pull with rebase: Your index contains uncommitted changes.
-error: please commit or stash them.
-ok 61 - pull --rebase fails on corrupt HEAD
-
-expecting success: 
-	mkdir src &&
-	(cd src &&
-	 git init &&
-	 printf "1\n2\n3\n4\n5\n6\n7\n8\n9\n10\n" > stuff &&
-	 git add stuff &&
-	 git commit -m "Initial revision"
-	) &&
-	git clone src dst &&
-	(cd src &&
-	 modify s/5/43/ stuff &&
-	 git commit -a -m "5->43" &&
-	 modify s/6/42/ stuff &&
-	 git commit -a -m "Make it bigger"
-	) &&
-	(cd dst &&
-	 modify s/5/43/ stuff &&
-	 git commit -a -m "Independent discovery of 5->43"
-	)
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5520-pull/src/.git/
-[master (root-commit) bd1c84a] Initial revision
- Author: A U Thor <author@example.com>
- 1 file changed, 10 insertions(+)
- create mode 100644 stuff
-Cloning into 'dst'...
-done.
-[master c0a2a33] 5->43
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[master 5004a46] Make it bigger
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[master 60bf00b] Independent discovery of 5->43
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 62 - setup for detecting upstreamed changes
-
-expecting success: 
-	(cd dst &&
-	 git pull --rebase &&
-	 test -z "$(git ls-files -u)"
-	)
-
-From /build/git-2.20.1/t/trash directory.t5520-pull/src
-   bd1c84a..5004a46  master     -> origin/master
-First, rewinding head to replay your work on top of it...
-ok 63 - git pull --rebase detects upstreamed changes
-
-expecting success: 
-	(cd dst &&
-	 test_might_fail git rebase --abort &&
-	 git reset --hard origin/master
-	) &&
-	git clone --bare src src-replace.git &&
-	rm -rf src &&
-	mv src-replace.git src &&
-	(cd dst &&
-	 modify s/2/22/ stuff &&
-	 git commit -a -m "Change 2" &&
-	 modify s/3/33/ stuff &&
-	 git commit -a -m "Change 3" &&
-	 modify s/4/44/ stuff &&
-	 git commit -a -m "Change 4" &&
-	 git push &&
-
-	 modify s/44/55/ stuff &&
-	 git commit --amend -a -m "Modified Change 4"
-	)
-
-fatal: No rebase in progress?
-HEAD is now at 5004a46 Make it bigger
-Cloning into bare repository 'src-replace.git'...
-done.
-[master 6561203] Change 2
- Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+), 2 deletions(-)
-[master e842a0a] Change 3
- Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+), 2 deletions(-)
-[master a5ed940] Change 4
- Author: A U Thor <author@example.com>
- 1 file changed, 3 insertions(+), 3 deletions(-)
-To /build/git-2.20.1/t/trash directory.t5520-pull/src
-   5004a46..a5ed940  master -> master
-[master 711c2d7] Modified Change 4
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:19:13 2005 -0700
- 1 file changed, 3 insertions(+), 3 deletions(-)
-ok 64 - setup for avoiding reapplying old patches
-
-expecting success: 
-	(cd dst &&
-	 test_must_fail git pull --rebase &&
-	 test 1 = $(find .git/rebase-apply -name "000*" | wc -l)
-	)
-
-First, rewinding head to replay your work on top of it...
-Applying: Modified Change 4
-Using index info to reconstruct a base tree...
-M	stuff
-Falling back to patching base and 3-way merge...
-Merging:
-a5ed940 Change 4
-virtual Modified Change 4
-found 1 common ancestor:
-virtual e369e858ec1aa73d497d02c4f23e5cf4ae2d3c3b
-Auto-merging stuff
-CONFLICT (content): Merge conflict in stuff
-error: Failed to merge in the changes.
-hint: Use 'git am --show-current-patch' to see the failed patch
-Patch failed at 0001 Modified Change 4
-
-Resolve all conflicts manually, mark them as resolved with
-"git add/rm <conflicted_files>", then run "git rebase --continue".
-You can instead skip this commit: run "git rebase --skip".
-To abort and get back to the state before "git rebase", run "git rebase --abort".
-
-ok 65 - git pull --rebase does not reapply old patches
-
-expecting success: 
-	git checkout -b copy2 to-rebase-orig &&
-	git pull --rebase . to-rebase &&
-	test "conflicting modification" = "$(cat file)" &&
-	test file = "$(cat file2)"
-
-Switched to a new branch 'copy2'
-From .
- * branch            to-rebase  -> FETCH_HEAD
-First, rewinding head to replay your work on top of it...
-ok 66 - git pull --rebase against local branch
-
-# passed all 66 test(s)
-1..66
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t6013-rev-list-reverse-parents.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6013-rev-list-reverse-parents/.git/
-expecting success: 
-	commit one &&
-	git tag root &&
-	commit two &&
-	git checkout -b side HEAD^ &&
-	commit three &&
-	git checkout master &&
-	git merge -s ours side &&
-	commit five
-	
-[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(-)
-Switched to a new branch 'side'
-[side 0fcb03e] three
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to branch 'master'
-Merge made by the 'ours' strategy.
-[master 2ed4a76] five
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 1 - set up --reverse example
-
-expecting success: 
-	git rev-list --parents --full-history master -- foo |
-		perl -e "print reverse <>" > expected &&
-	git rev-list --reverse --parents --full-history master -- foo \
-		> actual &&
-	test_cmp expected actual
-	
-ok 2 - --reverse --parents --full-history combines correctly
-
-expecting success: 
-	git rev-list --boundary --parents --full-history master ^root -- foo |
-		perl -e "print reverse <>" > expected &&
-	git rev-list --boundary --reverse --parents --full-history \
-		master ^root -- foo > actual &&
-	test_cmp expected actual
-	
-ok 3 - --boundary does too
-
-# passed all 3 test(s)
-1..3
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t6007-rev-list-cherry-pick-file.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6007-rev-list-cherry-pick-file/.git/
-expecting success: 
-	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 master &&
-	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
-
-[master (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 'master'
-[master 9e00a87] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[master 9c68531] D
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 bar
-[master 555ccf5] F
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 1 - setup
-
-expecting success: 
-	git rev-list --left-right B...C > actual &&
-	git name-rev --stdin --name-only --refs="*tags/*" \
-		< actual > actual.named &&
-	test_cmp expect actual.named
-
-ok 2 - --left-right
-
-expecting success: 
-	git rev-list --count B...C > actual &&
-	test "$(cat actual)" = 2
-
-ok 3 - --count
-
-expecting success: 
-	test -z "$(git rev-list --left-right --cherry-pick B...C -- foo)"
-
-ok 4 - --cherry-pick foo comes up empty
-
-expecting success: 
-	git rev-list --left-right --cherry-pick B...C -- bar > actual &&
-	git name-rev --stdin --name-only --refs="*tags/*" \
-		< actual > actual.named &&
-	test_cmp expect actual.named
-
-ok 5 - --cherry-pick bar does not come up empty
-
-expecting success: 
-	git rev-list --left-right B...C -- bar > actual &&
-	git name-rev --stdin --name-only --refs="*tags/*" \
-		< actual > actual.named &&
-	test_cmp expect actual.named
-
-ok 6 - bar does not come up empty
-
-expecting success: 
-	git rev-list --left-right --cherry-pick F...E -- bar > actual &&
-	git name-rev --stdin --name-only --refs="*tags/*" \
-		< actual > actual.named &&
-	test_cmp expect actual.named
-
-ok 7 - --cherry-pick bar does not come up empty (II)
-
-expecting success: 
-	git rev-list --left-right --cherry-pick F...E -- bar >actual &&
-	git name-rev --stdin --name-only --refs="*tags/F" --refs="*tags/E" \
-		<actual >actual.named &&
-	test_cmp expect actual.named
-
-ok 8 - name-rev multiple --refs combine inclusive
-
-expecting success: 
-	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 --stdin --name-only --refs="*tags/F" \
-		<actual >actual.named &&
-	test_cmp expect actual.named
-
-ok 9 - name-rev --refs excludes non-matched patterns
-
-expecting success: 
-	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 --stdin --name-only --refs="*tags/*" --exclude="*E" \
-		<actual >actual.named &&
-	test_cmp expect actual.named
-
-ok 10 - name-rev --exclude excludes matched patterns
-
-expecting success: 
-	git rev-list --left-right --cherry-pick F...E -- bar >expect &&
-	git name-rev --stdin --name-only --refs="*tags/F" --refs="*tags/E" --no-refs --refs="*tags/G" \
-		<expect >actual &&
-	test_cmp expect actual
-
-ok 11 - name-rev --no-refs clears the refs list
-
-expecting success: 
-	git rev-list --cherry-mark F...E -- bar > actual &&
-	git name-rev --stdin --name-only --refs="*tags/*" \
-		< actual > actual.named &&
-	test_cmp expect actual.named
-
-ok 12 - --cherry-mark
-
-expecting success: 
-	git rev-list --cherry-mark --left-right F...E -- bar > actual &&
-	git name-rev --stdin --name-only --refs="*tags/*" \
-		< actual > actual.named &&
-	test_cmp expect actual.named
-
-ok 13 - --cherry-mark --left-right
-
-expecting success: 
-	git rev-list --cherry-pick --right-only F...E -- bar > actual &&
-	git name-rev --stdin --name-only --refs="*tags/*" \
-		< actual > actual.named &&
-	test_cmp expect actual.named
-
-ok 14 - --cherry-pick --right-only
-
-expecting success: 
-	git rev-list --cherry-pick --left-only E...F -- bar > actual &&
-	git name-rev --stdin --name-only --refs="*tags/*" \
-		< actual > actual.named &&
-	test_cmp expect actual.named
-
-ok 15 - --cherry-pick --left-only
-
-expecting success: 
-	git rev-list --cherry F...E -- bar > actual &&
-	git name-rev --stdin --name-only --refs="*tags/*" \
-		< actual > actual.named &&
-	test_cmp expect actual.named
-
-ok 16 - --cherry
-
-expecting success: 
-	git rev-list --cherry --count F...E -- bar > actual &&
-	test_cmp expect actual
-
-ok 17 - --cherry --count
-
-expecting success: 
-	git rev-list --cherry-mark --count F...E -- bar > actual &&
-	test_cmp expect actual
-
-ok 18 - --cherry-mark --count
-
-expecting success: 
-	git rev-list --cherry-mark --left-right --count F...E -- bar > actual &&
-	test_cmp expect actual
-
-ok 19 - --cherry-mark --left-right --count
-
-expecting success: 
-	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...master -- foo)"
-
-[independent (root-commit) 5da548c] independent
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo
-[independent de095d9] independent, too
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 20 - --cherry-pick with independent, but identical branches
-
-expecting success: 
-	git rev-list --count --left-right C...D > actual &&
-	test_cmp expect actual
-
-ok 21 - --count --left-right
-
-expecting success: 
-	git checkout -b shy-diff &&
-	test_commit dont-look-at-me &&
-	echo Hello >dont-look-at-me.t &&
-	test_tick &&
-	git commit -m tip dont-look-at-me.t &&
-	git checkout -b mainline HEAD^ &&
-	test_commit to-cherry-pick &&
-	remove_loose_object shy-diff^:dont-look-at-me.t &&
-	git rev-list --cherry-pick ...shy-diff
-
-Switched to a new branch 'shy-diff'
-[shy-diff 38fbe57] 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 f065567] tip
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'mainline'
-[mainline 7b441fd] to-cherry-pick
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 to-cherry-pick.t
-7b441fdb48b15549aa518c0e9aef495001ae11cd
-f065567c34afb81b41cc75716781105f7fc57824
-ok 22 - --cherry-pick avoids looking at full diffs
-
-# passed all 22 test(s)
-1..22
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t6014-rev-list-all.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6014-rev-list-all/.git/
-expecting success: 
-
-	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: checking out '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 performing another checkout.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
-
-  git checkout -b <new-branch-name>
-
-HEAD is now at 86412ff one
-[detached HEAD 13d8fe0] detached
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ create mode 100644 foo
+[master 4931c53] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Note: checking out '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 performing another checkout.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -b with the checkout command again. Example:
+
+  git checkout -b <new-branch-name>
+
+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: 
@@ -215090,6 +212726,1351 @@
 1..81
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
+*** t5552-skipping-fetch-negotiator.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5552-skipping-fetch-negotiator/.git/
+expecting success: 
+	git init server &&
+	test_commit -C server to_fetch &&
+
+	git init client &&
+	for i in $(test_seq 7)
+	do
+		test_commit -C client c$i
+	done &&
+
+	# We send: "c7" (skip 1) "c5" (skip 2) "c2" (skip 4). After that, since
+	# "c1" has no parent, it is still sent as "have" even though it would
+	# normally be skipped.
+	test_config -C client fetch.negotiationalgorithm skipping &&
+	trace_fetch client "$(pwd)/server" &&
+	have_sent c7 c5 c2 c1 &&
+	have_not_sent c6 c4 c3
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5552-skipping-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/git-2.20.1/t/trash directory.t5552-skipping-fetch-negotiator/client/.git/
+[master (root-commit) 9e22a6c] c1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c1.t
+[master 0d7e994] c2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c2.t
+[master 85a1cf7] c3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c3.t
+[master 0849982] c4
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c4.t
+[master 0abab02] c5
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c5.t
+[master 796a96a] c6
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c6.t
+[master 9b13844] c7
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c7.t
+warning: no common commits
+From /build/git-2.20.1/t/trash directory.t5552-skipping-fetch-negotiator/server
+ * branch            HEAD       -> FETCH_HEAD
+packet:        fetch> have 9b13844ba1d52a28bb9487107b41cce9916b74c9
+packet:        fetch> have 0abab022ac7e07f16265106cf36faf7cb5d87ab3
+packet:        fetch> have 0d7e994c092abbb0a21e7d243114efa5ba452b8c
+packet:        fetch> have 9e22a6c1b441ee1bcd54b8da801261ba8b15eac9
+ok 1 - commits with no parents are sent regardless of skip distance
+
+expecting success: 
+	rm -rf server client trace &&
+	git init server &&
+	test_commit -C server to_fetch &&
+
+	git init client &&
+	test_commit -C client on_client &&
+	git -C client checkout on_client &&
+
+	test_config -C client fetch.negotiationAlgorithm invalid &&
+	test_must_fail git -C client fetch "$(pwd)/server" 2>err &&
+	test_i18ngrep "unknown fetch negotiation algorithm" err &&
+
+	# Explicit "default" value
+	test_config -C client fetch.negotiationAlgorithm default &&
+	git -C client -c fetch.negotiationAlgorithm=default fetch "$(pwd)/server" &&
+
+	# Implementation detail: If there is nothing to fetch, we will not error out
+	test_config -C client fetch.negotiationAlgorithm invalid &&
+	git -C client fetch "$(pwd)/server" 2>err &&
+	test_i18ngrep ! "unknown fetch negotiation algorithm" err
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5552-skipping-fetch-negotiator/server/.git/
+[master (root-commit) 64a1f76] 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/git-2.20.1/t/trash directory.t5552-skipping-fetch-negotiator/client/.git/
+[master (root-commit) 6d60c89] on_client
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 on_client.t
+Note: checking out 'on_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 performing another checkout.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -b with the checkout command again. Example:
+
+  git checkout -b <new-branch-name>
+
+HEAD is now at 6d60c89 on_client
+fatal: unknown fetch negotiation algorithm 'invalid'
+warning: no common commits
+From /build/git-2.20.1/t/trash directory.t5552-skipping-fetch-negotiator/server
+ * branch            HEAD       -> FETCH_HEAD
+ok 2 - unknown fetch.negotiationAlgorithm values error out
+
+expecting success: 
+	rm -rf server client trace &&
+	git init server &&
+	test_commit -C server to_fetch &&
+
+	git init client &&
+	for i in $(test_seq 11)
+	do
+		test_commit -C client c$i
+	done &&
+	git -C client checkout c5 &&
+	test_commit -C client c5side &&
+
+	# Before reaching c5, we send "c5side" (skip 1) and "c11" (skip 1) "c9"
+	# (skip 2) "c6" (skip 4). The larger skip (skip 4) takes precedence, so
+	# the next "have" sent will be "c1" (from "c6" skip 4) and not "c4"
+	# (from "c5side" skip 1).
+	test_config -C client fetch.negotiationalgorithm skipping &&
+	trace_fetch client "$(pwd)/server" &&
+	have_sent c5side c11 c9 c6 c1 &&
+	have_not_sent c10 c8 c7 c5 c4 c3 c2
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5552-skipping-fetch-negotiator/server/.git/
+[master (root-commit) 3bc19e6] 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/git-2.20.1/t/trash directory.t5552-skipping-fetch-negotiator/client/.git/
+[master (root-commit) 73c9691] c1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c1.t
+[master 3e97f74] c2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c2.t
+[master 40cabae] c3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c3.t
+[master 7106bbb] c4
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c4.t
+[master 2a51269] c5
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c5.t
+[master 591084c] c6
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c6.t
+[master 86cf406] c7
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c7.t
+[master cd20934] c8
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c8.t
+[master 6d58a2d] c9
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c9.t
+[master 9fa7b54] c10
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c10.t
+[master 71dd193] c11
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c11.t
+Note: checking out 'c5'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by performing another checkout.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -b with the checkout command again. Example:
+
+  git checkout -b <new-branch-name>
+
+HEAD is now at 2a51269 c5
+[detached HEAD 5bb2674] c5side
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c5side.t
+warning: no common commits
+From /build/git-2.20.1/t/trash directory.t5552-skipping-fetch-negotiator/server
+ * branch            HEAD       -> FETCH_HEAD
+packet:        fetch> have 5bb26742f0d19e4c8eb1d1c6b4ad095643276f17
+packet:        fetch> have 71dd1938ab184b2c161869e75d3d67ab6f43f2ad
+packet:        fetch> have 6d58a2de92cca4528034ca2f9a1c205bc6850c1d
+packet:        fetch> have 591084cc9129e52445472ffcd274d61cb8468867
+packet:        fetch> have 73c9691b10107e4c472cac321722d49cc664e3e6
+ok 3 - when two skips collide, favor the larger one
+
+expecting success: 
+	rm -rf server client trace &&
+	git init server &&
+	test_commit -C server c1 &&
+	test_commit -C server c2 &&
+	test_commit -C server c3 &&
+	git -C server tag -d c1 c2 c3 &&
+
+	git clone server client &&
+	test_commit -C client c4 &&
+	test_commit -C client c5 &&
+	git -C client checkout c4^^ &&
+	test_commit -C client c2side &&
+
+	git -C server checkout --orphan anotherbranch &&
+	test_commit -C server to_fetch &&
+
+	# The server advertising "c3" (as "refs/heads/master") means that we do
+	# not need to send any ancestors of "c3", but we still need to send "c3"
+	# itself.
+	test_config -C client fetch.negotiationalgorithm skipping &&
+	trace_fetch client origin to_fetch &&
+	have_sent c5 c4^ c2side &&
+	have_not_sent c4 c4^^ c4^^^
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5552-skipping-fetch-negotiator/server/.git/
+[master (root-commit) 47f2535] c1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c1.t
+[master dd0ac24] c2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c2.t
+[master b554ada] c3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c3.t
+Deleted tag 'c1' (was 47f2535)
+Deleted tag 'c2' (was dd0ac24)
+Deleted tag 'c3' (was b554ada)
+Cloning into 'client'...
+done.
+[master 15c2709] c4
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c4.t
+[master 14537eb] c5
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c5.t
+Note: checking out 'c4^^'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by performing another checkout.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -b with the checkout command again. Example:
+
+  git checkout -b <new-branch-name>
+
+HEAD is now at dd0ac24 c2
+[detached HEAD 3409843] c2side
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c2side.t
+Switched to a new branch 'anotherbranch'
+[anotherbranch (root-commit) ed0e66c] to_fetch
+ Author: A U Thor <author@example.com>
+ 4 files changed, 4 insertions(+)
+ create mode 100644 c1.t
+ create mode 100644 c2.t
+ create mode 100644 c3.t
+ create mode 100644 to_fetch.t
+From /build/git-2.20.1/t/trash directory.t5552-skipping-fetch-negotiator/server
+ * tag               to_fetch   -> FETCH_HEAD
+packet:        fetch> have 14537ebb3063f1a5d49e3e3eac10cc6e900a9c3a
+packet:        fetch> have b554adabfc933db0071191b38e163057f45d7dee
+packet:        fetch> have 3409843ec3ac9e67b951a36aae634d4ff9ec378d
+ok 4 - use ref advertisement to filter out commits
+
+expecting success: 
+	rm -rf server client trace &&
+	git init server &&
+	test_commit -C server to_fetch &&
+
+	git init client &&
+
+	# 2 regular commits
+	test_tick=2000000000 &&
+	test_commit -C client c1 &&
+	test_commit -C client c2 &&
+
+	# 4 old commits
+	test_tick=1000000000 &&
+	git -C client checkout c1 &&
+	test_commit -C client old1 &&
+	test_commit -C client old2 &&
+	test_commit -C client old3 &&
+	test_commit -C client old4 &&
+
+	# "c2" and "c1" are popped first, then "old4" to "old1". "old1" would
+	# normally be skipped, but is treated as a commit without a parent here
+	# and sent, because (due to clock skew) its only parent has already been
+	# popped off the priority queue.
+	test_config -C client fetch.negotiationalgorithm skipping &&
+	trace_fetch client "$(pwd)/server" &&
+	have_sent c2 c1 old4 old2 old1 &&
+	have_not_sent old3
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5552-skipping-fetch-negotiator/server/.git/
+[master (root-commit) 8324fbb] 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/git-2.20.1/t/trash directory.t5552-skipping-fetch-negotiator/client/.git/
+[master (root-commit) dc824fa] c1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c1.t
+[master 9ab4692] c2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c2.t
+Note: checking out 'c1'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by performing another checkout.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -b with the checkout command again. Example:
+
+  git checkout -b <new-branch-name>
+
+HEAD is now at dc824fa c1
+[detached HEAD e9a2c09] old1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 old1.t
+[detached HEAD 41bd8dc] old2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 old2.t
+[detached HEAD 4ff0db5] old3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 old3.t
+[detached HEAD caef059] old4
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 old4.t
+warning: no common commits
+From /build/git-2.20.1/t/trash directory.t5552-skipping-fetch-negotiator/server
+ * branch            HEAD       -> FETCH_HEAD
+packet:        fetch> have 9ab46928dc282aa09f4dbf96893a252e058e7e8e
+packet:        fetch> have dc824fafb05f3229aedf1f320bbe572e35364dfe
+packet:        fetch> have caef059de69917b9119176a11b88afcef769331d
+packet:        fetch> have 41bd8dc092ee110ba80e350a346ec507ab2e42a0
+packet:        fetch> have e9a2c092a8e911567a377c881a7f6031e7f892ea
+ok 5 - handle clock skew
+
+expecting success: 
+	rm -rf server client trace &&
+	git init server &&
+	test_commit -C server to_fetch &&
+
+	git init client &&
+	for i in $(test_seq 8)
+	do
+		git -C client checkout --orphan b$i &&
+		test_commit -C client b$i.c0
+	done &&
+	for j in $(test_seq 19)
+	do
+		for i in $(test_seq 8)
+		do
+			git -C client checkout b$i &&
+			test_commit -C client b$i.c$j
+		done
+	done &&
+
+	# Copy this branch over to the server and add a commit on it so that it
+	# is reachable but not advertised.
+	git -C server fetch --no-tags "$(pwd)/client" b1:refs/heads/b1 &&
+	git -C server checkout b1 &&
+	test_commit -C server commit-on-b1 &&
+
+	test_config -C client fetch.negotiationalgorithm skipping &&
+	trace_fetch client "$(pwd)/server" to_fetch &&
+	grep "  fetch" trace &&
+
+	# fetch-pack sends 2 requests each containing 16 "have" lines before
+	# processing the first response. In these 2 requests, 4 commits from
+	# each branch are sent. Just check the first branch.
+	have_sent b1.c19 b1.c17 b1.c14 b1.c9 &&
+	have_not_sent b1.c18 b1.c16 b1.c15 b1.c13 b1.c12 b1.c11 b1.c10 &&
+
+	# While fetch-pack is processing the first response, it should read that
+	# the server ACKs b1.c19 and b1.c17.
+	grep "fetch< ACK $(git -C client rev-parse b1.c19) common" trace &&
+	grep "fetch< ACK $(git -C client rev-parse b1.c17) common" trace &&
+
+	# fetch-pack should thus not send any more commits in the b1 branch, but
+	# should still send the others (in this test, just check b2).
+	for i in $(test_seq 0 8)
+	do
+		have_not_sent b1.c$i
+	done &&
+	have_sent b2.c1 b2.c0
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5552-skipping-fetch-negotiator/server/.git/
+[master (root-commit) 184bd23] 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/git-2.20.1/t/trash directory.t5552-skipping-fetch-negotiator/client/.git/
+Switched to a new branch 'b1'
+[b1 (root-commit) f66d2ca] b1.c0
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b1.c0.t
+Switched to a new branch 'b2'
+[b2 (root-commit) c402344] b2.c0
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 b1.c0.t
+ create mode 100644 b2.c0.t
+Switched to a new branch 'b3'
+[b3 (root-commit) 8252af3] b3.c0
+ Author: A U Thor <author@example.com>
+ 3 files changed, 3 insertions(+)
+ create mode 100644 b1.c0.t
+ create mode 100644 b2.c0.t
+ create mode 100644 b3.c0.t
+Switched to a new branch 'b4'
+[b4 (root-commit) 8bffdf8] b4.c0
+ Author: A U Thor <author@example.com>
+ 4 files changed, 4 insertions(+)
+ create mode 100644 b1.c0.t
+ create mode 100644 b2.c0.t
+ create mode 100644 b3.c0.t
+ create mode 100644 b4.c0.t
+Switched to a new branch 'b5'
+[b5 (root-commit) ece05e8] b5.c0
+ Author: A U Thor <author@example.com>
+ 5 files changed, 5 insertions(+)
+ create mode 100644 b1.c0.t
+ create mode 100644 b2.c0.t
+ create mode 100644 b3.c0.t
+ create mode 100644 b4.c0.t
+ create mode 100644 b5.c0.t
+Switched to a new branch 'b6'
+[b6 (root-commit) ca6bc33] b6.c0
+ Author: A U Thor <author@example.com>
+ 6 files changed, 6 insertions(+)
+ create mode 100644 b1.c0.t
+ create mode 100644 b2.c0.t
+ create mode 100644 b3.c0.t
+ create mode 100644 b4.c0.t
+ create mode 100644 b5.c0.t
+ create mode 100644 b6.c0.t
+Switched to a new branch 'b7'
+[b7 (root-commit) 063e256] b7.c0
+ Author: A U Thor <author@example.com>
+ 7 files changed, 7 insertions(+)
+ create mode 100644 b1.c0.t
+ create mode 100644 b2.c0.t
+ create mode 100644 b3.c0.t
+ create mode 100644 b4.c0.t
+ create mode 100644 b5.c0.t
+ create mode 100644 b6.c0.t
+ create mode 100644 b7.c0.t
+Switched to a new branch 'b8'
+[b8 (root-commit) 9f605c2] b8.c0
+ Author: A U Thor <author@example.com>
+ 8 files changed, 8 insertions(+)
+ create mode 100644 b1.c0.t
+ create mode 100644 b2.c0.t
+ create mode 100644 b3.c0.t
+ create mode 100644 b4.c0.t
+ create mode 100644 b5.c0.t
+ create mode 100644 b6.c0.t
+ create mode 100644 b7.c0.t
+ create mode 100644 b8.c0.t
+Switched to branch 'b1'
+[b1 3f095eb] b1.c1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b1.c1.t
+Switched to branch 'b2'
+[b2 89ecd55] b2.c1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b2.c1.t
+Switched to branch 'b3'
+[b3 6592e0b] b3.c1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b3.c1.t
+Switched to branch 'b4'
+[b4 4426873] b4.c1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b4.c1.t
+Switched to branch 'b5'
+[b5 dbb467e] b5.c1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b5.c1.t
+Switched to branch 'b6'
+[b6 6b911cf] b6.c1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b6.c1.t
+Switched to branch 'b7'
+[b7 2414896] b7.c1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b7.c1.t
+Switched to branch 'b8'
+[b8 768bfc5] b8.c1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b8.c1.t
+Switched to branch 'b1'
+[b1 e885a48] b1.c2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b1.c2.t
+Switched to branch 'b2'
+[b2 7c818a7] b2.c2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b2.c2.t
+Switched to branch 'b3'
+[b3 871f49f] b3.c2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b3.c2.t
+Switched to branch 'b4'
+[b4 72680bb] b4.c2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b4.c2.t
+Switched to branch 'b5'
+[b5 b4557a1] b5.c2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b5.c2.t
+Switched to branch 'b6'
+[b6 6ca2925] b6.c2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b6.c2.t
+Switched to branch 'b7'
+[b7 7b661b8] b7.c2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b7.c2.t
+Switched to branch 'b8'
+[b8 2ecc389] b8.c2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b8.c2.t
+Switched to branch 'b1'
+[b1 5c8f104] b1.c3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b1.c3.t
+Switched to branch 'b2'
+[b2 4a25303] b2.c3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b2.c3.t
+Switched to branch 'b3'
+[b3 53d0287] b3.c3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b3.c3.t
+Switched to branch 'b4'
+[b4 6a982e3] b4.c3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b4.c3.t
+Switched to branch 'b5'
+[b5 beacf7c] b5.c3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b5.c3.t
+Switched to branch 'b6'
+[b6 645ec77] b6.c3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b6.c3.t
+Switched to branch 'b7'
+[b7 c245fa6] b7.c3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b7.c3.t
+Switched to branch 'b8'
+[b8 e7e7720] b8.c3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b8.c3.t
+Switched to branch 'b1'
+[b1 42fd38e] b1.c4
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b1.c4.t
+Switched to branch 'b2'
+[b2 b2c5e5b] b2.c4
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b2.c4.t
+Switched to branch 'b3'
+[b3 f0835ff] b3.c4
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b3.c4.t
+Switched to branch 'b4'
+[b4 b60c575] b4.c4
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b4.c4.t
+Switched to branch 'b5'
+[b5 4981e16] b5.c4
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b5.c4.t
+Switched to branch 'b6'
+[b6 3b4c6b7] b6.c4
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b6.c4.t
+Switched to branch 'b7'
+[b7 500474e] b7.c4
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b7.c4.t
+Switched to branch 'b8'
+[b8 54ca498] b8.c4
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b8.c4.t
+Switched to branch 'b1'
+[b1 3accc66] b1.c5
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b1.c5.t
+Switched to branch 'b2'
+[b2 82dee3b] b2.c5
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b2.c5.t
+Switched to branch 'b3'
+[b3 be215b2] b3.c5
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b3.c5.t
+Switched to branch 'b4'
+[b4 dabc132] b4.c5
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b4.c5.t
+Switched to branch 'b5'
+[b5 8561b1c] b5.c5
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b5.c5.t
+Switched to branch 'b6'
+[b6 318c581] b6.c5
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b6.c5.t
+Switched to branch 'b7'
+[b7 92d192b] b7.c5
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b7.c5.t
+Switched to branch 'b8'
+[b8 ea98a5a] b8.c5
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b8.c5.t
+Switched to branch 'b1'
+[b1 4f95974] b1.c6
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b1.c6.t
+Switched to branch 'b2'
+[b2 c6b69d0] b2.c6
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b2.c6.t
+Switched to branch 'b3'
+[b3 0c5d942] b3.c6
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b3.c6.t
+Switched to branch 'b4'
+[b4 46bd8d8] b4.c6
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b4.c6.t
+Switched to branch 'b5'
+[b5 3eb11ae] b5.c6
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b5.c6.t
+Switched to branch 'b6'
+[b6 77cb153] b6.c6
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b6.c6.t
+Switched to branch 'b7'
+[b7 1fa72fc] b7.c6
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b7.c6.t
+Switched to branch 'b8'
+[b8 ddd2755] b8.c6
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b8.c6.t
+Switched to branch 'b1'
+[b1 318aa43] b1.c7
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b1.c7.t
+Switched to branch 'b2'
+[b2 5e7b2f0] b2.c7
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b2.c7.t
+Switched to branch 'b3'
+[b3 9bf9a83] b3.c7
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b3.c7.t
+Switched to branch 'b4'
+[b4 794bc8f] b4.c7
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b4.c7.t
+Switched to branch 'b5'
+[b5 69fe812] b5.c7
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b5.c7.t
+Switched to branch 'b6'
+[b6 97ae47d] b6.c7
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b6.c7.t
+Switched to branch 'b7'
+[b7 403ab1f] b7.c7
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b7.c7.t
+Switched to branch 'b8'
+[b8 cff31fa] b8.c7
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b8.c7.t
+Switched to branch 'b1'
+[b1 eccb3a8] b1.c8
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b1.c8.t
+Switched to branch 'b2'
+[b2 6e4ea02] b2.c8
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b2.c8.t
+Switched to branch 'b3'
+[b3 37e9829] b3.c8
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b3.c8.t
+Switched to branch 'b4'
+[b4 9ff00cf] b4.c8
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b4.c8.t
+Switched to branch 'b5'
+[b5 a42de58] b5.c8
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b5.c8.t
+Switched to branch 'b6'
+[b6 8fce737] b6.c8
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b6.c8.t
+Switched to branch 'b7'
+[b7 8a6b38a] b7.c8
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b7.c8.t
+Switched to branch 'b8'
+[b8 4e6a712] b8.c8
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b8.c8.t
+Switched to branch 'b1'
+[b1 b76868e] b1.c9
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b1.c9.t
+Switched to branch 'b2'
+[b2 770eae6] b2.c9
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b2.c9.t
+Switched to branch 'b3'
+[b3 83458c8] b3.c9
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b3.c9.t
+Switched to branch 'b4'
+[b4 49c8cda] b4.c9
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b4.c9.t
+Switched to branch 'b5'
+[b5 0ed227c] b5.c9
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b5.c9.t
+Switched to branch 'b6'
+[b6 91e9203] b6.c9
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b6.c9.t
+Switched to branch 'b7'
+[b7 5f1aa7f] b7.c9
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b7.c9.t
+Switched to branch 'b8'
+[b8 e4190b4] b8.c9
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b8.c9.t
+Switched to branch 'b1'
+[b1 431681a] b1.c10
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b1.c10.t
+Switched to branch 'b2'
+[b2 cdc2fe7] b2.c10
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b2.c10.t
+Switched to branch 'b3'
+[b3 04d742f] b3.c10
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b3.c10.t
+Switched to branch 'b4'
+[b4 a03b044] b4.c10
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b4.c10.t
+Switched to branch 'b5'
+[b5 1636ce4] b5.c10
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b5.c10.t
+Switched to branch 'b6'
+[b6 5636f71] b6.c10
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b6.c10.t
+Switched to branch 'b7'
+[b7 a986247] b7.c10
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b7.c10.t
+Switched to branch 'b8'
+[b8 3c735f4] b8.c10
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b8.c10.t
+Switched to branch 'b1'
+[b1 d2b5e73] b1.c11
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b1.c11.t
+Switched to branch 'b2'
+[b2 f9d95c1] b2.c11
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b2.c11.t
+Switched to branch 'b3'
+[b3 62a89df] b3.c11
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b3.c11.t
+Switched to branch 'b4'
+[b4 ad26868] b4.c11
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b4.c11.t
+Switched to branch 'b5'
+[b5 5a4dfb9] b5.c11
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b5.c11.t
+Switched to branch 'b6'
+[b6 dc8930a] b6.c11
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b6.c11.t
+Switched to branch 'b7'
+[b7 3b76e60] b7.c11
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b7.c11.t
+Switched to branch 'b8'
+[b8 2ba6a3d] b8.c11
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b8.c11.t
+Switched to branch 'b1'
+[b1 b8e826f] b1.c12
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b1.c12.t
+Switched to branch 'b2'
+[b2 4234dfd] b2.c12
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b2.c12.t
+Switched to branch 'b3'
+[b3 342bc7b] b3.c12
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b3.c12.t
+Switched to branch 'b4'
+[b4 108c1a4] b4.c12
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b4.c12.t
+Switched to branch 'b5'
+[b5 9a28ede] b5.c12
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b5.c12.t
+Switched to branch 'b6'
+[b6 3f5ace9] b6.c12
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b6.c12.t
+Switched to branch 'b7'
+[b7 93c4bac] b7.c12
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b7.c12.t
+Switched to branch 'b8'
+[b8 baa7561] b8.c12
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b8.c12.t
+Switched to branch 'b1'
+[b1 95bc4bb] b1.c13
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b1.c13.t
+Switched to branch 'b2'
+[b2 8489a1d] b2.c13
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b2.c13.t
+Switched to branch 'b3'
+[b3 64d34a0] b3.c13
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b3.c13.t
+Switched to branch 'b4'
+[b4 bac01a4] b4.c13
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b4.c13.t
+Switched to branch 'b5'
+[b5 e86f129] b5.c13
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b5.c13.t
+Switched to branch 'b6'
+[b6 699548c] b6.c13
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b6.c13.t
+Switched to branch 'b7'
+[b7 103bf10] b7.c13
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b7.c13.t
+Switched to branch 'b8'
+[b8 c26a4fc] b8.c13
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b8.c13.t
+Switched to branch 'b1'
+[b1 b89f649] b1.c14
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b1.c14.t
+Switched to branch 'b2'
+[b2 fe51ff5] b2.c14
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b2.c14.t
+Switched to branch 'b3'
+[b3 fc1ea38] b3.c14
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b3.c14.t
+Switched to branch 'b4'
+[b4 2b6a82d] b4.c14
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b4.c14.t
+Switched to branch 'b5'
+[b5 bd4af3f] b5.c14
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b5.c14.t
+Switched to branch 'b6'
+[b6 15633e6] b6.c14
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b6.c14.t
+Switched to branch 'b7'
+[b7 b2e9b68] b7.c14
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b7.c14.t
+Switched to branch 'b8'
+[b8 a1d75da] b8.c14
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b8.c14.t
+Switched to branch 'b1'
+[b1 5e97e7c] b1.c15
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b1.c15.t
+Switched to branch 'b2'
+[b2 1c61ed4] b2.c15
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b2.c15.t
+Switched to branch 'b3'
+[b3 19afa9a] b3.c15
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b3.c15.t
+Switched to branch 'b4'
+[b4 9c413e1] b4.c15
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b4.c15.t
+Switched to branch 'b5'
+[b5 d014f6a] b5.c15
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b5.c15.t
+Switched to branch 'b6'
+[b6 f8c4313] b6.c15
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b6.c15.t
+Switched to branch 'b7'
+[b7 682d1c2] b7.c15
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b7.c15.t
+Switched to branch 'b8'
+[b8 d06805d] b8.c15
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b8.c15.t
+Switched to branch 'b1'
+[b1 6280c6c] b1.c16
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b1.c16.t
+Switched to branch 'b2'
+[b2 54730b4] b2.c16
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b2.c16.t
+Switched to branch 'b3'
+[b3 450e72c] b3.c16
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b3.c16.t
+Switched to branch 'b4'
+[b4 1d556dd] b4.c16
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b4.c16.t
+Switched to branch 'b5'
+[b5 30d8e5b] b5.c16
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b5.c16.t
+Switched to branch 'b6'
+[b6 7b79d49] b6.c16
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b6.c16.t
+Switched to branch 'b7'
+[b7 15da705] b7.c16
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b7.c16.t
+Switched to branch 'b8'
+[b8 83492f9] b8.c16
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b8.c16.t
+Switched to branch 'b1'
+[b1 17639a0] b1.c17
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b1.c17.t
+Switched to branch 'b2'
+[b2 0e8fe67] b2.c17
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b2.c17.t
+Switched to branch 'b3'
+[b3 a33f3b9] b3.c17
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b3.c17.t
+Switched to branch 'b4'
+[b4 bf65a8f] b4.c17
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b4.c17.t
+Switched to branch 'b5'
+[b5 d9ed2b1] b5.c17
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b5.c17.t
+Switched to branch 'b6'
+[b6 48b167c] b6.c17
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b6.c17.t
+Switched to branch 'b7'
+[b7 7f5656e] b7.c17
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b7.c17.t
+Switched to branch 'b8'
+[b8 e7bb01c] b8.c17
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b8.c17.t
+Switched to branch 'b1'
+[b1 ea1e457] b1.c18
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b1.c18.t
+Switched to branch 'b2'
+[b2 611613a] b2.c18
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b2.c18.t
+Switched to branch 'b3'
+[b3 7497b4a] b3.c18
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b3.c18.t
+Switched to branch 'b4'
+[b4 b5d9485] b4.c18
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b4.c18.t
+Switched to branch 'b5'
+[b5 d9fd7d4] b5.c18
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b5.c18.t
+Switched to branch 'b6'
+[b6 f5d257d] b6.c18
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b6.c18.t
+Switched to branch 'b7'
+[b7 ca45808] b7.c18
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b7.c18.t
+Switched to branch 'b8'
+[b8 76929ae] b8.c18
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b8.c18.t
+Switched to branch 'b1'
+[b1 e3496f0] b1.c19
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b1.c19.t
+Switched to branch 'b2'
+[b2 124ff4f] b2.c19
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b2.c19.t
+Switched to branch 'b3'
+[b3 155cfe5] b3.c19
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b3.c19.t
+Switched to branch 'b4'
+[b4 29f3488] b4.c19
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b4.c19.t
+Switched to branch 'b5'
+[b5 b722512] b5.c19
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b5.c19.t
+Switched to branch 'b6'
+[b6 eb0ead1] b6.c19
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b6.c19.t
+Switched to branch 'b7'
+[b7 334d40a] b7.c19
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b7.c19.t
+Switched to branch 'b8'
+[b8 f65fc9b] b8.c19
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b8.c19.t
+warning: no common commits
+From /build/git-2.20.1/t/trash directory.t5552-skipping-fetch-negotiator/client
+ * [new branch]      b1         -> b1
+Switched to branch 'b1'
+[b1 4fc6b0b] commit-on-b1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 commit-on-b1.t
+From /build/git-2.20.1/t/trash directory.t5552-skipping-fetch-negotiator/server
+ * tag               to_fetch   -> FETCH_HEAD
+packet:        fetch< 4fc6b0b77cfa2370eb0c417e5e26e40a980884fe HEAD\0multi_ack thin-pack side-band side-band-64k ofs-delta shallow deepen-since deepen-not deepen-relative no-progress include-tag multi_ack_detailed symref=HEAD:refs/heads/b1 agent=git/2.20.1
+packet:        fetch< 4fc6b0b77cfa2370eb0c417e5e26e40a980884fe refs/heads/b1
+packet:        fetch< 184bd23dc533e1e63153e7e181411bd29acca918 refs/heads/master
+packet:        fetch< 4fc6b0b77cfa2370eb0c417e5e26e40a980884fe refs/tags/commit-on-b1
+packet:        fetch< 184bd23dc533e1e63153e7e181411bd29acca918 refs/tags/to_fetch
+packet:        fetch< 0000
+packet:        fetch> want 184bd23dc533e1e63153e7e181411bd29acca918 multi_ack_detailed side-band-64k thin-pack no-progress ofs-delta deepen-since deepen-not agent=git/2.20.1
+packet:        fetch> 0000
+packet:        fetch> have f65fc9b4d5c1cb76494a7f8df0230d8d29a33e67
+packet:        fetch> have 334d40a157dec5d93023976c30cd22b24bdc279a
+packet:        fetch> have eb0ead13281c18fd207283425897500ff37b58a0
+packet:        fetch> have b722512541a1c484f0269dbb06e0ebe809126be7
+packet:        fetch> have 29f348829e91209e05b0f7277512e3815fd33d66
+packet:        fetch> have 155cfe5fba134b2a3f290da550e227776793d1c5
+packet:        fetch> have 124ff4f891c3955a682247533ec290603f9df504
+packet:        fetch> have e3496f08debed7528bd7e4c4a12b71d1a99d697f
+packet:        fetch> have e7bb01cb25bebd0341c9d62f4c7e929a99b6ed4b
+packet:        fetch> have 7f5656e94770d527d4f909fd5e2ea274ec63177a
+packet:        fetch> have 48b167c8c363708a36d20637466781d435df923e
+packet:        fetch> have d9ed2b16325a06a2cc5061533b4935c526e4e64d
+packet:        fetch> have bf65a8f944c8cdbf9d31b2f8656b07b1f3b7daf4
+packet:        fetch> have a33f3b91e50fa0ce528590623af68f075a7d7f13
+packet:        fetch> have 0e8fe67b3355336aecfc08fdd26397774c64247a
+packet:        fetch> have 17639a004fe8511fe1de57dd9ddabf2ee0de902d
+packet:        fetch> 0000
+packet:        fetch> have a1d75daa2f482f89171f092778da506803e54531
+packet:        fetch> have b2e9b68d2650b77283421888be8a950c18bab29d
+packet:        fetch> have 15633e66d344ed5bf98eebac690942c9cb93d182
+packet:        fetch> have bd4af3f8e2999e978ad2b792b1815f78f91a81d8
+packet:        fetch> have 2b6a82df34178b75c650082ccc76cab0bc2d2537
+packet:        fetch> have fc1ea38ba267d192a042f8c6efb76b4b37a3cd59
+packet:        fetch> have fe51ff519f033bfe0b49a646f58762e393bdbd1d
+packet:        fetch> have b89f6499d7cee40ef422edb15433a10f82de0206
+packet:        fetch> have e4190b433240834c895347214d29426a094f2fe2
+packet:        fetch> have 5f1aa7f016defcf74e5e1d4991342987c9d4b447
+packet:        fetch> have 91e920349cc8fc80c282e69da054c2bfa3346e03
+packet:        fetch> have 0ed227c5105634ad47b6e4351cb4933656eb6c83
+packet:        fetch> have 49c8cda191a8dc56e3e99fe3207882c2409ecab9
+packet:        fetch> have 83458c83eb7fd3f865319fc6c6436caa2268401c
+packet:        fetch> have 770eae6e9055970583428d6c1ac289cec76525a9
+packet:        fetch> have b76868e654ce45adb9e06f638e48a72556843361
+packet:        fetch> 0000
+packet:        fetch< ACK e3496f08debed7528bd7e4c4a12b71d1a99d697f common
+packet:        fetch< ACK 17639a004fe8511fe1de57dd9ddabf2ee0de902d common
+packet:        fetch< NAK
+packet:        fetch> have 768bfc586d66909db8c6f75f809ecf54f353d2cb
+packet:        fetch> have 2414896148937fcc3df5ca53e846ebd2481945b3
+packet:        fetch> have 6b911cfac437ae1c8a0db544afef1c4dba87d26d
+packet:        fetch> have dbb467e9a5ddb4b8148e8b7f214ceed3c4e0e71a
+packet:        fetch> have 44268733d7e0371a0129a3776faa39beee58d3fe
+packet:        fetch> have 6592e0bbee4f972ca359f25206af69a9962aac1c
+packet:        fetch> have 89ecd55a5a20b633c82b7fbf2491660b45b37f5f
+packet:        fetch> have 9f605c21b07f8dd321aa26907043464e8a8eb40d
+packet:        fetch> have 063e25688044f8baf7ce6ce7bfb87ced658844c8
+packet:        fetch> have ca6bc330e163fe097fd075d037ceacbdafee00f3
+packet:        fetch> have ece05e896e3c6aaa553cb541f15203bcadc24468
+packet:        fetch> have 8bffdf81ad07c0f1bb4beaab6f4db452cc745dd6
+packet:        fetch> have 8252af32268388cf5b0de476a87325cfff99c560
+packet:        fetch> have c402344c412528d24d8381cf5cc66e6c5df54169
+packet:        fetch> done
+packet:        fetch< ACK b89f6499d7cee40ef422edb15433a10f82de0206 common
+packet:        fetch< ACK b76868e654ce45adb9e06f638e48a72556843361 common
+packet:        fetch< NAK
+packet:        fetch< ACK b76868e654ce45adb9e06f638e48a72556843361
+packet:        fetch> have e3496f08debed7528bd7e4c4a12b71d1a99d697f
+packet:        fetch> have 17639a004fe8511fe1de57dd9ddabf2ee0de902d
+packet:        fetch> have b89f6499d7cee40ef422edb15433a10f82de0206
+packet:        fetch> have b76868e654ce45adb9e06f638e48a72556843361
+packet:        fetch< ACK e3496f08debed7528bd7e4c4a12b71d1a99d697f common
+packet:        fetch< ACK 17639a004fe8511fe1de57dd9ddabf2ee0de902d common
+packet:        fetch> have 89ecd55a5a20b633c82b7fbf2491660b45b37f5f
+packet:        fetch> have c402344c412528d24d8381cf5cc66e6c5df54169
+ok 6 - do not send "have" with ancestors of commits that server ACKed
+
+# passed all 6 test(s)
+1..6
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
 *** t6012-rev-list-simplify.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6012-rev-list-simplify/.git/
 expecting success: 
@@ -215401,6 +214382,232 @@
 1..22
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
+*** t6020-merge-df.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6020-merge-df/.git/
+expecting success: 
+	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"
+
+[master (root-commit) 72b1eee] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 init
+[master e0fe3ca] 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 9000677] File: dir
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 dir
+ok 1 - prepare repository
+
+expecting success: 
+	test_expect_code 1 git merge -m "merge msg" master
+
+Merging:
+9000677 File: dir
+virtual master
+found 1 common ancestor:
+72b1eee initial
+Adding dir/foo
+Removing dir to make room for subdirectory
+
+CONFLICT (file/directory): There is a directory with name dir in master. Adding dir as dir~HEAD
+Automatic merge failed; fix conflicts and then commit the result.
+ok 2 - Merge with d/f conflicts
+
+expecting success: 
+	git reset --hard &&
+	git checkout master &&
+	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 master
+
+HEAD is now at 9000677 File: dir
+Switched to branch 'master'
+[master 7ae3a95] first
+ Author: A U Thor <author@example.com>
+ 3 files changed, 3 insertions(+)
+ create mode 100644 after
+ create mode 100644 before/one
+ create mode 100644 dir~HEAD
+[master d77b198] 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 9ef7d23] para
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 another
+Merging:
+9ef7d23 para
+virtual master
+found 1 common ancestor:
+7ae3a95 first
+Removing after to make room for subdirectory
+
+Removing after
+Merge made by the 'recursive' 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: 
+	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 'dir~HEAD'
+rm 'init'
+[modify (root-commit) 6522ef7] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 8 insertions(+)
+ create mode 100644 letters
+[modify 9c8e2eb] 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 8fbd47b] 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: 
+	git checkout delete^0 &&
+	test_must_fail git merge modify &&
+
+	test 5 -eq $(git ls-files -s | wc -l) &&
+	test 4 -eq $(git ls-files -u | wc -l) &&
+	test 1 -eq $(git ls-files -o | wc -l) &&
+
+	test -f letters/file &&
+	test -f letters.txt &&
+	test -f letters~modify
+
+Note: checking out '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 performing another checkout.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -b with the checkout command again. Example:
+
+  git checkout -b <new-branch-name>
+
+HEAD is now at 8fbd47b deleted
+Merging:
+8fbd47b deleted
+virtual modify
+found 1 common ancestor:
+6522ef7 initial
+Adding letters/file
+Auto-merging letters.txt
+CONFLICT (add/add): Merge conflict in letters.txt
+CONFLICT (modify/delete): letters deleted in HEAD and modified in modify. Version modify of letters left in tree at letters~modify.
+Automatic merge failed; fix conflicts and then commit the result.
+ok 5 - modify/delete + directory/file conflict
+
+expecting success: 
+	git reset --hard &&
+	git clean -f &&
+	git checkout modify^0 &&
+
+	test_must_fail git merge delete &&
+
+	test 5 -eq $(git ls-files -s | wc -l) &&
+	test 4 -eq $(git ls-files -u | wc -l) &&
+	test 1 -eq $(git ls-files -o | wc -l) &&
+
+	test -f letters/file &&
+	test -f letters.txt &&
+	test -f letters~HEAD
+
+warning: unable to unlink 'letters': Is a directory
+HEAD is now at 8fbd47b deleted
+Removing letters~modify
+Previous HEAD position was 8fbd47b deleted
+HEAD is now at 9c8e2eb modified
+Merging:
+9c8e2eb modified
+virtual delete
+found 1 common ancestor:
+6522ef7 initial
+Adding letters/file
+Removing letters to make room for subdirectory
+
+Auto-merging letters.txt
+CONFLICT (add/add): Merge conflict in letters.txt
+CONFLICT (modify/delete): letters deleted in delete and modified in HEAD. Version HEAD of letters left in tree at letters~HEAD.
+Automatic merge failed; fix conflicts and then commit the result.
+ok 6 - modify/delete + directory/file conflict; other way
+
+# passed all 6 test(s)
+1..6
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
 *** t6016-rev-list-graph-simplify-history.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6016-rev-list-graph-simplify-history/.git/
 expecting success: 
@@ -215724,230 +214931,143 @@
 1..12
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t6020-merge-df.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6020-merge-df/.git/
-expecting success: 
-	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"
-
-[master (root-commit) 55f7c3e] initial
+*** t6021-merge-criss-cross.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6021-merge-criss-cross/.git/
+expecting success: echo "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 &&
+echo "1
+2
+3
+4
+5
+6
+7
+8 changed in B8, branch A
+9" > file &&
+git commit -m "B8" file &&
+git checkout B &&
+echo "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 &&
+echo "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 &&
+echo "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) 69b7af5] Initial commit
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 init
-[master e57b141] File: dir/foo
+ 1 file changed, 9 insertions(+)
+ create mode 100644 file
+Switched to branch 'A'
+[A 046b5fd] B8
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 dir/foo
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 Switched to branch 'B'
-[B 03c3077] File: dir
+[B 9324a4c] C3
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 dir
-ok 1 - prepare repository
-
-expecting success: 
-	test_expect_code 1 git merge -m "merge msg" master
-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
 Merging:
-03c3077 File: dir
-virtual master
+9324a4c C3
+virtual A
 found 1 common ancestor:
-55f7c3e initial
-Adding dir/foo
-Removing dir to make room for subdirectory
-
-CONFLICT (file/directory): There is a directory with name dir in master. Adding dir as dir~HEAD
-Automatic merge failed; fix conflicts and then commit the result.
-ok 2 - Merge with d/f conflicts
-
-expecting success: 
-	git reset --hard &&
-	git checkout master &&
-	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 master
-
-HEAD is now at 03c3077 File: dir
-Switched to branch 'master'
-[master c057c23] first
- Author: A U Thor <author@example.com>
- 3 files changed, 3 insertions(+)
- create mode 100644 after
- create mode 100644 before/one
- create mode 100644 dir~HEAD
-[master 0601808] 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 52242ef] para
+69b7af5 Initial commit
+Auto-merging file
+Merge made by the 'recursive' strategy.
+ file | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[B 6e3f069] E3
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 another
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to branch 'A'
 Merging:
-52242ef para
-virtual master
+046b5fd B8
+virtual C3
 found 1 common ancestor:
-c057c23 first
-Removing after to make room for subdirectory
-
-Removing after
+69b7af5 Initial commit
+Auto-merging file
 Merge made by the 'recursive' 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: 
-	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 'dir~HEAD'
-rm 'init'
-[modify (root-commit) 23b1608] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 8 insertions(+)
- create mode 100644 letters
-[modify c8d3d69] 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 c4cd2a6] deleted
+ file | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+[A 687c8aa] D8
  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: 
-	git checkout delete^0 &&
-	test_must_fail git merge modify &&
-
-	test 5 -eq $(git ls-files -s | wc -l) &&
-	test 4 -eq $(git ls-files -u | wc -l) &&
-	test 1 -eq $(git ls-files -o | wc -l) &&
-
-	test -f letters/file &&
-	test -f letters.txt &&
-	test -f letters~modify
-
-Note: checking out '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 performing another checkout.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
-
-  git checkout -b <new-branch-name>
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+ok 1 - prepare repository
 
-HEAD is now at c4cd2a6 deleted
+expecting success: git merge -m "final merge" B
 Merging:
-c4cd2a6 deleted
-virtual modify
-found 1 common ancestor:
-23b1608 initial
-Adding letters/file
-Auto-merging letters.txt
-CONFLICT (add/add): Merge conflict in letters.txt
-CONFLICT (modify/delete): letters deleted in HEAD and modified in modify. Version modify of letters left in tree at letters~modify.
-Automatic merge failed; fix conflicts and then commit the result.
-ok 5 - modify/delete + directory/file conflict
-
-expecting success: 
-	git reset --hard &&
-	git clean -f &&
-	git checkout modify^0 &&
-
-	test_must_fail git merge delete &&
-
-	test 5 -eq $(git ls-files -s | wc -l) &&
-	test 4 -eq $(git ls-files -u | wc -l) &&
-	test 1 -eq $(git ls-files -o | wc -l) &&
-
-	test -f letters/file &&
-	test -f letters.txt &&
-	test -f letters~HEAD
+687c8aa D8
+virtual B
+found 2 common ancestors:
+9324a4c C3
+046b5fd B8
+  Merging:
+  9324a4c C3
+  046b5fd B8
+  found 1 common ancestor:
+  69b7af5 Initial commit
+  Auto-merging file
+Auto-merging file
+Merge made by the 'recursive' strategy.
+ file | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 2 - Criss-cross merge
 
-warning: unable to unlink 'letters': Is a directory
-HEAD is now at c4cd2a6 deleted
-Removing letters~modify
-Previous HEAD position was c4cd2a6 deleted
-HEAD is now at c8d3d69 modified
-Merging:
-c8d3d69 modified
-virtual delete
-found 1 common ancestor:
-23b1608 initial
-Adding letters/file
-Removing letters to make room for subdirectory
+expecting success: cmp file file-expect
+ok 3 - Criss-cross merge result
 
-Auto-merging letters.txt
-CONFLICT (add/add): Merge conflict in letters.txt
-CONFLICT (modify/delete): letters deleted in delete and modified in HEAD. Version HEAD of letters left in tree at letters~HEAD.
+expecting success: git reset --hard A^ &&
+test_must_fail git merge -s resolve -m "final merge" B
+HEAD is now at 687c8aa 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 6 - modify/delete + directory/file conflict; other way
+ok 4 - Criss-cross merge fails (-s resolve)
 
-# passed all 6 test(s)
-1..6
+# passed all 4 test(s)
+1..4
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
 *** t6019-rev-list-ancestry-path.sh ***
@@ -216163,329 +215283,1480 @@
 1..13
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t6021-merge-criss-cross.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6021-merge-criss-cross/.git/
-expecting success: echo "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 &&
-echo "1
-2
-3
-4
-5
-6
-7
-8 changed in B8, branch A
-9" > file &&
-git commit -m "B8" file &&
-git checkout B &&
-echo "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 &&
-echo "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 &&
-echo "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) b562377] Initial commit
+*** t5520-pull.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5520-pull/.git/
+expecting success: 
+	echo file >file &&
+	git add file &&
+	git commit -a -m original
+
+[master (root-commit) 69f25f2] original
  Author: A U Thor <author@example.com>
- 1 file changed, 9 insertions(+)
+ 1 file changed, 1 insertion(+)
  create mode 100644 file
-Switched to branch 'A'
-[A e93723e] B8
+ok 1 - setup
+
+expecting success: 
+	git init cloned &&
+	(
+		cd cloned &&
+		git pull ..
+	) &&
+	test -f file &&
+	test -f cloned/file &&
+	test_cmp file cloned/file
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5520-pull/cloned/.git/
+From ..
+ * branch            HEAD       -> FETCH_HEAD
+ok 2 - pulling into void
+
+expecting success: 
+	git init cloned-uho &&
+	(
+		cd cloned-uho &&
+		git pull .. master:master
+	) &&
+	test -f file &&
+	test -f cloned-uho/file &&
+	test_cmp file cloned-uho/file
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5520-pull/cloned-uho/.git/
+From ..
+ * [new branch]      master     -> master
+ok 3 - pulling into void using master:master
+
+expecting success: 
+	git init cloned-untracked &&
+	(
+		cd cloned-untracked &&
+		echo untracked >file &&
+		test_must_fail git pull .. master &&
+		echo untracked >expect &&
+		test_cmp expect file
+	)
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5520-pull/cloned-untracked/.git/
+From ..
+ * branch            master     -> FETCH_HEAD
+error: The following untracked working tree files would be overwritten by merge:
+	file
+Please move or remove them before you merge.
+Aborting
+ok 4 - pulling into void does not overwrite untracked files
+
+expecting success: 
+	git init cloned-staged-colliding &&
+	(
+		cd cloned-staged-colliding &&
+		echo "alternate content" >file &&
+		git add file &&
+		test_must_fail git pull .. master &&
+		echo "alternate content" >expect &&
+		test_cmp expect file &&
+		git cat-file blob :file >file.index &&
+		test_cmp expect file.index
+	)
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5520-pull/cloned-staged-colliding/.git/
+From ..
+ * branch            master     -> FETCH_HEAD
+error: Your local changes to the following files would be overwritten by merge:
+	file
+Please commit your changes or stash them before you merge.
+Aborting
+ok 5 - pulling into void does not overwrite staged files
+
+expecting success: 
+	git init cloned-staged-new &&
+	(
+		cd cloned-staged-new &&
+		echo "new tracked file" >newfile &&
+		git add newfile &&
+		git pull .. master &&
+		echo "new tracked file" >expect &&
+		test_cmp expect newfile &&
+		git cat-file blob :newfile >newfile.index &&
+		test_cmp expect newfile.index
+	)
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5520-pull/cloned-staged-new/.git/
+From ..
+ * branch            master     -> FETCH_HEAD
+ok 6 - pulling into void does not remove new staged files
+
+expecting success: 
+	git init cloned-octopus &&
+	(
+		cd cloned-octopus &&
+		test_must_fail git pull .. master master &&
+		! test -f file
+	)
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5520-pull/cloned-octopus/.git/
+From ..
+ * branch            master     -> FETCH_HEAD
+ * branch            master     -> FETCH_HEAD
+fatal: Cannot merge multiple branches into empty head.
+ok 7 - pulling into void must not create an octopus
+
+expecting success: 
+	git branch copy master &&
+	git config branch.copy.remote . &&
+	git config branch.copy.merge refs/heads/master &&
+	echo updated >file &&
+	git commit -a -m updated &&
+	git checkout copy &&
+	test "$(cat file)" = file &&
+	git pull &&
+	test "$(cat file)" = updated &&
+	git reflog -1 >reflog.actual &&
+	sed "s/^[0-9a-f][0-9a-f]*/OBJID/" reflog.actual >reflog.fuzzy &&
+	echo "OBJID HEAD@{0}: pull: Fast-forward" >reflog.expected &&
+	test_cmp reflog.expected reflog.fuzzy
+
+[master 1ae1460] updated
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to branch 'B'
-[B 5ed6564] C3
- Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+), 1 deletion(-)
-Merging:
-5ed6564 C3
-virtual A
-found 1 common ancestor:
-b562377 Initial commit
-Auto-merging file
-Merge made by the 'recursive' strategy.
+Switched to branch 'copy'
+Your branch is behind 'master' by 1 commit, and can be fast-forwarded.
+  (use "git pull" to update your local branch)
+From .
+ * branch            master     -> FETCH_HEAD
+Updating 69f25f2..1ae1460
+Fast-forward
  file | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
-[B 2a864ac] E3
+ok 8 - test . as a remote
+
+expecting success: 
+	git checkout -b second master^ &&
+	echo modified >file &&
+	git commit -a -m modified &&
+	git checkout copy &&
+	git reset --hard HEAD^ &&
+	test "$(cat file)" = file &&
+	git pull . second &&
+	test "$(cat file)" = modified &&
+	git reflog -1 >reflog.actual &&
+	sed "s/^[0-9a-f][0-9a-f]*/OBJID/" reflog.actual >reflog.fuzzy &&
+	echo "OBJID HEAD@{0}: pull . second: Fast-forward" >reflog.expected &&
+	test_cmp reflog.expected reflog.fuzzy
+
+Switched to a new branch 'second'
+[second b4f0101] modified
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to branch 'A'
-Merging:
-e93723e B8
-virtual C3
-found 1 common ancestor:
-b562377 Initial commit
-Auto-merging file
-Merge made by the 'recursive' strategy.
- file | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-[A 43f2fb0] D8
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 2 deletions(-)
-ok 1 - prepare repository
-
-expecting success: git merge -m "final merge" B
-Merging:
-43f2fb0 D8
-virtual B
-found 2 common ancestors:
-5ed6564 C3
-e93723e B8
-  Merging:
-  5ed6564 C3
-  e93723e B8
-  found 1 common ancestor:
-  b562377 Initial commit
-  Auto-merging file
-Auto-merging file
-Merge made by the 'recursive' strategy.
+Switched to branch 'copy'
+Your branch is up to date with 'master'.
+HEAD is now at 69f25f2 original
+From .
+ * branch            second     -> FETCH_HEAD
+Updating 69f25f2..b4f0101
+Fast-forward
  file | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
-ok 2 - Criss-cross merge
+ok 9 - the default remote . should not break explicit pull
 
-expecting success: cmp file file-expect
-ok 3 - Criss-cross merge result
+expecting success: 
+	git checkout -b test copy^ &&
+	test_when_finished "git checkout -f copy && git branch -D test" &&
+	test "$(cat file)" = file &&
+	test_must_fail git pull . "refs/nonexisting1/*:refs/nonexisting2/*" 2>err &&
+	test_i18ngrep "no candidates for merging" err &&
+	test "$(cat file)" = file
 
-expecting success: git reset --hard A^ &&
-test_must_fail git merge -s resolve -m "final merge" B
-HEAD is now at 43f2fb0 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)
+Switched to a new branch 'test'
+There are no candidates for merging among the refs that you just fetched.
+Switched to branch 'copy'
+Your branch and 'master' have diverged,
+and have 1 and 1 different commits each, respectively.
+  (use "git pull" to merge the remote branch into yours)
+Deleted branch test (was 69f25f2).
+ok 10 - fail if wildcard spec does not match any refs
 
-# passed all 4 test(s)
-1..4
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t6009-rev-list-parent.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6009-rev-list-parent/.git/
 expecting success: 
+	git remote add test_remote . &&
+	test_when_finished "git remote remove test_remote" &&
+	git checkout -b test copy^ &&
+	test_when_finished "git checkout -f copy && git branch -D test" &&
+	test "$(cat file)" = file &&
+	test_config branch.test.remote origin &&
+	test_must_fail git pull test_remote 2>err &&
+	test_i18ngrep "specify a branch on the command line" err &&
+	test "$(cat file)" = file
 
-	touch file &&
-	git add file &&
+Switched to a new branch 'test'
+for your current branch, you must specify a branch on the command line.
+Switched to branch 'copy'
+Your branch and 'master' have diverged,
+and have 1 and 1 different commits each, respectively.
+  (use "git pull" to merge the remote branch into yours)
+Deleted branch test (was 69f25f2).
+ok 11 - fail if no branches specified with non-default remote
 
-	test_commit one &&
+expecting success: 
+	git remote add origin . &&
+	test_when_finished "git remote remove origin" &&
+	git checkout HEAD^ &&
+	test_when_finished "git checkout -f copy" &&
+	test "$(cat file)" = file &&
+	test_must_fail git pull 2>err &&
+	test_i18ngrep "not currently on a branch" err &&
+	test "$(cat file)" = file
 
-	test_tick=$(($test_tick - 2400)) &&
+Note: checking out 'HEAD^'.
 
-	test_commit two &&
-	test_commit three &&
-	test_commit four &&
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by performing another checkout.
 
-	git log --pretty=oneline --abbrev-commit
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -b with the checkout command again. Example:
 
-[master (root-commit) e622cea] one
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+)
- create mode 100644 file
- create mode 100644 one.t
-[master bfa07e2] two
+  git checkout -b <new-branch-name>
+
+HEAD is now at 69f25f2 original
+You are not currently on a branch.
+Previous HEAD position was 69f25f2 original
+Switched to branch 'copy'
+Your branch and 'master' have diverged,
+and have 1 and 1 different commits each, respectively.
+  (use "git pull" to merge the remote branch into yours)
+ok 12 - fail if not on a branch
+
+expecting success: 
+	git remote add test_remote . &&
+	test_when_finished "git remote remove test_remote" &&
+	git checkout -b test copy^ &&
+	test_when_finished "git checkout -f copy && git branch -D test" &&
+	test_config branch.test.remote test_remote &&
+	test "$(cat file)" = file &&
+	test_must_fail git pull 2>err &&
+	test_i18ngrep "no tracking information" err &&
+	test "$(cat file)" = file
+
+Switched to a new branch 'test'
+There is no tracking information for the current branch.
+Switched to branch 'copy'
+Your branch and 'master' have diverged,
+and have 1 and 1 different commits each, respectively.
+  (use "git pull" to merge the remote branch into yours)
+Deleted branch test (was 69f25f2).
+ok 13 - fail if no configuration for current branch
+
+expecting success: 
+	git remote add test_remote . &&
+	test_when_finished "git remote remove test_remote" &&
+	git checkout -b test copy^ &&
+	test_when_finished "git checkout -f copy && git branch -D test" &&
+	test_config branch.test.remote test_remote &&
+	test "$(cat file)" = file &&
+	test_must_fail git pull --all 2>err &&
+	test_i18ngrep "There is no tracking information" err &&
+	test "$(cat file)" = file
+
+Switched to a new branch 'test'
+Fetching test_remote
+There is no tracking information for the current branch.
+Switched to branch 'copy'
+Your branch and 'master' have diverged,
+and have 1 and 1 different commits each, respectively.
+  (use "git pull" to merge the remote branch into yours)
+Deleted branch test (was 69f25f2).
+ok 14 - pull --all: fail if no configuration for current branch
+
+expecting success: 
+	git checkout -b test copy^ &&
+	test_when_finished "git checkout -f copy && git branch -D test" &&
+	test_config branch.test.remote . &&
+	test_config branch.test.merge refs/heads/nonexisting &&
+	test "$(cat file)" = file &&
+	test_must_fail git pull 2>err &&
+	test_i18ngrep "no such ref was fetched" err &&
+	test "$(cat file)" = file
+
+Switched to a new branch 'test'
+from the remote, but no such ref was fetched.
+Switched to branch 'copy'
+Your branch and 'master' have diverged,
+and have 1 and 1 different commits each, respectively.
+  (use "git pull" to merge the remote branch into yours)
+Deleted branch test (was 69f25f2).
+ok 15 - fail if upstream branch does not exist
+
+expecting success: 
+	git checkout -b third second^ &&
+	test_when_finished "git checkout -f copy && git branch -D third" &&
+	test "$(cat file)" = file &&
+	test_commit modified2 file &&
+	test -z "$(git ls-files -u)" &&
+	test_must_fail git pull . second &&
+	test -n "$(git ls-files -u)" &&
+	cp file expected &&
+	test_must_fail git pull . second 2>err &&
+	test_i18ngrep "Pulling is not possible because you have unmerged files." err &&
+	test_cmp expected file &&
+	git add file &&
+	test -z "$(git ls-files -u)" &&
+	test_must_fail git pull . second 2>err &&
+	test_i18ngrep "You have not concluded your merge" err &&
+	test_cmp expected file
+
+Switched to a new branch 'third'
+[third ffc6d9d] modified2
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-[master ecfa770] three
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+From .
+ * branch            second     -> FETCH_HEAD
+Merging:
+ffc6d9d modified2
+virtual b4f0101944662aadcaca8bac24527a8e6af66e39
+found 1 common ancestor:
+69f25f2 original
+Auto-merging file
+CONFLICT (content): Merge conflict in file
+Automatic merge failed; fix conflicts and then commit the result.
+error: Pulling is not possible because you have unmerged files.
+error: You have not concluded your merge (MERGE_HEAD exists).
+Switched to branch 'copy'
+Your branch and 'master' have diverged,
+and have 1 and 1 different commits each, respectively.
+  (use "git pull" to merge the remote branch into yours)
+Deleted branch third (was ffc6d9d).
+ok 16 - fail if the index has unresolved entries
+
+expecting success: 
+	git checkout -b third second^ &&
+	test_when_finished "git checkout -f copy && git branch -D third" &&
+	test "$(cat file)" = file &&
+	git pull . second:third 2>err &&
+	test_i18ngrep "fetch updated the current branch head" err &&
+	test "$(cat file)" = modified &&
+	test "$(git rev-parse third)" = "$(git rev-parse second)"
+
+Switched to a new branch 'third'
+Already up to date.
+warning: fetch updated the current branch head.
+Switched to branch 'copy'
+Your branch and 'master' have diverged,
+and have 1 and 1 different commits each, respectively.
+  (use "git pull" to merge the remote branch into yours)
+Deleted branch third (was b4f0101).
+ok 17 - fast-forwards working tree if branch head is updated
+
+expecting success: 
+	git checkout -b third second^ &&
+	test_when_finished "git checkout -f copy && git branch -D third" &&
+	test "$(cat file)" = file &&
+	echo conflict >file &&
+	test_must_fail git pull . second:third 2>err &&
+	test_i18ngrep "Cannot fast-forward your working tree" err &&
+	test "$(cat file)" = conflict &&
+	test "$(git rev-parse third)" = "$(git rev-parse second)"
+
+Switched to a new branch 'third'
+fatal: Cannot fast-forward your working tree.
+Switched to branch 'copy'
+Your branch and 'master' have diverged,
+and have 1 and 1 different commits each, respectively.
+  (use "git pull" to merge the remote branch into yours)
+Deleted branch third (was b4f0101).
+ok 18 - fast-forward fails with conflicting work tree
+
+expecting success: 
+	git branch to-rebase &&
+	echo modified again > file &&
+	git commit -m file file &&
+	git checkout to-rebase &&
+	echo new > file2 &&
+	git add file2 &&
+	git commit -m "new file" &&
+	git tag before-rebase &&
+	git pull --rebase . copy &&
+	test "$(git rev-parse HEAD^)" = "$(git rev-parse copy)" &&
+	test new = "$(git show HEAD:file2)"
+
+[copy 645eaec] file
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 three.t
-[master 0906875] four
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to branch 'to-rebase'
+[to-rebase 573d428] new file
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 four.t
-0906875 four
-ecfa770 three
-bfa07e2 two
-e622cea one
-ok 1 - setup
+ create mode 100644 file2
+From .
+ * branch            copy       -> FETCH_HEAD
+First, rewinding head to replay your work on top of it...
+Applying: new file
+ok 19 - --rebase
 
 expecting success: 
+	git reset --hard before-rebase &&
+	git checkout -b ff &&
+	echo another modification >file &&
+	git commit -m third file &&
 
-	git rev-list one --not four >result &&
-	test_must_be_empty result
+	git checkout to-rebase &&
+	git pull --rebase . ff &&
+	test "$(git rev-parse HEAD)" = "$(git rev-parse ff)" &&
 
+	# The above only validates the result.  Did we actually bypass rebase?
+	git reflog -1 >reflog.actual &&
+	sed "s/^[0-9a-f][0-9a-f]*/OBJID/" reflog.actual >reflog.fuzzy &&
+	echo "OBJID HEAD@{0}: pull --rebase . ff: Fast-forward" >reflog.expected &&
+	test_cmp reflog.expected reflog.fuzzy
 
-ok 2 - one is ancestor of others and should not be shown
+HEAD is now at 573d428 new file
+Switched to a new branch 'ff'
+[ff d68db0b] third
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to branch 'to-rebase'
+From .
+ * branch            ff         -> FETCH_HEAD
+Updating 573d428..d68db0b
+Fast-forward
+ file | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Current branch to-rebase is up to date.
+ok 20 - --rebase fast forward
 
 expecting success: 
+	test_when_finished "
+		git reset --hard
+		git checkout to-rebase
+		git branch -D to-rebase-ff
+		git branch -D behind" &&
+	git branch behind &&
+	git checkout -b to-rebase-ff &&
+	echo another modification >>file &&
+	git add file &&
+	git commit -m mod &&
 
-	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 master &&
+	git checkout behind &&
+	echo dirty >file &&
+	git pull --rebase --autostash . to-rebase-ff &&
+	test "$(git rev-parse HEAD)" = "$(git rev-parse to-rebase-ff)"
+
+Switched to a new branch 'to-rebase-ff'
+[to-rebase-ff 29040d0] mod
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Switched to branch 'behind'
+From .
+ * branch            to-rebase-ff -> FETCH_HEAD
+Created autostash: ade9035
+HEAD is now at d68db0b third
+First, rewinding head to replay your work on top of it...
+Fast-forwarded behind to 29040d0f250d988787b9d7c57ca398f358a6b805.
+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.
+HEAD is now at 29040d0 mod
+Switched to branch 'to-rebase'
+Deleted branch to-rebase-ff (was 29040d0).
+Deleted branch behind (was 29040d0).
+ok 21 - --rebase --autostash fast forward
+
+expecting success: 
+	test_when_finished "git rebase --abort; git checkout -f to-rebase" &&
+	git checkout -b seq &&
+	test_seq 5 >seq.txt &&
+	git add seq.txt &&
 	test_tick &&
-	git merge --allow-unrelated-histories -m normalmerge newroot &&
-	git tag normalmerge &&
+	git commit -m "Add seq.txt" &&
+	echo 6 >>seq.txt &&
 	test_tick &&
-	git merge -m tripus sidebranch anotherbranch &&
-	git tag tripus &&
-	git checkout -b tetrabranch normalmerge &&
+	git commit -m "Append to seq.txt" seq.txt &&
+	git checkout -b with-conflicts HEAD^ &&
+	echo conflicting >>seq.txt &&
 	test_tick &&
-	git merge -m tetrapus sidebranch anotherbranch yetanotherbranch &&
-	git tag tetrapus &&
-	git checkout master
+	git commit -m "Create conflict" seq.txt &&
+	test_must_fail git pull --rebase . seq 2>err >out &&
+	test_i18ngrep "Resolve all conflicts manually" out
 
-Switched to a new branch 'newroot'
-[newroot (root-commit) 04238a1] five
+Switched to a new branch 'seq'
+[seq b21b7f6] Add seq.txt
  Author: A U Thor <author@example.com>
- 6 files changed, 5 insertions(+)
- create mode 100644 file
- create mode 100644 five.t
- create mode 100644 four.t
- create mode 100644 one.t
- create mode 100644 three.t
- create mode 100644 two.t
-Switched to a new branch 'sidebranch'
-[sidebranch e29a44f] six
+ 1 file changed, 5 insertions(+)
+ create mode 100644 seq.txt
+[seq 7c9529f] Append to seq.txt
  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
+Switched to a new branch 'with-conflicts'
+[with-conflicts b8eb96a] Create conflict
  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
+Resolve all conflicts manually, mark them as resolved with
+Switched to branch 'to-rebase'
+ok 22 - --rebase with conflicts shows advice
+
+expecting success: 
+	test_when_finished "git rebase --abort; git checkout -f to-rebase" &&
+	git checkout -b diverging &&
+	test_commit attributes .gitattributes "* text=auto" attrs &&
+	sha1="$(printf "1\\r\\n" | git hash-object -w --stdin)" &&
+	git update-index --cacheinfo 0644 $sha1 file &&
+	git commit -m v1-with-cr &&
+	# force checkout because `git reset --hard` will not leave clean `file`
+	git checkout -f -b fails-to-rebase HEAD^ &&
+	test_commit v2-without-cr file "2" file2-lf &&
+	test_must_fail git pull --rebase . diverging 2>err >out &&
+	test_i18ngrep "Resolve all conflicts manually" out
+
+Switched to a new branch 'diverging'
+[diverging b7c266b] attributes
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 eight.t
-Switched to branch 'master'
-Merging:
-0906875 four
-virtual newroot
-found 0 common ancestors:
-Merge made by the 'recursive' strategy.
- five.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 five.t
-Trying simple merge with sidebranch
-Trying simple merge with anotherbranch
-Merge made by the 'octopus' strategy.
- seven.t | 1 +
- six.t   | 1 +
- 2 files changed, 2 insertions(+)
- create mode 100644 seven.t
- create mode 100644 six.t
-Switched to a new branch 'tetrabranch'
-Trying simple merge with sidebranch
-Trying simple merge with anotherbranch
-Trying simple merge with yetanotherbranch
-Merge made by the 'octopus' strategy.
- eight.t | 1 +
- seven.t | 1 +
- six.t   | 1 +
- 3 files changed, 3 insertions(+)
- create mode 100644 eight.t
- create mode 100644 seven.t
- create mode 100644 six.t
-Switched to branch 'master'
-ok 3 - setup roots, merges and octopuses
+ create mode 100644 .gitattributes
+[diverging bd8e90d] v1-with-cr
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'fails-to-rebase'
+[fails-to-rebase ccd8bbb] v2-without-cr
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Resolve all conflicts manually, mark them as resolved with
+Switched to branch 'to-rebase'
+ok 23 - failed --rebase shows advice
 
 expecting success: 
+	git reset --hard before-rebase &&
+	test_must_fail git pull --rebase . copy master 2>err &&
+	test "$(git rev-parse HEAD)" = "$(git rev-parse before-rebase)" &&
+	test_i18ngrep "Cannot rebase onto multiple branches" err &&
+	test modified = "$(git show HEAD:file)"
 
-	check_revlist "--max-parents=0" one five
-
-ok 4 - rev-list roots
+HEAD is now at 573d428 new file
+fatal: Cannot rebase onto multiple branches.
+ok 24 - --rebase fails with multiple branches
 
 expecting success: 
+	test_config rebase.autostash true &&
+	test_pull_autostash --rebase
 
-	check_revlist "--max-parents=1" one eight seven six five four three two &&
-	check_revlist "--no-merges" one eight seven six five four three two
-
-ok 5 - rev-list no merges
+HEAD is now at 573d428 new file
+From .
+ * branch            copy       -> FETCH_HEAD
+Created autostash: b8a6a85
+HEAD is now at 573d428 new file
+First, rewinding head to replay your work on top of it...
+Applying: new file
+Applied autostash.
+ok 25 - pull --rebase succeeds with dirty working directory and rebase.autostash set
 
 expecting success: 
+	test_config rebase.autostash true &&
+	test_pull_autostash --rebase --autostash
 
-	check_revlist "--max-parents=2" one normalmerge eight seven six five four three two
-
-ok 6 - rev-list no octopuses
+HEAD is now at 573d428 new file
+From .
+ * branch            copy       -> FETCH_HEAD
+Created autostash: b8a6a85
+HEAD is now at 573d428 new file
+First, rewinding head to replay your work on top of it...
+Applying: new file
+Applied autostash.
+ok 26 - pull --rebase --autostash & rebase.autostash=true
 
 expecting success: 
+	test_config rebase.autostash false &&
+	test_pull_autostash --rebase --autostash
 
-	check_revlist "--min-parents=1" tetrapus tripus normalmerge eight seven six four three two
-
-ok 7 - rev-list no roots
+HEAD is now at 573d428 new file
+From .
+ * branch            copy       -> FETCH_HEAD
+Created autostash: b8a6a85
+HEAD is now at 573d428 new file
+First, rewinding head to replay your work on top of it...
+Applying: new file
+Applied autostash.
+ok 27 - pull --rebase --autostash & rebase.autostash=false
 
 expecting success: 
+	test_unconfig rebase.autostash &&
+	test_pull_autostash --rebase --autostash
 
-	check_revlist "--min-parents=2" tetrapus tripus normalmerge &&
-	check_revlist "--merges" tetrapus tripus normalmerge
-
-ok 8 - rev-list merges
+HEAD is now at 573d428 new file
+From .
+ * branch            copy       -> FETCH_HEAD
+Created autostash: b8a6a85
+HEAD is now at 573d428 new file
+First, rewinding head to replay your work on top of it...
+Applying: new file
+Applied autostash.
+ok 28 - pull --rebase --autostash & rebase.autostash unset
 
 expecting success: 
+	test_config rebase.autostash true &&
+	test_pull_autostash_fail --rebase --no-autostash
 
-	check_revlist "--min-parents=3" tetrapus tripus
-
-ok 9 - rev-list octopus
+HEAD is now at 573d428 new file
+error: cannot pull with rebase: Your index contains uncommitted changes.
+ok 29 - pull --rebase --no-autostash & rebase.autostash=true
 
 expecting success: 
+	test_config rebase.autostash false &&
+	test_pull_autostash_fail --rebase --no-autostash
 
-	check_revlist "--min-parents=1 --max-parents=1" eight seven six four three two
-
-ok 10 - rev-list ordinary commits
+HEAD is now at 573d428 new file
+error: cannot pull with rebase: Your index contains uncommitted changes.
+ok 30 - pull --rebase --no-autostash & rebase.autostash=false
 
 expecting success: 
+	test_unconfig rebase.autostash &&
+	test_pull_autostash_fail --rebase --no-autostash
 
-	check_revlist "--min-parents=2 --no-merges" &&
-	check_revlist "--merges --no-merges" &&
-	check_revlist "--no-merges --merges"
-
-ok 11 - rev-list --merges --no-merges yields empty set
+HEAD is now at 573d428 new file
+error: cannot pull with rebase: Your index contains uncommitted changes.
+ok 31 - pull --rebase --no-autostash & rebase.autostash unset
 
 expecting success: 
+		test_must_fail git pull $i . copy 2>err &&
+		test_i18ngrep "only valid with --rebase" err
+	
+fatal: --[no-]autostash option is only valid with --rebase.
+ok 32 - pull --autostash (without --rebase) is illegal
 
-	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 &&
+expecting success: 
+		test_must_fail git pull $i . copy 2>err &&
+		test_i18ngrep "only valid with --rebase" err
+	
+fatal: --[no-]autostash option is only valid with --rebase.
+ok 33 - pull --no-autostash (without --rebase) is illegal
+
+expecting success: 
+	git reset --hard before-rebase &&
+	test_config pull.rebase true &&
+	git pull . copy &&
+	test "$(git rev-parse HEAD^)" = "$(git rev-parse copy)" &&
+	test new = "$(git show HEAD:file2)"
+
+HEAD is now at 573d428 new file
+From .
+ * branch            copy       -> FETCH_HEAD
+First, rewinding head to replay your work on top of it...
+Applying: new file
+ok 34 - pull.rebase
+
+expecting success: 
+	test_config pull.rebase true &&
+	test_pull_autostash --autostash
+
+HEAD is now at 573d428 new file
+From .
+ * branch            copy       -> FETCH_HEAD
+Created autostash: b8a6a85
+HEAD is now at 573d428 new file
+First, rewinding head to replay your work on top of it...
+Applying: new file
+Applied autostash.
+ok 35 - pull --autostash & pull.rebase=true
+
+expecting success: 
+	test_config pull.rebase true &&
+	test_pull_autostash_fail --no-autostash
+
+HEAD is now at 573d428 new file
+error: cannot pull with rebase: Your index contains uncommitted changes.
+ok 36 - pull --no-autostash & pull.rebase=true
+
+expecting success: 
+	git reset --hard before-rebase &&
+	test_config branch.to-rebase.rebase true &&
+	git pull . copy &&
+	test "$(git rev-parse HEAD^)" = "$(git rev-parse copy)" &&
+	test new = "$(git show HEAD:file2)"
+
+HEAD is now at 573d428 new file
+From .
+ * branch            copy       -> FETCH_HEAD
+First, rewinding head to replay your work on top of it...
+Applying: new file
+ok 37 - branch.to-rebase.rebase
+
+expecting success: 
+	git reset --hard before-rebase &&
+	test_config pull.rebase true &&
+	test_config branch.to-rebase.rebase false &&
+	git pull . copy &&
+	test "$(git rev-parse HEAD^)" != "$(git rev-parse copy)" &&
+	test new = "$(git show HEAD:file2)"
+
+HEAD is now at 573d428 new file
+From .
+ * branch            copy       -> FETCH_HEAD
+Merging:
+573d428 new file
+virtual 645eaec0dd86ff6387097317ae02eb7a7feabbcf
+found 1 common ancestor:
+b4f0101 modified
+Merge made by the 'recursive' strategy.
+ file | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 38 - branch.to-rebase.rebase should override pull.rebase
+
+expecting success: 
+	git reset --hard before-rebase &&
+	git pull --rebase --verify-signatures . copy 2>err &&
+	test "$(git rev-parse HEAD^)" = "$(git rev-parse copy)" &&
+	test new = "$(git show HEAD:file2)" &&
+	test_i18ngrep "ignoring --verify-signatures for rebase" err
+
+HEAD is now at 573d428 new file
+First, rewinding head to replay your work on top of it...
+Applying: new file
+warning: ignoring --verify-signatures for rebase
+ok 39 - pull --rebase warns on --verify-signatures
+
+expecting success: 
+	git reset --hard before-rebase &&
+	git pull --rebase --no-verify-signatures . copy 2>err &&
+	test "$(git rev-parse HEAD^)" = "$(git rev-parse copy)" &&
+	test new = "$(git show HEAD:file2)" &&
+	test_i18ngrep ! "verify-signatures" err
+
+HEAD is now at 573d428 new file
+First, rewinding head to replay your work on top of it...
+Applying: new file
+ok 40 - pull --rebase does not warn on --no-verify-signatures
+
+expecting success: 
+	git reset --hard before-rebase &&
+	git checkout -b keep-merge second^ &&
+	test_commit file3 &&
+	git checkout to-rebase &&
+	git merge keep-merge &&
+	git tag before-preserve-rebase
+
+HEAD is now at 573d428 new file
+Switched to a new branch 'keep-merge'
+[keep-merge 2af40f6] file3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file3.t
+Switched to branch 'to-rebase'
+Merging:
+573d428 new file
+virtual keep-merge
+found 1 common ancestor:
+69f25f2 original
+Merge made by the 'recursive' strategy.
+ file3.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file3.t
+ok 41 - preserve merge setup
+
+expecting success: 
+	git reset --hard before-preserve-rebase &&
+	test_config pull.rebase false &&
+	git pull . copy &&
+	test "$(git rev-parse HEAD^1)" = "$(git rev-parse before-preserve-rebase)" &&
+	test "$(git rev-parse HEAD^2)" = "$(git rev-parse copy)" &&
+	test file3 = "$(git show HEAD:file3.t)"
+
+HEAD is now at 123acf6 Merge branch 'keep-merge' into to-rebase
+From .
+ * branch            copy       -> FETCH_HEAD
+Merging:
+123acf6 Merge branch 'keep-merge' into to-rebase
+virtual 645eaec0dd86ff6387097317ae02eb7a7feabbcf
+found 1 common ancestor:
+b4f0101 modified
+Merge made by the 'recursive' strategy.
+ file | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 42 - pull.rebase=false create a new merge commit
+
+expecting success: 
+	git reset --hard before-preserve-rebase &&
+	test_config pull.rebase true &&
+	git pull . copy &&
+	test "$(git rev-parse HEAD^^)" = "$(git rev-parse copy)" &&
+	test file3 = "$(git show HEAD:file3.t)"
+
+HEAD is now at 123acf6 Merge branch 'keep-merge' into to-rebase
+From .
+ * branch            copy       -> FETCH_HEAD
+First, rewinding head to replay your work on top of it...
+Applying: new file
+Applying: file3
+ok 43 - pull.rebase=true flattens keep-merge
+
+expecting success: 
+	git reset --hard before-preserve-rebase &&
+	test_config pull.rebase 1 &&
+	git pull . copy &&
+	test "$(git rev-parse HEAD^^)" = "$(git rev-parse copy)" &&
+	test file3 = "$(git show HEAD:file3.t)"
+
+HEAD is now at 123acf6 Merge branch 'keep-merge' into to-rebase
+From .
+ * branch            copy       -> FETCH_HEAD
+First, rewinding head to replay your work on top of it...
+Applying: new file
+Applying: file3
+ok 44 - pull.rebase=1 is treated as true and flattens keep-merge
+
+checking prerequisite: REBASE_P
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
+	test -z "$GIT_TEST_SKIP_REBASE_P"
+
+)
+prerequisite REBASE_P ok
+expecting success: 
+	git reset --hard before-preserve-rebase &&
+	test_config pull.rebase preserve &&
+	git pull . copy &&
+	test "$(git rev-parse HEAD^^)" = "$(git rev-parse copy)" &&
+	test "$(git rev-parse HEAD^2)" = "$(git rev-parse keep-merge)"
+
+HEAD is now at 123acf6 Merge branch 'keep-merge' into to-rebase
+From .
+ * branch            copy       -> FETCH_HEAD
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/to-rebase.
+ok 45 - pull.rebase=preserve rebases and merges keep-merge
+
+expecting success: 
+	write_script "$TRASH_DIRECTORY/fake-editor" <<-\EOF &&
+	echo I was here >fake.out &&
+	false
+	EOF
+	test_set_editor "$TRASH_DIRECTORY/fake-editor" &&
+	test_when_finished "test_might_fail git rebase --abort" &&
+	test_must_fail git pull --rebase=interactive . copy &&
+	test "I was here" = "$(cat fake.out)"
+
+From .
+ * branch            copy       -> FETCH_HEAD
+error: There was a problem with the editor '"$FAKE_EDITOR"'.
+fatal: No rebase in progress?
+ok 46 - pull.rebase=interactive
+
+expecting success: 
+	write_script "$TRASH_DIRECTORY/fake-editor" <<-\EOF &&
+	echo I was here, too >fake.out &&
+	false
+	EOF
+	test_set_editor "$TRASH_DIRECTORY/fake-editor" &&
+	test_when_finished "test_might_fail git rebase --abort" &&
+	test_must_fail git pull --rebase=i . copy &&
+	test "I was here, too" = "$(cat fake.out)"
+
+From .
+ * branch            copy       -> FETCH_HEAD
+error: There was a problem with the editor '"$FAKE_EDITOR"'.
+fatal: No rebase in progress?
+ok 47 - pull --rebase=i
+
+expecting success: 
+	git reset --hard before-preserve-rebase &&
+	test_config pull.rebase invalid &&
+	! git pull . copy
+
+HEAD is now at 123acf6 Merge branch 'keep-merge' into to-rebase
+fatal: Invalid value for pull.rebase: invalid
+ok 48 - pull.rebase=invalid fails
+
+expecting success: 
+	git reset --hard before-preserve-rebase &&
+	test_config pull.rebase true &&
+	git pull --rebase=false . copy &&
+	test "$(git rev-parse HEAD^1)" = "$(git rev-parse before-preserve-rebase)" &&
+	test "$(git rev-parse HEAD^2)" = "$(git rev-parse copy)" &&
+	test file3 = "$(git show HEAD:file3.t)"
+
+HEAD is now at 123acf6 Merge branch 'keep-merge' into to-rebase
+From .
+ * branch            copy       -> FETCH_HEAD
+Merging:
+123acf6 Merge branch 'keep-merge' into to-rebase
+virtual 645eaec0dd86ff6387097317ae02eb7a7feabbcf
+found 1 common ancestor:
+b4f0101 modified
+Merge made by the 'recursive' strategy.
+ file | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 49 - --rebase=false create a new merge commit
+
+expecting success: 
+	git reset --hard before-preserve-rebase &&
+	test_config pull.rebase preserve &&
+	git pull --rebase=true . copy &&
+	test "$(git rev-parse HEAD^^)" = "$(git rev-parse copy)" &&
+	test file3 = "$(git show HEAD:file3.t)"
+
+HEAD is now at 123acf6 Merge branch 'keep-merge' into to-rebase
+From .
+ * branch            copy       -> FETCH_HEAD
+First, rewinding head to replay your work on top of it...
+Applying: new file
+Applying: file3
+ok 50 - --rebase=true rebases and flattens keep-merge
+
+expecting success: 
+	git reset --hard before-preserve-rebase &&
+	test_config pull.rebase true &&
+	git pull --rebase=preserve . copy &&
+	test "$(git rev-parse HEAD^^)" = "$(git rev-parse copy)" &&
+	test "$(git rev-parse HEAD^2)" = "$(git rev-parse keep-merge)"
+
+HEAD is now at 123acf6 Merge branch 'keep-merge' into to-rebase
+From .
+ * branch            copy       -> FETCH_HEAD
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/to-rebase.
+ok 51 - --rebase=preserve rebases and merges keep-merge
+
+expecting success: 
+	git reset --hard before-preserve-rebase &&
+	! git pull --rebase=invalid . copy
+
+HEAD is now at 123acf6 Merge branch 'keep-merge' into to-rebase
+error: Invalid value for --rebase: invalid
+ok 52 - --rebase=invalid fails
+
+expecting success: 
+	git reset --hard before-preserve-rebase &&
+	test_config pull.rebase preserve &&
+	git pull --rebase . copy &&
+	test "$(git rev-parse HEAD^^)" = "$(git rev-parse copy)" &&
+	test file3 = "$(git show HEAD:file3.t)"
+
+HEAD is now at 123acf6 Merge branch 'keep-merge' into to-rebase
+From .
+ * branch            copy       -> FETCH_HEAD
+First, rewinding head to replay your work on top of it...
+Applying: new file
+Applying: file3
+ok 53 - --rebase overrides pull.rebase=preserve and flattens keep-merge
+
+expecting success: 
+
+	git remote add -f me . &&
+	git checkout copy &&
+	git tag copy-orig &&
+	git reset --hard HEAD^ &&
+	echo conflicting modification > file &&
+	git commit -m conflict file &&
+	git checkout to-rebase &&
+	echo file > file2 &&
+	git commit -m to-rebase file2 &&
+	git tag to-rebase-orig &&
+	git pull --rebase me copy &&
+	test "conflicting modification" = "$(cat file)" &&
+	test file = "$(cat file2)"
+
+
+Updating me
+From .
+ * [new branch]      copy            -> me/copy
+ * [new branch]      diverging       -> me/diverging
+ * [new branch]      fails-to-rebase -> me/fails-to-rebase
+ * [new branch]      ff              -> me/ff
+ * [new branch]      keep-merge      -> me/keep-merge
+ * [new branch]      master          -> me/master
+ * [new branch]      second          -> me/second
+ * [new branch]      seq             -> me/seq
+ * [new branch]      to-rebase       -> me/to-rebase
+ * [new branch]      with-conflicts  -> me/with-conflicts
+Switched to branch 'copy'
+Your branch and 'master' have diverged,
+and have 2 and 1 different commits each, respectively.
+  (use "git pull" to merge the remote branch into yours)
+HEAD is now at b4f0101 modified
+[copy a0d2beb] conflict
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to branch 'to-rebase'
+[to-rebase 03b6ee0] to-rebase
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+From .
+ * branch            copy       -> FETCH_HEAD
+ + 645eaec...a0d2beb copy       -> me/copy  (forced update)
+First, rewinding head to replay your work on top of it...
+Applying: new file
+Applying: file3
+Applying: to-rebase
+ok 54 - --rebase with rebased upstream
+
+expecting success: 
+	test_when_finished "test_might_fail git rebase --abort" &&
+	git reset --hard to-rebase-orig &&
+	git pull --rebase -f me copy &&
+	test "conflicting modification" = "$(cat file)" &&
+	test file = "$(cat file2)"
+
+HEAD is now at 03b6ee0 to-rebase
+From .
+ * branch            copy       -> FETCH_HEAD
+First, rewinding head to replay your work on top of it...
+Applying: new file
+Applying: file3
+Applying: to-rebase
+fatal: No rebase in progress?
+ok 55 - --rebase -f with rebased upstream
+
+expecting success: 
+
+	git update-ref refs/remotes/me/copy copy-orig &&
+	git checkout --track -b to-rebase2 me/copy &&
+	git reset --hard to-rebase-orig &&
+	git pull --rebase &&
+	test "conflicting modification" = "$(cat file)" &&
+	test file = "$(cat file2)"
+
+
+Switched to a new branch 'to-rebase2'
+Branch 'to-rebase2' set up to track remote branch 'copy' from 'me'.
+HEAD is now at 03b6ee0 to-rebase
+From .
+ + 645eaec...a0d2beb copy       -> me/copy  (forced update)
+ + 5963ff0...af6c117 to-rebase  -> me/to-rebase  (forced update)
+ * [new branch]      to-rebase2 -> me/to-rebase2
+First, rewinding head to replay your work on top of it...
+Applying: new file
+Applying: file3
+Applying: to-rebase
+ok 56 - --rebase with rebased default upstream
+
+expecting success: 
+
+	git update-ref refs/remotes/me/copy copy-orig &&
+	git reset --hard to-rebase-orig &&
+	git checkout --track -b to-rebase3 me/copy &&
+	git reset --hard to-rebase-orig &&
+	git fetch &&
+	git pull --rebase &&
+	test "conflicting modification" = "$(cat file)" &&
+	test file = "$(cat file2)"
+
+
+HEAD is now at 03b6ee0 to-rebase
+Switched to a new branch 'to-rebase3'
+Branch 'to-rebase3' set up to track remote branch 'copy' from 'me'.
+HEAD is now at 03b6ee0 to-rebase
+From .
+ + 645eaec...a0d2beb copy       -> me/copy  (forced update)
+ * [new branch]      to-rebase3 -> me/to-rebase3
+First, rewinding head to replay your work on top of it...
+Applying: new file
+Applying: file3
+Applying: to-rebase
+ok 57 - rebased upstream + fetch + pull --rebase
+
+expecting success: 
+
+	git checkout to-rebase &&
+	git update-ref refs/remotes/me/copy copy^ &&
+	COPY="$(git rev-parse --verify me/copy)" &&
+	git rebase --onto $COPY copy &&
+	test_config branch.to-rebase.remote me &&
+	test_config branch.to-rebase.merge refs/heads/copy &&
+	test_config branch.to-rebase.rebase true &&
+	echo dirty >> file &&
+	git add file &&
+	test_must_fail git pull &&
+	test "$COPY" = "$(git rev-parse --verify me/copy)" &&
+	git checkout HEAD -- file &&
+	git pull &&
+	test "$COPY" != "$(git rev-parse --verify me/copy)"
+
+
+Switched to branch 'to-rebase'
+First, rewinding head to replay your work on top of it...
+Applying: new file
+Applying: file3
+Applying: to-rebase
+error: cannot pull with rebase: Your index contains uncommitted changes.
+error: please commit or stash them.
+From .
+   b4f0101..a0d2beb  copy       -> me/copy
+ + af6c117...d4a115d to-rebase  -> me/to-rebase  (forced update)
+ + 03b6ee0...af6c117 to-rebase3 -> me/to-rebase3  (forced update)
+First, rewinding head to replay your work on top of it...
+Applying: new file
+Applying: file3
+Applying: to-rebase
+ok 58 - pull --rebase dies early with dirty working directory
+
+expecting success: 
+	git rev-parse master >expect &&
+	mkdir empty_repo &&
+	(cd empty_repo &&
+	 git init &&
+	 git pull --rebase .. master &&
+	 git rev-parse HEAD >../actual
+	) &&
+	test_cmp expect actual
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5520-pull/empty_repo/.git/
+From ..
+ * branch            master     -> FETCH_HEAD
+ok 59 - pull --rebase works on branch yet to be born
+
+expecting success: 
+	test_when_finished "rm -rf empty_repo2" &&
+	git init empty_repo2 &&
+	(
+		cd empty_repo2 &&
+		echo staged-file >staged-file &&
+		git add staged-file &&
+		test "$(git ls-files)" = staged-file &&
+		test_must_fail git pull --rebase .. master 2>err &&
+		test "$(git ls-files)" = staged-file &&
+		test "$(git show :staged-file)" = staged-file &&
+		test_i18ngrep "unborn branch with changes added to the index" err
+	)
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5520-pull/empty_repo2/.git/
+fatal: Updating an unborn branch with changes added to the index.
+ok 60 - pull --rebase fails on unborn branch with staged changes
+
+expecting success: 
+	test_when_finished "rm -rf corrupt" &&
+	git init corrupt &&
+	(
+		cd corrupt &&
+		test_commit one &&
+		obj=$(git rev-parse --verify HEAD | sed "s#^..#&/#") &&
+		rm -f .git/objects/$obj &&
+		test_must_fail git pull --rebase
+	)
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5520-pull/corrupt/.git/
+[master (root-commit) d944c64] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+error: cannot pull with rebase: Your index contains uncommitted changes.
+error: please commit or stash them.
+ok 61 - pull --rebase fails on corrupt HEAD
+
+expecting success: 
+	mkdir src &&
+	(cd src &&
+	 git init &&
+	 printf "1\n2\n3\n4\n5\n6\n7\n8\n9\n10\n" > stuff &&
+	 git add stuff &&
+	 git commit -m "Initial revision"
+	) &&
+	git clone src dst &&
+	(cd src &&
+	 modify s/5/43/ stuff &&
+	 git commit -a -m "5->43" &&
+	 modify s/6/42/ stuff &&
+	 git commit -a -m "Make it bigger"
+	) &&
+	(cd dst &&
+	 modify s/5/43/ stuff &&
+	 git commit -a -m "Independent discovery of 5->43"
+	)
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5520-pull/src/.git/
+[master (root-commit) bd1c84a] Initial revision
+ Author: A U Thor <author@example.com>
+ 1 file changed, 10 insertions(+)
+ create mode 100644 stuff
+Cloning into 'dst'...
+done.
+[master c0a2a33] 5->43
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[master 5004a46] Make it bigger
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[master 60bf00b] Independent discovery of 5->43
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 62 - setup for detecting upstreamed changes
+
+expecting success: 
+	(cd dst &&
+	 git pull --rebase &&
+	 test -z "$(git ls-files -u)"
+	)
+
+From /build/git-2.20.1/t/trash directory.t5520-pull/src
+   bd1c84a..5004a46  master     -> origin/master
+First, rewinding head to replay your work on top of it...
+ok 63 - git pull --rebase detects upstreamed changes
+
+expecting success: 
+	(cd dst &&
+	 test_might_fail git rebase --abort &&
+	 git reset --hard origin/master
+	) &&
+	git clone --bare src src-replace.git &&
+	rm -rf src &&
+	mv src-replace.git src &&
+	(cd dst &&
+	 modify s/2/22/ stuff &&
+	 git commit -a -m "Change 2" &&
+	 modify s/3/33/ stuff &&
+	 git commit -a -m "Change 3" &&
+	 modify s/4/44/ stuff &&
+	 git commit -a -m "Change 4" &&
+	 git push &&
+
+	 modify s/44/55/ stuff &&
+	 git commit --amend -a -m "Modified Change 4"
+	)
+
+fatal: No rebase in progress?
+HEAD is now at 5004a46 Make it bigger
+Cloning into bare repository 'src-replace.git'...
+done.
+[master 6561203] Change 2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+[master e842a0a] Change 3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+[master a5ed940] Change 4
+ Author: A U Thor <author@example.com>
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+To /build/git-2.20.1/t/trash directory.t5520-pull/src
+   5004a46..a5ed940  master -> master
+[master 711c2d7] Modified Change 4
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:19:13 2005 -0700
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+ok 64 - setup for avoiding reapplying old patches
+
+expecting success: 
+	(cd dst &&
+	 test_must_fail git pull --rebase &&
+	 test 1 = $(find .git/rebase-apply -name "000*" | wc -l)
+	)
+
+First, rewinding head to replay your work on top of it...
+Applying: Modified Change 4
+Using index info to reconstruct a base tree...
+M	stuff
+Falling back to patching base and 3-way merge...
+Merging:
+a5ed940 Change 4
+virtual Modified Change 4
+found 1 common ancestor:
+virtual e369e858ec1aa73d497d02c4f23e5cf4ae2d3c3b
+Auto-merging stuff
+CONFLICT (content): Merge conflict in stuff
+error: Failed to merge in the changes.
+hint: Use 'git am --show-current-patch' to see the failed patch
+Patch failed at 0001 Modified Change 4
+
+Resolve all conflicts manually, mark them as resolved with
+"git add/rm <conflicted_files>", then run "git rebase --continue".
+You can instead skip this commit: run "git rebase --skip".
+To abort and get back to the state before "git rebase", run "git rebase --abort".
+
+ok 65 - git pull --rebase does not reapply old patches
+
+expecting success: 
+	git checkout -b copy2 to-rebase-orig &&
+	git pull --rebase . to-rebase &&
+	test "conflicting modification" = "$(cat file)" &&
+	test file = "$(cat file2)"
+
+Switched to a new branch 'copy2'
+From .
+ * branch            to-rebase  -> FETCH_HEAD
+First, rewinding head to replay your work on top of it...
+ok 66 - git pull --rebase against local branch
+
+# passed all 66 test(s)
+1..66
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t6009-rev-list-parent.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6009-rev-list-parent/.git/
+expecting success: 
+
+	touch file &&
+	git add file &&
+
+	test_commit one &&
+
+	test_tick=$(($test_tick - 2400)) &&
+
+	test_commit two &&
+	test_commit three &&
+	test_commit four &&
+
+	git log --pretty=oneline --abbrev-commit
+
+[master (root-commit) e622cea] one
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+)
+ create mode 100644 file
+ create mode 100644 one.t
+[master bfa07e2] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+[master ecfa770] three
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 three.t
+[master 0906875] four
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 four.t
+0906875 four
+ecfa770 three
+bfa07e2 two
+e622cea one
+ok 1 - setup
+
+expecting success: 
+
+	git rev-list one --not four >result &&
+	test_must_be_empty result
+
+
+ok 2 - one is ancestor of others and should not be shown
+
+expecting success: 
+
+	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 master &&
+	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 master
+
+Switched to a new branch 'newroot'
+[newroot (root-commit) 04238a1] five
+ Author: A U Thor <author@example.com>
+ 6 files changed, 5 insertions(+)
+ create mode 100644 file
+ create mode 100644 five.t
+ create mode 100644 four.t
+ create mode 100644 one.t
+ create mode 100644 three.t
+ create mode 100644 two.t
+Switched to a new branch 'sidebranch'
+[sidebranch e29a44f] six
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 six.t
+Switched to a new branch 'anotherbranch'
+[anotherbranch f863663] seven
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 seven.t
+Switched to a new branch 'yetanotherbranch'
+[yetanotherbranch 3e13a02] eight
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 eight.t
+Switched to branch 'master'
+Merging:
+0906875 four
+virtual newroot
+found 0 common ancestors:
+Merge made by the 'recursive' strategy.
+ five.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 five.t
+Trying simple merge with sidebranch
+Trying simple merge with anotherbranch
+Merge made by the 'octopus' strategy.
+ seven.t | 1 +
+ six.t   | 1 +
+ 2 files changed, 2 insertions(+)
+ create mode 100644 seven.t
+ create mode 100644 six.t
+Switched to a new branch 'tetrabranch'
+Trying simple merge with sidebranch
+Trying simple merge with anotherbranch
+Trying simple merge with yetanotherbranch
+Merge made by the 'octopus' strategy.
+ eight.t | 1 +
+ seven.t | 1 +
+ six.t   | 1 +
+ 3 files changed, 3 insertions(+)
+ create mode 100644 eight.t
+ create mode 100644 seven.t
+ create mode 100644 six.t
+Switched to branch 'master'
+ok 3 - setup roots, merges and octopuses
+
+expecting success: 
+
+	check_revlist "--max-parents=0" one five
+
+ok 4 - rev-list roots
+
+expecting success: 
+
+	check_revlist "--max-parents=1" one eight seven six five four three two &&
+	check_revlist "--no-merges" one eight seven six five four three two
+
+ok 5 - rev-list no merges
+
+expecting success: 
+
+	check_revlist "--max-parents=2" one normalmerge eight seven six five four three two
+
+ok 6 - rev-list no octopuses
+
+expecting success: 
+
+	check_revlist "--min-parents=1" tetrapus tripus normalmerge eight seven six four three two
+
+ok 7 - rev-list no roots
+
+expecting success: 
+
+	check_revlist "--min-parents=2" tetrapus tripus normalmerge &&
+	check_revlist "--merges" tetrapus tripus normalmerge
+
+ok 8 - rev-list merges
+
+expecting success: 
+
+	check_revlist "--min-parents=3" tetrapus tripus
+
+ok 9 - rev-list octopus
+
+expecting success: 
+
+	check_revlist "--min-parents=1 --max-parents=1" eight seven six four three two
+
+ok 10 - rev-list ordinary commits
+
+expecting success: 
+
+	check_revlist "--min-parents=2 --no-merges" &&
+	check_revlist "--merges --no-merges" &&
+	check_revlist "--no-merges --merges"
+
+ok 11 - rev-list --merges --no-merges yields empty set
+
+expecting success: 
+
+	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 &&
@@ -217135,6 +217406,105 @@
 1..12
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
+*** t6025-merge-symlinks.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6025-merge-symlinks/.git/
+expecting success: 
+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 master &&
+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
+[master (root-commit) b2c01bb] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 file
+[master 4b38959] master
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 120000 symlink
+Switched to branch 'b-symlink'
+[b-symlink 70bce6a] 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 fe6f926] b-file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 symlink
+ok 1 - setup
+
+expecting success: 
+git checkout b-symlink &&
+test_must_fail git merge master
+Switched to branch 'b-symlink'
+Merging:
+70bce6a b-symlink
+virtual master
+found 1 common ancestor:
+b2c01bb initial
+Auto-merging symlink
+CONFLICT (add/add): Merge conflict in symlink
+Automatic merge failed; fix conflicts and then commit the result.
+ok 2 - merge master into b-symlink, which has a different symbolic link
+
+expecting success: 
+test -f symlink
+ok 3 - the merge result must be a file
+
+expecting success: 
+git reset --hard && git checkout b-file &&
+test_must_fail git merge master
+HEAD is now at 70bce6a b-symlink
+Switched to branch 'b-file'
+Merging:
+fe6f926 b-file
+virtual master
+found 1 common ancestor:
+b2c01bb initial
+CONFLICT (add/add): Merge conflict in symlink
+Automatic merge failed; fix conflicts and then commit the result.
+ok 4 - merge master into b-file, which has a file instead of a symbolic link
+
+expecting success: 
+test -f symlink
+ok 5 - the merge result must be a file
+
+expecting success: 
+git reset --hard &&
+git checkout master &&
+test_must_fail git merge b-file
+HEAD is now at fe6f926 b-file
+Switched to branch 'master'
+Merging:
+4b38959 master
+virtual b-file
+found 1 common ancestor:
+b2c01bb initial
+CONFLICT (add/add): Merge conflict in symlink
+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 master
+
+expecting success: 
+test -f symlink
+ok 7 - the merge result must be a file
+
+# passed all 7 test(s)
+1..7
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
 *** t6017-rev-list-stdin.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6017-rev-list-stdin/.git/
 expecting success: 
@@ -217879,103 +218249,579 @@
 1..18
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t6025-merge-symlinks.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6025-merge-symlinks/.git/
+*** t6006-rev-list-format.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6006-rev-list-format/.git/
 expecting success: 
-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 master &&
-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
-[master (root-commit) d0c4a40] initial
+	: >foo &&
+	git add foo &&
+	git config i18n.commitEncoding $test_encoding &&
+	echo "$added_iso88591" | git commit -F - &&
+	head1=$(git rev-parse --verify HEAD) &&
+	head1_short=$(git rev-parse --verify --short $head1) &&
+	tree1=$(git rev-parse --verify HEAD:) &&
+	tree1_short=$(git rev-parse --verify --short $tree1) &&
+	echo "$changed" > foo &&
+	echo "$changed_iso88591" | git commit -a -F - &&
+	head2=$(git rev-parse --verify HEAD) &&
+	head2_short=$(git rev-parse --verify --short $head2) &&
+	tree2=$(git rev-parse --verify HEAD:) &&
+	tree2_short=$(git rev-parse --verify --short $tree2) &&
+	git config --unset i18n.commitEncoding
+
+[master (root-commit) 75bad09] added (hinzugefügt) foo
  Author: A U Thor <author@example.com>
  1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 file
-[master aca5aca] master
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 120000 symlink
-Switched to branch 'b-symlink'
-[b-symlink 387f560] 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 8d1e87a] b-file
+ create mode 100644 foo
+[master 7e50ed9] changed (geändert) foo
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 symlink
 ok 1 - setup
 
 expecting success: 
-git checkout b-symlink &&
-test_must_fail git merge master
-Switched to branch 'b-symlink'
-Merging:
-387f560 b-symlink
-virtual master
-found 1 common ancestor:
-d0c4a40 initial
-Auto-merging symlink
-CONFLICT (add/add): Merge conflict in symlink
-Automatic merge failed; fix conflicts and then commit the result.
-ok 2 - merge master into b-symlink, which has a different symbolic link
+		git rev-list --pretty=format:'%%h' master >output.percent &&
+		test_cmp expect.percent output.percent
+	
+ok 2 - format percent
 
 expecting success: 
-test -f symlink
-ok 3 - the merge result must be a file
+		git rev-list --pretty=format:'%H%n%h' master >output.hash &&
+		test_cmp expect.hash output.hash
+	
+ok 3 - format hash
 
 expecting success: 
-git reset --hard && git checkout b-file &&
-test_must_fail git merge master
-HEAD is now at 387f560 b-symlink
-Switched to branch 'b-file'
-Merging:
-8d1e87a b-file
-virtual master
-found 1 common ancestor:
-d0c4a40 initial
-CONFLICT (add/add): Merge conflict in symlink
-Automatic merge failed; fix conflicts and then commit the result.
-ok 4 - merge master into b-file, which has a file instead of a symbolic link
+		git rev-list --pretty=format:'%T%n%t' master >output.tree &&
+		test_cmp expect.tree output.tree
+	
+ok 4 - format tree
 
 expecting success: 
-test -f symlink
-ok 5 - the merge result must be a file
+		git rev-list --pretty=format:'%P%n%p' master >output.parents &&
+		test_cmp expect.parents output.parents
+	
+ok 5 - format parents
 
 expecting success: 
-git reset --hard &&
-git checkout master &&
-test_must_fail git merge b-file
-HEAD is now at 8d1e87a b-file
-Switched to branch 'master'
-Merging:
-aca5aca master
-virtual b-file
-found 1 common ancestor:
-d0c4a40 initial
-CONFLICT (add/add): Merge conflict in symlink
-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 master
+		git rev-list --pretty=format:'%an%n%ae%n%ad%n%aD%n%at' master >output.author &&
+		test_cmp expect.author output.author
+	
+ok 6 - format author
 
 expecting success: 
-test -f symlink
-ok 7 - the merge result must be a file
+		git rev-list --pretty=format:'%cn%n%ce%n%cd%n%cD%n%ct' master >output.committer &&
+		test_cmp expect.committer output.committer
+	
+ok 7 - format committer
 
-# passed all 7 test(s)
-1..7
+expecting success: 
+		git rev-list --pretty=format:'%e' master >output.encoding &&
+		test_cmp expect.encoding output.encoding
+	
+ok 8 - format encoding
+
+expecting success: 
+		git rev-list --pretty=format:'%s' master >output.subject &&
+		test_cmp expect.subject output.subject
+	
+ok 9 - format subject
+
+expecting success: 
+		git rev-list --pretty=format:'%<(20,trunc)%s' master >output.subject-truncated &&
+		test_cmp expect.subject-truncated output.subject-truncated
+	
+ok 10 - format subject-truncated
+
+expecting success: 
+		git rev-list --pretty=format:'%b' master >output.body &&
+		test_cmp expect.body output.body
+	
+ok 11 - format body
+
+expecting success: 
+		git rev-list --pretty=format:'%B' master >output.raw-body &&
+		test_cmp expect.raw-body output.raw-body
+	
+ok 12 - format raw-body
+
+expecting success: 
+	cat >expect <<-EOF &&
+	commit $head2
+	<RED>foo<GREEN>bar<BLUE>baz<RESET>xyzzy
+	EOF
+	format="%Credfoo%Cgreenbar%Cbluebaz%Cresetxyzzy" &&
+	git rev-list --color --format="$format" -1 master >actual.raw &&
+	test_decode_color <actual.raw >actual &&
+	test_cmp expect actual
+
+ok 13 - basic colors
+
+expecting success: 
+	cat >expect <<-EOF &&
+	commit $head2
+	<BOLD;RED;BYELLOW>foo<RESET>
+	EOF
+	format="%C(red yellow bold)foo%C(reset)" &&
+	git rev-list --color --format="$format" -1 master >actual.raw &&
+	test_decode_color <actual.raw >actual &&
+	test_cmp expect actual
+
+ok 14 - advanced colors
+
+expecting success: 
+		git log --format=$color -1 >actual &&
+		has_no_color actual
+	
+ok 15 - %Cred does not enable color by default
+
+expecting success: 
+		git -c color.diff=always log --format=$color -1 >actual &&
+		has_color actual
+	
+ok 16 - %Cred enables colors for color.diff
+
+expecting success: 
+		git -c color.ui=always log --format=$color -1 >actual &&
+		has_color actual
+	
+ok 17 - %Cred enables colors for color.ui
+
+expecting success: 
+		git log --format=$color -1 --color >actual &&
+		has_color actual
+	
+ok 18 - %Cred respects --color
+
+expecting success: 
+		git -c color.ui=always log --format=$color -1 --no-color >actual &&
+		has_no_color actual
+	
+ok 19 - %Cred respects --no-color
+
+checking prerequisite: TTY
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
+	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: 
+		test_terminal git log --format=$color -1 --color=auto >actual &&
+		has_color actual
+	
+ok 20 - %Cred respects --color=auto (stdout is tty)
+
+expecting success: 
+		(
+			TERM=vt100 && export TERM &&
+			git log --format=$color -1 --color=auto >actual &&
+			has_no_color actual
+		)
+	
+ok 21 - %Cred respects --color=auto (stdout not tty)
+
+expecting success: 
+		git log --format=$color -1 >actual &&
+		has_no_color actual
+	
+ok 22 - %C(...) does not enable color by default
+
+expecting success: 
+		git -c color.diff=always log --format=$color -1 >actual &&
+		has_color actual
+	
+ok 23 - %C(...) enables colors for color.diff
+
+expecting success: 
+		git -c color.ui=always log --format=$color -1 >actual &&
+		has_color actual
+	
+ok 24 - %C(...) enables colors for color.ui
+
+expecting success: 
+		git log --format=$color -1 --color >actual &&
+		has_color actual
+	
+ok 25 - %C(...) respects --color
+
+expecting success: 
+		git -c color.ui=always log --format=$color -1 --no-color >actual &&
+		has_no_color actual
+	
+ok 26 - %C(...) respects --no-color
+
+expecting success: 
+		test_terminal git log --format=$color -1 --color=auto >actual &&
+		has_color actual
+	
+ok 27 - %C(...) respects --color=auto (stdout is tty)
+
+expecting success: 
+		(
+			TERM=vt100 && export TERM &&
+			git log --format=$color -1 --color=auto >actual &&
+			has_no_color actual
+		)
+	
+ok 28 - %C(...) respects --color=auto (stdout not tty)
+
+expecting success: 
+		git log --format=$color -1 >actual &&
+		has_no_color actual
+	
+ok 29 - %C(auto,...) does not enable color by default
+
+expecting success: 
+		git -c color.diff=always log --format=$color -1 >actual &&
+		has_color actual
+	
+ok 30 - %C(auto,...) enables colors for color.diff
+
+expecting success: 
+		git -c color.ui=always log --format=$color -1 >actual &&
+		has_color actual
+	
+ok 31 - %C(auto,...) enables colors for color.ui
+
+expecting success: 
+		git log --format=$color -1 --color >actual &&
+		has_color actual
+	
+ok 32 - %C(auto,...) respects --color
+
+expecting success: 
+		git -c color.ui=always log --format=$color -1 --no-color >actual &&
+		has_no_color actual
+	
+ok 33 - %C(auto,...) respects --no-color
+
+expecting success: 
+		test_terminal git log --format=$color -1 --color=auto >actual &&
+		has_color actual
+	
+ok 34 - %C(auto,...) respects --color=auto (stdout is tty)
+
+expecting success: 
+		(
+			TERM=vt100 && export TERM &&
+			git log --format=$color -1 --color=auto >actual &&
+			has_no_color actual
+		)
+	
+ok 35 - %C(auto,...) respects --color=auto (stdout not tty)
+
+expecting success: 
+	git log --format=$ALWAYS_COLOR -1 >actual &&
+	has_color actual
+
+ok 36 - %C(always,...) enables color even without tty
+
+expecting success: 
+	git log --color --format="%C(auto)%H" -1 >actual.raw &&
+	test_decode_color <actual.raw >actual &&
+	echo "<YELLOW>$(git rev-parse HEAD)<RESET>" >expect &&
+	test_cmp expect actual
+
+ok 37 - %C(auto) respects --color
+
+expecting success: 
+	git log --no-color --format="%C(auto)%H" -1 >actual &&
+	git rev-parse HEAD >expect &&
+	test_cmp expect actual
+
+ok 38 - %C(auto) respects --no-color
+
+expecting success: 
+	git rev-list --color --format="%C(auto,green)foo%C(auto,reset)" \
+		-1 HEAD >actual.raw &&
+	test_decode_color <actual.raw >actual &&
+	cat >expect <<-EOF &&
+	commit $(git rev-parse HEAD)
+	<GREEN>foo<RESET>
+	EOF
+	test_cmp expect actual
+
+ok 39 - rev-list %C(auto,...) respects --color
+
+expecting success: 
+	git config i18n.commitencoding $test_encoding &&
+	echo change2 >foo && git commit -a -F commit-msg &&
+	head3=$(git rev-parse --verify HEAD) &&
+	head3_short=$(git rev-parse --short $head3)
+
+[master 79c1a11] Test printing of complex bodies
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 40 - setup complex body
+
+expecting success: 
+		git rev-list --pretty=format:'%e' master >output.complex-encoding &&
+		test_cmp expect.complex-encoding output.complex-encoding
+	
+ok 41 - format complex-encoding
+
+expecting success: 
+		git rev-list --pretty=format:'%s' master >output.complex-subject &&
+		test_cmp expect.complex-subject output.complex-subject
+	
+ok 42 - format complex-subject
+
+expecting success: 
+		git rev-list --pretty=format:'%<(20,trunc)%s' master >output.complex-subject-trunc &&
+		test_cmp expect.complex-subject-trunc output.complex-subject-trunc
+	
+ok 43 - format complex-subject-trunc
+
+expecting success: 
+		git rev-list --pretty=format:'%<(20,mtrunc)%s' master >output.complex-subject-mtrunc &&
+		test_cmp expect.complex-subject-mtrunc output.complex-subject-mtrunc
+	
+ok 44 - format complex-subject-mtrunc
+
+expecting success: 
+		git rev-list --pretty=format:'%<(20,ltrunc)%s' master >output.complex-subject-ltrunc &&
+		test_cmp expect.complex-subject-ltrunc output.complex-subject-ltrunc
+	
+ok 45 - format complex-subject-ltrunc
+
+expecting success: 
+	cat <<-EOF >expected.utf-8 &&
+	commit $head3
+	This commit message is much longer than the others,
+	and it will be encoded in $test_encoding. We should therefore
+	include an ISO8859 character: ¡bueno!
+
+	commit $head2
+	commit $head1
+	EOF
+	iconv -f utf-8 -t $test_encoding expected.utf-8 >expected.ISO8859-1
+
+ok 46 - prepare expected messages (for test %b)
+
+expecting success: 
+		git rev-list --pretty=format:'%b' master >output.complex-body &&
+		test_cmp expect.complex-body output.complex-body
+	
+ok 47 - format complex-body
+
+expecting success: 
+		git rev-list --pretty=format:'%s' master >output.complex-subject-commitencoding-unset &&
+		test_cmp expect.complex-subject-commitencoding-unset output.complex-subject-commitencoding-unset
+	
+ok 48 - format complex-subject-commitencoding-unset
+
+expecting success: 
+		git rev-list --pretty=format:'%<(20,trunc)%s' master >output.complex-subject-commitencoding-unset-trunc &&
+		test_cmp expect.complex-subject-commitencoding-unset-trunc output.complex-subject-commitencoding-unset-trunc
+	
+ok 49 - format complex-subject-commitencoding-unset-trunc
+
+expecting success: 
+		git rev-list --pretty=format:'%<(20,mtrunc)%s' master >output.complex-subject-commitencoding-unset-mtrunc &&
+		test_cmp expect.complex-subject-commitencoding-unset-mtrunc output.complex-subject-commitencoding-unset-mtrunc
+	
+ok 50 - format complex-subject-commitencoding-unset-mtrunc
+
+expecting success: 
+		git rev-list --pretty=format:'%<(20,ltrunc)%s' master >output.complex-subject-commitencoding-unset-ltrunc &&
+		test_cmp expect.complex-subject-commitencoding-unset-ltrunc output.complex-subject-commitencoding-unset-ltrunc
+	
+ok 51 - format complex-subject-commitencoding-unset-ltrunc
+
+expecting success: 
+		git rev-list --pretty=format:'%b' master >output.complex-body-commitencoding-unset &&
+		test_cmp expect.complex-body-commitencoding-unset output.complex-body-commitencoding-unset
+	
+ok 52 - format complex-body-commitencoding-unset
+
+expecting success: 
+	echo  >expect commit $head3 &&
+	echo >>expect fooQbar &&
+	git rev-list -1 --format=foo%x00bar HEAD >actual.nul &&
+	nul_to_q <actual.nul >actual &&
+	test_cmp expect actual
+
+ok 53 - %x00 shows NUL
+
+expecting success: 
+	echo 2005-04-07 >expect.ad-short &&
+	git log -1 --date=short --pretty=tformat:%ad >output.ad-short master &&
+	test_cmp expect.ad-short output.ad-short
+
+ok 54 - %ad respects --date=
+
+expecting success: 
+	test_tick &&
+	C=$(GIT_AUTHOR_EMAIL= git commit-tree HEAD^{tree} </dev/null) &&
+	A=$(git show --pretty=format:%an,%ae,%ad%n -s $C) &&
+	verbose test "$A" = "A U Thor,,Thu Apr 7 15:14:13 2005 -0700"
+
+ok 55 - empty email
+
+expecting success: 
+	git show -s --pretty=format:"%s%n%-b%nThanks%n" HEAD^^ >actual &&
+	test_line_count = 2 actual
+
+ok 56 - del LF before empty (1)
+
+expecting success: 
+	git show -s --pretty=format:"%s%n%-b%nThanks%n" HEAD >actual &&
+	test_line_count = 6 actual &&
+	grep "^$" actual
+
+
+ok 57 - del LF before empty (2)
+
+expecting success: 
+	git show -s --pretty=format:"%s%+b%nThanks%n" HEAD^^ >actual &&
+	test_line_count = 2 actual
+
+ok 58 - add LF before non-empty (1)
+
+expecting success: 
+	git show -s --pretty=format:"%s%+b%nThanks%n" HEAD >actual &&
+	test_line_count = 6 actual &&
+	grep "^$" actual
+
+
+ok 59 - add LF before non-empty (2)
+
+expecting success: 
+	git show -s --pretty=format:"%s% bThanks" HEAD^^ >actual &&
+	test $(wc -w <actual) = 3
+
+ok 60 - add SP before non-empty (1)
+
+expecting success: 
+	git show -s --pretty=format:"%s% sThanks" HEAD^^ >actual &&
+	test $(wc -w <actual) = 6
+
+ok 61 - add SP before non-empty (2)
+
+expecting success: 
+	echo SHORT SHORT SHORT >expect2 &&
+	echo LONG LONG LONG >expect3 &&
+	git log -1 --format="%h %h %h" HEAD >actual1 &&
+	git log -1 --abbrev=5 --format="%h %h %h" HEAD >actual2 &&
+	git log -1 --abbrev=5 --format="%H %H %H" HEAD >actual3 &&
+	sed -e "s/$OID_REGEX/LONG/g" -e "s/$_x05/SHORT/g" <actual2 >fuzzy2 &&
+	sed -e "s/$OID_REGEX/LONG/g" -e "s/$_x05/SHORT/g" <actual3 >fuzzy3 &&
+	test_cmp expect2 fuzzy2 &&
+	test_cmp expect3 fuzzy3 &&
+	! test_cmp actual1 actual2
+
+--- actual1	2023-01-05 11:49:31.642868030 +0000
++++ actual2	2023-01-05 11:49:31.650868030 +0000
+@@ -1 +1 @@
+-79c1a11 79c1a11 79c1a11
++79c1a 79c1a 79c1a
+ok 62 - --abbrev
+
+expecting success: 
+	git log -1 --format=%H --abbrev-commit --abbrev=20 HEAD >actual &&
+	len=$(wc -c <actual) &&
+	test $len = 41
+
+ok 63 - %H is not affected by --abbrev-commit
+
+expecting success: 
+	git log -1 --format=%h --abbrev-commit --abbrev=20 HEAD >actual &&
+	len=$(wc -c <actual) &&
+	test $len = 21
+
+ok 64 - %h is not affected by --abbrev-commit
+
+expecting success: 
+	git reflog >expect &&
+	git log -g --format="%h %gD: %gs" >actual &&
+	test_cmp expect actual
+
+ok 65 - "%h %gD: %gs" is same as git-reflog
+
+expecting success: 
+	git reflog --date=raw >expect &&
+	git log -g --format="%h %gD: %gs" --date=raw >actual &&
+	test_cmp expect actual
+
+ok 66 - "%h %gD: %gs" is same as git-reflog (with date)
+
+expecting success: 
+	git reflog --abbrev=13 --date=raw >expect &&
+	git log -g --abbrev=13 --format="%h %gD: %gs" --date=raw >actual &&
+	test_cmp expect actual
+
+ok 67 - "%h %gD: %gs" is same as git-reflog (with --abbrev)
+
+expecting success: 
+	echo "master@{0}" >expect.gd-short &&
+	git log -g -1 --format=%gd refs/heads/master >actual.gd-short &&
+	test_cmp expect.gd-short actual.gd-short
+
+ok 68 - %gd shortens ref name
+
+expecting success: 
+	echo "C O Mitter:committer@example.com" >expect &&
+	git log -g -1 --format="%gn:%ge" >actual &&
+	test_cmp expect actual
+
+ok 69 - reflog identity
+
+expecting success: 
+	git commit -m "dummy" --allow-empty &&
+	git commit -m "dummy" --allow-empty &&
+	git filter-branch --msg-filter "sed -e s/dummy//" HEAD^^.. &&
+	git rev-list --oneline HEAD >test.txt &&
+	test_line_count = 5 test.txt &&
+	git rev-list --oneline --graph HEAD >testg.txt &&
+	test_line_count = 5 testg.txt
+
+[master 5aa097f] dummy
+ Author: A U Thor <author@example.com>
+[master fa3a3fa] dummy
+ Author: A U Thor <author@example.com>
+
Rewrite 5aa097fabcc2e47c5f43f6ec1836bf401a2c6f69 (1/2) (0 seconds passed, remaining 0 predicted)    
Rewrite fa3a3faef638b2d98ff91d77837c396b38c8dbbe (2/2) (0 seconds passed, remaining 0 predicted)    
+Ref 'refs/heads/master' was rewritten
+ok 70 - oneline with empty message
+
+expecting success: 
+	git commit --author="a <a@example.com>" --allow-empty -m foo &&
+	echo "a <a@example.com>" >expect &&
+	git log -1 --format="%an <%ae>" >actual &&
+	test_cmp expect actual
+
+[master 900520a] foo
+ Author: a <a@example.com>
+ok 71 - single-character name is parsed correctly
+
+expecting success: 
+	echo "%GX %G" >expect &&
+	git log -1 --format="%GX %G" >actual &&
+	test_cmp expect actual
+
+ok 72 - unused %G placeholders are passed through
+
+# passed all 72 test(s)
+1..72
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
 *** t6024-recursive-merge.sh ***
@@ -218106,12 +218952,12 @@
 	grep "Cannot merge binary files: binary-file (HEAD vs. F)" merge.err
 
 HEAD is now at 71b2f3d F
-[F 6c82b1b] binary
+[F a84c79e] 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 f2bec7f] binary2
+[G e90f7b8] binary2
  Author: A U Thor <author@example.com>
  1 file changed, 0 insertions(+), 0 deletions(-)
  create mode 100644 binary-file
@@ -218140,33 +218986,33 @@
 	git rev-parse --verify :3:a2
 
 
-HEAD is now at f2bec7f binary2
+HEAD is now at e90f7b8 binary2
 Switched to a new branch 'delete'
 rm 'a1'
-[delete ec4bd83] delete
+[delete 17152a7] delete
  Author: A U Thor <author@example.com>
  1 file changed, 1 deletion(-)
  delete mode 100644 a1
 Switched to a new branch 'rename'
-[rename 43039b2] rename
+[rename f110971] rename
  Author: A U Thor <author@example.com>
  1 file changed, 0 insertions(+), 0 deletions(-)
  rename a1 => a2 (100%)
 Merging:
-43039b2 rename
+f110971 rename
 virtual delete
 found 1 common ancestor:
-f2bec7f binary2
+e90f7b8 binary2
 CONFLICT (rename/delete): a1 deleted in delete and renamed to a2 in HEAD. Version HEAD of a2 left in tree.
 Automatic merge failed; fix conflicts and then commit the result.
 fd7923529855d0b274795ae3349c5e0438333979
 fatal: Needed a single revision
 Switched to branch 'delete'
 Merging:
-ec4bd83 delete
+17152a7 delete
 virtual rename
 found 1 common ancestor:
-f2bec7f binary2
+e90f7b8 binary2
 CONFLICT (rename/delete): a1 deleted in HEAD and renamed to a2 in rename. Version rename of a2 left in tree.
 Automatic merge failed; fix conflicts and then commit the result.
 fatal: Needed a single revision
@@ -218177,6 +219023,288 @@
 1..6
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
+*** t6003-rev-list-topo-order.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6003-rev-list-topo-order/.git/
+expecting success: 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: check_output simple-topo-order "git rev-list --topo-order  HEAD"
+ok 2 - simple topo order
+
+expecting success: check_output simple-date-order "git rev-list --date-order  HEAD"
+ok 3 - simple date order
+
+expecting success: check_output simple-author-date-order "git rev-list --author-date-order  HEAD"
+ok 4 - simple author-date order
+
+expecting success: check_output two-diamonds-topo-order-g6 "git rev-list --topo-order  g4"
+ok 5 - two diamonds topo order (g6)
+
+expecting success: check_output multiple-heads "git rev-list --topo-order a3 b3 c3"
+ok 6 - multiple heads
+
+expecting success: 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: 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: 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: check_output duplicated-head-arguments "git rev-list --topo-order l5 l5 ^l1"
+ok 10 - duplicated head arguments
+
+expecting success: check_output prune-near-topo "git rev-list --topo-order a4 ^c3"
+ok 11 - prune near topo
+
+expecting success: check_output head-has-no-parent "git rev-list --topo-order  root"
+ok 12 - head has no parent
+
+expecting success: check_output two-nodes-one-head-one-base "git rev-list --topo-order  l0"
+ok 13 - two nodes - one head, one base
+
+expecting success: 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: check_output linear-prune-l2-root "git rev-list --topo-order  l2 ^root"
+ok 15 - linear prune l2 ^root
+
+expecting success: check_output linear-prune-l2-l0 "git rev-list --topo-order  l2 ^l0"
+ok 16 - linear prune l2 ^l0
+
+expecting success: check_output linear-prune-l2-l1 "git rev-list --topo-order  l2 ^l1"
+ok 17 - linear prune l2 ^l1
+
+expecting success: check_output linear-prune-l5-a4 "git rev-list --topo-order  l5 ^a4"
+ok 18 - linear prune l5 ^a4
+
+expecting success: check_output linear-prune-l5-l3 "git rev-list --topo-order  l5 ^l3"
+ok 19 - linear prune l5 ^l3
+
+expecting success: check_output linear-prune-l5-l4 "git rev-list --topo-order  l5 ^l4"
+ok 20 - linear prune l5 ^l4
+
+expecting success: 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: 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: 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: check_output one-specified-head-reachable-from-another-a4-c3-topo-order "list_duplicates git rev-list --topo-order a4 c3"
+ok 24 - one specified head reachable from another a4, c3, --topo-order
+
+expecting success: check_output one-specified-head-reachable-from-another-c3-a4-topo-order "list_duplicates git rev-list --topo-order c3 a4"
+ok 25 - one specified head reachable from another c3, a4, --topo-order
+
+expecting success: check_output one-specified-head-reachable-from-another-a4-c3-no-topo-order "list_duplicates git rev-list a4 c3"
+ok 26 - one specified head reachable from another a4, c3, no --topo-order
+
+expecting success: check_output one-specified-head-reachable-from-another-c3-a4-no-topo-order "list_duplicates git rev-list c3 a4"
+ok 27 - one specified head reachable from another c3, a4, no --topo-order
+
+expecting success: check_output graph-with-c3-and-a4-parents-of-head "list_duplicates git rev-list m1"
+ok 28 - graph with c3 and a4 parents of head
+
+expecting success: check_output graph-with-a4-and-c3-parents-of-head "list_duplicates git rev-list m2"
+ok 29 - graph with a4 and c3 parents of head
+
+expecting success: git rev-list --topo-order  a3 ^a3
+ok 30 - head ^head --topo-order
+
+expecting success: git rev-list a3 ^a3
+ok 31 - head ^head no --topo-order
+
+expecting success: check_output simple-topo-order-l5r1 "git rev-list --topo-order  l5r1"
+ok 32 - simple topo order (l5r1)
+
+expecting success: check_output simple-topo-order-r1l5 "git rev-list --topo-order  r1l5"
+ok 33 - simple topo order (r1l5)
+
+expecting success: check_output don-t-print-things-unreachable-from-one-branch "git rev-list a3 ^b3 --topo-order"
+ok 34 - don't print things unreachable from one branch
+
+expecting success: check_output topo-order-a4-l3 "git rev-list --topo-order a4 l3"
+ok 35 - --topo-order a4 l3
+
+# passed all 35 test(s)
+1..35
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t6002-rev-list-bisect.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6002-rev-list-bisect/.git/
+expecting success: test $_bisect_err -le $_max_diff
+ok 1 - bisection diff --bisect l0 ^root <= 0
+
+expecting success: test $_bisect_err -le $_max_diff
+ok 2 - bisection diff --bisect l1 ^root <= 0
+
+expecting success: test $_bisect_err -le $_max_diff
+ok 3 - bisection diff --bisect l2 ^root <= 0
+
+expecting success: test $_bisect_err -le $_max_diff
+ok 4 - bisection diff --bisect a0 ^root <= 0
+
+expecting success: test $_bisect_err -le $_max_diff
+ok 5 - bisection diff --bisect a1 ^root <= 0
+
+expecting success: test $_bisect_err -le $_max_diff
+ok 6 - bisection diff --bisect a2 ^root <= 0
+
+expecting success: test $_bisect_err -le $_max_diff
+ok 7 - bisection diff --bisect a3 ^root <= 0
+
+expecting success: test $_bisect_err -le $_max_diff
+ok 8 - bisection diff --bisect b1 ^root <= 0
+
+expecting success: test $_bisect_err -le $_max_diff
+ok 9 - bisection diff --bisect b2 ^root <= 0
+
+expecting success: test $_bisect_err -le $_max_diff
+ok 10 - bisection diff --bisect b3 ^root <= 0
+
+expecting success: test $_bisect_err -le $_max_diff
+ok 11 - bisection diff --bisect c1 ^root <= 0
+
+expecting success: test $_bisect_err -le $_max_diff
+ok 12 - bisection diff --bisect c2 ^root <= 0
+
+expecting success: test $_bisect_err -le $_max_diff
+ok 13 - bisection diff --bisect c3 ^root <= 0
+
+expecting success: test $_bisect_err -le $_max_diff
+ok 14 - bisection diff --bisect E ^F <= 0
+
+expecting success: test $_bisect_err -le $_max_diff
+ok 15 - bisection diff --bisect e1 ^F <= 0
+
+expecting success: test $_bisect_err -le $_max_diff
+ok 16 - bisection diff --bisect e2 ^F <= 0
+
+expecting success: test $_bisect_err -le $_max_diff
+ok 17 - bisection diff --bisect e3 ^F <= 0
+
+expecting success: test $_bisect_err -le $_max_diff
+ok 18 - bisection diff --bisect e4 ^F <= 0
+
+expecting success: test $_bisect_err -le $_max_diff
+ok 19 - bisection diff --bisect e5 ^F <= 0
+
+expecting success: test $_bisect_err -le $_max_diff
+ok 20 - bisection diff --bisect e6 ^F <= 0
+
+expecting success: test $_bisect_err -le $_max_diff
+ok 21 - bisection diff --bisect e7 ^F <= 0
+
+expecting success: test $_bisect_err -le $_max_diff
+ok 22 - bisection diff --bisect f1 ^F <= 0
+
+expecting success: test $_bisect_err -le $_max_diff
+ok 23 - bisection diff --bisect f2 ^F <= 0
+
+expecting success: test $_bisect_err -le $_max_diff
+ok 24 - bisection diff --bisect f3 ^F <= 0
+
+expecting success: test $_bisect_err -le $_max_diff
+ok 25 - bisection diff --bisect f4 ^F <= 0
+
+expecting success: test $_bisect_err -le $_max_diff
+ok 26 - bisection diff --bisect E ^F <= 0
+
+expecting success: test $_bisect_err -le $_max_diff
+ok 27 - bisection diff --bisect V ^U <= 1
+
+expecting success: test $_bisect_err -le $_max_diff
+ok 28 - bisection diff --bisect V ^U ^u1 ^u2 ^u3 <= 0
+
+expecting success: test $_bisect_err -le $_max_diff
+ok 29 - bisection diff --bisect u1 ^U <= 0
+
+expecting success: test $_bisect_err -le $_max_diff
+ok 30 - bisection diff --bisect u2 ^U <= 0
+
+expecting success: test $_bisect_err -le $_max_diff
+ok 31 - bisection diff --bisect u3 ^U <= 0
+
+expecting success: test $_bisect_err -le $_max_diff
+ok 32 - bisection diff --bisect u4 ^U <= 0
+
+expecting success: test $_bisect_err -le $_max_diff
+ok 33 - bisection diff --bisect u5 ^U <= 0
+
+expecting success: check_output bisect-l5-root "git rev-list $_bisect_option l5 ^root"
+ok 34 - --bisect l5 ^root
+
+expecting success: check_output bisect-l5-root-c3 "git rev-list $_bisect_option l5 ^root ^c3"
+ok 35 - --bisect l5 ^root ^c3
+
+expecting success: check_output bisect-l5-root-c3-b4 "git rev-list $_bisect_option l5 ^c3 ^b4"
+ok 36 - --bisect l5 ^root ^c3 ^b4
+
+expecting success: 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: 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: 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: 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: 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: 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: 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: 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: 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: 
+	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: 
+	# the only thing between c3 and c1 is c2
+	git rev-parse c2 >expect &&
+	git rev-list --bisect >actual &&
+	test_cmp expect actual
+
+ok 47 - rev-list --bisect can default to good/bad refs
+
+expecting success: 
+	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
+
+# passed all 48 test(s)
+1..48
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
 *** t6027-merge-binary.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6027-merge-binary/.git/
 expecting success: 
@@ -218243,7 +219371,7 @@
 Trying simple merge.
 Simple merge failed, trying Automatic merge.
 Auto-merging m
-error: Cannot merge binary files: .merge_file_wocfvw
+error: Cannot merge binary files: .merge_file_H5YwN3
 ERROR: content conflict in m
 fatal: merge program failed
 Automatic merge failed; fix conflicts and then commit the result.
@@ -218279,132 +219407,6 @@
 1..3
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t6028-merge-up-to-date.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6028-merge-up-to-date/.git/
-expecting success: 
-	>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: 
-
-	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: 
-
-	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: 
-
-	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: 
-
-	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: 
-
-	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: 
-
-	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/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
 *** t6023-merge-file.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6023-merge-file/.git/
 expecting success: 
@@ -218434,8 +219436,8 @@
 not ok 5 - merge without conflict (missing LF at EOF) # TODO known breakage
 
 checking known breakage: test_cmp test.txt test2.txt
---- test.txt	2021-12-03 05:09:04.717064857 +0000
-+++ test2.txt	2021-12-03 05:09:04.809062182 +0000
+--- test.txt	2023-01-05 11:49:31.818868030 +0000
++++ test2.txt	2023-01-05 11:49:31.854868030 +0000
 @@ -3,7 +3,11 @@
  super aquam refectionis educavit me;
  animam meam convertit,
@@ -218564,6 +219566,132 @@
 1..27
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
+*** t6028-merge-up-to-date.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6028-merge-up-to-date/.git/
+expecting success: 
+	>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: 
+
+	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: 
+
+	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: 
+
+	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: 
+
+	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: 
+
+	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: 
+
+	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/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
 *** t6026-merge-attr.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6026-merge-attr/.git/
 expecting success: 
@@ -218848,1068 +219976,1629 @@
 1..9
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t6006-rev-list-format.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6006-rev-list-format/.git/
+*** t6033-merge-crlf.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6033-merge-crlf/.git/
 expecting success: 
-	: >foo &&
-	git add foo &&
-	git config i18n.commitEncoding $test_encoding &&
-	echo "$added_iso88591" | git commit -F - &&
-	head1=$(git rev-parse --verify HEAD) &&
-	head1_short=$(git rev-parse --verify --short $head1) &&
-	tree1=$(git rev-parse --verify HEAD:) &&
-	tree1_short=$(git rev-parse --verify --short $tree1) &&
-	echo "$changed" > foo &&
-	echo "$changed_iso88591" | git commit -a -F - &&
-	head2=$(git rev-parse --verify HEAD) &&
-	head2_short=$(git rev-parse --verify --short $head2) &&
-	tree2=$(git rev-parse --verify HEAD:) &&
-	tree2_short=$(git rev-parse --verify --short $tree2) &&
-	git config --unset i18n.commitEncoding
+	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 master
 
-[master (root-commit) 75bad09] added (hinzugefügt) foo
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 foo
-[master 7e50ed9] changed (geändert) foo
+[master (root-commit) a8ac235] Initial
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
+ create mode 100644 file
+[master 748acb3] add line from a
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to branch 'side'
+[side 2efe0a9] add line from b
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to branch 'master'
 ok 1 - setup
 
 expecting success: 
-		git rev-list --pretty=format:'%%h' master >output.percent &&
-		test_cmp expect.percent output.percent
-	
-ok 2 - format percent
+	git reset --hard initial &&
+	git merge side -s ours &&
+	cat file | remove_cr | append_cr >file.temp &&
+	test_cmp file file.temp
 
-expecting success: 
-		git rev-list --pretty=format:'%H%n%h' master >output.hash &&
-		test_cmp expect.hash output.hash
-	
-ok 3 - format hash
+HEAD is now at a8ac235 Initial
+Merge made by the 'ours' strategy.
+ok 2 - Check "ours" is CRLF
 
 expecting success: 
-		git rev-list --pretty=format:'%T%n%t' master >output.tree &&
-		test_cmp expect.tree output.tree
-	
-ok 4 - format tree
+	git reset --hard a &&
+	test_must_fail git merge side &&
+	cat file | remove_cr | append_cr >file.temp &&
+	test_cmp file file.temp
+
+HEAD is now at 748acb3 add line from a
+Merging:
+748acb3 add line from a
+virtual side
+found 1 common ancestor:
+a8ac235 Initial
+Auto-merging file
+CONFLICT (content): Merge conflict in file
+Automatic merge failed; fix conflicts and then commit the result.
+ok 3 - Check that conflict file is CRLF
 
+# passed all 3 test(s)
+1..3
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t6034-merge-rename-nocruft.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6034-merge-rename-nocruft/.git/
 expecting success: 
-		git rev-list --pretty=format:'%P%n%p' master >output.parents &&
-		test_cmp expect.parents output.parents
-	
-ok 5 - format parents
+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 master
+[master (root-commit) 4887327] 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 c30edd1] 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 f92b809] red creates R
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 R
+Switched to branch 'blue'
+[blue cdf8632] blue modify A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to branch 'master'
+ok 1 - setup
 
 expecting success: 
-		git rev-list --pretty=format:'%an%n%ae%n%ad%n%aD%n%at' master >output.author &&
-		test_cmp expect.author output.author
-	
-ok 6 - format author
+	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'
+Merging:
+f92b809 red creates R
+virtual white
+found 1 common ancestor:
+4887327 initial has A and M
+Merge made by the 'recursive' 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: 
-		git rev-list --pretty=format:'%cn%n%ce%n%cd%n%cD%n%ct' master >output.committer &&
-		test_cmp expect.committer output.committer
-	
-ok 7 - format committer
+	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'
+Merging:
+c30edd1 white renames A->B, M->N
+virtual blue
+found 1 common ancestor:
+4887327 initial has A and M
+Skipped N (merged same as existing)
+Auto-merging B
+Merge made by the 'recursive' 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/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t6039-merge-ignorecase.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6039-merge-ignorecase/.git/
+checking prerequisite: CASE_INSENSITIVE_FS
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
+	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/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t6029-merge-subtree.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6029-merge-subtree/.git/
 expecting success: 
-		git rev-list --pretty=format:'%e' master >output.encoding &&
-		test_cmp expect.encoding output.encoding
-	
-ok 8 - format encoding
+
+	s="1 2 3 4 5 6 7 8" &&
+	for i in $s; do echo $i; done >hello &&
+	git add hello &&
+	git commit -m initial &&
+	git checkout -b side &&
+	echo >>hello world &&
+	git add hello &&
+	git commit -m second &&
+	git checkout master &&
+	for i in mundo $s; do echo $i; done >hello &&
+	git add hello &&
+	git commit -m master
+
+
+[master (root-commit) 3fc01a8] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 8 insertions(+)
+ create mode 100644 hello
+Switched to a new branch 'side'
+[side d75e281] second
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Switched to branch 'master'
+[master e1ad56a] master
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 1 - setup
 
 expecting success: 
-		git rev-list --pretty=format:'%s' master >output.subject &&
-		test_cmp expect.subject output.subject
-	
-ok 9 - format subject
+
+	git merge -s subtree side &&
+	for i in mundo $s world; do echo $i; done >expect &&
+	test_cmp expect hello
+
+
+Merging:
+e1ad56a master
+virtual side
+found 1 common ancestor:
+3fc01a8 initial
+Auto-merging hello
+Merge made by the 'subtree' strategy.
+ hello | 1 +
+ 1 file changed, 1 insertion(+)
+ok 2 - subtree available and works like recursive
 
 expecting success: 
-		git rev-list --pretty=format:'%<(20,trunc)%s' master >output.subject-truncated &&
-		test_cmp expect.subject-truncated output.subject-truncated
-	
-ok 10 - format subject-truncated
+	git checkout --orphan sub &&
+	git rm -rf . &&
+	test_commit foo
+
+Switched to a new branch 'sub'
+rm 'hello'
+[sub (root-commit) ddd63c9] foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo.t
+ok 3 - setup branch sub
 
 expecting success: 
-		git rev-list --pretty=format:'%b' master >output.body &&
-		test_cmp expect.body output.body
-	
-ok 11 - format body
+	git checkout -b main master &&
+	git merge -s ours --no-commit --allow-unrelated-histories sub &&
+	git read-tree --prefix=dir/ -u sub &&
+	git commit -m "initial merge of sub into main" &&
+	test_path_is_file dir/foo.t &&
+	test_path_is_file hello
+
+Switched to a new branch 'main'
+Automatic merge went well; stopped before committing as requested
+[main ec46c55] initial merge of sub into main
+ Author: A U Thor <author@example.com>
+ok 4 - setup branch main
 
 expecting success: 
-		git rev-list --pretty=format:'%B' master >output.raw-body &&
-		test_cmp expect.raw-body output.raw-body
-	
-ok 12 - format raw-body
+	git checkout sub &&
+	test_commit bar
+
+Switched to branch 'sub'
+[sub 46a08c5] bar
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 bar.t
+ok 5 - update branch sub
 
 expecting success: 
-	cat >expect <<-EOF &&
-	commit $head2
-	<RED>foo<GREEN>bar<BLUE>baz<RESET>xyzzy
-	EOF
-	format="%Credfoo%Cgreenbar%Cbluebaz%Cresetxyzzy" &&
-	git rev-list --color --format="$format" -1 master >actual.raw &&
-	test_decode_color <actual.raw >actual &&
-	test_cmp expect actual
+	git checkout main &&
+	git merge -s subtree sub -m "second merge of sub into main" &&
+	test_path_is_file dir/bar.t &&
+	test_path_is_file dir/foo.t &&
+	test_path_is_file hello
 
-ok 13 - basic colors
+Switched to branch 'main'
+Merging:
+ec46c55 initial merge of sub into main
+virtual sub
+found 1 common ancestor:
+ddd63c9 foo
+Merge made by the 'subtree' strategy.
+ dir/bar.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 dir/bar.t
+ok 6 - update branch main
 
 expecting success: 
-	cat >expect <<-EOF &&
-	commit $head2
-	<BOLD;RED;BYELLOW>foo<RESET>
-	EOF
-	format="%C(red yellow bold)foo%C(reset)" &&
-	git rev-list --color --format="$format" -1 master >actual.raw &&
-	test_decode_color <actual.raw >actual &&
-	test_cmp expect actual
+	mkdir git-gui &&
+	cd git-gui &&
+	git init &&
+	echo git-gui > git-gui.sh &&
+	o1=$(git hash-object git-gui.sh) &&
+	git add git-gui.sh &&
+	git commit -m "initial git-gui" &&
+	cd .. &&
+	mkdir git &&
+	cd git &&
+	git init &&
+	echo git >git.c &&
+	o2=$(git hash-object git.c) &&
+	git add git.c &&
+	git commit -m "initial git"
 
-ok 14 - advanced colors
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6029-merge-subtree/git-gui/.git/
+[master (root-commit) a175596] initial git-gui
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 git-gui.sh
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6029-merge-subtree/git/.git/
+[master (root-commit) 724c210] initial git
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 git.c
+ok 7 - setup
 
 expecting success: 
-		git log --format=$color -1 >actual &&
-		has_no_color actual
-	
-ok 15 - %Cred does not enable color by default
+	git remote add -f gui ../git-gui &&
+	git merge -s ours --no-commit --allow-unrelated-histories gui/master &&
+	git read-tree --prefix=git-gui/ -u gui/master &&
+	git commit -m "Merge git-gui as our subdirectory" &&
+	git checkout -b work &&
+	git ls-files -s >actual &&
+	(
+		echo "100644 $o1 0	git-gui/git-gui.sh" &&
+		echo "100644 $o2 0	git.c"
+	) >expected &&
+	test_cmp expected actual
+
+Updating gui
+warning: no common commits
+From ../git-gui
+ * [new branch]      master     -> gui/master
+Automatic merge went well; stopped before committing as requested
+[master b741856] Merge git-gui as our subdirectory
+ Author: A U Thor <author@example.com>
+Switched to a new branch 'work'
+ok 8 - initial merge
 
 expecting success: 
-		git -c color.diff=always log --format=$color -1 >actual &&
-		has_color actual
-	
-ok 16 - %Cred enables colors for color.diff
+	cd ../git-gui &&
+	echo git-gui2 > git-gui.sh &&
+	o3=$(git hash-object git-gui.sh) &&
+	git add git-gui.sh &&
+	git checkout -b master2 &&
+	git commit -m "update git-gui" &&
+	cd ../git &&
+	git pull -s subtree gui master2 &&
+	git ls-files -s >actual &&
+	(
+		echo "100644 $o3 0	git-gui/git-gui.sh" &&
+		echo "100644 $o2 0	git.c"
+	) >expected &&
+	test_cmp expected actual
+
+Switched to a new branch 'master2'
+M	git-gui.sh
+[master2 c9333be] update git-gui
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+From ../git-gui
+ * branch            master2    -> FETCH_HEAD
+ * [new branch]      master2    -> gui/master2
+Merging:
+b741856 Merge git-gui as our subdirectory
+virtual c9333bebe07f90e76933cfa634ab72516dede3df
+found 1 common ancestor:
+a175596 initial git-gui
+Merge made by the 'subtree' strategy.
+ git-gui/git-gui.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 9 - merge update
 
 expecting success: 
-		git -c color.ui=always log --format=$color -1 >actual &&
-		has_color actual
-	
-ok 17 - %Cred enables colors for color.ui
+	cd ../git &&
+	git reset --hard master &&
+	git checkout -b master2 &&
+	git merge -s ours --no-commit gui/master &&
+	git read-tree --prefix=git-gui2/ -u gui/master &&
+	git commit -m "Merge git-gui2 as our subdirectory" &&
+	git checkout -b work2 &&
+	git ls-files -s >actual &&
+	(
+		echo "100644 $o1 0	git-gui/git-gui.sh" &&
+		echo "100644 $o1 0	git-gui2/git-gui.sh" &&
+		echo "100644 $o2 0	git.c"
+	) >expected &&
+	test_cmp expected actual
+
+HEAD is now at b741856 Merge git-gui as our subdirectory
+Switched to a new branch 'master2'
+Already up to date.
+[master2 b1fd074] Merge git-gui2 as our subdirectory
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 git-gui2/git-gui.sh
+Switched to a new branch 'work2'
+ok 10 - initial ambiguous subtree
 
 expecting success: 
-		git log --format=$color -1 --color >actual &&
-		has_color actual
-	
-ok 18 - %Cred respects --color
+	cd ../git &&
+	git reset --hard master2 &&
+	git pull -Xsubtree=git-gui gui master2 &&
+	git ls-files -s >actual &&
+	(
+		echo "100644 $o3 0	git-gui/git-gui.sh" &&
+		echo "100644 $o1 0	git-gui2/git-gui.sh" &&
+		echo "100644 $o2 0	git.c"
+	) >expected &&
+	test_cmp expected actual
+
+HEAD is now at b1fd074 Merge git-gui2 as our subdirectory
+From ../git-gui
+ * branch            master2    -> FETCH_HEAD
+Merging:
+b1fd074 Merge git-gui2 as our subdirectory
+virtual c9333bebe07f90e76933cfa634ab72516dede3df
+found 1 common ancestor:
+a175596 initial git-gui
+Merge made by the 'recursive' strategy.
+ git-gui/git-gui.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 11 - merge using explicit
 
 expecting success: 
-		git -c color.ui=always log --format=$color -1 --no-color >actual &&
-		has_no_color actual
-	
-ok 19 - %Cred respects --no-color
+	cd ../git &&
+	git reset --hard master2 &&
+	git pull -Xsubtree=git-gui2 gui master2 &&
+	git ls-files -s >actual &&
+	(
+		echo "100644 $o1 0	git-gui/git-gui.sh" &&
+		echo "100644 $o3 0	git-gui2/git-gui.sh" &&
+		echo "100644 $o2 0	git.c"
+	) >expected &&
+	test_cmp expected actual
 
-checking prerequisite: TTY
+HEAD is now at b1fd074 Merge git-gui2 as our subdirectory
+From ../git-gui
+ * branch            master2    -> FETCH_HEAD
+Merging:
+b1fd074 Merge git-gui2 as our subdirectory
+virtual c9333bebe07f90e76933cfa634ab72516dede3df
+found 1 common ancestor:
+a175596 initial git-gui
+Merge made by the 'recursive' strategy.
+ git-gui2/git-gui.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 12 - merge2 using explicit
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
-	test_have_prereq PERL &&
+# passed all 12 test(s)
+1..12
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t6018-rev-list-glob.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6018-rev-list-glob/.git/
+expecting success: 
 
-	# 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 &&
+	commit master &&
+	git checkout -b subspace/one master &&
+	commit one &&
+	git checkout -b subspace/two master &&
+	commit two &&
+	git checkout -b subspace-x master &&
+	commit subspace-x &&
+	git checkout -b other/three master &&
+	commit three &&
+	git checkout -b someref master &&
+	commit some &&
+	git checkout master &&
+	commit master2 &&
+	git tag foo/bar master &&
+	commit master3 &&
+	git update-ref refs/remotes/foo/baz master &&
+	commit master4 &&
+	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
 
-	perl "$TEST_DIRECTORY"/test-terminal.perl \
-		sh -c "test -t 1 && test -t 2"
+[master (root-commit) e1f5012] master
+ 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 2eafb28] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'subspace/two'
+[subspace/two 8d58bb9] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'subspace-x'
+[subspace-x a6204e5] 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 9f9c15a] three
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'someref'
+[someref 065b9f3] some
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to branch 'master'
+[master 95cfde6] master2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[master 32e7f0b] master3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[master 427c67e] master4
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 1 - setup
 
-)
-prerequisite TTY ok
 expecting success: 
-		test_terminal git log --format=$color -1 --color=auto >actual &&
-		has_color actual
-	
-died of signal 15 at /build/git-2.20.1/t/test-terminal.perl line 35.
-ok 20 - %Cred respects --color=auto (stdout is tty)
 
-expecting success: 
-		(
-			TERM=vt100 && export TERM &&
-			git log --format=$color -1 --color=auto >actual &&
-			has_no_color actual
-		)
-	
-ok 21 - %Cred respects --color=auto (stdout not tty)
+	compare rev-parse "subspace/one subspace/two" "--glob=refs/heads/subspace/*"
 
-expecting success: 
-		git log --format=$color -1 >actual &&
-		has_no_color actual
-	
-ok 22 - %C(...) does not enable color by default
 
-expecting success: 
-		git -c color.diff=always log --format=$color -1 >actual &&
-		has_color actual
-	
-ok 23 - %C(...) enables colors for color.diff
+ok 2 - rev-parse --glob=refs/heads/subspace/*
 
 expecting success: 
-		git -c color.ui=always log --format=$color -1 >actual &&
-		has_color actual
-	
-ok 24 - %C(...) enables colors for color.ui
 
-expecting success: 
-		git log --format=$color -1 --color >actual &&
-		has_color actual
-	
-ok 25 - %C(...) respects --color
+	compare rev-parse "subspace/one subspace/two" "--glob=heads/subspace/*"
 
-expecting success: 
-		git -c color.ui=always log --format=$color -1 --no-color >actual &&
-		has_no_color actual
-	
-ok 26 - %C(...) respects --no-color
 
-expecting success: 
-		test_terminal git log --format=$color -1 --color=auto >actual &&
-		has_color actual
-	
-ok 27 - %C(...) respects --color=auto (stdout is tty)
+ok 3 - rev-parse --glob=heads/subspace/*
 
 expecting success: 
-		(
-			TERM=vt100 && export TERM &&
-			git log --format=$color -1 --color=auto >actual &&
-			has_no_color actual
-		)
-	
-ok 28 - %C(...) respects --color=auto (stdout not tty)
 
-expecting success: 
-		git log --format=$color -1 >actual &&
-		has_no_color actual
-	
-ok 29 - %C(auto,...) does not enable color by default
+	compare rev-parse "subspace/one subspace/two" "--glob=refs/heads/subspace/"
+
+
+ok 4 - rev-parse --glob=refs/heads/subspace/
 
 expecting success: 
-		git -c color.diff=always log --format=$color -1 >actual &&
-		has_color actual
-	
-ok 30 - %C(auto,...) enables colors for color.diff
+
+	compare rev-parse "subspace/one subspace/two" "--glob=heads/subspace/"
+
+
+ok 5 - rev-parse --glob=heads/subspace/
 
 expecting success: 
-		git -c color.ui=always log --format=$color -1 >actual &&
-		has_color actual
-	
-ok 31 - %C(auto,...) enables colors for color.ui
+
+	compare rev-parse "subspace/one subspace/two" "--glob=heads/subspace"
+
+
+ok 6 - rev-parse --glob=heads/subspace
+
+checking known breakage: 
+
+	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: 
+
+	compare rev-parse "master" "--glob --symbolic master"
+
+
+--- expected	2023-01-05 11:49:31.194868030 +0000
++++ actual	2023-01-05 11:49:31.202868030 +0000
+@@ -1 +1,2 @@
+-427c67e8294a2917294f816398b918414251bb36
++--glob
++master
+not ok 8 - rev-parse is not confused by option-like glob # TODO known breakage
 
 expecting success: 
-		git log --format=$color -1 --color >actual &&
-		has_color actual
-	
-ok 32 - %C(auto,...) respects --color
+
+	compare rev-parse "subspace/one subspace/two" "--branches=subspace/*"
+
+
+ok 9 - rev-parse --branches=subspace/*
 
 expecting success: 
-		git -c color.ui=always log --format=$color -1 --no-color >actual &&
-		has_no_color actual
-	
-ok 33 - %C(auto,...) respects --no-color
+
+	compare rev-parse "subspace/one subspace/two" "--branches=subspace/"
+
+
+ok 10 - rev-parse --branches=subspace/
 
 expecting success: 
-		test_terminal git log --format=$color -1 --color=auto >actual &&
-		has_color actual
-	
-ok 34 - %C(auto,...) respects --color=auto (stdout is tty)
+
+	compare rev-parse "subspace/one subspace/two" "--branches=subspace"
+
+
+ok 11 - rev-parse --branches=subspace
 
 expecting success: 
-		(
-			TERM=vt100 && export TERM &&
-			git log --format=$color -1 --color=auto >actual &&
-			has_no_color actual
-		)
-	
-ok 35 - %C(auto,...) respects --color=auto (stdout not tty)
+
+	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: 
-	git log --format=$ALWAYS_COLOR -1 >actual &&
-	has_color actual
 
-ok 36 - %C(always,...) enables color even without tty
+	compare rev-parse "master" "--glob=heads/someref/* master"
+
+
+ok 13 - rev-parse --glob=heads/someref/* master
 
 expecting success: 
-	git log --color --format="%C(auto)%H" -1 >actual.raw &&
-	test_decode_color <actual.raw >actual &&
-	echo "<YELLOW>$(git rev-parse HEAD)<RESET>" >expect &&
-	test_cmp expect actual
 
-ok 37 - %C(auto) respects --color
+	compare rev-parse "master other/three someref subspace-x subspace/one subspace/two" "--glob=heads/*"
+
+
+ok 14 - rev-parse --glob=heads/*
 
 expecting success: 
-	git log --no-color --format="%C(auto)%H" -1 >actual &&
-	git rev-parse HEAD >expect &&
-	test_cmp expect actual
 
-ok 38 - %C(auto) respects --no-color
+	compare rev-parse "foo/bar" "--tags=foo"
+
+
+ok 15 - rev-parse --tags=foo
 
 expecting success: 
-	git rev-list --color --format="%C(auto,green)foo%C(auto,reset)" \
-		-1 HEAD >actual.raw &&
-	test_decode_color <actual.raw >actual &&
-	cat >expect <<-EOF &&
-	commit $(git rev-parse HEAD)
-	<GREEN>foo<RESET>
-	EOF
-	test_cmp expect actual
 
-ok 39 - rev-list %C(auto,...) respects --color
+	compare rev-parse "foo/baz" "--remotes=foo"
+
+
+ok 16 - rev-parse --remotes=foo
 
 expecting success: 
-	git config i18n.commitencoding $test_encoding &&
-	echo change2 >foo && git commit -a -F commit-msg &&
-	head3=$(git rev-parse --verify HEAD) &&
-	head3_short=$(git rev-parse --short $head3)
+	compare rev-parse "--exclude=*/* --branches" "master someref subspace-x"
 
-[master 79c1a11] Test printing of complex bodies
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 40 - setup complex body
+ok 17 - rev-parse --exclude with --branches
 
 expecting success: 
-		git rev-list --pretty=format:'%e' master >output.complex-encoding &&
-		test_cmp expect.complex-encoding output.complex-encoding
-	
-ok 41 - format complex-encoding
+	compare rev-parse "--exclude=refs/remotes/* --all" "--branches --tags"
+
+ok 18 - rev-parse --exclude with --all
 
 expecting success: 
-		git rev-list --pretty=format:'%s' master >output.complex-subject &&
-		test_cmp expect.complex-subject output.complex-subject
-	
-ok 42 - format complex-subject
+	compare rev-parse "--exclude=refs/remotes/* --exclude=refs/tags/* --all" --branches
+
+ok 19 - rev-parse accumulates multiple --exclude
 
 expecting success: 
-		git rev-list --pretty=format:'%<(20,trunc)%s' master >output.complex-subject-trunc &&
-		test_cmp expect.complex-subject-trunc output.complex-subject-trunc
-	
-ok 43 - format complex-subject-trunc
+	compare rev-parse "--exclude=* --branches --branches" "--branches"
+
+ok 20 - rev-parse --branches clears --exclude
 
 expecting success: 
-		git rev-list --pretty=format:'%<(20,mtrunc)%s' master >output.complex-subject-mtrunc &&
-		test_cmp expect.complex-subject-mtrunc output.complex-subject-mtrunc
-	
-ok 44 - format complex-subject-mtrunc
+	compare rev-parse "--exclude=* --tags --tags" "--tags"
+
+ok 21 - rev-parse --tags clears --exclude
 
 expecting success: 
-		git rev-list --pretty=format:'%<(20,ltrunc)%s' master >output.complex-subject-ltrunc &&
-		test_cmp expect.complex-subject-ltrunc output.complex-subject-ltrunc
-	
-ok 45 - format complex-subject-ltrunc
+	compare rev-parse "--exclude=* --all --all" "--all"
+
+ok 22 - rev-parse --all clears --exclude
 
 expecting success: 
-	cat <<-EOF >expected.utf-8 &&
-	commit $head3
-	This commit message is much longer than the others,
-	and it will be encoded in $test_encoding. We should therefore
-	include an ISO8859 character: ¡bueno!
+	compare rev-parse "--exclude=subspace-* --branches=sub*" "subspace/one subspace/two"
 
-	commit $head2
-	commit $head1
-	EOF
-	iconv -f utf-8 -t $test_encoding expected.utf-8 >expected.ISO8859-1
+ok 23 - rev-parse --exclude=glob with --branches=glob
 
-ok 46 - prepare expected messages (for test %b)
+expecting success: 
+	compare rev-parse "--exclude=qux/? --tags=qux/*" "qux/one qux/two"
+
+ok 24 - rev-parse --exclude=glob with --tags=glob
 
 expecting success: 
-		git rev-list --pretty=format:'%b' master >output.complex-body &&
-		test_cmp expect.complex-body output.complex-body
-	
-ok 47 - format complex-body
+	compare rev-parse "--exclude=upstream/? --remotes=upstream/*" "upstream/one upstream/two"
+
+ok 25 - rev-parse --exclude=glob with --remotes=glob
 
 expecting success: 
-		git rev-list --pretty=format:'%s' master >output.complex-subject-commitencoding-unset &&
-		test_cmp expect.complex-subject-commitencoding-unset output.complex-subject-commitencoding-unset
-	
-ok 48 - format complex-subject-commitencoding-unset
+	compare rev-parse "--exclude=subspace-x --branches=sub*" "subspace/one subspace/two"
+
+ok 26 - rev-parse --exclude=ref with --branches=glob
 
 expecting success: 
-		git rev-list --pretty=format:'%<(20,trunc)%s' master >output.complex-subject-commitencoding-unset-trunc &&
-		test_cmp expect.complex-subject-commitencoding-unset-trunc output.complex-subject-commitencoding-unset-trunc
-	
-ok 49 - format complex-subject-commitencoding-unset-trunc
+	compare rev-parse "--exclude=qux/x --tags=qux/*" "qux/one qux/two"
+
+ok 27 - rev-parse --exclude=ref with --tags=glob
 
 expecting success: 
-		git rev-list --pretty=format:'%<(20,mtrunc)%s' master >output.complex-subject-commitencoding-unset-mtrunc &&
-		test_cmp expect.complex-subject-commitencoding-unset-mtrunc output.complex-subject-commitencoding-unset-mtrunc
-	
-ok 50 - format complex-subject-commitencoding-unset-mtrunc
+	compare rev-parse "--exclude=upstream/x --remotes=upstream/*" "upstream/one upstream/two"
+
+ok 28 - rev-parse --exclude=ref with --remotes=glob
 
 expecting success: 
-		git rev-list --pretty=format:'%<(20,ltrunc)%s' master >output.complex-subject-commitencoding-unset-ltrunc &&
-		test_cmp expect.complex-subject-commitencoding-unset-ltrunc output.complex-subject-commitencoding-unset-ltrunc
-	
-ok 51 - format complex-subject-commitencoding-unset-ltrunc
+	compare rev-list "--exclude=subspace-* --branches=sub*" "subspace/one subspace/two"
+
+ok 29 - rev-list --exclude=glob with --branches=glob
 
 expecting success: 
-		git rev-list --pretty=format:'%b' master >output.complex-body-commitencoding-unset &&
-		test_cmp expect.complex-body-commitencoding-unset output.complex-body-commitencoding-unset
-	
-ok 52 - format complex-body-commitencoding-unset
+	compare rev-list "--exclude=qux/? --tags=qux/*" "qux/one qux/two"
+
+ok 30 - rev-list --exclude=glob with --tags=glob
 
 expecting success: 
-	echo  >expect commit $head3 &&
-	echo >>expect fooQbar &&
-	git rev-list -1 --format=foo%x00bar HEAD >actual.nul &&
-	nul_to_q <actual.nul >actual &&
-	test_cmp expect actual
+	compare rev-list "--exclude=upstream/? --remotes=upstream/*" "upstream/one upstream/two"
 
-ok 53 - %x00 shows NUL
+ok 31 - rev-list --exclude=glob with --remotes=glob
 
 expecting success: 
-	echo 2005-04-07 >expect.ad-short &&
-	git log -1 --date=short --pretty=tformat:%ad >output.ad-short master &&
-	test_cmp expect.ad-short output.ad-short
+	compare rev-list "--exclude=subspace-x --branches=sub*" "subspace/one subspace/two"
 
-ok 54 - %ad respects --date=
+ok 32 - rev-list --exclude=ref with --branches=glob
 
 expecting success: 
-	test_tick &&
-	C=$(GIT_AUTHOR_EMAIL= git commit-tree HEAD^{tree} </dev/null) &&
-	A=$(git show --pretty=format:%an,%ae,%ad%n -s $C) &&
-	verbose test "$A" = "A U Thor,,Thu Apr 7 15:14:13 2005 -0700"
+	compare rev-list "--exclude=qux/x --tags=qux/*" "qux/one qux/two"
 
-ok 55 - empty email
+ok 33 - rev-list --exclude=ref with --tags=glob
 
 expecting success: 
-	git show -s --pretty=format:"%s%n%-b%nThanks%n" HEAD^^ >actual &&
-	test_line_count = 2 actual
+	compare rev-list "--exclude=upstream/x --remotes=upstream/*" "upstream/one upstream/two"
 
-ok 56 - del LF before empty (1)
+ok 34 - rev-list --exclude=ref with --remotes=glob
 
 expecting success: 
-	git show -s --pretty=format:"%s%n%-b%nThanks%n" HEAD >actual &&
-	test_line_count = 6 actual &&
-	grep "^$" actual
 
+	compare rev-list "subspace/one subspace/two" "--glob=refs/heads/subspace/*"
 
-ok 57 - del LF before empty (2)
+
+ok 35 - rev-list --glob=refs/heads/subspace/*
 
 expecting success: 
-	git show -s --pretty=format:"%s%+b%nThanks%n" HEAD^^ >actual &&
-	test_line_count = 2 actual
 
-ok 58 - add LF before non-empty (1)
+	compare rev-list "subspace/one subspace/two" "--glob refs/heads/subspace/*"
+
+
+ok 36 - rev-list --glob refs/heads/subspace/*
 
 expecting success: 
-	git show -s --pretty=format:"%s%+b%nThanks%n" HEAD >actual &&
-	test_line_count = 6 actual &&
-	grep "^$" actual
 
+	compare rev-list "master" "--glob -0 master"
 
-ok 59 - add LF before non-empty (2)
+
+ok 37 - rev-list not confused by option-like --glob arg
 
 expecting success: 
-	git show -s --pretty=format:"%s% bThanks" HEAD^^ >actual &&
-	test $(wc -w <actual) = 3
 
-ok 60 - add SP before non-empty (1)
+	compare rev-list "subspace/one subspace/two" "--glob=heads/subspace/*"
 
-expecting success: 
-	git show -s --pretty=format:"%s% sThanks" HEAD^^ >actual &&
-	test $(wc -w <actual) = 6
 
-ok 61 - add SP before non-empty (2)
+ok 38 - rev-list --glob=heads/subspace/*
 
 expecting success: 
-	echo SHORT SHORT SHORT >expect2 &&
-	echo LONG LONG LONG >expect3 &&
-	git log -1 --format="%h %h %h" HEAD >actual1 &&
-	git log -1 --abbrev=5 --format="%h %h %h" HEAD >actual2 &&
-	git log -1 --abbrev=5 --format="%H %H %H" HEAD >actual3 &&
-	sed -e "s/$OID_REGEX/LONG/g" -e "s/$_x05/SHORT/g" <actual2 >fuzzy2 &&
-	sed -e "s/$OID_REGEX/LONG/g" -e "s/$_x05/SHORT/g" <actual3 >fuzzy3 &&
-	test_cmp expect2 fuzzy2 &&
-	test_cmp expect3 fuzzy3 &&
-	! test_cmp actual1 actual2
 
---- actual1	2021-12-03 05:09:05.533041137 +0000
-+++ actual2	2021-12-03 05:09:05.545040788 +0000
-@@ -1 +1 @@
--79c1a11 79c1a11 79c1a11
-+79c1a 79c1a 79c1a
-ok 62 - --abbrev
+	compare rev-list "subspace/one subspace/two" "--glob=refs/heads/subspace/"
 
-expecting success: 
-	git log -1 --format=%H --abbrev-commit --abbrev=20 HEAD >actual &&
-	len=$(wc -c <actual) &&
-	test $len = 41
 
-ok 63 - %H is not affected by --abbrev-commit
+ok 39 - rev-list --glob=refs/heads/subspace/
 
 expecting success: 
-	git log -1 --format=%h --abbrev-commit --abbrev=20 HEAD >actual &&
-	len=$(wc -c <actual) &&
-	test $len = 21
 
-ok 64 - %h is not affected by --abbrev-commit
+	compare rev-list "subspace/one subspace/two" "--glob=heads/subspace/"
 
-expecting success: 
-	git reflog >expect &&
-	git log -g --format="%h %gD: %gs" >actual &&
-	test_cmp expect actual
 
-ok 65 - "%h %gD: %gs" is same as git-reflog
+ok 40 - rev-list --glob=heads/subspace/
 
 expecting success: 
-	git reflog --date=raw >expect &&
-	git log -g --format="%h %gD: %gs" --date=raw >actual &&
-	test_cmp expect actual
 
-ok 66 - "%h %gD: %gs" is same as git-reflog (with date)
+	compare rev-list "subspace/one subspace/two" "--glob=heads/subspace"
+
+
+ok 41 - rev-list --glob=heads/subspace
 
 expecting success: 
-	git reflog --abbrev=13 --date=raw >expect &&
-	git log -g --abbrev=13 --format="%h %gD: %gs" --date=raw >actual &&
-	test_cmp expect actual
 
-ok 67 - "%h %gD: %gs" is same as git-reflog (with --abbrev)
+	compare rev-list "subspace/one subspace/two" "--branches=subspace/*"
+
+
+ok 42 - rev-list --branches=subspace/*
 
 expecting success: 
-	echo "master@{0}" >expect.gd-short &&
-	git log -g -1 --format=%gd refs/heads/master >actual.gd-short &&
-	test_cmp expect.gd-short actual.gd-short
 
-ok 68 - %gd shortens ref name
+	compare rev-list "subspace/one subspace/two" "--branches=subspace/"
+
+
+ok 43 - rev-list --branches=subspace/
 
 expecting success: 
-	echo "C O Mitter:committer@example.com" >expect &&
-	git log -g -1 --format="%gn:%ge" >actual &&
-	test_cmp expect actual
 
-ok 69 - reflog identity
+	compare rev-list "subspace/one subspace/two" "--branches=subspace"
+
+
+ok 44 - rev-list --branches=subspace
 
 expecting success: 
-	git commit -m "dummy" --allow-empty &&
-	git commit -m "dummy" --allow-empty &&
-	git filter-branch --msg-filter "sed -e s/dummy//" HEAD^^.. &&
-	git rev-list --oneline HEAD >test.txt &&
-	test_line_count = 5 test.txt &&
-	git rev-list --oneline --graph HEAD >testg.txt &&
-	test_line_count = 5 testg.txt
 
-[master 5aa097f] dummy
- Author: A U Thor <author@example.com>
-[master fa3a3fa] dummy
- Author: A U Thor <author@example.com>
-
Rewrite 5aa097fabcc2e47c5f43f6ec1836bf401a2c6f69 (1/2) (0 seconds passed, remaining 0 predicted)    
Rewrite fa3a3faef638b2d98ff91d77837c396b38c8dbbe (2/2) (1 seconds passed, remaining 0 predicted)    
-Ref 'refs/heads/master' was rewritten
-ok 70 - oneline with empty message
+	compare rev-list "master subspace-x someref other/three subspace/one subspace/two" "--branches"
+
+
+ok 45 - rev-list --branches
 
 expecting success: 
-	git commit --author="a <a@example.com>" --allow-empty -m foo &&
-	echo "a <a@example.com>" >expect &&
-	git log -1 --format="%an <%ae>" >actual &&
-	test_cmp expect actual
 
-[master 900520a] foo
- Author: a <a@example.com>
-ok 71 - single-character name is parsed correctly
+	compare rev-list "master" "--glob=heads/someref/* master"
+
+
+ok 46 - rev-list --glob=heads/someref/* master
 
 expecting success: 
-	echo "%GX %G" >expect &&
-	git log -1 --format="%GX %G" >actual &&
-	test_cmp expect actual
 
-ok 72 - unused %G placeholders are passed through
+	compare rev-list "subspace/one subspace/two other/three" "--glob=heads/subspace/* --glob=heads/other/*"
+
+
+ok 47 - rev-list --glob=heads/subspace/* --glob=heads/other/*
 
-# passed all 72 test(s)
-1..72
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t6033-merge-crlf.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6033-merge-crlf/.git/
 expecting success: 
-	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 master
 
-[master (root-commit) 7835299] Initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-[master 345ebd0] add line from a
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to branch 'side'
-[side 5e6977c] add line from b
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to branch 'master'
-ok 1 - setup
+	compare rev-list "master other/three someref subspace-x subspace/one subspace/two" "--glob=heads/*"
+
+
+ok 48 - rev-list --glob=heads/*
 
 expecting success: 
-	git reset --hard initial &&
-	git merge side -s ours &&
-	cat file | remove_cr | append_cr >file.temp &&
-	test_cmp file file.temp
 
-HEAD is now at 7835299 Initial
-Merge made by the 'ours' strategy.
-ok 2 - Check "ours" is CRLF
+	compare rev-list "foo/bar" "--tags=foo"
+
+
+ok 49 - rev-list --tags=foo
 
 expecting success: 
-	git reset --hard a &&
-	test_must_fail git merge side &&
-	cat file | remove_cr | append_cr >file.temp &&
-	test_cmp file file.temp
 
-HEAD is now at 345ebd0 add line from a
-Merging:
-345ebd0 add line from a
-virtual side
-found 1 common ancestor:
-7835299 Initial
-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
+	compare rev-list "foo/bar qux/x qux/two qux/one" "--tags"
 
-# passed all 3 test(s)
-1..3
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t6003-rev-list-topo-order.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6003-rev-list-topo-order/.git/
-expecting success: 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: check_output simple-topo-order "git rev-list --topo-order  HEAD"
-ok 2 - simple topo order
+ok 50 - rev-list --tags
 
-expecting success: check_output simple-date-order "git rev-list --date-order  HEAD"
-ok 3 - simple date order
+expecting success: 
 
-expecting success: check_output simple-author-date-order "git rev-list --author-date-order  HEAD"
-ok 4 - simple author-date order
+	compare rev-list "foo/baz" "--remotes=foo"
 
-expecting success: check_output two-diamonds-topo-order-g6 "git rev-list --topo-order  g4"
-ok 5 - two diamonds topo order (g6)
 
-expecting success: check_output multiple-heads "git rev-list --topo-order a3 b3 c3"
-ok 6 - multiple heads
+ok 51 - rev-list --remotes=foo
 
-expecting success: 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: 
+	compare rev-list "--exclude=*/* --branches" "master someref subspace-x"
 
-expecting success: check_output multiple-heads-prune-at-l1 "git rev-list --topo-order a3 b3 c3 ^l1"
-ok 8 - multiple heads, prune at l1
+ok 52 - rev-list --exclude with --branches
 
-expecting success: 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: 
+	compare rev-list "--exclude=refs/remotes/* --all" "--branches --tags"
 
-expecting success: check_output duplicated-head-arguments "git rev-list --topo-order l5 l5 ^l1"
-ok 10 - duplicated head arguments
+ok 53 - rev-list --exclude with --all
 
-expecting success: check_output prune-near-topo "git rev-list --topo-order a4 ^c3"
-ok 11 - prune near topo
+expecting success: 
+	compare rev-list "--exclude=refs/remotes/* --exclude=refs/tags/* --all" --branches
 
-expecting success: check_output head-has-no-parent "git rev-list --topo-order  root"
-ok 12 - head has no parent
+ok 54 - rev-list accumulates multiple --exclude
 
-expecting success: check_output two-nodes-one-head-one-base "git rev-list --topo-order  l0"
-ok 13 - two nodes - one head, one base
+expecting success: 
+	git rev-list --stdin </dev/null >actual &&
+	test_must_be_empty actual
 
-expecting success: 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
+ok 55 - rev-list should succeed with empty output on empty stdin
 
-expecting success: check_output linear-prune-l2-root "git rev-list --topo-order  l2 ^root"
-ok 15 - linear prune l2 ^root
+expecting success: 
+	git rev-list --exclude=* --all >actual &&
+	test_must_be_empty actual
 
-expecting success: check_output linear-prune-l2-l0 "git rev-list --topo-order  l2 ^l0"
-ok 16 - linear prune l2 ^l0
+ok 56 - rev-list should succeed with empty output with all refs excluded
 
-expecting success: check_output linear-prune-l2-l1 "git rev-list --topo-order  l2 ^l1"
-ok 17 - linear prune l2 ^l1
+expecting success: 
+	(
+		test_create_repo empty &&
+		cd empty &&
+		git rev-list --all >actual &&
+		test_must_be_empty actual
+	)
 
-expecting success: check_output linear-prune-l5-a4 "git rev-list --topo-order  l5 ^a4"
-ok 18 - linear prune l5 ^a4
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6018-rev-list-glob/empty/.git/
+ok 57 - rev-list should succeed with empty output with empty --all
 
-expecting success: check_output linear-prune-l5-l3 "git rev-list --topo-order  l5 ^l3"
-ok 19 - linear prune l5 ^l3
+expecting success: 
+	git rev-list --glob=does-not-match-anything >actual &&
+	test_must_be_empty actual
 
-expecting success: check_output linear-prune-l5-l4 "git rev-list --topo-order  l5 ^l4"
-ok 20 - linear prune l5 ^l4
+ok 58 - rev-list should succeed with empty output with empty glob
 
-expecting success: 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: 
 
-expecting success: check_output max-count-10-non-topo-order "git rev-list --max-count=10 l5"
-ok 22 - max-count 10 - non topo order
+	compare shortlog "subspace/one subspace/two" --branches=subspace &&
+	compare shortlog \
+	  "master subspace-x someref other/three subspace/one subspace/two" \
+	  --branches &&
+	compare shortlog master "--glob=heads/someref/* master" &&
+	compare shortlog "subspace/one subspace/two other/three" \
+	  "--glob=heads/subspace/* --glob=heads/other/*" &&
+	compare shortlog \
+	  "master other/three someref subspace-x subspace/one subspace/two" \
+	  "--glob=heads/*" &&
+	compare shortlog foo/bar --tags=foo &&
+	compare shortlog "foo/bar qux/one qux/two qux/x" --tags &&
+	compare shortlog foo/baz --remotes=foo
 
-expecting success: 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: check_output one-specified-head-reachable-from-another-a4-c3-topo-order "list_duplicates git rev-list --topo-order a4 c3"
-ok 24 - one specified head reachable from another a4, c3, --topo-order
+ok 59 - shortlog accepts --glob/--tags/--remotes
 
-expecting success: check_output one-specified-head-reachable-from-another-c3-a4-topo-order "list_duplicates git rev-list --topo-order c3 a4"
-ok 25 - one specified head reachable from another c3, a4, --topo-order
+checking known breakage: 
 
-expecting success: check_output one-specified-head-reachable-from-another-a4-c3-no-topo-order "list_duplicates git rev-list a4 c3"
-ok 26 - one specified head reachable from another a4, c3, no --topo-order
+	compare shortlog \
+	  "master other/three someref subspace-x subspace/one subspace/two" \
+	  "--glob heads/*"
 
-expecting success: check_output one-specified-head-reachable-from-another-c3-a4-no-topo-order "list_duplicates git rev-list c3 a4"
-ok 27 - one specified head reachable from another c3, a4, no --topo-order
 
-expecting success: check_output graph-with-c3-and-a4-parents-of-head "list_duplicates git rev-list m1"
-ok 28 - graph with c3 and a4 parents of head
+error: unknown option `--glob'
+usage: git shortlog [<options>] [<revision-range>] [[--] <path>...]
+   or: git log --pretty=short | git shortlog [<options>]
 
-expecting success: check_output graph-with-a4-and-c3-parents-of-head "list_duplicates git rev-list m2"
-ok 29 - graph with a4 and c3 parents of head
+    -c, --committer       Group by committer rather than author
+    -n, --numbered        sort output according to the number of commits per author
+    -s, --summary         Suppress commit descriptions, only provides commit count
+    -e, --email           Show the email address of each author
+    -w[<w>[,<i1>[,<i2>]]]
+                          Linewrap output
 
-expecting success: git rev-list --topo-order  a3 ^a3
-ok 30 - head ^head --topo-order
+not ok 60 - shortlog accepts --glob as detached option # TODO known breakage
 
-expecting success: git rev-list a3 ^a3
-ok 31 - head ^head no --topo-order
+checking known breakage: 
 
-expecting success: check_output simple-topo-order-l5r1 "git rev-list --topo-order  l5r1"
-ok 32 - simple topo order (l5r1)
+	compare shortlog master "--glob -e master"
 
-expecting success: check_output simple-topo-order-r1l5 "git rev-list --topo-order  r1l5"
-ok 33 - simple topo order (r1l5)
 
-expecting success: check_output don-t-print-things-unreachable-from-one-branch "git rev-list a3 ^b3 --topo-order"
-ok 34 - don't print things unreachable from one branch
+error: unknown option `--glob'
+usage: git shortlog [<options>] [<revision-range>] [[--] <path>...]
+   or: git log --pretty=short | git shortlog [<options>]
 
-expecting success: check_output topo-order-a4-l3 "git rev-list --topo-order a4 l3"
-ok 35 - --topo-order a4 l3
+    -c, --committer       Group by committer rather than author
+    -n, --numbered        sort output according to the number of commits per author
+    -s, --summary         Suppress commit descriptions, only provides commit count
+    -e, --email           Show the email address of each author
+    -w[<w>[,<i1>[,<i2>]]]
+                          Linewrap output
 
-# passed all 35 test(s)
-1..35
+not ok 61 - shortlog --glob is not confused by option-like argument # TODO known breakage
+
+# still have 4 known breakage(s)
+# passed all remaining 57 test(s)
+1..61
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t6002-rev-list-bisect.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6002-rev-list-bisect/.git/
-expecting success: test $_bisect_err -le $_max_diff
-ok 1 - bisection diff --bisect l0 ^root <= 0
+*** t6037-merge-ours-theirs.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6037-merge-ours-theirs/.git/
+expecting success: 
+	for i in 1 2 3 4 5 6 7 8 9
+	do
+		echo "$i"
+	done >file &&
+	git add file &&
+	cp file elif &&
+	git commit -m initial &&
 
-expecting success: test $_bisect_err -le $_max_diff
-ok 2 - bisection diff --bisect l1 ^root <= 0
+	sed -e "s/1/one/" -e "s/9/nine/" >file <elif &&
+	git commit -a -m ours &&
 
-expecting success: test $_bisect_err -le $_max_diff
-ok 3 - bisection diff --bisect l2 ^root <= 0
+	git checkout -b side HEAD^ &&
 
-expecting success: test $_bisect_err -le $_max_diff
-ok 4 - bisection diff --bisect a0 ^root <= 0
+	sed -e "s/9/nueve/" >file <elif &&
+	git commit -a -m theirs &&
 
-expecting success: test $_bisect_err -le $_max_diff
-ok 5 - bisection diff --bisect a1 ^root <= 0
+	git checkout master^0
 
-expecting success: test $_bisect_err -le $_max_diff
-ok 6 - bisection diff --bisect a2 ^root <= 0
+[master (root-commit) 75da2e5] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 9 insertions(+)
+ create mode 100644 file
+[master dc7ed12] ours
+ Author: A U Thor <author@example.com>
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+Switched to a new branch 'side'
+[side f350a9c] theirs
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Note: checking out 'master^0'.
 
-expecting success: test $_bisect_err -le $_max_diff
-ok 7 - bisection diff --bisect a3 ^root <= 0
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by performing another checkout.
 
-expecting success: test $_bisect_err -le $_max_diff
-ok 8 - bisection diff --bisect b1 ^root <= 0
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -b with the checkout command again. Example:
 
-expecting success: test $_bisect_err -le $_max_diff
-ok 9 - bisection diff --bisect b2 ^root <= 0
+  git checkout -b <new-branch-name>
 
-expecting success: test $_bisect_err -le $_max_diff
-ok 10 - bisection diff --bisect b3 ^root <= 0
+HEAD is now at dc7ed12 ours
+ok 1 - setup
 
-expecting success: test $_bisect_err -le $_max_diff
-ok 11 - bisection diff --bisect c1 ^root <= 0
+expecting success: 
+	git reset --hard master &&
+	test_must_fail git merge -s recursive side &&
+	grep nine file &&
+	grep nueve file &&
+	! grep 9 file &&
+	grep one file &&
+	! grep 1 file
 
-expecting success: test $_bisect_err -le $_max_diff
-ok 12 - bisection diff --bisect c2 ^root <= 0
+HEAD is now at dc7ed12 ours
+Merging:
+dc7ed12 ours
+virtual side
+found 1 common ancestor:
+75da2e5 initial
+Auto-merging file
+CONFLICT (content): Merge conflict in file
+Automatic merge failed; fix conflicts and then commit the result.
+nine
+nueve
+one
+ok 2 - plain recursive - should conflict
 
-expecting success: test $_bisect_err -le $_max_diff
-ok 13 - bisection diff --bisect c3 ^root <= 0
+expecting success: 
+	git reset --hard master &&
+	git merge -s recursive -Xtheirs side &&
+	! grep nine file &&
+	grep nueve file &&
+	! grep 9 file &&
+	grep one file &&
+	! grep 1 file
 
-expecting success: test $_bisect_err -le $_max_diff
-ok 14 - bisection diff --bisect E ^F <= 0
+HEAD is now at dc7ed12 ours
+Merging:
+dc7ed12 ours
+virtual side
+found 1 common ancestor:
+75da2e5 initial
+Auto-merging file
+Merge made by the 'recursive' strategy.
+ file | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+nueve
+one
+ok 3 - recursive favouring theirs
 
-expecting success: test $_bisect_err -le $_max_diff
-ok 15 - bisection diff --bisect e1 ^F <= 0
+expecting success: 
+	git reset --hard master &&
+	git merge -s recursive -X ours side &&
+	grep nine file &&
+	! grep nueve file &&
+	! grep 9 file &&
+	grep one file &&
+	! grep 1 file
 
-expecting success: test $_bisect_err -le $_max_diff
-ok 16 - bisection diff --bisect e2 ^F <= 0
+HEAD is now at dc7ed12 ours
+Merging:
+dc7ed12 ours
+virtual side
+found 1 common ancestor:
+75da2e5 initial
+Auto-merging file
+Skipped file (merged same as existing)
+Merge made by the 'recursive' strategy.
+nine
+one
+ok 4 - recursive favouring ours
 
-expecting success: test $_bisect_err -le $_max_diff
-ok 17 - bisection diff --bisect e3 ^F <= 0
+expecting success: 
+	echo file binary >.gitattributes &&
 
-expecting success: test $_bisect_err -le $_max_diff
-ok 18 - bisection diff --bisect e4 ^F <= 0
+	git reset --hard master &&
+	git merge -s recursive -X theirs side &&
+	git diff --exit-code side HEAD -- file &&
 
-expecting success: test $_bisect_err -le $_max_diff
-ok 19 - bisection diff --bisect e5 ^F <= 0
+	git reset --hard master &&
+	git merge -s recursive -X ours side &&
+	git diff --exit-code master HEAD -- file
 
-expecting success: test $_bisect_err -le $_max_diff
-ok 20 - bisection diff --bisect e6 ^F <= 0
+HEAD is now at dc7ed12 ours
+Merging:
+dc7ed12 ours
+virtual side
+found 1 common ancestor:
+75da2e5 initial
+Auto-merging file
+Merge made by the 'recursive' strategy.
+ file | Bin 23 -> 22 bytes
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+HEAD is now at dc7ed12 ours
+Merging:
+dc7ed12 ours
+virtual side
+found 1 common ancestor:
+75da2e5 initial
+Auto-merging file
+Skipped file (merged same as existing)
+Merge made by the 'recursive' strategy.
+ok 5 - binary file with -Xours/-Xtheirs
 
-expecting success: test $_bisect_err -le $_max_diff
-ok 21 - bisection diff --bisect e7 ^F <= 0
+expecting success: 
+	git reset --hard master && git pull -s recursive -Xours . side &&
+	git reset --hard master && git pull -s recursive -X ours . side &&
+	git reset --hard master && git pull -s recursive -Xtheirs . side &&
+	git reset --hard master && git pull -s recursive -X theirs . side &&
+	git reset --hard master && test_must_fail git pull -s recursive -X bork . side
 
-expecting success: test $_bisect_err -le $_max_diff
-ok 22 - bisection diff --bisect f1 ^F <= 0
+HEAD is now at dc7ed12 ours
+From .
+ * branch            side       -> FETCH_HEAD
+Merging:
+dc7ed12 ours
+virtual f350a9cafdf1afa76d962c012d899e6736115673
+found 1 common ancestor:
+75da2e5 initial
+Auto-merging file
+Skipped file (merged same as existing)
+Merge made by the 'recursive' strategy.
+HEAD is now at dc7ed12 ours
+From .
+ * branch            side       -> FETCH_HEAD
+Merging:
+dc7ed12 ours
+virtual f350a9cafdf1afa76d962c012d899e6736115673
+found 1 common ancestor:
+75da2e5 initial
+Auto-merging file
+Skipped file (merged same as existing)
+Merge made by the 'recursive' strategy.
+HEAD is now at dc7ed12 ours
+From .
+ * branch            side       -> FETCH_HEAD
+Merging:
+dc7ed12 ours
+virtual f350a9cafdf1afa76d962c012d899e6736115673
+found 1 common ancestor:
+75da2e5 initial
+Auto-merging file
+Merge made by the 'recursive' strategy.
+ file | Bin 23 -> 22 bytes
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+HEAD is now at dc7ed12 ours
+From .
+ * branch            side       -> FETCH_HEAD
+Merging:
+dc7ed12 ours
+virtual f350a9cafdf1afa76d962c012d899e6736115673
+found 1 common ancestor:
+75da2e5 initial
+Auto-merging file
+Merge made by the 'recursive' strategy.
+ file | Bin 23 -> 22 bytes
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+HEAD is now at dc7ed12 ours
+From .
+ * branch            side       -> FETCH_HEAD
+fatal: Unknown option for merge-recursive: -Xbork
+ok 6 - pull passes -X to underlying merge
 
-expecting success: test $_bisect_err -le $_max_diff
-ok 23 - bisection diff --bisect f2 ^F <= 0
+checking prerequisite: SYMLINKS
 
-expecting success: test $_bisect_err -le $_max_diff
-ok 24 - bisection diff --bisect f3 ^F <= 0
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
+	# test whether the filesystem supports symbolic links
+	ln -s x y && test -h y
 
-expecting success: test $_bisect_err -le $_max_diff
-ok 25 - bisection diff --bisect f4 ^F <= 0
+)
+prerequisite SYMLINKS ok
+expecting success: 
+	git reset --hard master &&
+	git checkout -b two master &&
+	ln -s target-zero link &&
+	git add link &&
+	git commit -m "add link pointing to zero" &&
 
-expecting success: test $_bisect_err -le $_max_diff
-ok 26 - bisection diff --bisect E ^F <= 0
+	ln -f -s target-two link &&
+	git commit -m "add link pointing to two" link &&
 
-expecting success: test $_bisect_err -le $_max_diff
-ok 27 - bisection diff --bisect V ^U <= 1
+	git checkout -b one HEAD^ &&
+	ln -f -s target-one link &&
+	git commit -m "add link pointing to one" link &&
 
-expecting success: test $_bisect_err -le $_max_diff
-ok 28 - bisection diff --bisect V ^U ^u1 ^u2 ^u3 <= 0
+	# we expect symbolic links not to resolve automatically, of course
+	git checkout one^0 &&
+	test_must_fail git merge -s recursive two &&
 
-expecting success: test $_bisect_err -le $_max_diff
-ok 29 - bisection diff --bisect u1 ^U <= 0
+	# favor theirs to resolve to target-two?
+	git reset --hard &&
+	git checkout one^0 &&
+	git merge -s recursive -X theirs two &&
+	git diff --exit-code two HEAD link &&
 
-expecting success: test $_bisect_err -le $_max_diff
-ok 30 - bisection diff --bisect u2 ^U <= 0
+	# favor ours to resolve to target-one?
+	git reset --hard &&
+	git checkout one^0 &&
+	git merge -s recursive -X ours two &&
+	git diff --exit-code one HEAD link
 
-expecting success: test $_bisect_err -le $_max_diff
-ok 31 - bisection diff --bisect u3 ^U <= 0
 
-expecting success: test $_bisect_err -le $_max_diff
-ok 32 - bisection diff --bisect u4 ^U <= 0
+HEAD is now at dc7ed12 ours
+Switched to a new branch 'two'
+[two 737418d] add link pointing to zero
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 120000 link
+[two 92aee3c] add link pointing to two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'one'
+[one 0d54a4b] add link pointing to one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Note: checking out 'one^0'.
 
-expecting success: test $_bisect_err -le $_max_diff
-ok 33 - bisection diff --bisect u5 ^U <= 0
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by performing another checkout.
 
-expecting success: check_output bisect-l5-root "git rev-list $_bisect_option l5 ^root"
-ok 34 - --bisect l5 ^root
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -b with the checkout command again. Example:
 
-expecting success: check_output bisect-l5-root-c3 "git rev-list $_bisect_option l5 ^root ^c3"
-ok 35 - --bisect l5 ^root ^c3
+  git checkout -b <new-branch-name>
 
-expecting success: check_output bisect-l5-root-c3-b4 "git rev-list $_bisect_option l5 ^c3 ^b4"
-ok 36 - --bisect l5 ^root ^c3 ^b4
+HEAD is now at 0d54a4b add link pointing to one
+Merging:
+0d54a4b add link pointing to one
+virtual two
+found 1 common ancestor:
+737418d add link pointing to zero
+Auto-merging link
+CONFLICT (content): Merge conflict in link
+Automatic merge failed; fix conflicts and then commit the result.
+HEAD is now at 0d54a4b add link pointing to one
+HEAD is now at 0d54a4b add link pointing to one
+Merging:
+0d54a4b add link pointing to one
+virtual two
+found 1 common ancestor:
+737418d add link pointing to zero
+Auto-merging link
+Merge made by the 'recursive' strategy.
+ link | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+HEAD is now at 4fa22ff Merge branch 'two' into HEAD
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-expecting success: check_output bisect-l3-root-c3-b4 "git rev-list $_bisect_option l3 ^root ^c3 ^b4"
-ok 37 - --bisect l3 ^root ^c3 ^b4
+  4fa22ff Merge branch 'two' into HEAD
 
-expecting success: 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
+If you want to keep it by creating a new branch, this may be a good time
+to do so with:
 
-expecting success: 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
+ git branch <new-branch-name> 4fa22ff
 
-expecting success: 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
+HEAD is now at 0d54a4b add link pointing to one
+Merging:
+0d54a4b add link pointing to one
+virtual two
+found 1 common ancestor:
+737418d add link pointing to zero
+Auto-merging link
+Skipped link (merged same as existing)
+Merge made by the 'recursive' strategy.
+ok 7 - symlink with -Xours/-Xtheirs
 
-expecting success: check_output bisect-a4-a2-a3-b4 "git rev-list $_bisect_option a4 ^a2 ^a3 ^b4"
-ok 41 - --bisect a4 ^a2 ^a3 ^b4
+# passed all 7 test(s)
+1..7
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t6031-merge-filemode.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6031-merge-filemode/.git/
+expecting success: 
+	: >file1 &&
+	git add file1 &&
+	git commit -m initial &&
+	git checkout -b a1 master &&
+	: >dummy &&
+	git add dummy &&
+	git commit -m a &&
+	git checkout -b b1 master &&
+	test_chmod +x file1 &&
+	git add file1 &&
+	git commit -m b1
 
-expecting success: 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
+[master (root-commit) 1ef6b3a] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 file1
+Switched to a new branch 'a1'
+[a1 d82433d] a
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 dummy
+Switched to a new branch 'b1'
+[b1 83d053b] b1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ mode change 100644 => 100755 file1
+ok 1 - set up mode change in one branch
 
-expecting success: 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: 
+		git checkout -f $us &&
+		git merge -s $strategy $them &&
+		git ls-files -s file1 | grep ^100755
+	
+Switched to branch 'a1'
+Merging:
+d82433d a
+virtual b1
+found 1 common ancestor:
+1ef6b3a initial
+Merge made by the 'recursive' strategy.
+ file1 | 0
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ mode change 100644 => 100755 file1
+100755 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0	file1
+ok 2 - resolve single mode change (recursive, a1)
 
-expecting success: check_output bisect-a4-a2-a3-b4 "git rev-list $_bisect_option a4 ^a2 ^a3 ^b4"
-ok 44 - --bisect a4 ^a2 ^a3 ^b4
+checking prerequisite: FILEMODE
 
-expecting success: 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
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
+	test "$(git config --bool core.filemode)" = true
 
+)
+prerequisite FILEMODE ok
 expecting success: 
-	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
+		test -x file1
+	
+ok 3 - verify executable bit on file (recursive, a1)
 
-ok 46 - set up fake --bisect refs
+expecting success: 
+		git checkout -f $us &&
+		git merge -s $strategy $them &&
+		git ls-files -s file1 | grep ^100755
+	
+Switched to branch 'b1'
+Updating 83d053b..7702669
+Fast-forward
+ dummy | 0
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 dummy
+100755 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0	file1
+ok 4 - resolve single mode change (recursive, b1)
 
 expecting success: 
-	# the only thing between c3 and c1 is c2
-	git rev-parse c2 >expect &&
-	git rev-list --bisect >actual &&
-	test_cmp expect actual
+		test -x file1
+	
+ok 5 - verify executable bit on file (recursive, b1)
 
-ok 47 - rev-list --bisect can default to good/bad refs
+expecting success: 
+		git checkout -f $us &&
+		git merge -s $strategy $them &&
+		git ls-files -s file1 | grep ^100755
+	
+Switched to branch 'a1'
+Already up to date.
+100755 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0	file1
+ok 6 - resolve single mode change (resolve, a1)
 
 expecting success: 
-	git rev-parse c3 ^b1 ^c1 >expect &&
-	git rev-parse --bisect >actual &&
+		test -x file1
+	
+ok 7 - verify executable bit on file (resolve, a1)
 
-	# 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: 
+		git checkout -f $us &&
+		git merge -s $strategy $them &&
+		git ls-files -s file1 | grep ^100755
+	
+Switched to branch 'b1'
+Already up to date.
+100755 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0	file1
+ok 8 - resolve single mode change (resolve, b1)
 
-ok 48 - rev-parse --bisect can default to good/bad refs
+expecting success: 
+		test -x file1
+	
+ok 9 - verify executable bit on file (resolve, b1)
 
-# passed all 48 test(s)
-1..48
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t6034-merge-rename-nocruft.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6034-merge-rename-nocruft/.git/
 expecting success: 
-cat >A <<\EOF &&
-a aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-b bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
-c cccccccccccccccccccccccccccccccccccccccccccccccc
-d dddddddddddddddddddddddddddddddddddddddddddddddd
-e eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee
-f ffffffffffffffffffffffffffffffffffffffffffffffff
-g gggggggggggggggggggggggggggggggggggggggggggggggg
-h hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh
-i iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii
-j jjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjj
-k kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk
-l llllllllllllllllllllllllllllllllllllllllllllllll
-m mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm
-n nnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnn
-o oooooooooooooooooooooooooooooooooooooooooooooooo
-EOF
+	git reset --hard HEAD &&
+	git checkout -b a2 master &&
+	: >file2 &&
+	H=$(git hash-object file2) &&
+	test_chmod +x file2 &&
+	git commit -m a2 &&
+	git checkout -b b2 master &&
+	: >file2 &&
+	git add file2 &&
+	git commit -m b2 &&
+	{
+		echo "100755 $H 2	file2"
+		echo "100644 $H 3	file2"
+	} >expect
 
-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
+HEAD is now at 7702669 Merge branch 'b1' into a1
+Switched to a new branch 'a2'
+[a2 638cc5d] a2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100755 file2
+Switched to a new branch 'b2'
+[b2 5af9105] b2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 file2
+ok 10 - set up mode change in both branches
 
-git add A M &&
-git commit -m "initial has A and M" &&
-git branch white &&
-git branch red &&
-git branch blue &&
+expecting success: 
+		git reset --hard &&
+		git checkout -f a2 &&
+		test_must_fail git merge -s $strategy b2 &&
+		git ls-files -u >actual &&
+		test_cmp expect actual &&
+		git ls-files -s file2 | grep ^100755
+	
+HEAD is now at 5af9105 b2
+Switched to branch 'a2'
+Merging:
+638cc5d a2
+virtual b2
+found 1 common ancestor:
+1ef6b3a initial
+Auto-merging file2
+CONFLICT (add/add): Merge conflict in file2
+Automatic merge failed; fix conflicts and then commit the result.
+100755 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 2	file2
+ok 11 - detect conflict on double mode change (recursive)
 
-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" &&
+expecting success: 
+		test -x file2
+	
+ok 12 - verify executable bit on file (recursive)
 
-git checkout red &&
-echo created by red >R &&
-git update-index --add R &&
-git commit -m "red creates R" &&
+expecting success: 
+		git reset --hard &&
+		git checkout -f a2 &&
+		test_must_fail git merge -s $strategy b2 &&
+		git ls-files -u >actual &&
+		test_cmp expect actual &&
+		git ls-files -s file2 | grep ^100755
+	
+HEAD is now at 638cc5d a2
+Already on 'a2'
+error: Merge requires file-level merging
+Trying really trivial in-index merge...
+Nope.
+Trying simple merge.
+Simple merge failed, trying Automatic merge.
+ERROR: File file2 added identically in both branches,
+ERROR: but permissions conflict 100755->100644.
+fatal: merge program failed
+Automatic merge failed; fix conflicts and then commit the result.
+100755 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 2	file2
+ok 13 - detect conflict on double mode change (resolve)
 
-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" &&
+expecting success: 
+		test -x file2
+	
+ok 14 - verify executable bit on file (resolve)
 
-git checkout master
-[master (root-commit) 4764f87] 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 61e6dbf] 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 99cef97] red creates R
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 R
-Switched to branch 'blue'
-[blue 263adf1] blue modify A
+expecting success: 
+	git reset --hard &&
+	git checkout -b deletion master &&
+	git rm file1 &&
+	git commit -m deletion
+
+HEAD is now at 638cc5d a2
+Switched to a new branch 'deletion'
+rm 'file1'
+[deletion dc4c2d3] deletion
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to branch 'master'
-ok 1 - setup
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ delete mode 100644 file1
+ok 15 - set up delete/modechange scenario
 
 expecting success: 
-	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'
+		git reset --hard &&
+		git checkout $us &&
+		test_must_fail git merge -s $strategy $them
+	
+HEAD is now at dc4c2d3 deletion
+Switched to branch 'b1'
 Merging:
-99cef97 red creates R
-virtual white
+7702669 Merge branch 'b1' into a1
+virtual deletion
 found 1 common ancestor:
-4764f87 initial has A and M
-Merge made by the 'recursive' 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)
+1ef6b3a initial
+CONFLICT (modify/delete): file1 deleted in deletion and modified in HEAD. Version HEAD of file1 left in tree.
+Automatic merge failed; fix conflicts and then commit the result.
+ok 16 - detect delete/modechange conflict (recursive, b1)
 
 expecting success: 
-	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'
+		git reset --hard &&
+		git checkout $us &&
+		test_must_fail git merge -s $strategy $them
+	
+HEAD is now at 7702669 Merge branch 'b1' into a1
+Switched to branch 'deletion'
 Merging:
-61e6dbf white renames A->B, M->N
-virtual blue
+dc4c2d3 deletion
+virtual b1
 found 1 common ancestor:
-4764f87 initial has A and M
-Skipped N (merged same as existing)
-Auto-merging B
-Merge made by the 'recursive' strategy.
- B | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-1db6abaa095ec16043333967f8d0dbaa01cdf029
-ok 3 - merge blue into white (A->B, mod A, A untracked)
+1ef6b3a initial
+CONFLICT (modify/delete): file1 deleted in HEAD and modified in b1. Version b1 of file1 left in tree.
+Automatic merge failed; fix conflicts and then commit the result.
+ok 17 - detect delete/modechange conflict (recursive, deletion)
 
-# passed all 3 test(s)
-1..3
+expecting success: 
+		git reset --hard &&
+		git checkout $us &&
+		test_must_fail git merge -s $strategy $them
+	
+HEAD is now at dc4c2d3 deletion
+Switched to branch 'b1'
+error: Merge requires file-level merging
+Trying really trivial in-index merge...
+Nope.
+Trying simple merge.
+Simple merge failed, trying Automatic merge.
+ERROR: File file1 deleted on one branch but had its
+ERROR: permissions changed on the other.
+fatal: merge program failed
+Automatic merge failed; fix conflicts and then commit the result.
+ok 18 - detect delete/modechange conflict (resolve, b1)
+
+expecting success: 
+		git reset --hard &&
+		git checkout $us &&
+		test_must_fail git merge -s $strategy $them
+	
+HEAD is now at 7702669 Merge branch 'b1' into a1
+Switched to branch 'deletion'
+error: Merge requires file-level merging
+Trying really trivial in-index merge...
+Nope.
+Trying simple merge.
+Simple merge failed, trying Automatic merge.
+ERROR: File file1 deleted on one branch but had its
+ERROR: permissions changed on the other.
+fatal: merge program failed
+Automatic merge failed; fix conflicts and then commit the result.
+ok 19 - detect delete/modechange conflict (resolve, deletion)
+
+# passed all 19 test(s)
+1..19
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t6045-merge-rename-delete.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6045-merge-rename-delete/.git/
+expecting success: 
+	echo foo >A &&
+	git add A &&
+	git commit -m "initial" &&
+
+	git checkout -b rename &&
+	git mv A B &&
+	git commit -m "rename" &&
+
+	git checkout master &&
+	git rm A &&
+	git commit -m "delete" &&
+
+	test_must_fail git merge --strategy=recursive rename >output &&
+	test_i18ngrep "CONFLICT (rename/delete): A deleted in HEAD and renamed to B in rename. Version rename of B left in tree." output
+
+[master (root-commit) 5ae1879] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A
+Switched to a new branch 'rename'
+[rename 33490fd] rename
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename A => B (100%)
+Switched to branch 'master'
+rm 'A'
+[master 2d12e3b] delete
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 A
+CONFLICT (rename/delete): A deleted in HEAD and renamed to B in rename. Version rename of B left in tree.
+ok 1 - rename/delete
+
+# passed all 1 test(s)
+1..1
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
 *** t5500-fetch-pack.sh ***
@@ -220061,10 +221750,10 @@
 got ack (3) 3ac3ef48e6a300496e8466ad8a80df7f37503a7e
 got ack (1) 3ac3ef48e6a300496e8466ad8a80df7f37503a7e
 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: Counting objects:   0% (1/192)           
remote: Counting objects:   1% (2/192)           
remote: Counting objects:   2% (4/192)           
remote: Counting objects:   3% (6/192)           
remote: Counting objects:   4% (8/192)           
remote: Counting objects:   5% (10/192)           
remote: Counting objects:   6% (12/192)           
remote: Counting objects:   7% (14/192)           
remote: Counting objects:   8% (16/192)           
remote: Counting objects:   9% (18/192)           
remote: Counting objects:  10% (20/192)           
remote: Counting objects:  11% (22/192)           
remote: Counting objects:  12% (24/192)           
remote: Counting objects:  13% (25/192)           
remote: Counting objects:  14% (27/192)           
remote: Counting objects:  15% (29/192)           
remote: Counting objects:  16% (31/192)           
remote: Counting objects:  17% (33/192)           
remote: Counting objects:  18% (35/192)           
remote: Counting objects:  19% (37/192)           
remote: Counting objects:  20% (39/192)           
remote: Counting objects:  21% (41/192)           
remote: Counting objects:  22% (43/192)           
remote: Counting objects:  23% (45/192)           
remote: Counting objects:  24% (47/192)           
remote: Counting objects:  25% (48/192)           
remote: Counting objects:  26% (50/192)           
remote: Counting objects:  27% (52/192)           
remote: Counting objects:  28% (54/192)           
remote: Counting objects:  29% (56/192)           
remote: Counting objects:  30% (58/192)           
remote: Counting objects:  31% (60/192)           
remote: Counting objects:  32% (62/192)           
remote: Counting objects:  33% (64/192)           
remote: Counting objects:  34% (66/192)           
remote: Counting objects:  35% (68/192)           
remote: Counting objects:  36% (70/192)           
remote: Counting objects:  37% (72/192)           
remote: Counting objects:  38% (73/192)           
remote: Counting objects:  39% (75/192)           
remote: Counting objects:  40% (77/192)           
remote: Counting objects:  41% (79/192)           
remote: Counting objects:  42% (81/192)           
remote: Counting objects:  43% (83/192)           
remote: Counting objects:  44% (85/192)           
remote: Counting objects:  45% (87/192)           
remote: Counting objects:  46% (89/192)           
remote: Counting objects:  47% (91/192)           
remote: Counting objects:  48% (93/192)           
remote: Counting objects:  49% (95/192)           
remote: Counting objects:  50% (96/192)           
remote: Counting objects:  51% (98/192)           
remote: Counting objects:  52% (100/192)           
remote: Counting objects:  53% (102/192)           
remote: Counting objects:  54% (104/192)           
remote: Counting objects:  55% (106/192)           
remote: Counting objects:  56% (108/192)           
remote: Counting objects:  57% (110/192)           
remote: Counting objects:  58% (112/192)           
remote: Counting objects:  59% (114/192)           
remote: Counting objects:  60% (116/192)           
remote: Counting objects:  61% (118/192)           
remote: Counting objects:  62% (120/192)           
remote: Counting objects:  63% (121/192)           
remote: Counting objects:  64% (123/192)           
remote: Counting objects:  65% (125/192)           
remote: Counting objects:  66% (127/192)           
remote: Counting objects:  67% (129/192)           
remote: Counting objects:  68% (131/192)           
remote: Counting objects:  69% (133/192)           
remote: Counting objects:  70% (135/192)           
remote: Counting objects:  71% (137/192)           
remote: Counting objects:  72% (139/192)           
remote: Counting objects:  73% (141/192)           
remote: Counting objects:  74% (143/192)           
remote: Counting objects:  75% (144/192)           
remote: Counting objects:  76% (146/192)           
remote: Counting objects:  77% (148/192)           
remote: Counting objects:  78% (150/192)           
remote: Counting objects:  79% (152/192)           
remote: Counting objects:  80% (154/192)           
remote: Counting objects:  81% (156/192)           
remote: Counting objects:  82% (158/192)           
remote: Counting objects:  83% (160/192)           
remote: Counting objects:  84% (162/192)           
remote: Counting objects:  85% (164/192)           
remote: Counting objects:  86% (166/192)           
remote: Counting objects:  87% (168/192)           
remote: Counting objects:  88% (169/192)           
remote: Counting objects:  89% (171/192)           
remote: Counting objects:  90% (173/192)           
remote: Counting objects:  91% (175/192)           
remote: Counting objects:  92% (177/192)           
remote: Counting objects:  93% (179/192)           
remote: Counting objects:  94% (181/192)           
remote: Counting objects:  95% (183/192)           
remote: Counting objects:  96% (185/192)           
remote: Counting objects:  97% (187/192)           
remote: Counting objects:  98% (189/192)           
remote: Counting objects:  99% (191/192)           
remote: Counting objects: 100% (192/192)           
remote: Counting objects: 100% (192/192), done.        
 remote: Compressing objects:   1% (1/64)           
remote: Compressing objects:   3% (2/64)           
remote: Compressing objects:   4% (3/64)           
remote: Compressing objects:   6% (4/64)           
remote: Compressing objects:   7% (5/64)           
remote: Compressing objects:   9% (6/64)           
remote: Compressing objects:  10% (7/64)           
remote: Compressing objects:  12% (8/64)           
remote: Compressing objects:  14% (9/64)           
remote: Compressing objects:  15% (10/64)           
remote: Compressing objects:  17% (11/64)           
remote: Compressing objects:  18% (12/64)           
remote: Compressing objects:  20% (13/64)           
remote: Compressing objects:  21% (14/64)           
remote: Compressing objects:  23% (15/64)           
remote: Compressing objects:  25% (16/64)           
remote: Compressing objects:  26% (17/64)           
remote: Compressing objects:  28% (18/64)           
remote: Compressing objects:  29% (19/64)           
remote: Compressing objects:  31% (20/64)           
remote: Compressing objects:  32% (21/64)           
remote: Compressing objects:  34% (22/64)           
remote: Compressing objects:  35% (23/64)           
remote: Compressing objects:  37% (24/64)           
remote: Compressing objects:  39% (25/64)           
remote: Compressing objects:  40% (26/64)           
remote: Compressing objects:  42% (27/64)           
remote: Compressing objects:  43% (28/64)           
remote: Compressing objects:  45% (29/64)           
remote: Compressing objects:  46% (30/64)           
remote: Compressing objects:  48% (31/64)           
remote: Compressing objects:  50% (32/64)           
remote: Compressing objects:  51% (33/64)           
remote: Compressing objects:  53% (34/64)           
remote: Compressing objects:  54% (35/64)           
remote: Compressing objects:  56% (36/64)           
remote: Compressing objects:  57% (37/64)           
remote: Compressing objects:  59% (38/64)           
remote: Compressing objects:  60% (39/64)           
remote: Compressing objects:  62% (40/64)           
remote: Compressing objects:  64% (41/64)           
remote: Compressing objects:  65% (42/64)           
remote: Compressing objects:  67% (43/64)           
remote: Compressing objects:  68% (44/64)           
remote: Compressing objects:  70% (45/64)           
remote: Compressing objects:  71% (46/64)           
remote: Compressing objects:  73% (47/64)           
remote: Compressing objects:  75% (48/64)           
remote: Compressing objects:  76% (49/64)           
remote: Compressing objects:  78% (50/64)           
remote: Compressing objects:  79% (51/64)           
remote: Compressing objects:  81% (52/64)           
remote: Compressing objects:  82% (53/64)           
remote: Compressing objects:  84% (54/64)           
remote: Compressing objects:  85% (55/64)           
remote: Compressing objects:  87% (56/64)           
remote: Compressing objects:  89% (57/64)           
remote: Compressing objects:  90% (58/64)           
remote: Compressing objects:  92% (59/64)           
remote: Compressing objects:  93% (60/64)           
remote: Compressing objects:  95% (61/64)           
remote: Compressing objects:  96% (62/64)           
remote: Compressing objects:  98% (63/64)           
remote: Compressing objects: 100% (64/64)           
remote: Compressing objects: 100% (64/64), done.        
 Receiving objects:   0% (1/192)   
Receiving objects:   1% (2/192)   
Receiving objects:   2% (4/192)   
Receiving objects:   3% (6/192)   
Receiving objects:   4% (8/192)   
Receiving objects:   5% (10/192)   
Receiving objects:   6% (12/192)   
Receiving objects:   7% (14/192)   
Receiving objects:   8% (16/192)   
Receiving objects:   9% (18/192)   
Receiving objects:  10% (20/192)   
Receiving objects:  11% (22/192)   
Receiving objects:  12% (24/192)   
Receiving objects:  13% (25/192)   
Receiving objects:  14% (27/192)   
Receiving objects:  15% (29/192)   
Receiving objects:  16% (31/192)   
Receiving objects:  17% (33/192)   
Receiving objects:  18% (35/192)   
Receiving objects:  19% (37/192)   
Receiving objects:  20% (39/192)   
Receiving objects:  21% (41/192)   
Receiving objects:  22% (43/192)   
Receiving objects:  23% (45/192)   
Receiving objects:  24% (47/192)   
Receiving objects:  25% (48/192)   
Receiving objects:  26% (50/192)   
remote: Total 192 (delta 0), reused 0 (delta 0)        
-Receiving objects:  27% (52/192)   
Receiving objects:  28% (54/192)   
Receiving objects:  29% (56/192)   
Receiving objects:  30% (58/192)   
Receiving objects:  31% (60/192)   
Receiving objects:  32% (62/192)   
Receiving objects:  33% (64/192)   
Receiving objects:  34% (66/192)   
Receiving objects:  35% (68/192)   
Receiving objects:  36% (70/192)   
Receiving objects:  37% (72/192)   
Receiving objects:  38% (73/192)   
Receiving objects:  39% (75/192)   
Receiving objects:  40% (77/192)   
Receiving objects:  41% (79/192)   
Receiving objects:  42% (81/192)   
Receiving objects:  43% (83/192)   
Receiving objects:  44% (85/192)   
Receiving objects:  45% (87/192)   
Receiving objects:  46% (89/192)   
Receiving objects:  47% (91/192)   
Receiving objects:  48% (93/192)   
Receiving objects:  49% (95/192)   
Receiving objects:  50% (96/192)   
Receiving objects:  51% (98/192)   
Receiving objects:  52% (100/192)   
Receiving objects:  53% (102/192)   
Receiving objects:  54% (104/192)   
Receiving objects:  55% (106/192)   
Receiving objects:  56% (108/192)   
Receiving objects:  57% (110/192)   
Receiving objects:  58% (112/192)   
Receiving objects:  59% (114/192)   
Receiving objects:  60% (116/192)   
Receiving objects:  61% (118/192)   
Receiving objects:  62% (120/192)   
Receiving objects:  63% (121/192)   
Receiving objects:  64% (123/192)   
Receiving objects:  65% (125/192)   
Receiving objects:  66% (127/192)   
Receiving objects:  67% (129/192)   
Receiving objects:  68% (131/192)   
Receiving objects:  69% (133/192)   
Receiving objects:  70% (135/192)   
Receiving objects:  71% (137/192)   
Receiving objects:  72% (139/192)   
Receiving objects:  73% (141/192)   
Receiving objects:  74% (143/192)   
Receiving objects:  75% (144/192)   
Receiving objects:  76% (146/192)   
Receiving objects:  77% (148/192)   
Receiving objects:  78% (150/192)   
Receiving objects:  79% (152/192)   
Receiving objects:  80% (154/192)   
Receiving objects:  81% (156/192)   
Receiving objects:  82% (158/192)   
Receiving objects:  83% (160/192)   
Receiving objects:  84% (162/192)   
Receiving objects:  85% (164/192)   
Receiving objects:  86% (166/192)   
Receiving objects:  87% (168/192)   
Receiving objects:  88% (169/192)   
Receiving objects:  89% (171/192)   
Receiving objects:  90% (173/192)   
Receiving objects:  91% (175/192)   
Receiving objects:  92% (177/192)   
Receiving objects:  93% (179/192)   
Receiving objects:  94% (181/192)   
Receiving objects:  95% (183/192)   
Receiving objects:  96% (185/192)   
Receiving objects:  97% (187/192)   
Receiving objects:  98% (189/192)   
Receiving objects:  99% (191/192)   
Receiving objects: 100% (192/192)   
Receiving objects: 100% (192/192), 16.30 KiB | 201.00 KiB/s, done.
+Receiving objects:  27% (52/192)   
Receiving objects:  28% (54/192)   
Receiving objects:  29% (56/192)   
Receiving objects:  30% (58/192)   
Receiving objects:  31% (60/192)   
Receiving objects:  32% (62/192)   
Receiving objects:  33% (64/192)   
Receiving objects:  34% (66/192)   
Receiving objects:  35% (68/192)   
Receiving objects:  36% (70/192)   
Receiving objects:  37% (72/192)   
Receiving objects:  38% (73/192)   
Receiving objects:  39% (75/192)   
Receiving objects:  40% (77/192)   
Receiving objects:  41% (79/192)   
Receiving objects:  42% (81/192)   
Receiving objects:  43% (83/192)   
Receiving objects:  44% (85/192)   
Receiving objects:  45% (87/192)   
Receiving objects:  46% (89/192)   
Receiving objects:  47% (91/192)   
Receiving objects:  48% (93/192)   
Receiving objects:  49% (95/192)   
Receiving objects:  50% (96/192)   
Receiving objects:  51% (98/192)   
Receiving objects:  52% (100/192)   
Receiving objects:  53% (102/192)   
Receiving objects:  54% (104/192)   
Receiving objects:  55% (106/192)   
Receiving objects:  56% (108/192)   
Receiving objects:  57% (110/192)   
Receiving objects:  58% (112/192)   
Receiving objects:  59% (114/192)   
Receiving objects:  60% (116/192)   
Receiving objects:  61% (118/192)   
Receiving objects:  62% (120/192)   
Receiving objects:  63% (121/192)   
Receiving objects:  64% (123/192)   
Receiving objects:  65% (125/192)   
Receiving objects:  66% (127/192)   
Receiving objects:  67% (129/192)   
Receiving objects:  68% (131/192)   
Receiving objects:  69% (133/192)   
Receiving objects:  70% (135/192)   
Receiving objects:  71% (137/192)   
Receiving objects:  72% (139/192)   
Receiving objects:  73% (141/192)   
Receiving objects:  74% (143/192)   
Receiving objects:  75% (144/192)   
Receiving objects:  76% (146/192)   
Receiving objects:  77% (148/192)   
Receiving objects:  78% (150/192)   
Receiving objects:  79% (152/192)   
Receiving objects:  80% (154/192)   
Receiving objects:  81% (156/192)   
Receiving objects:  82% (158/192)   
Receiving objects:  83% (160/192)   
Receiving objects:  84% (162/192)   
Receiving objects:  85% (164/192)   
Receiving objects:  86% (166/192)   
Receiving objects:  87% (168/192)   
Receiving objects:  88% (169/192)   
Receiving objects:  89% (171/192)   
Receiving objects:  90% (173/192)   
Receiving objects:  91% (175/192)   
Receiving objects:  92% (177/192)   
Receiving objects:  93% (179/192)   
Receiving objects:  94% (181/192)   
Receiving objects:  95% (183/192)   
Receiving objects:  96% (185/192)   
Receiving objects:  97% (187/192)   
Receiving objects:  98% (189/192)   
Receiving objects:  99% (191/192)   
Receiving objects: 100% (192/192)   
Receiving objects: 100% (192/192), 16.30 KiB | 451.00 KiB/s, done.
 pack	d6698cfcaf6e075007fcb2123d8a138210d6d911
 27f494dfb7e67d2f9cd2282404adf1d97581aa34 refs/heads/B
 notice: HEAD points to an unborn branch (r)
@@ -220852,10 +222541,10 @@
 remote: Enumerating objects: 267, done.        
 remote: Counting objects:   0% (1/267)           
remote: Counting objects:   1% (3/267)           
remote: Counting objects:   2% (6/267)           
remote: Counting objects:   3% (9/267)           
remote: Counting objects:   4% (11/267)           
remote: Counting objects:   5% (14/267)           
remote: Counting objects:   6% (17/267)           
remote: Counting objects:   7% (19/267)           
remote: Counting objects:   8% (22/267)           
remote: Counting objects:   9% (25/267)           
remote: Counting objects:  10% (27/267)           
remote: Counting objects:  11% (30/267)           
remote: Counting objects:  12% (33/267)           
remote: Counting objects:  13% (35/267)           
remote: Counting objects:  14% (38/267)           
remote: Counting objects:  15% (41/267)           
remote: Counting objects:  16% (43/267)           
remote: Counting objects:  17% (46/267)           
remote: Counting objects:  18% (49/267)           
remote: Counting objects:  19% (51/267)           
remote: Counting objects:  20% (54/267)           
remote: Counting objects:  21% (57/267)           
remote: Counting objects:  22% (59/267)           
remote: Counting objects:  23% (62/267)           
remote: Counting objects:  24% (65/267)           
remote: Counting objects:  25% (67/267)           
remote: Counting objects:  26% (70/267)           
remote: Counting objects:  27% (73/267)           
remote: Counting objects:  28% (75/267)           
remote: Counting objects:  29% (78/267)           
remote: Counting objects:  30% (81/267)           
remote: Counting objects:  31% (83/267)           
remote: Counting objects:  32% (86/267)           
remote: Counting objects:  33% (89/267)           
remote: Counting objects:  34% (91/267)           
remote: Counting objects:  35% (94/267)           
remote: Counting objects:  36% (97/267)           
remote: Counting objects:  37% (99/267)           
remote: Counting objects:  38% (102/267)           
remote: Counting objects:  39% (105/267)           
remote: Counting objects:  40% (107/267)           
remote: Counting objects:  41% (110/267)           
remote: Counting objects:  42% (113/267)           
remote: Counting objects:  43% (115/267)           
remote: Counting objects:  44% (118/267)           
remote: Counting objects:  45% (121/267)           
remote: Counting objects:  46% (123/267)           
remote: Counting objects:  47% (126/267)           
remote: Counting objects:  48% (129/267)           
remote: Counting objects:  49% (131/267)           
remote: Counting objects:  50% (134/267)           
remote: Counting objects:  51% (137/267)           
remote: Counting objects:  52% (139/267)           
remote: Counting objects:  53% (142/267)           
remote: Counting objects:  54% (145/267)           
remote: Counting objects:  55% (147/267)           
remote: Counting objects:  56% (150/267)           
remote: Counting objects:  57% (153/267)           
remote: Counting objects:  58% (155/267)           
remote: Counting objects:  59% (158/267)           
remote: Counting objects:  60% (161/267)           
remote: Counting objects:  61% (163/267)           
remote: Counting objects:  62% (166/267)           
remote: Counting objects:  63% (169/267)           
remote: Counting objects:  64% (171/267)           
remote: Counting objects:  65% (174/267)           
remote: Counting objects:  66% (177/267)           
remote: Counting objects:  67% (179/267)           
remote: Counting objects:  68% (182/267)           
remote: Counting objects:  69% (185/267)           
remote: Counting objects:  70% (187/267)           
remote: Counting objects:  71% (190/267)           
remote: Counting objects:  72% (193/267)           
remote: Counting objects:  73% (195/267)           
remote: Counting objects:  74% (198/267)           
remote: Counting objects:  75% (201/267)           
remote: Counting objects:  76% (203/267)           
remote: Counting objects:  77% (206/267)           
remote: Counting objects:  78% (209/267)           
remote: Counting objects:  79% (211/267)           
remote: Counting objects:  80% (214/267)           
remote: Counting objects:  81% (217/267)           
remote: Counting objects:  82% (219/267)           
remote: Counting objects:  83% (222/267)           
remote: Counting objects:  84% (225/267)           
remote: Counting objects:  85% (227/267)           
remote: Counting objects:  86% (230/267)           
remote: Counting objects:  87% (233/267)           
remote: Counting objects:  88% (235/267)           
remote: Counting objects:  89% (238/267)           
remote: Counting objects:  90% (241/267)           
remote: Counting objects:  91% (243/267)           
remote: Counting objects:  92% (246/267)           
remote: Counting objects:  93% (249/267)           
remote: Counting objects:  94% (251/267)           
remote: Counting objects:  95% (254/267)           
remote: Counting objects:  96% (257/267)           
remote: Counting objects:  97% (259/267)           
remote: Counting objects:  98% (262/267)           
remote: Counting objects:  99% (265/267)           
remote: Counting objects: 100% (267/267)           
remote: Counting objects: 100% (267/267), done.        
 remote: Compressing objects:   1% (1/96)           
remote: Compressing objects:   2% (2/96)           
remote: Compressing objects:   3% (3/96)           
remote: Compressing objects:   4% (4/96)           
remote: Compressing objects:   5% (5/96)           
remote: Compressing objects:   6% (6/96)           
remote: Compressing objects:   7% (7/96)           
remote: Compressing objects:   8% (8/96)           
remote: Compressing objects:   9% (9/96)           
remote: Compressing objects:  10% (10/96)           
remote: Compressing objects:  11% (11/96)           
remote: Compressing objects:  12% (12/96)           
remote: Compressing objects:  13% (13/96)           
remote: Compressing objects:  14% (14/96)           
remote: Compressing objects:  15% (15/96)           
remote: Compressing objects:  16% (16/96)           
remote: Compressing objects:  17% (17/96)           
remote: Compressing objects:  18% (18/96)           
remote: Compressing objects:  19% (19/96)           
remote: Compressing objects:  20% (20/96)           
remote: Compressing objects:  21% (21/96)           
remote: Compressing objects:  22% (22/96)           
remote: Compressing objects:  23% (23/96)           
remote: Compressing objects:  25% (24/96)           
remote: Compressing objects:  26% (25/96)           
remote: Compressing objects:  27% (26/96)           
remote: Compressing objects:  28% (27/96)           
remote: Compressing objects:  29% (28/96)           
remote: Compressing objects:  30% (29/96)           
remote: Compressing objects:  31% (30/96)           
remote: Compressing objects:  32% (31/96)           
remote: Compressing objects:  33% (32/96)           
remote: Compressing objects:  34% (33/96)           
remote: Compressing objects:  35% (34/96)           
remote: Compressing objects:  36% (35/96)           
remote: Compressing objects:  37% (36/96)           
remote: Compressing objects:  38% (37/96)           
remote: Compressing objects:  39% (38/96)           
remote: Compressing objects:  40% (39/96)           
remote: Compressing objects:  41% (40/96)           
remote: Compressing objects:  42% (41/96)           
remote: Compressing objects:  43% (42/96)           
remote: Compressing objects:  44% (43/96)           
remote: Compressing objects:  45% (44/96)           
remote: Compressing objects:  46% (45/96)           
remote: Compressing objects:  47% (46/96)           
remote: Compressing objects:  48% (47/96)           
remote: Compressing objects:  50% (48/96)           
remote: Compressing objects:  51% (49/96)           
remote: Compressing objects:  52% (50/96)           
remote: Compressing objects:  53% (51/96)           
remote: Compressing objects:  54% (52/96)           
remote: Compressing objects:  55% (53/96)           
remote: Compressing objects:  56% (54/96)           
remote: Compressing objects:  57% (55/96)           
remote: Compressing objects:  58% (56/96)           
remote: Compressing objects:  59% (57/96)           
remote: Compressing objects:  60% (58/96)           
remote: Compressing objects:  61% (59/96)           
remote: Compressing objects:  62% (60/96)           
remote: Compressing objects:  63% (61/96)           
remote: Compressing objects:  64% (62/96)           
remote: Compressing objects:  65% (63/96)           
remote: Compressing objects:  66% (64/96)           
remote: Compressing objects:  67% (65/96)           
remote: Compressing objects:  68% (66/96)           
remote: Compressing objects:  69% (67/96)           
remote: Compressing objects:  70% (68/96)           
remote: Compressing objects:  71% (69/96)           
remote: Compressing objects:  72% (70/96)           
remote: Compressing objects:  73% (71/96)           
remote: Compressing objects:  75% (72/96)           
remote: Compressing objects:  76% (73/96)           
remote: Compressing objects:  77% (74/96)           
remote: Compressing objects:  78% (75/96)           
remote: Compressing objects:  79% (76/96)           
remote: Compressing objects:  80% (77/96)           
remote: Compressing objects:  81% (78/96)           
remote: Compressing objects:  82% (79/96)           
remote: Compressing objects:  83% (80/96)           
remote: Compressing objects:  84% (81/96)           
remote: Compressing objects:  85% (82/96)           
remote: Compressing objects:  86% (83/96)           
remote: Compressing objects:  87% (84/96)           
remote: Compressing objects:  88% (85/96)           
remote: Compressing objects:  89% (86/96)           
remote: Compressing objects:  90% (87/96)           
remote: Compressing objects:  91% (88/96)           
remote: Compressing objects:  92% (89/96)           
remote: Compressing objects:  93% (90/96)           
remote: Compressing objects:  94% (91/96)           
remote: Compressing objects:  95% (92/96)           
remote: Compressing objects:  96% (93/96)           
remote: Compressing objects:  97% (94/96)           
remote: Compressing objects:  98% (95/96)           
remote: Compressing objects: 100% (96/96)           
remote: Compressing objects: 100% (96/96), done.        
-Receiving objects:   0% (1/267)   
Receiving objects:   1% (3/267)   
Receiving objects:   2% (6/267)   
Receiving objects:   3% (9/267)   
Receiving objects:   4% (11/267)   
Receiving objects:   5% (14/267)   
Receiving objects:   6% (17/267)   
Receiving objects:   7% (19/267)   
Receiving objects:   8% (22/267)   
Receiving objects:   9% (25/267)   
Receiving objects:  10% (27/267)   
Receiving objects:  11% (30/267)   
Receiving objects:  12% (33/267)   
Receiving objects:  13% (35/267)   
Receiving objects:  14% (38/267)   
Receiving objects:  15% (41/267)   
Receiving objects:  16% (43/267)   
Receiving objects:  17% (46/267)   
Receiving objects:  18% (49/267)   
Receiving objects:  19% (51/267)   
Receiving objects:  20% (54/267)   
Receiving objects:  21% (57/267)   
Receiving objects:  22% (59/267)   
Receiving objects:  23% (62/267)   
Receiving objects:  24% (65/267)   
Receiving objects:  25% (67/267)   
Receiving objects:  26% (70/267)   
Receiving objects:  27% (73/267)   
Receiving objects:  28% (75/267)   
Receiving objects:  29% (78/267)   
Receiving objects:  30% (81/267)   
Receiving objects:  31% (83/267)   
Receiving objects:  32% (86/267)   
Receiving objects:  33% (89/267)   
Receiving objects:  34% (91/267)   
Receiving objects:  35% (94/267)   
Receiving objects:  36% (97/267)   
Receiving objects:  37% (99/267)   
Receiving objects:  38% (102/267)   
Receiving objects:  39% (105/267)   
Receiving objects:  40% (107/267)   
Receiving objects:  41% (110/267)   
Receiving objects:  42% (113/267)   
Receiving objects:  43% (115/267)   
Receiving objects:  44% (118/267)   
Receiving objects:  45% (121/267)   
Receiving objects:  46% (123/267)   
Receiving objects:  47% (126/267)   
Receiving objects:  48% (129/267)   
Receiving objects:  49% (131/267)   
Receiving objects:  50% (134/267)   
remote: Total 267 (delta 2), reused 0 (delta 0)        
-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.48 KiB | 207.00 KiB/s, done.
-Resolving deltas:   0% (0/2)   
Resolving deltas: 100% (2/2)   
Resolving deltas: 100% (2/2), done.
-keep	954cbdf1432fc45696dcab80988c249c7e5fdff1
+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)        
+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 | 546.00 KiB/s, done.
+Resolving deltas:   0% (0/3)   
Resolving deltas:  66% (2/3)   
Resolving deltas: 100% (3/3)   
Resolving deltas: 100% (3/3), done.
+keep	55a6b9f51c169aff63cc8c51f1ca095e13b105b5
 3a06f778373fecb61b87d7844d150a48c6a65020 HEAD
 f85e353c1b377970afbb804118d9135948598eea refs/heads/A
 3a06f778373fecb61b87d7844d150a48c6a65020 refs/heads/B
@@ -222735,1431 +224424,52 @@
 1..356
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t6029-merge-subtree.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6029-merge-subtree/.git/
+*** t6038-merge-text-auto.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6038-merge-text-auto/.git/
 expecting success: 
+	git config core.autocrlf false &&
 
-	s="1 2 3 4 5 6 7 8" &&
-	for i in $s; do echo $i; done >hello &&
-	git add hello &&
-	git commit -m initial &&
-	git checkout -b side &&
-	echo >>hello world &&
-	git add hello &&
-	git commit -m second &&
-	git checkout master &&
-	for i in mundo $s; do echo $i; done >hello &&
-	git add hello &&
-	git commit -m master
-
+	echo first line | append_cr >file &&
+	echo first line >control_file &&
+	echo only line >inert_file &&
 
-[master (root-commit) d43938f] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 8 insertions(+)
- create mode 100644 hello
-Switched to a new branch 'side'
-[side 1d33363] second
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Switched to branch 'master'
-[master 7df8de0] master
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 1 - setup
+	git add file control_file inert_file &&
+	test_tick &&
+	git commit -m "Initial" &&
+	git tag initial &&
+	git branch side &&
 
-expecting success: 
+	echo "* text=auto" >.gitattributes &&
+	echo first line >file &&
+	git add .gitattributes file &&
+	test_tick &&
+	git commit -m "normalize file" &&
 
-	git merge -s subtree side &&
-	for i in mundo $s world; do echo $i; done >expect &&
-	test_cmp expect hello
+	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 &&
 
-Merging:
-7df8de0 master
-virtual side
-found 1 common ancestor:
-d43938f initial
-Auto-merging hello
-Merge made by the 'subtree' strategy.
- hello | 1 +
- 1 file changed, 1 insertion(+)
-ok 2 - subtree available and works like recursive
+	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 &&
 
-expecting success: 
-	git checkout --orphan sub &&
-	git rm -rf . &&
-	test_commit foo
+	git checkout master
 
-Switched to a new branch 'sub'
-rm 'hello'
-[sub (root-commit) ddd63c9] foo
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo.t
-ok 3 - setup branch sub
-
-expecting success: 
-	git checkout -b main master &&
-	git merge -s ours --no-commit --allow-unrelated-histories sub &&
-	git read-tree --prefix=dir/ -u sub &&
-	git commit -m "initial merge of sub into main" &&
-	test_path_is_file dir/foo.t &&
-	test_path_is_file hello
-
-Switched to a new branch 'main'
-Automatic merge went well; stopped before committing as requested
-[main 0a1cc02] initial merge of sub into main
- Author: A U Thor <author@example.com>
-ok 4 - setup branch main
-
-expecting success: 
-	git checkout sub &&
-	test_commit bar
-
-Switched to branch 'sub'
-[sub 46a08c5] bar
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 bar.t
-ok 5 - update branch sub
-
-expecting success: 
-	git checkout main &&
-	git merge -s subtree sub -m "second merge of sub into main" &&
-	test_path_is_file dir/bar.t &&
-	test_path_is_file dir/foo.t &&
-	test_path_is_file hello
-
-Switched to branch 'main'
-Merging:
-0a1cc02 initial merge of sub into main
-virtual sub
-found 1 common ancestor:
-ddd63c9 foo
-Merge made by the 'subtree' strategy.
- dir/bar.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 dir/bar.t
-ok 6 - update branch main
-
-expecting success: 
-	mkdir git-gui &&
-	cd git-gui &&
-	git init &&
-	echo git-gui > git-gui.sh &&
-	o1=$(git hash-object git-gui.sh) &&
-	git add git-gui.sh &&
-	git commit -m "initial git-gui" &&
-	cd .. &&
-	mkdir git &&
-	cd git &&
-	git init &&
-	echo git >git.c &&
-	o2=$(git hash-object git.c) &&
-	git add git.c &&
-	git commit -m "initial git"
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6029-merge-subtree/git-gui/.git/
-[master (root-commit) a175596] initial git-gui
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 git-gui.sh
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6029-merge-subtree/git/.git/
-[master (root-commit) 724c210] initial git
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 git.c
-ok 7 - setup
-
-expecting success: 
-	git remote add -f gui ../git-gui &&
-	git merge -s ours --no-commit --allow-unrelated-histories gui/master &&
-	git read-tree --prefix=git-gui/ -u gui/master &&
-	git commit -m "Merge git-gui as our subdirectory" &&
-	git checkout -b work &&
-	git ls-files -s >actual &&
-	(
-		echo "100644 $o1 0	git-gui/git-gui.sh" &&
-		echo "100644 $o2 0	git.c"
-	) >expected &&
-	test_cmp expected actual
-
-Updating gui
-warning: no common commits
-From ../git-gui
- * [new branch]      master     -> gui/master
-Automatic merge went well; stopped before committing as requested
-[master b741856] Merge git-gui as our subdirectory
- Author: A U Thor <author@example.com>
-Switched to a new branch 'work'
-ok 8 - initial merge
-
-expecting success: 
-	cd ../git-gui &&
-	echo git-gui2 > git-gui.sh &&
-	o3=$(git hash-object git-gui.sh) &&
-	git add git-gui.sh &&
-	git checkout -b master2 &&
-	git commit -m "update git-gui" &&
-	cd ../git &&
-	git pull -s subtree gui master2 &&
-	git ls-files -s >actual &&
-	(
-		echo "100644 $o3 0	git-gui/git-gui.sh" &&
-		echo "100644 $o2 0	git.c"
-	) >expected &&
-	test_cmp expected actual
-
-Switched to a new branch 'master2'
-M	git-gui.sh
-[master2 c9333be] update git-gui
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-From ../git-gui
- * branch            master2    -> FETCH_HEAD
- * [new branch]      master2    -> gui/master2
-Merging:
-b741856 Merge git-gui as our subdirectory
-virtual c9333bebe07f90e76933cfa634ab72516dede3df
-found 1 common ancestor:
-a175596 initial git-gui
-Merge made by the 'subtree' strategy.
- git-gui/git-gui.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 9 - merge update
-
-expecting success: 
-	cd ../git &&
-	git reset --hard master &&
-	git checkout -b master2 &&
-	git merge -s ours --no-commit gui/master &&
-	git read-tree --prefix=git-gui2/ -u gui/master &&
-	git commit -m "Merge git-gui2 as our subdirectory" &&
-	git checkout -b work2 &&
-	git ls-files -s >actual &&
-	(
-		echo "100644 $o1 0	git-gui/git-gui.sh" &&
-		echo "100644 $o1 0	git-gui2/git-gui.sh" &&
-		echo "100644 $o2 0	git.c"
-	) >expected &&
-	test_cmp expected actual
-
-HEAD is now at b741856 Merge git-gui as our subdirectory
-Switched to a new branch 'master2'
-Already up to date.
-[master2 b1fd074] Merge git-gui2 as our subdirectory
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 git-gui2/git-gui.sh
-Switched to a new branch 'work2'
-ok 10 - initial ambiguous subtree
-
-expecting success: 
-	cd ../git &&
-	git reset --hard master2 &&
-	git pull -Xsubtree=git-gui gui master2 &&
-	git ls-files -s >actual &&
-	(
-		echo "100644 $o3 0	git-gui/git-gui.sh" &&
-		echo "100644 $o1 0	git-gui2/git-gui.sh" &&
-		echo "100644 $o2 0	git.c"
-	) >expected &&
-	test_cmp expected actual
-
-HEAD is now at b1fd074 Merge git-gui2 as our subdirectory
-From ../git-gui
- * branch            master2    -> FETCH_HEAD
-Merging:
-b1fd074 Merge git-gui2 as our subdirectory
-virtual c9333bebe07f90e76933cfa634ab72516dede3df
-found 1 common ancestor:
-a175596 initial git-gui
-Merge made by the 'recursive' strategy.
- git-gui/git-gui.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 11 - merge using explicit
-
-expecting success: 
-	cd ../git &&
-	git reset --hard master2 &&
-	git pull -Xsubtree=git-gui2 gui master2 &&
-	git ls-files -s >actual &&
-	(
-		echo "100644 $o1 0	git-gui/git-gui.sh" &&
-		echo "100644 $o3 0	git-gui2/git-gui.sh" &&
-		echo "100644 $o2 0	git.c"
-	) >expected &&
-	test_cmp expected actual
-
-HEAD is now at b1fd074 Merge git-gui2 as our subdirectory
-From ../git-gui
- * branch            master2    -> FETCH_HEAD
-Merging:
-b1fd074 Merge git-gui2 as our subdirectory
-virtual c9333bebe07f90e76933cfa634ab72516dede3df
-found 1 common ancestor:
-a175596 initial git-gui
-Merge made by the 'recursive' strategy.
- git-gui2/git-gui.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 12 - merge2 using explicit
-
-# passed all 12 test(s)
-1..12
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t6039-merge-ignorecase.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6039-merge-ignorecase/.git/
-checking prerequisite: CASE_INSENSITIVE_FS
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
-	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/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t6018-rev-list-glob.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6018-rev-list-glob/.git/
-expecting success: 
-
-	commit master &&
-	git checkout -b subspace/one master &&
-	commit one &&
-	git checkout -b subspace/two master &&
-	commit two &&
-	git checkout -b subspace-x master &&
-	commit subspace-x &&
-	git checkout -b other/three master &&
-	commit three &&
-	git checkout -b someref master &&
-	commit some &&
-	git checkout master &&
-	commit master2 &&
-	git tag foo/bar master &&
-	commit master3 &&
-	git update-ref refs/remotes/foo/baz master &&
-	commit master4 &&
-	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
-
-[master (root-commit) e1f5012] master
- 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 2eafb28] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'subspace/two'
-[subspace/two 8d58bb9] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'subspace-x'
-[subspace-x a6204e5] 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 9f9c15a] three
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'someref'
-[someref 065b9f3] some
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to branch 'master'
-[master 95cfde6] master2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[master 32e7f0b] master3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[master 427c67e] master4
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 1 - setup
-
-expecting success: 
-
-	compare rev-parse "subspace/one subspace/two" "--glob=refs/heads/subspace/*"
-
-
-ok 2 - rev-parse --glob=refs/heads/subspace/*
-
-expecting success: 
-
-	compare rev-parse "subspace/one subspace/two" "--glob=heads/subspace/*"
-
-
-ok 3 - rev-parse --glob=heads/subspace/*
-
-expecting success: 
-
-	compare rev-parse "subspace/one subspace/two" "--glob=refs/heads/subspace/"
-
-
-ok 4 - rev-parse --glob=refs/heads/subspace/
-
-expecting success: 
-
-	compare rev-parse "subspace/one subspace/two" "--glob=heads/subspace/"
-
-
-ok 5 - rev-parse --glob=heads/subspace/
-
-expecting success: 
-
-	compare rev-parse "subspace/one subspace/two" "--glob=heads/subspace"
-
-
-ok 6 - rev-parse --glob=heads/subspace
-
-checking known breakage: 
-
-	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: 
-
-	compare rev-parse "master" "--glob --symbolic master"
-
-
---- expected	2021-12-03 05:09:02.997114853 +0000
-+++ actual	2021-12-03 05:09:03.013114388 +0000
-@@ -1 +1,2 @@
--427c67e8294a2917294f816398b918414251bb36
-+--glob
-+master
-not ok 8 - rev-parse is not confused by option-like glob # TODO known breakage
-
-expecting success: 
-
-	compare rev-parse "subspace/one subspace/two" "--branches=subspace/*"
-
-
-ok 9 - rev-parse --branches=subspace/*
-
-expecting success: 
-
-	compare rev-parse "subspace/one subspace/two" "--branches=subspace/"
-
-
-ok 10 - rev-parse --branches=subspace/
-
-expecting success: 
-
-	compare rev-parse "subspace/one subspace/two" "--branches=subspace"
-
-
-ok 11 - rev-parse --branches=subspace
-
-expecting success: 
-
-	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: 
-
-	compare rev-parse "master" "--glob=heads/someref/* master"
-
-
-ok 13 - rev-parse --glob=heads/someref/* master
-
-expecting success: 
-
-	compare rev-parse "master other/three someref subspace-x subspace/one subspace/two" "--glob=heads/*"
-
-
-ok 14 - rev-parse --glob=heads/*
-
-expecting success: 
-
-	compare rev-parse "foo/bar" "--tags=foo"
-
-
-ok 15 - rev-parse --tags=foo
-
-expecting success: 
-
-	compare rev-parse "foo/baz" "--remotes=foo"
-
-
-ok 16 - rev-parse --remotes=foo
-
-expecting success: 
-	compare rev-parse "--exclude=*/* --branches" "master someref subspace-x"
-
-ok 17 - rev-parse --exclude with --branches
-
-expecting success: 
-	compare rev-parse "--exclude=refs/remotes/* --all" "--branches --tags"
-
-ok 18 - rev-parse --exclude with --all
-
-expecting success: 
-	compare rev-parse "--exclude=refs/remotes/* --exclude=refs/tags/* --all" --branches
-
-ok 19 - rev-parse accumulates multiple --exclude
-
-expecting success: 
-	compare rev-parse "--exclude=* --branches --branches" "--branches"
-
-ok 20 - rev-parse --branches clears --exclude
-
-expecting success: 
-	compare rev-parse "--exclude=* --tags --tags" "--tags"
-
-ok 21 - rev-parse --tags clears --exclude
-
-expecting success: 
-	compare rev-parse "--exclude=* --all --all" "--all"
-
-ok 22 - rev-parse --all clears --exclude
-
-expecting success: 
-	compare rev-parse "--exclude=subspace-* --branches=sub*" "subspace/one subspace/two"
-
-ok 23 - rev-parse --exclude=glob with --branches=glob
-
-expecting success: 
-	compare rev-parse "--exclude=qux/? --tags=qux/*" "qux/one qux/two"
-
-ok 24 - rev-parse --exclude=glob with --tags=glob
-
-expecting success: 
-	compare rev-parse "--exclude=upstream/? --remotes=upstream/*" "upstream/one upstream/two"
-
-ok 25 - rev-parse --exclude=glob with --remotes=glob
-
-expecting success: 
-	compare rev-parse "--exclude=subspace-x --branches=sub*" "subspace/one subspace/two"
-
-ok 26 - rev-parse --exclude=ref with --branches=glob
-
-expecting success: 
-	compare rev-parse "--exclude=qux/x --tags=qux/*" "qux/one qux/two"
-
-ok 27 - rev-parse --exclude=ref with --tags=glob
-
-expecting success: 
-	compare rev-parse "--exclude=upstream/x --remotes=upstream/*" "upstream/one upstream/two"
-
-ok 28 - rev-parse --exclude=ref with --remotes=glob
-
-expecting success: 
-	compare rev-list "--exclude=subspace-* --branches=sub*" "subspace/one subspace/two"
-
-ok 29 - rev-list --exclude=glob with --branches=glob
-
-expecting success: 
-	compare rev-list "--exclude=qux/? --tags=qux/*" "qux/one qux/two"
-
-ok 30 - rev-list --exclude=glob with --tags=glob
-
-expecting success: 
-	compare rev-list "--exclude=upstream/? --remotes=upstream/*" "upstream/one upstream/two"
-
-ok 31 - rev-list --exclude=glob with --remotes=glob
-
-expecting success: 
-	compare rev-list "--exclude=subspace-x --branches=sub*" "subspace/one subspace/two"
-
-ok 32 - rev-list --exclude=ref with --branches=glob
-
-expecting success: 
-	compare rev-list "--exclude=qux/x --tags=qux/*" "qux/one qux/two"
-
-ok 33 - rev-list --exclude=ref with --tags=glob
-
-expecting success: 
-	compare rev-list "--exclude=upstream/x --remotes=upstream/*" "upstream/one upstream/two"
-
-ok 34 - rev-list --exclude=ref with --remotes=glob
-
-expecting success: 
-
-	compare rev-list "subspace/one subspace/two" "--glob=refs/heads/subspace/*"
-
-
-ok 35 - rev-list --glob=refs/heads/subspace/*
-
-expecting success: 
-
-	compare rev-list "subspace/one subspace/two" "--glob refs/heads/subspace/*"
-
-
-ok 36 - rev-list --glob refs/heads/subspace/*
-
-expecting success: 
-
-	compare rev-list "master" "--glob -0 master"
-
-
-ok 37 - rev-list not confused by option-like --glob arg
-
-expecting success: 
-
-	compare rev-list "subspace/one subspace/two" "--glob=heads/subspace/*"
-
-
-ok 38 - rev-list --glob=heads/subspace/*
-
-expecting success: 
-
-	compare rev-list "subspace/one subspace/two" "--glob=refs/heads/subspace/"
-
-
-ok 39 - rev-list --glob=refs/heads/subspace/
-
-expecting success: 
-
-	compare rev-list "subspace/one subspace/two" "--glob=heads/subspace/"
-
-
-ok 40 - rev-list --glob=heads/subspace/
-
-expecting success: 
-
-	compare rev-list "subspace/one subspace/two" "--glob=heads/subspace"
-
-
-ok 41 - rev-list --glob=heads/subspace
-
-expecting success: 
-
-	compare rev-list "subspace/one subspace/two" "--branches=subspace/*"
-
-
-ok 42 - rev-list --branches=subspace/*
-
-expecting success: 
-
-	compare rev-list "subspace/one subspace/two" "--branches=subspace/"
-
-
-ok 43 - rev-list --branches=subspace/
-
-expecting success: 
-
-	compare rev-list "subspace/one subspace/two" "--branches=subspace"
-
-
-ok 44 - rev-list --branches=subspace
-
-expecting success: 
-
-	compare rev-list "master subspace-x someref other/three subspace/one subspace/two" "--branches"
-
-
-ok 45 - rev-list --branches
-
-expecting success: 
-
-	compare rev-list "master" "--glob=heads/someref/* master"
-
-
-ok 46 - rev-list --glob=heads/someref/* master
-
-expecting success: 
-
-	compare rev-list "subspace/one subspace/two other/three" "--glob=heads/subspace/* --glob=heads/other/*"
-
-
-ok 47 - rev-list --glob=heads/subspace/* --glob=heads/other/*
-
-expecting success: 
-
-	compare rev-list "master other/three someref subspace-x subspace/one subspace/two" "--glob=heads/*"
-
-
-ok 48 - rev-list --glob=heads/*
-
-expecting success: 
-
-	compare rev-list "foo/bar" "--tags=foo"
-
-
-ok 49 - rev-list --tags=foo
-
-expecting success: 
-
-	compare rev-list "foo/bar qux/x qux/two qux/one" "--tags"
-
-
-ok 50 - rev-list --tags
-
-expecting success: 
-
-	compare rev-list "foo/baz" "--remotes=foo"
-
-
-ok 51 - rev-list --remotes=foo
-
-expecting success: 
-	compare rev-list "--exclude=*/* --branches" "master someref subspace-x"
-
-ok 52 - rev-list --exclude with --branches
-
-expecting success: 
-	compare rev-list "--exclude=refs/remotes/* --all" "--branches --tags"
-
-ok 53 - rev-list --exclude with --all
-
-expecting success: 
-	compare rev-list "--exclude=refs/remotes/* --exclude=refs/tags/* --all" --branches
-
-ok 54 - rev-list accumulates multiple --exclude
-
-expecting success: 
-	git rev-list --stdin </dev/null >actual &&
-	test_must_be_empty actual
-
-ok 55 - rev-list should succeed with empty output on empty stdin
-
-expecting success: 
-	git rev-list --exclude=* --all >actual &&
-	test_must_be_empty actual
-
-ok 56 - rev-list should succeed with empty output with all refs excluded
-
-expecting success: 
-	(
-		test_create_repo empty &&
-		cd empty &&
-		git rev-list --all >actual &&
-		test_must_be_empty actual
-	)
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6018-rev-list-glob/empty/.git/
-ok 57 - rev-list should succeed with empty output with empty --all
-
-expecting success: 
-	git rev-list --glob=does-not-match-anything >actual &&
-	test_must_be_empty actual
-
-ok 58 - rev-list should succeed with empty output with empty glob
-
-expecting success: 
-
-	compare shortlog "subspace/one subspace/two" --branches=subspace &&
-	compare shortlog \
-	  "master subspace-x someref other/three subspace/one subspace/two" \
-	  --branches &&
-	compare shortlog master "--glob=heads/someref/* master" &&
-	compare shortlog "subspace/one subspace/two other/three" \
-	  "--glob=heads/subspace/* --glob=heads/other/*" &&
-	compare shortlog \
-	  "master 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 59 - shortlog accepts --glob/--tags/--remotes
-
-checking known breakage: 
-
-	compare shortlog \
-	  "master 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, --committer       Group by committer rather than author
-    -n, --numbered        sort output according to the number of commits per author
-    -s, --summary         Suppress commit descriptions, only provides commit count
-    -e, --email           Show the email address of each author
-    -w[<w>[,<i1>[,<i2>]]]
-                          Linewrap output
-
-not ok 60 - shortlog accepts --glob as detached option # TODO known breakage
-
-checking known breakage: 
-
-	compare shortlog master "--glob -e master"
-
-
-error: unknown option `--glob'
-usage: git shortlog [<options>] [<revision-range>] [[--] <path>...]
-   or: git log --pretty=short | git shortlog [<options>]
-
-    -c, --committer       Group by committer rather than author
-    -n, --numbered        sort output according to the number of commits per author
-    -s, --summary         Suppress commit descriptions, only provides commit count
-    -e, --email           Show the email address of each author
-    -w[<w>[,<i1>[,<i2>]]]
-                          Linewrap output
-
-not ok 61 - shortlog --glob is not confused by option-like argument # TODO known breakage
-
-# still have 4 known breakage(s)
-# passed all remaining 57 test(s)
-1..61
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t6031-merge-filemode.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6031-merge-filemode/.git/
-expecting success: 
-	: >file1 &&
-	git add file1 &&
-	git commit -m initial &&
-	git checkout -b a1 master &&
-	: >dummy &&
-	git add dummy &&
-	git commit -m a &&
-	git checkout -b b1 master &&
-	test_chmod +x file1 &&
-	git add file1 &&
-	git commit -m b1
-
-[master (root-commit) b5c2466] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 file1
-Switched to a new branch 'a1'
-[a1 be98be7] a
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 dummy
-Switched to a new branch 'b1'
-[b1 b14149e] b1
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- mode change 100644 => 100755 file1
-ok 1 - set up mode change in one branch
-
-expecting success: 
-		git checkout -f $us &&
-		git merge -s $strategy $them &&
-		git ls-files -s file1 | grep ^100755
-	
-Switched to branch 'a1'
-Merging:
-be98be7 a
-virtual b1
-found 1 common ancestor:
-b5c2466 initial
-Merge made by the 'recursive' strategy.
- file1 | 0
- 1 file changed, 0 insertions(+), 0 deletions(-)
- mode change 100644 => 100755 file1
-100755 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0	file1
-ok 2 - resolve single mode change (recursive, a1)
-
-checking prerequisite: FILEMODE
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
-	test "$(git config --bool core.filemode)" = true
-
-)
-prerequisite FILEMODE ok
-expecting success: 
-		test -x file1
-	
-ok 3 - verify executable bit on file (recursive, a1)
-
-expecting success: 
-		git checkout -f $us &&
-		git merge -s $strategy $them &&
-		git ls-files -s file1 | grep ^100755
-	
-Switched to branch 'b1'
-Updating b14149e..90d1c8d
-Fast-forward
- dummy | 0
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 dummy
-100755 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0	file1
-ok 4 - resolve single mode change (recursive, b1)
-
-expecting success: 
-		test -x file1
-	
-ok 5 - verify executable bit on file (recursive, b1)
-
-expecting success: 
-		git checkout -f $us &&
-		git merge -s $strategy $them &&
-		git ls-files -s file1 | grep ^100755
-	
-Switched to branch 'a1'
-Already up to date.
-100755 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0	file1
-ok 6 - resolve single mode change (resolve, a1)
-
-expecting success: 
-		test -x file1
-	
-ok 7 - verify executable bit on file (resolve, a1)
-
-expecting success: 
-		git checkout -f $us &&
-		git merge -s $strategy $them &&
-		git ls-files -s file1 | grep ^100755
-	
-Switched to branch 'b1'
-Already up to date.
-100755 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0	file1
-ok 8 - resolve single mode change (resolve, b1)
-
-expecting success: 
-		test -x file1
-	
-ok 9 - verify executable bit on file (resolve, b1)
-
-expecting success: 
-	git reset --hard HEAD &&
-	git checkout -b a2 master &&
-	: >file2 &&
-	H=$(git hash-object file2) &&
-	test_chmod +x file2 &&
-	git commit -m a2 &&
-	git checkout -b b2 master &&
-	: >file2 &&
-	git add file2 &&
-	git commit -m b2 &&
-	{
-		echo "100755 $H 2	file2"
-		echo "100644 $H 3	file2"
-	} >expect
-
-HEAD is now at 90d1c8d Merge branch 'b1' into a1
-Switched to a new branch 'a2'
-[a2 34c6036] a2
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100755 file2
-Switched to a new branch 'b2'
-[b2 9b8ff47] b2
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 file2
-ok 10 - set up mode change in both branches
-
-expecting success: 
-		git reset --hard &&
-		git checkout -f a2 &&
-		test_must_fail git merge -s $strategy b2 &&
-		git ls-files -u >actual &&
-		test_cmp expect actual &&
-		git ls-files -s file2 | grep ^100755
-	
-HEAD is now at 9b8ff47 b2
-Switched to branch 'a2'
-Merging:
-34c6036 a2
-virtual b2
-found 1 common ancestor:
-b5c2466 initial
-Auto-merging file2
-CONFLICT (add/add): Merge conflict in file2
-Automatic merge failed; fix conflicts and then commit the result.
-100755 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 2	file2
-ok 11 - detect conflict on double mode change (recursive)
-
-expecting success: 
-		test -x file2
-	
-ok 12 - verify executable bit on file (recursive)
-
-expecting success: 
-		git reset --hard &&
-		git checkout -f a2 &&
-		test_must_fail git merge -s $strategy b2 &&
-		git ls-files -u >actual &&
-		test_cmp expect actual &&
-		git ls-files -s file2 | grep ^100755
-	
-HEAD is now at 34c6036 a2
-Already on 'a2'
-error: Merge requires file-level merging
-Trying really trivial in-index merge...
-Nope.
-Trying simple merge.
-Simple merge failed, trying Automatic merge.
-ERROR: File file2 added identically in both branches,
-ERROR: but permissions conflict 100755->100644.
-fatal: merge program failed
-Automatic merge failed; fix conflicts and then commit the result.
-100755 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 2	file2
-ok 13 - detect conflict on double mode change (resolve)
-
-expecting success: 
-		test -x file2
-	
-ok 14 - verify executable bit on file (resolve)
-
-expecting success: 
-	git reset --hard &&
-	git checkout -b deletion master &&
-	git rm file1 &&
-	git commit -m deletion
-
-HEAD is now at 34c6036 a2
-Switched to a new branch 'deletion'
-rm 'file1'
-[deletion bc846d5] deletion
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- delete mode 100644 file1
-ok 15 - set up delete/modechange scenario
-
-expecting success: 
-		git reset --hard &&
-		git checkout $us &&
-		test_must_fail git merge -s $strategy $them
-	
-HEAD is now at bc846d5 deletion
-Switched to branch 'b1'
-Merging:
-90d1c8d Merge branch 'b1' into a1
-virtual deletion
-found 1 common ancestor:
-b5c2466 initial
-CONFLICT (modify/delete): file1 deleted in deletion and modified in HEAD. Version HEAD of file1 left in tree.
-Automatic merge failed; fix conflicts and then commit the result.
-ok 16 - detect delete/modechange conflict (recursive, b1)
-
-expecting success: 
-		git reset --hard &&
-		git checkout $us &&
-		test_must_fail git merge -s $strategy $them
-	
-HEAD is now at 90d1c8d Merge branch 'b1' into a1
-Switched to branch 'deletion'
-Merging:
-bc846d5 deletion
-virtual b1
-found 1 common ancestor:
-b5c2466 initial
-CONFLICT (modify/delete): file1 deleted in HEAD and modified in b1. Version b1 of file1 left in tree.
-Automatic merge failed; fix conflicts and then commit the result.
-ok 17 - detect delete/modechange conflict (recursive, deletion)
-
-expecting success: 
-		git reset --hard &&
-		git checkout $us &&
-		test_must_fail git merge -s $strategy $them
-	
-HEAD is now at bc846d5 deletion
-Switched to branch 'b1'
-error: Merge requires file-level merging
-Trying really trivial in-index merge...
-Nope.
-Trying simple merge.
-Simple merge failed, trying Automatic merge.
-ERROR: File file1 deleted on one branch but had its
-ERROR: permissions changed on the other.
-fatal: merge program failed
-Automatic merge failed; fix conflicts and then commit the result.
-ok 18 - detect delete/modechange conflict (resolve, b1)
-
-expecting success: 
-		git reset --hard &&
-		git checkout $us &&
-		test_must_fail git merge -s $strategy $them
-	
-HEAD is now at 90d1c8d Merge branch 'b1' into a1
-Switched to branch 'deletion'
-error: Merge requires file-level merging
-Trying really trivial in-index merge...
-Nope.
-Trying simple merge.
-Simple merge failed, trying Automatic merge.
-ERROR: File file1 deleted on one branch but had its
-ERROR: permissions changed on the other.
-fatal: merge program failed
-Automatic merge failed; fix conflicts and then commit the result.
-ok 19 - detect delete/modechange conflict (resolve, deletion)
-
-# passed all 19 test(s)
-1..19
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t6037-merge-ours-theirs.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6037-merge-ours-theirs/.git/
-expecting success: 
-	for i in 1 2 3 4 5 6 7 8 9
-	do
-		echo "$i"
-	done >file &&
-	git add file &&
-	cp file elif &&
-	git commit -m initial &&
-
-	sed -e "s/1/one/" -e "s/9/nine/" >file <elif &&
-	git commit -a -m ours &&
-
-	git checkout -b side HEAD^ &&
-
-	sed -e "s/9/nueve/" >file <elif &&
-	git commit -a -m theirs &&
-
-	git checkout master^0
-
-[master (root-commit) d9505bc] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 9 insertions(+)
- create mode 100644 file
-[master 419e2b9] ours
- Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+), 2 deletions(-)
-Switched to a new branch 'side'
-[side e02c68b] theirs
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Note: checking out 'master^0'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by performing another checkout.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
-
-  git checkout -b <new-branch-name>
-
-HEAD is now at 419e2b9 ours
-ok 1 - setup
-
-expecting success: 
-	git reset --hard master &&
-	test_must_fail git merge -s recursive side &&
-	grep nine file &&
-	grep nueve file &&
-	! grep 9 file &&
-	grep one file &&
-	! grep 1 file
-
-HEAD is now at 419e2b9 ours
-Merging:
-419e2b9 ours
-virtual side
-found 1 common ancestor:
-d9505bc initial
-Auto-merging file
-CONFLICT (content): Merge conflict in file
-Automatic merge failed; fix conflicts and then commit the result.
-nine
-nueve
-one
-ok 2 - plain recursive - should conflict
-
-expecting success: 
-	git reset --hard master &&
-	git merge -s recursive -Xtheirs side &&
-	! grep nine file &&
-	grep nueve file &&
-	! grep 9 file &&
-	grep one file &&
-	! grep 1 file
-
-HEAD is now at 419e2b9 ours
-Merging:
-419e2b9 ours
-virtual side
-found 1 common ancestor:
-d9505bc initial
-Auto-merging file
-Merge made by the 'recursive' strategy.
- file | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-nueve
-one
-ok 3 - recursive favouring theirs
-
-expecting success: 
-	git reset --hard master &&
-	git merge -s recursive -X ours side &&
-	grep nine file &&
-	! grep nueve file &&
-	! grep 9 file &&
-	grep one file &&
-	! grep 1 file
-
-HEAD is now at 419e2b9 ours
-Merging:
-419e2b9 ours
-virtual side
-found 1 common ancestor:
-d9505bc initial
-Auto-merging file
-Skipped file (merged same as existing)
-Merge made by the 'recursive' strategy.
-nine
-one
-ok 4 - recursive favouring ours
-
-expecting success: 
-	echo file binary >.gitattributes &&
-
-	git reset --hard master &&
-	git merge -s recursive -X theirs side &&
-	git diff --exit-code side HEAD -- file &&
-
-	git reset --hard master &&
-	git merge -s recursive -X ours side &&
-	git diff --exit-code master HEAD -- file
-
-HEAD is now at 419e2b9 ours
-Merging:
-419e2b9 ours
-virtual side
-found 1 common ancestor:
-d9505bc initial
-Auto-merging file
-Merge made by the 'recursive' strategy.
- file | Bin 23 -> 22 bytes
- 1 file changed, 0 insertions(+), 0 deletions(-)
-HEAD is now at 419e2b9 ours
-Merging:
-419e2b9 ours
-virtual side
-found 1 common ancestor:
-d9505bc initial
-Auto-merging file
-Skipped file (merged same as existing)
-Merge made by the 'recursive' strategy.
-ok 5 - binary file with -Xours/-Xtheirs
-
-expecting success: 
-	git reset --hard master && git pull -s recursive -Xours . side &&
-	git reset --hard master && git pull -s recursive -X ours . side &&
-	git reset --hard master && git pull -s recursive -Xtheirs . side &&
-	git reset --hard master && git pull -s recursive -X theirs . side &&
-	git reset --hard master && test_must_fail git pull -s recursive -X bork . side
-
-HEAD is now at 419e2b9 ours
-From .
- * branch            side       -> FETCH_HEAD
-Merging:
-419e2b9 ours
-virtual e02c68b248f5d7b0081674e1cd0804687f907246
-found 1 common ancestor:
-d9505bc initial
-Auto-merging file
-Skipped file (merged same as existing)
-Merge made by the 'recursive' strategy.
-HEAD is now at 419e2b9 ours
-From .
- * branch            side       -> FETCH_HEAD
-Merging:
-419e2b9 ours
-virtual e02c68b248f5d7b0081674e1cd0804687f907246
-found 1 common ancestor:
-d9505bc initial
-Auto-merging file
-Skipped file (merged same as existing)
-Merge made by the 'recursive' strategy.
-HEAD is now at 419e2b9 ours
-From .
- * branch            side       -> FETCH_HEAD
-Merging:
-419e2b9 ours
-virtual e02c68b248f5d7b0081674e1cd0804687f907246
-found 1 common ancestor:
-d9505bc initial
-Auto-merging file
-Merge made by the 'recursive' strategy.
- file | Bin 23 -> 22 bytes
- 1 file changed, 0 insertions(+), 0 deletions(-)
-HEAD is now at 419e2b9 ours
-From .
- * branch            side       -> FETCH_HEAD
-Merging:
-419e2b9 ours
-virtual e02c68b248f5d7b0081674e1cd0804687f907246
-found 1 common ancestor:
-d9505bc initial
-Auto-merging file
-Merge made by the 'recursive' strategy.
- file | Bin 23 -> 22 bytes
- 1 file changed, 0 insertions(+), 0 deletions(-)
-HEAD is now at 419e2b9 ours
-From .
- * branch            side       -> FETCH_HEAD
-fatal: Unknown option for merge-recursive: -Xbork
-ok 6 - pull passes -X to underlying merge
-
-checking prerequisite: SYMLINKS
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
-	# test whether the filesystem supports symbolic links
-	ln -s x y && test -h y
-
-)
-prerequisite SYMLINKS ok
-expecting success: 
-	git reset --hard master &&
-	git checkout -b two master &&
-	ln -s target-zero link &&
-	git add link &&
-	git commit -m "add link pointing to zero" &&
-
-	ln -f -s target-two link &&
-	git commit -m "add link pointing to two" link &&
-
-	git checkout -b one HEAD^ &&
-	ln -f -s target-one link &&
-	git commit -m "add link pointing to one" link &&
-
-	# we expect symbolic links not to resolve automatically, of course
-	git checkout one^0 &&
-	test_must_fail git merge -s recursive two &&
-
-	# favor theirs to resolve to target-two?
-	git reset --hard &&
-	git checkout one^0 &&
-	git merge -s recursive -X theirs two &&
-	git diff --exit-code two HEAD link &&
-
-	# favor ours to resolve to target-one?
-	git reset --hard &&
-	git checkout one^0 &&
-	git merge -s recursive -X ours two &&
-	git diff --exit-code one HEAD link
-
-
-HEAD is now at 419e2b9 ours
-Switched to a new branch 'two'
-[two aa5683a] add link pointing to zero
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 120000 link
-[two c1163de] add link pointing to two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'one'
-[one 76b6d6d] add link pointing to one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Note: checking out 'one^0'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by performing another checkout.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
-
-  git checkout -b <new-branch-name>
-
-HEAD is now at 76b6d6d add link pointing to one
-Merging:
-76b6d6d add link pointing to one
-virtual two
-found 1 common ancestor:
-aa5683a add link pointing to zero
-Auto-merging link
-CONFLICT (content): Merge conflict in link
-Automatic merge failed; fix conflicts and then commit the result.
-HEAD is now at 76b6d6d add link pointing to one
-HEAD is now at 76b6d6d add link pointing to one
-Merging:
-76b6d6d add link pointing to one
-virtual two
-found 1 common ancestor:
-aa5683a add link pointing to zero
-Auto-merging link
-Merge made by the 'recursive' strategy.
- link | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-HEAD is now at 417827c Merge branch 'two' into HEAD
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  417827c Merge branch 'two' into HEAD
-
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
-
- git branch <new-branch-name> 417827c
-
-HEAD is now at 76b6d6d add link pointing to one
-Merging:
-76b6d6d add link pointing to one
-virtual two
-found 1 common ancestor:
-aa5683a add link pointing to zero
-Auto-merging link
-Skipped link (merged same as existing)
-Merge made by the 'recursive' strategy.
-ok 7 - symlink with -Xours/-Xtheirs
-
-# passed all 7 test(s)
-1..7
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t6038-merge-text-auto.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6038-merge-text-auto/.git/
-expecting success: 
-	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 master
-
-[master (root-commit) 1c56df1] Initial
+[master (root-commit) 1c56df1] Initial
  Author: A U Thor <author@example.com>
  3 files changed, 3 insertions(+)
  create mode 100644 control_file
@@ -224384,8 +224694,8 @@
 
 HEAD is now at 0d9ffb6 add line from b
 M	file
---- expected.expect	2021-12-03 05:09:09.076938121 +0000
-+++ file.actual	2021-12-03 05:09:09.084937888 +0000
+--- expected.expect	2023-01-05 11:49:33.850868030 +0000
++++ file.actual	2023-01-05 11:49:33.850868030 +0000
 @@ -1,2 +1,7 @@
 +<<<<<<< b
 +first lineQ
@@ -224420,8 +224730,8 @@
 Previous HEAD position was 1c56df1 Initial
 HEAD is now at 99f8882 add line from a
 M	file
---- expected.expect	2021-12-03 05:09:09.176935214 +0000
-+++ file.actual	2021-12-03 05:09:09.184934981 +0000
+--- expected.expect	2023-01-05 11:49:33.946868030 +0000
++++ file.actual	2023-01-05 11:49:33.946868030 +0000
 @@ -1,2 +1,7 @@
 +<<<<<<< a
  first line
@@ -224495,367 +224805,6 @@
 1..11
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t6045-merge-rename-delete.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6045-merge-rename-delete/.git/
-expecting success: 
-	echo foo >A &&
-	git add A &&
-	git commit -m "initial" &&
-
-	git checkout -b rename &&
-	git mv A B &&
-	git commit -m "rename" &&
-
-	git checkout master &&
-	git rm A &&
-	git commit -m "delete" &&
-
-	test_must_fail git merge --strategy=recursive rename >output &&
-	test_i18ngrep "CONFLICT (rename/delete): A deleted in HEAD and renamed to B in rename. Version rename of B left in tree." output
-
-[master (root-commit) f772cfa] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A
-Switched to a new branch 'rename'
-[rename f234fe2] rename
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename A => B (100%)
-Switched to branch 'master'
-rm 'A'
-[master e46b8e6] delete
- Author: A U Thor <author@example.com>
- 1 file changed, 1 deletion(-)
- delete mode 100644 A
-CONFLICT (rename/delete): A deleted in HEAD and renamed to B in rename. Version rename of B left in tree.
-ok 1 - rename/delete
-
-# passed all 1 test(s)
-1..1
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t6040-tracking-info.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6040-tracking-info/.git/
-expecting success: 
-	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 master &&
-	advance h
-
-[master (root-commit) cc33353] a
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 a
-[master 7e1cf2d] b
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b
-[master 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 remote branch 'master' from 'origin'.
-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 remote branch 'master' from 'origin'.
-HEAD is now at afc0d66 d
-Switched to a new branch 'b3'
-Branch 'b3' set up to track remote branch 'master' from 'origin'.
-HEAD is now at 7e1cf2d b
-Switched to a new branch 'b4'
-Branch 'b4' set up to track remote branch 'master' from 'origin'.
-[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 remote branch 'master' from 'origin'.
-Switched to a new branch 'b5'
-Branch 'b5' set up to track local branch '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 remote branch 'master' from 'origin'.
-Switched to a new branch 'follower'
-Branch 'follower' set up to track local branch 'master'.
-[follower 21abfbd] h
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 h
-ok 1 - setup
-
-expecting success: 
-	(
-		cd test &&
-		git branch -v
-	) |
-	sed -n -e "$script" >actual &&
-	test_i18ncmp expect actual
-
-ok 2 - branch -v
-
-expecting success: 
-	(
-		cd test &&
-		git branch -vv
-	) |
-	sed -n -e "$script" >actual &&
-	test_i18ncmp expect actual
-
-ok 3 - branch -vv
-
-expecting success: 
-	(
-		cd test && git checkout b1
-	) >actual &&
-	test_i18ngrep "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: 
-	git checkout master &&
-	git checkout follower >actual &&
-	test_i18ngrep "is ahead of" actual
-
-Switched to branch 'master'
-Switched to branch 'follower'
-Your branch is ahead of 'master' by 1 commit.
-ok 5 - checkout with local tracked branch
-
-expecting success: 
-	(
-		cd test &&
-		git checkout b5
-	) >actual &&
-	test_i18ngrep "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: 
-	(
-		cd test && git checkout b6
-	) >actual &&
-	test_i18ngrep "Your branch is up to date with .origin/master" actual
-
-Switched to branch 'b6'
-Your branch is up to date with 'origin/master'.
-ok 7 - checkout (up-to-date with upstream)
-
-expecting success: 
-	(
-		cd test &&
-		git checkout b1 >/dev/null &&
-		# reports nothing to commit
-		test_must_fail git commit --dry-run
-	) >actual &&
-	test_i18ngrep "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: 
-	(
-		cd test &&
-		git checkout b5 >/dev/null &&
-		# reports nothing to commit
-		test_must_fail git commit --dry-run
-	) >actual &&
-	test_i18ngrep "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: 
-	(
-		cd test &&
-		git checkout b6 >/dev/null &&
-		# reports nothing to commit
-		test_must_fail git commit --dry-run
-	) >actual &&
-	test_i18ngrep "Your branch is up to date with .origin/master" actual
-
-Switched to branch 'b6'
-Your branch is up to date with 'origin/master'.
-ok 10 - status (up-to-date with upstream)
-
-expecting success: 
-	(
-		cd test &&
-		git checkout b1 >/dev/null &&
-		git status -s -b | head -1
-	) >actual &&
-	test_i18ncmp expect actual
-
-Switched to branch 'b1'
-ok 11 - status -s -b (diverged from upstream)
-
-expecting success: 
-	(
-		cd test &&
-		git checkout b1 >/dev/null &&
-		git status -s -b --no-ahead-behind | head -1
-	) >actual &&
-	test_i18ncmp expect actual
-
-Already on 'b1'
-ok 12 - status -s -b --no-ahead-behind (diverged from upstream)
-
-expecting success: 
-	(
-		cd test &&
-		git checkout b1 >/dev/null &&
-		git status --long -b | head -3
-	) >actual &&
-	test_i18ncmp expect actual
-
-Already on 'b1'
-ok 13 - status --long --branch
-
-expecting success: 
-	(
-		cd test &&
-		git checkout b1 >/dev/null &&
-		git status --long -b --no-ahead-behind | head -2
-	) >actual &&
-	test_i18ncmp expect actual
-
-Already on 'b1'
-ok 14 - status --long --branch --no-ahead-behind
-
-expecting success: 
-	(
-		cd test &&
-		git checkout b5 >/dev/null &&
-		git status -s -b | head -1
-	) >actual &&
-	test_i18ncmp expect actual
-
-Switched to branch 'b5'
-ok 15 - status -s -b (upstream is gone)
-
-expecting success: 
-	(
-		cd test &&
-		git checkout b6 >/dev/null &&
-		git status -s -b | head -1
-	) >actual &&
-	test_i18ncmp expect actual
-
-Switched to branch 'b6'
-ok 16 - status -s -b (up-to-date with upstream)
-
-expecting success: 
-	git checkout master &&
-	git tag light &&
-	test_must_fail git branch --track lighttrack light >actual &&
-	test_i18ngrep ! "set up to track" actual &&
-	test_must_fail git checkout lighttrack
-
-Switched to branch 'master'
-fatal: Cannot setup tracking information; starting point 'light' is not a branch.
-error: pathspec 'lighttrack' did not match any file(s) known to git
-ok 17 - fail to track lightweight tags
-
-expecting success: 
-	git checkout master &&
-	git tag -m heavy heavy &&
-	test_must_fail git branch --track heavytrack heavy >actual &&
-	test_i18ngrep ! "set up to track" actual &&
-	test_must_fail git checkout heavytrack
-
-Already on 'master'
-fatal: Cannot setup tracking information; starting point 'heavy' is not a branch.
-error: pathspec 'heavytrack' did not match any file(s) known to git
-ok 18 - fail to track annotated tags
-
-expecting success: 
-	git branch from-master master &&
-	git branch --set-upstream-to master from-master &&
-	git branch from-master2 master &&
-	test_must_fail git config branch.from-master2.merge > actual &&
-	git rev-list from-master2 &&
-	git update-ref refs/heads/from-master2 from-master2^ &&
-	git rev-parse from-master2 >expect2 &&
-	git branch --set-upstream-to master from-master2 &&
-	git config branch.from-master.merge > actual &&
-	git rev-parse from-master2 >actual2 &&
-	grep -q "^refs/heads/master$" actual &&
-	cmp expect2 actual2
-
-Branch 'from-master' set up to track local branch 'master'.
-ac11e552c8e799a6af00e91a64888439b699d9fd
-7e1cf2dc889e845623128125195d11533d8aef5e
-cc33353f1c71fb0fa9b4671a6a0a8539ad9ecd0a
-Branch 'from-master2' set up to track local branch 'master'.
-ok 19 - --set-upstream-to does not change branch
-
-expecting success: 
-	git checkout follower &&
-	git checkout from-master2 &&
-	git config branch.from-master2.merge > expect2 &&
-	git branch --set-upstream-to @{-1} from-master &&
-	git config branch.from-master.merge > actual &&
-	git config branch.from-master2.merge > actual2 &&
-	git branch --set-upstream-to follower from-master &&
-	git config branch.from-master.merge > expect &&
-	test_cmp expect2 actual2 &&
-	test_cmp expect actual
-
-Switched to branch 'follower'
-Your branch is ahead of 'master' by 1 commit.
-  (use "git push" to publish your local commits)
-Switched to branch 'from-master2'
-Your branch is behind 'master' by 1 commit, and can be fast-forwarded.
-  (use "git pull" to update your local branch)
-Branch 'from-master' set up to track local branch 'follower'.
-Branch 'from-master' set up to track local branch 'follower'.
-ok 20 - --set-upstream-to @{-1}
-
-# passed all 20 test(s)
-1..20
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
 *** t6035-merge-dir-to-symlink.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6035-merge-dir-to-symlink/.git/
 expecting success: 
@@ -224871,7 +224820,7 @@
 	test_ln_s_add b-2 a/b &&
 	git commit -m "dir to symlink"
 
-[master (root-commit) 911f1e7] base
+[master (root-commit) df5881f] base
  Author: A U Thor <author@example.com>
  3 files changed, 0 insertions(+), 0 deletions(-)
  create mode 100644 a/b-2/c/d
@@ -224887,7 +224836,7 @@
 
 )
 prerequisite SYMLINKS ok
-[master a2f0aaf] dir to symlink
+[master 4678c15] dir to symlink
  Author: A U Thor <author@example.com>
  2 files changed, 1 insertion(+)
  create mode 120000 a/b
@@ -224912,10 +224861,10 @@
 
   git checkout -b <new-branch-name>
 
-HEAD is now at a2f0aaf dir to symlink
-HEAD is now at a2f0aaf dir to symlink
+HEAD is now at 4678c15 dir to symlink
+HEAD is now at 4678c15 dir to symlink
 rm 'a/b'
-[detached HEAD 5653ecf] untracked symlink remains
+[detached HEAD cfe2e62] untracked symlink remains
  Author: A U Thor <author@example.com>
  1 file changed, 1 deletion(-)
  delete mode 120000 a/b
@@ -224933,24 +224882,24 @@
 	git checkout -f start^0 &&
 	test -f a/b-2/c/d
 
-HEAD is now at 5653ecf untracked symlink remains
-HEAD is now at a2f0aaf dir to symlink
+HEAD is now at cfe2e62 untracked symlink remains
+HEAD is now at 4678c15 dir to symlink
 rm 'a/b'
-[detached HEAD 5653ecf] untracked symlink remains
+[detached HEAD cfe2e62] untracked symlink remains
  Author: A U Thor <author@example.com>
  1 file changed, 1 deletion(-)
  delete mode 120000 a/b
 Warning: you are leaving 1 commit behind, not connected to
 any of your branches:
 
-  5653ecf untracked symlink remains
+  cfe2e62 untracked symlink remains
 
 If you want to keep it by creating a new branch, this may be a good time
 to do so with:
 
- git branch <new-branch-name> 5653ecf
+ git branch <new-branch-name> cfe2e62
 
-HEAD is now at 911f1e7 base
+HEAD is now at df5881f base
 ok 3 - a/b-2/c/d is kept when clobbering symlink b
 
 expecting success: 
@@ -224959,10 +224908,10 @@
 	 git checkout start^0 &&
 	 test -f a/b-2/c/d
 
-HEAD is now at 911f1e7 base
-HEAD is now at a2f0aaf dir to symlink
-Previous HEAD position was a2f0aaf dir to symlink
-HEAD is now at 911f1e7 base
+HEAD is now at df5881f base
+HEAD is now at 4678c15 dir to symlink
+Previous HEAD position was 4678c15 dir to symlink
+HEAD is now at df5881f base
 ok 4 - checkout should not have deleted a/b-2/c/d
 
 expecting success: 
@@ -224973,8 +224922,8 @@
 	git commit -m x &&
 	git tag baseline
 
-HEAD is now at 911f1e7 base
-[detached HEAD 42dca6d] x
+HEAD is now at df5881f base
+[detached HEAD 0492535] x
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 ok 5 - setup for merge test
@@ -224985,8 +224934,8 @@
 	git merge -s resolve master &&
 	test -f a/b-2/c/d
 
-HEAD is now at 42dca6d x
-HEAD is now at 42dca6d x
+HEAD is now at 0492535 x
+HEAD is now at 0492535 x
 error: Merge requires file-level merging
 Trying really trivial in-index merge...
 Nope.
@@ -225012,23 +224961,23 @@
 	git merge -s recursive master &&
 	test -f a/b-2/c/d
 
-HEAD is now at e5327ad Merge branch 'master' into HEAD
+HEAD is now at 2eab6ec Merge branch 'master' into HEAD
 Warning: you are leaving 1 commit behind, not connected to
 any of your branches:
 
-  e5327ad Merge branch 'master' into HEAD
+  2eab6ec Merge branch 'master' 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> e5327ad
+ git branch <new-branch-name> 2eab6ec
 
-HEAD is now at 42dca6d x
+HEAD is now at 0492535 x
 Merging:
-42dca6d x
+0492535 x
 virtual master
 found 1 common ancestor:
-911f1e7 base
+df5881f base
 Removing a/b/c/d
 Adding a/b
 Merge made by the 'recursive' strategy.
@@ -225050,18 +224999,18 @@
 	git merge -s resolve baseline^0 &&
 	test -f a/b-2/c/d
 
-HEAD is now at e5327ad Merge branch 'master' into HEAD
+HEAD is now at 2eab6ec Merge branch 'master' into HEAD
 Warning: you are leaving 1 commit behind, not connected to
 any of your branches:
 
-  e5327ad Merge branch 'master' into HEAD
+  2eab6ec Merge branch 'master' 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> e5327ad
+ git branch <new-branch-name> 2eab6ec
 
-HEAD is now at a2f0aaf dir to symlink
+HEAD is now at 4678c15 dir to symlink
 error: Merge requires file-level merging
 Trying really trivial in-index merge...
 Nope.
@@ -225083,23 +225032,23 @@
 	git merge -s recursive baseline^0 &&
 	test -f a/b-2/c/d
 
-HEAD is now at 6ca6733 Merge commit 'baseline^0' into HEAD
+HEAD is now at b5d1741 Merge commit 'baseline^0' into HEAD
 Warning: you are leaving 1 commit behind, not connected to
 any of your branches:
 
-  6ca6733 Merge commit 'baseline^0' into HEAD
+  b5d1741 Merge commit 'baseline^0' into HEAD
 
 If you want to keep it by creating a new branch, this may be a good time
 to do so with:
 
- git branch <new-branch-name> 6ca6733
+ git branch <new-branch-name> b5d1741
 
-HEAD is now at a2f0aaf dir to symlink
+HEAD is now at 4678c15 dir to symlink
 Merging:
-a2f0aaf dir to symlink
+4678c15 dir to symlink
 virtual baseline^0
 found 1 common ancestor:
-911f1e7 base
+df5881f base
 Adding a/b
 Merge made by the 'recursive' strategy.
  a/x | 1 +
@@ -225119,18 +225068,18 @@
 	test -f a/b/c/e &&
 	test -f a/b-2/c/d
 
-HEAD is now at 6ca6733 Merge commit 'baseline^0' into HEAD
+HEAD is now at b5d1741 Merge commit 'baseline^0' into HEAD
 Warning: you are leaving 1 commit behind, not connected to
 any of your branches:
 
-  6ca6733 Merge commit 'baseline^0' into HEAD
+  b5d1741 Merge commit 'baseline^0' into HEAD
 
 If you want to keep it by creating a new branch, this may be a good time
 to do so with:
 
- git branch <new-branch-name> 6ca6733
+ git branch <new-branch-name> b5d1741
 
-HEAD is now at 42dca6d x
+HEAD is now at 0492535 x
 error: Merge requires file-level merging
 Trying really trivial in-index merge...
 Nope.
@@ -225154,23 +225103,23 @@
 	test -f a/b/c/e &&
 	test -f a/b-2/c/d
 
-HEAD is now at b694daa Merge branch 'master' into HEAD
+HEAD is now at 2eab6ec Merge branch 'master' into HEAD
 Warning: you are leaving 1 commit behind, not connected to
 any of your branches:
 
-  b694daa Merge branch 'master' into HEAD
+  2eab6ec Merge branch 'master' 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> b694daa
+ git branch <new-branch-name> 2eab6ec
 
-HEAD is now at 42dca6d x
+HEAD is now at 0492535 x
 Merging:
-42dca6d x
+0492535 x
 virtual master
 found 1 common ancestor:
-911f1e7 base
+df5881f base
 Removing a/b/c/d
 CONFLICT (directory/file): There is a directory with name a/b in HEAD. Adding a/b as a/b~master
 Automatic merge failed; fix conflicts and then commit the result.
@@ -225183,8 +225132,8 @@
 	test_must_fail git merge -s resolve master
 
 warning: unable to unlink 'a/b': Is a directory
-HEAD is now at 42dca6d x
-HEAD is now at 42dca6d x
+HEAD is now at 0492535 x
+HEAD is now at 0492535 x
 error: Entry 'a/b/c/d' not uptodate. Cannot merge.
 Trying really trivial in-index merge...
 Nope.
@@ -225198,18 +225147,18 @@
 	echo more content >>a/b/c/d &&
 	test_must_fail git merge -s recursive master
 
-HEAD is now at 42dca6d x
-HEAD is now at 42dca6d x
+HEAD is now at 0492535 x
+HEAD is now at 0492535 x
 error: Your local changes to the following files would be overwritten by merge:
 	a/b/c/d
 Please commit your changes or stash them before you merge.
 Aborting
 error: merging of trees 695fce9fd104d35d689ea7465b7232978f5090fc and 9b692e5ee87aae16ad6ecbfd5cddc632859a1cca failed
 Merging:
-42dca6d x
+0492535 x
 virtual master
 found 1 common ancestor:
-911f1e7 base
+df5881f base
 ok 17 - do not lose modifications in merge (recursive)
 
 expecting success: 
@@ -225221,10 +225170,10 @@
 	git commit -m "dir a/b-2 to symlink" &&
 	git tag test2
 
-HEAD is now at 42dca6d x
-Previous HEAD position was 42dca6d x
-HEAD is now at 911f1e7 base
-[detached HEAD fa98c93] dir a/b-2 to symlink
+HEAD is now at 0492535 x
+Previous HEAD position was 0492535 x
+HEAD is now at df5881f base
+[detached HEAD 1c21e77] dir a/b-2 to symlink
  Author: A U Thor <author@example.com>
  3 files changed, 2 insertions(+)
  create mode 120000 a/b-2
@@ -225238,9 +225187,9 @@
 	git merge -s resolve test2 &&
 	test -f a/b/c/d
 
-HEAD is now at fa98c93 dir a/b-2 to symlink
-Previous HEAD position was fa98c93 dir a/b-2 to symlink
-HEAD is now at 42dca6d x
+HEAD is now at 1c21e77 dir a/b-2 to symlink
+Previous HEAD position was 1c21e77 dir a/b-2 to symlink
+HEAD is now at 0492535 x
 error: Merge requires file-level merging
 Trying really trivial in-index merge...
 Nope.
@@ -225268,23 +225217,23 @@
 	git merge -s recursive test2 &&
 	test -f a/b/c/d
 
-HEAD is now at a742604 Merge tag 'test2' into HEAD
+HEAD is now at c030c5f Merge tag 'test2' into HEAD
 Warning: you are leaving 1 commit behind, not connected to
 any of your branches:
 
-  a742604 Merge tag 'test2' into HEAD
+  c030c5f Merge tag 'test2' into HEAD
 
 If you want to keep it by creating a new branch, this may be a good time
 to do so with:
 
- git branch <new-branch-name> a742604
+ git branch <new-branch-name> c030c5f
 
-HEAD is now at 42dca6d x
+HEAD is now at 0492535 x
 Merging:
-42dca6d x
+0492535 x
 virtual test2
 found 1 common ancestor:
-911f1e7 base
+df5881f base
 Removing a/b-2/c/d
 Adding a/b-2
 Merge made by the 'recursive' strategy.
@@ -225308,23 +225257,23 @@
 	git merge -s recursive baseline^0 &&
 	test -f a/b/c/d
 
-HEAD is now at a742604 Merge tag 'test2' into HEAD
+HEAD is now at c030c5f Merge tag 'test2' into HEAD
 Warning: you are leaving 1 commit behind, not connected to
 any of your branches:
 
-  a742604 Merge tag 'test2' into HEAD
+  c030c5f Merge tag 'test2' into HEAD
 
 If you want to keep it by creating a new branch, this may be a good time
 to do so with:
 
- git branch <new-branch-name> a742604
+ git branch <new-branch-name> c030c5f
 
 Switched to a new branch 'foo'
 Merging:
-fa98c93 dir a/b-2 to symlink
+1c21e77 dir a/b-2 to symlink
 virtual baseline^0
 found 1 common ancestor:
-911f1e7 base
+df5881f base
 Adding a/b-2
 Merge made by the 'recursive' strategy.
  a/x | 1 +
@@ -225341,6 +225290,432 @@
 1..24
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
+*** t6040-tracking-info.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6040-tracking-info/.git/
+expecting success: 
+	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 master &&
+	advance h
+
+[master (root-commit) cc33353] a
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 a
+[master 7e1cf2d] b
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b
+[master 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 remote branch 'master' from 'origin'.
+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 remote branch 'master' from 'origin'.
+HEAD is now at afc0d66 d
+Switched to a new branch 'b3'
+Branch 'b3' set up to track remote branch 'master' from 'origin'.
+HEAD is now at 7e1cf2d b
+Switched to a new branch 'b4'
+Branch 'b4' set up to track remote branch 'master' from 'origin'.
+[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 remote branch 'master' from 'origin'.
+Switched to a new branch 'b5'
+Branch 'b5' set up to track local branch '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 remote branch 'master' from 'origin'.
+Switched to a new branch 'follower'
+Branch 'follower' set up to track local branch 'master'.
+[follower 21abfbd] h
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 h
+ok 1 - setup
+
+expecting success: 
+	(
+		cd test &&
+		git branch -v
+	) |
+	sed -n -e "$script" >actual &&
+	test_i18ncmp expect actual
+
+ok 2 - branch -v
+
+expecting success: 
+	(
+		cd test &&
+		git branch -vv
+	) |
+	sed -n -e "$script" >actual &&
+	test_i18ncmp expect actual
+
+ok 3 - branch -vv
+
+expecting success: 
+	(
+		cd test && git checkout b1
+	) >actual &&
+	test_i18ngrep "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: 
+	git checkout master &&
+	git checkout follower >actual &&
+	test_i18ngrep "is ahead of" actual
+
+Switched to branch 'master'
+Switched to branch 'follower'
+Your branch is ahead of 'master' by 1 commit.
+ok 5 - checkout with local tracked branch
+
+expecting success: 
+	(
+		cd test &&
+		git checkout b5
+	) >actual &&
+	test_i18ngrep "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: 
+	(
+		cd test && git checkout b6
+	) >actual &&
+	test_i18ngrep "Your branch is up to date with .origin/master" actual
+
+Switched to branch 'b6'
+Your branch is up to date with 'origin/master'.
+ok 7 - checkout (up-to-date with upstream)
+
+expecting success: 
+	(
+		cd test &&
+		git checkout b1 >/dev/null &&
+		# reports nothing to commit
+		test_must_fail git commit --dry-run
+	) >actual &&
+	test_i18ngrep "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: 
+	(
+		cd test &&
+		git checkout b5 >/dev/null &&
+		# reports nothing to commit
+		test_must_fail git commit --dry-run
+	) >actual &&
+	test_i18ngrep "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: 
+	(
+		cd test &&
+		git checkout b6 >/dev/null &&
+		# reports nothing to commit
+		test_must_fail git commit --dry-run
+	) >actual &&
+	test_i18ngrep "Your branch is up to date with .origin/master" actual
+
+Switched to branch 'b6'
+Your branch is up to date with 'origin/master'.
+ok 10 - status (up-to-date with upstream)
+
+expecting success: 
+	(
+		cd test &&
+		git checkout b1 >/dev/null &&
+		git status -s -b | head -1
+	) >actual &&
+	test_i18ncmp expect actual
+
+Switched to branch 'b1'
+ok 11 - status -s -b (diverged from upstream)
+
+expecting success: 
+	(
+		cd test &&
+		git checkout b1 >/dev/null &&
+		git status -s -b --no-ahead-behind | head -1
+	) >actual &&
+	test_i18ncmp expect actual
+
+Already on 'b1'
+ok 12 - status -s -b --no-ahead-behind (diverged from upstream)
+
+expecting success: 
+	(
+		cd test &&
+		git checkout b1 >/dev/null &&
+		git status --long -b | head -3
+	) >actual &&
+	test_i18ncmp expect actual
+
+Already on 'b1'
+ok 13 - status --long --branch
+
+expecting success: 
+	(
+		cd test &&
+		git checkout b1 >/dev/null &&
+		git status --long -b --no-ahead-behind | head -2
+	) >actual &&
+	test_i18ncmp expect actual
+
+Already on 'b1'
+ok 14 - status --long --branch --no-ahead-behind
+
+expecting success: 
+	(
+		cd test &&
+		git checkout b5 >/dev/null &&
+		git status -s -b | head -1
+	) >actual &&
+	test_i18ncmp expect actual
+
+Switched to branch 'b5'
+ok 15 - status -s -b (upstream is gone)
+
+expecting success: 
+	(
+		cd test &&
+		git checkout b6 >/dev/null &&
+		git status -s -b | head -1
+	) >actual &&
+	test_i18ncmp expect actual
+
+Switched to branch 'b6'
+ok 16 - status -s -b (up-to-date with upstream)
+
+expecting success: 
+	git checkout master &&
+	git tag light &&
+	test_must_fail git branch --track lighttrack light >actual &&
+	test_i18ngrep ! "set up to track" actual &&
+	test_must_fail git checkout lighttrack
+
+Switched to branch 'master'
+fatal: Cannot setup tracking information; starting point 'light' is not a branch.
+error: pathspec 'lighttrack' did not match any file(s) known to git
+ok 17 - fail to track lightweight tags
+
+expecting success: 
+	git checkout master &&
+	git tag -m heavy heavy &&
+	test_must_fail git branch --track heavytrack heavy >actual &&
+	test_i18ngrep ! "set up to track" actual &&
+	test_must_fail git checkout heavytrack
+
+Already on 'master'
+fatal: Cannot setup tracking information; starting point 'heavy' is not a branch.
+error: pathspec 'heavytrack' did not match any file(s) known to git
+ok 18 - fail to track annotated tags
+
+expecting success: 
+	git branch from-master master &&
+	git branch --set-upstream-to master from-master &&
+	git branch from-master2 master &&
+	test_must_fail git config branch.from-master2.merge > actual &&
+	git rev-list from-master2 &&
+	git update-ref refs/heads/from-master2 from-master2^ &&
+	git rev-parse from-master2 >expect2 &&
+	git branch --set-upstream-to master from-master2 &&
+	git config branch.from-master.merge > actual &&
+	git rev-parse from-master2 >actual2 &&
+	grep -q "^refs/heads/master$" actual &&
+	cmp expect2 actual2
+
+Branch 'from-master' set up to track local branch 'master'.
+ac11e552c8e799a6af00e91a64888439b699d9fd
+7e1cf2dc889e845623128125195d11533d8aef5e
+cc33353f1c71fb0fa9b4671a6a0a8539ad9ecd0a
+Branch 'from-master2' set up to track local branch 'master'.
+ok 19 - --set-upstream-to does not change branch
+
+expecting success: 
+	git checkout follower &&
+	git checkout from-master2 &&
+	git config branch.from-master2.merge > expect2 &&
+	git branch --set-upstream-to @{-1} from-master &&
+	git config branch.from-master.merge > actual &&
+	git config branch.from-master2.merge > actual2 &&
+	git branch --set-upstream-to follower from-master &&
+	git config branch.from-master.merge > expect &&
+	test_cmp expect2 actual2 &&
+	test_cmp expect actual
+
+Switched to branch 'follower'
+Your branch is ahead of 'master' by 1 commit.
+  (use "git push" to publish your local commits)
+Switched to branch 'from-master2'
+Your branch is behind 'master' by 1 commit, and can be fast-forwarded.
+  (use "git pull" to update your local branch)
+Branch 'from-master' set up to track local branch 'follower'.
+Branch 'from-master' set up to track local branch 'follower'.
+ok 20 - --set-upstream-to @{-1}
+
+# passed all 20 test(s)
+1..20
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t6100-rev-list-in-order.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6100-rev-list-in-order/.git/
+expecting success: 
+	for x in one two three four
+	do
+		echo $x >$x &&
+		git add $x &&
+		git commit -m "add file $x" ||
+		return 1
+	done &&
+	for x in four three
+	do
+		git rm $x &&
+		git commit -m "remove $x" ||
+		return 1
+	done
+
+[master (root-commit) ef8affe] add file one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one
+[master f364755] add file two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two
+[master 2f72994] add file three
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 three
+[master f4f7a02] add file four
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 four
+rm 'four'
+[master 216d5ce] remove four
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 four
+rm 'three'
+[master 2aa5d91] remove three
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 three
+ok 1 - setup a commit history with trees, blobs
+
+expecting success: 
+	git rev-list --in-commit-order --objects HEAD >actual.raw &&
+	cut -c 1-40 >actual <actual.raw &&
+
+	git cat-file --batch-check="%(objectname)" >expect.raw <<-\EOF &&
+		HEAD^{commit}
+		HEAD^{tree}
+		HEAD^{tree}:one
+		HEAD^{tree}:two
+		HEAD~1^{commit}
+		HEAD~1^{tree}
+		HEAD~1^{tree}:three
+		HEAD~2^{commit}
+		HEAD~2^{tree}
+		HEAD~2^{tree}:four
+		HEAD~3^{commit}
+		# HEAD~3^{tree} skipped, same as HEAD~1^{tree}
+		HEAD~4^{commit}
+		# HEAD~4^{tree} skipped, same as HEAD^{tree}
+		HEAD~5^{commit}
+		HEAD~5^{tree}
+	EOF
+	grep -v "#" >expect <expect.raw &&
+
+	test_cmp expect actual
+
+ok 2 - rev-list --in-commit-order
+
+expecting success: 
+	git rev-list --objects HEAD >actual.raw &&
+	cut -c 1-40 >actual <actual.raw &&
+
+	git cat-file --batch-check="%(objectname)" >expect.raw <<-\EOF &&
+		HEAD^{commit}
+		HEAD~1^{commit}
+		HEAD~2^{commit}
+		HEAD~3^{commit}
+		HEAD~4^{commit}
+		HEAD~5^{commit}
+		HEAD^{tree}
+		HEAD^{tree}:one
+		HEAD^{tree}:two
+		HEAD~1^{tree}
+		HEAD~1^{tree}:three
+		HEAD~2^{tree}
+		HEAD~2^{tree}:four
+		# HEAD~3^{tree} skipped, same as HEAD~1^{tree}
+		# HEAD~4^{tree} skipped, same as HEAD^{tree}
+		HEAD~5^{tree}
+	EOF
+	grep -v "#" >expect <expect.raw &&
+
+	test_cmp expect actual
+
+ok 3 - rev-list lists blobs and trees after commits
+
+# passed all 3 test(s)
+1..3
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
 *** t6032-merge-large-rename.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6032-merge-large-rename/.git/
 expecting success: 
@@ -225349,7 +225724,7 @@
 	git commit -m initial &&
 	git tag initial
 
-[master (root-commit) c17e4a2] initial
+[master (root-commit) 39892ef] initial
  Author: A U Thor <author@example.com>
  1 file changed, 0 insertions(+), 0 deletions(-)
  create mode 100644 file
@@ -225384,8 +225759,8 @@
 	
 Already on 'master'
 error: branch 'test5' not found.
-HEAD is now at c17e4a2 initial
-[master 1ed70b1] add=5
+HEAD is now at 39892ef initial
+[master cb0944c] add=5
  Author: A U Thor <author@example.com>
  5 files changed, 110 insertions(+)
  create mode 100644 1
@@ -225393,7 +225768,7 @@
  create mode 100644 3
  create mode 100644 4
  create mode 100644 5
-[master 808ba39] change=5
+[master 242a3bb] change=5
  Author: A U Thor <author@example.com>
  5 files changed, 5 insertions(+), 5 deletions(-)
 Switched to a new branch 'test5'
@@ -225402,7 +225777,7 @@
 rm '3'
 rm '4'
 rm '5'
-[test5 89c3b31] change+rename=5
+[test5 6cf2d9d] change+rename=5
  Author: A U Thor <author@example.com>
  5 files changed, 5 insertions(+), 5 deletions(-)
  rename 1 => 1.moved (91%)
@@ -225411,10 +225786,10 @@
  rename 4 => 4.moved (91%)
  rename 5 => 5.moved (91%)
 Merging:
-89c3b31 change+rename=5
+6cf2d9d change+rename=5
 virtual master
 found 1 common ancestor:
-1ed70b1 add=5
+cb0944c add=5
 Auto-merging 5.moved
 Auto-merging 4.moved
 Auto-merging 3.moved
@@ -225463,15 +225838,15 @@
 	
 Switched to branch 'master'
 error: branch 'test4' not found.
-HEAD is now at c17e4a2 initial
-[master 2abf67c] add=4
+HEAD is now at 39892ef initial
+[master 20573dc] add=4
  Author: A U Thor <author@example.com>
  4 files changed, 88 insertions(+)
  create mode 100644 1
  create mode 100644 2
  create mode 100644 3
  create mode 100644 4
-[master 062bff4] change=4
+[master 23e198b] change=4
  Author: A U Thor <author@example.com>
  4 files changed, 4 insertions(+), 4 deletions(-)
 Switched to a new branch 'test4'
@@ -225479,7 +225854,7 @@
 rm '2'
 rm '3'
 rm '4'
-[test4 6e7bece] change+rename=4
+[test4 ca39570] change+rename=4
  Author: A U Thor <author@example.com>
  4 files changed, 4 insertions(+), 4 deletions(-)
  rename 1 => 1.moved (91%)
@@ -225487,10 +225862,10 @@
  rename 3 => 3.moved (91%)
  rename 4 => 4.moved (91%)
 Merging:
-6e7bece change+rename=4
+ca39570 change+rename=4
 virtual master
 found 1 common ancestor:
-2abf67c add=4
+20573dc add=4
 Auto-merging 4.moved
 Auto-merging 3.moved
 Auto-merging 2.moved
@@ -225531,9 +225906,9 @@
 	esac
 	
 Switched to branch 'master'
-Deleted branch test5 (was 162a47f).
-HEAD is now at c17e4a2 initial
-[master 1ed70b1] add=5
+Deleted branch test5 (was d9eb0bd).
+HEAD is now at 39892ef initial
+[master 113fc59] add=5
  Author: A U Thor <author@example.com>
  5 files changed, 110 insertions(+)
  create mode 100644 1
@@ -225541,7 +225916,7 @@
  create mode 100644 3
  create mode 100644 4
  create mode 100644 5
-[master 4180a1e] change=5
+[master d3e9401] change=5
  Author: A U Thor <author@example.com>
  5 files changed, 5 insertions(+), 5 deletions(-)
 Switched to a new branch 'test5'
@@ -225550,7 +225925,7 @@
 rm '3'
 rm '4'
 rm '5'
-[test5 0f192e9] change+rename=5
+[test5 75cb6d5] change+rename=5
  Author: A U Thor <author@example.com>
  5 files changed, 5 insertions(+), 5 deletions(-)
  rename 1 => 1.moved (91%)
@@ -225559,10 +225934,10 @@
  rename 4 => 4.moved (91%)
  rename 5 => 5.moved (91%)
 Merging:
-0f192e9 change+rename=5
+75cb6d5 change+rename=5
 virtual master
 found 1 common ancestor:
-1ed70b1 add=5
+113fc59 add=5
 CONFLICT (modify/delete): 5 deleted in HEAD and modified in master. Version master of 5 left in tree.
 CONFLICT (modify/delete): 4 deleted in HEAD and modified in master. Version master of 4 left in tree.
 CONFLICT (modify/delete): 3 deleted in HEAD and modified in master. Version master of 3 left in tree.
@@ -225606,9 +225981,9 @@
 	esac
 	
 Switched to branch 'master'
-Deleted branch test5 (was 0f192e9).
-HEAD is now at c17e4a2 initial
-[master cb86d56] add=5
+Deleted branch test5 (was 75cb6d5).
+HEAD is now at 39892ef initial
+[master 113fc59] add=5
  Author: A U Thor <author@example.com>
  5 files changed, 110 insertions(+)
  create mode 100644 1
@@ -225616,7 +225991,7 @@
  create mode 100644 3
  create mode 100644 4
  create mode 100644 5
-[master 1d2b167] change=5
+[master d3e9401] change=5
  Author: A U Thor <author@example.com>
  5 files changed, 5 insertions(+), 5 deletions(-)
 Switched to a new branch 'test5'
@@ -225625,7 +226000,7 @@
 rm '3'
 rm '4'
 rm '5'
-[test5 ba3e0ac] change+rename=5
+[test5 75cb6d5] change+rename=5
  Author: A U Thor <author@example.com>
  5 files changed, 5 insertions(+), 5 deletions(-)
  rename 1 => 1.moved (91%)
@@ -225634,10 +226009,10 @@
  rename 4 => 4.moved (91%)
  rename 5 => 5.moved (91%)
 Merging:
-ba3e0ac change+rename=5
+75cb6d5 change+rename=5
 virtual master
 found 1 common ancestor:
-cb86d56 add=5
+113fc59 add=5
 Auto-merging 5.moved
 Auto-merging 4.moved
 Auto-merging 3.moved
@@ -225681,8 +226056,8 @@
 	
 Switched to branch 'master'
 error: branch 'test6' not found.
-HEAD is now at c17e4a2 initial
-[master 01beba9] add=6
+HEAD is now at 39892ef initial
+[master 325626f] add=6
  Author: A U Thor <author@example.com>
  6 files changed, 132 insertions(+)
  create mode 100644 1
@@ -225691,7 +226066,7 @@
  create mode 100644 4
  create mode 100644 5
  create mode 100644 6
-[master 3021445] change=6
+[master eed0888] change=6
  Author: A U Thor <author@example.com>
  6 files changed, 6 insertions(+), 6 deletions(-)
 Switched to a new branch 'test6'
@@ -225701,7 +226076,7 @@
 rm '4'
 rm '5'
 rm '6'
-[test6 133d15a] change+rename=6
+[test6 ded6b20] change+rename=6
  Author: A U Thor <author@example.com>
  6 files changed, 6 insertions(+), 6 deletions(-)
  rename 1 => 1.moved (91%)
@@ -225711,10 +226086,10 @@
  rename 5 => 5.moved (91%)
  rename 6 => 6.moved (91%)
 Merging:
-133d15a change+rename=6
+ded6b20 change+rename=6
 virtual master
 found 1 common ancestor:
-01beba9 add=6
+325626f add=6
 CONFLICT (modify/delete): 6 deleted in HEAD and modified in master. Version master of 6 left in tree.
 CONFLICT (modify/delete): 5 deleted in HEAD and modified in master. Version master of 5 left in tree.
 CONFLICT (modify/delete): 4 deleted in HEAD and modified in master. Version master of 4 left in tree.
@@ -225749,8 +226124,8 @@
 	git add unrelated-change &&
 	git commit -m unrelated-change
 
-HEAD is now at c17e4a2 initial
-[test6 ac7508a] create-files
+HEAD is now at 39892ef initial
+[test6 dc9d972] create-files
  Author: A U Thor <author@example.com>
  200 files changed, 4400 insertions(+)
  create mode 100644 1
@@ -225954,7 +226329,7 @@
  create mode 100644 98
  create mode 100644 99
 Switched to a new branch 'simple-rename'
-[simple-rename 353e2bf] renamed
+[simple-rename 50cdfc3] renamed
  Author: A U Thor <author@example.com>
  200 files changed, 0 insertions(+), 0 deletions(-)
  rename 1 => builtin/1 (100%)
@@ -226158,7 +226533,7 @@
  rename 98 => builtin/98 (100%)
  rename 99 => builtin/99 (100%)
 Switched to branch 'simple-change'
-[simple-change bc4ffc0] unrelated-change
+[simple-change 06d4298] unrelated-change
  Author: A U Thor <author@example.com>
  1 file changed, 0 insertions(+), 0 deletions(-)
  create mode 100644 unrelated-change
@@ -226175,109 +226550,172 @@
 1..10
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t6100-rev-list-in-order.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6100-rev-list-in-order/.git/
+*** t6060-merge-index.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6060-merge-index/.git/
 expecting success: 
-	for x in one two three four
-	do
-		echo $x >$x &&
-		git add $x &&
-		git commit -m "add file $x" ||
-		return 1
-	done &&
-	for x in four three
-	do
-		git rm $x &&
-		git commit -m "remove $x" ||
-		return 1
-	done
+	for i in 1 2 3 4 5 6 7 8 9 10; do
+		echo $i
+	done >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) b089e73] add file one
+[master (root-commit) f0d5fbf] base
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one
-[master 17322a2] add file two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 two
-[master 0e8e422] add file three
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 three
-[master 548a668] add file four
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 four
-rm 'four'
-[master b14f33e] remove four
+ 1 file changed, 10 insertions(+)
+ create mode 100644 file
+[master dcc9963] two
  Author: A U Thor <author@example.com>
- 1 file changed, 1 deletion(-)
- delete mode 100644 four
-rm 'three'
-[master 752c852] remove three
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'other'
+[other 0aff53e] ten
  Author: A U Thor <author@example.com>
- 1 file changed, 1 deletion(-)
- delete mode 100644 three
-ok 1 - setup a commit history with trees, blobs
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 1 - setup diverging branches
 
 expecting success: 
-	git rev-list --in-commit-order --objects HEAD >actual.raw &&
-	cut -c 1-40 >actual <actual.raw &&
+	git read-tree -i -m base ten two &&
+	echo file >expect &&
+	git diff-files --name-only --diff-filter=U >unmerged &&
+	test_cmp expect unmerged
 
-	git cat-file --batch-check="%(objectname)" >expect.raw <<-\EOF &&
-		HEAD^{commit}
-		HEAD^{tree}
-		HEAD^{tree}:one
-		HEAD^{tree}:two
-		HEAD~1^{commit}
-		HEAD~1^{tree}
-		HEAD~1^{tree}:three
-		HEAD~2^{commit}
-		HEAD~2^{tree}
-		HEAD~2^{tree}:four
-		HEAD~3^{commit}
-		# HEAD~3^{tree} skipped, same as HEAD~1^{tree}
-		HEAD~4^{commit}
-		# HEAD~4^{tree} skipped, same as HEAD^{tree}
-		HEAD~5^{commit}
-		HEAD~5^{tree}
-	EOF
-	grep -v "#" >expect <expect.raw &&
+ok 2 - read-tree does not resolve content merge
 
-	test_cmp expect actual
+expecting success: 
+	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 2 - rev-list --in-commit-order
+Auto-merging file
+ok 3 - git merge-index git-merge-one-file resolves
 
 expecting success: 
-	git rev-list --objects HEAD >actual.raw &&
-	cut -c 1-40 >actual <actual.raw &&
+	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
+	)
 
-	git cat-file --batch-check="%(objectname)" >expect.raw <<-\EOF &&
-		HEAD^{commit}
-		HEAD~1^{commit}
-		HEAD~2^{commit}
-		HEAD~3^{commit}
-		HEAD~4^{commit}
-		HEAD~5^{commit}
-		HEAD^{tree}
-		HEAD^{tree}:one
-		HEAD^{tree}:two
-		HEAD~1^{tree}
-		HEAD~1^{tree}:three
-		HEAD~2^{tree}
-		HEAD~2^{tree}:four
-		# HEAD~3^{tree} skipped, same as HEAD~1^{tree}
-		# HEAD~4^{tree} skipped, same as HEAD^{tree}
-		HEAD~5^{tree}
-	EOF
-	grep -v "#" >expect <expect.raw &&
+Cloning into bare repository 'bare.git'...
+done.
+ok 4 - setup bare merge
 
-	test_cmp expect actual
+expecting success: 
+	(cd bare.git &&
+	 GIT_INDEX_FILE=$PWD/merge.index &&
+	 export GIT_INDEX_FILE &&
+	 test_must_fail git merge-index git-merge-one-file -a
+	)
 
-ok 3 - rev-list lists blobs and trees after commits
+fatal: /build/git-2.20.1/git-merge-one-file cannot be used without a working tree.
+fatal: merge program failed
+ok 5 - merge-one-file fails without a work tree
 
-# passed all 3 test(s)
-1..3
+expecting success: 
+	(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: 
+	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/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t6110-rev-list-sparse.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6110-rev-list-sparse/.git/
+expecting success: 
+	test_commit A &&
+	test_commit B &&
+	test_commit C &&
+	git checkout -b side HEAD^ &&
+	test_commit D &&
+	test_commit E &&
+	git merge master
+
+[master (root-commit) 0ddfaf1] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A.t
+[master d9df450] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 B.t
+[master 35a8500] C
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 C.t
+Switched to a new branch 'side'
+[side 3e6e33e] D
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 D.t
+[side dc25130] E
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 E.t
+Merging:
+dc25130 E
+virtual master
+found 1 common ancestor:
+d9df450 B
+Merge made by the 'recursive' strategy.
+ C.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 C.t
+ok 1 - setup
+
+expecting success: 
+	git rev-list --first-parent --boundary HEAD^..
+
+2d82c395bc1ef4846e3c35512cb70c2abc5cdab1
+-35a8500a6c116c9ddf35e140fa3277a7fe0b4196
+-dc25130fe5e9f5d4a18aa4e0dff022e489b22c75
+ok 2 - rev-list --first-parent --boundary
+
+# passed all 2 test(s)
+1..2
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
 *** t6044-merge-unrelated-index-changes.sh ***
@@ -226632,1140 +227070,4427 @@
 1..15
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t6110-rev-list-sparse.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6110-rev-list-sparse/.git/
+*** t6130-pathspec-noglob.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6130-pathspec-noglob/.git/
 expecting success: 
-	test_commit A &&
-	test_commit B &&
-	test_commit C &&
-	git checkout -b side HEAD^ &&
-	test_commit D &&
-	test_commit E &&
-	git merge master
+	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) 0ddfaf1] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.t
-[master d9df450] B
+[master (root-commit) f600089] unrelated
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 B.t
-[master 35a8500] C
+ create mode 100644 bar
+[master 065b8fa] vanilla
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 C.t
-Switched to a new branch 'side'
-[side 3e6e33e] D
+ create mode 100644 foo
+[master 306e39a] star
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 D.t
-[side dc25130] E
+ create mode 100644 f*
+[master 48b9afb] bracket
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 E.t
-Merging:
-dc25130 E
-virtual master
-found 1 common ancestor:
-d9df450 B
-Merge made by the 'recursive' strategy.
- C.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 C.t
-ok 1 - setup
+ create mode 100644 f[o][o]
+ok 1 - create commits with glob characters
 
 expecting success: 
-	git rev-list --first-parent --boundary HEAD^..
+	echo vanilla >expect &&
+	git log --format=%s -- foo >actual &&
+	test_cmp expect actual
 
-2d82c395bc1ef4846e3c35512cb70c2abc5cdab1
--35a8500a6c116c9ddf35e140fa3277a7fe0b4196
--dc25130fe5e9f5d4a18aa4e0dff022e489b22c75
-ok 2 - rev-list --first-parent --boundary
+ok 2 - vanilla pathspec matches literally
 
-# passed all 2 test(s)
-1..2
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t6060-merge-index.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6060-merge-index/.git/
 expecting success: 
-	for i in 1 2 3 4 5 6 7 8 9 10; do
-		echo $i
-	done >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
+	cat >expect <<-\EOF &&
+	bracket
+	star
+	vanilla
+	EOF
+	git log --format=%s -- "f*" >actual &&
+	test_cmp expect actual
 
-[master (root-commit) f75531a] base
- Author: A U Thor <author@example.com>
- 1 file changed, 10 insertions(+)
- create mode 100644 file
-[master de68086] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'other'
-[other c95fde3] ten
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 1 - setup diverging branches
+ok 3 - star pathspec globs
 
 expecting success: 
-	git read-tree -i -m base ten two &&
-	echo file >expect &&
-	git diff-files --name-only --diff-filter=U >unmerged &&
-	test_cmp expect unmerged
+	cat >expect <<-\EOF &&
+	bracket
+	star
+	vanilla
+	EOF
+	git log --format=%s -- ":(glob)f*" >actual &&
+	test_cmp expect actual
 
-ok 2 - read-tree does not resolve content merge
+ok 4 - star pathspec globs
 
 expecting success: 
-	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
+	cat >expect <<-\EOF &&
+	bracket
+	vanilla
+	EOF
+	git log --format=%s -- "f[o][o]" >actual &&
+	test_cmp expect actual
 
-Auto-merging file
-ok 3 - git merge-index git-merge-one-file resolves
+ok 5 - bracket pathspec globs and matches literal brackets
 
 expecting success: 
-	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
-	)
+	cat >expect <<-\EOF &&
+	bracket
+	vanilla
+	EOF
+	git log --format=%s -- ":(glob)f[o][o]" >actual &&
+	test_cmp expect actual
 
-Cloning into bare repository 'bare.git'...
-done.
-ok 4 - setup bare merge
+ok 6 - bracket pathspec globs and matches literal brackets
 
 expecting success: 
-	(cd bare.git &&
-	 GIT_INDEX_FILE=$PWD/merge.index &&
-	 export GIT_INDEX_FILE &&
-	 test_must_fail git merge-index git-merge-one-file -a
-	)
+	echo vanilla >expect &&
+	git --literal-pathspecs log --format=%s -- foo >actual &&
+	test_cmp expect actual
 
-fatal: /build/git-2.20.1/git-merge-one-file cannot be used without a working tree.
-fatal: merge program failed
-ok 5 - merge-one-file fails without a work tree
+ok 7 - no-glob option matches literally (vanilla)
 
 expecting success: 
-	(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
+	echo vanilla >expect &&
+	git log --format=%s -- ":(literal)foo" >actual &&
+	test_cmp expect actual
 
-Auto-merging file
-ok 6 - merge-one-file respects GIT_WORK_TREE
+ok 8 - no-glob option matches literally (vanilla)
 
 expecting success: 
-	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
+	echo star >expect &&
+	git --literal-pathspecs log --format=%s -- "f*" >actual &&
+	test_cmp expect actual
 
-Cloning into 'subdir/child'...
-done.
-Auto-merging file
-ok 7 - merge-one-file respects core.worktree
+ok 9 - no-glob option matches literally (star)
 
-# passed all 7 test(s)
-1..7
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t5516-fetch-push.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5516-fetch-push/.git/
 expecting success: 
+	echo star >expect &&
+	git log --format=%s -- ":(literal)f*" >actual &&
+	test_cmp expect actual
 
-	>path1 &&
-	git add path1 &&
-	test_tick &&
-	git commit -a -m repo &&
-	the_first_commit=$(git show-ref -s --verify refs/heads/master) &&
-
-	>path2 &&
-	git add path2 &&
-	test_tick &&
-	git commit -a -m second &&
-	the_commit=$(git show-ref -s --verify refs/heads/master)
+ok 10 - no-glob option matches literally (star)
 
+expecting success: 
+	echo bracket >expect &&
+	git --literal-pathspecs log --format=%s -- "f[o][o]" >actual &&
+	test_cmp expect actual
 
-[master (root-commit) b9c09d6] repo
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 path1
-[master 9ad36e1] second
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 path2
-ok 1 - setup
+ok 11 - no-glob option matches literally (bracket)
 
 expecting success: 
-	mk_empty testrepo &&
-	(
-		cd testrepo &&
-		git fetch .. refs/heads/master:refs/remotes/origin/master &&
-
-		echo "$the_commit commit	refs/remotes/origin/master" >expect &&
-		git for-each-ref refs/remotes/origin >actual &&
-		test_cmp expect actual
-	)
+	echo bracket >expect &&
+	git log --format=%s -- ":(literal)f[o][o]" >actual &&
+	test_cmp expect actual
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5516-fetch-push/testrepo/.git/
-From ..
- * [new branch]      master     -> origin/master
-ok 2 - fetch without wildcard
+ok 12 - no-glob option matches literally (bracket)
 
 expecting success: 
-	mk_empty testrepo &&
-	(
-		cd testrepo &&
-		git config remote.up.url .. &&
-		git config remote.up.fetch "refs/heads/*:refs/remotes/origin/*" &&
-		git fetch up &&
-
-		echo "$the_commit commit	refs/remotes/origin/master" >expect &&
-		git for-each-ref refs/remotes/origin >actual &&
-		test_cmp expect actual
-	)
+	git --literal-pathspecs log --format=%s -- ":(literal)foo" >actual &&
+	test_must_be_empty actual
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5516-fetch-push/testrepo/.git/
-From ..
- * [new branch]      master     -> origin/master
-ok 3 - fetch with wildcard
+ok 13 - no-glob option disables :(literal)
 
 expecting success: 
-	mk_empty testrepo &&
-	(
-		TRASH=$(pwd)/ &&
-		cd testrepo &&
-		git config "url.$TRASH.insteadOf" trash/ &&
-		git config remote.up.url trash/. &&
-		git config remote.up.fetch "refs/heads/*:refs/remotes/origin/*" &&
-		git fetch up &&
-
-		echo "$the_commit commit	refs/remotes/origin/master" >expect &&
-		git for-each-ref refs/remotes/origin >actual &&
-		test_cmp expect actual
-	)
+	echo star >expect &&
+	GIT_LITERAL_PATHSPECS=1 git log --format=%s -- "f*" >actual &&
+	test_cmp expect actual
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5516-fetch-push/testrepo/.git/
-From /build/git-2.20.1/t/trash directory.t5516-fetch-push/.
- * [new branch]      master     -> origin/master
-ok 4 - fetch with insteadOf
+ok 14 - no-glob environment variable works
 
 expecting success: 
-	mk_empty testrepo &&
-	(
-		TRASH=$(pwd)/ &&
-		cd testrepo &&
-		git config "url.trash/.pushInsteadOf" "$TRASH" &&
-		git config remote.up.url "$TRASH." &&
-		git config remote.up.fetch "refs/heads/*:refs/remotes/origin/*" &&
-		git fetch up &&
-
-		echo "$the_commit commit	refs/remotes/origin/master" >expect &&
-		git for-each-ref refs/remotes/origin >actual &&
-		test_cmp expect actual
-	)
+	git --literal-pathspecs blame -- foo &&
+	git --icase-pathspecs   blame -- foo &&
+	git --glob-pathspecs    blame -- foo &&
+	git --noglob-pathspecs  blame -- foo
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5516-fetch-push/testrepo/.git/
-From /build/git-2.20.1/t/trash directory.t5516-fetch-push/.
- * [new branch]      master     -> origin/master
-ok 5 - fetch with pushInsteadOf (should not rewrite)
+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: 
-	mk_empty testrepo &&
-
-	git push testrepo refs/heads/master:refs/remotes/origin/master &&
-	(
-		cd testrepo &&
-		echo "$the_commit commit	refs/remotes/origin/master" >expect &&
-		git for-each-ref refs/remotes/origin >actual &&
-		test_cmp expect actual
-	)
+	mkdir xxx &&
+	test_commit xxx xxx/bar
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5516-fetch-push/testrepo/.git/
-To testrepo
- * [new branch]      master -> origin/master
-ok 6 - push without wildcard
+[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: 
-	mk_empty testrepo &&
-
-	git push testrepo "refs/heads/*:refs/remotes/origin/*" &&
-	(
-		cd testrepo &&
-		echo "$the_commit commit	refs/remotes/origin/master" >expect &&
-		git for-each-ref refs/remotes/origin >actual &&
-		test_cmp expect actual
-	)
+	cat >expect <<-\EOF &&
+	xxx
+	unrelated
+	EOF
+	git log --format=%s -- ":(glob)**/bar" >actual &&
+	test_cmp expect actual
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5516-fetch-push/testrepo/.git/
-To testrepo
- * [new branch]      master -> origin/master
-ok 7 - push with wildcard
+ok 17 - **/ works with :(glob)
 
 expecting success: 
-	mk_empty testrepo &&
-	TRASH="$(pwd)/" &&
-	test_config "url.$TRASH.insteadOf" trash/ &&
-	git push trash/testrepo refs/heads/master:refs/remotes/origin/master &&
-	(
-		cd testrepo &&
-		echo "$the_commit commit	refs/remotes/origin/master" >expect &&
-		git for-each-ref refs/remotes/origin >actual &&
-		test_cmp expect actual
-	)
+	git --noglob-pathspecs log --format=%s -- "**/bar" >actual &&
+	test_must_be_empty actual
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5516-fetch-push/testrepo/.git/
-To /build/git-2.20.1/t/trash directory.t5516-fetch-push/testrepo
- * [new branch]      master -> origin/master
-ok 8 - push with insteadOf
+ok 18 - **/ does not work with --noglob-pathspecs
 
 expecting success: 
-	mk_empty testrepo &&
-	TRASH="$(pwd)/" &&
-	test_config "url.$TRASH.pushInsteadOf" trash/ &&
-	git push trash/testrepo refs/heads/master:refs/remotes/origin/master &&
-	(
-		cd testrepo &&
-		echo "$the_commit commit	refs/remotes/origin/master" >expect &&
-		git for-each-ref refs/remotes/origin >actual &&
-		test_cmp expect actual
-	)
+	cat >expect <<-\EOF &&
+	xxx
+	unrelated
+	EOF
+	git --noglob-pathspecs log --format=%s -- ":(glob)**/bar" >actual &&
+	test_cmp expect actual
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5516-fetch-push/testrepo/.git/
-To /build/git-2.20.1/t/trash directory.t5516-fetch-push/testrepo
- * [new branch]      master -> origin/master
-ok 9 - push with pushInsteadOf
+ok 19 - **/ works with :(glob) and --noglob-pathspecs
 
 expecting success: 
-	mk_empty testrepo &&
-	test_config "url.trash2/.pushInsteadOf" testrepo/ &&
-	test_config "url.trash3/.pushInsteadOf" trash/wrong &&
-	test_config remote.r.url trash/wrong &&
-	test_config remote.r.pushurl "testrepo/" &&
-	git push r refs/heads/master:refs/remotes/origin/master &&
-	(
-		cd testrepo &&
-		echo "$the_commit commit	refs/remotes/origin/master" >expect &&
-		git for-each-ref refs/remotes/origin >actual &&
-		test_cmp expect actual
-	)
+	cat >expect <<-\EOF &&
+	xxx
+	unrelated
+	EOF
+	git --glob-pathspecs log --format=%s -- "**/bar" >actual &&
+	test_cmp expect actual
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5516-fetch-push/testrepo/.git/
-To testrepo/
- * [new branch]      master -> origin/master
-ok 10 - push with pushInsteadOf and explicit pushurl (pushInsteadOf should not rewrite)
+ok 20 - **/ works with --glob-pathspecs
 
 expecting success: 
+	git --glob-pathspecs log --format=%s -- ":(literal)**/bar" >actual &&
+	test_must_be_empty actual
 
-	mk_test testrepo heads/master &&
-	git push testrepo : &&
-	check_push_result testrepo $the_commit heads/master
+ok 21 - **/ does not work with :(literal) and --glob-pathspecs
 
+# passed all 21 test(s)
+1..21
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t6112-rev-list-filters-objects.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6112-rev-list-filters-objects/.git/
+expecting success: 
+	echo "{print \$1}" >print_1.awk &&
+	echo "{print \$2}" >print_2.awk &&
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5516-fetch-push/testrepo/.git/
-remote: warning: updating the current branch        
-To testrepo
- * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> master
-remote: warning: updating the current branch        
-To testrepo
-   b9c09d6..9ad36e1  master -> master
-ok 11 - push with matching heads
+	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"
+	done
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6112-rev-list-filters-objects/r1/.git/
+[master (root-commit) 2065dc8] 1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file.1
+[master 23d4bac] 2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file.2
+[master 80ec5a4] 3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file.3
+[master cafea83] 4
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file.4
+[master e3a032e] 5
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file.5
+ok 1 - setup r1
 
 expecting success: 
+	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 &&
 
-	mk_test testrepo heads/master &&
-	git push testrepo : &&
-	check_push_result testrepo $the_commit heads/master
+	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
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5516-fetch-push/testrepo/.git/
-remote: warning: updating the current branch        
-To testrepo
- * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> master
-remote: warning: updating the current branch        
-To testrepo
-   b9c09d6..9ad36e1  master -> master
-ok 12 - push with matching heads on the command line
+ok 2 - verify blob:none omits all 5 blobs
 
 expecting success: 
+	file_3=$(git -C r1 ls-files -s file.3 |
+		 awk -f print_2.awk) &&
 
-	mk_test testrepo heads/master &&
-	git push testrepo : &&
-	git commit --amend -massaged &&
-	test_must_fail git push testrepo &&
-	check_push_result testrepo $the_commit heads/master &&
-	git reset --hard $the_commit
+	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
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5516-fetch-push/testrepo/.git/
-remote: warning: updating the current branch        
-To testrepo
- * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> master
-remote: warning: updating the current branch        
-To testrepo
-   b9c09d6..9ad36e1  master -> master
-[master ead0604] assaged
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:14:13 2005 -0700
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 path2
-fatal: The current branch master has no upstream branch.
-To push the current branch and set the remote as upstream, use
+d2c9288bc745d46e9af90d26e0a3b6e03c099dff 
+ok 3 - specify blob explicitly prevents filtering
 
-    git push --set-upstream testrepo master
+expecting success: 
+	git -C r1 rev-list --objects HEAD >revs &&
+	awk -f print_1.awk revs |
+	sort >expected &&
 
-HEAD is now at 9ad36e1 second
-ok 13 - failed (non-fast-forward) push with matching heads
+	git -C r1 rev-list --objects --filter-print-omitted --filter=blob:none \
+		HEAD >revs &&
+	awk -f print_1.awk revs |
+	sed "s/~//" |
+	sort >observed &&
 
-expecting success: 
+	test_cmp expected observed
 
-	mk_test testrepo heads/master &&
-	git push testrepo : &&
-	git commit --amend -massaged &&
-	git push --force testrepo : &&
-	! check_push_result testrepo $the_commit heads/master &&
-	git reset --hard $the_commit
+ok 4 - verify emitted+omitted == all
 
+expecting success: 
+	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"
+	done
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5516-fetch-push/testrepo/.git/
-remote: warning: updating the current branch        
-To testrepo
- * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> master
-remote: warning: updating the current branch        
-To testrepo
-   b9c09d6..9ad36e1  master -> master
-[master ead0604] assaged
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6112-rev-list-filters-objects/r2/.git/
+[master (root-commit) 4e0b7ec] 1000
  Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:14:13 2005 -0700
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 path2
-remote: warning: updating the current branch        
-To testrepo
- + 9ad36e1...ead0604 master -> master (forced update)
---- expect	2021-12-03 05:08:27.546145354 +0000
-+++ actual	2021-12-03 05:08:27.558145005 +0000
-@@ -1 +1 @@
--9ad36e1e54b2130a20d55abb4f0f3ca8494ead3f
-+ead060494eed34a0810ba15d500e7ac4ecaa2560
-HEAD is now at 9ad36e1 second
-ok 14 - push --force with matching heads
+ 1 file changed, 1 insertion(+)
+ create mode 100644 large.1000
+[master ccf7462] 10000
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 large.10000
+ok 5 - setup r2
 
 expecting success: 
+	git -C r2 ls-files -s large.1000 large.10000 >ls_files_result &&
+	awk -f print_2.awk ls_files_result |
+	sort >expected &&
 
-	mk_test testrepo heads/master &&
-	git push testrepo : &&
-	git commit --amend -massaged &&
-	git push testrepo +: &&
-	! check_push_result testrepo $the_commit heads/master &&
-	git reset --hard $the_commit
+	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
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5516-fetch-push/testrepo/.git/
-remote: warning: updating the current branch        
-To testrepo
- * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> master
-remote: warning: updating the current branch        
-To testrepo
-   b9c09d6..9ad36e1  master -> master
-[master ead0604] assaged
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:14:13 2005 -0700
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 path2
-remote: warning: updating the current branch        
-To testrepo
- + 9ad36e1...ead0604 master -> master (forced update)
---- expect	2021-12-03 05:08:28.218125821 +0000
-+++ actual	2021-12-03 05:08:28.230125472 +0000
-@@ -1 +1 @@
--9ad36e1e54b2130a20d55abb4f0f3ca8494ead3f
-+ead060494eed34a0810ba15d500e7ac4ecaa2560
-HEAD is now at 9ad36e1 second
-ok 15 - push with matching heads and forced update
+ok 6 - verify blob:limit=500 omits all blobs
 
 expecting success: 
+	git -C r2 rev-list --objects HEAD >revs &&
+	awk -f print_1.awk revs |
+	sort >expected &&
 
-	mk_test testrepo heads/master &&
-	git push testrepo master:master &&
-	check_push_result testrepo $the_commit heads/master
+	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
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5516-fetch-push/testrepo/.git/
-remote: warning: updating the current branch        
-To testrepo
- * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> master
-remote: warning: updating the current branch        
-To testrepo
-   b9c09d6..9ad36e1  master -> master
-ok 16 - push with no ambiguity (1)
+ok 7 - verify emitted+omitted == all
 
 expecting success: 
+	git -C r2 ls-files -s large.1000 large.10000 >ls_files_result &&
+	awk -f print_2.awk ls_files_result |
+	sort >expected &&
 
-	mk_test testrepo remotes/origin/master &&
-	git push testrepo master:origin/master &&
-	check_push_result testrepo $the_commit remotes/origin/master
+	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
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5516-fetch-push/testrepo/.git/
-To testrepo
- * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> origin/master
-notice: HEAD points to an unborn branch (master)
-To testrepo
-   b9c09d6..9ad36e1  master -> origin/master
-notice: HEAD points to an unborn branch (master)
-ok 17 - push with no ambiguity (2)
+ok 8 - verify blob:limit=1000
 
 expecting success: 
+	git -C r2 ls-files -s large.10000 >ls_files_result &&
+	awk -f print_2.awk ls_files_result |
+	sort >expected &&
 
-	mk_test testrepo heads/master heads/t/master &&
-	git branch -f t/master master &&
-	git push testrepo master &&
-	check_push_result testrepo $the_commit heads/master &&
-	check_push_result testrepo $the_first_commit heads/t/master
+	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
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5516-fetch-push/testrepo/.git/
-remote: warning: updating the current branch        
-To testrepo
- * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> master
-To testrepo
- * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> t/master
-remote: warning: updating the current branch        
-To testrepo
-   b9c09d6..9ad36e1  master -> master
-ok 18 - push with colon-less refspec, no ambiguity
+ok 9 - verify blob:limit=1001
 
 expecting success: 
+	git -C r2 ls-files -s large.10000 >ls_files_result &&
+	awk -f print_2.awk ls_files_result |
+	sort >expected &&
 
-	mk_test testrepo heads/master remotes/origin/master &&
-	git push testrepo master:master &&
-	check_push_result testrepo $the_commit heads/master &&
-	check_push_result testrepo $the_first_commit remotes/origin/master
+	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
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5516-fetch-push/testrepo/.git/
-remote: warning: updating the current branch        
-To testrepo
- * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> master
-To testrepo
- * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> origin/master
-remote: warning: updating the current branch        
-To testrepo
-   b9c09d6..9ad36e1  master -> master
-ok 19 - push with weak ambiguity (1)
+ok 10 - verify blob:limit=1k
 
 expecting success: 
+	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 &&
 
-	mk_test testrepo heads/master remotes/origin/master remotes/another/master &&
-	git push testrepo master:master &&
-	check_push_result testrepo $the_commit heads/master &&
-	check_push_result testrepo $the_first_commit remotes/origin/master remotes/another/master
+	test_must_be_empty observed
 
+ok 11 - verify blob:limit=1m
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5516-fetch-push/testrepo/.git/
-remote: warning: updating the current branch        
-To testrepo
- * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> master
-To testrepo
- * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> origin/master
-To testrepo
- * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> another/master
-remote: warning: updating the current branch        
-To testrepo
-   b9c09d6..9ad36e1  master -> master
-ok 20 - push with weak ambiguity (2)
+expecting success: 
+	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
+	done &&
+	git -C r3 commit -m "sparse" &&
+	echo dir1/ >pattern1 &&
+	echo sparse1 >pattern2
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6112-rev-list-filters-objects/r3/.git/
+[master (root-commit) a8e248e] 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 12 - setup r3
 
 expecting success: 
+	git -C r3 ls-files -s sparse1 sparse2 >ls_files_result &&
+	awk -f print_2.awk ls_files_result |
+	sort >expected &&
 
-	mk_test testrepo heads/frotz tags/frotz &&
-	test_must_fail git push testrepo master:frotz &&
-	check_push_result testrepo $the_first_commit heads/frotz tags/frotz
+	git -C r3 rev-list --quiet --objects --filter-print-omitted \
+		--filter=sparse:path=../pattern1 HEAD >revs &&
+	awk -f print_1.awk revs |
+	sed "s/~//" |
+	sort >observed &&
 
+	test_cmp expected observed
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5516-fetch-push/testrepo/.git/
-To testrepo
- * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> frotz
-To testrepo
- * [new tag]         b9c09d6cc74d3857142fb7c082dca65b88254c6d -> frotz
-notice: HEAD points to an unborn branch (master)
-error: dst refspec frotz matches more than one.
-error: failed to push some refs to 'testrepo'
-notice: HEAD points to an unborn branch (master)
-ok 21 - push with ambiguity
+ok 13 - verify sparse:path=pattern1 omits top-level files
 
 expecting success: 
+	git -C r3 ls-files -s sparse2 dir1/sparse2 >ls_files_result &&
+	awk -f print_2.awk ls_files_result |
+	sort >expected &&
 
-	mk_test testrepo heads/frotz tags/frotz &&
-	git branch -f frotz master &&
-	git push testrepo frotz &&
-	check_push_result testrepo $the_commit heads/frotz &&
-	check_push_result testrepo $the_first_commit tags/frotz
+	git -C r3 rev-list --quiet --objects --filter-print-omitted \
+		--filter=sparse:path=../pattern2 HEAD >revs &&
+	awk -f print_1.awk revs |
+	sed "s/~//" |
+	sort >observed &&
 
+	test_cmp expected observed
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5516-fetch-push/testrepo/.git/
-To testrepo
- * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> frotz
-To testrepo
- * [new tag]         b9c09d6cc74d3857142fb7c082dca65b88254c6d -> frotz
-notice: HEAD points to an unborn branch (master)
-To testrepo
-   b9c09d6..9ad36e1  frotz -> frotz
-notice: HEAD points to an unborn branch (master)
-notice: HEAD points to an unborn branch (master)
-ok 22 - push with colon-less refspec (1)
+ok 14 - verify sparse:path=pattern2 omits both sparse2 files
 
 expecting success: 
+	echo dir1/ >r3/pattern &&
+	git -C r3 add pattern &&
+	git -C r3 commit -m "pattern"
 
-	mk_test testrepo heads/frotz tags/frotz &&
-	if git show-ref --verify -q refs/heads/frotz
-	then
-		git branch -D frotz
-	fi &&
-	git tag -f frotz &&
-	git push -f testrepo frotz &&
-	check_push_result testrepo $the_commit tags/frotz &&
-	check_push_result testrepo $the_first_commit heads/frotz
+[master 68e19ce] pattern
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 pattern
+ok 15 - setup r3 part 2
 
+expecting success: 
+	git -C r3 ls-files -s pattern sparse1 sparse2 >ls_files_result &&
+	awk -f print_2.awk ls_files_result |
+	sort >expected &&
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5516-fetch-push/testrepo/.git/
-To testrepo
- * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> frotz
-To testrepo
- * [new tag]         b9c09d6cc74d3857142fb7c082dca65b88254c6d -> frotz
-notice: HEAD points to an unborn branch (master)
-Deleted branch frotz (was 9ad36e1).
-To testrepo
- + b9c09d6...9ad36e1 frotz -> frotz (forced update)
-notice: HEAD points to an unborn branch (master)
-notice: HEAD points to an unborn branch (master)
-ok 23 - push with colon-less refspec (2)
+	oid=$(git -C r3 ls-files -s pattern | awk -f print_2.awk) &&
 
-expecting success: 
+	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 &&
 
-	mk_test testrepo &&
-	if git show-ref --verify -q refs/tags/frotz
-	then
-		git tag -d frotz
-	fi &&
-	git branch -f frotz master &&
-	git push testrepo frotz &&
-	check_push_result testrepo $the_commit heads/frotz &&
-	test 1 = $( cd testrepo && git show-ref | wc -l )
+	test_cmp expected observed
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5516-fetch-push/testrepo/.git/
-notice: HEAD points to an unborn branch (master)
-notice: No default references
-Deleted tag 'frotz' (was 9ad36e1)
-To testrepo
- * [new branch]      frotz -> frotz
-notice: HEAD points to an unborn branch (master)
-ok 24 - push with colon-less refspec (3)
+ok 16 - verify sparse:oid=OID omits top-level files
 
 expecting success: 
+	git -C r3 ls-files -s pattern sparse1 sparse2 >ls_files_result &&
+	awk -f print_2.awk ls_files_result |
+	sort >expected &&
 
-	mk_test testrepo &&
-	if git show-ref --verify -q refs/heads/frotz
-	then
-		git branch -D frotz
-	fi &&
-	git tag -f frotz &&
-	git push testrepo frotz &&
-	check_push_result testrepo $the_commit tags/frotz &&
-	test 1 = $( cd testrepo && git show-ref | wc -l )
+	git -C r3 rev-list --quiet --objects --filter-print-omitted \
+		--filter=sparse:oid=master:pattern HEAD >revs &&
+	awk -f print_1.awk revs |
+	sed "s/~//" |
+	sort >observed &&
 
+	test_cmp expected observed
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5516-fetch-push/testrepo/.git/
-notice: HEAD points to an unborn branch (master)
-notice: No default references
-Deleted branch frotz (was 9ad36e1).
-To testrepo
- * [new tag]         frotz -> frotz
-notice: HEAD points to an unborn branch (master)
-ok 25 - push with colon-less refspec (4)
+ok 17 - verify sparse:oid=oid-ish omits top-level files
 
 expecting success: 
+	TREE=$(git -C r3 rev-parse HEAD:dir1) &&
 
-	mk_test testrepo &&
-	git push testrepo master:branch &&
-	check_push_result testrepo $the_commit heads/branch
-
+	# Create a spare repo because we will be deleting objects from this one.
+	git clone r3 r3.b &&
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5516-fetch-push/testrepo/.git/
-notice: HEAD points to an unborn branch (master)
-notice: No default references
-To testrepo
- * [new branch]      master -> branch
-notice: HEAD points to an unborn branch (master)
-ok 26 - push head with non-existent, incomplete dest
+	rm r3.b/.git/objects/$(echo $TREE | sed "s|^..|&/|") &&
 
-expecting success: 
+	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 &&
 
-	mk_test testrepo &&
-	git tag -f v1.0 &&
-	git push testrepo v1.0:tag &&
-	check_push_result testrepo $the_commit tags/tag
+	# 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
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5516-fetch-push/testrepo/.git/
-notice: HEAD points to an unborn branch (master)
-notice: No default references
-To testrepo
- * [new tag]         v1.0 -> tag
-notice: HEAD points to an unborn branch (master)
-ok 27 - push tag with non-existent, incomplete dest
+Cloning into 'r3.b'...
+done.
+ok 18 - rev-list W/ --missing=print and --missing=allow-any for trees
 
 expecting success: 
+	git -C r3 rev-list --quiet --objects --filter-print-omitted \
+		--filter=tree:0 HEAD >revs &&
 
-	mk_test testrepo &&
-	test_must_fail git push testrepo $(git rev-parse master):foo
+	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
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5516-fetch-push/testrepo/.git/
-notice: HEAD points to an unborn branch (master)
-notice: No default references
-error: unable to push to unqualified destination: foo
-The destination refspec neither matches an existing ref on the remote nor
-begins with refs/, and we are unable to guess a prefix based on the source ref.
-error: failed to push some refs to 'testrepo'
-ok 28 - push sha1 with non-existent, incomplete dest
+ok 19 - verify tree:0 includes trees in "filtered" output
 
 expecting success: 
+	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 &&
 
-	mk_test testrepo &&
-	test_must_fail git push testrepo master^:branch
-
+	# Make sure no other trees were considered besides the root.
+	! grep "Skipping contents of tree [^.]" filter_trace
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5516-fetch-push/testrepo/.git/
-notice: HEAD points to an unborn branch (master)
-notice: No default references
-error: unable to push to unqualified destination: branch
-The destination refspec neither matches an existing ref on the remote nor
-begins with refs/, and we are unable to guess a prefix based on the source ref.
-error: failed to push some refs to 'testrepo'
-ok 29 - push ref expression with non-existent, incomplete dest
+68e19ce80c38db73436557c55d533273eb98c297
+a8e248eb852d4f4f1e5272bde3d0909a2a23bddc
+ok 20 - filter a GIANT tree through tree:0
 
 expecting success: 
+	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 &&
 
-	mk_test testrepo heads/master &&
-	git checkout master &&
-	git push testrepo HEAD &&
-	check_push_result testrepo $the_commit heads/master
+	for id in `cat expected | sed "s|..|&/|"`
+	do
+		rm r1/.git/objects/$id
+	done &&
 
+	git -C r1 rev-list --quiet --missing=print --objects HEAD >revs &&
+	awk -f print_1.awk revs |
+	sed "s/?//" |
+	sort >observed &&
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5516-fetch-push/testrepo/.git/
-remote: warning: updating the current branch        
-To testrepo
- * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> master
-Already on 'master'
-remote: warning: updating the current branch        
-To testrepo
-   b9c09d6..9ad36e1  HEAD -> master
-ok 30 - push with HEAD
+	test_cmp expected observed
+
+ok 21 - rev-list W/ --missing=print
 
 expecting success: 
+	test_must_fail git -C r1 rev-list --quiet --objects HEAD
 
-	mk_test testrepo heads/master &&
-	git checkout -b local master &&
-	git push testrepo HEAD &&
-	check_push_result testrepo $the_commit heads/local
+fatal: missing blob object '54ff69bde100bd29db945c2fc62010675d3b5b14'
+ok 22 - rev-list W/O --missing fails
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5516-fetch-push/testrepo/.git/
-remote: warning: updating the current branch        
-To testrepo
- * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> master
-Switched to a new branch 'local'
-To testrepo
- * [new branch]      HEAD -> local
-ok 31 - push with HEAD nonexisting at remote
+expecting success: 
+	git -C r1 rev-list --quiet --missing=allow-any --objects HEAD
+
+ok 23 - rev-list W/ missing=allow-any
 
+# passed all 23 test(s)
+1..23
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t6022-merge-rename.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6022-merge-rename/.git/
 expecting success: 
+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
 
-	mk_test testrepo heads/master &&
-	git checkout master &&
-	git branch -D local &&
-	git checkout -b local &&
-	git push testrepo master local &&
-	check_push_result testrepo $the_commit heads/master &&
-	check_push_result testrepo $the_commit heads/local &&
+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
 
-	# Without force rewinding should fail
-	git reset --hard HEAD^ &&
-	test_must_fail git push testrepo HEAD &&
-	check_push_result testrepo $the_commit heads/local &&
+git add A M &&
+git commit -m "initial has A and M" &&
+git branch white &&
+git branch red &&
+git branch blue &&
+git branch yellow &&
+git branch change &&
+git branch change+rename &&
 
-	# With force rewinding should succeed
-	git push testrepo +HEAD &&
-	check_push_result testrepo $the_first_commit heads/local
+sed -e "/^g /s/.*/g : master changes a line/" <A >A+ &&
+mv A+ A &&
+git commit -a -m "master updates A" &&
 
+git checkout yellow &&
+rm -f M &&
+git commit -a -m "yellow removes M" &&
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5516-fetch-push/testrepo/.git/
-remote: warning: updating the current branch        
-To testrepo
- * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> master
-Switched to branch 'master'
-Deleted branch local (was 9ad36e1).
-Switched to a new branch 'local'
-remote: warning: updating the current branch        
-To testrepo
-   b9c09d6..9ad36e1  master -> master
- * [new branch]      local -> local
-HEAD is now at b9c09d6 repo
-To testrepo
- ! [rejected]        HEAD -> local (non-fast-forward)
-error: failed to push some refs to 'testrepo'
-hint: Updates were rejected because the tip of your current branch is behind
-hint: its remote counterpart. Integrate the remote changes (e.g.
-hint: 'git pull ...') before pushing again.
-hint: See the 'Note about fast-forwards' in 'git push --help' for details.
-To testrepo
- + 9ad36e1...b9c09d6 HEAD -> local (forced update)
-ok 32 - push with +HEAD
+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" &&
 
-expecting success: 
+git checkout red &&
+sed -e "/^g /s/.*/g : red changes a line/" <A >B &&
+sed -e "/^G /s/.*/G : colored branch changes a line/" <M >N &&
+rm -f A M &&
+git update-index --add --remove A B M N &&
+git commit -m "red renames A->B, M->N" &&
 
-	mk_test testrepo &&
-	git checkout master &&
-	git push testrepo HEAD:branch &&
-	check_push_result testrepo $the_commit heads/branch
+git checkout blue &&
+sed -e "/^g /s/.*/g : blue changes a line/" <A >C &&
+sed -e "/^G /s/.*/G : colored branch changes a line/" <M >N &&
+rm -f A M &&
+git update-index --add --remove A C M N &&
+git commit -m "blue renames A->C, M->N" &&
 
+git checkout change &&
+sed -e "/^g /s/.*/g : changed line/" <A >A+ &&
+mv A+ A &&
+git commit -q -a -m "changed" &&
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5516-fetch-push/testrepo/.git/
-notice: HEAD points to an unborn branch (master)
-notice: No default references
+git checkout change+rename &&
+sed -e "/^g /s/.*/g : changed line/" <A >B &&
+rm A &&
+git update-index --add B &&
+git commit -q -a -m "changed and renamed" &&
+
+git checkout master
+[master (root-commit) edb79f6] 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
+[master faabf06] master updates A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to branch 'yellow'
+[yellow c8555ba] yellow removes M
+ Author: A U Thor <author@example.com>
+ 1 file changed, 15 deletions(-)
+ delete mode 100644 M
+Switched to branch 'white'
+[white d7399f2] 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 72e551d] red renames A->B, M->N
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+ rename A => B (93%)
+ rename M => N (93%)
+Switched to branch 'blue'
+[blue 990658d] blue renames A->C, M->N
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+ rename A => C (93%)
+ rename M => N (93%)
+Switched to branch 'change'
+Switched to branch 'change+rename'
 Switched to branch 'master'
-To testrepo
- * [new branch]      HEAD -> branch
-notice: HEAD points to an unborn branch (master)
-ok 33 - push HEAD with non-existent, incomplete dest
+ok 1 - setup
 
 expecting success: 
+	git show-branch &&
+	test_expect_code 1 git pull . white &&
+	git ls-files -s &&
+	git ls-files -u B >b.stages &&
+	test_line_count = 3 b.stages &&
+	git ls-files -s N >n.stages &&
+	test_line_count = 1 n.stages &&
+	sed -ne "/^g/{
+	p
+	q
+	}" B | grep master &&
+	git diff --exit-code white N
 
-	mk_test testrepo heads/local &&
-	git checkout master &&
-	git branch -f local $the_commit &&
-	(
-		cd testrepo &&
-		git checkout local &&
-		git reset --hard $the_first_commit
-	) &&
-	test_config remote.there.url testrepo &&
-	test_config remote.there.push HEAD &&
-	test_config branch.master.remote there &&
-	git push &&
-	check_push_result testrepo $the_commit heads/master &&
-	check_push_result testrepo $the_first_commit heads/local
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5516-fetch-push/testrepo/.git/
-To testrepo
- * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> local
-notice: HEAD points to an unborn branch (master)
-Already on 'master'
-Switched to branch 'local'
-HEAD is now at b9c09d6 repo
-To testrepo
- * [new branch]      HEAD -> master
-ok 34 - push with config remote.*.push = HEAD
+! [blue] blue renames A->C, M->N
+ ! [change] changed
+  ! [change+rename] changed and renamed
+   * [master] master updates A
+    ! [red] red renames A->B, M->N
+     ! [white] white renames A->B, M->N
+      ! [yellow] yellow removes M
+-------
+      + [yellow] yellow removes M
+     +  [white] white renames A->B, M->N
+    +   [red] red renames A->B, M->N
+   *    [master] master updates A
+  +     [change+rename] changed and renamed
+ +      [change] changed
++       [blue] blue renames A->C, M->N
++++*+++ [yellow^] initial has A and M
+From .
+ * branch            white      -> FETCH_HEAD
+Merging:
+faabf06 master updates A
+virtual d7399f293c17d18f00a0b52ed0c892f0cb9578e8
+found 1 common ancestor:
+edb79f6 initial has A and M
+Auto-merging B
+CONFLICT (content): Merge conflict in B
+Automatic merge failed; fix conflicts and then commit the result.
+100644 aed72d761b68c20ffce8249a5a0426494098d376 1	B
+100644 c68856fe0bfce4eb453d8e12329c47ab60c8107b 2	B
+100644 2d603156dc5bdf6295c789cac08e3c9942a0b82a 3	B
+100644 ba41fb96393979b22691106b06bf5231eab57b85 0	N
+g : master changes a line
+ok 2 - pull renaming branch into unrenaming one
 
 expecting success: 
-	mk_test up_repo heads/master &&
-	mk_test down_repo heads/master &&
-	test_config remote.up.url up_repo &&
-	test_config remote.down.url down_repo &&
-	test_config branch.master.remote up &&
-	test_config remote.pushdefault down &&
-	test_config push.default matching &&
-	git push &&
-	check_push_result up_repo $the_first_commit heads/master &&
-	check_push_result down_repo $the_commit heads/master
+	rm -f B &&
+	git reset --hard &&
+	git checkout red &&
+	test_expect_code 1 git pull . white &&
+	git ls-files -u B >b.stages &&
+	test_line_count = 3 b.stages &&
+	git ls-files -s N >n.stages &&
+	test_line_count = 1 n.stages &&
+	sed -ne "/^g/{
+	p
+	q
+	}" B | grep red &&
+	git diff --exit-code white N
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5516-fetch-push/up_repo/.git/
-remote: warning: updating the current branch        
-To up_repo
- * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> master
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5516-fetch-push/down_repo/.git/
-remote: warning: updating the current branch        
-To down_repo
- * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> master
-remote: warning: updating the current branch        
-To down_repo
-   b9c09d6..9ad36e1  master -> master
-ok 35 - push with remote.pushdefault
+HEAD is now at faabf06 master updates A
+Switched to branch 'red'
+From .
+ * branch            white      -> FETCH_HEAD
+Merging:
+72e551d red renames A->B, M->N
+virtual d7399f293c17d18f00a0b52ed0c892f0cb9578e8
+found 1 common ancestor:
+edb79f6 initial has A and M
+Auto-merging N
+Skipped N (merged same as existing)
+Auto-merging B
+CONFLICT (content): Merge conflict in B
+Automatic merge failed; fix conflicts and then commit the result.
+g : red changes a line
+ok 3 - pull renaming branch into another renaming one
 
 expecting success: 
+	git reset --hard &&
+	git show-branch &&
+	test_expect_code 1 git pull . master &&
+	git ls-files -u B >b.stages &&
+	test_line_count = 3 b.stages &&
+	git ls-files -s N >n.stages &&
+	test_line_count = 1 n.stages &&
+	sed -ne "/^g/{
+	p
+	q
+	}" B | grep red &&
+	git diff --exit-code white N
 
-	mk_test testrepo heads/master &&
-	git checkout master &&
-	test_config remote.there.url test2repo &&
-	test_config remote.there.pushurl testrepo &&
-	git push there : &&
-	check_push_result testrepo $the_commit heads/master
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5516-fetch-push/testrepo/.git/
-remote: warning: updating the current branch        
-To testrepo
- * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> master
-Already on 'master'
-remote: warning: updating the current branch        
-To testrepo
-   b9c09d6..9ad36e1  master -> master
-ok 36 - push with config remote.*.pushurl
+HEAD is now at 72e551d red renames A->B, M->N
+! [blue] blue renames A->C, M->N
+ ! [change] changed
+  ! [change+rename] changed and renamed
+   ! [master] master updates A
+    * [red] red renames A->B, M->N
+     ! [white] white renames A->B, M->N
+      ! [yellow] yellow removes M
+-------
+      + [yellow] yellow removes M
+     +  [white] white renames A->B, M->N
+    *   [red] red renames A->B, M->N
+   +    [master] master updates A
+  +     [change+rename] changed and renamed
+ +      [change] changed
++       [blue] blue renames A->C, M->N
+++++*++ [yellow^] initial has A and M
+From .
+ * branch            master     -> FETCH_HEAD
+Merging:
+72e551d red renames A->B, M->N
+virtual faabf066da382276f948638d23dbd1d039925d8b
+found 1 common ancestor:
+edb79f6 initial has A and M
+Skipped N (merged same as existing)
+Auto-merging B
+CONFLICT (content): Merge conflict in B
+Automatic merge failed; fix conflicts and then commit the result.
+g : red changes a line
+ok 4 - pull unrenaming branch into renaming one
 
 expecting success: 
-	mk_test up_repo heads/master &&
-	mk_test side_repo heads/master &&
-	mk_test down_repo heads/master &&
-	test_config remote.up.url up_repo &&
-	test_config remote.pushdefault side_repo &&
-	test_config remote.down.url down_repo &&
-	test_config branch.master.remote up &&
-	test_config branch.master.pushremote down &&
-	test_config push.default matching &&
-	git push &&
-	check_push_result up_repo $the_first_commit heads/master &&
-	check_push_result side_repo $the_first_commit heads/master &&
-	check_push_result down_repo $the_commit heads/master
+	git reset --hard &&
+	git show-branch &&
+	test_expect_code 1 git pull . blue &&
+	git ls-files -u A >a.stages &&
+	test_line_count = 1 a.stages &&
+	git ls-files -u B >b.stages &&
+	test_line_count = 1 b.stages &&
+	git ls-files -u C >c.stages &&
+	test_line_count = 1 c.stages &&
+	git ls-files -s N >n.stages &&
+	test_line_count = 1 n.stages &&
+	sed -ne "/^g/{
+	p
+	q
+	}" B | grep red &&
+	git diff --exit-code white N
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5516-fetch-push/up_repo/.git/
-remote: warning: updating the current branch        
-To up_repo
- * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> master
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5516-fetch-push/side_repo/.git/
-remote: warning: updating the current branch        
-To side_repo
- * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> master
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5516-fetch-push/down_repo/.git/
-remote: warning: updating the current branch        
-To down_repo
- * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> master
-remote: warning: updating the current branch        
-To down_repo
-   b9c09d6..9ad36e1  master -> master
-ok 37 - push with config branch.*.pushremote
+HEAD is now at 72e551d red renames A->B, M->N
+! [blue] blue renames A->C, M->N
+ ! [change] changed
+  ! [change+rename] changed and renamed
+   ! [master] master updates A
+    * [red] red renames A->B, M->N
+     ! [white] white renames A->B, M->N
+      ! [yellow] yellow removes M
+-------
+      + [yellow] yellow removes M
+     +  [white] white renames A->B, M->N
+    *   [red] red renames A->B, M->N
+   +    [master] master updates A
+  +     [change+rename] changed and renamed
+ +      [change] changed
++       [blue] blue renames A->C, M->N
+++++*++ [yellow^] initial has A and M
+From .
+ * branch            blue       -> FETCH_HEAD
+Merging:
+72e551d red renames A->B, M->N
+virtual 990658d82a834e63c1a8d9643f7954237786d8d3
+found 1 common ancestor:
+edb79f6 initial has A and M
+Auto-merging N
+Skipped N (merged same as existing)
+CONFLICT (rename/rename): Rename "A"->"B" in branch "HEAD" rename "A"->"C" in "990658d82a834e63c1a8d9643f7954237786d8d3"
+Automatic merge failed; fix conflicts and then commit the result.
+g : red changes a line
+ok 5 - pull conflicting renames
 
 expecting success: 
-	mk_test one_repo heads/master &&
-	mk_test two_repo heads/master &&
-	test_config remote.one.url one_repo &&
-	test_config remote.two.url two_repo &&
-	test_config branch.master.pushremote two_repo &&
-	test_config remote.pushdefault one_repo &&
-	test_config push.default matching &&
-	git push &&
-	check_push_result one_repo $the_first_commit heads/master &&
-	check_push_result two_repo $the_commit heads/master
+	git reset --hard &&
+	git show-branch &&
+	echo >A this file should not matter &&
+	test_expect_code 1 git pull . white &&
+	test_path_is_file A
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5516-fetch-push/one_repo/.git/
-remote: warning: updating the current branch        
-To one_repo
- * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> master
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5516-fetch-push/two_repo/.git/
-remote: warning: updating the current branch        
-To two_repo
- * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> master
-remote: warning: updating the current branch        
-To two_repo
-   b9c09d6..9ad36e1  master -> master
-ok 38 - branch.*.pushremote config order is irrelevant
+HEAD is now at 72e551d red renames A->B, M->N
+! [blue] blue renames A->C, M->N
+ ! [change] changed
+  ! [change+rename] changed and renamed
+   ! [master] master updates A
+    * [red] red renames A->B, M->N
+     ! [white] white renames A->B, M->N
+      ! [yellow] yellow removes M
+-------
+      + [yellow] yellow removes M
+     +  [white] white renames A->B, M->N
+    *   [red] red renames A->B, M->N
+   +    [master] master updates A
+  +     [change+rename] changed and renamed
+ +      [change] changed
++       [blue] blue renames A->C, M->N
+++++*++ [yellow^] initial has A and M
+From .
+ * branch            white      -> FETCH_HEAD
+Merging:
+72e551d red renames A->B, M->N
+virtual d7399f293c17d18f00a0b52ed0c892f0cb9578e8
+found 1 common ancestor:
+edb79f6 initial has A and M
+Auto-merging N
+Skipped N (merged same as existing)
+Auto-merging B
+CONFLICT (content): Merge conflict in B
+Automatic merge failed; fix conflicts and then commit the result.
+ok 6 - interference with untracked working tree file
 
 expecting success: 
+	git reset --hard &&
+	git checkout white &&
+	git show-branch &&
+	rm -f A &&
+	echo >A this file should not matter &&
+	test_expect_code 1 git pull . red &&
+	test_path_is_file A
 
-	mk_test testrepo heads/master &&
-	old_commit=$(git -C testrepo show-ref -s --verify refs/heads/master) &&
-	git push --dry-run testrepo : &&
-	check_push_result testrepo $old_commit heads/master
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5516-fetch-push/testrepo/.git/
-remote: warning: updating the current branch        
-To testrepo
- * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> master
-To testrepo
-   b9c09d6..9ad36e1  master -> master
-ok 39 - push with dry-run
+HEAD is now at 72e551d red renames A->B, M->N
+Switched to branch 'white'
+! [blue] blue renames A->C, M->N
+ ! [change] changed
+  ! [change+rename] changed and renamed
+   ! [master] master updates A
+    ! [red] red renames A->B, M->N
+     * [white] white renames A->B, M->N
+      ! [yellow] yellow removes M
+-------
+      + [yellow] yellow removes M
+     *  [white] white renames A->B, M->N
+    +   [red] red renames A->B, M->N
+   +    [master] master updates A
+  +     [change+rename] changed and renamed
+ +      [change] changed
++       [blue] blue renames A->C, M->N
++++++*+ [yellow^] initial has A and M
+From .
+ * branch            red        -> FETCH_HEAD
+Merging:
+d7399f2 white renames A->B, M->N
+virtual 72e551d4b12b05e53a4af420294935d218849338
+found 1 common ancestor:
+edb79f6 initial has A and M
+Auto-merging N
+Skipped N (merged same as existing)
+Auto-merging B
+CONFLICT (content): Merge conflict in B
+Automatic merge failed; fix conflicts and then commit the result.
+ok 7 - interference with untracked working tree file
 
 expecting success: 
+	git reset --hard &&
+	rm -f A M &&
+	git checkout -f master &&
+	git tag -f anchor &&
+	git show-branch &&
+	git pull . yellow &&
+	test_path_is_missing M &&
+	git reset --hard anchor
 
-	mk_test testrepo heads/master &&
-	mk_child testrepo child &&
-	(
-		cd child &&
-		git pull .. master &&
-		git push &&
-		test $(git rev-parse master) = \
-			$(git rev-parse remotes/origin/master)
-	)
+HEAD is now at d7399f2 white renames A->B, M->N
+Switched to branch 'master'
+! [blue] blue renames A->C, M->N
+ ! [change] changed
+  ! [change+rename] changed and renamed
+   * [master] master updates A
+    ! [red] red renames A->B, M->N
+     ! [white] white renames A->B, M->N
+      ! [yellow] yellow removes M
+-------
+      + [yellow] yellow removes M
+     +  [white] white renames A->B, M->N
+    +   [red] red renames A->B, M->N
+   *    [master] master updates A
+  +     [change+rename] changed and renamed
+ +      [change] changed
++       [blue] blue renames A->C, M->N
++++*+++ [yellow^] initial has A and M
+From .
+ * branch            yellow     -> FETCH_HEAD
+Merging:
+faabf06 master updates A
+virtual c8555bae11e5b766cf5896fa34cccb7f7b1620b0
+found 1 common ancestor:
+edb79f6 initial has A and M
+Removing M
+Merge made by the 'recursive' strategy.
+ M | 15 ---------------
+ 1 file changed, 15 deletions(-)
+ delete mode 100644 M
+HEAD is now at faabf06 master updates A
+ok 8 - interference with untracked working tree file
 
+expecting success: 
+	git reset --hard &&
+	rm -f A M &&
+	git checkout -f master &&
+	git tag -f anchor &&
+	git show-branch &&
+	echo >>M one line addition &&
+	cat M >M.saved &&
+	test_expect_code 128 git pull . yellow &&
+	test_cmp M M.saved &&
+	rm -f M.saved
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5516-fetch-push/testrepo/.git/
-remote: warning: updating the current branch        
-To testrepo
- * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> master
-Cloning into 'child'...
-done.
-From ..
- * branch            master     -> FETCH_HEAD
-Updating b9c09d6..9ad36e1
-Fast-forward
- path2 | 0
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 path2
-remote: warning: updating the current branch        
-To /build/git-2.20.1/t/trash directory.t5516-fetch-push/testrepo
-   b9c09d6..9ad36e1  master -> master
-ok 40 - push updates local refs
+HEAD is now at faabf06 master updates A
+Already on 'master'
+! [blue] blue renames A->C, M->N
+ ! [change] changed
+  ! [change+rename] changed and renamed
+   * [master] master updates A
+    ! [red] red renames A->B, M->N
+     ! [white] white renames A->B, M->N
+      ! [yellow] yellow removes M
+-------
+      + [yellow] yellow removes M
+     +  [white] white renames A->B, M->N
+    +   [red] red renames A->B, M->N
+   *    [master] master updates A
+  +     [change+rename] changed and renamed
+ +      [change] changed
++       [blue] blue renames A->C, M->N
++++*+++ [yellow^] initial has A and M
+From .
+ * branch            yellow     -> FETCH_HEAD
+error: Your local changes to the following files would be overwritten by merge:
+	M
+Please commit your changes or stash them before you merge.
+Aborting
+error: merging of trees 327b18fcbf562119811a97f5b8ed9c8ef85d5c3d and 878bb4a74cc6b899e74bcd3b56352573baeb967d failed
+Merging:
+faabf06 master updates A
+virtual c8555bae11e5b766cf5896fa34cccb7f7b1620b0
+found 1 common ancestor:
+edb79f6 initial has A and M
+ok 9 - updated working tree file should prevent the merge
 
 expecting success: 
+	git reset --hard &&
+	rm -f A M &&
+	git checkout -f master &&
+	git tag -f anchor &&
+	git show-branch &&
+	echo >>M one line addition &&
+	cat M >M.saved &&
+	git update-index M &&
+	test_expect_code 128 git pull . yellow &&
+	test_cmp M M.saved &&
+	rm -f M.saved
 
-	mk_test testrepo heads/master &&
-	mk_child testrepo child1 &&
-	mk_child testrepo child2 &&
-	(cd child1 && git pull .. master && git push) &&
-	(
-		cd child2 &&
-		git pull ../child1 master &&
-		git push &&
-		test $(git rev-parse master) = \
-			$(git rev-parse remotes/origin/master)
-	)
+HEAD is now at faabf06 master updates A
+Already on 'master'
+! [blue] blue renames A->C, M->N
+ ! [change] changed
+  ! [change+rename] changed and renamed
+   * [master] master updates A
+    ! [red] red renames A->B, M->N
+     ! [white] white renames A->B, M->N
+      ! [yellow] yellow removes M
+-------
+      + [yellow] yellow removes M
+     +  [white] white renames A->B, M->N
+    +   [red] red renames A->B, M->N
+   *    [master] master updates A
+  +     [change+rename] changed and renamed
+ +      [change] changed
++       [blue] blue renames A->C, M->N
++++*+++ [yellow^] initial has A and M
+From .
+ * branch            yellow     -> FETCH_HEAD
+error: Your local changes to the following files would be overwritten by merge:
+  M
+Merging:
+faabf06 master updates A
+virtual c8555bae11e5b766cf5896fa34cccb7f7b1620b0
+found 1 common ancestor:
+edb79f6 initial has A and M
+ok 10 - updated working tree file should prevent the merge
 
+expecting success: 
+	git reset --hard &&
+	rm -f A M &&
+	git checkout -f yellow &&
+	git tag -f anchor &&
+	git show-branch &&
+	echo >M this file should not matter &&
+	git pull . master &&
+	test_path_is_file M &&
+	! {
+		git ls-files -s |
+		grep M
+	} &&
+	git reset --hard anchor
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5516-fetch-push/testrepo/.git/
-remote: warning: updating the current branch        
-To testrepo
- * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> master
-Cloning into 'child1'...
-done.
-Cloning into 'child2'...
-done.
-From ..
- * branch            master     -> FETCH_HEAD
-Updating b9c09d6..9ad36e1
-Fast-forward
- path2 | 0
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 path2
-remote: warning: updating the current branch        
-To /build/git-2.20.1/t/trash directory.t5516-fetch-push/testrepo
-   b9c09d6..9ad36e1  master -> master
-From ../child1
+HEAD is now at faabf06 master updates A
+Switched to branch 'yellow'
+Updated tag 'anchor' (was faabf06)
+! [blue] blue renames A->C, M->N
+ ! [change] changed
+  ! [change+rename] changed and renamed
+   ! [master] master updates A
+    ! [red] red renames A->B, M->N
+     ! [white] white renames A->B, M->N
+      * [yellow] yellow removes M
+-------
+      * [yellow] yellow removes M
+     +  [white] white renames A->B, M->N
+    +   [red] red renames A->B, M->N
+   +    [master] master updates A
+  +     [change+rename] changed and renamed
+ +      [change] changed
++       [blue] blue renames A->C, M->N
+++++++* [yellow^] initial has A and M
+From .
  * branch            master     -> FETCH_HEAD
-Updating b9c09d6..9ad36e1
-Fast-forward
- path2 | 0
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 path2
-Everything up-to-date
-ok 41 - push updates up-to-date local refs
+Merging:
+c8555ba yellow removes M
+virtual faabf066da382276f948638d23dbd1d039925d8b
+found 1 common ancestor:
+edb79f6 initial has A and M
+Merge made by the 'recursive' strategy.
+ A | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+HEAD is now at c8555ba yellow removes M
+ok 11 - interference with untracked working tree file
 
 expecting success: 
+	rm -f A M N &&
+	git reset --hard &&
+	git checkout change+rename &&
+	GIT_MERGE_VERBOSITY=3 git merge change >out &&
+	test_i18ngrep "^Skipped B" out &&
+	git reset --hard HEAD^ &&
+	git checkout change &&
+	GIT_MERGE_VERBOSITY=3 git merge change+rename >out &&
+	test_i18ngrep ! "^Skipped B" out
 
-	mk_test testrepo heads/master &&
-	mk_child testrepo child &&
-	(
-		cd child &&
-		git push &&
-		! test -f .git/refs/remotes/origin/master
-	)
-
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5516-fetch-push/testrepo/.git/
-remote: warning: updating the current branch        
-To testrepo
- * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> master
-Cloning into 'child'...
-done.
-Everything up-to-date
-ok 42 - push preserves up-to-date packed refs
+HEAD is now at c8555ba yellow removes M
+Switched to branch 'change+rename'
+Skipped B (merged same as existing)
+HEAD is now at 6ae1959 changed and renamed
+Switched to branch 'change'
+ok 12 - merge of identical changes in a renamed file
 
 expecting success: 
+	git reset --hard &&
+	git checkout --orphan dir-in-way &&
+	git rm -rf . &&
+	git clean -fdqx &&
 
-	mk_test testrepo heads/master &&
-	mk_child testrepo child &&
-	mkdir testrepo/.git/hooks &&
-	echo "#!/no/frobnication/today" >testrepo/.git/hooks/pre-receive &&
-	chmod +x testrepo/.git/hooks/pre-receive &&
-	(
-		cd child &&
-		git pull .. master &&
-		test_must_fail git push &&
-		test $(git rev-parse master) != \
-			$(git rev-parse remotes/origin/master)
-	)
-
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5516-fetch-push/testrepo/.git/
-remote: warning: updating the current branch        
-To testrepo
- * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> master
-Cloning into 'child'...
-done.
-From ..
- * branch            master     -> FETCH_HEAD
-Updating b9c09d6..9ad36e1
-Fast-forward
- path2 | 0
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 path2
-fatal: cannot run hooks/pre-receive: No such file or directory
-To /build/git-2.20.1/t/trash directory.t5516-fetch-push/testrepo
- ! [remote rejected] master -> master (pre-receive hook declined)
-error: failed to push some refs to '/build/git-2.20.1/t/trash directory.t5516-fetch-push/testrepo'
-ok 43 - push does not update local refs on failure
+	mkdir sub &&
+	mkdir dir &&
+	printf "1\n2\n3\n4\n5\n6\n7\n8\n9\n10\n" >sub/file &&
+	echo foo >dir/file-in-the-way &&
+	git add -A &&
+	git commit -m "Common commit" &&
 
-expecting success: 
+	echo 11 >>sub/file &&
+	echo more >>dir/file-in-the-way &&
+	git add -u &&
+	git commit -m "Commit to merge, with dir in the way" &&
 
-	mk_test testrepo heads/master &&
-	rm -f testrepo/.git/objects/??/* &&
-	git push testrepo :refs/heads/master &&
-	(cd testrepo && test_must_fail git rev-parse --verify refs/heads/master)
+	git checkout -b dir-not-in-way &&
+	git reset --soft HEAD^ &&
+	git rm -rf dir &&
+	git commit -m "Commit to merge, with dir removed" -- dir sub/file &&
 
+	git checkout -b renamed-file-has-no-conflicts dir-in-way~1 &&
+	git rm -rf dir &&
+	git rm sub/file &&
+	printf "1\n2\n3\n4\n5555\n6\n7\n8\n9\n10\n" >dir &&
+	git add dir &&
+	git commit -m "Independent change" &&
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5516-fetch-push/testrepo/.git/
-remote: warning: updating the current branch        
-To testrepo
- * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> master
-error: refs/heads/master does not point to a valid object!
-remote: warning: updating the current branch        
-remote: warning: Allowing deletion of corrupt ref.        
-To testrepo
- - [deleted]         master
-fatal: Needed a single revision
-ok 44 - allow deleting an invalid remote ref
+	git checkout -b renamed-file-has-conflicts dir-in-way~1 &&
+	git rm -rf dir &&
+	git mv sub/file dir &&
+	echo 12 >>dir &&
+	git add dir &&
+	git commit -m "Conflicting change"
 
-expecting success: 
-	mk_test_with_hooks testrepo heads/master heads/next &&
-	orgmaster=$(cd testrepo && git show-ref -s --verify refs/heads/master) &&
-	newmaster=$(git show-ref -s --verify refs/heads/master) &&
+HEAD is now at 684433c Merge branch 'change+rename' into change
+Switched to a new branch 'dir-in-way'
+rm 'B'
+rm 'M'
+[dir-in-way (root-commit) 3569ad3] Common commit
+ Author: A U Thor <author@example.com>
+ 2 files changed, 11 insertions(+)
+ create mode 100644 dir/file-in-the-way
+ create mode 100644 sub/file
+[dir-in-way d08efad] Commit to merge, with dir in the way
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+Switched to a new branch 'dir-not-in-way'
+rm 'dir/file-in-the-way'
+[dir-not-in-way 05c80e9] Commit to merge, with dir removed
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+), 1 deletion(-)
+ delete mode 100644 dir/file-in-the-way
+Switched to a new branch 'renamed-file-has-no-conflicts'
+rm 'dir/file-in-the-way'
+rm 'sub/file'
+[renamed-file-has-no-conflicts 6f74978] Independent change
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+), 2 deletions(-)
+ rename sub/file => dir (79%)
+ delete mode 100644 dir/file-in-the-way
+Switched to a new branch 'renamed-file-has-conflicts'
+rm 'dir/file-in-the-way'
+[renamed-file-has-conflicts 163ed37] Conflicting change
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+), 1 deletion(-)
+ rename sub/file => dir (87%)
+ delete mode 100644 dir/file-in-the-way
+ok 13 - setup for rename + d/f conflicts
+
+expecting success: 
+	git reset --hard &&
+	git checkout -q renamed-file-has-no-conflicts^0 &&
+	git merge --strategy=recursive dir-not-in-way &&
+	git diff --quiet &&
+	test -f dir &&
+	test_cmp expected dir
+
+HEAD is now at 163ed37 Conflicting change
+Merging:
+6f74978 Independent change
+virtual dir-not-in-way
+found 1 common ancestor:
+3569ad3 Common commit
+Auto-merging dir
+Merge made by the 'recursive' strategy.
+ dir | 1 +
+ 1 file changed, 1 insertion(+)
+ok 14 - Rename+D/F conflict; renamed file merges + dir not in way
+
+expecting success: 
+	git reset --hard &&
+	rm -rf dir~* &&
+	git checkout -q renamed-file-has-no-conflicts^0 &&
+	test_must_fail git merge --strategy=recursive dir-in-way >output &&
+
+	test_i18ngrep "CONFLICT (modify/delete): dir/file-in-the-way" output &&
+	test_i18ngrep "Auto-merging dir" output &&
+	test_i18ngrep "Adding as dir~HEAD instead" output &&
+
+	test 3 -eq "$(git ls-files -u | wc -l)" &&
+	test 2 -eq "$(git ls-files -u dir/file-in-the-way | wc -l)" &&
+
+	test_must_fail git diff --quiet &&
+	test_must_fail git diff --cached --quiet &&
+
+	test -f dir/file-in-the-way &&
+	test -f dir~HEAD &&
+	test_cmp expected dir~HEAD
+
+HEAD is now at b07fb7c Merge branch 'dir-not-in-way' into HEAD
+CONFLICT (modify/delete): dir/file-in-the-way deleted in HEAD and modified in dir-in-way. Version dir-in-way of dir/file-in-the-way left in tree.
+Auto-merging dir
+Adding as dir~HEAD instead
+ok 15 - Rename+D/F conflict; renamed file merges but dir in way
+
+expecting success: 
+	git reset --hard &&
+	rm -rf dir~* &&
+	git checkout -q dir-in-way^0 &&
+	test_must_fail git merge --strategy=recursive renamed-file-has-no-conflicts >output 2>errors &&
+
+	! grep "error: refusing to lose untracked file at" errors &&
+	test_i18ngrep "CONFLICT (modify/delete): dir/file-in-the-way" output &&
+	test_i18ngrep "Auto-merging dir" output &&
+	test_i18ngrep "Adding as dir~renamed-file-has-no-conflicts instead" output &&
+
+	test 3 -eq "$(git ls-files -u | wc -l)" &&
+	test 2 -eq "$(git ls-files -u dir/file-in-the-way | wc -l)" &&
+
+	test_must_fail git diff --quiet &&
+	test_must_fail git diff --cached --quiet &&
+
+	test -f dir/file-in-the-way &&
+	test -f dir~renamed-file-has-no-conflicts &&
+	test_cmp expected dir~renamed-file-has-no-conflicts
+
+HEAD is now at 6f74978 Independent change
+CONFLICT (modify/delete): dir/file-in-the-way deleted in renamed-file-has-no-conflicts and modified in HEAD. Version HEAD of dir/file-in-the-way left in tree.
+Auto-merging dir
+Adding as dir~renamed-file-has-no-conflicts instead
+ok 16 - Same as previous, but merged other way
+
+expecting success: 
+	git reset --hard &&
+	rm -rf dir~* &&
+	git checkout -q renamed-file-has-conflicts^0 &&
+	test_must_fail git merge --strategy=recursive dir-not-in-way &&
+
+	test 3 -eq "$(git ls-files -u | wc -l)" &&
+	test 3 -eq "$(git ls-files -u dir | wc -l)" &&
+
+	test_must_fail git diff --quiet &&
+	test_must_fail git diff --cached --quiet &&
+
+	test -f dir &&
+	test_cmp expected dir
+
+warning: unable to unlink 'dir': Is a directory
+HEAD is now at d08efad Commit to merge, with dir in the way
+Merging:
+163ed37 Conflicting change
+virtual dir-not-in-way
+found 1 common ancestor:
+3569ad3 Common commit
+Auto-merging dir
+CONFLICT (content): Merge conflict in dir
+Automatic merge failed; fix conflicts and then commit the result.
+ok 17 - Rename+D/F conflict; renamed file cannot merge, dir not in way
+
+expecting success: 
+	modify s/dir-not-in-way/dir-in-way/ expected &&
+
+	git reset --hard &&
+	rm -rf dir~* &&
+	git checkout -q renamed-file-has-conflicts^0 &&
+	test_must_fail git merge --strategy=recursive dir-in-way &&
+
+	test 5 -eq "$(git ls-files -u | wc -l)" &&
+	test 3 -eq "$(git ls-files -u dir | grep -v file-in-the-way | wc -l)" &&
+	test 2 -eq "$(git ls-files -u dir/file-in-the-way | wc -l)" &&
+
+	test_must_fail git diff --quiet &&
+	test_must_fail git diff --cached --quiet &&
+
+	test -f dir/file-in-the-way &&
+	test -f dir~HEAD &&
+	test_cmp expected dir~HEAD
+
+HEAD is now at 163ed37 Conflicting change
+Merging:
+163ed37 Conflicting change
+virtual dir-in-way
+found 1 common ancestor:
+3569ad3 Common commit
+CONFLICT (modify/delete): dir/file-in-the-way deleted in HEAD and modified in dir-in-way. Version dir-in-way of dir/file-in-the-way left in tree.
+Removing dir to make room for subdirectory
+
+Auto-merging dir
+CONFLICT (content): Merge conflict in dir
+Refusing to lose dirty file at dir
+Adding as dir~HEAD instead
+Automatic merge failed; fix conflicts and then commit the result.
+ok 18 - Rename+D/F conflict; renamed file cannot merge and dir in the way
+
+expecting success: 
+	git reset --hard &&
+	rm -rf dir~* &&
+	git checkout -q dir-in-way^0 &&
+	test_must_fail git merge --strategy=recursive renamed-file-has-conflicts &&
+
+	test 5 -eq "$(git ls-files -u | wc -l)" &&
+	test 3 -eq "$(git ls-files -u dir | grep -v file-in-the-way | wc -l)" &&
+	test 2 -eq "$(git ls-files -u dir/file-in-the-way | wc -l)" &&
+
+	test_must_fail git diff --quiet &&
+	test_must_fail git diff --cached --quiet &&
+
+	test -f dir/file-in-the-way &&
+	test -f dir~renamed-file-has-conflicts &&
+	test_cmp expected dir~renamed-file-has-conflicts
+
+HEAD is now at 163ed37 Conflicting change
+Merging:
+d08efad Commit to merge, with dir in the way
+virtual renamed-file-has-conflicts
+found 1 common ancestor:
+3569ad3 Common commit
+CONFLICT (modify/delete): dir/file-in-the-way deleted in renamed-file-has-conflicts and modified in HEAD. Version HEAD of dir/file-in-the-way left in tree.
+Auto-merging dir
+CONFLICT (content): Merge conflict in dir
+Adding as dir~renamed-file-has-conflicts instead
+Automatic merge failed; fix conflicts and then commit the result.
+ok 19 - Same as previous, but merged other way
+
+expecting success: 
+	git reset --hard &&
+	git checkout --orphan rename-dest &&
+	git rm -rf . &&
+	git clean -fdqx &&
+
+	mkdir one &&
+	echo stuff >one/file &&
+	git add -A &&
+	git commit -m "Common commit" &&
+
+	git mv one/file destdir &&
+	git commit -m "Renamed to destdir" &&
+
+	git checkout -b source-conflict HEAD~1 &&
+	git rm -rf one &&
+	mkdir destdir &&
+	touch one destdir/foo &&
+	git add -A &&
+	git commit -m "Conflicts in the way"
+
+warning: unable to unlink 'dir': Is a directory
+HEAD is now at d08efad Commit to merge, with dir in the way
+Switched to a new branch 'rename-dest'
+rm 'dir/file-in-the-way'
+rm 'sub/file'
+[rename-dest (root-commit) b7b91d4] Common commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one/file
+[rename-dest 3312c1c] Renamed to destdir
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename one/file => destdir (100%)
+Switched to a new branch 'source-conflict'
+rm 'one/file'
+[source-conflict 775b154] Conflicts in the way
+ Author: A U Thor <author@example.com>
+ 3 files changed, 1 deletion(-)
+ create mode 100644 destdir/foo
+ create mode 100644 one
+ delete mode 100644 one/file
+ok 20 - setup both rename source and destination involved in D/F conflict
+
+expecting success: 
+	git reset --hard &&
+	rm -rf dir~* &&
+	git checkout -q rename-dest^0 &&
+	test_must_fail git merge --strategy=recursive source-conflict &&
+
+	test 1 -eq "$(git ls-files -u | wc -l)" &&
+
+	test_must_fail git diff --quiet &&
+
+	test -f destdir/foo &&
+	test -f one &&
+	test -f destdir~HEAD &&
+	test "stuff" = "$(cat destdir~HEAD)"
+
+HEAD is now at 775b154 Conflicts in the way
+Merging:
+3312c1c Renamed to destdir
+virtual source-conflict
+found 1 common ancestor:
+b7b91d4 Common commit
+Adding one
+Adding destdir/foo
+Removing destdir to make room for subdirectory
+
+CONFLICT (rename/delete): one/file deleted in source-conflict and renamed to destdir in HEAD. Version HEAD of destdir left in tree at destdir~HEAD.
+Automatic merge failed; fix conflicts and then commit the result.
+ok 21 - both rename source and destination involved in D/F conflict
+
+expecting success: 
+	git reset --hard &&
+	git checkout --orphan rename-two &&
+	git rm -rf . &&
+	git clean -fdqx &&
+
+	mkdir one &&
+	mkdir two &&
+	echo stuff >one/file &&
+	echo other >two/file &&
+	git add -A &&
+	git commit -m "Common commit" &&
+
+	git rm -rf one &&
+	git mv two/file one &&
+	git commit -m "Rename two/file -> one" &&
+
+	git checkout -b rename-one HEAD~1 &&
+	git rm -rf two &&
+	git mv one/file two &&
+	rm -r one &&
+	git commit -m "Rename one/file -> two"
+
+HEAD is now at 3312c1c Renamed to destdir
+Switched to a new branch 'rename-two'
+rm 'destdir'
+[rename-two (root-commit) 14ab955] Common commit
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 one/file
+ create mode 100644 two/file
+rm 'one/file'
+[rename-two 742b467] Rename two/file -> one
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 deletion(-)
+ rename two/file => one (100%)
+ delete mode 100644 one/file
+Switched to a new branch 'rename-one'
+rm 'two/file'
+[rename-one 941ae5d] Rename one/file -> two
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 deletion(-)
+ rename one/file => two (100%)
+ delete mode 100644 two/file
+ok 22 - setup pair rename to parent of other (D/F conflicts)
+
+expecting success: 
+	git checkout -q rename-one^0 &&
+	mkdir one &&
+	test_must_fail git merge --strategy=recursive rename-two &&
+
+	test 2 -eq "$(git ls-files -u | wc -l)" &&
+	test 1 -eq "$(git ls-files -u one | wc -l)" &&
+	test 1 -eq "$(git ls-files -u two | wc -l)" &&
+
+	test_must_fail git diff --quiet &&
+
+	test 4 -eq $(find . | grep -v .git | wc -l) &&
+
+	test -d one &&
+	test -f one~rename-two &&
+	test -f two &&
+	test "other" = $(cat one~rename-two) &&
+	test "stuff" = $(cat two)
+
+Merging:
+941ae5d Rename one/file -> two
+virtual rename-two
+found 1 common ancestor:
+14ab955 Common commit
+CONFLICT (rename/delete): one/file deleted in rename-two and renamed to two in HEAD. Version HEAD of two left in tree.
+CONFLICT (rename/delete): two/file deleted in HEAD and renamed to one in rename-two. Version rename-two of one left in tree at one~rename-two.
+Automatic merge failed; fix conflicts and then commit the result.
+ok 23 - pair rename to parent of other (D/F conflicts) w/ untracked dir
+
+expecting success: 
+	git reset --hard &&
+	git clean -fdqx &&
+	test_must_fail git merge --strategy=recursive rename-two &&
+
+	test 2 -eq "$(git ls-files -u | wc -l)" &&
+	test 1 -eq "$(git ls-files -u one | wc -l)" &&
+	test 1 -eq "$(git ls-files -u two | wc -l)" &&
+
+	test_must_fail git diff --quiet &&
+
+	test 3 -eq $(find . | grep -v .git | wc -l) &&
+
+	test -f one &&
+	test -f two &&
+	test "other" = $(cat one) &&
+	test "stuff" = $(cat two)
+
+warning: unable to unlink 'one': Is a directory
+HEAD is now at 941ae5d Rename one/file -> two
+Merging:
+941ae5d Rename one/file -> two
+virtual rename-two
+found 1 common ancestor:
+14ab955 Common commit
+CONFLICT (rename/delete): one/file deleted in rename-two and renamed to two in HEAD. Version HEAD of two left in tree.
+CONFLICT (rename/delete): two/file deleted in HEAD and renamed to one in rename-two. Version rename-two of one left in tree.
+Automatic merge failed; fix conflicts and then commit the result.
+ok 24 - pair rename to parent of other (D/F conflicts) w/ clean start
+
+expecting success: 
+	git reset --hard &&
+	git checkout --orphan first-rename &&
+	git rm -rf . &&
+	git clean -fdqx &&
+
+	echo stuff >original &&
+	git add -A &&
+	git commit -m "Common commit" &&
+
+	mkdir two &&
+	>two/file &&
+	git add two/file &&
+	git mv original one &&
+	git commit -m "Put two/file in the way, rename to one" &&
+
+	git checkout -b second-rename HEAD~1 &&
+	mkdir one &&
+	>one/file &&
+	git add one/file &&
+	git mv original two &&
+	git commit -m "Put one/file in the way, rename to two"
+
+HEAD is now at 941ae5d Rename one/file -> two
+Switched to a new branch 'first-rename'
+rm 'two'
+[first-rename (root-commit) 9f497b6] Common commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 original
+[first-rename ad1d8f2] Put two/file in the way, rename to one
+ Author: A U Thor <author@example.com>
+ 2 files changed, 0 insertions(+), 0 deletions(-)
+ rename original => one (100%)
+ create mode 100644 two/file
+Switched to a new branch 'second-rename'
+[second-rename 63d2a24] Put one/file in the way, rename to two
+ Author: A U Thor <author@example.com>
+ 2 files changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 one/file
+ rename original => two (100%)
+ok 25 - setup rename of one file to two, with directories in the way
+
+expecting success: 
+	git checkout -q first-rename^0 &&
+	test_must_fail git merge --strategy=recursive second-rename &&
+
+	test 5 -eq "$(git ls-files -s | wc -l)" &&
+	test 3 -eq "$(git ls-files -u | wc -l)" &&
+	test 1 -eq "$(git ls-files -u one | wc -l)" &&
+	test 1 -eq "$(git ls-files -u two | wc -l)" &&
+	test 1 -eq "$(git ls-files -u original | wc -l)" &&
+	test 2 -eq "$(git ls-files -o | wc -l)" &&
+
+	test -f one/file &&
+	test -f two/file &&
+	test -f one~HEAD &&
+	test -f two~second-rename &&
+	! test -f original
+
+Merging:
+ad1d8f2 Put two/file in the way, rename to one
+virtual second-rename
+found 1 common ancestor:
+9f497b6 Common commit
+Adding two/file
+Adding one/file
+Removing one to make room for subdirectory
+
+CONFLICT (rename/rename): Rename "original"->"one" in branch "HEAD" rename "original"->"two" in "second-rename"
+one is a directory in second-rename adding as one~HEAD instead
+two is a directory in HEAD adding as two~second-rename instead
+Automatic merge failed; fix conflicts and then commit the result.
+ok 26 - check handling of differently renamed file with D/F conflicts
+
+expecting success: 
+	git reset --hard &&
+	git checkout --orphan first-rename-redo &&
+	git rm -rf . &&
+	git clean -fdqx &&
+
+	echo stuff >original &&
+	mkdir one two &&
+	touch one/file two/file &&
+	git add -A &&
+	git commit -m "Common commit" &&
+
+	git rm -rf one &&
+	git mv original one &&
+	git commit -m "Rename to one" &&
+
+	git checkout -b second-rename-redo HEAD~1 &&
+	git rm -rf two &&
+	git mv original two &&
+	git commit -m "Rename to two"
+
+warning: unable to unlink 'two': Is a directory
+HEAD is now at ad1d8f2 Put two/file in the way, rename to one
+Switched to a new branch 'first-rename-redo'
+rm 'one'
+rm 'two/file'
+[first-rename-redo (root-commit) 8217ec7] Common commit
+ Author: A U Thor <author@example.com>
+ 3 files changed, 1 insertion(+)
+ create mode 100644 one/file
+ create mode 100644 original
+ create mode 100644 two/file
+rm 'one/file'
+[first-rename-redo acaa2c6] Rename to one
+ Author: A U Thor <author@example.com>
+ 2 files changed, 0 insertions(+), 0 deletions(-)
+ rename original => one (100%)
+ delete mode 100644 one/file
+Switched to a new branch 'second-rename-redo'
+rm 'two/file'
+[second-rename-redo b3450ea] Rename to two
+ Author: A U Thor <author@example.com>
+ 2 files changed, 0 insertions(+), 0 deletions(-)
+ rename original => two (100%)
+ delete mode 100644 two/file
+ok 27 - setup rename one file to two; directories moving out of the way
+
+expecting success: 
+	git checkout -q first-rename-redo^0 &&
+	test_must_fail git merge --strategy=recursive second-rename-redo &&
+
+	test 3 -eq "$(git ls-files -u | wc -l)" &&
+	test 1 -eq "$(git ls-files -u one | wc -l)" &&
+	test 1 -eq "$(git ls-files -u two | wc -l)" &&
+	test 1 -eq "$(git ls-files -u original | wc -l)" &&
+	test 0 -eq "$(git ls-files -o | wc -l)" &&
+
+	test -f one &&
+	test -f two &&
+	! test -f original
+
+Merging:
+acaa2c6 Rename to one
+virtual second-rename-redo
+found 1 common ancestor:
+8217ec7 Common commit
+Removing two/file
+CONFLICT (rename/rename): Rename "original"->"one" in branch "HEAD" rename "original"->"two" in "second-rename-redo"
+Automatic merge failed; fix conflicts and then commit the result.
+ok 28 - check handling of differently renamed file with D/F conflicts
+
+expecting success: 
+	git reset --hard &&
+	git checkout --orphan avoid-unnecessary-update-1 &&
+	git rm -rf . &&
+	git clean -fdqx &&
+
+	printf "1\n2\n3\n4\n5\n6\n7\n8\n9\n10\n" >original &&
+	git add -A &&
+	git commit -m "Common commit" &&
+
+	git mv original rename &&
+	echo 11 >>rename &&
+	git add -u &&
+	git commit -m "Renamed and modified" &&
+
+	git checkout -b merge-branch-1 HEAD~1 &&
+	echo "random content" >random-file &&
+	git add -A &&
+	git commit -m "Random, unrelated changes"
+
+HEAD is now at acaa2c6 Rename to one
+Switched to a new branch 'avoid-unnecessary-update-1'
+rm 'one'
+rm 'two/file'
+[avoid-unnecessary-update-1 (root-commit) 3504be7] Common commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 10 insertions(+)
+ create mode 100644 original
+[avoid-unnecessary-update-1 47ba25d] Renamed and modified
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ rename original => rename (87%)
+Switched to a new branch 'merge-branch-1'
+[merge-branch-1 72de516] Random, unrelated changes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 random-file
+ok 29 - setup avoid unnecessary update, normal rename
+
+expecting success: 
+	git checkout -q avoid-unnecessary-update-1^0 &&
+	test-tool chmtime --get =1000000000 rename >expect &&
+	git merge merge-branch-1 &&
+	test-tool chmtime --get rename >actual &&
+	test_cmp expect actual # "rename" should have stayed intact
+
+Merging:
+47ba25d Renamed and modified
+virtual merge-branch-1
+found 1 common ancestor:
+3504be7 Common commit
+Skipped rename (merged same as existing)
+Merge made by the 'recursive' strategy.
+ random-file | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 random-file
+ok 30 - avoid unnecessary update, normal rename
+
+expecting success: 
+	git reset --hard &&
+	git checkout --orphan avoid-unnecessary-update-2 &&
+	git rm -rf . &&
+	git clean -fdqx &&
+
+	mkdir df &&
+	printf "1\n2\n3\n4\n5\n6\n7\n8\n9\n10\n" >df/file &&
+	git add -A &&
+	git commit -m "Common commit" &&
+
+	git mv df/file temp &&
+	rm -rf df &&
+	git mv temp df &&
+	echo 11 >>df &&
+	git add -u &&
+	git commit -m "Renamed and modified" &&
+
+	git checkout -b merge-branch-2 HEAD~1 &&
+	>unrelated-change &&
+	git add unrelated-change &&
+	git commit -m "Only unrelated changes"
+
+HEAD is now at e882baa Merge branch 'merge-branch-1' into HEAD
+Switched to a new branch 'avoid-unnecessary-update-2'
+rm 'random-file'
+rm 'rename'
+[avoid-unnecessary-update-2 (root-commit) d9d86e3] Common commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 10 insertions(+)
+ create mode 100644 df/file
+[avoid-unnecessary-update-2 bea18c4] Renamed and modified
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ rename df/file => df (87%)
+Switched to a new branch 'merge-branch-2'
+[merge-branch-2 c6e4fbe] Only unrelated changes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 unrelated-change
+ok 31 - setup to test avoiding unnecessary update, with D/F conflict
+
+expecting success: 
+	git checkout -q avoid-unnecessary-update-2^0 &&
+	test-tool chmtime --get =1000000000 df >expect &&
+	git merge merge-branch-2 &&
+	test-tool chmtime --get df >actual &&
+	test_cmp expect actual # "df" should have stayed intact
+
+Merging:
+bea18c4 Renamed and modified
+virtual merge-branch-2
+found 1 common ancestor:
+d9d86e3 Common commit
+Skipped df (merged same as existing)
+Merge made by the 'recursive' strategy.
+ unrelated-change | 0
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 unrelated-change
+ok 32 - avoid unnecessary update, with D/F conflict
+
+expecting success: 
+	git rm -rf . &&
+	git clean -fdqx &&
+	rm -rf .git &&
+	git init &&
+
+	>irrelevant &&
+	mkdir df &&
+	>df/file &&
+	git add -A &&
+	git commit -mA &&
+
+	git checkout -b side &&
+	git rm -rf df &&
+	git commit -mB &&
+
+	git checkout master &&
+	git rm -rf df &&
+	echo bla >df &&
+	git add -A &&
+	git commit -m "Add a newfile"
+
+rm 'df'
+rm 'unrelated-change'
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6022-merge-rename/.git/
+[master (root-commit) c69085d] A
+ Author: A U Thor <author@example.com>
+ 2 files changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 df/file
+ create mode 100644 irrelevant
+Switched to a new branch 'side'
+rm 'df/file'
+[side d17b42a] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ delete mode 100644 df/file
+Switched to branch 'master'
+rm 'df/file'
+[master 064cbd0] Add a newfile
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+)
+ create mode 100644 df
+ delete mode 100644 df/file
+ok 33 - setup avoid unnecessary update, dir->(file,nothing)
+
+expecting success: 
+	git checkout -q master^0 &&
+	test-tool chmtime --get =1000000000 df >expect &&
+	git merge side &&
+	test-tool chmtime --get df >actual &&
+	test_cmp expect actual # "df" should have stayed intact
+
+Merging:
+064cbd0 Add a newfile
+virtual side
+found 1 common ancestor:
+c69085d A
+Adding df
+Merge made by the 'recursive' strategy.
+ok 34 - avoid unnecessary update, dir->(file,nothing)
+
+expecting success: 
+	git rm -rf . &&
+	git clean -fdqx &&
+	rm -rf .git &&
+	git init &&
+
+	>irrelevant &&
+	>file &&
+	git add -A &&
+	git commit -mA &&
+
+	git checkout -b side &&
+	git rm -f file &&
+	git commit -m "Delete file" &&
+
+	git checkout master &&
+	echo bla >file &&
+	git add -A &&
+	git commit -m "Modify file"
+
+rm 'df'
+rm 'irrelevant'
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6022-merge-rename/.git/
+[master (root-commit) 50eae4e] A
+ Author: A U Thor <author@example.com>
+ 2 files changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 file
+ create mode 100644 irrelevant
+Switched to a new branch 'side'
+rm 'file'
+[side 5e50d0a] Delete file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ delete mode 100644 file
+Switched to branch 'master'
+[master 7ffcd81] Modify file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 35 - setup avoid unnecessary update, modify/delete
+
+expecting success: 
+	git checkout -q master^0 &&
+	test-tool chmtime --get =1000000000 file >expect &&
+	test_must_fail git merge side &&
+	test-tool chmtime --get file >actual &&
+	test_cmp expect actual # "file" should have stayed intact
+
+Merging:
+7ffcd81 Modify file
+virtual side
+found 1 common ancestor:
+50eae4e A
+CONFLICT (modify/delete): file deleted in side and modified in HEAD. Version HEAD of file left in tree.
+Automatic merge failed; fix conflicts and then commit the result.
+ok 36 - avoid unnecessary update, modify/delete
+
+expecting success: 
+	git rm -rf . &&
+	git clean -fdqx &&
+	rm -rf .git &&
+	git init &&
+
+	printf "1\n2\n3\n4\n5\n6\n7\n8\n" >file &&
+	git add -A &&
+	git commit -mA &&
+
+	git checkout -b side &&
+	cp file newfile &&
+	git add -A &&
+	git commit -m "Add file copy" &&
+
+	git checkout master &&
+	git mv file newfile &&
+	git commit -m "Rename file"
+
+file: needs merge
+rm 'file'
+rm 'file'
+rm 'irrelevant'
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6022-merge-rename/.git/
+[master (root-commit) 52fef83] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 8 insertions(+)
+ create mode 100644 file
+Switched to a new branch 'side'
+[side ebed6a4] Add file copy
+ Author: A U Thor <author@example.com>
+ 1 file changed, 8 insertions(+)
+ create mode 100644 newfile
+Switched to branch 'master'
+[master 4da1136] Rename file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename file => newfile (100%)
+ok 37 - setup avoid unnecessary update, rename/add-dest
+
+expecting success: 
+	git checkout -q master^0 &&
+	test-tool chmtime --get =1000000000 newfile >expect &&
+	git merge side &&
+	test-tool chmtime --get newfile >actual &&
+	test_cmp expect actual # "file" should have stayed intact
+
+Merging:
+4da1136 Rename file
+virtual side
+found 1 common ancestor:
+52fef83 A
+Merge made by the 'recursive' strategy.
+ok 38 - avoid unnecessary update, rename/add-dest
+
+expecting success: 
+	git reset --hard &&
+	git checkout --orphan rename-plus-small-change &&
+	git rm -rf . &&
+	git clean -fdqx &&
+
+	echo ORIGINAL >file &&
+	git add file &&
+
+	test_tick &&
+	git commit -m Initial &&
+	git checkout -b rename_branch &&
+	git mv file renamed_file &&
+	git commit -m Rename &&
+	git checkout rename-plus-small-change &&
+	echo NEW-VERSION >file &&
+	git commit -a -m Reformat
+
+HEAD is now at 378900c Merge branch 'side' into HEAD
+Switched to a new branch 'rename-plus-small-change'
+rm 'newfile'
+[rename-plus-small-change (root-commit) e44eadc] Initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+Switched to a new branch 'rename_branch'
+[rename_branch f706812] Rename
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename file => renamed_file (100%)
+Switched to branch 'rename-plus-small-change'
+[rename-plus-small-change 068ab66] Reformat
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 39 - setup merge of rename + small change
+
+expecting success: 
+	git merge rename_branch &&
+
+	test 1 -eq $(git ls-files -s | wc -l) &&
+	test 0 -eq $(git ls-files -o | wc -l) &&
+	test $(git rev-parse HEAD:renamed_file) = $(git rev-parse HEAD~1:file)
+
+Merging:
+068ab66 Reformat
+virtual rename_branch
+found 1 common ancestor:
+e44eadc Initial
+Merge made by the 'recursive' strategy.
+ file => renamed_file | 0
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename file => renamed_file (100%)
+ok 40 - merge rename + small change
+
+expecting success: 
+	git rm -rf . &&
+	git clean -fdqx &&
+	rm -rf .git &&
+	git init &&
+
+	printf "1\n2\n3\n4\n5\n6\n7\n8\n" >original_file &&
+	git add original_file &&
+	git commit -mA &&
+
+	git checkout -b rename &&
+	echo 9 >>original_file &&
+	git add original_file &&
+	git mv original_file renamed_file &&
+	git commit -mB &&
+
+	git checkout master &&
+	echo 8.5 >>original_file &&
+	git add original_file &&
+	git commit -mC
+
+rm 'renamed_file'
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6022-merge-rename/.git/
+[master (root-commit) 4847e8a] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 8 insertions(+)
+ create mode 100644 original_file
+Switched to a new branch 'rename'
+[rename e9adddb] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ rename original_file => renamed_file (88%)
+Switched to branch 'master'
+[master 0487bb6] C
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 41 - setup for use of extended merge markers
+
+expecting success: 
+	git checkout rename^0 &&
+	test_must_fail git merge -s recursive master^0 &&
+	test_cmp expected renamed_file
+
+Note: checking out '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 performing another checkout.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -b with the checkout command again. Example:
+
+  git checkout -b <new-branch-name>
+
+HEAD is now at e9adddb B
+Merging:
+e9adddb B
+virtual master^0
+found 1 common ancestor:
+4847e8a A
+Auto-merging renamed_file
+CONFLICT (content): Merge conflict in renamed_file
+Automatic merge failed; fix conflicts and then commit the result.
+ok 42 - merge master into rename has correct extended markers
+
+expecting success: 
+	git reset --hard &&
+	git checkout master^0 &&
+	test_must_fail git merge -s recursive rename^0 &&
+	test_cmp expected renamed_file
+
+HEAD is now at e9adddb B
+Previous HEAD position was e9adddb B
+HEAD is now at 0487bb6 C
+Merging:
+0487bb6 C
+virtual rename^0
+found 1 common ancestor:
+4847e8a A
+Auto-merging renamed_file
+CONFLICT (content): Merge conflict in renamed_file
+Automatic merge failed; fix conflicts and then commit the result.
+ok 43 - merge rename into master has correct extended markers
+
+expecting success: 
+	git rm -rf . &&
+	git clean -fdqx &&
+	rm -rf .git &&
+	git init &&
+
+	> irrelevant_file &&
+	printf "1\n2\n3\n4\n5\n6\n7\n8\n" >original_file &&
+	git add irrelevant_file original_file &&
+	git commit -mA &&
+
+	git checkout -b rename &&
+	git mv original_file renamed_file &&
+	git commit -mB &&
+
+	git checkout master &&
+	git rm original_file &&
+	git commit -mC
+
+renamed_file: needs merge
+rm 'renamed_file'
+rm 'renamed_file'
+rm 'renamed_file'
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6022-merge-rename/.git/
+[master (root-commit) e476651] A
+ Author: A U Thor <author@example.com>
+ 2 files changed, 8 insertions(+)
+ create mode 100644 irrelevant_file
+ create mode 100644 original_file
+Switched to a new branch 'rename'
+[rename 951e2d3] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename original_file => renamed_file (100%)
+Switched to branch 'master'
+rm 'original_file'
+[master 52b2874] C
+ Author: A U Thor <author@example.com>
+ 1 file changed, 8 deletions(-)
+ delete mode 100644 original_file
+ok 44 - setup spurious "refusing to lose untracked" message
+
+expecting success: 
+	git checkout master^0 &&
+	test_must_fail git merge rename^0 2>errors.txt &&
+	! grep "refusing to lose untracked file" errors.txt
+
+Note: checking out 'master^0'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by performing another checkout.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -b with the checkout command again. Example:
+
+  git checkout -b <new-branch-name>
+
+HEAD is now at 52b2874 C
+Merging:
+52b2874 C
+virtual rename^0
+found 1 common ancestor:
+e476651 A
+CONFLICT (rename/delete): original_file deleted in HEAD and renamed to renamed_file in rename^0. Version rename^0 of renamed_file left in tree.
+Automatic merge failed; fix conflicts and then commit the result.
+ok 45 - no spurious "refusing to lose untracked" message
+
+expecting success: 
+	git checkout -f -b empty-base &&
+	>empty1 &&
+	git add empty1 &&
+	git commit -m base &&
+	echo content >empty1 &&
+	git add empty1 &&
+	git commit -m fill &&
+	git checkout -b empty-topic HEAD^ &&
+	git mv empty1 empty2 &&
+	git commit -m rename &&
+	test_must_fail git merge empty-base &&
+	test_must_be_empty empty2
+
+Switched to a new branch 'empty-base'
+[empty-base a940ee2] base
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 empty1
+[empty-base d42ce4d] fill
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Switched to a new branch 'empty-topic'
+[empty-topic ab32619] rename
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename empty1 => empty2 (100%)
+Merging:
+ab32619 rename
+virtual empty-base
+found 1 common ancestor:
+a940ee2 base
+CONFLICT (modify/delete): empty1 deleted in HEAD and modified in empty-base. Version empty-base of empty1 left in tree.
+Automatic merge failed; fix conflicts and then commit the result.
+ok 46 - do not follow renames for empty files
+
+# passed all 46 test(s)
+1..46
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t6131-pathspec-icase.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6131-pathspec-icase/.git/
+checking prerequisite: CASE_INSENSITIVE_FS
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
+	echo good >CamelCase &&
+	echo bad >camelcase &&
+	test "$(cat CamelCase)" != good
+
+)
+prerequisite CASE_INSENSITIVE_FS not satisfied
+expecting success: 
+	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: 
+	echo bar >expect &&
+	git log --format=%s -- "bar" >actual &&
+	test_cmp expect actual
+
+ok 2 - tree_entry_interesting matches bar
+
+expecting success: 
+	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: 
+	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: 
+	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: 
+	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: 
+	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: 
+	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: 
+	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/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t6046-merge-skip-unneeded-updates.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6046-merge-skip-unneeded-updates/.git/
+expecting success: 
+	test_create_repo 1a &&
+	(
+		cd 1a &&
+
+		test_write_lines 1 2 3 4 5 6 7 8 9 10 >b &&
+		git add b &&
+		test_tick &&
+		git commit -m "O" &&
+
+		git branch O &&
+		git branch A &&
+		git branch B &&
+
+		git checkout A &&
+		test_write_lines 1 2 3 4 5 5.5 6 7 8 9 10 10.5 >b &&
+		git add b &&
+		test_tick &&
+		git commit -m "A" &&
+
+		git checkout B &&
+		test_write_lines 1 2 3 4 5 5.5 6 7 8 9 10 >b &&
+		git add b &&
+		test_tick &&
+		git commit -m "B"
+	)
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6046-merge-skip-unneeded-updates/1a/.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(+)
+ok 1 - 1a-setup: Modify(A)/Modify(B), change on B subset of A
+
+expecting success: 
+	test_when_finished "git -C 1a reset --hard" &&
+	test_when_finished "git -C 1a clean -fd" &&
+	(
+		cd 1a &&
+
+		git checkout A^0 &&
+
+		test-tool chmtime =31337 b &&
+		test-tool chmtime -v +0 b >expected-mtime &&
+
+		GIT_MERGE_VERBOSITY=3 git merge -s recursive B^0 >out 2>err &&
+
+		test_i18ngrep "Skipped b" out &&
+		test_must_be_empty err &&
+
+		test-tool chmtime -v +0 b >actual-mtime &&
+		test_cmp expected-mtime actual-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
+	)
+
+Note: checking out '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 performing another checkout.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -b with the checkout command again. Example:
+
+  git checkout -b <new-branch-name>
+
+HEAD is now at 14800cf A
+Skipped b (merged same as existing)
+Removing actual
+Removing actual-mtime
+Removing err
+Removing expect
+Removing expected-mtime
+Removing index_files
+Removing out
+HEAD is now at 890ca43 Merge commit 'B^0' into HEAD
+ok 2 - 1a-check-L: Modify(A)/Modify(B), change on B subset of A
+
+expecting success: 
+	test_when_finished "git -C 1a reset --hard" &&
+	test_when_finished "git -C 1a clean -fd" &&
+	(
+		cd 1a &&
+
+		git checkout B^0 &&
+
+		GIT_MERGE_VERBOSITY=3 git merge -s recursive A^0 >out 2>err &&
+
+		test_i18ngrep "Auto-merging b" out &&
+		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
+	)
+
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  890ca43 Merge commit 'B^0' into HEAD
+
+If you want to keep it by creating a new branch, this may be a good time
+to do so with:
+
+ git branch <new-branch-name> 890ca43
+
+HEAD is now at dfd7e13 B
+Auto-merging b
+Removing actual
+Removing err
+Removing expect
+Removing index_files
+Removing out
+HEAD is now at af76942 Merge commit 'A^0' into HEAD
+ok 3 - 1a-check-R: Modify(A)/Modify(B), change on B subset of A
+
+expecting success: 
+	test_create_repo 2a &&
+	(
+		cd 2a &&
+
+		test_seq 1 10 >b &&
+		git add b &&
+		test_tick &&
+		git commit -m "O" &&
+
+		git branch O &&
+		git branch A &&
+		git branch B &&
+
+		git checkout A &&
+		test_seq 1 11 >b &&
+		git add b &&
+		test_tick &&
+		git commit -m "A" &&
+
+		git checkout B &&
+		git mv b c &&
+		test_tick &&
+		git commit -m "B"
+	)
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6046-merge-skip-unneeded-updates/2a/.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%)
+ok 4 - 2a-setup: Modify(A)/rename(B)
+
+expecting success: 
+	test_when_finished "git -C 2a reset --hard" &&
+	test_when_finished "git -C 2a clean -fd" &&
+	(
+		cd 2a &&
+
+		git checkout A^0 &&
+
+		GIT_MERGE_VERBOSITY=3 git merge -s recursive B^0 >out 2>err &&
+
+		test_i18ngrep ! "Skipped c" out &&
+		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
+	)
+
+Note: checking out '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 performing another checkout.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -b with the checkout command again. Example:
+
+  git checkout -b <new-branch-name>
+
+HEAD is now at c2d59c7 A
+fatal: Path 'b' does not exist in 'HEAD'
+HEAD:b
+Removing actual
+Removing err
+Removing expect
+Removing index_files
+Removing out
+HEAD is now at 95ffd0e Merge commit 'B^0' into HEAD
+ok 5 - 2a-check-L: Modify/rename, merge into modify side
+
+expecting success: 
+	test_when_finished "git -C 2a reset --hard" &&
+	test_when_finished "git -C 2a clean -fd" &&
+	(
+		cd 2a &&
+
+		git checkout B^0 &&
+
+		GIT_MERGE_VERBOSITY=3 git merge -s recursive A^0 >out 2>err &&
+
+		test_i18ngrep ! "Skipped c" out &&
+		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
+	)
+
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  95ffd0e Merge commit 'B^0' into HEAD
+
+If you want to keep it by creating a new branch, this may be a good time
+to do so with:
+
+ git branch <new-branch-name> 95ffd0e
+
+HEAD is now at 6283fcf B
+fatal: Path 'b' does not exist in 'HEAD'
+HEAD:b
+Removing actual
+Removing err
+Removing expect
+Removing index_files
+Removing out
+HEAD is now at 3067c26 Merge commit 'A^0' into HEAD
+ok 6 - 2a-check-R: Modify/rename, merge into rename side
+
+expecting success: 
+	test_create_repo 2b &&
+	(
+		cd 2b &&
+
+		test_write_lines 1 2 3 4 5 6 7 8 9 10 >b &&
+		git add b &&
+		test_tick &&
+		git commit -m "O" &&
+
+		git branch O &&
+		git branch A &&
+		git branch B &&
+
+		git checkout A &&
+		test_write_lines 1 2 3 4 5 5.5 6 7 8 9 10 10.5 >b &&
+		git add b &&
+		git mv b c &&
+		test_tick &&
+		git commit -m "A" &&
+
+		git checkout B &&
+		test_write_lines 1 2 3 4 5 5.5 6 7 8 9 10 >b &&
+		git add b &&
+		test_tick &&
+		git commit -m "B"
+	)
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6046-merge-skip-unneeded-updates/2b/.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(+)
+ok 7 - 2b-setup: Rename+Mod(A)/Mod(B), B mods subset of A
+
+expecting success: 
+	test_when_finished "git -C 2b reset --hard" &&
+	test_when_finished "git -C 2b clean -fd" &&
+	(
+		cd 2b &&
+
+		git checkout A^0 &&
+
+		test-tool chmtime =31337 c &&
+		test-tool chmtime -v +0 c >expected-mtime &&
+
+		GIT_MERGE_VERBOSITY=3 git merge -s recursive B^0 >out 2>err &&
+
+		test_i18ngrep "Skipped c" out &&
+		test_must_be_empty err &&
+
+		test-tool chmtime -v +0 c >actual-mtime &&
+		test_cmp expected-mtime actual-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
+	)
+
+Note: checking out '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 performing another checkout.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -b with the checkout command again. Example:
+
+  git checkout -b <new-branch-name>
+
+HEAD is now at fed518a A
+Skipped c (merged same as existing)
+fatal: Path 'b' does not exist in 'HEAD'
+HEAD:b
+Removing actual
+Removing actual-mtime
+Removing err
+Removing expect
+Removing expected-mtime
+Removing index_files
+Removing out
+HEAD is now at f5d2de5 Merge commit 'B^0' into HEAD
+ok 8 - 2b-check-L: Rename+Mod(A)/Mod(B), B mods subset of A
+
+expecting success: 
+	test_when_finished "git -C 2b reset --hard" &&
+	test_when_finished "git -C 2b clean -fd" &&
+	(
+		cd 2b &&
+
+		git checkout B^0 &&
+
+		GIT_MERGE_VERBOSITY=3 git merge -s recursive A^0 >out 2>err &&
+
+		test_i18ngrep "Auto-merging c" out &&
+		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
+	)
+
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  f5d2de5 Merge commit 'B^0' into HEAD
+
+If you want to keep it by creating a new branch, this may be a good time
+to do so with:
+
+ git branch <new-branch-name> f5d2de5
+
+HEAD is now at dfd7e13 B
+Auto-merging c
+fatal: Path 'b' does not exist in 'HEAD'
+HEAD:b
+Removing actual
+Removing err
+Removing expect
+Removing index_files
+Removing out
+HEAD is now at 85bba06 Merge commit 'A^0' into HEAD
+ok 9 - 2b-check-R: Rename+Mod(A)/Mod(B), B mods subset of A
+
+expecting success: 
+	test_create_repo 2c &&
+	(
+		cd 2c &&
+
+		test_seq 1 10 >b &&
+		git add b &&
+		test_tick &&
+		git commit -m "O" &&
+
+		git branch O &&
+		git branch A &&
+		git branch B &&
+
+		git checkout A &&
+		test_seq 1 11 >b &&
+		echo whatever >c &&
+		git add b c &&
+		test_tick &&
+		git commit -m "A" &&
+
+		git checkout B &&
+		git mv b c &&
+		test_tick &&
+		git commit -m "B"
+	)
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6046-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%)
+ok 10 - 2c-setup: Modify b & add c VS rename b->c
+
+expecting success: 
+	(
+		cd 2c &&
+
+		git checkout A^0 &&
+
+		GIT_MERGE_VERBOSITY=3 &&
+		export GIT_MERGE_VERBOSITY &&
+		test_must_fail git merge -s recursive B^0 >out 2>err &&
+
+		test_i18ngrep "CONFLICT (rename/add): Rename b->c" out &&
+		test_i18ngrep ! "Skipped c" out &&
+		test_must_be_empty err
+
+		# FIXME: rename/add conflicts are horribly broken right now;
+		# when I get back to my patch series fixing it and
+		# rename/rename(2to1) conflicts to bring them in line with
+		# how add/add conflicts behave, then checks like the below
+		# could be added.  But that patch series is waiting until
+		# the rename-directory-detection series lands, which this
+		# is part of.  And in the mean time, I do not want to further
+		# enforce broken behavior.  So for now, the main test is the
+		# one above that err is an empty file.
+
+		#git ls-files -s >index_files &&
+		#test_line_count = 2 index_files &&
+
+		#git rev-parse >actual :2:c :3:c &&
+		#git rev-parse >expect A:b  A:c  &&
+		#test_cmp expect actual &&
+
+		#git cat-file -p A:b >>merged &&
+		#git cat-file -p A:c >>merge-me &&
+		#>empty &&
+		#test_must_fail git merge-file \
+		#	-L "Temporary merge branch 1" \
+		#	-L "" \
+		#	-L "Temporary merge branch 2" \
+		#	merged empty merge-me &&
+		#sed -e "s/^\([<=>]\)/\1\1\1/" merged >merged-internal &&
+
+		#git hash-object c               >actual &&
+		#git hash-object merged-internal >expect &&
+		#test_cmp expect actual &&
+
+		#test_path_is_missing b
+	)
+
+Note: checking out '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 performing another checkout.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -b with the checkout command again. Example:
+
+  git checkout -b <new-branch-name>
+
+HEAD is now at edf631f A
+CONFLICT (rename/add): Rename b->c in B^0. c added in HEAD
+ok 11 - 2c-check: Modify b & add c VS rename b->c
+
+expecting success: 
+	test_create_repo 3a &&
+	(
+		cd 3a &&
+
+		mkdir foo &&
+		test_seq 1 10 >bq &&
+		test_write_lines a b c d e f g h i j k >foo/whatever &&
+		git add bq foo/whatever &&
+		test_tick &&
+		git commit -m "O" &&
+
+		git branch O &&
+		git branch A &&
+		git branch B &&
+
+		git checkout A &&
+		test_seq 1 11 >bq &&
+		git add bq &&
+		git mv bq foo/ &&
+		test_tick &&
+		git commit -m "A" &&
+
+		git checkout B &&
+		git mv foo/ bar/ &&
+		test_tick &&
+		git commit -m "B"
+	)
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6046-merge-skip-unneeded-updates/3a/.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%)
+ok 12 - 3a-setup: bq_1->foo/bq_2 on A, foo/->bar/ on B
+
+expecting success: 
+	test_when_finished "git -C 3a reset --hard" &&
+	test_when_finished "git -C 3a clean -fd" &&
+	(
+		cd 3a &&
+
+		git checkout A^0 &&
+
+		GIT_MERGE_VERBOSITY=3 git merge -s recursive B^0 >out 2>err &&
+
+		test_i18ngrep ! "Skipped bar/bq" out &&
+		test_must_be_empty err &&
+
+		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 foo/bq foo/whatever
+	)
+
+Note: checking out '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 performing another checkout.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -b with the checkout command again. Example:
+
+  git checkout -b <new-branch-name>
+
+HEAD is now at 5576138 A
+fatal: Path 'bq' does not exist in 'HEAD'
+HEAD:bq
+Removing actual
+Removing err
+Removing expect
+Removing index_files
+Removing out
+HEAD is now at 4f639ac Merge commit 'B^0' into HEAD
+ok 13 - 3a-check-L: bq_1->foo/bq_2 on A, foo/->bar/ on B
+
+expecting success: 
+	test_when_finished "git -C 3a reset --hard" &&
+	test_when_finished "git -C 3a clean -fd" &&
+	(
+		cd 3a &&
+
+		git checkout B^0 &&
+
+		GIT_MERGE_VERBOSITY=3 git merge -s recursive A^0 >out 2>err &&
+
+		test_i18ngrep ! "Skipped bar/bq" out &&
+		test_must_be_empty err &&
+
+		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 foo/bq foo/whatever
+	)
+
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  4f639ac Merge commit 'B^0' into HEAD
+
+If you want to keep it by creating a new branch, this may be a good time
+to do so with:
+
+ git branch <new-branch-name> 4f639ac
+
+HEAD is now at 69c0854 B
+fatal: Path 'bq' does not exist in 'HEAD'
+HEAD:bq
+Removing actual
+Removing err
+Removing expect
+Removing index_files
+Removing out
+HEAD is now at b4ee1a9 Merge commit 'A^0' into HEAD
+ok 14 - 3a-check-R: bq_1->foo/bq_2 on A, foo/->bar/ on B
+
+expecting success: 
+	test_create_repo 3b &&
+	(
+		cd 3b &&
+
+		mkdir foo &&
+		test_seq 1 10 >bq &&
+		test_write_lines a b c d e f g h i j k >foo/whatever &&
+		git add bq foo/whatever &&
+		test_tick &&
+		git commit -m "O" &&
+
+		git branch O &&
+		git branch A &&
+		git branch B &&
+
+		git checkout A &&
+		git mv bq foo/ &&
+		test_tick &&
+		git commit -m "A" &&
+
+		git checkout B &&
+		test_seq 1 11 >bq &&
+		git add bq &&
+		git mv foo/ bar/ &&
+		test_tick &&
+		git commit -m "B"
+	)
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6046-merge-skip-unneeded-updates/3b/.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%)
+ok 15 - 3b-setup: bq_1->foo/bq_2 on A, foo/->bar/ on B
+
+expecting success: 
+	test_when_finished "git -C 3b reset --hard" &&
+	test_when_finished "git -C 3b clean -fd" &&
+	(
+		cd 3b &&
+
+		git checkout A^0 &&
+
+		GIT_MERGE_VERBOSITY=3 git merge -s recursive B^0 >out 2>err &&
+
+		test_i18ngrep ! "Skipped bar/bq" out &&
+		test_must_be_empty err &&
+
+		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 foo/bq foo/whatever
+	)
+
+Note: checking out '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 performing another checkout.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -b with the checkout command again. Example:
+
+  git checkout -b <new-branch-name>
+
+HEAD is now at d02b71c A
+fatal: Path 'bq' does not exist in 'HEAD'
+HEAD:bq
+Removing actual
+Removing err
+Removing expect
+Removing index_files
+Removing out
+HEAD is now at a1ae1f4 Merge commit 'B^0' into HEAD
+ok 16 - 3b-check-L: bq_1->foo/bq_2 on A, foo/->bar/ on B
+
+expecting success: 
+	test_when_finished "git -C 3b reset --hard" &&
+	test_when_finished "git -C 3b clean -fd" &&
+	(
+		cd 3b &&
+
+		git checkout B^0 &&
+
+		GIT_MERGE_VERBOSITY=3 git merge -s recursive A^0 >out 2>err &&
+
+		test_i18ngrep ! "Skipped bar/bq" out &&
+		test_must_be_empty err &&
+
+		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 foo/bq foo/whatever
+	)
+
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  a1ae1f4 Merge commit 'B^0' into HEAD
+
+If you want to keep it by creating a new branch, this may be a good time
+to do so with:
+
+ git branch <new-branch-name> a1ae1f4
+
+HEAD is now at 2f47892 B
+fatal: Path 'bq' does not exist in 'HEAD'
+HEAD:bq
+Removing actual
+Removing err
+Removing expect
+Removing index_files
+Removing out
+HEAD is now at cd308e9 Merge commit 'A^0' into HEAD
+ok 17 - 3b-check-R: bq_1->foo/bq_2 on A, foo/->bar/ on B
+
+expecting success: 
+	test_create_repo 4a &&
+	(
+		cd 4a &&
+
+		test_write_lines 1 2 3 4 5 6 7 8 9 10 >b &&
+		git add b &&
+		test_tick &&
+		git commit -m "O" &&
+
+		git branch O &&
+		git branch A &&
+		git branch B &&
+
+		git checkout A &&
+		test_write_lines 1 2 3 4 5 5.5 6 7 8 9 10 10.5 >b &&
+		git add b &&
+		test_tick &&
+		git commit -m "A" &&
+
+		git checkout B &&
+		test_write_lines 1 2 3 4 5 5.5 6 7 8 9 10 >b &&
+		git add b &&
+		test_tick &&
+		git commit -m "B"
+	)
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6046-merge-skip-unneeded-updates/4a/.git/
+[master (root-commit) 105387b] O
+ Author: A U Thor <author@example.com>
+ 1 file changed, 10 insertions(+)
+ create mode 100644 b
+Switched to branch 'A'
+[A 14800cf] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 2 insertions(+)
+Switched to branch 'B'
+[B dfd7e13] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 18 - 4a-setup: Change on A, change on B subset of A, dirty mods present
+
+checking known breakage: 
+	test_when_finished "git -C 4a reset --hard" &&
+	test_when_finished "git -C 4a clean -fd" &&
+	(
+		cd 4a &&
+
+		git checkout A^0 &&
+		echo "File rewritten" >b &&
+
+		test-tool chmtime =31337 b &&
+		test-tool chmtime -v +0 b >expected-mtime &&
+
+		GIT_MERGE_VERBOSITY=3 git merge -s recursive B^0 >out 2>err &&
+
+		test_i18ngrep "Skipped b" out &&
+		test_must_be_empty err &&
+
+		test-tool chmtime -v +0 b >actual-mtime &&
+		test_cmp expected-mtime actual-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
+	)
+
+Note: checking out '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 performing another checkout.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -b with the checkout command again. Example:
+
+  git checkout -b <new-branch-name>
+
+HEAD is now at 14800cf A
+Removing err
+Removing expected-mtime
+Removing out
+HEAD is now at 14800cf A
+not ok 19 - 4a-check: Change on A, change on B subset of A, dirty mods present # TODO known breakage
+
+expecting success: 
+	test_create_repo 4b &&
+	(
+		cd 4b &&
+
+		test_write_lines 1 2 3 4 5 6 7 8 9 10 >b &&
+		git add b &&
+		test_tick &&
+		git commit -m "O" &&
+
+		git branch O &&
+		git branch A &&
+		git branch B &&
+
+		git checkout A &&
+		test_write_lines 1 2 3 4 5 5.5 6 7 8 9 10 10.5 >b &&
+		git add b &&
+		git mv b c &&
+		test_tick &&
+		git commit -m "A" &&
+
+		git checkout B &&
+		test_write_lines 1 2 3 4 5 5.5 6 7 8 9 10 >b &&
+		git add b &&
+		test_tick &&
+		git commit -m "B"
+	)
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6046-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(+)
+ok 20 - 4b-setup: Rename+Mod(A)/Mod(B), change on B subset of A, dirty mods present
+
+expecting success: 
+	test_when_finished "git -C 4b reset --hard" &&
+	test_when_finished "git -C 4b clean -fd" &&
+	(
+		cd 4b &&
+
+		git checkout A^0 &&
+		echo "File rewritten" >c &&
+
+		test-tool chmtime =31337 c &&
+		test-tool chmtime -v +0 c >expected-mtime &&
+
+		GIT_MERGE_VERBOSITY=3 git merge -s recursive B^0 >out 2>err &&
+
+		test_i18ngrep "Skipped c" out &&
+		test_must_be_empty err &&
+
+		test-tool chmtime -v +0 c >actual-mtime &&
+		test_cmp expected-mtime actual-mtime &&
+
+		git ls-files -s >index_files &&
+		test_line_count = 1 index_files &&
+
+		git rev-parse >actual :0:c &&
+		git rev-parse >expect A:c &&
+		test_cmp expect actual &&
+
+		git hash-object c >actual &&
+		echo "File rewritten" | git hash-object --stdin >expect &&
+		test_cmp expect actual &&
+
+		test_must_fail git rev-parse HEAD:b &&
+		test_path_is_missing b
+	)
+
+Note: checking out '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 performing another checkout.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -b with the checkout command again. Example:
+
+  git checkout -b <new-branch-name>
+
+HEAD is now at fed518a A
+Skipped c (merged same as existing)
+fatal: Path 'b' does not exist in 'HEAD'
+HEAD:b
+Removing actual
+Removing actual-mtime
+Removing err
+Removing expect
+Removing expected-mtime
+Removing index_files
+Removing out
+HEAD is now at 44e1efc Merge commit 'B^0' into HEAD
+ok 21 - 4b-check: Rename+Mod(A)/Mod(B), change on B subset of A, dirty mods present
+
+# still have 1 known breakage(s)
+# passed all remaining 20 test(s)
+1..21
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t5516-fetch-push.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5516-fetch-push/.git/
+expecting success: 
+
+	>path1 &&
+	git add path1 &&
+	test_tick &&
+	git commit -a -m repo &&
+	the_first_commit=$(git show-ref -s --verify refs/heads/master) &&
+
+	>path2 &&
+	git add path2 &&
+	test_tick &&
+	git commit -a -m second &&
+	the_commit=$(git show-ref -s --verify refs/heads/master)
+
+
+[master (root-commit) b9c09d6] repo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 path1
+[master 9ad36e1] second
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 path2
+ok 1 - setup
+
+expecting success: 
+	mk_empty testrepo &&
+	(
+		cd testrepo &&
+		git fetch .. refs/heads/master:refs/remotes/origin/master &&
+
+		echo "$the_commit commit	refs/remotes/origin/master" >expect &&
+		git for-each-ref refs/remotes/origin >actual &&
+		test_cmp expect actual
+	)
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5516-fetch-push/testrepo/.git/
+From ..
+ * [new branch]      master     -> origin/master
+ok 2 - fetch without wildcard
+
+expecting success: 
+	mk_empty testrepo &&
+	(
+		cd testrepo &&
+		git config remote.up.url .. &&
+		git config remote.up.fetch "refs/heads/*:refs/remotes/origin/*" &&
+		git fetch up &&
+
+		echo "$the_commit commit	refs/remotes/origin/master" >expect &&
+		git for-each-ref refs/remotes/origin >actual &&
+		test_cmp expect actual
+	)
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5516-fetch-push/testrepo/.git/
+From ..
+ * [new branch]      master     -> origin/master
+ok 3 - fetch with wildcard
+
+expecting success: 
+	mk_empty testrepo &&
+	(
+		TRASH=$(pwd)/ &&
+		cd testrepo &&
+		git config "url.$TRASH.insteadOf" trash/ &&
+		git config remote.up.url trash/. &&
+		git config remote.up.fetch "refs/heads/*:refs/remotes/origin/*" &&
+		git fetch up &&
+
+		echo "$the_commit commit	refs/remotes/origin/master" >expect &&
+		git for-each-ref refs/remotes/origin >actual &&
+		test_cmp expect actual
+	)
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5516-fetch-push/testrepo/.git/
+From /build/git-2.20.1/t/trash directory.t5516-fetch-push/.
+ * [new branch]      master     -> origin/master
+ok 4 - fetch with insteadOf
+
+expecting success: 
+	mk_empty testrepo &&
+	(
+		TRASH=$(pwd)/ &&
+		cd testrepo &&
+		git config "url.trash/.pushInsteadOf" "$TRASH" &&
+		git config remote.up.url "$TRASH." &&
+		git config remote.up.fetch "refs/heads/*:refs/remotes/origin/*" &&
+		git fetch up &&
+
+		echo "$the_commit commit	refs/remotes/origin/master" >expect &&
+		git for-each-ref refs/remotes/origin >actual &&
+		test_cmp expect actual
+	)
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5516-fetch-push/testrepo/.git/
+From /build/git-2.20.1/t/trash directory.t5516-fetch-push/.
+ * [new branch]      master     -> origin/master
+ok 5 - fetch with pushInsteadOf (should not rewrite)
+
+expecting success: 
+	mk_empty testrepo &&
+
+	git push testrepo refs/heads/master:refs/remotes/origin/master &&
+	(
+		cd testrepo &&
+		echo "$the_commit commit	refs/remotes/origin/master" >expect &&
+		git for-each-ref refs/remotes/origin >actual &&
+		test_cmp expect actual
+	)
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5516-fetch-push/testrepo/.git/
+To testrepo
+ * [new branch]      master -> origin/master
+ok 6 - push without wildcard
+
+expecting success: 
+	mk_empty testrepo &&
+
+	git push testrepo "refs/heads/*:refs/remotes/origin/*" &&
+	(
+		cd testrepo &&
+		echo "$the_commit commit	refs/remotes/origin/master" >expect &&
+		git for-each-ref refs/remotes/origin >actual &&
+		test_cmp expect actual
+	)
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5516-fetch-push/testrepo/.git/
+To testrepo
+ * [new branch]      master -> origin/master
+ok 7 - push with wildcard
+
+expecting success: 
+	mk_empty testrepo &&
+	TRASH="$(pwd)/" &&
+	test_config "url.$TRASH.insteadOf" trash/ &&
+	git push trash/testrepo refs/heads/master:refs/remotes/origin/master &&
+	(
+		cd testrepo &&
+		echo "$the_commit commit	refs/remotes/origin/master" >expect &&
+		git for-each-ref refs/remotes/origin >actual &&
+		test_cmp expect actual
+	)
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5516-fetch-push/testrepo/.git/
+To /build/git-2.20.1/t/trash directory.t5516-fetch-push/testrepo
+ * [new branch]      master -> origin/master
+ok 8 - push with insteadOf
+
+expecting success: 
+	mk_empty testrepo &&
+	TRASH="$(pwd)/" &&
+	test_config "url.$TRASH.pushInsteadOf" trash/ &&
+	git push trash/testrepo refs/heads/master:refs/remotes/origin/master &&
+	(
+		cd testrepo &&
+		echo "$the_commit commit	refs/remotes/origin/master" >expect &&
+		git for-each-ref refs/remotes/origin >actual &&
+		test_cmp expect actual
+	)
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5516-fetch-push/testrepo/.git/
+To /build/git-2.20.1/t/trash directory.t5516-fetch-push/testrepo
+ * [new branch]      master -> origin/master
+ok 9 - push with pushInsteadOf
+
+expecting success: 
+	mk_empty testrepo &&
+	test_config "url.trash2/.pushInsteadOf" testrepo/ &&
+	test_config "url.trash3/.pushInsteadOf" trash/wrong &&
+	test_config remote.r.url trash/wrong &&
+	test_config remote.r.pushurl "testrepo/" &&
+	git push r refs/heads/master:refs/remotes/origin/master &&
+	(
+		cd testrepo &&
+		echo "$the_commit commit	refs/remotes/origin/master" >expect &&
+		git for-each-ref refs/remotes/origin >actual &&
+		test_cmp expect actual
+	)
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5516-fetch-push/testrepo/.git/
+To testrepo/
+ * [new branch]      master -> origin/master
+ok 10 - push with pushInsteadOf and explicit pushurl (pushInsteadOf should not rewrite)
+
+expecting success: 
+
+	mk_test testrepo heads/master &&
+	git push testrepo : &&
+	check_push_result testrepo $the_commit heads/master
+
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5516-fetch-push/testrepo/.git/
+remote: warning: updating the current branch        
+To testrepo
+ * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> master
+remote: warning: updating the current branch        
+To testrepo
+   b9c09d6..9ad36e1  master -> master
+ok 11 - push with matching heads
+
+expecting success: 
+
+	mk_test testrepo heads/master &&
+	git push testrepo : &&
+	check_push_result testrepo $the_commit heads/master
+
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5516-fetch-push/testrepo/.git/
+remote: warning: updating the current branch        
+To testrepo
+ * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> master
+remote: warning: updating the current branch        
+To testrepo
+   b9c09d6..9ad36e1  master -> master
+ok 12 - push with matching heads on the command line
+
+expecting success: 
+
+	mk_test testrepo heads/master &&
+	git push testrepo : &&
+	git commit --amend -massaged &&
+	test_must_fail git push testrepo &&
+	check_push_result testrepo $the_commit heads/master &&
+	git reset --hard $the_commit
+
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5516-fetch-push/testrepo/.git/
+remote: warning: updating the current branch        
+To testrepo
+ * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> master
+remote: warning: updating the current branch        
+To testrepo
+   b9c09d6..9ad36e1  master -> master
+[master ead0604] assaged
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:14:13 2005 -0700
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 path2
+fatal: The current branch master has no upstream branch.
+To push the current branch and set the remote as upstream, use
+
+    git push --set-upstream testrepo master
+
+HEAD is now at 9ad36e1 second
+ok 13 - failed (non-fast-forward) push with matching heads
+
+expecting success: 
+
+	mk_test testrepo heads/master &&
+	git push testrepo : &&
+	git commit --amend -massaged &&
+	git push --force testrepo : &&
+	! check_push_result testrepo $the_commit heads/master &&
+	git reset --hard $the_commit
+
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5516-fetch-push/testrepo/.git/
+remote: warning: updating the current branch        
+To testrepo
+ * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> master
+remote: warning: updating the current branch        
+To testrepo
+   b9c09d6..9ad36e1  master -> master
+[master ead0604] assaged
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:14:13 2005 -0700
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 path2
+remote: warning: updating the current branch        
+To testrepo
+ + 9ad36e1...ead0604 master -> master (forced update)
+--- expect	2023-01-05 11:49:13.358868030 +0000
++++ actual	2023-01-05 11:49:13.362868030 +0000
+@@ -1 +1 @@
+-9ad36e1e54b2130a20d55abb4f0f3ca8494ead3f
++ead060494eed34a0810ba15d500e7ac4ecaa2560
+HEAD is now at 9ad36e1 second
+ok 14 - push --force with matching heads
+
+expecting success: 
+
+	mk_test testrepo heads/master &&
+	git push testrepo : &&
+	git commit --amend -massaged &&
+	git push testrepo +: &&
+	! check_push_result testrepo $the_commit heads/master &&
+	git reset --hard $the_commit
+
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5516-fetch-push/testrepo/.git/
+remote: warning: updating the current branch        
+To testrepo
+ * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> master
+remote: warning: updating the current branch        
+To testrepo
+   b9c09d6..9ad36e1  master -> master
+[master ead0604] assaged
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:14:13 2005 -0700
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 path2
+remote: warning: updating the current branch        
+To testrepo
+ + 9ad36e1...ead0604 master -> master (forced update)
+--- expect	2023-01-05 11:49:13.630868030 +0000
++++ actual	2023-01-05 11:49:13.634868030 +0000
+@@ -1 +1 @@
+-9ad36e1e54b2130a20d55abb4f0f3ca8494ead3f
++ead060494eed34a0810ba15d500e7ac4ecaa2560
+HEAD is now at 9ad36e1 second
+ok 15 - push with matching heads and forced update
+
+expecting success: 
+
+	mk_test testrepo heads/master &&
+	git push testrepo master:master &&
+	check_push_result testrepo $the_commit heads/master
+
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5516-fetch-push/testrepo/.git/
+remote: warning: updating the current branch        
+To testrepo
+ * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> master
+remote: warning: updating the current branch        
+To testrepo
+   b9c09d6..9ad36e1  master -> master
+ok 16 - push with no ambiguity (1)
+
+expecting success: 
+
+	mk_test testrepo remotes/origin/master &&
+	git push testrepo master:origin/master &&
+	check_push_result testrepo $the_commit remotes/origin/master
+
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5516-fetch-push/testrepo/.git/
+To testrepo
+ * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> origin/master
+notice: HEAD points to an unborn branch (master)
+To testrepo
+   b9c09d6..9ad36e1  master -> origin/master
+notice: HEAD points to an unborn branch (master)
+ok 17 - push with no ambiguity (2)
+
+expecting success: 
+
+	mk_test testrepo heads/master heads/t/master &&
+	git branch -f t/master master &&
+	git push testrepo master &&
+	check_push_result testrepo $the_commit heads/master &&
+	check_push_result testrepo $the_first_commit heads/t/master
+
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5516-fetch-push/testrepo/.git/
+remote: warning: updating the current branch        
+To testrepo
+ * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> master
+To testrepo
+ * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> t/master
+remote: warning: updating the current branch        
+To testrepo
+   b9c09d6..9ad36e1  master -> master
+ok 18 - push with colon-less refspec, no ambiguity
+
+expecting success: 
+
+	mk_test testrepo heads/master remotes/origin/master &&
+	git push testrepo master:master &&
+	check_push_result testrepo $the_commit heads/master &&
+	check_push_result testrepo $the_first_commit remotes/origin/master
+
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5516-fetch-push/testrepo/.git/
+remote: warning: updating the current branch        
+To testrepo
+ * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> master
+To testrepo
+ * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> origin/master
+remote: warning: updating the current branch        
+To testrepo
+   b9c09d6..9ad36e1  master -> master
+ok 19 - push with weak ambiguity (1)
+
+expecting success: 
+
+	mk_test testrepo heads/master remotes/origin/master remotes/another/master &&
+	git push testrepo master:master &&
+	check_push_result testrepo $the_commit heads/master &&
+	check_push_result testrepo $the_first_commit remotes/origin/master remotes/another/master
+
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5516-fetch-push/testrepo/.git/
+remote: warning: updating the current branch        
+To testrepo
+ * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> master
+To testrepo
+ * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> origin/master
+To testrepo
+ * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> another/master
+remote: warning: updating the current branch        
+To testrepo
+   b9c09d6..9ad36e1  master -> master
+ok 20 - push with weak ambiguity (2)
+
+expecting success: 
+
+	mk_test testrepo heads/frotz tags/frotz &&
+	test_must_fail git push testrepo master:frotz &&
+	check_push_result testrepo $the_first_commit heads/frotz tags/frotz
+
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5516-fetch-push/testrepo/.git/
+To testrepo
+ * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> frotz
+To testrepo
+ * [new tag]         b9c09d6cc74d3857142fb7c082dca65b88254c6d -> frotz
+notice: HEAD points to an unborn branch (master)
+error: dst refspec frotz matches more than one.
+error: failed to push some refs to 'testrepo'
+notice: HEAD points to an unborn branch (master)
+ok 21 - push with ambiguity
+
+expecting success: 
+
+	mk_test testrepo heads/frotz tags/frotz &&
+	git branch -f frotz master &&
+	git push testrepo frotz &&
+	check_push_result testrepo $the_commit heads/frotz &&
+	check_push_result testrepo $the_first_commit tags/frotz
+
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5516-fetch-push/testrepo/.git/
+To testrepo
+ * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> frotz
+To testrepo
+ * [new tag]         b9c09d6cc74d3857142fb7c082dca65b88254c6d -> frotz
+notice: HEAD points to an unborn branch (master)
+To testrepo
+   b9c09d6..9ad36e1  frotz -> frotz
+notice: HEAD points to an unborn branch (master)
+notice: HEAD points to an unborn branch (master)
+ok 22 - push with colon-less refspec (1)
+
+expecting success: 
+
+	mk_test testrepo heads/frotz tags/frotz &&
+	if git show-ref --verify -q refs/heads/frotz
+	then
+		git branch -D frotz
+	fi &&
+	git tag -f frotz &&
+	git push -f testrepo frotz &&
+	check_push_result testrepo $the_commit tags/frotz &&
+	check_push_result testrepo $the_first_commit heads/frotz
+
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5516-fetch-push/testrepo/.git/
+To testrepo
+ * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> frotz
+To testrepo
+ * [new tag]         b9c09d6cc74d3857142fb7c082dca65b88254c6d -> frotz
+notice: HEAD points to an unborn branch (master)
+Deleted branch frotz (was 9ad36e1).
+To testrepo
+ + b9c09d6...9ad36e1 frotz -> frotz (forced update)
+notice: HEAD points to an unborn branch (master)
+notice: HEAD points to an unborn branch (master)
+ok 23 - push with colon-less refspec (2)
+
+expecting success: 
+
+	mk_test testrepo &&
+	if git show-ref --verify -q refs/tags/frotz
+	then
+		git tag -d frotz
+	fi &&
+	git branch -f frotz master &&
+	git push testrepo frotz &&
+	check_push_result testrepo $the_commit heads/frotz &&
+	test 1 = $( cd testrepo && git show-ref | wc -l )
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5516-fetch-push/testrepo/.git/
+notice: HEAD points to an unborn branch (master)
+notice: No default references
+Deleted tag 'frotz' (was 9ad36e1)
+To testrepo
+ * [new branch]      frotz -> frotz
+notice: HEAD points to an unborn branch (master)
+ok 24 - push with colon-less refspec (3)
+
+expecting success: 
+
+	mk_test testrepo &&
+	if git show-ref --verify -q refs/heads/frotz
+	then
+		git branch -D frotz
+	fi &&
+	git tag -f frotz &&
+	git push testrepo frotz &&
+	check_push_result testrepo $the_commit tags/frotz &&
+	test 1 = $( cd testrepo && git show-ref | wc -l )
+
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5516-fetch-push/testrepo/.git/
+notice: HEAD points to an unborn branch (master)
+notice: No default references
+Deleted branch frotz (was 9ad36e1).
+To testrepo
+ * [new tag]         frotz -> frotz
+notice: HEAD points to an unborn branch (master)
+ok 25 - push with colon-less refspec (4)
+
+expecting success: 
+
+	mk_test testrepo &&
+	git push testrepo master:branch &&
+	check_push_result testrepo $the_commit heads/branch
+
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5516-fetch-push/testrepo/.git/
+notice: HEAD points to an unborn branch (master)
+notice: No default references
+To testrepo
+ * [new branch]      master -> branch
+notice: HEAD points to an unborn branch (master)
+ok 26 - push head with non-existent, incomplete dest
+
+expecting success: 
+
+	mk_test testrepo &&
+	git tag -f v1.0 &&
+	git push testrepo v1.0:tag &&
+	check_push_result testrepo $the_commit tags/tag
+
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5516-fetch-push/testrepo/.git/
+notice: HEAD points to an unborn branch (master)
+notice: No default references
+To testrepo
+ * [new tag]         v1.0 -> tag
+notice: HEAD points to an unborn branch (master)
+ok 27 - push tag with non-existent, incomplete dest
+
+expecting success: 
+
+	mk_test testrepo &&
+	test_must_fail git push testrepo $(git rev-parse master):foo
+
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5516-fetch-push/testrepo/.git/
+notice: HEAD points to an unborn branch (master)
+notice: No default references
+error: unable to push to unqualified destination: foo
+The destination refspec neither matches an existing ref on the remote nor
+begins with refs/, and we are unable to guess a prefix based on the source ref.
+error: failed to push some refs to 'testrepo'
+ok 28 - push sha1 with non-existent, incomplete dest
+
+expecting success: 
+
+	mk_test testrepo &&
+	test_must_fail git push testrepo master^:branch
+
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5516-fetch-push/testrepo/.git/
+notice: HEAD points to an unborn branch (master)
+notice: No default references
+error: unable to push to unqualified destination: branch
+The destination refspec neither matches an existing ref on the remote nor
+begins with refs/, and we are unable to guess a prefix based on the source ref.
+error: failed to push some refs to 'testrepo'
+ok 29 - push ref expression with non-existent, incomplete dest
+
+expecting success: 
+
+	mk_test testrepo heads/master &&
+	git checkout master &&
+	git push testrepo HEAD &&
+	check_push_result testrepo $the_commit heads/master
+
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5516-fetch-push/testrepo/.git/
+remote: warning: updating the current branch        
+To testrepo
+ * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> master
+Already on 'master'
+remote: warning: updating the current branch        
+To testrepo
+   b9c09d6..9ad36e1  HEAD -> master
+ok 30 - push with HEAD
+
+expecting success: 
+
+	mk_test testrepo heads/master &&
+	git checkout -b local master &&
+	git push testrepo HEAD &&
+	check_push_result testrepo $the_commit heads/local
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5516-fetch-push/testrepo/.git/
+remote: warning: updating the current branch        
+To testrepo
+ * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> master
+Switched to a new branch 'local'
+To testrepo
+ * [new branch]      HEAD -> local
+ok 31 - push with HEAD nonexisting at remote
+
+expecting success: 
+
+	mk_test testrepo heads/master &&
+	git checkout master &&
+	git branch -D local &&
+	git checkout -b local &&
+	git push testrepo master local &&
+	check_push_result testrepo $the_commit heads/master &&
+	check_push_result testrepo $the_commit heads/local &&
+
+	# Without force rewinding should fail
+	git reset --hard HEAD^ &&
+	test_must_fail git push testrepo HEAD &&
+	check_push_result testrepo $the_commit heads/local &&
+
+	# With force rewinding should succeed
+	git push testrepo +HEAD &&
+	check_push_result testrepo $the_first_commit heads/local
+
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5516-fetch-push/testrepo/.git/
+remote: warning: updating the current branch        
+To testrepo
+ * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> master
+Switched to branch 'master'
+Deleted branch local (was 9ad36e1).
+Switched to a new branch 'local'
+remote: warning: updating the current branch        
+To testrepo
+   b9c09d6..9ad36e1  master -> master
+ * [new branch]      local -> local
+HEAD is now at b9c09d6 repo
+To testrepo
+ ! [rejected]        HEAD -> local (non-fast-forward)
+error: failed to push some refs to 'testrepo'
+hint: Updates were rejected because the tip of your current branch is behind
+hint: its remote counterpart. Integrate the remote changes (e.g.
+hint: 'git pull ...') before pushing again.
+hint: See the 'Note about fast-forwards' in 'git push --help' for details.
+To testrepo
+ + 9ad36e1...b9c09d6 HEAD -> local (forced update)
+ok 32 - push with +HEAD
+
+expecting success: 
+
+	mk_test testrepo &&
+	git checkout master &&
+	git push testrepo HEAD:branch &&
+	check_push_result testrepo $the_commit heads/branch
+
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5516-fetch-push/testrepo/.git/
+notice: HEAD points to an unborn branch (master)
+notice: No default references
+Switched to branch 'master'
+To testrepo
+ * [new branch]      HEAD -> branch
+notice: HEAD points to an unborn branch (master)
+ok 33 - push HEAD with non-existent, incomplete dest
+
+expecting success: 
+
+	mk_test testrepo heads/local &&
+	git checkout master &&
+	git branch -f local $the_commit &&
+	(
+		cd testrepo &&
+		git checkout local &&
+		git reset --hard $the_first_commit
+	) &&
+	test_config remote.there.url testrepo &&
+	test_config remote.there.push HEAD &&
+	test_config branch.master.remote there &&
+	git push &&
+	check_push_result testrepo $the_commit heads/master &&
+	check_push_result testrepo $the_first_commit heads/local
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5516-fetch-push/testrepo/.git/
+To testrepo
+ * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> local
+notice: HEAD points to an unborn branch (master)
+Already on 'master'
+Switched to branch 'local'
+HEAD is now at b9c09d6 repo
+To testrepo
+ * [new branch]      HEAD -> master
+ok 34 - push with config remote.*.push = HEAD
+
+expecting success: 
+	mk_test up_repo heads/master &&
+	mk_test down_repo heads/master &&
+	test_config remote.up.url up_repo &&
+	test_config remote.down.url down_repo &&
+	test_config branch.master.remote up &&
+	test_config remote.pushdefault down &&
+	test_config push.default matching &&
+	git push &&
+	check_push_result up_repo $the_first_commit heads/master &&
+	check_push_result down_repo $the_commit heads/master
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5516-fetch-push/up_repo/.git/
+remote: warning: updating the current branch        
+To up_repo
+ * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> master
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5516-fetch-push/down_repo/.git/
+remote: warning: updating the current branch        
+To down_repo
+ * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> master
+remote: warning: updating the current branch        
+To down_repo
+   b9c09d6..9ad36e1  master -> master
+ok 35 - push with remote.pushdefault
+
+expecting success: 
+
+	mk_test testrepo heads/master &&
+	git checkout master &&
+	test_config remote.there.url test2repo &&
+	test_config remote.there.pushurl testrepo &&
+	git push there : &&
+	check_push_result testrepo $the_commit heads/master
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5516-fetch-push/testrepo/.git/
+remote: warning: updating the current branch        
+To testrepo
+ * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> master
+Already on 'master'
+remote: warning: updating the current branch        
+To testrepo
+   b9c09d6..9ad36e1  master -> master
+ok 36 - push with config remote.*.pushurl
+
+expecting success: 
+	mk_test up_repo heads/master &&
+	mk_test side_repo heads/master &&
+	mk_test down_repo heads/master &&
+	test_config remote.up.url up_repo &&
+	test_config remote.pushdefault side_repo &&
+	test_config remote.down.url down_repo &&
+	test_config branch.master.remote up &&
+	test_config branch.master.pushremote down &&
+	test_config push.default matching &&
+	git push &&
+	check_push_result up_repo $the_first_commit heads/master &&
+	check_push_result side_repo $the_first_commit heads/master &&
+	check_push_result down_repo $the_commit heads/master
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5516-fetch-push/up_repo/.git/
+remote: warning: updating the current branch        
+To up_repo
+ * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> master
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5516-fetch-push/side_repo/.git/
+remote: warning: updating the current branch        
+To side_repo
+ * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> master
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5516-fetch-push/down_repo/.git/
+remote: warning: updating the current branch        
+To down_repo
+ * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> master
+remote: warning: updating the current branch        
+To down_repo
+   b9c09d6..9ad36e1  master -> master
+ok 37 - push with config branch.*.pushremote
+
+expecting success: 
+	mk_test one_repo heads/master &&
+	mk_test two_repo heads/master &&
+	test_config remote.one.url one_repo &&
+	test_config remote.two.url two_repo &&
+	test_config branch.master.pushremote two_repo &&
+	test_config remote.pushdefault one_repo &&
+	test_config push.default matching &&
+	git push &&
+	check_push_result one_repo $the_first_commit heads/master &&
+	check_push_result two_repo $the_commit heads/master
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5516-fetch-push/one_repo/.git/
+remote: warning: updating the current branch        
+To one_repo
+ * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> master
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5516-fetch-push/two_repo/.git/
+remote: warning: updating the current branch        
+To two_repo
+ * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> master
+remote: warning: updating the current branch        
+To two_repo
+   b9c09d6..9ad36e1  master -> master
+ok 38 - branch.*.pushremote config order is irrelevant
+
+expecting success: 
+
+	mk_test testrepo heads/master &&
+	old_commit=$(git -C testrepo show-ref -s --verify refs/heads/master) &&
+	git push --dry-run testrepo : &&
+	check_push_result testrepo $old_commit heads/master
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5516-fetch-push/testrepo/.git/
+remote: warning: updating the current branch        
+To testrepo
+ * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> master
+To testrepo
+   b9c09d6..9ad36e1  master -> master
+ok 39 - push with dry-run
+
+expecting success: 
+
+	mk_test testrepo heads/master &&
+	mk_child testrepo child &&
+	(
+		cd child &&
+		git pull .. master &&
+		git push &&
+		test $(git rev-parse master) = \
+			$(git rev-parse remotes/origin/master)
+	)
+
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5516-fetch-push/testrepo/.git/
+remote: warning: updating the current branch        
+To testrepo
+ * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> master
+Cloning into 'child'...
+done.
+From ..
+ * branch            master     -> FETCH_HEAD
+Updating b9c09d6..9ad36e1
+Fast-forward
+ path2 | 0
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 path2
+remote: warning: updating the current branch        
+To /build/git-2.20.1/t/trash directory.t5516-fetch-push/testrepo
+   b9c09d6..9ad36e1  master -> master
+ok 40 - push updates local refs
+
+expecting success: 
+
+	mk_test testrepo heads/master &&
+	mk_child testrepo child1 &&
+	mk_child testrepo child2 &&
+	(cd child1 && git pull .. master && git push) &&
+	(
+		cd child2 &&
+		git pull ../child1 master &&
+		git push &&
+		test $(git rev-parse master) = \
+			$(git rev-parse remotes/origin/master)
+	)
+
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5516-fetch-push/testrepo/.git/
+remote: warning: updating the current branch        
+To testrepo
+ * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> master
+Cloning into 'child1'...
+done.
+Cloning into 'child2'...
+done.
+From ..
+ * branch            master     -> FETCH_HEAD
+Updating b9c09d6..9ad36e1
+Fast-forward
+ path2 | 0
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 path2
+remote: warning: updating the current branch        
+To /build/git-2.20.1/t/trash directory.t5516-fetch-push/testrepo
+   b9c09d6..9ad36e1  master -> master
+From ../child1
+ * branch            master     -> FETCH_HEAD
+Updating b9c09d6..9ad36e1
+Fast-forward
+ path2 | 0
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 path2
+Everything up-to-date
+ok 41 - push updates up-to-date local refs
+
+expecting success: 
+
+	mk_test testrepo heads/master &&
+	mk_child testrepo child &&
+	(
+		cd child &&
+		git push &&
+		! test -f .git/refs/remotes/origin/master
+	)
+
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5516-fetch-push/testrepo/.git/
+remote: warning: updating the current branch        
+To testrepo
+ * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> master
+Cloning into 'child'...
+done.
+Everything up-to-date
+ok 42 - push preserves up-to-date packed refs
+
+expecting success: 
+
+	mk_test testrepo heads/master &&
+	mk_child testrepo child &&
+	mkdir testrepo/.git/hooks &&
+	echo "#!/no/frobnication/today" >testrepo/.git/hooks/pre-receive &&
+	chmod +x testrepo/.git/hooks/pre-receive &&
+	(
+		cd child &&
+		git pull .. master &&
+		test_must_fail git push &&
+		test $(git rev-parse master) != \
+			$(git rev-parse remotes/origin/master)
+	)
+
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5516-fetch-push/testrepo/.git/
+remote: warning: updating the current branch        
+To testrepo
+ * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> master
+Cloning into 'child'...
+done.
+From ..
+ * branch            master     -> FETCH_HEAD
+Updating b9c09d6..9ad36e1
+Fast-forward
+ path2 | 0
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 path2
+fatal: cannot run hooks/pre-receive: No such file or directory
+To /build/git-2.20.1/t/trash directory.t5516-fetch-push/testrepo
+ ! [remote rejected] master -> master (pre-receive hook declined)
+error: failed to push some refs to '/build/git-2.20.1/t/trash directory.t5516-fetch-push/testrepo'
+ok 43 - push does not update local refs on failure
+
+expecting success: 
+
+	mk_test testrepo heads/master &&
+	rm -f testrepo/.git/objects/??/* &&
+	git push testrepo :refs/heads/master &&
+	(cd testrepo && test_must_fail git rev-parse --verify refs/heads/master)
+
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5516-fetch-push/testrepo/.git/
+remote: warning: updating the current branch        
+To testrepo
+ * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> master
+error: refs/heads/master does not point to a valid object!
+remote: warning: updating the current branch        
+remote: warning: Allowing deletion of corrupt ref.        
+To testrepo
+ - [deleted]         master
+fatal: Needed a single revision
+ok 44 - allow deleting an invalid remote ref
+
+expecting success: 
+	mk_test_with_hooks testrepo heads/master heads/next &&
+	orgmaster=$(cd testrepo && git show-ref -s --verify refs/heads/master) &&
+	newmaster=$(git show-ref -s --verify refs/heads/master) &&
 	orgnext=$(cd testrepo && git show-ref -s --verify refs/heads/next) &&
 	newnext=$ZERO_OID &&
 	git push testrepo refs/heads/master:refs/heads/master :refs/heads/next &&
@@ -229686,211 +233411,6 @@
 1..93
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t6130-pathspec-noglob.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6130-pathspec-noglob/.git/
-expecting success: 
-	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: 
-	echo vanilla >expect &&
-	git log --format=%s -- foo >actual &&
-	test_cmp expect actual
-
-ok 2 - vanilla pathspec matches literally
-
-expecting success: 
-	cat >expect <<-\EOF &&
-	bracket
-	star
-	vanilla
-	EOF
-	git log --format=%s -- "f*" >actual &&
-	test_cmp expect actual
-
-ok 3 - star pathspec globs
-
-expecting success: 
-	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: 
-	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: 
-	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: 
-	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: 
-	echo vanilla >expect &&
-	git log --format=%s -- ":(literal)foo" >actual &&
-	test_cmp expect actual
-
-ok 8 - no-glob option matches literally (vanilla)
-
-expecting success: 
-	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: 
-	echo star >expect &&
-	git log --format=%s -- ":(literal)f*" >actual &&
-	test_cmp expect actual
-
-ok 10 - no-glob option matches literally (star)
-
-expecting success: 
-	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: 
-	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: 
-	git --literal-pathspecs log --format=%s -- ":(literal)foo" >actual &&
-	test_must_be_empty actual
-
-ok 13 - no-glob option disables :(literal)
-
-expecting success: 
-	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: 
-	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: 
-	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: 
-	cat >expect <<-\EOF &&
-	xxx
-	unrelated
-	EOF
-	git log --format=%s -- ":(glob)**/bar" >actual &&
-	test_cmp expect actual
-
-ok 17 - **/ works with :(glob)
-
-expecting success: 
-	git --noglob-pathspecs log --format=%s -- "**/bar" >actual &&
-	test_must_be_empty actual
-
-ok 18 - **/ does not work with --noglob-pathspecs
-
-expecting success: 
-	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: 
-	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: 
-	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/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
 *** t6042-merge-rename-corner-cases.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6042-merge-rename-corner-cases/.git/
 expecting success: 
@@ -229979,16 +233499,16 @@
 	)
 
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6042-merge-rename-corner-cases/rename-modify-add-source/.git/
-[master (root-commit) 52cf488] A
+[master (root-commit) 8e0d630] A
  Author: A U Thor <author@example.com>
  1 file changed, 7 insertions(+)
  create mode 100644 a
 Switched to a new branch 'B'
-[B be6ded7] B
+[B 9507508] B
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 Switched to a new branch 'C'
-[C a08e237] C
+[C 52f396b] C
  Author: A U Thor <author@example.com>
  2 files changed, 8 insertions(+), 7 deletions(-)
  create mode 100644 b
@@ -230020,12 +233540,12 @@
 
   git checkout -b <new-branch-name>
 
-HEAD is now at be6ded7 B
+HEAD is now at 9507508 B
 Merging:
-be6ded7 B
+9507508 B
 virtual C^0
 found 1 common ancestor:
-52cf488 A
+8e0d630 A
 Auto-merging a
 CONFLICT (content): Merge conflict in a
 Automatic merge failed; fix conflicts and then commit the result.
@@ -230055,18 +233575,18 @@
 	)
 
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6042-merge-rename-corner-cases/break-detection-1/.git/
-[master (root-commit) 06e9957] A
+[master (root-commit) 3a4f724] A
  Author: A U Thor <author@example.com>
  2 files changed, 6 insertions(+)
  create mode 100644 a
  create mode 100644 b
 Switched to a new branch 'B'
-[B deb3b82] B
+[B b2c8c42] B
  Author: A U Thor <author@example.com>
  2 files changed, 6 insertions(+), 5 deletions(-)
  create mode 100644 c
 Switched to a new branch 'C'
-[C e473a7e] C
+[C 00d613e] C
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 ok 5 - setup resolvable conflict missed if rename missed
@@ -230094,10 +233614,10 @@
 	)
 
 Merging:
-e473a7e C
+00d613e C
 virtual B^0
 found 1 common ancestor:
-06e9957 A
+3a4f724 A
 Auto-merging a
 CONFLICT (content): Merge conflict in a
 Automatic merge failed; fix conflicts and then commit the result.
@@ -230130,19 +233650,19 @@
 	)
 
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6042-merge-rename-corner-cases/break-detection-2/.git/
-[master (root-commit) 652d87f] A
+[master (root-commit) 785506c] A
  Author: A U Thor <author@example.com>
  2 files changed, 6 insertions(+)
  create mode 100644 a
  create mode 100644 b
 Switched to a new branch 'D'
-[D ea311e3] D
+[D 98e3a5d] D
  Author: A U Thor <author@example.com>
  2 files changed, 7 insertions(+), 5 deletions(-)
  create mode 100644 c
 Switched to a new branch 'E'
 rm 'a'
-[E 5866402] E
+[E 372bd86] E
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 5 deletions(-)
 ok 7 - setup conflict resolved wrong if rename missed
@@ -230156,10 +233676,10 @@
 	)
 
 Merging:
-5866402 E
+372bd86 E
 virtual D^0
 found 1 common ancestor:
-652d87f A
+785506c A
 Merge made by the 'recursive' strategy.
  c | 6 ++++++
  1 file changed, 6 insertions(+)
@@ -230189,17 +233709,17 @@
 	)
 
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6042-merge-rename-corner-cases/break-detection-3/.git/
-[master (root-commit) ad82390] A
+[master (root-commit) 37aaafc] A
  Author: A U Thor <author@example.com>
  1 file changed, 5 insertions(+)
  create mode 100644 a
 Switched to a new branch 'B'
-[B 1e47f0c] B
+[B a75d702] B
  Author: A U Thor <author@example.com>
  1 file changed, 0 insertions(+), 0 deletions(-)
  rename a => b (100%)
 Switched to a new branch 'C'
-[C 4259aa8] C
+[C 8376be4] C
  Author: A U Thor <author@example.com>
  2 files changed, 6 insertions(+), 5 deletions(-)
  create mode 100644 b
@@ -230241,12 +233761,12 @@
 
   git checkout -b <new-branch-name>
 
-HEAD is now at 1e47f0c B
+HEAD is now at a75d702 B
 Merging:
-1e47f0c B
+a75d702 B
 virtual C^0
 found 1 common ancestor:
-ad82390 A
+37aaafc A
 Merge made by the 'recursive' strategy.
 test_line_count: line count for out != 2
 100644 8a1218a1024a212bb3db30becd860315f9f3ac52 0	b
@@ -230280,19 +233800,19 @@
 Warning: you are leaving 1 commit behind, not connected to
 any of your branches:
 
-  1222ad1 Merge commit 'C^0' into HEAD
+  66a2a18 Merge commit 'C^0' into HEAD
 
 If you want to keep it by creating a new branch, this may be a good time
 to do so with:
 
- git branch <new-branch-name> 1222ad1
+ git branch <new-branch-name> 66a2a18
 
-HEAD is now at 4259aa8 C
+HEAD is now at 8376be4 C
 Merging:
-4259aa8 C
+8376be4 C
 virtual B^0
 found 1 common ancestor:
-ad82390 A
+37aaafc A
 Merge made by the 'recursive' strategy.
  a | 1 -
  1 file changed, 1 deletion(-)
@@ -230583,18 +234103,18 @@
 	)
 
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6042-merge-rename-corner-cases/rename-rename-2to1/.git/
-[master (root-commit) 3e17559] A
+[master (root-commit) 0d5daa1] A
  Author: A U Thor <author@example.com>
  2 files changed, 10 insertions(+)
  create mode 100644 a
  create mode 100644 b
 Switched to a new branch 'B'
-[B ead0b7d] B
+[B b83f6f1] B
  Author: A U Thor <author@example.com>
  2 files changed, 1 insertion(+)
  rename a => c (100%)
 Switched to a new branch 'C'
-[C 92c655b] C
+[C 55a27df] C
  Author: A U Thor <author@example.com>
  2 files changed, 1 insertion(+)
  rename b => c (100%)
@@ -230641,7 +234161,7 @@
 
   git checkout -b <new-branch-name>
 
-HEAD is now at ead0b7d B
+HEAD is now at b83f6f1 B
 CONFLICT (rename/rename): Rename a->c in HEAD. Rename b->c in C^0
 ok 18 - handle rename/rename (2to1) conflict correctly
 
@@ -230753,17 +234273,17 @@
 	)
 
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6042-merge-rename-corner-cases/rename-rename-1to2-add-source-1/.git/
-[master (root-commit) be8dd4e] A
+[master (root-commit) 1ac33e1] A
  Author: A U Thor <author@example.com>
  1 file changed, 7 insertions(+)
  create mode 100644 a
 Switched to a new branch 'B'
-[B 373bf36] B
+[B de37cb7] B
  Author: A U Thor <author@example.com>
  1 file changed, 0 insertions(+), 0 deletions(-)
  rename a => b (100%)
 Switched to a new branch 'C'
-[C 37a39fb] C
+[C 307eb5c] C
  Author: A U Thor <author@example.com>
  2 files changed, 8 insertions(+), 7 deletions(-)
  create mode 100644 c
@@ -230804,12 +234324,12 @@
 
   git checkout -b <new-branch-name>
 
-HEAD is now at 373bf36 B
+HEAD is now at de37cb7 B
 Merging:
-373bf36 B
+de37cb7 B
 virtual C^0
 found 1 common ancestor:
-be8dd4e A
+1ac33e1 A
 Merge made by the 'recursive' strategy.
  b | 8 +-------
  c | 7 +++++++
@@ -231021,19 +234541,19 @@
 	)
 
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6042-merge-rename-corner-cases/rad/.git/
-[master (root-commit) 877b165] original
+[master (root-commit) 1f846fd] original
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 foo
 Switched to branch 'A'
 rm 'foo'
-[A 39fac27] Remove foo, add bar
+[A f7bd02f] Remove foo, add bar
  Author: A U Thor <author@example.com>
  2 files changed, 1 insertion(+), 1 deletion(-)
  create mode 100644 bar
  delete mode 100644 foo
 Switched to branch 'B'
-[B 228eaa9] rename foo to bar
+[B b1d0bae] rename foo to bar
  Author: A U Thor <author@example.com>
  1 file changed, 0 insertions(+), 0 deletions(-)
  rename foo => bar (100%)
@@ -231085,13 +234605,13 @@
 
   git checkout -b <new-branch-name>
 
-HEAD is now at 228eaa9 rename foo to bar
+HEAD is now at b1d0bae rename foo to bar
 error: 'grep CONFLICT (rename.*add) out' didn't find a match in:
 Merging:
-228eaa9 rename foo to bar
+b1d0bae rename foo to bar
 virtual A^0
 found 1 common ancestor:
-877b165 original
+1f846fd original
 CONFLICT (rename/delete): foo deleted in A^0 and renamed to bar in HEAD. Version HEAD of bar left in tree.
 Automatic merge failed; fix conflicts and then commit the result.
 not ok 28 - rad-check: rename/add/delete conflict # TODO known breakage
@@ -231121,21 +234641,21 @@
 	)
 
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6042-merge-rename-corner-cases/rrdd/.git/
-[master (root-commit) 7893631] O
+[master (root-commit) 569f7bf] O
  Author: A U Thor <author@example.com>
  2 files changed, 2 insertions(+)
  create mode 100644 bar
  create mode 100644 foo
 Switched to branch 'A'
 rm 'bar'
-[A aa7dc2b] Rename foo, remove bar
+[A b3e425a] Rename foo, remove bar
  Author: A U Thor <author@example.com>
  2 files changed, 1 deletion(-)
  delete mode 100644 bar
  rename foo => baz (100%)
 Switched to branch 'B'
 rm 'foo'
-[B 1635e7e] Rename bar, remove foo
+[B f91f744] Rename bar, remove foo
  Author: A U Thor <author@example.com>
  2 files changed, 1 deletion(-)
  rename bar => baz (100%)
@@ -231189,14 +234709,14 @@
 
   git checkout -b <new-branch-name>
 
-HEAD is now at aa7dc2b Rename foo, remove bar
+HEAD is now at b3e425a Rename foo, remove bar
 CONFLICT (rename/rename): Rename foo->baz in HEAD. Rename bar->baz in B^0
 error: 'grep CONFLICT (rename.*delete) out' didn't find a match in:
 Merging:
-aa7dc2b Rename foo, remove bar
+b3e425a Rename foo, remove bar
 virtual B^0
 found 1 common ancestor:
-7893631 O
+569f7bf O
 CONFLICT (rename/rename): Rename foo->baz in HEAD. Rename bar->baz in B^0
 Renaming foo to baz~HEAD and bar to baz~B^0 instead
 Automatic merge failed; fix conflicts and then commit the result.
@@ -231357,3441 +234877,191 @@
 1..32
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t6022-merge-rename.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6022-merge-rename/.git/
+*** t6133-pathspec-rev-dwim.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6133-pathspec-rev-dwim/.git/
 expecting success: 
-cat >A <<\EOF &&
-a aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-b bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
-c cccccccccccccccccccccccccccccccccccccccccccccccc
-d dddddddddddddddddddddddddddddddddddddddddddddddd
-e eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee
-f ffffffffffffffffffffffffffffffffffffffffffffffff
-g gggggggggggggggggggggggggggggggggggggggggggggggg
-h hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh
-i iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii
-j jjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjj
-k kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk
-l llllllllllllllllllllllllllllllllllllllllllllllll
-m mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm
-n nnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnn
-o oooooooooooooooooooooooooooooooooooooooooooooooo
-EOF
-
-cat >M <<\EOF &&
-A AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-B BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB
-C CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC
-D DDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD
-E EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE
-F FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
-G GGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG
-H HHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH
-I IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII
-J JJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJ
-K KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK
-L LLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLL
-M MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM
-N NNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNN
-O OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO
-EOF
-
-git add A M &&
-git commit -m "initial has A and M" &&
-git branch white &&
-git branch red &&
-git branch blue &&
-git branch yellow &&
-git branch change &&
-git branch change+rename &&
-
-sed -e "/^g /s/.*/g : master changes a line/" <A >A+ &&
-mv A+ A &&
-git commit -a -m "master updates A" &&
-
-git checkout yellow &&
-rm -f M &&
-git commit -a -m "yellow removes M" &&
-
-git checkout white &&
-sed -e "/^g /s/.*/g : white changes a line/" <A >B &&
-sed -e "/^G /s/.*/G : colored branch changes a line/" <M >N &&
-rm -f A M &&
-git update-index --add --remove A B M N &&
-git commit -m "white renames A->B, M->N" &&
-
-git checkout red &&
-sed -e "/^g /s/.*/g : red changes a line/" <A >B &&
-sed -e "/^G /s/.*/G : colored branch changes a line/" <M >N &&
-rm -f A M &&
-git update-index --add --remove A B M N &&
-git commit -m "red renames A->B, M->N" &&
-
-git checkout blue &&
-sed -e "/^g /s/.*/g : blue changes a line/" <A >C &&
-sed -e "/^G /s/.*/G : colored branch changes a line/" <M >N &&
-rm -f A M &&
-git update-index --add --remove A C M N &&
-git commit -m "blue renames A->C, M->N" &&
-
-git checkout change &&
-sed -e "/^g /s/.*/g : changed line/" <A >A+ &&
-mv A+ A &&
-git commit -q -a -m "changed" &&
-
-git checkout change+rename &&
-sed -e "/^g /s/.*/g : changed line/" <A >B &&
-rm A &&
-git update-index --add B &&
-git commit -q -a -m "changed and renamed" &&
+	test_commit base &&
+	echo content >"br[ack]ets" &&
+	git add . &&
+	test_tick &&
+	git commit -m brackets
 
-git checkout master
-[master (root-commit) 63f9821] 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
-[master dfa1029] master updates A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to branch 'yellow'
-[yellow b383ef3] yellow removes M
- Author: A U Thor <author@example.com>
- 1 file changed, 15 deletions(-)
- delete mode 100644 M
-Switched to branch 'white'
-[white e15d4c3] 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 a8f88e5] red renames A->B, M->N
+[master (root-commit) d1ff1c9] base
  Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+), 2 deletions(-)
- rename A => B (93%)
- rename M => N (93%)
-Switched to branch 'blue'
-[blue 84cdde0] blue renames A->C, M->N
+ 1 file changed, 1 insertion(+)
+ create mode 100644 base.t
+[master 261aa52] brackets
  Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+), 2 deletions(-)
- rename A => C (93%)
- rename M => N (93%)
-Switched to branch 'change'
-Switched to branch 'change+rename'
-Switched to branch 'master'
+ 1 file changed, 1 insertion(+)
+ create mode 100644 br[ack]ets
 ok 1 - setup
 
 expecting success: 
-	git show-branch &&
-	test_expect_code 1 git pull . white &&
-	git ls-files -s &&
-	git ls-files -u B >b.stages &&
-	test_line_count = 3 b.stages &&
-	git ls-files -s N >n.stages &&
-	test_line_count = 1 n.stages &&
-	sed -ne "/^g/{
-	p
-	q
-	}" B | grep master &&
-	git diff --exit-code white N
+	git log -- "*.t" >expect &&
+	git log    "*.t" >actual &&
+	test_cmp expect actual
 
-! [blue] blue renames A->C, M->N
- ! [change] changed
-  ! [change+rename] changed and renamed
-   * [master] master updates A
-    ! [red] red renames A->B, M->N
-     ! [white] white renames A->B, M->N
-      ! [yellow] yellow removes M
--------
-  +     [change+rename] changed and renamed
- +      [change] changed
-+       [blue] blue renames A->C, M->N
-      + [yellow] yellow removes M
-     +  [white] white renames A->B, M->N
-    +   [red] red renames A->B, M->N
-   *    [master] master updates A
-+++*+++ [change+rename^] initial has A and M
-From .
- * branch            white      -> FETCH_HEAD
-Merging:
-dfa1029 master updates A
-virtual e15d4c3cdbf50691d24d196629ca9a26aeafb936
-found 1 common ancestor:
-63f9821 initial has A and M
-Auto-merging B
-CONFLICT (content): Merge conflict in B
-Automatic merge failed; fix conflicts and then commit the result.
-100644 aed72d761b68c20ffce8249a5a0426494098d376 1	B
-100644 c68856fe0bfce4eb453d8e12329c47ab60c8107b 2	B
-100644 2d603156dc5bdf6295c789cac08e3c9942a0b82a 3	B
-100644 ba41fb96393979b22691106b06bf5231eab57b85 0	N
-g : master changes a line
-ok 2 - pull renaming branch into unrenaming one
+ok 2 - non-rev wildcard dwims to pathspec
 
 expecting success: 
-	rm -f B &&
-	git reset --hard &&
-	git checkout red &&
-	test_expect_code 1 git pull . white &&
-	git ls-files -u B >b.stages &&
-	test_line_count = 3 b.stages &&
-	git ls-files -s N >n.stages &&
-	test_line_count = 1 n.stages &&
-	sed -ne "/^g/{
-	p
-	q
-	}" B | grep red &&
-	git diff --exit-code white N
+	git show "HEAD:br[ack]ets" -- >expect &&
+	git show "HEAD:br[ack]ets"    >actual &&
+	test_cmp expect actual
 
-HEAD is now at dfa1029 master updates A
-Switched to branch 'red'
-From .
- * branch            white      -> FETCH_HEAD
-Merging:
-a8f88e5 red renames A->B, M->N
-virtual e15d4c3cdbf50691d24d196629ca9a26aeafb936
-found 1 common ancestor:
-63f9821 initial has A and M
-Auto-merging N
-Skipped N (merged same as existing)
-Auto-merging B
-CONFLICT (content): Merge conflict in B
-Automatic merge failed; fix conflicts and then commit the result.
-g : red changes a line
-ok 3 - pull renaming branch into another renaming one
+ok 3 - tree:path with metacharacters dwims to rev
 
 expecting success: 
-	git reset --hard &&
-	git show-branch &&
-	test_expect_code 1 git pull . master &&
-	git ls-files -u B >b.stages &&
-	test_line_count = 3 b.stages &&
-	git ls-files -s N >n.stages &&
-	test_line_count = 1 n.stages &&
-	sed -ne "/^g/{
-	p
-	q
-	}" B | grep red &&
-	git diff --exit-code white N
+	git log "HEAD^{/b.*}" -- >expect &&
+	git log "HEAD^{/b.*}"    >actual &&
+	test_cmp expect actual
 
-HEAD is now at a8f88e5 red renames A->B, M->N
-! [blue] blue renames A->C, M->N
- ! [change] changed
-  ! [change+rename] changed and renamed
-   ! [master] master updates A
-    * [red] red renames A->B, M->N
-     ! [white] white renames A->B, M->N
-      ! [yellow] yellow removes M
--------
-  +     [change+rename] changed and renamed
- +      [change] changed
-+       [blue] blue renames A->C, M->N
-      + [yellow] yellow removes M
-     +  [white] white renames A->B, M->N
-    *   [red] red renames A->B, M->N
-   +    [master] master updates A
-++++*++ [change+rename^] initial has A and M
-From .
- * branch            master     -> FETCH_HEAD
-Merging:
-a8f88e5 red renames A->B, M->N
-virtual dfa1029aca190ee53efc97696ad39fed916c7acb
-found 1 common ancestor:
-63f9821 initial has A and M
-Skipped N (merged same as existing)
-Auto-merging B
-CONFLICT (content): Merge conflict in B
-Automatic merge failed; fix conflicts and then commit the result.
-g : red changes a line
-ok 4 - pull unrenaming branch into renaming one
+ok 4 - ^{foo} with metacharacters dwims to rev
 
 expecting success: 
-	git reset --hard &&
-	git show-branch &&
-	test_expect_code 1 git pull . blue &&
-	git ls-files -u A >a.stages &&
-	test_line_count = 1 a.stages &&
-	git ls-files -u B >b.stages &&
-	test_line_count = 1 b.stages &&
-	git ls-files -u C >c.stages &&
-	test_line_count = 1 c.stages &&
-	git ls-files -s N >n.stages &&
-	test_line_count = 1 n.stages &&
-	sed -ne "/^g/{
-	p
-	q
-	}" B | grep red &&
-	git diff --exit-code white N
+	git log "HEAD@{now [or thereabouts]}" -- >expect &&
+	git log "HEAD@{now [or thereabouts]}"    >actual &&
+	test_cmp expect actual
 
-HEAD is now at a8f88e5 red renames A->B, M->N
-! [blue] blue renames A->C, M->N
- ! [change] changed
-  ! [change+rename] changed and renamed
-   ! [master] master updates A
-    * [red] red renames A->B, M->N
-     ! [white] white renames A->B, M->N
-      ! [yellow] yellow removes M
--------
-  +     [change+rename] changed and renamed
- +      [change] changed
-+       [blue] blue renames A->C, M->N
-      + [yellow] yellow removes M
-     +  [white] white renames A->B, M->N
-    *   [red] red renames A->B, M->N
-   +    [master] master updates A
-++++*++ [change+rename^] initial has A and M
-From .
- * branch            blue       -> FETCH_HEAD
-Merging:
-a8f88e5 red renames A->B, M->N
-virtual 84cdde0f094cacdf7aab3de5c032a9996c55e994
-found 1 common ancestor:
-63f9821 initial has A and M
-Auto-merging N
-Skipped N (merged same as existing)
-CONFLICT (rename/rename): Rename "A"->"B" in branch "HEAD" rename "A"->"C" in "84cdde0f094cacdf7aab3de5c032a9996c55e994"
-Automatic merge failed; fix conflicts and then commit the result.
-g : red changes a line
-ok 5 - pull conflicting renames
+ok 5 - @{foo} with metacharacters dwims to rev
 
 expecting success: 
-	git reset --hard &&
-	git show-branch &&
-	echo >A this file should not matter &&
-	test_expect_code 1 git pull . white &&
-	test_path_is_file A
+	mkdir subdir &&
+	(
+		cd subdir &&
+		git log -- ":/*.t" >expect &&
+		git log    ":/*.t" >actual &&
+		test_cmp expect actual
+	)
 
-HEAD is now at a8f88e5 red renames A->B, M->N
-! [blue] blue renames A->C, M->N
- ! [change] changed
-  ! [change+rename] changed and renamed
-   ! [master] master updates A
-    * [red] red renames A->B, M->N
-     ! [white] white renames A->B, M->N
-      ! [yellow] yellow removes M
--------
-  +     [change+rename] changed and renamed
- +      [change] changed
-+       [blue] blue renames A->C, M->N
-      + [yellow] yellow removes M
-     +  [white] white renames A->B, M->N
-    *   [red] red renames A->B, M->N
-   +    [master] master updates A
-++++*++ [change+rename^] initial has A and M
-From .
- * branch            white      -> FETCH_HEAD
-Merging:
-a8f88e5 red renames A->B, M->N
-virtual e15d4c3cdbf50691d24d196629ca9a26aeafb936
-found 1 common ancestor:
-63f9821 initial has A and M
-Auto-merging N
-Skipped N (merged same as existing)
-Auto-merging B
-CONFLICT (content): Merge conflict in B
-Automatic merge failed; fix conflicts and then commit the result.
-ok 6 - interference with untracked working tree file
+ok 6 - :/*.t from a subdir dwims to a pathspec
 
+# passed all 6 test(s)
+1..6
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t6101-rev-parse-parents.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6101-rev-parse-parents/.git/
 expecting success: 
-	git reset --hard &&
-	git checkout white &&
-	git show-branch &&
-	rm -f A &&
-	echo >A this file should not matter &&
-	test_expect_code 1 git pull . red &&
-	test_path_is_file A
-
-HEAD is now at a8f88e5 red renames A->B, M->N
-Switched to branch 'white'
-! [blue] blue renames A->C, M->N
- ! [change] changed
-  ! [change+rename] changed and renamed
-   ! [master] master updates A
-    ! [red] red renames A->B, M->N
-     * [white] white renames A->B, M->N
-      ! [yellow] yellow removes M
--------
-  +     [change+rename] changed and renamed
- +      [change] changed
-+       [blue] blue renames A->C, M->N
-      + [yellow] yellow removes M
-     *  [white] white renames A->B, M->N
-    +   [red] red renames A->B, M->N
-   +    [master] master updates A
-+++++*+ [change+rename^] initial has A and M
-From .
- * branch            red        -> FETCH_HEAD
-Merging:
-e15d4c3 white renames A->B, M->N
-virtual a8f88e58ad2a406304635446508ab5af56f204da
-found 1 common ancestor:
-63f9821 initial has A and M
-Auto-merging N
-Skipped N (merged same as existing)
-Auto-merging B
-CONFLICT (content): Merge conflict in B
-Automatic merge failed; fix conflicts and then commit the result.
-ok 7 - interference with untracked working tree file
+	test_commit start &&
+	test_commit second &&
+	git checkout --orphan tmp &&
+	test_commit start2 &&
+	git checkout master &&
+	git merge -m next --allow-unrelated-histories start2 &&
+	test_commit final &&
 
-expecting success: 
-	git reset --hard &&
-	rm -f A M &&
-	git checkout -f master &&
-	git tag -f anchor &&
-	git show-branch &&
-	git pull . yellow &&
-	test_path_is_missing M &&
-	git reset --hard anchor
+	test_seq 40 |
+	while read i
+	do
+		git checkout --orphan "b$i" &&
+		test_tick &&
+		git commit --allow-empty -m "$i" &&
+		commit=$(git rev-parse --verify HEAD) &&
+		printf "$commit " >>.git/info/grafts
+	done
 
-HEAD is now at e15d4c3 white renames A->B, M->N
+[master (root-commit) bb4ab09] start
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 start.t
+[master 79e4276] second
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 second.t
+Switched to a new branch 'tmp'
+[tmp (root-commit) 4c3ba1d] start2
+ Author: A U Thor <author@example.com>
+ 3 files changed, 3 insertions(+)
+ create mode 100644 second.t
+ create mode 100644 start.t
+ create mode 100644 start2.t
 Switched to branch 'master'
-! [blue] blue renames A->C, M->N
- ! [change] changed
-  ! [change+rename] changed and renamed
-   * [master] master updates A
-    ! [red] red renames A->B, M->N
-     ! [white] white renames A->B, M->N
-      ! [yellow] yellow removes M
--------
-  +     [change+rename] changed and renamed
- +      [change] changed
-+       [blue] blue renames A->C, M->N
-      + [yellow] yellow removes M
-     +  [white] white renames A->B, M->N
-    +   [red] red renames A->B, M->N
-   *    [master] master updates A
-+++*+++ [change+rename^] initial has A and M
-From .
- * branch            yellow     -> FETCH_HEAD
-Merging:
-dfa1029 master updates A
-virtual b383ef34bb110a8e4048b63fcce68aab7691c934
-found 1 common ancestor:
-63f9821 initial has A and M
-Removing M
-Merge made by the 'recursive' strategy.
- M | 15 ---------------
- 1 file changed, 15 deletions(-)
- delete mode 100644 M
-HEAD is now at dfa1029 master updates A
-ok 8 - interference with untracked working tree file
-
-expecting success: 
-	git reset --hard &&
-	rm -f A M &&
-	git checkout -f master &&
-	git tag -f anchor &&
-	git show-branch &&
-	echo >>M one line addition &&
-	cat M >M.saved &&
-	test_expect_code 128 git pull . yellow &&
-	test_cmp M M.saved &&
-	rm -f M.saved
-
-HEAD is now at dfa1029 master updates A
-Already on 'master'
-! [blue] blue renames A->C, M->N
- ! [change] changed
-  ! [change+rename] changed and renamed
-   * [master] master updates A
-    ! [red] red renames A->B, M->N
-     ! [white] white renames A->B, M->N
-      ! [yellow] yellow removes M
--------
-  +     [change+rename] changed and renamed
- +      [change] changed
-+       [blue] blue renames A->C, M->N
-      + [yellow] yellow removes M
-     +  [white] white renames A->B, M->N
-    +   [red] red renames A->B, M->N
-   *    [master] master updates A
-+++*+++ [change+rename^] initial has A and M
-From .
- * branch            yellow     -> FETCH_HEAD
-error: Your local changes to the following files would be overwritten by merge:
-	M
-Please commit your changes or stash them before you merge.
-Aborting
-error: merging of trees 327b18fcbf562119811a97f5b8ed9c8ef85d5c3d and 878bb4a74cc6b899e74bcd3b56352573baeb967d failed
-Merging:
-dfa1029 master updates A
-virtual b383ef34bb110a8e4048b63fcce68aab7691c934
-found 1 common ancestor:
-63f9821 initial has A and M
-ok 9 - updated working tree file should prevent the merge
-
-expecting success: 
-	git reset --hard &&
-	rm -f A M &&
-	git checkout -f master &&
-	git tag -f anchor &&
-	git show-branch &&
-	echo >>M one line addition &&
-	cat M >M.saved &&
-	git update-index M &&
-	test_expect_code 128 git pull . yellow &&
-	test_cmp M M.saved &&
-	rm -f M.saved
-
-HEAD is now at dfa1029 master updates A
-Already on 'master'
-! [blue] blue renames A->C, M->N
- ! [change] changed
-  ! [change+rename] changed and renamed
-   * [master] master updates A
-    ! [red] red renames A->B, M->N
-     ! [white] white renames A->B, M->N
-      ! [yellow] yellow removes M
--------
-  +     [change+rename] changed and renamed
- +      [change] changed
-+       [blue] blue renames A->C, M->N
-      + [yellow] yellow removes M
-     +  [white] white renames A->B, M->N
-    +   [red] red renames A->B, M->N
-   *    [master] master updates A
-+++*+++ [change+rename^] initial has A and M
-From .
- * branch            yellow     -> FETCH_HEAD
-error: Your local changes to the following files would be overwritten by merge:
-  M
-Merging:
-dfa1029 master updates A
-virtual b383ef34bb110a8e4048b63fcce68aab7691c934
-found 1 common ancestor:
-63f9821 initial has A and M
-ok 10 - updated working tree file should prevent the merge
-
-expecting success: 
-	git reset --hard &&
-	rm -f A M &&
-	git checkout -f yellow &&
-	git tag -f anchor &&
-	git show-branch &&
-	echo >M this file should not matter &&
-	git pull . master &&
-	test_path_is_file M &&
-	! {
-		git ls-files -s |
-		grep M
-	} &&
-	git reset --hard anchor
-
-HEAD is now at dfa1029 master updates A
-Switched to branch 'yellow'
-Updated tag 'anchor' (was dfa1029)
-! [blue] blue renames A->C, M->N
- ! [change] changed
-  ! [change+rename] changed and renamed
-   ! [master] master updates A
-    ! [red] red renames A->B, M->N
-     ! [white] white renames A->B, M->N
-      * [yellow] yellow removes M
--------
-  +     [change+rename] changed and renamed
- +      [change] changed
-+       [blue] blue renames A->C, M->N
-      * [yellow] yellow removes M
-     +  [white] white renames A->B, M->N
-    +   [red] red renames A->B, M->N
-   +    [master] master updates A
-++++++* [change+rename^] initial has A and M
-From .
- * branch            master     -> FETCH_HEAD
 Merging:
-b383ef3 yellow removes M
-virtual dfa1029aca190ee53efc97696ad39fed916c7acb
-found 1 common ancestor:
-63f9821 initial has A and M
+79e4276 second
+virtual start2
+found 0 common ancestors:
 Merge made by the 'recursive' strategy.
- A | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-HEAD is now at b383ef3 yellow removes M
-ok 11 - interference with untracked working tree file
-
-expecting success: 
-	rm -f A M N &&
-	git reset --hard &&
-	git checkout change+rename &&
-	GIT_MERGE_VERBOSITY=3 git merge change >out &&
-	test_i18ngrep "^Skipped B" out &&
-	git reset --hard HEAD^ &&
-	git checkout change &&
-	GIT_MERGE_VERBOSITY=3 git merge change+rename >out &&
-	test_i18ngrep ! "^Skipped B" out
-
-HEAD is now at b383ef3 yellow removes M
-Switched to branch 'change+rename'
-Skipped B (merged same as existing)
-HEAD is now at 438c2c4 changed and renamed
-Switched to branch 'change'
-ok 12 - merge of identical changes in a renamed file
-
-expecting success: 
-	git reset --hard &&
-	git checkout --orphan dir-in-way &&
-	git rm -rf . &&
-	git clean -fdqx &&
-
-	mkdir sub &&
-	mkdir dir &&
-	printf "1\n2\n3\n4\n5\n6\n7\n8\n9\n10\n" >sub/file &&
-	echo foo >dir/file-in-the-way &&
-	git add -A &&
-	git commit -m "Common commit" &&
-
-	echo 11 >>sub/file &&
-	echo more >>dir/file-in-the-way &&
-	git add -u &&
-	git commit -m "Commit to merge, with dir in the way" &&
-
-	git checkout -b dir-not-in-way &&
-	git reset --soft HEAD^ &&
-	git rm -rf dir &&
-	git commit -m "Commit to merge, with dir removed" -- dir sub/file &&
-
-	git checkout -b renamed-file-has-no-conflicts dir-in-way~1 &&
-	git rm -rf dir &&
-	git rm sub/file &&
-	printf "1\n2\n3\n4\n5555\n6\n7\n8\n9\n10\n" >dir &&
-	git add dir &&
-	git commit -m "Independent change" &&
-
-	git checkout -b renamed-file-has-conflicts dir-in-way~1 &&
-	git rm -rf dir &&
-	git mv sub/file dir &&
-	echo 12 >>dir &&
-	git add dir &&
-	git commit -m "Conflicting change"
-
-HEAD is now at 4136a07 Merge branch 'change+rename' into change
-Switched to a new branch 'dir-in-way'
-rm 'B'
-rm 'M'
-[dir-in-way (root-commit) d7209d2] Common commit
+ start2.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 start2.t
+[master 28dcd76] final
  Author: A U Thor <author@example.com>
- 2 files changed, 11 insertions(+)
- create mode 100644 dir/file-in-the-way
- create mode 100644 sub/file
-[dir-in-way d551aee] Commit to merge, with dir in the way
+ 1 file changed, 1 insertion(+)
+ create mode 100644 final.t
+Switched to a new branch 'b1'
+[b1 (root-commit) f5f3b2c] 1
  Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
-Switched to a new branch 'dir-not-in-way'
-rm 'dir/file-in-the-way'
-[dir-not-in-way b8dcad4] Commit to merge, with dir removed
+ 4 files changed, 4 insertions(+)
+ create mode 100644 final.t
+ create mode 100644 second.t
+ create mode 100644 start.t
+ create mode 100644 start2.t
+hint: Support for <GIT_DIR>/info/grafts is deprecated
+hint: and will be removed in a future Git version.
+hint: 
+hint: Please use "git replace --convert-graft-file"
+hint: to convert the grafts into replace refs.
+hint: 
+hint: Turn this message off by running
+hint: "git config advice.graftFileDeprecated false"
+Switched to a new branch 'b2'
+hint: Support for <GIT_DIR>/info/grafts is deprecated
+hint: and will be removed in a future Git version.
+hint: 
+hint: Please use "git replace --convert-graft-file"
+hint: to convert the grafts into replace refs.
+hint: 
+hint: Turn this message off by running
+hint: "git config advice.graftFileDeprecated false"
+[b2 (root-commit) 618c8bc] 2
  Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+), 1 deletion(-)
- delete mode 100644 dir/file-in-the-way
-Switched to a new branch 'renamed-file-has-no-conflicts'
-rm 'dir/file-in-the-way'
-rm 'sub/file'
-[renamed-file-has-no-conflicts 1a23eb9] Independent change
+ 4 files changed, 4 insertions(+)
+ create mode 100644 final.t
+ create mode 100644 second.t
+ create mode 100644 start.t
+ create mode 100644 start2.t
+hint: Support for <GIT_DIR>/info/grafts is deprecated
+hint: and will be removed in a future Git version.
+hint: 
+hint: Please use "git replace --convert-graft-file"
+hint: to convert the grafts into replace refs.
+hint: 
+hint: Turn this message off by running
+hint: "git config advice.graftFileDeprecated false"
+Switched to a new branch 'b3'
+hint: Support for <GIT_DIR>/info/grafts is deprecated
+hint: and will be removed in a future Git version.
+hint: 
+hint: Please use "git replace --convert-graft-file"
+hint: to convert the grafts into replace refs.
+hint: 
+hint: Turn this message off by running
+hint: "git config advice.graftFileDeprecated false"
+[b3 (root-commit) ba8105e] 3
  Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+), 2 deletions(-)
- rename sub/file => dir (79%)
- delete mode 100644 dir/file-in-the-way
-Switched to a new branch 'renamed-file-has-conflicts'
-rm 'dir/file-in-the-way'
-[renamed-file-has-conflicts 6931950] Conflicting change
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+), 1 deletion(-)
- rename sub/file => dir (87%)
- delete mode 100644 dir/file-in-the-way
-ok 13 - setup for rename + d/f conflicts
-
-expecting success: 
-	git reset --hard &&
-	git checkout -q renamed-file-has-no-conflicts^0 &&
-	git merge --strategy=recursive dir-not-in-way &&
-	git diff --quiet &&
-	test -f dir &&
-	test_cmp expected dir
-
-HEAD is now at 6931950 Conflicting change
-Merging:
-1a23eb9 Independent change
-virtual dir-not-in-way
-found 1 common ancestor:
-d7209d2 Common commit
-Auto-merging dir
-Merge made by the 'recursive' strategy.
- dir | 1 +
- 1 file changed, 1 insertion(+)
-ok 14 - Rename+D/F conflict; renamed file merges + dir not in way
-
-expecting success: 
-	git reset --hard &&
-	rm -rf dir~* &&
-	git checkout -q renamed-file-has-no-conflicts^0 &&
-	test_must_fail git merge --strategy=recursive dir-in-way >output &&
-
-	test_i18ngrep "CONFLICT (modify/delete): dir/file-in-the-way" output &&
-	test_i18ngrep "Auto-merging dir" output &&
-	test_i18ngrep "Adding as dir~HEAD instead" output &&
-
-	test 3 -eq "$(git ls-files -u | wc -l)" &&
-	test 2 -eq "$(git ls-files -u dir/file-in-the-way | wc -l)" &&
-
-	test_must_fail git diff --quiet &&
-	test_must_fail git diff --cached --quiet &&
-
-	test -f dir/file-in-the-way &&
-	test -f dir~HEAD &&
-	test_cmp expected dir~HEAD
-
-HEAD is now at b6abf1b Merge branch 'dir-not-in-way' into HEAD
-CONFLICT (modify/delete): dir/file-in-the-way deleted in HEAD and modified in dir-in-way. Version dir-in-way of dir/file-in-the-way left in tree.
-Auto-merging dir
-Adding as dir~HEAD instead
-ok 15 - Rename+D/F conflict; renamed file merges but dir in way
-
-expecting success: 
-	git reset --hard &&
-	rm -rf dir~* &&
-	git checkout -q dir-in-way^0 &&
-	test_must_fail git merge --strategy=recursive renamed-file-has-no-conflicts >output 2>errors &&
-
-	! grep "error: refusing to lose untracked file at" errors &&
-	test_i18ngrep "CONFLICT (modify/delete): dir/file-in-the-way" output &&
-	test_i18ngrep "Auto-merging dir" output &&
-	test_i18ngrep "Adding as dir~renamed-file-has-no-conflicts instead" output &&
-
-	test 3 -eq "$(git ls-files -u | wc -l)" &&
-	test 2 -eq "$(git ls-files -u dir/file-in-the-way | wc -l)" &&
-
-	test_must_fail git diff --quiet &&
-	test_must_fail git diff --cached --quiet &&
-
-	test -f dir/file-in-the-way &&
-	test -f dir~renamed-file-has-no-conflicts &&
-	test_cmp expected dir~renamed-file-has-no-conflicts
-
-HEAD is now at 1a23eb9 Independent change
-CONFLICT (modify/delete): dir/file-in-the-way deleted in renamed-file-has-no-conflicts and modified in HEAD. Version HEAD of dir/file-in-the-way left in tree.
-Auto-merging dir
-Adding as dir~renamed-file-has-no-conflicts instead
-ok 16 - Same as previous, but merged other way
-
-expecting success: 
-	git reset --hard &&
-	rm -rf dir~* &&
-	git checkout -q renamed-file-has-conflicts^0 &&
-	test_must_fail git merge --strategy=recursive dir-not-in-way &&
-
-	test 3 -eq "$(git ls-files -u | wc -l)" &&
-	test 3 -eq "$(git ls-files -u dir | wc -l)" &&
-
-	test_must_fail git diff --quiet &&
-	test_must_fail git diff --cached --quiet &&
-
-	test -f dir &&
-	test_cmp expected dir
-
-warning: unable to unlink 'dir': Is a directory
-HEAD is now at d551aee Commit to merge, with dir in the way
-Merging:
-6931950 Conflicting change
-virtual dir-not-in-way
-found 1 common ancestor:
-d7209d2 Common commit
-Auto-merging dir
-CONFLICT (content): Merge conflict in dir
-Automatic merge failed; fix conflicts and then commit the result.
-ok 17 - Rename+D/F conflict; renamed file cannot merge, dir not in way
-
-expecting success: 
-	modify s/dir-not-in-way/dir-in-way/ expected &&
-
-	git reset --hard &&
-	rm -rf dir~* &&
-	git checkout -q renamed-file-has-conflicts^0 &&
-	test_must_fail git merge --strategy=recursive dir-in-way &&
-
-	test 5 -eq "$(git ls-files -u | wc -l)" &&
-	test 3 -eq "$(git ls-files -u dir | grep -v file-in-the-way | wc -l)" &&
-	test 2 -eq "$(git ls-files -u dir/file-in-the-way | wc -l)" &&
-
-	test_must_fail git diff --quiet &&
-	test_must_fail git diff --cached --quiet &&
-
-	test -f dir/file-in-the-way &&
-	test -f dir~HEAD &&
-	test_cmp expected dir~HEAD
-
-HEAD is now at 6931950 Conflicting change
-Merging:
-6931950 Conflicting change
-virtual dir-in-way
-found 1 common ancestor:
-d7209d2 Common commit
-CONFLICT (modify/delete): dir/file-in-the-way deleted in HEAD and modified in dir-in-way. Version dir-in-way of dir/file-in-the-way left in tree.
-Removing dir to make room for subdirectory
-
-Auto-merging dir
-CONFLICT (content): Merge conflict in dir
-Refusing to lose dirty file at dir
-Adding as dir~HEAD instead
-Automatic merge failed; fix conflicts and then commit the result.
-ok 18 - Rename+D/F conflict; renamed file cannot merge and dir in the way
-
-expecting success: 
-	git reset --hard &&
-	rm -rf dir~* &&
-	git checkout -q dir-in-way^0 &&
-	test_must_fail git merge --strategy=recursive renamed-file-has-conflicts &&
-
-	test 5 -eq "$(git ls-files -u | wc -l)" &&
-	test 3 -eq "$(git ls-files -u dir | grep -v file-in-the-way | wc -l)" &&
-	test 2 -eq "$(git ls-files -u dir/file-in-the-way | wc -l)" &&
-
-	test_must_fail git diff --quiet &&
-	test_must_fail git diff --cached --quiet &&
-
-	test -f dir/file-in-the-way &&
-	test -f dir~renamed-file-has-conflicts &&
-	test_cmp expected dir~renamed-file-has-conflicts
-
-HEAD is now at 6931950 Conflicting change
-Merging:
-d551aee Commit to merge, with dir in the way
-virtual renamed-file-has-conflicts
-found 1 common ancestor:
-d7209d2 Common commit
-CONFLICT (modify/delete): dir/file-in-the-way deleted in renamed-file-has-conflicts and modified in HEAD. Version HEAD of dir/file-in-the-way left in tree.
-Auto-merging dir
-CONFLICT (content): Merge conflict in dir
-Adding as dir~renamed-file-has-conflicts instead
-Automatic merge failed; fix conflicts and then commit the result.
-ok 19 - Same as previous, but merged other way
-
-expecting success: 
-	git reset --hard &&
-	git checkout --orphan rename-dest &&
-	git rm -rf . &&
-	git clean -fdqx &&
-
-	mkdir one &&
-	echo stuff >one/file &&
-	git add -A &&
-	git commit -m "Common commit" &&
-
-	git mv one/file destdir &&
-	git commit -m "Renamed to destdir" &&
-
-	git checkout -b source-conflict HEAD~1 &&
-	git rm -rf one &&
-	mkdir destdir &&
-	touch one destdir/foo &&
-	git add -A &&
-	git commit -m "Conflicts in the way"
-
-warning: unable to unlink 'dir': Is a directory
-HEAD is now at d551aee Commit to merge, with dir in the way
-Switched to a new branch 'rename-dest'
-rm 'dir/file-in-the-way'
-rm 'sub/file'
-[rename-dest (root-commit) bcf8698] Common commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one/file
-[rename-dest 76a7363] Renamed to destdir
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename one/file => destdir (100%)
-Switched to a new branch 'source-conflict'
-rm 'one/file'
-[source-conflict 7f80aab] Conflicts in the way
- Author: A U Thor <author@example.com>
- 3 files changed, 1 deletion(-)
- create mode 100644 destdir/foo
- create mode 100644 one
- delete mode 100644 one/file
-ok 20 - setup both rename source and destination involved in D/F conflict
-
-expecting success: 
-	git reset --hard &&
-	rm -rf dir~* &&
-	git checkout -q rename-dest^0 &&
-	test_must_fail git merge --strategy=recursive source-conflict &&
-
-	test 1 -eq "$(git ls-files -u | wc -l)" &&
-
-	test_must_fail git diff --quiet &&
-
-	test -f destdir/foo &&
-	test -f one &&
-	test -f destdir~HEAD &&
-	test "stuff" = "$(cat destdir~HEAD)"
-
-HEAD is now at 7f80aab Conflicts in the way
-Merging:
-76a7363 Renamed to destdir
-virtual source-conflict
-found 1 common ancestor:
-bcf8698 Common commit
-Adding one
-Adding destdir/foo
-Removing destdir to make room for subdirectory
-
-CONFLICT (rename/delete): one/file deleted in source-conflict and renamed to destdir in HEAD. Version HEAD of destdir left in tree at destdir~HEAD.
-Automatic merge failed; fix conflicts and then commit the result.
-ok 21 - both rename source and destination involved in D/F conflict
-
-expecting success: 
-	git reset --hard &&
-	git checkout --orphan rename-two &&
-	git rm -rf . &&
-	git clean -fdqx &&
-
-	mkdir one &&
-	mkdir two &&
-	echo stuff >one/file &&
-	echo other >two/file &&
-	git add -A &&
-	git commit -m "Common commit" &&
-
-	git rm -rf one &&
-	git mv two/file one &&
-	git commit -m "Rename two/file -> one" &&
-
-	git checkout -b rename-one HEAD~1 &&
-	git rm -rf two &&
-	git mv one/file two &&
-	rm -r one &&
-	git commit -m "Rename one/file -> two"
-
-HEAD is now at 76a7363 Renamed to destdir
-Switched to a new branch 'rename-two'
-rm 'destdir'
-[rename-two (root-commit) 3d14b5e] Common commit
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 one/file
- create mode 100644 two/file
-rm 'one/file'
-[rename-two c0a7fdc] Rename two/file -> one
- Author: A U Thor <author@example.com>
- 2 files changed, 1 deletion(-)
- rename two/file => one (100%)
- delete mode 100644 one/file
-Switched to a new branch 'rename-one'
-rm 'two/file'
-[rename-one 56179a4] Rename one/file -> two
- Author: A U Thor <author@example.com>
- 2 files changed, 1 deletion(-)
- rename one/file => two (100%)
- delete mode 100644 two/file
-ok 22 - setup pair rename to parent of other (D/F conflicts)
-
-expecting success: 
-	git checkout -q rename-one^0 &&
-	mkdir one &&
-	test_must_fail git merge --strategy=recursive rename-two &&
-
-	test 2 -eq "$(git ls-files -u | wc -l)" &&
-	test 1 -eq "$(git ls-files -u one | wc -l)" &&
-	test 1 -eq "$(git ls-files -u two | wc -l)" &&
-
-	test_must_fail git diff --quiet &&
-
-	test 4 -eq $(find . | grep -v .git | wc -l) &&
-
-	test -d one &&
-	test -f one~rename-two &&
-	test -f two &&
-	test "other" = $(cat one~rename-two) &&
-	test "stuff" = $(cat two)
-
-Merging:
-56179a4 Rename one/file -> two
-virtual rename-two
-found 1 common ancestor:
-3d14b5e Common commit
-CONFLICT (rename/delete): one/file deleted in rename-two and renamed to two in HEAD. Version HEAD of two left in tree.
-CONFLICT (rename/delete): two/file deleted in HEAD and renamed to one in rename-two. Version rename-two of one left in tree at one~rename-two.
-Automatic merge failed; fix conflicts and then commit the result.
-ok 23 - pair rename to parent of other (D/F conflicts) w/ untracked dir
-
-expecting success: 
-	git reset --hard &&
-	git clean -fdqx &&
-	test_must_fail git merge --strategy=recursive rename-two &&
-
-	test 2 -eq "$(git ls-files -u | wc -l)" &&
-	test 1 -eq "$(git ls-files -u one | wc -l)" &&
-	test 1 -eq "$(git ls-files -u two | wc -l)" &&
-
-	test_must_fail git diff --quiet &&
-
-	test 3 -eq $(find . | grep -v .git | wc -l) &&
-
-	test -f one &&
-	test -f two &&
-	test "other" = $(cat one) &&
-	test "stuff" = $(cat two)
-
-warning: unable to unlink 'one': Is a directory
-HEAD is now at 56179a4 Rename one/file -> two
-Merging:
-56179a4 Rename one/file -> two
-virtual rename-two
-found 1 common ancestor:
-3d14b5e Common commit
-CONFLICT (rename/delete): one/file deleted in rename-two and renamed to two in HEAD. Version HEAD of two left in tree.
-CONFLICT (rename/delete): two/file deleted in HEAD and renamed to one in rename-two. Version rename-two of one left in tree.
-Automatic merge failed; fix conflicts and then commit the result.
-ok 24 - pair rename to parent of other (D/F conflicts) w/ clean start
-
-expecting success: 
-	git reset --hard &&
-	git checkout --orphan first-rename &&
-	git rm -rf . &&
-	git clean -fdqx &&
-
-	echo stuff >original &&
-	git add -A &&
-	git commit -m "Common commit" &&
-
-	mkdir two &&
-	>two/file &&
-	git add two/file &&
-	git mv original one &&
-	git commit -m "Put two/file in the way, rename to one" &&
-
-	git checkout -b second-rename HEAD~1 &&
-	mkdir one &&
-	>one/file &&
-	git add one/file &&
-	git mv original two &&
-	git commit -m "Put one/file in the way, rename to two"
-
-HEAD is now at 56179a4 Rename one/file -> two
-Switched to a new branch 'first-rename'
-rm 'two'
-[first-rename (root-commit) e6391f1] Common commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 original
-[first-rename 9dfc4e9] Put two/file in the way, rename to one
- Author: A U Thor <author@example.com>
- 2 files changed, 0 insertions(+), 0 deletions(-)
- rename original => one (100%)
- create mode 100644 two/file
-Switched to a new branch 'second-rename'
-[second-rename 1782f68] Put one/file in the way, rename to two
- Author: A U Thor <author@example.com>
- 2 files changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 one/file
- rename original => two (100%)
-ok 25 - setup rename of one file to two, with directories in the way
-
-expecting success: 
-	git checkout -q first-rename^0 &&
-	test_must_fail git merge --strategy=recursive second-rename &&
-
-	test 5 -eq "$(git ls-files -s | wc -l)" &&
-	test 3 -eq "$(git ls-files -u | wc -l)" &&
-	test 1 -eq "$(git ls-files -u one | wc -l)" &&
-	test 1 -eq "$(git ls-files -u two | wc -l)" &&
-	test 1 -eq "$(git ls-files -u original | wc -l)" &&
-	test 2 -eq "$(git ls-files -o | wc -l)" &&
-
-	test -f one/file &&
-	test -f two/file &&
-	test -f one~HEAD &&
-	test -f two~second-rename &&
-	! test -f original
-
-Merging:
-9dfc4e9 Put two/file in the way, rename to one
-virtual second-rename
-found 1 common ancestor:
-e6391f1 Common commit
-Adding two/file
-Adding one/file
-Removing one to make room for subdirectory
-
-CONFLICT (rename/rename): Rename "original"->"one" in branch "HEAD" rename "original"->"two" in "second-rename"
-one is a directory in second-rename adding as one~HEAD instead
-two is a directory in HEAD adding as two~second-rename instead
-Automatic merge failed; fix conflicts and then commit the result.
-ok 26 - check handling of differently renamed file with D/F conflicts
-
-expecting success: 
-	git reset --hard &&
-	git checkout --orphan first-rename-redo &&
-	git rm -rf . &&
-	git clean -fdqx &&
-
-	echo stuff >original &&
-	mkdir one two &&
-	touch one/file two/file &&
-	git add -A &&
-	git commit -m "Common commit" &&
-
-	git rm -rf one &&
-	git mv original one &&
-	git commit -m "Rename to one" &&
-
-	git checkout -b second-rename-redo HEAD~1 &&
-	git rm -rf two &&
-	git mv original two &&
-	git commit -m "Rename to two"
-
-warning: unable to unlink 'two': Is a directory
-HEAD is now at 9dfc4e9 Put two/file in the way, rename to one
-Switched to a new branch 'first-rename-redo'
-rm 'one'
-rm 'two/file'
-[first-rename-redo (root-commit) 910b956] Common commit
- Author: A U Thor <author@example.com>
- 3 files changed, 1 insertion(+)
- create mode 100644 one/file
- create mode 100644 original
- create mode 100644 two/file
-rm 'one/file'
-[first-rename-redo d4431d6] Rename to one
- Author: A U Thor <author@example.com>
- 2 files changed, 0 insertions(+), 0 deletions(-)
- rename original => one (100%)
- delete mode 100644 one/file
-Switched to a new branch 'second-rename-redo'
-rm 'two/file'
-[second-rename-redo 6280696] Rename to two
- Author: A U Thor <author@example.com>
- 2 files changed, 0 insertions(+), 0 deletions(-)
- rename original => two (100%)
- delete mode 100644 two/file
-ok 27 - setup rename one file to two; directories moving out of the way
-
-expecting success: 
-	git checkout -q first-rename-redo^0 &&
-	test_must_fail git merge --strategy=recursive second-rename-redo &&
-
-	test 3 -eq "$(git ls-files -u | wc -l)" &&
-	test 1 -eq "$(git ls-files -u one | wc -l)" &&
-	test 1 -eq "$(git ls-files -u two | wc -l)" &&
-	test 1 -eq "$(git ls-files -u original | wc -l)" &&
-	test 0 -eq "$(git ls-files -o | wc -l)" &&
-
-	test -f one &&
-	test -f two &&
-	! test -f original
-
-Merging:
-d4431d6 Rename to one
-virtual second-rename-redo
-found 1 common ancestor:
-910b956 Common commit
-Removing two/file
-CONFLICT (rename/rename): Rename "original"->"one" in branch "HEAD" rename "original"->"two" in "second-rename-redo"
-Automatic merge failed; fix conflicts and then commit the result.
-ok 28 - check handling of differently renamed file with D/F conflicts
-
-expecting success: 
-	git reset --hard &&
-	git checkout --orphan avoid-unnecessary-update-1 &&
-	git rm -rf . &&
-	git clean -fdqx &&
-
-	printf "1\n2\n3\n4\n5\n6\n7\n8\n9\n10\n" >original &&
-	git add -A &&
-	git commit -m "Common commit" &&
-
-	git mv original rename &&
-	echo 11 >>rename &&
-	git add -u &&
-	git commit -m "Renamed and modified" &&
-
-	git checkout -b merge-branch-1 HEAD~1 &&
-	echo "random content" >random-file &&
-	git add -A &&
-	git commit -m "Random, unrelated changes"
-
-HEAD is now at d4431d6 Rename to one
-Switched to a new branch 'avoid-unnecessary-update-1'
-rm 'one'
-rm 'two/file'
-[avoid-unnecessary-update-1 (root-commit) 7e63db9] Common commit
- Author: A U Thor <author@example.com>
- 1 file changed, 10 insertions(+)
- create mode 100644 original
-[avoid-unnecessary-update-1 ea68845] Renamed and modified
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- rename original => rename (87%)
-Switched to a new branch 'merge-branch-1'
-[merge-branch-1 d7fd782] Random, unrelated changes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 random-file
-ok 29 - setup avoid unnecessary update, normal rename
-
-expecting success: 
-	git checkout -q avoid-unnecessary-update-1^0 &&
-	test-tool chmtime --get =1000000000 rename >expect &&
-	git merge merge-branch-1 &&
-	test-tool chmtime --get rename >actual &&
-	test_cmp expect actual # "rename" should have stayed intact
-
-Merging:
-ea68845 Renamed and modified
-virtual merge-branch-1
-found 1 common ancestor:
-7e63db9 Common commit
-Skipped rename (merged same as existing)
-Merge made by the 'recursive' strategy.
- random-file | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 random-file
-ok 30 - avoid unnecessary update, normal rename
-
-expecting success: 
-	git reset --hard &&
-	git checkout --orphan avoid-unnecessary-update-2 &&
-	git rm -rf . &&
-	git clean -fdqx &&
-
-	mkdir df &&
-	printf "1\n2\n3\n4\n5\n6\n7\n8\n9\n10\n" >df/file &&
-	git add -A &&
-	git commit -m "Common commit" &&
-
-	git mv df/file temp &&
-	rm -rf df &&
-	git mv temp df &&
-	echo 11 >>df &&
-	git add -u &&
-	git commit -m "Renamed and modified" &&
-
-	git checkout -b merge-branch-2 HEAD~1 &&
-	>unrelated-change &&
-	git add unrelated-change &&
-	git commit -m "Only unrelated changes"
-
-HEAD is now at f6a25ec Merge branch 'merge-branch-1' into HEAD
-Switched to a new branch 'avoid-unnecessary-update-2'
-rm 'random-file'
-rm 'rename'
-[avoid-unnecessary-update-2 (root-commit) 1795ac2] Common commit
- Author: A U Thor <author@example.com>
- 1 file changed, 10 insertions(+)
- create mode 100644 df/file
-[avoid-unnecessary-update-2 7116cb7] Renamed and modified
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- rename df/file => df (87%)
-Switched to a new branch 'merge-branch-2'
-[merge-branch-2 08e4aa8] Only unrelated changes
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 unrelated-change
-ok 31 - setup to test avoiding unnecessary update, with D/F conflict
-
-expecting success: 
-	git checkout -q avoid-unnecessary-update-2^0 &&
-	test-tool chmtime --get =1000000000 df >expect &&
-	git merge merge-branch-2 &&
-	test-tool chmtime --get df >actual &&
-	test_cmp expect actual # "df" should have stayed intact
-
-Merging:
-7116cb7 Renamed and modified
-virtual merge-branch-2
-found 1 common ancestor:
-1795ac2 Common commit
-Skipped df (merged same as existing)
-Merge made by the 'recursive' strategy.
- unrelated-change | 0
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 unrelated-change
-ok 32 - avoid unnecessary update, with D/F conflict
-
-expecting success: 
-	git rm -rf . &&
-	git clean -fdqx &&
-	rm -rf .git &&
-	git init &&
-
-	>irrelevant &&
-	mkdir df &&
-	>df/file &&
-	git add -A &&
-	git commit -mA &&
-
-	git checkout -b side &&
-	git rm -rf df &&
-	git commit -mB &&
-
-	git checkout master &&
-	git rm -rf df &&
-	echo bla >df &&
-	git add -A &&
-	git commit -m "Add a newfile"
-
-rm 'df'
-rm 'unrelated-change'
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6022-merge-rename/.git/
-[master (root-commit) 4f40f3e] A
- Author: A U Thor <author@example.com>
- 2 files changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 df/file
- create mode 100644 irrelevant
-Switched to a new branch 'side'
-rm 'df/file'
-[side 895550e] B
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- delete mode 100644 df/file
-Switched to branch 'master'
-rm 'df/file'
-[master e48d6ca] Add a newfile
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+)
- create mode 100644 df
- delete mode 100644 df/file
-ok 33 - setup avoid unnecessary update, dir->(file,nothing)
-
-expecting success: 
-	git checkout -q master^0 &&
-	test-tool chmtime --get =1000000000 df >expect &&
-	git merge side &&
-	test-tool chmtime --get df >actual &&
-	test_cmp expect actual # "df" should have stayed intact
-
-Merging:
-e48d6ca Add a newfile
-virtual side
-found 1 common ancestor:
-4f40f3e A
-Adding df
-Merge made by the 'recursive' strategy.
-ok 34 - avoid unnecessary update, dir->(file,nothing)
-
-expecting success: 
-	git rm -rf . &&
-	git clean -fdqx &&
-	rm -rf .git &&
-	git init &&
-
-	>irrelevant &&
-	>file &&
-	git add -A &&
-	git commit -mA &&
-
-	git checkout -b side &&
-	git rm -f file &&
-	git commit -m "Delete file" &&
-
-	git checkout master &&
-	echo bla >file &&
-	git add -A &&
-	git commit -m "Modify file"
-
-rm 'df'
-rm 'irrelevant'
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6022-merge-rename/.git/
-[master (root-commit) 186f85e] A
- Author: A U Thor <author@example.com>
- 2 files changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 file
- create mode 100644 irrelevant
-Switched to a new branch 'side'
-rm 'file'
-[side ebba424] Delete file
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- delete mode 100644 file
-Switched to branch 'master'
-[master 628b7ea] Modify file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 35 - setup avoid unnecessary update, modify/delete
-
-expecting success: 
-	git checkout -q master^0 &&
-	test-tool chmtime --get =1000000000 file >expect &&
-	test_must_fail git merge side &&
-	test-tool chmtime --get file >actual &&
-	test_cmp expect actual # "file" should have stayed intact
-
-Merging:
-628b7ea Modify file
-virtual side
-found 1 common ancestor:
-186f85e A
-CONFLICT (modify/delete): file deleted in side and modified in HEAD. Version HEAD of file left in tree.
-Automatic merge failed; fix conflicts and then commit the result.
-ok 36 - avoid unnecessary update, modify/delete
-
-expecting success: 
-	git rm -rf . &&
-	git clean -fdqx &&
-	rm -rf .git &&
-	git init &&
-
-	printf "1\n2\n3\n4\n5\n6\n7\n8\n" >file &&
-	git add -A &&
-	git commit -mA &&
-
-	git checkout -b side &&
-	cp file newfile &&
-	git add -A &&
-	git commit -m "Add file copy" &&
-
-	git checkout master &&
-	git mv file newfile &&
-	git commit -m "Rename file"
-
-file: needs merge
-rm 'file'
-rm 'file'
-rm 'irrelevant'
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6022-merge-rename/.git/
-[master (root-commit) 9f9a6a1] A
- Author: A U Thor <author@example.com>
- 1 file changed, 8 insertions(+)
- create mode 100644 file
-Switched to a new branch 'side'
-[side 0ad6131] Add file copy
- Author: A U Thor <author@example.com>
- 1 file changed, 8 insertions(+)
- create mode 100644 newfile
-Switched to branch 'master'
-[master 2217c32] Rename file
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename file => newfile (100%)
-ok 37 - setup avoid unnecessary update, rename/add-dest
-
-expecting success: 
-	git checkout -q master^0 &&
-	test-tool chmtime --get =1000000000 newfile >expect &&
-	git merge side &&
-	test-tool chmtime --get newfile >actual &&
-	test_cmp expect actual # "file" should have stayed intact
-
-Merging:
-2217c32 Rename file
-virtual side
-found 1 common ancestor:
-9f9a6a1 A
-Merge made by the 'recursive' strategy.
-ok 38 - avoid unnecessary update, rename/add-dest
-
-expecting success: 
-	git reset --hard &&
-	git checkout --orphan rename-plus-small-change &&
-	git rm -rf . &&
-	git clean -fdqx &&
-
-	echo ORIGINAL >file &&
-	git add file &&
-
-	test_tick &&
-	git commit -m Initial &&
-	git checkout -b rename_branch &&
-	git mv file renamed_file &&
-	git commit -m Rename &&
-	git checkout rename-plus-small-change &&
-	echo NEW-VERSION >file &&
-	git commit -a -m Reformat
-
-HEAD is now at ced2a32 Merge branch 'side' into HEAD
-Switched to a new branch 'rename-plus-small-change'
-rm 'newfile'
-[rename-plus-small-change (root-commit) e44eadc] Initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-Switched to a new branch 'rename_branch'
-[rename_branch f706812] Rename
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename file => renamed_file (100%)
-Switched to branch 'rename-plus-small-change'
-[rename-plus-small-change 068ab66] Reformat
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 39 - setup merge of rename + small change
-
-expecting success: 
-	git merge rename_branch &&
-
-	test 1 -eq $(git ls-files -s | wc -l) &&
-	test 0 -eq $(git ls-files -o | wc -l) &&
-	test $(git rev-parse HEAD:renamed_file) = $(git rev-parse HEAD~1:file)
-
-Merging:
-068ab66 Reformat
-virtual rename_branch
-found 1 common ancestor:
-e44eadc Initial
-Merge made by the 'recursive' strategy.
- file => renamed_file | 0
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename file => renamed_file (100%)
-ok 40 - merge rename + small change
-
-expecting success: 
-	git rm -rf . &&
-	git clean -fdqx &&
-	rm -rf .git &&
-	git init &&
-
-	printf "1\n2\n3\n4\n5\n6\n7\n8\n" >original_file &&
-	git add original_file &&
-	git commit -mA &&
-
-	git checkout -b rename &&
-	echo 9 >>original_file &&
-	git add original_file &&
-	git mv original_file renamed_file &&
-	git commit -mB &&
-
-	git checkout master &&
-	echo 8.5 >>original_file &&
-	git add original_file &&
-	git commit -mC
-
-rm 'renamed_file'
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6022-merge-rename/.git/
-[master (root-commit) 4847e8a] A
- Author: A U Thor <author@example.com>
- 1 file changed, 8 insertions(+)
- create mode 100644 original_file
-Switched to a new branch 'rename'
-[rename e9adddb] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- rename original_file => renamed_file (88%)
-Switched to branch 'master'
-[master 0487bb6] C
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 41 - setup for use of extended merge markers
-
-expecting success: 
-	git checkout rename^0 &&
-	test_must_fail git merge -s recursive master^0 &&
-	test_cmp expected renamed_file
-
-Note: checking out '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 performing another checkout.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
-
-  git checkout -b <new-branch-name>
-
-HEAD is now at e9adddb B
-Merging:
-e9adddb B
-virtual master^0
-found 1 common ancestor:
-4847e8a A
-Auto-merging renamed_file
-CONFLICT (content): Merge conflict in renamed_file
-Automatic merge failed; fix conflicts and then commit the result.
-ok 42 - merge master into rename has correct extended markers
-
-expecting success: 
-	git reset --hard &&
-	git checkout master^0 &&
-	test_must_fail git merge -s recursive rename^0 &&
-	test_cmp expected renamed_file
-
-HEAD is now at e9adddb B
-Previous HEAD position was e9adddb B
-HEAD is now at 0487bb6 C
-Merging:
-0487bb6 C
-virtual rename^0
-found 1 common ancestor:
-4847e8a A
-Auto-merging renamed_file
-CONFLICT (content): Merge conflict in renamed_file
-Automatic merge failed; fix conflicts and then commit the result.
-ok 43 - merge rename into master has correct extended markers
-
-expecting success: 
-	git rm -rf . &&
-	git clean -fdqx &&
-	rm -rf .git &&
-	git init &&
-
-	> irrelevant_file &&
-	printf "1\n2\n3\n4\n5\n6\n7\n8\n" >original_file &&
-	git add irrelevant_file original_file &&
-	git commit -mA &&
-
-	git checkout -b rename &&
-	git mv original_file renamed_file &&
-	git commit -mB &&
-
-	git checkout master &&
-	git rm original_file &&
-	git commit -mC
-
-renamed_file: needs merge
-rm 'renamed_file'
-rm 'renamed_file'
-rm 'renamed_file'
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6022-merge-rename/.git/
-[master (root-commit) e476651] A
- Author: A U Thor <author@example.com>
- 2 files changed, 8 insertions(+)
- create mode 100644 irrelevant_file
- create mode 100644 original_file
-Switched to a new branch 'rename'
-[rename 951e2d3] B
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename original_file => renamed_file (100%)
-Switched to branch 'master'
-rm 'original_file'
-[master 52b2874] C
- Author: A U Thor <author@example.com>
- 1 file changed, 8 deletions(-)
- delete mode 100644 original_file
-ok 44 - setup spurious "refusing to lose untracked" message
-
-expecting success: 
-	git checkout master^0 &&
-	test_must_fail git merge rename^0 2>errors.txt &&
-	! grep "refusing to lose untracked file" errors.txt
-
-Note: checking out 'master^0'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by performing another checkout.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
-
-  git checkout -b <new-branch-name>
-
-HEAD is now at 52b2874 C
-Merging:
-52b2874 C
-virtual rename^0
-found 1 common ancestor:
-e476651 A
-CONFLICT (rename/delete): original_file deleted in HEAD and renamed to renamed_file in rename^0. Version rename^0 of renamed_file left in tree.
-Automatic merge failed; fix conflicts and then commit the result.
-ok 45 - no spurious "refusing to lose untracked" message
-
-expecting success: 
-	git checkout -f -b empty-base &&
-	>empty1 &&
-	git add empty1 &&
-	git commit -m base &&
-	echo content >empty1 &&
-	git add empty1 &&
-	git commit -m fill &&
-	git checkout -b empty-topic HEAD^ &&
-	git mv empty1 empty2 &&
-	git commit -m rename &&
-	test_must_fail git merge empty-base &&
-	test_must_be_empty empty2
-
-Switched to a new branch 'empty-base'
-[empty-base a940ee2] base
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 empty1
-[empty-base d42ce4d] fill
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Switched to a new branch 'empty-topic'
-[empty-topic ab32619] rename
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename empty1 => empty2 (100%)
-Merging:
-ab32619 rename
-virtual empty-base
-found 1 common ancestor:
-a940ee2 base
-CONFLICT (modify/delete): empty1 deleted in HEAD and modified in empty-base. Version empty-base of empty1 left in tree.
-Automatic merge failed; fix conflicts and then commit the result.
-ok 46 - do not follow renames for empty files
-
-# passed all 46 test(s)
-1..46
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t6046-merge-skip-unneeded-updates.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6046-merge-skip-unneeded-updates/.git/
-expecting success: 
-	test_create_repo 1a &&
-	(
-		cd 1a &&
-
-		test_write_lines 1 2 3 4 5 6 7 8 9 10 >b &&
-		git add b &&
-		test_tick &&
-		git commit -m "O" &&
-
-		git branch O &&
-		git branch A &&
-		git branch B &&
-
-		git checkout A &&
-		test_write_lines 1 2 3 4 5 5.5 6 7 8 9 10 10.5 >b &&
-		git add b &&
-		test_tick &&
-		git commit -m "A" &&
-
-		git checkout B &&
-		test_write_lines 1 2 3 4 5 5.5 6 7 8 9 10 >b &&
-		git add b &&
-		test_tick &&
-		git commit -m "B"
-	)
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6046-merge-skip-unneeded-updates/1a/.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(+)
-ok 1 - 1a-setup: Modify(A)/Modify(B), change on B subset of A
-
-expecting success: 
-	test_when_finished "git -C 1a reset --hard" &&
-	test_when_finished "git -C 1a clean -fd" &&
-	(
-		cd 1a &&
-
-		git checkout A^0 &&
-
-		test-tool chmtime =31337 b &&
-		test-tool chmtime -v +0 b >expected-mtime &&
-
-		GIT_MERGE_VERBOSITY=3 git merge -s recursive B^0 >out 2>err &&
-
-		test_i18ngrep "Skipped b" out &&
-		test_must_be_empty err &&
-
-		test-tool chmtime -v +0 b >actual-mtime &&
-		test_cmp expected-mtime actual-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
-	)
-
-Note: checking out '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 performing another checkout.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
-
-  git checkout -b <new-branch-name>
-
-HEAD is now at 14800cf A
-Skipped b (merged same as existing)
-Removing actual
-Removing actual-mtime
-Removing err
-Removing expect
-Removing expected-mtime
-Removing index_files
-Removing out
-HEAD is now at a3ebbc3 Merge commit 'B^0' into HEAD
-ok 2 - 1a-check-L: Modify(A)/Modify(B), change on B subset of A
-
-expecting success: 
-	test_when_finished "git -C 1a reset --hard" &&
-	test_when_finished "git -C 1a clean -fd" &&
-	(
-		cd 1a &&
-
-		git checkout B^0 &&
-
-		GIT_MERGE_VERBOSITY=3 git merge -s recursive A^0 >out 2>err &&
-
-		test_i18ngrep "Auto-merging b" out &&
-		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
-	)
-
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  a3ebbc3 Merge commit 'B^0' into HEAD
-
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
-
- git branch <new-branch-name> a3ebbc3
-
-HEAD is now at dfd7e13 B
-Auto-merging b
-Removing actual
-Removing err
-Removing expect
-Removing index_files
-Removing out
-HEAD is now at d8d4c9c Merge commit 'A^0' into HEAD
-ok 3 - 1a-check-R: Modify(A)/Modify(B), change on B subset of A
-
-expecting success: 
-	test_create_repo 2a &&
-	(
-		cd 2a &&
-
-		test_seq 1 10 >b &&
-		git add b &&
-		test_tick &&
-		git commit -m "O" &&
-
-		git branch O &&
-		git branch A &&
-		git branch B &&
-
-		git checkout A &&
-		test_seq 1 11 >b &&
-		git add b &&
-		test_tick &&
-		git commit -m "A" &&
-
-		git checkout B &&
-		git mv b c &&
-		test_tick &&
-		git commit -m "B"
-	)
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6046-merge-skip-unneeded-updates/2a/.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%)
-ok 4 - 2a-setup: Modify(A)/rename(B)
-
-expecting success: 
-	test_when_finished "git -C 2a reset --hard" &&
-	test_when_finished "git -C 2a clean -fd" &&
-	(
-		cd 2a &&
-
-		git checkout A^0 &&
-
-		GIT_MERGE_VERBOSITY=3 git merge -s recursive B^0 >out 2>err &&
-
-		test_i18ngrep ! "Skipped c" out &&
-		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
-	)
-
-Note: checking out '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 performing another checkout.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
-
-  git checkout -b <new-branch-name>
-
-HEAD is now at c2d59c7 A
-fatal: Path 'b' does not exist in 'HEAD'
-HEAD:b
-Removing actual
-Removing err
-Removing expect
-Removing index_files
-Removing out
-HEAD is now at 5f0c937 Merge commit 'B^0' into HEAD
-ok 5 - 2a-check-L: Modify/rename, merge into modify side
-
-expecting success: 
-	test_when_finished "git -C 2a reset --hard" &&
-	test_when_finished "git -C 2a clean -fd" &&
-	(
-		cd 2a &&
-
-		git checkout B^0 &&
-
-		GIT_MERGE_VERBOSITY=3 git merge -s recursive A^0 >out 2>err &&
-
-		test_i18ngrep ! "Skipped c" out &&
-		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
-	)
-
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  5f0c937 Merge commit 'B^0' into HEAD
-
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
-
- git branch <new-branch-name> 5f0c937
-
-HEAD is now at 6283fcf B
-fatal: Path 'b' does not exist in 'HEAD'
-HEAD:b
-Removing actual
-Removing err
-Removing expect
-Removing index_files
-Removing out
-HEAD is now at 842807a Merge commit 'A^0' into HEAD
-ok 6 - 2a-check-R: Modify/rename, merge into rename side
-
-expecting success: 
-	test_create_repo 2b &&
-	(
-		cd 2b &&
-
-		test_write_lines 1 2 3 4 5 6 7 8 9 10 >b &&
-		git add b &&
-		test_tick &&
-		git commit -m "O" &&
-
-		git branch O &&
-		git branch A &&
-		git branch B &&
-
-		git checkout A &&
-		test_write_lines 1 2 3 4 5 5.5 6 7 8 9 10 10.5 >b &&
-		git add b &&
-		git mv b c &&
-		test_tick &&
-		git commit -m "A" &&
-
-		git checkout B &&
-		test_write_lines 1 2 3 4 5 5.5 6 7 8 9 10 >b &&
-		git add b &&
-		test_tick &&
-		git commit -m "B"
-	)
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6046-merge-skip-unneeded-updates/2b/.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(+)
-ok 7 - 2b-setup: Rename+Mod(A)/Mod(B), B mods subset of A
-
-expecting success: 
-	test_when_finished "git -C 2b reset --hard" &&
-	test_when_finished "git -C 2b clean -fd" &&
-	(
-		cd 2b &&
-
-		git checkout A^0 &&
-
-		test-tool chmtime =31337 c &&
-		test-tool chmtime -v +0 c >expected-mtime &&
-
-		GIT_MERGE_VERBOSITY=3 git merge -s recursive B^0 >out 2>err &&
-
-		test_i18ngrep "Skipped c" out &&
-		test_must_be_empty err &&
-
-		test-tool chmtime -v +0 c >actual-mtime &&
-		test_cmp expected-mtime actual-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
-	)
-
-Note: checking out '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 performing another checkout.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
-
-  git checkout -b <new-branch-name>
-
-HEAD is now at fed518a A
-Skipped c (merged same as existing)
-fatal: Path 'b' does not exist in 'HEAD'
-HEAD:b
-Removing actual
-Removing actual-mtime
-Removing err
-Removing expect
-Removing expected-mtime
-Removing index_files
-Removing out
-HEAD is now at 773713e Merge commit 'B^0' into HEAD
-ok 8 - 2b-check-L: Rename+Mod(A)/Mod(B), B mods subset of A
-
-expecting success: 
-	test_when_finished "git -C 2b reset --hard" &&
-	test_when_finished "git -C 2b clean -fd" &&
-	(
-		cd 2b &&
-
-		git checkout B^0 &&
-
-		GIT_MERGE_VERBOSITY=3 git merge -s recursive A^0 >out 2>err &&
-
-		test_i18ngrep "Auto-merging c" out &&
-		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
-	)
-
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  773713e Merge commit 'B^0' into HEAD
-
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
-
- git branch <new-branch-name> 773713e
-
-HEAD is now at dfd7e13 B
-Auto-merging c
-fatal: Path 'b' does not exist in 'HEAD'
-HEAD:b
-Removing actual
-Removing err
-Removing expect
-Removing index_files
-Removing out
-HEAD is now at a15a2d2 Merge commit 'A^0' into HEAD
-ok 9 - 2b-check-R: Rename+Mod(A)/Mod(B), B mods subset of A
-
-expecting success: 
-	test_create_repo 2c &&
-	(
-		cd 2c &&
-
-		test_seq 1 10 >b &&
-		git add b &&
-		test_tick &&
-		git commit -m "O" &&
-
-		git branch O &&
-		git branch A &&
-		git branch B &&
-
-		git checkout A &&
-		test_seq 1 11 >b &&
-		echo whatever >c &&
-		git add b c &&
-		test_tick &&
-		git commit -m "A" &&
-
-		git checkout B &&
-		git mv b c &&
-		test_tick &&
-		git commit -m "B"
-	)
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6046-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%)
-ok 10 - 2c-setup: Modify b & add c VS rename b->c
-
-expecting success: 
-	(
-		cd 2c &&
-
-		git checkout A^0 &&
-
-		GIT_MERGE_VERBOSITY=3 &&
-		export GIT_MERGE_VERBOSITY &&
-		test_must_fail git merge -s recursive B^0 >out 2>err &&
-
-		test_i18ngrep "CONFLICT (rename/add): Rename b->c" out &&
-		test_i18ngrep ! "Skipped c" out &&
-		test_must_be_empty err
-
-		# FIXME: rename/add conflicts are horribly broken right now;
-		# when I get back to my patch series fixing it and
-		# rename/rename(2to1) conflicts to bring them in line with
-		# how add/add conflicts behave, then checks like the below
-		# could be added.  But that patch series is waiting until
-		# the rename-directory-detection series lands, which this
-		# is part of.  And in the mean time, I do not want to further
-		# enforce broken behavior.  So for now, the main test is the
-		# one above that err is an empty file.
-
-		#git ls-files -s >index_files &&
-		#test_line_count = 2 index_files &&
-
-		#git rev-parse >actual :2:c :3:c &&
-		#git rev-parse >expect A:b  A:c  &&
-		#test_cmp expect actual &&
-
-		#git cat-file -p A:b >>merged &&
-		#git cat-file -p A:c >>merge-me &&
-		#>empty &&
-		#test_must_fail git merge-file \
-		#	-L "Temporary merge branch 1" \
-		#	-L "" \
-		#	-L "Temporary merge branch 2" \
-		#	merged empty merge-me &&
-		#sed -e "s/^\([<=>]\)/\1\1\1/" merged >merged-internal &&
-
-		#git hash-object c               >actual &&
-		#git hash-object merged-internal >expect &&
-		#test_cmp expect actual &&
-
-		#test_path_is_missing b
-	)
-
-Note: checking out '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 performing another checkout.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
-
-  git checkout -b <new-branch-name>
-
-HEAD is now at edf631f A
-CONFLICT (rename/add): Rename b->c in B^0. c added in HEAD
-ok 11 - 2c-check: Modify b & add c VS rename b->c
-
-expecting success: 
-	test_create_repo 3a &&
-	(
-		cd 3a &&
-
-		mkdir foo &&
-		test_seq 1 10 >bq &&
-		test_write_lines a b c d e f g h i j k >foo/whatever &&
-		git add bq foo/whatever &&
-		test_tick &&
-		git commit -m "O" &&
-
-		git branch O &&
-		git branch A &&
-		git branch B &&
-
-		git checkout A &&
-		test_seq 1 11 >bq &&
-		git add bq &&
-		git mv bq foo/ &&
-		test_tick &&
-		git commit -m "A" &&
-
-		git checkout B &&
-		git mv foo/ bar/ &&
-		test_tick &&
-		git commit -m "B"
-	)
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6046-merge-skip-unneeded-updates/3a/.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%)
-ok 12 - 3a-setup: bq_1->foo/bq_2 on A, foo/->bar/ on B
-
-expecting success: 
-	test_when_finished "git -C 3a reset --hard" &&
-	test_when_finished "git -C 3a clean -fd" &&
-	(
-		cd 3a &&
-
-		git checkout A^0 &&
-
-		GIT_MERGE_VERBOSITY=3 git merge -s recursive B^0 >out 2>err &&
-
-		test_i18ngrep ! "Skipped bar/bq" out &&
-		test_must_be_empty err &&
-
-		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 foo/bq foo/whatever
-	)
-
-Note: checking out '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 performing another checkout.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
-
-  git checkout -b <new-branch-name>
-
-HEAD is now at 5576138 A
-fatal: Path 'bq' does not exist in 'HEAD'
-HEAD:bq
-Removing actual
-Removing err
-Removing expect
-Removing index_files
-Removing out
-HEAD is now at 43b755c Merge commit 'B^0' into HEAD
-ok 13 - 3a-check-L: bq_1->foo/bq_2 on A, foo/->bar/ on B
-
-expecting success: 
-	test_when_finished "git -C 3a reset --hard" &&
-	test_when_finished "git -C 3a clean -fd" &&
-	(
-		cd 3a &&
-
-		git checkout B^0 &&
-
-		GIT_MERGE_VERBOSITY=3 git merge -s recursive A^0 >out 2>err &&
-
-		test_i18ngrep ! "Skipped bar/bq" out &&
-		test_must_be_empty err &&
-
-		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 foo/bq foo/whatever
-	)
-
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  43b755c Merge commit 'B^0' into HEAD
-
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
-
- git branch <new-branch-name> 43b755c
-
-HEAD is now at 69c0854 B
-fatal: Path 'bq' does not exist in 'HEAD'
-HEAD:bq
-Removing actual
-Removing err
-Removing expect
-Removing index_files
-Removing out
-HEAD is now at 812210b Merge commit 'A^0' into HEAD
-ok 14 - 3a-check-R: bq_1->foo/bq_2 on A, foo/->bar/ on B
-
-expecting success: 
-	test_create_repo 3b &&
-	(
-		cd 3b &&
-
-		mkdir foo &&
-		test_seq 1 10 >bq &&
-		test_write_lines a b c d e f g h i j k >foo/whatever &&
-		git add bq foo/whatever &&
-		test_tick &&
-		git commit -m "O" &&
-
-		git branch O &&
-		git branch A &&
-		git branch B &&
-
-		git checkout A &&
-		git mv bq foo/ &&
-		test_tick &&
-		git commit -m "A" &&
-
-		git checkout B &&
-		test_seq 1 11 >bq &&
-		git add bq &&
-		git mv foo/ bar/ &&
-		test_tick &&
-		git commit -m "B"
-	)
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6046-merge-skip-unneeded-updates/3b/.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%)
-ok 15 - 3b-setup: bq_1->foo/bq_2 on A, foo/->bar/ on B
-
-expecting success: 
-	test_when_finished "git -C 3b reset --hard" &&
-	test_when_finished "git -C 3b clean -fd" &&
-	(
-		cd 3b &&
-
-		git checkout A^0 &&
-
-		GIT_MERGE_VERBOSITY=3 git merge -s recursive B^0 >out 2>err &&
-
-		test_i18ngrep ! "Skipped bar/bq" out &&
-		test_must_be_empty err &&
-
-		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 foo/bq foo/whatever
-	)
-
-Note: checking out '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 performing another checkout.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
-
-  git checkout -b <new-branch-name>
-
-HEAD is now at d02b71c A
-fatal: Path 'bq' does not exist in 'HEAD'
-HEAD:bq
-Removing actual
-Removing err
-Removing expect
-Removing index_files
-Removing out
-HEAD is now at b19010e Merge commit 'B^0' into HEAD
-ok 16 - 3b-check-L: bq_1->foo/bq_2 on A, foo/->bar/ on B
-
-expecting success: 
-	test_when_finished "git -C 3b reset --hard" &&
-	test_when_finished "git -C 3b clean -fd" &&
-	(
-		cd 3b &&
-
-		git checkout B^0 &&
-
-		GIT_MERGE_VERBOSITY=3 git merge -s recursive A^0 >out 2>err &&
-
-		test_i18ngrep ! "Skipped bar/bq" out &&
-		test_must_be_empty err &&
-
-		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 foo/bq foo/whatever
-	)
-
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  b19010e Merge commit 'B^0' into HEAD
-
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
-
- git branch <new-branch-name> b19010e
-
-HEAD is now at 2f47892 B
-fatal: Path 'bq' does not exist in 'HEAD'
-HEAD:bq
-Removing actual
-Removing err
-Removing expect
-Removing index_files
-Removing out
-HEAD is now at 201cb83 Merge commit 'A^0' into HEAD
-ok 17 - 3b-check-R: bq_1->foo/bq_2 on A, foo/->bar/ on B
-
-expecting success: 
-	test_create_repo 4a &&
-	(
-		cd 4a &&
-
-		test_write_lines 1 2 3 4 5 6 7 8 9 10 >b &&
-		git add b &&
-		test_tick &&
-		git commit -m "O" &&
-
-		git branch O &&
-		git branch A &&
-		git branch B &&
-
-		git checkout A &&
-		test_write_lines 1 2 3 4 5 5.5 6 7 8 9 10 10.5 >b &&
-		git add b &&
-		test_tick &&
-		git commit -m "A" &&
-
-		git checkout B &&
-		test_write_lines 1 2 3 4 5 5.5 6 7 8 9 10 >b &&
-		git add b &&
-		test_tick &&
-		git commit -m "B"
-	)
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6046-merge-skip-unneeded-updates/4a/.git/
-[master (root-commit) 105387b] O
- Author: A U Thor <author@example.com>
- 1 file changed, 10 insertions(+)
- create mode 100644 b
-Switched to branch 'A'
-[A 14800cf] A
- Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+)
-Switched to branch 'B'
-[B dfd7e13] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 18 - 4a-setup: Change on A, change on B subset of A, dirty mods present
-
-checking known breakage: 
-	test_when_finished "git -C 4a reset --hard" &&
-	test_when_finished "git -C 4a clean -fd" &&
-	(
-		cd 4a &&
-
-		git checkout A^0 &&
-		echo "File rewritten" >b &&
-
-		test-tool chmtime =31337 b &&
-		test-tool chmtime -v +0 b >expected-mtime &&
-
-		GIT_MERGE_VERBOSITY=3 git merge -s recursive B^0 >out 2>err &&
-
-		test_i18ngrep "Skipped b" out &&
-		test_must_be_empty err &&
-
-		test-tool chmtime -v +0 b >actual-mtime &&
-		test_cmp expected-mtime actual-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
-	)
-
-Note: checking out '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 performing another checkout.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
-
-  git checkout -b <new-branch-name>
-
-HEAD is now at 14800cf A
-Removing err
-Removing expected-mtime
-Removing out
-HEAD is now at 14800cf A
-not ok 19 - 4a-check: Change on A, change on B subset of A, dirty mods present # TODO known breakage
-
-expecting success: 
-	test_create_repo 4b &&
-	(
-		cd 4b &&
-
-		test_write_lines 1 2 3 4 5 6 7 8 9 10 >b &&
-		git add b &&
-		test_tick &&
-		git commit -m "O" &&
-
-		git branch O &&
-		git branch A &&
-		git branch B &&
-
-		git checkout A &&
-		test_write_lines 1 2 3 4 5 5.5 6 7 8 9 10 10.5 >b &&
-		git add b &&
-		git mv b c &&
-		test_tick &&
-		git commit -m "A" &&
-
-		git checkout B &&
-		test_write_lines 1 2 3 4 5 5.5 6 7 8 9 10 >b &&
-		git add b &&
-		test_tick &&
-		git commit -m "B"
-	)
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6046-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(+)
-ok 20 - 4b-setup: Rename+Mod(A)/Mod(B), change on B subset of A, dirty mods present
-
-expecting success: 
-	test_when_finished "git -C 4b reset --hard" &&
-	test_when_finished "git -C 4b clean -fd" &&
-	(
-		cd 4b &&
-
-		git checkout A^0 &&
-		echo "File rewritten" >c &&
-
-		test-tool chmtime =31337 c &&
-		test-tool chmtime -v +0 c >expected-mtime &&
-
-		GIT_MERGE_VERBOSITY=3 git merge -s recursive B^0 >out 2>err &&
-
-		test_i18ngrep "Skipped c" out &&
-		test_must_be_empty err &&
-
-		test-tool chmtime -v +0 c >actual-mtime &&
-		test_cmp expected-mtime actual-mtime &&
-
-		git ls-files -s >index_files &&
-		test_line_count = 1 index_files &&
-
-		git rev-parse >actual :0:c &&
-		git rev-parse >expect A:c &&
-		test_cmp expect actual &&
-
-		git hash-object c >actual &&
-		echo "File rewritten" | git hash-object --stdin >expect &&
-		test_cmp expect actual &&
-
-		test_must_fail git rev-parse HEAD:b &&
-		test_path_is_missing b
-	)
-
-Note: checking out '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 performing another checkout.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
-
-  git checkout -b <new-branch-name>
-
-HEAD is now at fed518a A
-Skipped c (merged same as existing)
-fatal: Path 'b' does not exist in 'HEAD'
-HEAD:b
-Removing actual
-Removing actual-mtime
-Removing err
-Removing expect
-Removing expected-mtime
-Removing index_files
-Removing out
-HEAD is now at 5a7f4c9 Merge commit 'B^0' into HEAD
-ok 21 - 4b-check: Rename+Mod(A)/Mod(B), change on B subset of A, dirty mods present
-
-# still have 1 known breakage(s)
-# passed all remaining 20 test(s)
-1..21
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t6112-rev-list-filters-objects.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6112-rev-list-filters-objects/.git/
-expecting success: 
-	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"
-	done
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6112-rev-list-filters-objects/r1/.git/
-[master (root-commit) 52985d8] 1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file.1
-[master 1a3c6cd] 2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file.2
-[master b77cfc2] 3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file.3
-[master ca83fb5] 4
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file.4
-[master 44f20ac] 5
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file.5
-ok 1 - setup r1
-
-expecting success: 
-	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: 
-	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: 
-	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: 
-	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"
-	done
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6112-rev-list-filters-objects/r2/.git/
-[master (root-commit) 93c2df8] 1000
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 large.1000
-[master 03e21d9] 10000
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 large.10000
-ok 5 - setup r2
-
-expecting success: 
-	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: 
-	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: 
-	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: 
-	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: 
-	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: 
-	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: 
-	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
-	done &&
-	git -C r3 commit -m "sparse" &&
-	echo dir1/ >pattern1 &&
-	echo sparse1 >pattern2
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6112-rev-list-filters-objects/r3/.git/
-[master (root-commit) 8dc070f] 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 12 - setup r3
-
-expecting success: 
-	git -C r3 ls-files -s 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:path=../pattern1 HEAD >revs &&
-	awk -f print_1.awk revs |
-	sed "s/~//" |
-	sort >observed &&
-
-	test_cmp expected observed
-
-ok 13 - verify sparse:path=pattern1 omits top-level files
-
-expecting success: 
-	git -C r3 ls-files -s sparse2 dir1/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:path=../pattern2 HEAD >revs &&
-	awk -f print_1.awk revs |
-	sed "s/~//" |
-	sort >observed &&
-
-	test_cmp expected observed
-
-ok 14 - verify sparse:path=pattern2 omits both sparse2 files
-
-expecting success: 
-	echo dir1/ >r3/pattern &&
-	git -C r3 add pattern &&
-	git -C r3 commit -m "pattern"
-
-[master ac89dce] pattern
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 pattern
-ok 15 - setup r3 part 2
-
-expecting success: 
-	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 16 - verify sparse:oid=OID omits top-level files
-
-expecting success: 
-	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=master:pattern HEAD >revs &&
-	awk -f print_1.awk revs |
-	sed "s/~//" |
-	sort >observed &&
-
-	test_cmp expected observed
-
-ok 17 - verify sparse:oid=oid-ish omits top-level files
-
-expecting success: 
-	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 18 - rev-list W/ --missing=print and --missing=allow-any for trees
-
-expecting success: 
-	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 19 - verify tree:0 includes trees in "filtered" output
-
-expecting success: 
-	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
-
-ac89dcef8d76bf3022a7414573d1c4457a3f8da2
-8dc070f5041577d542c4fb65f235445570500f83
-ok 20 - filter a GIANT tree through tree:0
-
-expecting success: 
-	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 `cat expected | sed "s|..|&/|"`
-	do
-		rm r1/.git/objects/$id
-	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 21 - rev-list W/ --missing=print
-
-expecting success: 
-	test_must_fail git -C r1 rev-list --quiet --objects HEAD
-
-fatal: missing blob object '54ff69bde100bd29db945c2fc62010675d3b5b14'
-ok 22 - rev-list W/O --missing fails
-
-expecting success: 
-	git -C r1 rev-list --quiet --missing=allow-any --objects HEAD
-
-ok 23 - rev-list W/ missing=allow-any
-
-# passed all 23 test(s)
-1..23
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t6133-pathspec-rev-dwim.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6133-pathspec-rev-dwim/.git/
-expecting success: 
-	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: 
-	git log -- "*.t" >expect &&
-	git log    "*.t" >actual &&
-	test_cmp expect actual
-
-ok 2 - non-rev wildcard dwims to pathspec
-
-expecting success: 
-	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: 
-	git log "HEAD^{/b.*}" -- >expect &&
-	git log "HEAD^{/b.*}"    >actual &&
-	test_cmp expect actual
-
-ok 4 - ^{foo} with metacharacters dwims to rev
-
-expecting success: 
-	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: 
-	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/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t6131-pathspec-icase.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6131-pathspec-icase/.git/
-checking prerequisite: CASE_INSENSITIVE_FS
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
-	echo good >CamelCase &&
-	echo bad >camelcase &&
-	test "$(cat CamelCase)" != good
-
-)
-prerequisite CASE_INSENSITIVE_FS not satisfied
-expecting success: 
-	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: 
-	echo bar >expect &&
-	git log --format=%s -- "bar" >actual &&
-	test_cmp expect actual
-
-ok 2 - tree_entry_interesting matches bar
-
-expecting success: 
-	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: 
-	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: 
-	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: 
-	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: 
-	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: 
-	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: 
-	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/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t6101-rev-parse-parents.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6101-rev-parse-parents/.git/
-expecting success: 
-	test_commit start &&
-	test_commit second &&
-	git checkout --orphan tmp &&
-	test_commit start2 &&
-	git checkout master &&
-	git merge -m next --allow-unrelated-histories start2 &&
-	test_commit final &&
-
-	test_seq 40 |
-	while read i
-	do
-		git checkout --orphan "b$i" &&
-		test_tick &&
-		git commit --allow-empty -m "$i" &&
-		commit=$(git rev-parse --verify HEAD) &&
-		printf "$commit " >>.git/info/grafts
-	done
-
-[master (root-commit) bb4ab09] start
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 start.t
-[master 79e4276] second
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 second.t
-Switched to a new branch 'tmp'
-[tmp (root-commit) 4c3ba1d] start2
- Author: A U Thor <author@example.com>
- 3 files changed, 3 insertions(+)
- create mode 100644 second.t
- create mode 100644 start.t
- create mode 100644 start2.t
-Switched to branch 'master'
-Merging:
-79e4276 second
-virtual start2
-found 0 common ancestors:
-Merge made by the 'recursive' strategy.
- start2.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 start2.t
-[master 28dcd76] final
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 final.t
-Switched to a new branch 'b1'
-[b1 (root-commit) f5f3b2c] 1
- Author: A U Thor <author@example.com>
- 4 files changed, 4 insertions(+)
- create mode 100644 final.t
- create mode 100644 second.t
- create mode 100644 start.t
- create mode 100644 start2.t
-hint: Support for <GIT_DIR>/info/grafts is deprecated
-hint: and will be removed in a future Git version.
-hint: 
-hint: Please use "git replace --convert-graft-file"
-hint: to convert the grafts into replace refs.
-hint: 
-hint: Turn this message off by running
-hint: "git config advice.graftFileDeprecated false"
-Switched to a new branch 'b2'
-hint: Support for <GIT_DIR>/info/grafts is deprecated
-hint: and will be removed in a future Git version.
-hint: 
-hint: Please use "git replace --convert-graft-file"
-hint: to convert the grafts into replace refs.
-hint: 
-hint: Turn this message off by running
-hint: "git config advice.graftFileDeprecated false"
-[b2 (root-commit) 618c8bc] 2
- Author: A U Thor <author@example.com>
- 4 files changed, 4 insertions(+)
- create mode 100644 final.t
- create mode 100644 second.t
- create mode 100644 start.t
- create mode 100644 start2.t
-hint: Support for <GIT_DIR>/info/grafts is deprecated
-hint: and will be removed in a future Git version.
-hint: 
-hint: Please use "git replace --convert-graft-file"
-hint: to convert the grafts into replace refs.
-hint: 
-hint: Turn this message off by running
-hint: "git config advice.graftFileDeprecated false"
-Switched to a new branch 'b3'
-hint: Support for <GIT_DIR>/info/grafts is deprecated
-hint: and will be removed in a future Git version.
-hint: 
-hint: Please use "git replace --convert-graft-file"
-hint: to convert the grafts into replace refs.
-hint: 
-hint: Turn this message off by running
-hint: "git config advice.graftFileDeprecated false"
-[b3 (root-commit) ba8105e] 3
- Author: A U Thor <author@example.com>
- 4 files changed, 4 insertions(+)
- create mode 100644 final.t
- create mode 100644 second.t
- create mode 100644 start.t
- create mode 100644 start2.t
-hint: Support for <GIT_DIR>/info/grafts is deprecated
-hint: and will be removed in a future Git version.
-hint: 
-hint: Please use "git replace --convert-graft-file"
-hint: to convert the grafts into replace refs.
-hint: 
-hint: Turn this message off by running
-hint: "git config advice.graftFileDeprecated false"
-Switched to a new branch 'b4'
-hint: Support for <GIT_DIR>/info/grafts is deprecated
-hint: and will be removed in a future Git version.
-hint: 
-hint: Please use "git replace --convert-graft-file"
-hint: to convert the grafts into replace refs.
-hint: 
-hint: Turn this message off by running
-hint: "git config advice.graftFileDeprecated false"
-[b4 (root-commit) 8edc64f] 4
+ 4 files changed, 4 insertions(+)
+ create mode 100644 final.t
+ create mode 100644 second.t
+ create mode 100644 start.t
+ create mode 100644 start2.t
+hint: Support for <GIT_DIR>/info/grafts is deprecated
+hint: and will be removed in a future Git version.
+hint: 
+hint: Please use "git replace --convert-graft-file"
+hint: to convert the grafts into replace refs.
+hint: 
+hint: Turn this message off by running
+hint: "git config advice.graftFileDeprecated false"
+Switched to a new branch 'b4'
+hint: Support for <GIT_DIR>/info/grafts is deprecated
+hint: and will be removed in a future Git version.
+hint: 
+hint: Please use "git replace --convert-graft-file"
+hint: to convert the grafts into replace refs.
+hint: 
+hint: Turn this message off by running
+hint: "git config advice.graftFileDeprecated false"
+[b4 (root-commit) 8edc64f] 4
  Author: A U Thor <author@example.com>
  4 files changed, 4 insertions(+)
  create mode 100644 final.t
@@ -236376,51 +236646,6 @@
 1..38
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t6134-pathspec-in-submodule.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6134-pathspec-in-submodule/.git/
-expecting success: 
-	test_create_repo pretzel &&
-	: >pretzel/a &&
-	git -C pretzel add a &&
-	git -C pretzel commit -m "add a file" -- a &&
-	git submodule add ./pretzel sub &&
-	git commit -a -m "add submodule" &&
-	git submodule deinit --all
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6134-pathspec-in-submodule/pretzel/.git/
-[master (root-commit) 5377efb] add a file
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 a
-Cloning into '/build/git-2.20.1/t/trash directory.t6134-pathspec-in-submodule/sub'...
-done.
-[master (root-commit) 1ebd30c] add submodule
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
-Cleared directory 'sub'
-Submodule 'sub' (./pretzel) unregistered for path 'sub'
-ok 1 - setup a submodule
-
-expecting success: 
-	echo a >sub/a &&
-	test_must_fail git add sub/a 2>actual &&
-	test_i18ncmp expect actual
-
-ok 2 - error message for path inside submodule
-
-expecting success: 
-	test_must_fail git -C sub add . 2>actual &&
-	test_i18ngrep "in unpopulated submodule" actual
-
-fatal: in unpopulated submodule 'sub'
-ok 3 - error message for path inside submodule from within submodule
-
-# passed all 3 test(s)
-1..3
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
 *** t6132-pathspec-exclude.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6132-pathspec-exclude/.git/
 expecting success: 
@@ -236443,32 +236668,32 @@
 EOF
 	test_cmp expect actual
 
-[master (root-commit) ac3607c] file
+[master (root-commit) 43a96ec] file
  Author: A U Thor <author@example.com>
  1 file changed, 0 insertions(+), 0 deletions(-)
  create mode 100644 file
 sub/file
-[master 086d8ff] sub/file
+[master 58ba987] sub/file
  Author: A U Thor <author@example.com>
  1 file changed, 0 insertions(+), 0 deletions(-)
  create mode 100644 sub/file
 sub/sub/file
-[master 9f23100] sub/sub/file
+[master e4edebc] sub/sub/file
  Author: A U Thor <author@example.com>
  1 file changed, 0 insertions(+), 0 deletions(-)
  create mode 100644 sub/sub/file
 sub/file2
-[master 9ea4ab0] sub/file2
+[master 116f947] sub/file2
  Author: A U Thor <author@example.com>
  1 file changed, 0 insertions(+), 0 deletions(-)
  create mode 100644 sub/file2
 sub/sub/sub/file
-[master 6c6ce5e] sub/sub/sub/file
+[master 34f96e4] sub/sub/sub/file
  Author: A U Thor <author@example.com>
  1 file changed, 0 insertions(+), 0 deletions(-)
  create mode 100644 sub/sub/sub/file
 sub2/file
-[master 271211f] sub2/file
+[master 90a0300] sub2/file
  Author: A U Thor <author@example.com>
  1 file changed, 0 insertions(+), 0 deletions(-)
  create mode 100644 sub2/file
@@ -236676,7 +236901,7 @@
 	)
 
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6132-pathspec-exclude/case8/.git/
-[master (root-commit) 63e39b2] twofiles
+[master (root-commit) 64b219e] twofiles
  Author: A U Thor <author@example.com>
  2 files changed, 2 insertions(+)
  create mode 100644 file1
@@ -236687,6 +236912,109 @@
 1..18
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
+*** t6301-for-each-ref-errors.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6301-for-each-ref-errors/.git/
+expecting success: 
+	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) 1141a98] Initial
+ Author: A U Thor <author@example.com>
+ok 1 - setup
+
+expecting success: 
+	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_i18ncmp full-list out &&
+	test_i18ncmp broken-err err
+
+ok 2 - Broken refs are reported correctly
+
+expecting success: 
+	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_i18ncmp zeros-err err &&
+	git for-each-ref --format="%(objectname) %(refname)" >brief-out 2>brief-err &&
+	test_cmp brief-list brief-out &&
+	test_i18ncmp zeros-err brief-err
+
+ok 3 - NULL_SHA1 refs are reported correctly
+
+expecting success: 
+	r=refs/heads/missing &&
+	echo $MISSING >.git/$r &&
+	test_when_finished "rm -f .git/$r" &&
+	echo "fatal: missing object $MISSING for $r" >missing-err &&
+	test_must_fail git for-each-ref 2>err &&
+	test_i18ncmp missing-err err &&
+	(
+		cat brief-list &&
+		echo "$MISSING $r"
+	) | 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
+
+# passed all 4 test(s)
+1..4
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t6134-pathspec-in-submodule.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6134-pathspec-in-submodule/.git/
+expecting success: 
+	test_create_repo pretzel &&
+	: >pretzel/a &&
+	git -C pretzel add a &&
+	git -C pretzel commit -m "add a file" -- a &&
+	git submodule add ./pretzel sub &&
+	git commit -a -m "add submodule" &&
+	git submodule deinit --all
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6134-pathspec-in-submodule/pretzel/.git/
+[master (root-commit) 8d5b24b] add a file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 a
+Cloning into '/build/git-2.20.1/t/trash directory.t6134-pathspec-in-submodule/sub'...
+done.
+[master (root-commit) 5fbfd12] add submodule
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+Cleared directory 'sub'
+Submodule 'sub' (./pretzel) unregistered for path 'sub'
+ok 1 - setup a submodule
+
+expecting success: 
+	echo a >sub/a &&
+	test_must_fail git add sub/a 2>actual &&
+	test_i18ncmp expect actual
+
+ok 2 - error message for path inside submodule
+
+expecting success: 
+	test_must_fail git -C sub add . 2>actual &&
+	test_i18ngrep "in unpopulated submodule" actual
+
+fatal: in unpopulated submodule 'sub'
+ok 3 - error message for path inside submodule from within submodule
+
+# passed all 3 test(s)
+1..3
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
 *** t6050-replace.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6050-replace/.git/
 expecting success: 
@@ -237410,64 +237738,6 @@
 1..35
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t6301-for-each-ref-errors.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6301-for-each-ref-errors/.git/
-expecting success: 
-	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) ea70eed] Initial
- Author: A U Thor <author@example.com>
-ok 1 - setup
-
-expecting success: 
-	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_i18ncmp full-list out &&
-	test_i18ncmp broken-err err
-
-ok 2 - Broken refs are reported correctly
-
-expecting success: 
-	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_i18ncmp zeros-err err &&
-	git for-each-ref --format="%(objectname) %(refname)" >brief-out 2>brief-err &&
-	test_cmp brief-list brief-out &&
-	test_i18ncmp zeros-err brief-err
-
-ok 3 - NULL_SHA1 refs are reported correctly
-
-expecting success: 
-	r=refs/heads/missing &&
-	echo $MISSING >.git/$r &&
-	test_when_finished "rm -f .git/$r" &&
-	echo "fatal: missing object $MISSING for $r" >missing-err &&
-	test_must_fail git for-each-ref 2>err &&
-	test_i18ncmp missing-err err &&
-	(
-		cat brief-list &&
-		echo "$MISSING $r"
-	) | 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
-
-# passed all 4 test(s)
-1..4
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
 *** t6135-pathspec-with-attrs.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6135-pathspec-with-attrs/.git/
 expecting success: 
@@ -237505,7 +237775,7 @@
 	git ls-files >actual &&
 	test_cmp expect actual
 
-[master (root-commit) 06a51e0] initial commit
+[master (root-commit) b008d0e] initial commit
  Author: A U Thor <author@example.com>
  22 files changed, 0 insertions(+), 0 deletions(-)
  create mode 100644 fileA
@@ -237563,7 +237833,7 @@
 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
-[master fc03afb] add attributes
+[master 7de72d4] add attributes
  Author: A U Thor <author@example.com>
  1 file changed, 10 insertions(+)
  create mode 100644 .gitattributes
@@ -239294,7 +239564,7 @@
 Merge made by the 'recursive' strategy.
  a | 1 +
  1 file changed, 1 insertion(+)
-HEAD is now at 9149d9d Merge commit 'E3^0' into HEAD
+HEAD is now at 0a58686 Merge commit 'E3^0' into HEAD
 ok 15 - merge of D1 & E3 succeeds
 
 expecting success: 
@@ -239324,12 +239594,12 @@
 Warning: you are leaving 1 commit behind, not connected to
 any of your branches:
 
-  9149d9d Merge commit 'E3^0' into HEAD
+  0a58686 Merge commit 'E3^0' into HEAD
 
 If you want to keep it by creating a new branch, this may be a good time
 to do so with:
 
- git branch <new-branch-name> 9149d9d
+ git branch <new-branch-name> 0a58686
 
 HEAD is now at c17d257 D1
 Merging:
@@ -239393,7 +239663,7 @@
  a2 | 1 +
  1 file changed, 1 insertion(+)
 test_must_fail: command succeeded: git merge -s recursive E4^0
-HEAD is now at d64b3b0 Merge commit 'E4^0' into HEAD
+HEAD is now at 2b4f83e Merge commit 'E4^0' into HEAD
 not ok 17 - merge of D2 & E4 merges a2s & reports conflict for a/file # TODO known breakage
 
 expecting success: 
@@ -239432,25 +239702,25 @@
 	)
 
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6036-recursive-corner-cases/rename-squared-squared/.git/
-[master (root-commit) 3f5ccf8] A
+[master (root-commit) 77ecfe6] A
  Author: A U Thor <author@example.com>
  1 file changed, 6 insertions(+)
  create mode 100644 a
 Switched to a new branch 'B'
-[B 0ac8119] B
+[B cc90bd9] B
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  rename a => b (85%)
 Switched to a new branch 'C'
-[C da012d5] C
+[C 56fed6d] C
  Author: A U Thor <author@example.com>
  1 file changed, 0 insertions(+), 0 deletions(-)
  rename a => c (100%)
 Automatic merge went well; stopped before committing as requested
-[detached HEAD ba2cddb] Merge commit C^0 into HEAD
+[detached HEAD 83c3c9a] Merge commit C^0 into HEAD
  Author: A U Thor <author@example.com>
 Automatic merge went well; stopped before committing as requested
-[detached HEAD d8e15d9] Merge commit B^0 into HEAD
+[detached HEAD 097eeb4] Merge commit B^0 into HEAD
  Author: A U Thor <author@example.com>
 ok 18 - setup rename/rename(1to2)/modify followed by what looks like rename/rename(2to1)/modify
 
@@ -239472,20 +239742,20 @@
 		test $(git rev-parse HEAD:newname) = $(git rev-parse E:newname)
 	)
 
-Previous HEAD position was d8e15d9 Merge commit B^0 into HEAD
-HEAD is now at ba2cddb Merge commit C^0 into HEAD
+Previous HEAD position was 097eeb4 Merge commit B^0 into HEAD
+HEAD is now at 83c3c9a Merge commit C^0 into HEAD
 Merging:
-ba2cddb Merge commit C^0 into HEAD
+83c3c9a Merge commit C^0 into HEAD
 virtual E^0
 found 2 common ancestors:
-0ac8119 B
-da012d5 C
+56fed6d C
+cc90bd9 B
   Merging:
-  0ac8119 B
-  da012d5 C
+  56fed6d C
+  cc90bd9 B
   found 1 common ancestor:
-  3f5ccf8 A
-  CONFLICT (rename/rename): Rename "a"->"b" in branch "Temporary merge branch 1" rename "a"->"c" in "Temporary merge branch 2" (left unresolved)
+  77ecfe6 A
+  CONFLICT (rename/rename): Rename "a"->"c" in branch "Temporary merge branch 1" rename "a"->"b" in "Temporary merge branch 2" (left unresolved)
 Merge made by the 'recursive' strategy.
  newname | 1 +
  1 file changed, 1 insertion(+)
@@ -239532,17 +239802,17 @@
 	)
 
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6036-recursive-corner-cases/rename-rename-add-source/.git/
-[master (root-commit) eb0a7cb] A
+[master (root-commit) aa6ed69] A
  Author: A U Thor <author@example.com>
  1 file changed, 5 insertions(+)
  create mode 100644 a
 Switched to a new branch 'B'
-[B 21b7b4d] B
+[B 4186b17] B
  Author: A U Thor <author@example.com>
  1 file changed, 0 insertions(+), 0 deletions(-)
  rename a => b (100%)
 Switched to a new branch 'C'
-[C 69537d8] C
+[C 3e2777c] C
  Author: A U Thor <author@example.com>
  2 files changed, 11 insertions(+), 5 deletions(-)
  create mode 100644 c
@@ -239557,14 +239827,14 @@
 
   git checkout -b <new-branch-name>
 
-HEAD is now at 21b7b4d B
+HEAD is now at 4186b17 B
 Automatic merge went well; stopped before committing as requested
-[detached HEAD 0660991] Merge commit C^0 into HEAD
+[detached HEAD 8de060b] Merge commit C^0 into HEAD
  Author: A U Thor <author@example.com>
-Previous HEAD position was 0660991 Merge commit C^0 into HEAD
-HEAD is now at 69537d8 C
+Previous HEAD position was 8de060b Merge commit C^0 into HEAD
+HEAD is now at 3e2777c C
 Automatic merge went well; stopped before committing as requested
-[detached HEAD 5587030] Merge commit B^0 into HEAD
+[detached HEAD 65a3086] Merge commit B^0 into HEAD
  Author: A U Thor <author@example.com>
 ok 20 - setup criss-cross + rename/rename/add-source + modify/modify
 
@@ -239594,19 +239864,19 @@
 		test_cmp expect actual
 	)
 
-Previous HEAD position was 5587030 Merge commit B^0 into HEAD
-HEAD is now at 0660991 Merge commit C^0 into HEAD
+Previous HEAD position was 65a3086 Merge commit B^0 into HEAD
+HEAD is now at 8de060b Merge commit C^0 into HEAD
 Merging:
-0660991 Merge commit C^0 into HEAD
+8de060b Merge commit C^0 into HEAD
 virtual E^0
 found 2 common ancestors:
-69537d8 C
-21b7b4d B
+3e2777c C
+4186b17 B
   Merging:
-  69537d8 C
-  21b7b4d B
+  3e2777c C
+  4186b17 B
   found 1 common ancestor:
-  eb0a7cb A
+  aa6ed69 A
 Auto-merging a
 CONFLICT (add/add): Merge conflict in a
 Automatic merge failed; fix conflicts and then commit the result.
@@ -239648,18 +239918,18 @@
 	)
 
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6036-recursive-corner-cases/rename-rename-add-dest/.git/
-[master (root-commit) ea07c7d] A
+[master (root-commit) 40e2657] A
  Author: A U Thor <author@example.com>
  1 file changed, 0 insertions(+), 0 deletions(-)
  create mode 100644 a
 Switched to a new branch 'B'
-[B 56b1c54] B
+[B f2bda00] B
  Author: A U Thor <author@example.com>
  2 files changed, 7 insertions(+)
  rename a => b (100%)
  create mode 100644 c
 Switched to a new branch 'C'
-[C 9fa4a99] C
+[C 24e1457] C
  Author: A U Thor <author@example.com>
  1 file changed, 0 insertions(+), 0 deletions(-)
  rename a => c (100%)
@@ -239674,14 +239944,14 @@
 
   git checkout -b <new-branch-name>
 
-HEAD is now at 56b1c54 B
+HEAD is now at f2bda00 B
 Automatic merge went well; stopped before committing as requested
-[detached HEAD e7b563f] D is like B but renames b back to a
+[detached HEAD 7ebde0b] D is like B but renames b back to a
  Author: A U Thor <author@example.com>
-Previous HEAD position was e7b563f D is like B but renames b back to a
-HEAD is now at 56b1c54 B
+Previous HEAD position was 7ebde0b D is like B but renames b back to a
+HEAD is now at f2bda00 B
 Automatic merge went well; stopped before committing as requested
-[detached HEAD ff398b3] E like D but has mod in c
+[detached HEAD a8ea2ff] E like D but has mod in c
  Author: A U Thor <author@example.com>
 ok 22 - setup criss-cross+rename/rename/add-dest + simple modify
 
@@ -239707,19 +239977,19 @@
 		test_cmp expect actual
 	)
 
-Previous HEAD position was ff398b3 E like D but has mod in c
-HEAD is now at e7b563f D is like B but renames b back to a
+Previous HEAD position was a8ea2ff E like D but has mod in c
+HEAD is now at 7ebde0b D is like B but renames b back to a
 Merging:
-e7b563f D is like B but renames b back to a
+7ebde0b D is like B but renames b back to a
 virtual E^0
 found 2 common ancestors:
-9fa4a99 C
-56b1c54 B
+24e1457 C
+f2bda00 B
   Merging:
-  9fa4a99 C
-  56b1c54 B
+  24e1457 C
+  f2bda00 B
   found 1 common ancestor:
-  ea07c7d A
+  40e2657 A
   Auto-merging c
 Merge made by the 'recursive' strategy.
  c | 1 +
@@ -239766,18 +240036,18 @@
 
 )
 prerequisite SYMLINKS ok
-[master (root-commit) c71d0d0] A
+[master (root-commit) e6d61d2] A
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 120000 fickle
 Switched to a new branch 'B'
 rm 'fickle'
-[B 71bc3ae] B
+[B 5655a1f] B
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 Switched to a new branch 'C'
 rm 'fickle'
-[C 5418c41] C
+[C bb19260] C
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 Merge made by the 'ours' strategy.
@@ -239800,19 +240070,19 @@
 		test_line_count = 1 out
 	)
 
-Previous HEAD position was c442fc4 E
-HEAD is now at 21a3cf4 D
+Previous HEAD position was b313e97 E
+HEAD is now at a04bfa4 D
 Merging:
-21a3cf4 D
+a04bfa4 D
 virtual E^0
 found 2 common ancestors:
-5418c41 C
-71bc3ae B
+bb19260 C
+5655a1f B
   Merging:
-  5418c41 C
-  71bc3ae B
+  bb19260 C
+  5655a1f B
   found 1 common ancestor:
-  c71d0d0 A
+  e6d61d2 A
   Auto-merging fickle
   CONFLICT (content): Merge conflict in fickle
 Already up to date!
@@ -239849,7 +240119,7 @@
 	)
 
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6036-recursive-corner-cases/symlink-add-add/.git/
-[master (root-commit) 1962548] A
+[master (root-commit) 1c084da] A
  Author: A U Thor <author@example.com>
  1 file changed, 0 insertions(+), 0 deletions(-)
  create mode 100644 ignoreme
@@ -239864,12 +240134,12 @@
 
 )
 prerequisite SYMLINKS ok
-[B 2eaa5c5] B
+[B 1358833] B
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 120000 fickle
 Switched to a new branch 'C'
-[C 2566952] C
+[C a68c7d5] C
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 120000 fickle
@@ -239893,19 +240163,19 @@
 		test_line_count = 1 out
 	)
 
-Previous HEAD position was 5cca9ec E
-HEAD is now at e9dfe58 D
+Previous HEAD position was 729e109 E
+HEAD is now at 419da76 D
 Merging:
-e9dfe58 D
+419da76 D
 virtual E^0
 found 2 common ancestors:
-2566952 C
-2eaa5c5 B
+a68c7d5 C
+1358833 B
   Merging:
-  2566952 C
-  2eaa5c5 B
+  a68c7d5 C
+  1358833 B
   found 1 common ancestor:
-  1962548 A
+  1c084da A
   Auto-merging fickle
   CONFLICT (add/add): Merge conflict in fickle
 Already up to date!
@@ -239965,21 +240235,21 @@
 
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6036-recursive-corner-cases/submodule-modify-modify/.git/
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6036-recursive-corner-cases/submodule-modify-modify/submod/.git/
-[master (root-commit) 64023f2] A
+[master (root-commit) 5156713] A
  Author: A U Thor <author@example.com>
  1 file changed, 0 insertions(+), 0 deletions(-)
  create mode 100644 file-A
 Switched to a new branch 'B'
-[B a94baad] B
+[B 3b86662] B
  Author: A U Thor <author@example.com>
  1 file changed, 0 insertions(+), 0 deletions(-)
  create mode 100644 file-B
 Switched to a new branch 'C'
-[C b371d6f] C
+[C ccaa63a] C
  Author: A U Thor <author@example.com>
  1 file changed, 0 insertions(+), 0 deletions(-)
  create mode 100644 file-C
-HEAD is now at 64023f2 A
+HEAD is now at 5156713 A
 warning: adding embedded git repository: submod
 hint: You've added another git repository inside your current repository.
 hint: Clones of the outer repository will not contain the contents of
@@ -239994,23 +240264,23 @@
 hint: 	git rm --cached submod
 hint: 
 hint: See "git help submodule" for more information.
-[master (root-commit) f2c908f] A
+[master (root-commit) 7b4e060] A
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 160000 submod
 Switched to a new branch 'B'
 warning: refname 'B' is ambiguous.
 warning: refname 'B' is ambiguous.
-HEAD is now at a94baad B
-[B 22ec8c9] B
+HEAD is now at 3b86662 B
+[B d3b8da0] B
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 Switched to a new branch 'C'
 M	submod
 warning: refname 'C' is ambiguous.
 warning: refname 'C' is ambiguous.
-HEAD is now at b371d6f C
-[C 7193f1c] C
+HEAD is now at ccaa63a C
+[C 433709a] C
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 Merge made by the 'ours' strategy.
@@ -240033,20 +240303,20 @@
 		test_line_count = 1 out
 	)
 
-Previous HEAD position was cee8bf2 E
-HEAD is now at b13d00d D
+Previous HEAD position was 66022b8 E
+HEAD is now at a59c621 D
 M	submod
 Merging:
-b13d00d D
+a59c621 D
 virtual E^0
 found 2 common ancestors:
-7193f1c C
-22ec8c9 B
+433709a C
+d3b8da0 B
   Merging:
-  7193f1c C
-  22ec8c9 B
+  433709a C
+  d3b8da0 B
   found 1 common ancestor:
-  f2c908f A
+  7b4e060 A
   Auto-merging submod
   CONFLICT (submodule): Merge conflict in submod
 Already up to date!
@@ -240106,28 +240376,28 @@
 
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6036-recursive-corner-cases/submodule-add-add/.git/
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6036-recursive-corner-cases/submodule-add-add/submod/.git/
-[master (root-commit) 25ce080] A
+[master (root-commit) 0fd2682] A
  Author: A U Thor <author@example.com>
  1 file changed, 0 insertions(+), 0 deletions(-)
  create mode 100644 file-A
 Switched to a new branch 'B'
-[B aac067e] B
+[B 414c1f5] B
  Author: A U Thor <author@example.com>
  1 file changed, 0 insertions(+), 0 deletions(-)
  create mode 100644 file-B
 Switched to a new branch 'C'
-[C 8db8916] C
+[C 21c9085] C
  Author: A U Thor <author@example.com>
  1 file changed, 0 insertions(+), 0 deletions(-)
  create mode 100644 file-C
-[master (root-commit) 9018ba3] A
+[master (root-commit) 6d01077] A
  Author: A U Thor <author@example.com>
  1 file changed, 0 insertions(+), 0 deletions(-)
  create mode 100644 irrelevant-file
 Switched to a new branch 'B'
 warning: refname 'B' is ambiguous.
 warning: refname 'B' is ambiguous.
-HEAD is now at aac067e B
+HEAD is now at 414c1f5 B
 warning: adding embedded git repository: submod
 hint: You've added another git repository inside your current repository.
 hint: Clones of the outer repository will not contain the contents of
@@ -240142,7 +240412,7 @@
 hint: 	git rm --cached submod
 hint: 
 hint: See "git help submodule" for more information.
-[B 9e953c1] B
+[B f7b47e3] B
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 160000 submod
@@ -240150,7 +240420,7 @@
 Switched to a new branch 'C'
 warning: refname 'C' is ambiguous.
 warning: refname 'C' is ambiguous.
-HEAD is now at 8db8916 C
+HEAD is now at 21c9085 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
@@ -240165,7 +240435,7 @@
 hint: 	git rm --cached submod
 hint: 
 hint: See "git help submodule" for more information.
-[C dc05dac] C
+[C 0fa20fe] C
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 160000 submod
@@ -240189,20 +240459,20 @@
 		test_line_count = 1 out
 	)
 
-Previous HEAD position was 2a680cf E
-HEAD is now at c97db73 D
+Previous HEAD position was a6de746 E
+HEAD is now at 267c402 D
 M	submod
 Merging:
-c97db73 D
+267c402 D
 virtual E^0
 found 2 common ancestors:
-dc05dac C
-9e953c1 B
+0fa20fe C
+f7b47e3 B
   Merging:
-  dc05dac C
-  9e953c1 B
+  0fa20fe C
+  f7b47e3 B
   found 1 common ancestor:
-  9018ba3 A
+  6d01077 A
   Auto-merging submod
   CONFLICT (submodule): Merge conflict in submod
 Already up to date!
@@ -240250,16 +240520,16 @@
 
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6036-recursive-corner-cases/submodule-symlink-add-add/.git/
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6036-recursive-corner-cases/submodule-symlink-add-add/path/.git/
-[master (root-commit) ba1df34] B
+[master (root-commit) 4851b7b] B
  Author: A U Thor <author@example.com>
  1 file changed, 0 insertions(+), 0 deletions(-)
  create mode 100644 file-B
-[master (root-commit) 9018ba3] A
+[master (root-commit) 6d01077] 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 ba1df34 B
+HEAD is now at 4851b7b 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
@@ -240274,7 +240544,7 @@
 hint: 	git rm --cached path
 hint: 
 hint: See "git help submodule" for more information.
-[B e615d4e] B
+[B f387dbc] B
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 160000 path
@@ -240290,7 +240560,7 @@
 
 )
 prerequisite SYMLINKS ok
-[C f8d2ebe] C
+[C 70b5a16] C
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 120000 path
@@ -240314,22 +240584,24 @@
 		test_line_count = 1 out
 	)
 
-Previous HEAD position was 861ade4 E
-HEAD is now at a56450f D
+Previous HEAD position was 30293c2 E
+HEAD is now at b5d3e36 D
 Merging:
-a56450f D
+b5d3e36 D
 virtual E^0
 found 2 common ancestors:
-e615d4e B
-f8d2ebe C
+70b5a16 C
+f387dbc B
   Merging:
-  e615d4e B
-  f8d2ebe C
+  70b5a16 C
+  f387dbc B
   found 1 common ancestor:
-  9018ba3 A
-  CONFLICT (add/add): Merge conflict in path
-Already up to date!
+  6d01077 A
+  CONFLICT (submodule): Merge conflict in path
 Merge made by the 'recursive' strategy.
+ path | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ mode change 160000 => 120000 path
 test_must_fail: command succeeded: git merge -s recursive E^0
 not ok 33 - check conflicting entry types (submodule vs symlink) # TODO known breakage
 
@@ -240364,17 +240636,17 @@
 	)
 
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6036-recursive-corner-cases/regular-file-mode-conflict/.git/
-[master (root-commit) 3469dbd] A
+[master (root-commit) 6d01077] 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 64367a7] B
+[B 107a26e] 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 62055b0] C
+[C 2a8fc7a] C
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100755 source_me.bash
@@ -240398,19 +240670,19 @@
 		test_line_count = 1 out
 	)
 
-Previous HEAD position was da98d80 E
-HEAD is now at b7e583f D
+Previous HEAD position was 6a7e3dd E
+HEAD is now at 4af25ce D
 Merging:
-b7e583f D
+4af25ce D
 virtual E^0
 found 2 common ancestors:
-62055b0 C
-64367a7 B
+2a8fc7a C
+107a26e B
   Merging:
-  62055b0 C
-  64367a7 B
+  2a8fc7a C
+  107a26e B
   found 1 common ancestor:
-  3469dbd A
+  6d01077 A
   Auto-merging source_me.bash
   CONFLICT (add/add): Merge conflict in source_me.bash
 Already up to date!
@@ -241008,12 +241280,12 @@
 expecting success: 
 		test-tool chmtime --get -86400 $(find .git/objects -type f)
 	
-1638421755
-1638421755
-1638421755
-1638421755
-1638421755
-1638421755
+1672832978
+1672832978
+1672832978
+1672832978
+1672832978
+1672832978
 ok 5 - simulate time passing (loose)
 
 expecting success: 
@@ -241049,13 +241321,13 @@
 		test-tool chmtime --get -86400 $(find .git/objects -type f)
 	
 HEAD is now at 8539479 base
-1638421756
-1638421756
-1638421756
-1638421756
-1638421756
-1638421756
-1638421756
+1672832978
+1672832978
+1672832978
+1672832978
+1672832978
+1672832978
+1672832978
 ok 10 - abandon objects again (loose)
 
 expecting success: 
@@ -241122,9 +241394,9 @@
 expecting success: 
 		test-tool chmtime --get -86400 $(find .git/objects -type f)
 	
-1638421756
-1638421756
-1638421756
+1672832978
+1672832978
+1672832978
 ok 18 - simulate time passing (repack)
 
 expecting success: 
@@ -241161,15 +241433,15 @@
 		test-tool chmtime --get -86400 $(find .git/objects -type f)
 	
 HEAD is now at aa8ecd7 base
-1638421756
-1638421756
-1638421756
-1638421756
-1638421756
-1638421756
-1638421756
-1638421756
-1638421756
+1672832979
+1672832979
+1672832979
+1672832979
+1672832979
+1672832978
+1672832979
+1672832979
+1672832979
 ok 23 - abandon objects again (repack)
 
 expecting success: 
@@ -241763,7 +242035,7 @@
 error: Could not read object 3b18e512dba79e4c8300dd08aeb37f8e728b8dad
 tag foo-tag
 Tagger: C O Mitter <committer@example.com>
-Date:   Fri Dec 3 05:09:17 2021 +0000
+Date:   Thu Jan 5 11:49:39 2023 +0000
 
 Tags 3b18e512dba79e4c8300dd08aeb37f8e728b8dad
 ok 2 - showing a tag that point at a missing object
@@ -241928,839 +242200,6 @@
 1..14
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t6200-fmt-merge-msg.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6200-fmt-merge-msg/.git/
-expecting success: 
-	echo one >one &&
-	git add one &&
-	test_tick &&
-	git commit -m "Initial" &&
-
-	git clone . remote &&
-
-	echo uno >one &&
-	echo dos >two &&
-	git add two &&
-	test_tick &&
-	git commit -a -m "Second" &&
-
-	git checkout -b left &&
-
-	echo "c1" >one &&
-	test_tick &&
-	git commit -a -m "Common #1" &&
-
-	echo "c2" >one &&
-	test_tick &&
-	git commit -a -m "Common #2" &&
-
-	git branch right &&
-
-	echo "l3" >two &&
-	test_tick &&
-	GIT_COMMITTER_NAME="Another Committer" \
-	GIT_AUTHOR_NAME="Another Author" git commit -a -m "Left #3" &&
-
-	echo "l4" >two &&
-	test_tick &&
-	GIT_COMMITTER_NAME="Another Committer" \
-	GIT_AUTHOR_NAME="Another Author" git commit -a -m "Left #4" &&
-
-	echo "l5" >two &&
-	test_tick &&
-	GIT_COMMITTER_NAME="Another Committer" \
-	GIT_AUTHOR_NAME="Another Author" git commit -a -m "Left #5" &&
-	git tag tag-l5 &&
-
-	git checkout right &&
-
-	echo "r3" >three &&
-	git add three &&
-	test_tick &&
-	git commit -a -m "Right #3" &&
-	git tag tag-r3 &&
-
-	echo "r4" >three &&
-	test_tick &&
-	git commit -a -m "Right #4" &&
-
-	echo "r5" >three &&
-	test_tick &&
-	git commit -a -m "Right #5" &&
-
-	git checkout -b long &&
-	i=0 &&
-	while test $i -lt 30
-	do
-		test_commit $i one &&
-		i=$(($i+1))
-	done &&
-
-	git show-branch &&
-
-	apos="'"
-
-[master (root-commit) 883c9d3] Initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one
-Cloning into 'remote'...
-done.
-[master 2935695] Second
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+), 1 deletion(-)
- create mode 100644 two
-Switched to a new branch 'left'
-[left b86daf8] Common #1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[left 9f2fd7e] Common #2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[left 5b6ed2c] Left #3
- Author: Another Author <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[left e382d03] Left #4
- Author: Another Author <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[left 558a9dc] Left #5
- Author: Another Author <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to branch 'right'
-[right 00c8e89] Right #3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 three
-[right ef8635d] Right #4
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[right 2d2f597] Right #5
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'long'
-[long d6a0cbe] 0
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[long e56a64b] 1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[long 8fc7bcd] 2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[long b5605fc] 3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[long 35000b2] 4
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[long 3c4f1c6] 5
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[long bf0bc37] 6
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[long e0e9a85] 7
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[long eb8c9f5] 8
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[long 99409c7] 9
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[long 0ce96e0] 10
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[long 8377914] 11
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[long 85798ed] 12
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[long f75d7f4] 13
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[long f56cc6e] 14
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[long 3dc0dbd] 15
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[long 56d0ffb] 16
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[long 4c19426] 17
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[long 5342a39] 18
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[long 0753e7e] 19
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[long 72baa93] 20
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[long 494d039] 21
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[long 543e615] 22
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[long 41d12df] 23
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[long 8b77407] 24
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[long 12fecbe] 25
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[long f709339] 26
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[long c90ce26] 27
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[long cf03e3f] 28
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[long f343514] 29
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-! [left] Left #5
- * [long] 29
-  ! [master] Second
-   ! [right] Right #5
-----
- *   [long] 29
- *   [long^] 28
- *   [long~2] 27
- *   [long~3] 26
- *   [long~4] 25
- *   [long~5] 24
- *   [long~6] 23
- *   [long~7] 22
- *   [long~8] 21
- *   [long~9] 20
- *   [long~10] 19
- *   [long~11] 18
- *   [long~12] 17
- *   [long~13] 16
- *   [long~14] 15
- *   [long~15] 14
- *   [long~16] 13
- *   [long~17] 12
- *   [long~18] 11
- *   [long~19] 10
- *   [long~20] 9
- *   [long~21] 8
- *   [long~22] 7
- *   [long~23] 6
- *   [long~24] 5
- *   [long~25] 4
- *   [long~26] 3
- *   [long~27] 2
- *   [long~28] 1
- *   [long~29] 0
- * + [right] Right #5
- * + [right^] Right #4
- * + [right~2] Right #3
-+    [left] Left #5
-+    [left^] Left #4
-+    [left~2] Left #3
-+* + [right~3] Common #2
-+* + [right~4] Common #1
-+*++ [master] Second
-ok 1 - setup
-
-expecting success: 
-	echo "Merge branch ${apos}left${apos}" >expected &&
-
-	git checkout master &&
-	git fetch . left &&
-
-	git fmt-merge-msg <.git/FETCH_HEAD >actual &&
-	test_cmp expected actual
-
-Switched to branch 'master'
-From .
- * branch            left       -> FETCH_HEAD
-ok 2 - message for merging local branch
-
-expecting success: 
-	echo "Merge branch ${apos}left${apos} of $(pwd)" >expected &&
-
-	git checkout master &&
-	git fetch "$(pwd)" left &&
-
-	git fmt-merge-msg <.git/FETCH_HEAD >actual &&
-	test_cmp expected actual
-
-Already on 'master'
-From /build/git-2.20.1/t/trash directory.t6200-fmt-merge-msg
- * branch            left       -> FETCH_HEAD
-ok 3 - message for merging external branch
-
-expecting success: 
-	cat >expected <<-EOF &&
-	Merge branch ${apos}left${apos}
-
-	# By Another Author (3) and A U Thor (2)
-	# Via Another Committer
-	* left:
-	  Left #5
-	  Left #4
-	  Left #3
-	  Common #2
-	  Common #1
-	EOF
-
-	test_config merge.log true &&
-	test_unconfig merge.summary &&
-
-	git checkout master &&
-	test_tick &&
-	git fetch . left &&
-
-	git fmt-merge-msg <.git/FETCH_HEAD >actual1 &&
-
-	test_unconfig merge.log &&
-	test_config merge.summary true &&
-
-	git checkout master &&
-	test_tick &&
-	git fetch . left &&
-
-	git fmt-merge-msg <.git/FETCH_HEAD >actual2 &&
-
-	test_cmp expected actual1 &&
-	test_cmp expected actual2
-
-Already on 'master'
-From .
- * branch            left       -> FETCH_HEAD
-Already on 'master'
-From .
- * branch            left       -> FETCH_HEAD
-ok 4 - [merge] summary/log configuration
-
-expecting success: 
-	git checkout master &&
-	test_tick &&
-	git fetch . left
-
-Already on 'master'
-From .
- * branch            left       -> FETCH_HEAD
-ok 5 - setup FETCH_HEAD
-
-expecting success: 
-	cat >expected <<-EOF &&
-	Merge branch ${apos}left${apos}
-
-	# By Another Author (3) and A U Thor (2)
-	# Via Another Committer
-	* left: (5 commits)
-	  Left #5
-	  Left #4
-	  Left #3
-	  ...
-	EOF
-
-	git -c merge.log=3 fmt-merge-msg <.git/FETCH_HEAD >actual &&
-	test_cmp expected actual
-
-ok 6 - merge.log=3 limits shortlog length
-
-expecting success: 
-	cat >expected <<-EOF &&
-	Merge branch ${apos}left${apos}
-
-	# By Another Author (3) and A U Thor (2)
-	# Via Another Committer
-	* left:
-	  Left #5
-	  Left #4
-	  Left #3
-	  Common #2
-	  Common #1
-	EOF
-
-	git -c merge.log=5 fmt-merge-msg <.git/FETCH_HEAD >actual &&
-	test_cmp expected actual
-
-ok 7 - merge.log=5 shows all 5 commits
-
-expecting success: 
-	cat >expected <<-EOF &&
-	Merge branch ${apos}left${apos}
-
-	x By Another Author (3) and A U Thor (2)
-	x Via Another Committer
-	* left:
-	  Left #5
-	  Left #4
-	  Left #3
-	  Common #2
-	  Common #1
-	EOF
-
-	git -c core.commentchar="x" fmt-merge-msg --log=5 <.git/FETCH_HEAD >actual &&
-	test_cmp expected actual
-
-ok 8 - --log=5 with custom comment character
-
-expecting success: 
-	echo "Merge branch ${apos}left${apos}" >expected &&
-	git -c merge.log=0 fmt-merge-msg <.git/FETCH_HEAD >actual &&
-	test_cmp expected actual
-
-ok 9 - merge.log=0 disables shortlog
-
-expecting success: 
-	cat >expected <<-EOF &&
-	Merge branch ${apos}left${apos}
-
-	# By Another Author (3) and A U Thor (2)
-	# Via Another Committer
-	* left: (5 commits)
-	  Left #5
-	  Left #4
-	  Left #3
-	  ...
-	EOF
-
-	git fmt-merge-msg --log=3 <.git/FETCH_HEAD >actual &&
-	test_cmp expected actual
-
-ok 10 - --log=3 limits shortlog length
-
-expecting success: 
-	cat >expected <<-EOF &&
-	Merge branch ${apos}left${apos}
-
-	# By Another Author (3) and A U Thor (2)
-	# Via Another Committer
-	* left:
-	  Left #5
-	  Left #4
-	  Left #3
-	  Common #2
-	  Common #1
-	EOF
-
-	git fmt-merge-msg --log=5 <.git/FETCH_HEAD >actual &&
-	test_cmp expected actual
-
-ok 11 - --log=5 shows all 5 commits
-
-expecting success: 
-	echo "Merge branch ${apos}left${apos}" >expected &&
-	git fmt-merge-msg --no-log <.git/FETCH_HEAD >actual &&
-	test_cmp expected actual
-
-ok 12 - --no-log disables shortlog
-
-expecting success: 
-	echo "Merge branch ${apos}left${apos}" >expected &&
-	git fmt-merge-msg --no-log <.git/FETCH_HEAD >actual &&
-	test_cmp expected actual
-
-ok 13 - --log=0 disables shortlog
-
-expecting success: 
-	echo "Sync with left" >expected &&
-	cat >expected.log <<-EOF &&
-	Sync with left
-
-	# By Another Author (3) and A U Thor (2)
-	# Via Another Committer
-	* ${apos}left${apos} of $(pwd):
-	  Left #5
-	  Left #4
-	  Left #3
-	  Common #2
-	  Common #1
-	EOF
-
-	test_unconfig merge.log &&
-	test_unconfig merge.summary &&
-	git checkout master &&
-	git fetch "$(pwd)" left &&
-	git fmt-merge-msg -m "Sync with left" <.git/FETCH_HEAD >actual &&
-	git fmt-merge-msg --log -m "Sync with left" \
-					<.git/FETCH_HEAD >actual.log &&
-	test_config merge.log true &&
-	git fmt-merge-msg -m "Sync with left" \
-					<.git/FETCH_HEAD >actual.log-config &&
-	git fmt-merge-msg --no-log -m "Sync with left" \
-					<.git/FETCH_HEAD >actual.nolog &&
-
-	test_cmp expected actual &&
-	test_cmp expected.log actual.log &&
-	test_cmp expected.log actual.log-config &&
-	test_cmp expected actual.nolog
-
-Already on 'master'
-From /build/git-2.20.1/t/trash directory.t6200-fmt-merge-msg
- * branch            left       -> FETCH_HEAD
-ok 14 - fmt-merge-msg -m
-
-expecting success: 
-	cat >expected <<-EOF
-	Merge branches ${apos}left${apos} and ${apos}right${apos}
-
-	# By Another Author (3) and A U Thor (2)
-	# Via Another Committer
-	* left:
-	  Left #5
-	  Left #4
-	  Left #3
-	  Common #2
-	  Common #1
-
-	* right:
-	  Right #5
-	  Right #4
-	  Right #3
-	  Common #2
-	  Common #1
-	EOF
-
-ok 15 - setup: expected shortlog for two branches
-
-expecting success: 
-	test_config merge.log true &&
-	test_unconfig merge.summary &&
-	git checkout master &&
-	test_tick &&
-	git fetch . left right &&
-	git fmt-merge-msg <.git/FETCH_HEAD >actual1 &&
-
-	test_unconfig merge.log &&
-	test_config merge.summary true &&
-	git checkout master &&
-	test_tick &&
-	git fetch . left right &&
-	git fmt-merge-msg <.git/FETCH_HEAD >actual2 &&
-
-	test_config merge.log yes &&
-	test_unconfig merge.summary &&
-	git checkout master &&
-	test_tick &&
-	git fetch . left right &&
-	git fmt-merge-msg <.git/FETCH_HEAD >actual3 &&
-
-	test_unconfig merge.log &&
-	test_config merge.summary yes &&
-	git checkout master &&
-	test_tick &&
-	git fetch . left right &&
-	git fmt-merge-msg <.git/FETCH_HEAD >actual4 &&
-
-	test_cmp expected actual1 &&
-	test_cmp expected actual2 &&
-	test_cmp expected actual3 &&
-	test_cmp expected actual4
-
-Already on 'master'
-From .
- * branch            left       -> FETCH_HEAD
- * branch            right      -> FETCH_HEAD
-Already on 'master'
-From .
- * branch            left       -> FETCH_HEAD
- * branch            right      -> FETCH_HEAD
-Already on 'master'
-From .
- * branch            left       -> FETCH_HEAD
- * branch            right      -> FETCH_HEAD
-Already on 'master'
-From .
- * branch            left       -> FETCH_HEAD
- * branch            right      -> FETCH_HEAD
-ok 16 - shortlog for two branches
-
-expecting success: 
-	test_unconfig merge.log &&
-	test_config merge.summary yes &&
-	git checkout master &&
-	test_tick &&
-	git fetch . left right &&
-	git fmt-merge-msg -F .git/FETCH_HEAD >actual &&
-	test_cmp expected actual
-
-Already on 'master'
-From .
- * branch            left       -> FETCH_HEAD
- * branch            right      -> FETCH_HEAD
-ok 17 - merge-msg -F
-
-expecting success: 
-	test_unconfig merge.log &&
-	test_config merge.summary yes &&
-	git checkout master &&
-	test_tick &&
-	git fetch . left right &&
-	mkdir sub &&
-	cp .git/FETCH_HEAD sub/FETCH_HEAD &&
-	(
-		cd sub &&
-		git fmt-merge-msg -F FETCH_HEAD >../actual
-	) &&
-	test_cmp expected actual
-
-Already on 'master'
-From .
- * branch            left       -> FETCH_HEAD
- * branch            right      -> FETCH_HEAD
-ok 18 - merge-msg -F in subdirectory
-
-expecting success: 
-	test_unconfig merge.log &&
-	test_config merge.summary yes &&
-
-	(
-		cd remote &&
-		git checkout -b unrelated &&
-		test_tick &&
-		git fetch origin &&
-		git fmt-merge-msg <.git/FETCH_HEAD >../actual
-	) &&
-
-	test_must_be_empty actual
-
-Switched to a new branch 'unrelated'
-From /build/git-2.20.1/t/trash directory.t6200-fmt-merge-msg/.
- * [new branch]      left       -> origin/left
- * [new branch]      long       -> origin/long
-   883c9d3..2935695  master     -> origin/master
- * [new branch]      right      -> origin/right
- * [new tag]         29         -> 29
- * [new tag]         tag-l5     -> tag-l5
- * [new tag]         0          -> 0
- * [new tag]         1          -> 1
- * [new tag]         10         -> 10
- * [new tag]         11         -> 11
- * [new tag]         12         -> 12
- * [new tag]         13         -> 13
- * [new tag]         14         -> 14
- * [new tag]         15         -> 15
- * [new tag]         16         -> 16
- * [new tag]         17         -> 17
- * [new tag]         18         -> 18
- * [new tag]         19         -> 19
- * [new tag]         2          -> 2
- * [new tag]         20         -> 20
- * [new tag]         21         -> 21
- * [new tag]         22         -> 22
- * [new tag]         23         -> 23
- * [new tag]         24         -> 24
- * [new tag]         25         -> 25
- * [new tag]         26         -> 26
- * [new tag]         27         -> 27
- * [new tag]         28         -> 28
- * [new tag]         3          -> 3
- * [new tag]         4          -> 4
- * [new tag]         5          -> 5
- * [new tag]         6          -> 6
- * [new tag]         7          -> 7
- * [new tag]         8          -> 8
- * [new tag]         9          -> 9
- * [new tag]         tag-r3     -> tag-r3
-ok 19 - merge-msg with nothing to merge
-
-expecting success: 
-	cat >expected <<-EOF &&
-	Merge tag ${apos}tag-r3${apos}
-
-	* tag ${apos}tag-r3${apos}:
-	  Right #3
-	  Common #2
-	  Common #1
-	EOF
-
-	test_unconfig merge.log &&
-	test_config merge.summary yes &&
-
-	git checkout master &&
-	test_tick &&
-	git fetch . tag tag-r3 &&
-
-	git fmt-merge-msg <.git/FETCH_HEAD >actual &&
-	test_cmp expected actual
-
-Already on 'master'
-ok 20 - merge-msg tag
-
-expecting success: 
-	cat >expected <<-EOF &&
-	Merge tags ${apos}tag-r3${apos} and ${apos}tag-l5${apos}
-
-	* tag ${apos}tag-r3${apos}:
-	  Right #3
-	  Common #2
-	  Common #1
-
-	# By Another Author (3) and A U Thor (2)
-	# Via Another Committer
-	* tag ${apos}tag-l5${apos}:
-	  Left #5
-	  Left #4
-	  Left #3
-	  Common #2
-	  Common #1
-	EOF
-
-	test_unconfig merge.log &&
-	test_config merge.summary yes &&
-
-	git checkout master &&
-	test_tick &&
-	git fetch . tag tag-r3 tag tag-l5 &&
-
-	git fmt-merge-msg <.git/FETCH_HEAD >actual &&
-	test_cmp expected actual
-
-Already on 'master'
-ok 21 - merge-msg two tags
-
-expecting success: 
-	cat >expected <<-EOF &&
-	Merge branch ${apos}left${apos}, tag ${apos}tag-r3${apos}
-
-	* tag ${apos}tag-r3${apos}:
-	  Right #3
-	  Common #2
-	  Common #1
-
-	# By Another Author (3) and A U Thor (2)
-	# Via Another Committer
-	* left:
-	  Left #5
-	  Left #4
-	  Left #3
-	  Common #2
-	  Common #1
-	EOF
-
-	test_unconfig merge.log &&
-	test_config merge.summary yes &&
-
-	git checkout master &&
-	test_tick &&
-	git fetch . tag tag-r3 left &&
-
-	git fmt-merge-msg <.git/FETCH_HEAD >actual &&
-	test_cmp expected actual
-
-Already on 'master'
-From .
- * branch            left       -> FETCH_HEAD
-ok 22 - merge-msg tag and branch
-
-expecting success: 
-	{
-		cat <<-EOF &&
-		Merge branch ${apos}long${apos}
-
-		* long: (35 commits)
-		EOF
-
-		i=29 &&
-		while test $i -gt 9
-		do
-			echo "  $i" &&
-			i=$(($i-1))
-		done &&
-		echo "  ..."
-	} >expected &&
-
-	test_config merge.summary yes &&
-
-	git checkout master &&
-	test_tick &&
-	git fetch . long &&
-
-	git fmt-merge-msg <.git/FETCH_HEAD >actual &&
-	test_cmp expected actual
-
-Already on 'master'
-From .
- * branch            long       -> FETCH_HEAD
-ok 23 - merge-msg lots of commits
-
-expecting success: 
-	test_config merge.log true &&
-
-	git checkout master^0 &&
-	git commit --allow-empty -m "One step ahead" &&
-	git tag -a -m "An annotated one" annote HEAD &&
-
-	git checkout master &&
-	git fetch . annote &&
-
-	git fmt-merge-msg <.git/FETCH_HEAD >actual &&
-	{
-		cat <<-\EOF
-		Merge tag 'annote'
-
-		An annotated one
-
-		* tag 'annote':
-		  One step ahead
-		EOF
-	} >expected &&
-	test_cmp expected actual &&
-
-	test_when_finished "git reset --hard" &&
-	annote=$(git rev-parse annote) &&
-	git merge --no-commit --no-ff $annote &&
-	{
-		cat <<-EOF
-		Merge tag '$annote'
-
-		An annotated one
-
-		* tag '$annote':
-		  One step ahead
-		EOF
-	} >expected &&
-	test_cmp expected .git/MERGE_MSG
-
-Note: checking out 'master^0'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by performing another checkout.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
-
-  git checkout -b <new-branch-name>
-
-HEAD is now at 2935695 Second
-[detached HEAD a1b29db] One step ahead
- Author: A U Thor <author@example.com>
-Previous HEAD position was a1b29db One step ahead
-Switched to branch 'master'
-From .
- * tag               annote     -> FETCH_HEAD
-Merging:
-2935695 Second
-virtual 8b46c6aacb57c799d0614a94329ab758b2fc5b2e
-found 1 common ancestor:
-2935695 Second
-Already up to date!
-Automatic merge went well; stopped before committing as requested
-HEAD is now at 2935695 Second
-ok 24 - merge-msg with "merging" an annotated tag
-
-# passed all 24 test(s)
-1..24
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
 *** t6120-describe.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6120-describe/.git/
 expecting success: 
@@ -243619,7 +243058,7 @@
 ---------------------------------------------------------------------
 
 Already on 'master'
-Segmentation fault
+./test-lib.sh: line 1266: 2783179 Segmentation fault      "$@"
 not ok 64 - name-rev works in a deep repo # TODO known breakage
 
 expecting success: 
@@ -243683,351 +243122,1030 @@
 1..70
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t7010-setup.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7010-setup/.git/
+*** t6200-fmt-merge-msg.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6200-fmt-merge-msg/.git/
 expecting success: 
+	echo one >one &&
+	git add one &&
+	test_tick &&
+	git commit -m "Initial" &&
 
-	mkdir -p a/b/c a/e &&
-	D=$(pwd) &&
-	>a/b/c/d &&
-	>a/e/f
-
-
-ok 1 - setup
+	git clone . remote &&
 
-expecting success: 
+	echo uno >one &&
+	echo dos >two &&
+	git add two &&
+	test_tick &&
+	git commit -a -m "Second" &&
 
-	git add "$D/a/b/c/d" &&
-	git ls-files >current &&
-	echo a/b/c/d >expect &&
-	test_cmp expect current
+	git checkout -b left &&
 
+	echo "c1" >one &&
+	test_tick &&
+	git commit -a -m "Common #1" &&
 
-ok 2 - git add (absolute)
+	echo "c2" >one &&
+	test_tick &&
+	git commit -a -m "Common #2" &&
 
-expecting success: 
+	git branch right &&
 
-	rm -f .git/index &&
-	(
-		cd a/b &&
-		git add "../e/./f"
-	) &&
-	git ls-files >current &&
-	echo a/e/f >expect &&
-	test_cmp expect current
+	echo "l3" >two &&
+	test_tick &&
+	GIT_COMMITTER_NAME="Another Committer" \
+	GIT_AUTHOR_NAME="Another Author" git commit -a -m "Left #3" &&
 
+	echo "l4" >two &&
+	test_tick &&
+	GIT_COMMITTER_NAME="Another Committer" \
+	GIT_AUTHOR_NAME="Another Author" git commit -a -m "Left #4" &&
 
-ok 3 - git add (funny relative)
+	echo "l5" >two &&
+	test_tick &&
+	GIT_COMMITTER_NAME="Another Committer" \
+	GIT_AUTHOR_NAME="Another Author" git commit -a -m "Left #5" &&
+	git tag tag-l5 &&
 
-expecting success: 
+	git checkout right &&
 
-	rm -f .git/index &&
-	git add a &&
-	git rm -f --cached "$D/a/b/c/d" &&
-	git ls-files >current &&
-	echo a/e/f >expect &&
-	test_cmp expect current
+	echo "r3" >three &&
+	git add three &&
+	test_tick &&
+	git commit -a -m "Right #3" &&
+	git tag tag-r3 &&
 
+	echo "r4" >three &&
+	test_tick &&
+	git commit -a -m "Right #4" &&
 
-rm 'a/b/c/d'
-ok 4 - git rm (absolute)
+	echo "r5" >three &&
+	test_tick &&
+	git commit -a -m "Right #5" &&
 
-expecting success: 
+	git checkout -b long &&
+	i=0 &&
+	while test $i -lt 30
+	do
+		test_commit $i one &&
+		i=$(($i+1))
+	done &&
 
-	rm -f .git/index &&
-	git add a &&
-	(
-		cd a/b &&
-		git rm -f --cached "../e/./f"
-	) &&
-	git ls-files >current &&
-	echo a/b/c/d >expect &&
-	test_cmp expect current
+	git show-branch &&
 
+	apos="'"
 
-rm 'a/e/f'
-ok 5 - git rm (funny relative)
+[master (root-commit) 883c9d3] Initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one
+Cloning into 'remote'...
+done.
+[master 2935695] Second
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+ create mode 100644 two
+Switched to a new branch 'left'
+[left b86daf8] Common #1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[left 9f2fd7e] Common #2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[left 5b6ed2c] Left #3
+ Author: Another Author <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[left e382d03] Left #4
+ Author: Another Author <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[left 558a9dc] Left #5
+ Author: Another Author <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to branch 'right'
+[right 00c8e89] Right #3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 three
+[right ef8635d] Right #4
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[right 2d2f597] Right #5
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'long'
+[long d6a0cbe] 0
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[long e56a64b] 1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[long 8fc7bcd] 2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[long b5605fc] 3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[long 35000b2] 4
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[long 3c4f1c6] 5
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[long bf0bc37] 6
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[long e0e9a85] 7
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[long eb8c9f5] 8
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[long 99409c7] 9
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[long 0ce96e0] 10
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[long 8377914] 11
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[long 85798ed] 12
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[long f75d7f4] 13
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[long f56cc6e] 14
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[long 3dc0dbd] 15
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[long 56d0ffb] 16
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[long 4c19426] 17
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[long 5342a39] 18
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[long 0753e7e] 19
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[long 72baa93] 20
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[long 494d039] 21
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[long 543e615] 22
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[long 41d12df] 23
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[long 8b77407] 24
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[long 12fecbe] 25
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[long f709339] 26
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[long c90ce26] 27
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[long cf03e3f] 28
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[long f343514] 29
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+! [left] Left #5
+ * [long] 29
+  ! [master] Second
+   ! [right] Right #5
+----
+ *   [long] 29
+ *   [long^] 28
+ *   [long~2] 27
+ *   [long~3] 26
+ *   [long~4] 25
+ *   [long~5] 24
+ *   [long~6] 23
+ *   [long~7] 22
+ *   [long~8] 21
+ *   [long~9] 20
+ *   [long~10] 19
+ *   [long~11] 18
+ *   [long~12] 17
+ *   [long~13] 16
+ *   [long~14] 15
+ *   [long~15] 14
+ *   [long~16] 13
+ *   [long~17] 12
+ *   [long~18] 11
+ *   [long~19] 10
+ *   [long~20] 9
+ *   [long~21] 8
+ *   [long~22] 7
+ *   [long~23] 6
+ *   [long~24] 5
+ *   [long~25] 4
+ *   [long~26] 3
+ *   [long~27] 2
+ *   [long~28] 1
+ *   [long~29] 0
+ * + [right] Right #5
+ * + [right^] Right #4
+ * + [right~2] Right #3
++    [left] Left #5
++    [left^] Left #4
++    [left~2] Left #3
++* + [right~3] Common #2
++* + [right~4] Common #1
++*++ [master] Second
+ok 1 - setup
 
 expecting success: 
+	echo "Merge branch ${apos}left${apos}" >expected &&
 
-	rm -f .git/index &&
-	git add a &&
-	git ls-files "$D/a/e/../b" >current &&
-	echo a/b/c/d >expect &&
-	test_cmp expect current
+	git checkout master &&
+	git fetch . left &&
 
+	git fmt-merge-msg <.git/FETCH_HEAD >actual &&
+	test_cmp expected actual
 
-ok 6 - git ls-files (absolute)
+Switched to branch 'master'
+From .
+ * branch            left       -> FETCH_HEAD
+ok 2 - message for merging local branch
 
 expecting success: 
+	echo "Merge branch ${apos}left${apos} of $(pwd)" >expected &&
 
-	rm -f .git/index &&
-	git add a &&
-	(
-		cd a/b &&
-		git ls-files "../b/c"
-	)  >current &&
-	echo c/d >expect &&
-	test_cmp expect current
+	git checkout master &&
+	git fetch "$(pwd)" left &&
 
+	git fmt-merge-msg <.git/FETCH_HEAD >actual &&
+	test_cmp expected actual
 
-ok 7 - git ls-files (relative #1)
+Already on 'master'
+From /build/git-2.20.1/t/trash directory.t6200-fmt-merge-msg
+ * branch            left       -> FETCH_HEAD
+ok 3 - message for merging external branch
 
 expecting success: 
+	cat >expected <<-EOF &&
+	Merge branch ${apos}left${apos}
 
-	rm -f .git/index &&
-	git add a &&
-	(
-		cd a/b &&
-		git ls-files --full-name "../e/f"
-	)  >current &&
-	echo a/e/f >expect &&
-	test_cmp expect current
+	# By Another Author (3) and A U Thor (2)
+	# Via Another Committer
+	* left:
+	  Left #5
+	  Left #4
+	  Left #3
+	  Common #2
+	  Common #1
+	EOF
 
+	test_config merge.log true &&
+	test_unconfig merge.summary &&
 
-ok 8 - git ls-files (relative #2)
+	git checkout master &&
+	test_tick &&
+	git fetch . left &&
 
-expecting success: 
+	git fmt-merge-msg <.git/FETCH_HEAD >actual1 &&
 
-	rm -f .git/index &&
-	git add a &&
-	(
-		cd a/b &&
-		git ls-files "../e/f"
-	)  >current &&
-	echo ../e/f >expect &&
-	test_cmp expect current
+	test_unconfig merge.log &&
+	test_config merge.summary true &&
 
+	git checkout master &&
+	test_tick &&
+	git fetch . left &&
 
-ok 9 - git ls-files (relative #3)
+	git fmt-merge-msg <.git/FETCH_HEAD >actual2 &&
 
-expecting success: 
-	git commit -m "foo" &&
-	echo aa >>a/b/c/d &&
-	git commit -m "aa" "$(pwd)/a/b/c/d"
+	test_cmp expected actual1 &&
+	test_cmp expected actual2
 
-[master (root-commit) 88942f1] foo
- Author: A U Thor <author@example.com>
- 2 files changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 a/b/c/d
- create mode 100644 a/e/f
-[master 70949b6] aa
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 10 - commit using absolute path names
+Already on 'master'
+From .
+ * branch            left       -> FETCH_HEAD
+Already on 'master'
+From .
+ * branch            left       -> FETCH_HEAD
+ok 4 - [merge] summary/log configuration
 
 expecting success: 
-	echo bb >>a/b/c/d &&
-	git commit -m "bb" "$(pwd)/a/b/c/d" &&
-
-	git log a/b/c/d >f1.txt &&
-	git log "$(pwd)/a/b/c/d" >f2.txt &&
-	test_cmp f1.txt f2.txt
+	git checkout master &&
+	test_tick &&
+	git fetch . left
 
-[master 0c0c42e] bb
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 11 - log using absolute path names
+Already on 'master'
+From .
+ * branch            left       -> FETCH_HEAD
+ok 5 - setup FETCH_HEAD
 
 expecting success: 
-	git blame a/b/c/d >f1.txt &&
-	git blame "$(pwd)/a/b/c/d" >f2.txt &&
-	test_cmp f1.txt f2.txt
+	cat >expected <<-EOF &&
+	Merge branch ${apos}left${apos}
 
-ok 12 - blame using absolute path names
+	# By Another Author (3) and A U Thor (2)
+	# Via Another Committer
+	* left: (5 commits)
+	  Left #5
+	  Left #4
+	  Left #3
+	  ...
+	EOF
+
+	git -c merge.log=3 fmt-merge-msg <.git/FETCH_HEAD >actual &&
+	test_cmp expected actual
+
+ok 6 - merge.log=3 limits shortlog length
 
 expecting success: 
-	test_create_repo tester
+	cat >expected <<-EOF &&
+	Merge branch ${apos}left${apos}
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7010-setup/tester/.git/
-ok 13 - setup deeper work tree
+	# By Another Author (3) and A U Thor (2)
+	# Via Another Committer
+	* left:
+	  Left #5
+	  Left #4
+	  Left #3
+	  Common #2
+	  Common #1
+	EOF
 
-expecting success: (
-	cd tester &&
-	d1="$(cd .. ; pwd)" &&
-	test_must_fail git add "$d1"
-)
-fatal: /build/git-2.20.1/t/trash directory.t7010-setup: '/build/git-2.20.1/t/trash directory.t7010-setup' is outside repository
-ok 14 - add a directory outside the work tree
+	git -c merge.log=5 fmt-merge-msg <.git/FETCH_HEAD >actual &&
+	test_cmp expected actual
 
-expecting success: (
-	cd tester &&
-	f="$(pwd)x" &&
-	echo "$f" &&
-	touch "$f" &&
-	test_must_fail git add "$f"
-)
-/build/git-2.20.1/t/trash directory.t7010-setup/testerx
-fatal: /build/git-2.20.1/t/trash directory.t7010-setup/testerx: '/build/git-2.20.1/t/trash directory.t7010-setup/testerx' is outside repository
-ok 15 - add a file outside the work tree, nasty case 1
+ok 7 - merge.log=5 shows all 5 commits
 
-expecting success: (
-	cd tester &&
-	f="$(pwd | sed "s/.$//")x" &&
-	echo "$f" &&
-	touch "$f" &&
-	test_must_fail git add "$f"
-)
-/build/git-2.20.1/t/trash directory.t7010-setup/testex
-fatal: /build/git-2.20.1/t/trash directory.t7010-setup/testex: '/build/git-2.20.1/t/trash directory.t7010-setup/testex' is outside repository
-ok 16 - add a file outside the work tree, nasty case 2
+expecting success: 
+	cat >expected <<-EOF &&
+	Merge branch ${apos}left${apos}
+
+	x By Another Author (3) and A U Thor (2)
+	x Via Another Committer
+	* left:
+	  Left #5
+	  Left #4
+	  Left #3
+	  Common #2
+	  Common #1
+	EOF
+
+	git -c core.commentchar="x" fmt-merge-msg --log=5 <.git/FETCH_HEAD >actual &&
+	test_cmp expected actual
+
+ok 8 - --log=5 with custom comment character
 
-# passed all 16 test(s)
-1..16
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t7011-skip-worktree-reading.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7011-skip-worktree-reading/.git/
 expecting success: 
-	test_commit init &&
+	echo "Merge branch ${apos}left${apos}" >expected &&
+	git -c merge.log=0 fmt-merge-msg <.git/FETCH_HEAD >actual &&
+	test_cmp expected actual
+
+ok 9 - merge.log=0 disables shortlog
+
+expecting success: 
+	cat >expected <<-EOF &&
+	Merge branch ${apos}left${apos}
+
+	# By Another Author (3) and A U Thor (2)
+	# Via Another Committer
+	* left: (5 commits)
+	  Left #5
+	  Left #4
+	  Left #3
+	  ...
+	EOF
+
+	git fmt-merge-msg --log=3 <.git/FETCH_HEAD >actual &&
+	test_cmp expected actual
+
+ok 10 - --log=3 limits shortlog length
+
+expecting success: 
+	cat >expected <<-EOF &&
+	Merge branch ${apos}left${apos}
+
+	# By Another Author (3) and A U Thor (2)
+	# Via Another Committer
+	* left:
+	  Left #5
+	  Left #4
+	  Left #3
+	  Common #2
+	  Common #1
+	EOF
+
+	git fmt-merge-msg --log=5 <.git/FETCH_HEAD >actual &&
+	test_cmp expected actual
+
+ok 11 - --log=5 shows all 5 commits
+
+expecting success: 
+	echo "Merge branch ${apos}left${apos}" >expected &&
+	git fmt-merge-msg --no-log <.git/FETCH_HEAD >actual &&
+	test_cmp expected actual
+
+ok 12 - --no-log disables shortlog
+
+expecting success: 
+	echo "Merge branch ${apos}left${apos}" >expected &&
+	git fmt-merge-msg --no-log <.git/FETCH_HEAD >actual &&
+	test_cmp expected actual
+
+ok 13 - --log=0 disables shortlog
+
+expecting success: 
+	echo "Sync with left" >expected &&
+	cat >expected.log <<-EOF &&
+	Sync with left
+
+	# By Another Author (3) and A U Thor (2)
+	# Via Another Committer
+	* ${apos}left${apos} of $(pwd):
+	  Left #5
+	  Left #4
+	  Left #3
+	  Common #2
+	  Common #1
+	EOF
+
+	test_unconfig merge.log &&
+	test_unconfig merge.summary &&
+	git checkout master &&
+	git fetch "$(pwd)" left &&
+	git fmt-merge-msg -m "Sync with left" <.git/FETCH_HEAD >actual &&
+	git fmt-merge-msg --log -m "Sync with left" \
+					<.git/FETCH_HEAD >actual.log &&
+	test_config merge.log true &&
+	git fmt-merge-msg -m "Sync with left" \
+					<.git/FETCH_HEAD >actual.log-config &&
+	git fmt-merge-msg --no-log -m "Sync with left" \
+					<.git/FETCH_HEAD >actual.nolog &&
+
+	test_cmp expected actual &&
+	test_cmp expected.log actual.log &&
+	test_cmp expected.log actual.log-config &&
+	test_cmp expected actual.nolog
+
+Already on 'master'
+From /build/git-2.20.1/t/trash directory.t6200-fmt-merge-msg
+ * branch            left       -> FETCH_HEAD
+ok 14 - fmt-merge-msg -m
+
+expecting success: 
+	cat >expected <<-EOF
+	Merge branches ${apos}left${apos} and ${apos}right${apos}
+
+	# By Another Author (3) and A U Thor (2)
+	# Via Another Committer
+	* left:
+	  Left #5
+	  Left #4
+	  Left #3
+	  Common #2
+	  Common #1
+
+	* right:
+	  Right #5
+	  Right #4
+	  Right #3
+	  Common #2
+	  Common #1
+	EOF
+
+ok 15 - setup: expected shortlog for two branches
+
+expecting success: 
+	test_config merge.log true &&
+	test_unconfig merge.summary &&
+	git checkout master &&
+	test_tick &&
+	git fetch . left right &&
+	git fmt-merge-msg <.git/FETCH_HEAD >actual1 &&
+
+	test_unconfig merge.log &&
+	test_config merge.summary true &&
+	git checkout master &&
+	test_tick &&
+	git fetch . left right &&
+	git fmt-merge-msg <.git/FETCH_HEAD >actual2 &&
+
+	test_config merge.log yes &&
+	test_unconfig merge.summary &&
+	git checkout master &&
+	test_tick &&
+	git fetch . left right &&
+	git fmt-merge-msg <.git/FETCH_HEAD >actual3 &&
+
+	test_unconfig merge.log &&
+	test_config merge.summary yes &&
+	git checkout master &&
+	test_tick &&
+	git fetch . left right &&
+	git fmt-merge-msg <.git/FETCH_HEAD >actual4 &&
+
+	test_cmp expected actual1 &&
+	test_cmp expected actual2 &&
+	test_cmp expected actual3 &&
+	test_cmp expected actual4
+
+Already on 'master'
+From .
+ * branch            left       -> FETCH_HEAD
+ * branch            right      -> FETCH_HEAD
+Already on 'master'
+From .
+ * branch            left       -> FETCH_HEAD
+ * branch            right      -> FETCH_HEAD
+Already on 'master'
+From .
+ * branch            left       -> FETCH_HEAD
+ * branch            right      -> FETCH_HEAD
+Already on 'master'
+From .
+ * branch            left       -> FETCH_HEAD
+ * branch            right      -> FETCH_HEAD
+ok 16 - shortlog for two branches
+
+expecting success: 
+	test_unconfig merge.log &&
+	test_config merge.summary yes &&
+	git checkout master &&
+	test_tick &&
+	git fetch . left right &&
+	git fmt-merge-msg -F .git/FETCH_HEAD >actual &&
+	test_cmp expected actual
+
+Already on 'master'
+From .
+ * branch            left       -> FETCH_HEAD
+ * branch            right      -> FETCH_HEAD
+ok 17 - merge-msg -F
+
+expecting success: 
+	test_unconfig merge.log &&
+	test_config merge.summary yes &&
+	git checkout master &&
+	test_tick &&
+	git fetch . left right &&
 	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
+	cp .git/FETCH_HEAD sub/FETCH_HEAD &&
+	(
+		cd sub &&
+		git fmt-merge-msg -F FETCH_HEAD >../actual
+	) &&
+	test_cmp expected actual
 
-[master (root-commit) 2519212] init
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 init.t
-ok 1 - setup
+Already on 'master'
+From .
+ * branch            left       -> FETCH_HEAD
+ * branch            right      -> FETCH_HEAD
+ok 18 - merge-msg -F in subdirectory
 
 expecting success: 
-	setup_absent &&
-	git update-index 1 &&
-	test_absent
+	test_unconfig merge.log &&
+	test_config merge.summary yes &&
 
-ok 2 - update-index
+	(
+		cd remote &&
+		git checkout -b unrelated &&
+		test_tick &&
+		git fetch origin &&
+		git fmt-merge-msg <.git/FETCH_HEAD >../actual
+	) &&
+
+	test_must_be_empty actual
+
+Switched to a new branch 'unrelated'
+From /build/git-2.20.1/t/trash directory.t6200-fmt-merge-msg/.
+ * [new branch]      left       -> origin/left
+ * [new branch]      long       -> origin/long
+   883c9d3..2935695  master     -> origin/master
+ * [new branch]      right      -> origin/right
+ * [new tag]         29         -> 29
+ * [new tag]         tag-l5     -> tag-l5
+ * [new tag]         0          -> 0
+ * [new tag]         1          -> 1
+ * [new tag]         10         -> 10
+ * [new tag]         11         -> 11
+ * [new tag]         12         -> 12
+ * [new tag]         13         -> 13
+ * [new tag]         14         -> 14
+ * [new tag]         15         -> 15
+ * [new tag]         16         -> 16
+ * [new tag]         17         -> 17
+ * [new tag]         18         -> 18
+ * [new tag]         19         -> 19
+ * [new tag]         2          -> 2
+ * [new tag]         20         -> 20
+ * [new tag]         21         -> 21
+ * [new tag]         22         -> 22
+ * [new tag]         23         -> 23
+ * [new tag]         24         -> 24
+ * [new tag]         25         -> 25
+ * [new tag]         26         -> 26
+ * [new tag]         27         -> 27
+ * [new tag]         28         -> 28
+ * [new tag]         3          -> 3
+ * [new tag]         4          -> 4
+ * [new tag]         5          -> 5
+ * [new tag]         6          -> 6
+ * [new tag]         7          -> 7
+ * [new tag]         8          -> 8
+ * [new tag]         9          -> 9
+ * [new tag]         tag-r3     -> tag-r3
+ok 19 - merge-msg with nothing to merge
 
 expecting success: 
-	setup_dirty &&
-	git update-index 1 &&
-	test_dirty
+	cat >expected <<-EOF &&
+	Merge tag ${apos}tag-r3${apos}
 
-ok 3 - update-index
+	* tag ${apos}tag-r3${apos}:
+	  Right #3
+	  Common #2
+	  Common #1
+	EOF
+
+	test_unconfig merge.log &&
+	test_config merge.summary yes &&
+
+	git checkout master &&
+	test_tick &&
+	git fetch . tag tag-r3 &&
+
+	git fmt-merge-msg <.git/FETCH_HEAD >actual &&
+	test_cmp expected actual
+
+Already on 'master'
+ok 20 - merge-msg tag
 
 expecting success: 
-	setup_absent &&
-	git update-index --remove 1 &&
-	test -z "$(git ls-files 1)" &&
-	test ! -f 1
+	cat >expected <<-EOF &&
+	Merge tags ${apos}tag-r3${apos} and ${apos}tag-l5${apos}
 
-ok 4 - update-index --remove
+	* tag ${apos}tag-r3${apos}:
+	  Right #3
+	  Common #2
+	  Common #1
+
+	# By Another Author (3) and A U Thor (2)
+	# Via Another Committer
+	* tag ${apos}tag-l5${apos}:
+	  Left #5
+	  Left #4
+	  Left #3
+	  Common #2
+	  Common #1
+	EOF
+
+	test_unconfig merge.log &&
+	test_config merge.summary yes &&
+
+	git checkout master &&
+	test_tick &&
+	git fetch . tag tag-r3 tag tag-l5 &&
+
+	git fmt-merge-msg <.git/FETCH_HEAD >actual &&
+	test_cmp expected actual
+
+Already on 'master'
+ok 21 - merge-msg two tags
 
 expecting success: 
-	setup_dirty &&
-	git update-index --remove 1 &&
-	test -z "$(git ls-files 1)" &&
-	echo dirty > expected &&
-	test_cmp expected 1
+	cat >expected <<-EOF &&
+	Merge branch ${apos}left${apos}, tag ${apos}tag-r3${apos}
 
-ok 5 - update-index --remove
+	* tag ${apos}tag-r3${apos}:
+	  Right #3
+	  Common #2
+	  Common #1
+
+	# By Another Author (3) and A U Thor (2)
+	# Via Another Committer
+	* left:
+	  Left #5
+	  Left #4
+	  Left #3
+	  Common #2
+	  Common #1
+	EOF
+
+	test_unconfig merge.log &&
+	test_config merge.summary yes &&
+
+	git checkout master &&
+	test_tick &&
+	git fetch . tag tag-r3 left &&
+
+	git fmt-merge-msg <.git/FETCH_HEAD >actual &&
+	test_cmp expected actual
+
+Already on 'master'
+From .
+ * branch            left       -> FETCH_HEAD
+ok 22 - merge-msg tag and branch
 
 expecting success: 
-	setup_absent &&
-	test -z "$(git ls-files -d)"
+	{
+		cat <<-EOF &&
+		Merge branch ${apos}long${apos}
 
-ok 6 - ls-files --deleted
+		* long: (35 commits)
+		EOF
+
+		i=29 &&
+		while test $i -gt 9
+		do
+			echo "  $i" &&
+			i=$(($i-1))
+		done &&
+		echo "  ..."
+	} >expected &&
+
+	test_config merge.summary yes &&
+
+	git checkout master &&
+	test_tick &&
+	git fetch . long &&
+
+	git fmt-merge-msg <.git/FETCH_HEAD >actual &&
+	test_cmp expected actual
+
+Already on 'master'
+From .
+ * branch            long       -> FETCH_HEAD
+ok 23 - merge-msg lots of commits
 
 expecting success: 
-	setup_dirty &&
-	test -z "$(git ls-files -d)"
+	test_config merge.log true &&
 
-ok 7 - ls-files --deleted
+	git checkout master^0 &&
+	git commit --allow-empty -m "One step ahead" &&
+	git tag -a -m "An annotated one" annote HEAD &&
+
+	git checkout master &&
+	git fetch . annote &&
+
+	git fmt-merge-msg <.git/FETCH_HEAD >actual &&
+	{
+		cat <<-\EOF
+		Merge tag 'annote'
+
+		An annotated one
+
+		* tag 'annote':
+		  One step ahead
+		EOF
+	} >expected &&
+	test_cmp expected actual &&
+
+	test_when_finished "git reset --hard" &&
+	annote=$(git rev-parse annote) &&
+	git merge --no-commit --no-ff $annote &&
+	{
+		cat <<-EOF
+		Merge tag '$annote'
+
+		An annotated one
+
+		* tag '$annote':
+		  One step ahead
+		EOF
+	} >expected &&
+	test_cmp expected .git/MERGE_MSG
+
+Note: checking out 'master^0'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by performing another checkout.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -b with the checkout command again. Example:
+
+  git checkout -b <new-branch-name>
+
+HEAD is now at 2935695 Second
+[detached HEAD a1b29db] One step ahead
+ Author: A U Thor <author@example.com>
+Previous HEAD position was a1b29db One step ahead
+Switched to branch 'master'
+From .
+ * tag               annote     -> FETCH_HEAD
+Merging:
+2935695 Second
+virtual 8b46c6aacb57c799d0614a94329ab758b2fc5b2e
+found 1 common ancestor:
+2935695 Second
+Already up to date!
+Automatic merge went well; stopped before committing as requested
+HEAD is now at 2935695 Second
+ok 24 - merge-msg with "merging" an annotated tag
 
+# passed all 24 test(s)
+1..24
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t7010-setup.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7010-setup/.git/
 expecting success: 
-	setup_absent &&
-	test -z "$(git ls-files -m)"
 
-ok 8 - ls-files --modified
+	mkdir -p a/b/c a/e &&
+	D=$(pwd) &&
+	>a/b/c/d &&
+	>a/e/f
+
+
+ok 1 - setup
 
 expecting success: 
-	setup_dirty &&
-	test -z "$(git ls-files -m)"
 
-ok 9 - ls-files --modified
+	git add "$D/a/b/c/d" &&
+	git ls-files >current &&
+	echo a/b/c/d >expect &&
+	test_cmp expect current
+
+
+ok 2 - git add (absolute)
 
 expecting success: 
-	git update-index --no-skip-worktree 1 &&
-	echo test > 1 &&
-	git update-index 1 &&
-	git update-index --skip-worktree 1 &&
-	rm 1 &&
-	test "$(git grep --no-ext-grep test)" = "1:test"
 
-ok 10 - grep with skip-worktree file
+	rm -f .git/index &&
+	(
+		cd a/b &&
+		git add "../e/./f"
+	) &&
+	git ls-files >current &&
+	echo a/e/f >expect &&
+	test_cmp expect current
+
+
+ok 3 - git add (funny relative)
 
 expecting success: 
-	setup_absent &&
-	git diff-index HEAD -- 1 > result &&
-	test_cmp expected result
 
-ok 11 - diff-index does not examine skip-worktree absent entries
+	rm -f .git/index &&
+	git add a &&
+	git rm -f --cached "$D/a/b/c/d" &&
+	git ls-files >current &&
+	echo a/e/f >expect &&
+	test_cmp expect current
+
+
+rm 'a/b/c/d'
+ok 4 - git rm (absolute)
 
 expecting success: 
-	setup_dirty &&
-	git diff-index HEAD -- 1 > result &&
-	test_cmp expected result
 
-ok 12 - diff-index does not examine skip-worktree dirty entries
+	rm -f .git/index &&
+	git add a &&
+	(
+		cd a/b &&
+		git rm -f --cached "../e/./f"
+	) &&
+	git ls-files >current &&
+	echo a/b/c/d >expect &&
+	test_cmp expect current
+
+
+rm 'a/e/f'
+ok 5 - git rm (funny relative)
 
 expecting success: 
-	setup_absent &&
-	test -z "$(git diff-files -- one)"
 
-ok 13 - diff-files does not examine skip-worktree absent entries
+	rm -f .git/index &&
+	git add a &&
+	git ls-files "$D/a/e/../b" >current &&
+	echo a/b/c/d >expect &&
+	test_cmp expect current
+
+
+ok 6 - git ls-files (absolute)
 
 expecting success: 
-	setup_dirty &&
-	test -z "$(git diff-files -- one)"
 
-ok 14 - diff-files does not examine skip-worktree dirty entries
+	rm -f .git/index &&
+	git add a &&
+	(
+		cd a/b &&
+		git ls-files "../b/c"
+	)  >current &&
+	echo c/d >expect &&
+	test_cmp expect current
+
+
+ok 7 - git ls-files (relative #1)
 
 expecting success: 
-	setup_absent &&
-	git rm 1
 
-rm '1'
-ok 15 - git-rm succeeds on skip-worktree absent entries
+	rm -f .git/index &&
+	git add a &&
+	(
+		cd a/b &&
+		git ls-files --full-name "../e/f"
+	)  >current &&
+	echo a/e/f >expect &&
+	test_cmp expect current
+
+
+ok 8 - git ls-files (relative #2)
 
 expecting success: 
-	git reset &&
-	setup_absent &&
-	test_must_fail git commit -m null 1
 
-On branch master
-Untracked files:
-	2
-	expect.full
-	expect.skip
-	expected
-	result
-	sub/
+	rm -f .git/index &&
+	git add a &&
+	(
+		cd a/b &&
+		git ls-files "../e/f"
+	)  >current &&
+	echo ../e/f >expect &&
+	test_cmp expect current
 
-nothing added to commit but untracked files present
-ok 16 - commit on skip-worktree absent entries
+
+ok 9 - git ls-files (relative #3)
 
 expecting success: 
-	git reset &&
-	setup_dirty &&
-	test_must_fail git commit -m null 1
+	git commit -m "foo" &&
+	echo aa >>a/b/c/d &&
+	git commit -m "aa" "$(pwd)/a/b/c/d"
 
-On branch master
-Untracked files:
-	1
-	2
-	expect.full
-	expect.skip
-	expected
-	result
-	sub/
+[master (root-commit) 78324fc] foo
+ Author: A U Thor <author@example.com>
+ 2 files changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 a/b/c/d
+ create mode 100644 a/e/f
+[master 2344d8e] aa
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 10 - commit using absolute path names
 
-nothing added to commit but untracked files present
-ok 17 - commit on skip-worktree dirty entries
+expecting success: 
+	echo bb >>a/b/c/d &&
+	git commit -m "bb" "$(pwd)/a/b/c/d" &&
 
-# passed all 17 test(s)
-1..17
+	git log a/b/c/d >f1.txt &&
+	git log "$(pwd)/a/b/c/d" >f2.txt &&
+	test_cmp f1.txt f2.txt
+
+[master 427c7b6] bb
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 11 - log using absolute path names
+
+expecting success: 
+	git blame a/b/c/d >f1.txt &&
+	git blame "$(pwd)/a/b/c/d" >f2.txt &&
+	test_cmp f1.txt f2.txt
+
+ok 12 - blame using absolute path names
+
+expecting success: 
+	test_create_repo tester
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7010-setup/tester/.git/
+ok 13 - setup deeper work tree
+
+expecting success: (
+	cd tester &&
+	d1="$(cd .. ; pwd)" &&
+	test_must_fail git add "$d1"
+)
+fatal: /build/git-2.20.1/t/trash directory.t7010-setup: '/build/git-2.20.1/t/trash directory.t7010-setup' is outside repository
+ok 14 - add a directory outside the work tree
+
+expecting success: (
+	cd tester &&
+	f="$(pwd)x" &&
+	echo "$f" &&
+	touch "$f" &&
+	test_must_fail git add "$f"
+)
+/build/git-2.20.1/t/trash directory.t7010-setup/testerx
+fatal: /build/git-2.20.1/t/trash directory.t7010-setup/testerx: '/build/git-2.20.1/t/trash directory.t7010-setup/testerx' is outside repository
+ok 15 - add a file outside the work tree, nasty case 1
+
+expecting success: (
+	cd tester &&
+	f="$(pwd | sed "s/.$//")x" &&
+	echo "$f" &&
+	touch "$f" &&
+	test_must_fail git add "$f"
+)
+/build/git-2.20.1/t/trash directory.t7010-setup/testex
+fatal: /build/git-2.20.1/t/trash directory.t7010-setup/testex: '/build/git-2.20.1/t/trash directory.t7010-setup/testex' is outside repository
+ok 16 - add a file outside the work tree, nasty case 2
+
+# passed all 16 test(s)
+1..16
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
 *** t7030-verify-tag.sh ***
@@ -244215,2700 +244333,5317 @@
 1..11
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t5510-fetch.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5510-fetch/.git/
+*** t7012-skip-worktree-writing.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7012-skip-worktree-writing/.git/
 expecting success: 
-	echo >file original &&
-	git add file &&
-	git commit -a -m original
-[master (root-commit) bf34813] original
+	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 file
+ 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: 
-	git clone . one &&
-	(
-		cd one &&
-		echo >file updated by one &&
-		git commit -a -m "updated by one"
-	) &&
-	git clone . two &&
-	(
-		cd two &&
-		git config branch.master.remote one &&
-		git config remote.one.url ../one/.git/ &&
-		git config remote.one.fetch refs/heads/master:refs/heads/one
-	) &&
-	git clone . three &&
-	(
-		cd three &&
-		git config branch.master.remote two &&
-		git config branch.master.merge refs/heads/one &&
-		mkdir -p .git/remotes &&
-		{
-			echo "URL: ../two/.git/"
-			echo "Pull: refs/heads/master:refs/heads/two"
-			echo "Pull: refs/heads/one:refs/heads/one"
-		} >.git/remotes/two
-	) &&
-	git clone . bundle &&
-	git clone . seven
+	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
 
-Cloning into 'one'...
-done.
-[master 392a771] updated by one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Cloning into 'two'...
-done.
-Cloning into 'three'...
-done.
-Cloning into 'bundle'...
-done.
-Cloning into 'seven'...
-done.
-ok 2 - clone and setup child repos
+Note: checking out '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 performing another checkout.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -b with the checkout command again. Example:
+
+  git checkout -b <new-branch-name>
+
+HEAD is now at fa1ce8e modified and added
+ok 2 - read-tree updates worktree, absent case
 
 expecting success: 
-	cd "$D" &&
-	echo >file updated by origin &&
-	git commit -a -m "updated by origin" &&
-	cd two &&
-	git fetch &&
-	git rev-parse --verify refs/heads/one &&
-	mine=$(git rev-parse refs/heads/one) &&
-	his=$(cd ../one && git rev-parse refs/heads/master) &&
-	test "z$mine" = "z$his"
+	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: 
+	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: 
+	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: 
+	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: 
+	setup_absent &&
+	git add 1 &&
+	test_absent
+
+ok 7 - git-add ignores worktree content
+
+expecting success: 
+	setup_dirty &&
+	git add 1 &&
+	test_dirty
+
+ok 8 - git-add ignores worktree content
+
+expecting success: 
+	setup_dirty &&
+	test_must_fail git rm 1 &&
+	test_dirty
+
+error: the following file has changes staged in the index:
+    1
+(use --cached to keep the file, or -f to force removal)
+ok 9 - git-rm fails if worktree is dirty
+
+expecting success: 
+	setup_absent &&
+	git clean -n > result &&
+	test_i18ncmp expected result
+
+ok 10 - git-clean, absent case
+
+expecting success: 
+	setup_dirty &&
+	git clean -n > result &&
+	test_i18ncmp expected result
+
+ok 11 - git-clean, dirty case
+
+# passed all 11 test(s)
+1..11
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t7009-filter-branch-null-sha1.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7009-filter-branch-null-sha1/.git/
+expecting success: 
+	test_commit one &&
+	test_commit two &&
+	test_commit three
 
-[master 89b3e7f] updated by origin
+[master (root-commit) d79ce16] one
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-From ../one/
- * [new branch]      master     -> one
-392a771163a3b8f573a7f65f4496034df2efdcef
-ok 3 - fetch test
+ 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: 
-	cd "$D" &&
-	cd three &&
-	git fetch &&
-	git rev-parse --verify refs/heads/two &&
-	git rev-parse --verify refs/heads/one &&
-	master_in_two=$(cd ../two && git rev-parse master) &&
-	one_in_two=$(cd ../two && git rev-parse one) &&
 	{
-		echo "$one_in_two	"
-		echo "$master_in_two	not-for-merge"
-	} >expected &&
-	cut -f -2 .git/FETCH_HEAD >actual &&
-	test_cmp expected actual
-From ../two/
- * [new branch]      one        -> one
- * [new branch]      master     -> two
-bf34813667d307d4f1af1abbbd65d0fa8ab923b6
-392a771163a3b8f573a7f65f4496034df2efdcef
-ok 4 - fetch test for-merge
+		git ls-tree HEAD &&
+		printf "160000 commit $ZERO_OID\\tbroken\\n"
+	} >broken-tree &&
+	echo "add broken entry" >msg &&
 
-expecting success: 
-	cd "$D" &&
-	git clone . prune &&
-	cd prune &&
-	git update-ref refs/remotes/origin/extrabranch master &&
+	tree=$(git mktree <broken-tree) &&
+	test_tick &&
+	commit=$(git commit-tree $tree -p HEAD <msg) &&
+	git update-ref HEAD "$commit"
 
-	git fetch --prune origin &&
-	test_must_fail git rev-parse origin/extrabranch
+ok 2 - setup: a commit with a bogus null sha1 in the tree
 
-Cloning into 'prune'...
-done.
-From /build/git-2.20.1/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> origin/extrabranch
-fatal: ambiguous argument 'origin/extrabranch': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-origin/extrabranch
-ok 5 - fetch --prune on its own works as expected
+expecting success: 
+	test_tick &&
+	git commit -a -m "back to normal"
+
+[master 6fc1982] back to normal
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ delete mode 160000 broken
+ok 3 - setup: bring HEAD and index in sync
 
 expecting success: 
-	cd "$D" &&
-	git clone . prune-branch &&
-	cd prune-branch &&
-	git update-ref refs/remotes/origin/extrabranch master &&
+	test_must_fail git filter-branch \
+		--force --prune-empty \
+		--index-filter "true"
 
-	git fetch --prune origin master &&
-	git rev-parse origin/extrabranch
+
Rewrite d79ce1670bdcb76e6d1da2ae095e890ccb326ae9 (1/5) (1 seconds passed, remaining 4 predicted)    
Rewrite 139b20d8e6c5b496de61f033f642d0e3dbff528d (1/5) (1 seconds passed, remaining 4 predicted)    
Rewrite 7c7cd714e262561f73f3079dfca4e8724682ac21 (3/5) (1 seconds passed, remaining 0 predicted)    
Rewrite e3ed0c3a94f05540151bd8cb9ac647b8777964a6 (3/5) (1 seconds passed, remaining 0 predicted)    error: invalid object 160000 0000000000000000000000000000000000000000 for 'broken'
+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
 
-Cloning into 'prune-branch'...
-done.
-From /build/git-2.20.1/t/trash directory.t5510-fetch/.
- * branch            master     -> FETCH_HEAD
-89b3e7fa4dd518245f0869e129c64e2d1cc3643f
-ok 6 - fetch --prune with a branch name keeps branches
+expecting success: 
+	test_must_fail git filter-branch \
+		--force --prune-empty \
+		--index-filter "git rm --cached --ignore-unmatch three.t"
+
+
Rewrite d79ce1670bdcb76e6d1da2ae095e890ccb326ae9 (1/5) (0 seconds passed, remaining 0 predicted)    
Rewrite 139b20d8e6c5b496de61f033f642d0e3dbff528d (2/5) (0 seconds passed, remaining 0 predicted)    
Rewrite 7c7cd714e262561f73f3079dfca4e8724682ac21 (3/5) (0 seconds passed, remaining 0 predicted)    rm 'three.t'
+
Rewrite e3ed0c3a94f05540151bd8cb9ac647b8777964a6 (4/5) (0 seconds passed, remaining 0 predicted)    error: invalid object 160000 0000000000000000000000000000000000000000 for 'broken'
+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: 
-	cd "$D" &&
-	git clone . prune-namespace &&
-	cd prune-namespace &&
+	echo three >expect &&
+	git filter-branch \
+		--force --prune-empty \
+		--index-filter "git rm --cached --ignore-unmatch broken" &&
+	git log -1 --format=%s >actual &&
+	test_cmp expect actual
 
-	git fetch --prune origin refs/heads/a/*:refs/remotes/origin/a/* &&
-	git rev-parse origin/master
+
Rewrite d79ce1670bdcb76e6d1da2ae095e890ccb326ae9 (1/5) (0 seconds passed, remaining 0 predicted)    
Rewrite 139b20d8e6c5b496de61f033f642d0e3dbff528d (2/5) (1 seconds passed, remaining 1 predicted)    
Rewrite 7c7cd714e262561f73f3079dfca4e8724682ac21 (2/5) (1 seconds passed, remaining 1 predicted)    
Rewrite e3ed0c3a94f05540151bd8cb9ac647b8777964a6 (2/5) (1 seconds passed, remaining 1 predicted)    error: invalid object 160000 0000000000000000000000000000000000000000 for 'broken'
+warning: cache entry has null sha1: broken
+rm 'broken'
+
Rewrite 6fc1982a7cbeec7380180353ef341fd996ac21f7 (5/5) (1 seconds passed, remaining 0 predicted)    
+Ref 'refs/heads/master' was rewritten
+ok 6 - removing the broken entry works
 
-Cloning into 'prune-namespace'...
-done.
-89b3e7fa4dd518245f0869e129c64e2d1cc3643f
-ok 7 - fetch --prune with a namespace keeps other namespaces
+# passed all 6 test(s)
+1..6
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t7011-skip-worktree-reading.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7011-skip-worktree-reading/.git/
+expecting success: 
+	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: 
-	cd "$D" &&
-	git update-ref refs/pull/42/head master &&
-	git clone . prune-overlapping &&
-	cd prune-overlapping &&
-	git config --add remote.origin.fetch refs/pull/*/head:refs/remotes/origin/pr/* &&
+	setup_absent &&
+	git update-index 1 &&
+	test_absent
 
-	git fetch --prune origin &&
-	git rev-parse origin/master &&
-	git rev-parse origin/pr/42 &&
+ok 2 - update-index
 
-	git config --unset-all remote.origin.fetch &&
-	git config remote.origin.fetch refs/pull/*/head:refs/remotes/origin/pr/* &&
-	git config --add remote.origin.fetch refs/heads/*:refs/remotes/origin/* &&
+expecting success: 
+	setup_dirty &&
+	git update-index 1 &&
+	test_dirty
 
-	git fetch --prune origin &&
-	git rev-parse origin/master &&
-	git rev-parse origin/pr/42
+ok 3 - update-index
 
-Cloning into 'prune-overlapping'...
-done.
-From /build/git-2.20.1/t/trash directory.t5510-fetch/.
- * [new ref]         refs/pull/42/head -> origin/pr/42
-89b3e7fa4dd518245f0869e129c64e2d1cc3643f
-89b3e7fa4dd518245f0869e129c64e2d1cc3643f
-89b3e7fa4dd518245f0869e129c64e2d1cc3643f
-89b3e7fa4dd518245f0869e129c64e2d1cc3643f
-ok 8 - fetch --prune handles overlapping refspecs
+expecting success: 
+	setup_absent &&
+	git update-index --remove 1 &&
+	test -z "$(git ls-files 1)" &&
+	test ! -f 1
+
+ok 4 - update-index --remove
 
 expecting success: 
-	cd "$D" &&
-	git clone . prune-tags &&
-	cd prune-tags &&
-	git tag sometag master &&
-	# Create what looks like a remote-tracking branch from an earlier
-	# fetch that has since been deleted from the remote:
-	git update-ref refs/remotes/origin/fake-remote master &&
+	setup_dirty &&
+	git update-index --remove 1 &&
+	test -z "$(git ls-files 1)" &&
+	echo dirty > expected &&
+	test_cmp expected 1
 
-	git fetch --prune --tags origin &&
-	git rev-parse origin/master &&
-	test_must_fail git rev-parse origin/fake-remote &&
-	git rev-parse sometag
+ok 5 - update-index --remove
 
-Cloning into 'prune-tags'...
-done.
-From /build/git-2.20.1/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> origin/fake-remote
-89b3e7fa4dd518245f0869e129c64e2d1cc3643f
-fatal: ambiguous argument 'origin/fake-remote': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-origin/fake-remote
-89b3e7fa4dd518245f0869e129c64e2d1cc3643f
-ok 9 - fetch --prune --tags prunes branches but not tags
+expecting success: 
+	setup_absent &&
+	test -z "$(git ls-files -d)"
+
+ok 6 - ls-files --deleted
 
 expecting success: 
-	cd "$D" &&
-	git clone . prune-tags-branch &&
-	cd prune-tags-branch &&
-	git tag sometag master &&
-	git update-ref refs/remotes/origin/extrabranch master &&
+	setup_dirty &&
+	test -z "$(git ls-files -d)"
 
-	git fetch --prune --tags origin master &&
-	git rev-parse origin/extrabranch &&
-	git rev-parse sometag
+ok 7 - ls-files --deleted
 
-Cloning into 'prune-tags-branch'...
-done.
-From /build/git-2.20.1/t/trash directory.t5510-fetch/.
- * branch            master     -> FETCH_HEAD
-89b3e7fa4dd518245f0869e129c64e2d1cc3643f
-89b3e7fa4dd518245f0869e129c64e2d1cc3643f
-ok 10 - fetch --prune --tags with branch does not prune other things
+expecting success: 
+	setup_absent &&
+	test -z "$(git ls-files -m)"
+
+ok 8 - ls-files --modified
 
 expecting success: 
-	cd "$D" &&
-	git clone . prune-tags-refspec &&
-	cd prune-tags-refspec &&
-	git tag sometag master &&
-	git update-ref refs/remotes/origin/foo/otherbranch master &&
-	git update-ref refs/remotes/origin/extrabranch master &&
+	setup_dirty &&
+	test -z "$(git ls-files -m)"
 
-	git fetch --prune --tags origin refs/heads/foo/*:refs/remotes/origin/foo/* &&
-	test_must_fail git rev-parse refs/remotes/origin/foo/otherbranch &&
-	git rev-parse origin/extrabranch &&
-	git rev-parse sometag
+ok 9 - ls-files --modified
 
-Cloning into 'prune-tags-refspec'...
-done.
-From /build/git-2.20.1/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> origin/foo/otherbranch
-fatal: ambiguous argument 'refs/remotes/origin/foo/otherbranch': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-refs/remotes/origin/foo/otherbranch
-89b3e7fa4dd518245f0869e129c64e2d1cc3643f
-89b3e7fa4dd518245f0869e129c64e2d1cc3643f
-ok 11 - fetch --prune --tags with refspec prunes based on refspec
+expecting success: 
+	git update-index --no-skip-worktree 1 &&
+	echo test > 1 &&
+	git update-index 1 &&
+	git update-index --skip-worktree 1 &&
+	rm 1 &&
+	test "$(git grep --no-ext-grep test)" = "1:test"
+
+ok 10 - grep with skip-worktree file
 
 expecting success: 
+	setup_absent &&
+	git diff-index HEAD -- 1 > result &&
+	test_cmp expected result
 
-    cd "$D" &&
+ok 11 - diff-index does not examine skip-worktree absent entries
 
-    mkdir notags &&
-    cd notags &&
-    git init &&
+expecting success: 
+	setup_dirty &&
+	git diff-index HEAD -- 1 > result &&
+	test_cmp expected result
 
-    git fetch -t ..
+ok 12 - diff-index does not examine skip-worktree dirty entries
 
+expecting success: 
+	setup_absent &&
+	test -z "$(git diff-files -- one)"
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5510-fetch/notags/.git/
-From ..
- * branch            HEAD       -> FETCH_HEAD
-ok 12 - fetch tags when there is no tags
+ok 13 - diff-files does not examine skip-worktree absent entries
 
 expecting success: 
+	setup_dirty &&
+	test -z "$(git diff-files -- one)"
 
-	cd "$D" &&
-	git tag -a -m annotated anno HEAD &&
-	git tag light HEAD &&
+ok 14 - diff-files does not examine skip-worktree dirty entries
 
-	mkdir four &&
-	cd four &&
-	git init &&
+expecting success: 
+	setup_absent &&
+	git rm 1
 
-	git fetch .. :track &&
-	git show-ref --verify refs/tags/anno &&
-	git show-ref --verify refs/tags/light
+rm '1'
+ok 15 - git-rm succeeds on skip-worktree absent entries
 
+expecting success: 
+	git reset &&
+	setup_absent &&
+	test_must_fail git commit -m null 1
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5510-fetch/four/.git/
-From ..
- * [new ref]                    -> track
- * [new tag]         anno       -> anno
- * [new tag]         light      -> light
-7d539a23921365a5af4d2d6a8d1bb79b47ae5410 refs/tags/anno
-89b3e7fa4dd518245f0869e129c64e2d1cc3643f refs/tags/light
-ok 13 - fetch following tags
+On branch master
+Untracked files:
+	2
+	expect.full
+	expect.skip
+	expected
+	result
+	sub/
+
+nothing added to commit but untracked files present
+ok 16 - commit on skip-worktree absent entries
 
 expecting success: 
-	cd "$D" &&
-	git init descriptive &&
-	(
-		cd descriptive &&
-		git config remote.o.url .. &&
-		git config remote.o.fetch "refs/heads/*:refs/crazyheads/*" &&
-		git config --add remote.o.fetch "refs/others/*:refs/heads/*" &&
-		git fetch o
-	) &&
-	git tag -a -m "Descriptive tag" descriptive-tag &&
-	git branch descriptive-branch &&
-	git checkout descriptive-branch &&
-	echo "Nuts" >crazy &&
-	git add crazy &&
-	git commit -a -m "descriptive commit" &&
-	git update-ref refs/others/crazy HEAD &&
-	(
-		cd descriptive &&
-		git fetch o 2>actual &&
-		test_i18ngrep "new branch.* -> refs/crazyheads/descriptive-branch$" actual &&
-		test_i18ngrep "new tag.* -> descriptive-tag$" actual &&
-		test_i18ngrep "new ref.* -> crazy$" actual
-	) &&
-	git checkout master
+	git reset &&
+	setup_dirty &&
+	test_must_fail git commit -m null 1
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5510-fetch/descriptive/.git/
-From ..
- * [new branch]      master     -> refs/crazyheads/master
- * [new tag]         anno       -> anno
- * [new tag]         light      -> light
-Switched to branch 'descriptive-branch'
-[descriptive-branch 951d92c] descriptive commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 crazy
- * [new branch]      descriptive-branch -> refs/crazyheads/descriptive-branch
- * [new tag]         descriptive-tag    -> descriptive-tag
- * [new ref]         refs/others/crazy  -> crazy
-Switched to branch 'master'
-ok 14 - fetch uses remote ref names to describe new refs
+On branch master
+Untracked files:
+	1
+	2
+	expect.full
+	expect.skip
+	expected
+	result
+	sub/
+
+nothing added to commit but untracked files present
+ok 17 - commit on skip-worktree dirty entries
 
+# passed all 17 test(s)
+1..17
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t7062-wtstatus-ignorecase.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7062-wtstatus-ignorecase/.git/
 expecting success: 
+	# 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
 
-	cd "$D" &&
+On branch master
 
-	mkdir five &&
-	cd five &&
-	git init &&
+No commits yet
 
-	test_must_fail git fetch .. anno:five
+Changes to be committed:
+  (use "git rm --cached <file>..." to unstage)
 
+	new file:   V/XQANY/test
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5510-fetch/five/.git/
-error: cannot update ref 'refs/heads/five': trying to write non-commit object 7d539a23921365a5af4d2d6a8d1bb79b47ae5410 to branch 'refs/heads/five'
-From ..
- ! [new tag]         anno       -> five  (unable to update local ref)
- * [new tag]         anno       -> anno
-ok 15 - fetch must not resolve short tag name
+ok 1 - status with hash collisions
 
+# passed all 1 test(s)
+1..1
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t7061-wtstatus-ignore.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7061-wtstatus-ignore/.git/
 expecting success: 
+	echo "ignored" >.gitignore &&
+	mkdir untracked &&
+	: >untracked/ignored &&
+	: >untracked/uncommitted &&
+	git status --porcelain --ignored >actual &&
+	test_cmp expected actual
 
-	cd "$D" &&
-	git update-ref refs/remotes/six/HEAD HEAD &&
+ok 1 - status untracked directory with --ignored
 
-	mkdir six &&
-	cd six &&
-	git init &&
+expecting success: 
+	printf "\357\273\277ignored\n" >.gitignore &&
+	mkdir -p untracked &&
+	: >untracked/ignored &&
+	: >untracked/uncommitted &&
+	git status --porcelain --ignored >actual &&
+	test_cmp expected actual
 
-	git fetch .. six:six
+ok 2 - same with gitignore starting with BOM
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5510-fetch/six/.git/
-From ..
- * [new ref]         six/HEAD        -> six
- * [new tag]         anno            -> anno
- * [new tag]         descriptive-tag -> descriptive-tag
- * [new tag]         light           -> light
-ok 16 - fetch can now resolve short remote name
+expecting success: 
+	git status --porcelain --ignored -u >actual &&
+	test_cmp expected actual
+
+ok 3 - status untracked directory with --ignored -u
 
 expecting success: 
-	cd "$D" &&
-	echo >file updated again by origin &&
-	git commit -a -m "tip" &&
-	git bundle create bundle1 master^..master
+	git status --porcelain --ignored untracked/ >actual &&
+	test_cmp expected actual
 
-[master 91e08a5] tip
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 17 - create bundle 1
+ok 4 - status prefixed untracked directory with --ignored
 
 expecting success: 
-	head -n 1 "$D"/bundle1 | grep "^#" &&
-	head -n 2 "$D"/bundle1 | grep "^-[0-9a-f]\{40\} " &&
-	head -n 3 "$D"/bundle1 | grep "^[0-9a-f]\{40\} " &&
-	head -n 4 "$D"/bundle1 | grep "^$"
+	git status --porcelain --ignored -u untracked/ >actual &&
+	test_cmp expected actual
 
-# v2 git bundle
--89b3e7fa4dd518245f0869e129c64e2d1cc3643f updated by origin
-91e08a57c371c572b88eec4927c22af1d66e09fb refs/heads/master
+ok 5 - status prefixed untracked sub-directory with --ignored -u
 
-ok 18 - header of bundle looks right
+expecting success: 
+	rm -rf untracked &&
+	mkdir ignored &&
+	: >ignored/uncommitted &&
+	git status --porcelain --ignored >actual &&
+	test_cmp expected actual
+
+ok 6 - status ignored directory with --ignore
 
 expecting success: 
-	cd "$D" &&
-	git bundle create bundle2 master~2..master
+	git status --porcelain --ignored -u >actual &&
+	test_cmp expected actual
 
-ok 19 - create bundle 2
+ok 7 - status ignored directory with --ignore -u
 
 expecting success: 
-	cd "$D/bundle" &&
-	git checkout -b some-branch &&
-	test_must_fail git fetch "$D/bundle1" master:master
+	rm -rf ignored &&
+	mkdir untracked-ignored &&
+	mkdir untracked-ignored/test &&
+	git status --porcelain --ignored >actual &&
+	test_cmp expected actual
 
-Switched to a new branch 'some-branch'
-error: Repository lacks these prerequisite commits:
-error: 89b3e7fa4dd518245f0869e129c64e2d1cc3643f 
-ok 20 - unbundle 1
+ok 8 - status empty untracked directory with --ignore
 
 expecting success: 
-	cd "$D" &&
-	convert_bundle_to_pack <bundle1 >bundle.pack &&
-	git index-pack bundle.pack &&
-	test_bundle_object_count bundle.pack 3
+	git status --porcelain --ignored -u >actual &&
+	test_cmp expected actual
 
-cbbadf321f5f459722fb0975953bc5d189e8a361
-ok 21 - bundle 1 has only 3 files 
+ok 9 - status empty untracked directory with --ignore -u
 
 expecting success: 
-	cd "$D/bundle" &&
-	git fetch ../bundle2 master:master &&
-	test "tip" = "$(git log -1 --pretty=oneline master | cut -b42-)"
+	: >untracked-ignored/ignored &&
+	: >untracked-ignored/test/ignored &&
+	git status --porcelain --ignored >actual &&
+	test_cmp expected actual
 
-From ../bundle2
-   bf34813..91e08a5  master     -> master
-ok 22 - unbundle 2
+ok 10 - status untracked directory with ignored files with --ignore
 
 expecting success: 
-	cd "$D" &&
-	touch file2 &&
-	git add file2 &&
-	git commit -m add.file2 file2 &&
-	git bundle create bundle3 -1 HEAD &&
-	convert_bundle_to_pack <bundle3 >bundle.pack &&
-	git index-pack bundle.pack &&
-	test_bundle_object_count bundle.pack 3
+	git status --porcelain --ignored -u >actual &&
+	test_cmp expected actual
+
+ok 11 - status untracked directory with ignored files with --ignore -u
+
+expecting success: 
+	rm -rf untracked-ignored &&
+	mkdir tracked &&
+	: >tracked/committed &&
+	git add tracked/committed &&
+	git commit -m. &&
+	echo "tracked" >.gitignore &&
+	git status --porcelain --ignored >actual &&
+	test_cmp expected actual
 
-[master 198a5d3] add.file2
+[master (root-commit) d401dee] .
  Author: A U Thor <author@example.com>
  1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 file2
-2103010f82481cc06e71b30b153d593b0502342e
-ok 23 - bundle does not prerequisite objects
+ create mode 100644 tracked/committed
+ok 12 - status ignored tracked directory with --ignore
 
 expecting success: 
+	git status --porcelain --ignored -u >actual &&
+	test_cmp expected actual
 
-	cd "$D" &&
-	git tag -a -m 1.0 v1.0 master &&
-	git bundle create bundle4 v1.0
+ok 13 - status ignored tracked directory with --ignore -u
 
+expecting success: 
+	echo "committed" >>.gitignore &&
+	git status --porcelain --ignored >actual &&
+	test_cmp expected actual
 
-ok 24 - bundle should be able to create a full history
+ok 14 - status ignored tracked directory and ignored file with --ignore
 
 expecting success: 
-	git config branch.master.remote yeti &&
-	git config branch.master.merge refs/heads/bigfoot &&
-	git config remote.blub.url one &&
-	git config remote.blub.fetch "refs/heads/*:refs/remotes/one/*" &&
-	git fetch blub
+	git status --porcelain --ignored -u >actual &&
+	test_cmp expected actual
 
-From one
- * [new branch]      master     -> one/master
-ok 25 - fetch with a non-applying branch.<name>.merge
+ok 15 - status ignored tracked directory and ignored file with --ignore -u
 
 expecting success: 
-	one_head=$(cd one && git rev-parse HEAD) &&
-	this_head=$(git rev-parse HEAD) &&
-	git update-ref -d FETCH_HEAD &&
-	git fetch one &&
-	test $one_head = "$(git rev-parse --verify FETCH_HEAD)" &&
-	test $this_head = "$(git rev-parse --verify HEAD)"
+	echo "tracked" >.gitignore &&
+	: >tracked/uncommitted &&
+	git status --porcelain --ignored >actual &&
+	test_cmp expected actual
 
-From one
- * branch            HEAD       -> FETCH_HEAD
-ok 26 - fetch from GIT URL with a non-applying branch.<name>.merge [1]
+ok 16 - status ignored tracked directory and uncommitted file with --ignore
 
 expecting success: 
-	one_ref=$(cd one && git symbolic-ref HEAD) &&
-	git config branch.master.remote blub &&
-	git config branch.master.merge "$one_ref" &&
-	git update-ref -d FETCH_HEAD &&
-	git fetch one &&
-	test $one_head = "$(git rev-parse --verify FETCH_HEAD)" &&
-	test $this_head = "$(git rev-parse --verify HEAD)"
+	git status --porcelain --ignored -u >actual &&
+	test_cmp expected actual
 
-From one
- * branch            HEAD       -> FETCH_HEAD
-ok 27 - fetch from GIT URL with a non-applying branch.<name>.merge [2]
+ok 17 - status ignored tracked directory and uncommitted file with --ignore -u
 
 expecting success: 
-	git config branch.master.merge "${one_ref}_not" &&
-	git update-ref -d FETCH_HEAD &&
-	git fetch one &&
-	test $one_head = "$(git rev-parse --verify FETCH_HEAD)" &&
-	test $this_head = "$(git rev-parse --verify HEAD)"
+	rm -rf tracked/uncommitted &&
+	mkdir tracked/ignored &&
+	: >tracked/ignored/uncommitted &&
+	git status --porcelain --ignored >actual &&
+	test_cmp expected actual
 
-From one
- * branch            HEAD       -> FETCH_HEAD
-ok 28 - fetch from GIT URL with a non-applying branch.<name>.merge [3]
+ok 18 - status ignored tracked directory with uncommitted file in untracked subdir with --ignore
 
 expecting success: 
-	test_must_fail git fetch "a\\!'b" > result 2>&1 &&
-	cat result &&
-	grep "fatal: 'a\\\\!'b'" result
-
-fatal: 'a\!'b' does not appear to be a git repository
-fatal: Could not read from remote repository.
+	git status --porcelain --ignored -u >actual &&
+	test_cmp expected actual
 
-Please make sure you have the correct access rights
-and the repository exists.
-fatal: 'a\!'b' does not appear to be a git repository
-ok 29 - quoting of a strangely named repo
+ok 19 - status ignored tracked directory with uncommitted file in untracked subdir with --ignore -u
 
 expecting success: 
+	: >tracked/ignored/committed &&
+	git add -f tracked/ignored/committed &&
+	git commit -m. &&
+	git status --porcelain --ignored >actual &&
+	test_cmp expected actual
 
-	cd "$D" &&
-	git bundle create bundle5 HEAD master &&
-	git bundle list-heads bundle5 >actual &&
-	for h in HEAD refs/heads/master
-	do
-		echo "$(git rev-parse --verify $h) $h"
-	done >expect &&
-	test_cmp expect actual
+[master d4fc1cb] .
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 tracked/ignored/committed
+ok 20 - status ignored tracked directory with uncommitted file in tracked subdir with --ignore
 
+expecting success: 
+	git status --porcelain --ignored -u >actual &&
+	test_cmp expected actual
 
-ok 30 - bundle should record HEAD correctly
+ok 21 - status ignored tracked directory with uncommitted file in tracked subdir with --ignore -u
 
 expecting success: 
-	(
-		cd three &&
-		git tag base-origin-master refs/remotes/origin/master
-	)
+	git init tracked/submodule &&
+	test_commit -C tracked/submodule initial &&
+	git status --porcelain --ignored -u tracked/submodule >actual &&
+	test_cmp expected actual
 
-ok 31 - mark initial state of origin/master
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7061-wtstatus-ignore/tracked/submodule/.git/
+[master (root-commit) 24b24cf] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+ok 22 - status ignores submodule in excluded directory
 
+# passed all 22 test(s)
+1..22
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t7060-wtstatus.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7060-wtstatus/.git/
 expecting success: 
+	git config --global advice.statusuoption false &&
+	test_commit A &&
+	test_commit B oneside added &&
+	git checkout A^0 &&
+	test_commit C oneside created
 
-	cd "$D" &&
-	git branch -f side &&
-	(
-		cd three &&
-		git update-ref refs/remotes/origin/master base-origin-master &&
-		o=$(git rev-parse --verify refs/remotes/origin/master) &&
-		git fetch origin master &&
-		n=$(git rev-parse --verify refs/remotes/origin/master) &&
-		test "$o" != "$n" &&
-		test_must_fail git rev-parse --verify refs/remotes/origin/side
-	)
+[master (root-commit) 0ddfaf1] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A.t
+[master 5747a32] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 oneside
+Note: checking out 'A^0'.
 
-From /build/git-2.20.1/t/trash directory.t5510-fetch/.
- * branch            master     -> FETCH_HEAD
-   bf34813..198a5d3  master     -> origin/master
-fatal: Needed a single revision
-ok 32 - explicit fetch should update tracking
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by performing another checkout.
 
-expecting success: 
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -b with the checkout command again. Example:
 
-	cd "$D" &&
-	git branch -f side &&
-	(
-		cd three &&
-		git update-ref refs/remotes/origin/master base-origin-master &&
-		o=$(git rev-parse --verify refs/remotes/origin/master) &&
-		git pull origin master &&
-		n=$(git rev-parse --verify refs/remotes/origin/master) &&
-		test "$o" != "$n" &&
-		test_must_fail git rev-parse --verify refs/remotes/origin/side
-	)
+  git checkout -b <new-branch-name>
 
-From /build/git-2.20.1/t/trash directory.t5510-fetch/.
- * branch            master     -> FETCH_HEAD
-   bf34813..198a5d3  master     -> origin/master
-Updating bf34813..198a5d3
-Fast-forward
- file  | 2 +-
- file2 | 0
- 2 files changed, 1 insertion(+), 1 deletion(-)
- create mode 100644 file2
-fatal: Needed a single revision
-ok 33 - explicit pull should update tracking
+HEAD is now at 0ddfaf1 A
+[detached HEAD f7fe030] C
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 oneside
+ok 1 - setup
 
 expecting success: 
-	cd "$D" &&
-	(
-		cd three &&
-		test_must_fail git fetch --refmap="*:refs/remotes/none/*"
-	)
+	git checkout B^0 &&
+	test_must_fail git merge C
 
-fatal: --refmap option is only meaningful with command-line refspec(s).
-fatal: the remote end hung up unexpectedly
-ok 34 - explicit --refmap is allowed only with command-line refspec
+Previous HEAD position was f7fe030 C
+HEAD is now at 5747a32 B
+Merging:
+5747a32 B
+virtual C
+found 1 common ancestor:
+0ddfaf1 A
+Auto-merging oneside
+CONFLICT (add/add): Merge conflict in oneside
+Automatic merge failed; fix conflicts and then commit the result.
+ok 2 - A/A conflict
 
 expecting success: 
-	cd "$D" &&
-	git branch -f side &&
-	(
-		cd three &&
-		git update-ref refs/remotes/origin/master base-origin-master &&
-		o=$(git rev-parse --verify refs/remotes/origin/master) &&
-		git fetch --refmap="refs/heads/*:refs/remotes/other/*" origin master &&
-		n=$(git rev-parse --verify refs/remotes/origin/master) &&
-		test "$o" = "$n" &&
-		test_must_fail git rev-parse --verify refs/remotes/origin/side &&
-		git rev-parse --verify refs/remotes/other/master
-	)
+	git diff --cached --name-status >actual &&
+	echo "U	oneside" >expect &&
+	test_cmp expect actual
 
-From /build/git-2.20.1/t/trash directory.t5510-fetch/.
- * branch            master     -> FETCH_HEAD
- * [new branch]      master     -> other/master
-fatal: Needed a single revision
-198a5d34ee7685aad0c688d4833bbf879556f13f
-ok 35 - explicit --refmap option overrides remote.*.fetch
+ok 3 - Report path with conflict
 
 expecting success: 
-	cd "$D" &&
-	git branch -f side &&
-	(
-		cd three &&
-		git update-ref refs/remotes/origin/master base-origin-master &&
-		o=$(git rev-parse --verify refs/remotes/origin/master) &&
-		git fetch --refmap="" origin master &&
-		n=$(git rev-parse --verify refs/remotes/origin/master) &&
-		test "$o" = "$n" &&
-		test_must_fail git rev-parse --verify refs/remotes/origin/side
-	)
+	git diff --cached --name-status HEAD^ >actual &&
+	echo "U	oneside" >expect &&
+	test_cmp expect actual
 
-From /build/git-2.20.1/t/trash directory.t5510-fetch/.
- * branch            master     -> FETCH_HEAD
-fatal: Needed a single revision
-ok 36 - explicitly empty --refmap option disables remote.*.fetch
+ok 4 - Report new path with conflict
 
 expecting success: 
+	cat >expect <<EOF &&
+On branch side
+You have unmerged paths.
+  (fix conflicts and run "git commit")
+  (use "git merge --abort" to abort the merge)
 
-	cd "$D" &&
-	git branch -f side &&
+Unmerged paths:
+  (use "git add/rm <file>..." as appropriate to mark resolution)
+
+	deleted by us:   foo
+
+no changes added to commit (use "git add" and/or "git commit -a")
+EOF
+	mkdir mdconflict &&
 	(
-		cd three &&
-		git update-ref refs/remotes/origin/master base-origin-master &&
-		o=$(git rev-parse --verify refs/remotes/origin/master) &&
-		git fetch origin &&
-		n=$(git rev-parse --verify refs/remotes/origin/master) &&
-		test "$o" != "$n" &&
-		git rev-parse --verify refs/remotes/origin/side
+		cd mdconflict &&
+		git init &&
+		test_commit initial foo "" &&
+		test_commit modify foo foo &&
+		git checkout -b side HEAD^ &&
+		git rm foo &&
+		git commit -m delete &&
+		test_must_fail git merge master &&
+		test_must_fail git commit --dry-run >../actual &&
+		test_i18ncmp ../expect ../actual &&
+		git status >../actual &&
+		test_i18ncmp ../expect ../actual
 	)
 
-From /build/git-2.20.1/t/trash directory.t5510-fetch/.
- * [new branch]      descriptive-branch -> origin/descriptive-branch
-   bf34813..198a5d3  master             -> origin/master
- * [new branch]      side               -> origin/side
- * [new tag]         anno               -> anno
- * [new tag]         descriptive-tag    -> descriptive-tag
- * [new tag]         light              -> light
- * [new tag]         v1.0               -> v1.0
-198a5d34ee7685aad0c688d4833bbf879556f13f
-ok 37 - configured fetch updates tracking
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7060-wtstatus/mdconflict/.git/
+[master (root-commit) a3c5375] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo
+[master efd4a38] modify
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'side'
+rm 'foo'
+[side 0599bc2] delete
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 foo
+Merging:
+0599bc2 delete
+virtual master
+found 1 common ancestor:
+a3c5375 initial
+CONFLICT (modify/delete): foo deleted in HEAD and modified in master. Version master of foo left in tree.
+Automatic merge failed; fix conflicts and then commit the result.
+ok 5 - M/D conflict does not segfault
 
 expecting success: 
-	cd "$D" &&
-	git update-ref refs/odd/location HEAD &&
+	git rm -f -r . &&
+	cat "$TEST_DIRECTORY/README" >ONE &&
+	git add ONE &&
+	test_tick &&
+	git commit -m "One commit with ONE" &&
+
+	echo Modified >TWO &&
+	cat ONE >>TWO &&
+	cat ONE >>THREE &&
+	git add TWO THREE &&
+	sha1=$(git rev-parse :ONE) &&
+	git rm --cached ONE &&
 	(
-		cd three &&
-		git update-ref refs/remotes/origin/master base-origin-master &&
-		git config --add remote.origin.fetch \
-			refs/odd/location:refs/remotes/origin/odd &&
-		o=$(git rev-parse --verify refs/remotes/origin/master) &&
-		git fetch origin master &&
-		n=$(git rev-parse --verify refs/remotes/origin/master) &&
-		test "$o" != "$n" &&
-		test_must_fail git rev-parse --verify refs/remotes/origin/odd
-	)
+		echo "100644 $sha1 1	ONE" &&
+		echo "100644 $sha1 2	ONE" &&
+		echo "100644 $sha1 3	ONE"
+	) | git update-index --index-info &&
+	echo Further >>THREE
 
-From /build/git-2.20.1/t/trash directory.t5510-fetch/.
- * branch            master     -> FETCH_HEAD
-   bf34813..198a5d3  master     -> origin/master
-fatal: Needed a single revision
-ok 38 - non-matching refspecs do not confuse tracking update
+oneside: needs merge
+rm 'A.t'
+rm 'oneside'
+rm 'oneside'
+[detached HEAD c882fbf] One commit with ONE
+ Author: A U Thor <author@example.com>
+rm 'ONE'
+ok 6 - rename & unmerged setup
 
 expecting success: 
+	git status -suno >actual &&
+	cat >expect <<-EOF &&
+	UU ONE
+	AM THREE
+	A  TWO
+	EOF
+	test_cmp expect actual
 
-	cd "$D" &&
-	test_must_fail git push seven no:no
+ok 7 - rename & unmerged status
 
+expecting success: 
+	cat >expected <<-EOF &&
+	U	ONE
+	A	THREE
+	A	TWO
+	EOF
+	git diff-index --cached --name-status HEAD >actual &&
+	test_cmp expected actual
 
-error: src refspec no does not match any.
-error: failed to push some refs to 'seven'
-ok 39 - pushing nonexistent branch by mistake should not segv
+ok 8 - git diff-index --cached shows 2 added + 1 unmerged
 
 expecting success: 
+	cat >expected <<-EOF &&
+	U	ONE
+	A	THREE
+	A	TWO
+	EOF
+	git diff-index --cached -M --name-status HEAD >actual &&
+	test_cmp expected actual
 
-	cd "$D" &&
-	git clone .git follow &&
-	git checkout HEAD^0 &&
-	(
-		for i in 1 2 3 4 5 6 7
-		do
-			echo $i >>file &&
-			git commit -m $i -a &&
-			git tag -a -m $i excess-$i || exit 1
-		done
-	) &&
+ok 9 - git diff-index --cached -M shows 2 added + 1 unmerged
+
+expecting success: 
+	cat >expected <<-EOF &&
+	U	ONE
+	C	ONE	THREE
+	C	ONE	TWO
+	EOF
+	git diff-index --cached -C --name-status HEAD |
+	sed "s/^C[0-9]*/C/g" >actual &&
+	test_cmp expected actual
+
+ok 10 - git diff-index --cached -C shows 2 copies + 1 unmerged
+
+expecting success: 
+	git reset --hard &&
 	git checkout master &&
-	(
-		cd follow &&
-		git fetch
-	)
+	test_commit init main.txt init &&
+	git checkout -b second_branch &&
+	git rm main.txt &&
+	git commit -m "main.txt deleted on second_branch" &&
+	test_commit second conflict.txt second &&
+	git checkout master &&
+	test_commit on_second main.txt on_second &&
+	test_commit master conflict.txt master &&
+	test_must_fail git merge second_branch &&
+	cat >expected <<\EOF &&
+On branch master
+You have unmerged paths.
+  (fix conflicts and run "git commit")
+  (use "git merge --abort" to abort the merge)
 
-Cloning into 'follow'...
-done.
-Note: checking out 'HEAD^0'.
+Unmerged paths:
+  (use "git add/rm <file>..." as appropriate to mark resolution)
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by performing another checkout.
+	both added:      conflict.txt
+	deleted by them: main.txt
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
+no changes added to commit (use "git add" and/or "git commit -a")
+EOF
+	git status --untracked-files=no >actual &&
+	test_i18ncmp expected actual
 
-  git checkout -b <new-branch-name>
+HEAD is now at c882fbf One commit with ONE
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  c882fbf One commit with ONE
 
-HEAD is now at 198a5d3 add.file2
-[detached HEAD 99c0a97] 1
+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> c882fbf
+
+Switched to branch 'master'
+[master e5fc44e] init
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[detached HEAD 8899580] 2
+ create mode 100644 main.txt
+Switched to a new branch 'second_branch'
+rm 'main.txt'
+[second_branch 1fd8046] main.txt deleted on second_branch
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[detached HEAD 6a175d5] 3
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 main.txt
+[second_branch e4d0ede] second
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[detached HEAD 5a1facf] 4
+ create mode 100644 conflict.txt
+Switched to branch 'master'
+[master 9824e6a] on_second
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[detached HEAD d29e954] 5
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[master b29dd8b] master
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[detached HEAD 4138161] 6
+ create mode 100644 conflict.txt
+Merging:
+b29dd8b master
+virtual second_branch
+found 1 common ancestor:
+e5fc44e init
+CONFLICT (modify/delete): main.txt deleted in second_branch and modified in HEAD. Version HEAD of main.txt left in tree.
+Auto-merging conflict.txt
+CONFLICT (add/add): Merge conflict in conflict.txt
+Automatic merge failed; fix conflicts and then commit the result.
+ok 11 - status when conflicts with add and rm advice (deleted by them)
+
+expecting success: 
+	git reset --hard &&
+	git checkout -b conflict &&
+	test_commit one main.txt one &&
+	git branch conflict_second &&
+	git mv main.txt sub_master.txt &&
+	git commit -m "main.txt renamed in sub_master.txt" &&
+	git checkout conflict_second &&
+	git mv main.txt sub_second.txt &&
+	git commit -m "main.txt renamed in sub_second.txt"
+
+HEAD is now at b29dd8b master
+Switched to a new branch 'conflict'
+[conflict 21bce8e] one
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[detached HEAD 48f54a0] 7
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[conflict e06d4c6] main.txt renamed in sub_master.txt
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Previous HEAD position was 48f54a0 7
-Switched to branch 'master'
-Your branch is based on 'one/master_not', but the upstream is gone.
-  (use "git branch --unset-upstream" to fixup)
-ok 40 - auto tag following fetches minimum
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename main.txt => sub_master.txt (100%)
+Switched to branch 'conflict_second'
+[conflict_second 6b2443c] main.txt renamed in sub_second.txt
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename main.txt => sub_second.txt (100%)
+ok 12 - prepare for conflicts
 
 expecting success: 
+	test_must_fail git merge conflict &&
+	cat >expected <<\EOF &&
+On branch conflict_second
+You have unmerged paths.
+  (fix conflicts and run "git commit")
+  (use "git merge --abort" to abort the merge)
 
-	test_must_fail git fetch . side:master
+Unmerged paths:
+  (use "git add/rm <file>..." as appropriate to mark resolution)
 
+	both deleted:    main.txt
+	added by them:   sub_master.txt
+	added by us:     sub_second.txt
 
-fatal: Refusing to fetch into current branch refs/heads/master of non-bare repository
-ok 41 - refuse to fetch into the current branch
+no changes added to commit (use "git add" and/or "git commit -a")
+EOF
+	git status --untracked-files=no >actual &&
+	test_i18ncmp expected actual
+
+Merging:
+6b2443c main.txt renamed in sub_second.txt
+virtual conflict
+found 1 common ancestor:
+21bce8e one
+CONFLICT (rename/rename): Rename "main.txt"->"sub_second.txt" in branch "HEAD" rename "main.txt"->"sub_master.txt" in "conflict"
+Automatic merge failed; fix conflicts and then commit the result.
+ok 13 - status when conflicts with add and rm advice (both deleted)
 
 expecting success: 
+	git reset --hard conflict_second &&
+	test_must_fail git merge conflict &&
+	git add sub_master.txt &&
+	git add sub_second.txt &&
+	cat >expected <<\EOF &&
+On branch conflict_second
+You have unmerged paths.
+  (fix conflicts and run "git commit")
+  (use "git merge --abort" to abort the merge)
 
-	git fetch --update-head-ok . side:master
+Changes to be committed:
 
+	new file:   sub_master.txt
 
-fatal: the remote end hung up unexpectedly
-ok 42 - fetch into the current branch with --update-head-ok
+Unmerged paths:
+  (use "git rm <file>..." to mark resolution)
 
-expecting success: 
+	both deleted:    main.txt
 
-	rm -f .git/FETCH_HEAD &&
-	git fetch --dry-run . &&
-	! test -f .git/FETCH_HEAD
+Untracked files not listed (use -u option to show untracked files)
+EOF
+	git status --untracked-files=no >actual &&
+	test_i18ncmp expected actual &&
+	git reset --hard &&
+	git checkout master
 
-From .
- * branch            HEAD       -> FETCH_HEAD
-ok 43 - fetch --dry-run
+HEAD is now at 6b2443c main.txt renamed in sub_second.txt
+Merging:
+6b2443c main.txt renamed in sub_second.txt
+virtual conflict
+found 1 common ancestor:
+21bce8e one
+CONFLICT (rename/rename): Rename "main.txt"->"sub_second.txt" in branch "HEAD" rename "main.txt"->"sub_master.txt" in "conflict"
+Automatic merge failed; fix conflicts and then commit the result.
+HEAD is now at 6b2443c main.txt renamed in sub_second.txt
+warning: refname 'master' is ambiguous.
+Switched to branch 'master'
+ok 14 - status when conflicts with only rm advice (both deleted)
 
 expecting success: 
-	mkdir dups &&
-	(
-		cd dups &&
-		git init &&
-		git config branch.master.remote three &&
-		git config remote.three.url ../three/.git &&
-		git config remote.three.fetch +refs/heads/*:refs/remotes/origin/* &&
-		git config --add remote.three.fetch +refs/heads/*:refs/remotes/origin/* &&
-		git fetch three
-	)
+	git reset --hard &&
+	git checkout master^0 &&
+	git status --branch --porcelain >actual &&
+	cat >expected <<-EOF &&
+	## HEAD (no branch)
+	?? .gitconfig
+	?? actual
+	?? expect
+	?? expected
+	?? mdconflict/
+	EOF
+	test_i18ncmp expected actual
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5510-fetch/dups/.git/
-From ../three/
- * [new branch]      master             -> origin/master
- * [new branch]      one                -> origin/one
- * [new branch]      two                -> origin/two
- * [new tag]         base-origin-master -> base-origin-master
- * [new tag]         v1.0               -> v1.0
- * [new tag]         anno               -> anno
- * [new tag]         descriptive-tag    -> descriptive-tag
- * [new tag]         light              -> light
-ok 44 - should be able to fetch with duplicate refspecs
+HEAD is now at b29dd8b master
+warning: refname 'master' is ambiguous.
+Note: checking out 'master^0'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by performing another checkout.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -b with the checkout command again. Example:
+
+  git checkout -b <new-branch-name>
+
+HEAD is now at b29dd8b master
+ok 15 - status --branch with detached HEAD
 
 expecting success: 
-	mkdir lhs-ambiguous &&
-	(
-		cd lhs-ambiguous &&
-		git init server &&
-		test_commit -C server unwanted &&
-		test_commit -C server wanted &&
+	git reset --hard &&
+	git checkout master^0 &&
+	git status --branch --porcelain=v1 >actual &&
+	cat >expected <<-EOF &&
+	## HEAD (no branch)
+	?? .gitconfig
+	?? actual
+	?? expect
+	?? expected
+	?? mdconflict/
+	EOF
+	test_i18ncmp expected actual
 
-		git init client &&
+HEAD is now at b29dd8b master
+warning: refname 'master' is ambiguous.
+HEAD is now at b29dd8b master
+ok 16 - status --porcelain=v1 --branch with detached HEAD
 
-		# Check a name coming after "refs" alphabetically ...
-		git -C server update-ref refs/heads/s wanted &&
-		git -C server update-ref refs/heads/refs/heads/s unwanted &&
-		git -C client fetch ../server +refs/heads/s:refs/heads/checkthis &&
-		git -C server rev-parse wanted >expect &&
-		git -C client rev-parse checkthis >actual &&
-		test_cmp expect actual &&
+expecting success: 
+	test_must_fail git status --porcelain=bogus
 
-		# ... and one before.
-		git -C server update-ref refs/heads/q wanted &&
-		git -C server update-ref refs/heads/refs/heads/q unwanted &&
-		git -C client fetch ../server +refs/heads/q:refs/heads/checkthis &&
-		git -C server rev-parse wanted >expect &&
-		git -C client rev-parse checkthis >actual &&
-		test_cmp expect actual &&
+fatal: unsupported porcelain version 'bogus'
+ok 17 - status --porcelain=bogus
 
-		# Tags are preferred over branches like refs/{heads,tags}/*
-		git -C server update-ref refs/tags/t wanted &&
-		git -C server update-ref refs/heads/t unwanted &&
-		git -C client fetch ../server +t:refs/heads/checkthis &&
-		git -C server rev-parse wanted >expect &&
-		git -C client rev-parse checkthis >actual
-	)
+# passed all 17 test(s)
+1..17
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t7008-grep-binary.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7008-grep-binary/.git/
+expecting success: 
+	echo 'binaryQfileQm[*]cQ*æQð' | q_to_nul >a &&
+	git add a &&
+	git commit -m.
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5510-fetch/lhs-ambiguous/server/.git/
-[master (root-commit) 4bd74f6] unwanted
+[master (root-commit) 053187d] .
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 unwanted.t
-[master 2680c84] wanted
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 wanted.t
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5510-fetch/lhs-ambiguous/client/.git/
-From ../server
- * [new branch]      s          -> checkthis
- * [new tag]         wanted     -> wanted
- * [new tag]         unwanted   -> unwanted
-From ../server
- * [new tag]         t          -> t
-ok 45 - LHS of refspec follows ref disambiguation rules
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 a
+ok 1 - setup
 
 expecting success: 
-			remote_url="file://$(git -C one config remote.origin.url)" &&
-			remote_fetch="$(git -C one config remote.origin.fetch)" &&
-			cmdline_setup="\"$remote_url\" \"$remote_fetch\""
-		
-ok 46 - setup cmdline_setup variable for subsequent test
+	echo Binary file a matches >expect &&
+	git grep ina a >actual &&
+	test_cmp expect actual
+
+ok 2 - git grep ina a
 
 expecting success: 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/git-2.20.1/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
+	git grep -ah ina a >actual &&
+	test_cmp a actual
 
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
+ok 3 - git grep -ah ina a
 
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+expecting success: 
+	test_must_fail git grep -I ina a >actual &&
+	test_must_be_empty actual
 
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch  &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-From file:///build/git-2.20.1/t/trash directory.t5510-fetch/.
- * [new branch]      descriptive-branch -> origin/descriptive-branch
-   bf34813..198a5d3  master             -> origin/master
- * [new branch]      newbranch          -> origin/newbranch
- * [new branch]      side               -> origin/side
- * [new tag]         newtag             -> newtag
- * [new tag]         v1.0               -> v1.0
- * [new tag]         anno               -> anno
- * [new tag]         descriptive-tag    -> descriptive-tag
- * [new tag]         light              -> light
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-Deleted branch newbranch (was 198a5d3).
-Deleted tag 'newtag' (was 198a5d3)
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-ok 47 - name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:kept tag:kept
+ok 4 - git grep -I ina a
 
 expecting success: 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/git-2.20.1/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
+	echo a:1 >expect &&
+	git grep -c ina a >actual &&
+	test_cmp expect actual
 
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
+ok 5 - git grep -c ina a
 
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+expecting success: 
+	echo a >expect &&
+	git grep -l ina a >actual &&
+	test_cmp expect actual
 
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch "file:///build/git-2.20.1/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-Deleted branch newbranch (was 198a5d3).
-Deleted tag 'newtag' (was 198a5d3)
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-ok 48 - link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:kept tag:kept
+ok 6 - git grep -l ina a
 
 expecting success: 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/git-2.20.1/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
+	echo a >expect &&
+	git grep -L bar a >actual &&
+	test_cmp expect actual
 
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
+ok 7 - git grep -L bar a
 
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+expecting success: 
+	git grep -q ina a >actual &&
+	test_must_be_empty actual
 
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch --no-prune &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-Deleted branch newbranch (was 198a5d3).
-Deleted tag 'newtag' (was 198a5d3)
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-ok 49 - name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept
+ok 8 - git grep -q ina a
 
 expecting success: 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/git-2.20.1/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
+	git grep -F ile a
 
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
+Binary file a matches
+ok 9 - git grep -F ile a
 
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+expecting success: 
+	git grep -Fi iLE a
 
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch --no-prune &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-Deleted branch newbranch (was 198a5d3).
-Deleted tag 'newtag' (was 198a5d3)
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-ok 50 - link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept
+Binary file a matches
+ok 10 - git grep -Fi iLE a
 
 expecting success: 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/git-2.20.1/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
+	git grep ile a
 
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
+Binary file a matches
+ok 11 - git grep ile a
 
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+checking known breakage: 
+	git grep .fi a
 
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch --prune &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-Deleted branch newbranch (was 198a5d3).
-Deleted tag 'newtag' (was 198a5d3)
-From /build/git-2.20.1/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> origin/newbranch
-fatal: Needed a single revision
-198a5d34ee7685aad0c688d4833bbf879556f13f
-ok 51 - name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept
+not ok 12 - git grep .fi a # TODO known breakage
 
 expecting success: 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/git-2.20.1/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
+			printf 'yQf' | q_to_nul >f &&
+			git grep -f f -F a
+		
+Binary file a matches
+ok 13 - git grep -f f -F 'y<NUL>f' a
 
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
+expecting success: 
+			printf 'yQx' | q_to_nul >f &&
+			test_must_fail git grep -f f -F a
+		
+ok 14 - git grep -f f -F 'y<NUL>x' a
 
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+expecting success: 
+			printf 'YQf' | q_to_nul >f &&
+			git grep -f f -Fi a
+		
+Binary file a matches
+ok 15 - git grep -f f -Fi 'Y<NUL>f' a
 
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch --prune &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-From file:///build/git-2.20.1/t/trash directory.t5510-fetch/.
- * [new branch]      newbranch  -> origin/newbranch
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-Deleted branch newbranch (was 198a5d3).
-Deleted tag 'newtag' (was 198a5d3)
-From /build/git-2.20.1/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> origin/newbranch
-fatal: Needed a single revision
-198a5d34ee7685aad0c688d4833bbf879556f13f
-ok 52 - link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept
+expecting success: 
+			printf 'YQx' | q_to_nul >f &&
+			test_must_fail git grep -f f -Fi a
+		
+ok 16 - git grep -f f -Fi 'Y<NUL>x' a
 
 expecting success: 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/git-2.20.1/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
+			printf 'yQf' | q_to_nul >f &&
+			git grep -f f  a
+		
+Binary file a matches
+ok 17 - git grep -f f  'y<NUL>f' a
 
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
+expecting success: 
+			printf 'yQx' | q_to_nul >f &&
+			test_must_fail git grep -f f  a
+		
+ok 18 - git grep -f f  'y<NUL>x' a
 
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+expecting success: 
+			printf 'æQð' | q_to_nul >f &&
+			git grep -f f  a
+		
+Binary file a matches
+ok 19 - git grep -f f  'æ<NUL>ð' a
 
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch --prune origin refs/tags/*:refs/tags/* &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-From file:///build/git-2.20.1/t/trash directory.t5510-fetch/.
- * [new branch]      newbranch  -> origin/newbranch
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-Deleted branch newbranch (was 198a5d3).
-Deleted tag 'newtag' (was 198a5d3)
-From /build/git-2.20.1/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> newtag
- * [new tag]         excess-1   -> excess-1
- * [new tag]         excess-2   -> excess-2
- * [new tag]         excess-3   -> excess-3
- * [new tag]         excess-4   -> excess-4
- * [new tag]         excess-5   -> excess-5
- * [new tag]         excess-6   -> excess-6
- * [new tag]         excess-7   -> excess-7
-198a5d34ee7685aad0c688d4833bbf879556f13f
-fatal: Needed a single revision
-ok 53 - name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune origin refs/tags/*:refs/tags/*; branch:kept tag:pruned
+expecting success: 
+			printf 'eQm[*]c' | q_to_nul >f &&
+			git grep -f f -F a
+		
+Binary file a matches
+ok 20 - git grep -f f -F 'e<NUL>m[*]c' a
 
 expecting success: 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/git-2.20.1/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
+			printf 'EQM[*]C' | q_to_nul >f &&
+			git grep -f f -Fi a
+		
+Binary file a matches
+ok 21 - git grep -f f -Fi 'E<NUL>M[*]C' a
 
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
+expecting success: 
+			printf 'yQ[f]' | q_to_nul >f &&
+			test_must_fail git grep -f f -F a
+		
+ok 22 - git grep -f f -F 'y<NUL>[f]' a
 
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+expecting success: 
+			printf '[y]Qf' | q_to_nul >f &&
+			test_must_fail git grep -f f -F a
+		
+ok 23 - git grep -f f -F '[y]<NUL>f' a
 
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch --prune "file:///build/git-2.20.1/t/trash directory.t5510-fetch/." refs/tags/*:refs/tags/* &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-From file:///build/git-2.20.1/t/trash directory.t5510-fetch/.
- * [new tag]         newtag     -> newtag
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-Deleted branch newbranch (was 198a5d3).
-Deleted tag 'newtag' (was 198a5d3)
-From file:///build/git-2.20.1/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> newtag
-198a5d34ee7685aad0c688d4833bbf879556f13f
-fatal: Needed a single revision
-ok 54 - link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune origin refs/tags/*:refs/tags/*; branch:kept tag:pruned
+expecting success: 
+			printf 'YQ[F]' | q_to_nul >f &&
+			test_must_fail git grep -f f -Fi a
+		
+ok 24 - git grep -f f -Fi 'Y<NUL>[F]' a
 
 expecting success: 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/git-2.20.1/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
+			printf '[Y]QF' | q_to_nul >f &&
+			test_must_fail git grep -f f -Fi a
+		
+ok 25 - git grep -f f -Fi '[Y]<NUL>F' a
 
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
+expecting success: 
+			printf 'æQ[ð]' | q_to_nul >f &&
+			test_must_fail git grep -f f -F a
+		
+ok 26 - git grep -f f -F 'æ<NUL>[ð]' a
 
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+expecting success: 
+			printf '[æ]Qð' | q_to_nul >f &&
+			test_must_fail git grep -f f -F a
+		
+ok 27 - git grep -f f -F '[æ]<NUL>ð' a
 
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch --prune origin refs/tags/*:refs/tags/* +refs/heads/*:refs/remotes/origin/* &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-From file:///build/git-2.20.1/t/trash directory.t5510-fetch/.
- * [new tag]         newtag     -> newtag
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-Deleted branch newbranch (was 198a5d3).
-Deleted tag 'newtag' (was 198a5d3)
-From /build/git-2.20.1/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> origin/newbranch
- - [deleted]         (none)     -> newtag
-fatal: Needed a single revision
-fatal: Needed a single revision
-ok 55 - name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune origin refs/tags/*:refs/tags/* +refs/heads/*:refs/remotes/origin/*; branch:pruned tag:pruned
+expecting success: 
+			printf 'ÆQ[�]' | q_to_nul >f &&
+			test_must_fail git grep -f f -Fi a
+		
+ok 28 - git grep -f f -Fi 'Æ<NUL>[�]' a
 
 expecting success: 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/git-2.20.1/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
+			printf '[Æ]Q�' | q_to_nul >f &&
+			test_must_fail git grep -f f -Fi a
+		
+ok 29 - git grep -f f -Fi '[Æ]<NUL>�' a
 
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
+checking known breakage: 
+			printf 'ÆQ�' | q_to_nul >f &&
+			git grep -f f -i a
+		
+not ok 30 - git grep -f f -i 'Æ<NUL>�' a # TODO known breakage
 
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+checking known breakage: 
+			printf 'yQ[f]' | q_to_nul >f &&
+			git grep -f f  a
+		
+not ok 31 - git grep -f f  'y<NUL>[f]' a # TODO known breakage
 
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch --prune "file:///build/git-2.20.1/t/trash directory.t5510-fetch/." refs/tags/*:refs/tags/* +refs/heads/*:refs/remotes/origin/* &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-From file:///build/git-2.20.1/t/trash directory.t5510-fetch/.
- * [new branch]      newbranch  -> origin/newbranch
- * [new tag]         newtag     -> newtag
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-Deleted branch newbranch (was 198a5d3).
-Deleted tag 'newtag' (was 198a5d3)
-From file:///build/git-2.20.1/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> origin/newbranch
- - [deleted]         (none)     -> newtag
-fatal: Needed a single revision
-fatal: Needed a single revision
-ok 56 - link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune origin refs/tags/*:refs/tags/* +refs/heads/*:refs/remotes/origin/*; branch:pruned tag:pruned
+checking known breakage: 
+			printf '[y]Qf' | q_to_nul >f &&
+			git grep -f f  a
+		
+not ok 32 - git grep -f f  '[y]<NUL>f' a # TODO known breakage
 
-expecting success: 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/git-2.20.1/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
+checking known breakage: 
+			printf 'YQ[F]' | q_to_nul >f &&
+			git grep -f f -i a
+		
+not ok 33 - git grep -f f -i 'Y<NUL>[F]' a # TODO known breakage
 
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
+checking known breakage: 
+			printf '[Y]Qf' | q_to_nul >f &&
+			git grep -f f -i a
+		
+not ok 34 - git grep -f f -i '[Y]<NUL>f' a # TODO known breakage
 
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+checking known breakage: 
+			printf 'æQ[ð]' | q_to_nul >f &&
+			git grep -f f  a
+		
+not ok 35 - git grep -f f  'æ<NUL>[ð]' a # TODO known breakage
 
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch  &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-From file:///build/git-2.20.1/t/trash directory.t5510-fetch/.
- * [new branch]      newbranch  -> origin/newbranch
- * [new tag]         newtag     -> newtag
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-Deleted branch newbranch (was 198a5d3).
-Deleted tag 'newtag' (was 198a5d3)
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-ok 57 - name prune fetch.prune=false remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:kept tag:kept
+checking known breakage: 
+			printf '[æ]Qð' | q_to_nul >f &&
+			git grep -f f  a
+		
+not ok 36 - git grep -f f  '[æ]<NUL>ð' a # TODO known breakage
 
-expecting success: 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/git-2.20.1/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
+checking known breakage: 
+			printf 'ÆQ[�]' | q_to_nul >f &&
+			git grep -f f -i a
+		
+not ok 37 - git grep -f f -i 'Æ<NUL>[�]' a # TODO known breakage
 
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
+checking known breakage: 
+			printf 'eQm.*cQ' | q_to_nul >f &&
+			git grep -f f  a
+		
+not ok 38 - git grep -f f  'e<NUL>m.*c<NUL>' a # TODO known breakage
 
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+checking known breakage: 
+			printf 'EQM.*cQ' | q_to_nul >f &&
+			git grep -f f -i a
+		
+not ok 39 - git grep -f f -i 'E<NUL>M.*c<NUL>' a # TODO known breakage
 
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch "file:///build/git-2.20.1/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-Deleted branch newbranch (was 198a5d3).
-Deleted tag 'newtag' (was 198a5d3)
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-ok 58 - link prune fetch.prune=false remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:kept tag:kept
+checking known breakage: 
+			printf 'eQm[*]c' | q_to_nul >f &&
+			test_must_fail git grep -f f  a
+		
+Binary file a matches
+test_must_fail: command succeeded: git grep -f f a
+not ok 40 - git grep -f f  'e<NUL>m[*]c' a # TODO known breakage
 
-expecting success: 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/git-2.20.1/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
+checking known breakage: 
+			printf 'EQM[*]C' | q_to_nul >f &&
+			test_must_fail git grep -f f -i a
+		
+Binary file a matches
+test_must_fail: command succeeded: git grep -f f -i a
+not ok 41 - git grep -f f -i 'E<NUL>M[*]C' a # TODO known breakage
 
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
+expecting success: 
+			printf 'NOMATCHQð' | q_to_nul >f &&
+			test_must_fail git grep -f f -i a
+		
+ok 42 - git grep -f f -i 'NOMATCH<NUL>ð' a
 
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+checking known breakage: 
+			printf '[Æ]QNOMATCH' | q_to_nul >f &&
+			test_must_fail git grep -f f -i a
+		
+Binary file a matches
+test_must_fail: command succeeded: git grep -f f -i a
+not ok 43 - git grep -f f -i '[Æ]<NUL>NOMATCH' a # TODO known breakage
 
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch --no-prune &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-Deleted branch newbranch (was 198a5d3).
-Deleted tag 'newtag' (was 198a5d3)
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-ok 59 - name prune fetch.prune=false remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept
+checking known breakage: 
+			printf '[æ]QNOMATCH' | q_to_nul >f &&
+			test_must_fail git grep -f f -i a
+		
+Binary file a matches
+test_must_fail: command succeeded: git grep -f f -i a
+not ok 44 - git grep -f f -i '[æ]<NUL>NOMATCH' a # TODO known breakage
 
 expecting success: 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/git-2.20.1/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
+			printf '[Æ]Qð' | q_to_nul >f &&
+			git grep -f f -i a
+		
+Binary file a matches
+ok 45 - git grep -f f -i '[Æ]<NUL>ð' a
 
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
+expecting success: 
+			printf '[æ]Qð' | q_to_nul >f &&
+			git grep -f f -i a
+		
+Binary file a matches
+ok 46 - git grep -f f -i '[æ]<NUL>ð' a
 
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+expecting success: 
+			printf 'yQ[f]' | q_to_nul >f &&
+			test_must_fail git grep -f f -F a
+		
+ok 47 - git grep -f f -F 'y<NUL>[f]' a
 
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch --no-prune &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-Deleted branch newbranch (was 198a5d3).
-Deleted tag 'newtag' (was 198a5d3)
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-ok 60 - link prune fetch.prune=false remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept
+expecting success: 
+			printf 'YQ[F]' | q_to_nul >f &&
+			test_must_fail git grep -f f -Fi a
+		
+ok 48 - git grep -f f -Fi 'Y<NUL>[F]' a
 
 expecting success: 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/git-2.20.1/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
+			printf 'yQNOMATCH' | q_to_nul >f &&
+			test_must_fail git grep -f f  a
+		
+ok 49 - git grep -f f  'y<NUL>NOMATCH' a
 
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
+expecting success: 
+			printf 'QNOMATCH' | q_to_nul >f &&
+			test_must_fail git grep -f f  a
+		
+ok 50 - git grep -f f  '<NUL>NOMATCH' a
 
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+expecting success: 
+			printf 'YQNOMATCH' | q_to_nul >f &&
+			test_must_fail git grep -f f -i a
+		
+ok 51 - git grep -f f -i 'Y<NUL>NOMATCH' a
 
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch --prune &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-Deleted branch newbranch (was 198a5d3).
-Deleted tag 'newtag' (was 198a5d3)
-From /build/git-2.20.1/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> origin/newbranch
-fatal: Needed a single revision
-198a5d34ee7685aad0c688d4833bbf879556f13f
-ok 61 - name prune fetch.prune=false remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept
+expecting success: 
+			printf 'QNOMATCH' | q_to_nul >f &&
+			test_must_fail git grep -f f -i a
+		
+ok 52 - git grep -f f -i '<NUL>NOMATCH' a
 
 expecting success: 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/git-2.20.1/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
+			printf 'æQ[ð]' | q_to_nul >f &&
+			test_must_fail git grep -f f -F a
+		
+ok 53 - git grep -f f -F 'æ<NUL>[ð]' a
 
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
+expecting success: 
+			printf 'ÆQ[�]' | q_to_nul >f &&
+			test_must_fail git grep -f f -Fi a
+		
+ok 54 - git grep -f f -Fi 'Æ<NUL>[�]' a
 
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+expecting success: 
+			printf 'yQNÓMATCH' | q_to_nul >f &&
+			test_must_fail git grep -f f  a
+		
+ok 55 - git grep -f f  'y<NUL>NÓMATCH' a
 
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch --prune &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-From file:///build/git-2.20.1/t/trash directory.t5510-fetch/.
- * [new branch]      newbranch  -> origin/newbranch
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-Deleted branch newbranch (was 198a5d3).
-Deleted tag 'newtag' (was 198a5d3)
-From /build/git-2.20.1/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> origin/newbranch
-fatal: Needed a single revision
-198a5d34ee7685aad0c688d4833bbf879556f13f
-ok 62 - link prune fetch.prune=false remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept
+expecting success: 
+			printf 'QNÓMATCH' | q_to_nul >f &&
+			test_must_fail git grep -f f  a
+		
+ok 56 - git grep -f f  '<NUL>NÓMATCH' a
 
 expecting success: 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/git-2.20.1/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
+			printf 'YQNÓMATCH' | q_to_nul >f &&
+			test_must_fail git grep -f f -i a
+		
+ok 57 - git grep -f f -i 'Y<NUL>NÓMATCH' a
 
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
+expecting success: 
+			printf 'QNÓMATCH' | q_to_nul >f &&
+			test_must_fail git grep -f f -i a
+		
+ok 58 - git grep -f f -i '<NUL>NÓMATCH' a
 
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+expecting success: 
+	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
 
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch  &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-From file:///build/git-2.20.1/t/trash directory.t5510-fetch/.
- * [new branch]      newbranch  -> origin/newbranch
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-Deleted branch newbranch (was 198a5d3).
-Deleted tag 'newtag' (was 198a5d3)
-From /build/git-2.20.1/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> origin/newbranch
-fatal: Needed a single revision
-198a5d34ee7685aad0c688d4833bbf879556f13f
-ok 63 - name prune fetch.prune=true remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:pruned tag:kept
+ok 59 - grep respects binary diff attribute
 
 expecting success: 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/git-2.20.1/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
+	git grep --cached text t >actual &&
+	test_cmp expect actual
 
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
+ok 60 - grep --cached respects binary diff attribute
 
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+expecting success: 
+	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
 
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch "file:///build/git-2.20.1/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-From file:///build/git-2.20.1/t/trash directory.t5510-fetch/.
- * [new branch]      newbranch  -> origin/newbranch
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-Deleted branch newbranch (was 198a5d3).
-Deleted tag 'newtag' (was 198a5d3)
-From file:///build/git-2.20.1/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> origin/newbranch
-fatal: Needed a single revision
-198a5d34ee7685aad0c688d4833bbf879556f13f
-ok 64 - link prune fetch.prune=true remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:pruned tag:kept
+rm '.gitattributes'
+ok 61 - grep --cached respects binary diff attribute (2)
 
 expecting success: 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/git-2.20.1/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
+	git 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
 
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
+[master bdbcb6d] new
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 t
+ok 62 - grep revision respects binary diff attribute
 
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+expecting success: 
+	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
 
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch --prune &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-From file:///build/git-2.20.1/t/trash directory.t5510-fetch/.
- * [new branch]      newbranch  -> origin/newbranch
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-Deleted branch newbranch (was 198a5d3).
-Deleted tag 'newtag' (was 198a5d3)
-From /build/git-2.20.1/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> origin/newbranch
-fatal: Needed a single revision
-198a5d34ee7685aad0c688d4833bbf879556f13f
-ok 65 - name prune fetch.prune=true remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept
+ok 63 - grep respects not-binary diff attribute
 
 expecting success: 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/git-2.20.1/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
+	echo a diff=foo >.gitattributes &&
+	git config diff.foo.textconv "\"$(pwd)\""/nul_to_q_textconv
 
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
+ok 64 - setup textconv filters
 
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+expecting success: 
+	test_must_fail git grep Qfile
 
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch --prune &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-From file:///build/git-2.20.1/t/trash directory.t5510-fetch/.
- * [new branch]      newbranch  -> origin/newbranch
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-Deleted branch newbranch (was 198a5d3).
-Deleted tag 'newtag' (was 198a5d3)
-From /build/git-2.20.1/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> origin/newbranch
-fatal: Needed a single revision
-198a5d34ee7685aad0c688d4833bbf879556f13f
-ok 66 - link prune fetch.prune=true remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept
+ok 65 - grep does not honor textconv
 
 expecting success: 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/git-2.20.1/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
+	echo "a:binaryQfileQm[*]cQ*æQð" >expect &&
+	git grep --textconv Qfile >actual &&
+	test_cmp expect actual
 
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
+ok 66 - grep --textconv honors textconv
 
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+expecting success: 
+	test_must_fail git grep --no-textconv Qfile
 
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch --no-prune &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-From file:///build/git-2.20.1/t/trash directory.t5510-fetch/.
- * [new branch]      newbranch  -> origin/newbranch
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-Deleted branch newbranch (was 198a5d3).
-Deleted tag 'newtag' (was 198a5d3)
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-ok 67 - name prune fetch.prune=true remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept
+ok 67 - grep --no-textconv does not honor textconv
 
 expecting success: 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/git-2.20.1/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
+	echo "HEAD:a:binaryQfileQm[*]cQ*æQð" >expect &&
+	git grep --textconv Qfile HEAD:a >actual &&
+	test_cmp expect actual
 
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
+ok 68 - grep --textconv blob honors textconv
 
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+# still have 15 known breakage(s)
+# passed all remaining 53 test(s)
+1..68
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t7101-reset-empty-subdirs.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7101-reset-empty-subdirs/.git/
+expecting success: mkdir path0 &&
+     cp "$TEST_DIRECTORY"/../COPYING path0/COPYING &&
+     git add path0/COPYING &&
+     git commit -m add -a
+[master (root-commit) c842825] add
+ Author: A U Thor <author@example.com>
+ 1 file changed, 360 insertions(+)
+ create mode 100644 path0/COPYING
+ok 1 - creating initial files
 
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch --no-prune &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-Deleted branch newbranch (was 198a5d3).
-Deleted tag 'newtag' (was 198a5d3)
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-ok 68 - link prune fetch.prune=true remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept
+expecting success: mkdir path1 &&
+     mkdir path1/path2 &&
+     cp "$TEST_DIRECTORY"/../COPYING path1/path2/COPYING &&
+     cp "$TEST_DIRECTORY"/../COPYING path1/COPYING &&
+     cp "$TEST_DIRECTORY"/../COPYING COPYING &&
+     cp "$TEST_DIRECTORY"/../COPYING 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 e59a838] change
+ Author: A U Thor <author@example.com>
+ 4 files changed, 1440 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: 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/git-2.20.1/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
+expecting success: git reset --hard HEAD^
+HEAD is now at c842825 add
+ok 3 - resetting tree HEAD^
 
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
+expecting success: test -d path0 &&
+     test -f path0/COPYING
+ok 4 - checking initial files exist after rewind
 
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+expecting success: ! test -f path1/path2/COPYING
+ok 5 - checking lack of path1/path2/COPYING
 
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch  &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-Deleted branch newbranch (was 198a5d3).
-Deleted tag 'newtag' (was 198a5d3)
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-ok 69 - name prune fetch.prune=unset remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:kept tag:kept
+expecting success: ! test -f path1/COPYING
+ok 6 - checking lack of path1/COPYING
 
-expecting success: 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/git-2.20.1/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
+expecting success: ! test -f COPYING
+ok 7 - checking lack of COPYING
 
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
+expecting success: ! test -f path0/COPYING-TOO
+ok 8 - checking checking lack of path1/COPYING-TOO
 
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+expecting success: ! test -d path1/path2
+ok 9 - checking lack of path1/path2
 
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch "file:///build/git-2.20.1/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-Deleted branch newbranch (was 198a5d3).
-Deleted tag 'newtag' (was 198a5d3)
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-ok 70 - link prune fetch.prune=unset remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:kept tag:kept
+expecting success: ! test -d path1
+ok 10 - checking lack of path1
 
+# passed all 10 test(s)
+1..10
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t7103-reset-bare.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7103-reset-bare/.git/
 expecting success: 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/git-2.20.1/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
+	echo one >file &&
+	git add file &&
+	git commit -m one &&
+	echo two >file &&
+	git commit -a -m two
 
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
+[master (root-commit) 9895ce0] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+[master 97931ae] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 1 - setup non-bare
 
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+expecting success: 
+	(cd .git &&
+	 test_must_fail git reset --hard)
 
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch --no-prune &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-Deleted branch newbranch (was 198a5d3).
-Deleted tag 'newtag' (was 198a5d3)
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-ok 71 - name prune fetch.prune=unset remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept
+fatal: this operation must be run in a work tree
+ok 2 - "hard" reset requires a worktree
 
 expecting success: 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/git-2.20.1/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
+	(cd .git &&
+	 test_must_fail git reset --merge)
 
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
+fatal: this operation must be run in a work tree
+ok 3 - "merge" reset requires a worktree
 
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+expecting success: 
+	(cd .git &&
+	 test_must_fail git reset --keep)
 
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch --no-prune &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-Deleted branch newbranch (was 198a5d3).
-Deleted tag 'newtag' (was 198a5d3)
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-ok 72 - link prune fetch.prune=unset remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept
+fatal: this operation must be run in a work tree
+ok 4 - "keep" reset requires a worktree
 
 expecting success: 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/git-2.20.1/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
+	(cd .git && git reset)
 
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
+ok 5 - "mixed" reset is ok
 
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+expecting success: 
+	(cd .git && git reset --soft)
 
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch --prune &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-Deleted branch newbranch (was 198a5d3).
-Deleted tag 'newtag' (was 198a5d3)
-From /build/git-2.20.1/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> origin/newbranch
-fatal: Needed a single revision
-198a5d34ee7685aad0c688d4833bbf879556f13f
-ok 73 - name prune fetch.prune=unset remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept
+ok 6 - "soft" reset is ok
 
 expecting success: 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/git-2.20.1/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
+	mkdir worktree &&
+	GIT_WORK_TREE=$PWD/worktree GIT_DIR=$PWD/.git git reset --hard &&
+	test_cmp file worktree/file
 
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
+HEAD is now at 97931ae two
+ok 7 - hard reset works with GIT_WORK_TREE
 
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+expecting success: 
+	git clone --bare . bare.git &&
+	cd bare.git
 
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch --prune &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-From file:///build/git-2.20.1/t/trash directory.t5510-fetch/.
- * [new branch]      newbranch  -> origin/newbranch
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-Deleted branch newbranch (was 198a5d3).
-Deleted tag 'newtag' (was 198a5d3)
-From /build/git-2.20.1/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> origin/newbranch
-fatal: Needed a single revision
-198a5d34ee7685aad0c688d4833bbf879556f13f
-ok 74 - link prune fetch.prune=unset remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept
+Cloning into bare repository 'bare.git'...
+done.
+ok 8 - setup bare
 
 expecting success: 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/git-2.20.1/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
+	test_must_fail git reset --hard HEAD^
 
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
+fatal: this operation must be run in a work tree
+ok 9 - "hard" reset is not allowed in bare
 
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+expecting success: 
+	test_must_fail git reset --merge HEAD^
 
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch  &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-From file:///build/git-2.20.1/t/trash directory.t5510-fetch/.
- * [new branch]      newbranch  -> origin/newbranch
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-Deleted branch newbranch (was 198a5d3).
-Deleted tag 'newtag' (was 198a5d3)
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-ok 75 - name prune fetch.prune=false remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:kept tag:kept
+fatal: this operation must be run in a work tree
+ok 10 - "merge" reset is not allowed in bare
 
 expecting success: 
-		# make sure a newbranch is there in . and also in one
-		git branch -f newbranch &&
-		git tag -f newtag &&
-		(
-			cd one &&
-			test_unconfig fetch.prune &&
-			test_unconfig fetch.pruneTags &&
-			test_unconfig remote.origin.prune &&
-			test_unconfig remote.origin.pruneTags &&
-			git fetch "file:///build/git-2.20.1/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			git rev-parse --verify refs/remotes/origin/newbranch &&
-			git rev-parse --verify refs/tags/newtag
-		) &&
+	test_must_fail git reset --keep HEAD^
 
-		# now remove them
-		git branch -d newbranch &&
-		git tag -d newtag &&
+fatal: this operation must be run in a work tree
+ok 11 - "keep" reset is not allowed in bare
 
-		# then test
-		(
-			cd one &&
-			git_fetch_c="" &&
-			set_config_tristate fetch.prune $fetch_prune &&
-			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
-			set_config_tristate remote.origin.prune $remote_origin_prune &&
-			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+expecting success: 
+	test_must_fail git reset --mixed HEAD^
 
-			if test "$mode" != "link"
-			then
-				git_fetch_c=""
-			fi &&
-			git$git_fetch_c fetch "file:///build/git-2.20.1/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
-			case "$expected_branch" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			kept)
-				git rev-parse --verify refs/remotes/origin/newbranch
-				;;
-			esac &&
-			case "$expected_tag" in
-			pruned)
-				test_must_fail git rev-parse --verify refs/tags/newtag
-				;;
-			kept)
-				git rev-parse --verify refs/tags/newtag
-				;;
-			esac
-		)
-	
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-Deleted branch newbranch (was 198a5d3).
-Deleted tag 'newtag' (was 198a5d3)
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-ok 76 - link prune fetch.prune=false remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:kept tag:kept
+fatal: mixed reset is not allowed in a bare repository
+ok 12 - "mixed" reset is not allowed in bare
+
+expecting success: 
+	git reset --soft HEAD^ &&
+	test "$(git show --pretty=format:%s | head -n 1)" = "one"
+
+ok 13 - "soft" reset is allowed in bare
+
+# passed all 13 test(s)
+1..13
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t7104-reset-hard.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7104-reset-hard/.git/
+expecting success: 
+
+	mkdir before later &&
+	>before/1 &&
+	>before/2 &&
+	>hello &&
+	>later/3 &&
+	git add before hello later &&
+	git commit -m world &&
+
+	H=$(git rev-parse :hello) &&
+	git rm --cached hello &&
+	echo "100644 $H 2	hello" | git update-index --index-info &&
+
+	rm -f hello &&
+	mkdir -p hello &&
+	>hello/world &&
+	test "$(git ls-files -o)" = hello/world
+
+
+[master (root-commit) ab79795] world
+ Author: A U Thor <author@example.com>
+ 4 files changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 before/1
+ create mode 100644 before/2
+ create mode 100644 hello
+ create mode 100644 later/3
+rm 'hello'
+ok 1 - setup
+
+expecting success: 
+
+	git reset --hard &&
+	git ls-files --error-unmatch before/1 before/2 hello later/3 &&
+	test -f hello
+
+
+HEAD is now at ab79795 world
+before/1
+before/2
+hello
+later/3
+ok 2 - reset --hard should restore unmerged ones
+
+expecting success: 
+
+	T=$(git write-tree) &&
+	rm -f .git/index &&
+	git add before hello later &&
+	U=$(git write-tree) &&
+	test "$T" = "$U"
+
+
+ok 3 - reset --hard did not corrupt index or cached-tree
+
+# passed all 3 test(s)
+1..3
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t6600-test-reach.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6600-test-reach/.git/
+expecting success: 
+	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
+	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
+		done
+	done &&
+	git commit-graph write --reachable &&
+	mv .git/objects/info/commit-graph 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 &&
+	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
+Merging:
+7393be9 2-1
+virtual commit-1-2
+found 1 common ancestor:
+0d15007 1-1
+Merge made by the 'recursive' strategy.
+ 1-2.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-2.t
+Merging:
+1bf5db8 2-2
+virtual commit-1-3
+found 1 common ancestor:
+d299b7f 1-2
+Merge made by the 'recursive' strategy.
+ 1-3.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-3.t
+Merging:
+92bd651 2-3
+virtual commit-1-4
+found 1 common ancestor:
+4824988 1-3
+Merge made by the 'recursive' strategy.
+ 1-4.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-4.t
+Merging:
+a4e7c8a 2-4
+virtual commit-1-5
+found 1 common ancestor:
+365457e 1-4
+Merge made by the 'recursive' strategy.
+ 1-5.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-5.t
+Merging:
+2e8320d 2-5
+virtual commit-1-6
+found 1 common ancestor:
+c37c079 1-5
+Merge made by the 'recursive' strategy.
+ 1-6.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-6.t
+Merging:
+cad3ed9 2-6
+virtual commit-1-7
+found 1 common ancestor:
+a87f56a 1-6
+Merge made by the 'recursive' strategy.
+ 1-7.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-7.t
+Merging:
+aac73ea 2-7
+virtual commit-1-8
+found 1 common ancestor:
+e7afdd6 1-7
+Merge made by the 'recursive' strategy.
+ 1-8.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-8.t
+Merging:
+239f00a 2-8
+virtual commit-1-9
+found 1 common ancestor:
+2855ea4 1-8
+Merge made by the 'recursive' strategy.
+ 1-9.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-9.t
+Merging:
+7d3e798 2-9
+virtual commit-1-10
+found 1 common ancestor:
+5d90ff6 1-9
+Merge made by the 'recursive' 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
+Merging:
+3195915 3-1
+virtual commit-2-2
+found 1 common ancestor:
+7393be9 2-1
+Merge made by the 'recursive' strategy.
+ 1-2.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-2.t
+Merging:
+ffdcde5 3-2
+virtual commit-2-3
+found 1 common ancestor:
+1bf5db8 2-2
+Merge made by the 'recursive' strategy.
+ 1-3.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-3.t
+Merging:
+8ef79ca 3-3
+virtual commit-2-4
+found 1 common ancestor:
+92bd651 2-3
+Merge made by the 'recursive' strategy.
+ 1-4.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-4.t
+Merging:
+8a1d716 3-4
+virtual commit-2-5
+found 1 common ancestor:
+a4e7c8a 2-4
+Merge made by the 'recursive' strategy.
+ 1-5.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-5.t
+Merging:
+8db6a6c 3-5
+virtual commit-2-6
+found 1 common ancestor:
+2e8320d 2-5
+Merge made by the 'recursive' strategy.
+ 1-6.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-6.t
+Merging:
+491496e 3-6
+virtual commit-2-7
+found 1 common ancestor:
+cad3ed9 2-6
+Merge made by the 'recursive' strategy.
+ 1-7.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-7.t
+Merging:
+eb0ba81 3-7
+virtual commit-2-8
+found 1 common ancestor:
+aac73ea 2-7
+Merge made by the 'recursive' strategy.
+ 1-8.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-8.t
+Merging:
+90b5f9f 3-8
+virtual commit-2-9
+found 1 common ancestor:
+239f00a 2-8
+Merge made by the 'recursive' strategy.
+ 1-9.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-9.t
+Merging:
+a78eaa3 3-9
+virtual commit-2-10
+found 1 common ancestor:
+7d3e798 2-9
+Merge made by the 'recursive' 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
+Merging:
+af41a20 4-1
+virtual commit-3-2
+found 1 common ancestor:
+3195915 3-1
+Merge made by the 'recursive' strategy.
+ 1-2.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-2.t
+Merging:
+b6ad88f 4-2
+virtual commit-3-3
+found 1 common ancestor:
+ffdcde5 3-2
+Merge made by the 'recursive' strategy.
+ 1-3.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-3.t
+Merging:
+a3e50c3 4-3
+virtual commit-3-4
+found 1 common ancestor:
+8ef79ca 3-3
+Merge made by the 'recursive' strategy.
+ 1-4.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-4.t
+Merging:
+52bf1f6 4-4
+virtual commit-3-5
+found 1 common ancestor:
+8a1d716 3-4
+Merge made by the 'recursive' strategy.
+ 1-5.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-5.t
+Merging:
+aaafa12 4-5
+virtual commit-3-6
+found 1 common ancestor:
+8db6a6c 3-5
+Merge made by the 'recursive' strategy.
+ 1-6.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-6.t
+Merging:
+9fb3c9b 4-6
+virtual commit-3-7
+found 1 common ancestor:
+491496e 3-6
+Merge made by the 'recursive' strategy.
+ 1-7.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-7.t
+Merging:
+92fb89f 4-7
+virtual commit-3-8
+found 1 common ancestor:
+eb0ba81 3-7
+Merge made by the 'recursive' strategy.
+ 1-8.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-8.t
+Merging:
+ee4640a 4-8
+virtual commit-3-9
+found 1 common ancestor:
+90b5f9f 3-8
+Merge made by the 'recursive' strategy.
+ 1-9.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-9.t
+Merging:
+d5102f0 4-9
+virtual commit-3-10
+found 1 common ancestor:
+a78eaa3 3-9
+Merge made by the 'recursive' 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
+Merging:
+2948e13 5-1
+virtual commit-4-2
+found 1 common ancestor:
+af41a20 4-1
+Merge made by the 'recursive' strategy.
+ 1-2.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-2.t
+Merging:
+b4e848b 5-2
+virtual commit-4-3
+found 1 common ancestor:
+b6ad88f 4-2
+Merge made by the 'recursive' strategy.
+ 1-3.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-3.t
+Merging:
+4364d77 5-3
+virtual commit-4-4
+found 1 common ancestor:
+a3e50c3 4-3
+Merge made by the 'recursive' strategy.
+ 1-4.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-4.t
+Merging:
+95c9df8 5-4
+virtual commit-4-5
+found 1 common ancestor:
+52bf1f6 4-4
+Merge made by the 'recursive' strategy.
+ 1-5.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-5.t
+Merging:
+4174002 5-5
+virtual commit-4-6
+found 1 common ancestor:
+aaafa12 4-5
+Merge made by the 'recursive' strategy.
+ 1-6.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-6.t
+Merging:
+20b3a70 5-6
+virtual commit-4-7
+found 1 common ancestor:
+9fb3c9b 4-6
+Merge made by the 'recursive' strategy.
+ 1-7.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-7.t
+Merging:
+06046bd 5-7
+virtual commit-4-8
+found 1 common ancestor:
+92fb89f 4-7
+Merge made by the 'recursive' strategy.
+ 1-8.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-8.t
+Merging:
+48b11e0 5-8
+virtual commit-4-9
+found 1 common ancestor:
+ee4640a 4-8
+Merge made by the 'recursive' strategy.
+ 1-9.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-9.t
+Merging:
+17d7515 5-9
+virtual commit-4-10
+found 1 common ancestor:
+d5102f0 4-9
+Merge made by the 'recursive' 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
+Merging:
+d213662 6-1
+virtual commit-5-2
+found 1 common ancestor:
+2948e13 5-1
+Merge made by the 'recursive' strategy.
+ 1-2.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-2.t
+Merging:
+b611247 6-2
+virtual commit-5-3
+found 1 common ancestor:
+b4e848b 5-2
+Merge made by the 'recursive' strategy.
+ 1-3.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-3.t
+Merging:
+a14f9cb 6-3
+virtual commit-5-4
+found 1 common ancestor:
+4364d77 5-3
+Merge made by the 'recursive' strategy.
+ 1-4.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-4.t
+Merging:
+8f21391 6-4
+virtual commit-5-5
+found 1 common ancestor:
+95c9df8 5-4
+Merge made by the 'recursive' strategy.
+ 1-5.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-5.t
+Merging:
+2bb630e 6-5
+virtual commit-5-6
+found 1 common ancestor:
+4174002 5-5
+Merge made by the 'recursive' strategy.
+ 1-6.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-6.t
+Merging:
+98cc5ec 6-6
+virtual commit-5-7
+found 1 common ancestor:
+20b3a70 5-6
+Merge made by the 'recursive' strategy.
+ 1-7.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-7.t
+Merging:
+9c0ab3e 6-7
+virtual commit-5-8
+found 1 common ancestor:
+06046bd 5-7
+Merge made by the 'recursive' strategy.
+ 1-8.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-8.t
+Merging:
+3824dbc 6-8
+virtual commit-5-9
+found 1 common ancestor:
+48b11e0 5-8
+Merge made by the 'recursive' strategy.
+ 1-9.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-9.t
+Merging:
+e8b8a49 6-9
+virtual commit-5-10
+found 1 common ancestor:
+17d7515 5-9
+Merge made by the 'recursive' 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
+Merging:
+3c4cef0 7-1
+virtual commit-6-2
+found 1 common ancestor:
+d213662 6-1
+Merge made by the 'recursive' strategy.
+ 1-2.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-2.t
+Merging:
+fc239af 7-2
+virtual commit-6-3
+found 1 common ancestor:
+b611247 6-2
+Merge made by the 'recursive' strategy.
+ 1-3.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-3.t
+Merging:
+772be73 7-3
+virtual commit-6-4
+found 1 common ancestor:
+a14f9cb 6-3
+Merge made by the 'recursive' strategy.
+ 1-4.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-4.t
+Merging:
+3ca79c9 7-4
+virtual commit-6-5
+found 1 common ancestor:
+8f21391 6-4
+Merge made by the 'recursive' strategy.
+ 1-5.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-5.t
+Merging:
+d023c5c 7-5
+virtual commit-6-6
+found 1 common ancestor:
+2bb630e 6-5
+Merge made by the 'recursive' strategy.
+ 1-6.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-6.t
+Merging:
+254441b 7-6
+virtual commit-6-7
+found 1 common ancestor:
+98cc5ec 6-6
+Merge made by the 'recursive' strategy.
+ 1-7.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-7.t
+Merging:
+194d475 7-7
+virtual commit-6-8
+found 1 common ancestor:
+9c0ab3e 6-7
+Merge made by the 'recursive' strategy.
+ 1-8.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-8.t
+Merging:
+001094e 7-8
+virtual commit-6-9
+found 1 common ancestor:
+3824dbc 6-8
+Merge made by the 'recursive' strategy.
+ 1-9.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-9.t
+Merging:
+bfd4d81 7-9
+virtual commit-6-10
+found 1 common ancestor:
+e8b8a49 6-9
+Merge made by the 'recursive' 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
+Merging:
+25a847a 8-1
+virtual commit-7-2
+found 1 common ancestor:
+3c4cef0 7-1
+Merge made by the 'recursive' strategy.
+ 1-2.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-2.t
+Merging:
+6ea0ec6 8-2
+virtual commit-7-3
+found 1 common ancestor:
+fc239af 7-2
+Merge made by the 'recursive' strategy.
+ 1-3.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-3.t
+Merging:
+0968afe 8-3
+virtual commit-7-4
+found 1 common ancestor:
+772be73 7-3
+Merge made by the 'recursive' strategy.
+ 1-4.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-4.t
+Merging:
+c6a12b0 8-4
+virtual commit-7-5
+found 1 common ancestor:
+3ca79c9 7-4
+Merge made by the 'recursive' strategy.
+ 1-5.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-5.t
+Merging:
+e223128 8-5
+virtual commit-7-6
+found 1 common ancestor:
+d023c5c 7-5
+Merge made by the 'recursive' strategy.
+ 1-6.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-6.t
+Merging:
+f863cb8 8-6
+virtual commit-7-7
+found 1 common ancestor:
+254441b 7-6
+Merge made by the 'recursive' strategy.
+ 1-7.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-7.t
+Merging:
+6337e52 8-7
+virtual commit-7-8
+found 1 common ancestor:
+194d475 7-7
+Merge made by the 'recursive' strategy.
+ 1-8.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-8.t
+Merging:
+c59194d 8-8
+virtual commit-7-9
+found 1 common ancestor:
+001094e 7-8
+Merge made by the 'recursive' strategy.
+ 1-9.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-9.t
+Merging:
+ccddb60 8-9
+virtual commit-7-10
+found 1 common ancestor:
+bfd4d81 7-9
+Merge made by the 'recursive' 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
+Merging:
+48082f2 9-1
+virtual commit-8-2
+found 1 common ancestor:
+25a847a 8-1
+Merge made by the 'recursive' strategy.
+ 1-2.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-2.t
+Merging:
+af387a3 9-2
+virtual commit-8-3
+found 1 common ancestor:
+6ea0ec6 8-2
+Merge made by the 'recursive' strategy.
+ 1-3.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-3.t
+Merging:
+d6b5c7e 9-3
+virtual commit-8-4
+found 1 common ancestor:
+0968afe 8-3
+Merge made by the 'recursive' strategy.
+ 1-4.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-4.t
+Merging:
+208d869 9-4
+virtual commit-8-5
+found 1 common ancestor:
+c6a12b0 8-4
+Merge made by the 'recursive' strategy.
+ 1-5.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-5.t
+Merging:
+04ce14a 9-5
+virtual commit-8-6
+found 1 common ancestor:
+e223128 8-5
+Merge made by the 'recursive' strategy.
+ 1-6.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-6.t
+Merging:
+95ec0bb 9-6
+virtual commit-8-7
+found 1 common ancestor:
+f863cb8 8-6
+Merge made by the 'recursive' strategy.
+ 1-7.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-7.t
+Merging:
+9db19ce 9-7
+virtual commit-8-8
+found 1 common ancestor:
+6337e52 8-7
+Merge made by the 'recursive' strategy.
+ 1-8.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-8.t
+Merging:
+1140e64 9-8
+virtual commit-8-9
+found 1 common ancestor:
+c59194d 8-8
+Merge made by the 'recursive' strategy.
+ 1-9.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-9.t
+Merging:
+b96ffc8 9-9
+virtual commit-8-10
+found 1 common ancestor:
+ccddb60 8-9
+Merge made by the 'recursive' 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
+Merging:
+b42f416 10-1
+virtual commit-9-2
+found 1 common ancestor:
+48082f2 9-1
+Merge made by the 'recursive' strategy.
+ 1-2.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-2.t
+Merging:
+08aefe5 10-2
+virtual commit-9-3
+found 1 common ancestor:
+af387a3 9-2
+Merge made by the 'recursive' strategy.
+ 1-3.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-3.t
+Merging:
+1f1c74f 10-3
+virtual commit-9-4
+found 1 common ancestor:
+d6b5c7e 9-3
+Merge made by the 'recursive' strategy.
+ 1-4.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-4.t
+Merging:
+97ae747 10-4
+virtual commit-9-5
+found 1 common ancestor:
+208d869 9-4
+Merge made by the 'recursive' strategy.
+ 1-5.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-5.t
+Merging:
+edcde8e 10-5
+virtual commit-9-6
+found 1 common ancestor:
+04ce14a 9-5
+Merge made by the 'recursive' strategy.
+ 1-6.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-6.t
+Merging:
+aa4c999 10-6
+virtual commit-9-7
+found 1 common ancestor:
+95ec0bb 9-6
+Merge made by the 'recursive' strategy.
+ 1-7.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-7.t
+Merging:
+6d7cc92 10-7
+virtual commit-9-8
+found 1 common ancestor:
+9db19ce 9-7
+Merge made by the 'recursive' strategy.
+ 1-8.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-8.t
+Merging:
+4ad1d23 10-8
+virtual commit-9-9
+found 1 common ancestor:
+1140e64 9-8
+Merge made by the 'recursive' strategy.
+ 1-9.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-9.t
+Merging:
+28a5e4c 10-9
+virtual commit-9-10
+found 1 common ancestor:
+b96ffc8 9-9
+Merge made by the 'recursive' strategy.
+ 1-10.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1-10.t
+Computing commit graph generation numbers:   1% (1/100)   
Computing commit graph generation numbers:   2% (2/100)   
Computing commit graph generation numbers:   3% (3/100)   
Computing commit graph generation numbers:   4% (4/100)   
Computing commit graph generation numbers:   5% (5/100)   
Computing commit graph generation numbers:   6% (6/100)   
Computing commit graph generation numbers:   7% (7/100)   
Computing commit graph generation numbers:   8% (8/100)   
Computing commit graph generation numbers:   9% (9/100)   
Computing commit graph generation numbers:  10% (10/100)   
Computing commit graph generation numbers:  11% (11/100)   
Computing commit graph generation numbers:  12% (12/100)   
Computing commit graph generation numbers:  13% (13/100)   
Computing commit graph generation numbers:  14% (14/100)   
Computing commit graph generation numbers:  15% (15/100)   
Computing commit graph generation numbers:  16% (16/100)   
Computing commit graph generation numbers:  17% (17/100)   
Computing commit graph generation numbers:  18% (18/100)   
Computing commit graph generation numbers:  19% (19/100)   
Computing commit graph generation numbers:  20% (20/100)   
Computing commit graph generation numbers:  21% (21/100)   
Computing commit graph generation numbers:  22% (22/100)   
Computing commit graph generation numbers:  23% (23/100)   
Computing commit graph generation numbers:  24% (24/100)   
Computing commit graph generation numbers:  25% (25/100)   
Computing commit graph generation numbers:  26% (26/100)   
Computing commit graph generation numbers:  27% (27/100)   
Computing commit graph generation numbers:  28% (28/100)   
Computing commit graph generation numbers:  29% (29/100)   
Computing commit graph generation numbers:  30% (30/100)   
Computing commit graph generation numbers:  31% (31/100)   
Computing commit graph generation numbers:  32% (32/100)   
Computing commit graph generation numbers:  33% (33/100)   
Computing commit graph generation numbers:  34% (34/100)   
Computing commit graph generation numbers:  35% (35/100)   
Computing commit graph generation numbers:  36% (36/100)   
Computing commit graph generation numbers:  37% (37/100)   
Computing commit graph generation numbers:  38% (38/100)   
Computing commit graph generation numbers:  39% (39/100)   
Computing commit graph generation numbers:  40% (40/100)   
Computing commit graph generation numbers:  41% (41/100)   
Computing commit graph generation numbers:  42% (42/100)   
Computing commit graph generation numbers:  43% (43/100)   
Computing commit graph generation numbers:  44% (44/100)   
Computing commit graph generation numbers:  45% (45/100)   
Computing commit graph generation numbers:  46% (46/100)   
Computing commit graph generation numbers:  47% (47/100)   
Computing commit graph generation numbers:  48% (48/100)   
Computing commit graph generation numbers:  49% (49/100)   
Computing commit graph generation numbers:  50% (50/100)   
Computing commit graph generation numbers:  51% (51/100)   
Computing commit graph generation numbers:  52% (52/100)   
Computing commit graph generation numbers:  53% (53/100)   
Computing commit graph generation numbers:  54% (54/100)   
Computing commit graph generation numbers:  55% (55/100)   
Computing commit graph generation numbers:  56% (56/100)   
Computing commit graph generation numbers:  57% (57/100)   
Computing commit graph generation numbers:  58% (58/100)   
Computing commit graph generation numbers:  59% (59/100)   
Computing commit graph generation numbers:  60% (60/100)   
Computing commit graph generation numbers:  61% (61/100)   
Computing commit graph generation numbers:  62% (62/100)   
Computing commit graph generation numbers:  63% (63/100)   
Computing commit graph generation numbers:  64% (64/100)   
Computing commit graph generation numbers:  65% (65/100)   
Computing commit graph generation numbers:  66% (66/100)   
Computing commit graph generation numbers:  67% (67/100)   
Computing commit graph generation numbers:  68% (68/100)   
Computing commit graph generation numbers:  69% (69/100)   
Computing commit graph generation numbers:  70% (70/100)   
Computing commit graph generation numbers:  71% (71/100)   
Computing commit graph generation numbers:  72% (72/100)   
Computing commit graph generation numbers:  73% (73/100)   
Computing commit graph generation numbers:  74% (74/100)   
Computing commit graph generation numbers:  75% (75/100)   
Computing commit graph generation numbers:  76% (76/100)   
Computing commit graph generation numbers:  77% (77/100)   
Computing commit graph generation numbers:  78% (78/100)   
Computing commit graph generation numbers:  79% (79/100)   
Computing commit graph generation numbers:  80% (80/100)   
Computing commit graph generation numbers:  81% (81/100)   
Computing commit graph generation numbers:  82% (82/100)   
Computing commit graph generation numbers:  83% (83/100)   
Computing commit graph generation numbers:  84% (84/100)   
Computing commit graph generation numbers:  85% (85/100)   
Computing commit graph generation numbers:  86% (86/100)   
Computing commit graph generation numbers:  87% (87/100)   
Computing commit graph generation numbers:  88% (88/100)   
Computing commit graph generation numbers:  89% (89/100)   
Computing commit graph generation numbers:  90% (90/100)   
Computing commit graph generation numbers:  91% (91/100)   
Computing commit graph generation numbers:  92% (92/100)   
Computing commit graph generation numbers:  93% (93/100)   
Computing commit graph generation numbers:  94% (94/100)   
Computing commit graph generation numbers:  95% (95/100)   
Computing commit graph generation numbers:  96% (96/100)   
Computing commit graph generation numbers:  97% (97/100)   
Computing commit graph generation numbers:  98% (98/100)   
Computing commit graph generation numbers:  99% (99/100)   
Computing commit graph generation numbers: 100% (100/100)   
Computing commit graph generation numbers: 100% (100/100), done.
+Computing commit graph generation numbers:   4% (1/25)   
Computing commit graph generation numbers:   8% (2/25)   
Computing commit graph generation numbers:  12% (3/25)   
Computing commit graph generation numbers:  16% (4/25)   
Computing commit graph generation numbers:  20% (5/25)   
Computing commit graph generation numbers:  24% (6/25)   
Computing commit graph generation numbers:  28% (7/25)   
Computing commit graph generation numbers:  32% (8/25)   
Computing commit graph generation numbers:  36% (9/25)   
Computing commit graph generation numbers:  40% (10/25)   
Computing commit graph generation numbers:  44% (11/25)   
Computing commit graph generation numbers:  48% (12/25)   
Computing commit graph generation numbers:  52% (13/25)   
Computing commit graph generation numbers:  56% (14/25)   
Computing commit graph generation numbers:  60% (15/25)   
Computing commit graph generation numbers:  64% (16/25)   
Computing commit graph generation numbers:  68% (17/25)   
Computing commit graph generation numbers:  72% (18/25)   
Computing commit graph generation numbers:  76% (19/25)   
Computing commit graph generation numbers:  80% (20/25)   
Computing commit graph generation numbers:  84% (21/25)   
Computing commit graph generation numbers:  88% (22/25)   
Computing commit graph generation numbers:  92% (23/25)   
Computing commit graph generation numbers:  96% (24/25)   
Computing commit graph generation numbers: 100% (25/25)   
Computing commit graph generation numbers: 100% (25/25), done.
+ok 1 - setup
+
+expecting success: 
+	cat >input <<-\EOF &&
+	A:commit-5-7
+	B:commit-4-9
+	EOF
+	echo "ref_newer(A,B):0" >expect &&
+	test_three_modes ref_newer
+
+ok 2 - ref_newer:miss
+
+expecting success: 
+	cat >input <<-\EOF &&
+	A:commit-5-7
+	B:commit-2-3
+	EOF
+	echo "ref_newer(A,B):1" >expect &&
+	test_three_modes ref_newer
+
+ok 3 - ref_newer:hit
+
+expecting success: 
+	cat >input <<-\EOF &&
+	A:commit-5-7
+	B:commit-8-8
+	EOF
+	echo "in_merge_bases(A,B):1" >expect &&
+	test_three_modes in_merge_bases
+
+ok 4 - in_merge_bases:hit
+
+expecting success: 
+	cat >input <<-\EOF &&
+	A:commit-6-8
+	B:commit-5-9
+	EOF
+	echo "in_merge_bases(A,B):0" >expect &&
+	test_three_modes in_merge_bases
+
+ok 5 - in_merge_bases:miss
+
+expecting success: 
+	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_three_modes is_descendant_of
+
+ok 6 - is_descendant_of:hit
+
+expecting success: 
+	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_three_modes is_descendant_of
+
+ok 7 - is_descendant_of:miss
+
+expecting success: 
+	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_three_modes get_merge_bases_many
+
+ok 8 - get_merge_bases_many
+
+expecting success: 
+	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_three_modes reduce_heads
+
+ok 9 - reduce_heads
+
+expecting success: 
+	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_three_modes can_all_from_reach
+
+ok 10 - can_all_from_reach:hit
+
+expecting success: 
+	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_three_modes can_all_from_reach
+
+ok 11 - can_all_from_reach:miss
+
+expecting success: 
+	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_three_modes can_all_from_reach_with_flag
+
+ok 12 - can_all_from_reach_with_flag: tags case
+
+expecting success: 
+	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_three_modes commit_contains &&
+	test_three_modes commit_contains --tag
+
+ok 13 - commit_contains:hit
+
+expecting success: 
+	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_three_modes commit_contains &&
+	test_three_modes commit_contains --tag
+
+ok 14 - commit_contains:miss
+
+expecting success: 
+	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_three_modes git rev-list --topo-order commit-6-6
+
+ok 15 - rev-list: basic topo-order
+
+expecting success: 
+	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_three_modes git rev-list --first-parent --topo-order commit-6-6
+
+ok 16 - rev-list: first-parent topo-order
+
+expecting success: 
+	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_three_modes git rev-list --topo-order commit-3-3..commit-6-6
+
+ok 17 - rev-list: range topo-order
+
+expecting success: 
+	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_three_modes git rev-list --topo-order commit-3-8..commit-6-6
+
+ok 18 - rev-list: range topo-order
+
+expecting success: 
+	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_three_modes git rev-list --first-parent --topo-order commit-3-8..commit-6-6
+
+ok 19 - rev-list: first-parent range topo-order
+
+expecting success: 
+	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_three_modes git rev-list --topo-order --ancestry-path commit-3-3..commit-6-6
+
+ok 20 - rev-list: ancestry-path topo-order
+
+expecting success: 
+	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_three_modes git rev-list --topo-order commit-3-8...commit-6-6
+
+ok 21 - rev-list: symmetric difference topo-order
+
+expecting success: 
+	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_three_modes get_reachable_subset
+
+ok 22 - get_reachable_subset:all
+
+expecting success: 
+	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_three_modes get_reachable_subset
+
+ok 23 - get_reachable_subset:some
+
+expecting success: 
+	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_three_modes get_reachable_subset
+
+ok 24 - get_reachable_subset:none
+
+# passed all 24 test(s)
+1..24
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t7106-reset-unborn-branch.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7106-reset-unborn-branch/.git/
+expecting success: 
+	echo a >a &&
+	echo b >b
+
+ok 1 - setup
+
+expecting success: 
+	git add a b &&
+	git reset &&
+
+	git ls-files >actual &&
+	test_must_be_empty actual
+
+ok 2 - reset
+
+expecting success: 
+	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: 
+	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: 
+	rm .git/index &&
+	git add a &&
+	echo y >yes &&
+	git reset -p <yes >output &&
+
+	git ls-files >actual &&
+	test_must_be_empty actual &&
+	test_i18ngrep "Unstage" output
+
+Unstage this hunk [y,n,q,a,d,e,?]? 
+ok 5 - reset -p
+
+expecting success: 
+	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: 
+	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/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t7001-mv.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7001-mv/.git/
+expecting success: mkdir path0 path1 &&
+     cp "$TEST_DIRECTORY"/../COPYING path0/COPYING &&
+     git add path0/COPYING &&
+     git commit -m add -a
+[master (root-commit) 247f7db] add
+ Author: A U Thor <author@example.com>
+ 1 file changed, 360 insertions(+)
+ create mode 100644 path0/COPYING
+ok 1 - prepare reference tree
+
+expecting success: cd path0 && git mv COPYING ../path1/COPYING
+ok 2 - moving the file out of subdirectory
+
+expecting success: cd .. && git commit -m move-out -a
+[master 4553b23] move-out
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename {path0 => path1}/COPYING (100%)
+ok 3 - commiting the change
+
+expecting success: git diff-tree -r -M --name-status  HEAD^ HEAD >actual &&
+    grep "^R100..*path0/COPYING..*path1/COPYING" actual
+R100	path0/COPYING	path1/COPYING
+ok 4 - checking the commit
+
+expecting success: cd path0 && git mv ../path1/COPYING COPYING
+ok 5 - moving the file back into subdirectory
+
+expecting success: cd .. && git commit -m move-in -a
+[master 4e55a7c] move-in
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename {path1 => path0}/COPYING (100%)
+ok 6 - commiting the change
+
+expecting success: git diff-tree -r -M --name-status  HEAD^ HEAD >actual &&
+    grep "^R100..*path1/COPYING..*path0/COPYING" actual
+R100	path1/COPYING	path0/COPYING
+ok 7 - checking the commit
+
+expecting success: git mv -n path0/COPYING MOVED &&
+     test -f path0/COPYING &&
+     test ! -f MOVED
+Checking rename of 'path0/COPYING' to 'MOVED'
+Renaming path0/COPYING to MOVED
+ok 8 - mv --dry-run does not move file
+
+expecting success: git mv -k idontexist path0
+ok 9 - checking -k on non-existing file
+
+expecting success: touch untracked1 &&
+     git mv -k untracked1 path0 &&
+     test -f untracked1 &&
+     test ! -f path0/untracked1
+ok 10 - checking -k on untracked file
+
+expecting success: touch untracked2 &&
+     git mv -k untracked1 untracked2 path0 &&
+     test -f untracked1 &&
+     test -f untracked2 &&
+     test ! -f path0/untracked1 &&
+     test ! -f path0/untracked2
+ok 11 - checking -k on multiple untracked files
+
+expecting success: touch path0/untracked1 &&
+     test_must_fail git mv -f untracked1 path0 &&
+     test ! -f .git/index.lock &&
+     test -f untracked1 &&
+     test -f path0/untracked1
+fatal: not under version control, source=untracked1, destination=path0/untracked1
+ok 12 - checking -f on untracked file with existing target
+
+expecting success: test_must_fail git mv path0/COPYING no-such-dir/ &&
+     test_must_fail git mv path0/COPYING no-such-dir// &&
+     git mv path0/ no-such-dir/ &&
+     test_path_is_dir no-such-dir
+fatal: destination directory does not exist, source=path0/COPYING, destination=no-such-dir/
+fatal: destination directory does not exist, source=path0/COPYING, destination=no-such-dir/
+ok 13 - moving to absent target with trailing slash
+
+expecting success: git reset --hard
+HEAD is now at 4e55a7c move-in
+ok 14 - clean up
+
+expecting success: mkdir path1 &&
+     git mv path0/ path1/ &&
+     test_path_is_dir path1/path0/
+ok 15 - moving to existing untracked target with trailing slash
+
+expecting success: mkdir path2 &&
+     >path2/file && git add path2/file &&
+     git mv path1/path0/ path2/ &&
+     test_path_is_dir path2/path0/
+ok 16 - moving to existing tracked target with trailing slash
+
+expecting success: git reset --hard
+HEAD is now at 4e55a7c move-in
+ok 17 - clean up
+
+expecting success: cp "$TEST_DIRECTORY"/../README.md path0/README &&
+     git add path0/README &&
+     git commit -m add2 -a
+[master a991052] add2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 64 insertions(+)
+ create mode 100644 path0/README
+ok 18 - adding another file
+
+expecting success: git mv path0 path2
+ok 19 - moving whole subdirectory
+
+expecting success: git commit -m dir-move -a
+[master 7f3fc5d] dir-move
+ Author: A U Thor <author@example.com>
+ 2 files changed, 0 insertions(+), 0 deletions(-)
+ rename {path0 => path2}/COPYING (100%)
+ rename {path0 => path2}/README (100%)
+ok 20 - commiting the change
+
+expecting success: git diff-tree -r -M --name-status  HEAD^ HEAD >actual &&
+     grep "^R100..*path0/COPYING..*path2/COPYING" actual &&
+     grep "^R100..*path0/README..*path2/README" actual
+R100	path0/COPYING	path2/COPYING
+R100	path0/README	path2/README
+ok 21 - checking the commit
+
+expecting success: git mv path2/COPYING path2/COPYING-renamed
+ok 22 - succeed when source is a prefix of destination
+
+expecting success: git mv path2 path1
+ok 23 - moving whole subdirectory into subdirectory
+
+expecting success: git commit -m dir-move -a
+[master a921b53] dir-move
+ Author: A U Thor <author@example.com>
+ 2 files changed, 0 insertions(+), 0 deletions(-)
+ rename path2/COPYING => path1/path2/COPYING-renamed (100%)
+ rename {path2 => path1/path2}/README (100%)
+ok 24 - commiting the change
+
+expecting success: git diff-tree -r -M --name-status  HEAD^ HEAD >actual &&
+     grep "^R100..*path2/COPYING..*path1/path2/COPYING" actual &&
+     grep "^R100..*path2/README..*path1/path2/README" actual
+R100	path2/COPYING	path1/path2/COPYING-renamed
+R100	path2/README	path1/path2/README
+ok 25 - checking the commit
+
+expecting success: mkdir path0 && mkdir path0/path2 && test_must_fail git mv path2 path0
+fatal: bad source, source=path2, destination=path0/path2
+ok 26 - do not move directory over existing directory
+
+expecting success: git mv path1/path2/ .
+ok 27 - move into "."
+
+expecting success: 
+	rm -fr .git papers partA &&
+	git init &&
+	mkdir -p papers/unsorted papers/all-papers partA &&
+	echo a > papers/unsorted/Thesis.pdf &&
+	echo b > partA/outline.txt &&
+	echo c > papers/unsorted/_another &&
+	git add papers partA &&
+	T1=$(git write-tree) &&
+
+	git mv papers/unsorted/Thesis.pdf papers/all-papers/moo-blah.pdf &&
+
+	T=$(git write-tree) &&
+	git ls-tree -r $T | verbose grep partA/outline.txt
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7001-mv/.git/
+100644 blob 61780798228d17af2d34fce4cfbdf35556832472	partA/outline.txt
+ok 28 - Michael Cassar's test case
+
+expecting success: 
+	rm -fr .git &&
+	git init &&
+	mkdir ab &&
+	date >ab.c &&
+	date >ab/d &&
+	git add ab.c ab &&
+	git commit -m initial &&
+	git mv ab a
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7001-mv/.git/
+[master (root-commit) e0c94b8] initial
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 ab.c
+ create mode 100644 ab/d
+ok 29 - Sergey Vlasov's test case
+
+expecting success: (
+
+	rm -fr mine &&
+	mkdir mine &&
+	cd mine &&
+	test_create_repo one &&
+	cd one &&
+	mkdir sub &&
+	>sub/file &&
+	git add sub/file &&
+
+	git mv sub "$(pwd)/in" &&
+	! test -d sub &&
+	test -d in &&
+	git ls-files --error-unmatch in/file
+
+
+)
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7001-mv/mine/one/.git/
+in/file
+ok 30 - absolute pathname
+
+expecting success: (
+
+	rm -fr mine &&
+	mkdir mine &&
+	cd mine &&
+	out=$(pwd) &&
+	test_create_repo one &&
+	cd one &&
+	mkdir sub &&
+	>sub/file &&
+	git add sub/file &&
+
+	test_must_fail git mv sub "$out/out" &&
+	test -d sub &&
+	! test -d ../in &&
+	git ls-files --error-unmatch sub/file
+
+)
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7001-mv/mine/one/.git/
+fatal: '/build/git-2.20.1/t/trash directory.t7001-mv/mine/out' is outside repository
+sub/file
+ok 31 - absolute pathname outside should fail
+
+expecting success: 
+	rm -fr .git && git init &&
+	mkdir dir other &&
+	>dir/a.txt &&
+	>dir/b.txt &&
+	git add dir/?.txt &&
+	git mv dir/a.txt dir/b.txt other &&
+	git ls-files >actual &&
+	{ echo other/a.txt; echo other/b.txt; } >expect &&
+	test_cmp expect actual
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7001-mv/.git/
+ok 32 - git mv to move multiple sources into a directory
+
+expecting success: 
+
+	rm -fr .git &&
+	git init &&
+	echo 1 >dirty &&
+	git add dirty &&
+	entry="$(git ls-files --stage dirty | cut -f 1)" &&
+	git mv dirty dirty2 &&
+	[ "$entry" = "$(git ls-files --stage dirty2 | cut -f 1)" ] &&
+	echo 2 >dirty2 &&
+	git mv dirty2 dirty &&
+	[ "$entry" = "$(git ls-files --stage dirty | cut -f 1)" ]
+
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7001-mv/.git/
+ok 33 - git mv should not change sha1 of moved cache entry
+
+expecting success: 
+
+	rm -fr .git &&
+	git init &&
+	echo 1 >moved &&
+	test_ln_s_add moved symlink &&
+	git add moved &&
+	test_must_fail git mv moved symlink &&
+	git mv -f moved symlink &&
+	! test -e moved &&
+	test -f symlink &&
+	test "$(cat symlink)" = 1 &&
+	git update-index --refresh &&
+	git diff-files --quiet
+
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7001-mv/.git/
+checking prerequisite: SYMLINKS
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
+	# test whether the filesystem supports symbolic links
+	ln -s x y && test -h y
+
+)
+prerequisite SYMLINKS ok
+fatal: destination exists, source=moved, destination=symlink
+ok 34 - git mv should overwrite symlink to a file
+
+expecting success: 
+
+	rm -fr .git &&
+	git init &&
+	echo 1 >moved &&
+	test_ln_s_add moved symlink &&
+	git add moved &&
+	test_must_fail git mv symlink moved &&
+	git mv -f symlink moved &&
+	! test -e symlink &&
+	git update-index --refresh &&
+	git diff-files --quiet
+
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7001-mv/.git/
+fatal: destination exists, source=symlink, destination=moved
+ok 35 - git mv should overwrite file with a symlink
+
+expecting success: 
+
+	test -h moved
+
+ok 36 - check moved symlink
+
+expecting success: 
+	git commit -m initial &&
+	git reset --hard &&
+	git submodule add ./. sub &&
+	echo content >file &&
+	git add file &&
+	git commit -m "added sub and file" &&
+	mkdir -p deep/directory/hierarchy &&
+	git submodule add ./. deep/directory/hierarchy/sub &&
+	git commit -m "added another submodule" &&
+	git branch submodule
+
+[master (root-commit) 976815f] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 120000 moved
+HEAD is now at 976815f initial
+Cloning into '/build/git-2.20.1/t/trash directory.t7001-mv/sub'...
+done.
+[master 04d937c] added sub and file
+ Author: A U Thor <author@example.com>
+ 3 files changed, 5 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 100644 file
+ create mode 160000 sub
+Cloning into '/build/git-2.20.1/t/trash directory.t7001-mv/deep/directory/hierarchy/sub'...
+done.
+[master d90aa92] added another submodule
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 160000 deep/directory/hierarchy/sub
+ok 37 - setup submodule
+
+expecting success: 
+	test_must_fail git mv sub file
+
+fatal: cannot move directory over file, source=sub, destination=file
+ok 38 - git mv cannot move a submodule in a file
+
+expecting success: 
+	entry="$(git ls-files --stage sub | cut -f 1)" &&
+	git rm .gitmodules &&
+	(
+		cd sub &&
+		rm -f .git &&
+		cp -R -P -p ../.git/modules/sub .git &&
+		GIT_WORK_TREE=. git config --unset core.worktree
+	) &&
+	mkdir mod &&
+	git mv sub mod/sub &&
+	! test -e sub &&
+	[ "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" ] &&
+	(
+		cd mod/sub &&
+		git status
+	) &&
+	git update-index --refresh &&
+	git diff-files --quiet
+
+rm '.gitmodules'
+On branch master
+Your branch is up to date with 'origin/master'.
+
+nothing to commit, working tree clean
+ok 39 - git mv moves a submodule with a .git directory and no .gitmodules
+
+expecting success: 
+	rm -rf mod &&
+	git reset --hard &&
+	git submodule update &&
+	entry="$(git ls-files --stage sub | cut -f 1)" &&
+	(
+		cd sub &&
+		rm -f .git &&
+		cp -R -P -p ../.git/modules/sub .git &&
+		GIT_WORK_TREE=. git config --unset core.worktree
+	) &&
+	mkdir mod &&
+	git mv sub mod/sub &&
+	! test -e sub &&
+	[ "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" ] &&
+	(
+		cd mod/sub &&
+		git status
+	) &&
+	echo mod/sub >expected &&
+	git config -f .gitmodules submodule.sub.path >actual &&
+	test_cmp expected actual &&
+	git update-index --refresh &&
+	git diff-files --quiet
+
+HEAD is now at d90aa92 added another submodule
+Submodule path 'sub': checked out '976815fecc06d80b6cdbcab141220b6fe4acf42a'
+HEAD detached at 976815f
+nothing to commit, working tree clean
+ok 40 - git mv moves a submodule with a .git directory and .gitmodules
+
+expecting success: 
+	rm -rf mod &&
+	git reset --hard &&
+	git submodule update &&
+	entry="$(git ls-files --stage sub | cut -f 1)" &&
+	mkdir mod &&
+	(
+		cd mod &&
+		git mv ../sub/ .
+	) &&
+	! test -e sub &&
+	[ "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" ] &&
+	(
+		cd mod/sub &&
+		git status
+	) &&
+	echo mod/sub >expected &&
+	git config -f .gitmodules submodule.sub.path >actual &&
+	test_cmp expected actual &&
+	git update-index --refresh &&
+	git diff-files --quiet
+
+HEAD is now at d90aa92 added another submodule
+Submodule path 'sub': checked out '976815fecc06d80b6cdbcab141220b6fe4acf42a'
+HEAD detached at 976815f
+nothing to commit, working tree clean
+ok 41 - git mv moves a submodule with gitfile
+
+expecting success: 
+	rm -rf mod &&
+	git reset --hard &&
+	git submodule update &&
+	git rm .gitmodules &&
+	entry="$(git ls-files --stage sub | cut -f 1)" &&
+	mkdir mod &&
+	git mv sub mod/sub 2>actual.err &&
+	test_must_be_empty actual.err &&
+	! test -e sub &&
+	[ "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" ] &&
+	(
+		cd mod/sub &&
+		git status
+	) &&
+	git update-index --refresh &&
+	git diff-files --quiet
+
+HEAD is now at d90aa92 added another submodule
+Submodule path 'sub': checked out '976815fecc06d80b6cdbcab141220b6fe4acf42a'
+rm '.gitmodules'
+HEAD detached at 976815f
+nothing to commit, working tree clean
+ok 42 - mv does not complain when no .gitmodules file is found
+
+expecting success: 
+	rm -rf mod &&
+	git reset --hard &&
+	git submodule update &&
+	git config -f .gitmodules foo.bar true &&
+	entry="$(git ls-files --stage sub | cut -f 1)" &&
+	mkdir mod &&
+	test_must_fail git mv sub mod/sub 2>actual.err &&
+	test -s actual.err &&
+	test -e sub &&
+	git diff-files --quiet -- sub &&
+	git add .gitmodules &&
+	git mv sub mod/sub 2>actual.err &&
+	test_must_be_empty actual.err &&
+	! test -e sub &&
+	[ "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" ] &&
+	(
+		cd mod/sub &&
+		git status
+	) &&
+	git update-index --refresh &&
+	git diff-files --quiet
+
+HEAD is now at d90aa92 added another submodule
+Submodule path 'sub': checked out '976815fecc06d80b6cdbcab141220b6fe4acf42a'
+HEAD detached at 976815f
+nothing to commit, working tree clean
+ok 43 - mv will error out on a modified .gitmodules file unless staged
+
+expecting success: 
+	rm -rf mod &&
+	git reset --hard &&
+	git submodule update &&
+	git config -f .gitmodules --remove-section submodule.sub &&
+	git add .gitmodules &&
+	entry="$(git ls-files --stage sub | cut -f 1)" &&
+	echo "warning: Could not find section in .gitmodules where path=sub" >expect.err &&
+	mkdir mod &&
+	git mv sub mod/sub 2>actual.err &&
+	test_i18ncmp expect.err actual.err &&
+	! test -e sub &&
+	[ "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" ] &&
+	(
+		cd mod/sub &&
+		git status
+	) &&
+	git update-index --refresh &&
+	git diff-files --quiet
+
+HEAD is now at d90aa92 added another submodule
+Submodule path 'sub': checked out '976815fecc06d80b6cdbcab141220b6fe4acf42a'
+HEAD detached at 976815f
+nothing to commit, working tree clean
+ok 44 - mv issues a warning when section is not found in .gitmodules
+
+expecting success: 
+	rm -rf mod &&
+	git reset --hard &&
+	git submodule update &&
+	mkdir mod &&
+	git mv -n sub mod/sub 2>actual.err &&
+	test -f sub/.git &&
+	git diff-index --exit-code HEAD &&
+	git update-index --refresh &&
+	git diff-files --quiet -- sub .gitmodules
+
+HEAD is now at d90aa92 added another submodule
+Submodule path 'sub': checked out '976815fecc06d80b6cdbcab141220b6fe4acf42a'
+Checking rename of 'sub' to 'mod/sub'
+Renaming sub to mod/sub
+ok 45 - mv --dry-run does not touch the submodule or .gitmodules
+
+expecting success: 
+	git mv sub sub2 &&
+	git commit -m "moved sub to sub2" &&
+	git checkout -q HEAD^ 2>actual &&
+	test_i18ngrep "^warning: unable to rmdir 'sub2':" actual &&
+	git status -s sub2 >actual &&
+	echo "?? sub2/" >expected &&
+	test_cmp expected actual &&
+	! test -f sub/.git &&
+	test -f sub2/.git &&
+	git submodule update &&
+	test -f sub/.git &&
+	rm -rf sub2 &&
+	git diff-index --exit-code HEAD &&
+	git update-index --refresh &&
+	git diff-files --quiet -- sub .gitmodules &&
+	git status -s sub2 >actual &&
+	test_must_be_empty actual
+
+[master 34cb80b] moved sub to sub2
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+), 1 deletion(-)
+ rename sub => sub2 (100%)
+warning: unable to rmdir 'sub2': Directory not empty
+Submodule path 'sub': checked out '976815fecc06d80b6cdbcab141220b6fe4acf42a'
+ok 46 - checking out a commit before submodule moved needs manual updates
+
+expecting success: 
+	git checkout submodule &&
+	mkdir dummy dest &&
+	git mv -k dummy sub dest &&
+	git status --porcelain >actual &&
+	grep "^R  sub -> dest/sub" actual &&
+	git reset --hard &&
+	git checkout .
+
+Switched to branch 'submodule'
+R  sub -> dest/sub
+warning: unable to rmdir 'dest/sub': Directory not empty
+HEAD is now at d90aa92 added another submodule
+ok 47 - mv -k does not accidentally destroy submodules
+
+expecting success: 
+	(
+		cd deep &&
+		git mv directory ../ &&
+		# git status would fail if the update of linking git dir to
+		# work dir of the submodule failed.
+		git status &&
+		git config -f ../.gitmodules submodule.deep/directory/hierarchy/sub.path >../actual &&
+		echo "directory/hierarchy/sub" >../expect
+	) &&
+	test_cmp expect actual
+
+On branch submodule
+Changes to be committed:
+  (use "git reset HEAD <file>..." to unstage)
+
+	modified:   ../.gitmodules
+	renamed:    directory/hierarchy/sub -> ../directory/hierarchy/sub
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+
+	../a/
+	../ab.c
+	../actual
+	../actual.err
+	../dest/
+	../expect
+	../expect.err
+	../expected
+	../mine/
+	../other/
+
+ok 48 - moving a submodule in nested directories
+
+expecting success: 
+	git commit -am "cleanup commit" &&
+	mkdir sub_nested_nested &&
+	(cd sub_nested_nested &&
+		touch nested_level2 &&
+		git init &&
+		git add . &&
+		git commit -m "nested level 2"
+	) &&
+	mkdir sub_nested &&
+	(cd sub_nested &&
+		touch nested_level1 &&
+		git init &&
+		git add . &&
+		git commit -m "nested level 1" &&
+		git submodule add ../sub_nested_nested &&
+		git commit -m "add nested level 2"
+	) &&
+	git submodule add ./sub_nested nested_move &&
+	git commit -m "add nested_move" &&
+	git submodule update --init --recursive &&
+	git mv nested_move sub_nested_moved &&
+	git status
+
+[submodule bac5a5d] cleanup commit
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+), 1 deletion(-)
+ rename {deep/directory => directory}/hierarchy/sub (100%)
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7001-mv/sub_nested_nested/.git/
+[master (root-commit) 1180892] nested level 2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 nested_level2
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7001-mv/sub_nested/.git/
+[master (root-commit) c85ee96] nested level 1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 nested_level1
+Cloning into '/build/git-2.20.1/t/trash directory.t7001-mv/sub_nested/sub_nested_nested'...
+done.
+[master 26e157e] add nested level 2
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub_nested_nested
+Cloning into '/build/git-2.20.1/t/trash directory.t7001-mv/nested_move'...
+done.
+[submodule 0354aac] add nested_move
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 160000 nested_move
+Submodule 'sub' (/build/git-2.20.1/t/trash directory.t7001-mv/./.) registered for path 'directory/hierarchy/sub/sub'
+Cloning into '/build/git-2.20.1/t/trash directory.t7001-mv/directory/hierarchy/sub/sub'...
+done.
+Submodule path 'directory/hierarchy/sub/sub': checked out '976815fecc06d80b6cdbcab141220b6fe4acf42a'
+Submodule 'sub_nested_nested' (/build/git-2.20.1/t/trash directory.t7001-mv/sub_nested_nested) registered for path 'nested_move/sub_nested_nested'
+Cloning into '/build/git-2.20.1/t/trash directory.t7001-mv/nested_move/sub_nested_nested'...
+done.
+Submodule path 'nested_move/sub_nested_nested': checked out '1180892edb0a81160212a8aec0577e7230456519'
+Submodule path 'sub': checked out '976815fecc06d80b6cdbcab141220b6fe4acf42a'
+On branch submodule
+Changes to be committed:
+  (use "git reset HEAD <file>..." to unstage)
+
+	modified:   .gitmodules
+	renamed:    nested_move -> sub_nested_moved
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+
+	a/
+	ab.c
+	actual
+	actual.err
+	dest/
+	expect
+	expect.err
+	expected
+	mine/
+	other/
+	sub_nested/
+	sub_nested_nested/
+
+ok 49 - moving nested submodules
+
+# passed all 49 test(s)
+1..49
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t7064-wtstatus-pv2.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7064-wtstatus-pv2/.git/
+expecting success: 
+	test_tick &&
+	git config core.autocrlf false &&
+	echo x >file_x &&
+	echo y >file_y &&
+	echo z >file_z &&
+	mkdir dir1 &&
+	echo a >dir1/file_a &&
+	echo b >dir1/file_b
+
+ok 1 - setup
+
+expecting success: 
+	cat >expect <<-EOF &&
+	# branch.oid (initial)
+	# branch.head master
+	? actual
+	? dir1/
+	? expect
+	? file_x
+	? file_y
+	? file_z
+	EOF
+
+	git status --porcelain=v2 --branch --untracked-files=normal >actual &&
+	test_cmp expect actual
+
+ok 2 - before initial commit, nothing added, only untracked
+
+expecting success: 
+	git add file_x file_y file_z dir1 &&
+	OID_A=$(git hash-object -t blob -- dir1/file_a) &&
+	OID_B=$(git hash-object -t blob -- dir1/file_b) &&
+	OID_X=$(git hash-object -t blob -- file_x) &&
+	OID_Y=$(git hash-object -t blob -- file_y) &&
+	OID_Z=$(git hash-object -t blob -- file_z) &&
+
+	cat >expect <<-EOF &&
+	# branch.oid (initial)
+	# branch.head master
+	1 A. N... 000000 100644 100644 $ZERO_OID $OID_A dir1/file_a
+	1 A. N... 000000 100644 100644 $ZERO_OID $OID_B dir1/file_b
+	1 A. N... 000000 100644 100644 $ZERO_OID $OID_X file_x
+	1 A. N... 000000 100644 100644 $ZERO_OID $OID_Y file_y
+	1 A. N... 000000 100644 100644 $ZERO_OID $OID_Z file_z
+	? actual
+	? expect
+	EOF
+
+	git status --porcelain=v2 --branch --untracked-files=all >actual &&
+	test_cmp expect actual
+
+ok 3 - before initial commit, things added
+
+expecting success: 
+	lf_to_nul >expect <<-EOF &&
+	# branch.oid (initial)
+	# branch.head master
+	1 A. N... 000000 100644 100644 $ZERO_OID $OID_A dir1/file_a
+	1 A. N... 000000 100644 100644 $ZERO_OID $OID_B dir1/file_b
+	1 A. N... 000000 100644 100644 $ZERO_OID $OID_X file_x
+	1 A. N... 000000 100644 100644 $ZERO_OID $OID_Y file_y
+	1 A. N... 000000 100644 100644 $ZERO_OID $OID_Z file_z
+	? actual
+	? expect
+	EOF
+
+	git status -z --porcelain=v2 --branch --untracked-files=all >actual &&
+	test_cmp expect actual
+
+ok 4 - before initial commit, things added (-z)
+
+expecting success: 
+	git commit -m initial &&
+	H0=$(git rev-parse HEAD) &&
+	cat >expect <<-EOF &&
+	# branch.oid $H0
+	# branch.head master
+	? actual
+	? expect
+	EOF
+
+	git status --porcelain=v2 --branch --untracked-files=all >actual &&
+	test_cmp expect actual
+
+[master (root-commit) bbc01be] initial
+ Author: A U Thor <author@example.com>
+ 5 files changed, 5 insertions(+)
+ create mode 100644 dir1/file_a
+ create mode 100644 dir1/file_b
+ create mode 100644 file_x
+ create mode 100644 file_y
+ create mode 100644 file_z
+ok 5 - make first commit, comfirm HEAD oid and branch
+
+expecting success: 
+	echo x >>file_x &&
+	OID_X1=$(git hash-object -t blob -- file_x) &&
+	rm file_z &&
+	H0=$(git rev-parse HEAD) &&
+
+	cat >expect <<-EOF &&
+	# branch.oid $H0
+	# branch.head master
+	1 .M N... 100644 100644 100644 $OID_X $OID_X file_x
+	1 .D N... 100644 100644 000000 $OID_Z $OID_Z file_z
+	? actual
+	? expect
+	EOF
+
+	git status --porcelain=v2 --branch --untracked-files=all >actual &&
+	test_cmp expect actual
+
+ok 6 - after first commit, create unstaged changes
+
+expecting success: 
+	cat >expect <<-EOF &&
+	1 .M N... 100644 100644 100644 $OID_X $OID_X file_x
+	1 .D N... 100644 100644 000000 $OID_Z $OID_Z file_z
+	EOF
+
+	git status --porcelain=v2 --untracked-files=no >actual &&
+	test_cmp expect actual
+
+ok 7 - after first commit but omit untracked files and branch
+
+expecting success: 
+	git add file_x &&
+	git rm file_z &&
+	H0=$(git rev-parse HEAD) &&
+
+	cat >expect <<-EOF &&
+	# branch.oid $H0
+	# branch.head master
+	1 M. N... 100644 100644 100644 $OID_X $OID_X1 file_x
+	1 D. N... 100644 000000 000000 $OID_Z $ZERO_OID file_z
+	? actual
+	? expect
+	EOF
+
+	git status --porcelain=v2 --branch --untracked-files=all >actual &&
+	test_cmp expect actual
+
+rm 'file_z'
+ok 8 - after first commit, stage existing changes
+
+expecting success: 
+	git mv file_y renamed_y &&
+	H0=$(git rev-parse HEAD) &&
+
+	q_to_tab >expect <<-EOF &&
+	# branch.oid $H0
+	# branch.head master
+	1 M. N... 100644 100644 100644 $OID_X $OID_X1 file_x
+	1 D. N... 100644 000000 000000 $OID_Z $ZERO_OID file_z
+	2 R. N... 100644 100644 100644 $OID_Y $OID_Y R100 renamed_yQfile_y
+	? actual
+	? expect
+	EOF
+
+	git status --porcelain=v2 --branch --untracked-files=all >actual &&
+	test_cmp expect actual
+
+ok 9 - rename causes 2 path lines
+
+expecting success: 
+	H0=$(git rev-parse HEAD) &&
+
+	## Lines use NUL path separator and line terminator, so double transform here.
+	q_to_nul <<-EOF | lf_to_nul >expect &&
+	# branch.oid $H0
+	# branch.head master
+	1 M. N... 100644 100644 100644 $OID_X $OID_X1 file_x
+	1 D. N... 100644 000000 000000 $OID_Z $ZERO_OID file_z
+	2 R. N... 100644 100644 100644 $OID_Y $OID_Y R100 renamed_yQfile_y
+	? actual
+	? expect
+	EOF
+
+	git status --porcelain=v2 --branch --untracked-files=all -z >actual &&
+	test_cmp expect actual
+
+ok 10 - rename causes 2 path lines (-z)
+
+expecting success: 
+	git commit -m second &&
+	H1=$(git rev-parse HEAD) &&
+
+	cat >expect <<-EOF &&
+	# branch.oid $H1
+	# branch.head master
+	? actual
+	? expect
+	EOF
+
+	git status --porcelain=v2 --branch --untracked-files=all >actual &&
+	test_cmp expect actual
+
+[master 84bf28d] second
+ Author: A U Thor <author@example.com>
+ 3 files changed, 1 insertion(+), 1 deletion(-)
+ delete mode 100644 file_z
+ rename file_y => renamed_y (100%)
+ok 11 - make second commit, confirm clean and new HEAD oid
+
+expecting success: 
+	test_when_finished "rm -f x.ign .gitignore" &&
+	echo x.ign >.gitignore &&
+	echo "ignore me" >x.ign &&
+
+	cat >expect <<-EOF &&
+	? .gitignore
+	? actual
+	? expect
+	EOF
+
+	git status --porcelain=v2 --untracked-files=all >actual &&
+	test_cmp expect actual
+
+ok 12 - confirm ignored files are not printed
+
+expecting success: 
+	test_when_finished "rm -f x.ign .gitignore" &&
+	echo x.ign >.gitignore &&
+	echo "ignore me" >x.ign &&
+
+	cat >expect <<-EOF &&
+	? .gitignore
+	? actual
+	? expect
+	! x.ign
+	EOF
+
+	git status --porcelain=v2 --ignored --untracked-files=all >actual &&
+	test_cmp expect actual
+
+ok 13 - ignored files are printed with --ignored
+
+expecting success: 
+	cat >.gitignore <<-EOF &&
+	actual*
+	expect*
+	EOF
+
+	git add .gitignore &&
+	git commit -m ignore_trash &&
+	H1=$(git rev-parse HEAD) &&
+
+	cat >expect <<-EOF &&
+	# branch.oid $H1
+	# branch.head master
+	EOF
+
+	git status --porcelain=v2 --branch >actual &&
+	test_cmp expect actual
+
+[master f09abb9] ignore_trash
+ Author: A U Thor <author@example.com>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 .gitignore
+ok 14 - create and commit permanent ignore file
+
+expecting success: 
+	test_when_finished "git rm -f intent1.add intent2.add" &&
+	touch intent1.add &&
+	echo test >intent2.add &&
+
+	git add --intent-to-add intent1.add intent2.add &&
+
+	cat >expect <<-EOF &&
+	1 .A N... 000000 000000 100644 $ZERO_OID $ZERO_OID intent1.add
+	1 .A N... 000000 000000 100644 $ZERO_OID $ZERO_OID intent2.add
+	EOF
+
+	git status --porcelain=v2 >actual &&
+	test_cmp expect actual
+
+rm 'intent1.add'
+rm 'intent2.add'
+ok 15 - verify --intent-to-add output
+
+expecting success: 
+	test_when_finished "git reset --hard" &&
+
+	git branch AA_A master &&
+	git checkout AA_A &&
+	echo "Branch AA_A" >conflict.txt &&
+	OID_AA_A=$(git hash-object -t blob -- conflict.txt) &&
+	git add conflict.txt &&
+	git commit -m "branch aa_a" &&
+
+	git branch AA_B master &&
+	git checkout AA_B &&
+	echo "Branch AA_B" >conflict.txt &&
+	OID_AA_B=$(git hash-object -t blob -- conflict.txt) &&
+	git add conflict.txt &&
+	git commit -m "branch aa_b" &&
+
+	git branch AA_M AA_B &&
+	git checkout AA_M &&
+	test_must_fail git merge AA_A &&
+
+	HM=$(git rev-parse HEAD) &&
+
+	cat >expect <<-EOF &&
+	# branch.oid $HM
+	# branch.head AA_M
+	u AA N... 000000 100644 100644 100644 $ZERO_OID $OID_AA_B $OID_AA_A conflict.txt
+	EOF
+
+	git status --porcelain=v2 --branch --untracked-files=all >actual &&
+	test_cmp expect actual
+
+Switched to branch 'AA_A'
+[AA_A 55eca05] branch aa_a
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 conflict.txt
+Switched to branch 'AA_B'
+[AA_B 307553c] branch aa_b
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 conflict.txt
+Switched to branch 'AA_M'
+Merging:
+307553c branch aa_b
+virtual AA_A
+found 1 common ancestor:
+f09abb9 ignore_trash
+Auto-merging conflict.txt
+CONFLICT (add/add): Merge conflict in conflict.txt
+Automatic merge failed; fix conflicts and then commit the result.
+HEAD is now at 307553c branch aa_b
+ok 16 - verify AA (add-add) conflict
+
+expecting success: 
+	test_when_finished "git reset --hard" &&
+
+	git branch UU_ANC master &&
+	git checkout UU_ANC &&
+	echo "Ancestor" >conflict.txt &&
+	OID_UU_ANC=$(git hash-object -t blob -- conflict.txt) &&
+	git add conflict.txt &&
+	git commit -m "UU_ANC" &&
+
+	git branch UU_A UU_ANC &&
+	git checkout UU_A &&
+	echo "Branch UU_A" >conflict.txt &&
+	OID_UU_A=$(git hash-object -t blob -- conflict.txt) &&
+	git add conflict.txt &&
+	git commit -m "branch uu_a" &&
+
+	git branch UU_B UU_ANC &&
+	git checkout UU_B &&
+	echo "Branch UU_B" >conflict.txt &&
+	OID_UU_B=$(git hash-object -t blob -- conflict.txt) &&
+	git add conflict.txt &&
+	git commit -m "branch uu_b" &&
+
+	git branch UU_M UU_B &&
+	git checkout UU_M &&
+	test_must_fail git merge UU_A &&
+
+	HM=$(git rev-parse HEAD) &&
+
+	cat >expect <<-EOF &&
+	# branch.oid $HM
+	# branch.head UU_M
+	u UU N... 100644 100644 100644 100644 $OID_UU_ANC $OID_UU_B $OID_UU_A conflict.txt
+	EOF
+
+	git status --porcelain=v2 --branch --untracked-files=all >actual &&
+	test_cmp expect actual
+
+Switched to branch 'UU_ANC'
+[UU_ANC 70071ed] UU_ANC
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 conflict.txt
+Switched to branch 'UU_A'
+[UU_A a088b5d] branch uu_a
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to branch 'UU_B'
+[UU_B c5f3cc7] branch uu_b
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to branch 'UU_M'
+Merging:
+c5f3cc7 branch uu_b
+virtual UU_A
+found 1 common ancestor:
+70071ed UU_ANC
+Auto-merging conflict.txt
+CONFLICT (content): Merge conflict in conflict.txt
+Automatic merge failed; fix conflicts and then commit the result.
+HEAD is now at c5f3cc7 branch uu_b
+ok 17 - verify UU (edit-edit) conflict
+
+expecting success: 
+	git checkout master &&
+	test_when_finished "rm -rf sub_repo" &&
+	git clone . sub_repo &&
+	(
+		## Confirm local master tracks remote master.
+		cd sub_repo &&
+		HUF=$(git rev-parse HEAD) &&
+
+		cat >expect <<-EOF &&
+		# branch.oid $HUF
+		# branch.head master
+		# branch.upstream origin/master
+		# branch.ab +0 -0
+		EOF
+
+		git status --porcelain=v2 --branch --untracked-files=all >actual &&
+		test_cmp expect actual &&
+
+		## Test ahead/behind.
+		echo xyz >file_xyz &&
+		git add file_xyz &&
+		git commit -m xyz &&
+
+		HUF=$(git rev-parse HEAD) &&
+
+		cat >expect <<-EOF &&
+		# branch.oid $HUF
+		# branch.head master
+		# branch.upstream origin/master
+		# branch.ab +1 -0
+		EOF
+
+		git status --porcelain=v2 --branch --untracked-files=all >actual &&
+		test_cmp expect actual &&
+
+		## Repeat the above but without --branch.
+		git status --porcelain=v2 --untracked-files=all >actual &&
+		test_must_be_empty actual &&
+
+		## Test upstream-gone case. Fake this by pointing origin/master at
+		## a non-existing commit.
+		OLD=$(git rev-parse origin/master) &&
+		NEW=$ZERO_OID &&
+		mv .git/packed-refs .git/old-packed-refs &&
+		sed "s/$OLD/$NEW/g" <.git/old-packed-refs >.git/packed-refs &&
+
+		HUF=$(git rev-parse HEAD) &&
+
+		cat >expect <<-EOF &&
+		# branch.oid $HUF
+		# branch.head master
+		# branch.upstream origin/master
+		EOF
+
+		git status --porcelain=v2 --branch --untracked-files=all >actual &&
+		test_cmp expect actual
+	)
+
+Switched to branch 'master'
+Cloning into 'sub_repo'...
+done.
+[master 638bb2b] xyz
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file_xyz
+ok 18 - verify upstream fields in branch header
+
+expecting success: 
+	git checkout master &&
+	test_when_finished "rm -rf sub_repo" &&
+	git clone . sub_repo &&
+	(
+		## Confirm local master tracks remote master.
+		cd sub_repo &&
+		HUF=$(git rev-parse HEAD) &&
+
+		# Confirm --no-ahead-behind reports traditional branch.ab with 0/0 for equal branches.
+		cat >expect <<-EOF &&
+		# branch.oid $HUF
+		# branch.head master
+		# branch.upstream origin/master
+		# branch.ab +0 -0
+		EOF
+
+		git status --no-ahead-behind --porcelain=v2 --branch --untracked-files=all >actual &&
+		test_cmp expect actual &&
+
+		# Confirm --ahead-behind reports traditional branch.ab with 0/0.
+		cat >expect <<-EOF &&
+		# branch.oid $HUF
+		# branch.head master
+		# branch.upstream origin/master
+		# branch.ab +0 -0
+		EOF
+
+		git status --ahead-behind --porcelain=v2 --branch --untracked-files=all >actual &&
+		test_cmp expect actual &&
+
+		## Test non-equal ahead/behind.
+		echo xyz >file_xyz &&
+		git add file_xyz &&
+		git commit -m xyz &&
+
+		HUF=$(git rev-parse HEAD) &&
+
+		# Confirm --no-ahead-behind reports branch.ab with ?/? for non-equal branches.
+		cat >expect <<-EOF &&
+		# branch.oid $HUF
+		# branch.head master
+		# branch.upstream origin/master
+		# branch.ab +? -?
+		EOF
+
+		git status --no-ahead-behind --porcelain=v2 --branch --untracked-files=all >actual &&
+		test_cmp expect actual &&
+
+		# Confirm --ahead-behind reports traditional branch.ab with 1/0.
+		cat >expect <<-EOF &&
+		# branch.oid $HUF
+		# branch.head master
+		# branch.upstream origin/master
+		# branch.ab +1 -0
+		EOF
+
+		git status --ahead-behind --porcelain=v2 --branch --untracked-files=all >actual &&
+		test_cmp expect actual
+	)
+
+Already on 'master'
+Cloning into 'sub_repo'...
+done.
+[master 638bb2b] xyz
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file_xyz
+ok 19 - verify --[no-]ahead-behind with V2 format
+
+expecting success: 
+	git checkout master &&
+	git clone . sub_repo &&
+	git clone . super_repo &&
+	(	cd super_repo &&
+		git submodule add ../sub_repo sub1 &&
+
+		## Confirm stage/add of clean submodule.
+		HMOD=$(git hash-object -t blob -- .gitmodules) &&
+		HSUP=$(git rev-parse HEAD) &&
+		HSUB=$HSUP &&
+
+		cat >expect <<-EOF &&
+		# branch.oid $HSUP
+		# branch.head master
+		# branch.upstream origin/master
+		# branch.ab +0 -0
+		1 A. N... 000000 100644 100644 $ZERO_OID $HMOD .gitmodules
+		1 A. S... 000000 160000 160000 $ZERO_OID $HSUB sub1
+		EOF
+
+		git status --porcelain=v2 --branch --untracked-files=all >actual &&
+		test_cmp expect actual
+	)
+
+Already on 'master'
+Cloning into 'sub_repo'...
+done.
+Cloning into 'super_repo'...
+done.
+Cloning into '/build/git-2.20.1/t/trash directory.t7064-wtstatus-pv2/super_repo/sub1'...
+done.
+ok 20 - create and add submodule, submodule appears clean (A. S...)
+
+expecting success: 
+	(	cd super_repo &&
+		## create untracked file in the submodule.
+		(	cd sub1 &&
+			echo "xxxx" >file_in_sub
+		) &&
+
+		HMOD=$(git hash-object -t blob -- .gitmodules) &&
+		HSUP=$(git rev-parse HEAD) &&
+		HSUB=$HSUP &&
+
+		cat >expect <<-EOF &&
+		# branch.oid $HSUP
+		# branch.head master
+		# branch.upstream origin/master
+		# branch.ab +0 -0
+		1 A. N... 000000 100644 100644 $ZERO_OID $HMOD .gitmodules
+		1 AM S..U 000000 160000 160000 $ZERO_OID $HSUB sub1
+		EOF
+
+		git status --porcelain=v2 --branch --untracked-files=all >actual &&
+		test_cmp expect actual
+	)
+
+ok 21 - untracked changes in added submodule (AM S..U)
+
+expecting success: 
+	(	cd super_repo &&
+		## stage the changes in the submodule.
+		(	cd sub1 &&
+			git add file_in_sub
+		) &&
+
+		HMOD=$(git hash-object -t blob -- .gitmodules) &&
+		HSUP=$(git rev-parse HEAD) &&
+		HSUB=$HSUP &&
+
+		cat >expect <<-EOF &&
+		# branch.oid $HSUP
+		# branch.head master
+		# branch.upstream origin/master
+		# branch.ab +0 -0
+		1 A. N... 000000 100644 100644 $ZERO_OID $HMOD .gitmodules
+		1 AM S.M. 000000 160000 160000 $ZERO_OID $HSUB sub1
+		EOF
+
+		git status --porcelain=v2 --branch --untracked-files=all >actual &&
+		test_cmp expect actual
+	)
+
+ok 22 - staged changes in added submodule (AM S.M.)
+
+expecting success: 
+	(	cd super_repo &&
+		(	cd sub1 &&
+			## make additional unstaged changes (on the same file) in the submodule.
+			## This does not cause us to get S.MU (because the submodule does not report
+			## a "?" line for the unstaged changes).
+			echo "more changes" >>file_in_sub
+		) &&
+
+		HMOD=$(git hash-object -t blob -- .gitmodules) &&
+		HSUP=$(git rev-parse HEAD) &&
+		HSUB=$HSUP &&
+
+		cat >expect <<-EOF &&
+		# branch.oid $HSUP
+		# branch.head master
+		# branch.upstream origin/master
+		# branch.ab +0 -0
+		1 A. N... 000000 100644 100644 $ZERO_OID $HMOD .gitmodules
+		1 AM S.M. 000000 160000 160000 $ZERO_OID $HSUB sub1
+		EOF
+
+		git status --porcelain=v2 --branch --untracked-files=all >actual &&
+		test_cmp expect actual
+	)
+
+ok 23 - staged and unstaged changes in added (AM S.M.)
+
+expecting success: 
+	(	cd super_repo &&
+		(	cd sub1 &&
+			## stage new changes in tracked file.
+			git add file_in_sub &&
+			## create new untracked file.
+			echo "yyyy" >>another_file_in_sub
+		) &&
+
+		HMOD=$(git hash-object -t blob -- .gitmodules) &&
+		HSUP=$(git rev-parse HEAD) &&
+		HSUB=$HSUP &&
+
+		cat >expect <<-EOF &&
+		# branch.oid $HSUP
+		# branch.head master
+		# branch.upstream origin/master
+		# branch.ab +0 -0
+		1 A. N... 000000 100644 100644 $ZERO_OID $HMOD .gitmodules
+		1 AM S.MU 000000 160000 160000 $ZERO_OID $HSUB sub1
+		EOF
+
+		git status --porcelain=v2 --branch --untracked-files=all >actual &&
+		test_cmp expect actual
+	)
+
+ok 24 - staged and untracked changes in added submodule (AM S.MU)
+
+expecting success: 
+	(	cd super_repo &&
+		(	cd sub1 &&
+			## Make a new commit in the submodule.
+			git add file_in_sub &&
+			rm -f another_file_in_sub &&
+			git commit -m "new commit"
+		) &&
+
+		HMOD=$(git hash-object -t blob -- .gitmodules) &&
+		HSUP=$(git rev-parse HEAD) &&
+		HSUB=$HSUP &&
+
+		cat >expect <<-EOF &&
+		# branch.oid $HSUP
+		# branch.head master
+		# branch.upstream origin/master
+		# branch.ab +0 -0
+		1 A. N... 000000 100644 100644 $ZERO_OID $HMOD .gitmodules
+		1 AM SC.. 000000 160000 160000 $ZERO_OID $HSUB sub1
+		EOF
+
+		git status --porcelain=v2 --branch --untracked-files=all >actual &&
+		test_cmp expect actual
+	)
+
+[master 49ed2bd] new commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 file_in_sub
+ok 25 - commit within the submodule appears as new commit in super (AM SC..)
+
+expecting success: 
+	(	cd super_repo &&
+		## Stage the new submodule commit in the super.
+		git add sub1 &&
+		## Commit the super so that the sub no longer appears as added.
+		git commit -m "super commit" &&
+
+		HSUP=$(git rev-parse HEAD) &&
+
+		cat >expect <<-EOF &&
+		# branch.oid $HSUP
+		# branch.head master
+		# branch.upstream origin/master
+		# branch.ab +1 -0
+		EOF
+
+		git status --porcelain=v2 --branch --untracked-files=all >actual &&
+		test_cmp expect actual
+	)
+
+[master 9939ebd] super commit
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub1
+ok 26 - stage submodule in super and commit
+
+expecting success: 
+	(	cd super_repo &&
+		(	cd sub1 &&
+			echo "zzzz" >>file_in_sub
+		) &&
+
+		HSUP=$(git rev-parse HEAD) &&
+		HSUB=$(cd sub1 && git rev-parse HEAD) &&
+
+		cat >expect <<-EOF &&
+		# branch.oid $HSUP
+		# branch.head master
+		# branch.upstream origin/master
+		# branch.ab +1 -0
+		1 .M S.M. 160000 160000 160000 $HSUB $HSUB sub1
+		EOF
+
+		git status --porcelain=v2 --branch --untracked-files=all >actual &&
+		test_cmp expect actual
+	)
+
+ok 27 - make unstaged changes in existing submodule (.M S.M.)
+
+# passed all 27 test(s)
+1..27
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t5510-fetch.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5510-fetch/.git/
+expecting success: 
+	echo >file original &&
+	git add file &&
+	git commit -a -m original
+[master (root-commit) f9793b4] original
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+ok 1 - setup
+
+expecting success: 
+	git clone . one &&
+	(
+		cd one &&
+		echo >file updated by one &&
+		git commit -a -m "updated by one"
+	) &&
+	git clone . two &&
+	(
+		cd two &&
+		git config branch.master.remote one &&
+		git config remote.one.url ../one/.git/ &&
+		git config remote.one.fetch refs/heads/master:refs/heads/one
+	) &&
+	git clone . three &&
+	(
+		cd three &&
+		git config branch.master.remote two &&
+		git config branch.master.merge refs/heads/one &&
+		mkdir -p .git/remotes &&
+		{
+			echo "URL: ../two/.git/"
+			echo "Pull: refs/heads/master:refs/heads/two"
+			echo "Pull: refs/heads/one:refs/heads/one"
+		} >.git/remotes/two
+	) &&
+	git clone . bundle &&
+	git clone . seven
+
+Cloning into 'one'...
+done.
+[master 68725be] updated by one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Cloning into 'two'...
+done.
+Cloning into 'three'...
+done.
+Cloning into 'bundle'...
+done.
+Cloning into 'seven'...
+done.
+ok 2 - clone and setup child repos
+
+expecting success: 
+	cd "$D" &&
+	echo >file updated by origin &&
+	git commit -a -m "updated by origin" &&
+	cd two &&
+	git fetch &&
+	git rev-parse --verify refs/heads/one &&
+	mine=$(git rev-parse refs/heads/one) &&
+	his=$(cd ../one && git rev-parse refs/heads/master) &&
+	test "z$mine" = "z$his"
+
+[master 679b0d4] updated by origin
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+From ../one/
+ * [new branch]      master     -> one
+68725beb1b550405f5264fdaaeaee45034a2690b
+ok 3 - fetch test
+
+expecting success: 
+	cd "$D" &&
+	cd three &&
+	git fetch &&
+	git rev-parse --verify refs/heads/two &&
+	git rev-parse --verify refs/heads/one &&
+	master_in_two=$(cd ../two && git rev-parse master) &&
+	one_in_two=$(cd ../two && git rev-parse one) &&
+	{
+		echo "$one_in_two	"
+		echo "$master_in_two	not-for-merge"
+	} >expected &&
+	cut -f -2 .git/FETCH_HEAD >actual &&
+	test_cmp expected actual
+From ../two/
+ * [new branch]      one        -> one
+ * [new branch]      master     -> two
+f9793b4a9b565e79f67b9735940dd6aa8a99cf4e
+68725beb1b550405f5264fdaaeaee45034a2690b
+ok 4 - fetch test for-merge
+
+expecting success: 
+	cd "$D" &&
+	git clone . prune &&
+	cd prune &&
+	git update-ref refs/remotes/origin/extrabranch master &&
+
+	git fetch --prune origin &&
+	test_must_fail git rev-parse origin/extrabranch
+
+Cloning into 'prune'...
+done.
+From /build/git-2.20.1/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> origin/extrabranch
+fatal: ambiguous argument 'origin/extrabranch': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+origin/extrabranch
+ok 5 - fetch --prune on its own works as expected
+
+expecting success: 
+	cd "$D" &&
+	git clone . prune-branch &&
+	cd prune-branch &&
+	git update-ref refs/remotes/origin/extrabranch master &&
+
+	git fetch --prune origin master &&
+	git rev-parse origin/extrabranch
+
+Cloning into 'prune-branch'...
+done.
+From /build/git-2.20.1/t/trash directory.t5510-fetch/.
+ * branch            master     -> FETCH_HEAD
+679b0d4e136e2bd617dea1857b35254582ba9e23
+ok 6 - fetch --prune with a branch name keeps branches
+
+expecting success: 
+	cd "$D" &&
+	git clone . prune-namespace &&
+	cd prune-namespace &&
+
+	git fetch --prune origin refs/heads/a/*:refs/remotes/origin/a/* &&
+	git rev-parse origin/master
+
+Cloning into 'prune-namespace'...
+done.
+679b0d4e136e2bd617dea1857b35254582ba9e23
+ok 7 - fetch --prune with a namespace keeps other namespaces
+
+expecting success: 
+	cd "$D" &&
+	git update-ref refs/pull/42/head master &&
+	git clone . prune-overlapping &&
+	cd prune-overlapping &&
+	git config --add remote.origin.fetch refs/pull/*/head:refs/remotes/origin/pr/* &&
+
+	git fetch --prune origin &&
+	git rev-parse origin/master &&
+	git rev-parse origin/pr/42 &&
+
+	git config --unset-all remote.origin.fetch &&
+	git config remote.origin.fetch refs/pull/*/head:refs/remotes/origin/pr/* &&
+	git config --add remote.origin.fetch refs/heads/*:refs/remotes/origin/* &&
+
+	git fetch --prune origin &&
+	git rev-parse origin/master &&
+	git rev-parse origin/pr/42
+
+Cloning into 'prune-overlapping'...
+done.
+From /build/git-2.20.1/t/trash directory.t5510-fetch/.
+ * [new ref]         refs/pull/42/head -> origin/pr/42
+679b0d4e136e2bd617dea1857b35254582ba9e23
+679b0d4e136e2bd617dea1857b35254582ba9e23
+679b0d4e136e2bd617dea1857b35254582ba9e23
+679b0d4e136e2bd617dea1857b35254582ba9e23
+ok 8 - fetch --prune handles overlapping refspecs
+
+expecting success: 
+	cd "$D" &&
+	git clone . prune-tags &&
+	cd prune-tags &&
+	git tag sometag master &&
+	# Create what looks like a remote-tracking branch from an earlier
+	# fetch that has since been deleted from the remote:
+	git update-ref refs/remotes/origin/fake-remote master &&
+
+	git fetch --prune --tags origin &&
+	git rev-parse origin/master &&
+	test_must_fail git rev-parse origin/fake-remote &&
+	git rev-parse sometag
+
+Cloning into 'prune-tags'...
+done.
+From /build/git-2.20.1/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> origin/fake-remote
+679b0d4e136e2bd617dea1857b35254582ba9e23
+fatal: ambiguous argument 'origin/fake-remote': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+origin/fake-remote
+679b0d4e136e2bd617dea1857b35254582ba9e23
+ok 9 - fetch --prune --tags prunes branches but not tags
+
+expecting success: 
+	cd "$D" &&
+	git clone . prune-tags-branch &&
+	cd prune-tags-branch &&
+	git tag sometag master &&
+	git update-ref refs/remotes/origin/extrabranch master &&
+
+	git fetch --prune --tags origin master &&
+	git rev-parse origin/extrabranch &&
+	git rev-parse sometag
+
+Cloning into 'prune-tags-branch'...
+done.
+From /build/git-2.20.1/t/trash directory.t5510-fetch/.
+ * branch            master     -> FETCH_HEAD
+679b0d4e136e2bd617dea1857b35254582ba9e23
+679b0d4e136e2bd617dea1857b35254582ba9e23
+ok 10 - fetch --prune --tags with branch does not prune other things
+
+expecting success: 
+	cd "$D" &&
+	git clone . prune-tags-refspec &&
+	cd prune-tags-refspec &&
+	git tag sometag master &&
+	git update-ref refs/remotes/origin/foo/otherbranch master &&
+	git update-ref refs/remotes/origin/extrabranch master &&
+
+	git fetch --prune --tags origin refs/heads/foo/*:refs/remotes/origin/foo/* &&
+	test_must_fail git rev-parse refs/remotes/origin/foo/otherbranch &&
+	git rev-parse origin/extrabranch &&
+	git rev-parse sometag
+
+Cloning into 'prune-tags-refspec'...
+done.
+From /build/git-2.20.1/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> origin/foo/otherbranch
+fatal: ambiguous argument 'refs/remotes/origin/foo/otherbranch': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+refs/remotes/origin/foo/otherbranch
+679b0d4e136e2bd617dea1857b35254582ba9e23
+679b0d4e136e2bd617dea1857b35254582ba9e23
+ok 11 - fetch --prune --tags with refspec prunes based on refspec
+
+expecting success: 
+
+    cd "$D" &&
+
+    mkdir notags &&
+    cd notags &&
+    git init &&
+
+    git fetch -t ..
+
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5510-fetch/notags/.git/
+From ..
+ * branch            HEAD       -> FETCH_HEAD
+ok 12 - fetch tags when there is no tags
+
+expecting success: 
+
+	cd "$D" &&
+	git tag -a -m annotated anno HEAD &&
+	git tag light HEAD &&
+
+	mkdir four &&
+	cd four &&
+	git init &&
+
+	git fetch .. :track &&
+	git show-ref --verify refs/tags/anno &&
+	git show-ref --verify refs/tags/light
+
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5510-fetch/four/.git/
+From ..
+ * [new ref]                    -> track
+ * [new tag]         anno       -> anno
+ * [new tag]         light      -> light
+c12a8e771dbca3dc89dcd04285e2bb7770b33159 refs/tags/anno
+679b0d4e136e2bd617dea1857b35254582ba9e23 refs/tags/light
+ok 13 - fetch following tags
+
+expecting success: 
+	cd "$D" &&
+	git init descriptive &&
+	(
+		cd descriptive &&
+		git config remote.o.url .. &&
+		git config remote.o.fetch "refs/heads/*:refs/crazyheads/*" &&
+		git config --add remote.o.fetch "refs/others/*:refs/heads/*" &&
+		git fetch o
+	) &&
+	git tag -a -m "Descriptive tag" descriptive-tag &&
+	git branch descriptive-branch &&
+	git checkout descriptive-branch &&
+	echo "Nuts" >crazy &&
+	git add crazy &&
+	git commit -a -m "descriptive commit" &&
+	git update-ref refs/others/crazy HEAD &&
+	(
+		cd descriptive &&
+		git fetch o 2>actual &&
+		test_i18ngrep "new branch.* -> refs/crazyheads/descriptive-branch$" actual &&
+		test_i18ngrep "new tag.* -> descriptive-tag$" actual &&
+		test_i18ngrep "new ref.* -> crazy$" actual
+	) &&
+	git checkout master
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5510-fetch/descriptive/.git/
+From ..
+ * [new branch]      master     -> refs/crazyheads/master
+ * [new tag]         anno       -> anno
+ * [new tag]         light      -> light
+Switched to branch 'descriptive-branch'
+[descriptive-branch 5abb683] descriptive commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 crazy
+ * [new branch]      descriptive-branch -> refs/crazyheads/descriptive-branch
+ * [new tag]         descriptive-tag    -> descriptive-tag
+ * [new ref]         refs/others/crazy  -> crazy
+Switched to branch 'master'
+ok 14 - fetch uses remote ref names to describe new refs
+
+expecting success: 
+
+	cd "$D" &&
+
+	mkdir five &&
+	cd five &&
+	git init &&
+
+	test_must_fail git fetch .. anno:five
+
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5510-fetch/five/.git/
+error: cannot update ref 'refs/heads/five': trying to write non-commit object c12a8e771dbca3dc89dcd04285e2bb7770b33159 to branch 'refs/heads/five'
+From ..
+ ! [new tag]         anno       -> five  (unable to update local ref)
+ * [new tag]         anno       -> anno
+ok 15 - fetch must not resolve short tag name
+
+expecting success: 
+
+	cd "$D" &&
+	git update-ref refs/remotes/six/HEAD HEAD &&
+
+	mkdir six &&
+	cd six &&
+	git init &&
+
+	git fetch .. six:six
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5510-fetch/six/.git/
+From ..
+ * [new ref]         six/HEAD        -> six
+ * [new tag]         anno            -> anno
+ * [new tag]         descriptive-tag -> descriptive-tag
+ * [new tag]         light           -> light
+ok 16 - fetch can now resolve short remote name
+
+expecting success: 
+	cd "$D" &&
+	echo >file updated again by origin &&
+	git commit -a -m "tip" &&
+	git bundle create bundle1 master^..master
+
+[master feb4f9b] tip
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 17 - create bundle 1
+
+expecting success: 
+	head -n 1 "$D"/bundle1 | grep "^#" &&
+	head -n 2 "$D"/bundle1 | grep "^-[0-9a-f]\{40\} " &&
+	head -n 3 "$D"/bundle1 | grep "^[0-9a-f]\{40\} " &&
+	head -n 4 "$D"/bundle1 | grep "^$"
+
+# v2 git bundle
+-679b0d4e136e2bd617dea1857b35254582ba9e23 updated by origin
+feb4f9b294ff1a4406f0ae57b065e50b3f1b2b70 refs/heads/master
+
+ok 18 - header of bundle looks right
+
+expecting success: 
+	cd "$D" &&
+	git bundle create bundle2 master~2..master
+
+ok 19 - create bundle 2
+
+expecting success: 
+	cd "$D/bundle" &&
+	git checkout -b some-branch &&
+	test_must_fail git fetch "$D/bundle1" master:master
+
+Switched to a new branch 'some-branch'
+error: Repository lacks these prerequisite commits:
+error: 679b0d4e136e2bd617dea1857b35254582ba9e23 
+ok 20 - unbundle 1
+
+expecting success: 
+	cd "$D" &&
+	convert_bundle_to_pack <bundle1 >bundle.pack &&
+	git index-pack bundle.pack &&
+	test_bundle_object_count bundle.pack 3
+
+fc739b72c44830e934b36acc60fda900c0276e8d
+ok 21 - bundle 1 has only 3 files 
+
+expecting success: 
+	cd "$D/bundle" &&
+	git fetch ../bundle2 master:master &&
+	test "tip" = "$(git log -1 --pretty=oneline master | cut -b42-)"
+
+From ../bundle2
+   f9793b4..feb4f9b  master     -> master
+ok 22 - unbundle 2
+
+expecting success: 
+	cd "$D" &&
+	touch file2 &&
+	git add file2 &&
+	git commit -m add.file2 file2 &&
+	git bundle create bundle3 -1 HEAD &&
+	convert_bundle_to_pack <bundle3 >bundle.pack &&
+	git index-pack bundle.pack &&
+	test_bundle_object_count bundle.pack 3
+
+[master a7a7ea8] add.file2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 file2
+32111550c61bf2a0278426168c5d8bb81ef1a5ce
+ok 23 - bundle does not prerequisite objects
+
+expecting success: 
+
+	cd "$D" &&
+	git tag -a -m 1.0 v1.0 master &&
+	git bundle create bundle4 v1.0
+
+
+ok 24 - bundle should be able to create a full history
+
+expecting success: 
+	git config branch.master.remote yeti &&
+	git config branch.master.merge refs/heads/bigfoot &&
+	git config remote.blub.url one &&
+	git config remote.blub.fetch "refs/heads/*:refs/remotes/one/*" &&
+	git fetch blub
+
+From one
+ * [new branch]      master     -> one/master
+ok 25 - fetch with a non-applying branch.<name>.merge
+
+expecting success: 
+	one_head=$(cd one && git rev-parse HEAD) &&
+	this_head=$(git rev-parse HEAD) &&
+	git update-ref -d FETCH_HEAD &&
+	git fetch one &&
+	test $one_head = "$(git rev-parse --verify FETCH_HEAD)" &&
+	test $this_head = "$(git rev-parse --verify HEAD)"
+
+From one
+ * branch            HEAD       -> FETCH_HEAD
+ok 26 - fetch from GIT URL with a non-applying branch.<name>.merge [1]
+
+expecting success: 
+	one_ref=$(cd one && git symbolic-ref HEAD) &&
+	git config branch.master.remote blub &&
+	git config branch.master.merge "$one_ref" &&
+	git update-ref -d FETCH_HEAD &&
+	git fetch one &&
+	test $one_head = "$(git rev-parse --verify FETCH_HEAD)" &&
+	test $this_head = "$(git rev-parse --verify HEAD)"
+
+From one
+ * branch            HEAD       -> FETCH_HEAD
+ok 27 - fetch from GIT URL with a non-applying branch.<name>.merge [2]
+
+expecting success: 
+	git config branch.master.merge "${one_ref}_not" &&
+	git update-ref -d FETCH_HEAD &&
+	git fetch one &&
+	test $one_head = "$(git rev-parse --verify FETCH_HEAD)" &&
+	test $this_head = "$(git rev-parse --verify HEAD)"
+
+From one
+ * branch            HEAD       -> FETCH_HEAD
+ok 28 - fetch from GIT URL with a non-applying branch.<name>.merge [3]
+
+expecting success: 
+	test_must_fail git fetch "a\\!'b" > result 2>&1 &&
+	cat result &&
+	grep "fatal: 'a\\\\!'b'" result
+
+fatal: 'a\!'b' does not appear to be a git repository
+fatal: Could not read from remote repository.
+
+Please make sure you have the correct access rights
+and the repository exists.
+fatal: 'a\!'b' does not appear to be a git repository
+ok 29 - quoting of a strangely named repo
+
+expecting success: 
+
+	cd "$D" &&
+	git bundle create bundle5 HEAD master &&
+	git bundle list-heads bundle5 >actual &&
+	for h in HEAD refs/heads/master
+	do
+		echo "$(git rev-parse --verify $h) $h"
+	done >expect &&
+	test_cmp expect actual
+
+
+ok 30 - bundle should record HEAD correctly
+
+expecting success: 
+	(
+		cd three &&
+		git tag base-origin-master refs/remotes/origin/master
+	)
+
+ok 31 - mark initial state of origin/master
+
+expecting success: 
+
+	cd "$D" &&
+	git branch -f side &&
+	(
+		cd three &&
+		git update-ref refs/remotes/origin/master base-origin-master &&
+		o=$(git rev-parse --verify refs/remotes/origin/master) &&
+		git fetch origin master &&
+		n=$(git rev-parse --verify refs/remotes/origin/master) &&
+		test "$o" != "$n" &&
+		test_must_fail git rev-parse --verify refs/remotes/origin/side
+	)
+
+From /build/git-2.20.1/t/trash directory.t5510-fetch/.
+ * branch            master     -> FETCH_HEAD
+   f9793b4..a7a7ea8  master     -> origin/master
+fatal: Needed a single revision
+ok 32 - explicit fetch should update tracking
+
+expecting success: 
+
+	cd "$D" &&
+	git branch -f side &&
+	(
+		cd three &&
+		git update-ref refs/remotes/origin/master base-origin-master &&
+		o=$(git rev-parse --verify refs/remotes/origin/master) &&
+		git pull origin master &&
+		n=$(git rev-parse --verify refs/remotes/origin/master) &&
+		test "$o" != "$n" &&
+		test_must_fail git rev-parse --verify refs/remotes/origin/side
+	)
+
+From /build/git-2.20.1/t/trash directory.t5510-fetch/.
+ * branch            master     -> FETCH_HEAD
+   f9793b4..a7a7ea8  master     -> origin/master
+Updating f9793b4..a7a7ea8
+Fast-forward
+ file  | 2 +-
+ file2 | 0
+ 2 files changed, 1 insertion(+), 1 deletion(-)
+ create mode 100644 file2
+fatal: Needed a single revision
+ok 33 - explicit pull should update tracking
+
+expecting success: 
+	cd "$D" &&
+	(
+		cd three &&
+		test_must_fail git fetch --refmap="*:refs/remotes/none/*"
+	)
+
+fatal: --refmap option is only meaningful with command-line refspec(s).
+fatal: the remote end hung up unexpectedly
+ok 34 - explicit --refmap is allowed only with command-line refspec
+
+expecting success: 
+	cd "$D" &&
+	git branch -f side &&
+	(
+		cd three &&
+		git update-ref refs/remotes/origin/master base-origin-master &&
+		o=$(git rev-parse --verify refs/remotes/origin/master) &&
+		git fetch --refmap="refs/heads/*:refs/remotes/other/*" origin master &&
+		n=$(git rev-parse --verify refs/remotes/origin/master) &&
+		test "$o" = "$n" &&
+		test_must_fail git rev-parse --verify refs/remotes/origin/side &&
+		git rev-parse --verify refs/remotes/other/master
+	)
+
+From /build/git-2.20.1/t/trash directory.t5510-fetch/.
+ * branch            master     -> FETCH_HEAD
+ * [new branch]      master     -> other/master
+fatal: Needed a single revision
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+ok 35 - explicit --refmap option overrides remote.*.fetch
+
+expecting success: 
+	cd "$D" &&
+	git branch -f side &&
+	(
+		cd three &&
+		git update-ref refs/remotes/origin/master base-origin-master &&
+		o=$(git rev-parse --verify refs/remotes/origin/master) &&
+		git fetch --refmap="" origin master &&
+		n=$(git rev-parse --verify refs/remotes/origin/master) &&
+		test "$o" = "$n" &&
+		test_must_fail git rev-parse --verify refs/remotes/origin/side
+	)
+
+From /build/git-2.20.1/t/trash directory.t5510-fetch/.
+ * branch            master     -> FETCH_HEAD
+fatal: Needed a single revision
+ok 36 - explicitly empty --refmap option disables remote.*.fetch
+
+expecting success: 
+
+	cd "$D" &&
+	git branch -f side &&
+	(
+		cd three &&
+		git update-ref refs/remotes/origin/master base-origin-master &&
+		o=$(git rev-parse --verify refs/remotes/origin/master) &&
+		git fetch origin &&
+		n=$(git rev-parse --verify refs/remotes/origin/master) &&
+		test "$o" != "$n" &&
+		git rev-parse --verify refs/remotes/origin/side
+	)
+
+From /build/git-2.20.1/t/trash directory.t5510-fetch/.
+ * [new branch]      descriptive-branch -> origin/descriptive-branch
+   f9793b4..a7a7ea8  master             -> origin/master
+ * [new branch]      side               -> origin/side
+ * [new tag]         anno               -> anno
+ * [new tag]         descriptive-tag    -> descriptive-tag
+ * [new tag]         light              -> light
+ * [new tag]         v1.0               -> v1.0
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+ok 37 - configured fetch updates tracking
+
+expecting success: 
+	cd "$D" &&
+	git update-ref refs/odd/location HEAD &&
+	(
+		cd three &&
+		git update-ref refs/remotes/origin/master base-origin-master &&
+		git config --add remote.origin.fetch \
+			refs/odd/location:refs/remotes/origin/odd &&
+		o=$(git rev-parse --verify refs/remotes/origin/master) &&
+		git fetch origin master &&
+		n=$(git rev-parse --verify refs/remotes/origin/master) &&
+		test "$o" != "$n" &&
+		test_must_fail git rev-parse --verify refs/remotes/origin/odd
+	)
+
+From /build/git-2.20.1/t/trash directory.t5510-fetch/.
+ * branch            master     -> FETCH_HEAD
+   f9793b4..a7a7ea8  master     -> origin/master
+fatal: Needed a single revision
+ok 38 - non-matching refspecs do not confuse tracking update
+
+expecting success: 
+
+	cd "$D" &&
+	test_must_fail git push seven no:no
+
+
+error: src refspec no does not match any.
+error: failed to push some refs to 'seven'
+ok 39 - pushing nonexistent branch by mistake should not segv
+
+expecting success: 
+
+	cd "$D" &&
+	git clone .git follow &&
+	git checkout HEAD^0 &&
+	(
+		for i in 1 2 3 4 5 6 7
+		do
+			echo $i >>file &&
+			git commit -m $i -a &&
+			git tag -a -m $i excess-$i || exit 1
+		done
+	) &&
+	git checkout master &&
+	(
+		cd follow &&
+		git fetch
+	)
+
+Cloning into 'follow'...
+done.
+Note: checking out '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 performing another checkout.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -b with the checkout command again. Example:
+
+  git checkout -b <new-branch-name>
+
+HEAD is now at a7a7ea8 add.file2
+[detached HEAD 111c40c] 1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[detached HEAD 7f8f600] 2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[detached HEAD 92984c4] 3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[detached HEAD d861f3d] 4
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[detached HEAD db21ae6] 5
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[detached HEAD 8eb20bf] 6
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[detached HEAD 8fa80ac] 7
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Previous HEAD position was 8fa80ac 7
+Switched to branch 'master'
+Your branch is based on 'one/master_not', but the upstream is gone.
+  (use "git branch --unset-upstream" to fixup)
+ok 40 - auto tag following fetches minimum
+
+expecting success: 
+
+	test_must_fail git fetch . side:master
+
+
+fatal: Refusing to fetch into current branch refs/heads/master of non-bare repository
+fatal: the remote end hung up unexpectedly
+ok 41 - refuse to fetch into the current branch
+
+expecting success: 
+
+	git fetch --update-head-ok . side:master
+
+
+ok 42 - fetch into the current branch with --update-head-ok
+
+expecting success: 
+
+	rm -f .git/FETCH_HEAD &&
+	git fetch --dry-run . &&
+	! test -f .git/FETCH_HEAD
+
+From .
+ * branch            HEAD       -> FETCH_HEAD
+ok 43 - fetch --dry-run
+
+expecting success: 
+	mkdir dups &&
+	(
+		cd dups &&
+		git init &&
+		git config branch.master.remote three &&
+		git config remote.three.url ../three/.git &&
+		git config remote.three.fetch +refs/heads/*:refs/remotes/origin/* &&
+		git config --add remote.three.fetch +refs/heads/*:refs/remotes/origin/* &&
+		git fetch three
+	)
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5510-fetch/dups/.git/
+From ../three/
+ * [new branch]      master             -> origin/master
+ * [new branch]      one                -> origin/one
+ * [new branch]      two                -> origin/two
+ * [new tag]         base-origin-master -> base-origin-master
+ * [new tag]         v1.0               -> v1.0
+ * [new tag]         anno               -> anno
+ * [new tag]         descriptive-tag    -> descriptive-tag
+ * [new tag]         light              -> light
+ok 44 - should be able to fetch with duplicate refspecs
+
+expecting success: 
+	mkdir lhs-ambiguous &&
+	(
+		cd lhs-ambiguous &&
+		git init server &&
+		test_commit -C server unwanted &&
+		test_commit -C server wanted &&
+
+		git init client &&
+
+		# Check a name coming after "refs" alphabetically ...
+		git -C server update-ref refs/heads/s wanted &&
+		git -C server update-ref refs/heads/refs/heads/s unwanted &&
+		git -C client fetch ../server +refs/heads/s:refs/heads/checkthis &&
+		git -C server rev-parse wanted >expect &&
+		git -C client rev-parse checkthis >actual &&
+		test_cmp expect actual &&
+
+		# ... and one before.
+		git -C server update-ref refs/heads/q wanted &&
+		git -C server update-ref refs/heads/refs/heads/q unwanted &&
+		git -C client fetch ../server +refs/heads/q:refs/heads/checkthis &&
+		git -C server rev-parse wanted >expect &&
+		git -C client rev-parse checkthis >actual &&
+		test_cmp expect actual &&
+
+		# Tags are preferred over branches like refs/{heads,tags}/*
+		git -C server update-ref refs/tags/t wanted &&
+		git -C server update-ref refs/heads/t unwanted &&
+		git -C client fetch ../server +t:refs/heads/checkthis &&
+		git -C server rev-parse wanted >expect &&
+		git -C client rev-parse checkthis >actual
+	)
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5510-fetch/lhs-ambiguous/server/.git/
+[master (root-commit) 4bd74f6] unwanted
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 unwanted.t
+[master 2680c84] wanted
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 wanted.t
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5510-fetch/lhs-ambiguous/client/.git/
+From ../server
+ * [new branch]      s          -> checkthis
+ * [new tag]         wanted     -> wanted
+ * [new tag]         unwanted   -> unwanted
+From ../server
+ * [new tag]         t          -> t
+ok 45 - LHS of refspec follows ref disambiguation rules
+
+expecting success: 
+			remote_url="file://$(git -C one config remote.origin.url)" &&
+			remote_fetch="$(git -C one config remote.origin.fetch)" &&
+			cmdline_setup="\"$remote_url\" \"$remote_fetch\""
+		
+ok 46 - setup cmdline_setup variable for subsequent test
 
 expecting success: 
 		# make sure a newbranch is there in . and also in one
@@ -246942,7 +249677,7 @@
 			then
 				git_fetch_c=""
 			fi &&
-			git$git_fetch_c fetch --no-prune &&
+			git$git_fetch_c fetch  &&
 			case "$expected_branch" in
 			pruned)
 				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
@@ -246961,13 +249696,23 @@
 			esac
 		)
 	
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-Deleted branch newbranch (was 198a5d3).
-Deleted tag 'newtag' (was 198a5d3)
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-ok 77 - name prune fetch.prune=false remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept
+From file:///build/git-2.20.1/t/trash directory.t5510-fetch/.
+ * [new branch]      descriptive-branch -> origin/descriptive-branch
+   f9793b4..a7a7ea8  master             -> origin/master
+ * [new branch]      newbranch          -> origin/newbranch
+ * [new branch]      side               -> origin/side
+ * [new tag]         newtag             -> newtag
+ * [new tag]         v1.0               -> v1.0
+ * [new tag]         anno               -> anno
+ * [new tag]         descriptive-tag    -> descriptive-tag
+ * [new tag]         light              -> light
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+Deleted branch newbranch (was a7a7ea8).
+Deleted tag 'newtag' (was a7a7ea8)
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+ok 47 - name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:kept tag:kept
 
 expecting success: 
 		# make sure a newbranch is there in . and also in one
@@ -247001,7 +249746,7 @@
 			then
 				git_fetch_c=""
 			fi &&
-			git$git_fetch_c fetch --no-prune &&
+			git$git_fetch_c fetch "file:///build/git-2.20.1/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
 			case "$expected_branch" in
 			pruned)
 				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
@@ -247020,13 +249765,13 @@
 			esac
 		)
 	
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-Deleted branch newbranch (was 198a5d3).
-Deleted tag 'newtag' (was 198a5d3)
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-ok 78 - link prune fetch.prune=false remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+Deleted branch newbranch (was a7a7ea8).
+Deleted tag 'newtag' (was a7a7ea8)
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+ok 48 - link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:kept tag:kept
 
 expecting success: 
 		# make sure a newbranch is there in . and also in one
@@ -247060,7 +249805,7 @@
 			then
 				git_fetch_c=""
 			fi &&
-			git$git_fetch_c fetch --prune &&
+			git$git_fetch_c fetch --no-prune &&
 			case "$expected_branch" in
 			pruned)
 				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
@@ -247079,15 +249824,13 @@
 			esac
 		)
 	
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-Deleted branch newbranch (was 198a5d3).
-Deleted tag 'newtag' (was 198a5d3)
-From /build/git-2.20.1/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> origin/newbranch
-fatal: Needed a single revision
-198a5d34ee7685aad0c688d4833bbf879556f13f
-ok 79 - name prune fetch.prune=false remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+Deleted branch newbranch (was a7a7ea8).
+Deleted tag 'newtag' (was a7a7ea8)
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+ok 49 - name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept
 
 expecting success: 
 		# make sure a newbranch is there in . and also in one
@@ -247121,7 +249864,7 @@
 			then
 				git_fetch_c=""
 			fi &&
-			git$git_fetch_c fetch --prune &&
+			git$git_fetch_c fetch --no-prune &&
 			case "$expected_branch" in
 			pruned)
 				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
@@ -247140,17 +249883,13 @@
 			esac
 		)
 	
-From file:///build/git-2.20.1/t/trash directory.t5510-fetch/.
- * [new branch]      newbranch  -> origin/newbranch
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-Deleted branch newbranch (was 198a5d3).
-Deleted tag 'newtag' (was 198a5d3)
-From /build/git-2.20.1/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> origin/newbranch
-fatal: Needed a single revision
-198a5d34ee7685aad0c688d4833bbf879556f13f
-ok 80 - link prune fetch.prune=false remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+Deleted branch newbranch (was a7a7ea8).
+Deleted tag 'newtag' (was a7a7ea8)
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+ok 50 - link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept
 
 expecting success: 
 		# make sure a newbranch is there in . and also in one
@@ -247184,7 +249923,7 @@
 			then
 				git_fetch_c=""
 			fi &&
-			git$git_fetch_c fetch --prune origin refs/tags/*:refs/tags/* &&
+			git$git_fetch_c fetch --prune &&
 			case "$expected_branch" in
 			pruned)
 				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
@@ -247203,17 +249942,15 @@
 			esac
 		)
 	
-From file:///build/git-2.20.1/t/trash directory.t5510-fetch/.
- * [new branch]      newbranch  -> origin/newbranch
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-Deleted branch newbranch (was 198a5d3).
-Deleted tag 'newtag' (was 198a5d3)
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+Deleted branch newbranch (was a7a7ea8).
+Deleted tag 'newtag' (was a7a7ea8)
 From /build/git-2.20.1/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> newtag
-198a5d34ee7685aad0c688d4833bbf879556f13f
+ - [deleted]         (none)     -> origin/newbranch
 fatal: Needed a single revision
-ok 81 - name prune fetch.prune=false remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset --prune origin refs/tags/*:refs/tags/*; branch:kept tag:pruned
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+ok 51 - name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept
 
 expecting success: 
 		# make sure a newbranch is there in . and also in one
@@ -247247,7 +249984,7 @@
 			then
 				git_fetch_c=""
 			fi &&
-			git$git_fetch_c fetch --prune "file:///build/git-2.20.1/t/trash directory.t5510-fetch/." refs/tags/*:refs/tags/* &&
+			git$git_fetch_c fetch --prune &&
 			case "$expected_branch" in
 			pruned)
 				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
@@ -247267,16 +250004,16 @@
 		)
 	
 From file:///build/git-2.20.1/t/trash directory.t5510-fetch/.
- * [new tag]         newtag     -> newtag
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-Deleted branch newbranch (was 198a5d3).
-Deleted tag 'newtag' (was 198a5d3)
-From file:///build/git-2.20.1/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> newtag
-198a5d34ee7685aad0c688d4833bbf879556f13f
+ * [new branch]      newbranch  -> origin/newbranch
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+Deleted branch newbranch (was a7a7ea8).
+Deleted tag 'newtag' (was a7a7ea8)
+From /build/git-2.20.1/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> origin/newbranch
 fatal: Needed a single revision
-ok 82 - link prune fetch.prune=false remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset --prune origin refs/tags/*:refs/tags/*; branch:kept tag:pruned
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+ok 52 - link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept
 
 expecting success: 
 		# make sure a newbranch is there in . and also in one
@@ -247310,7 +250047,7 @@
 			then
 				git_fetch_c=""
 			fi &&
-			git$git_fetch_c fetch --prune origin refs/tags/*:refs/tags/* +refs/heads/*:refs/remotes/origin/* &&
+			git$git_fetch_c fetch --prune origin refs/tags/*:refs/tags/* &&
 			case "$expected_branch" in
 			pruned)
 				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
@@ -247330,17 +250067,23 @@
 		)
 	
 From file:///build/git-2.20.1/t/trash directory.t5510-fetch/.
- * [new tag]         newtag     -> newtag
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-Deleted branch newbranch (was 198a5d3).
-Deleted tag 'newtag' (was 198a5d3)
+ * [new branch]      newbranch  -> origin/newbranch
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+Deleted branch newbranch (was a7a7ea8).
+Deleted tag 'newtag' (was a7a7ea8)
 From /build/git-2.20.1/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> origin/newbranch
  - [deleted]         (none)     -> newtag
+ * [new tag]         excess-1   -> excess-1
+ * [new tag]         excess-2   -> excess-2
+ * [new tag]         excess-3   -> excess-3
+ * [new tag]         excess-4   -> excess-4
+ * [new tag]         excess-5   -> excess-5
+ * [new tag]         excess-6   -> excess-6
+ * [new tag]         excess-7   -> excess-7
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
 fatal: Needed a single revision
-fatal: Needed a single revision
-ok 83 - name prune fetch.prune=false remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset --prune origin refs/tags/*:refs/tags/* +refs/heads/*:refs/remotes/origin/*; branch:pruned tag:pruned
+ok 53 - name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune origin refs/tags/*:refs/tags/*; branch:kept tag:pruned
 
 expecting success: 
 		# make sure a newbranch is there in . and also in one
@@ -247374,7 +250117,7 @@
 			then
 				git_fetch_c=""
 			fi &&
-			git$git_fetch_c fetch --prune "file:///build/git-2.20.1/t/trash directory.t5510-fetch/." refs/tags/*:refs/tags/* +refs/heads/*:refs/remotes/origin/* &&
+			git$git_fetch_c fetch --prune "file:///build/git-2.20.1/t/trash directory.t5510-fetch/." refs/tags/*:refs/tags/* &&
 			case "$expected_branch" in
 			pruned)
 				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
@@ -247394,18 +250137,16 @@
 		)
 	
 From file:///build/git-2.20.1/t/trash directory.t5510-fetch/.
- * [new branch]      newbranch  -> origin/newbranch
  * [new tag]         newtag     -> newtag
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-Deleted branch newbranch (was 198a5d3).
-Deleted tag 'newtag' (was 198a5d3)
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+Deleted branch newbranch (was a7a7ea8).
+Deleted tag 'newtag' (was a7a7ea8)
 From file:///build/git-2.20.1/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> origin/newbranch
  - [deleted]         (none)     -> newtag
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
 fatal: Needed a single revision
-fatal: Needed a single revision
-ok 84 - link prune fetch.prune=false remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset --prune origin refs/tags/*:refs/tags/* +refs/heads/*:refs/remotes/origin/*; branch:pruned tag:pruned
+ok 54 - link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune origin refs/tags/*:refs/tags/*; branch:kept tag:pruned
 
 expecting success: 
 		# make sure a newbranch is there in . and also in one
@@ -247439,7 +250180,7 @@
 			then
 				git_fetch_c=""
 			fi &&
-			git$git_fetch_c fetch  &&
+			git$git_fetch_c fetch --prune origin refs/tags/*:refs/tags/* +refs/heads/*:refs/remotes/origin/* &&
 			case "$expected_branch" in
 			pruned)
 				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
@@ -247459,15 +250200,17 @@
 		)
 	
 From file:///build/git-2.20.1/t/trash directory.t5510-fetch/.
- * [new branch]      newbranch  -> origin/newbranch
  * [new tag]         newtag     -> newtag
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-Deleted branch newbranch (was 198a5d3).
-Deleted tag 'newtag' (was 198a5d3)
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-ok 85 - name prune fetch.prune=true remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:kept tag:kept
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+Deleted branch newbranch (was a7a7ea8).
+Deleted tag 'newtag' (was a7a7ea8)
+From /build/git-2.20.1/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> origin/newbranch
+ - [deleted]         (none)     -> newtag
+fatal: Needed a single revision
+fatal: Needed a single revision
+ok 55 - name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune origin refs/tags/*:refs/tags/* +refs/heads/*:refs/remotes/origin/*; branch:pruned tag:pruned
 
 expecting success: 
 		# make sure a newbranch is there in . and also in one
@@ -247501,7 +250244,7 @@
 			then
 				git_fetch_c=""
 			fi &&
-			git$git_fetch_c fetch "file:///build/git-2.20.1/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git$git_fetch_c fetch --prune "file:///build/git-2.20.1/t/trash directory.t5510-fetch/." refs/tags/*:refs/tags/* +refs/heads/*:refs/remotes/origin/* &&
 			case "$expected_branch" in
 			pruned)
 				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
@@ -247520,13 +250263,19 @@
 			esac
 		)
 	
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-Deleted branch newbranch (was 198a5d3).
-Deleted tag 'newtag' (was 198a5d3)
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-ok 86 - link prune fetch.prune=true remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:kept tag:kept
+From file:///build/git-2.20.1/t/trash directory.t5510-fetch/.
+ * [new branch]      newbranch  -> origin/newbranch
+ * [new tag]         newtag     -> newtag
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+Deleted branch newbranch (was a7a7ea8).
+Deleted tag 'newtag' (was a7a7ea8)
+From file:///build/git-2.20.1/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> origin/newbranch
+ - [deleted]         (none)     -> newtag
+fatal: Needed a single revision
+fatal: Needed a single revision
+ok 56 - link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune origin refs/tags/*:refs/tags/* +refs/heads/*:refs/remotes/origin/*; branch:pruned tag:pruned
 
 expecting success: 
 		# make sure a newbranch is there in . and also in one
@@ -247560,7 +250309,7 @@
 			then
 				git_fetch_c=""
 			fi &&
-			git$git_fetch_c fetch --prune &&
+			git$git_fetch_c fetch  &&
 			case "$expected_branch" in
 			pruned)
 				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
@@ -247579,15 +250328,16 @@
 			esac
 		)
 	
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-Deleted branch newbranch (was 198a5d3).
-Deleted tag 'newtag' (was 198a5d3)
-From /build/git-2.20.1/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> origin/newbranch
-fatal: Needed a single revision
-198a5d34ee7685aad0c688d4833bbf879556f13f
-ok 87 - name prune fetch.prune=true remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept
+From file:///build/git-2.20.1/t/trash directory.t5510-fetch/.
+ * [new branch]      newbranch  -> origin/newbranch
+ * [new tag]         newtag     -> newtag
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+Deleted branch newbranch (was a7a7ea8).
+Deleted tag 'newtag' (was a7a7ea8)
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+ok 57 - name prune fetch.prune=false remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:kept tag:kept
 
 expecting success: 
 		# make sure a newbranch is there in . and also in one
@@ -247621,7 +250371,7 @@
 			then
 				git_fetch_c=""
 			fi &&
-			git$git_fetch_c fetch --prune &&
+			git$git_fetch_c fetch "file:///build/git-2.20.1/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
 			case "$expected_branch" in
 			pruned)
 				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
@@ -247640,17 +250390,13 @@
 			esac
 		)
 	
-From file:///build/git-2.20.1/t/trash directory.t5510-fetch/.
- * [new branch]      newbranch  -> origin/newbranch
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-Deleted branch newbranch (was 198a5d3).
-Deleted tag 'newtag' (was 198a5d3)
-From /build/git-2.20.1/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> origin/newbranch
-fatal: Needed a single revision
-198a5d34ee7685aad0c688d4833bbf879556f13f
-ok 88 - link prune fetch.prune=true remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+Deleted branch newbranch (was a7a7ea8).
+Deleted tag 'newtag' (was a7a7ea8)
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+ok 58 - link prune fetch.prune=false remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:kept tag:kept
 
 expecting success: 
 		# make sure a newbranch is there in . and also in one
@@ -247703,15 +250449,13 @@
 			esac
 		)
 	
-From file:///build/git-2.20.1/t/trash directory.t5510-fetch/.
- * [new branch]      newbranch  -> origin/newbranch
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-Deleted branch newbranch (was 198a5d3).
-Deleted tag 'newtag' (was 198a5d3)
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-ok 89 - name prune fetch.prune=true remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+Deleted branch newbranch (was a7a7ea8).
+Deleted tag 'newtag' (was a7a7ea8)
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+ok 59 - name prune fetch.prune=false remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept
 
 expecting success: 
 		# make sure a newbranch is there in . and also in one
@@ -247764,13 +250508,13 @@
 			esac
 		)
 	
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-Deleted branch newbranch (was 198a5d3).
-Deleted tag 'newtag' (was 198a5d3)
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-ok 90 - link prune fetch.prune=true remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+Deleted branch newbranch (was a7a7ea8).
+Deleted tag 'newtag' (was a7a7ea8)
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+ok 60 - link prune fetch.prune=false remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept
 
 expecting success: 
 		# make sure a newbranch is there in . and also in one
@@ -247804,7 +250548,7 @@
 			then
 				git_fetch_c=""
 			fi &&
-			git$git_fetch_c fetch  &&
+			git$git_fetch_c fetch --prune &&
 			case "$expected_branch" in
 			pruned)
 				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
@@ -247823,15 +250567,15 @@
 			esac
 		)
 	
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-Deleted branch newbranch (was 198a5d3).
-Deleted tag 'newtag' (was 198a5d3)
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+Deleted branch newbranch (was a7a7ea8).
+Deleted tag 'newtag' (was a7a7ea8)
 From /build/git-2.20.1/t/trash directory.t5510-fetch/.
  - [deleted]         (none)     -> origin/newbranch
 fatal: Needed a single revision
-198a5d34ee7685aad0c688d4833bbf879556f13f
-ok 91 - name prune fetch.prune=unset remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:pruned tag:kept
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+ok 61 - name prune fetch.prune=false remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept
 
 expecting success: 
 		# make sure a newbranch is there in . and also in one
@@ -247865,7 +250609,7 @@
 			then
 				git_fetch_c=""
 			fi &&
-			git$git_fetch_c fetch "file:///build/git-2.20.1/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git$git_fetch_c fetch --prune &&
 			case "$expected_branch" in
 			pruned)
 				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
@@ -247886,15 +250630,15 @@
 	
 From file:///build/git-2.20.1/t/trash directory.t5510-fetch/.
  * [new branch]      newbranch  -> origin/newbranch
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-Deleted branch newbranch (was 198a5d3).
-Deleted tag 'newtag' (was 198a5d3)
-From file:///build/git-2.20.1/t/trash directory.t5510-fetch/.
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+Deleted branch newbranch (was a7a7ea8).
+Deleted tag 'newtag' (was a7a7ea8)
+From /build/git-2.20.1/t/trash directory.t5510-fetch/.
  - [deleted]         (none)     -> origin/newbranch
 fatal: Needed a single revision
-198a5d34ee7685aad0c688d4833bbf879556f13f
-ok 92 - link prune fetch.prune=unset remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:pruned tag:kept
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+ok 62 - link prune fetch.prune=false remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept
 
 expecting success: 
 		# make sure a newbranch is there in . and also in one
@@ -247928,7 +250672,7 @@
 			then
 				git_fetch_c=""
 			fi &&
-			git$git_fetch_c fetch --no-prune &&
+			git$git_fetch_c fetch  &&
 			case "$expected_branch" in
 			pruned)
 				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
@@ -247949,13 +250693,15 @@
 	
 From file:///build/git-2.20.1/t/trash directory.t5510-fetch/.
  * [new branch]      newbranch  -> origin/newbranch
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-Deleted branch newbranch (was 198a5d3).
-Deleted tag 'newtag' (was 198a5d3)
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-ok 93 - name prune fetch.prune=unset remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+Deleted branch newbranch (was a7a7ea8).
+Deleted tag 'newtag' (was a7a7ea8)
+From /build/git-2.20.1/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> origin/newbranch
+fatal: Needed a single revision
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+ok 63 - name prune fetch.prune=true remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:pruned tag:kept
 
 expecting success: 
 		# make sure a newbranch is there in . and also in one
@@ -247989,7 +250735,7 @@
 			then
 				git_fetch_c=""
 			fi &&
-			git$git_fetch_c fetch --no-prune &&
+			git$git_fetch_c fetch "file:///build/git-2.20.1/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
 			case "$expected_branch" in
 			pruned)
 				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
@@ -248008,13 +250754,17 @@
 			esac
 		)
 	
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-Deleted branch newbranch (was 198a5d3).
-Deleted tag 'newtag' (was 198a5d3)
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-ok 94 - link prune fetch.prune=unset remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept
+From file:///build/git-2.20.1/t/trash directory.t5510-fetch/.
+ * [new branch]      newbranch  -> origin/newbranch
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+Deleted branch newbranch (was a7a7ea8).
+Deleted tag 'newtag' (was a7a7ea8)
+From file:///build/git-2.20.1/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> origin/newbranch
+fatal: Needed a single revision
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+ok 64 - link prune fetch.prune=true remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:pruned tag:kept
 
 expecting success: 
 		# make sure a newbranch is there in . and also in one
@@ -248067,15 +250817,17 @@
 			esac
 		)
 	
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-Deleted branch newbranch (was 198a5d3).
-Deleted tag 'newtag' (was 198a5d3)
+From file:///build/git-2.20.1/t/trash directory.t5510-fetch/.
+ * [new branch]      newbranch  -> origin/newbranch
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+Deleted branch newbranch (was a7a7ea8).
+Deleted tag 'newtag' (was a7a7ea8)
 From /build/git-2.20.1/t/trash directory.t5510-fetch/.
  - [deleted]         (none)     -> origin/newbranch
 fatal: Needed a single revision
-198a5d34ee7685aad0c688d4833bbf879556f13f
-ok 95 - name prune fetch.prune=unset remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+ok 65 - name prune fetch.prune=true remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept
 
 expecting success: 
 		# make sure a newbranch is there in . and also in one
@@ -248130,15 +250882,15 @@
 	
 From file:///build/git-2.20.1/t/trash directory.t5510-fetch/.
  * [new branch]      newbranch  -> origin/newbranch
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-Deleted branch newbranch (was 198a5d3).
-Deleted tag 'newtag' (was 198a5d3)
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+Deleted branch newbranch (was a7a7ea8).
+Deleted tag 'newtag' (was a7a7ea8)
 From /build/git-2.20.1/t/trash directory.t5510-fetch/.
  - [deleted]         (none)     -> origin/newbranch
 fatal: Needed a single revision
-198a5d34ee7685aad0c688d4833bbf879556f13f
-ok 96 - link prune fetch.prune=unset remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+ok 66 - link prune fetch.prune=true remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept
 
 expecting success: 
 		# make sure a newbranch is there in . and also in one
@@ -248172,7 +250924,7 @@
 			then
 				git_fetch_c=""
 			fi &&
-			git$git_fetch_c fetch  &&
+			git$git_fetch_c fetch --no-prune &&
 			case "$expected_branch" in
 			pruned)
 				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
@@ -248193,15 +250945,13 @@
 	
 From file:///build/git-2.20.1/t/trash directory.t5510-fetch/.
  * [new branch]      newbranch  -> origin/newbranch
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-Deleted branch newbranch (was 198a5d3).
-Deleted tag 'newtag' (was 198a5d3)
-From /build/git-2.20.1/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> origin/newbranch
-fatal: Needed a single revision
-198a5d34ee7685aad0c688d4833bbf879556f13f
-ok 97 - name prune fetch.prune=false remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:pruned tag:kept
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+Deleted branch newbranch (was a7a7ea8).
+Deleted tag 'newtag' (was a7a7ea8)
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+ok 67 - name prune fetch.prune=true remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept
 
 expecting success: 
 		# make sure a newbranch is there in . and also in one
@@ -248235,7 +250985,7 @@
 			then
 				git_fetch_c=""
 			fi &&
-			git$git_fetch_c fetch "file:///build/git-2.20.1/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git$git_fetch_c fetch --no-prune &&
 			case "$expected_branch" in
 			pruned)
 				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
@@ -248254,17 +251004,13 @@
 			esac
 		)
 	
-From file:///build/git-2.20.1/t/trash directory.t5510-fetch/.
- * [new branch]      newbranch  -> origin/newbranch
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-Deleted branch newbranch (was 198a5d3).
-Deleted tag 'newtag' (was 198a5d3)
-From file:///build/git-2.20.1/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> origin/newbranch
-fatal: Needed a single revision
-198a5d34ee7685aad0c688d4833bbf879556f13f
-ok 98 - link prune fetch.prune=false remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:pruned tag:kept
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+Deleted branch newbranch (was a7a7ea8).
+Deleted tag 'newtag' (was a7a7ea8)
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+ok 68 - link prune fetch.prune=true remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept
 
 expecting success: 
 		# make sure a newbranch is there in . and also in one
@@ -248298,7 +251044,7 @@
 			then
 				git_fetch_c=""
 			fi &&
-			git$git_fetch_c fetch --no-prune &&
+			git$git_fetch_c fetch  &&
 			case "$expected_branch" in
 			pruned)
 				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
@@ -248317,15 +251063,13 @@
 			esac
 		)
 	
-From file:///build/git-2.20.1/t/trash directory.t5510-fetch/.
- * [new branch]      newbranch  -> origin/newbranch
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-Deleted branch newbranch (was 198a5d3).
-Deleted tag 'newtag' (was 198a5d3)
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-ok 99 - name prune fetch.prune=false remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+Deleted branch newbranch (was a7a7ea8).
+Deleted tag 'newtag' (was a7a7ea8)
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+ok 69 - name prune fetch.prune=unset remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:kept tag:kept
 
 expecting success: 
 		# make sure a newbranch is there in . and also in one
@@ -248359,7 +251103,7 @@
 			then
 				git_fetch_c=""
 			fi &&
-			git$git_fetch_c fetch --no-prune &&
+			git$git_fetch_c fetch "file:///build/git-2.20.1/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
 			case "$expected_branch" in
 			pruned)
 				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
@@ -248378,13 +251122,13 @@
 			esac
 		)
 	
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-Deleted branch newbranch (was 198a5d3).
-Deleted tag 'newtag' (was 198a5d3)
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-ok 100 - link prune fetch.prune=false remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+Deleted branch newbranch (was a7a7ea8).
+Deleted tag 'newtag' (was a7a7ea8)
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+ok 70 - link prune fetch.prune=unset remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:kept tag:kept
 
 expecting success: 
 		# make sure a newbranch is there in . and also in one
@@ -248418,7 +251162,7 @@
 			then
 				git_fetch_c=""
 			fi &&
-			git$git_fetch_c fetch --prune &&
+			git$git_fetch_c fetch --no-prune &&
 			case "$expected_branch" in
 			pruned)
 				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
@@ -248437,15 +251181,13 @@
 			esac
 		)
 	
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-Deleted branch newbranch (was 198a5d3).
-Deleted tag 'newtag' (was 198a5d3)
-From /build/git-2.20.1/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> origin/newbranch
-fatal: Needed a single revision
-198a5d34ee7685aad0c688d4833bbf879556f13f
-ok 101 - name prune fetch.prune=false remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+Deleted branch newbranch (was a7a7ea8).
+Deleted tag 'newtag' (was a7a7ea8)
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+ok 71 - name prune fetch.prune=unset remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept
 
 expecting success: 
 		# make sure a newbranch is there in . and also in one
@@ -248479,7 +251221,7 @@
 			then
 				git_fetch_c=""
 			fi &&
-			git$git_fetch_c fetch --prune &&
+			git$git_fetch_c fetch --no-prune &&
 			case "$expected_branch" in
 			pruned)
 				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
@@ -248498,17 +251240,13 @@
 			esac
 		)
 	
-From file:///build/git-2.20.1/t/trash directory.t5510-fetch/.
- * [new branch]      newbranch  -> origin/newbranch
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-Deleted branch newbranch (was 198a5d3).
-Deleted tag 'newtag' (was 198a5d3)
-From /build/git-2.20.1/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> origin/newbranch
-fatal: Needed a single revision
-198a5d34ee7685aad0c688d4833bbf879556f13f
-ok 102 - link prune fetch.prune=false remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+Deleted branch newbranch (was a7a7ea8).
+Deleted tag 'newtag' (was a7a7ea8)
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+ok 72 - link prune fetch.prune=unset remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept
 
 expecting success: 
 		# make sure a newbranch is there in . and also in one
@@ -248542,7 +251280,7 @@
 			then
 				git_fetch_c=""
 			fi &&
-			git$git_fetch_c fetch  &&
+			git$git_fetch_c fetch --prune &&
 			case "$expected_branch" in
 			pruned)
 				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
@@ -248561,17 +251299,15 @@
 			esac
 		)
 	
-From file:///build/git-2.20.1/t/trash directory.t5510-fetch/.
- * [new branch]      newbranch  -> origin/newbranch
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-Deleted branch newbranch (was 198a5d3).
-Deleted tag 'newtag' (was 198a5d3)
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+Deleted branch newbranch (was a7a7ea8).
+Deleted tag 'newtag' (was a7a7ea8)
 From /build/git-2.20.1/t/trash directory.t5510-fetch/.
  - [deleted]         (none)     -> origin/newbranch
 fatal: Needed a single revision
-198a5d34ee7685aad0c688d4833bbf879556f13f
-ok 103 - name prune fetch.prune=true remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:pruned tag:kept
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+ok 73 - name prune fetch.prune=unset remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept
 
 expecting success: 
 		# make sure a newbranch is there in . and also in one
@@ -248605,7 +251341,7 @@
 			then
 				git_fetch_c=""
 			fi &&
-			git$git_fetch_c fetch "file:///build/git-2.20.1/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git$git_fetch_c fetch --prune &&
 			case "$expected_branch" in
 			pruned)
 				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
@@ -248626,15 +251362,15 @@
 	
 From file:///build/git-2.20.1/t/trash directory.t5510-fetch/.
  * [new branch]      newbranch  -> origin/newbranch
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-Deleted branch newbranch (was 198a5d3).
-Deleted tag 'newtag' (was 198a5d3)
-From file:///build/git-2.20.1/t/trash directory.t5510-fetch/.
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+Deleted branch newbranch (was a7a7ea8).
+Deleted tag 'newtag' (was a7a7ea8)
+From /build/git-2.20.1/t/trash directory.t5510-fetch/.
  - [deleted]         (none)     -> origin/newbranch
 fatal: Needed a single revision
-198a5d34ee7685aad0c688d4833bbf879556f13f
-ok 104 - link prune fetch.prune=true remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:pruned tag:kept
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+ok 74 - link prune fetch.prune=unset remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept
 
 expecting success: 
 		# make sure a newbranch is there in . and also in one
@@ -248668,7 +251404,7 @@
 			then
 				git_fetch_c=""
 			fi &&
-			git$git_fetch_c fetch --prune &&
+			git$git_fetch_c fetch  &&
 			case "$expected_branch" in
 			pruned)
 				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
@@ -248689,15 +251425,13 @@
 	
 From file:///build/git-2.20.1/t/trash directory.t5510-fetch/.
  * [new branch]      newbranch  -> origin/newbranch
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-Deleted branch newbranch (was 198a5d3).
-Deleted tag 'newtag' (was 198a5d3)
-From /build/git-2.20.1/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> origin/newbranch
-fatal: Needed a single revision
-198a5d34ee7685aad0c688d4833bbf879556f13f
-ok 105 - name prune fetch.prune=true remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+Deleted branch newbranch (was a7a7ea8).
+Deleted tag 'newtag' (was a7a7ea8)
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+ok 75 - name prune fetch.prune=false remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:kept tag:kept
 
 expecting success: 
 		# make sure a newbranch is there in . and also in one
@@ -248731,7 +251465,7 @@
 			then
 				git_fetch_c=""
 			fi &&
-			git$git_fetch_c fetch --prune &&
+			git$git_fetch_c fetch "file:///build/git-2.20.1/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
 			case "$expected_branch" in
 			pruned)
 				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
@@ -248750,17 +251484,13 @@
 			esac
 		)
 	
-From file:///build/git-2.20.1/t/trash directory.t5510-fetch/.
- * [new branch]      newbranch  -> origin/newbranch
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-Deleted branch newbranch (was 198a5d3).
-Deleted tag 'newtag' (was 198a5d3)
-From /build/git-2.20.1/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> origin/newbranch
-fatal: Needed a single revision
-198a5d34ee7685aad0c688d4833bbf879556f13f
-ok 106 - link prune fetch.prune=true remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+Deleted branch newbranch (was a7a7ea8).
+Deleted tag 'newtag' (was a7a7ea8)
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+ok 76 - link prune fetch.prune=false remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:kept tag:kept
 
 expecting success: 
 		# make sure a newbranch is there in . and also in one
@@ -248813,15 +251543,13 @@
 			esac
 		)
 	
-From file:///build/git-2.20.1/t/trash directory.t5510-fetch/.
- * [new branch]      newbranch  -> origin/newbranch
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-Deleted branch newbranch (was 198a5d3).
-Deleted tag 'newtag' (was 198a5d3)
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-ok 107 - name prune fetch.prune=true remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+Deleted branch newbranch (was a7a7ea8).
+Deleted tag 'newtag' (was a7a7ea8)
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+ok 77 - name prune fetch.prune=false remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept
 
 expecting success: 
 		# make sure a newbranch is there in . and also in one
@@ -248874,13 +251602,13 @@
 			esac
 		)
 	
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-Deleted branch newbranch (was 198a5d3).
-Deleted tag 'newtag' (was 198a5d3)
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-ok 108 - link prune fetch.prune=true remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+Deleted branch newbranch (was a7a7ea8).
+Deleted tag 'newtag' (was a7a7ea8)
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+ok 78 - link prune fetch.prune=false remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept
 
 expecting success: 
 		# make sure a newbranch is there in . and also in one
@@ -248914,7 +251642,7 @@
 			then
 				git_fetch_c=""
 			fi &&
-			git$git_fetch_c fetch --prune origin refs/tags/*:refs/tags/* &&
+			git$git_fetch_c fetch --prune &&
 			case "$expected_branch" in
 			pruned)
 				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
@@ -248933,15 +251661,15 @@
 			esac
 		)
 	
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-Deleted branch newbranch (was 198a5d3).
-Deleted tag 'newtag' (was 198a5d3)
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+Deleted branch newbranch (was a7a7ea8).
+Deleted tag 'newtag' (was a7a7ea8)
 From /build/git-2.20.1/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> newtag
-198a5d34ee7685aad0c688d4833bbf879556f13f
+ - [deleted]         (none)     -> origin/newbranch
 fatal: Needed a single revision
-ok 109 - name prune fetch.prune=true remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --prune origin refs/tags/*:refs/tags/*; branch:kept tag:pruned
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+ok 79 - name prune fetch.prune=false remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept
 
 expecting success: 
 		# make sure a newbranch is there in . and also in one
@@ -248975,7 +251703,7 @@
 			then
 				git_fetch_c=""
 			fi &&
-			git$git_fetch_c fetch --prune "file:///build/git-2.20.1/t/trash directory.t5510-fetch/." refs/tags/*:refs/tags/* &&
+			git$git_fetch_c fetch --prune &&
 			case "$expected_branch" in
 			pruned)
 				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
@@ -248995,16 +251723,16 @@
 		)
 	
 From file:///build/git-2.20.1/t/trash directory.t5510-fetch/.
- * [new tag]         newtag     -> newtag
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-Deleted branch newbranch (was 198a5d3).
-Deleted tag 'newtag' (was 198a5d3)
-From file:///build/git-2.20.1/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> newtag
-198a5d34ee7685aad0c688d4833bbf879556f13f
+ * [new branch]      newbranch  -> origin/newbranch
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+Deleted branch newbranch (was a7a7ea8).
+Deleted tag 'newtag' (was a7a7ea8)
+From /build/git-2.20.1/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> origin/newbranch
 fatal: Needed a single revision
-ok 110 - link prune fetch.prune=true remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --prune origin refs/tags/*:refs/tags/*; branch:kept tag:pruned
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+ok 80 - link prune fetch.prune=false remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept
 
 expecting success: 
 		# make sure a newbranch is there in . and also in one
@@ -249038,7 +251766,7 @@
 			then
 				git_fetch_c=""
 			fi &&
-			git$git_fetch_c fetch --prune origin refs/tags/*:refs/tags/* +refs/heads/*:refs/remotes/origin/* &&
+			git$git_fetch_c fetch --prune origin refs/tags/*:refs/tags/* &&
 			case "$expected_branch" in
 			pruned)
 				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
@@ -249058,17 +251786,16 @@
 		)
 	
 From file:///build/git-2.20.1/t/trash directory.t5510-fetch/.
- * [new tag]         newtag     -> newtag
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-Deleted branch newbranch (was 198a5d3).
-Deleted tag 'newtag' (was 198a5d3)
+ * [new branch]      newbranch  -> origin/newbranch
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+Deleted branch newbranch (was a7a7ea8).
+Deleted tag 'newtag' (was a7a7ea8)
 From /build/git-2.20.1/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> origin/newbranch
  - [deleted]         (none)     -> newtag
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
 fatal: Needed a single revision
-fatal: Needed a single revision
-ok 111 - name prune fetch.prune=true remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --prune origin refs/tags/*:refs/tags/* +refs/heads/*:refs/remotes/origin/*; branch:pruned tag:pruned
+ok 81 - name prune fetch.prune=false remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset --prune origin refs/tags/*:refs/tags/*; branch:kept tag:pruned
 
 expecting success: 
 		# make sure a newbranch is there in . and also in one
@@ -249102,7 +251829,7 @@
 			then
 				git_fetch_c=""
 			fi &&
-			git$git_fetch_c fetch --prune "file:///build/git-2.20.1/t/trash directory.t5510-fetch/." refs/tags/*:refs/tags/* +refs/heads/*:refs/remotes/origin/* &&
+			git$git_fetch_c fetch --prune "file:///build/git-2.20.1/t/trash directory.t5510-fetch/." refs/tags/*:refs/tags/* &&
 			case "$expected_branch" in
 			pruned)
 				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
@@ -249122,18 +251849,16 @@
 		)
 	
 From file:///build/git-2.20.1/t/trash directory.t5510-fetch/.
- * [new branch]      newbranch  -> origin/newbranch
  * [new tag]         newtag     -> newtag
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-Deleted branch newbranch (was 198a5d3).
-Deleted tag 'newtag' (was 198a5d3)
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+Deleted branch newbranch (was a7a7ea8).
+Deleted tag 'newtag' (was a7a7ea8)
 From file:///build/git-2.20.1/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> origin/newbranch
  - [deleted]         (none)     -> newtag
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
 fatal: Needed a single revision
-fatal: Needed a single revision
-ok 112 - link prune fetch.prune=true remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --prune origin refs/tags/*:refs/tags/* +refs/heads/*:refs/remotes/origin/*; branch:pruned tag:pruned
+ok 82 - link prune fetch.prune=false remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset --prune origin refs/tags/*:refs/tags/*; branch:kept tag:pruned
 
 expecting success: 
 		# make sure a newbranch is there in . and also in one
@@ -249167,7 +251892,7 @@
 			then
 				git_fetch_c=""
 			fi &&
-			git$git_fetch_c fetch --prune-tags &&
+			git$git_fetch_c fetch --prune origin refs/tags/*:refs/tags/* +refs/heads/*:refs/remotes/origin/* &&
 			case "$expected_branch" in
 			pruned)
 				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
@@ -249187,15 +251912,17 @@
 		)
 	
 From file:///build/git-2.20.1/t/trash directory.t5510-fetch/.
- * [new branch]      newbranch  -> origin/newbranch
  * [new tag]         newtag     -> newtag
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-Deleted branch newbranch (was 198a5d3).
-Deleted tag 'newtag' (was 198a5d3)
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-ok 113 - name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune-tags; branch:kept tag:kept
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+Deleted branch newbranch (was a7a7ea8).
+Deleted tag 'newtag' (was a7a7ea8)
+From /build/git-2.20.1/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> origin/newbranch
+ - [deleted]         (none)     -> newtag
+fatal: Needed a single revision
+fatal: Needed a single revision
+ok 83 - name prune fetch.prune=false remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset --prune origin refs/tags/*:refs/tags/* +refs/heads/*:refs/remotes/origin/*; branch:pruned tag:pruned
 
 expecting success: 
 		# make sure a newbranch is there in . and also in one
@@ -249229,7 +251956,7 @@
 			then
 				git_fetch_c=""
 			fi &&
-			git$git_fetch_c fetch --prune-tags &&
+			git$git_fetch_c fetch --prune "file:///build/git-2.20.1/t/trash directory.t5510-fetch/." refs/tags/*:refs/tags/* +refs/heads/*:refs/remotes/origin/* &&
 			case "$expected_branch" in
 			pruned)
 				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
@@ -249248,13 +251975,19 @@
 			esac
 		)
 	
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-Deleted branch newbranch (was 198a5d3).
-Deleted tag 'newtag' (was 198a5d3)
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-ok 114 - link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune-tags; branch:kept tag:kept
+From file:///build/git-2.20.1/t/trash directory.t5510-fetch/.
+ * [new branch]      newbranch  -> origin/newbranch
+ * [new tag]         newtag     -> newtag
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+Deleted branch newbranch (was a7a7ea8).
+Deleted tag 'newtag' (was a7a7ea8)
+From file:///build/git-2.20.1/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> origin/newbranch
+ - [deleted]         (none)     -> newtag
+fatal: Needed a single revision
+fatal: Needed a single revision
+ok 84 - link prune fetch.prune=false remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset --prune origin refs/tags/*:refs/tags/* +refs/heads/*:refs/remotes/origin/*; branch:pruned tag:pruned
 
 expecting success: 
 		# make sure a newbranch is there in . and also in one
@@ -249307,13 +252040,16 @@
 			esac
 		)
 	
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-Deleted branch newbranch (was 198a5d3).
-Deleted tag 'newtag' (was 198a5d3)
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-ok 115 - name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=true remote.origin.pruneTags=unset; branch:kept tag:kept
+From file:///build/git-2.20.1/t/trash directory.t5510-fetch/.
+ * [new branch]      newbranch  -> origin/newbranch
+ * [new tag]         newtag     -> newtag
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+Deleted branch newbranch (was a7a7ea8).
+Deleted tag 'newtag' (was a7a7ea8)
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+ok 85 - name prune fetch.prune=true remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:kept tag:kept
 
 expecting success: 
 		# make sure a newbranch is there in . and also in one
@@ -249347,7 +252083,7 @@
 			then
 				git_fetch_c=""
 			fi &&
-			git$git_fetch_c fetch "file:///build/git-2.20.1/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" refs/tags/*:refs/tags/* &&
+			git$git_fetch_c fetch "file:///build/git-2.20.1/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
 			case "$expected_branch" in
 			pruned)
 				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
@@ -249366,13 +252102,13 @@
 			esac
 		)
 	
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-Deleted branch newbranch (was 198a5d3).
-Deleted tag 'newtag' (was 198a5d3)
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-ok 116 - link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=true remote.origin.pruneTags=unset; branch:kept tag:kept
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+Deleted branch newbranch (was a7a7ea8).
+Deleted tag 'newtag' (was a7a7ea8)
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+ok 86 - link prune fetch.prune=true remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:kept tag:kept
 
 expecting success: 
 		# make sure a newbranch is there in . and also in one
@@ -249406,7 +252142,7 @@
 			then
 				git_fetch_c=""
 			fi &&
-			git$git_fetch_c fetch  &&
+			git$git_fetch_c fetch --prune &&
 			case "$expected_branch" in
 			pruned)
 				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
@@ -249425,13 +252161,15 @@
 			esac
 		)
 	
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-Deleted branch newbranch (was 198a5d3).
-Deleted tag 'newtag' (was 198a5d3)
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-ok 117 - name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=true; branch:kept tag:kept
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+Deleted branch newbranch (was a7a7ea8).
+Deleted tag 'newtag' (was a7a7ea8)
+From /build/git-2.20.1/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> origin/newbranch
+fatal: Needed a single revision
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+ok 87 - name prune fetch.prune=true remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept
 
 expecting success: 
 		# make sure a newbranch is there in . and also in one
@@ -249465,7 +252203,7 @@
 			then
 				git_fetch_c=""
 			fi &&
-			git$git_fetch_c fetch "file:///build/git-2.20.1/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" refs/tags/*:refs/tags/* &&
+			git$git_fetch_c fetch --prune &&
 			case "$expected_branch" in
 			pruned)
 				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
@@ -249484,13 +252222,17 @@
 			esac
 		)
 	
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-Deleted branch newbranch (was 198a5d3).
-Deleted tag 'newtag' (was 198a5d3)
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-ok 118 - link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=true; branch:kept tag:kept
+From file:///build/git-2.20.1/t/trash directory.t5510-fetch/.
+ * [new branch]      newbranch  -> origin/newbranch
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+Deleted branch newbranch (was a7a7ea8).
+Deleted tag 'newtag' (was a7a7ea8)
+From /build/git-2.20.1/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> origin/newbranch
+fatal: Needed a single revision
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+ok 88 - link prune fetch.prune=true remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept
 
 expecting success: 
 		# make sure a newbranch is there in . and also in one
@@ -249524,7 +252266,7 @@
 			then
 				git_fetch_c=""
 			fi &&
-			git$git_fetch_c fetch --prune --prune-tags &&
+			git$git_fetch_c fetch --no-prune &&
 			case "$expected_branch" in
 			pruned)
 				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
@@ -249543,16 +252285,15 @@
 			esac
 		)
 	
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-Deleted branch newbranch (was 198a5d3).
-Deleted tag 'newtag' (was 198a5d3)
-From /build/git-2.20.1/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> origin/newbranch
- - [deleted]         (none)     -> newtag
-fatal: Needed a single revision
-fatal: Needed a single revision
-ok 119 - name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune --prune-tags; branch:pruned tag:pruned
+From file:///build/git-2.20.1/t/trash directory.t5510-fetch/.
+ * [new branch]      newbranch  -> origin/newbranch
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+Deleted branch newbranch (was a7a7ea8).
+Deleted tag 'newtag' (was a7a7ea8)
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+ok 89 - name prune fetch.prune=true remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept
 
 expecting success: 
 		# make sure a newbranch is there in . and also in one
@@ -249586,7 +252327,7 @@
 			then
 				git_fetch_c=""
 			fi &&
-			git$git_fetch_c fetch --prune --prune-tags &&
+			git$git_fetch_c fetch --no-prune &&
 			case "$expected_branch" in
 			pruned)
 				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
@@ -249605,19 +252346,13 @@
 			esac
 		)
 	
-From file:///build/git-2.20.1/t/trash directory.t5510-fetch/.
- * [new branch]      newbranch  -> origin/newbranch
- * [new tag]         newtag     -> newtag
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-Deleted branch newbranch (was 198a5d3).
-Deleted tag 'newtag' (was 198a5d3)
-From /build/git-2.20.1/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> origin/newbranch
- - [deleted]         (none)     -> newtag
-fatal: Needed a single revision
-fatal: Needed a single revision
-ok 120 - link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune --prune-tags; branch:pruned tag:pruned
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+Deleted branch newbranch (was a7a7ea8).
+Deleted tag 'newtag' (was a7a7ea8)
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+ok 90 - link prune fetch.prune=true remote.origin.prune=false fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept
 
 expecting success: 
 		# make sure a newbranch is there in . and also in one
@@ -249670,19 +252405,15 @@
 			esac
 		)
 	
-From file:///build/git-2.20.1/t/trash directory.t5510-fetch/.
- * [new branch]      newbranch  -> origin/newbranch
- * [new tag]         newtag     -> newtag
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-Deleted branch newbranch (was 198a5d3).
-Deleted tag 'newtag' (was 198a5d3)
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+Deleted branch newbranch (was a7a7ea8).
+Deleted tag 'newtag' (was a7a7ea8)
 From /build/git-2.20.1/t/trash directory.t5510-fetch/.
  - [deleted]         (none)     -> origin/newbranch
- - [deleted]         (none)     -> newtag
 fatal: Needed a single revision
-fatal: Needed a single revision
-ok 121 - name prune fetch.prune=true remote.origin.prune=unset fetch.pruneTags=true remote.origin.pruneTags=unset; branch:pruned tag:pruned
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+ok 91 - name prune fetch.prune=unset remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:pruned tag:kept
 
 expecting success: 
 		# make sure a newbranch is there in . and also in one
@@ -249716,7 +252447,7 @@
 			then
 				git_fetch_c=""
 			fi &&
-			git$git_fetch_c fetch "file:///build/git-2.20.1/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" refs/tags/*:refs/tags/* &&
+			git$git_fetch_c fetch "file:///build/git-2.20.1/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
 			case "$expected_branch" in
 			pruned)
 				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
@@ -249737,17 +252468,15 @@
 	
 From file:///build/git-2.20.1/t/trash directory.t5510-fetch/.
  * [new branch]      newbranch  -> origin/newbranch
- * [new tag]         newtag     -> newtag
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-Deleted branch newbranch (was 198a5d3).
-Deleted tag 'newtag' (was 198a5d3)
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+Deleted branch newbranch (was a7a7ea8).
+Deleted tag 'newtag' (was a7a7ea8)
 From file:///build/git-2.20.1/t/trash directory.t5510-fetch/.
  - [deleted]         (none)     -> origin/newbranch
- - [deleted]         (none)     -> newtag
-fatal: Needed a single revision
 fatal: Needed a single revision
-ok 122 - link prune fetch.prune=true remote.origin.prune=unset fetch.pruneTags=true remote.origin.pruneTags=unset; branch:pruned tag:pruned
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+ok 92 - link prune fetch.prune=unset remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:pruned tag:kept
 
 expecting success: 
 		# make sure a newbranch is there in . and also in one
@@ -249781,7 +252510,7 @@
 			then
 				git_fetch_c=""
 			fi &&
-			git$git_fetch_c fetch  &&
+			git$git_fetch_c fetch --no-prune &&
 			case "$expected_branch" in
 			pruned)
 				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
@@ -249802,17 +252531,13 @@
 	
 From file:///build/git-2.20.1/t/trash directory.t5510-fetch/.
  * [new branch]      newbranch  -> origin/newbranch
- * [new tag]         newtag     -> newtag
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-Deleted branch newbranch (was 198a5d3).
-Deleted tag 'newtag' (was 198a5d3)
-From /build/git-2.20.1/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> origin/newbranch
- - [deleted]         (none)     -> newtag
-fatal: Needed a single revision
-fatal: Needed a single revision
-ok 123 - name prune fetch.prune=unset remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=true; branch:pruned tag:pruned
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+Deleted branch newbranch (was a7a7ea8).
+Deleted tag 'newtag' (was a7a7ea8)
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+ok 93 - name prune fetch.prune=unset remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept
 
 expecting success: 
 		# make sure a newbranch is there in . and also in one
@@ -249846,7 +252571,7 @@
 			then
 				git_fetch_c=""
 			fi &&
-			git$git_fetch_c fetch "file:///build/git-2.20.1/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" refs/tags/*:refs/tags/* &&
+			git$git_fetch_c fetch --no-prune &&
 			case "$expected_branch" in
 			pruned)
 				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
@@ -249865,19 +252590,13 @@
 			esac
 		)
 	
-From file:///build/git-2.20.1/t/trash directory.t5510-fetch/.
- * [new branch]      newbranch  -> origin/newbranch
- * [new tag]         newtag     -> newtag
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-Deleted branch newbranch (was 198a5d3).
-Deleted tag 'newtag' (was 198a5d3)
-From file:///build/git-2.20.1/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> origin/newbranch
- - [deleted]         (none)     -> newtag
-fatal: Needed a single revision
-fatal: Needed a single revision
-ok 124 - link prune fetch.prune=unset remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=true; branch:pruned tag:pruned
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+Deleted branch newbranch (was a7a7ea8).
+Deleted tag 'newtag' (was a7a7ea8)
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+ok 94 - link prune fetch.prune=unset remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept
 
 expecting success: 
 		# make sure a newbranch is there in . and also in one
@@ -249911,7 +252630,7 @@
 			then
 				git_fetch_c=""
 			fi &&
-			git$git_fetch_c fetch  &&
+			git$git_fetch_c fetch --prune &&
 			case "$expected_branch" in
 			pruned)
 				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
@@ -249930,19 +252649,15 @@
 			esac
 		)
 	
-From file:///build/git-2.20.1/t/trash directory.t5510-fetch/.
- * [new branch]      newbranch  -> origin/newbranch
- * [new tag]         newtag     -> newtag
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-Deleted branch newbranch (was 198a5d3).
-Deleted tag 'newtag' (was 198a5d3)
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+Deleted branch newbranch (was a7a7ea8).
+Deleted tag 'newtag' (was a7a7ea8)
 From /build/git-2.20.1/t/trash directory.t5510-fetch/.
  - [deleted]         (none)     -> origin/newbranch
- - [deleted]         (none)     -> newtag
 fatal: Needed a single revision
-fatal: Needed a single revision
-ok 125 - name prune fetch.prune=true remote.origin.prune=unset fetch.pruneTags=true remote.origin.pruneTags=unset; branch:pruned tag:pruned
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+ok 95 - name prune fetch.prune=unset remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept
 
 expecting success: 
 		# make sure a newbranch is there in . and also in one
@@ -249976,7 +252691,7 @@
 			then
 				git_fetch_c=""
 			fi &&
-			git$git_fetch_c fetch "file:///build/git-2.20.1/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" refs/tags/*:refs/tags/* &&
+			git$git_fetch_c fetch --prune &&
 			case "$expected_branch" in
 			pruned)
 				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
@@ -249997,17 +252712,15 @@
 	
 From file:///build/git-2.20.1/t/trash directory.t5510-fetch/.
  * [new branch]      newbranch  -> origin/newbranch
- * [new tag]         newtag     -> newtag
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-Deleted branch newbranch (was 198a5d3).
-Deleted tag 'newtag' (was 198a5d3)
-From file:///build/git-2.20.1/t/trash directory.t5510-fetch/.
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+Deleted branch newbranch (was a7a7ea8).
+Deleted tag 'newtag' (was a7a7ea8)
+From /build/git-2.20.1/t/trash directory.t5510-fetch/.
  - [deleted]         (none)     -> origin/newbranch
- - [deleted]         (none)     -> newtag
-fatal: Needed a single revision
 fatal: Needed a single revision
-ok 126 - link prune fetch.prune=true remote.origin.prune=unset fetch.pruneTags=true remote.origin.pruneTags=unset; branch:pruned tag:pruned
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+ok 96 - link prune fetch.prune=unset remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept
 
 expecting success: 
 		# make sure a newbranch is there in . and also in one
@@ -250062,17 +252775,15 @@
 	
 From file:///build/git-2.20.1/t/trash directory.t5510-fetch/.
  * [new branch]      newbranch  -> origin/newbranch
- * [new tag]         newtag     -> newtag
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-Deleted branch newbranch (was 198a5d3).
-Deleted tag 'newtag' (was 198a5d3)
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+Deleted branch newbranch (was a7a7ea8).
+Deleted tag 'newtag' (was a7a7ea8)
 From /build/git-2.20.1/t/trash directory.t5510-fetch/.
  - [deleted]         (none)     -> origin/newbranch
- - [deleted]         (none)     -> newtag
 fatal: Needed a single revision
-fatal: Needed a single revision
-ok 127 - name prune fetch.prune=false remote.origin.prune=true fetch.pruneTags=false remote.origin.pruneTags=true; branch:pruned tag:pruned
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+ok 97 - name prune fetch.prune=false remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:pruned tag:kept
 
 expecting success: 
 		# make sure a newbranch is there in . and also in one
@@ -250106,7 +252817,7 @@
 			then
 				git_fetch_c=""
 			fi &&
-			git$git_fetch_c fetch "file:///build/git-2.20.1/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" refs/tags/*:refs/tags/* &&
+			git$git_fetch_c fetch "file:///build/git-2.20.1/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
 			case "$expected_branch" in
 			pruned)
 				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
@@ -250127,17 +252838,15 @@
 	
 From file:///build/git-2.20.1/t/trash directory.t5510-fetch/.
  * [new branch]      newbranch  -> origin/newbranch
- * [new tag]         newtag     -> newtag
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-Deleted branch newbranch (was 198a5d3).
-Deleted tag 'newtag' (was 198a5d3)
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+Deleted branch newbranch (was a7a7ea8).
+Deleted tag 'newtag' (was a7a7ea8)
 From file:///build/git-2.20.1/t/trash directory.t5510-fetch/.
  - [deleted]         (none)     -> origin/newbranch
- - [deleted]         (none)     -> newtag
-fatal: Needed a single revision
 fatal: Needed a single revision
-ok 128 - link prune fetch.prune=false remote.origin.prune=true fetch.pruneTags=false remote.origin.pruneTags=true; branch:pruned tag:pruned
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+ok 98 - link prune fetch.prune=false remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:pruned tag:kept
 
 expecting success: 
 		# make sure a newbranch is there in . and also in one
@@ -250171,7 +252880,7 @@
 			then
 				git_fetch_c=""
 			fi &&
-			git$git_fetch_c fetch  &&
+			git$git_fetch_c fetch --no-prune &&
 			case "$expected_branch" in
 			pruned)
 				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
@@ -250192,14 +252901,13 @@
 	
 From file:///build/git-2.20.1/t/trash directory.t5510-fetch/.
  * [new branch]      newbranch  -> origin/newbranch
- * [new tag]         newtag     -> newtag
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-Deleted branch newbranch (was 198a5d3).
-Deleted tag 'newtag' (was 198a5d3)
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-ok 129 - name prune fetch.prune=true remote.origin.prune=false fetch.pruneTags=true remote.origin.pruneTags=false; branch:kept tag:kept
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+Deleted branch newbranch (was a7a7ea8).
+Deleted tag 'newtag' (was a7a7ea8)
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+ok 99 - name prune fetch.prune=false remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept
 
 expecting success: 
 		# make sure a newbranch is there in . and also in one
@@ -250233,7 +252941,7 @@
 			then
 				git_fetch_c=""
 			fi &&
-			git$git_fetch_c fetch "file:///build/git-2.20.1/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" refs/tags/*:refs/tags/* &&
+			git$git_fetch_c fetch --no-prune &&
 			case "$expected_branch" in
 			pruned)
 				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
@@ -250252,13 +252960,13 @@
 			esac
 		)
 	
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-Deleted branch newbranch (was 198a5d3).
-Deleted tag 'newtag' (was 198a5d3)
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-ok 130 - link prune fetch.prune=true remote.origin.prune=false fetch.pruneTags=true remote.origin.pruneTags=false; branch:kept tag:kept
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+Deleted branch newbranch (was a7a7ea8).
+Deleted tag 'newtag' (was a7a7ea8)
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+ok 100 - link prune fetch.prune=false remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept
 
 expecting success: 
 		# make sure a newbranch is there in . and also in one
@@ -250292,7 +253000,7 @@
 			then
 				git_fetch_c=""
 			fi &&
-			git$git_fetch_c fetch --prune --prune-tags origin +refs/heads/*:refs/remotes/origin/* &&
+			git$git_fetch_c fetch --prune &&
 			case "$expected_branch" in
 			pruned)
 				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
@@ -250311,15 +253019,15 @@
 			esac
 		)
 	
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-Deleted branch newbranch (was 198a5d3).
-Deleted tag 'newtag' (was 198a5d3)
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+Deleted branch newbranch (was a7a7ea8).
+Deleted tag 'newtag' (was a7a7ea8)
 From /build/git-2.20.1/t/trash directory.t5510-fetch/.
  - [deleted]         (none)     -> origin/newbranch
 fatal: Needed a single revision
-198a5d34ee7685aad0c688d4833bbf879556f13f
-ok 131 - name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune --prune-tags origin +refs/heads/*:refs/remotes/origin/*; branch:pruned tag:kept
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+ok 101 - name prune fetch.prune=false remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept
 
 expecting success: 
 		# make sure a newbranch is there in . and also in one
@@ -250353,7 +253061,7 @@
 			then
 				git_fetch_c=""
 			fi &&
-			git$git_fetch_c fetch --prune --prune-tags "file:///build/git-2.20.1/t/trash directory.t5510-fetch/." +refs/heads/*:refs/remotes/origin/* &&
+			git$git_fetch_c fetch --prune &&
 			case "$expected_branch" in
 			pruned)
 				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
@@ -250374,15 +253082,15 @@
 	
 From file:///build/git-2.20.1/t/trash directory.t5510-fetch/.
  * [new branch]      newbranch  -> origin/newbranch
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-Deleted branch newbranch (was 198a5d3).
-Deleted tag 'newtag' (was 198a5d3)
-From file:///build/git-2.20.1/t/trash directory.t5510-fetch/.
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+Deleted branch newbranch (was a7a7ea8).
+Deleted tag 'newtag' (was a7a7ea8)
+From /build/git-2.20.1/t/trash directory.t5510-fetch/.
  - [deleted]         (none)     -> origin/newbranch
 fatal: Needed a single revision
-198a5d34ee7685aad0c688d4833bbf879556f13f
-ok 132 - link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune --prune-tags origin +refs/heads/*:refs/remotes/origin/*; branch:pruned tag:kept
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+ok 102 - link prune fetch.prune=false remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept
 
 expecting success: 
 		# make sure a newbranch is there in . and also in one
@@ -250416,7 +253124,7 @@
 			then
 				git_fetch_c=""
 			fi &&
-			git$git_fetch_c fetch --prune origin +refs/heads/*:refs/remotes/origin/* &&
+			git$git_fetch_c fetch  &&
 			case "$expected_branch" in
 			pruned)
 				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
@@ -250437,15 +253145,15 @@
 	
 From file:///build/git-2.20.1/t/trash directory.t5510-fetch/.
  * [new branch]      newbranch  -> origin/newbranch
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-Deleted branch newbranch (was 198a5d3).
-Deleted tag 'newtag' (was 198a5d3)
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+Deleted branch newbranch (was a7a7ea8).
+Deleted tag 'newtag' (was a7a7ea8)
 From /build/git-2.20.1/t/trash directory.t5510-fetch/.
  - [deleted]         (none)     -> origin/newbranch
 fatal: Needed a single revision
-198a5d34ee7685aad0c688d4833bbf879556f13f
-ok 133 - name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=true remote.origin.pruneTags=unset --prune origin +refs/heads/*:refs/remotes/origin/*; branch:pruned tag:kept
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+ok 103 - name prune fetch.prune=true remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:pruned tag:kept
 
 expecting success: 
 		# make sure a newbranch is there in . and also in one
@@ -250479,7 +253187,7 @@
 			then
 				git_fetch_c=""
 			fi &&
-			git$git_fetch_c fetch --prune "file:///build/git-2.20.1/t/trash directory.t5510-fetch/." +refs/heads/*:refs/remotes/origin/* &&
+			git$git_fetch_c fetch "file:///build/git-2.20.1/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
 			case "$expected_branch" in
 			pruned)
 				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
@@ -250500,15 +253208,15 @@
 	
 From file:///build/git-2.20.1/t/trash directory.t5510-fetch/.
  * [new branch]      newbranch  -> origin/newbranch
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-Deleted branch newbranch (was 198a5d3).
-Deleted tag 'newtag' (was 198a5d3)
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+Deleted branch newbranch (was a7a7ea8).
+Deleted tag 'newtag' (was a7a7ea8)
 From file:///build/git-2.20.1/t/trash directory.t5510-fetch/.
  - [deleted]         (none)     -> origin/newbranch
 fatal: Needed a single revision
-198a5d34ee7685aad0c688d4833bbf879556f13f
-ok 134 - link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=true remote.origin.pruneTags=unset --prune origin +refs/heads/*:refs/remotes/origin/*; branch:pruned tag:kept
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+ok 104 - link prune fetch.prune=true remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset; branch:pruned tag:kept
 
 expecting success: 
 		# make sure a newbranch is there in . and also in one
@@ -250542,7 +253250,7 @@
 			then
 				git_fetch_c=""
 			fi &&
-			git$git_fetch_c fetch --prune origin +refs/heads/*:refs/remotes/origin/* &&
+			git$git_fetch_c fetch --prune &&
 			case "$expected_branch" in
 			pruned)
 				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
@@ -250563,15 +253271,15 @@
 	
 From file:///build/git-2.20.1/t/trash directory.t5510-fetch/.
  * [new branch]      newbranch  -> origin/newbranch
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-Deleted branch newbranch (was 198a5d3).
-Deleted tag 'newtag' (was 198a5d3)
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+Deleted branch newbranch (was a7a7ea8).
+Deleted tag 'newtag' (was a7a7ea8)
 From /build/git-2.20.1/t/trash directory.t5510-fetch/.
  - [deleted]         (none)     -> origin/newbranch
 fatal: Needed a single revision
-198a5d34ee7685aad0c688d4833bbf879556f13f
-ok 135 - name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=true --prune origin +refs/heads/*:refs/remotes/origin/*; branch:pruned tag:kept
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+ok 105 - name prune fetch.prune=true remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept
 
 expecting success: 
 		# make sure a newbranch is there in . and also in one
@@ -250605,7 +253313,7 @@
 			then
 				git_fetch_c=""
 			fi &&
-			git$git_fetch_c fetch --prune "file:///build/git-2.20.1/t/trash directory.t5510-fetch/." +refs/heads/*:refs/remotes/origin/* &&
+			git$git_fetch_c fetch --prune &&
 			case "$expected_branch" in
 			pruned)
 				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
@@ -250626,15 +253334,15 @@
 	
 From file:///build/git-2.20.1/t/trash directory.t5510-fetch/.
  * [new branch]      newbranch  -> origin/newbranch
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-Deleted branch newbranch (was 198a5d3).
-Deleted tag 'newtag' (was 198a5d3)
-From file:///build/git-2.20.1/t/trash directory.t5510-fetch/.
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+Deleted branch newbranch (was a7a7ea8).
+Deleted tag 'newtag' (was a7a7ea8)
+From /build/git-2.20.1/t/trash directory.t5510-fetch/.
  - [deleted]         (none)     -> origin/newbranch
 fatal: Needed a single revision
-198a5d34ee7685aad0c688d4833bbf879556f13f
-ok 136 - link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=true --prune origin +refs/heads/*:refs/remotes/origin/*; branch:pruned tag:kept
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+ok 106 - link prune fetch.prune=true remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --prune; branch:pruned tag:kept
 
 expecting success: 
 		# make sure a newbranch is there in . and also in one
@@ -250668,7 +253376,7 @@
 			then
 				git_fetch_c=""
 			fi &&
-			git$git_fetch_c fetch origin --prune-tags &&
+			git$git_fetch_c fetch --no-prune &&
 			case "$expected_branch" in
 			pruned)
 				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
@@ -250689,13 +253397,13 @@
 	
 From file:///build/git-2.20.1/t/trash directory.t5510-fetch/.
  * [new branch]      newbranch  -> origin/newbranch
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-Deleted branch newbranch (was 198a5d3).
-Deleted tag 'newtag' (was 198a5d3)
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-ok 137 - name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset origin --prune-tags; branch:kept tag:kept
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+Deleted branch newbranch (was a7a7ea8).
+Deleted tag 'newtag' (was a7a7ea8)
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+ok 107 - name prune fetch.prune=true remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept
 
 expecting success: 
 		# make sure a newbranch is there in . and also in one
@@ -250729,7 +253437,7 @@
 			then
 				git_fetch_c=""
 			fi &&
-			git$git_fetch_c fetch "file:///build/git-2.20.1/t/trash directory.t5510-fetch/." --prune-tags &&
+			git$git_fetch_c fetch --no-prune &&
 			case "$expected_branch" in
 			pruned)
 				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
@@ -250748,13 +253456,13 @@
 			esac
 		)
 	
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-Deleted branch newbranch (was 198a5d3).
-Deleted tag 'newtag' (was 198a5d3)
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-ok 138 - link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset origin --prune-tags; branch:kept tag:kept
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+Deleted branch newbranch (was a7a7ea8).
+Deleted tag 'newtag' (was a7a7ea8)
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+ok 108 - link prune fetch.prune=true remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --no-prune; branch:kept tag:kept
 
 expecting success: 
 		# make sure a newbranch is there in . and also in one
@@ -250788,7 +253496,7 @@
 			then
 				git_fetch_c=""
 			fi &&
-			git$git_fetch_c fetch origin --prune --prune-tags &&
+			git$git_fetch_c fetch --prune origin refs/tags/*:refs/tags/* &&
 			case "$expected_branch" in
 			pruned)
 				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
@@ -250807,16 +253515,15 @@
 			esac
 		)
 	
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-Deleted branch newbranch (was 198a5d3).
-Deleted tag 'newtag' (was 198a5d3)
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+Deleted branch newbranch (was a7a7ea8).
+Deleted tag 'newtag' (was a7a7ea8)
 From /build/git-2.20.1/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> origin/newbranch
  - [deleted]         (none)     -> newtag
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
 fatal: Needed a single revision
-fatal: Needed a single revision
-ok 139 - name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset origin --prune --prune-tags; branch:pruned tag:pruned
+ok 109 - name prune fetch.prune=true remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --prune origin refs/tags/*:refs/tags/*; branch:kept tag:pruned
 
 expecting success: 
 		# make sure a newbranch is there in . and also in one
@@ -250850,7 +253557,7 @@
 			then
 				git_fetch_c=""
 			fi &&
-			git$git_fetch_c fetch "file:///build/git-2.20.1/t/trash directory.t5510-fetch/." --prune --prune-tags &&
+			git$git_fetch_c fetch --prune "file:///build/git-2.20.1/t/trash directory.t5510-fetch/." refs/tags/*:refs/tags/* &&
 			case "$expected_branch" in
 			pruned)
 				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
@@ -250870,17 +253577,16 @@
 		)
 	
 From file:///build/git-2.20.1/t/trash directory.t5510-fetch/.
- * [new branch]      newbranch  -> origin/newbranch
  * [new tag]         newtag     -> newtag
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-Deleted branch newbranch (was 198a5d3).
-Deleted tag 'newtag' (was 198a5d3)
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+Deleted branch newbranch (was a7a7ea8).
+Deleted tag 'newtag' (was a7a7ea8)
 From file:///build/git-2.20.1/t/trash directory.t5510-fetch/.
  - [deleted]         (none)     -> newtag
-198a5d34ee7685aad0c688d4833bbf879556f13f
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
 fatal: Needed a single revision
-ok 140 - link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset origin --prune --prune-tags; branch:kept tag:pruned
+ok 110 - link prune fetch.prune=true remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --prune origin refs/tags/*:refs/tags/*; branch:kept tag:pruned
 
 expecting success: 
 		# make sure a newbranch is there in . and also in one
@@ -250914,7 +253620,7 @@
 			then
 				git_fetch_c=""
 			fi &&
-			git$git_fetch_c fetch --prune --prune-tags origin &&
+			git$git_fetch_c fetch --prune origin refs/tags/*:refs/tags/* +refs/heads/*:refs/remotes/origin/* &&
 			case "$expected_branch" in
 			pruned)
 				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
@@ -250935,16 +253641,16 @@
 	
 From file:///build/git-2.20.1/t/trash directory.t5510-fetch/.
  * [new tag]         newtag     -> newtag
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-Deleted branch newbranch (was 198a5d3).
-Deleted tag 'newtag' (was 198a5d3)
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+Deleted branch newbranch (was a7a7ea8).
+Deleted tag 'newtag' (was a7a7ea8)
 From /build/git-2.20.1/t/trash directory.t5510-fetch/.
  - [deleted]         (none)     -> origin/newbranch
  - [deleted]         (none)     -> newtag
 fatal: Needed a single revision
 fatal: Needed a single revision
-ok 141 - name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune --prune-tags origin; branch:pruned tag:pruned
+ok 111 - name prune fetch.prune=true remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --prune origin refs/tags/*:refs/tags/* +refs/heads/*:refs/remotes/origin/*; branch:pruned tag:pruned
 
 expecting success: 
 		# make sure a newbranch is there in . and also in one
@@ -250978,7 +253684,7 @@
 			then
 				git_fetch_c=""
 			fi &&
-			git$git_fetch_c fetch --prune --prune-tags "file:///build/git-2.20.1/t/trash directory.t5510-fetch/." &&
+			git$git_fetch_c fetch --prune "file:///build/git-2.20.1/t/trash directory.t5510-fetch/." refs/tags/*:refs/tags/* +refs/heads/*:refs/remotes/origin/* &&
 			case "$expected_branch" in
 			pruned)
 				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
@@ -251000,15 +253706,16 @@
 From file:///build/git-2.20.1/t/trash directory.t5510-fetch/.
  * [new branch]      newbranch  -> origin/newbranch
  * [new tag]         newtag     -> newtag
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-Deleted branch newbranch (was 198a5d3).
-Deleted tag 'newtag' (was 198a5d3)
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+Deleted branch newbranch (was a7a7ea8).
+Deleted tag 'newtag' (was a7a7ea8)
 From file:///build/git-2.20.1/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> origin/newbranch
  - [deleted]         (none)     -> newtag
-198a5d34ee7685aad0c688d4833bbf879556f13f
 fatal: Needed a single revision
-ok 142 - link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune --prune-tags origin; branch:kept tag:pruned
+fatal: Needed a single revision
+ok 112 - link prune fetch.prune=true remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=unset --prune origin refs/tags/*:refs/tags/* +refs/heads/*:refs/remotes/origin/*; branch:pruned tag:pruned
 
 expecting success: 
 		# make sure a newbranch is there in . and also in one
@@ -251042,7 +253749,7 @@
 			then
 				git_fetch_c=""
 			fi &&
-			git$git_fetch_c fetch --prune origin &&
+			git$git_fetch_c fetch --prune-tags &&
 			case "$expected_branch" in
 			pruned)
 				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
@@ -251062,16 +253769,1891 @@
 		)
 	
 From file:///build/git-2.20.1/t/trash directory.t5510-fetch/.
+ * [new branch]      newbranch  -> origin/newbranch
  * [new tag]         newtag     -> newtag
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-Deleted branch newbranch (was 198a5d3).
-Deleted tag 'newtag' (was 198a5d3)
-From /build/git-2.20.1/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> origin/newbranch
- - [deleted]         (none)     -> newtag
-fatal: Needed a single revision
-fatal: Needed a single revision
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+Deleted branch newbranch (was a7a7ea8).
+Deleted tag 'newtag' (was a7a7ea8)
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+ok 113 - name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune-tags; branch:kept tag:kept
+
+expecting success: 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/git-2.20.1/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
+
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
+
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch --prune-tags &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+Deleted branch newbranch (was a7a7ea8).
+Deleted tag 'newtag' (was a7a7ea8)
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+ok 114 - link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune-tags; branch:kept tag:kept
+
+expecting success: 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/git-2.20.1/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
+
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
+
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch  &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+Deleted branch newbranch (was a7a7ea8).
+Deleted tag 'newtag' (was a7a7ea8)
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+ok 115 - name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=true remote.origin.pruneTags=unset; branch:kept tag:kept
+
+expecting success: 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/git-2.20.1/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
+
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
+
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch "file:///build/git-2.20.1/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" refs/tags/*:refs/tags/* &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+Deleted branch newbranch (was a7a7ea8).
+Deleted tag 'newtag' (was a7a7ea8)
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+ok 116 - link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=true remote.origin.pruneTags=unset; branch:kept tag:kept
+
+expecting success: 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/git-2.20.1/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
+
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
+
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch  &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+Deleted branch newbranch (was a7a7ea8).
+Deleted tag 'newtag' (was a7a7ea8)
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+ok 117 - name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=true; branch:kept tag:kept
+
+expecting success: 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/git-2.20.1/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
+
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
+
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch "file:///build/git-2.20.1/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" refs/tags/*:refs/tags/* &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+Deleted branch newbranch (was a7a7ea8).
+Deleted tag 'newtag' (was a7a7ea8)
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+ok 118 - link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=true; branch:kept tag:kept
+
+expecting success: 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/git-2.20.1/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
+
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
+
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch --prune --prune-tags &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+Deleted branch newbranch (was a7a7ea8).
+Deleted tag 'newtag' (was a7a7ea8)
+From /build/git-2.20.1/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> origin/newbranch
+ - [deleted]         (none)     -> newtag
+fatal: Needed a single revision
+fatal: Needed a single revision
+ok 119 - name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune --prune-tags; branch:pruned tag:pruned
+
+expecting success: 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/git-2.20.1/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
+
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
+
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch --prune --prune-tags &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+From file:///build/git-2.20.1/t/trash directory.t5510-fetch/.
+ * [new branch]      newbranch  -> origin/newbranch
+ * [new tag]         newtag     -> newtag
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+Deleted branch newbranch (was a7a7ea8).
+Deleted tag 'newtag' (was a7a7ea8)
+From /build/git-2.20.1/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> origin/newbranch
+ - [deleted]         (none)     -> newtag
+fatal: Needed a single revision
+fatal: Needed a single revision
+ok 120 - link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune --prune-tags; branch:pruned tag:pruned
+
+expecting success: 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/git-2.20.1/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
+
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
+
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch  &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+From file:///build/git-2.20.1/t/trash directory.t5510-fetch/.
+ * [new branch]      newbranch  -> origin/newbranch
+ * [new tag]         newtag     -> newtag
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+Deleted branch newbranch (was a7a7ea8).
+Deleted tag 'newtag' (was a7a7ea8)
+From /build/git-2.20.1/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> origin/newbranch
+ - [deleted]         (none)     -> newtag
+fatal: Needed a single revision
+fatal: Needed a single revision
+ok 121 - name prune fetch.prune=true remote.origin.prune=unset fetch.pruneTags=true remote.origin.pruneTags=unset; branch:pruned tag:pruned
+
+expecting success: 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/git-2.20.1/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
+
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
+
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch "file:///build/git-2.20.1/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" refs/tags/*:refs/tags/* &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+From file:///build/git-2.20.1/t/trash directory.t5510-fetch/.
+ * [new branch]      newbranch  -> origin/newbranch
+ * [new tag]         newtag     -> newtag
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+Deleted branch newbranch (was a7a7ea8).
+Deleted tag 'newtag' (was a7a7ea8)
+From file:///build/git-2.20.1/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> origin/newbranch
+ - [deleted]         (none)     -> newtag
+fatal: Needed a single revision
+fatal: Needed a single revision
+ok 122 - link prune fetch.prune=true remote.origin.prune=unset fetch.pruneTags=true remote.origin.pruneTags=unset; branch:pruned tag:pruned
+
+expecting success: 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/git-2.20.1/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
+
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
+
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch  &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+From file:///build/git-2.20.1/t/trash directory.t5510-fetch/.
+ * [new branch]      newbranch  -> origin/newbranch
+ * [new tag]         newtag     -> newtag
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+Deleted branch newbranch (was a7a7ea8).
+Deleted tag 'newtag' (was a7a7ea8)
+From /build/git-2.20.1/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> origin/newbranch
+ - [deleted]         (none)     -> newtag
+fatal: Needed a single revision
+fatal: Needed a single revision
+ok 123 - name prune fetch.prune=unset remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=true; branch:pruned tag:pruned
+
+expecting success: 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/git-2.20.1/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
+
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
+
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch "file:///build/git-2.20.1/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" refs/tags/*:refs/tags/* &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+From file:///build/git-2.20.1/t/trash directory.t5510-fetch/.
+ * [new branch]      newbranch  -> origin/newbranch
+ * [new tag]         newtag     -> newtag
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+Deleted branch newbranch (was a7a7ea8).
+Deleted tag 'newtag' (was a7a7ea8)
+From file:///build/git-2.20.1/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> origin/newbranch
+ - [deleted]         (none)     -> newtag
+fatal: Needed a single revision
+fatal: Needed a single revision
+ok 124 - link prune fetch.prune=unset remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=true; branch:pruned tag:pruned
+
+expecting success: 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/git-2.20.1/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
+
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
+
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch  &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+From file:///build/git-2.20.1/t/trash directory.t5510-fetch/.
+ * [new branch]      newbranch  -> origin/newbranch
+ * [new tag]         newtag     -> newtag
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+Deleted branch newbranch (was a7a7ea8).
+Deleted tag 'newtag' (was a7a7ea8)
+From /build/git-2.20.1/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> origin/newbranch
+ - [deleted]         (none)     -> newtag
+fatal: Needed a single revision
+fatal: Needed a single revision
+ok 125 - name prune fetch.prune=true remote.origin.prune=unset fetch.pruneTags=true remote.origin.pruneTags=unset; branch:pruned tag:pruned
+
+expecting success: 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/git-2.20.1/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
+
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
+
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch "file:///build/git-2.20.1/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" refs/tags/*:refs/tags/* &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+From file:///build/git-2.20.1/t/trash directory.t5510-fetch/.
+ * [new branch]      newbranch  -> origin/newbranch
+ * [new tag]         newtag     -> newtag
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+Deleted branch newbranch (was a7a7ea8).
+Deleted tag 'newtag' (was a7a7ea8)
+From file:///build/git-2.20.1/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> origin/newbranch
+ - [deleted]         (none)     -> newtag
+fatal: Needed a single revision
+fatal: Needed a single revision
+ok 126 - link prune fetch.prune=true remote.origin.prune=unset fetch.pruneTags=true remote.origin.pruneTags=unset; branch:pruned tag:pruned
+
+expecting success: 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/git-2.20.1/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
+
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
+
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch  &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+From file:///build/git-2.20.1/t/trash directory.t5510-fetch/.
+ * [new branch]      newbranch  -> origin/newbranch
+ * [new tag]         newtag     -> newtag
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+Deleted branch newbranch (was a7a7ea8).
+Deleted tag 'newtag' (was a7a7ea8)
+From /build/git-2.20.1/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> origin/newbranch
+ - [deleted]         (none)     -> newtag
+fatal: Needed a single revision
+fatal: Needed a single revision
+ok 127 - name prune fetch.prune=false remote.origin.prune=true fetch.pruneTags=false remote.origin.pruneTags=true; branch:pruned tag:pruned
+
+expecting success: 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/git-2.20.1/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
+
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
+
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch "file:///build/git-2.20.1/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" refs/tags/*:refs/tags/* &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+From file:///build/git-2.20.1/t/trash directory.t5510-fetch/.
+ * [new branch]      newbranch  -> origin/newbranch
+ * [new tag]         newtag     -> newtag
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+Deleted branch newbranch (was a7a7ea8).
+Deleted tag 'newtag' (was a7a7ea8)
+From file:///build/git-2.20.1/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> origin/newbranch
+ - [deleted]         (none)     -> newtag
+fatal: Needed a single revision
+fatal: Needed a single revision
+ok 128 - link prune fetch.prune=false remote.origin.prune=true fetch.pruneTags=false remote.origin.pruneTags=true; branch:pruned tag:pruned
+
+expecting success: 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/git-2.20.1/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
+
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
+
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch  &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+From file:///build/git-2.20.1/t/trash directory.t5510-fetch/.
+ * [new branch]      newbranch  -> origin/newbranch
+ * [new tag]         newtag     -> newtag
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+Deleted branch newbranch (was a7a7ea8).
+Deleted tag 'newtag' (was a7a7ea8)
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+ok 129 - name prune fetch.prune=true remote.origin.prune=false fetch.pruneTags=true remote.origin.pruneTags=false; branch:kept tag:kept
+
+expecting success: 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/git-2.20.1/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
+
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
+
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch "file:///build/git-2.20.1/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" refs/tags/*:refs/tags/* &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+Deleted branch newbranch (was a7a7ea8).
+Deleted tag 'newtag' (was a7a7ea8)
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+ok 130 - link prune fetch.prune=true remote.origin.prune=false fetch.pruneTags=true remote.origin.pruneTags=false; branch:kept tag:kept
+
+expecting success: 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/git-2.20.1/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
+
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
+
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch --prune --prune-tags origin +refs/heads/*:refs/remotes/origin/* &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+Deleted branch newbranch (was a7a7ea8).
+Deleted tag 'newtag' (was a7a7ea8)
+From /build/git-2.20.1/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> origin/newbranch
+fatal: Needed a single revision
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+ok 131 - name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune --prune-tags origin +refs/heads/*:refs/remotes/origin/*; branch:pruned tag:kept
+
+expecting success: 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/git-2.20.1/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
+
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
+
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch --prune --prune-tags "file:///build/git-2.20.1/t/trash directory.t5510-fetch/." +refs/heads/*:refs/remotes/origin/* &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+From file:///build/git-2.20.1/t/trash directory.t5510-fetch/.
+ * [new branch]      newbranch  -> origin/newbranch
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+Deleted branch newbranch (was a7a7ea8).
+Deleted tag 'newtag' (was a7a7ea8)
+From file:///build/git-2.20.1/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> origin/newbranch
+fatal: Needed a single revision
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+ok 132 - link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune --prune-tags origin +refs/heads/*:refs/remotes/origin/*; branch:pruned tag:kept
+
+expecting success: 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/git-2.20.1/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
+
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
+
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch --prune origin +refs/heads/*:refs/remotes/origin/* &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+From file:///build/git-2.20.1/t/trash directory.t5510-fetch/.
+ * [new branch]      newbranch  -> origin/newbranch
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+Deleted branch newbranch (was a7a7ea8).
+Deleted tag 'newtag' (was a7a7ea8)
+From /build/git-2.20.1/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> origin/newbranch
+fatal: Needed a single revision
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+ok 133 - name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=true remote.origin.pruneTags=unset --prune origin +refs/heads/*:refs/remotes/origin/*; branch:pruned tag:kept
+
+expecting success: 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/git-2.20.1/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
+
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
+
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch --prune "file:///build/git-2.20.1/t/trash directory.t5510-fetch/." +refs/heads/*:refs/remotes/origin/* &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+From file:///build/git-2.20.1/t/trash directory.t5510-fetch/.
+ * [new branch]      newbranch  -> origin/newbranch
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+Deleted branch newbranch (was a7a7ea8).
+Deleted tag 'newtag' (was a7a7ea8)
+From file:///build/git-2.20.1/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> origin/newbranch
+fatal: Needed a single revision
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+ok 134 - link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=true remote.origin.pruneTags=unset --prune origin +refs/heads/*:refs/remotes/origin/*; branch:pruned tag:kept
+
+expecting success: 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/git-2.20.1/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
+
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
+
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch --prune origin +refs/heads/*:refs/remotes/origin/* &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+From file:///build/git-2.20.1/t/trash directory.t5510-fetch/.
+ * [new branch]      newbranch  -> origin/newbranch
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+Deleted branch newbranch (was a7a7ea8).
+Deleted tag 'newtag' (was a7a7ea8)
+From /build/git-2.20.1/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> origin/newbranch
+fatal: Needed a single revision
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+ok 135 - name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=true --prune origin +refs/heads/*:refs/remotes/origin/*; branch:pruned tag:kept
+
+expecting success: 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/git-2.20.1/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
+
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
+
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch --prune "file:///build/git-2.20.1/t/trash directory.t5510-fetch/." +refs/heads/*:refs/remotes/origin/* &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+From file:///build/git-2.20.1/t/trash directory.t5510-fetch/.
+ * [new branch]      newbranch  -> origin/newbranch
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+Deleted branch newbranch (was a7a7ea8).
+Deleted tag 'newtag' (was a7a7ea8)
+From file:///build/git-2.20.1/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> origin/newbranch
+fatal: Needed a single revision
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+ok 136 - link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=true --prune origin +refs/heads/*:refs/remotes/origin/*; branch:pruned tag:kept
+
+expecting success: 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/git-2.20.1/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
+
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
+
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch origin --prune-tags &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+From file:///build/git-2.20.1/t/trash directory.t5510-fetch/.
+ * [new branch]      newbranch  -> origin/newbranch
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+Deleted branch newbranch (was a7a7ea8).
+Deleted tag 'newtag' (was a7a7ea8)
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+ok 137 - name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset origin --prune-tags; branch:kept tag:kept
+
+expecting success: 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/git-2.20.1/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
+
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
+
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch "file:///build/git-2.20.1/t/trash directory.t5510-fetch/." --prune-tags &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+Deleted branch newbranch (was a7a7ea8).
+Deleted tag 'newtag' (was a7a7ea8)
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+ok 138 - link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset origin --prune-tags; branch:kept tag:kept
+
+expecting success: 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/git-2.20.1/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
+
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
+
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch origin --prune --prune-tags &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+Deleted branch newbranch (was a7a7ea8).
+Deleted tag 'newtag' (was a7a7ea8)
+From /build/git-2.20.1/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> origin/newbranch
+ - [deleted]         (none)     -> newtag
+fatal: Needed a single revision
+fatal: Needed a single revision
+ok 139 - name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset origin --prune --prune-tags; branch:pruned tag:pruned
+
+expecting success: 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/git-2.20.1/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
+
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
+
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch "file:///build/git-2.20.1/t/trash directory.t5510-fetch/." --prune --prune-tags &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+From file:///build/git-2.20.1/t/trash directory.t5510-fetch/.
+ * [new branch]      newbranch  -> origin/newbranch
+ * [new tag]         newtag     -> newtag
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+Deleted branch newbranch (was a7a7ea8).
+Deleted tag 'newtag' (was a7a7ea8)
+From file:///build/git-2.20.1/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> newtag
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+fatal: Needed a single revision
+ok 140 - link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset origin --prune --prune-tags; branch:kept tag:pruned
+
+expecting success: 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/git-2.20.1/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
+
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
+
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch --prune --prune-tags origin &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+From file:///build/git-2.20.1/t/trash directory.t5510-fetch/.
+ * [new tag]         newtag     -> newtag
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+Deleted branch newbranch (was a7a7ea8).
+Deleted tag 'newtag' (was a7a7ea8)
+From /build/git-2.20.1/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> origin/newbranch
+ - [deleted]         (none)     -> newtag
+fatal: Needed a single revision
+fatal: Needed a single revision
+ok 141 - name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune --prune-tags origin; branch:pruned tag:pruned
+
+expecting success: 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/git-2.20.1/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
+
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
+
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch --prune --prune-tags "file:///build/git-2.20.1/t/trash directory.t5510-fetch/." &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+From file:///build/git-2.20.1/t/trash directory.t5510-fetch/.
+ * [new branch]      newbranch  -> origin/newbranch
+ * [new tag]         newtag     -> newtag
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+Deleted branch newbranch (was a7a7ea8).
+Deleted tag 'newtag' (was a7a7ea8)
+From file:///build/git-2.20.1/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> newtag
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+fatal: Needed a single revision
+ok 142 - link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset --prune --prune-tags origin; branch:kept tag:pruned
+
+expecting success: 
+		# make sure a newbranch is there in . and also in one
+		git branch -f newbranch &&
+		git tag -f newtag &&
+		(
+			cd one &&
+			test_unconfig fetch.prune &&
+			test_unconfig fetch.pruneTags &&
+			test_unconfig remote.origin.prune &&
+			test_unconfig remote.origin.pruneTags &&
+			git fetch "file:///build/git-2.20.1/t/trash directory.t5510-fetch/." "+refs/heads/*:refs/remotes/origin/*" &&
+			git rev-parse --verify refs/remotes/origin/newbranch &&
+			git rev-parse --verify refs/tags/newtag
+		) &&
+
+		# now remove them
+		git branch -d newbranch &&
+		git tag -d newtag &&
+
+		# then test
+		(
+			cd one &&
+			git_fetch_c="" &&
+			set_config_tristate fetch.prune $fetch_prune &&
+			set_config_tristate fetch.pruneTags $fetch_prune_tags &&
+			set_config_tristate remote.origin.prune $remote_origin_prune &&
+			set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
+
+			if test "$mode" != "link"
+			then
+				git_fetch_c=""
+			fi &&
+			git$git_fetch_c fetch --prune origin &&
+			case "$expected_branch" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			kept)
+				git rev-parse --verify refs/remotes/origin/newbranch
+				;;
+			esac &&
+			case "$expected_tag" in
+			pruned)
+				test_must_fail git rev-parse --verify refs/tags/newtag
+				;;
+			kept)
+				git rev-parse --verify refs/tags/newtag
+				;;
+			esac
+		)
+	
+From file:///build/git-2.20.1/t/trash directory.t5510-fetch/.
+ * [new tag]         newtag     -> newtag
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+Deleted branch newbranch (was a7a7ea8).
+Deleted tag 'newtag' (was a7a7ea8)
+From /build/git-2.20.1/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> origin/newbranch
+ - [deleted]         (none)     -> newtag
+fatal: Needed a single revision
+fatal: Needed a single revision
 ok 143 - name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=true remote.origin.pruneTags=unset --prune origin; branch:pruned tag:pruned
 
 expecting success: 
@@ -251128,13 +255710,13 @@
 From file:///build/git-2.20.1/t/trash directory.t5510-fetch/.
  * [new branch]      newbranch  -> origin/newbranch
  * [new tag]         newtag     -> newtag
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-Deleted branch newbranch (was 198a5d3).
-Deleted tag 'newtag' (was 198a5d3)
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+Deleted branch newbranch (was a7a7ea8).
+Deleted tag 'newtag' (was a7a7ea8)
 From file:///build/git-2.20.1/t/trash directory.t5510-fetch/.
  - [deleted]         (none)     -> newtag
-198a5d34ee7685aad0c688d4833bbf879556f13f
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
 fatal: Needed a single revision
 ok 144 - link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=true remote.origin.pruneTags=unset --prune origin; branch:kept tag:pruned
 
@@ -251191,10 +255773,10 @@
 	
 From file:///build/git-2.20.1/t/trash directory.t5510-fetch/.
  * [new tag]         newtag     -> newtag
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-Deleted branch newbranch (was 198a5d3).
-Deleted tag 'newtag' (was 198a5d3)
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+Deleted branch newbranch (was a7a7ea8).
+Deleted tag 'newtag' (was a7a7ea8)
 From /build/git-2.20.1/t/trash directory.t5510-fetch/.
  - [deleted]         (none)     -> origin/newbranch
  - [deleted]         (none)     -> newtag
@@ -251256,13 +255838,13 @@
 From file:///build/git-2.20.1/t/trash directory.t5510-fetch/.
  * [new branch]      newbranch  -> origin/newbranch
  * [new tag]         newtag     -> newtag
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-Deleted branch newbranch (was 198a5d3).
-Deleted tag 'newtag' (was 198a5d3)
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+Deleted branch newbranch (was a7a7ea8).
+Deleted tag 'newtag' (was a7a7ea8)
 From file:///build/git-2.20.1/t/trash directory.t5510-fetch/.
  - [deleted]         (none)     -> newtag
-198a5d34ee7685aad0c688d4833bbf879556f13f
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
 fatal: Needed a single revision
 ok 146 - link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=true --prune origin; branch:kept tag:pruned
 
@@ -251319,10 +255901,10 @@
 	
 From file:///build/git-2.20.1/t/trash directory.t5510-fetch/.
  * [new tag]         newtag     -> newtag
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-Deleted branch newbranch (was 198a5d3).
-Deleted tag 'newtag' (was 198a5d3)
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+Deleted branch newbranch (was a7a7ea8).
+Deleted tag 'newtag' (was a7a7ea8)
 From /build/git-2.20.1/t/trash directory.t5510-fetch/.
  - [deleted]         (none)     -> origin/newbranch
  - [deleted]         (none)     -> newtag
@@ -251384,13 +255966,13 @@
 From file:///build/git-2.20.1/t/trash directory.t5510-fetch/.
  * [new branch]      newbranch  -> origin/newbranch
  * [new tag]         newtag     -> newtag
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-Deleted branch newbranch (was 198a5d3).
-Deleted tag 'newtag' (was 198a5d3)
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+Deleted branch newbranch (was a7a7ea8).
+Deleted tag 'newtag' (was a7a7ea8)
 From file:///build/git-2.20.1/t/trash directory.t5510-fetch/.
  - [deleted]         (none)     -> newtag
-198a5d34ee7685aad0c688d4833bbf879556f13f
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
 fatal: Needed a single revision
 ok 148 - link prune fetch.prune=true remote.origin.prune=unset fetch.pruneTags=true remote.origin.pruneTags=unset origin; branch:kept tag:pruned
 
@@ -251447,10 +256029,10 @@
 	
 From file:///build/git-2.20.1/t/trash directory.t5510-fetch/.
  * [new tag]         newtag     -> newtag
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-Deleted branch newbranch (was 198a5d3).
-Deleted tag 'newtag' (was 198a5d3)
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+Deleted branch newbranch (was a7a7ea8).
+Deleted tag 'newtag' (was a7a7ea8)
 From /build/git-2.20.1/t/trash directory.t5510-fetch/.
  - [deleted]         (none)     -> origin/newbranch
  - [deleted]         (none)     -> newtag
@@ -251512,13 +256094,13 @@
 From file:///build/git-2.20.1/t/trash directory.t5510-fetch/.
  * [new branch]      newbranch  -> origin/newbranch
  * [new tag]         newtag     -> newtag
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-Deleted branch newbranch (was 198a5d3).
-Deleted tag 'newtag' (was 198a5d3)
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+Deleted branch newbranch (was a7a7ea8).
+Deleted tag 'newtag' (was a7a7ea8)
 From file:///build/git-2.20.1/t/trash directory.t5510-fetch/.
  - [deleted]         (none)     -> newtag
-198a5d34ee7685aad0c688d4833bbf879556f13f
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
 fatal: Needed a single revision
 ok 150 - link prune fetch.prune=unset remote.origin.prune=true fetch.pruneTags=true remote.origin.pruneTags=unset origin; branch:kept tag:pruned
 
@@ -251575,10 +256157,10 @@
 	
 From file:///build/git-2.20.1/t/trash directory.t5510-fetch/.
  * [new tag]         newtag     -> newtag
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-Deleted branch newbranch (was 198a5d3).
-Deleted tag 'newtag' (was 198a5d3)
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+Deleted branch newbranch (was a7a7ea8).
+Deleted tag 'newtag' (was a7a7ea8)
 From /build/git-2.20.1/t/trash directory.t5510-fetch/.
  - [deleted]         (none)     -> origin/newbranch
  - [deleted]         (none)     -> newtag
@@ -251640,13 +256222,13 @@
 From file:///build/git-2.20.1/t/trash directory.t5510-fetch/.
  * [new branch]      newbranch  -> origin/newbranch
  * [new tag]         newtag     -> newtag
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-Deleted branch newbranch (was 198a5d3).
-Deleted tag 'newtag' (was 198a5d3)
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+Deleted branch newbranch (was a7a7ea8).
+Deleted tag 'newtag' (was a7a7ea8)
 From file:///build/git-2.20.1/t/trash directory.t5510-fetch/.
  - [deleted]         (none)     -> newtag
-198a5d34ee7685aad0c688d4833bbf879556f13f
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
 fatal: Needed a single revision
 ok 152 - link prune fetch.prune=unset remote.origin.prune=true fetch.pruneTags=unset remote.origin.pruneTags=true origin; branch:kept tag:pruned
 
@@ -251711,14 +256293,14 @@
 	
 From file:///build/git-2.20.1/t/trash directory.t5510-fetch/.
  * [new tag]         newtag     -> newtag
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-Deleted branch newbranch (was 198a5d3).
-Deleted tag 'newtag' (was 198a5d3)
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+Deleted branch newbranch (was a7a7ea8).
+Deleted tag 'newtag' (was a7a7ea8)
 From /build/git-2.20.1/t/trash directory.t5510-fetch/.
  - [deleted]         (none)     -> newtag
  * branch            master     -> FETCH_HEAD
-198a5d34ee7685aad0c688d4833bbf879556f13f
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
 fatal: Needed a single revision
 ok 154 - name prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset origin --prune --prune-tags; branch:kept tag:pruned
 
@@ -251775,13 +256357,13 @@
 	
 From file:///build/git-2.20.1/t/trash directory.t5510-fetch/.
  * [new tag]         newtag     -> newtag
-198a5d34ee7685aad0c688d4833bbf879556f13f
-198a5d34ee7685aad0c688d4833bbf879556f13f
-Deleted branch newbranch (was 198a5d3).
-Deleted tag 'newtag' (was 198a5d3)
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
+Deleted branch newbranch (was a7a7ea8).
+Deleted tag 'newtag' (was a7a7ea8)
 From file:///build/git-2.20.1/t/trash directory.t5510-fetch/.
  - [deleted]         (none)     -> newtag
-198a5d34ee7685aad0c688d4833bbf879556f13f
+a7a7ea8a8e4af425c8519418f237bad645ec28bf
 fatal: Needed a single revision
 ok 155 - link prune fetch.prune=unset remote.origin.prune=unset fetch.pruneTags=unset remote.origin.pruneTags=unset origin --prune --prune-tags; branch:kept tag:pruned
 
@@ -251799,11 +256381,11 @@
 	pack=$(git index-pack --fix-thin --stdin <twoside-boundary.pack) &&
 	test_bundle_object_count .git/objects/pack/pack-${pack##pack	}.pack 3
 
-[master 37f1e1c] base
+[master 6ed7567] base
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 base.t
-[master 632112f] oneside
+[master 6538f1c] oneside
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 oneside.t
@@ -251818,20 +256400,20 @@
 
   git checkout -b <new-branch-name>
 
-HEAD is now at 37f1e1c base
-[detached HEAD 0ad4921] otherside
+HEAD is now at 6ed7567 base
+[detached HEAD 60c4a76] otherside
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 otherside.t
-Previous HEAD position was 0ad4921 otherside
+Previous HEAD position was 60c4a76 otherside
 Switched to branch 'master'
 Your branch is based on 'one/master_not', but the upstream is gone.
   (use "git branch --unset-upstream" to fixup)
 Merging:
-632112f oneside
+6538f1c oneside
 virtual otherside
 found 1 common ancestor:
-37f1e1c base
+6ed7567 base
 Merge made by the 'recursive' strategy.
  otherside.t | 1 +
  1 file changed, 1 insertion(+)
@@ -251851,7 +256433,7 @@
 
 Cloning into 'only-prunes'...
 done.
-Deleted branch goodbye (was 13efdf5).
+Deleted branch goodbye (was bfd1722).
 ok 157 - fetch --prune prints the remotes url
 
 expecting success: 
@@ -251869,7 +256451,7 @@
 
 Cloning into 'prune-df-conflict'...
 done.
-Deleted branch dir/file (was 13efdf5).
+Deleted branch dir/file (was bfd1722).
 From /build/git-2.20.1/t/trash directory.t5510-fetch/.
  - [deleted]         (none)     -> origin/dir/file
  * [new branch]      dir        -> origin/dir
@@ -251885,11 +256467,11 @@
 		git fetch .. HEAD refs/foo
 	)
 
-[master 21a1ee4] extra
+[master c2224ae] extra
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 extra.t
-HEAD is now at 13efdf5 Merge tag 'otherside'
+HEAD is now at bfd1722 Merge tag 'otherside'
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5510-fetch/one-level/.git/
 From ..
  * branch            HEAD       -> FETCH_HEAD
@@ -251914,7 +256496,7 @@
 	)
 
 Cloning into 'auto-gc'...
-[master 1193ea6] test2
+[master b36ebe6] test2
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 test2.t
@@ -251937,7 +256519,7 @@
 
 Cloning into 'full-output'...
 done.
-[master 6bdc709] looooooooooooong-tag
+[master 0c0be23] looooooooooooong-tag
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 looooooooooooong-tag.t
@@ -251959,7 +256541,7 @@
 
 Cloning into 'compact'...
 done.
-[master 010a30e] extraaa
+[master cdf8dd8] extraaa
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 extraaa.t
@@ -252128,3551 +256710,130 @@
 1..165
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t7012-skip-worktree-writing.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7012-skip-worktree-writing/.git/
-expecting success: 
-	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: 
-	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: checking out '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 performing another checkout.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
-
-  git checkout -b <new-branch-name>
-
-HEAD is now at fa1ce8e modified and added
-ok 2 - read-tree updates worktree, absent case
-
-expecting success: 
-	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: 
-	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: 
-	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: 
-	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: 
-	setup_absent &&
-	git add 1 &&
-	test_absent
-
-ok 7 - git-add ignores worktree content
-
-expecting success: 
-	setup_dirty &&
-	git add 1 &&
-	test_dirty
-
-ok 8 - git-add ignores worktree content
-
-expecting success: 
-	setup_dirty &&
-	test_must_fail git rm 1 &&
-	test_dirty
-
-error: the following file has changes staged in the index:
-    1
-(use --cached to keep the file, or -f to force removal)
-ok 9 - git-rm fails if worktree is dirty
-
-expecting success: 
-	setup_absent &&
-	git clean -n > result &&
-	test_i18ncmp expected result
-
-ok 10 - git-clean, absent case
-
-expecting success: 
-	setup_dirty &&
-	git clean -n > result &&
-	test_i18ncmp expected result
-
-ok 11 - git-clean, dirty case
-
-# passed all 11 test(s)
-1..11
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t7062-wtstatus-ignorecase.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7062-wtstatus-ignorecase/.git/
-expecting success: 
-	# 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/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t7009-filter-branch-null-sha1.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7009-filter-branch-null-sha1/.git/
-expecting success: 
-	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: 
-	{
-		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: 
-	test_tick &&
-	git commit -a -m "back to normal"
-
-[master 6fc1982] back to normal
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- delete mode 160000 broken
-ok 3 - setup: bring HEAD and index in sync
-
-expecting success: 
-	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)    error: invalid object 160000 0000000000000000000000000000000000000000 for 'broken'
-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: 
-	test_must_fail git filter-branch \
-		--force --prune-empty \
-		--index-filter "git rm --cached --ignore-unmatch three.t"
-
-
Rewrite d79ce1670bdcb76e6d1da2ae095e890ccb326ae9 (1/5) (0 seconds passed, remaining 0 predicted)    
Rewrite 139b20d8e6c5b496de61f033f642d0e3dbff528d (2/5) (0 seconds passed, remaining 0 predicted)    
Rewrite 7c7cd714e262561f73f3079dfca4e8724682ac21 (3/5) (0 seconds passed, remaining 0 predicted)    rm 'three.t'
-
Rewrite e3ed0c3a94f05540151bd8cb9ac647b8777964a6 (4/5) (0 seconds passed, remaining 0 predicted)    error: invalid object 160000 0000000000000000000000000000000000000000 for 'broken'
-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: 
-	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)    error: invalid object 160000 0000000000000000000000000000000000000000 for 'broken'
-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/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t7061-wtstatus-ignore.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7061-wtstatus-ignore/.git/
-expecting success: 
-	echo "ignored" >.gitignore &&
-	mkdir untracked &&
-	: >untracked/ignored &&
-	: >untracked/uncommitted &&
-	git status --porcelain --ignored >actual &&
-	test_cmp expected actual
-
-ok 1 - status untracked directory with --ignored
-
-expecting success: 
-	printf "\357\273\277ignored\n" >.gitignore &&
-	mkdir -p untracked &&
-	: >untracked/ignored &&
-	: >untracked/uncommitted &&
-	git status --porcelain --ignored >actual &&
-	test_cmp expected actual
-
-ok 2 - same with gitignore starting with BOM
-
-expecting success: 
-	git status --porcelain --ignored -u >actual &&
-	test_cmp expected actual
-
-ok 3 - status untracked directory with --ignored -u
-
-expecting success: 
-	git status --porcelain --ignored untracked/ >actual &&
-	test_cmp expected actual
-
-ok 4 - status prefixed untracked directory with --ignored
-
-expecting success: 
-	git status --porcelain --ignored -u untracked/ >actual &&
-	test_cmp expected actual
-
-ok 5 - status prefixed untracked sub-directory with --ignored -u
-
-expecting success: 
-	rm -rf untracked &&
-	mkdir ignored &&
-	: >ignored/uncommitted &&
-	git status --porcelain --ignored >actual &&
-	test_cmp expected actual
-
-ok 6 - status ignored directory with --ignore
-
-expecting success: 
-	git status --porcelain --ignored -u >actual &&
-	test_cmp expected actual
-
-ok 7 - status ignored directory with --ignore -u
-
-expecting success: 
-	rm -rf ignored &&
-	mkdir untracked-ignored &&
-	mkdir untracked-ignored/test &&
-	git status --porcelain --ignored >actual &&
-	test_cmp expected actual
-
-ok 8 - status empty untracked directory with --ignore
-
-expecting success: 
-	git status --porcelain --ignored -u >actual &&
-	test_cmp expected actual
-
-ok 9 - status empty untracked directory with --ignore -u
-
-expecting success: 
-	: >untracked-ignored/ignored &&
-	: >untracked-ignored/test/ignored &&
-	git status --porcelain --ignored >actual &&
-	test_cmp expected actual
-
-ok 10 - status untracked directory with ignored files with --ignore
-
-expecting success: 
-	git status --porcelain --ignored -u >actual &&
-	test_cmp expected actual
-
-ok 11 - status untracked directory with ignored files with --ignore -u
-
-expecting success: 
-	rm -rf untracked-ignored &&
-	mkdir tracked &&
-	: >tracked/committed &&
-	git add tracked/committed &&
-	git commit -m. &&
-	echo "tracked" >.gitignore &&
-	git status --porcelain --ignored >actual &&
-	test_cmp expected actual
-
-[master (root-commit) 8438f63] .
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 tracked/committed
-ok 12 - status ignored tracked directory with --ignore
-
-expecting success: 
-	git status --porcelain --ignored -u >actual &&
-	test_cmp expected actual
-
-ok 13 - status ignored tracked directory with --ignore -u
-
-expecting success: 
-	echo "committed" >>.gitignore &&
-	git status --porcelain --ignored >actual &&
-	test_cmp expected actual
-
-ok 14 - status ignored tracked directory and ignored file with --ignore
-
-expecting success: 
-	git status --porcelain --ignored -u >actual &&
-	test_cmp expected actual
-
-ok 15 - status ignored tracked directory and ignored file with --ignore -u
-
-expecting success: 
-	echo "tracked" >.gitignore &&
-	: >tracked/uncommitted &&
-	git status --porcelain --ignored >actual &&
-	test_cmp expected actual
-
-ok 16 - status ignored tracked directory and uncommitted file with --ignore
-
-expecting success: 
-	git status --porcelain --ignored -u >actual &&
-	test_cmp expected actual
-
-ok 17 - status ignored tracked directory and uncommitted file with --ignore -u
-
-expecting success: 
-	rm -rf tracked/uncommitted &&
-	mkdir tracked/ignored &&
-	: >tracked/ignored/uncommitted &&
-	git status --porcelain --ignored >actual &&
-	test_cmp expected actual
-
-ok 18 - status ignored tracked directory with uncommitted file in untracked subdir with --ignore
-
-expecting success: 
-	git status --porcelain --ignored -u >actual &&
-	test_cmp expected actual
-
-ok 19 - status ignored tracked directory with uncommitted file in untracked subdir with --ignore -u
-
-expecting success: 
-	: >tracked/ignored/committed &&
-	git add -f tracked/ignored/committed &&
-	git commit -m. &&
-	git status --porcelain --ignored >actual &&
-	test_cmp expected actual
-
-[master 92cee86] .
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 tracked/ignored/committed
-ok 20 - status ignored tracked directory with uncommitted file in tracked subdir with --ignore
-
-expecting success: 
-	git status --porcelain --ignored -u >actual &&
-	test_cmp expected actual
-
-ok 21 - status ignored tracked directory with uncommitted file in tracked subdir with --ignore -u
-
-expecting success: 
-	git init tracked/submodule &&
-	test_commit -C tracked/submodule initial &&
-	git status --porcelain --ignored -u tracked/submodule >actual &&
-	test_cmp expected actual
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7061-wtstatus-ignore/tracked/submodule/.git/
-[master (root-commit) 24b24cf] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-ok 22 - status ignores submodule in excluded directory
-
-# passed all 22 test(s)
-1..22
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t7060-wtstatus.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7060-wtstatus/.git/
-expecting success: 
-	git config --global advice.statusuoption false &&
-	test_commit A &&
-	test_commit B oneside added &&
-	git checkout A^0 &&
-	test_commit C oneside created
-
-[master (root-commit) 0ddfaf1] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.t
-[master 5747a32] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 oneside
-Note: checking out '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 performing another checkout.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
-
-  git checkout -b <new-branch-name>
-
-HEAD is now at 0ddfaf1 A
-[detached HEAD f7fe030] C
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 oneside
-ok 1 - setup
-
-expecting success: 
-	git checkout B^0 &&
-	test_must_fail git merge C
-
-Previous HEAD position was f7fe030 C
-HEAD is now at 5747a32 B
-Merging:
-5747a32 B
-virtual C
-found 1 common ancestor:
-0ddfaf1 A
-Auto-merging oneside
-CONFLICT (add/add): Merge conflict in oneside
-Automatic merge failed; fix conflicts and then commit the result.
-ok 2 - A/A conflict
-
-expecting success: 
-	git diff --cached --name-status >actual &&
-	echo "U	oneside" >expect &&
-	test_cmp expect actual
-
-ok 3 - Report path with conflict
-
-expecting success: 
-	git diff --cached --name-status HEAD^ >actual &&
-	echo "U	oneside" >expect &&
-	test_cmp expect actual
-
-ok 4 - Report new path with conflict
-
-expecting success: 
-	cat >expect <<EOF &&
-On branch side
-You have unmerged paths.
-  (fix conflicts and run "git commit")
-  (use "git merge --abort" to abort the merge)
-
-Unmerged paths:
-  (use "git add/rm <file>..." as appropriate to mark resolution)
-
-	deleted by us:   foo
-
-no changes added to commit (use "git add" and/or "git commit -a")
-EOF
-	mkdir mdconflict &&
-	(
-		cd mdconflict &&
-		git init &&
-		test_commit initial foo "" &&
-		test_commit modify foo foo &&
-		git checkout -b side HEAD^ &&
-		git rm foo &&
-		git commit -m delete &&
-		test_must_fail git merge master &&
-		test_must_fail git commit --dry-run >../actual &&
-		test_i18ncmp ../expect ../actual &&
-		git status >../actual &&
-		test_i18ncmp ../expect ../actual
-	)
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7060-wtstatus/mdconflict/.git/
-[master (root-commit) a3c5375] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo
-[master efd4a38] modify
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'side'
-rm 'foo'
-[side 0599bc2] delete
- Author: A U Thor <author@example.com>
- 1 file changed, 1 deletion(-)
- delete mode 100644 foo
-Merging:
-0599bc2 delete
-virtual master
-found 1 common ancestor:
-a3c5375 initial
-CONFLICT (modify/delete): foo deleted in HEAD and modified in master. Version master of foo left in tree.
-Automatic merge failed; fix conflicts and then commit the result.
-ok 5 - M/D conflict does not segfault
-
+*** t7105-reset-patch.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7105-reset-patch/.git/
 expecting success: 
-	git rm -f -r . &&
-	cat "$TEST_DIRECTORY/README" >ONE &&
-	git add ONE &&
+	mkdir dir &&
+	echo parent > dir/foo &&
+	echo dummy > bar &&
+	git add dir &&
+	git commit -m initial &&
 	test_tick &&
-	git commit -m "One commit with ONE" &&
-
-	echo Modified >TWO &&
-	cat ONE >>TWO &&
-	cat ONE >>THREE &&
-	git add TWO THREE &&
-	sha1=$(git rev-parse :ONE) &&
-	git rm --cached ONE &&
-	(
-		echo "100644 $sha1 1	ONE" &&
-		echo "100644 $sha1 2	ONE" &&
-		echo "100644 $sha1 3	ONE"
-	) | git update-index --index-info &&
-	echo Further >>THREE
-
-oneside: needs merge
-rm 'A.t'
-rm 'oneside'
-rm 'oneside'
-[detached HEAD c882fbf] One commit with ONE
- Author: A U Thor <author@example.com>
-rm 'ONE'
-ok 6 - rename & unmerged setup
-
-expecting success: 
-	git status -suno >actual &&
-	cat >expect <<-EOF &&
-	UU ONE
-	AM THREE
-	A  TWO
-	EOF
-	test_cmp expect actual
-
-ok 7 - rename & unmerged status
-
-expecting success: 
-	cat >expected <<-EOF &&
-	U	ONE
-	A	THREE
-	A	TWO
-	EOF
-	git diff-index --cached --name-status HEAD >actual &&
-	test_cmp expected actual
-
-ok 8 - git diff-index --cached shows 2 added + 1 unmerged
-
-expecting success: 
-	cat >expected <<-EOF &&
-	U	ONE
-	A	THREE
-	A	TWO
-	EOF
-	git diff-index --cached -M --name-status HEAD >actual &&
-	test_cmp expected actual
-
-ok 9 - git diff-index --cached -M shows 2 added + 1 unmerged
-
-expecting success: 
-	cat >expected <<-EOF &&
-	U	ONE
-	C	ONE	THREE
-	C	ONE	TWO
-	EOF
-	git diff-index --cached -C --name-status HEAD |
-	sed "s/^C[0-9]*/C/g" >actual &&
-	test_cmp expected actual
-
-ok 10 - git diff-index --cached -C shows 2 copies + 1 unmerged
-
-expecting success: 
-	git reset --hard &&
-	git checkout master &&
-	test_commit init main.txt init &&
-	git checkout -b second_branch &&
-	git rm main.txt &&
-	git commit -m "main.txt deleted on second_branch" &&
-	test_commit second conflict.txt second &&
-	git checkout master &&
-	test_commit on_second main.txt on_second &&
-	test_commit master conflict.txt master &&
-	test_must_fail git merge second_branch &&
-	cat >expected <<\EOF &&
-On branch master
-You have unmerged paths.
-  (fix conflicts and run "git commit")
-  (use "git merge --abort" to abort the merge)
-
-Unmerged paths:
-  (use "git add/rm <file>..." as appropriate to mark resolution)
-
-	both added:      conflict.txt
-	deleted by them: main.txt
-
-no changes added to commit (use "git add" and/or "git commit -a")
-EOF
-	git status --untracked-files=no >actual &&
-	test_i18ncmp expected actual
-
-HEAD is now at c882fbf One commit with ONE
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  c882fbf One commit with ONE
-
-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> c882fbf
+	test_commit second dir/foo head &&
+	set_and_save_state bar bar_work bar_index &&
+	save_head
 
-Switched to branch 'master'
-[master e5fc44e] init
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 main.txt
-Switched to a new branch 'second_branch'
-rm 'main.txt'
-[second_branch 1fd8046] main.txt deleted on second_branch
- Author: A U Thor <author@example.com>
- 1 file changed, 1 deletion(-)
- delete mode 100644 main.txt
-[second_branch e4d0ede] second
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 conflict.txt
-Switched to branch 'master'
-[master 9824e6a] on_second
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[master b29dd8b] master
+[master (root-commit) 979d432] initial
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 conflict.txt
-Merging:
-b29dd8b master
-virtual second_branch
-found 1 common ancestor:
-e5fc44e init
-CONFLICT (modify/delete): main.txt deleted in second_branch and modified in HEAD. Version HEAD of main.txt left in tree.
-Auto-merging conflict.txt
-CONFLICT (add/add): Merge conflict in conflict.txt
-Automatic merge failed; fix conflicts and then commit the result.
-ok 11 - status when conflicts with add and rm advice (deleted by them)
-
-expecting success: 
-	git reset --hard &&
-	git checkout -b conflict &&
-	test_commit one main.txt one &&
-	git branch conflict_second &&
-	git mv main.txt sub_master.txt &&
-	git commit -m "main.txt renamed in sub_master.txt" &&
-	git checkout conflict_second &&
-	git mv main.txt sub_second.txt &&
-	git commit -m "main.txt renamed in sub_second.txt"
-
-HEAD is now at b29dd8b master
-Switched to a new branch 'conflict'
-[conflict 21bce8e] one
+ create mode 100644 dir/foo
+[master 89c7fdc] second
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-[conflict e06d4c6] main.txt renamed in sub_master.txt
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename main.txt => sub_master.txt (100%)
-Switched to branch 'conflict_second'
-[conflict_second 6b2443c] main.txt renamed in sub_second.txt
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename main.txt => sub_second.txt (100%)
-ok 12 - prepare for conflicts
-
-expecting success: 
-	test_must_fail git merge conflict &&
-	cat >expected <<\EOF &&
-On branch conflict_second
-You have unmerged paths.
-  (fix conflicts and run "git commit")
-  (use "git merge --abort" to abort the merge)
-
-Unmerged paths:
-  (use "git add/rm <file>..." as appropriate to mark resolution)
-
-	both deleted:    main.txt
-	added by them:   sub_master.txt
-	added by us:     sub_second.txt
-
-no changes added to commit (use "git add" and/or "git commit -a")
-EOF
-	git status --untracked-files=no >actual &&
-	test_i18ncmp expected actual
-
-Merging:
-6b2443c main.txt renamed in sub_second.txt
-virtual conflict
-found 1 common ancestor:
-21bce8e one
-CONFLICT (rename/rename): Rename "main.txt"->"sub_second.txt" in branch "HEAD" rename "main.txt"->"sub_master.txt" in "conflict"
-Automatic merge failed; fix conflicts and then commit the result.
-ok 13 - status when conflicts with add and rm advice (both deleted)
-
-expecting success: 
-	git reset --hard conflict_second &&
-	test_must_fail git merge conflict &&
-	git add sub_master.txt &&
-	git add sub_second.txt &&
-	cat >expected <<\EOF &&
-On branch conflict_second
-You have unmerged paths.
-  (fix conflicts and run "git commit")
-  (use "git merge --abort" to abort the merge)
-
-Changes to be committed:
-
-	new file:   sub_master.txt
-
-Unmerged paths:
-  (use "git rm <file>..." to mark resolution)
-
-	both deleted:    main.txt
-
-Untracked files not listed (use -u option to show untracked files)
-EOF
-	git status --untracked-files=no >actual &&
-	test_i18ncmp expected actual &&
-	git reset --hard &&
-	git checkout master
-
-HEAD is now at 6b2443c main.txt renamed in sub_second.txt
-Merging:
-6b2443c main.txt renamed in sub_second.txt
-virtual conflict
-found 1 common ancestor:
-21bce8e one
-CONFLICT (rename/rename): Rename "main.txt"->"sub_second.txt" in branch "HEAD" rename "main.txt"->"sub_master.txt" in "conflict"
-Automatic merge failed; fix conflicts and then commit the result.
-HEAD is now at 6b2443c main.txt renamed in sub_second.txt
-warning: refname 'master' is ambiguous.
-Switched to branch 'master'
-ok 14 - status when conflicts with only rm advice (both deleted)
-
-expecting success: 
-	git reset --hard &&
-	git checkout master^0 &&
-	git status --branch --porcelain >actual &&
-	cat >expected <<-EOF &&
-	## HEAD (no branch)
-	?? .gitconfig
-	?? actual
-	?? expect
-	?? expected
-	?? mdconflict/
-	EOF
-	test_i18ncmp expected actual
-
-HEAD is now at b29dd8b master
-warning: refname 'master' is ambiguous.
-Note: checking out 'master^0'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by performing another checkout.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
-
-  git checkout -b <new-branch-name>
-
-HEAD is now at b29dd8b master
-ok 15 - status --branch with detached HEAD
-
-expecting success: 
-	git reset --hard &&
-	git checkout master^0 &&
-	git status --branch --porcelain=v1 >actual &&
-	cat >expected <<-EOF &&
-	## HEAD (no branch)
-	?? .gitconfig
-	?? actual
-	?? expect
-	?? expected
-	?? mdconflict/
-	EOF
-	test_i18ncmp expected actual
-
-HEAD is now at b29dd8b master
-warning: refname 'master' is ambiguous.
-HEAD is now at b29dd8b master
-ok 16 - status --porcelain=v1 --branch with detached HEAD
-
-expecting success: 
-	test_must_fail git status --porcelain=bogus
-
-fatal: unsupported porcelain version 'bogus'
-ok 17 - status --porcelain=bogus
-
-# passed all 17 test(s)
-1..17
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t7101-reset-empty-subdirs.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7101-reset-empty-subdirs/.git/
-expecting success: mkdir path0 &&
-     cp "$TEST_DIRECTORY"/../COPYING path0/COPYING &&
-     git add path0/COPYING &&
-     git commit -m add -a
-[master (root-commit) 03a1879] add
- Author: A U Thor <author@example.com>
- 1 file changed, 360 insertions(+)
- create mode 100644 path0/COPYING
-ok 1 - creating initial files
-
-expecting success: mkdir path1 &&
-     mkdir path1/path2 &&
-     cp "$TEST_DIRECTORY"/../COPYING path1/path2/COPYING &&
-     cp "$TEST_DIRECTORY"/../COPYING path1/COPYING &&
-     cp "$TEST_DIRECTORY"/../COPYING COPYING &&
-     cp "$TEST_DIRECTORY"/../COPYING 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 2f1d7e3] change
- Author: A U Thor <author@example.com>
- 4 files changed, 1440 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: git reset --hard HEAD^
-HEAD is now at 03a1879 add
-ok 3 - resetting tree HEAD^
-
-expecting success: test -d path0 &&
-     test -f path0/COPYING
-ok 4 - checking initial files exist after rewind
-
-expecting success: ! test -f path1/path2/COPYING
-ok 5 - checking lack of path1/path2/COPYING
-
-expecting success: ! test -f path1/COPYING
-ok 6 - checking lack of path1/COPYING
-
-expecting success: ! test -f COPYING
-ok 7 - checking lack of COPYING
-
-expecting success: ! test -f path0/COPYING-TOO
-ok 8 - checking checking lack of path1/COPYING-TOO
-
-expecting success: ! test -d path1/path2
-ok 9 - checking lack of path1/path2
-
-expecting success: ! test -d path1
-ok 10 - checking lack of path1
-
-# passed all 10 test(s)
-1..10
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t6600-test-reach.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6600-test-reach/.git/
-expecting success: 
-	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
-	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
-		done
-	done &&
-	git commit-graph write --reachable &&
-	mv .git/objects/info/commit-graph 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 &&
-	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
-Merging:
-7393be9 2-1
-virtual commit-1-2
-found 1 common ancestor:
-0d15007 1-1
-Merge made by the 'recursive' strategy.
- 1-2.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-2.t
-Merging:
-1bf5db8 2-2
-virtual commit-1-3
-found 1 common ancestor:
-d299b7f 1-2
-Merge made by the 'recursive' strategy.
- 1-3.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-3.t
-Merging:
-92bd651 2-3
-virtual commit-1-4
-found 1 common ancestor:
-4824988 1-3
-Merge made by the 'recursive' strategy.
- 1-4.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-4.t
-Merging:
-a4e7c8a 2-4
-virtual commit-1-5
-found 1 common ancestor:
-365457e 1-4
-Merge made by the 'recursive' strategy.
- 1-5.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-5.t
-Merging:
-2e8320d 2-5
-virtual commit-1-6
-found 1 common ancestor:
-c37c079 1-5
-Merge made by the 'recursive' strategy.
- 1-6.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-6.t
-Merging:
-cad3ed9 2-6
-virtual commit-1-7
-found 1 common ancestor:
-a87f56a 1-6
-Merge made by the 'recursive' strategy.
- 1-7.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-7.t
-Merging:
-aac73ea 2-7
-virtual commit-1-8
-found 1 common ancestor:
-e7afdd6 1-7
-Merge made by the 'recursive' strategy.
- 1-8.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-8.t
-Merging:
-239f00a 2-8
-virtual commit-1-9
-found 1 common ancestor:
-2855ea4 1-8
-Merge made by the 'recursive' strategy.
- 1-9.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-9.t
-Merging:
-7d3e798 2-9
-virtual commit-1-10
-found 1 common ancestor:
-5d90ff6 1-9
-Merge made by the 'recursive' 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
-Merging:
-3195915 3-1
-virtual commit-2-2
-found 1 common ancestor:
-7393be9 2-1
-Merge made by the 'recursive' strategy.
- 1-2.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-2.t
-Merging:
-ffdcde5 3-2
-virtual commit-2-3
-found 1 common ancestor:
-1bf5db8 2-2
-Merge made by the 'recursive' strategy.
- 1-3.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-3.t
-Merging:
-8ef79ca 3-3
-virtual commit-2-4
-found 1 common ancestor:
-92bd651 2-3
-Merge made by the 'recursive' strategy.
- 1-4.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-4.t
-Merging:
-8a1d716 3-4
-virtual commit-2-5
-found 1 common ancestor:
-a4e7c8a 2-4
-Merge made by the 'recursive' strategy.
- 1-5.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-5.t
-Merging:
-8db6a6c 3-5
-virtual commit-2-6
-found 1 common ancestor:
-2e8320d 2-5
-Merge made by the 'recursive' strategy.
- 1-6.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-6.t
-Merging:
-491496e 3-6
-virtual commit-2-7
-found 1 common ancestor:
-cad3ed9 2-6
-Merge made by the 'recursive' strategy.
- 1-7.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-7.t
-Merging:
-eb0ba81 3-7
-virtual commit-2-8
-found 1 common ancestor:
-aac73ea 2-7
-Merge made by the 'recursive' strategy.
- 1-8.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-8.t
-Merging:
-90b5f9f 3-8
-virtual commit-2-9
-found 1 common ancestor:
-239f00a 2-8
-Merge made by the 'recursive' strategy.
- 1-9.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-9.t
-Merging:
-a78eaa3 3-9
-virtual commit-2-10
-found 1 common ancestor:
-7d3e798 2-9
-Merge made by the 'recursive' 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
-Merging:
-af41a20 4-1
-virtual commit-3-2
-found 1 common ancestor:
-3195915 3-1
-Merge made by the 'recursive' strategy.
- 1-2.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-2.t
-Merging:
-b6ad88f 4-2
-virtual commit-3-3
-found 1 common ancestor:
-ffdcde5 3-2
-Merge made by the 'recursive' strategy.
- 1-3.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-3.t
-Merging:
-a3e50c3 4-3
-virtual commit-3-4
-found 1 common ancestor:
-8ef79ca 3-3
-Merge made by the 'recursive' strategy.
- 1-4.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-4.t
-Merging:
-52bf1f6 4-4
-virtual commit-3-5
-found 1 common ancestor:
-8a1d716 3-4
-Merge made by the 'recursive' strategy.
- 1-5.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-5.t
-Merging:
-aaafa12 4-5
-virtual commit-3-6
-found 1 common ancestor:
-8db6a6c 3-5
-Merge made by the 'recursive' strategy.
- 1-6.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-6.t
-Merging:
-9fb3c9b 4-6
-virtual commit-3-7
-found 1 common ancestor:
-491496e 3-6
-Merge made by the 'recursive' strategy.
- 1-7.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-7.t
-Merging:
-92fb89f 4-7
-virtual commit-3-8
-found 1 common ancestor:
-eb0ba81 3-7
-Merge made by the 'recursive' strategy.
- 1-8.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-8.t
-Merging:
-ee4640a 4-8
-virtual commit-3-9
-found 1 common ancestor:
-90b5f9f 3-8
-Merge made by the 'recursive' strategy.
- 1-9.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-9.t
-Merging:
-d5102f0 4-9
-virtual commit-3-10
-found 1 common ancestor:
-a78eaa3 3-9
-Merge made by the 'recursive' 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
-Merging:
-2948e13 5-1
-virtual commit-4-2
-found 1 common ancestor:
-af41a20 4-1
-Merge made by the 'recursive' strategy.
- 1-2.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-2.t
-Merging:
-b4e848b 5-2
-virtual commit-4-3
-found 1 common ancestor:
-b6ad88f 4-2
-Merge made by the 'recursive' strategy.
- 1-3.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-3.t
-Merging:
-4364d77 5-3
-virtual commit-4-4
-found 1 common ancestor:
-a3e50c3 4-3
-Merge made by the 'recursive' strategy.
- 1-4.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-4.t
-Merging:
-95c9df8 5-4
-virtual commit-4-5
-found 1 common ancestor:
-52bf1f6 4-4
-Merge made by the 'recursive' strategy.
- 1-5.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-5.t
-Merging:
-4174002 5-5
-virtual commit-4-6
-found 1 common ancestor:
-aaafa12 4-5
-Merge made by the 'recursive' strategy.
- 1-6.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-6.t
-Merging:
-20b3a70 5-6
-virtual commit-4-7
-found 1 common ancestor:
-9fb3c9b 4-6
-Merge made by the 'recursive' strategy.
- 1-7.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-7.t
-Merging:
-06046bd 5-7
-virtual commit-4-8
-found 1 common ancestor:
-92fb89f 4-7
-Merge made by the 'recursive' strategy.
- 1-8.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-8.t
-Merging:
-48b11e0 5-8
-virtual commit-4-9
-found 1 common ancestor:
-ee4640a 4-8
-Merge made by the 'recursive' strategy.
- 1-9.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-9.t
-Merging:
-17d7515 5-9
-virtual commit-4-10
-found 1 common ancestor:
-d5102f0 4-9
-Merge made by the 'recursive' 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
-Merging:
-d213662 6-1
-virtual commit-5-2
-found 1 common ancestor:
-2948e13 5-1
-Merge made by the 'recursive' strategy.
- 1-2.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-2.t
-Merging:
-b611247 6-2
-virtual commit-5-3
-found 1 common ancestor:
-b4e848b 5-2
-Merge made by the 'recursive' strategy.
- 1-3.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-3.t
-Merging:
-a14f9cb 6-3
-virtual commit-5-4
-found 1 common ancestor:
-4364d77 5-3
-Merge made by the 'recursive' strategy.
- 1-4.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-4.t
-Merging:
-8f21391 6-4
-virtual commit-5-5
-found 1 common ancestor:
-95c9df8 5-4
-Merge made by the 'recursive' strategy.
- 1-5.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-5.t
-Merging:
-2bb630e 6-5
-virtual commit-5-6
-found 1 common ancestor:
-4174002 5-5
-Merge made by the 'recursive' strategy.
- 1-6.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-6.t
-Merging:
-98cc5ec 6-6
-virtual commit-5-7
-found 1 common ancestor:
-20b3a70 5-6
-Merge made by the 'recursive' strategy.
- 1-7.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-7.t
-Merging:
-9c0ab3e 6-7
-virtual commit-5-8
-found 1 common ancestor:
-06046bd 5-7
-Merge made by the 'recursive' strategy.
- 1-8.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-8.t
-Merging:
-3824dbc 6-8
-virtual commit-5-9
-found 1 common ancestor:
-48b11e0 5-8
-Merge made by the 'recursive' strategy.
- 1-9.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-9.t
-Merging:
-e8b8a49 6-9
-virtual commit-5-10
-found 1 common ancestor:
-17d7515 5-9
-Merge made by the 'recursive' 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
-Merging:
-3c4cef0 7-1
-virtual commit-6-2
-found 1 common ancestor:
-d213662 6-1
-Merge made by the 'recursive' strategy.
- 1-2.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-2.t
-Merging:
-fc239af 7-2
-virtual commit-6-3
-found 1 common ancestor:
-b611247 6-2
-Merge made by the 'recursive' strategy.
- 1-3.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-3.t
-Merging:
-772be73 7-3
-virtual commit-6-4
-found 1 common ancestor:
-a14f9cb 6-3
-Merge made by the 'recursive' strategy.
- 1-4.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-4.t
-Merging:
-3ca79c9 7-4
-virtual commit-6-5
-found 1 common ancestor:
-8f21391 6-4
-Merge made by the 'recursive' strategy.
- 1-5.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-5.t
-Merging:
-d023c5c 7-5
-virtual commit-6-6
-found 1 common ancestor:
-2bb630e 6-5
-Merge made by the 'recursive' strategy.
- 1-6.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-6.t
-Merging:
-254441b 7-6
-virtual commit-6-7
-found 1 common ancestor:
-98cc5ec 6-6
-Merge made by the 'recursive' strategy.
- 1-7.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-7.t
-Merging:
-194d475 7-7
-virtual commit-6-8
-found 1 common ancestor:
-9c0ab3e 6-7
-Merge made by the 'recursive' strategy.
- 1-8.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-8.t
-Merging:
-001094e 7-8
-virtual commit-6-9
-found 1 common ancestor:
-3824dbc 6-8
-Merge made by the 'recursive' strategy.
- 1-9.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-9.t
-Merging:
-bfd4d81 7-9
-virtual commit-6-10
-found 1 common ancestor:
-e8b8a49 6-9
-Merge made by the 'recursive' 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
-Merging:
-25a847a 8-1
-virtual commit-7-2
-found 1 common ancestor:
-3c4cef0 7-1
-Merge made by the 'recursive' strategy.
- 1-2.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-2.t
-Merging:
-6ea0ec6 8-2
-virtual commit-7-3
-found 1 common ancestor:
-fc239af 7-2
-Merge made by the 'recursive' strategy.
- 1-3.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-3.t
-Merging:
-0968afe 8-3
-virtual commit-7-4
-found 1 common ancestor:
-772be73 7-3
-Merge made by the 'recursive' strategy.
- 1-4.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-4.t
-Merging:
-c6a12b0 8-4
-virtual commit-7-5
-found 1 common ancestor:
-3ca79c9 7-4
-Merge made by the 'recursive' strategy.
- 1-5.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-5.t
-Merging:
-e223128 8-5
-virtual commit-7-6
-found 1 common ancestor:
-d023c5c 7-5
-Merge made by the 'recursive' strategy.
- 1-6.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-6.t
-Merging:
-f863cb8 8-6
-virtual commit-7-7
-found 1 common ancestor:
-254441b 7-6
-Merge made by the 'recursive' strategy.
- 1-7.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-7.t
-Merging:
-6337e52 8-7
-virtual commit-7-8
-found 1 common ancestor:
-194d475 7-7
-Merge made by the 'recursive' strategy.
- 1-8.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-8.t
-Merging:
-c59194d 8-8
-virtual commit-7-9
-found 1 common ancestor:
-001094e 7-8
-Merge made by the 'recursive' strategy.
- 1-9.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-9.t
-Merging:
-ccddb60 8-9
-virtual commit-7-10
-found 1 common ancestor:
-bfd4d81 7-9
-Merge made by the 'recursive' 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
-Merging:
-48082f2 9-1
-virtual commit-8-2
-found 1 common ancestor:
-25a847a 8-1
-Merge made by the 'recursive' strategy.
- 1-2.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-2.t
-Merging:
-af387a3 9-2
-virtual commit-8-3
-found 1 common ancestor:
-6ea0ec6 8-2
-Merge made by the 'recursive' strategy.
- 1-3.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-3.t
-Merging:
-d6b5c7e 9-3
-virtual commit-8-4
-found 1 common ancestor:
-0968afe 8-3
-Merge made by the 'recursive' strategy.
- 1-4.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-4.t
-Merging:
-208d869 9-4
-virtual commit-8-5
-found 1 common ancestor:
-c6a12b0 8-4
-Merge made by the 'recursive' strategy.
- 1-5.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-5.t
-Merging:
-04ce14a 9-5
-virtual commit-8-6
-found 1 common ancestor:
-e223128 8-5
-Merge made by the 'recursive' strategy.
- 1-6.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-6.t
-Merging:
-95ec0bb 9-6
-virtual commit-8-7
-found 1 common ancestor:
-f863cb8 8-6
-Merge made by the 'recursive' strategy.
- 1-7.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-7.t
-Merging:
-9db19ce 9-7
-virtual commit-8-8
-found 1 common ancestor:
-6337e52 8-7
-Merge made by the 'recursive' strategy.
- 1-8.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-8.t
-Merging:
-1140e64 9-8
-virtual commit-8-9
-found 1 common ancestor:
-c59194d 8-8
-Merge made by the 'recursive' strategy.
- 1-9.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-9.t
-Merging:
-b96ffc8 9-9
-virtual commit-8-10
-found 1 common ancestor:
-ccddb60 8-9
-Merge made by the 'recursive' 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
-Merging:
-b42f416 10-1
-virtual commit-9-2
-found 1 common ancestor:
-48082f2 9-1
-Merge made by the 'recursive' strategy.
- 1-2.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-2.t
-Merging:
-08aefe5 10-2
-virtual commit-9-3
-found 1 common ancestor:
-af387a3 9-2
-Merge made by the 'recursive' strategy.
- 1-3.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-3.t
-Merging:
-1f1c74f 10-3
-virtual commit-9-4
-found 1 common ancestor:
-d6b5c7e 9-3
-Merge made by the 'recursive' strategy.
- 1-4.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-4.t
-Merging:
-97ae747 10-4
-virtual commit-9-5
-found 1 common ancestor:
-208d869 9-4
-Merge made by the 'recursive' strategy.
- 1-5.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-5.t
-Merging:
-edcde8e 10-5
-virtual commit-9-6
-found 1 common ancestor:
-04ce14a 9-5
-Merge made by the 'recursive' strategy.
- 1-6.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-6.t
-Merging:
-aa4c999 10-6
-virtual commit-9-7
-found 1 common ancestor:
-95ec0bb 9-6
-Merge made by the 'recursive' strategy.
- 1-7.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-7.t
-Merging:
-6d7cc92 10-7
-virtual commit-9-8
-found 1 common ancestor:
-9db19ce 9-7
-Merge made by the 'recursive' strategy.
- 1-8.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-8.t
-Merging:
-4ad1d23 10-8
-virtual commit-9-9
-found 1 common ancestor:
-1140e64 9-8
-Merge made by the 'recursive' strategy.
- 1-9.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-9.t
-Merging:
-28a5e4c 10-9
-virtual commit-9-10
-found 1 common ancestor:
-b96ffc8 9-9
-Merge made by the 'recursive' strategy.
- 1-10.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 1-10.t
-Computing commit graph generation numbers:   1% (1/100)   
Computing commit graph generation numbers:   2% (2/100)   
Computing commit graph generation numbers:   3% (3/100)   
Computing commit graph generation numbers:   4% (4/100)   
Computing commit graph generation numbers:   5% (5/100)   
Computing commit graph generation numbers:   6% (6/100)   
Computing commit graph generation numbers:   7% (7/100)   
Computing commit graph generation numbers:   8% (8/100)   
Computing commit graph generation numbers:   9% (9/100)   
Computing commit graph generation numbers:  10% (10/100)   
Computing commit graph generation numbers:  11% (11/100)   
Computing commit graph generation numbers:  12% (12/100)   
Computing commit graph generation numbers:  13% (13/100)   
Computing commit graph generation numbers:  14% (14/100)   
Computing commit graph generation numbers:  15% (15/100)   
Computing commit graph generation numbers:  16% (16/100)   
Computing commit graph generation numbers:  17% (17/100)   
Computing commit graph generation numbers:  18% (18/100)   
Computing commit graph generation numbers:  19% (19/100)   
Computing commit graph generation numbers:  20% (20/100)   
Computing commit graph generation numbers:  21% (21/100)   
Computing commit graph generation numbers:  22% (22/100)   
Computing commit graph generation numbers:  23% (23/100)   
Computing commit graph generation numbers:  24% (24/100)   
Computing commit graph generation numbers:  25% (25/100)   
Computing commit graph generation numbers:  26% (26/100)   
Computing commit graph generation numbers:  27% (27/100)   
Computing commit graph generation numbers:  28% (28/100)   
Computing commit graph generation numbers:  29% (29/100)   
Computing commit graph generation numbers:  30% (30/100)   
Computing commit graph generation numbers:  31% (31/100)   
Computing commit graph generation numbers:  32% (32/100)   
Computing commit graph generation numbers:  33% (33/100)   
Computing commit graph generation numbers:  34% (34/100)   
Computing commit graph generation numbers:  35% (35/100)   
Computing commit graph generation numbers:  36% (36/100)   
Computing commit graph generation numbers:  37% (37/100)   
Computing commit graph generation numbers:  38% (38/100)   
Computing commit graph generation numbers:  39% (39/100)   
Computing commit graph generation numbers:  40% (40/100)   
Computing commit graph generation numbers:  41% (41/100)   
Computing commit graph generation numbers:  42% (42/100)   
Computing commit graph generation numbers:  43% (43/100)   
Computing commit graph generation numbers:  44% (44/100)   
Computing commit graph generation numbers:  45% (45/100)   
Computing commit graph generation numbers:  46% (46/100)   
Computing commit graph generation numbers:  47% (47/100)   
Computing commit graph generation numbers:  48% (48/100)   
Computing commit graph generation numbers:  49% (49/100)   
Computing commit graph generation numbers:  50% (50/100)   
Computing commit graph generation numbers:  51% (51/100)   
Computing commit graph generation numbers:  52% (52/100)   
Computing commit graph generation numbers:  53% (53/100)   
Computing commit graph generation numbers:  54% (54/100)   
Computing commit graph generation numbers:  55% (55/100)   
Computing commit graph generation numbers:  56% (56/100)   
Computing commit graph generation numbers:  57% (57/100)   
Computing commit graph generation numbers:  58% (58/100)   
Computing commit graph generation numbers:  59% (59/100)   
Computing commit graph generation numbers:  60% (60/100)   
Computing commit graph generation numbers:  61% (61/100)   
Computing commit graph generation numbers:  62% (62/100)   
Computing commit graph generation numbers:  63% (63/100)   
Computing commit graph generation numbers:  64% (64/100)   
Computing commit graph generation numbers:  65% (65/100)   
Computing commit graph generation numbers:  66% (66/100)   
Computing commit graph generation numbers:  67% (67/100)   
Computing commit graph generation numbers:  68% (68/100)   
Computing commit graph generation numbers:  69% (69/100)   
Computing commit graph generation numbers:  70% (70/100)   
Computing commit graph generation numbers:  71% (71/100)   
Computing commit graph generation numbers:  72% (72/100)   
Computing commit graph generation numbers:  73% (73/100)   
Computing commit graph generation numbers:  74% (74/100)   
Computing commit graph generation numbers:  75% (75/100)   
Computing commit graph generation numbers:  76% (76/100)   
Computing commit graph generation numbers:  77% (77/100)   
Computing commit graph generation numbers:  78% (78/100)   
Computing commit graph generation numbers:  79% (79/100)   
Computing commit graph generation numbers:  80% (80/100)   
Computing commit graph generation numbers:  81% (81/100)   
Computing commit graph generation numbers:  82% (82/100)   
Computing commit graph generation numbers:  83% (83/100)   
Computing commit graph generation numbers:  84% (84/100)   
Computing commit graph generation numbers:  85% (85/100)   
Computing commit graph generation numbers:  86% (86/100)   
Computing commit graph generation numbers:  87% (87/100)   
Computing commit graph generation numbers:  88% (88/100)   
Computing commit graph generation numbers:  89% (89/100)   
Computing commit graph generation numbers:  90% (90/100)   
Computing commit graph generation numbers:  91% (91/100)   
Computing commit graph generation numbers:  92% (92/100)   
Computing commit graph generation numbers:  93% (93/100)   
Computing commit graph generation numbers:  94% (94/100)   
Computing commit graph generation numbers:  95% (95/100)   
Computing commit graph generation numbers:  96% (96/100)   
Computing commit graph generation numbers:  97% (97/100)   
Computing commit graph generation numbers:  98% (98/100)   
Computing commit graph generation numbers:  99% (99/100)   
Computing commit graph generation numbers: 100% (100/100)   
Computing commit graph generation numbers: 100% (100/100), done.
-Computing commit graph generation numbers:   4% (1/25)   
Computing commit graph generation numbers:   8% (2/25)   
Computing commit graph generation numbers:  12% (3/25)   
Computing commit graph generation numbers:  16% (4/25)   
Computing commit graph generation numbers:  20% (5/25)   
Computing commit graph generation numbers:  24% (6/25)   
Computing commit graph generation numbers:  28% (7/25)   
Computing commit graph generation numbers:  32% (8/25)   
Computing commit graph generation numbers:  36% (9/25)   
Computing commit graph generation numbers:  40% (10/25)   
Computing commit graph generation numbers:  44% (11/25)   
Computing commit graph generation numbers:  48% (12/25)   
Computing commit graph generation numbers:  52% (13/25)   
Computing commit graph generation numbers:  56% (14/25)   
Computing commit graph generation numbers:  60% (15/25)   
Computing commit graph generation numbers:  64% (16/25)   
Computing commit graph generation numbers:  68% (17/25)   
Computing commit graph generation numbers:  72% (18/25)   
Computing commit graph generation numbers:  76% (19/25)   
Computing commit graph generation numbers:  80% (20/25)   
Computing commit graph generation numbers:  84% (21/25)   
Computing commit graph generation numbers:  88% (22/25)   
Computing commit graph generation numbers:  92% (23/25)   
Computing commit graph generation numbers:  96% (24/25)   
Computing commit graph generation numbers: 100% (25/25)   
Computing commit graph generation numbers: 100% (25/25), done.
 ok 1 - setup
 
 expecting success: 
-	cat >input <<-\EOF &&
-	A:commit-5-7
-	B:commit-4-9
-	EOF
-	echo "ref_newer(A,B):0" >expect &&
-	test_three_modes ref_newer
-
-ok 2 - ref_newer:miss
-
-expecting success: 
-	cat >input <<-\EOF &&
-	A:commit-5-7
-	B:commit-2-3
-	EOF
-	echo "ref_newer(A,B):1" >expect &&
-	test_three_modes ref_newer
-
-ok 3 - ref_newer:hit
-
-expecting success: 
-	cat >input <<-\EOF &&
-	A:commit-5-7
-	B:commit-8-8
-	EOF
-	echo "in_merge_bases(A,B):1" >expect &&
-	test_three_modes in_merge_bases
-
-ok 4 - in_merge_bases:hit
-
-expecting success: 
-	cat >input <<-\EOF &&
-	A:commit-6-8
-	B:commit-5-9
-	EOF
-	echo "in_merge_bases(A,B):0" >expect &&
-	test_three_modes in_merge_bases
-
-ok 5 - in_merge_bases:miss
-
-expecting success: 
-	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_three_modes is_descendant_of
-
-ok 6 - is_descendant_of:hit
-
-expecting success: 
-	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_three_modes is_descendant_of
-
-ok 7 - is_descendant_of:miss
-
-expecting success: 
-	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_three_modes get_merge_bases_many
-
-ok 8 - get_merge_bases_many
-
-expecting success: 
-	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_three_modes reduce_heads
-
-ok 9 - reduce_heads
-
-expecting success: 
-	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_three_modes can_all_from_reach
-
-ok 10 - can_all_from_reach:hit
-
-expecting success: 
-	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_three_modes can_all_from_reach
-
-ok 11 - can_all_from_reach:miss
-
-expecting success: 
-	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_three_modes can_all_from_reach_with_flag
-
-ok 12 - can_all_from_reach_with_flag: tags case
-
-expecting success: 
-	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_three_modes commit_contains &&
-	test_three_modes commit_contains --tag
-
-ok 13 - commit_contains:hit
-
-expecting success: 
-	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_three_modes commit_contains &&
-	test_three_modes commit_contains --tag
-
-ok 14 - commit_contains:miss
-
-expecting success: 
-	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_three_modes git rev-list --topo-order commit-6-6
-
-ok 15 - rev-list: basic topo-order
-
-expecting success: 
-	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_three_modes git rev-list --first-parent --topo-order commit-6-6
-
-ok 16 - rev-list: first-parent topo-order
-
-expecting success: 
-	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_three_modes git rev-list --topo-order commit-3-3..commit-6-6
-
-ok 17 - rev-list: range topo-order
-
-expecting success: 
-	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_three_modes git rev-list --topo-order commit-3-8..commit-6-6
+	set_and_save_state dir/foo work work &&
+	test_write_lines n n | git reset -p &&
+	verify_saved_state dir/foo &&
+	verify_saved_state bar
 
-ok 18 - rev-list: range topo-order
+diff --git a/bar b/bar
+new file mode 100644
+index 0000000..7780244
+--- /dev/null
++++ b/bar
+@@ -0,0 +1 @@
++bar_index
+Unstage this hunk [y,n,q,a,d,e,?]? 
+diff --git a/dir/foo b/dir/foo
+index 564b12f..b8f99f5 100644
+--- a/dir/foo
++++ b/dir/foo
+@@ -1 +1 @@
+-head
++work
+Unstage this hunk [y,n,q,a,d,e,?]? 
+ok 2 - saying "n" does nothing
 
 expecting success: 
-	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_three_modes git rev-list --first-parent --topo-order commit-3-8..commit-6-6
+	test_write_lines n y | git reset -p >output &&
+	verify_state dir/foo work head &&
+	verify_saved_state bar &&
+	test_i18ngrep "Unstage" output
 
-ok 19 - rev-list: first-parent range topo-order
+Unstage this hunk [y,n,q,a,d,e,?]? 
+Unstage this hunk [y,n,q,a,d,e,?]? 
+ok 3 - git reset -p
 
 expecting success: 
-	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_three_modes git rev-list --topo-order --ancestry-path commit-3-3..commit-6-6
+	test_write_lines n y | git reset -p HEAD^ >output &&
+	verify_state dir/foo work parent &&
+	verify_saved_state bar &&
+	test_i18ngrep "Apply" output
 
-ok 20 - rev-list: ancestry-path topo-order
+Apply deletion to index [y,n,q,a,d,?]? 
+Apply this hunk to index [y,n,q,a,d,e,?]? 
+ok 4 - git reset -p HEAD^
 
 expecting success: 
-	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_three_modes git rev-list --topo-order commit-3-8...commit-6-6
+	set_state dir/foo work work &&
+	test_write_lines y n | git reset -p dir &&
+	verify_state dir/foo work head &&
+	verify_saved_state bar
 
-ok 21 - rev-list: symmetric difference topo-order
+diff --git a/dir/foo b/dir/foo
+index 564b12f..b8f99f5 100644
+--- a/dir/foo
++++ b/dir/foo
+@@ -1 +1 @@
+-head
++work
+Unstage this hunk [y,n,q,a,d,e,?]? 
+ok 5 - git reset -p dir
 
 expecting success: 
-	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_three_modes get_reachable_subset
+	set_state dir/foo work work &&
+	test_write_lines y n | (cd dir && git reset -p -- foo) &&
+	verify_state dir/foo work head &&
+	verify_saved_state bar
 
-ok 22 - get_reachable_subset:all
+diff --git a/dir/foo b/dir/foo
+index 564b12f..b8f99f5 100644
+--- a/dir/foo
++++ b/dir/foo
+@@ -1 +1 @@
+-head
++work
+Unstage this hunk [y,n,q,a,d,e,?]? 
+ok 6 - git reset -p -- foo (inside dir)
 
 expecting success: 
-	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_three_modes get_reachable_subset
+	test_write_lines y n | git reset -p HEAD^ -- dir &&
+	verify_state dir/foo work parent &&
+	verify_saved_state bar
 
-ok 23 - get_reachable_subset:some
+diff --git b/dir/foo a/dir/foo
+index 564b12f..9676f5b 100644
+--- b/dir/foo
++++ a/dir/foo
+@@ -1 +1 @@
+-head
++parent
+Apply this hunk to index [y,n,q,a,d,e,?]? 
+ok 7 - git reset -p HEAD^ -- dir
 
 expecting success: 
-	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_three_modes get_reachable_subset
+	verify_saved_head
 
-ok 24 - get_reachable_subset:none
+ok 8 - none of this moved HEAD
 
-# passed all 24 test(s)
-1..24
+# passed all 8 test(s)
+1..8
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t7001-mv.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7001-mv/.git/
-expecting success: mkdir path0 path1 &&
-     cp "$TEST_DIRECTORY"/../COPYING path0/COPYING &&
-     git add path0/COPYING &&
-     git commit -m add -a
-[master (root-commit) 02c7814] add
- Author: A U Thor <author@example.com>
- 1 file changed, 360 insertions(+)
- create mode 100644 path0/COPYING
-ok 1 - prepare reference tree
-
-expecting success: cd path0 && git mv COPYING ../path1/COPYING
-ok 2 - moving the file out of subdirectory
-
-expecting success: cd .. && git commit -m move-out -a
-[master 2b546fd] move-out
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename {path0 => path1}/COPYING (100%)
-ok 3 - commiting the change
-
-expecting success: git diff-tree -r -M --name-status  HEAD^ HEAD >actual &&
-    grep "^R100..*path0/COPYING..*path1/COPYING" actual
-R100	path0/COPYING	path1/COPYING
-ok 4 - checking the commit
-
-expecting success: cd path0 && git mv ../path1/COPYING COPYING
-ok 5 - moving the file back into subdirectory
-
-expecting success: cd .. && git commit -m move-in -a
-[master 0b4af26] move-in
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename {path1 => path0}/COPYING (100%)
-ok 6 - commiting the change
-
-expecting success: git diff-tree -r -M --name-status  HEAD^ HEAD >actual &&
-    grep "^R100..*path1/COPYING..*path0/COPYING" actual
-R100	path1/COPYING	path0/COPYING
-ok 7 - checking the commit
-
-expecting success: git mv -n path0/COPYING MOVED &&
-     test -f path0/COPYING &&
-     test ! -f MOVED
-Checking rename of 'path0/COPYING' to 'MOVED'
-Renaming path0/COPYING to MOVED
-ok 8 - mv --dry-run does not move file
-
-expecting success: git mv -k idontexist path0
-ok 9 - checking -k on non-existing file
-
-expecting success: touch untracked1 &&
-     git mv -k untracked1 path0 &&
-     test -f untracked1 &&
-     test ! -f path0/untracked1
-ok 10 - checking -k on untracked file
-
-expecting success: touch untracked2 &&
-     git mv -k untracked1 untracked2 path0 &&
-     test -f untracked1 &&
-     test -f untracked2 &&
-     test ! -f path0/untracked1 &&
-     test ! -f path0/untracked2
-ok 11 - checking -k on multiple untracked files
-
-expecting success: touch path0/untracked1 &&
-     test_must_fail git mv -f untracked1 path0 &&
-     test ! -f .git/index.lock &&
-     test -f untracked1 &&
-     test -f path0/untracked1
-fatal: not under version control, source=untracked1, destination=path0/untracked1
-ok 12 - checking -f on untracked file with existing target
-
-expecting success: test_must_fail git mv path0/COPYING no-such-dir/ &&
-     test_must_fail git mv path0/COPYING no-such-dir// &&
-     git mv path0/ no-such-dir/ &&
-     test_path_is_dir no-such-dir
-fatal: destination directory does not exist, source=path0/COPYING, destination=no-such-dir/
-fatal: destination directory does not exist, source=path0/COPYING, destination=no-such-dir/
-ok 13 - moving to absent target with trailing slash
-
-expecting success: git reset --hard
-HEAD is now at 0b4af26 move-in
-ok 14 - clean up
-
-expecting success: mkdir path1 &&
-     git mv path0/ path1/ &&
-     test_path_is_dir path1/path0/
-ok 15 - moving to existing untracked target with trailing slash
-
-expecting success: mkdir path2 &&
-     >path2/file && git add path2/file &&
-     git mv path1/path0/ path2/ &&
-     test_path_is_dir path2/path0/
-ok 16 - moving to existing tracked target with trailing slash
-
-expecting success: git reset --hard
-HEAD is now at 0b4af26 move-in
-ok 17 - clean up
-
-expecting success: cp "$TEST_DIRECTORY"/../README.md path0/README &&
-     git add path0/README &&
-     git commit -m add2 -a
-[master b2d80a6] add2
- Author: A U Thor <author@example.com>
- 1 file changed, 64 insertions(+)
- create mode 100644 path0/README
-ok 18 - adding another file
-
-expecting success: git mv path0 path2
-ok 19 - moving whole subdirectory
-
-expecting success: git commit -m dir-move -a
-[master 71b93a8] dir-move
- Author: A U Thor <author@example.com>
- 2 files changed, 0 insertions(+), 0 deletions(-)
- rename {path0 => path2}/COPYING (100%)
- rename {path0 => path2}/README (100%)
-ok 20 - commiting the change
-
-expecting success: git diff-tree -r -M --name-status  HEAD^ HEAD >actual &&
-     grep "^R100..*path0/COPYING..*path2/COPYING" actual &&
-     grep "^R100..*path0/README..*path2/README" actual
-R100	path0/COPYING	path2/COPYING
-R100	path0/README	path2/README
-ok 21 - checking the commit
-
-expecting success: git mv path2/COPYING path2/COPYING-renamed
-ok 22 - succeed when source is a prefix of destination
-
-expecting success: git mv path2 path1
-ok 23 - moving whole subdirectory into subdirectory
-
-expecting success: git commit -m dir-move -a
-[master 9d0b872] dir-move
- Author: A U Thor <author@example.com>
- 2 files changed, 0 insertions(+), 0 deletions(-)
- rename path2/COPYING => path1/path2/COPYING-renamed (100%)
- rename {path2 => path1/path2}/README (100%)
-ok 24 - commiting the change
-
-expecting success: git diff-tree -r -M --name-status  HEAD^ HEAD >actual &&
-     grep "^R100..*path2/COPYING..*path1/path2/COPYING" actual &&
-     grep "^R100..*path2/README..*path1/path2/README" actual
-R100	path2/COPYING	path1/path2/COPYING-renamed
-R100	path2/README	path1/path2/README
-ok 25 - checking the commit
-
-expecting success: mkdir path0 && mkdir path0/path2 && test_must_fail git mv path2 path0
-fatal: bad source, source=path2, destination=path0/path2
-ok 26 - do not move directory over existing directory
-
-expecting success: git mv path1/path2/ .
-ok 27 - move into "."
-
-expecting success: 
-	rm -fr .git papers partA &&
-	git init &&
-	mkdir -p papers/unsorted papers/all-papers partA &&
-	echo a > papers/unsorted/Thesis.pdf &&
-	echo b > partA/outline.txt &&
-	echo c > papers/unsorted/_another &&
-	git add papers partA &&
-	T1=$(git write-tree) &&
-
-	git mv papers/unsorted/Thesis.pdf papers/all-papers/moo-blah.pdf &&
-
-	T=$(git write-tree) &&
-	git ls-tree -r $T | verbose grep partA/outline.txt
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7001-mv/.git/
-100644 blob 61780798228d17af2d34fce4cfbdf35556832472	partA/outline.txt
-ok 28 - Michael Cassar's test case
-
-expecting success: 
-	rm -fr .git &&
-	git init &&
-	mkdir ab &&
-	date >ab.c &&
-	date >ab/d &&
-	git add ab.c ab &&
-	git commit -m initial &&
-	git mv ab a
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7001-mv/.git/
-[master (root-commit) 733d25e] initial
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 ab.c
- create mode 100644 ab/d
-ok 29 - Sergey Vlasov's test case
-
-expecting success: (
-
-	rm -fr mine &&
-	mkdir mine &&
-	cd mine &&
-	test_create_repo one &&
-	cd one &&
-	mkdir sub &&
-	>sub/file &&
-	git add sub/file &&
-
-	git mv sub "$(pwd)/in" &&
-	! test -d sub &&
-	test -d in &&
-	git ls-files --error-unmatch in/file
-
-
-)
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7001-mv/mine/one/.git/
-in/file
-ok 30 - absolute pathname
-
-expecting success: (
-
-	rm -fr mine &&
-	mkdir mine &&
-	cd mine &&
-	out=$(pwd) &&
-	test_create_repo one &&
-	cd one &&
-	mkdir sub &&
-	>sub/file &&
-	git add sub/file &&
-
-	test_must_fail git mv sub "$out/out" &&
-	test -d sub &&
-	! test -d ../in &&
-	git ls-files --error-unmatch sub/file
-
-)
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7001-mv/mine/one/.git/
-fatal: '/build/git-2.20.1/t/trash directory.t7001-mv/mine/out' is outside repository
-sub/file
-ok 31 - absolute pathname outside should fail
-
-expecting success: 
-	rm -fr .git && git init &&
-	mkdir dir other &&
-	>dir/a.txt &&
-	>dir/b.txt &&
-	git add dir/?.txt &&
-	git mv dir/a.txt dir/b.txt other &&
-	git ls-files >actual &&
-	{ echo other/a.txt; echo other/b.txt; } >expect &&
-	test_cmp expect actual
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7001-mv/.git/
-ok 32 - git mv to move multiple sources into a directory
-
-expecting success: 
-
-	rm -fr .git &&
-	git init &&
-	echo 1 >dirty &&
-	git add dirty &&
-	entry="$(git ls-files --stage dirty | cut -f 1)" &&
-	git mv dirty dirty2 &&
-	[ "$entry" = "$(git ls-files --stage dirty2 | cut -f 1)" ] &&
-	echo 2 >dirty2 &&
-	git mv dirty2 dirty &&
-	[ "$entry" = "$(git ls-files --stage dirty | cut -f 1)" ]
-
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7001-mv/.git/
-ok 33 - git mv should not change sha1 of moved cache entry
-
-expecting success: 
-
-	rm -fr .git &&
-	git init &&
-	echo 1 >moved &&
-	test_ln_s_add moved symlink &&
-	git add moved &&
-	test_must_fail git mv moved symlink &&
-	git mv -f moved symlink &&
-	! test -e moved &&
-	test -f symlink &&
-	test "$(cat symlink)" = 1 &&
-	git update-index --refresh &&
-	git diff-files --quiet
-
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7001-mv/.git/
-checking prerequisite: SYMLINKS
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
-	# test whether the filesystem supports symbolic links
-	ln -s x y && test -h y
-
-)
-prerequisite SYMLINKS ok
-fatal: destination exists, source=moved, destination=symlink
-ok 34 - git mv should overwrite symlink to a file
-
-expecting success: 
-
-	rm -fr .git &&
-	git init &&
-	echo 1 >moved &&
-	test_ln_s_add moved symlink &&
-	git add moved &&
-	test_must_fail git mv symlink moved &&
-	git mv -f symlink moved &&
-	! test -e symlink &&
-	git update-index --refresh &&
-	git diff-files --quiet
-
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7001-mv/.git/
-fatal: destination exists, source=symlink, destination=moved
-ok 35 - git mv should overwrite file with a symlink
-
-expecting success: 
-
-	test -h moved
-
-ok 36 - check moved symlink
-
-expecting success: 
-	git commit -m initial &&
-	git reset --hard &&
-	git submodule add ./. sub &&
-	echo content >file &&
-	git add file &&
-	git commit -m "added sub and file" &&
-	mkdir -p deep/directory/hierarchy &&
-	git submodule add ./. deep/directory/hierarchy/sub &&
-	git commit -m "added another submodule" &&
-	git branch submodule
-
-[master (root-commit) ff926f5] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 120000 moved
-HEAD is now at ff926f5 initial
-Cloning into '/build/git-2.20.1/t/trash directory.t7001-mv/sub'...
-done.
-[master 52c76c9] added sub and file
- Author: A U Thor <author@example.com>
- 3 files changed, 5 insertions(+)
- create mode 100644 .gitmodules
- create mode 100644 file
- create mode 160000 sub
-Cloning into '/build/git-2.20.1/t/trash directory.t7001-mv/deep/directory/hierarchy/sub'...
-done.
-[master 174e8d2] added another submodule
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 160000 deep/directory/hierarchy/sub
-ok 37 - setup submodule
-
-expecting success: 
-	test_must_fail git mv sub file
-
-fatal: cannot move directory over file, source=sub, destination=file
-ok 38 - git mv cannot move a submodule in a file
-
-expecting success: 
-	entry="$(git ls-files --stage sub | cut -f 1)" &&
-	git rm .gitmodules &&
-	(
-		cd sub &&
-		rm -f .git &&
-		cp -R -P -p ../.git/modules/sub .git &&
-		GIT_WORK_TREE=. git config --unset core.worktree
-	) &&
-	mkdir mod &&
-	git mv sub mod/sub &&
-	! test -e sub &&
-	[ "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" ] &&
-	(
-		cd mod/sub &&
-		git status
-	) &&
-	git update-index --refresh &&
-	git diff-files --quiet
-
-rm '.gitmodules'
-On branch master
-Your branch is up to date with 'origin/master'.
-
-nothing to commit, working tree clean
-ok 39 - git mv moves a submodule with a .git directory and no .gitmodules
-
-expecting success: 
-	rm -rf mod &&
-	git reset --hard &&
-	git submodule update &&
-	entry="$(git ls-files --stage sub | cut -f 1)" &&
-	(
-		cd sub &&
-		rm -f .git &&
-		cp -R -P -p ../.git/modules/sub .git &&
-		GIT_WORK_TREE=. git config --unset core.worktree
-	) &&
-	mkdir mod &&
-	git mv sub mod/sub &&
-	! test -e sub &&
-	[ "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" ] &&
-	(
-		cd mod/sub &&
-		git status
-	) &&
-	echo mod/sub >expected &&
-	git config -f .gitmodules submodule.sub.path >actual &&
-	test_cmp expected actual &&
-	git update-index --refresh &&
-	git diff-files --quiet
-
-HEAD is now at 174e8d2 added another submodule
-Submodule path 'sub': checked out 'ff926f52b6e41c1f21a9fb79bb35bfa2ebb79844'
-HEAD detached at ff926f5
-nothing to commit, working tree clean
-ok 40 - git mv moves a submodule with a .git directory and .gitmodules
-
-expecting success: 
-	rm -rf mod &&
-	git reset --hard &&
-	git submodule update &&
-	entry="$(git ls-files --stage sub | cut -f 1)" &&
-	mkdir mod &&
-	(
-		cd mod &&
-		git mv ../sub/ .
-	) &&
-	! test -e sub &&
-	[ "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" ] &&
-	(
-		cd mod/sub &&
-		git status
-	) &&
-	echo mod/sub >expected &&
-	git config -f .gitmodules submodule.sub.path >actual &&
-	test_cmp expected actual &&
-	git update-index --refresh &&
-	git diff-files --quiet
-
-HEAD is now at 174e8d2 added another submodule
-Submodule path 'sub': checked out 'ff926f52b6e41c1f21a9fb79bb35bfa2ebb79844'
-HEAD detached at ff926f5
-nothing to commit, working tree clean
-ok 41 - git mv moves a submodule with gitfile
-
-expecting success: 
-	rm -rf mod &&
-	git reset --hard &&
-	git submodule update &&
-	git rm .gitmodules &&
-	entry="$(git ls-files --stage sub | cut -f 1)" &&
-	mkdir mod &&
-	git mv sub mod/sub 2>actual.err &&
-	test_must_be_empty actual.err &&
-	! test -e sub &&
-	[ "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" ] &&
-	(
-		cd mod/sub &&
-		git status
-	) &&
-	git update-index --refresh &&
-	git diff-files --quiet
-
-HEAD is now at 174e8d2 added another submodule
-Submodule path 'sub': checked out 'ff926f52b6e41c1f21a9fb79bb35bfa2ebb79844'
-rm '.gitmodules'
-HEAD detached at ff926f5
-nothing to commit, working tree clean
-ok 42 - mv does not complain when no .gitmodules file is found
-
-expecting success: 
-	rm -rf mod &&
-	git reset --hard &&
-	git submodule update &&
-	git config -f .gitmodules foo.bar true &&
-	entry="$(git ls-files --stage sub | cut -f 1)" &&
-	mkdir mod &&
-	test_must_fail git mv sub mod/sub 2>actual.err &&
-	test -s actual.err &&
-	test -e sub &&
-	git diff-files --quiet -- sub &&
-	git add .gitmodules &&
-	git mv sub mod/sub 2>actual.err &&
-	test_must_be_empty actual.err &&
-	! test -e sub &&
-	[ "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" ] &&
-	(
-		cd mod/sub &&
-		git status
-	) &&
-	git update-index --refresh &&
-	git diff-files --quiet
-
-HEAD is now at 174e8d2 added another submodule
-Submodule path 'sub': checked out 'ff926f52b6e41c1f21a9fb79bb35bfa2ebb79844'
-HEAD detached at ff926f5
-nothing to commit, working tree clean
-ok 43 - mv will error out on a modified .gitmodules file unless staged
-
-expecting success: 
-	rm -rf mod &&
-	git reset --hard &&
-	git submodule update &&
-	git config -f .gitmodules --remove-section submodule.sub &&
-	git add .gitmodules &&
-	entry="$(git ls-files --stage sub | cut -f 1)" &&
-	echo "warning: Could not find section in .gitmodules where path=sub" >expect.err &&
-	mkdir mod &&
-	git mv sub mod/sub 2>actual.err &&
-	test_i18ncmp expect.err actual.err &&
-	! test -e sub &&
-	[ "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" ] &&
-	(
-		cd mod/sub &&
-		git status
-	) &&
-	git update-index --refresh &&
-	git diff-files --quiet
-
-HEAD is now at 174e8d2 added another submodule
-Submodule path 'sub': checked out 'ff926f52b6e41c1f21a9fb79bb35bfa2ebb79844'
-HEAD detached at ff926f5
-nothing to commit, working tree clean
-ok 44 - mv issues a warning when section is not found in .gitmodules
-
-expecting success: 
-	rm -rf mod &&
-	git reset --hard &&
-	git submodule update &&
-	mkdir mod &&
-	git mv -n sub mod/sub 2>actual.err &&
-	test -f sub/.git &&
-	git diff-index --exit-code HEAD &&
-	git update-index --refresh &&
-	git diff-files --quiet -- sub .gitmodules
-
-HEAD is now at 174e8d2 added another submodule
-Submodule path 'sub': checked out 'ff926f52b6e41c1f21a9fb79bb35bfa2ebb79844'
-Checking rename of 'sub' to 'mod/sub'
-Renaming sub to mod/sub
-ok 45 - mv --dry-run does not touch the submodule or .gitmodules
-
-expecting success: 
-	git mv sub sub2 &&
-	git commit -m "moved sub to sub2" &&
-	git checkout -q HEAD^ 2>actual &&
-	test_i18ngrep "^warning: unable to rmdir 'sub2':" actual &&
-	git status -s sub2 >actual &&
-	echo "?? sub2/" >expected &&
-	test_cmp expected actual &&
-	! test -f sub/.git &&
-	test -f sub2/.git &&
-	git submodule update &&
-	test -f sub/.git &&
-	rm -rf sub2 &&
-	git diff-index --exit-code HEAD &&
-	git update-index --refresh &&
-	git diff-files --quiet -- sub .gitmodules &&
-	git status -s sub2 >actual &&
-	test_must_be_empty actual
-
-[master ad6245a] moved sub to sub2
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+), 1 deletion(-)
- rename sub => sub2 (100%)
-warning: unable to rmdir 'sub2': Directory not empty
-Submodule path 'sub': checked out 'ff926f52b6e41c1f21a9fb79bb35bfa2ebb79844'
-ok 46 - checking out a commit before submodule moved needs manual updates
-
-expecting success: 
-	git checkout submodule &&
-	mkdir dummy dest &&
-	git mv -k dummy sub dest &&
-	git status --porcelain >actual &&
-	grep "^R  sub -> dest/sub" actual &&
-	git reset --hard &&
-	git checkout .
-
-Switched to branch 'submodule'
-R  sub -> dest/sub
-warning: unable to rmdir 'dest/sub': Directory not empty
-HEAD is now at 174e8d2 added another submodule
-ok 47 - mv -k does not accidentally destroy submodules
-
-expecting success: 
-	(
-		cd deep &&
-		git mv directory ../ &&
-		# git status would fail if the update of linking git dir to
-		# work dir of the submodule failed.
-		git status &&
-		git config -f ../.gitmodules submodule.deep/directory/hierarchy/sub.path >../actual &&
-		echo "directory/hierarchy/sub" >../expect
-	) &&
-	test_cmp expect actual
-
-On branch submodule
-Changes to be committed:
-  (use "git reset HEAD <file>..." to unstage)
-
-	modified:   ../.gitmodules
-	renamed:    directory/hierarchy/sub -> ../directory/hierarchy/sub
-
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-
-	../a/
-	../ab.c
-	../actual
-	../actual.err
-	../dest/
-	../expect
-	../expect.err
-	../expected
-	../mine/
-	../other/
-
-ok 48 - moving a submodule in nested directories
-
-expecting success: 
-	git commit -am "cleanup commit" &&
-	mkdir sub_nested_nested &&
-	(cd sub_nested_nested &&
-		touch nested_level2 &&
-		git init &&
-		git add . &&
-		git commit -m "nested level 2"
-	) &&
-	mkdir sub_nested &&
-	(cd sub_nested &&
-		touch nested_level1 &&
-		git init &&
-		git add . &&
-		git commit -m "nested level 1" &&
-		git submodule add ../sub_nested_nested &&
-		git commit -m "add nested level 2"
-	) &&
-	git submodule add ./sub_nested nested_move &&
-	git commit -m "add nested_move" &&
-	git submodule update --init --recursive &&
-	git mv nested_move sub_nested_moved &&
-	git status
-
-[submodule e0fdf9e] cleanup commit
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+), 1 deletion(-)
- rename {deep/directory => directory}/hierarchy/sub (100%)
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7001-mv/sub_nested_nested/.git/
-[master (root-commit) 84136d2] nested level 2
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 nested_level2
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7001-mv/sub_nested/.git/
-[master (root-commit) 89f8e81] nested level 1
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 nested_level1
-Cloning into '/build/git-2.20.1/t/trash directory.t7001-mv/sub_nested/sub_nested_nested'...
-done.
-[master 69bfc80] add nested level 2
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub_nested_nested
-Cloning into '/build/git-2.20.1/t/trash directory.t7001-mv/nested_move'...
-done.
-[submodule a72cbde] add nested_move
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 160000 nested_move
-Submodule 'sub' (/build/git-2.20.1/t/trash directory.t7001-mv/./.) registered for path 'directory/hierarchy/sub/sub'
-Cloning into '/build/git-2.20.1/t/trash directory.t7001-mv/directory/hierarchy/sub/sub'...
-done.
-Submodule path 'directory/hierarchy/sub/sub': checked out 'ff926f52b6e41c1f21a9fb79bb35bfa2ebb79844'
-Submodule 'sub_nested_nested' (/build/git-2.20.1/t/trash directory.t7001-mv/sub_nested_nested) registered for path 'nested_move/sub_nested_nested'
-Cloning into '/build/git-2.20.1/t/trash directory.t7001-mv/nested_move/sub_nested_nested'...
-done.
-Submodule path 'nested_move/sub_nested_nested': checked out '84136d270b149bcf1a19b2ac9948b8b36e9a94fe'
-Submodule path 'sub': checked out 'ff926f52b6e41c1f21a9fb79bb35bfa2ebb79844'
-On branch submodule
-Changes to be committed:
-  (use "git reset HEAD <file>..." to unstage)
-
-	modified:   .gitmodules
-	renamed:    nested_move -> sub_nested_moved
-
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-
-	a/
-	ab.c
-	actual
-	actual.err
-	dest/
-	expect
-	expect.err
-	expected
-	mine/
-	other/
-	sub_nested/
-	sub_nested_nested/
-
-ok 49 - moving nested submodules
-
-# passed all 49 test(s)
-1..49
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t7008-grep-binary.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7008-grep-binary/.git/
-expecting success: 
-	echo 'binaryQfileQm[*]cQ*æQð' | q_to_nul >a &&
-	git add a &&
-	git commit -m.
-
-[master (root-commit) c59b3ac] .
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 a
-ok 1 - setup
-
-expecting success: 
-	echo Binary file a matches >expect &&
-	git grep ina a >actual &&
-	test_cmp expect actual
-
-ok 2 - git grep ina a
-
-expecting success: 
-	git grep -ah ina a >actual &&
-	test_cmp a actual
-
-ok 3 - git grep -ah ina a
-
-expecting success: 
-	test_must_fail git grep -I ina a >actual &&
-	test_must_be_empty actual
-
-ok 4 - git grep -I ina a
-
-expecting success: 
-	echo a:1 >expect &&
-	git grep -c ina a >actual &&
-	test_cmp expect actual
-
-ok 5 - git grep -c ina a
-
-expecting success: 
-	echo a >expect &&
-	git grep -l ina a >actual &&
-	test_cmp expect actual
-
-ok 6 - git grep -l ina a
-
-expecting success: 
-	echo a >expect &&
-	git grep -L bar a >actual &&
-	test_cmp expect actual
-
-ok 7 - git grep -L bar a
-
-expecting success: 
-	git grep -q ina a >actual &&
-	test_must_be_empty actual
-
-ok 8 - git grep -q ina a
-
-expecting success: 
-	git grep -F ile a
-
-Binary file a matches
-ok 9 - git grep -F ile a
-
-expecting success: 
-	git grep -Fi iLE a
-
-Binary file a matches
-ok 10 - git grep -Fi iLE a
-
-expecting success: 
-	git grep ile a
-
-Binary file a matches
-ok 11 - git grep ile a
-
-checking known breakage: 
-	git grep .fi a
-
-not ok 12 - git grep .fi a # TODO known breakage
-
-expecting success: 
-			printf 'yQf' | q_to_nul >f &&
-			git grep -f f -F a
-		
-Binary file a matches
-ok 13 - git grep -f f -F 'y<NUL>f' a
-
-expecting success: 
-			printf 'yQx' | q_to_nul >f &&
-			test_must_fail git grep -f f -F a
-		
-ok 14 - git grep -f f -F 'y<NUL>x' a
-
-expecting success: 
-			printf 'YQf' | q_to_nul >f &&
-			git grep -f f -Fi a
-		
-Binary file a matches
-ok 15 - git grep -f f -Fi 'Y<NUL>f' a
-
-expecting success: 
-			printf 'YQx' | q_to_nul >f &&
-			test_must_fail git grep -f f -Fi a
-		
-ok 16 - git grep -f f -Fi 'Y<NUL>x' a
-
-expecting success: 
-			printf 'yQf' | q_to_nul >f &&
-			git grep -f f  a
-		
-Binary file a matches
-ok 17 - git grep -f f  'y<NUL>f' a
-
-expecting success: 
-			printf 'yQx' | q_to_nul >f &&
-			test_must_fail git grep -f f  a
-		
-ok 18 - git grep -f f  'y<NUL>x' a
-
-expecting success: 
-			printf 'æQð' | q_to_nul >f &&
-			git grep -f f  a
-		
-Binary file a matches
-ok 19 - git grep -f f  'æ<NUL>ð' a
-
-expecting success: 
-			printf 'eQm[*]c' | q_to_nul >f &&
-			git grep -f f -F a
-		
-Binary file a matches
-ok 20 - git grep -f f -F 'e<NUL>m[*]c' a
-
-expecting success: 
-			printf 'EQM[*]C' | q_to_nul >f &&
-			git grep -f f -Fi a
-		
-Binary file a matches
-ok 21 - git grep -f f -Fi 'E<NUL>M[*]C' a
-
-expecting success: 
-			printf 'yQ[f]' | q_to_nul >f &&
-			test_must_fail git grep -f f -F a
-		
-ok 22 - git grep -f f -F 'y<NUL>[f]' a
-
-expecting success: 
-			printf '[y]Qf' | q_to_nul >f &&
-			test_must_fail git grep -f f -F a
-		
-ok 23 - git grep -f f -F '[y]<NUL>f' a
-
-expecting success: 
-			printf 'YQ[F]' | q_to_nul >f &&
-			test_must_fail git grep -f f -Fi a
-		
-ok 24 - git grep -f f -Fi 'Y<NUL>[F]' a
-
-expecting success: 
-			printf '[Y]QF' | q_to_nul >f &&
-			test_must_fail git grep -f f -Fi a
-		
-ok 25 - git grep -f f -Fi '[Y]<NUL>F' a
-
-expecting success: 
-			printf 'æQ[ð]' | q_to_nul >f &&
-			test_must_fail git grep -f f -F a
-		
-ok 26 - git grep -f f -F 'æ<NUL>[ð]' a
-
-expecting success: 
-			printf '[æ]Qð' | q_to_nul >f &&
-			test_must_fail git grep -f f -F a
-		
-ok 27 - git grep -f f -F '[æ]<NUL>ð' a
-
-expecting success: 
-			printf 'ÆQ[�]' | q_to_nul >f &&
-			test_must_fail git grep -f f -Fi a
-		
-ok 28 - git grep -f f -Fi 'Æ<NUL>[�]' a
-
-expecting success: 
-			printf '[Æ]Q�' | q_to_nul >f &&
-			test_must_fail git grep -f f -Fi a
-		
-ok 29 - git grep -f f -Fi '[Æ]<NUL>�' a
-
-checking known breakage: 
-			printf 'ÆQ�' | q_to_nul >f &&
-			git grep -f f -i a
-		
-not ok 30 - git grep -f f -i 'Æ<NUL>�' a # TODO known breakage
-
-checking known breakage: 
-			printf 'yQ[f]' | q_to_nul >f &&
-			git grep -f f  a
-		
-not ok 31 - git grep -f f  'y<NUL>[f]' a # TODO known breakage
-
-checking known breakage: 
-			printf '[y]Qf' | q_to_nul >f &&
-			git grep -f f  a
-		
-not ok 32 - git grep -f f  '[y]<NUL>f' a # TODO known breakage
-
-checking known breakage: 
-			printf 'YQ[F]' | q_to_nul >f &&
-			git grep -f f -i a
-		
-not ok 33 - git grep -f f -i 'Y<NUL>[F]' a # TODO known breakage
-
-checking known breakage: 
-			printf '[Y]Qf' | q_to_nul >f &&
-			git grep -f f -i a
-		
-not ok 34 - git grep -f f -i '[Y]<NUL>f' a # TODO known breakage
-
-checking known breakage: 
-			printf 'æQ[ð]' | q_to_nul >f &&
-			git grep -f f  a
-		
-not ok 35 - git grep -f f  'æ<NUL>[ð]' a # TODO known breakage
-
-checking known breakage: 
-			printf '[æ]Qð' | q_to_nul >f &&
-			git grep -f f  a
-		
-not ok 36 - git grep -f f  '[æ]<NUL>ð' a # TODO known breakage
-
-checking known breakage: 
-			printf 'ÆQ[�]' | q_to_nul >f &&
-			git grep -f f -i a
-		
-not ok 37 - git grep -f f -i 'Æ<NUL>[�]' a # TODO known breakage
-
-checking known breakage: 
-			printf 'eQm.*cQ' | q_to_nul >f &&
-			git grep -f f  a
-		
-not ok 38 - git grep -f f  'e<NUL>m.*c<NUL>' a # TODO known breakage
-
-checking known breakage: 
-			printf 'EQM.*cQ' | q_to_nul >f &&
-			git grep -f f -i a
-		
-not ok 39 - git grep -f f -i 'E<NUL>M.*c<NUL>' a # TODO known breakage
-
-checking known breakage: 
-			printf 'eQm[*]c' | q_to_nul >f &&
-			test_must_fail git grep -f f  a
-		
-Binary file a matches
-test_must_fail: command succeeded: git grep -f f a
-not ok 40 - git grep -f f  'e<NUL>m[*]c' a # TODO known breakage
-
-checking known breakage: 
-			printf 'EQM[*]C' | q_to_nul >f &&
-			test_must_fail git grep -f f -i a
-		
-Binary file a matches
-test_must_fail: command succeeded: git grep -f f -i a
-not ok 41 - git grep -f f -i 'E<NUL>M[*]C' a # TODO known breakage
-
-expecting success: 
-			printf 'NOMATCHQð' | q_to_nul >f &&
-			test_must_fail git grep -f f -i a
-		
-ok 42 - git grep -f f -i 'NOMATCH<NUL>ð' a
-
-checking known breakage: 
-			printf '[Æ]QNOMATCH' | q_to_nul >f &&
-			test_must_fail git grep -f f -i a
-		
-Binary file a matches
-test_must_fail: command succeeded: git grep -f f -i a
-not ok 43 - git grep -f f -i '[Æ]<NUL>NOMATCH' a # TODO known breakage
-
-checking known breakage: 
-			printf '[æ]QNOMATCH' | q_to_nul >f &&
-			test_must_fail git grep -f f -i a
-		
-Binary file a matches
-test_must_fail: command succeeded: git grep -f f -i a
-not ok 44 - git grep -f f -i '[æ]<NUL>NOMATCH' a # TODO known breakage
-
-expecting success: 
-			printf '[Æ]Qð' | q_to_nul >f &&
-			git grep -f f -i a
-		
-Binary file a matches
-ok 45 - git grep -f f -i '[Æ]<NUL>ð' a
-
-expecting success: 
-			printf '[æ]Qð' | q_to_nul >f &&
-			git grep -f f -i a
-		
-Binary file a matches
-ok 46 - git grep -f f -i '[æ]<NUL>ð' a
-
-expecting success: 
-			printf 'yQ[f]' | q_to_nul >f &&
-			test_must_fail git grep -f f -F a
-		
-ok 47 - git grep -f f -F 'y<NUL>[f]' a
-
-expecting success: 
-			printf 'YQ[F]' | q_to_nul >f &&
-			test_must_fail git grep -f f -Fi a
-		
-ok 48 - git grep -f f -Fi 'Y<NUL>[F]' a
-
-expecting success: 
-			printf 'yQNOMATCH' | q_to_nul >f &&
-			test_must_fail git grep -f f  a
-		
-ok 49 - git grep -f f  'y<NUL>NOMATCH' a
-
-expecting success: 
-			printf 'QNOMATCH' | q_to_nul >f &&
-			test_must_fail git grep -f f  a
-		
-ok 50 - git grep -f f  '<NUL>NOMATCH' a
-
-expecting success: 
-			printf 'YQNOMATCH' | q_to_nul >f &&
-			test_must_fail git grep -f f -i a
-		
-ok 51 - git grep -f f -i 'Y<NUL>NOMATCH' a
-
-expecting success: 
-			printf 'QNOMATCH' | q_to_nul >f &&
-			test_must_fail git grep -f f -i a
-		
-ok 52 - git grep -f f -i '<NUL>NOMATCH' a
-
-expecting success: 
-			printf 'æQ[ð]' | q_to_nul >f &&
-			test_must_fail git grep -f f -F a
-		
-ok 53 - git grep -f f -F 'æ<NUL>[ð]' a
-
-expecting success: 
-			printf 'ÆQ[�]' | q_to_nul >f &&
-			test_must_fail git grep -f f -Fi a
-		
-ok 54 - git grep -f f -Fi 'Æ<NUL>[�]' a
-
-expecting success: 
-			printf 'yQNÓMATCH' | q_to_nul >f &&
-			test_must_fail git grep -f f  a
-		
-ok 55 - git grep -f f  'y<NUL>NÓMATCH' a
-
-expecting success: 
-			printf 'QNÓMATCH' | q_to_nul >f &&
-			test_must_fail git grep -f f  a
-		
-ok 56 - git grep -f f  '<NUL>NÓMATCH' a
-
-expecting success: 
-			printf 'YQNÓMATCH' | q_to_nul >f &&
-			test_must_fail git grep -f f -i a
-		
-ok 57 - git grep -f f -i 'Y<NUL>NÓMATCH' a
-
-expecting success: 
-			printf 'QNÓMATCH' | q_to_nul >f &&
-			test_must_fail git grep -f f -i a
-		
-ok 58 - git grep -f f -i '<NUL>NÓMATCH' a
-
-expecting success: 
-	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 59 - grep respects binary diff attribute
-
-expecting success: 
-	git grep --cached text t >actual &&
-	test_cmp expect actual
-
-ok 60 - grep --cached respects binary diff attribute
-
-expecting success: 
-	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
-
-rm '.gitattributes'
-ok 61 - grep --cached respects binary diff attribute (2)
-
-expecting success: 
-	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 c72d473] new
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 t
-ok 62 - grep revision respects binary diff attribute
-
-expecting success: 
-	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 63 - grep respects not-binary diff attribute
-
-expecting success: 
-	echo a diff=foo >.gitattributes &&
-	git config diff.foo.textconv "\"$(pwd)\""/nul_to_q_textconv
-
-ok 64 - setup textconv filters
-
-expecting success: 
-	test_must_fail git grep Qfile
-
-ok 65 - grep does not honor textconv
-
-expecting success: 
-	echo "a:binaryQfileQm[*]cQ*æQð" >expect &&
-	git grep --textconv Qfile >actual &&
-	test_cmp expect actual
-
-ok 66 - grep --textconv honors textconv
-
-expecting success: 
-	test_must_fail git grep --no-textconv Qfile
-
-ok 67 - grep --no-textconv does not honor textconv
-
-expecting success: 
-	echo "HEAD:a:binaryQfileQm[*]cQ*æQð" >expect &&
-	git grep --textconv Qfile HEAD:a >actual &&
-	test_cmp expect actual
-
-ok 68 - grep --textconv blob honors textconv
-
-# still have 15 known breakage(s)
-# passed all remaining 53 test(s)
-1..68
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t7104-reset-hard.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7104-reset-hard/.git/
-expecting success: 
-
-	mkdir before later &&
-	>before/1 &&
-	>before/2 &&
-	>hello &&
-	>later/3 &&
-	git add before hello later &&
-	git commit -m world &&
-
-	H=$(git rev-parse :hello) &&
-	git rm --cached hello &&
-	echo "100644 $H 2	hello" | git update-index --index-info &&
-
-	rm -f hello &&
-	mkdir -p hello &&
-	>hello/world &&
-	test "$(git ls-files -o)" = hello/world
-
-
-[master (root-commit) 019f744] world
- Author: A U Thor <author@example.com>
- 4 files changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 before/1
- create mode 100644 before/2
- create mode 100644 hello
- create mode 100644 later/3
-rm 'hello'
-ok 1 - setup
-
-expecting success: 
-
-	git reset --hard &&
-	git ls-files --error-unmatch before/1 before/2 hello later/3 &&
-	test -f hello
-
-
-HEAD is now at 019f744 world
-before/1
-before/2
-hello
-later/3
-ok 2 - reset --hard should restore unmerged ones
-
-expecting success: 
-
-	T=$(git write-tree) &&
-	rm -f .git/index &&
-	git add before hello later &&
-	U=$(git write-tree) &&
-	test "$T" = "$U"
-
-
-ok 3 - reset --hard did not corrupt index or cached-tree
-
-# passed all 3 test(s)
-1..3
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t7103-reset-bare.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7103-reset-bare/.git/
-expecting success: 
-	echo one >file &&
-	git add file &&
-	git commit -m one &&
-	echo two >file &&
-	git commit -a -m two
-
-[master (root-commit) 4b33a2b] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-[master 84bff2f] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 1 - setup non-bare
-
-expecting success: 
-	(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: 
-	(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: 
-	(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: 
-	(cd .git && git reset)
-
-ok 5 - "mixed" reset is ok
-
-expecting success: 
-	(cd .git && git reset --soft)
-
-ok 6 - "soft" reset is ok
-
-expecting success: 
-	mkdir worktree &&
-	GIT_WORK_TREE=$PWD/worktree GIT_DIR=$PWD/.git git reset --hard &&
-	test_cmp file worktree/file
-
-HEAD is now at 84bff2f two
-ok 7 - hard reset works with GIT_WORK_TREE
-
-expecting success: 
-	git clone --bare . bare.git &&
-	cd bare.git
-
-Cloning into bare repository 'bare.git'...
-done.
-ok 8 - setup bare
-
-expecting success: 
-	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: 
-	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: 
-	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: 
-	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: 
-	git reset --soft HEAD^ &&
-	test "$(git show --pretty=format:%s | head -n 1)" = "one"
-
-ok 13 - "soft" reset is allowed in bare
-
-# passed all 13 test(s)
-1..13
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t7106-reset-unborn-branch.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7106-reset-unborn-branch/.git/
-expecting success: 
-	echo a >a &&
-	echo b >b
-
-ok 1 - setup
-
-expecting success: 
-	git add a b &&
-	git reset &&
-
-	git ls-files >actual &&
-	test_must_be_empty actual
-
-ok 2 - reset
-
-expecting success: 
-	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: 
-	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: 
-	rm .git/index &&
-	git add a &&
-	echo y >yes &&
-	git reset -p <yes >output &&
-
-	git ls-files >actual &&
-	test_must_be_empty actual &&
-	test_i18ngrep "Unstage" output
-
-Unstage this hunk [y,n,q,a,d,e,?]? 
-ok 5 - reset -p
-
-expecting success: 
-	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: 
-	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/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t6300-for-each-ref.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6300-for-each-ref/.git/
+*** t6300-for-each-ref.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6300-for-each-ref/.git/
 expecting success: 
 	setdate_and_increment &&
 	echo "Using $datestamp" > one &&
@@ -255680,8339 +256841,1894 @@
 	git commit -m "Initial" &&
 	setdate_and_increment &&
 	git tag -a -m "Tagging at $datestamp" testtag &&
-	git update-ref refs/remotes/origin/master master &&
-	git remote add origin nowhere &&
-	git config branch.master.remote origin &&
-	git config branch.master.merge refs/heads/master &&
-	git remote add myfork elsewhere &&
-	git config remote.pushdefault myfork &&
-	git config push.default current
-
-[master (root-commit) ea12284] Initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one
-ok 1 - setup
-
-expecting success: 
-		git for-each-ref --format='%(refname)' refs/heads/master >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 2 - basic atom: head refname
-
-expecting success: 
-		git for-each-ref --format='%(refname:)' refs/heads/master >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 3 - basic atom: head refname:
-
-expecting success: 
-		git for-each-ref --format='%(refname:short)' refs/heads/master >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 4 - basic atom: head refname:short
-
-expecting success: 
-		git for-each-ref --format='%(refname:lstrip=1)' refs/heads/master >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 5 - basic atom: head refname:lstrip=1
-
-expecting success: 
-		git for-each-ref --format='%(refname:lstrip=2)' refs/heads/master >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 6 - basic atom: head refname:lstrip=2
-
-expecting success: 
-		git for-each-ref --format='%(refname:lstrip=-1)' refs/heads/master >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 7 - basic atom: head refname:lstrip=-1
-
-expecting success: 
-		git for-each-ref --format='%(refname:lstrip=-2)' refs/heads/master >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 8 - basic atom: head refname:lstrip=-2
-
-expecting success: 
-		git for-each-ref --format='%(refname:rstrip=1)' refs/heads/master >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 9 - basic atom: head refname:rstrip=1
-
-expecting success: 
-		git for-each-ref --format='%(refname:rstrip=2)' refs/heads/master >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 10 - basic atom: head refname:rstrip=2
-
-expecting success: 
-		git for-each-ref --format='%(refname:rstrip=-1)' refs/heads/master >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 11 - basic atom: head refname:rstrip=-1
-
-expecting success: 
-		git for-each-ref --format='%(refname:rstrip=-2)' refs/heads/master >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 12 - basic atom: head refname:rstrip=-2
-
-expecting success: 
-		git for-each-ref --format='%(refname:strip=1)' refs/heads/master >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 13 - basic atom: head refname:strip=1
-
-expecting success: 
-		git for-each-ref --format='%(refname:strip=2)' refs/heads/master >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 14 - basic atom: head refname:strip=2
-
-expecting success: 
-		git for-each-ref --format='%(refname:strip=-1)' refs/heads/master >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 15 - basic atom: head refname:strip=-1
-
-expecting success: 
-		git for-each-ref --format='%(refname:strip=-2)' refs/heads/master >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 16 - basic atom: head refname:strip=-2
-
-expecting success: 
-		git for-each-ref --format='%(upstream)' refs/heads/master >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 17 - basic atom: head upstream
-
-expecting success: 
-		git for-each-ref --format='%(upstream:short)' refs/heads/master >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 18 - basic atom: head upstream:short
-
-expecting success: 
-		git for-each-ref --format='%(upstream:lstrip=2)' refs/heads/master >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 19 - basic atom: head upstream:lstrip=2
-
-expecting success: 
-		git for-each-ref --format='%(upstream:lstrip=-2)' refs/heads/master >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 20 - basic atom: head upstream:lstrip=-2
-
-expecting success: 
-		git for-each-ref --format='%(upstream:rstrip=2)' refs/heads/master >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 21 - basic atom: head upstream:rstrip=2
-
-expecting success: 
-		git for-each-ref --format='%(upstream:rstrip=-2)' refs/heads/master >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 22 - basic atom: head upstream:rstrip=-2
-
-expecting success: 
-		git for-each-ref --format='%(upstream:strip=2)' refs/heads/master >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 23 - basic atom: head upstream:strip=2
-
-expecting success: 
-		git for-each-ref --format='%(upstream:strip=-2)' refs/heads/master >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 24 - basic atom: head upstream:strip=-2
-
-expecting success: 
-		git for-each-ref --format='%(push)' refs/heads/master >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 25 - basic atom: head push
-
-expecting success: 
-		git for-each-ref --format='%(push:short)' refs/heads/master >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 26 - basic atom: head push:short
-
-expecting success: 
-		git for-each-ref --format='%(push:lstrip=1)' refs/heads/master >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 27 - basic atom: head push:lstrip=1
-
-expecting success: 
-		git for-each-ref --format='%(push:lstrip=-1)' refs/heads/master >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 28 - basic atom: head push:lstrip=-1
-
-expecting success: 
-		git for-each-ref --format='%(push:rstrip=1)' refs/heads/master >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 29 - basic atom: head push:rstrip=1
-
-expecting success: 
-		git for-each-ref --format='%(push:rstrip=-1)' refs/heads/master >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 30 - basic atom: head push:rstrip=-1
-
-expecting success: 
-		git for-each-ref --format='%(push:strip=1)' refs/heads/master >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 31 - basic atom: head push:strip=1
-
-expecting success: 
-		git for-each-ref --format='%(push:strip=-1)' refs/heads/master >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 32 - basic atom: head push:strip=-1
-
-expecting success: 
-		git for-each-ref --format='%(objecttype)' refs/heads/master >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 33 - basic atom: head objecttype
-
-expecting success: 
-		git for-each-ref --format='%(objectsize)' refs/heads/master >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 34 - basic atom: head objectsize
-
-expecting success: 
-		git for-each-ref --format='%(objectname)' refs/heads/master >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 35 - basic atom: head objectname
-
-expecting success: 
-		git for-each-ref --format='%(objectname:short)' refs/heads/master >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 36 - basic atom: head objectname:short
-
-expecting success: 
-		git for-each-ref --format='%(objectname:short=1)' refs/heads/master >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 37 - basic atom: head objectname:short=1
-
-expecting success: 
-		git for-each-ref --format='%(objectname:short=10)' refs/heads/master >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 38 - basic atom: head objectname:short=10
-
-expecting success: 
-		git for-each-ref --format='%(tree)' refs/heads/master >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 39 - basic atom: head tree
-
-expecting success: 
-		git for-each-ref --format='%(parent)' refs/heads/master >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 40 - basic atom: head parent
-
-expecting success: 
-		git for-each-ref --format='%(numparent)' refs/heads/master >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 41 - basic atom: head numparent
-
-expecting success: 
-		git for-each-ref --format='%(object)' refs/heads/master >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 42 - basic atom: head object
-
-expecting success: 
-		git for-each-ref --format='%(type)' refs/heads/master >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 43 - basic atom: head type
-
-expecting success: 
-		git for-each-ref --format='%(*objectname)' refs/heads/master >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 44 - basic atom: head *objectname
-
-expecting success: 
-		git for-each-ref --format='%(*objecttype)' refs/heads/master >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 45 - basic atom: head *objecttype
-
-expecting success: 
-		git for-each-ref --format='%(author)' refs/heads/master >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 46 - basic atom: head author
-
-expecting success: 
-		git for-each-ref --format='%(authorname)' refs/heads/master >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 47 - basic atom: head authorname
-
-expecting success: 
-		git for-each-ref --format='%(authoremail)' refs/heads/master >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 48 - basic atom: head authoremail
-
-expecting success: 
-		git for-each-ref --format='%(authordate)' refs/heads/master >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 49 - basic atom: head authordate
-
-expecting success: 
-		git for-each-ref --format='%(committer)' refs/heads/master >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 50 - basic atom: head committer
-
-expecting success: 
-		git for-each-ref --format='%(committername)' refs/heads/master >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 51 - basic atom: head committername
-
-expecting success: 
-		git for-each-ref --format='%(committeremail)' refs/heads/master >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 52 - basic atom: head committeremail
-
-expecting success: 
-		git for-each-ref --format='%(committerdate)' refs/heads/master >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 53 - basic atom: head committerdate
-
-expecting success: 
-		git for-each-ref --format='%(tag)' refs/heads/master >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 54 - basic atom: head tag
-
-expecting success: 
-		git for-each-ref --format='%(tagger)' refs/heads/master >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 55 - basic atom: head tagger
-
-expecting success: 
-		git for-each-ref --format='%(taggername)' refs/heads/master >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 56 - basic atom: head taggername
-
-expecting success: 
-		git for-each-ref --format='%(taggeremail)' refs/heads/master >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 57 - basic atom: head taggeremail
-
-expecting success: 
-		git for-each-ref --format='%(taggerdate)' refs/heads/master >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 58 - basic atom: head taggerdate
-
-expecting success: 
-		git for-each-ref --format='%(creator)' refs/heads/master >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 59 - basic atom: head creator
-
-expecting success: 
-		git for-each-ref --format='%(creatordate)' refs/heads/master >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 60 - basic atom: head creatordate
-
-expecting success: 
-		git for-each-ref --format='%(subject)' refs/heads/master >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 61 - basic atom: head subject
-
-expecting success: 
-		git for-each-ref --format='%(contents:subject)' refs/heads/master >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 62 - basic atom: head contents:subject
-
-expecting success: 
-		git for-each-ref --format='%(body)' refs/heads/master >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 63 - basic atom: head body
-
-expecting success: 
-		git for-each-ref --format='%(contents:body)' refs/heads/master >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 64 - basic atom: head contents:body
-
-expecting success: 
-		git for-each-ref --format='%(contents:signature)' refs/heads/master >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 65 - basic atom: head contents:signature
-
-expecting success: 
-		git for-each-ref --format='%(contents)' refs/heads/master >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 66 - basic atom: head contents
-
-expecting success: 
-		git for-each-ref --format='%(HEAD)' refs/heads/master >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 67 - basic atom: head HEAD
-
-expecting success: 
-		git for-each-ref --format='%(refname)' refs/tags/testtag >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 68 - basic atom: tag refname
-
-expecting success: 
-		git for-each-ref --format='%(refname:short)' refs/tags/testtag >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 69 - basic atom: tag refname:short
-
-expecting success: 
-		git for-each-ref --format='%(upstream)' refs/tags/testtag >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 70 - basic atom: tag upstream
-
-expecting success: 
-		git for-each-ref --format='%(push)' refs/tags/testtag >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 71 - basic atom: tag push
-
-expecting success: 
-		git for-each-ref --format='%(objecttype)' refs/tags/testtag >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 72 - basic atom: tag objecttype
-
-expecting success: 
-		git for-each-ref --format='%(objectsize)' refs/tags/testtag >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 73 - basic atom: tag objectsize
-
-expecting success: 
-		git for-each-ref --format='%(objectname)' refs/tags/testtag >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 74 - basic atom: tag objectname
-
-expecting success: 
-		git for-each-ref --format='%(objectname:short)' refs/tags/testtag >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 75 - basic atom: tag objectname:short
-
-expecting success: 
-		git for-each-ref --format='%(objectname:short=1)' refs/heads/master >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 76 - basic atom: head objectname:short=1
-
-expecting success: 
-		git for-each-ref --format='%(objectname:short=10)' refs/heads/master >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 77 - basic atom: head objectname:short=10
-
-expecting success: 
-		git for-each-ref --format='%(tree)' refs/tags/testtag >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 78 - basic atom: tag tree
-
-expecting success: 
-		git for-each-ref --format='%(parent)' refs/tags/testtag >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 79 - basic atom: tag parent
-
-expecting success: 
-		git for-each-ref --format='%(numparent)' refs/tags/testtag >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 80 - basic atom: tag numparent
-
-expecting success: 
-		git for-each-ref --format='%(object)' refs/tags/testtag >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 81 - basic atom: tag object
-
-expecting success: 
-		git for-each-ref --format='%(type)' refs/tags/testtag >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 82 - basic atom: tag type
-
-expecting success: 
-		git for-each-ref --format='%(*objectname)' refs/tags/testtag >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 83 - basic atom: tag *objectname
-
-expecting success: 
-		git for-each-ref --format='%(*objecttype)' refs/tags/testtag >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 84 - basic atom: tag *objecttype
-
-expecting success: 
-		git for-each-ref --format='%(author)' refs/tags/testtag >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 85 - basic atom: tag author
-
-expecting success: 
-		git for-each-ref --format='%(authorname)' refs/tags/testtag >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 86 - basic atom: tag authorname
-
-expecting success: 
-		git for-each-ref --format='%(authoremail)' refs/tags/testtag >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 87 - basic atom: tag authoremail
-
-expecting success: 
-		git for-each-ref --format='%(authordate)' refs/tags/testtag >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 88 - basic atom: tag authordate
-
-expecting success: 
-		git for-each-ref --format='%(committer)' refs/tags/testtag >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 89 - basic atom: tag committer
-
-expecting success: 
-		git for-each-ref --format='%(committername)' refs/tags/testtag >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 90 - basic atom: tag committername
-
-expecting success: 
-		git for-each-ref --format='%(committeremail)' refs/tags/testtag >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 91 - basic atom: tag committeremail
-
-expecting success: 
-		git for-each-ref --format='%(committerdate)' refs/tags/testtag >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 92 - basic atom: tag committerdate
-
-expecting success: 
-		git for-each-ref --format='%(tag)' refs/tags/testtag >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 93 - basic atom: tag tag
-
-expecting success: 
-		git for-each-ref --format='%(tagger)' refs/tags/testtag >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 94 - basic atom: tag tagger
-
-expecting success: 
-		git for-each-ref --format='%(taggername)' refs/tags/testtag >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 95 - basic atom: tag taggername
-
-expecting success: 
-		git for-each-ref --format='%(taggeremail)' refs/tags/testtag >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 96 - basic atom: tag taggeremail
-
-expecting success: 
-		git for-each-ref --format='%(taggerdate)' refs/tags/testtag >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 97 - basic atom: tag taggerdate
-
-expecting success: 
-		git for-each-ref --format='%(creator)' refs/tags/testtag >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 98 - basic atom: tag creator
-
-expecting success: 
-		git for-each-ref --format='%(creatordate)' refs/tags/testtag >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 99 - basic atom: tag creatordate
-
-expecting success: 
-		git for-each-ref --format='%(subject)' refs/tags/testtag >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 100 - basic atom: tag subject
-
-expecting success: 
-		git for-each-ref --format='%(contents:subject)' refs/tags/testtag >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 101 - basic atom: tag contents:subject
-
-expecting success: 
-		git for-each-ref --format='%(body)' refs/tags/testtag >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 102 - basic atom: tag body
-
-expecting success: 
-		git for-each-ref --format='%(contents:body)' refs/tags/testtag >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 103 - basic atom: tag contents:body
-
-expecting success: 
-		git for-each-ref --format='%(contents:signature)' refs/tags/testtag >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 104 - basic atom: tag contents:signature
-
-expecting success: 
-		git for-each-ref --format='%(contents)' refs/tags/testtag >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 105 - basic atom: tag contents
-
-expecting success: 
-		git for-each-ref --format='%(HEAD)' refs/tags/testtag >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 106 - basic atom: tag HEAD
-
-expecting success: 
-	test_must_fail git for-each-ref --format="%(INVALID)" refs/heads
-
-fatal: unknown field name: INVALID
-ok 107 - Check invalid atoms names are errors
-
-expecting success: 
-	git for-each-ref --format="%(authordate)" refs/heads &&
-	git for-each-ref --format="%(authordate:default) %(authordate)" refs/heads &&
-	git for-each-ref --format="%(authordate) %(authordate:default)" refs/heads &&
-	git for-each-ref --format="%(authordate:default) %(authordate:default)" refs/heads
-
-Tue Jul 4 01:18:44 2006 +0200
-Tue Jul 4 01:18:44 2006 +0200 Tue Jul 4 01:18:44 2006 +0200
-Tue Jul 4 01:18:44 2006 +0200 Tue Jul 4 01:18:44 2006 +0200
-Tue Jul 4 01:18:44 2006 +0200 Tue Jul 4 01:18:44 2006 +0200
-ok 108 - Check format specifiers are ignored in naming date atoms
-
-expecting success: 
-	git for-each-ref --format="%(authordate:default)" refs/heads &&
-	git for-each-ref --format="%(authordate:relative)" refs/heads &&
-	git for-each-ref --format="%(authordate:short)" refs/heads &&
-	git for-each-ref --format="%(authordate:local)" refs/heads &&
-	git for-each-ref --format="%(authordate:iso8601)" refs/heads &&
-	git for-each-ref --format="%(authordate:rfc2822)" refs/heads
-
-Tue Jul 4 01:18:44 2006 +0200
-15 years ago
-2006-07-04
-Mon Jul 3 23:18:44 2006
-2006-07-04 01:18:44 +0200
-Tue, 4 Jul 2006 01:18:44 +0200
-ok 109 - Check valid format specifiers for date fields
-
-expecting success: 
-	test_must_fail git for-each-ref --format="%(authordate:INVALID)" refs/heads
-
-fatal: unknown date format INVALID
-ok 110 - Check invalid format specifiers are errors
-
-expecting success: 
-	test_must_fail git for-each-ref --format="%(objectname:short=0)" &&
-	test_must_fail git for-each-ref --format="%(objectname:short=-1)" &&
-	test_must_fail git for-each-ref --format="%(objectname:short=foo)"
-
-fatal: positive value expected objectname:short=0
-fatal: positive value expected objectname:short=-1
-fatal: positive value expected objectname:short=foo
-ok 111 - arguments to %(objectname:short=) must be positive integers
-
-expecting success: 
-	test_date "" \
-		"Tue Jul 4 01:18:43 2006 +0200" \
-		"Tue Jul 4 01:18:44 2006 +0200" \
-		"Tue Jul 4 01:18:45 2006 +0200"
-
-ok 112 - Check unformatted date fields output
-
-expecting success: 
-	test_date default \
-		"Tue Jul 4 01:18:43 2006 +0200" \
-		"Tue Jul 4 01:18:44 2006 +0200" \
-		"Tue Jul 4 01:18:45 2006 +0200"
-
-ok 113 - Check format "default" formatted date fields output
-
-expecting success: 
-	test_date default-local "Mon Jul 3 23:18:43 2006" "Mon Jul 3 23:18:44 2006" "Mon Jul 3 23:18:45 2006"
-
-ok 114 - Check format "default-local" date fields output
-
-expecting success: 
-	f=relative &&
-	(git for-each-ref --shell --format="%(refname) %(committerdate:$f) %(authordate:$f)" refs/heads &&
-	git for-each-ref --shell --format="%(refname) %(taggerdate:$f)" refs/tags) >actual
-
-ok 115 - Check format "relative" date fields output
-
-expecting success: 
-	test_date relative-local \
-		"$(git for-each-ref --format="%(committerdate:relative)" refs/heads)" \
-		"$(git for-each-ref --format="%(authordate:relative)" refs/heads)" \
-		"$(git for-each-ref --format="%(taggerdate:relative)" refs/tags)"
-
-ok 116 - Check format "relative-local" date fields output
-
-expecting success: 
-	test_date short 2006-07-04 2006-07-04 2006-07-04
-
-ok 117 - Check format "short" date fields output
-
-expecting success: 
-	test_date short-local 2006-07-03 2006-07-03 2006-07-03
-
-ok 118 - Check format "short-local" date fields output
-
-expecting success: 
-	test_date local \
-		"Mon Jul 3 23:18:43 2006" \
-		"Mon Jul 3 23:18:44 2006" \
-		"Mon Jul 3 23:18:45 2006"
-
-ok 119 - Check format "local" date fields output
-
-expecting success: 
-	test_date iso8601 \
-		"2006-07-04 01:18:43 +0200" \
-		"2006-07-04 01:18:44 +0200" \
-		"2006-07-04 01:18:45 +0200"
-
-ok 120 - Check format "iso8601" date fields output
-
-expecting success: 
-	test_date iso8601-local "2006-07-03 23:18:43 +0000" "2006-07-03 23:18:44 +0000" "2006-07-03 23:18:45 +0000"
-
-ok 121 - Check format "iso8601-local" date fields output
-
-expecting success: 
-	test_date rfc2822 \
-		"Tue, 4 Jul 2006 01:18:43 +0200" \
-		"Tue, 4 Jul 2006 01:18:44 +0200" \
-		"Tue, 4 Jul 2006 01:18:45 +0200"
-
-ok 122 - Check format "rfc2822" date fields output
-
-expecting success: 
-	test_date rfc2822-local "Mon, 3 Jul 2006 23:18:43 +0000" "Mon, 3 Jul 2006 23:18:44 +0000" "Mon, 3 Jul 2006 23:18:45 +0000"
-
-ok 123 - Check format "rfc2822-local" date fields output
-
-expecting success: 
-	test_date raw "1151968723 +0200" "1151968724 +0200" "1151968725 +0200"
-
-ok 124 - Check format "raw" date fields output
-
-expecting success: 
-	test_date raw-local "1151968723 +0000" "1151968724 +0000" "1151968725 +0000"
-
-ok 125 - Check format "raw-local" date fields output
-
-expecting success: 
-	echo "my date is 2006-07-04" >expected &&
-	git for-each-ref \
-	  --format="%(authordate:format:my date is %Y-%m-%d)" \
-	  refs/heads >actual &&
-	test_cmp expected actual
-
-ok 126 - Check format of strftime date fields
-
-expecting success: 
-	echo "my date is 2006-07-03" >expected &&
-	git for-each-ref \
-	  --format="%(authordate:format-local:my date is %Y-%m-%d)" \
-	  refs/heads >actual &&
-	test_cmp expected actual
-
-ok 127 - Check format of strftime-local date fields
-
-expecting success: 
-	echo >expected &&
-	git for-each-ref --format="%(authordate:format:)" refs/heads >actual &&
-	test_cmp expected actual &&
-	long="long format -- $ZERO_OID$ZERO_OID$ZERO_OID$ZERO_OID$ZERO_OID$ZERO_OID$ZERO_OID" &&
-	echo $long >expected &&
-	git for-each-ref --format="%(authordate:format:$long)" refs/heads >actual &&
-	test_cmp expected actual
-
-ok 128 - exercise strftime with odd fields
-
-expecting success: 
-	git for-each-ref --format="%(refname)" --sort=refname >actual &&
-	test_cmp expected actual
-
-ok 129 - Verify ascending sort
-
-expecting success: 
-	git for-each-ref --format="%(refname)" --sort=-refname >actual &&
-	test_cmp expected actual
-
-ok 130 - Verify descending sort
-
-expecting success: 
-	git for-each-ref --shell --format="%(refname)" >actual &&
-	test_cmp expected actual
-
-ok 131 - Quoting style: shell
-
-expecting success: 
-	git for-each-ref --perl --format="%(refname)" >actual &&
-	test_cmp expected actual
-
-ok 132 - Quoting style: perl
-
-expecting success: 
-	git for-each-ref --python --format="%(refname)" >actual &&
-	test_cmp expected actual
-
-ok 133 - Quoting style: python
-
-expecting success: 
-	git for-each-ref --tcl --format="%(refname)" >actual &&
-	test_cmp expected actual
-
-ok 134 - Quoting style: tcl
-
-expecting success: 
-		test_must_fail git for-each-ref --perl --shell 2>err &&
-		grep '^error: more than one quoting style' err
-	
-error: more than one quoting style?
-ok 135 - more than one quoting style: --perl --shell
-
-expecting success: 
-		test_must_fail git for-each-ref -s --python 2>err &&
-		grep '^error: more than one quoting style' err
-	
-error: more than one quoting style?
-ok 136 - more than one quoting style: -s --python
-
-expecting success: 
-		test_must_fail git for-each-ref --python --tcl 2>err &&
-		grep '^error: more than one quoting style' err
-	
-error: more than one quoting style?
-ok 137 - more than one quoting style: --python --tcl
-
-expecting success: 
-		test_must_fail git for-each-ref --tcl --perl 2>err &&
-		grep '^error: more than one quoting style' err
-	
-error: more than one quoting style?
-ok 138 - more than one quoting style: --tcl --perl
-
-expecting success: 
-	test_commit two
-
-[master 4ddde45] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-ok 139 - setup for upstream:track[short]
-
-expecting success: 
-		git for-each-ref --format='%(upstream:track)' refs/heads/master >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 140 - basic atom: head upstream:track
-
-expecting success: 
-		git for-each-ref --format='%(upstream:trackshort)' refs/heads/master >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 141 - basic atom: head upstream:trackshort
-
-expecting success: 
-		git for-each-ref --format='%(upstream:track,nobracket)' refs/heads/master >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 142 - basic atom: head upstream:track,nobracket
-
-expecting success: 
-		git for-each-ref --format='%(upstream:nobracket,track)' refs/heads/master >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 143 - basic atom: head upstream:nobracket,track
-
-expecting success: 
-		git for-each-ref --format='%(push:track)' refs/heads/master >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 144 - basic atom: head push:track
-
-expecting success: 
-		git for-each-ref --format='%(push:trackshort)' refs/heads/master >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 145 - basic atom: head push:trackshort
-
-expecting success: 
-	test_must_fail git for-each-ref --format="%(refname:track)" 2>/dev/null &&
-	test_must_fail git for-each-ref --format="%(refname:trackshort)" 2>/dev/null
-
-ok 146 - Check that :track[short] cannot be used with other atoms
-
-expecting success: 
-	cat >expected <<-\EOF &&
-	[gone]
-
-	EOF
-	test_when_finished "git config branch.master.merge refs/heads/master" &&
-	git config branch.master.merge refs/heads/does-not-exist &&
-	git for-each-ref \
-		--format="%(upstream:track)$LF%(upstream:trackshort)" \
-		refs/heads >actual &&
-	test_cmp expected actual
-
-ok 147 - Check that :track[short] works when upstream is invalid
-
-expecting success: 
-	test_must_fail git for-each-ref --format="%(refname:INVALID)"
-
-fatal: unrecognized %(refname:INVALID) argument: INVALID
-ok 148 - Check for invalid refname format
-
-expecting success: 
-	cat >expected.color <<-EOF &&
-	$(git rev-parse --short refs/heads/master) <GREEN>master<RESET>
-	$(git rev-parse --short refs/remotes/origin/master) <GREEN>origin/master<RESET>
-	$(git rev-parse --short refs/tags/testtag) <GREEN>testtag<RESET>
-	$(git rev-parse --short refs/tags/two) <GREEN>two<RESET>
-	EOF
-	sed "s/<[^>]*>//g" <expected.color >expected.bare &&
-	color_format="%(objectname:short) %(color:green)%(refname:short)"
-
-ok 149 - set up color tests
-
-checking prerequisite: TTY
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
-	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: 
-	test_terminal git for-each-ref --format="$color_format" >actual.raw &&
-	test_decode_color <actual.raw >actual &&
-	test_cmp expected.color actual
-
-ok 150 - %(color) shows color with a tty
-
-expecting success: 
-	TERM=vt100 git for-each-ref --format="$color_format" >actual &&
-	test_cmp expected.bare actual
-
-ok 151 - %(color) does not show color without tty
-
-expecting success: 
-	git for-each-ref --color --format="$color_format" >actual.raw &&
-	test_decode_color <actual.raw >actual &&
-	test_cmp expected.color actual
-
-ok 152 - --color can override tty check
-
-expecting success: 
-	git -c color.ui=always for-each-ref --format="$color_format" >actual &&
-	test_cmp expected.bare actual
-
-ok 153 - color.ui=always does not override tty check
-
-expecting success: 
-	git config --bool core.warnambiguousrefs true &&
-	git checkout -b newtag &&
-	echo "Using $datestamp" > one &&
-	git add one &&
-	git commit -m "Branch" &&
-	setdate_and_increment &&
-	git tag -m "Tagging at $datestamp" master &&
-	git for-each-ref --format "%(refname:short)" refs/heads/master refs/tags/master >actual &&
-	test_cmp expected actual
-
-Switched to a new branch 'newtag'
-[newtag b5aa6dc] Branch
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 154 - Check ambiguous head and tag refs (strict)
-
-expecting success: 
-	git config --bool core.warnambiguousrefs false &&
-	git for-each-ref --format "%(refname:short)" refs/heads/master refs/tags/master >actual &&
-	test_cmp expected actual
-
-ok 155 - Check ambiguous head and tag refs (loose)
-
-expecting success: 
-	git checkout master &&
-	git tag ambiguous testtag^0 &&
-	git branch ambiguous testtag^0 &&
-	git for-each-ref --format "%(refname:short)" refs/heads/ambiguous refs/tags/ambiguous >actual &&
-	test_cmp expected actual
-
-Switched to branch 'master'
-Your branch is ahead of 'origin/master' by 1 commit.
-  (use "git push" to publish your local commits)
-ok 156 - Check ambiguous head and tag refs II (loose)
-
-expecting success: 
-
-	git tag -m "bogo" bogo &&
-	bogo=$(git cat-file tag bogo) &&
-	bogo=$(printf "%s" "$bogo" | git mktag) &&
-	git tag -f bogo "$bogo" &&
-	git for-each-ref --format "%(body)" refs/tags/bogo
-
-
-Updated tag 'bogo' (was 89437ea)
-
-ok 157 - an unusual tag with an incomplete line
-
-expecting success: 
-	cat >>msg <<-\EOF &&
-		the subject line
-
-		first body line
-		second body line
-	EOF
-	git tag -F msg subject-body
-
-ok 158 - create tag with subject and body content
-
-expecting success: 
-		git for-each-ref --format='%(subject)' refs/tags/subject-body >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 159 - basic atom: refs/tags/subject-body subject
-
-expecting success: 
-		git for-each-ref --format='%(body)' refs/tags/subject-body >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 160 - basic atom: refs/tags/subject-body body
-
-expecting success: 
-		git for-each-ref --format='%(contents)' refs/tags/subject-body >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 161 - basic atom: refs/tags/subject-body contents
-
-expecting success: 
-	cat >msg <<-\EOF &&
-		first subject line
-		second subject line
-
-		first body line
-		second body line
-	EOF
-	git tag -F msg multiline
-
-ok 162 - create tag with multiline subject
-
-expecting success: 
-		git for-each-ref --format='%(subject)' refs/tags/multiline >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 163 - basic atom: refs/tags/multiline subject
-
-expecting success: 
-		git for-each-ref --format='%(contents:subject)' refs/tags/multiline >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 164 - basic atom: refs/tags/multiline contents:subject
-
-expecting success: 
-		git for-each-ref --format='%(body)' refs/tags/multiline >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 165 - basic atom: refs/tags/multiline body
-
-expecting success: 
-		git for-each-ref --format='%(contents:body)' refs/tags/multiline >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 166 - basic atom: refs/tags/multiline contents:body
-
-expecting success: 
-		git for-each-ref --format='%(contents:signature)' refs/tags/multiline >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 167 - basic atom: refs/tags/multiline contents:signature
-
-expecting success: 
-		git for-each-ref --format='%(contents)' refs/tags/multiline >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 168 - basic atom: refs/tags/multiline contents
-
-skipping test: create signed tags 
-	git tag -s -m "" signed-empty &&
-	git tag -s -m "subject line" signed-short &&
-	cat >msg <<-\EOF &&
-	subject line
-
-	body contents
-	EOF
-	git tag -s -F msg signed-long
-
-ok 169 # skip create signed tags (missing GPG)
-
-skipping test: basic atom: refs/tags/signed-empty subject 
-		git for-each-ref --format='%(subject)' refs/tags/signed-empty >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 170 # skip basic atom: refs/tags/signed-empty subject (missing GPG)
-
-skipping test: basic atom: refs/tags/signed-empty contents:subject 
-		git for-each-ref --format='%(contents:subject)' refs/tags/signed-empty >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 171 # skip basic atom: refs/tags/signed-empty contents:subject (missing GPG)
-
-skipping test: basic atom: refs/tags/signed-empty body 
-		git for-each-ref --format='%(body)' refs/tags/signed-empty >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 172 # skip basic atom: refs/tags/signed-empty body (missing GPG)
-
-skipping test: basic atom: refs/tags/signed-empty contents:body 
-		git for-each-ref --format='%(contents:body)' refs/tags/signed-empty >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 173 # skip basic atom: refs/tags/signed-empty contents:body (missing GPG)
-
-skipping test: basic atom: refs/tags/signed-empty contents:signature 
-		git for-each-ref --format='%(contents:signature)' refs/tags/signed-empty >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 174 # skip basic atom: refs/tags/signed-empty contents:signature (missing GPG)
-
-skipping test: basic atom: refs/tags/signed-empty contents 
-		git for-each-ref --format='%(contents)' refs/tags/signed-empty >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 175 # skip basic atom: refs/tags/signed-empty contents (missing GPG)
-
-skipping test: basic atom: refs/tags/signed-short subject 
-		git for-each-ref --format='%(subject)' refs/tags/signed-short >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 176 # skip basic atom: refs/tags/signed-short subject (missing GPG)
-
-skipping test: basic atom: refs/tags/signed-short contents:subject 
-		git for-each-ref --format='%(contents:subject)' refs/tags/signed-short >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 177 # skip basic atom: refs/tags/signed-short contents:subject (missing GPG)
-
-skipping test: basic atom: refs/tags/signed-short body 
-		git for-each-ref --format='%(body)' refs/tags/signed-short >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 178 # skip basic atom: refs/tags/signed-short body (missing GPG)
-
-skipping test: basic atom: refs/tags/signed-short contents:body 
-		git for-each-ref --format='%(contents:body)' refs/tags/signed-short >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 179 # skip basic atom: refs/tags/signed-short contents:body (missing GPG)
-
-skipping test: basic atom: refs/tags/signed-short contents:signature 
-		git for-each-ref --format='%(contents:signature)' refs/tags/signed-short >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 180 # skip basic atom: refs/tags/signed-short contents:signature (missing GPG)
-
-skipping test: basic atom: refs/tags/signed-short contents 
-		git for-each-ref --format='%(contents)' refs/tags/signed-short >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 181 # skip basic atom: refs/tags/signed-short contents (missing GPG)
-
-skipping test: basic atom: refs/tags/signed-long subject 
-		git for-each-ref --format='%(subject)' refs/tags/signed-long >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 182 # skip basic atom: refs/tags/signed-long subject (missing GPG)
-
-skipping test: basic atom: refs/tags/signed-long contents:subject 
-		git for-each-ref --format='%(contents:subject)' refs/tags/signed-long >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 183 # skip basic atom: refs/tags/signed-long contents:subject (missing GPG)
-
-skipping test: basic atom: refs/tags/signed-long body 
-		git for-each-ref --format='%(body)' refs/tags/signed-long >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 184 # skip basic atom: refs/tags/signed-long body (missing GPG)
-
-skipping test: basic atom: refs/tags/signed-long contents:body 
-		git for-each-ref --format='%(contents:body)' refs/tags/signed-long >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 185 # skip basic atom: refs/tags/signed-long contents:body (missing GPG)
-
-skipping test: basic atom: refs/tags/signed-long contents:signature 
-		git for-each-ref --format='%(contents:signature)' refs/tags/signed-long >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 186 # skip basic atom: refs/tags/signed-long contents:signature (missing GPG)
-
-skipping test: basic atom: refs/tags/signed-long contents 
-		git for-each-ref --format='%(contents)' refs/tags/signed-long >actual &&
-		sanitize_pgp <actual >actual.clean &&
-		test_cmp expected actual.clean
-	
-ok 187 # skip basic atom: refs/tags/signed-long contents (missing GPG)
-
-expecting success: 
-	git for-each-ref --format="%(objectname) %(taggeremail) %(refname)" --sort=objectname --sort=taggeremail \
-		refs/tags/bogo refs/tags/master > actual &&
-	test_cmp expected actual
-
-ok 188 - Verify sort with multiple keys
-
-expecting success: 
-	test_when_finished "git checkout master" &&
-	git for-each-ref --format="%(HEAD) %(refname:short)" refs/heads/ >actual &&
-	sed -e "s/^\* /  /" actual >expect &&
-	git checkout --orphan orphaned-branch &&
-	git for-each-ref --format="%(HEAD) %(refname:short)" refs/heads/ >actual &&
-	test_cmp expect actual
-
-Switched to a new branch 'orphaned-branch'
-Switched to branch 'master'
-Your branch is ahead of 'origin/master' by 1 commit.
-  (use "git push" to publish your local commits)
-ok 189 - do not dereference NULL upon %(HEAD) on unborn branch
-
-expecting success: 
-	echo "Some contents" > two &&
-	git add two &&
-	git commit -F - <<-EOF
-	trailers: this commit message has trailers
-
-	Some message contents
-
-	$(cat trailers)
-	EOF
-
-[master 36c72cc] trailers: this commit message has trailers
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 two
-ok 190 - set up trailers for next test
-
-expecting success: 
-	git for-each-ref --format="%(trailers:unfold)" refs/heads/master >actual &&
-	{
-		unfold <trailers
-		echo
-	} >expect &&
-	test_cmp expect actual
-
-ok 191 - %(trailers:unfold) unfolds trailers
-
-expecting success: 
-	git for-each-ref --format="%(trailers:only)" refs/heads/master >actual &&
-	{
-		grep -v patch.description <trailers &&
-		echo
-	} >expect &&
-	test_cmp expect actual
-
-ok 192 - %(trailers:only) shows only "key: value" trailers
-
-expecting success: 
-	git for-each-ref --format="%(trailers:only,unfold)" refs/heads/master >actual &&
-	git for-each-ref --format="%(trailers:unfold,only)" refs/heads/master >reverse &&
-	test_cmp actual reverse &&
-	{
-		grep -v patch.description <trailers | unfold &&
-		echo
-	} >expect &&
-	test_cmp expect actual
-
-ok 193 - %(trailers:only) and %(trailers:unfold) work together
-
-expecting success: 
-	git for-each-ref --format="%(contents:trailers:unfold)" refs/heads/master >actual &&
-	{
-		unfold <trailers
-		echo
-	} >expect &&
-	test_cmp expect actual
-
-ok 194 - %(contents:trailers:unfold) unfolds trailers
-
-expecting success: 
-	git for-each-ref --format="%(contents:trailers:only)" refs/heads/master >actual &&
-	{
-		grep -v patch.description <trailers &&
-		echo
-	} >expect &&
-	test_cmp expect actual
-
-ok 195 - %(contents:trailers:only) shows only "key: value" trailers
-
-expecting success: 
-	git for-each-ref --format="%(contents:trailers:only,unfold)" refs/heads/master >actual &&
-	git for-each-ref --format="%(contents:trailers:unfold,only)" refs/heads/master >reverse &&
-	test_cmp actual reverse &&
-	{
-		grep -v patch.description <trailers | unfold &&
-		echo
-	} >expect &&
-	test_cmp expect actual
-
-ok 196 - %(contents:trailers:only) and %(contents:trailers:unfold) work together
-
-expecting success: 
-	# error message cannot be checked under i18n
-	cat >expect <<-EOF &&
-	fatal: unknown %(trailers) argument: unsupported
-	EOF
-	test_must_fail git for-each-ref --format="%(trailers:unsupported)" 2>actual &&
-	test_i18ncmp expect actual
-
-ok 197 - %(trailers) rejects unknown trailers arguments
-
-expecting success: 
-	# error message cannot be checked under i18n
-	cat >expect <<-EOF &&
-	fatal: unknown %(trailers) argument: unsupported
-	EOF
-	test_must_fail git for-each-ref --format="%(contents:trailers:unsupported)" 2>actual &&
-	test_i18ncmp expect actual
-
-ok 198 - %(contents:trailers) rejects unknown trailers arguments
-
-expecting success: 
-	git for-each-ref --format="%(contents:trailers)" refs/heads/master >actual &&
-	sanitize_pgp <actual >actual.clean &&
-	# git for-each-ref ends with a blank line
-	cat >expect <<-EOF &&
-	$(cat trailers)
-
-	EOF
-	test_cmp expect actual.clean
-
-ok 199 - basic atom: head contents:trailers
-
-expecting success: 
-	git commit --allow-empty -F - <<-\EOF &&
-	this is the subject
-
-	This is the body. The message has a "---" line which would confuse a
-	message+patch parser. But here we know we have only a commit message,
-	so we get it right.
-
-	trailer: wrong
-	---
-	This is more body.
-
-	trailer: right
-	EOF
-
-	{
-		echo "trailer: right" &&
-		echo
-	} >expect &&
-	git for-each-ref --format="%(trailers)" refs/heads/master >actual &&
-	test_cmp expect actual
-
-[master 162c31a] this is the subject
- Author: A U Thor <author@example.com>
-ok 200 - trailer parsing not fooled by --- line
-
-expecting success: 
-	git symbolic-ref refs/heads/sym refs/heads/master
-
-ok 201 - Add symbolic ref for the following tests
-
-expecting success: 
-	git for-each-ref --format="%(symref)" refs/heads/sym >actual &&
-	test_cmp expected actual
-
-ok 202 - Verify usage of %(symref) atom
-
-expecting success: 
-	git for-each-ref --format="%(symref:short)" refs/heads/sym >actual &&
-	test_cmp expected actual
-
-ok 203 - Verify usage of %(symref:short) atom
-
-expecting success: 
-	git for-each-ref --format="%(symref:lstrip=2)" refs/heads/sym > actual &&
-	git for-each-ref --format="%(symref:lstrip=-2)" refs/heads/sym >> actual &&
-	test_cmp expected actual &&
-
-	git for-each-ref --format="%(symref:strip=2)" refs/heads/sym > actual &&
-	git for-each-ref --format="%(symref:strip=-2)" refs/heads/sym >> actual &&
-	test_cmp expected actual
-
-ok 204 - Verify usage of %(symref:lstrip) atom
-
-expecting success: 
-	git for-each-ref --format="%(symref:rstrip=2)" refs/heads/sym > actual &&
-	git for-each-ref --format="%(symref:rstrip=-2)" refs/heads/sym >> actual &&
-	test_cmp expected actual
-
-ok 205 - Verify usage of %(symref:rstrip) atom
-
-expecting success: 
-	git init remote-tests &&
-	(
-		cd remote-tests &&
-		test_commit initial &&
-		git remote add from fifth.coffee:blub &&
-		git config branch.master.remote from &&
-		git config branch.master.merge refs/heads/stable &&
-		git remote add to southridge.audio:repo &&
-		git config remote.to.push "refs/heads/*:refs/heads/pushed/*" &&
-		git config branch.master.pushRemote to &&
-		for pair in "%(upstream)=refs/remotes/from/stable" \
-			"%(upstream:remotename)=from" \
-			"%(upstream:remoteref)=refs/heads/stable" \
-			"%(push)=refs/remotes/to/pushed/master" \
-			"%(push:remotename)=to" \
-			"%(push:remoteref)=refs/heads/pushed/master"
-		do
-			echo "${pair#*=}" >expect &&
-			git for-each-ref --format="${pair%=*}" \
-				refs/heads/master >actual &&
-			test_cmp expect actual
-		done &&
-		git branch push-simple &&
-		git config branch.push-simple.pushRemote from &&
-		actual="$(git for-each-ref \
-			--format="%(push:remotename),%(push:remoteref)" \
-			refs/heads/push-simple)" &&
-		test from, = "$actual"
-	)
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6300-for-each-ref/remote-tests/.git/
-[master (root-commit) 5e30013] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-ok 206 - :remotename and :remoteref
-
-expecting success: 
-	git for-each-ref --format="%(refname)" refs/heads/MASTER >actual &&
-	test_must_be_empty actual &&
-
-	echo refs/heads/master >expect &&
-	git for-each-ref --format="%(refname)" --ignore-case \
-		refs/heads/MASTER >actual &&
-	test_cmp expect actual
-
-ok 207 - for-each-ref --ignore-case ignores case
-
-# passed all 207 test(s)
-1..207
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t7064-wtstatus-pv2.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7064-wtstatus-pv2/.git/
-expecting success: 
-	test_tick &&
-	git config core.autocrlf false &&
-	echo x >file_x &&
-	echo y >file_y &&
-	echo z >file_z &&
-	mkdir dir1 &&
-	echo a >dir1/file_a &&
-	echo b >dir1/file_b
-
-ok 1 - setup
-
-expecting success: 
-	cat >expect <<-EOF &&
-	# branch.oid (initial)
-	# branch.head master
-	? actual
-	? dir1/
-	? expect
-	? file_x
-	? file_y
-	? file_z
-	EOF
-
-	git status --porcelain=v2 --branch --untracked-files=normal >actual &&
-	test_cmp expect actual
-
-ok 2 - before initial commit, nothing added, only untracked
-
-expecting success: 
-	git add file_x file_y file_z dir1 &&
-	OID_A=$(git hash-object -t blob -- dir1/file_a) &&
-	OID_B=$(git hash-object -t blob -- dir1/file_b) &&
-	OID_X=$(git hash-object -t blob -- file_x) &&
-	OID_Y=$(git hash-object -t blob -- file_y) &&
-	OID_Z=$(git hash-object -t blob -- file_z) &&
-
-	cat >expect <<-EOF &&
-	# branch.oid (initial)
-	# branch.head master
-	1 A. N... 000000 100644 100644 $ZERO_OID $OID_A dir1/file_a
-	1 A. N... 000000 100644 100644 $ZERO_OID $OID_B dir1/file_b
-	1 A. N... 000000 100644 100644 $ZERO_OID $OID_X file_x
-	1 A. N... 000000 100644 100644 $ZERO_OID $OID_Y file_y
-	1 A. N... 000000 100644 100644 $ZERO_OID $OID_Z file_z
-	? actual
-	? expect
-	EOF
-
-	git status --porcelain=v2 --branch --untracked-files=all >actual &&
-	test_cmp expect actual
-
-ok 3 - before initial commit, things added
-
-expecting success: 
-	lf_to_nul >expect <<-EOF &&
-	# branch.oid (initial)
-	# branch.head master
-	1 A. N... 000000 100644 100644 $ZERO_OID $OID_A dir1/file_a
-	1 A. N... 000000 100644 100644 $ZERO_OID $OID_B dir1/file_b
-	1 A. N... 000000 100644 100644 $ZERO_OID $OID_X file_x
-	1 A. N... 000000 100644 100644 $ZERO_OID $OID_Y file_y
-	1 A. N... 000000 100644 100644 $ZERO_OID $OID_Z file_z
-	? actual
-	? expect
-	EOF
-
-	git status -z --porcelain=v2 --branch --untracked-files=all >actual &&
-	test_cmp expect actual
-
-ok 4 - before initial commit, things added (-z)
-
-expecting success: 
-	git commit -m initial &&
-	H0=$(git rev-parse HEAD) &&
-	cat >expect <<-EOF &&
-	# branch.oid $H0
-	# branch.head master
-	? actual
-	? expect
-	EOF
-
-	git status --porcelain=v2 --branch --untracked-files=all >actual &&
-	test_cmp expect actual
-
-[master (root-commit) bbc01be] initial
- Author: A U Thor <author@example.com>
- 5 files changed, 5 insertions(+)
- create mode 100644 dir1/file_a
- create mode 100644 dir1/file_b
- create mode 100644 file_x
- create mode 100644 file_y
- create mode 100644 file_z
-ok 5 - make first commit, comfirm HEAD oid and branch
-
-expecting success: 
-	echo x >>file_x &&
-	OID_X1=$(git hash-object -t blob -- file_x) &&
-	rm file_z &&
-	H0=$(git rev-parse HEAD) &&
-
-	cat >expect <<-EOF &&
-	# branch.oid $H0
-	# branch.head master
-	1 .M N... 100644 100644 100644 $OID_X $OID_X file_x
-	1 .D N... 100644 100644 000000 $OID_Z $OID_Z file_z
-	? actual
-	? expect
-	EOF
-
-	git status --porcelain=v2 --branch --untracked-files=all >actual &&
-	test_cmp expect actual
-
-ok 6 - after first commit, create unstaged changes
-
-expecting success: 
-	cat >expect <<-EOF &&
-	1 .M N... 100644 100644 100644 $OID_X $OID_X file_x
-	1 .D N... 100644 100644 000000 $OID_Z $OID_Z file_z
-	EOF
-
-	git status --porcelain=v2 --untracked-files=no >actual &&
-	test_cmp expect actual
-
-ok 7 - after first commit but omit untracked files and branch
-
-expecting success: 
-	git add file_x &&
-	git rm file_z &&
-	H0=$(git rev-parse HEAD) &&
-
-	cat >expect <<-EOF &&
-	# branch.oid $H0
-	# branch.head master
-	1 M. N... 100644 100644 100644 $OID_X $OID_X1 file_x
-	1 D. N... 100644 000000 000000 $OID_Z $ZERO_OID file_z
-	? actual
-	? expect
-	EOF
-
-	git status --porcelain=v2 --branch --untracked-files=all >actual &&
-	test_cmp expect actual
-
-rm 'file_z'
-ok 8 - after first commit, stage existing changes
-
-expecting success: 
-	git mv file_y renamed_y &&
-	H0=$(git rev-parse HEAD) &&
-
-	q_to_tab >expect <<-EOF &&
-	# branch.oid $H0
-	# branch.head master
-	1 M. N... 100644 100644 100644 $OID_X $OID_X1 file_x
-	1 D. N... 100644 000000 000000 $OID_Z $ZERO_OID file_z
-	2 R. N... 100644 100644 100644 $OID_Y $OID_Y R100 renamed_yQfile_y
-	? actual
-	? expect
-	EOF
-
-	git status --porcelain=v2 --branch --untracked-files=all >actual &&
-	test_cmp expect actual
-
-ok 9 - rename causes 2 path lines
-
-expecting success: 
-	H0=$(git rev-parse HEAD) &&
-
-	## Lines use NUL path separator and line terminator, so double transform here.
-	q_to_nul <<-EOF | lf_to_nul >expect &&
-	# branch.oid $H0
-	# branch.head master
-	1 M. N... 100644 100644 100644 $OID_X $OID_X1 file_x
-	1 D. N... 100644 000000 000000 $OID_Z $ZERO_OID file_z
-	2 R. N... 100644 100644 100644 $OID_Y $OID_Y R100 renamed_yQfile_y
-	? actual
-	? expect
-	EOF
-
-	git status --porcelain=v2 --branch --untracked-files=all -z >actual &&
-	test_cmp expect actual
-
-ok 10 - rename causes 2 path lines (-z)
-
-expecting success: 
-	git commit -m second &&
-	H1=$(git rev-parse HEAD) &&
-
-	cat >expect <<-EOF &&
-	# branch.oid $H1
-	# branch.head master
-	? actual
-	? expect
-	EOF
-
-	git status --porcelain=v2 --branch --untracked-files=all >actual &&
-	test_cmp expect actual
-
-[master 84bf28d] second
- Author: A U Thor <author@example.com>
- 3 files changed, 1 insertion(+), 1 deletion(-)
- delete mode 100644 file_z
- rename file_y => renamed_y (100%)
-ok 11 - make second commit, confirm clean and new HEAD oid
-
-expecting success: 
-	test_when_finished "rm -f x.ign .gitignore" &&
-	echo x.ign >.gitignore &&
-	echo "ignore me" >x.ign &&
-
-	cat >expect <<-EOF &&
-	? .gitignore
-	? actual
-	? expect
-	EOF
-
-	git status --porcelain=v2 --untracked-files=all >actual &&
-	test_cmp expect actual
-
-ok 12 - confirm ignored files are not printed
-
-expecting success: 
-	test_when_finished "rm -f x.ign .gitignore" &&
-	echo x.ign >.gitignore &&
-	echo "ignore me" >x.ign &&
-
-	cat >expect <<-EOF &&
-	? .gitignore
-	? actual
-	? expect
-	! x.ign
-	EOF
-
-	git status --porcelain=v2 --ignored --untracked-files=all >actual &&
-	test_cmp expect actual
-
-ok 13 - ignored files are printed with --ignored
-
-expecting success: 
-	cat >.gitignore <<-EOF &&
-	actual*
-	expect*
-	EOF
-
-	git add .gitignore &&
-	git commit -m ignore_trash &&
-	H1=$(git rev-parse HEAD) &&
-
-	cat >expect <<-EOF &&
-	# branch.oid $H1
-	# branch.head master
-	EOF
-
-	git status --porcelain=v2 --branch >actual &&
-	test_cmp expect actual
-
-[master f09abb9] ignore_trash
- Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+)
- create mode 100644 .gitignore
-ok 14 - create and commit permanent ignore file
-
-expecting success: 
-	test_when_finished "git rm -f intent1.add intent2.add" &&
-	touch intent1.add &&
-	echo test >intent2.add &&
-
-	git add --intent-to-add intent1.add intent2.add &&
-
-	cat >expect <<-EOF &&
-	1 .A N... 000000 000000 100644 $ZERO_OID $ZERO_OID intent1.add
-	1 .A N... 000000 000000 100644 $ZERO_OID $ZERO_OID intent2.add
-	EOF
-
-	git status --porcelain=v2 >actual &&
-	test_cmp expect actual
-
-rm 'intent1.add'
-rm 'intent2.add'
-ok 15 - verify --intent-to-add output
-
-expecting success: 
-	test_when_finished "git reset --hard" &&
-
-	git branch AA_A master &&
-	git checkout AA_A &&
-	echo "Branch AA_A" >conflict.txt &&
-	OID_AA_A=$(git hash-object -t blob -- conflict.txt) &&
-	git add conflict.txt &&
-	git commit -m "branch aa_a" &&
-
-	git branch AA_B master &&
-	git checkout AA_B &&
-	echo "Branch AA_B" >conflict.txt &&
-	OID_AA_B=$(git hash-object -t blob -- conflict.txt) &&
-	git add conflict.txt &&
-	git commit -m "branch aa_b" &&
-
-	git branch AA_M AA_B &&
-	git checkout AA_M &&
-	test_must_fail git merge AA_A &&
-
-	HM=$(git rev-parse HEAD) &&
-
-	cat >expect <<-EOF &&
-	# branch.oid $HM
-	# branch.head AA_M
-	u AA N... 000000 100644 100644 100644 $ZERO_OID $OID_AA_B $OID_AA_A conflict.txt
-	EOF
-
-	git status --porcelain=v2 --branch --untracked-files=all >actual &&
-	test_cmp expect actual
-
-Switched to branch 'AA_A'
-[AA_A 55eca05] branch aa_a
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 conflict.txt
-Switched to branch 'AA_B'
-[AA_B 307553c] branch aa_b
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 conflict.txt
-Switched to branch 'AA_M'
-Merging:
-307553c branch aa_b
-virtual AA_A
-found 1 common ancestor:
-f09abb9 ignore_trash
-Auto-merging conflict.txt
-CONFLICT (add/add): Merge conflict in conflict.txt
-Automatic merge failed; fix conflicts and then commit the result.
-HEAD is now at 307553c branch aa_b
-ok 16 - verify AA (add-add) conflict
-
-expecting success: 
-	test_when_finished "git reset --hard" &&
-
-	git branch UU_ANC master &&
-	git checkout UU_ANC &&
-	echo "Ancestor" >conflict.txt &&
-	OID_UU_ANC=$(git hash-object -t blob -- conflict.txt) &&
-	git add conflict.txt &&
-	git commit -m "UU_ANC" &&
-
-	git branch UU_A UU_ANC &&
-	git checkout UU_A &&
-	echo "Branch UU_A" >conflict.txt &&
-	OID_UU_A=$(git hash-object -t blob -- conflict.txt) &&
-	git add conflict.txt &&
-	git commit -m "branch uu_a" &&
-
-	git branch UU_B UU_ANC &&
-	git checkout UU_B &&
-	echo "Branch UU_B" >conflict.txt &&
-	OID_UU_B=$(git hash-object -t blob -- conflict.txt) &&
-	git add conflict.txt &&
-	git commit -m "branch uu_b" &&
-
-	git branch UU_M UU_B &&
-	git checkout UU_M &&
-	test_must_fail git merge UU_A &&
-
-	HM=$(git rev-parse HEAD) &&
-
-	cat >expect <<-EOF &&
-	# branch.oid $HM
-	# branch.head UU_M
-	u UU N... 100644 100644 100644 100644 $OID_UU_ANC $OID_UU_B $OID_UU_A conflict.txt
-	EOF
-
-	git status --porcelain=v2 --branch --untracked-files=all >actual &&
-	test_cmp expect actual
-
-Switched to branch 'UU_ANC'
-[UU_ANC 70071ed] UU_ANC
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 conflict.txt
-Switched to branch 'UU_A'
-[UU_A a088b5d] branch uu_a
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to branch 'UU_B'
-[UU_B c5f3cc7] branch uu_b
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to branch 'UU_M'
-Merging:
-c5f3cc7 branch uu_b
-virtual UU_A
-found 1 common ancestor:
-70071ed UU_ANC
-Auto-merging conflict.txt
-CONFLICT (content): Merge conflict in conflict.txt
-Automatic merge failed; fix conflicts and then commit the result.
-HEAD is now at c5f3cc7 branch uu_b
-ok 17 - verify UU (edit-edit) conflict
-
-expecting success: 
-	git checkout master &&
-	test_when_finished "rm -rf sub_repo" &&
-	git clone . sub_repo &&
-	(
-		## Confirm local master tracks remote master.
-		cd sub_repo &&
-		HUF=$(git rev-parse HEAD) &&
-
-		cat >expect <<-EOF &&
-		# branch.oid $HUF
-		# branch.head master
-		# branch.upstream origin/master
-		# branch.ab +0 -0
-		EOF
-
-		git status --porcelain=v2 --branch --untracked-files=all >actual &&
-		test_cmp expect actual &&
-
-		## Test ahead/behind.
-		echo xyz >file_xyz &&
-		git add file_xyz &&
-		git commit -m xyz &&
-
-		HUF=$(git rev-parse HEAD) &&
-
-		cat >expect <<-EOF &&
-		# branch.oid $HUF
-		# branch.head master
-		# branch.upstream origin/master
-		# branch.ab +1 -0
-		EOF
-
-		git status --porcelain=v2 --branch --untracked-files=all >actual &&
-		test_cmp expect actual &&
-
-		## Repeat the above but without --branch.
-		git status --porcelain=v2 --untracked-files=all >actual &&
-		test_must_be_empty actual &&
-
-		## Test upstream-gone case. Fake this by pointing origin/master at
-		## a non-existing commit.
-		OLD=$(git rev-parse origin/master) &&
-		NEW=$ZERO_OID &&
-		mv .git/packed-refs .git/old-packed-refs &&
-		sed "s/$OLD/$NEW/g" <.git/old-packed-refs >.git/packed-refs &&
-
-		HUF=$(git rev-parse HEAD) &&
-
-		cat >expect <<-EOF &&
-		# branch.oid $HUF
-		# branch.head master
-		# branch.upstream origin/master
-		EOF
-
-		git status --porcelain=v2 --branch --untracked-files=all >actual &&
-		test_cmp expect actual
-	)
-
-Switched to branch 'master'
-Cloning into 'sub_repo'...
-done.
-[master 638bb2b] xyz
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file_xyz
-ok 18 - verify upstream fields in branch header
-
-expecting success: 
-	git checkout master &&
-	test_when_finished "rm -rf sub_repo" &&
-	git clone . sub_repo &&
-	(
-		## Confirm local master tracks remote master.
-		cd sub_repo &&
-		HUF=$(git rev-parse HEAD) &&
-
-		# Confirm --no-ahead-behind reports traditional branch.ab with 0/0 for equal branches.
-		cat >expect <<-EOF &&
-		# branch.oid $HUF
-		# branch.head master
-		# branch.upstream origin/master
-		# branch.ab +0 -0
-		EOF
-
-		git status --no-ahead-behind --porcelain=v2 --branch --untracked-files=all >actual &&
-		test_cmp expect actual &&
-
-		# Confirm --ahead-behind reports traditional branch.ab with 0/0.
-		cat >expect <<-EOF &&
-		# branch.oid $HUF
-		# branch.head master
-		# branch.upstream origin/master
-		# branch.ab +0 -0
-		EOF
-
-		git status --ahead-behind --porcelain=v2 --branch --untracked-files=all >actual &&
-		test_cmp expect actual &&
-
-		## Test non-equal ahead/behind.
-		echo xyz >file_xyz &&
-		git add file_xyz &&
-		git commit -m xyz &&
-
-		HUF=$(git rev-parse HEAD) &&
-
-		# Confirm --no-ahead-behind reports branch.ab with ?/? for non-equal branches.
-		cat >expect <<-EOF &&
-		# branch.oid $HUF
-		# branch.head master
-		# branch.upstream origin/master
-		# branch.ab +? -?
-		EOF
-
-		git status --no-ahead-behind --porcelain=v2 --branch --untracked-files=all >actual &&
-		test_cmp expect actual &&
-
-		# Confirm --ahead-behind reports traditional branch.ab with 1/0.
-		cat >expect <<-EOF &&
-		# branch.oid $HUF
-		# branch.head master
-		# branch.upstream origin/master
-		# branch.ab +1 -0
-		EOF
-
-		git status --ahead-behind --porcelain=v2 --branch --untracked-files=all >actual &&
-		test_cmp expect actual
-	)
-
-Already on 'master'
-Cloning into 'sub_repo'...
-done.
-[master 638bb2b] xyz
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file_xyz
-ok 19 - verify --[no-]ahead-behind with V2 format
-
-expecting success: 
-	git checkout master &&
-	git clone . sub_repo &&
-	git clone . super_repo &&
-	(	cd super_repo &&
-		git submodule add ../sub_repo sub1 &&
-
-		## Confirm stage/add of clean submodule.
-		HMOD=$(git hash-object -t blob -- .gitmodules) &&
-		HSUP=$(git rev-parse HEAD) &&
-		HSUB=$HSUP &&
-
-		cat >expect <<-EOF &&
-		# branch.oid $HSUP
-		# branch.head master
-		# branch.upstream origin/master
-		# branch.ab +0 -0
-		1 A. N... 000000 100644 100644 $ZERO_OID $HMOD .gitmodules
-		1 A. S... 000000 160000 160000 $ZERO_OID $HSUB sub1
-		EOF
-
-		git status --porcelain=v2 --branch --untracked-files=all >actual &&
-		test_cmp expect actual
-	)
-
-Already on 'master'
-Cloning into 'sub_repo'...
-done.
-Cloning into 'super_repo'...
-done.
-Cloning into '/build/git-2.20.1/t/trash directory.t7064-wtstatus-pv2/super_repo/sub1'...
-done.
-ok 20 - create and add submodule, submodule appears clean (A. S...)
-
-expecting success: 
-	(	cd super_repo &&
-		## create untracked file in the submodule.
-		(	cd sub1 &&
-			echo "xxxx" >file_in_sub
-		) &&
-
-		HMOD=$(git hash-object -t blob -- .gitmodules) &&
-		HSUP=$(git rev-parse HEAD) &&
-		HSUB=$HSUP &&
-
-		cat >expect <<-EOF &&
-		# branch.oid $HSUP
-		# branch.head master
-		# branch.upstream origin/master
-		# branch.ab +0 -0
-		1 A. N... 000000 100644 100644 $ZERO_OID $HMOD .gitmodules
-		1 AM S..U 000000 160000 160000 $ZERO_OID $HSUB sub1
-		EOF
-
-		git status --porcelain=v2 --branch --untracked-files=all >actual &&
-		test_cmp expect actual
-	)
-
-ok 21 - untracked changes in added submodule (AM S..U)
-
-expecting success: 
-	(	cd super_repo &&
-		## stage the changes in the submodule.
-		(	cd sub1 &&
-			git add file_in_sub
-		) &&
-
-		HMOD=$(git hash-object -t blob -- .gitmodules) &&
-		HSUP=$(git rev-parse HEAD) &&
-		HSUB=$HSUP &&
-
-		cat >expect <<-EOF &&
-		# branch.oid $HSUP
-		# branch.head master
-		# branch.upstream origin/master
-		# branch.ab +0 -0
-		1 A. N... 000000 100644 100644 $ZERO_OID $HMOD .gitmodules
-		1 AM S.M. 000000 160000 160000 $ZERO_OID $HSUB sub1
-		EOF
-
-		git status --porcelain=v2 --branch --untracked-files=all >actual &&
-		test_cmp expect actual
-	)
-
-ok 22 - staged changes in added submodule (AM S.M.)
-
-expecting success: 
-	(	cd super_repo &&
-		(	cd sub1 &&
-			## make additional unstaged changes (on the same file) in the submodule.
-			## This does not cause us to get S.MU (because the submodule does not report
-			## a "?" line for the unstaged changes).
-			echo "more changes" >>file_in_sub
-		) &&
-
-		HMOD=$(git hash-object -t blob -- .gitmodules) &&
-		HSUP=$(git rev-parse HEAD) &&
-		HSUB=$HSUP &&
-
-		cat >expect <<-EOF &&
-		# branch.oid $HSUP
-		# branch.head master
-		# branch.upstream origin/master
-		# branch.ab +0 -0
-		1 A. N... 000000 100644 100644 $ZERO_OID $HMOD .gitmodules
-		1 AM S.M. 000000 160000 160000 $ZERO_OID $HSUB sub1
-		EOF
-
-		git status --porcelain=v2 --branch --untracked-files=all >actual &&
-		test_cmp expect actual
-	)
-
-ok 23 - staged and unstaged changes in added (AM S.M.)
-
-expecting success: 
-	(	cd super_repo &&
-		(	cd sub1 &&
-			## stage new changes in tracked file.
-			git add file_in_sub &&
-			## create new untracked file.
-			echo "yyyy" >>another_file_in_sub
-		) &&
-
-		HMOD=$(git hash-object -t blob -- .gitmodules) &&
-		HSUP=$(git rev-parse HEAD) &&
-		HSUB=$HSUP &&
-
-		cat >expect <<-EOF &&
-		# branch.oid $HSUP
-		# branch.head master
-		# branch.upstream origin/master
-		# branch.ab +0 -0
-		1 A. N... 000000 100644 100644 $ZERO_OID $HMOD .gitmodules
-		1 AM S.MU 000000 160000 160000 $ZERO_OID $HSUB sub1
-		EOF
-
-		git status --porcelain=v2 --branch --untracked-files=all >actual &&
-		test_cmp expect actual
-	)
-
-ok 24 - staged and untracked changes in added submodule (AM S.MU)
-
-expecting success: 
-	(	cd super_repo &&
-		(	cd sub1 &&
-			## Make a new commit in the submodule.
-			git add file_in_sub &&
-			rm -f another_file_in_sub &&
-			git commit -m "new commit"
-		) &&
-
-		HMOD=$(git hash-object -t blob -- .gitmodules) &&
-		HSUP=$(git rev-parse HEAD) &&
-		HSUB=$HSUP &&
-
-		cat >expect <<-EOF &&
-		# branch.oid $HSUP
-		# branch.head master
-		# branch.upstream origin/master
-		# branch.ab +0 -0
-		1 A. N... 000000 100644 100644 $ZERO_OID $HMOD .gitmodules
-		1 AM SC.. 000000 160000 160000 $ZERO_OID $HSUB sub1
-		EOF
-
-		git status --porcelain=v2 --branch --untracked-files=all >actual &&
-		test_cmp expect actual
-	)
-
-[master 49ed2bd] new commit
- Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+)
- create mode 100644 file_in_sub
-ok 25 - commit within the submodule appears as new commit in super (AM SC..)
-
-expecting success: 
-	(	cd super_repo &&
-		## Stage the new submodule commit in the super.
-		git add sub1 &&
-		## Commit the super so that the sub no longer appears as added.
-		git commit -m "super commit" &&
-
-		HSUP=$(git rev-parse HEAD) &&
-
-		cat >expect <<-EOF &&
-		# branch.oid $HSUP
-		# branch.head master
-		# branch.upstream origin/master
-		# branch.ab +1 -0
-		EOF
-
-		git status --porcelain=v2 --branch --untracked-files=all >actual &&
-		test_cmp expect actual
-	)
-
-[master 9939ebd] super commit
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub1
-ok 26 - stage submodule in super and commit
-
-expecting success: 
-	(	cd super_repo &&
-		(	cd sub1 &&
-			echo "zzzz" >>file_in_sub
-		) &&
-
-		HSUP=$(git rev-parse HEAD) &&
-		HSUB=$(cd sub1 && git rev-parse HEAD) &&
-
-		cat >expect <<-EOF &&
-		# branch.oid $HSUP
-		# branch.head master
-		# branch.upstream origin/master
-		# branch.ab +1 -0
-		1 .M S.M. 160000 160000 160000 $HSUB $HSUB sub1
-		EOF
-
-		git status --porcelain=v2 --branch --untracked-files=all >actual &&
-		test_cmp expect actual
-	)
-
-ok 27 - make unstaged changes in existing submodule (.M S.M.)
-
-# passed all 27 test(s)
-1..27
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t7110-reset-merge.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7110-reset-merge/.git/
-expecting success: 
-    for i in 1 2 3; do echo line $i; done >file1 &&
-    cat file1 >file2 &&
-    git add file1 file2 &&
-    test_tick &&
-    git commit -m "Initial commit" &&
-    git tag initial &&
-    echo line 4 >>file1 &&
-    cat file1 >file2 &&
-    test_tick &&
-    git commit -m "add line 4 to file1" file1 &&
-    git tag second
-
-[master (root-commit) 294b13e] Initial commit
- Author: A U Thor <author@example.com>
- 2 files changed, 6 insertions(+)
- create mode 100644 file1
- create mode 100644 file2
-[master 91b6f65] add line 4 to file1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 1 - setup
-
-expecting success: 
-    git reset --merge HEAD^ &&
-    ! grep 4 file1 &&
-    grep 4 file2 &&
-    test "$(git rev-parse HEAD)" = "$(git rev-parse initial)" &&
-    test -z "$(git diff --cached)"
-
-line 4
-ok 2 - reset --merge is ok with changes in file it does not touch
-
-expecting success: 
-    git reset --merge second &&
-    grep 4 file1 &&
-    grep 4 file2 &&
-    test "$(git rev-parse HEAD)" = "$(git rev-parse second)" &&
-    test -z "$(git diff --cached)"
-
-line 4
-line 4
-ok 3 - reset --merge is ok when switching back
-
-expecting success: 
-    git reset --hard second &&
-    cat file1 >file2 &&
-    git reset --keep HEAD^ &&
-    ! grep 4 file1 &&
-    grep 4 file2 &&
-    test "$(git rev-parse HEAD)" = "$(git rev-parse initial)" &&
-    test -z "$(git diff --cached)"
-
-HEAD is now at 91b6f65 add line 4 to file1
-line 4
-ok 4 - reset --keep is ok with changes in file it does not touch
-
-expecting success: 
-    git reset --keep second &&
-    grep 4 file1 &&
-    grep 4 file2 &&
-    test "$(git rev-parse HEAD)" = "$(git rev-parse second)" &&
-    test -z "$(git diff --cached)"
-
-line 4
-line 4
-ok 5 - reset --keep is ok when switching back
-
-expecting success: 
-    git reset --hard second &&
-    cat file1 >file2 &&
-    echo "line 5" >> file1 &&
-    git add file1 &&
-    git reset --merge HEAD^ &&
-    ! grep 4 file1 &&
-    ! grep 5 file1 &&
-    grep 4 file2 &&
-    test "$(git rev-parse HEAD)" = "$(git rev-parse initial)" &&
-    test -z "$(git diff --cached)"
-
-HEAD is now at 91b6f65 add line 4 to file1
-line 4
-ok 6 - reset --merge discards changes added to index (1)
-
-expecting success: 
-    git reset --hard initial &&
-    echo "line 5" >> file2 &&
-    git add file2 &&
-    git reset --merge second &&
-    ! grep 4 file2 &&
-    ! grep 5 file1 &&
-    grep 4 file1 &&
-    test "$(git rev-parse HEAD)" = "$(git rev-parse second)" &&
-    test -z "$(git diff --cached)"
-
-HEAD is now at 294b13e Initial commit
-line 4
-ok 7 - reset --merge is ok again when switching back (1)
-
-expecting success: 
-    git reset --hard second &&
-    echo "line 5" >> file1 &&
-    git add file1 &&
-    test_must_fail git reset --keep HEAD^
-
-HEAD is now at 91b6f65 add line 4 to file1
-error: Entry 'file1' would be overwritten by merge. Cannot merge.
-fatal: Could not reset index file to revision 'HEAD^'.
-ok 8 - reset --keep fails with changes in index in files it touches
-
-expecting success: 
-    git reset --hard second &&
-    echo "line 4" >> file2 &&
-    git add file2 &&
-    git reset --merge HEAD^ &&
-    ! grep 4 file2 &&
-    test "$(git rev-parse HEAD)" = "$(git rev-parse initial)" &&
-    test -z "$(git diff)" &&
-    test -z "$(git diff --cached)"
-
-HEAD is now at 91b6f65 add line 4 to file1
-ok 9 - reset --merge discards changes added to index (2)
-
-expecting success: 
-    git reset --hard initial &&
-    git reset --merge second &&
-    ! grep 4 file2 &&
-    grep 4 file1 &&
-    test "$(git rev-parse HEAD)" = "$(git rev-parse second)" &&
-    test -z "$(git diff --cached)"
-
-HEAD is now at 294b13e Initial commit
-line 4
-ok 10 - reset --merge is ok again when switching back (2)
-
-expecting success: 
-    git reset --hard second &&
-    echo "line 4" >> file2 &&
-    git add file2 &&
-    git reset --keep HEAD^ &&
-    grep 4 file2 &&
-    test "$(git rev-parse HEAD)" = "$(git rev-parse initial)" &&
-    test -z "$(git diff --cached)"
-
-HEAD is now at 91b6f65 add line 4 to file1
-line 4
-ok 11 - reset --keep keeps changes it does not touch
-
-expecting success: 
-    git reset --keep second &&
-    grep 4 file2 &&
-    grep 4 file1 &&
-    test "$(git rev-parse HEAD)" = "$(git rev-parse second)" &&
-    test -z "$(git diff --cached)"
-
-line 4
-line 4
-ok 12 - reset --keep keeps changes when switching back
-
-expecting success: 
-    git reset --hard second &&
-    echo "line 5" >> file1 &&
-    test_tick &&
-    git commit -m "add line 5" file1 &&
-    sed -e "s/line 1/changed line 1/" <file1 >file3 &&
-    mv file3 file1 &&
-    test_must_fail git reset --merge HEAD^ 2>err.log &&
-    grep file1 err.log | grep "not uptodate"
-
-HEAD is now at 91b6f65 add line 4 to file1
-[master 7799e7c] add line 5
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-error: Entry 'file1' not uptodate. Cannot merge.
-ok 13 - reset --merge fails with changes in file it touches
-
-expecting success: 
-    git reset --hard second &&
-    echo "line 5" >> file1 &&
-    test_tick &&
-    git commit -m "add line 5" file1 &&
-    sed -e "s/line 1/changed line 1/" <file1 >file3 &&
-    mv file3 file1 &&
-    test_must_fail git reset --keep HEAD^ 2>err.log &&
-    grep file1 err.log | grep "not uptodate"
-
-HEAD is now at 91b6f65 add line 4 to file1
-[master f1894d3] add line 5
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-error: Entry 'file1' not uptodate. Cannot merge.
-ok 14 - reset --keep fails with changes in file it touches
-
-expecting success: 
-    git reset --hard second &&
-    git branch branch1 &&
-    git branch branch2 &&
-    git branch branch3 &&
-    git checkout branch1 &&
-    echo "line 5 in branch1" >> file1 &&
-    test_tick &&
-    git commit -a -m "change in branch1" &&
-    git checkout branch2 &&
-    echo "line 5 in branch2" >> file1 &&
-    test_tick &&
-    git commit -a -m "change in branch2" &&
-    git tag third &&
-    git checkout branch3 &&
-    echo a new file >file3 &&
-    rm -f file1 &&
-    git add file3 &&
-    test_tick &&
-    git commit -a -m "change in branch3"
-
-HEAD is now at 91b6f65 add line 4 to file1
-Switched to branch 'branch1'
-[branch1 4afd189] change in branch1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Switched to branch 'branch2'
-[branch2 077fd6d] change in branch2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Switched to branch 'branch3'
-[branch3 05419f2] change in branch3
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+), 4 deletions(-)
- delete mode 100644 file1
- create mode 100644 file3
-ok 15 - setup 3 different branches
-
-expecting success: 
-    git checkout third &&
-    test_must_fail git merge branch1 &&
-    git reset --merge HEAD^ &&
-    test "$(git rev-parse HEAD)" = "$(git rev-parse second)" &&
-    test -z "$(git diff --cached)" &&
-    test -z "$(git diff)"
-
-Note: checking out 'third'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by performing another checkout.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
-
-  git checkout -b <new-branch-name>
-
-HEAD is now at 077fd6d change in branch2
-Merging:
-077fd6d change in branch2
-virtual branch1
-found 1 common ancestor:
-91b6f65 add line 4 to file1
-Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-Automatic merge failed; fix conflicts and then commit the result.
-ok 16 - "reset --merge HEAD^" is ok with pending merge
-
-expecting success: 
-    git reset --hard third &&
-    test_must_fail git merge branch1 &&
-    test_must_fail git reset --keep HEAD^ 2>err.log &&
-    test_i18ngrep "middle of a merge" err.log
-
-HEAD is now at 077fd6d change in branch2
-Merging:
-077fd6d change in branch2
-virtual branch1
-found 1 common ancestor:
-91b6f65 add line 4 to file1
-Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-Automatic merge failed; fix conflicts and then commit the result.
-fatal: Cannot do a keep reset in the middle of a merge.
-ok 17 - "reset --keep HEAD^" fails with pending merge
-
-expecting success: 
-    git reset --hard third &&
-    test_must_fail git merge branch1 &&
-    git reset --merge HEAD &&
-    test "$(git rev-parse HEAD)" = "$(git rev-parse third)" &&
-    test -z "$(git diff --cached)" &&
-    test -z "$(git diff)"
-
-HEAD is now at 077fd6d change in branch2
-Merging:
-077fd6d change in branch2
-virtual branch1
-found 1 common ancestor:
-91b6f65 add line 4 to file1
-Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-Automatic merge failed; fix conflicts and then commit the result.
-ok 18 - "reset --merge HEAD" is ok with pending merge
-
-expecting success: 
-    git reset --hard third &&
-    test_must_fail git merge branch1 &&
-    test_must_fail git reset --keep HEAD 2>err.log &&
-    test_i18ngrep "middle of a merge" err.log
-
-HEAD is now at 077fd6d change in branch2
-Merging:
-077fd6d change in branch2
-virtual branch1
-found 1 common ancestor:
-91b6f65 add line 4 to file1
-Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-Automatic merge failed; fix conflicts and then commit the result.
-fatal: Cannot do a keep reset in the middle of a merge.
-ok 19 - "reset --keep HEAD" fails with pending merge
-
-expecting success: 
-    git reset --hard third &&
-    rm -f file2 &&
-    test_must_fail git merge branch3 &&
-    ! test -f file2 &&
-    test -f file3 &&
-    git diff --exit-code file3 &&
-    git diff --exit-code branch3 file3 &&
-    git reset --merge HEAD &&
-    ! test -f file3 &&
-    ! test -f file2 &&
-    git diff --exit-code --cached
-
-HEAD is now at 077fd6d change in branch2
-Merging:
-077fd6d change in branch2
-virtual branch3
-found 1 common ancestor:
-91b6f65 add line 4 to file1
-CONFLICT (modify/delete): file1 deleted in branch3 and modified in HEAD. Version HEAD of file1 left in tree.
-Automatic merge failed; fix conflicts and then commit the result.
-ok 20 - --merge is ok with added/deleted merge
-
-expecting success: 
-    git reset --hard third &&
-    rm -f file2 &&
-    test_must_fail git merge branch3 &&
-    ! test -f file2 &&
-    test -f file3 &&
-    git diff --exit-code file3 &&
-    git diff --exit-code branch3 file3 &&
-    test_must_fail git reset --keep HEAD 2>err.log &&
-    test_i18ngrep "middle of a merge" err.log
-
-HEAD is now at 077fd6d change in branch2
-Merging:
-077fd6d change in branch2
-virtual branch3
-found 1 common ancestor:
-91b6f65 add line 4 to file1
-CONFLICT (modify/delete): file1 deleted in branch3 and modified in HEAD. Version HEAD of file1 left in tree.
-Automatic merge failed; fix conflicts and then commit the result.
-fatal: Cannot do a keep reset in the middle of a merge.
-ok 21 - --keep fails with added/deleted merge
-
-# passed all 21 test(s)
-1..21
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t7105-reset-patch.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7105-reset-patch/.git/
-expecting success: 
-	mkdir dir &&
-	echo parent > dir/foo &&
-	echo dummy > bar &&
-	git add dir &&
-	git commit -m initial &&
-	test_tick &&
-	test_commit second dir/foo head &&
-	set_and_save_state bar bar_work bar_index &&
-	save_head
-
-[master (root-commit) eb33daf] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 dir/foo
-[master 5aebd9b] second
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 1 - setup
-
-expecting success: 
-	set_and_save_state dir/foo work work &&
-	test_write_lines n n | git reset -p &&
-	verify_saved_state dir/foo &&
-	verify_saved_state bar
-
-diff --git a/bar b/bar
-new file mode 100644
-index 0000000..7780244
---- /dev/null
-+++ b/bar
-@@ -0,0 +1 @@
-+bar_index
-Unstage this hunk [y,n,q,a,d,e,?]? 
-diff --git a/dir/foo b/dir/foo
-index 564b12f..b8f99f5 100644
---- a/dir/foo
-+++ b/dir/foo
-@@ -1 +1 @@
--head
-+work
-Unstage this hunk [y,n,q,a,d,e,?]? 
-ok 2 - saying "n" does nothing
-
-expecting success: 
-	test_write_lines n y | git reset -p >output &&
-	verify_state dir/foo work head &&
-	verify_saved_state bar &&
-	test_i18ngrep "Unstage" output
-
-Unstage this hunk [y,n,q,a,d,e,?]? 
-Unstage this hunk [y,n,q,a,d,e,?]? 
-ok 3 - git reset -p
-
-expecting success: 
-	test_write_lines n y | git reset -p HEAD^ >output &&
-	verify_state dir/foo work parent &&
-	verify_saved_state bar &&
-	test_i18ngrep "Apply" output
-
-Apply deletion to index [y,n,q,a,d,?]? 
-Apply this hunk to index [y,n,q,a,d,e,?]? 
-ok 4 - git reset -p HEAD^
-
-expecting success: 
-	set_state dir/foo work work &&
-	test_write_lines y n | git reset -p dir &&
-	verify_state dir/foo work head &&
-	verify_saved_state bar
-
-diff --git a/dir/foo b/dir/foo
-index 564b12f..b8f99f5 100644
---- a/dir/foo
-+++ b/dir/foo
-@@ -1 +1 @@
--head
-+work
-Unstage this hunk [y,n,q,a,d,e,?]? 
-ok 5 - git reset -p dir
-
-expecting success: 
-	set_state dir/foo work work &&
-	test_write_lines y n | (cd dir && git reset -p -- foo) &&
-	verify_state dir/foo work head &&
-	verify_saved_state bar
-
-diff --git a/dir/foo b/dir/foo
-index 564b12f..b8f99f5 100644
---- a/dir/foo
-+++ b/dir/foo
-@@ -1 +1 @@
--head
-+work
-Unstage this hunk [y,n,q,a,d,e,?]? 
-ok 6 - git reset -p -- foo (inside dir)
-
-expecting success: 
-	test_write_lines y n | git reset -p HEAD^ -- dir &&
-	verify_state dir/foo work parent &&
-	verify_saved_state bar
-
-diff --git b/dir/foo a/dir/foo
-index 564b12f..9676f5b 100644
---- b/dir/foo
-+++ a/dir/foo
-@@ -1 +1 @@
--head
-+parent
-Apply this hunk to index [y,n,q,a,d,e,?]? 
-ok 7 - git reset -p HEAD^ -- dir
-
-expecting success: 
-	verify_saved_head
-
-ok 8 - none of this moved HEAD
-
-# passed all 8 test(s)
-1..8
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t7102-reset.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7102-reset/.git/
-expecting success: 
-	test_tick &&
-	echo "1st file" >first &&
-	git add first &&
-	git commit -m "create 1st file" &&
-
-	echo "2nd file" >second &&
-	git add second &&
-	git commit -m "create 2nd file" &&
-
-	echo "2nd line 1st file" >>first &&
-	git commit -a -m "modify 1st file" &&
-
-	git rm first &&
-	git mv second secondfile &&
-	git commit -a -m "remove 1st and rename 2nd" &&
-
-	echo "1st line 2nd file" >secondfile &&
-	echo "2nd line 2nd file" >>secondfile &&
-	# "git commit -m" would break MinGW, as Windows refuse to pass
-	# $test_encoding encoded parameter to git.
-	commit_msg $test_encoding | git -c "i18n.commitEncoding=$test_encoding" commit -a -F - &&
-	head5=$(git rev-parse --verify HEAD)
-
-[master (root-commit) 811bbdf] create 1st file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 first
-[master ba22ccd] create 2nd file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 second
-[master ddaefe0] modify 1st file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-rm 'first'
-[master d1a4bc3] remove 1st and rename 2nd
- Author: A U Thor <author@example.com>
- 2 files changed, 2 deletions(-)
- delete mode 100644 first
- rename second => secondfile (100%)
-[master eed6733] modify 2nd file (geändert)
- Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+), 1 deletion(-)
-ok 1 - creating initial files and commits
-
-expecting success: 
-	hex=$(git log -1 --format="%h") &&
-	git reset --hard > .actual &&
-	echo HEAD is now at $hex $(commit_msg) > .expected &&
-	test_i18ncmp .expected .actual
-
-ok 2 - reset --hard message
-
-expecting success: 
-	hex=$(git log -1 --format="%h") &&
-	git -c "i18n.logOutputEncoding=$test_encoding" reset --hard > .actual &&
-	echo HEAD is now at $hex $(commit_msg $test_encoding) > .expected &&
-	test_i18ncmp .expected .actual
-
-ok 3 - reset --hard message (ISO8859-1 logoutputencoding)
-
-expecting success: 
-	test_must_fail git reset aaaaaa &&
-	test_must_fail git reset --mixed aaaaaa &&
-	test_must_fail git reset --soft aaaaaa &&
-	test_must_fail git reset --hard aaaaaa &&
-	check_changes $head5
-
-fatal: ambiguous argument 'aaaaaa': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-fatal: ambiguous argument 'aaaaaa': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-fatal: ambiguous argument 'aaaaaa': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-fatal: ambiguous argument 'aaaaaa': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-ok 4 - giving a non existing revision should fail
-
-expecting success: 
-	touch .git/MERGE_HEAD &&
-	echo "100644 44c5b5884550c17758737edcced463447b91d42b 1	un" |
-		git update-index --index-info &&
-	test_must_fail git reset --soft HEAD &&
-	rm .git/MERGE_HEAD &&
-	git rm --cached -- un
-
-fatal: Cannot do a soft reset in the middle of a merge.
-un: needs merge
-rm 'un'
-ok 5 - reset --soft with unmerged index should fail
-
-expecting success: 
-	test_must_fail git reset --soft -- first &&
-	test_must_fail git reset --hard -- first &&
-	test_must_fail git reset --soft HEAD^ -- first &&
-	test_must_fail git reset --hard HEAD^ -- first &&
-	check_changes $head5
-
-fatal: Cannot do soft reset with paths.
-fatal: Cannot do hard reset with paths.
-fatal: Cannot do soft reset with paths.
-fatal: Cannot do hard reset with paths.
-ok 6 - giving paths with options different than --mixed should fail
-
-expecting success: 
-	test_must_fail git reset --other &&
-	test_must_fail git reset -o &&
-	test_must_fail git reset --mixed --other &&
-	test_must_fail git reset --mixed -o &&
-	test_must_fail git reset --soft --other &&
-	test_must_fail git reset --soft -o &&
-	test_must_fail git reset --hard --other &&
-	test_must_fail git reset --hard -o &&
-	check_changes $head5
-
-error: unknown option `other'
-usage: git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]
-   or: git reset [-q] [<tree-ish>] [--] <paths>...
-   or: git reset --patch [<tree-ish>] [--] [<paths>...]
-
-    -q, --quiet           be quiet, only report errors
-    --mixed               reset HEAD and index
-    --soft                reset only HEAD
-    --hard                reset HEAD, index and working tree
-    --merge               reset HEAD, index and working tree
-    --keep                reset HEAD but keep local changes
-    --recurse-submodules[=<reset>]
-                          control recursive updating of submodules
-    -p, --patch           select hunks interactively
-    -N, --intent-to-add   record only the fact that removed paths will be added later
-
-error: unknown switch `o'
-usage: git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]
-   or: git reset [-q] [<tree-ish>] [--] <paths>...
-   or: git reset --patch [<tree-ish>] [--] [<paths>...]
-
-    -q, --quiet           be quiet, only report errors
-    --mixed               reset HEAD and index
-    --soft                reset only HEAD
-    --hard                reset HEAD, index and working tree
-    --merge               reset HEAD, index and working tree
-    --keep                reset HEAD but keep local changes
-    --recurse-submodules[=<reset>]
-                          control recursive updating of submodules
-    -p, --patch           select hunks interactively
-    -N, --intent-to-add   record only the fact that removed paths will be added later
-
-error: unknown option `other'
-usage: git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]
-   or: git reset [-q] [<tree-ish>] [--] <paths>...
-   or: git reset --patch [<tree-ish>] [--] [<paths>...]
-
-    -q, --quiet           be quiet, only report errors
-    --mixed               reset HEAD and index
-    --soft                reset only HEAD
-    --hard                reset HEAD, index and working tree
-    --merge               reset HEAD, index and working tree
-    --keep                reset HEAD but keep local changes
-    --recurse-submodules[=<reset>]
-                          control recursive updating of submodules
-    -p, --patch           select hunks interactively
-    -N, --intent-to-add   record only the fact that removed paths will be added later
-
-error: unknown switch `o'
-usage: git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]
-   or: git reset [-q] [<tree-ish>] [--] <paths>...
-   or: git reset --patch [<tree-ish>] [--] [<paths>...]
-
-    -q, --quiet           be quiet, only report errors
-    --mixed               reset HEAD and index
-    --soft                reset only HEAD
-    --hard                reset HEAD, index and working tree
-    --merge               reset HEAD, index and working tree
-    --keep                reset HEAD but keep local changes
-    --recurse-submodules[=<reset>]
-                          control recursive updating of submodules
-    -p, --patch           select hunks interactively
-    -N, --intent-to-add   record only the fact that removed paths will be added later
-
-error: unknown option `other'
-usage: git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]
-   or: git reset [-q] [<tree-ish>] [--] <paths>...
-   or: git reset --patch [<tree-ish>] [--] [<paths>...]
-
-    -q, --quiet           be quiet, only report errors
-    --mixed               reset HEAD and index
-    --soft                reset only HEAD
-    --hard                reset HEAD, index and working tree
-    --merge               reset HEAD, index and working tree
-    --keep                reset HEAD but keep local changes
-    --recurse-submodules[=<reset>]
-                          control recursive updating of submodules
-    -p, --patch           select hunks interactively
-    -N, --intent-to-add   record only the fact that removed paths will be added later
-
-error: unknown switch `o'
-usage: git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]
-   or: git reset [-q] [<tree-ish>] [--] <paths>...
-   or: git reset --patch [<tree-ish>] [--] [<paths>...]
-
-    -q, --quiet           be quiet, only report errors
-    --mixed               reset HEAD and index
-    --soft                reset only HEAD
-    --hard                reset HEAD, index and working tree
-    --merge               reset HEAD, index and working tree
-    --keep                reset HEAD but keep local changes
-    --recurse-submodules[=<reset>]
-                          control recursive updating of submodules
-    -p, --patch           select hunks interactively
-    -N, --intent-to-add   record only the fact that removed paths will be added later
-
-error: unknown option `other'
-usage: git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]
-   or: git reset [-q] [<tree-ish>] [--] <paths>...
-   or: git reset --patch [<tree-ish>] [--] [<paths>...]
-
-    -q, --quiet           be quiet, only report errors
-    --mixed               reset HEAD and index
-    --soft                reset only HEAD
-    --hard                reset HEAD, index and working tree
-    --merge               reset HEAD, index and working tree
-    --keep                reset HEAD but keep local changes
-    --recurse-submodules[=<reset>]
-                          control recursive updating of submodules
-    -p, --patch           select hunks interactively
-    -N, --intent-to-add   record only the fact that removed paths will be added later
-
-error: unknown switch `o'
-usage: git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]
-   or: git reset [-q] [<tree-ish>] [--] <paths>...
-   or: git reset --patch [<tree-ish>] [--] [<paths>...]
-
-    -q, --quiet           be quiet, only report errors
-    --mixed               reset HEAD and index
-    --soft                reset only HEAD
-    --hard                reset HEAD, index and working tree
-    --merge               reset HEAD, index and working tree
-    --keep                reset HEAD but keep local changes
-    --recurse-submodules[=<reset>]
-                          control recursive updating of submodules
-    -p, --patch           select hunks interactively
-    -N, --intent-to-add   record only the fact that removed paths will be added later
-
-ok 7 - giving unrecognized options should fail
-
-expecting success: 
-	git branch branch1 &&
-	git branch branch2 &&
-
-	git checkout branch1 &&
-	echo "3rd line in branch1" >>secondfile &&
-	git commit -a -m "change in branch1" &&
-
-	git checkout branch2 &&
-	echo "3rd line in branch2" >>secondfile &&
-	git commit -a -m "change in branch2" &&
-
-	test_must_fail git merge branch1 &&
-	test_must_fail git reset --soft &&
-
-	printf "1st line 2nd file\n2nd line 2nd file\n3rd line" >secondfile &&
-	git commit -a -m "the change in branch2" &&
-
-	git checkout master &&
-	git branch -D branch1 branch2 &&
-	check_changes $head5
-
-Switched to branch 'branch1'
-[branch1 6b78ea5] change in branch1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Switched to branch 'branch2'
-[branch2 f8a209f] change in branch2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Merging:
-f8a209f change in branch2
-virtual branch1
-found 1 common ancestor:
-eed6733 modify 2nd file (geändert)
-Auto-merging secondfile
-CONFLICT (content): Merge conflict in secondfile
-Automatic merge failed; fix conflicts and then commit the result.
-fatal: Cannot do a soft reset in the middle of a merge.
-[branch2 8e8e261] the change in branch2
- Author: A U Thor <author@example.com>
-Switched to branch 'master'
-Deleted branch branch1 (was 6b78ea5).
-Deleted branch branch2 (was 8e8e261).
-ok 8 - trying to do reset --soft with pending merge should fail
-
-expecting success: 
-	git branch branch3 &&
-	git branch branch4 &&
-
-	git checkout branch3 &&
-	echo "3rd line in branch3" >>secondfile &&
-	git commit -a -m "line in branch3" &&
-
-	git checkout branch4 &&
-	echo "3rd line in branch4" >>secondfile &&
-
-	git checkout -m branch3 &&
-	test_must_fail git reset --soft &&
-
-	printf "1st line 2nd file\n2nd line 2nd file\n3rd line" >secondfile &&
-	git commit -a -m "the line in branch3" &&
-
-	git checkout master &&
-	git branch -D branch3 branch4 &&
-	check_changes $head5
-
-Switched to branch 'branch3'
-[branch3 0b5021a] line in branch3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Switched to branch 'branch4'
-Switched to branch 'branch3'
-M	secondfile
-fatal: Cannot do a soft reset in the middle of a merge.
-[branch3 dbe96ed] the line in branch3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to branch 'master'
-Deleted branch branch3 (was dbe96ed).
-Deleted branch branch4 (was eed6733).
-ok 9 - trying to do reset --soft with pending checkout merge should fail
-
-expecting success: 
-	git reset --hard &&
-		check_changes $head5 &&
-	git reset --hard HEAD &&
-		check_changes $head5 &&
-	git reset --soft &&
-		check_changes $head5 &&
-	git reset --soft HEAD &&
-		check_changes $head5 &&
-	git reset --mixed &&
-		check_changes $head5 &&
-	git reset --mixed HEAD &&
-		check_changes $head5 &&
-	git reset &&
-		check_changes $head5 &&
-	git reset HEAD &&
-		check_changes $head5
-
-HEAD is now at eed6733 modify 2nd file (geändert)
-HEAD is now at eed6733 modify 2nd file (geändert)
-ok 10 - resetting to HEAD with no changes should succeed and do nothing
-
-expecting success: 
-	git reset --soft HEAD^ &&
-	check_changes d1a4bc3abce4829628ae2dcb0d60ef3d1a78b1c4 &&
-	test "$(git rev-parse ORIG_HEAD)" = \
-			$head5
-
-ok 11 - --soft reset only should show changes in diff --cached
-
-expecting success: 
-	echo "3rd line 2nd file" >>secondfile &&
-	git commit -a -C ORIG_HEAD &&
-	head4=$(git rev-parse --verify HEAD) &&
-	check_changes $head4 &&
-	test "$(git rev-parse ORIG_HEAD)" = \
-			$head5
-
-[master b052eb8] modify 2nd file (geändert)
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:13:13 2005 -0700
- 1 file changed, 3 insertions(+), 1 deletion(-)
-ok 12 - changing files and redo the last commit should succeed
-
-expecting success: 
-	git reset --hard HEAD~2 &&
-	check_changes ddaefe00f1da16864591c61fdc7adb5d7cd6b74e &&
-	test "$(git rev-parse ORIG_HEAD)" = \
-			$head4
-
-HEAD is now at ddaefe0 modify 1st file
-ok 13 - --hard reset should change the files and undo commits permanently
-
-expecting success: 
-	git rm first &&
-	git mv second secondfile &&
-
-	echo "1st line 2nd file" >secondfile &&
-	echo "2nd line 2nd file" >>secondfile &&
-	git add secondfile &&
-	check_changes ddaefe00f1da16864591c61fdc7adb5d7cd6b74e
-
-rm 'first'
-ok 14 - redoing changes adding them without commit them should succeed
-
-expecting success: 
-	git reset &&
-	check_changes ddaefe00f1da16864591c61fdc7adb5d7cd6b74e &&
-	test "$(git rev-parse ORIG_HEAD)" = \
-			ddaefe00f1da16864591c61fdc7adb5d7cd6b74e
-
-Unstaged changes after reset:
-D	first
-D	second
-ok 15 - --mixed reset to HEAD should unadd the files
-
-expecting success: 
-	git add secondfile &&
-	git reset --hard ddaefe00f1da16864591c61fdc7adb5d7cd6b74e &&
-
-	git rm first &&
-	git mv second secondfile &&
-	git commit -a -m "remove 1st and rename 2nd" &&
-
-	echo "1st line 2nd file" >secondfile &&
-	echo "2nd line 2nd file" >>secondfile &&
-	# "git commit -m" would break MinGW, as Windows refuse to pass
-	# $test_encoding encoded parameter to git.
-	commit_msg $test_encoding | git -c "i18n.commitEncoding=$test_encoding" commit -a -F - &&
-	check_changes $head5
-
-HEAD is now at ddaefe0 modify 1st file
-rm 'first'
-[master d1a4bc3] remove 1st and rename 2nd
- Author: A U Thor <author@example.com>
- 2 files changed, 2 deletions(-)
- delete mode 100644 first
- rename second => secondfile (100%)
-[master eed6733] modify 2nd file (geändert)
- Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+), 1 deletion(-)
-ok 16 - redoing the last two commits should succeed
-
-expecting success: 
-	git branch branch1 &&
-	git branch branch2 &&
-
-	git checkout branch1 &&
-	echo "3rd line in branch1" >>secondfile &&
-	git commit -a -m "change in branch1" &&
-
-	git checkout branch2 &&
-	echo "3rd line in branch2" >>secondfile &&
-	git commit -a -m "change in branch2" &&
-	head3=$(git rev-parse --verify HEAD) &&
-
-	test_must_fail git pull . branch1 &&
-	git reset --hard &&
-	check_changes $head3
-
-Switched to branch 'branch1'
-[branch1 6b78ea5] change in branch1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Switched to branch 'branch2'
-[branch2 f8a209f] change in branch2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-From .
- * branch            branch1    -> FETCH_HEAD
-Merging:
-f8a209f change in branch2
-virtual 6b78ea5a18fcfce43fc7d5b8980e339547a633be
-found 1 common ancestor:
-eed6733 modify 2nd file (geändert)
-Auto-merging secondfile
-CONFLICT (content): Merge conflict in secondfile
-Automatic merge failed; fix conflicts and then commit the result.
-HEAD is now at f8a209f change in branch2
-ok 17 - --hard reset to HEAD should clear a failed merge
-
-expecting success: 
-	git reset --hard HEAD^ &&
-	check_changes $head5 &&
-
-	git pull . branch1 &&
-	git reset --hard ORIG_HEAD &&
-	check_changes $head5 &&
-
-	git checkout master &&
-	git branch -D branch1 branch2 &&
-	check_changes $head5
-
-HEAD is now at eed6733 modify 2nd file (geändert)
-From .
- * branch            branch1    -> FETCH_HEAD
-Updating eed6733..6b78ea5
-Fast-forward
- secondfile | 1 +
- 1 file changed, 1 insertion(+)
-HEAD is now at eed6733 modify 2nd file (geändert)
-Switched to branch 'master'
-Deleted branch branch1 (was 6b78ea5).
-Deleted branch branch2 (was eed6733).
-ok 18 - --hard reset to ORIG_HEAD should clear a fast-forward merge
-
-expecting success: 
-	echo 1 > file1 &&
-	echo 2 > file2 &&
-	git add file1 file2 &&
-	test_tick &&
-	git commit -m files &&
-	git rm file2 &&
-	echo 3 > file3 &&
-	echo 4 > file4 &&
-	echo 5 > file1 &&
-	git add file1 file3 file4 &&
-	git reset HEAD -- file1 file2 file3 &&
-	test_must_fail git diff --quiet &&
-	git diff > output &&
-	test_cmp expect output &&
-	git diff --cached > output &&
-	test_cmp cached_expect output
-
-[master 14b96fb] files
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 file1
- create mode 100644 file2
-rm 'file2'
-Unstaged changes after reset:
-M	file1
-D	file2
-ok 19 - test --mixed <paths>
-
-expecting success: 
-
-	mkdir sub &&
-	>sub/file1 &&
-	>sub/file2 &&
-	git update-index --add sub/file1 sub/file2 &&
-	T=$(git write-tree) &&
-	git reset HEAD sub/file2 &&
-	test_must_fail git diff --quiet &&
-	U=$(git write-tree) &&
-	echo "$T" &&
-	echo "$U" &&
-	test_must_fail git diff-index --cached --exit-code "$T" &&
-	test "$T" != "$U"
-
-
-Unstaged changes after reset:
-M	file1
-D	file2
-9571d9b5fb34d9c1274612948c5356f0615744bc
-88880074c0c9957f91fd21817fee120b773fc32c
-:100644 000000 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0000000000000000000000000000000000000000 D	sub/file2
-ok 20 - test resetting the index at give paths
-
-expecting success: 
-	git reset --hard &&
-	git reset -- file1 &&
-	git diff-files --exit-code &&
-	git diff-index --cached --exit-code HEAD
-
-HEAD is now at 14b96fb files
-ok 21 - resetting an unmodified path is a no-op
-
-expecting success: 
-	echo 123 >> file2 &&
-	git reset --mixed HEAD > output &&
-	test_i18ncmp expect output
-
-ok 22 - --mixed refreshes the index
-
-expecting success: 
-	git rm --cached file2 &&
-	F1=$(git rev-parse HEAD:file1) &&
-	F2=$(git rev-parse HEAD:file2) &&
-	F3=$(git rev-parse HEAD:secondfile) &&
-	{
-		echo "100644 $F1 1	file2" &&
-		echo "100644 $F2 2	file2" &&
-		echo "100644 $F3 3	file2"
-	} | git update-index --index-info &&
-	git ls-files -u &&
-	git reset HEAD file2 &&
-	test_must_fail git diff --quiet &&
-	git diff-index --exit-code --cached HEAD
-
-rm 'file2'
-100644 d00491fd7e5bb6fa28c517a0bb32b8b506539d4d 1	file2
-100644 0cfbf08886fca9a91cb753ec8734c84fcbe52c9f 2	file2
-100644 44c5b5884550c17758737edcced463447b91d42b 3	file2
-Unstaged changes after reset:
-M	file2
-ok 23 - resetting specific path that is unmerged
-
-expecting success: 
-
-	git reset --hard &&
-	>secondfile &&
-	git add secondfile &&
-	git reset secondfile &&
-	test_must_fail git diff --quiet -- secondfile &&
-	test -z "$(git diff --cached --name-only)" &&
-	test -f secondfile &&
-	test_must_be_empty secondfile
-
-
-HEAD is now at 14b96fb files
-Unstaged changes after reset:
-M	secondfile
-ok 24 - disambiguation (1)
-
-expecting success: 
-
-	git reset --hard &&
-	>secondfile &&
-	git add secondfile &&
-	rm -f secondfile &&
-	test_must_fail git reset secondfile &&
-	test -n "$(git diff --cached --name-only -- secondfile)" &&
-	test ! -f secondfile
-
-
-HEAD is now at 14b96fb files
-fatal: ambiguous argument 'secondfile': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-ok 25 - disambiguation (2)
-
-expecting success: 
-
-	git reset --hard &&
-	>secondfile &&
-	git add secondfile &&
-	rm -f secondfile &&
-	git reset HEAD secondfile &&
-	test_must_fail git diff --quiet &&
-	test -z "$(git diff --cached --name-only)" &&
-	test ! -f secondfile
-
-
-HEAD is now at 14b96fb files
-Unstaged changes after reset:
-D	secondfile
-ok 26 - disambiguation (3)
-
-expecting success: 
-
-	git reset --hard &&
-	>secondfile &&
-	git add secondfile &&
-	rm -f secondfile &&
-	git reset -- secondfile &&
-	test_must_fail git diff --quiet &&
-	test -z "$(git diff --cached --name-only)" &&
-	test ! -f secondfile
-
-HEAD is now at 14b96fb files
-Unstaged changes after reset:
-D	secondfile
-ok 27 - disambiguation (4)
-
-expecting success: 
-	# for simpler tests, drop last commit containing added files
-	git reset --hard HEAD^ &&
-	git reset HEAD^^{tree} -- . &&
-	git diff --cached HEAD^ --exit-code &&
-	git diff HEAD --exit-code
-
-HEAD is now at eed6733 modify 2nd file (geändert)
-Unstaged changes after reset:
-M	secondfile
-ok 28 - reset with paths accepts tree
-
-expecting success: 
-	echo new-file >new-file &&
-	git add new-file &&
-	git reset -N HEAD &&
-
-	tree=$(git write-tree) &&
-	git ls-tree $tree new-file >actual &&
-	test_must_be_empty actual &&
-
-	git diff --name-only >actual &&
-	echo new-file >expect &&
-	test_cmp expect actual
-
-Unstaged changes after reset:
-A	new-file
-ok 29 - reset -N keeps removed files as intent-to-add
-
-expecting success: 
-	git init mixed_worktree &&
-	(
-		cd mixed_worktree &&
-		test_commit dummy
-	) &&
-	git --git-dir=mixed_worktree/.git --work-tree=mixed_worktree reset >actual &&
-	test_must_be_empty actual
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7102-reset/mixed_worktree/.git/
-[master (root-commit) b737dfa] dummy
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 dummy.t
-ok 30 - reset --mixed sets up work tree
-
-# passed all 30 test(s)
-1..30
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t7301-clean-interactive.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7301-clean-interactive/.git/
-expecting success: 
-
-	mkdir -p src &&
-	touch src/part1.c Makefile &&
-	echo build >.gitignore &&
-	echo \*.o >>.gitignore &&
-	git add . &&
-	git commit -m setup &&
-	touch src/part2.c README &&
-	git add .
-
-
-[master (root-commit) feca009] setup
- Author: A U Thor <author@example.com>
- 3 files changed, 2 insertions(+)
- create mode 100644 .gitignore
- create mode 100644 Makefile
- create mode 100644 src/part1.c
-ok 1 - setup
-
-expecting success: 
-
-	mkdir -p build docs &&
-	touch a.out src/part3.c src/part3.h src/part4.c src/part4.h \
-	docs/manual.txt obj.o build/lib.so &&
-	echo c | git clean -i &&
-	test -f Makefile &&
-	test -f README &&
-	test -f src/part1.c &&
-	test -f src/part2.c &&
-	test ! -f a.out &&
-	test -f docs/manual.txt &&
-	test ! -f src/part3.c &&
-	test ! -f src/part3.h &&
-	test ! -f src/part4.c &&
-	test ! -f src/part4.h &&
-	test -f obj.o &&
-	test -f build/lib.so
-
-
-Would remove the following items:
-  a.out        src/part3.c  src/part3.h  src/part4.c  src/part4.h
-*** Commands ***
-    1: clean                2: filter by pattern    3: select by numbers
-    4: ask each             5: quit                 6: help
-What now> Removing a.out
-Removing src/part3.c
-Removing src/part3.h
-Removing src/part4.c
-Removing src/part4.h
-ok 2 - git clean -i (c: clean hotkey)
-
-expecting success: 
-
-	mkdir -p build docs &&
-	touch a.out src/part3.c src/part3.h src/part4.c src/part4.h \
-	docs/manual.txt obj.o build/lib.so &&
-	echo cl | git clean -i &&
-	test -f Makefile &&
-	test -f README &&
-	test -f src/part1.c &&
-	test -f src/part2.c &&
-	test ! -f a.out &&
-	test -f docs/manual.txt &&
-	test ! -f src/part3.c &&
-	test ! -f src/part3.h &&
-	test ! -f src/part4.c &&
-	test ! -f src/part4.h &&
-	test -f obj.o &&
-	test -f build/lib.so
-
-
-Would remove the following items:
-  a.out        src/part3.c  src/part3.h  src/part4.c  src/part4.h
-*** Commands ***
-    1: clean                2: filter by pattern    3: select by numbers
-    4: ask each             5: quit                 6: help
-What now> Removing a.out
-Removing src/part3.c
-Removing src/part3.h
-Removing src/part4.c
-Removing src/part4.h
-ok 3 - git clean -i (cl: clean prefix)
-
-expecting success: 
-
-	mkdir -p build docs &&
-	touch a.out src/part3.c src/part3.h src/part4.c src/part4.h \
-	docs/manual.txt obj.o build/lib.so &&
-	echo quit | git clean -i &&
-	test -f Makefile &&
-	test -f README &&
-	test -f src/part1.c &&
-	test -f src/part2.c &&
-	test -f a.out &&
-	test -f docs/manual.txt &&
-	test -f src/part3.c &&
-	test -f src/part3.h &&
-	test -f src/part4.c &&
-	test -f src/part4.h &&
-	test -f obj.o &&
-	test -f build/lib.so
-
-
-Would remove the following items:
-  a.out        src/part3.c  src/part3.h  src/part4.c  src/part4.h
-*** Commands ***
-    1: clean                2: filter by pattern    3: select by numbers
-    4: ask each             5: quit                 6: help
-What now> Bye.
-ok 4 - git clean -i (quit)
-
-expecting success: 
-
-	mkdir -p build docs &&
-	touch a.out src/part3.c src/part3.h src/part4.c src/part4.h \
-	docs/manual.txt obj.o build/lib.so &&
-	echo "\04" | git clean -i &&
-	test -f Makefile &&
-	test -f README &&
-	test -f src/part1.c &&
-	test -f src/part2.c &&
-	test -f a.out &&
-	test -f docs/manual.txt &&
-	test -f src/part3.c &&
-	test -f src/part3.h &&
-	test -f src/part4.c &&
-	test -f src/part4.h &&
-	test -f obj.o &&
-	test -f build/lib.so
-
-
-Would remove the following items:
-  a.out        src/part3.c  src/part3.h  src/part4.c  src/part4.h
-*** Commands ***
-    1: clean                2: filter by pattern    3: select by numbers
-    4: ask each             5: quit                 6: help
-What now> Huh ()?
-*** Commands ***
-    1: clean                2: filter by pattern    3: select by numbers
-    4: ask each             5: quit                 6: help
-What now> Bye.
-ok 5 - git clean -i (Ctrl+D)
-
-expecting success: 
-
-	mkdir -p build docs &&
-	touch a.out src/part3.c src/part3.h src/part4.c src/part4.h \
-	docs/manual.txt obj.o build/lib.so &&
-	test_write_lines f "*" "" c |
-	git clean -id &&
-	test -f Makefile &&
-	test -f README &&
-	test -f src/part1.c &&
-	test -f src/part2.c &&
-	test -f a.out &&
-	test -f docs/manual.txt &&
-	test -f src/part3.c &&
-	test -f src/part3.h &&
-	test -f src/part4.c &&
-	test -f src/part4.h &&
-	test -f obj.o &&
-	test -f build/lib.so
-
-
-Would remove the following items:
-  a.out        src/part3.c  src/part4.c
-  docs/        src/part3.h  src/part4.h
-*** Commands ***
-    1: clean                2: filter by pattern    3: select by numbers
-    4: ask each             5: quit                 6: help
-What now>   a.out        src/part3.c  src/part4.c
-  docs/        src/part3.h  src/part4.h
-Input ignore patterns>> No more files to clean, exiting.
-ok 6 - git clean -id (filter all)
-
-expecting success: 
-
-	mkdir -p build docs &&
-	touch a.out src/part3.c src/part3.h src/part4.c src/part4.h \
-	docs/manual.txt obj.o build/lib.so &&
-	test_write_lines f "part3.* *.out" "" c |
-	git clean -id &&
-	test -f Makefile &&
-	test -f README &&
-	test -f src/part1.c &&
-	test -f src/part2.c &&
-	test -f a.out &&
-	test ! -f docs/manual.txt &&
-	test -f src/part3.c &&
-	test -f src/part3.h &&
-	test ! -f src/part4.c &&
-	test ! -f src/part4.h &&
-	test -f obj.o &&
-	test -f build/lib.so
-
-
-Would remove the following items:
-  a.out        src/part3.c  src/part4.c
-  docs/        src/part3.h  src/part4.h
-*** Commands ***
-    1: clean                2: filter by pattern    3: select by numbers
-    4: ask each             5: quit                 6: help
-What now>   a.out        src/part3.c  src/part4.c
-  docs/        src/part3.h  src/part4.h
-Input ignore patterns>>   docs/        src/part4.c  src/part4.h
-Input ignore patterns>> Would remove the following items:
-  docs/        src/part4.c  src/part4.h
-*** Commands ***
-    1: clean                2: filter by pattern    3: select by numbers
-    4: ask each             5: quit                 6: help
-What now> Removing docs/
-Removing src/part4.c
-Removing src/part4.h
-ok 7 - git clean -id (filter patterns)
-
-expecting success: 
-
-	mkdir -p build docs &&
-	touch a.out src/part3.c src/part3.h src/part4.c src/part4.h \
-	docs/manual.txt obj.o build/lib.so &&
-	test_write_lines f "* !*.out" "" c |
-	git clean -id &&
-	test -f Makefile &&
-	test -f README &&
-	test -f src/part1.c &&
-	test -f src/part2.c &&
-	test ! -f a.out &&
-	test -f docs/manual.txt &&
-	test -f src/part3.c &&
-	test -f src/part3.h &&
-	test -f src/part4.c &&
-	test -f src/part4.h &&
-	test -f obj.o &&
-	test -f build/lib.so
-
-
-Would remove the following items:
-  a.out        src/part3.c  src/part4.c
-  docs/        src/part3.h  src/part4.h
-*** Commands ***
-    1: clean                2: filter by pattern    3: select by numbers
-    4: ask each             5: quit                 6: help
-What now>   a.out        src/part3.c  src/part4.c
-  docs/        src/part3.h  src/part4.h
-Input ignore patterns>>   a.out
-Input ignore patterns>> Would remove the following item:
-  a.out
-*** Commands ***
-    1: clean                2: filter by pattern    3: select by numbers
-    4: ask each             5: quit                 6: help
-What now> Removing a.out
-ok 8 - git clean -id (filter patterns 2)
-
-expecting success: 
-
-	mkdir -p build docs &&
-	touch a.out src/part3.c src/part3.h src/part4.c src/part4.h \
-	docs/manual.txt obj.o build/lib.so &&
-	test_write_lines s "*" "" c |
-	git clean -id &&
-	test -f Makefile &&
-	test -f README &&
-	test -f src/part1.c &&
-	test -f src/part2.c &&
-	test ! -f a.out &&
-	test ! -f docs/manual.txt &&
-	test ! -f src/part3.c &&
-	test ! -f src/part3.h &&
-	test ! -f src/part4.c &&
-	test ! -f src/part4.h &&
-	test -f obj.o &&
-	test -f build/lib.so
-
-
-Would remove the following items:
-  a.out        src/part3.c  src/part4.c
-  docs/        src/part3.h  src/part4.h
-*** Commands ***
-    1: clean                2: filter by pattern    3: select by numbers
-    4: ask each             5: quit                 6: help
-What now>     1: a.out          2: docs/          3: src/part3.c    4: src/part3.h
-    5: src/part4.c    6: src/part4.h
-Select items to delete>>   * 1: a.out        * 2: docs/        * 3: src/part3.c  * 4: src/part3.h
-  * 5: src/part4.c  * 6: src/part4.h
-Select items to delete>> Would remove the following items:
-  a.out        src/part3.c  src/part4.c
-  docs/        src/part3.h  src/part4.h
-*** Commands ***
-    1: clean                2: filter by pattern    3: select by numbers
-    4: ask each             5: quit                 6: help
-What now> Removing a.out
-Removing docs/
-Removing src/part3.c
-Removing src/part3.h
-Removing src/part4.c
-Removing src/part4.h
-ok 9 - git clean -id (select - all)
-
-expecting success: 
-
-	mkdir -p build docs &&
-	touch a.out src/part3.c src/part3.h src/part4.c src/part4.h \
-	docs/manual.txt obj.o build/lib.so &&
-	test_write_lines s "" c |
-	git clean -id &&
-	test -f Makefile &&
-	test -f README &&
-	test -f src/part1.c &&
-	test -f src/part2.c &&
-	test -f a.out &&
-	test -f docs/manual.txt &&
-	test -f src/part3.c &&
-	test -f src/part3.h &&
-	test -f src/part4.c &&
-	test -f src/part4.h &&
-	test -f obj.o &&
-	test -f build/lib.so
-
-
-Would remove the following items:
-  a.out        src/part3.c  src/part4.c
-  docs/        src/part3.h  src/part4.h
-*** Commands ***
-    1: clean                2: filter by pattern    3: select by numbers
-    4: ask each             5: quit                 6: help
-What now>     1: a.out          2: docs/          3: src/part3.c    4: src/part3.h
-    5: src/part4.c    6: src/part4.h
-Select items to delete>> No more files to clean, exiting.
-ok 10 - git clean -id (select - none)
-
-expecting success: 
-
-	mkdir -p build docs &&
-	touch a.out src/part3.c src/part3.h src/part4.c src/part4.h \
-	docs/manual.txt obj.o build/lib.so &&
-	test_write_lines s 3 "" c |
-	git clean -id &&
-	test -f Makefile &&
-	test -f README &&
-	test -f src/part1.c &&
-	test -f src/part2.c &&
-	test -f a.out &&
-	test -f docs/manual.txt &&
-	test ! -f src/part3.c &&
-	test -f src/part3.h &&
-	test -f src/part4.c &&
-	test -f src/part4.h &&
-	test -f obj.o &&
-	test -f build/lib.so
-
-
-Would remove the following items:
-  a.out        src/part3.c  src/part4.c
-  docs/        src/part3.h  src/part4.h
-*** Commands ***
-    1: clean                2: filter by pattern    3: select by numbers
-    4: ask each             5: quit                 6: help
-What now>     1: a.out          2: docs/          3: src/part3.c    4: src/part3.h
-    5: src/part4.c    6: src/part4.h
-Select items to delete>>     1: a.out          2: docs/        * 3: src/part3.c    4: src/part3.h
-    5: src/part4.c    6: src/part4.h
-Select items to delete>> Would remove the following item:
-  src/part3.c
-*** Commands ***
-    1: clean                2: filter by pattern    3: select by numbers
-    4: ask each             5: quit                 6: help
-What now> Removing src/part3.c
-ok 11 - git clean -id (select - number)
-
-expecting success: 
-
-	mkdir -p build docs &&
-	touch a.out src/part3.c src/part3.h src/part4.c src/part4.h \
-	docs/manual.txt obj.o build/lib.so &&
-	test_write_lines s "2 3" 5 "" c |
-	git clean -id &&
-	test -f Makefile &&
-	test -f README &&
-	test -f src/part1.c &&
-	test -f src/part2.c &&
-	test -f a.out &&
-	test ! -f docs/manual.txt &&
-	test ! -f src/part3.c &&
-	test -f src/part3.h &&
-	test ! -f src/part4.c &&
-	test -f src/part4.h &&
-	test -f obj.o &&
-	test -f build/lib.so
-
-
-Would remove the following items:
-  a.out        src/part3.c  src/part4.c
-  docs/        src/part3.h  src/part4.h
-*** Commands ***
-    1: clean                2: filter by pattern    3: select by numbers
-    4: ask each             5: quit                 6: help
-What now>     1: a.out          2: docs/          3: src/part3.c    4: src/part3.h
-    5: src/part4.c    6: src/part4.h
-Select items to delete>>     1: a.out        * 2: docs/        * 3: src/part3.c    4: src/part3.h
-    5: src/part4.c    6: src/part4.h
-Select items to delete>>     1: a.out        * 2: docs/        * 3: src/part3.c    4: src/part3.h
-  * 5: src/part4.c    6: src/part4.h
-Select items to delete>> Would remove the following items:
-  docs/        src/part3.c  src/part4.c
-*** Commands ***
-    1: clean                2: filter by pattern    3: select by numbers
-    4: ask each             5: quit                 6: help
-What now> Removing docs/
-Removing src/part3.c
-Removing src/part4.c
-ok 12 - git clean -id (select - number 2)
-
-expecting success: 
-
-	mkdir -p build docs &&
-	touch a.out src/part3.c src/part3.h src/part4.c src/part4.h \
-	docs/manual.txt obj.o build/lib.so &&
-	test_write_lines s "3,4 5" "" c |
-	git clean -id &&
-	test -f Makefile &&
-	test -f README &&
-	test -f src/part1.c &&
-	test -f src/part2.c &&
-	test -f a.out &&
-	test -f docs/manual.txt &&
-	test ! -f src/part3.c &&
-	test ! -f src/part3.h &&
-	test ! -f src/part4.c &&
-	test -f src/part4.h &&
-	test -f obj.o &&
-	test -f build/lib.so
-
-
-Would remove the following items:
-  a.out        src/part3.c  src/part4.c
-  docs/        src/part3.h  src/part4.h
-*** Commands ***
-    1: clean                2: filter by pattern    3: select by numbers
-    4: ask each             5: quit                 6: help
-What now>     1: a.out          2: docs/          3: src/part3.c    4: src/part3.h
-    5: src/part4.c    6: src/part4.h
-Select items to delete>>     1: a.out          2: docs/        * 3: src/part3.c  * 4: src/part3.h
-  * 5: src/part4.c    6: src/part4.h
-Select items to delete>> Would remove the following items:
-  src/part3.c  src/part3.h  src/part4.c
-*** Commands ***
-    1: clean                2: filter by pattern    3: select by numbers
-    4: ask each             5: quit                 6: help
-What now> Removing src/part3.c
-Removing src/part3.h
-Removing src/part4.c
-ok 13 - git clean -id (select - number 3)
-
-expecting success: 
-
-	mkdir -p build docs &&
-	touch a.out foo.txt bar.txt baz.txt &&
-	test_write_lines s "a.out fo ba bar" "" c |
-	git clean -id &&
-	test -f Makefile &&
-	test ! -f a.out &&
-	test ! -f foo.txt &&
-	test ! -f bar.txt &&
-	test -f baz.txt &&
-	rm baz.txt
-
-
-Would remove the following items:
-  a.out        baz.txt      foo.txt
-  bar.txt      docs/        src/part4.h
-*** Commands ***
-    1: clean                2: filter by pattern    3: select by numbers
-    4: ask each             5: quit                 6: help
-What now>     1: a.out          2: bar.txt        3: baz.txt        4: docs/
-    5: foo.txt        6: src/part4.h
-Select items to delete>> Huh (ba)?
-  * 1: a.out        * 2: bar.txt        3: baz.txt        4: docs/
-  * 5: foo.txt        6: src/part4.h
-Select items to delete>> Would remove the following items:
-  a.out    bar.txt  foo.txt
-*** Commands ***
-    1: clean                2: filter by pattern    3: select by numbers
-    4: ask each             5: quit                 6: help
-What now> Removing a.out
-Removing bar.txt
-Removing foo.txt
-ok 14 - git clean -id (select - filenames)
-
-expecting success: 
-
-	mkdir -p build docs &&
-	touch a.out src/part3.c src/part3.h src/part4.c src/part4.h \
-	docs/manual.txt obj.o build/lib.so &&
-	test_write_lines s "1,3-4" 2 "" c |
-	git clean -id &&
-	test -f Makefile &&
-	test -f README &&
-	test -f src/part1.c &&
-	test -f src/part2.c &&
-	test ! -f a.out &&
-	test ! -f src/part3.c &&
-	test ! -f src/part3.h &&
-	test -f src/part4.c &&
-	test -f src/part4.h &&
-	test ! -f docs/manual.txt &&
-	test -f obj.o &&
-	test -f build/lib.so
-
-
-Would remove the following items:
-  a.out        src/part3.c  src/part4.c
-  docs/        src/part3.h  src/part4.h
-*** Commands ***
-    1: clean                2: filter by pattern    3: select by numbers
-    4: ask each             5: quit                 6: help
-What now>     1: a.out          2: docs/          3: src/part3.c    4: src/part3.h
-    5: src/part4.c    6: src/part4.h
-Select items to delete>>   * 1: a.out          2: docs/        * 3: src/part3.c  * 4: src/part3.h
-    5: src/part4.c    6: src/part4.h
-Select items to delete>>   * 1: a.out        * 2: docs/        * 3: src/part3.c  * 4: src/part3.h
-    5: src/part4.c    6: src/part4.h
-Select items to delete>> Would remove the following items:
-  a.out        docs/        src/part3.c  src/part3.h
-*** Commands ***
-    1: clean                2: filter by pattern    3: select by numbers
-    4: ask each             5: quit                 6: help
-What now> Removing a.out
-Removing docs/
-Removing src/part3.c
-Removing src/part3.h
-ok 15 - git clean -id (select - range)
-
-expecting success: 
-
-	mkdir -p build docs &&
-	touch a.out src/part3.c src/part3.h src/part4.c src/part4.h \
-	docs/manual.txt obj.o build/lib.so &&
-	test_write_lines s "4- 1" "" c |
-	git clean -id &&
-	test -f Makefile &&
-	test -f README &&
-	test -f src/part1.c &&
-	test -f src/part2.c &&
-	test ! -f a.out &&
-	test -f docs/manual.txt &&
-	test -f src/part3.c &&
-	test ! -f src/part3.h &&
-	test ! -f src/part4.c &&
-	test ! -f src/part4.h &&
-	test -f obj.o &&
-	test -f build/lib.so
-
-
-Would remove the following items:
-  a.out        src/part3.c  src/part4.c
-  docs/        src/part3.h  src/part4.h
-*** Commands ***
-    1: clean                2: filter by pattern    3: select by numbers
-    4: ask each             5: quit                 6: help
-What now>     1: a.out          2: docs/          3: src/part3.c    4: src/part3.h
-    5: src/part4.c    6: src/part4.h
-Select items to delete>>   * 1: a.out          2: docs/          3: src/part3.c  * 4: src/part3.h
-  * 5: src/part4.c  * 6: src/part4.h
-Select items to delete>> Would remove the following items:
-  a.out        src/part3.h  src/part4.c  src/part4.h
-*** Commands ***
-    1: clean                2: filter by pattern    3: select by numbers
-    4: ask each             5: quit                 6: help
-What now> Removing a.out
-Removing src/part3.h
-Removing src/part4.c
-Removing src/part4.h
-ok 16 - git clean -id (select - range 2)
-
-expecting success: 
-
-	mkdir -p build docs &&
-	touch a.out src/part3.c src/part3.h src/part4.c src/part4.h \
-	docs/manual.txt obj.o build/lib.so &&
-	test_write_lines s "*" "-5- 1 -2" "" c |
-	git clean -id &&
-	test -f Makefile &&
-	test -f README &&
-	test -f src/part1.c &&
-	test -f src/part2.c &&
-	test ! -f a.out &&
-	test -f docs/manual.txt &&
-	test ! -f src/part3.c &&
-	test ! -f src/part3.h &&
-	test -f src/part4.c &&
-	test -f src/part4.h &&
-	test -f obj.o &&
-	test -f build/lib.so
-
-
-Would remove the following items:
-  a.out        src/part3.c  src/part4.c
-  docs/        src/part3.h  src/part4.h
-*** Commands ***
-    1: clean                2: filter by pattern    3: select by numbers
-    4: ask each             5: quit                 6: help
-What now>     1: a.out          2: docs/          3: src/part3.c    4: src/part3.h
-    5: src/part4.c    6: src/part4.h
-Select items to delete>>   * 1: a.out        * 2: docs/        * 3: src/part3.c  * 4: src/part3.h
-  * 5: src/part4.c  * 6: src/part4.h
-Select items to delete>>   * 1: a.out          2: docs/        * 3: src/part3.c  * 4: src/part3.h
-    5: src/part4.c    6: src/part4.h
-Select items to delete>> Would remove the following items:
-  a.out        src/part3.c  src/part3.h
-*** Commands ***
-    1: clean                2: filter by pattern    3: select by numbers
-    4: ask each             5: quit                 6: help
-What now> Removing a.out
-Removing src/part3.c
-Removing src/part3.h
-ok 17 - git clean -id (inverse select)
-
-expecting success: 
-
-	mkdir -p build docs &&
-	touch a.out src/part3.c src/part3.h src/part4.c src/part4.h \
-	docs/manual.txt obj.o build/lib.so &&
-	test_write_lines a Y y no yes bad "" |
-	git clean -id &&
-	test -f Makefile &&
-	test -f README &&
-	test -f src/part1.c &&
-	test -f src/part2.c &&
-	test ! -f a.out &&
-	test ! -f docs/manual.txt &&
-	test -f src/part3.c &&
-	test ! -f src/part3.h &&
-	test -f src/part4.c &&
-	test -f src/part4.h &&
-	test -f obj.o &&
-	test -f build/lib.so
-
-
-Would remove the following items:
-  a.out        src/part3.c  src/part4.c
-  docs/        src/part3.h  src/part4.h
-*** Commands ***
-    1: clean                2: filter by pattern    3: select by numbers
-    4: ask each             5: quit                 6: help
-What now> Remove a.out [y/N]? Remove docs/ [y/N]? Remove src/part3.c [y/N]? Remove src/part3.h [y/N]? Remove src/part4.c [y/N]? Remove src/part4.h [y/N]? Removing a.out
-Removing docs/
-Removing src/part3.h
-ok 18 - git clean -id (ask)
-
-expecting success: 
-
-	mkdir -p build docs &&
-	touch a.out src/part3.c src/part3.h src/part4.c src/part4.h \
-	docs/manual.txt obj.o build/lib.so &&
-	test_write_lines a Y no yes "\04" |
-	git clean -id &&
-	test -f Makefile &&
-	test -f README &&
-	test -f src/part1.c &&
-	test -f src/part2.c &&
-	test ! -f a.out &&
-	test -f docs/manual.txt &&
-	test ! -f src/part3.c &&
-	test -f src/part3.h &&
-	test -f src/part4.c &&
-	test -f src/part4.h &&
-	test -f obj.o &&
-	test -f build/lib.so
-
-
-Would remove the following items:
-  a.out        src/part3.c  src/part4.c
-  docs/        src/part3.h  src/part4.h
-*** Commands ***
-    1: clean                2: filter by pattern    3: select by numbers
-    4: ask each             5: quit                 6: help
-What now> Remove a.out [y/N]? Remove docs/ [y/N]? Remove src/part3.c [y/N]? Remove src/part3.h [y/N]? Remove src/part4.c [y/N]? 
-Removing a.out
-Removing src/part3.c
-ok 19 - git clean -id (ask - Ctrl+D)
-
-expecting success: 
-
-	mkdir -p build docs &&
-	touch a.out src/part3.c src/part3.h src/part4.c src/part4.h \
-	docs/manual.txt obj.o build/lib.so &&
-	(cd build/ &&
-	 test_write_lines f docs "*.h" "" c |
-	 git clean -id ..) &&
-	test -f Makefile &&
-	test -f README &&
-	test -f src/part1.c &&
-	test -f src/part2.c &&
-	test ! -f a.out &&
-	test -f docs/manual.txt &&
-	test ! -f src/part3.c &&
-	test -f src/part3.h &&
-	test ! -f src/part4.c &&
-	test -f src/part4.h &&
-	test -f obj.o &&
-	test -f build/lib.so
-
-
-Would remove the following items:
-  ../a.out        ../src/part3.c  ../src/part4.c
-  ../docs/        ../src/part3.h  ../src/part4.h
-*** Commands ***
-    1: clean                2: filter by pattern    3: select by numbers
-    4: ask each             5: quit                 6: help
-What now>   ../a.out        ../src/part3.c  ../src/part4.c
-  ../docs/        ../src/part3.h  ../src/part4.h
-Input ignore patterns>>   ../a.out        ../src/part3.h  ../src/part4.h
-  ../src/part3.c  ../src/part4.c
-Input ignore patterns>>   ../a.out        ../src/part3.c  ../src/part4.c
-Input ignore patterns>> Would remove the following items:
-  ../a.out        ../src/part3.c  ../src/part4.c
-*** Commands ***
-    1: clean                2: filter by pattern    3: select by numbers
-    4: ask each             5: quit                 6: help
-What now> Removing ../a.out
-Removing ../src/part3.c
-Removing ../src/part4.c
-ok 20 - git clean -id with prefix and path (filter)
-
-expecting success: 
-
-	mkdir -p build docs &&
-	touch a.out src/part3.c src/part3.h src/part4.c src/part4.h \
-	docs/manual.txt obj.o build/lib.so &&
-	(cd build/ &&
-	 test_write_lines s ../docs/ ../src/part3.c ../src/part4.c "" c |
-	 git clean -id ..) &&
-	test -f Makefile &&
-	test -f README &&
-	test -f src/part1.c &&
-	test -f src/part2.c &&
-	test -f a.out &&
-	test ! -f docs/manual.txt &&
-	test ! -f src/part3.c &&
-	test -f src/part3.h &&
-	test ! -f src/part4.c &&
-	test -f src/part4.h &&
-	test -f obj.o &&
-	test -f build/lib.so
-
-
-Would remove the following items:
-  ../a.out        ../src/part3.c  ../src/part4.c
-  ../docs/        ../src/part3.h  ../src/part4.h
-*** Commands ***
-    1: clean                2: filter by pattern    3: select by numbers
-    4: ask each             5: quit                 6: help
-What now>     1: ../a.out          2: ../docs/          3: ../src/part3.c
-    4: ../src/part3.h    5: ../src/part4.c    6: ../src/part4.h
-Select items to delete>>     1: ../a.out        * 2: ../docs/          3: ../src/part3.c
-    4: ../src/part3.h    5: ../src/part4.c    6: ../src/part4.h
-Select items to delete>>     1: ../a.out        * 2: ../docs/        * 3: ../src/part3.c
-    4: ../src/part3.h    5: ../src/part4.c    6: ../src/part4.h
-Select items to delete>>     1: ../a.out        * 2: ../docs/        * 3: ../src/part3.c
-    4: ../src/part3.h  * 5: ../src/part4.c    6: ../src/part4.h
-Select items to delete>> Would remove the following items:
-  ../docs/        ../src/part3.c  ../src/part4.c
-*** Commands ***
-    1: clean                2: filter by pattern    3: select by numbers
-    4: ask each             5: quit                 6: help
-What now> Removing ../docs/
-Removing ../src/part3.c
-Removing ../src/part4.c
-ok 21 - git clean -id with prefix and path (select by name)
-
-expecting success: 
-
-	mkdir -p build docs &&
-	touch a.out src/part3.c src/part3.h src/part4.c src/part4.h \
-	docs/manual.txt obj.o build/lib.so &&
-	(cd build/ &&
-	 test_write_lines a Y y no yes bad "" |
-	 git clean -id ..) &&
-	test -f Makefile &&
-	test -f README &&
-	test -f src/part1.c &&
-	test -f src/part2.c &&
-	test ! -f a.out &&
-	test ! -f docs/manual.txt &&
-	test -f src/part3.c &&
-	test ! -f src/part3.h &&
-	test -f src/part4.c &&
-	test -f src/part4.h &&
-	test -f obj.o &&
-	test -f build/lib.so
-
-
-Would remove the following items:
-  ../a.out        ../src/part3.c  ../src/part4.c
-  ../docs/        ../src/part3.h  ../src/part4.h
-*** Commands ***
-    1: clean                2: filter by pattern    3: select by numbers
-    4: ask each             5: quit                 6: help
-What now> Remove ../a.out [y/N]? Remove ../docs/ [y/N]? Remove ../src/part3.c [y/N]? Remove ../src/part3.h [y/N]? Remove ../src/part4.c [y/N]? Remove ../src/part4.h [y/N]? Removing ../a.out
-Removing ../docs/
-Removing ../src/part3.h
-ok 22 - git clean -id with prefix and path (ask)
-
-checking prerequisite: TTY
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
-	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: 
-	>a.out &&
-	echo q |
-	test_terminal git clean -i |
-	test_decode_color |
-	head -n 1 >header &&
-	# not i18ngrep
-	grep "^<BOLD>" header
-
-<BOLD>Would remove the following items:
-ok 23 - git clean -i paints the header in HEADER color
-
-# passed all 23 test(s)
-1..23
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t6043-merge-rename-directories.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6043-merge-rename-directories/.git/
-expecting success: 
-	test_create_repo 1a &&
-	(
-		cd 1a &&
-
-		mkdir z &&
-		echo b >z/b &&
-		echo c >z/c &&
-		git add z &&
-		test_tick &&
-		git commit -m "O" &&
-
-		git branch O &&
-		git branch A &&
-		git branch B &&
-
-		git checkout A &&
-		git mv z y &&
-		test_tick &&
-		git commit -m "A" &&
-
-		git checkout B &&
-		echo d >z/d &&
-		mkdir z/e &&
-		echo f >z/e/f &&
-		git add z/d z/e/f &&
-		test_tick &&
-		git commit -m "B"
-	)
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6043-merge-rename-directories/1a/.git/
-[master (root-commit) 4e96174] O
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 z/b
- create mode 100644 z/c
-Switched to branch 'A'
-[A 4e9f86d] A
- Author: A U Thor <author@example.com>
- 2 files changed, 0 insertions(+), 0 deletions(-)
- rename {z => y}/b (100%)
- rename {z => y}/c (100%)
-Switched to branch 'B'
-[B aa97264] B
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 z/d
- create mode 100644 z/e/f
-ok 1 - 1a-setup: Simple directory rename detection
-
-expecting success: 
-	(
-		cd 1a &&
-
-		git checkout A^0 &&
-
-		git merge -s recursive B^0 &&
-
-		git ls-files -s >out &&
-		test_line_count = 4 out &&
-
-		git rev-parse >actual \
-			HEAD:y/b HEAD:y/c HEAD:y/d HEAD:y/e/f &&
-		git rev-parse >expect \
-			O:z/b    O:z/c    B:z/d    B:z/e/f &&
-		test_cmp expect actual &&
-
-		git hash-object y/d >actual &&
-		git rev-parse B:z/d >expect &&
-		test_cmp expect actual &&
-
-		test_must_fail git rev-parse HEAD:z/d &&
-		test_must_fail git rev-parse HEAD:z/e/f &&
-		test_path_is_missing z/d &&
-		test_path_is_missing z/e/f
-	)
-
-Note: checking out '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 performing another checkout.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
-
-  git checkout -b <new-branch-name>
-
-HEAD is now at 4e9f86d A
-Merging:
-4e9f86d A
-virtual B^0
-found 1 common ancestor:
-4e96174 O
-Skipped y/c (merged same as existing)
-Skipped y/b (merged same as existing)
-Merge made by the 'recursive' strategy.
- y/d   | 1 +
- y/e/f | 1 +
- 2 files changed, 2 insertions(+)
- create mode 100644 y/d
- create mode 100644 y/e/f
-fatal: Path 'z/d' does not exist in 'HEAD'
-HEAD:z/d
-fatal: Path 'z/e/f' does not exist in 'HEAD'
-HEAD:z/e/f
-ok 2 - 1a-check: Simple directory rename detection
-
-expecting success: 
-	test_create_repo 1b &&
-	(
-		cd 1b &&
-
-		mkdir z &&
-		echo b >z/b &&
-		echo c >z/c &&
-		mkdir y &&
-		echo d >y/d &&
-		git add z y &&
-		test_tick &&
-		git commit -m "O" &&
-
-		git branch O &&
-		git branch A &&
-		git branch B &&
-
-		git checkout A &&
-		echo e >z/e &&
-		git add z/e &&
-		test_tick &&
-		git commit -m "A" &&
-
-		git checkout B &&
-		git mv z/b y &&
-		git mv z/c y &&
-		rmdir z &&
-		test_tick &&
-		git commit -m "B"
-	)
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6043-merge-rename-directories/1b/.git/
-[master (root-commit) 828128d] O
- Author: A U Thor <author@example.com>
- 3 files changed, 3 insertions(+)
- create mode 100644 y/d
- create mode 100644 z/b
- create mode 100644 z/c
-Switched to branch 'A'
-[A 62cf902] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 z/e
-Switched to branch 'B'
-[B 2a8bd7d] B
- Author: A U Thor <author@example.com>
- 2 files changed, 0 insertions(+), 0 deletions(-)
- rename {z => y}/b (100%)
- rename {z => y}/c (100%)
-ok 3 - 1b-setup: Merge a directory with another
-
-expecting success: 
-	(
-		cd 1b &&
-
-		git checkout A^0 &&
-
-		git merge -s recursive B^0 &&
-
-		git ls-files -s >out &&
-		test_line_count = 4 out &&
-
-		git rev-parse >actual \
-			HEAD:y/b HEAD:y/c HEAD:y/d HEAD:y/e &&
-		git rev-parse >expect \
-			O:z/b    O:z/c    O:y/d    A:z/e &&
-		test_cmp expect actual &&
-		test_must_fail git rev-parse HEAD:z/e
-	)
-
-Note: checking out '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 performing another checkout.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
-
-  git checkout -b <new-branch-name>
-
-HEAD is now at 62cf902 A
-Merging:
-62cf902 A
-virtual B^0
-found 1 common ancestor:
-828128d O
-Merge made by the 'recursive' strategy.
- {z => y}/b | 0
- {z => y}/c | 0
- {z => y}/e | 0
- 3 files changed, 0 insertions(+), 0 deletions(-)
- rename {z => y}/b (100%)
- rename {z => y}/c (100%)
- rename {z => y}/e (100%)
-fatal: Path 'z/e' does not exist in 'HEAD'
-HEAD:z/e
-ok 4 - 1b-check: Merge a directory with another
-
-expecting success: 
-	test_create_repo 1c &&
-	(
-		cd 1c &&
-
-		mkdir z &&
-		echo b >z/b &&
-		echo c >z/c &&
-		mkdir x &&
-		echo d >x/d &&
-		git add z x &&
-		test_tick &&
-		git commit -m "O" &&
-
-		git branch O &&
-		git branch A &&
-		git branch B &&
-
-		git checkout A &&
-		git mv z y &&
-		test_tick &&
-		git commit -m "A" &&
-
-		git checkout B &&
-		git mv x/d z/d &&
-		test_tick &&
-		git commit -m "B"
-	)
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6043-merge-rename-directories/1c/.git/
-[master (root-commit) 1e3967e] O
- Author: A U Thor <author@example.com>
- 3 files changed, 3 insertions(+)
- create mode 100644 x/d
- create mode 100644 z/b
- create mode 100644 z/c
-Switched to branch 'A'
-[A 623f815] A
- Author: A U Thor <author@example.com>
- 2 files changed, 0 insertions(+), 0 deletions(-)
- rename {z => y}/b (100%)
- rename {z => y}/c (100%)
-Switched to branch 'B'
-[B c9f07f0] B
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename {x => z}/d (100%)
-ok 5 - 1c-setup: Transitive renaming
-
-expecting success: 
-	(
-		cd 1c &&
-
-		git checkout A^0 &&
-
-		git merge -s recursive B^0 &&
-
-		git ls-files -s >out &&
-		test_line_count = 3 out &&
-
-		git rev-parse >actual \
-			HEAD:y/b HEAD:y/c HEAD:y/d &&
-		git rev-parse >expect \
-			O:z/b    O:z/c    O:x/d &&
-		test_cmp expect actual &&
-		test_must_fail git rev-parse HEAD:x/d &&
-		test_must_fail git rev-parse HEAD:z/d &&
-		test_path_is_missing z/d
-	)
-
-Note: checking out '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 performing another checkout.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
-
-  git checkout -b <new-branch-name>
-
-HEAD is now at 623f815 A
-Merging:
-623f815 A
-virtual B^0
-found 1 common ancestor:
-1e3967e O
-Skipped y/c (merged same as existing)
-Skipped y/b (merged same as existing)
-Merge made by the 'recursive' strategy.
- {x => y}/d | 0
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename {x => y}/d (100%)
-fatal: Path 'x/d' does not exist in 'HEAD'
-HEAD:x/d
-fatal: Path 'z/d' does not exist in 'HEAD'
-HEAD:z/d
-ok 6 - 1c-check: Transitive renaming
-
-expecting success: 
-	test_create_repo 1d &&
-	(
-		cd 1d &&
-
-		mkdir z &&
-		echo b >z/b &&
-		echo c >z/c &&
-		mkdir y &&
-		echo d >y/d &&
-		echo e >y/e &&
-		git add z y &&
-		test_tick &&
-		git commit -m "O" &&
-
-		git branch O &&
-		git branch A &&
-		git branch B &&
-
-		git checkout A &&
-		git mv z x &&
-		echo m >y/m &&
-		echo wham1 >y/wham &&
-		git add y &&
-		test_tick &&
-		git commit -m "A" &&
-
-		git checkout B &&
-		git mv y x &&
-		echo n >z/n &&
-		echo wham2 >z/wham &&
-		git add z &&
-		test_tick &&
-		git commit -m "B"
-	)
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6043-merge-rename-directories/1d/.git/
-[master (root-commit) a5c945e] O
- Author: A U Thor <author@example.com>
- 4 files changed, 4 insertions(+)
- create mode 100644 y/d
- create mode 100644 y/e
- create mode 100644 z/b
- create mode 100644 z/c
-Switched to branch 'A'
-[A e0494ce] A
- Author: A U Thor <author@example.com>
- 4 files changed, 2 insertions(+)
- rename {z => x}/b (100%)
- rename {z => x}/c (100%)
- create mode 100644 y/m
- create mode 100644 y/wham
-Switched to branch 'B'
-[B 7f8e93c] B
- Author: A U Thor <author@example.com>
- 4 files changed, 2 insertions(+)
- rename {y => x}/d (100%)
- rename {y => x}/e (100%)
- create mode 100644 z/n
- create mode 100644 z/wham
-ok 7 - 1d-setup: Directory renames cause a rename/rename(2to1) conflict
-
-expecting success: 
-	(
-		cd 1d &&
-
-		git checkout A^0 &&
-
-		test_must_fail git merge -s recursive B^0 >out &&
-		test_i18ngrep "CONFLICT (rename/rename)" out &&
-
-		git ls-files -s >out &&
-		test_line_count = 8 out &&
-		git ls-files -u >out &&
-		test_line_count = 2 out &&
-		git ls-files -o >out &&
-		test_line_count = 3 out &&
-
-		git rev-parse >actual \
-			:0:x/b :0:x/c :0:x/d :0:x/e :0:x/m :0:x/n &&
-		git rev-parse >expect \
-			 O:z/b  O:z/c  O:y/d  O:y/e  A:y/m  B:z/n &&
-		test_cmp expect actual &&
-
-		test_must_fail git rev-parse :0:x/wham &&
-		git rev-parse >actual \
-			:2:x/wham :3:x/wham &&
-		git rev-parse >expect \
-			 A:y/wham  B:z/wham &&
-		test_cmp expect actual &&
-
-		test_path_is_missing x/wham &&
-		test_path_is_file x/wham~HEAD &&
-		test_path_is_file x/wham~B^0 &&
-
-		git hash-object >actual \
-			x/wham~HEAD x/wham~B^0 &&
-		git rev-parse >expect \
-			A:y/wham    B:z/wham &&
-		test_cmp expect actual
-	)
-
-Note: checking out '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 performing another checkout.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
-
-  git checkout -b <new-branch-name>
-
-HEAD is now at e0494ce A
-CONFLICT (rename/rename): Rename y/wham->x/wham in HEAD. Rename z/wham->x/wham in B^0
-fatal: Path 'x/wham' is in the index, but not at stage 0.
-Did you mean ':2:x/wham'?
-:0:x/wham
-ok 8 - 1d-check: Directory renames cause a rename/rename(2to1) conflict
-
-expecting success: 
-	test_create_repo 1e &&
-	(
-		cd 1e &&
-
-		mkdir z &&
-		echo b >z/oldb &&
-		echo c >z/oldc &&
-		git add z &&
-		test_tick &&
-		git commit -m "O" &&
-
-		git branch O &&
-		git branch A &&
-		git branch B &&
-
-		git checkout A &&
-		mkdir y &&
-		git mv z/oldb y/newb &&
-		git mv z/oldc y/newc &&
-		test_tick &&
-		git commit -m "A" &&
-
-		git checkout B &&
-		echo d >z/d &&
-		git add z/d &&
-		test_tick &&
-		git commit -m "B"
-	)
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6043-merge-rename-directories/1e/.git/
-[master (root-commit) a0c453d] O
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 z/oldb
- create mode 100644 z/oldc
-Switched to branch 'A'
-[A e7f73d0] A
- Author: A U Thor <author@example.com>
- 2 files changed, 0 insertions(+), 0 deletions(-)
- rename z/oldb => y/newb (100%)
- rename z/oldc => y/newc (100%)
-Switched to branch 'B'
-[B b36bf99] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 z/d
-ok 9 - 1e-setup: Renamed directory, with all files being renamed too
-
-expecting success: 
-	(
-		cd 1e &&
-
-		git checkout A^0 &&
-
-		git merge -s recursive B^0 &&
-
-		git ls-files -s >out &&
-		test_line_count = 3 out &&
-
-		git rev-parse >actual \
-			HEAD:y/newb HEAD:y/newc HEAD:y/d &&
-		git rev-parse >expect \
-			O:z/oldb    O:z/oldc    B:z/d &&
-		test_cmp expect actual &&
-		test_must_fail git rev-parse HEAD:z/d
-	)
-
-Note: checking out '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 performing another checkout.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
-
-  git checkout -b <new-branch-name>
-
-HEAD is now at e7f73d0 A
-Merging:
-e7f73d0 A
-virtual B^0
-found 1 common ancestor:
-a0c453d O
-Skipped y/newc (merged same as existing)
-Skipped y/newb (merged same as existing)
-Merge made by the 'recursive' strategy.
- y/d | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 y/d
-fatal: Path 'z/d' does not exist in 'HEAD'
-HEAD:z/d
-ok 10 - 1e-check: Renamed directory, with all files being renamed too
-
-expecting success: 
-	test_create_repo 1f &&
-	(
-		cd 1f &&
-
-		mkdir z &&
-		echo b >z/b &&
-		echo c >z/c &&
-		echo d >z/d &&
-		echo e >z/e &&
-		echo f >z/f &&
-		git add z &&
-		test_tick &&
-		git commit -m "O" &&
-
-		git branch O &&
-		git branch A &&
-		git branch B &&
-
-		git checkout A &&
-		echo g >z/g &&
-		git add z/g &&
-		test_tick &&
-		git commit -m "A" &&
-
-		git checkout B &&
-		mkdir y &&
-		mkdir x &&
-		git mv z/b y/ &&
-		git mv z/c y/ &&
-		git mv z/d x/ &&
-		git mv z/e x/ &&
-		git mv z/f x/ &&
-		rmdir z &&
-		test_tick &&
-		git commit -m "B"
-	)
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6043-merge-rename-directories/1f/.git/
-[master (root-commit) bc89ae6] O
- Author: A U Thor <author@example.com>
- 5 files changed, 5 insertions(+)
- create mode 100644 z/b
- create mode 100644 z/c
- create mode 100644 z/d
- create mode 100644 z/e
- create mode 100644 z/f
-Switched to branch 'A'
-[A d83c371] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 z/g
-Switched to branch 'B'
-[B 2106ef0] B
- Author: A U Thor <author@example.com>
- 5 files changed, 0 insertions(+), 0 deletions(-)
- rename {z => x}/d (100%)
- rename {z => x}/e (100%)
- rename {z => x}/f (100%)
- rename {z => y}/b (100%)
- rename {z => y}/c (100%)
-ok 11 - 1f-setup: Split a directory into two other directories
-
-expecting success: 
-	(
-		cd 1f &&
-
-		git checkout A^0 &&
-
-		git merge -s recursive B^0 &&
-
-		git ls-files -s >out &&
-		test_line_count = 6 out &&
-
-		git rev-parse >actual \
-			HEAD:y/b HEAD:y/c HEAD:x/d HEAD:x/e HEAD:x/f HEAD:x/g &&
-		git rev-parse >expect \
-			O:z/b    O:z/c    O:z/d    O:z/e    O:z/f    A:z/g &&
-		test_cmp expect actual &&
-		test_path_is_missing z/g &&
-		test_must_fail git rev-parse HEAD:z/g
-	)
-
-Note: checking out '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 performing another checkout.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
-
-  git checkout -b <new-branch-name>
-
-HEAD is now at d83c371 A
-Merging:
-d83c371 A
-virtual B^0
-found 1 common ancestor:
-bc89ae6 O
-Merge made by the 'recursive' strategy.
- {z => x}/d | 0
- {z => x}/e | 0
- {z => x}/f | 0
- {z => x}/g | 0
- {z => y}/b | 0
- {z => y}/c | 0
- 6 files changed, 0 insertions(+), 0 deletions(-)
- rename {z => x}/d (100%)
- rename {z => x}/e (100%)
- rename {z => x}/f (100%)
- rename {z => x}/g (100%)
- rename {z => y}/b (100%)
- rename {z => y}/c (100%)
-fatal: Path 'z/g' does not exist in 'HEAD'
-HEAD:z/g
-ok 12 - 1f-check: Split a directory into two other directories
-
-expecting success: 
-	test_create_repo 2a &&
-	(
-		cd 2a &&
-
-		mkdir z &&
-		echo b >z/b &&
-		echo c >z/c &&
-		git add z &&
-		test_tick &&
-		git commit -m "O" &&
-
-		git branch O &&
-		git branch A &&
-		git branch B &&
-
-		git checkout A &&
-		mkdir y &&
-		mkdir w &&
-		git mv z/b y/ &&
-		git mv z/c w/ &&
-		test_tick &&
-		git commit -m "A" &&
-
-		git checkout B &&
-		echo d >z/d &&
-		git add z/d &&
-		test_tick &&
-		git commit -m "B"
-	)
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6043-merge-rename-directories/2a/.git/
-[master (root-commit) 4e96174] O
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 z/b
- create mode 100644 z/c
-Switched to branch 'A'
-[A 6af9a4d] A
- Author: A U Thor <author@example.com>
- 2 files changed, 0 insertions(+), 0 deletions(-)
- rename {z => w}/c (100%)
- rename {z => y}/b (100%)
-Switched to branch 'B'
-[B db43152] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 z/d
-ok 13 - 2a-setup: Directory split into two on one side, with equal numbers of paths
-
-expecting success: 
-	(
-		cd 2a &&
-
-		git checkout A^0 &&
-
-		test_must_fail git merge -s recursive B^0 >out &&
-		test_i18ngrep "CONFLICT.*directory rename split" out &&
-
-		git ls-files -s >out &&
-		test_line_count = 3 out &&
-		git ls-files -u >out &&
-		test_line_count = 0 out &&
-		git ls-files -o >out &&
-		test_line_count = 1 out &&
-
-		git rev-parse >actual \
-			:0:y/b :0:w/c :0:z/d &&
-		git rev-parse >expect \
-			 O:z/b  O:z/c  B:z/d &&
-		test_cmp expect actual
-	)
-
-Note: checking out '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 performing another checkout.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
-
-  git checkout -b <new-branch-name>
-
-HEAD is now at 6af9a4d A
-CONFLICT (directory rename split): Unclear where to place z/d because directory z was renamed to multiple other directories, with no destination getting a majority of the files.
-ok 14 - 2a-check: Directory split into two on one side, with equal numbers of paths
-
-expecting success: 
-	test_create_repo 2b &&
-	(
-		cd 2b &&
-
-		mkdir z &&
-		echo b >z/b &&
-		echo c >z/c &&
-		git add z &&
-		test_tick &&
-		git commit -m "O" &&
-
-		git branch O &&
-		git branch A &&
-		git branch B &&
-
-		git checkout A &&
-		mkdir y &&
-		mkdir w &&
-		git mv z/b y/ &&
-		git mv z/c w/ &&
-		test_tick &&
-		git commit -m "A" &&
-
-		git checkout B &&
-		mkdir x &&
-		echo d >x/d &&
-		git add x/d &&
-		test_tick &&
-		git commit -m "B"
-	)
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6043-merge-rename-directories/2b/.git/
-[master (root-commit) 4e96174] O
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 z/b
- create mode 100644 z/c
-Switched to branch 'A'
-[A 6af9a4d] A
- Author: A U Thor <author@example.com>
- 2 files changed, 0 insertions(+), 0 deletions(-)
- rename {z => w}/c (100%)
- rename {z => y}/b (100%)
-Switched to branch 'B'
-[B c2fe7fb] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 x/d
-ok 15 - 2b-setup: Directory split into two on one side, with equal numbers of paths
-
-expecting success: 
-	(
-		cd 2b &&
-
-		git checkout A^0 &&
-
-		git merge -s recursive B^0 >out &&
-
-		git ls-files -s >out &&
-		test_line_count = 3 out &&
-		git ls-files -u >out &&
-		test_line_count = 0 out &&
-		git ls-files -o >out &&
-		test_line_count = 1 out &&
-
-		git rev-parse >actual \
-			:0:y/b :0:w/c :0:x/d &&
-		git rev-parse >expect \
-			 O:z/b  O:z/c  B:x/d &&
-		test_cmp expect actual &&
-		test_i18ngrep ! "CONFLICT.*directory rename split" out
-	)
-
-Note: checking out '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 performing another checkout.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
-
-  git checkout -b <new-branch-name>
-
-HEAD is now at 6af9a4d A
-ok 16 - 2b-check: Directory split into two on one side, with equal numbers of paths
-
-expecting success: 
-	test_create_repo 3a &&
-	(
-		cd 3a &&
-
-		mkdir z &&
-		echo b >z/b &&
-		echo c >z/c &&
-		echo d >z/d &&
-		git add z &&
-		test_tick &&
-		git commit -m "O" &&
-
-		git branch O &&
-		git branch A &&
-		git branch B &&
-
-		git checkout A &&
-		test_tick &&
-		git commit --allow-empty -m "A" &&
-
-		git checkout B &&
-		mkdir y &&
-		mkdir x &&
-		git mv z/b y/ &&
-		git mv z/c y/ &&
-		git mv z/d x/ &&
-		rmdir z &&
-		test_tick &&
-		git commit -m "B"
-	)
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6043-merge-rename-directories/3a/.git/
-[master (root-commit) 6c15033] O
- Author: A U Thor <author@example.com>
- 3 files changed, 3 insertions(+)
- create mode 100644 z/b
- create mode 100644 z/c
- create mode 100644 z/d
-Switched to branch 'A'
-[A 73b131e] A
- Author: A U Thor <author@example.com>
-Switched to branch 'B'
-[B d135340] B
- Author: A U Thor <author@example.com>
- 3 files changed, 0 insertions(+), 0 deletions(-)
- rename {z => x}/d (100%)
- rename {z => y}/b (100%)
- rename {z => y}/c (100%)
-ok 17 - 3a-setup: Avoid implicit rename if involved as source on other side
-
-expecting success: 
-	(
-		cd 3a &&
-
-		git checkout A^0 &&
-
-		git merge -s recursive B^0 &&
-
-		git ls-files -s >out &&
-		test_line_count = 3 out &&
-
-		git rev-parse >actual \
-			HEAD:y/b HEAD:y/c HEAD:x/d &&
-		git rev-parse >expect \
-			O:z/b    O:z/c    O:z/d &&
-		test_cmp expect actual
-	)
-
-Note: checking out '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 performing another checkout.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
-
-  git checkout -b <new-branch-name>
-
-HEAD is now at 73b131e A
-Merging:
-73b131e A
-virtual B^0
-found 1 common ancestor:
-6c15033 O
-Merge made by the 'recursive' strategy.
- {z => x}/d | 0
- {z => y}/b | 0
- {z => y}/c | 0
- 3 files changed, 0 insertions(+), 0 deletions(-)
- rename {z => x}/d (100%)
- rename {z => y}/b (100%)
- rename {z => y}/c (100%)
-ok 18 - 3a-check: Avoid implicit rename if involved as source on other side
-
-expecting success: 
-	test_create_repo 3b &&
-	(
-		cd 3b &&
-
-		mkdir z &&
-		echo b >z/b &&
-		echo c >z/c &&
-		echo d >z/d &&
-		git add z &&
-		test_tick &&
-		git commit -m "O" &&
-
-		git branch O &&
-		git branch A &&
-		git branch B &&
-
-		git checkout A &&
-		mkdir y &&
-		mkdir x &&
-		git mv z/b y/ &&
-		git mv z/c y/ &&
-		git mv z/d x/ &&
-		rmdir z &&
-		test_tick &&
-		git commit -m "A" &&
-
-		git checkout B &&
-		mkdir w &&
-		git mv z/d w/ &&
-		test_tick &&
-		git commit -m "B"
-	)
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6043-merge-rename-directories/3b/.git/
-[master (root-commit) 6c15033] O
- Author: A U Thor <author@example.com>
- 3 files changed, 3 insertions(+)
- create mode 100644 z/b
- create mode 100644 z/c
- create mode 100644 z/d
-Switched to branch 'A'
-[A 5eead67] A
- Author: A U Thor <author@example.com>
- 3 files changed, 0 insertions(+), 0 deletions(-)
- rename {z => x}/d (100%)
- rename {z => y}/b (100%)
- rename {z => y}/c (100%)
-Switched to branch 'B'
-[B 464e387] B
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename {z => w}/d (100%)
-ok 19 - 3b-setup: Avoid implicit rename if involved as source on current side
-
-expecting success: 
-	(
-		cd 3b &&
-
-		git checkout A^0 &&
-
-		test_must_fail git merge -s recursive B^0 >out &&
-		test_i18ngrep CONFLICT.*rename/rename.*z/d.*x/d.*w/d out &&
-		test_i18ngrep ! CONFLICT.*rename/rename.*y/d out &&
-
-		git ls-files -s >out &&
-		test_line_count = 5 out &&
-		git ls-files -u >out &&
-		test_line_count = 3 out &&
-		git ls-files -o >out &&
-		test_line_count = 1 out &&
-
-		git rev-parse >actual \
-			:0:y/b :0:y/c :1:z/d :2:x/d :3:w/d &&
-		git rev-parse >expect \
-			 O:z/b  O:z/c  O:z/d  O:z/d  O:z/d &&
-		test_cmp expect actual &&
-
-		test_path_is_missing z/d &&
-		git hash-object >actual \
-			x/d   w/d &&
-		git rev-parse >expect \
-			O:z/d O:z/d &&
-		test_cmp expect actual
-	)
-
-Note: checking out '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 performing another checkout.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
-
-  git checkout -b <new-branch-name>
-
-HEAD is now at 5eead67 A
-CONFLICT (rename/rename): Rename "z/d"->"x/d" in branch "HEAD" rename "z/d"->"w/d" in "B^0"
-ok 20 - 3b-check: Avoid implicit rename if involved as source on current side
-
-expecting success: 
-	test_create_repo 4a &&
-	(
-		cd 4a &&
-
-		mkdir z &&
-		echo b >z/b &&
-		echo c >z/c &&
-		echo d >z/d &&
-		echo e >z/e &&
-		git add z &&
-		test_tick &&
-		git commit -m "O" &&
-
-		git branch O &&
-		git branch A &&
-		git branch B &&
-
-		git checkout A &&
-		mkdir y &&
-		git mv z/b y/ &&
-		git mv z/c y/ &&
-		git mv z/d y/ &&
-		test_tick &&
-		git commit -m "A" &&
-
-		git checkout B &&
-		echo f >z/f &&
-		git add z/f &&
-		test_tick &&
-		git commit -m "B"
-	)
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6043-merge-rename-directories/4a/.git/
-[master (root-commit) 9e2ca6f] O
- Author: A U Thor <author@example.com>
- 4 files changed, 4 insertions(+)
- create mode 100644 z/b
- create mode 100644 z/c
- create mode 100644 z/d
- create mode 100644 z/e
-Switched to branch 'A'
-[A 9c11b44] A
- Author: A U Thor <author@example.com>
- 3 files changed, 0 insertions(+), 0 deletions(-)
- rename {z => y}/b (100%)
- rename {z => y}/c (100%)
- rename {z => y}/d (100%)
-Switched to branch 'B'
-[B aa71186] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 z/f
-ok 21 - 4a-setup: Directory split, with original directory still present
-
-expecting success: 
-	(
-		cd 4a &&
-
-		git checkout A^0 &&
-
-		git merge -s recursive B^0 &&
-
-		git ls-files -s >out &&
-		test_line_count = 5 out &&
-		git ls-files -u >out &&
-		test_line_count = 0 out &&
-		git ls-files -o >out &&
-		test_line_count = 1 out &&
-
-		git rev-parse >actual \
-			HEAD:y/b HEAD:y/c HEAD:y/d HEAD:z/e HEAD:z/f &&
-		git rev-parse >expect \
-			O:z/b    O:z/c    O:z/d    O:z/e    B:z/f &&
-		test_cmp expect actual
-	)
-
-Note: checking out '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 performing another checkout.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
-
-  git checkout -b <new-branch-name>
-
-HEAD is now at 9c11b44 A
-Merging:
-9c11b44 A
-virtual B^0
-found 1 common ancestor:
-9e2ca6f O
-Skipped y/d (merged same as existing)
-Skipped y/c (merged same as existing)
-Skipped y/b (merged same as existing)
-Merge made by the 'recursive' strategy.
- z/f | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 z/f
-ok 22 - 4a-check: Directory split, with original directory still present
-
-expecting success: 
-	test_create_repo 5a &&
-	(
-		cd 5a &&
-
-		mkdir z &&
-		echo b >z/b &&
-		echo c >z/c &&
-		mkdir y &&
-		echo d >y/d &&
-		git add z y &&
-		test_tick &&
-		git commit -m "O" &&
-
-		git branch O &&
-		git branch A &&
-		git branch B &&
-
-		git checkout A &&
-		echo e1 >z/e &&
-		echo f >z/f &&
-		echo e2 >y/e &&
-		git add z/e z/f y/e &&
-		test_tick &&
-		git commit -m "A" &&
-
-		git checkout B &&
-		git mv z/b y/ &&
-		git mv z/c y/ &&
-		rmdir z &&
-		test_tick &&
-		git commit -m "B"
-	)
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6043-merge-rename-directories/5a/.git/
-[master (root-commit) 828128d] O
- Author: A U Thor <author@example.com>
- 3 files changed, 3 insertions(+)
- create mode 100644 y/d
- create mode 100644 z/b
- create mode 100644 z/c
-Switched to branch 'A'
-[A b42bf3c] A
- Author: A U Thor <author@example.com>
- 3 files changed, 3 insertions(+)
- create mode 100644 y/e
- create mode 100644 z/e
- create mode 100644 z/f
-Switched to branch 'B'
-[B 2a8bd7d] B
- Author: A U Thor <author@example.com>
- 2 files changed, 0 insertions(+), 0 deletions(-)
- rename {z => y}/b (100%)
- rename {z => y}/c (100%)
-ok 23 - 5a-setup: Merge directories, other side adds files to original and target
-
-expecting success: 
-	(
-		cd 5a &&
-
-		git checkout A^0 &&
-
-		test_must_fail git merge -s recursive B^0 >out &&
-		test_i18ngrep "CONFLICT.*implicit dir rename" out &&
-
-		git ls-files -s >out &&
-		test_line_count = 6 out &&
-		git ls-files -u >out &&
-		test_line_count = 0 out &&
-		git ls-files -o >out &&
-		test_line_count = 1 out &&
-
-		git rev-parse >actual \
-			:0:y/b :0:y/c :0:y/d :0:y/e :0:z/e :0:y/f &&
-		git rev-parse >expect \
-			 O:z/b  O:z/c  O:y/d  A:y/e  A:z/e  A:z/f &&
-		test_cmp expect actual
-	)
-
-Note: checking out '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 performing another checkout.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
-
-  git checkout -b <new-branch-name>
-
-HEAD is now at b42bf3c A
-CONFLICT (implicit dir rename): Existing file/dir at y/e in the way of implicit directory rename(s) putting the following path(s) there: z/e.
-ok 24 - 5a-check: Merge directories, other side adds files to original and target
-
-expecting success: 
-	test_create_repo 5b &&
-	(
-		cd 5b &&
-
-		mkdir z &&
-		echo b >z/b &&
-		echo c >z/c &&
-		echo d1 >z/d &&
-		git add z &&
-		test_tick &&
-		git commit -m "O" &&
-
-		git branch O &&
-		git branch A &&
-		git branch B &&
-
-		git checkout A &&
-		git rm z/d &&
-		git mv z y &&
-		echo d2 >y/d &&
-		git add y/d &&
-		test_tick &&
-		git commit -m "A" &&
-
-		git checkout B &&
-		mkdir y &&
-		echo d3 >y/d &&
-		echo e >z/e &&
-		git add y/d z/e &&
-		test_tick &&
-		git commit -m "B"
-	)
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6043-merge-rename-directories/5b/.git/
-[master (root-commit) 66a9911] O
- Author: A U Thor <author@example.com>
- 3 files changed, 3 insertions(+)
- create mode 100644 z/b
- create mode 100644 z/c
- create mode 100644 z/d
-Switched to branch 'A'
-rm 'z/d'
-[A f5563b5] A
- Author: A U Thor <author@example.com>
- 4 files changed, 1 insertion(+), 1 deletion(-)
- rename {z => y}/b (100%)
- rename {z => y}/c (100%)
- create mode 100644 y/d
- delete mode 100644 z/d
-Switched to branch 'B'
-[B 5ac66d1] B
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 y/d
- create mode 100644 z/e
-ok 25 - 5b-setup: Rename/delete in order to get add/add/add conflict
-
-expecting success: 
-	(
-		cd 5b &&
-
-		git checkout A^0 &&
-
-		test_must_fail git merge -s recursive B^0 >out &&
-		test_i18ngrep "CONFLICT (add/add).* y/d" out &&
-
-		git ls-files -s >out &&
-		test_line_count = 5 out &&
-		git ls-files -u >out &&
-		test_line_count = 2 out &&
-		git ls-files -o >out &&
-		test_line_count = 1 out &&
-
-		git rev-parse >actual \
-			:0:y/b :0:y/c :0:y/e :2:y/d :3:y/d &&
-		git rev-parse >expect \
-			 O:z/b  O:z/c  B:z/e  A:y/d  B:y/d &&
-		test_cmp expect actual &&
-
-		test_must_fail git rev-parse :1:y/d &&
-		test_path_is_file y/d
-	)
-
-Note: checking out '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 performing another checkout.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
-
-  git checkout -b <new-branch-name>
-
-HEAD is now at f5563b5 A
-CONFLICT (add/add): Merge conflict in y/d
-fatal: Path 'y/d' is in the index, but not at stage 1.
-Did you mean ':2:y/d'?
-:1:y/d
-ok 26 - 5b-check: Rename/delete in order to get add/add/add conflict
-
-expecting success: 
-	test_create_repo 5c &&
-	(
-		cd 5c &&
-
-		mkdir z &&
-		echo b >z/b &&
-		echo c >z/c &&
-		mkdir x &&
-		echo d1 >x/d &&
-		git add z x &&
-		test_tick &&
-		git commit -m "O" &&
-
-		git branch O &&
-		git branch A &&
-		git branch B &&
-
-		git checkout A &&
-		git mv z y &&
-		echo d2 >y/d &&
-		git add y/d &&
-		git mv x w &&
-		test_tick &&
-		git commit -m "A" &&
-
-		git checkout B &&
-		git mv x/d z/ &&
-		mkdir w &&
-		mkdir y &&
-		echo d3 >w/d &&
-		echo d4 >y/d &&
-		echo e >z/e &&
-		git add w/ y/ z/e &&
-		test_tick &&
-		git commit -m "B"
-	)
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6043-merge-rename-directories/5c/.git/
-[master (root-commit) cb15013] O
- Author: A U Thor <author@example.com>
- 3 files changed, 3 insertions(+)
- create mode 100644 x/d
- create mode 100644 z/b
- create mode 100644 z/c
-Switched to branch 'A'
-[A b27f493] A
- Author: A U Thor <author@example.com>
- 4 files changed, 1 insertion(+)
- rename {x => w}/d (100%)
- rename {z => y}/b (100%)
- rename {z => y}/c (100%)
- create mode 100644 y/d
-Switched to branch 'B'
-[B 535e6b3] B
- Author: A U Thor <author@example.com>
- 4 files changed, 3 insertions(+)
- create mode 100644 w/d
- create mode 100644 y/d
- rename {x => z}/d (100%)
- create mode 100644 z/e
-ok 27 - 5c-setup: Transitive rename would cause rename/rename/rename/add/add/add
-
-expecting success: 
-	(
-		cd 5c &&
-
-		git checkout A^0 &&
-
-		test_must_fail git merge -s recursive B^0 >out &&
-		test_i18ngrep "CONFLICT (rename/rename).*x/d.*w/d.*z/d" out &&
-		test_i18ngrep "CONFLICT (add/add).* y/d" out &&
-
-		git ls-files -s >out &&
-		test_line_count = 9 out &&
-		git ls-files -u >out &&
-		test_line_count = 6 out &&
-		git ls-files -o >out &&
-		test_line_count = 3 out &&
-
-		git rev-parse >actual \
-			:0:y/b :0:y/c :0:y/e &&
-		git rev-parse >expect \
-			 O:z/b  O:z/c  B:z/e &&
-		test_cmp expect actual &&
-
-		test_must_fail git rev-parse :1:y/d &&
-		git rev-parse >actual \
-			:2:w/d :3:w/d :1:x/d :2:y/d :3:y/d :3:z/d &&
-		git rev-parse >expect \
-			 O:x/d  B:w/d  O:x/d  A:y/d  B:y/d  O:x/d &&
-		test_cmp expect actual &&
-
-		git hash-object >actual \
-			w/d~HEAD w/d~B^0 z/d &&
-		git rev-parse >expect \
-			O:x/d    B:w/d   O:x/d &&
-		test_cmp expect actual &&
-		test_path_is_missing x/d &&
-		test_path_is_file y/d &&
-		grep -q "<<<<" y/d  # conflict markers should be present
-	)
-
-Note: checking out '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 performing another checkout.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
-
-  git checkout -b <new-branch-name>
-
-HEAD is now at b27f493 A
-CONFLICT (rename/rename): Rename "x/d"->"w/d" in branch "HEAD" rename "x/d"->"z/d" in "B^0"
-CONFLICT (add/add): Merge conflict in y/d
-fatal: Path 'y/d' is in the index, but not at stage 1.
-Did you mean ':2:y/d'?
-:1:y/d
-ok 28 - 5c-check: Transitive rename would cause rename/rename/rename/add/add/add
-
-expecting success: 
-	test_create_repo 5d &&
-	(
-		cd 5d &&
-
-		mkdir z &&
-		echo b >z/b &&
-		echo c >z/c &&
-		git add z &&
-		test_tick &&
-		git commit -m "O" &&
-
-		git branch O &&
-		git branch A &&
-		git branch B &&
-
-		git checkout A &&
-		git mv z y &&
-		echo d1 >y/d &&
-		git add y/d &&
-		test_tick &&
-		git commit -m "A" &&
-
-		git checkout B &&
-		mkdir -p y/d &&
-		echo e >y/d/e &&
-		echo d2 >z/d &&
-		echo f >z/f &&
-		git add y/d/e z/d z/f &&
-		test_tick &&
-		git commit -m "B"
-	)
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6043-merge-rename-directories/5d/.git/
-[master (root-commit) 4e96174] O
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 z/b
- create mode 100644 z/c
-Switched to branch 'A'
-[A ecc7afe] A
- Author: A U Thor <author@example.com>
- 3 files changed, 1 insertion(+)
- rename {z => y}/b (100%)
- rename {z => y}/c (100%)
- create mode 100644 y/d
-Switched to branch 'B'
-[B 67e12ad] B
- Author: A U Thor <author@example.com>
- 3 files changed, 3 insertions(+)
- create mode 100644 y/d/e
- create mode 100644 z/d
- create mode 100644 z/f
-ok 29 - 5d-setup: Directory/file/file conflict due to directory rename
-
-expecting success: 
-	(
-		cd 5d &&
-
-		git checkout A^0 &&
-
-		test_must_fail git merge -s recursive B^0 >out &&
-		test_i18ngrep "CONFLICT (file/directory).*y/d" out &&
-
-		git ls-files -s >out &&
-		test_line_count = 6 out &&
-		git ls-files -u >out &&
-		test_line_count = 1 out &&
-		git ls-files -o >out &&
-		test_line_count = 2 out &&
-
-		git rev-parse >actual \
-			:0:y/b :0:y/c :0:z/d :0:y/f :2:y/d :0:y/d/e &&
-		git rev-parse >expect \
-			 O:z/b  O:z/c  B:z/d  B:z/f  A:y/d  B:y/d/e &&
-		test_cmp expect actual &&
-
-		git hash-object y/d~HEAD >actual &&
-		git rev-parse A:y/d >expect &&
-		test_cmp expect actual
-	)
-
-Note: checking out '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 performing another checkout.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
-
-  git checkout -b <new-branch-name>
-
-HEAD is now at ecc7afe A
-CONFLICT (file/directory): There is a directory with name y/d in B^0. Adding y/d as y/d~HEAD
-ok 30 - 5d-check: Directory/file/file conflict due to directory rename
-
-expecting success: 
-	test_create_repo 6a &&
-	(
-		cd 6a &&
-
-		mkdir z &&
-		echo b >z/b &&
-		echo c >z/c &&
-		echo d >z/d &&
-		git add z &&
-		test_tick &&
-		git commit -m "O" &&
-
-		git branch O &&
-		git branch A &&
-		git branch B &&
-
-		git checkout A &&
-		git rm z/c &&
-		git rm z/d &&
-		test_tick &&
-		git commit -m "A" &&
-
-		git checkout B &&
-		mkdir y &&
-		git mv z/b y/ &&
-		git mv z/c y/ &&
-		test_tick &&
-		git commit -m "B"
-	)
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6043-merge-rename-directories/6a/.git/
-[master (root-commit) 6c15033] O
- Author: A U Thor <author@example.com>
- 3 files changed, 3 insertions(+)
- create mode 100644 z/b
- create mode 100644 z/c
- create mode 100644 z/d
-Switched to branch 'A'
-rm 'z/c'
-rm 'z/d'
-[A 1476532] A
- Author: A U Thor <author@example.com>
- 2 files changed, 2 deletions(-)
- delete mode 100644 z/c
- delete mode 100644 z/d
-Switched to branch 'B'
-[B 53c1aba] B
- Author: A U Thor <author@example.com>
- 2 files changed, 0 insertions(+), 0 deletions(-)
- rename {z => y}/b (100%)
- rename {z => y}/c (100%)
-ok 31 - 6a-setup: Tricky rename/delete
-
-expecting success: 
-	(
-		cd 6a &&
-
-		git checkout A^0 &&
-
-		test_must_fail git merge -s recursive B^0 >out &&
-		test_i18ngrep "CONFLICT (rename/delete).*z/c.*y/c" out &&
-
-		git ls-files -s >out &&
-		test_line_count = 2 out &&
-		git ls-files -u >out &&
-		test_line_count = 1 out &&
-		git ls-files -o >out &&
-		test_line_count = 1 out &&
-
-		git rev-parse >actual \
-			:0:y/b :3:y/c &&
-		git rev-parse >expect \
-			 O:z/b  O:z/c &&
-		test_cmp expect actual
-	)
-
-Note: checking out '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 performing another checkout.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
-
-  git checkout -b <new-branch-name>
-
-HEAD is now at 1476532 A
-CONFLICT (rename/delete): z/c deleted in HEAD and renamed to y/c in B^0. Version B^0 of y/c left in tree.
-ok 32 - 6a-check: Tricky rename/delete
-
-expecting success: 
-	test_create_repo 6b &&
-	(
-		cd 6b &&
-
-		mkdir z &&
-		echo b >z/b &&
-		echo c >z/c &&
-		git add z &&
-		test_tick &&
-		git commit -m "O" &&
-
-		git branch O &&
-		git branch A &&
-		git branch B &&
-
-		git checkout A &&
-		git mv z y &&
-		test_tick &&
-		git commit -m "A" &&
-
-		git checkout B &&
-		git mv z y &&
-		mkdir z &&
-		echo d >z/d &&
-		git add z/d &&
-		test_tick &&
-		git commit -m "B"
-	)
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6043-merge-rename-directories/6b/.git/
-[master (root-commit) 4e96174] O
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 z/b
- create mode 100644 z/c
-Switched to branch 'A'
-[A 4e9f86d] A
- Author: A U Thor <author@example.com>
- 2 files changed, 0 insertions(+), 0 deletions(-)
- rename {z => y}/b (100%)
- rename {z => y}/c (100%)
-Switched to branch 'B'
-[B 6ea17b2] B
- Author: A U Thor <author@example.com>
- 3 files changed, 1 insertion(+)
- rename {z => y}/b (100%)
- rename {z => y}/c (100%)
- create mode 100644 z/d
-ok 33 - 6b-setup: Same rename done on both sides
-
-expecting success: 
-	(
-		cd 6b &&
-
-		git checkout A^0 &&
-
-		git merge -s recursive B^0 &&
-
-		git ls-files -s >out &&
-		test_line_count = 3 out &&
-		git ls-files -u >out &&
-		test_line_count = 0 out &&
-		git ls-files -o >out &&
-		test_line_count = 1 out &&
-
-		git rev-parse >actual \
-			HEAD:y/b HEAD:y/c HEAD:z/d &&
-		git rev-parse >expect \
-			O:z/b    O:z/c    B:z/d &&
-		test_cmp expect actual
-	)
-
-Note: checking out '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 performing another checkout.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
-
-  git checkout -b <new-branch-name>
-
-HEAD is now at 4e9f86d A
-Merging:
-4e9f86d A
-virtual B^0
-found 1 common ancestor:
-4e96174 O
-Skipped y/c (merged same as existing)
-Skipped y/b (merged same as existing)
-Merge made by the 'recursive' strategy.
- z/d | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 z/d
-ok 34 - 6b-check: Same rename done on both sides
-
-expecting success: 
-	test_create_repo 6c &&
-	(
-		cd 6c &&
-
-		mkdir z &&
-		echo b >z/b &&
-		echo c >z/c &&
-		git add z &&
-		test_tick &&
-		git commit -m "O" &&
-
-		git branch O &&
-		git branch A &&
-		git branch B &&
-
-		git checkout A &&
-		test_tick &&
-		git commit --allow-empty -m "A" &&
-
-		git checkout B &&
-		git mv z y &&
-		mkdir z &&
-		echo d >z/d &&
-		git add z/d &&
-		test_tick &&
-		git commit -m "B"
-	)
+	git update-ref refs/remotes/origin/master master &&
+	git remote add origin nowhere &&
+	git config branch.master.remote origin &&
+	git config branch.master.merge refs/heads/master &&
+	git remote add myfork elsewhere &&
+	git config remote.pushdefault myfork &&
+	git config push.default current
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6043-merge-rename-directories/6c/.git/
-[master (root-commit) 4e96174] O
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 z/b
- create mode 100644 z/c
-Switched to branch 'A'
-[A 405f2b4] A
- Author: A U Thor <author@example.com>
-Switched to branch 'B'
-[B 6ea17b2] B
+[master (root-commit) ea12284] Initial
  Author: A U Thor <author@example.com>
- 3 files changed, 1 insertion(+)
- rename {z => y}/b (100%)
- rename {z => y}/c (100%)
- create mode 100644 z/d
-ok 35 - 6c-setup: Rename only done on same side
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one
+ok 1 - setup
 
 expecting success: 
-	(
-		cd 6c &&
+		git for-each-ref --format='%(refname)' refs/heads/master >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 2 - basic atom: head refname
 
-		git checkout A^0 &&
+expecting success: 
+		git for-each-ref --format='%(refname:)' refs/heads/master >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 3 - basic atom: head refname:
 
-		git merge -s recursive B^0 &&
+expecting success: 
+		git for-each-ref --format='%(refname:short)' refs/heads/master >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 4 - basic atom: head refname:short
 
-		git ls-files -s >out &&
-		test_line_count = 3 out &&
-		git ls-files -u >out &&
-		test_line_count = 0 out &&
-		git ls-files -o >out &&
-		test_line_count = 1 out &&
+expecting success: 
+		git for-each-ref --format='%(refname:lstrip=1)' refs/heads/master >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 5 - basic atom: head refname:lstrip=1
 
-		git rev-parse >actual \
-			HEAD:y/b HEAD:y/c HEAD:z/d &&
-		git rev-parse >expect \
-			O:z/b    O:z/c    B:z/d &&
-		test_cmp expect actual
-	)
+expecting success: 
+		git for-each-ref --format='%(refname:lstrip=2)' refs/heads/master >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 6 - basic atom: head refname:lstrip=2
 
-Note: checking out 'A^0'.
+expecting success: 
+		git for-each-ref --format='%(refname:lstrip=-1)' refs/heads/master >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 7 - basic atom: head refname:lstrip=-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 performing another checkout.
+expecting success: 
+		git for-each-ref --format='%(refname:lstrip=-2)' refs/heads/master >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 8 - basic atom: head refname:lstrip=-2
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
+expecting success: 
+		git for-each-ref --format='%(refname:rstrip=1)' refs/heads/master >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 9 - basic atom: head refname:rstrip=1
 
-  git checkout -b <new-branch-name>
+expecting success: 
+		git for-each-ref --format='%(refname:rstrip=2)' refs/heads/master >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 10 - basic atom: head refname:rstrip=2
 
-HEAD is now at 405f2b4 A
-Merging:
-405f2b4 A
-virtual B^0
-found 1 common ancestor:
-4e96174 O
-Merge made by the 'recursive' strategy.
- {z => y}/b | 0
- {z => y}/c | 0
- z/d        | 1 +
- 3 files changed, 1 insertion(+)
- rename {z => y}/b (100%)
- rename {z => y}/c (100%)
- create mode 100644 z/d
-ok 36 - 6c-check: Rename only done on same side
+expecting success: 
+		git for-each-ref --format='%(refname:rstrip=-1)' refs/heads/master >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 11 - basic atom: head refname:rstrip=-1
 
 expecting success: 
-	test_create_repo 6d &&
-	(
-		cd 6d &&
+		git for-each-ref --format='%(refname:rstrip=-2)' refs/heads/master >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 12 - basic atom: head refname:rstrip=-2
 
-		mkdir z &&
-		echo b >z/b &&
-		echo c >z/c &&
-		mkdir x &&
-		echo d >x/d &&
-		git add z x &&
-		test_tick &&
-		git commit -m "O" &&
+expecting success: 
+		git for-each-ref --format='%(refname:strip=1)' refs/heads/master >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 13 - basic atom: head refname:strip=1
 
-		git branch O &&
-		git branch A &&
-		git branch B &&
+expecting success: 
+		git for-each-ref --format='%(refname:strip=2)' refs/heads/master >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 14 - basic atom: head refname:strip=2
 
-		git checkout A &&
-		test_tick &&
-		git commit --allow-empty -m "A" &&
+expecting success: 
+		git for-each-ref --format='%(refname:strip=-1)' refs/heads/master >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 15 - basic atom: head refname:strip=-1
 
-		git checkout B &&
-		git mv z y &&
-		git mv x z &&
-		test_tick &&
-		git commit -m "B"
-	)
+expecting success: 
+		git for-each-ref --format='%(refname:strip=-2)' refs/heads/master >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 16 - basic atom: head refname:strip=-2
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6043-merge-rename-directories/6d/.git/
-[master (root-commit) 1e3967e] O
- Author: A U Thor <author@example.com>
- 3 files changed, 3 insertions(+)
- create mode 100644 x/d
- create mode 100644 z/b
- create mode 100644 z/c
-Switched to branch 'A'
-[A 1491553] A
- Author: A U Thor <author@example.com>
-Switched to branch 'B'
-[B add22d4] B
- Author: A U Thor <author@example.com>
- 3 files changed, 0 insertions(+), 0 deletions(-)
- rename {z => y}/b (100%)
- rename {z => y}/c (100%)
- rename {x => z}/d (100%)
-ok 37 - 6d-setup: We do not always want transitive renaming
+expecting success: 
+		git for-each-ref --format='%(upstream)' refs/heads/master >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 17 - basic atom: head upstream
 
 expecting success: 
-	(
-		cd 6d &&
+		git for-each-ref --format='%(upstream:short)' refs/heads/master >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 18 - basic atom: head upstream:short
 
-		git checkout A^0 &&
+expecting success: 
+		git for-each-ref --format='%(upstream:lstrip=2)' refs/heads/master >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 19 - basic atom: head upstream:lstrip=2
 
-		git merge -s recursive B^0 &&
+expecting success: 
+		git for-each-ref --format='%(upstream:lstrip=-2)' refs/heads/master >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 20 - basic atom: head upstream:lstrip=-2
 
-		git ls-files -s >out &&
-		test_line_count = 3 out &&
-		git ls-files -u >out &&
-		test_line_count = 0 out &&
-		git ls-files -o >out &&
-		test_line_count = 1 out &&
+expecting success: 
+		git for-each-ref --format='%(upstream:rstrip=2)' refs/heads/master >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 21 - basic atom: head upstream:rstrip=2
 
-		git rev-parse >actual \
-			HEAD:y/b HEAD:y/c HEAD:z/d &&
-		git rev-parse >expect \
-			O:z/b    O:z/c    O:x/d &&
-		test_cmp expect actual
-	)
+expecting success: 
+		git for-each-ref --format='%(upstream:rstrip=-2)' refs/heads/master >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 22 - basic atom: head upstream:rstrip=-2
 
-Note: checking out 'A^0'.
+expecting success: 
+		git for-each-ref --format='%(upstream:strip=2)' refs/heads/master >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 23 - basic atom: head upstream:strip=2
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by performing another checkout.
+expecting success: 
+		git for-each-ref --format='%(upstream:strip=-2)' refs/heads/master >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 24 - basic atom: head upstream:strip=-2
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
+expecting success: 
+		git for-each-ref --format='%(push)' refs/heads/master >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 25 - basic atom: head push
 
-  git checkout -b <new-branch-name>
+expecting success: 
+		git for-each-ref --format='%(push:short)' refs/heads/master >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 26 - basic atom: head push:short
 
-HEAD is now at 1491553 A
-Merging:
-1491553 A
-virtual B^0
-found 1 common ancestor:
-1e3967e O
-Merge made by the 'recursive' strategy.
- {z => y}/b | 0
- {z => y}/c | 0
- {x => z}/d | 0
- 3 files changed, 0 insertions(+), 0 deletions(-)
- rename {z => y}/b (100%)
- rename {z => y}/c (100%)
- rename {x => z}/d (100%)
-ok 38 - 6d-check: We do not always want transitive renaming
+expecting success: 
+		git for-each-ref --format='%(push:lstrip=1)' refs/heads/master >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 27 - basic atom: head push:lstrip=1
 
 expecting success: 
-	test_create_repo 6e &&
-	(
-		cd 6e &&
+		git for-each-ref --format='%(push:lstrip=-1)' refs/heads/master >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 28 - basic atom: head push:lstrip=-1
 
-		mkdir z &&
-		echo b >z/b &&
-		echo c >z/c &&
-		git add z &&
-		test_tick &&
-		git commit -m "O" &&
+expecting success: 
+		git for-each-ref --format='%(push:rstrip=1)' refs/heads/master >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 29 - basic atom: head push:rstrip=1
 
-		git branch O &&
-		git branch A &&
-		git branch B &&
+expecting success: 
+		git for-each-ref --format='%(push:rstrip=-1)' refs/heads/master >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 30 - basic atom: head push:rstrip=-1
 
-		git checkout A &&
-		test_tick &&
-		git commit --allow-empty -m "A" &&
+expecting success: 
+		git for-each-ref --format='%(push:strip=1)' refs/heads/master >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 31 - basic atom: head push:strip=1
 
-		git checkout B &&
-		git mv z y &&
-		echo d1 > y/d &&
-		mkdir z &&
-		echo d2 > z/d &&
-		git add y/d z/d &&
-		test_tick &&
-		git commit -m "B"
-	)
+expecting success: 
+		git for-each-ref --format='%(push:strip=-1)' refs/heads/master >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 32 - basic atom: head push:strip=-1
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6043-merge-rename-directories/6e/.git/
-[master (root-commit) 4e96174] O
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 z/b
- create mode 100644 z/c
-Switched to branch 'A'
-[A 405f2b4] A
- Author: A U Thor <author@example.com>
-Switched to branch 'B'
-[B c2a120e] B
- Author: A U Thor <author@example.com>
- 4 files changed, 2 insertions(+)
- rename {z => y}/b (100%)
- rename {z => y}/c (100%)
- create mode 100644 y/d
- create mode 100644 z/d
-ok 39 - 6e-setup: Add/add from one side
+expecting success: 
+		git for-each-ref --format='%(objecttype)' refs/heads/master >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 33 - basic atom: head objecttype
 
 expecting success: 
-	(
-		cd 6e &&
+		git for-each-ref --format='%(objectsize)' refs/heads/master >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 34 - basic atom: head objectsize
 
-		git checkout A^0 &&
+expecting success: 
+		git for-each-ref --format='%(objectname)' refs/heads/master >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 35 - basic atom: head objectname
 
-		git merge -s recursive B^0 &&
+expecting success: 
+		git for-each-ref --format='%(objectname:short)' refs/heads/master >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 36 - basic atom: head objectname:short
 
-		git ls-files -s >out &&
-		test_line_count = 4 out &&
-		git ls-files -u >out &&
-		test_line_count = 0 out &&
-		git ls-files -o >out &&
-		test_line_count = 1 out &&
+expecting success: 
+		git for-each-ref --format='%(objectname:short=1)' refs/heads/master >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 37 - basic atom: head objectname:short=1
 
-		git rev-parse >actual \
-			HEAD:y/b HEAD:y/c HEAD:y/d HEAD:z/d &&
-		git rev-parse >expect \
-			O:z/b    O:z/c    B:y/d    B:z/d &&
-		test_cmp expect actual
-	)
+expecting success: 
+		git for-each-ref --format='%(objectname:short=10)' refs/heads/master >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 38 - basic atom: head objectname:short=10
 
-Note: checking out 'A^0'.
+expecting success: 
+		git for-each-ref --format='%(tree)' refs/heads/master >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 39 - basic atom: head tree
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by performing another checkout.
+expecting success: 
+		git for-each-ref --format='%(parent)' refs/heads/master >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 40 - basic atom: head parent
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
+expecting success: 
+		git for-each-ref --format='%(numparent)' refs/heads/master >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 41 - basic atom: head numparent
 
-  git checkout -b <new-branch-name>
+expecting success: 
+		git for-each-ref --format='%(object)' refs/heads/master >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 42 - basic atom: head object
 
-HEAD is now at 405f2b4 A
-Merging:
-405f2b4 A
-virtual B^0
-found 1 common ancestor:
-4e96174 O
-Merge made by the 'recursive' strategy.
- {z => y}/b | 0
- {z => y}/c | 0
- y/d        | 1 +
- z/d        | 1 +
- 4 files changed, 2 insertions(+)
- rename {z => y}/b (100%)
- rename {z => y}/c (100%)
- create mode 100644 y/d
- create mode 100644 z/d
-ok 40 - 6e-check: Add/add from one side
+expecting success: 
+		git for-each-ref --format='%(type)' refs/heads/master >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 43 - basic atom: head type
 
 expecting success: 
-	test_create_repo 7a &&
-	(
-		cd 7a &&
+		git for-each-ref --format='%(*objectname)' refs/heads/master >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 44 - basic atom: head *objectname
 
-		mkdir z &&
-		echo b >z/b &&
-		echo c >z/c &&
-		git add z &&
-		test_tick &&
-		git commit -m "O" &&
+expecting success: 
+		git for-each-ref --format='%(*objecttype)' refs/heads/master >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 45 - basic atom: head *objecttype
 
-		git branch O &&
-		git branch A &&
-		git branch B &&
+expecting success: 
+		git for-each-ref --format='%(author)' refs/heads/master >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 46 - basic atom: head author
 
-		git checkout A &&
-		git mv z y &&
-		test_tick &&
-		git commit -m "A" &&
+expecting success: 
+		git for-each-ref --format='%(authorname)' refs/heads/master >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 47 - basic atom: head authorname
 
-		git checkout B &&
-		mkdir w &&
-		mkdir x &&
-		git mv z/b w/ &&
-		git mv z/c x/ &&
-		echo d > z/d &&
-		git add z/d &&
-		test_tick &&
-		git commit -m "B"
-	)
+expecting success: 
+		git for-each-ref --format='%(authoremail)' refs/heads/master >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 48 - basic atom: head authoremail
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6043-merge-rename-directories/7a/.git/
-[master (root-commit) 4e96174] O
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 z/b
- create mode 100644 z/c
-Switched to branch 'A'
-[A 4e9f86d] A
- Author: A U Thor <author@example.com>
- 2 files changed, 0 insertions(+), 0 deletions(-)
- rename {z => y}/b (100%)
- rename {z => y}/c (100%)
-Switched to branch 'B'
-[B e02cee0] B
- Author: A U Thor <author@example.com>
- 3 files changed, 1 insertion(+)
- rename {z => w}/b (100%)
- rename {z => x}/c (100%)
- create mode 100644 z/d
-ok 41 - 7a-setup: rename-dir vs. rename-dir (NOT split evenly) PLUS add-other-file
+expecting success: 
+		git for-each-ref --format='%(authordate)' refs/heads/master >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 49 - basic atom: head authordate
 
 expecting success: 
-	(
-		cd 7a &&
+		git for-each-ref --format='%(committer)' refs/heads/master >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 50 - basic atom: head committer
 
-		git checkout A^0 &&
+expecting success: 
+		git for-each-ref --format='%(committername)' refs/heads/master >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 51 - basic atom: head committername
 
-		test_must_fail git merge -s recursive B^0 >out &&
-		test_i18ngrep "CONFLICT (rename/rename).*z/b.*y/b.*w/b" out &&
-		test_i18ngrep "CONFLICT (rename/rename).*z/c.*y/c.*x/c" out &&
+expecting success: 
+		git for-each-ref --format='%(committeremail)' refs/heads/master >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 52 - basic atom: head committeremail
 
-		git ls-files -s >out &&
-		test_line_count = 7 out &&
-		git ls-files -u >out &&
-		test_line_count = 6 out &&
-		git ls-files -o >out &&
-		test_line_count = 1 out &&
+expecting success: 
+		git for-each-ref --format='%(committerdate)' refs/heads/master >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 53 - basic atom: head committerdate
 
-		git rev-parse >actual \
-			:1:z/b :2:y/b :3:w/b :1:z/c :2:y/c :3:x/c :0:y/d &&
-		git rev-parse >expect \
-			 O:z/b  O:z/b  O:z/b  O:z/c  O:z/c  O:z/c  B:z/d &&
-		test_cmp expect actual &&
+expecting success: 
+		git for-each-ref --format='%(tag)' refs/heads/master >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 54 - basic atom: head tag
 
-		git hash-object >actual \
-			y/b   w/b   y/c   x/c &&
-		git rev-parse >expect \
-			O:z/b O:z/b O:z/c O:z/c &&
-		test_cmp expect actual
-	)
+expecting success: 
+		git for-each-ref --format='%(tagger)' refs/heads/master >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 55 - basic atom: head tagger
 
-Note: checking out 'A^0'.
+expecting success: 
+		git for-each-ref --format='%(taggername)' refs/heads/master >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 56 - basic atom: head taggername
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by performing another checkout.
+expecting success: 
+		git for-each-ref --format='%(taggeremail)' refs/heads/master >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 57 - basic atom: head taggeremail
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
+expecting success: 
+		git for-each-ref --format='%(taggerdate)' refs/heads/master >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 58 - basic atom: head taggerdate
 
-  git checkout -b <new-branch-name>
+expecting success: 
+		git for-each-ref --format='%(creator)' refs/heads/master >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 59 - basic atom: head creator
 
-HEAD is now at 4e9f86d A
-CONFLICT (rename/rename): Rename "z/b"->"y/b" in branch "HEAD" rename "z/b"->"w/b" in "B^0"
-CONFLICT (rename/rename): Rename "z/c"->"y/c" in branch "HEAD" rename "z/c"->"x/c" in "B^0"
-ok 42 - 7a-check: rename-dir vs. rename-dir (NOT split evenly) PLUS add-other-file
+expecting success: 
+		git for-each-ref --format='%(creatordate)' refs/heads/master >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 60 - basic atom: head creatordate
 
 expecting success: 
-	test_create_repo 7b &&
-	(
-		cd 7b &&
+		git for-each-ref --format='%(subject)' refs/heads/master >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 61 - basic atom: head subject
 
-		mkdir z &&
-		mkdir x &&
-		mkdir w &&
-		echo b >z/b &&
-		echo c >z/c &&
-		echo d1 > x/d &&
-		echo d2 > w/d &&
-		git add z x w &&
-		test_tick &&
-		git commit -m "O" &&
+expecting success: 
+		git for-each-ref --format='%(contents:subject)' refs/heads/master >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 62 - basic atom: head contents:subject
 
-		git branch O &&
-		git branch A &&
-		git branch B &&
+expecting success: 
+		git for-each-ref --format='%(body)' refs/heads/master >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 63 - basic atom: head body
 
-		git checkout A &&
-		git mv z y &&
-		git mv w/d y/ &&
-		test_tick &&
-		git commit -m "A" &&
+expecting success: 
+		git for-each-ref --format='%(contents:body)' refs/heads/master >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 64 - basic atom: head contents:body
 
-		git checkout B &&
-		git mv x/d z/ &&
-		rmdir x &&
-		test_tick &&
-		git commit -m "B"
-	)
+expecting success: 
+		git for-each-ref --format='%(contents:signature)' refs/heads/master >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 65 - basic atom: head contents:signature
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6043-merge-rename-directories/7b/.git/
-[master (root-commit) 3a7ba74] O
- Author: A U Thor <author@example.com>
- 4 files changed, 4 insertions(+)
- create mode 100644 w/d
- create mode 100644 x/d
- create mode 100644 z/b
- create mode 100644 z/c
-Switched to branch 'A'
-[A 0808992] A
- Author: A U Thor <author@example.com>
- 3 files changed, 0 insertions(+), 0 deletions(-)
- rename {z => y}/b (100%)
- rename {z => y}/c (100%)
- rename {w => y}/d (100%)
-Switched to branch 'B'
-[B 946a998] B
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename {x => z}/d (100%)
-ok 43 - 7b-setup: rename/rename(2to1), but only due to transitive rename
+expecting success: 
+		git for-each-ref --format='%(contents)' refs/heads/master >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 66 - basic atom: head contents
 
 expecting success: 
-	(
-		cd 7b &&
+		git for-each-ref --format='%(HEAD)' refs/heads/master >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 67 - basic atom: head HEAD
 
-		git checkout A^0 &&
+expecting success: 
+		git for-each-ref --format='%(refname)' refs/tags/testtag >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 68 - basic atom: tag refname
 
-		test_must_fail git merge -s recursive B^0 >out &&
-		test_i18ngrep "CONFLICT (rename/rename)" out &&
+expecting success: 
+		git for-each-ref --format='%(refname:short)' refs/tags/testtag >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 69 - basic atom: tag refname:short
 
-		git ls-files -s >out &&
-		test_line_count = 4 out &&
-		git ls-files -u >out &&
-		test_line_count = 2 out &&
-		git ls-files -o >out &&
-		test_line_count = 3 out &&
+expecting success: 
+		git for-each-ref --format='%(upstream)' refs/tags/testtag >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 70 - basic atom: tag upstream
 
-		git rev-parse >actual \
-			:0:y/b :0:y/c :2:y/d :3:y/d &&
-		git rev-parse >expect \
-			 O:z/b  O:z/c  O:w/d  O:x/d &&
-		test_cmp expect actual &&
+expecting success: 
+		git for-each-ref --format='%(push)' refs/tags/testtag >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 71 - basic atom: tag push
 
-		test_path_is_missing y/d &&
-		test_path_is_file y/d~HEAD &&
-		test_path_is_file y/d~B^0 &&
+expecting success: 
+		git for-each-ref --format='%(objecttype)' refs/tags/testtag >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 72 - basic atom: tag objecttype
 
-		git hash-object >actual \
-			y/d~HEAD y/d~B^0 &&
-		git rev-parse >expect \
-			O:w/d    O:x/d &&
-		test_cmp expect actual
-	)
+expecting success: 
+		git for-each-ref --format='%(objectsize)' refs/tags/testtag >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 73 - basic atom: tag objectsize
 
-Note: checking out 'A^0'.
+expecting success: 
+		git for-each-ref --format='%(objectname)' refs/tags/testtag >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 74 - basic atom: tag objectname
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by performing another checkout.
+expecting success: 
+		git for-each-ref --format='%(objectname:short)' refs/tags/testtag >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 75 - basic atom: tag objectname:short
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
+expecting success: 
+		git for-each-ref --format='%(objectname:short=1)' refs/heads/master >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 76 - basic atom: head objectname:short=1
 
-  git checkout -b <new-branch-name>
+expecting success: 
+		git for-each-ref --format='%(objectname:short=10)' refs/heads/master >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 77 - basic atom: head objectname:short=10
 
-HEAD is now at 0808992 A
-CONFLICT (rename/rename): Rename w/d->y/d in HEAD. Rename x/d->y/d in B^0
-ok 44 - 7b-check: rename/rename(2to1), but only due to transitive rename
+expecting success: 
+		git for-each-ref --format='%(tree)' refs/tags/testtag >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 78 - basic atom: tag tree
 
 expecting success: 
-	test_create_repo 7c &&
-	(
-		cd 7c &&
+		git for-each-ref --format='%(parent)' refs/tags/testtag >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 79 - basic atom: tag parent
 
-		mkdir z &&
-		echo b >z/b &&
-		echo c >z/c &&
-		mkdir x &&
-		echo d >x/d &&
-		git add z x &&
-		test_tick &&
-		git commit -m "O" &&
+expecting success: 
+		git for-each-ref --format='%(numparent)' refs/tags/testtag >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 80 - basic atom: tag numparent
 
-		git branch O &&
-		git branch A &&
-		git branch B &&
+expecting success: 
+		git for-each-ref --format='%(object)' refs/tags/testtag >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 81 - basic atom: tag object
 
-		git checkout A &&
-		git mv z y &&
-		git mv x w &&
-		test_tick &&
-		git commit -m "A" &&
+expecting success: 
+		git for-each-ref --format='%(type)' refs/tags/testtag >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 82 - basic atom: tag type
 
-		git checkout B &&
-		git mv x/d z/ &&
-		rmdir x &&
-		test_tick &&
-		git commit -m "B"
-	)
+expecting success: 
+		git for-each-ref --format='%(*objectname)' refs/tags/testtag >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 83 - basic atom: tag *objectname
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6043-merge-rename-directories/7c/.git/
-[master (root-commit) 1e3967e] O
- Author: A U Thor <author@example.com>
- 3 files changed, 3 insertions(+)
- create mode 100644 x/d
- create mode 100644 z/b
- create mode 100644 z/c
-Switched to branch 'A'
-[A 1e0f8cf] A
- Author: A U Thor <author@example.com>
- 3 files changed, 0 insertions(+), 0 deletions(-)
- rename {x => w}/d (100%)
- rename {z => y}/b (100%)
- rename {z => y}/c (100%)
-Switched to branch 'B'
-[B c9f07f0] B
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename {x => z}/d (100%)
-ok 45 - 7c-setup: rename/rename(1to...2or3); transitive rename may add complexity
+expecting success: 
+		git for-each-ref --format='%(*objecttype)' refs/tags/testtag >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 84 - basic atom: tag *objecttype
 
 expecting success: 
-	(
-		cd 7c &&
+		git for-each-ref --format='%(author)' refs/tags/testtag >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 85 - basic atom: tag author
 
-		git checkout A^0 &&
+expecting success: 
+		git for-each-ref --format='%(authorname)' refs/tags/testtag >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 86 - basic atom: tag authorname
 
-		test_must_fail git merge -s recursive B^0 >out &&
-		test_i18ngrep "CONFLICT (rename/rename).*x/d.*w/d.*y/d" out &&
+expecting success: 
+		git for-each-ref --format='%(authoremail)' refs/tags/testtag >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 87 - basic atom: tag authoremail
 
-		git ls-files -s >out &&
-		test_line_count = 5 out &&
-		git ls-files -u >out &&
-		test_line_count = 3 out &&
-		git ls-files -o >out &&
-		test_line_count = 1 out &&
+expecting success: 
+		git for-each-ref --format='%(authordate)' refs/tags/testtag >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 88 - basic atom: tag authordate
 
-		git rev-parse >actual \
-			:0:y/b :0:y/c :1:x/d :2:w/d :3:y/d &&
-		git rev-parse >expect \
-			 O:z/b  O:z/c  O:x/d  O:x/d  O:x/d &&
-		test_cmp expect actual
-	)
+expecting success: 
+		git for-each-ref --format='%(committer)' refs/tags/testtag >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 89 - basic atom: tag committer
 
-Note: checking out 'A^0'.
+expecting success: 
+		git for-each-ref --format='%(committername)' refs/tags/testtag >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 90 - basic atom: tag committername
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by performing another checkout.
+expecting success: 
+		git for-each-ref --format='%(committeremail)' refs/tags/testtag >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 91 - basic atom: tag committeremail
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
+expecting success: 
+		git for-each-ref --format='%(committerdate)' refs/tags/testtag >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 92 - basic atom: tag committerdate
 
-  git checkout -b <new-branch-name>
+expecting success: 
+		git for-each-ref --format='%(tag)' refs/tags/testtag >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 93 - basic atom: tag tag
 
-HEAD is now at 1e0f8cf A
-CONFLICT (rename/rename): Rename "x/d"->"w/d" in branch "HEAD" rename "x/d"->"y/d" in "B^0"
-ok 46 - 7c-check: rename/rename(1to...2or3); transitive rename may add complexity
+expecting success: 
+		git for-each-ref --format='%(tagger)' refs/tags/testtag >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 94 - basic atom: tag tagger
 
 expecting success: 
-	test_create_repo 7d &&
-	(
-		cd 7d &&
+		git for-each-ref --format='%(taggername)' refs/tags/testtag >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 95 - basic atom: tag taggername
 
-		mkdir z &&
-		echo b >z/b &&
-		echo c >z/c &&
-		mkdir x &&
-		echo d >x/d &&
-		git add z x &&
-		test_tick &&
-		git commit -m "O" &&
+expecting success: 
+		git for-each-ref --format='%(taggeremail)' refs/tags/testtag >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 96 - basic atom: tag taggeremail
 
-		git branch O &&
-		git branch A &&
-		git branch B &&
+expecting success: 
+		git for-each-ref --format='%(taggerdate)' refs/tags/testtag >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 97 - basic atom: tag taggerdate
 
-		git checkout A &&
-		git mv z y &&
-		git rm -rf x &&
-		test_tick &&
-		git commit -m "A" &&
+expecting success: 
+		git for-each-ref --format='%(creator)' refs/tags/testtag >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 98 - basic atom: tag creator
 
-		git checkout B &&
-		git mv x/d z/ &&
-		rmdir x &&
-		test_tick &&
-		git commit -m "B"
-	)
+expecting success: 
+		git for-each-ref --format='%(creatordate)' refs/tags/testtag >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 99 - basic atom: tag creatordate
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6043-merge-rename-directories/7d/.git/
-[master (root-commit) 1e3967e] O
- Author: A U Thor <author@example.com>
- 3 files changed, 3 insertions(+)
- create mode 100644 x/d
- create mode 100644 z/b
- create mode 100644 z/c
-Switched to branch 'A'
-rm 'x/d'
-[A 202563c] A
- Author: A U Thor <author@example.com>
- 3 files changed, 1 deletion(-)
- delete mode 100644 x/d
- rename {z => y}/b (100%)
- rename {z => y}/c (100%)
-Switched to branch 'B'
-[B c9f07f0] B
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename {x => z}/d (100%)
-ok 47 - 7d-setup: transitive rename involved in rename/delete; how is it reported?
+expecting success: 
+		git for-each-ref --format='%(subject)' refs/tags/testtag >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 100 - basic atom: tag subject
 
 expecting success: 
-	(
-		cd 7d &&
+		git for-each-ref --format='%(contents:subject)' refs/tags/testtag >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 101 - basic atom: tag contents:subject
 
-		git checkout A^0 &&
+expecting success: 
+		git for-each-ref --format='%(body)' refs/tags/testtag >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 102 - basic atom: tag body
 
-		test_must_fail git merge -s recursive B^0 >out &&
-		test_i18ngrep "CONFLICT (rename/delete).*x/d.*y/d" out &&
+expecting success: 
+		git for-each-ref --format='%(contents:body)' refs/tags/testtag >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 103 - basic atom: tag contents:body
 
-		git ls-files -s >out &&
-		test_line_count = 3 out &&
-		git ls-files -u >out &&
-		test_line_count = 1 out &&
-		git ls-files -o >out &&
-		test_line_count = 1 out &&
+expecting success: 
+		git for-each-ref --format='%(contents:signature)' refs/tags/testtag >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 104 - basic atom: tag contents:signature
 
-		git rev-parse >actual \
-			:0:y/b :0:y/c :3:y/d &&
-		git rev-parse >expect \
-			 O:z/b  O:z/c  O:x/d &&
-		test_cmp expect actual
-	)
+expecting success: 
+		git for-each-ref --format='%(contents)' refs/tags/testtag >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 105 - basic atom: tag contents
 
-Note: checking out 'A^0'.
+expecting success: 
+		git for-each-ref --format='%(HEAD)' refs/tags/testtag >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 106 - basic atom: tag 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 performing another checkout.
+expecting success: 
+	test_must_fail git for-each-ref --format="%(INVALID)" refs/heads
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
+fatal: unknown field name: INVALID
+ok 107 - Check invalid atoms names are errors
 
-  git checkout -b <new-branch-name>
+expecting success: 
+	git for-each-ref --format="%(authordate)" refs/heads &&
+	git for-each-ref --format="%(authordate:default) %(authordate)" refs/heads &&
+	git for-each-ref --format="%(authordate) %(authordate:default)" refs/heads &&
+	git for-each-ref --format="%(authordate:default) %(authordate:default)" refs/heads
 
-HEAD is now at 202563c A
-CONFLICT (rename/delete): x/d deleted in HEAD and renamed to y/d in B^0. Version B^0 of y/d left in tree.
-ok 48 - 7d-check: transitive rename involved in rename/delete; how is it reported?
+Tue Jul 4 01:18:44 2006 +0200
+Tue Jul 4 01:18:44 2006 +0200 Tue Jul 4 01:18:44 2006 +0200
+Tue Jul 4 01:18:44 2006 +0200 Tue Jul 4 01:18:44 2006 +0200
+Tue Jul 4 01:18:44 2006 +0200 Tue Jul 4 01:18:44 2006 +0200
+ok 108 - Check format specifiers are ignored in naming date atoms
 
 expecting success: 
-	test_create_repo 7e &&
-	(
-		cd 7e &&
+	git for-each-ref --format="%(authordate:default)" refs/heads &&
+	git for-each-ref --format="%(authordate:relative)" refs/heads &&
+	git for-each-ref --format="%(authordate:short)" refs/heads &&
+	git for-each-ref --format="%(authordate:local)" refs/heads &&
+	git for-each-ref --format="%(authordate:iso8601)" refs/heads &&
+	git for-each-ref --format="%(authordate:rfc2822)" refs/heads
 
-		mkdir z &&
-		echo b >z/b &&
-		echo c >z/c &&
-		mkdir x &&
-		echo d1 >x/d &&
-		git add z x &&
-		test_tick &&
-		git commit -m "O" &&
+Tue Jul 4 01:18:44 2006 +0200
+17 years ago
+2006-07-04
+Mon Jul 3 23:18:44 2006
+2006-07-04 01:18:44 +0200
+Tue, 4 Jul 2006 01:18:44 +0200
+ok 109 - Check valid format specifiers for date fields
 
-		git branch O &&
-		git branch A &&
-		git branch B &&
+expecting success: 
+	test_must_fail git for-each-ref --format="%(authordate:INVALID)" refs/heads
 
-		git checkout A &&
-		git mv z y &&
-		git rm x/d &&
-		mkdir -p x/d &&
-		mkdir -p y/d &&
-		echo f >x/d/f &&
-		echo g >y/d/g &&
-		git add x/d/f y/d/g &&
-		test_tick &&
-		git commit -m "A" &&
+fatal: unknown date format INVALID
+ok 110 - Check invalid format specifiers are errors
 
-		git checkout B &&
-		git mv x/d z/ &&
-		rmdir x &&
-		test_tick &&
-		git commit -m "B"
-	)
+expecting success: 
+	test_must_fail git for-each-ref --format="%(objectname:short=0)" &&
+	test_must_fail git for-each-ref --format="%(objectname:short=-1)" &&
+	test_must_fail git for-each-ref --format="%(objectname:short=foo)"
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6043-merge-rename-directories/7e/.git/
-[master (root-commit) cb15013] O
- Author: A U Thor <author@example.com>
- 3 files changed, 3 insertions(+)
- create mode 100644 x/d
- create mode 100644 z/b
- create mode 100644 z/c
-Switched to branch 'A'
-rm 'x/d'
-[A 3ba9059] A
- Author: A U Thor <author@example.com>
- 5 files changed, 2 insertions(+), 1 deletion(-)
- delete mode 100644 x/d
- create mode 100644 x/d/f
- rename {z => y}/b (100%)
- rename {z => y}/c (100%)
- create mode 100644 y/d/g
-Switched to branch 'B'
-[B 0710b4b] B
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename {x => z}/d (100%)
-ok 49 - 7e-setup: transitive rename in rename/delete AND dirs in the way
+fatal: positive value expected objectname:short=0
+fatal: positive value expected objectname:short=-1
+fatal: positive value expected objectname:short=foo
+ok 111 - arguments to %(objectname:short=) must be positive integers
 
 expecting success: 
-	(
-		cd 7e &&
-
-		git checkout A^0 &&
+	test_date "" \
+		"Tue Jul 4 01:18:43 2006 +0200" \
+		"Tue Jul 4 01:18:44 2006 +0200" \
+		"Tue Jul 4 01:18:45 2006 +0200"
 
-		test_must_fail git merge -s recursive B^0 >out &&
-		test_i18ngrep "CONFLICT (rename/delete).*x/d.*y/d" out &&
+ok 112 - Check unformatted date fields output
 
-		git ls-files -s >out &&
-		test_line_count = 5 out &&
-		git ls-files -u >out &&
-		test_line_count = 1 out &&
-		git ls-files -o >out &&
-		test_line_count = 2 out &&
+expecting success: 
+	test_date default \
+		"Tue Jul 4 01:18:43 2006 +0200" \
+		"Tue Jul 4 01:18:44 2006 +0200" \
+		"Tue Jul 4 01:18:45 2006 +0200"
 
-		git rev-parse >actual \
-			:0:x/d/f :0:y/d/g :0:y/b :0:y/c :3:y/d &&
-		git rev-parse >expect \
-			 A:x/d/f  A:y/d/g  O:z/b  O:z/c  O:x/d &&
-		test_cmp expect actual &&
+ok 113 - Check format "default" formatted date fields output
 
-		git hash-object y/d~B^0 >actual &&
-		git rev-parse O:x/d >expect &&
-		test_cmp expect actual
-	)
+expecting success: 
+	test_date default-local "Mon Jul 3 23:18:43 2006" "Mon Jul 3 23:18:44 2006" "Mon Jul 3 23:18:45 2006"
 
-Note: checking out 'A^0'.
+ok 114 - Check format "default-local" date fields output
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by performing another checkout.
+expecting success: 
+	f=relative &&
+	(git for-each-ref --shell --format="%(refname) %(committerdate:$f) %(authordate:$f)" refs/heads &&
+	git for-each-ref --shell --format="%(refname) %(taggerdate:$f)" refs/tags) >actual
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
+ok 115 - Check format "relative" date fields output
 
-  git checkout -b <new-branch-name>
+expecting success: 
+	test_date relative-local \
+		"$(git for-each-ref --format="%(committerdate:relative)" refs/heads)" \
+		"$(git for-each-ref --format="%(authordate:relative)" refs/heads)" \
+		"$(git for-each-ref --format="%(taggerdate:relative)" refs/tags)"
 
-HEAD is now at 3ba9059 A
-CONFLICT (rename/delete): x/d deleted in HEAD and renamed to y/d in B^0. Version B^0 of y/d left in tree at y/d~B^0.
-ok 50 - 7e-check: transitive rename in rename/delete AND dirs in the way
+ok 116 - Check format "relative-local" date fields output
 
 expecting success: 
-	test_create_repo 8a &&
-	(
-		cd 8a &&
+	test_date short 2006-07-04 2006-07-04 2006-07-04
 
-		mkdir x &&
-		mkdir y &&
-		echo a >x/a &&
-		echo b >x/b &&
-		echo c >y/c &&
-		echo d >y/d &&
-		git add x y &&
-		test_tick &&
-		git commit -m "O" &&
+ok 117 - Check format "short" date fields output
 
-		git branch O &&
-		git branch A &&
-		git branch B &&
+expecting success: 
+	test_date short-local 2006-07-03 2006-07-03 2006-07-03
 
-		git checkout A &&
-		echo e >x/e &&
-		echo f >y/f &&
-		git add x/e y/f &&
-		test_tick &&
-		git commit -m "A" &&
+ok 118 - Check format "short-local" date fields output
 
-		git checkout B &&
-		git mv y z &&
-		git mv x y &&
-		test_tick &&
-		git commit -m "B"
-	)
+expecting success: 
+	test_date local \
+		"Mon Jul 3 23:18:43 2006" \
+		"Mon Jul 3 23:18:44 2006" \
+		"Mon Jul 3 23:18:45 2006"
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6043-merge-rename-directories/8a/.git/
-[master (root-commit) 644420a] O
- Author: A U Thor <author@example.com>
- 4 files changed, 4 insertions(+)
- create mode 100644 x/a
- create mode 100644 x/b
- create mode 100644 y/c
- create mode 100644 y/d
-Switched to branch 'A'
-[A 6afefa0] A
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 x/e
- create mode 100644 y/f
-Switched to branch 'B'
-[B ccdb287] B
- Author: A U Thor <author@example.com>
- 4 files changed, 0 insertions(+), 0 deletions(-)
- rename {x => y}/a (100%)
- rename {x => y}/b (100%)
- rename {y => z}/c (100%)
- rename {y => z}/d (100%)
-ok 51 - 8a-setup: Dual-directory rename, one into the others way
+ok 119 - Check format "local" date fields output
 
 expecting success: 
-	(
-		cd 8a &&
+	test_date iso8601 \
+		"2006-07-04 01:18:43 +0200" \
+		"2006-07-04 01:18:44 +0200" \
+		"2006-07-04 01:18:45 +0200"
 
-		git checkout A^0 &&
+ok 120 - Check format "iso8601" date fields output
 
-		git merge -s recursive B^0 &&
+expecting success: 
+	test_date iso8601-local "2006-07-03 23:18:43 +0000" "2006-07-03 23:18:44 +0000" "2006-07-03 23:18:45 +0000"
 
-		git ls-files -s >out &&
-		test_line_count = 6 out &&
-		git ls-files -u >out &&
-		test_line_count = 0 out &&
-		git ls-files -o >out &&
-		test_line_count = 1 out &&
+ok 121 - Check format "iso8601-local" date fields output
 
-		git rev-parse >actual \
-			HEAD:y/a HEAD:y/b HEAD:y/e HEAD:y/f HEAD:z/c HEAD:z/d &&
-		git rev-parse >expect \
-			O:x/a    O:x/b    A:x/e    A:y/f    O:y/c    O:y/d &&
-		test_cmp expect actual
-	)
+expecting success: 
+	test_date rfc2822 \
+		"Tue, 4 Jul 2006 01:18:43 +0200" \
+		"Tue, 4 Jul 2006 01:18:44 +0200" \
+		"Tue, 4 Jul 2006 01:18:45 +0200"
 
-Note: checking out 'A^0'.
+ok 122 - Check format "rfc2822" date fields output
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by performing another checkout.
+expecting success: 
+	test_date rfc2822-local "Mon, 3 Jul 2006 23:18:43 +0000" "Mon, 3 Jul 2006 23:18:44 +0000" "Mon, 3 Jul 2006 23:18:45 +0000"
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
+ok 123 - Check format "rfc2822-local" date fields output
 
-  git checkout -b <new-branch-name>
+expecting success: 
+	test_date raw "1151968723 +0200" "1151968724 +0200" "1151968725 +0200"
 
-HEAD is now at 6afefa0 A
-Merging:
-6afefa0 A
-virtual B^0
-found 1 common ancestor:
-644420a O
-Merge made by the 'recursive' strategy.
- {x => y}/a | 0
- {x => y}/b | 0
- {x => y}/e | 0
- {y => z}/c | 0
- {y => z}/d | 0
- 5 files changed, 0 insertions(+), 0 deletions(-)
- rename {x => y}/a (100%)
- rename {x => y}/b (100%)
- rename {x => y}/e (100%)
- rename {y => z}/c (100%)
- rename {y => z}/d (100%)
-ok 52 - 8a-check: Dual-directory rename, one into the others way
+ok 124 - Check format "raw" date fields output
 
 expecting success: 
-	test_create_repo 8b &&
-	(
-		cd 8b &&
+	test_date raw-local "1151968723 +0000" "1151968724 +0000" "1151968725 +0000"
 
-		mkdir x &&
-		mkdir y &&
-		echo a1 >x/a &&
-		echo b1 >x/b &&
-		echo a2 >y/a &&
-		echo b2 >y/b &&
-		git add x y &&
-		test_tick &&
-		git commit -m "O" &&
+ok 125 - Check format "raw-local" date fields output
 
-		git branch O &&
-		git branch A &&
-		git branch B &&
+expecting success: 
+	echo "my date is 2006-07-04" >expected &&
+	git for-each-ref \
+	  --format="%(authordate:format:my date is %Y-%m-%d)" \
+	  refs/heads >actual &&
+	test_cmp expected actual
 
-		git checkout A &&
-		echo e1 >x/e &&
-		echo e2 >y/e &&
-		git add x/e y/e &&
-		test_tick &&
-		git commit -m "A" &&
+ok 126 - Check format of strftime date fields
 
-		git checkout B &&
-		git mv y z &&
-		git mv x y &&
-		test_tick &&
-		git commit -m "B"
-	)
+expecting success: 
+	echo "my date is 2006-07-03" >expected &&
+	git for-each-ref \
+	  --format="%(authordate:format-local:my date is %Y-%m-%d)" \
+	  refs/heads >actual &&
+	test_cmp expected actual
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6043-merge-rename-directories/8b/.git/
-[master (root-commit) d95116f] O
- Author: A U Thor <author@example.com>
- 4 files changed, 4 insertions(+)
- create mode 100644 x/a
- create mode 100644 x/b
- create mode 100644 y/a
- create mode 100644 y/b
-Switched to branch 'A'
-[A 8d5e46a] A
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 x/e
- create mode 100644 y/e
-Switched to branch 'B'
-[B a7bdbf9] B
- Author: A U Thor <author@example.com>
- 6 files changed, 4 insertions(+), 4 deletions(-)
- delete mode 100644 x/a
- delete mode 100644 x/b
- create mode 100644 z/a
- create mode 100644 z/b
-ok 53 - 8b-setup: Dual-directory rename, one into the others way, with conflicting filenames
+ok 127 - Check format of strftime-local date fields
 
 expecting success: 
-	(
-		cd 8b &&
+	echo >expected &&
+	git for-each-ref --format="%(authordate:format:)" refs/heads >actual &&
+	test_cmp expected actual &&
+	long="long format -- $ZERO_OID$ZERO_OID$ZERO_OID$ZERO_OID$ZERO_OID$ZERO_OID$ZERO_OID" &&
+	echo $long >expected &&
+	git for-each-ref --format="%(authordate:format:$long)" refs/heads >actual &&
+	test_cmp expected actual
 
-		git checkout A^0 &&
+ok 128 - exercise strftime with odd fields
 
-		git merge -s recursive B^0 &&
+expecting success: 
+	git for-each-ref --format="%(refname)" --sort=refname >actual &&
+	test_cmp expected actual
 
-		git ls-files -s >out &&
-		test_line_count = 6 out &&
-		git ls-files -u >out &&
-		test_line_count = 0 out &&
-		git ls-files -o >out &&
-		test_line_count = 1 out &&
+ok 129 - Verify ascending sort
 
-		git rev-parse >actual \
-			HEAD:y/a HEAD:y/b HEAD:z/a HEAD:z/b HEAD:x/e HEAD:y/e &&
-		git rev-parse >expect \
-			O:x/a    O:x/b    O:y/a    O:y/b    A:x/e    A:y/e &&
-		test_cmp expect actual
-	)
+expecting success: 
+	git for-each-ref --format="%(refname)" --sort=-refname >actual &&
+	test_cmp expected actual
 
-Note: checking out 'A^0'.
+ok 130 - Verify descending sort
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by performing another checkout.
+expecting success: 
+	git for-each-ref --shell --format="%(refname)" >actual &&
+	test_cmp expected actual
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
+ok 131 - Quoting style: shell
 
-  git checkout -b <new-branch-name>
+expecting success: 
+	git for-each-ref --perl --format="%(refname)" >actual &&
+	test_cmp expected actual
 
-HEAD is now at 8d5e46a A
-Merging:
-8d5e46a A
-virtual B^0
-found 1 common ancestor:
-d95116f O
-Removing x/b
-Removing x/a
-Merge made by the 'recursive' strategy.
- x/a | 1 -
- x/b | 1 -
- y/a | 2 +-
- y/b | 2 +-
- z/a | 1 +
- z/b | 1 +
- 6 files changed, 4 insertions(+), 4 deletions(-)
- delete mode 100644 x/a
- delete mode 100644 x/b
- create mode 100644 z/a
- create mode 100644 z/b
-ok 54 - 8b-check: Dual-directory rename, one into the others way, with conflicting filenames
+ok 132 - Quoting style: perl
 
 expecting success: 
-	test_create_repo 8c &&
-	(
-		cd 8c &&
-
-		mkdir z &&
-		echo b >z/b &&
-		echo c >z/c &&
-		test_seq 1 10 >z/d &&
-		git add z &&
-		test_tick &&
-		git commit -m "O" &&
+	git for-each-ref --python --format="%(refname)" >actual &&
+	test_cmp expected actual
 
-		git branch O &&
-		git branch A &&
-		git branch B &&
+ok 133 - Quoting style: python
 
-		git checkout A &&
-		git rm z/d &&
-		git mv z y &&
-		test_tick &&
-		git commit -m "A" &&
+expecting success: 
+	git for-each-ref --tcl --format="%(refname)" >actual &&
+	test_cmp expected actual
 
-		git checkout B &&
-		echo 11 >z/d &&
-		test_chmod +x z/d &&
-		echo e >z/e &&
-		git add z/d z/e &&
-		test_tick &&
-		git commit -m "B"
-	)
+ok 134 - Quoting style: tcl
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6043-merge-rename-directories/8c/.git/
-[master (root-commit) a8ba9b3] O
- Author: A U Thor <author@example.com>
- 3 files changed, 12 insertions(+)
- create mode 100644 z/b
- create mode 100644 z/c
- create mode 100644 z/d
-Switched to branch 'A'
-rm 'z/d'
-[A d5ba1c0] A
- Author: A U Thor <author@example.com>
- 3 files changed, 10 deletions(-)
- rename {z => y}/b (100%)
- rename {z => y}/c (100%)
- delete mode 100644 z/d
-Switched to branch 'B'
-[B 1757e3f] B
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+), 10 deletions(-)
- mode change 100644 => 100755 z/d
- create mode 100644 z/e
-ok 55 - 8c-setup: modify/delete or rename+modify/delete?
+expecting success: 
+		test_must_fail git for-each-ref --perl --shell 2>err &&
+		grep '^error: more than one quoting style' err
+	
+error: more than one quoting style?
+ok 135 - more than one quoting style: --perl --shell
 
 expecting success: 
-	(
-		cd 8c &&
+		test_must_fail git for-each-ref -s --python 2>err &&
+		grep '^error: more than one quoting style' err
+	
+error: more than one quoting style?
+ok 136 - more than one quoting style: -s --python
 
-		git checkout A^0 &&
+expecting success: 
+		test_must_fail git for-each-ref --python --tcl 2>err &&
+		grep '^error: more than one quoting style' err
+	
+error: more than one quoting style?
+ok 137 - more than one quoting style: --python --tcl
 
-		test_must_fail git merge -s recursive B^0 >out &&
-		test_i18ngrep "CONFLICT (modify/delete).* z/d" out &&
+expecting success: 
+		test_must_fail git for-each-ref --tcl --perl 2>err &&
+		grep '^error: more than one quoting style' err
+	
+error: more than one quoting style?
+ok 138 - more than one quoting style: --tcl --perl
 
-		git ls-files -s >out &&
-		test_line_count = 5 out &&
-		git ls-files -u >out &&
-		test_line_count = 2 out &&
-		git ls-files -o >out &&
-		test_line_count = 1 out &&
+expecting success: 
+	test_commit two
 
-		git rev-parse >actual \
-			:0:y/b :0:y/c :0:y/e :1:z/d :3:z/d &&
-		git rev-parse >expect \
-			 O:z/b  O:z/c  B:z/e  O:z/d  B:z/d &&
-		test_cmp expect actual &&
+[master 4ddde45] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+ok 139 - setup for upstream:track[short]
 
-		test_must_fail git rev-parse :2:z/d &&
-		git ls-files -s z/d | grep ^100755 &&
-		test_path_is_file z/d &&
-		test_path_is_missing y/d
-	)
+expecting success: 
+		git for-each-ref --format='%(upstream:track)' refs/heads/master >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 140 - basic atom: head upstream:track
 
-Note: checking out 'A^0'.
+expecting success: 
+		git for-each-ref --format='%(upstream:trackshort)' refs/heads/master >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 141 - basic atom: head upstream:trackshort
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by performing another checkout.
+expecting success: 
+		git for-each-ref --format='%(upstream:track,nobracket)' refs/heads/master >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 142 - basic atom: head upstream:track,nobracket
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
+expecting success: 
+		git for-each-ref --format='%(upstream:nobracket,track)' refs/heads/master >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 143 - basic atom: head upstream:nobracket,track
 
-  git checkout -b <new-branch-name>
+expecting success: 
+		git for-each-ref --format='%(push:track)' refs/heads/master >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 144 - basic atom: head push:track
 
-HEAD is now at d5ba1c0 A
-CONFLICT (modify/delete): z/d deleted in HEAD and modified in B^0. Version B^0 of z/d left in tree.
-fatal: Path 'z/d' is in the index, but not at stage 2.
-Did you mean ':1:z/d'?
-:2:z/d
-100755 b4de3947675361a7770d29b8982c407b0ec6b2a0 3	z/d
-ok 56 - 8c-check: modify/delete or rename+modify/delete
+expecting success: 
+		git for-each-ref --format='%(push:trackshort)' refs/heads/master >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 145 - basic atom: head push:trackshort
 
 expecting success: 
-	test_create_repo 8d &&
-	(
-		cd 8d &&
+	test_must_fail git for-each-ref --format="%(refname:track)" 2>/dev/null &&
+	test_must_fail git for-each-ref --format="%(refname:trackshort)" 2>/dev/null
 
-		mkdir z &&
-		echo b >z/b &&
-		echo c >z/c &&
-		test_seq 1 10 >z/d &&
-		git add z &&
-		test_tick &&
-		git commit -m "O" &&
+ok 146 - Check that :track[short] cannot be used with other atoms
 
-		git branch O &&
-		git branch A &&
-		git branch B &&
+expecting success: 
+	cat >expected <<-\EOF &&
+	[gone]
 
-		git checkout A &&
-		git rm z/d &&
-		git mv z y &&
-		test_tick &&
-		git commit -m "A" &&
+	EOF
+	test_when_finished "git config branch.master.merge refs/heads/master" &&
+	git config branch.master.merge refs/heads/does-not-exist &&
+	git for-each-ref \
+		--format="%(upstream:track)$LF%(upstream:trackshort)" \
+		refs/heads >actual &&
+	test_cmp expected actual
 
-		git checkout B &&
-		echo e >z/e &&
-		git add z/e &&
-		test_tick &&
-		git commit -m "B"
-	)
+ok 147 - Check that :track[short] works when upstream is invalid
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6043-merge-rename-directories/8d/.git/
-[master (root-commit) a8ba9b3] O
- Author: A U Thor <author@example.com>
- 3 files changed, 12 insertions(+)
- create mode 100644 z/b
- create mode 100644 z/c
- create mode 100644 z/d
-Switched to branch 'A'
-rm 'z/d'
-[A d5ba1c0] A
- Author: A U Thor <author@example.com>
- 3 files changed, 10 deletions(-)
- rename {z => y}/b (100%)
- rename {z => y}/c (100%)
- delete mode 100644 z/d
-Switched to branch 'B'
-[B 12eaccc] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 z/e
-ok 57 - 8d-setup: rename/delete...or not?
+expecting success: 
+	test_must_fail git for-each-ref --format="%(refname:INVALID)"
+
+fatal: unrecognized %(refname:INVALID) argument: INVALID
+ok 148 - Check for invalid refname format
 
 expecting success: 
-	(
-		cd 8d &&
+	cat >expected.color <<-EOF &&
+	$(git rev-parse --short refs/heads/master) <GREEN>master<RESET>
+	$(git rev-parse --short refs/remotes/origin/master) <GREEN>origin/master<RESET>
+	$(git rev-parse --short refs/tags/testtag) <GREEN>testtag<RESET>
+	$(git rev-parse --short refs/tags/two) <GREEN>two<RESET>
+	EOF
+	sed "s/<[^>]*>//g" <expected.color >expected.bare &&
+	color_format="%(objectname:short) %(color:green)%(refname:short)"
 
-		git checkout A^0 &&
+ok 149 - set up color tests
 
-		git merge -s recursive B^0 &&
+checking prerequisite: TTY
 
-		git ls-files -s >out &&
-		test_line_count = 3 out &&
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
+	test_have_prereq PERL &&
 
-		git rev-parse >actual \
-			HEAD:y/b HEAD:y/c HEAD:y/e &&
-		git rev-parse >expect \
-			O:z/b    O:z/c    B:z/e &&
-		test_cmp expect actual
-	)
+	# 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 &&
 
-Note: checking out 'A^0'.
+	perl "$TEST_DIRECTORY"/test-terminal.perl \
+		sh -c "test -t 1 && test -t 2"
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by performing another checkout.
+)
+prerequisite TTY ok
+expecting success: 
+	test_terminal git for-each-ref --format="$color_format" >actual.raw &&
+	test_decode_color <actual.raw >actual &&
+	test_cmp expected.color actual
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
+ok 150 - %(color) shows color with a tty
 
-  git checkout -b <new-branch-name>
+expecting success: 
+	TERM=vt100 git for-each-ref --format="$color_format" >actual &&
+	test_cmp expected.bare actual
 
-HEAD is now at d5ba1c0 A
-Merging:
-d5ba1c0 A
-virtual B^0
-found 1 common ancestor:
-a8ba9b3 O
-Skipped y/c (merged same as existing)
-Skipped y/b (merged same as existing)
-Merge made by the 'recursive' strategy.
- y/e | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 y/e
-ok 58 - 8d-check: rename/delete...or not?
+ok 151 - %(color) does not show color without tty
 
 expecting success: 
-	test_create_repo 8e &&
-	(
-		cd 8e &&
+	git for-each-ref --color --format="$color_format" >actual.raw &&
+	test_decode_color <actual.raw >actual &&
+	test_cmp expected.color actual
 
-		mkdir z &&
-		echo b >z/b &&
-		echo c >z/c &&
-		git add z &&
-		test_tick &&
-		git commit -m "O" &&
+ok 152 - --color can override tty check
 
-		git branch O &&
-		git branch A &&
-		git branch B &&
+expecting success: 
+	git -c color.ui=always for-each-ref --format="$color_format" >actual &&
+	test_cmp expected.bare actual
 
-		git checkout A &&
-		git mv z y &&
-		test_tick &&
-		git commit -m "A" &&
+ok 153 - color.ui=always does not override tty check
 
-		git checkout B &&
-		git mv z w &&
-		mkdir z &&
-		echo d >z/d &&
-		git add z/d &&
-		test_tick &&
-		git commit -m "B"
-	)
+expecting success: 
+	git config --bool core.warnambiguousrefs true &&
+	git checkout -b newtag &&
+	echo "Using $datestamp" > one &&
+	git add one &&
+	git commit -m "Branch" &&
+	setdate_and_increment &&
+	git tag -m "Tagging at $datestamp" master &&
+	git for-each-ref --format "%(refname:short)" refs/heads/master refs/tags/master >actual &&
+	test_cmp expected actual
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6043-merge-rename-directories/8e/.git/
-[master (root-commit) 4e96174] O
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 z/b
- create mode 100644 z/c
-Switched to branch 'A'
-[A 4e9f86d] A
- Author: A U Thor <author@example.com>
- 2 files changed, 0 insertions(+), 0 deletions(-)
- rename {z => y}/b (100%)
- rename {z => y}/c (100%)
-Switched to branch 'B'
-[B 7a02f25] B
+Switched to a new branch 'newtag'
+[newtag b5aa6dc] Branch
  Author: A U Thor <author@example.com>
- 3 files changed, 1 insertion(+)
- rename {z => w}/b (100%)
- rename {z => w}/c (100%)
- create mode 100644 z/d
-ok 59 - 8e-setup: Both sides rename, one side adds to original directory
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 154 - Check ambiguous head and tag refs (strict)
 
 expecting success: 
-	(
-		cd 8e &&
+	git config --bool core.warnambiguousrefs false &&
+	git for-each-ref --format "%(refname:short)" refs/heads/master refs/tags/master >actual &&
+	test_cmp expected actual
 
-		git checkout A^0 &&
+ok 155 - Check ambiguous head and tag refs (loose)
 
-		test_must_fail git merge -s recursive B^0 >out 2>err &&
-		test_i18ngrep CONFLICT.*rename/rename.*z/c.*y/c.*w/c out &&
-		test_i18ngrep CONFLICT.*rename/rename.*z/b.*y/b.*w/b out &&
+expecting success: 
+	git checkout master &&
+	git tag ambiguous testtag^0 &&
+	git branch ambiguous testtag^0 &&
+	git for-each-ref --format "%(refname:short)" refs/heads/ambiguous refs/tags/ambiguous >actual &&
+	test_cmp expected actual
 
-		git ls-files -s >out &&
-		test_line_count = 7 out &&
-		git ls-files -u >out &&
-		test_line_count = 6 out &&
-		git ls-files -o >out &&
-		test_line_count = 2 out &&
+Switched to branch 'master'
+Your branch is ahead of 'origin/master' by 1 commit.
+  (use "git push" to publish your local commits)
+ok 156 - Check ambiguous head and tag refs II (loose)
 
-		git rev-parse >actual \
-			:1:z/b :2:y/b :3:w/b :1:z/c :2:y/c :3:w/c :0:y/d &&
-		git rev-parse >expect \
-			 O:z/b  O:z/b  O:z/b  O:z/c  O:z/c  O:z/c  B:z/d &&
-		test_cmp expect actual &&
+expecting success: 
 
-		git hash-object >actual \
-			y/b   w/b   y/c   w/c &&
-		git rev-parse >expect \
-			O:z/b O:z/b O:z/c O:z/c &&
-		test_cmp expect actual &&
+	git tag -m "bogo" bogo &&
+	bogo=$(git cat-file tag bogo) &&
+	bogo=$(printf "%s" "$bogo" | git mktag) &&
+	git tag -f bogo "$bogo" &&
+	git for-each-ref --format "%(body)" refs/tags/bogo
 
-		test_path_is_missing z/b &&
-		test_path_is_missing z/c
-	)
 
-Note: checking out 'A^0'.
+Updated tag 'bogo' (was 89437ea)
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by performing another checkout.
+ok 157 - an unusual tag with an incomplete line
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
+expecting success: 
+	cat >>msg <<-\EOF &&
+		the subject line
 
-  git checkout -b <new-branch-name>
+		first body line
+		second body line
+	EOF
+	git tag -F msg subject-body
 
-HEAD is now at 4e9f86d A
-CONFLICT (rename/rename): Rename "z/c"->"y/c" in branch "HEAD" rename "z/c"->"w/c" in "B^0"
-CONFLICT (rename/rename): Rename "z/b"->"y/b" in branch "HEAD" rename "z/b"->"w/b" in "B^0"
-ok 60 - 8e-check: Both sides rename, one side adds to original directory
+ok 158 - create tag with subject and body content
 
 expecting success: 
-	test_create_repo 9a &&
-	(
-		cd 9a &&
+		git for-each-ref --format='%(subject)' refs/tags/subject-body >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 159 - basic atom: refs/tags/subject-body subject
 
-		mkdir -p z/d &&
-		echo b >z/b &&
-		echo c >z/c &&
-		echo e >z/d/e &&
-		echo f >z/d/f &&
-		echo g >z/d/g &&
-		git add z &&
-		test_tick &&
-		git commit -m "O" &&
+expecting success: 
+		git for-each-ref --format='%(body)' refs/tags/subject-body >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 160 - basic atom: refs/tags/subject-body body
 
-		git branch O &&
-		git branch A &&
-		git branch B &&
+expecting success: 
+		git for-each-ref --format='%(contents)' refs/tags/subject-body >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 161 - basic atom: refs/tags/subject-body contents
 
-		git checkout A &&
-		mkdir x &&
-		git mv z/d x/w &&
-		git mv z y &&
-		test_tick &&
-		git commit -m "A" &&
+expecting success: 
+	cat >msg <<-\EOF &&
+		first subject line
+		second subject line
 
-		git checkout B &&
-		echo h >z/d/h &&
-		echo i >z/i &&
-		git add z &&
-		test_tick &&
-		git commit -m "B"
-	)
+		first body line
+		second body line
+	EOF
+	git tag -F msg multiline
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6043-merge-rename-directories/9a/.git/
-[master (root-commit) ad6f8a2] O
- Author: A U Thor <author@example.com>
- 5 files changed, 5 insertions(+)
- create mode 100644 z/b
- create mode 100644 z/c
- create mode 100644 z/d/e
- create mode 100644 z/d/f
- create mode 100644 z/d/g
-Switched to branch 'A'
-[A 9bfe686] A
- Author: A U Thor <author@example.com>
- 5 files changed, 0 insertions(+), 0 deletions(-)
- rename {z/d => x/w}/e (100%)
- rename {z/d => x/w}/f (100%)
- rename {z/d => x/w}/g (100%)
- rename {z => y}/b (100%)
- rename {z => y}/c (100%)
-Switched to branch 'B'
-[B 004af77] B
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 z/d/h
- create mode 100644 z/i
-ok 61 - 9a-setup: Inner renamed directory within outer renamed directory
+ok 162 - create tag with multiline subject
 
 expecting success: 
-	(
-		cd 9a &&
-
-		git checkout A^0 &&
+		git for-each-ref --format='%(subject)' refs/tags/multiline >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 163 - basic atom: refs/tags/multiline subject
 
-		git merge -s recursive B^0 &&
+expecting success: 
+		git for-each-ref --format='%(contents:subject)' refs/tags/multiline >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 164 - basic atom: refs/tags/multiline contents:subject
 
-		git ls-files -s >out &&
-		test_line_count = 7 out &&
-		git ls-files -u >out &&
-		test_line_count = 0 out &&
-		git ls-files -o >out &&
-		test_line_count = 1 out &&
+expecting success: 
+		git for-each-ref --format='%(body)' refs/tags/multiline >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 165 - basic atom: refs/tags/multiline body
 
-		git rev-parse >actual \
-			HEAD:y/b HEAD:y/c HEAD:y/i &&
-		git rev-parse >expect \
-			O:z/b    O:z/c    B:z/i &&
-		test_cmp expect actual &&
+expecting success: 
+		git for-each-ref --format='%(contents:body)' refs/tags/multiline >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 166 - basic atom: refs/tags/multiline contents:body
 
-		git rev-parse >actual \
-			HEAD:x/w/e HEAD:x/w/f HEAD:x/w/g HEAD:x/w/h &&
-		git rev-parse >expect \
-			O:z/d/e    O:z/d/f    O:z/d/g    B:z/d/h &&
-		test_cmp expect actual
-	)
+expecting success: 
+		git for-each-ref --format='%(contents:signature)' refs/tags/multiline >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 167 - basic atom: refs/tags/multiline contents:signature
 
-Note: checking out 'A^0'.
+expecting success: 
+		git for-each-ref --format='%(contents)' refs/tags/multiline >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 168 - basic atom: refs/tags/multiline contents
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by performing another checkout.
+skipping test: create signed tags 
+	git tag -s -m "" signed-empty &&
+	git tag -s -m "subject line" signed-short &&
+	cat >msg <<-\EOF &&
+	subject line
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
+	body contents
+	EOF
+	git tag -s -F msg signed-long
 
-  git checkout -b <new-branch-name>
+ok 169 # skip create signed tags (missing GPG)
 
-HEAD is now at 9bfe686 A
-Merging:
-9bfe686 A
-virtual B^0
-found 1 common ancestor:
-ad6f8a2 O
-Skipped y/c (merged same as existing)
-Skipped y/b (merged same as existing)
-Skipped x/w/g (merged same as existing)
-Skipped x/w/f (merged same as existing)
-Skipped x/w/e (merged same as existing)
-Merge made by the 'recursive' strategy.
- x/w/h | 1 +
- y/i   | 1 +
- 2 files changed, 2 insertions(+)
- create mode 100644 x/w/h
- create mode 100644 y/i
-ok 62 - 9a-check: Inner renamed directory within outer renamed directory
+skipping test: basic atom: refs/tags/signed-empty subject 
+		git for-each-ref --format='%(subject)' refs/tags/signed-empty >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 170 # skip basic atom: refs/tags/signed-empty subject (missing GPG)
 
-expecting success: 
-	test_create_repo 9b &&
-	(
-		cd 9b &&
+skipping test: basic atom: refs/tags/signed-empty contents:subject 
+		git for-each-ref --format='%(contents:subject)' refs/tags/signed-empty >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 171 # skip basic atom: refs/tags/signed-empty contents:subject (missing GPG)
 
-		mkdir z &&
-		echo b >z/b &&
-		echo c >z/c &&
-		mkdir x &&
-		test_seq 1 10 >x/d &&
-		git add z x &&
-		test_tick &&
-		git commit -m "O" &&
+skipping test: basic atom: refs/tags/signed-empty body 
+		git for-each-ref --format='%(body)' refs/tags/signed-empty >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 172 # skip basic atom: refs/tags/signed-empty body (missing GPG)
 
-		git branch O &&
-		git branch A &&
-		git branch B &&
+skipping test: basic atom: refs/tags/signed-empty contents:body 
+		git for-each-ref --format='%(contents:body)' refs/tags/signed-empty >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 173 # skip basic atom: refs/tags/signed-empty contents:body (missing GPG)
 
-		git checkout A &&
-		git mv z y &&
-		test_seq 1 11 >x/d &&
-		git add x/d &&
-		test_tick &&
-		git commit -m "A" &&
+skipping test: basic atom: refs/tags/signed-empty contents:signature 
+		git for-each-ref --format='%(contents:signature)' refs/tags/signed-empty >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 174 # skip basic atom: refs/tags/signed-empty contents:signature (missing GPG)
 
-		git checkout B &&
-		test_seq 0 10 >x/d &&
-		git mv x/d z/d &&
-		git add z/d &&
-		test_tick &&
-		git commit -m "B"
-	)
+skipping test: basic atom: refs/tags/signed-empty contents 
+		git for-each-ref --format='%(contents)' refs/tags/signed-empty >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 175 # skip basic atom: refs/tags/signed-empty contents (missing GPG)
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6043-merge-rename-directories/9b/.git/
-[master (root-commit) f84ec32] O
- Author: A U Thor <author@example.com>
- 3 files changed, 12 insertions(+)
- create mode 100644 x/d
- create mode 100644 z/b
- create mode 100644 z/c
-Switched to branch 'A'
-[A a2010ab] A
- Author: A U Thor <author@example.com>
- 3 files changed, 1 insertion(+)
- rename {z => y}/b (100%)
- rename {z => y}/c (100%)
-Switched to branch 'B'
-[B ded5d1d] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- rename {x => z}/d (91%)
-ok 63 - 9b-setup: Transitive rename with content merge
+skipping test: basic atom: refs/tags/signed-short subject 
+		git for-each-ref --format='%(subject)' refs/tags/signed-short >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 176 # skip basic atom: refs/tags/signed-short subject (missing GPG)
 
-expecting success: 
-	(
-		cd 9b &&
+skipping test: basic atom: refs/tags/signed-short contents:subject 
+		git for-each-ref --format='%(contents:subject)' refs/tags/signed-short >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 177 # skip basic atom: refs/tags/signed-short contents:subject (missing GPG)
 
-		git checkout A^0 &&
+skipping test: basic atom: refs/tags/signed-short body 
+		git for-each-ref --format='%(body)' refs/tags/signed-short >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 178 # skip basic atom: refs/tags/signed-short body (missing GPG)
 
-		git merge -s recursive B^0 &&
+skipping test: basic atom: refs/tags/signed-short contents:body 
+		git for-each-ref --format='%(contents:body)' refs/tags/signed-short >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 179 # skip basic atom: refs/tags/signed-short contents:body (missing GPG)
 
-		git ls-files -s >out &&
-		test_line_count = 3 out &&
+skipping test: basic atom: refs/tags/signed-short contents:signature 
+		git for-each-ref --format='%(contents:signature)' refs/tags/signed-short >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 180 # skip basic atom: refs/tags/signed-short contents:signature (missing GPG)
 
-		test_seq 0 11 >expected &&
-		test_cmp expected y/d &&
-		git add expected &&
-		git rev-parse >actual \
-			HEAD:y/b HEAD:y/c HEAD:y/d &&
-		git rev-parse >expect \
-			O:z/b    O:z/c    :0:expected &&
-		test_cmp expect actual &&
-		test_must_fail git rev-parse HEAD:x/d &&
-		test_must_fail git rev-parse HEAD:z/d &&
-		test_path_is_missing z/d &&
+skipping test: basic atom: refs/tags/signed-short contents 
+		git for-each-ref --format='%(contents)' refs/tags/signed-short >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 181 # skip basic atom: refs/tags/signed-short contents (missing GPG)
 
-		test $(git rev-parse HEAD:y/d) != $(git rev-parse O:x/d) &&
-		test $(git rev-parse HEAD:y/d) != $(git rev-parse A:x/d) &&
-		test $(git rev-parse HEAD:y/d) != $(git rev-parse B:z/d)
-	)
+skipping test: basic atom: refs/tags/signed-long subject 
+		git for-each-ref --format='%(subject)' refs/tags/signed-long >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 182 # skip basic atom: refs/tags/signed-long subject (missing GPG)
 
-Note: checking out 'A^0'.
+skipping test: basic atom: refs/tags/signed-long contents:subject 
+		git for-each-ref --format='%(contents:subject)' refs/tags/signed-long >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 183 # skip basic atom: refs/tags/signed-long contents:subject (missing GPG)
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by performing another checkout.
+skipping test: basic atom: refs/tags/signed-long body 
+		git for-each-ref --format='%(body)' refs/tags/signed-long >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 184 # skip basic atom: refs/tags/signed-long body (missing GPG)
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
+skipping test: basic atom: refs/tags/signed-long contents:body 
+		git for-each-ref --format='%(contents:body)' refs/tags/signed-long >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 185 # skip basic atom: refs/tags/signed-long contents:body (missing GPG)
 
-  git checkout -b <new-branch-name>
+skipping test: basic atom: refs/tags/signed-long contents:signature 
+		git for-each-ref --format='%(contents:signature)' refs/tags/signed-long >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 186 # skip basic atom: refs/tags/signed-long contents:signature (missing GPG)
 
-HEAD is now at a2010ab A
-Merging:
-a2010ab A
-virtual B^0
-found 1 common ancestor:
-f84ec32 O
-Auto-merging y/d
-Skipped y/c (merged same as existing)
-Skipped y/b (merged same as existing)
-Merge made by the 'recursive' strategy.
- {x => y}/d | 1 +
- 1 file changed, 1 insertion(+)
- rename {x => y}/d (92%)
-fatal: Path 'x/d' does not exist in 'HEAD'
-HEAD:x/d
-fatal: Path 'z/d' does not exist in 'HEAD'
-HEAD:z/d
-ok 64 - 9b-check: Transitive rename with content merge
+skipping test: basic atom: refs/tags/signed-long contents 
+		git for-each-ref --format='%(contents)' refs/tags/signed-long >actual &&
+		sanitize_pgp <actual >actual.clean &&
+		test_cmp expected actual.clean
+	
+ok 187 # skip basic atom: refs/tags/signed-long contents (missing GPG)
 
 expecting success: 
-	test_create_repo 9c &&
-	(
-		cd 9c &&
-
-		mkdir z &&
-		echo b >z/b &&
-		echo c >z/c &&
-		mkdir x &&
-		echo d >x/d &&
-		echo e >x/e &&
-		mkdir w &&
-		echo f >w/f &&
-		git add z x w &&
-		test_tick &&
-		git commit -m "O" &&
-
-		git branch O &&
-		git branch A &&
-		git branch B &&
-
-		git checkout A &&
-		git mv z y &&
-		git mv w/f x/ &&
-		echo g >x/g &&
-		git add x/g &&
-		test_tick &&
-		git commit -m "A" &&
-
-		git checkout B &&
-		git mv x/d z/d &&
-		git mv x/e z/e &&
-		test_tick &&
-		git commit -m "B"
-	)
+	git for-each-ref --format="%(objectname) %(taggeremail) %(refname)" --sort=objectname --sort=taggeremail \
+		refs/tags/bogo refs/tags/master > actual &&
+	test_cmp expected actual
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6043-merge-rename-directories/9c/.git/
-[master (root-commit) f3e903b] O
- Author: A U Thor <author@example.com>
- 5 files changed, 5 insertions(+)
- create mode 100644 w/f
- create mode 100644 x/d
- create mode 100644 x/e
- create mode 100644 z/b
- create mode 100644 z/c
-Switched to branch 'A'
-[A 8a6c5f2] A
- Author: A U Thor <author@example.com>
- 4 files changed, 1 insertion(+)
- rename {w => x}/f (100%)
- create mode 100644 x/g
- rename {z => y}/b (100%)
- rename {z => y}/c (100%)
-Switched to branch 'B'
-[B 3f509fc] B
- Author: A U Thor <author@example.com>
- 2 files changed, 0 insertions(+), 0 deletions(-)
- rename {x => z}/d (100%)
- rename {x => z}/e (100%)
-ok 65 - 9c-setup: Doubly transitive rename?
+ok 188 - Verify sort with multiple keys
 
 expecting success: 
-	(
-		cd 9c &&
+	test_when_finished "git checkout master" &&
+	git for-each-ref --format="%(HEAD) %(refname:short)" refs/heads/ >actual &&
+	sed -e "s/^\* /  /" actual >expect &&
+	git checkout --orphan orphaned-branch &&
+	git for-each-ref --format="%(HEAD) %(refname:short)" refs/heads/ >actual &&
+	test_cmp expect actual
 
-		git checkout A^0 &&
+Switched to a new branch 'orphaned-branch'
+Switched to branch 'master'
+Your branch is ahead of 'origin/master' by 1 commit.
+  (use "git push" to publish your local commits)
+ok 189 - do not dereference NULL upon %(HEAD) on unborn branch
 
-		git merge -s recursive B^0 >out &&
-		test_i18ngrep "WARNING: Avoiding applying x -> z rename to x/f" out &&
+expecting success: 
+	echo "Some contents" > two &&
+	git add two &&
+	git commit -F - <<-EOF
+	trailers: this commit message has trailers
 
-		git ls-files -s >out &&
-		test_line_count = 6 out &&
-		git ls-files -o >out &&
-		test_line_count = 1 out &&
+	Some message contents
 
-		git rev-parse >actual \
-			HEAD:y/b HEAD:y/c HEAD:y/d HEAD:y/e HEAD:x/f HEAD:x/g &&
-		git rev-parse >expect \
-			O:z/b    O:z/c    O:x/d    O:x/e    O:w/f    A:x/g &&
-		test_cmp expect actual
-	)
+	$(cat trailers)
+	EOF
 
-Note: checking out 'A^0'.
+[master 36c72cc] trailers: this commit message has trailers
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two
+ok 190 - set up trailers for next test
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by performing another checkout.
+expecting success: 
+	git for-each-ref --format="%(trailers:unfold)" refs/heads/master >actual &&
+	{
+		unfold <trailers
+		echo
+	} >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 -b with the checkout command again. Example:
+ok 191 - %(trailers:unfold) unfolds trailers
 
-  git checkout -b <new-branch-name>
+expecting success: 
+	git for-each-ref --format="%(trailers:only)" refs/heads/master >actual &&
+	{
+		grep -v patch.description <trailers &&
+		echo
+	} >expect &&
+	test_cmp expect actual
 
-HEAD is now at 8a6c5f2 A
-WARNING: Avoiding applying x -> z rename to x/f, because z itself was renamed.
-ok 66 - 9c-check: Doubly transitive rename?
+ok 192 - %(trailers:only) shows only "key: value" trailers
 
 expecting success: 
-	test_create_repo 9d &&
-	(
-		cd 9d &&
+	git for-each-ref --format="%(trailers:only,unfold)" refs/heads/master >actual &&
+	git for-each-ref --format="%(trailers:unfold,only)" refs/heads/master >reverse &&
+	test_cmp actual reverse &&
+	{
+		grep -v patch.description <trailers | unfold &&
+		echo
+	} >expect &&
+	test_cmp expect actual
 
-		mkdir z y x w v u &&
-		echo a >z/a &&
-		echo b >y/b &&
-		echo c >x/c &&
-		echo d >w/d &&
-		echo e >v/e &&
-		echo f >u/f &&
-		git add z y x w v u &&
-		test_tick &&
-		git commit -m "O" &&
+ok 193 - %(trailers:only) and %(trailers:unfold) work together
 
-		git branch O &&
-		git branch A &&
-		git branch B &&
+expecting success: 
+	git for-each-ref --format="%(contents:trailers:unfold)" refs/heads/master >actual &&
+	{
+		unfold <trailers
+		echo
+	} >expect &&
+	test_cmp expect actual
 
-		git checkout A &&
-		git mv z/a y/ &&
-		git mv x/c w/ &&
-		git mv v/e u/ &&
-		test_tick &&
-		git commit -m "A" &&
+ok 194 - %(contents:trailers:unfold) unfolds trailers
 
-		git checkout B &&
-		echo t >z/t &&
-		git mv y/b x/ &&
-		git mv w/d v/ &&
-		git add z/t &&
-		test_tick &&
-		git commit -m "B"
-	)
+expecting success: 
+	git for-each-ref --format="%(contents:trailers:only)" refs/heads/master >actual &&
+	{
+		grep -v patch.description <trailers &&
+		echo
+	} >expect &&
+	test_cmp expect actual
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6043-merge-rename-directories/9d/.git/
-[master (root-commit) a77ae1c] O
- Author: A U Thor <author@example.com>
- 6 files changed, 6 insertions(+)
- create mode 100644 u/f
- create mode 100644 v/e
- create mode 100644 w/d
- create mode 100644 x/c
- create mode 100644 y/b
- create mode 100644 z/a
-Switched to branch 'A'
-[A 67d374b] A
- Author: A U Thor <author@example.com>
- 3 files changed, 0 insertions(+), 0 deletions(-)
- rename {v => u}/e (100%)
- rename {x => w}/c (100%)
- rename {z => y}/a (100%)
-Switched to branch 'B'
-[B 9c7db88] B
- Author: A U Thor <author@example.com>
- 3 files changed, 1 insertion(+)
- rename {w => v}/d (100%)
- rename {y => x}/b (100%)
- create mode 100644 z/t
-ok 67 - 9d-setup: N-way transitive rename?
+ok 195 - %(contents:trailers:only) shows only "key: value" trailers
 
 expecting success: 
-	(
-		cd 9d &&
-
-		git checkout A^0 &&
+	git for-each-ref --format="%(contents:trailers:only,unfold)" refs/heads/master >actual &&
+	git for-each-ref --format="%(contents:trailers:unfold,only)" refs/heads/master >reverse &&
+	test_cmp actual reverse &&
+	{
+		grep -v patch.description <trailers | unfold &&
+		echo
+	} >expect &&
+	test_cmp expect actual
 
-		git merge -s recursive B^0 >out &&
-		test_i18ngrep "WARNING: Avoiding applying z -> y rename to z/t" out &&
-		test_i18ngrep "WARNING: Avoiding applying y -> x rename to y/a" out &&
-		test_i18ngrep "WARNING: Avoiding applying x -> w rename to x/b" out &&
-		test_i18ngrep "WARNING: Avoiding applying w -> v rename to w/c" out &&
+ok 196 - %(contents:trailers:only) and %(contents:trailers:unfold) work together
 
-		git ls-files -s >out &&
-		test_line_count = 7 out &&
-		git ls-files -o >out &&
-		test_line_count = 1 out &&
+expecting success: 
+	# error message cannot be checked under i18n
+	cat >expect <<-EOF &&
+	fatal: unknown %(trailers) argument: unsupported
+	EOF
+	test_must_fail git for-each-ref --format="%(trailers:unsupported)" 2>actual &&
+	test_i18ncmp expect actual
 
-		git rev-parse >actual \
-			HEAD:z/t \
-			HEAD:y/a HEAD:x/b HEAD:w/c \
-			HEAD:u/d HEAD:u/e HEAD:u/f &&
-		git rev-parse >expect \
-			B:z/t    \
-			O:z/a    O:y/b    O:x/c    \
-			O:w/d    O:v/e    A:u/f &&
-		test_cmp expect actual
-	)
+ok 197 - %(trailers) rejects unknown trailers arguments
 
-Note: checking out 'A^0'.
+expecting success: 
+	# error message cannot be checked under i18n
+	cat >expect <<-EOF &&
+	fatal: unknown %(trailers) argument: unsupported
+	EOF
+	test_must_fail git for-each-ref --format="%(contents:trailers:unsupported)" 2>actual &&
+	test_i18ncmp 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 performing another checkout.
+ok 198 - %(contents:trailers) rejects unknown trailers arguments
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
+expecting success: 
+	git for-each-ref --format="%(contents:trailers)" refs/heads/master >actual &&
+	sanitize_pgp <actual >actual.clean &&
+	# git for-each-ref ends with a blank line
+	cat >expect <<-EOF &&
+	$(cat trailers)
 
-  git checkout -b <new-branch-name>
+	EOF
+	test_cmp expect actual.clean
 
-HEAD is now at 67d374b A
-WARNING: Avoiding applying z -> y rename to z/t, because y itself was renamed.
-WARNING: Avoiding applying y -> x rename to y/a, because x itself was renamed.
-WARNING: Avoiding applying x -> w rename to x/b, because w itself was renamed.
-WARNING: Avoiding applying w -> v rename to w/c, because v itself was renamed.
-ok 68 - 9d-check: N-way transitive rename?
+ok 199 - basic atom: head contents:trailers
 
 expecting success: 
-	test_create_repo 9e &&
-	(
-		cd 9e &&
+	git commit --allow-empty -F - <<-\EOF &&
+	this is the subject
 
-		mkdir dir1 dir2 dir3 dirN &&
-		echo a >dir1/a &&
-		echo b >dir1/b &&
-		echo d >dir2/d &&
-		echo e >dir2/e &&
-		echo g >dir3/g &&
-		echo h >dir3/h &&
-		echo j >dirN/j &&
-		echo k >dirN/k &&
-		git add dir* &&
-		test_tick &&
-		git commit -m "O" &&
+	This is the body. The message has a "---" line which would confuse a
+	message+patch parser. But here we know we have only a commit message,
+	so we get it right.
 
-		git branch O &&
-		git branch A &&
-		git branch B &&
+	trailer: wrong
+	---
+	This is more body.
 
-		git checkout A &&
-		echo c  >dir1/c &&
-		echo yo >dir1/yo &&
-		echo f  >dir2/f &&
-		echo yo >dir2/yo &&
-		echo i  >dir3/i &&
-		echo yo >dir3/yo &&
-		echo l  >dirN/l &&
-		echo yo >dirN/yo &&
-		git add dir* &&
-		test_tick &&
-		git commit -m "A" &&
+	trailer: right
+	EOF
 
-		git checkout B &&
-		git mv dir1 combined &&
-		git mv dir2/* combined/ &&
-		git mv dir3/* combined/ &&
-		git mv dirN/* combined/ &&
-		test_tick &&
-		git commit -m "B"
-	)
+	{
+		echo "trailer: right" &&
+		echo
+	} >expect &&
+	git for-each-ref --format="%(trailers)" refs/heads/master >actual &&
+	test_cmp expect actual
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6043-merge-rename-directories/9e/.git/
-[master (root-commit) 6b1b942] O
- Author: A U Thor <author@example.com>
- 8 files changed, 8 insertions(+)
- create mode 100644 dir1/a
- create mode 100644 dir1/b
- create mode 100644 dir2/d
- create mode 100644 dir2/e
- create mode 100644 dir3/g
- create mode 100644 dir3/h
- create mode 100644 dirN/j
- create mode 100644 dirN/k
-Switched to branch 'A'
-[A 1129f61] A
- Author: A U Thor <author@example.com>
- 8 files changed, 8 insertions(+)
- create mode 100644 dir1/c
- create mode 100644 dir1/yo
- create mode 100644 dir2/f
- create mode 100644 dir2/yo
- create mode 100644 dir3/i
- create mode 100644 dir3/yo
- create mode 100644 dirN/l
- create mode 100644 dirN/yo
-Switched to branch 'B'
-[B e5547de] B
+[master 162c31a] this is the subject
  Author: A U Thor <author@example.com>
- 8 files changed, 0 insertions(+), 0 deletions(-)
- rename {dir1 => combined}/a (100%)
- rename {dir1 => combined}/b (100%)
- rename {dir2 => combined}/d (100%)
- rename {dir2 => combined}/e (100%)
- rename {dir3 => combined}/g (100%)
- rename {dir3 => combined}/h (100%)
- rename {dirN => combined}/j (100%)
- rename {dirN => combined}/k (100%)
-ok 69 - 9e-setup: N-to-1 whammo
+ok 200 - trailer parsing not fooled by --- line
 
 expecting success: 
-	(
-		cd 9e &&
+	git symbolic-ref refs/heads/sym refs/heads/master
 
-		git checkout A^0 &&
+ok 201 - Add symbolic ref for the following tests
 
-		test_must_fail git merge -s recursive B^0 >out &&
-		grep "CONFLICT (implicit dir rename): Cannot map more than one path to combined/yo" out >error_line &&
-		grep -q dir1/yo error_line &&
-		grep -q dir2/yo error_line &&
-		grep -q dir3/yo error_line &&
-		grep -q dirN/yo error_line &&
+expecting success: 
+	git for-each-ref --format="%(symref)" refs/heads/sym >actual &&
+	test_cmp expected actual
 
-		git ls-files -s >out &&
-		test_line_count = 16 out &&
-		git ls-files -u >out &&
-		test_line_count = 0 out &&
-		git ls-files -o >out &&
-		test_line_count = 2 out &&
+ok 202 - Verify usage of %(symref) atom
 
-		git rev-parse >actual \
-			:0:combined/a :0:combined/b :0:combined/c \
-			:0:combined/d :0:combined/e :0:combined/f \
-			:0:combined/g :0:combined/h :0:combined/i \
-			:0:combined/j :0:combined/k :0:combined/l &&
-		git rev-parse >expect \
-			 O:dir1/a      O:dir1/b      A:dir1/c \
-			 O:dir2/d      O:dir2/e      A:dir2/f \
-			 O:dir3/g      O:dir3/h      A:dir3/i \
-			 O:dirN/j      O:dirN/k      A:dirN/l &&
-		test_cmp expect actual &&
+expecting success: 
+	git for-each-ref --format="%(symref:short)" refs/heads/sym >actual &&
+	test_cmp expected actual
 
-		git rev-parse >actual \
-			:0:dir1/yo :0:dir2/yo :0:dir3/yo :0:dirN/yo &&
-		git rev-parse >expect \
-			 A:dir1/yo  A:dir2/yo  A:dir3/yo  A:dirN/yo &&
-		test_cmp expect actual
-	)
+ok 203 - Verify usage of %(symref:short) atom
 
-Note: checking out 'A^0'.
+expecting success: 
+	git for-each-ref --format="%(symref:lstrip=2)" refs/heads/sym > actual &&
+	git for-each-ref --format="%(symref:lstrip=-2)" refs/heads/sym >> actual &&
+	test_cmp expected actual &&
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by performing another checkout.
+	git for-each-ref --format="%(symref:strip=2)" refs/heads/sym > actual &&
+	git for-each-ref --format="%(symref:strip=-2)" refs/heads/sym >> actual &&
+	test_cmp expected actual
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
+ok 204 - Verify usage of %(symref:lstrip) atom
 
-  git checkout -b <new-branch-name>
+expecting success: 
+	git for-each-ref --format="%(symref:rstrip=2)" refs/heads/sym > actual &&
+	git for-each-ref --format="%(symref:rstrip=-2)" refs/heads/sym >> actual &&
+	test_cmp expected actual
 
-HEAD is now at 1129f61 A
-ok 70 - 9e-check: N-to-1 whammo
+ok 205 - Verify usage of %(symref:rstrip) atom
 
 expecting success: 
-	test_create_repo 9f &&
+	git init remote-tests &&
 	(
-		cd 9f &&
+		cd remote-tests &&
+		test_commit initial &&
+		git remote add from fifth.coffee:blub &&
+		git config branch.master.remote from &&
+		git config branch.master.merge refs/heads/stable &&
+		git remote add to southridge.audio:repo &&
+		git config remote.to.push "refs/heads/*:refs/heads/pushed/*" &&
+		git config branch.master.pushRemote to &&
+		for pair in "%(upstream)=refs/remotes/from/stable" \
+			"%(upstream:remotename)=from" \
+			"%(upstream:remoteref)=refs/heads/stable" \
+			"%(push)=refs/remotes/to/pushed/master" \
+			"%(push:remotename)=to" \
+			"%(push:remoteref)=refs/heads/pushed/master"
+		do
+			echo "${pair#*=}" >expect &&
+			git for-each-ref --format="${pair%=*}" \
+				refs/heads/master >actual &&
+			test_cmp expect actual
+		done &&
+		git branch push-simple &&
+		git config branch.push-simple.pushRemote from &&
+		actual="$(git for-each-ref \
+			--format="%(push:remotename),%(push:remoteref)" \
+			refs/heads/push-simple)" &&
+		test from, = "$actual"
+	)
 
-		mkdir -p goal/a &&
-		mkdir -p goal/b &&
-		echo foo >goal/a/foo &&
-		echo bar >goal/b/bar &&
-		echo baz >goal/b/baz &&
-		git add goal &&
-		test_tick &&
-		git commit -m "O" &&
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6300-for-each-ref/remote-tests/.git/
+[master (root-commit) 5e30013] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+ok 206 - :remotename and :remoteref
 
-		git branch O &&
-		git branch A &&
-		git branch B &&
+expecting success: 
+	git for-each-ref --format="%(refname)" refs/heads/MASTER >actual &&
+	test_must_be_empty actual &&
 
-		git checkout A &&
-		git mv goal/ priority &&
-		test_tick &&
-		git commit -m "A" &&
+	echo refs/heads/master >expect &&
+	git for-each-ref --format="%(refname)" --ignore-case \
+		refs/heads/MASTER >actual &&
+	test_cmp expect actual
 
-		git checkout B &&
-		echo c >goal/c &&
-		git add goal/c &&
-		test_tick &&
-		git commit -m "B"
-	)
+ok 207 - for-each-ref --ignore-case ignores case
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6043-merge-rename-directories/9f/.git/
-[master (root-commit) 6480e53] O
- Author: A U Thor <author@example.com>
- 3 files changed, 3 insertions(+)
- create mode 100644 goal/a/foo
- create mode 100644 goal/b/bar
- create mode 100644 goal/b/baz
-Switched to branch 'A'
-[A 96c4122] A
+# passed all 207 test(s)
+1..207
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t7110-reset-merge.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7110-reset-merge/.git/
+expecting success: 
+    for i in 1 2 3; do echo line $i; done >file1 &&
+    cat file1 >file2 &&
+    git add file1 file2 &&
+    test_tick &&
+    git commit -m "Initial commit" &&
+    git tag initial &&
+    echo line 4 >>file1 &&
+    cat file1 >file2 &&
+    test_tick &&
+    git commit -m "add line 4 to file1" file1 &&
+    git tag second
+
+[master (root-commit) 294b13e] Initial commit
  Author: A U Thor <author@example.com>
- 3 files changed, 0 insertions(+), 0 deletions(-)
- rename {goal => priority}/a/foo (100%)
- rename {goal => priority}/b/bar (100%)
- rename {goal => priority}/b/baz (100%)
-Switched to branch 'B'
-[B 08998f4] B
+ 2 files changed, 6 insertions(+)
+ create mode 100644 file1
+ create mode 100644 file2
+[master 91b6f65] add line 4 to file1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 goal/c
-ok 71 - 9f-setup: Renamed directory that only contained immediate subdirs
+ok 1 - setup
 
 expecting success: 
-	(
-		cd 9f &&
-
-		git checkout A^0 &&
-
-		git merge -s recursive B^0 &&
+    git reset --merge HEAD^ &&
+    ! grep 4 file1 &&
+    grep 4 file2 &&
+    test "$(git rev-parse HEAD)" = "$(git rev-parse initial)" &&
+    test -z "$(git diff --cached)"
 
-		git ls-files -s >out &&
-		test_line_count = 4 out &&
+line 4
+ok 2 - reset --merge is ok with changes in file it does not touch
 
-		git rev-parse >actual \
-			HEAD:priority/a/foo \
-			HEAD:priority/b/bar \
-			HEAD:priority/b/baz \
-			HEAD:priority/c &&
-		git rev-parse >expect \
-			O:goal/a/foo \
-			O:goal/b/bar \
-			O:goal/b/baz \
-			B:goal/c &&
-		test_cmp expect actual &&
-		test_must_fail git rev-parse HEAD:goal/c
-	)
+expecting success: 
+    git reset --merge second &&
+    grep 4 file1 &&
+    grep 4 file2 &&
+    test "$(git rev-parse HEAD)" = "$(git rev-parse second)" &&
+    test -z "$(git diff --cached)"
 
-Note: checking out 'A^0'.
+line 4
+line 4
+ok 3 - reset --merge is ok when switching back
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by performing another checkout.
+expecting success: 
+    git reset --hard second &&
+    cat file1 >file2 &&
+    git reset --keep HEAD^ &&
+    ! grep 4 file1 &&
+    grep 4 file2 &&
+    test "$(git rev-parse HEAD)" = "$(git rev-parse initial)" &&
+    test -z "$(git diff --cached)"
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
+HEAD is now at 91b6f65 add line 4 to file1
+line 4
+ok 4 - reset --keep is ok with changes in file it does not touch
 
-  git checkout -b <new-branch-name>
+expecting success: 
+    git reset --keep second &&
+    grep 4 file1 &&
+    grep 4 file2 &&
+    test "$(git rev-parse HEAD)" = "$(git rev-parse second)" &&
+    test -z "$(git diff --cached)"
 
-HEAD is now at 96c4122 A
-Merging:
-96c4122 A
-virtual B^0
-found 1 common ancestor:
-6480e53 O
-Skipped priority/b/baz (merged same as existing)
-Skipped priority/b/bar (merged same as existing)
-Skipped priority/a/foo (merged same as existing)
-Merge made by the 'recursive' strategy.
- priority/c | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 priority/c
-fatal: Path 'goal/c' does not exist in 'HEAD'
-HEAD:goal/c
-ok 72 - 9f-check: Renamed directory that only contained immediate subdirs
+line 4
+line 4
+ok 5 - reset --keep is ok when switching back
 
 expecting success: 
-	test_create_repo 9g &&
-	(
-		cd 9g &&
+    git reset --hard second &&
+    cat file1 >file2 &&
+    echo "line 5" >> file1 &&
+    git add file1 &&
+    git reset --merge HEAD^ &&
+    ! grep 4 file1 &&
+    ! grep 5 file1 &&
+    grep 4 file2 &&
+    test "$(git rev-parse HEAD)" = "$(git rev-parse initial)" &&
+    test -z "$(git diff --cached)"
 
-		mkdir -p goal/a &&
-		mkdir -p goal/b &&
-		echo foo >goal/a/foo &&
-		echo bar >goal/b/bar &&
-		echo baz >goal/b/baz &&
-		git add goal &&
-		test_tick &&
-		git commit -m "O" &&
+HEAD is now at 91b6f65 add line 4 to file1
+line 4
+ok 6 - reset --merge discards changes added to index (1)
 
-		git branch O &&
-		git branch A &&
-		git branch B &&
+expecting success: 
+    git reset --hard initial &&
+    echo "line 5" >> file2 &&
+    git add file2 &&
+    git reset --merge second &&
+    ! grep 4 file2 &&
+    ! grep 5 file1 &&
+    grep 4 file1 &&
+    test "$(git rev-parse HEAD)" = "$(git rev-parse second)" &&
+    test -z "$(git diff --cached)"
 
-		git checkout A &&
-		mkdir priority &&
-		git mv goal/a/ priority/alpha &&
-		git mv goal/b/ priority/beta &&
-		rmdir goal/ &&
-		test_tick &&
-		git commit -m "A" &&
+HEAD is now at 294b13e Initial commit
+line 4
+ok 7 - reset --merge is ok again when switching back (1)
 
-		git checkout B &&
-		echo c >goal/c &&
-		git add goal/c &&
-		test_tick &&
-		git commit -m "B"
-	)
+expecting success: 
+    git reset --hard second &&
+    echo "line 5" >> file1 &&
+    git add file1 &&
+    test_must_fail git reset --keep HEAD^
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6043-merge-rename-directories/9g/.git/
-[master (root-commit) 6480e53] O
- Author: A U Thor <author@example.com>
- 3 files changed, 3 insertions(+)
- create mode 100644 goal/a/foo
- create mode 100644 goal/b/bar
- create mode 100644 goal/b/baz
-Switched to branch 'A'
-[A f7fdc05] A
- Author: A U Thor <author@example.com>
- 3 files changed, 0 insertions(+), 0 deletions(-)
- rename {goal/a => priority/alpha}/foo (100%)
- rename {goal/b => priority/beta}/bar (100%)
- rename {goal/b => priority/beta}/baz (100%)
-Switched to branch 'B'
-[B 08998f4] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 goal/c
-ok 73 - 9g-setup: Renamed directory that only contained immediate subdirs, immediate subdirs renamed
+HEAD is now at 91b6f65 add line 4 to file1
+error: Entry 'file1' would be overwritten by merge. Cannot merge.
+fatal: Could not reset index file to revision 'HEAD^'.
+ok 8 - reset --keep fails with changes in index in files it touches
 
-checking known breakage: 
-	(
-		cd 9g &&
+expecting success: 
+    git reset --hard second &&
+    echo "line 4" >> file2 &&
+    git add file2 &&
+    git reset --merge HEAD^ &&
+    ! grep 4 file2 &&
+    test "$(git rev-parse HEAD)" = "$(git rev-parse initial)" &&
+    test -z "$(git diff)" &&
+    test -z "$(git diff --cached)"
 
-		git checkout A^0 &&
+HEAD is now at 91b6f65 add line 4 to file1
+ok 9 - reset --merge discards changes added to index (2)
 
-		git merge -s recursive B^0 &&
+expecting success: 
+    git reset --hard initial &&
+    git reset --merge second &&
+    ! grep 4 file2 &&
+    grep 4 file1 &&
+    test "$(git rev-parse HEAD)" = "$(git rev-parse second)" &&
+    test -z "$(git diff --cached)"
 
-		git ls-files -s >out &&
-		test_line_count = 4 out &&
+HEAD is now at 294b13e Initial commit
+line 4
+ok 10 - reset --merge is ok again when switching back (2)
 
-		git rev-parse >actual \
-			HEAD:priority/alpha/foo \
-			HEAD:priority/beta/bar  \
-			HEAD:priority/beta/baz  \
-			HEAD:priority/c &&
-		git rev-parse >expect \
-			O:goal/a/foo \
-			O:goal/b/bar \
-			O:goal/b/baz \
-			B:goal/c &&
-		test_cmp expect actual &&
-		test_must_fail git rev-parse HEAD:goal/c
-	)
+expecting success: 
+    git reset --hard second &&
+    echo "line 4" >> file2 &&
+    git add file2 &&
+    git reset --keep HEAD^ &&
+    grep 4 file2 &&
+    test "$(git rev-parse HEAD)" = "$(git rev-parse initial)" &&
+    test -z "$(git diff --cached)"
 
-Note: checking out 'A^0'.
+HEAD is now at 91b6f65 add line 4 to file1
+line 4
+ok 11 - reset --keep keeps changes it does not touch
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by performing another checkout.
+expecting success: 
+    git reset --keep second &&
+    grep 4 file2 &&
+    grep 4 file1 &&
+    test "$(git rev-parse HEAD)" = "$(git rev-parse second)" &&
+    test -z "$(git diff --cached)"
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
+line 4
+line 4
+ok 12 - reset --keep keeps changes when switching back
 
-  git checkout -b <new-branch-name>
+expecting success: 
+    git reset --hard second &&
+    echo "line 5" >> file1 &&
+    test_tick &&
+    git commit -m "add line 5" file1 &&
+    sed -e "s/line 1/changed line 1/" <file1 >file3 &&
+    mv file3 file1 &&
+    test_must_fail git reset --merge HEAD^ 2>err.log &&
+    grep file1 err.log | grep "not uptodate"
 
-HEAD is now at f7fdc05 A
-Merging:
-f7fdc05 A
-virtual B^0
-found 1 common ancestor:
-6480e53 O
-Skipped priority/beta/baz (merged same as existing)
-Skipped priority/beta/bar (merged same as existing)
-Skipped priority/alpha/foo (merged same as existing)
-Merge made by the 'recursive' strategy.
- goal/c | 1 +
+HEAD is now at 91b6f65 add line 4 to file1
+[master 7799e7c] add line 5
+ Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 goal/c
-fatal: Path 'priority/c' does not exist in 'HEAD'
-not ok 74 - 9g-check: Renamed directory that only contained immediate subdirs, immediate subdirs renamed # TODO known breakage
+error: Entry 'file1' not uptodate. Cannot merge.
+ok 13 - reset --merge fails with changes in file it touches
 
 expecting success: 
-	test_create_repo 9h &&
-	(
-		cd 9h &&
-
-		mkdir z &&
-		echo b >z/b &&
-		echo c >z/c &&
-		printf "1\n2\n3\n4\n5\n6\n7\n8\nd\n" >z/d &&
-		git add z &&
-		test_tick &&
-		git commit -m "O" &&
-
-		git branch O &&
-		git branch A &&
-		git branch B &&
+    git reset --hard second &&
+    echo "line 5" >> file1 &&
+    test_tick &&
+    git commit -m "add line 5" file1 &&
+    sed -e "s/line 1/changed line 1/" <file1 >file3 &&
+    mv file3 file1 &&
+    test_must_fail git reset --keep HEAD^ 2>err.log &&
+    grep file1 err.log | grep "not uptodate"
 
-		git checkout A &&
-		test_tick &&
-		echo more >>z/d &&
-		git add z/d &&
-		git commit -m "A" &&
+HEAD is now at 91b6f65 add line 4 to file1
+[master f1894d3] add line 5
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+error: Entry 'file1' not uptodate. Cannot merge.
+ok 14 - reset --keep fails with changes in file it touches
 
-		git checkout B &&
-		mkdir y &&
-		mkdir x &&
-		git mv z/b y/ &&
-		git mv z/c y/ &&
-		git mv z/d x/ &&
-		rmdir z &&
-		test_tick &&
-		git commit -m "B"
-	)
+expecting success: 
+    git reset --hard second &&
+    git branch branch1 &&
+    git branch branch2 &&
+    git branch branch3 &&
+    git checkout branch1 &&
+    echo "line 5 in branch1" >> file1 &&
+    test_tick &&
+    git commit -a -m "change in branch1" &&
+    git checkout branch2 &&
+    echo "line 5 in branch2" >> file1 &&
+    test_tick &&
+    git commit -a -m "change in branch2" &&
+    git tag third &&
+    git checkout branch3 &&
+    echo a new file >file3 &&
+    rm -f file1 &&
+    git add file3 &&
+    test_tick &&
+    git commit -a -m "change in branch3"
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6043-merge-rename-directories/9h/.git/
-[master (root-commit) 714b322] O
+HEAD is now at 91b6f65 add line 4 to file1
+Switched to branch 'branch1'
+[branch1 4afd189] change in branch1
  Author: A U Thor <author@example.com>
- 3 files changed, 11 insertions(+)
- create mode 100644 z/b
- create mode 100644 z/c
- create mode 100644 z/d
-Switched to branch 'A'
-[A d51a99d] A
+ 1 file changed, 1 insertion(+)
+Switched to branch 'branch2'
+[branch2 077fd6d] change in branch2
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-Switched to branch 'B'
-[B 0435868] B
+Switched to branch 'branch3'
+[branch3 05419f2] change in branch3
  Author: A U Thor <author@example.com>
- 3 files changed, 0 insertions(+), 0 deletions(-)
- rename {z => x}/d (100%)
- rename {z => y}/b (100%)
- rename {z => y}/c (100%)
-ok 75 - 9h-setup: Avoid dir rename on merely modified path
+ 2 files changed, 1 insertion(+), 4 deletions(-)
+ delete mode 100644 file1
+ create mode 100644 file3
+ok 15 - setup 3 different branches
 
 expecting success: 
-	(
-		cd 9h &&
-
-		git checkout A^0 &&
-
-		git merge -s recursive B^0 &&
-
-		git ls-files -s >out &&
-		test_line_count = 3 out &&
-
-		git rev-parse >actual \
-			HEAD:y/b HEAD:y/c HEAD:x/d &&
-		git rev-parse >expect \
-			O:z/b    O:z/c    A:z/d &&
-		test_cmp expect actual
-	)
+    git checkout third &&
+    test_must_fail git merge branch1 &&
+    git reset --merge HEAD^ &&
+    test "$(git rev-parse HEAD)" = "$(git rev-parse second)" &&
+    test -z "$(git diff --cached)" &&
+    test -z "$(git diff)"
 
-Note: checking out 'A^0'.
+Note: checking out 'third'.
 
 You are in 'detached HEAD' state. You can look around, make experimental
 changes and commit them, and you can discard any commits you make in this
@@ -264023,1446 +258739,1678 @@
 
   git checkout -b <new-branch-name>
 
-HEAD is now at d51a99d A
+HEAD is now at 077fd6d change in branch2
 Merging:
-d51a99d A
-virtual B^0
+077fd6d change in branch2
+virtual branch1
 found 1 common ancestor:
-714b322 O
-Merge made by the 'recursive' strategy.
- {z => x}/d | 0
- {z => y}/b | 0
- {z => y}/c | 0
- 3 files changed, 0 insertions(+), 0 deletions(-)
- rename {z => x}/d (100%)
- rename {z => y}/b (100%)
- rename {z => y}/c (100%)
-ok 76 - 9h-check: Avoid dir rename on merely modified path
+91b6f65 add line 4 to file1
+Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+Automatic merge failed; fix conflicts and then commit the result.
+ok 16 - "reset --merge HEAD^" is ok with pending merge
 
 expecting success: 
-	test_create_repo 10a &&
-	(
-		cd 10a &&
-
-		mkdir z &&
-		echo b >z/b &&
-		echo c >z/c &&
-		git add z &&
-		test_tick &&
-		git commit -m "O" &&
-
-		git branch O &&
-		git branch A &&
-		git branch B &&
-
-		git checkout A &&
-		git rm z/c &&
-		test_tick &&
-		git commit -m "A" &&
-
-		git checkout B &&
-		git mv z/c z/d &&
-		test_tick &&
-		git commit -m "B"
-	)
+    git reset --hard third &&
+    test_must_fail git merge branch1 &&
+    test_must_fail git reset --keep HEAD^ 2>err.log &&
+    test_i18ngrep "middle of a merge" err.log
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6043-merge-rename-directories/10a/.git/
-[master (root-commit) 4e96174] O
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 z/b
- create mode 100644 z/c
-Switched to branch 'A'
-rm 'z/c'
-[A bc21cd8] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 deletion(-)
- delete mode 100644 z/c
-Switched to branch 'B'
-[B 7bb44f1] B
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename z/{c => d} (100%)
-ok 77 - 10a-setup: Overwrite untracked with normal rename/delete
+HEAD is now at 077fd6d change in branch2
+Merging:
+077fd6d change in branch2
+virtual branch1
+found 1 common ancestor:
+91b6f65 add line 4 to file1
+Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+Automatic merge failed; fix conflicts and then commit the result.
+fatal: Cannot do a keep reset in the middle of a merge.
+ok 17 - "reset --keep HEAD^" fails with pending merge
 
 expecting success: 
-	(
-		cd 10a &&
-
-		git checkout A^0 &&
-		echo very >z/c &&
-		echo important >z/d &&
-
-		test_must_fail git merge -s recursive B^0 >out 2>err &&
-		test_i18ngrep "The following untracked working tree files would be overwritten by merge" err &&
-
-		git ls-files -s >out &&
-		test_line_count = 1 out &&
-		git ls-files -o >out &&
-		test_line_count = 4 out &&
-
-		echo very >expect &&
-		test_cmp expect z/c &&
+    git reset --hard third &&
+    test_must_fail git merge branch1 &&
+    git reset --merge HEAD &&
+    test "$(git rev-parse HEAD)" = "$(git rev-parse third)" &&
+    test -z "$(git diff --cached)" &&
+    test -z "$(git diff)"
 
-		echo important >expect &&
-		test_cmp expect z/d &&
+HEAD is now at 077fd6d change in branch2
+Merging:
+077fd6d change in branch2
+virtual branch1
+found 1 common ancestor:
+91b6f65 add line 4 to file1
+Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+Automatic merge failed; fix conflicts and then commit the result.
+ok 18 - "reset --merge HEAD" is ok with pending merge
 
-		git rev-parse HEAD:z/b >actual &&
-		git rev-parse O:z/b >expect &&
-		test_cmp expect actual
-	)
+expecting success: 
+    git reset --hard third &&
+    test_must_fail git merge branch1 &&
+    test_must_fail git reset --keep HEAD 2>err.log &&
+    test_i18ngrep "middle of a merge" err.log
 
-Note: checking out 'A^0'.
+HEAD is now at 077fd6d change in branch2
+Merging:
+077fd6d change in branch2
+virtual branch1
+found 1 common ancestor:
+91b6f65 add line 4 to file1
+Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+Automatic merge failed; fix conflicts and then commit the result.
+fatal: Cannot do a keep reset in the middle of a merge.
+ok 19 - "reset --keep HEAD" fails with pending merge
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by performing another checkout.
+expecting success: 
+    git reset --hard third &&
+    rm -f file2 &&
+    test_must_fail git merge branch3 &&
+    ! test -f file2 &&
+    test -f file3 &&
+    git diff --exit-code file3 &&
+    git diff --exit-code branch3 file3 &&
+    git reset --merge HEAD &&
+    ! test -f file3 &&
+    ! test -f file2 &&
+    git diff --exit-code --cached
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
+HEAD is now at 077fd6d change in branch2
+Merging:
+077fd6d change in branch2
+virtual branch3
+found 1 common ancestor:
+91b6f65 add line 4 to file1
+CONFLICT (modify/delete): file1 deleted in branch3 and modified in HEAD. Version HEAD of file1 left in tree.
+Automatic merge failed; fix conflicts and then commit the result.
+ok 20 - --merge is ok with added/deleted merge
 
-  git checkout -b <new-branch-name>
+expecting success: 
+    git reset --hard third &&
+    rm -f file2 &&
+    test_must_fail git merge branch3 &&
+    ! test -f file2 &&
+    test -f file3 &&
+    git diff --exit-code file3 &&
+    git diff --exit-code branch3 file3 &&
+    test_must_fail git reset --keep HEAD 2>err.log &&
+    test_i18ngrep "middle of a merge" err.log
 
-HEAD is now at bc21cd8 A
-error: The following untracked working tree files would be overwritten by merge:
-ok 78 - 10a-check: Overwrite untracked with normal rename/delete
+HEAD is now at 077fd6d change in branch2
+Merging:
+077fd6d change in branch2
+virtual branch3
+found 1 common ancestor:
+91b6f65 add line 4 to file1
+CONFLICT (modify/delete): file1 deleted in branch3 and modified in HEAD. Version HEAD of file1 left in tree.
+Automatic merge failed; fix conflicts and then commit the result.
+fatal: Cannot do a keep reset in the middle of a merge.
+ok 21 - --keep fails with added/deleted merge
 
+# passed all 21 test(s)
+1..21
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t7102-reset.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7102-reset/.git/
 expecting success: 
-	test_create_repo 10b &&
-	(
-		cd 10b &&
+	test_tick &&
+	echo "1st file" >first &&
+	git add first &&
+	git commit -m "create 1st file" &&
 
-		mkdir z &&
-		echo b >z/b &&
-		echo c >z/c &&
-		git add z &&
-		test_tick &&
-		git commit -m "O" &&
+	echo "2nd file" >second &&
+	git add second &&
+	git commit -m "create 2nd file" &&
 
-		git branch O &&
-		git branch A &&
-		git branch B &&
+	echo "2nd line 1st file" >>first &&
+	git commit -a -m "modify 1st file" &&
 
-		git checkout A &&
-		git rm z/c &&
-		git mv z/ y/ &&
-		test_tick &&
-		git commit -m "A" &&
+	git rm first &&
+	git mv second secondfile &&
+	git commit -a -m "remove 1st and rename 2nd" &&
 
-		git checkout B &&
-		git mv z/c z/d &&
-		echo e >z/e &&
-		git add z/e &&
-		test_tick &&
-		git commit -m "B"
-	)
+	echo "1st line 2nd file" >secondfile &&
+	echo "2nd line 2nd file" >>secondfile &&
+	# "git commit -m" would break MinGW, as Windows refuse to pass
+	# $test_encoding encoded parameter to git.
+	commit_msg $test_encoding | git -c "i18n.commitEncoding=$test_encoding" commit -a -F - &&
+	head5=$(git rev-parse --verify HEAD)
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6043-merge-rename-directories/10b/.git/
-[master (root-commit) 4e96174] O
+[master (root-commit) 811bbdf] create 1st file
  Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 z/b
- create mode 100644 z/c
-Switched to branch 'A'
-rm 'z/c'
-[A 3a1dd27] A
+ 1 file changed, 1 insertion(+)
+ create mode 100644 first
+[master ba22ccd] create 2nd file
  Author: A U Thor <author@example.com>
- 2 files changed, 1 deletion(-)
- rename {z => y}/b (100%)
- delete mode 100644 z/c
-Switched to branch 'B'
-[B 13c0b2e] B
+ 1 file changed, 1 insertion(+)
+ create mode 100644 second
+[master ddaefe0] modify 1st file
  Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+)
- rename z/{c => d} (100%)
- create mode 100644 z/e
-ok 79 - 10b-setup: Overwrite untracked with dir rename + delete
+ 1 file changed, 1 insertion(+)
+rm 'first'
+[master d1a4bc3] remove 1st and rename 2nd
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 deletions(-)
+ delete mode 100644 first
+ rename second => secondfile (100%)
+[master eed6733] modify 2nd file (geändert)
+ Author: A U Thor <author@example.com>
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+ok 1 - creating initial files and commits
 
 expecting success: 
-	(
-		cd 10b &&
-
-		git checkout A^0 &&
-		echo very >y/c &&
-		echo important >y/d &&
-		echo contents >y/e &&
-
-		test_must_fail git merge -s recursive B^0 >out 2>err &&
-		test_i18ngrep "CONFLICT (rename/delete).*Version B\^0 of y/d left in tree at y/d~B\^0" out &&
-		test_i18ngrep "Error: Refusing to lose untracked file at y/e; writing to y/e~B\^0 instead" out &&
-
-		git ls-files -s >out &&
-		test_line_count = 3 out &&
-		git ls-files -u >out &&
-		test_line_count = 2 out &&
-		git ls-files -o >out &&
-		test_line_count = 5 out &&
+	hex=$(git log -1 --format="%h") &&
+	git reset --hard > .actual &&
+	echo HEAD is now at $hex $(commit_msg) > .expected &&
+	test_i18ncmp .expected .actual
 
-		git rev-parse >actual \
-			:0:y/b :3:y/d :3:y/e &&
-		git rev-parse >expect \
-			O:z/b  O:z/c  B:z/e &&
-		test_cmp expect actual &&
+ok 2 - reset --hard message
 
-		echo very >expect &&
-		test_cmp expect y/c &&
+expecting success: 
+	hex=$(git log -1 --format="%h") &&
+	git -c "i18n.logOutputEncoding=$test_encoding" reset --hard > .actual &&
+	echo HEAD is now at $hex $(commit_msg $test_encoding) > .expected &&
+	test_i18ncmp .expected .actual
 
-		echo important >expect &&
-		test_cmp expect y/d &&
+ok 3 - reset --hard message (ISO8859-1 logoutputencoding)
 
-		echo contents >expect &&
-		test_cmp expect y/e
-	)
+expecting success: 
+	test_must_fail git reset aaaaaa &&
+	test_must_fail git reset --mixed aaaaaa &&
+	test_must_fail git reset --soft aaaaaa &&
+	test_must_fail git reset --hard aaaaaa &&
+	check_changes $head5
 
-Note: checking out 'A^0'.
+fatal: ambiguous argument 'aaaaaa': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+fatal: ambiguous argument 'aaaaaa': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+fatal: ambiguous argument 'aaaaaa': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+fatal: ambiguous argument 'aaaaaa': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+ok 4 - giving a non existing revision should fail
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by performing another checkout.
+expecting success: 
+	touch .git/MERGE_HEAD &&
+	echo "100644 44c5b5884550c17758737edcced463447b91d42b 1	un" |
+		git update-index --index-info &&
+	test_must_fail git reset --soft HEAD &&
+	rm .git/MERGE_HEAD &&
+	git rm --cached -- un
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
+fatal: Cannot do a soft reset in the middle of a merge.
+un: needs merge
+rm 'un'
+ok 5 - reset --soft with unmerged index should fail
 
-  git checkout -b <new-branch-name>
+expecting success: 
+	test_must_fail git reset --soft -- first &&
+	test_must_fail git reset --hard -- first &&
+	test_must_fail git reset --soft HEAD^ -- first &&
+	test_must_fail git reset --hard HEAD^ -- first &&
+	check_changes $head5
 
-HEAD is now at 3a1dd27 A
-CONFLICT (rename/delete): z/c deleted in HEAD and renamed to y/d in B^0. Version B^0 of y/d left in tree at y/d~B^0.
-Error: Refusing to lose untracked file at y/e; writing to y/e~B^0 instead.
-ok 80 - 10b-check: Overwrite untracked with dir rename + delete
+fatal: Cannot do soft reset with paths.
+fatal: Cannot do hard reset with paths.
+fatal: Cannot do soft reset with paths.
+fatal: Cannot do hard reset with paths.
+ok 6 - giving paths with options different than --mixed should fail
 
 expecting success: 
-	test_create_repo 10c &&
-	(
-		cd 10c &&
+	test_must_fail git reset --other &&
+	test_must_fail git reset -o &&
+	test_must_fail git reset --mixed --other &&
+	test_must_fail git reset --mixed -o &&
+	test_must_fail git reset --soft --other &&
+	test_must_fail git reset --soft -o &&
+	test_must_fail git reset --hard --other &&
+	test_must_fail git reset --hard -o &&
+	check_changes $head5
 
-		mkdir z x &&
-		echo a >z/a &&
-		echo b >z/b &&
-		echo c >x/c &&
-		echo d >x/d &&
-		git add z x &&
-		test_tick &&
-		git commit -m "O" &&
+error: unknown option `other'
+usage: git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]
+   or: git reset [-q] [<tree-ish>] [--] <paths>...
+   or: git reset --patch [<tree-ish>] [--] [<paths>...]
 
-		git branch O &&
-		git branch A &&
-		git branch B &&
+    -q, --quiet           be quiet, only report errors
+    --mixed               reset HEAD and index
+    --soft                reset only HEAD
+    --hard                reset HEAD, index and working tree
+    --merge               reset HEAD, index and working tree
+    --keep                reset HEAD but keep local changes
+    --recurse-submodules[=<reset>]
+                          control recursive updating of submodules
+    -p, --patch           select hunks interactively
+    -N, --intent-to-add   record only the fact that removed paths will be added later
 
-		git checkout A &&
-		mkdir w &&
-		git mv x/c w/c &&
-		git mv z/ y/ &&
-		test_tick &&
-		git commit -m "A" &&
+error: unknown switch `o'
+usage: git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]
+   or: git reset [-q] [<tree-ish>] [--] <paths>...
+   or: git reset --patch [<tree-ish>] [--] [<paths>...]
 
-		git checkout B &&
-		git mv x/c z/ &&
-		test_tick &&
-		git commit -m "B"
-	)
+    -q, --quiet           be quiet, only report errors
+    --mixed               reset HEAD and index
+    --soft                reset only HEAD
+    --hard                reset HEAD, index and working tree
+    --merge               reset HEAD, index and working tree
+    --keep                reset HEAD but keep local changes
+    --recurse-submodules[=<reset>]
+                          control recursive updating of submodules
+    -p, --patch           select hunks interactively
+    -N, --intent-to-add   record only the fact that removed paths will be added later
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6043-merge-rename-directories/10c/.git/
-[master (root-commit) 1ee9006] O
- Author: A U Thor <author@example.com>
- 4 files changed, 4 insertions(+)
- create mode 100644 x/c
- create mode 100644 x/d
- create mode 100644 z/a
- create mode 100644 z/b
-Switched to branch 'A'
-[A e6a4b22] A
- Author: A U Thor <author@example.com>
- 3 files changed, 0 insertions(+), 0 deletions(-)
- rename {x => w}/c (100%)
- rename {z => y}/a (100%)
- rename {z => y}/b (100%)
-Switched to branch 'B'
-[B b8dbf85] B
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename {x => z}/c (100%)
-ok 81 - 10c-setup: Overwrite untracked with dir rename/rename(1to2)
+error: unknown option `other'
+usage: git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]
+   or: git reset [-q] [<tree-ish>] [--] <paths>...
+   or: git reset --patch [<tree-ish>] [--] [<paths>...]
 
-expecting success: 
-	(
-		cd 10c &&
+    -q, --quiet           be quiet, only report errors
+    --mixed               reset HEAD and index
+    --soft                reset only HEAD
+    --hard                reset HEAD, index and working tree
+    --merge               reset HEAD, index and working tree
+    --keep                reset HEAD but keep local changes
+    --recurse-submodules[=<reset>]
+                          control recursive updating of submodules
+    -p, --patch           select hunks interactively
+    -N, --intent-to-add   record only the fact that removed paths will be added later
 
-		git checkout A^0 &&
-		echo important >y/c &&
+error: unknown switch `o'
+usage: git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]
+   or: git reset [-q] [<tree-ish>] [--] <paths>...
+   or: git reset --patch [<tree-ish>] [--] [<paths>...]
 
-		test_must_fail git merge -s recursive B^0 >out 2>err &&
-		test_i18ngrep "CONFLICT (rename/rename)" out &&
-		test_i18ngrep "Refusing to lose untracked file at y/c; adding as y/c~B\^0 instead" out &&
+    -q, --quiet           be quiet, only report errors
+    --mixed               reset HEAD and index
+    --soft                reset only HEAD
+    --hard                reset HEAD, index and working tree
+    --merge               reset HEAD, index and working tree
+    --keep                reset HEAD but keep local changes
+    --recurse-submodules[=<reset>]
+                          control recursive updating of submodules
+    -p, --patch           select hunks interactively
+    -N, --intent-to-add   record only the fact that removed paths will be added later
 
-		git ls-files -s >out &&
-		test_line_count = 6 out &&
-		git ls-files -u >out &&
-		test_line_count = 3 out &&
-		git ls-files -o >out &&
-		test_line_count = 3 out &&
+error: unknown option `other'
+usage: git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]
+   or: git reset [-q] [<tree-ish>] [--] <paths>...
+   or: git reset --patch [<tree-ish>] [--] [<paths>...]
 
-		git rev-parse >actual \
-			:0:y/a :0:y/b :0:x/d :1:x/c :2:w/c :3:y/c &&
-		git rev-parse >expect \
-			 O:z/a  O:z/b  O:x/d  O:x/c  O:x/c  O:x/c &&
-		test_cmp expect actual &&
+    -q, --quiet           be quiet, only report errors
+    --mixed               reset HEAD and index
+    --soft                reset only HEAD
+    --hard                reset HEAD, index and working tree
+    --merge               reset HEAD, index and working tree
+    --keep                reset HEAD but keep local changes
+    --recurse-submodules[=<reset>]
+                          control recursive updating of submodules
+    -p, --patch           select hunks interactively
+    -N, --intent-to-add   record only the fact that removed paths will be added later
 
-		git hash-object y/c~B^0 >actual &&
-		git rev-parse O:x/c >expect &&
-		test_cmp expect actual &&
+error: unknown switch `o'
+usage: git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]
+   or: git reset [-q] [<tree-ish>] [--] <paths>...
+   or: git reset --patch [<tree-ish>] [--] [<paths>...]
 
-		echo important >expect &&
-		test_cmp expect y/c
-	)
+    -q, --quiet           be quiet, only report errors
+    --mixed               reset HEAD and index
+    --soft                reset only HEAD
+    --hard                reset HEAD, index and working tree
+    --merge               reset HEAD, index and working tree
+    --keep                reset HEAD but keep local changes
+    --recurse-submodules[=<reset>]
+                          control recursive updating of submodules
+    -p, --patch           select hunks interactively
+    -N, --intent-to-add   record only the fact that removed paths will be added later
 
-Note: checking out 'A^0'.
+error: unknown option `other'
+usage: git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]
+   or: git reset [-q] [<tree-ish>] [--] <paths>...
+   or: git reset --patch [<tree-ish>] [--] [<paths>...]
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by performing another checkout.
+    -q, --quiet           be quiet, only report errors
+    --mixed               reset HEAD and index
+    --soft                reset only HEAD
+    --hard                reset HEAD, index and working tree
+    --merge               reset HEAD, index and working tree
+    --keep                reset HEAD but keep local changes
+    --recurse-submodules[=<reset>]
+                          control recursive updating of submodules
+    -p, --patch           select hunks interactively
+    -N, --intent-to-add   record only the fact that removed paths will be added later
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
+error: unknown switch `o'
+usage: git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]
+   or: git reset [-q] [<tree-ish>] [--] <paths>...
+   or: git reset --patch [<tree-ish>] [--] [<paths>...]
 
-  git checkout -b <new-branch-name>
+    -q, --quiet           be quiet, only report errors
+    --mixed               reset HEAD and index
+    --soft                reset only HEAD
+    --hard                reset HEAD, index and working tree
+    --merge               reset HEAD, index and working tree
+    --keep                reset HEAD but keep local changes
+    --recurse-submodules[=<reset>]
+                          control recursive updating of submodules
+    -p, --patch           select hunks interactively
+    -N, --intent-to-add   record only the fact that removed paths will be added later
 
-HEAD is now at e6a4b22 A
-CONFLICT (rename/rename): Rename "x/c"->"w/c" in branch "HEAD" rename "x/c"->"y/c" in "B^0"
-Refusing to lose untracked file at y/c; adding as y/c~B^0 instead
-ok 82 - 10c-check: Overwrite untracked with dir rename/rename(1to2)
+ok 7 - giving unrecognized options should fail
 
 expecting success: 
-	test_create_repo 10d &&
-	(
-		cd 10d &&
+	git branch branch1 &&
+	git branch branch2 &&
 
-		mkdir z x &&
-		echo a >z/a &&
-		echo b >z/b &&
-		echo c >z/c &&
-		echo d >x/d &&
-		echo e >x/e &&
-		echo f >x/f &&
-		git add z x &&
-		test_tick &&
-		git commit -m "O" &&
+	git checkout branch1 &&
+	echo "3rd line in branch1" >>secondfile &&
+	git commit -a -m "change in branch1" &&
 
-		git branch O &&
-		git branch A &&
-		git branch B &&
+	git checkout branch2 &&
+	echo "3rd line in branch2" >>secondfile &&
+	git commit -a -m "change in branch2" &&
 
-		git checkout A &&
-		git mv z/c x/wham &&
-		git mv z/ y/ &&
-		test_tick &&
-		git commit -m "A" &&
+	test_must_fail git merge branch1 &&
+	test_must_fail git reset --soft &&
 
-		git checkout B &&
-		git mv x/f z/wham &&
-		git mv x/ y/ &&
-		test_tick &&
-		git commit -m "B"
-	)
+	printf "1st line 2nd file\n2nd line 2nd file\n3rd line" >secondfile &&
+	git commit -a -m "the change in branch2" &&
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6043-merge-rename-directories/10d/.git/
-[master (root-commit) 1a4b546] O
+	git checkout master &&
+	git branch -D branch1 branch2 &&
+	check_changes $head5
+
+Switched to branch 'branch1'
+[branch1 6b78ea5] change in branch1
  Author: A U Thor <author@example.com>
- 6 files changed, 6 insertions(+)
- create mode 100644 x/d
- create mode 100644 x/e
- create mode 100644 x/f
- create mode 100644 z/a
- create mode 100644 z/b
- create mode 100644 z/c
-Switched to branch 'A'
-[A 9f961af] A
+ 1 file changed, 1 insertion(+)
+Switched to branch 'branch2'
+[branch2 f8a209f] change in branch2
  Author: A U Thor <author@example.com>
- 3 files changed, 0 insertions(+), 0 deletions(-)
- rename z/c => x/wham (100%)
- rename {z => y}/a (100%)
- rename {z => y}/b (100%)
-Switched to branch 'B'
-[B 6a20b58] B
+ 1 file changed, 1 insertion(+)
+Merging:
+f8a209f change in branch2
+virtual branch1
+found 1 common ancestor:
+eed6733 modify 2nd file (geändert)
+Auto-merging secondfile
+CONFLICT (content): Merge conflict in secondfile
+Automatic merge failed; fix conflicts and then commit the result.
+fatal: Cannot do a soft reset in the middle of a merge.
+[branch2 8e8e261] the change in branch2
  Author: A U Thor <author@example.com>
- 3 files changed, 0 insertions(+), 0 deletions(-)
- rename {x => y}/d (100%)
- rename {x => y}/e (100%)
- rename x/f => z/wham (100%)
-ok 83 - 10d-setup: Delete untracked with dir rename/rename(2to1)
+Switched to branch 'master'
+Deleted branch branch1 (was 6b78ea5).
+Deleted branch branch2 (was 8e8e261).
+ok 8 - trying to do reset --soft with pending merge should fail
 
 expecting success: 
-	(
-		cd 10d &&
-
-		git checkout A^0 &&
-		echo important >y/wham &&
-
-		test_must_fail git merge -s recursive B^0 >out 2>err &&
-		test_i18ngrep "CONFLICT (rename/rename)" out &&
-		test_i18ngrep "Refusing to lose untracked file at y/wham" out &&
-
-		git ls-files -s >out &&
-		test_line_count = 6 out &&
-		git ls-files -u >out &&
-		test_line_count = 2 out &&
-		git ls-files -o >out &&
-		test_line_count = 4 out &&
-
-		git rev-parse >actual \
-			:0:y/a :0:y/b :0:y/d :0:y/e :2:y/wham :3:y/wham &&
-		git rev-parse >expect \
-			 O:z/a  O:z/b  O:x/d  O:x/e  O:z/c     O:x/f &&
-		test_cmp expect actual &&
-
-		test_must_fail git rev-parse :1:y/wham &&
-
-		echo important >expect &&
-		test_cmp expect y/wham &&
-
-		git hash-object >actual \
-			y/wham~B^0 y/wham~HEAD &&
-		git rev-parse >expect \
-			O:x/f      O:z/c &&
-		test_cmp expect actual
-	)
-
-Note: checking out '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 performing another checkout.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
-
-  git checkout -b <new-branch-name>
-
-HEAD is now at 9f961af A
-CONFLICT (rename/rename): Rename z/c->y/wham in HEAD. Rename x/f->y/wham in B^0
-Refusing to lose untracked file at y/wham, even though it's in the way.
-fatal: Path 'y/wham' is in the index, but not at stage 1.
-Did you mean ':2:y/wham'?
-:1:y/wham
-ok 84 - 10d-check: Delete untracked with dir rename/rename(2to1)
+	git branch branch3 &&
+	git branch branch4 &&
 
-expecting success: 
-	test_create_repo 10e &&
-	(
-		cd 10e &&
+	git checkout branch3 &&
+	echo "3rd line in branch3" >>secondfile &&
+	git commit -a -m "line in branch3" &&
 
-		mkdir z &&
-		echo a >z/a &&
-		echo b >z/b &&
-		git add z &&
-		test_tick &&
-		git commit -m "O" &&
+	git checkout branch4 &&
+	echo "3rd line in branch4" >>secondfile &&
 
-		git branch O &&
-		git branch A &&
-		git branch B &&
+	git checkout -m branch3 &&
+	test_must_fail git reset --soft &&
 
-		git checkout A &&
-		git mv z/ y/ &&
-		test_tick &&
-		git commit -m "A" &&
+	printf "1st line 2nd file\n2nd line 2nd file\n3rd line" >secondfile &&
+	git commit -a -m "the line in branch3" &&
 
-		git checkout B &&
-		echo c >z/c &&
-		git add z/c &&
-		test_tick &&
-		git commit -m "B"
-	)
+	git checkout master &&
+	git branch -D branch3 branch4 &&
+	check_changes $head5
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6043-merge-rename-directories/10e/.git/
-[master (root-commit) 75ee182] O
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 z/a
- create mode 100644 z/b
-Switched to branch 'A'
-[A ac1ed31] A
- Author: A U Thor <author@example.com>
- 2 files changed, 0 insertions(+), 0 deletions(-)
- rename {z => y}/a (100%)
- rename {z => y}/b (100%)
-Switched to branch 'B'
-[B 095ac3d] B
+Switched to branch 'branch3'
+[branch3 0b5021a] line in branch3
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 z/c
-ok 85 - 10e-setup: Does git complain about untracked file that is not really in the way?
+Switched to branch 'branch4'
+Switched to branch 'branch3'
+M	secondfile
+fatal: Cannot do a soft reset in the middle of a merge.
+[branch3 dbe96ed] the line in branch3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to branch 'master'
+Deleted branch branch3 (was dbe96ed).
+Deleted branch branch4 (was eed6733).
+ok 9 - trying to do reset --soft with pending checkout merge should fail
 
-checking known breakage: 
-	(
-		cd 10e &&
+expecting success: 
+	git reset --hard &&
+		check_changes $head5 &&
+	git reset --hard HEAD &&
+		check_changes $head5 &&
+	git reset --soft &&
+		check_changes $head5 &&
+	git reset --soft HEAD &&
+		check_changes $head5 &&
+	git reset --mixed &&
+		check_changes $head5 &&
+	git reset --mixed HEAD &&
+		check_changes $head5 &&
+	git reset &&
+		check_changes $head5 &&
+	git reset HEAD &&
+		check_changes $head5
 
-		git checkout A^0 &&
-		mkdir z &&
-		echo random >z/c &&
+HEAD is now at eed6733 modify 2nd file (geändert)
+HEAD is now at eed6733 modify 2nd file (geändert)
+ok 10 - resetting to HEAD with no changes should succeed and do nothing
 
-		git merge -s recursive B^0 >out 2>err &&
-		test_i18ngrep ! "following untracked working tree files would be overwritten by merge" err &&
+expecting success: 
+	git reset --soft HEAD^ &&
+	check_changes d1a4bc3abce4829628ae2dcb0d60ef3d1a78b1c4 &&
+	test "$(git rev-parse ORIG_HEAD)" = \
+			$head5
 
-		git ls-files -s >out &&
-		test_line_count = 3 out &&
-		git ls-files -u >out &&
-		test_line_count = 0 out &&
-		git ls-files -o >out &&
-		test_line_count = 3 out &&
+ok 11 - --soft reset only should show changes in diff --cached
 
-		git rev-parse >actual \
-			:0:y/a :0:y/b :0:y/c &&
-		git rev-parse >expect \
-			 O:z/a  O:z/b  B:z/c &&
-		test_cmp expect actual &&
+expecting success: 
+	echo "3rd line 2nd file" >>secondfile &&
+	git commit -a -C ORIG_HEAD &&
+	head4=$(git rev-parse --verify HEAD) &&
+	check_changes $head4 &&
+	test "$(git rev-parse ORIG_HEAD)" = \
+			$head5
 
-		echo random >expect &&
-		test_cmp expect z/c
-	)
+[master b052eb8] modify 2nd file (geändert)
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:13:13 2005 -0700
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+ok 12 - changing files and redo the last commit should succeed
 
-Note: checking out 'A^0'.
+expecting success: 
+	git reset --hard HEAD~2 &&
+	check_changes ddaefe00f1da16864591c61fdc7adb5d7cd6b74e &&
+	test "$(git rev-parse ORIG_HEAD)" = \
+			$head4
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by performing another checkout.
+HEAD is now at ddaefe0 modify 1st file
+ok 13 - --hard reset should change the files and undo commits permanently
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
+expecting success: 
+	git rm first &&
+	git mv second secondfile &&
 
-  git checkout -b <new-branch-name>
+	echo "1st line 2nd file" >secondfile &&
+	echo "2nd line 2nd file" >>secondfile &&
+	git add secondfile &&
+	check_changes ddaefe00f1da16864591c61fdc7adb5d7cd6b74e
 
-HEAD is now at ac1ed31 A
-not ok 86 - 10e-check: Does git complain about untracked file that is not really in the way? # TODO known breakage
+rm 'first'
+ok 14 - redoing changes adding them without commit them should succeed
 
 expecting success: 
-	test_create_repo 11a &&
-	(
-		cd 11a &&
+	git reset &&
+	check_changes ddaefe00f1da16864591c61fdc7adb5d7cd6b74e &&
+	test "$(git rev-parse ORIG_HEAD)" = \
+			ddaefe00f1da16864591c61fdc7adb5d7cd6b74e
 
-		mkdir z &&
-		echo a >z/a &&
-		test_seq 1 10 >z/b &&
-		git add z &&
-		test_tick &&
-		git commit -m "O" &&
+Unstaged changes after reset:
+D	first
+D	second
+ok 15 - --mixed reset to HEAD should unadd the files
 
-		git branch O &&
-		git branch A &&
-		git branch B &&
+expecting success: 
+	git add secondfile &&
+	git reset --hard ddaefe00f1da16864591c61fdc7adb5d7cd6b74e &&
 
-		git checkout A &&
-		git mv z/b z/c &&
-		test_tick &&
-		git commit -m "A" &&
+	git rm first &&
+	git mv second secondfile &&
+	git commit -a -m "remove 1st and rename 2nd" &&
 
-		git checkout B &&
-		echo 11 >>z/b &&
-		git add z/b &&
-		test_tick &&
-		git commit -m "B"
-	)
+	echo "1st line 2nd file" >secondfile &&
+	echo "2nd line 2nd file" >>secondfile &&
+	# "git commit -m" would break MinGW, as Windows refuse to pass
+	# $test_encoding encoded parameter to git.
+	commit_msg $test_encoding | git -c "i18n.commitEncoding=$test_encoding" commit -a -F - &&
+	check_changes $head5
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6043-merge-rename-directories/11a/.git/
-[master (root-commit) d2da13d] O
- Author: A U Thor <author@example.com>
- 2 files changed, 11 insertions(+)
- create mode 100644 z/a
- create mode 100644 z/b
-Switched to branch 'A'
-[A 7a0ff52] A
+HEAD is now at ddaefe0 modify 1st file
+rm 'first'
+[master d1a4bc3] remove 1st and rename 2nd
  Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename z/{b => c} (100%)
-Switched to branch 'B'
-[B b7a4243] B
+ 2 files changed, 2 deletions(-)
+ delete mode 100644 first
+ rename second => secondfile (100%)
+[master eed6733] modify 2nd file (geändert)
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 87 - 11a-setup: Avoid losing dirty contents with simple rename
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+ok 16 - redoing the last two commits should succeed
 
 expecting success: 
-	(
-		cd 11a &&
-
-		git checkout A^0 &&
-		echo stuff >>z/c &&
+	git branch branch1 &&
+	git branch branch2 &&
 
-		test_must_fail git merge -s recursive B^0 >out 2>err &&
-		test_i18ngrep "Refusing to lose dirty file at z/c" out &&
+	git checkout branch1 &&
+	echo "3rd line in branch1" >>secondfile &&
+	git commit -a -m "change in branch1" &&
 
-		test_seq 1 10 >expected &&
-		echo stuff >>expected &&
-		test_cmp expected z/c &&
+	git checkout branch2 &&
+	echo "3rd line in branch2" >>secondfile &&
+	git commit -a -m "change in branch2" &&
+	head3=$(git rev-parse --verify HEAD) &&
 
-		git ls-files -s >out &&
-		test_line_count = 2 out &&
-		git ls-files -u >out &&
-		test_line_count = 1 out &&
-		git ls-files -o >out &&
-		test_line_count = 4 out &&
+	test_must_fail git pull . branch1 &&
+	git reset --hard &&
+	check_changes $head3
 
-		git rev-parse >actual \
-			:0:z/a :2:z/c &&
-		git rev-parse >expect \
-			 O:z/a  B:z/b &&
-		test_cmp expect actual &&
+Switched to branch 'branch1'
+[branch1 6b78ea5] change in branch1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Switched to branch 'branch2'
+[branch2 f8a209f] change in branch2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+From .
+ * branch            branch1    -> FETCH_HEAD
+Merging:
+f8a209f change in branch2
+virtual 6b78ea5a18fcfce43fc7d5b8980e339547a633be
+found 1 common ancestor:
+eed6733 modify 2nd file (geändert)
+Auto-merging secondfile
+CONFLICT (content): Merge conflict in secondfile
+Automatic merge failed; fix conflicts and then commit the result.
+HEAD is now at f8a209f change in branch2
+ok 17 - --hard reset to HEAD should clear a failed merge
 
-		git hash-object z/c~HEAD >actual &&
-		git rev-parse B:z/b >expect &&
-		test_cmp expect actual
-	)
+expecting success: 
+	git reset --hard HEAD^ &&
+	check_changes $head5 &&
 
-Note: checking out 'A^0'.
+	git pull . branch1 &&
+	git reset --hard ORIG_HEAD &&
+	check_changes $head5 &&
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by performing another checkout.
+	git checkout master &&
+	git branch -D branch1 branch2 &&
+	check_changes $head5
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
+HEAD is now at eed6733 modify 2nd file (geändert)
+From .
+ * branch            branch1    -> FETCH_HEAD
+Updating eed6733..6b78ea5
+Fast-forward
+ secondfile | 1 +
+ 1 file changed, 1 insertion(+)
+HEAD is now at eed6733 modify 2nd file (geändert)
+Switched to branch 'master'
+Deleted branch branch1 (was 6b78ea5).
+Deleted branch branch2 (was eed6733).
+ok 18 - --hard reset to ORIG_HEAD should clear a fast-forward merge
 
-  git checkout -b <new-branch-name>
+expecting success: 
+	echo 1 > file1 &&
+	echo 2 > file2 &&
+	git add file1 file2 &&
+	test_tick &&
+	git commit -m files &&
+	git rm file2 &&
+	echo 3 > file3 &&
+	echo 4 > file4 &&
+	echo 5 > file1 &&
+	git add file1 file3 file4 &&
+	git reset HEAD -- file1 file2 file3 &&
+	test_must_fail git diff --quiet &&
+	git diff > output &&
+	test_cmp expect output &&
+	git diff --cached > output &&
+	test_cmp cached_expect output
 
-HEAD is now at 7a0ff52 A
-Refusing to lose dirty file at z/c
-ok 88 - 11a-check: Avoid losing dirty contents with simple rename
+[master 14b96fb] files
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 file1
+ create mode 100644 file2
+rm 'file2'
+Unstaged changes after reset:
+M	file1
+D	file2
+ok 19 - test --mixed <paths>
 
 expecting success: 
-	test_create_repo 11b &&
-	(
-		cd 11b &&
 
-		mkdir z x &&
-		echo a >z/a &&
-		echo b >x/b &&
-		test_seq 1 10 >x/c &&
-		git add z x &&
-		test_tick &&
-		git commit -m "O" &&
+	mkdir sub &&
+	>sub/file1 &&
+	>sub/file2 &&
+	git update-index --add sub/file1 sub/file2 &&
+	T=$(git write-tree) &&
+	git reset HEAD sub/file2 &&
+	test_must_fail git diff --quiet &&
+	U=$(git write-tree) &&
+	echo "$T" &&
+	echo "$U" &&
+	test_must_fail git diff-index --cached --exit-code "$T" &&
+	test "$T" != "$U"
 
-		git branch O &&
-		git branch A &&
-		git branch B &&
 
-		git checkout A &&
-		git mv x/c z/c &&
-		test_tick &&
-		git commit -m "A" &&
+Unstaged changes after reset:
+M	file1
+D	file2
+9571d9b5fb34d9c1274612948c5356f0615744bc
+88880074c0c9957f91fd21817fee120b773fc32c
+:100644 000000 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0000000000000000000000000000000000000000 D	sub/file2
+ok 20 - test resetting the index at give paths
 
-		git checkout B &&
-		git mv z y &&
-		echo 11 >>x/c &&
-		git add x/c &&
-		test_tick &&
-		git commit -m "B"
-	)
+expecting success: 
+	git reset --hard &&
+	git reset -- file1 &&
+	git diff-files --exit-code &&
+	git diff-index --cached --exit-code HEAD
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6043-merge-rename-directories/11b/.git/
-[master (root-commit) 8ba0ed2] O
- Author: A U Thor <author@example.com>
- 3 files changed, 12 insertions(+)
- create mode 100644 x/b
- create mode 100644 x/c
- create mode 100644 z/a
-Switched to branch 'A'
-[A 331ae41] A
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename {x => z}/c (100%)
-Switched to branch 'B'
-[B 0b664da] B
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+)
- rename {z => y}/a (100%)
-ok 89 - 11b-setup: Avoid losing dirty file involved in directory rename
+HEAD is now at 14b96fb files
+ok 21 - resetting an unmodified path is a no-op
 
 expecting success: 
-	(
-		cd 11b &&
+	echo 123 >> file2 &&
+	git reset --mixed HEAD > output &&
+	test_i18ncmp expect output
 
-		git checkout A^0 &&
-		echo stuff >>z/c &&
+ok 22 - --mixed refreshes the index
 
-		git merge -s recursive B^0 >out 2>err &&
-		test_i18ngrep "Refusing to lose dirty file at z/c" out &&
+expecting success: 
+	git rm --cached file2 &&
+	F1=$(git rev-parse HEAD:file1) &&
+	F2=$(git rev-parse HEAD:file2) &&
+	F3=$(git rev-parse HEAD:secondfile) &&
+	{
+		echo "100644 $F1 1	file2" &&
+		echo "100644 $F2 2	file2" &&
+		echo "100644 $F3 3	file2"
+	} | git update-index --index-info &&
+	git ls-files -u &&
+	git reset HEAD file2 &&
+	test_must_fail git diff --quiet &&
+	git diff-index --exit-code --cached HEAD
 
-		grep -q stuff z/c &&
-		test_seq 1 10 >expected &&
-		echo stuff >>expected &&
-		test_cmp expected z/c &&
+rm 'file2'
+100644 d00491fd7e5bb6fa28c517a0bb32b8b506539d4d 1	file2
+100644 0cfbf08886fca9a91cb753ec8734c84fcbe52c9f 2	file2
+100644 44c5b5884550c17758737edcced463447b91d42b 3	file2
+Unstaged changes after reset:
+M	file2
+ok 23 - resetting specific path that is unmerged
 
-		git ls-files -s >out &&
-		test_line_count = 3 out &&
-		git ls-files -u >out &&
-		test_line_count = 0 out &&
-		git ls-files -m >out &&
-		test_line_count = 0 out &&
-		git ls-files -o >out &&
-		test_line_count = 4 out &&
+expecting success: 
 
-		git rev-parse >actual \
-			:0:x/b :0:y/a :0:y/c &&
-		git rev-parse >expect \
-			 O:x/b  O:z/a  B:x/c &&
-		test_cmp expect actual &&
+	git reset --hard &&
+	>secondfile &&
+	git add secondfile &&
+	git reset secondfile &&
+	test_must_fail git diff --quiet -- secondfile &&
+	test -z "$(git diff --cached --name-only)" &&
+	test -f secondfile &&
+	test_must_be_empty secondfile
 
-		git hash-object y/c >actual &&
-		git rev-parse B:x/c >expect &&
-		test_cmp expect actual
-	)
 
-Note: checking out 'A^0'.
+HEAD is now at 14b96fb files
+Unstaged changes after reset:
+M	secondfile
+ok 24 - disambiguation (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 performing another checkout.
+expecting success: 
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
+	git reset --hard &&
+	>secondfile &&
+	git add secondfile &&
+	rm -f secondfile &&
+	test_must_fail git reset secondfile &&
+	test -n "$(git diff --cached --name-only -- secondfile)" &&
+	test ! -f secondfile
 
-  git checkout -b <new-branch-name>
 
-HEAD is now at 331ae41 A
-Refusing to lose dirty file at z/c
-ok 90 - 11b-check: Avoid losing dirty file involved in directory rename
+HEAD is now at 14b96fb files
+fatal: ambiguous argument 'secondfile': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+ok 25 - disambiguation (2)
 
 expecting success: 
-	test_create_repo 11c &&
-	(
-		cd 11c &&
-
-		mkdir y x &&
-		echo a >y/a &&
-		echo b >x/b &&
-		test_seq 1 10 >x/c &&
-		git add y x &&
-		test_tick &&
-		git commit -m "O" &&
-
-		git branch O &&
-		git branch A &&
-		git branch B &&
 
-		git checkout A &&
-		git mv x/c y/c &&
-		test_tick &&
-		git commit -m "A" &&
+	git reset --hard &&
+	>secondfile &&
+	git add secondfile &&
+	rm -f secondfile &&
+	git reset HEAD secondfile &&
+	test_must_fail git diff --quiet &&
+	test -z "$(git diff --cached --name-only)" &&
+	test ! -f secondfile
 
-		git checkout B &&
-		mkdir y/c &&
-		echo d >y/c/d &&
-		echo 11 >>x/c &&
-		git add x/c y/c/d &&
-		test_tick &&
-		git commit -m "B"
-	)
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6043-merge-rename-directories/11c/.git/
-[master (root-commit) c615350] O
- Author: A U Thor <author@example.com>
- 3 files changed, 12 insertions(+)
- create mode 100644 x/b
- create mode 100644 x/c
- create mode 100644 y/a
-Switched to branch 'A'
-[A b42d3e1] A
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename {x => y}/c (100%)
-Switched to branch 'B'
-[B 78faa62] B
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 y/c/d
-ok 91 - 11c-setup: Avoid losing not-uptodate with rename + D/F conflict
+HEAD is now at 14b96fb files
+Unstaged changes after reset:
+D	secondfile
+ok 26 - disambiguation (3)
 
 expecting success: 
-	(
-		cd 11c &&
-
-		git checkout A^0 &&
-		echo stuff >>y/c &&
 
-		test_must_fail git merge -s recursive B^0 >out 2>err &&
-		test_i18ngrep "following files would be overwritten by merge" err &&
+	git reset --hard &&
+	>secondfile &&
+	git add secondfile &&
+	rm -f secondfile &&
+	git reset -- secondfile &&
+	test_must_fail git diff --quiet &&
+	test -z "$(git diff --cached --name-only)" &&
+	test ! -f secondfile
 
-		grep -q stuff y/c &&
-		test_seq 1 10 >expected &&
-		echo stuff >>expected &&
-		test_cmp expected y/c &&
+HEAD is now at 14b96fb files
+Unstaged changes after reset:
+D	secondfile
+ok 27 - disambiguation (4)
 
-		git ls-files -s >out &&
-		test_line_count = 3 out &&
-		git ls-files -u >out &&
-		test_line_count = 0 out &&
-		git ls-files -m >out &&
-		test_line_count = 1 out &&
-		git ls-files -o >out &&
-		test_line_count = 3 out
-	)
+expecting success: 
+	# for simpler tests, drop last commit containing added files
+	git reset --hard HEAD^ &&
+	git reset HEAD^^{tree} -- . &&
+	git diff --cached HEAD^ --exit-code &&
+	git diff HEAD --exit-code
 
-Note: checking out 'A^0'.
+HEAD is now at eed6733 modify 2nd file (geändert)
+Unstaged changes after reset:
+M	secondfile
+ok 28 - reset with paths accepts tree
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by performing another checkout.
+expecting success: 
+	echo new-file >new-file &&
+	git add new-file &&
+	git reset -N HEAD &&
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
+	tree=$(git write-tree) &&
+	git ls-tree $tree new-file >actual &&
+	test_must_be_empty actual &&
 
-  git checkout -b <new-branch-name>
+	git diff --name-only >actual &&
+	echo new-file >expect &&
+	test_cmp expect actual
 
-HEAD is now at b42d3e1 A
-error: Your local changes to the following files would be overwritten by merge:
-ok 92 - 11c-check: Avoid losing not-uptodate with rename + D/F conflict
+Unstaged changes after reset:
+A	new-file
+ok 29 - reset -N keeps removed files as intent-to-add
 
 expecting success: 
-	test_create_repo 11d &&
+	git init mixed_worktree &&
 	(
-		cd 11d &&
+		cd mixed_worktree &&
+		test_commit dummy
+	) &&
+	git --git-dir=mixed_worktree/.git --work-tree=mixed_worktree reset >actual &&
+	test_must_be_empty actual
 
-		mkdir z x &&
-		echo a >z/a &&
-		echo b >x/b &&
-		test_seq 1 10 >x/c &&
-		git add z x &&
-		test_tick &&
-		git commit -m "O" &&
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7102-reset/mixed_worktree/.git/
+[master (root-commit) b737dfa] dummy
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 dummy.t
+ok 30 - reset --mixed sets up work tree
 
-		git branch O &&
-		git branch A &&
-		git branch B &&
+# passed all 30 test(s)
+1..30
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t7301-clean-interactive.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7301-clean-interactive/.git/
+expecting success: 
 
-		git checkout A &&
-		git mv x/c z/c &&
-		test_tick &&
-		git commit -m "A" &&
+	mkdir -p src &&
+	touch src/part1.c Makefile &&
+	echo build >.gitignore &&
+	echo \*.o >>.gitignore &&
+	git add . &&
+	git commit -m setup &&
+	touch src/part2.c README &&
+	git add .
 
-		git checkout B &&
-		git mv z y &&
-		mkdir y/c &&
-		echo d >y/c/d &&
-		echo 11 >>x/c &&
-		git add x/c y/c/d &&
-		test_tick &&
-		git commit -m "B"
-	)
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6043-merge-rename-directories/11d/.git/
-[master (root-commit) 8ba0ed2] O
- Author: A U Thor <author@example.com>
- 3 files changed, 12 insertions(+)
- create mode 100644 x/b
- create mode 100644 x/c
- create mode 100644 z/a
-Switched to branch 'A'
-[A 331ae41] A
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename {x => z}/c (100%)
-Switched to branch 'B'
-[B cbf14e5] B
+[master (root-commit) 9a15cbf] setup
  Author: A U Thor <author@example.com>
  3 files changed, 2 insertions(+)
- rename {z => y}/a (100%)
- create mode 100644 y/c/d
-ok 93 - 11d-setup: Avoid losing not-uptodate with rename + D/F conflict
+ create mode 100644 .gitignore
+ create mode 100644 Makefile
+ create mode 100644 src/part1.c
+ok 1 - setup
 
 expecting success: 
-	(
-		cd 11d &&
 
-		git checkout A^0 &&
-		echo stuff >>z/c &&
+	mkdir -p build docs &&
+	touch a.out src/part3.c src/part3.h src/part4.c src/part4.h \
+	docs/manual.txt obj.o build/lib.so &&
+	echo c | git clean -i &&
+	test -f Makefile &&
+	test -f README &&
+	test -f src/part1.c &&
+	test -f src/part2.c &&
+	test ! -f a.out &&
+	test -f docs/manual.txt &&
+	test ! -f src/part3.c &&
+	test ! -f src/part3.h &&
+	test ! -f src/part4.c &&
+	test ! -f src/part4.h &&
+	test -f obj.o &&
+	test -f build/lib.so
 
-		test_must_fail git merge -s recursive B^0 >out 2>err &&
-		test_i18ngrep "Refusing to lose dirty file at z/c" out &&
 
-		grep -q stuff z/c &&
-		test_seq 1 10 >expected &&
-		echo stuff >>expected &&
-		test_cmp expected z/c &&
+Would remove the following items:
+  a.out        src/part3.c  src/part3.h  src/part4.c  src/part4.h
+*** Commands ***
+    1: clean                2: filter by pattern    3: select by numbers
+    4: ask each             5: quit                 6: help
+What now> Removing a.out
+Removing src/part3.c
+Removing src/part3.h
+Removing src/part4.c
+Removing src/part4.h
+ok 2 - git clean -i (c: clean hotkey)
 
-		git ls-files -s >out &&
-		test_line_count = 4 out &&
-		git ls-files -u >out &&
-		test_line_count = 1 out &&
-		git ls-files -o >out &&
-		test_line_count = 5 out &&
+expecting success: 
 
-		git rev-parse >actual \
-			:0:x/b :0:y/a :0:y/c/d :3:y/c &&
-		git rev-parse >expect \
-			 O:x/b  O:z/a  B:y/c/d  B:x/c &&
-		test_cmp expect actual &&
+	mkdir -p build docs &&
+	touch a.out src/part3.c src/part3.h src/part4.c src/part4.h \
+	docs/manual.txt obj.o build/lib.so &&
+	echo cl | git clean -i &&
+	test -f Makefile &&
+	test -f README &&
+	test -f src/part1.c &&
+	test -f src/part2.c &&
+	test ! -f a.out &&
+	test -f docs/manual.txt &&
+	test ! -f src/part3.c &&
+	test ! -f src/part3.h &&
+	test ! -f src/part4.c &&
+	test ! -f src/part4.h &&
+	test -f obj.o &&
+	test -f build/lib.so
 
-		git hash-object y/c~HEAD >actual &&
-		git rev-parse B:x/c >expect &&
-		test_cmp expect actual
-	)
 
-Note: checking out 'A^0'.
+Would remove the following items:
+  a.out        src/part3.c  src/part3.h  src/part4.c  src/part4.h
+*** Commands ***
+    1: clean                2: filter by pattern    3: select by numbers
+    4: ask each             5: quit                 6: help
+What now> Removing a.out
+Removing src/part3.c
+Removing src/part3.h
+Removing src/part4.c
+Removing src/part4.h
+ok 3 - git clean -i (cl: clean prefix)
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by performing another checkout.
+expecting success: 
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
+	mkdir -p build docs &&
+	touch a.out src/part3.c src/part3.h src/part4.c src/part4.h \
+	docs/manual.txt obj.o build/lib.so &&
+	echo quit | git clean -i &&
+	test -f Makefile &&
+	test -f README &&
+	test -f src/part1.c &&
+	test -f src/part2.c &&
+	test -f a.out &&
+	test -f docs/manual.txt &&
+	test -f src/part3.c &&
+	test -f src/part3.h &&
+	test -f src/part4.c &&
+	test -f src/part4.h &&
+	test -f obj.o &&
+	test -f build/lib.so
 
-  git checkout -b <new-branch-name>
 
-HEAD is now at 331ae41 A
-Refusing to lose dirty file at z/c
-ok 94 - 11d-check: Avoid losing not-uptodate with rename + D/F conflict
+Would remove the following items:
+  a.out        src/part3.c  src/part3.h  src/part4.c  src/part4.h
+*** Commands ***
+    1: clean                2: filter by pattern    3: select by numbers
+    4: ask each             5: quit                 6: help
+What now> Bye.
+ok 4 - git clean -i (quit)
 
 expecting success: 
-	test_create_repo 11e &&
-	(
-		cd 11e &&
 
-		mkdir z x &&
-		echo a >z/a &&
-		echo b >z/b &&
-		echo c >x/c &&
-		echo d >x/d &&
-		git add z x &&
-		test_tick &&
-		git commit -m "O" &&
-
-		git branch O &&
-		git branch A &&
-		git branch B &&
-
-		git checkout A &&
-		git mv z/ y/ &&
-		echo different >y/c &&
-		mkdir w &&
-		git mv x/c w/ &&
-		git add y/c &&
-		test_tick &&
-		git commit -m "A" &&
+	mkdir -p build docs &&
+	touch a.out src/part3.c src/part3.h src/part4.c src/part4.h \
+	docs/manual.txt obj.o build/lib.so &&
+	echo "\04" | git clean -i &&
+	test -f Makefile &&
+	test -f README &&
+	test -f src/part1.c &&
+	test -f src/part2.c &&
+	test -f a.out &&
+	test -f docs/manual.txt &&
+	test -f src/part3.c &&
+	test -f src/part3.h &&
+	test -f src/part4.c &&
+	test -f src/part4.h &&
+	test -f obj.o &&
+	test -f build/lib.so
 
-		git checkout B &&
-		git mv x/c z/ &&
-		test_tick &&
-		git commit -m "B"
-	)
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6043-merge-rename-directories/11e/.git/
-[master (root-commit) 1ee9006] O
- Author: A U Thor <author@example.com>
- 4 files changed, 4 insertions(+)
- create mode 100644 x/c
- create mode 100644 x/d
- create mode 100644 z/a
- create mode 100644 z/b
-Switched to branch 'A'
-[A 0006594] A
- Author: A U Thor <author@example.com>
- 4 files changed, 1 insertion(+)
- rename {x => w}/c (100%)
- rename {z => y}/a (100%)
- rename {z => y}/b (100%)
- create mode 100644 y/c
-Switched to branch 'B'
-[B b8dbf85] B
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename {x => z}/c (100%)
-ok 95 - 11e-setup: Avoid deleting not-uptodate with dir rename/rename(1to2)/add
+Would remove the following items:
+  a.out        src/part3.c  src/part3.h  src/part4.c  src/part4.h
+*** Commands ***
+    1: clean                2: filter by pattern    3: select by numbers
+    4: ask each             5: quit                 6: help
+What now> Huh (\04)?
+*** Commands ***
+    1: clean                2: filter by pattern    3: select by numbers
+    4: ask each             5: quit                 6: help
+What now> Bye.
+ok 5 - git clean -i (Ctrl+D)
 
 expecting success: 
-	(
-		cd 11e &&
 
-		git checkout A^0 &&
-		echo mods >>y/c &&
+	mkdir -p build docs &&
+	touch a.out src/part3.c src/part3.h src/part4.c src/part4.h \
+	docs/manual.txt obj.o build/lib.so &&
+	test_write_lines f "*" "" c |
+	git clean -id &&
+	test -f Makefile &&
+	test -f README &&
+	test -f src/part1.c &&
+	test -f src/part2.c &&
+	test -f a.out &&
+	test -f docs/manual.txt &&
+	test -f src/part3.c &&
+	test -f src/part3.h &&
+	test -f src/part4.c &&
+	test -f src/part4.h &&
+	test -f obj.o &&
+	test -f build/lib.so
 
-		test_must_fail git merge -s recursive B^0 >out 2>err &&
-		test_i18ngrep "CONFLICT (rename/rename)" out &&
-		test_i18ngrep "Refusing to lose dirty file at y/c" out &&
 
-		git ls-files -s >out &&
-		test_line_count = 7 out &&
-		git ls-files -u >out &&
-		test_line_count = 4 out &&
-		git ls-files -o >out &&
-		test_line_count = 4 out &&
+Would remove the following items:
+  a.out        src/part3.c  src/part4.c
+  docs/        src/part3.h  src/part4.h
+*** Commands ***
+    1: clean                2: filter by pattern    3: select by numbers
+    4: ask each             5: quit                 6: help
+What now>   a.out        src/part3.c  src/part4.c
+  docs/        src/part3.h  src/part4.h
+Input ignore patterns>> No more files to clean, exiting.
+ok 6 - git clean -id (filter all)
 
-		echo different >expected &&
-		echo mods >>expected &&
-		test_cmp expected y/c &&
+expecting success: 
 
-		git rev-parse >actual \
-			:0:y/a :0:y/b :0:x/d :1:x/c :2:w/c :2:y/c :3:y/c &&
-		git rev-parse >expect \
-			 O:z/a  O:z/b  O:x/d  O:x/c  O:x/c  A:y/c  O:x/c &&
-		test_cmp expect actual &&
+	mkdir -p build docs &&
+	touch a.out src/part3.c src/part3.h src/part4.c src/part4.h \
+	docs/manual.txt obj.o build/lib.so &&
+	test_write_lines f "part3.* *.out" "" c |
+	git clean -id &&
+	test -f Makefile &&
+	test -f README &&
+	test -f src/part1.c &&
+	test -f src/part2.c &&
+	test -f a.out &&
+	test ! -f docs/manual.txt &&
+	test -f src/part3.c &&
+	test -f src/part3.h &&
+	test ! -f src/part4.c &&
+	test ! -f src/part4.h &&
+	test -f obj.o &&
+	test -f build/lib.so
 
-		git hash-object >actual \
-			y/c~B^0 y/c~HEAD &&
-		git rev-parse >expect \
-			O:x/c   A:y/c &&
-		test_cmp expect actual
-	)
 
-Note: checking out 'A^0'.
+Would remove the following items:
+  a.out        src/part3.c  src/part4.c
+  docs/        src/part3.h  src/part4.h
+*** Commands ***
+    1: clean                2: filter by pattern    3: select by numbers
+    4: ask each             5: quit                 6: help
+What now>   a.out        src/part3.c  src/part4.c
+  docs/        src/part3.h  src/part4.h
+Input ignore patterns>>   docs/        src/part4.c  src/part4.h
+Input ignore patterns>> Would remove the following items:
+  docs/        src/part4.c  src/part4.h
+*** Commands ***
+    1: clean                2: filter by pattern    3: select by numbers
+    4: ask each             5: quit                 6: help
+What now> Removing docs/
+Removing src/part4.c
+Removing src/part4.h
+ok 7 - git clean -id (filter patterns)
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by performing another checkout.
+expecting success: 
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
+	mkdir -p build docs &&
+	touch a.out src/part3.c src/part3.h src/part4.c src/part4.h \
+	docs/manual.txt obj.o build/lib.so &&
+	test_write_lines f "* !*.out" "" c |
+	git clean -id &&
+	test -f Makefile &&
+	test -f README &&
+	test -f src/part1.c &&
+	test -f src/part2.c &&
+	test ! -f a.out &&
+	test -f docs/manual.txt &&
+	test -f src/part3.c &&
+	test -f src/part3.h &&
+	test -f src/part4.c &&
+	test -f src/part4.h &&
+	test -f obj.o &&
+	test -f build/lib.so
 
-  git checkout -b <new-branch-name>
 
-HEAD is now at 0006594 A
-CONFLICT (rename/rename): Rename "x/c"->"w/c" in branch "HEAD" rename "x/c"->"y/c" in "B^0"
-Refusing to lose dirty file at y/c
-ok 96 - 11e-check: Avoid deleting not-uptodate with dir rename/rename(1to2)/add
+Would remove the following items:
+  a.out        src/part3.c  src/part4.c
+  docs/        src/part3.h  src/part4.h
+*** Commands ***
+    1: clean                2: filter by pattern    3: select by numbers
+    4: ask each             5: quit                 6: help
+What now>   a.out        src/part3.c  src/part4.c
+  docs/        src/part3.h  src/part4.h
+Input ignore patterns>>   a.out
+Input ignore patterns>> Would remove the following item:
+  a.out
+*** Commands ***
+    1: clean                2: filter by pattern    3: select by numbers
+    4: ask each             5: quit                 6: help
+What now> Removing a.out
+ok 8 - git clean -id (filter patterns 2)
 
 expecting success: 
-	test_create_repo 11f &&
-	(
-		cd 11f &&
-
-		mkdir z x &&
-		echo a >z/a &&
-		echo b >z/b &&
-		test_seq 1 10 >x/c &&
-		echo d >x/d &&
-		git add z x &&
-		test_tick &&
-		git commit -m "O" &&
-
-		git branch O &&
-		git branch A &&
-		git branch B &&
 
-		git checkout A &&
-		git mv z/ y/ &&
-		git mv x/c y/wham &&
-		test_tick &&
-		git commit -m "A" &&
+	mkdir -p build docs &&
+	touch a.out src/part3.c src/part3.h src/part4.c src/part4.h \
+	docs/manual.txt obj.o build/lib.so &&
+	test_write_lines s "*" "" c |
+	git clean -id &&
+	test -f Makefile &&
+	test -f README &&
+	test -f src/part1.c &&
+	test -f src/part2.c &&
+	test ! -f a.out &&
+	test ! -f docs/manual.txt &&
+	test ! -f src/part3.c &&
+	test ! -f src/part3.h &&
+	test ! -f src/part4.c &&
+	test ! -f src/part4.h &&
+	test -f obj.o &&
+	test -f build/lib.so
 
-		git checkout B &&
-		git mv x/d z/wham &&
-		test_tick &&
-		git commit -m "B"
-	)
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6043-merge-rename-directories/11f/.git/
-[master (root-commit) 2274342] O
- Author: A U Thor <author@example.com>
- 4 files changed, 13 insertions(+)
- create mode 100644 x/c
- create mode 100644 x/d
- create mode 100644 z/a
- create mode 100644 z/b
-Switched to branch 'A'
-[A 6299452] A
- Author: A U Thor <author@example.com>
- 3 files changed, 0 insertions(+), 0 deletions(-)
- rename {z => y}/a (100%)
- rename {z => y}/b (100%)
- rename x/c => y/wham (100%)
-Switched to branch 'B'
-[B 42fa76f] B
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename x/d => z/wham (100%)
-ok 97 - 11f-setup: Avoid deleting not-uptodate with dir rename/rename(2to1)
+Would remove the following items:
+  a.out        src/part3.c  src/part4.c
+  docs/        src/part3.h  src/part4.h
+*** Commands ***
+    1: clean                2: filter by pattern    3: select by numbers
+    4: ask each             5: quit                 6: help
+What now>     1: a.out          2: docs/          3: src/part3.c    4: src/part3.h
+    5: src/part4.c    6: src/part4.h
+Select items to delete>>   * 1: a.out        * 2: docs/        * 3: src/part3.c  * 4: src/part3.h
+  * 5: src/part4.c  * 6: src/part4.h
+Select items to delete>> Would remove the following items:
+  a.out        src/part3.c  src/part4.c
+  docs/        src/part3.h  src/part4.h
+*** Commands ***
+    1: clean                2: filter by pattern    3: select by numbers
+    4: ask each             5: quit                 6: help
+What now> Removing a.out
+Removing docs/
+Removing src/part3.c
+Removing src/part3.h
+Removing src/part4.c
+Removing src/part4.h
+ok 9 - git clean -id (select - all)
 
 expecting success: 
-	(
-		cd 11f &&
 
-		git checkout A^0 &&
-		echo important >>y/wham &&
+	mkdir -p build docs &&
+	touch a.out src/part3.c src/part3.h src/part4.c src/part4.h \
+	docs/manual.txt obj.o build/lib.so &&
+	test_write_lines s "" c |
+	git clean -id &&
+	test -f Makefile &&
+	test -f README &&
+	test -f src/part1.c &&
+	test -f src/part2.c &&
+	test -f a.out &&
+	test -f docs/manual.txt &&
+	test -f src/part3.c &&
+	test -f src/part3.h &&
+	test -f src/part4.c &&
+	test -f src/part4.h &&
+	test -f obj.o &&
+	test -f build/lib.so
 
-		test_must_fail git merge -s recursive B^0 >out 2>err &&
-		test_i18ngrep "CONFLICT (rename/rename)" out &&
-		test_i18ngrep "Refusing to lose dirty file at y/wham" out &&
 
-		git ls-files -s >out &&
-		test_line_count = 4 out &&
-		git ls-files -u >out &&
-		test_line_count = 2 out &&
-		git ls-files -o >out &&
-		test_line_count = 4 out &&
+Would remove the following items:
+  a.out        src/part3.c  src/part4.c
+  docs/        src/part3.h  src/part4.h
+*** Commands ***
+    1: clean                2: filter by pattern    3: select by numbers
+    4: ask each             5: quit                 6: help
+What now>     1: a.out          2: docs/          3: src/part3.c    4: src/part3.h
+    5: src/part4.c    6: src/part4.h
+Select items to delete>> No more files to clean, exiting.
+ok 10 - git clean -id (select - none)
 
-		test_seq 1 10 >expected &&
-		echo important >>expected &&
-		test_cmp expected y/wham &&
+expecting success: 
 
-		test_must_fail git rev-parse :1:y/wham &&
-		git hash-object >actual \
-			y/wham~B^0 y/wham~HEAD &&
-		git rev-parse >expect \
-			O:x/d      O:x/c &&
-		test_cmp expect actual &&
+	mkdir -p build docs &&
+	touch a.out src/part3.c src/part3.h src/part4.c src/part4.h \
+	docs/manual.txt obj.o build/lib.so &&
+	test_write_lines s 3 "" c |
+	git clean -id &&
+	test -f Makefile &&
+	test -f README &&
+	test -f src/part1.c &&
+	test -f src/part2.c &&
+	test -f a.out &&
+	test -f docs/manual.txt &&
+	test ! -f src/part3.c &&
+	test -f src/part3.h &&
+	test -f src/part4.c &&
+	test -f src/part4.h &&
+	test -f obj.o &&
+	test -f build/lib.so
 
-		git rev-parse >actual \
-			:0:y/a :0:y/b :2:y/wham :3:y/wham &&
-		git rev-parse >expect \
-			 O:z/a  O:z/b  O:x/c     O:x/d &&
-		test_cmp expect actual
-	)
 
-Note: checking out 'A^0'.
+Would remove the following items:
+  a.out        src/part3.c  src/part4.c
+  docs/        src/part3.h  src/part4.h
+*** Commands ***
+    1: clean                2: filter by pattern    3: select by numbers
+    4: ask each             5: quit                 6: help
+What now>     1: a.out          2: docs/          3: src/part3.c    4: src/part3.h
+    5: src/part4.c    6: src/part4.h
+Select items to delete>>     1: a.out          2: docs/        * 3: src/part3.c    4: src/part3.h
+    5: src/part4.c    6: src/part4.h
+Select items to delete>> Would remove the following item:
+  src/part3.c
+*** Commands ***
+    1: clean                2: filter by pattern    3: select by numbers
+    4: ask each             5: quit                 6: help
+What now> Removing src/part3.c
+ok 11 - git clean -id (select - number)
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by performing another checkout.
+expecting success: 
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
+	mkdir -p build docs &&
+	touch a.out src/part3.c src/part3.h src/part4.c src/part4.h \
+	docs/manual.txt obj.o build/lib.so &&
+	test_write_lines s "2 3" 5 "" c |
+	git clean -id &&
+	test -f Makefile &&
+	test -f README &&
+	test -f src/part1.c &&
+	test -f src/part2.c &&
+	test -f a.out &&
+	test ! -f docs/manual.txt &&
+	test ! -f src/part3.c &&
+	test -f src/part3.h &&
+	test ! -f src/part4.c &&
+	test -f src/part4.h &&
+	test -f obj.o &&
+	test -f build/lib.so
 
-  git checkout -b <new-branch-name>
 
-HEAD is now at 6299452 A
-CONFLICT (rename/rename): Rename x/c->y/wham in HEAD. Rename x/d->y/wham in B^0
-Refusing to lose dirty file at y/wham
-fatal: Path 'y/wham' is in the index, but not at stage 1.
-Did you mean ':2:y/wham'?
-:1:y/wham
-ok 98 - 11f-check: Avoid deleting not-uptodate with dir rename/rename(2to1)
+Would remove the following items:
+  a.out        src/part3.c  src/part4.c
+  docs/        src/part3.h  src/part4.h
+*** Commands ***
+    1: clean                2: filter by pattern    3: select by numbers
+    4: ask each             5: quit                 6: help
+What now>     1: a.out          2: docs/          3: src/part3.c    4: src/part3.h
+    5: src/part4.c    6: src/part4.h
+Select items to delete>>     1: a.out        * 2: docs/        * 3: src/part3.c    4: src/part3.h
+    5: src/part4.c    6: src/part4.h
+Select items to delete>>     1: a.out        * 2: docs/        * 3: src/part3.c    4: src/part3.h
+  * 5: src/part4.c    6: src/part4.h
+Select items to delete>> Would remove the following items:
+  docs/        src/part3.c  src/part4.c
+*** Commands ***
+    1: clean                2: filter by pattern    3: select by numbers
+    4: ask each             5: quit                 6: help
+What now> Removing docs/
+Removing src/part3.c
+Removing src/part4.c
+ok 12 - git clean -id (select - number 2)
 
 expecting success: 
-	test_create_repo 12a &&
-	(
-		cd 12a &&
-
-		mkdir -p node1 node2 &&
-		echo leaf1 >node1/leaf1 &&
-		echo leaf2 >node1/leaf2 &&
-		echo leaf3 >node2/leaf3 &&
-		echo leaf4 >node2/leaf4 &&
-		git add node1 node2 &&
-		test_tick &&
-		git commit -m "O" &&
-
-		git branch O &&
-		git branch A &&
-		git branch B &&
 
-		git checkout A &&
-		git mv node2/ node1/ &&
-		test_tick &&
-		git commit -m "A" &&
+	mkdir -p build docs &&
+	touch a.out src/part3.c src/part3.h src/part4.c src/part4.h \
+	docs/manual.txt obj.o build/lib.so &&
+	test_write_lines s "3,4 5" "" c |
+	git clean -id &&
+	test -f Makefile &&
+	test -f README &&
+	test -f src/part1.c &&
+	test -f src/part2.c &&
+	test -f a.out &&
+	test -f docs/manual.txt &&
+	test ! -f src/part3.c &&
+	test ! -f src/part3.h &&
+	test ! -f src/part4.c &&
+	test -f src/part4.h &&
+	test -f obj.o &&
+	test -f build/lib.so
 
-		git checkout B &&
-		echo leaf5 >node1/leaf5 &&
-		echo leaf6 >node2/leaf6 &&
-		git add node1 node2 &&
-		test_tick &&
-		git commit -m "B"
-	)
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6043-merge-rename-directories/12a/.git/
-[master (root-commit) 674d36e] O
- Author: A U Thor <author@example.com>
- 4 files changed, 4 insertions(+)
- create mode 100644 node1/leaf1
- create mode 100644 node1/leaf2
- create mode 100644 node2/leaf3
- create mode 100644 node2/leaf4
-Switched to branch 'A'
-[A 494e77b] A
- Author: A U Thor <author@example.com>
- 2 files changed, 0 insertions(+), 0 deletions(-)
- rename {node2 => node1/node2}/leaf3 (100%)
- rename {node2 => node1/node2}/leaf4 (100%)
-Switched to branch 'B'
-[B 139a75f] B
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 node1/leaf5
- create mode 100644 node2/leaf6
-ok 99 - 12a-setup: Moving one directory hierarchy into another
+Would remove the following items:
+  a.out        src/part3.c  src/part4.c
+  docs/        src/part3.h  src/part4.h
+*** Commands ***
+    1: clean                2: filter by pattern    3: select by numbers
+    4: ask each             5: quit                 6: help
+What now>     1: a.out          2: docs/          3: src/part3.c    4: src/part3.h
+    5: src/part4.c    6: src/part4.h
+Select items to delete>>     1: a.out          2: docs/        * 3: src/part3.c  * 4: src/part3.h
+  * 5: src/part4.c    6: src/part4.h
+Select items to delete>> Would remove the following items:
+  src/part3.c  src/part3.h  src/part4.c
+*** Commands ***
+    1: clean                2: filter by pattern    3: select by numbers
+    4: ask each             5: quit                 6: help
+What now> Removing src/part3.c
+Removing src/part3.h
+Removing src/part4.c
+ok 13 - git clean -id (select - number 3)
 
 expecting success: 
-	(
-		cd 12a &&
 
-		git checkout A^0 &&
+	mkdir -p build docs &&
+	touch a.out foo.txt bar.txt baz.txt &&
+	test_write_lines s "a.out fo ba bar" "" c |
+	git clean -id &&
+	test -f Makefile &&
+	test ! -f a.out &&
+	test ! -f foo.txt &&
+	test ! -f bar.txt &&
+	test -f baz.txt &&
+	rm baz.txt
 
-		git merge -s recursive B^0 &&
 
-		git ls-files -s >out &&
-		test_line_count = 6 out &&
+Would remove the following items:
+  a.out        baz.txt      foo.txt
+  bar.txt      docs/        src/part4.h
+*** Commands ***
+    1: clean                2: filter by pattern    3: select by numbers
+    4: ask each             5: quit                 6: help
+What now>     1: a.out          2: bar.txt        3: baz.txt        4: docs/
+    5: foo.txt        6: src/part4.h
+Select items to delete>> Huh (ba)?
+  * 1: a.out        * 2: bar.txt        3: baz.txt        4: docs/
+  * 5: foo.txt        6: src/part4.h
+Select items to delete>> Would remove the following items:
+  a.out    bar.txt  foo.txt
+*** Commands ***
+    1: clean                2: filter by pattern    3: select by numbers
+    4: ask each             5: quit                 6: help
+What now> Removing a.out
+Removing bar.txt
+Removing foo.txt
+ok 14 - git clean -id (select - filenames)
 
-		git rev-parse >actual \
-			HEAD:node1/leaf1 HEAD:node1/leaf2 HEAD:node1/leaf5 \
-			HEAD:node1/node2/leaf3 \
-			HEAD:node1/node2/leaf4 \
-			HEAD:node1/node2/leaf6 &&
-		git rev-parse >expect \
-			O:node1/leaf1    O:node1/leaf2    B:node1/leaf5 \
-			O:node2/leaf3 \
-			O:node2/leaf4 \
-			B:node2/leaf6 &&
-		test_cmp expect actual
-	)
+expecting success: 
 
-Note: checking out 'A^0'.
+	mkdir -p build docs &&
+	touch a.out src/part3.c src/part3.h src/part4.c src/part4.h \
+	docs/manual.txt obj.o build/lib.so &&
+	test_write_lines s "1,3-4" 2 "" c |
+	git clean -id &&
+	test -f Makefile &&
+	test -f README &&
+	test -f src/part1.c &&
+	test -f src/part2.c &&
+	test ! -f a.out &&
+	test ! -f src/part3.c &&
+	test ! -f src/part3.h &&
+	test -f src/part4.c &&
+	test -f src/part4.h &&
+	test ! -f docs/manual.txt &&
+	test -f obj.o &&
+	test -f build/lib.so
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by performing another checkout.
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
+Would remove the following items:
+  a.out        src/part3.c  src/part4.c
+  docs/        src/part3.h  src/part4.h
+*** Commands ***
+    1: clean                2: filter by pattern    3: select by numbers
+    4: ask each             5: quit                 6: help
+What now>     1: a.out          2: docs/          3: src/part3.c    4: src/part3.h
+    5: src/part4.c    6: src/part4.h
+Select items to delete>>   * 1: a.out          2: docs/        * 3: src/part3.c  * 4: src/part3.h
+    5: src/part4.c    6: src/part4.h
+Select items to delete>>   * 1: a.out        * 2: docs/        * 3: src/part3.c  * 4: src/part3.h
+    5: src/part4.c    6: src/part4.h
+Select items to delete>> Would remove the following items:
+  a.out        docs/        src/part3.c  src/part3.h
+*** Commands ***
+    1: clean                2: filter by pattern    3: select by numbers
+    4: ask each             5: quit                 6: help
+What now> Removing a.out
+Removing docs/
+Removing src/part3.c
+Removing src/part3.h
+ok 15 - git clean -id (select - range)
 
-  git checkout -b <new-branch-name>
+expecting success: 
 
-HEAD is now at 494e77b A
-Merging:
-494e77b A
-virtual B^0
-found 1 common ancestor:
-674d36e O
-Skipped node1/node2/leaf4 (merged same as existing)
-Skipped node1/node2/leaf3 (merged same as existing)
-Merge made by the 'recursive' strategy.
- node1/leaf5       | 1 +
- node1/node2/leaf6 | 1 +
- 2 files changed, 2 insertions(+)
- create mode 100644 node1/leaf5
- create mode 100644 node1/node2/leaf6
-ok 100 - 12a-check: Moving one directory hierarchy into another
+	mkdir -p build docs &&
+	touch a.out src/part3.c src/part3.h src/part4.c src/part4.h \
+	docs/manual.txt obj.o build/lib.so &&
+	test_write_lines s "4- 1" "" c |
+	git clean -id &&
+	test -f Makefile &&
+	test -f README &&
+	test -f src/part1.c &&
+	test -f src/part2.c &&
+	test ! -f a.out &&
+	test -f docs/manual.txt &&
+	test -f src/part3.c &&
+	test ! -f src/part3.h &&
+	test ! -f src/part4.c &&
+	test ! -f src/part4.h &&
+	test -f obj.o &&
+	test -f build/lib.so
 
-expecting success: 
-	test_create_repo 12b &&
-	(
-		cd 12b &&
 
-		mkdir -p node1 node2 &&
-		echo leaf1 >node1/leaf1 &&
-		echo leaf2 >node1/leaf2 &&
-		echo leaf3 >node2/leaf3 &&
-		echo leaf4 >node2/leaf4 &&
-		git add node1 node2 &&
-		test_tick &&
-		git commit -m "O" &&
+Would remove the following items:
+  a.out        src/part3.c  src/part4.c
+  docs/        src/part3.h  src/part4.h
+*** Commands ***
+    1: clean                2: filter by pattern    3: select by numbers
+    4: ask each             5: quit                 6: help
+What now>     1: a.out          2: docs/          3: src/part3.c    4: src/part3.h
+    5: src/part4.c    6: src/part4.h
+Select items to delete>>   * 1: a.out          2: docs/          3: src/part3.c  * 4: src/part3.h
+  * 5: src/part4.c  * 6: src/part4.h
+Select items to delete>> Would remove the following items:
+  a.out        src/part3.h  src/part4.c  src/part4.h
+*** Commands ***
+    1: clean                2: filter by pattern    3: select by numbers
+    4: ask each             5: quit                 6: help
+What now> Removing a.out
+Removing src/part3.h
+Removing src/part4.c
+Removing src/part4.h
+ok 16 - git clean -id (select - range 2)
 
-		git branch O &&
-		git branch A &&
-		git branch B &&
+expecting success: 
 
-		git checkout A &&
-		git mv node2/ node1/ &&
-		test_tick &&
-		git commit -m "A" &&
+	mkdir -p build docs &&
+	touch a.out src/part3.c src/part3.h src/part4.c src/part4.h \
+	docs/manual.txt obj.o build/lib.so &&
+	test_write_lines s "*" "-5- 1 -2" "" c |
+	git clean -id &&
+	test -f Makefile &&
+	test -f README &&
+	test -f src/part1.c &&
+	test -f src/part2.c &&
+	test ! -f a.out &&
+	test -f docs/manual.txt &&
+	test ! -f src/part3.c &&
+	test ! -f src/part3.h &&
+	test -f src/part4.c &&
+	test -f src/part4.h &&
+	test -f obj.o &&
+	test -f build/lib.so
 
-		git checkout B &&
-		git mv node1/ node2/ &&
-		test_tick &&
-		git commit -m "B"
-	)
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6043-merge-rename-directories/12b/.git/
-[master (root-commit) 674d36e] O
- Author: A U Thor <author@example.com>
- 4 files changed, 4 insertions(+)
- create mode 100644 node1/leaf1
- create mode 100644 node1/leaf2
- create mode 100644 node2/leaf3
- create mode 100644 node2/leaf4
-Switched to branch 'A'
-[A 494e77b] A
- Author: A U Thor <author@example.com>
- 2 files changed, 0 insertions(+), 0 deletions(-)
- rename {node2 => node1/node2}/leaf3 (100%)
- rename {node2 => node1/node2}/leaf4 (100%)
-Switched to branch 'B'
-[B 634f1d4] B
- Author: A U Thor <author@example.com>
- 2 files changed, 0 insertions(+), 0 deletions(-)
- rename {node1 => node2/node1}/leaf1 (100%)
- rename {node1 => node2/node1}/leaf2 (100%)
-ok 101 - 12b-setup: Moving one directory hierarchy into another
+Would remove the following items:
+  a.out        src/part3.c  src/part4.c
+  docs/        src/part3.h  src/part4.h
+*** Commands ***
+    1: clean                2: filter by pattern    3: select by numbers
+    4: ask each             5: quit                 6: help
+What now>     1: a.out          2: docs/          3: src/part3.c    4: src/part3.h
+    5: src/part4.c    6: src/part4.h
+Select items to delete>>   * 1: a.out        * 2: docs/        * 3: src/part3.c  * 4: src/part3.h
+  * 5: src/part4.c  * 6: src/part4.h
+Select items to delete>>   * 1: a.out          2: docs/        * 3: src/part3.c  * 4: src/part3.h
+    5: src/part4.c    6: src/part4.h
+Select items to delete>> Would remove the following items:
+  a.out        src/part3.c  src/part3.h
+*** Commands ***
+    1: clean                2: filter by pattern    3: select by numbers
+    4: ask each             5: quit                 6: help
+What now> Removing a.out
+Removing src/part3.c
+Removing src/part3.h
+ok 17 - git clean -id (inverse select)
 
 expecting success: 
-	(
-		cd 12b &&
 
-		git checkout A^0 &&
+	mkdir -p build docs &&
+	touch a.out src/part3.c src/part3.h src/part4.c src/part4.h \
+	docs/manual.txt obj.o build/lib.so &&
+	test_write_lines a Y y no yes bad "" |
+	git clean -id &&
+	test -f Makefile &&
+	test -f README &&
+	test -f src/part1.c &&
+	test -f src/part2.c &&
+	test ! -f a.out &&
+	test ! -f docs/manual.txt &&
+	test -f src/part3.c &&
+	test ! -f src/part3.h &&
+	test -f src/part4.c &&
+	test -f src/part4.h &&
+	test -f obj.o &&
+	test -f build/lib.so
 
-		git merge -s recursive B^0 &&
 
-		git ls-files -s >out &&
-		test_line_count = 4 out &&
+Would remove the following items:
+  a.out        src/part3.c  src/part4.c
+  docs/        src/part3.h  src/part4.h
+*** Commands ***
+    1: clean                2: filter by pattern    3: select by numbers
+    4: ask each             5: quit                 6: help
+What now> Remove a.out [y/N]? Remove docs/ [y/N]? Remove src/part3.c [y/N]? Remove src/part3.h [y/N]? Remove src/part4.c [y/N]? Remove src/part4.h [y/N]? Removing a.out
+Removing docs/
+Removing src/part3.h
+ok 18 - git clean -id (ask)
 
-		git rev-parse >actual \
-			HEAD:node1/node2/node1/leaf1 \
-			HEAD:node1/node2/node1/leaf2 \
-			HEAD:node2/node1/node2/leaf3 \
-			HEAD:node2/node1/node2/leaf4 &&
-		git rev-parse >expect \
-			O:node1/leaf1 \
-			O:node1/leaf2 \
-			O:node2/leaf3 \
-			O:node2/leaf4 &&
-		test_cmp expect actual
-	)
+expecting success: 
 
-Note: checking out 'A^0'.
+	mkdir -p build docs &&
+	touch a.out src/part3.c src/part3.h src/part4.c src/part4.h \
+	docs/manual.txt obj.o build/lib.so &&
+	test_write_lines a Y no yes "\04" |
+	git clean -id &&
+	test -f Makefile &&
+	test -f README &&
+	test -f src/part1.c &&
+	test -f src/part2.c &&
+	test ! -f a.out &&
+	test -f docs/manual.txt &&
+	test ! -f src/part3.c &&
+	test -f src/part3.h &&
+	test -f src/part4.c &&
+	test -f src/part4.h &&
+	test -f obj.o &&
+	test -f build/lib.so
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by performing another checkout.
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
+Would remove the following items:
+  a.out        src/part3.c  src/part4.c
+  docs/        src/part3.h  src/part4.h
+*** Commands ***
+    1: clean                2: filter by pattern    3: select by numbers
+    4: ask each             5: quit                 6: help
+What now> Remove a.out [y/N]? Remove docs/ [y/N]? Remove src/part3.c [y/N]? Remove src/part3.h [y/N]? Remove src/part4.c [y/N]? 
+Removing a.out
+Removing src/part3.c
+ok 19 - git clean -id (ask - Ctrl+D)
 
-  git checkout -b <new-branch-name>
+expecting success: 
 
-HEAD is now at 494e77b A
-Merging:
-494e77b A
-virtual B^0
-found 1 common ancestor:
-674d36e O
-Merge made by the 'recursive' strategy.
- node1/{ => node2/node1}/leaf1      | 0
- node1/{ => node2/node1}/leaf2      | 0
- {node1 => node2/node1}/node2/leaf3 | 0
- {node1 => node2/node1}/node2/leaf4 | 0
- 4 files changed, 0 insertions(+), 0 deletions(-)
- rename node1/{ => node2/node1}/leaf1 (100%)
- rename node1/{ => node2/node1}/leaf2 (100%)
- rename {node1 => node2/node1}/node2/leaf3 (100%)
- rename {node1 => node2/node1}/node2/leaf4 (100%)
-ok 102 - 12b-check: Moving one directory hierarchy into another
+	mkdir -p build docs &&
+	touch a.out src/part3.c src/part3.h src/part4.c src/part4.h \
+	docs/manual.txt obj.o build/lib.so &&
+	(cd build/ &&
+	 test_write_lines f docs "*.h" "" c |
+	 git clean -id ..) &&
+	test -f Makefile &&
+	test -f README &&
+	test -f src/part1.c &&
+	test -f src/part2.c &&
+	test ! -f a.out &&
+	test -f docs/manual.txt &&
+	test ! -f src/part3.c &&
+	test -f src/part3.h &&
+	test ! -f src/part4.c &&
+	test -f src/part4.h &&
+	test -f obj.o &&
+	test -f build/lib.so
 
-expecting success: 
-	test_create_repo 12c &&
-	(
-		cd 12c &&
 
-		mkdir -p node1 node2 &&
-		printf "1\n2\n3\n4\n5\n6\n7\n8\nleaf1\n" >node1/leaf1 &&
-		printf "1\n2\n3\n4\n5\n6\n7\n8\nleaf2\n" >node1/leaf2 &&
-		printf "1\n2\n3\n4\n5\n6\n7\n8\nleaf3\n" >node2/leaf3 &&
-		printf "1\n2\n3\n4\n5\n6\n7\n8\nleaf4\n" >node2/leaf4 &&
-		git add node1 node2 &&
-		test_tick &&
-		git commit -m "O" &&
+Would remove the following items:
+  ../a.out        ../src/part3.c  ../src/part4.c
+  ../docs/        ../src/part3.h  ../src/part4.h
+*** Commands ***
+    1: clean                2: filter by pattern    3: select by numbers
+    4: ask each             5: quit                 6: help
+What now>   ../a.out        ../src/part3.c  ../src/part4.c
+  ../docs/        ../src/part3.h  ../src/part4.h
+Input ignore patterns>>   ../a.out        ../src/part3.h  ../src/part4.h
+  ../src/part3.c  ../src/part4.c
+Input ignore patterns>>   ../a.out        ../src/part3.c  ../src/part4.c
+Input ignore patterns>> Would remove the following items:
+  ../a.out        ../src/part3.c  ../src/part4.c
+*** Commands ***
+    1: clean                2: filter by pattern    3: select by numbers
+    4: ask each             5: quit                 6: help
+What now> Removing ../a.out
+Removing ../src/part3.c
+Removing ../src/part4.c
+ok 20 - git clean -id with prefix and path (filter)
 
-		git branch O &&
-		git branch A &&
-		git branch B &&
+expecting success: 
 
-		git checkout A &&
-		git mv node2/ node1/ &&
-		for i in `git ls-files`; do echo side A >>$i; done &&
-		git add -u &&
-		test_tick &&
-		git commit -m "A" &&
+	mkdir -p build docs &&
+	touch a.out src/part3.c src/part3.h src/part4.c src/part4.h \
+	docs/manual.txt obj.o build/lib.so &&
+	(cd build/ &&
+	 test_write_lines s ../docs/ ../src/part3.c ../src/part4.c "" c |
+	 git clean -id ..) &&
+	test -f Makefile &&
+	test -f README &&
+	test -f src/part1.c &&
+	test -f src/part2.c &&
+	test -f a.out &&
+	test ! -f docs/manual.txt &&
+	test ! -f src/part3.c &&
+	test -f src/part3.h &&
+	test ! -f src/part4.c &&
+	test -f src/part4.h &&
+	test -f obj.o &&
+	test -f build/lib.so
 
-		git checkout B &&
-		git mv node1/ node2/ &&
-		for i in `git ls-files`; do echo side B >>$i; done &&
-		git add -u &&
-		test_tick &&
-		git commit -m "B"
-	)
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6043-merge-rename-directories/12c/.git/
-[master (root-commit) 0cf2f73] O
- Author: A U Thor <author@example.com>
- 4 files changed, 36 insertions(+)
- create mode 100644 node1/leaf1
- create mode 100644 node1/leaf2
- create mode 100644 node2/leaf3
- create mode 100644 node2/leaf4
-Switched to branch 'A'
-[A 18ec7be] A
- Author: A U Thor <author@example.com>
- 4 files changed, 4 insertions(+)
- rename {node2 => node1/node2}/leaf3 (75%)
- rename {node2 => node1/node2}/leaf4 (75%)
-Switched to branch 'B'
-[B 705044c] B
- Author: A U Thor <author@example.com>
- 4 files changed, 4 insertions(+)
- rename {node1 => node2/node1}/leaf1 (75%)
- rename {node1 => node2/node1}/leaf2 (75%)
-ok 103 - 12c-setup: Moving one directory hierarchy into another w/ content merge
+Would remove the following items:
+  ../a.out        ../src/part3.c  ../src/part4.c
+  ../docs/        ../src/part3.h  ../src/part4.h
+*** Commands ***
+    1: clean                2: filter by pattern    3: select by numbers
+    4: ask each             5: quit                 6: help
+What now>     1: ../a.out          2: ../docs/          3: ../src/part3.c
+    4: ../src/part3.h    5: ../src/part4.c    6: ../src/part4.h
+Select items to delete>>     1: ../a.out        * 2: ../docs/          3: ../src/part3.c
+    4: ../src/part3.h    5: ../src/part4.c    6: ../src/part4.h
+Select items to delete>>     1: ../a.out        * 2: ../docs/        * 3: ../src/part3.c
+    4: ../src/part3.h    5: ../src/part4.c    6: ../src/part4.h
+Select items to delete>>     1: ../a.out        * 2: ../docs/        * 3: ../src/part3.c
+    4: ../src/part3.h  * 5: ../src/part4.c    6: ../src/part4.h
+Select items to delete>> Would remove the following items:
+  ../docs/        ../src/part3.c  ../src/part4.c
+*** Commands ***
+    1: clean                2: filter by pattern    3: select by numbers
+    4: ask each             5: quit                 6: help
+What now> Removing ../docs/
+Removing ../src/part3.c
+Removing ../src/part4.c
+ok 21 - git clean -id with prefix and path (select by name)
 
 expecting success: 
-	(
-		cd 12c &&
 
-		git checkout A^0 &&
+	mkdir -p build docs &&
+	touch a.out src/part3.c src/part3.h src/part4.c src/part4.h \
+	docs/manual.txt obj.o build/lib.so &&
+	(cd build/ &&
+	 test_write_lines a Y y no yes bad "" |
+	 git clean -id ..) &&
+	test -f Makefile &&
+	test -f README &&
+	test -f src/part1.c &&
+	test -f src/part2.c &&
+	test ! -f a.out &&
+	test ! -f docs/manual.txt &&
+	test -f src/part3.c &&
+	test ! -f src/part3.h &&
+	test -f src/part4.c &&
+	test -f src/part4.h &&
+	test -f obj.o &&
+	test -f build/lib.so
 
-		test_must_fail git merge -s recursive B^0 &&
 
-		git ls-files -u >out &&
-		test_line_count = 12 out &&
+Would remove the following items:
+  ../a.out        ../src/part3.c  ../src/part4.c
+  ../docs/        ../src/part3.h  ../src/part4.h
+*** Commands ***
+    1: clean                2: filter by pattern    3: select by numbers
+    4: ask each             5: quit                 6: help
+What now> Remove ../a.out [y/N]? Remove ../docs/ [y/N]? Remove ../src/part3.c [y/N]? Remove ../src/part3.h [y/N]? Remove ../src/part4.c [y/N]? Remove ../src/part4.h [y/N]? Removing ../a.out
+Removing ../docs/
+Removing ../src/part3.h
+ok 22 - git clean -id with prefix and path (ask)
 
-		git rev-parse >actual \
-			:1:node1/node2/node1/leaf1 \
-			:1:node1/node2/node1/leaf2 \
-			:1:node2/node1/node2/leaf3 \
-			:1:node2/node1/node2/leaf4 \
-			:2:node1/node2/node1/leaf1 \
-			:2:node1/node2/node1/leaf2 \
-			:2:node2/node1/node2/leaf3 \
-			:2:node2/node1/node2/leaf4 \
-			:3:node1/node2/node1/leaf1 \
-			:3:node1/node2/node1/leaf2 \
-			:3:node2/node1/node2/leaf3 \
-			:3:node2/node1/node2/leaf4 &&
-		git rev-parse >expect \
-			O:node1/leaf1 \
-			O:node1/leaf2 \
-			O:node2/leaf3 \
-			O:node2/leaf4 \
-			A:node1/leaf1 \
-			A:node1/leaf2 \
-			A:node1/node2/leaf3 \
-			A:node1/node2/leaf4 \
-			B:node2/node1/leaf1 \
-			B:node2/node1/leaf2 \
-			B:node2/leaf3 \
-			B:node2/leaf4 &&
-		test_cmp expect actual
-	)
+checking prerequisite: TTY
 
-Note: checking out 'A^0'.
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
+	test_have_prereq PERL &&
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by performing another checkout.
+	# 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 &&
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
+	perl "$TEST_DIRECTORY"/test-terminal.perl \
+		sh -c "test -t 1 && test -t 2"
 
-  git checkout -b <new-branch-name>
+)
+prerequisite TTY ok
+expecting success: 
+	>a.out &&
+	echo q |
+	test_terminal git clean -i |
+	test_decode_color |
+	head -n 1 >header &&
+	# not i18ngrep
+	grep "^<BOLD>" header
 
-HEAD is now at 18ec7be A
-Merging:
-18ec7be A
-virtual B^0
-found 1 common ancestor:
-0cf2f73 O
-Auto-merging node2/node1/node2/leaf4
-CONFLICT (content): Merge conflict in node2/node1/node2/leaf4
-Auto-merging node2/node1/node2/leaf3
-CONFLICT (content): Merge conflict in node2/node1/node2/leaf3
-Auto-merging node1/node2/node1/leaf2
-CONFLICT (content): Merge conflict in node1/node2/node1/leaf2
-Auto-merging node1/node2/node1/leaf1
-CONFLICT (content): Merge conflict in node1/node2/node1/leaf1
-Automatic merge failed; fix conflicts and then commit the result.
-ok 104 - 12c-check: Moving one directory hierarchy into another w/ content merge
+<BOLD>Would remove the following items:
+ok 23 - git clean -i paints the header in HEADER color
 
-# still have 2 known breakage(s)
-# passed all remaining 102 test(s)
-1..104
+# passed all 23 test(s)
+1..23
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
 *** t7111-reset-table.sh ***
@@ -266162,490 +261110,2611 @@
 ok 26 - check: B C C D --keep XXXXX  
 
 expecting success: 
-	git reset --hard C &&
-	if test "$I1" != "$H1"
-	then
-	    echo "$I1" >file1 &&
-	    git add file1
-	fi &&
-	if test "$W1" != "$I1"
-	then
-	    echo "$W1" >file1
-	fi &&
-	if test "$W2" != "XXXXX"
-	then
-	    git reset --$opt $T &&
-	    test "$(cat file1)" = "$W2" &&
-	    git checkout-index -f -- file1 &&
-	    test "$(cat file1)" = "$I2" &&
-	    git checkout -f HEAD -- file1 &&
-	    test "$(cat file1)" = "$H2"
-	else
-	    test_must_fail git reset --$opt $T
-	fi
-    
-HEAD is now at 4bb0b07 C
-ok 27 - check: B C C C --soft B C C
+	git reset --hard C &&
+	if test "$I1" != "$H1"
+	then
+	    echo "$I1" >file1 &&
+	    git add file1
+	fi &&
+	if test "$W1" != "$I1"
+	then
+	    echo "$W1" >file1
+	fi &&
+	if test "$W2" != "XXXXX"
+	then
+	    git reset --$opt $T &&
+	    test "$(cat file1)" = "$W2" &&
+	    git checkout-index -f -- file1 &&
+	    test "$(cat file1)" = "$I2" &&
+	    git checkout -f HEAD -- file1 &&
+	    test "$(cat file1)" = "$H2"
+	else
+	    test_must_fail git reset --$opt $T
+	fi
+    
+HEAD is now at 4bb0b07 C
+ok 27 - check: B C C C --soft B C C
+
+expecting success: 
+	git reset --hard C &&
+	if test "$I1" != "$H1"
+	then
+	    echo "$I1" >file1 &&
+	    git add file1
+	fi &&
+	if test "$W1" != "$I1"
+	then
+	    echo "$W1" >file1
+	fi &&
+	if test "$W2" != "XXXXX"
+	then
+	    git reset --$opt $T &&
+	    test "$(cat file1)" = "$W2" &&
+	    git checkout-index -f -- file1 &&
+	    test "$(cat file1)" = "$I2" &&
+	    git checkout -f HEAD -- file1 &&
+	    test "$(cat file1)" = "$H2"
+	else
+	    test_must_fail git reset --$opt $T
+	fi
+    
+HEAD is now at 4bb0b07 C
+Unstaged changes after reset:
+M	file1
+ok 28 - check: B C C C --mixed B C C
+
+expecting success: 
+	git reset --hard C &&
+	if test "$I1" != "$H1"
+	then
+	    echo "$I1" >file1 &&
+	    git add file1
+	fi &&
+	if test "$W1" != "$I1"
+	then
+	    echo "$W1" >file1
+	fi &&
+	if test "$W2" != "XXXXX"
+	then
+	    git reset --$opt $T &&
+	    test "$(cat file1)" = "$W2" &&
+	    git checkout-index -f -- file1 &&
+	    test "$(cat file1)" = "$I2" &&
+	    git checkout -f HEAD -- file1 &&
+	    test "$(cat file1)" = "$H2"
+	else
+	    test_must_fail git reset --$opt $T
+	fi
+    
+HEAD is now at 4bb0b07 C
+HEAD is now at 4bb0b07 C
+ok 29 - check: B C C C --hard C C C
+
+expecting success: 
+	git reset --hard C &&
+	if test "$I1" != "$H1"
+	then
+	    echo "$I1" >file1 &&
+	    git add file1
+	fi &&
+	if test "$W1" != "$I1"
+	then
+	    echo "$W1" >file1
+	fi &&
+	if test "$W2" != "XXXXX"
+	then
+	    git reset --$opt $T &&
+	    test "$(cat file1)" = "$W2" &&
+	    git checkout-index -f -- file1 &&
+	    test "$(cat file1)" = "$I2" &&
+	    git checkout -f HEAD -- file1 &&
+	    test "$(cat file1)" = "$H2"
+	else
+	    test_must_fail git reset --$opt $T
+	fi
+    
+HEAD is now at 4bb0b07 C
+ok 30 - check: B C C C --merge B C C
+
+expecting success: 
+	git reset --hard C &&
+	if test "$I1" != "$H1"
+	then
+	    echo "$I1" >file1 &&
+	    git add file1
+	fi &&
+	if test "$W1" != "$I1"
+	then
+	    echo "$W1" >file1
+	fi &&
+	if test "$W2" != "XXXXX"
+	then
+	    git reset --$opt $T &&
+	    test "$(cat file1)" = "$W2" &&
+	    git checkout-index -f -- file1 &&
+	    test "$(cat file1)" = "$I2" &&
+	    git checkout -f HEAD -- file1 &&
+	    test "$(cat file1)" = "$H2"
+	else
+	    test_must_fail git reset --$opt $T
+	fi
+    
+HEAD is now at 4bb0b07 C
+ok 31 - check: B C C C --keep B C C
+
+expecting success: 
+    git reset --hard C &&
+    git branch branch1 &&
+    git branch branch2 &&
+    git checkout branch1 &&
+    test_commit B1 file1 &&
+    git checkout branch2 &&
+    test_commit B file1
+
+HEAD is now at 4bb0b07 C
+Switched to branch 'branch1'
+[branch1 5456cd2] B1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to branch 'branch2'
+[branch2 aa272d3] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 32 - setting up branches to test with unmerged entries
+
+expecting success: 
+	git reset --hard B &&
+	test_must_fail git merge branch1 &&
+	cat file1 >X_file1 &&
+	if test "$W2" != "XXXXX"
+	then
+	    git reset --$opt $T &&
+	    if test "$W2" = "X"
+	    then
+		test_cmp file1 X_file1
+	    else
+		test "$(cat file1)" = "$W2"
+	    fi &&
+	    git checkout-index -f -- file1 &&
+	    test "$(cat file1)" = "$I2" &&
+	    git checkout -f HEAD -- file1 &&
+	    test "$(cat file1)" = "$H2"
+	else
+	    test_must_fail git reset --$opt $T
+	fi
+    
+HEAD is now at aa272d3 B
+Merging:
+aa272d3 B
+virtual branch1
+found 1 common ancestor:
+4bb0b07 C
+Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+Automatic merge failed; fix conflicts and then commit the result.
+fatal: Cannot do a soft reset in the middle of a merge.
+ok 33 - check: X U B C --soft XXXXX  
+
+expecting success: 
+	git reset --hard B &&
+	test_must_fail git merge branch1 &&
+	cat file1 >X_file1 &&
+	if test "$W2" != "XXXXX"
+	then
+	    git reset --$opt $T &&
+	    if test "$W2" = "X"
+	    then
+		test_cmp file1 X_file1
+	    else
+		test "$(cat file1)" = "$W2"
+	    fi &&
+	    git checkout-index -f -- file1 &&
+	    test "$(cat file1)" = "$I2" &&
+	    git checkout -f HEAD -- file1 &&
+	    test "$(cat file1)" = "$H2"
+	else
+	    test_must_fail git reset --$opt $T
+	fi
+    
+HEAD is now at aa272d3 B
+Merging:
+aa272d3 B
+virtual branch1
+found 1 common ancestor:
+4bb0b07 C
+Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+Automatic merge failed; fix conflicts and then commit the result.
+Unstaged changes after reset:
+M	file1
+ok 34 - check: X U B C --mixed X C C
+
+expecting success: 
+	git reset --hard B &&
+	test_must_fail git merge branch1 &&
+	cat file1 >X_file1 &&
+	if test "$W2" != "XXXXX"
+	then
+	    git reset --$opt $T &&
+	    if test "$W2" = "X"
+	    then
+		test_cmp file1 X_file1
+	    else
+		test "$(cat file1)" = "$W2"
+	    fi &&
+	    git checkout-index -f -- file1 &&
+	    test "$(cat file1)" = "$I2" &&
+	    git checkout -f HEAD -- file1 &&
+	    test "$(cat file1)" = "$H2"
+	else
+	    test_must_fail git reset --$opt $T
+	fi
+    
+HEAD is now at aa272d3 B
+Merging:
+aa272d3 B
+virtual branch1
+found 1 common ancestor:
+4bb0b07 C
+Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+Automatic merge failed; fix conflicts and then commit the result.
+HEAD is now at 4bb0b07 C
+ok 35 - check: X U B C --hard C C C
+
+expecting success: 
+	git reset --hard B &&
+	test_must_fail git merge branch1 &&
+	cat file1 >X_file1 &&
+	if test "$W2" != "XXXXX"
+	then
+	    git reset --$opt $T &&
+	    if test "$W2" = "X"
+	    then
+		test_cmp file1 X_file1
+	    else
+		test "$(cat file1)" = "$W2"
+	    fi &&
+	    git checkout-index -f -- file1 &&
+	    test "$(cat file1)" = "$I2" &&
+	    git checkout -f HEAD -- file1 &&
+	    test "$(cat file1)" = "$H2"
+	else
+	    test_must_fail git reset --$opt $T
+	fi
+    
+HEAD is now at aa272d3 B
+Merging:
+aa272d3 B
+virtual branch1
+found 1 common ancestor:
+4bb0b07 C
+Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+Automatic merge failed; fix conflicts and then commit the result.
+ok 36 - check: X U B C --merge C C C
+
+expecting success: 
+	git reset --hard B &&
+	test_must_fail git merge branch1 &&
+	cat file1 >X_file1 &&
+	if test "$W2" != "XXXXX"
+	then
+	    git reset --$opt $T &&
+	    if test "$W2" = "X"
+	    then
+		test_cmp file1 X_file1
+	    else
+		test "$(cat file1)" = "$W2"
+	    fi &&
+	    git checkout-index -f -- file1 &&
+	    test "$(cat file1)" = "$I2" &&
+	    git checkout -f HEAD -- file1 &&
+	    test "$(cat file1)" = "$H2"
+	else
+	    test_must_fail git reset --$opt $T
+	fi
+    
+HEAD is now at aa272d3 B
+Merging:
+aa272d3 B
+virtual branch1
+found 1 common ancestor:
+4bb0b07 C
+Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+Automatic merge failed; fix conflicts and then commit the result.
+fatal: Cannot do a keep reset in the middle of a merge.
+ok 37 - check: X U B C --keep XXXXX  
+
+expecting success: 
+	git reset --hard B &&
+	test_must_fail git merge branch1 &&
+	cat file1 >X_file1 &&
+	if test "$W2" != "XXXXX"
+	then
+	    git reset --$opt $T &&
+	    if test "$W2" = "X"
+	    then
+		test_cmp file1 X_file1
+	    else
+		test "$(cat file1)" = "$W2"
+	    fi &&
+	    git checkout-index -f -- file1 &&
+	    test "$(cat file1)" = "$I2" &&
+	    git checkout -f HEAD -- file1 &&
+	    test "$(cat file1)" = "$H2"
+	else
+	    test_must_fail git reset --$opt $T
+	fi
+    
+HEAD is now at aa272d3 B
+Merging:
+aa272d3 B
+virtual branch1
+found 1 common ancestor:
+4bb0b07 C
+Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+Automatic merge failed; fix conflicts and then commit the result.
+fatal: Cannot do a soft reset in the middle of a merge.
+ok 38 - check: X U B B --soft XXXXX  
+
+expecting success: 
+	git reset --hard B &&
+	test_must_fail git merge branch1 &&
+	cat file1 >X_file1 &&
+	if test "$W2" != "XXXXX"
+	then
+	    git reset --$opt $T &&
+	    if test "$W2" = "X"
+	    then
+		test_cmp file1 X_file1
+	    else
+		test "$(cat file1)" = "$W2"
+	    fi &&
+	    git checkout-index -f -- file1 &&
+	    test "$(cat file1)" = "$I2" &&
+	    git checkout -f HEAD -- file1 &&
+	    test "$(cat file1)" = "$H2"
+	else
+	    test_must_fail git reset --$opt $T
+	fi
+    
+HEAD is now at aa272d3 B
+Merging:
+aa272d3 B
+virtual branch1
+found 1 common ancestor:
+4bb0b07 C
+Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+Automatic merge failed; fix conflicts and then commit the result.
+Unstaged changes after reset:
+M	file1
+ok 39 - check: X U B B --mixed X B B
+
+expecting success: 
+	git reset --hard B &&
+	test_must_fail git merge branch1 &&
+	cat file1 >X_file1 &&
+	if test "$W2" != "XXXXX"
+	then
+	    git reset --$opt $T &&
+	    if test "$W2" = "X"
+	    then
+		test_cmp file1 X_file1
+	    else
+		test "$(cat file1)" = "$W2"
+	    fi &&
+	    git checkout-index -f -- file1 &&
+	    test "$(cat file1)" = "$I2" &&
+	    git checkout -f HEAD -- file1 &&
+	    test "$(cat file1)" = "$H2"
+	else
+	    test_must_fail git reset --$opt $T
+	fi
+    
+HEAD is now at aa272d3 B
+Merging:
+aa272d3 B
+virtual branch1
+found 1 common ancestor:
+4bb0b07 C
+Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+Automatic merge failed; fix conflicts and then commit the result.
+HEAD is now at aa272d3 B
+ok 40 - check: X U B B --hard B B B
+
+expecting success: 
+	git reset --hard B &&
+	test_must_fail git merge branch1 &&
+	cat file1 >X_file1 &&
+	if test "$W2" != "XXXXX"
+	then
+	    git reset --$opt $T &&
+	    if test "$W2" = "X"
+	    then
+		test_cmp file1 X_file1
+	    else
+		test "$(cat file1)" = "$W2"
+	    fi &&
+	    git checkout-index -f -- file1 &&
+	    test "$(cat file1)" = "$I2" &&
+	    git checkout -f HEAD -- file1 &&
+	    test "$(cat file1)" = "$H2"
+	else
+	    test_must_fail git reset --$opt $T
+	fi
+    
+HEAD is now at aa272d3 B
+Merging:
+aa272d3 B
+virtual branch1
+found 1 common ancestor:
+4bb0b07 C
+Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+Automatic merge failed; fix conflicts and then commit the result.
+ok 41 - check: X U B B --merge B B B
+
+expecting success: 
+	git reset --hard B &&
+	test_must_fail git merge branch1 &&
+	cat file1 >X_file1 &&
+	if test "$W2" != "XXXXX"
+	then
+	    git reset --$opt $T &&
+	    if test "$W2" = "X"
+	    then
+		test_cmp file1 X_file1
+	    else
+		test "$(cat file1)" = "$W2"
+	    fi &&
+	    git checkout-index -f -- file1 &&
+	    test "$(cat file1)" = "$I2" &&
+	    git checkout -f HEAD -- file1 &&
+	    test "$(cat file1)" = "$H2"
+	else
+	    test_must_fail git reset --$opt $T
+	fi
+    
+HEAD is now at aa272d3 B
+Merging:
+aa272d3 B
+virtual branch1
+found 1 common ancestor:
+4bb0b07 C
+Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+Automatic merge failed; fix conflicts and then commit the result.
+fatal: Cannot do a keep reset in the middle of a merge.
+ok 42 - check: X U B B --keep XXXXX  
+
+# passed all 42 test(s)
+1..42
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t7402-submodule-rebase.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7402-submodule-rebase/.git/
+expecting success: 
+
+	echo file > file &&
+	git add file &&
+	test_tick &&
+	git commit -m initial &&
+	git clone . submodule &&
+	git add submodule &&
+	test_tick &&
+	git commit -m submodule &&
+	echo second line >> file &&
+	(cd submodule && git pull) &&
+	test_tick &&
+	git commit -m file-and-submodule -a &&
+	git branch added-submodule
+
+
+[master (root-commit) ffefb50] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+Cloning into 'submodule'...
+done.
+warning: adding embedded git repository: submodule
+hint: You've added another git repository inside your current repository.
+hint: Clones of the outer repository will not contain the contents of
+hint: the embedded repository and will not know how to obtain it.
+hint: If you meant to add a submodule, use:
+hint: 
+hint: 	git submodule add <url> submodule
+hint: 
+hint: If you added this path by mistake, you can remove it from the
+hint: index with:
+hint: 
+hint: 	git rm --cached submodule
+hint: 
+hint: See "git help submodule" for more information.
+[master 9bd10db] submodule
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 160000 submodule
+From /build/git-2.20.1/t/trash directory.t7402-submodule-rebase/.
+   ffefb50..9bd10db  master     -> origin/master
+Updating ffefb50..9bd10db
+Fast-forward
+ submodule | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 160000 submodule
+[master 041f541] file-and-submodule
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+ok 1 - setup
+
+expecting success: 
+
+	(cd submodule &&
+	 echo 3rd line >> file &&
+	 test_tick &&
+	 git commit -m fork -a) &&
+	echo unrelated >> file2 &&
+	git add file2 &&
+	test_tick &&
+	git commit -m unrelated file2 &&
+	echo other line >> file &&
+	test_tick &&
+	git commit -m update file &&
+	CURRENT=$(cd submodule && git rev-parse HEAD) &&
+	EXPECTED=$(git rev-parse HEAD~2:submodule) &&
+	GIT_TRACE=1 git rebase --onto HEAD~2 HEAD^ &&
+	STORED=$(git rev-parse HEAD:submodule) &&
+	test $EXPECTED = $STORED &&
+	test $CURRENT = $(cd submodule && git rev-parse HEAD)
+
+
+[master eb5e1a6] fork
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master b5e9d7b] unrelated
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file2
+[master a65f80c] update
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+trace: built-in: git rebase --onto 'HEAD~2' HEAD^
+trace: run_command: git config --bool rebase.usebuiltin
+trace: built-in: git config --bool rebase.usebuiltin
+trace: run_command: 'GIT_DIR='\''/build/git-2.20.1/t/trash directory.t7402-submodule-rebase/.git'\''; state_dir='\''.git/rebase-apply'\''; upstream_name='\''HEAD^'\''; upstream='\''b5e9d7b7db63bf27cc3ce457eb90630609309fb6'\''; head_name='\''refs/heads/master'\''; orig_head='\''a65f80c7f0672c121207764dac7ccebf98cf44c8'\''; onto='\''041f541f7d4ce41c4eda25e0e58871f126de234b'\''; onto_name='\''HEAD~2'\''; revisions='\''b5e9d7b7db63bf27cc3ce457eb90630609309fb6..a65f80c7f0672c121207764dac7ccebf98cf44c8'\''; unset restrict_revision; GIT_QUIET='\'''\''; git_am_opt='\'''\''; verbose='\'''\''; diffstat='\'''\''; force_rebase='\'''\''; action='\'''\''; signoff='\'''\''; allow_rerere_autoupdate='\'''\''; keep_empty='\'''\''; autosquash='\'''\''; unset gpg_sign_opt; unset cmd; allow_empty_message='\''--allow-empty-message'\''; rebase_merges='\'''\''; rebase_cousins='\'''\''; unset strategy; unset strategy_opts; rebase_root='\'''\''; squash_onto='\'''\''; git_format_patch_opt='\'''\''; . git-sh-setup && . git-rebase--common && . git-rebase--am && git_rebase__am'
+First, rewinding head to replay your work on top of it...
+trace: built-in: git rev-parse --git-dir
+trace: built-in: git rev-parse --show-cdup
+trace: built-in: git rev-parse --git-path objects
+trace: built-in: git format-patch -k --stdout --full-index --cherry-pick --right-only --src-prefix=a/ --dst-prefix=b/ --no-renames --no-cover-letter --pretty=mboxrd b5e9d7b7db63bf27cc3ce457eb90630609309fb6...a65f80c7f0672c121207764dac7ccebf98cf44c8
+trace: built-in: git am --rebasing '--resolvemsg=
+Resolve all conflicts manually, mark them as resolved with
+"git add/rm <conflicted_files>", then run "git rebase --continue".
+You can instead skip this commit: run "git rebase --skip".
+To abort and get back to the state before "git rebase", run "git rebase --abort".
+' --patch-format=mboxrd
+trace: run_command: git mailsplit -d4 -o.git/rebase-apply -b --mboxrd --
+trace: built-in: git mailsplit -d4 -o.git/rebase-apply -b --mboxrd --
+Applying: update
+trace: built-in: git rev-parse HEAD
+trace: built-in: git update-ref -m 'rebase finished: refs/heads/master onto 041f541f7d4ce41c4eda25e0e58871f126de234b' refs/heads/master 81a011672801a6d53f73688ebde4d518274102e6 a65f80c7f0672c121207764dac7ccebf98cf44c8
+trace: built-in: git symbolic-ref -m 'rebase finished: returning to refs/heads/master' HEAD refs/heads/master
+trace: run_command: git gc --auto
+trace: built-in: git gc --auto
+ok 2 - rebase with a dirty submodule
+
+expecting success: 
+
+	test submodule = $(git diff --name-only) &&
+	HEAD=$(git rev-parse HEAD) &&
+	GIT_EDITOR="\"$(pwd)/fake-editor.sh\"" EDITOR_TEXT="pick $HEAD" \
+		git rebase -i HEAD^ &&
+	test submodule = $(git diff --name-only)
+
+
+pick 81a011672801a6d53f73688ebde4d518274102e6
+Successfully rebased and updated refs/heads/master.
+ok 3 - interactive rebase with a dirty submodule
+
+expecting success: 
+
+	echo yet another line >> file &&
+	test_tick &&
+	git commit -m next file &&
+	echo rewrite > file &&
+	test_tick &&
+	git commit -m rewrite file &&
+	echo dirty > file &&
+	test_must_fail git rebase --onto HEAD~2 HEAD^
+
+
+[master 260764e] next
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master 63179b5] rewrite
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+error: cannot rebase: You have unstaged changes.
+error: Please commit or stash them.
+ok 4 - rebase with dirty file and submodule fails
+
+expecting success: 
+
+	echo new > file &&
+	CURRENT=$(cd submodule && git rev-parse HEAD) &&
+	git stash &&
+	test new != $(cat file) &&
+	test submodule = $(git diff --name-only) &&
+	test $CURRENT = $(cd submodule && git rev-parse HEAD) &&
+	git stash apply &&
+	test new = $(cat file) &&
+	test $CURRENT = $(cd submodule && git rev-parse HEAD)
+
+
+Saved working directory and index state WIP on master: 63179b5 rewrite
+Merging Version stash was based on with Stashed changes
+Merging:
+virtual Version stash was based on
+virtual Stashed changes
+found 1 common ancestor:
+virtual 8b045485d7af7da389e60eb467551e426da98c59
+On branch master
+Changes not staged for commit:
+  (use "git add <file>..." to update what will be committed)
+  (use "git checkout -- <file>..." to discard changes in working directory)
+
+	modified:   file
+	modified:   submodule (new commits)
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+
+	fake-editor.sh
+
+no changes added to commit (use "git add" and/or "git commit -a")
+ok 5 - stash with a dirty submodule
+
+expecting success: 
+	git reset --hard &&
+	git checkout added-submodule &&
+	git add submodule &&
+	test_tick &&
+	git commit -m third &&
+	(
+		cd submodule &&
+		git commit --allow-empty -m extra
+	) &&
+	git add submodule &&
+	test_tick &&
+	git commit -m fourth &&
+
+	test_must_fail git rebase --onto HEAD^^ HEAD^ HEAD^0 &&
+	git ls-files -s submodule >actual &&
+	(
+		cd submodule &&
+		echo "160000 $(git rev-parse HEAD^) 1	submodule" &&
+		echo "160000 $(git rev-parse HEAD^^) 2	submodule" &&
+		echo "160000 $(git rev-parse HEAD) 3	submodule"
+	) >expect &&
+	test_cmp expect actual
+
+HEAD is now at 63179b5 rewrite
+Switched to branch 'added-submodule'
+M	submodule
+[added-submodule 3e80a7a] third
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[master 7d89a17] extra
+ Author: A U Thor <author@example.com>
+[added-submodule b58fe73] fourth
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+First, rewinding head to replay your work on top of it...
+Applying: fourth
+Using index info to reconstruct a base tree...
+M	submodule
+Falling back to patching base and 3-way merge...
+Merging:
+041f541 file-and-submodule
+virtual fourth
+found 1 common ancestor:
+virtual 916d85feee86a894adc3398951af35ea093209b9
+Failed to merge submodule submodule (commits don't follow merge-base)
+Auto-merging submodule
+CONFLICT (submodule): Merge conflict in submodule
+error: Failed to merge in the changes.
+hint: Use 'git am --show-current-patch' to see the failed patch
+Patch failed at 0001 fourth
+
+Resolve all conflicts manually, mark them as resolved with
+"git add/rm <conflicted_files>", then run "git rebase --continue".
+You can instead skip this commit: run "git rebase --skip".
+To abort and get back to the state before "git rebase", run "git rebase --abort".
+
+ok 6 - rebasing submodule that should conflict
+
+# passed all 6 test(s)
+1..6
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t7201-co.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7201-co/.git/
+expecting success: 
+
+	fill x y z > same &&
+	fill 1 2 3 4 5 6 7 8 >one &&
+	fill a b c d e >two &&
+	git add same one two &&
+	git commit -m "Initial A one, A two" &&
+
+	git checkout -b renamer &&
+	rm -f one &&
+	fill 1 3 4 5 6 7 8 >uno &&
+	git add uno &&
+	fill a b c d e f >two &&
+	git commit -a -m "Renamer R one->uno, M two" &&
+
+	git checkout -b side master &&
+	fill 1 2 3 4 5 6 7 >one &&
+	fill A B C D E >three &&
+	rm -f two &&
+	git update-index --add --remove one two three &&
+	git commit -m "Side M one, D two, A three" &&
+
+	git checkout -b simple master &&
+	rm -f one &&
+	fill a c e > two &&
+	git commit -a -m "Simple D one, M two" &&
+
+	git checkout master
+
+[master (root-commit) 7329388] Initial A one, A two
+ Author: A U Thor <author@example.com>
+ 3 files changed, 16 insertions(+)
+ create mode 100644 one
+ create mode 100644 same
+ create mode 100644 two
+Switched to a new branch 'renamer'
+[renamer 0420b41] Renamer R one->uno, M two
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+), 1 deletion(-)
+ rename one => uno (87%)
+Switched to a new branch 'side'
+[side ab76817] Side M one, D two, A three
+ Author: A U Thor <author@example.com>
+ 3 files changed, 5 insertions(+), 6 deletions(-)
+ create mode 100644 three
+ delete mode 100644 two
+Switched to a new branch 'simple'
+[simple 022ff9d] Simple D one, M two
+ Author: A U Thor <author@example.com>
+ 2 files changed, 10 deletions(-)
+ delete mode 100644 one
+Switched to branch 'master'
+ok 1 - setup
+
+expecting success: 
+
+	git checkout -b delete-me master &&
+	git update-ref -d --no-deref refs/heads/delete-me &&
+	test refs/heads/delete-me = "$(git symbolic-ref HEAD)" &&
+	git checkout master &&
+	test refs/heads/master = "$(git symbolic-ref HEAD)"
+
+Switched to a new branch 'delete-me'
+Switched to branch 'master'
+ok 2 - checkout from non-existing branch
+
+expecting success: 
+
+	fill 0 1 2 3 4 5 6 7 8 >one &&
+	if git checkout side
+	then
+		echo Not happy
+		false
+	else
+		echo "happy - failed correctly"
+	fi
+
+
+error: Your local changes to the following files would be overwritten by checkout:
+	one
+Please commit your changes or stash them before you switch branches.
+Aborting
+happy - failed correctly
+ok 3 - checkout with dirty tree without -m
+
+expecting success: 
+
+	git checkout -f master &&
+	fill 0 1 2 3 4 5 6 7 8 >same &&
+	cp same kept &&
+	git checkout side >messages &&
+	test_cmp same kept &&
+	printf "M\t%s\n" same >messages.expect &&
+	test_cmp messages.expect messages
+
+Already on 'master'
+Switched to branch 'side'
+ok 4 - checkout with unrelated dirty tree without -m
+
+expecting success: 
+
+	git checkout -f master &&
+	git clean -f &&
+
+	fill 0 1 2 3 4 5 6 7 8 >one &&
+	git checkout -m side > messages &&
+
+	test "$(git symbolic-ref HEAD)" = "refs/heads/side" &&
+
+	printf "M\t%s\n" one >expect.messages &&
+	test_cmp expect.messages messages &&
+
+	fill "M	one" "A	three" "D	two" >expect.master &&
+	git diff --name-status master >current.master &&
+	test_cmp expect.master current.master &&
+
+	fill "M	one" >expect.side &&
+	git diff --name-status side >current.side &&
+	test_cmp expect.side current.side &&
+
+	git diff --cached >current.index &&
+	test_must_be_empty current.index
+
+Switched to branch 'master'
+Removing kept
+Removing messages
+Removing messages.expect
+Switched to branch 'side'
+ok 5 - checkout -m with dirty tree
+
+expecting success: 
+
+	git checkout -f master && git clean -f &&
+
+	fill 1 2 3 4 5 7 8 >one &&
+	if git checkout renamer
+	then
+		echo Not happy
+		false
+	else
+		echo "happy - failed correctly"
+	fi &&
+
+	git checkout -m renamer &&
+	fill 1 3 4 5 7 8 >expect &&
+	test_cmp expect uno &&
+	! test -f one &&
+	git diff --cached >current &&
+	test_must_be_empty current
+
+
+Switched to branch 'master'
+Removing current.index
+Removing current.master
+Removing current.side
+Removing expect.master
+Removing expect.messages
+Removing expect.side
+Removing messages
+error: Your local changes to the following files would be overwritten by checkout:
+	one
+Please commit your changes or stash them before you switch branches.
+Aborting
+happy - failed correctly
+Switched to branch 'renamer'
+M	uno
+ok 6 - checkout -m with dirty tree, renamed
+
+expecting success: 
+
+	git checkout -f master && git clean -f &&
+
+	fill 1 T 3 4 5 6 S 8 >one &&
+	if git checkout renamer
+	then
+		echo Not happy
+		false
+	else
+		echo "happy - failed correctly"
+	fi &&
+
+	git checkout -m renamer &&
+
+	git diff master:one :3:uno |
+	sed -e "1,/^@@/d" -e "/^ /d" -e "s/^-/d/" -e "s/^+/a/" >current &&
+	fill d2 aT d7 aS >expect &&
+	test_cmp expect current &&
+	git diff --cached two >current &&
+	test_must_be_empty current
+
+Switched to branch 'master'
+Removing current
+Removing expect
+error: Your local changes to the following files would be overwritten by checkout:
+	one
+Please commit your changes or stash them before you switch branches.
+Aborting
+happy - failed correctly
+Switched to branch 'renamer'
+M	uno
+ok 7 - checkout -m with merge conflict
+
+expecting success: 
+
+	git checkout -f master && git clean -f &&
+
+	fill b d > two &&
+	git checkout -m simple &&
+
+	git ls-files >current &&
+	fill same two two two >expect &&
+	test_cmp expect current &&
+
+	cat <<-EOF >expect &&
+	<<<<<<< simple
+	a
+	c
+	e
+	=======
+	b
+	d
+	>>>>>>> local
+	EOF
+	test_cmp expect two
+
+Switched to branch 'master'
+Removing current
+Removing expect
+Switched to branch 'simple'
+M	two
+ok 8 - format of merge conflict from checkout -m
+
+expecting success: 
+
+	git checkout -f master && git reset --hard && git clean -f &&
+
+	fill b d > two &&
+	git checkout --merge --conflict=diff3 simple &&
+
+	cat <<-EOF >expect &&
+	<<<<<<< simple
+	a
+	c
+	e
+	||||||| master
+	a
+	b
+	c
+	d
+	e
+	=======
+	b
+	d
+	>>>>>>> local
+	EOF
+	test_cmp expect two
+
+Switched to branch 'master'
+HEAD is now at 7329388 Initial A one, A two
+Removing current
+Removing expect
+Switched to branch 'simple'
+M	two
+ok 9 - checkout --merge --conflict=diff3 <branch>
+
+expecting success: 
+
+	git checkout -f master && git reset --hard && git clean -f &&
+	git rm two &&
+
+	test_must_fail git checkout simple 2>errs &&
+	test_i18ngrep overwritten errs &&
+
+	git checkout --merge simple 2>errs &&
+	test_i18ngrep ! overwritten errs &&
+	git ls-files -u &&
+	test_must_fail git cat-file -t :0:two &&
+	test "$(git cat-file -t :1:two)" = blob &&
+	test "$(git cat-file -t :2:two)" = blob &&
+	test_must_fail git cat-file -t :3:two
+
+Switched to branch 'master'
+HEAD is now at 7329388 Initial A one, A two
+Removing expect
+rm 'two'
+error: Your local changes to the following files would be overwritten by checkout:
+M	two
+100644 940532533944dd159bfd11136fac2ee35872de38 1	two
+100644 bf8d586a0d1628d4b5132c772c2fb2906385b149 2	two
+fatal: Not a valid object name :0:two
+fatal: Not a valid object name :3:two
+ok 10 - switch to another branch while carrying a deletion
+
+expecting success: 
+
+	git config advice.detachedHead false &&
+	git checkout -f renamer && git clean -f &&
+	git checkout renamer^ 2>messages &&
+	test_i18ngrep "HEAD is now at 7329388" messages &&
+	test_line_count = 1 messages &&
+	H=$(git rev-parse --verify HEAD) &&
+	M=$(git show-ref -s --verify refs/heads/master) &&
+	test "z$H" = "z$M" &&
+	if git symbolic-ref HEAD >/dev/null 2>&1
+	then
+		echo "OOPS, HEAD is still symbolic???"
+		false
+	else
+		: happy
+	fi
+
+Switched to branch 'renamer'
+Removing errs
+HEAD is now at 7329388 Initial A one, A two
+ok 11 - checkout to detach HEAD (with advice declined)
+
+expecting success: 
+	git config advice.detachedHead true &&
+	git checkout -f renamer && git clean -f &&
+	GIT_TEST_GETTEXT_POISON= git checkout renamer^ 2>messages &&
+	grep "HEAD is now at 7329388" messages &&
+	test_line_count -gt 1 messages &&
+	H=$(git rev-parse --verify HEAD) &&
+	M=$(git show-ref -s --verify refs/heads/master) &&
+	test "z$H" = "z$M" &&
+	if git symbolic-ref HEAD >/dev/null 2>&1
+	then
+		echo "OOPS, HEAD is still symbolic???"
+		false
+	else
+		: happy
+	fi
+
+Previous HEAD position was 7329388 Initial A one, A two
+Switched to branch 'renamer'
+Removing messages
+HEAD is now at 7329388 Initial A one, A two
+ok 12 - checkout to detach HEAD
+
+expecting success: 
+
+	git checkout -f master && git clean -f &&
+	git checkout renamer^ &&
+	H=$(git rev-parse --verify HEAD) &&
+	M=$(git show-ref -s --verify refs/heads/master) &&
+	test "z$H" = "z$M" &&
+	if git symbolic-ref HEAD >/dev/null 2>&1
+	then
+		echo "OOPS, HEAD is still symbolic???"
+		false
+	else
+		: happy
+	fi
+
+Switched to branch 'master'
+Removing messages
+Note: checking out 'renamer^'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by performing another checkout.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -b with the checkout command again. Example:
+
+  git checkout -b <new-branch-name>
+
+HEAD is now at 7329388 Initial A one, A two
+ok 13 - checkout to detach HEAD with branchname^
+
+expecting success: 
+
+	git checkout -f master && git clean -f &&
+	git checkout ":/Initial" &&
+	H=$(git rev-parse --verify HEAD) &&
+	M=$(git show-ref -s --verify refs/heads/master) &&
+	test "z$H" = "z$M" &&
+	if git symbolic-ref HEAD >/dev/null 2>&1
+	then
+		echo "OOPS, HEAD is still symbolic???"
+		false
+	else
+		: happy
+	fi
+
+Switched to branch 'master'
+Note: checking out ':/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 performing another checkout.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -b with the checkout command again. Example:
+
+  git checkout -b <new-branch-name>
+
+HEAD is now at 7329388 Initial A one, A two
+ok 14 - checkout to detach HEAD with :/message
+
+expecting success: 
+
+	git checkout -f master && git clean -f &&
+	git checkout HEAD^0 &&
+	H=$(git rev-parse --verify HEAD) &&
+	M=$(git show-ref -s --verify refs/heads/master) &&
+	test "z$H" = "z$M" &&
+	if git symbolic-ref HEAD >/dev/null 2>&1
+	then
+		echo "OOPS, HEAD is still symbolic???"
+		false
+	else
+		: happy
+	fi
+
+Switched to branch 'master'
+Note: checking out '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 performing another checkout.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -b with the checkout command again. Example:
+
+  git checkout -b <new-branch-name>
+
+HEAD is now at 7329388 Initial A one, A two
+ok 15 - checkout to detach HEAD with HEAD^0
+
+expecting success: 
+
+	git tag both side &&
+	git branch both master &&
+	git reset --hard &&
+	git checkout master &&
+
+	git checkout both &&
+	H=$(git rev-parse --verify HEAD) &&
+	M=$(git show-ref -s --verify refs/heads/master) &&
+	test "z$H" = "z$M" &&
+	name=$(git symbolic-ref HEAD 2>/dev/null) &&
+	test "z$name" = zrefs/heads/both
+
+
+HEAD is now at 7329388 Initial A one, A two
+Switched to branch 'master'
+warning: refname 'both' is ambiguous.
+Switched to branch 'both'
+ok 16 - checkout with ambiguous tag/branch names
+
+expecting success: 
+
+	git reset --hard &&
+	git checkout master &&
+
+	git tag frotz side &&
+	git branch frotz master &&
+	git reset --hard &&
+	git checkout master &&
+
+	git checkout tags/frotz &&
+	H=$(git rev-parse --verify HEAD) &&
+	S=$(git show-ref -s --verify refs/heads/side) &&
+	test "z$H" = "z$S" &&
+	if name=$(git symbolic-ref HEAD 2>/dev/null)
+	then
+		echo "Bad -- should have detached"
+		false
+	else
+		: happy
+	fi
+
+
+HEAD is now at 7329388 Initial A one, A two
+Switched to branch 'master'
+HEAD is now at 7329388 Initial A one, A two
+Already on 'master'
+Note: checking out 'tags/frotz'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by performing another checkout.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -b with the checkout command again. Example:
+
+  git checkout -b <new-branch-name>
+
+HEAD is now at ab76817 Side M one, D two, A three
+ok 17 - checkout with ambiguous tag/branch names
+
+expecting success: 
+
+	git reset --hard &&
+	git checkout master &&
+
+	mkdir subs &&
+	(
+		cd subs &&
+		git checkout side
+	) &&
+	! test -f subs/one &&
+	rm -fr subs
+
+
+HEAD is now at ab76817 Side M one, D two, A three
+Previous HEAD position was ab76817 Side M one, D two, A three
+Switched to branch 'master'
+Switched to branch 'side'
+ok 18 - switch branches while in subdirectory
+
+expecting success: 
+
+	git reset --hard &&
+	git checkout side &&
+	mkdir subs &&
+	>subs/bero &&
+	git add subs/bero &&
+	git commit -m "add subs/bero" &&
+
+	git checkout master &&
+	mkdir -p subs &&
+	(
+		cd subs &&
+		git checkout side -- bero
+	) &&
+	test -f subs/bero
+
+
+HEAD is now at ab76817 Side M one, D two, A three
+Already on 'side'
+[side bb04aa0] add subs/bero
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 subs/bero
+Switched to branch 'master'
+ok 19 - checkout specific path while in subdirectory
+
+expecting success: 
+    git config branch.autosetupmerge false &&
+    git checkout master &&
+    git checkout --track -b track1 &&
+    test "$(git config branch.track1.remote)" &&
+    test "$(git config branch.track1.merge)"
+Already on 'master'
+A	subs/bero
+Switched to a new branch 'track1'
+A	subs/bero
+Branch 'track1' set up to track local branch 'master'.
+ok 20 - checkout w/--track sets up tracking
+
+expecting success: 
+    test_when_finished git config branch.autosetupmerge false &&
+    git config branch.autosetupmerge always &&
+    git checkout master &&
+    git checkout -b track2 &&
+    test "$(git config branch.track2.remote)" &&
+    test "$(git config branch.track2.merge)"
+Switched to branch 'master'
+A	subs/bero
+Switched to a new branch 'track2'
+A	subs/bero
+Branch 'track2' set up to track local branch 'master'.
+ok 21 - checkout w/autosetupmerge=always sets up tracking
+
+expecting success: 
+    git checkout master^0 &&
+    test_must_fail git symbolic-ref HEAD &&
+    test_must_fail git checkout --track -b track &&
+    test_must_fail git rev-parse --verify track &&
+    test_must_fail git symbolic-ref HEAD &&
+    test "z$(git rev-parse master^0)" = "z$(git rev-parse HEAD)"
+
+Note: checking out 'master^0'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by performing another checkout.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -b with the checkout command again. Example:
+
+  git checkout -b <new-branch-name>
+
+HEAD is now at 7329388 Initial A one, A two
+A	subs/bero
+fatal: ref HEAD is not a symbolic ref
+fatal: Cannot setup tracking information; starting point 'HEAD' is not a branch.
+A	subs/bero
+fatal: Needed a single revision
+fatal: ref HEAD is not a symbolic ref
+ok 22 - checkout w/--track from non-branch HEAD fails
+
+expecting success: 
+    git checkout master^0 &&
+    test_must_fail git symbolic-ref HEAD &&
+    test_must_fail git checkout --track -b track frotz &&
+    test_must_fail git rev-parse --verify track &&
+    test_must_fail git symbolic-ref HEAD &&
+    test "z$(git rev-parse master^0)" = "z$(git rev-parse HEAD)"
+
+HEAD is now at 7329388 Initial A one, A two
+A	subs/bero
+fatal: ref HEAD is not a symbolic ref
+warning: refname 'frotz' is ambiguous.
+warning: refname 'frotz' is ambiguous.
+fatal: Ambiguous object name: 'frotz'.
+A	subs/bero
+fatal: Needed a single revision
+fatal: ref HEAD is not a symbolic ref
+ok 23 - checkout w/--track from tag fails
+
+expecting success: 
+    git checkout master &&
+    git config --bool core.prefersymlinkrefs yes &&
+    git checkout side &&
+    git checkout master &&
+    it=$(git symbolic-ref HEAD) &&
+    test "z$it" = zrefs/heads/master &&
+    here=$(git rev-parse --verify refs/heads/master) &&
+    git checkout side^ &&
+    test "z$(git rev-parse --verify refs/heads/master)" = "z$here"
+
+Switched to branch 'master'
+A	subs/bero
+Switched to branch 'side'
+Switched to branch 'master'
+Note: checking out 'side^'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by performing another checkout.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -b with the checkout command again. Example:
+
+  git checkout -b <new-branch-name>
+
+HEAD is now at ab76817 Side M one, D two, A three
+ok 24 - detach a symbolic link HEAD
+
+expecting success: 
+    git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*" &&
+    git update-ref refs/remotes/origin/koala/bear renamer &&
+
+    git checkout --track origin/koala/bear &&
+    test "refs/heads/koala/bear" = "$(git symbolic-ref HEAD)" &&
+    test "$(git rev-parse HEAD)" = "$(git rev-parse renamer)" &&
+
+    git checkout master && git branch -D koala/bear &&
+
+    git checkout --track refs/remotes/origin/koala/bear &&
+    test "refs/heads/koala/bear" = "$(git symbolic-ref HEAD)" &&
+    test "$(git rev-parse HEAD)" = "$(git rev-parse renamer)" &&
+
+    git checkout master && git branch -D koala/bear &&
+
+    git checkout --track remotes/origin/koala/bear &&
+    test "refs/heads/koala/bear" = "$(git symbolic-ref HEAD)" &&
+    test "$(git rev-parse HEAD)" = "$(git rev-parse renamer)"
+
+Previous HEAD position was ab76817 Side M one, D two, A three
+Switched to a new branch 'koala/bear'
+Branch 'koala/bear' set up to track remote branch 'koala/bear' from 'origin'.
+Switched to branch 'master'
+Deleted branch koala/bear (was 0420b41).
+Switched to a new branch 'koala/bear'
+Branch 'koala/bear' set up to track remote branch 'koala/bear' from 'origin'.
+Switched to branch 'master'
+Deleted branch koala/bear (was 0420b41).
+Switched to a new branch 'koala/bear'
+Branch 'koala/bear' set up to track remote branch 'koala/bear' from 'origin'.
+ok 25 - checkout with --track fakes a sensible -b <name>
+
+expecting success: 
+    test_must_fail git checkout --track renamer
+fatal: missing branch name; try -b
+ok 26 - checkout with --track, but without -b, fails with too short tracked name
+
+expecting success: 
+	setup_conflicting_index &&
+	echo "none of the above" >sample &&
+	cat sample >fild &&
+	cat sample >file &&
+	cat sample >filf &&
+	test_must_fail git checkout fild file filf &&
+	test_cmp sample fild &&
+	test_cmp sample filf &&
+	test_cmp sample file
+
+error: path 'file' is unmerged
+ok 27 - checkout an unmerged path should fail
+
+expecting success: 
+	setup_conflicting_index &&
+	echo "none of the above" >sample &&
+	echo ourside >expect &&
+	cat sample >fild &&
+	cat sample >file &&
+	cat sample >filf &&
+	git checkout -f fild file filf &&
+	test_cmp expect fild &&
+	test_cmp expect filf &&
+	test_cmp sample file
+
+warning: path 'file' is unmerged
+ok 28 - checkout with an unmerged path can be ignored
+
+expecting success: 
+	setup_conflicting_index &&
+	echo "none of the above" >sample &&
+	echo ourside >expect &&
+	cat sample >fild &&
+	cat sample >file &&
+	cat sample >filf &&
+	git checkout --ours . &&
+	test_cmp expect fild &&
+	test_cmp expect filf &&
+	test_cmp expect file &&
+	git checkout --theirs file &&
+	test ztheirside = "z$(cat file)"
+
+ok 29 - checkout unmerged stage
+
+expecting success: 
+	setup_conflicting_index &&
+	echo "none of the above" >sample &&
+	echo ourside >expect &&
+	cat sample >fild &&
+	cat sample >file &&
+	cat sample >filf &&
+	git checkout -m -- fild file filf &&
+	(
+		echo "<<<<<<< ours" &&
+		echo ourside &&
+		echo "=======" &&
+		echo theirside &&
+		echo ">>>>>>> theirs"
+	) >merged &&
+	test_cmp expect fild &&
+	test_cmp expect filf &&
+	test_cmp merged file
+
+ok 30 - checkout with --merge
+
+expecting success: 
+	git config merge.conflictstyle diff3 &&
+	setup_conflicting_index &&
+	echo "none of the above" >sample &&
+	echo ourside >expect &&
+	cat sample >fild &&
+	cat sample >file &&
+	cat sample >filf &&
+	git checkout -m -- fild file filf &&
+	(
+		echo "<<<<<<< ours" &&
+		echo ourside &&
+		echo "||||||| base" &&
+		echo original &&
+		echo "=======" &&
+		echo theirside &&
+		echo ">>>>>>> theirs"
+	) >merged &&
+	test_cmp expect fild &&
+	test_cmp expect filf &&
+	test_cmp merged file
+
+ok 31 - checkout with --merge, in diff3 -m style
+
+expecting success: 
+	git config merge.conflictstyle diff3 &&
+	setup_conflicting_index &&
+	echo "none of the above" >sample &&
+	echo ourside >expect &&
+	cat sample >fild &&
+	cat sample >file &&
+	cat sample >filf &&
+	git checkout --conflict=merge -- fild file filf &&
+	(
+		echo "<<<<<<< ours" &&
+		echo ourside &&
+		echo "=======" &&
+		echo theirside &&
+		echo ">>>>>>> theirs"
+	) >merged &&
+	test_cmp expect fild &&
+	test_cmp expect filf &&
+	test_cmp merged file
+
+ok 32 - checkout --conflict=merge, overriding config
+
+expecting success: 
+	test_unconfig merge.conflictstyle &&
+	setup_conflicting_index &&
+	echo "none of the above" >sample &&
+	echo ourside >expect &&
+	cat sample >fild &&
+	cat sample >file &&
+	cat sample >filf &&
+	git checkout --conflict=diff3 -- fild file filf &&
+	(
+		echo "<<<<<<< ours" &&
+		echo ourside &&
+		echo "||||||| base" &&
+		echo original &&
+		echo "=======" &&
+		echo theirside &&
+		echo ">>>>>>> theirs"
+	) >merged &&
+	test_cmp expect fild &&
+	test_cmp expect filf &&
+	test_cmp merged file
+
+ok 33 - checkout --conflict=diff3
+
+expecting success: 
+	git reset --hard master &&
+	git symbolic-ref HEAD refs/heads/master &&
+	test_must_fail git checkout -b renamer side^ &&
+	test $(git symbolic-ref HEAD) = refs/heads/master &&
+	git diff --exit-code &&
+	git diff --cached --exit-code
+
+
+HEAD is now at 7329388 Initial A one, A two
+fatal: A branch named 'renamer' already exists.
+ok 34 - failing checkout -b should not break working tree
+
+expecting success: 
+	git reset --hard master &&
+	git checkout master^0 &&
+	echo modified >one &&
+	test_must_fail git checkout renamer 2>error.log &&
+	! grep "^Previous HEAD" error.log
+
+HEAD is now at 7329388 Initial A one, A two
+Note: checking out 'master^0'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by performing another checkout.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -b with the checkout command again. Example:
+
+  git checkout -b <new-branch-name>
+
+HEAD is now at 7329388 Initial A one, A two
+ok 35 - switch out of non-branch
+
+expecting success: 
+	git reset --hard &&
+
+	git config merge.filfre.driver "./filfre.sh %O %A %B" &&
+	git config merge.filfre.name "Feel-free merge driver" &&
+	git config merge.filfre.recursive binary &&
+	echo "arm merge=filfre" >.gitattributes &&
+
+	git checkout -b left &&
+	echo neutral >arm &&
+	git add arm .gitattributes &&
+	test_tick &&
+	git commit -m neutral &&
+	git branch right &&
+
+	echo left >arm &&
+	test_tick &&
+	git commit -a -m left &&
+	git checkout right &&
+
+	echo right >arm &&
+	test_tick &&
+	git commit -a -m right &&
+
+	test_must_fail git merge left &&
+	(
+		for t in filfre-common left right
+		do
+			grep $t arm || exit 1
+		done
+	) &&
+
+	mv arm expect &&
+	git checkout -m arm &&
+	test_cmp expect arm
+
+HEAD is now at 7329388 Initial A one, A two
+Switched to a new branch 'left'
+[left b257dc6] neutral
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 .gitattributes
+ create mode 100644 arm
+[left 2459c9d] left
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to branch 'right'
+[right 6b476b9] right
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Merging:
+6b476b9 right
+virtual left
+found 1 common ancestor:
+b257dc6 neutral
+Auto-merging arm
+CONFLICT (content): Merge conflict in arm
+Automatic merge failed; fix conflicts and then commit the result.
+||||||| filfre-common
+left
+right
+ok 36 - custom merge driver with checkout -m
+
+# passed all 36 test(s)
+1..36
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t7300-clean.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7300-clean/.git/
+expecting success: 
+
+	mkdir -p src &&
+	touch src/part1.c Makefile &&
+	echo build >.gitignore &&
+	echo \*.o >>.gitignore &&
+	git add . &&
+	git commit -m setup &&
+	touch src/part2.c README &&
+	git add .
+
+
+[master (root-commit) 9a15cbf] setup
+ Author: A U Thor <author@example.com>
+ 3 files changed, 2 insertions(+)
+ create mode 100644 .gitignore
+ create mode 100644 Makefile
+ create mode 100644 src/part1.c
+ok 1 - setup
+
+expecting success: 
+	git update-index --skip-worktree .gitignore &&
+	rm .gitignore &&
+	mkdir -p build docs &&
+	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
+	git clean &&
+	test -f Makefile &&
+	test -f README &&
+	test -f src/part1.c &&
+	test -f src/part2.c &&
+	test ! -f a.out &&
+	test ! -f src/part3.c &&
+	test -f docs/manual.txt &&
+	test -f obj.o &&
+	test -f build/lib.so &&
+	git update-index --no-skip-worktree .gitignore &&
+	git checkout .gitignore
+
+Removing a.out
+Removing src/part3.c
+ok 2 - git clean with skip-worktree .gitignore
+
+expecting success: 
+
+	mkdir -p build docs &&
+	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
+	git clean &&
+	test -f Makefile &&
+	test -f README &&
+	test -f src/part1.c &&
+	test -f src/part2.c &&
+	test ! -f a.out &&
+	test ! -f src/part3.c &&
+	test -f docs/manual.txt &&
+	test -f obj.o &&
+	test -f build/lib.so
+
+
+Removing a.out
+Removing src/part3.c
+ok 3 - git clean
+
+expecting success: 
+
+	mkdir -p build docs &&
+	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
+	git clean src/ &&
+	test -f Makefile &&
+	test -f README &&
+	test -f src/part1.c &&
+	test -f src/part2.c &&
+	test -f a.out &&
+	test ! -f src/part3.c &&
+	test -f docs/manual.txt &&
+	test -f obj.o &&
+	test -f build/lib.so
+
+
+Removing src/part3.c
+ok 4 - git clean src/
+
+expecting success: 
+
+	mkdir -p build docs &&
+	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
+	git clean src/ src/ &&
+	test -f Makefile &&
+	test -f README &&
+	test -f src/part1.c &&
+	test -f src/part2.c &&
+	test -f a.out &&
+	test ! -f src/part3.c &&
+	test -f docs/manual.txt &&
+	test -f obj.o &&
+	test -f build/lib.so
+
+
+Removing src/part3.c
+ok 5 - git clean src/ src/
+
+expecting success: 
+
+	mkdir -p build docs src/test &&
+	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so src/test/1.c &&
+	(cd src/ && git clean) &&
+	test -f Makefile &&
+	test -f README &&
+	test -f src/part1.c &&
+	test -f src/part2.c &&
+	test -f a.out &&
+	test ! -f src/part3.c &&
+	test -f src/test/1.c &&
+	test -f docs/manual.txt &&
+	test -f obj.o &&
+	test -f build/lib.so
+
+
+Removing part3.c
+ok 6 - git clean with prefix
+
+expecting success: 
+
+	mkdir -p build docs &&
+	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
+	would_clean=$(
+		cd docs &&
+		git clean -n ../src |
+		sed -n -e "s|^Would remove ||p"
+	) &&
+	verbose test "$would_clean" = ../src/part3.c
+
+ok 7 - git clean with relative prefix
+
+expecting success: 
+
+	mkdir -p build docs &&
+	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
+	would_clean=$(
+		cd docs &&
+		git clean -n "$(pwd)/../src" |
+		sed -n -e "s|^Would remove ||p"
+	) &&
+	verbose test "$would_clean" = ../src/part3.c
+
+ok 8 - git clean with absolute path
+
+expecting success: 
+
+	mkdir -p build docs &&
+	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
+	(
+		cd docs &&
+		test_must_fail git clean -n ../..
+	)
+
+fatal: ../..: '../..' is outside repository
+ok 9 - git clean with out of work tree relative path
+
+expecting success: 
+
+	mkdir -p build docs &&
+	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
+	dd=$(cd .. && pwd) &&
+	(
+		cd docs &&
+		test_must_fail git clean -n $dd
+	)
+
+fatal: /build/git-2.20.1/t: '/build/git-2.20.1/t' is outside repository
+ok 10 - git clean with out of work tree absolute path
+
+expecting success: 
+
+	mkdir -p build docs src/feature &&
+	touch a.out src/part3.c src/feature/file.c docs/manual.txt obj.o build/lib.so &&
+	(cd src/ && git clean -d feature/) &&
+	test -f Makefile &&
+	test -f README &&
+	test -f src/part1.c &&
+	test -f src/part2.c &&
+	test -f a.out &&
+	test -f src/part3.c &&
+	test ! -f src/feature/file.c &&
+	test -f docs/manual.txt &&
+	test -f obj.o &&
+	test -f build/lib.so
+
+
+Removing feature/file.c
+ok 11 - git clean -d with prefix and path
+
+checking prerequisite: SYMLINKS
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
+	# test whether the filesystem supports symbolic links
+	ln -s x y && test -h y
+
+)
+prerequisite SYMLINKS ok
+expecting success: 
+
+	mkdir -p build docs &&
+	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
+	ln -s docs/manual.txt src/part4.c &&
+	git clean &&
+	test -f Makefile &&
+	test -f README &&
+	test -f src/part1.c &&
+	test -f src/part2.c &&
+	test ! -f a.out &&
+	test ! -f src/part3.c &&
+	test ! -f src/part4.c &&
+	test -f docs/manual.txt &&
+	test -f obj.o &&
+	test -f build/lib.so
+
+
+Removing a.out
+Removing src/part3.c
+Removing src/part4.c
+ok 12 - git clean symbolic link
+
+expecting success: 
+
+	touch a.clean b.clean other.c &&
+	git clean "*.clean" &&
+	test -f Makefile &&
+	test -f README &&
+	test -f src/part1.c &&
+	test -f src/part2.c &&
+	test ! -f a.clean &&
+	test ! -f b.clean &&
+	test -f other.c
+
+
+Removing a.clean
+Removing b.clean
+ok 13 - git clean with wildcard
+
+expecting success: 
+
+	mkdir -p build docs &&
+	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
+	git clean -n &&
+	test -f Makefile &&
+	test -f README &&
+	test -f src/part1.c &&
+	test -f src/part2.c &&
+	test -f a.out &&
+	test -f src/part3.c &&
+	test -f docs/manual.txt &&
+	test -f obj.o &&
+	test -f build/lib.so
+
+
+Would remove a.out
+Would remove other.c
+Would remove src/part3.c
+ok 14 - git clean -n
+
+expecting success: 
+
+	mkdir -p build docs &&
+	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
+	git clean -d &&
+	test -f Makefile &&
+	test -f README &&
+	test -f src/part1.c &&
+	test -f src/part2.c &&
+	test ! -f a.out &&
+	test ! -f src/part3.c &&
+	test ! -d docs &&
+	test -f obj.o &&
+	test -f build/lib.so
+
+
+Removing a.out
+Removing docs/
+Removing other.c
+Removing src/feature/
+Removing src/part3.c
+Removing src/test/
+ok 15 - git clean -d
+
+expecting success: 
+
+	mkdir -p build docs examples &&
+	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so examples/1.c &&
+	git clean -d src/ examples/ &&
+	test -f Makefile &&
+	test -f README &&
+	test -f src/part1.c &&
+	test -f src/part2.c &&
+	test -f a.out &&
+	test ! -f src/part3.c &&
+	test ! -f examples/1.c &&
+	test -f docs/manual.txt &&
+	test -f obj.o &&
+	test -f build/lib.so
+
+
+Removing examples/
+Removing src/part3.c
+ok 16 - git clean -d src/ examples/
+
+expecting success: 
+
+	mkdir -p build docs &&
+	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
+	git clean -x &&
+	test -f Makefile &&
+	test -f README &&
+	test -f src/part1.c &&
+	test -f src/part2.c &&
+	test ! -f a.out &&
+	test ! -f src/part3.c &&
+	test -f docs/manual.txt &&
+	test ! -f obj.o &&
+	test -f build/lib.so
+
+
+Removing a.out
+Removing obj.o
+Removing src/part3.c
+ok 17 - git clean -x
+
+expecting success: 
+
+	mkdir -p build docs &&
+	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
+	git clean -d -x &&
+	test -f Makefile &&
+	test -f README &&
+	test -f src/part1.c &&
+	test -f src/part2.c &&
+	test ! -f a.out &&
+	test ! -f src/part3.c &&
+	test ! -d docs &&
+	test ! -f obj.o &&
+	test ! -d build
+
+
+Removing a.out
+Removing build/
+Removing docs/
+Removing obj.o
+Removing src/part3.c
+ok 18 - git clean -d -x
+
+expecting success: 
+
+	mkdir -p build docs &&
+	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
+	git clean -d -x -e src &&
+	test -f Makefile &&
+	test -f README &&
+	test -f src/part1.c &&
+	test -f src/part2.c &&
+	test ! -f a.out &&
+	test -f src/part3.c &&
+	test ! -d docs &&
+	test ! -f obj.o &&
+	test ! -d build
+
+
+Removing a.out
+Removing build/
+Removing docs/
+Removing obj.o
+ok 19 - git clean -d -x with ignored tracked directory
+
+expecting success: 
+
+	mkdir -p build docs &&
+	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
+	git clean -X &&
+	test -f Makefile &&
+	test -f README &&
+	test -f src/part1.c &&
+	test -f src/part2.c &&
+	test -f a.out &&
+	test -f src/part3.c &&
+	test -f docs/manual.txt &&
+	test ! -f obj.o &&
+	test -f build/lib.so
+
+
+Removing obj.o
+ok 20 - git clean -X
+
+expecting success: 
+
+	mkdir -p build docs &&
+	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
+	git clean -d -X &&
+	test -f Makefile &&
+	test -f README &&
+	test -f src/part1.c &&
+	test -f src/part2.c &&
+	test -f a.out &&
+	test -f src/part3.c &&
+	test -f docs/manual.txt &&
+	test ! -f obj.o &&
+	test ! -d build
+
+
+Removing build/
+Removing obj.o
+ok 21 - git clean -d -X
+
+expecting success: 
+
+	mkdir -p build docs &&
+	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
+	git clean -d -X -e src &&
+	test -f Makefile &&
+	test -f README &&
+	test -f src/part1.c &&
+	test -f src/part2.c &&
+	test -f a.out &&
+	test ! -f src/part3.c &&
+	test -f docs/manual.txt &&
+	test ! -f obj.o &&
+	test ! -d build
+
+
+Removing build/
+Removing obj.o
+Removing src/part3.c
+ok 22 - git clean -d -X with ignored tracked directory
+
+expecting success: 
+
+	git config --unset clean.requireForce &&
+	test_must_fail git clean
+
+
+fatal: clean.requireForce defaults to true and neither -i, -n, nor -f given; refusing to clean
+ok 23 - clean.requireForce defaults to true
+
+expecting success: 
+
+	git config clean.requireForce true &&
+	test_must_fail git clean
+
+
+fatal: clean.requireForce set to true and neither -i, -n, nor -f given; refusing to clean
+ok 24 - clean.requireForce
+
+expecting success: 
+
+	mkdir -p build docs &&
+	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
+	git clean -n &&
+	test -f Makefile &&
+	test -f README &&
+	test -f src/part1.c &&
+	test -f src/part2.c &&
+	test -f a.out &&
+	test -f src/part3.c &&
+	test -f docs/manual.txt &&
+	test -f obj.o &&
+	test -f build/lib.so
+
+
+Would remove a.out
+Would remove src/part3.c
+ok 25 - clean.requireForce and -n
+
+expecting success: 
+
+	git clean -f &&
+	test -f README &&
+	test -f src/part1.c &&
+	test -f src/part2.c &&
+	test ! -f a.out &&
+	test ! -f src/part3.c &&
+	test -f docs/manual.txt &&
+	test -f obj.o &&
+	test -f build/lib.so
+
+
+Removing a.out
+Removing src/part3.c
+ok 26 - clean.requireForce and -f
+
+expecting success: 
+
+	echo excludes >excludes &&
+	echo included >included &&
+	git config core.excludesfile excludes &&
+	output=$(git clean -n excludes included 2>&1) &&
+	expr "$output" : ".*included" >/dev/null &&
+	! expr "$output" : ".*excludes" >/dev/null
+
+
+ok 27 - core.excludesfile
+
+checking prerequisite: SANITY
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
+	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: 
+
+	mkdir foo &&
+	touch foo/bar &&
+	test_when_finished "chmod 755 foo" &&
+	(exec <foo/bar &&
+	 chmod 0 foo &&
+	 test_must_fail git clean -f -d)
+
+warning: could not open directory 'foo/': Permission denied
+warning: failed to remove foo/: Directory not empty
+Removing docs/
+Removing included
+ok 28 - removal failure
+
+expecting success: 
+	rm -fr foo bar baz &&
+	mkdir -p foo bar baz/boo &&
+	(
+		cd foo &&
+		git init &&
+		test_commit nested hello.world
+	) &&
+	(
+		cd bar &&
+		>goodbye.people
+	) &&
+	(
+		cd baz/boo &&
+		git init &&
+		test_commit deeply.nested deeper.world
+	) &&
+	git clean -f -d &&
+	test -f foo/.git/index &&
+	test -f foo/hello.world &&
+	test -f baz/boo/.git/index &&
+	test -f baz/boo/deeper.world &&
+	! test -d bar
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7300-clean/foo/.git/
+[master (root-commit) abd8674] nested
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 hello.world
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7300-clean/baz/boo/.git/
+[master (root-commit) 3f7f1fc] deeply.nested
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 deeper.world
+Removing bar/
+Skipping repository baz/boo
+Skipping repository foo/
+ok 29 - nested git work tree
+
+expecting success: 
+	rm -fr almost_git almost_bare_git almost_submodule &&
+	mkdir -p almost_git/.git/objects &&
+	mkdir -p almost_git/.git/refs &&
+	cat >almost_git/.git/HEAD <<-\EOF &&
+	garbage
+	EOF
+	cp -r almost_git/.git/ almost_bare_git &&
+	mkdir almost_submodule/ &&
+	cat >almost_submodule/.git <<-\EOF &&
+	garbage
+	EOF
+	test_when_finished "rm -rf almost_*" &&
+	git clean -f -d &&
+	test_path_is_missing almost_git &&
+	test_path_is_missing almost_bare_git &&
+	test_path_is_missing almost_submodule
+
+Removing almost_bare_git/
+Removing almost_git/
+Removing almost_submodule/
+Skipping repository baz/boo
+Skipping repository foo/
+ok 30 - should clean things that almost look like git but are not
+
+expecting success: 
+	rm -fr repo to_clean sub1 sub2 &&
+	mkdir repo to_clean &&
+	(
+		cd repo &&
+		git init &&
+		test_commit msg hello.world
+	) &&
+	git submodule add ./repo/.git sub1 &&
+	git commit -m "sub1" &&
+	git branch before_sub2 &&
+	git submodule add ./repo/.git sub2 &&
+	git commit -m "sub2" &&
+	git checkout before_sub2 &&
+	>to_clean/should_clean.this &&
+	git clean -f -d &&
+	test_path_is_file repo/.git/index &&
+	test_path_is_file repo/hello.world &&
+	test_path_is_file sub1/.git &&
+	test_path_is_file sub1/hello.world &&
+	test_path_is_file sub2/.git &&
+	test_path_is_file sub2/hello.world &&
+	test_path_is_missing to_clean
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7300-clean/repo/.git/
+[master (root-commit) 1af9d3b] msg
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 hello.world
+Cloning into '/build/git-2.20.1/t/trash directory.t7300-clean/sub1'...
+done.
+[master 8d4b8f3] sub1
+ Author: A U Thor <author@example.com>
+ 4 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 100644 README
+ create mode 100644 src/part2.c
+ create mode 160000 sub1
+Cloning into '/build/git-2.20.1/t/trash directory.t7300-clean/sub2'...
+done.
+[master 87a93fa] sub2
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 160000 sub2
+warning: unable to rmdir 'sub2': Directory not empty
+Switched to branch 'before_sub2'
+Skipping repository baz/boo
+Skipping repository foo/
+Skipping repository repo/
+Skipping repository sub2/
+Removing to_clean/
+ok 31 - should not clean submodules
+
+expecting success: 
+	rm -fr to_clean possible_sub1 &&
+	mkdir to_clean possible_sub1 &&
+	test_when_finished "rm -rf possible_sub*" &&
+	echo "gitdir: foo" >possible_sub1/.git &&
+	>possible_sub1/hello.world &&
+	chmod 0 possible_sub1/.git &&
+	>to_clean/should_clean.this &&
+	git clean -f -d &&
+	test_path_is_file possible_sub1/.git &&
+	test_path_is_file possible_sub1/hello.world &&
+	test_path_is_missing to_clean
+
+Skipping repository baz/boo
+Skipping repository foo/
+Skipping repository possible_sub1/
+Skipping repository repo/
+Skipping repository sub2/
+Removing to_clean/
+ok 32 - should avoid cleaning possible submodules
+
+expecting success: 
+	rm -fr empty_repo to_clean &&
+	git init empty_repo &&
+	mkdir to_clean &&
+	>to_clean/should_clean.this &&
+	git clean -f -d &&
+	test_path_is_file empty_repo/.git/HEAD &&
+	test_path_is_missing to_clean
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7300-clean/empty_repo/.git/
+Skipping repository baz/boo
+Skipping repository empty_repo/
+Skipping repository foo/
+Skipping repository repo/
+Skipping repository sub2/
+Removing to_clean/
+ok 33 - nested (empty) git should be kept
 
 expecting success: 
-	git reset --hard C &&
-	if test "$I1" != "$H1"
-	then
-	    echo "$I1" >file1 &&
-	    git add file1
-	fi &&
-	if test "$W1" != "$I1"
-	then
-	    echo "$W1" >file1
-	fi &&
-	if test "$W2" != "XXXXX"
-	then
-	    git reset --$opt $T &&
-	    test "$(cat file1)" = "$W2" &&
-	    git checkout-index -f -- file1 &&
-	    test "$(cat file1)" = "$I2" &&
-	    git checkout -f HEAD -- file1 &&
-	    test "$(cat file1)" = "$H2"
-	else
-	    test_must_fail git reset --$opt $T
-	fi
-    
-HEAD is now at 4bb0b07 C
-Unstaged changes after reset:
-M	file1
-ok 28 - check: B C C C --mixed B C C
+	rm -fr bare1 bare2 subdir &&
+	git init --bare bare1 &&
+	git clone --local --bare . bare2 &&
+	mkdir subdir &&
+	cp -r bare2 subdir/bare3 &&
+	git clean -f -d &&
+	test_path_is_missing bare1 &&
+	test_path_is_missing bare2 &&
+	test_path_is_missing subdir
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7300-clean/bare1/
+Cloning into bare repository 'bare2'...
+done.
+Removing bare1/
+Removing bare2/
+Skipping repository baz/boo
+Skipping repository empty_repo/
+Skipping repository foo/
+Skipping repository repo/
+Skipping repository sub2/
+Removing subdir/
+ok 34 - nested bare repositories should be cleaned
+
+checking known breakage: 
+	rm -fr strange_bare &&
+	mkdir strange_bare &&
+	git init --bare strange_bare/.git &&
+	git clean -f -d &&
+	test_path_is_missing strange_bare
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7300-clean/strange_bare/.git/
+Skipping repository baz/boo
+Skipping repository empty_repo/
+Skipping repository foo/
+Skipping repository repo/
+Skipping repository strange_bare/
+Skipping repository sub2/
+Path exists:
+drwxrwxr-x 3 pbuilder2 pbuilder2 60 Jan  5 11:49 strange_bare
+strange_bare
+not ok 35 - nested (empty) bare repositories should be cleaned even when in .git # TODO known breakage
+
+checking known breakage: 
+	rm -fr strange_bare &&
+	mkdir strange_bare &&
+	git clone --local --bare . strange_bare/.git &&
+	git clean -f -d &&
+	test_path_is_missing strange_bare
+
+Cloning into bare repository 'strange_bare/.git'...
+done.
+Skipping repository baz/boo
+Skipping repository empty_repo/
+Skipping repository foo/
+Skipping repository repo/
+Skipping repository strange_bare/
+Skipping repository sub2/
+Path exists:
+drwxrwxr-x 3 pbuilder2 pbuilder2 60 Jan  5 11:49 strange_bare
+strange_bare
+not ok 36 - nested (non-empty) bare repositories should be cleaned even when in .git # TODO known breakage
 
 expecting success: 
-	git reset --hard C &&
-	if test "$I1" != "$H1"
-	then
-	    echo "$I1" >file1 &&
-	    git add file1
-	fi &&
-	if test "$W1" != "$I1"
-	then
-	    echo "$W1" >file1
-	fi &&
-	if test "$W2" != "XXXXX"
-	then
-	    git reset --$opt $T &&
-	    test "$(cat file1)" = "$W2" &&
-	    git checkout-index -f -- file1 &&
-	    test "$(cat file1)" = "$I2" &&
-	    git checkout -f HEAD -- file1 &&
-	    test "$(cat file1)" = "$H2"
-	else
-	    test_must_fail git reset --$opt $T
-	fi
-    
-HEAD is now at 4bb0b07 C
-HEAD is now at 4bb0b07 C
-ok 29 - check: B C C C --hard C C C
+	rm -fr repo &&
+	mkdir repo &&
+	(
+		cd repo &&
+		git init &&
+		mkdir -p bar/baz &&
+		test_commit msg bar/baz/hello.world
+	) &&
+	git clean -f -d repo/bar/baz &&
+	test_path_is_file repo/.git/HEAD &&
+	test_path_is_dir repo/bar/ &&
+	test_path_is_missing repo/bar/baz
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7300-clean/repo/.git/
+[master (root-commit) 14dba50] msg
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 bar/baz/hello.world
+Removing repo/bar/baz/
+ok 37 - giving path in nested git work tree will remove it
 
 expecting success: 
-	git reset --hard C &&
-	if test "$I1" != "$H1"
-	then
-	    echo "$I1" >file1 &&
-	    git add file1
-	fi &&
-	if test "$W1" != "$I1"
-	then
-	    echo "$W1" >file1
-	fi &&
-	if test "$W2" != "XXXXX"
-	then
-	    git reset --$opt $T &&
-	    test "$(cat file1)" = "$W2" &&
-	    git checkout-index -f -- file1 &&
-	    test "$(cat file1)" = "$I2" &&
-	    git checkout -f HEAD -- file1 &&
-	    test "$(cat file1)" = "$H2"
-	else
-	    test_must_fail git reset --$opt $T
-	fi
-    
-HEAD is now at 4bb0b07 C
-ok 30 - check: B C C C --merge B C C
+	rm -fr repo &&
+	mkdir repo untracked &&
+	(
+		cd repo &&
+		git init &&
+		test_commit msg hello.world
+	) &&
+	git clean -f -d repo/.git &&
+	test_path_is_file repo/.git/HEAD &&
+	test_path_is_dir repo/.git/refs &&
+	test_path_is_dir repo/.git/objects &&
+	test_path_is_dir untracked/
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7300-clean/repo/.git/
+[master (root-commit) 1af9d3b] msg
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 hello.world
+ok 38 - giving path to nested .git will not remove it
 
 expecting success: 
-	git reset --hard C &&
-	if test "$I1" != "$H1"
-	then
-	    echo "$I1" >file1 &&
-	    git add file1
-	fi &&
-	if test "$W1" != "$I1"
-	then
-	    echo "$W1" >file1
-	fi &&
-	if test "$W2" != "XXXXX"
-	then
-	    git reset --$opt $T &&
-	    test "$(cat file1)" = "$W2" &&
-	    git checkout-index -f -- file1 &&
-	    test "$(cat file1)" = "$I2" &&
-	    git checkout -f HEAD -- file1 &&
-	    test "$(cat file1)" = "$H2"
-	else
-	    test_must_fail git reset --$opt $T
-	fi
-    
-HEAD is now at 4bb0b07 C
-ok 31 - check: B C C C --keep B C C
+	rm -fr repo untracked &&
+	mkdir repo untracked &&
+	(
+		cd repo &&
+		git init &&
+		test_commit msg hello.world
+	) &&
+	git clean -f -d repo/.git/ &&
+	test_path_is_dir repo/.git &&
+	test_dir_is_empty repo/.git &&
+	test_path_is_dir untracked/
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7300-clean/repo/.git/
+[master (root-commit) 1af9d3b] msg
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 hello.world
+Removing repo/.git/COMMIT_EDITMSG
+Removing repo/.git/HEAD
+Removing repo/.git/branches/
+Removing repo/.git/config
+Removing repo/.git/description
+Removing repo/.git/hooks/
+Removing repo/.git/index
+Removing repo/.git/info/
+Removing repo/.git/logs/
+Removing repo/.git/objects/
+Removing repo/.git/refs/
+ok 39 - giving path to nested .git/ will remove contents
 
 expecting success: 
-    git reset --hard C &&
-    git branch branch1 &&
-    git branch branch2 &&
-    git checkout branch1 &&
-    test_commit B1 file1 &&
-    git checkout branch2 &&
-    test_commit B file1
+	rm -fr foo bar baz &&
+	mkdir -p foo bar baz/boo &&
+	(
+		cd foo &&
+		git init &&
+		test_commit nested hello.world
+	) &&
+	(
+		cd bar &&
+		>goodbye.people
+	) &&
+	(
+		cd baz/boo &&
+		git init &&
+		test_commit deeply.nested deeper.world
+	) &&
+	git clean -f -f -d &&
+	! test -d foo &&
+	! test -d bar &&
+	! test -d baz
 
-HEAD is now at 4bb0b07 C
-Switched to branch 'branch1'
-[branch1 5456cd2] B1
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7300-clean/foo/.git/
+[master (root-commit) abd8674] nested
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to branch 'branch2'
-[branch2 aa272d3] B
+ 1 file changed, 1 insertion(+)
+ create mode 100644 hello.world
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7300-clean/baz/boo/.git/
+[master (root-commit) 3f7f1fc] deeply.nested
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 32 - setting up branches to test with unmerged entries
+ 1 file changed, 1 insertion(+)
+ create mode 100644 deeper.world
+Removing bar/
+Removing baz/
+Removing empty_repo/
+Removing foo/
+Removing repo/
+Removing strange_bare/
+Removing sub2/
+Removing untracked/
+ok 40 - force removal of nested git work tree
 
 expecting success: 
-	git reset --hard B &&
-	test_must_fail git merge branch1 &&
-	cat file1 >X_file1 &&
-	if test "$W2" != "XXXXX"
-	then
-	    git reset --$opt $T &&
-	    if test "$W2" = "X"
-	    then
-		test_cmp file1 X_file1
-	    else
-		test "$(cat file1)" = "$W2"
-	    fi &&
-	    git checkout-index -f -- file1 &&
-	    test "$(cat file1)" = "$I2" &&
-	    git checkout -f HEAD -- file1 &&
-	    test "$(cat file1)" = "$H2"
-	else
-	    test_must_fail git reset --$opt $T
-	fi
-    
-HEAD is now at aa272d3 B
-Merging:
-aa272d3 B
-virtual branch1
-found 1 common ancestor:
-4bb0b07 C
-Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-Automatic merge failed; fix conflicts and then commit the result.
-fatal: Cannot do a soft reset in the middle of a merge.
-ok 33 - check: X U B C --soft XXXXX  
+	rm -fr repo &&
+	mkdir repo &&
+	(
+		cd repo &&
+		git init &&
+		touch known 1 2 3 &&
+		git add known &&
+		git clean -f -e 1 -e 2 &&
+		test -e 1 &&
+		test -e 2 &&
+		! (test -e 3) &&
+		test -e known
+	)
 
-expecting success: 
-	git reset --hard B &&
-	test_must_fail git merge branch1 &&
-	cat file1 >X_file1 &&
-	if test "$W2" != "XXXXX"
-	then
-	    git reset --$opt $T &&
-	    if test "$W2" = "X"
-	    then
-		test_cmp file1 X_file1
-	    else
-		test "$(cat file1)" = "$W2"
-	    fi &&
-	    git checkout-index -f -- file1 &&
-	    test "$(cat file1)" = "$I2" &&
-	    git checkout -f HEAD -- file1 &&
-	    test "$(cat file1)" = "$H2"
-	else
-	    test_must_fail git reset --$opt $T
-	fi
-    
-HEAD is now at aa272d3 B
-Merging:
-aa272d3 B
-virtual branch1
-found 1 common ancestor:
-4bb0b07 C
-Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-Automatic merge failed; fix conflicts and then commit the result.
-Unstaged changes after reset:
-M	file1
-ok 34 - check: X U B C --mixed X C C
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7300-clean/repo/.git/
+Removing 3
+ok 41 - git clean -e
 
 expecting success: 
-	git reset --hard B &&
-	test_must_fail git merge branch1 &&
-	cat file1 >X_file1 &&
-	if test "$W2" != "XXXXX"
-	then
-	    git reset --$opt $T &&
-	    if test "$W2" = "X"
-	    then
-		test_cmp file1 X_file1
-	    else
-		test "$(cat file1)" = "$W2"
-	    fi &&
-	    git checkout-index -f -- file1 &&
-	    test "$(cat file1)" = "$I2" &&
-	    git checkout -f HEAD -- file1 &&
-	    test "$(cat file1)" = "$H2"
-	else
-	    test_must_fail git reset --$opt $T
-	fi
-    
-HEAD is now at aa272d3 B
-Merging:
-aa272d3 B
-virtual branch1
-found 1 common ancestor:
-4bb0b07 C
-Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-Automatic merge failed; fix conflicts and then commit the result.
-HEAD is now at 4bb0b07 C
-ok 35 - check: X U B C --hard C C C
+	mkdir foo &&
+	chmod a= foo &&
+	git clean -dfx foo &&
+	! test -d foo
 
-expecting success: 
-	git reset --hard B &&
-	test_must_fail git merge branch1 &&
-	cat file1 >X_file1 &&
-	if test "$W2" != "XXXXX"
-	then
-	    git reset --$opt $T &&
-	    if test "$W2" = "X"
-	    then
-		test_cmp file1 X_file1
-	    else
-		test "$(cat file1)" = "$W2"
-	    fi &&
-	    git checkout-index -f -- file1 &&
-	    test "$(cat file1)" = "$I2" &&
-	    git checkout -f HEAD -- file1 &&
-	    test "$(cat file1)" = "$H2"
-	else
-	    test_must_fail git reset --$opt $T
-	fi
-    
-HEAD is now at aa272d3 B
-Merging:
-aa272d3 B
-virtual branch1
-found 1 common ancestor:
-4bb0b07 C
-Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-Automatic merge failed; fix conflicts and then commit the result.
-ok 36 - check: X U B C --merge C C C
+warning: could not open directory 'foo/': Permission denied
+Removing foo/
+ok 42 - git clean -d with an unreadable empty directory
 
 expecting success: 
-	git reset --hard B &&
-	test_must_fail git merge branch1 &&
-	cat file1 >X_file1 &&
-	if test "$W2" != "XXXXX"
-	then
-	    git reset --$opt $T &&
-	    if test "$W2" = "X"
-	    then
-		test_cmp file1 X_file1
-	    else
-		test "$(cat file1)" = "$W2"
-	    fi &&
-	    git checkout-index -f -- file1 &&
-	    test "$(cat file1)" = "$I2" &&
-	    git checkout -f HEAD -- file1 &&
-	    test "$(cat file1)" = "$H2"
-	else
-	    test_must_fail git reset --$opt $T
-	fi
-    
-HEAD is now at aa272d3 B
-Merging:
-aa272d3 B
-virtual branch1
-found 1 common ancestor:
-4bb0b07 C
-Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-Automatic merge failed; fix conflicts and then commit the result.
-fatal: Cannot do a keep reset in the middle of a merge.
-ok 37 - check: X U B C --keep XXXXX  
+	mkdir -p foo &&
+	mkdir -p foobar &&
+	git clean -df foobar &&
+	test_path_is_dir foo &&
+	test_path_is_missing foobar
 
-expecting success: 
-	git reset --hard B &&
-	test_must_fail git merge branch1 &&
-	cat file1 >X_file1 &&
-	if test "$W2" != "XXXXX"
-	then
-	    git reset --$opt $T &&
-	    if test "$W2" = "X"
-	    then
-		test_cmp file1 X_file1
-	    else
-		test "$(cat file1)" = "$W2"
-	    fi &&
-	    git checkout-index -f -- file1 &&
-	    test "$(cat file1)" = "$I2" &&
-	    git checkout -f HEAD -- file1 &&
-	    test "$(cat file1)" = "$H2"
-	else
-	    test_must_fail git reset --$opt $T
-	fi
-    
-HEAD is now at aa272d3 B
-Merging:
-aa272d3 B
-virtual branch1
-found 1 common ancestor:
-4bb0b07 C
-Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-Automatic merge failed; fix conflicts and then commit the result.
-fatal: Cannot do a soft reset in the middle of a merge.
-ok 38 - check: X U B B --soft XXXXX  
+Removing foobar/
+ok 43 - git clean -d respects pathspecs (dir is prefix of pathspec)
 
 expecting success: 
-	git reset --hard B &&
-	test_must_fail git merge branch1 &&
-	cat file1 >X_file1 &&
-	if test "$W2" != "XXXXX"
-	then
-	    git reset --$opt $T &&
-	    if test "$W2" = "X"
-	    then
-		test_cmp file1 X_file1
-	    else
-		test "$(cat file1)" = "$W2"
-	    fi &&
-	    git checkout-index -f -- file1 &&
-	    test "$(cat file1)" = "$I2" &&
-	    git checkout -f HEAD -- file1 &&
-	    test "$(cat file1)" = "$H2"
-	else
-	    test_must_fail git reset --$opt $T
-	fi
-    
-HEAD is now at aa272d3 B
-Merging:
-aa272d3 B
-virtual branch1
-found 1 common ancestor:
-4bb0b07 C
-Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-Automatic merge failed; fix conflicts and then commit the result.
-Unstaged changes after reset:
-M	file1
-ok 39 - check: X U B B --mixed X B B
+	mkdir -p foo &&
+	mkdir -p foobar &&
+	git clean -df foo &&
+	test_path_is_missing foo &&
+	test_path_is_dir foobar
 
-expecting success: 
-	git reset --hard B &&
-	test_must_fail git merge branch1 &&
-	cat file1 >X_file1 &&
-	if test "$W2" != "XXXXX"
-	then
-	    git reset --$opt $T &&
-	    if test "$W2" = "X"
-	    then
-		test_cmp file1 X_file1
-	    else
-		test "$(cat file1)" = "$W2"
-	    fi &&
-	    git checkout-index -f -- file1 &&
-	    test "$(cat file1)" = "$I2" &&
-	    git checkout -f HEAD -- file1 &&
-	    test "$(cat file1)" = "$H2"
-	else
-	    test_must_fail git reset --$opt $T
-	fi
-    
-HEAD is now at aa272d3 B
-Merging:
-aa272d3 B
-virtual branch1
-found 1 common ancestor:
-4bb0b07 C
-Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-Automatic merge failed; fix conflicts and then commit the result.
-HEAD is now at aa272d3 B
-ok 40 - check: X U B B --hard B B B
+Removing foo/
+ok 44 - git clean -d respects pathspecs (pathspec is prefix of dir)
 
 expecting success: 
-	git reset --hard B &&
-	test_must_fail git merge branch1 &&
-	cat file1 >X_file1 &&
-	if test "$W2" != "XXXXX"
-	then
-	    git reset --$opt $T &&
-	    if test "$W2" = "X"
-	    then
-		test_cmp file1 X_file1
-	    else
-		test "$(cat file1)" = "$W2"
-	    fi &&
-	    git checkout-index -f -- file1 &&
-	    test "$(cat file1)" = "$I2" &&
-	    git checkout -f HEAD -- file1 &&
-	    test "$(cat file1)" = "$H2"
-	else
-	    test_must_fail git reset --$opt $T
-	fi
-    
-HEAD is now at aa272d3 B
-Merging:
-aa272d3 B
-virtual branch1
-found 1 common ancestor:
-4bb0b07 C
-Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-Automatic merge failed; fix conflicts and then commit the result.
-ok 41 - check: X U B B --merge B B B
+	echo /foo/bar >.gitignore &&
+	echo ignoreme >>.gitignore &&
+	rm -rf foo &&
+	mkdir -p foo/a/aa/aaa foo/b/bb/bbb &&
+	touch foo/bar foo/baz foo/a/aa/ignoreme foo/b/ignoreme foo/b/bb/1 foo/b/bb/2 &&
+	git clean -df &&
+	test_path_is_dir foo &&
+	test_path_is_file foo/bar &&
+	test_path_is_missing foo/baz &&
+	test_path_is_file foo/a/aa/ignoreme &&
+	test_path_is_missing foo/a/aa/aaa &&
+	test_path_is_file foo/b/ignoreme &&
+	test_path_is_missing foo/b/bb
 
-expecting success: 
-	git reset --hard B &&
-	test_must_fail git merge branch1 &&
-	cat file1 >X_file1 &&
-	if test "$W2" != "XXXXX"
-	then
-	    git reset --$opt $T &&
-	    if test "$W2" = "X"
-	    then
-		test_cmp file1 X_file1
-	    else
-		test "$(cat file1)" = "$W2"
-	    fi &&
-	    git checkout-index -f -- file1 &&
-	    test "$(cat file1)" = "$I2" &&
-	    git checkout -f HEAD -- file1 &&
-	    test "$(cat file1)" = "$H2"
-	else
-	    test_must_fail git reset --$opt $T
-	fi
-    
-HEAD is now at aa272d3 B
-Merging:
-aa272d3 B
-virtual branch1
-found 1 common ancestor:
-4bb0b07 C
-Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-Automatic merge failed; fix conflicts and then commit the result.
-fatal: Cannot do a keep reset in the middle of a merge.
-ok 42 - check: X U B B --keep XXXXX  
+Removing build/
+Removing foo/a/aa/aaa/
+Removing foo/b/bb/
+Removing foo/baz
+Removing foobar/
+Removing obj.o
+Skipping repository repo/
+ok 45 - git clean -d skips untracked dirs containing ignored files
 
-# passed all 42 test(s)
-1..42
+# still have 2 known breakage(s)
+# passed all remaining 43 test(s)
+1..45
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
 *** t7004-tag.sh ***
@@ -269259,1501 +266328,4967 @@
 
 ok 194 - set up color tests
 
-expecting success: 
-	TERM=vt100 git tag $color_args >actual.raw &&
-	test_decode_color <actual.raw >actual &&
-	test_cmp expect.bare actual
+expecting success: 
+	TERM=vt100 git tag $color_args >actual.raw &&
+	test_decode_color <actual.raw >actual &&
+	test_cmp expect.bare actual
+
+ok 195 - %(color) omitted without tty
+
+checking prerequisite: TTY
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
+	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: 
+	test_terminal git tag $color_args >actual.raw &&
+	test_decode_color <actual.raw >actual &&
+	test_cmp expect.color actual
+
+ok 196 - %(color) present with tty
+
+expecting success: 
+	git tag --color $color_args >actual.raw &&
+	test_decode_color <actual.raw >actual &&
+	test_cmp expect.color actual
+
+ok 197 - --color overrides auto-color
+
+expecting success: 
+	git -c color.ui=always tag $color_args >actual.raw &&
+	test_decode_color <actual.raw >actual &&
+	test_cmp expect.color actual
+
+ok 198 - color.ui=always overrides auto-color
+
+expecting success: 
+	git tag mergetest-1 HEAD~2 &&
+	git tag mergetest-2 HEAD~1 &&
+	git tag mergetest-3 HEAD
+
+ok 199 - setup --merged test tags
+
+expecting success: 
+	cat >expect <<-\EOF &&
+	mergetest-1
+	mergetest-2
+	EOF
+	git tag --merged=mergetest-2 "mergetest*" >actual &&
+	test_cmp expect actual
+
+ok 200 - --merged can be used in non-list mode
+
+expecting success: 
+	test_must_fail git tag --merged HEAD --no-merged HEAD
+
+error: option `no-merged' is incompatible with --merged
+ok 201 - --merged is incompatible with --no-merged
+
+expecting success: 
+	cat >expect <<-\EOF &&
+	mergetest-1
+	mergetest-2
+	EOF
+	git tag -l --merged=mergetest-2 mergetest-* >actual &&
+	test_cmp expect actual
+
+ok 202 - --merged shows merged tags
+
+expecting success: 
+	cat >expect <<-\EOF &&
+	mergetest-3
+	EOF
+	git tag -l --no-merged=mergetest-2 mergetest-* >actual &&
+	test_cmp expect actual
+
+ok 203 - --no-merged show unmerged tags
+
+expecting success: 
+	git tag --no-merged=mergetest-2 mergetest-* >actual &&
+	test_cmp expect actual
+
+ok 204 - --no-merged can be used in non-list mode
+
+expecting success: 
+	git tag ambiguous &&
+	git branch ambiguous &&
+	echo ambiguous >expect &&
+	git tag -l ambiguous >actual &&
+	test_cmp expect actual
+
+ok 205 - ambiguous branch/tags not marked
+
+expecting success: 
+	(
+		git init no-contains &&
+		cd no-contains &&
+		test_commit v0.1 &&
+		test_commit v0.2 &&
+		test_commit v0.3 &&
+		test_commit v0.4 &&
+		test_commit v0.5 &&
+		cat >expected <<-\EOF &&
+		v0.2
+		v0.3
+		v0.4
+		EOF
+		git tag --contains v0.2 --no-contains v0.5 >actual &&
+		test_cmp expected actual
+	)
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7004-tag/no-contains/.git/
+[master (root-commit) fdf35a1] v0.1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 v0.1.t
+[master 82f1d18] v0.2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 v0.2.t
+[master 4c097b6] v0.3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 v0.3.t
+[master 8804202] v0.4
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 v0.4.t
+[master 947a091] v0.5
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 v0.5.t
+ok 206 - --contains combined with --no-contains
+
+expecting success: 
+	cd no-contains &&
+	blob=$(git rev-parse v0.3:v0.3.t) &&
+	tree=$(git rev-parse v0.3^{tree}) &&
+	git tag tag-blob $blob &&
+	git tag tag-tree $tree &&
+	git tag --contains v0.3 >actual &&
+	cat >expected <<-\EOF &&
+	v0.3
+	v0.4
+	v0.5
+	EOF
+	test_cmp expected actual &&
+	git tag --no-contains v0.3 >actual &&
+	cat >expected <<-\EOF &&
+	v0.1
+	v0.2
+	EOF
+	test_cmp expected actual
+
+ok 207 - Does --[no-]contains stop at commits? Yes!
+
+# passed all 207 test(s)
+1..207
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t6041-bisect-submodule.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6041-bisect-submodule/.git/
+expecting success: 
+		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/git-2.20.1/t/trash directory.t6041-bisect-submodule/submodule_update_sub1/.git/
+[master (root-commit) c9a0cf8] 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/git-2.20.1/t/trash directory.t6041-bisect-submodule/submodule_update_sub2/.git/
+[master (root-commit) da87b88] 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/git-2.20.1/t/trash directory.t6041-bisect-submodule/submodule_update_repo/.git/
+[master (root-commit) e72495d] 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/git-2.20.1/t/trash directory.t6041-bisect-submodule/submodule_update_repo/sub1'...
+done.
+Cloning into '/build/git-2.20.1/t/trash directory.t6041-bisect-submodule/submodule_update_repo/uninitialized_sub'...
+done.
+[add_sub1 e3fdd99] 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'
+Removing uninitialized_sub
+Removing sub1
+Removing .gitmodules
+[remove_sub1 1fa62e7] Revert "Add sub1"
+ Author: A U Thor <author@example.com>
+ Date: Thu Jan 5 11:49:33 2023 +0000
+ 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 e61a9fe] 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/git-2.20.1/t/trash directory.t6041-bisect-submodule/submodule_update_sub1
+ * [new branch]      modifications -> modifications
+[modify_sub1 9ebc294] 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/git-2.20.1/t/trash directory.t6041-bisect-submodule/submodule_update_repo/sub1/sub2'...
+done.
+[add_nested_sub 472dd09] 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 baf7aa2] 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 3b4c025] 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 08a711b] update nested sub
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[modify_sub1_recursively 6eef6dc] update sub1, that updates nested sub
+ Author: A U Thor <author@example.com>
+To /build/git-2.20.1/t/trash directory.t6041-bisect-submodule/submodule_update_sub1
+ * [new branch]      modify_sub1_recursively -> modify_sub1_recursively
+To /build/git-2.20.1/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 'c9a0cf82af566f320ac3203f2f224ceeb76a7d26'
+Previous HEAD position was c9a0cf8 Base inside first submodule
+Switched to branch 'modifications'
+rm 'sub1'
+[replace_sub1_with_directory 4e7da7e] 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'
+Removing sub1/file3
+Removing sub1/file2
+Removing sub1/file1
+Adding sub1
+[replace_directory_with_sub1 efb682a] Revert "Replace sub1 with directory"
+ Author: A U Thor <author@example.com>
+ Date: Thu Jan 5 11:49:34 2023 +0000
+ 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 08c2690] 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 0eb4b48] Revert "Replace sub1 with file"
+ Author: A U Thor <author@example.com>
+ Date: Thu Jan 5 11:49:35 2023 +0000
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+ mode change 100644 => 160000 sub1
+Switched to a new branch 'invalid_sub1'
+[invalid_sub1 62e18de] Invalid sub1 commit
+ Author: A U Thor <author@example.com>
+Switched to a new branch 'valid_sub1'
+[valid_sub1 1223289] Revert "Invalid sub1 commit"
+ Author: A U Thor <author@example.com>
+ Date: Thu Jan 5 11:49:35 2023 +0000
+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 remote branch 'no_submodule' from 'origin'.
+Branch 'add_sub1' set up to track remote branch 'add_sub1' from 'origin'.
+Switched to branch 'add_sub1'
+Your branch is up to date with 'origin/add_sub1'.
+[add_sub1 7e04339] bisect bad
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 bar
+HEAD is now at e72495d Base
+Bisecting: 0 revisions left to test after this (roughly 0 steps)
+[e3fdd990ca8f39b72a104bfd38589d046cd192c1] Add sub1
+Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t6041-bisect-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/git-2.20.1/t/trash directory.t6041-bisect-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/git-2.20.1/t/trash directory.t6041-bisect-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/git-2.20.1/t/trash directory.t6041-bisect-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out 'c9a0cf82af566f320ac3203f2f224ceeb76a7d26'
+Submodule path 'uninitialized_sub': checked out 'c9a0cf82af566f320ac3203f2f224ceeb76a7d26'
+ok 1 - git_bisect: added submodule creates empty directory
+
+expecting success: 
+		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 remote branch 'no_submodule' from 'origin'.
+Branch 'add_sub1' set up to track remote branch 'add_sub1' from 'origin'.
+Switched to branch 'add_sub1'
+Your branch is up to date with 'origin/add_sub1'.
+[add_sub1 a021057] bisect bad
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 bar
+HEAD is now at e72495d Base
+Bisecting: 0 revisions left to test after this (roughly 0 steps)
+[e3fdd990ca8f39b72a104bfd38589d046cd192c1] Add sub1
+Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t6041-bisect-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/git-2.20.1/t/trash directory.t6041-bisect-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/git-2.20.1/t/trash directory.t6041-bisect-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/git-2.20.1/t/trash directory.t6041-bisect-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out 'c9a0cf82af566f320ac3203f2f224ceeb76a7d26'
+Submodule path 'uninitialized_sub': checked out 'c9a0cf82af566f320ac3203f2f224ceeb76a7d26'
+ok 2 - git_bisect: added submodule leaves existing empty directory alone
+
+expecting success: 
+		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 remote branch 'replace_sub1_with_file' from 'origin'.
+fatal: Needed a single revision
+Branch 'replace_file_with_sub1' set up to track remote branch 'replace_file_with_sub1' from 'origin'.
+Switched to branch 'replace_file_with_sub1'
+Your branch is up to date with 'origin/replace_file_with_sub1'.
+[replace_file_with_sub1 c72d1db] bisect bad
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 bar
+HEAD is now at 08c2690 Replace sub1 with file
+Bisecting: 0 revisions left to test after this (roughly 0 steps)
+[0eb4b48a64a32d169d5a1dd8e979f3c26a9d7c6e] Revert "Replace sub1 with file"
+Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t6041-bisect-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/git-2.20.1/t/trash directory.t6041-bisect-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/git-2.20.1/t/trash directory.t6041-bisect-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/git-2.20.1/t/trash directory.t6041-bisect-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out 'c9a0cf82af566f320ac3203f2f224ceeb76a7d26'
+Submodule path 'uninitialized_sub': checked out 'c9a0cf82af566f320ac3203f2f224ceeb76a7d26'
+ok 3 - git_bisect: replace tracked file with submodule creates empty directory
+
+expecting success: 
+		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 remote branch 'replace_sub1_with_directory' from 'origin'.
+fatal: Needed a single revision
+Branch 'replace_directory_with_sub1' set up to track remote branch 'replace_directory_with_sub1' from 'origin'.
+Switched to branch 'replace_directory_with_sub1'
+Your branch is up to date with 'origin/replace_directory_with_sub1'.
+[replace_directory_with_sub1 c8b56b8] bisect bad
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 bar
+HEAD is now at 4e7da7e Replace sub1 with directory
+Bisecting: 0 revisions left to test after this (roughly 0 steps)
+[efb682ab45649eef261293cdf8f3f6a06a6dd80e] Revert "Replace sub1 with directory"
+Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t6041-bisect-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/git-2.20.1/t/trash directory.t6041-bisect-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/git-2.20.1/t/trash directory.t6041-bisect-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/git-2.20.1/t/trash directory.t6041-bisect-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out 'c9a0cf82af566f320ac3203f2f224ceeb76a7d26'
+Submodule path 'uninitialized_sub': checked out 'c9a0cf82af566f320ac3203f2f224ceeb76a7d26'
+ok 4 - git_bisect: replace directory with submodule
+
+expecting success: 
+		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 remote branch 'add_sub1' from 'origin'.
+Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t6041-bisect-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/git-2.20.1/t/trash directory.t6041-bisect-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out 'c9a0cf82af566f320ac3203f2f224ceeb76a7d26'
+Branch 'remove_sub1' set up to track remote branch 'remove_sub1' from 'origin'.
+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 daeb031] bisect bad
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 bar
+HEAD is now at e3fdd99 Add sub1
+Bisecting: 0 revisions left to test after this (roughly 0 steps)
+warning: unable to rmdir 'sub1': Directory not empty
+[1fa62e75f6cff951db5e9903cdbe60ea3d70c6d4] Revert "Add sub1"
+ok 5 - git_bisect: removed submodule leaves submodule directory and its contents in place
+
+expecting success: 
+		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 remote branch 'add_sub1' from 'origin'.
+Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t6041-bisect-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/git-2.20.1/t/trash directory.t6041-bisect-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out 'c9a0cf82af566f320ac3203f2f224ceeb76a7d26'
+Branch 'remove_sub1' set up to track remote branch 'remove_sub1' from 'origin'.
+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 253681c] bisect bad
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 bar
+HEAD is now at e3fdd99 Add sub1
+Bisecting: 0 revisions left to test after this (roughly 0 steps)
+warning: unable to rmdir 'sub1': Directory not empty
+[1fa62e75f6cff951db5e9903cdbe60ea3d70c6d4] Revert "Add sub1"
+ok 6 - git_bisect: removed submodule leaves submodule containing a .git directory alone
+
+expecting success: 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
+			test_must_fail $command replace_sub1_with_directory &&
+			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 remote branch 'add_sub1' from 'origin'.
+Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t6041-bisect-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/git-2.20.1/t/trash directory.t6041-bisect-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out 'c9a0cf82af566f320ac3203f2f224ceeb76a7d26'
+Branch 'replace_sub1_with_directory' set up to track remote branch 'replace_sub1_with_directory' from 'origin'.
+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: 
+		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 &&
+			test_must_fail $command replace_sub1_with_directory &&
+			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 remote branch 'add_sub1' from 'origin'.
+Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t6041-bisect-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/git-2.20.1/t/trash directory.t6041-bisect-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out 'c9a0cf82af566f320ac3203f2f224ceeb76a7d26'
+Branch 'replace_sub1_with_directory' set up to track remote branch 'replace_sub1_with_directory' from 'origin'.
+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: 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
+			test_must_fail $command replace_sub1_with_file &&
+			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 remote branch 'add_sub1' from 'origin'.
+Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t6041-bisect-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/git-2.20.1/t/trash directory.t6041-bisect-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out 'c9a0cf82af566f320ac3203f2f224ceeb76a7d26'
+Branch 'replace_sub1_with_file' set up to track remote branch 'replace_sub1_with_file' from 'origin'.
+Switched to branch 'replace_sub1_with_file'
+Your branch is up to date with 'origin/replace_sub1_with_file'.
+[replace_sub1_with_file a864a4a] bisect bad
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 bar
+HEAD is now at e3fdd99 Add sub1
+Submodule path 'sub1': checked out 'c9a0cf82af566f320ac3203f2f224ceeb76a7d26'
+Bisecting: 0 revisions left to test after this (roughly 0 steps)
+[08c2690e6d87079e4e2a99dca7a697e05e10da48] Replace sub1 with file
+test_must_fail: command succeeded: git_bisect replace_sub1_with_file
+not ok 9 - git_bisect: replace submodule with a file must fail # TODO known breakage
+
+checking known breakage: 
+		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 &&
+			test_must_fail $command replace_sub1_with_file &&
+			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 remote branch 'add_sub1' from 'origin'.
+Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t6041-bisect-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/git-2.20.1/t/trash directory.t6041-bisect-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out 'c9a0cf82af566f320ac3203f2f224ceeb76a7d26'
+Branch 'replace_sub1_with_file' set up to track remote branch 'replace_sub1_with_file' from 'origin'.
+Switched to branch 'replace_sub1_with_file'
+Your branch is up to date with 'origin/replace_sub1_with_file'.
+[replace_sub1_with_file 29277f7] bisect bad
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 bar
+HEAD is now at e3fdd99 Add sub1
+Submodule path 'sub1': checked out 'c9a0cf82af566f320ac3203f2f224ceeb76a7d26'
+Bisecting: 0 revisions left to test after this (roughly 0 steps)
+[08c2690e6d87079e4e2a99dca7a697e05e10da48] Replace sub1 with file
+test_must_fail: command succeeded: git_bisect 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: 
+		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 remote branch 'add_sub1' from 'origin'.
+Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t6041-bisect-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/git-2.20.1/t/trash directory.t6041-bisect-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out 'c9a0cf82af566f320ac3203f2f224ceeb76a7d26'
+Branch 'modify_sub1' set up to track remote branch 'modify_sub1' from 'origin'.
+Switched to branch 'modify_sub1'
+Your branch is up to date with 'origin/modify_sub1'.
+[modify_sub1 f571ebc] bisect bad
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 bar
+HEAD is now at e3fdd99 Add sub1
+Bisecting: 0 revisions left to test after this (roughly 0 steps)
+[9ebc294b7b5ec6d1f59c101b1c8d71d03302bcbf] Modify sub1
+Submodule path 'sub1': checked out 'e61a9fe12a9523e5649e7b14e86d7ae54e90077b'
+ok 11 - git_bisect: modified submodule does not update submodule work tree
+
+expecting success: 
+		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 remote branch 'add_sub1' from 'origin'.
+Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t6041-bisect-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/git-2.20.1/t/trash directory.t6041-bisect-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out 'c9a0cf82af566f320ac3203f2f224ceeb76a7d26'
+Branch 'invalid_sub1' set up to track remote branch 'invalid_sub1' from 'origin'.
+Switched to branch 'invalid_sub1'
+Your branch is up to date with 'origin/invalid_sub1'.
+[invalid_sub1 c9048d8] bisect bad
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 bar
+HEAD is now at e3fdd99 Add sub1
+Bisecting: 0 revisions left to test after this (roughly 0 steps)
+[62e18de40f988005e11c048e27f5d2bde8aeb3cd] Invalid sub1 commit
+error: Server does not allow request for unadvertised object 0123456789012345678901234567890123456789
+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: 
+		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 remote branch 'invalid_sub1' from 'origin'.
+fatal: Needed a single revision
+Branch 'valid_sub1' set up to track remote branch 'valid_sub1' from 'origin'.
+Switched to branch 'valid_sub1'
+Your branch is up to date with 'origin/valid_sub1'.
+[valid_sub1 e8160ac] bisect bad
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 bar
+HEAD is now at 62e18de Invalid sub1 commit
+Bisecting: 0 revisions left to test after this (roughly 0 steps)
+[12232896bd30c73714aa45063af2513cfcfc5d74] Revert "Invalid sub1 commit"
+Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t6041-bisect-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/git-2.20.1/t/trash directory.t6041-bisect-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/git-2.20.1/t/trash directory.t6041-bisect-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/git-2.20.1/t/trash directory.t6041-bisect-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out 'c9a0cf82af566f320ac3203f2f224ceeb76a7d26'
+Submodule path 'uninitialized_sub': checked out 'c9a0cf82af566f320ac3203f2f224ceeb76a7d26'
+ok 13 - git_bisect: modified submodule does not update submodule work tree from invalid commit
+
+expecting success: 
+		prolog &&
+		reset_work_tree_to 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 remote branch 'no_submodule' from 'origin'.
+Branch 'add_sub1' set up to track remote branch 'add_sub1' from 'origin'.
+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/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t6043-merge-rename-directories.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6043-merge-rename-directories/.git/
+expecting success: 
+	test_create_repo 1a &&
+	(
+		cd 1a &&
+
+		mkdir z &&
+		echo b >z/b &&
+		echo c >z/c &&
+		git add z &&
+		test_tick &&
+		git commit -m "O" &&
+
+		git branch O &&
+		git branch A &&
+		git branch B &&
+
+		git checkout A &&
+		git mv z y &&
+		test_tick &&
+		git commit -m "A" &&
+
+		git checkout B &&
+		echo d >z/d &&
+		mkdir z/e &&
+		echo f >z/e/f &&
+		git add z/d z/e/f &&
+		test_tick &&
+		git commit -m "B"
+	)
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6043-merge-rename-directories/1a/.git/
+[master (root-commit) 4e96174] O
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 z/b
+ create mode 100644 z/c
+Switched to branch 'A'
+[A 4e9f86d] A
+ Author: A U Thor <author@example.com>
+ 2 files changed, 0 insertions(+), 0 deletions(-)
+ rename {z => y}/b (100%)
+ rename {z => y}/c (100%)
+Switched to branch 'B'
+[B aa97264] B
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 z/d
+ create mode 100644 z/e/f
+ok 1 - 1a-setup: Simple directory rename detection
+
+expecting success: 
+	(
+		cd 1a &&
+
+		git checkout A^0 &&
+
+		git merge -s recursive B^0 &&
+
+		git ls-files -s >out &&
+		test_line_count = 4 out &&
+
+		git rev-parse >actual \
+			HEAD:y/b HEAD:y/c HEAD:y/d HEAD:y/e/f &&
+		git rev-parse >expect \
+			O:z/b    O:z/c    B:z/d    B:z/e/f &&
+		test_cmp expect actual &&
+
+		git hash-object y/d >actual &&
+		git rev-parse B:z/d >expect &&
+		test_cmp expect actual &&
+
+		test_must_fail git rev-parse HEAD:z/d &&
+		test_must_fail git rev-parse HEAD:z/e/f &&
+		test_path_is_missing z/d &&
+		test_path_is_missing z/e/f
+	)
+
+Note: checking out '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 performing another checkout.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -b with the checkout command again. Example:
+
+  git checkout -b <new-branch-name>
+
+HEAD is now at 4e9f86d A
+Merging:
+4e9f86d A
+virtual B^0
+found 1 common ancestor:
+4e96174 O
+Skipped y/c (merged same as existing)
+Skipped y/b (merged same as existing)
+Merge made by the 'recursive' strategy.
+ y/d   | 1 +
+ y/e/f | 1 +
+ 2 files changed, 2 insertions(+)
+ create mode 100644 y/d
+ create mode 100644 y/e/f
+fatal: Path 'z/d' does not exist in 'HEAD'
+HEAD:z/d
+fatal: Path 'z/e/f' does not exist in 'HEAD'
+HEAD:z/e/f
+ok 2 - 1a-check: Simple directory rename detection
+
+expecting success: 
+	test_create_repo 1b &&
+	(
+		cd 1b &&
+
+		mkdir z &&
+		echo b >z/b &&
+		echo c >z/c &&
+		mkdir y &&
+		echo d >y/d &&
+		git add z y &&
+		test_tick &&
+		git commit -m "O" &&
+
+		git branch O &&
+		git branch A &&
+		git branch B &&
+
+		git checkout A &&
+		echo e >z/e &&
+		git add z/e &&
+		test_tick &&
+		git commit -m "A" &&
+
+		git checkout B &&
+		git mv z/b y &&
+		git mv z/c y &&
+		rmdir z &&
+		test_tick &&
+		git commit -m "B"
+	)
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6043-merge-rename-directories/1b/.git/
+[master (root-commit) 828128d] O
+ Author: A U Thor <author@example.com>
+ 3 files changed, 3 insertions(+)
+ create mode 100644 y/d
+ create mode 100644 z/b
+ create mode 100644 z/c
+Switched to branch 'A'
+[A 62cf902] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 z/e
+Switched to branch 'B'
+[B 2a8bd7d] B
+ Author: A U Thor <author@example.com>
+ 2 files changed, 0 insertions(+), 0 deletions(-)
+ rename {z => y}/b (100%)
+ rename {z => y}/c (100%)
+ok 3 - 1b-setup: Merge a directory with another
+
+expecting success: 
+	(
+		cd 1b &&
+
+		git checkout A^0 &&
+
+		git merge -s recursive B^0 &&
+
+		git ls-files -s >out &&
+		test_line_count = 4 out &&
+
+		git rev-parse >actual \
+			HEAD:y/b HEAD:y/c HEAD:y/d HEAD:y/e &&
+		git rev-parse >expect \
+			O:z/b    O:z/c    O:y/d    A:z/e &&
+		test_cmp expect actual &&
+		test_must_fail git rev-parse HEAD:z/e
+	)
+
+Note: checking out '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 performing another checkout.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -b with the checkout command again. Example:
+
+  git checkout -b <new-branch-name>
+
+HEAD is now at 62cf902 A
+Merging:
+62cf902 A
+virtual B^0
+found 1 common ancestor:
+828128d O
+Merge made by the 'recursive' strategy.
+ {z => y}/b | 0
+ {z => y}/c | 0
+ {z => y}/e | 0
+ 3 files changed, 0 insertions(+), 0 deletions(-)
+ rename {z => y}/b (100%)
+ rename {z => y}/c (100%)
+ rename {z => y}/e (100%)
+fatal: Path 'z/e' does not exist in 'HEAD'
+HEAD:z/e
+ok 4 - 1b-check: Merge a directory with another
+
+expecting success: 
+	test_create_repo 1c &&
+	(
+		cd 1c &&
+
+		mkdir z &&
+		echo b >z/b &&
+		echo c >z/c &&
+		mkdir x &&
+		echo d >x/d &&
+		git add z x &&
+		test_tick &&
+		git commit -m "O" &&
+
+		git branch O &&
+		git branch A &&
+		git branch B &&
+
+		git checkout A &&
+		git mv z y &&
+		test_tick &&
+		git commit -m "A" &&
+
+		git checkout B &&
+		git mv x/d z/d &&
+		test_tick &&
+		git commit -m "B"
+	)
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6043-merge-rename-directories/1c/.git/
+[master (root-commit) 1e3967e] O
+ Author: A U Thor <author@example.com>
+ 3 files changed, 3 insertions(+)
+ create mode 100644 x/d
+ create mode 100644 z/b
+ create mode 100644 z/c
+Switched to branch 'A'
+[A 623f815] A
+ Author: A U Thor <author@example.com>
+ 2 files changed, 0 insertions(+), 0 deletions(-)
+ rename {z => y}/b (100%)
+ rename {z => y}/c (100%)
+Switched to branch 'B'
+[B c9f07f0] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename {x => z}/d (100%)
+ok 5 - 1c-setup: Transitive renaming
+
+expecting success: 
+	(
+		cd 1c &&
+
+		git checkout A^0 &&
+
+		git merge -s recursive B^0 &&
+
+		git ls-files -s >out &&
+		test_line_count = 3 out &&
+
+		git rev-parse >actual \
+			HEAD:y/b HEAD:y/c HEAD:y/d &&
+		git rev-parse >expect \
+			O:z/b    O:z/c    O:x/d &&
+		test_cmp expect actual &&
+		test_must_fail git rev-parse HEAD:x/d &&
+		test_must_fail git rev-parse HEAD:z/d &&
+		test_path_is_missing z/d
+	)
+
+Note: checking out '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 performing another checkout.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -b with the checkout command again. Example:
+
+  git checkout -b <new-branch-name>
+
+HEAD is now at 623f815 A
+Merging:
+623f815 A
+virtual B^0
+found 1 common ancestor:
+1e3967e O
+Skipped y/c (merged same as existing)
+Skipped y/b (merged same as existing)
+Merge made by the 'recursive' strategy.
+ {x => y}/d | 0
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename {x => y}/d (100%)
+fatal: Path 'x/d' does not exist in 'HEAD'
+HEAD:x/d
+fatal: Path 'z/d' does not exist in 'HEAD'
+HEAD:z/d
+ok 6 - 1c-check: Transitive renaming
+
+expecting success: 
+	test_create_repo 1d &&
+	(
+		cd 1d &&
+
+		mkdir z &&
+		echo b >z/b &&
+		echo c >z/c &&
+		mkdir y &&
+		echo d >y/d &&
+		echo e >y/e &&
+		git add z y &&
+		test_tick &&
+		git commit -m "O" &&
+
+		git branch O &&
+		git branch A &&
+		git branch B &&
+
+		git checkout A &&
+		git mv z x &&
+		echo m >y/m &&
+		echo wham1 >y/wham &&
+		git add y &&
+		test_tick &&
+		git commit -m "A" &&
+
+		git checkout B &&
+		git mv y x &&
+		echo n >z/n &&
+		echo wham2 >z/wham &&
+		git add z &&
+		test_tick &&
+		git commit -m "B"
+	)
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6043-merge-rename-directories/1d/.git/
+[master (root-commit) a5c945e] O
+ Author: A U Thor <author@example.com>
+ 4 files changed, 4 insertions(+)
+ create mode 100644 y/d
+ create mode 100644 y/e
+ create mode 100644 z/b
+ create mode 100644 z/c
+Switched to branch 'A'
+[A e0494ce] A
+ Author: A U Thor <author@example.com>
+ 4 files changed, 2 insertions(+)
+ rename {z => x}/b (100%)
+ rename {z => x}/c (100%)
+ create mode 100644 y/m
+ create mode 100644 y/wham
+Switched to branch 'B'
+[B 7f8e93c] B
+ Author: A U Thor <author@example.com>
+ 4 files changed, 2 insertions(+)
+ rename {y => x}/d (100%)
+ rename {y => x}/e (100%)
+ create mode 100644 z/n
+ create mode 100644 z/wham
+ok 7 - 1d-setup: Directory renames cause a rename/rename(2to1) conflict
+
+expecting success: 
+	(
+		cd 1d &&
+
+		git checkout A^0 &&
+
+		test_must_fail git merge -s recursive B^0 >out &&
+		test_i18ngrep "CONFLICT (rename/rename)" out &&
+
+		git ls-files -s >out &&
+		test_line_count = 8 out &&
+		git ls-files -u >out &&
+		test_line_count = 2 out &&
+		git ls-files -o >out &&
+		test_line_count = 3 out &&
+
+		git rev-parse >actual \
+			:0:x/b :0:x/c :0:x/d :0:x/e :0:x/m :0:x/n &&
+		git rev-parse >expect \
+			 O:z/b  O:z/c  O:y/d  O:y/e  A:y/m  B:z/n &&
+		test_cmp expect actual &&
+
+		test_must_fail git rev-parse :0:x/wham &&
+		git rev-parse >actual \
+			:2:x/wham :3:x/wham &&
+		git rev-parse >expect \
+			 A:y/wham  B:z/wham &&
+		test_cmp expect actual &&
+
+		test_path_is_missing x/wham &&
+		test_path_is_file x/wham~HEAD &&
+		test_path_is_file x/wham~B^0 &&
+
+		git hash-object >actual \
+			x/wham~HEAD x/wham~B^0 &&
+		git rev-parse >expect \
+			A:y/wham    B:z/wham &&
+		test_cmp expect actual
+	)
+
+Note: checking out '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 performing another checkout.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -b with the checkout command again. Example:
+
+  git checkout -b <new-branch-name>
+
+HEAD is now at e0494ce A
+CONFLICT (rename/rename): Rename y/wham->x/wham in HEAD. Rename z/wham->x/wham in B^0
+fatal: Path 'x/wham' is in the index, but not at stage 0.
+Did you mean ':2:x/wham'?
+:0:x/wham
+ok 8 - 1d-check: Directory renames cause a rename/rename(2to1) conflict
+
+expecting success: 
+	test_create_repo 1e &&
+	(
+		cd 1e &&
+
+		mkdir z &&
+		echo b >z/oldb &&
+		echo c >z/oldc &&
+		git add z &&
+		test_tick &&
+		git commit -m "O" &&
+
+		git branch O &&
+		git branch A &&
+		git branch B &&
+
+		git checkout A &&
+		mkdir y &&
+		git mv z/oldb y/newb &&
+		git mv z/oldc y/newc &&
+		test_tick &&
+		git commit -m "A" &&
+
+		git checkout B &&
+		echo d >z/d &&
+		git add z/d &&
+		test_tick &&
+		git commit -m "B"
+	)
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6043-merge-rename-directories/1e/.git/
+[master (root-commit) a0c453d] O
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 z/oldb
+ create mode 100644 z/oldc
+Switched to branch 'A'
+[A e7f73d0] A
+ Author: A U Thor <author@example.com>
+ 2 files changed, 0 insertions(+), 0 deletions(-)
+ rename z/oldb => y/newb (100%)
+ rename z/oldc => y/newc (100%)
+Switched to branch 'B'
+[B b36bf99] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 z/d
+ok 9 - 1e-setup: Renamed directory, with all files being renamed too
+
+expecting success: 
+	(
+		cd 1e &&
+
+		git checkout A^0 &&
+
+		git merge -s recursive B^0 &&
+
+		git ls-files -s >out &&
+		test_line_count = 3 out &&
+
+		git rev-parse >actual \
+			HEAD:y/newb HEAD:y/newc HEAD:y/d &&
+		git rev-parse >expect \
+			O:z/oldb    O:z/oldc    B:z/d &&
+		test_cmp expect actual &&
+		test_must_fail git rev-parse HEAD:z/d
+	)
+
+Note: checking out '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 performing another checkout.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -b with the checkout command again. Example:
+
+  git checkout -b <new-branch-name>
+
+HEAD is now at e7f73d0 A
+Merging:
+e7f73d0 A
+virtual B^0
+found 1 common ancestor:
+a0c453d O
+Skipped y/newc (merged same as existing)
+Skipped y/newb (merged same as existing)
+Merge made by the 'recursive' strategy.
+ y/d | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 y/d
+fatal: Path 'z/d' does not exist in 'HEAD'
+HEAD:z/d
+ok 10 - 1e-check: Renamed directory, with all files being renamed too
+
+expecting success: 
+	test_create_repo 1f &&
+	(
+		cd 1f &&
+
+		mkdir z &&
+		echo b >z/b &&
+		echo c >z/c &&
+		echo d >z/d &&
+		echo e >z/e &&
+		echo f >z/f &&
+		git add z &&
+		test_tick &&
+		git commit -m "O" &&
+
+		git branch O &&
+		git branch A &&
+		git branch B &&
+
+		git checkout A &&
+		echo g >z/g &&
+		git add z/g &&
+		test_tick &&
+		git commit -m "A" &&
+
+		git checkout B &&
+		mkdir y &&
+		mkdir x &&
+		git mv z/b y/ &&
+		git mv z/c y/ &&
+		git mv z/d x/ &&
+		git mv z/e x/ &&
+		git mv z/f x/ &&
+		rmdir z &&
+		test_tick &&
+		git commit -m "B"
+	)
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6043-merge-rename-directories/1f/.git/
+[master (root-commit) bc89ae6] O
+ Author: A U Thor <author@example.com>
+ 5 files changed, 5 insertions(+)
+ create mode 100644 z/b
+ create mode 100644 z/c
+ create mode 100644 z/d
+ create mode 100644 z/e
+ create mode 100644 z/f
+Switched to branch 'A'
+[A d83c371] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 z/g
+Switched to branch 'B'
+[B 2106ef0] B
+ Author: A U Thor <author@example.com>
+ 5 files changed, 0 insertions(+), 0 deletions(-)
+ rename {z => x}/d (100%)
+ rename {z => x}/e (100%)
+ rename {z => x}/f (100%)
+ rename {z => y}/b (100%)
+ rename {z => y}/c (100%)
+ok 11 - 1f-setup: Split a directory into two other directories
+
+expecting success: 
+	(
+		cd 1f &&
+
+		git checkout A^0 &&
+
+		git merge -s recursive B^0 &&
+
+		git ls-files -s >out &&
+		test_line_count = 6 out &&
+
+		git rev-parse >actual \
+			HEAD:y/b HEAD:y/c HEAD:x/d HEAD:x/e HEAD:x/f HEAD:x/g &&
+		git rev-parse >expect \
+			O:z/b    O:z/c    O:z/d    O:z/e    O:z/f    A:z/g &&
+		test_cmp expect actual &&
+		test_path_is_missing z/g &&
+		test_must_fail git rev-parse HEAD:z/g
+	)
+
+Note: checking out '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 performing another checkout.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -b with the checkout command again. Example:
+
+  git checkout -b <new-branch-name>
+
+HEAD is now at d83c371 A
+Merging:
+d83c371 A
+virtual B^0
+found 1 common ancestor:
+bc89ae6 O
+Merge made by the 'recursive' strategy.
+ {z => x}/d | 0
+ {z => x}/e | 0
+ {z => x}/f | 0
+ {z => x}/g | 0
+ {z => y}/b | 0
+ {z => y}/c | 0
+ 6 files changed, 0 insertions(+), 0 deletions(-)
+ rename {z => x}/d (100%)
+ rename {z => x}/e (100%)
+ rename {z => x}/f (100%)
+ rename {z => x}/g (100%)
+ rename {z => y}/b (100%)
+ rename {z => y}/c (100%)
+fatal: Path 'z/g' does not exist in 'HEAD'
+HEAD:z/g
+ok 12 - 1f-check: Split a directory into two other directories
+
+expecting success: 
+	test_create_repo 2a &&
+	(
+		cd 2a &&
+
+		mkdir z &&
+		echo b >z/b &&
+		echo c >z/c &&
+		git add z &&
+		test_tick &&
+		git commit -m "O" &&
+
+		git branch O &&
+		git branch A &&
+		git branch B &&
+
+		git checkout A &&
+		mkdir y &&
+		mkdir w &&
+		git mv z/b y/ &&
+		git mv z/c w/ &&
+		test_tick &&
+		git commit -m "A" &&
+
+		git checkout B &&
+		echo d >z/d &&
+		git add z/d &&
+		test_tick &&
+		git commit -m "B"
+	)
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6043-merge-rename-directories/2a/.git/
+[master (root-commit) 4e96174] O
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 z/b
+ create mode 100644 z/c
+Switched to branch 'A'
+[A 6af9a4d] A
+ Author: A U Thor <author@example.com>
+ 2 files changed, 0 insertions(+), 0 deletions(-)
+ rename {z => w}/c (100%)
+ rename {z => y}/b (100%)
+Switched to branch 'B'
+[B db43152] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 z/d
+ok 13 - 2a-setup: Directory split into two on one side, with equal numbers of paths
+
+expecting success: 
+	(
+		cd 2a &&
+
+		git checkout A^0 &&
+
+		test_must_fail git merge -s recursive B^0 >out &&
+		test_i18ngrep "CONFLICT.*directory rename split" out &&
+
+		git ls-files -s >out &&
+		test_line_count = 3 out &&
+		git ls-files -u >out &&
+		test_line_count = 0 out &&
+		git ls-files -o >out &&
+		test_line_count = 1 out &&
+
+		git rev-parse >actual \
+			:0:y/b :0:w/c :0:z/d &&
+		git rev-parse >expect \
+			 O:z/b  O:z/c  B:z/d &&
+		test_cmp expect actual
+	)
+
+Note: checking out '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 performing another checkout.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -b with the checkout command again. Example:
+
+  git checkout -b <new-branch-name>
+
+HEAD is now at 6af9a4d A
+CONFLICT (directory rename split): Unclear where to place z/d because directory z was renamed to multiple other directories, with no destination getting a majority of the files.
+ok 14 - 2a-check: Directory split into two on one side, with equal numbers of paths
+
+expecting success: 
+	test_create_repo 2b &&
+	(
+		cd 2b &&
+
+		mkdir z &&
+		echo b >z/b &&
+		echo c >z/c &&
+		git add z &&
+		test_tick &&
+		git commit -m "O" &&
+
+		git branch O &&
+		git branch A &&
+		git branch B &&
+
+		git checkout A &&
+		mkdir y &&
+		mkdir w &&
+		git mv z/b y/ &&
+		git mv z/c w/ &&
+		test_tick &&
+		git commit -m "A" &&
+
+		git checkout B &&
+		mkdir x &&
+		echo d >x/d &&
+		git add x/d &&
+		test_tick &&
+		git commit -m "B"
+	)
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6043-merge-rename-directories/2b/.git/
+[master (root-commit) 4e96174] O
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 z/b
+ create mode 100644 z/c
+Switched to branch 'A'
+[A 6af9a4d] A
+ Author: A U Thor <author@example.com>
+ 2 files changed, 0 insertions(+), 0 deletions(-)
+ rename {z => w}/c (100%)
+ rename {z => y}/b (100%)
+Switched to branch 'B'
+[B c2fe7fb] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 x/d
+ok 15 - 2b-setup: Directory split into two on one side, with equal numbers of paths
+
+expecting success: 
+	(
+		cd 2b &&
+
+		git checkout A^0 &&
+
+		git merge -s recursive B^0 >out &&
+
+		git ls-files -s >out &&
+		test_line_count = 3 out &&
+		git ls-files -u >out &&
+		test_line_count = 0 out &&
+		git ls-files -o >out &&
+		test_line_count = 1 out &&
+
+		git rev-parse >actual \
+			:0:y/b :0:w/c :0:x/d &&
+		git rev-parse >expect \
+			 O:z/b  O:z/c  B:x/d &&
+		test_cmp expect actual &&
+		test_i18ngrep ! "CONFLICT.*directory rename split" out
+	)
+
+Note: checking out '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 performing another checkout.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -b with the checkout command again. Example:
+
+  git checkout -b <new-branch-name>
+
+HEAD is now at 6af9a4d A
+ok 16 - 2b-check: Directory split into two on one side, with equal numbers of paths
+
+expecting success: 
+	test_create_repo 3a &&
+	(
+		cd 3a &&
+
+		mkdir z &&
+		echo b >z/b &&
+		echo c >z/c &&
+		echo d >z/d &&
+		git add z &&
+		test_tick &&
+		git commit -m "O" &&
+
+		git branch O &&
+		git branch A &&
+		git branch B &&
+
+		git checkout A &&
+		test_tick &&
+		git commit --allow-empty -m "A" &&
+
+		git checkout B &&
+		mkdir y &&
+		mkdir x &&
+		git mv z/b y/ &&
+		git mv z/c y/ &&
+		git mv z/d x/ &&
+		rmdir z &&
+		test_tick &&
+		git commit -m "B"
+	)
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6043-merge-rename-directories/3a/.git/
+[master (root-commit) 6c15033] O
+ Author: A U Thor <author@example.com>
+ 3 files changed, 3 insertions(+)
+ create mode 100644 z/b
+ create mode 100644 z/c
+ create mode 100644 z/d
+Switched to branch 'A'
+[A 73b131e] A
+ Author: A U Thor <author@example.com>
+Switched to branch 'B'
+[B d135340] B
+ Author: A U Thor <author@example.com>
+ 3 files changed, 0 insertions(+), 0 deletions(-)
+ rename {z => x}/d (100%)
+ rename {z => y}/b (100%)
+ rename {z => y}/c (100%)
+ok 17 - 3a-setup: Avoid implicit rename if involved as source on other side
+
+expecting success: 
+	(
+		cd 3a &&
+
+		git checkout A^0 &&
+
+		git merge -s recursive B^0 &&
+
+		git ls-files -s >out &&
+		test_line_count = 3 out &&
+
+		git rev-parse >actual \
+			HEAD:y/b HEAD:y/c HEAD:x/d &&
+		git rev-parse >expect \
+			O:z/b    O:z/c    O:z/d &&
+		test_cmp expect actual
+	)
+
+Note: checking out '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 performing another checkout.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -b with the checkout command again. Example:
+
+  git checkout -b <new-branch-name>
+
+HEAD is now at 73b131e A
+Merging:
+73b131e A
+virtual B^0
+found 1 common ancestor:
+6c15033 O
+Merge made by the 'recursive' strategy.
+ {z => x}/d | 0
+ {z => y}/b | 0
+ {z => y}/c | 0
+ 3 files changed, 0 insertions(+), 0 deletions(-)
+ rename {z => x}/d (100%)
+ rename {z => y}/b (100%)
+ rename {z => y}/c (100%)
+ok 18 - 3a-check: Avoid implicit rename if involved as source on other side
+
+expecting success: 
+	test_create_repo 3b &&
+	(
+		cd 3b &&
+
+		mkdir z &&
+		echo b >z/b &&
+		echo c >z/c &&
+		echo d >z/d &&
+		git add z &&
+		test_tick &&
+		git commit -m "O" &&
+
+		git branch O &&
+		git branch A &&
+		git branch B &&
+
+		git checkout A &&
+		mkdir y &&
+		mkdir x &&
+		git mv z/b y/ &&
+		git mv z/c y/ &&
+		git mv z/d x/ &&
+		rmdir z &&
+		test_tick &&
+		git commit -m "A" &&
+
+		git checkout B &&
+		mkdir w &&
+		git mv z/d w/ &&
+		test_tick &&
+		git commit -m "B"
+	)
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6043-merge-rename-directories/3b/.git/
+[master (root-commit) 6c15033] O
+ Author: A U Thor <author@example.com>
+ 3 files changed, 3 insertions(+)
+ create mode 100644 z/b
+ create mode 100644 z/c
+ create mode 100644 z/d
+Switched to branch 'A'
+[A 5eead67] A
+ Author: A U Thor <author@example.com>
+ 3 files changed, 0 insertions(+), 0 deletions(-)
+ rename {z => x}/d (100%)
+ rename {z => y}/b (100%)
+ rename {z => y}/c (100%)
+Switched to branch 'B'
+[B 464e387] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename {z => w}/d (100%)
+ok 19 - 3b-setup: Avoid implicit rename if involved as source on current side
+
+expecting success: 
+	(
+		cd 3b &&
+
+		git checkout A^0 &&
+
+		test_must_fail git merge -s recursive B^0 >out &&
+		test_i18ngrep CONFLICT.*rename/rename.*z/d.*x/d.*w/d out &&
+		test_i18ngrep ! CONFLICT.*rename/rename.*y/d out &&
+
+		git ls-files -s >out &&
+		test_line_count = 5 out &&
+		git ls-files -u >out &&
+		test_line_count = 3 out &&
+		git ls-files -o >out &&
+		test_line_count = 1 out &&
+
+		git rev-parse >actual \
+			:0:y/b :0:y/c :1:z/d :2:x/d :3:w/d &&
+		git rev-parse >expect \
+			 O:z/b  O:z/c  O:z/d  O:z/d  O:z/d &&
+		test_cmp expect actual &&
+
+		test_path_is_missing z/d &&
+		git hash-object >actual \
+			x/d   w/d &&
+		git rev-parse >expect \
+			O:z/d O:z/d &&
+		test_cmp expect actual
+	)
+
+Note: checking out '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 performing another checkout.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -b with the checkout command again. Example:
+
+  git checkout -b <new-branch-name>
+
+HEAD is now at 5eead67 A
+CONFLICT (rename/rename): Rename "z/d"->"x/d" in branch "HEAD" rename "z/d"->"w/d" in "B^0"
+ok 20 - 3b-check: Avoid implicit rename if involved as source on current side
+
+expecting success: 
+	test_create_repo 4a &&
+	(
+		cd 4a &&
+
+		mkdir z &&
+		echo b >z/b &&
+		echo c >z/c &&
+		echo d >z/d &&
+		echo e >z/e &&
+		git add z &&
+		test_tick &&
+		git commit -m "O" &&
+
+		git branch O &&
+		git branch A &&
+		git branch B &&
+
+		git checkout A &&
+		mkdir y &&
+		git mv z/b y/ &&
+		git mv z/c y/ &&
+		git mv z/d y/ &&
+		test_tick &&
+		git commit -m "A" &&
+
+		git checkout B &&
+		echo f >z/f &&
+		git add z/f &&
+		test_tick &&
+		git commit -m "B"
+	)
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6043-merge-rename-directories/4a/.git/
+[master (root-commit) 9e2ca6f] O
+ Author: A U Thor <author@example.com>
+ 4 files changed, 4 insertions(+)
+ create mode 100644 z/b
+ create mode 100644 z/c
+ create mode 100644 z/d
+ create mode 100644 z/e
+Switched to branch 'A'
+[A 9c11b44] A
+ Author: A U Thor <author@example.com>
+ 3 files changed, 0 insertions(+), 0 deletions(-)
+ rename {z => y}/b (100%)
+ rename {z => y}/c (100%)
+ rename {z => y}/d (100%)
+Switched to branch 'B'
+[B aa71186] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 z/f
+ok 21 - 4a-setup: Directory split, with original directory still present
+
+expecting success: 
+	(
+		cd 4a &&
+
+		git checkout A^0 &&
+
+		git merge -s recursive B^0 &&
+
+		git ls-files -s >out &&
+		test_line_count = 5 out &&
+		git ls-files -u >out &&
+		test_line_count = 0 out &&
+		git ls-files -o >out &&
+		test_line_count = 1 out &&
+
+		git rev-parse >actual \
+			HEAD:y/b HEAD:y/c HEAD:y/d HEAD:z/e HEAD:z/f &&
+		git rev-parse >expect \
+			O:z/b    O:z/c    O:z/d    O:z/e    B:z/f &&
+		test_cmp expect actual
+	)
+
+Note: checking out '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 performing another checkout.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -b with the checkout command again. Example:
+
+  git checkout -b <new-branch-name>
+
+HEAD is now at 9c11b44 A
+Merging:
+9c11b44 A
+virtual B^0
+found 1 common ancestor:
+9e2ca6f O
+Skipped y/d (merged same as existing)
+Skipped y/c (merged same as existing)
+Skipped y/b (merged same as existing)
+Merge made by the 'recursive' strategy.
+ z/f | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 z/f
+ok 22 - 4a-check: Directory split, with original directory still present
+
+expecting success: 
+	test_create_repo 5a &&
+	(
+		cd 5a &&
+
+		mkdir z &&
+		echo b >z/b &&
+		echo c >z/c &&
+		mkdir y &&
+		echo d >y/d &&
+		git add z y &&
+		test_tick &&
+		git commit -m "O" &&
+
+		git branch O &&
+		git branch A &&
+		git branch B &&
+
+		git checkout A &&
+		echo e1 >z/e &&
+		echo f >z/f &&
+		echo e2 >y/e &&
+		git add z/e z/f y/e &&
+		test_tick &&
+		git commit -m "A" &&
+
+		git checkout B &&
+		git mv z/b y/ &&
+		git mv z/c y/ &&
+		rmdir z &&
+		test_tick &&
+		git commit -m "B"
+	)
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6043-merge-rename-directories/5a/.git/
+[master (root-commit) 828128d] O
+ Author: A U Thor <author@example.com>
+ 3 files changed, 3 insertions(+)
+ create mode 100644 y/d
+ create mode 100644 z/b
+ create mode 100644 z/c
+Switched to branch 'A'
+[A b42bf3c] A
+ Author: A U Thor <author@example.com>
+ 3 files changed, 3 insertions(+)
+ create mode 100644 y/e
+ create mode 100644 z/e
+ create mode 100644 z/f
+Switched to branch 'B'
+[B 2a8bd7d] B
+ Author: A U Thor <author@example.com>
+ 2 files changed, 0 insertions(+), 0 deletions(-)
+ rename {z => y}/b (100%)
+ rename {z => y}/c (100%)
+ok 23 - 5a-setup: Merge directories, other side adds files to original and target
+
+expecting success: 
+	(
+		cd 5a &&
+
+		git checkout A^0 &&
+
+		test_must_fail git merge -s recursive B^0 >out &&
+		test_i18ngrep "CONFLICT.*implicit dir rename" out &&
+
+		git ls-files -s >out &&
+		test_line_count = 6 out &&
+		git ls-files -u >out &&
+		test_line_count = 0 out &&
+		git ls-files -o >out &&
+		test_line_count = 1 out &&
+
+		git rev-parse >actual \
+			:0:y/b :0:y/c :0:y/d :0:y/e :0:z/e :0:y/f &&
+		git rev-parse >expect \
+			 O:z/b  O:z/c  O:y/d  A:y/e  A:z/e  A:z/f &&
+		test_cmp expect actual
+	)
+
+Note: checking out '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 performing another checkout.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -b with the checkout command again. Example:
+
+  git checkout -b <new-branch-name>
+
+HEAD is now at b42bf3c A
+CONFLICT (implicit dir rename): Existing file/dir at y/e in the way of implicit directory rename(s) putting the following path(s) there: z/e.
+ok 24 - 5a-check: Merge directories, other side adds files to original and target
+
+expecting success: 
+	test_create_repo 5b &&
+	(
+		cd 5b &&
+
+		mkdir z &&
+		echo b >z/b &&
+		echo c >z/c &&
+		echo d1 >z/d &&
+		git add z &&
+		test_tick &&
+		git commit -m "O" &&
+
+		git branch O &&
+		git branch A &&
+		git branch B &&
+
+		git checkout A &&
+		git rm z/d &&
+		git mv z y &&
+		echo d2 >y/d &&
+		git add y/d &&
+		test_tick &&
+		git commit -m "A" &&
+
+		git checkout B &&
+		mkdir y &&
+		echo d3 >y/d &&
+		echo e >z/e &&
+		git add y/d z/e &&
+		test_tick &&
+		git commit -m "B"
+	)
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6043-merge-rename-directories/5b/.git/
+[master (root-commit) 66a9911] O
+ Author: A U Thor <author@example.com>
+ 3 files changed, 3 insertions(+)
+ create mode 100644 z/b
+ create mode 100644 z/c
+ create mode 100644 z/d
+Switched to branch 'A'
+rm 'z/d'
+[A f5563b5] A
+ Author: A U Thor <author@example.com>
+ 4 files changed, 1 insertion(+), 1 deletion(-)
+ rename {z => y}/b (100%)
+ rename {z => y}/c (100%)
+ create mode 100644 y/d
+ delete mode 100644 z/d
+Switched to branch 'B'
+[B 5ac66d1] B
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 y/d
+ create mode 100644 z/e
+ok 25 - 5b-setup: Rename/delete in order to get add/add/add conflict
+
+expecting success: 
+	(
+		cd 5b &&
+
+		git checkout A^0 &&
+
+		test_must_fail git merge -s recursive B^0 >out &&
+		test_i18ngrep "CONFLICT (add/add).* y/d" out &&
+
+		git ls-files -s >out &&
+		test_line_count = 5 out &&
+		git ls-files -u >out &&
+		test_line_count = 2 out &&
+		git ls-files -o >out &&
+		test_line_count = 1 out &&
+
+		git rev-parse >actual \
+			:0:y/b :0:y/c :0:y/e :2:y/d :3:y/d &&
+		git rev-parse >expect \
+			 O:z/b  O:z/c  B:z/e  A:y/d  B:y/d &&
+		test_cmp expect actual &&
+
+		test_must_fail git rev-parse :1:y/d &&
+		test_path_is_file y/d
+	)
+
+Note: checking out '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 performing another checkout.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -b with the checkout command again. Example:
+
+  git checkout -b <new-branch-name>
+
+HEAD is now at f5563b5 A
+CONFLICT (add/add): Merge conflict in y/d
+fatal: Path 'y/d' is in the index, but not at stage 1.
+Did you mean ':2:y/d'?
+:1:y/d
+ok 26 - 5b-check: Rename/delete in order to get add/add/add conflict
+
+expecting success: 
+	test_create_repo 5c &&
+	(
+		cd 5c &&
+
+		mkdir z &&
+		echo b >z/b &&
+		echo c >z/c &&
+		mkdir x &&
+		echo d1 >x/d &&
+		git add z x &&
+		test_tick &&
+		git commit -m "O" &&
+
+		git branch O &&
+		git branch A &&
+		git branch B &&
+
+		git checkout A &&
+		git mv z y &&
+		echo d2 >y/d &&
+		git add y/d &&
+		git mv x w &&
+		test_tick &&
+		git commit -m "A" &&
+
+		git checkout B &&
+		git mv x/d z/ &&
+		mkdir w &&
+		mkdir y &&
+		echo d3 >w/d &&
+		echo d4 >y/d &&
+		echo e >z/e &&
+		git add w/ y/ z/e &&
+		test_tick &&
+		git commit -m "B"
+	)
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6043-merge-rename-directories/5c/.git/
+[master (root-commit) cb15013] O
+ Author: A U Thor <author@example.com>
+ 3 files changed, 3 insertions(+)
+ create mode 100644 x/d
+ create mode 100644 z/b
+ create mode 100644 z/c
+Switched to branch 'A'
+[A b27f493] A
+ Author: A U Thor <author@example.com>
+ 4 files changed, 1 insertion(+)
+ rename {x => w}/d (100%)
+ rename {z => y}/b (100%)
+ rename {z => y}/c (100%)
+ create mode 100644 y/d
+Switched to branch 'B'
+[B 535e6b3] B
+ Author: A U Thor <author@example.com>
+ 4 files changed, 3 insertions(+)
+ create mode 100644 w/d
+ create mode 100644 y/d
+ rename {x => z}/d (100%)
+ create mode 100644 z/e
+ok 27 - 5c-setup: Transitive rename would cause rename/rename/rename/add/add/add
+
+expecting success: 
+	(
+		cd 5c &&
+
+		git checkout A^0 &&
+
+		test_must_fail git merge -s recursive B^0 >out &&
+		test_i18ngrep "CONFLICT (rename/rename).*x/d.*w/d.*z/d" out &&
+		test_i18ngrep "CONFLICT (add/add).* y/d" out &&
+
+		git ls-files -s >out &&
+		test_line_count = 9 out &&
+		git ls-files -u >out &&
+		test_line_count = 6 out &&
+		git ls-files -o >out &&
+		test_line_count = 3 out &&
+
+		git rev-parse >actual \
+			:0:y/b :0:y/c :0:y/e &&
+		git rev-parse >expect \
+			 O:z/b  O:z/c  B:z/e &&
+		test_cmp expect actual &&
+
+		test_must_fail git rev-parse :1:y/d &&
+		git rev-parse >actual \
+			:2:w/d :3:w/d :1:x/d :2:y/d :3:y/d :3:z/d &&
+		git rev-parse >expect \
+			 O:x/d  B:w/d  O:x/d  A:y/d  B:y/d  O:x/d &&
+		test_cmp expect actual &&
+
+		git hash-object >actual \
+			w/d~HEAD w/d~B^0 z/d &&
+		git rev-parse >expect \
+			O:x/d    B:w/d   O:x/d &&
+		test_cmp expect actual &&
+		test_path_is_missing x/d &&
+		test_path_is_file y/d &&
+		grep -q "<<<<" y/d  # conflict markers should be present
+	)
+
+Note: checking out '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 performing another checkout.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -b with the checkout command again. Example:
+
+  git checkout -b <new-branch-name>
+
+HEAD is now at b27f493 A
+CONFLICT (rename/rename): Rename "x/d"->"w/d" in branch "HEAD" rename "x/d"->"z/d" in "B^0"
+CONFLICT (add/add): Merge conflict in y/d
+fatal: Path 'y/d' is in the index, but not at stage 1.
+Did you mean ':2:y/d'?
+:1:y/d
+ok 28 - 5c-check: Transitive rename would cause rename/rename/rename/add/add/add
+
+expecting success: 
+	test_create_repo 5d &&
+	(
+		cd 5d &&
+
+		mkdir z &&
+		echo b >z/b &&
+		echo c >z/c &&
+		git add z &&
+		test_tick &&
+		git commit -m "O" &&
+
+		git branch O &&
+		git branch A &&
+		git branch B &&
+
+		git checkout A &&
+		git mv z y &&
+		echo d1 >y/d &&
+		git add y/d &&
+		test_tick &&
+		git commit -m "A" &&
+
+		git checkout B &&
+		mkdir -p y/d &&
+		echo e >y/d/e &&
+		echo d2 >z/d &&
+		echo f >z/f &&
+		git add y/d/e z/d z/f &&
+		test_tick &&
+		git commit -m "B"
+	)
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6043-merge-rename-directories/5d/.git/
+[master (root-commit) 4e96174] O
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 z/b
+ create mode 100644 z/c
+Switched to branch 'A'
+[A ecc7afe] A
+ Author: A U Thor <author@example.com>
+ 3 files changed, 1 insertion(+)
+ rename {z => y}/b (100%)
+ rename {z => y}/c (100%)
+ create mode 100644 y/d
+Switched to branch 'B'
+[B 67e12ad] B
+ Author: A U Thor <author@example.com>
+ 3 files changed, 3 insertions(+)
+ create mode 100644 y/d/e
+ create mode 100644 z/d
+ create mode 100644 z/f
+ok 29 - 5d-setup: Directory/file/file conflict due to directory rename
+
+expecting success: 
+	(
+		cd 5d &&
+
+		git checkout A^0 &&
+
+		test_must_fail git merge -s recursive B^0 >out &&
+		test_i18ngrep "CONFLICT (file/directory).*y/d" out &&
+
+		git ls-files -s >out &&
+		test_line_count = 6 out &&
+		git ls-files -u >out &&
+		test_line_count = 1 out &&
+		git ls-files -o >out &&
+		test_line_count = 2 out &&
+
+		git rev-parse >actual \
+			:0:y/b :0:y/c :0:z/d :0:y/f :2:y/d :0:y/d/e &&
+		git rev-parse >expect \
+			 O:z/b  O:z/c  B:z/d  B:z/f  A:y/d  B:y/d/e &&
+		test_cmp expect actual &&
+
+		git hash-object y/d~HEAD >actual &&
+		git rev-parse A:y/d >expect &&
+		test_cmp expect actual
+	)
+
+Note: checking out '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 performing another checkout.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -b with the checkout command again. Example:
+
+  git checkout -b <new-branch-name>
+
+HEAD is now at ecc7afe A
+CONFLICT (file/directory): There is a directory with name y/d in B^0. Adding y/d as y/d~HEAD
+ok 30 - 5d-check: Directory/file/file conflict due to directory rename
+
+expecting success: 
+	test_create_repo 6a &&
+	(
+		cd 6a &&
+
+		mkdir z &&
+		echo b >z/b &&
+		echo c >z/c &&
+		echo d >z/d &&
+		git add z &&
+		test_tick &&
+		git commit -m "O" &&
+
+		git branch O &&
+		git branch A &&
+		git branch B &&
+
+		git checkout A &&
+		git rm z/c &&
+		git rm z/d &&
+		test_tick &&
+		git commit -m "A" &&
+
+		git checkout B &&
+		mkdir y &&
+		git mv z/b y/ &&
+		git mv z/c y/ &&
+		test_tick &&
+		git commit -m "B"
+	)
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6043-merge-rename-directories/6a/.git/
+[master (root-commit) 6c15033] O
+ Author: A U Thor <author@example.com>
+ 3 files changed, 3 insertions(+)
+ create mode 100644 z/b
+ create mode 100644 z/c
+ create mode 100644 z/d
+Switched to branch 'A'
+rm 'z/c'
+rm 'z/d'
+[A 1476532] A
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 deletions(-)
+ delete mode 100644 z/c
+ delete mode 100644 z/d
+Switched to branch 'B'
+[B 53c1aba] B
+ Author: A U Thor <author@example.com>
+ 2 files changed, 0 insertions(+), 0 deletions(-)
+ rename {z => y}/b (100%)
+ rename {z => y}/c (100%)
+ok 31 - 6a-setup: Tricky rename/delete
+
+expecting success: 
+	(
+		cd 6a &&
+
+		git checkout A^0 &&
+
+		test_must_fail git merge -s recursive B^0 >out &&
+		test_i18ngrep "CONFLICT (rename/delete).*z/c.*y/c" out &&
+
+		git ls-files -s >out &&
+		test_line_count = 2 out &&
+		git ls-files -u >out &&
+		test_line_count = 1 out &&
+		git ls-files -o >out &&
+		test_line_count = 1 out &&
+
+		git rev-parse >actual \
+			:0:y/b :3:y/c &&
+		git rev-parse >expect \
+			 O:z/b  O:z/c &&
+		test_cmp expect actual
+	)
+
+Note: checking out '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 performing another checkout.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -b with the checkout command again. Example:
+
+  git checkout -b <new-branch-name>
+
+HEAD is now at 1476532 A
+CONFLICT (rename/delete): z/c deleted in HEAD and renamed to y/c in B^0. Version B^0 of y/c left in tree.
+ok 32 - 6a-check: Tricky rename/delete
+
+expecting success: 
+	test_create_repo 6b &&
+	(
+		cd 6b &&
+
+		mkdir z &&
+		echo b >z/b &&
+		echo c >z/c &&
+		git add z &&
+		test_tick &&
+		git commit -m "O" &&
+
+		git branch O &&
+		git branch A &&
+		git branch B &&
+
+		git checkout A &&
+		git mv z y &&
+		test_tick &&
+		git commit -m "A" &&
+
+		git checkout B &&
+		git mv z y &&
+		mkdir z &&
+		echo d >z/d &&
+		git add z/d &&
+		test_tick &&
+		git commit -m "B"
+	)
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6043-merge-rename-directories/6b/.git/
+[master (root-commit) 4e96174] O
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 z/b
+ create mode 100644 z/c
+Switched to branch 'A'
+[A 4e9f86d] A
+ Author: A U Thor <author@example.com>
+ 2 files changed, 0 insertions(+), 0 deletions(-)
+ rename {z => y}/b (100%)
+ rename {z => y}/c (100%)
+Switched to branch 'B'
+[B 6ea17b2] B
+ Author: A U Thor <author@example.com>
+ 3 files changed, 1 insertion(+)
+ rename {z => y}/b (100%)
+ rename {z => y}/c (100%)
+ create mode 100644 z/d
+ok 33 - 6b-setup: Same rename done on both sides
+
+expecting success: 
+	(
+		cd 6b &&
+
+		git checkout A^0 &&
+
+		git merge -s recursive B^0 &&
+
+		git ls-files -s >out &&
+		test_line_count = 3 out &&
+		git ls-files -u >out &&
+		test_line_count = 0 out &&
+		git ls-files -o >out &&
+		test_line_count = 1 out &&
+
+		git rev-parse >actual \
+			HEAD:y/b HEAD:y/c HEAD:z/d &&
+		git rev-parse >expect \
+			O:z/b    O:z/c    B:z/d &&
+		test_cmp expect actual
+	)
+
+Note: checking out '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 performing another checkout.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -b with the checkout command again. Example:
+
+  git checkout -b <new-branch-name>
+
+HEAD is now at 4e9f86d A
+Merging:
+4e9f86d A
+virtual B^0
+found 1 common ancestor:
+4e96174 O
+Skipped y/c (merged same as existing)
+Skipped y/b (merged same as existing)
+Merge made by the 'recursive' strategy.
+ z/d | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 z/d
+ok 34 - 6b-check: Same rename done on both sides
+
+expecting success: 
+	test_create_repo 6c &&
+	(
+		cd 6c &&
+
+		mkdir z &&
+		echo b >z/b &&
+		echo c >z/c &&
+		git add z &&
+		test_tick &&
+		git commit -m "O" &&
+
+		git branch O &&
+		git branch A &&
+		git branch B &&
+
+		git checkout A &&
+		test_tick &&
+		git commit --allow-empty -m "A" &&
+
+		git checkout B &&
+		git mv z y &&
+		mkdir z &&
+		echo d >z/d &&
+		git add z/d &&
+		test_tick &&
+		git commit -m "B"
+	)
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6043-merge-rename-directories/6c/.git/
+[master (root-commit) 4e96174] O
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 z/b
+ create mode 100644 z/c
+Switched to branch 'A'
+[A 405f2b4] A
+ Author: A U Thor <author@example.com>
+Switched to branch 'B'
+[B 6ea17b2] B
+ Author: A U Thor <author@example.com>
+ 3 files changed, 1 insertion(+)
+ rename {z => y}/b (100%)
+ rename {z => y}/c (100%)
+ create mode 100644 z/d
+ok 35 - 6c-setup: Rename only done on same side
+
+expecting success: 
+	(
+		cd 6c &&
+
+		git checkout A^0 &&
+
+		git merge -s recursive B^0 &&
+
+		git ls-files -s >out &&
+		test_line_count = 3 out &&
+		git ls-files -u >out &&
+		test_line_count = 0 out &&
+		git ls-files -o >out &&
+		test_line_count = 1 out &&
+
+		git rev-parse >actual \
+			HEAD:y/b HEAD:y/c HEAD:z/d &&
+		git rev-parse >expect \
+			O:z/b    O:z/c    B:z/d &&
+		test_cmp expect actual
+	)
+
+Note: checking out '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 performing another checkout.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -b with the checkout command again. Example:
+
+  git checkout -b <new-branch-name>
+
+HEAD is now at 405f2b4 A
+Merging:
+405f2b4 A
+virtual B^0
+found 1 common ancestor:
+4e96174 O
+Merge made by the 'recursive' strategy.
+ {z => y}/b | 0
+ {z => y}/c | 0
+ z/d        | 1 +
+ 3 files changed, 1 insertion(+)
+ rename {z => y}/b (100%)
+ rename {z => y}/c (100%)
+ create mode 100644 z/d
+ok 36 - 6c-check: Rename only done on same side
+
+expecting success: 
+	test_create_repo 6d &&
+	(
+		cd 6d &&
+
+		mkdir z &&
+		echo b >z/b &&
+		echo c >z/c &&
+		mkdir x &&
+		echo d >x/d &&
+		git add z x &&
+		test_tick &&
+		git commit -m "O" &&
+
+		git branch O &&
+		git branch A &&
+		git branch B &&
+
+		git checkout A &&
+		test_tick &&
+		git commit --allow-empty -m "A" &&
+
+		git checkout B &&
+		git mv z y &&
+		git mv x z &&
+		test_tick &&
+		git commit -m "B"
+	)
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6043-merge-rename-directories/6d/.git/
+[master (root-commit) 1e3967e] O
+ Author: A U Thor <author@example.com>
+ 3 files changed, 3 insertions(+)
+ create mode 100644 x/d
+ create mode 100644 z/b
+ create mode 100644 z/c
+Switched to branch 'A'
+[A 1491553] A
+ Author: A U Thor <author@example.com>
+Switched to branch 'B'
+[B add22d4] B
+ Author: A U Thor <author@example.com>
+ 3 files changed, 0 insertions(+), 0 deletions(-)
+ rename {z => y}/b (100%)
+ rename {z => y}/c (100%)
+ rename {x => z}/d (100%)
+ok 37 - 6d-setup: We do not always want transitive renaming
+
+expecting success: 
+	(
+		cd 6d &&
+
+		git checkout A^0 &&
+
+		git merge -s recursive B^0 &&
+
+		git ls-files -s >out &&
+		test_line_count = 3 out &&
+		git ls-files -u >out &&
+		test_line_count = 0 out &&
+		git ls-files -o >out &&
+		test_line_count = 1 out &&
+
+		git rev-parse >actual \
+			HEAD:y/b HEAD:y/c HEAD:z/d &&
+		git rev-parse >expect \
+			O:z/b    O:z/c    O:x/d &&
+		test_cmp expect actual
+	)
+
+Note: checking out '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 performing another checkout.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -b with the checkout command again. Example:
+
+  git checkout -b <new-branch-name>
+
+HEAD is now at 1491553 A
+Merging:
+1491553 A
+virtual B^0
+found 1 common ancestor:
+1e3967e O
+Merge made by the 'recursive' strategy.
+ {z => y}/b | 0
+ {z => y}/c | 0
+ {x => z}/d | 0
+ 3 files changed, 0 insertions(+), 0 deletions(-)
+ rename {z => y}/b (100%)
+ rename {z => y}/c (100%)
+ rename {x => z}/d (100%)
+ok 38 - 6d-check: We do not always want transitive renaming
+
+expecting success: 
+	test_create_repo 6e &&
+	(
+		cd 6e &&
+
+		mkdir z &&
+		echo b >z/b &&
+		echo c >z/c &&
+		git add z &&
+		test_tick &&
+		git commit -m "O" &&
+
+		git branch O &&
+		git branch A &&
+		git branch B &&
+
+		git checkout A &&
+		test_tick &&
+		git commit --allow-empty -m "A" &&
+
+		git checkout B &&
+		git mv z y &&
+		echo d1 > y/d &&
+		mkdir z &&
+		echo d2 > z/d &&
+		git add y/d z/d &&
+		test_tick &&
+		git commit -m "B"
+	)
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6043-merge-rename-directories/6e/.git/
+[master (root-commit) 4e96174] O
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 z/b
+ create mode 100644 z/c
+Switched to branch 'A'
+[A 405f2b4] A
+ Author: A U Thor <author@example.com>
+Switched to branch 'B'
+[B c2a120e] B
+ Author: A U Thor <author@example.com>
+ 4 files changed, 2 insertions(+)
+ rename {z => y}/b (100%)
+ rename {z => y}/c (100%)
+ create mode 100644 y/d
+ create mode 100644 z/d
+ok 39 - 6e-setup: Add/add from one side
+
+expecting success: 
+	(
+		cd 6e &&
+
+		git checkout A^0 &&
+
+		git merge -s recursive B^0 &&
+
+		git ls-files -s >out &&
+		test_line_count = 4 out &&
+		git ls-files -u >out &&
+		test_line_count = 0 out &&
+		git ls-files -o >out &&
+		test_line_count = 1 out &&
+
+		git rev-parse >actual \
+			HEAD:y/b HEAD:y/c HEAD:y/d HEAD:z/d &&
+		git rev-parse >expect \
+			O:z/b    O:z/c    B:y/d    B:z/d &&
+		test_cmp expect actual
+	)
+
+Note: checking out '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 performing another checkout.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -b with the checkout command again. Example:
+
+  git checkout -b <new-branch-name>
+
+HEAD is now at 405f2b4 A
+Merging:
+405f2b4 A
+virtual B^0
+found 1 common ancestor:
+4e96174 O
+Merge made by the 'recursive' strategy.
+ {z => y}/b | 0
+ {z => y}/c | 0
+ y/d        | 1 +
+ z/d        | 1 +
+ 4 files changed, 2 insertions(+)
+ rename {z => y}/b (100%)
+ rename {z => y}/c (100%)
+ create mode 100644 y/d
+ create mode 100644 z/d
+ok 40 - 6e-check: Add/add from one side
+
+expecting success: 
+	test_create_repo 7a &&
+	(
+		cd 7a &&
+
+		mkdir z &&
+		echo b >z/b &&
+		echo c >z/c &&
+		git add z &&
+		test_tick &&
+		git commit -m "O" &&
+
+		git branch O &&
+		git branch A &&
+		git branch B &&
+
+		git checkout A &&
+		git mv z y &&
+		test_tick &&
+		git commit -m "A" &&
+
+		git checkout B &&
+		mkdir w &&
+		mkdir x &&
+		git mv z/b w/ &&
+		git mv z/c x/ &&
+		echo d > z/d &&
+		git add z/d &&
+		test_tick &&
+		git commit -m "B"
+	)
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6043-merge-rename-directories/7a/.git/
+[master (root-commit) 4e96174] O
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 z/b
+ create mode 100644 z/c
+Switched to branch 'A'
+[A 4e9f86d] A
+ Author: A U Thor <author@example.com>
+ 2 files changed, 0 insertions(+), 0 deletions(-)
+ rename {z => y}/b (100%)
+ rename {z => y}/c (100%)
+Switched to branch 'B'
+[B e02cee0] B
+ Author: A U Thor <author@example.com>
+ 3 files changed, 1 insertion(+)
+ rename {z => w}/b (100%)
+ rename {z => x}/c (100%)
+ create mode 100644 z/d
+ok 41 - 7a-setup: rename-dir vs. rename-dir (NOT split evenly) PLUS add-other-file
+
+expecting success: 
+	(
+		cd 7a &&
+
+		git checkout A^0 &&
+
+		test_must_fail git merge -s recursive B^0 >out &&
+		test_i18ngrep "CONFLICT (rename/rename).*z/b.*y/b.*w/b" out &&
+		test_i18ngrep "CONFLICT (rename/rename).*z/c.*y/c.*x/c" out &&
+
+		git ls-files -s >out &&
+		test_line_count = 7 out &&
+		git ls-files -u >out &&
+		test_line_count = 6 out &&
+		git ls-files -o >out &&
+		test_line_count = 1 out &&
+
+		git rev-parse >actual \
+			:1:z/b :2:y/b :3:w/b :1:z/c :2:y/c :3:x/c :0:y/d &&
+		git rev-parse >expect \
+			 O:z/b  O:z/b  O:z/b  O:z/c  O:z/c  O:z/c  B:z/d &&
+		test_cmp expect actual &&
+
+		git hash-object >actual \
+			y/b   w/b   y/c   x/c &&
+		git rev-parse >expect \
+			O:z/b O:z/b O:z/c O:z/c &&
+		test_cmp expect actual
+	)
+
+Note: checking out '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 performing another checkout.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -b with the checkout command again. Example:
+
+  git checkout -b <new-branch-name>
+
+HEAD is now at 4e9f86d A
+CONFLICT (rename/rename): Rename "z/b"->"y/b" in branch "HEAD" rename "z/b"->"w/b" in "B^0"
+CONFLICT (rename/rename): Rename "z/c"->"y/c" in branch "HEAD" rename "z/c"->"x/c" in "B^0"
+ok 42 - 7a-check: rename-dir vs. rename-dir (NOT split evenly) PLUS add-other-file
+
+expecting success: 
+	test_create_repo 7b &&
+	(
+		cd 7b &&
+
+		mkdir z &&
+		mkdir x &&
+		mkdir w &&
+		echo b >z/b &&
+		echo c >z/c &&
+		echo d1 > x/d &&
+		echo d2 > w/d &&
+		git add z x w &&
+		test_tick &&
+		git commit -m "O" &&
+
+		git branch O &&
+		git branch A &&
+		git branch B &&
+
+		git checkout A &&
+		git mv z y &&
+		git mv w/d y/ &&
+		test_tick &&
+		git commit -m "A" &&
+
+		git checkout B &&
+		git mv x/d z/ &&
+		rmdir x &&
+		test_tick &&
+		git commit -m "B"
+	)
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6043-merge-rename-directories/7b/.git/
+[master (root-commit) 3a7ba74] O
+ Author: A U Thor <author@example.com>
+ 4 files changed, 4 insertions(+)
+ create mode 100644 w/d
+ create mode 100644 x/d
+ create mode 100644 z/b
+ create mode 100644 z/c
+Switched to branch 'A'
+[A 0808992] A
+ Author: A U Thor <author@example.com>
+ 3 files changed, 0 insertions(+), 0 deletions(-)
+ rename {z => y}/b (100%)
+ rename {z => y}/c (100%)
+ rename {w => y}/d (100%)
+Switched to branch 'B'
+[B 946a998] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename {x => z}/d (100%)
+ok 43 - 7b-setup: rename/rename(2to1), but only due to transitive rename
+
+expecting success: 
+	(
+		cd 7b &&
+
+		git checkout A^0 &&
+
+		test_must_fail git merge -s recursive B^0 >out &&
+		test_i18ngrep "CONFLICT (rename/rename)" out &&
+
+		git ls-files -s >out &&
+		test_line_count = 4 out &&
+		git ls-files -u >out &&
+		test_line_count = 2 out &&
+		git ls-files -o >out &&
+		test_line_count = 3 out &&
+
+		git rev-parse >actual \
+			:0:y/b :0:y/c :2:y/d :3:y/d &&
+		git rev-parse >expect \
+			 O:z/b  O:z/c  O:w/d  O:x/d &&
+		test_cmp expect actual &&
+
+		test_path_is_missing y/d &&
+		test_path_is_file y/d~HEAD &&
+		test_path_is_file y/d~B^0 &&
+
+		git hash-object >actual \
+			y/d~HEAD y/d~B^0 &&
+		git rev-parse >expect \
+			O:w/d    O:x/d &&
+		test_cmp expect actual
+	)
+
+Note: checking out '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 performing another checkout.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -b with the checkout command again. Example:
+
+  git checkout -b <new-branch-name>
+
+HEAD is now at 0808992 A
+CONFLICT (rename/rename): Rename w/d->y/d in HEAD. Rename x/d->y/d in B^0
+ok 44 - 7b-check: rename/rename(2to1), but only due to transitive rename
+
+expecting success: 
+	test_create_repo 7c &&
+	(
+		cd 7c &&
+
+		mkdir z &&
+		echo b >z/b &&
+		echo c >z/c &&
+		mkdir x &&
+		echo d >x/d &&
+		git add z x &&
+		test_tick &&
+		git commit -m "O" &&
+
+		git branch O &&
+		git branch A &&
+		git branch B &&
+
+		git checkout A &&
+		git mv z y &&
+		git mv x w &&
+		test_tick &&
+		git commit -m "A" &&
+
+		git checkout B &&
+		git mv x/d z/ &&
+		rmdir x &&
+		test_tick &&
+		git commit -m "B"
+	)
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6043-merge-rename-directories/7c/.git/
+[master (root-commit) 1e3967e] O
+ Author: A U Thor <author@example.com>
+ 3 files changed, 3 insertions(+)
+ create mode 100644 x/d
+ create mode 100644 z/b
+ create mode 100644 z/c
+Switched to branch 'A'
+[A 1e0f8cf] A
+ Author: A U Thor <author@example.com>
+ 3 files changed, 0 insertions(+), 0 deletions(-)
+ rename {x => w}/d (100%)
+ rename {z => y}/b (100%)
+ rename {z => y}/c (100%)
+Switched to branch 'B'
+[B c9f07f0] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename {x => z}/d (100%)
+ok 45 - 7c-setup: rename/rename(1to...2or3); transitive rename may add complexity
+
+expecting success: 
+	(
+		cd 7c &&
+
+		git checkout A^0 &&
+
+		test_must_fail git merge -s recursive B^0 >out &&
+		test_i18ngrep "CONFLICT (rename/rename).*x/d.*w/d.*y/d" out &&
+
+		git ls-files -s >out &&
+		test_line_count = 5 out &&
+		git ls-files -u >out &&
+		test_line_count = 3 out &&
+		git ls-files -o >out &&
+		test_line_count = 1 out &&
+
+		git rev-parse >actual \
+			:0:y/b :0:y/c :1:x/d :2:w/d :3:y/d &&
+		git rev-parse >expect \
+			 O:z/b  O:z/c  O:x/d  O:x/d  O:x/d &&
+		test_cmp expect actual
+	)
+
+Note: checking out '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 performing another checkout.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -b with the checkout command again. Example:
+
+  git checkout -b <new-branch-name>
+
+HEAD is now at 1e0f8cf A
+CONFLICT (rename/rename): Rename "x/d"->"w/d" in branch "HEAD" rename "x/d"->"y/d" in "B^0"
+ok 46 - 7c-check: rename/rename(1to...2or3); transitive rename may add complexity
+
+expecting success: 
+	test_create_repo 7d &&
+	(
+		cd 7d &&
+
+		mkdir z &&
+		echo b >z/b &&
+		echo c >z/c &&
+		mkdir x &&
+		echo d >x/d &&
+		git add z x &&
+		test_tick &&
+		git commit -m "O" &&
+
+		git branch O &&
+		git branch A &&
+		git branch B &&
+
+		git checkout A &&
+		git mv z y &&
+		git rm -rf x &&
+		test_tick &&
+		git commit -m "A" &&
+
+		git checkout B &&
+		git mv x/d z/ &&
+		rmdir x &&
+		test_tick &&
+		git commit -m "B"
+	)
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6043-merge-rename-directories/7d/.git/
+[master (root-commit) 1e3967e] O
+ Author: A U Thor <author@example.com>
+ 3 files changed, 3 insertions(+)
+ create mode 100644 x/d
+ create mode 100644 z/b
+ create mode 100644 z/c
+Switched to branch 'A'
+rm 'x/d'
+[A 202563c] A
+ Author: A U Thor <author@example.com>
+ 3 files changed, 1 deletion(-)
+ delete mode 100644 x/d
+ rename {z => y}/b (100%)
+ rename {z => y}/c (100%)
+Switched to branch 'B'
+[B c9f07f0] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename {x => z}/d (100%)
+ok 47 - 7d-setup: transitive rename involved in rename/delete; how is it reported?
+
+expecting success: 
+	(
+		cd 7d &&
+
+		git checkout A^0 &&
+
+		test_must_fail git merge -s recursive B^0 >out &&
+		test_i18ngrep "CONFLICT (rename/delete).*x/d.*y/d" out &&
+
+		git ls-files -s >out &&
+		test_line_count = 3 out &&
+		git ls-files -u >out &&
+		test_line_count = 1 out &&
+		git ls-files -o >out &&
+		test_line_count = 1 out &&
+
+		git rev-parse >actual \
+			:0:y/b :0:y/c :3:y/d &&
+		git rev-parse >expect \
+			 O:z/b  O:z/c  O:x/d &&
+		test_cmp expect actual
+	)
+
+Note: checking out '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 performing another checkout.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -b with the checkout command again. Example:
+
+  git checkout -b <new-branch-name>
+
+HEAD is now at 202563c A
+CONFLICT (rename/delete): x/d deleted in HEAD and renamed to y/d in B^0. Version B^0 of y/d left in tree.
+ok 48 - 7d-check: transitive rename involved in rename/delete; how is it reported?
+
+expecting success: 
+	test_create_repo 7e &&
+	(
+		cd 7e &&
+
+		mkdir z &&
+		echo b >z/b &&
+		echo c >z/c &&
+		mkdir x &&
+		echo d1 >x/d &&
+		git add z x &&
+		test_tick &&
+		git commit -m "O" &&
+
+		git branch O &&
+		git branch A &&
+		git branch B &&
+
+		git checkout A &&
+		git mv z y &&
+		git rm x/d &&
+		mkdir -p x/d &&
+		mkdir -p y/d &&
+		echo f >x/d/f &&
+		echo g >y/d/g &&
+		git add x/d/f y/d/g &&
+		test_tick &&
+		git commit -m "A" &&
+
+		git checkout B &&
+		git mv x/d z/ &&
+		rmdir x &&
+		test_tick &&
+		git commit -m "B"
+	)
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6043-merge-rename-directories/7e/.git/
+[master (root-commit) cb15013] O
+ Author: A U Thor <author@example.com>
+ 3 files changed, 3 insertions(+)
+ create mode 100644 x/d
+ create mode 100644 z/b
+ create mode 100644 z/c
+Switched to branch 'A'
+rm 'x/d'
+[A 3ba9059] A
+ Author: A U Thor <author@example.com>
+ 5 files changed, 2 insertions(+), 1 deletion(-)
+ delete mode 100644 x/d
+ create mode 100644 x/d/f
+ rename {z => y}/b (100%)
+ rename {z => y}/c (100%)
+ create mode 100644 y/d/g
+Switched to branch 'B'
+[B 0710b4b] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename {x => z}/d (100%)
+ok 49 - 7e-setup: transitive rename in rename/delete AND dirs in the way
+
+expecting success: 
+	(
+		cd 7e &&
+
+		git checkout A^0 &&
+
+		test_must_fail git merge -s recursive B^0 >out &&
+		test_i18ngrep "CONFLICT (rename/delete).*x/d.*y/d" out &&
+
+		git ls-files -s >out &&
+		test_line_count = 5 out &&
+		git ls-files -u >out &&
+		test_line_count = 1 out &&
+		git ls-files -o >out &&
+		test_line_count = 2 out &&
+
+		git rev-parse >actual \
+			:0:x/d/f :0:y/d/g :0:y/b :0:y/c :3:y/d &&
+		git rev-parse >expect \
+			 A:x/d/f  A:y/d/g  O:z/b  O:z/c  O:x/d &&
+		test_cmp expect actual &&
+
+		git hash-object y/d~B^0 >actual &&
+		git rev-parse O:x/d >expect &&
+		test_cmp expect actual
+	)
+
+Note: checking out '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 performing another checkout.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -b with the checkout command again. Example:
+
+  git checkout -b <new-branch-name>
+
+HEAD is now at 3ba9059 A
+CONFLICT (rename/delete): x/d deleted in HEAD and renamed to y/d in B^0. Version B^0 of y/d left in tree at y/d~B^0.
+ok 50 - 7e-check: transitive rename in rename/delete AND dirs in the way
+
+expecting success: 
+	test_create_repo 8a &&
+	(
+		cd 8a &&
+
+		mkdir x &&
+		mkdir y &&
+		echo a >x/a &&
+		echo b >x/b &&
+		echo c >y/c &&
+		echo d >y/d &&
+		git add x y &&
+		test_tick &&
+		git commit -m "O" &&
+
+		git branch O &&
+		git branch A &&
+		git branch B &&
+
+		git checkout A &&
+		echo e >x/e &&
+		echo f >y/f &&
+		git add x/e y/f &&
+		test_tick &&
+		git commit -m "A" &&
+
+		git checkout B &&
+		git mv y z &&
+		git mv x y &&
+		test_tick &&
+		git commit -m "B"
+	)
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6043-merge-rename-directories/8a/.git/
+[master (root-commit) 644420a] O
+ Author: A U Thor <author@example.com>
+ 4 files changed, 4 insertions(+)
+ create mode 100644 x/a
+ create mode 100644 x/b
+ create mode 100644 y/c
+ create mode 100644 y/d
+Switched to branch 'A'
+[A 6afefa0] A
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 x/e
+ create mode 100644 y/f
+Switched to branch 'B'
+[B ccdb287] B
+ Author: A U Thor <author@example.com>
+ 4 files changed, 0 insertions(+), 0 deletions(-)
+ rename {x => y}/a (100%)
+ rename {x => y}/b (100%)
+ rename {y => z}/c (100%)
+ rename {y => z}/d (100%)
+ok 51 - 8a-setup: Dual-directory rename, one into the others way
+
+expecting success: 
+	(
+		cd 8a &&
+
+		git checkout A^0 &&
+
+		git merge -s recursive B^0 &&
+
+		git ls-files -s >out &&
+		test_line_count = 6 out &&
+		git ls-files -u >out &&
+		test_line_count = 0 out &&
+		git ls-files -o >out &&
+		test_line_count = 1 out &&
+
+		git rev-parse >actual \
+			HEAD:y/a HEAD:y/b HEAD:y/e HEAD:y/f HEAD:z/c HEAD:z/d &&
+		git rev-parse >expect \
+			O:x/a    O:x/b    A:x/e    A:y/f    O:y/c    O:y/d &&
+		test_cmp expect actual
+	)
+
+Note: checking out '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 performing another checkout.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -b with the checkout command again. Example:
+
+  git checkout -b <new-branch-name>
+
+HEAD is now at 6afefa0 A
+Merging:
+6afefa0 A
+virtual B^0
+found 1 common ancestor:
+644420a O
+Merge made by the 'recursive' strategy.
+ {x => y}/a | 0
+ {x => y}/b | 0
+ {x => y}/e | 0
+ {y => z}/c | 0
+ {y => z}/d | 0
+ 5 files changed, 0 insertions(+), 0 deletions(-)
+ rename {x => y}/a (100%)
+ rename {x => y}/b (100%)
+ rename {x => y}/e (100%)
+ rename {y => z}/c (100%)
+ rename {y => z}/d (100%)
+ok 52 - 8a-check: Dual-directory rename, one into the others way
+
+expecting success: 
+	test_create_repo 8b &&
+	(
+		cd 8b &&
+
+		mkdir x &&
+		mkdir y &&
+		echo a1 >x/a &&
+		echo b1 >x/b &&
+		echo a2 >y/a &&
+		echo b2 >y/b &&
+		git add x y &&
+		test_tick &&
+		git commit -m "O" &&
+
+		git branch O &&
+		git branch A &&
+		git branch B &&
+
+		git checkout A &&
+		echo e1 >x/e &&
+		echo e2 >y/e &&
+		git add x/e y/e &&
+		test_tick &&
+		git commit -m "A" &&
+
+		git checkout B &&
+		git mv y z &&
+		git mv x y &&
+		test_tick &&
+		git commit -m "B"
+	)
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6043-merge-rename-directories/8b/.git/
+[master (root-commit) d95116f] O
+ Author: A U Thor <author@example.com>
+ 4 files changed, 4 insertions(+)
+ create mode 100644 x/a
+ create mode 100644 x/b
+ create mode 100644 y/a
+ create mode 100644 y/b
+Switched to branch 'A'
+[A 8d5e46a] A
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 x/e
+ create mode 100644 y/e
+Switched to branch 'B'
+[B a7bdbf9] B
+ Author: A U Thor <author@example.com>
+ 6 files changed, 4 insertions(+), 4 deletions(-)
+ delete mode 100644 x/a
+ delete mode 100644 x/b
+ create mode 100644 z/a
+ create mode 100644 z/b
+ok 53 - 8b-setup: Dual-directory rename, one into the others way, with conflicting filenames
+
+expecting success: 
+	(
+		cd 8b &&
+
+		git checkout A^0 &&
+
+		git merge -s recursive B^0 &&
+
+		git ls-files -s >out &&
+		test_line_count = 6 out &&
+		git ls-files -u >out &&
+		test_line_count = 0 out &&
+		git ls-files -o >out &&
+		test_line_count = 1 out &&
+
+		git rev-parse >actual \
+			HEAD:y/a HEAD:y/b HEAD:z/a HEAD:z/b HEAD:x/e HEAD:y/e &&
+		git rev-parse >expect \
+			O:x/a    O:x/b    O:y/a    O:y/b    A:x/e    A:y/e &&
+		test_cmp expect actual
+	)
 
-ok 195 - %(color) omitted without tty
+Note: checking out 'A^0'.
 
-checking prerequisite: TTY
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by performing another checkout.
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
-	test_have_prereq PERL &&
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -b with the checkout command again. Example:
 
-	# Reading from the pty master seems to get stuck _sometimes_
-	# on Mac OS X 10.5.0, using Perl 5.10.0 or 5.8.9.
-	#
-	# Reproduction recipe: run
-	#
-	#	i=0
-	#	while ./test-terminal.perl echo hi $i
-	#	do
-	#		: $((i = $i + 1))
-	#	done
-	#
-	# After 2000 iterations or so it hangs.
-	# https://rt.cpan.org/Ticket/Display.html?id=65692
-	#
-	test "$(uname -s)" != Darwin &&
+  git checkout -b <new-branch-name>
 
-	perl "$TEST_DIRECTORY"/test-terminal.perl \
-		sh -c "test -t 1 && test -t 2"
+HEAD is now at 8d5e46a A
+Merging:
+8d5e46a A
+virtual B^0
+found 1 common ancestor:
+d95116f O
+Removing x/b
+Removing x/a
+Merge made by the 'recursive' strategy.
+ x/a | 1 -
+ x/b | 1 -
+ y/a | 2 +-
+ y/b | 2 +-
+ z/a | 1 +
+ z/b | 1 +
+ 6 files changed, 4 insertions(+), 4 deletions(-)
+ delete mode 100644 x/a
+ delete mode 100644 x/b
+ create mode 100644 z/a
+ create mode 100644 z/b
+ok 54 - 8b-check: Dual-directory rename, one into the others way, with conflicting filenames
 
-)
-prerequisite TTY ok
 expecting success: 
-	test_terminal git tag $color_args >actual.raw &&
-	test_decode_color <actual.raw >actual &&
-	test_cmp expect.color actual
+	test_create_repo 8c &&
+	(
+		cd 8c &&
 
-ok 196 - %(color) present with tty
+		mkdir z &&
+		echo b >z/b &&
+		echo c >z/c &&
+		test_seq 1 10 >z/d &&
+		git add z &&
+		test_tick &&
+		git commit -m "O" &&
 
-expecting success: 
-	git tag --color $color_args >actual.raw &&
-	test_decode_color <actual.raw >actual &&
-	test_cmp expect.color actual
+		git branch O &&
+		git branch A &&
+		git branch B &&
 
-ok 197 - --color overrides auto-color
+		git checkout A &&
+		git rm z/d &&
+		git mv z y &&
+		test_tick &&
+		git commit -m "A" &&
 
-expecting success: 
-	git -c color.ui=always tag $color_args >actual.raw &&
-	test_decode_color <actual.raw >actual &&
-	test_cmp expect.color actual
+		git checkout B &&
+		echo 11 >z/d &&
+		test_chmod +x z/d &&
+		echo e >z/e &&
+		git add z/d z/e &&
+		test_tick &&
+		git commit -m "B"
+	)
 
-ok 198 - color.ui=always overrides auto-color
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6043-merge-rename-directories/8c/.git/
+[master (root-commit) a8ba9b3] O
+ Author: A U Thor <author@example.com>
+ 3 files changed, 12 insertions(+)
+ create mode 100644 z/b
+ create mode 100644 z/c
+ create mode 100644 z/d
+Switched to branch 'A'
+rm 'z/d'
+[A d5ba1c0] A
+ Author: A U Thor <author@example.com>
+ 3 files changed, 10 deletions(-)
+ rename {z => y}/b (100%)
+ rename {z => y}/c (100%)
+ delete mode 100644 z/d
+Switched to branch 'B'
+[B 1757e3f] B
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+), 10 deletions(-)
+ mode change 100644 => 100755 z/d
+ create mode 100644 z/e
+ok 55 - 8c-setup: modify/delete or rename+modify/delete?
 
 expecting success: 
-	git tag mergetest-1 HEAD~2 &&
-	git tag mergetest-2 HEAD~1 &&
-	git tag mergetest-3 HEAD
+	(
+		cd 8c &&
 
-ok 199 - setup --merged test tags
+		git checkout A^0 &&
 
-expecting success: 
-	cat >expect <<-\EOF &&
-	mergetest-1
-	mergetest-2
-	EOF
-	git tag --merged=mergetest-2 "mergetest*" >actual &&
-	test_cmp expect actual
+		test_must_fail git merge -s recursive B^0 >out &&
+		test_i18ngrep "CONFLICT (modify/delete).* z/d" out &&
 
-ok 200 - --merged can be used in non-list mode
+		git ls-files -s >out &&
+		test_line_count = 5 out &&
+		git ls-files -u >out &&
+		test_line_count = 2 out &&
+		git ls-files -o >out &&
+		test_line_count = 1 out &&
 
-expecting success: 
-	test_must_fail git tag --merged HEAD --no-merged HEAD
+		git rev-parse >actual \
+			:0:y/b :0:y/c :0:y/e :1:z/d :3:z/d &&
+		git rev-parse >expect \
+			 O:z/b  O:z/c  B:z/e  O:z/d  B:z/d &&
+		test_cmp expect actual &&
 
-error: option `no-merged' is incompatible with --merged
-ok 201 - --merged is incompatible with --no-merged
+		test_must_fail git rev-parse :2:z/d &&
+		git ls-files -s z/d | grep ^100755 &&
+		test_path_is_file z/d &&
+		test_path_is_missing y/d
+	)
 
-expecting success: 
-	cat >expect <<-\EOF &&
-	mergetest-1
-	mergetest-2
-	EOF
-	git tag -l --merged=mergetest-2 mergetest-* >actual &&
-	test_cmp expect actual
+Note: checking out 'A^0'.
 
-ok 202 - --merged shows merged tags
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by performing another checkout.
 
-expecting success: 
-	cat >expect <<-\EOF &&
-	mergetest-3
-	EOF
-	git tag -l --no-merged=mergetest-2 mergetest-* >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 -b with the checkout command again. Example:
 
-ok 203 - --no-merged show unmerged tags
+  git checkout -b <new-branch-name>
+
+HEAD is now at d5ba1c0 A
+CONFLICT (modify/delete): z/d deleted in HEAD and modified in B^0. Version B^0 of z/d left in tree.
+fatal: Path 'z/d' is in the index, but not at stage 2.
+Did you mean ':1:z/d'?
+:2:z/d
+100755 b4de3947675361a7770d29b8982c407b0ec6b2a0 3	z/d
+ok 56 - 8c-check: modify/delete or rename+modify/delete
 
 expecting success: 
-	git tag --no-merged=mergetest-2 mergetest-* >actual &&
-	test_cmp expect actual
+	test_create_repo 8d &&
+	(
+		cd 8d &&
 
-ok 204 - --no-merged can be used in non-list mode
+		mkdir z &&
+		echo b >z/b &&
+		echo c >z/c &&
+		test_seq 1 10 >z/d &&
+		git add z &&
+		test_tick &&
+		git commit -m "O" &&
 
-expecting success: 
-	git tag ambiguous &&
-	git branch ambiguous &&
-	echo ambiguous >expect &&
-	git tag -l ambiguous >actual &&
-	test_cmp expect actual
+		git branch O &&
+		git branch A &&
+		git branch B &&
 
-ok 205 - ambiguous branch/tags not marked
+		git checkout A &&
+		git rm z/d &&
+		git mv z y &&
+		test_tick &&
+		git commit -m "A" &&
 
-expecting success: 
-	(
-		git init no-contains &&
-		cd no-contains &&
-		test_commit v0.1 &&
-		test_commit v0.2 &&
-		test_commit v0.3 &&
-		test_commit v0.4 &&
-		test_commit v0.5 &&
-		cat >expected <<-\EOF &&
-		v0.2
-		v0.3
-		v0.4
-		EOF
-		git tag --contains v0.2 --no-contains v0.5 >actual &&
-		test_cmp expected actual
+		git checkout B &&
+		echo e >z/e &&
+		git add z/e &&
+		test_tick &&
+		git commit -m "B"
 	)
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7004-tag/no-contains/.git/
-[master (root-commit) fdf35a1] v0.1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 v0.1.t
-[master 82f1d18] v0.2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 v0.2.t
-[master 4c097b6] v0.3
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6043-merge-rename-directories/8d/.git/
+[master (root-commit) a8ba9b3] O
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 v0.3.t
-[master 8804202] v0.4
+ 3 files changed, 12 insertions(+)
+ create mode 100644 z/b
+ create mode 100644 z/c
+ create mode 100644 z/d
+Switched to branch 'A'
+rm 'z/d'
+[A d5ba1c0] A
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 v0.4.t
-[master 947a091] v0.5
+ 3 files changed, 10 deletions(-)
+ rename {z => y}/b (100%)
+ rename {z => y}/c (100%)
+ delete mode 100644 z/d
+Switched to branch 'B'
+[B 12eaccc] B
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 v0.5.t
-ok 206 - --contains combined with --no-contains
+ create mode 100644 z/e
+ok 57 - 8d-setup: rename/delete...or not?
 
 expecting success: 
-	cd no-contains &&
-	blob=$(git rev-parse v0.3:v0.3.t) &&
-	tree=$(git rev-parse v0.3^{tree}) &&
-	git tag tag-blob $blob &&
-	git tag tag-tree $tree &&
-	git tag --contains v0.3 >actual &&
-	cat >expected <<-\EOF &&
-	v0.3
-	v0.4
-	v0.5
-	EOF
-	test_cmp expected actual &&
-	git tag --no-contains v0.3 >actual &&
-	cat >expected <<-\EOF &&
-	v0.1
-	v0.2
-	EOF
-	test_cmp expected actual
+	(
+		cd 8d &&
 
-ok 207 - Does --[no-]contains stop at commits? Yes!
+		git checkout A^0 &&
 
-# passed all 207 test(s)
-1..207
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t7300-clean.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7300-clean/.git/
-expecting success: 
+		git merge -s recursive B^0 &&
 
-	mkdir -p src &&
-	touch src/part1.c Makefile &&
-	echo build >.gitignore &&
-	echo \*.o >>.gitignore &&
-	git add . &&
-	git commit -m setup &&
-	touch src/part2.c README &&
-	git add .
+		git ls-files -s >out &&
+		test_line_count = 3 out &&
 
+		git rev-parse >actual \
+			HEAD:y/b HEAD:y/c HEAD:y/e &&
+		git rev-parse >expect \
+			O:z/b    O:z/c    B:z/e &&
+		test_cmp expect actual
+	)
 
-[master (root-commit) feca009] setup
- Author: A U Thor <author@example.com>
- 3 files changed, 2 insertions(+)
- create mode 100644 .gitignore
- create mode 100644 Makefile
- create mode 100644 src/part1.c
-ok 1 - setup
+Note: checking out 'A^0'.
 
-expecting success: 
-	git update-index --skip-worktree .gitignore &&
-	rm .gitignore &&
-	mkdir -p build docs &&
-	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
-	git clean &&
-	test -f Makefile &&
-	test -f README &&
-	test -f src/part1.c &&
-	test -f src/part2.c &&
-	test ! -f a.out &&
-	test ! -f src/part3.c &&
-	test -f docs/manual.txt &&
-	test -f obj.o &&
-	test -f build/lib.so &&
-	git update-index --no-skip-worktree .gitignore &&
-	git checkout .gitignore
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by performing another checkout.
 
-Removing a.out
-Removing src/part3.c
-ok 2 - git clean with skip-worktree .gitignore
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -b with the checkout command again. Example:
 
-expecting success: 
+  git checkout -b <new-branch-name>
 
-	mkdir -p build docs &&
-	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
-	git clean &&
-	test -f Makefile &&
-	test -f README &&
-	test -f src/part1.c &&
-	test -f src/part2.c &&
-	test ! -f a.out &&
-	test ! -f src/part3.c &&
-	test -f docs/manual.txt &&
-	test -f obj.o &&
-	test -f build/lib.so
+HEAD is now at d5ba1c0 A
+Merging:
+d5ba1c0 A
+virtual B^0
+found 1 common ancestor:
+a8ba9b3 O
+Skipped y/c (merged same as existing)
+Skipped y/b (merged same as existing)
+Merge made by the 'recursive' strategy.
+ y/e | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 y/e
+ok 58 - 8d-check: rename/delete...or not?
 
+expecting success: 
+	test_create_repo 8e &&
+	(
+		cd 8e &&
 
-Removing a.out
-Removing src/part3.c
-ok 3 - git clean
+		mkdir z &&
+		echo b >z/b &&
+		echo c >z/c &&
+		git add z &&
+		test_tick &&
+		git commit -m "O" &&
 
-expecting success: 
+		git branch O &&
+		git branch A &&
+		git branch B &&
 
-	mkdir -p build docs &&
-	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
-	git clean src/ &&
-	test -f Makefile &&
-	test -f README &&
-	test -f src/part1.c &&
-	test -f src/part2.c &&
-	test -f a.out &&
-	test ! -f src/part3.c &&
-	test -f docs/manual.txt &&
-	test -f obj.o &&
-	test -f build/lib.so
+		git checkout A &&
+		git mv z y &&
+		test_tick &&
+		git commit -m "A" &&
 
+		git checkout B &&
+		git mv z w &&
+		mkdir z &&
+		echo d >z/d &&
+		git add z/d &&
+		test_tick &&
+		git commit -m "B"
+	)
 
-Removing src/part3.c
-ok 4 - git clean src/
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6043-merge-rename-directories/8e/.git/
+[master (root-commit) 4e96174] O
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 z/b
+ create mode 100644 z/c
+Switched to branch 'A'
+[A 4e9f86d] A
+ Author: A U Thor <author@example.com>
+ 2 files changed, 0 insertions(+), 0 deletions(-)
+ rename {z => y}/b (100%)
+ rename {z => y}/c (100%)
+Switched to branch 'B'
+[B 7a02f25] B
+ Author: A U Thor <author@example.com>
+ 3 files changed, 1 insertion(+)
+ rename {z => w}/b (100%)
+ rename {z => w}/c (100%)
+ create mode 100644 z/d
+ok 59 - 8e-setup: Both sides rename, one side adds to original directory
 
 expecting success: 
+	(
+		cd 8e &&
 
-	mkdir -p build docs &&
-	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
-	git clean src/ src/ &&
-	test -f Makefile &&
-	test -f README &&
-	test -f src/part1.c &&
-	test -f src/part2.c &&
-	test -f a.out &&
-	test ! -f src/part3.c &&
-	test -f docs/manual.txt &&
-	test -f obj.o &&
-	test -f build/lib.so
+		git checkout A^0 &&
 
+		test_must_fail git merge -s recursive B^0 >out 2>err &&
+		test_i18ngrep CONFLICT.*rename/rename.*z/c.*y/c.*w/c out &&
+		test_i18ngrep CONFLICT.*rename/rename.*z/b.*y/b.*w/b out &&
 
-Removing src/part3.c
-ok 5 - git clean src/ src/
+		git ls-files -s >out &&
+		test_line_count = 7 out &&
+		git ls-files -u >out &&
+		test_line_count = 6 out &&
+		git ls-files -o >out &&
+		test_line_count = 2 out &&
 
-expecting success: 
+		git rev-parse >actual \
+			:1:z/b :2:y/b :3:w/b :1:z/c :2:y/c :3:w/c :0:y/d &&
+		git rev-parse >expect \
+			 O:z/b  O:z/b  O:z/b  O:z/c  O:z/c  O:z/c  B:z/d &&
+		test_cmp expect actual &&
 
-	mkdir -p build docs src/test &&
-	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so src/test/1.c &&
-	(cd src/ && git clean) &&
-	test -f Makefile &&
-	test -f README &&
-	test -f src/part1.c &&
-	test -f src/part2.c &&
-	test -f a.out &&
-	test ! -f src/part3.c &&
-	test -f src/test/1.c &&
-	test -f docs/manual.txt &&
-	test -f obj.o &&
-	test -f build/lib.so
+		git hash-object >actual \
+			y/b   w/b   y/c   w/c &&
+		git rev-parse >expect \
+			O:z/b O:z/b O:z/c O:z/c &&
+		test_cmp expect actual &&
 
+		test_path_is_missing z/b &&
+		test_path_is_missing z/c
+	)
 
-Removing part3.c
-ok 6 - git clean with prefix
+Note: checking out 'A^0'.
 
-expecting success: 
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by performing another checkout.
 
-	mkdir -p build docs &&
-	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
-	would_clean=$(
-		cd docs &&
-		git clean -n ../src |
-		sed -n -e "s|^Would remove ||p"
-	) &&
-	verbose test "$would_clean" = ../src/part3.c
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -b with the checkout command again. Example:
 
-ok 7 - git clean with relative prefix
+  git checkout -b <new-branch-name>
+
+HEAD is now at 4e9f86d A
+CONFLICT (rename/rename): Rename "z/c"->"y/c" in branch "HEAD" rename "z/c"->"w/c" in "B^0"
+CONFLICT (rename/rename): Rename "z/b"->"y/b" in branch "HEAD" rename "z/b"->"w/b" in "B^0"
+ok 60 - 8e-check: Both sides rename, one side adds to original directory
 
 expecting success: 
+	test_create_repo 9a &&
+	(
+		cd 9a &&
 
-	mkdir -p build docs &&
-	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
-	would_clean=$(
-		cd docs &&
-		git clean -n "$(pwd)/../src" |
-		sed -n -e "s|^Would remove ||p"
-	) &&
-	verbose test "$would_clean" = ../src/part3.c
+		mkdir -p z/d &&
+		echo b >z/b &&
+		echo c >z/c &&
+		echo e >z/d/e &&
+		echo f >z/d/f &&
+		echo g >z/d/g &&
+		git add z &&
+		test_tick &&
+		git commit -m "O" &&
 
-ok 8 - git clean with absolute path
+		git branch O &&
+		git branch A &&
+		git branch B &&
 
-expecting success: 
+		git checkout A &&
+		mkdir x &&
+		git mv z/d x/w &&
+		git mv z y &&
+		test_tick &&
+		git commit -m "A" &&
 
-	mkdir -p build docs &&
-	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
-	(
-		cd docs &&
-		test_must_fail git clean -n ../..
+		git checkout B &&
+		echo h >z/d/h &&
+		echo i >z/i &&
+		git add z &&
+		test_tick &&
+		git commit -m "B"
 	)
 
-fatal: ../..: '../..' is outside repository
-ok 9 - git clean with out of work tree relative path
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6043-merge-rename-directories/9a/.git/
+[master (root-commit) ad6f8a2] O
+ Author: A U Thor <author@example.com>
+ 5 files changed, 5 insertions(+)
+ create mode 100644 z/b
+ create mode 100644 z/c
+ create mode 100644 z/d/e
+ create mode 100644 z/d/f
+ create mode 100644 z/d/g
+Switched to branch 'A'
+[A 9bfe686] A
+ Author: A U Thor <author@example.com>
+ 5 files changed, 0 insertions(+), 0 deletions(-)
+ rename {z/d => x/w}/e (100%)
+ rename {z/d => x/w}/f (100%)
+ rename {z/d => x/w}/g (100%)
+ rename {z => y}/b (100%)
+ rename {z => y}/c (100%)
+Switched to branch 'B'
+[B 004af77] B
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 z/d/h
+ create mode 100644 z/i
+ok 61 - 9a-setup: Inner renamed directory within outer renamed directory
 
 expecting success: 
-
-	mkdir -p build docs &&
-	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
-	dd=$(cd .. && pwd) &&
 	(
-		cd docs &&
-		test_must_fail git clean -n $dd
-	)
-
-fatal: /build/git-2.20.1/t: '/build/git-2.20.1/t' is outside repository
-ok 10 - git clean with out of work tree absolute path
+		cd 9a &&
 
-expecting success: 
+		git checkout A^0 &&
 
-	mkdir -p build docs src/feature &&
-	touch a.out src/part3.c src/feature/file.c docs/manual.txt obj.o build/lib.so &&
-	(cd src/ && git clean -d feature/) &&
-	test -f Makefile &&
-	test -f README &&
-	test -f src/part1.c &&
-	test -f src/part2.c &&
-	test -f a.out &&
-	test -f src/part3.c &&
-	test ! -f src/feature/file.c &&
-	test -f docs/manual.txt &&
-	test -f obj.o &&
-	test -f build/lib.so
+		git merge -s recursive B^0 &&
 
+		git ls-files -s >out &&
+		test_line_count = 7 out &&
+		git ls-files -u >out &&
+		test_line_count = 0 out &&
+		git ls-files -o >out &&
+		test_line_count = 1 out &&
 
-Removing feature/file.c
-ok 11 - git clean -d with prefix and path
+		git rev-parse >actual \
+			HEAD:y/b HEAD:y/c HEAD:y/i &&
+		git rev-parse >expect \
+			O:z/b    O:z/c    B:z/i &&
+		test_cmp expect actual &&
 
-checking prerequisite: SYMLINKS
+		git rev-parse >actual \
+			HEAD:x/w/e HEAD:x/w/f HEAD:x/w/g HEAD:x/w/h &&
+		git rev-parse >expect \
+			O:z/d/e    O:z/d/f    O:z/d/g    B:z/d/h &&
+		test_cmp expect actual
+	)
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
-	# test whether the filesystem supports symbolic links
-	ln -s x y && test -h y
+Note: checking out 'A^0'.
 
-)
-prerequisite SYMLINKS ok
-expecting success: 
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by performing another checkout.
 
-	mkdir -p build docs &&
-	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
-	ln -s docs/manual.txt src/part4.c &&
-	git clean &&
-	test -f Makefile &&
-	test -f README &&
-	test -f src/part1.c &&
-	test -f src/part2.c &&
-	test ! -f a.out &&
-	test ! -f src/part3.c &&
-	test ! -f src/part4.c &&
-	test -f docs/manual.txt &&
-	test -f obj.o &&
-	test -f build/lib.so
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -b with the checkout command again. Example:
 
+  git checkout -b <new-branch-name>
 
-Removing a.out
-Removing src/part3.c
-Removing src/part4.c
-ok 12 - git clean symbolic link
+HEAD is now at 9bfe686 A
+Merging:
+9bfe686 A
+virtual B^0
+found 1 common ancestor:
+ad6f8a2 O
+Skipped y/c (merged same as existing)
+Skipped y/b (merged same as existing)
+Skipped x/w/g (merged same as existing)
+Skipped x/w/f (merged same as existing)
+Skipped x/w/e (merged same as existing)
+Merge made by the 'recursive' strategy.
+ x/w/h | 1 +
+ y/i   | 1 +
+ 2 files changed, 2 insertions(+)
+ create mode 100644 x/w/h
+ create mode 100644 y/i
+ok 62 - 9a-check: Inner renamed directory within outer renamed directory
 
 expecting success: 
+	test_create_repo 9b &&
+	(
+		cd 9b &&
 
-	touch a.clean b.clean other.c &&
-	git clean "*.clean" &&
-	test -f Makefile &&
-	test -f README &&
-	test -f src/part1.c &&
-	test -f src/part2.c &&
-	test ! -f a.clean &&
-	test ! -f b.clean &&
-	test -f other.c
-
-
-Removing a.clean
-Removing b.clean
-ok 13 - git clean with wildcard
+		mkdir z &&
+		echo b >z/b &&
+		echo c >z/c &&
+		mkdir x &&
+		test_seq 1 10 >x/d &&
+		git add z x &&
+		test_tick &&
+		git commit -m "O" &&
 
-expecting success: 
+		git branch O &&
+		git branch A &&
+		git branch B &&
 
-	mkdir -p build docs &&
-	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
-	git clean -n &&
-	test -f Makefile &&
-	test -f README &&
-	test -f src/part1.c &&
-	test -f src/part2.c &&
-	test -f a.out &&
-	test -f src/part3.c &&
-	test -f docs/manual.txt &&
-	test -f obj.o &&
-	test -f build/lib.so
+		git checkout A &&
+		git mv z y &&
+		test_seq 1 11 >x/d &&
+		git add x/d &&
+		test_tick &&
+		git commit -m "A" &&
 
+		git checkout B &&
+		test_seq 0 10 >x/d &&
+		git mv x/d z/d &&
+		git add z/d &&
+		test_tick &&
+		git commit -m "B"
+	)
 
-Would remove a.out
-Would remove other.c
-Would remove src/part3.c
-ok 14 - git clean -n
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6043-merge-rename-directories/9b/.git/
+[master (root-commit) f84ec32] O
+ Author: A U Thor <author@example.com>
+ 3 files changed, 12 insertions(+)
+ create mode 100644 x/d
+ create mode 100644 z/b
+ create mode 100644 z/c
+Switched to branch 'A'
+[A a2010ab] A
+ Author: A U Thor <author@example.com>
+ 3 files changed, 1 insertion(+)
+ rename {z => y}/b (100%)
+ rename {z => y}/c (100%)
+Switched to branch 'B'
+[B ded5d1d] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ rename {x => z}/d (91%)
+ok 63 - 9b-setup: Transitive rename with content merge
 
 expecting success: 
+	(
+		cd 9b &&
 
-	mkdir -p build docs &&
-	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
-	git clean -d &&
-	test -f Makefile &&
-	test -f README &&
-	test -f src/part1.c &&
-	test -f src/part2.c &&
-	test ! -f a.out &&
-	test ! -f src/part3.c &&
-	test ! -d docs &&
-	test -f obj.o &&
-	test -f build/lib.so
-
+		git checkout A^0 &&
 
-Removing a.out
-Removing docs/
-Removing other.c
-Removing src/feature/
-Removing src/part3.c
-Removing src/test/
-ok 15 - git clean -d
+		git merge -s recursive B^0 &&
 
-expecting success: 
+		git ls-files -s >out &&
+		test_line_count = 3 out &&
 
-	mkdir -p build docs examples &&
-	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so examples/1.c &&
-	git clean -d src/ examples/ &&
-	test -f Makefile &&
-	test -f README &&
-	test -f src/part1.c &&
-	test -f src/part2.c &&
-	test -f a.out &&
-	test ! -f src/part3.c &&
-	test ! -f examples/1.c &&
-	test -f docs/manual.txt &&
-	test -f obj.o &&
-	test -f build/lib.so
+		test_seq 0 11 >expected &&
+		test_cmp expected y/d &&
+		git add expected &&
+		git rev-parse >actual \
+			HEAD:y/b HEAD:y/c HEAD:y/d &&
+		git rev-parse >expect \
+			O:z/b    O:z/c    :0:expected &&
+		test_cmp expect actual &&
+		test_must_fail git rev-parse HEAD:x/d &&
+		test_must_fail git rev-parse HEAD:z/d &&
+		test_path_is_missing z/d &&
 
+		test $(git rev-parse HEAD:y/d) != $(git rev-parse O:x/d) &&
+		test $(git rev-parse HEAD:y/d) != $(git rev-parse A:x/d) &&
+		test $(git rev-parse HEAD:y/d) != $(git rev-parse B:z/d)
+	)
 
-Removing examples/
-Removing src/part3.c
-ok 16 - git clean -d src/ examples/
+Note: checking out 'A^0'.
 
-expecting success: 
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by performing another checkout.
 
-	mkdir -p build docs &&
-	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
-	git clean -x &&
-	test -f Makefile &&
-	test -f README &&
-	test -f src/part1.c &&
-	test -f src/part2.c &&
-	test ! -f a.out &&
-	test ! -f src/part3.c &&
-	test -f docs/manual.txt &&
-	test ! -f obj.o &&
-	test -f build/lib.so
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -b with the checkout command again. Example:
 
+  git checkout -b <new-branch-name>
 
-Removing a.out
-Removing obj.o
-Removing src/part3.c
-ok 17 - git clean -x
+HEAD is now at a2010ab A
+Merging:
+a2010ab A
+virtual B^0
+found 1 common ancestor:
+f84ec32 O
+Auto-merging y/d
+Skipped y/c (merged same as existing)
+Skipped y/b (merged same as existing)
+Merge made by the 'recursive' strategy.
+ {x => y}/d | 1 +
+ 1 file changed, 1 insertion(+)
+ rename {x => y}/d (92%)
+fatal: Path 'x/d' does not exist in 'HEAD'
+HEAD:x/d
+fatal: Path 'z/d' does not exist in 'HEAD'
+HEAD:z/d
+ok 64 - 9b-check: Transitive rename with content merge
 
 expecting success: 
+	test_create_repo 9c &&
+	(
+		cd 9c &&
 
-	mkdir -p build docs &&
-	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
-	git clean -d -x &&
-	test -f Makefile &&
-	test -f README &&
-	test -f src/part1.c &&
-	test -f src/part2.c &&
-	test ! -f a.out &&
-	test ! -f src/part3.c &&
-	test ! -d docs &&
-	test ! -f obj.o &&
-	test ! -d build
+		mkdir z &&
+		echo b >z/b &&
+		echo c >z/c &&
+		mkdir x &&
+		echo d >x/d &&
+		echo e >x/e &&
+		mkdir w &&
+		echo f >w/f &&
+		git add z x w &&
+		test_tick &&
+		git commit -m "O" &&
 
+		git branch O &&
+		git branch A &&
+		git branch B &&
 
-Removing a.out
-Removing build/
-Removing docs/
-Removing obj.o
-Removing src/part3.c
-ok 18 - git clean -d -x
+		git checkout A &&
+		git mv z y &&
+		git mv w/f x/ &&
+		echo g >x/g &&
+		git add x/g &&
+		test_tick &&
+		git commit -m "A" &&
 
-expecting success: 
+		git checkout B &&
+		git mv x/d z/d &&
+		git mv x/e z/e &&
+		test_tick &&
+		git commit -m "B"
+	)
 
-	mkdir -p build docs &&
-	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
-	git clean -d -x -e src &&
-	test -f Makefile &&
-	test -f README &&
-	test -f src/part1.c &&
-	test -f src/part2.c &&
-	test ! -f a.out &&
-	test -f src/part3.c &&
-	test ! -d docs &&
-	test ! -f obj.o &&
-	test ! -d build
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6043-merge-rename-directories/9c/.git/
+[master (root-commit) f3e903b] O
+ Author: A U Thor <author@example.com>
+ 5 files changed, 5 insertions(+)
+ create mode 100644 w/f
+ create mode 100644 x/d
+ create mode 100644 x/e
+ create mode 100644 z/b
+ create mode 100644 z/c
+Switched to branch 'A'
+[A 8a6c5f2] A
+ Author: A U Thor <author@example.com>
+ 4 files changed, 1 insertion(+)
+ rename {w => x}/f (100%)
+ create mode 100644 x/g
+ rename {z => y}/b (100%)
+ rename {z => y}/c (100%)
+Switched to branch 'B'
+[B 3f509fc] B
+ Author: A U Thor <author@example.com>
+ 2 files changed, 0 insertions(+), 0 deletions(-)
+ rename {x => z}/d (100%)
+ rename {x => z}/e (100%)
+ok 65 - 9c-setup: Doubly transitive rename?
 
+expecting success: 
+	(
+		cd 9c &&
 
-Removing a.out
-Removing build/
-Removing docs/
-Removing obj.o
-ok 19 - git clean -d -x with ignored tracked directory
+		git checkout A^0 &&
 
-expecting success: 
+		git merge -s recursive B^0 >out &&
+		test_i18ngrep "WARNING: Avoiding applying x -> z rename to x/f" out &&
 
-	mkdir -p build docs &&
-	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
-	git clean -X &&
-	test -f Makefile &&
-	test -f README &&
-	test -f src/part1.c &&
-	test -f src/part2.c &&
-	test -f a.out &&
-	test -f src/part3.c &&
-	test -f docs/manual.txt &&
-	test ! -f obj.o &&
-	test -f build/lib.so
+		git ls-files -s >out &&
+		test_line_count = 6 out &&
+		git ls-files -o >out &&
+		test_line_count = 1 out &&
 
+		git rev-parse >actual \
+			HEAD:y/b HEAD:y/c HEAD:y/d HEAD:y/e HEAD:x/f HEAD:x/g &&
+		git rev-parse >expect \
+			O:z/b    O:z/c    O:x/d    O:x/e    O:w/f    A:x/g &&
+		test_cmp expect actual
+	)
 
-Removing obj.o
-ok 20 - git clean -X
+Note: checking out 'A^0'.
 
-expecting success: 
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by performing another checkout.
 
-	mkdir -p build docs &&
-	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
-	git clean -d -X &&
-	test -f Makefile &&
-	test -f README &&
-	test -f src/part1.c &&
-	test -f src/part2.c &&
-	test -f a.out &&
-	test -f src/part3.c &&
-	test -f docs/manual.txt &&
-	test ! -f obj.o &&
-	test ! -d build
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -b with the checkout command again. Example:
 
+  git checkout -b <new-branch-name>
 
-Removing build/
-Removing obj.o
-ok 21 - git clean -d -X
+HEAD is now at 8a6c5f2 A
+WARNING: Avoiding applying x -> z rename to x/f, because z itself was renamed.
+ok 66 - 9c-check: Doubly transitive rename?
 
 expecting success: 
+	test_create_repo 9d &&
+	(
+		cd 9d &&
 
-	mkdir -p build docs &&
-	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
-	git clean -d -X -e src &&
-	test -f Makefile &&
-	test -f README &&
-	test -f src/part1.c &&
-	test -f src/part2.c &&
-	test -f a.out &&
-	test ! -f src/part3.c &&
-	test -f docs/manual.txt &&
-	test ! -f obj.o &&
-	test ! -d build
+		mkdir z y x w v u &&
+		echo a >z/a &&
+		echo b >y/b &&
+		echo c >x/c &&
+		echo d >w/d &&
+		echo e >v/e &&
+		echo f >u/f &&
+		git add z y x w v u &&
+		test_tick &&
+		git commit -m "O" &&
 
+		git branch O &&
+		git branch A &&
+		git branch B &&
 
-Removing build/
-Removing obj.o
-Removing src/part3.c
-ok 22 - git clean -d -X with ignored tracked directory
+		git checkout A &&
+		git mv z/a y/ &&
+		git mv x/c w/ &&
+		git mv v/e u/ &&
+		test_tick &&
+		git commit -m "A" &&
 
-expecting success: 
+		git checkout B &&
+		echo t >z/t &&
+		git mv y/b x/ &&
+		git mv w/d v/ &&
+		git add z/t &&
+		test_tick &&
+		git commit -m "B"
+	)
 
-	git config --unset clean.requireForce &&
-	test_must_fail git clean
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6043-merge-rename-directories/9d/.git/
+[master (root-commit) a77ae1c] O
+ Author: A U Thor <author@example.com>
+ 6 files changed, 6 insertions(+)
+ create mode 100644 u/f
+ create mode 100644 v/e
+ create mode 100644 w/d
+ create mode 100644 x/c
+ create mode 100644 y/b
+ create mode 100644 z/a
+Switched to branch 'A'
+[A 67d374b] A
+ Author: A U Thor <author@example.com>
+ 3 files changed, 0 insertions(+), 0 deletions(-)
+ rename {v => u}/e (100%)
+ rename {x => w}/c (100%)
+ rename {z => y}/a (100%)
+Switched to branch 'B'
+[B 9c7db88] B
+ Author: A U Thor <author@example.com>
+ 3 files changed, 1 insertion(+)
+ rename {w => v}/d (100%)
+ rename {y => x}/b (100%)
+ create mode 100644 z/t
+ok 67 - 9d-setup: N-way transitive rename?
 
+expecting success: 
+	(
+		cd 9d &&
 
-fatal: clean.requireForce defaults to true and neither -i, -n, nor -f given; refusing to clean
-ok 23 - clean.requireForce defaults to true
+		git checkout A^0 &&
 
-expecting success: 
+		git merge -s recursive B^0 >out &&
+		test_i18ngrep "WARNING: Avoiding applying z -> y rename to z/t" out &&
+		test_i18ngrep "WARNING: Avoiding applying y -> x rename to y/a" out &&
+		test_i18ngrep "WARNING: Avoiding applying x -> w rename to x/b" out &&
+		test_i18ngrep "WARNING: Avoiding applying w -> v rename to w/c" out &&
 
-	git config clean.requireForce true &&
-	test_must_fail git clean
+		git ls-files -s >out &&
+		test_line_count = 7 out &&
+		git ls-files -o >out &&
+		test_line_count = 1 out &&
 
+		git rev-parse >actual \
+			HEAD:z/t \
+			HEAD:y/a HEAD:x/b HEAD:w/c \
+			HEAD:u/d HEAD:u/e HEAD:u/f &&
+		git rev-parse >expect \
+			B:z/t    \
+			O:z/a    O:y/b    O:x/c    \
+			O:w/d    O:v/e    A:u/f &&
+		test_cmp expect actual
+	)
 
-fatal: clean.requireForce set to true and neither -i, -n, nor -f given; refusing to clean
-ok 24 - clean.requireForce
+Note: checking out 'A^0'.
 
-expecting success: 
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by performing another checkout.
 
-	mkdir -p build docs &&
-	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
-	git clean -n &&
-	test -f Makefile &&
-	test -f README &&
-	test -f src/part1.c &&
-	test -f src/part2.c &&
-	test -f a.out &&
-	test -f src/part3.c &&
-	test -f docs/manual.txt &&
-	test -f obj.o &&
-	test -f build/lib.so
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -b with the checkout command again. Example:
 
+  git checkout -b <new-branch-name>
 
-Would remove a.out
-Would remove src/part3.c
-ok 25 - clean.requireForce and -n
+HEAD is now at 67d374b A
+WARNING: Avoiding applying z -> y rename to z/t, because y itself was renamed.
+WARNING: Avoiding applying y -> x rename to y/a, because x itself was renamed.
+WARNING: Avoiding applying x -> w rename to x/b, because w itself was renamed.
+WARNING: Avoiding applying w -> v rename to w/c, because v itself was renamed.
+ok 68 - 9d-check: N-way transitive rename?
 
 expecting success: 
+	test_create_repo 9e &&
+	(
+		cd 9e &&
 
-	git clean -f &&
-	test -f README &&
-	test -f src/part1.c &&
-	test -f src/part2.c &&
-	test ! -f a.out &&
-	test ! -f src/part3.c &&
-	test -f docs/manual.txt &&
-	test -f obj.o &&
-	test -f build/lib.so
+		mkdir dir1 dir2 dir3 dirN &&
+		echo a >dir1/a &&
+		echo b >dir1/b &&
+		echo d >dir2/d &&
+		echo e >dir2/e &&
+		echo g >dir3/g &&
+		echo h >dir3/h &&
+		echo j >dirN/j &&
+		echo k >dirN/k &&
+		git add dir* &&
+		test_tick &&
+		git commit -m "O" &&
 
+		git branch O &&
+		git branch A &&
+		git branch B &&
 
-Removing a.out
-Removing src/part3.c
-ok 26 - clean.requireForce and -f
+		git checkout A &&
+		echo c  >dir1/c &&
+		echo yo >dir1/yo &&
+		echo f  >dir2/f &&
+		echo yo >dir2/yo &&
+		echo i  >dir3/i &&
+		echo yo >dir3/yo &&
+		echo l  >dirN/l &&
+		echo yo >dirN/yo &&
+		git add dir* &&
+		test_tick &&
+		git commit -m "A" &&
 
-expecting success: 
+		git checkout B &&
+		git mv dir1 combined &&
+		git mv dir2/* combined/ &&
+		git mv dir3/* combined/ &&
+		git mv dirN/* combined/ &&
+		test_tick &&
+		git commit -m "B"
+	)
 
-	echo excludes >excludes &&
-	echo included >included &&
-	git config core.excludesfile excludes &&
-	output=$(git clean -n excludes included 2>&1) &&
-	expr "$output" : ".*included" >/dev/null &&
-	! expr "$output" : ".*excludes" >/dev/null
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6043-merge-rename-directories/9e/.git/
+[master (root-commit) 6b1b942] O
+ Author: A U Thor <author@example.com>
+ 8 files changed, 8 insertions(+)
+ create mode 100644 dir1/a
+ create mode 100644 dir1/b
+ create mode 100644 dir2/d
+ create mode 100644 dir2/e
+ create mode 100644 dir3/g
+ create mode 100644 dir3/h
+ create mode 100644 dirN/j
+ create mode 100644 dirN/k
+Switched to branch 'A'
+[A 1129f61] A
+ Author: A U Thor <author@example.com>
+ 8 files changed, 8 insertions(+)
+ create mode 100644 dir1/c
+ create mode 100644 dir1/yo
+ create mode 100644 dir2/f
+ create mode 100644 dir2/yo
+ create mode 100644 dir3/i
+ create mode 100644 dir3/yo
+ create mode 100644 dirN/l
+ create mode 100644 dirN/yo
+Switched to branch 'B'
+[B e5547de] B
+ Author: A U Thor <author@example.com>
+ 8 files changed, 0 insertions(+), 0 deletions(-)
+ rename {dir1 => combined}/a (100%)
+ rename {dir1 => combined}/b (100%)
+ rename {dir2 => combined}/d (100%)
+ rename {dir2 => combined}/e (100%)
+ rename {dir3 => combined}/g (100%)
+ rename {dir3 => combined}/h (100%)
+ rename {dirN => combined}/j (100%)
+ rename {dirN => combined}/k (100%)
+ok 69 - 9e-setup: N-to-1 whammo
 
+expecting success: 
+	(
+		cd 9e &&
 
-ok 27 - core.excludesfile
+		git checkout A^0 &&
 
-checking prerequisite: SANITY
+		test_must_fail git merge -s recursive B^0 >out &&
+		grep "CONFLICT (implicit dir rename): Cannot map more than one path to combined/yo" out >error_line &&
+		grep -q dir1/yo error_line &&
+		grep -q dir2/yo error_line &&
+		grep -q dir3/yo error_line &&
+		grep -q dirN/yo error_line &&
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
-	mkdir SANETESTD.1 SANETESTD.2 &&
+		git ls-files -s >out &&
+		test_line_count = 16 out &&
+		git ls-files -u >out &&
+		test_line_count = 0 out &&
+		git ls-files -o >out &&
+		test_line_count = 2 out &&
 
-	chmod +w SANETESTD.1 SANETESTD.2 &&
-	>SANETESTD.1/x 2>SANETESTD.2/x &&
-	chmod -w SANETESTD.1 &&
-	chmod -r SANETESTD.1/x &&
-	chmod -rx SANETESTD.2 ||
-	BUG "cannot prepare SANETESTD"
+		git rev-parse >actual \
+			:0:combined/a :0:combined/b :0:combined/c \
+			:0:combined/d :0:combined/e :0:combined/f \
+			:0:combined/g :0:combined/h :0:combined/i \
+			:0:combined/j :0:combined/k :0:combined/l &&
+		git rev-parse >expect \
+			 O:dir1/a      O:dir1/b      A:dir1/c \
+			 O:dir2/d      O:dir2/e      A:dir2/f \
+			 O:dir3/g      O:dir3/h      A:dir3/i \
+			 O:dirN/j      O:dirN/k      A:dirN/l &&
+		test_cmp expect actual &&
 
-	! test -r SANETESTD.1/x &&
-	! rm SANETESTD.1/x && ! test -f SANETESTD.2/x
-	status=$?
+		git rev-parse >actual \
+			:0:dir1/yo :0:dir2/yo :0:dir3/yo :0:dirN/yo &&
+		git rev-parse >expect \
+			 A:dir1/yo  A:dir2/yo  A:dir3/yo  A:dirN/yo &&
+		test_cmp expect actual
+	)
 
-	chmod +rwx SANETESTD.1 SANETESTD.2 &&
-	rm -rf SANETESTD.1 SANETESTD.2 ||
-	BUG "cannot clean SANETESTD"
-	return $status
+Note: checking out 'A^0'.
 
-)
-rm: cannot remove 'SANETESTD.1/x': Permission denied
-prerequisite SANITY ok
-expecting success: 
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by performing another checkout.
 
-	mkdir foo &&
-	touch foo/bar &&
-	test_when_finished "chmod 755 foo" &&
-	(exec <foo/bar &&
-	 chmod 0 foo &&
-	 test_must_fail git clean -f -d)
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -b with the checkout command again. Example:
 
-warning: could not open directory 'foo/': Permission denied
-warning: failed to remove foo/: Directory not empty
-Removing docs/
-Removing included
-ok 28 - removal failure
+  git checkout -b <new-branch-name>
+
+HEAD is now at 1129f61 A
+ok 70 - 9e-check: N-to-1 whammo
 
 expecting success: 
-	rm -fr foo bar baz &&
-	mkdir -p foo bar baz/boo &&
-	(
-		cd foo &&
-		git init &&
-		test_commit nested hello.world
-	) &&
-	(
-		cd bar &&
-		>goodbye.people
-	) &&
+	test_create_repo 9f &&
 	(
-		cd baz/boo &&
-		git init &&
-		test_commit deeply.nested deeper.world
-	) &&
-	git clean -f -d &&
-	test -f foo/.git/index &&
-	test -f foo/hello.world &&
-	test -f baz/boo/.git/index &&
-	test -f baz/boo/deeper.world &&
-	! test -d bar
+		cd 9f &&
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7300-clean/foo/.git/
-[master (root-commit) abd8674] nested
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 hello.world
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7300-clean/baz/boo/.git/
-[master (root-commit) 3f7f1fc] deeply.nested
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 deeper.world
-Removing bar/
-Skipping repository baz/boo
-Skipping repository foo/
-ok 29 - nested git work tree
+		mkdir -p goal/a &&
+		mkdir -p goal/b &&
+		echo foo >goal/a/foo &&
+		echo bar >goal/b/bar &&
+		echo baz >goal/b/baz &&
+		git add goal &&
+		test_tick &&
+		git commit -m "O" &&
 
-expecting success: 
-	rm -fr almost_git almost_bare_git almost_submodule &&
-	mkdir -p almost_git/.git/objects &&
-	mkdir -p almost_git/.git/refs &&
-	cat >almost_git/.git/HEAD <<-\EOF &&
-	garbage
-	EOF
-	cp -r almost_git/.git/ almost_bare_git &&
-	mkdir almost_submodule/ &&
-	cat >almost_submodule/.git <<-\EOF &&
-	garbage
-	EOF
-	test_when_finished "rm -rf almost_*" &&
-	git clean -f -d &&
-	test_path_is_missing almost_git &&
-	test_path_is_missing almost_bare_git &&
-	test_path_is_missing almost_submodule
+		git branch O &&
+		git branch A &&
+		git branch B &&
 
-Removing almost_bare_git/
-Removing almost_git/
-Removing almost_submodule/
-Skipping repository baz/boo
-Skipping repository foo/
-ok 30 - should clean things that almost look like git but are not
+		git checkout A &&
+		git mv goal/ priority &&
+		test_tick &&
+		git commit -m "A" &&
 
-expecting success: 
-	rm -fr repo to_clean sub1 sub2 &&
-	mkdir repo to_clean &&
-	(
-		cd repo &&
-		git init &&
-		test_commit msg hello.world
-	) &&
-	git submodule add ./repo/.git sub1 &&
-	git commit -m "sub1" &&
-	git branch before_sub2 &&
-	git submodule add ./repo/.git sub2 &&
-	git commit -m "sub2" &&
-	git checkout before_sub2 &&
-	>to_clean/should_clean.this &&
-	git clean -f -d &&
-	test_path_is_file repo/.git/index &&
-	test_path_is_file repo/hello.world &&
-	test_path_is_file sub1/.git &&
-	test_path_is_file sub1/hello.world &&
-	test_path_is_file sub2/.git &&
-	test_path_is_file sub2/hello.world &&
-	test_path_is_missing to_clean
+		git checkout B &&
+		echo c >goal/c &&
+		git add goal/c &&
+		test_tick &&
+		git commit -m "B"
+	)
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7300-clean/repo/.git/
-[master (root-commit) 1af9d3b] msg
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6043-merge-rename-directories/9f/.git/
+[master (root-commit) 6480e53] O
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 hello.world
-Cloning into '/build/git-2.20.1/t/trash directory.t7300-clean/sub1'...
-done.
-[master a9f8d1b] sub1
+ 3 files changed, 3 insertions(+)
+ create mode 100644 goal/a/foo
+ create mode 100644 goal/b/bar
+ create mode 100644 goal/b/baz
+Switched to branch 'A'
+[A 96c4122] A
  Author: A U Thor <author@example.com>
- 4 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 100644 README
- create mode 100644 src/part2.c
- create mode 160000 sub1
-Cloning into '/build/git-2.20.1/t/trash directory.t7300-clean/sub2'...
-done.
-[master b0c328f] sub2
+ 3 files changed, 0 insertions(+), 0 deletions(-)
+ rename {goal => priority}/a/foo (100%)
+ rename {goal => priority}/b/bar (100%)
+ rename {goal => priority}/b/baz (100%)
+Switched to branch 'B'
+[B 08998f4] B
  Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 160000 sub2
-warning: unable to rmdir 'sub2': Directory not empty
-Switched to branch 'before_sub2'
-Skipping repository baz/boo
-Skipping repository foo/
-Skipping repository repo/
-Skipping repository sub2/
-Removing to_clean/
-ok 31 - should not clean submodules
-
-expecting success: 
-	rm -fr to_clean possible_sub1 &&
-	mkdir to_clean possible_sub1 &&
-	test_when_finished "rm -rf possible_sub*" &&
-	echo "gitdir: foo" >possible_sub1/.git &&
-	>possible_sub1/hello.world &&
-	chmod 0 possible_sub1/.git &&
-	>to_clean/should_clean.this &&
-	git clean -f -d &&
-	test_path_is_file possible_sub1/.git &&
-	test_path_is_file possible_sub1/hello.world &&
-	test_path_is_missing to_clean
-
-Skipping repository baz/boo
-Skipping repository foo/
-Skipping repository possible_sub1/
-Skipping repository repo/
-Skipping repository sub2/
-Removing to_clean/
-ok 32 - should avoid cleaning possible submodules
+ 1 file changed, 1 insertion(+)
+ create mode 100644 goal/c
+ok 71 - 9f-setup: Renamed directory that only contained immediate subdirs
 
 expecting success: 
-	rm -fr empty_repo to_clean &&
-	git init empty_repo &&
-	mkdir to_clean &&
-	>to_clean/should_clean.this &&
-	git clean -f -d &&
-	test_path_is_file empty_repo/.git/HEAD &&
-	test_path_is_missing to_clean
+	(
+		cd 9f &&
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7300-clean/empty_repo/.git/
-Skipping repository baz/boo
-Skipping repository empty_repo/
-Skipping repository foo/
-Skipping repository repo/
-Skipping repository sub2/
-Removing to_clean/
-ok 33 - nested (empty) git should be kept
+		git checkout A^0 &&
 
-expecting success: 
-	rm -fr bare1 bare2 subdir &&
-	git init --bare bare1 &&
-	git clone --local --bare . bare2 &&
-	mkdir subdir &&
-	cp -r bare2 subdir/bare3 &&
-	git clean -f -d &&
-	test_path_is_missing bare1 &&
-	test_path_is_missing bare2 &&
-	test_path_is_missing subdir
+		git merge -s recursive B^0 &&
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7300-clean/bare1/
-Cloning into bare repository 'bare2'...
-done.
-Removing bare1/
-Removing bare2/
-Skipping repository baz/boo
-Skipping repository empty_repo/
-Skipping repository foo/
-Skipping repository repo/
-Skipping repository sub2/
-Removing subdir/
-ok 34 - nested bare repositories should be cleaned
+		git ls-files -s >out &&
+		test_line_count = 4 out &&
 
-checking known breakage: 
-	rm -fr strange_bare &&
-	mkdir strange_bare &&
-	git init --bare strange_bare/.git &&
-	git clean -f -d &&
-	test_path_is_missing strange_bare
+		git rev-parse >actual \
+			HEAD:priority/a/foo \
+			HEAD:priority/b/bar \
+			HEAD:priority/b/baz \
+			HEAD:priority/c &&
+		git rev-parse >expect \
+			O:goal/a/foo \
+			O:goal/b/bar \
+			O:goal/b/baz \
+			B:goal/c &&
+		test_cmp expect actual &&
+		test_must_fail git rev-parse HEAD:goal/c
+	)
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7300-clean/strange_bare/.git/
-Skipping repository baz/boo
-Skipping repository empty_repo/
-Skipping repository foo/
-Skipping repository repo/
-Skipping repository strange_bare/
-Skipping repository sub2/
-Path exists:
-drwxr-xr-x 3 pbuilder1 pbuilder1 60 Dec  3 05:09 strange_bare
-strange_bare
-not ok 35 - nested (empty) bare repositories should be cleaned even when in .git # TODO known breakage
+Note: checking out 'A^0'.
 
-checking known breakage: 
-	rm -fr strange_bare &&
-	mkdir strange_bare &&
-	git clone --local --bare . strange_bare/.git &&
-	git clean -f -d &&
-	test_path_is_missing strange_bare
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by performing another checkout.
 
-Cloning into bare repository 'strange_bare/.git'...
-done.
-Skipping repository baz/boo
-Skipping repository empty_repo/
-Skipping repository foo/
-Skipping repository repo/
-Skipping repository strange_bare/
-Skipping repository sub2/
-Path exists:
-drwxr-xr-x 3 pbuilder1 pbuilder1 60 Dec  3 05:09 strange_bare
-strange_bare
-not ok 36 - nested (non-empty) bare repositories should be cleaned even when in .git # TODO known breakage
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -b with the checkout command again. Example:
 
-expecting success: 
-	rm -fr repo &&
-	mkdir repo &&
-	(
-		cd repo &&
-		git init &&
-		mkdir -p bar/baz &&
-		test_commit msg bar/baz/hello.world
-	) &&
-	git clean -f -d repo/bar/baz &&
-	test_path_is_file repo/.git/HEAD &&
-	test_path_is_dir repo/bar/ &&
-	test_path_is_missing repo/bar/baz
+  git checkout -b <new-branch-name>
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7300-clean/repo/.git/
-[master (root-commit) 14dba50] msg
- Author: A U Thor <author@example.com>
+HEAD is now at 96c4122 A
+Merging:
+96c4122 A
+virtual B^0
+found 1 common ancestor:
+6480e53 O
+Skipped priority/b/baz (merged same as existing)
+Skipped priority/b/bar (merged same as existing)
+Skipped priority/a/foo (merged same as existing)
+Merge made by the 'recursive' strategy.
+ priority/c | 1 +
  1 file changed, 1 insertion(+)
- create mode 100644 bar/baz/hello.world
-Removing repo/bar/baz/
-ok 37 - giving path in nested git work tree will remove it
+ create mode 100644 priority/c
+fatal: Path 'goal/c' does not exist in 'HEAD'
+HEAD:goal/c
+ok 72 - 9f-check: Renamed directory that only contained immediate subdirs
 
 expecting success: 
-	rm -fr repo &&
-	mkdir repo untracked &&
+	test_create_repo 9g &&
 	(
-		cd repo &&
-		git init &&
-		test_commit msg hello.world
-	) &&
-	git clean -f -d repo/.git &&
-	test_path_is_file repo/.git/HEAD &&
-	test_path_is_dir repo/.git/refs &&
-	test_path_is_dir repo/.git/objects &&
-	test_path_is_dir untracked/
+		cd 9g &&
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7300-clean/repo/.git/
-[master (root-commit) 1af9d3b] msg
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 hello.world
-ok 38 - giving path to nested .git will not remove it
+		mkdir -p goal/a &&
+		mkdir -p goal/b &&
+		echo foo >goal/a/foo &&
+		echo bar >goal/b/bar &&
+		echo baz >goal/b/baz &&
+		git add goal &&
+		test_tick &&
+		git commit -m "O" &&
 
-expecting success: 
-	rm -fr repo untracked &&
-	mkdir repo untracked &&
-	(
-		cd repo &&
-		git init &&
-		test_commit msg hello.world
-	) &&
-	git clean -f -d repo/.git/ &&
-	test_path_is_dir repo/.git &&
-	test_dir_is_empty repo/.git &&
-	test_path_is_dir untracked/
+		git branch O &&
+		git branch A &&
+		git branch B &&
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7300-clean/repo/.git/
-[master (root-commit) 1af9d3b] msg
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 hello.world
-Removing repo/.git/COMMIT_EDITMSG
-Removing repo/.git/HEAD
-Removing repo/.git/branches/
-Removing repo/.git/config
-Removing repo/.git/description
-Removing repo/.git/hooks/
-Removing repo/.git/index
-Removing repo/.git/info/
-Removing repo/.git/logs/
-Removing repo/.git/objects/
-Removing repo/.git/refs/
-ok 39 - giving path to nested .git/ will remove contents
+		git checkout A &&
+		mkdir priority &&
+		git mv goal/a/ priority/alpha &&
+		git mv goal/b/ priority/beta &&
+		rmdir goal/ &&
+		test_tick &&
+		git commit -m "A" &&
 
-expecting success: 
-	rm -fr foo bar baz &&
-	mkdir -p foo bar baz/boo &&
-	(
-		cd foo &&
-		git init &&
-		test_commit nested hello.world
-	) &&
-	(
-		cd bar &&
-		>goodbye.people
-	) &&
-	(
-		cd baz/boo &&
-		git init &&
-		test_commit deeply.nested deeper.world
-	) &&
-	git clean -f -f -d &&
-	! test -d foo &&
-	! test -d bar &&
-	! test -d baz
+		git checkout B &&
+		echo c >goal/c &&
+		git add goal/c &&
+		test_tick &&
+		git commit -m "B"
+	)
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7300-clean/foo/.git/
-[master (root-commit) abd8674] nested
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6043-merge-rename-directories/9g/.git/
+[master (root-commit) 6480e53] O
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 hello.world
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7300-clean/baz/boo/.git/
-[master (root-commit) 3f7f1fc] deeply.nested
+ 3 files changed, 3 insertions(+)
+ create mode 100644 goal/a/foo
+ create mode 100644 goal/b/bar
+ create mode 100644 goal/b/baz
+Switched to branch 'A'
+[A f7fdc05] A
+ Author: A U Thor <author@example.com>
+ 3 files changed, 0 insertions(+), 0 deletions(-)
+ rename {goal/a => priority/alpha}/foo (100%)
+ rename {goal/b => priority/beta}/bar (100%)
+ rename {goal/b => priority/beta}/baz (100%)
+Switched to branch 'B'
+[B 08998f4] B
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 deeper.world
-Removing bar/
-Removing baz/
-Removing empty_repo/
-Removing foo/
-Removing repo/
-Removing strange_bare/
-Removing sub2/
-Removing untracked/
-ok 40 - force removal of nested git work tree
+ create mode 100644 goal/c
+ok 73 - 9g-setup: Renamed directory that only contained immediate subdirs, immediate subdirs renamed
 
-expecting success: 
-	rm -fr repo &&
-	mkdir repo &&
+checking known breakage: 
 	(
-		cd repo &&
-		git init &&
-		touch known 1 2 3 &&
-		git add known &&
-		git clean -f -e 1 -e 2 &&
-		test -e 1 &&
-		test -e 2 &&
-		! (test -e 3) &&
-		test -e known
-	)
+		cd 9g &&
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7300-clean/repo/.git/
-Removing 3
-ok 41 - git clean -e
+		git checkout A^0 &&
 
-expecting success: 
-	mkdir foo &&
-	chmod a= foo &&
-	git clean -dfx foo &&
-	! test -d foo
+		git merge -s recursive B^0 &&
 
-warning: could not open directory 'foo/': Permission denied
-Removing foo/
-ok 42 - git clean -d with an unreadable empty directory
+		git ls-files -s >out &&
+		test_line_count = 4 out &&
 
-expecting success: 
-	mkdir -p foo &&
-	mkdir -p foobar &&
-	git clean -df foobar &&
-	test_path_is_dir foo &&
-	test_path_is_missing foobar
+		git rev-parse >actual \
+			HEAD:priority/alpha/foo \
+			HEAD:priority/beta/bar  \
+			HEAD:priority/beta/baz  \
+			HEAD:priority/c &&
+		git rev-parse >expect \
+			O:goal/a/foo \
+			O:goal/b/bar \
+			O:goal/b/baz \
+			B:goal/c &&
+		test_cmp expect actual &&
+		test_must_fail git rev-parse HEAD:goal/c
+	)
 
-Removing foobar/
-ok 43 - git clean -d respects pathspecs (dir is prefix of pathspec)
+Note: checking out 'A^0'.
 
-expecting success: 
-	mkdir -p foo &&
-	mkdir -p foobar &&
-	git clean -df foo &&
-	test_path_is_missing foo &&
-	test_path_is_dir foobar
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by performing another checkout.
 
-Removing foo/
-ok 44 - git clean -d respects pathspecs (pathspec is prefix of dir)
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -b with the checkout command again. Example:
 
-expecting success: 
-	echo /foo/bar >.gitignore &&
-	echo ignoreme >>.gitignore &&
-	rm -rf foo &&
-	mkdir -p foo/a/aa/aaa foo/b/bb/bbb &&
-	touch foo/bar foo/baz foo/a/aa/ignoreme foo/b/ignoreme foo/b/bb/1 foo/b/bb/2 &&
-	git clean -df &&
-	test_path_is_dir foo &&
-	test_path_is_file foo/bar &&
-	test_path_is_missing foo/baz &&
-	test_path_is_file foo/a/aa/ignoreme &&
-	test_path_is_missing foo/a/aa/aaa &&
-	test_path_is_file foo/b/ignoreme &&
-	test_path_is_missing foo/b/bb
+  git checkout -b <new-branch-name>
 
-Removing build/
-Removing foo/a/aa/aaa/
-Removing foo/b/bb/
-Removing foo/baz
-Removing foobar/
-Removing obj.o
-Skipping repository repo/
-ok 45 - git clean -d skips untracked dirs containing ignored files
+HEAD is now at f7fdc05 A
+Merging:
+f7fdc05 A
+virtual B^0
+found 1 common ancestor:
+6480e53 O
+Skipped priority/beta/baz (merged same as existing)
+Skipped priority/beta/bar (merged same as existing)
+Skipped priority/alpha/foo (merged same as existing)
+Merge made by the 'recursive' strategy.
+ goal/c | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 goal/c
+fatal: Path 'priority/c' does not exist in 'HEAD'
+not ok 74 - 9g-check: Renamed directory that only contained immediate subdirs, immediate subdirs renamed # TODO known breakage
 
-# still have 2 known breakage(s)
-# passed all remaining 43 test(s)
-1..45
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t7201-co.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7201-co/.git/
 expecting success: 
+	test_create_repo 9h &&
+	(
+		cd 9h &&
 
-	fill x y z > same &&
-	fill 1 2 3 4 5 6 7 8 >one &&
-	fill a b c d e >two &&
-	git add same one two &&
-	git commit -m "Initial A one, A two" &&
-
-	git checkout -b renamer &&
-	rm -f one &&
-	fill 1 3 4 5 6 7 8 >uno &&
-	git add uno &&
-	fill a b c d e f >two &&
-	git commit -a -m "Renamer R one->uno, M two" &&
+		mkdir z &&
+		echo b >z/b &&
+		echo c >z/c &&
+		printf "1\n2\n3\n4\n5\n6\n7\n8\nd\n" >z/d &&
+		git add z &&
+		test_tick &&
+		git commit -m "O" &&
 
-	git checkout -b side master &&
-	fill 1 2 3 4 5 6 7 >one &&
-	fill A B C D E >three &&
-	rm -f two &&
-	git update-index --add --remove one two three &&
-	git commit -m "Side M one, D two, A three" &&
+		git branch O &&
+		git branch A &&
+		git branch B &&
 
-	git checkout -b simple master &&
-	rm -f one &&
-	fill a c e > two &&
-	git commit -a -m "Simple D one, M two" &&
+		git checkout A &&
+		test_tick &&
+		echo more >>z/d &&
+		git add z/d &&
+		git commit -m "A" &&
 
-	git checkout master
+		git checkout B &&
+		mkdir y &&
+		mkdir x &&
+		git mv z/b y/ &&
+		git mv z/c y/ &&
+		git mv z/d x/ &&
+		rmdir z &&
+		test_tick &&
+		git commit -m "B"
+	)
 
-[master (root-commit) 7329388] Initial A one, A two
- Author: A U Thor <author@example.com>
- 3 files changed, 16 insertions(+)
- create mode 100644 one
- create mode 100644 same
- create mode 100644 two
-Switched to a new branch 'renamer'
-[renamer 0420b41] Renamer R one->uno, M two
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6043-merge-rename-directories/9h/.git/
+[master (root-commit) 714b322] O
  Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+), 1 deletion(-)
- rename one => uno (87%)
-Switched to a new branch 'side'
-[side ab76817] Side M one, D two, A three
+ 3 files changed, 11 insertions(+)
+ create mode 100644 z/b
+ create mode 100644 z/c
+ create mode 100644 z/d
+Switched to branch 'A'
+[A d51a99d] A
  Author: A U Thor <author@example.com>
- 3 files changed, 5 insertions(+), 6 deletions(-)
- create mode 100644 three
- delete mode 100644 two
-Switched to a new branch 'simple'
-[simple 022ff9d] Simple D one, M two
+ 1 file changed, 1 insertion(+)
+Switched to branch 'B'
+[B 0435868] B
  Author: A U Thor <author@example.com>
- 2 files changed, 10 deletions(-)
- delete mode 100644 one
-Switched to branch 'master'
-ok 1 - setup
+ 3 files changed, 0 insertions(+), 0 deletions(-)
+ rename {z => x}/d (100%)
+ rename {z => y}/b (100%)
+ rename {z => y}/c (100%)
+ok 75 - 9h-setup: Avoid dir rename on merely modified path
 
 expecting success: 
+	(
+		cd 9h &&
 
-	git checkout -b delete-me master &&
-	git update-ref -d --no-deref refs/heads/delete-me &&
-	test refs/heads/delete-me = "$(git symbolic-ref HEAD)" &&
-	git checkout master &&
-	test refs/heads/master = "$(git symbolic-ref HEAD)"
+		git checkout A^0 &&
 
-Switched to a new branch 'delete-me'
-Switched to branch 'master'
-ok 2 - checkout from non-existing branch
+		git merge -s recursive B^0 &&
 
-expecting success: 
+		git ls-files -s >out &&
+		test_line_count = 3 out &&
 
-	fill 0 1 2 3 4 5 6 7 8 >one &&
-	if git checkout side
-	then
-		echo Not happy
-		false
-	else
-		echo "happy - failed correctly"
-	fi
+		git rev-parse >actual \
+			HEAD:y/b HEAD:y/c HEAD:x/d &&
+		git rev-parse >expect \
+			O:z/b    O:z/c    A:z/d &&
+		test_cmp expect actual
+	)
 
+Note: checking out 'A^0'.
 
-error: Your local changes to the following files would be overwritten by checkout:
-	one
-Please commit your changes or stash them before you switch branches.
-Aborting
-happy - failed correctly
-ok 3 - checkout with dirty tree without -m
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by performing another checkout.
 
-expecting success: 
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -b with the checkout command again. Example:
 
-	git checkout -f master &&
-	fill 0 1 2 3 4 5 6 7 8 >same &&
-	cp same kept &&
-	git checkout side >messages &&
-	test_cmp same kept &&
-	printf "M\t%s\n" same >messages.expect &&
-	test_cmp messages.expect messages
+  git checkout -b <new-branch-name>
 
-Already on 'master'
-Switched to branch 'side'
-ok 4 - checkout with unrelated dirty tree without -m
+HEAD is now at d51a99d A
+Merging:
+d51a99d A
+virtual B^0
+found 1 common ancestor:
+714b322 O
+Merge made by the 'recursive' strategy.
+ {z => x}/d | 0
+ {z => y}/b | 0
+ {z => y}/c | 0
+ 3 files changed, 0 insertions(+), 0 deletions(-)
+ rename {z => x}/d (100%)
+ rename {z => y}/b (100%)
+ rename {z => y}/c (100%)
+ok 76 - 9h-check: Avoid dir rename on merely modified path
 
 expecting success: 
+	test_create_repo 10a &&
+	(
+		cd 10a &&
 
-	git checkout -f master &&
-	git clean -f &&
+		mkdir z &&
+		echo b >z/b &&
+		echo c >z/c &&
+		git add z &&
+		test_tick &&
+		git commit -m "O" &&
 
-	fill 0 1 2 3 4 5 6 7 8 >one &&
-	git checkout -m side > messages &&
+		git branch O &&
+		git branch A &&
+		git branch B &&
 
-	test "$(git symbolic-ref HEAD)" = "refs/heads/side" &&
+		git checkout A &&
+		git rm z/c &&
+		test_tick &&
+		git commit -m "A" &&
 
-	printf "M\t%s\n" one >expect.messages &&
-	test_cmp expect.messages messages &&
+		git checkout B &&
+		git mv z/c z/d &&
+		test_tick &&
+		git commit -m "B"
+	)
 
-	fill "M	one" "A	three" "D	two" >expect.master &&
-	git diff --name-status master >current.master &&
-	test_cmp expect.master current.master &&
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6043-merge-rename-directories/10a/.git/
+[master (root-commit) 4e96174] O
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 z/b
+ create mode 100644 z/c
+Switched to branch 'A'
+rm 'z/c'
+[A bc21cd8] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 z/c
+Switched to branch 'B'
+[B 7bb44f1] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename z/{c => d} (100%)
+ok 77 - 10a-setup: Overwrite untracked with normal rename/delete
 
-	fill "M	one" >expect.side &&
-	git diff --name-status side >current.side &&
-	test_cmp expect.side current.side &&
+expecting success: 
+	(
+		cd 10a &&
 
-	git diff --cached >current.index &&
-	test_must_be_empty current.index
+		git checkout A^0 &&
+		echo very >z/c &&
+		echo important >z/d &&
 
-Switched to branch 'master'
-Removing kept
-Removing messages
-Removing messages.expect
-Switched to branch 'side'
-ok 5 - checkout -m with dirty tree
+		test_must_fail git merge -s recursive B^0 >out 2>err &&
+		test_i18ngrep "The following untracked working tree files would be overwritten by merge" err &&
 
-expecting success: 
+		git ls-files -s >out &&
+		test_line_count = 1 out &&
+		git ls-files -o >out &&
+		test_line_count = 4 out &&
 
-	git checkout -f master && git clean -f &&
+		echo very >expect &&
+		test_cmp expect z/c &&
 
-	fill 1 2 3 4 5 7 8 >one &&
-	if git checkout renamer
-	then
-		echo Not happy
-		false
-	else
-		echo "happy - failed correctly"
-	fi &&
+		echo important >expect &&
+		test_cmp expect z/d &&
 
-	git checkout -m renamer &&
-	fill 1 3 4 5 7 8 >expect &&
-	test_cmp expect uno &&
-	! test -f one &&
-	git diff --cached >current &&
-	test_must_be_empty current
+		git rev-parse HEAD:z/b >actual &&
+		git rev-parse O:z/b >expect &&
+		test_cmp expect actual
+	)
 
+Note: checking out 'A^0'.
 
-Switched to branch 'master'
-Removing current.index
-Removing current.master
-Removing current.side
-Removing expect.master
-Removing expect.messages
-Removing expect.side
-Removing messages
-error: Your local changes to the following files would be overwritten by checkout:
-	one
-Please commit your changes or stash them before you switch branches.
-Aborting
-happy - failed correctly
-Switched to branch 'renamer'
-M	uno
-ok 6 - checkout -m with dirty tree, renamed
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by performing another checkout.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -b with the checkout command again. Example:
+
+  git checkout -b <new-branch-name>
+
+HEAD is now at bc21cd8 A
+error: The following untracked working tree files would be overwritten by merge:
+ok 78 - 10a-check: Overwrite untracked with normal rename/delete
 
 expecting success: 
+	test_create_repo 10b &&
+	(
+		cd 10b &&
 
-	git checkout -f master && git clean -f &&
+		mkdir z &&
+		echo b >z/b &&
+		echo c >z/c &&
+		git add z &&
+		test_tick &&
+		git commit -m "O" &&
 
-	fill 1 T 3 4 5 6 S 8 >one &&
-	if git checkout renamer
-	then
-		echo Not happy
-		false
-	else
-		echo "happy - failed correctly"
-	fi &&
+		git branch O &&
+		git branch A &&
+		git branch B &&
 
-	git checkout -m renamer &&
+		git checkout A &&
+		git rm z/c &&
+		git mv z/ y/ &&
+		test_tick &&
+		git commit -m "A" &&
 
-	git diff master:one :3:uno |
-	sed -e "1,/^@@/d" -e "/^ /d" -e "s/^-/d/" -e "s/^+/a/" >current &&
-	fill d2 aT d7 aS >expect &&
-	test_cmp expect current &&
-	git diff --cached two >current &&
-	test_must_be_empty current
+		git checkout B &&
+		git mv z/c z/d &&
+		echo e >z/e &&
+		git add z/e &&
+		test_tick &&
+		git commit -m "B"
+	)
 
-Switched to branch 'master'
-Removing current
-Removing expect
-error: Your local changes to the following files would be overwritten by checkout:
-	one
-Please commit your changes or stash them before you switch branches.
-Aborting
-happy - failed correctly
-Switched to branch 'renamer'
-M	uno
-ok 7 - checkout -m with merge conflict
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6043-merge-rename-directories/10b/.git/
+[master (root-commit) 4e96174] O
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 z/b
+ create mode 100644 z/c
+Switched to branch 'A'
+rm 'z/c'
+[A 3a1dd27] A
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 deletion(-)
+ rename {z => y}/b (100%)
+ delete mode 100644 z/c
+Switched to branch 'B'
+[B 13c0b2e] B
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+)
+ rename z/{c => d} (100%)
+ create mode 100644 z/e
+ok 79 - 10b-setup: Overwrite untracked with dir rename + delete
 
 expecting success: 
+	(
+		cd 10b &&
 
-	git checkout -f master && git clean -f &&
+		git checkout A^0 &&
+		echo very >y/c &&
+		echo important >y/d &&
+		echo contents >y/e &&
 
-	fill b d > two &&
-	git checkout -m simple &&
+		test_must_fail git merge -s recursive B^0 >out 2>err &&
+		test_i18ngrep "CONFLICT (rename/delete).*Version B\^0 of y/d left in tree at y/d~B\^0" out &&
+		test_i18ngrep "Error: Refusing to lose untracked file at y/e; writing to y/e~B\^0 instead" out &&
 
-	git ls-files >current &&
-	fill same two two two >expect &&
-	test_cmp expect current &&
+		git ls-files -s >out &&
+		test_line_count = 3 out &&
+		git ls-files -u >out &&
+		test_line_count = 2 out &&
+		git ls-files -o >out &&
+		test_line_count = 5 out &&
 
-	cat <<-EOF >expect &&
-	<<<<<<< simple
-	a
-	c
-	e
-	=======
-	b
-	d
-	>>>>>>> local
-	EOF
-	test_cmp expect two
+		git rev-parse >actual \
+			:0:y/b :3:y/d :3:y/e &&
+		git rev-parse >expect \
+			O:z/b  O:z/c  B:z/e &&
+		test_cmp expect actual &&
 
-Switched to branch 'master'
-Removing current
-Removing expect
-Switched to branch 'simple'
-M	two
-ok 8 - format of merge conflict from checkout -m
+		echo very >expect &&
+		test_cmp expect y/c &&
 
-expecting success: 
+		echo important >expect &&
+		test_cmp expect y/d &&
 
-	git checkout -f master && git reset --hard && git clean -f &&
+		echo contents >expect &&
+		test_cmp expect y/e
+	)
 
-	fill b d > two &&
-	git checkout --merge --conflict=diff3 simple &&
+Note: checking out 'A^0'.
 
-	cat <<-EOF >expect &&
-	<<<<<<< simple
-	a
-	c
-	e
-	||||||| master
-	a
-	b
-	c
-	d
-	e
-	=======
-	b
-	d
-	>>>>>>> local
-	EOF
-	test_cmp expect two
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by performing another checkout.
 
-Switched to branch 'master'
-HEAD is now at 7329388 Initial A one, A two
-Removing current
-Removing expect
-Switched to branch 'simple'
-M	two
-ok 9 - checkout --merge --conflict=diff3 <branch>
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -b with the checkout command again. Example:
+
+  git checkout -b <new-branch-name>
+
+HEAD is now at 3a1dd27 A
+CONFLICT (rename/delete): z/c deleted in HEAD and renamed to y/d in B^0. Version B^0 of y/d left in tree at y/d~B^0.
+Error: Refusing to lose untracked file at y/e; writing to y/e~B^0 instead.
+ok 80 - 10b-check: Overwrite untracked with dir rename + delete
 
 expecting success: 
+	test_create_repo 10c &&
+	(
+		cd 10c &&
 
-	git checkout -f master && git reset --hard && git clean -f &&
-	git rm two &&
+		mkdir z x &&
+		echo a >z/a &&
+		echo b >z/b &&
+		echo c >x/c &&
+		echo d >x/d &&
+		git add z x &&
+		test_tick &&
+		git commit -m "O" &&
 
-	test_must_fail git checkout simple 2>errs &&
-	test_i18ngrep overwritten errs &&
+		git branch O &&
+		git branch A &&
+		git branch B &&
 
-	git checkout --merge simple 2>errs &&
-	test_i18ngrep ! overwritten errs &&
-	git ls-files -u &&
-	test_must_fail git cat-file -t :0:two &&
-	test "$(git cat-file -t :1:two)" = blob &&
-	test "$(git cat-file -t :2:two)" = blob &&
-	test_must_fail git cat-file -t :3:two
+		git checkout A &&
+		mkdir w &&
+		git mv x/c w/c &&
+		git mv z/ y/ &&
+		test_tick &&
+		git commit -m "A" &&
 
-Switched to branch 'master'
-HEAD is now at 7329388 Initial A one, A two
-Removing expect
-rm 'two'
-error: Your local changes to the following files would be overwritten by checkout:
-M	two
-100644 940532533944dd159bfd11136fac2ee35872de38 1	two
-100644 bf8d586a0d1628d4b5132c772c2fb2906385b149 2	two
-fatal: Not a valid object name :0:two
-fatal: Not a valid object name :3:two
-ok 10 - switch to another branch while carrying a deletion
+		git checkout B &&
+		git mv x/c z/ &&
+		test_tick &&
+		git commit -m "B"
+	)
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6043-merge-rename-directories/10c/.git/
+[master (root-commit) 1ee9006] O
+ Author: A U Thor <author@example.com>
+ 4 files changed, 4 insertions(+)
+ create mode 100644 x/c
+ create mode 100644 x/d
+ create mode 100644 z/a
+ create mode 100644 z/b
+Switched to branch 'A'
+[A e6a4b22] A
+ Author: A U Thor <author@example.com>
+ 3 files changed, 0 insertions(+), 0 deletions(-)
+ rename {x => w}/c (100%)
+ rename {z => y}/a (100%)
+ rename {z => y}/b (100%)
+Switched to branch 'B'
+[B b8dbf85] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename {x => z}/c (100%)
+ok 81 - 10c-setup: Overwrite untracked with dir rename/rename(1to2)
 
 expecting success: 
+	(
+		cd 10c &&
 
-	git config advice.detachedHead false &&
-	git checkout -f renamer && git clean -f &&
-	git checkout renamer^ 2>messages &&
-	test_i18ngrep "HEAD is now at 7329388" messages &&
-	test_line_count = 1 messages &&
-	H=$(git rev-parse --verify HEAD) &&
-	M=$(git show-ref -s --verify refs/heads/master) &&
-	test "z$H" = "z$M" &&
-	if git symbolic-ref HEAD >/dev/null 2>&1
-	then
-		echo "OOPS, HEAD is still symbolic???"
-		false
-	else
-		: happy
-	fi
+		git checkout A^0 &&
+		echo important >y/c &&
 
-Switched to branch 'renamer'
-Removing errs
-HEAD is now at 7329388 Initial A one, A two
-ok 11 - checkout to detach HEAD (with advice declined)
+		test_must_fail git merge -s recursive B^0 >out 2>err &&
+		test_i18ngrep "CONFLICT (rename/rename)" out &&
+		test_i18ngrep "Refusing to lose untracked file at y/c; adding as y/c~B\^0 instead" out &&
 
-expecting success: 
-	git config advice.detachedHead true &&
-	git checkout -f renamer && git clean -f &&
-	GIT_TEST_GETTEXT_POISON= git checkout renamer^ 2>messages &&
-	grep "HEAD is now at 7329388" messages &&
-	test_line_count -gt 1 messages &&
-	H=$(git rev-parse --verify HEAD) &&
-	M=$(git show-ref -s --verify refs/heads/master) &&
-	test "z$H" = "z$M" &&
-	if git symbolic-ref HEAD >/dev/null 2>&1
-	then
-		echo "OOPS, HEAD is still symbolic???"
-		false
-	else
-		: happy
-	fi
+		git ls-files -s >out &&
+		test_line_count = 6 out &&
+		git ls-files -u >out &&
+		test_line_count = 3 out &&
+		git ls-files -o >out &&
+		test_line_count = 3 out &&
 
-Previous HEAD position was 7329388 Initial A one, A two
-Switched to branch 'renamer'
-Removing messages
-HEAD is now at 7329388 Initial A one, A two
-ok 12 - checkout to detach HEAD
+		git rev-parse >actual \
+			:0:y/a :0:y/b :0:x/d :1:x/c :2:w/c :3:y/c &&
+		git rev-parse >expect \
+			 O:z/a  O:z/b  O:x/d  O:x/c  O:x/c  O:x/c &&
+		test_cmp expect actual &&
 
-expecting success: 
+		git hash-object y/c~B^0 >actual &&
+		git rev-parse O:x/c >expect &&
+		test_cmp expect actual &&
 
-	git checkout -f master && git clean -f &&
-	git checkout renamer^ &&
-	H=$(git rev-parse --verify HEAD) &&
-	M=$(git show-ref -s --verify refs/heads/master) &&
-	test "z$H" = "z$M" &&
-	if git symbolic-ref HEAD >/dev/null 2>&1
-	then
-		echo "OOPS, HEAD is still symbolic???"
-		false
-	else
-		: happy
-	fi
+		echo important >expect &&
+		test_cmp expect y/c
+	)
 
-Switched to branch 'master'
-Removing messages
-Note: checking out 'renamer^'.
+Note: checking out '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
@@ -270764,56 +271299,107 @@
 
   git checkout -b <new-branch-name>
 
-HEAD is now at 7329388 Initial A one, A two
-ok 13 - checkout to detach HEAD with branchname^
+HEAD is now at e6a4b22 A
+CONFLICT (rename/rename): Rename "x/c"->"w/c" in branch "HEAD" rename "x/c"->"y/c" in "B^0"
+Refusing to lose untracked file at y/c; adding as y/c~B^0 instead
+ok 82 - 10c-check: Overwrite untracked with dir rename/rename(1to2)
 
 expecting success: 
+	test_create_repo 10d &&
+	(
+		cd 10d &&
 
-	git checkout -f master && git clean -f &&
-	git checkout ":/Initial" &&
-	H=$(git rev-parse --verify HEAD) &&
-	M=$(git show-ref -s --verify refs/heads/master) &&
-	test "z$H" = "z$M" &&
-	if git symbolic-ref HEAD >/dev/null 2>&1
-	then
-		echo "OOPS, HEAD is still symbolic???"
-		false
-	else
-		: happy
-	fi
-
-Switched to branch 'master'
-Note: checking out ':/Initial'.
+		mkdir z x &&
+		echo a >z/a &&
+		echo b >z/b &&
+		echo c >z/c &&
+		echo d >x/d &&
+		echo e >x/e &&
+		echo f >x/f &&
+		git add z x &&
+		test_tick &&
+		git commit -m "O" &&
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by performing another checkout.
+		git branch O &&
+		git branch A &&
+		git branch B &&
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
+		git checkout A &&
+		git mv z/c x/wham &&
+		git mv z/ y/ &&
+		test_tick &&
+		git commit -m "A" &&
 
-  git checkout -b <new-branch-name>
+		git checkout B &&
+		git mv x/f z/wham &&
+		git mv x/ y/ &&
+		test_tick &&
+		git commit -m "B"
+	)
 
-HEAD is now at 7329388 Initial A one, A two
-ok 14 - checkout to detach HEAD with :/message
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6043-merge-rename-directories/10d/.git/
+[master (root-commit) 1a4b546] O
+ Author: A U Thor <author@example.com>
+ 6 files changed, 6 insertions(+)
+ create mode 100644 x/d
+ create mode 100644 x/e
+ create mode 100644 x/f
+ create mode 100644 z/a
+ create mode 100644 z/b
+ create mode 100644 z/c
+Switched to branch 'A'
+[A 9f961af] A
+ Author: A U Thor <author@example.com>
+ 3 files changed, 0 insertions(+), 0 deletions(-)
+ rename z/c => x/wham (100%)
+ rename {z => y}/a (100%)
+ rename {z => y}/b (100%)
+Switched to branch 'B'
+[B 6a20b58] B
+ Author: A U Thor <author@example.com>
+ 3 files changed, 0 insertions(+), 0 deletions(-)
+ rename {x => y}/d (100%)
+ rename {x => y}/e (100%)
+ rename x/f => z/wham (100%)
+ok 83 - 10d-setup: Delete untracked with dir rename/rename(2to1)
 
 expecting success: 
+	(
+		cd 10d &&
 
-	git checkout -f master && git clean -f &&
-	git checkout HEAD^0 &&
-	H=$(git rev-parse --verify HEAD) &&
-	M=$(git show-ref -s --verify refs/heads/master) &&
-	test "z$H" = "z$M" &&
-	if git symbolic-ref HEAD >/dev/null 2>&1
-	then
-		echo "OOPS, HEAD is still symbolic???"
-		false
-	else
-		: happy
-	fi
+		git checkout A^0 &&
+		echo important >y/wham &&
 
-Switched to branch 'master'
-Note: checking out 'HEAD^0'.
+		test_must_fail git merge -s recursive B^0 >out 2>err &&
+		test_i18ngrep "CONFLICT (rename/rename)" out &&
+		test_i18ngrep "Refusing to lose untracked file at y/wham" out &&
+
+		git ls-files -s >out &&
+		test_line_count = 6 out &&
+		git ls-files -u >out &&
+		test_line_count = 2 out &&
+		git ls-files -o >out &&
+		test_line_count = 4 out &&
+
+		git rev-parse >actual \
+			:0:y/a :0:y/b :0:y/d :0:y/e :2:y/wham :3:y/wham &&
+		git rev-parse >expect \
+			 O:z/a  O:z/b  O:x/d  O:x/e  O:z/c     O:x/f &&
+		test_cmp expect actual &&
+
+		test_must_fail git rev-parse :1:y/wham &&
+
+		echo important >expect &&
+		test_cmp expect y/wham &&
+
+		git hash-object >actual \
+			y/wham~B^0 y/wham~HEAD &&
+		git rev-parse >expect \
+			O:x/f      O:z/c &&
+		test_cmp expect actual
+	)
+
+Note: checking out '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
@@ -270824,58 +271410,90 @@
 
   git checkout -b <new-branch-name>
 
-HEAD is now at 7329388 Initial A one, A two
-ok 15 - checkout to detach HEAD with HEAD^0
+HEAD is now at 9f961af A
+CONFLICT (rename/rename): Rename z/c->y/wham in HEAD. Rename x/f->y/wham in B^0
+Refusing to lose untracked file at y/wham, even though it's in the way.
+fatal: Path 'y/wham' is in the index, but not at stage 1.
+Did you mean ':2:y/wham'?
+:1:y/wham
+ok 84 - 10d-check: Delete untracked with dir rename/rename(2to1)
 
 expecting success: 
+	test_create_repo 10e &&
+	(
+		cd 10e &&
 
-	git tag both side &&
-	git branch both master &&
-	git reset --hard &&
-	git checkout master &&
+		mkdir z &&
+		echo a >z/a &&
+		echo b >z/b &&
+		git add z &&
+		test_tick &&
+		git commit -m "O" &&
 
-	git checkout both &&
-	H=$(git rev-parse --verify HEAD) &&
-	M=$(git show-ref -s --verify refs/heads/master) &&
-	test "z$H" = "z$M" &&
-	name=$(git symbolic-ref HEAD 2>/dev/null) &&
-	test "z$name" = zrefs/heads/both
+		git branch O &&
+		git branch A &&
+		git branch B &&
 
+		git checkout A &&
+		git mv z/ y/ &&
+		test_tick &&
+		git commit -m "A" &&
 
-HEAD is now at 7329388 Initial A one, A two
-Switched to branch 'master'
-warning: refname 'both' is ambiguous.
-Switched to branch 'both'
-ok 16 - checkout with ambiguous tag/branch names
+		git checkout B &&
+		echo c >z/c &&
+		git add z/c &&
+		test_tick &&
+		git commit -m "B"
+	)
 
-expecting success: 
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6043-merge-rename-directories/10e/.git/
+[master (root-commit) 75ee182] O
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 z/a
+ create mode 100644 z/b
+Switched to branch 'A'
+[A ac1ed31] A
+ Author: A U Thor <author@example.com>
+ 2 files changed, 0 insertions(+), 0 deletions(-)
+ rename {z => y}/a (100%)
+ rename {z => y}/b (100%)
+Switched to branch 'B'
+[B 095ac3d] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 z/c
+ok 85 - 10e-setup: Does git complain about untracked file that is not really in the way?
 
-	git reset --hard &&
-	git checkout master &&
+checking known breakage: 
+	(
+		cd 10e &&
 
-	git tag frotz side &&
-	git branch frotz master &&
-	git reset --hard &&
-	git checkout master &&
+		git checkout A^0 &&
+		mkdir z &&
+		echo random >z/c &&
 
-	git checkout tags/frotz &&
-	H=$(git rev-parse --verify HEAD) &&
-	S=$(git show-ref -s --verify refs/heads/side) &&
-	test "z$H" = "z$S" &&
-	if name=$(git symbolic-ref HEAD 2>/dev/null)
-	then
-		echo "Bad -- should have detached"
-		false
-	else
-		: happy
-	fi
+		git merge -s recursive B^0 >out 2>err &&
+		test_i18ngrep ! "following untracked working tree files would be overwritten by merge" err &&
 
+		git ls-files -s >out &&
+		test_line_count = 3 out &&
+		git ls-files -u >out &&
+		test_line_count = 0 out &&
+		git ls-files -o >out &&
+		test_line_count = 3 out &&
 
-HEAD is now at 7329388 Initial A one, A two
-Switched to branch 'master'
-HEAD is now at 7329388 Initial A one, A two
-Already on 'master'
-Note: checking out 'tags/frotz'.
+		git rev-parse >actual \
+			:0:y/a :0:y/b :0:y/c &&
+		git rev-parse >expect \
+			 O:z/a  O:z/b  B:z/c &&
+		test_cmp expect actual &&
+
+		echo random >expect &&
+		test_cmp expect z/c
+	)
+
+Note: checking out '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
@@ -270886,92 +271504,87 @@
 
   git checkout -b <new-branch-name>
 
-HEAD is now at ab76817 Side M one, D two, A three
-ok 17 - checkout with ambiguous tag/branch names
+HEAD is now at ac1ed31 A
+not ok 86 - 10e-check: Does git complain about untracked file that is not really in the way? # TODO known breakage
 
 expecting success: 
-
-	git reset --hard &&
-	git checkout master &&
-
-	mkdir subs &&
+	test_create_repo 11a &&
 	(
-		cd subs &&
-		git checkout side
-	) &&
-	! test -f subs/one &&
-	rm -fr subs
-
-
-HEAD is now at ab76817 Side M one, D two, A three
-Previous HEAD position was ab76817 Side M one, D two, A three
-Switched to branch 'master'
-Switched to branch 'side'
-ok 18 - switch branches while in subdirectory
+		cd 11a &&
 
-expecting success: 
+		mkdir z &&
+		echo a >z/a &&
+		test_seq 1 10 >z/b &&
+		git add z &&
+		test_tick &&
+		git commit -m "O" &&
 
-	git reset --hard &&
-	git checkout side &&
-	mkdir subs &&
-	>subs/bero &&
-	git add subs/bero &&
-	git commit -m "add subs/bero" &&
+		git branch O &&
+		git branch A &&
+		git branch B &&
 
-	git checkout master &&
-	mkdir -p subs &&
-	(
-		cd subs &&
-		git checkout side -- bero
-	) &&
-	test -f subs/bero
+		git checkout A &&
+		git mv z/b z/c &&
+		test_tick &&
+		git commit -m "A" &&
 
+		git checkout B &&
+		echo 11 >>z/b &&
+		git add z/b &&
+		test_tick &&
+		git commit -m "B"
+	)
 
-HEAD is now at ab76817 Side M one, D two, A three
-Already on 'side'
-[side bb04aa0] add subs/bero
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6043-merge-rename-directories/11a/.git/
+[master (root-commit) d2da13d] O
+ Author: A U Thor <author@example.com>
+ 2 files changed, 11 insertions(+)
+ create mode 100644 z/a
+ create mode 100644 z/b
+Switched to branch 'A'
+[A 7a0ff52] A
  Author: A U Thor <author@example.com>
  1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 subs/bero
-Switched to branch 'master'
-ok 19 - checkout specific path while in subdirectory
+ rename z/{b => c} (100%)
+Switched to branch 'B'
+[B b7a4243] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 87 - 11a-setup: Avoid losing dirty contents with simple rename
 
 expecting success: 
-    git config branch.autosetupmerge false &&
-    git checkout master &&
-    git checkout --track -b track1 &&
-    test "$(git config branch.track1.remote)" &&
-    test "$(git config branch.track1.merge)"
-Already on 'master'
-A	subs/bero
-Switched to a new branch 'track1'
-A	subs/bero
-Branch 'track1' set up to track local branch 'master'.
-ok 20 - checkout w/--track sets up tracking
+	(
+		cd 11a &&
 
-expecting success: 
-    test_when_finished git config branch.autosetupmerge false &&
-    git config branch.autosetupmerge always &&
-    git checkout master &&
-    git checkout -b track2 &&
-    test "$(git config branch.track2.remote)" &&
-    test "$(git config branch.track2.merge)"
-Switched to branch 'master'
-A	subs/bero
-Switched to a new branch 'track2'
-A	subs/bero
-Branch 'track2' set up to track local branch 'master'.
-ok 21 - checkout w/autosetupmerge=always sets up tracking
+		git checkout A^0 &&
+		echo stuff >>z/c &&
 
-expecting success: 
-    git checkout master^0 &&
-    test_must_fail git symbolic-ref HEAD &&
-    test_must_fail git checkout --track -b track &&
-    test_must_fail git rev-parse --verify track &&
-    test_must_fail git symbolic-ref HEAD &&
-    test "z$(git rev-parse master^0)" = "z$(git rev-parse HEAD)"
+		test_must_fail git merge -s recursive B^0 >out 2>err &&
+		test_i18ngrep "Refusing to lose dirty file at z/c" out &&
 
-Note: checking out 'master^0'.
+		test_seq 1 10 >expected &&
+		echo stuff >>expected &&
+		test_cmp expected z/c &&
+
+		git ls-files -s >out &&
+		test_line_count = 2 out &&
+		git ls-files -u >out &&
+		test_line_count = 1 out &&
+		git ls-files -o >out &&
+		test_line_count = 4 out &&
+
+		git rev-parse >actual \
+			:0:z/a :2:z/c &&
+		git rev-parse >expect \
+			 O:z/a  B:z/b &&
+		test_cmp expect actual &&
+
+		git hash-object z/c~HEAD >actual &&
+		git rev-parse B:z/b >expect &&
+		test_cmp expect actual
+	)
+
+Note: checking out '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
@@ -270982,50 +271595,95 @@
 
   git checkout -b <new-branch-name>
 
-HEAD is now at 7329388 Initial A one, A two
-A	subs/bero
-fatal: ref HEAD is not a symbolic ref
-fatal: Cannot setup tracking information; starting point 'HEAD' is not a branch.
-A	subs/bero
-fatal: Needed a single revision
-fatal: ref HEAD is not a symbolic ref
-ok 22 - checkout w/--track from non-branch HEAD fails
+HEAD is now at 7a0ff52 A
+Refusing to lose dirty file at z/c
+ok 88 - 11a-check: Avoid losing dirty contents with simple rename
 
 expecting success: 
-    git checkout master^0 &&
-    test_must_fail git symbolic-ref HEAD &&
-    test_must_fail git checkout --track -b track frotz &&
-    test_must_fail git rev-parse --verify track &&
-    test_must_fail git symbolic-ref HEAD &&
-    test "z$(git rev-parse master^0)" = "z$(git rev-parse HEAD)"
+	test_create_repo 11b &&
+	(
+		cd 11b &&
 
-HEAD is now at 7329388 Initial A one, A two
-A	subs/bero
-fatal: ref HEAD is not a symbolic ref
-warning: refname 'frotz' is ambiguous.
-warning: refname 'frotz' is ambiguous.
-fatal: Ambiguous object name: 'frotz'.
-A	subs/bero
-fatal: Needed a single revision
-fatal: ref HEAD is not a symbolic ref
-ok 23 - checkout w/--track from tag fails
+		mkdir z x &&
+		echo a >z/a &&
+		echo b >x/b &&
+		test_seq 1 10 >x/c &&
+		git add z x &&
+		test_tick &&
+		git commit -m "O" &&
+
+		git branch O &&
+		git branch A &&
+		git branch B &&
+
+		git checkout A &&
+		git mv x/c z/c &&
+		test_tick &&
+		git commit -m "A" &&
+
+		git checkout B &&
+		git mv z y &&
+		echo 11 >>x/c &&
+		git add x/c &&
+		test_tick &&
+		git commit -m "B"
+	)
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6043-merge-rename-directories/11b/.git/
+[master (root-commit) 8ba0ed2] O
+ Author: A U Thor <author@example.com>
+ 3 files changed, 12 insertions(+)
+ create mode 100644 x/b
+ create mode 100644 x/c
+ create mode 100644 z/a
+Switched to branch 'A'
+[A 331ae41] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename {x => z}/c (100%)
+Switched to branch 'B'
+[B 0b664da] B
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+)
+ rename {z => y}/a (100%)
+ok 89 - 11b-setup: Avoid losing dirty file involved in directory rename
 
 expecting success: 
-    git checkout master &&
-    git config --bool core.prefersymlinkrefs yes &&
-    git checkout side &&
-    git checkout master &&
-    it=$(git symbolic-ref HEAD) &&
-    test "z$it" = zrefs/heads/master &&
-    here=$(git rev-parse --verify refs/heads/master) &&
-    git checkout side^ &&
-    test "z$(git rev-parse --verify refs/heads/master)" = "z$here"
+	(
+		cd 11b &&
 
-Switched to branch 'master'
-A	subs/bero
-Switched to branch 'side'
-Switched to branch 'master'
-Note: checking out 'side^'.
+		git checkout A^0 &&
+		echo stuff >>z/c &&
+
+		git merge -s recursive B^0 >out 2>err &&
+		test_i18ngrep "Refusing to lose dirty file at z/c" out &&
+
+		grep -q stuff z/c &&
+		test_seq 1 10 >expected &&
+		echo stuff >>expected &&
+		test_cmp expected z/c &&
+
+		git ls-files -s >out &&
+		test_line_count = 3 out &&
+		git ls-files -u >out &&
+		test_line_count = 0 out &&
+		git ls-files -m >out &&
+		test_line_count = 0 out &&
+		git ls-files -o >out &&
+		test_line_count = 4 out &&
+
+		git rev-parse >actual \
+			:0:x/b :0:y/a :0:y/c &&
+		git rev-parse >expect \
+			 O:x/b  O:z/a  B:x/c &&
+		test_cmp expect actual &&
+
+		git hash-object y/c >actual &&
+		git rev-parse B:x/c >expect &&
+		test_cmp expect actual
+	)
+
+Note: checking out '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
@@ -271036,205 +271694,186 @@
 
   git checkout -b <new-branch-name>
 
-HEAD is now at ab76817 Side M one, D two, A three
-ok 24 - detach a symbolic link HEAD
+HEAD is now at 331ae41 A
+Refusing to lose dirty file at z/c
+ok 90 - 11b-check: Avoid losing dirty file involved in directory rename
 
 expecting success: 
-    git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*" &&
-    git update-ref refs/remotes/origin/koala/bear renamer &&
-
-    git checkout --track origin/koala/bear &&
-    test "refs/heads/koala/bear" = "$(git symbolic-ref HEAD)" &&
-    test "$(git rev-parse HEAD)" = "$(git rev-parse renamer)" &&
+	test_create_repo 11c &&
+	(
+		cd 11c &&
 
-    git checkout master && git branch -D koala/bear &&
+		mkdir y x &&
+		echo a >y/a &&
+		echo b >x/b &&
+		test_seq 1 10 >x/c &&
+		git add y x &&
+		test_tick &&
+		git commit -m "O" &&
 
-    git checkout --track refs/remotes/origin/koala/bear &&
-    test "refs/heads/koala/bear" = "$(git symbolic-ref HEAD)" &&
-    test "$(git rev-parse HEAD)" = "$(git rev-parse renamer)" &&
+		git branch O &&
+		git branch A &&
+		git branch B &&
 
-    git checkout master && git branch -D koala/bear &&
+		git checkout A &&
+		git mv x/c y/c &&
+		test_tick &&
+		git commit -m "A" &&
 
-    git checkout --track remotes/origin/koala/bear &&
-    test "refs/heads/koala/bear" = "$(git symbolic-ref HEAD)" &&
-    test "$(git rev-parse HEAD)" = "$(git rev-parse renamer)"
+		git checkout B &&
+		mkdir y/c &&
+		echo d >y/c/d &&
+		echo 11 >>x/c &&
+		git add x/c y/c/d &&
+		test_tick &&
+		git commit -m "B"
+	)
 
-Previous HEAD position was ab76817 Side M one, D two, A three
-Switched to a new branch 'koala/bear'
-Branch 'koala/bear' set up to track remote branch 'koala/bear' from 'origin'.
-Switched to branch 'master'
-Deleted branch koala/bear (was 0420b41).
-Switched to a new branch 'koala/bear'
-Branch 'koala/bear' set up to track remote branch 'koala/bear' from 'origin'.
-Switched to branch 'master'
-Deleted branch koala/bear (was 0420b41).
-Switched to a new branch 'koala/bear'
-Branch 'koala/bear' set up to track remote branch 'koala/bear' from 'origin'.
-ok 25 - checkout with --track fakes a sensible -b <name>
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6043-merge-rename-directories/11c/.git/
+[master (root-commit) c615350] O
+ Author: A U Thor <author@example.com>
+ 3 files changed, 12 insertions(+)
+ create mode 100644 x/b
+ create mode 100644 x/c
+ create mode 100644 y/a
+Switched to branch 'A'
+[A b42d3e1] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename {x => y}/c (100%)
+Switched to branch 'B'
+[B 78faa62] B
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 y/c/d
+ok 91 - 11c-setup: Avoid losing not-uptodate with rename + D/F conflict
 
 expecting success: 
-    test_must_fail git checkout --track renamer
-fatal: missing branch name; try -b
-ok 26 - checkout with --track, but without -b, fails with too short tracked name
+	(
+		cd 11c &&
 
-expecting success: 
-	setup_conflicting_index &&
-	echo "none of the above" >sample &&
-	cat sample >fild &&
-	cat sample >file &&
-	cat sample >filf &&
-	test_must_fail git checkout fild file filf &&
-	test_cmp sample fild &&
-	test_cmp sample filf &&
-	test_cmp sample file
+		git checkout A^0 &&
+		echo stuff >>y/c &&
 
-error: path 'file' is unmerged
-ok 27 - checkout an unmerged path should fail
+		test_must_fail git merge -s recursive B^0 >out 2>err &&
+		test_i18ngrep "following files would be overwritten by merge" err &&
 
-expecting success: 
-	setup_conflicting_index &&
-	echo "none of the above" >sample &&
-	echo ourside >expect &&
-	cat sample >fild &&
-	cat sample >file &&
-	cat sample >filf &&
-	git checkout -f fild file filf &&
-	test_cmp expect fild &&
-	test_cmp expect filf &&
-	test_cmp sample file
+		grep -q stuff y/c &&
+		test_seq 1 10 >expected &&
+		echo stuff >>expected &&
+		test_cmp expected y/c &&
 
-warning: path 'file' is unmerged
-ok 28 - checkout with an unmerged path can be ignored
+		git ls-files -s >out &&
+		test_line_count = 3 out &&
+		git ls-files -u >out &&
+		test_line_count = 0 out &&
+		git ls-files -m >out &&
+		test_line_count = 1 out &&
+		git ls-files -o >out &&
+		test_line_count = 3 out
+	)
 
-expecting success: 
-	setup_conflicting_index &&
-	echo "none of the above" >sample &&
-	echo ourside >expect &&
-	cat sample >fild &&
-	cat sample >file &&
-	cat sample >filf &&
-	git checkout --ours . &&
-	test_cmp expect fild &&
-	test_cmp expect filf &&
-	test_cmp expect file &&
-	git checkout --theirs file &&
-	test ztheirside = "z$(cat file)"
+Note: checking out 'A^0'.
 
-ok 29 - checkout unmerged stage
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by performing another checkout.
 
-expecting success: 
-	setup_conflicting_index &&
-	echo "none of the above" >sample &&
-	echo ourside >expect &&
-	cat sample >fild &&
-	cat sample >file &&
-	cat sample >filf &&
-	git checkout -m -- fild file filf &&
-	(
-		echo "<<<<<<< ours" &&
-		echo ourside &&
-		echo "=======" &&
-		echo theirside &&
-		echo ">>>>>>> theirs"
-	) >merged &&
-	test_cmp expect fild &&
-	test_cmp expect filf &&
-	test_cmp merged file
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -b with the checkout command again. Example:
 
-ok 30 - checkout with --merge
+  git checkout -b <new-branch-name>
+
+HEAD is now at b42d3e1 A
+error: Your local changes to the following files would be overwritten by merge:
+ok 92 - 11c-check: Avoid losing not-uptodate with rename + D/F conflict
 
 expecting success: 
-	git config merge.conflictstyle diff3 &&
-	setup_conflicting_index &&
-	echo "none of the above" >sample &&
-	echo ourside >expect &&
-	cat sample >fild &&
-	cat sample >file &&
-	cat sample >filf &&
-	git checkout -m -- fild file filf &&
+	test_create_repo 11d &&
 	(
-		echo "<<<<<<< ours" &&
-		echo ourside &&
-		echo "||||||| base" &&
-		echo original &&
-		echo "=======" &&
-		echo theirside &&
-		echo ">>>>>>> theirs"
-	) >merged &&
-	test_cmp expect fild &&
-	test_cmp expect filf &&
-	test_cmp merged file
+		cd 11d &&
 
-ok 31 - checkout with --merge, in diff3 -m style
+		mkdir z x &&
+		echo a >z/a &&
+		echo b >x/b &&
+		test_seq 1 10 >x/c &&
+		git add z x &&
+		test_tick &&
+		git commit -m "O" &&
 
-expecting success: 
-	git config merge.conflictstyle diff3 &&
-	setup_conflicting_index &&
-	echo "none of the above" >sample &&
-	echo ourside >expect &&
-	cat sample >fild &&
-	cat sample >file &&
-	cat sample >filf &&
-	git checkout --conflict=merge -- fild file filf &&
-	(
-		echo "<<<<<<< ours" &&
-		echo ourside &&
-		echo "=======" &&
-		echo theirside &&
-		echo ">>>>>>> theirs"
-	) >merged &&
-	test_cmp expect fild &&
-	test_cmp expect filf &&
-	test_cmp merged file
+		git branch O &&
+		git branch A &&
+		git branch B &&
 
-ok 32 - checkout --conflict=merge, overriding config
+		git checkout A &&
+		git mv x/c z/c &&
+		test_tick &&
+		git commit -m "A" &&
+
+		git checkout B &&
+		git mv z y &&
+		mkdir y/c &&
+		echo d >y/c/d &&
+		echo 11 >>x/c &&
+		git add x/c y/c/d &&
+		test_tick &&
+		git commit -m "B"
+	)
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6043-merge-rename-directories/11d/.git/
+[master (root-commit) 8ba0ed2] O
+ Author: A U Thor <author@example.com>
+ 3 files changed, 12 insertions(+)
+ create mode 100644 x/b
+ create mode 100644 x/c
+ create mode 100644 z/a
+Switched to branch 'A'
+[A 331ae41] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename {x => z}/c (100%)
+Switched to branch 'B'
+[B cbf14e5] B
+ Author: A U Thor <author@example.com>
+ 3 files changed, 2 insertions(+)
+ rename {z => y}/a (100%)
+ create mode 100644 y/c/d
+ok 93 - 11d-setup: Avoid losing not-uptodate with rename + D/F conflict
 
 expecting success: 
-	test_unconfig merge.conflictstyle &&
-	setup_conflicting_index &&
-	echo "none of the above" >sample &&
-	echo ourside >expect &&
-	cat sample >fild &&
-	cat sample >file &&
-	cat sample >filf &&
-	git checkout --conflict=diff3 -- fild file filf &&
 	(
-		echo "<<<<<<< ours" &&
-		echo ourside &&
-		echo "||||||| base" &&
-		echo original &&
-		echo "=======" &&
-		echo theirside &&
-		echo ">>>>>>> theirs"
-	) >merged &&
-	test_cmp expect fild &&
-	test_cmp expect filf &&
-	test_cmp merged file
+		cd 11d &&
 
-ok 33 - checkout --conflict=diff3
+		git checkout A^0 &&
+		echo stuff >>z/c &&
 
-expecting success: 
-	git reset --hard master &&
-	git symbolic-ref HEAD refs/heads/master &&
-	test_must_fail git checkout -b renamer side^ &&
-	test $(git symbolic-ref HEAD) = refs/heads/master &&
-	git diff --exit-code &&
-	git diff --cached --exit-code
+		test_must_fail git merge -s recursive B^0 >out 2>err &&
+		test_i18ngrep "Refusing to lose dirty file at z/c" out &&
 
+		grep -q stuff z/c &&
+		test_seq 1 10 >expected &&
+		echo stuff >>expected &&
+		test_cmp expected z/c &&
 
-HEAD is now at 7329388 Initial A one, A two
-fatal: A branch named 'renamer' already exists.
-ok 34 - failing checkout -b should not break working tree
+		git ls-files -s >out &&
+		test_line_count = 4 out &&
+		git ls-files -u >out &&
+		test_line_count = 1 out &&
+		git ls-files -o >out &&
+		test_line_count = 5 out &&
 
-expecting success: 
-	git reset --hard master &&
-	git checkout master^0 &&
-	echo modified >one &&
-	test_must_fail git checkout renamer 2>error.log &&
-	! grep "^Previous HEAD" error.log
+		git rev-parse >actual \
+			:0:x/b :0:y/a :0:y/c/d :3:y/c &&
+		git rev-parse >expect \
+			 O:x/b  O:z/a  B:y/c/d  B:x/c &&
+		test_cmp expect actual &&
 
-HEAD is now at 7329388 Initial A one, A two
-Note: checking out 'master^0'.
+		git hash-object y/c~HEAD >actual &&
+		git rev-parse B:x/c >expect &&
+		test_cmp expect actual
+	)
+
+Note: checking out '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
@@ -271245,925 +271884,558 @@
 
   git checkout -b <new-branch-name>
 
-HEAD is now at 7329388 Initial A one, A two
-ok 35 - switch out of non-branch
+HEAD is now at 331ae41 A
+Refusing to lose dirty file at z/c
+ok 94 - 11d-check: Avoid losing not-uptodate with rename + D/F conflict
 
 expecting success: 
-	git reset --hard &&
-
-	git config merge.filfre.driver "./filfre.sh %O %A %B" &&
-	git config merge.filfre.name "Feel-free merge driver" &&
-	git config merge.filfre.recursive binary &&
-	echo "arm merge=filfre" >.gitattributes &&
-
-	git checkout -b left &&
-	echo neutral >arm &&
-	git add arm .gitattributes &&
-	test_tick &&
-	git commit -m neutral &&
-	git branch right &&
+	test_create_repo 11e &&
+	(
+		cd 11e &&
 
-	echo left >arm &&
-	test_tick &&
-	git commit -a -m left &&
-	git checkout right &&
+		mkdir z x &&
+		echo a >z/a &&
+		echo b >z/b &&
+		echo c >x/c &&
+		echo d >x/d &&
+		git add z x &&
+		test_tick &&
+		git commit -m "O" &&
 
-	echo right >arm &&
-	test_tick &&
-	git commit -a -m right &&
+		git branch O &&
+		git branch A &&
+		git branch B &&
 
-	test_must_fail git merge left &&
-	(
-		for t in filfre-common left right
-		do
-			grep $t arm || exit 1
-		done
-	) &&
+		git checkout A &&
+		git mv z/ y/ &&
+		echo different >y/c &&
+		mkdir w &&
+		git mv x/c w/ &&
+		git add y/c &&
+		test_tick &&
+		git commit -m "A" &&
 
-	mv arm expect &&
-	git checkout -m arm &&
-	test_cmp expect arm
+		git checkout B &&
+		git mv x/c z/ &&
+		test_tick &&
+		git commit -m "B"
+	)
 
-HEAD is now at 7329388 Initial A one, A two
-Switched to a new branch 'left'
-[left b257dc6] neutral
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6043-merge-rename-directories/11e/.git/
+[master (root-commit) 1ee9006] O
  Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 .gitattributes
- create mode 100644 arm
-[left 2459c9d] left
+ 4 files changed, 4 insertions(+)
+ create mode 100644 x/c
+ create mode 100644 x/d
+ create mode 100644 z/a
+ create mode 100644 z/b
+Switched to branch 'A'
+[A 0006594] A
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to branch 'right'
-[right 6b476b9] right
+ 4 files changed, 1 insertion(+)
+ rename {x => w}/c (100%)
+ rename {z => y}/a (100%)
+ rename {z => y}/b (100%)
+ create mode 100644 y/c
+Switched to branch 'B'
+[B b8dbf85] B
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Merging:
-6b476b9 right
-virtual left
-found 1 common ancestor:
-b257dc6 neutral
-Auto-merging arm
-CONFLICT (content): Merge conflict in arm
-Automatic merge failed; fix conflicts and then commit the result.
-||||||| filfre-common
-left
-right
-ok 36 - custom merge driver with checkout -m
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename {x => z}/c (100%)
+ok 95 - 11e-setup: Avoid deleting not-uptodate with dir rename/rename(1to2)/add
 
-# passed all 36 test(s)
-1..36
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t7402-submodule-rebase.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7402-submodule-rebase/.git/
 expecting success: 
+	(
+		cd 11e &&
 
-	echo file > file &&
-	git add file &&
-	test_tick &&
-	git commit -m initial &&
-	git clone . submodule &&
-	git add submodule &&
-	test_tick &&
-	git commit -m submodule &&
-	echo second line >> file &&
-	(cd submodule && git pull) &&
-	test_tick &&
-	git commit -m file-and-submodule -a &&
-	git branch added-submodule
+		git checkout A^0 &&
+		echo mods >>y/c &&
 
+		test_must_fail git merge -s recursive B^0 >out 2>err &&
+		test_i18ngrep "CONFLICT (rename/rename)" out &&
+		test_i18ngrep "Refusing to lose dirty file at y/c" out &&
 
-[master (root-commit) ffefb50] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-Cloning into 'submodule'...
-done.
-warning: adding embedded git repository: submodule
-hint: You've added another git repository inside your current repository.
-hint: Clones of the outer repository will not contain the contents of
-hint: the embedded repository and will not know how to obtain it.
-hint: If you meant to add a submodule, use:
-hint: 
-hint: 	git submodule add <url> submodule
-hint: 
-hint: If you added this path by mistake, you can remove it from the
-hint: index with:
-hint: 
-hint: 	git rm --cached submodule
-hint: 
-hint: See "git help submodule" for more information.
-[master 9bd10db] submodule
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 160000 submodule
-From /build/git-2.20.1/t/trash directory.t7402-submodule-rebase/.
-   ffefb50..9bd10db  master     -> origin/master
-Updating ffefb50..9bd10db
-Fast-forward
- submodule | 1 +
- 1 file changed, 1 insertion(+)
- create mode 160000 submodule
-[master 041f541] file-and-submodule
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+), 1 deletion(-)
-ok 1 - setup
+		git ls-files -s >out &&
+		test_line_count = 7 out &&
+		git ls-files -u >out &&
+		test_line_count = 4 out &&
+		git ls-files -o >out &&
+		test_line_count = 4 out &&
 
-expecting success: 
+		echo different >expected &&
+		echo mods >>expected &&
+		test_cmp expected y/c &&
 
-	(cd submodule &&
-	 echo 3rd line >> file &&
-	 test_tick &&
-	 git commit -m fork -a) &&
-	echo unrelated >> file2 &&
-	git add file2 &&
-	test_tick &&
-	git commit -m unrelated file2 &&
-	echo other line >> file &&
-	test_tick &&
-	git commit -m update file &&
-	CURRENT=$(cd submodule && git rev-parse HEAD) &&
-	EXPECTED=$(git rev-parse HEAD~2:submodule) &&
-	GIT_TRACE=1 git rebase --onto HEAD~2 HEAD^ &&
-	STORED=$(git rev-parse HEAD:submodule) &&
-	test $EXPECTED = $STORED &&
-	test $CURRENT = $(cd submodule && git rev-parse HEAD)
+		git rev-parse >actual \
+			:0:y/a :0:y/b :0:x/d :1:x/c :2:w/c :2:y/c :3:y/c &&
+		git rev-parse >expect \
+			 O:z/a  O:z/b  O:x/d  O:x/c  O:x/c  A:y/c  O:x/c &&
+		test_cmp expect actual &&
 
+		git hash-object >actual \
+			y/c~B^0 y/c~HEAD &&
+		git rev-parse >expect \
+			O:x/c   A:y/c &&
+		test_cmp expect actual
+	)
 
-[master eb5e1a6] fork
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[master b5e9d7b] unrelated
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file2
-[master a65f80c] update
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-trace: built-in: git rebase --onto 'HEAD~2' HEAD^
-trace: run_command: git config --bool rebase.usebuiltin
-trace: built-in: git config --bool rebase.usebuiltin
-trace: run_command: 'GIT_DIR='\''/build/git-2.20.1/t/trash directory.t7402-submodule-rebase/.git'\''; state_dir='\''.git/rebase-apply'\''; upstream_name='\''HEAD^'\''; upstream='\''b5e9d7b7db63bf27cc3ce457eb90630609309fb6'\''; head_name='\''refs/heads/master'\''; orig_head='\''a65f80c7f0672c121207764dac7ccebf98cf44c8'\''; onto='\''041f541f7d4ce41c4eda25e0e58871f126de234b'\''; onto_name='\''HEAD~2'\''; revisions='\''b5e9d7b7db63bf27cc3ce457eb90630609309fb6..a65f80c7f0672c121207764dac7ccebf98cf44c8'\''; unset restrict_revision; GIT_QUIET='\'''\''; git_am_opt='\'''\''; verbose='\'''\''; diffstat='\'''\''; force_rebase='\'''\''; action='\'''\''; signoff='\'''\''; allow_rerere_autoupdate='\'''\''; keep_empty='\'''\''; autosquash='\'''\''; unset gpg_sign_opt; unset cmd; allow_empty_message='\''--allow-empty-message'\''; rebase_merges='\'''\''; rebase_cousins='\'''\''; unset strategy; unset strategy_opts; rebase_root='\'''\''; squash_onto='\'''\''; git_format_patch_opt='\'''\''; . git-sh-setup && . git-rebase--common && . git-rebase--am && git_rebase__am'
-First, rewinding head to replay your work on top of it...
-trace: built-in: git rev-parse --git-dir
-trace: built-in: git rev-parse --show-cdup
-trace: built-in: git rev-parse --git-path objects
-trace: built-in: git format-patch -k --stdout --full-index --cherry-pick --right-only --src-prefix=a/ --dst-prefix=b/ --no-renames --no-cover-letter --pretty=mboxrd b5e9d7b7db63bf27cc3ce457eb90630609309fb6...a65f80c7f0672c121207764dac7ccebf98cf44c8
-trace: built-in: git am --rebasing '--resolvemsg=
-Resolve all conflicts manually, mark them as resolved with
-"git add/rm <conflicted_files>", then run "git rebase --continue".
-You can instead skip this commit: run "git rebase --skip".
-To abort and get back to the state before "git rebase", run "git rebase --abort".
-' --patch-format=mboxrd
-trace: run_command: git mailsplit -d4 -o.git/rebase-apply -b --mboxrd --
-trace: built-in: git mailsplit -d4 -o.git/rebase-apply -b --mboxrd --
-Applying: update
-trace: built-in: git rev-parse HEAD
-trace: built-in: git update-ref -m 'rebase finished: refs/heads/master onto 041f541f7d4ce41c4eda25e0e58871f126de234b' refs/heads/master 81a011672801a6d53f73688ebde4d518274102e6 a65f80c7f0672c121207764dac7ccebf98cf44c8
-trace: built-in: git symbolic-ref -m 'rebase finished: returning to refs/heads/master' HEAD refs/heads/master
-trace: run_command: git gc --auto
-trace: built-in: git gc --auto
-ok 2 - rebase with a dirty submodule
+Note: checking out 'A^0'.
 
-expecting success: 
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by performing another checkout.
 
-	test submodule = $(git diff --name-only) &&
-	HEAD=$(git rev-parse HEAD) &&
-	GIT_EDITOR="\"$(pwd)/fake-editor.sh\"" EDITOR_TEXT="pick $HEAD" \
-		git rebase -i HEAD^ &&
-	test submodule = $(git diff --name-only)
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -b with the checkout command again. Example:
 
+  git checkout -b <new-branch-name>
 
-pick 81a011672801a6d53f73688ebde4d518274102e6
-Successfully rebased and updated refs/heads/master.
-ok 3 - interactive rebase with a dirty submodule
+HEAD is now at 0006594 A
+CONFLICT (rename/rename): Rename "x/c"->"w/c" in branch "HEAD" rename "x/c"->"y/c" in "B^0"
+Refusing to lose dirty file at y/c
+ok 96 - 11e-check: Avoid deleting not-uptodate with dir rename/rename(1to2)/add
 
 expecting success: 
+	test_create_repo 11f &&
+	(
+		cd 11f &&
 
-	echo yet another line >> file &&
-	test_tick &&
-	git commit -m next file &&
-	echo rewrite > file &&
-	test_tick &&
-	git commit -m rewrite file &&
-	echo dirty > file &&
-	test_must_fail git rebase --onto HEAD~2 HEAD^
+		mkdir z x &&
+		echo a >z/a &&
+		echo b >z/b &&
+		test_seq 1 10 >x/c &&
+		echo d >x/d &&
+		git add z x &&
+		test_tick &&
+		git commit -m "O" &&
+
+		git branch O &&
+		git branch A &&
+		git branch B &&
 
+		git checkout A &&
+		git mv z/ y/ &&
+		git mv x/c y/wham &&
+		test_tick &&
+		git commit -m "A" &&
 
-[master 260764e] next
+		git checkout B &&
+		git mv x/d z/wham &&
+		test_tick &&
+		git commit -m "B"
+	)
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6043-merge-rename-directories/11f/.git/
+[master (root-commit) 2274342] O
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[master 63179b5] rewrite
+ 4 files changed, 13 insertions(+)
+ create mode 100644 x/c
+ create mode 100644 x/d
+ create mode 100644 z/a
+ create mode 100644 z/b
+Switched to branch 'A'
+[A 6299452] A
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 4 deletions(-)
-error: cannot rebase: You have unstaged changes.
-error: Please commit or stash them.
-ok 4 - rebase with dirty file and submodule fails
+ 3 files changed, 0 insertions(+), 0 deletions(-)
+ rename {z => y}/a (100%)
+ rename {z => y}/b (100%)
+ rename x/c => y/wham (100%)
+Switched to branch 'B'
+[B 42fa76f] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename x/d => z/wham (100%)
+ok 97 - 11f-setup: Avoid deleting not-uptodate with dir rename/rename(2to1)
 
 expecting success: 
+	(
+		cd 11f &&
 
-	echo new > file &&
-	CURRENT=$(cd submodule && git rev-parse HEAD) &&
-	git stash &&
-	test new != $(cat file) &&
-	test submodule = $(git diff --name-only) &&
-	test $CURRENT = $(cd submodule && git rev-parse HEAD) &&
-	git stash apply &&
-	test new = $(cat file) &&
-	test $CURRENT = $(cd submodule && git rev-parse HEAD)
+		git checkout A^0 &&
+		echo important >>y/wham &&
 
+		test_must_fail git merge -s recursive B^0 >out 2>err &&
+		test_i18ngrep "CONFLICT (rename/rename)" out &&
+		test_i18ngrep "Refusing to lose dirty file at y/wham" out &&
 
-Saved working directory and index state WIP on master: 63179b5 rewrite
-Merging Version stash was based on with Stashed changes
-Merging:
-virtual Version stash was based on
-virtual Stashed changes
-found 1 common ancestor:
-virtual 8b045485d7af7da389e60eb467551e426da98c59
-On branch master
-Changes not staged for commit:
-  (use "git add <file>..." to update what will be committed)
-  (use "git checkout -- <file>..." to discard changes in working directory)
+		git ls-files -s >out &&
+		test_line_count = 4 out &&
+		git ls-files -u >out &&
+		test_line_count = 2 out &&
+		git ls-files -o >out &&
+		test_line_count = 4 out &&
 
-	modified:   file
-	modified:   submodule (new commits)
+		test_seq 1 10 >expected &&
+		echo important >>expected &&
+		test_cmp expected y/wham &&
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
+		test_must_fail git rev-parse :1:y/wham &&
+		git hash-object >actual \
+			y/wham~B^0 y/wham~HEAD &&
+		git rev-parse >expect \
+			O:x/d      O:x/c &&
+		test_cmp expect actual &&
 
-	fake-editor.sh
+		git rev-parse >actual \
+			:0:y/a :0:y/b :2:y/wham :3:y/wham &&
+		git rev-parse >expect \
+			 O:z/a  O:z/b  O:x/c     O:x/d &&
+		test_cmp expect actual
+	)
 
-no changes added to commit (use "git add" and/or "git commit -a")
-ok 5 - stash with a dirty submodule
+Note: checking out '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 performing another checkout.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -b with the checkout command again. Example:
+
+  git checkout -b <new-branch-name>
+
+HEAD is now at 6299452 A
+CONFLICT (rename/rename): Rename x/c->y/wham in HEAD. Rename x/d->y/wham in B^0
+Refusing to lose dirty file at y/wham
+fatal: Path 'y/wham' is in the index, but not at stage 1.
+Did you mean ':2:y/wham'?
+:1:y/wham
+ok 98 - 11f-check: Avoid deleting not-uptodate with dir rename/rename(2to1)
 
 expecting success: 
-	git reset --hard &&
-	git checkout added-submodule &&
-	git add submodule &&
-	test_tick &&
-	git commit -m third &&
+	test_create_repo 12a &&
 	(
-		cd submodule &&
-		git commit --allow-empty -m extra
-	) &&
-	git add submodule &&
-	test_tick &&
-	git commit -m fourth &&
+		cd 12a &&
 
-	test_must_fail git rebase --onto HEAD^^ HEAD^ HEAD^0 &&
-	git ls-files -s submodule >actual &&
-	(
-		cd submodule &&
-		echo "160000 $(git rev-parse HEAD^) 1	submodule" &&
-		echo "160000 $(git rev-parse HEAD^^) 2	submodule" &&
-		echo "160000 $(git rev-parse HEAD) 3	submodule"
-	) >expect &&
-	test_cmp expect actual
+		mkdir -p node1 node2 &&
+		echo leaf1 >node1/leaf1 &&
+		echo leaf2 >node1/leaf2 &&
+		echo leaf3 >node2/leaf3 &&
+		echo leaf4 >node2/leaf4 &&
+		git add node1 node2 &&
+		test_tick &&
+		git commit -m "O" &&
 
-HEAD is now at 63179b5 rewrite
-Switched to branch 'added-submodule'
-M	submodule
-[added-submodule 3e80a7a] third
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[master 7d89a17] extra
- Author: A U Thor <author@example.com>
-[added-submodule b58fe73] fourth
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-First, rewinding head to replay your work on top of it...
-Applying: fourth
-Using index info to reconstruct a base tree...
-M	submodule
-Falling back to patching base and 3-way merge...
-Merging:
-041f541 file-and-submodule
-virtual fourth
-found 1 common ancestor:
-virtual 916d85feee86a894adc3398951af35ea093209b9
-Failed to merge submodule submodule (commits don't follow merge-base)
-Auto-merging submodule
-CONFLICT (submodule): Merge conflict in submodule
-error: Failed to merge in the changes.
-hint: Use 'git am --show-current-patch' to see the failed patch
-Patch failed at 0001 fourth
+		git branch O &&
+		git branch A &&
+		git branch B &&
 
-Resolve all conflicts manually, mark them as resolved with
-"git add/rm <conflicted_files>", then run "git rebase --continue".
-You can instead skip this commit: run "git rebase --skip".
-To abort and get back to the state before "git rebase", run "git rebase --abort".
+		git checkout A &&
+		git mv node2/ node1/ &&
+		test_tick &&
+		git commit -m "A" &&
 
-ok 6 - rebasing submodule that should conflict
+		git checkout B &&
+		echo leaf5 >node1/leaf5 &&
+		echo leaf6 >node2/leaf6 &&
+		git add node1 node2 &&
+		test_tick &&
+		git commit -m "B"
+	)
 
-# passed all 6 test(s)
-1..6
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t6041-bisect-submodule.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6041-bisect-submodule/.git/
-expecting success: 
-		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/git-2.20.1/t/trash directory.t6041-bisect-submodule/submodule_update_sub1/.git/
-[master (root-commit) 111050f] 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/git-2.20.1/t/trash directory.t6041-bisect-submodule/submodule_update_sub2/.git/
-[master (root-commit) c10d6ad] 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/git-2.20.1/t/trash directory.t6041-bisect-submodule/submodule_update_repo/.git/
-[master (root-commit) 5f58605] 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/git-2.20.1/t/trash directory.t6041-bisect-submodule/submodule_update_repo/sub1'...
-done.
-Cloning into '/build/git-2.20.1/t/trash directory.t6041-bisect-submodule/submodule_update_repo/uninitialized_sub'...
-done.
-[add_sub1 136d209] 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'
-Removing uninitialized_sub
-Removing sub1
-Removing .gitmodules
-[remove_sub1 385654c] Revert "Add sub1"
- Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:09:08 2021 +0000
- 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 a58fd74] 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/git-2.20.1/t/trash directory.t6041-bisect-submodule/submodule_update_sub1
- * [new branch]      modifications -> modifications
-[modify_sub1 b833f0b] 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/git-2.20.1/t/trash directory.t6041-bisect-submodule/submodule_update_repo/sub1/sub2'...
-done.
-[add_nested_sub 90331a1] 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 5892ea1] 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 cdb8297] 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 8ace71b] update nested sub
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[modify_sub1_recursively deadf36] update sub1, that updates nested sub
- Author: A U Thor <author@example.com>
-To /build/git-2.20.1/t/trash directory.t6041-bisect-submodule/submodule_update_sub1
- * [new branch]      modify_sub1_recursively -> modify_sub1_recursively
-To /build/git-2.20.1/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 '111050feece79dd9a0f511e552b69a4f2239b35e'
-Previous HEAD position was 111050f Base inside first submodule
-Switched to branch 'modifications'
-rm 'sub1'
-[replace_sub1_with_directory 158d4bb] 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'
-Removing sub1/file3
-Removing sub1/file2
-Removing sub1/file1
-Adding sub1
-[replace_directory_with_sub1 0810445] Revert "Replace sub1 with directory"
- Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:09:10 2021 +0000
- 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 5bed998] 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 741c1e4] Revert "Replace sub1 with file"
- Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:09:11 2021 +0000
- 2 files changed, 5 insertions(+), 1 deletion(-)
- mode change 100644 => 160000 sub1
-Switched to a new branch 'invalid_sub1'
-[invalid_sub1 a77c96f] Invalid sub1 commit
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6043-merge-rename-directories/12a/.git/
+[master (root-commit) 674d36e] O
  Author: A U Thor <author@example.com>
-Switched to a new branch 'valid_sub1'
-[valid_sub1 be1bf6e] Revert "Invalid sub1 commit"
+ 4 files changed, 4 insertions(+)
+ create mode 100644 node1/leaf1
+ create mode 100644 node1/leaf2
+ create mode 100644 node2/leaf3
+ create mode 100644 node2/leaf4
+Switched to branch 'A'
+[A 494e77b] A
  Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:09:11 2021 +0000
-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 remote branch 'no_submodule' from 'origin'.
-Branch 'add_sub1' set up to track remote branch 'add_sub1' from 'origin'.
-Switched to branch 'add_sub1'
-Your branch is up to date with 'origin/add_sub1'.
-[add_sub1 ca14371] bisect bad
+ 2 files changed, 0 insertions(+), 0 deletions(-)
+ rename {node2 => node1/node2}/leaf3 (100%)
+ rename {node2 => node1/node2}/leaf4 (100%)
+Switched to branch 'B'
+[B 139a75f] B
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 bar
-HEAD is now at 5f58605 Base
-Bisecting: 0 revisions left to test after this (roughly 0 steps)
-[136d2098a4d916a04014f48e8a26df1dd32b0a22] Add sub1
-Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t6041-bisect-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/git-2.20.1/t/trash directory.t6041-bisect-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/git-2.20.1/t/trash directory.t6041-bisect-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/git-2.20.1/t/trash directory.t6041-bisect-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '111050feece79dd9a0f511e552b69a4f2239b35e'
-Submodule path 'uninitialized_sub': checked out '111050feece79dd9a0f511e552b69a4f2239b35e'
-ok 1 - git_bisect: added submodule creates empty directory
+ 2 files changed, 2 insertions(+)
+ create mode 100644 node1/leaf5
+ create mode 100644 node2/leaf6
+ok 99 - 12a-setup: Moving one directory hierarchy into another
 
 expecting success: 
-		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 remote branch 'no_submodule' from 'origin'.
-Branch 'add_sub1' set up to track remote branch 'add_sub1' from 'origin'.
-Switched to branch 'add_sub1'
-Your branch is up to date with 'origin/add_sub1'.
-[add_sub1 5cd2dae] bisect bad
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 bar
-HEAD is now at 5f58605 Base
-Bisecting: 0 revisions left to test after this (roughly 0 steps)
-[136d2098a4d916a04014f48e8a26df1dd32b0a22] Add sub1
-Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t6041-bisect-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/git-2.20.1/t/trash directory.t6041-bisect-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/git-2.20.1/t/trash directory.t6041-bisect-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/git-2.20.1/t/trash directory.t6041-bisect-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '111050feece79dd9a0f511e552b69a4f2239b35e'
-Submodule path 'uninitialized_sub': checked out '111050feece79dd9a0f511e552b69a4f2239b35e'
-ok 2 - git_bisect: added submodule leaves existing empty directory alone
+	(
+		cd 12a &&
 
-expecting success: 
-		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 remote branch 'replace_sub1_with_file' from 'origin'.
-fatal: Needed a single revision
-Branch 'replace_file_with_sub1' set up to track remote branch 'replace_file_with_sub1' from 'origin'.
-Switched to branch 'replace_file_with_sub1'
-Your branch is up to date with 'origin/replace_file_with_sub1'.
-[replace_file_with_sub1 3c230bc] bisect bad
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 bar
-HEAD is now at 5bed998 Replace sub1 with file
-Bisecting: 0 revisions left to test after this (roughly 0 steps)
-[741c1e41077b08d2a68cbb499b1aa0f6189d3d89] Revert "Replace sub1 with file"
-Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t6041-bisect-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/git-2.20.1/t/trash directory.t6041-bisect-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/git-2.20.1/t/trash directory.t6041-bisect-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/git-2.20.1/t/trash directory.t6041-bisect-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '111050feece79dd9a0f511e552b69a4f2239b35e'
-Submodule path 'uninitialized_sub': checked out '111050feece79dd9a0f511e552b69a4f2239b35e'
-ok 3 - git_bisect: replace tracked file with submodule creates empty directory
+		git checkout A^0 &&
 
-expecting success: 
-		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 remote branch 'replace_sub1_with_directory' from 'origin'.
-fatal: Needed a single revision
-Branch 'replace_directory_with_sub1' set up to track remote branch 'replace_directory_with_sub1' from 'origin'.
-Switched to branch 'replace_directory_with_sub1'
-Your branch is up to date with 'origin/replace_directory_with_sub1'.
-[replace_directory_with_sub1 ccab75d] bisect bad
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 bar
-HEAD is now at 158d4bb Replace sub1 with directory
-Bisecting: 0 revisions left to test after this (roughly 0 steps)
-[0810445a7fffefe8b685e050254b8d344851bc80] Revert "Replace sub1 with directory"
-Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t6041-bisect-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/git-2.20.1/t/trash directory.t6041-bisect-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/git-2.20.1/t/trash directory.t6041-bisect-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/git-2.20.1/t/trash directory.t6041-bisect-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '111050feece79dd9a0f511e552b69a4f2239b35e'
-Submodule path 'uninitialized_sub': checked out '111050feece79dd9a0f511e552b69a4f2239b35e'
-ok 4 - git_bisect: replace directory with submodule
+		git merge -s recursive B^0 &&
 
-expecting success: 
-		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 remote branch 'add_sub1' from 'origin'.
-Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t6041-bisect-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/git-2.20.1/t/trash directory.t6041-bisect-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '111050feece79dd9a0f511e552b69a4f2239b35e'
-Branch 'remove_sub1' set up to track remote branch 'remove_sub1' from 'origin'.
-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 4094ff7] bisect bad
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 bar
-HEAD is now at 136d209 Add sub1
-Bisecting: 0 revisions left to test after this (roughly 0 steps)
-warning: unable to rmdir 'sub1': Directory not empty
-[385654c8185cde5713909e67c38fe91ba75ad924] Revert "Add sub1"
-ok 5 - git_bisect: removed submodule leaves submodule directory and its contents in place
+		git ls-files -s >out &&
+		test_line_count = 6 out &&
 
-expecting success: 
-		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 remote branch 'add_sub1' from 'origin'.
-Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t6041-bisect-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/git-2.20.1/t/trash directory.t6041-bisect-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '111050feece79dd9a0f511e552b69a4f2239b35e'
-Branch 'remove_sub1' set up to track remote branch 'remove_sub1' from 'origin'.
-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 103bb12] bisect bad
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 bar
-HEAD is now at 136d209 Add sub1
-Bisecting: 0 revisions left to test after this (roughly 0 steps)
-warning: unable to rmdir 'sub1': Directory not empty
-[385654c8185cde5713909e67c38fe91ba75ad924] Revert "Add sub1"
-ok 6 - git_bisect: removed submodule leaves submodule containing a .git directory alone
+		git rev-parse >actual \
+			HEAD:node1/leaf1 HEAD:node1/leaf2 HEAD:node1/leaf5 \
+			HEAD:node1/node2/leaf3 \
+			HEAD:node1/node2/leaf4 \
+			HEAD:node1/node2/leaf6 &&
+		git rev-parse >expect \
+			O:node1/leaf1    O:node1/leaf2    B:node1/leaf5 \
+			O:node2/leaf3 \
+			O:node2/leaf4 \
+			B:node2/leaf6 &&
+		test_cmp expect actual
+	)
 
-expecting success: 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
-			test_must_fail $command replace_sub1_with_directory &&
-			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 remote branch 'add_sub1' from 'origin'.
-Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t6041-bisect-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/git-2.20.1/t/trash directory.t6041-bisect-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '111050feece79dd9a0f511e552b69a4f2239b35e'
-Branch 'replace_sub1_with_directory' set up to track remote branch 'replace_sub1_with_directory' from 'origin'.
-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
+Note: checking out '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 performing another checkout.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -b with the checkout command again. Example:
+
+  git checkout -b <new-branch-name>
+
+HEAD is now at 494e77b A
+Merging:
+494e77b A
+virtual B^0
+found 1 common ancestor:
+674d36e O
+Skipped node1/node2/leaf4 (merged same as existing)
+Skipped node1/node2/leaf3 (merged same as existing)
+Merge made by the 'recursive' strategy.
+ node1/leaf5       | 1 +
+ node1/node2/leaf6 | 1 +
+ 2 files changed, 2 insertions(+)
+ create mode 100644 node1/leaf5
+ create mode 100644 node1/node2/leaf6
+ok 100 - 12a-check: Moving one directory hierarchy into another
 
 expecting success: 
-		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 &&
-			test_must_fail $command replace_sub1_with_directory &&
-			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 remote branch 'add_sub1' from 'origin'.
-Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t6041-bisect-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/git-2.20.1/t/trash directory.t6041-bisect-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '111050feece79dd9a0f511e552b69a4f2239b35e'
-Branch 'replace_sub1_with_directory' set up to track remote branch 'replace_sub1_with_directory' from 'origin'.
-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
+	test_create_repo 12b &&
+	(
+		cd 12b &&
 
-checking known breakage: 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
-			test_must_fail $command replace_sub1_with_file &&
-			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 remote branch 'add_sub1' from 'origin'.
-Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t6041-bisect-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/git-2.20.1/t/trash directory.t6041-bisect-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '111050feece79dd9a0f511e552b69a4f2239b35e'
-Branch 'replace_sub1_with_file' set up to track remote branch 'replace_sub1_with_file' from 'origin'.
-Switched to branch 'replace_sub1_with_file'
-Your branch is up to date with 'origin/replace_sub1_with_file'.
-[replace_sub1_with_file ec94d2c] bisect bad
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 bar
-HEAD is now at 136d209 Add sub1
-Submodule path 'sub1': checked out '111050feece79dd9a0f511e552b69a4f2239b35e'
-Bisecting: 0 revisions left to test after this (roughly 0 steps)
-[5bed998d58c99b4ef52bed9bb84a52d562571e7d] Replace sub1 with file
-test_must_fail: command succeeded: git_bisect replace_sub1_with_file
-not ok 9 - git_bisect: replace submodule with a file must fail # TODO known breakage
+		mkdir -p node1 node2 &&
+		echo leaf1 >node1/leaf1 &&
+		echo leaf2 >node1/leaf2 &&
+		echo leaf3 >node2/leaf3 &&
+		echo leaf4 >node2/leaf4 &&
+		git add node1 node2 &&
+		test_tick &&
+		git commit -m "O" &&
 
-checking known breakage: 
-		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 &&
-			test_must_fail $command replace_sub1_with_file &&
-			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 remote branch 'add_sub1' from 'origin'.
-Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t6041-bisect-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/git-2.20.1/t/trash directory.t6041-bisect-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '111050feece79dd9a0f511e552b69a4f2239b35e'
-Branch 'replace_sub1_with_file' set up to track remote branch 'replace_sub1_with_file' from 'origin'.
-Switched to branch 'replace_sub1_with_file'
-Your branch is up to date with 'origin/replace_sub1_with_file'.
-[replace_sub1_with_file ca32f80] bisect bad
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 bar
-HEAD is now at 136d209 Add sub1
-Submodule path 'sub1': checked out '111050feece79dd9a0f511e552b69a4f2239b35e'
-Bisecting: 0 revisions left to test after this (roughly 0 steps)
-[5bed998d58c99b4ef52bed9bb84a52d562571e7d] Replace sub1 with file
-test_must_fail: command succeeded: git_bisect replace_sub1_with_file
-not ok 10 - git_bisect: replace submodule containing a .git directory with a file must fail # TODO known breakage
+		git branch O &&
+		git branch A &&
+		git branch B &&
 
-expecting success: 
-		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 remote branch 'add_sub1' from 'origin'.
-Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t6041-bisect-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/git-2.20.1/t/trash directory.t6041-bisect-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '111050feece79dd9a0f511e552b69a4f2239b35e'
-Branch 'modify_sub1' set up to track remote branch 'modify_sub1' from 'origin'.
-Switched to branch 'modify_sub1'
-Your branch is up to date with 'origin/modify_sub1'.
-[modify_sub1 b40d569] bisect bad
+		git checkout A &&
+		git mv node2/ node1/ &&
+		test_tick &&
+		git commit -m "A" &&
+
+		git checkout B &&
+		git mv node1/ node2/ &&
+		test_tick &&
+		git commit -m "B"
+	)
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6043-merge-rename-directories/12b/.git/
+[master (root-commit) 674d36e] O
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 bar
-HEAD is now at 136d209 Add sub1
-Bisecting: 0 revisions left to test after this (roughly 0 steps)
-[b833f0b856f319b577aa48b2eea9a10ba38a8973] Modify sub1
-Submodule path 'sub1': checked out 'a58fd74124fde4d1063adfd578c355a255b9b461'
-ok 11 - git_bisect: modified submodule does not update submodule work tree
+ 4 files changed, 4 insertions(+)
+ create mode 100644 node1/leaf1
+ create mode 100644 node1/leaf2
+ create mode 100644 node2/leaf3
+ create mode 100644 node2/leaf4
+Switched to branch 'A'
+[A 494e77b] A
+ Author: A U Thor <author@example.com>
+ 2 files changed, 0 insertions(+), 0 deletions(-)
+ rename {node2 => node1/node2}/leaf3 (100%)
+ rename {node2 => node1/node2}/leaf4 (100%)
+Switched to branch 'B'
+[B 634f1d4] B
+ Author: A U Thor <author@example.com>
+ 2 files changed, 0 insertions(+), 0 deletions(-)
+ rename {node1 => node2/node1}/leaf1 (100%)
+ rename {node1 => node2/node1}/leaf2 (100%)
+ok 101 - 12b-setup: Moving one directory hierarchy into another
 
 expecting success: 
-		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 remote branch 'add_sub1' from 'origin'.
-Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t6041-bisect-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/git-2.20.1/t/trash directory.t6041-bisect-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '111050feece79dd9a0f511e552b69a4f2239b35e'
-Branch 'invalid_sub1' set up to track remote branch 'invalid_sub1' from 'origin'.
-Switched to branch 'invalid_sub1'
-Your branch is up to date with 'origin/invalid_sub1'.
-[invalid_sub1 5e2235b] bisect bad
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 bar
-HEAD is now at 136d209 Add sub1
-Bisecting: 0 revisions left to test after this (roughly 0 steps)
-[a77c96fff95f10b5a7eb5043b69dbe84aa00ef12] Invalid sub1 commit
-error: Server does not allow request for unadvertised object 0123456789012345678901234567890123456789
-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
+	(
+		cd 12b &&
+
+		git checkout A^0 &&
+
+		git merge -s recursive B^0 &&
+
+		git ls-files -s >out &&
+		test_line_count = 4 out &&
+
+		git rev-parse >actual \
+			HEAD:node1/node2/node1/leaf1 \
+			HEAD:node1/node2/node1/leaf2 \
+			HEAD:node2/node1/node2/leaf3 \
+			HEAD:node2/node1/node2/leaf4 &&
+		git rev-parse >expect \
+			O:node1/leaf1 \
+			O:node1/leaf2 \
+			O:node2/leaf3 \
+			O:node2/leaf4 &&
+		test_cmp expect actual
+	)
+
+Note: checking out '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 performing another checkout.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -b with the checkout command again. Example:
+
+  git checkout -b <new-branch-name>
+
+HEAD is now at 494e77b A
+Merging:
+494e77b A
+virtual B^0
+found 1 common ancestor:
+674d36e O
+Merge made by the 'recursive' strategy.
+ node1/{ => node2/node1}/leaf1      | 0
+ node1/{ => node2/node1}/leaf2      | 0
+ {node1 => node2/node1}/node2/leaf3 | 0
+ {node1 => node2/node1}/node2/leaf4 | 0
+ 4 files changed, 0 insertions(+), 0 deletions(-)
+ rename node1/{ => node2/node1}/leaf1 (100%)
+ rename node1/{ => node2/node1}/leaf2 (100%)
+ rename {node1 => node2/node1}/node2/leaf3 (100%)
+ rename {node1 => node2/node1}/node2/leaf4 (100%)
+ok 102 - 12b-check: Moving one directory hierarchy into another
 
 expecting success: 
-		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 remote branch 'invalid_sub1' from 'origin'.
-fatal: Needed a single revision
-Branch 'valid_sub1' set up to track remote branch 'valid_sub1' from 'origin'.
-Switched to branch 'valid_sub1'
-Your branch is up to date with 'origin/valid_sub1'.
-[valid_sub1 547d9e1] bisect bad
+	test_create_repo 12c &&
+	(
+		cd 12c &&
+
+		mkdir -p node1 node2 &&
+		printf "1\n2\n3\n4\n5\n6\n7\n8\nleaf1\n" >node1/leaf1 &&
+		printf "1\n2\n3\n4\n5\n6\n7\n8\nleaf2\n" >node1/leaf2 &&
+		printf "1\n2\n3\n4\n5\n6\n7\n8\nleaf3\n" >node2/leaf3 &&
+		printf "1\n2\n3\n4\n5\n6\n7\n8\nleaf4\n" >node2/leaf4 &&
+		git add node1 node2 &&
+		test_tick &&
+		git commit -m "O" &&
+
+		git branch O &&
+		git branch A &&
+		git branch B &&
+
+		git checkout A &&
+		git mv node2/ node1/ &&
+		for i in `git ls-files`; do echo side A >>$i; done &&
+		git add -u &&
+		test_tick &&
+		git commit -m "A" &&
+
+		git checkout B &&
+		git mv node1/ node2/ &&
+		for i in `git ls-files`; do echo side B >>$i; done &&
+		git add -u &&
+		test_tick &&
+		git commit -m "B"
+	)
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t6043-merge-rename-directories/12c/.git/
+[master (root-commit) 0cf2f73] O
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 bar
-HEAD is now at a77c96f Invalid sub1 commit
-Bisecting: 0 revisions left to test after this (roughly 0 steps)
-[be1bf6ecf765aae21fab0b200bf2fd07bcbfc6e2] Revert "Invalid sub1 commit"
-Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t6041-bisect-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/git-2.20.1/t/trash directory.t6041-bisect-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/git-2.20.1/t/trash directory.t6041-bisect-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/git-2.20.1/t/trash directory.t6041-bisect-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '111050feece79dd9a0f511e552b69a4f2239b35e'
-Submodule path 'uninitialized_sub': checked out '111050feece79dd9a0f511e552b69a4f2239b35e'
-ok 13 - git_bisect: modified submodule does not update submodule work tree from invalid commit
+ 4 files changed, 36 insertions(+)
+ create mode 100644 node1/leaf1
+ create mode 100644 node1/leaf2
+ create mode 100644 node2/leaf3
+ create mode 100644 node2/leaf4
+Switched to branch 'A'
+[A 18ec7be] A
+ Author: A U Thor <author@example.com>
+ 4 files changed, 4 insertions(+)
+ rename {node2 => node1/node2}/leaf3 (75%)
+ rename {node2 => node1/node2}/leaf4 (75%)
+Switched to branch 'B'
+[B 705044c] B
+ Author: A U Thor <author@example.com>
+ 4 files changed, 4 insertions(+)
+ rename {node1 => node2/node1}/leaf1 (75%)
+ rename {node1 => node2/node1}/leaf2 (75%)
+ok 103 - 12c-setup: Moving one directory hierarchy into another w/ content merge
 
 expecting success: 
-		prolog &&
-		reset_work_tree_to 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 remote branch 'no_submodule' from 'origin'.
-Branch 'add_sub1' set up to track remote branch 'add_sub1' from 'origin'.
-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
+	(
+		cd 12c &&
+
+		git checkout A^0 &&
+
+		test_must_fail git merge -s recursive B^0 &&
+
+		git ls-files -u >out &&
+		test_line_count = 12 out &&
+
+		git rev-parse >actual \
+			:1:node1/node2/node1/leaf1 \
+			:1:node1/node2/node1/leaf2 \
+			:1:node2/node1/node2/leaf3 \
+			:1:node2/node1/node2/leaf4 \
+			:2:node1/node2/node1/leaf1 \
+			:2:node1/node2/node1/leaf2 \
+			:2:node2/node1/node2/leaf3 \
+			:2:node2/node1/node2/leaf4 \
+			:3:node1/node2/node1/leaf1 \
+			:3:node1/node2/node1/leaf2 \
+			:3:node2/node1/node2/leaf3 \
+			:3:node2/node1/node2/leaf4 &&
+		git rev-parse >expect \
+			O:node1/leaf1 \
+			O:node1/leaf2 \
+			O:node2/leaf3 \
+			O:node2/leaf4 \
+			A:node1/leaf1 \
+			A:node1/leaf2 \
+			A:node1/node2/leaf3 \
+			A:node1/node2/leaf4 \
+			B:node2/node1/leaf1 \
+			B:node2/node1/leaf2 \
+			B:node2/leaf3 \
+			B:node2/leaf4 &&
+		test_cmp expect actual
+	)
+
+Note: checking out '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 performing another checkout.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -b with the checkout command again. Example:
+
+  git checkout -b <new-branch-name>
+
+HEAD is now at 18ec7be A
+Merging:
+18ec7be A
+virtual B^0
+found 1 common ancestor:
+0cf2f73 O
+Auto-merging node2/node1/node2/leaf4
+CONFLICT (content): Merge conflict in node2/node1/node2/leaf4
+Auto-merging node2/node1/node2/leaf3
+CONFLICT (content): Merge conflict in node2/node1/node2/leaf3
+Auto-merging node1/node2/node1/leaf2
+CONFLICT (content): Merge conflict in node1/node2/node1/leaf2
+Auto-merging node1/node2/node1/leaf1
+CONFLICT (content): Merge conflict in node1/node2/node1/leaf1
+Automatic merge failed; fix conflicts and then commit the result.
+ok 104 - 12c-check: Moving one directory hierarchy into another w/ content merge
 
 # still have 2 known breakage(s)
-# passed all remaining 12 test(s)
-1..14
+# passed all remaining 102 test(s)
+1..104
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
 *** t7410-submodule-checkout-to.sh ***
@@ -272196,28 +272468,28 @@
 	)
 
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7410-submodule-checkout-to/origin/sub/.git/
-[master (root-commit) ba11548] file1
+[master (root-commit) 657c77f] file1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 file1
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7410-submodule-checkout-to/origin/main/.git/
 Cloning into '/build/git-2.20.1/t/trash directory.t7410-submodule-checkout-to/origin/main/sub'...
 done.
-[master (root-commit) 02ba155] add sub
+[master (root-commit) 9efd87a] add sub
  Author: A U Thor <author@example.com>
  2 files changed, 4 insertions(+)
  create mode 100644 .gitmodules
  create mode 160000 sub
-[master eda8025] file1 updated
+[master ed19757] file1 updated
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 From /build/git-2.20.1/t/trash directory.t7410-submodule-checkout-to/origin/sub
-   ba11548..eda8025  master     -> origin/master
-Updating ba11548..eda8025
+   657c77f..ed19757  master     -> origin/master
+Updating 657c77f..ed19757
 Fast-forward
  file1 | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
-[master 57ee4cb] sub updated
+[master af79372] sub updated
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 ok 1 - setup: make origin
@@ -272231,15 +272503,15 @@
 Submodule 'sub' (/build/git-2.20.1/t/trash directory.t7410-submodule-checkout-to/origin/sub) registered for path 'sub'
 Cloning into '/build/git-2.20.1/t/trash directory.t7410-submodule-checkout-to/clone/main/sub'...
 done.
-Submodule path 'sub': checked out 'eda80256c8a5c9c2e3b59cb85dbfe3543e2fd42f'
+Submodule path 'sub': checked out 'ed19757f1103fb6c5386cf1edf834fc73dc19468'
 ok 2 - setup: clone
 
 expecting success: 
 	mkdir default_checkout &&
 	git -C clone/main worktree add "$base_path/default_checkout/main" "$rev1_hash_main"
 
-Preparing worktree (detached HEAD 02ba155)
-HEAD is now at 02ba155 add sub
+Preparing worktree (detached HEAD 9efd87a)
+HEAD is now at 9efd87a add sub
 ok 3 - checkout main
 
 checking known breakage: 
@@ -272253,11 +272525,11 @@
 	git -C clone/main worktree add "$base_path/fully_cloned_submodule/main" "$rev1_hash_main" &&
 	git -C fully_cloned_submodule/main submodule update
 
-Preparing worktree (detached HEAD 02ba155)
-HEAD is now at 02ba155 add sub
+Preparing worktree (detached HEAD 9efd87a)
+HEAD is now at 9efd87a add sub
 Cloning into '/build/git-2.20.1/t/trash directory.t7410-submodule-checkout-to/fully_cloned_submodule/main/sub'...
 done.
-Submodule path 'sub': checked out 'ba115483232fb071034317386b4738e6f38f790b'
+Submodule path 'sub': checked out '657c77f30d6454f7e4d9be0545661e23811770e2'
 ok 5 - checkout main and initialize independent clones
 
 expecting success: 
@@ -272272,10 +272544,10 @@
 	git -C clone/main worktree add "$base_path/linked_submodule/main" "$rev1_hash_main" &&
 	git -C clone/main/sub worktree add "$base_path/linked_submodule/main/sub" "$rev1_hash_sub"
 
-Preparing worktree (detached HEAD 02ba155)
-HEAD is now at 02ba155 add sub
-Preparing worktree (detached HEAD ba11548)
-HEAD is now at ba11548 file1
+Preparing worktree (detached HEAD 9efd87a)
+HEAD is now at 9efd87a add sub
+Preparing worktree (detached HEAD 657c77f)
+HEAD is now at 657c77f file1
 ok 7 - checkout sub manually
 
 expecting success: 
@@ -273206,7 +273478,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  3 05:09 path/file
+-rw-rw-r-- 1 pbuilder2 pbuilder2 9 Jan  5 11:49 path/file
 path/file
 HEAD is now at 90b0bac A
 not ok 16 - directory/submodule conflict; keep submodule clean # TODO known breakage
@@ -273293,7 +273565,7 @@
 	)
 
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7411-submodule-config/submodule/.git/
-[master (root-commit) 62d87ff] a
+[master (root-commit) bc0c539] a
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 a
@@ -273302,13 +273574,13 @@
 done.
 Cloning into '/build/git-2.20.1/t/trash directory.t7411-submodule-config/super/a'...
 done.
-[master (root-commit) 442ad21] add as submodule and as a
+[master (root-commit) 6d75aad] 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 94cc506] move a to b
+[master 553a11c] move a to b
  Author: A U Thor <author@example.com>
  2 files changed, 1 insertion(+), 1 deletion(-)
  rename a => b (100%)
@@ -273377,10 +273649,10 @@
 		test_i18ngrep "submodule-blob $sha1:.gitmodules" actual_stderr >/dev/null
 	)
 
-[master ae51a7b] add error
+[master ea01236] add error
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-HEAD is now at 94cc506 move a to b
+HEAD is now at 553a11c move a to b
 ok 5 - error in history of one submodule config lets continue, stderr message contains blob ref
 
 expecting success: 
@@ -273415,10 +273687,10 @@
 		test_cmp expect_error actual
 	)
 
-[master 50bfb16] add error in fetchrecursesubmodules
+[master eb2a9c9] add error in fetchrecursesubmodules
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-HEAD is now at 94cc506 move a to b
+HEAD is now at 553a11c move a to b
 ok 7 - error in history in fetchrecursesubmodule lets continue
 
 expecting success: 
@@ -273466,11 +273738,11 @@
 	)
 
 rm '.gitmodules'
-[master 07d3212] remove .gitmodules from the current branch
+[master e2f3107] 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 94cc506 move a to b
+HEAD is now at 553a11c move a to b
 ok 12 - writeable .gitmodules when it is nowhere in the repository
 
 expecting success: 
@@ -273491,7 +273763,7 @@
 	)
 
 rm '.gitmodules'
-HEAD is now at 94cc506 move a to b
+HEAD is now at 553a11c move a to b
 ok 14 - non-writeable .gitmodules when it is in the current branch but not in the index
 
 expecting success: 
@@ -273506,7 +273778,7 @@
 		test_cmp expect actual
 	)
 
-HEAD is now at 94cc506 move a to b
+HEAD is now at 553a11c move a to b
 ok 15 - reading submodules config from the index when .gitmodules is not in the working tree
 
 expecting success: 
@@ -273520,7 +273792,7 @@
 	)
 
 rm '.gitmodules'
-HEAD is now at 94cc506 move a to b
+HEAD is now at 553a11c move a to b
 ok 16 - reading submodules config from the current branch when .gitmodules is not in the index
 
 expecting success: 
@@ -273541,17 +273813,17 @@
 	)
 
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7411-submodule-config/super/submodule/nested_submodule/.git/
-[master (root-commit) 8dde29f] add a
+[master (root-commit) f853c02] 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 96aea1e] added nested_submodule
+[master ee8e0f6] 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 58a6217] updated submodule
+[master c176d58] updated submodule
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 ok 17 - reading nested submodules config
@@ -273576,6 +273848,382 @@
 1..18
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
+*** t7414-submodule-mistakes.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7414-submodule-mistakes/.git/
+expecting success: 
+	git init embed &&
+	test_commit -C embed one
+
+Initialized empty Git repository in /build/git-2.20.1/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: 
+	test_when_finished "git rm --cached -f embed" &&
+	git add embed 2>stderr &&
+	test_i18ngrep warning stderr
+
+warning: adding embedded git repository: embed
+rm 'embed'
+ok 2 - git-add on embedded repository warns
+
+expecting success: 
+	test_when_finished "git rm --cached -f embed" &&
+	git add --no-warn-embedded-repo embed 2>stderr &&
+	test_i18ngrep ! warning stderr
+
+rm 'embed'
+ok 3 - --no-warn-embedded-repo suppresses warning
+
+expecting success: 
+	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_i18ngrep ! 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.
+[master b0129aa] two
+ Author: A U Thor <author@example.com>
+rm 'embed'
+ok 4 - no warning when updating entry
+
+expecting success: 
+	test_when_finished "git rm -rf submodule .gitmodules" &&
+	git submodule add ./embed submodule 2>stderr &&
+	test_i18ngrep ! 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/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t7401-submodule-summary.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7401-submodule-summary/.git/
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7401-submodule-summary/sm1/.git/
+expecting success: 
+	git add sm1 &&
+	git submodule summary >actual &&
+	cat >expected <<-EOF &&
+* sm1 0000000...a2c4dab (2):
+  > Add foo2
+
+EOF
+	test_cmp expected actual
+
+warning: adding embedded git repository: sm1
+hint: You've added another git repository inside your current repository.
+hint: Clones of the outer repository will not contain the contents of
+hint: the embedded repository and will not know how to obtain it.
+hint: If you meant to add a submodule, use:
+hint: 
+hint: 	git submodule add <url> sm1
+hint: 
+hint: If you added this path by mistake, you can remove it from the
+hint: index with:
+hint: 
+hint: 	git rm --cached sm1
+hint: 
+hint: See "git help submodule" for more information.
+ok 1 - added submodule
+
+expecting success: 
+	mkdir sub &&
+	(
+		cd sub &&
+		git submodule summary >../actual
+	) &&
+	cat >expected <<-EOF &&
+* ../sm1 0000000...a2c4dab (2):
+  > Add foo2
+
+EOF
+	test_cmp expected actual
+
+ok 2 - added submodule (subdirectory)
+
+expecting success: 
+	(
+		cd sub &&
+		git submodule summary . >../actual
+	) &&
+	test_must_be_empty actual
+
+ok 3 - added submodule (subdirectory only)
+
+expecting success: 
+	(
+		cd sub &&
+		git submodule summary ../sm1 >../actual
+	) &&
+	cat >expected <<-EOF &&
+* ../sm1 0000000...a2c4dab (2):
+  > Add foo2
+
+EOF
+	test_cmp expected actual
+
+ok 4 - added submodule (subdirectory with explicit path)
+
+expecting success: 
+	git submodule summary >actual &&
+	cat >expected <<-EOF &&
+* sm1 a2c4dab...4c8d358 (1):
+  > Add foo3
+
+EOF
+	test_cmp expected actual
+
+ok 5 - modified submodule(forward)
+
+expecting success: 
+	git submodule summary --files >actual &&
+	cat >expected <<-EOF &&
+* sm1 a2c4dab...4c8d358 (1):
+  > Add foo3
+
+EOF
+	test_cmp expected actual
+
+ok 6 - modified submodule(forward), --files
+
+expecting success: 
+	git config -f .gitmodules submodule.sm1.path sm1 &&
+	git config -f .gitmodules submodule.sm1.ignore all &&
+	git config submodule.sm1.ignore all &&
+	git config diff.ignoreSubmodules all &&
+	git submodule summary >actual &&
+	cat >expected <<-EOF &&
+* sm1 a2c4dab...4c8d358 (1):
+  > Add foo3
+
+EOF
+	test_cmp expected actual &&
+	git config --unset diff.ignoreSubmodules &&
+	git config --remove-section submodule.sm1 &&
+	git config -f .gitmodules --remove-section submodule.sm1
+
+ok 7 - no ignore=all setting has any effect
+
+expecting success: 
+	git submodule summary >actual &&
+	cat >expected <<-EOF &&
+* sm1 4c8d358...db425b6 (2):
+  < Add foo3
+  < Add foo2
+
+EOF
+	test_cmp expected actual
+
+ok 8 - modified submodule(backward)
+
+expecting success: 
+	git submodule summary >actual &&
+	cat >expected <<-EOF &&
+* sm1 4c8d358...41fbea9 (4):
+  > Add foo5
+  > Add foo4
+  < Add foo3
+  < Add foo2
+
+EOF
+	test_cmp expected actual
+
+ok 9 - modified submodule(backward and forward)
+
+expecting success: 
+	git submodule summary -n 3 >actual &&
+	cat >expected <<-EOF &&
+* sm1 4c8d358...41fbea9 (4):
+  > Add foo5
+  > Add foo4
+  < Add foo3
+
+EOF
+	test_cmp expected actual
+
+ok 10 - --summary-limit
+
+expecting success: 
+	git submodule summary --cached >actual &&
+	cat >expected <<-EOF &&
+* sm1 41fbea9(submodule)->9da5fb8(blob) (3):
+  < Add foo5
+
+EOF
+	test_i18ncmp actual expected
+
+ok 11 - typechanged submodule(submodule->blob), --cached
+
+expecting success: 
+	git submodule summary --files >actual &&
+	cat >expected <<-EOF &&
+* sm1 9da5fb8(blob)->41fbea9(submodule) (3):
+  > Add foo5
+
+EOF
+	test_i18ncmp actual expected
+
+ok 12 - typechanged submodule(submodule->blob), --files
+
+expecting success: 
+	git submodule summary >actual &&
+	cat >expected <<-EOF &&
+* sm1 41fbea9(submodule)->9da5fb8(blob):
+
+EOF
+	test_i18ncmp actual expected
+
+fatal: not a git repository: 'sm1/.git'
+ok 13 - typechanged submodule(submodule->blob)
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7401-submodule-summary/sm1/.git/
+expecting success: 
+	git submodule summary >actual &&
+	cat >expected <<-EOF &&
+* sm1 41fbea9...6858906:
+  Warn: sm1 doesn't contain commit 41fbea99b81568012be3e9bcc31431971c1e5bc5
+
+EOF
+	test_i18ncmp actual expected
+
+ok 14 - nonexistent commit
+
+expecting success: 
+	git submodule summary >actual &&
+	cat >expected <<-EOF &&
+* sm1 9da5fb8(blob)->6858906(submodule) (2):
+  > Add foo7
+
+EOF
+	test_i18ncmp expected actual
+
+ok 15 - typechanged submodule(blob->submodule)
+
+expecting success: 
+	git submodule summary >actual &&
+	cat >expected <<-EOF &&
+* sm1 6858906...0000000:
+
+EOF
+	test_cmp expected actual
+
+fatal: not a git repository: 'sm1/.git'
+ok 16 - deleted submodule
+
+expecting success: 
+	test_create_repo sm2 &&
+	head7=$(add_file sm2 foo8 foo9) &&
+	git add sm2
+
+Initialized empty Git repository in /build/git-2.20.1/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.
+ok 17 - create second submodule
+
+expecting success: 
+	git submodule summary >actual &&
+	cat >expected <<-EOF &&
+* sm1 6858906...0000000:
+
+* sm2 0000000...fa9eeaf (2):
+  > Add foo9
+
+EOF
+	test_cmp expected actual
+
+fatal: not a git repository: 'sm1/.git'
+ok 18 - multiple submodules
+
+expecting success: 
+	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: 
+	git submodule summary HEAD^ >actual &&
+	cat >expected <<-EOF &&
+* sm1 6858906...0000000:
+
+* sm2 0000000...fa9eeaf (2):
+  > Add foo9
+
+EOF
+	test_cmp expected actual
+
+fatal: not a git repository: 'sm1/.git'
+ok 20 - given commit
+
+expecting success: 
+	git submodule summary --for-status HEAD^ >actual &&
+	test_i18ncmp actual - <<EOF
+* sm1 6858906...0000000:
+
+* sm2 0000000...fa9eeaf (2):
+  > Add foo9
+
+EOF
+
+fatal: no submodule mapping found in .gitmodules for path 'sm2'
+fatal: not a git repository: 'sm1/.git'
+ok 21 - --for-status
+
+expecting success: 
+	test_must_fail git submodule summary --files --cached
+
+The --cached option cannot be used with the --files option
+ok 22 - fail when using --files together with --cached
+
+expecting success: 
+	git init xyzzy &&
+	cd xyzzy &&
+	git submodule summary >output 2>&1 &&
+	test_must_be_empty output
+
+Initialized empty Git repository in /build/git-2.20.1/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/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
 *** t7413-submodule-is-active.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7413-submodule-is-active/.git/
 expecting success: 
@@ -273716,73 +274364,561 @@
 1..8
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t7414-submodule-mistakes.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7414-submodule-mistakes/.git/
+*** t7417-submodule-path-url.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7417-submodule-path-url/.git/
 expecting success: 
-	git init embed &&
-	test_commit -C embed one
+	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/git-2.20.1/t/trash directory.t7414-submodule-mistakes/embed/.git/
-[master (root-commit) d79ce16] one
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7417-submodule-path-url/upstream/.git/
+[master (root-commit) eafc5e7] base
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-ok 1 - create embedded repository
+Cloning into '/build/git-2.20.1/t/trash directory.t7417-submodule-path-url/sub'...
+done.
+warning: ignoring 'submodule.sub.path' which may be interpreted as a command-line option: -sub
+[master (root-commit) 237163c] submodule
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 160000 -sub
+ create mode 100644 .gitmodules
+ok 1 - create submodule with dash in path
 
 expecting success: 
-	test_when_finished "git rm --cached -f embed" &&
-	git add embed 2>stderr &&
-	test_i18ngrep warning stderr
+	test_when_finished "rm -rf dst" &&
+	git clone --recurse-submodules . dst 2>err &&
+	test_i18ngrep ignoring err
 
-warning: adding embedded git repository: embed
-rm 'embed'
-ok 2 - git-add on embedded repository warns
+warning: ignoring 'submodule.sub.path' which may be interpreted as a command-line option: -sub
+warning: ignoring 'submodule.sub.path' which may be interpreted as a command-line option: -sub
+ok 2 - clone rejects unprotected dash
 
 expecting success: 
-	test_when_finished "git rm --cached -f embed" &&
-	git add --no-warn-embedded-repo embed 2>stderr &&
-	test_i18ngrep ! warning stderr
+	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
 
-rm 'embed'
-ok 3 - --no-warn-embedded-repo suppresses warning
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7417-submodule-path-url/dst/
+remote: error: object 7e03af04dae731f9aa8e2febaf8b530bdafd3aa1: gitmodulesPath: disallowed submodule path: -sub        
+ok 3 - fsck rejects unprotected dash
+
+skipping test: submodule paths disallows trailing spaces 
+	git init super &&
+	test_must_fail git -C super submodule add ../upstream "sub " &&
+
+	: add "sub", then rename "sub" to "sub ", the hard way &&
+	git -C super submodule add ../upstream sub &&
+	tree=$(git -C super write-tree) &&
+	git -C super ls-tree $tree >tree &&
+	sed "s/sub/sub /" <tree >tree.new &&
+	tree=$(git -C super mktree <tree.new) &&
+	commit=$(echo with space | git -C super commit-tree $tree) &&
+	git -C super update-ref refs/heads/master $commit &&
+
+	test_must_fail git clone --recurse-submodules super dst 2>err &&
+	test_i18ngrep "sub " err
 
+ok 4 # skip submodule paths disallows trailing spaces (missing MINGW)
+
+# passed all 4 test(s)
+1..4
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t7403-submodule-sync.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7403-submodule-sync/.git/
 expecting success: 
-	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_i18ngrep ! warning stderr
+	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
+	)
 
-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.
-[master b0129aa] two
+[master (root-commit) 0c90624] upstream
  Author: A U Thor <author@example.com>
-rm 'embed'
-ok 4 - no warning when updating entry
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+Cloning into 'super'...
+done.
+Cloning into 'submodule'...
+done.
+Cloning into '/build/git-2.20.1/t/trash directory.t7403-submodule-sync/submodule/sub-submodule'...
+done.
+[master 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/git-2.20.1/t/trash directory.t7403-submodule-sync/super/submodule'...
+done.
+[master 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/git-2.20.1/t/trash directory.t7403-submodule-sync/submodule) registered for path 'submodule'
+Cloning into '/build/git-2.20.1/t/trash directory.t7403-submodule-sync/super-clone/submodule'...
+done.
+Submodule path 'submodule': checked out '5a446ba52b7cd49fd2fdd854f363e71780faa9a8'
+Submodule 'sub-submodule' (/build/git-2.20.1/t/trash directory.t7403-submodule-sync/submodule) registered for path 'submodule/sub-submodule'
+Cloning into '/build/git-2.20.1/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/git-2.20.1/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/git-2.20.1/t/trash directory.t7403-submodule-sync/submodule) registered for path 'submodule'
+Cloning into '/build/git-2.20.1/t/trash directory.t7403-submodule-sync/relative-clone/submodule'...
+done.
+Submodule path 'submodule': checked out '5a446ba52b7cd49fd2fdd854f363e71780faa9a8'
+Submodule 'sub-submodule' (/build/git-2.20.1/t/trash directory.t7403-submodule-sync/submodule) registered for path 'submodule/sub-submodule'
+Cloning into '/build/git-2.20.1/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/git-2.20.1/t/trash directory.t7403-submodule-sync/submodule) registered for path 'submodule'
+Cloning into '/build/git-2.20.1/t/trash directory.t7403-submodule-sync/recursive-clone/submodule'...
+done.
+Submodule path 'submodule': checked out '5a446ba52b7cd49fd2fdd854f363e71780faa9a8'
+Submodule 'sub-submodule' (/build/git-2.20.1/t/trash directory.t7403-submodule-sync/submodule) registered for path 'submodule/sub-submodule'
+Cloning into '/build/git-2.20.1/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: 
-	test_when_finished "git rm -rf submodule .gitmodules" &&
-	git submodule add ./embed submodule 2>stderr &&
-	test_i18ngrep ! warning stderr
+	(
+		cd submodule &&
+		echo second line >>file &&
+		test_tick &&
+		git commit -a -m "change submodule"
+	)
 
-rm '.gitmodules'
-rm 'submodule'
-ok 5 - submodule add does not warn
+[master c61fc01] change submodule
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 2 - change submodule
 
-# passed all 5 test(s)
-1..5
+expecting success: 
+	(
+		cd super &&
+		cd submodule &&
+		git checkout master &&
+		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 'master'
+Your branch is up to date with 'origin/master'.
+From /build/git-2.20.1/t/trash directory.t7403-submodule-sync/submodule
+   5a446ba..c61fc01  master     -> origin/master
+Updating 5a446ba..c61fc01
+Fast-forward
+ file | 1 +
+ 1 file changed, 1 insertion(+)
+[master 9f583c0] moved-sub-submodule
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[master f2e88dd] moved-submodule
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+ok 3 - change submodule url
+
+expecting success: 
+	(
+		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 master &&
+		git pull
+	) &&
+	(
+		cd super-clone &&
+		test -d "$(git config submodule.submodule.url)"
+	)
+
+From /build/git-2.20.1/t/trash directory.t7403-submodule-sync/super
+   78df3af..f2e88dd  master     -> origin/master
+Updating 78df3af..f2e88dd
+Fast-forward
+ .gitmodules | 2 +-
+ submodule   | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+Synchronizing submodule url for 'submodule'
+Switched to branch 'master'
+Your branch is up to date with 'origin/master'.
+From /build/git-2.20.1/t/trash directory.t7403-submodule-sync/moved-submodule
+   5a446ba..9f583c0  master     -> origin/master
+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: 
+	(
+		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 master &&
+		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 'master'
+Your branch is up to date with 'origin/master'.
+From /build/git-2.20.1/t/trash directory.t7403-submodule-sync/moved-submodule
+   5a446ba..9f583c0  master     -> origin/master
+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: 
+	reset_submodule_urls super-clone
+
+ok 6 - reset submodule URLs
+
+expecting success: 
+	(
+		cd super-clone &&
+		git pull --no-recurse-submodules &&
+		mkdir -p sub &&
+		cd sub &&
+		git submodule sync >../../output
+	) &&
+	test_i18ngrep "\\.\\./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 master &&
+		git pull
+	) &&
+	(
+		cd super-clone &&
+		test -d "$(git config submodule.submodule.url)"
+	)
+
+Already up to date.
+Synchronizing submodule url for '../submodule'
+Already on 'master'
+M	sub-submodule
+Your branch is up to date with 'origin/master'.
+Already up to date.
+ok 7 - "git submodule sync" should update submodule URLs - subdirectory
+
+expecting success: 
+	(
+		cd super-clone &&
+		(
+			cd submodule &&
+			git pull --no-recurse-submodules
+		) &&
+		mkdir -p sub &&
+		cd sub &&
+		git submodule sync --recursive >../../output
+	) &&
+	test_i18ngrep "\\.\\./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 master &&
+		git pull
+	)
+
+Already up to date.
+Synchronizing submodule url for '../submodule/sub-submodule'
+Already on 'master'
+Your branch is up to date with 'origin/master'.
+Already up to date.
+ok 8 - "git submodule sync --recursive" should update all submodule URLs - subdirectory
+
+expecting success: 
+	(
+		cd empty-clone &&
+		git pull &&
+		git submodule sync &&
+		test -d "$(git config submodule.submodule.url)"
+	)
+
+From /build/git-2.20.1/t/trash directory.t7403-submodule-sync/super
+   78df3af..f2e88dd  master     -> origin/master
+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: 
+	(
+		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/git-2.20.1/t/trash directory.t7403-submodule-sync/super
+   78df3af..f2e88dd  master     -> origin/master
+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: 
+	(
+		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: 
+	(
+		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: 
+	(
+		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: 
+	(
+		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: 
+	(
+		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: 
+	(
+		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: 
+	(
+		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: 
+	(
+		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/git-2.20.1/t/trash directory.t7403-submodule-sync/relative-clone/a/b/c/.git/
+[master (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/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
 *** t7006-pager.sh ***
@@ -273862,8 +274998,8 @@
 	test_cmp expected actual
 
 ls: cannot access 'subdir/paginated.out': No such file or directory
---- expected	2021-12-03 05:09:17.972679533 +0000
-+++ actual	2021-12-03 05:09:18.160674067 +0000
+--- expected	2023-01-05 11:49:40.082868030 +0000
++++ actual	2023-01-05 11:49:40.190868030 +0000
 @@ -1 +1 @@
 -subdir/paginated.out
 +paginated.out
@@ -273908,7 +275044,6 @@
 	! test -e paginated.out
 
 24b24cf8a829f5b8c30dfc018b0a459a2ccaf380
-died of signal 15 at /build/git-2.20.1/t/test-terminal.perl line 35.
 ok 7 - some commands do not use a pager
 
 expecting success: 
@@ -273959,7 +275094,6 @@
 Date:   Thu Apr 7 15:13:13 2005 -0700
 
     initial
-died of signal 15 at /build/git-2.20.1/t/test-terminal.perl line 35.
 ok 12 - no pager with --no-pager
 
 expecting success: 
@@ -274015,7 +275149,6 @@
 	! test -e paginated.out
 
 initial
-died of signal 15 at /build/git-2.20.1/t/test-terminal.perl line 35.
 ok 17 - git tag -l respects --no-pager
 
 expecting success: 
@@ -274067,7 +275200,6 @@
 	test_terminal git -c pager.tag tag -am message newtag &&
 	! test -e paginated.out
 
-died of signal 15 at /build/git-2.20.1/t/test-terminal.perl line 35.
 Deleted tag 'newtag' (was a052248)
 ok 23 - git tag -a ignores pager.tag
 
@@ -274141,7 +275273,6 @@
 	! test -e paginated.out
 
 Branch 'master' set up to track local branch 'other'.
-died of signal 15 at /build/git-2.20.1/t/test-terminal.perl line 35.
 Deleted branch other (was 24b24cf).
 ok 31 - git branch --set-upstream-to ignores pager.branch
 
@@ -274169,6 +275300,7 @@
 	! test -e paginated.out
 
 bar
+died of signal 15 at /build/git-2.20.1/t/test-terminal.perl line 35.
 ok 34 - git config --get ignores pager.config
 
 expecting success: 
@@ -274717,7 +275849,6 @@
 		test_path_is_file cwd-retained
 	)
 
-died of signal 15 at /build/git-2.20.1/t/test-terminal.perl line 35.
 ok 79 - core.pager in repo config works and retains cwd
 
 expecting success: 
@@ -275233,1229 +276364,6 @@
 1..11
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t7401-submodule-summary.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7401-submodule-summary/.git/
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7401-submodule-summary/sm1/.git/
-expecting success: 
-	git add sm1 &&
-	git submodule summary >actual &&
-	cat >expected <<-EOF &&
-* sm1 0000000...a2c4dab (2):
-  > Add foo2
-
-EOF
-	test_cmp expected actual
-
-warning: adding embedded git repository: sm1
-hint: You've added another git repository inside your current repository.
-hint: Clones of the outer repository will not contain the contents of
-hint: the embedded repository and will not know how to obtain it.
-hint: If you meant to add a submodule, use:
-hint: 
-hint: 	git submodule add <url> sm1
-hint: 
-hint: If you added this path by mistake, you can remove it from the
-hint: index with:
-hint: 
-hint: 	git rm --cached sm1
-hint: 
-hint: See "git help submodule" for more information.
-ok 1 - added submodule
-
-expecting success: 
-	mkdir sub &&
-	(
-		cd sub &&
-		git submodule summary >../actual
-	) &&
-	cat >expected <<-EOF &&
-* ../sm1 0000000...a2c4dab (2):
-  > Add foo2
-
-EOF
-	test_cmp expected actual
-
-ok 2 - added submodule (subdirectory)
-
-expecting success: 
-	(
-		cd sub &&
-		git submodule summary . >../actual
-	) &&
-	test_must_be_empty actual
-
-ok 3 - added submodule (subdirectory only)
-
-expecting success: 
-	(
-		cd sub &&
-		git submodule summary ../sm1 >../actual
-	) &&
-	cat >expected <<-EOF &&
-* ../sm1 0000000...a2c4dab (2):
-  > Add foo2
-
-EOF
-	test_cmp expected actual
-
-ok 4 - added submodule (subdirectory with explicit path)
-
-expecting success: 
-	git submodule summary >actual &&
-	cat >expected <<-EOF &&
-* sm1 a2c4dab...4c8d358 (1):
-  > Add foo3
-
-EOF
-	test_cmp expected actual
-
-ok 5 - modified submodule(forward)
-
-expecting success: 
-	git submodule summary --files >actual &&
-	cat >expected <<-EOF &&
-* sm1 a2c4dab...4c8d358 (1):
-  > Add foo3
-
-EOF
-	test_cmp expected actual
-
-ok 6 - modified submodule(forward), --files
-
-expecting success: 
-	git config -f .gitmodules submodule.sm1.path sm1 &&
-	git config -f .gitmodules submodule.sm1.ignore all &&
-	git config submodule.sm1.ignore all &&
-	git config diff.ignoreSubmodules all &&
-	git submodule summary >actual &&
-	cat >expected <<-EOF &&
-* sm1 a2c4dab...4c8d358 (1):
-  > Add foo3
-
-EOF
-	test_cmp expected actual &&
-	git config --unset diff.ignoreSubmodules &&
-	git config --remove-section submodule.sm1 &&
-	git config -f .gitmodules --remove-section submodule.sm1
-
-ok 7 - no ignore=all setting has any effect
-
-expecting success: 
-	git submodule summary >actual &&
-	cat >expected <<-EOF &&
-* sm1 4c8d358...db425b6 (2):
-  < Add foo3
-  < Add foo2
-
-EOF
-	test_cmp expected actual
-
-ok 8 - modified submodule(backward)
-
-expecting success: 
-	git submodule summary >actual &&
-	cat >expected <<-EOF &&
-* sm1 4c8d358...41fbea9 (4):
-  > Add foo5
-  > Add foo4
-  < Add foo3
-  < Add foo2
-
-EOF
-	test_cmp expected actual
-
-ok 9 - modified submodule(backward and forward)
-
-expecting success: 
-	git submodule summary -n 3 >actual &&
-	cat >expected <<-EOF &&
-* sm1 4c8d358...41fbea9 (4):
-  > Add foo5
-  > Add foo4
-  < Add foo3
-
-EOF
-	test_cmp expected actual
-
-ok 10 - --summary-limit
-
-expecting success: 
-	git submodule summary --cached >actual &&
-	cat >expected <<-EOF &&
-* sm1 41fbea9(submodule)->9da5fb8(blob) (3):
-  < Add foo5
-
-EOF
-	test_i18ncmp actual expected
-
-ok 11 - typechanged submodule(submodule->blob), --cached
-
-expecting success: 
-	git submodule summary --files >actual &&
-	cat >expected <<-EOF &&
-* sm1 9da5fb8(blob)->41fbea9(submodule) (3):
-  > Add foo5
-
-EOF
-	test_i18ncmp actual expected
-
-ok 12 - typechanged submodule(submodule->blob), --files
-
-expecting success: 
-	git submodule summary >actual &&
-	cat >expected <<-EOF &&
-* sm1 41fbea9(submodule)->9da5fb8(blob):
-
-EOF
-	test_i18ncmp actual expected
-
-fatal: not a git repository: 'sm1/.git'
-ok 13 - typechanged submodule(submodule->blob)
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7401-submodule-summary/sm1/.git/
-expecting success: 
-	git submodule summary >actual &&
-	cat >expected <<-EOF &&
-* sm1 41fbea9...6858906:
-  Warn: sm1 doesn't contain commit 41fbea99b81568012be3e9bcc31431971c1e5bc5
-
-EOF
-	test_i18ncmp actual expected
-
-ok 14 - nonexistent commit
-
-expecting success: 
-	git submodule summary >actual &&
-	cat >expected <<-EOF &&
-* sm1 9da5fb8(blob)->6858906(submodule) (2):
-  > Add foo7
-
-EOF
-	test_i18ncmp expected actual
-
-ok 15 - typechanged submodule(blob->submodule)
-
-expecting success: 
-	git submodule summary >actual &&
-	cat >expected <<-EOF &&
-* sm1 6858906...0000000:
-
-EOF
-	test_cmp expected actual
-
-fatal: not a git repository: 'sm1/.git'
-ok 16 - deleted submodule
-
-expecting success: 
-	test_create_repo sm2 &&
-	head7=$(add_file sm2 foo8 foo9) &&
-	git add sm2
-
-Initialized empty Git repository in /build/git-2.20.1/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.
-ok 17 - create second submodule
-
-expecting success: 
-	git submodule summary >actual &&
-	cat >expected <<-EOF &&
-* sm1 6858906...0000000:
-
-* sm2 0000000...fa9eeaf (2):
-  > Add foo9
-
-EOF
-	test_cmp expected actual
-
-fatal: not a git repository: 'sm1/.git'
-ok 18 - multiple submodules
-
-expecting success: 
-	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: 
-	git submodule summary HEAD^ >actual &&
-	cat >expected <<-EOF &&
-* sm1 6858906...0000000:
-
-* sm2 0000000...fa9eeaf (2):
-  > Add foo9
-
-EOF
-	test_cmp expected actual
-
-fatal: not a git repository: 'sm1/.git'
-ok 20 - given commit
-
-expecting success: 
-	git submodule summary --for-status HEAD^ >actual &&
-	test_i18ncmp actual - <<EOF
-* sm1 6858906...0000000:
-
-* sm2 0000000...fa9eeaf (2):
-  > Add foo9
-
-EOF
-
-fatal: no submodule mapping found in .gitmodules for path 'sm2'
-fatal: not a git repository: 'sm1/.git'
-ok 21 - --for-status
-
-expecting success: 
-	test_must_fail git submodule summary --files --cached
-
-The --cached option cannot be used with the --files option
-ok 22 - fail when using --files together with --cached
-
-expecting success: 
-	git init xyzzy &&
-	cd xyzzy &&
-	git submodule summary >output 2>&1 &&
-	test_must_be_empty output
-
-Initialized empty Git repository in /build/git-2.20.1/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/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t7403-submodule-sync.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7403-submodule-sync/.git/
-expecting success: 
-	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
-	)
-
-[master (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/git-2.20.1/t/trash directory.t7403-submodule-sync/submodule/sub-submodule'...
-done.
-[master 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/git-2.20.1/t/trash directory.t7403-submodule-sync/super/submodule'...
-done.
-[master 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/git-2.20.1/t/trash directory.t7403-submodule-sync/submodule) registered for path 'submodule'
-Cloning into '/build/git-2.20.1/t/trash directory.t7403-submodule-sync/super-clone/submodule'...
-done.
-Submodule path 'submodule': checked out '5a446ba52b7cd49fd2fdd854f363e71780faa9a8'
-Submodule 'sub-submodule' (/build/git-2.20.1/t/trash directory.t7403-submodule-sync/submodule) registered for path 'submodule/sub-submodule'
-Cloning into '/build/git-2.20.1/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/git-2.20.1/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/git-2.20.1/t/trash directory.t7403-submodule-sync/submodule) registered for path 'submodule'
-Cloning into '/build/git-2.20.1/t/trash directory.t7403-submodule-sync/relative-clone/submodule'...
-done.
-Submodule path 'submodule': checked out '5a446ba52b7cd49fd2fdd854f363e71780faa9a8'
-Submodule 'sub-submodule' (/build/git-2.20.1/t/trash directory.t7403-submodule-sync/submodule) registered for path 'submodule/sub-submodule'
-Cloning into '/build/git-2.20.1/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/git-2.20.1/t/trash directory.t7403-submodule-sync/submodule) registered for path 'submodule'
-Cloning into '/build/git-2.20.1/t/trash directory.t7403-submodule-sync/recursive-clone/submodule'...
-done.
-Submodule path 'submodule': checked out '5a446ba52b7cd49fd2fdd854f363e71780faa9a8'
-Submodule 'sub-submodule' (/build/git-2.20.1/t/trash directory.t7403-submodule-sync/submodule) registered for path 'submodule/sub-submodule'
-Cloning into '/build/git-2.20.1/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: 
-	(
-		cd submodule &&
-		echo second line >>file &&
-		test_tick &&
-		git commit -a -m "change submodule"
-	)
-
-[master c61fc01] change submodule
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 2 - change submodule
-
-expecting success: 
-	(
-		cd super &&
-		cd submodule &&
-		git checkout master &&
-		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 'master'
-Your branch is up to date with 'origin/master'.
-From /build/git-2.20.1/t/trash directory.t7403-submodule-sync/submodule
-   5a446ba..c61fc01  master     -> origin/master
-Updating 5a446ba..c61fc01
-Fast-forward
- file | 1 +
- 1 file changed, 1 insertion(+)
-[master 9f583c0] moved-sub-submodule
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[master f2e88dd] moved-submodule
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+), 2 deletions(-)
-ok 3 - change submodule url
-
-expecting success: 
-	(
-		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 master &&
-		git pull
-	) &&
-	(
-		cd super-clone &&
-		test -d "$(git config submodule.submodule.url)"
-	)
-
-From /build/git-2.20.1/t/trash directory.t7403-submodule-sync/super
-   78df3af..f2e88dd  master     -> origin/master
-Updating 78df3af..f2e88dd
-Fast-forward
- .gitmodules | 2 +-
- submodule   | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-Synchronizing submodule url for 'submodule'
-Switched to branch 'master'
-Your branch is up to date with 'origin/master'.
-From /build/git-2.20.1/t/trash directory.t7403-submodule-sync/moved-submodule
-   5a446ba..9f583c0  master     -> origin/master
-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: 
-	(
-		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 master &&
-		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 'master'
-Your branch is up to date with 'origin/master'.
-From /build/git-2.20.1/t/trash directory.t7403-submodule-sync/moved-submodule
-   5a446ba..9f583c0  master     -> origin/master
-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: 
-	reset_submodule_urls super-clone
-
-ok 6 - reset submodule URLs
-
-expecting success: 
-	(
-		cd super-clone &&
-		git pull --no-recurse-submodules &&
-		mkdir -p sub &&
-		cd sub &&
-		git submodule sync >../../output
-	) &&
-	test_i18ngrep "\\.\\./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 master &&
-		git pull
-	) &&
-	(
-		cd super-clone &&
-		test -d "$(git config submodule.submodule.url)"
-	)
-
-Already up to date.
-Synchronizing submodule url for '../submodule'
-Already on 'master'
-M	sub-submodule
-Your branch is up to date with 'origin/master'.
-Already up to date.
-ok 7 - "git submodule sync" should update submodule URLs - subdirectory
-
-expecting success: 
-	(
-		cd super-clone &&
-		(
-			cd submodule &&
-			git pull --no-recurse-submodules
-		) &&
-		mkdir -p sub &&
-		cd sub &&
-		git submodule sync --recursive >../../output
-	) &&
-	test_i18ngrep "\\.\\./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 master &&
-		git pull
-	)
-
-Already up to date.
-Synchronizing submodule url for '../submodule/sub-submodule'
-Already on 'master'
-Your branch is up to date with 'origin/master'.
-Already up to date.
-ok 8 - "git submodule sync --recursive" should update all submodule URLs - subdirectory
-
-expecting success: 
-	(
-		cd empty-clone &&
-		git pull &&
-		git submodule sync &&
-		test -d "$(git config submodule.submodule.url)"
-	)
-
-From /build/git-2.20.1/t/trash directory.t7403-submodule-sync/super
-   78df3af..f2e88dd  master     -> origin/master
-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: 
-	(
-		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/git-2.20.1/t/trash directory.t7403-submodule-sync/super
-   78df3af..f2e88dd  master     -> origin/master
-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: 
-	(
-		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: 
-	(
-		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: 
-	(
-		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: 
-	(
-		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: 
-	(
-		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: 
-	(
-		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: 
-	(
-		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: 
-	(
-		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/git-2.20.1/t/trash directory.t7403-submodule-sync/relative-clone/a/b/c/.git/
-[master (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/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t7417-submodule-path-url.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7417-submodule-path-url/.git/
-expecting success: 
-	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/git-2.20.1/t/trash directory.t7417-submodule-path-url/upstream/.git/
-[master (root-commit) ee31d7e] base
- Author: A U Thor <author@example.com>
-Cloning into '/build/git-2.20.1/t/trash directory.t7417-submodule-path-url/sub'...
-done.
-warning: ignoring 'submodule.sub.path' which may be interpreted as a command-line option: -sub
-[master (root-commit) 8174125] submodule
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 160000 -sub
- create mode 100644 .gitmodules
-ok 1 - create submodule with dash in path
-
-expecting success: 
-	test_when_finished "rm -rf dst" &&
-	git clone --recurse-submodules . dst 2>err &&
-	test_i18ngrep ignoring err
-
-warning: ignoring 'submodule.sub.path' which may be interpreted as a command-line option: -sub
-warning: ignoring 'submodule.sub.path' which may be interpreted as a command-line option: -sub
-ok 2 - clone rejects unprotected dash
-
-expecting success: 
-	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/git-2.20.1/t/trash directory.t7417-submodule-path-url/dst/
-remote: error: object 7e03af04dae731f9aa8e2febaf8b530bdafd3aa1: gitmodulesPath: disallowed submodule path: -sub        
-ok 3 - fsck rejects unprotected dash
-
-skipping test: submodule paths disallows trailing spaces 
-	git init super &&
-	test_must_fail git -C super submodule add ../upstream "sub " &&
-
-	: add "sub", then rename "sub" to "sub ", the hard way &&
-	git -C super submodule add ../upstream sub &&
-	tree=$(git -C super write-tree) &&
-	git -C super ls-tree $tree >tree &&
-	sed "s/sub/sub /" <tree >tree.new &&
-	tree=$(git -C super mktree <tree.new) &&
-	commit=$(echo with space | git -C super commit-tree $tree) &&
-	git -C super update-ref refs/heads/master $commit &&
-
-	test_must_fail git clone --recurse-submodules super dst 2>err &&
-	test_i18ngrep "sub " err
-
-ok 4 # skip submodule paths disallows trailing spaces (missing MINGW)
-
-# passed all 4 test(s)
-1..4
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t7408-submodule-reference.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7408-submodule-reference/.git/
-expecting success: 
-	test_create_repo A &&
-	(
-		cd A &&
-		echo first >file1 &&
-		git add file1 &&
-		git commit -m A-initial
-	)
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7408-submodule-reference/A/.git/
-[master (root-commit) e3fc762] A-initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file1
-ok 1 - preparing first repository
-
-expecting success: 
-	git clone A B &&
-	(
-		cd B &&
-		echo second >file2 &&
-		git add file2 &&
-		git commit -m B-addition &&
-		git repack -a -d &&
-		git prune
-	)
-
-Cloning into 'B'...
-done.
-[master ec4535b] B-addition
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file2
-ok 2 - preparing second repository
-
-expecting success: 
-	test_create_repo super &&
-	(
-		cd super &&
-		echo file >file &&
-		git add file &&
-		git commit -m B-super-initial
-	)
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7408-submodule-reference/super/.git/
-[master (root-commit) 8115d32] B-super-initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-ok 3 - preparing superproject
-
-expecting success: 
-	(
-		cd super &&
-		git submodule add --reference ../B "file://$base_dir/A" sub &&
-		git commit -m B-super-added &&
-		git repack -ad
-	) &&
-	test_alternate_is_used super/.git/modules/sub/objects/info/alternates super/sub
-
-Cloning into '/build/git-2.20.1/t/trash directory.t7408-submodule-reference/super/sub'...
-[master 931029a] B-super-added
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
-ok 4 - submodule add --reference uses alternates
-
-expecting success: 
-	(
-		cd super &&
-		git submodule add --reference ../B --dissociate "file://$base_dir/A" sub-dissociate &&
-		git commit -m B-super-added &&
-		git repack -ad
-	) &&
-	test_path_is_missing super/.git/modules/sub-dissociate/objects/info/alternates
-
-Cloning into '/build/git-2.20.1/t/trash directory.t7408-submodule-reference/super/sub-dissociate'...
-[master d7cc951] B-super-added
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 160000 sub-dissociate
-ok 5 - submodule add --reference with --dissociate does not use alternates
-
-expecting success: 
-	(
-		cd super/sub &&
-		echo "0 objects, 0 kilobytes" >expected &&
-		git count-objects >current &&
-		diff expected current
-	)
-
-ok 6 - that reference gets used with add
-
-expecting success: 
-	test_when_finished "rm -rf super-clone" &&
-	git clone super super-clone &&
-	git -C super-clone submodule update --init --reference ../B &&
-	test_alternate_is_used super-clone/.git/modules/sub/objects/info/alternates super-clone/sub
-
-Cloning into 'super-clone'...
-done.
-Submodule 'sub' (file:///build/git-2.20.1/t/trash directory.t7408-submodule-reference/A) registered for path 'sub'
-Submodule 'sub-dissociate' (file:///build/git-2.20.1/t/trash directory.t7408-submodule-reference/A) registered for path 'sub-dissociate'
-Cloning into '/build/git-2.20.1/t/trash directory.t7408-submodule-reference/super-clone/sub'...
-Cloning into '/build/git-2.20.1/t/trash directory.t7408-submodule-reference/super-clone/sub-dissociate'...
-Submodule path 'sub': checked out 'e3fc762308c9e8c8a5c9aa31d46b29f1d8a1066f'
-Submodule path 'sub-dissociate': checked out 'e3fc762308c9e8c8a5c9aa31d46b29f1d8a1066f'
-ok 7 - updating superproject keeps alternates
-
-expecting success: 
-	test_when_finished "rm -rf super-clone" &&
-	git clone super super-clone &&
-	git -C super-clone submodule update --init --reference ../B --dissociate &&
-	test_path_is_missing super-clone/.git/modules/sub/objects/info/alternates
-
-Cloning into 'super-clone'...
-done.
-Submodule 'sub' (file:///build/git-2.20.1/t/trash directory.t7408-submodule-reference/A) registered for path 'sub'
-Submodule 'sub-dissociate' (file:///build/git-2.20.1/t/trash directory.t7408-submodule-reference/A) registered for path 'sub-dissociate'
-Cloning into '/build/git-2.20.1/t/trash directory.t7408-submodule-reference/super-clone/sub'...
-Cloning into '/build/git-2.20.1/t/trash directory.t7408-submodule-reference/super-clone/sub-dissociate'...
-Submodule path 'sub': checked out 'e3fc762308c9e8c8a5c9aa31d46b29f1d8a1066f'
-Submodule path 'sub-dissociate': checked out 'e3fc762308c9e8c8a5c9aa31d46b29f1d8a1066f'
-ok 8 - updating superproject with --dissociate does not keep alternates
-
-expecting success: 
-	test_when_finished "rm -rf super-clone" &&
-	git clone --reference super --recursive super super-clone &&
-	(
-		cd super-clone &&
-		# test superproject has alternates setup correctly
-		test_alternate_is_used .git/objects/info/alternates . &&
-		# test submodule has correct setup
-		test_alternate_is_used .git/modules/sub/objects/info/alternates sub
-	)
-
-Cloning into 'super-clone'...
-done.
-Submodule 'sub' (file:///build/git-2.20.1/t/trash directory.t7408-submodule-reference/A) registered for path 'sub'
-Submodule 'sub-dissociate' (file:///build/git-2.20.1/t/trash directory.t7408-submodule-reference/A) registered for path 'sub-dissociate'
-Cloning into '/build/git-2.20.1/t/trash directory.t7408-submodule-reference/super-clone/sub'...
-Cloning into '/build/git-2.20.1/t/trash directory.t7408-submodule-reference/super-clone/sub-dissociate'...
-Submodule path 'sub': checked out 'e3fc762308c9e8c8a5c9aa31d46b29f1d8a1066f'
-Submodule path 'sub-dissociate': checked out 'e3fc762308c9e8c8a5c9aa31d46b29f1d8a1066f'
-ok 9 - submodules use alternates when cloning a superproject
-
-expecting success: 
-	test_when_finished "rm -rf super-clone" &&
-	git clone super super2 &&
-	test_must_fail git clone --recursive --reference super2 super2 super-clone &&
-	(
-		cd super-clone &&
-		# test superproject has alternates setup correctly
-		test_alternate_is_used .git/objects/info/alternates . &&
-		# update of the submodule succeeds
-		test_must_fail git submodule update --init &&
-		# and we have no alternates:
-		test_must_fail test_alternate_is_used .git/modules/sub/objects/info/alternates sub &&
-		test_must_fail test_path_is_file sub/file1
-	)
-
-Cloning into 'super2'...
-done.
-Cloning into 'super-clone'...
-done.
-Submodule 'sub' (file:///build/git-2.20.1/t/trash directory.t7408-submodule-reference/A) registered for path 'sub'
-Submodule 'sub-dissociate' (file:///build/git-2.20.1/t/trash directory.t7408-submodule-reference/A) registered for path 'sub-dissociate'
-fatal: submodule 'sub' cannot add alternate: path '/build/git-2.20.1/t/trash directory.t7408-submodule-reference/super2/.git/modules/sub/' does not exist
-Failed to clone 'sub'. Retry scheduled
-fatal: submodule 'sub-dissociate' cannot add alternate: path '/build/git-2.20.1/t/trash directory.t7408-submodule-reference/super2/.git/modules/sub-dissociate/' does not exist
-Failed to clone 'sub-dissociate'. Retry scheduled
-fatal: submodule 'sub' cannot add alternate: path '/build/git-2.20.1/t/trash directory.t7408-submodule-reference/super2/.git/modules/sub/' does not exist
-Failed to clone 'sub' a second time, aborting
-fatal: submodule 'sub' cannot add alternate: path '/build/git-2.20.1/t/trash directory.t7408-submodule-reference/super2/.git/modules/sub/' does not exist
-Failed to clone 'sub'. Retry scheduled
-fatal: submodule 'sub-dissociate' cannot add alternate: path '/build/git-2.20.1/t/trash directory.t7408-submodule-reference/super2/.git/modules/sub-dissociate/' does not exist
-Failed to clone 'sub-dissociate'. Retry scheduled
-fatal: submodule 'sub' cannot add alternate: path '/build/git-2.20.1/t/trash directory.t7408-submodule-reference/super2/.git/modules/sub/' does not exist
-Failed to clone 'sub' a second time, aborting
-fatal: submodule 'sub-dissociate' cannot add alternate: path '/build/git-2.20.1/t/trash directory.t7408-submodule-reference/super2/.git/modules/sub-dissociate/' does not exist
-Failed to clone 'sub-dissociate' a second time, aborting
-t7408-submodule-reference.sh: 617: eval: cannot open .git/modules/sub/objects/info/alternates: No such file
-t7408-submodule-reference.sh: 617: test: =: unexpected operator
-test_line_count: line count for .git/modules/sub/objects/info/alternates != 1
-cat: .git/modules/sub/objects/info/alternates: No such file or directory
-File sub/file1 doesn't exist. 
-ok 10 - missing submodule alternate fails clone and submodule update
-
-expecting success: 
-	test_when_finished "rm -rf super-clone" &&
-	git clone --reference-if-able super2 --recursive super2 super-clone &&
-	(
-		cd super-clone &&
-		# test superproject has alternates setup correctly
-		test_alternate_is_used .git/objects/info/alternates . &&
-		# update of the submodule succeeds
-		git submodule update --init &&
-		# and we have no alternates:
-		test_must_fail test_alternate_is_used .git/modules/sub/objects/info/alternates sub &&
-		test_path_is_file sub/file1
-	)
-
-Cloning into 'super-clone'...
-done.
-Submodule 'sub' (file:///build/git-2.20.1/t/trash directory.t7408-submodule-reference/A) registered for path 'sub'
-Submodule 'sub-dissociate' (file:///build/git-2.20.1/t/trash directory.t7408-submodule-reference/A) registered for path 'sub-dissociate'
-submodule 'sub' cannot add alternate: path '/build/git-2.20.1/t/trash directory.t7408-submodule-reference/super2/.git/modules/sub/' does not existCloning into '/build/git-2.20.1/t/trash directory.t7408-submodule-reference/super-clone/sub'...
-submodule 'sub-dissociate' cannot add alternate: path '/build/git-2.20.1/t/trash directory.t7408-submodule-reference/super2/.git/modules/sub-dissociate/' does not existCloning into '/build/git-2.20.1/t/trash directory.t7408-submodule-reference/super-clone/sub-dissociate'...
-Submodule path 'sub': checked out 'e3fc762308c9e8c8a5c9aa31d46b29f1d8a1066f'
-Submodule path 'sub-dissociate': checked out 'e3fc762308c9e8c8a5c9aa31d46b29f1d8a1066f'
-t7408-submodule-reference.sh: 617: eval: cannot open .git/modules/sub/objects/info/alternates: No such file
-t7408-submodule-reference.sh: 617: test: =: unexpected operator
-test_line_count: line count for .git/modules/sub/objects/info/alternates != 1
-cat: .git/modules/sub/objects/info/alternates: No such file or directory
-ok 11 - ignoring missing submodule alternates passes clone and submodule update
-
-expecting success: 
-	test_create_repo supersuper &&
-	(
-		cd supersuper &&
-		echo "I am super super." >file &&
-		git add file &&
-		git commit -m B-super-super-initial &&
-		git submodule add "file://$base_dir/super" subwithsub &&
-		git commit -m B-super-super-added &&
-		git submodule update --init --recursive &&
-		git repack -ad
-	) &&
-	git clone supersuper supersuper2 &&
-	(
-		cd supersuper2 &&
-		git submodule update --init
-	)
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7408-submodule-reference/supersuper/.git/
-[master (root-commit) ac3a2a0] B-super-super-initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-Cloning into '/build/git-2.20.1/t/trash directory.t7408-submodule-reference/supersuper/subwithsub'...
-[master 7c2e0cc] B-super-super-added
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 subwithsub
-Submodule 'sub' (file:///build/git-2.20.1/t/trash directory.t7408-submodule-reference/A) registered for path 'subwithsub/sub'
-Submodule 'sub-dissociate' (file:///build/git-2.20.1/t/trash directory.t7408-submodule-reference/A) registered for path 'subwithsub/sub-dissociate'
-Cloning into '/build/git-2.20.1/t/trash directory.t7408-submodule-reference/supersuper/subwithsub/sub'...
-Cloning into '/build/git-2.20.1/t/trash directory.t7408-submodule-reference/supersuper/subwithsub/sub-dissociate'...
-Submodule path 'subwithsub/sub': checked out 'e3fc762308c9e8c8a5c9aa31d46b29f1d8a1066f'
-Submodule path 'subwithsub/sub-dissociate': checked out 'e3fc762308c9e8c8a5c9aa31d46b29f1d8a1066f'
-Cloning into 'supersuper2'...
-done.
-Submodule 'subwithsub' (file:///build/git-2.20.1/t/trash directory.t7408-submodule-reference/super) registered for path 'subwithsub'
-Cloning into '/build/git-2.20.1/t/trash directory.t7408-submodule-reference/supersuper2/subwithsub'...
-Submodule path 'subwithsub': checked out 'd7cc951a5810c37f7245914dbb5baf13b6dfc351'
-ok 12 - preparing second superproject with a nested submodule plus partial clone
-
-expecting success: 
-	test_when_finished "rm -rf supersuper-clone" &&
-	git clone --recursive --reference supersuper supersuper supersuper-clone &&
-	(
-		cd supersuper-clone &&
-		# test superproject has alternates setup correctly
-		test_alternate_is_used .git/objects/info/alternates . &&
-		# immediate submodule has alternate:
-		test_alternate_is_used .git/modules/subwithsub/objects/info/alternates subwithsub &&
-		# nested submodule also has alternate:
-		test_alternate_is_used .git/modules/subwithsub/modules/sub/objects/info/alternates subwithsub/sub
-	)
-
-Cloning into 'supersuper-clone'...
-done.
-Submodule 'subwithsub' (file:///build/git-2.20.1/t/trash directory.t7408-submodule-reference/super) registered for path 'subwithsub'
-Cloning into '/build/git-2.20.1/t/trash directory.t7408-submodule-reference/supersuper-clone/subwithsub'...
-Submodule path 'subwithsub': checked out 'd7cc951a5810c37f7245914dbb5baf13b6dfc351'
-Submodule 'sub' (file:///build/git-2.20.1/t/trash directory.t7408-submodule-reference/A) registered for path 'subwithsub/sub'
-Submodule 'sub-dissociate' (file:///build/git-2.20.1/t/trash directory.t7408-submodule-reference/A) registered for path 'subwithsub/sub-dissociate'
-Cloning into '/build/git-2.20.1/t/trash directory.t7408-submodule-reference/supersuper-clone/subwithsub/sub'...
-Cloning into '/build/git-2.20.1/t/trash directory.t7408-submodule-reference/supersuper-clone/subwithsub/sub-dissociate'...
-Submodule path 'subwithsub/sub': checked out 'e3fc762308c9e8c8a5c9aa31d46b29f1d8a1066f'
-Submodule path 'subwithsub/sub-dissociate': checked out 'e3fc762308c9e8c8a5c9aa31d46b29f1d8a1066f'
-ok 13 - nested submodule alternate in works and is actually used
-
-expecting success: 
-	test_when_finished "rm -rf supersuper-clone" &&
-	test_must_fail git clone --recursive --reference supersuper2 supersuper2 supersuper-clone &&
-	(
-		cd supersuper-clone &&
-		check_that_two_of_three_alternates_are_used &&
-		# update of the submodule fails
-		test_must_fail git submodule update --init --recursive
-	)
-
-Cloning into 'supersuper-clone'...
-done.
-Submodule 'subwithsub' (file:///build/git-2.20.1/t/trash directory.t7408-submodule-reference/super) registered for path 'subwithsub'
-Cloning into '/build/git-2.20.1/t/trash directory.t7408-submodule-reference/supersuper-clone/subwithsub'...
-Submodule path 'subwithsub': checked out 'd7cc951a5810c37f7245914dbb5baf13b6dfc351'
-Submodule 'sub' (file:///build/git-2.20.1/t/trash directory.t7408-submodule-reference/A) registered for path 'subwithsub/sub'
-Submodule 'sub-dissociate' (file:///build/git-2.20.1/t/trash directory.t7408-submodule-reference/A) registered for path 'subwithsub/sub-dissociate'
-fatal: submodule 'sub' cannot add alternate: path '/build/git-2.20.1/t/trash directory.t7408-submodule-reference/supersuper2/.git/modules/subwithsub/modules/sub/' does not exist
-Failed to clone 'sub'. Retry scheduled
-fatal: submodule 'sub' cannot add alternate: path '/build/git-2.20.1/t/trash directory.t7408-submodule-reference/supersuper2/.git/modules/subwithsub/modules/sub/' does not exist
-Failed to clone 'sub' a second time, aborting
-fatal: submodule 'sub-dissociate' cannot add alternate: path '/build/git-2.20.1/t/trash directory.t7408-submodule-reference/supersuper2/.git/modules/subwithsub/modules/sub-dissociate/' does not exist
-Failed to clone 'sub-dissociate'. Retry scheduled
-fatal: submodule 'sub-dissociate' cannot add alternate: path '/build/git-2.20.1/t/trash directory.t7408-submodule-reference/supersuper2/.git/modules/subwithsub/modules/sub-dissociate/' does not exist
-Failed to clone 'sub-dissociate' a second time, aborting
-Failed to recurse into submodule path 'subwithsub'
-t7408-submodule-reference.sh: 617: eval: cannot open .git/modules/subwithsub/modules/sub/objects/info/alternates: No such file
-t7408-submodule-reference.sh: 617: test: =: unexpected operator
-test_line_count: line count for .git/modules/subwithsub/modules/sub/objects/info/alternates != 1
-cat: .git/modules/subwithsub/modules/sub/objects/info/alternates: No such file or directory
-fatal: submodule 'sub' cannot add alternate: path '/build/git-2.20.1/t/trash directory.t7408-submodule-reference/supersuper2/.git/modules/subwithsub/modules/sub/' does not exist
-Failed to clone 'sub'. Retry scheduled
-fatal: submodule 'sub-dissociate' cannot add alternate: path '/build/git-2.20.1/t/trash directory.t7408-submodule-reference/supersuper2/.git/modules/subwithsub/modules/sub-dissociate/' does not exist
-Failed to clone 'sub-dissociate'. Retry scheduled
-fatal: submodule 'sub' cannot add alternate: path '/build/git-2.20.1/t/trash directory.t7408-submodule-reference/supersuper2/.git/modules/subwithsub/modules/sub/' does not exist
-Failed to clone 'sub' a second time, aborting
-fatal: submodule 'sub-dissociate' cannot add alternate: path '/build/git-2.20.1/t/trash directory.t7408-submodule-reference/supersuper2/.git/modules/subwithsub/modules/sub-dissociate/' does not exist
-Failed to clone 'sub-dissociate' a second time, aborting
-Failed to recurse into submodule path 'subwithsub'
-ok 14 - missing nested submodule alternate fails clone and submodule update
-
-expecting success: 
-	test_when_finished "rm -rf supersuper-clone" &&
-	git clone --recursive --reference-if-able supersuper2 supersuper2 supersuper-clone &&
-	(
-		cd supersuper-clone &&
-		check_that_two_of_three_alternates_are_used &&
-		# update of the submodule succeeds
-		git submodule update --init --recursive
-	)
-
-Cloning into 'supersuper-clone'...
-done.
-Submodule 'subwithsub' (file:///build/git-2.20.1/t/trash directory.t7408-submodule-reference/super) registered for path 'subwithsub'
-Cloning into '/build/git-2.20.1/t/trash directory.t7408-submodule-reference/supersuper-clone/subwithsub'...
-Submodule path 'subwithsub': checked out 'd7cc951a5810c37f7245914dbb5baf13b6dfc351'
-Submodule 'sub' (file:///build/git-2.20.1/t/trash directory.t7408-submodule-reference/A) registered for path 'subwithsub/sub'
-Submodule 'sub-dissociate' (file:///build/git-2.20.1/t/trash directory.t7408-submodule-reference/A) registered for path 'subwithsub/sub-dissociate'
-submodule 'sub' cannot add alternate: path '/build/git-2.20.1/t/trash directory.t7408-submodule-reference/supersuper2/.git/modules/subwithsub/modules/sub/' does not existCloning into '/build/git-2.20.1/t/trash directory.t7408-submodule-reference/supersuper-clone/subwithsub/sub'...
-submodule 'sub-dissociate' cannot add alternate: path '/build/git-2.20.1/t/trash directory.t7408-submodule-reference/supersuper2/.git/modules/subwithsub/modules/sub-dissociate/' does not existCloning into '/build/git-2.20.1/t/trash directory.t7408-submodule-reference/supersuper-clone/subwithsub/sub-dissociate'...
-Submodule path 'subwithsub/sub': checked out 'e3fc762308c9e8c8a5c9aa31d46b29f1d8a1066f'
-Submodule path 'subwithsub/sub-dissociate': checked out 'e3fc762308c9e8c8a5c9aa31d46b29f1d8a1066f'
-t7408-submodule-reference.sh: 617: eval: cannot open .git/modules/subwithsub/modules/sub/objects/info/alternates: No such file
-t7408-submodule-reference.sh: 617: test: =: unexpected operator
-test_line_count: line count for .git/modules/subwithsub/modules/sub/objects/info/alternates != 1
-cat: .git/modules/subwithsub/modules/sub/objects/info/alternates: No such file or directory
-ok 15 - missing nested submodule alternate in --reference-if-able mode
-
-# passed all 15 test(s)
-1..15
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
 *** t7415-submodule-names.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7415-submodule-names/.git/
 expecting success: 
@@ -276488,7 +276396,7 @@
 	git -C innocent commit --allow-empty -m foo
 
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7415-submodule-names/innocent/.git/
-[master (root-commit) d242db3] foo
+[master (root-commit) c326254] foo
  Author: A U Thor <author@example.com>
 ok 2 - create innocent subrepo
 
@@ -276519,9 +276427,9 @@
 warning: ignoring suspicious submodule name: ../../modules/evil
 warning: ignoring suspicious submodule name: ../../modules/evil
 warning: ignoring suspicious submodule name: ../../modules/evil
-[master (root-commit) 874e522] evil
+[master (root-commit) 7bcb96f] evil
  Author: A U Thor <author@example.com>
- 27 files changed, 677 insertions(+)
+ 27 files changed, 678 insertions(+)
  create mode 100644 .gitmodules
  create mode 160000 evil
  create mode 100644 modules/evil/HEAD
@@ -276545,7 +276453,7 @@
  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/4b/825dc642cb6eb9a060e54bf8d69288fbee4904
- create mode 100644 modules/evil/objects/d2/42db34b3cf23d7bfb8ca6049760d50829cbbf9
+ create mode 100644 modules/evil/objects/c3/26254cecd9cdfa312c64d552defd0a8bc73a8f
  create mode 100644 modules/evil/packed-refs
  create mode 100644 modules/evil/refs/heads/master
  create mode 100644 modules/evil/refs/remotes/origin/HEAD
@@ -276561,7 +276469,7 @@
 warning: ignoring suspicious submodule name: ../../modules/evil
 warning: ignoring suspicious submodule name: ../../modules/evil
 warning: ignoring suspicious submodule name: ../../modules/evil
-[master 2852369] another
+[master d73e3f9] another
  Author: A U Thor <author@example.com>
  2 files changed, 4 insertions(+)
  create mode 160000 another-module
@@ -276664,23 +276572,23 @@
 rm 'modules/evil/logs/refs/heads/master'
 rm 'modules/evil/logs/refs/remotes/origin/HEAD'
 rm 'modules/evil/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904'
-rm 'modules/evil/objects/d2/42db34b3cf23d7bfb8ca6049760d50829cbbf9'
+rm 'modules/evil/objects/c3/26254cecd9cdfa312c64d552defd0a8bc73a8f'
 rm 'modules/evil/packed-refs'
 rm 'modules/evil/refs/heads/master'
 rm 'modules/evil/refs/remotes/origin/HEAD'
-[odd (root-commit) f06a914] odd
+[odd (root-commit) e5f1e45] odd
  Author: A U Thor <author@example.com>
  1 file changed, 7 insertions(+)
  create mode 100644 .gitmodules
 143+0 records in
 143+0 records out
-143 bytes copied, 0.000279799 s, 511 kB/s
+143 bytes copied, 0.000383723 s, 373 kB/s
 49+0 records in
 49+0 records out
-49 bytes copied, 0.000118495 s, 414 kB/s
+49 bytes copied, 0.000108121 s, 453 kB/s
 127+0 records in
 127+0 records out
-127 bytes copied, 0.000266593 s, 476 kB/s
+127 bytes copied, 0.000219774 s, 578 kB/s
 ok 10 - create oddly ordered pack
 
 expecting success: 
@@ -276701,7 +276609,7 @@
 	test_must_fail git -C dst.git index-pack --strict --stdin <odd.pack
 
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7415-submodule-names/dst.git/
-pack	0b12cc5be1c9bb4fe5734a57b466c4c6dcc5ca6a
+pack	141d58e0fe499fae6ca2f418f151398158687c60
 error: object d15c248b1e3fa18c7472763bb23d1fadb682c82d: gitmodulesName: disallowed submodule name: ../../modules/evil
 error: object d15c248b1e3fa18c7472763bb23d1fadb682c82d: gitmodulesName: disallowed submodule name: ../../modules/evil
 error: object d15c248b1e3fa18c7472763bb23d1fadb682c82d: gitmodulesName: disallowed submodule name: ../../modules/evil
@@ -276718,7 +276626,7 @@
 	grep gitmodulesName output
 
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7415-submodule-names/dst.git/
-0b12cc5be1c9bb4fe5734a57b466c4c6dcc5ca6a
+141d58e0fe499fae6ca2f418f151398158687c60
 error: object d15c248b1e3fa18c7472763bb23d1fadb682c82d: gitmodulesName: disallowed submodule name: ../../modules/evil
 error: object d15c248b1e3fa18c7472763bb23d1fadb682c82d: gitmodulesName: disallowed submodule name: ../../modules/evil
 error: object d15c248b1e3fa18c7472763bb23d1fadb682c82d: gitmodulesName: disallowed submodule name: ../../modules/evil
@@ -276773,7 +276681,7 @@
 	)
 
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7415-submodule-names/non-blob/.git/
-[master (root-commit) 072126f] ok
+[master (root-commit) cab9fc0] ok
  Author: A U Thor <author@example.com>
  1 file changed, 7 insertions(+)
  create mode 100644 subdir/file
@@ -276797,7 +276705,7 @@
 	)
 
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7415-submodule-names/corrupt/.git/
-[master (root-commit) 67f3818] broken gitmodules
+[master (root-commit) 122302e] broken gitmodules
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 .gitmodules
@@ -276890,8 +276798,8 @@
  create mode 100644 .gitmodules
  create mode 160000 thing1
  create mode 160000 thing2
-error: submodule git dir '/build/git-2.20.1/t/trash directory.t7415-submodule-names/clone/.git/modules/hippo/hooks' is inside git dir '/build/git-2.20.1/t/trash directory.t7415-submodule-names/clone/.git/modules/hippo'
-error: submodule git dir '/build/git-2.20.1/t/trash directory.t7415-submodule-names/clone/.git/modules/hippo/hooks' is inside git dir '/build/git-2.20.1/t/trash directory.t7415-submodule-names/clone/.git/modules/hippo'
+fatal: /build/git-2.20.1/t/trash directory.t7415-submodule-names/clone/.git/modules/hippo already exists
+fatal: not a git repository: /build/git-2.20.1/t/trash directory.t7415-submodule-names/clone/thing1/../.git/modules/hippo
 ok 18 - git dirs of sibling submodules must not be nested
 
 # passed all 18 test(s)
@@ -276907,7 +276815,7 @@
 	git commit -m "first"
 
 
-[master (root-commit) 3817b10] first
+[master (root-commit) 812f920] first
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 file
@@ -276920,7 +276828,7 @@
 	git commit --no-verify -m "bar"
 
 
-[master a89879c] bar
+[master 6876bee] bar
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 ok 2 - --no-verify with no hook
@@ -276932,7 +276840,7 @@
 	git commit -m "more"
 
 
-[master 901f4bd] more
+[master 1992d19] more
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 ok 3 - with succeeding hook
@@ -276944,7 +276852,7 @@
 	git commit --no-verify -m "even more"
 
 
-[master 6b6e81b] even more
+[master 253021d] even more
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 ok 4 - --no-verify with succeeding hook
@@ -276965,7 +276873,7 @@
 	git commit --no-verify -m "stuff"
 
 
-[master dc71d8b] stuff
+[master be02aee] stuff
  Author: A U Thor <author@example.com>
  1 file changed, 2 insertions(+)
 ok 6 - --no-verify with failing hook
@@ -276979,7 +276887,7 @@
 
 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`.
-[master 0b84a06] content
+[master 3f1820e] content
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 ok 7 - with non-executable hook
@@ -276991,7 +276899,7 @@
 	git commit --no-verify -m "more content"
 
 
-[master c5e322e] more content
+[master 4969e92] more content
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 ok 8 - --no-verify with non-executable hook
@@ -277007,7 +276915,7 @@
 	) &&
 	rmdir success
 
-[master 7329d57] hook requires GIT_PREFIX = success/
+[master 72dd867] hook requires GIT_PREFIX = success/
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 ok 9 - with hook requiring GIT_PREFIX
@@ -277043,19 +276951,19 @@
 		--allow-empty -m "by new.author via command line" &&
 	git show -s
 
-[master ca90f76] by new.author via env
+[master 061e02e] by new.author via env
  Author: New Author <newauthor@example.com>
  1 file changed, 1 insertion(+)
-commit ca90f7668cdc030c57768c5d7feac8cfc96a8775
+commit 061e02e9e0b2bfad6e0f9f93290fa28cb0ae2d85
 Author: New Author <newauthor@example.com>
-Date:   Fri Dec 3 05:09:39 2021 +0000
+Date:   Thu Jan 5 11:49:55 2023 +0000
 
     by new.author via env
-[master 748f27d] by new.author via command line
+[master 976b23d] by new.author via command line
  Author: New Author <newauthor@example.com>
-commit 748f27decfd4adca08ddaf64b4f6e27cda4fb23a
+commit 976b23dc3a55f73cc3114188b0f142e6cb6cda0e
 Author: New Author <newauthor@example.com>
-Date:   Fri Dec 3 05:09:39 2021 +0000
+Date:   Thu Jan 5 11:49:55 2023 +0000
 
     by new.author via command line
 ok 11 - check the author in hook
@@ -277075,11 +276983,11 @@
 	git commit -m submodule
 
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7416-submodule-dash-url/upstream/.git/
-[master (root-commit) ee31d7e] base
+[master (root-commit) eafc5e7] base
  Author: A U Thor <author@example.com>
 Cloning into '/build/git-2.20.1/t/trash directory.t7416-submodule-dash-url/sub'...
 done.
-[master (root-commit) 20e5ae4] submodule
+[master (root-commit) 2bd1999] submodule
  Author: A U Thor <author@example.com>
  2 files changed, 4 insertions(+)
  create mode 100644 .gitmodules
@@ -277098,7 +277006,7 @@
 Submodule 'sub' (/build/git-2.20.1/t/trash directory.t7416-submodule-dash-url/./-upstream) registered for path 'sub'
 Cloning into '/build/git-2.20.1/t/trash directory.t7416-submodule-dash-url/dst/sub'...
 done.
-Submodule path 'sub': checked out 'ee31d7e4fdec92251f2605a7a441d06dd01905c3'
+Submodule path 'sub': checked out 'eafc5e7f219abe0c25113c39f5bd91af8ad9f7a4'
 ok 2 - clone can recurse submodule
 
 expecting success: 
@@ -277116,7 +277024,7 @@
 	perl -i -pe "s{\./}{}" .gitmodules &&
 	git commit -am "drop protection"
 
-[master 892139e] drop protection
+[master ae34f9e] drop protection
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 ok 4 - remove ./ protection from .gitmodules url
@@ -277159,7 +277067,7 @@
  1 file changed, 1 insertion(+)
  create mode 100644 c.t
 Adding existing repo at 'testmodule' to the index
-[master db9560a] Add testmodule
+[master ebea5e7] Add testmodule
  Author: A U Thor <author@example.com>
  2 files changed, 5 insertions(+), 1 deletion(-)
  create mode 160000 testmodule
@@ -277181,7 +277089,7 @@
 	grep gitmodulesUrl err
 
 Switched to a new branch 'missing-scheme'
-[missing-scheme (root-commit) 6e639b7] gitmodules with missing URL scheme
+[missing-scheme (root-commit) db07f18] gitmodules with missing URL scheme
  Author: A U Thor <author@example.com>
  3 files changed, 4 insertions(+)
  create mode 100644 .gitmodules
@@ -277207,7 +277115,7 @@
 	grep gitmodulesUrl err
 
 Switched to a new branch 'relative-missing-scheme'
-[relative-missing-scheme (root-commit) ee78f83] gitmodules with relative URL that strips off scheme
+[relative-missing-scheme (root-commit) 8b01609] gitmodules with relative URL that strips off scheme
  Author: A U Thor <author@example.com>
  3 files changed, 4 insertions(+)
  create mode 100644 .gitmodules
@@ -277233,7 +277141,7 @@
 	grep gitmodulesUrl err
 
 Switched to a new branch 'empty-scheme'
-[empty-scheme (root-commit) 0dea29b] gitmodules with empty URL scheme
+[empty-scheme (root-commit) 56e510b] gitmodules with empty URL scheme
  Author: A U Thor <author@example.com>
  3 files changed, 4 insertions(+)
  create mode 100644 .gitmodules
@@ -277259,7 +277167,7 @@
 	grep gitmodulesUrl err
 
 Switched to a new branch 'relative-empty-scheme'
-[relative-empty-scheme (root-commit) 1f61674] relative gitmodules URL resolving to empty scheme
+[relative-empty-scheme (root-commit) 4c089c0] relative gitmodules URL resolving to empty scheme
  Author: A U Thor <author@example.com>
  3 files changed, 4 insertions(+)
  create mode 100644 .gitmodules
@@ -277285,7 +277193,7 @@
 	grep gitmodulesUrl err
 
 Switched to a new branch 'empty-host'
-[empty-host (root-commit) f0ba4e3] gitmodules with extra slashes
+[empty-host (root-commit) ada150a] gitmodules with extra slashes
  Author: A U Thor <author@example.com>
  3 files changed, 4 insertions(+)
  create mode 100644 .gitmodules
@@ -277311,7 +277219,7 @@
 	grep gitmodulesUrl err
 
 Switched to a new branch 'messy-relative'
-[messy-relative (root-commit) f60a99d] gitmodules abusing relative_path
+[messy-relative (root-commit) 7157ba6] gitmodules abusing relative_path
  Author: A U Thor <author@example.com>
  3 files changed, 4 insertions(+)
  create mode 100644 .gitmodules
@@ -277335,7 +277243,7 @@
 	git push dst HEAD
 
 Switched to a new branch 'newscheme'
-[newscheme (root-commit) a06b295] gitmodules with unrecognized scheme
+[newscheme (root-commit) 5768649] gitmodules with unrecognized scheme
  Author: A U Thor <author@example.com>
  3 files changed, 4 insertions(+)
  create mode 100644 .gitmodules
@@ -277362,7 +277270,7 @@
 	grep gitmodulesUrl err
 
 Switched to a new branch 'newline'
-[newline (root-commit) 003fa32] gitmodules with newline
+[newline (root-commit) aa98cb1] gitmodules with newline
  Author: A U Thor <author@example.com>
  3 files changed, 4 insertions(+)
  create mode 100644 .gitmodules
@@ -277387,7 +277295,7 @@
 	grep gitmodulesUrl err
 
 Switched to a new branch 'relative-newline'
-[relative-newline (root-commit) dcdc2fc] relative url with newline
+[relative-newline (root-commit) 005a616] relative url with newline
  Author: A U Thor <author@example.com>
  3 files changed, 4 insertions(+)
  create mode 100644 .gitmodules
@@ -277401,6 +277309,174 @@
 1..16
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
+*** t7418-submodule-sparse-gitmodules.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7418-submodule-sparse-gitmodules/.git/
+expecting success: 
+	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 upstream super &&
+	(cd super &&
+		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/git-2.20.1/t/trash directory.t7418-submodule-sparse-gitmodules/upstream/.git/
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7418-submodule-sparse-gitmodules/submodule/.git/
+[master (root-commit) a939200] Add file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+Cloning into '/build/git-2.20.1/t/trash directory.t7418-submodule-sparse-gitmodules/upstream/submodule'...
+done.
+[master (root-commit) caa93e1] Add submodule
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 submodule
+Cloning into 'super'...
+done.
+ok 1 - sparse checkout setup which hides .gitmodules
+
+expecting success: 
+	echo "../submodule" >expect &&
+	git -C super submodule--helper config submodule.submodule.url >actual &&
+	test_cmp expect actual
+
+ok 2 - reading gitmodules config file when it is not checked out
+
+expecting success: 
+	test_must_fail git -C super submodule--helper config submodule.submodule.url newurl &&
+	test_path_is_missing super/.gitmodules
+
+fatal: please make sure that the .gitmodules file is in the working tree
+ok 3 - not writing gitmodules config file when it is not checked out
+
+expecting success: 
+	test_must_fail git -C super config submodule.submodule.url &&
+	git -C super submodule init &&
+	git -C super config submodule.submodule.url >actual &&
+	echo "$(pwd)/submodule" >expect &&
+	test_cmp expect actual
+
+Submodule 'submodule' (/build/git-2.20.1/t/trash directory.t7418-submodule-sparse-gitmodules/submodule) registered for path 'submodule'
+ok 4 - initialising submodule when the gitmodules config is not checked out
+
+expecting success: 
+	test_path_is_missing super/submodule/file &&
+	git -C super submodule update &&
+	test_cmp submodule/file super/submodule/file
+
+Cloning into '/build/git-2.20.1/t/trash directory.t7418-submodule-sparse-gitmodules/super/submodule'...
+done.
+Submodule path 'submodule': checked out 'a939200cdece6d977c80e37469830b5cb29fd586'
+ok 5 - updating submodule when the gitmodules config is not checked out
+
+expecting success: 
+	test_when_finished "git -C submodule reset --hard $ORIG_SUBMODULE;
+			    git -C upstream reset --hard $ORIG_UPSTREAM;
+			    git -C super reset --hard $ORIG_SUPER;
+			    git -C upstream submodule update --remote;
+			    git -C super pull;
+			    git -C super submodule update --remote" &&
+	(cd submodule &&
+		echo file2 >file2 &&
+		git add file2 &&
+		test_tick &&
+		git commit -m "Add file2 to submodule"
+	) &&
+	(cd upstream &&
+		git submodule update --remote &&
+		git add submodule &&
+		test_tick &&
+		git commit -m "Update submodule"
+	) &&
+	git -C super pull &&
+	# The --for-status options reads the gitmodules config
+	git -C super submodule summary --for-status >actual &&
+	rev1=$(git -C submodule rev-parse --short HEAD) &&
+	rev2=$(git -C submodule rev-parse --short HEAD^) &&
+	cat >expect <<-EOF &&
+	* submodule ${rev1}...${rev2} (1):
+	  < Add file2 to submodule
+
+	EOF
+	test_cmp expect actual &&
+	# Test that the update actually succeeds
+	test_path_is_missing super/submodule/file2 &&
+	git -C super submodule update &&
+	test_cmp submodule/file2 super/submodule/file2 &&
+	git -C super status --short >output &&
+	test_must_be_empty output
+
+[master 83d36b8] Add file2 to submodule
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file2
+From /build/git-2.20.1/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/git-2.20.1/t/trash directory.t7418-submodule-sparse-gitmodules/upstream
+   caa93e1..5ae4276  master     -> origin/master
+Fetching submodule submodule
+From /build/git-2.20.1/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/git-2.20.1/t/trash directory.t7418-submodule-sparse-gitmodules/submodule
+ + 83d36b8...a939200 master     -> origin/master  (forced update)
+Submodule path 'submodule': checked out 'a939200cdece6d977c80e37469830b5cb29fd586'
+From /build/git-2.20.1/t/trash directory.t7418-submodule-sparse-gitmodules/upstream
+ + 5ae4276...caa93e1 master     -> origin/master  (forced update)
+Already up to date.
+From /build/git-2.20.1/t/trash directory.t7418-submodule-sparse-gitmodules/submodule
+ + 83d36b8...a939200 master     -> origin/master  (forced update)
+Submodule path 'submodule': checked out 'a939200cdece6d977c80e37469830b5cb29fd586'
+ok 6 - re-updating submodule when the gitmodules config is not checked out
+
+expecting success: 
+	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.
+please make sure that the .gitmodules file is in the working tree
+ok 7 - not adding submodules when the gitmodules config is not checked out
+
+expecting success: 
+	git -C super submodule init
+
+ok 8 - init submodule still works even after the previous add failed
+
+# passed all 8 test(s)
+1..8
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
 *** t7500-commit-template-squash-signoff.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7500-commit-template-squash-signoff/.git/
 expecting success: 
@@ -277408,7 +277484,7 @@
 	git add foo &&
 	git commit -m "initial commit"
 
-[master (root-commit) ebd4190] initial commit
+[master (root-commit) afa6419] initial commit
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 foo
@@ -277476,7 +277552,7 @@
 	) &&
 	commit_msg_is "template linecommit message"
 
-[master ac120f1] template line
+[master 681e540] template line
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 ok 8 - adding real content to a template should commit
@@ -277491,7 +277567,7 @@
 	) &&
 	commit_msg_is "short templatecommit message"
 
-[master 5f10fac] short template
+[master e437d9e] short template
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 ok 9 - -t option should be short for --template
@@ -277507,7 +277583,7 @@
 	) &&
 	commit_msg_is "new templatecommit message"
 
-[master c4d2cea] new template
+[master c159665] new template
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 ok 10 - config-specified template should commit
@@ -277519,7 +277595,7 @@
 		-m "command line msg" &&
 	commit_msg_is "command line msg"
 
-[master d586191] command line msg
+[master fd8588a] command line msg
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 ok 11 - explicit commit message should override template
@@ -277534,7 +277610,7 @@
 	) &&
 	commit_msg_is "standard input msg"
 
-[master 44939cd] standard input msg
+[master f2c53ac] standard input msg
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 ok 12 - commit message from file should override template
@@ -277546,7 +277622,7 @@
 	git commit --template "$TEMPLATE" &&
 	commit_msg_is "commit message"
 
-[master f2cab8b] commit message
+[master 89dbadf] commit message
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 ok 13 - commit message from template with whitespace issue
@@ -277566,7 +277642,7 @@
 	cmp .git/index saved-index >/dev/null
 
 
-[master a25f665] commit using another index
+[master b69195e] commit using another index
  Author: A U Thor <author@example.com>
  2 files changed, 1 insertion(+), 7 deletions(-)
  create mode 100644 file
@@ -277587,7 +277663,7 @@
 	) &&
 	cmp .git/index saved-index >/dev/null
 
-[master b7cb134] commit using nonexistent index
+[master ed82fdf] commit using nonexistent index
  Author: A U Thor <author@example.com>
  1 file changed, 1 deletion(-)
  delete mode 100644 file
@@ -277599,7 +277675,7 @@
 	git cat-file commit HEAD | sed "1,/^\$/d" > output &&
 	test_cmp expect output
 
-[master 461d440] zort
+[master 8770399] zort
  Author: A U Thor <author@example.com>
  1 file changed, 8 insertions(+)
  create mode 100644 foo
@@ -277615,7 +277691,7 @@
 	) &&
 	commit_msg_is "Log in sub directory"
 
-[master 05e913e] Log in sub directory
+[master 31d4754] Log in sub directory
  Author: A U Thor <author@example.com>
 ok 17 - commit message from file (1)
 
@@ -277628,7 +277704,7 @@
 	) &&
 	commit_msg_is "Log in sub directory"
 
-[master c46ea2a] Log in sub directory
+[master a773d4a] Log in sub directory
  Author: A U Thor <author@example.com>
 ok 18 - commit message from file (2)
 
@@ -277639,7 +277715,7 @@
 	) &&
 	commit_msg_is "Log with foo word"
 
-[master 14fac36] Log with foo word
+[master 698780c] Log with foo word
  Author: A U Thor <author@example.com>
 ok 19 - commit message from stdin
 
@@ -277652,7 +277728,7 @@
 	) &&
 	commit_msg_is "-F log"
 
-[master 3c0d307] -F log
+[master 598b15d] -F log
  Author: A U Thor <author@example.com>
 ok 20 - commit -F overrides -t
 
@@ -277664,7 +277740,7 @@
 	commit_msg_is "" &&
 	git tag empty-message-commit
 
-[master 1356b96] 
+[master dbe1961] 
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 ok 21 - Commit without message is allowed with --allow-empty-message
@@ -277684,7 +277760,7 @@
 	git commit --allow-empty-message -m"hello there" &&
 	commit_msg_is "hello there"
 
-[master 09b249c] hello there
+[master dd575bd] hello there
  Author: A U Thor <author@example.com>
  1 file changed, 2 insertions(+)
 ok 23 - Commit a message with --allow-empty-message
@@ -277697,9 +277773,9 @@
 	commit_msg_is ""
 
 Aborting commit due to empty commit message.
-[master ef4c631] 
+[master 8af5394] 
  Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:09:38 2021 +0000
+ Date: Thu Jan 5 11:49:54 2023 +0000
  1 file changed, 1 insertion(+)
 ok 24 - commit -C empty respects --allow-empty-message
 
@@ -277708,13 +277784,13 @@
 	git commit --fixup HEAD~1 &&
 	commit_msg_is "fixup! target message subject line"
 
-[master 3db295f] target message subject line
+[master ef9b072] target message subject line
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[master 8387b44] intermediate commit
+[master c14b9db] intermediate commit
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[master f2d6dd2] fixup! target message subject line
+[master a6ad8ad] 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
@@ -277726,13 +277802,13 @@
 
 extra"
 
-[master 8776015] target message subject line
+[master 057a7bd] target message subject line
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[master 1cb7d71] intermediate commit
+[master da1e73f] intermediate commit
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[master a1ff033] fixup! target message subject line
+[master e8b1ca9] 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"
@@ -277743,13 +277819,13 @@
 	git commit --squash HEAD~1 -F msgfile  &&
 	commit_msg_is "squash! target message subject linelog message from file"
 
-[master 7110aca] target message subject line
+[master b7676a7] target message subject line
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[master 7d8f3a0] intermediate commit
+[master f84b71e] intermediate commit
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[master 29139b6] squash! target message subject line
+[master b12e50a] squash! target message subject line
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 ok 27 - commit --squash works with -F
@@ -277759,13 +277835,13 @@
 	git commit --squash HEAD~1 -m "foo bar\nbaz" &&
 	commit_msg_is "squash! target message subject linefoo bar\nbaz"
 
-[master c717a7e] target message subject line
+[master 7f40c53] target message subject line
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[master ac5cf58] intermediate commit
+[master b262eb6] intermediate commit
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[master 4bb465c] squash! target message subject line
+[master 88b65aa] squash! target message subject line
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 ok 28 - commit --squash works with -m
@@ -277775,15 +277851,15 @@
 	git commit --squash HEAD~1 -C HEAD &&
 	commit_msg_is "squash! target message subject lineintermediate commit"
 
-[master 10b9c2f] target message subject line
+[master fe3b44e] target message subject line
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[master 71d6406] intermediate commit
+[master 2cfa2b4] intermediate commit
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[master 8c52ae9] squash! target message subject line
+[master 1906402] squash! target message subject line
  Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:09:38 2021 +0000
+ Date: Thu Jan 5 11:49:55 2023 +0000
  1 file changed, 1 insertion(+)
 ok 29 - commit --squash works with -C
 
@@ -277793,15 +277869,15 @@
 	git commit --squash HEAD~1 -c HEAD &&
 	commit_msg_is "squash! target message subject lineedited commit"
 
-[master f6dc828] target message subject line
+[master abf2bad] target message subject line
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[master a4105b2] intermediate commit
+[master 002136f] intermediate commit
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[master adf623e] squash! target message subject line
+[master 4c68a5a] squash! target message subject line
  Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:09:38 2021 +0000
+ Date: Thu Jan 5 11:49:55 2023 +0000
  1 file changed, 1 insertion(+)
 ok 30 - commit --squash works with -c
 
@@ -277810,15 +277886,15 @@
 	git commit --squash HEAD -C HEAD &&
 	commit_msg_is "squash! intermediate commit"
 
-[master 569d0b4] target message subject line
+[master 349db42] target message subject line
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[master 4f4ce00] intermediate commit
+[master ef1d588] intermediate commit
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[master 1098ac0] squash! intermediate commit
+[master 73fafaa] squash! intermediate commit
  Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:09:38 2021 +0000
+ Date: Thu Jan 5 11:49:55 2023 +0000
  1 file changed, 1 insertion(+)
 ok 31 - commit --squash works with -C for same commit
 
@@ -277828,15 +277904,15 @@
 	git commit --squash HEAD -c HEAD &&
 	commit_msg_is "squash! edited commit"
 
-[master 9ef89bc] target message subject line
+[master c096358] target message subject line
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[master 91034f7] intermediate commit
+[master 9dc686b] intermediate commit
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[master c7310a6] squash! edited commit
+[master 795f61f] squash! edited commit
  Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:09:39 2021 +0000
+ Date: Thu Jan 5 11:49:55 2023 +0000
  1 file changed, 1 insertion(+)
 ok 32 - commit --squash works with -c for same commit
 
@@ -277846,13 +277922,13 @@
 	git commit --squash HEAD~1 &&
 	commit_msg_is "squash! target message subject linecommit message"
 
-[master 1ef5323] target message subject line
+[master 64b9dc4] target message subject line
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[master a6c076d] intermediate commit
+[master b5af8dc] intermediate commit
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[master 37bca3f] squash! target message subject line
+[master 33832ee] squash! target message subject line
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 ok 33 - commit --squash works with editor
@@ -277882,8 +277958,8 @@
 
 Switched to a new branch 'commit-template-check'
 M	foo
-HEAD is now at 37bca3f squash! target message subject line
-[commit-template-check dd05c7e] 
+HEAD is now at 33832ee squash! target message subject line
+[commit-template-check 6ede96b] 
  Author: A U Thor <author@example.com>
  1 file changed, 0 insertions(+), 0 deletions(-)
  create mode 100644 commit-template-check
@@ -277930,1517 +278006,1052 @@
 1..37
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t7418-submodule-sparse-gitmodules.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7418-submodule-sparse-gitmodules/.git/
+*** t7408-submodule-reference.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7408-submodule-reference/.git/
 expecting success: 
-	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 upstream super &&
-	(cd super &&
-		cat >.git/info/sparse-checkout <<-\EOF &&
-		/*
-		!/.gitmodules
-		EOF
-		git config core.sparsecheckout true &&
-		git read-tree -m -u HEAD &&
-		test_path_is_missing .gitmodules
+	test_create_repo A &&
+	(
+		cd A &&
+		echo first >file1 &&
+		git add file1 &&
+		git commit -m A-initial
 	)
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7418-submodule-sparse-gitmodules/upstream/.git/
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7418-submodule-sparse-gitmodules/submodule/.git/
-[master (root-commit) a939200] Add file
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7408-submodule-reference/A/.git/
+[master (root-commit) c080ca5] A-initial
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 file
-Cloning into '/build/git-2.20.1/t/trash directory.t7418-submodule-sparse-gitmodules/upstream/submodule'...
-done.
-[master (root-commit) caa93e1] Add submodule
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 submodule
-Cloning into 'super'...
-done.
-ok 1 - sparse checkout setup which hides .gitmodules
-
-expecting success: 
-	echo "../submodule" >expect &&
-	git -C super submodule--helper config submodule.submodule.url >actual &&
-	test_cmp expect actual
-
-ok 2 - reading gitmodules config file when it is not checked out
-
-expecting success: 
-	test_must_fail git -C super submodule--helper config submodule.submodule.url newurl &&
-	test_path_is_missing super/.gitmodules
-
-fatal: please make sure that the .gitmodules file is in the working tree
-ok 3 - not writing gitmodules config file when it is not checked out
-
-expecting success: 
-	test_must_fail git -C super config submodule.submodule.url &&
-	git -C super submodule init &&
-	git -C super config submodule.submodule.url >actual &&
-	echo "$(pwd)/submodule" >expect &&
-	test_cmp expect actual
-
-Submodule 'submodule' (/build/git-2.20.1/t/trash directory.t7418-submodule-sparse-gitmodules/submodule) registered for path 'submodule'
-ok 4 - initialising submodule when the gitmodules config is not checked out
-
-expecting success: 
-	test_path_is_missing super/submodule/file &&
-	git -C super submodule update &&
-	test_cmp submodule/file super/submodule/file
-
-Cloning into '/build/git-2.20.1/t/trash directory.t7418-submodule-sparse-gitmodules/super/submodule'...
-done.
-Submodule path 'submodule': checked out 'a939200cdece6d977c80e37469830b5cb29fd586'
-ok 5 - updating submodule when the gitmodules config is not checked out
+ create mode 100644 file1
+ok 1 - preparing first repository
 
 expecting success: 
-	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 clone A B &&
+	(
+		cd B &&
+		echo second >file2 &&
 		git add file2 &&
-		test_tick &&
-		git commit -m "Add file2 to submodule"
-	) &&
-	(cd upstream &&
-		git submodule update --remote &&
-		git add submodule &&
-		test_tick &&
-		git commit -m "Update submodule"
-	) &&
-	git -C super pull &&
-	# The --for-status options reads the gitmodules config
-	git -C super submodule summary --for-status >actual &&
-	rev1=$(git -C submodule rev-parse --short HEAD) &&
-	rev2=$(git -C submodule rev-parse --short HEAD^) &&
-	cat >expect <<-EOF &&
-	* submodule ${rev1}...${rev2} (1):
-	  < Add file2 to submodule
-
-	EOF
-	test_cmp expect actual &&
-	# Test that the update actually succeeds
-	test_path_is_missing super/submodule/file2 &&
-	git -C super submodule update &&
-	test_cmp submodule/file2 super/submodule/file2 &&
-	git -C super status --short >output &&
-	test_must_be_empty output
-
-[master 83d36b8] Add file2 to submodule
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file2
-From /build/git-2.20.1/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/git-2.20.1/t/trash directory.t7418-submodule-sparse-gitmodules/upstream
-   caa93e1..5ae4276  master     -> origin/master
-Fetching submodule submodule
-From /build/git-2.20.1/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/git-2.20.1/t/trash directory.t7418-submodule-sparse-gitmodules/submodule
- + 83d36b8...a939200 master     -> origin/master  (forced update)
-Submodule path 'submodule': checked out 'a939200cdece6d977c80e37469830b5cb29fd586'
-From /build/git-2.20.1/t/trash directory.t7418-submodule-sparse-gitmodules/upstream
- + 5ae4276...caa93e1 master     -> origin/master  (forced update)
-Already up to date.
-From /build/git-2.20.1/t/trash directory.t7418-submodule-sparse-gitmodules/submodule
- + 83d36b8...a939200 master     -> origin/master  (forced update)
-Submodule path 'submodule': checked out 'a939200cdece6d977c80e37469830b5cb29fd586'
-ok 6 - re-updating submodule when the gitmodules config is not checked out
-
-expecting success: 
-	git clone submodule new_submodule &&
-	test_must_fail git -C super submodule add ../new_submodule &&
-	test_path_is_missing .gitmodules
+		git commit -m B-addition &&
+		git repack -a -d &&
+		git prune
+	)
 
-Cloning into 'new_submodule'...
+Cloning into 'B'...
 done.
-please make sure that the .gitmodules file is in the working tree
-ok 7 - not adding submodules when the gitmodules config is not checked out
-
-expecting success: 
-	git -C super submodule init
-
-ok 8 - init submodule still works even after the previous add failed
-
-# passed all 8 test(s)
-1..8
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t7504-commit-msg-hook.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7504-commit-msg-hook/.git/
-expecting success: 
-
-	echo "foo" > file &&
-	git add file &&
-	git commit -m "first"
-
-
-[master (root-commit) 3817b10] first
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-ok 1 - with no hook
-
-expecting success: 
-
-	echo "more foo" >> file &&
-	git add file &&
-	echo "more foo" > FAKE_MSG &&
-	GIT_EDITOR="\"\$FAKE_EDITOR\"" git commit
-
-
-[master e891d86] more foo
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 2 - with no hook (editor)
-
-expecting success: 
-
-	echo "bar" > file &&
-	git add file &&
-	git commit --no-verify -m "bar"
-
-
-[master 80197c3] bar
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 2 deletions(-)
-ok 3 - --no-verify with no hook
-
-expecting success: 
-
-	echo "more bar" > file &&
-	git add file &&
-	echo "more bar" > FAKE_MSG &&
-	GIT_EDITOR="\"\$FAKE_EDITOR\"" git commit --no-verify
-
-
-[master 4d1554c] more bar
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 4 - --no-verify with no hook (editor)
-
-expecting success: 
-
-	echo "more" >> file &&
-	git add file &&
-	git commit -m "more"
-
-
-[master d386ecf] more
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 5 - with succeeding hook
-
-expecting success: 
-
-	echo "more more" >> file &&
-	git add file &&
-	echo "more more" > FAKE_MSG &&
-	GIT_EDITOR="\"\$FAKE_EDITOR\"" git commit
-
-
-[master ad79a06] more more
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 6 - with succeeding hook (editor)
-
-expecting success: 
-
-	echo "even more" >> file &&
-	git add file &&
-	git commit --no-verify -m "even more"
-
-
-[master f28b3f4] even more
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 7 - --no-verify with succeeding hook
-
-expecting success: 
-
-	echo "even more more" >> file &&
-	git add file &&
-	echo "even more more" > FAKE_MSG &&
-	GIT_EDITOR="\"\$FAKE_EDITOR\"" git commit --no-verify
-
-
-[master 9395cda] even more more
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 8 - --no-verify with succeeding hook (editor)
-
-expecting success: 
-
-	echo "another" >> file &&
-	git add file &&
-	test_must_fail git commit -m "another"
-
-
-ok 9 - with failing hook
-
-expecting success: 
-
-	echo "more another" >> file &&
-	git add file &&
-	echo "more another" > FAKE_MSG &&
-	! (GIT_EDITOR="\"\$FAKE_EDITOR\"" git commit)
-
-
-ok 10 - with failing hook (editor)
-
-expecting success: 
-
-	echo "stuff" >> file &&
-	git add file &&
-	git commit --no-verify -m "stuff"
-
-
-[master 419f261] stuff
- Author: A U Thor <author@example.com>
- 1 file changed, 3 insertions(+)
-ok 11 - --no-verify with failing hook
-
-expecting success: 
-
-	echo "more stuff" >> file &&
-	git add file &&
-	echo "more stuff" > FAKE_MSG &&
-	GIT_EDITOR="\"\$FAKE_EDITOR\"" git commit --no-verify
-
-
-[master d281a08] more stuff
+[master 1cd8235] B-addition
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-ok 12 - --no-verify with failing hook (editor)
-
-expecting success: 
-
-	test_when_finished "git branch -D newbranch" &&
-	test_when_finished "git checkout -f master" &&
-	git checkout --orphan newbranch &&
-	: >file2 &&
-	git add file2 &&
-	git commit --no-verify file2 -m in-side-branch &&
-	test_must_fail git merge --allow-unrelated-histories master &&
-	commit_msg_is "in-side-branch" # HEAD before merge
-
-
-Switched to a new branch 'newbranch'
-[newbranch (root-commit) ffef66f] in-side-branch
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 file2
-error: Your local changes to the following files would be overwritten by merge:
-  file
-Merging:
-ffef66f in-side-branch
-virtual master
-found 0 common ancestors:
-Switched to branch 'master'
-Deleted branch newbranch (was ffef66f).
-ok 13 - merge fails with failing hook
-
-expecting success: 
-
-	test_when_finished "git branch -D newbranch" &&
-	test_when_finished "git checkout -f master" &&
-	git checkout --orphan newbranch &&
-	git rm -f file &&
-	: >file2 &&
-	git add file2 &&
-	git commit --no-verify file2 -m in-side-branch &&
-	git merge --no-verify --allow-unrelated-histories master &&
-	commit_msg_is "Merge branch 'master' into newbranch"
-
-Switched to a new branch 'newbranch'
-rm 'file'
-[newbranch (root-commit) ffef66f] in-side-branch
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
  create mode 100644 file2
-Merging:
-ffef66f in-side-branch
-virtual master
-found 0 common ancestors:
-Merge made by the 'recursive' strategy.
- file | 9 +++++++++
- 1 file changed, 9 insertions(+)
- create mode 100644 file
-Switched to branch 'master'
-Deleted branch newbranch (was cb16679).
-ok 14 - merge bypasses failing hook with --no-verify
-
-expecting success: 
-
-	echo "content" >file &&
-	git add file &&
-	git commit -m "content"
-
-
-hint: The '.git/hooks/commit-msg' hook was ignored because it's not set as executable.
-hint: You can disable this warning with `git config advice.ignoredHook false`.
-[master e51f8a6] content
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 9 deletions(-)
-ok 15 - with non-executable hook
-
-expecting success: 
-
-	echo "content again" >> file &&
-	git add file &&
-	echo "content again" > FAKE_MSG &&
-	GIT_EDITOR="\"\$FAKE_EDITOR\"" git commit -m "content again"
-
-
-hint: The '.git/hooks/commit-msg' hook was ignored because it's not set as executable.
-hint: You can disable this warning with `git config advice.ignoredHook false`.
-[master 3885f9e] content again
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 16 - with non-executable hook (editor)
-
-expecting success: 
-
-	echo "more content" >> file &&
-	git add file &&
-	git commit --no-verify -m "more content"
-
-
-[master e16ef2a] more content
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 17 - --no-verify with non-executable hook
-
-expecting success: 
-
-	echo "even more content" >> file &&
-	git add file &&
-	echo "even more content" > FAKE_MSG &&
-	GIT_EDITOR="\"\$FAKE_EDITOR\"" git commit --no-verify
-
-
-[master d9514c0] even more content
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 18 - --no-verify with non-executable hook (editor)
-
-expecting success: 
-
-	echo "additional" >> file &&
-	git add file &&
-	git commit -m "additional" &&
-	commit_msg_is "new message"
-
-
-[master 3eecc86] new message
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 19 - hook edits commit message
-
-expecting success: 
-
-	echo "additional content" >> file &&
-	git add file &&
-	echo "additional content" > FAKE_MSG &&
-	GIT_EDITOR="\"\$FAKE_EDITOR\"" git commit &&
-	commit_msg_is "new message"
-
-
-[master c8198ff] new message
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 20 - hook edits commit message (editor)
-
-expecting success: 
-
-	echo "plus" >> file &&
-	git add file &&
-	git commit --no-verify -m "plus" &&
-	commit_msg_is "plus"
-
-
-[master 153a1d1] plus
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 21 - hook doesn't edit commit message
+ok 2 - preparing second repository
 
 expecting success: 
+	test_create_repo super &&
+	(
+		cd super &&
+		echo file >file &&
+		git add file &&
+		git commit -m B-super-initial
+	)
 
-	echo "more plus" >> file &&
-	git add file &&
-	echo "more plus" > FAKE_MSG &&
-	GIT_EDITOR="\"\$FAKE_EDITOR\"" git commit --no-verify &&
-	commit_msg_is "more plus"
-
-[master d4d78c5] more plus
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7408-submodule-reference/super/.git/
+[master (root-commit) b17c592] B-super-initial
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-ok 22 - hook doesn't edit commit message (editor)
-
-expecting success: 
-	test_when_finished "git branch -D newbranch" &&
-	test_when_finished "git checkout -f master" &&
-	git checkout --orphan newbranch &&
-	git rm -f file &&
-	: >file2 &&
-	git add file2 &&
-	git commit --no-verify file2 -m in-side-branch &&
-	git merge --allow-unrelated-histories master &&
-	commit_msg_is "new message"
-
-Switched to a new branch 'newbranch'
-rm 'file'
-[newbranch (root-commit) 575545e] in-side-branch
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 file2
-Merging:
-575545e in-side-branch
-virtual master
-found 0 common ancestors:
-Merge made by the 'recursive' strategy.
- file | 8 ++++++++
- 1 file changed, 8 insertions(+)
  create mode 100644 file
-Switched to branch 'master'
-Deleted branch newbranch (was 997a78f).
-ok 23 - hook called in git-merge picks up commit message
-
-checking known breakage: 
-	test_when_finished "git branch -D newbranch" &&
-	test_when_finished "git checkout -f master" &&
-	git checkout master &&
-	echo a >file2 &&
-	git add file2 &&
-	git commit --no-verify -m "add file2 to master" &&
-	git checkout -b newbranch master^ &&
-	echo b >file2 &&
-	git add file2 &&
-	git commit --no-verify file2 -m in-side-branch &&
-	git merge --no-verify -m not-rewritten-by-hook master &&
-	# resolve conflict:
-	echo c >file2 &&
-	git add file2 &&
-	git merge --continue &&
-	commit_msg_is not-rewritten-by-hook
-
-Already on 'master'
-[master 6d27501] add file2 to master
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file2
-Switched to a new branch 'newbranch'
-[newbranch ae2240b] in-side-branch
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file2
-Merging:
-ae2240b in-side-branch
-virtual master
-found 1 common ancestor:
-d4d78c5 more plus
-Auto-merging file2
-CONFLICT (add/add): Merge conflict in file2
-Automatic merge failed; fix conflicts and then commit the result.
-Switched to branch 'master'
-Deleted branch newbranch (was ae2240b).
-not ok 24 - merge --continue remembers --no-verify # TODO known breakage
-
-expecting success: 
-
-	GIT_SEQUENCE_EDITOR="\"$REWORD_EDITOR\"" git rebase -i HEAD^ &&
-	commit_msg_is "new message"
-
-
-Rebasing (1/1)
[detached HEAD ab9f3fe] new message
- Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:09:40 2021 +0000
- 1 file changed, 1 insertion(+)
- create mode 100644 file2
-Successfully rebased and updated refs/heads/master.
-ok 25 - hook is called for reword during `rebase -i`
-
-# still have 1 known breakage(s)
-# passed all remaining 24 test(s)
-1..25
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t7502-commit-porcelain.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7502-commit-porcelain/.git/
-expecting success: 
-
-	echo new >file1 &&
-	git add file1 &&
-	check_summary_oneline "root-commit" "initial" &&
-
-	echo change >>file1 &&
-	git add file1
-
-ok 1 - output summary format
-
-expecting success: 
-	check_summary_oneline "" "a change"
-
-ok 2 - output summary format: root-commit
-
-expecting success: 
-
-	check_summary_oneline "" "empty" "--allow-empty"
-
-ok 3 - output summary format for commit with an empty diff
-
-expecting success: 
-
-	git checkout -b recursive-base &&
-	test_commit base file1 &&
-
-	git checkout -b recursive-a recursive-base &&
-	test_commit commit-a file1 &&
-
-	git checkout -b recursive-b recursive-base &&
-	test_commit commit-b file1 &&
-
-	# conflict
-	git checkout recursive-a &&
-	test_must_fail git merge recursive-b &&
-	# resolve the conflict
-	echo commit-a > file1 &&
-	git add file1 &&
-	check_summary_oneline "" "Merge"
-
-Switched to a new branch 'recursive-base'
-[recursive-base e6f945f] base
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 2 deletions(-)
-Switched to a new branch 'recursive-a'
-[recursive-a 9300328] commit-a
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'recursive-b'
-[recursive-b 2f9e083] commit-b
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to branch 'recursive-a'
-Merging:
-9300328 commit-a
-virtual recursive-b
-found 1 common ancestor:
-e6f945f base
-Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-Automatic merge failed; fix conflicts and then commit the result.
-ok 4 - output summary format for merges
-
-expecting success: 
-
-	output_tests_cleanup &&
-
-	echo doing partial >"commit is" &&
-	mkdir not &&
-	echo very much encouraged but we should >not/forbid &&
-	git add "commit is" not &&
-	echo update added "commit is" file >"commit is" &&
-	echo also update another >not/forbid &&
-	test_tick &&
-	git commit -a -m "initial with -a" &&
-
-	git cat-file blob HEAD:"commit is" >current.1 &&
-	git cat-file blob HEAD:not/forbid >current.2 &&
-
-	cmp current.1 "commit is" &&
-	cmp current.2 not/forbid
-
-
-Switched to branch 'master'
-rm 'file1'
-[master 34ca441] cleanup
- Author: A U Thor <author@example.com>
- 1 file changed, 2 deletions(-)
- delete mode 100644 file1
-[master 8a2203d] initial with -a
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 commit is
- create mode 100644 not/forbid
-ok 5 - the basics
-
-expecting success: 
-
-	echo another >"commit is" &&
-	echo another >not/forbid &&
-	test_tick &&
-	git commit -m "partial commit to handle a file" "commit is" &&
-
-	changed=$(git diff-tree --name-only HEAD^ HEAD) &&
-	test "$changed" = "commit is"
-
-
-[master 3302250] partial commit to handle a file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 6 - partial
-
-expecting success: 
-
-	test_tick &&
-	git commit -m "partial commit to subdirectory" not &&
-
-	changed=$(git diff-tree -r --name-only HEAD^ HEAD) &&
-	test "$changed" = "not/forbid"
-
-
-[master 742b3a6] partial commit to subdirectory
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 7 - partial modification in a subdirectory
-
-expecting success: 
-
-	git rm not/forbid &&
-	git commit -m "partial commit to remove not/forbid" not &&
-
-	changed=$(git diff-tree -r --name-only HEAD^ HEAD) &&
-	test "$changed" = "not/forbid" &&
-	remain=$(git ls-tree -r --name-only HEAD) &&
-	test "$remain" = "commit is"
-
-
-rm 'not/forbid'
-[master 09fd303] partial commit to remove not/forbid
- Author: A U Thor <author@example.com>
- 1 file changed, 1 deletion(-)
- delete mode 100644 not/forbid
-ok 8 - partial removal
-
-expecting success: 
-
-	>positive &&
-	git add positive &&
-	git commit -s -m "thank you" &&
-	actual=$(git cat-file commit HEAD | sed -ne "s/Signed-off-by: //p") &&
-	expected=$(git var GIT_COMMITTER_IDENT | sed -e "s/>.*/>/") &&
-	test "z$actual" = "z$expected"
-
-
-[master cc1232b] thank you
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 positive
-ok 9 - sign off
-
-expecting success: 
-
-	>negative &&
-	git add negative &&
-	git commit -m "one" -m "two" -m "three" &&
-	actual=$(git cat-file commit HEAD | sed -e "1,/^\$/d") &&
-	expected=$(echo one; echo; echo two; echo; echo three) &&
-	test "z$actual" = "z$expected"
-
-
-[master 19f335d] one
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 negative
-ok 10 - multiple -m
-
-expecting success: 
-
-	echo minus >negative &&
-	git add negative &&
-	git status -v | sed -ne "/^diff --git /p" >actual &&
-	echo "diff --git a/negative b/negative" >expect &&
-	test_cmp expect actual
-
-
-ok 11 - verbose
-
-expecting success: 
-
-	test_config diff.noprefix true &&
-	git status -v >actual &&
-	grep "diff --git negative negative" actual
-
-diff --git negative negative
-ok 12 - verbose respects diff config
-
-expecting success: 
-	printf "%s" "$mesg_with_comment_and_newlines" >expect
-
-ok 13 - prepare file with comment line and trailing newlines
-
-expecting success: 
-
-	echo >>negative &&
-	git commit --cleanup=verbatim --no-status -t expect -a &&
-	git cat-file -p HEAD |sed -e "1,/^\$/d" >actual &&
-	test_cmp expect actual
-
-
-[master a8a362f] # text
- Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+)
-ok 14 - cleanup commit messages (verbatim option,-t)
-
-expecting success: 
-
-	echo >>negative &&
-	git commit --cleanup=verbatim -F expect -a &&
-	git cat-file -p HEAD |sed -e "1,/^\$/d">actual &&
-	test_cmp expect actual
-
-
-[master 1a798b1] # text
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 15 - cleanup commit messages (verbatim option,-F)
-
-expecting success: 
-
-	echo >>negative &&
-	git commit --cleanup=verbatim -m "$mesg_with_comment_and_newlines" -a &&
-	git cat-file -p HEAD |sed -e "1,/^\$/d">actual &&
-	test_cmp expect actual
-
-
-[master 980cf90] # text
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 16 - cleanup commit messages (verbatim option,-m)
-
-expecting success: 
-
-	echo >>negative &&
-	{ echo;echo "# text";echo; } >text &&
-	echo "# text" >expect &&
-	git commit --cleanup=whitespace -F text -a &&
-	git cat-file -p HEAD |sed -e "1,/^\$/d">actual &&
-	test_cmp expect actual
-
-
-[master 94a43e3] # text
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 17 - cleanup commit messages (whitespace option,-F)
-
-expecting success: 
-
-	echo >>negative &&
-	cat >text <<EOF &&
-
-# to be kept
-
-  # ------------------------ >8 ------------------------
-# to be kept, too
-# ------------------------ >8 ------------------------
-to be removed
-# ------------------------ >8 ------------------------
-to be removed, too
-EOF
-
-	cat >expect <<EOF &&
-# to be kept
-
-  # ------------------------ >8 ------------------------
-# to be kept, too
-EOF
-	git commit --cleanup=scissors -e -F text -a &&
-	git cat-file -p HEAD |sed -e "1,/^\$/d">actual &&
-	test_cmp expect actual
-
-[master 716e3cc] # to be kept
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 18 - cleanup commit messages (scissors option,-F,-e)
-
-expecting success: 
-
-	echo >>negative &&
-	cat >text <<EOF &&
-# ------------------------ >8 ------------------------
-to be removed
-EOF
-	git commit --cleanup=scissors -e -F text -a --allow-empty-message &&
-	git cat-file -p HEAD |sed -e "1,/^\$/d">actual &&
-	test_must_be_empty actual
-
-[master e7b5e59] 
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 19 - cleanup commit messages (scissors option,-F,-e, scissors on first line)
+ok 3 - preparing superproject
 
 expecting success: 
+	(
+		cd super &&
+		git submodule add --reference ../B "file://$base_dir/A" sub &&
+		git commit -m B-super-added &&
+		git repack -ad
+	) &&
+	test_alternate_is_used super/.git/modules/sub/objects/info/alternates super/sub
 
-	echo >>negative &&
-	{ echo;echo "# text";echo sample;echo; } >text &&
-	echo sample >expect &&
-	git commit --cleanup=strip -F text -a &&
-	git cat-file -p HEAD |sed -e "1,/^\$/d">actual &&
-	test_cmp expect actual
-
-
-[master c5e08a2] sample
+Cloning into '/build/git-2.20.1/t/trash directory.t7408-submodule-reference/super/sub'...
+[master e43ba21] B-super-added
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 20 - cleanup commit messages (strip option,-F)
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+ok 4 - submodule add --reference uses alternates
 
 expecting success: 
+	(
+		cd super &&
+		git submodule add --reference ../B --dissociate "file://$base_dir/A" sub-dissociate &&
+		git commit -m B-super-added &&
+		git repack -ad
+	) &&
+	test_path_is_missing super/.git/modules/sub-dissociate/objects/info/alternates
 
-	echo >>negative &&
-	{ echo;echo sample;echo; } >text &&
-	git commit -e -F text -a &&
-	head -n 4 .git/COMMIT_EDITMSG >actual
-
-[master 68ab696] sample
+Cloning into '/build/git-2.20.1/t/trash directory.t7408-submodule-reference/super/sub-dissociate'...
+[master 4fc1f88] B-super-added
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 21 - cleanup commit messages (strip option,-F,-e)
+ 2 files changed, 4 insertions(+)
+ create mode 160000 sub-dissociate
+ok 5 - submodule add --reference with --dissociate does not use alternates
 
 expecting success: 
-	test_i18ncmp expect actual
+	(
+		cd super/sub &&
+		echo "0 objects, 0 kilobytes" >expected &&
+		git count-objects >current &&
+		diff expected current
+	)
 
-ok 22 - cleanup commit messages (strip option,-F,-e): output
+ok 6 - that reference gets used with add
 
 expecting success: 
-	test_must_fail git commit --cleanup=non-existent
+	test_when_finished "rm -rf super-clone" &&
+	git clone super super-clone &&
+	git -C super-clone submodule update --init --reference ../B &&
+	test_alternate_is_used super-clone/.git/modules/sub/objects/info/alternates super-clone/sub
 
-fatal: Invalid cleanup mode non-existent
-ok 23 - cleanup commit message (fail on invalid cleanup mode option)
+Cloning into 'super-clone'...
+done.
+Submodule 'sub' (file:///build/git-2.20.1/t/trash directory.t7408-submodule-reference/A) registered for path 'sub'
+Submodule 'sub-dissociate' (file:///build/git-2.20.1/t/trash directory.t7408-submodule-reference/A) registered for path 'sub-dissociate'
+Cloning into '/build/git-2.20.1/t/trash directory.t7408-submodule-reference/super-clone/sub'...
+Cloning into '/build/git-2.20.1/t/trash directory.t7408-submodule-reference/super-clone/sub-dissociate'...
+Submodule path 'sub': checked out 'c080ca5a3b712a36d5d33dd4a945653695d744da'
+Submodule path 'sub-dissociate': checked out 'c080ca5a3b712a36d5d33dd4a945653695d744da'
+ok 7 - updating superproject keeps alternates
 
 expecting success: 
-	test_must_fail git -c commit.cleanup=non-existent commit
+	test_when_finished "rm -rf super-clone" &&
+	git clone super super-clone &&
+	git -C super-clone submodule update --init --reference ../B --dissociate &&
+	test_path_is_missing super-clone/.git/modules/sub/objects/info/alternates
 
-fatal: Invalid cleanup mode non-existent
-ok 24 - cleanup commit message (fail on invalid cleanup mode configuration)
+Cloning into 'super-clone'...
+done.
+Submodule 'sub' (file:///build/git-2.20.1/t/trash directory.t7408-submodule-reference/A) registered for path 'sub'
+Submodule 'sub-dissociate' (file:///build/git-2.20.1/t/trash directory.t7408-submodule-reference/A) registered for path 'sub-dissociate'
+Cloning into '/build/git-2.20.1/t/trash directory.t7408-submodule-reference/super-clone/sub'...
+Cloning into '/build/git-2.20.1/t/trash directory.t7408-submodule-reference/super-clone/sub-dissociate'...
+Submodule path 'sub': checked out 'c080ca5a3b712a36d5d33dd4a945653695d744da'
+Submodule path 'sub-dissociate': checked out 'c080ca5a3b712a36d5d33dd4a945653695d744da'
+ok 8 - updating superproject with --dissociate does not keep alternates
 
 expecting success: 
-	echo content >>file &&
-	git add file &&
+	test_when_finished "rm -rf super-clone" &&
+	git clone --reference super --recursive super super-clone &&
 	(
-	  test_set_editor "$TEST_DIRECTORY"/t7500/add-content-and-comment &&
-	  git commit --no-status
-	) &&
-	commit_msg_is "commit message"
+		cd super-clone &&
+		# test superproject has alternates setup correctly
+		test_alternate_is_used .git/objects/info/alternates . &&
+		# test submodule has correct setup
+		test_alternate_is_used .git/modules/sub/objects/info/alternates sub
+	)
 
-[master d6a2899] commit message
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-ok 25 - cleanup commit message (no config and no option uses default)
+Cloning into 'super-clone'...
+done.
+Submodule 'sub' (file:///build/git-2.20.1/t/trash directory.t7408-submodule-reference/A) registered for path 'sub'
+Submodule 'sub-dissociate' (file:///build/git-2.20.1/t/trash directory.t7408-submodule-reference/A) registered for path 'sub-dissociate'
+Cloning into '/build/git-2.20.1/t/trash directory.t7408-submodule-reference/super-clone/sub'...
+Cloning into '/build/git-2.20.1/t/trash directory.t7408-submodule-reference/super-clone/sub-dissociate'...
+Submodule path 'sub': checked out 'c080ca5a3b712a36d5d33dd4a945653695d744da'
+Submodule path 'sub-dissociate': checked out 'c080ca5a3b712a36d5d33dd4a945653695d744da'
+ok 9 - submodules use alternates when cloning a superproject
 
 expecting success: 
-	echo content >>file &&
-	git add file &&
+	test_when_finished "rm -rf super-clone" &&
+	git clone super super2 &&
+	test_must_fail git clone --recursive --reference super2 super2 super-clone &&
 	(
-	  test_set_editor "$TEST_DIRECTORY"/t7500/add-content-and-comment &&
-	  git commit --cleanup=whitespace --no-status
-	) &&
-	commit_msg_is "commit message # comment"
+		cd super-clone &&
+		# test superproject has alternates setup correctly
+		test_alternate_is_used .git/objects/info/alternates . &&
+		# update of the submodule succeeds
+		test_must_fail git submodule update --init &&
+		# and we have no alternates:
+		test_must_fail test_alternate_is_used .git/modules/sub/objects/info/alternates sub &&
+		test_must_fail test_path_is_file sub/file1
+	)
 
-[master 677ffe8] commit message # comment
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 26 - cleanup commit message (option overrides default)
+Cloning into 'super2'...
+done.
+Cloning into 'super-clone'...
+done.
+Submodule 'sub' (file:///build/git-2.20.1/t/trash directory.t7408-submodule-reference/A) registered for path 'sub'
+Submodule 'sub-dissociate' (file:///build/git-2.20.1/t/trash directory.t7408-submodule-reference/A) registered for path 'sub-dissociate'
+fatal: submodule 'sub' cannot add alternate: path '/build/git-2.20.1/t/trash directory.t7408-submodule-reference/super2/.git/modules/sub/' does not exist
+Failed to clone 'sub'. Retry scheduled
+fatal: submodule 'sub' cannot add alternate: path '/build/git-2.20.1/t/trash directory.t7408-submodule-reference/super2/.git/modules/sub/' does not exist
+Failed to clone 'sub' a second time, aborting
+fatal: submodule 'sub-dissociate' cannot add alternate: path '/build/git-2.20.1/t/trash directory.t7408-submodule-reference/super2/.git/modules/sub-dissociate/' does not exist
+Failed to clone 'sub-dissociate'. Retry scheduled
+fatal: submodule 'sub-dissociate' cannot add alternate: path '/build/git-2.20.1/t/trash directory.t7408-submodule-reference/super2/.git/modules/sub-dissociate/' does not exist
+Failed to clone 'sub-dissociate' a second time, aborting
+fatal: submodule 'sub' cannot add alternate: path '/build/git-2.20.1/t/trash directory.t7408-submodule-reference/super2/.git/modules/sub/' does not exist
+Failed to clone 'sub'. Retry scheduled
+fatal: submodule 'sub-dissociate' cannot add alternate: path '/build/git-2.20.1/t/trash directory.t7408-submodule-reference/super2/.git/modules/sub-dissociate/' does not exist
+Failed to clone 'sub-dissociate'. Retry scheduled
+fatal: submodule 'sub' cannot add alternate: path '/build/git-2.20.1/t/trash directory.t7408-submodule-reference/super2/.git/modules/sub/' does not exist
+Failed to clone 'sub' a second time, aborting
+/build/git-2.20.1/t/test-lib-functions.sh: line 617: .git/modules/sub/objects/info/alternates: No such file or directory
+/build/git-2.20.1/t/test-lib-functions.sh: line 617: test: =: unary operator expected
+test_line_count: line count for .git/modules/sub/objects/info/alternates != 1
+cat: .git/modules/sub/objects/info/alternates: No such file or directory
+File sub/file1 doesn't exist. 
+ok 10 - missing submodule alternate fails clone and submodule update
 
 expecting success: 
-	echo content >>file &&
-	git add file &&
+	test_when_finished "rm -rf super-clone" &&
+	git clone --reference-if-able super2 --recursive super2 super-clone &&
 	(
-	  test_set_editor "$TEST_DIRECTORY"/t7500/add-content-and-comment &&
-	  git -c commit.cleanup=whitespace commit --no-status
-	) &&
-	commit_msg_is "commit message # comment"
+		cd super-clone &&
+		# test superproject has alternates setup correctly
+		test_alternate_is_used .git/objects/info/alternates . &&
+		# update of the submodule succeeds
+		git submodule update --init &&
+		# and we have no alternates:
+		test_must_fail test_alternate_is_used .git/modules/sub/objects/info/alternates sub &&
+		test_path_is_file sub/file1
+	)
 
-[master 7403f47] commit message # comment
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 27 - cleanup commit message (config overrides default)
+Cloning into 'super-clone'...
+done.
+Submodule 'sub' (file:///build/git-2.20.1/t/trash directory.t7408-submodule-reference/A) registered for path 'sub'
+Submodule 'sub-dissociate' (file:///build/git-2.20.1/t/trash directory.t7408-submodule-reference/A) registered for path 'sub-dissociate'
+submodule 'sub' cannot add alternate: path '/build/git-2.20.1/t/trash directory.t7408-submodule-reference/super2/.git/modules/sub/' does not existCloning into '/build/git-2.20.1/t/trash directory.t7408-submodule-reference/super-clone/sub'...
+submodule 'sub-dissociate' cannot add alternate: path '/build/git-2.20.1/t/trash directory.t7408-submodule-reference/super2/.git/modules/sub-dissociate/' does not existCloning into '/build/git-2.20.1/t/trash directory.t7408-submodule-reference/super-clone/sub-dissociate'...
+Submodule path 'sub': checked out 'c080ca5a3b712a36d5d33dd4a945653695d744da'
+Submodule path 'sub-dissociate': checked out 'c080ca5a3b712a36d5d33dd4a945653695d744da'
+/build/git-2.20.1/t/test-lib-functions.sh: line 617: .git/modules/sub/objects/info/alternates: No such file or directory
+/build/git-2.20.1/t/test-lib-functions.sh: line 617: test: =: unary operator expected
+test_line_count: line count for .git/modules/sub/objects/info/alternates != 1
+cat: .git/modules/sub/objects/info/alternates: No such file or directory
+ok 11 - ignoring missing submodule alternates passes clone and submodule update
 
 expecting success: 
-	echo content >>file &&
-	git add file &&
+	test_create_repo supersuper &&
 	(
-	  test_set_editor "$TEST_DIRECTORY"/t7500/add-content-and-comment &&
-	  git -c commit.cleanup=whitespace commit --cleanup=default
+		cd supersuper &&
+		echo "I am super super." >file &&
+		git add file &&
+		git commit -m B-super-super-initial &&
+		git submodule add "file://$base_dir/super" subwithsub &&
+		git commit -m B-super-super-added &&
+		git submodule update --init --recursive &&
+		git repack -ad
 	) &&
-	commit_msg_is "commit message"
-
-[master 7dda181] commit message
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 28 - cleanup commit message (option overrides config)
-
-expecting success: 
-	echo content >>file &&
-	git add file &&
-	git commit -m "message #comment " &&
-	commit_msg_is "message #comment"
-
-[master 1a59102] message #comment
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 29 - cleanup commit message (default, -m)
-
-expecting success: 
-	echo content >>file &&
-	git add file &&
-	git commit --cleanup=whitespace --no-status -m "message #comment " &&
-	commit_msg_is "message #comment"
+	git clone supersuper supersuper2 &&
+	(
+		cd supersuper2 &&
+		git submodule update --init
+	)
 
-[master a3a10c1] message #comment
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7408-submodule-reference/supersuper/.git/
+[master (root-commit) 0ee2938] B-super-super-initial
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-ok 30 - cleanup commit message (whitespace option, -m)
-
-expecting success: 
-	echo content >>file &&
-	git add file &&
-	git -c commit.cleanup=whitespace commit --no-status -m "message #comment " &&
-	commit_msg_is "message #comment"
-
-[master 5e53dc8] message #comment
+ create mode 100644 file
+Cloning into '/build/git-2.20.1/t/trash directory.t7408-submodule-reference/supersuper/subwithsub'...
+[master d02012c] B-super-super-added
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 31 - cleanup commit message (whitespace config, -m)
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 subwithsub
+Submodule 'sub' (file:///build/git-2.20.1/t/trash directory.t7408-submodule-reference/A) registered for path 'subwithsub/sub'
+Submodule 'sub-dissociate' (file:///build/git-2.20.1/t/trash directory.t7408-submodule-reference/A) registered for path 'subwithsub/sub-dissociate'
+Cloning into '/build/git-2.20.1/t/trash directory.t7408-submodule-reference/supersuper/subwithsub/sub'...
+Cloning into '/build/git-2.20.1/t/trash directory.t7408-submodule-reference/supersuper/subwithsub/sub-dissociate'...
+Submodule path 'subwithsub/sub': checked out 'c080ca5a3b712a36d5d33dd4a945653695d744da'
+Submodule path 'subwithsub/sub-dissociate': checked out 'c080ca5a3b712a36d5d33dd4a945653695d744da'
+Cloning into 'supersuper2'...
+done.
+Submodule 'subwithsub' (file:///build/git-2.20.1/t/trash directory.t7408-submodule-reference/super) registered for path 'subwithsub'
+Cloning into '/build/git-2.20.1/t/trash directory.t7408-submodule-reference/supersuper2/subwithsub'...
+Submodule path 'subwithsub': checked out '4fc1f884702baddd89cd3fa34758e56ee39cadaf'
+ok 12 - preparing second superproject with a nested submodule plus partial clone
 
 expecting success: 
-	echo >>negative &&
-	git commit -e -m "sample" -a &&
-	test_i18ngrep \
-	  "^# Author: *A U Thor <author@example.com>\$" \
-	  .git/COMMIT_EDITMSG
+	test_when_finished "rm -rf supersuper-clone" &&
+	git clone --recursive --reference supersuper supersuper supersuper-clone &&
+	(
+		cd supersuper-clone &&
+		# test superproject has alternates setup correctly
+		test_alternate_is_used .git/objects/info/alternates . &&
+		# immediate submodule has alternate:
+		test_alternate_is_used .git/modules/subwithsub/objects/info/alternates subwithsub &&
+		# nested submodule also has alternate:
+		test_alternate_is_used .git/modules/subwithsub/modules/sub/objects/info/alternates subwithsub/sub
+	)
 
-[master 412b92d] sample
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-# Author:    A U Thor <author@example.com>
-ok 32 - message shows author when it is not equal to committer
+Cloning into 'supersuper-clone'...
+done.
+Submodule 'subwithsub' (file:///build/git-2.20.1/t/trash directory.t7408-submodule-reference/super) registered for path 'subwithsub'
+Cloning into '/build/git-2.20.1/t/trash directory.t7408-submodule-reference/supersuper-clone/subwithsub'...
+Submodule path 'subwithsub': checked out '4fc1f884702baddd89cd3fa34758e56ee39cadaf'
+Submodule 'sub' (file:///build/git-2.20.1/t/trash directory.t7408-submodule-reference/A) registered for path 'subwithsub/sub'
+Submodule 'sub-dissociate' (file:///build/git-2.20.1/t/trash directory.t7408-submodule-reference/A) registered for path 'subwithsub/sub-dissociate'
+Cloning into '/build/git-2.20.1/t/trash directory.t7408-submodule-reference/supersuper-clone/subwithsub/sub'...
+Cloning into '/build/git-2.20.1/t/trash directory.t7408-submodule-reference/supersuper-clone/subwithsub/sub-dissociate'...
+Submodule path 'subwithsub/sub': checked out 'c080ca5a3b712a36d5d33dd4a945653695d744da'
+Submodule path 'subwithsub/sub-dissociate': checked out 'c080ca5a3b712a36d5d33dd4a945653695d744da'
+ok 13 - nested submodule alternate in works and is actually used
 
 expecting success: 
-	git commit --allow-empty -e -m foo --date="2010-01-02T03:04:05" &&
-	test_i18ngrep \
-	  "^# Date: *Sat Jan 2 03:04:05 2010 +0000" \
-	  .git/COMMIT_EDITMSG
-
-[master e7428d3] foo
- Author: A U Thor <author@example.com>
- Date: Sat Jan 2 03:04:05 2010 +0000
-# Date:      Sat Jan 2 03:04:05 2010 +0000
-ok 33 - message shows date when it is explicitly set
-
-checking prerequisite: AUTOIDENT
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
-	sane_unset GIT_AUTHOR_NAME &&
-	sane_unset GIT_AUTHOR_EMAIL &&
-	git var GIT_AUTHOR_IDENT
-
-)
-
-*** 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@ionos1-amd64.debian.net>) not allowed
-prerequisite AUTOIDENT not satisfied
-skipping test: message shows committer when it is automatic 
-
-	echo >>negative &&
+	test_when_finished "rm -rf supersuper-clone" &&
+	test_must_fail git clone --recursive --reference supersuper2 supersuper2 supersuper-clone &&
 	(
-		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_i18ngrep "^# Committer: " .git/COMMIT_EDITMSG
+		cd supersuper-clone &&
+		check_that_two_of_three_alternates_are_used &&
+		# update of the submodule fails
+		test_must_fail git submodule update --init --recursive
+	)
 
-ok 34 # skip message shows committer when it is automatic (missing AUTOIDENT)
+Cloning into 'supersuper-clone'...
+done.
+Submodule 'subwithsub' (file:///build/git-2.20.1/t/trash directory.t7408-submodule-reference/super) registered for path 'subwithsub'
+Cloning into '/build/git-2.20.1/t/trash directory.t7408-submodule-reference/supersuper-clone/subwithsub'...
+Submodule path 'subwithsub': checked out '4fc1f884702baddd89cd3fa34758e56ee39cadaf'
+Submodule 'sub' (file:///build/git-2.20.1/t/trash directory.t7408-submodule-reference/A) registered for path 'subwithsub/sub'
+Submodule 'sub-dissociate' (file:///build/git-2.20.1/t/trash directory.t7408-submodule-reference/A) registered for path 'subwithsub/sub-dissociate'
+fatal: submodule 'sub' cannot add alternate: path '/build/git-2.20.1/t/trash directory.t7408-submodule-reference/supersuper2/.git/modules/subwithsub/modules/sub/' does not exist
+Failed to clone 'sub'. Retry scheduled
+fatal: submodule 'sub' cannot add alternate: path '/build/git-2.20.1/t/trash directory.t7408-submodule-reference/supersuper2/.git/modules/subwithsub/modules/sub/' does not exist
+Failed to clone 'sub' a second time, aborting
+fatal: submodule 'sub-dissociate' cannot add alternate: path '/build/git-2.20.1/t/trash directory.t7408-submodule-reference/supersuper2/.git/modules/subwithsub/modules/sub-dissociate/' does not exist
+Failed to clone 'sub-dissociate'. Retry scheduled
+fatal: submodule 'sub-dissociate' cannot add alternate: path '/build/git-2.20.1/t/trash directory.t7408-submodule-reference/supersuper2/.git/modules/subwithsub/modules/sub-dissociate/' does not exist
+Failed to clone 'sub-dissociate' a second time, aborting
+Failed to recurse into submodule path 'subwithsub'
+/build/git-2.20.1/t/test-lib-functions.sh: line 617: .git/modules/subwithsub/modules/sub/objects/info/alternates: No such file or directory
+/build/git-2.20.1/t/test-lib-functions.sh: line 617: test: =: unary operator expected
+test_line_count: line count for .git/modules/subwithsub/modules/sub/objects/info/alternates != 1
+cat: .git/modules/subwithsub/modules/sub/objects/info/alternates: No such file or directory
+fatal: submodule 'sub' cannot add alternate: path '/build/git-2.20.1/t/trash directory.t7408-submodule-reference/supersuper2/.git/modules/subwithsub/modules/sub/' does not exist
+Failed to clone 'sub'. Retry scheduled
+fatal: submodule 'sub-dissociate' cannot add alternate: path '/build/git-2.20.1/t/trash directory.t7408-submodule-reference/supersuper2/.git/modules/subwithsub/modules/sub-dissociate/' does not exist
+Failed to clone 'sub-dissociate'. Retry scheduled
+fatal: submodule 'sub' cannot add alternate: path '/build/git-2.20.1/t/trash directory.t7408-submodule-reference/supersuper2/.git/modules/subwithsub/modules/sub/' does not exist
+Failed to clone 'sub' a second time, aborting
+fatal: submodule 'sub-dissociate' cannot add alternate: path '/build/git-2.20.1/t/trash directory.t7408-submodule-reference/supersuper2/.git/modules/subwithsub/modules/sub-dissociate/' does not exist
+Failed to clone 'sub-dissociate' a second time, aborting
+Failed to recurse into submodule path 'subwithsub'
+ok 14 - missing nested submodule alternate fails clone and submodule update
 
 expecting success: 
-	>.git/result &&
-
-	echo >>negative &&
+	test_when_finished "rm -rf supersuper-clone" &&
+	git clone --recursive --reference-if-able supersuper2 supersuper2 supersuper-clone &&
 	(
-		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
-
-
-*** 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.
+		cd supersuper-clone &&
+		check_that_two_of_three_alternates_are_used &&
+		# update of the submodule succeeds
+		git submodule update --init --recursive
+	)
 
-fatal: empty ident name (for <pbuilder1@ionos1-amd64.debian.net>) not allowed
-ok 35 - do not fire editor when committer is bogus
+Cloning into 'supersuper-clone'...
+done.
+Submodule 'subwithsub' (file:///build/git-2.20.1/t/trash directory.t7408-submodule-reference/super) registered for path 'subwithsub'
+Cloning into '/build/git-2.20.1/t/trash directory.t7408-submodule-reference/supersuper-clone/subwithsub'...
+Submodule path 'subwithsub': checked out '4fc1f884702baddd89cd3fa34758e56ee39cadaf'
+Submodule 'sub' (file:///build/git-2.20.1/t/trash directory.t7408-submodule-reference/A) registered for path 'subwithsub/sub'
+Submodule 'sub-dissociate' (file:///build/git-2.20.1/t/trash directory.t7408-submodule-reference/A) registered for path 'subwithsub/sub-dissociate'
+submodule 'sub' cannot add alternate: path '/build/git-2.20.1/t/trash directory.t7408-submodule-reference/supersuper2/.git/modules/subwithsub/modules/sub/' does not existCloning into '/build/git-2.20.1/t/trash directory.t7408-submodule-reference/supersuper-clone/subwithsub/sub'...
+submodule 'sub-dissociate' cannot add alternate: path '/build/git-2.20.1/t/trash directory.t7408-submodule-reference/supersuper2/.git/modules/subwithsub/modules/sub-dissociate/' does not existCloning into '/build/git-2.20.1/t/trash directory.t7408-submodule-reference/supersuper-clone/subwithsub/sub-dissociate'...
+Submodule path 'subwithsub/sub': checked out 'c080ca5a3b712a36d5d33dd4a945653695d744da'
+Submodule path 'subwithsub/sub-dissociate': checked out 'c080ca5a3b712a36d5d33dd4a945653695d744da'
+/build/git-2.20.1/t/test-lib-functions.sh: line 617: .git/modules/subwithsub/modules/sub/objects/info/alternates: No such file or directory
+/build/git-2.20.1/t/test-lib-functions.sh: line 617: test: =: unary operator expected
+test_line_count: line count for .git/modules/subwithsub/modules/sub/objects/info/alternates != 1
+cat: .git/modules/subwithsub/modules/sub/objects/info/alternates: No such file or directory
+ok 15 - missing nested submodule alternate in --reference-if-able mode
 
+# passed all 15 test(s)
+1..15
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t7504-commit-msg-hook.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7504-commit-msg-hook/.git/
 expecting success: 
-	echo tick >file &&
-	git add file &&
-	echo "editor not started" >.git/result &&
-	(GIT_EDITOR="\"$(pwd)/.git/FAKE_EDITOR\"" git commit -m tick) &&
-	test "$(cat .git/result)" = "editor not started"
-
-[master aec1a61] tick
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 7 deletions(-)
-ok 36 - do not fire editor if -m <msg> was given
 
-expecting success: 
-	echo tock >file &&
+	echo "foo" > file &&
 	git add file &&
-	echo "editor not started" >.git/result &&
-	(GIT_EDITOR="\"$(pwd)/.git/FAKE_EDITOR\"" \
-	 git commit -m "" --allow-empty-message) &&
-	test "$(cat .git/result)" = "editor not started"
-
-[master 4b7f1d9] 
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 37 - do not fire editor if -m "" was given
-
-expecting success: 
+	git commit -m "first"
 
-	git clean -f &&
-	echo f >g &&
-	git add g &&
-	git commit -m "add g" &&
-	git branch second &&
-	echo master >g &&
-	echo g >h &&
-	git add g h &&
-	git commit -m "modify g and add h" &&
-	git checkout second &&
-	echo second >g &&
-	git add g &&
-	git commit -m second &&
-	# Must fail due to conflict
-	test_must_fail git cherry-pick -n master &&
-	echo "editor not started" >.git/result &&
-	(
-		GIT_EDITOR="\"$(pwd)/.git/FAKE_EDITOR\"" &&
-		export GIT_EDITOR &&
-		test_must_fail git commit
-	) &&
-	test "$(cat .git/result)" = "editor not started"
 
-Removing act
-Removing actual
-Removing commit_msg_is.actual
-Removing commit_msg_is.expect
-Removing current.1
-Removing current.2
-Removing exp
-Removing expect
-Removing text
-[master 3ff9a0e] add g
+[master (root-commit) 812f920] first
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 g
-[master 5dec94d] 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 1280b60] 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 5dec94d... modify g and add h
-hint: after resolving the conflicts, mark the corrected paths
-hint: with 'git add <paths>' or 'git rm <paths>'
-error: Committing is not possible because you have unmerged files.
-hint: Fix them up in the work tree, and then use 'git add/rm <file>'
-hint: as appropriate to mark resolution and make a commit.
-fatal: Exiting because of an unresolved conflict.
-U	g
-ok 38 - do not fire editor in the presence of conflicts
-
-expecting success: 
-	echo >>negative &&
-	! "$SHELL_PATH" -c '
-	  echo kill -TERM $$ >> .git/FAKE_EDITOR
-	  GIT_EDITOR=.git/FAKE_EDITOR
-	  export GIT_EDITOR
-	  exec git commit -a' &&
-	test ! -f .git/index.lock
-
-Terminated
-ok 39 - a SIGTERM should break locks
+ create mode 100644 file
+ok 1 - with no hook
 
 expecting success: 
 
-	git rev-parse second master >expect &&
-	test_must_fail git merge second master &&
-	git checkout master g &&
-	EDITOR=: git commit -a &&
-	git cat-file commit HEAD | sed -n -e "s/^parent //p" -e "/^$/q" >actual &&
-	test_cmp expect actual
+	echo "more foo" >> file &&
+	git add file &&
+	echo "more foo" > FAKE_MSG &&
+	GIT_EDITOR="\"\$FAKE_EDITOR\"" git commit
 
 
-Merging:
-virtual second
-virtual master
-found 1 common ancestor:
-3ff9a0e add g
-Auto-merging g
-CONFLICT (content): Merge conflict in g
-Automatic merge failed; fix conflicts and then commit the result.
-[second a7f8177] Merge branch 'master' into second
+[master b4e0d1d] more foo
  Author: A U Thor <author@example.com>
-ok 40 - Hand committing of a redundant merge removes dups
+ 1 file changed, 1 insertion(+)
+ok 2 - with no hook (editor)
 
 expecting success: 
 
-	git reset --hard &&
-	git commit -s -m "hello: kitty" --allow-empty &&
-	git cat-file commit HEAD | sed -e "1,/^$/d" >actual &&
-	test_line_count = 3 actual
+	echo "bar" > file &&
+	git add file &&
+	git commit --no-verify -m "bar"
 
 
-HEAD is now at a7f8177 Merge branch 'master' into second
-[second 2e95f37] hello: kitty
+[master 1606380] bar
  Author: A U Thor <author@example.com>
-ok 41 - A single-liner subject with a token plus colon is not a footer
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+ok 3 - --no-verify with no hook
 
 expecting success: 
-	git commit -s --allow-empty --allow-empty-message &&
-	cat <<-EOF >expect &&
 
+	echo "more bar" > file &&
+	git add file &&
+	echo "more bar" > FAKE_MSG &&
+	GIT_EDITOR="\"\$FAKE_EDITOR\"" git commit --no-verify
 
-	Signed-off-by: $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>
-
-	EOF
-	sed -e "/^#/d" -e "s/^:.*//" .git/COMMIT_EDITMSG >actual &&
-	test_cmp expect actual
 
-[second ffd414a] Signed-off-by: C O Mitter <committer@example.com>
+[master 198ba89] more bar
  Author: A U Thor <author@example.com>
-ok 42 - commit -s places sob on third line after two empty lines
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 4 - --no-verify with no hook (editor)
 
 expecting success: 
-		try_commit "" &&
-		test_i18ngrep "^# Changes to be committed:" .git/COMMIT_EDITMSG
-	
-HEAD is now at ffd414a Signed-off-by: C O Mitter <committer@example.com>
-[second 9d1d908] message
+
+	echo "more" >> file &&
+	git add file &&
+	git commit -m "more"
+
+
+[master 549cac7] more
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-# Changes to be committed:
-ok 43 - commit
+ok 5 - with succeeding hook
 
 expecting success: 
-		try_commit --status &&
-		test_i18ngrep "^# Changes to be committed:" .git/COMMIT_EDITMSG
-	
-HEAD is now at 9d1d908 message
-[second 163b75c] message
+
+	echo "more more" >> file &&
+	git add file &&
+	echo "more more" > FAKE_MSG &&
+	GIT_EDITOR="\"\$FAKE_EDITOR\"" git commit
+
+
+[master e6b1e16] more more
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-# Changes to be committed:
-ok 44 - commit --status
+ok 6 - with succeeding hook (editor)
 
 expecting success: 
-		try_commit --no-status &&
-		test_i18ngrep ! "^# Changes to be committed:" .git/COMMIT_EDITMSG
-	
-HEAD is now at 163b75c message
-[second 257ad01] message
+
+	echo "even more" >> file &&
+	git add file &&
+	git commit --no-verify -m "even more"
+
+
+[master 37dc500] even more
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-ok 45 - commit --no-status
+ok 7 - --no-verify with succeeding hook
 
 expecting success: 
-		test_config commit.status yes &&
-		try_commit "" &&
-		test_i18ngrep "^# Changes to be committed:" .git/COMMIT_EDITMSG
-	
-HEAD is now at 257ad01 message
-[second 0a95875] message
+
+	echo "even more more" >> file &&
+	git add file &&
+	echo "even more more" > FAKE_MSG &&
+	GIT_EDITOR="\"\$FAKE_EDITOR\"" git commit --no-verify
+
+
+[master f6bcbf3] even more more
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-# Changes to be committed:
-ok 46 - commit with commit.status = yes
+ok 8 - --no-verify with succeeding hook (editor)
 
 expecting success: 
-		test_config commit.status no &&
-		try_commit "" &&
-		test_i18ngrep ! "^# Changes to be committed:" .git/COMMIT_EDITMSG
-	
-HEAD is now at 0a95875 message
-[second 06f9db0] message
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 47 - commit with commit.status = no
+
+	echo "another" >> file &&
+	git add file &&
+	test_must_fail git commit -m "another"
+
+
+ok 9 - with failing hook
 
 expecting success: 
-		test_config commit.status yes &&
-		try_commit --status &&
-		test_i18ngrep "^# Changes to be committed:" .git/COMMIT_EDITMSG
-	
-HEAD is now at 06f9db0 message
-[second ec82c00] message
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-# Changes to be committed:
-ok 48 - commit --status with commit.status = yes
+
+	echo "more another" >> file &&
+	git add file &&
+	echo "more another" > FAKE_MSG &&
+	! (GIT_EDITOR="\"\$FAKE_EDITOR\"" git commit)
+
+
+ok 10 - with failing hook (editor)
 
 expecting success: 
-		test_config commit.status yes &&
-		try_commit --no-status &&
-		test_i18ngrep ! "^# Changes to be committed:" .git/COMMIT_EDITMSG
-	
-HEAD is now at ec82c00 message
-[second 26a4e77] message
+
+	echo "stuff" >> file &&
+	git add file &&
+	git commit --no-verify -m "stuff"
+
+
+[master 287e9ab] stuff
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 49 - commit --no-status with commit.status = yes
+ 1 file changed, 3 insertions(+)
+ok 11 - --no-verify with failing hook
 
 expecting success: 
-		test_config commit.status no &&
-		try_commit --status &&
-		test_i18ngrep "^# Changes to be committed:" .git/COMMIT_EDITMSG
-	
-HEAD is now at 26a4e77 message
-[second 88c22f0] message
+
+	echo "more stuff" >> file &&
+	git add file &&
+	echo "more stuff" > FAKE_MSG &&
+	GIT_EDITOR="\"\$FAKE_EDITOR\"" git commit --no-verify
+
+
+[master 70fdc17] more stuff
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-# Changes to be committed:
-ok 50 - commit --status with commit.status = no
+ok 12 - --no-verify with failing hook (editor)
 
 expecting success: 
-		test_config commit.status no &&
-		try_commit --no-status &&
-		test_i18ngrep ! "^# Changes to be committed:" .git/COMMIT_EDITMSG
-	
-HEAD is now at 88c22f0 message
-[second 4162d6a] message
+
+	test_when_finished "git branch -D newbranch" &&
+	test_when_finished "git checkout -f master" &&
+	git checkout --orphan newbranch &&
+	: >file2 &&
+	git add file2 &&
+	git commit --no-verify file2 -m in-side-branch &&
+	test_must_fail git merge --allow-unrelated-histories master &&
+	commit_msg_is "in-side-branch" # HEAD before merge
+
+
+Switched to a new branch 'newbranch'
+[newbranch (root-commit) beb7ed1] in-side-branch
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 51 - commit --no-status with commit.status = no
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 file2
+error: Your local changes to the following files would be overwritten by merge:
+  file
+Merging:
+beb7ed1 in-side-branch
+virtual master
+found 0 common ancestors:
+Switched to branch 'master'
+Deleted branch newbranch (was beb7ed1).
+ok 13 - merge fails with failing hook
 
 expecting success: 
-		try_commit "" &&
-		test_i18ngrep "^# Changes to be committed:" .git/COMMIT_EDITMSG
-	
-HEAD is now at 4162d6a message
-[second 979a7d8] message
+
+	test_when_finished "git branch -D newbranch" &&
+	test_when_finished "git checkout -f master" &&
+	git checkout --orphan newbranch &&
+	git rm -f file &&
+	: >file2 &&
+	git add file2 &&
+	git commit --no-verify file2 -m in-side-branch &&
+	git merge --no-verify --allow-unrelated-histories master &&
+	commit_msg_is "Merge branch 'master' into newbranch"
+
+Switched to a new branch 'newbranch'
+rm 'file'
+[newbranch (root-commit) beb7ed1] in-side-branch
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-## Custom template
-# Changes to be committed:
-ok 52 - commit
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 file2
+Merging:
+beb7ed1 in-side-branch
+virtual master
+found 0 common ancestors:
+Merge made by the 'recursive' strategy.
+ file | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+ create mode 100644 file
+Switched to branch 'master'
+Deleted branch newbranch (was 37a0c25).
+ok 14 - merge bypasses failing hook with --no-verify
 
 expecting success: 
-		try_commit --status &&
-		test_i18ngrep "^# Changes to be committed:" .git/COMMIT_EDITMSG
-	
-HEAD is now at 979a7d8 message
-[second b35d24b] message
+
+	echo "content" >file &&
+	git add file &&
+	git commit -m "content"
+
+
+hint: The '.git/hooks/commit-msg' hook was ignored because it's not set as executable.
+hint: You can disable this warning with `git config advice.ignoredHook false`.
+[master c7917fe] content
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-## Custom template
-# Changes to be committed:
-ok 53 - commit --status
+ 1 file changed, 1 insertion(+), 9 deletions(-)
+ok 15 - with non-executable hook
 
 expecting success: 
-		try_commit --no-status &&
-		test_i18ngrep ! "^# Changes to be committed:" .git/COMMIT_EDITMSG
-	
-HEAD is now at b35d24b message
-[second 286a37c] message
+
+	echo "content again" >> file &&
+	git add file &&
+	echo "content again" > FAKE_MSG &&
+	GIT_EDITOR="\"\$FAKE_EDITOR\"" git commit -m "content again"
+
+
+hint: The '.git/hooks/commit-msg' hook was ignored because it's not set as executable.
+hint: You can disable this warning with `git config advice.ignoredHook false`.
+[master 2811b44] content again
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-## Custom template
-ok 54 - commit --no-status
+ok 16 - with non-executable hook (editor)
 
 expecting success: 
-		test_config commit.status yes &&
-		try_commit "" &&
-		test_i18ngrep "^# Changes to be committed:" .git/COMMIT_EDITMSG
-	
-HEAD is now at 286a37c message
-[second 0a3b97e] message
+
+	echo "more content" >> file &&
+	git add file &&
+	git commit --no-verify -m "more content"
+
+
+[master e6ff5c2] more content
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-## Custom template
-# Changes to be committed:
-ok 55 - commit with commit.status = yes
+ok 17 - --no-verify with non-executable hook
 
 expecting success: 
-		test_config commit.status no &&
-		try_commit "" &&
-		test_i18ngrep ! "^# Changes to be committed:" .git/COMMIT_EDITMSG
-	
-HEAD is now at 0a3b97e message
-[second e5e0da2] message
+
+	echo "even more content" >> file &&
+	git add file &&
+	echo "even more content" > FAKE_MSG &&
+	GIT_EDITOR="\"\$FAKE_EDITOR\"" git commit --no-verify
+
+
+[master b282bae] even more content
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-## Custom template
-ok 56 - commit with commit.status = no
+ok 18 - --no-verify with non-executable hook (editor)
 
 expecting success: 
-		test_config commit.status yes &&
-		try_commit --status &&
-		test_i18ngrep "^# Changes to be committed:" .git/COMMIT_EDITMSG
-	
-HEAD is now at e5e0da2 message
-[second cfd2dca] message
+
+	echo "additional" >> file &&
+	git add file &&
+	git commit -m "additional" &&
+	commit_msg_is "new message"
+
+
+[master 1898836] new message
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-## Custom template
-# Changes to be committed:
-ok 57 - commit --status with commit.status = yes
+ok 19 - hook edits commit message
 
 expecting success: 
-		test_config commit.status yes &&
-		try_commit --no-status &&
-		test_i18ngrep ! "^# Changes to be committed:" .git/COMMIT_EDITMSG
-	
-HEAD is now at cfd2dca message
-[second b990741] message
+
+	echo "additional content" >> file &&
+	git add file &&
+	echo "additional content" > FAKE_MSG &&
+	GIT_EDITOR="\"\$FAKE_EDITOR\"" git commit &&
+	commit_msg_is "new message"
+
+
+[master 1f1b742] new message
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-## Custom template
-ok 58 - commit --no-status with commit.status = yes
+ok 20 - hook edits commit message (editor)
 
 expecting success: 
-		test_config commit.status no &&
-		try_commit --status &&
-		test_i18ngrep "^# Changes to be committed:" .git/COMMIT_EDITMSG
-	
-HEAD is now at b990741 message
-[second 16eedb9] message
+
+	echo "plus" >> file &&
+	git add file &&
+	git commit --no-verify -m "plus" &&
+	commit_msg_is "plus"
+
+
+[master d65fe14] plus
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-## Custom template
-# Changes to be committed:
-ok 59 - commit --status with commit.status = no
+ok 21 - hook doesn't edit commit message
 
 expecting success: 
-		test_config commit.status no &&
-		try_commit --no-status &&
-		test_i18ngrep ! "^# Changes to be committed:" .git/COMMIT_EDITMSG
-	
-HEAD is now at 16eedb9 message
-[second c2eb408] message
+
+	echo "more plus" >> file &&
+	git add file &&
+	echo "more plus" > FAKE_MSG &&
+	GIT_EDITOR="\"\$FAKE_EDITOR\"" git commit --no-verify &&
+	commit_msg_is "more plus"
+
+[master d05da86] more plus
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-## Custom template
-ok 60 - commit --no-status with commit.status = no
+ok 22 - hook doesn't edit commit message (editor)
 
 expecting success: 
-	test_config core.commentchar ";" &&
-	try_commit --status &&
-	test_i18ngrep "^; Changes to be committed:" .git/COMMIT_EDITMSG
+	test_when_finished "git branch -D newbranch" &&
+	test_when_finished "git checkout -f master" &&
+	git checkout --orphan newbranch &&
+	git rm -f file &&
+	: >file2 &&
+	git add file2 &&
+	git commit --no-verify file2 -m in-side-branch &&
+	git merge --allow-unrelated-histories master &&
+	commit_msg_is "new message"
 
-HEAD is now at c2eb408 message
-[second 18cb8f8] message ## Custom template
+Switched to a new branch 'newbranch'
+rm 'file'
+[newbranch (root-commit) 8a0f169] in-side-branch
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-## Custom template
-; Changes to be committed:
-ok 61 - commit --status with custom comment character
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 file2
+Merging:
+8a0f169 in-side-branch
+virtual master
+found 0 common ancestors:
+Merge made by the 'recursive' strategy.
+ file | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+ create mode 100644 file
+Switched to branch 'master'
+Deleted branch newbranch (was d5e6fe0).
+ok 23 - hook called in git-merge picks up commit message
 
-expecting success: 
-	test_commit "#foo" foo &&
-	GIT_EDITOR=.git/FAKE_EDITOR git -c core.commentChar=auto commit --amend &&
-	test_i18ngrep "^; Changes to be committed:" .git/COMMIT_EDITMSG
+checking known breakage: 
+	test_when_finished "git branch -D newbranch" &&
+	test_when_finished "git checkout -f master" &&
+	git checkout master &&
+	echo a >file2 &&
+	git add file2 &&
+	git commit --no-verify -m "add file2 to master" &&
+	git checkout -b newbranch master^ &&
+	echo b >file2 &&
+	git add file2 &&
+	git commit --no-verify file2 -m in-side-branch &&
+	git merge --no-verify -m not-rewritten-by-hook master &&
+	# resolve conflict:
+	echo c >file2 &&
+	git add file2 &&
+	git merge --continue &&
+	commit_msg_is not-rewritten-by-hook
 
-[second 97533e0] #foo
+Already on 'master'
+[master 12252be] add file2 to master
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 foo
-[second 8598a1a] message #foo
+ create mode 100644 file2
+Switched to a new branch 'newbranch'
+[newbranch 2bbfbe3] in-side-branch
  Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:23:13 2005 -0700
  1 file changed, 1 insertion(+)
- create mode 100644 foo
-; Changes to be committed:
-ok 62 - switch core.commentchar
+ create mode 100644 file2
+Merging:
+2bbfbe3 in-side-branch
+virtual master
+found 1 common ancestor:
+d05da86 more plus
+Auto-merging file2
+CONFLICT (add/add): Merge conflict in file2
+Automatic merge failed; fix conflicts and then commit the result.
+Switched to branch 'master'
+Deleted branch newbranch (was 2bbfbe3).
+not ok 24 - merge --continue remembers --no-verify # TODO known breakage
 
 expecting success: 
-	cat >text <<\EOF &&
-# 1
-; 2
-@ 3
-! 4
-$ 5
-% 6
-^ 7
-& 8
-| 9
-: 10
-EOF
-	git commit --amend -F text &&
-	(
-		test_set_editor .git/FAKE_EDITOR &&
-		test_must_fail git -c core.commentChar=auto commit --amend
-	)
 
-[second 1655339] # 1 ; 2 @ 3 ! 4 $ 5 % 6 ^ 7 & 8 | 9 : 10
+	GIT_SEQUENCE_EDITOR="\"$REWORD_EDITOR\"" git rebase -i HEAD^ &&
+	commit_msg_is "new message"
+
+
+Rebasing (1/1)
[detached HEAD dc73e58] new message
  Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:23:13 2005 -0700
+ Date: Thu Jan 5 11:49:56 2023 +0000
  1 file changed, 1 insertion(+)
- create mode 100644 foo
-fatal: unable to select a comment character that is not used
-in the current commit message
-ok 63 - switch core.commentchar but out of options
+ create mode 100644 file2
+Successfully rebased and updated refs/heads/master.
+ok 25 - hook is called for reword during `rebase -i`
 
-# passed all 63 test(s)
-1..63
+# still have 1 known breakage(s)
+# passed all remaining 24 test(s)
+1..25
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t7510-signed-commit.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7510-signed-commit/.git/
+skipping test: create signed commits 
+	test_when_finished "test_unconfig commit.gpgsign" &&
+
+	echo 1 >file && git add file &&
+	test_tick && git commit -S -m initial &&
+	git tag initial &&
+	git branch side &&
+
+	echo 2 >file && test_tick && git commit -a -S -m second &&
+	git tag second &&
+
+	git checkout side &&
+	echo 3 >elif && git add elif &&
+	test_tick && git commit -m "third on side" &&
+
+	git checkout master &&
+	test_tick && git merge -S side &&
+	git tag merge &&
+
+	echo 4 >file && test_tick && git commit -a -m "fourth unsigned" &&
+	git tag fourth-unsigned &&
+
+	test_tick && git commit --amend -S -m "fourth signed" &&
+	git tag fourth-signed &&
+
+	git config commit.gpgsign true &&
+	echo 5 >file && test_tick && git commit -a -m "fifth signed" &&
+	git tag fifth-signed &&
+
+	git config commit.gpgsign false &&
+	echo 6 >file && test_tick && git commit -a -m "sixth" &&
+	git tag sixth-unsigned &&
+
+	git config commit.gpgsign true &&
+	echo 7 >file && test_tick && git commit -a -m "seventh" --no-gpg-sign &&
+	git tag seventh-unsigned &&
+
+	test_tick && git rebase -f HEAD^^ && git tag sixth-signed HEAD^ &&
+	git tag seventh-signed &&
+
+	echo 8 >file && test_tick && git commit -a -m eighth -SB7227189 &&
+	git tag eighth-signed-alt &&
+
+	# commit.gpgsign is still on but this must not be signed
+	git tag ninth-unsigned $(echo 9 | git commit-tree HEAD^{tree}) &&
+	# explicit -S of course must sign.
+	git tag tenth-signed $(echo 9 | git commit-tree -S HEAD^{tree})
+
+ok 1 # skip create signed commits (missing GPG)
+
+skipping test: verify and show signatures 
+	(
+		for commit in initial second merge fourth-signed \
+			fifth-signed sixth-signed seventh-signed tenth-signed
+		do
+			git verify-commit $commit &&
+			git show --pretty=short --show-signature $commit >actual &&
+			grep "Good signature from" actual &&
+			! grep "BAD signature from" actual &&
+			echo $commit OK || exit 1
+		done
+	) &&
+	(
+		for commit in merge^2 fourth-unsigned sixth-unsigned \
+			seventh-unsigned ninth-unsigned
+		do
+			test_must_fail git verify-commit $commit &&
+			git show --pretty=short --show-signature $commit >actual &&
+			! grep "Good signature from" actual &&
+			! grep "BAD signature from" actual &&
+			echo $commit OK || exit 1
+		done
+	) &&
+	(
+		for commit in eighth-signed-alt
+		do
+			git show --pretty=short --show-signature $commit >actual &&
+			grep "Good signature from" actual &&
+			! grep "BAD signature from" actual &&
+			grep "not certified" actual &&
+			echo $commit OK || exit 1
+		done
+	)
+
+ok 2 # skip verify and show signatures (missing GPG)
+
+skipping test: verify-commit exits success on untrusted signature 
+	git verify-commit eighth-signed-alt 2>actual &&
+	grep "Good signature from" actual &&
+	! grep "BAD signature from" actual &&
+	grep "not certified" actual
+
+ok 3 # skip verify-commit exits success on untrusted signature (missing GPG)
+
+skipping test: verify signatures with --raw 
+	(
+		for commit in initial second merge fourth-signed fifth-signed sixth-signed seventh-signed
+		do
+			git verify-commit --raw $commit 2>actual &&
+			grep "GOODSIG" actual &&
+			! grep "BADSIG" actual &&
+			echo $commit OK || exit 1
+		done
+	) &&
+	(
+		for commit in merge^2 fourth-unsigned sixth-unsigned seventh-unsigned
+		do
+			test_must_fail git verify-commit --raw $commit 2>actual &&
+			! grep "GOODSIG" actual &&
+			! grep "BADSIG" actual &&
+			echo $commit OK || exit 1
+		done
+	) &&
+	(
+		for commit in eighth-signed-alt
+		do
+			git verify-commit --raw $commit 2>actual &&
+			grep "GOODSIG" actual &&
+			! grep "BADSIG" actual &&
+			grep "TRUST_UNDEFINED" actual &&
+			echo $commit OK || exit 1
+		done
+	)
+
+ok 4 # skip verify signatures with --raw (missing GPG)
+
+skipping test: show signed commit with signature 
+	git show -s initial >commit &&
+	git show -s --show-signature initial >show &&
+	git verify-commit -v initial >verify.1 2>verify.2 &&
+	git cat-file commit initial >cat &&
+	grep -v -e "gpg: " -e "Warning: " show >show.commit &&
+	grep -e "gpg: " -e "Warning: " show >show.gpg &&
+	grep -v "^ " cat | grep -v "^gpgsig " >cat.commit &&
+	test_cmp show.commit commit &&
+	test_cmp show.gpg verify.2 &&
+	test_cmp cat.commit verify.1
+
+ok 5 # skip show signed commit with signature (missing GPG)
+
+skipping test: detect fudged signature 
+	git cat-file commit seventh-signed >raw &&
+	sed -e "s/^seventh/7th forged/" raw >forged1 &&
+	git hash-object -w -t commit forged1 >forged1.commit &&
+	test_must_fail git verify-commit $(cat forged1.commit) &&
+	git show --pretty=short --show-signature $(cat forged1.commit) >actual1 &&
+	grep "BAD signature from" actual1 &&
+	! grep "Good signature from" actual1
+
+ok 6 # skip detect fudged signature (missing GPG)
+
+skipping test: detect fudged signature with NUL 
+	git cat-file commit seventh-signed >raw &&
+	cat raw >forged2 &&
+	echo Qwik | tr "Q" "\000" >>forged2 &&
+	git hash-object -w -t commit forged2 >forged2.commit &&
+	test_must_fail git verify-commit $(cat forged2.commit) &&
+	git show --pretty=short --show-signature $(cat forged2.commit) >actual2 &&
+	grep "BAD signature from" actual2 &&
+	! grep "Good signature from" actual2
+
+ok 7 # skip detect fudged signature with NUL (missing GPG)
+
+skipping test: amending already signed commit 
+	git checkout fourth-signed^0 &&
+	git commit --amend -S --no-edit &&
+	git verify-commit HEAD &&
+	git show -s --show-signature HEAD >actual &&
+	grep "Good signature from" actual &&
+	! grep "BAD signature from" actual
+
+ok 8 # skip amending already signed commit (missing GPG)
+
+skipping test: show good signature with custom format 
+	cat >expect <<-\EOF &&
+	G
+	13B6F51ECDDE430D
+	C O Mitter <committer@example.com>
+	73D758744BE721698EC54E8713B6F51ECDDE430D
+	73D758744BE721698EC54E8713B6F51ECDDE430D
+	EOF
+	git log -1 --format="%G?%n%GK%n%GS%n%GF%n%GP" sixth-signed >actual &&
+	test_cmp expect actual
+
+ok 9 # skip show good signature with custom format (missing GPG)
+
+skipping test: show bad signature with custom format 
+	cat >expect <<-\EOF &&
+	B
+	13B6F51ECDDE430D
+	C O Mitter <committer@example.com>
+
+
+	EOF
+	git log -1 --format="%G?%n%GK%n%GS%n%GF%n%GP" $(cat forged1.commit) >actual &&
+	test_cmp expect actual
+
+ok 10 # skip show bad signature with custom format (missing GPG)
+
+skipping test: show untrusted signature with custom format 
+	cat >expect <<-\EOF &&
+	U
+	65A0EEA02E30CAD7
+	Eris Discordia <discord@example.net>
+	F8364A59E07FFE9F4D63005A65A0EEA02E30CAD7
+	D4BE22311AD3131E5EDA29A461092E85B7227189
+	EOF
+	git log -1 --format="%G?%n%GK%n%GS%n%GF%n%GP" eighth-signed-alt >actual &&
+	test_cmp expect actual
+
+ok 11 # skip show untrusted signature with custom format (missing GPG)
+
+skipping test: show unknown signature with custom format 
+	cat >expect <<-\EOF &&
+	E
+	65A0EEA02E30CAD7
+
+
+
+	EOF
+	GNUPGHOME="$GNUPGHOME_NOT_USED" git log -1 --format="%G?%n%GK%n%GS%n%GF%n%GP" eighth-signed-alt >actual &&
+	test_cmp expect actual
+
+ok 12 # skip show unknown signature with custom format (missing GPG)
+
+skipping test: show lack of signature with custom format 
+	cat >expect <<-\EOF &&
+	N
+
+
+
+
+	EOF
+	git log -1 --format="%G?%n%GK%n%GS%n%GF%n%GP" seventh-unsigned >actual &&
+	test_cmp expect actual
+
+ok 13 # skip show lack of signature with custom format (missing GPG)
+
+skipping test: log.showsignature behaves like --show-signature 
+	test_config log.showsignature true &&
+	git show initial >actual &&
+	grep "gpg: Signature made" actual &&
+	grep "gpg: Good signature" actual
+
+ok 14 # skip log.showsignature behaves like --show-signature (missing GPG)
+
+skipping test: check config gpg.format values 
+	test_config gpg.format openpgp &&
+	git commit -S --amend -m "success" &&
+	test_config gpg.format OpEnPgP &&
+	test_must_fail git commit -S --amend -m "fail"
+
+ok 15 # skip check config gpg.format values (missing GPG)
+
+skipping test: detect fudged commit with double signature 
+	sed -e "/gpgsig/,/END PGP/d" forged1 >double-base &&
+	sed -n -e "/gpgsig/,/END PGP/p" forged1 | \
+		sed -e "s/^gpgsig//;s/^ //" | gpg --dearmor >double-sig1.sig &&
+	gpg -o double-sig2.sig -u 29472784 --detach-sign double-base &&
+	cat double-sig1.sig double-sig2.sig | gpg --enarmor >double-combined.asc &&
+	sed -e "s/^\(-.*\)ARMORED FILE/\1SIGNATURE/;1s/^/gpgsig /;2,\$s/^/ /" \
+		double-combined.asc > double-gpgsig &&
+	sed -e "/committer/r double-gpgsig" double-base >double-commit &&
+	git hash-object -w -t commit double-commit >double-commit.commit &&
+	test_must_fail git verify-commit $(cat double-commit.commit) &&
+	git show --pretty=short --show-signature $(cat double-commit.commit) >double-actual &&
+	grep "BAD signature from" double-actual &&
+	grep "Good signature from" double-actual
+
+ok 16 # skip detect fudged commit with double signature (missing GPG)
+
+skipping test: show double signature with custom format 
+	cat >expect <<-\EOF &&
+	E
+
+
+
+
+	EOF
+	git log -1 --format="%G?%n%GK%n%GS%n%GF%n%GP" $(cat double-commit.commit) >actual &&
+	test_cmp expect actual
+
+ok 17 # skip show double signature with custom format (missing GPG)
+
+# passed all 17 test(s)
+1..17
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
 *** t7509-commit-authorship.sh ***
@@ -279717,6 +279328,1212 @@
 1..12
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
+*** t7511-status-index.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7511-status-index/.git/
+expecting success: 
+		git add * &&
+		git status
+	
+On branch master
+
+No commits yet
+
+Changes to be committed:
+  (use "git rm --cached <file>..." to unstage)
+
+	new file:   0
+	new file:   1
+	new file:   2
+	new file:   3
+	new file:   4
+	new file:   5
+	new file:   6
+	new file:   7
+	new file:   8
+	new file:   9
+	new file:   a
+	new file:   b
+	new file:   c
+	new file:   d
+	new file:   e
+	new file:   f
+	new file:   g
+	new file:   h
+	new file:   i
+	new file:   j
+	new file:   k
+	new file:   l
+	new file:   m
+	new file:   n
+	new file:   o
+	new file:   p
+	new file:   q
+	new file:   r
+	new file:   s
+	new file:   t
+	new file:   u
+	new file:   v
+	new file:   w
+	new file:   x
+	new file:   y
+	new file:   z
+
+ok 1 - status, filename length 1
+
+expecting success: 
+		git add p* &&
+		git status
+	
+On branch master
+
+No commits yet
+
+Changes to be committed:
+  (use "git rm --cached <file>..." to unstage)
+
+	new file:   p0
+	new file:   p1
+	new file:   p2
+	new file:   p3
+	new file:   p4
+	new file:   p5
+	new file:   p6
+	new file:   p7
+	new file:   p8
+	new file:   p9
+	new file:   pa
+	new file:   pb
+	new file:   pc
+	new file:   pd
+	new file:   pe
+	new file:   pf
+	new file:   pg
+	new file:   ph
+	new file:   pi
+	new file:   pj
+	new file:   pk
+	new file:   pl
+	new file:   pm
+	new file:   pn
+	new file:   po
+	new file:   pp
+	new file:   pq
+	new file:   pr
+	new file:   ps
+	new file:   pt
+	new file:   pu
+	new file:   pv
+	new file:   pw
+	new file:   px
+	new file:   py
+	new file:   pz
+
+ok 2 - status, filename length 2
+
+expecting success: 
+		git add px* &&
+		git status
+	
+On branch master
+
+No commits yet
+
+Changes to be committed:
+  (use "git rm --cached <file>..." to unstage)
+
+	new file:   px0
+	new file:   px1
+	new file:   px2
+	new file:   px3
+	new file:   px4
+	new file:   px5
+	new file:   px6
+	new file:   px7
+	new file:   px8
+	new file:   px9
+	new file:   pxa
+	new file:   pxb
+	new file:   pxc
+	new file:   pxd
+	new file:   pxe
+	new file:   pxf
+	new file:   pxg
+	new file:   pxh
+	new file:   pxi
+	new file:   pxj
+	new file:   pxk
+	new file:   pxl
+	new file:   pxm
+	new file:   pxn
+	new file:   pxo
+	new file:   pxp
+	new file:   pxq
+	new file:   pxr
+	new file:   pxs
+	new file:   pxt
+	new file:   pxu
+	new file:   pxv
+	new file:   pxw
+	new file:   pxx
+	new file:   pxy
+	new file:   pxz
+
+ok 3 - status, filename length 3
+
+expecting success: 
+		git add pre* &&
+		git status
+	
+On branch master
+
+No commits yet
+
+Changes to be committed:
+  (use "git rm --cached <file>..." to unstage)
+
+	new file:   pre0
+	new file:   pre1
+	new file:   pre2
+	new file:   pre3
+	new file:   pre4
+	new file:   pre5
+	new file:   pre6
+	new file:   pre7
+	new file:   pre8
+	new file:   pre9
+	new file:   prea
+	new file:   preb
+	new file:   prec
+	new file:   pred
+	new file:   pree
+	new file:   pref
+	new file:   preg
+	new file:   preh
+	new file:   prei
+	new file:   prej
+	new file:   prek
+	new file:   prel
+	new file:   prem
+	new file:   pren
+	new file:   preo
+	new file:   prep
+	new file:   preq
+	new file:   prer
+	new file:   pres
+	new file:   pret
+	new file:   preu
+	new file:   prev
+	new file:   prew
+	new file:   prex
+	new file:   prey
+	new file:   prez
+
+ok 4 - status, filename length 4
+
+expecting success: 
+		git add pref* &&
+		git status
+	
+On branch master
+
+No commits yet
+
+Changes to be committed:
+  (use "git rm --cached <file>..." to unstage)
+
+	new file:   pref0
+	new file:   pref1
+	new file:   pref2
+	new file:   pref3
+	new file:   pref4
+	new file:   pref5
+	new file:   pref6
+	new file:   pref7
+	new file:   pref8
+	new file:   pref9
+	new file:   prefa
+	new file:   prefb
+	new file:   prefc
+	new file:   prefd
+	new file:   prefe
+	new file:   preff
+	new file:   prefg
+	new file:   prefh
+	new file:   prefi
+	new file:   prefj
+	new file:   prefk
+	new file:   prefl
+	new file:   prefm
+	new file:   prefn
+	new file:   prefo
+	new file:   prefp
+	new file:   prefq
+	new file:   prefr
+	new file:   prefs
+	new file:   preft
+	new file:   prefu
+	new file:   prefv
+	new file:   prefw
+	new file:   prefx
+	new file:   prefy
+	new file:   prefz
+
+ok 5 - status, filename length 5
+
+expecting success: 
+		git add prefi* &&
+		git status
+	
+On branch master
+
+No commits yet
+
+Changes to be committed:
+  (use "git rm --cached <file>..." to unstage)
+
+	new file:   prefi0
+	new file:   prefi1
+	new file:   prefi2
+	new file:   prefi3
+	new file:   prefi4
+	new file:   prefi5
+	new file:   prefi6
+	new file:   prefi7
+	new file:   prefi8
+	new file:   prefi9
+	new file:   prefia
+	new file:   prefib
+	new file:   prefic
+	new file:   prefid
+	new file:   prefie
+	new file:   prefif
+	new file:   prefig
+	new file:   prefih
+	new file:   prefii
+	new file:   prefij
+	new file:   prefik
+	new file:   prefil
+	new file:   prefim
+	new file:   prefin
+	new file:   prefio
+	new file:   prefip
+	new file:   prefiq
+	new file:   prefir
+	new file:   prefis
+	new file:   prefit
+	new file:   prefiu
+	new file:   prefiv
+	new file:   prefiw
+	new file:   prefix
+	new file:   prefiy
+	new file:   prefiz
+
+ok 6 - status, filename length 6
+
+expecting success: 
+		git add prefix* &&
+		git status
+	
+On branch master
+
+No commits yet
+
+Changes to be committed:
+  (use "git rm --cached <file>..." to unstage)
+
+	new file:   prefix0
+	new file:   prefix1
+	new file:   prefix2
+	new file:   prefix3
+	new file:   prefix4
+	new file:   prefix5
+	new file:   prefix6
+	new file:   prefix7
+	new file:   prefix8
+	new file:   prefix9
+	new file:   prefixa
+	new file:   prefixb
+	new file:   prefixc
+	new file:   prefixd
+	new file:   prefixe
+	new file:   prefixf
+	new file:   prefixg
+	new file:   prefixh
+	new file:   prefixi
+	new file:   prefixj
+	new file:   prefixk
+	new file:   prefixl
+	new file:   prefixm
+	new file:   prefixn
+	new file:   prefixo
+	new file:   prefixp
+	new file:   prefixq
+	new file:   prefixr
+	new file:   prefixs
+	new file:   prefixt
+	new file:   prefixu
+	new file:   prefixv
+	new file:   prefixw
+	new file:   prefixx
+	new file:   prefixy
+	new file:   prefixz
+
+ok 7 - status, filename length 7
+
+expecting success: 
+		git add prefix-* &&
+		git status
+	
+On branch master
+
+No commits yet
+
+Changes to be committed:
+  (use "git rm --cached <file>..." to unstage)
+
+	new file:   prefix-0
+	new file:   prefix-1
+	new file:   prefix-2
+	new file:   prefix-3
+	new file:   prefix-4
+	new file:   prefix-5
+	new file:   prefix-6
+	new file:   prefix-7
+	new file:   prefix-8
+	new file:   prefix-9
+	new file:   prefix-a
+	new file:   prefix-b
+	new file:   prefix-c
+	new file:   prefix-d
+	new file:   prefix-e
+	new file:   prefix-f
+	new file:   prefix-g
+	new file:   prefix-h
+	new file:   prefix-i
+	new file:   prefix-j
+	new file:   prefix-k
+	new file:   prefix-l
+	new file:   prefix-m
+	new file:   prefix-n
+	new file:   prefix-o
+	new file:   prefix-p
+	new file:   prefix-q
+	new file:   prefix-r
+	new file:   prefix-s
+	new file:   prefix-t
+	new file:   prefix-u
+	new file:   prefix-v
+	new file:   prefix-w
+	new file:   prefix-x
+	new file:   prefix-y
+	new file:   prefix-z
+
+ok 8 - status, filename length 8
+
+expecting success: 
+		git add prefix-p* &&
+		git status
+	
+On branch master
+
+No commits yet
+
+Changes to be committed:
+  (use "git rm --cached <file>..." to unstage)
+
+	new file:   prefix-p0
+	new file:   prefix-p1
+	new file:   prefix-p2
+	new file:   prefix-p3
+	new file:   prefix-p4
+	new file:   prefix-p5
+	new file:   prefix-p6
+	new file:   prefix-p7
+	new file:   prefix-p8
+	new file:   prefix-p9
+	new file:   prefix-pa
+	new file:   prefix-pb
+	new file:   prefix-pc
+	new file:   prefix-pd
+	new file:   prefix-pe
+	new file:   prefix-pf
+	new file:   prefix-pg
+	new file:   prefix-ph
+	new file:   prefix-pi
+	new file:   prefix-pj
+	new file:   prefix-pk
+	new file:   prefix-pl
+	new file:   prefix-pm
+	new file:   prefix-pn
+	new file:   prefix-po
+	new file:   prefix-pp
+	new file:   prefix-pq
+	new file:   prefix-pr
+	new file:   prefix-ps
+	new file:   prefix-pt
+	new file:   prefix-pu
+	new file:   prefix-pv
+	new file:   prefix-pw
+	new file:   prefix-px
+	new file:   prefix-py
+	new file:   prefix-pz
+
+ok 9 - status, filename length 9
+
+expecting success: 
+		git add prefix-pr* &&
+		git status
+	
+On branch master
+
+No commits yet
+
+Changes to be committed:
+  (use "git rm --cached <file>..." to unstage)
+
+	new file:   prefix-pr0
+	new file:   prefix-pr1
+	new file:   prefix-pr2
+	new file:   prefix-pr3
+	new file:   prefix-pr4
+	new file:   prefix-pr5
+	new file:   prefix-pr6
+	new file:   prefix-pr7
+	new file:   prefix-pr8
+	new file:   prefix-pr9
+	new file:   prefix-pra
+	new file:   prefix-prb
+	new file:   prefix-prc
+	new file:   prefix-prd
+	new file:   prefix-pre
+	new file:   prefix-prf
+	new file:   prefix-prg
+	new file:   prefix-prh
+	new file:   prefix-pri
+	new file:   prefix-prj
+	new file:   prefix-prk
+	new file:   prefix-prl
+	new file:   prefix-prm
+	new file:   prefix-prn
+	new file:   prefix-pro
+	new file:   prefix-prp
+	new file:   prefix-prq
+	new file:   prefix-prr
+	new file:   prefix-prs
+	new file:   prefix-prt
+	new file:   prefix-pru
+	new file:   prefix-prv
+	new file:   prefix-prw
+	new file:   prefix-prx
+	new file:   prefix-pry
+	new file:   prefix-prz
+
+ok 10 - status, filename length 10
+
+expecting success: 
+		git add prefix-pre* &&
+		git status
+	
+On branch master
+
+No commits yet
+
+Changes to be committed:
+  (use "git rm --cached <file>..." to unstage)
+
+	new file:   prefix-pre0
+	new file:   prefix-pre1
+	new file:   prefix-pre2
+	new file:   prefix-pre3
+	new file:   prefix-pre4
+	new file:   prefix-pre5
+	new file:   prefix-pre6
+	new file:   prefix-pre7
+	new file:   prefix-pre8
+	new file:   prefix-pre9
+	new file:   prefix-prea
+	new file:   prefix-preb
+	new file:   prefix-prec
+	new file:   prefix-pred
+	new file:   prefix-pree
+	new file:   prefix-pref
+	new file:   prefix-preg
+	new file:   prefix-preh
+	new file:   prefix-prei
+	new file:   prefix-prej
+	new file:   prefix-prek
+	new file:   prefix-prel
+	new file:   prefix-prem
+	new file:   prefix-pren
+	new file:   prefix-preo
+	new file:   prefix-prep
+	new file:   prefix-preq
+	new file:   prefix-prer
+	new file:   prefix-pres
+	new file:   prefix-pret
+	new file:   prefix-preu
+	new file:   prefix-prev
+	new file:   prefix-prew
+	new file:   prefix-prex
+	new file:   prefix-prey
+	new file:   prefix-prez
+
+ok 11 - status, filename length 11
+
+expecting success: 
+		git add prefix-pref* &&
+		git status
+	
+On branch master
+
+No commits yet
+
+Changes to be committed:
+  (use "git rm --cached <file>..." to unstage)
+
+	new file:   prefix-pref0
+	new file:   prefix-pref1
+	new file:   prefix-pref2
+	new file:   prefix-pref3
+	new file:   prefix-pref4
+	new file:   prefix-pref5
+	new file:   prefix-pref6
+	new file:   prefix-pref7
+	new file:   prefix-pref8
+	new file:   prefix-pref9
+	new file:   prefix-prefa
+	new file:   prefix-prefb
+	new file:   prefix-prefc
+	new file:   prefix-prefd
+	new file:   prefix-prefe
+	new file:   prefix-preff
+	new file:   prefix-prefg
+	new file:   prefix-prefh
+	new file:   prefix-prefi
+	new file:   prefix-prefj
+	new file:   prefix-prefk
+	new file:   prefix-prefl
+	new file:   prefix-prefm
+	new file:   prefix-prefn
+	new file:   prefix-prefo
+	new file:   prefix-prefp
+	new file:   prefix-prefq
+	new file:   prefix-prefr
+	new file:   prefix-prefs
+	new file:   prefix-preft
+	new file:   prefix-prefu
+	new file:   prefix-prefv
+	new file:   prefix-prefw
+	new file:   prefix-prefx
+	new file:   prefix-prefy
+	new file:   prefix-prefz
+
+ok 12 - status, filename length 12
+
+expecting success: 
+		git add prefix-prefi* &&
+		git status
+	
+On branch master
+
+No commits yet
+
+Changes to be committed:
+  (use "git rm --cached <file>..." to unstage)
+
+	new file:   prefix-prefi0
+	new file:   prefix-prefi1
+	new file:   prefix-prefi2
+	new file:   prefix-prefi3
+	new file:   prefix-prefi4
+	new file:   prefix-prefi5
+	new file:   prefix-prefi6
+	new file:   prefix-prefi7
+	new file:   prefix-prefi8
+	new file:   prefix-prefi9
+	new file:   prefix-prefia
+	new file:   prefix-prefib
+	new file:   prefix-prefic
+	new file:   prefix-prefid
+	new file:   prefix-prefie
+	new file:   prefix-prefif
+	new file:   prefix-prefig
+	new file:   prefix-prefih
+	new file:   prefix-prefii
+	new file:   prefix-prefij
+	new file:   prefix-prefik
+	new file:   prefix-prefil
+	new file:   prefix-prefim
+	new file:   prefix-prefin
+	new file:   prefix-prefio
+	new file:   prefix-prefip
+	new file:   prefix-prefiq
+	new file:   prefix-prefir
+	new file:   prefix-prefis
+	new file:   prefix-prefit
+	new file:   prefix-prefiu
+	new file:   prefix-prefiv
+	new file:   prefix-prefiw
+	new file:   prefix-prefix
+	new file:   prefix-prefiy
+	new file:   prefix-prefiz
+
+ok 13 - status, filename length 13
+
+expecting success: 
+		git add prefix-prefix* &&
+		git status
+	
+On branch master
+
+No commits yet
+
+Changes to be committed:
+  (use "git rm --cached <file>..." to unstage)
+
+	new file:   prefix-prefix0
+	new file:   prefix-prefix1
+	new file:   prefix-prefix2
+	new file:   prefix-prefix3
+	new file:   prefix-prefix4
+	new file:   prefix-prefix5
+	new file:   prefix-prefix6
+	new file:   prefix-prefix7
+	new file:   prefix-prefix8
+	new file:   prefix-prefix9
+	new file:   prefix-prefixa
+	new file:   prefix-prefixb
+	new file:   prefix-prefixc
+	new file:   prefix-prefixd
+	new file:   prefix-prefixe
+	new file:   prefix-prefixf
+	new file:   prefix-prefixg
+	new file:   prefix-prefixh
+	new file:   prefix-prefixi
+	new file:   prefix-prefixj
+	new file:   prefix-prefixk
+	new file:   prefix-prefixl
+	new file:   prefix-prefixm
+	new file:   prefix-prefixn
+	new file:   prefix-prefixo
+	new file:   prefix-prefixp
+	new file:   prefix-prefixq
+	new file:   prefix-prefixr
+	new file:   prefix-prefixs
+	new file:   prefix-prefixt
+	new file:   prefix-prefixu
+	new file:   prefix-prefixv
+	new file:   prefix-prefixw
+	new file:   prefix-prefixx
+	new file:   prefix-prefixy
+	new file:   prefix-prefixz
+
+ok 14 - status, filename length 14
+
+expecting success: 
+		git add prefix-prefix-* &&
+		git status
+	
+On branch master
+
+No commits yet
+
+Changes to be committed:
+  (use "git rm --cached <file>..." to unstage)
+
+	new file:   prefix-prefix-0
+	new file:   prefix-prefix-1
+	new file:   prefix-prefix-2
+	new file:   prefix-prefix-3
+	new file:   prefix-prefix-4
+	new file:   prefix-prefix-5
+	new file:   prefix-prefix-6
+	new file:   prefix-prefix-7
+	new file:   prefix-prefix-8
+	new file:   prefix-prefix-9
+	new file:   prefix-prefix-a
+	new file:   prefix-prefix-b
+	new file:   prefix-prefix-c
+	new file:   prefix-prefix-d
+	new file:   prefix-prefix-e
+	new file:   prefix-prefix-f
+	new file:   prefix-prefix-g
+	new file:   prefix-prefix-h
+	new file:   prefix-prefix-i
+	new file:   prefix-prefix-j
+	new file:   prefix-prefix-k
+	new file:   prefix-prefix-l
+	new file:   prefix-prefix-m
+	new file:   prefix-prefix-n
+	new file:   prefix-prefix-o
+	new file:   prefix-prefix-p
+	new file:   prefix-prefix-q
+	new file:   prefix-prefix-r
+	new file:   prefix-prefix-s
+	new file:   prefix-prefix-t
+	new file:   prefix-prefix-u
+	new file:   prefix-prefix-v
+	new file:   prefix-prefix-w
+	new file:   prefix-prefix-x
+	new file:   prefix-prefix-y
+	new file:   prefix-prefix-z
+
+ok 15 - status, filename length 15
+
+expecting success: 
+		git add prefix-prefix-p* &&
+		git status
+	
+On branch master
+
+No commits yet
+
+Changes to be committed:
+  (use "git rm --cached <file>..." to unstage)
+
+	new file:   prefix-prefix-p0
+	new file:   prefix-prefix-p1
+	new file:   prefix-prefix-p2
+	new file:   prefix-prefix-p3
+	new file:   prefix-prefix-p4
+	new file:   prefix-prefix-p5
+	new file:   prefix-prefix-p6
+	new file:   prefix-prefix-p7
+	new file:   prefix-prefix-p8
+	new file:   prefix-prefix-p9
+	new file:   prefix-prefix-pa
+	new file:   prefix-prefix-pb
+	new file:   prefix-prefix-pc
+	new file:   prefix-prefix-pd
+	new file:   prefix-prefix-pe
+	new file:   prefix-prefix-pf
+	new file:   prefix-prefix-pg
+	new file:   prefix-prefix-ph
+	new file:   prefix-prefix-pi
+	new file:   prefix-prefix-pj
+	new file:   prefix-prefix-pk
+	new file:   prefix-prefix-pl
+	new file:   prefix-prefix-pm
+	new file:   prefix-prefix-pn
+	new file:   prefix-prefix-po
+	new file:   prefix-prefix-pp
+	new file:   prefix-prefix-pq
+	new file:   prefix-prefix-pr
+	new file:   prefix-prefix-ps
+	new file:   prefix-prefix-pt
+	new file:   prefix-prefix-pu
+	new file:   prefix-prefix-pv
+	new file:   prefix-prefix-pw
+	new file:   prefix-prefix-px
+	new file:   prefix-prefix-py
+	new file:   prefix-prefix-pz
+
+ok 16 - status, filename length 16
+
+expecting success: 
+		git add prefix-prefix-pr* &&
+		git status
+	
+On branch master
+
+No commits yet
+
+Changes to be committed:
+  (use "git rm --cached <file>..." to unstage)
+
+	new file:   prefix-prefix-pr0
+	new file:   prefix-prefix-pr1
+	new file:   prefix-prefix-pr2
+	new file:   prefix-prefix-pr3
+	new file:   prefix-prefix-pr4
+	new file:   prefix-prefix-pr5
+	new file:   prefix-prefix-pr6
+	new file:   prefix-prefix-pr7
+	new file:   prefix-prefix-pr8
+	new file:   prefix-prefix-pr9
+	new file:   prefix-prefix-pra
+	new file:   prefix-prefix-prb
+	new file:   prefix-prefix-prc
+	new file:   prefix-prefix-prd
+	new file:   prefix-prefix-pre
+	new file:   prefix-prefix-prf
+	new file:   prefix-prefix-prg
+	new file:   prefix-prefix-prh
+	new file:   prefix-prefix-pri
+	new file:   prefix-prefix-prj
+	new file:   prefix-prefix-prk
+	new file:   prefix-prefix-prl
+	new file:   prefix-prefix-prm
+	new file:   prefix-prefix-prn
+	new file:   prefix-prefix-pro
+	new file:   prefix-prefix-prp
+	new file:   prefix-prefix-prq
+	new file:   prefix-prefix-prr
+	new file:   prefix-prefix-prs
+	new file:   prefix-prefix-prt
+	new file:   prefix-prefix-pru
+	new file:   prefix-prefix-prv
+	new file:   prefix-prefix-prw
+	new file:   prefix-prefix-prx
+	new file:   prefix-prefix-pry
+	new file:   prefix-prefix-prz
+
+ok 17 - status, filename length 17
+
+expecting success: 
+		git add prefix-prefix-pre* &&
+		git status
+	
+On branch master
+
+No commits yet
+
+Changes to be committed:
+  (use "git rm --cached <file>..." to unstage)
+
+	new file:   prefix-prefix-pre0
+	new file:   prefix-prefix-pre1
+	new file:   prefix-prefix-pre2
+	new file:   prefix-prefix-pre3
+	new file:   prefix-prefix-pre4
+	new file:   prefix-prefix-pre5
+	new file:   prefix-prefix-pre6
+	new file:   prefix-prefix-pre7
+	new file:   prefix-prefix-pre8
+	new file:   prefix-prefix-pre9
+	new file:   prefix-prefix-prea
+	new file:   prefix-prefix-preb
+	new file:   prefix-prefix-prec
+	new file:   prefix-prefix-pred
+	new file:   prefix-prefix-pree
+	new file:   prefix-prefix-pref
+	new file:   prefix-prefix-preg
+	new file:   prefix-prefix-preh
+	new file:   prefix-prefix-prei
+	new file:   prefix-prefix-prej
+	new file:   prefix-prefix-prek
+	new file:   prefix-prefix-prel
+	new file:   prefix-prefix-prem
+	new file:   prefix-prefix-pren
+	new file:   prefix-prefix-preo
+	new file:   prefix-prefix-prep
+	new file:   prefix-prefix-preq
+	new file:   prefix-prefix-prer
+	new file:   prefix-prefix-pres
+	new file:   prefix-prefix-pret
+	new file:   prefix-prefix-preu
+	new file:   prefix-prefix-prev
+	new file:   prefix-prefix-prew
+	new file:   prefix-prefix-prex
+	new file:   prefix-prefix-prey
+	new file:   prefix-prefix-prez
+
+ok 18 - status, filename length 18
+
+expecting success: 
+		git add prefix-prefix-pref* &&
+		git status
+	
+On branch master
+
+No commits yet
+
+Changes to be committed:
+  (use "git rm --cached <file>..." to unstage)
+
+	new file:   prefix-prefix-pref0
+	new file:   prefix-prefix-pref1
+	new file:   prefix-prefix-pref2
+	new file:   prefix-prefix-pref3
+	new file:   prefix-prefix-pref4
+	new file:   prefix-prefix-pref5
+	new file:   prefix-prefix-pref6
+	new file:   prefix-prefix-pref7
+	new file:   prefix-prefix-pref8
+	new file:   prefix-prefix-pref9
+	new file:   prefix-prefix-prefa
+	new file:   prefix-prefix-prefb
+	new file:   prefix-prefix-prefc
+	new file:   prefix-prefix-prefd
+	new file:   prefix-prefix-prefe
+	new file:   prefix-prefix-preff
+	new file:   prefix-prefix-prefg
+	new file:   prefix-prefix-prefh
+	new file:   prefix-prefix-prefi
+	new file:   prefix-prefix-prefj
+	new file:   prefix-prefix-prefk
+	new file:   prefix-prefix-prefl
+	new file:   prefix-prefix-prefm
+	new file:   prefix-prefix-prefn
+	new file:   prefix-prefix-prefo
+	new file:   prefix-prefix-prefp
+	new file:   prefix-prefix-prefq
+	new file:   prefix-prefix-prefr
+	new file:   prefix-prefix-prefs
+	new file:   prefix-prefix-preft
+	new file:   prefix-prefix-prefu
+	new file:   prefix-prefix-prefv
+	new file:   prefix-prefix-prefw
+	new file:   prefix-prefix-prefx
+	new file:   prefix-prefix-prefy
+	new file:   prefix-prefix-prefz
+
+ok 19 - status, filename length 19
+
+expecting success: 
+		git add prefix-prefix-prefi* &&
+		git status
+	
+On branch master
+
+No commits yet
+
+Changes to be committed:
+  (use "git rm --cached <file>..." to unstage)
+
+	new file:   prefix-prefix-prefi0
+	new file:   prefix-prefix-prefi1
+	new file:   prefix-prefix-prefi2
+	new file:   prefix-prefix-prefi3
+	new file:   prefix-prefix-prefi4
+	new file:   prefix-prefix-prefi5
+	new file:   prefix-prefix-prefi6
+	new file:   prefix-prefix-prefi7
+	new file:   prefix-prefix-prefi8
+	new file:   prefix-prefix-prefi9
+	new file:   prefix-prefix-prefia
+	new file:   prefix-prefix-prefib
+	new file:   prefix-prefix-prefic
+	new file:   prefix-prefix-prefid
+	new file:   prefix-prefix-prefie
+	new file:   prefix-prefix-prefif
+	new file:   prefix-prefix-prefig
+	new file:   prefix-prefix-prefih
+	new file:   prefix-prefix-prefii
+	new file:   prefix-prefix-prefij
+	new file:   prefix-prefix-prefik
+	new file:   prefix-prefix-prefil
+	new file:   prefix-prefix-prefim
+	new file:   prefix-prefix-prefin
+	new file:   prefix-prefix-prefio
+	new file:   prefix-prefix-prefip
+	new file:   prefix-prefix-prefiq
+	new file:   prefix-prefix-prefir
+	new file:   prefix-prefix-prefis
+	new file:   prefix-prefix-prefit
+	new file:   prefix-prefix-prefiu
+	new file:   prefix-prefix-prefiv
+	new file:   prefix-prefix-prefiw
+	new file:   prefix-prefix-prefix
+	new file:   prefix-prefix-prefiy
+	new file:   prefix-prefix-prefiz
+
+ok 20 - status, filename length 20
+
+expecting success: 
+		git add prefix-prefix-prefix* &&
+		git status
+	
+On branch master
+
+No commits yet
+
+Changes to be committed:
+  (use "git rm --cached <file>..." to unstage)
+
+	new file:   prefix-prefix-prefix0
+	new file:   prefix-prefix-prefix1
+	new file:   prefix-prefix-prefix2
+	new file:   prefix-prefix-prefix3
+	new file:   prefix-prefix-prefix4
+	new file:   prefix-prefix-prefix5
+	new file:   prefix-prefix-prefix6
+	new file:   prefix-prefix-prefix7
+	new file:   prefix-prefix-prefix8
+	new file:   prefix-prefix-prefix9
+	new file:   prefix-prefix-prefixa
+	new file:   prefix-prefix-prefixb
+	new file:   prefix-prefix-prefixc
+	new file:   prefix-prefix-prefixd
+	new file:   prefix-prefix-prefixe
+	new file:   prefix-prefix-prefixf
+	new file:   prefix-prefix-prefixg
+	new file:   prefix-prefix-prefixh
+	new file:   prefix-prefix-prefixi
+	new file:   prefix-prefix-prefixj
+	new file:   prefix-prefix-prefixk
+	new file:   prefix-prefix-prefixl
+	new file:   prefix-prefix-prefixm
+	new file:   prefix-prefix-prefixn
+	new file:   prefix-prefix-prefixo
+	new file:   prefix-prefix-prefixp
+	new file:   prefix-prefix-prefixq
+	new file:   prefix-prefix-prefixr
+	new file:   prefix-prefix-prefixs
+	new file:   prefix-prefix-prefixt
+	new file:   prefix-prefix-prefixu
+	new file:   prefix-prefix-prefixv
+	new file:   prefix-prefix-prefixw
+	new file:   prefix-prefix-prefixx
+	new file:   prefix-prefix-prefixy
+	new file:   prefix-prefix-prefixz
+
+ok 21 - status, filename length 21
+
+expecting success: 
+		git add prefix-prefix-prefix-* &&
+		git status
+	
+On branch master
+
+No commits yet
+
+Changes to be committed:
+  (use "git rm --cached <file>..." to unstage)
+
+	new file:   prefix-prefix-prefix-0
+	new file:   prefix-prefix-prefix-1
+	new file:   prefix-prefix-prefix-2
+	new file:   prefix-prefix-prefix-3
+	new file:   prefix-prefix-prefix-4
+	new file:   prefix-prefix-prefix-5
+	new file:   prefix-prefix-prefix-6
+	new file:   prefix-prefix-prefix-7
+	new file:   prefix-prefix-prefix-8
+	new file:   prefix-prefix-prefix-9
+	new file:   prefix-prefix-prefix-a
+	new file:   prefix-prefix-prefix-b
+	new file:   prefix-prefix-prefix-c
+	new file:   prefix-prefix-prefix-d
+	new file:   prefix-prefix-prefix-e
+	new file:   prefix-prefix-prefix-f
+	new file:   prefix-prefix-prefix-g
+	new file:   prefix-prefix-prefix-h
+	new file:   prefix-prefix-prefix-i
+	new file:   prefix-prefix-prefix-j
+	new file:   prefix-prefix-prefix-k
+	new file:   prefix-prefix-prefix-l
+	new file:   prefix-prefix-prefix-m
+	new file:   prefix-prefix-prefix-n
+	new file:   prefix-prefix-prefix-o
+	new file:   prefix-prefix-prefix-p
+	new file:   prefix-prefix-prefix-q
+	new file:   prefix-prefix-prefix-r
+	new file:   prefix-prefix-prefix-s
+	new file:   prefix-prefix-prefix-t
+	new file:   prefix-prefix-prefix-u
+	new file:   prefix-prefix-prefix-v
+	new file:   prefix-prefix-prefix-w
+	new file:   prefix-prefix-prefix-x
+	new file:   prefix-prefix-prefix-y
+	new file:   prefix-prefix-prefix-z
+
+ok 22 - status, filename length 22
+
+expecting success: 
+		git add prefix-prefix-prefix-p* &&
+		git status
+	
+On branch master
+
+No commits yet
+
+Changes to be committed:
+  (use "git rm --cached <file>..." to unstage)
+
+	new file:   prefix-prefix-prefix-p0
+	new file:   prefix-prefix-prefix-p1
+	new file:   prefix-prefix-prefix-p2
+	new file:   prefix-prefix-prefix-p3
+	new file:   prefix-prefix-prefix-p4
+	new file:   prefix-prefix-prefix-p5
+	new file:   prefix-prefix-prefix-p6
+	new file:   prefix-prefix-prefix-p7
+	new file:   prefix-prefix-prefix-p8
+	new file:   prefix-prefix-prefix-p9
+	new file:   prefix-prefix-prefix-pa
+	new file:   prefix-prefix-prefix-pb
+	new file:   prefix-prefix-prefix-pc
+	new file:   prefix-prefix-prefix-pd
+	new file:   prefix-prefix-prefix-pe
+	new file:   prefix-prefix-prefix-pf
+	new file:   prefix-prefix-prefix-pg
+	new file:   prefix-prefix-prefix-ph
+	new file:   prefix-prefix-prefix-pi
+	new file:   prefix-prefix-prefix-pj
+	new file:   prefix-prefix-prefix-pk
+	new file:   prefix-prefix-prefix-pl
+	new file:   prefix-prefix-prefix-pm
+	new file:   prefix-prefix-prefix-pn
+	new file:   prefix-prefix-prefix-po
+	new file:   prefix-prefix-prefix-pp
+	new file:   prefix-prefix-prefix-pq
+	new file:   prefix-prefix-prefix-pr
+	new file:   prefix-prefix-prefix-ps
+	new file:   prefix-prefix-prefix-pt
+	new file:   prefix-prefix-prefix-pu
+	new file:   prefix-prefix-prefix-pv
+	new file:   prefix-prefix-prefix-pw
+	new file:   prefix-prefix-prefix-px
+	new file:   prefix-prefix-prefix-py
+	new file:   prefix-prefix-prefix-pz
+
+ok 23 - status, filename length 23
+
+expecting success: 
+		git add prefix-prefix-prefix-pr* &&
+		git status
+	
+On branch master
+
+No commits yet
+
+Changes to be committed:
+  (use "git rm --cached <file>..." to unstage)
+
+	new file:   prefix-prefix-prefix-pr0
+	new file:   prefix-prefix-prefix-pr1
+	new file:   prefix-prefix-prefix-pr2
+	new file:   prefix-prefix-prefix-pr3
+	new file:   prefix-prefix-prefix-pr4
+	new file:   prefix-prefix-prefix-pr5
+	new file:   prefix-prefix-prefix-pr6
+	new file:   prefix-prefix-prefix-pr7
+	new file:   prefix-prefix-prefix-pr8
+	new file:   prefix-prefix-prefix-pr9
+	new file:   prefix-prefix-prefix-pra
+	new file:   prefix-prefix-prefix-prb
+	new file:   prefix-prefix-prefix-prc
+	new file:   prefix-prefix-prefix-prd
+	new file:   prefix-prefix-prefix-pre
+	new file:   prefix-prefix-prefix-prf
+	new file:   prefix-prefix-prefix-prg
+	new file:   prefix-prefix-prefix-prh
+	new file:   prefix-prefix-prefix-pri
+	new file:   prefix-prefix-prefix-prj
+	new file:   prefix-prefix-prefix-prk
+	new file:   prefix-prefix-prefix-prl
+	new file:   prefix-prefix-prefix-prm
+	new file:   prefix-prefix-prefix-prn
+	new file:   prefix-prefix-prefix-pro
+	new file:   prefix-prefix-prefix-prp
+	new file:   prefix-prefix-prefix-prq
+	new file:   prefix-prefix-prefix-prr
+	new file:   prefix-prefix-prefix-prs
+	new file:   prefix-prefix-prefix-prt
+	new file:   prefix-prefix-prefix-pru
+	new file:   prefix-prefix-prefix-prv
+	new file:   prefix-prefix-prefix-prw
+	new file:   prefix-prefix-prefix-prx
+	new file:   prefix-prefix-prefix-pry
+	new file:   prefix-prefix-prefix-prz
+
+ok 24 - status, filename length 24
+
+# passed all 24 test(s)
+1..24
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
 *** t7501-commit-basic-functionality.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7501-commit-basic-functionality/.git/
 expecting success: 
@@ -280855,2068 +281672,943 @@
 1..69
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t7510-signed-commit.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7510-signed-commit/.git/
-skipping test: create signed commits 
-	test_when_finished "test_unconfig commit.gpgsign" &&
-
-	echo 1 >file && git add file &&
-	test_tick && git commit -S -m initial &&
-	git tag initial &&
-	git branch side &&
-
-	echo 2 >file && test_tick && git commit -a -S -m second &&
-	git tag second &&
+*** t7502-commit-porcelain.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7502-commit-porcelain/.git/
+expecting success: 
 
-	git checkout side &&
-	echo 3 >elif && git add elif &&
-	test_tick && git commit -m "third on side" &&
+	echo new >file1 &&
+	git add file1 &&
+	check_summary_oneline "root-commit" "initial" &&
 
-	git checkout master &&
-	test_tick && git merge -S side &&
-	git tag merge &&
+	echo change >>file1 &&
+	git add file1
 
-	echo 4 >file && test_tick && git commit -a -m "fourth unsigned" &&
-	git tag fourth-unsigned &&
+ok 1 - output summary format
 
-	test_tick && git commit --amend -S -m "fourth signed" &&
-	git tag fourth-signed &&
+expecting success: 
+	check_summary_oneline "" "a change"
 
-	git config commit.gpgsign true &&
-	echo 5 >file && test_tick && git commit -a -m "fifth signed" &&
-	git tag fifth-signed &&
+ok 2 - output summary format: root-commit
 
-	git config commit.gpgsign false &&
-	echo 6 >file && test_tick && git commit -a -m "sixth" &&
-	git tag sixth-unsigned &&
+expecting success: 
 
-	git config commit.gpgsign true &&
-	echo 7 >file && test_tick && git commit -a -m "seventh" --no-gpg-sign &&
-	git tag seventh-unsigned &&
+	check_summary_oneline "" "empty" "--allow-empty"
 
-	test_tick && git rebase -f HEAD^^ && git tag sixth-signed HEAD^ &&
-	git tag seventh-signed &&
+ok 3 - output summary format for commit with an empty diff
 
-	echo 8 >file && test_tick && git commit -a -m eighth -SB7227189 &&
-	git tag eighth-signed-alt &&
+expecting success: 
 
-	# commit.gpgsign is still on but this must not be signed
-	git tag ninth-unsigned $(echo 9 | git commit-tree HEAD^{tree}) &&
-	# explicit -S of course must sign.
-	git tag tenth-signed $(echo 9 | git commit-tree -S HEAD^{tree})
+	git checkout -b recursive-base &&
+	test_commit base file1 &&
 
-ok 1 # skip create signed commits (missing GPG)
+	git checkout -b recursive-a recursive-base &&
+	test_commit commit-a file1 &&
 
-skipping test: verify and show signatures 
-	(
-		for commit in initial second merge fourth-signed \
-			fifth-signed sixth-signed seventh-signed tenth-signed
-		do
-			git verify-commit $commit &&
-			git show --pretty=short --show-signature $commit >actual &&
-			grep "Good signature from" actual &&
-			! grep "BAD signature from" actual &&
-			echo $commit OK || exit 1
-		done
-	) &&
-	(
-		for commit in merge^2 fourth-unsigned sixth-unsigned \
-			seventh-unsigned ninth-unsigned
-		do
-			test_must_fail git verify-commit $commit &&
-			git show --pretty=short --show-signature $commit >actual &&
-			! grep "Good signature from" actual &&
-			! grep "BAD signature from" actual &&
-			echo $commit OK || exit 1
-		done
-	) &&
-	(
-		for commit in eighth-signed-alt
-		do
-			git show --pretty=short --show-signature $commit >actual &&
-			grep "Good signature from" actual &&
-			! grep "BAD signature from" actual &&
-			grep "not certified" actual &&
-			echo $commit OK || exit 1
-		done
-	)
+	git checkout -b recursive-b recursive-base &&
+	test_commit commit-b file1 &&
 
-ok 2 # skip verify and show signatures (missing GPG)
+	# conflict
+	git checkout recursive-a &&
+	test_must_fail git merge recursive-b &&
+	# resolve the conflict
+	echo commit-a > file1 &&
+	git add file1 &&
+	check_summary_oneline "" "Merge"
 
-skipping test: verify-commit exits success on untrusted signature 
-	git verify-commit eighth-signed-alt 2>actual &&
-	grep "Good signature from" actual &&
-	! grep "BAD signature from" actual &&
-	grep "not certified" actual
+Switched to a new branch 'recursive-base'
+[recursive-base e6f945f] base
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+Switched to a new branch 'recursive-a'
+[recursive-a 9300328] commit-a
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'recursive-b'
+[recursive-b 2f9e083] commit-b
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to branch 'recursive-a'
+Merging:
+9300328 commit-a
+virtual recursive-b
+found 1 common ancestor:
+e6f945f base
+Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+Automatic merge failed; fix conflicts and then commit the result.
+ok 4 - output summary format for merges
 
-ok 3 # skip verify-commit exits success on untrusted signature (missing GPG)
+expecting success: 
 
-skipping test: verify signatures with --raw 
-	(
-		for commit in initial second merge fourth-signed fifth-signed sixth-signed seventh-signed
-		do
-			git verify-commit --raw $commit 2>actual &&
-			grep "GOODSIG" actual &&
-			! grep "BADSIG" actual &&
-			echo $commit OK || exit 1
-		done
-	) &&
-	(
-		for commit in merge^2 fourth-unsigned sixth-unsigned seventh-unsigned
-		do
-			test_must_fail git verify-commit --raw $commit 2>actual &&
-			! grep "GOODSIG" actual &&
-			! grep "BADSIG" actual &&
-			echo $commit OK || exit 1
-		done
-	) &&
-	(
-		for commit in eighth-signed-alt
-		do
-			git verify-commit --raw $commit 2>actual &&
-			grep "GOODSIG" actual &&
-			! grep "BADSIG" actual &&
-			grep "TRUST_UNDEFINED" actual &&
-			echo $commit OK || exit 1
-		done
-	)
+	output_tests_cleanup &&
 
-ok 4 # skip verify signatures with --raw (missing GPG)
+	echo doing partial >"commit is" &&
+	mkdir not &&
+	echo very much encouraged but we should >not/forbid &&
+	git add "commit is" not &&
+	echo update added "commit is" file >"commit is" &&
+	echo also update another >not/forbid &&
+	test_tick &&
+	git commit -a -m "initial with -a" &&
 
-skipping test: show signed commit with signature 
-	git show -s initial >commit &&
-	git show -s --show-signature initial >show &&
-	git verify-commit -v initial >verify.1 2>verify.2 &&
-	git cat-file commit initial >cat &&
-	grep -v -e "gpg: " -e "Warning: " show >show.commit &&
-	grep -e "gpg: " -e "Warning: " show >show.gpg &&
-	grep -v "^ " cat | grep -v "^gpgsig " >cat.commit &&
-	test_cmp show.commit commit &&
-	test_cmp show.gpg verify.2 &&
-	test_cmp cat.commit verify.1
+	git cat-file blob HEAD:"commit is" >current.1 &&
+	git cat-file blob HEAD:not/forbid >current.2 &&
 
-ok 5 # skip show signed commit with signature (missing GPG)
+	cmp current.1 "commit is" &&
+	cmp current.2 not/forbid
 
-skipping test: detect fudged signature 
-	git cat-file commit seventh-signed >raw &&
-	sed -e "s/^seventh/7th forged/" raw >forged1 &&
-	git hash-object -w -t commit forged1 >forged1.commit &&
-	test_must_fail git verify-commit $(cat forged1.commit) &&
-	git show --pretty=short --show-signature $(cat forged1.commit) >actual1 &&
-	grep "BAD signature from" actual1 &&
-	! grep "Good signature from" actual1
 
-ok 6 # skip detect fudged signature (missing GPG)
+Switched to branch 'master'
+rm 'file1'
+[master 34ca441] cleanup
+ Author: A U Thor <author@example.com>
+ 1 file changed, 2 deletions(-)
+ delete mode 100644 file1
+[master 8a2203d] initial with -a
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 commit is
+ create mode 100644 not/forbid
+ok 5 - the basics
 
-skipping test: detect fudged signature with NUL 
-	git cat-file commit seventh-signed >raw &&
-	cat raw >forged2 &&
-	echo Qwik | tr "Q" "\000" >>forged2 &&
-	git hash-object -w -t commit forged2 >forged2.commit &&
-	test_must_fail git verify-commit $(cat forged2.commit) &&
-	git show --pretty=short --show-signature $(cat forged2.commit) >actual2 &&
-	grep "BAD signature from" actual2 &&
-	! grep "Good signature from" actual2
+expecting success: 
 
-ok 7 # skip detect fudged signature with NUL (missing GPG)
+	echo another >"commit is" &&
+	echo another >not/forbid &&
+	test_tick &&
+	git commit -m "partial commit to handle a file" "commit is" &&
 
-skipping test: amending already signed commit 
-	git checkout fourth-signed^0 &&
-	git commit --amend -S --no-edit &&
-	git verify-commit HEAD &&
-	git show -s --show-signature HEAD >actual &&
-	grep "Good signature from" actual &&
-	! grep "BAD signature from" actual
+	changed=$(git diff-tree --name-only HEAD^ HEAD) &&
+	test "$changed" = "commit is"
 
-ok 8 # skip amending already signed commit (missing GPG)
 
-skipping test: show good signature with custom format 
-	cat >expect <<-\EOF &&
-	G
-	13B6F51ECDDE430D
-	C O Mitter <committer@example.com>
-	73D758744BE721698EC54E8713B6F51ECDDE430D
-	73D758744BE721698EC54E8713B6F51ECDDE430D
-	EOF
-	git log -1 --format="%G?%n%GK%n%GS%n%GF%n%GP" sixth-signed >actual &&
-	test_cmp expect actual
+[master 3302250] partial commit to handle a file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 6 - partial
 
-ok 9 # skip show good signature with custom format (missing GPG)
+expecting success: 
 
-skipping test: show bad signature with custom format 
-	cat >expect <<-\EOF &&
-	B
-	13B6F51ECDDE430D
-	C O Mitter <committer@example.com>
+	test_tick &&
+	git commit -m "partial commit to subdirectory" not &&
 
+	changed=$(git diff-tree -r --name-only HEAD^ HEAD) &&
+	test "$changed" = "not/forbid"
 
-	EOF
-	git log -1 --format="%G?%n%GK%n%GS%n%GF%n%GP" $(cat forged1.commit) >actual &&
-	test_cmp expect actual
 
-ok 10 # skip show bad signature with custom format (missing GPG)
+[master 742b3a6] partial commit to subdirectory
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 7 - partial modification in a subdirectory
 
-skipping test: show untrusted signature with custom format 
-	cat >expect <<-\EOF &&
-	U
-	65A0EEA02E30CAD7
-	Eris Discordia <discord@example.net>
-	F8364A59E07FFE9F4D63005A65A0EEA02E30CAD7
-	D4BE22311AD3131E5EDA29A461092E85B7227189
-	EOF
-	git log -1 --format="%G?%n%GK%n%GS%n%GF%n%GP" eighth-signed-alt >actual &&
-	test_cmp expect actual
+expecting success: 
 
-ok 11 # skip show untrusted signature with custom format (missing GPG)
+	git rm not/forbid &&
+	git commit -m "partial commit to remove not/forbid" not &&
 
-skipping test: show unknown signature with custom format 
-	cat >expect <<-\EOF &&
-	E
-	65A0EEA02E30CAD7
+	changed=$(git diff-tree -r --name-only HEAD^ HEAD) &&
+	test "$changed" = "not/forbid" &&
+	remain=$(git ls-tree -r --name-only HEAD) &&
+	test "$remain" = "commit is"
 
 
+rm 'not/forbid'
+[master 09fd303] partial commit to remove not/forbid
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 not/forbid
+ok 8 - partial removal
 
-	EOF
-	GNUPGHOME="$GNUPGHOME_NOT_USED" git log -1 --format="%G?%n%GK%n%GS%n%GF%n%GP" eighth-signed-alt >actual &&
-	test_cmp expect actual
+expecting success: 
 
-ok 12 # skip show unknown signature with custom format (missing GPG)
+	>positive &&
+	git add positive &&
+	git commit -s -m "thank you" &&
+	actual=$(git cat-file commit HEAD | sed -ne "s/Signed-off-by: //p") &&
+	expected=$(git var GIT_COMMITTER_IDENT | sed -e "s/>.*/>/") &&
+	test "z$actual" = "z$expected"
 
-skipping test: show lack of signature with custom format 
-	cat >expect <<-\EOF &&
-	N
 
+[master cc1232b] thank you
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 positive
+ok 9 - sign off
 
+expecting success: 
 
+	>negative &&
+	git add negative &&
+	git commit -m "one" -m "two" -m "three" &&
+	actual=$(git cat-file commit HEAD | sed -e "1,/^\$/d") &&
+	expected=$(echo one; echo; echo two; echo; echo three) &&
+	test "z$actual" = "z$expected"
 
-	EOF
-	git log -1 --format="%G?%n%GK%n%GS%n%GF%n%GP" seventh-unsigned >actual &&
-	test_cmp expect actual
 
-ok 13 # skip show lack of signature with custom format (missing GPG)
+[master 19f335d] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 negative
+ok 10 - multiple -m
 
-skipping test: log.showsignature behaves like --show-signature 
-	test_config log.showsignature true &&
-	git show initial >actual &&
-	grep "gpg: Signature made" actual &&
-	grep "gpg: Good signature" actual
+expecting success: 
 
-ok 14 # skip log.showsignature behaves like --show-signature (missing GPG)
+	echo minus >negative &&
+	git add negative &&
+	git status -v | sed -ne "/^diff --git /p" >actual &&
+	echo "diff --git a/negative b/negative" >expect &&
+	test_cmp expect actual
 
-skipping test: check config gpg.format values 
-	test_config gpg.format openpgp &&
-	git commit -S --amend -m "success" &&
-	test_config gpg.format OpEnPgP &&
-	test_must_fail git commit -S --amend -m "fail"
 
-ok 15 # skip check config gpg.format values (missing GPG)
+ok 11 - verbose
 
-skipping test: detect fudged commit with double signature 
-	sed -e "/gpgsig/,/END PGP/d" forged1 >double-base &&
-	sed -n -e "/gpgsig/,/END PGP/p" forged1 | \
-		sed -e "s/^gpgsig//;s/^ //" | gpg --dearmor >double-sig1.sig &&
-	gpg -o double-sig2.sig -u 29472784 --detach-sign double-base &&
-	cat double-sig1.sig double-sig2.sig | gpg --enarmor >double-combined.asc &&
-	sed -e "s/^\(-.*\)ARMORED FILE/\1SIGNATURE/;1s/^/gpgsig /;2,\$s/^/ /" \
-		double-combined.asc > double-gpgsig &&
-	sed -e "/committer/r double-gpgsig" double-base >double-commit &&
-	git hash-object -w -t commit double-commit >double-commit.commit &&
-	test_must_fail git verify-commit $(cat double-commit.commit) &&
-	git show --pretty=short --show-signature $(cat double-commit.commit) >double-actual &&
-	grep "BAD signature from" double-actual &&
-	grep "Good signature from" double-actual
+expecting success: 
 
-ok 16 # skip detect fudged commit with double signature (missing GPG)
+	test_config diff.noprefix true &&
+	git status -v >actual &&
+	grep "diff --git negative negative" actual
 
-skipping test: show double signature with custom format 
-	cat >expect <<-\EOF &&
-	E
+diff --git negative negative
+ok 12 - verbose respects diff config
 
+expecting success: 
+	printf "%s" "$mesg_with_comment_and_newlines" >expect
 
+ok 13 - prepare file with comment line and trailing newlines
 
+expecting success: 
 
-	EOF
-	git log -1 --format="%G?%n%GK%n%GS%n%GF%n%GP" $(cat double-commit.commit) >actual &&
+	echo >>negative &&
+	git commit --cleanup=verbatim --no-status -t expect -a &&
+	git cat-file -p HEAD |sed -e "1,/^\$/d" >actual &&
 	test_cmp expect actual
 
-ok 17 # skip show double signature with custom format (missing GPG)
-
-# passed all 17 test(s)
-1..17
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t7507-commit-verbose.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7507-commit-verbose/.git/
-expecting success: 
-	echo content >file &&
-	git add file &&
-	git commit -F message
 
-[master (root-commit) d3a14fd] subject
+[master a8a362f] # text
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-ok 1 - setup
+ 1 file changed, 2 insertions(+)
+ok 14 - cleanup commit messages (verbatim option,-t)
 
 expecting success: 
-	git commit --amend -v &&
-	test_line_count = 1 out
 
-[master d3a14fd] subject
- Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:09:39 2021 +0000
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-ok 2 - initial commit shows verbose diff
+	echo >>negative &&
+	git commit --cleanup=verbatim -F expect -a &&
+	git cat-file -p HEAD |sed -e "1,/^\$/d">actual &&
+	test_cmp expect actual
 
-expecting success: 
-	echo content modified >file &&
-	git add file &&
-	git commit -F message
 
-[master 1ca7bf3] subject
+[master 1a798b1] # text
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 3 - second commit
+ 1 file changed, 1 insertion(+)
+ok 15 - cleanup commit messages (verbatim option,-F)
 
 expecting success: 
-	git commit --amend -v &&
-	check_message message &&
-	test_line_count = 1 out
 
-[master 1ca7bf3] subject
- Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:09:39 2021 +0000
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 4 - verbose diff is stripped out
+	echo >>negative &&
+	git commit --cleanup=verbatim -m "$mesg_with_comment_and_newlines" -a &&
+	git cat-file -p HEAD |sed -e "1,/^\$/d">actual &&
+	test_cmp expect actual
 
-expecting success: 
-	git config diff.mnemonicprefix true &&
-	git commit --amend -v &&
-	check_message message &&
-	test_line_count = 1 out
 
-[master 1ca7bf3] subject
+[master 980cf90] # text
  Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:09:39 2021 +0000
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 5 - verbose diff is stripped out (mnemonicprefix)
+ 1 file changed, 1 insertion(+)
+ok 16 - cleanup commit messages (verbatim option,-m)
 
 expecting success: 
-	git commit --amend -F diff &&
-	check_message diff
 
-[master 004b396] This is an example commit message that contains a diff.
- Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:09:39 2021 +0000
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 6 - diff in message is retained without -v
+	echo >>negative &&
+	{ echo;echo "# text";echo; } >text &&
+	echo "# text" >expect &&
+	git commit --cleanup=whitespace -F text -a &&
+	git cat-file -p HEAD |sed -e "1,/^\$/d">actual &&
+	test_cmp expect actual
 
-expecting success: 
-	git commit --amend -F diff -v &&
-	check_message diff
 
-[master 004b396] This is an example commit message that contains a diff.
+[master 94a43e3] # text
  Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:09:39 2021 +0000
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 7 - diff in message is retained with -v
+ 1 file changed, 1 insertion(+)
+ok 17 - cleanup commit messages (whitespace option,-F)
 
 expecting success: 
-	git config diff.submodule log &&
-	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_i18ngrep "Aborting commit due to empty commit message." err
-
-Cloning into '/build/git-2.20.1/t/trash directory.t7507-commit-verbose/sub'...
-done.
-[master 0fb50a6] sub added
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
-[master 109fbb3] 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:
-#	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 004b396..109fbb3:
-  > submodule commit
-Aborting commit due to empty commit message.
-ok 8 - submodule log is stripped out too with -v
+	echo >>negative &&
+	cat >text <<EOF &&
 
-expecting success: 
-	(
-		GIT_EDITOR=cat &&
-		export GIT_EDITOR &&
-		test_must_fail git -c core.commentchar=";" commit -a -v 2>err
-	) &&
-	test_i18ngrep "Aborting commit due to empty commit message." err
+# to be kept
 
+  # ------------------------ >8 ------------------------
+# to be kept, too
+# ------------------------ >8 ------------------------
+to be removed
+# ------------------------ >8 ------------------------
+to be removed, too
+EOF
 
-; 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:
-;	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 004b396..109fbb3:
-  > submodule commit
-Aborting commit due to empty commit message.
-ok 9 - verbose diff is stripped out with set core.commentChar
+	cat >expect <<EOF &&
+# to be kept
 
-expecting success: 
-	git status >actual &&
-	! grep "^diff --git" actual
+  # ------------------------ >8 ------------------------
+# to be kept, too
+EOF
+	git commit --cleanup=scissors -e -F text -a &&
+	git cat-file -p HEAD |sed -e "1,/^\$/d">actual &&
+	test_cmp expect actual
 
-ok 10 - status does not verbose without --verbose
+[master 716e3cc] # to be kept
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 18 - cleanup commit messages (scissors option,-F,-e)
 
 expecting success: 
-	echo dirty >file
 
-ok 11 - setup -v -v
+	echo >>negative &&
+	cat >text <<EOF &&
+# ------------------------ >8 ------------------------
+to be removed
+EOF
+	git commit --cleanup=scissors -e -F text -a --allow-empty-message &&
+	git cat-file -p HEAD |sed -e "1,/^\$/d">actual &&
+	test_must_be_empty actual
 
-expecting success: 
-		git -c commit.verbose=true commit --amend &&
-		test_line_count = 1 out
-	
-[master 0fb50a6] sub added
+[master e7b5e59] 
  Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:09:40 2021 +0000
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
-ok 12 - commit.verbose=true and --verbose omitted
+ 1 file changed, 1 insertion(+)
+ok 19 - cleanup commit messages (scissors option,-F,-e, scissors on first line)
 
 expecting success: 
-		git -c commit.verbose=1 commit --amend &&
-		test_line_count = 1 out
-	
-[master 0fb50a6] sub added
- Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:09:40 2021 +0000
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
-ok 13 - commit.verbose=1 and --verbose omitted
 
-expecting success: 
-		git -c commit.verbose=false commit --amend &&
-		test_line_count = 0 out
-	
-[master 0fb50a6] sub added
- Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:09:40 2021 +0000
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
-ok 14 - commit.verbose=false and --verbose omitted
+	echo >>negative &&
+	{ echo;echo "# text";echo sample;echo; } >text &&
+	echo sample >expect &&
+	git commit --cleanup=strip -F text -a &&
+	git cat-file -p HEAD |sed -e "1,/^\$/d">actual &&
+	test_cmp expect actual
 
-expecting success: 
-		git -c commit.verbose=-2 commit --amend &&
-		test_line_count = 0 out
-	
-[master 0fb50a6] sub added
- Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:09:40 2021 +0000
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
-ok 15 - commit.verbose=-2 and --verbose omitted
 
-expecting success: 
-		git -c commit.verbose=-1 commit --amend &&
-		test_line_count = 0 out
-	
-[master 0fb50a6] sub added
+[master c5e08a2] sample
  Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:09:40 2021 +0000
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
-ok 16 - commit.verbose=-1 and --verbose omitted
+ 1 file changed, 1 insertion(+)
+ok 20 - cleanup commit messages (strip option,-F)
 
 expecting success: 
-		git -c commit.verbose=0 commit --amend &&
-		test_line_count = 0 out
-	
-[master 0fb50a6] sub added
- Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:09:40 2021 +0000
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
-ok 17 - commit.verbose=0 and --verbose omitted
 
-expecting success: 
-		git -c commit.verbose=2 commit --amend &&
-		test_line_count = 2 out
-	
-[master 0fb50a6] sub added
- Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:09:40 2021 +0000
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
-ok 18 - commit.verbose=2 and --verbose omitted
+	echo >>negative &&
+	{ echo;echo sample;echo; } >text &&
+	git commit -e -F text -a &&
+	head -n 4 .git/COMMIT_EDITMSG >actual
 
-expecting success: 
-		git -c commit.verbose=3 commit --amend &&
-		test_line_count = 2 out
-	
-[master db10077] sub added
+[master 68ab696] sample
  Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:09:40 2021 +0000
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
-ok 19 - commit.verbose=3 and --verbose omitted
+ 1 file changed, 1 insertion(+)
+ok 21 - cleanup commit messages (strip option,-F,-e)
 
 expecting success: 
-		git -c commit.verbose=true commit --amend --verbose &&
-		test_line_count = 1 out
-	
-[master db10077] sub added
- Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:09:40 2021 +0000
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
-ok 20 - commit.verbose=true and --verbose
+	test_i18ncmp expect actual
 
-expecting success: 
-		git -c commit.verbose=true commit --amend --no-verbose &&
-		test_line_count = 0 out
-	
-[master db10077] sub added
- Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:09:40 2021 +0000
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
-ok 21 - commit.verbose=true and --no-verbose
+ok 22 - cleanup commit messages (strip option,-F,-e): output
 
 expecting success: 
-		git -c commit.verbose=true commit --amend -v -v &&
-		test_line_count = 2 out
-	
-[master db10077] sub added
- Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:09:40 2021 +0000
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
-ok 22 - commit.verbose=true and -v -v
+	test_must_fail git commit --cleanup=non-existent
 
-expecting success: 
-		git -c commit.verbose=false commit --amend --verbose &&
-		test_line_count = 1 out
-	
-[master db10077] sub added
- Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:09:40 2021 +0000
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
-ok 23 - commit.verbose=false and --verbose
+fatal: Invalid cleanup mode non-existent
+ok 23 - cleanup commit message (fail on invalid cleanup mode option)
 
 expecting success: 
-		git -c commit.verbose=false commit --amend --no-verbose &&
-		test_line_count = 0 out
-	
-[master db10077] sub added
- Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:09:40 2021 +0000
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
-ok 24 - commit.verbose=false and --no-verbose
+	test_must_fail git -c commit.cleanup=non-existent commit
 
-expecting success: 
-		git -c commit.verbose=false commit --amend -v -v &&
-		test_line_count = 2 out
-	
-[master db10077] sub added
- Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:09:40 2021 +0000
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
-ok 25 - commit.verbose=false and -v -v
+fatal: Invalid cleanup mode non-existent
+ok 24 - cleanup commit message (fail on invalid cleanup mode configuration)
 
 expecting success: 
-		git -c commit.verbose=-2 commit --amend --verbose &&
-		test_line_count = 1 out
-	
-[master db10077] sub added
- Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:09:40 2021 +0000
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
-ok 26 - commit.verbose=-2 and --verbose
+	echo content >>file &&
+	git add file &&
+	(
+	  test_set_editor "$TEST_DIRECTORY"/t7500/add-content-and-comment &&
+	  git commit --no-status
+	) &&
+	commit_msg_is "commit message"
 
-expecting success: 
-		git -c commit.verbose=-2 commit --amend --no-verbose &&
-		test_line_count = 0 out
-	
-[master db10077] sub added
+[master d6a2899] commit message
  Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:09:40 2021 +0000
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
-ok 27 - commit.verbose=-2 and --no-verbose
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+ok 25 - cleanup commit message (no config and no option uses default)
 
 expecting success: 
-		git -c commit.verbose=-2 commit --amend -v -v &&
-		test_line_count = 2 out
-	
-[master db10077] sub added
- Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:09:40 2021 +0000
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
-ok 28 - commit.verbose=-2 and -v -v
+	echo content >>file &&
+	git add file &&
+	(
+	  test_set_editor "$TEST_DIRECTORY"/t7500/add-content-and-comment &&
+	  git commit --cleanup=whitespace --no-status
+	) &&
+	commit_msg_is "commit message # comment"
 
-expecting success: 
-		git -c commit.verbose=-1 commit --amend --verbose &&
-		test_line_count = 1 out
-	
-[master db10077] sub added
+[master 677ffe8] commit message # comment
  Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:09:40 2021 +0000
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
-ok 29 - commit.verbose=-1 and --verbose
+ 1 file changed, 1 insertion(+)
+ok 26 - cleanup commit message (option overrides default)
 
 expecting success: 
-		git -c commit.verbose=-1 commit --amend --no-verbose &&
-		test_line_count = 0 out
-	
-[master db10077] sub added
- Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:09:40 2021 +0000
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
-ok 30 - commit.verbose=-1 and --no-verbose
+	echo content >>file &&
+	git add file &&
+	(
+	  test_set_editor "$TEST_DIRECTORY"/t7500/add-content-and-comment &&
+	  git -c commit.cleanup=whitespace commit --no-status
+	) &&
+	commit_msg_is "commit message # comment"
 
-expecting success: 
-		git -c commit.verbose=-1 commit --amend -v -v &&
-		test_line_count = 2 out
-	
-[master db10077] sub added
+[master 7403f47] commit message # comment
  Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:09:40 2021 +0000
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
-ok 31 - commit.verbose=-1 and -v -v
+ 1 file changed, 1 insertion(+)
+ok 27 - cleanup commit message (config overrides default)
 
 expecting success: 
-		git -c commit.verbose=0 commit --amend --verbose &&
-		test_line_count = 1 out
-	
-[master db10077] sub added
- Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:09:40 2021 +0000
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
-ok 32 - commit.verbose=0 and --verbose
+	echo content >>file &&
+	git add file &&
+	(
+	  test_set_editor "$TEST_DIRECTORY"/t7500/add-content-and-comment &&
+	  git -c commit.cleanup=whitespace commit --cleanup=default
+	) &&
+	commit_msg_is "commit message"
 
-expecting success: 
-		git -c commit.verbose=0 commit --amend --no-verbose &&
-		test_line_count = 0 out
-	
-[master 10bf57e] sub added
+[master 7dda181] commit message
  Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:09:40 2021 +0000
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
-ok 33 - commit.verbose=0 and --no-verbose
+ 1 file changed, 1 insertion(+)
+ok 28 - cleanup commit message (option overrides config)
 
 expecting success: 
-		git -c commit.verbose=0 commit --amend -v -v &&
-		test_line_count = 2 out
-	
-[master 10bf57e] sub added
- Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:09:40 2021 +0000
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
-ok 34 - commit.verbose=0 and -v -v
+	echo content >>file &&
+	git add file &&
+	git commit -m "message #comment " &&
+	commit_msg_is "message #comment"
 
-expecting success: 
-		git -c commit.verbose=1 commit --amend --verbose &&
-		test_line_count = 1 out
-	
-[master 10bf57e] sub added
+[master 1a59102] message #comment
  Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:09:40 2021 +0000
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
-ok 35 - commit.verbose=1 and --verbose
+ 1 file changed, 1 insertion(+)
+ok 29 - cleanup commit message (default, -m)
 
 expecting success: 
-		git -c commit.verbose=1 commit --amend --no-verbose &&
-		test_line_count = 0 out
-	
-[master 10bf57e] sub added
- Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:09:40 2021 +0000
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
-ok 36 - commit.verbose=1 and --no-verbose
+	echo content >>file &&
+	git add file &&
+	git commit --cleanup=whitespace --no-status -m "message #comment " &&
+	commit_msg_is "message #comment"
 
-expecting success: 
-		git -c commit.verbose=1 commit --amend -v -v &&
-		test_line_count = 2 out
-	
-[master 10bf57e] sub added
+[master a3a10c1] message #comment
  Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:09:40 2021 +0000
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
-ok 37 - commit.verbose=1 and -v -v
+ 1 file changed, 1 insertion(+)
+ok 30 - cleanup commit message (whitespace option, -m)
 
 expecting success: 
-		git -c commit.verbose=2 commit --amend --verbose &&
-		test_line_count = 1 out
-	
-[master 10bf57e] sub added
- Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:09:40 2021 +0000
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
-ok 38 - commit.verbose=2 and --verbose
+	echo content >>file &&
+	git add file &&
+	git -c commit.cleanup=whitespace commit --no-status -m "message #comment " &&
+	commit_msg_is "message #comment"
 
-expecting success: 
-		git -c commit.verbose=2 commit --amend --no-verbose &&
-		test_line_count = 0 out
-	
-[master 10bf57e] sub added
+[master 5e53dc8] message #comment
  Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:09:40 2021 +0000
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
-ok 39 - commit.verbose=2 and --no-verbose
+ 1 file changed, 1 insertion(+)
+ok 31 - cleanup commit message (whitespace config, -m)
 
 expecting success: 
-		git -c commit.verbose=2 commit --amend -v -v &&
-		test_line_count = 2 out
-	
-[master 10bf57e] sub added
- Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:09:40 2021 +0000
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
-ok 40 - commit.verbose=2 and -v -v
+	echo >>negative &&
+	git commit -e -m "sample" -a &&
+	test_i18ngrep \
+	  "^# Author: *A U Thor <author@example.com>\$" \
+	  .git/COMMIT_EDITMSG
 
-expecting success: 
-		git -c commit.verbose=3 commit --amend --verbose &&
-		test_line_count = 1 out
-	
-[master 10bf57e] sub added
+[master 412b92d] sample
  Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:09:40 2021 +0000
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
-ok 41 - commit.verbose=3 and --verbose
+ 1 file changed, 1 insertion(+)
+# Author:    A U Thor <author@example.com>
+ok 32 - message shows author when it is not equal to committer
 
 expecting success: 
-		git -c commit.verbose=3 commit --amend --no-verbose &&
-		test_line_count = 0 out
-	
-[master 10bf57e] sub added
- Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:09:40 2021 +0000
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
-ok 42 - commit.verbose=3 and --no-verbose
+	git commit --allow-empty -e -m foo --date="2010-01-02T03:04:05" &&
+	test_i18ngrep \
+	  "^# Date: *Sat Jan 2 03:04:05 2010 +0000" \
+	  .git/COMMIT_EDITMSG
 
-expecting success: 
-		git -c commit.verbose=3 commit --amend -v -v &&
-		test_line_count = 2 out
-	
-[master 10bf57e] sub added
+[master e7428d3] foo
  Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:09:40 2021 +0000
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
-ok 43 - commit.verbose=3 and -v -v
+ Date: Sat Jan 2 03:04:05 2010 +0000
+# Date:      Sat Jan 2 03:04:05 2010 +0000
+ok 33 - message shows date when it is explicitly set
 
-expecting success: 
-	git -c commit.verbose=true status >actual &&
-	! grep "^diff --git actual"
+checking prerequisite: AUTOIDENT
 
-ok 44 - status ignores commit.verbose=true
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
+	sane_unset GIT_AUTHOR_NAME &&
+	sane_unset GIT_AUTHOR_EMAIL &&
+	git var GIT_AUTHOR_IDENT
 
-# passed all 44 test(s)
-1..44
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t7511-status-index.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7511-status-index/.git/
+)
+second user <pbuilder2@ionos5-amd64.debian.net> 1112912533 -0700
+prerequisite AUTOIDENT ok
 expecting success: 
-		git add * &&
-		git status
-	
-On branch master
 
-No commits yet
+	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_i18ngrep "^# Committer: " .git/COMMIT_EDITMSG
 
-Changes to be committed:
-  (use "git rm --cached <file>..." to unstage)
+[master 9be036c] sample
+ Author: A U Thor <author@example.com>
+ Committer: second user <pbuilder2@ionos5-amd64.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:
 
-	new file:   0
-	new file:   1
-	new file:   2
-	new file:   3
-	new file:   4
-	new file:   5
-	new file:   6
-	new file:   7
-	new file:   8
-	new file:   9
-	new file:   a
-	new file:   b
-	new file:   c
-	new file:   d
-	new file:   e
-	new file:   f
-	new file:   g
-	new file:   h
-	new file:   i
-	new file:   j
-	new file:   k
-	new file:   l
-	new file:   m
-	new file:   n
-	new file:   o
-	new file:   p
-	new file:   q
-	new file:   r
-	new file:   s
-	new file:   t
-	new file:   u
-	new file:   v
-	new file:   w
-	new file:   x
-	new file:   y
-	new file:   z
+    git config --global --edit
 
-ok 1 - status, filename length 1
+After doing this, you may fix the identity used for this commit with:
 
-expecting success: 
-		git add p* &&
-		git status
-	
-On branch master
+    git commit --amend --reset-author
 
-No commits yet
+ 1 file changed, 1 insertion(+)
+# Committer: second user <pbuilder2@ionos5-amd64.debian.net>
+ok 34 - message shows committer when it is automatic
 
-Changes to be committed:
-  (use "git rm --cached <file>..." to unstage)
+skipping test: do not fire editor when committer is bogus 
+	>.git/result &&
 
-	new file:   p0
-	new file:   p1
-	new file:   p2
-	new file:   p3
-	new file:   p4
-	new file:   p5
-	new file:   p6
-	new file:   p7
-	new file:   p8
-	new file:   p9
-	new file:   pa
-	new file:   pb
-	new file:   pc
-	new file:   pd
-	new file:   pe
-	new file:   pf
-	new file:   pg
-	new file:   ph
-	new file:   pi
-	new file:   pj
-	new file:   pk
-	new file:   pl
-	new file:   pm
-	new file:   pn
-	new file:   po
-	new file:   pp
-	new file:   pq
-	new file:   pr
-	new file:   ps
-	new file:   pt
-	new file:   pu
-	new file:   pv
-	new file:   pw
-	new file:   px
-	new file:   py
-	new file:   pz
+	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
 
-ok 2 - status, filename length 2
+ok 35 # skip do not fire editor when committer is bogus (missing !AUTOIDENT)
 
 expecting success: 
-		git add px* &&
-		git status
-	
-On branch master
-
-No commits yet
+	echo tick >file &&
+	git add file &&
+	echo "editor not started" >.git/result &&
+	(GIT_EDITOR="\"$(pwd)/.git/FAKE_EDITOR\"" git commit -m tick) &&
+	test "$(cat .git/result)" = "editor not started"
 
-Changes to be committed:
-  (use "git rm --cached <file>..." to unstage)
+[master 9ce368b] tick
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 7 deletions(-)
+ok 36 - do not fire editor if -m <msg> was given
 
-	new file:   px0
-	new file:   px1
-	new file:   px2
-	new file:   px3
-	new file:   px4
-	new file:   px5
-	new file:   px6
-	new file:   px7
-	new file:   px8
-	new file:   px9
-	new file:   pxa
-	new file:   pxb
-	new file:   pxc
-	new file:   pxd
-	new file:   pxe
-	new file:   pxf
-	new file:   pxg
-	new file:   pxh
-	new file:   pxi
-	new file:   pxj
-	new file:   pxk
-	new file:   pxl
-	new file:   pxm
-	new file:   pxn
-	new file:   pxo
-	new file:   pxp
-	new file:   pxq
-	new file:   pxr
-	new file:   pxs
-	new file:   pxt
-	new file:   pxu
-	new file:   pxv
-	new file:   pxw
-	new file:   pxx
-	new file:   pxy
-	new file:   pxz
+expecting success: 
+	echo tock >file &&
+	git add file &&
+	echo "editor not started" >.git/result &&
+	(GIT_EDITOR="\"$(pwd)/.git/FAKE_EDITOR\"" \
+	 git commit -m "" --allow-empty-message) &&
+	test "$(cat .git/result)" = "editor not started"
 
-ok 3 - status, filename length 3
+[master 9450851] 
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 37 - do not fire editor if -m "" was given
 
 expecting success: 
-		git add pre* &&
-		git status
-	
-On branch master
 
-No commits yet
+	git clean -f &&
+	echo f >g &&
+	git add g &&
+	git commit -m "add g" &&
+	git branch second &&
+	echo master >g &&
+	echo g >h &&
+	git add g h &&
+	git commit -m "modify g and add h" &&
+	git checkout second &&
+	echo second >g &&
+	git add g &&
+	git commit -m second &&
+	# Must fail due to conflict
+	test_must_fail git cherry-pick -n master &&
+	echo "editor not started" >.git/result &&
+	(
+		GIT_EDITOR="\"$(pwd)/.git/FAKE_EDITOR\"" &&
+		export GIT_EDITOR &&
+		test_must_fail git commit
+	) &&
+	test "$(cat .git/result)" = "editor not started"
 
-Changes to be committed:
-  (use "git rm --cached <file>..." to unstage)
+Removing act
+Removing actual
+Removing commit_msg_is.actual
+Removing commit_msg_is.expect
+Removing current.1
+Removing current.2
+Removing exp
+Removing expect
+Removing text
+[master c0c3abb] add g
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 g
+[master daddddf] modify g and add h
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+ create mode 100644 h
+Switched to branch 'second'
+[second b321431] 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 daddddf... modify g and add h
+hint: after resolving the conflicts, mark the corrected paths
+hint: with 'git add <paths>' or 'git rm <paths>'
+error: Committing is not possible because you have unmerged files.
+hint: Fix them up in the work tree, and then use 'git add/rm <file>'
+hint: as appropriate to mark resolution and make a commit.
+fatal: Exiting because of an unresolved conflict.
+U	g
+ok 38 - do not fire editor in the presence of conflicts
 
-	new file:   pre0
-	new file:   pre1
-	new file:   pre2
-	new file:   pre3
-	new file:   pre4
-	new file:   pre5
-	new file:   pre6
-	new file:   pre7
-	new file:   pre8
-	new file:   pre9
-	new file:   prea
-	new file:   preb
-	new file:   prec
-	new file:   pred
-	new file:   pree
-	new file:   pref
-	new file:   preg
-	new file:   preh
-	new file:   prei
-	new file:   prej
-	new file:   prek
-	new file:   prel
-	new file:   prem
-	new file:   pren
-	new file:   preo
-	new file:   prep
-	new file:   preq
-	new file:   prer
-	new file:   pres
-	new file:   pret
-	new file:   preu
-	new file:   prev
-	new file:   prew
-	new file:   prex
-	new file:   prey
-	new file:   prez
+expecting success: 
+	echo >>negative &&
+	! "$SHELL_PATH" -c '
+	  echo kill -TERM $$ >> .git/FAKE_EDITOR
+	  GIT_EDITOR=.git/FAKE_EDITOR
+	  export GIT_EDITOR
+	  exec git commit -a' &&
+	test ! -f .git/index.lock
 
-ok 4 - status, filename length 4
+Terminated
+ok 39 - a SIGTERM should break locks
 
 expecting success: 
-		git add pref* &&
-		git status
-	
-On branch master
 
-No commits yet
-
-Changes to be committed:
-  (use "git rm --cached <file>..." to unstage)
+	git rev-parse second master >expect &&
+	test_must_fail git merge second master &&
+	git checkout master g &&
+	EDITOR=: git commit -a &&
+	git cat-file commit HEAD | sed -n -e "s/^parent //p" -e "/^$/q" >actual &&
+	test_cmp expect actual
 
-	new file:   pref0
-	new file:   pref1
-	new file:   pref2
-	new file:   pref3
-	new file:   pref4
-	new file:   pref5
-	new file:   pref6
-	new file:   pref7
-	new file:   pref8
-	new file:   pref9
-	new file:   prefa
-	new file:   prefb
-	new file:   prefc
-	new file:   prefd
-	new file:   prefe
-	new file:   preff
-	new file:   prefg
-	new file:   prefh
-	new file:   prefi
-	new file:   prefj
-	new file:   prefk
-	new file:   prefl
-	new file:   prefm
-	new file:   prefn
-	new file:   prefo
-	new file:   prefp
-	new file:   prefq
-	new file:   prefr
-	new file:   prefs
-	new file:   preft
-	new file:   prefu
-	new file:   prefv
-	new file:   prefw
-	new file:   prefx
-	new file:   prefy
-	new file:   prefz
 
-ok 5 - status, filename length 5
+Merging:
+virtual second
+virtual master
+found 1 common ancestor:
+c0c3abb add g
+Auto-merging g
+CONFLICT (content): Merge conflict in g
+Automatic merge failed; fix conflicts and then commit the result.
+[second 26999aa] Merge branch 'master' into second
+ Author: A U Thor <author@example.com>
+ok 40 - Hand committing of a redundant merge removes dups
 
 expecting success: 
-		git add prefi* &&
-		git status
-	
-On branch master
 
-No commits yet
-
-Changes to be committed:
-  (use "git rm --cached <file>..." to unstage)
+	git reset --hard &&
+	git commit -s -m "hello: kitty" --allow-empty &&
+	git cat-file commit HEAD | sed -e "1,/^$/d" >actual &&
+	test_line_count = 3 actual
 
-	new file:   prefi0
-	new file:   prefi1
-	new file:   prefi2
-	new file:   prefi3
-	new file:   prefi4
-	new file:   prefi5
-	new file:   prefi6
-	new file:   prefi7
-	new file:   prefi8
-	new file:   prefi9
-	new file:   prefia
-	new file:   prefib
-	new file:   prefic
-	new file:   prefid
-	new file:   prefie
-	new file:   prefif
-	new file:   prefig
-	new file:   prefih
-	new file:   prefii
-	new file:   prefij
-	new file:   prefik
-	new file:   prefil
-	new file:   prefim
-	new file:   prefin
-	new file:   prefio
-	new file:   prefip
-	new file:   prefiq
-	new file:   prefir
-	new file:   prefis
-	new file:   prefit
-	new file:   prefiu
-	new file:   prefiv
-	new file:   prefiw
-	new file:   prefix
-	new file:   prefiy
-	new file:   prefiz
 
-ok 6 - status, filename length 6
+HEAD is now at 26999aa Merge branch 'master' into second
+[second 00b3b3c] hello: kitty
+ Author: A U Thor <author@example.com>
+ok 41 - A single-liner subject with a token plus colon is not a footer
 
 expecting success: 
-		git add prefix* &&
-		git status
-	
-On branch master
+	git commit -s --allow-empty --allow-empty-message &&
+	cat <<-EOF >expect &&
 
-No commits yet
 
-Changes to be committed:
-  (use "git rm --cached <file>..." to unstage)
+	Signed-off-by: $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>
 
-	new file:   prefix0
-	new file:   prefix1
-	new file:   prefix2
-	new file:   prefix3
-	new file:   prefix4
-	new file:   prefix5
-	new file:   prefix6
-	new file:   prefix7
-	new file:   prefix8
-	new file:   prefix9
-	new file:   prefixa
-	new file:   prefixb
-	new file:   prefixc
-	new file:   prefixd
-	new file:   prefixe
-	new file:   prefixf
-	new file:   prefixg
-	new file:   prefixh
-	new file:   prefixi
-	new file:   prefixj
-	new file:   prefixk
-	new file:   prefixl
-	new file:   prefixm
-	new file:   prefixn
-	new file:   prefixo
-	new file:   prefixp
-	new file:   prefixq
-	new file:   prefixr
-	new file:   prefixs
-	new file:   prefixt
-	new file:   prefixu
-	new file:   prefixv
-	new file:   prefixw
-	new file:   prefixx
-	new file:   prefixy
-	new file:   prefixz
+	EOF
+	sed -e "/^#/d" -e "s/^:.*//" .git/COMMIT_EDITMSG >actual &&
+	test_cmp expect actual
 
-ok 7 - status, filename length 7
+[second 9871d8b] Signed-off-by: C O Mitter <committer@example.com>
+ Author: A U Thor <author@example.com>
+ok 42 - commit -s places sob on third line after two empty lines
 
 expecting success: 
-		git add prefix-* &&
-		git status
+		try_commit "" &&
+		test_i18ngrep "^# Changes to be committed:" .git/COMMIT_EDITMSG
 	
-On branch master
-
-No commits yet
-
-Changes to be committed:
-  (use "git rm --cached <file>..." to unstage)
-
-	new file:   prefix-0
-	new file:   prefix-1
-	new file:   prefix-2
-	new file:   prefix-3
-	new file:   prefix-4
-	new file:   prefix-5
-	new file:   prefix-6
-	new file:   prefix-7
-	new file:   prefix-8
-	new file:   prefix-9
-	new file:   prefix-a
-	new file:   prefix-b
-	new file:   prefix-c
-	new file:   prefix-d
-	new file:   prefix-e
-	new file:   prefix-f
-	new file:   prefix-g
-	new file:   prefix-h
-	new file:   prefix-i
-	new file:   prefix-j
-	new file:   prefix-k
-	new file:   prefix-l
-	new file:   prefix-m
-	new file:   prefix-n
-	new file:   prefix-o
-	new file:   prefix-p
-	new file:   prefix-q
-	new file:   prefix-r
-	new file:   prefix-s
-	new file:   prefix-t
-	new file:   prefix-u
-	new file:   prefix-v
-	new file:   prefix-w
-	new file:   prefix-x
-	new file:   prefix-y
-	new file:   prefix-z
-
-ok 8 - status, filename length 8
+HEAD is now at 9871d8b Signed-off-by: C O Mitter <committer@example.com>
+[second 559d431] message
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+# Changes to be committed:
+ok 43 - commit
 
 expecting success: 
-		git add prefix-p* &&
-		git status
+		try_commit --status &&
+		test_i18ngrep "^# Changes to be committed:" .git/COMMIT_EDITMSG
 	
-On branch master
-
-No commits yet
-
-Changes to be committed:
-  (use "git rm --cached <file>..." to unstage)
-
-	new file:   prefix-p0
-	new file:   prefix-p1
-	new file:   prefix-p2
-	new file:   prefix-p3
-	new file:   prefix-p4
-	new file:   prefix-p5
-	new file:   prefix-p6
-	new file:   prefix-p7
-	new file:   prefix-p8
-	new file:   prefix-p9
-	new file:   prefix-pa
-	new file:   prefix-pb
-	new file:   prefix-pc
-	new file:   prefix-pd
-	new file:   prefix-pe
-	new file:   prefix-pf
-	new file:   prefix-pg
-	new file:   prefix-ph
-	new file:   prefix-pi
-	new file:   prefix-pj
-	new file:   prefix-pk
-	new file:   prefix-pl
-	new file:   prefix-pm
-	new file:   prefix-pn
-	new file:   prefix-po
-	new file:   prefix-pp
-	new file:   prefix-pq
-	new file:   prefix-pr
-	new file:   prefix-ps
-	new file:   prefix-pt
-	new file:   prefix-pu
-	new file:   prefix-pv
-	new file:   prefix-pw
-	new file:   prefix-px
-	new file:   prefix-py
-	new file:   prefix-pz
-
-ok 9 - status, filename length 9
+HEAD is now at 559d431 message
+[second a7a6874] message
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+# Changes to be committed:
+ok 44 - commit --status
 
 expecting success: 
-		git add prefix-pr* &&
-		git status
+		try_commit --no-status &&
+		test_i18ngrep ! "^# Changes to be committed:" .git/COMMIT_EDITMSG
 	
-On branch master
-
-No commits yet
-
-Changes to be committed:
-  (use "git rm --cached <file>..." to unstage)
-
-	new file:   prefix-pr0
-	new file:   prefix-pr1
-	new file:   prefix-pr2
-	new file:   prefix-pr3
-	new file:   prefix-pr4
-	new file:   prefix-pr5
-	new file:   prefix-pr6
-	new file:   prefix-pr7
-	new file:   prefix-pr8
-	new file:   prefix-pr9
-	new file:   prefix-pra
-	new file:   prefix-prb
-	new file:   prefix-prc
-	new file:   prefix-prd
-	new file:   prefix-pre
-	new file:   prefix-prf
-	new file:   prefix-prg
-	new file:   prefix-prh
-	new file:   prefix-pri
-	new file:   prefix-prj
-	new file:   prefix-prk
-	new file:   prefix-prl
-	new file:   prefix-prm
-	new file:   prefix-prn
-	new file:   prefix-pro
-	new file:   prefix-prp
-	new file:   prefix-prq
-	new file:   prefix-prr
-	new file:   prefix-prs
-	new file:   prefix-prt
-	new file:   prefix-pru
-	new file:   prefix-prv
-	new file:   prefix-prw
-	new file:   prefix-prx
-	new file:   prefix-pry
-	new file:   prefix-prz
-
-ok 10 - status, filename length 10
+HEAD is now at a7a6874 message
+[second 95cbb6c] message
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 45 - commit --no-status
 
 expecting success: 
-		git add prefix-pre* &&
-		git status
+		test_config commit.status yes &&
+		try_commit "" &&
+		test_i18ngrep "^# Changes to be committed:" .git/COMMIT_EDITMSG
 	
-On branch master
-
-No commits yet
-
-Changes to be committed:
-  (use "git rm --cached <file>..." to unstage)
-
-	new file:   prefix-pre0
-	new file:   prefix-pre1
-	new file:   prefix-pre2
-	new file:   prefix-pre3
-	new file:   prefix-pre4
-	new file:   prefix-pre5
-	new file:   prefix-pre6
-	new file:   prefix-pre7
-	new file:   prefix-pre8
-	new file:   prefix-pre9
-	new file:   prefix-prea
-	new file:   prefix-preb
-	new file:   prefix-prec
-	new file:   prefix-pred
-	new file:   prefix-pree
-	new file:   prefix-pref
-	new file:   prefix-preg
-	new file:   prefix-preh
-	new file:   prefix-prei
-	new file:   prefix-prej
-	new file:   prefix-prek
-	new file:   prefix-prel
-	new file:   prefix-prem
-	new file:   prefix-pren
-	new file:   prefix-preo
-	new file:   prefix-prep
-	new file:   prefix-preq
-	new file:   prefix-prer
-	new file:   prefix-pres
-	new file:   prefix-pret
-	new file:   prefix-preu
-	new file:   prefix-prev
-	new file:   prefix-prew
-	new file:   prefix-prex
-	new file:   prefix-prey
-	new file:   prefix-prez
-
-ok 11 - status, filename length 11
+HEAD is now at 95cbb6c message
+[second 93b4022] message
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+# Changes to be committed:
+ok 46 - commit with commit.status = yes
 
 expecting success: 
-		git add prefix-pref* &&
-		git status
+		test_config commit.status no &&
+		try_commit "" &&
+		test_i18ngrep ! "^# Changes to be committed:" .git/COMMIT_EDITMSG
 	
-On branch master
-
-No commits yet
-
-Changes to be committed:
-  (use "git rm --cached <file>..." to unstage)
-
-	new file:   prefix-pref0
-	new file:   prefix-pref1
-	new file:   prefix-pref2
-	new file:   prefix-pref3
-	new file:   prefix-pref4
-	new file:   prefix-pref5
-	new file:   prefix-pref6
-	new file:   prefix-pref7
-	new file:   prefix-pref8
-	new file:   prefix-pref9
-	new file:   prefix-prefa
-	new file:   prefix-prefb
-	new file:   prefix-prefc
-	new file:   prefix-prefd
-	new file:   prefix-prefe
-	new file:   prefix-preff
-	new file:   prefix-prefg
-	new file:   prefix-prefh
-	new file:   prefix-prefi
-	new file:   prefix-prefj
-	new file:   prefix-prefk
-	new file:   prefix-prefl
-	new file:   prefix-prefm
-	new file:   prefix-prefn
-	new file:   prefix-prefo
-	new file:   prefix-prefp
-	new file:   prefix-prefq
-	new file:   prefix-prefr
-	new file:   prefix-prefs
-	new file:   prefix-preft
-	new file:   prefix-prefu
-	new file:   prefix-prefv
-	new file:   prefix-prefw
-	new file:   prefix-prefx
-	new file:   prefix-prefy
-	new file:   prefix-prefz
-
-ok 12 - status, filename length 12
+HEAD is now at 93b4022 message
+[second bd01a4c] message
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 47 - commit with commit.status = no
 
 expecting success: 
-		git add prefix-prefi* &&
-		git status
+		test_config commit.status yes &&
+		try_commit --status &&
+		test_i18ngrep "^# Changes to be committed:" .git/COMMIT_EDITMSG
 	
-On branch master
-
-No commits yet
-
-Changes to be committed:
-  (use "git rm --cached <file>..." to unstage)
-
-	new file:   prefix-prefi0
-	new file:   prefix-prefi1
-	new file:   prefix-prefi2
-	new file:   prefix-prefi3
-	new file:   prefix-prefi4
-	new file:   prefix-prefi5
-	new file:   prefix-prefi6
-	new file:   prefix-prefi7
-	new file:   prefix-prefi8
-	new file:   prefix-prefi9
-	new file:   prefix-prefia
-	new file:   prefix-prefib
-	new file:   prefix-prefic
-	new file:   prefix-prefid
-	new file:   prefix-prefie
-	new file:   prefix-prefif
-	new file:   prefix-prefig
-	new file:   prefix-prefih
-	new file:   prefix-prefii
-	new file:   prefix-prefij
-	new file:   prefix-prefik
-	new file:   prefix-prefil
-	new file:   prefix-prefim
-	new file:   prefix-prefin
-	new file:   prefix-prefio
-	new file:   prefix-prefip
-	new file:   prefix-prefiq
-	new file:   prefix-prefir
-	new file:   prefix-prefis
-	new file:   prefix-prefit
-	new file:   prefix-prefiu
-	new file:   prefix-prefiv
-	new file:   prefix-prefiw
-	new file:   prefix-prefix
-	new file:   prefix-prefiy
-	new file:   prefix-prefiz
-
-ok 13 - status, filename length 13
+HEAD is now at bd01a4c message
+[second e8a86c8] message
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+# Changes to be committed:
+ok 48 - commit --status with commit.status = yes
 
 expecting success: 
-		git add prefix-prefix* &&
-		git status
+		test_config commit.status yes &&
+		try_commit --no-status &&
+		test_i18ngrep ! "^# Changes to be committed:" .git/COMMIT_EDITMSG
 	
-On branch master
-
-No commits yet
-
-Changes to be committed:
-  (use "git rm --cached <file>..." to unstage)
-
-	new file:   prefix-prefix0
-	new file:   prefix-prefix1
-	new file:   prefix-prefix2
-	new file:   prefix-prefix3
-	new file:   prefix-prefix4
-	new file:   prefix-prefix5
-	new file:   prefix-prefix6
-	new file:   prefix-prefix7
-	new file:   prefix-prefix8
-	new file:   prefix-prefix9
-	new file:   prefix-prefixa
-	new file:   prefix-prefixb
-	new file:   prefix-prefixc
-	new file:   prefix-prefixd
-	new file:   prefix-prefixe
-	new file:   prefix-prefixf
-	new file:   prefix-prefixg
-	new file:   prefix-prefixh
-	new file:   prefix-prefixi
-	new file:   prefix-prefixj
-	new file:   prefix-prefixk
-	new file:   prefix-prefixl
-	new file:   prefix-prefixm
-	new file:   prefix-prefixn
-	new file:   prefix-prefixo
-	new file:   prefix-prefixp
-	new file:   prefix-prefixq
-	new file:   prefix-prefixr
-	new file:   prefix-prefixs
-	new file:   prefix-prefixt
-	new file:   prefix-prefixu
-	new file:   prefix-prefixv
-	new file:   prefix-prefixw
-	new file:   prefix-prefixx
-	new file:   prefix-prefixy
-	new file:   prefix-prefixz
-
-ok 14 - status, filename length 14
+HEAD is now at e8a86c8 message
+[second 4f52e44] message
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 49 - commit --no-status with commit.status = yes
 
 expecting success: 
-		git add prefix-prefix-* &&
-		git status
+		test_config commit.status no &&
+		try_commit --status &&
+		test_i18ngrep "^# Changes to be committed:" .git/COMMIT_EDITMSG
 	
-On branch master
-
-No commits yet
-
-Changes to be committed:
-  (use "git rm --cached <file>..." to unstage)
-
-	new file:   prefix-prefix-0
-	new file:   prefix-prefix-1
-	new file:   prefix-prefix-2
-	new file:   prefix-prefix-3
-	new file:   prefix-prefix-4
-	new file:   prefix-prefix-5
-	new file:   prefix-prefix-6
-	new file:   prefix-prefix-7
-	new file:   prefix-prefix-8
-	new file:   prefix-prefix-9
-	new file:   prefix-prefix-a
-	new file:   prefix-prefix-b
-	new file:   prefix-prefix-c
-	new file:   prefix-prefix-d
-	new file:   prefix-prefix-e
-	new file:   prefix-prefix-f
-	new file:   prefix-prefix-g
-	new file:   prefix-prefix-h
-	new file:   prefix-prefix-i
-	new file:   prefix-prefix-j
-	new file:   prefix-prefix-k
-	new file:   prefix-prefix-l
-	new file:   prefix-prefix-m
-	new file:   prefix-prefix-n
-	new file:   prefix-prefix-o
-	new file:   prefix-prefix-p
-	new file:   prefix-prefix-q
-	new file:   prefix-prefix-r
-	new file:   prefix-prefix-s
-	new file:   prefix-prefix-t
-	new file:   prefix-prefix-u
-	new file:   prefix-prefix-v
-	new file:   prefix-prefix-w
-	new file:   prefix-prefix-x
-	new file:   prefix-prefix-y
-	new file:   prefix-prefix-z
-
-ok 15 - status, filename length 15
+HEAD is now at 4f52e44 message
+[second 8ec0615] message
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+# Changes to be committed:
+ok 50 - commit --status with commit.status = no
 
 expecting success: 
-		git add prefix-prefix-p* &&
-		git status
+		test_config commit.status no &&
+		try_commit --no-status &&
+		test_i18ngrep ! "^# Changes to be committed:" .git/COMMIT_EDITMSG
 	
-On branch master
-
-No commits yet
-
-Changes to be committed:
-  (use "git rm --cached <file>..." to unstage)
-
-	new file:   prefix-prefix-p0
-	new file:   prefix-prefix-p1
-	new file:   prefix-prefix-p2
-	new file:   prefix-prefix-p3
-	new file:   prefix-prefix-p4
-	new file:   prefix-prefix-p5
-	new file:   prefix-prefix-p6
-	new file:   prefix-prefix-p7
-	new file:   prefix-prefix-p8
-	new file:   prefix-prefix-p9
-	new file:   prefix-prefix-pa
-	new file:   prefix-prefix-pb
-	new file:   prefix-prefix-pc
-	new file:   prefix-prefix-pd
-	new file:   prefix-prefix-pe
-	new file:   prefix-prefix-pf
-	new file:   prefix-prefix-pg
-	new file:   prefix-prefix-ph
-	new file:   prefix-prefix-pi
-	new file:   prefix-prefix-pj
-	new file:   prefix-prefix-pk
-	new file:   prefix-prefix-pl
-	new file:   prefix-prefix-pm
-	new file:   prefix-prefix-pn
-	new file:   prefix-prefix-po
-	new file:   prefix-prefix-pp
-	new file:   prefix-prefix-pq
-	new file:   prefix-prefix-pr
-	new file:   prefix-prefix-ps
-	new file:   prefix-prefix-pt
-	new file:   prefix-prefix-pu
-	new file:   prefix-prefix-pv
-	new file:   prefix-prefix-pw
-	new file:   prefix-prefix-px
-	new file:   prefix-prefix-py
-	new file:   prefix-prefix-pz
-
-ok 16 - status, filename length 16
+HEAD is now at 8ec0615 message
+[second 926deab] message
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 51 - commit --no-status with commit.status = no
 
 expecting success: 
-		git add prefix-prefix-pr* &&
-		git status
+		try_commit "" &&
+		test_i18ngrep "^# Changes to be committed:" .git/COMMIT_EDITMSG
 	
-On branch master
-
-No commits yet
-
-Changes to be committed:
-  (use "git rm --cached <file>..." to unstage)
-
-	new file:   prefix-prefix-pr0
-	new file:   prefix-prefix-pr1
-	new file:   prefix-prefix-pr2
-	new file:   prefix-prefix-pr3
-	new file:   prefix-prefix-pr4
-	new file:   prefix-prefix-pr5
-	new file:   prefix-prefix-pr6
-	new file:   prefix-prefix-pr7
-	new file:   prefix-prefix-pr8
-	new file:   prefix-prefix-pr9
-	new file:   prefix-prefix-pra
-	new file:   prefix-prefix-prb
-	new file:   prefix-prefix-prc
-	new file:   prefix-prefix-prd
-	new file:   prefix-prefix-pre
-	new file:   prefix-prefix-prf
-	new file:   prefix-prefix-prg
-	new file:   prefix-prefix-prh
-	new file:   prefix-prefix-pri
-	new file:   prefix-prefix-prj
-	new file:   prefix-prefix-prk
-	new file:   prefix-prefix-prl
-	new file:   prefix-prefix-prm
-	new file:   prefix-prefix-prn
-	new file:   prefix-prefix-pro
-	new file:   prefix-prefix-prp
-	new file:   prefix-prefix-prq
-	new file:   prefix-prefix-prr
-	new file:   prefix-prefix-prs
-	new file:   prefix-prefix-prt
-	new file:   prefix-prefix-pru
-	new file:   prefix-prefix-prv
-	new file:   prefix-prefix-prw
-	new file:   prefix-prefix-prx
-	new file:   prefix-prefix-pry
-	new file:   prefix-prefix-prz
-
-ok 17 - status, filename length 17
+HEAD is now at 926deab message
+[second f0d83ed] message
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+## Custom template
+# Changes to be committed:
+ok 52 - commit
 
 expecting success: 
-		git add prefix-prefix-pre* &&
-		git status
+		try_commit --status &&
+		test_i18ngrep "^# Changes to be committed:" .git/COMMIT_EDITMSG
 	
-On branch master
-
-No commits yet
-
-Changes to be committed:
-  (use "git rm --cached <file>..." to unstage)
-
-	new file:   prefix-prefix-pre0
-	new file:   prefix-prefix-pre1
-	new file:   prefix-prefix-pre2
-	new file:   prefix-prefix-pre3
-	new file:   prefix-prefix-pre4
-	new file:   prefix-prefix-pre5
-	new file:   prefix-prefix-pre6
-	new file:   prefix-prefix-pre7
-	new file:   prefix-prefix-pre8
-	new file:   prefix-prefix-pre9
-	new file:   prefix-prefix-prea
-	new file:   prefix-prefix-preb
-	new file:   prefix-prefix-prec
-	new file:   prefix-prefix-pred
-	new file:   prefix-prefix-pree
-	new file:   prefix-prefix-pref
-	new file:   prefix-prefix-preg
-	new file:   prefix-prefix-preh
-	new file:   prefix-prefix-prei
-	new file:   prefix-prefix-prej
-	new file:   prefix-prefix-prek
-	new file:   prefix-prefix-prel
-	new file:   prefix-prefix-prem
-	new file:   prefix-prefix-pren
-	new file:   prefix-prefix-preo
-	new file:   prefix-prefix-prep
-	new file:   prefix-prefix-preq
-	new file:   prefix-prefix-prer
-	new file:   prefix-prefix-pres
-	new file:   prefix-prefix-pret
-	new file:   prefix-prefix-preu
-	new file:   prefix-prefix-prev
-	new file:   prefix-prefix-prew
-	new file:   prefix-prefix-prex
-	new file:   prefix-prefix-prey
-	new file:   prefix-prefix-prez
-
-ok 18 - status, filename length 18
+HEAD is now at f0d83ed message
+[second 1982ad5] message
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+## Custom template
+# Changes to be committed:
+ok 53 - commit --status
 
 expecting success: 
-		git add prefix-prefix-pref* &&
-		git status
+		try_commit --no-status &&
+		test_i18ngrep ! "^# Changes to be committed:" .git/COMMIT_EDITMSG
 	
-On branch master
-
-No commits yet
-
-Changes to be committed:
-  (use "git rm --cached <file>..." to unstage)
-
-	new file:   prefix-prefix-pref0
-	new file:   prefix-prefix-pref1
-	new file:   prefix-prefix-pref2
-	new file:   prefix-prefix-pref3
-	new file:   prefix-prefix-pref4
-	new file:   prefix-prefix-pref5
-	new file:   prefix-prefix-pref6
-	new file:   prefix-prefix-pref7
-	new file:   prefix-prefix-pref8
-	new file:   prefix-prefix-pref9
-	new file:   prefix-prefix-prefa
-	new file:   prefix-prefix-prefb
-	new file:   prefix-prefix-prefc
-	new file:   prefix-prefix-prefd
-	new file:   prefix-prefix-prefe
-	new file:   prefix-prefix-preff
-	new file:   prefix-prefix-prefg
-	new file:   prefix-prefix-prefh
-	new file:   prefix-prefix-prefi
-	new file:   prefix-prefix-prefj
-	new file:   prefix-prefix-prefk
-	new file:   prefix-prefix-prefl
-	new file:   prefix-prefix-prefm
-	new file:   prefix-prefix-prefn
-	new file:   prefix-prefix-prefo
-	new file:   prefix-prefix-prefp
-	new file:   prefix-prefix-prefq
-	new file:   prefix-prefix-prefr
-	new file:   prefix-prefix-prefs
-	new file:   prefix-prefix-preft
-	new file:   prefix-prefix-prefu
-	new file:   prefix-prefix-prefv
-	new file:   prefix-prefix-prefw
-	new file:   prefix-prefix-prefx
-	new file:   prefix-prefix-prefy
-	new file:   prefix-prefix-prefz
-
-ok 19 - status, filename length 19
+HEAD is now at 1982ad5 message
+[second 96f6d38] message
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+## Custom template
+ok 54 - commit --no-status
 
 expecting success: 
-		git add prefix-prefix-prefi* &&
-		git status
+		test_config commit.status yes &&
+		try_commit "" &&
+		test_i18ngrep "^# Changes to be committed:" .git/COMMIT_EDITMSG
 	
-On branch master
-
-No commits yet
-
-Changes to be committed:
-  (use "git rm --cached <file>..." to unstage)
-
-	new file:   prefix-prefix-prefi0
-	new file:   prefix-prefix-prefi1
-	new file:   prefix-prefix-prefi2
-	new file:   prefix-prefix-prefi3
-	new file:   prefix-prefix-prefi4
-	new file:   prefix-prefix-prefi5
-	new file:   prefix-prefix-prefi6
-	new file:   prefix-prefix-prefi7
-	new file:   prefix-prefix-prefi8
-	new file:   prefix-prefix-prefi9
-	new file:   prefix-prefix-prefia
-	new file:   prefix-prefix-prefib
-	new file:   prefix-prefix-prefic
-	new file:   prefix-prefix-prefid
-	new file:   prefix-prefix-prefie
-	new file:   prefix-prefix-prefif
-	new file:   prefix-prefix-prefig
-	new file:   prefix-prefix-prefih
-	new file:   prefix-prefix-prefii
-	new file:   prefix-prefix-prefij
-	new file:   prefix-prefix-prefik
-	new file:   prefix-prefix-prefil
-	new file:   prefix-prefix-prefim
-	new file:   prefix-prefix-prefin
-	new file:   prefix-prefix-prefio
-	new file:   prefix-prefix-prefip
-	new file:   prefix-prefix-prefiq
-	new file:   prefix-prefix-prefir
-	new file:   prefix-prefix-prefis
-	new file:   prefix-prefix-prefit
-	new file:   prefix-prefix-prefiu
-	new file:   prefix-prefix-prefiv
-	new file:   prefix-prefix-prefiw
-	new file:   prefix-prefix-prefix
-	new file:   prefix-prefix-prefiy
-	new file:   prefix-prefix-prefiz
-
-ok 20 - status, filename length 20
+HEAD is now at 96f6d38 message
+[second 695c316] message
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+## Custom template
+# Changes to be committed:
+ok 55 - commit with commit.status = yes
 
 expecting success: 
-		git add prefix-prefix-prefix* &&
-		git status
+		test_config commit.status no &&
+		try_commit "" &&
+		test_i18ngrep ! "^# Changes to be committed:" .git/COMMIT_EDITMSG
 	
-On branch master
-
-No commits yet
-
-Changes to be committed:
-  (use "git rm --cached <file>..." to unstage)
-
-	new file:   prefix-prefix-prefix0
-	new file:   prefix-prefix-prefix1
-	new file:   prefix-prefix-prefix2
-	new file:   prefix-prefix-prefix3
-	new file:   prefix-prefix-prefix4
-	new file:   prefix-prefix-prefix5
-	new file:   prefix-prefix-prefix6
-	new file:   prefix-prefix-prefix7
-	new file:   prefix-prefix-prefix8
-	new file:   prefix-prefix-prefix9
-	new file:   prefix-prefix-prefixa
-	new file:   prefix-prefix-prefixb
-	new file:   prefix-prefix-prefixc
-	new file:   prefix-prefix-prefixd
-	new file:   prefix-prefix-prefixe
-	new file:   prefix-prefix-prefixf
-	new file:   prefix-prefix-prefixg
-	new file:   prefix-prefix-prefixh
-	new file:   prefix-prefix-prefixi
-	new file:   prefix-prefix-prefixj
-	new file:   prefix-prefix-prefixk
-	new file:   prefix-prefix-prefixl
-	new file:   prefix-prefix-prefixm
-	new file:   prefix-prefix-prefixn
-	new file:   prefix-prefix-prefixo
-	new file:   prefix-prefix-prefixp
-	new file:   prefix-prefix-prefixq
-	new file:   prefix-prefix-prefixr
-	new file:   prefix-prefix-prefixs
-	new file:   prefix-prefix-prefixt
-	new file:   prefix-prefix-prefixu
-	new file:   prefix-prefix-prefixv
-	new file:   prefix-prefix-prefixw
-	new file:   prefix-prefix-prefixx
-	new file:   prefix-prefix-prefixy
-	new file:   prefix-prefix-prefixz
-
-ok 21 - status, filename length 21
+HEAD is now at 695c316 message
+[second 2e1b66b] message
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+## Custom template
+ok 56 - commit with commit.status = no
 
 expecting success: 
-		git add prefix-prefix-prefix-* &&
-		git status
+		test_config commit.status yes &&
+		try_commit --status &&
+		test_i18ngrep "^# Changes to be committed:" .git/COMMIT_EDITMSG
 	
-On branch master
-
-No commits yet
-
-Changes to be committed:
-  (use "git rm --cached <file>..." to unstage)
-
-	new file:   prefix-prefix-prefix-0
-	new file:   prefix-prefix-prefix-1
-	new file:   prefix-prefix-prefix-2
-	new file:   prefix-prefix-prefix-3
-	new file:   prefix-prefix-prefix-4
-	new file:   prefix-prefix-prefix-5
-	new file:   prefix-prefix-prefix-6
-	new file:   prefix-prefix-prefix-7
-	new file:   prefix-prefix-prefix-8
-	new file:   prefix-prefix-prefix-9
-	new file:   prefix-prefix-prefix-a
-	new file:   prefix-prefix-prefix-b
-	new file:   prefix-prefix-prefix-c
-	new file:   prefix-prefix-prefix-d
-	new file:   prefix-prefix-prefix-e
-	new file:   prefix-prefix-prefix-f
-	new file:   prefix-prefix-prefix-g
-	new file:   prefix-prefix-prefix-h
-	new file:   prefix-prefix-prefix-i
-	new file:   prefix-prefix-prefix-j
-	new file:   prefix-prefix-prefix-k
-	new file:   prefix-prefix-prefix-l
-	new file:   prefix-prefix-prefix-m
-	new file:   prefix-prefix-prefix-n
-	new file:   prefix-prefix-prefix-o
-	new file:   prefix-prefix-prefix-p
-	new file:   prefix-prefix-prefix-q
-	new file:   prefix-prefix-prefix-r
-	new file:   prefix-prefix-prefix-s
-	new file:   prefix-prefix-prefix-t
-	new file:   prefix-prefix-prefix-u
-	new file:   prefix-prefix-prefix-v
-	new file:   prefix-prefix-prefix-w
-	new file:   prefix-prefix-prefix-x
-	new file:   prefix-prefix-prefix-y
-	new file:   prefix-prefix-prefix-z
+HEAD is now at 2e1b66b message
+[second b1b7d9b] message
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+## Custom template
+# Changes to be committed:
+ok 57 - commit --status with commit.status = yes
 
-ok 22 - status, filename length 22
+expecting success: 
+		test_config commit.status yes &&
+		try_commit --no-status &&
+		test_i18ngrep ! "^# Changes to be committed:" .git/COMMIT_EDITMSG
+	
+HEAD is now at b1b7d9b message
+[second 92edaf3] message
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+## Custom template
+ok 58 - commit --no-status with commit.status = yes
 
 expecting success: 
-		git add prefix-prefix-prefix-p* &&
-		git status
+		test_config commit.status no &&
+		try_commit --status &&
+		test_i18ngrep "^# Changes to be committed:" .git/COMMIT_EDITMSG
 	
-On branch master
-
-No commits yet
+HEAD is now at 92edaf3 message
+[second e89c5bb] message
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+## Custom template
+# Changes to be committed:
+ok 59 - commit --status with commit.status = no
 
-Changes to be committed:
-  (use "git rm --cached <file>..." to unstage)
+expecting success: 
+		test_config commit.status no &&
+		try_commit --no-status &&
+		test_i18ngrep ! "^# Changes to be committed:" .git/COMMIT_EDITMSG
+	
+HEAD is now at e89c5bb message
+[second 8fa3593] message
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+## Custom template
+ok 60 - commit --no-status with commit.status = no
 
-	new file:   prefix-prefix-prefix-p0
-	new file:   prefix-prefix-prefix-p1
-	new file:   prefix-prefix-prefix-p2
-	new file:   prefix-prefix-prefix-p3
-	new file:   prefix-prefix-prefix-p4
-	new file:   prefix-prefix-prefix-p5
-	new file:   prefix-prefix-prefix-p6
-	new file:   prefix-prefix-prefix-p7
-	new file:   prefix-prefix-prefix-p8
-	new file:   prefix-prefix-prefix-p9
-	new file:   prefix-prefix-prefix-pa
-	new file:   prefix-prefix-prefix-pb
-	new file:   prefix-prefix-prefix-pc
-	new file:   prefix-prefix-prefix-pd
-	new file:   prefix-prefix-prefix-pe
-	new file:   prefix-prefix-prefix-pf
-	new file:   prefix-prefix-prefix-pg
-	new file:   prefix-prefix-prefix-ph
-	new file:   prefix-prefix-prefix-pi
-	new file:   prefix-prefix-prefix-pj
-	new file:   prefix-prefix-prefix-pk
-	new file:   prefix-prefix-prefix-pl
-	new file:   prefix-prefix-prefix-pm
-	new file:   prefix-prefix-prefix-pn
-	new file:   prefix-prefix-prefix-po
-	new file:   prefix-prefix-prefix-pp
-	new file:   prefix-prefix-prefix-pq
-	new file:   prefix-prefix-prefix-pr
-	new file:   prefix-prefix-prefix-ps
-	new file:   prefix-prefix-prefix-pt
-	new file:   prefix-prefix-prefix-pu
-	new file:   prefix-prefix-prefix-pv
-	new file:   prefix-prefix-prefix-pw
-	new file:   prefix-prefix-prefix-px
-	new file:   prefix-prefix-prefix-py
-	new file:   prefix-prefix-prefix-pz
+expecting success: 
+	test_config core.commentchar ";" &&
+	try_commit --status &&
+	test_i18ngrep "^; Changes to be committed:" .git/COMMIT_EDITMSG
 
-ok 23 - status, filename length 23
+HEAD is now at 8fa3593 message
+[second 2ffe6ca] message ## Custom template
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+## Custom template
+; Changes to be committed:
+ok 61 - commit --status with custom comment character
 
 expecting success: 
-		git add prefix-prefix-prefix-pr* &&
-		git status
-	
-On branch master
-
-No commits yet
+	test_commit "#foo" foo &&
+	GIT_EDITOR=.git/FAKE_EDITOR git -c core.commentChar=auto commit --amend &&
+	test_i18ngrep "^; Changes to be committed:" .git/COMMIT_EDITMSG
 
-Changes to be committed:
-  (use "git rm --cached <file>..." to unstage)
+[second 06b3c38] #foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo
+[second 335df3c] message #foo
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:23:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo
+; Changes to be committed:
+ok 62 - switch core.commentchar
 
-	new file:   prefix-prefix-prefix-pr0
-	new file:   prefix-prefix-prefix-pr1
-	new file:   prefix-prefix-prefix-pr2
-	new file:   prefix-prefix-prefix-pr3
-	new file:   prefix-prefix-prefix-pr4
-	new file:   prefix-prefix-prefix-pr5
-	new file:   prefix-prefix-prefix-pr6
-	new file:   prefix-prefix-prefix-pr7
-	new file:   prefix-prefix-prefix-pr8
-	new file:   prefix-prefix-prefix-pr9
-	new file:   prefix-prefix-prefix-pra
-	new file:   prefix-prefix-prefix-prb
-	new file:   prefix-prefix-prefix-prc
-	new file:   prefix-prefix-prefix-prd
-	new file:   prefix-prefix-prefix-pre
-	new file:   prefix-prefix-prefix-prf
-	new file:   prefix-prefix-prefix-prg
-	new file:   prefix-prefix-prefix-prh
-	new file:   prefix-prefix-prefix-pri
-	new file:   prefix-prefix-prefix-prj
-	new file:   prefix-prefix-prefix-prk
-	new file:   prefix-prefix-prefix-prl
-	new file:   prefix-prefix-prefix-prm
-	new file:   prefix-prefix-prefix-prn
-	new file:   prefix-prefix-prefix-pro
-	new file:   prefix-prefix-prefix-prp
-	new file:   prefix-prefix-prefix-prq
-	new file:   prefix-prefix-prefix-prr
-	new file:   prefix-prefix-prefix-prs
-	new file:   prefix-prefix-prefix-prt
-	new file:   prefix-prefix-prefix-pru
-	new file:   prefix-prefix-prefix-prv
-	new file:   prefix-prefix-prefix-prw
-	new file:   prefix-prefix-prefix-prx
-	new file:   prefix-prefix-prefix-pry
-	new file:   prefix-prefix-prefix-prz
+expecting success: 
+	cat >text <<\EOF &&
+# 1
+; 2
+@ 3
+! 4
+$ 5
+% 6
+^ 7
+& 8
+| 9
+: 10
+EOF
+	git commit --amend -F text &&
+	(
+		test_set_editor .git/FAKE_EDITOR &&
+		test_must_fail git -c core.commentChar=auto commit --amend
+	)
 
-ok 24 - status, filename length 24
+[second 5a514e7] # 1 ; 2 @ 3 ! 4 $ 5 % 6 ^ 7 & 8 | 9 : 10
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:23:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo
+fatal: unable to select a comment character that is not used
+in the current commit message
+ok 63 - switch core.commentchar but out of options
 
-# passed all 24 test(s)
-1..24
+# passed all 63 test(s)
+1..63
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
 *** t7515-status-symlinks.sh ***
@@ -282932,7 +282624,7 @@
 	git commit -m initial &&
 	git tag initial
 
-[master (root-commit) 3a5504f] initial
+[master (root-commit) 4fdc182] initial
  Author: A U Thor <author@example.com>
  2 files changed, 2 insertions(+)
  create mode 100644 dir/file1
@@ -282973,18 +282665,586 @@
 	git status --porcelain >actual &&
 	test_cmp expect actual
 
-[master 6df746a] second
+[master 985663d] second
  Author: A U Thor <author@example.com>
  2 files changed, 2 insertions(+)
  create mode 100644 copy/file1
  create mode 100644 copy/file2
-HEAD is now at 3a5504f initial
+HEAD is now at 4fdc182 initial
 ok 3 - symlink replacing a directory
 
 # passed all 3 test(s)
 1..3
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
+*** t7507-commit-verbose.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7507-commit-verbose/.git/
+expecting success: 
+	echo content >file &&
+	git add file &&
+	git commit -F message
+
+[master (root-commit) bc5281c] subject
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+ok 1 - setup
+
+expecting success: 
+	git commit --amend -v &&
+	test_line_count = 1 out
+
+[master bc5281c] subject
+ Author: A U Thor <author@example.com>
+ Date: Thu Jan 5 11:49:56 2023 +0000
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+ok 2 - initial commit shows verbose diff
+
+expecting success: 
+	echo content modified >file &&
+	git add file &&
+	git commit -F message
+
+[master 900596e] subject
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 3 - second commit
+
+expecting success: 
+	git commit --amend -v &&
+	check_message message &&
+	test_line_count = 1 out
+
+[master 900596e] subject
+ Author: A U Thor <author@example.com>
+ Date: Thu Jan 5 11:49:56 2023 +0000
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 4 - verbose diff is stripped out
+
+expecting success: 
+	git config diff.mnemonicprefix true &&
+	git commit --amend -v &&
+	check_message message &&
+	test_line_count = 1 out
+
+[master 900596e] subject
+ Author: A U Thor <author@example.com>
+ Date: Thu Jan 5 11:49:56 2023 +0000
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 5 - verbose diff is stripped out (mnemonicprefix)
+
+expecting success: 
+	git commit --amend -F diff &&
+	check_message diff
+
+[master c88f9c4] This is an example commit message that contains a diff.
+ Author: A U Thor <author@example.com>
+ Date: Thu Jan 5 11:49:56 2023 +0000
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 6 - diff in message is retained without -v
+
+expecting success: 
+	git commit --amend -F diff -v &&
+	check_message diff
+
+[master c88f9c4] This is an example commit message that contains a diff.
+ Author: A U Thor <author@example.com>
+ Date: Thu Jan 5 11:49:56 2023 +0000
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 7 - diff in message is retained with -v
+
+expecting success: 
+	git config diff.submodule log &&
+	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_i18ngrep "Aborting commit due to empty commit message." err
+
+Cloning into '/build/git-2.20.1/t/trash directory.t7507-commit-verbose/sub'...
+done.
+[master 1c67478] sub added
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+[master 597bbdb] 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:
+#	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 c88f9c4..597bbdb:
+  > submodule commit
+Aborting commit due to empty commit message.
+ok 8 - submodule log is stripped out too with -v
+
+expecting success: 
+	(
+		GIT_EDITOR=cat &&
+		export GIT_EDITOR &&
+		test_must_fail git -c core.commentchar=";" commit -a -v 2>err
+	) &&
+	test_i18ngrep "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:
+;	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 c88f9c4..597bbdb:
+  > submodule commit
+Aborting commit due to empty commit message.
+ok 9 - verbose diff is stripped out with set core.commentChar
+
+expecting success: 
+	git status >actual &&
+	! grep "^diff --git" actual
+
+ok 10 - status does not verbose without --verbose
+
+expecting success: 
+	echo dirty >file
+
+ok 11 - setup -v -v
+
+expecting success: 
+		git -c commit.verbose=true commit --amend &&
+		test_line_count = 1 out
+	
+[master 1c67478] sub added
+ Author: A U Thor <author@example.com>
+ Date: Thu Jan 5 11:49:57 2023 +0000
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+ok 12 - commit.verbose=true and --verbose omitted
+
+expecting success: 
+		git -c commit.verbose=1 commit --amend &&
+		test_line_count = 1 out
+	
+[master 1c67478] sub added
+ Author: A U Thor <author@example.com>
+ Date: Thu Jan 5 11:49:57 2023 +0000
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+ok 13 - commit.verbose=1 and --verbose omitted
+
+expecting success: 
+		git -c commit.verbose=false commit --amend &&
+		test_line_count = 0 out
+	
+[master 1c67478] sub added
+ Author: A U Thor <author@example.com>
+ Date: Thu Jan 5 11:49:57 2023 +0000
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+ok 14 - commit.verbose=false and --verbose omitted
+
+expecting success: 
+		git -c commit.verbose=-2 commit --amend &&
+		test_line_count = 0 out
+	
+[master 1c67478] sub added
+ Author: A U Thor <author@example.com>
+ Date: Thu Jan 5 11:49:57 2023 +0000
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+ok 15 - commit.verbose=-2 and --verbose omitted
+
+expecting success: 
+		git -c commit.verbose=-1 commit --amend &&
+		test_line_count = 0 out
+	
+[master 1c67478] sub added
+ Author: A U Thor <author@example.com>
+ Date: Thu Jan 5 11:49:57 2023 +0000
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+ok 16 - commit.verbose=-1 and --verbose omitted
+
+expecting success: 
+		git -c commit.verbose=0 commit --amend &&
+		test_line_count = 0 out
+	
+[master 1c67478] sub added
+ Author: A U Thor <author@example.com>
+ Date: Thu Jan 5 11:49:57 2023 +0000
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+ok 17 - commit.verbose=0 and --verbose omitted
+
+expecting success: 
+		git -c commit.verbose=2 commit --amend &&
+		test_line_count = 2 out
+	
+[master 1c67478] sub added
+ Author: A U Thor <author@example.com>
+ Date: Thu Jan 5 11:49:57 2023 +0000
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+ok 18 - commit.verbose=2 and --verbose omitted
+
+expecting success: 
+		git -c commit.verbose=3 commit --amend &&
+		test_line_count = 2 out
+	
+[master 1c67478] sub added
+ Author: A U Thor <author@example.com>
+ Date: Thu Jan 5 11:49:57 2023 +0000
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+ok 19 - commit.verbose=3 and --verbose omitted
+
+expecting success: 
+		git -c commit.verbose=true commit --amend --verbose &&
+		test_line_count = 1 out
+	
+[master f99e90c] sub added
+ Author: A U Thor <author@example.com>
+ Date: Thu Jan 5 11:49:57 2023 +0000
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+ok 20 - commit.verbose=true and --verbose
+
+expecting success: 
+		git -c commit.verbose=true commit --amend --no-verbose &&
+		test_line_count = 0 out
+	
+[master f99e90c] sub added
+ Author: A U Thor <author@example.com>
+ Date: Thu Jan 5 11:49:57 2023 +0000
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+ok 21 - commit.verbose=true and --no-verbose
+
+expecting success: 
+		git -c commit.verbose=true commit --amend -v -v &&
+		test_line_count = 2 out
+	
+[master f99e90c] sub added
+ Author: A U Thor <author@example.com>
+ Date: Thu Jan 5 11:49:57 2023 +0000
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+ok 22 - commit.verbose=true and -v -v
+
+expecting success: 
+		git -c commit.verbose=false commit --amend --verbose &&
+		test_line_count = 1 out
+	
+[master f99e90c] sub added
+ Author: A U Thor <author@example.com>
+ Date: Thu Jan 5 11:49:57 2023 +0000
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+ok 23 - commit.verbose=false and --verbose
+
+expecting success: 
+		git -c commit.verbose=false commit --amend --no-verbose &&
+		test_line_count = 0 out
+	
+[master f99e90c] sub added
+ Author: A U Thor <author@example.com>
+ Date: Thu Jan 5 11:49:57 2023 +0000
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+ok 24 - commit.verbose=false and --no-verbose
+
+expecting success: 
+		git -c commit.verbose=false commit --amend -v -v &&
+		test_line_count = 2 out
+	
+[master f99e90c] sub added
+ Author: A U Thor <author@example.com>
+ Date: Thu Jan 5 11:49:57 2023 +0000
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+ok 25 - commit.verbose=false and -v -v
+
+expecting success: 
+		git -c commit.verbose=-2 commit --amend --verbose &&
+		test_line_count = 1 out
+	
+[master f99e90c] sub added
+ Author: A U Thor <author@example.com>
+ Date: Thu Jan 5 11:49:57 2023 +0000
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+ok 26 - commit.verbose=-2 and --verbose
+
+expecting success: 
+		git -c commit.verbose=-2 commit --amend --no-verbose &&
+		test_line_count = 0 out
+	
+[master f99e90c] sub added
+ Author: A U Thor <author@example.com>
+ Date: Thu Jan 5 11:49:57 2023 +0000
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+ok 27 - commit.verbose=-2 and --no-verbose
+
+expecting success: 
+		git -c commit.verbose=-2 commit --amend -v -v &&
+		test_line_count = 2 out
+	
+[master f99e90c] sub added
+ Author: A U Thor <author@example.com>
+ Date: Thu Jan 5 11:49:57 2023 +0000
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+ok 28 - commit.verbose=-2 and -v -v
+
+expecting success: 
+		git -c commit.verbose=-1 commit --amend --verbose &&
+		test_line_count = 1 out
+	
+[master f99e90c] sub added
+ Author: A U Thor <author@example.com>
+ Date: Thu Jan 5 11:49:57 2023 +0000
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+ok 29 - commit.verbose=-1 and --verbose
+
+expecting success: 
+		git -c commit.verbose=-1 commit --amend --no-verbose &&
+		test_line_count = 0 out
+	
+[master f99e90c] sub added
+ Author: A U Thor <author@example.com>
+ Date: Thu Jan 5 11:49:57 2023 +0000
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+ok 30 - commit.verbose=-1 and --no-verbose
+
+expecting success: 
+		git -c commit.verbose=-1 commit --amend -v -v &&
+		test_line_count = 2 out
+	
+[master f99e90c] sub added
+ Author: A U Thor <author@example.com>
+ Date: Thu Jan 5 11:49:57 2023 +0000
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+ok 31 - commit.verbose=-1 and -v -v
+
+expecting success: 
+		git -c commit.verbose=0 commit --amend --verbose &&
+		test_line_count = 1 out
+	
+[master f99e90c] sub added
+ Author: A U Thor <author@example.com>
+ Date: Thu Jan 5 11:49:57 2023 +0000
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+ok 32 - commit.verbose=0 and --verbose
+
+expecting success: 
+		git -c commit.verbose=0 commit --amend --no-verbose &&
+		test_line_count = 0 out
+	
+[master f99e90c] sub added
+ Author: A U Thor <author@example.com>
+ Date: Thu Jan 5 11:49:57 2023 +0000
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+ok 33 - commit.verbose=0 and --no-verbose
+
+expecting success: 
+		git -c commit.verbose=0 commit --amend -v -v &&
+		test_line_count = 2 out
+	
+[master f99e90c] sub added
+ Author: A U Thor <author@example.com>
+ Date: Thu Jan 5 11:49:57 2023 +0000
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+ok 34 - commit.verbose=0 and -v -v
+
+expecting success: 
+		git -c commit.verbose=1 commit --amend --verbose &&
+		test_line_count = 1 out
+	
+[master 3ccb7f3] sub added
+ Author: A U Thor <author@example.com>
+ Date: Thu Jan 5 11:49:57 2023 +0000
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+ok 35 - commit.verbose=1 and --verbose
+
+expecting success: 
+		git -c commit.verbose=1 commit --amend --no-verbose &&
+		test_line_count = 0 out
+	
+[master 3ccb7f3] sub added
+ Author: A U Thor <author@example.com>
+ Date: Thu Jan 5 11:49:57 2023 +0000
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+ok 36 - commit.verbose=1 and --no-verbose
+
+expecting success: 
+		git -c commit.verbose=1 commit --amend -v -v &&
+		test_line_count = 2 out
+	
+[master 3ccb7f3] sub added
+ Author: A U Thor <author@example.com>
+ Date: Thu Jan 5 11:49:57 2023 +0000
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+ok 37 - commit.verbose=1 and -v -v
+
+expecting success: 
+		git -c commit.verbose=2 commit --amend --verbose &&
+		test_line_count = 1 out
+	
+[master 3ccb7f3] sub added
+ Author: A U Thor <author@example.com>
+ Date: Thu Jan 5 11:49:57 2023 +0000
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+ok 38 - commit.verbose=2 and --verbose
+
+expecting success: 
+		git -c commit.verbose=2 commit --amend --no-verbose &&
+		test_line_count = 0 out
+	
+[master 3ccb7f3] sub added
+ Author: A U Thor <author@example.com>
+ Date: Thu Jan 5 11:49:57 2023 +0000
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+ok 39 - commit.verbose=2 and --no-verbose
+
+expecting success: 
+		git -c commit.verbose=2 commit --amend -v -v &&
+		test_line_count = 2 out
+	
+[master 3ccb7f3] sub added
+ Author: A U Thor <author@example.com>
+ Date: Thu Jan 5 11:49:57 2023 +0000
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+ok 40 - commit.verbose=2 and -v -v
+
+expecting success: 
+		git -c commit.verbose=3 commit --amend --verbose &&
+		test_line_count = 1 out
+	
+[master 3ccb7f3] sub added
+ Author: A U Thor <author@example.com>
+ Date: Thu Jan 5 11:49:57 2023 +0000
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+ok 41 - commit.verbose=3 and --verbose
+
+expecting success: 
+		git -c commit.verbose=3 commit --amend --no-verbose &&
+		test_line_count = 0 out
+	
+[master 3ccb7f3] sub added
+ Author: A U Thor <author@example.com>
+ Date: Thu Jan 5 11:49:57 2023 +0000
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+ok 42 - commit.verbose=3 and --no-verbose
+
+expecting success: 
+		git -c commit.verbose=3 commit --amend -v -v &&
+		test_line_count = 2 out
+	
+[master 3ccb7f3] sub added
+ Author: A U Thor <author@example.com>
+ Date: Thu Jan 5 11:49:57 2023 +0000
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+ok 43 - commit.verbose=3 and -v -v
+
+expecting success: 
+	git -c commit.verbose=true status >actual &&
+	! grep "^diff --git actual"
+
+ok 44 - status ignores commit.verbose=true
+
+# passed all 44 test(s)
+1..44
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
 *** t7514-commit-patch.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7514-commit-patch/.git/
 expecting success: 
@@ -282992,7 +283252,7 @@
 	git add file &&
 	git commit -m commit1
 
-[master (root-commit) 826a018] commit1
+[master (root-commit) e597f57] commit1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 file
@@ -283013,7 +283273,7 @@
  line1
 +more
 Stage this hunk [y,n,q,a,d,e,?]? 
-[master 5efe9f3] commit2
+[master 1404e36] commit2
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 ok 2 - edit hunk "commit -p -m message"
@@ -283034,7 +283294,7 @@
  more
 +more
 Stage this hunk [y,n,q,a,d,e,?]? 
-[master f118a47] commit3
+[master 21558b8] commit3
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 ok 3 - edit hunk "commit --dry-run -p -m message"
@@ -283043,6 +283303,83 @@
 1..3
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
+*** t7516-commit-races.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7516-commit-races/.git/
+expecting success: 
+	write_script hare-editor <<-\EOF &&
+	git commit --allow-empty -m hare
+	EOF
+	test_must_fail env EDITOR=./hare-editor git commit --allow-empty -m tortoise -e &&
+	git show -s --pretty=format:%s >subject &&
+	grep hare subject &&
+	test -z "$(git show -s --pretty=format:%P)"
+
+[master (root-commit) b240683] hare
+ Author: A U Thor <author@example.com>
+fatal: cannot lock ref 'HEAD': reference already exists
+hare
+ok 1 - race to create orphan commit
+
+expecting success: 
+	write_script airplane-editor <<-\EOF &&
+	git commit --allow-empty -m airplane
+	EOF
+	git checkout --orphan branch &&
+	git commit --allow-empty -m base &&
+	git rev-parse HEAD >base &&
+	test_must_fail env EDITOR=./airplane-editor git commit --allow-empty -m ship -e &&
+	git show -s --pretty=format:%s >subject &&
+	grep airplane subject &&
+	git rev-parse HEAD^ >parent &&
+	test_cmp base parent
+
+Switched to a new branch 'branch'
+[branch (root-commit) 5f044cc] base
+ Author: A U Thor <author@example.com>
+[branch e87c988] airplane
+ Author: A U Thor <author@example.com>
+fatal: cannot lock ref 'HEAD': is at e87c9883982bc7aa02617bcd89dfec6027eb6e28 but expected 5f044cc799e2dea4c78d076d8997276550d19e7c
+airplane
+ok 2 - race to create non-orphan commit
+
+# passed all 2 test(s)
+1..2
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t7518-ident-corner-cases.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7518-ident-corner-cases/.git/
+expecting success: 
+	(
+		sane_unset GIT_AUTHOR_EMAIL &&
+		GIT_AUTHOR_NAME= &&
+		test_must_fail git commit --allow-empty -m foo 2>err &&
+		test_i18ngrep ! null err
+	)
+
+ok 1 - empty name and missing email
+
+expecting success: 
+	test_must_fail env GIT_AUTHOR_NAME=" .;<>" \
+		git commit --allow-empty -m foo
+
+fatal: name consists only of disallowed characters:  .;<>
+ok 2 - commit rejects all-crud name
+
+expecting success: 
+	(
+		sane_unset GIT_AUTHOR_NAME &&
+		test_must_fail \
+			git -c user.name= commit --allow-empty -m foo 2>err &&
+		test_i18ngrep "empty ident name" err
+	)
+
+fatal: empty ident name (for <author@example.com>) not allowed
+ok 3 - empty configured name does not auto-detect
+
+# passed all 3 test(s)
+1..3
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
 *** t7506-status-submodule.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7506-status-submodule/.git/
 expecting success: 
@@ -283052,11 +283389,11 @@
 	git commit -m "Add submodule sub"
 
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7506-status-submodule/sub/.git/
-[master (root-commit) accdaca]  Add bar
+[master (root-commit) e50058e]  Add bar
  Author: A U Thor <author@example.com>
  1 file changed, 0 insertions(+), 0 deletions(-)
  create mode 100644 bar
-[master edbae94]  Add foo
+[master 30b487a]  Add foo
  Author: A U Thor <author@example.com>
  1 file changed, 0 insertions(+), 0 deletions(-)
  create mode 100644 foo
@@ -283074,7 +283411,7 @@
 hint: 	git rm --cached sub
 hint: 
 hint: See "git help submodule" for more information.
-[master (root-commit) ef7d07d] Add submodule sub
+[master (root-commit) 1559c9b] Add submodule sub
  Author: A U Thor <author@example.com>
  2 files changed, 2 insertions(+)
  create mode 100644 .gitignore
@@ -283101,7 +283438,7 @@
 	git status >output &&
 	test_i18ngrep "modified:   sub (modified content)" output
 
-HEAD is now at edbae94  Add foo
+HEAD is now at 30b487a  Add foo
 	modified:   sub (modified content)
 ok 4 - status with modified file in submodule
 
@@ -283113,7 +283450,7 @@
 	 M sub
 	EOF
 
-HEAD is now at edbae94  Add foo
+HEAD is now at 30b487a  Add foo
 ok 5 - status with modified file in submodule (porcelain)
 
 expecting success: 
@@ -283124,7 +283461,7 @@
 	 m sub
 	EOF
 
-HEAD is now at edbae94  Add foo
+HEAD is now at 30b487a  Add foo
 ok 6 - status with modified file in submodule (short)
 
 expecting success: 
@@ -283132,7 +283469,7 @@
 	git status >output &&
 	test_i18ngrep "modified:   sub (modified content)" output
 
-HEAD is now at edbae94  Add foo
+HEAD is now at 30b487a  Add foo
 	modified:   sub (modified content)
 ok 7 - status with added file in submodule
 
@@ -283143,7 +283480,7 @@
 	 M sub
 	EOF
 
-HEAD is now at edbae94  Add foo
+HEAD is now at 30b487a  Add foo
 ok 8 - status with added file in submodule (porcelain)
 
 expecting success: 
@@ -283153,7 +283490,7 @@
 	 m sub
 	EOF
 
-HEAD is now at edbae94  Add foo
+HEAD is now at 30b487a  Add foo
 ok 9 - status with added file in submodule (short)
 
 expecting success: 
@@ -283162,7 +283499,7 @@
 	git status >output &&
 	test_i18ngrep "modified:   sub (untracked content)" output
 
-HEAD is now at edbae94  Add foo
+HEAD is now at 30b487a  Add foo
 	modified:   sub (untracked content)
 ok 10 - status with untracked file in submodule
 
@@ -283195,7 +283532,7 @@
 	git status >output &&
 	test_i18ngrep "modified:   sub (modified content, untracked content)" output
 
-HEAD is now at edbae94  Add foo
+HEAD is now at 30b487a  Add foo
 	modified:   sub (modified content, untracked content)
 ok 14 - status with added and untracked file in submodule
 
@@ -283207,7 +283544,7 @@
 	 M sub
 	EOF
 
-HEAD is now at edbae94  Add foo
+HEAD is now at 30b487a  Add foo
 ok 15 - status with added and untracked file in submodule (porcelain)
 
 expecting success: 
@@ -283218,8 +283555,8 @@
 	git status >output &&
 	test_i18ngrep "modified:   sub (new commits, modified content)" output
 
-HEAD is now at edbae94  Add foo
-[master 903aba2] next change
+HEAD is now at 30b487a  Add foo
+[master 09487e4] next change
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 	modified:   sub (new commits, modified content)
@@ -283233,7 +283570,7 @@
 	 M sub
 	EOF
 
-HEAD is now at 903aba2 next change
+HEAD is now at 09487e4 next change
 ok 17 - status with modified file in modified submodule (porcelain)
 
 expecting success: 
@@ -283241,7 +283578,7 @@
 	git status >output &&
 	test_i18ngrep "modified:   sub (new commits, modified content)" output
 
-HEAD is now at 903aba2 next change
+HEAD is now at 09487e4 next change
 	modified:   sub (new commits, modified content)
 ok 18 - status with added file in modified submodule
 
@@ -283252,7 +283589,7 @@
 	 M sub
 	EOF
 
-HEAD is now at 903aba2 next change
+HEAD is now at 09487e4 next change
 ok 19 - status with added file in modified submodule (porcelain)
 
 expecting success: 
@@ -283261,7 +283598,7 @@
 	git status >output &&
 	test_i18ngrep "modified:   sub (new commits, untracked content)" output
 
-HEAD is now at 903aba2 next change
+HEAD is now at 09487e4 next change
 	modified:   sub (new commits, untracked content)
 ok 20 - status with untracked file in modified submodule
 
@@ -283279,7 +283616,7 @@
 	git status >output &&
 	test_i18ngrep "modified:   sub (new commits, modified content, untracked content)" output
 
-HEAD is now at 903aba2 next change
+HEAD is now at 09487e4 next change
 	modified:   sub (new commits, modified content, untracked content)
 ok 22 - status with added and untracked file in modified submodule
 
@@ -283291,7 +283628,7 @@
 	 M sub
 	EOF
 
-HEAD is now at 903aba2 next change
+HEAD is now at 09487e4 next change
 ok 23 - status with added and untracked file in modified submodule (porcelain)
 
 expecting success: 
@@ -283303,7 +283640,7 @@
 	 echo .real >>.gitignore &&
 	 git commit -m "added .real to .gitignore" .gitignore
 
-[master cca1783] added .real to .gitignore
+[master c312291] added .real to .gitignore
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 ok 24 - setup .git file for sub
@@ -283313,7 +283650,7 @@
 	git status >output &&
 	test_i18ngrep "modified:   sub (new commits, modified content)" output
 
-HEAD is now at 903aba2 next change
+HEAD is now at 09487e4 next change
 	modified:   sub (new commits, modified content)
 ok 25 - status with added file in modified submodule with .git file
 
@@ -283377,11 +283714,11 @@
 Cloning into 'super'...
 done.
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7506-status-submodule/sub1/.git/
-[master (root-commit) a7dea22]  Add bar
+[master (root-commit) 5ce0bf4]  Add bar
  Author: A U Thor <author@example.com>
  1 file changed, 0 insertions(+), 0 deletions(-)
  create mode 100644 bar
-[master de024e7]  Add foo
+[master dc85e39]  Add foo
  Author: A U Thor <author@example.com>
  1 file changed, 0 insertions(+), 0 deletions(-)
  create mode 100644 foo
@@ -283397,7 +283734,7 @@
 Switched to a new branch 'add_sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t7506-status-submodule/super/sub1'...
 done.
-[add_sub1 a0f8efc] add sub1
+[add_sub1 953372f] add sub1
  Author: A U Thor <author@example.com>
  2 files changed, 4 insertions(+)
  create mode 100644 .gitmodules
@@ -283406,17 +283743,17 @@
 Switched to a new branch 'add_sub2'
 Cloning into '/build/git-2.20.1/t/trash directory.t7506-status-submodule/super/sub2'...
 done.
-[add_sub2 535699f] add sub2
+[add_sub2 9b418cf] add sub2
  Author: A U Thor <author@example.com>
  2 files changed, 4 insertions(+)
  create mode 100644 .gitmodules
  create mode 160000 sub2
 Switched to a new branch 'merge_conflict_gitmodules'
 Merging:
-535699f add sub2
+9b418cf add sub2
 virtual add_sub1
 found 1 common ancestor:
-cca1783 added .real to .gitignore
+c312291 added .real to .gitignore
 Auto-merging .gitmodules
 CONFLICT (add/add): Merge conflict in .gitmodules
 Automatic merge failed; fix conflicts and then commit the result.
@@ -283464,25 +283801,25 @@
 
 .gitmodules: needs merge
 rm '.gitmodules'
-[merge_conflict_gitmodules 24e0fe3] remove .gitmodules
+[merge_conflict_gitmodules e16fda2] remove .gitmodules
  Author: A U Thor <author@example.com>
 Adding existing repo at 'sub1' to the index
 Adding existing repo at 'sub2' to the index
 Cloning into '/build/git-2.20.1/t/trash directory.t7506-status-submodule/super/sub3'...
 done.
-[merge_conflict_gitmodules 5747d3e] messy merge in superproject
+[merge_conflict_gitmodules 04b1410] messy merge in superproject
  Author: A U Thor <author@example.com>
  2 files changed, 10 insertions(+)
  create mode 100644 .gitmodules
  create mode 160000 sub3
 Cloning into '/build/git-2.20.1/t/trash directory.t7506-status-submodule/super/sub1/sub2'...
 done.
-[master 9fc2e2b] add sub2 to sub1
+[master a9665a2] add sub2 to sub1
  Author: A U Thor <author@example.com>
  2 files changed, 4 insertions(+)
  create mode 100644 .gitmodules
  create mode 160000 sub2
-[merge_conflict_gitmodules cdf529d] update sub1 to contain nested sub
+[merge_conflict_gitmodules 72a95fa] update sub1 to contain nested sub
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 Cloning into 'untracked_repository'...
@@ -283561,83 +283898,6 @@
 1..40
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t7516-commit-races.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7516-commit-races/.git/
-expecting success: 
-	write_script hare-editor <<-\EOF &&
-	git commit --allow-empty -m hare
-	EOF
-	test_must_fail env EDITOR=./hare-editor git commit --allow-empty -m tortoise -e &&
-	git show -s --pretty=format:%s >subject &&
-	grep hare subject &&
-	test -z "$(git show -s --pretty=format:%P)"
-
-[master (root-commit) 0b8e12b] hare
- Author: A U Thor <author@example.com>
-fatal: cannot lock ref 'HEAD': reference already exists
-hare
-ok 1 - race to create orphan commit
-
-expecting success: 
-	write_script airplane-editor <<-\EOF &&
-	git commit --allow-empty -m airplane
-	EOF
-	git checkout --orphan branch &&
-	git commit --allow-empty -m base &&
-	git rev-parse HEAD >base &&
-	test_must_fail env EDITOR=./airplane-editor git commit --allow-empty -m ship -e &&
-	git show -s --pretty=format:%s >subject &&
-	grep airplane subject &&
-	git rev-parse HEAD^ >parent &&
-	test_cmp base parent
-
-Switched to a new branch 'branch'
-[branch (root-commit) 4ec6522] base
- Author: A U Thor <author@example.com>
-[branch 28edc97] airplane
- Author: A U Thor <author@example.com>
-fatal: cannot lock ref 'HEAD': is at 28edc978fdb98ab7ae4ba698e371917ead9c229d but expected 4ec652203b4bf08edde74fed5636a6c6cdcf0e4f
-airplane
-ok 2 - race to create non-orphan commit
-
-# passed all 2 test(s)
-1..2
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t7518-ident-corner-cases.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7518-ident-corner-cases/.git/
-expecting success: 
-	(
-		sane_unset GIT_AUTHOR_EMAIL &&
-		GIT_AUTHOR_NAME= &&
-		test_must_fail git commit --allow-empty -m foo 2>err &&
-		test_i18ngrep ! null err
-	)
-
-ok 1 - empty name and missing email
-
-expecting success: 
-	test_must_fail env GIT_AUTHOR_NAME=" .;<>" \
-		git commit --allow-empty -m foo
-
-fatal: name consists only of disallowed characters:  .;<>
-ok 2 - commit rejects all-crud name
-
-expecting success: 
-	(
-		sane_unset GIT_AUTHOR_NAME &&
-		test_must_fail \
-			git -c user.name= commit --allow-empty -m foo 2>err &&
-		test_i18ngrep "empty ident name" err
-	)
-
-fatal: empty ident name (for <author@example.com>) not allowed
-ok 3 - empty configured name does not auto-detect
-
-# passed all 3 test(s)
-1..3
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
 *** t7520-ignored-hook-warning.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7520-ignored-hook-warning/.git/
 expecting success: 
@@ -283654,7 +283914,7 @@
 	git commit --allow-empty -m "more" 2>message &&
 	test_i18ngrep ! -e "hook was ignored" message
 
-[master (root-commit) d78167f] more
+[master (root-commit) e4e3c9b] more
  Author: A U Thor <author@example.com>
 ok 2 - no warning if hook is not ignored
 
@@ -283663,7 +283923,7 @@
 	git commit --allow-empty -m "even more" 2>message &&
 	test_i18ngrep -e "hook was ignored" message
 
-[master 0e3cdd6] even more
+[master 6063116] even more
  Author: A U Thor <author@example.com>
 hint: The '.git/hooks/pre-commit' hook was ignored because it's not set as executable.
 ok 3 - warning if hook is ignored
@@ -283674,7 +283934,7 @@
 	git commit --allow-empty -m "even more" 2>message &&
 	test_i18ngrep ! -e "hook was ignored" message
 
-[master 45d6523] even more
+[master de8c88e] even more
  Author: A U Thor <author@example.com>
 ok 4 - no warning if advice.ignoredHook set to false
 
@@ -283684,7 +283944,7 @@
 	git commit --allow-empty -m "even more" 2>message &&
 	test_i18ngrep ! -e "hook was ignored" message
 
-[master 81e0c11] even more
+[master ba401d1] even more
  Author: A U Thor <author@example.com>
 ok 5 - no warning if unset advice.ignoredHook and hook removed
 
@@ -283692,6 +283952,164 @@
 1..5
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
+*** t7525-status-rename.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7525-status-rename/.git/
+expecting success: 
+	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) af7b005] Adding original file.
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 original
+ok 1 - setup
+
+expecting success: 
+	git status >actual &&
+	test_i18ngrep "renamed:" actual
+
+	renamed:    original -> renamed
+ok 2 - status no-options
+
+expecting success: 
+	git status --no-renames >actual &&
+	test_i18ngrep "deleted:" actual &&
+	test_i18ngrep "new file:" actual
+
+	deleted:    original
+	new file:   renamed
+ok 3 - status --no-renames
+
+expecting success: 
+	git -c diff.renames=false status >actual &&
+	test_i18ngrep "deleted:" actual &&
+	test_i18ngrep "new file:" actual
+
+	deleted:    original
+	new file:   renamed
+ok 4 - status.renames inherits from diff.renames false
+
+expecting success: 
+	git -c diff.renames=true status >actual &&
+	test_i18ngrep "renamed:" actual
+
+	renamed:    original -> renamed
+ok 5 - status.renames inherits from diff.renames true
+
+expecting success: 
+	git -c diff.renames=true -c status.renames=false status >actual &&
+	test_i18ngrep "deleted:" actual &&
+	test_i18ngrep "new file:" actual
+
+	deleted:    original
+	new file:   renamed
+ok 6 - status.renames overrides diff.renames false
+
+expecting success: 
+	git -c diff.renames=false -c status.renames=true status >actual &&
+	test_i18ngrep "renamed:" actual
+
+	renamed:    original -> renamed
+ok 7 - status.renames overrides from diff.renames true
+
+expecting success: 
+	git -c status.renames=false status >actual &&
+	test_i18ngrep "deleted:" actual &&
+	test_i18ngrep "new file:" actual
+
+	deleted:    original
+	new file:   renamed
+ok 8 - status status.renames=false
+
+expecting success: 
+	git -c status.renames=true status >actual &&
+	test_i18ngrep "renamed:" actual
+
+	renamed:    original -> renamed
+ok 9 - status status.renames=true
+
+expecting success: 
+	git -c status.renames=false commit --dry-run >actual &&
+	test_i18ngrep "deleted:" actual &&
+	test_i18ngrep "new file:" actual
+
+	deleted:    original
+	new file:   renamed
+ok 10 - commit honors status.renames=false
+
+expecting success: 
+	git -c status.renames=true commit --dry-run >actual &&
+	test_i18ngrep "renamed:" actual
+
+	renamed:    original -> renamed
+ok 11 - commit honors status.renames=true
+
+expecting success: 
+	git -c status.renames=true status --no-renames >actual &&
+	test_i18ngrep "deleted:" actual &&
+	test_i18ngrep "new file:" actual
+
+	deleted:    original
+	new file:   renamed
+ok 12 - status config overridden
+
+expecting success: 
+	git status -M=100% >actual &&
+	test_i18ngrep "deleted:" actual &&
+	test_i18ngrep "new file:" actual &&
+
+	git status --find-rename=100% >actual &&
+	test_i18ngrep "deleted:" actual &&
+	test_i18ngrep "new file:" actual
+
+	deleted:    original
+	new file:   renamed
+	deleted:    original
+	new file:   renamed
+ok 13 - status score=100%
+
+expecting success: 
+	git status -M=01% >actual &&
+	test_i18ngrep "renamed:" actual &&
+
+	git status --find-rename=01% >actual &&
+	test_i18ngrep "renamed:" actual
+
+	renamed:    original -> renamed
+	renamed:    original -> renamed
+ok 14 - status score=01%
+
+expecting success: 
+	cp renamed copy &&
+	git add copy &&
+
+	git -c status.renames=copies status -M=01% >actual &&
+	test_i18ngrep "copied:" actual &&
+	test_i18ngrep "renamed:" actual &&
+
+	git -c status.renames=copies status --find-rename=01% >actual &&
+	test_i18ngrep "copied:" actual &&
+	test_i18ngrep "renamed:" actual
+
+	copied:     original -> copy
+	renamed:    original -> renamed
+	copied:     original -> copy
+	renamed:    original -> renamed
+ok 15 - copies not overridden by find-rename
+
+# passed all 15 test(s)
+1..15
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
 *** t7521-ignored-mode.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7521-ignored-mode/.git/
 expecting success: 
@@ -283703,7 +284121,7 @@
 	git add . &&
 	git commit -m "Initial commit"
 
-[master (root-commit) 6a3fcd8] Initial commit
+[master (root-commit) 63dee53] Initial commit
  Author: A U Thor <author@example.com>
  1 file changed, 3 insertions(+)
  create mode 100644 .gitignore
@@ -283757,7 +284175,7 @@
 	git status --porcelain=v2 --ignored=matching --untracked-files=all >output &&
 	test_i18ncmp expect output
 
-[master 59d0fe3] commit tracked files
+[master 19d5c83] commit tracked files
  Author: A U Thor <author@example.com>
  4 files changed, 0 insertions(+), 0 deletions(-)
  create mode 100644 dir/tracked_ignored/tracked_1
@@ -283770,7 +284188,7 @@
 Removing output
 Removing tracked_ignored/ignored_1.ign
 Removing tracked_ignored/ignored_2.ign
-HEAD is now at 6a3fcd8 Initial commit
+HEAD is now at 63dee53 Initial commit
 ok 3 - Verify status behavior on directory with tracked & ignored files
 
 expecting success: 
@@ -283843,7 +284261,7 @@
 	git status --porcelain=v2 --ignored=matching --untracked-files=all >output &&
 	test_i18ncmp expect output
 
-[master 3925704] Force add file in ignored directory
+[master 4f7e873] Force add file in ignored directory
  Author: A U Thor <author@example.com>
  1 file changed, 0 insertions(+), 0 deletions(-)
  create mode 100644 ignored_dir/tracked
@@ -283853,7 +284271,7 @@
 Removing ignored_dir/ignored_2
 Removing ignored_dir/ignored_2.ign
 Removing output
-HEAD is now at 6a3fcd8 Initial commit
+HEAD is now at 63dee53 Initial commit
 ok 6 - Verify status behavior on ignored directory containing tracked file
 
 expecting success: 
@@ -283926,7 +284344,7 @@
 	git status --porcelain=v2 --ignored=matching --untracked-files=normal >output &&
 	test_i18ncmp expect output
 
-[master 3925704] Force add file in ignored directory
+[master 4f7e873] Force add file in ignored directory
  Author: A U Thor <author@example.com>
  1 file changed, 0 insertions(+), 0 deletions(-)
  create mode 100644 ignored_dir/tracked
@@ -283936,7 +284354,7 @@
 Removing ignored_dir/ignored_2
 Removing ignored_dir/ignored_2.ign
 Removing output
-HEAD is now at 6a3fcd8 Initial commit
+HEAD is now at 63dee53 Initial commit
 ok 9 - Verify status behavior on ignored directory containing tracked file
 
 expecting success: 
@@ -284009,6 +284427,2804 @@
 1..12
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
+*** t7517-per-repo-email.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7517-per-repo-email/.git/
+expecting success: 
+	# we want to make sure a reflog is written, since that needs
+	# a non-strict ident. So be sure we have an actual commit.
+	test_commit foo &&
+
+	sane_unset GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL &&
+	sane_unset GIT_COMMITTER_NAME GIT_COMMITTER_EMAIL &&
+	git config user.name "test" &&
+	git config --global user.useConfigOnly true
+
+[master (root-commit) ddd63c9] foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo.t
+ok 1 - setup a likely user.useConfigOnly use case
+
+expecting success: 
+	test_must_fail git commit --allow-empty -m msg
+
+
+*** Please tell me who you are.
+
+Run
+
+  git config --global user.email "you@example.com"
+  git config --global user.name "Your Name"
+
+to set your account's default identity.
+Omit --global to set the identity only in this repository.
+
+fatal: no email was given and auto-detection is disabled
+ok 2 - fails committing if clone email is not set
+
+expecting success: 
+	test_must_fail env EMAIL=test@fail.com git commit --allow-empty -m msg
+
+
+*** Please tell me who you are.
+
+Run
+
+  git config --global user.email "you@example.com"
+  git config --global user.name "Your Name"
+
+to set your account's default identity.
+Omit --global to set the identity only in this repository.
+
+fatal: no email was given and auto-detection is disabled
+ok 3 - fails committing if clone email is not set, but EMAIL set
+
+expecting success: 
+	test_config user.email "test@ok.com" &&
+	git commit --allow-empty -m msg
+
+[master f3d9b79] msg
+ok 4 - succeeds committing if clone email is set
+
+expecting success: 
+	git clone . clone
+
+Cloning into 'clone'...
+done.
+ok 5 - succeeds cloning if global email is not set
+
+expecting success: 
+	# temporarily enable an actual ident for this setup
+	test_config user.email foo@example.com &&
+	test_commit new &&
+	git branch side-without-commit HEAD^ &&
+	git checkout -b side-with-commit HEAD^ &&
+	test_commit side
+
+[master a31892e] new
+ 1 file changed, 1 insertion(+)
+ create mode 100644 new.t
+Switched to a new branch 'side-with-commit'
+[side-with-commit 1946d3f] side
+ 1 file changed, 1 insertion(+)
+ create mode 100644 side.t
+ok 6 - set up rebase scenarios
+
+expecting success: 
+	git checkout -B tmp side-without-commit &&
+	git rebase master
+
+Switched to a new branch 'tmp'
+First, rewinding head to replay your work on top of it...
+Fast-forwarded tmp to master.
+ok 7 - fast-forward rebase does not care about ident
+
+expecting success: 
+	test_when_finished "git rebase --abort || true" &&
+	git checkout -B tmp side-with-commit &&
+	test_must_fail git rebase master
+
+Reset branch 'tmp'
+First, rewinding head to replay your work on top of it...
+
+*** Please tell me who you are.
+
+Run
+
+  git config --global user.email "you@example.com"
+  git config --global user.name "Your Name"
+
+to set your account's default identity.
+Omit --global to set the identity only in this repository.
+
+fatal: no email was given and auto-detection is disabled
+fatal: No rebase in progress?
+ok 8 - non-fast-forward rebase refuses to write commits
+
+expecting success: 
+	git checkout -B tmp side-without-commit &&
+	git rebase -i master
+
+Previous HEAD position was a31892e new
+Switched to and reset branch 'tmp'
+Successfully rebased and updated refs/heads/tmp.
+ok 9 - fast-forward rebase does not care about ident (interactive)
+
+expecting success: 
+	test_when_finished "git rebase --abort || true" &&
+	git checkout -B tmp side-with-commit &&
+	test_must_fail git rebase -i master
+
+Reset branch 'tmp'
+Rebasing (1/1)
+*** Please tell me who you are.
+
+Run
+
+  git config --global user.email "you@example.com"
+  git config --global user.name "Your Name"
+
+to set your account's default identity.
+Omit --global to set the identity only in this repository.
+
+fatal: no email was given and auto-detection is disabled
+ok 10 - non-fast-forward rebase refuses to write commits (interactive)
+
+expecting success: 
+	git checkout -B tmp side-with-commit &&
+	git rebase -i HEAD^
+
+Reset branch 'tmp'
+Successfully rebased and updated refs/heads/tmp.
+ok 11 - noop interactive rebase does not care about ident
+
+checking prerequisite: REBASE_P
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
+	test -z "$GIT_TEST_SKIP_REBASE_P"
+
+)
+prerequisite REBASE_P ok
+expecting success: 
+	git checkout -B tmp side-without-commit &&
+	git rebase -p master
+
+Reset branch 'tmp'
+Rebasing (1/1)
Successfully rebased and updated refs/heads/tmp.
+ok 12 - fast-forward rebase does not care about ident (preserve)
+
+expecting success: 
+	test_when_finished "git rebase --abort || true" &&
+	git checkout -B tmp side-with-commit &&
+	test_must_fail git rebase -p master
+
+Reset branch 'tmp'
+Rebasing (1/1)
+*** Please tell me who you are.
+
+Run
+
+  git config --global user.email "you@example.com"
+  git config --global user.name "Your Name"
+
+to set your account's default identity.
+Omit --global to set the identity only in this repository.
+
+fatal: no email was given and auto-detection is disabled
+Could not pick 1946d3f6183d588aeff6ac046ea536f53312b882
+ok 13 - non-fast-forward rebase refuses to write commits (preserve)
+
+# passed all 13 test(s)
+1..13
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t7513-interpret-trailers.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7513-interpret-trailers/.git/
+expecting success: 
+	: >empty &&
+	cat >basic_message <<-\EOF &&
+		subject
+
+		body
+	EOF
+	cat >complex_message_body <<-\EOF &&
+		my subject
+
+		my body which is long
+		and contains some special
+		chars like : = ? !
+
+	EOF
+	sed -e "s/ Z\$/ /" >complex_message_trailers <<-\EOF &&
+		Fixes: Z
+		Acked-by: Z
+		Reviewed-by: Z
+		Signed-off-by: Z
+	EOF
+	cat >basic_patch <<-\EOF
+		---
+		 foo.txt | 2 +-
+		 1 file changed, 1 insertion(+), 1 deletion(-)
+
+		diff --git a/foo.txt b/foo.txt
+		index 0353767..1d91aa1 100644
+		--- a/foo.txt
+		+++ b/foo.txt
+		@@ -1,3 +1,3 @@
+
+		-bar
+		+baz
+
+		--
+		1.9.rc0.11.ga562ddc
+
+	EOF
+
+ok 1 - setup
+
+expecting success: 
+	sed -e "s/ Z\$/ /" >expected <<-\EOF &&
+
+		ack: Peff
+		Reviewed-by: Z
+		Acked-by: Johan
+	EOF
+	git interpret-trailers --trailer "ack = Peff" --trailer "Reviewed-by" \
+		--trailer "Acked-by: Johan" empty >actual &&
+	test_cmp expected actual
+
+ok 2 - without config
+
+expecting success: 
+	sed -e "s/ Z\$/ /" >expected <<-\EOF &&
+
+		Acked-by: Johan
+		Reviewed-by: Z
+		ack: Peff
+	EOF
+	git interpret-trailers --trailer "Acked-by: Johan" --trailer "Reviewed-by" \
+		--trailer "ack = Peff" empty >actual &&
+	test_cmp expected actual
+
+ok 3 - without config in another order
+
+expecting success: 
+	cat >expected <<-\EOF &&
+
+		ack: Peff
+		Acked-by: Johan
+	EOF
+	git interpret-trailers --trim-empty --trailer ack=Peff \
+		--trailer "Reviewed-by" --trailer "Acked-by: Johan" \
+		--trailer "sob:" empty >actual &&
+	test_cmp expected actual
+
+ok 4 - --trim-empty without config
+
+expecting success: 
+	cat >expected <<-\EOF &&
+
+		Acked-by: Johan
+		Reviewed-by: Peff
+	EOF
+	{ echo; echo "Acked-by: Johan"; } |
+	git -c "trailer.Acked-by.ifexists=addifdifferent" interpret-trailers \
+		--trailer "Reviewed-by: Peff" --trailer "Acked-by: Johan" >actual &&
+	test_cmp expected actual
+
+ok 5 - with config option on the command line
+
+expecting success: 
+	cat >expected <<-\EOF &&
+		area: change
+
+		Reviewed-by: Peff
+		Acked-by: Johan
+	EOF
+	echo "area: change" |
+	git interpret-trailers --trailer "Reviewed-by: Peff" \
+		--trailer "Acked-by: Johan" >actual &&
+	test_cmp expected actual
+
+ok 6 - with only a title in the message
+
+expecting success: 
+	cat >expected <<-\EOF &&
+		place of
+		code: change
+
+		Reviewed-by: Peff
+		Acked-by: Johan
+	EOF
+	printf "%s\n" "place of" "code: change" |
+	git interpret-trailers --trailer "Reviewed-by: Peff" \
+		--trailer "Acked-by: Johan" >actual &&
+	test_cmp expected actual
+
+ok 7 - with multiline title in the message
+
+expecting success: 
+	cat >patch <<-\EOF &&
+
+		this is not a trailer
+		this is not a trailer
+		Signed-off-by: a <a@example.com>
+		this is not a trailer
+	EOF
+	cat >expected <<-\EOF &&
+
+		this is not a trailer
+		this is not a trailer
+		Signed-off-by: a <a@example.com>
+		this is not a trailer
+		token: value
+	EOF
+	git interpret-trailers --trailer "token: value" patch >actual &&
+	test_cmp expected actual
+
+ok 8 - with non-trailer lines mixed with Signed-off-by
+
+expecting success: 
+	cat >patch <<-\EOF &&
+
+		this is not a trailer
+		this is not a trailer
+		(cherry picked from commit x)
+		this is not a trailer
+	EOF
+	cat >expected <<-\EOF &&
+
+		this is not a trailer
+		this is not a trailer
+		(cherry picked from commit x)
+		this is not a trailer
+		token: value
+	EOF
+	git interpret-trailers --trailer "token: value" patch >actual &&
+	test_cmp expected actual
+
+ok 9 - with non-trailer lines mixed with cherry picked from
+
+expecting success: 
+	cat >patch <<-\EOF &&
+
+		this is not a trailer
+		this is not a trailer
+		My-trailer: x
+		this is not a trailer
+	EOF
+	cat >expected <<-\EOF &&
+
+		this is not a trailer
+		this is not a trailer
+		My-trailer: x
+		this is not a trailer
+		token: value
+	EOF
+	test_config trailer.my.key "My-trailer: " &&
+	git interpret-trailers --trailer "token: value" patch >actual &&
+	test_cmp expected actual
+
+ok 10 - with non-trailer lines mixed with a configured trailer
+
+expecting success: 
+	cat >patch <<-\EOF &&
+
+		this is not a trailer
+		this is not a trailer
+		I-am-not-configured: x
+		this is not a trailer
+	EOF
+	cat >expected <<-\EOF &&
+
+		this is not a trailer
+		this is not a trailer
+		I-am-not-configured: x
+		this is not a trailer
+
+		token: value
+	EOF
+	test_config trailer.my.key "My-trailer: " &&
+	git interpret-trailers --trailer "token: value" patch >actual &&
+	test_cmp expected actual
+
+ok 11 - with non-trailer lines mixed with a non-configured trailer
+
+expecting success: 
+	cat >patch <<-\EOF &&
+
+		I-am-not-configured: x
+		I-am-also-not-configured: x
+	EOF
+	cat >expected <<-\EOF &&
+
+		I-am-not-configured: x
+		I-am-also-not-configured: x
+		token: value
+	EOF
+	test_config trailer.my.key "My-trailer: " &&
+	git interpret-trailers --trailer "token: value" patch >actual &&
+	test_cmp expected actual
+
+ok 12 - with all non-configured trailers
+
+expecting success: 
+	cat >patch <<-\EOF &&
+
+		this is not a trailer
+	EOF
+	cat >expected <<-\EOF &&
+
+		this is not a trailer
+
+		token: value
+	EOF
+	git interpret-trailers --trailer "token: value" patch >actual &&
+	test_cmp expected actual
+
+ok 13 - with non-trailer lines only
+
+expecting success: 
+	q_to_tab >patch <<-\EOF &&
+
+		Qtoken: value
+	EOF
+	q_to_tab >expected <<-\EOF &&
+
+		Qtoken: value
+
+		token: value
+	EOF
+	git interpret-trailers --trailer "token: value" patch >actual &&
+	test_cmp expected actual
+
+ok 14 - line with leading whitespace is not trailer
+
+expecting success: 
+	q_to_tab >patch <<-\EOF &&
+
+		Signed-off-by: a <a@example.com>
+		name: value on
+		Qmultiple lines
+		this is not a trailer
+		this is not a trailer
+		this is not a trailer
+		this is not a trailer
+		this is not a trailer
+		this is not a trailer
+	EOF
+	q_to_tab >expected <<-\EOF &&
+
+		Signed-off-by: a <a@example.com>
+		name: value on
+		Qmultiple lines
+		this is not a trailer
+		this is not a trailer
+		this is not a trailer
+		this is not a trailer
+		this is not a trailer
+		this is not a trailer
+		name: value
+	EOF
+	git interpret-trailers --trailer "name: value" patch >actual &&
+	test_cmp expected actual
+
+ok 15 - multiline field treated as one trailer for 25% check
+
+expecting success: 
+	q_to_tab >patch <<-\EOF &&
+
+		another: trailer
+		name: value on
+		Qmultiple lines
+		another: trailer
+	EOF
+	q_to_tab >expected <<-\EOF &&
+
+		another: trailer
+		name: value on
+		Qmultiple lines
+		name: value
+		another: trailer
+	EOF
+	test_config trailer.name.where after &&
+	git interpret-trailers --trailer "name: value" patch >actual &&
+	test_cmp expected actual
+
+ok 16 - multiline field treated as atomic for placement
+
+expecting success: 
+	q_to_tab >patch <<-\EOF &&
+
+		another: trailer
+		name: value on
+		Qmultiple lines
+		another: trailer
+	EOF
+	q_to_tab >expected <<-\EOF &&
+
+		another: trailer
+		another: trailer
+		name: value
+	EOF
+	test_config trailer.name.ifexists replace &&
+	git interpret-trailers --trailer "name: value" patch >actual &&
+	test_cmp expected actual
+
+ok 17 - multiline field treated as atomic for replacement
+
+expecting success: 
+	q_to_tab >patch <<-\EOF &&
+
+		another: trailer
+		name: first line
+		Qsecond line
+		another: trailer
+	EOF
+	test_config trailer.name.ifexists addIfDifferent &&
+
+	q_to_tab >trailer <<-\EOF &&
+		name: first line
+		Qsecond line
+	EOF
+	q_to_tab >expected <<-\EOF &&
+
+		another: trailer
+		name: first line
+		Qsecond line
+		another: trailer
+	EOF
+	git interpret-trailers --trailer "$(cat trailer)" patch >actual &&
+	test_cmp expected actual &&
+
+	q_to_tab >trailer <<-\EOF &&
+		name: first line
+		QQQQQsecond line
+	EOF
+	q_to_tab >expected <<-\EOF &&
+
+		another: trailer
+		name: first line
+		Qsecond line
+		another: trailer
+		name: first line
+		QQQQQsecond line
+	EOF
+	git interpret-trailers --trailer "$(cat trailer)" patch >actual &&
+	test_cmp expected actual &&
+
+	q_to_tab >trailer <<-\EOF &&
+		name: first line *DIFFERENT*
+		Qsecond line
+	EOF
+	q_to_tab >expected <<-\EOF &&
+
+		another: trailer
+		name: first line
+		Qsecond line
+		another: trailer
+		name: first line *DIFFERENT*
+		Qsecond line
+	EOF
+	git interpret-trailers --trailer "$(cat trailer)" patch >actual &&
+	test_cmp expected actual
+
+ok 18 - multiline field treated as atomic for difference check
+
+expecting success: 
+	q_to_tab >patch <<-\EOF &&
+
+		another: trailer
+		name: first line
+		Qsecond line
+		another: trailer
+	EOF
+	test_config trailer.name.where after &&
+	test_config trailer.name.ifexists addIfDifferentNeighbor &&
+
+	q_to_tab >trailer <<-\EOF &&
+		name: first line
+		Qsecond line
+	EOF
+	q_to_tab >expected <<-\EOF &&
+
+		another: trailer
+		name: first line
+		Qsecond line
+		another: trailer
+	EOF
+	git interpret-trailers --trailer "$(cat trailer)" patch >actual &&
+	test_cmp expected actual &&
+
+	q_to_tab >trailer <<-\EOF &&
+		name: first line
+		QQQQQsecond line
+	EOF
+	q_to_tab >expected <<-\EOF &&
+
+		another: trailer
+		name: first line
+		Qsecond line
+		name: first line
+		QQQQQsecond line
+		another: trailer
+	EOF
+	git interpret-trailers --trailer "$(cat trailer)" patch >actual &&
+	test_cmp expected actual
+
+ok 19 - multiline field treated as atomic for neighbor check
+
+expecting success: 
+	git config trailer.ack.key "Acked-by: " &&
+	cat >expected <<-\EOF &&
+
+		Acked-by: Peff
+	EOF
+	git interpret-trailers --trim-empty --trailer "ack = Peff" empty >actual &&
+	test_cmp expected actual &&
+	git interpret-trailers --trim-empty --trailer "Acked-by = Peff" empty >actual &&
+	test_cmp expected actual &&
+	git interpret-trailers --trim-empty --trailer "Acked-by :Peff" empty >actual &&
+	test_cmp expected actual
+
+ok 20 - with config setup
+
+expecting success: 
+	git config trailer.separators ":=" &&
+	git config trailer.ack.key "Acked-by= " &&
+	cat >expected <<-\EOF &&
+
+		Acked-by= Peff
+	EOF
+	git interpret-trailers --trim-empty --trailer "ack = Peff" empty >actual &&
+	test_cmp expected actual &&
+	git interpret-trailers --trim-empty --trailer "Acked-by= Peff" empty >actual &&
+	test_cmp expected actual &&
+	git interpret-trailers --trim-empty --trailer "Acked-by : Peff" empty >actual &&
+	test_cmp expected actual
+
+ok 21 - with config setup and ":=" as separators
+
+expecting success: 
+	git config trailer.separators "%" &&
+	cat >expected <<-\EOF &&
+
+		bug% 42
+		count% 10
+		bug% 422
+	EOF
+	git interpret-trailers --trim-empty --trailer "bug = 42" \
+		--trailer count%10 --trailer "test: stuff" \
+		--trailer "bug % 422" empty >actual &&
+	test_cmp expected actual
+
+ok 22 - with config setup and "%" as separators
+
+expecting success: 
+	cat >special_message <<-\EOF &&
+		Special Message
+
+		bug% 42
+		count% 10
+		bug% 422
+	EOF
+	cat >expected <<-\EOF &&
+		Special Message
+
+		bug% 42
+		count% 10
+		bug% 422
+		count% 100
+	EOF
+	git interpret-trailers --trailer count%100 \
+		special_message >actual &&
+	test_cmp expected actual
+
+ok 23 - with "%" as separators and a message with trailers
+
+expecting success: 
+	git config trailer.separators ":=#" &&
+	git config trailer.bug.key "Bug #" &&
+	cat >expected <<-\EOF &&
+
+		Bug #42
+	EOF
+	git interpret-trailers --trim-empty --trailer "bug = 42" empty >actual &&
+	test_cmp expected actual
+
+ok 24 - with config setup and ":=#" as separators
+
+expecting success: 
+	cat basic_message >expected &&
+	echo >>expected &&
+	git interpret-trailers <basic_message >actual &&
+	test_cmp expected actual
+
+ok 25 - with commit basic message
+
+expecting success: 
+	cat basic_message >input &&
+	cat basic_patch >>input &&
+	cat basic_message >expected &&
+	echo >>expected &&
+	cat basic_patch >>expected &&
+	git interpret-trailers <input >actual &&
+	test_cmp expected actual
+
+ok 26 - with basic patch
+
+expecting success: 
+	cat complex_message_body complex_message_trailers >complex_message &&
+	cat complex_message_body >expected &&
+	sed -e "s/ Z\$/ /" >>expected <<-\EOF &&
+		Fixes: Z
+		Acked-by= Z
+		Reviewed-by: Z
+		Signed-off-by: Z
+	EOF
+	git interpret-trailers complex_message >actual &&
+	test_cmp expected actual
+
+ok 27 - with commit complex message as argument
+
+expecting success: 
+	cat basic_message >>expected &&
+	echo >>expected &&
+	cat basic_patch >>expected &&
+	git interpret-trailers complex_message input >actual &&
+	test_cmp expected actual
+
+ok 28 - with 2 files arguments
+
+expecting success: 
+	cat basic_message >message_with_comments &&
+	sed -e "s/ Z\$/ /" >>message_with_comments <<-\EOF &&
+		# comment
+
+		# other comment
+		Cc: Z
+		# yet another comment
+		Reviewed-by: Johan
+		Reviewed-by: Z
+		# last comment
+
+	EOF
+	cat basic_patch >>message_with_comments &&
+	cat basic_message >expected &&
+	cat >>expected <<-\EOF &&
+		# comment
+
+		Reviewed-by: Johan
+		Cc: Peff
+		# last comment
+
+	EOF
+	cat basic_patch >>expected &&
+	git interpret-trailers --trim-empty --trailer "Cc: Peff" message_with_comments >actual &&
+	test_cmp expected actual
+
+ok 29 - with message that has comments
+
+expecting success: 
+	cat basic_message >message_with_comments &&
+	sed -e "s/ Z\$/ /" >>message_with_comments <<-\EOF &&
+		# comment
+
+		# other comment
+		Cc: Z
+		# yet another comment
+		Reviewed-by: Johan
+		Reviewed-by: Z
+		# last comment
+
+		Conflicts:
+
+	EOF
+	cat basic_message >expected &&
+	cat >>expected <<-\EOF &&
+		# comment
+
+		Reviewed-by: Johan
+		Cc: Peff
+		# last comment
+
+		Conflicts:
+
+	EOF
+	git interpret-trailers --trim-empty --trailer "Cc: Peff" message_with_comments >actual &&
+	test_cmp expected actual
+
+ok 30 - with message that has an old style conflict block
+
+expecting success: 
+	cat complex_message_body >expected &&
+	sed -e "s/ Z\$/ /" >>expected <<-\EOF &&
+		Fixes: Z
+		Acked-by= Z
+		Reviewed-by: Z
+		Signed-off-by: Z
+		Acked-by= Peff
+		Bug #42
+	EOF
+	git interpret-trailers --trailer "ack: Peff" \
+		--trailer "bug: 42" <complex_message >actual &&
+	test_cmp expected actual
+
+ok 31 - with commit complex message and trailer args
+
+expecting success: 
+	cat complex_message >complex_patch &&
+	cat basic_patch >>complex_patch &&
+	cat complex_message_body >expected &&
+	cat >>expected <<-\EOF &&
+		Acked-by= Peff
+		Bug #42
+	EOF
+	cat basic_patch >>expected &&
+	git interpret-trailers --trim-empty --trailer "ack: Peff" \
+		--trailer "bug: 42" <complex_patch >actual &&
+	test_cmp expected actual
+
+ok 32 - with complex patch, args and --trim-empty
+
+expecting success: 
+	cat basic_message >message &&
+	cat basic_patch >>message &&
+	cat basic_message >expected &&
+	echo >>expected &&
+	cat basic_patch >>expected &&
+	git interpret-trailers --in-place message &&
+	test_cmp expected message
+
+ok 33 - in-place editing with basic patch
+
+expecting success: 
+	cat basic_message >message &&
+	cat basic_patch >>message &&
+	cat basic_message >expected &&
+	echo >>expected &&
+	cat >>expected <<-\EOF &&
+		Reviewed-by: Alice
+	EOF
+	cat basic_patch >>expected &&
+	git interpret-trailers --trailer "Reviewed-by: Alice" --in-place message &&
+	test_cmp expected message
+
+ok 34 - in-place editing with additional trailer
+
+expecting success: 
+	test_must_fail git interpret-trailers --trailer "Reviewed-by: Alice" --in-place < basic_message
+
+fatal: no input file given for in-place editing
+ok 35 - in-place editing on stdin disallowed
+
+expecting success: 
+	test_must_fail git interpret-trailers --trailer "Reviewed-by: Alice" --in-place nonexisting &&
+	test_path_is_missing nonexisting
+
+fatal: could not read input file 'nonexisting': No such file or directory
+ok 36 - in-place editing on non-existing file
+
+checking prerequisite: SANITY
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
+	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: 
+	cat basic_message >message &&
+	chmod -r message &&
+	test_must_fail git interpret-trailers --trailer "Reviewed-by: Alice" --in-place message &&
+	chmod +r message &&
+	test_cmp message basic_message
+
+fatal: could not read input file 'message': Permission denied
+ok 37 - in-place editing doesn't clobber original file on error
+
+expecting success: 
+	git config trailer.bug.where "before" &&
+	cat complex_message_body >expected &&
+	sed -e "s/ Z\$/ /" >>expected <<-\EOF &&
+		Bug #42
+		Fixes: Z
+		Acked-by= Z
+		Reviewed-by: Z
+		Signed-off-by: Z
+		Acked-by= Peff
+	EOF
+	git interpret-trailers --trailer "ack: Peff" \
+		--trailer "bug: 42" complex_message >actual &&
+	test_cmp expected actual
+
+ok 38 - using "where = before"
+
+expecting success: 
+	git config trailer.ack.where "before" &&
+	cat complex_message_body >expected &&
+	sed -e "s/ Z\$/ /" >>expected <<-\EOF &&
+		Fixes: Z
+		Acked-by= Z
+		Acked-by= Peff
+		Reviewed-by: Z
+		Signed-off-by: Z
+	EOF
+	git interpret-trailers --where after --trailer "ack: Peff" \
+		complex_message >actual &&
+	test_cmp expected actual
+
+ok 39 - overriding configuration with "--where after"
+
+expecting success: 
+	cat complex_message_body >expected &&
+	sed -e "s/ Z\$/ /" >>expected <<-\EOF &&
+		Bug #42
+		Fixes: Z
+		Acked-by= Peff
+		Acked-by= Z
+		Reviewed-by: Z
+		Signed-off-by: Z
+	EOF
+	git interpret-trailers --where after --no-where --trailer "ack: Peff" \
+		--trailer "bug: 42" complex_message >actual &&
+	test_cmp expected actual
+
+ok 40 - using "where = before" with "--no-where"
+
+expecting success: 
+	git config trailer.ack.where "after" &&
+	cat complex_message_body >expected &&
+	sed -e "s/ Z\$/ /" >>expected <<-\EOF &&
+		Bug #42
+		Fixes: Z
+		Acked-by= Z
+		Acked-by= Peff
+		Reviewed-by: Z
+		Signed-off-by: Z
+	EOF
+	git interpret-trailers --trailer "ack: Peff" \
+		--trailer "bug: 42" complex_message >actual &&
+	test_cmp expected actual
+
+ok 41 - using "where = after"
+
+expecting success: 
+	git config trailer.review.key "Reviewed-by" &&
+	git config trailer.review.where "end" &&
+	cat complex_message_body >expected &&
+	sed -e "s/ Z\$/ /" >>expected <<-\EOF &&
+		Fixes: Z
+		Acked-by= Z
+		Acked-by= Peff
+		Reviewed-by: Z
+		Signed-off-by: Z
+		Reviewed-by: Junio
+		Reviewed-by: Johannes
+	EOF
+	git interpret-trailers --trailer "ack: Peff" \
+		--trailer "Reviewed-by: Junio" --trailer "Reviewed-by: Johannes" \
+		complex_message >actual &&
+	test_cmp expected actual
+
+ok 42 - using "where = end"
+
+expecting success: 
+	git config trailer.review.key "Reviewed-by" &&
+	git config trailer.review.where "start" &&
+	cat complex_message_body >expected &&
+	sed -e "s/ Z\$/ /" >>expected <<-\EOF &&
+		Reviewed-by: Johannes
+		Reviewed-by: Junio
+		Fixes: Z
+		Acked-by= Z
+		Acked-by= Peff
+		Reviewed-by: Z
+		Signed-off-by: Z
+	EOF
+	git interpret-trailers --trailer "ack: Peff" \
+		--trailer "Reviewed-by: Junio" --trailer "Reviewed-by: Johannes" \
+		complex_message >actual &&
+	test_cmp expected actual
+
+ok 43 - using "where = start"
+
+expecting success: 
+	git config trailer.review.key "Reviewed-by:" &&
+	git config trailer.review.where "before" &&
+	cat complex_message_body >expected &&
+	sed -e "s/ Z\$/ /" >>expected <<-\EOF &&
+		Bug #42
+		Fixes: Z
+		Acked-by= Z
+		Acked-by= Peff
+		Reviewed-by:Johan
+		Reviewed-by:
+		Signed-off-by: Z
+	EOF
+	git interpret-trailers --trailer "ack: Peff" --trailer "bug: 42" \
+		--trailer "review: Johan" <complex_message >actual &&
+	test_cmp expected actual
+
+ok 44 - using "where = before" for a token in the middle of the message
+
+expecting success: 
+	cat complex_message_body >expected &&
+	cat >>expected <<-\EOF &&
+		Bug #46
+		Bug #42
+		Acked-by= Peff
+		Reviewed-by:Johan
+	EOF
+	git interpret-trailers --trim-empty --trailer "ack: Peff" \
+		--trailer "bug: 42" --trailer "review: Johan" \
+		--trailer "Bug: 46" <complex_message >actual &&
+	test_cmp expected actual
+
+ok 45 - using "where = before" and --trim-empty
+
+expecting success: 
+	cat complex_message_body >expected &&
+	sed -e "s/ Z\$/ /" >>expected <<-\EOF &&
+		Bug #42
+		Fixes: Z
+		Acked-by= Z
+		Acked-by= Peff
+		Acked-by= Junio
+		Acked-by= Peff
+		Reviewed-by:
+		Signed-off-by: Z
+	EOF
+	git interpret-trailers --trailer "ack: Peff" --trailer "review:" \
+		--trailer "ack: Junio" --trailer "bug: 42" --trailer "ack: Peff" \
+		--trailer "ack: Peff" <complex_message >actual &&
+	test_cmp expected actual
+
+ok 46 - the default is "ifExists = addIfDifferentNeighbor"
+
+expecting success: 
+	git config trailer.ifexists "addIfDifferent" &&
+	cat complex_message_body >expected &&
+	sed -e "s/ Z\$/ /" >>expected <<-\EOF &&
+		Bug #42
+		Fixes: Z
+		Acked-by= Z
+		Acked-by= Peff
+		Acked-by= Junio
+		Reviewed-by:
+		Signed-off-by: Z
+	EOF
+	git interpret-trailers --trailer "ack: Peff" --trailer "review:" \
+		--trailer "ack: Junio" --trailer "bug: 42" --trailer "ack: Peff" \
+		--trailer "ack: Peff" <complex_message >actual &&
+	test_cmp expected actual
+
+ok 47 - default "ifExists" is now "addIfDifferent"
+
+expecting success: 
+	git config trailer.ack.ifExists "addIfDifferent" &&
+	git config trailer.ack.where "end" &&
+	cat complex_message_body >expected &&
+	sed -e "s/ Z\$/ /" >>expected <<-\EOF &&
+		Bug #42
+		Fixes: Z
+		Acked-by= Z
+		Reviewed-by:
+		Signed-off-by: Z
+		Acked-by= Peff
+	EOF
+	git interpret-trailers --trailer "ack: Peff" --trailer "review:" \
+		--trailer "bug: 42" --trailer "ack: Peff" \
+		<complex_message >actual &&
+	test_cmp expected actual
+
+ok 48 - using "ifExists = addIfDifferent" with "where = end"
+
+expecting success: 
+	git config trailer.ack.ifExists "addIfDifferent" &&
+	git config trailer.ack.where "before" &&
+	cat complex_message_body >expected &&
+	sed -e "s/ Z\$/ /" >>expected <<-\EOF &&
+		Bug #42
+		Fixes: Z
+		Acked-by= Peff
+		Acked-by= Z
+		Reviewed-by:
+		Signed-off-by: Z
+	EOF
+	git interpret-trailers --trailer "ack: Peff" --trailer "review:" \
+		--trailer "bug: 42" --trailer "ack: Peff" \
+		<complex_message >actual &&
+	test_cmp expected actual
+
+ok 49 - using "ifExists = addIfDifferent" with "where = before"
+
+expecting success: 
+	git config trailer.ack.ifExists "addIfDifferentNeighbor" &&
+	git config trailer.ack.where "end" &&
+	cat complex_message_body >expected &&
+	sed -e "s/ Z\$/ /" >>expected <<-\EOF &&
+		Bug #42
+		Fixes: Z
+		Acked-by= Z
+		Reviewed-by:
+		Signed-off-by: Z
+		Acked-by= Peff
+		Acked-by= Junio
+		Tested-by: Jakub
+		Acked-by= Junio
+		Acked-by= Peff
+	EOF
+	git interpret-trailers --trailer "ack: Peff" --trailer "review:" \
+		--trailer "ack: Junio" --trailer "bug: 42" \
+		--trailer "Tested-by: Jakub" --trailer "ack: Junio" \
+		--trailer "ack: Junio" --trailer "ack: Peff" <complex_message >actual &&
+	test_cmp expected actual
+
+ok 50 - using "ifExists = addIfDifferentNeighbor" with "where = end"
+
+expecting success: 
+	git config trailer.ack.ifExists "addIfDifferentNeighbor" &&
+	git config trailer.ack.where "after" &&
+	cat complex_message_body >expected &&
+	sed -e "s/ Z\$/ /" >>expected <<-\EOF &&
+		Bug #42
+		Fixes: Z
+		Acked-by= Z
+		Acked-by= Peff
+		Acked-by= Junio
+		Acked-by= Peff
+		Reviewed-by:
+		Signed-off-by: Z
+		Tested-by: Jakub
+	EOF
+	git interpret-trailers --trailer "ack: Peff" --trailer "review:" \
+		--trailer "ack: Junio" --trailer "bug: 42" \
+		--trailer "Tested-by: Jakub" --trailer "ack: Junio" \
+		--trailer "ack: Junio" --trailer "ack: Peff" <complex_message >actual &&
+	test_cmp expected actual
+
+ok 51 - using "ifExists = addIfDifferentNeighbor"  with "where = after"
+
+expecting success: 
+	git config trailer.ack.ifExists "addIfDifferentNeighbor" &&
+	cat complex_message_body >expected &&
+	cat >>expected <<-\EOF &&
+		Bug #42
+		Acked-by= Peff
+		Acked-by= Junio
+		Acked-by= Peff
+	EOF
+	git interpret-trailers --trim-empty --trailer "ack: Peff" \
+		--trailer "Acked-by= Peff" --trailer "review:" \
+		--trailer "ack: Junio" --trailer "bug: 42" \
+		--trailer "ack: Peff" <complex_message >actual &&
+	test_cmp expected actual
+
+ok 52 - using "ifExists = addIfDifferentNeighbor" and --trim-empty
+
+expecting success: 
+	git config trailer.ack.ifExists "add" &&
+	git config trailer.ack.where "end" &&
+	cat complex_message_body >expected &&
+	sed -e "s/ Z\$/ /" >>expected <<-\EOF &&
+		Bug #42
+		Fixes: Z
+		Acked-by= Z
+		Reviewed-by:
+		Signed-off-by: Z
+		Acked-by= Peff
+		Acked-by= Peff
+		Tested-by: Jakub
+		Acked-by= Junio
+		Tested-by: Johannes
+		Acked-by= Peff
+	EOF
+	git interpret-trailers --trailer "ack: Peff" \
+		--trailer "Acked-by= Peff" --trailer "review:" \
+		--trailer "Tested-by: Jakub" --trailer "ack: Junio" \
+		--trailer "bug: 42" --trailer "Tested-by: Johannes" \
+		--trailer "ack: Peff" <complex_message >actual &&
+	test_cmp expected actual
+
+ok 53 - using "ifExists = add" with "where = end"
+
+expecting success: 
+	git config trailer.ack.ifExists "add" &&
+	git config trailer.ack.where "after" &&
+	cat complex_message_body >expected &&
+	sed -e "s/ Z\$/ /" >>expected <<-\EOF &&
+		Bug #42
+		Fixes: Z
+		Acked-by= Z
+		Acked-by= Peff
+		Acked-by= Peff
+		Acked-by= Junio
+		Acked-by= Peff
+		Reviewed-by:
+		Signed-off-by: Z
+	EOF
+	git interpret-trailers --trailer "ack: Peff" \
+		--trailer "Acked-by= Peff" --trailer "review:" \
+		--trailer "ack: Junio" --trailer "bug: 42" \
+		--trailer "ack: Peff" <complex_message >actual &&
+	test_cmp expected actual
+
+ok 54 - using "ifExists = add" with "where = after"
+
+expecting success: 
+	git config trailer.fix.key "Fixes: " &&
+	git config trailer.fix.ifExists "add" &&
+	cat complex_message_body >expected &&
+	sed -e "s/ Z\$/ /" >>expected <<-\EOF &&
+		Bug #42
+		Acked-by= Z
+		Reviewed-by:
+		Signed-off-by: Z
+		Fixes: 22
+	EOF
+	git interpret-trailers --if-exists replace --trailer "review:" \
+		--trailer "fix=53" --trailer "fix=22" --trailer "bug: 42" \
+		<complex_message >actual &&
+	test_cmp expected actual
+
+ok 55 - overriding configuration with "--if-exists replace"
+
+expecting success: 
+	git config trailer.fix.key "Fixes: " &&
+	git config trailer.fix.ifExists "replace" &&
+	cat complex_message_body >expected &&
+	sed -e "s/ Z\$/ /" >>expected <<-\EOF &&
+		Bug #42
+		Acked-by= Z
+		Acked-by= Junio
+		Acked-by= Peff
+		Reviewed-by:
+		Signed-off-by: Z
+		Fixes: 22
+	EOF
+	git interpret-trailers --trailer "review:" \
+		--trailer "fix=53" --trailer "ack: Junio" --trailer "fix=22" \
+		--trailer "bug: 42" --trailer "ack: Peff" \
+		<complex_message >actual &&
+	test_cmp expected actual
+
+ok 56 - using "ifExists = replace"
+
+expecting success: 
+	git config trailer.fix.where "after" &&
+	cat complex_message_body >expected &&
+	sed -e "s/ Z\$/ /" >>expected <<-\EOF &&
+		Bug #42
+		Fixes: 22
+		Acked-by= Z
+		Acked-by= Junio
+		Acked-by= Peff
+		Reviewed-by:
+		Signed-off-by: Z
+	EOF
+	git interpret-trailers --trailer "review:" \
+		--trailer "fix=53" --trailer "ack: Junio" --trailer "fix=22" \
+		--trailer "bug: 42" --trailer "ack: Peff" \
+		<complex_message >actual &&
+	test_cmp expected actual
+
+ok 57 - using "ifExists = replace" with "where = after"
+
+expecting success: 
+	git config trailer.fix.ifExists "doNothing" &&
+	cat complex_message_body >expected &&
+	sed -e "s/ Z\$/ /" >>expected <<-\EOF &&
+		Bug #42
+		Fixes: Z
+		Acked-by= Z
+		Acked-by= Junio
+		Acked-by= Peff
+		Reviewed-by:
+		Signed-off-by: Z
+	EOF
+	git interpret-trailers --trailer "review:" --trailer "fix=53" \
+		--trailer "ack: Junio" --trailer "fix=22" \
+		--trailer "bug: 42" --trailer "ack: Peff" \
+		<complex_message >actual &&
+	test_cmp expected actual
+
+ok 58 - using "ifExists = doNothing"
+
+expecting success: 
+	git config trailer.cc.key "Cc: " &&
+	git config trailer.cc.where "before" &&
+	cat complex_message_body >expected &&
+	sed -e "s/ Z\$/ /" >>expected <<-\EOF &&
+		Bug #42
+		Cc: Linus
+		Fixes: Z
+		Acked-by= Z
+		Acked-by= Junio
+		Acked-by= Peff
+		Reviewed-by:
+		Signed-off-by: Z
+	EOF
+	git interpret-trailers --trailer "review:" --trailer "fix=53" \
+		--trailer "cc=Linus" --trailer "ack: Junio" \
+		--trailer "fix=22" --trailer "bug: 42" --trailer "ack: Peff" \
+		<complex_message >actual &&
+	test_cmp expected actual
+
+ok 59 - the default is "ifMissing = add"
+
+expecting success: 
+	git config trailer.ifmissing "add" &&
+	cat complex_message_body >expected &&
+	sed -e "s/ Z\$/ /" >>expected <<-\EOF &&
+		Fixes: Z
+		Acked-by= Z
+		Acked-by= Junio
+		Acked-by= Peff
+		Reviewed-by:
+		Signed-off-by: Z
+	EOF
+	git interpret-trailers --if-missing doNothing \
+		--trailer "review:" --trailer "fix=53" \
+		--trailer "cc=Linus" --trailer "ack: Junio" \
+		--trailer "fix=22" --trailer "bug: 42" --trailer "ack: Peff" \
+		<complex_message >actual &&
+	test_cmp expected actual
+
+ok 60 - overriding configuration with "--if-missing doNothing"
+
+expecting success: 
+	git config trailer.ifmissing "doNothing" &&
+	cat complex_message_body >expected &&
+	sed -e "s/ Z\$/ /" >>expected <<-\EOF &&
+		Fixes: Z
+		Acked-by= Z
+		Acked-by= Junio
+		Acked-by= Peff
+		Reviewed-by:
+		Signed-off-by: Z
+	EOF
+	git interpret-trailers --trailer "review:" --trailer "fix=53" \
+		--trailer "cc=Linus" --trailer "ack: Junio" \
+		--trailer "fix=22" --trailer "bug: 42" --trailer "ack: Peff" \
+		<complex_message >actual &&
+	test_cmp expected actual &&
+	git config trailer.ifmissing "add"
+
+ok 61 - when default "ifMissing" is "doNothing"
+
+expecting success: 
+	git config trailer.cc.key "Cc: " &&
+	git config trailer.cc.where "end" &&
+	git config trailer.cc.ifMissing "add" &&
+	cat complex_message_body >expected &&
+	sed -e "s/ Z\$/ /" >>expected <<-\EOF &&
+		Bug #42
+		Fixes: Z
+		Acked-by= Z
+		Acked-by= Junio
+		Acked-by= Peff
+		Reviewed-by:
+		Signed-off-by: Z
+		Cc: Linus
+	EOF
+	git interpret-trailers --trailer "review:" --trailer "fix=53" \
+		--trailer "ack: Junio" --trailer "fix=22" \
+		--trailer "bug: 42" --trailer "cc=Linus" --trailer "ack: Peff" \
+		<complex_message >actual &&
+	test_cmp expected actual
+
+ok 62 - using "ifMissing = add" with "where = end"
+
+expecting success: 
+	git config trailer.cc.key "Cc: " &&
+	git config trailer.cc.where "before" &&
+	git config trailer.cc.ifMissing "add" &&
+	cat complex_message_body >expected &&
+	sed -e "s/ Z\$/ /" >>expected <<-\EOF &&
+		Cc: Linus
+		Bug #42
+		Fixes: Z
+		Acked-by= Z
+		Acked-by= Junio
+		Acked-by= Peff
+		Reviewed-by:
+		Signed-off-by: Z
+	EOF
+	git interpret-trailers --trailer "review:" --trailer "fix=53" \
+		--trailer "ack: Junio" --trailer "fix=22" \
+		--trailer "bug: 42" --trailer "cc=Linus" --trailer "ack: Peff" \
+		<complex_message >actual &&
+	test_cmp expected actual
+
+ok 63 - using "ifMissing = add" with "where = before"
+
+expecting success: 
+	git config trailer.cc.ifMissing "doNothing" &&
+	cat complex_message_body >expected &&
+	sed -e "s/ Z\$/ /" >>expected <<-\EOF &&
+		Bug #42
+		Fixes: Z
+		Acked-by= Z
+		Acked-by= Junio
+		Acked-by= Peff
+		Reviewed-by:
+		Signed-off-by: Z
+	EOF
+	git interpret-trailers --trailer "review:" --trailer "fix=53" \
+		--trailer "cc=Linus" --trailer "ack: Junio" \
+		--trailer "fix=22" --trailer "bug: 42" --trailer "ack: Peff" \
+		<complex_message >actual &&
+	test_cmp expected actual
+
+ok 64 - using "ifMissing = doNothing"
+
+expecting success: 
+	git config trailer.where "after" &&
+	git config --unset trailer.ack.where &&
+	cat complex_message_body >expected &&
+	sed -e "s/ Z\$/ /" >>expected <<-\EOF &&
+		Bug #42
+		Fixes: Z
+		Acked-by= Z
+		Acked-by= Peff
+		Acked-by= Peff
+		Acked-by= Junio
+		Acked-by= Peff
+		Reviewed-by:
+		Signed-off-by: Z
+		Tested-by: Jakub
+		Tested-by: Johannes
+	EOF
+	git interpret-trailers --trailer "ack: Peff" \
+		--trailer "Acked-by= Peff" --trailer "review:" \
+		--trailer "Tested-by: Jakub" --trailer "ack: Junio" \
+		--trailer "bug: 42" --trailer "Tested-by: Johannes" \
+		--trailer "ack: Peff" <complex_message >actual &&
+	test_cmp expected actual
+
+ok 65 - default "where" is now "after"
+
+expecting success: 
+	git config trailer.sign.key "Signed-off-by: " &&
+	git config trailer.sign.where "after" &&
+	git config trailer.sign.ifExists "addIfDifferentNeighbor" &&
+	git config trailer.sign.command "echo \"A U Thor <author@example.com>\"" &&
+	cat complex_message_body >expected &&
+	sed -e "s/ Z\$/ /" >>expected <<-\EOF &&
+		Fixes: Z
+		Acked-by= Z
+		Reviewed-by:
+		Signed-off-by: Z
+		Signed-off-by: A U Thor <author@example.com>
+	EOF
+	git interpret-trailers --trailer "review:" --trailer "fix=22" \
+		<complex_message >actual &&
+	test_cmp expected actual
+
+ok 66 - with simple command
+
+expecting success: 
+	git config trailer.sign.ifExists "addIfDifferent" &&
+	git config trailer.sign.command "echo \"\$GIT_COMMITTER_NAME <\$GIT_COMMITTER_EMAIL>\"" &&
+	cat complex_message_body >expected &&
+	sed -e "s/ Z\$/ /" >>expected <<-\EOF &&
+		Fixes: Z
+		Acked-by= Z
+		Reviewed-by:
+		Signed-off-by: Z
+		Signed-off-by: C O Mitter <committer@example.com>
+	EOF
+	git interpret-trailers --trailer "review:" --trailer "fix=22" \
+		<complex_message >actual &&
+	test_cmp expected actual
+
+ok 67 - with command using commiter information
+
+expecting success: 
+	git config trailer.sign.key "Signed-off-by: " &&
+	git config trailer.sign.where "after" &&
+	git config trailer.sign.ifExists "addIfDifferentNeighbor" &&
+	git config trailer.sign.command "echo \"\$GIT_AUTHOR_NAME <\$GIT_AUTHOR_EMAIL>\"" &&
+	cat complex_message_body >expected &&
+	sed -e "s/ Z\$/ /" >>expected <<-\EOF &&
+		Fixes: Z
+		Acked-by= Z
+		Reviewed-by:
+		Signed-off-by: Z
+		Signed-off-by: A U Thor <author@example.com>
+	EOF
+	git interpret-trailers --trailer "review:" --trailer "fix=22" \
+		<complex_message >actual &&
+	test_cmp expected actual
+
+ok 68 - with command using author information
+
+expecting success: 
+	echo "Content of the first commit." > a.txt &&
+	git add a.txt &&
+	git commit -m "Add file a.txt"
+
+[master (root-commit) 65cb072] Add file a.txt
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 a.txt
+ok 69 - setup a commit
+
+expecting success: 
+	git config trailer.fix.ifExists "replace" &&
+	git config trailer.fix.command "git log -1 --oneline --format=\"%h (%s)\" --abbrev-commit --abbrev=14 \$ARG" &&
+	FIXED=$(git log -1 --oneline --format="%h (%s)" --abbrev-commit --abbrev=14 HEAD) &&
+	cat complex_message_body >expected &&
+	sed -e "s/ Z\$/ /" >>expected <<-EOF &&
+		Fixes: $FIXED
+		Acked-by= Z
+		Reviewed-by:
+		Signed-off-by: Z
+		Signed-off-by: A U Thor <author@example.com>
+	EOF
+	git interpret-trailers --trailer "review:" --trailer "fix=HEAD" \
+		<complex_message >actual &&
+	test_cmp expected actual
+
+ok 70 - with command using $ARG
+
+expecting success: 
+	git config trailer.fix.ifExists "replace" &&
+	git config trailer.fix.command "false \$ARG" &&
+	cat complex_message_body >expected &&
+	sed -e "s/ Z\$/ /" >>expected <<-EOF &&
+		Fixes: Z
+		Acked-by= Z
+		Reviewed-by:
+		Signed-off-by: Z
+		Signed-off-by: A U Thor <author@example.com>
+	EOF
+	git interpret-trailers --trailer "review:" --trailer "fix=HEAD" \
+		<complex_message >actual &&
+	test_cmp expected actual
+
+error: running trailer command 'false ' failed
+error: running trailer command 'false HEAD' failed
+ok 71 - with failing command using $ARG
+
+expecting success: 
+	git config --unset trailer.fix.command &&
+	cat >expected <<-EOF &&
+
+		Signed-off-by: A U Thor <author@example.com>
+	EOF
+	git interpret-trailers --trailer ":" --trailer ":test" >actual <<-EOF &&
+	EOF
+	test_cmp expected actual
+
+error: empty trailer token in trailer ':'
+error: empty trailer token in trailer ':test'
+ok 72 - with empty tokens
+
+expecting success: 
+	git config --unset trailer.sign.key &&
+	cat >expected <<-EOF &&
+
+		sign: A U Thor <author@example.com>
+	EOF
+	git interpret-trailers >actual <<-EOF &&
+	EOF
+	test_cmp expected actual
+
+ok 73 - with command but no key
+
+expecting success: 
+	git config --unset trailer.review.key &&
+	cat >expected <<-EOF &&
+
+		review: Junio
+		sign: A U Thor <author@example.com>
+	EOF
+	git interpret-trailers --trailer "review:Junio" >actual <<-EOF &&
+	EOF
+	test_cmp expected actual
+
+ok 74 - with no command and no key
+
+expecting success: 
+	cat >expected <<-\EOF &&
+		my subject
+
+		review: Brian
+		sign: A U Thor <author@example.com>
+		# ------------------------ >8 ------------------------
+		ignore this
+	EOF
+	git interpret-trailers --trailer review:Brian >actual <<-\EOF &&
+		my subject
+		# ------------------------ >8 ------------------------
+		ignore this
+	EOF
+	test_cmp expected actual
+
+ok 75 - with cut line
+
+expecting success: 
+	git config trailer.sign.command "echo config-value" &&
+	cat >expected <<-\EOF &&
+		existing: existing-value
+		sign: config-value
+		added: added-value
+	EOF
+	git interpret-trailers \
+		--trailer added:added-value \
+		--only-trailers >actual <<-\EOF &&
+		my subject
+
+		my body
+
+		existing: existing-value
+	EOF
+	test_cmp expected actual
+
+ok 76 - only trailers
+
+expecting success: 
+	git config trailer.sign.command "echo config-value" &&
+	cat >expected <<-\EOF &&
+		Signed-off-by: nobody <nobody@nowhere>
+		Signed-off-by: somebody <somebody@somewhere>
+		sign: config-value
+	EOF
+	git interpret-trailers --only-trailers >actual <<-\EOF &&
+		subject
+
+		it is important that the trailers below are signed-off-by
+		so that they meet the "25% trailers Git knows about" heuristic
+
+		Signed-off-by: nobody <nobody@nowhere>
+		this is not a trailer
+		Signed-off-by: somebody <somebody@somewhere>
+	EOF
+	test_cmp expected actual
+
+ok 77 - only-trailers omits non-trailer in middle of block
+
+expecting success: 
+	git config trailer.sign.command "echo config-value" &&
+	cat >expected <<-\EOF &&
+		existing: existing-value
+	EOF
+	git interpret-trailers \
+		--only-trailers --only-input >actual <<-\EOF &&
+		my subject
+
+		my body
+
+		existing: existing-value
+	EOF
+	test_cmp expected actual
+
+ok 78 - only input
+
+expecting success: 
+	cat >expected <<-\EOF &&
+		foo: continued across several lines
+	EOF
+	# pass through tr to make leading and trailing whitespace more obvious
+	tr _ " " <<-\EOF |
+		my subject
+
+		my body
+
+		foo:_
+		__continued
+		___across
+		____several
+		_____lines
+		___
+	EOF
+	git interpret-trailers --only-trailers --only-input --unfold >actual &&
+	test_cmp expected actual
+
+ok 79 - unfold
+
+expecting success: 
+	echo "real-trailer: just right" >expected &&
+
+	git interpret-trailers --parse >actual <<-\EOF &&
+	subject
+
+	body
+
+	not-a-trailer: too soon
+	------ this is just a line in the commit message with a bunch of
+	------ dashes; it does not have any syntactic meaning.
+
+	real-trailer: just right
+	---
+	below the dashed line may be a patch, etc.
+
+	not-a-trailer: too late
+	EOF
+
+	test_cmp expected actual
+
+ok 80 - handling of --- lines in input
+
+expecting success: 
+	echo "real-trailer: just right" >expected &&
+
+	git interpret-trailers --parse --no-divider >actual <<-\EOF &&
+	subject
+
+	This commit message has a "---" in it, but because we tell
+	interpret-trailers not to respect that, it has no effect.
+
+	not-a-trailer: too soon
+	---
+
+	This is still the commit message body.
+
+	real-trailer: just right
+	EOF
+
+	test_cmp expected actual
+
+ok 81 - suppress --- handling
+
+# passed all 81 test(s)
+1..81
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t7407-submodule-foreach.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7407-submodule-foreach/.git/
+expecting success: 
+	echo file > file &&
+	git add file &&
+	test_tick &&
+	git commit -m upstream &&
+	git clone . super &&
+	git clone super submodule &&
+	(
+		cd super &&
+		git submodule add ../submodule sub1 &&
+		git submodule add ../submodule sub2 &&
+		git submodule add ../submodule sub3 &&
+		git config -f .gitmodules --rename-section \
+			submodule.sub1 submodule.foo1 &&
+		git config -f .gitmodules --rename-section \
+			submodule.sub2 submodule.foo2 &&
+		git config -f .gitmodules --rename-section \
+			submodule.sub3 submodule.foo3 &&
+		git add .gitmodules &&
+		test_tick &&
+		git commit -m "submodules" &&
+		git submodule init sub1 &&
+		git submodule init sub2 &&
+		git submodule init sub3
+	) &&
+	(
+		cd submodule &&
+		echo different > file &&
+		git add file &&
+		test_tick &&
+		git commit -m "different"
+	) &&
+	(
+		cd super &&
+		(
+			cd sub3 &&
+			git pull
+		) &&
+		git add sub3 &&
+		test_tick &&
+		git commit -m "update sub3"
+	)
+
+[master (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/git-2.20.1/t/trash directory.t7407-submodule-foreach/super/sub1'...
+done.
+Cloning into '/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/super/sub2'...
+done.
+Cloning into '/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/super/sub3'...
+done.
+[master 33b977a] submodules
+ Author: A U Thor <author@example.com>
+ 4 files changed, 12 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub1
+ create mode 160000 sub2
+ create mode 160000 sub3
+Submodule 'foo1' (/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/submodule) registered for path 'sub1'
+Submodule 'foo2' (/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/submodule) registered for path 'sub2'
+Submodule 'foo3' (/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/submodule) registered for path 'sub3'
+[master 509f622] different
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+From /build/git-2.20.1/t/trash directory.t7407-submodule-foreach/submodule
+   0c90624..509f622  master     -> origin/master
+Updating 0c90624..509f622
+Fast-forward
+ file | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[master ed2a820] update sub3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 1 - setup a submodule tree
+
+expecting success: 
+	git clone super clone &&
+	(
+		cd clone &&
+		git submodule update --init -- sub1 sub3 &&
+		git submodule foreach "echo \$toplevel-\$name-\$path-\$sha1" > ../actual &&
+		git config foo.bar zar &&
+		git submodule foreach "git config --file \"\$toplevel/.git/config\" foo.bar"
+	) &&
+	test_i18ncmp expect actual
+
+Cloning into 'clone'...
+done.
+Submodule 'foo1' (/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/submodule) registered for path 'sub1'
+Submodule 'foo3' (/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/submodule) registered for path 'sub3'
+Cloning into '/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/clone/sub1'...
+done.
+Cloning into '/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/clone/sub3'...
+done.
+Submodule path 'sub1': checked out '0c90624ab7f1aaa301d3bb79f60dcfed1ec4897f'
+Submodule path 'sub3': checked out '509f622a4f36a3e472affcf28fa959174f3dd5b5'
+Entering 'sub1'
+zar
+Entering 'sub3'
+zar
+ok 2 - test basic "submodule foreach" usage
+
+expecting success: 
+	mkdir clone/sub &&
+	(
+		cd clone/sub &&
+		git submodule foreach "echo \$toplevel-\$name-\$sm_path-\$displaypath-\$sha1" >../../actual
+	) &&
+	test_i18ncmp expect actual
+
+ok 3 - test "submodule foreach" from subdirectory
+
+expecting success: 
+	git clone submodule nested1 &&
+	git clone submodule nested2 &&
+	git clone submodule nested3 &&
+	(
+		cd nested3 &&
+		git submodule add ../submodule submodule &&
+		test_tick &&
+		git commit -m "submodule" &&
+		git submodule init submodule
+	) &&
+	(
+		cd nested2 &&
+		git submodule add ../nested3 nested3 &&
+		test_tick &&
+		git commit -m "nested3" &&
+		git submodule init nested3
+	) &&
+	(
+		cd nested1 &&
+		git submodule add ../nested2 nested2 &&
+		test_tick &&
+		git commit -m "nested2" &&
+		git submodule init nested2
+	) &&
+	(
+		cd super &&
+		git submodule add ../nested1 nested1 &&
+		test_tick &&
+		git commit -m "nested1" &&
+		git submodule init nested1
+	)
+
+Cloning into 'nested1'...
+done.
+Cloning into 'nested2'...
+done.
+Cloning into 'nested3'...
+done.
+Cloning into '/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/nested3/submodule'...
+done.
+[master 5ec8351] submodule
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 submodule
+Cloning into '/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/nested2/nested3'...
+done.
+[master 2e69c85] nested3
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 nested3
+Cloning into '/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/nested1/nested2'...
+done.
+[master b23f134] nested2
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 nested2
+Cloning into '/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/super/nested1'...
+done.
+[master 427ccd0] nested1
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 160000 nested1
+ok 4 - setup nested submodules
+
+expecting success: 
+	git clone super clone2 &&
+	(
+		cd clone2 &&
+		test_must_fail git rev-parse --resolve-git-dir sub1/.git &&
+		test_must_fail git rev-parse --resolve-git-dir sub2/.git &&
+		test_must_fail git rev-parse --resolve-git-dir sub3/.git &&
+		test_must_fail git rev-parse --resolve-git-dir nested1/.git &&
+		git submodule update --init &&
+		git rev-parse --resolve-git-dir sub1/.git &&
+		git rev-parse --resolve-git-dir sub2/.git &&
+		git rev-parse --resolve-git-dir sub3/.git &&
+		git rev-parse --resolve-git-dir nested1/.git &&
+		test_must_fail git rev-parse --resolve-git-dir nested1/nested2/.git &&
+		git submodule foreach "git submodule update --init" &&
+		git rev-parse --resolve-git-dir nested1/nested2/.git &&
+		test_must_fail git rev-parse --resolve-git-dir nested1/nested2/nested3/.git
+	)
+
+Cloning into 'clone2'...
+done.
+fatal: not a gitdir 'sub1/.git'
+fatal: not a gitdir 'sub2/.git'
+fatal: not a gitdir 'sub3/.git'
+fatal: not a gitdir 'nested1/.git'
+Submodule 'nested1' (/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/nested1) registered for path 'nested1'
+Submodule 'foo1' (/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/submodule) registered for path 'sub1'
+Submodule 'foo2' (/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/submodule) registered for path 'sub2'
+Submodule 'foo3' (/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/submodule) registered for path 'sub3'
+Cloning into '/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/clone2/nested1'...
+done.
+Cloning into '/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/clone2/sub2'...
+done.
+Cloning into '/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/clone2/sub1'...
+done.
+Cloning into '/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/clone2/sub3'...
+done.
+Submodule path 'nested1': checked out 'b23f134787d96fae589a6b76da41f4db112fc8db'
+Submodule path 'sub1': checked out '0c90624ab7f1aaa301d3bb79f60dcfed1ec4897f'
+Submodule path 'sub2': checked out '0c90624ab7f1aaa301d3bb79f60dcfed1ec4897f'
+Submodule path 'sub3': checked out '509f622a4f36a3e472affcf28fa959174f3dd5b5'
+/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/clone2/.git/modules/foo1
+/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/clone2/.git/modules/foo2
+/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/clone2/.git/modules/foo3
+/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/clone2/.git/modules/nested1
+fatal: not a gitdir 'nested1/nested2/.git'
+Entering 'nested1'
+Submodule 'nested2' (/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/nested2) registered for path 'nested2'
+Cloning into '/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/clone2/nested1/nested2'...
+done.
+Submodule path 'nested2': checked out '2e69c85de92bf5f316f3c67b5e492f287f5a6542'
+Entering 'sub1'
+Entering 'sub2'
+Entering 'sub3'
+/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/clone2/.git/modules/nested1/modules/nested2
+fatal: not a gitdir 'nested1/nested2/nested3/.git'
+ok 5 - use "submodule foreach" to checkout 2nd level submodule
+
+expecting success: 
+	(
+		cd clone2 &&
+		git submodule foreach --recursive "git submodule update --init" &&
+		git rev-parse --resolve-git-dir nested1/nested2/nested3/.git &&
+		git rev-parse --resolve-git-dir nested1/nested2/nested3/submodule/.git
+	)
+
+Entering 'nested1'
+Entering 'nested1/nested2'
+Submodule 'nested3' (/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/nested3) registered for path 'nested3'
+Cloning into '/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/clone2/nested1/nested2/nested3'...
+done.
+Submodule path 'nested3': checked out '5ec83512b76a0b8170b899f8e643913c3e9b72d9'
+Entering 'nested1/nested2/nested3'
+Submodule 'submodule' (/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/submodule) registered for path 'submodule'
+Cloning into '/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/clone2/nested1/nested2/nested3/submodule'...
+done.
+Submodule path 'submodule': checked out '509f622a4f36a3e472affcf28fa959174f3dd5b5'
+Entering 'nested1/nested2/nested3/submodule'
+Entering 'sub1'
+Entering 'sub2'
+Entering 'sub3'
+/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/clone2/.git/modules/nested1/modules/nested2/modules/nested3
+/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/clone2/.git/modules/nested1/modules/nested2/modules/nested3/modules/submodule
+ok 6 - use "foreach --recursive" to checkout all submodules
+
+expecting success: 
+	(
+		cd clone2 &&
+		git submodule foreach --recursive "true" > ../actual
+	) &&
+	test_i18ncmp expect actual
+
+ok 7 - test messages from "foreach --recursive"
+
+expecting success: 
+	(
+		cd clone2 &&
+		mkdir untracked &&
+		cd untracked &&
+		git submodule foreach --recursive >../../actual
+	) &&
+	test_i18ncmp expect actual
+
+ok 8 - test messages from "foreach --recursive" from subdirectory
+
+expecting success: 
+	(
+		cd clone2/untracked &&
+		git submodule foreach --recursive "echo toplevel: \$toplevel name: \$name path: \$sm_path displaypath: \$displaypath hash: \$sha1" >../../actual
+	) &&
+	test_i18ncmp expect actual
+
+ok 9 - test "submodule foreach --recursive" from subdirectory
+
+expecting success: 
+	(
+		cd clone2 &&
+		git submodule foreach -q --recursive "echo \$name-\$path" > ../actual
+	) &&
+	test_cmp expect actual
+
+ok 10 - test "foreach --quiet --recursive"
+
+expecting success: 
+	git clone super clone3 &&
+	(
+		cd clone3 &&
+		test_must_fail git rev-parse --resolve-git-dir sub1/.git &&
+		test_must_fail git rev-parse --resolve-git-dir sub2/.git &&
+		test_must_fail git rev-parse --resolve-git-dir sub3/.git &&
+		test_must_fail git rev-parse --resolve-git-dir nested1/.git &&
+		git submodule update --init --recursive &&
+		git rev-parse --resolve-git-dir sub1/.git &&
+		git rev-parse --resolve-git-dir sub2/.git &&
+		git rev-parse --resolve-git-dir sub3/.git &&
+		git rev-parse --resolve-git-dir nested1/.git &&
+		git rev-parse --resolve-git-dir nested1/nested2/.git &&
+		git rev-parse --resolve-git-dir nested1/nested2/nested3/.git &&
+		git rev-parse --resolve-git-dir nested1/nested2/nested3/submodule/.git
+	)
+
+Cloning into 'clone3'...
+done.
+fatal: not a gitdir 'sub1/.git'
+fatal: not a gitdir 'sub2/.git'
+fatal: not a gitdir 'sub3/.git'
+fatal: not a gitdir 'nested1/.git'
+Submodule 'nested1' (/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/nested1) registered for path 'nested1'
+Submodule 'foo1' (/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/submodule) registered for path 'sub1'
+Submodule 'foo2' (/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/submodule) registered for path 'sub2'
+Submodule 'foo3' (/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/submodule) registered for path 'sub3'
+Cloning into '/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/clone3/nested1'...
+done.
+Cloning into '/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/clone3/sub1'...
+done.
+Cloning into '/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/clone3/sub3'...
+done.
+Cloning into '/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/clone3/sub2'...
+done.
+Submodule path 'nested1': checked out 'b23f134787d96fae589a6b76da41f4db112fc8db'
+Submodule 'nested2' (/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/nested2) registered for path 'nested1/nested2'
+Cloning into '/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/clone3/nested1/nested2'...
+done.
+Submodule path 'nested1/nested2': checked out '2e69c85de92bf5f316f3c67b5e492f287f5a6542'
+Submodule 'nested3' (/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/nested3) registered for path 'nested1/nested2/nested3'
+Cloning into '/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/clone3/nested1/nested2/nested3'...
+done.
+Submodule path 'nested1/nested2/nested3': checked out '5ec83512b76a0b8170b899f8e643913c3e9b72d9'
+Submodule 'submodule' (/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/submodule) registered for path 'nested1/nested2/nested3/submodule'
+Cloning into '/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/clone3/nested1/nested2/nested3/submodule'...
+done.
+Submodule path 'nested1/nested2/nested3/submodule': checked out '509f622a4f36a3e472affcf28fa959174f3dd5b5'
+Submodule path 'sub1': checked out '0c90624ab7f1aaa301d3bb79f60dcfed1ec4897f'
+Submodule path 'sub2': checked out '0c90624ab7f1aaa301d3bb79f60dcfed1ec4897f'
+Submodule path 'sub3': checked out '509f622a4f36a3e472affcf28fa959174f3dd5b5'
+/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/clone3/.git/modules/foo1
+/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/clone3/.git/modules/foo2
+/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/clone3/.git/modules/foo3
+/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/clone3/.git/modules/nested1
+/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/clone3/.git/modules/nested1/modules/nested2
+/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/clone3/.git/modules/nested1/modules/nested2/modules/nested3
+/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/clone3/.git/modules/nested1/modules/nested2/modules/nested3/modules/submodule
+ok 11 - use "update --recursive" to checkout all submodules
+
+expecting success: 
+	(
+		cd clone3 &&
+		git submodule status --recursive > ../actual
+	) &&
+	test_cmp expect actual
+
+ok 12 - test "status --recursive"
+
+expecting success: 
+	(
+		cd clone3 &&
+		(
+			cd nested1/nested2 &&
+			test_commit file2
+		) &&
+		git submodule status --cached --recursive -- nested1 > ../actual
+	) &&
+	test_cmp expect actual
+
+[detached HEAD 25d56d1] file2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file2.t
+ok 13 - ensure "status --cached --recursive" preserves the --cached flag
+
+expecting success: 
+	(
+		cd clone3 &&
+		mkdir tmp && cd tmp &&
+		git submodule status --recursive > ../../actual
+	) &&
+	test_cmp expect actual
+
+ok 14 - test "status --recursive" from sub directory
+
+expecting success: 
+	git clone --recursive super clone4 &&
+	(
+		cd clone4 &&
+		git rev-parse --resolve-git-dir .git &&
+		git rev-parse --resolve-git-dir sub1/.git &&
+		git rev-parse --resolve-git-dir sub2/.git &&
+		git rev-parse --resolve-git-dir sub3/.git &&
+		git rev-parse --resolve-git-dir nested1/.git &&
+		git rev-parse --resolve-git-dir nested1/nested2/.git &&
+		git rev-parse --resolve-git-dir nested1/nested2/nested3/.git &&
+		git rev-parse --resolve-git-dir nested1/nested2/nested3/submodule/.git
+	)
+
+Cloning into 'clone4'...
+done.
+Submodule 'nested1' (/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/nested1) registered for path 'nested1'
+Submodule 'foo1' (/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/submodule) registered for path 'sub1'
+Submodule 'foo2' (/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/submodule) registered for path 'sub2'
+Submodule 'foo3' (/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/submodule) registered for path 'sub3'
+Cloning into '/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/clone4/nested1'...
+done.
+Cloning into '/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/clone4/sub1'...
+done.
+Cloning into '/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/clone4/sub3'...
+done.
+Cloning into '/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/clone4/sub2'...
+done.
+Submodule path 'nested1': checked out 'b23f134787d96fae589a6b76da41f4db112fc8db'
+Submodule 'nested2' (/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/nested2) registered for path 'nested1/nested2'
+Cloning into '/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/clone4/nested1/nested2'...
+done.
+Submodule path 'nested1/nested2': checked out '2e69c85de92bf5f316f3c67b5e492f287f5a6542'
+Submodule 'nested3' (/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/nested3) registered for path 'nested1/nested2/nested3'
+Cloning into '/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/clone4/nested1/nested2/nested3'...
+done.
+Submodule path 'nested1/nested2/nested3': checked out '5ec83512b76a0b8170b899f8e643913c3e9b72d9'
+Submodule 'submodule' (/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/submodule) registered for path 'nested1/nested2/nested3/submodule'
+Cloning into '/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/clone4/nested1/nested2/nested3/submodule'...
+done.
+Submodule path 'nested1/nested2/nested3/submodule': checked out '509f622a4f36a3e472affcf28fa959174f3dd5b5'
+Submodule path 'sub1': checked out '0c90624ab7f1aaa301d3bb79f60dcfed1ec4897f'
+Submodule path 'sub2': checked out '0c90624ab7f1aaa301d3bb79f60dcfed1ec4897f'
+Submodule path 'sub3': checked out '509f622a4f36a3e472affcf28fa959174f3dd5b5'
+.git
+/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/clone4/.git/modules/foo1
+/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/clone4/.git/modules/foo2
+/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/clone4/.git/modules/foo3
+/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/clone4/.git/modules/nested1
+/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/clone4/.git/modules/nested1/modules/nested2
+/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/clone4/.git/modules/nested1/modules/nested2/modules/nested3
+/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/clone4/.git/modules/nested1/modules/nested2/modules/nested3/modules/submodule
+ok 15 - use "git clone --recursive" to checkout all submodules
+
+expecting success: 
+	git clone super "common objects" &&
+	git clone super clone5 &&
+	(
+		cd clone5 &&
+		test_must_fail git rev-parse --resolve-git-dir d nested1/.git &&
+		git submodule update --init --recursive --reference="$(dirname "$PWD")/common objects" &&
+		git rev-parse --resolve-git-dir nested1/.git &&
+		git rev-parse --resolve-git-dir nested1/nested2/.git &&
+		git rev-parse --resolve-git-dir nested1/nested2/nested3/.git &&
+		test -f .git/modules/nested1/objects/info/alternates &&
+		test -f .git/modules/nested1/modules/nested2/objects/info/alternates &&
+		test -f .git/modules/nested1/modules/nested2/modules/nested3/objects/info/alternates
+	)
+
+Cloning into 'common objects'...
+done.
+Cloning into 'clone5'...
+done.
+fatal: not a gitdir 'd'
+Submodule 'nested1' (/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/nested1) registered for path 'nested1'
+Submodule 'foo1' (/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/submodule) registered for path 'sub1'
+Submodule 'foo2' (/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/submodule) registered for path 'sub2'
+Submodule 'foo3' (/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/submodule) registered for path 'sub3'
+Cloning into '/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/clone5/nested1'...
+done.
+Cloning into '/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/clone5/sub1'...
+done.
+Cloning into '/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/clone5/sub2'...
+done.
+Cloning into '/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/clone5/sub3'...
+done.
+Submodule path 'nested1': checked out 'b23f134787d96fae589a6b76da41f4db112fc8db'
+Submodule 'nested2' (/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/nested2) registered for path 'nested1/nested2'
+Cloning into '/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/clone5/nested1/nested2'...
+done.
+Submodule path 'nested1/nested2': checked out '2e69c85de92bf5f316f3c67b5e492f287f5a6542'
+Submodule 'nested3' (/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/nested3) registered for path 'nested1/nested2/nested3'
+Cloning into '/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/clone5/nested1/nested2/nested3'...
+done.
+Submodule path 'nested1/nested2/nested3': checked out '5ec83512b76a0b8170b899f8e643913c3e9b72d9'
+Submodule 'submodule' (/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/submodule) registered for path 'nested1/nested2/nested3/submodule'
+Cloning into '/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/clone5/nested1/nested2/nested3/submodule'...
+done.
+Submodule path 'nested1/nested2/nested3/submodule': checked out '509f622a4f36a3e472affcf28fa959174f3dd5b5'
+Submodule path 'sub1': checked out '0c90624ab7f1aaa301d3bb79f60dcfed1ec4897f'
+Submodule path 'sub2': checked out '0c90624ab7f1aaa301d3bb79f60dcfed1ec4897f'
+Submodule path 'sub3': checked out '509f622a4f36a3e472affcf28fa959174f3dd5b5'
+/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/clone5/.git/modules/nested1
+/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/clone5/.git/modules/nested1/modules/nested2
+/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/clone5/.git/modules/nested1/modules/nested2/modules/nested3
+ok 16 - test "update --recursive" with a flag with spaces
+
+expecting success: 
+	git clone super clone6 &&
+	(
+		cd clone6 &&
+		test_must_fail git rev-parse --resolve-git-dir sub1/.git &&
+		test_must_fail git rev-parse --resolve-git-dir sub2/.git &&
+		test_must_fail git rev-parse --resolve-git-dir sub3/.git &&
+		test_must_fail git rev-parse --resolve-git-dir nested1/.git &&
+		git submodule update --init --recursive -- nested1 &&
+		test_must_fail git rev-parse --resolve-git-dir sub1/.git &&
+		test_must_fail git rev-parse --resolve-git-dir sub2/.git &&
+		test_must_fail git rev-parse --resolve-git-dir sub3/.git &&
+		git rev-parse --resolve-git-dir nested1/.git &&
+		git rev-parse --resolve-git-dir nested1/nested2/.git &&
+		git rev-parse --resolve-git-dir nested1/nested2/nested3/.git &&
+		git rev-parse --resolve-git-dir nested1/nested2/nested3/submodule/.git
+	)
+
+Cloning into 'clone6'...
+done.
+fatal: not a gitdir 'sub1/.git'
+fatal: not a gitdir 'sub2/.git'
+fatal: not a gitdir 'sub3/.git'
+fatal: not a gitdir 'nested1/.git'
+Submodule 'nested1' (/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/nested1) registered for path 'nested1'
+Cloning into '/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/clone6/nested1'...
+done.
+Submodule path 'nested1': checked out 'b23f134787d96fae589a6b76da41f4db112fc8db'
+Submodule 'nested2' (/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/nested2) registered for path 'nested1/nested2'
+Cloning into '/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/clone6/nested1/nested2'...
+done.
+Submodule path 'nested1/nested2': checked out '2e69c85de92bf5f316f3c67b5e492f287f5a6542'
+Submodule 'nested3' (/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/nested3) registered for path 'nested1/nested2/nested3'
+Cloning into '/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/clone6/nested1/nested2/nested3'...
+done.
+Submodule path 'nested1/nested2/nested3': checked out '5ec83512b76a0b8170b899f8e643913c3e9b72d9'
+Submodule 'submodule' (/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/submodule) registered for path 'nested1/nested2/nested3/submodule'
+Cloning into '/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/clone6/nested1/nested2/nested3/submodule'...
+done.
+Submodule path 'nested1/nested2/nested3/submodule': checked out '509f622a4f36a3e472affcf28fa959174f3dd5b5'
+fatal: not a gitdir 'sub1/.git'
+fatal: not a gitdir 'sub2/.git'
+fatal: not a gitdir 'sub3/.git'
+/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/clone6/.git/modules/nested1
+/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/clone6/.git/modules/nested1/modules/nested2
+/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/clone6/.git/modules/nested1/modules/nested2/modules/nested3
+/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/clone6/.git/modules/nested1/modules/nested2/modules/nested3/modules/submodule
+ok 17 - use "update --recursive nested1" to checkout all submodules rooted in nested1
+
+expecting success: 
+	(
+		cd super &&
+		git submodule foreach echo success >../expected &&
+		yes | git submodule foreach "read y && test \"x\$y\" = xy && echo success" >../actual
+	) &&
+	test_cmp expected actual
+
+ok 18 - command passed to foreach retains notion of stdin
+
+expecting success: 
+	(
+		cd clone2 &&
+		git submodule foreach --recursive echo success >../expected &&
+		yes | git submodule foreach --recursive "read y && test \"x\$y\" = xy && echo success" >../actual
+	) &&
+	test_cmp expected actual
+
+ok 19 - command passed to foreach --recursive retains notion of stdin
+
+expecting success: 
+	(
+		cd super &&
+		git submodule foreach "echo \\\"quoted\\\"" > ../expected &&
+		git submodule foreach echo \"quoted\" > ../actual
+	) &&
+	test_cmp expected actual
+
+ok 20 - multi-argument command passed to foreach is not shell-evaluated twice
+
+# passed all 20 test(s)
+1..20
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t7601-merge-pull-config.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7601-merge-pull-config/.git/
+expecting success: 
+	echo c0 >c0.c &&
+	git add c0.c &&
+	git commit -m c0 &&
+	git tag c0 &&
+	echo c1 >c1.c &&
+	git add c1.c &&
+	git commit -m c1 &&
+	git tag c1 &&
+	git reset --hard c0 &&
+	echo c2 >c2.c &&
+	git add c2.c &&
+	git commit -m c2 &&
+	git tag c2 &&
+	git reset --hard c0 &&
+	echo c3 >c3.c &&
+	git add c3.c &&
+	git commit -m c3 &&
+	git tag c3
+
+[master (root-commit) 345f19e] c0
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c0.c
+[master 1c5ba15] c1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c1.c
+HEAD is now at 345f19e c0
+[master 988cb9b] c2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c2.c
+HEAD is now at 345f19e c0
+[master 6da8248] c3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c3.c
+ok 1 - setup
+
+expecting success: 
+	git reset --hard c1 &&
+	test -f c0.c &&
+	test -f c1.c &&
+	test ! -f c2.c &&
+	test ! -f c3.c &&
+	git merge c2 &&
+	test -f c1.c &&
+	test -f c2.c
+
+HEAD is now at 1c5ba15 c1
+Merging:
+1c5ba15 c1
+virtual c2
+found 1 common ancestor:
+345f19e c0
+Merge made by the 'recursive' strategy.
+ c2.c | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c2.c
+ok 2 - merge c1 with c2
+
+expecting success: 
+	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 345f19e c0
+From .
+ * tag               c1         -> FETCH_HEAD
+Updating 345f19e..1c5ba15
+Fast-forward
+ c1.c | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c1.c
+ok 3 - fast-forward pull succeeds with "true" in pull.ff
+
+expecting success: 
+	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 345f19e c0
+From .
+ * tag               c1         -> FETCH_HEAD
+Updating 345f19e..1c5ba15
+Fast-forward
+ c1.c | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c1.c
+ok 4 - pull.ff=true overrides merge.ff=false
+
+expecting success: 
+	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 345f19e c0
+From .
+ * tag               c1         -> FETCH_HEAD
+Merging:
+345f19e c0
+virtual 1c5ba15c8bbf6ee04636f9034f7e9fd208609eeb
+found 1 common ancestor:
+345f19e c0
+Merge made by the 'recursive' strategy.
+ c1.c | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c1.c
+ok 5 - fast-forward pull creates merge with "false" in pull.ff
+
+expecting success: 
+	git reset --hard c1 &&
+	test_config pull.ff only &&
+	test_must_fail git pull . c3
+
+HEAD is now at 1c5ba15 c1
+From .
+ * tag               c3         -> FETCH_HEAD
+fatal: Not possible to fast-forward, aborting.
+ok 6 - pull prevents non-fast-forward with "only" in pull.ff
+
+expecting success: 
+	git reset --hard c1 &&
+	git config pull.twohead ours &&
+	git merge c2 &&
+	test -f c1.c &&
+	! test -f c2.c
+
+HEAD is now at 1c5ba15 c1
+Merge made by the 'ours' strategy.
+ok 7 - merge c1 with c2 (ours in pull.twohead)
+
+expecting success: 
+	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 1c5ba15 c1
+error: Not handling anything other than two heads merge.
+Merge with strategy recursive failed.
+ok 8 - merge c1 with c2 and c3 (recursive in pull.octopus)
+
+expecting success: 
+	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 -f c0.c &&
+	test -f c1.c &&
+	test -f c2.c &&
+	test -f c3.c
+
+HEAD is now at 1c5ba15 c1
+error: Not handling anything other than two heads merge.
+Trying merge strategy recursive...
+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 9 - merge c1 with c2 and c3 (recursive and octopus in pull.octopus)
+
+expecting success: 
+	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 345f19e c0
+[master 3ae29da] c4
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 conflict.c
+ create mode 100644 foo.c
+[master eb0739d] 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 3ae29da c4
+[master a31dbab] c6
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+ok 10 - setup conflicted merge
+
+expecting success: 
+	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 eb0739d 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 eb0739d c5
+Merging:
+eb0739d c5
+virtual c6
+found 1 common ancestor:
+3ae29da c4
+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 eb0739d c5
+Trying merge strategy recursive...
+Merging:
+eb0739d c5
+virtual c6
+found 1 common ancestor:
+3ae29da c4
+Auto-merging conflict.c
+CONFLICT (content): Merge conflict in conflict.c
+Rewinding the tree to pristine...
+Trying merge strategy resolve...
+conflict.c: needs merge
+conflict.c: needs merge
+fatal: You need to resolve your current index first
+error: Your local changes to the following files would be overwritten by merge:
+  bar.c conflict.c
+Rewinding the tree to pristine...
+Using the recursive to prepare resolving by hand.
+conflict.c: needs merge
+Merging:
+eb0739d c5
+virtual c6
+found 1 common ancestor:
+3ae29da c4
+ok 11 - merge picks up the best result
+
+expecting success: 
+	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 eb0739d 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 eb0739d c5
+Merging:
+eb0739d c5
+virtual c6
+found 1 common ancestor:
+3ae29da c4
+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 eb0739d c5
+Trying merge strategy recursive...
+Merging:
+eb0739d c5
+virtual c6
+found 1 common ancestor:
+3ae29da c4
+Auto-merging conflict.c
+CONFLICT (content): Merge conflict in conflict.c
+Rewinding the tree to pristine...
+Trying merge strategy resolve...
+conflict.c: needs merge
+conflict.c: needs merge
+fatal: You need to resolve your current index first
+error: Your local changes to the following files would be overwritten by merge:
+  bar.c conflict.c
+Rewinding the tree to pristine...
+Using the recursive to prepare resolving by hand.
+conflict.c: needs merge
+Merging:
+eb0739d c5
+virtual c6
+found 1 common ancestor:
+3ae29da c4
+ok 12 - merge picks up the best result (from config)
+
+expecting success: 
+	git config pull.twohead "foobar" &&
+	git reset --hard c5 &&
+	test_must_fail git merge c6
+
+HEAD is now at eb0739d c5
+Could not find merge strategy 'foobar'.
+Available strategies are: octopus ours recursive resolve subtree.
+ok 13 - merge errors out on invalid strategy
+
+expecting success: 
+	git config --unset-all pull.twohead &&
+	git reset --hard c5 &&
+	test_must_fail git merge -s "resolve recursive" c6
+
+HEAD is now at eb0739d c5
+Could not find merge strategy 'resolve recursive'.
+Available strategies are: octopus ours recursive resolve subtree.
+ok 14 - merge errors out on invalid strategy
+
+# passed all 14 test(s)
+1..14
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t7604-merge-custom-message.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7604-merge-custom-message/.git/
+expecting success: 
+	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) f7d9335] c0
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c0.c
+[master ec69644] c1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c1.c
+HEAD is now at f7d9335 c0
+[master 314149b] c2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c2.c
+ok 1 - setup
+
+expecting success: 
+	git reset --hard c1 &&
+	git merge -m "$(cat exp.subject)" c2 &&
+	git cat-file commit HEAD | sed -e "1,/^$/d" >actual &&
+	test_cmp exp.subject actual
+
+HEAD is now at ec69644 c1
+Merging:
+ec69644 c1
+virtual c2
+found 1 common ancestor:
+f7d9335 c0
+Merge made by the 'recursive' strategy.
+ c2.c | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c2.c
+ok 2 - merge c2 with a custom message
+
+expecting success: 
+	git reset --hard c1 &&
+	git merge --log -m "$(cat exp.subject)" c2 &&
+	git cat-file commit HEAD | sed -e "1,/^$/d" >actual &&
+	test_cmp exp.log actual
+
+HEAD is now at ec69644 c1
+Merging:
+ec69644 c1
+virtual c2
+found 1 common ancestor:
+f7d9335 c0
+Merge made by the 'recursive' strategy.
+ c2.c | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c2.c
+ok 3 - merge --log appends to custom message
+
+# passed all 3 test(s)
+1..3
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
 *** t5572-pull-submodule.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5572-pull-submodule/.git/
 expecting success: 
@@ -284025,21 +287241,21 @@
 		)
 	
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5572-pull-submodule/submodule_update_sub1/.git/
-[master (root-commit) fd076b7] Base inside first submodule
+[master (root-commit) cb30fdc] 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/git-2.20.1/t/trash directory.t5572-pull-submodule/submodule_update_sub2/.git/
-[master (root-commit) ef25bb4] nested submodule base
+[master (root-commit) 4538386] 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/git-2.20.1/t/trash directory.t5572-pull-submodule/submodule_update_repo/.git/
-[master (root-commit) 4076c68] Base
+[master (root-commit) f1949d8] Base
  Author: A U Thor <author@example.com>
  3 files changed, 4 insertions(+)
  create mode 100644 .gitignore
@@ -284050,7 +287266,7 @@
 done.
 Cloning into '/build/git-2.20.1/t/trash directory.t5572-pull-submodule/submodule_update_repo/uninitialized_sub'...
 done.
-[add_sub1 989eaad] Add sub1
+[add_sub1 c13dab3] Add sub1
  Author: A U Thor <author@example.com>
  2 files changed, 8 insertions(+)
  create mode 100644 .gitmodules
@@ -284059,45 +287275,45 @@
 Removing uninitialized_sub
 Removing sub1
 Removing .gitmodules
-[remove_sub1 ec24b37] Revert "Add sub1"
+[remove_sub1 3cfd7a1] Revert "Add sub1"
  Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:08:46 2021 +0000
+ Date: Thu Jan 5 11:49:19 2023 +0000
  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 7fb11c0] modified file2 and added file3
+[modifications 785f00d] 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/git-2.20.1/t/trash directory.t5572-pull-submodule/submodule_update_sub1
  * [new branch]      modifications -> modifications
-[modify_sub1 19a8b3e] Modify sub1
+[modify_sub1 228a228] 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/git-2.20.1/t/trash directory.t5572-pull-submodule/submodule_update_repo/sub1/sub2'...
 done.
-[add_nested_sub 4c629ff] add a nested submodule
+[add_nested_sub 5f4c156] 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 b2a271c] update submodule, that updates a nested submodule
+[add_nested_sub 03a3e5b] 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 d0100a9] make a change in nested sub
+[modify_sub1_recursively ae200cb] 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 60f3114] update nested sub
+[modify_sub1_recursively 0b3fc38] update nested sub
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-[modify_sub1_recursively 2c27d93] update sub1, that updates nested sub
+[modify_sub1_recursively 113820f] update sub1, that updates nested sub
  Author: A U Thor <author@example.com>
 To /build/git-2.20.1/t/trash directory.t5572-pull-submodule/submodule_update_sub1
  * [new branch]      modify_sub1_recursively -> modify_sub1_recursively
@@ -284106,11 +287322,11 @@
 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 'fd076b76b46dba12cf19855e34202bc7e06b44e7'
-Previous HEAD position was fd076b7 Base inside first submodule
+Submodule path 'sub1': checked out 'cb30fdc4a6780f38db4c4c20499845f40a5892e6'
+Previous HEAD position was cb30fdc Base inside first submodule
 Switched to branch 'modifications'
 rm 'sub1'
-[replace_sub1_with_directory 1281a37] Replace sub1 with directory
+[replace_sub1_with_directory f031e8e] Replace sub1 with directory
  Author: A U Thor <author@example.com>
  5 files changed, 3 insertions(+), 5 deletions(-)
  delete mode 160000 sub1
@@ -284122,32 +287338,32 @@
 Removing sub1/file2
 Removing sub1/file1
 Adding sub1
-[replace_directory_with_sub1 edb9f87] Revert "Replace sub1 with directory"
+[replace_directory_with_sub1 55a8ec3] Revert "Replace sub1 with directory"
  Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:08:47 2021 +0000
+ Date: Thu Jan 5 11:49:20 2023 +0000
  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 027275b] Replace sub1 with file
+[replace_sub1_with_file 39dde8f] 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 90abad6] Revert "Replace sub1 with file"
+[replace_file_with_sub1 98424de] Revert "Replace sub1 with file"
  Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:08:47 2021 +0000
+ Date: Thu Jan 5 11:49:21 2023 +0000
  2 files changed, 5 insertions(+), 1 deletion(-)
  mode change 100644 => 160000 sub1
 Switched to a new branch 'invalid_sub1'
-[invalid_sub1 b9c9a4b] Invalid sub1 commit
+[invalid_sub1 58ef31f] Invalid sub1 commit
  Author: A U Thor <author@example.com>
 Switched to a new branch 'valid_sub1'
-[valid_sub1 b23c919] Revert "Invalid sub1 commit"
+[valid_sub1 71076b1] Revert "Invalid sub1 commit"
  Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:08:47 2021 +0000
+ Date: Thu Jan 5 11:49:21 2023 +0000
 warning: unable to rmdir 'uninitialized_sub': Directory not empty
 Switched to branch 'master'
 Cloning into 'submodule_update'...
@@ -284155,10 +287371,10 @@
 Switched to a new branch 'no_submodule'
 Branch 'no_submodule' set up to track remote branch 'no_submodule' from 'origin'.
 Branch 'add_sub1' set up to track remote branch 'add_sub1' from 'origin'.
-Deleted branch add_sub1 (was 989eaad).
+Deleted branch add_sub1 (was c13dab3).
 Switched to a new branch 'add_sub1'
 Branch 'add_sub1' set up to track remote branch 'add_sub1' from 'origin'.
-Updating 4076c68..989eaad
+Updating f1949d8..c13dab3
 Fast-forward
  .gitmodules | 7 +++++++
  1 file changed, 7 insertions(+)
@@ -284169,8 +287385,8 @@
 done.
 Cloning into '/build/git-2.20.1/t/trash directory.t5572-pull-submodule/submodule_update/uninitialized_sub'...
 done.
-Submodule path 'sub1': checked out 'fd076b76b46dba12cf19855e34202bc7e06b44e7'
-Submodule path 'uninitialized_sub': checked out 'fd076b76b46dba12cf19855e34202bc7e06b44e7'
+Submodule path 'sub1': checked out 'cb30fdc4a6780f38db4c4c20499845f40a5892e6'
+Submodule path 'uninitialized_sub': checked out 'cb30fdc4a6780f38db4c4c20499845f40a5892e6'
 ok 1 - git_pull: added submodule creates empty directory
 
 expecting success: 
@@ -284192,10 +287408,10 @@
 Switched to a new branch 'no_submodule'
 Branch 'no_submodule' set up to track remote branch 'no_submodule' from 'origin'.
 Branch 'add_sub1' set up to track remote branch 'add_sub1' from 'origin'.
-Deleted branch add_sub1 (was 989eaad).
+Deleted branch add_sub1 (was c13dab3).
 Switched to a new branch 'add_sub1'
 Branch 'add_sub1' set up to track remote branch 'add_sub1' from 'origin'.
-Updating 4076c68..989eaad
+Updating f1949d8..c13dab3
 Fast-forward
  .gitmodules | 7 +++++++
  1 file changed, 7 insertions(+)
@@ -284206,8 +287422,8 @@
 done.
 Cloning into '/build/git-2.20.1/t/trash directory.t5572-pull-submodule/submodule_update/uninitialized_sub'...
 done.
-Submodule path 'sub1': checked out 'fd076b76b46dba12cf19855e34202bc7e06b44e7'
-Submodule path 'uninitialized_sub': checked out 'fd076b76b46dba12cf19855e34202bc7e06b44e7'
+Submodule path 'sub1': checked out 'cb30fdc4a6780f38db4c4c20499845f40a5892e6'
+Submodule path 'uninitialized_sub': checked out 'cb30fdc4a6780f38db4c4c20499845f40a5892e6'
 ok 2 - git_pull: added submodule leaves existing empty directory alone
 
 expecting success: 
@@ -284229,10 +287445,10 @@
 Branch 'replace_sub1_with_file' set up to track remote branch 'replace_sub1_with_file' from 'origin'.
 fatal: Needed a single revision
 Branch 'replace_file_with_sub1' set up to track remote branch 'replace_file_with_sub1' from 'origin'.
-Deleted branch replace_file_with_sub1 (was 90abad6).
+Deleted branch replace_file_with_sub1 (was 98424de).
 Switched to a new branch 'replace_file_with_sub1'
 Branch 'replace_file_with_sub1' set up to track remote branch 'replace_file_with_sub1' from 'origin'.
-Updating 027275b..90abad6
+Updating 39dde8f..98424de
 Fast-forward
  .gitmodules | 4 ++++
  sub1        | 2 +-
@@ -284244,8 +287460,8 @@
 done.
 Cloning into '/build/git-2.20.1/t/trash directory.t5572-pull-submodule/submodule_update/uninitialized_sub'...
 done.
-Submodule path 'sub1': checked out 'fd076b76b46dba12cf19855e34202bc7e06b44e7'
-Submodule path 'uninitialized_sub': checked out 'fd076b76b46dba12cf19855e34202bc7e06b44e7'
+Submodule path 'sub1': checked out 'cb30fdc4a6780f38db4c4c20499845f40a5892e6'
+Submodule path 'uninitialized_sub': checked out 'cb30fdc4a6780f38db4c4c20499845f40a5892e6'
 ok 3 - git_pull: replace tracked file with submodule creates empty directory
 
 expecting success: 
@@ -284267,10 +287483,10 @@
 Branch 'replace_sub1_with_directory' set up to track remote branch 'replace_sub1_with_directory' from 'origin'.
 fatal: Needed a single revision
 Branch 'replace_directory_with_sub1' set up to track remote branch 'replace_directory_with_sub1' from 'origin'.
-Deleted branch replace_directory_with_sub1 (was edb9f87).
+Deleted branch replace_directory_with_sub1 (was 55a8ec3).
 Switched to a new branch 'replace_directory_with_sub1'
 Branch 'replace_directory_with_sub1' set up to track remote branch 'replace_directory_with_sub1' from 'origin'.
-Updating 1281a37..edb9f87
+Updating f031e8e..55a8ec3
 Fast-forward
  .gitmodules | 4 ++++
  sub1/file1  | 1 -
@@ -284286,8 +287502,8 @@
 done.
 Cloning into '/build/git-2.20.1/t/trash directory.t5572-pull-submodule/submodule_update/uninitialized_sub'...
 done.
-Submodule path 'sub1': checked out 'fd076b76b46dba12cf19855e34202bc7e06b44e7'
-Submodule path 'uninitialized_sub': checked out 'fd076b76b46dba12cf19855e34202bc7e06b44e7'
+Submodule path 'sub1': checked out 'cb30fdc4a6780f38db4c4c20499845f40a5892e6'
+Submodule path 'uninitialized_sub': checked out 'cb30fdc4a6780f38db4c4c20499845f40a5892e6'
 ok 4 - git_pull: replace directory with submodule
 
 expecting success: 
@@ -284308,13 +287524,13 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t5572-pull-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out 'fd076b76b46dba12cf19855e34202bc7e06b44e7'
+Submodule path 'sub1': checked out 'cb30fdc4a6780f38db4c4c20499845f40a5892e6'
 Branch 'remove_sub1' set up to track remote branch 'remove_sub1' from 'origin'.
-Deleted branch remove_sub1 (was ec24b37).
+Deleted branch remove_sub1 (was 3cfd7a1).
 Switched to a new branch 'remove_sub1'
 Branch 'remove_sub1' set up to track remote branch 'remove_sub1' from 'origin'.
 warning: unable to rmdir 'sub1': Directory not empty
-Updating 989eaad..ec24b37
+Updating c13dab3..3cfd7a1
 Fast-forward
  .gitmodules | 7 -------
  1 file changed, 7 deletions(-)
@@ -284341,13 +287557,13 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t5572-pull-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out 'fd076b76b46dba12cf19855e34202bc7e06b44e7'
+Submodule path 'sub1': checked out 'cb30fdc4a6780f38db4c4c20499845f40a5892e6'
 Branch 'remove_sub1' set up to track remote branch 'remove_sub1' from 'origin'.
-Deleted branch remove_sub1 (was ec24b37).
+Deleted branch remove_sub1 (was 3cfd7a1).
 Switched to a new branch 'remove_sub1'
 Branch 'remove_sub1' set up to track remote branch 'remove_sub1' from 'origin'.
 warning: unable to rmdir 'sub1': Directory not empty
-Updating 989eaad..ec24b37
+Updating c13dab3..3cfd7a1
 Fast-forward
  .gitmodules | 7 -------
  1 file changed, 7 deletions(-)
@@ -284372,9 +287588,9 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t5572-pull-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out 'fd076b76b46dba12cf19855e34202bc7e06b44e7'
+Submodule path 'sub1': checked out 'cb30fdc4a6780f38db4c4c20499845f40a5892e6'
 Branch 'replace_sub1_with_directory' set up to track remote branch 'replace_sub1_with_directory' from 'origin'.
-Deleted branch replace_sub1_with_directory (was 1281a37).
+Deleted branch replace_sub1_with_directory (was f031e8e).
 Switched to a new branch 'replace_sub1_with_directory'
 Branch 'replace_sub1_with_directory' set up to track remote branch 'replace_sub1_with_directory' from 'origin'.
 error: The following untracked working tree files would be overwritten by merge:
@@ -284382,7 +287598,7 @@
 	sub1/file2
 Please move or remove them before you merge.
 Aborting
-Updating 989eaad..1281a37
+Updating c13dab3..f031e8e
 ok 7 - git_pull: replace submodule with a directory must fail
 
 expecting success: 
@@ -284405,9 +287621,9 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t5572-pull-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out 'fd076b76b46dba12cf19855e34202bc7e06b44e7'
+Submodule path 'sub1': checked out 'cb30fdc4a6780f38db4c4c20499845f40a5892e6'
 Branch 'replace_sub1_with_directory' set up to track remote branch 'replace_sub1_with_directory' from 'origin'.
-Deleted branch replace_sub1_with_directory (was 1281a37).
+Deleted branch replace_sub1_with_directory (was f031e8e).
 Switched to a new branch 'replace_sub1_with_directory'
 Branch 'replace_sub1_with_directory' set up to track remote branch 'replace_sub1_with_directory' from 'origin'.
 error: The following untracked working tree files would be overwritten by merge:
@@ -284415,7 +287631,7 @@
 	sub1/file2
 Please move or remove them before you merge.
 Aborting
-Updating 989eaad..1281a37
+Updating c13dab3..f031e8e
 ok 8 - git_pull: replace submodule containing a .git directory with a directory must fail
 
 checking known breakage: 
@@ -284436,12 +287652,12 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t5572-pull-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out 'fd076b76b46dba12cf19855e34202bc7e06b44e7'
+Submodule path 'sub1': checked out 'cb30fdc4a6780f38db4c4c20499845f40a5892e6'
 Branch 'replace_sub1_with_file' set up to track remote branch 'replace_sub1_with_file' from 'origin'.
-Deleted branch replace_sub1_with_file (was 027275b).
+Deleted branch replace_sub1_with_file (was 39dde8f).
 Switched to a new branch 'replace_sub1_with_file'
 Branch 'replace_sub1_with_file' set up to track remote branch 'replace_sub1_with_file' from 'origin'.
-Updating 989eaad..027275b
+Updating c13dab3..39dde8f
 Fast-forward
  .gitmodules | 4 ----
  sub1        | 2 +-
@@ -284470,12 +287686,12 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t5572-pull-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out 'fd076b76b46dba12cf19855e34202bc7e06b44e7'
+Submodule path 'sub1': checked out 'cb30fdc4a6780f38db4c4c20499845f40a5892e6'
 Branch 'replace_sub1_with_file' set up to track remote branch 'replace_sub1_with_file' from 'origin'.
-Deleted branch replace_sub1_with_file (was 027275b).
+Deleted branch replace_sub1_with_file (was 39dde8f).
 Switched to a new branch 'replace_sub1_with_file'
 Branch 'replace_sub1_with_file' set up to track remote branch 'replace_sub1_with_file' from 'origin'.
-Updating 989eaad..027275b
+Updating c13dab3..39dde8f
 Fast-forward
  .gitmodules | 4 ----
  sub1        | 2 +-
@@ -284504,14 +287720,14 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t5572-pull-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out 'fd076b76b46dba12cf19855e34202bc7e06b44e7'
+Submodule path 'sub1': checked out 'cb30fdc4a6780f38db4c4c20499845f40a5892e6'
 Branch 'modify_sub1' set up to track remote branch 'modify_sub1' from 'origin'.
-Deleted branch modify_sub1 (was 19a8b3e).
+Deleted branch modify_sub1 (was 228a228).
 Switched to a new branch 'modify_sub1'
 Branch 'modify_sub1' set up to track remote branch 'modify_sub1' from 'origin'.
-Updating 989eaad..19a8b3e
+Updating c13dab3..228a228
 Fast-forward
-Submodule path 'sub1': checked out '7fb11c0eb916249cb4150c4a42917a0a7646bd73'
+Submodule path 'sub1': checked out '785f00dfc52b5c853796036a5e05c7f78624ae8a'
 ok 11 - git_pull: modified submodule does not update submodule work tree
 
 expecting success: 
@@ -284534,12 +287750,12 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t5572-pull-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out 'fd076b76b46dba12cf19855e34202bc7e06b44e7'
+Submodule path 'sub1': checked out 'cb30fdc4a6780f38db4c4c20499845f40a5892e6'
 Branch 'invalid_sub1' set up to track remote branch 'invalid_sub1' from 'origin'.
-Deleted branch invalid_sub1 (was b9c9a4b).
+Deleted branch invalid_sub1 (was 58ef31f).
 Switched to a new branch 'invalid_sub1'
 Branch 'invalid_sub1' set up to track remote branch 'invalid_sub1' from 'origin'.
-Updating 989eaad..b9c9a4b
+Updating c13dab3..58ef31f
 Fast-forward
 error: Server does not allow request for unadvertised object 0123456789012345678901234567890123456789
 Fetched in submodule path 'sub1', but it did not contain 0123456789012345678901234567890123456789. Direct fetching of that commit failed.
@@ -284564,10 +287780,10 @@
 Branch 'invalid_sub1' set up to track remote branch 'invalid_sub1' from 'origin'.
 fatal: Needed a single revision
 Branch 'valid_sub1' set up to track remote branch 'valid_sub1' from 'origin'.
-Deleted branch valid_sub1 (was b23c919).
+Deleted branch valid_sub1 (was 71076b1).
 Switched to a new branch 'valid_sub1'
 Branch 'valid_sub1' set up to track remote branch 'valid_sub1' from 'origin'.
-Updating b9c9a4b..b23c919
+Updating 58ef31f..71076b1
 Fast-forward
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
 Submodule 'uninitialized_sub' (/build/git-2.20.1/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
@@ -284575,8 +287791,8 @@
 done.
 Cloning into '/build/git-2.20.1/t/trash directory.t5572-pull-submodule/submodule_update/uninitialized_sub'...
 done.
-Submodule path 'sub1': checked out 'fd076b76b46dba12cf19855e34202bc7e06b44e7'
-Submodule path 'uninitialized_sub': checked out 'fd076b76b46dba12cf19855e34202bc7e06b44e7'
+Submodule path 'sub1': checked out 'cb30fdc4a6780f38db4c4c20499845f40a5892e6'
+Submodule path 'uninitialized_sub': checked out 'cb30fdc4a6780f38db4c4c20499845f40a5892e6'
 ok 13 - git_pull: modified submodule does not update submodule work tree from invalid commit
 
 expecting success: 
@@ -284596,14 +287812,14 @@
 Switched to a new branch 'no_submodule'
 Branch 'no_submodule' set up to track remote branch 'no_submodule' from 'origin'.
 Branch 'add_sub1' set up to track remote branch 'add_sub1' from 'origin'.
-Deleted branch add_sub1 (was 989eaad).
+Deleted branch add_sub1 (was c13dab3).
 Switched to a new branch 'add_sub1'
 Branch 'add_sub1' set up to track remote branch 'add_sub1' from 'origin'.
 error: The following untracked working tree files would be overwritten by merge:
 	sub1
 Please move or remove them before you merge.
 Aborting
-Updating 4076c68..989eaad
+Updating f1949d8..c13dab3
 ok 14 - git_pull: added submodule doesn't remove untracked unignored file with same name
 
 expecting success: 
@@ -284624,10 +287840,10 @@
 Switched to a new branch 'no_submodule'
 Branch 'no_submodule' set up to track remote branch 'no_submodule' from 'origin'.
 Branch 'add_sub1' set up to track remote branch 'add_sub1' from 'origin'.
-Deleted branch add_sub1 (was 989eaad).
+Deleted branch add_sub1 (was c13dab3).
 Switched to a new branch 'add_sub1'
 Branch 'add_sub1' set up to track remote branch 'add_sub1' from 'origin'.
-Updating 4076c68..989eaad
+Updating f1949d8..c13dab3
 Fast-forward
  .gitmodules | 7 +++++++
  1 file changed, 7 insertions(+)
@@ -284638,8 +287854,8 @@
 done.
 Cloning into '/build/git-2.20.1/t/trash directory.t5572-pull-submodule/submodule_update/uninitialized_sub'...
 done.
-Submodule path 'sub1': checked out 'fd076b76b46dba12cf19855e34202bc7e06b44e7'
-Submodule path 'uninitialized_sub': checked out 'fd076b76b46dba12cf19855e34202bc7e06b44e7'
+Submodule path 'sub1': checked out 'cb30fdc4a6780f38db4c4c20499845f40a5892e6'
+Submodule path 'uninitialized_sub': checked out 'cb30fdc4a6780f38db4c4c20499845f40a5892e6'
 ok 15 - git_pull_ff: added submodule creates empty directory
 
 expecting success: 
@@ -284661,10 +287877,10 @@
 Switched to a new branch 'no_submodule'
 Branch 'no_submodule' set up to track remote branch 'no_submodule' from 'origin'.
 Branch 'add_sub1' set up to track remote branch 'add_sub1' from 'origin'.
-Deleted branch add_sub1 (was 989eaad).
+Deleted branch add_sub1 (was c13dab3).
 Switched to a new branch 'add_sub1'
 Branch 'add_sub1' set up to track remote branch 'add_sub1' from 'origin'.
-Updating 4076c68..989eaad
+Updating f1949d8..c13dab3
 Fast-forward
  .gitmodules | 7 +++++++
  1 file changed, 7 insertions(+)
@@ -284675,8 +287891,8 @@
 done.
 Cloning into '/build/git-2.20.1/t/trash directory.t5572-pull-submodule/submodule_update/uninitialized_sub'...
 done.
-Submodule path 'sub1': checked out 'fd076b76b46dba12cf19855e34202bc7e06b44e7'
-Submodule path 'uninitialized_sub': checked out 'fd076b76b46dba12cf19855e34202bc7e06b44e7'
+Submodule path 'sub1': checked out 'cb30fdc4a6780f38db4c4c20499845f40a5892e6'
+Submodule path 'uninitialized_sub': checked out 'cb30fdc4a6780f38db4c4c20499845f40a5892e6'
 ok 16 - git_pull_ff: added submodule leaves existing empty directory alone
 
 expecting success: 
@@ -284698,10 +287914,10 @@
 Branch 'replace_sub1_with_file' set up to track remote branch 'replace_sub1_with_file' from 'origin'.
 fatal: Needed a single revision
 Branch 'replace_file_with_sub1' set up to track remote branch 'replace_file_with_sub1' from 'origin'.
-Deleted branch replace_file_with_sub1 (was 90abad6).
+Deleted branch replace_file_with_sub1 (was 98424de).
 Switched to a new branch 'replace_file_with_sub1'
 Branch 'replace_file_with_sub1' set up to track remote branch 'replace_file_with_sub1' from 'origin'.
-Updating 027275b..90abad6
+Updating 39dde8f..98424de
 Fast-forward
  .gitmodules | 4 ++++
  sub1        | 2 +-
@@ -284713,8 +287929,8 @@
 done.
 Cloning into '/build/git-2.20.1/t/trash directory.t5572-pull-submodule/submodule_update/uninitialized_sub'...
 done.
-Submodule path 'sub1': checked out 'fd076b76b46dba12cf19855e34202bc7e06b44e7'
-Submodule path 'uninitialized_sub': checked out 'fd076b76b46dba12cf19855e34202bc7e06b44e7'
+Submodule path 'sub1': checked out 'cb30fdc4a6780f38db4c4c20499845f40a5892e6'
+Submodule path 'uninitialized_sub': checked out 'cb30fdc4a6780f38db4c4c20499845f40a5892e6'
 ok 17 - git_pull_ff: replace tracked file with submodule creates empty directory
 
 expecting success: 
@@ -284736,10 +287952,10 @@
 Branch 'replace_sub1_with_directory' set up to track remote branch 'replace_sub1_with_directory' from 'origin'.
 fatal: Needed a single revision
 Branch 'replace_directory_with_sub1' set up to track remote branch 'replace_directory_with_sub1' from 'origin'.
-Deleted branch replace_directory_with_sub1 (was edb9f87).
+Deleted branch replace_directory_with_sub1 (was 55a8ec3).
 Switched to a new branch 'replace_directory_with_sub1'
 Branch 'replace_directory_with_sub1' set up to track remote branch 'replace_directory_with_sub1' from 'origin'.
-Updating 1281a37..edb9f87
+Updating f031e8e..55a8ec3
 Fast-forward
  .gitmodules | 4 ++++
  sub1/file1  | 1 -
@@ -284755,8 +287971,8 @@
 done.
 Cloning into '/build/git-2.20.1/t/trash directory.t5572-pull-submodule/submodule_update/uninitialized_sub'...
 done.
-Submodule path 'sub1': checked out 'fd076b76b46dba12cf19855e34202bc7e06b44e7'
-Submodule path 'uninitialized_sub': checked out 'fd076b76b46dba12cf19855e34202bc7e06b44e7'
+Submodule path 'sub1': checked out 'cb30fdc4a6780f38db4c4c20499845f40a5892e6'
+Submodule path 'uninitialized_sub': checked out 'cb30fdc4a6780f38db4c4c20499845f40a5892e6'
 ok 18 - git_pull_ff: replace directory with submodule
 
 expecting success: 
@@ -284777,13 +287993,13 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t5572-pull-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out 'fd076b76b46dba12cf19855e34202bc7e06b44e7'
+Submodule path 'sub1': checked out 'cb30fdc4a6780f38db4c4c20499845f40a5892e6'
 Branch 'remove_sub1' set up to track remote branch 'remove_sub1' from 'origin'.
-Deleted branch remove_sub1 (was ec24b37).
+Deleted branch remove_sub1 (was 3cfd7a1).
 Switched to a new branch 'remove_sub1'
 Branch 'remove_sub1' set up to track remote branch 'remove_sub1' from 'origin'.
 warning: unable to rmdir 'sub1': Directory not empty
-Updating 989eaad..ec24b37
+Updating c13dab3..3cfd7a1
 Fast-forward
  .gitmodules | 7 -------
  1 file changed, 7 deletions(-)
@@ -284810,13 +288026,13 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t5572-pull-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out 'fd076b76b46dba12cf19855e34202bc7e06b44e7'
+Submodule path 'sub1': checked out 'cb30fdc4a6780f38db4c4c20499845f40a5892e6'
 Branch 'remove_sub1' set up to track remote branch 'remove_sub1' from 'origin'.
-Deleted branch remove_sub1 (was ec24b37).
+Deleted branch remove_sub1 (was 3cfd7a1).
 Switched to a new branch 'remove_sub1'
 Branch 'remove_sub1' set up to track remote branch 'remove_sub1' from 'origin'.
 warning: unable to rmdir 'sub1': Directory not empty
-Updating 989eaad..ec24b37
+Updating c13dab3..3cfd7a1
 Fast-forward
  .gitmodules | 7 -------
  1 file changed, 7 deletions(-)
@@ -284841,9 +288057,9 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t5572-pull-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out 'fd076b76b46dba12cf19855e34202bc7e06b44e7'
+Submodule path 'sub1': checked out 'cb30fdc4a6780f38db4c4c20499845f40a5892e6'
 Branch 'replace_sub1_with_directory' set up to track remote branch 'replace_sub1_with_directory' from 'origin'.
-Deleted branch replace_sub1_with_directory (was 1281a37).
+Deleted branch replace_sub1_with_directory (was f031e8e).
 Switched to a new branch 'replace_sub1_with_directory'
 Branch 'replace_sub1_with_directory' set up to track remote branch 'replace_sub1_with_directory' from 'origin'.
 error: The following untracked working tree files would be overwritten by merge:
@@ -284851,7 +288067,7 @@
 	sub1/file2
 Please move or remove them before you merge.
 Aborting
-Updating 989eaad..1281a37
+Updating c13dab3..f031e8e
 ok 21 - git_pull_ff: replace submodule with a directory must fail
 
 expecting success: 
@@ -284874,9 +288090,9 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t5572-pull-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out 'fd076b76b46dba12cf19855e34202bc7e06b44e7'
+Submodule path 'sub1': checked out 'cb30fdc4a6780f38db4c4c20499845f40a5892e6'
 Branch 'replace_sub1_with_directory' set up to track remote branch 'replace_sub1_with_directory' from 'origin'.
-Deleted branch replace_sub1_with_directory (was 1281a37).
+Deleted branch replace_sub1_with_directory (was f031e8e).
 Switched to a new branch 'replace_sub1_with_directory'
 Branch 'replace_sub1_with_directory' set up to track remote branch 'replace_sub1_with_directory' from 'origin'.
 error: The following untracked working tree files would be overwritten by merge:
@@ -284884,7 +288100,7 @@
 	sub1/file2
 Please move or remove them before you merge.
 Aborting
-Updating 989eaad..1281a37
+Updating c13dab3..f031e8e
 ok 22 - git_pull_ff: replace submodule containing a .git directory with a directory must fail
 
 checking known breakage: 
@@ -284905,12 +288121,12 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t5572-pull-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out 'fd076b76b46dba12cf19855e34202bc7e06b44e7'
+Submodule path 'sub1': checked out 'cb30fdc4a6780f38db4c4c20499845f40a5892e6'
 Branch 'replace_sub1_with_file' set up to track remote branch 'replace_sub1_with_file' from 'origin'.
-Deleted branch replace_sub1_with_file (was 027275b).
+Deleted branch replace_sub1_with_file (was 39dde8f).
 Switched to a new branch 'replace_sub1_with_file'
 Branch 'replace_sub1_with_file' set up to track remote branch 'replace_sub1_with_file' from 'origin'.
-Updating 989eaad..027275b
+Updating c13dab3..39dde8f
 Fast-forward
  .gitmodules | 4 ----
  sub1        | 2 +-
@@ -284939,12 +288155,12 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t5572-pull-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out 'fd076b76b46dba12cf19855e34202bc7e06b44e7'
+Submodule path 'sub1': checked out 'cb30fdc4a6780f38db4c4c20499845f40a5892e6'
 Branch 'replace_sub1_with_file' set up to track remote branch 'replace_sub1_with_file' from 'origin'.
-Deleted branch replace_sub1_with_file (was 027275b).
+Deleted branch replace_sub1_with_file (was 39dde8f).
 Switched to a new branch 'replace_sub1_with_file'
 Branch 'replace_sub1_with_file' set up to track remote branch 'replace_sub1_with_file' from 'origin'.
-Updating 989eaad..027275b
+Updating c13dab3..39dde8f
 Fast-forward
  .gitmodules | 4 ----
  sub1        | 2 +-
@@ -284973,14 +288189,14 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t5572-pull-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out 'fd076b76b46dba12cf19855e34202bc7e06b44e7'
+Submodule path 'sub1': checked out 'cb30fdc4a6780f38db4c4c20499845f40a5892e6'
 Branch 'modify_sub1' set up to track remote branch 'modify_sub1' from 'origin'.
-Deleted branch modify_sub1 (was 19a8b3e).
+Deleted branch modify_sub1 (was 228a228).
 Switched to a new branch 'modify_sub1'
 Branch 'modify_sub1' set up to track remote branch 'modify_sub1' from 'origin'.
-Updating 989eaad..19a8b3e
+Updating c13dab3..228a228
 Fast-forward
-Submodule path 'sub1': checked out '7fb11c0eb916249cb4150c4a42917a0a7646bd73'
+Submodule path 'sub1': checked out '785f00dfc52b5c853796036a5e05c7f78624ae8a'
 ok 25 - git_pull_ff: modified submodule does not update submodule work tree
 
 expecting success: 
@@ -285003,12 +288219,12 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t5572-pull-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out 'fd076b76b46dba12cf19855e34202bc7e06b44e7'
+Submodule path 'sub1': checked out 'cb30fdc4a6780f38db4c4c20499845f40a5892e6'
 Branch 'invalid_sub1' set up to track remote branch 'invalid_sub1' from 'origin'.
-Deleted branch invalid_sub1 (was b9c9a4b).
+Deleted branch invalid_sub1 (was 58ef31f).
 Switched to a new branch 'invalid_sub1'
 Branch 'invalid_sub1' set up to track remote branch 'invalid_sub1' from 'origin'.
-Updating 989eaad..b9c9a4b
+Updating c13dab3..58ef31f
 Fast-forward
 error: Server does not allow request for unadvertised object 0123456789012345678901234567890123456789
 Fetched in submodule path 'sub1', but it did not contain 0123456789012345678901234567890123456789. Direct fetching of that commit failed.
@@ -285033,10 +288249,10 @@
 Branch 'invalid_sub1' set up to track remote branch 'invalid_sub1' from 'origin'.
 fatal: Needed a single revision
 Branch 'valid_sub1' set up to track remote branch 'valid_sub1' from 'origin'.
-Deleted branch valid_sub1 (was b23c919).
+Deleted branch valid_sub1 (was 71076b1).
 Switched to a new branch 'valid_sub1'
 Branch 'valid_sub1' set up to track remote branch 'valid_sub1' from 'origin'.
-Updating b9c9a4b..b23c919
+Updating 58ef31f..71076b1
 Fast-forward
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
 Submodule 'uninitialized_sub' (/build/git-2.20.1/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
@@ -285044,8 +288260,8 @@
 done.
 Cloning into '/build/git-2.20.1/t/trash directory.t5572-pull-submodule/submodule_update/uninitialized_sub'...
 done.
-Submodule path 'sub1': checked out 'fd076b76b46dba12cf19855e34202bc7e06b44e7'
-Submodule path 'uninitialized_sub': checked out 'fd076b76b46dba12cf19855e34202bc7e06b44e7'
+Submodule path 'sub1': checked out 'cb30fdc4a6780f38db4c4c20499845f40a5892e6'
+Submodule path 'uninitialized_sub': checked out 'cb30fdc4a6780f38db4c4c20499845f40a5892e6'
 ok 27 - git_pull_ff: modified submodule does not update submodule work tree from invalid commit
 
 expecting success: 
@@ -285065,14 +288281,14 @@
 Switched to a new branch 'no_submodule'
 Branch 'no_submodule' set up to track remote branch 'no_submodule' from 'origin'.
 Branch 'add_sub1' set up to track remote branch 'add_sub1' from 'origin'.
-Deleted branch add_sub1 (was 989eaad).
+Deleted branch add_sub1 (was c13dab3).
 Switched to a new branch 'add_sub1'
 Branch 'add_sub1' set up to track remote branch 'add_sub1' from 'origin'.
 error: The following untracked working tree files would be overwritten by merge:
 	sub1
 Please move or remove them before you merge.
 Aborting
-Updating 4076c68..989eaad
+Updating f1949d8..c13dab3
 ok 28 - git_pull_ff: added submodule doesn't remove untracked unignored file with same name
 
 expecting success: 
@@ -285093,10 +288309,10 @@
 Switched to a new branch 'no_submodule'
 Branch 'no_submodule' set up to track remote branch 'no_submodule' from 'origin'.
 Branch 'add_sub1' set up to track remote branch 'add_sub1' from 'origin'.
-Deleted branch add_sub1 (was 989eaad).
+Deleted branch add_sub1 (was c13dab3).
 Switched to a new branch 'add_sub1'
 Branch 'add_sub1' set up to track remote branch 'add_sub1' from 'origin'.
-Updating 4076c68..989eaad
+Updating f1949d8..c13dab3
 Fast-forward
  .gitmodules | 7 +++++++
  1 file changed, 7 insertions(+)
@@ -285107,8 +288323,8 @@
 done.
 Cloning into '/build/git-2.20.1/t/trash directory.t5572-pull-submodule/submodule_update/uninitialized_sub'...
 done.
-Submodule path 'sub1': checked out 'fd076b76b46dba12cf19855e34202bc7e06b44e7'
-Submodule path 'uninitialized_sub': checked out 'fd076b76b46dba12cf19855e34202bc7e06b44e7'
+Submodule path 'sub1': checked out 'cb30fdc4a6780f38db4c4c20499845f40a5892e6'
+Submodule path 'uninitialized_sub': checked out 'cb30fdc4a6780f38db4c4c20499845f40a5892e6'
 ok 29 - git_pull_ff_only: added submodule creates empty directory
 
 expecting success: 
@@ -285130,10 +288346,10 @@
 Switched to a new branch 'no_submodule'
 Branch 'no_submodule' set up to track remote branch 'no_submodule' from 'origin'.
 Branch 'add_sub1' set up to track remote branch 'add_sub1' from 'origin'.
-Deleted branch add_sub1 (was 989eaad).
+Deleted branch add_sub1 (was c13dab3).
 Switched to a new branch 'add_sub1'
 Branch 'add_sub1' set up to track remote branch 'add_sub1' from 'origin'.
-Updating 4076c68..989eaad
+Updating f1949d8..c13dab3
 Fast-forward
  .gitmodules | 7 +++++++
  1 file changed, 7 insertions(+)
@@ -285144,8 +288360,8 @@
 done.
 Cloning into '/build/git-2.20.1/t/trash directory.t5572-pull-submodule/submodule_update/uninitialized_sub'...
 done.
-Submodule path 'sub1': checked out 'fd076b76b46dba12cf19855e34202bc7e06b44e7'
-Submodule path 'uninitialized_sub': checked out 'fd076b76b46dba12cf19855e34202bc7e06b44e7'
+Submodule path 'sub1': checked out 'cb30fdc4a6780f38db4c4c20499845f40a5892e6'
+Submodule path 'uninitialized_sub': checked out 'cb30fdc4a6780f38db4c4c20499845f40a5892e6'
 ok 30 - git_pull_ff_only: added submodule leaves existing empty directory alone
 
 expecting success: 
@@ -285167,10 +288383,10 @@
 Branch 'replace_sub1_with_file' set up to track remote branch 'replace_sub1_with_file' from 'origin'.
 fatal: Needed a single revision
 Branch 'replace_file_with_sub1' set up to track remote branch 'replace_file_with_sub1' from 'origin'.
-Deleted branch replace_file_with_sub1 (was 90abad6).
+Deleted branch replace_file_with_sub1 (was 98424de).
 Switched to a new branch 'replace_file_with_sub1'
 Branch 'replace_file_with_sub1' set up to track remote branch 'replace_file_with_sub1' from 'origin'.
-Updating 027275b..90abad6
+Updating 39dde8f..98424de
 Fast-forward
  .gitmodules | 4 ++++
  sub1        | 2 +-
@@ -285182,8 +288398,8 @@
 done.
 Cloning into '/build/git-2.20.1/t/trash directory.t5572-pull-submodule/submodule_update/uninitialized_sub'...
 done.
-Submodule path 'sub1': checked out 'fd076b76b46dba12cf19855e34202bc7e06b44e7'
-Submodule path 'uninitialized_sub': checked out 'fd076b76b46dba12cf19855e34202bc7e06b44e7'
+Submodule path 'sub1': checked out 'cb30fdc4a6780f38db4c4c20499845f40a5892e6'
+Submodule path 'uninitialized_sub': checked out 'cb30fdc4a6780f38db4c4c20499845f40a5892e6'
 ok 31 - git_pull_ff_only: replace tracked file with submodule creates empty directory
 
 expecting success: 
@@ -285205,10 +288421,10 @@
 Branch 'replace_sub1_with_directory' set up to track remote branch 'replace_sub1_with_directory' from 'origin'.
 fatal: Needed a single revision
 Branch 'replace_directory_with_sub1' set up to track remote branch 'replace_directory_with_sub1' from 'origin'.
-Deleted branch replace_directory_with_sub1 (was edb9f87).
+Deleted branch replace_directory_with_sub1 (was 55a8ec3).
 Switched to a new branch 'replace_directory_with_sub1'
 Branch 'replace_directory_with_sub1' set up to track remote branch 'replace_directory_with_sub1' from 'origin'.
-Updating 1281a37..edb9f87
+Updating f031e8e..55a8ec3
 Fast-forward
  .gitmodules | 4 ++++
  sub1/file1  | 1 -
@@ -285224,8 +288440,8 @@
 done.
 Cloning into '/build/git-2.20.1/t/trash directory.t5572-pull-submodule/submodule_update/uninitialized_sub'...
 done.
-Submodule path 'sub1': checked out 'fd076b76b46dba12cf19855e34202bc7e06b44e7'
-Submodule path 'uninitialized_sub': checked out 'fd076b76b46dba12cf19855e34202bc7e06b44e7'
+Submodule path 'sub1': checked out 'cb30fdc4a6780f38db4c4c20499845f40a5892e6'
+Submodule path 'uninitialized_sub': checked out 'cb30fdc4a6780f38db4c4c20499845f40a5892e6'
 ok 32 - git_pull_ff_only: replace directory with submodule
 
 expecting success: 
@@ -285246,13 +288462,13 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t5572-pull-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out 'fd076b76b46dba12cf19855e34202bc7e06b44e7'
+Submodule path 'sub1': checked out 'cb30fdc4a6780f38db4c4c20499845f40a5892e6'
 Branch 'remove_sub1' set up to track remote branch 'remove_sub1' from 'origin'.
-Deleted branch remove_sub1 (was ec24b37).
+Deleted branch remove_sub1 (was 3cfd7a1).
 Switched to a new branch 'remove_sub1'
 Branch 'remove_sub1' set up to track remote branch 'remove_sub1' from 'origin'.
 warning: unable to rmdir 'sub1': Directory not empty
-Updating 989eaad..ec24b37
+Updating c13dab3..3cfd7a1
 Fast-forward
  .gitmodules | 7 -------
  1 file changed, 7 deletions(-)
@@ -285279,13 +288495,13 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t5572-pull-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out 'fd076b76b46dba12cf19855e34202bc7e06b44e7'
+Submodule path 'sub1': checked out 'cb30fdc4a6780f38db4c4c20499845f40a5892e6'
 Branch 'remove_sub1' set up to track remote branch 'remove_sub1' from 'origin'.
-Deleted branch remove_sub1 (was ec24b37).
+Deleted branch remove_sub1 (was 3cfd7a1).
 Switched to a new branch 'remove_sub1'
 Branch 'remove_sub1' set up to track remote branch 'remove_sub1' from 'origin'.
 warning: unable to rmdir 'sub1': Directory not empty
-Updating 989eaad..ec24b37
+Updating c13dab3..3cfd7a1
 Fast-forward
  .gitmodules | 7 -------
  1 file changed, 7 deletions(-)
@@ -285310,9 +288526,9 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t5572-pull-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out 'fd076b76b46dba12cf19855e34202bc7e06b44e7'
+Submodule path 'sub1': checked out 'cb30fdc4a6780f38db4c4c20499845f40a5892e6'
 Branch 'replace_sub1_with_directory' set up to track remote branch 'replace_sub1_with_directory' from 'origin'.
-Deleted branch replace_sub1_with_directory (was 1281a37).
+Deleted branch replace_sub1_with_directory (was f031e8e).
 Switched to a new branch 'replace_sub1_with_directory'
 Branch 'replace_sub1_with_directory' set up to track remote branch 'replace_sub1_with_directory' from 'origin'.
 error: The following untracked working tree files would be overwritten by merge:
@@ -285320,7 +288536,7 @@
 	sub1/file2
 Please move or remove them before you merge.
 Aborting
-Updating 989eaad..1281a37
+Updating c13dab3..f031e8e
 ok 35 - git_pull_ff_only: replace submodule with a directory must fail
 
 expecting success: 
@@ -285343,9 +288559,9 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t5572-pull-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out 'fd076b76b46dba12cf19855e34202bc7e06b44e7'
+Submodule path 'sub1': checked out 'cb30fdc4a6780f38db4c4c20499845f40a5892e6'
 Branch 'replace_sub1_with_directory' set up to track remote branch 'replace_sub1_with_directory' from 'origin'.
-Deleted branch replace_sub1_with_directory (was 1281a37).
+Deleted branch replace_sub1_with_directory (was f031e8e).
 Switched to a new branch 'replace_sub1_with_directory'
 Branch 'replace_sub1_with_directory' set up to track remote branch 'replace_sub1_with_directory' from 'origin'.
 error: The following untracked working tree files would be overwritten by merge:
@@ -285353,7 +288569,7 @@
 	sub1/file2
 Please move or remove them before you merge.
 Aborting
-Updating 989eaad..1281a37
+Updating c13dab3..f031e8e
 ok 36 - git_pull_ff_only: replace submodule containing a .git directory with a directory must fail
 
 checking known breakage: 
@@ -285374,12 +288590,12 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t5572-pull-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out 'fd076b76b46dba12cf19855e34202bc7e06b44e7'
+Submodule path 'sub1': checked out 'cb30fdc4a6780f38db4c4c20499845f40a5892e6'
 Branch 'replace_sub1_with_file' set up to track remote branch 'replace_sub1_with_file' from 'origin'.
-Deleted branch replace_sub1_with_file (was 027275b).
+Deleted branch replace_sub1_with_file (was 39dde8f).
 Switched to a new branch 'replace_sub1_with_file'
 Branch 'replace_sub1_with_file' set up to track remote branch 'replace_sub1_with_file' from 'origin'.
-Updating 989eaad..027275b
+Updating c13dab3..39dde8f
 Fast-forward
  .gitmodules | 4 ----
  sub1        | 2 +-
@@ -285408,12 +288624,12 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t5572-pull-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out 'fd076b76b46dba12cf19855e34202bc7e06b44e7'
+Submodule path 'sub1': checked out 'cb30fdc4a6780f38db4c4c20499845f40a5892e6'
 Branch 'replace_sub1_with_file' set up to track remote branch 'replace_sub1_with_file' from 'origin'.
-Deleted branch replace_sub1_with_file (was 027275b).
+Deleted branch replace_sub1_with_file (was 39dde8f).
 Switched to a new branch 'replace_sub1_with_file'
 Branch 'replace_sub1_with_file' set up to track remote branch 'replace_sub1_with_file' from 'origin'.
-Updating 989eaad..027275b
+Updating c13dab3..39dde8f
 Fast-forward
  .gitmodules | 4 ----
  sub1        | 2 +-
@@ -285442,14 +288658,14 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t5572-pull-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out 'fd076b76b46dba12cf19855e34202bc7e06b44e7'
+Submodule path 'sub1': checked out 'cb30fdc4a6780f38db4c4c20499845f40a5892e6'
 Branch 'modify_sub1' set up to track remote branch 'modify_sub1' from 'origin'.
-Deleted branch modify_sub1 (was 19a8b3e).
+Deleted branch modify_sub1 (was 228a228).
 Switched to a new branch 'modify_sub1'
 Branch 'modify_sub1' set up to track remote branch 'modify_sub1' from 'origin'.
-Updating 989eaad..19a8b3e
+Updating c13dab3..228a228
 Fast-forward
-Submodule path 'sub1': checked out '7fb11c0eb916249cb4150c4a42917a0a7646bd73'
+Submodule path 'sub1': checked out '785f00dfc52b5c853796036a5e05c7f78624ae8a'
 ok 39 - git_pull_ff_only: modified submodule does not update submodule work tree
 
 expecting success: 
@@ -285472,12 +288688,12 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t5572-pull-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out 'fd076b76b46dba12cf19855e34202bc7e06b44e7'
+Submodule path 'sub1': checked out 'cb30fdc4a6780f38db4c4c20499845f40a5892e6'
 Branch 'invalid_sub1' set up to track remote branch 'invalid_sub1' from 'origin'.
-Deleted branch invalid_sub1 (was b9c9a4b).
+Deleted branch invalid_sub1 (was 58ef31f).
 Switched to a new branch 'invalid_sub1'
 Branch 'invalid_sub1' set up to track remote branch 'invalid_sub1' from 'origin'.
-Updating 989eaad..b9c9a4b
+Updating c13dab3..58ef31f
 Fast-forward
 error: Server does not allow request for unadvertised object 0123456789012345678901234567890123456789
 Fetched in submodule path 'sub1', but it did not contain 0123456789012345678901234567890123456789. Direct fetching of that commit failed.
@@ -285502,10 +288718,10 @@
 Branch 'invalid_sub1' set up to track remote branch 'invalid_sub1' from 'origin'.
 fatal: Needed a single revision
 Branch 'valid_sub1' set up to track remote branch 'valid_sub1' from 'origin'.
-Deleted branch valid_sub1 (was b23c919).
+Deleted branch valid_sub1 (was 71076b1).
 Switched to a new branch 'valid_sub1'
 Branch 'valid_sub1' set up to track remote branch 'valid_sub1' from 'origin'.
-Updating b9c9a4b..b23c919
+Updating 58ef31f..71076b1
 Fast-forward
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
 Submodule 'uninitialized_sub' (/build/git-2.20.1/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
@@ -285513,8 +288729,8 @@
 done.
 Cloning into '/build/git-2.20.1/t/trash directory.t5572-pull-submodule/submodule_update/uninitialized_sub'...
 done.
-Submodule path 'sub1': checked out 'fd076b76b46dba12cf19855e34202bc7e06b44e7'
-Submodule path 'uninitialized_sub': checked out 'fd076b76b46dba12cf19855e34202bc7e06b44e7'
+Submodule path 'sub1': checked out 'cb30fdc4a6780f38db4c4c20499845f40a5892e6'
+Submodule path 'uninitialized_sub': checked out 'cb30fdc4a6780f38db4c4c20499845f40a5892e6'
 ok 41 - git_pull_ff_only: modified submodule does not update submodule work tree from invalid commit
 
 expecting success: 
@@ -285534,14 +288750,14 @@
 Switched to a new branch 'no_submodule'
 Branch 'no_submodule' set up to track remote branch 'no_submodule' from 'origin'.
 Branch 'add_sub1' set up to track remote branch 'add_sub1' from 'origin'.
-Deleted branch add_sub1 (was 989eaad).
+Deleted branch add_sub1 (was c13dab3).
 Switched to a new branch 'add_sub1'
 Branch 'add_sub1' set up to track remote branch 'add_sub1' from 'origin'.
 error: The following untracked working tree files would be overwritten by merge:
 	sub1
 Please move or remove them before you merge.
 Aborting
-Updating 4076c68..989eaad
+Updating f1949d8..c13dab3
 ok 42 - git_pull_ff_only: added submodule doesn't remove untracked unignored file with same name
 
 expecting success: 
@@ -285562,14 +288778,14 @@
 Switched to a new branch 'no_submodule'
 Branch 'no_submodule' set up to track remote branch 'no_submodule' from 'origin'.
 Branch 'add_sub1' set up to track remote branch 'add_sub1' from 'origin'.
-Deleted branch add_sub1 (was 989eaad).
+Deleted branch add_sub1 (was c13dab3).
 Switched to a new branch 'add_sub1'
 Branch 'add_sub1' set up to track remote branch 'add_sub1' from 'origin'.
 Merging:
-4076c68 Base
-virtual 989eaade9beead8259b459bed2da111249c97bbe
+f1949d8 Base
+virtual c13dab3bfb81ad6352392e37198039826882c589
 found 1 common ancestor:
-4076c68 Base
+f1949d8 Base
 Merge made by the 'recursive' strategy.
  .gitmodules | 7 +++++++
  1 file changed, 7 insertions(+)
@@ -285580,8 +288796,8 @@
 done.
 Cloning into '/build/git-2.20.1/t/trash directory.t5572-pull-submodule/submodule_update/uninitialized_sub'...
 done.
-Submodule path 'sub1': checked out 'fd076b76b46dba12cf19855e34202bc7e06b44e7'
-Submodule path 'uninitialized_sub': checked out 'fd076b76b46dba12cf19855e34202bc7e06b44e7'
+Submodule path 'sub1': checked out 'cb30fdc4a6780f38db4c4c20499845f40a5892e6'
+Submodule path 'uninitialized_sub': checked out 'cb30fdc4a6780f38db4c4c20499845f40a5892e6'
 ok 43 - git_pull_noff: added submodule creates empty directory
 
 expecting success: 
@@ -285603,14 +288819,14 @@
 Switched to a new branch 'no_submodule'
 Branch 'no_submodule' set up to track remote branch 'no_submodule' from 'origin'.
 Branch 'add_sub1' set up to track remote branch 'add_sub1' from 'origin'.
-Deleted branch add_sub1 (was 989eaad).
+Deleted branch add_sub1 (was c13dab3).
 Switched to a new branch 'add_sub1'
 Branch 'add_sub1' set up to track remote branch 'add_sub1' from 'origin'.
 Merging:
-4076c68 Base
-virtual 989eaade9beead8259b459bed2da111249c97bbe
+f1949d8 Base
+virtual c13dab3bfb81ad6352392e37198039826882c589
 found 1 common ancestor:
-4076c68 Base
+f1949d8 Base
 Merge made by the 'recursive' strategy.
  .gitmodules | 7 +++++++
  1 file changed, 7 insertions(+)
@@ -285621,8 +288837,8 @@
 done.
 Cloning into '/build/git-2.20.1/t/trash directory.t5572-pull-submodule/submodule_update/uninitialized_sub'...
 done.
-Submodule path 'sub1': checked out 'fd076b76b46dba12cf19855e34202bc7e06b44e7'
-Submodule path 'uninitialized_sub': checked out 'fd076b76b46dba12cf19855e34202bc7e06b44e7'
+Submodule path 'sub1': checked out 'cb30fdc4a6780f38db4c4c20499845f40a5892e6'
+Submodule path 'uninitialized_sub': checked out 'cb30fdc4a6780f38db4c4c20499845f40a5892e6'
 ok 44 - git_pull_noff: added submodule leaves existing empty directory alone
 
 expecting success: 
@@ -285644,14 +288860,14 @@
 Branch 'replace_sub1_with_file' set up to track remote branch 'replace_sub1_with_file' from 'origin'.
 fatal: Needed a single revision
 Branch 'replace_file_with_sub1' set up to track remote branch 'replace_file_with_sub1' from 'origin'.
-Deleted branch replace_file_with_sub1 (was 90abad6).
+Deleted branch replace_file_with_sub1 (was 98424de).
 Switched to a new branch 'replace_file_with_sub1'
 Branch 'replace_file_with_sub1' set up to track remote branch 'replace_file_with_sub1' from 'origin'.
 Merging:
-027275b Replace sub1 with file
-virtual 90abad6bac21683f2e6e46061983253f5eabf6d7
+39dde8f Replace sub1 with file
+virtual 98424dedb6e719bf34124478a984ddcfed53ebf6
 found 1 common ancestor:
-027275b Replace sub1 with file
+39dde8f Replace sub1 with file
 Merge made by the 'recursive' strategy.
  .gitmodules | 4 ++++
  sub1        | 2 +-
@@ -285663,8 +288879,8 @@
 done.
 Cloning into '/build/git-2.20.1/t/trash directory.t5572-pull-submodule/submodule_update/uninitialized_sub'...
 done.
-Submodule path 'sub1': checked out 'fd076b76b46dba12cf19855e34202bc7e06b44e7'
-Submodule path 'uninitialized_sub': checked out 'fd076b76b46dba12cf19855e34202bc7e06b44e7'
+Submodule path 'sub1': checked out 'cb30fdc4a6780f38db4c4c20499845f40a5892e6'
+Submodule path 'uninitialized_sub': checked out 'cb30fdc4a6780f38db4c4c20499845f40a5892e6'
 ok 45 - git_pull_noff: replace tracked file with submodule creates empty directory
 
 checking known breakage: 
@@ -285686,14 +288902,14 @@
 Branch 'replace_sub1_with_directory' set up to track remote branch 'replace_sub1_with_directory' from 'origin'.
 fatal: Needed a single revision
 Branch 'replace_directory_with_sub1' set up to track remote branch 'replace_directory_with_sub1' from 'origin'.
-Deleted branch replace_directory_with_sub1 (was edb9f87).
+Deleted branch replace_directory_with_sub1 (was 55a8ec3).
 Switched to a new branch 'replace_directory_with_sub1'
 Branch 'replace_directory_with_sub1' set up to track remote branch 'replace_directory_with_sub1' from 'origin'.
 Merging:
-1281a37 Replace sub1 with directory
-virtual edb9f8788e735393b2f54fa9f6c2e867c43babbf
+f031e8e Replace sub1 with directory
+virtual 55a8ec39884439bdcb130f77efb140f120728637
 found 1 common ancestor:
-1281a37 Replace sub1 with directory
+f031e8e Replace sub1 with directory
 Removing sub1/file3
 Removing sub1/file2
 Removing sub1/file1
@@ -285728,16 +288944,16 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t5572-pull-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out 'fd076b76b46dba12cf19855e34202bc7e06b44e7'
+Submodule path 'sub1': checked out 'cb30fdc4a6780f38db4c4c20499845f40a5892e6'
 Branch 'remove_sub1' set up to track remote branch 'remove_sub1' from 'origin'.
-Deleted branch remove_sub1 (was ec24b37).
+Deleted branch remove_sub1 (was 3cfd7a1).
 Switched to a new branch 'remove_sub1'
 Branch 'remove_sub1' set up to track remote branch 'remove_sub1' from 'origin'.
 Merging:
-989eaad Add sub1
-virtual ec24b3753183e26405cbc2bdef82b5761b3b8578
+c13dab3 Add sub1
+virtual 3cfd7a1351646c220cee184d47a59461e5cda851
 found 1 common ancestor:
-989eaad Add sub1
+c13dab3 Add sub1
 Removing uninitialized_sub
 Removing sub1
 Removing .gitmodules
@@ -285767,16 +288983,16 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t5572-pull-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out 'fd076b76b46dba12cf19855e34202bc7e06b44e7'
+Submodule path 'sub1': checked out 'cb30fdc4a6780f38db4c4c20499845f40a5892e6'
 Branch 'remove_sub1' set up to track remote branch 'remove_sub1' from 'origin'.
-Deleted branch remove_sub1 (was ec24b37).
+Deleted branch remove_sub1 (was 3cfd7a1).
 Switched to a new branch 'remove_sub1'
 Branch 'remove_sub1' set up to track remote branch 'remove_sub1' from 'origin'.
 Merging:
-989eaad Add sub1
-virtual ec24b3753183e26405cbc2bdef82b5761b3b8578
+c13dab3 Add sub1
+virtual 3cfd7a1351646c220cee184d47a59461e5cda851
 found 1 common ancestor:
-989eaad Add sub1
+c13dab3 Add sub1
 Removing uninitialized_sub
 Removing sub1
 Removing .gitmodules
@@ -285804,18 +289020,18 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t5572-pull-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out 'fd076b76b46dba12cf19855e34202bc7e06b44e7'
+Submodule path 'sub1': checked out 'cb30fdc4a6780f38db4c4c20499845f40a5892e6'
 Branch 'replace_sub1_with_directory' set up to track remote branch 'replace_sub1_with_directory' from 'origin'.
-Deleted branch replace_sub1_with_directory (was 1281a37).
+Deleted branch replace_sub1_with_directory (was f031e8e).
 Switched to a new branch 'replace_sub1_with_directory'
 Branch 'replace_sub1_with_directory' set up to track remote branch 'replace_sub1_with_directory' from 'origin'.
 error: refusing to lose untracked file at 'sub1/file2'
 error: refusing to lose untracked file at 'sub1/file1'
 Merging:
-989eaad Add sub1
-virtual 1281a37341faa072c8d850416e872f504d6fa16f
+c13dab3 Add sub1
+virtual f031e8eb95c50ff792d6c8ca69cf80dbf07ea40d
 found 1 common ancestor:
-989eaad Add sub1
+c13dab3 Add sub1
 Adding sub1/file3
 Adding sub1/file2
 Adding sub1/file1
@@ -285852,18 +289068,18 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t5572-pull-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out 'fd076b76b46dba12cf19855e34202bc7e06b44e7'
+Submodule path 'sub1': checked out 'cb30fdc4a6780f38db4c4c20499845f40a5892e6'
 Branch 'replace_sub1_with_directory' set up to track remote branch 'replace_sub1_with_directory' from 'origin'.
-Deleted branch replace_sub1_with_directory (was 1281a37).
+Deleted branch replace_sub1_with_directory (was f031e8e).
 Switched to a new branch 'replace_sub1_with_directory'
 Branch 'replace_sub1_with_directory' set up to track remote branch 'replace_sub1_with_directory' from 'origin'.
 error: refusing to lose untracked file at 'sub1/file2'
 error: refusing to lose untracked file at 'sub1/file1'
 Merging:
-989eaad Add sub1
-virtual 1281a37341faa072c8d850416e872f504d6fa16f
+c13dab3 Add sub1
+virtual f031e8eb95c50ff792d6c8ca69cf80dbf07ea40d
 found 1 common ancestor:
-989eaad Add sub1
+c13dab3 Add sub1
 Adding sub1/file3
 Adding sub1/file2
 Adding sub1/file1
@@ -285898,16 +289114,16 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t5572-pull-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out 'fd076b76b46dba12cf19855e34202bc7e06b44e7'
+Submodule path 'sub1': checked out 'cb30fdc4a6780f38db4c4c20499845f40a5892e6'
 Branch 'replace_sub1_with_file' set up to track remote branch 'replace_sub1_with_file' from 'origin'.
-Deleted branch replace_sub1_with_file (was 027275b).
+Deleted branch replace_sub1_with_file (was 39dde8f).
 Switched to a new branch 'replace_sub1_with_file'
 Branch 'replace_sub1_with_file' set up to track remote branch 'replace_sub1_with_file' from 'origin'.
 Merging:
-989eaad Add sub1
-virtual 027275bcd232569328a9c67d7edf4d4064d5f629
+c13dab3 Add sub1
+virtual 39dde8ffd68383ea5f497a8e3f5d3b3f428c1932
 found 1 common ancestor:
-989eaad Add sub1
+c13dab3 Add sub1
 Merge made by the 'recursive' strategy.
  .gitmodules | 4 ----
  sub1        | 2 +-
@@ -285936,16 +289152,16 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t5572-pull-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out 'fd076b76b46dba12cf19855e34202bc7e06b44e7'
+Submodule path 'sub1': checked out 'cb30fdc4a6780f38db4c4c20499845f40a5892e6'
 Branch 'replace_sub1_with_file' set up to track remote branch 'replace_sub1_with_file' from 'origin'.
-Deleted branch replace_sub1_with_file (was 027275b).
+Deleted branch replace_sub1_with_file (was 39dde8f).
 Switched to a new branch 'replace_sub1_with_file'
 Branch 'replace_sub1_with_file' set up to track remote branch 'replace_sub1_with_file' from 'origin'.
 Merging:
-989eaad Add sub1
-virtual 027275bcd232569328a9c67d7edf4d4064d5f629
+c13dab3 Add sub1
+virtual 39dde8ffd68383ea5f497a8e3f5d3b3f428c1932
 found 1 common ancestor:
-989eaad Add sub1
+c13dab3 Add sub1
 Merge made by the 'recursive' strategy.
  .gitmodules | 4 ----
  sub1        | 2 +-
@@ -285974,18 +289190,18 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t5572-pull-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out 'fd076b76b46dba12cf19855e34202bc7e06b44e7'
+Submodule path 'sub1': checked out 'cb30fdc4a6780f38db4c4c20499845f40a5892e6'
 Branch 'modify_sub1' set up to track remote branch 'modify_sub1' from 'origin'.
-Deleted branch modify_sub1 (was 19a8b3e).
+Deleted branch modify_sub1 (was 228a228).
 Switched to a new branch 'modify_sub1'
 Branch 'modify_sub1' set up to track remote branch 'modify_sub1' from 'origin'.
 Merging:
-989eaad Add sub1
-virtual 19a8b3e97736f9120a7f44fcd5c84854b18dd471
+c13dab3 Add sub1
+virtual 228a228ed1477fd1759d09c75d62f7f7838b9525
 found 1 common ancestor:
-989eaad Add sub1
+c13dab3 Add sub1
 Merge made by the 'recursive' strategy.
-Submodule path 'sub1': checked out '7fb11c0eb916249cb4150c4a42917a0a7646bd73'
+Submodule path 'sub1': checked out '785f00dfc52b5c853796036a5e05c7f78624ae8a'
 ok 53 - git_pull_noff: modified submodule does not update submodule work tree
 
 expecting success: 
@@ -286008,16 +289224,16 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t5572-pull-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out 'fd076b76b46dba12cf19855e34202bc7e06b44e7'
+Submodule path 'sub1': checked out 'cb30fdc4a6780f38db4c4c20499845f40a5892e6'
 Branch 'invalid_sub1' set up to track remote branch 'invalid_sub1' from 'origin'.
-Deleted branch invalid_sub1 (was b9c9a4b).
+Deleted branch invalid_sub1 (was 58ef31f).
 Switched to a new branch 'invalid_sub1'
 Branch 'invalid_sub1' set up to track remote branch 'invalid_sub1' from 'origin'.
 Merging:
-989eaad Add sub1
-virtual b9c9a4b0b498e377b3359ab32ce36995f91e91ca
+c13dab3 Add sub1
+virtual 58ef31f4aafed5ab073e98410e6660682ab6432f
 found 1 common ancestor:
-989eaad Add sub1
+c13dab3 Add sub1
 Merge made by the 'recursive' strategy.
 error: Server does not allow request for unadvertised object 0123456789012345678901234567890123456789
 Fetched in submodule path 'sub1', but it did not contain 0123456789012345678901234567890123456789. Direct fetching of that commit failed.
@@ -286042,14 +289258,14 @@
 Branch 'invalid_sub1' set up to track remote branch 'invalid_sub1' from 'origin'.
 fatal: Needed a single revision
 Branch 'valid_sub1' set up to track remote branch 'valid_sub1' from 'origin'.
-Deleted branch valid_sub1 (was b23c919).
+Deleted branch valid_sub1 (was 71076b1).
 Switched to a new branch 'valid_sub1'
 Branch 'valid_sub1' set up to track remote branch 'valid_sub1' from 'origin'.
 Merging:
-b9c9a4b Invalid sub1 commit
-virtual b23c91981b34891cd4e1673b8889131ebdb63efd
+58ef31f Invalid sub1 commit
+virtual 71076b10895c2b93a5d4a5b1fc5082129753b2fd
 found 1 common ancestor:
-b9c9a4b Invalid sub1 commit
+58ef31f Invalid sub1 commit
 Merge made by the 'recursive' strategy.
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
 Submodule 'uninitialized_sub' (/build/git-2.20.1/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
@@ -286057,8 +289273,8 @@
 done.
 Cloning into '/build/git-2.20.1/t/trash directory.t5572-pull-submodule/submodule_update/uninitialized_sub'...
 done.
-Submodule path 'sub1': checked out 'fd076b76b46dba12cf19855e34202bc7e06b44e7'
-Submodule path 'uninitialized_sub': checked out 'fd076b76b46dba12cf19855e34202bc7e06b44e7'
+Submodule path 'sub1': checked out 'cb30fdc4a6780f38db4c4c20499845f40a5892e6'
+Submodule path 'uninitialized_sub': checked out 'cb30fdc4a6780f38db4c4c20499845f40a5892e6'
 ok 55 - git_pull_noff: modified submodule does not update submodule work tree from invalid commit
 
 expecting success: 
@@ -286078,19 +289294,19 @@
 Switched to a new branch 'no_submodule'
 Branch 'no_submodule' set up to track remote branch 'no_submodule' from 'origin'.
 Branch 'add_sub1' set up to track remote branch 'add_sub1' from 'origin'.
-Deleted branch add_sub1 (was 989eaad).
+Deleted branch add_sub1 (was c13dab3).
 Switched to a new branch 'add_sub1'
 Branch 'add_sub1' set up to track remote branch 'add_sub1' from 'origin'.
 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 5ef07e07e0791df7e9fbbf23d45aaee06bff134d failed
+error: merging of trees ec38489b3f8eda08fda17055ad272abc24bdf929 and aa708c7df7069a0c26a3106f4d8806d4b87ac8f9 failed
 Merging:
-4076c68 Base
-virtual 989eaade9beead8259b459bed2da111249c97bbe
+f1949d8 Base
+virtual c13dab3bfb81ad6352392e37198039826882c589
 found 1 common ancestor:
-4076c68 Base
+f1949d8 Base
 ok 56 - git_pull_noff: added submodule doesn't remove untracked unignored file with same name
 
 expecting success: 
@@ -286238,758 +289454,393 @@
 From /build/git-2.20.1/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/git-2.20.1/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/git-2.20.1/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/git-2.20.1/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 60 -  --[no-]recurse-submodule and submodule.recurse
-
-expecting success: 
-	# change upstream
-	test_commit -C child rebase_strategy &&
-	git -C parent submodule update --remote &&
-	git -C parent add sub &&
-	git -C parent commit -m "update submodule" &&
-
-	# also have local commits
-	test_commit -C super/sub local_stuff &&
-
-	git -C super pull --rebase --recurse-submodules &&
-	test_path_is_file super/sub/rebase_strategy.t &&
-	test_path_is_file super/sub/local_stuff.t
-
-[master 444a38f] rebase_strategy
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 rebase_strategy.t
-From /build/git-2.20.1/t/trash directory.t5572-pull-submodule/child
-   c05caa7..444a38f  master          -> origin/master
- * [new tag]         rebase_strategy -> rebase_strategy
-Submodule path 'sub': checked out '444a38f268bc637531debc8ab96af23723e6738c'
-[master ae4551d] update submodule
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[detached HEAD de038fa] local_stuff
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 local_stuff.t
-From /build/git-2.20.1/t/trash directory.t5572-pull-submodule/parent
-   ab7e8d7..ae4551d  master     -> origin/master
-Fetching submodule sub
-From /build/git-2.20.1/t/trash directory.t5572-pull-submodule/child
-   c05caa7..444a38f  master          -> origin/master
- * [new tag]         rebase_strategy -> rebase_strategy
-Updating ab7e8d7..ae4551d
-Fast-forward
- sub | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Current branch master is up to date.
-First, rewinding head to replay your work on top of it...
-Applying: local_stuff
-Submodule path 'sub': rebased into '444a38f268bc637531debc8ab96af23723e6738c'
-ok 61 - recursive rebasing pull
-
-expecting success: 
-
-	# local changes in submodule recorded in superproject:
-	test_commit -C super/sub local_stuff_2 &&
-	git -C super add sub &&
-	git -C super commit -m "local update submodule" &&
-
-	# and in the remote as well:
-	test_commit -C child important_upstream_work &&
-	git -C parent submodule update --remote &&
-	git -C parent add sub &&
-	git -C parent commit -m "remote update submodule" &&
-
-	# Unfortunately we fail here, despite no conflict in the
-	# submodule itself, but the merge strategy in submodules
-	# does not support rebase:
-	test_must_fail git -C super pull --rebase --recurse-submodules 2>err &&
-	test_i18ngrep "locally recorded submodule modifications" err
-
-[detached HEAD bf24f6d] local_stuff_2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 local_stuff_2.t
-[master 8e37952] local update submodule
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[master 3328e66] important_upstream_work
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 important_upstream_work.t
-From /build/git-2.20.1/t/trash directory.t5572-pull-submodule/child
-   444a38f..3328e66  master                  -> origin/master
- * [new tag]         important_upstream_work -> important_upstream_work
-Submodule path 'sub': checked out '3328e66275888771ad97d1742b94efec5243e45d'
-[master f9ac4a8] 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 62 - pull rebase recursing fails with conflicts
-
-expecting success: 
-	rm -rf parent child &&
-
-	test_create_repo a-submodule &&
-	test_commit -C a-submodule foo &&
-
-	test_create_repo parent &&
-	git -C parent submodule add "$(pwd)/a-submodule" &&
-	git -C parent commit -m foo &&
-
-	git clone parent child &&
-
-	# Reset master so that it has no merge base with
-	# refs/remotes/origin/master.
-	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/git-2.20.1/t/trash directory.t5572-pull-submodule/a-submodule/.git/
-[master (root-commit) af4983b] foo
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo.t
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5572-pull-submodule/parent/.git/
-Cloning into '/build/git-2.20.1/t/trash directory.t5572-pull-submodule/parent/a-submodule'...
-done.
-[master (root-commit) acbef49] 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 837579a bar
-First, rewinding head to replay your work on top of it...
-ok 63 - branch has no merge base with remote-tracking counterpart
-
-# still have 11 known breakage(s)
-# passed all remaining 52 test(s)
-1..63
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t7407-submodule-foreach.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7407-submodule-foreach/.git/
-expecting success: 
-	echo file > file &&
-	git add file &&
-	test_tick &&
-	git commit -m upstream &&
-	git clone . super &&
-	git clone super submodule &&
-	(
-		cd super &&
-		git submodule add ../submodule sub1 &&
-		git submodule add ../submodule sub2 &&
-		git submodule add ../submodule sub3 &&
-		git config -f .gitmodules --rename-section \
-			submodule.sub1 submodule.foo1 &&
-		git config -f .gitmodules --rename-section \
-			submodule.sub2 submodule.foo2 &&
-		git config -f .gitmodules --rename-section \
-			submodule.sub3 submodule.foo3 &&
-		git add .gitmodules &&
-		test_tick &&
-		git commit -m "submodules" &&
-		git submodule init sub1 &&
-		git submodule init sub2 &&
-		git submodule init sub3
-	) &&
-	(
-		cd submodule &&
-		echo different > file &&
-		git add file &&
-		test_tick &&
-		git commit -m "different"
-	) &&
-	(
-		cd super &&
-		(
-			cd sub3 &&
-			git pull
-		) &&
-		git add sub3 &&
-		test_tick &&
-		git commit -m "update sub3"
-	)
-
-[master (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/git-2.20.1/t/trash directory.t7407-submodule-foreach/super/sub1'...
-done.
-Cloning into '/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/super/sub2'...
-done.
-Cloning into '/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/super/sub3'...
-done.
-[master 33b977a] submodules
- Author: A U Thor <author@example.com>
- 4 files changed, 12 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub1
- create mode 160000 sub2
- create mode 160000 sub3
-Submodule 'foo1' (/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/submodule) registered for path 'sub1'
-Submodule 'foo2' (/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/submodule) registered for path 'sub2'
-Submodule 'foo3' (/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/submodule) registered for path 'sub3'
-[master 509f622] different
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-From /build/git-2.20.1/t/trash directory.t7407-submodule-foreach/submodule
-   0c90624..509f622  master     -> origin/master
-Updating 0c90624..509f622
-Fast-forward
- file | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[master ed2a820] update sub3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 1 - setup a submodule tree
-
-expecting success: 
-	git clone super clone &&
-	(
-		cd clone &&
-		git submodule update --init -- sub1 sub3 &&
-		git submodule foreach "echo \$toplevel-\$name-\$path-\$sha1" > ../actual &&
-		git config foo.bar zar &&
-		git submodule foreach "git config --file \"\$toplevel/.git/config\" foo.bar"
-	) &&
-	test_i18ncmp expect actual
-
-Cloning into 'clone'...
-done.
-Submodule 'foo1' (/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/submodule) registered for path 'sub1'
-Submodule 'foo3' (/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/submodule) registered for path 'sub3'
-Cloning into '/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/clone/sub1'...
-done.
-Cloning into '/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/clone/sub3'...
-done.
-Submodule path 'sub1': checked out '0c90624ab7f1aaa301d3bb79f60dcfed1ec4897f'
-Submodule path 'sub3': checked out '509f622a4f36a3e472affcf28fa959174f3dd5b5'
-Entering 'sub1'
-zar
-Entering 'sub3'
-zar
-ok 2 - test basic "submodule foreach" usage
-
-expecting success: 
-	mkdir clone/sub &&
-	(
-		cd clone/sub &&
-		git submodule foreach "echo \$toplevel-\$name-\$sm_path-\$displaypath-\$sha1" >../../actual
-	) &&
-	test_i18ncmp expect actual
-
-ok 3 - test "submodule foreach" from subdirectory
-
-expecting success: 
-	git clone submodule nested1 &&
-	git clone submodule nested2 &&
-	git clone submodule nested3 &&
-	(
-		cd nested3 &&
-		git submodule add ../submodule submodule &&
-		test_tick &&
-		git commit -m "submodule" &&
-		git submodule init submodule
-	) &&
-	(
-		cd nested2 &&
-		git submodule add ../nested3 nested3 &&
-		test_tick &&
-		git commit -m "nested3" &&
-		git submodule init nested3
-	) &&
-	(
-		cd nested1 &&
-		git submodule add ../nested2 nested2 &&
-		test_tick &&
-		git commit -m "nested2" &&
-		git submodule init nested2
-	) &&
-	(
-		cd super &&
-		git submodule add ../nested1 nested1 &&
-		test_tick &&
-		git commit -m "nested1" &&
-		git submodule init nested1
-	)
-
-Cloning into 'nested1'...
-done.
-Cloning into 'nested2'...
-done.
-Cloning into 'nested3'...
-done.
-Cloning into '/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/nested3/submodule'...
-done.
-[master 5ec8351] submodule
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 submodule
-Cloning into '/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/nested2/nested3'...
-done.
-[master 2e69c85] nested3
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 nested3
-Cloning into '/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/nested1/nested2'...
-done.
-[master b23f134] nested2
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 nested2
-Cloning into '/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/super/nested1'...
-done.
-[master 427ccd0] nested1
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 160000 nested1
-ok 4 - setup nested submodules
-
-expecting success: 
-	git clone super clone2 &&
-	(
-		cd clone2 &&
-		test_must_fail git rev-parse --resolve-git-dir sub1/.git &&
-		test_must_fail git rev-parse --resolve-git-dir sub2/.git &&
-		test_must_fail git rev-parse --resolve-git-dir sub3/.git &&
-		test_must_fail git rev-parse --resolve-git-dir nested1/.git &&
-		git submodule update --init &&
-		git rev-parse --resolve-git-dir sub1/.git &&
-		git rev-parse --resolve-git-dir sub2/.git &&
-		git rev-parse --resolve-git-dir sub3/.git &&
-		git rev-parse --resolve-git-dir nested1/.git &&
-		test_must_fail git rev-parse --resolve-git-dir nested1/nested2/.git &&
-		git submodule foreach "git submodule update --init" &&
-		git rev-parse --resolve-git-dir nested1/nested2/.git &&
-		test_must_fail git rev-parse --resolve-git-dir nested1/nested2/nested3/.git
-	)
-
-Cloning into 'clone2'...
-done.
-fatal: not a gitdir 'sub1/.git'
-fatal: not a gitdir 'sub2/.git'
-fatal: not a gitdir 'sub3/.git'
-fatal: not a gitdir 'nested1/.git'
-Submodule 'nested1' (/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/nested1) registered for path 'nested1'
-Submodule 'foo1' (/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/submodule) registered for path 'sub1'
-Submodule 'foo2' (/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/submodule) registered for path 'sub2'
-Submodule 'foo3' (/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/submodule) registered for path 'sub3'
-Cloning into '/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/clone2/nested1'...
-done.
-Cloning into '/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/clone2/sub1'...
-done.
-Cloning into '/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/clone2/sub2'...
-done.
-Cloning into '/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/clone2/sub3'...
-done.
-Submodule path 'nested1': checked out 'b23f134787d96fae589a6b76da41f4db112fc8db'
-Submodule path 'sub1': checked out '0c90624ab7f1aaa301d3bb79f60dcfed1ec4897f'
-Submodule path 'sub2': checked out '0c90624ab7f1aaa301d3bb79f60dcfed1ec4897f'
-Submodule path 'sub3': checked out '509f622a4f36a3e472affcf28fa959174f3dd5b5'
-/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/clone2/.git/modules/foo1
-/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/clone2/.git/modules/foo2
-/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/clone2/.git/modules/foo3
-/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/clone2/.git/modules/nested1
-fatal: not a gitdir 'nested1/nested2/.git'
-Entering 'nested1'
-Submodule 'nested2' (/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/nested2) registered for path 'nested2'
-Cloning into '/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/clone2/nested1/nested2'...
-done.
-Submodule path 'nested2': checked out '2e69c85de92bf5f316f3c67b5e492f287f5a6542'
-Entering 'sub1'
-Entering 'sub2'
-Entering 'sub3'
-/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/clone2/.git/modules/nested1/modules/nested2
-fatal: not a gitdir 'nested1/nested2/nested3/.git'
-ok 5 - use "submodule foreach" to checkout 2nd level submodule
+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/git-2.20.1/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/git-2.20.1/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/git-2.20.1/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 60 -  --[no-]recurse-submodule and submodule.recurse
 
 expecting success: 
-	(
-		cd clone2 &&
-		git submodule foreach --recursive "git submodule update --init" &&
-		git rev-parse --resolve-git-dir nested1/nested2/nested3/.git &&
-		git rev-parse --resolve-git-dir nested1/nested2/nested3/submodule/.git
-	)
+	# 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" &&
 
-Entering 'nested1'
-Entering 'nested1/nested2'
-Submodule 'nested3' (/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/nested3) registered for path 'nested3'
-Cloning into '/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/clone2/nested1/nested2/nested3'...
-done.
-Submodule path 'nested3': checked out '5ec83512b76a0b8170b899f8e643913c3e9b72d9'
-Entering 'nested1/nested2/nested3'
-Submodule 'submodule' (/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/submodule) registered for path 'submodule'
-Cloning into '/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/clone2/nested1/nested2/nested3/submodule'...
-done.
-Submodule path 'submodule': checked out '509f622a4f36a3e472affcf28fa959174f3dd5b5'
-Entering 'nested1/nested2/nested3/submodule'
-Entering 'sub1'
-Entering 'sub2'
-Entering 'sub3'
-/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/clone2/.git/modules/nested1/modules/nested2/modules/nested3
-/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/clone2/.git/modules/nested1/modules/nested2/modules/nested3/modules/submodule
-ok 6 - use "foreach --recursive" to checkout all submodules
+	# also have local commits
+	test_commit -C super/sub local_stuff &&
 
-expecting success: 
-	(
-		cd clone2 &&
-		git submodule foreach --recursive "true" > ../actual
-	) &&
-	test_i18ncmp expect 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
 
-ok 7 - test messages from "foreach --recursive"
+[master 444a38f] rebase_strategy
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 rebase_strategy.t
+From /build/git-2.20.1/t/trash directory.t5572-pull-submodule/child
+   c05caa7..444a38f  master          -> origin/master
+ * [new tag]         rebase_strategy -> rebase_strategy
+Submodule path 'sub': checked out '444a38f268bc637531debc8ab96af23723e6738c'
+[master ae4551d] update submodule
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[detached HEAD de038fa] local_stuff
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 local_stuff.t
+From /build/git-2.20.1/t/trash directory.t5572-pull-submodule/parent
+   ab7e8d7..ae4551d  master     -> origin/master
+Fetching submodule sub
+From /build/git-2.20.1/t/trash directory.t5572-pull-submodule/child
+   c05caa7..444a38f  master          -> origin/master
+ * [new tag]         rebase_strategy -> rebase_strategy
+Updating ab7e8d7..ae4551d
+Fast-forward
+ sub | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Current branch master is up to date.
+First, rewinding head to replay your work on top of it...
+Applying: local_stuff
+Submodule path 'sub': rebased into '444a38f268bc637531debc8ab96af23723e6738c'
+ok 61 - recursive rebasing pull
 
 expecting success: 
-	(
-		cd clone2 &&
-		mkdir untracked &&
-		cd untracked &&
-		git submodule foreach --recursive >../../actual
-	) &&
-	test_i18ncmp expect actual
 
-ok 8 - test messages from "foreach --recursive" from subdirectory
+	# 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: 
-	(
-		cd clone2/untracked &&
-		git submodule foreach --recursive "echo toplevel: \$toplevel name: \$name path: \$sm_path displaypath: \$displaypath hash: \$sha1" >../../actual
-	) &&
-	test_i18ncmp expect actual
+	# 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" &&
 
-ok 9 - test "submodule foreach --recursive" from subdirectory
+	# 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_i18ngrep "locally recorded submodule modifications" err
+
+[detached HEAD bf24f6d] local_stuff_2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 local_stuff_2.t
+[master 8e37952] local update submodule
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[master 3328e66] important_upstream_work
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 important_upstream_work.t
+From /build/git-2.20.1/t/trash directory.t5572-pull-submodule/child
+   444a38f..3328e66  master                  -> origin/master
+ * [new tag]         important_upstream_work -> important_upstream_work
+Submodule path 'sub': checked out '3328e66275888771ad97d1742b94efec5243e45d'
+[master f9ac4a8] 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 62 - pull rebase recursing fails with conflicts
 
 expecting success: 
-	(
-		cd clone2 &&
-		git submodule foreach -q --recursive "echo \$name-\$path" > ../actual
-	) &&
-	test_cmp expect actual
+	rm -rf parent child &&
 
-ok 10 - test "foreach --quiet --recursive"
+	test_create_repo a-submodule &&
+	test_commit -C a-submodule foo &&
 
-expecting success: 
-	git clone super clone3 &&
-	(
-		cd clone3 &&
-		test_must_fail git rev-parse --resolve-git-dir sub1/.git &&
-		test_must_fail git rev-parse --resolve-git-dir sub2/.git &&
-		test_must_fail git rev-parse --resolve-git-dir sub3/.git &&
-		test_must_fail git rev-parse --resolve-git-dir nested1/.git &&
-		git submodule update --init --recursive &&
-		git rev-parse --resolve-git-dir sub1/.git &&
-		git rev-parse --resolve-git-dir sub2/.git &&
-		git rev-parse --resolve-git-dir sub3/.git &&
-		git rev-parse --resolve-git-dir nested1/.git &&
-		git rev-parse --resolve-git-dir nested1/nested2/.git &&
-		git rev-parse --resolve-git-dir nested1/nested2/nested3/.git &&
-		git rev-parse --resolve-git-dir nested1/nested2/nested3/submodule/.git
-	)
+	test_create_repo parent &&
+	git -C parent submodule add "$(pwd)/a-submodule" &&
+	git -C parent commit -m foo &&
 
-Cloning into 'clone3'...
-done.
-fatal: not a gitdir 'sub1/.git'
-fatal: not a gitdir 'sub2/.git'
-fatal: not a gitdir 'sub3/.git'
-fatal: not a gitdir 'nested1/.git'
-Submodule 'nested1' (/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/nested1) registered for path 'nested1'
-Submodule 'foo1' (/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/submodule) registered for path 'sub1'
-Submodule 'foo2' (/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/submodule) registered for path 'sub2'
-Submodule 'foo3' (/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/submodule) registered for path 'sub3'
-Cloning into '/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/clone3/nested1'...
-done.
-Cloning into '/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/clone3/sub1'...
-done.
-Cloning into '/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/clone3/sub2'...
-done.
-Cloning into '/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/clone3/sub3'...
-done.
-Submodule path 'nested1': checked out 'b23f134787d96fae589a6b76da41f4db112fc8db'
-Submodule 'nested2' (/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/nested2) registered for path 'nested1/nested2'
-Cloning into '/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/clone3/nested1/nested2'...
-done.
-Submodule path 'nested1/nested2': checked out '2e69c85de92bf5f316f3c67b5e492f287f5a6542'
-Submodule 'nested3' (/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/nested3) registered for path 'nested1/nested2/nested3'
-Cloning into '/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/clone3/nested1/nested2/nested3'...
+	git clone parent child &&
+
+	# Reset master so that it has no merge base with
+	# refs/remotes/origin/master.
+	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/git-2.20.1/t/trash directory.t5572-pull-submodule/a-submodule/.git/
+[master (root-commit) af4983b] foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo.t
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t5572-pull-submodule/parent/.git/
+Cloning into '/build/git-2.20.1/t/trash directory.t5572-pull-submodule/parent/a-submodule'...
 done.
-Submodule path 'nested1/nested2/nested3': checked out '5ec83512b76a0b8170b899f8e643913c3e9b72d9'
-Submodule 'submodule' (/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/submodule) registered for path 'nested1/nested2/nested3/submodule'
-Cloning into '/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/clone3/nested1/nested2/nested3/submodule'...
+[master (root-commit) acbef49] 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.
-Submodule path 'nested1/nested2/nested3/submodule': checked out '509f622a4f36a3e472affcf28fa959174f3dd5b5'
-Submodule path 'sub1': checked out '0c90624ab7f1aaa301d3bb79f60dcfed1ec4897f'
-Submodule path 'sub2': checked out '0c90624ab7f1aaa301d3bb79f60dcfed1ec4897f'
-Submodule path 'sub3': checked out '509f622a4f36a3e472affcf28fa959174f3dd5b5'
-/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/clone3/.git/modules/foo1
-/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/clone3/.git/modules/foo2
-/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/clone3/.git/modules/foo3
-/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/clone3/.git/modules/nested1
-/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/clone3/.git/modules/nested1/modules/nested2
-/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/clone3/.git/modules/nested1/modules/nested2/modules/nested3
-/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/clone3/.git/modules/nested1/modules/nested2/modules/nested3/modules/submodule
-ok 11 - use "update --recursive" to checkout all submodules
+HEAD is now at 837579a bar
+First, rewinding head to replay your work on top of it...
+ok 63 - branch has no merge base with remote-tracking counterpart
 
+# still have 11 known breakage(s)
+# passed all remaining 52 test(s)
+1..63
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t7605-merge-resolve.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7605-merge-resolve/.git/
 expecting success: 
-	(
-		cd clone3 &&
-		git submodule status --recursive > ../actual
-	) &&
-	test_cmp expect actual
+	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
 
-ok 12 - test "status --recursive"
+[master (root-commit) 9435f8d] c0
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c0.c
+[master 8b072a4] c1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c1.c
+HEAD is now at 9435f8d c0
+[master bbccf99] c2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c2.c
+HEAD is now at 9435f8d c0
+[master 7c7ae02] c3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c2.c
+ok 1 - setup
 
 expecting success: 
-	(
-		cd clone3 &&
-		(
-			cd nested1/nested2 &&
-			test_commit file2
-		) &&
-		git submodule status --cached --recursive -- nested1 > ../actual
-	) &&
-	test_cmp expect actual
+	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)
 
-[detached HEAD 25d56d1] file2
- Author: A U Thor <author@example.com>
+HEAD is now at 8b072a4 c1
+Trying really trivial in-index merge...
+Wonderful.
+In-index merge
+ c2.c | 1 +
  1 file changed, 1 insertion(+)
- create mode 100644 file2.t
-ok 13 - ensure "status --cached --recursive" preserves the --cached flag
+ create mode 100644 c2.c
+ok 2 - merge c1 to c2
 
 expecting success: 
-	(
-		cd clone3 &&
-		mkdir tmp && cd tmp &&
-		git submodule status --recursive > ../../actual
-	) &&
-	test_cmp expect actual
+	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)
 
-ok 14 - test "status --recursive" from sub directory
+HEAD is now at 8b072a4 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: 
-	git clone --recursive super clone4 &&
-	(
-		cd clone4 &&
-		git rev-parse --resolve-git-dir .git &&
-		git rev-parse --resolve-git-dir sub1/.git &&
-		git rev-parse --resolve-git-dir sub2/.git &&
-		git rev-parse --resolve-git-dir sub3/.git &&
-		git rev-parse --resolve-git-dir nested1/.git &&
-		git rev-parse --resolve-git-dir nested1/nested2/.git &&
-		git rev-parse --resolve-git-dir nested1/nested2/nested3/.git &&
-		git rev-parse --resolve-git-dir nested1/nested2/nested3/submodule/.git
-	)
+	git reset --hard c2 &&
+	test_must_fail git merge -s resolve c3
 
-Cloning into 'clone4'...
-done.
-Submodule 'nested1' (/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/nested1) registered for path 'nested1'
-Submodule 'foo1' (/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/submodule) registered for path 'sub1'
-Submodule 'foo2' (/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/submodule) registered for path 'sub2'
-Submodule 'foo3' (/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/submodule) registered for path 'sub3'
-Cloning into '/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/clone4/nested1'...
-done.
-Cloning into '/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/clone4/sub1'...
-done.
-Cloning into '/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/clone4/sub2'...
-done.
-Cloning into '/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/clone4/sub3'...
-done.
-Submodule path 'nested1': checked out 'b23f134787d96fae589a6b76da41f4db112fc8db'
-Submodule 'nested2' (/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/nested2) registered for path 'nested1/nested2'
-Cloning into '/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/clone4/nested1/nested2'...
-done.
-Submodule path 'nested1/nested2': checked out '2e69c85de92bf5f316f3c67b5e492f287f5a6542'
-Submodule 'nested3' (/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/nested3) registered for path 'nested1/nested2/nested3'
-Cloning into '/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/clone4/nested1/nested2/nested3'...
-done.
-Submodule path 'nested1/nested2/nested3': checked out '5ec83512b76a0b8170b899f8e643913c3e9b72d9'
-Submodule 'submodule' (/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/submodule) registered for path 'nested1/nested2/nested3/submodule'
-Cloning into '/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/clone4/nested1/nested2/nested3/submodule'...
-done.
-Submodule path 'nested1/nested2/nested3/submodule': checked out '509f622a4f36a3e472affcf28fa959174f3dd5b5'
-Submodule path 'sub1': checked out '0c90624ab7f1aaa301d3bb79f60dcfed1ec4897f'
-Submodule path 'sub2': checked out '0c90624ab7f1aaa301d3bb79f60dcfed1ec4897f'
-Submodule path 'sub3': checked out '509f622a4f36a3e472affcf28fa959174f3dd5b5'
-.git
-/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/clone4/.git/modules/foo1
-/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/clone4/.git/modules/foo2
-/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/clone4/.git/modules/foo3
-/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/clone4/.git/modules/nested1
-/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/clone4/.git/modules/nested1/modules/nested2
-/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/clone4/.git/modules/nested1/modules/nested2/modules/nested3
-/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/clone4/.git/modules/nested1/modules/nested2/modules/nested3/modules/submodule
-ok 15 - use "git clone --recursive" to checkout all submodules
+HEAD is now at bbccf99 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/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t7606-merge-custom.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7606-merge-custom/.git/
 expecting success: 
-	git clone super "common objects" &&
-	git clone super clone5 &&
-	(
-		cd clone5 &&
-		test_must_fail git rev-parse --resolve-git-dir d nested1/.git &&
-		git submodule update --init --recursive --reference="$(dirname "$PWD")/common objects" &&
-		git rev-parse --resolve-git-dir nested1/.git &&
-		git rev-parse --resolve-git-dir nested1/nested2/.git &&
-		git rev-parse --resolve-git-dir nested1/nested2/nested3/.git &&
-		test -f .git/modules/nested1/objects/info/alternates &&
-		test -f .git/modules/nested1/modules/nested2/objects/info/alternates &&
-		test -f .git/modules/nested1/modules/nested2/modules/nested3/objects/info/alternates
-	)
+	cat >git-merge-theirs <<-EOF &&
+	#!$SHELL_PATH
+	eval git read-tree --reset -u \\\$\$#
+	EOF
 
-Cloning into 'common objects'...
-done.
-Cloning into 'clone5'...
-done.
-fatal: not a gitdir 'd'
-Submodule 'nested1' (/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/nested1) registered for path 'nested1'
-Submodule 'foo1' (/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/submodule) registered for path 'sub1'
-Submodule 'foo2' (/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/submodule) registered for path 'sub2'
-Submodule 'foo3' (/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/submodule) registered for path 'sub3'
-Cloning into '/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/clone5/nested1'...
-done.
-Cloning into '/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/clone5/sub1'...
-done.
-Cloning into '/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/clone5/sub2'...
-done.
-Cloning into '/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/clone5/sub3'...
-done.
-Submodule path 'nested1': checked out 'b23f134787d96fae589a6b76da41f4db112fc8db'
-Submodule 'nested2' (/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/nested2) registered for path 'nested1/nested2'
-Cloning into '/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/clone5/nested1/nested2'...
-done.
-Submodule path 'nested1/nested2': checked out '2e69c85de92bf5f316f3c67b5e492f287f5a6542'
-Submodule 'nested3' (/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/nested3) registered for path 'nested1/nested2/nested3'
-Cloning into '/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/clone5/nested1/nested2/nested3'...
-done.
-Submodule path 'nested1/nested2/nested3': checked out '5ec83512b76a0b8170b899f8e643913c3e9b72d9'
-Submodule 'submodule' (/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/submodule) registered for path 'nested1/nested2/nested3/submodule'
-Cloning into '/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/clone5/nested1/nested2/nested3/submodule'...
-done.
-Submodule path 'nested1/nested2/nested3/submodule': checked out '509f622a4f36a3e472affcf28fa959174f3dd5b5'
-Submodule path 'sub1': checked out '0c90624ab7f1aaa301d3bb79f60dcfed1ec4897f'
-Submodule path 'sub2': checked out '0c90624ab7f1aaa301d3bb79f60dcfed1ec4897f'
-Submodule path 'sub3': checked out '509f622a4f36a3e472affcf28fa959174f3dd5b5'
-/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/clone5/.git/modules/nested1
-/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/clone5/.git/modules/nested1/modules/nested2
-/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/clone5/.git/modules/nested1/modules/nested2/modules/nested3
-ok 16 - test "update --recursive" with a flag with spaces
+	chmod +x git-merge-theirs &&
+	PATH=.:$PATH &&
+	export PATH
+
+ok 1 - set up custom strategy
 
 expecting success: 
-	git clone super clone6 &&
-	(
-		cd clone6 &&
-		test_must_fail git rev-parse --resolve-git-dir sub1/.git &&
-		test_must_fail git rev-parse --resolve-git-dir sub2/.git &&
-		test_must_fail git rev-parse --resolve-git-dir sub3/.git &&
-		test_must_fail git rev-parse --resolve-git-dir nested1/.git &&
-		git submodule update --init --recursive -- nested1 &&
-		test_must_fail git rev-parse --resolve-git-dir sub1/.git &&
-		test_must_fail git rev-parse --resolve-git-dir sub2/.git &&
-		test_must_fail git rev-parse --resolve-git-dir sub3/.git &&
-		git rev-parse --resolve-git-dir nested1/.git &&
-		git rev-parse --resolve-git-dir nested1/nested2/.git &&
-		git rev-parse --resolve-git-dir nested1/nested2/nested3/.git &&
-		git rev-parse --resolve-git-dir nested1/nested2/nested3/submodule/.git
-	)
+	test_commit c0 c0.c &&
+	test_commit c1 c1.c &&
+	git reset --keep c0 &&
+	echo c1c1 >c1.c &&
+	git add c1.c &&
+	test_commit c2 c2.c &&
+	git reset --keep c0 &&
+	test_commit c3 c3.c
 
-Cloning into 'clone6'...
-done.
-fatal: not a gitdir 'sub1/.git'
-fatal: not a gitdir 'sub2/.git'
-fatal: not a gitdir 'sub3/.git'
-fatal: not a gitdir 'nested1/.git'
-Submodule 'nested1' (/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/nested1) registered for path 'nested1'
-Cloning into '/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/clone6/nested1'...
-done.
-Submodule path 'nested1': checked out 'b23f134787d96fae589a6b76da41f4db112fc8db'
-Submodule 'nested2' (/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/nested2) registered for path 'nested1/nested2'
-Cloning into '/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/clone6/nested1/nested2'...
-done.
-Submodule path 'nested1/nested2': checked out '2e69c85de92bf5f316f3c67b5e492f287f5a6542'
-Submodule 'nested3' (/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/nested3) registered for path 'nested1/nested2/nested3'
-Cloning into '/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/clone6/nested1/nested2/nested3'...
-done.
-Submodule path 'nested1/nested2/nested3': checked out '5ec83512b76a0b8170b899f8e643913c3e9b72d9'
-Submodule 'submodule' (/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/submodule) registered for path 'nested1/nested2/nested3/submodule'
-Cloning into '/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/clone6/nested1/nested2/nested3/submodule'...
-done.
-Submodule path 'nested1/nested2/nested3/submodule': checked out '509f622a4f36a3e472affcf28fa959174f3dd5b5'
-fatal: not a gitdir 'sub1/.git'
-fatal: not a gitdir 'sub2/.git'
-fatal: not a gitdir 'sub3/.git'
-/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/clone6/.git/modules/nested1
-/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/clone6/.git/modules/nested1/modules/nested2
-/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/clone6/.git/modules/nested1/modules/nested2/modules/nested3
-/build/git-2.20.1/t/trash directory.t7407-submodule-foreach/clone6/.git/modules/nested1/modules/nested2/modules/nested3/modules/submodule
-ok 17 - use "update --recursive nested1" to checkout all submodules rooted in nested1
+[master (root-commit) 934056f] c0
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c0.c
+[master 7b51d7c] c1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c1.c
+[master f06910a] c2
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 c1.c
+ create mode 100644 c2.c
+[master 934e277] c3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c3.c
+ok 2 - setup
 
 expecting success: 
-	(
-		cd super &&
-		git submodule foreach echo success >../expected &&
-		yes | git submodule foreach "read y && test \"x\$y\" = xy && echo success" >../actual
-	) &&
-	test_cmp expected actual
+	git reset --hard c1 &&
 
-ok 18 - command passed to foreach retains notion of stdin
+	git rev-parse c1 >head.old &&
+	git rev-parse c2 >second-parent.expected &&
+	git rev-parse c2^{tree} >tree.expected &&
+	git merge -s theirs c2 &&
 
-expecting success: 
-	(
-		cd clone2 &&
-		git submodule foreach --recursive echo success >../expected &&
-		yes | git submodule foreach --recursive "read y && test \"x\$y\" = xy && echo success" >../actual
-	) &&
-	test_cmp expected actual
+	git rev-parse HEAD >head.new &&
+	git rev-parse HEAD^1 >first-parent &&
+	git rev-parse HEAD^2 >second-parent &&
+	git rev-parse HEAD^{tree} >tree &&
+	git update-index --refresh &&
+	git diff --exit-code &&
+	git diff --exit-code c2 HEAD &&
+	git diff --exit-code c2 &&
 
-ok 19 - command passed to foreach --recursive retains notion of stdin
+	! test_cmp head.old head.new &&
+	test_cmp head.old first-parent &&
+	test_cmp second-parent.expected second-parent &&
+	test_cmp tree.expected tree &&
+	test -f c0.c &&
+	grep c1c1 c1.c &&
+	test -f c2.c
+
+HEAD is now at 7b51d7c c1
+Merge made by the 'theirs' strategy.
+ c1.c | 2 +-
+ c2.c | 1 +
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+ create mode 100644 c2.c
+--- head.old	2023-01-05 11:50:04.314868030 +0000
++++ head.new	2023-01-05 11:50:04.366868030 +0000
+@@ -1 +1 @@
+-7b51d7cdbd54b8c470d864639e1136d88ce718ef
++5127482d58f03334905cdbe3564c8d092aa56dbe
+c1c1
+ok 3 - merge c2 with a custom strategy
 
 expecting success: 
-	(
-		cd super &&
-		git submodule foreach "echo \\\"quoted\\\"" > ../expected &&
-		git submodule foreach echo \"quoted\" > ../actual
-	) &&
-	test_cmp expected actual
+	git reset --hard c1 &&
 
-ok 20 - multi-argument command passed to foreach is not shell-evaluated twice
+	git rev-parse c1 >head.old &&
+	git rev-parse c3 >second-parent.expected &&
+	git rev-parse c3^{tree} >tree.expected &&
+	git merge -s theirs c3 &&
 
-# passed all 20 test(s)
-1..20
+	git rev-parse HEAD >head.new &&
+	git rev-parse HEAD^1 >first-parent &&
+	git rev-parse HEAD^2 >second-parent &&
+	git rev-parse HEAD^{tree} >tree &&
+	git update-index --refresh &&
+	git diff --exit-code &&
+	git diff --exit-code c3 HEAD &&
+	git diff --exit-code c3 &&
+
+	! test_cmp head.old head.new &&
+	test_cmp head.old first-parent &&
+	test_cmp second-parent.expected second-parent &&
+	test_cmp tree.expected tree &&
+	test -f c0.c &&
+	! test -e c1.c &&
+	test -f c3.c
+
+HEAD is now at 7b51d7c c1
+Merge made by the 'theirs' strategy.
+ c1.c | 1 -
+ c3.c | 1 +
+ 2 files changed, 1 insertion(+), 1 deletion(-)
+ delete mode 100644 c1.c
+ create mode 100644 c3.c
+--- head.old	2023-01-05 11:50:04.510868030 +0000
++++ head.new	2023-01-05 11:50:04.562868030 +0000
+@@ -1 +1 @@
+-7b51d7cdbd54b8c470d864639e1136d88ce718ef
++f5f2abda42595469639ae786a37808202e35dcf0
+ok 4 - trivial merge with custom strategy
+
+# passed all 4 test(s)
+1..4
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
 *** t7063-status-untracked-cache.sh ***
@@ -287346,7 +290197,7 @@
 	git add -f done/two done/.gitignore &&
 	git commit -m "first commit"
 
-[master (root-commit) 671d23b] first commit
+[master (root-commit) f60b2ac] first commit
  Author: A U Thor <author@example.com>
  5 files changed, 3 insertions(+)
  create mode 100644 done/.gitignore
@@ -287774,11 +290625,11 @@
 	test-tool dump-untracked-cache >../after &&
 	test_cmp ../before ../after
 
-[master 795f393] empty
+[master 965ca07] empty
  Author: A U Thor <author@example.com>
 Switched to a new branch 'other_branch'
 M	done/two
-[other_branch 4f460a5] test
+[other_branch af064e9] test
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 test.t
@@ -287795,7 +290646,7 @@
 	test-tool dump-untracked-cache >../after &&
 	test_cmp ../before ../after
 
-[master 4c982fa] commit
+[master 0446c26] commit
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 ok 43 - untracked cache survives a commit
@@ -287965,3589 +290816,20 @@
 
 You are in 'detached HEAD' state. You can look around, make experimental
 changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by performing another checkout.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
-
-  git checkout -b <new-branch-name>
-
-HEAD is now at 294fddc first commit
-Previous HEAD position was 294fddc first commit
-Switched to branch 'master'
-ok 50 - "status" after file replacement should be clean with UC=false
-
-# passed all 50 test(s)
-1..50
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t7525-status-rename.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7525-status-rename/.git/
-expecting success: 
-	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) 5e31512] Adding original file.
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 original
-ok 1 - setup
-
-expecting success: 
-	git status >actual &&
-	test_i18ngrep "renamed:" actual
-
-	renamed:    original -> renamed
-ok 2 - status no-options
-
-expecting success: 
-	git status --no-renames >actual &&
-	test_i18ngrep "deleted:" actual &&
-	test_i18ngrep "new file:" actual
-
-	deleted:    original
-	new file:   renamed
-ok 3 - status --no-renames
-
-expecting success: 
-	git -c diff.renames=false status >actual &&
-	test_i18ngrep "deleted:" actual &&
-	test_i18ngrep "new file:" actual
-
-	deleted:    original
-	new file:   renamed
-ok 4 - status.renames inherits from diff.renames false
-
-expecting success: 
-	git -c diff.renames=true status >actual &&
-	test_i18ngrep "renamed:" actual
-
-	renamed:    original -> renamed
-ok 5 - status.renames inherits from diff.renames true
-
-expecting success: 
-	git -c diff.renames=true -c status.renames=false status >actual &&
-	test_i18ngrep "deleted:" actual &&
-	test_i18ngrep "new file:" actual
-
-	deleted:    original
-	new file:   renamed
-ok 6 - status.renames overrides diff.renames false
-
-expecting success: 
-	git -c diff.renames=false -c status.renames=true status >actual &&
-	test_i18ngrep "renamed:" actual
-
-	renamed:    original -> renamed
-ok 7 - status.renames overrides from diff.renames true
-
-expecting success: 
-	git -c status.renames=false status >actual &&
-	test_i18ngrep "deleted:" actual &&
-	test_i18ngrep "new file:" actual
-
-	deleted:    original
-	new file:   renamed
-ok 8 - status status.renames=false
-
-expecting success: 
-	git -c status.renames=true status >actual &&
-	test_i18ngrep "renamed:" actual
-
-	renamed:    original -> renamed
-ok 9 - status status.renames=true
-
-expecting success: 
-	git -c status.renames=false commit --dry-run >actual &&
-	test_i18ngrep "deleted:" actual &&
-	test_i18ngrep "new file:" actual
-
-	deleted:    original
-	new file:   renamed
-ok 10 - commit honors status.renames=false
-
-expecting success: 
-	git -c status.renames=true commit --dry-run >actual &&
-	test_i18ngrep "renamed:" actual
-
-	renamed:    original -> renamed
-ok 11 - commit honors status.renames=true
-
-expecting success: 
-	git -c status.renames=true status --no-renames >actual &&
-	test_i18ngrep "deleted:" actual &&
-	test_i18ngrep "new file:" actual
-
-	deleted:    original
-	new file:   renamed
-ok 12 - status config overridden
-
-expecting success: 
-	git status -M=100% >actual &&
-	test_i18ngrep "deleted:" actual &&
-	test_i18ngrep "new file:" actual &&
-
-	git status --find-rename=100% >actual &&
-	test_i18ngrep "deleted:" actual &&
-	test_i18ngrep "new file:" actual
-
-	deleted:    original
-	new file:   renamed
-	deleted:    original
-	new file:   renamed
-ok 13 - status score=100%
-
-expecting success: 
-	git status -M=01% >actual &&
-	test_i18ngrep "renamed:" actual &&
-
-	git status --find-rename=01% >actual &&
-	test_i18ngrep "renamed:" actual
-
-	renamed:    original -> renamed
-	renamed:    original -> renamed
-ok 14 - status score=01%
-
-expecting success: 
-	cp renamed copy &&
-	git add copy &&
-
-	git -c status.renames=copies status -M=01% >actual &&
-	test_i18ngrep "copied:" actual &&
-	test_i18ngrep "renamed:" actual &&
-
-	git -c status.renames=copies status --find-rename=01% >actual &&
-	test_i18ngrep "copied:" actual &&
-	test_i18ngrep "renamed:" actual
-
-	copied:     original -> copy
-	renamed:    original -> renamed
-	copied:     original -> copy
-	renamed:    original -> renamed
-ok 15 - copies not overridden by find-rename
-
-# passed all 15 test(s)
-1..15
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t7513-interpret-trailers.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7513-interpret-trailers/.git/
-expecting success: 
-	: >empty &&
-	cat >basic_message <<-\EOF &&
-		subject
-
-		body
-	EOF
-	cat >complex_message_body <<-\EOF &&
-		my subject
-
-		my body which is long
-		and contains some special
-		chars like : = ? !
-
-	EOF
-	sed -e "s/ Z\$/ /" >complex_message_trailers <<-\EOF &&
-		Fixes: Z
-		Acked-by: Z
-		Reviewed-by: Z
-		Signed-off-by: Z
-	EOF
-	cat >basic_patch <<-\EOF
-		---
-		 foo.txt | 2 +-
-		 1 file changed, 1 insertion(+), 1 deletion(-)
-
-		diff --git a/foo.txt b/foo.txt
-		index 0353767..1d91aa1 100644
-		--- a/foo.txt
-		+++ b/foo.txt
-		@@ -1,3 +1,3 @@
-
-		-bar
-		+baz
-
-		--
-		1.9.rc0.11.ga562ddc
-
-	EOF
-
-ok 1 - setup
-
-expecting success: 
-	sed -e "s/ Z\$/ /" >expected <<-\EOF &&
-
-		ack: Peff
-		Reviewed-by: Z
-		Acked-by: Johan
-	EOF
-	git interpret-trailers --trailer "ack = Peff" --trailer "Reviewed-by" \
-		--trailer "Acked-by: Johan" empty >actual &&
-	test_cmp expected actual
-
-ok 2 - without config
-
-expecting success: 
-	sed -e "s/ Z\$/ /" >expected <<-\EOF &&
-
-		Acked-by: Johan
-		Reviewed-by: Z
-		ack: Peff
-	EOF
-	git interpret-trailers --trailer "Acked-by: Johan" --trailer "Reviewed-by" \
-		--trailer "ack = Peff" empty >actual &&
-	test_cmp expected actual
-
-ok 3 - without config in another order
-
-expecting success: 
-	cat >expected <<-\EOF &&
-
-		ack: Peff
-		Acked-by: Johan
-	EOF
-	git interpret-trailers --trim-empty --trailer ack=Peff \
-		--trailer "Reviewed-by" --trailer "Acked-by: Johan" \
-		--trailer "sob:" empty >actual &&
-	test_cmp expected actual
-
-ok 4 - --trim-empty without config
-
-expecting success: 
-	cat >expected <<-\EOF &&
-
-		Acked-by: Johan
-		Reviewed-by: Peff
-	EOF
-	{ echo; echo "Acked-by: Johan"; } |
-	git -c "trailer.Acked-by.ifexists=addifdifferent" interpret-trailers \
-		--trailer "Reviewed-by: Peff" --trailer "Acked-by: Johan" >actual &&
-	test_cmp expected actual
-
-ok 5 - with config option on the command line
-
-expecting success: 
-	cat >expected <<-\EOF &&
-		area: change
-
-		Reviewed-by: Peff
-		Acked-by: Johan
-	EOF
-	echo "area: change" |
-	git interpret-trailers --trailer "Reviewed-by: Peff" \
-		--trailer "Acked-by: Johan" >actual &&
-	test_cmp expected actual
-
-ok 6 - with only a title in the message
-
-expecting success: 
-	cat >expected <<-\EOF &&
-		place of
-		code: change
-
-		Reviewed-by: Peff
-		Acked-by: Johan
-	EOF
-	printf "%s\n" "place of" "code: change" |
-	git interpret-trailers --trailer "Reviewed-by: Peff" \
-		--trailer "Acked-by: Johan" >actual &&
-	test_cmp expected actual
-
-ok 7 - with multiline title in the message
-
-expecting success: 
-	cat >patch <<-\EOF &&
-
-		this is not a trailer
-		this is not a trailer
-		Signed-off-by: a <a@example.com>
-		this is not a trailer
-	EOF
-	cat >expected <<-\EOF &&
-
-		this is not a trailer
-		this is not a trailer
-		Signed-off-by: a <a@example.com>
-		this is not a trailer
-		token: value
-	EOF
-	git interpret-trailers --trailer "token: value" patch >actual &&
-	test_cmp expected actual
-
-ok 8 - with non-trailer lines mixed with Signed-off-by
-
-expecting success: 
-	cat >patch <<-\EOF &&
-
-		this is not a trailer
-		this is not a trailer
-		(cherry picked from commit x)
-		this is not a trailer
-	EOF
-	cat >expected <<-\EOF &&
-
-		this is not a trailer
-		this is not a trailer
-		(cherry picked from commit x)
-		this is not a trailer
-		token: value
-	EOF
-	git interpret-trailers --trailer "token: value" patch >actual &&
-	test_cmp expected actual
-
-ok 9 - with non-trailer lines mixed with cherry picked from
-
-expecting success: 
-	cat >patch <<-\EOF &&
-
-		this is not a trailer
-		this is not a trailer
-		My-trailer: x
-		this is not a trailer
-	EOF
-	cat >expected <<-\EOF &&
-
-		this is not a trailer
-		this is not a trailer
-		My-trailer: x
-		this is not a trailer
-		token: value
-	EOF
-	test_config trailer.my.key "My-trailer: " &&
-	git interpret-trailers --trailer "token: value" patch >actual &&
-	test_cmp expected actual
-
-ok 10 - with non-trailer lines mixed with a configured trailer
-
-expecting success: 
-	cat >patch <<-\EOF &&
-
-		this is not a trailer
-		this is not a trailer
-		I-am-not-configured: x
-		this is not a trailer
-	EOF
-	cat >expected <<-\EOF &&
-
-		this is not a trailer
-		this is not a trailer
-		I-am-not-configured: x
-		this is not a trailer
-
-		token: value
-	EOF
-	test_config trailer.my.key "My-trailer: " &&
-	git interpret-trailers --trailer "token: value" patch >actual &&
-	test_cmp expected actual
-
-ok 11 - with non-trailer lines mixed with a non-configured trailer
-
-expecting success: 
-	cat >patch <<-\EOF &&
-
-		I-am-not-configured: x
-		I-am-also-not-configured: x
-	EOF
-	cat >expected <<-\EOF &&
-
-		I-am-not-configured: x
-		I-am-also-not-configured: x
-		token: value
-	EOF
-	test_config trailer.my.key "My-trailer: " &&
-	git interpret-trailers --trailer "token: value" patch >actual &&
-	test_cmp expected actual
-
-ok 12 - with all non-configured trailers
-
-expecting success: 
-	cat >patch <<-\EOF &&
-
-		this is not a trailer
-	EOF
-	cat >expected <<-\EOF &&
-
-		this is not a trailer
-
-		token: value
-	EOF
-	git interpret-trailers --trailer "token: value" patch >actual &&
-	test_cmp expected actual
-
-ok 13 - with non-trailer lines only
-
-expecting success: 
-	q_to_tab >patch <<-\EOF &&
-
-		Qtoken: value
-	EOF
-	q_to_tab >expected <<-\EOF &&
-
-		Qtoken: value
-
-		token: value
-	EOF
-	git interpret-trailers --trailer "token: value" patch >actual &&
-	test_cmp expected actual
-
-ok 14 - line with leading whitespace is not trailer
-
-expecting success: 
-	q_to_tab >patch <<-\EOF &&
-
-		Signed-off-by: a <a@example.com>
-		name: value on
-		Qmultiple lines
-		this is not a trailer
-		this is not a trailer
-		this is not a trailer
-		this is not a trailer
-		this is not a trailer
-		this is not a trailer
-	EOF
-	q_to_tab >expected <<-\EOF &&
-
-		Signed-off-by: a <a@example.com>
-		name: value on
-		Qmultiple lines
-		this is not a trailer
-		this is not a trailer
-		this is not a trailer
-		this is not a trailer
-		this is not a trailer
-		this is not a trailer
-		name: value
-	EOF
-	git interpret-trailers --trailer "name: value" patch >actual &&
-	test_cmp expected actual
-
-ok 15 - multiline field treated as one trailer for 25% check
-
-expecting success: 
-	q_to_tab >patch <<-\EOF &&
-
-		another: trailer
-		name: value on
-		Qmultiple lines
-		another: trailer
-	EOF
-	q_to_tab >expected <<-\EOF &&
-
-		another: trailer
-		name: value on
-		Qmultiple lines
-		name: value
-		another: trailer
-	EOF
-	test_config trailer.name.where after &&
-	git interpret-trailers --trailer "name: value" patch >actual &&
-	test_cmp expected actual
-
-ok 16 - multiline field treated as atomic for placement
-
-expecting success: 
-	q_to_tab >patch <<-\EOF &&
-
-		another: trailer
-		name: value on
-		Qmultiple lines
-		another: trailer
-	EOF
-	q_to_tab >expected <<-\EOF &&
-
-		another: trailer
-		another: trailer
-		name: value
-	EOF
-	test_config trailer.name.ifexists replace &&
-	git interpret-trailers --trailer "name: value" patch >actual &&
-	test_cmp expected actual
-
-ok 17 - multiline field treated as atomic for replacement
-
-expecting success: 
-	q_to_tab >patch <<-\EOF &&
-
-		another: trailer
-		name: first line
-		Qsecond line
-		another: trailer
-	EOF
-	test_config trailer.name.ifexists addIfDifferent &&
-
-	q_to_tab >trailer <<-\EOF &&
-		name: first line
-		Qsecond line
-	EOF
-	q_to_tab >expected <<-\EOF &&
-
-		another: trailer
-		name: first line
-		Qsecond line
-		another: trailer
-	EOF
-	git interpret-trailers --trailer "$(cat trailer)" patch >actual &&
-	test_cmp expected actual &&
-
-	q_to_tab >trailer <<-\EOF &&
-		name: first line
-		QQQQQsecond line
-	EOF
-	q_to_tab >expected <<-\EOF &&
-
-		another: trailer
-		name: first line
-		Qsecond line
-		another: trailer
-		name: first line
-		QQQQQsecond line
-	EOF
-	git interpret-trailers --trailer "$(cat trailer)" patch >actual &&
-	test_cmp expected actual &&
-
-	q_to_tab >trailer <<-\EOF &&
-		name: first line *DIFFERENT*
-		Qsecond line
-	EOF
-	q_to_tab >expected <<-\EOF &&
-
-		another: trailer
-		name: first line
-		Qsecond line
-		another: trailer
-		name: first line *DIFFERENT*
-		Qsecond line
-	EOF
-	git interpret-trailers --trailer "$(cat trailer)" patch >actual &&
-	test_cmp expected actual
-
-ok 18 - multiline field treated as atomic for difference check
-
-expecting success: 
-	q_to_tab >patch <<-\EOF &&
-
-		another: trailer
-		name: first line
-		Qsecond line
-		another: trailer
-	EOF
-	test_config trailer.name.where after &&
-	test_config trailer.name.ifexists addIfDifferentNeighbor &&
-
-	q_to_tab >trailer <<-\EOF &&
-		name: first line
-		Qsecond line
-	EOF
-	q_to_tab >expected <<-\EOF &&
-
-		another: trailer
-		name: first line
-		Qsecond line
-		another: trailer
-	EOF
-	git interpret-trailers --trailer "$(cat trailer)" patch >actual &&
-	test_cmp expected actual &&
-
-	q_to_tab >trailer <<-\EOF &&
-		name: first line
-		QQQQQsecond line
-	EOF
-	q_to_tab >expected <<-\EOF &&
-
-		another: trailer
-		name: first line
-		Qsecond line
-		name: first line
-		QQQQQsecond line
-		another: trailer
-	EOF
-	git interpret-trailers --trailer "$(cat trailer)" patch >actual &&
-	test_cmp expected actual
-
-ok 19 - multiline field treated as atomic for neighbor check
-
-expecting success: 
-	git config trailer.ack.key "Acked-by: " &&
-	cat >expected <<-\EOF &&
-
-		Acked-by: Peff
-	EOF
-	git interpret-trailers --trim-empty --trailer "ack = Peff" empty >actual &&
-	test_cmp expected actual &&
-	git interpret-trailers --trim-empty --trailer "Acked-by = Peff" empty >actual &&
-	test_cmp expected actual &&
-	git interpret-trailers --trim-empty --trailer "Acked-by :Peff" empty >actual &&
-	test_cmp expected actual
-
-ok 20 - with config setup
-
-expecting success: 
-	git config trailer.separators ":=" &&
-	git config trailer.ack.key "Acked-by= " &&
-	cat >expected <<-\EOF &&
-
-		Acked-by= Peff
-	EOF
-	git interpret-trailers --trim-empty --trailer "ack = Peff" empty >actual &&
-	test_cmp expected actual &&
-	git interpret-trailers --trim-empty --trailer "Acked-by= Peff" empty >actual &&
-	test_cmp expected actual &&
-	git interpret-trailers --trim-empty --trailer "Acked-by : Peff" empty >actual &&
-	test_cmp expected actual
-
-ok 21 - with config setup and ":=" as separators
-
-expecting success: 
-	git config trailer.separators "%" &&
-	cat >expected <<-\EOF &&
-
-		bug% 42
-		count% 10
-		bug% 422
-	EOF
-	git interpret-trailers --trim-empty --trailer "bug = 42" \
-		--trailer count%10 --trailer "test: stuff" \
-		--trailer "bug % 422" empty >actual &&
-	test_cmp expected actual
-
-ok 22 - with config setup and "%" as separators
-
-expecting success: 
-	cat >special_message <<-\EOF &&
-		Special Message
-
-		bug% 42
-		count% 10
-		bug% 422
-	EOF
-	cat >expected <<-\EOF &&
-		Special Message
-
-		bug% 42
-		count% 10
-		bug% 422
-		count% 100
-	EOF
-	git interpret-trailers --trailer count%100 \
-		special_message >actual &&
-	test_cmp expected actual
-
-ok 23 - with "%" as separators and a message with trailers
-
-expecting success: 
-	git config trailer.separators ":=#" &&
-	git config trailer.bug.key "Bug #" &&
-	cat >expected <<-\EOF &&
-
-		Bug #42
-	EOF
-	git interpret-trailers --trim-empty --trailer "bug = 42" empty >actual &&
-	test_cmp expected actual
-
-ok 24 - with config setup and ":=#" as separators
-
-expecting success: 
-	cat basic_message >expected &&
-	echo >>expected &&
-	git interpret-trailers <basic_message >actual &&
-	test_cmp expected actual
-
-ok 25 - with commit basic message
-
-expecting success: 
-	cat basic_message >input &&
-	cat basic_patch >>input &&
-	cat basic_message >expected &&
-	echo >>expected &&
-	cat basic_patch >>expected &&
-	git interpret-trailers <input >actual &&
-	test_cmp expected actual
-
-ok 26 - with basic patch
-
-expecting success: 
-	cat complex_message_body complex_message_trailers >complex_message &&
-	cat complex_message_body >expected &&
-	sed -e "s/ Z\$/ /" >>expected <<-\EOF &&
-		Fixes: Z
-		Acked-by= Z
-		Reviewed-by: Z
-		Signed-off-by: Z
-	EOF
-	git interpret-trailers complex_message >actual &&
-	test_cmp expected actual
-
-ok 27 - with commit complex message as argument
-
-expecting success: 
-	cat basic_message >>expected &&
-	echo >>expected &&
-	cat basic_patch >>expected &&
-	git interpret-trailers complex_message input >actual &&
-	test_cmp expected actual
-
-ok 28 - with 2 files arguments
-
-expecting success: 
-	cat basic_message >message_with_comments &&
-	sed -e "s/ Z\$/ /" >>message_with_comments <<-\EOF &&
-		# comment
-
-		# other comment
-		Cc: Z
-		# yet another comment
-		Reviewed-by: Johan
-		Reviewed-by: Z
-		# last comment
-
-	EOF
-	cat basic_patch >>message_with_comments &&
-	cat basic_message >expected &&
-	cat >>expected <<-\EOF &&
-		# comment
-
-		Reviewed-by: Johan
-		Cc: Peff
-		# last comment
-
-	EOF
-	cat basic_patch >>expected &&
-	git interpret-trailers --trim-empty --trailer "Cc: Peff" message_with_comments >actual &&
-	test_cmp expected actual
-
-ok 29 - with message that has comments
-
-expecting success: 
-	cat basic_message >message_with_comments &&
-	sed -e "s/ Z\$/ /" >>message_with_comments <<-\EOF &&
-		# comment
-
-		# other comment
-		Cc: Z
-		# yet another comment
-		Reviewed-by: Johan
-		Reviewed-by: Z
-		# last comment
-
-		Conflicts:
-
-	EOF
-	cat basic_message >expected &&
-	cat >>expected <<-\EOF &&
-		# comment
-
-		Reviewed-by: Johan
-		Cc: Peff
-		# last comment
-
-		Conflicts:
-
-	EOF
-	git interpret-trailers --trim-empty --trailer "Cc: Peff" message_with_comments >actual &&
-	test_cmp expected actual
-
-ok 30 - with message that has an old style conflict block
-
-expecting success: 
-	cat complex_message_body >expected &&
-	sed -e "s/ Z\$/ /" >>expected <<-\EOF &&
-		Fixes: Z
-		Acked-by= Z
-		Reviewed-by: Z
-		Signed-off-by: Z
-		Acked-by= Peff
-		Bug #42
-	EOF
-	git interpret-trailers --trailer "ack: Peff" \
-		--trailer "bug: 42" <complex_message >actual &&
-	test_cmp expected actual
-
-ok 31 - with commit complex message and trailer args
-
-expecting success: 
-	cat complex_message >complex_patch &&
-	cat basic_patch >>complex_patch &&
-	cat complex_message_body >expected &&
-	cat >>expected <<-\EOF &&
-		Acked-by= Peff
-		Bug #42
-	EOF
-	cat basic_patch >>expected &&
-	git interpret-trailers --trim-empty --trailer "ack: Peff" \
-		--trailer "bug: 42" <complex_patch >actual &&
-	test_cmp expected actual
-
-ok 32 - with complex patch, args and --trim-empty
-
-expecting success: 
-	cat basic_message >message &&
-	cat basic_patch >>message &&
-	cat basic_message >expected &&
-	echo >>expected &&
-	cat basic_patch >>expected &&
-	git interpret-trailers --in-place message &&
-	test_cmp expected message
-
-ok 33 - in-place editing with basic patch
-
-expecting success: 
-	cat basic_message >message &&
-	cat basic_patch >>message &&
-	cat basic_message >expected &&
-	echo >>expected &&
-	cat >>expected <<-\EOF &&
-		Reviewed-by: Alice
-	EOF
-	cat basic_patch >>expected &&
-	git interpret-trailers --trailer "Reviewed-by: Alice" --in-place message &&
-	test_cmp expected message
-
-ok 34 - in-place editing with additional trailer
-
-expecting success: 
-	test_must_fail git interpret-trailers --trailer "Reviewed-by: Alice" --in-place < basic_message
-
-fatal: no input file given for in-place editing
-ok 35 - in-place editing on stdin disallowed
-
-expecting success: 
-	test_must_fail git interpret-trailers --trailer "Reviewed-by: Alice" --in-place nonexisting &&
-	test_path_is_missing nonexisting
-
-fatal: could not read input file 'nonexisting': No such file or directory
-ok 36 - in-place editing on non-existing file
-
-checking prerequisite: SANITY
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
-	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: 
-	cat basic_message >message &&
-	chmod -r message &&
-	test_must_fail git interpret-trailers --trailer "Reviewed-by: Alice" --in-place message &&
-	chmod +r message &&
-	test_cmp message basic_message
-
-fatal: could not read input file 'message': Permission denied
-ok 37 - in-place editing doesn't clobber original file on error
-
-expecting success: 
-	git config trailer.bug.where "before" &&
-	cat complex_message_body >expected &&
-	sed -e "s/ Z\$/ /" >>expected <<-\EOF &&
-		Bug #42
-		Fixes: Z
-		Acked-by= Z
-		Reviewed-by: Z
-		Signed-off-by: Z
-		Acked-by= Peff
-	EOF
-	git interpret-trailers --trailer "ack: Peff" \
-		--trailer "bug: 42" complex_message >actual &&
-	test_cmp expected actual
-
-ok 38 - using "where = before"
-
-expecting success: 
-	git config trailer.ack.where "before" &&
-	cat complex_message_body >expected &&
-	sed -e "s/ Z\$/ /" >>expected <<-\EOF &&
-		Fixes: Z
-		Acked-by= Z
-		Acked-by= Peff
-		Reviewed-by: Z
-		Signed-off-by: Z
-	EOF
-	git interpret-trailers --where after --trailer "ack: Peff" \
-		complex_message >actual &&
-	test_cmp expected actual
-
-ok 39 - overriding configuration with "--where after"
-
-expecting success: 
-	cat complex_message_body >expected &&
-	sed -e "s/ Z\$/ /" >>expected <<-\EOF &&
-		Bug #42
-		Fixes: Z
-		Acked-by= Peff
-		Acked-by= Z
-		Reviewed-by: Z
-		Signed-off-by: Z
-	EOF
-	git interpret-trailers --where after --no-where --trailer "ack: Peff" \
-		--trailer "bug: 42" complex_message >actual &&
-	test_cmp expected actual
-
-ok 40 - using "where = before" with "--no-where"
-
-expecting success: 
-	git config trailer.ack.where "after" &&
-	cat complex_message_body >expected &&
-	sed -e "s/ Z\$/ /" >>expected <<-\EOF &&
-		Bug #42
-		Fixes: Z
-		Acked-by= Z
-		Acked-by= Peff
-		Reviewed-by: Z
-		Signed-off-by: Z
-	EOF
-	git interpret-trailers --trailer "ack: Peff" \
-		--trailer "bug: 42" complex_message >actual &&
-	test_cmp expected actual
-
-ok 41 - using "where = after"
-
-expecting success: 
-	git config trailer.review.key "Reviewed-by" &&
-	git config trailer.review.where "end" &&
-	cat complex_message_body >expected &&
-	sed -e "s/ Z\$/ /" >>expected <<-\EOF &&
-		Fixes: Z
-		Acked-by= Z
-		Acked-by= Peff
-		Reviewed-by: Z
-		Signed-off-by: Z
-		Reviewed-by: Junio
-		Reviewed-by: Johannes
-	EOF
-	git interpret-trailers --trailer "ack: Peff" \
-		--trailer "Reviewed-by: Junio" --trailer "Reviewed-by: Johannes" \
-		complex_message >actual &&
-	test_cmp expected actual
-
-ok 42 - using "where = end"
-
-expecting success: 
-	git config trailer.review.key "Reviewed-by" &&
-	git config trailer.review.where "start" &&
-	cat complex_message_body >expected &&
-	sed -e "s/ Z\$/ /" >>expected <<-\EOF &&
-		Reviewed-by: Johannes
-		Reviewed-by: Junio
-		Fixes: Z
-		Acked-by= Z
-		Acked-by= Peff
-		Reviewed-by: Z
-		Signed-off-by: Z
-	EOF
-	git interpret-trailers --trailer "ack: Peff" \
-		--trailer "Reviewed-by: Junio" --trailer "Reviewed-by: Johannes" \
-		complex_message >actual &&
-	test_cmp expected actual
-
-ok 43 - using "where = start"
-
-expecting success: 
-	git config trailer.review.key "Reviewed-by:" &&
-	git config trailer.review.where "before" &&
-	cat complex_message_body >expected &&
-	sed -e "s/ Z\$/ /" >>expected <<-\EOF &&
-		Bug #42
-		Fixes: Z
-		Acked-by= Z
-		Acked-by= Peff
-		Reviewed-by:Johan
-		Reviewed-by:
-		Signed-off-by: Z
-	EOF
-	git interpret-trailers --trailer "ack: Peff" --trailer "bug: 42" \
-		--trailer "review: Johan" <complex_message >actual &&
-	test_cmp expected actual
-
-ok 44 - using "where = before" for a token in the middle of the message
-
-expecting success: 
-	cat complex_message_body >expected &&
-	cat >>expected <<-\EOF &&
-		Bug #46
-		Bug #42
-		Acked-by= Peff
-		Reviewed-by:Johan
-	EOF
-	git interpret-trailers --trim-empty --trailer "ack: Peff" \
-		--trailer "bug: 42" --trailer "review: Johan" \
-		--trailer "Bug: 46" <complex_message >actual &&
-	test_cmp expected actual
-
-ok 45 - using "where = before" and --trim-empty
-
-expecting success: 
-	cat complex_message_body >expected &&
-	sed -e "s/ Z\$/ /" >>expected <<-\EOF &&
-		Bug #42
-		Fixes: Z
-		Acked-by= Z
-		Acked-by= Peff
-		Acked-by= Junio
-		Acked-by= Peff
-		Reviewed-by:
-		Signed-off-by: Z
-	EOF
-	git interpret-trailers --trailer "ack: Peff" --trailer "review:" \
-		--trailer "ack: Junio" --trailer "bug: 42" --trailer "ack: Peff" \
-		--trailer "ack: Peff" <complex_message >actual &&
-	test_cmp expected actual
-
-ok 46 - the default is "ifExists = addIfDifferentNeighbor"
-
-expecting success: 
-	git config trailer.ifexists "addIfDifferent" &&
-	cat complex_message_body >expected &&
-	sed -e "s/ Z\$/ /" >>expected <<-\EOF &&
-		Bug #42
-		Fixes: Z
-		Acked-by= Z
-		Acked-by= Peff
-		Acked-by= Junio
-		Reviewed-by:
-		Signed-off-by: Z
-	EOF
-	git interpret-trailers --trailer "ack: Peff" --trailer "review:" \
-		--trailer "ack: Junio" --trailer "bug: 42" --trailer "ack: Peff" \
-		--trailer "ack: Peff" <complex_message >actual &&
-	test_cmp expected actual
-
-ok 47 - default "ifExists" is now "addIfDifferent"
-
-expecting success: 
-	git config trailer.ack.ifExists "addIfDifferent" &&
-	git config trailer.ack.where "end" &&
-	cat complex_message_body >expected &&
-	sed -e "s/ Z\$/ /" >>expected <<-\EOF &&
-		Bug #42
-		Fixes: Z
-		Acked-by= Z
-		Reviewed-by:
-		Signed-off-by: Z
-		Acked-by= Peff
-	EOF
-	git interpret-trailers --trailer "ack: Peff" --trailer "review:" \
-		--trailer "bug: 42" --trailer "ack: Peff" \
-		<complex_message >actual &&
-	test_cmp expected actual
-
-ok 48 - using "ifExists = addIfDifferent" with "where = end"
-
-expecting success: 
-	git config trailer.ack.ifExists "addIfDifferent" &&
-	git config trailer.ack.where "before" &&
-	cat complex_message_body >expected &&
-	sed -e "s/ Z\$/ /" >>expected <<-\EOF &&
-		Bug #42
-		Fixes: Z
-		Acked-by= Peff
-		Acked-by= Z
-		Reviewed-by:
-		Signed-off-by: Z
-	EOF
-	git interpret-trailers --trailer "ack: Peff" --trailer "review:" \
-		--trailer "bug: 42" --trailer "ack: Peff" \
-		<complex_message >actual &&
-	test_cmp expected actual
-
-ok 49 - using "ifExists = addIfDifferent" with "where = before"
-
-expecting success: 
-	git config trailer.ack.ifExists "addIfDifferentNeighbor" &&
-	git config trailer.ack.where "end" &&
-	cat complex_message_body >expected &&
-	sed -e "s/ Z\$/ /" >>expected <<-\EOF &&
-		Bug #42
-		Fixes: Z
-		Acked-by= Z
-		Reviewed-by:
-		Signed-off-by: Z
-		Acked-by= Peff
-		Acked-by= Junio
-		Tested-by: Jakub
-		Acked-by= Junio
-		Acked-by= Peff
-	EOF
-	git interpret-trailers --trailer "ack: Peff" --trailer "review:" \
-		--trailer "ack: Junio" --trailer "bug: 42" \
-		--trailer "Tested-by: Jakub" --trailer "ack: Junio" \
-		--trailer "ack: Junio" --trailer "ack: Peff" <complex_message >actual &&
-	test_cmp expected actual
-
-ok 50 - using "ifExists = addIfDifferentNeighbor" with "where = end"
-
-expecting success: 
-	git config trailer.ack.ifExists "addIfDifferentNeighbor" &&
-	git config trailer.ack.where "after" &&
-	cat complex_message_body >expected &&
-	sed -e "s/ Z\$/ /" >>expected <<-\EOF &&
-		Bug #42
-		Fixes: Z
-		Acked-by= Z
-		Acked-by= Peff
-		Acked-by= Junio
-		Acked-by= Peff
-		Reviewed-by:
-		Signed-off-by: Z
-		Tested-by: Jakub
-	EOF
-	git interpret-trailers --trailer "ack: Peff" --trailer "review:" \
-		--trailer "ack: Junio" --trailer "bug: 42" \
-		--trailer "Tested-by: Jakub" --trailer "ack: Junio" \
-		--trailer "ack: Junio" --trailer "ack: Peff" <complex_message >actual &&
-	test_cmp expected actual
-
-ok 51 - using "ifExists = addIfDifferentNeighbor"  with "where = after"
-
-expecting success: 
-	git config trailer.ack.ifExists "addIfDifferentNeighbor" &&
-	cat complex_message_body >expected &&
-	cat >>expected <<-\EOF &&
-		Bug #42
-		Acked-by= Peff
-		Acked-by= Junio
-		Acked-by= Peff
-	EOF
-	git interpret-trailers --trim-empty --trailer "ack: Peff" \
-		--trailer "Acked-by= Peff" --trailer "review:" \
-		--trailer "ack: Junio" --trailer "bug: 42" \
-		--trailer "ack: Peff" <complex_message >actual &&
-	test_cmp expected actual
-
-ok 52 - using "ifExists = addIfDifferentNeighbor" and --trim-empty
-
-expecting success: 
-	git config trailer.ack.ifExists "add" &&
-	git config trailer.ack.where "end" &&
-	cat complex_message_body >expected &&
-	sed -e "s/ Z\$/ /" >>expected <<-\EOF &&
-		Bug #42
-		Fixes: Z
-		Acked-by= Z
-		Reviewed-by:
-		Signed-off-by: Z
-		Acked-by= Peff
-		Acked-by= Peff
-		Tested-by: Jakub
-		Acked-by= Junio
-		Tested-by: Johannes
-		Acked-by= Peff
-	EOF
-	git interpret-trailers --trailer "ack: Peff" \
-		--trailer "Acked-by= Peff" --trailer "review:" \
-		--trailer "Tested-by: Jakub" --trailer "ack: Junio" \
-		--trailer "bug: 42" --trailer "Tested-by: Johannes" \
-		--trailer "ack: Peff" <complex_message >actual &&
-	test_cmp expected actual
-
-ok 53 - using "ifExists = add" with "where = end"
-
-expecting success: 
-	git config trailer.ack.ifExists "add" &&
-	git config trailer.ack.where "after" &&
-	cat complex_message_body >expected &&
-	sed -e "s/ Z\$/ /" >>expected <<-\EOF &&
-		Bug #42
-		Fixes: Z
-		Acked-by= Z
-		Acked-by= Peff
-		Acked-by= Peff
-		Acked-by= Junio
-		Acked-by= Peff
-		Reviewed-by:
-		Signed-off-by: Z
-	EOF
-	git interpret-trailers --trailer "ack: Peff" \
-		--trailer "Acked-by= Peff" --trailer "review:" \
-		--trailer "ack: Junio" --trailer "bug: 42" \
-		--trailer "ack: Peff" <complex_message >actual &&
-	test_cmp expected actual
-
-ok 54 - using "ifExists = add" with "where = after"
-
-expecting success: 
-	git config trailer.fix.key "Fixes: " &&
-	git config trailer.fix.ifExists "add" &&
-	cat complex_message_body >expected &&
-	sed -e "s/ Z\$/ /" >>expected <<-\EOF &&
-		Bug #42
-		Acked-by= Z
-		Reviewed-by:
-		Signed-off-by: Z
-		Fixes: 22
-	EOF
-	git interpret-trailers --if-exists replace --trailer "review:" \
-		--trailer "fix=53" --trailer "fix=22" --trailer "bug: 42" \
-		<complex_message >actual &&
-	test_cmp expected actual
-
-ok 55 - overriding configuration with "--if-exists replace"
-
-expecting success: 
-	git config trailer.fix.key "Fixes: " &&
-	git config trailer.fix.ifExists "replace" &&
-	cat complex_message_body >expected &&
-	sed -e "s/ Z\$/ /" >>expected <<-\EOF &&
-		Bug #42
-		Acked-by= Z
-		Acked-by= Junio
-		Acked-by= Peff
-		Reviewed-by:
-		Signed-off-by: Z
-		Fixes: 22
-	EOF
-	git interpret-trailers --trailer "review:" \
-		--trailer "fix=53" --trailer "ack: Junio" --trailer "fix=22" \
-		--trailer "bug: 42" --trailer "ack: Peff" \
-		<complex_message >actual &&
-	test_cmp expected actual
-
-ok 56 - using "ifExists = replace"
-
-expecting success: 
-	git config trailer.fix.where "after" &&
-	cat complex_message_body >expected &&
-	sed -e "s/ Z\$/ /" >>expected <<-\EOF &&
-		Bug #42
-		Fixes: 22
-		Acked-by= Z
-		Acked-by= Junio
-		Acked-by= Peff
-		Reviewed-by:
-		Signed-off-by: Z
-	EOF
-	git interpret-trailers --trailer "review:" \
-		--trailer "fix=53" --trailer "ack: Junio" --trailer "fix=22" \
-		--trailer "bug: 42" --trailer "ack: Peff" \
-		<complex_message >actual &&
-	test_cmp expected actual
-
-ok 57 - using "ifExists = replace" with "where = after"
-
-expecting success: 
-	git config trailer.fix.ifExists "doNothing" &&
-	cat complex_message_body >expected &&
-	sed -e "s/ Z\$/ /" >>expected <<-\EOF &&
-		Bug #42
-		Fixes: Z
-		Acked-by= Z
-		Acked-by= Junio
-		Acked-by= Peff
-		Reviewed-by:
-		Signed-off-by: Z
-	EOF
-	git interpret-trailers --trailer "review:" --trailer "fix=53" \
-		--trailer "ack: Junio" --trailer "fix=22" \
-		--trailer "bug: 42" --trailer "ack: Peff" \
-		<complex_message >actual &&
-	test_cmp expected actual
-
-ok 58 - using "ifExists = doNothing"
-
-expecting success: 
-	git config trailer.cc.key "Cc: " &&
-	git config trailer.cc.where "before" &&
-	cat complex_message_body >expected &&
-	sed -e "s/ Z\$/ /" >>expected <<-\EOF &&
-		Bug #42
-		Cc: Linus
-		Fixes: Z
-		Acked-by= Z
-		Acked-by= Junio
-		Acked-by= Peff
-		Reviewed-by:
-		Signed-off-by: Z
-	EOF
-	git interpret-trailers --trailer "review:" --trailer "fix=53" \
-		--trailer "cc=Linus" --trailer "ack: Junio" \
-		--trailer "fix=22" --trailer "bug: 42" --trailer "ack: Peff" \
-		<complex_message >actual &&
-	test_cmp expected actual
-
-ok 59 - the default is "ifMissing = add"
-
-expecting success: 
-	git config trailer.ifmissing "add" &&
-	cat complex_message_body >expected &&
-	sed -e "s/ Z\$/ /" >>expected <<-\EOF &&
-		Fixes: Z
-		Acked-by= Z
-		Acked-by= Junio
-		Acked-by= Peff
-		Reviewed-by:
-		Signed-off-by: Z
-	EOF
-	git interpret-trailers --if-missing doNothing \
-		--trailer "review:" --trailer "fix=53" \
-		--trailer "cc=Linus" --trailer "ack: Junio" \
-		--trailer "fix=22" --trailer "bug: 42" --trailer "ack: Peff" \
-		<complex_message >actual &&
-	test_cmp expected actual
-
-ok 60 - overriding configuration with "--if-missing doNothing"
-
-expecting success: 
-	git config trailer.ifmissing "doNothing" &&
-	cat complex_message_body >expected &&
-	sed -e "s/ Z\$/ /" >>expected <<-\EOF &&
-		Fixes: Z
-		Acked-by= Z
-		Acked-by= Junio
-		Acked-by= Peff
-		Reviewed-by:
-		Signed-off-by: Z
-	EOF
-	git interpret-trailers --trailer "review:" --trailer "fix=53" \
-		--trailer "cc=Linus" --trailer "ack: Junio" \
-		--trailer "fix=22" --trailer "bug: 42" --trailer "ack: Peff" \
-		<complex_message >actual &&
-	test_cmp expected actual &&
-	git config trailer.ifmissing "add"
-
-ok 61 - when default "ifMissing" is "doNothing"
-
-expecting success: 
-	git config trailer.cc.key "Cc: " &&
-	git config trailer.cc.where "end" &&
-	git config trailer.cc.ifMissing "add" &&
-	cat complex_message_body >expected &&
-	sed -e "s/ Z\$/ /" >>expected <<-\EOF &&
-		Bug #42
-		Fixes: Z
-		Acked-by= Z
-		Acked-by= Junio
-		Acked-by= Peff
-		Reviewed-by:
-		Signed-off-by: Z
-		Cc: Linus
-	EOF
-	git interpret-trailers --trailer "review:" --trailer "fix=53" \
-		--trailer "ack: Junio" --trailer "fix=22" \
-		--trailer "bug: 42" --trailer "cc=Linus" --trailer "ack: Peff" \
-		<complex_message >actual &&
-	test_cmp expected actual
-
-ok 62 - using "ifMissing = add" with "where = end"
-
-expecting success: 
-	git config trailer.cc.key "Cc: " &&
-	git config trailer.cc.where "before" &&
-	git config trailer.cc.ifMissing "add" &&
-	cat complex_message_body >expected &&
-	sed -e "s/ Z\$/ /" >>expected <<-\EOF &&
-		Cc: Linus
-		Bug #42
-		Fixes: Z
-		Acked-by= Z
-		Acked-by= Junio
-		Acked-by= Peff
-		Reviewed-by:
-		Signed-off-by: Z
-	EOF
-	git interpret-trailers --trailer "review:" --trailer "fix=53" \
-		--trailer "ack: Junio" --trailer "fix=22" \
-		--trailer "bug: 42" --trailer "cc=Linus" --trailer "ack: Peff" \
-		<complex_message >actual &&
-	test_cmp expected actual
-
-ok 63 - using "ifMissing = add" with "where = before"
-
-expecting success: 
-	git config trailer.cc.ifMissing "doNothing" &&
-	cat complex_message_body >expected &&
-	sed -e "s/ Z\$/ /" >>expected <<-\EOF &&
-		Bug #42
-		Fixes: Z
-		Acked-by= Z
-		Acked-by= Junio
-		Acked-by= Peff
-		Reviewed-by:
-		Signed-off-by: Z
-	EOF
-	git interpret-trailers --trailer "review:" --trailer "fix=53" \
-		--trailer "cc=Linus" --trailer "ack: Junio" \
-		--trailer "fix=22" --trailer "bug: 42" --trailer "ack: Peff" \
-		<complex_message >actual &&
-	test_cmp expected actual
-
-ok 64 - using "ifMissing = doNothing"
-
-expecting success: 
-	git config trailer.where "after" &&
-	git config --unset trailer.ack.where &&
-	cat complex_message_body >expected &&
-	sed -e "s/ Z\$/ /" >>expected <<-\EOF &&
-		Bug #42
-		Fixes: Z
-		Acked-by= Z
-		Acked-by= Peff
-		Acked-by= Peff
-		Acked-by= Junio
-		Acked-by= Peff
-		Reviewed-by:
-		Signed-off-by: Z
-		Tested-by: Jakub
-		Tested-by: Johannes
-	EOF
-	git interpret-trailers --trailer "ack: Peff" \
-		--trailer "Acked-by= Peff" --trailer "review:" \
-		--trailer "Tested-by: Jakub" --trailer "ack: Junio" \
-		--trailer "bug: 42" --trailer "Tested-by: Johannes" \
-		--trailer "ack: Peff" <complex_message >actual &&
-	test_cmp expected actual
-
-ok 65 - default "where" is now "after"
-
-expecting success: 
-	git config trailer.sign.key "Signed-off-by: " &&
-	git config trailer.sign.where "after" &&
-	git config trailer.sign.ifExists "addIfDifferentNeighbor" &&
-	git config trailer.sign.command "echo \"A U Thor <author@example.com>\"" &&
-	cat complex_message_body >expected &&
-	sed -e "s/ Z\$/ /" >>expected <<-\EOF &&
-		Fixes: Z
-		Acked-by= Z
-		Reviewed-by:
-		Signed-off-by: Z
-		Signed-off-by: A U Thor <author@example.com>
-	EOF
-	git interpret-trailers --trailer "review:" --trailer "fix=22" \
-		<complex_message >actual &&
-	test_cmp expected actual
-
-ok 66 - with simple command
-
-expecting success: 
-	git config trailer.sign.ifExists "addIfDifferent" &&
-	git config trailer.sign.command "echo \"\$GIT_COMMITTER_NAME <\$GIT_COMMITTER_EMAIL>\"" &&
-	cat complex_message_body >expected &&
-	sed -e "s/ Z\$/ /" >>expected <<-\EOF &&
-		Fixes: Z
-		Acked-by= Z
-		Reviewed-by:
-		Signed-off-by: Z
-		Signed-off-by: C O Mitter <committer@example.com>
-	EOF
-	git interpret-trailers --trailer "review:" --trailer "fix=22" \
-		<complex_message >actual &&
-	test_cmp expected actual
-
-ok 67 - with command using commiter information
-
-expecting success: 
-	git config trailer.sign.key "Signed-off-by: " &&
-	git config trailer.sign.where "after" &&
-	git config trailer.sign.ifExists "addIfDifferentNeighbor" &&
-	git config trailer.sign.command "echo \"\$GIT_AUTHOR_NAME <\$GIT_AUTHOR_EMAIL>\"" &&
-	cat complex_message_body >expected &&
-	sed -e "s/ Z\$/ /" >>expected <<-\EOF &&
-		Fixes: Z
-		Acked-by= Z
-		Reviewed-by:
-		Signed-off-by: Z
-		Signed-off-by: A U Thor <author@example.com>
-	EOF
-	git interpret-trailers --trailer "review:" --trailer "fix=22" \
-		<complex_message >actual &&
-	test_cmp expected actual
-
-ok 68 - with command using author information
-
-expecting success: 
-	echo "Content of the first commit." > a.txt &&
-	git add a.txt &&
-	git commit -m "Add file a.txt"
-
-[master (root-commit) b2ddc81] Add file a.txt
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 a.txt
-ok 69 - setup a commit
-
-expecting success: 
-	git config trailer.fix.ifExists "replace" &&
-	git config trailer.fix.command "git log -1 --oneline --format=\"%h (%s)\" --abbrev-commit --abbrev=14 \$ARG" &&
-	FIXED=$(git log -1 --oneline --format="%h (%s)" --abbrev-commit --abbrev=14 HEAD) &&
-	cat complex_message_body >expected &&
-	sed -e "s/ Z\$/ /" >>expected <<-EOF &&
-		Fixes: $FIXED
-		Acked-by= Z
-		Reviewed-by:
-		Signed-off-by: Z
-		Signed-off-by: A U Thor <author@example.com>
-	EOF
-	git interpret-trailers --trailer "review:" --trailer "fix=HEAD" \
-		<complex_message >actual &&
-	test_cmp expected actual
-
-ok 70 - with command using $ARG
-
-expecting success: 
-	git config trailer.fix.ifExists "replace" &&
-	git config trailer.fix.command "false \$ARG" &&
-	cat complex_message_body >expected &&
-	sed -e "s/ Z\$/ /" >>expected <<-EOF &&
-		Fixes: Z
-		Acked-by= Z
-		Reviewed-by:
-		Signed-off-by: Z
-		Signed-off-by: A U Thor <author@example.com>
-	EOF
-	git interpret-trailers --trailer "review:" --trailer "fix=HEAD" \
-		<complex_message >actual &&
-	test_cmp expected actual
-
-error: running trailer command 'false ' failed
-error: running trailer command 'false HEAD' failed
-ok 71 - with failing command using $ARG
-
-expecting success: 
-	git config --unset trailer.fix.command &&
-	cat >expected <<-EOF &&
-
-		Signed-off-by: A U Thor <author@example.com>
-	EOF
-	git interpret-trailers --trailer ":" --trailer ":test" >actual <<-EOF &&
-	EOF
-	test_cmp expected actual
-
-error: empty trailer token in trailer ':'
-error: empty trailer token in trailer ':test'
-ok 72 - with empty tokens
-
-expecting success: 
-	git config --unset trailer.sign.key &&
-	cat >expected <<-EOF &&
-
-		sign: A U Thor <author@example.com>
-	EOF
-	git interpret-trailers >actual <<-EOF &&
-	EOF
-	test_cmp expected actual
-
-ok 73 - with command but no key
-
-expecting success: 
-	git config --unset trailer.review.key &&
-	cat >expected <<-EOF &&
-
-		review: Junio
-		sign: A U Thor <author@example.com>
-	EOF
-	git interpret-trailers --trailer "review:Junio" >actual <<-EOF &&
-	EOF
-	test_cmp expected actual
-
-ok 74 - with no command and no key
-
-expecting success: 
-	cat >expected <<-\EOF &&
-		my subject
-
-		review: Brian
-		sign: A U Thor <author@example.com>
-		# ------------------------ >8 ------------------------
-		ignore this
-	EOF
-	git interpret-trailers --trailer review:Brian >actual <<-\EOF &&
-		my subject
-		# ------------------------ >8 ------------------------
-		ignore this
-	EOF
-	test_cmp expected actual
-
-ok 75 - with cut line
-
-expecting success: 
-	git config trailer.sign.command "echo config-value" &&
-	cat >expected <<-\EOF &&
-		existing: existing-value
-		sign: config-value
-		added: added-value
-	EOF
-	git interpret-trailers \
-		--trailer added:added-value \
-		--only-trailers >actual <<-\EOF &&
-		my subject
-
-		my body
-
-		existing: existing-value
-	EOF
-	test_cmp expected actual
-
-ok 76 - only trailers
-
-expecting success: 
-	git config trailer.sign.command "echo config-value" &&
-	cat >expected <<-\EOF &&
-		Signed-off-by: nobody <nobody@nowhere>
-		Signed-off-by: somebody <somebody@somewhere>
-		sign: config-value
-	EOF
-	git interpret-trailers --only-trailers >actual <<-\EOF &&
-		subject
-
-		it is important that the trailers below are signed-off-by
-		so that they meet the "25% trailers Git knows about" heuristic
-
-		Signed-off-by: nobody <nobody@nowhere>
-		this is not a trailer
-		Signed-off-by: somebody <somebody@somewhere>
-	EOF
-	test_cmp expected actual
-
-ok 77 - only-trailers omits non-trailer in middle of block
-
-expecting success: 
-	git config trailer.sign.command "echo config-value" &&
-	cat >expected <<-\EOF &&
-		existing: existing-value
-	EOF
-	git interpret-trailers \
-		--only-trailers --only-input >actual <<-\EOF &&
-		my subject
-
-		my body
-
-		existing: existing-value
-	EOF
-	test_cmp expected actual
-
-ok 78 - only input
-
-expecting success: 
-	cat >expected <<-\EOF &&
-		foo: continued across several lines
-	EOF
-	# pass through tr to make leading and trailing whitespace more obvious
-	tr _ " " <<-\EOF |
-		my subject
-
-		my body
-
-		foo:_
-		__continued
-		___across
-		____several
-		_____lines
-		___
-	EOF
-	git interpret-trailers --only-trailers --only-input --unfold >actual &&
-	test_cmp expected actual
-
-ok 79 - unfold
-
-expecting success: 
-	echo "real-trailer: just right" >expected &&
-
-	git interpret-trailers --parse >actual <<-\EOF &&
-	subject
-
-	body
-
-	not-a-trailer: too soon
-	------ this is just a line in the commit message with a bunch of
-	------ dashes; it does not have any syntactic meaning.
-
-	real-trailer: just right
-	---
-	below the dashed line may be a patch, etc.
-
-	not-a-trailer: too late
-	EOF
-
-	test_cmp expected actual
-
-ok 80 - handling of --- lines in input
-
-expecting success: 
-	echo "real-trailer: just right" >expected &&
-
-	git interpret-trailers --parse --no-divider >actual <<-\EOF &&
-	subject
-
-	This commit message has a "---" in it, but because we tell
-	interpret-trailers not to respect that, it has no effect.
-
-	not-a-trailer: too soon
-	---
-
-	This is still the commit message body.
-
-	real-trailer: just right
-	EOF
-
-	test_cmp expected actual
-
-ok 81 - suppress --- handling
-
-# passed all 81 test(s)
-1..81
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t7604-merge-custom-message.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7604-merge-custom-message/.git/
-expecting success: 
-	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) 8f4782c] c0
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c0.c
-[master 64c2707] c1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c1.c
-HEAD is now at 8f4782c c0
-[master 88dd079] c2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c2.c
-ok 1 - setup
-
-expecting success: 
-	git reset --hard c1 &&
-	git merge -m "$(cat exp.subject)" c2 &&
-	git cat-file commit HEAD | sed -e "1,/^$/d" >actual &&
-	test_cmp exp.subject actual
-
-HEAD is now at 64c2707 c1
-Merging:
-64c2707 c1
-virtual c2
-found 1 common ancestor:
-8f4782c c0
-Merge made by the 'recursive' strategy.
- c2.c | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 c2.c
-ok 2 - merge c2 with a custom message
-
-expecting success: 
-	git reset --hard c1 &&
-	git merge --log -m "$(cat exp.subject)" c2 &&
-	git cat-file commit HEAD | sed -e "1,/^$/d" >actual &&
-	test_cmp exp.log actual
-
-HEAD is now at 64c2707 c1
-Merging:
-64c2707 c1
-virtual c2
-found 1 common ancestor:
-8f4782c c0
-Merge made by the 'recursive' strategy.
- c2.c | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 c2.c
-ok 3 - merge --log appends to custom message
-
-# passed all 3 test(s)
-1..3
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t7517-per-repo-email.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7517-per-repo-email/.git/
-expecting success: 
-	# we want to make sure a reflog is written, since that needs
-	# a non-strict ident. So be sure we have an actual commit.
-	test_commit foo &&
-
-	sane_unset GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL &&
-	sane_unset GIT_COMMITTER_NAME GIT_COMMITTER_EMAIL &&
-	git config user.name "test" &&
-	git config --global user.useConfigOnly true
-
-[master (root-commit) ddd63c9] foo
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo.t
-ok 1 - setup a likely user.useConfigOnly use case
-
-expecting success: 
-	test_must_fail git commit --allow-empty -m msg
-
-
-*** Please tell me who you are.
-
-Run
-
-  git config --global user.email "you@example.com"
-  git config --global user.name "Your Name"
-
-to set your account's default identity.
-Omit --global to set the identity only in this repository.
-
-fatal: no email was given and auto-detection is disabled
-ok 2 - fails committing if clone email is not set
-
-expecting success: 
-	test_must_fail env EMAIL=test@fail.com git commit --allow-empty -m msg
-
-
-*** Please tell me who you are.
-
-Run
-
-  git config --global user.email "you@example.com"
-  git config --global user.name "Your Name"
-
-to set your account's default identity.
-Omit --global to set the identity only in this repository.
-
-fatal: no email was given and auto-detection is disabled
-ok 3 - fails committing if clone email is not set, but EMAIL set
-
-expecting success: 
-	test_config user.email "test@ok.com" &&
-	git commit --allow-empty -m msg
-
-[master f3d9b79] msg
-ok 4 - succeeds committing if clone email is set
-
-expecting success: 
-	git clone . clone
-
-Cloning into 'clone'...
-done.
-ok 5 - succeeds cloning if global email is not set
-
-expecting success: 
-	# temporarily enable an actual ident for this setup
-	test_config user.email foo@example.com &&
-	test_commit new &&
-	git branch side-without-commit HEAD^ &&
-	git checkout -b side-with-commit HEAD^ &&
-	test_commit side
-
-[master a31892e] new
- 1 file changed, 1 insertion(+)
- create mode 100644 new.t
-Switched to a new branch 'side-with-commit'
-[side-with-commit 1946d3f] side
- 1 file changed, 1 insertion(+)
- create mode 100644 side.t
-ok 6 - set up rebase scenarios
-
-expecting success: 
-	git checkout -B tmp side-without-commit &&
-	git rebase master
-
-Switched to a new branch 'tmp'
-First, rewinding head to replay your work on top of it...
-Fast-forwarded tmp to master.
-ok 7 - fast-forward rebase does not care about ident
-
-expecting success: 
-	test_when_finished "git rebase --abort || true" &&
-	git checkout -B tmp side-with-commit &&
-	test_must_fail git rebase master
-
-Reset branch 'tmp'
-First, rewinding head to replay your work on top of it...
-
-*** Please tell me who you are.
-
-Run
-
-  git config --global user.email "you@example.com"
-  git config --global user.name "Your Name"
-
-to set your account's default identity.
-Omit --global to set the identity only in this repository.
-
-fatal: no email was given and auto-detection is disabled
-fatal: No rebase in progress?
-ok 8 - non-fast-forward rebase refuses to write commits
-
-expecting success: 
-	git checkout -B tmp side-without-commit &&
-	git rebase -i master
-
-Previous HEAD position was a31892e new
-Switched to and reset branch 'tmp'
-Successfully rebased and updated refs/heads/tmp.
-ok 9 - fast-forward rebase does not care about ident (interactive)
-
-expecting success: 
-	test_when_finished "git rebase --abort || true" &&
-	git checkout -B tmp side-with-commit &&
-	test_must_fail git rebase -i master
-
-Reset branch 'tmp'
-Rebasing (1/1)
-*** Please tell me who you are.
-
-Run
-
-  git config --global user.email "you@example.com"
-  git config --global user.name "Your Name"
-
-to set your account's default identity.
-Omit --global to set the identity only in this repository.
-
-fatal: no email was given and auto-detection is disabled
-ok 10 - non-fast-forward rebase refuses to write commits (interactive)
-
-expecting success: 
-	git checkout -B tmp side-with-commit &&
-	git rebase -i HEAD^
-
-Reset branch 'tmp'
-Successfully rebased and updated refs/heads/tmp.
-ok 11 - noop interactive rebase does not care about ident
-
-checking prerequisite: REBASE_P
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
-	test -z "$GIT_TEST_SKIP_REBASE_P"
-
-)
-prerequisite REBASE_P ok
-expecting success: 
-	git checkout -B tmp side-without-commit &&
-	git rebase -p master
-
-Reset branch 'tmp'
-Rebasing (1/1)
Successfully rebased and updated refs/heads/tmp.
-ok 12 - fast-forward rebase does not care about ident (preserve)
-
-expecting success: 
-	test_when_finished "git rebase --abort || true" &&
-	git checkout -B tmp side-with-commit &&
-	test_must_fail git rebase -p master
-
-Reset branch 'tmp'
-Rebasing (1/1)
-*** Please tell me who you are.
-
-Run
-
-  git config --global user.email "you@example.com"
-  git config --global user.name "Your Name"
-
-to set your account's default identity.
-Omit --global to set the identity only in this repository.
-
-fatal: no email was given and auto-detection is disabled
-Could not pick 1946d3f6183d588aeff6ac046ea536f53312b882
-ok 13 - non-fast-forward rebase refuses to write commits (preserve)
-
-# passed all 13 test(s)
-1..13
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t7605-merge-resolve.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7605-merge-resolve/.git/
-expecting success: 
-	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) 785c949] c0
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c0.c
-[master 79512a2] c1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c1.c
-HEAD is now at 785c949 c0
-[master e863dab] c2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c2.c
-HEAD is now at 785c949 c0
-[master 3f0a960] c3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c2.c
-ok 1 - setup
-
-expecting success: 
-	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 79512a2 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: 
-	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 79512a2 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: 
-	git reset --hard c2 &&
-	test_must_fail git merge -s resolve c3
-
-HEAD is now at e863dab 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/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t7606-merge-custom.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7606-merge-custom/.git/
-expecting success: 
-	cat >git-merge-theirs <<-EOF &&
-	#!$SHELL_PATH
-	eval git read-tree --reset -u \\\$\$#
-	EOF
-
-	chmod +x git-merge-theirs &&
-	PATH=.:$PATH &&
-	export PATH
-
-ok 1 - set up custom strategy
-
-expecting success: 
-	test_commit c0 c0.c &&
-	test_commit c1 c1.c &&
-	git reset --keep c0 &&
-	echo c1c1 >c1.c &&
-	git add c1.c &&
-	test_commit c2 c2.c &&
-	git reset --keep c0 &&
-	test_commit c3 c3.c
-
-[master (root-commit) 934056f] c0
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c0.c
-[master 7b51d7c] c1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c1.c
-[master f06910a] c2
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 c1.c
- create mode 100644 c2.c
-[master 934e277] c3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c3.c
-ok 2 - setup
-
-expecting success: 
-	git reset --hard c1 &&
-
-	git rev-parse c1 >head.old &&
-	git rev-parse c2 >second-parent.expected &&
-	git rev-parse c2^{tree} >tree.expected &&
-	git merge -s theirs c2 &&
-
-	git rev-parse HEAD >head.new &&
-	git rev-parse HEAD^1 >first-parent &&
-	git rev-parse HEAD^2 >second-parent &&
-	git rev-parse HEAD^{tree} >tree &&
-	git update-index --refresh &&
-	git diff --exit-code &&
-	git diff --exit-code c2 HEAD &&
-	git diff --exit-code c2 &&
-
-	! test_cmp head.old head.new &&
-	test_cmp head.old first-parent &&
-	test_cmp second-parent.expected second-parent &&
-	test_cmp tree.expected tree &&
-	test -f c0.c &&
-	grep c1c1 c1.c &&
-	test -f c2.c
-
-HEAD is now at 7b51d7c c1
-Merge made by the 'theirs' strategy.
- c1.c | 2 +-
- c2.c | 1 +
- 2 files changed, 2 insertions(+), 1 deletion(-)
- create mode 100644 c2.c
---- head.old	2021-12-03 05:09:48.751784812 +0000
-+++ head.new	2021-12-03 05:09:48.903780394 +0000
-@@ -1 +1 @@
--7b51d7cdbd54b8c470d864639e1136d88ce718ef
-+5127482d58f03334905cdbe3564c8d092aa56dbe
-c1c1
-ok 3 - merge c2 with a custom strategy
-
-expecting success: 
-	git reset --hard c1 &&
-
-	git rev-parse c1 >head.old &&
-	git rev-parse c3 >second-parent.expected &&
-	git rev-parse c3^{tree} >tree.expected &&
-	git merge -s theirs c3 &&
-
-	git rev-parse HEAD >head.new &&
-	git rev-parse HEAD^1 >first-parent &&
-	git rev-parse HEAD^2 >second-parent &&
-	git rev-parse HEAD^{tree} >tree &&
-	git update-index --refresh &&
-	git diff --exit-code &&
-	git diff --exit-code c3 HEAD &&
-	git diff --exit-code c3 &&
-
-	! test_cmp head.old head.new &&
-	test_cmp head.old first-parent &&
-	test_cmp second-parent.expected second-parent &&
-	test_cmp tree.expected tree &&
-	test -f c0.c &&
-	! test -e c1.c &&
-	test -f c3.c
-
-HEAD is now at 7b51d7c c1
-Merge made by the 'theirs' strategy.
- c1.c | 1 -
- c3.c | 1 +
- 2 files changed, 1 insertion(+), 1 deletion(-)
- delete mode 100644 c1.c
- create mode 100644 c3.c
---- head.old	2021-12-03 05:09:49.155773068 +0000
-+++ head.new	2021-12-03 05:09:49.275769580 +0000
-@@ -1 +1 @@
--7b51d7cdbd54b8c470d864639e1136d88ce718ef
-+f5f2abda42595469639ae786a37808202e35dcf0
-ok 4 - trivial merge with custom strategy
-
-# passed all 4 test(s)
-1..4
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t7601-merge-pull-config.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7601-merge-pull-config/.git/
-expecting success: 
-	echo c0 >c0.c &&
-	git add c0.c &&
-	git commit -m c0 &&
-	git tag c0 &&
-	echo c1 >c1.c &&
-	git add c1.c &&
-	git commit -m c1 &&
-	git tag c1 &&
-	git reset --hard c0 &&
-	echo c2 >c2.c &&
-	git add c2.c &&
-	git commit -m c2 &&
-	git tag c2 &&
-	git reset --hard c0 &&
-	echo c3 >c3.c &&
-	git add c3.c &&
-	git commit -m c3 &&
-	git tag c3
-
-[master (root-commit) 3c83d4d] c0
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c0.c
-[master 8b0305e] c1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c1.c
-HEAD is now at 3c83d4d c0
-[master e7d38fd] c2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c2.c
-HEAD is now at 3c83d4d c0
-[master b734609] c3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c3.c
-ok 1 - setup
-
-expecting success: 
-	git reset --hard c1 &&
-	test -f c0.c &&
-	test -f c1.c &&
-	test ! -f c2.c &&
-	test ! -f c3.c &&
-	git merge c2 &&
-	test -f c1.c &&
-	test -f c2.c
-
-HEAD is now at 8b0305e c1
-Merging:
-8b0305e c1
-virtual c2
-found 1 common ancestor:
-3c83d4d c0
-Merge made by the 'recursive' strategy.
- c2.c | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 c2.c
-ok 2 - merge c1 with c2
-
-expecting success: 
-	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 3c83d4d c0
-From .
- * tag               c1         -> FETCH_HEAD
-Updating 3c83d4d..8b0305e
-Fast-forward
- c1.c | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 c1.c
-ok 3 - fast-forward pull succeeds with "true" in pull.ff
-
-expecting success: 
-	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 3c83d4d c0
-From .
- * tag               c1         -> FETCH_HEAD
-Updating 3c83d4d..8b0305e
-Fast-forward
- c1.c | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 c1.c
-ok 4 - pull.ff=true overrides merge.ff=false
-
-expecting success: 
-	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 3c83d4d c0
-From .
- * tag               c1         -> FETCH_HEAD
-Merging:
-3c83d4d c0
-virtual 8b0305e52150f62ea071d90c4c46c59c62cbef4d
-found 1 common ancestor:
-3c83d4d c0
-Merge made by the 'recursive' strategy.
- c1.c | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 c1.c
-ok 5 - fast-forward pull creates merge with "false" in pull.ff
-
-expecting success: 
-	git reset --hard c1 &&
-	test_config pull.ff only &&
-	test_must_fail git pull . c3
-
-HEAD is now at 8b0305e c1
-From .
- * tag               c3         -> FETCH_HEAD
-fatal: Not possible to fast-forward, aborting.
-ok 6 - pull prevents non-fast-forward with "only" in pull.ff
-
-expecting success: 
-	git reset --hard c1 &&
-	git config pull.twohead ours &&
-	git merge c2 &&
-	test -f c1.c &&
-	! test -f c2.c
-
-HEAD is now at 8b0305e c1
-Merge made by the 'ours' strategy.
-ok 7 - merge c1 with c2 (ours in pull.twohead)
-
-expecting success: 
-	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 8b0305e c1
-error: Not handling anything other than two heads merge.
-Merge with strategy recursive failed.
-ok 8 - merge c1 with c2 and c3 (recursive in pull.octopus)
-
-expecting success: 
-	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 -f c0.c &&
-	test -f c1.c &&
-	test -f c2.c &&
-	test -f c3.c
-
-HEAD is now at 8b0305e c1
-error: Not handling anything other than two heads merge.
-Trying merge strategy recursive...
-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 9 - merge c1 with c2 and c3 (recursive and octopus in pull.octopus)
-
-expecting success: 
-	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 3c83d4d c0
-[master 6b45ccd] c4
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 conflict.c
- create mode 100644 foo.c
-[master 6ed691c] 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 6b45ccd c4
-[master 36ed946] c6
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+), 1 deletion(-)
-ok 10 - setup conflicted merge
-
-expecting success: 
-	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 6ed691c 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 6ed691c c5
-Merging:
-6ed691c c5
-virtual c6
-found 1 common ancestor:
-6b45ccd c4
-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 6ed691c c5
-Trying merge strategy recursive...
-Merging:
-6ed691c c5
-virtual c6
-found 1 common ancestor:
-6b45ccd c4
-Auto-merging conflict.c
-CONFLICT (content): Merge conflict in conflict.c
-Rewinding the tree to pristine...
-Trying merge strategy resolve...
-conflict.c: needs merge
-conflict.c: needs merge
-fatal: You need to resolve your current index first
-error: Your local changes to the following files would be overwritten by merge:
-  bar.c conflict.c
-Rewinding the tree to pristine...
-Using the recursive to prepare resolving by hand.
-conflict.c: needs merge
-Merging:
-6ed691c c5
-virtual c6
-found 1 common ancestor:
-6b45ccd c4
-ok 11 - merge picks up the best result
-
-expecting success: 
-	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 6ed691c 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 6ed691c c5
-Merging:
-6ed691c c5
-virtual c6
-found 1 common ancestor:
-6b45ccd c4
-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 6ed691c c5
-Trying merge strategy recursive...
-Merging:
-6ed691c c5
-virtual c6
-found 1 common ancestor:
-6b45ccd c4
-Auto-merging conflict.c
-CONFLICT (content): Merge conflict in conflict.c
-Rewinding the tree to pristine...
-Trying merge strategy resolve...
-conflict.c: needs merge
-conflict.c: needs merge
-fatal: You need to resolve your current index first
-error: Your local changes to the following files would be overwritten by merge:
-  bar.c conflict.c
-Rewinding the tree to pristine...
-Using the recursive to prepare resolving by hand.
-conflict.c: needs merge
-Merging:
-6ed691c c5
-virtual c6
-found 1 common ancestor:
-6b45ccd c4
-ok 12 - merge picks up the best result (from config)
-
-expecting success: 
-	git config pull.twohead "foobar" &&
-	git reset --hard c5 &&
-	test_must_fail git merge c6
-
-HEAD is now at 6ed691c c5
-Could not find merge strategy 'foobar'.
-Available strategies are: octopus ours recursive resolve subtree.
-ok 13 - merge errors out on invalid strategy
-
-expecting success: 
-	git config --unset-all pull.twohead &&
-	git reset --hard c5 &&
-	test_must_fail git merge -s "resolve recursive" c6
-
-HEAD is now at 6ed691c c5
-Could not find merge strategy 'resolve recursive'.
-Available strategies are: octopus ours recursive resolve subtree.
-ok 14 - merge errors out on invalid strategy
-
-# passed all 14 test(s)
-1..14
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t7603-merge-reduce-heads.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7603-merge-reduce-heads/.git/
-expecting success: 
-	echo c0 > c0.c &&
-	git add c0.c &&
-	git commit -m c0 &&
-	git tag c0 &&
-	echo c1 > c1.c &&
-	git add c1.c &&
-	git commit -m c1 &&
-	git tag c1 &&
-	git reset --hard c0 &&
-	echo c2 > c2.c &&
-	git add c2.c &&
-	git commit -m c2 &&
-	git tag c2 &&
-	git reset --hard c0 &&
-	echo c3 > c3.c &&
-	git add c3.c &&
-	git commit -m c3 &&
-	git tag c3 &&
-	git reset --hard c0 &&
-	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
-
-[master (root-commit) 4c1ea88] c0
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c0.c
-[master b87ba90] c1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c1.c
-HEAD is now at 4c1ea88 c0
-[master 6545764] c2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c2.c
-HEAD is now at 4c1ea88 c0
-[master bdf6ee6] c3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c3.c
-HEAD is now at 4c1ea88 c0
-[master 5d10d72] c4
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c4.c
-[master 33d7be7] c5
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c5.c
-ok 1 - setup
-
-expecting success: 
-	git reset --hard c1 &&
-	git merge c2 c3 c4 c5 &&
-	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)" &&
-	test "$(git rev-parse c5)" = "$(git rev-parse HEAD^4)" &&
-	git diff --exit-code &&
-	test -f c0.c &&
-	test -f c1.c &&
-	test -f c2.c &&
-	test -f c3.c &&
-	test -f c4.c &&
-	test -f c5.c &&
-	git show --format=%s -s >actual &&
-	! grep c1 actual &&
-	grep c2 actual &&
-	grep c3 actual &&
-	! grep c4 actual &&
-	grep c5 actual
-
-HEAD is now at b87ba90 c1
-Trying simple merge with c2
-Trying simple merge with c3
-Trying simple merge with c5
-Merge made by the 'octopus' strategy.
- c2.c | 1 +
- c3.c | 1 +
- c4.c | 1 +
- c5.c | 1 +
- 4 files changed, 4 insertions(+)
- create mode 100644 c2.c
- create mode 100644 c3.c
- create mode 100644 c4.c
- create mode 100644 c5.c
-Merge tags 'c2', 'c3' and 'c5'
-Merge tags 'c2', 'c3' and 'c5'
-Merge tags 'c2', 'c3' and 'c5'
-ok 2 - merge c1 with c2, c3, c4, c5
-
-expecting success: 
-	git reset --hard c1 &&
-	git pull . c2 c3 c4 c5 &&
-	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)" &&
-	test "$(git rev-parse c5)" = "$(git rev-parse HEAD^4)" &&
-	git diff --exit-code &&
-	test -f c0.c &&
-	test -f c1.c &&
-	test -f c2.c &&
-	test -f c3.c &&
-	test -f c4.c &&
-	test -f c5.c &&
-	git show --format=%s -s >actual &&
-	! grep c1 actual &&
-	grep c2 actual &&
-	grep c3 actual &&
-	! grep c4 actual &&
-	grep c5 actual
-
-HEAD is now at b87ba90 c1
-From .
- * tag               c2         -> FETCH_HEAD
- * tag               c3         -> FETCH_HEAD
- * tag               c4         -> FETCH_HEAD
- * tag               c5         -> FETCH_HEAD
-Trying simple merge with 654576420155b774ad8abcfd2e7e3277b88a268f
-Trying simple merge with bdf6ee678041717b85c39e6218e34d03c3550b17
-Trying simple merge with 33d7be7501f26f523b0638855414d77f3e0df25b
-Merge made by the 'octopus' strategy.
- c2.c | 1 +
- c3.c | 1 +
- c4.c | 1 +
- c5.c | 1 +
- 4 files changed, 4 insertions(+)
- create mode 100644 c2.c
- create mode 100644 c3.c
- create mode 100644 c4.c
- create mode 100644 c5.c
-Merge tags 'c2', 'c3' and 'c5'
-Merge tags 'c2', 'c3' and 'c5'
-Merge tags 'c2', 'c3' and 'c5'
-ok 3 - pull c2, c3, c4, c5 into c1
-
-expecting success: 
-	for i in A B C D E
-	do
-		echo $i > $i.c &&
-		git add $i.c &&
-		git commit -m $i &&
-		git tag $i
-	done &&
-	git reset --hard A &&
-	for i in F G H I
-	do
-		echo $i > $i.c &&
-		git add $i.c &&
-		git commit -m $i &&
-		git tag $i
-	done
-
-[master f91a4da] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.c
-[master c20bcbe] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 B.c
-[master ef5efeb] C
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 C.c
-[master db9df22] D
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 D.c
-[master c1553fa] E
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 E.c
-HEAD is now at f91a4da A
-[master e97d277] F
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 F.c
-[master 1dfd942] G
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 G.c
-[master 4c00854] H
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 H.c
-[master e8057fc] I
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 I.c
-ok 4 - setup
-
-expecting success: 
-	git reset --hard A &&
-	git merge E I
-
-HEAD is now at f91a4da A
-Fast-forwarding to: E
-Trying simple merge with I
-Merge made by the 'octopus' strategy.
- B.c | 1 +
- C.c | 1 +
- D.c | 1 +
- E.c | 1 +
- F.c | 1 +
- G.c | 1 +
- H.c | 1 +
- I.c | 1 +
- 8 files changed, 8 insertions(+)
- create mode 100644 B.c
- create mode 100644 C.c
- create mode 100644 D.c
- create mode 100644 E.c
- create mode 100644 F.c
- create mode 100644 G.c
- create mode 100644 H.c
- create mode 100644 I.c
-ok 5 - merge E and I
-
-expecting success: 
-	test $(git rev-parse HEAD^1) = $(git rev-parse E) &&
-	test $(git rev-parse HEAD^2) = $(git rev-parse I)
-
-ok 6 - verify merge result
-
-expecting success: 
-	git reset --hard E &&
-	echo foo > file.c &&
-	git add file.c &&
-	git commit -m E2 &&
-	git tag E2 &&
-	git reset --hard I &&
-	echo bar >file.c &&
-	git add file.c &&
-	git commit -m I2 &&
-	git tag I2
-
-HEAD is now at c1553fa E
-[master ea2b710] E2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file.c
-HEAD is now at e8057fc I
-[master b73f8e0] I2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file.c
-ok 7 - add conflicts
-
-expecting success: 
-	git reset --hard A &&
-	test_must_fail git merge E2 I2 &&
-	echo baz > file.c &&
-	git add file.c &&
-	git commit -m "resolve conflict"
-
-HEAD is now at f91a4da A
-Fast-forwarding to: E2
-Trying simple merge with I2
-Simple merge did not work, trying automatic merge.
-Added file.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 file.c
-fatal: merge program failed
-Automatic merge failed; fix conflicts and then commit the result.
-[master 3985181] resolve conflict
- Author: A U Thor <author@example.com>
-ok 8 - merge E2 and I2, causing a conflict and resolve it
-
-expecting success: 
-	test $(git rev-parse HEAD^1) = $(git rev-parse E2) &&
-	test $(git rev-parse HEAD^2) = $(git rev-parse I2)
-
-ok 9 - verify merge result
-
-expecting success: 
-	git reset --hard c0 &&
-	git merge c4 c5
-
-HEAD is now at 4c1ea88 c0
-Updating 4c1ea88..33d7be7
-Fast-forward
- c4.c | 1 +
- c5.c | 1 +
- 2 files changed, 2 insertions(+)
- create mode 100644 c4.c
- create mode 100644 c5.c
-ok 10 - fast-forward to redundant refs
-
-expecting success: 
-	test $(git rev-parse HEAD) = $(git rev-parse c5)
-
-ok 11 - verify merge result
-
-expecting success: 
-	git reset --hard c5 &&
-	git merge c0 c4
-
-HEAD is now at 33d7be7 c5
-Already up to date.
-ok 12 - merge up-to-date redundant refs
-
-expecting success: 
-	test $(git rev-parse HEAD) = $(git rev-parse c5)
-
-ok 13 - verify merge result
-
-# passed all 13 test(s)
-1..13
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t7608-merge-messages.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7608-merge-messages/.git/
-expecting success: 
-	test_commit master-1 &&
-	git checkout -b local-branch &&
-	test_commit branch-1 &&
-	git checkout master &&
-	test_commit master-2 &&
-	git merge local-branch &&
-	check_oneline "Merge branch Qlocal-branchQ"
-
-[master (root-commit) 7b5416a] master-1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 master-1.t
-Switched to a new branch 'local-branch'
-[local-branch f064301] branch-1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 branch-1.t
-Switched to branch 'master'
-[master 04af5f8] master-2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 master-2.t
-Merging:
-04af5f8 master-2
-virtual local-branch
-found 1 common ancestor:
-7b5416a master-1
-Merge made by the 'recursive' strategy.
- branch-1.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 branch-1.t
-ok 1 - merge local branch
-
-expecting success: 
-	git checkout -b octopus-a master &&
-	test_commit octopus-1 &&
-	git checkout -b octopus-b master &&
-	test_commit octopus-2 &&
-	git checkout master &&
-	git merge octopus-a octopus-b &&
-	check_oneline "Merge branches Qoctopus-aQ and Qoctopus-bQ"
-
-Switched to a new branch 'octopus-a'
-[octopus-a 7226ae8] 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 9679e1e] octopus-2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 octopus-2.t
-Switched to branch 'master'
-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: 
-	git checkout -b tag-branch master &&
-	test_commit tag-1 &&
-	git checkout master &&
-	test_commit master-3 &&
-	git merge tag-1 &&
-	check_oneline "Merge tag Qtag-1Q"
-
-Switched to a new branch 'tag-branch'
-[tag-branch 727cec4] tag-1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 tag-1.t
-Switched to branch 'master'
-[master 1834f00] master-3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 master-3.t
-Merging:
-1834f00 master-3
-virtual tag-1
-found 1 common ancestor:
-b5672c0 Merge branches 'octopus-a' and 'octopus-b'
-Merge made by the 'recursive' strategy.
- tag-1.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 tag-1.t
-ok 3 - merge tag
-
-expecting success: 
-	git checkout -b ambiguous master &&
-	test_commit ambiguous &&
-	git checkout master &&
-	test_commit master-4 &&
-	git merge ambiguous &&
-	check_oneline "Merge tag QambiguousQ"
-
-Switched to a new branch 'ambiguous'
-[ambiguous 05dd8f8] ambiguous
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 ambiguous.t
-Switched to branch 'master'
-[master 4dad856] master-4
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 master-4.t
-warning: refname 'ambiguous' is ambiguous.
-warning: refname 'ambiguous' is ambiguous.
-Merging:
-4dad856 master-4
-virtual ambiguous
-found 1 common ancestor:
-cac54ed Merge tag 'tag-1'
-Merge made by the 'recursive' strategy.
- ambiguous.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 ambiguous.t
-ok 4 - ambiguous tag
-
-expecting success: 
-	git checkout -b remote master &&
-	test_commit remote-1 &&
-	git update-ref refs/remotes/origin/master remote &&
-	git checkout master &&
-	test_commit master-5 &&
-	git merge origin/master &&
-	check_oneline "Merge remote-tracking branch Qorigin/masterQ"
-
-Switched to a new branch 'remote'
-[remote bc66e06] remote-1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 remote-1.t
-Switched to branch 'master'
-[master ecb72d0] master-5
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 master-5.t
-Merging:
-ecb72d0 master-5
-virtual origin/master
-found 1 common ancestor:
-39902d7 Merge tag 'ambiguous'
-Merge made by the 'recursive' 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/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t7609-merge-co-error-msgs.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7609-merge-co-error-msgs/.git/
-expecting success: 
-	echo one >one &&
-	git add one &&
-	git commit -a -m First &&
-
-	git checkout -b branch &&
-	echo two >two &&
-	echo three >three &&
-	echo four >four &&
-	echo five >five &&
-	git add two three four five &&
-	git commit -m Second &&
-
-	git checkout master &&
-	echo other >two &&
-	echo other >three &&
-	echo other >four &&
-	echo other >five
-
-[master (root-commit) dbb9620] First
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one
-Switched to a new branch 'branch'
-[branch e81c966] Second
- Author: A U Thor <author@example.com>
- 4 files changed, 4 insertions(+)
- create mode 100644 five
- create mode 100644 four
- create mode 100644 three
- create mode 100644 two
-Switched to branch 'master'
-ok 1 - setup
-
-expecting success: 
-	test_must_fail git merge branch 2>out &&
-	test_i18ncmp out expect &&
-	git commit --allow-empty -m empty &&
-	(
-		GIT_MERGE_VERBOSITY=0 &&
-		export GIT_MERGE_VERBOSITY &&
-		test_must_fail git merge branch 2>out2
-	) &&
-	test_i18ncmp out2 expect &&
-	git reset --hard HEAD^
-
-Updating dbb9620..e81c966
-[master 1f11c95] empty
- Author: A U Thor <author@example.com>
-HEAD is now at dbb9620 First
-ok 2 - untracked files overwritten by merge (fast and non-fast forward)
-
-expecting success: 
-	git add two &&
-	git add three &&
-	git add four &&
-	test_must_fail git merge branch 2>out &&
-	test_i18ncmp out expect
-
-Updating dbb9620..e81c966
-ok 3 - untracked files or local changes ovewritten by merge
-
-expecting success: 
-	git add five &&
-	mkdir rep &&
-	echo one >rep/one &&
-	echo two >rep/two &&
-	git add rep/one rep/two &&
-	git commit -m Fourth &&
-	git checkout master &&
-	echo uno >rep/one &&
-	echo dos >rep/two &&
-	test_must_fail git checkout branch 2>out &&
-	test_i18ncmp out expect
-
-[master 4d30efb] Fourth
- Author: A U Thor <author@example.com>
- 6 files changed, 6 insertions(+)
- create mode 100644 five
- create mode 100644 four
- create mode 100644 rep/one
- create mode 100644 rep/two
- create mode 100644 three
- create mode 100644 two
-Already on 'master'
-ok 4 - cannot switch branches because of local changes
-
-expecting success: 
-	git add rep/one rep/two &&
-	test_must_fail git checkout branch 2>out &&
-	test_i18ncmp out expect
-
-ok 5 - not uptodate file porcelain checkout error
-
-expecting success: 
-	git init uptodate &&
-	cd uptodate &&
-	mkdir rep &&
-	mkdir rep2 &&
-	touch rep/foo &&
-	touch rep2/foo &&
-	git add rep/foo rep2/foo &&
-	git commit -m init &&
-	git checkout -b branch &&
-	git rm rep -r &&
-	git rm rep2 -r &&
-	>rep &&
-	>rep2 &&
-	git add rep rep2&&
-	git commit -m "added test as a file" &&
-	git checkout master &&
-	>rep/untracked-file &&
-	>rep2/untracked-file &&
-	test_must_fail git checkout branch 2>out &&
-	test_i18ncmp out ../expect
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7609-merge-co-error-msgs/uptodate/.git/
-[master (root-commit) 4d3d80b] init
- Author: A U Thor <author@example.com>
- 2 files changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 rep/foo
- create mode 100644 rep2/foo
-Switched to a new branch 'branch'
-rm 'rep/foo'
-rm 'rep2/foo'
-[branch ed257c3] added test as a file
- Author: A U Thor <author@example.com>
- 2 files changed, 0 insertions(+), 0 deletions(-)
- rename rep/foo => rep (100%)
- rename rep2/foo => rep2 (100%)
-Switched to branch 'master'
-ok 6 - not_uptodate_dir porcelain checkout error
-
-# passed all 6 test(s)
-1..6
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t7607-merge-overwrite.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7607-merge-overwrite/.git/
-expecting success: 
-	test_commit c0 c0.c &&
-	test_commit c1 c1.c &&
-	test_commit c1a c1.c "c1 a" &&
-	git reset --hard c0 &&
-	test_commit c2 c2.c &&
-	git reset --hard c0 &&
-	mkdir sub &&
-	echo "sub/f" > sub/f &&
-	mkdir sub2 &&
-	echo "sub2/f" > sub2/f &&
-	git add sub/f sub2/f &&
-	git commit -m sub &&
-	git tag sub &&
-	echo "VERY IMPORTANT CHANGES" > important
-
-[master (root-commit) 934056f] c0
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c0.c
-[master 7b51d7c] c1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c1.c
-[master 4e7fedb] c1a
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-HEAD is now at 934056f c0
-[master 48f99e1] c2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c2.c
-HEAD is now at 934056f c0
-[master 55608b7] sub
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 sub/f
- create mode 100644 sub2/f
-ok 1 - setup
-
-expecting success: 
-	git reset --hard c1 &&
-	cp important c2.c &&
-	test_must_fail git merge c2 &&
-	test_path_is_missing .git/MERGE_HEAD &&
-	test_cmp important c2.c
-
-HEAD is now at 7b51d7c c1
-error: The following untracked working tree files would be overwritten by merge:
-	c2.c
-Please move or remove them before you merge.
-Aborting
-error: merging of trees 93035bc44e71dc037ede30e10867527070f66364 and 223e2079392406e13c1b247476ccf8c658dbaaaf failed
-Merging:
-7b51d7c c1
-virtual c2
-found 1 common ancestor:
-934056f c0
-ok 2 - will not overwrite untracked file
-
-expecting success: 
-	git reset --hard c1 &&
-	cp important c2.c &&
-	git add c2.c &&
-	git commit -m important &&
-	git checkout c2
-
-HEAD is now at 7b51d7c c1
-[master b7e8e56] important
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c2.c
-Note: checking out 'c2'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by performing another checkout.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
-
-  git checkout -b <new-branch-name>
-
-HEAD is now at 48f99e1 c2
-ok 3 - will overwrite tracked file
-
-expecting success: 
-	git reset --hard c1 &&
-	cp important c2.c &&
-	git add c2.c &&
-	test_must_fail git merge c2 &&
-	test_path_is_missing .git/MERGE_HEAD &&
-	test_cmp important c2.c
-
-HEAD is now at 7b51d7c c1
-error: Your local changes to the following files would be overwritten by merge:
-  c2.c
-Merging:
-7b51d7c c1
-virtual c2
-found 1 common ancestor:
-934056f c0
-ok 4 - will not overwrite new file
-
-expecting success: 
-	git reset --hard c1 &&
-	cp important c2.c &&
-	git add c2.c &&
-	rm c2.c &&
-	test_must_fail git merge c2 &&
-	test_path_is_missing .git/MERGE_HEAD &&
-	git checkout c2.c &&
-	test_cmp important c2.c
-
-HEAD is now at 7b51d7c c1
-error: Your local changes to the following files would be overwritten by merge:
-  c2.c
-Merging:
-7b51d7c c1
-virtual c2
-found 1 common ancestor:
-934056f c0
-ok 5 - will not overwrite staged changes
-
-expecting success: 
-	git reset --hard c1 &&
-	git rm c1.c &&
-	git commit -m "rm c1.c" &&
-	cp important c1.c &&
-	test_must_fail git merge c1a &&
-	test_cmp important c1.c
-
-HEAD is now at 7b51d7c c1
-rm 'c1.c'
-[detached HEAD 86e44d1] rm c1.c
- Author: A U Thor <author@example.com>
- 1 file changed, 1 deletion(-)
- delete mode 100644 c1.c
-Merging:
-86e44d1 rm c1.c
-virtual c1a
-found 1 common ancestor:
-7b51d7c c1
-CONFLICT (modify/delete): c1.c deleted in HEAD and modified in c1a. Version c1a of c1.c left in tree at c1.c~c1a.
-Automatic merge failed; fix conflicts and then commit the result.
-ok 6 - will not overwrite removed file
-
-expecting success: 
-	git reset --hard c1 &&
-	git rm c1.c &&
-	git commit -m "rm c1.c" &&
-	cp important c1.c &&
-	git add c1.c &&
-	test_must_fail git merge c1a &&
-	test_path_is_missing .git/MERGE_HEAD &&
-	test_cmp important c1.c
-
-HEAD is now at 7b51d7c c1
-rm 'c1.c'
-[detached HEAD 86e44d1] rm c1.c
- Author: A U Thor <author@example.com>
- 1 file changed, 1 deletion(-)
- delete mode 100644 c1.c
-error: Your local changes to the following files would be overwritten by merge:
-  c1.c
-Merging:
-86e44d1 rm c1.c
-virtual c1a
-found 1 common ancestor:
-7b51d7c c1
-ok 7 - will not overwrite re-added file
-
-expecting success: 
-	git reset --hard c1 &&
-	git rm c1.c &&
-	git commit -m "rm c1.c" &&
-	cp important c1.c &&
-	git add c1.c &&
-	rm c1.c &&
-	test_must_fail git merge c1a &&
-	test_path_is_missing .git/MERGE_HEAD &&
-	git checkout c1.c &&
-	test_cmp important c1.c
-
-HEAD is now at 7b51d7c c1
-rm 'c1.c'
-[detached HEAD 86e44d1] rm c1.c
- Author: A U Thor <author@example.com>
- 1 file changed, 1 deletion(-)
- delete mode 100644 c1.c
-error: Your local changes to the following files would be overwritten by merge:
-  c1.c
-Merging:
-86e44d1 rm c1.c
-virtual c1a
-found 1 common ancestor:
-7b51d7c c1
-ok 8 - will not overwrite removed file with staged changes
-
-expecting success: 
-	git reset --hard c1 &&
-	git mv c1.c other.c &&
-	git commit -m rename &&
-	cp important other.c &&
-	test_must_fail git merge c1a >out &&
-	test_i18ngrep "Refusing to lose dirty file at other.c" out &&
-	test_path_is_file other.c~HEAD &&
-	test $(git hash-object other.c~HEAD) = $(git rev-parse c1a:c1.c) &&
-	test_cmp important other.c
-
-HEAD is now at 7b51d7c c1
-[detached HEAD 891a741] rename
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename c1.c => other.c (100%)
-Refusing to lose dirty file at other.c
-ok 9 - will not overwrite unstaged changes in renamed file
-
-expecting success: 
-	git reset --hard c0 &&
-	rm -rf sub &&
-	mkdir -p sub/f &&
-	cp important sub/f/important &&
-	test_must_fail git merge sub &&
-	test_path_is_missing .git/MERGE_HEAD &&
-	test_cmp important sub/f/important
-
-HEAD is now at 934056f c0
-error: Updating the following directories would lose untracked files in them:
-	sub/f
-
-Aborting
-Updating 934056f..55608b7
-ok 10 - will not overwrite untracked subtree
-
-expecting success: 
-	git reset --hard c0 &&
-	rm -rf sub &&
-	cp important sub &&
-	cp important sub2 &&
-	test_must_fail git merge sub 2>out &&
-	test_i18ncmp out expect &&
-	test_path_is_missing .git/MERGE_HEAD &&
-	test_cmp important sub &&
-	test_cmp important sub2 &&
-	rm -f sub sub2
-
-HEAD is now at 934056f c0
-Updating 934056f..55608b7
-ok 11 - will not overwrite untracked file in leading path
-
-checking prerequisite: SYMLINKS
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
-	# test whether the filesystem supports symbolic links
-	ln -s x y && test -h y
-
-)
-prerequisite SYMLINKS ok
-expecting success: 
-	git reset --hard c0 &&
-	rm -rf sub &&
-	mkdir sub2 &&
-	ln -s sub2 sub &&
-	test_must_fail git merge sub &&
-	test_path_is_missing .git/MERGE_HEAD
-
-HEAD is now at 934056f c0
-error: The following untracked working tree files would be overwritten by merge:
-	sub
-Please move or remove them before you merge.
-Aborting
-Updating 934056f..55608b7
-ok 12 - will not overwrite untracked symlink in leading path
-
-expecting success: 
-	git reset --hard c0 &&
-	rm -rf sub &&
-	test_ln_s_add sub2 sub &&
-	git commit -m ln &&
-	git checkout sub
-
-HEAD is now at 934056f c0
-[detached HEAD 6d387d8] ln
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 120000 sub
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  6d387d8 ln
-
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
-
- git branch <new-branch-name> 6d387d8
-
-HEAD is now at 55608b7 sub
-ok 13 - will not be confused by symlink in leading path
-
-expecting success: 
-	git reset --hard c0 &&
-	git rm -fr . &&
-	git checkout --orphan new &&
-	cp important c0.c &&
-	test_must_fail git merge c0 2>out &&
-	test_i18ncmp out expect
-
-HEAD is now at 934056f c0
-rm 'c0.c'
-Switched to a new branch 'new'
-D	c0.c
-ok 14 - will not overwrite untracked file on unborn branch
-
-expecting success: 
-	test_when_finished "rm c0.c" &&
-	test_path_is_missing .git/MERGE_HEAD &&
-	test_cmp important c0.c
-
-ok 15 - will not overwrite untracked file on unborn branch .git/MERGE_HEAD sanity etc.
-
-expecting success: 
-	test_must_fail git rev-parse --verify HEAD
-
-fatal: Needed a single revision
-ok 16 - failed merge leaves unborn branch in the womb
-
-expecting success: 
-	git symbolic-ref HEAD refs/heads/unborn &&
-	rm -f .git/index &&
-	echo foo > tracked-file &&
-	git add tracked-file &&
-	echo bar > untracked-file
-
-ok 17 - set up unborn branch and content
-
-expecting success: 
-	git merge master &&
-	grep foo tracked-file &&
-	git show :tracked-file >expect &&
-	grep foo expect &&
-	grep bar untracked-file
+state without impacting any branches by performing another checkout.
 
-foo
-foo
-bar
-ok 18 - will not clobber WT/index when merging into unborn
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -b with the checkout command again. Example:
 
-# passed all 18 test(s)
-1..18
+  git checkout -b <new-branch-name>
+
+HEAD is now at 294fddc first commit
+Previous HEAD position was 294fddc first commit
+Switched to branch 'master'
+ok 50 - "status" after file replacement should be clean with UC=false
+
+# passed all 50 test(s)
+1..50
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
 *** t7505-prepare-commit-msg-hook.sh ***
@@ -292155,6 +291437,468 @@
 1..21
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
+*** t7603-merge-reduce-heads.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7603-merge-reduce-heads/.git/
+expecting success: 
+	echo c0 > c0.c &&
+	git add c0.c &&
+	git commit -m c0 &&
+	git tag c0 &&
+	echo c1 > c1.c &&
+	git add c1.c &&
+	git commit -m c1 &&
+	git tag c1 &&
+	git reset --hard c0 &&
+	echo c2 > c2.c &&
+	git add c2.c &&
+	git commit -m c2 &&
+	git tag c2 &&
+	git reset --hard c0 &&
+	echo c3 > c3.c &&
+	git add c3.c &&
+	git commit -m c3 &&
+	git tag c3 &&
+	git reset --hard c0 &&
+	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
+
+[master (root-commit) f3feff8] c0
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c0.c
+[master 4ca56d9] c1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c1.c
+HEAD is now at f3feff8 c0
+[master 1a831db] c2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c2.c
+HEAD is now at f3feff8 c0
+[master 5849a0d] c3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c3.c
+HEAD is now at f3feff8 c0
+[master 484090a] c4
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c4.c
+[master 402a515] c5
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c5.c
+ok 1 - setup
+
+expecting success: 
+	git reset --hard c1 &&
+	git merge c2 c3 c4 c5 &&
+	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)" &&
+	test "$(git rev-parse c5)" = "$(git rev-parse HEAD^4)" &&
+	git diff --exit-code &&
+	test -f c0.c &&
+	test -f c1.c &&
+	test -f c2.c &&
+	test -f c3.c &&
+	test -f c4.c &&
+	test -f c5.c &&
+	git show --format=%s -s >actual &&
+	! grep c1 actual &&
+	grep c2 actual &&
+	grep c3 actual &&
+	! grep c4 actual &&
+	grep c5 actual
+
+HEAD is now at 4ca56d9 c1
+Trying simple merge with c2
+Trying simple merge with c3
+Trying simple merge with c5
+Merge made by the 'octopus' strategy.
+ c2.c | 1 +
+ c3.c | 1 +
+ c4.c | 1 +
+ c5.c | 1 +
+ 4 files changed, 4 insertions(+)
+ create mode 100644 c2.c
+ create mode 100644 c3.c
+ create mode 100644 c4.c
+ create mode 100644 c5.c
+Merge tags 'c2', 'c3' and 'c5'
+Merge tags 'c2', 'c3' and 'c5'
+Merge tags 'c2', 'c3' and 'c5'
+ok 2 - merge c1 with c2, c3, c4, c5
+
+expecting success: 
+	git reset --hard c1 &&
+	git pull . c2 c3 c4 c5 &&
+	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)" &&
+	test "$(git rev-parse c5)" = "$(git rev-parse HEAD^4)" &&
+	git diff --exit-code &&
+	test -f c0.c &&
+	test -f c1.c &&
+	test -f c2.c &&
+	test -f c3.c &&
+	test -f c4.c &&
+	test -f c5.c &&
+	git show --format=%s -s >actual &&
+	! grep c1 actual &&
+	grep c2 actual &&
+	grep c3 actual &&
+	! grep c4 actual &&
+	grep c5 actual
+
+HEAD is now at 4ca56d9 c1
+From .
+ * tag               c2         -> FETCH_HEAD
+ * tag               c3         -> FETCH_HEAD
+ * tag               c4         -> FETCH_HEAD
+ * tag               c5         -> FETCH_HEAD
+Trying simple merge with 1a831db91b20b487b95362c114bb3bb36a7a13ca
+Trying simple merge with 5849a0d8b9700a30920c96ac583918112b32f1aa
+Trying simple merge with 402a51567779bf7fb75a5da56f0c455e1ad8e9d9
+Merge made by the 'octopus' strategy.
+ c2.c | 1 +
+ c3.c | 1 +
+ c4.c | 1 +
+ c5.c | 1 +
+ 4 files changed, 4 insertions(+)
+ create mode 100644 c2.c
+ create mode 100644 c3.c
+ create mode 100644 c4.c
+ create mode 100644 c5.c
+Merge tags 'c2', 'c3' and 'c5'
+Merge tags 'c2', 'c3' and 'c5'
+Merge tags 'c2', 'c3' and 'c5'
+ok 3 - pull c2, c3, c4, c5 into c1
+
+expecting success: 
+	for i in A B C D E
+	do
+		echo $i > $i.c &&
+		git add $i.c &&
+		git commit -m $i &&
+		git tag $i
+	done &&
+	git reset --hard A &&
+	for i in F G H I
+	do
+		echo $i > $i.c &&
+		git add $i.c &&
+		git commit -m $i &&
+		git tag $i
+	done
+
+[master 782e451] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A.c
+[master 17afd2a] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 B.c
+[master 9292fcf] C
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 C.c
+[master 270b495] D
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 D.c
+[master aa8669f] E
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 E.c
+HEAD is now at 782e451 A
+[master a51029a] F
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 F.c
+[master 0291d09] G
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 G.c
+[master 3465ac3] H
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 H.c
+[master 518c474] I
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 I.c
+ok 4 - setup
+
+expecting success: 
+	git reset --hard A &&
+	git merge E I
+
+HEAD is now at 782e451 A
+Fast-forwarding to: E
+Trying simple merge with I
+Merge made by the 'octopus' strategy.
+ B.c | 1 +
+ C.c | 1 +
+ D.c | 1 +
+ E.c | 1 +
+ F.c | 1 +
+ G.c | 1 +
+ H.c | 1 +
+ I.c | 1 +
+ 8 files changed, 8 insertions(+)
+ create mode 100644 B.c
+ create mode 100644 C.c
+ create mode 100644 D.c
+ create mode 100644 E.c
+ create mode 100644 F.c
+ create mode 100644 G.c
+ create mode 100644 H.c
+ create mode 100644 I.c
+ok 5 - merge E and I
+
+expecting success: 
+	test $(git rev-parse HEAD^1) = $(git rev-parse E) &&
+	test $(git rev-parse HEAD^2) = $(git rev-parse I)
+
+ok 6 - verify merge result
+
+expecting success: 
+	git reset --hard E &&
+	echo foo > file.c &&
+	git add file.c &&
+	git commit -m E2 &&
+	git tag E2 &&
+	git reset --hard I &&
+	echo bar >file.c &&
+	git add file.c &&
+	git commit -m I2 &&
+	git tag I2
+
+HEAD is now at aa8669f E
+[master c063b3e] E2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file.c
+HEAD is now at 518c474 I
+[master b468906] I2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file.c
+ok 7 - add conflicts
+
+expecting success: 
+	git reset --hard A &&
+	test_must_fail git merge E2 I2 &&
+	echo baz > file.c &&
+	git add file.c &&
+	git commit -m "resolve conflict"
+
+HEAD is now at 782e451 A
+Fast-forwarding to: E2
+Trying simple merge with I2
+Simple merge did not work, trying automatic merge.
+Added file.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 file.c
+fatal: merge program failed
+Automatic merge failed; fix conflicts and then commit the result.
+[master 001ef7d] resolve conflict
+ Author: A U Thor <author@example.com>
+ok 8 - merge E2 and I2, causing a conflict and resolve it
+
+expecting success: 
+	test $(git rev-parse HEAD^1) = $(git rev-parse E2) &&
+	test $(git rev-parse HEAD^2) = $(git rev-parse I2)
+
+ok 9 - verify merge result
+
+expecting success: 
+	git reset --hard c0 &&
+	git merge c4 c5
+
+HEAD is now at f3feff8 c0
+Updating f3feff8..402a515
+Fast-forward
+ c4.c | 1 +
+ c5.c | 1 +
+ 2 files changed, 2 insertions(+)
+ create mode 100644 c4.c
+ create mode 100644 c5.c
+ok 10 - fast-forward to redundant refs
+
+expecting success: 
+	test $(git rev-parse HEAD) = $(git rev-parse c5)
+
+ok 11 - verify merge result
+
+expecting success: 
+	git reset --hard c5 &&
+	git merge c0 c4
+
+HEAD is now at 402a515 c5
+Already up to date.
+ok 12 - merge up-to-date redundant refs
+
+expecting success: 
+	test $(git rev-parse HEAD) = $(git rev-parse c5)
+
+ok 13 - verify merge result
+
+# passed all 13 test(s)
+1..13
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t7609-merge-co-error-msgs.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7609-merge-co-error-msgs/.git/
+expecting success: 
+	echo one >one &&
+	git add one &&
+	git commit -a -m First &&
+
+	git checkout -b branch &&
+	echo two >two &&
+	echo three >three &&
+	echo four >four &&
+	echo five >five &&
+	git add two three four five &&
+	git commit -m Second &&
+
+	git checkout master &&
+	echo other >two &&
+	echo other >three &&
+	echo other >four &&
+	echo other >five
+
+[master (root-commit) 75a7142] First
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one
+Switched to a new branch 'branch'
+[branch a8cfcfd] Second
+ Author: A U Thor <author@example.com>
+ 4 files changed, 4 insertions(+)
+ create mode 100644 five
+ create mode 100644 four
+ create mode 100644 three
+ create mode 100644 two
+Switched to branch 'master'
+ok 1 - setup
+
+expecting success: 
+	test_must_fail git merge branch 2>out &&
+	test_i18ncmp out expect &&
+	git commit --allow-empty -m empty &&
+	(
+		GIT_MERGE_VERBOSITY=0 &&
+		export GIT_MERGE_VERBOSITY &&
+		test_must_fail git merge branch 2>out2
+	) &&
+	test_i18ncmp out2 expect &&
+	git reset --hard HEAD^
+
+Updating 75a7142..a8cfcfd
+[master de3ea75] empty
+ Author: A U Thor <author@example.com>
+HEAD is now at 75a7142 First
+ok 2 - untracked files overwritten by merge (fast and non-fast forward)
+
+expecting success: 
+	git add two &&
+	git add three &&
+	git add four &&
+	test_must_fail git merge branch 2>out &&
+	test_i18ncmp out expect
+
+Updating 75a7142..a8cfcfd
+ok 3 - untracked files or local changes ovewritten by merge
+
+expecting success: 
+	git add five &&
+	mkdir rep &&
+	echo one >rep/one &&
+	echo two >rep/two &&
+	git add rep/one rep/two &&
+	git commit -m Fourth &&
+	git checkout master &&
+	echo uno >rep/one &&
+	echo dos >rep/two &&
+	test_must_fail git checkout branch 2>out &&
+	test_i18ncmp out expect
+
+[master 9771a89] Fourth
+ Author: A U Thor <author@example.com>
+ 6 files changed, 6 insertions(+)
+ create mode 100644 five
+ create mode 100644 four
+ create mode 100644 rep/one
+ create mode 100644 rep/two
+ create mode 100644 three
+ create mode 100644 two
+Already on 'master'
+ok 4 - cannot switch branches because of local changes
+
+expecting success: 
+	git add rep/one rep/two &&
+	test_must_fail git checkout branch 2>out &&
+	test_i18ncmp out expect
+
+ok 5 - not uptodate file porcelain checkout error
+
+expecting success: 
+	git init uptodate &&
+	cd uptodate &&
+	mkdir rep &&
+	mkdir rep2 &&
+	touch rep/foo &&
+	touch rep2/foo &&
+	git add rep/foo rep2/foo &&
+	git commit -m init &&
+	git checkout -b branch &&
+	git rm rep -r &&
+	git rm rep2 -r &&
+	>rep &&
+	>rep2 &&
+	git add rep rep2&&
+	git commit -m "added test as a file" &&
+	git checkout master &&
+	>rep/untracked-file &&
+	>rep2/untracked-file &&
+	test_must_fail git checkout branch 2>out &&
+	test_i18ncmp out ../expect
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7609-merge-co-error-msgs/uptodate/.git/
+[master (root-commit) 82f85c0] init
+ Author: A U Thor <author@example.com>
+ 2 files changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 rep/foo
+ create mode 100644 rep2/foo
+Switched to a new branch 'branch'
+rm 'rep/foo'
+rm 'rep2/foo'
+[branch 90041b3] added test as a file
+ Author: A U Thor <author@example.com>
+ 2 files changed, 0 insertions(+), 0 deletions(-)
+ rename rep/foo => rep (100%)
+ rename rep2/foo => rep2 (100%)
+Switched to branch 'master'
+ok 6 - not_uptodate_dir porcelain checkout error
+
+# passed all 6 test(s)
+1..6
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
 *** t7612-merge-verify-signatures.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7612-merge-verify-signatures/.git/
 skipping test: create signed commits 
@@ -292280,912 +292024,517 @@
 1..13
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t7519-status-fsmonitor.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7519-status-fsmonitor/.git/
+*** t7607-merge-overwrite.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7607-merge-overwrite/.git/
 expecting success: 
-	mkdir -p .git/hooks &&
-	: >tracked &&
-	: >modified &&
-	mkdir dir1 &&
-	: >dir1/tracked &&
-	: >dir1/modified &&
-	mkdir dir2 &&
-	: >dir2/tracked &&
-	: >dir2/modified &&
-	git -c core.fsmonitor= add . &&
-	git -c core.fsmonitor= commit -m initial &&
-	git config core.fsmonitor .git/hooks/fsmonitor-test &&
-	cat >.gitignore <<-\EOF
-	.gitignore
-	expect*
-	actual*
-	marker*
-	EOF
+	test_commit c0 c0.c &&
+	test_commit c1 c1.c &&
+	test_commit c1a c1.c "c1 a" &&
+	git reset --hard c0 &&
+	test_commit c2 c2.c &&
+	git reset --hard c0 &&
+	mkdir sub &&
+	echo "sub/f" > sub/f &&
+	mkdir sub2 &&
+	echo "sub2/f" > sub2/f &&
+	git add sub/f sub2/f &&
+	git commit -m sub &&
+	git tag sub &&
+	echo "VERY IMPORTANT CHANGES" > important
 
-[master (root-commit) 00325f2] initial
+[master (root-commit) 934056f] c0
  Author: A U Thor <author@example.com>
- 6 files changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 dir1/modified
- create mode 100644 dir1/tracked
- create mode 100644 dir2/modified
- create mode 100644 dir2/tracked
- create mode 100644 modified
- create mode 100644 tracked
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c0.c
+[master 7b51d7c] c1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c1.c
+[master 4e7fedb] c1a
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+HEAD is now at 934056f c0
+[master 48f99e1] c2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c2.c
+HEAD is now at 934056f c0
+[master 55608b7] sub
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 sub/f
+ create mode 100644 sub2/f
 ok 1 - setup
 
 expecting success: 
-	test-tool dump-fsmonitor >actual &&
-	grep "^no fsmonitor" actual
+	git reset --hard c1 &&
+	cp important c2.c &&
+	test_must_fail git merge c2 &&
+	test_path_is_missing .git/MERGE_HEAD &&
+	test_cmp important c2.c
 
-no fsmonitor
-ok 2 - fsmonitor extension is off by default
+HEAD is now at 7b51d7c c1
+error: The following untracked working tree files would be overwritten by merge:
+	c2.c
+Please move or remove them before you merge.
+Aborting
+error: merging of trees 93035bc44e71dc037ede30e10867527070f66364 and 223e2079392406e13c1b247476ccf8c658dbaaaf failed
+Merging:
+7b51d7c c1
+virtual c2
+found 1 common ancestor:
+934056f c0
+ok 2 - will not overwrite untracked file
 
 expecting success: 
-	git update-index --fsmonitor &&
-	test-tool dump-fsmonitor >actual &&
-	grep "^fsmonitor last update" actual
+	git reset --hard c1 &&
+	cp important c2.c &&
+	git add c2.c &&
+	git commit -m important &&
+	git checkout c2
 
-fatal: cannot run .git/hooks/fsmonitor-test: No such file or directory
-fsmonitor last update 1638508183995945401
-ok 3 - update-index --fsmonitor" adds the fsmonitor extension
+HEAD is now at 7b51d7c c1
+[master b7e8e56] important
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c2.c
+Note: checking out 'c2'.
 
-expecting success: 
-	git update-index --no-fsmonitor &&
-	test-tool dump-fsmonitor >actual &&
-	grep "^no fsmonitor" 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 performing another checkout.
 
-warning: core.fsmonitor is set; remove it if you really want to disable fsmonitor
-no fsmonitor
-ok 4 - update-index --no-fsmonitor" removes the fsmonitor extension
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -b with the checkout command again. Example:
 
-expecting success: 
-	git update-index --fsmonitor &&
-	git update-index --fsmonitor-valid dir1/modified &&
-	git update-index --fsmonitor-valid dir2/modified &&
-	git update-index --fsmonitor-valid modified &&
-	git ls-files -f >actual &&
-	test_cmp expect actual
+  git checkout -b <new-branch-name>
 
-fatal: cannot run .git/hooks/fsmonitor-test: No such file or directory
-ok 5 - update-index --fsmonitor-valid" sets the fsmonitor valid bit
+HEAD is now at 48f99e1 c2
+ok 3 - will overwrite tracked file
 
 expecting success: 
-	git update-index --no-fsmonitor-valid dir1/modified &&
-	git update-index --no-fsmonitor-valid dir2/modified &&
-	git update-index --no-fsmonitor-valid modified &&
-	git ls-files -f >actual &&
-	test_cmp expect actual
+	git reset --hard c1 &&
+	cp important c2.c &&
+	git add c2.c &&
+	test_must_fail git merge c2 &&
+	test_path_is_missing .git/MERGE_HEAD &&
+	test_cmp important c2.c
 
-ok 6 - update-index --no-fsmonitor-valid" clears the fsmonitor valid bit
+HEAD is now at 7b51d7c c1
+error: Your local changes to the following files would be overwritten by merge:
+  c2.c
+Merging:
+7b51d7c c1
+virtual c2
+found 1 common ancestor:
+934056f c0
+ok 4 - will not overwrite new file
 
 expecting success: 
-	write_integration_script &&
-	dirty_repo &&
-	git update-index --fsmonitor &&
-	git ls-files -f >actual &&
-	test_cmp expect actual
+	git reset --hard c1 &&
+	cp important c2.c &&
+	git add c2.c &&
+	rm c2.c &&
+	test_must_fail git merge c2 &&
+	test_path_is_missing .git/MERGE_HEAD &&
+	git checkout c2.c &&
+	test_cmp important c2.c
 
-ok 7 - all files returned by integration script get flagged as invalid
+HEAD is now at 7b51d7c c1
+error: Your local changes to the following files would be overwritten by merge:
+  c2.c
+Merging:
+7b51d7c c1
+virtual c2
+found 1 common ancestor:
+934056f c0
+ok 5 - will not overwrite staged changes
 
 expecting success: 
-	git add new &&
-	git add dir1/new &&
-	git add dir2/new &&
-	git ls-files -f >actual &&
-	test_cmp expect actual
+	git reset --hard c1 &&
+	git rm c1.c &&
+	git commit -m "rm c1.c" &&
+	cp important c1.c &&
+	test_must_fail git merge c1a &&
+	test_cmp important c1.c
 
-ok 8 - newly added files are marked valid
+HEAD is now at 7b51d7c c1
+rm 'c1.c'
+[detached HEAD 86e44d1] rm c1.c
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 c1.c
+Merging:
+86e44d1 rm c1.c
+virtual c1a
+found 1 common ancestor:
+7b51d7c c1
+CONFLICT (modify/delete): c1.c deleted in HEAD and modified in c1a. Version c1a of c1.c left in tree at c1.c~c1a.
+Automatic merge failed; fix conflicts and then commit the result.
+ok 6 - will not overwrite removed file
 
 expecting success: 
-	# modified files result in update-index returning 1
-	test_must_fail git update-index --refresh --force-write-index &&
-	git ls-files -f >actual &&
-	test_cmp expect actual
+	git reset --hard c1 &&
+	git rm c1.c &&
+	git commit -m "rm c1.c" &&
+	cp important c1.c &&
+	git add c1.c &&
+	test_must_fail git merge c1a &&
+	test_path_is_missing .git/MERGE_HEAD &&
+	test_cmp important c1.c
 
-dir1/modified: needs update
-dir2/modified: needs update
-modified: needs update
-ok 9 - all unmodified files get marked valid
+HEAD is now at 7b51d7c c1
+rm 'c1.c'
+[detached HEAD 86e44d1] rm c1.c
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 c1.c
+error: Your local changes to the following files would be overwritten by merge:
+  c1.c
+Merging:
+86e44d1 rm c1.c
+virtual c1a
+found 1 common ancestor:
+7b51d7c c1
+ok 7 - will not overwrite re-added file
 
 expecting success: 
-	write_script .git/hooks/fsmonitor-test<<-\EOF &&
-	printf "dir1/modified\0"
-	EOF
-	clean_repo &&
-	git update-index --refresh --force-write-index &&
-	echo 1 >modified &&
-	echo 2 >dir1/modified &&
-	echo 3 >dir2/modified &&
-	test_must_fail git update-index --refresh --force-write-index &&
-	git ls-files -f >actual &&
-	test_cmp expect actual
+	git reset --hard c1 &&
+	git rm c1.c &&
+	git commit -m "rm c1.c" &&
+	cp important c1.c &&
+	git add c1.c &&
+	rm c1.c &&
+	test_must_fail git merge c1a &&
+	test_path_is_missing .git/MERGE_HEAD &&
+	git checkout c1.c &&
+	test_cmp important c1.c
 
-HEAD is now at 00325f2 initial
-Removing dir1/untracked
-Removing dir2/untracked
-Removing untracked
-dir1/modified: needs update
-ok 10 - *only* files returned by the integration script get flagged as invalid
+HEAD is now at 7b51d7c c1
+rm 'c1.c'
+[detached HEAD 86e44d1] rm c1.c
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 c1.c
+error: Your local changes to the following files would be overwritten by merge:
+  c1.c
+Merging:
+86e44d1 rm c1.c
+virtual c1a
+found 1 common ancestor:
+7b51d7c c1
+ok 8 - will not overwrite removed file with staged changes
 
 expecting success: 
-	write_script .git/hooks/fsmonitor-test<<-\EOF &&
-	EOF
-	clean_repo &&
-	dirty_repo &&
-	git add . &&
-	git commit -m "to reset" &&
-	git reset HEAD~1 &&
-	git status >actual &&
-	git -c core.fsmonitor= status >expect &&
-	test_i18ncmp expect actual
+	git reset --hard c1 &&
+	git mv c1.c other.c &&
+	git commit -m rename &&
+	cp important other.c &&
+	test_must_fail git merge c1a >out &&
+	test_i18ngrep "Refusing to lose dirty file at other.c" out &&
+	test_path_is_file other.c~HEAD &&
+	test $(git hash-object other.c~HEAD) = $(git rev-parse c1a:c1.c) &&
+	test_cmp important other.c
 
-HEAD is now at 00325f2 initial
-[master a6b0d1c] to reset
+HEAD is now at 7b51d7c c1
+[detached HEAD 891a741] rename
  Author: A U Thor <author@example.com>
- 9 files changed, 6 insertions(+)
- create mode 100644 dir1/new
- create mode 100644 dir1/untracked
- create mode 100644 dir2/new
- create mode 100644 dir2/untracked
- create mode 100644 new
- create mode 100644 untracked
-Unstaged changes after reset:
-M	dir1/modified
-M	dir2/modified
-M	modified
-ok 11 - refresh_index() invalidates fsmonitor cache
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename c1.c => other.c (100%)
+Refusing to lose dirty file at other.c
+ok 9 - will not overwrite unstaged changes in renamed file
 
 expecting success: 
-		git config core.preloadIndex $preload_val &&
-		if test $preload_val = true
-		then
-			GIT_TEST_PRELOAD_INDEX=$preload_val; export GIT_TEST_PRELOAD_INDEX
-		else
-			sane_unset GIT_TEST_PRELOAD_INDEX
-		fi
-	
-ok 12 - setup preloadIndex to false
+	git reset --hard c0 &&
+	rm -rf sub &&
+	mkdir -p sub/f &&
+	cp important sub/f/important &&
+	test_must_fail git merge sub &&
+	test_path_is_missing .git/MERGE_HEAD &&
+	test_cmp important sub/f/important
 
-checking prerequisite: UNTRACKED_CACHE
+HEAD is now at 934056f c0
+error: Updating the following directories would lose untracked files in them:
+	sub/f
+
+Aborting
+Updating 934056f..55608b7
+ok 10 - will not overwrite untracked subtree
+
+expecting success: 
+	git reset --hard c0 &&
+	rm -rf sub &&
+	cp important sub &&
+	cp important sub2 &&
+	test_must_fail git merge sub 2>out &&
+	test_i18ncmp out expect &&
+	test_path_is_missing .git/MERGE_HEAD &&
+	test_cmp important sub &&
+	test_cmp important sub2 &&
+	rm -f sub sub2
+
+HEAD is now at 934056f c0
+Updating 934056f..55608b7
+ok 11 - will not overwrite untracked file in leading path
+
+checking prerequisite: SYMLINKS
 
 mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
 (
 	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
-	{ git update-index --test-untracked-cache; ret=$?; } &&
-	test $ret -ne 1
+	# test whether the filesystem supports symbolic links
+	ln -s x y && test -h y
 
 )
-Testing mtime in '/build/git-2.20.1/t/trash directory.t7519-status-fsmonitor' ...... OK
-prerequisite UNTRACKED_CACHE ok
-expecting success: 
-			git config core.untrackedcache $uc_val
-		
-ok 13 - setup untracked cache to false
-
+prerequisite SYMLINKS ok
 expecting success: 
-			write_integration_script &&
-			clean_repo &&
-			dirty_repo &&
-			git add new &&
-			git add dir1/new &&
-			git add dir2/new &&
-			git status >actual &&
-			git -c core.fsmonitor= status >expect &&
-			test_i18ncmp expect actual
-		
-HEAD is now at 00325f2 initial
-Removing dir1/new
-Removing dir1/untracked
-Removing dir2/new
-Removing dir2/untracked
-Removing new
-Removing untracked
-ok 14 - compare status with and without fsmonitor
+	git reset --hard c0 &&
+	rm -rf sub &&
+	mkdir sub2 &&
+	ln -s sub2 sub &&
+	test_must_fail git merge sub &&
+	test_path_is_missing .git/MERGE_HEAD
 
-expecting success: 
-			write_script .git/hooks/fsmonitor-test<<-\EOF &&
-			:>marker
-			EOF
-			clean_repo &&
-			git status &&
-			test_path_is_file marker &&
-			dirty_repo &&
-			rm -f marker &&
-			git status >actual &&
-			test_path_is_file marker &&
-			test_i18ngrep ! "Changes not staged for commit:" actual &&
-			if test $uc_val = true
-			then
-				test_i18ngrep ! "Untracked files:" actual
-			fi &&
-			if test $uc_val = false
-			then
-				test_i18ngrep "Untracked files:" actual
-			fi &&
-			rm -f marker
-		
-HEAD is now at 00325f2 initial
-Removing dir1/untracked
-Removing dir2/untracked
-Removing untracked
-On branch master
-nothing to commit, working tree clean
-Untracked files:
-ok 15 - status doesn't detect unreported modifications
+HEAD is now at 934056f c0
+error: The following untracked working tree files would be overwritten by merge:
+	sub
+Please move or remove them before you merge.
+Aborting
+Updating 934056f..55608b7
+ok 12 - will not overwrite untracked symlink in leading path
 
 expecting success: 
-			git config core.untrackedcache $uc_val
-		
-ok 16 - setup untracked cache to true
+	git reset --hard c0 &&
+	rm -rf sub &&
+	test_ln_s_add sub2 sub &&
+	git commit -m ln &&
+	git checkout sub
 
-expecting success: 
-			write_integration_script &&
-			clean_repo &&
-			dirty_repo &&
-			git add new &&
-			git add dir1/new &&
-			git add dir2/new &&
-			git status >actual &&
-			git -c core.fsmonitor= status >expect &&
-			test_i18ncmp expect actual
-		
-HEAD is now at 00325f2 initial
-Removing dir1/new
-Removing dir1/untracked
-Removing dir2/new
-Removing dir2/untracked
-Removing new
-Removing untracked
-ok 17 - compare status with and without fsmonitor
+HEAD is now at 934056f c0
+[detached HEAD 6d387d8] ln
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 120000 sub
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-expecting success: 
-			write_script .git/hooks/fsmonitor-test<<-\EOF &&
-			:>marker
-			EOF
-			clean_repo &&
-			git status &&
-			test_path_is_file marker &&
-			dirty_repo &&
-			rm -f marker &&
-			git status >actual &&
-			test_path_is_file marker &&
-			test_i18ngrep ! "Changes not staged for commit:" actual &&
-			if test $uc_val = true
-			then
-				test_i18ngrep ! "Untracked files:" actual
-			fi &&
-			if test $uc_val = false
-			then
-				test_i18ngrep "Untracked files:" actual
-			fi &&
-			rm -f marker
-		
-HEAD is now at 00325f2 initial
-Removing dir1/untracked
-Removing dir2/untracked
-Removing untracked
-On branch master
-nothing to commit, working tree clean
-ok 18 - status doesn't detect unreported modifications
+  6d387d8 ln
 
-expecting success: 
-		git config core.preloadIndex $preload_val &&
-		if test $preload_val = true
-		then
-			GIT_TEST_PRELOAD_INDEX=$preload_val; export GIT_TEST_PRELOAD_INDEX
-		else
-			sane_unset GIT_TEST_PRELOAD_INDEX
-		fi
-	
-ok 19 - setup preloadIndex to true
+If you want to keep it by creating a new branch, this may be a good time
+to do so with:
 
-expecting success: 
-			git config core.untrackedcache $uc_val
-		
-ok 20 - setup untracked cache to false
+ git branch <new-branch-name> 6d387d8
 
-expecting success: 
-			write_integration_script &&
-			clean_repo &&
-			dirty_repo &&
-			git add new &&
-			git add dir1/new &&
-			git add dir2/new &&
-			git status >actual &&
-			git -c core.fsmonitor= status >expect &&
-			test_i18ncmp expect actual
-		
-HEAD is now at 00325f2 initial
-Removing dir1/new
-Removing dir1/untracked
-Removing dir2/new
-Removing dir2/untracked
-Removing new
-Removing untracked
-ok 21 - compare status with and without fsmonitor
+HEAD is now at 55608b7 sub
+ok 13 - will not be confused by symlink in leading path
 
 expecting success: 
-			write_script .git/hooks/fsmonitor-test<<-\EOF &&
-			:>marker
-			EOF
-			clean_repo &&
-			git status &&
-			test_path_is_file marker &&
-			dirty_repo &&
-			rm -f marker &&
-			git status >actual &&
-			test_path_is_file marker &&
-			test_i18ngrep ! "Changes not staged for commit:" actual &&
-			if test $uc_val = true
-			then
-				test_i18ngrep ! "Untracked files:" actual
-			fi &&
-			if test $uc_val = false
-			then
-				test_i18ngrep "Untracked files:" actual
-			fi &&
-			rm -f marker
-		
-HEAD is now at 00325f2 initial
-Removing dir1/untracked
-Removing dir2/untracked
-Removing untracked
-On branch master
-nothing to commit, working tree clean
-Untracked files:
-ok 22 - status doesn't detect unreported modifications
+	git reset --hard c0 &&
+	git rm -fr . &&
+	git checkout --orphan new &&
+	cp important c0.c &&
+	test_must_fail git merge c0 2>out &&
+	test_i18ncmp out expect
 
-expecting success: 
-			git config core.untrackedcache $uc_val
-		
-ok 23 - setup untracked cache to true
+HEAD is now at 934056f c0
+rm 'c0.c'
+Switched to a new branch 'new'
+D	c0.c
+ok 14 - will not overwrite untracked file on unborn branch
 
 expecting success: 
-			write_integration_script &&
-			clean_repo &&
-			dirty_repo &&
-			git add new &&
-			git add dir1/new &&
-			git add dir2/new &&
-			git status >actual &&
-			git -c core.fsmonitor= status >expect &&
-			test_i18ncmp expect actual
-		
-HEAD is now at 00325f2 initial
-Removing dir1/new
-Removing dir1/untracked
-Removing dir2/new
-Removing dir2/untracked
-Removing new
-Removing untracked
-ok 24 - compare status with and without fsmonitor
+	test_when_finished "rm c0.c" &&
+	test_path_is_missing .git/MERGE_HEAD &&
+	test_cmp important c0.c
 
-expecting success: 
-			write_script .git/hooks/fsmonitor-test<<-\EOF &&
-			:>marker
-			EOF
-			clean_repo &&
-			git status &&
-			test_path_is_file marker &&
-			dirty_repo &&
-			rm -f marker &&
-			git status >actual &&
-			test_path_is_file marker &&
-			test_i18ngrep ! "Changes not staged for commit:" actual &&
-			if test $uc_val = true
-			then
-				test_i18ngrep ! "Untracked files:" actual
-			fi &&
-			if test $uc_val = false
-			then
-				test_i18ngrep "Untracked files:" actual
-			fi &&
-			rm -f marker
-		
-HEAD is now at 00325f2 initial
-Removing dir1/untracked
-Removing dir2/untracked
-Removing untracked
-On branch master
-nothing to commit, working tree clean
-ok 25 - status doesn't detect unreported modifications
+ok 15 - will not overwrite untracked file on unborn branch .git/MERGE_HEAD sanity etc.
 
 expecting success: 
-	write_integration_script &&
-	dirty_repo &&
-	git update-index --fsmonitor  &&
-	git ls-files -f >expect &&
-	test-tool dump-fsmonitor >&2 && echo &&
-	git update-index --fsmonitor --split-index &&
-	test-tool dump-fsmonitor >&2 && echo &&
-	git ls-files -f >actual &&
-	test_cmp expect actual
+	test_must_fail git rev-parse --verify HEAD
 
-fsmonitor last update 1638508191875058000
-------
-fsmonitor last update 1638508191875058000
----
-ok 26 - splitting the index results in the same state
+fatal: Needed a single revision
+ok 16 - failed merge leaves unborn branch in the womb
 
 expecting success: 
-	test_create_repo dot-git &&
-	(
-		cd dot-git &&
-		mkdir -p .git/hooks &&
-		: >tracked &&
-		: >modified &&
-		mkdir dir1 &&
-		: >dir1/tracked &&
-		: >dir1/modified &&
-		mkdir dir2 &&
-		: >dir2/tracked &&
-		: >dir2/modified &&
-		write_integration_script &&
-		git config core.fsmonitor .git/hooks/fsmonitor-test &&
-		git update-index --untracked-cache &&
-		git update-index --fsmonitor &&
-		GIT_TRACE_UNTRACKED_STATS="$TRASH_DIRECTORY/trace-before" \
-		git status &&
-		test-tool dump-untracked-cache >../before
-	) &&
-	cat >>dot-git/.git/hooks/fsmonitor-test <<-\EOF &&
-	printf ".git\0"
-	printf ".git/index\0"
-	printf "dir1/.git\0"
-	printf "dir1/.git/index\0"
-	EOF
-	(
-		cd dot-git &&
-		GIT_TRACE_UNTRACKED_STATS="$TRASH_DIRECTORY/trace-after" \
-		git status &&
-		test-tool dump-untracked-cache >../after
-	) &&
-	grep "directory invalidation" trace-before >>before &&
-	grep "directory invalidation" trace-after >>after &&
-	# UNTR extension unchanged, dir invalidation count unchanged
-	test_cmp before after
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7519-status-fsmonitor/dot-git/.git/
-On branch master
-
-No commits yet
-
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-
-	dir1/
-	dir2/
-	modified
-	tracked
-
-nothing added to commit but untracked files present (use "git add" to track)
-On branch master
-
-No commits yet
+	git symbolic-ref HEAD refs/heads/unborn &&
+	rm -f .git/index &&
+	echo foo > tracked-file &&
+	git add tracked-file &&
+	echo bar > untracked-file
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
+ok 17 - set up unborn branch and content
 
-	dir1/
-	dir2/
-	modified
-	tracked
+expecting success: 
+	git merge master &&
+	grep foo tracked-file &&
+	git show :tracked-file >expect &&
+	grep foo expect &&
+	grep bar untracked-file
 
-nothing added to commit but untracked files present (use "git add" to track)
-ok 27 - ignore .git changes when invalidating UNTR
+foo
+foo
+bar
+ok 18 - will not clobber WT/index when merging into unborn
 
-# passed all 27 test(s)
-1..27
+# passed all 18 test(s)
+1..18
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t7614-merge-signoff.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7614-merge-signoff/.git/
+*** t7608-merge-messages.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7608-merge-messages/.git/
 expecting success: 
-	test_setup
+	test_commit master-1 &&
+	git checkout -b local-branch &&
+	test_commit branch-1 &&
+	git checkout master &&
+	test_commit master-2 &&
+	git merge local-branch &&
+	check_oneline "Merge branch Qlocal-branchQ"
 
-[master (root-commit) c6c0069] Initial empty commit
+[master (root-commit) 7b5416a] master-1
  Author: A U Thor <author@example.com>
-Switched to a new branch 'other-branch'
-[other-branch cfb0fd3] other-branch
+ 1 file changed, 1 insertion(+)
+ create mode 100644 master-1.t
+Switched to a new branch 'local-branch'
+[local-branch f064301] branch-1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 file1
-ok 1 - setup
-
-expecting success: 
-	git checkout master &&
-	test_commit master-branch-2 file2 2 &&
-	git checkout other-branch &&
-	git merge master --signoff --no-edit &&
-	git cat-file commit HEAD | sed -e "1,/^\$/d" >actual &&
-	test_cmp expected-signed actual
-
+ create mode 100644 branch-1.t
 Switched to branch 'master'
-[master b9de090] master-branch-2
+[master 04af5f8] master-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'
+ create mode 100644 master-2.t
 Merging:
-cfb0fd3 other-branch
-virtual master
+04af5f8 master-2
+virtual local-branch
 found 1 common ancestor:
-c6c0069 Initial empty commit
+7b5416a master-1
 Merge made by the 'recursive' strategy.
- file2 | 1 +
+ branch-1.t | 1 +
  1 file changed, 1 insertion(+)
- create mode 100644 file2
-ok 2 - git merge --signoff adds a sign-off line
+ create mode 100644 branch-1.t
+ok 1 - merge local branch
 
 expecting success: 
+	git checkout -b octopus-a master &&
+	test_commit octopus-1 &&
+	git checkout -b octopus-b master &&
+	test_commit octopus-2 &&
 	git checkout master &&
-	test_commit master-branch-3 file3 3 &&
-	git checkout other-branch &&
-	git merge master --no-edit &&
-	git cat-file commit HEAD | sed -e "1,/^\$/d" >actual &&
-	test_cmp expected-unsigned actual
+	git merge octopus-a octopus-b &&
+	check_oneline "Merge branches Qoctopus-aQ and Qoctopus-bQ"
 
-Switched to branch 'master'
-[master 6089e59] master-branch-3
+Switched to a new branch 'octopus-a'
+[octopus-a 7226ae8] octopus-1
  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'
-Merging:
-0f9dc4c Merge branch 'master' into other-branch
-virtual master
-found 1 common ancestor:
-b9de090 master-branch-2
-Merge made by the 'recursive' strategy.
- file3 | 1 +
+ create mode 100644 octopus-1.t
+Switched to a new branch 'octopus-b'
+[octopus-b 9679e1e] octopus-2
+ Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 file3
-ok 3 - git merge does not add a sign-off line
+ create mode 100644 octopus-2.t
+Switched to branch 'master'
+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: 
+	git checkout -b tag-branch master &&
+	test_commit tag-1 &&
 	git checkout master &&
-	test_commit master-branch-4 file4 4 &&
-	git checkout other-branch &&
-	git merge master --no-edit --signoff --no-signoff &&
-	git cat-file commit HEAD | sed -e "1,/^\$/d" >actual &&
-	test_cmp expected-unsigned actual
+	test_commit master-3 &&
+	git merge tag-1 &&
+	check_oneline "Merge tag Qtag-1Q"
 
+Switched to a new branch 'tag-branch'
+[tag-branch 727cec4] tag-1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 tag-1.t
 Switched to branch 'master'
-[master 9764f57] master-branch-4
+[master 1834f00] master-3
  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'
+ create mode 100644 master-3.t
 Merging:
-be2ad4e Merge branch 'master' into other-branch
-virtual master
+1834f00 master-3
+virtual tag-1
 found 1 common ancestor:
-6089e59 master-branch-3
+b5672c0 Merge branches 'octopus-a' and 'octopus-b'
 Merge made by the 'recursive' strategy.
- file4 | 1 +
+ tag-1.t | 1 +
  1 file changed, 1 insertion(+)
- create mode 100644 file4
-ok 4 - git merge --no-signoff flag cancels --signoff flag
+ create mode 100644 tag-1.t
+ok 3 - merge tag
 
-# passed all 4 test(s)
-1..4
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t7602-merge-octopus-many.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7602-merge-octopus-many/.git/
 expecting success: 
-	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
+	git checkout -b ambiguous master &&
+	test_commit ambiguous &&
+	git checkout master &&
+	test_commit master-4 &&
+	git merge ambiguous &&
+	check_oneline "Merge tag QambiguousQ"
 
-[master (root-commit) 3c83d4d] c0
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c0.c
-HEAD is now at 3c83d4d c0
-[master 8b0305e] c1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c1.c
-HEAD is now at 3c83d4d c0
-[master e7d38fd] c2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c2.c
-HEAD is now at 3c83d4d c0
-[master b734609] c3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c3.c
-HEAD is now at 3c83d4d c0
-[master aa89446] c4
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c4.c
-HEAD is now at 3c83d4d c0
-[master e9ba7ce] c5
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c5.c
-HEAD is now at 3c83d4d c0
-[master 14cbfc5] c6
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c6.c
-HEAD is now at 3c83d4d c0
-[master 21a728f] c7
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c7.c
-HEAD is now at 3c83d4d c0
-[master 8d3c185] c8
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c8.c
-HEAD is now at 3c83d4d c0
-[master 71c747e] c9
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c9.c
-HEAD is now at 3c83d4d c0
-[master 1f9febf] c10
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c10.c
-HEAD is now at 3c83d4d c0
-[master d3982a8] c11
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c11.c
-HEAD is now at 3c83d4d c0
-[master 74c4407] c12
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c12.c
-HEAD is now at 3c83d4d c0
-[master 209c817] c13
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c13.c
-HEAD is now at 3c83d4d c0
-[master cab772e] c14
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c14.c
-HEAD is now at 3c83d4d c0
-[master c56a506] c15
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c15.c
-HEAD is now at 3c83d4d c0
-[master 4afcef2] c16
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c16.c
-HEAD is now at 3c83d4d c0
-[master 7a50525] c17
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c17.c
-HEAD is now at 3c83d4d c0
-[master aa48c43] c18
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c18.c
-HEAD is now at 3c83d4d c0
-[master 83a178d] c19
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c19.c
-HEAD is now at 3c83d4d c0
-[master bbe213d] c20
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c20.c
-HEAD is now at 3c83d4d c0
-[master 67497a0] c21
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c21.c
-HEAD is now at 3c83d4d c0
-[master 4efc366] c22
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c22.c
-HEAD is now at 3c83d4d c0
-[master 78c0252] c23
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c23.c
-HEAD is now at 3c83d4d c0
-[master 7e5b3a7] c24
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c24.c
-HEAD is now at 3c83d4d c0
-[master 484ab7b] c25
+Switched to a new branch 'ambiguous'
+[ambiguous 05dd8f8] ambiguous
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 c25.c
-HEAD is now at 3c83d4d c0
-[master 0e9c81a] c26
+ create mode 100644 ambiguous.t
+Switched to branch 'master'
+[master 4dad856] master-4
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 c26.c
-HEAD is now at 3c83d4d c0
-[master 6c87d78] c27
- Author: A U Thor <author@example.com>
+ create mode 100644 master-4.t
+warning: refname 'ambiguous' is ambiguous.
+warning: refname 'ambiguous' is ambiguous.
+Merging:
+4dad856 master-4
+virtual ambiguous
+found 1 common ancestor:
+cac54ed Merge tag 'tag-1'
+Merge made by the 'recursive' strategy.
+ ambiguous.t | 1 +
  1 file changed, 1 insertion(+)
- create mode 100644 c27.c
-HEAD is now at 3c83d4d c0
-[master bf1e05b] c28
+ create mode 100644 ambiguous.t
+ok 4 - ambiguous tag
+
+expecting success: 
+	git checkout -b remote master &&
+	test_commit remote-1 &&
+	git update-ref refs/remotes/origin/master remote &&
+	git checkout master &&
+	test_commit master-5 &&
+	git merge origin/master &&
+	check_oneline "Merge remote-tracking branch Qorigin/masterQ"
+
+Switched to a new branch 'remote'
+[remote bc66e06] remote-1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 c28.c
-HEAD is now at 3c83d4d c0
-[master f332ce1] c29
+ create mode 100644 remote-1.t
+Switched to branch 'master'
+[master ecb72d0] master-5
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 c29.c
-HEAD is now at 3c83d4d c0
-[master 9ca7e5f] c30
- Author: A U Thor <author@example.com>
+ create mode 100644 master-5.t
+Merging:
+ecb72d0 master-5
+virtual origin/master
+found 1 common ancestor:
+39902d7 Merge tag 'ambiguous'
+Merge made by the 'recursive' strategy.
+ remote-1.t | 1 +
  1 file changed, 1 insertion(+)
- create mode 100644 c30.c
-ok 1 - setup
-
-expecting success: 
-	git reset --hard c1 &&
-	i=2 &&
-	refs="" &&
-	while test $i -le 30
-	do
-		refs="$refs c$i"
-		i=$(expr $i + 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 8b0305e 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: 
-	git reset --hard c1 &&
-	git merge c2 c3 c4 >actual &&
-	test_i18ncmp expected actual
-
-HEAD is now at 8b0305e c1
-ok 3 - merge output uses pretty names
-
-expecting success: 
-	GIT_MERGE_VERBOSITY=0 git merge c4 c5 >actual &&
-	test_i18ncmp expected actual
-
-ok 4 - merge reduces irrelevant remote heads
-
-expecting success: 
-	git reset --hard c0 &&
-	git merge c1 c2 >actual &&
-	test_i18ncmp expected actual
-
-HEAD is now at 3c83d4d c0
-ok 5 - merge fast-forward output uses pretty names
+ create mode 100644 remote-1.t
+ok 5 - remote-tracking branch
 
 # passed all 5 test(s)
 1..5
@@ -294894,316 +294243,100 @@
 1..40
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t7611-merge-abort.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7611-merge-abort/.git/
+*** t7614-merge-signoff.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7614-merge-signoff/.git/
 expecting success: 
-	# 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 master
+	test_setup
 
-[master (root-commit) 2c18259] 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
-[master 932d6b7] second
+[master (root-commit) efeffda] Initial empty commit
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'conflict_branch'
-[conflict_branch 37997d5] conflict
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+), 2 deletions(-)
-Switched to a new branch 'clean_branch'
-[clean_branch c38077f] clean
+Switched to a new branch 'other-branch'
+[other-branch 1f74f12] other-branch
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to branch 'master'
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file1
 ok 1 - setup
 
 expecting success: 
-	test_must_fail git merge --abort 2>output &&
-	test_i18ngrep MERGE_HEAD output
-
-fatal: There is no merge to abort (MERGE_HEAD missing).
-ok 2 - fails without MERGE_HEAD (unstarted merge)
-
-expecting success: 
-	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: 
-	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_i18ngrep MERGE_HEAD output
+	git checkout master &&
+	test_commit master-branch-2 file2 2 &&
+	git checkout other-branch &&
+	git merge master --signoff --no-edit &&
+	git cat-file commit HEAD | sed -e "1,/^\$/d" >actual &&
+	test_cmp expected-signed actual
 
+Switched to branch 'master'
+[master fb3353c] master-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'
 Merging:
-932d6b7 second
-virtual clean_branch
+1f74f12 other-branch
+virtual master
 found 1 common ancestor:
-2c18259 initial
+efeffda Initial empty commit
 Merge made by the 'recursive' 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: 
-	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: 
-	git reset --hard "$pre_merge_head"
-
-HEAD is now at 932d6b7 second
-ok 6 - Forget previous merge
-
-expecting success: 
-	# 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)"
-
-Merging:
-932d6b7 second
-virtual clean_branch
-found 1 common ancestor:
-2c18259 initial
-Automatic merge went well; stopped before committing as requested
-ok 7 - Abort after --no-commit
-
-expecting success: 
-	# 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)"
-
-Merging:
-932d6b7 second
-virtual conflict_branch
-found 1 common ancestor:
-2c18259 initial
-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: 
-	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
-Merging:
-932d6b7 second
-virtual clean_branch
-found 1 common ancestor:
-2c18259 initial
-ok 9 - Clean merge with dirty index fails
-
-expecting success: 
-	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
-Merging:
-932d6b7 second
-virtual conflict_branch
-found 1 common ancestor:
-2c18259 initial
-ok 10 - Conflicting merge with dirty index fails
-
-expecting success: 
-	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: 
-	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
-
-Merging:
-932d6b7 second
-virtual clean_branch
-found 1 common ancestor:
-2c18259 initial
-Automatic merge went well; stopped before committing as requested
-ok 12 - Abort clean merge with non-conflicting dirty worktree
-
-expecting success: 
-	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
-
-Merging:
-932d6b7 second
-virtual conflict_branch
-found 1 common ancestor:
-2c18259 initial
-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: 
-	git reset --hard "$pre_merge_head"
-
-HEAD is now at 932d6b7 second
-ok 14 - Reset worktree changes
-
-expecting success: 
-	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
-error: merging of trees a2e7c2ef82c7194d05cb708830c1e88ce6875f1c and e9abbaa324044e9422619abeda250312320710b3 failed
-Merging:
-932d6b7 second
-virtual clean_branch
-found 1 common ancestor:
-2c18259 initial
-ok 15 - Fail clean merge with conflicting dirty worktree
-
-expecting success: 
-	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
-error: merging of trees a2e7c2ef82c7194d05cb708830c1e88ce6875f1c and abea744efbdcab1aeae53d0990d2140bdeb15bd4 failed
-Merging:
-932d6b7 second
-virtual conflict_branch
-found 1 common ancestor:
-2c18259 initial
-ok 16 - Fail conflicting merge with conflicting dirty worktree
-
-expecting success: 
-	git reset --hard "$pre_merge_head"
-
-HEAD is now at 932d6b7 second
-ok 17 - Reset worktree changes
+ file2 | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file2
+ok 2 - git merge --signoff adds a sign-off line
 
 expecting success: 
-	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
+	git checkout master &&
+	test_commit master-branch-3 file3 3 &&
+	git checkout other-branch &&
+	git merge master --no-edit &&
+	git cat-file commit HEAD | sed -e "1,/^\$/d" >actual &&
+	test_cmp expected-unsigned 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
-error: merging of trees a2e7c2ef82c7194d05cb708830c1e88ce6875f1c and e9abbaa324044e9422619abeda250312320710b3 failed
+Switched to branch 'master'
+[master df0507e] master-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'
 Merging:
-932d6b7 second
-virtual clean_branch
+03364df Merge branch 'master' into other-branch
+virtual master
 found 1 common ancestor:
-2c18259 initial
-ok 18 - Fail clean merge with matching dirty worktree
+fb3353c master-branch-2
+Merge made by the 'recursive' 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: 
-	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
+	git checkout master &&
+	test_commit master-branch-4 file4 4 &&
+	git checkout other-branch &&
+	git merge master --no-edit --signoff --no-signoff &&
+	git cat-file commit HEAD | sed -e "1,/^\$/d" >actual &&
+	test_cmp expected-unsigned 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
-error: merging of trees a2e7c2ef82c7194d05cb708830c1e88ce6875f1c and abea744efbdcab1aeae53d0990d2140bdeb15bd4 failed
+Switched to branch 'master'
+[master 5326e6b] master-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'
 Merging:
-932d6b7 second
-virtual conflict_branch
+a9342c9 Merge branch 'master' into other-branch
+virtual master
 found 1 common ancestor:
-2c18259 initial
-ok 19 - Fail conflicting merge with matching dirty worktree
+df0507e master-branch-3
+Merge made by the 'recursive' strategy.
+ file4 | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file4
+ok 4 - git merge --no-signoff flag cancels --signoff flag
 
-# passed all 19 test(s)
-1..19
+# passed all 4 test(s)
+1..4
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
 *** t7702-repack-cyclic-alternate.sh ***
@@ -295217,7 +294350,7 @@
 	git repack -adl &&
 	echo "$(pwd)"/.git/objects/../objects >.git/objects/info/alternates
 
-[master (root-commit) 55debb5] 1
+[master (root-commit) 2e253f4] 1
  Author: A U Thor <author@example.com>
  1 file changed, 0 insertions(+), 0 deletions(-)
  create mode 100644 a
@@ -295233,525 +294366,6 @@
 1..2
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t7812-grep-icase-non-ascii.sh ***
-Initialized empty Git repository in /build/git-2.20.1/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: 
-	test_write_lines "TILRAUN: Halló Heimur!" >file &&
-	git add file &&
-	LC_ALL="$is_IS_locale" &&
-	export LC_ALL
-
-ok 1 - setup
-
-expecting success: 
-	git grep -i "TILRAUN: Halló Heimur!" &&
-	git grep -i "TILRAUN: HALLÓ HEIMUR!"
-
-file:TILRAUN: Halló Heimur!
-file:TILRAUN: Halló Heimur!
-ok 2 - grep literal string, no -F
-
-expecting success: 
-	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 3 - grep pcre utf-8 icase
-
-expecting success: 
-	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 4 - grep pcre utf-8 string with "+"
-
-expecting success: 
-	git grep -i -F "TILRAUN: Halló Heimur!" &&
-	git grep -i -F "TILRAUN: HALLÓ HEIMUR!"
-
-file:TILRAUN: Halló Heimur!
-file:TILRAUN: Halló Heimur!
-ok 5 - grep literal string, with -F
-
-expecting success: 
-	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 6 - grep string with regex, with -F
-
-expecting success: 
-	git commit -m first &&
-	git log --format=%f -i -S"TILRAUN: HALLÓ HEIMUR!" >actual &&
-	echo first >expected &&
-	test_cmp expected actual
-
-[master (root-commit) 7933e36] 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 7 - pickaxe -i on non-ascii
-
-# passed all 7 test(s)
-1..7
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t7813-grep-icase-iso.sh ***
-Initialized empty Git repository in /build/git-2.20.1/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
-skipping test: setup 
-	printf "TILRAUN: Halló Heimur!" >file &&
-	git add file &&
-	LC_ALL="$is_IS_iso_locale" &&
-	export LC_ALL
-
-ok 1 # skip setup (missing GETTEXT_ISO_LOCALE)
-
-skipping test: grep pcre string 
-	git grep --perl-regexp -i "TILRAUN: H.lló Heimur!" &&
-	git grep --perl-regexp -i "TILRAUN: H.LLÓ HEIMUR!"
-
-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/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t7701-repack-unpack-unreachable.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7701-repack-unpack-unreachable/.git/
-expecting success: 
-	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 master &&
-	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 |
-		   egrep "^($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 |
-		   egrep "^($fsha1|$csha1|$tsha1) " |
-		   sort | uniq | wc -l) &&
-	git show $fsha1 &&
-	git show $csha1 &&
-	git show $tsha1
-
-[master (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 'master'
-[master 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: 
-	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: 
-	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: 
-	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: 
-	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
-
-[master 73784a1] make it reachable
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-my-unique-content
-ok 5 - keep packed objects found only in index
-
-expecting success: 
-	# 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 6 - repack -k keeps unreachable packed objects
-
-expecting success: 
-	# 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 7 - repack -k packs unreachable loose objects
-
-# passed all 7 test(s)
-1..7
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t7811-grep-open.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7811-grep-open/.git/
-expecting success: 
-	test_might_fail git config --unset core.pager &&
-	less=$(
-		unset PAGER GIT_PAGER;
-		git var GIT_PAGER
-	) &&
-	test -n "$less"
-
-ok 1 - determine default pager
-
-expecting success: 
-	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: 
-	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	2021-12-03 05:09:52.827666329 +0000
-+++ pager-args	2021-12-03 05:09:52.843665863 +0000
-@@ -1,2 +1 @@
--+/*GREP_PATTERN
- grep.h
-ok 3 - git grep -O
-
-expecting success: 
-	test_must_fail git grep --cached -O GREP_PATTERN >out 2>msg &&
-	test_i18ngrep open-files-in-pager msg
-
-fatal: --open-files-in-pager only works on the worktree
-ok 4 - git grep -O --cached
-
-expecting success: 
-	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: 
-	cat >less <<-\EOF &&
-	#!/bin/sh
-	printf "%s\n" "$@" >actual
-	EOF
-	chmod +x less
-
-ok 6 - setup: fake "less"
-
-expecting success: 
-	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: 
-	rm -f actual &&
-	cat >expect <<-\EOF &&
-	+/*enum grep_pat_token
-	grep.h
-	revision.c
-	subdir/grep.c
-	unrelated
-	EOF
-	>empty &&
-
-	echo "enum grep_pat_token" >unrelated &&
-	test_when_finished "git checkout HEAD unrelated" &&
-	GIT_PAGER=./less git grep -F -O "enum grep_pat_token" >out &&
-	test_cmp expect actual &&
-	test_must_be_empty out
-
-ok 8 - modified file
-
-expecting success: 
-	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: 
-	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/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
 *** t7003-filter-branch.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7003-filter-branch/.git/
 expecting success: 
@@ -295820,7 +294434,7 @@
 expecting success: 
 	git filter-branch branch
 
-
Rewrite 0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 (1/9) (0 seconds passed, remaining 0 predicted)    
Rewrite e86e54590a6764f0c4219b3fe8b5e971cd5a0ed8 (2/9) (0 seconds passed, remaining 0 predicted)    
Rewrite bd662c15882f4e7910b78fc26a3d8fe1ffa802e5 (3/9) (0 seconds passed, remaining 0 predicted)    
Rewrite 3abb9b554927997a06e6fafc3c62469a75ef32a3 (4/9) (0 seconds passed, remaining 0 predicted)    
Rewrite 48ac83b9774bbddb9c1cd6fe140d5380297aa69c (5/9) (0 seconds passed, remaining 0 predicted)    
Rewrite 0e63577b8a9dce52b69167d9c008f6a0e30de818 (6/9) (0 seconds passed, remaining 0 predicted)    
Rewrite 013e089e8403f3749848f7aafc6f271fb7179dbc (7/9) (0 seconds passed, remaining 0 predicted)    
Rewrite 3c39262d23e70569701d337b4d27a1e97512c2d9 (8/9) (0 seconds passed, remaining 0 predicted)    
Rewrite 110eac945dc1713b27bdf49e74e5805db66971f0 (9/9) (0 seconds passed, remaining 0 predicted)    
+
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
 
@@ -295894,8 +294508,8 @@
 
 
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)    
+
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) (1 seconds passed, remaining 0 predicted)    mv: cannot stat 'D.t': No such file or directory
+
Rewrite 013e089e8403f3749848f7aafc6f271fb7179dbc (6/9) (1 seconds passed, remaining 0 predicted)    
Rewrite 3c39262d23e70569701d337b4d27a1e97512c2d9 (6/9) (1 seconds passed, remaining 0 predicted)    
Rewrite 110eac945dc1713b27bdf49e74e5805db66971f0 (6/9) (1 seconds passed, remaining 0 predicted)    
 Ref 'refs/heads/branch' was rewritten
 ok 9 - rewrite, renaming a specific file
 
@@ -295912,9 +294526,9 @@
 
 
Rewrite 0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 (1/9) (0 seconds passed, remaining 0 predicted)    mv: cannot stat 'dir': No such file or directory
 
Rewrite e86e54590a6764f0c4219b3fe8b5e971cd5a0ed8 (2/9) (0 seconds passed, remaining 0 predicted)    mv: cannot stat 'dir': No such file or directory
-
Rewrite 3d6c5360ccb48d27bbc524f53496821309a1fc79 (3/9) (0 seconds passed, remaining 0 predicted)    mv: cannot stat 'dir': No such file or directory
-
Rewrite 28e3b83a5f2c2b87fa77b674df1529da9f4a66b4 (4/9) (0 seconds passed, remaining 0 predicted)    
Rewrite b0e1a7fc77c44f8710a324ce0cdaa5f0e3f41f41 (5/9) (0 seconds passed, remaining 0 predicted)    
Rewrite 0e63577b8a9dce52b69167d9c008f6a0e30de818 (6/9) (1 seconds passed, remaining 0 predicted)    mv: cannot stat 'dir': No such file or directory
-
Rewrite 284d35b48d5c7cf8f258f9d25690e5c3c38bb8c3 (6/9) (1 seconds passed, remaining 0 predicted)    
Rewrite 8d77ce9a0f051fe4d6b311099cfc061fc8fa238e (6/9) (1 seconds passed, remaining 0 predicted)    
Rewrite 3623c2fd76a1257ce6cfb529b64aa3e51d851ffd (6/9) (1 seconds passed, remaining 0 predicted)    
+
Rewrite 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
 
@@ -295932,7 +294546,7 @@
 	git filter-branch --state-branch state -f --tree-filter "touch file || :" HEAD
 
 Branch state does not exist. Will create
-
Rewrite 0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 (1/9) (0 seconds passed, remaining 0 predicted)    
Rewrite e86e54590a6764f0c4219b3fe8b5e971cd5a0ed8 (2/9) (0 seconds passed, remaining 0 predicted)    
Rewrite 3d6c5360ccb48d27bbc524f53496821309a1fc79 (3/9) (0 seconds passed, remaining 0 predicted)    
Rewrite ef5df644a239016a9035ed6fe3e7f2b4b4a349bd (4/9) (0 seconds passed, remaining 0 predicted)    
Rewrite d66aa888e8e10ccecac31b04a73b006afcfb6ab2 (5/9) (0 seconds passed, remaining 0 predicted)    
Rewrite 0e63577b8a9dce52b69167d9c008f6a0e30de818 (6/9) (1 seconds passed, remaining 0 predicted)    
Rewrite 095b78eb9c1f77139224464f38f1e0aff8add3cf (6/9) (1 seconds passed, remaining 0 predicted)    
Rewrite 20d07e95852c2683da5bd70d3badbd5028484552 (6/9) (1 seconds passed, remaining 0 predicted)    
Rewrite 8a3423ee5559c5e0c32440a860f6b09a0e6020fc (6/9) (1 seconds passed, remaining 0 predicted)    
+
Rewrite 0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 (1/9) (0 seconds passed, remaining 0 predicted)    
Rewrite e86e54590a6764f0c4219b3fe8b5e971cd5a0ed8 (2/9) (0 seconds passed, remaining 0 predicted)    
Rewrite 3d6c5360ccb48d27bbc524f53496821309a1fc79 (3/9) (0 seconds passed, remaining 0 predicted)    
Rewrite ef5df644a239016a9035ed6fe3e7f2b4b4a349bd (4/9) (0 seconds passed, remaining 0 predicted)    
Rewrite d66aa888e8e10ccecac31b04a73b006afcfb6ab2 (5/9) (0 seconds passed, remaining 0 predicted)    
Rewrite 0e63577b8a9dce52b69167d9c008f6a0e30de818 (6/9) (0 seconds passed, remaining 0 predicted)    
Rewrite 095b78eb9c1f77139224464f38f1e0aff8add3cf (7/9) (0 seconds passed, remaining 0 predicted)    
Rewrite 20d07e95852c2683da5bd70d3badbd5028484552 (8/9) (0 seconds passed, remaining 0 predicted)    
Rewrite 8a3423ee5559c5e0c32440a860f6b09a0e6020fc (9/9) (0 seconds passed, remaining 0 predicted)    
 Ref 'refs/heads/branch' was rewritten
 Saving rewrite state to state
 ok 13 - populate --state-branch
@@ -296067,7 +294681,7 @@
 		  mv \"\$GIT_INDEX_FILE.new\" \"\$GIT_INDEX_FILE\"" directorymoved &&
 	git diff --exit-code HEAD directorymoved:newsubdir
 
-
Rewrite 0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 (1/16) (0 seconds passed, remaining 0 predicted)    
Rewrite e86e54590a6764f0c4219b3fe8b5e971cd5a0ed8 (2/16) (0 seconds passed, remaining 0 predicted)    
Rewrite 0e63577b8a9dce52b69167d9c008f6a0e30de818 (3/16) (0 seconds passed, remaining 0 predicted)    
Rewrite 2744380f4984748b7b4c121c182e9c3330a609c5 (4/16) (1 seconds passed, remaining 3 predicted)    
Rewrite d3494446ffa0b10a4a22ad9db09ce4fe83ff7648 (4/16) (1 seconds passed, remaining 3 predicted)    
Rewrite 3d6c5360ccb48d27bbc524f53496821309a1fc79 (4/16) (1 seconds passed, remaining 3 predicted)    
Rewrite ef5df644a239016a9035ed6fe3e7f2b4b4a349bd (4/16) (1 seconds passed, remaining 3 predicted)    
Rewrite d66aa888e8e10ccecac31b04a73b006afcfb6ab2 (4/16) (1 seconds passed, remaining 3 predicted)    
Rewrite 095b78eb9c1f77139224464f38f1e0aff8add3cf (9/16) (1 seconds passed, remaining 0 predicted)    
Rewrite 20d07e95852c2683da5bd70d3badbd5028484552 (9/16) (1 seconds passed, remaining 0 predicted)    
Rewrite 8a3423ee5559c5e0c32440a860f6b09a0e6020fc (9/16) (1 seconds passed, remaining 0 predicted)    
Rewrite bb8f80d463b54137409c5a381ad07ea6bf4b1867 (9/16) (1 seconds passed, remaining 0 predicted)    
Rewrite 5bae69c6543c34be1d98816e26501bcda79d1d6b (9/16) (1 seconds passed, remaining 0 predicted)    
Rewrite 140072ead29d56d10c1c5c473c117e3aed45a333 (9/16) (1 seconds passed, remaining 0 predicted)    
Rewrite ead226bc0b53c5d210f2326ae871b0fea3004df3 (9/16) (1 seconds passed, remaining 0 predicted)    
Rewrite 7329f31555df2545350d15ecd0f5eab05e7142e1 (9/16) (1 seconds passed, remaining 0 predicted)    
+
Rewrite 0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 (1/16) (0 seconds passed, remaining 0 predicted)    
Rewrite e86e54590a6764f0c4219b3fe8b5e971cd5a0ed8 (2/16) (1 seconds passed, remaining 7 predicted)    
Rewrite 0e63577b8a9dce52b69167d9c008f6a0e30de818 (2/16) (1 seconds passed, remaining 7 predicted)    
Rewrite 2744380f4984748b7b4c121c182e9c3330a609c5 (2/16) (1 seconds passed, remaining 7 predicted)    
Rewrite d3494446ffa0b10a4a22ad9db09ce4fe83ff7648 (5/16) (1 seconds passed, remaining 2 predicted)    
Rewrite 3d6c5360ccb48d27bbc524f53496821309a1fc79 (5/16) (1 seconds passed, remaining 2 predicted)    
Rewrite ef5df644a239016a9035ed6fe3e7f2b4b4a349bd (5/16) (1 seconds passed, remaining 2 predicted)    
Rewrite d66aa888e8e10ccecac31b04a73b006afcfb6ab2 (5/16) (1 seconds passed, remaining 2 predicted)    
Rewrite 095b78eb9c1f77139224464f38f1e0aff8add3cf (5/16) (1 seconds passed, remaining 2 predicted)    
Rewrite 20d07e95852c2683da5bd70d3badbd5028484552 (5/16) (1 seconds passed, remaining 2 predicted)    
Rewrite 8a3423ee5559c5e0c32440a860f6b09a0e6020fc (11/16) (1 seconds passed, remaining 0 predicted)    
Rewrite bb8f80d463b54137409c5a381ad07ea6bf4b1867 (11/16) (1 seconds passed, remaining 0 predicted)    
Rewrite 5bae69c6543c34be1d98816e26501bcda79d1d6b (11/16) (1 seconds passed, remaining 0 predicted)    
Rewrite 140072ead29d56d10c1c5c473c117e3aed45a333 (11/16) (1 seconds passed, remaining 0 predicted)    
Rewrite ead226bc0b53c5d210f2326ae871b0fea3004df3 (11/16) (1 seconds passed, remaining 0 predicted)    
Rewrite 7329f31555df2545350d15ecd0f5eab05e7142e1 (11/16) (1 seconds passed, remaining 0 predicted)    
 Ref 'refs/heads/directorymoved' was rewritten
 ok 20 - use index-filter to move into a subdirectory
 
@@ -296098,7 +294712,7 @@
  Author: B V Uips <author@example.com>
  1 file changed, 0 insertions(+), 0 deletions(-)
  create mode 100644 i
-
Rewrite 0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 (1/17) (0 seconds passed, remaining 0 predicted)    
Rewrite e86e54590a6764f0c4219b3fe8b5e971cd5a0ed8 (2/17) (0 seconds passed, remaining 0 predicted)    
Rewrite 0e63577b8a9dce52b69167d9c008f6a0e30de818 (3/17) (0 seconds passed, remaining 0 predicted)    
Rewrite 2744380f4984748b7b4c121c182e9c3330a609c5 (4/17) (0 seconds passed, remaining 0 predicted)    
Rewrite d3494446ffa0b10a4a22ad9db09ce4fe83ff7648 (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) (1 seconds passed, remaining 0 predicted)    
Rewrite 7329f31555df2545350d15ecd0f5eab05e7142e1 (15/17) (1 seconds passed, remaining 0 predicted)    
Rewrite 2bfc21d43f33a03177145ce5f42ee28e86b0e4d2 (15/17) (1 seconds passed, remaining 0 predicted)    
+
Rewrite 0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 (1/17) (0 seconds passed, remaining 0 predicted)    
Rewrite e86e54590a6764f0c4219b3fe8b5e971cd5a0ed8 (2/17) (0 seconds passed, remaining 0 predicted)    
Rewrite 0e63577b8a9dce52b69167d9c008f6a0e30de818 (3/17) (1 seconds passed, remaining 4 predicted)    
Rewrite 2744380f4984748b7b4c121c182e9c3330a609c5 (3/17) (1 seconds passed, remaining 4 predicted)    
Rewrite d3494446ffa0b10a4a22ad9db09ce4fe83ff7648 (3/17) (1 seconds passed, remaining 4 predicted)    
Rewrite 3d6c5360ccb48d27bbc524f53496821309a1fc79 (3/17) (1 seconds passed, remaining 4 predicted)    
Rewrite ef5df644a239016a9035ed6fe3e7f2b4b4a349bd (7/17) (1 seconds passed, remaining 1 predicted)    
Rewrite d66aa888e8e10ccecac31b04a73b006afcfb6ab2 (7/17) (1 seconds passed, remaining 1 predicted)    
Rewrite 095b78eb9c1f77139224464f38f1e0aff8add3cf (7/17) (1 seconds passed, remaining 1 predicted)    
Rewrite 20d07e95852c2683da5bd70d3badbd5028484552 (7/17) (1 seconds passed, remaining 1 predicted)    
Rewrite 8a3423ee5559c5e0c32440a860f6b09a0e6020fc (7/17) (1 seconds passed, remaining 1 predicted)    
Rewrite bb8f80d463b54137409c5a381ad07ea6bf4b1867 (7/17) (1 seconds passed, remaining 1 predicted)    
Rewrite 5bae69c6543c34be1d98816e26501bcda79d1d6b (7/17) (1 seconds passed, remaining 1 predicted)    
Rewrite 140072ead29d56d10c1c5c473c117e3aed45a333 (7/17) (1 seconds passed, remaining 1 predicted)    
Rewrite ead226bc0b53c5d210f2326ae871b0fea3004df3 (15/17) (1 seconds passed, remaining 0 predicted)    
Rewrite 7329f31555df2545350d15ecd0f5eab05e7142e1 (15/17) (1 seconds passed, remaining 0 predicted)    
Rewrite 2bfc21d43f33a03177145ce5f42ee28e86b0e4d2 (15/17) (1 seconds passed, remaining 0 predicted)    
 Ref 'refs/heads/preserved-author' was rewritten
 ok 22 - author information is preserved
 
@@ -296123,7 +294737,7 @@
 [master 68862b3] 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 2744380f4984748b7b4c121c182e9c3330a609c5 (4/18) (0 seconds passed, remaining 0 predicted)    
Rewrite d3494446ffa0b10a4a22ad9db09ce4fe83ff7648 (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) (1 seconds passed, remaining 1 predicted)    
Rewrite 095b78eb9c1f77139224464f38f1e0aff8add3cf (8/18) (1 seconds passed, remaining 1 predicted)    
Rewrite 20d07e95852c2683da5bd70d3badbd5028484552 (8/18) (1 seconds passed, remaining 1 predicted)    
Rewrite 8a3423ee5559c5e0c32440a860f6b09a0e6020fc (8/18) (1 seconds passed, remaining 1 predicted)    
Rewrite bb8f80d463b54137409c5a381ad07ea6bf4b1867 (8/18) (1 seconds passed, remaining 1 predicted)    
Rewrite 5bae69c6543c34be1d98816e26501bcda79d1d6b (8/18) (1 seconds passed, remaining 1 predicted)    
Rewrite 140072ead29d56d10c1c5c473c117e3aed45a333 (8/18) (1 seconds passed, remaining 1 predicted)    
Rewrite ead226bc0b53c5d210f2326ae871b0fea3004df3 (8/18) (1 seconds passed, remaining 1 predicted)    
Rewrite 7329f31555df2545350d15ecd0f5eab05e7142e1 (8/18) (1 seconds passed, remaining 1 predicted)    
Rewrite 2bfc21d43f33a03177145ce5f42ee28e86b0e4d2 (17/18) (1 seconds passed, remaining 0 predicted)    
Rewrite 68862b396e34e966159af1904a1560522f345981 (17/18) (1 seconds passed, remaining 0 predicted)    
+
Rewrite 0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 (1/18) (0 seconds passed, remaining 0 predicted)    
Rewrite e86e54590a6764f0c4219b3fe8b5e971cd5a0ed8 (2/18) (0 seconds passed, remaining 0 predicted)    
Rewrite 0e63577b8a9dce52b69167d9c008f6a0e30de818 (3/18) (0 seconds passed, remaining 0 predicted)    
Rewrite 2744380f4984748b7b4c121c182e9c3330a609c5 (4/18) (0 seconds passed, remaining 0 predicted)    
Rewrite d3494446ffa0b10a4a22ad9db09ce4fe83ff7648 (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) (1 seconds passed, remaining 0 predicted)    
Rewrite 140072ead29d56d10c1c5c473c117e3aed45a333 (13/18) (1 seconds passed, remaining 0 predicted)    
Rewrite ead226bc0b53c5d210f2326ae871b0fea3004df3 (13/18) (1 seconds passed, remaining 0 predicted)    
Rewrite 7329f31555df2545350d15ecd0f5eab05e7142e1 (13/18) (1 seconds passed, remaining 0 predicted)    
Rewrite 2bfc21d43f33a03177145ce5f42ee28e86b0e4d2 (13/18) (1 seconds passed, remaining 0 predicted)    
Rewrite 68862b396e34e966159af1904a1560522f345981 (13/18) (1 seconds passed, remaining 0 predicted)    
 Ref 'refs/heads/removed-author' was rewritten
 ok 23 - remove a certain author's commits
 
@@ -296351,7 +294965,7 @@
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 to_remove.t
-
Rewrite 0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 (1/14) (0 seconds passed, remaining 0 predicted)    
Rewrite e86e54590a6764f0c4219b3fe8b5e971cd5a0ed8 (2/14) (0 seconds passed, remaining 0 predicted)    
Rewrite 3d6c5360ccb48d27bbc524f53496821309a1fc79 (3/14) (0 seconds passed, remaining 0 predicted)    
Rewrite ef5df644a239016a9035ed6fe3e7f2b4b4a349bd (4/14) (0 seconds passed, remaining 0 predicted)    
Rewrite d66aa888e8e10ccecac31b04a73b006afcfb6ab2 (5/14) (0 seconds passed, remaining 0 predicted)    
Rewrite 0e63577b8a9dce52b69167d9c008f6a0e30de818 (6/14) (0 seconds passed, remaining 0 predicted)    
Rewrite 095b78eb9c1f77139224464f38f1e0aff8add3cf (7/14) (1 seconds passed, remaining 1 predicted)    
Rewrite 20d07e95852c2683da5bd70d3badbd5028484552 (7/14) (1 seconds passed, remaining 1 predicted)    
Rewrite 8a3423ee5559c5e0c32440a860f6b09a0e6020fc (7/14) (1 seconds passed, remaining 1 predicted)    
Rewrite bb8f80d463b54137409c5a381ad07ea6bf4b1867 (7/14) (1 seconds passed, remaining 1 predicted)    
Rewrite 5bae69c6543c34be1d98816e26501bcda79d1d6b (7/14) (1 seconds passed, remaining 1 predicted)    
Rewrite 140072ead29d56d10c1c5c473c117e3aed45a333 (7/14) (1 seconds passed, remaining 1 predicted)    
Rewrite ead226bc0b53c5d210f2326ae871b0fea3004df3 (7/14) (1 seconds passed, remaining 1 predicted)    
Rewrite 219a992bdcfa9f21a6ac93c218579aed7936acdd (7/14) (1 seconds passed, remaining 1 predicted)    
+
Rewrite 0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 (1/14) (0 seconds passed, remaining 0 predicted)    
Rewrite e86e54590a6764f0c4219b3fe8b5e971cd5a0ed8 (2/14) (0 seconds passed, remaining 0 predicted)    
Rewrite 3d6c5360ccb48d27bbc524f53496821309a1fc79 (3/14) (1 seconds passed, remaining 3 predicted)    
Rewrite ef5df644a239016a9035ed6fe3e7f2b4b4a349bd (3/14) (1 seconds passed, remaining 3 predicted)    
Rewrite d66aa888e8e10ccecac31b04a73b006afcfb6ab2 (3/14) (1 seconds passed, remaining 3 predicted)    
Rewrite 0e63577b8a9dce52b69167d9c008f6a0e30de818 (3/14) (1 seconds passed, remaining 3 predicted)    
Rewrite 095b78eb9c1f77139224464f38f1e0aff8add3cf (7/14) (1 seconds passed, remaining 1 predicted)    
Rewrite 20d07e95852c2683da5bd70d3badbd5028484552 (7/14) (1 seconds passed, remaining 1 predicted)    
Rewrite 8a3423ee5559c5e0c32440a860f6b09a0e6020fc (7/14) (1 seconds passed, remaining 1 predicted)    
Rewrite bb8f80d463b54137409c5a381ad07ea6bf4b1867 (7/14) (1 seconds passed, remaining 1 predicted)    
Rewrite 5bae69c6543c34be1d98816e26501bcda79d1d6b (7/14) (1 seconds passed, remaining 1 predicted)    
Rewrite 140072ead29d56d10c1c5c473c117e3aed45a333 (7/14) (1 seconds passed, remaining 1 predicted)    
Rewrite ead226bc0b53c5d210f2326ae871b0fea3004df3 (7/14) (1 seconds passed, remaining 1 predicted)    
Rewrite 219a992bdcfa9f21a6ac93c218579aed7936acdd (7/14) (1 seconds passed, remaining 1 predicted)    
 Ref 'refs/heads/branch' was rewritten
 ok 33 - Prune empty commits
 
@@ -296379,7 +294993,7 @@
  to_remove_2.t | 1 +
  1 file changed, 1 insertion(+)
  create mode 100644 to_remove_2.t
-
Rewrite 0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 (1/15) (0 seconds passed, remaining 0 predicted)    
Rewrite e86e54590a6764f0c4219b3fe8b5e971cd5a0ed8 (2/15) (0 seconds passed, remaining 0 predicted)    
Rewrite 3d6c5360ccb48d27bbc524f53496821309a1fc79 (3/15) (0 seconds passed, remaining 0 predicted)    
Rewrite ef5df644a239016a9035ed6fe3e7f2b4b4a349bd (4/15) (0 seconds passed, remaining 0 predicted)    
Rewrite d66aa888e8e10ccecac31b04a73b006afcfb6ab2 (5/15) (0 seconds passed, remaining 0 predicted)    
Rewrite 0e63577b8a9dce52b69167d9c008f6a0e30de818 (6/15) (0 seconds passed, remaining 0 predicted)    
Rewrite 095b78eb9c1f77139224464f38f1e0aff8add3cf (7/15) (0 seconds passed, remaining 0 predicted)    
Rewrite 20d07e95852c2683da5bd70d3badbd5028484552 (8/15) (0 seconds passed, remaining 0 predicted)    
Rewrite 8a3423ee5559c5e0c32440a860f6b09a0e6020fc (9/15) (0 seconds passed, remaining 0 predicted)    
Rewrite bb8f80d463b54137409c5a381ad07ea6bf4b1867 (10/15) (1 seconds passed, remaining 0 predicted)    
Rewrite 5bae69c6543c34be1d98816e26501bcda79d1d6b (10/15) (1 seconds passed, remaining 0 predicted)    
Rewrite 140072ead29d56d10c1c5c473c117e3aed45a333 (10/15) (1 seconds passed, remaining 0 predicted)    
Rewrite ead226bc0b53c5d210f2326ae871b0fea3004df3 (10/15) (1 seconds passed, remaining 0 predicted)    
Rewrite cb86908a399a1a40c4270055e48259f9034a5458 (10/15) (1 seconds passed, remaining 0 predicted)    
Rewrite 61efb63b91ac2be151fa30bc4f43e001cd3b8c86 (10/15) (1 seconds passed, remaining 0 predicted)    
+
Rewrite 0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 (1/15) (0 seconds passed, remaining 0 predicted)    
Rewrite e86e54590a6764f0c4219b3fe8b5e971cd5a0ed8 (2/15) (0 seconds passed, remaining 0 predicted)    
Rewrite 3d6c5360ccb48d27bbc524f53496821309a1fc79 (3/15) (0 seconds passed, remaining 0 predicted)    
Rewrite ef5df644a239016a9035ed6fe3e7f2b4b4a349bd (4/15) (0 seconds passed, remaining 0 predicted)    
Rewrite d66aa888e8e10ccecac31b04a73b006afcfb6ab2 (5/15) (0 seconds passed, remaining 0 predicted)    
Rewrite 0e63577b8a9dce52b69167d9c008f6a0e30de818 (6/15) (0 seconds passed, remaining 0 predicted)    
Rewrite 095b78eb9c1f77139224464f38f1e0aff8add3cf (7/15) (1 seconds passed, remaining 1 predicted)    
Rewrite 20d07e95852c2683da5bd70d3badbd5028484552 (7/15) (1 seconds passed, remaining 1 predicted)    
Rewrite 8a3423ee5559c5e0c32440a860f6b09a0e6020fc (7/15) (1 seconds passed, remaining 1 predicted)    
Rewrite bb8f80d463b54137409c5a381ad07ea6bf4b1867 (7/15) (1 seconds passed, remaining 1 predicted)    
Rewrite 5bae69c6543c34be1d98816e26501bcda79d1d6b (7/15) (1 seconds passed, remaining 1 predicted)    
Rewrite 140072ead29d56d10c1c5c473c117e3aed45a333 (7/15) (1 seconds passed, remaining 1 predicted)    
Rewrite ead226bc0b53c5d210f2326ae871b0fea3004df3 (7/15) (1 seconds passed, remaining 1 predicted)    
Rewrite cb86908a399a1a40c4270055e48259f9034a5458 (7/15) (1 seconds passed, remaining 1 predicted)    
Rewrite 61efb63b91ac2be151fa30bc4f43e001cd3b8c86 (15/15) (1 seconds passed, remaining 0 predicted)    
 Ref 'refs/heads/branch' was rewritten
 ok 34 - prune empty collapsed merges
 
@@ -296392,7 +295006,7 @@
 
 [branch 5b6cb84] empty
  Author: A U Thor <author@example.com>
-
Rewrite 0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 (1/14) (0 seconds passed, remaining 0 predicted)    
Rewrite e86e54590a6764f0c4219b3fe8b5e971cd5a0ed8 (2/14) (0 seconds passed, remaining 0 predicted)    
Rewrite 3d6c5360ccb48d27bbc524f53496821309a1fc79 (3/14) (0 seconds passed, remaining 0 predicted)    
Rewrite ef5df644a239016a9035ed6fe3e7f2b4b4a349bd (4/14) (0 seconds passed, remaining 0 predicted)    
Rewrite d66aa888e8e10ccecac31b04a73b006afcfb6ab2 (5/14) (0 seconds passed, remaining 0 predicted)    
Rewrite 0e63577b8a9dce52b69167d9c008f6a0e30de818 (6/14) (0 seconds passed, remaining 0 predicted)    
Rewrite 095b78eb9c1f77139224464f38f1e0aff8add3cf (7/14) (0 seconds passed, remaining 0 predicted)    
Rewrite 20d07e95852c2683da5bd70d3badbd5028484552 (8/14) (0 seconds passed, remaining 0 predicted)    
Rewrite 8a3423ee5559c5e0c32440a860f6b09a0e6020fc (9/14) (0 seconds passed, remaining 0 predicted)    
Rewrite bb8f80d463b54137409c5a381ad07ea6bf4b1867 (10/14) (0 seconds passed, remaining 0 predicted)    
Rewrite 5bae69c6543c34be1d98816e26501bcda79d1d6b (11/14) (0 seconds passed, remaining 0 predicted)    
Rewrite 140072ead29d56d10c1c5c473c117e3aed45a333 (12/14) (0 seconds passed, remaining 0 predicted)    
Rewrite ead226bc0b53c5d210f2326ae871b0fea3004df3 (13/14) (0 seconds passed, remaining 0 predicted)    
Rewrite 5b6cb848f343668f1f75c3258a59d12c1680d67f (14/14) (0 seconds passed, remaining 0 predicted)    
+
Rewrite 0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 (1/14) (0 seconds passed, remaining 0 predicted)    
Rewrite e86e54590a6764f0c4219b3fe8b5e971cd5a0ed8 (2/14) (0 seconds passed, remaining 0 predicted)    
Rewrite 3d6c5360ccb48d27bbc524f53496821309a1fc79 (3/14) (0 seconds passed, remaining 0 predicted)    
Rewrite ef5df644a239016a9035ed6fe3e7f2b4b4a349bd (4/14) (0 seconds passed, remaining 0 predicted)    
Rewrite d66aa888e8e10ccecac31b04a73b006afcfb6ab2 (5/14) (0 seconds passed, remaining 0 predicted)    
Rewrite 0e63577b8a9dce52b69167d9c008f6a0e30de818 (6/14) (0 seconds passed, remaining 0 predicted)    
Rewrite 095b78eb9c1f77139224464f38f1e0aff8add3cf (7/14) (0 seconds passed, remaining 0 predicted)    
Rewrite 20d07e95852c2683da5bd70d3badbd5028484552 (8/14) (0 seconds passed, remaining 0 predicted)    
Rewrite 8a3423ee5559c5e0c32440a860f6b09a0e6020fc (9/14) (0 seconds passed, remaining 0 predicted)    
Rewrite bb8f80d463b54137409c5a381ad07ea6bf4b1867 (10/14) (0 seconds passed, remaining 0 predicted)    
Rewrite 5bae69c6543c34be1d98816e26501bcda79d1d6b (11/14) (0 seconds passed, remaining 0 predicted)    
Rewrite 140072ead29d56d10c1c5c473c117e3aed45a333 (12/14) (0 seconds passed, remaining 0 predicted)    
Rewrite ead226bc0b53c5d210f2326ae871b0fea3004df3 (13/14) (0 seconds passed, remaining 0 predicted)    
Rewrite 5b6cb848f343668f1f75c3258a59d12c1680d67f (14/14) (1 seconds passed, remaining 0 predicted)    
 Ref 'refs/heads/branch' was rewritten
 ok 35 - prune empty works even without index/tree filters
 
@@ -296404,7 +295018,7 @@
 	git branch -D testing &&
 	test_cmp expect actual
 
-
Rewrite 0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 (1/9) (0 seconds passed, remaining 0 predicted)    
Rewrite e86e54590a6764f0c4219b3fe8b5e971cd5a0ed8 (2/9) (0 seconds passed, remaining 0 predicted)    
Rewrite bd662c15882f4e7910b78fc26a3d8fe1ffa802e5 (3/9) (0 seconds passed, remaining 0 predicted)    
Rewrite 3abb9b554927997a06e6fafc3c62469a75ef32a3 (4/9) (0 seconds passed, remaining 0 predicted)    
Rewrite 48ac83b9774bbddb9c1cd6fe140d5380297aa69c (5/9) (0 seconds passed, remaining 0 predicted)    
Rewrite 0e63577b8a9dce52b69167d9c008f6a0e30de818 (6/9) (0 seconds passed, remaining 0 predicted)    
Rewrite 013e089e8403f3749848f7aafc6f271fb7179dbc (7/9) (0 seconds passed, remaining 0 predicted)    
Rewrite 3c39262d23e70569701d337b4d27a1e97512c2d9 (8/9) (0 seconds passed, remaining 0 predicted)    
Rewrite 110eac945dc1713b27bdf49e74e5805db66971f0 (9/9) (0 seconds passed, remaining 0 predicted)    
+
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)    
 Ref 'refs/heads/testing' was rewritten
 Deleted branch testing (was 00fc75b).
 ok 36 - --prune-empty is able to prune root commit
@@ -296415,7 +295029,7 @@
 	test_path_is_missing .git/refs/heads/prune-entire &&
 	test_must_fail git reflog exists refs/heads/prune-entire
 
-
Rewrite 0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 (1/2) (0 seconds passed, remaining 0 predicted)    
Rewrite e86e54590a6764f0c4219b3fe8b5e971cd5a0ed8 (2/2) (1 seconds passed, remaining 0 predicted)    
+
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
 ok 37 - --prune-empty is able to prune entire branch
 
@@ -296546,7 +295160,7 @@
 					 } || :" HEAD &&
 	test $orig_head != $(git show-ref --hash --head HEAD)
 
-
Rewrite cc5d7558673710c1da61856fa53718f4fe4029c5 (1/4) (0 seconds passed, remaining 0 predicted)    
Rewrite 3c3a2977a7686d58a5bc18a73fec6f5426367554 (2/4) (1 seconds passed, remaining 1 predicted)    
Rewrite c887a35a6b375a71cf748cc455e4e6974949c44b (2/4) (1 seconds passed, remaining 1 predicted)    
Rewrite 55e7f7f5c6b8aa2c16038f4d55571f44524b1af5 (2/4) (1 seconds passed, remaining 1 predicted)    
+
Rewrite cc5d7558673710c1da61856fa53718f4fe4029c5 (1/4) (0 seconds passed, remaining 0 predicted)    
Rewrite 3c3a2977a7686d58a5bc18a73fec6f5426367554 (2/4) (0 seconds passed, remaining 0 predicted)    
Rewrite c887a35a6b375a71cf748cc455e4e6974949c44b (3/4) (0 seconds passed, remaining 0 predicted)    
Rewrite 55e7f7f5c6b8aa2c16038f4d55571f44524b1af5 (4/4) (1 seconds passed, remaining 0 predicted)    
 Ref 'refs/heads/master' was rewritten
 warning: unable to rmdir 'submod': Directory not empty
 ok 41 - rewrite submodule with another content
@@ -296612,6 +295226,1154 @@
 1..45
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
+*** t7611-merge-abort.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7611-merge-abort/.git/
+expecting success: 
+	# 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 master
+
+[master (root-commit) 97734c0] 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
+[master 3eff477] second
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'conflict_branch'
+[conflict_branch b9b342c] conflict
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+Switched to a new branch 'clean_branch'
+[clean_branch 277f324] clean
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to branch 'master'
+ok 1 - setup
+
+expecting success: 
+	test_must_fail git merge --abort 2>output &&
+	test_i18ngrep MERGE_HEAD output
+
+fatal: There is no merge to abort (MERGE_HEAD missing).
+ok 2 - fails without MERGE_HEAD (unstarted merge)
+
+expecting success: 
+	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: 
+	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_i18ngrep MERGE_HEAD output
+
+Merging:
+3eff477 second
+virtual clean_branch
+found 1 common ancestor:
+97734c0 initial
+Merge made by the 'recursive' 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: 
+	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: 
+	git reset --hard "$pre_merge_head"
+
+HEAD is now at 3eff477 second
+ok 6 - Forget previous merge
+
+expecting success: 
+	# 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)"
+
+Merging:
+3eff477 second
+virtual clean_branch
+found 1 common ancestor:
+97734c0 initial
+Automatic merge went well; stopped before committing as requested
+ok 7 - Abort after --no-commit
+
+expecting success: 
+	# 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)"
+
+Merging:
+3eff477 second
+virtual conflict_branch
+found 1 common ancestor:
+97734c0 initial
+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: 
+	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
+Merging:
+3eff477 second
+virtual clean_branch
+found 1 common ancestor:
+97734c0 initial
+ok 9 - Clean merge with dirty index fails
+
+expecting success: 
+	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
+Merging:
+3eff477 second
+virtual conflict_branch
+found 1 common ancestor:
+97734c0 initial
+ok 10 - Conflicting merge with dirty index fails
+
+expecting success: 
+	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: 
+	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
+
+Merging:
+3eff477 second
+virtual clean_branch
+found 1 common ancestor:
+97734c0 initial
+Automatic merge went well; stopped before committing as requested
+ok 12 - Abort clean merge with non-conflicting dirty worktree
+
+expecting success: 
+	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
+
+Merging:
+3eff477 second
+virtual conflict_branch
+found 1 common ancestor:
+97734c0 initial
+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: 
+	git reset --hard "$pre_merge_head"
+
+HEAD is now at 3eff477 second
+ok 14 - Reset worktree changes
+
+expecting success: 
+	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
+error: merging of trees a2e7c2ef82c7194d05cb708830c1e88ce6875f1c and e9abbaa324044e9422619abeda250312320710b3 failed
+Merging:
+3eff477 second
+virtual clean_branch
+found 1 common ancestor:
+97734c0 initial
+ok 15 - Fail clean merge with conflicting dirty worktree
+
+expecting success: 
+	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
+error: merging of trees a2e7c2ef82c7194d05cb708830c1e88ce6875f1c and abea744efbdcab1aeae53d0990d2140bdeb15bd4 failed
+Merging:
+3eff477 second
+virtual conflict_branch
+found 1 common ancestor:
+97734c0 initial
+ok 16 - Fail conflicting merge with conflicting dirty worktree
+
+expecting success: 
+	git reset --hard "$pre_merge_head"
+
+HEAD is now at 3eff477 second
+ok 17 - Reset worktree changes
+
+expecting success: 
+	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
+error: merging of trees a2e7c2ef82c7194d05cb708830c1e88ce6875f1c and e9abbaa324044e9422619abeda250312320710b3 failed
+Merging:
+3eff477 second
+virtual clean_branch
+found 1 common ancestor:
+97734c0 initial
+ok 18 - Fail clean merge with matching dirty worktree
+
+expecting success: 
+	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
+error: merging of trees a2e7c2ef82c7194d05cb708830c1e88ce6875f1c and abea744efbdcab1aeae53d0990d2140bdeb15bd4 failed
+Merging:
+3eff477 second
+virtual conflict_branch
+found 1 common ancestor:
+97734c0 initial
+ok 19 - Fail conflicting merge with matching dirty worktree
+
+# passed all 19 test(s)
+1..19
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t7701-repack-unpack-unreachable.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7701-repack-unpack-unreachable/.git/
+expecting success: 
+	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 master &&
+	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 |
+		   egrep "^($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 |
+		   egrep "^($fsha1|$csha1|$tsha1) " |
+		   sort | uniq | wc -l) &&
+	git show $fsha1 &&
+	git show $csha1 &&
+	git show $tsha1
+
+[master (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 'master'
+[master 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: 
+	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: 
+	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: 
+	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: 
+	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
+
+[master 73784a1] make it reachable
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+my-unique-content
+ok 5 - keep packed objects found only in index
+
+expecting success: 
+	# 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 6 - repack -k keeps unreachable packed objects
+
+expecting success: 
+	# 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 7 - repack -k packs unreachable loose objects
+
+# passed all 7 test(s)
+1..7
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t7602-merge-octopus-many.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7602-merge-octopus-many/.git/
+expecting success: 
+	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) f3feff8] c0
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c0.c
+HEAD is now at f3feff8 c0
+[master 4ca56d9] c1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c1.c
+HEAD is now at f3feff8 c0
+[master 1a831db] c2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c2.c
+HEAD is now at f3feff8 c0
+[master 6961fff] c3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c3.c
+HEAD is now at f3feff8 c0
+[master 2a6c5e3] c4
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c4.c
+HEAD is now at f3feff8 c0
+[master 4e8a7ca] c5
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c5.c
+HEAD is now at f3feff8 c0
+[master 09a422f] c6
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c6.c
+HEAD is now at f3feff8 c0
+[master 4d813be] c7
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c7.c
+HEAD is now at f3feff8 c0
+[master db6692d] c8
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c8.c
+HEAD is now at f3feff8 c0
+[master cd55e0a] c9
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c9.c
+HEAD is now at f3feff8 c0
+[master 6bdeefa] c10
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c10.c
+HEAD is now at f3feff8 c0
+[master 10a7a5b] c11
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c11.c
+HEAD is now at f3feff8 c0
+[master dffc787] c12
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c12.c
+HEAD is now at f3feff8 c0
+[master 98072b8] c13
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c13.c
+HEAD is now at f3feff8 c0
+[master 54ef376] c14
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c14.c
+HEAD is now at f3feff8 c0
+[master 4dac216] c15
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c15.c
+HEAD is now at f3feff8 c0
+[master 2069036] c16
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c16.c
+HEAD is now at f3feff8 c0
+[master 1ad652a] c17
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c17.c
+HEAD is now at f3feff8 c0
+[master c1ee49e] c18
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c18.c
+HEAD is now at f3feff8 c0
+[master 2106d92] c19
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c19.c
+HEAD is now at f3feff8 c0
+[master f7952b7] c20
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c20.c
+HEAD is now at f3feff8 c0
+[master bafa224] c21
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c21.c
+HEAD is now at f3feff8 c0
+[master 4a64c4a] c22
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c22.c
+HEAD is now at f3feff8 c0
+[master 58ca040] c23
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c23.c
+HEAD is now at f3feff8 c0
+[master 93546f0] c24
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c24.c
+HEAD is now at f3feff8 c0
+[master 67ff8b9] c25
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c25.c
+HEAD is now at f3feff8 c0
+[master e454046] c26
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c26.c
+HEAD is now at f3feff8 c0
+[master 396019c] c27
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c27.c
+HEAD is now at f3feff8 c0
+[master 53a9277] c28
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c28.c
+HEAD is now at f3feff8 c0
+[master 9214b73] c29
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c29.c
+HEAD is now at f3feff8 c0
+[master cedba7d] c30
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c30.c
+ok 1 - setup
+
+expecting success: 
+	git reset --hard c1 &&
+	i=2 &&
+	refs="" &&
+	while test $i -le 30
+	do
+		refs="$refs c$i"
+		i=$(expr $i + 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 4ca56d9 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: 
+	git reset --hard c1 &&
+	git merge c2 c3 c4 >actual &&
+	test_i18ncmp expected actual
+
+HEAD is now at 4ca56d9 c1
+ok 3 - merge output uses pretty names
+
+expecting success: 
+	GIT_MERGE_VERBOSITY=0 git merge c4 c5 >actual &&
+	test_i18ncmp expected actual
+
+ok 4 - merge reduces irrelevant remote heads
+
+expecting success: 
+	git reset --hard c0 &&
+	git merge c1 c2 >actual &&
+	test_i18ncmp expected actual
+
+HEAD is now at f3feff8 c0
+ok 5 - merge fast-forward output uses pretty names
+
+# passed all 5 test(s)
+1..5
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t7813-grep-icase-iso.sh ***
+Initialized empty Git repository in /build/git-2.20.1/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
+skipping test: setup 
+	printf "TILRAUN: Halló Heimur!" >file &&
+	git add file &&
+	LC_ALL="$is_IS_iso_locale" &&
+	export LC_ALL
+
+ok 1 # skip setup (missing GETTEXT_ISO_LOCALE)
+
+skipping test: grep pcre string 
+	git grep --perl-regexp -i "TILRAUN: H.lló Heimur!" &&
+	git grep --perl-regexp -i "TILRAUN: H.LLÓ HEIMUR!"
+
+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/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t7812-grep-icase-non-ascii.sh ***
+Initialized empty Git repository in /build/git-2.20.1/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: 
+	test_write_lines "TILRAUN: Halló Heimur!" >file &&
+	git add file &&
+	LC_ALL="$is_IS_locale" &&
+	export LC_ALL
+
+ok 1 - setup
+
+expecting success: 
+	git grep -i "TILRAUN: Halló Heimur!" &&
+	git grep -i "TILRAUN: HALLÓ HEIMUR!"
+
+file:TILRAUN: Halló Heimur!
+file:TILRAUN: Halló Heimur!
+ok 2 - grep literal string, no -F
+
+expecting success: 
+	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 3 - grep pcre utf-8 icase
+
+expecting success: 
+	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 4 - grep pcre utf-8 string with "+"
+
+expecting success: 
+	git grep -i -F "TILRAUN: Halló Heimur!" &&
+	git grep -i -F "TILRAUN: HALLÓ HEIMUR!"
+
+file:TILRAUN: Halló Heimur!
+file:TILRAUN: Halló Heimur!
+ok 5 - grep literal string, with -F
+
+expecting success: 
+	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 6 - grep string with regex, with -F
+
+expecting success: 
+	git commit -m first &&
+	git log --format=%f -i -S"TILRAUN: HALLÓ HEIMUR!" >actual &&
+	echo first >expected &&
+	test_cmp expected actual
+
+[master (root-commit) df79df6] 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 7 - pickaxe -i on non-ascii
+
+# passed all 7 test(s)
+1..7
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t7811-grep-open.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7811-grep-open/.git/
+expecting success: 
+	test_might_fail git config --unset core.pager &&
+	less=$(
+		unset PAGER GIT_PAGER;
+		git var GIT_PAGER
+	) &&
+	test -n "$less"
+
+ok 1 - determine default pager
+
+expecting success: 
+	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: 
+	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	2023-01-05 11:50:06.766868030 +0000
++++ pager-args	2023-01-05 11:50:06.778868030 +0000
+@@ -1,2 +1 @@
+-+/*GREP_PATTERN
+ grep.h
+ok 3 - git grep -O
+
+expecting success: 
+	test_must_fail git grep --cached -O GREP_PATTERN >out 2>msg &&
+	test_i18ngrep open-files-in-pager msg
+
+fatal: --open-files-in-pager only works on the worktree
+ok 4 - git grep -O --cached
+
+expecting success: 
+	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: 
+	cat >less <<-\EOF &&
+	#!/bin/sh
+	printf "%s\n" "$@" >actual
+	EOF
+	chmod +x less
+
+ok 6 - setup: fake "less"
+
+expecting success: 
+	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: 
+	rm -f actual &&
+	cat >expect <<-\EOF &&
+	+/*enum grep_pat_token
+	grep.h
+	revision.c
+	subdir/grep.c
+	unrelated
+	EOF
+	>empty &&
+
+	echo "enum grep_pat_token" >unrelated &&
+	test_when_finished "git checkout HEAD unrelated" &&
+	GIT_PAGER=./less git grep -F -O "enum grep_pat_token" >out &&
+	test_cmp expect actual &&
+	test_must_be_empty out
+
+ok 8 - modified file
+
+expecting success: 
+	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: 
+	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/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
 *** t7700-repack.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7700-repack/.git/
 expecting success: 
@@ -296965,44 +296727,44 @@
 		echo merge failed - test is setup
 	fi
 
-[master (root-commit) 93aac00] file1.a
+[master (root-commit) dab8ae0] 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 9b6351d] ugly
+[foo 41e6cad] ugly
  Author: U Gly <ug@localhost>
  2 files changed, 2 insertions(+), 1 deletion(-)
  delete mode 100644 file1
  create mode 100644 file2
 Switched to branch 'master'
-[master f536e65] file1.b
+[master 2f33978] file1.b
  Author: Old Line <ol@localhost>
  1 file changed, 3 insertions(+)
 Switched to branch 'foo'
 Merging:
-9b6351d ugly
+41e6cad ugly
 virtual master
 found 1 common ancestor:
-93aac00 file1.a
+dab8ae0 file1.a
 CONFLICT (modify/delete): file1 deleted in HEAD and modified in master. Version master of file1 left in tree.
 Automatic merge failed; fix conflicts and then commit the result.
 merge failed - resolving automatically
 file1: needs merge
 rm 'file1'
-[foo a788d20] merged
+[foo d64ac85] merged
  Author: M Result <mr@localhost>
 Switched to branch 'master'
-[master a99ccdf] replace
+[master 8f860a8] replace
  Author: No Bla <nb@localhost>
  1 file changed, 1 insertion(+), 1 deletion(-)
 Switched to branch 'foo'
 Merging:
-a788d20 merged
+d64ac85 merged
 virtual master
 found 1 common ancestor:
-f536e65 file1.b
+2f33978 file1.b
 CONFLICT (modify/delete): file1 deleted in HEAD and modified in master. Version master of file1 left in tree.
 Automatic merge failed; fix conflicts and then commit the result.
 merge failed - test is setup
@@ -297011,26 +296773,524 @@
 expecting success: 
 	git blame file2
 
-9b6351d2 (U Gly    2021-12-03 05:09:54 +0000 1) New line ...
-9b6351d2 (U Gly    2021-12-03 05:09:54 +0000 2) ... and more
-a788d206 (M Result 2021-12-03 05:09:54 +0000 3) 
-a788d206 (M Result 2021-12-03 05:09:54 +0000 4) bla
-a788d206 (M Result 2021-12-03 05:09:54 +0000 5) Even more
+41e6cadf (U Gly    2023-01-05 11:50:07 +0000 1) New line ...
+41e6cadf (U Gly    2023-01-05 11:50:07 +0000 2) ... and more
+d64ac858 (M Result 2023-01-05 11:50:07 +0000 3) 
+d64ac858 (M Result 2023-01-05 11:50:07 +0000 4) bla
+d64ac858 (M Result 2023-01-05 11:50:07 +0000 5) Even more
 ok 2 - blame runs on unconflicted file while other file has conflicts
 
 expecting success: 
 	git blame file1
 
-^93aac00 (Old Line 2021-12-03 05:09:54 +0000 1) Old line
-f536e653 (Old Line 2021-12-03 05:09:54 +0000 2) 
-f536e653 (Old Line 2021-12-03 05:09:54 +0000 3) 
-a99ccdfe (No Bla   2021-12-03 05:09:54 +0000 4) foo
+^dab8ae0 (Old Line 2023-01-05 11:50:07 +0000 1) Old line
+2f33978f (Old Line 2023-01-05 11:50:07 +0000 2) 
+2f33978f (Old Line 2023-01-05 11:50:07 +0000 3) 
+8f860a81 (No Bla   2023-01-05 11:50:07 +0000 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/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
+*** t7519-status-fsmonitor.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7519-status-fsmonitor/.git/
+expecting success: 
+	mkdir -p .git/hooks &&
+	: >tracked &&
+	: >modified &&
+	mkdir dir1 &&
+	: >dir1/tracked &&
+	: >dir1/modified &&
+	mkdir dir2 &&
+	: >dir2/tracked &&
+	: >dir2/modified &&
+	git -c core.fsmonitor= add . &&
+	git -c core.fsmonitor= commit -m initial &&
+	git config core.fsmonitor .git/hooks/fsmonitor-test &&
+	cat >.gitignore <<-\EOF
+	.gitignore
+	expect*
+	actual*
+	marker*
+	EOF
+
+[master (root-commit) 1960b5b] initial
+ Author: A U Thor <author@example.com>
+ 6 files changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 dir1/modified
+ create mode 100644 dir1/tracked
+ create mode 100644 dir2/modified
+ create mode 100644 dir2/tracked
+ create mode 100644 modified
+ create mode 100644 tracked
+ok 1 - setup
+
+expecting success: 
+	test-tool dump-fsmonitor >actual &&
+	grep "^no fsmonitor" actual
+
+no fsmonitor
+ok 2 - fsmonitor extension is off by default
+
+expecting success: 
+	git update-index --fsmonitor &&
+	test-tool dump-fsmonitor >actual &&
+	grep "^fsmonitor last update" actual
+
+fatal: cannot run .git/hooks/fsmonitor-test: No such file or directory
+fsmonitor last update 1672919400235482406
+ok 3 - update-index --fsmonitor" adds the fsmonitor extension
+
+expecting success: 
+	git update-index --no-fsmonitor &&
+	test-tool dump-fsmonitor >actual &&
+	grep "^no fsmonitor" actual
+
+warning: core.fsmonitor is set; remove it if you really want to disable fsmonitor
+no fsmonitor
+ok 4 - update-index --no-fsmonitor" removes the fsmonitor extension
+
+expecting success: 
+	git update-index --fsmonitor &&
+	git update-index --fsmonitor-valid dir1/modified &&
+	git update-index --fsmonitor-valid dir2/modified &&
+	git update-index --fsmonitor-valid modified &&
+	git ls-files -f >actual &&
+	test_cmp expect actual
+
+fatal: cannot run .git/hooks/fsmonitor-test: No such file or directory
+ok 5 - update-index --fsmonitor-valid" sets the fsmonitor valid bit
+
+expecting success: 
+	git update-index --no-fsmonitor-valid dir1/modified &&
+	git update-index --no-fsmonitor-valid dir2/modified &&
+	git update-index --no-fsmonitor-valid modified &&
+	git ls-files -f >actual &&
+	test_cmp expect actual
+
+ok 6 - update-index --no-fsmonitor-valid" clears the fsmonitor valid bit
+
+expecting success: 
+	write_integration_script &&
+	dirty_repo &&
+	git update-index --fsmonitor &&
+	git ls-files -f >actual &&
+	test_cmp expect actual
+
+ok 7 - all files returned by integration script get flagged as invalid
+
+expecting success: 
+	git add new &&
+	git add dir1/new &&
+	git add dir2/new &&
+	git ls-files -f >actual &&
+	test_cmp expect actual
+
+ok 8 - newly added files are marked valid
+
+expecting success: 
+	# modified files result in update-index returning 1
+	test_must_fail git update-index --refresh --force-write-index &&
+	git ls-files -f >actual &&
+	test_cmp expect actual
+
+dir1/modified: needs update
+dir2/modified: needs update
+modified: needs update
+ok 9 - all unmodified files get marked valid
+
+expecting success: 
+	write_script .git/hooks/fsmonitor-test<<-\EOF &&
+	printf "dir1/modified\0"
+	EOF
+	clean_repo &&
+	git update-index --refresh --force-write-index &&
+	echo 1 >modified &&
+	echo 2 >dir1/modified &&
+	echo 3 >dir2/modified &&
+	test_must_fail git update-index --refresh --force-write-index &&
+	git ls-files -f >actual &&
+	test_cmp expect actual
+
+HEAD is now at 1960b5b initial
+Removing dir1/untracked
+Removing dir2/untracked
+Removing untracked
+dir1/modified: needs update
+ok 10 - *only* files returned by the integration script get flagged as invalid
+
+expecting success: 
+	write_script .git/hooks/fsmonitor-test<<-\EOF &&
+	EOF
+	clean_repo &&
+	dirty_repo &&
+	git add . &&
+	git commit -m "to reset" &&
+	git reset HEAD~1 &&
+	git status >actual &&
+	git -c core.fsmonitor= status >expect &&
+	test_i18ncmp expect actual
+
+HEAD is now at 1960b5b initial
+[master 972ad3a] to reset
+ Author: A U Thor <author@example.com>
+ 9 files changed, 6 insertions(+)
+ create mode 100644 dir1/new
+ create mode 100644 dir1/untracked
+ create mode 100644 dir2/new
+ create mode 100644 dir2/untracked
+ create mode 100644 new
+ create mode 100644 untracked
+Unstaged changes after reset:
+M	dir1/modified
+M	dir2/modified
+M	modified
+ok 11 - refresh_index() invalidates fsmonitor cache
+
+expecting success: 
+		git config core.preloadIndex $preload_val &&
+		if test $preload_val = true
+		then
+			GIT_TEST_PRELOAD_INDEX=$preload_val; export GIT_TEST_PRELOAD_INDEX
+		else
+			sane_unset GIT_TEST_PRELOAD_INDEX
+		fi
+	
+ok 12 - setup preloadIndex to false
+
+checking prerequisite: UNTRACKED_CACHE
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
+	{ git update-index --test-untracked-cache; ret=$?; } &&
+	test $ret -ne 1
+
+)
+Testing mtime in '/build/git-2.20.1/t/trash directory.t7519-status-fsmonitor' ...... OK
+prerequisite UNTRACKED_CACHE ok
+expecting success: 
+			git config core.untrackedcache $uc_val
+		
+ok 13 - setup untracked cache to false
+
+expecting success: 
+			write_integration_script &&
+			clean_repo &&
+			dirty_repo &&
+			git add new &&
+			git add dir1/new &&
+			git add dir2/new &&
+			git status >actual &&
+			git -c core.fsmonitor= status >expect &&
+			test_i18ncmp expect actual
+		
+HEAD is now at 1960b5b initial
+Removing dir1/new
+Removing dir1/untracked
+Removing dir2/new
+Removing dir2/untracked
+Removing new
+Removing untracked
+ok 14 - compare status with and without fsmonitor
+
+expecting success: 
+			write_script .git/hooks/fsmonitor-test<<-\EOF &&
+			:>marker
+			EOF
+			clean_repo &&
+			git status &&
+			test_path_is_file marker &&
+			dirty_repo &&
+			rm -f marker &&
+			git status >actual &&
+			test_path_is_file marker &&
+			test_i18ngrep ! "Changes not staged for commit:" actual &&
+			if test $uc_val = true
+			then
+				test_i18ngrep ! "Untracked files:" actual
+			fi &&
+			if test $uc_val = false
+			then
+				test_i18ngrep "Untracked files:" actual
+			fi &&
+			rm -f marker
+		
+HEAD is now at 1960b5b initial
+Removing dir1/untracked
+Removing dir2/untracked
+Removing untracked
+On branch master
+nothing to commit, working tree clean
+Untracked files:
+ok 15 - status doesn't detect unreported modifications
+
+expecting success: 
+			git config core.untrackedcache $uc_val
+		
+ok 16 - setup untracked cache to true
+
+expecting success: 
+			write_integration_script &&
+			clean_repo &&
+			dirty_repo &&
+			git add new &&
+			git add dir1/new &&
+			git add dir2/new &&
+			git status >actual &&
+			git -c core.fsmonitor= status >expect &&
+			test_i18ncmp expect actual
+		
+HEAD is now at 1960b5b initial
+Removing dir1/new
+Removing dir1/untracked
+Removing dir2/new
+Removing dir2/untracked
+Removing new
+Removing untracked
+ok 17 - compare status with and without fsmonitor
+
+expecting success: 
+			write_script .git/hooks/fsmonitor-test<<-\EOF &&
+			:>marker
+			EOF
+			clean_repo &&
+			git status &&
+			test_path_is_file marker &&
+			dirty_repo &&
+			rm -f marker &&
+			git status >actual &&
+			test_path_is_file marker &&
+			test_i18ngrep ! "Changes not staged for commit:" actual &&
+			if test $uc_val = true
+			then
+				test_i18ngrep ! "Untracked files:" actual
+			fi &&
+			if test $uc_val = false
+			then
+				test_i18ngrep "Untracked files:" actual
+			fi &&
+			rm -f marker
+		
+HEAD is now at 1960b5b initial
+Removing dir1/untracked
+Removing dir2/untracked
+Removing untracked
+On branch master
+nothing to commit, working tree clean
+ok 18 - status doesn't detect unreported modifications
+
+expecting success: 
+		git config core.preloadIndex $preload_val &&
+		if test $preload_val = true
+		then
+			GIT_TEST_PRELOAD_INDEX=$preload_val; export GIT_TEST_PRELOAD_INDEX
+		else
+			sane_unset GIT_TEST_PRELOAD_INDEX
+		fi
+	
+ok 19 - setup preloadIndex to true
+
+expecting success: 
+			git config core.untrackedcache $uc_val
+		
+ok 20 - setup untracked cache to false
+
+expecting success: 
+			write_integration_script &&
+			clean_repo &&
+			dirty_repo &&
+			git add new &&
+			git add dir1/new &&
+			git add dir2/new &&
+			git status >actual &&
+			git -c core.fsmonitor= status >expect &&
+			test_i18ncmp expect actual
+		
+HEAD is now at 1960b5b initial
+Removing dir1/new
+Removing dir1/untracked
+Removing dir2/new
+Removing dir2/untracked
+Removing new
+Removing untracked
+ok 21 - compare status with and without fsmonitor
+
+expecting success: 
+			write_script .git/hooks/fsmonitor-test<<-\EOF &&
+			:>marker
+			EOF
+			clean_repo &&
+			git status &&
+			test_path_is_file marker &&
+			dirty_repo &&
+			rm -f marker &&
+			git status >actual &&
+			test_path_is_file marker &&
+			test_i18ngrep ! "Changes not staged for commit:" actual &&
+			if test $uc_val = true
+			then
+				test_i18ngrep ! "Untracked files:" actual
+			fi &&
+			if test $uc_val = false
+			then
+				test_i18ngrep "Untracked files:" actual
+			fi &&
+			rm -f marker
+		
+HEAD is now at 1960b5b initial
+Removing dir1/untracked
+Removing dir2/untracked
+Removing untracked
+On branch master
+nothing to commit, working tree clean
+Untracked files:
+ok 22 - status doesn't detect unreported modifications
+
+expecting success: 
+			git config core.untrackedcache $uc_val
+		
+ok 23 - setup untracked cache to true
+
+expecting success: 
+			write_integration_script &&
+			clean_repo &&
+			dirty_repo &&
+			git add new &&
+			git add dir1/new &&
+			git add dir2/new &&
+			git status >actual &&
+			git -c core.fsmonitor= status >expect &&
+			test_i18ncmp expect actual
+		
+HEAD is now at 1960b5b initial
+Removing dir1/new
+Removing dir1/untracked
+Removing dir2/new
+Removing dir2/untracked
+Removing new
+Removing untracked
+ok 24 - compare status with and without fsmonitor
+
+expecting success: 
+			write_script .git/hooks/fsmonitor-test<<-\EOF &&
+			:>marker
+			EOF
+			clean_repo &&
+			git status &&
+			test_path_is_file marker &&
+			dirty_repo &&
+			rm -f marker &&
+			git status >actual &&
+			test_path_is_file marker &&
+			test_i18ngrep ! "Changes not staged for commit:" actual &&
+			if test $uc_val = true
+			then
+				test_i18ngrep ! "Untracked files:" actual
+			fi &&
+			if test $uc_val = false
+			then
+				test_i18ngrep "Untracked files:" actual
+			fi &&
+			rm -f marker
+		
+HEAD is now at 1960b5b initial
+Removing dir1/untracked
+Removing dir2/untracked
+Removing untracked
+On branch master
+nothing to commit, working tree clean
+ok 25 - status doesn't detect unreported modifications
+
+expecting success: 
+	write_integration_script &&
+	dirty_repo &&
+	git update-index --fsmonitor  &&
+	git ls-files -f >expect &&
+	test-tool dump-fsmonitor >&2 && echo &&
+	git update-index --fsmonitor --split-index &&
+	test-tool dump-fsmonitor >&2 && echo &&
+	git ls-files -f >actual &&
+	test_cmp expect actual
+
+fsmonitor last update 1672919408025067000
+------
+fsmonitor last update 1672919408025067000
+
+ok 26 - splitting the index results in the same state
+
+expecting success: 
+	test_create_repo dot-git &&
+	(
+		cd dot-git &&
+		mkdir -p .git/hooks &&
+		: >tracked &&
+		: >modified &&
+		mkdir dir1 &&
+		: >dir1/tracked &&
+		: >dir1/modified &&
+		mkdir dir2 &&
+		: >dir2/tracked &&
+		: >dir2/modified &&
+		write_integration_script &&
+		git config core.fsmonitor .git/hooks/fsmonitor-test &&
+		git update-index --untracked-cache &&
+		git update-index --fsmonitor &&
+		GIT_TRACE_UNTRACKED_STATS="$TRASH_DIRECTORY/trace-before" \
+		git status &&
+		test-tool dump-untracked-cache >../before
+	) &&
+	cat >>dot-git/.git/hooks/fsmonitor-test <<-\EOF &&
+	printf ".git\0"
+	printf ".git/index\0"
+	printf "dir1/.git\0"
+	printf "dir1/.git/index\0"
+	EOF
+	(
+		cd dot-git &&
+		GIT_TRACE_UNTRACKED_STATS="$TRASH_DIRECTORY/trace-after" \
+		git status &&
+		test-tool dump-untracked-cache >../after
+	) &&
+	grep "directory invalidation" trace-before >>before &&
+	grep "directory invalidation" trace-after >>after &&
+	# UNTR extension unchanged, dir invalidation count unchanged
+	test_cmp before after
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7519-status-fsmonitor/dot-git/.git/
+On branch master
+
+No commits yet
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+
+	dir1/
+	dir2/
+	modified
+	tracked
+
+nothing added to commit but untracked files present (use "git add" to track)
+On branch master
+
+No commits yet
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+
+	dir1/
+	dir2/
+	modified
+	tracked
+
+nothing added to commit but untracked files present (use "git add" to track)
+ok 27 - ignore .git changes when invalidating UNTR
+
+# passed all 27 test(s)
+1..27
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
 *** t8005-blame-i18n.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t8005-blame-i18n/.git/
 expecting success: 
@@ -297049,14 +297309,14 @@
 	git config i18n.commitencoding SJIS &&
 	git commit --author "$SJIS_NAME <sjis@localhost>" -m "$SJIS_MSG"
 
-[master (root-commit) dc1e15b] ブレーム�テスト��。
+[master (root-commit) f6322c4] ブレーム�テスト��。
  Author: 山田 太郎 <utf8@localhost>
  1 file changed, 1 insertion(+)
  create mode 100644 file
-[master d55f438] ブレーム�テスト��。
+[master 04716db] ブレーム�テスト��。
  Author: »³ÅÄ ÂÀϺ <euc-japan@localhost>
  1 file changed, 1 insertion(+)
-[master ba14ddb] ブレーム�テスト��。
+[master 9afec04] ブレーム�テスト��。
  Author: ŽR“c ‘¾˜Y <sjis@localhost>
  1 file changed, 1 insertion(+)
 ok 1 - setup the repository
@@ -297513,14 +297773,14 @@
 
 )
 prerequisite SYMLINKS ok
-[master (root-commit) 570074b] First
+[master (root-commit) 6fcd696] 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 f27357f] Second
+[master ad0d8b6] Second
  Author: Number2 <author@example.com>
  Date: Fri Jan 1 20:00:00 2010 +0000
  1 file changed, 1 insertion(+), 1 deletion(-)
@@ -297586,6 +297846,73 @@
 1..10
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
+*** t8008-blame-formats.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t8008-blame-formats/.git/
+expecting success: 
+	echo a >file &&
+	git add file &&
+	test_tick &&
+	git commit -m one &&
+	echo b >>file &&
+	echo c >>file &&
+	echo d >>file &&
+	test_tick &&
+	git commit -a -m two &&
+	ID1=$(git rev-parse HEAD^) &&
+	shortID1="^$(git rev-parse HEAD^ |cut -c 1-17)" &&
+	ID2=$(git rev-parse HEAD) &&
+	shortID2="$(git rev-parse HEAD |cut -c 1-18)"
+
+[master (root-commit) baf5e0b] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+[master 8825379] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 3 insertions(+)
+ok 1 - setup
+
+expecting success: 
+	git blame --abbrev=17 file >actual &&
+	test_cmp expect actual
+
+ok 2 - normal blame output
+
+expecting success: 
+	git blame --porcelain file >actual &&
+	test_cmp expect actual
+
+ok 3 - blame --porcelain output
+
+expecting success: 
+	git blame --line-porcelain file >actual &&
+	test_cmp expect actual
+
+ok 4 - blame --line-porcelain output
+
+expecting success: 
+	(
+		GIT_INDEX_FILE=.git/tmp-index &&
+		export GIT_INDEX_FILE &&
+		echo "This is it" >single-file &&
+		git add single-file &&
+		tree=$(git write-tree) &&
+		commit=$(printf "%s\n%s\n%s\n\n\n  \noneline\n\nbody\n" \
+			"tree $tree" \
+			"author A <a@b.c> 123456789 +0000" \
+			"committer C <c@d.e> 123456789 +0000" |
+		git hash-object -w -t commit --stdin) &&
+		git blame --porcelain $commit -- single-file >output &&
+		grep "^summary oneline$" output
+	)
+
+summary oneline
+ok 5 - --porcelain detects first non-blank line as subject
+
+# passed all 5 test(s)
+1..5
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
 *** t7600-merge.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7600-merge/.git/
 expecting success: 
@@ -299027,71 +299354,75 @@
 1..58
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t8008-blame-formats.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t8008-blame-formats/.git/
+*** t8009-blame-vs-topicbranches.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t8009-blame-vs-topicbranches/.git/
 expecting success: 
-	echo a >file &&
-	git add file &&
-	test_tick &&
-	git commit -m one &&
-	echo b >>file &&
-	echo c >>file &&
-	echo d >>file &&
-	test_tick &&
-	git commit -a -m two &&
-	ID1=$(git rev-parse HEAD^) &&
-	shortID1="^$(git rev-parse HEAD^ |cut -c 1-17)" &&
-	ID2=$(git rev-parse HEAD) &&
-	shortID2="$(git rev-parse HEAD |cut -c 1-18)"
-
-[master (root-commit) baf5e0b] one
+	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
-[master 8825379] two
+ create mode 100644 file.t
+[master 5392e14] A1
  Author: A U Thor <author@example.com>
- 1 file changed, 3 insertions(+)
+ 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
+Merging:
+5392e14 A1
+virtual B2
+found 1 common ancestor:
+2152206 A0
+Merge made by the 'recursive' 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
+Merging:
+6e3b304 A2
+virtual C1
+found 1 common ancestor:
+5392e14 A1
+Merge made by the 'recursive' strategy.
+ C1.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 C1.t
 ok 1 - setup
 
 expecting success: 
-	git blame --abbrev=17 file >actual &&
-	test_cmp expect actual
-
-ok 2 - normal blame output
-
-expecting success: 
-	git blame --porcelain file >actual &&
-	test_cmp expect actual
-
-ok 3 - blame --porcelain output
-
-expecting success: 
-	git blame --line-porcelain file >actual &&
+	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 4 - blame --line-porcelain output
-
-expecting success: 
-	(
-		GIT_INDEX_FILE=.git/tmp-index &&
-		export GIT_INDEX_FILE &&
-		echo "This is it" >single-file &&
-		git add single-file &&
-		tree=$(git write-tree) &&
-		commit=$(printf "%s\n%s\n%s\n\n\n  \noneline\n\nbody\n" \
-			"tree $tree" \
-			"author A <a@b.c> 123456789 +0000" \
-			"committer C <c@d.e> 123456789 +0000" |
-		git hash-object -w -t commit --stdin) &&
-		git blame --porcelain $commit -- single-file >output &&
-		grep "^summary oneline$" output
-	)
-
-summary oneline
-ok 5 - --porcelain detects first non-blank line as subject
-
-# passed all 5 test(s)
-1..5
+	
+ok 2 - blame --reverse --first-parent finds A1
+
+# passed all 2 test(s)
+1..2
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
 *** t8006-blame-textconv.sh ***
@@ -299119,7 +299450,7 @@
 
 )
 prerequisite SYMLINKS ok
-[master (root-commit) 6b74c46] First
+[master (root-commit) 6358d3a] First
  Author: Number1 <author@example.com>
  Date: Fri Jan 1 18:00:00 2010 +0000
  5 files changed, 7 insertions(+)
@@ -299128,7 +299459,7 @@
  create mode 120000 symlink.bin
  create mode 100644 two.bin
  create mode 100644 zero.bin
-[master 78c6ce0] Second
+[master be0e7c6] Second
  Author: Number2 <author@example.com>
  Date: Fri Jan 1 20:00:00 2010 +0000
  3 files changed, 3 insertions(+), 2 deletions(-)
@@ -299205,7 +299536,7 @@
 	echo "bin: test number 2 version 3" >>two.bin &&
 	GIT_AUTHOR_NAME=Number3 git commit -a -m Third --date="2010-01-01 22:00:00"
 
-[master 32f3ec2] Third
+[master c87a7c9] Third
  Author: Number3 <author@example.com>
  Date: Fri Jan 1 22:00:00 2010 +0000
  1 file changed, 1 insertion(+)
@@ -299242,7 +299573,7 @@
 	git add three.bin &&
 	GIT_AUTHOR_NAME=Number4 git commit -a -m Fourth --date="2010-01-01 23:00:00"
 
-[master 7ad59a7] Fourth
+[master b2c1ae8] Fourth
  Author: Number4 <author@example.com>
  Date: Fri Jan 1 23:00:00 2010 +0000
  1 file changed, 4 insertions(+)
@@ -299266,77 +299597,6 @@
 1..16
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t8009-blame-vs-topicbranches.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t8009-blame-vs-topicbranches/.git/
-expecting success: 
-	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
-Merging:
-5392e14 A1
-virtual B2
-found 1 common ancestor:
-2152206 A0
-Merge made by the 'recursive' 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
-Merging:
-6e3b304 A2
-virtual C1
-found 1 common ancestor:
-5392e14 A1
-Merge made by the 'recursive' strategy.
- C1.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 C1.t
-ok 1 - setup
-
-expecting success: 
-	git blame --porcelain --reverse --first-parent A0..A3 -- file.t >actual_full &&
-	head -n 1 <actual_full | sed -e "s/ .*//" >actual &&
-	git rev-parse A1 >expect &&
-	test_cmp expect actual
-	
-ok 2 - blame --reverse --first-parent finds A1
-
-# passed all 2 test(s)
-1..2
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
 *** t8010-cat-file-filters.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t8010-cat-file-filters/.git/
 expecting success: 
@@ -299575,6 +299835,257 @@
 1..10
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
+*** t9003-help-autocorrect.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9003-help-autocorrect/.git/
+expecting success: 
+	# An alias
+	git config alias.lgf "log --format=%s --first-parent" &&
+
+	# A random user-defined command
+	write_script git-distimdistim <<-EOF &&
+		echo distimdistim was called
+	EOF
+
+	PATH="$PATH:." &&
+	export PATH &&
+
+	git commit --allow-empty -m "a single log entry" &&
+
+	# Sanity check
+	git lgf >actual &&
+	echo "a single log entry" >expect &&
+	test_cmp expect actual &&
+
+	git distimdistim >actual &&
+	echo "distimdistim was called" >expect &&
+	test_cmp expect actual
+
+[master (root-commit) 275fdab] a single log entry
+ Author: A U Thor <author@example.com>
+ok 1 - setup
+
+expecting success: 
+	git config help.autocorrect 0 &&
+
+	test_must_fail git lfg 2>actual &&
+	grep "^	lgf" actual &&
+
+	test_must_fail git distimdist 2>actual &&
+	grep "^	distimdistim" actual
+
+	lgf
+	distimdistim
+ok 2 - autocorrect showing candidates
+
+expecting success: 
+	git config help.autocorrect -1 &&
+
+	git lfg >actual &&
+	echo "a single log entry" >expect &&
+	test_cmp expect actual &&
+
+	git distimdist >actual &&
+	echo "distimdistim was called" >expect &&
+	test_cmp expect actual
+
+WARNING: You called a Git command named 'lfg', which does not exist.
+Continuing under the assumption that you meant 'lgf'.
+WARNING: You called a Git command named 'distimdist', which does not exist.
+Continuing under the assumption that you meant 'distimdistim'.
+ok 3 - autocorrect running commands
+
+# passed all 3 test(s)
+1..3
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t9002-column.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9002-column/.git/
+expecting success: 
+	cat >lista <<\EOF
+one
+two
+three
+four
+five
+six
+seven
+eight
+nine
+ten
+eleven
+EOF
+
+ok 1 - setup
+
+expecting success: 
+	git column --indent=Z --mode=never <lista >actual &&
+	test_cmp lista actual
+
+ok 2 - never
+
+expecting success: 
+	cat >expected <<\EOF &&
+Zone
+Ztwo
+Zthree
+Zfour
+Zfive
+Zsix
+Zseven
+Zeight
+Znine
+Zten
+Zeleven
+EOF
+	git column --indent=Z --mode=plain <lista >actual &&
+	test_cmp expected actual
+
+ok 3 - always
+
+expecting success: 
+	cat >expected <<\EOF &&
+one    two    three  four   five   six    seven  eight  nine   ten    eleven
+EOF
+	COLUMNS=80 git column --mode=column <lista >actual &&
+	test_cmp expected actual
+
+ok 4 - 80 columns
+
+expecting success: 
+	COLUMNS=1 git column --mode=column <lista >actual &&
+	test_cmp expected actual
+
+ok 5 - COLUMNS = 1
+
+expecting success: 
+	git column --mode=column --width=1 <lista >actual &&
+	test_cmp expected actual
+
+ok 6 - width = 1
+
+expecting success: 
+	cat >expected <<\EOF &&
+one    seven
+two    eight
+three  nine
+four   ten
+five   eleven
+six
+EOF
+	git column --mode=column <lista >actual &&
+	test_cmp expected actual
+
+ok 7 - 20 columns
+
+expecting success: 
+	cat >expected <<\EOF &&
+one    seven
+two    eight
+three  nine
+four   ten
+five   eleven
+six
+EOF
+	git column --mode=column,nodense < lista > actual &&
+	test_cmp expected actual
+
+ok 8 - 20 columns, nodense
+
+expecting success: 
+	cat >expected <<\EOF &&
+one   five  nine
+two   six   ten
+three seven eleven
+four  eight
+EOF
+	git column --mode=column,dense < lista > actual &&
+	test_cmp expected actual
+
+ok 9 - 20 columns, dense
+
+expecting success: 
+	cat >expected <<\EOF &&
+one     seven
+two     eight
+three   nine
+four    ten
+five    eleven
+six
+EOF
+	git column --mode=column --padding 2 <lista >actual &&
+	test_cmp expected actual
+
+ok 10 - 20 columns, padding 2
+
+expecting success: 
+	cat >expected <<\EOF &&
+  one    seven
+  two    eight
+  three  nine
+  four   ten
+  five   eleven
+  six
+EOF
+	git column --mode=column --indent="  " <lista >actual &&
+	test_cmp expected actual
+
+ok 11 - 20 columns, indented
+
+expecting success: 
+	cat >expected <<\EOF &&
+one    two
+three  four
+five   six
+seven  eight
+nine   ten
+eleven
+EOF
+	git column --mode=row <lista >actual &&
+	test_cmp expected actual
+
+ok 12 - 20 columns, row first
+
+expecting success: 
+	cat >expected <<\EOF &&
+one    two
+three  four
+five   six
+seven  eight
+nine   ten
+eleven
+EOF
+	git column --mode=row,nodense <lista >actual &&
+	test_cmp expected actual
+
+ok 13 - 20 columns, row first, nodense
+
+expecting success: 
+	cat >expected <<\EOF &&
+one   two    three
+four  five   six
+seven eight  nine
+ten   eleven
+EOF
+	git column --mode=row,dense <lista >actual &&
+	test_cmp expected actual
+
+ok 14 - 20 columns, row first, dense
+
+# passed all 14 test(s)
+1..14
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t9004-example.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9004-example/.git/
+expecting success: 
+	test-tool example-decorate
+
+ok 1 - decorate
+
+# passed all 1 test(s)
+1..1
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
 *** t7814-grep-recurse-submodules.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7814-grep-recurse-submodules/.git/
 expecting success: 
@@ -299590,18 +300101,18 @@
 	git submodule add ./submodule &&
 	git commit -m "added submodule"
 
-[master (root-commit) 0e51a79] add a and b
+[master (root-commit) f9a70a0] 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/git-2.20.1/t/trash directory.t7814-grep-recurse-submodules/submodule/.git/
-[master (root-commit) cc55a6c] add a
+[master (root-commit) a77fe2d] 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 59aab23] added submodule
+[master ecfc9dc] added submodule
  Author: A U Thor <author@example.com>
  2 files changed, 4 insertions(+)
  create mode 100644 .gitmodules
@@ -299675,17 +300186,17 @@
 	test_cmp expect actual
 
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7814-grep-recurse-submodules/submodule/sub/.git/
-[master (root-commit) 1a10c5b] add a
+[master (root-commit) a77fe2d] 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 0efae65] added sub
+[master 2abf90d] added sub
  Author: A U Thor <author@example.com>
  2 files changed, 4 insertions(+)
  create mode 100644 .gitmodules
  create mode 160000 sub
-[master a807778] updated submodule
+[master 3acd351] updated submodule
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 warning: nested submodules without .gitmodules in the working tree are not supported yet
@@ -299829,18 +300340,18 @@
 	test_cmp expect actual
 
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7814-grep-recurse-submodules/parent/.git/
-[master (root-commit) d375826] add fi:le
+[master (root-commit) b933622] 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/git-2.20.1/t/trash directory.t7814-grep-recurse-submodules/su:b/.git/
-[master (root-commit) d375826] add fi:le
+[master (root-commit) b933622] add fi:le
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 fi:le
 Cloning into '/build/git-2.20.1/t/trash directory.t7814-grep-recurse-submodules/parent/su:b'...
 done.
-[master e02e9d8] add submodule
+[master 53903da] add submodule
  Author: A U Thor <author@example.com>
  2 files changed, 4 insertions(+)
  create mode 100644 .gitmodules
@@ -299890,24 +300401,24 @@
 	test_cmp expect actual
 
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7814-grep-recurse-submodules/parent/.git/
-[master (root-commit) 61e16f2] add file
+[master (root-commit) dd4121b] add file
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 file
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7814-grep-recurse-submodules/sub/.git/
-[master (root-commit) 61e16f2] add file
+[master (root-commit) dd4121b] add file
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 file
 Cloning into '/build/git-2.20.1/t/trash directory.t7814-grep-recurse-submodules/parent/dir/sub'...
 done.
-[master fd72e34] add submodule
+[master 1aebc1b] add submodule
  Author: A U Thor <author@example.com>
  2 files changed, 4 insertions(+)
  create mode 100644 .gitmodules
  create mode 160000 dir/sub
 warning: nested submodules without .gitmodules in the working tree are not supported yet
-[master 11b1bb4] moved submodule
+[master edeb250] moved submodule
  Author: A U Thor <author@example.com>
  2 files changed, 1 insertion(+), 1 deletion(-)
  rename dir/sub => sub-moved (100%)
@@ -299956,14 +300467,14 @@
 	test_cmp expect actual
 
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7814-grep-recurse-submodules/sub/.git/
-[master (root-commit) 771d7ea] add file
+[master (root-commit) 4fb0194] add file
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 file
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7814-grep-recurse-submodules/parent/.git/
 Cloning into '/build/git-2.20.1/t/trash directory.t7814-grep-recurse-submodules/parent/sub'...
 done.
-[master (root-commit) bf4d405] add files and submodule
+[master (root-commit) 2b544f1] add files and submodule
  Author: A U Thor <author@example.com>
  4 files changed, 6 insertions(+)
  create mode 100644 .gitmodules
@@ -300008,7 +300519,7 @@
 	test_cmp expect actual
 
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7814-grep-recurse-submodules/sub/.git/
-[master (root-commit) 771d7ea] add file
+[master (root-commit) 4fb0194] add file
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 file
@@ -300017,7 +300528,7 @@
 done.
 Cloning into '/build/git-2.20.1/t/trash directory.t7814-grep-recurse-submodules/parent/sub'...
 done.
-[master (root-commit) 576b49a] add files and submodules
+[master (root-commit) 1909dd6] add files and submodules
  Author: A U Thor <author@example.com>
  4 files changed, 9 insertions(+)
  create mode 100644 .gitmodules
@@ -300115,8 +300626,8 @@
 	test_cmp expect actual
 
 warning: nested submodules without .gitmodules in the working tree are not supported yet
---- expect	2021-12-03 05:09:58.107512847 +0000
-+++ actual	2021-12-03 05:09:58.095513196 +0000
+--- expect	2023-01-05 11:50:10.790868030 +0000
++++ actual	2023-01-05 11:50:10.778868030 +0000
 @@ -1,3 +1,2 @@
  a:(1|2)d(3|4)
  submodule/a:(1|2)d(3|4)
@@ -300128,255 +300639,385 @@
 1..23
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t9002-column.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9002-column/.git/
+*** t9020-remote-svn.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9020-remote-svn/.git/
 expecting success: 
-	cat >lista <<\EOF
-one
-two
-three
-four
-five
-six
-seven
-eight
-nine
-ten
-eleven
-EOF
+	init_git &&
+	git fetch svnsim &&
+	test_cmp .git/refs/svn/svnsim/master .git/refs/remotes/svnsim/master  &&
+	cp .git/refs/remotes/svnsim/master master.good
 
-ok 1 - setup
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9020-remote-svn/.git/
+progress Imported commit 1.
+progress Imported commit 2.
+progress Imported commit 3.
+progress Imported commit 4.
+progress Imported commit 5.
+progress Imported commit 6.
+From testsvn::sim:///build/git-2.20.1/t/t9154/svn.dump
+ * [new branch]      master     -> svnsim/master
+ok 1 - simple fetch
 
 expecting success: 
-	git column --indent=Z --mode=never <lista >actual &&
-	test_cmp lista actual
+	git fetch svnsim &&
+	test_cmp master.good .git/refs/remotes/svnsim/master
 
-ok 2 - never
+warning: svnrdump, returned 1
+ok 2 - repeated fetch, nothing shall change
 
 expecting success: 
-	cat >expected <<\EOF &&
-Zone
-Ztwo
-Zthree
-Zfour
-Zfive
-Zsix
-Zseven
-Zeight
-Znine
-Zten
-Zeleven
-EOF
-	git column --indent=Z --mode=plain <lista >actual &&
-	test_cmp expected actual
+	git fetch svnfile
 
-ok 3 - always
+progress Imported commit 1.
+progress Imported commit 2.
+progress Imported commit 3.
+progress Imported commit 4.
+progress Imported commit 5.
+progress Imported commit 6.
+From testsvn::file:///build/git-2.20.1/t/t9154/svn.dump
+ * [new branch]      master     -> svnfile/master
+ok 3 - fetch from a file:// url gives the same result
+
+checking known breakage: 
+	test_cmp .git/refs/remotes/svnfile/master .git/refs/remotes/svnsim/master
+
+--- .git/refs/remotes/svnfile/master	2023-01-05 11:50:11.370868030 +0000
++++ .git/refs/remotes/svnsim/master	2023-01-05 11:50:11.106868030 +0000
+@@ -1 +1 @@
+-dcd4c3cca8ba8ffe72e050b99f3d2a44a4c69356
++b43cc2ac09e889bbac1bf9e9c9f4a3ffab728f25
+not ok 4 - the sha1 differ because the git-svn-id line in the commit msg contains the url # TODO known breakage
 
 expecting success: 
-	cat >expected <<\EOF &&
-one    two    three  four   five   six    seven  eight  nine   ten    eleven
-EOF
-	COLUMNS=80 git column --mode=column <lista >actual &&
-	test_cmp expected actual
+	# filter out any other marks, that can not be regenerated. Only up to 3 digit revisions are allowed here
+	grep ":[0-9]\{1,3\} " $MARKSPATH/svnsim.marks > $MARKSPATH/svnsim.marks.old &&
+	rm $MARKSPATH/svnsim.marks &&
+	git fetch svnsim &&
+	test_cmp $MARKSPATH/svnsim.marks.old $MARKSPATH/svnsim.marks
 
-ok 4 - 80 columns
+warning: svnrdump, returned 1
+ok 5 - mark-file regeneration
 
 expecting success: 
-	COLUMNS=1 git column --mode=column <lista >actual &&
-	test_cmp expected actual
+	SVNRMAX=3 &&
+	export SVNRMAX &&
+	init_git &&
+	git fetch svnsim &&
+	test_cmp .git/refs/svn/svnsim/master .git/refs/remotes/svnsim/master  &&
+	unset SVNRMAX &&
+	git fetch svnsim &&
+	test_cmp master.good .git/refs/remotes/svnsim/master
 
-ok 5 - COLUMNS = 1
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9020-remote-svn/.git/
+progress Imported commit 1.
+progress Imported commit 2.
+From testsvn::sim:///build/git-2.20.1/t/t9154/svn.dump
+ * [new branch]      master     -> svnsim/master
+progress Imported commit 3.
+progress Imported commit 4.
+progress Imported commit 5.
+progress Imported commit 6.
+From testsvn::sim:///build/git-2.20.1/t/t9154/svn.dump
+   c924f56..b43cc2a  master     -> svnsim/master
+ok 6 - incremental imports must lead to the same head
 
+# still have 1 known breakage(s)
+# passed all remaining 5 test(s)
+1..6
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t9011-svn-da.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9011-svn-da/.git/
 expecting success: 
-	git column --mode=column --width=1 <lista >actual &&
-	test_cmp expected actual
+	test_must_fail test-svn-fe -d preimage empty 0
 
-ok 6 - width = 1
+error: invalid delta: unexpected end of file
+ok 1 - reject empty delta
 
 expecting success: 
-	cat >expected <<\EOF &&
-one    seven
-two    eight
-three  nine
-four   ten
-five   eleven
-six
-EOF
-	git column --mode=column <lista >actual &&
-	test_cmp expected actual
+	printf "SVNQ" | q_to_nul >clear.delta &&
+	test-svn-fe -d preimage clear.delta 4 >actual &&
+	test_must_be_empty actual
 
-ok 7 - 20 columns
+ok 2 - delta can empty file
 
 expecting success: 
-	cat >expected <<\EOF &&
-one    seven
-two    eight
-three  nine
-four   ten
-five   eleven
-six
-EOF
-	git column --mode=column,nodense < lista > actual &&
-	test_cmp expected actual
+	printf "SVN\002" >bad.filetype &&
+	test_must_fail test-svn-fe -d preimage bad.filetype 4
 
-ok 8 - 20 columns, nodense
+error: invalid delta: unrecognized file type
+ok 3 - reject svndiff2
 
 expecting success: 
-	cat >expected <<\EOF &&
-one   five  nine
-two   six   ten
-three seven eleven
-four  eight
-EOF
-	git column --mode=column,dense < lista > actual &&
-	test_cmp expected actual
+	printf "SVNQ%s" "QQQQQ" | q_to_nul >clear.onewindow &&
+	test-svn-fe -d preimage clear.onewindow 9 >actual &&
+	test_must_be_empty actual
 
-ok 9 - 20 columns, dense
+ok 4 - one-window empty delta
 
 expecting success: 
-	cat >expected <<\EOF &&
-one     seven
-two     eight
-three   nine
-four    ten
-five    eleven
-six
-EOF
-	git column --mode=column --padding 2 <lista >actual &&
-	test_cmp expected actual
+	printf "SVNQ%s" "QQQQQ" | q_to_nul >clear.onewindow &&
+	printf "SVNQ%s" "QQ" | q_to_nul >clear.partialwindow &&
+	test_must_fail test-svn-fe -d preimage clear.onewindow 6 &&
+	test_must_fail test-svn-fe -d preimage clear.partialwindow 6
 
-ok 10 - 20 columns, padding 2
+error: invalid delta: unexpected end of file
+error: invalid delta: unexpected end of file
+ok 5 - reject incomplete window header
 
 expecting success: 
-	cat >expected <<\EOF &&
-  one    seven
-  two    eight
-  three  nine
-  four   ten
-  five   eleven
-  six
-EOF
-	git column --mode=column --indent="  " <lista >actual &&
-	test_cmp expected actual
+	printf "SVNQ%s" "QQQQQ" | q_to_nul >clear.onewindow &&
+	printf "SVNQ%s" "QQ" | q_to_nul >clear.partialwindow &&
+	test_must_fail test-svn-fe -d preimage clear.onewindow 14 &&
+	test_must_fail test-svn-fe -d preimage clear.partialwindow 9
 
-ok 11 - 20 columns, indented
+error: invalid delta: unexpected end of file
+error: invalid delta: unexpected end of file
+ok 6 - reject declared delta longer than actual delta
 
 expecting success: 
-	cat >expected <<\EOF &&
-one    two
-three  four
-five   six
-seven  eight
-nine   ten
-eleven
-EOF
-	git column --mode=row <lista >actual &&
-	test_cmp expected actual
+	printf "SVNQ%s%s" "QQQQQ" "QQQQQ" | q_to_nul >clear.twowindow &&
+	test-svn-fe -d preimage clear.twowindow 14 >actual &&
+	test_must_fail test-svn-fe -d preimage clear.twowindow 13 &&
+	test_must_be_empty actual
 
-ok 12 - 20 columns, row first
+error: invalid delta: unexpected end of file
+ok 7 - two-window empty delta
 
 expecting success: 
-	cat >expected <<\EOF &&
-one    two
-three  four
-five   six
-seven  eight
-nine   ten
-eleven
-EOF
-	git column --mode=row,nodense <lista >actual &&
-	test_cmp expected actual
+	printf "SVNQ%s" \
+		"RRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRQQQQQ" |
+		tr R "\200" |
+		q_to_nul >clear.noisy &&
+	len=$(wc -c <clear.noisy) &&
+	test-svn-fe -d preimage clear.noisy $len &&
+	test_must_be_empty actual
 
-ok 13 - 20 columns, row first, nodense
+ok 8 - noisy zeroes
 
 expecting success: 
-	cat >expected <<\EOF &&
-one   two    three
-four  five   six
-seven eight  nine
-ten   eleven
-EOF
-	git column --mode=row,dense <lista >actual &&
-	test_cmp expected actual
+	printf "SVNRQ" | tr R "\200" | q_to_nul >clear.badmagic &&
+	test_must_fail test-svn-fe -d preimage clear.badmagic 5
 
-ok 14 - 20 columns, row first, dense
+error: invalid delta: unrecognized file type
+ok 9 - reject variable-length int in magic
 
-# passed all 14 test(s)
-1..14
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t9004-example.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9004-example/.git/
 expecting success: 
-	test-tool example-decorate
+	printf "SVNQ%s%s" "QQQQQ" "QQQQRRQ" |
+		tr R "\200" |
+		q_to_nul >clear.fullint &&
+	printf "SVNQ%s%s" "QQQQQ" "QQQQRR" |
+		tr RT "\201" |
+		q_to_nul >clear.partialint &&
+	test_must_fail test-svn-fe -d preimage clear.fullint 15 &&
+	test-svn-fe -d preimage clear.fullint 16 &&
+	test_must_fail test-svn-fe -d preimage clear.partialint 15
 
-ok 1 - decorate
+error: invalid delta: unexpected end of file
+error: invalid delta: unexpected end of file
+ok 10 - reject truncated integer
 
-# passed all 1 test(s)
-1..1
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t9003-help-autocorrect.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9003-help-autocorrect/.git/
 expecting success: 
-	# An alias
-	git config alias.lgf "log --format=%s --first-parent" &&
+	printf "SVNQ%b" "Q\003QQQ" | q_to_nul >clear.readpreimage &&
+	test-svn-fe -d preimage clear.readpreimage 9 >actual &&
+	test_must_be_empty actual
 
-	# A random user-defined command
-	write_script git-distimdistim <<-EOF &&
-		echo distimdistim was called
-	EOF
+ok 11 - nonempty (but unused) preimage view
 
-	PATH="$PATH:." &&
-	export PATH &&
+expecting success: 
+	printf "SVNQ%b%b" "Q\003QQQ" "Q\002QQQ" |
+		q_to_nul >clear.backtrack &&
+	test_must_fail test-svn-fe -d preimage clear.backtrack 14
 
-	git commit --allow-empty -m "a single log entry" &&
+error: invalid delta: window slides left
+ok 12 - preimage view: right endpoint cannot backtrack
 
-	# Sanity check
-	git lgf >actual &&
-	echo "a single log entry" >expect &&
-	test_cmp expect actual &&
+expecting success: 
+	printf "SVNQ%b%b" "Q\003QQQ" "\001\002QQQ" |
+		q_to_nul >clear.preshrink &&
+	printf "SVNQ%b%b" "Q\003QQQ" "\001\001QQQ" |
+		q_to_nul >clear.shrinkbacktrack &&
+	test-svn-fe -d preimage clear.preshrink 14 >actual &&
+	test_must_fail test-svn-fe -d preimage clear.shrinkbacktrack 14 &&
+	test_must_be_empty actual
 
-	git distimdistim >actual &&
-	echo "distimdistim was called" >expect &&
+error: invalid delta: window slides left
+ok 13 - preimage view: left endpoint can advance
+
+expecting success: 
+	printf "SVNQ%b%b" "\001\001QQQ" "\0200Q\003QQQ" |
+		q_to_nul >clear.noisybacktrack &&
+	printf "SVNQ%b%b" "\001\001QQQ" "\0200\001\002QQQ" |
+		q_to_nul >clear.noisyadvance &&
+	test_must_fail test-svn-fe -d preimage clear.noisybacktrack 15 &&
+	test-svn-fe -d preimage clear.noisyadvance 15 &&
+	test_must_be_empty actual
+
+error: invalid delta: window slides left
+ok 14 - preimage view: offsets compared by value
+
+expecting success: 
+	printf "SVNQ%b" "\010QQQQ" | q_to_nul >clear.lateemptyread &&
+	printf "SVNQ%b" "\010\001QQQ" | q_to_nul >clear.latenonemptyread &&
+	printf "SVNQ%b" "\001\010QQQ" | q_to_nul >clear.longread &&
+	test_must_fail test-svn-fe -d preimage clear.lateemptyread 9 &&
+	test_must_fail test-svn-fe -d preimage clear.latenonemptyread 9 &&
+	test_must_fail test-svn-fe -d preimage clear.longread 9
+
+error: delta preimage ends early
+error: delta preimage ends early
+error: delta preimage ends early
+ok 15 - preimage view: reject truncated preimage
+
+expecting success: 
+	printf "SVNQ%b%s%b%s" "QQQQ\003" "bar" "QQQQ\001" "x" |
+		q_to_nul >inline.clear &&
+	test_must_fail test-svn-fe -d preimage inline.clear 18 >actual
+
+error: invalid delta: does not copy all inline data
+ok 16 - forbid unconsumed inline data
+
+expecting success: 
+	printf "SVNQ%b%s" "QQQQ\003" "b" | q_to_nul >inline.trunc &&
+	test_must_fail test-svn-fe -d preimage inline.trunc 10
+
+error: invalid delta: unexpected end of file
+ok 17 - reject truncated inline data
+
+expecting success: 
+	printf "SVNQ%b%b%s" "QQ\001\001\003" "\0201" "b" | q_to_nul >insn.trunc &&
+	test_must_fail test-svn-fe -d preimage insn.trunc 11
+
+error: invalid delta: unexpected end of file
+ok 18 - reject truncated inline data (after instruction section)
+
+expecting success: 
+	echo hi >expect &&
+	printf "SVNQ%b%b%b" "QQ\003\001\003" "\0203" "hi\n" | q_to_nul >copydat &&
+	test-svn-fe -d preimage copydat 13 >actual &&
 	test_cmp expect actual
 
-[master (root-commit) 467ba06] a single log entry
- Author: A U Thor <author@example.com>
-ok 1 - setup
+ok 19 - copyfrom_data
 
 expecting success: 
-	git config help.autocorrect 0 &&
+	echo hi >expect &&
+	printf "SVNQ%b%b%b%b%b" "QQ\003\002\003" "\0201\0202" "hi\n" \
+		"QQQ\002Q" "\0200Q" | q_to_nul >copy.multi &&
+	len=$(wc -c <copy.multi) &&
+	test-svn-fe -d preimage copy.multi $len >actual &&
+	test_cmp expect actual
 
-	test_must_fail git lfg 2>actual &&
-	grep "^	lgf" actual &&
+ok 20 - multiple copyfrom_data
 
-	test_must_fail git distimdist 2>actual &&
-	grep "^	distimdistim" actual
+expecting success: 
+	printf "SVNQ%b%b%b" "QQ\003\002\003" "\0203\0200" "hi\n" |
+		q_to_nul >copy.partial &&
+	len=$(wc -c <copy.partial) &&
+	test_must_fail test-svn-fe -d preimage copy.partial $len
 
-	lgf
-	distimdistim
-ok 2 - autocorrect showing candidates
+error: invalid delta: unexpected end of instructions section
+ok 21 - incomplete multiple insn
 
 expecting success: 
-	git config help.autocorrect -1 &&
+	printf "SVNQ%b%b%s%b%s" "QQ\002\002\001" "\0201\0201" "X" \
+			"QQQQ\002" "YZ" |
+		q_to_nul >copy.incomplete &&
+	len=$(wc -c <copy.incomplete) &&
+	test_must_fail test-svn-fe -d preimage copy.incomplete $len
 
-	git lfg >actual &&
-	echo "a single log entry" >expect &&
-	test_cmp expect actual &&
+error: invalid delta: copies unavailable inline data
+ok 22 - catch attempt to copy missing data
 
-	git distimdist >actual &&
-	echo "distimdistim was called" >expect &&
+expecting success: 
+	printf foofoo >expect &&
+	printf "SVNQ%b%b%s" "QQ\006\004\003" "\0203\0100\003Q" "foo" |
+		q_to_nul >copytarget.repeat &&
+	len=$(wc -c <copytarget.repeat) &&
+	test-svn-fe -d preimage copytarget.repeat $len >actual &&
 	test_cmp expect actual
 
-WARNING: You called a Git command named 'lfg', which does not exist.
-Continuing under the assumption that you meant 'lgf'.
-WARNING: You called a Git command named 'distimdist', which does not exist.
-Continuing under the assumption that you meant 'distimdistim'.
-ok 3 - autocorrect running commands
+ok 23 - copyfrom target to repeat data
 
-# passed all 3 test(s)
-1..3
+expecting success: 
+	printf foooof >expect &&
+	printf "SVNQ%b%b%s" \
+		"QQ\006\007\003" "\0203\0101\002\0101\001\0101Q" "foo" |
+		q_to_nul >copytarget.reverse &&
+	len=$(wc -c <copytarget.reverse) &&
+	test-svn-fe -d preimage copytarget.reverse $len >actual &&
+	test_cmp expect actual
+
+ok 24 - copyfrom target out of order
+
+expecting success: 
+	printf "SVNQ%b%b%s" "QQ\004\004\003" "\0202\0101\002\0201" "XYZ" |
+		q_to_nul >copytarget.infuture &&
+	len=$(wc -c <copytarget.infuture) &&
+	test_must_fail test-svn-fe -d preimage copytarget.infuture $len
+
+error: invalid delta: copies from the future
+ok 25 - catch copyfrom future
+
+expecting success: 
+	printf XYXYXYXYXYXZ >expect &&
+	printf "SVNQ%b%b%s" "QQ\014\004\003" "\0202\0111Q\0201" "XYZ" |
+		q_to_nul >copytarget.sustain &&
+	len=$(wc -c <copytarget.sustain) &&
+	test-svn-fe -d preimage copytarget.sustain $len >actual &&
+	test_cmp expect actual
+
+ok 26 - copy to sustain
+
+expecting success: 
+	printf "SVNQ%b%b%s" "QQ\003\003\001" "\0201\0177Q" X |
+		q_to_nul >copytarget.overflow &&
+	len=$(wc -c <copytarget.overflow) &&
+	test_must_fail test-svn-fe -d preimage copytarget.overflow $len
+
+error: invalid delta: incorrect postimage length
+ok 27 - catch copy that overflows
+
+expecting success: 
+	printf foo >expect &&
+	printf "SVNQ%b%b" "Q\003\003\002Q" "\003Q" | q_to_nul >copysource.all &&
+	test-svn-fe -d preimage copysource.all 11 >actual &&
+	test_cmp expect actual
+
+ok 28 - copyfrom source
+
+expecting success: 
+	printf oof >expect &&
+	printf "SVNQ%b%b" "Q\003\003\006Q" "\001\002\001\001\001Q" |
+		q_to_nul >copysource.rev &&
+	test-svn-fe -d preimage copysource.rev 15 >actual &&
+	test_cmp expect actual
+
+ok 29 - copy backwards
+
+expecting success: 
+	printf fo >expect &&
+	printf "SVNQ%b%b%b%b" "Q\003\001\002Q" "\001Q" \
+		"\002\001\001\002Q" "\001Q" |
+		q_to_nul >copysource.two &&
+	test-svn-fe -d preimage copysource.two 18 >actual &&
+	test_cmp expect actual
+
+ok 30 - offsets are relative to window
+
+expecting success: 
+	printf aaaaccccdddddddd >expect &&
+	printf aaaabbbbcccc >source &&
+	printf "SVNQ%b%b%s" "Q\014\020\007\001" \
+		"\004Q\004\010\0201\0107\010" d |
+		q_to_nul >delta.example &&
+	len=$(wc -c <delta.example) &&
+	test-svn-fe -d source delta.example $len >actual &&
+	test_cmp expect actual
+
+ok 31 - example from notes/svndiff
+
+# passed all 31 test(s)
+1..31
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
 *** t6030-bisect-porcelain.sh ***
@@ -301781,387 +302422,6 @@
 1..71
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t9011-svn-da.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9011-svn-da/.git/
-expecting success: 
-	test_must_fail test-svn-fe -d preimage empty 0
-
-error: invalid delta: unexpected end of file
-ok 1 - reject empty delta
-
-expecting success: 
-	printf "SVNQ" | q_to_nul >clear.delta &&
-	test-svn-fe -d preimage clear.delta 4 >actual &&
-	test_must_be_empty actual
-
-ok 2 - delta can empty file
-
-expecting success: 
-	printf "SVN\002" >bad.filetype &&
-	test_must_fail test-svn-fe -d preimage bad.filetype 4
-
-error: invalid delta: unrecognized file type
-ok 3 - reject svndiff2
-
-expecting success: 
-	printf "SVNQ%s" "QQQQQ" | q_to_nul >clear.onewindow &&
-	test-svn-fe -d preimage clear.onewindow 9 >actual &&
-	test_must_be_empty actual
-
-ok 4 - one-window empty delta
-
-expecting success: 
-	printf "SVNQ%s" "QQQQQ" | q_to_nul >clear.onewindow &&
-	printf "SVNQ%s" "QQ" | q_to_nul >clear.partialwindow &&
-	test_must_fail test-svn-fe -d preimage clear.onewindow 6 &&
-	test_must_fail test-svn-fe -d preimage clear.partialwindow 6
-
-error: invalid delta: unexpected end of file
-error: invalid delta: unexpected end of file
-ok 5 - reject incomplete window header
-
-expecting success: 
-	printf "SVNQ%s" "QQQQQ" | q_to_nul >clear.onewindow &&
-	printf "SVNQ%s" "QQ" | q_to_nul >clear.partialwindow &&
-	test_must_fail test-svn-fe -d preimage clear.onewindow 14 &&
-	test_must_fail test-svn-fe -d preimage clear.partialwindow 9
-
-error: invalid delta: unexpected end of file
-error: invalid delta: unexpected end of file
-ok 6 - reject declared delta longer than actual delta
-
-expecting success: 
-	printf "SVNQ%s%s" "QQQQQ" "QQQQQ" | q_to_nul >clear.twowindow &&
-	test-svn-fe -d preimage clear.twowindow 14 >actual &&
-	test_must_fail test-svn-fe -d preimage clear.twowindow 13 &&
-	test_must_be_empty actual
-
-error: invalid delta: unexpected end of file
-ok 7 - two-window empty delta
-
-expecting success: 
-	printf "SVNQ%s" \
-		"RRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRQQQQQ" |
-		tr R "\200" |
-		q_to_nul >clear.noisy &&
-	len=$(wc -c <clear.noisy) &&
-	test-svn-fe -d preimage clear.noisy $len &&
-	test_must_be_empty actual
-
-ok 8 - noisy zeroes
-
-expecting success: 
-	printf "SVNRQ" | tr R "\200" | q_to_nul >clear.badmagic &&
-	test_must_fail test-svn-fe -d preimage clear.badmagic 5
-
-error: invalid delta: unrecognized file type
-ok 9 - reject variable-length int in magic
-
-expecting success: 
-	printf "SVNQ%s%s" "QQQQQ" "QQQQRRQ" |
-		tr R "\200" |
-		q_to_nul >clear.fullint &&
-	printf "SVNQ%s%s" "QQQQQ" "QQQQRR" |
-		tr RT "\201" |
-		q_to_nul >clear.partialint &&
-	test_must_fail test-svn-fe -d preimage clear.fullint 15 &&
-	test-svn-fe -d preimage clear.fullint 16 &&
-	test_must_fail test-svn-fe -d preimage clear.partialint 15
-
-error: invalid delta: unexpected end of file
-error: invalid delta: unexpected end of file
-ok 10 - reject truncated integer
-
-expecting success: 
-	printf "SVNQ%b" "Q\003QQQ" | q_to_nul >clear.readpreimage &&
-	test-svn-fe -d preimage clear.readpreimage 9 >actual &&
-	test_must_be_empty actual
-
-ok 11 - nonempty (but unused) preimage view
-
-expecting success: 
-	printf "SVNQ%b%b" "Q\003QQQ" "Q\002QQQ" |
-		q_to_nul >clear.backtrack &&
-	test_must_fail test-svn-fe -d preimage clear.backtrack 14
-
-error: invalid delta: window slides left
-ok 12 - preimage view: right endpoint cannot backtrack
-
-expecting success: 
-	printf "SVNQ%b%b" "Q\003QQQ" "\001\002QQQ" |
-		q_to_nul >clear.preshrink &&
-	printf "SVNQ%b%b" "Q\003QQQ" "\001\001QQQ" |
-		q_to_nul >clear.shrinkbacktrack &&
-	test-svn-fe -d preimage clear.preshrink 14 >actual &&
-	test_must_fail test-svn-fe -d preimage clear.shrinkbacktrack 14 &&
-	test_must_be_empty actual
-
-error: invalid delta: window slides left
-ok 13 - preimage view: left endpoint can advance
-
-expecting success: 
-	printf "SVNQ%b%b" "\001\001QQQ" "\0200Q\003QQQ" |
-		q_to_nul >clear.noisybacktrack &&
-	printf "SVNQ%b%b" "\001\001QQQ" "\0200\001\002QQQ" |
-		q_to_nul >clear.noisyadvance &&
-	test_must_fail test-svn-fe -d preimage clear.noisybacktrack 15 &&
-	test-svn-fe -d preimage clear.noisyadvance 15 &&
-	test_must_be_empty actual
-
-error: invalid delta: window slides left
-ok 14 - preimage view: offsets compared by value
-
-expecting success: 
-	printf "SVNQ%b" "\010QQQQ" | q_to_nul >clear.lateemptyread &&
-	printf "SVNQ%b" "\010\001QQQ" | q_to_nul >clear.latenonemptyread &&
-	printf "SVNQ%b" "\001\010QQQ" | q_to_nul >clear.longread &&
-	test_must_fail test-svn-fe -d preimage clear.lateemptyread 9 &&
-	test_must_fail test-svn-fe -d preimage clear.latenonemptyread 9 &&
-	test_must_fail test-svn-fe -d preimage clear.longread 9
-
-error: delta preimage ends early
-error: delta preimage ends early
-error: delta preimage ends early
-ok 15 - preimage view: reject truncated preimage
-
-expecting success: 
-	printf "SVNQ%b%s%b%s" "QQQQ\003" "bar" "QQQQ\001" "x" |
-		q_to_nul >inline.clear &&
-	test_must_fail test-svn-fe -d preimage inline.clear 18 >actual
-
-error: invalid delta: does not copy all inline data
-ok 16 - forbid unconsumed inline data
-
-expecting success: 
-	printf "SVNQ%b%s" "QQQQ\003" "b" | q_to_nul >inline.trunc &&
-	test_must_fail test-svn-fe -d preimage inline.trunc 10
-
-error: invalid delta: unexpected end of file
-ok 17 - reject truncated inline data
-
-expecting success: 
-	printf "SVNQ%b%b%s" "QQ\001\001\003" "\0201" "b" | q_to_nul >insn.trunc &&
-	test_must_fail test-svn-fe -d preimage insn.trunc 11
-
-error: invalid delta: unexpected end of file
-ok 18 - reject truncated inline data (after instruction section)
-
-expecting success: 
-	echo hi >expect &&
-	printf "SVNQ%b%b%b" "QQ\003\001\003" "\0203" "hi\n" | q_to_nul >copydat &&
-	test-svn-fe -d preimage copydat 13 >actual &&
-	test_cmp expect actual
-
-ok 19 - copyfrom_data
-
-expecting success: 
-	echo hi >expect &&
-	printf "SVNQ%b%b%b%b%b" "QQ\003\002\003" "\0201\0202" "hi\n" \
-		"QQQ\002Q" "\0200Q" | q_to_nul >copy.multi &&
-	len=$(wc -c <copy.multi) &&
-	test-svn-fe -d preimage copy.multi $len >actual &&
-	test_cmp expect actual
-
-ok 20 - multiple copyfrom_data
-
-expecting success: 
-	printf "SVNQ%b%b%b" "QQ\003\002\003" "\0203\0200" "hi\n" |
-		q_to_nul >copy.partial &&
-	len=$(wc -c <copy.partial) &&
-	test_must_fail test-svn-fe -d preimage copy.partial $len
-
-error: invalid delta: unexpected end of instructions section
-ok 21 - incomplete multiple insn
-
-expecting success: 
-	printf "SVNQ%b%b%s%b%s" "QQ\002\002\001" "\0201\0201" "X" \
-			"QQQQ\002" "YZ" |
-		q_to_nul >copy.incomplete &&
-	len=$(wc -c <copy.incomplete) &&
-	test_must_fail test-svn-fe -d preimage copy.incomplete $len
-
-error: invalid delta: copies unavailable inline data
-ok 22 - catch attempt to copy missing data
-
-expecting success: 
-	printf foofoo >expect &&
-	printf "SVNQ%b%b%s" "QQ\006\004\003" "\0203\0100\003Q" "foo" |
-		q_to_nul >copytarget.repeat &&
-	len=$(wc -c <copytarget.repeat) &&
-	test-svn-fe -d preimage copytarget.repeat $len >actual &&
-	test_cmp expect actual
-
-ok 23 - copyfrom target to repeat data
-
-expecting success: 
-	printf foooof >expect &&
-	printf "SVNQ%b%b%s" \
-		"QQ\006\007\003" "\0203\0101\002\0101\001\0101Q" "foo" |
-		q_to_nul >copytarget.reverse &&
-	len=$(wc -c <copytarget.reverse) &&
-	test-svn-fe -d preimage copytarget.reverse $len >actual &&
-	test_cmp expect actual
-
-ok 24 - copyfrom target out of order
-
-expecting success: 
-	printf "SVNQ%b%b%s" "QQ\004\004\003" "\0202\0101\002\0201" "XYZ" |
-		q_to_nul >copytarget.infuture &&
-	len=$(wc -c <copytarget.infuture) &&
-	test_must_fail test-svn-fe -d preimage copytarget.infuture $len
-
-error: invalid delta: copies from the future
-ok 25 - catch copyfrom future
-
-expecting success: 
-	printf XYXYXYXYXYXZ >expect &&
-	printf "SVNQ%b%b%s" "QQ\014\004\003" "\0202\0111Q\0201" "XYZ" |
-		q_to_nul >copytarget.sustain &&
-	len=$(wc -c <copytarget.sustain) &&
-	test-svn-fe -d preimage copytarget.sustain $len >actual &&
-	test_cmp expect actual
-
-ok 26 - copy to sustain
-
-expecting success: 
-	printf "SVNQ%b%b%s" "QQ\003\003\001" "\0201\0177Q" X |
-		q_to_nul >copytarget.overflow &&
-	len=$(wc -c <copytarget.overflow) &&
-	test_must_fail test-svn-fe -d preimage copytarget.overflow $len
-
-error: invalid delta: incorrect postimage length
-ok 27 - catch copy that overflows
-
-expecting success: 
-	printf foo >expect &&
-	printf "SVNQ%b%b" "Q\003\003\002Q" "\003Q" | q_to_nul >copysource.all &&
-	test-svn-fe -d preimage copysource.all 11 >actual &&
-	test_cmp expect actual
-
-ok 28 - copyfrom source
-
-expecting success: 
-	printf oof >expect &&
-	printf "SVNQ%b%b" "Q\003\003\006Q" "\001\002\001\001\001Q" |
-		q_to_nul >copysource.rev &&
-	test-svn-fe -d preimage copysource.rev 15 >actual &&
-	test_cmp expect actual
-
-ok 29 - copy backwards
-
-expecting success: 
-	printf fo >expect &&
-	printf "SVNQ%b%b%b%b" "Q\003\001\002Q" "\001Q" \
-		"\002\001\001\002Q" "\001Q" |
-		q_to_nul >copysource.two &&
-	test-svn-fe -d preimage copysource.two 18 >actual &&
-	test_cmp expect actual
-
-ok 30 - offsets are relative to window
-
-expecting success: 
-	printf aaaaccccdddddddd >expect &&
-	printf aaaabbbbcccc >source &&
-	printf "SVNQ%b%b%s" "Q\014\020\007\001" \
-		"\004Q\004\010\0201\0107\010" d |
-		q_to_nul >delta.example &&
-	len=$(wc -c <delta.example) &&
-	test-svn-fe -d source delta.example $len >actual &&
-	test_cmp expect actual
-
-ok 31 - example from notes/svndiff
-
-# passed all 31 test(s)
-1..31
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t9020-remote-svn.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9020-remote-svn/.git/
-expecting success: 
-	init_git &&
-	git fetch svnsim &&
-	test_cmp .git/refs/svn/svnsim/master .git/refs/remotes/svnsim/master  &&
-	cp .git/refs/remotes/svnsim/master master.good
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9020-remote-svn/.git/
-progress Imported commit 1.
-progress Imported commit 2.
-progress Imported commit 3.
-progress Imported commit 4.
-progress Imported commit 5.
-progress Imported commit 6.
-From testsvn::sim:///build/git-2.20.1/t/t9154/svn.dump
- * [new branch]      master     -> svnsim/master
-ok 1 - simple fetch
-
-expecting success: 
-	git fetch svnsim &&
-	test_cmp master.good .git/refs/remotes/svnsim/master
-
-warning: svnrdump, returned 1
-ok 2 - repeated fetch, nothing shall change
-
-expecting success: 
-	git fetch svnfile
-
-progress Imported commit 1.
-progress Imported commit 2.
-progress Imported commit 3.
-progress Imported commit 4.
-progress Imported commit 5.
-progress Imported commit 6.
-From testsvn::file:///build/git-2.20.1/t/t9154/svn.dump
- * [new branch]      master     -> svnfile/master
-ok 3 - fetch from a file:// url gives the same result
-
-checking known breakage: 
-	test_cmp .git/refs/remotes/svnfile/master .git/refs/remotes/svnsim/master
-
---- .git/refs/remotes/svnfile/master	2021-12-03 05:09:59.727465756 +0000
-+++ .git/refs/remotes/svnsim/master	2021-12-03 05:09:59.475473081 +0000
-@@ -1 +1 @@
--dcd4c3cca8ba8ffe72e050b99f3d2a44a4c69356
-+b43cc2ac09e889bbac1bf9e9c9f4a3ffab728f25
-not ok 4 - the sha1 differ because the git-svn-id line in the commit msg contains the url # TODO known breakage
-
-expecting success: 
-	# filter out any other marks, that can not be regenerated. Only up to 3 digit revisions are allowed here
-	grep ":[0-9]\{1,3\} " $MARKSPATH/svnsim.marks > $MARKSPATH/svnsim.marks.old &&
-	rm $MARKSPATH/svnsim.marks &&
-	git fetch svnsim &&
-	test_cmp $MARKSPATH/svnsim.marks.old $MARKSPATH/svnsim.marks
-
-warning: svnrdump, returned 1
-ok 5 - mark-file regeneration
-
-expecting success: 
-	SVNRMAX=3 &&
-	export SVNRMAX &&
-	init_git &&
-	git fetch svnsim &&
-	test_cmp .git/refs/svn/svnsim/master .git/refs/remotes/svnsim/master  &&
-	unset SVNRMAX &&
-	git fetch svnsim &&
-	test_cmp master.good .git/refs/remotes/svnsim/master
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9020-remote-svn/.git/
-progress Imported commit 1.
-progress Imported commit 2.
-From testsvn::sim:///build/git-2.20.1/t/t9154/svn.dump
- * [new branch]      master     -> svnsim/master
-progress Imported commit 3.
-progress Imported commit 4.
-progress Imported commit 5.
-progress Imported commit 6.
-From testsvn::sim:///build/git-2.20.1/t/t9154/svn.dump
-   c924f56..b43cc2a  master     -> svnsim/master
-ok 6 - incremental imports must lead to the same head
-
-# still have 1 known breakage(s)
-# passed all remaining 5 test(s)
-1..6
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
 *** t8001-annotate.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t8001-annotate/.git/
 expecting success: 
@@ -302171,7 +302431,7 @@
 	GIT_AUTHOR_NAME="A" GIT_AUTHOR_EMAIL="A@test.git" \
 	git commit -a -m "Initial."
 
-[master (root-commit) 82a4f90] Initial.
+[master (root-commit) 18cbfca] Initial.
  Author: A <A@test.git>
  1 file changed, 2 insertions(+)
  create mode 100644 file
@@ -302202,7 +302462,7 @@
 	GIT_AUTHOR_NAME="B" GIT_AUTHOR_EMAIL="B@test.git" \
 	git commit -a -m "Second."
 
-[master 8388019] Second.
+[master d7ca576] Second.
  Author: B <B@test.git>
  1 file changed, 2 insertions(+)
 ok 4 - setup B lines
@@ -302211,8 +302471,8 @@
 	check_count A 2 B 2
 
 git annotate  file 
-Author B (expected 2, attributed 2) good
 Author A (expected 2, attributed 2) good
+Author B (expected 2, attributed 2) good
 ok 5 - blame 2 authors
 
 expecting success: 
@@ -302223,7 +302483,7 @@
 	git commit -a -m "Branch1-1"
 
 Switched to a new branch 'branch1'
-[branch1 dc2e1f8] Branch1-1
+[branch1 cf99a10] Branch1-1
  Author: B1 <B1@test.git>
  1 file changed, 2 insertions(+)
 ok 6 - setup B1 lines (branch1)
@@ -302245,7 +302505,7 @@
 	git commit -a -m "Branch2-1"
 
 Switched to a new branch 'branch2'
-[branch2 48e7444] Branch2-1
+[branch2 6725f07] Branch2-1
  Author: B2 <B2@test.git>
  1 file changed, 1 insertion(+), 1 deletion(-)
 ok 8 - setup B2 lines (branch2)
@@ -302254,8 +302514,8 @@
 	check_count A 2 B 1 B2 1
 
 git annotate  file 
-Author A (expected 2, attributed 2) good
 Author B (expected 1, attributed 1) good
+Author A (expected 2, attributed 2) good
 Author B2 (expected 1, attributed 1) good
 ok 9 - blame 2 authors + 1 branch2 author
 
@@ -302263,10 +302523,10 @@
 	git merge branch1
 
 Merging:
-48e7444 Branch2-1
+6725f07 Branch2-1
 virtual branch1
 found 1 common ancestor:
-8388019 Second.
+d7ca576 Second.
 Auto-merging file
 Merge made by the 'recursive' strategy.
  file | 2 ++
@@ -302278,9 +302538,9 @@
 
 git annotate  file 
 Author B2 (expected 1, attributed 1) good
-Author A (expected 2, attributed 2) good
-Author B (expected 1, attributed 1) good
 Author B1 (expected 2, attributed 2) good
+Author B (expected 1, attributed 1) good
+Author A (expected 2, attributed 2) good
 ok 11 - blame 2 authors + 2 merged-in authors
 
 expecting success: 
@@ -302288,9 +302548,9 @@
 
 git annotate  --first-parent file 
 Author B (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
 Author A (expected 2, attributed 2) good
 Author A U Thor (expected 2, attributed 2) good
-Author B2 (expected 1, attributed 1) good
 ok 12 - blame --first-parent blames merge for branch1
 
 expecting success: 
@@ -302312,9 +302572,9 @@
 	echo "evil merge." >>file &&
 	git commit -a --amend
 
-[branch2 7351d9b] Merge branch 'branch1' into branch2
+[branch2 4fc40c2] Merge branch 'branch1' into branch2
  Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:09:54 2021 +0000
+ Date: Thu Jan 5 11:50:07 2023 +0000
 ok 15 - setup evil merge
 
 expecting success: 
@@ -302322,10 +302582,10 @@
 
 git annotate  file 
 Author B2 (expected 1, attributed 1) good
-Author B1 (expected 2, attributed 2) good
-Author B (expected 1, attributed 1) good
 Author A (expected 2, attributed 2) good
 Author A U Thor (expected 1, attributed 1) good
+Author B1 (expected 2, attributed 2) good
+Author B (expected 1, attributed 1) good
 ok 16 - blame evil merge
 
 expecting success: 
@@ -302517,7 +302777,7 @@
 	GIT_AUTHOR_NAME="C" GIT_AUTHOR_EMAIL="C@test.git" \
 	git commit -a -m "Incomplete"
 
-[branch2 da58e18] Incomplete
+[branch2 e7d4ec4] Incomplete
  Author: C <C@test.git>
  1 file changed, 1 insertion(+)
 ok 18 - setup incomplete line
@@ -302527,8 +302787,8 @@
 
 git annotate  file 
 Author B2 (expected 1, attributed 1) good
-Author C (expected 1, attributed 1) good
 Author B1 (expected 2, attributed 2) good
+Author C (expected 1, attributed 1) good
 Author A U Thor (expected 1, attributed 1) good
 Author A (expected 2, attributed 2) good
 Author B (expected 1, attributed 1) good
@@ -302544,7 +302804,7 @@
 	GIT_AUTHOR_NAME="D" GIT_AUTHOR_EMAIL="D@test.git" \
 	git commit -a -m "edit"
 
-[branch2 0d4848e] edit
+[branch2 3d7c2fb] edit
  Author: D <D@test.git>
  1 file changed, 1 insertion(+), 2 deletions(-)
 ok 20 - setup edits
@@ -302553,13 +302813,13 @@
 	check_count A 1 B 1 B1 1 B2 1 "A U Thor" 1 C 1 D 1
 
 git annotate  file 
-Author B (expected 1, attributed 1) good
-Author A (expected 1, attributed 1) good
 Author B1 (expected 1, attributed 1) good
-Author D (expected 1, attributed 1) good
 Author C (expected 1, attributed 1) good
 Author B2 (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
+Author B (expected 1, attributed 1) good
 Author A U Thor (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
 ok 21 - blame edits
 
 expecting success: 
@@ -302569,7 +302829,7 @@
 	GIT_AUTHOR_NAME="E" GIT_AUTHOR_EMAIL="E at test dot git" \
 	git commit -a -m "norobots"
 
-[branch2 6ba024a] norobots
+[branch2 07ed9b9] norobots
  Author: E <E at test dot git>
  1 file changed, 1 insertion(+)
 ok 22 - setup obfuscated email
@@ -302578,14 +302838,14 @@
 	check_count A 1 B 1 B1 1 B2 1 "A U Thor" 1 C 1 D 1 E 1
 
 git annotate  file 
+Author C (expected 1, attributed 1) good
+Author B (expected 1, attributed 1) good
 Author B1 (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
 Author E (expected 1, attributed 1) good
-Author A U Thor (expected 1, attributed 1) good
-Author A (expected 1, attributed 1) good
 Author B2 (expected 1, attributed 1) good
-Author D (expected 1, attributed 1) good
-Author C (expected 1, attributed 1) good
-Author B (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
+Author A U Thor (expected 1, attributed 1) good
 ok 23 - blame obfuscated email
 
 expecting success: 
@@ -302594,25 +302854,25 @@
 git annotate  -L1 file 
 Author D (expected 1, attributed 1) good
 Author A (expected 1, attributed 1) good
-Author B1 (expected 1, attributed 1) good
-Author C (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
 Author B (expected 1, attributed 1) good
 Author E (expected 1, attributed 1) good
 Author A U Thor (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
+Author B1 (expected 1, attributed 1) good
+Author C (expected 1, attributed 1) good
 ok 24 - blame -L 1 (all)
 
 expecting success: 
 	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 B2 (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 B2 (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 B1 (expected 1, attributed 1) good
-Author A U Thor (expected 1, attributed 1) good
 Author A (expected 1, attributed 1) good
 ok 25 - blame -L , (all)
 
@@ -302620,29 +302880,29 @@
 	check_count -L5 B1 1 C 1 D 1 "A U Thor" 1
 
 git annotate  -L5 file 
-Author A U Thor (expected 1, attributed 1) good
 Author B1 (expected 1, attributed 1) good
-Author D (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 26 - blame -L X (X to end)
 
 expecting success: 
 	check_count -L5, B1 1 C 1 D 1 "A U Thor" 1
 
 git annotate  -L5, file 
-Author D (expected 1, attributed 1) good
 Author C (expected 1, attributed 1) good
-Author A U Thor (expected 1, attributed 1) good
 Author B1 (expected 1, attributed 1) good
+Author A U Thor (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
 ok 27 - blame -L X, (X to end)
 
 expecting success: 
 	check_count -L,3 A 1 B2 1 E 1
 
 git annotate  -L,3 file 
+Author B2 (expected 1, attributed 1) good
 Author E (expected 1, attributed 1) good
 Author A (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
 ok 28 - blame -L ,Y (up to Y)
 
 expecting success: 
@@ -302657,8 +302917,8 @@
 
 git annotate  -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 B1 (expected 1, attributed 1) good
 Author B2 (expected 1, attributed 1) good
 ok 30 - blame -L X,Y
 
@@ -302666,10 +302926,10 @@
 	check_count -L6,3 B 1 B1 1 B2 1 D 1
 
 git annotate  -L6,3 file 
-Author B (expected 1, attributed 1) good
-Author 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 31 - blame -L Y,X (undocumented)
 
 expecting success: 
@@ -302713,9 +302973,9 @@
 	check_count -L3,+4 B 1 B1 1 B2 1 D 1
 
 git annotate  -L3,+4 file 
-Author D (expected 1, attributed 1) good
 Author B2 (expected 1, attributed 1) good
 Author B1 (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
 Author B (expected 1, attributed 1) good
 ok 38 - blame -L X,+N
 
@@ -302742,8 +303002,8 @@
 	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 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 42 - blame -L X,-N
@@ -302752,8 +303012,8 @@
 	check_count -L/evil/ C 1 "A U Thor" 1
 
 git annotate  -L/evil/ file 
-Author C (expected 1, attributed 1) good
 Author A U Thor (expected 1, attributed 1) good
+Author C (expected 1, attributed 1) good
 ok 43 - blame -L /RE/ (RE to end)
 
 expecting success: 
@@ -302761,9 +303021,9 @@
 
 git annotate  -L/robot/,/green/ file 
 Author B (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
+Author A (expected 1, attributed 1) good
 Author D (expected 1, attributed 1) good
 ok 44 - blame -L /RE/,/RE2/
 
@@ -302771,36 +303031,36 @@
 	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
+Author D (expected 1, attributed 1) good
 ok 45 - blame -L X,/RE/
 
 expecting success: 
 	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 A U Thor (expected 1, attributed 1) good
 Author D (expected 1, attributed 1) good
+Author B1 (expected 1, attributed 1) good
 ok 46 - blame -L /RE/,Y
 
 expecting success: 
 	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
-Author A U Thor (expected 1, attributed 1) good
 ok 47 - blame -L /RE/,+N
 
 expecting success: 
 	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 D (expected 1, attributed 1) good
 Author B2 (expected 1, attributed 1) good
+Author B (expected 1, attributed 1) good
 ok 48 - blame -L /RE/,-N
 
 expecting success: 
@@ -302829,14 +303089,14 @@
 	check_count -L,$n A 1 B 1 B1 1 B2 1 "A U Thor" 1 C 1 D 1 E 1
 
 git annotate  -L,8 file 
-Author C (expected 1, attributed 1) good
 Author B (expected 1, attributed 1) good
-Author A (expected 1, attributed 1) good
-Author B1 (expected 1, attributed 1) good
 Author E (expected 1, attributed 1) good
+Author A U Thor (expected 1, attributed 1) good
 Author D (expected 1, attributed 1) good
+Author C (expected 1, attributed 1) good
 Author B2 (expected 1, attributed 1) good
-Author A U Thor (expected 1, attributed 1) good
+Author B1 (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
 ok 52 - blame -L ,Y (Y == nlines)
 
 expecting success: 
@@ -302844,28 +303104,28 @@
 	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 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 D (expected 1, attributed 1) good
 Author B1 (expected 1, attributed 1) good
 Author A U Thor (expected 1, attributed 1) good
-Author D (expected 1, attributed 1) good
+Author E (expected 1, attributed 1) good
+Author B (expected 1, attributed 1) good
 Author B2 (expected 1, attributed 1) good
+Author C (expected 1, attributed 1) good
 ok 53 - blame -L ,Y (Y == nlines + 1)
 
 expecting success: 
 	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 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 C (expected 1, attributed 1) good
 Author B1 (expected 1, attributed 1) good
 Author A (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
-Author E (expected 1, attributed 1) good
 Author D (expected 1, attributed 1) good
-Author A U Thor (expected 1, attributed 1) good
-Author B (expected 1, attributed 1) good
 ok 54 - blame -L ,Y (Y > nlines)
 
 expecting success: 
@@ -302873,38 +303133,38 @@
 
 git annotate  -L2,3 -L6,7 file 
 Author A (expected 1, attributed 1) good
-Author B1 (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
 Author A U Thor (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
+Author B1 (expected 1, attributed 1) good
 ok 55 - blame -L multiple (disjoint)
 
 expecting success: 
 	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 B2 (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 56 - blame -L multiple (disjoint: unordered)
 
 expecting success: 
 	check_count -L2,3 -L4,5 A 1 B 1 B2 1 D 1
 
 git annotate  -L2,3 -L4,5 file 
-Author B2 (expected 1, attributed 1) good
-Author A (expected 1, attributed 1) good
 Author D (expected 1, attributed 1) good
 Author B (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
 ok 57 - blame -L multiple (adjacent)
 
 expecting success: 
 	check_count -L4,5 -L2,3 A 1 B 1 B2 1 D 1
 
 git annotate  -L4,5 -L2,3 file 
-Author B2 (expected 1, attributed 1) good
-Author A (expected 1, attributed 1) good
 Author D (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
 Author B (expected 1, attributed 1) good
 ok 58 - blame -L multiple (adjacent: unordered)
 
@@ -302912,57 +303172,57 @@
 	check_count -L2,4 -L3,5 A 1 B 1 B2 1 D 1
 
 git annotate  -L2,4 -L3,5 file 
+Author A (expected 1, attributed 1) good
 Author D (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
 Author B (expected 1, attributed 1) good
-Author A (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
 ok 59 - blame -L multiple (overlapping)
 
 expecting success: 
 	check_count -L3,5 -L2,4 A 1 B 1 B2 1 D 1
 
 git annotate  -L3,5 -L2,4 file 
-Author D (expected 1, attributed 1) good
-Author A (expected 1, attributed 1) good
 Author B2 (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
 Author B (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
 ok 60 - blame -L multiple (overlapping: unordered)
 
 expecting success: 
 	check_count -L2,8 -L3,5 A 1 B 1 B1 1 B2 1 C 1 D 1 "A U Thor" 1
 
 git annotate  -L2,8 -L3,5 file 
+Author D (expected 1, attributed 1) good
+Author C (expected 1, attributed 1) good
+Author A U Thor (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
 Author B1 (expected 1, attributed 1) good
 Author B2 (expected 1, attributed 1) good
-Author A U Thor (expected 1, attributed 1) good
 Author B (expected 1, attributed 1) good
-Author C (expected 1, attributed 1) good
-Author D (expected 1, attributed 1) good
-Author A (expected 1, attributed 1) good
 ok 61 - blame -L multiple (superset/subset)
 
 expecting success: 
 	check_count -L3,5 -L2,8 A 1 B 1 B1 1 B2 1 C 1 D 1 "A U Thor" 1
 
 git annotate  -L3,5 -L2,8 file 
-Author A U Thor (expected 1, attributed 1) good
-Author C (expected 1, attributed 1) good
 Author B (expected 1, attributed 1) good
-Author D (expected 1, attributed 1) good
 Author A (expected 1, attributed 1) good
-Author B1 (expected 1, attributed 1) good
 Author B2 (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
+Author C (expected 1, attributed 1) good
+Author A U Thor (expected 1, attributed 1) good
+Author B1 (expected 1, attributed 1) good
 ok 62 - blame -L multiple (superset/subset: unordered)
 
 expecting success: 
 	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 C (expected 1, attributed 1) good
 Author B1 (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
 Author D (expected 1, attributed 1) good
 Author A U Thor (expected 1, attributed 1) good
-Author C (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
 ok 63 - blame -L /RE/ (relative)
 
 expecting success: 
@@ -302970,20 +303230,20 @@
 
 git annotate  -L/dog/ file 
 Author C (expected 1, attributed 1) good
-Author D (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
 Author B (expected 1, attributed 1) good
 Author A U Thor (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
-Author A (expected 1, attributed 1) good
 Author B1 (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
 ok 64 - blame -L /RE/ (relative: no preceding range)
 
 expecting success: 
 	check_count -L1,1 -L/dog/,+1 A 1 E 1
 
 git annotate  -L1,1 -L/dog/,+1 file 
-Author A (expected 1, attributed 1) good
 Author E (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
 ok 65 - blame -L /RE/ (relative: adjacent)
 
 expecting success: 
@@ -303002,8 +303262,8 @@
 	check_count -L3,3 -L^/dog/,+2 A 1 B2 1
 
 git annotate  -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 68 - blame -L ^/RE/ (absolute)
 
 expecting success: 
@@ -303025,8 +303285,8 @@
 	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 C (expected 1, attributed 1) good
 Author E (expected 1, attributed 1) good
 ok 71 - blame -L ^/RE/ (absolute: end-of-file)
 
@@ -303059,14 +303319,14 @@
 	GIT_AUTHOR_NAME="H" GIT_AUTHOR_EMAIL="H@test.git" \
 	git commit -a -m "mail"
 
-[branch2 e35f431] hello
+[branch2 de4e160] hello
  Author: F <F@test.git>
  1 file changed, 4 insertions(+)
  create mode 100644 hello.c
-[branch2 ca0bb5f] goodbye
+[branch2 b788573] goodbye
  Author: G <G@test.git>
  1 file changed, 1 insertion(+)
-[branch2 24cd90c] mail
+[branch2 541aa81] mail
  Author: H <H@test.git>
  1 file changed, 5 insertions(+)
 ok 72 - setup -L :regex
@@ -303075,8 +303335,8 @@
 	check_count -f hello.c -L:main F 4 G 1
 
 git annotate  -L:main hello.c 
-Author G (expected 1, attributed 1) good
 Author F (expected 4, attributed 4) good
+Author G (expected 1, attributed 1) good
 ok 73 - blame -L :literal
 
 expecting success: 
@@ -303096,8 +303356,8 @@
 	check_count -f hello.c -L3,3 -L:ma.. F 1 H 4
 
 git annotate  -L3,3 -L:ma.. hello.c 
-Author F (expected 1, attributed 1) good
 Author H (expected 4, attributed 4) good
+Author F (expected 1, attributed 1) good
 ok 76 - blame -L :RE (relative)
 
 expecting success: 
@@ -303132,8 +303392,8 @@
 	check_count -f hello.c -L^:ma.. F 4 G 1
 
 git annotate  -L^:ma.. hello.c 
-Author F (expected 4, attributed 4) good
 Author G (expected 1, attributed 1) good
+Author F (expected 4, attributed 4) good
 ok 81 - blame -L ^:RE (absolute: no preceding range)
 
 expecting success: 
@@ -303148,8 +303408,8 @@
 
 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
+Author F (expected 4, attributed 4) good
 ok 83 - blame -L ^:RE (absolute: end-of-file)
 
 expecting success: 
@@ -303167,14 +303427,14 @@
 	git commit -a -m "step 1"
 	)
 
-[branch2 38732a3] step 0
+[branch2 d38c0fb] step 0
  Author: I <I@test.git>
  1 file changed, 0 insertions(+), 0 deletions(-)
  create mode 100644 incremental
-[branch2 1a6203c] step 0.5
+[branch2 7d6108a] step 0.5
  Author: I <I@test.git>
  1 file changed, 1 insertion(+)
-[branch2 d0b4984] step 1
+[branch2 7e5154b] step 1
  Author: I <I@test.git>
  1 file changed, 1 insertion(+), 1 deletion(-)
 ok 84 - setup incremental
@@ -303357,1368 +303617,6 @@
 1..107
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t8002-blame.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t8002-blame/.git/
-expecting success: 
-	echo "1A quick brown fox jumps over the" >file &&
-	echo "lazy dog" >>file &&
-	git add file &&
-	GIT_AUTHOR_NAME="A" GIT_AUTHOR_EMAIL="A@test.git" \
-	git commit -a -m "Initial."
-
-[master (root-commit) 82a4f90] Initial.
- Author: A <A@test.git>
- 1 file changed, 2 insertions(+)
- create mode 100644 file
-ok 1 - setup A lines
-
-expecting success: 
-	check_count A 2
-
-git blame -c  file 
-Author A (expected 2, attributed 2) good
-ok 2 - blame 1 author
-
-expecting success: 
-	git tag -m "test tag" testTag &&
-	git tag -m "test tag #2" testTag2 testTag &&
-	check_count -h testTag A 2 &&
-	check_count -h testTag2 A 2
-
-git blame -c  file testTag
-Author A (expected 2, attributed 2) good
-git blame -c  file testTag2
-Author A (expected 2, attributed 2) good
-ok 3 - blame by tag objects
-
-expecting success: 
-	echo "2A quick brown fox jumps over the" >>file &&
-	echo "lazy dog" >>file &&
-	GIT_AUTHOR_NAME="B" GIT_AUTHOR_EMAIL="B@test.git" \
-	git commit -a -m "Second."
-
-[master 8388019] Second.
- Author: B <B@test.git>
- 1 file changed, 2 insertions(+)
-ok 4 - setup B lines
-
-expecting success: 
-	check_count A 2 B 2
-
-git blame -c  file 
-Author A (expected 2, attributed 2) good
-Author B (expected 2, attributed 2) good
-ok 5 - blame 2 authors
-
-expecting success: 
-	git checkout -b branch1 master &&
-	echo "3A slow green fox jumps into the" >>file &&
-	echo "well." >>file &&
-	GIT_AUTHOR_NAME="B1" GIT_AUTHOR_EMAIL="B1@test.git" \
-	git commit -a -m "Branch1-1"
-
-Switched to a new branch 'branch1'
-[branch1 dc2e1f8] Branch1-1
- Author: B1 <B1@test.git>
- 1 file changed, 2 insertions(+)
-ok 6 - setup B1 lines (branch1)
-
-expecting success: 
-	check_count A 2 B 2 B1 2
-
-git blame -c  file 
-Author B1 (expected 2, attributed 2) good
-Author B (expected 2, attributed 2) good
-Author A (expected 2, attributed 2) good
-ok 7 - blame 2 authors + 1 branch1 author
-
-expecting success: 
-	git checkout -b branch2 master &&
-	sed -e "s/2A quick brown/4A quick brown lazy dog/" <file >file.new &&
-	mv file.new file &&
-	GIT_AUTHOR_NAME="B2" GIT_AUTHOR_EMAIL="B2@test.git" \
-	git commit -a -m "Branch2-1"
-
-Switched to a new branch 'branch2'
-[branch2 48e7444] Branch2-1
- Author: B2 <B2@test.git>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 8 - setup B2 lines (branch2)
-
-expecting success: 
-	check_count A 2 B 1 B2 1
-
-git blame -c  file 
-Author B2 (expected 1, attributed 1) good
-Author B (expected 1, attributed 1) good
-Author A (expected 2, attributed 2) good
-ok 9 - blame 2 authors + 1 branch2 author
-
-expecting success: 
-	git merge branch1
-
-Merging:
-48e7444 Branch2-1
-virtual branch1
-found 1 common ancestor:
-8388019 Second.
-Auto-merging file
-Merge made by the 'recursive' strategy.
- file | 2 ++
- 1 file changed, 2 insertions(+)
-ok 10 - merge branch1 & branch2
-
-expecting success: 
-	check_count A 2 B 1 B1 2 B2 1
-
-git blame -c  file 
-Author B1 (expected 2, attributed 2) good
-Author A (expected 2, attributed 2) good
-Author B (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
-ok 11 - blame 2 authors + 2 merged-in authors
-
-expecting success: 
-	check_count --first-parent A 2 B 1 "A U Thor" 2 B2 1
-
-git blame -c  --first-parent file 
-Author B (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
-Author A U Thor (expected 2, attributed 2) good
-Author A (expected 2, attributed 2) good
-ok 12 - blame --first-parent blames merge for branch1
-
-expecting success: 
-	check_count -h master A 2 B 2
-
-git blame -c  file master
-Author B (expected 2, attributed 2) good
-Author A (expected 2, attributed 2) good
-ok 13 - blame ancestor
-
-expecting success: 
-	check_count -h master^ A 2
-
-git blame -c  file master^
-Author A (expected 2, attributed 2) good
-ok 14 - blame great-ancestor
-
-expecting success: 
-	echo "evil merge." >>file &&
-	git commit -a --amend
-
-[branch2 7351d9b] Merge branch 'branch1' into branch2
- Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:09:54 2021 +0000
-ok 15 - setup evil merge
-
-expecting success: 
-	check_count A 2 B 1 B1 2 B2 1 "A U Thor" 1
-
-git blame -c  file 
-Author B (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
-Author A (expected 2, attributed 2) good
-Author B1 (expected 2, attributed 2) good
-Author A U Thor (expected 1, attributed 1) good
-ok 16 - blame evil merge
-
-expecting success: 
-	test_when_finished "git checkout branch2" &&
-	test_when_finished "rm -f .git/info/grafts" &&
-	graft= &&
-	for i in 0 1 2
-	do
-		for j in 0 1 2 3 4 5 6 7 8 9
-		do
-			git checkout --orphan "$i$j" &&
-			printf "%s\n" "$i" "$j" >file &&
-			test_tick &&
-			GIT_AUTHOR_NAME=$i$j GIT_AUTHOR_EMAIL=$i$j@test.git \
-			git commit -a -m "$i$j" &&
-			commit=$(git rev-parse --verify HEAD) &&
-			graft="$graft$commit "
-		done
-	done &&
-	printf "%s " $graft >.git/info/grafts &&
-	check_count -h 00 01 1 10 1
-
-Switched to a new branch '00'
-[00 (root-commit) e2c6177] 00
- Author: 00 <00@test.git>
- 1 file changed, 2 insertions(+)
- create mode 100644 file
-Switched to a new branch '01'
-[01 (root-commit) 0dbe04b] 01
- Author: 01 <01@test.git>
- 1 file changed, 2 insertions(+)
- create mode 100644 file
-Switched to a new branch '02'
-[02 (root-commit) 97fbca6] 02
- Author: 02 <02@test.git>
- 1 file changed, 2 insertions(+)
- create mode 100644 file
-Switched to a new branch '03'
-[03 (root-commit) 5cdbcd8] 03
- Author: 03 <03@test.git>
- 1 file changed, 2 insertions(+)
- create mode 100644 file
-Switched to a new branch '04'
-[04 (root-commit) 5a154cf] 04
- Author: 04 <04@test.git>
- 1 file changed, 2 insertions(+)
- create mode 100644 file
-Switched to a new branch '05'
-[05 (root-commit) a84e1de] 05
- Author: 05 <05@test.git>
- 1 file changed, 2 insertions(+)
- create mode 100644 file
-Switched to a new branch '06'
-[06 (root-commit) d4bea54] 06
- Author: 06 <06@test.git>
- 1 file changed, 2 insertions(+)
- create mode 100644 file
-Switched to a new branch '07'
-[07 (root-commit) 24ba6e8] 07
- Author: 07 <07@test.git>
- 1 file changed, 2 insertions(+)
- create mode 100644 file
-Switched to a new branch '08'
-[08 (root-commit) fe90088] 08
- Author: 08 <08@test.git>
- 1 file changed, 2 insertions(+)
- create mode 100644 file
-Switched to a new branch '09'
-[09 (root-commit) 773a2fb] 09
- Author: 09 <09@test.git>
- 1 file changed, 2 insertions(+)
- create mode 100644 file
-Switched to a new branch '10'
-[10 (root-commit) 80536e5] 10
- Author: 10 <10@test.git>
- 1 file changed, 2 insertions(+)
- create mode 100644 file
-Switched to a new branch '11'
-[11 (root-commit) 33c07c1] 11
- Author: 11 <11@test.git>
- 1 file changed, 2 insertions(+)
- create mode 100644 file
-Switched to a new branch '12'
-[12 (root-commit) ae7094b] 12
- Author: 12 <12@test.git>
- 1 file changed, 2 insertions(+)
- create mode 100644 file
-Switched to a new branch '13'
-[13 (root-commit) 19e767d] 13
- Author: 13 <13@test.git>
- 1 file changed, 2 insertions(+)
- create mode 100644 file
-Switched to a new branch '14'
-[14 (root-commit) f7159ac] 14
- Author: 14 <14@test.git>
- 1 file changed, 2 insertions(+)
- create mode 100644 file
-Switched to a new branch '15'
-[15 (root-commit) d95fecf] 15
- Author: 15 <15@test.git>
- 1 file changed, 2 insertions(+)
- create mode 100644 file
-Switched to a new branch '16'
-[16 (root-commit) d8bfdb9] 16
- Author: 16 <16@test.git>
- 1 file changed, 2 insertions(+)
- create mode 100644 file
-Switched to a new branch '17'
-[17 (root-commit) aa3f31e] 17
- Author: 17 <17@test.git>
- 1 file changed, 2 insertions(+)
- create mode 100644 file
-Switched to a new branch '18'
-[18 (root-commit) d76cb1d] 18
- Author: 18 <18@test.git>
- 1 file changed, 2 insertions(+)
- create mode 100644 file
-Switched to a new branch '19'
-[19 (root-commit) 95e03c5] 19
- Author: 19 <19@test.git>
- 1 file changed, 2 insertions(+)
- create mode 100644 file
-Switched to a new branch '20'
-[20 (root-commit) d40a964] 20
- Author: 20 <20@test.git>
- 1 file changed, 2 insertions(+)
- create mode 100644 file
-Switched to a new branch '21'
-[21 (root-commit) 6c3def2] 21
- Author: 21 <21@test.git>
- 1 file changed, 2 insertions(+)
- create mode 100644 file
-Switched to a new branch '22'
-[22 (root-commit) 78d2294] 22
- Author: 22 <22@test.git>
- 1 file changed, 2 insertions(+)
- create mode 100644 file
-Switched to a new branch '23'
-[23 (root-commit) 76a64d0] 23
- Author: 23 <23@test.git>
- 1 file changed, 2 insertions(+)
- create mode 100644 file
-Switched to a new branch '24'
-[24 (root-commit) 59f234a] 24
- Author: 24 <24@test.git>
- 1 file changed, 2 insertions(+)
- create mode 100644 file
-Switched to a new branch '25'
-[25 (root-commit) 26ac47a] 25
- Author: 25 <25@test.git>
- 1 file changed, 2 insertions(+)
- create mode 100644 file
-Switched to a new branch '26'
-[26 (root-commit) db7e855] 26
- Author: 26 <26@test.git>
- 1 file changed, 2 insertions(+)
- create mode 100644 file
-Switched to a new branch '27'
-[27 (root-commit) 279f565] 27
- Author: 27 <27@test.git>
- 1 file changed, 2 insertions(+)
- create mode 100644 file
-Switched to a new branch '28'
-[28 (root-commit) f691d9c] 28
- Author: 28 <28@test.git>
- 1 file changed, 2 insertions(+)
- create mode 100644 file
-Switched to a new branch '29'
-[29 (root-commit) c72134e] 29
- Author: 29 <29@test.git>
- 1 file changed, 2 insertions(+)
- create mode 100644 file
-git blame -c  file 00
-hint: Support for <GIT_DIR>/info/grafts is deprecated
-hint: and will be removed in a future Git version.
-hint: 
-hint: Please use "git replace --convert-graft-file"
-hint: to convert the grafts into replace refs.
-hint: 
-hint: Turn this message off by running
-hint: "git config advice.graftFileDeprecated false"
-Author 10 (expected 1, attributed 1) good
-Author 01 (expected 1, attributed 1) good
-Switched to branch 'branch2'
-ok 17 - blame huge graft
-
-expecting success: 
-	echo "incomplete" | tr -d "\\012" >>file &&
-	GIT_AUTHOR_NAME="C" GIT_AUTHOR_EMAIL="C@test.git" \
-	git commit -a -m "Incomplete"
-
-[branch2 da58e18] Incomplete
- Author: C <C@test.git>
- 1 file changed, 1 insertion(+)
-ok 18 - setup incomplete line
-
-expecting success: 
-	check_count A 2 B 1 B1 2 B2 1 "A U Thor" 1 C 1
-
-git blame -c  file 
-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 2, attributed 2) good
-Author B1 (expected 2, attributed 2) good
-Author B (expected 1, attributed 1) good
-ok 19 - blame incomplete line
-
-expecting success: 
-	mv file file.orig &&
-	{
-		cat file.orig &&
-		echo
-	} | sed -e "s/^3A/99/" -e "/^1A/d" -e "/^incomplete/d" >file &&
-	echo "incomplete" | tr -d "\\012" >>file &&
-	GIT_AUTHOR_NAME="D" GIT_AUTHOR_EMAIL="D@test.git" \
-	git commit -a -m "edit"
-
-[branch2 0d4848e] edit
- Author: D <D@test.git>
- 1 file changed, 1 insertion(+), 2 deletions(-)
-ok 20 - setup edits
-
-expecting success: 
-	check_count A 1 B 1 B1 1 B2 1 "A U Thor" 1 C 1 D 1
-
-git blame -c  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 B (expected 1, attributed 1) good
-Author A (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
-Author C (expected 1, attributed 1) good
-ok 21 - blame edits
-
-expecting success: 
-	echo "No robots allowed" >file.new &&
-	cat file >>file.new &&
-	mv file.new file &&
-	GIT_AUTHOR_NAME="E" GIT_AUTHOR_EMAIL="E at test dot git" \
-	git commit -a -m "norobots"
-
-[branch2 6ba024a] norobots
- Author: E <E at test dot git>
- 1 file changed, 1 insertion(+)
-ok 22 - setup obfuscated email
-
-expecting success: 
-	check_count A 1 B 1 B1 1 B2 1 "A U Thor" 1 C 1 D 1 E 1
-
-git blame -c  file 
-Author C (expected 1, attributed 1) good
-Author B1 (expected 1, attributed 1) good
-Author E (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
-Author B (expected 1, attributed 1) good
-Author A U Thor (expected 1, attributed 1) good
-Author A (expected 1, attributed 1) good
-Author D (expected 1, attributed 1) good
-ok 23 - blame obfuscated email
-
-expecting success: 
-	check_count -L1 A 1 B 1 B1 1 B2 1 "A U Thor" 1 C 1 D 1 E 1
-
-git blame -c  -L1 file 
-Author B2 (expected 1, attributed 1) good
-Author D (expected 1, attributed 1) good
-Author E (expected 1, attributed 1) good
-Author A (expected 1, attributed 1) good
-Author B (expected 1, attributed 1) good
-Author C (expected 1, attributed 1) good
-Author B1 (expected 1, attributed 1) good
-Author A U Thor (expected 1, attributed 1) good
-ok 24 - blame -L 1 (all)
-
-expecting success: 
-	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 B1 (expected 1, attributed 1) good
-Author E (expected 1, attributed 1) good
-Author B (expected 1, attributed 1) good
-Author C (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
-Author D (expected 1, attributed 1) good
-Author A U Thor (expected 1, attributed 1) good
-Author A (expected 1, attributed 1) good
-ok 25 - blame -L , (all)
-
-expecting success: 
-	check_count -L5 B1 1 C 1 D 1 "A U Thor" 1
-
-git blame -c  -L5 file 
-Author C (expected 1, attributed 1) good
-Author D (expected 1, attributed 1) good
-Author B1 (expected 1, attributed 1) good
-Author A U Thor (expected 1, attributed 1) good
-ok 26 - blame -L X (X to end)
-
-expecting success: 
-	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 D (expected 1, attributed 1) good
-Author C (expected 1, attributed 1) good
-Author A U Thor (expected 1, attributed 1) good
-ok 27 - blame -L X, (X to end)
-
-expecting success: 
-	check_count -L,3 A 1 B2 1 E 1
-
-git blame -c  -L,3 file 
-Author A (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
-Author E (expected 1, attributed 1) good
-ok 28 - blame -L ,Y (up to Y)
-
-expecting success: 
-	check_count -L3,3 B2 1
-
-git blame -c  -L3,3 file 
-Author B2 (expected 1, attributed 1) good
-ok 29 - blame -L X,X
-
-expecting success: 
-	check_count -L3,6 B 1 B1 1 B2 1 D 1
-
-git blame -c  -L3,6 file 
-Author B1 (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
-Author B (expected 1, attributed 1) good
-Author D (expected 1, attributed 1) good
-ok 30 - blame -L X,Y
-
-expecting success: 
-	check_count -L6,3 B 1 B1 1 B2 1 D 1
-
-git blame -c  -L6,3 file 
-Author D (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
-Author B (expected 1, attributed 1) good
-Author B1 (expected 1, attributed 1) good
-ok 31 - blame -L Y,X (undocumented)
-
-expecting success: 
-	test_must_fail $PROG -L-1 file
-
-fatal: -L invalid line number: -1
-ok 32 - blame -L -X
-
-expecting success: 
-	test_must_fail $PROG -L0 file
-
-fatal: -L invalid line number: 0
-ok 33 - blame -L 0
-
-expecting success: 
-	test_must_fail $PROG -L,0 file
-
-fatal: -L invalid line number: 0
-ok 34 - blame -L ,0
-
-expecting success: 
-	test_must_fail $PROG -L,+0 file
-
-fatal: -L invalid empty range
-ok 35 - blame -L ,+0
-
-expecting success: 
-	test_must_fail $PROG -L1,+0 file
-
-fatal: -L invalid empty range
-ok 36 - blame -L X,+0
-
-expecting success: 
-	check_count -L3,+1 B2 1
-
-git blame -c  -L3,+1 file 
-Author B2 (expected 1, attributed 1) good
-ok 37 - blame -L X,+1
-
-expecting success: 
-	check_count -L3,+4 B 1 B1 1 B2 1 D 1
-
-git blame -c  -L3,+4 file 
-Author D (expected 1, attributed 1) good
-Author B1 (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
-Author B (expected 1, attributed 1) good
-ok 38 - blame -L X,+N
-
-expecting success: 
-	test_must_fail $PROG -L,-0 file
-
-fatal: -L invalid empty range
-ok 39 - blame -L ,-0
-
-expecting success: 
-	test_must_fail $PROG -L1,-0 file
-
-fatal: -L invalid empty range
-ok 40 - blame -L X,-0
-
-expecting success: 
-	check_count -L3,-1 B2 1
-
-git blame -c  -L3,-1 file 
-Author B2 (expected 1, attributed 1) good
-ok 41 - blame -L X,-1
-
-expecting success: 
-	check_count -L6,-4 B 1 B1 1 B2 1 D 1
-
-git blame -c  -L6,-4 file 
-Author B (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
-Author B1 (expected 1, attributed 1) good
-Author D (expected 1, attributed 1) good
-ok 42 - blame -L X,-N
-
-expecting success: 
-	check_count -L/evil/ C 1 "A U Thor" 1
-
-git blame -c  -L/evil/ file 
-Author C (expected 1, attributed 1) good
-Author A U Thor (expected 1, attributed 1) good
-ok 43 - blame -L /RE/ (RE to end)
-
-expecting success: 
-	check_count -L/robot/,/green/ A 1 B 1 B2 1 D 1 E 1
-
-git blame -c  -L/robot/,/green/ file 
-Author B2 (expected 1, attributed 1) good
-Author B (expected 1, attributed 1) good
-Author D (expected 1, attributed 1) good
-Author A (expected 1, attributed 1) good
-Author E (expected 1, attributed 1) good
-ok 44 - blame -L /RE/,/RE2/
-
-expecting success: 
-	check_count -L5,/evil/ B1 1 D 1 "A U Thor" 1
-
-git blame -c  -L5,/evil/ file 
-Author A U Thor (expected 1, attributed 1) good
-Author B1 (expected 1, attributed 1) good
-Author D (expected 1, attributed 1) good
-ok 45 - blame -L X,/RE/
-
-expecting success: 
-	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
-ok 46 - blame -L /RE/,Y
-
-expecting success: 
-	check_count -L/99/,+3 B1 1 D 1 "A U Thor" 1
-
-git blame -c  -L/99/,+3 file 
-Author D (expected 1, attributed 1) good
-Author B1 (expected 1, attributed 1) good
-Author A U Thor (expected 1, attributed 1) good
-ok 47 - blame -L /RE/,+N
-
-expecting success: 
-	check_count -L/99/,-3 B 1 B2 1 D 1
-
-git blame -c  -L/99/,-3 file 
-Author B (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
-Author D (expected 1, attributed 1) good
-ok 48 - blame -L /RE/,-N
-
-expecting success: 
-	n=$(expr $(wc -l <file) + 1) &&
-	check_count -L$n C 1
-
-git blame -c  -L8 file 
-Author C (expected 1, attributed 1) good
-ok 49 - blame -L X (X == nlines)
-
-expecting success: 
-	n=$(expr $(wc -l <file) + 2) &&
-	test_must_fail $PROG -L$n file
-
-fatal: file file has only 8 lines
-ok 50 - blame -L X (X == nlines + 1)
-
-expecting success: 
-	test_must_fail $PROG -L12345 file
-
-fatal: file file has only 8 lines
-ok 51 - blame -L X (X > nlines)
-
-expecting success: 
-	n=$(expr $(wc -l <file) + 1) &&
-	check_count -L,$n A 1 B 1 B1 1 B2 1 "A U Thor" 1 C 1 D 1 E 1
-
-git blame -c  -L,8 file 
-Author C (expected 1, attributed 1) good
-Author A U Thor (expected 1, attributed 1) good
-Author B (expected 1, attributed 1) good
-Author E (expected 1, attributed 1) good
-Author A (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
-Author B1 (expected 1, attributed 1) good
-Author D (expected 1, attributed 1) good
-ok 52 - blame -L ,Y (Y == nlines)
-
-expecting success: 
-	n=$(expr $(wc -l <file) + 2) &&
-	check_count -L,$n A 1 B 1 B1 1 B2 1 "A U Thor" 1 C 1 D 1 E 1
-
-git blame -c  -L,9 file 
-Author A (expected 1, attributed 1) good
-Author C (expected 1, attributed 1) good
-Author E (expected 1, attributed 1) good
-Author B1 (expected 1, attributed 1) good
-Author D (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 53 - blame -L ,Y (Y == nlines + 1)
-
-expecting success: 
-	check_count -L,12345 A 1 B 1 B1 1 B2 1 "A U Thor" 1 C 1 D 1 E 1
-
-git blame -c  -L,12345 file 
-Author B2 (expected 1, attributed 1) good
-Author A (expected 1, attributed 1) good
-Author C (expected 1, attributed 1) good
-Author B1 (expected 1, attributed 1) good
-Author B (expected 1, attributed 1) good
-Author D (expected 1, attributed 1) good
-Author E (expected 1, attributed 1) good
-Author A U Thor (expected 1, attributed 1) good
-ok 54 - blame -L ,Y (Y > nlines)
-
-expecting success: 
-	check_count -L2,3 -L6,7 A 1 B1 1 B2 1 "A U Thor" 1
-
-git blame -c  -L2,3 -L6,7 file 
-Author B1 (expected 1, attributed 1) good
-Author A U Thor (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
-Author A (expected 1, attributed 1) good
-ok 55 - blame -L multiple (disjoint)
-
-expecting success: 
-	check_count -L6,7 -L2,3 A 1 B1 1 B2 1 "A U Thor" 1
-
-git blame -c  -L6,7 -L2,3 file 
-Author B1 (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
-Author A U Thor (expected 1, attributed 1) good
-Author A (expected 1, attributed 1) good
-ok 56 - blame -L multiple (disjoint: unordered)
-
-expecting success: 
-	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 B (expected 1, attributed 1) good
-Author D (expected 1, attributed 1) good
-Author A (expected 1, attributed 1) good
-ok 57 - blame -L multiple (adjacent)
-
-expecting success: 
-	check_count -L4,5 -L2,3 A 1 B 1 B2 1 D 1
-
-git blame -c  -L4,5 -L2,3 file 
-Author B (expected 1, attributed 1) good
-Author D (expected 1, attributed 1) good
-Author A (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
-ok 58 - blame -L multiple (adjacent: unordered)
-
-expecting success: 
-	check_count -L2,4 -L3,5 A 1 B 1 B2 1 D 1
-
-git blame -c  -L2,4 -L3,5 file 
-Author B (expected 1, attributed 1) good
-Author A (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
-Author D (expected 1, attributed 1) good
-ok 59 - blame -L multiple (overlapping)
-
-expecting success: 
-	check_count -L3,5 -L2,4 A 1 B 1 B2 1 D 1
-
-git blame -c  -L3,5 -L2,4 file 
-Author B (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
-Author A (expected 1, attributed 1) good
-Author D (expected 1, attributed 1) good
-ok 60 - blame -L multiple (overlapping: unordered)
-
-expecting success: 
-	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 C (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
-Author A U Thor (expected 1, attributed 1) good
-Author D (expected 1, attributed 1) good
-Author B1 (expected 1, attributed 1) good
-Author A (expected 1, attributed 1) good
-Author B (expected 1, attributed 1) good
-ok 61 - blame -L multiple (superset/subset)
-
-expecting success: 
-	check_count -L3,5 -L2,8 A 1 B 1 B1 1 B2 1 C 1 D 1 "A U Thor" 1
-
-git blame -c  -L3,5 -L2,8 file 
-Author A U Thor (expected 1, attributed 1) good
-Author 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 B (expected 1, attributed 1) good
-Author D (expected 1, attributed 1) good
-ok 62 - blame -L multiple (superset/subset: unordered)
-
-expecting success: 
-	check_count -L3,3 -L/fox/ B1 1 B2 1 C 1 D 1 "A U Thor" 1
-
-git blame -c  -L3,3 -L/fox/ file 
-Author B1 (expected 1, attributed 1) good
-Author A U Thor (expected 1, attributed 1) good
-Author C (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
-Author D (expected 1, attributed 1) good
-ok 63 - blame -L /RE/ (relative)
-
-expecting success: 
-	check_count -L/dog/ A 1 B 1 B1 1 B2 1 C 1 D 1 "A U Thor" 1
-
-git blame -c  -L/dog/ file 
-Author B (expected 1, attributed 1) good
-Author A (expected 1, attributed 1) good
-Author B1 (expected 1, attributed 1) good
-Author A U Thor (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
-Author D (expected 1, attributed 1) good
-Author C (expected 1, attributed 1) good
-ok 64 - blame -L /RE/ (relative: no preceding range)
-
-expecting success: 
-	check_count -L1,1 -L/dog/,+1 A 1 E 1
-
-git blame -c  -L1,1 -L/dog/,+1 file 
-Author A (expected 1, attributed 1) good
-Author E (expected 1, attributed 1) good
-ok 65 - blame -L /RE/ (relative: adjacent)
-
-expecting success: 
-	test_must_fail $PROG -L4,4 -L/dog/ file
-
-fatal: -L parameter 'dog' starting at line 5: No match
-ok 66 - blame -L /RE/ (relative: not found)
-
-expecting success: 
-	test_must_fail $PROG -L, -L/$/ file
-
-fatal: file file has only 8 lines
-ok 67 - blame -L /RE/ (relative: end-of-file)
-
-expecting success: 
-	check_count -L3,3 -L^/dog/,+2 A 1 B2 1
-
-git blame -c  -L3,3 -L^/dog/,+2 file 
-Author B2 (expected 1, attributed 1) good
-Author A (expected 1, attributed 1) good
-ok 68 - blame -L ^/RE/ (absolute)
-
-expecting success: 
-	check_count -L^/dog/,+2 A 1 B2 1
-
-git blame -c  -L^/dog/,+2 file 
-Author A (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
-ok 69 - blame -L ^/RE/ (absolute: no preceding range)
-
-expecting success: 
-	test_must_fail $PROG -L4,4 -L^/tambourine/ file
-
-fatal: -L parameter 'tambourine' starting at line 1: No match
-ok 70 - blame -L ^/RE/ (absolute: not found)
-
-expecting success: 
-	n=$(expr $(wc -l <file) + 1) &&
-	check_count -L$n -L^/$/,+2 A 1 C 1 E 1
-
-git blame -c  -L8 -L^/$/,+2 file 
-Author A (expected 1, attributed 1) good
-Author E (expected 1, attributed 1) good
-Author C (expected 1, attributed 1) good
-ok 71 - blame -L ^/RE/ (absolute: end-of-file)
-
-expecting success: 
-	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 e35f431] hello
- Author: F <F@test.git>
- 1 file changed, 4 insertions(+)
- create mode 100644 hello.c
-[branch2 ca0bb5f] goodbye
- Author: G <G@test.git>
- 1 file changed, 1 insertion(+)
-[branch2 24cd90c] mail
- Author: H <H@test.git>
- 1 file changed, 5 insertions(+)
-ok 72 - setup -L :regex
-
-expecting success: 
-	check_count -f hello.c -L:main F 4 G 1
-
-git blame -c  -L:main hello.c 
-Author G (expected 1, attributed 1) good
-Author F (expected 4, attributed 4) good
-ok 73 - blame -L :literal
-
-expecting success: 
-	check_count -f hello.c "-L:m[a-z][a-z]l" H 4
-
-git blame -c  -L:m[a-z][a-z]l hello.c 
-Author H (expected 4, attributed 4) good
-ok 74 - blame -L :regex
-
-expecting success: 
-	test_must_fail $PROG -L:nomatch hello.c
-
-fatal: -L parameter 'nomatch' starting at line 1: no match
-ok 75 - blame -L :nomatch
-
-expecting success: 
-	check_count -f hello.c -L3,3 -L:ma.. F 1 H 4
-
-git blame -c  -L3,3 -L:ma.. hello.c 
-Author F (expected 1, attributed 1) good
-Author H (expected 4, attributed 4) good
-ok 76 - blame -L :RE (relative)
-
-expecting success: 
-	check_count -f hello.c -L:ma.. F 4 G 1
-
-git blame -c  -L:ma.. hello.c 
-Author F (expected 4, attributed 4) good
-Author G (expected 1, attributed 1) good
-ok 77 - blame -L :RE (relative: no preceding range)
-
-expecting success: 
-	test_must_fail $PROG -L3,3 -L:tambourine hello.c
-
-fatal: -L parameter 'tambourine' starting at line 4: no match
-ok 78 - blame -L :RE (relative: not found)
-
-expecting success: 
-	test_must_fail $PROG -L, -L:main hello.c
-
-fatal: -L parameter 'main' starting at line 11: no match
-ok 79 - blame -L :RE (relative: end-of-file)
-
-expecting success: 
-	check_count -f hello.c -L3,3 -L^:ma.. F 4 G 1
-
-git blame -c  -L3,3 -L^:ma.. hello.c 
-Author F (expected 4, attributed 4) good
-Author G (expected 1, attributed 1) good
-ok 80 - blame -L ^:RE (absolute)
-
-expecting success: 
-	check_count -f hello.c -L^:ma.. F 4 G 1
-
-git blame -c  -L^:ma.. hello.c 
-Author F (expected 4, attributed 4) good
-Author G (expected 1, attributed 1) good
-ok 81 - blame -L ^:RE (absolute: no preceding range)
-
-expecting success: 
-	test_must_fail $PROG -L4,4 -L^:tambourine hello.c
-
-fatal: -L parameter 'tambourine' starting at line 1: no match
-ok 82 - blame -L ^:RE (absolute: not found)
-
-expecting success: 
-	n=$(printf "%d" $(wc -l <hello.c)) &&
-	check_count -f hello.c -L$n -L^:ma.. F 4 G 1 H 1
-
-git blame -c  -L10 -L^:ma.. hello.c 
-Author H (expected 1, attributed 1) good
-Author G (expected 1, attributed 1) good
-Author F (expected 4, attributed 4) good
-ok 83 - blame -L ^:RE (absolute: end-of-file)
-
-expecting success: 
-	(
-	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 38732a3] step 0
- Author: I <I@test.git>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 incremental
-[branch2 1a6203c] step 0.5
- Author: I <I@test.git>
- 1 file changed, 1 insertion(+)
-[branch2 d0b4984] step 1
- Author: I <I@test.git>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 84 - setup incremental
-
-expecting success: 
-	check_count -h HEAD^^ -f incremental
-
-git blame -c  incremental HEAD^^
-ok 85 - blame empty
-
-expecting success: 
-	test_must_fail $PROG -L0 incremental HEAD^^
-
-fatal: -L invalid line number: 0
-ok 86 - blame -L 0 empty
-
-expecting success: 
-	test_must_fail $PROG -L1 incremental HEAD^^
-
-fatal: file incremental has only 0 lines
-ok 87 - blame -L 1 empty
-
-expecting success: 
-	test_must_fail $PROG -L2 incremental HEAD^^
-
-fatal: file incremental has only 0 lines
-ok 88 - blame -L 2 empty
-
-expecting success: 
-	check_count -h HEAD^ -f incremental I 1
-
-git blame -c  incremental HEAD^
-Author I (expected 1, attributed 1) good
-ok 89 - blame half
-
-expecting success: 
-	test_must_fail $PROG -L0 incremental HEAD^
-
-fatal: -L invalid line number: 0
-ok 90 - blame -L 0 half
-
-expecting success: 
-	check_count -h HEAD^ -f incremental -L1 I 1
-
-git blame -c  -L1 incremental HEAD^
-Author I (expected 1, attributed 1) good
-ok 91 - blame -L 1 half
-
-expecting success: 
-	test_must_fail $PROG -L2 incremental HEAD^
-
-fatal: file incremental has only 1 line
-ok 92 - blame -L 2 half
-
-expecting success: 
-	test_must_fail $PROG -L3 incremental HEAD^
-
-fatal: file incremental has only 1 line
-ok 93 - blame -L 3 half
-
-expecting success: 
-	check_count -f incremental I 1
-
-git blame -c  incremental 
-Author I (expected 1, attributed 1) good
-ok 94 - blame full
-
-expecting success: 
-	test_must_fail $PROG -L0 incremental
-
-fatal: -L invalid line number: 0
-ok 95 - blame -L 0 full
-
-expecting success: 
-	check_count -f incremental -L1 I 1
-
-git blame -c  -L1 incremental 
-Author I (expected 1, attributed 1) good
-ok 96 - blame -L 1 full
-
-expecting success: 
-	test_must_fail $PROG -L2 incremental
-
-fatal: file incremental has only 1 line
-ok 97 - blame -L 2 full
-
-expecting success: 
-	test_must_fail $PROG -L3 incremental
-
-fatal: file incremental has only 1 line
-ok 98 - blame -L 3 full
-
-expecting success: 
-	test_must_fail $PROG -L file
-
-usage: git blame [<options>] [<rev-opts>] [<rev>] [--] <file>
-
-    <rev-opts> are documented in git-rev-list(1)
-
-    --incremental         Show blame entries as we find them, incrementally
-    -b                    Show blank SHA-1 for boundary commits (Default: off)
-    --root                Do not treat root commits as boundaries (Default: off)
-    --show-stats          Show work cost statistics
-    --progress            Force progress reporting
-    --score-debug         Show output score for blame entries
-    -f, --show-name       Show original filename (Default: auto)
-    -n, --show-number     Show original linenumber (Default: off)
-    -p, --porcelain       Show in a format designed for machine consumption
-    --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, --show-email      Show author email instead of name (Default: off)
-    -w                    Ignore whitespace differences
-    --color-lines         color redundant metadata from previous line differently
-    --color-by-age        color lines by age
-    --indent-heuristic    Use an experimental heuristic to improve diffs
-    --minimal             Spend extra cycles to find better match
-    -S <file>             Use revisions from <file> instead of calling git-rev-list
-    --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 <n,m>              Process only line range n,m, counting from 1
-    --abbrev[=<n>]        use <n> digits to display SHA-1s
-
-ok 99 - blame -L
-
-expecting success: 
-	test_must_fail $PROG -L1,+ file
-
-usage: git blame [<options>] [<rev-opts>] [<rev>] [--] <file>
-ok 100 - blame -L X,+
-
-expecting success: 
-	test_must_fail $PROG -L1,- file
-
-usage: git blame [<options>] [<rev-opts>] [<rev>] [--] <file>
-ok 101 - blame -L X,-
-
-expecting success: 
-	test_must_fail $PROG -LX file
-
-usage: git blame [<options>] [<rev-opts>] [<rev>] [--] <file>
-ok 102 - blame -L X (non-numeric X)
-
-expecting success: 
-	test_must_fail $PROG -L1,Y file
-
-usage: git blame [<options>] [<rev-opts>] [<rev>] [--] <file>
-ok 103 - blame -L X,Y (non-numeric Y)
-
-expecting success: 
-	test_must_fail $PROG -L1,+N file
-
-usage: git blame [<options>] [<rev-opts>] [<rev>] [--] <file>
-ok 104 - blame -L X,+N (non-numeric N)
-
-expecting success: 
-	test_must_fail $PROG -L1,-N file
-
-usage: git blame [<options>] [<rev-opts>] [<rev>] [--] <file>
-ok 105 - blame -L X,-N (non-numeric N)
-
-expecting success: 
-	test_must_fail $PROG -L1,^/99/ file
-
-usage: git blame [<options>] [<rev-opts>] [<rev>] [--] <file>
-ok 106 - blame -L ,^/RE/
-
-expecting success: 
-	>untracked &&
-	test_must_fail git blame untracked
-
-fatal: no such path 'untracked' in HEAD
-ok 107 - blame untracked file in empty repo
-
-expecting success: 
-	check_count \
-		"<A@test.git>" 1 \
-		"<B@test.git>" 1 \
-		"<B1@test.git>" 1 \
-		"<B2@test.git>" 1 \
-		"<author@example.com>" 1 \
-		"<C@test.git>" 1 \
-		"<D@test.git>" 1 \
-		"<E at test dot git>" 1
-
-git blame -c -e  file 
-Author <D@test.git> (expected 1, attributed 1) good
-Author <E at test dot git> (expected 1, attributed 1) good
-Author <B2@test.git> (expected 1, attributed 1) good
-Author <B@test.git> (expected 1, attributed 1) good
-Author <author@example.com> (expected 1, attributed 1) good
-Author <C@test.git> (expected 1, attributed 1) good
-Author <A@test.git> (expected 1, attributed 1) good
-Author <B1@test.git> (expected 1, attributed 1) good
-ok 108 - blame --show-email
-
-expecting success: 
-	echo "bin: test number 1" >one &&
-	git add one &&
-	GIT_AUTHOR_NAME=name1 \
-	GIT_AUTHOR_EMAIL=email1@test.git \
-	git commit -m First --date="2010-01-01 01:00:00" &&
-	cat >expected_n <<-\EOF &&
-	(name1 2010-01-01 01:00:00 +0000 1) bin: test number 1
-	EOF
-	cat >expected_e <<-\EOF
-	(<email1@test.git> 2010-01-01 01:00:00 +0000 1) bin: test number 1
-	EOF
-
-[branch2 e9b4edd] First
- Author: name1 <email1@test.git>
- Date: Fri Jan 1 01:00:00 2010 +0000
- 1 file changed, 1 insertion(+)
- create mode 100644 one
-ok 109 - setup showEmail tests
-
-expecting success: 
-	git blame one >blame &&
-	find_blame <blame >result &&
-	test_cmp expected_n result
-
-ok 110 - blame with no options and no config
-
-expecting success: 
-	git blame --show-email one >blame1 &&
-	find_blame <blame1 >result &&
-	test_cmp expected_e result &&
-	git blame -e one >blame2 &&
-	find_blame <blame2 >result &&
-	test_cmp expected_e result &&
-	git blame --no-show-email one >blame3 &&
-	find_blame <blame3 >result &&
-	test_cmp expected_n result
-
-ok 111 - blame with showemail options
-
-expecting success: 
-	git config blame.showEmail false &&
-	git blame one >blame1 &&
-	find_blame <blame1 >result &&
-	test_cmp expected_n result &&
-	git blame --show-email one >blame2 &&
-	find_blame <blame2 >result &&
-	test_cmp expected_e result &&
-	git blame -e one >blame3 &&
-	find_blame <blame3 >result &&
-	test_cmp expected_e result &&
-	git blame --no-show-email one >blame4 &&
-	find_blame <blame4 >result &&
-	test_cmp expected_n result
-
-ok 112 - blame with showEmail config false
-
-expecting success: 
-	git config blame.showEmail true &&
-	git blame one >blame1 &&
-	find_blame <blame1 >result &&
-	test_cmp expected_e result &&
-	git blame --no-show-email one >blame2 &&
-	find_blame <blame2 >result &&
-	test_cmp expected_n result
-
-ok 113 - blame with showEmail config true
-
-expecting success: 
-	test_commit abbrev &&
-	sha1=$(git rev-parse --verify HEAD) &&
-	check_abbrev () {
-		expect=$1; shift
-		echo $sha1 | cut -c 1-$expect >expect &&
-		git blame "$@" abbrev.t >actual &&
-		perl -lne "/[0-9a-f]+/ and print \$&" <actual >actual.sha &&
-		test_cmp expect actual.sha
-	}
-
-[branch2 b7f6f8c] abbrev
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 abbrev.t
-ok 114 - set up abbrev tests
-
-expecting success: 
-	# non-boundary commits get +1 for alignment
-	check_abbrev 31 --abbrev=30 HEAD &&
-	check_abbrev 30 --abbrev=30 ^HEAD
-
-ok 115 - blame --abbrev=<n> works
-
-expecting success: 
-	check_abbrev 40 -l HEAD &&
-	check_abbrev 39 -l ^HEAD
-
-ok 116 - blame -l aligns regular and boundary commits
-
-expecting success: 
-	check_abbrev 40 --abbrev=40 HEAD &&
-	check_abbrev 39 --abbrev=40 ^HEAD
-
-ok 117 - blame --abbrev=40 behaves like -l
-
-expecting success: 
-	check_abbrev 40 --no-abbrev
-
-ok 118 - --no-abbrev works like --abbrev=40
-
-expecting success: 
-	test_must_fail git blame --exclude-promisor-objects one
-
-error: unknown option `--exclude-promisor-objects'
-usage: git blame [<options>] [<rev-opts>] [<rev>] [--] <file>
-
-    <rev-opts> are documented in git-rev-list(1)
-
-    --incremental         Show blame entries as we find them, incrementally
-    -b                    Show blank SHA-1 for boundary commits (Default: off)
-    --root                Do not treat root commits as boundaries (Default: off)
-    --show-stats          Show work cost statistics
-    --progress            Force progress reporting
-    --score-debug         Show output score for blame entries
-    -f, --show-name       Show original filename (Default: auto)
-    -n, --show-number     Show original linenumber (Default: off)
-    -p, --porcelain       Show in a format designed for machine consumption
-    --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, --show-email      Show author email instead of name (Default: off)
-    -w                    Ignore whitespace differences
-    --color-lines         color redundant metadata from previous line differently
-    --color-by-age        color lines by age
-    --indent-heuristic    Use an experimental heuristic to improve diffs
-    --minimal             Spend extra cycles to find better match
-    -S <file>             Use revisions from <file> instead of calling git-rev-list
-    --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 <n,m>              Process only line range n,m, counting from 1
-    --abbrev[=<n>]        use <n> digits to display SHA-1s
-
-ok 119 - --exclude-promisor-objects does not BUG-crash
-
-# passed all 119 test(s)
-1..119
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
 *** t9010-svn-fe.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9010-svn-fe/.git/
 checking prerequisite: PIPE
@@ -305484,8 +304382,8 @@
 pack_report: pack_mapped              =          0 /          0
 ---------------------------------------------------------------------
 
---- hello	2021-12-03 05:09:59.519471802 +0000
-+++ actual.target	2021-12-03 05:09:59.599469476 +0000
+--- hello	2023-01-05 11:50:11.842868030 +0000
++++ actual.target	2023-01-05 11:50:11.934868030 +0000
 @@ -1 +1 @@
 -hello
 +link hello
@@ -306246,183 +305144,1609 @@
 	test_cmp expect.2 actual.2 &&
 	test_cmp expect.3 actual.3
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9010-svn-fe/.git/
-progress Imported commit 1.
-progress Imported commit 2.
-progress Imported commit 3.
-/build/git-2.20.1/git-fast-import statistics:
----------------------------------------------------------------------
-Alloc'd objects:       5000
-Total objects:           18 (         0 duplicates                  )
-      blobs  :            6 (         0 duplicates          0 deltas of          3 attempts)
-      trees  :            6 (         0 duplicates          2 deltas of          4 attempts)
-      commits:            6 (         0 duplicates          0 deltas of          0 attempts)
-      tags   :            0 (         0 duplicates          0 deltas of          0 attempts)
-Total branches:           2 (         2 loads     )
-      marks:           1024 (         3 unique    )
-      atoms:              4
-Memory total:          2344 KiB
-       pools:          2110 KiB
-     objects:           234 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize = 1073741824
-pack_report: core.packedGitLimit      = 35184372088832
-pack_report: pack_used_ctr            =          2
-pack_report: pack_mmap_calls          =          2
-pack_report: pack_open_windows        =          0 /          1
-pack_report: pack_mapped              =          0 /        964
----------------------------------------------------------------------
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9010-svn-fe/.git/
+progress Imported commit 1.
+progress Imported commit 2.
+progress Imported commit 3.
+/build/git-2.20.1/git-fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:       5000
+Total objects:           18 (         0 duplicates                  )
+      blobs  :            6 (         0 duplicates          0 deltas of          3 attempts)
+      trees  :            6 (         0 duplicates          2 deltas of          4 attempts)
+      commits:            6 (         0 duplicates          0 deltas of          0 attempts)
+      tags   :            0 (         0 duplicates          0 deltas of          0 attempts)
+Total branches:           2 (         2 loads     )
+      marks:           1024 (         3 unique    )
+      atoms:              4
+Memory total:          2344 KiB
+       pools:          2110 KiB
+     objects:           234 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize = 1073741824
+pack_report: core.packedGitLimit      = 35184372088832
+pack_report: pack_used_ctr            =          2
+pack_report: pack_mmap_calls          =          2
+pack_report: pack_open_windows        =          0 /          1
+pack_report: pack_mapped              =          0 /        964
+---------------------------------------------------------------------
+
+ok 20 - deltas need not consume the whole preimage
+
+expecting success: 
+	reinit_git &&
+	{
+		# COPY 1
+		printf "SVNQ%b%b" "Q\001\001\002Q" "\001Q" |
+		q_to_nul
+	} >greedy.delta &&
+	{
+		cat <<-\EOF &&
+		SVN-fs-dump-format-version: 3
+
+		Revision-number: 1
+		Prop-content-length: 10
+		Content-length: 10
+
+		PROPS-END
+
+		Node-path: bootstrap
+		Node-kind: file
+		Node-action: add
+		Text-delta: true
+		Prop-content-length: 10
+		EOF
+		echo Text-content-length: $(wc -c <greedy.delta) &&
+		echo Content-length: $((10 + $(wc -c <greedy.delta))) &&
+		echo &&
+		echo PROPS-END &&
+		cat greedy.delta &&
+		echo
+	} >greedydelta.dump &&
+	try_dump greedydelta.dump must_fail might_fail
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9010-svn-fe/.git/
+error: delta preimage ends early
+fatal: cannot apply delta
+fatal: Expected 'data n' command, found: 
+fast-import: dumping crash report to .git/fast_import_crash_2884426
+ok 21 - no hang for delta trying to read past end of preimage
+
+expecting success: 
+	svnconf=$PWD/svnconf &&
+	mkdir -p "$svnconf" &&
+
+	if
+		svnadmin -h >/dev/null 2>&1 &&
+		svnadmin create simple-svn &&
+		svnadmin load simple-svn <"$TEST_DIRECTORY/t9135/svn.dump" &&
+		svn export --config-dir "$svnconf" "file://$PWD/simple-svn" simple-svnco
+	then
+		test_set_prereq SVNREPO
+	fi
+
+<<< 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 >>>
+
+A    simple-svnco
+A    simple-svnco/branches
+A    simple-svnco/branches/branch-b
+A    simple-svnco/branches/branch-b/b1
+A    simple-svnco/branches/branch-c
+A    simple-svnco/branches/branch-c/b1
+A    simple-svnco/trunk
+Exported revision 6.
+ok 22 - set up svn repo
+
+expecting success: 
+	mkdir -p simple-git &&
+	(
+		cd simple-git &&
+		reinit_git &&
+		try_dump "$TEST_DIRECTORY/t9135/svn.dump"
+	) &&
+	(
+		cd simple-svnco &&
+		git init &&
+		git add . &&
+		git fetch ../simple-git master &&
+		git diff --exit-code FETCH_HEAD
+	)
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9010-svn-fe/simple-git/.git/
+progress Imported commit 1.
+progress Imported commit 2.
+progress Imported commit 3.
+progress Imported commit 4.
+progress Imported commit 5.
+progress Imported commit 6.
+/build/git-2.20.1/git-fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:       5000
+Total objects:           31 (         0 duplicates                  )
+      blobs  :            7 (         0 duplicates          2 deltas of          4 attempts)
+      trees  :           12 (         0 duplicates          6 deltas of          7 attempts)
+      commits:           12 (         0 duplicates          0 deltas of          0 attempts)
+      tags   :            0 (         0 duplicates          0 deltas of          0 attempts)
+Total branches:           2 (         2 loads     )
+      marks:           1024 (         6 unique    )
+      atoms:             10
+Memory total:          2344 KiB
+       pools:          2110 KiB
+     objects:           234 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize = 1073741824
+pack_report: core.packedGitLimit      = 35184372088832
+pack_report: pack_used_ctr            =          7
+pack_report: pack_mmap_calls          =          3
+pack_report: pack_open_windows        =          0 /          1
+pack_report: pack_mapped              =          0 /       2551
+---------------------------------------------------------------------
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9010-svn-fe/simple-svnco/.git/
+From ../simple-git
+ * branch            master     -> FETCH_HEAD
+ok 23 - t9135/svn.dump
+
+# still have 3 known breakage(s)
+# passed all remaining 20 test(s)
+1..23
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t8002-blame.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t8002-blame/.git/
+expecting success: 
+	echo "1A quick brown fox jumps over the" >file &&
+	echo "lazy dog" >>file &&
+	git add file &&
+	GIT_AUTHOR_NAME="A" GIT_AUTHOR_EMAIL="A@test.git" \
+	git commit -a -m "Initial."
+
+[master (root-commit) 18cbfca] Initial.
+ Author: A <A@test.git>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 file
+ok 1 - setup A lines
+
+expecting success: 
+	check_count A 2
+
+git blame -c  file 
+Author A (expected 2, attributed 2) good
+ok 2 - blame 1 author
+
+expecting success: 
+	git tag -m "test tag" testTag &&
+	git tag -m "test tag #2" testTag2 testTag &&
+	check_count -h testTag A 2 &&
+	check_count -h testTag2 A 2
+
+git blame -c  file testTag
+Author A (expected 2, attributed 2) good
+git blame -c  file testTag2
+Author A (expected 2, attributed 2) good
+ok 3 - blame by tag objects
+
+expecting success: 
+	echo "2A quick brown fox jumps over the" >>file &&
+	echo "lazy dog" >>file &&
+	GIT_AUTHOR_NAME="B" GIT_AUTHOR_EMAIL="B@test.git" \
+	git commit -a -m "Second."
+
+[master d7ca576] Second.
+ Author: B <B@test.git>
+ 1 file changed, 2 insertions(+)
+ok 4 - setup B lines
+
+expecting success: 
+	check_count A 2 B 2
+
+git blame -c  file 
+Author A (expected 2, attributed 2) good
+Author B (expected 2, attributed 2) good
+ok 5 - blame 2 authors
+
+expecting success: 
+	git checkout -b branch1 master &&
+	echo "3A slow green fox jumps into the" >>file &&
+	echo "well." >>file &&
+	GIT_AUTHOR_NAME="B1" GIT_AUTHOR_EMAIL="B1@test.git" \
+	git commit -a -m "Branch1-1"
+
+Switched to a new branch 'branch1'
+[branch1 cf99a10] Branch1-1
+ Author: B1 <B1@test.git>
+ 1 file changed, 2 insertions(+)
+ok 6 - setup B1 lines (branch1)
+
+expecting success: 
+	check_count A 2 B 2 B1 2
+
+git blame -c  file 
+Author B (expected 2, attributed 2) good
+Author A (expected 2, attributed 2) good
+Author B1 (expected 2, attributed 2) good
+ok 7 - blame 2 authors + 1 branch1 author
+
+expecting success: 
+	git checkout -b branch2 master &&
+	sed -e "s/2A quick brown/4A quick brown lazy dog/" <file >file.new &&
+	mv file.new file &&
+	GIT_AUTHOR_NAME="B2" GIT_AUTHOR_EMAIL="B2@test.git" \
+	git commit -a -m "Branch2-1"
+
+Switched to a new branch 'branch2'
+[branch2 6725f07] Branch2-1
+ Author: B2 <B2@test.git>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 8 - setup B2 lines (branch2)
+
+expecting success: 
+	check_count A 2 B 1 B2 1
+
+git blame -c  file 
+Author B (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
+Author A (expected 2, attributed 2) good
+ok 9 - blame 2 authors + 1 branch2 author
+
+expecting success: 
+	git merge branch1
+
+Merging:
+6725f07 Branch2-1
+virtual branch1
+found 1 common ancestor:
+d7ca576 Second.
+Auto-merging file
+Merge made by the 'recursive' strategy.
+ file | 2 ++
+ 1 file changed, 2 insertions(+)
+ok 10 - merge branch1 & branch2
+
+expecting success: 
+	check_count A 2 B 1 B1 2 B2 1
+
+git blame -c  file 
+Author B2 (expected 1, attributed 1) good
+Author B1 (expected 2, attributed 2) good
+Author A (expected 2, attributed 2) good
+Author B (expected 1, attributed 1) good
+ok 11 - blame 2 authors + 2 merged-in authors
+
+expecting success: 
+	check_count --first-parent A 2 B 1 "A U Thor" 2 B2 1
+
+git blame -c  --first-parent file 
+Author A (expected 2, attributed 2) good
+Author B (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
+Author A U Thor (expected 2, attributed 2) good
+ok 12 - blame --first-parent blames merge for branch1
+
+expecting success: 
+	check_count -h master A 2 B 2
+
+git blame -c  file master
+Author B (expected 2, attributed 2) good
+Author A (expected 2, attributed 2) good
+ok 13 - blame ancestor
+
+expecting success: 
+	check_count -h master^ A 2
+
+git blame -c  file master^
+Author A (expected 2, attributed 2) good
+ok 14 - blame great-ancestor
+
+expecting success: 
+	echo "evil merge." >>file &&
+	git commit -a --amend
+
+[branch2 4fc40c2] Merge branch 'branch1' into branch2
+ Author: A U Thor <author@example.com>
+ Date: Thu Jan 5 11:50:07 2023 +0000
+ok 15 - setup evil merge
+
+expecting success: 
+	check_count A 2 B 1 B1 2 B2 1 "A U Thor" 1
+
+git blame -c  file 
+Author B1 (expected 2, attributed 2) good
+Author B (expected 1, attributed 1) good
+Author A (expected 2, attributed 2) good
+Author B2 (expected 1, attributed 1) good
+Author A U Thor (expected 1, attributed 1) good
+ok 16 - blame evil merge
+
+expecting success: 
+	test_when_finished "git checkout branch2" &&
+	test_when_finished "rm -f .git/info/grafts" &&
+	graft= &&
+	for i in 0 1 2
+	do
+		for j in 0 1 2 3 4 5 6 7 8 9
+		do
+			git checkout --orphan "$i$j" &&
+			printf "%s\n" "$i" "$j" >file &&
+			test_tick &&
+			GIT_AUTHOR_NAME=$i$j GIT_AUTHOR_EMAIL=$i$j@test.git \
+			git commit -a -m "$i$j" &&
+			commit=$(git rev-parse --verify HEAD) &&
+			graft="$graft$commit "
+		done
+	done &&
+	printf "%s " $graft >.git/info/grafts &&
+	check_count -h 00 01 1 10 1
+
+Switched to a new branch '00'
+[00 (root-commit) e2c6177] 00
+ Author: 00 <00@test.git>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 file
+Switched to a new branch '01'
+[01 (root-commit) 0dbe04b] 01
+ Author: 01 <01@test.git>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 file
+Switched to a new branch '02'
+[02 (root-commit) 97fbca6] 02
+ Author: 02 <02@test.git>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 file
+Switched to a new branch '03'
+[03 (root-commit) 5cdbcd8] 03
+ Author: 03 <03@test.git>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 file
+Switched to a new branch '04'
+[04 (root-commit) 5a154cf] 04
+ Author: 04 <04@test.git>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 file
+Switched to a new branch '05'
+[05 (root-commit) a84e1de] 05
+ Author: 05 <05@test.git>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 file
+Switched to a new branch '06'
+[06 (root-commit) d4bea54] 06
+ Author: 06 <06@test.git>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 file
+Switched to a new branch '07'
+[07 (root-commit) 24ba6e8] 07
+ Author: 07 <07@test.git>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 file
+Switched to a new branch '08'
+[08 (root-commit) fe90088] 08
+ Author: 08 <08@test.git>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 file
+Switched to a new branch '09'
+[09 (root-commit) 773a2fb] 09
+ Author: 09 <09@test.git>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 file
+Switched to a new branch '10'
+[10 (root-commit) 80536e5] 10
+ Author: 10 <10@test.git>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 file
+Switched to a new branch '11'
+[11 (root-commit) 33c07c1] 11
+ Author: 11 <11@test.git>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 file
+Switched to a new branch '12'
+[12 (root-commit) ae7094b] 12
+ Author: 12 <12@test.git>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 file
+Switched to a new branch '13'
+[13 (root-commit) 19e767d] 13
+ Author: 13 <13@test.git>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 file
+Switched to a new branch '14'
+[14 (root-commit) f7159ac] 14
+ Author: 14 <14@test.git>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 file
+Switched to a new branch '15'
+[15 (root-commit) d95fecf] 15
+ Author: 15 <15@test.git>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 file
+Switched to a new branch '16'
+[16 (root-commit) d8bfdb9] 16
+ Author: 16 <16@test.git>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 file
+Switched to a new branch '17'
+[17 (root-commit) aa3f31e] 17
+ Author: 17 <17@test.git>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 file
+Switched to a new branch '18'
+[18 (root-commit) d76cb1d] 18
+ Author: 18 <18@test.git>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 file
+Switched to a new branch '19'
+[19 (root-commit) 95e03c5] 19
+ Author: 19 <19@test.git>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 file
+Switched to a new branch '20'
+[20 (root-commit) d40a964] 20
+ Author: 20 <20@test.git>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 file
+Switched to a new branch '21'
+[21 (root-commit) 6c3def2] 21
+ Author: 21 <21@test.git>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 file
+Switched to a new branch '22'
+[22 (root-commit) 78d2294] 22
+ Author: 22 <22@test.git>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 file
+Switched to a new branch '23'
+[23 (root-commit) 76a64d0] 23
+ Author: 23 <23@test.git>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 file
+Switched to a new branch '24'
+[24 (root-commit) 59f234a] 24
+ Author: 24 <24@test.git>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 file
+Switched to a new branch '25'
+[25 (root-commit) 26ac47a] 25
+ Author: 25 <25@test.git>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 file
+Switched to a new branch '26'
+[26 (root-commit) db7e855] 26
+ Author: 26 <26@test.git>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 file
+Switched to a new branch '27'
+[27 (root-commit) 279f565] 27
+ Author: 27 <27@test.git>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 file
+Switched to a new branch '28'
+[28 (root-commit) f691d9c] 28
+ Author: 28 <28@test.git>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 file
+Switched to a new branch '29'
+[29 (root-commit) c72134e] 29
+ Author: 29 <29@test.git>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 file
+git blame -c  file 00
+hint: Support for <GIT_DIR>/info/grafts is deprecated
+hint: and will be removed in a future Git version.
+hint: 
+hint: Please use "git replace --convert-graft-file"
+hint: to convert the grafts into replace refs.
+hint: 
+hint: Turn this message off by running
+hint: "git config advice.graftFileDeprecated false"
+Author 10 (expected 1, attributed 1) good
+Author 01 (expected 1, attributed 1) good
+Switched to branch 'branch2'
+ok 17 - blame huge graft
+
+expecting success: 
+	echo "incomplete" | tr -d "\\012" >>file &&
+	GIT_AUTHOR_NAME="C" GIT_AUTHOR_EMAIL="C@test.git" \
+	git commit -a -m "Incomplete"
+
+[branch2 e7d4ec4] Incomplete
+ Author: C <C@test.git>
+ 1 file changed, 1 insertion(+)
+ok 18 - setup incomplete line
+
+expecting success: 
+	check_count A 2 B 1 B1 2 B2 1 "A U Thor" 1 C 1
+
+git blame -c  file 
+Author B (expected 1, attributed 1) good
+Author A U Thor (expected 1, attributed 1) good
+Author B1 (expected 2, attributed 2) good
+Author C (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
+Author A (expected 2, attributed 2) good
+ok 19 - blame incomplete line
+
+expecting success: 
+	mv file file.orig &&
+	{
+		cat file.orig &&
+		echo
+	} | sed -e "s/^3A/99/" -e "/^1A/d" -e "/^incomplete/d" >file &&
+	echo "incomplete" | tr -d "\\012" >>file &&
+	GIT_AUTHOR_NAME="D" GIT_AUTHOR_EMAIL="D@test.git" \
+	git commit -a -m "edit"
+
+[branch2 3d7c2fb] edit
+ Author: D <D@test.git>
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+ok 20 - setup edits
+
+expecting success: 
+	check_count A 1 B 1 B1 1 B2 1 "A U Thor" 1 C 1 D 1
+
+git blame -c  file 
+Author C (expected 1, attributed 1) good
+Author A (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 B (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
+ok 21 - blame edits
+
+expecting success: 
+	echo "No robots allowed" >file.new &&
+	cat file >>file.new &&
+	mv file.new file &&
+	GIT_AUTHOR_NAME="E" GIT_AUTHOR_EMAIL="E at test dot git" \
+	git commit -a -m "norobots"
+
+[branch2 07ed9b9] norobots
+ Author: E <E at test dot git>
+ 1 file changed, 1 insertion(+)
+ok 22 - setup obfuscated email
+
+expecting success: 
+	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 B1 (expected 1, attributed 1) good
+Author B (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
+Author A U Thor (expected 1, attributed 1) good
+ok 23 - blame obfuscated email
+
+expecting success: 
+	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 B1 (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 A (expected 1, attributed 1) good
+Author A U Thor (expected 1, attributed 1) good
+Author B (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
+ok 24 - blame -L 1 (all)
+
+expecting success: 
+	check_count -L, A 1 B 1 B1 1 B2 1 "A U Thor" 1 C 1 D 1 E 1
+
+git blame -c  -L, file 
+Author B (expected 1, attributed 1) good
+Author A U Thor (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 E (expected 1, attributed 1) good
+Author B1 (expected 1, attributed 1) good
+ok 25 - blame -L , (all)
+
+expecting success: 
+	check_count -L5 B1 1 C 1 D 1 "A U Thor" 1
+
+git blame -c  -L5 file 
+Author C (expected 1, attributed 1) good
+Author A U Thor (expected 1, attributed 1) good
+Author B1 (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
+ok 26 - blame -L X (X to end)
+
+expecting success: 
+	check_count -L5, B1 1 C 1 D 1 "A U Thor" 1
+
+git blame -c  -L5, file 
+Author C (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
+Author A U Thor (expected 1, attributed 1) good
+Author B1 (expected 1, attributed 1) good
+ok 27 - blame -L X, (X to end)
+
+expecting success: 
+	check_count -L,3 A 1 B2 1 E 1
+
+git blame -c  -L,3 file 
+Author A (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
+Author E (expected 1, attributed 1) good
+ok 28 - blame -L ,Y (up to Y)
+
+expecting success: 
+	check_count -L3,3 B2 1
+
+git blame -c  -L3,3 file 
+Author B2 (expected 1, attributed 1) good
+ok 29 - blame -L X,X
+
+expecting success: 
+	check_count -L3,6 B 1 B1 1 B2 1 D 1
+
+git blame -c  -L3,6 file 
+Author B (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
+Author B1 (expected 1, attributed 1) good
+ok 30 - blame -L X,Y
+
+expecting success: 
+	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 B2 (expected 1, attributed 1) good
+Author B (expected 1, attributed 1) good
+ok 31 - blame -L Y,X (undocumented)
+
+expecting success: 
+	test_must_fail $PROG -L-1 file
+
+fatal: -L invalid line number: -1
+ok 32 - blame -L -X
+
+expecting success: 
+	test_must_fail $PROG -L0 file
+
+fatal: -L invalid line number: 0
+ok 33 - blame -L 0
+
+expecting success: 
+	test_must_fail $PROG -L,0 file
+
+fatal: -L invalid line number: 0
+ok 34 - blame -L ,0
+
+expecting success: 
+	test_must_fail $PROG -L,+0 file
+
+fatal: -L invalid empty range
+ok 35 - blame -L ,+0
+
+expecting success: 
+	test_must_fail $PROG -L1,+0 file
+
+fatal: -L invalid empty range
+ok 36 - blame -L X,+0
+
+expecting success: 
+	check_count -L3,+1 B2 1
+
+git blame -c  -L3,+1 file 
+Author B2 (expected 1, attributed 1) good
+ok 37 - blame -L X,+1
+
+expecting success: 
+	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 B1 (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
+ok 38 - blame -L X,+N
+
+expecting success: 
+	test_must_fail $PROG -L,-0 file
+
+fatal: -L invalid empty range
+ok 39 - blame -L ,-0
+
+expecting success: 
+	test_must_fail $PROG -L1,-0 file
+
+fatal: -L invalid empty range
+ok 40 - blame -L X,-0
+
+expecting success: 
+	check_count -L3,-1 B2 1
+
+git blame -c  -L3,-1 file 
+Author B2 (expected 1, attributed 1) good
+ok 41 - blame -L X,-1
+
+expecting success: 
+	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 B (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
+ok 42 - blame -L X,-N
+
+expecting success: 
+	check_count -L/evil/ C 1 "A U Thor" 1
+
+git blame -c  -L/evil/ file 
+Author C (expected 1, attributed 1) good
+Author A U Thor (expected 1, attributed 1) good
+ok 43 - blame -L /RE/ (RE to end)
+
+expecting success: 
+	check_count -L/robot/,/green/ A 1 B 1 B2 1 D 1 E 1
+
+git blame -c  -L/robot/,/green/ file 
+Author E (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
+Author B (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
+ok 44 - blame -L /RE/,/RE2/
+
+expecting success: 
+	check_count -L5,/evil/ B1 1 D 1 "A U Thor" 1
+
+git blame -c  -L5,/evil/ file 
+Author A U Thor (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
+Author B1 (expected 1, attributed 1) good
+ok 45 - blame -L X,/RE/
+
+expecting success: 
+	check_count -L/99/,7 B1 1 D 1 "A U Thor" 1
+
+git blame -c  -L/99/,7 file 
+Author A U Thor (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
+Author B1 (expected 1, attributed 1) good
+ok 46 - blame -L /RE/,Y
+
+expecting success: 
+	check_count -L/99/,+3 B1 1 D 1 "A U Thor" 1
+
+git blame -c  -L/99/,+3 file 
+Author B1 (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
+Author A U Thor (expected 1, attributed 1) good
+ok 47 - blame -L /RE/,+N
+
+expecting success: 
+	check_count -L/99/,-3 B 1 B2 1 D 1
+
+git blame -c  -L/99/,-3 file 
+Author D (expected 1, attributed 1) good
+Author B (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
+ok 48 - blame -L /RE/,-N
+
+expecting success: 
+	n=$(expr $(wc -l <file) + 1) &&
+	check_count -L$n C 1
+
+git blame -c  -L8 file 
+Author C (expected 1, attributed 1) good
+ok 49 - blame -L X (X == nlines)
+
+expecting success: 
+	n=$(expr $(wc -l <file) + 2) &&
+	test_must_fail $PROG -L$n file
+
+fatal: file file has only 8 lines
+ok 50 - blame -L X (X == nlines + 1)
+
+expecting success: 
+	test_must_fail $PROG -L12345 file
+
+fatal: file file has only 8 lines
+ok 51 - blame -L X (X > nlines)
+
+expecting success: 
+	n=$(expr $(wc -l <file) + 1) &&
+	check_count -L,$n A 1 B 1 B1 1 B2 1 "A U Thor" 1 C 1 D 1 E 1
+
+git blame -c  -L,8 file 
+Author B2 (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 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
+ok 52 - blame -L ,Y (Y == nlines)
+
+expecting success: 
+	n=$(expr $(wc -l <file) + 2) &&
+	check_count -L,$n A 1 B 1 B1 1 B2 1 "A U Thor" 1 C 1 D 1 E 1
+
+git blame -c  -L,9 file 
+Author B1 (expected 1, attributed 1) good
+Author E (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
+Author A U Thor (expected 1, attributed 1) good
+Author 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
+ok 53 - blame -L ,Y (Y == nlines + 1)
+
+expecting success: 
+	check_count -L,12345 A 1 B 1 B1 1 B2 1 "A U Thor" 1 C 1 D 1 E 1
+
+git blame -c  -L,12345 file 
+Author B1 (expected 1, attributed 1) good
+Author A U Thor (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
+Author B (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
+Author C (expected 1, attributed 1) good
+Author E (expected 1, attributed 1) good
+ok 54 - blame -L ,Y (Y > nlines)
+
+expecting success: 
+	check_count -L2,3 -L6,7 A 1 B1 1 B2 1 "A U Thor" 1
+
+git blame -c  -L2,3 -L6,7 file 
+Author A U Thor (expected 1, attributed 1) good
+Author B1 (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
+ok 55 - blame -L multiple (disjoint)
+
+expecting success: 
+	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
+ok 56 - blame -L multiple (disjoint: unordered)
+
+expecting success: 
+	check_count -L2,3 -L4,5 A 1 B 1 B2 1 D 1
+
+git blame -c  -L2,3 -L4,5 file 
+Author D (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
+Author B (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
+ok 57 - blame -L multiple (adjacent)
+
+expecting success: 
+	check_count -L4,5 -L2,3 A 1 B 1 B2 1 D 1
+
+git blame -c  -L4,5 -L2,3 file 
+Author A (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
+Author B (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
+ok 58 - blame -L multiple (adjacent: unordered)
+
+expecting success: 
+	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
+ok 59 - blame -L multiple (overlapping)
+
+expecting success: 
+	check_count -L3,5 -L2,4 A 1 B 1 B2 1 D 1
+
+git blame -c  -L3,5 -L2,4 file 
+Author D (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
+Author B (expected 1, attributed 1) good
+ok 60 - blame -L multiple (overlapping: unordered)
+
+expecting success: 
+	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 D (expected 1, attributed 1) good
+Author C (expected 1, attributed 1) good
+Author B (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
+Author B1 (expected 1, attributed 1) good
+Author A U Thor (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
+ok 61 - blame -L multiple (superset/subset)
+
+expecting success: 
+	check_count -L3,5 -L2,8 A 1 B 1 B1 1 B2 1 C 1 D 1 "A U Thor" 1
+
+git blame -c  -L3,5 -L2,8 file 
+Author B (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
+Author B1 (expected 1, attributed 1) good
+Author A U Thor (expected 1, attributed 1) good
+Author C (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
+ok 62 - blame -L multiple (superset/subset: unordered)
+
+expecting success: 
+	check_count -L3,3 -L/fox/ B1 1 B2 1 C 1 D 1 "A U Thor" 1
+
+git blame -c  -L3,3 -L/fox/ file 
+Author B1 (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
+Author C (expected 1, attributed 1) good
+Author A U Thor (expected 1, attributed 1) good
+ok 63 - blame -L /RE/ (relative)
+
+expecting success: 
+	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 D (expected 1, attributed 1) good
+Author B (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
+Author A U Thor (expected 1, attributed 1) good
+Author B1 (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
+ok 64 - blame -L /RE/ (relative: no preceding range)
+
+expecting success: 
+	check_count -L1,1 -L/dog/,+1 A 1 E 1
+
+git blame -c  -L1,1 -L/dog/,+1 file 
+Author A (expected 1, attributed 1) good
+Author E (expected 1, attributed 1) good
+ok 65 - blame -L /RE/ (relative: adjacent)
+
+expecting success: 
+	test_must_fail $PROG -L4,4 -L/dog/ file
+
+fatal: -L parameter 'dog' starting at line 5: No match
+ok 66 - blame -L /RE/ (relative: not found)
+
+expecting success: 
+	test_must_fail $PROG -L, -L/$/ file
+
+fatal: file file has only 8 lines
+ok 67 - blame -L /RE/ (relative: end-of-file)
+
+expecting success: 
+	check_count -L3,3 -L^/dog/,+2 A 1 B2 1
+
+git blame -c  -L3,3 -L^/dog/,+2 file 
+Author A (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
+ok 68 - blame -L ^/RE/ (absolute)
+
+expecting success: 
+	check_count -L^/dog/,+2 A 1 B2 1
+
+git blame -c  -L^/dog/,+2 file 
+Author A (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
+ok 69 - blame -L ^/RE/ (absolute: no preceding range)
+
+expecting success: 
+	test_must_fail $PROG -L4,4 -L^/tambourine/ file
+
+fatal: -L parameter 'tambourine' starting at line 1: No match
+ok 70 - blame -L ^/RE/ (absolute: not found)
+
+expecting success: 
+	n=$(expr $(wc -l <file) + 1) &&
+	check_count -L$n -L^/$/,+2 A 1 C 1 E 1
+
+git blame -c  -L8 -L^/$/,+2 file 
+Author A (expected 1, attributed 1) good
+Author C (expected 1, attributed 1) good
+Author E (expected 1, attributed 1) good
+ok 71 - blame -L ^/RE/ (absolute: end-of-file)
+
+expecting success: 
+	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 de4e160] hello
+ Author: F <F@test.git>
+ 1 file changed, 4 insertions(+)
+ create mode 100644 hello.c
+[branch2 b788573] goodbye
+ Author: G <G@test.git>
+ 1 file changed, 1 insertion(+)
+[branch2 541aa81] mail
+ Author: H <H@test.git>
+ 1 file changed, 5 insertions(+)
+ok 72 - setup -L :regex
+
+expecting success: 
+	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
+ok 73 - blame -L :literal
+
+expecting success: 
+	check_count -f hello.c "-L:m[a-z][a-z]l" H 4
+
+git blame -c  -L:m[a-z][a-z]l hello.c 
+Author H (expected 4, attributed 4) good
+ok 74 - blame -L :regex
+
+expecting success: 
+	test_must_fail $PROG -L:nomatch hello.c
+
+fatal: -L parameter 'nomatch' starting at line 1: no match
+ok 75 - blame -L :nomatch
+
+expecting success: 
+	check_count -f hello.c -L3,3 -L:ma.. F 1 H 4
+
+git blame -c  -L3,3 -L:ma.. hello.c 
+Author H (expected 4, attributed 4) good
+Author F (expected 1, attributed 1) good
+ok 76 - blame -L :RE (relative)
+
+expecting success: 
+	check_count -f hello.c -L:ma.. F 4 G 1
+
+git blame -c  -L:ma.. hello.c 
+Author G (expected 1, attributed 1) good
+Author F (expected 4, attributed 4) good
+ok 77 - blame -L :RE (relative: no preceding range)
+
+expecting success: 
+	test_must_fail $PROG -L3,3 -L:tambourine hello.c
+
+fatal: -L parameter 'tambourine' starting at line 4: no match
+ok 78 - blame -L :RE (relative: not found)
+
+expecting success: 
+	test_must_fail $PROG -L, -L:main hello.c
+
+fatal: -L parameter 'main' starting at line 11: no match
+ok 79 - blame -L :RE (relative: end-of-file)
+
+expecting success: 
+	check_count -f hello.c -L3,3 -L^:ma.. F 4 G 1
+
+git blame -c  -L3,3 -L^:ma.. hello.c 
+Author G (expected 1, attributed 1) good
+Author F (expected 4, attributed 4) good
+ok 80 - blame -L ^:RE (absolute)
+
+expecting success: 
+	check_count -f hello.c -L^:ma.. F 4 G 1
+
+git blame -c  -L^:ma.. hello.c 
+Author G (expected 1, attributed 1) good
+Author F (expected 4, attributed 4) good
+ok 81 - blame -L ^:RE (absolute: no preceding range)
+
+expecting success: 
+	test_must_fail $PROG -L4,4 -L^:tambourine hello.c
+
+fatal: -L parameter 'tambourine' starting at line 1: no match
+ok 82 - blame -L ^:RE (absolute: not found)
+
+expecting success: 
+	n=$(printf "%d" $(wc -l <hello.c)) &&
+	check_count -f hello.c -L$n -L^:ma.. F 4 G 1 H 1
+
+git blame -c  -L10 -L^:ma.. hello.c 
+Author G (expected 1, attributed 1) good
+Author F (expected 4, attributed 4) good
+Author H (expected 1, attributed 1) good
+ok 83 - blame -L ^:RE (absolute: end-of-file)
+
+expecting success: 
+	(
+	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 d38c0fb] step 0
+ Author: I <I@test.git>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 incremental
+[branch2 7d6108a] step 0.5
+ Author: I <I@test.git>
+ 1 file changed, 1 insertion(+)
+[branch2 7e5154b] step 1
+ Author: I <I@test.git>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 84 - setup incremental
+
+expecting success: 
+	check_count -h HEAD^^ -f incremental
+
+git blame -c  incremental HEAD^^
+ok 85 - blame empty
+
+expecting success: 
+	test_must_fail $PROG -L0 incremental HEAD^^
+
+fatal: -L invalid line number: 0
+ok 86 - blame -L 0 empty
+
+expecting success: 
+	test_must_fail $PROG -L1 incremental HEAD^^
+
+fatal: file incremental has only 0 lines
+ok 87 - blame -L 1 empty
+
+expecting success: 
+	test_must_fail $PROG -L2 incremental HEAD^^
+
+fatal: file incremental has only 0 lines
+ok 88 - blame -L 2 empty
+
+expecting success: 
+	check_count -h HEAD^ -f incremental I 1
+
+git blame -c  incremental HEAD^
+Author I (expected 1, attributed 1) good
+ok 89 - blame half
+
+expecting success: 
+	test_must_fail $PROG -L0 incremental HEAD^
+
+fatal: -L invalid line number: 0
+ok 90 - blame -L 0 half
+
+expecting success: 
+	check_count -h HEAD^ -f incremental -L1 I 1
+
+git blame -c  -L1 incremental HEAD^
+Author I (expected 1, attributed 1) good
+ok 91 - blame -L 1 half
+
+expecting success: 
+	test_must_fail $PROG -L2 incremental HEAD^
+
+fatal: file incremental has only 1 line
+ok 92 - blame -L 2 half
+
+expecting success: 
+	test_must_fail $PROG -L3 incremental HEAD^
+
+fatal: file incremental has only 1 line
+ok 93 - blame -L 3 half
+
+expecting success: 
+	check_count -f incremental I 1
+
+git blame -c  incremental 
+Author I (expected 1, attributed 1) good
+ok 94 - blame full
+
+expecting success: 
+	test_must_fail $PROG -L0 incremental
+
+fatal: -L invalid line number: 0
+ok 95 - blame -L 0 full
+
+expecting success: 
+	check_count -f incremental -L1 I 1
+
+git blame -c  -L1 incremental 
+Author I (expected 1, attributed 1) good
+ok 96 - blame -L 1 full
+
+expecting success: 
+	test_must_fail $PROG -L2 incremental
+
+fatal: file incremental has only 1 line
+ok 97 - blame -L 2 full
+
+expecting success: 
+	test_must_fail $PROG -L3 incremental
+
+fatal: file incremental has only 1 line
+ok 98 - blame -L 3 full
+
+expecting success: 
+	test_must_fail $PROG -L file
+
+usage: git blame [<options>] [<rev-opts>] [<rev>] [--] <file>
+
+    <rev-opts> are documented in git-rev-list(1)
+
+    --incremental         Show blame entries as we find them, incrementally
+    -b                    Show blank SHA-1 for boundary commits (Default: off)
+    --root                Do not treat root commits as boundaries (Default: off)
+    --show-stats          Show work cost statistics
+    --progress            Force progress reporting
+    --score-debug         Show output score for blame entries
+    -f, --show-name       Show original filename (Default: auto)
+    -n, --show-number     Show original linenumber (Default: off)
+    -p, --porcelain       Show in a format designed for machine consumption
+    --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, --show-email      Show author email instead of name (Default: off)
+    -w                    Ignore whitespace differences
+    --color-lines         color redundant metadata from previous line differently
+    --color-by-age        color lines by age
+    --indent-heuristic    Use an experimental heuristic to improve diffs
+    --minimal             Spend extra cycles to find better match
+    -S <file>             Use revisions from <file> instead of calling git-rev-list
+    --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 <n,m>              Process only line range n,m, counting from 1
+    --abbrev[=<n>]        use <n> digits to display SHA-1s
+
+ok 99 - blame -L
+
+expecting success: 
+	test_must_fail $PROG -L1,+ file
+
+usage: git blame [<options>] [<rev-opts>] [<rev>] [--] <file>
+ok 100 - blame -L X,+
+
+expecting success: 
+	test_must_fail $PROG -L1,- file
+
+usage: git blame [<options>] [<rev-opts>] [<rev>] [--] <file>
+ok 101 - blame -L X,-
+
+expecting success: 
+	test_must_fail $PROG -LX file
+
+usage: git blame [<options>] [<rev-opts>] [<rev>] [--] <file>
+ok 102 - blame -L X (non-numeric X)
+
+expecting success: 
+	test_must_fail $PROG -L1,Y file
+
+usage: git blame [<options>] [<rev-opts>] [<rev>] [--] <file>
+ok 103 - blame -L X,Y (non-numeric Y)
+
+expecting success: 
+	test_must_fail $PROG -L1,+N file
+
+usage: git blame [<options>] [<rev-opts>] [<rev>] [--] <file>
+ok 104 - blame -L X,+N (non-numeric N)
+
+expecting success: 
+	test_must_fail $PROG -L1,-N file
+
+usage: git blame [<options>] [<rev-opts>] [<rev>] [--] <file>
+ok 105 - blame -L X,-N (non-numeric N)
+
+expecting success: 
+	test_must_fail $PROG -L1,^/99/ file
+
+usage: git blame [<options>] [<rev-opts>] [<rev>] [--] <file>
+ok 106 - blame -L ,^/RE/
+
+expecting success: 
+	>untracked &&
+	test_must_fail git blame untracked
+
+fatal: no such path 'untracked' in HEAD
+ok 107 - blame untracked file in empty repo
+
+expecting success: 
+	check_count \
+		"<A@test.git>" 1 \
+		"<B@test.git>" 1 \
+		"<B1@test.git>" 1 \
+		"<B2@test.git>" 1 \
+		"<author@example.com>" 1 \
+		"<C@test.git>" 1 \
+		"<D@test.git>" 1 \
+		"<E at test dot git>" 1
+
+git blame -c -e  file 
+Author <E at test dot git> (expected 1, attributed 1) good
+Author <A@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 <D@test.git> (expected 1, attributed 1) good
+Author <B2@test.git> (expected 1, attributed 1) good
+Author <B@test.git> (expected 1, attributed 1) good
+Author <C@test.git> (expected 1, attributed 1) good
+ok 108 - blame --show-email
+
+expecting success: 
+	echo "bin: test number 1" >one &&
+	git add one &&
+	GIT_AUTHOR_NAME=name1 \
+	GIT_AUTHOR_EMAIL=email1@test.git \
+	git commit -m First --date="2010-01-01 01:00:00" &&
+	cat >expected_n <<-\EOF &&
+	(name1 2010-01-01 01:00:00 +0000 1) bin: test number 1
+	EOF
+	cat >expected_e <<-\EOF
+	(<email1@test.git> 2010-01-01 01:00:00 +0000 1) bin: test number 1
+	EOF
+
+[branch2 e5b02e2] First
+ Author: name1 <email1@test.git>
+ Date: Fri Jan 1 01:00:00 2010 +0000
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one
+ok 109 - setup showEmail tests
+
+expecting success: 
+	git blame one >blame &&
+	find_blame <blame >result &&
+	test_cmp expected_n result
 
-ok 20 - deltas need not consume the whole preimage
+ok 110 - blame with no options and no config
 
 expecting success: 
-	reinit_git &&
-	{
-		# COPY 1
-		printf "SVNQ%b%b" "Q\001\001\002Q" "\001Q" |
-		q_to_nul
-	} >greedy.delta &&
-	{
-		cat <<-\EOF &&
-		SVN-fs-dump-format-version: 3
+	git blame --show-email one >blame1 &&
+	find_blame <blame1 >result &&
+	test_cmp expected_e result &&
+	git blame -e one >blame2 &&
+	find_blame <blame2 >result &&
+	test_cmp expected_e result &&
+	git blame --no-show-email one >blame3 &&
+	find_blame <blame3 >result &&
+	test_cmp expected_n result
 
-		Revision-number: 1
-		Prop-content-length: 10
-		Content-length: 10
+ok 111 - blame with showemail options
 
-		PROPS-END
+expecting success: 
+	git config blame.showEmail false &&
+	git blame one >blame1 &&
+	find_blame <blame1 >result &&
+	test_cmp expected_n result &&
+	git blame --show-email one >blame2 &&
+	find_blame <blame2 >result &&
+	test_cmp expected_e result &&
+	git blame -e one >blame3 &&
+	find_blame <blame3 >result &&
+	test_cmp expected_e result &&
+	git blame --no-show-email one >blame4 &&
+	find_blame <blame4 >result &&
+	test_cmp expected_n result
 
-		Node-path: bootstrap
-		Node-kind: file
-		Node-action: add
-		Text-delta: true
-		Prop-content-length: 10
-		EOF
-		echo Text-content-length: $(wc -c <greedy.delta) &&
-		echo Content-length: $((10 + $(wc -c <greedy.delta))) &&
-		echo &&
-		echo PROPS-END &&
-		cat greedy.delta &&
-		echo
-	} >greedydelta.dump &&
-	try_dump greedydelta.dump must_fail might_fail
+ok 112 - blame with showEmail config false
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9010-svn-fe/.git/
-error: delta preimage ends early
-fatal: cannot apply delta
-fatal: Expected 'data n' command, found: 
-fast-import: dumping crash report to .git/fast_import_crash_3473348
-ok 21 - no hang for delta trying to read past end of preimage
+expecting success: 
+	git config blame.showEmail true &&
+	git blame one >blame1 &&
+	find_blame <blame1 >result &&
+	test_cmp expected_e result &&
+	git blame --no-show-email one >blame2 &&
+	find_blame <blame2 >result &&
+	test_cmp expected_n result
+
+ok 113 - blame with showEmail config true
 
 expecting success: 
-	svnconf=$PWD/svnconf &&
-	mkdir -p "$svnconf" &&
+	test_commit abbrev &&
+	sha1=$(git rev-parse --verify HEAD) &&
+	check_abbrev () {
+		expect=$1; shift
+		echo $sha1 | cut -c 1-$expect >expect &&
+		git blame "$@" abbrev.t >actual &&
+		perl -lne "/[0-9a-f]+/ and print \$&" <actual >actual.sha &&
+		test_cmp expect actual.sha
+	}
 
-	if
-		svnadmin -h >/dev/null 2>&1 &&
-		svnadmin create simple-svn &&
-		svnadmin load simple-svn <"$TEST_DIRECTORY/t9135/svn.dump" &&
-		svn export --config-dir "$svnconf" "file://$PWD/simple-svn" simple-svnco
-	then
-		test_set_prereq SVNREPO
-	fi
+[branch2 73fb653] abbrev
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 abbrev.t
+ok 114 - set up abbrev tests
 
-<<< Started new transaction, based on original revision 1
-     * editing path : branches ... done.
-     * editing path : trunk ... done.
+expecting success: 
+	# non-boundary commits get +1 for alignment
+	check_abbrev 31 --abbrev=30 HEAD &&
+	check_abbrev 30 --abbrev=30 ^HEAD
 
-------- Committed revision 1 >>>
+ok 115 - blame --abbrev=<n> works
 
-<<< Started new transaction, based on original revision 2
-     * editing path : branches/branch-b ...COPIED... done.
+expecting success: 
+	check_abbrev 40 -l HEAD &&
+	check_abbrev 39 -l ^HEAD
 
-------- Committed revision 2 >>>
+ok 116 - blame -l aligns regular and boundary commits
 
-<<< Started new transaction, based on original revision 3
-     * editing path : branches/branch-b/b1 ... done.
+expecting success: 
+	check_abbrev 40 --abbrev=40 HEAD &&
+	check_abbrev 39 --abbrev=40 ^HEAD
 
-------- Committed revision 3 >>>
+ok 117 - blame --abbrev=40 behaves like -l
 
-<<< Started new transaction, based on original revision 4
-     * editing path : branches/branch-c ...COPIED... done.
+expecting success: 
+	check_abbrev 40 --no-abbrev
 
-------- Committed revision 4 >>>
+ok 118 - --no-abbrev works like --abbrev=40
 
-<<< Started new transaction, based on original revision 5
-     * editing path : branches/branch-c ... done.
+expecting success: 
+	test_must_fail git blame --exclude-promisor-objects one
 
-------- Committed revision 5 >>>
+error: unknown option `--exclude-promisor-objects'
+usage: git blame [<options>] [<rev-opts>] [<rev>] [--] <file>
 
-<<< Started new transaction, based on original revision 6
-     * editing path : branches/branch-c ...COPIED... done.
+    <rev-opts> are documented in git-rev-list(1)
 
-------- Committed revision 6 >>>
+    --incremental         Show blame entries as we find them, incrementally
+    -b                    Show blank SHA-1 for boundary commits (Default: off)
+    --root                Do not treat root commits as boundaries (Default: off)
+    --show-stats          Show work cost statistics
+    --progress            Force progress reporting
+    --score-debug         Show output score for blame entries
+    -f, --show-name       Show original filename (Default: auto)
+    -n, --show-number     Show original linenumber (Default: off)
+    -p, --porcelain       Show in a format designed for machine consumption
+    --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, --show-email      Show author email instead of name (Default: off)
+    -w                    Ignore whitespace differences
+    --color-lines         color redundant metadata from previous line differently
+    --color-by-age        color lines by age
+    --indent-heuristic    Use an experimental heuristic to improve diffs
+    --minimal             Spend extra cycles to find better match
+    -S <file>             Use revisions from <file> instead of calling git-rev-list
+    --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 <n,m>              Process only line range n,m, counting from 1
+    --abbrev[=<n>]        use <n> digits to display SHA-1s
 
-A    simple-svnco
-A    simple-svnco/branches
-A    simple-svnco/branches/branch-b
-A    simple-svnco/branches/branch-b/b1
-A    simple-svnco/branches/branch-c
-A    simple-svnco/branches/branch-c/b1
-A    simple-svnco/trunk
-Exported revision 6.
-ok 22 - set up svn repo
+ok 119 - --exclude-promisor-objects does not BUG-crash
 
+# passed all 119 test(s)
+1..119
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t9102-git-svn-deep-rmdir.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9102-git-svn-deep-rmdir/.git/
 expecting success: 
-	mkdir -p simple-git &&
-	(
-		cd simple-git &&
-		reinit_git &&
-		try_dump "$TEST_DIRECTORY/t9135/svn.dump"
-	) &&
+	mkdir import &&
 	(
-		cd simple-svnco &&
-		git init &&
-		git add . &&
-		git fetch ../simple-git master &&
-		git diff --exit-code FETCH_HEAD
+		cd import &&
+		mkdir -p deeply/nested/directory/number/1 &&
+		mkdir -p deeply/nested/directory/number/2 &&
+		echo foo >deeply/nested/directory/number/1/file &&
+		echo foo >deeply/nested/directory/number/2/another &&
+		svn_cmd import -m "import for git svn" . "$svnrepo"
 	)
+	
+Adding         deeply
+Adding         deeply/nested
+Adding         deeply/nested/directory
+Adding         deeply/nested/directory/number
+Adding         deeply/nested/directory/number/1
+Adding         deeply/nested/directory/number/1/file
+Adding         deeply/nested/directory/number/2
+Adding         deeply/nested/directory/number/2/another
+Committing transaction...
+Committed revision 1.
+ok 1 - initialize repo
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9010-svn-fe/simple-git/.git/
-progress Imported commit 1.
-progress Imported commit 2.
-progress Imported commit 3.
-progress Imported commit 4.
-progress Imported commit 5.
-progress Imported commit 6.
-/build/git-2.20.1/git-fast-import statistics:
----------------------------------------------------------------------
-Alloc'd objects:       5000
-Total objects:           31 (         0 duplicates                  )
-      blobs  :            7 (         0 duplicates          2 deltas of          4 attempts)
-      trees  :           12 (         0 duplicates          6 deltas of          7 attempts)
-      commits:           12 (         0 duplicates          0 deltas of          0 attempts)
-      tags   :            0 (         0 duplicates          0 deltas of          0 attempts)
-Total branches:           2 (         2 loads     )
-      marks:           1024 (         6 unique    )
-      atoms:             10
-Memory total:          2344 KiB
-       pools:          2110 KiB
-     objects:           234 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize = 1073741824
-pack_report: core.packedGitLimit      = 35184372088832
-pack_report: pack_used_ctr            =          7
-pack_report: pack_mmap_calls          =          3
-pack_report: pack_open_windows        =          0 /          1
-pack_report: pack_mapped              =          0 /       2551
----------------------------------------------------------------------
+expecting success: 
+	git svn init "$svnrepo" &&
+	git svn fetch &&
+	git checkout -f -b test-rmdir remotes/git-svn
+	
+	A	deeply/nested/directory/number/1/file
+	A	deeply/nested/directory/number/2/another
+r1 = 7e3b6e66c96c8dc00a52b4c9fd6c19c0d851037c (refs/remotes/git-svn)
+Checked out HEAD:
+  file:///build/git-2.20.1/t/trash%20directory.t9102-git-svn-deep-rmdir/svnrepo r1
+Switched to a new branch 'test-rmdir'
+ok 2 - mirror via git svn
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9010-svn-fe/simple-svnco/.git/
-From ../simple-git
- * branch            master     -> FETCH_HEAD
-ok 23 - t9135/svn.dump
+expecting success: 
+	git rm -f deeply/nested/directory/number/2/another &&
+	git commit -a -m "remove another" &&
+	git svn set-tree --rmdir HEAD &&
+	svn_cmd ls -R "$svnrepo" | grep ^deeply/nested/directory/number/1
+	
+rm 'deeply/nested/directory/number/2/another'
+[test-rmdir f48bb69] remove another
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 deeply/nested/directory/number/2/another
+	D	deeply/nested/directory/number/2/another
+	D+	deeply/nested/directory/number/2/
+	D	deeply/nested/directory/number/2/another
+	D	deeply/nested/directory/number/2/
+W: -empty_dir: deeply/nested/directory/number/2
+r2 = 44bc15e00aa5bdc3adad4aa53b5667e2745c3948 (refs/remotes/git-svn)
+Done committing 1 revisions to SVN
+deeply/nested/directory/number/1/
+deeply/nested/directory/number/1/file
+ok 3 - Try a commit on rmdir
 
-# still have 3 known breakage(s)
-# passed all remaining 20 test(s)
-1..23
+# passed all 3 test(s)
+1..3
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
 *** t8012-blame-colors.sh ***
@@ -306434,7 +306758,7 @@
 	GIT_AUTHOR_NAME="A" GIT_AUTHOR_EMAIL="A@test.git" \
 	git commit -a -m "Initial."
 
-[master (root-commit) b5aef87] Initial.
+[master (root-commit) 8be10d5] Initial.
  Author: A <A@test.git>
  1 file changed, 2 insertions(+)
  create mode 100644 file
@@ -306465,7 +306789,7 @@
 	GIT_AUTHOR_NAME="B" GIT_AUTHOR_EMAIL="B@test.git" \
 	git commit -a -m "Second."
 
-[master ba38c55] Second.
+[master 36877b6] Second.
  Author: B <B@test.git>
  1 file changed, 2 insertions(+)
 ok 4 - setup B lines
@@ -306486,7 +306810,7 @@
 	git commit -a -m "Branch1-1"
 
 Switched to a new branch 'branch1'
-[branch1 9016ddb] Branch1-1
+[branch1 34dcde8] Branch1-1
  Author: B1 <B1@test.git>
  1 file changed, 2 insertions(+)
 ok 6 - setup B1 lines (branch1)
@@ -306495,9 +306819,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 A (expected 2, attributed 2) good
 ok 7 - blame 2 authors + 1 branch1 author
 
 expecting success: 
@@ -306508,7 +306832,7 @@
 	git commit -a -m "Branch2-1"
 
 Switched to a new branch 'branch2'
-[branch2 d53d525] Branch2-1
+[branch2 5f12de7] Branch2-1
  Author: B2 <B2@test.git>
  1 file changed, 1 insertion(+), 1 deletion(-)
 ok 8 - setup B2 lines (branch2)
@@ -306526,10 +306850,10 @@
 	git merge branch1
 
 Merging:
-d53d525 Branch2-1
+5f12de7 Branch2-1
 virtual branch1
 found 1 common ancestor:
-ba38c55 Second.
+36877b6 Second.
 Auto-merging file
 Merge made by the 'recursive' strategy.
  file | 2 ++
@@ -306540,20 +306864,20 @@
 	check_count A 2 B 1 B1 2 B2 1
 
 git blame -c  file 
+Author B (expected 1, attributed 1) good
 Author A (expected 2, attributed 2) good
 Author B2 (expected 1, attributed 1) good
 Author B1 (expected 2, attributed 2) good
-Author B (expected 1, attributed 1) good
 ok 11 - blame 2 authors + 2 merged-in authors
 
 expecting success: 
 	check_count --first-parent A 2 B 1 "A U Thor" 2 B2 1
 
 git blame -c  --first-parent file 
-Author A U Thor (expected 2, attributed 2) good
 Author A (expected 2, attributed 2) good
-Author B (expected 1, attributed 1) 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 12 - blame --first-parent blames merge for branch1
 
 expecting success: 
@@ -306575,20 +306899,20 @@
 	echo "evil merge." >>file &&
 	git commit -a --amend
 
-[branch2 e054ec7] Merge branch 'branch1' into branch2
+[branch2 5ce7799] Merge branch 'branch1' into branch2
  Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:09:57 2021 +0000
+ Date: Thu Jan 5 11:50:10 2023 +0000
 ok 15 - setup evil merge
 
 expecting success: 
 	check_count A 2 B 1 B1 2 B2 1 "A U Thor" 1
 
 git blame -c  file 
-Author A (expected 2, attributed 2) good
 Author B (expected 1, attributed 1) good
-Author B1 (expected 2, attributed 2) good
-Author B2 (expected 1, attributed 1) good
+Author A (expected 2, attributed 2) good
 Author A U Thor (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
+Author B1 (expected 2, attributed 2) good
 ok 16 - blame evil merge
 
 expecting success: 
@@ -306770,8 +307094,8 @@
 hint: 
 hint: Turn this message off by running
 hint: "git config advice.graftFileDeprecated false"
-Author 10 (expected 1, attributed 1) good
 Author 01 (expected 1, attributed 1) good
+Author 10 (expected 1, attributed 1) good
 Switched to branch 'branch2'
 ok 17 - blame huge graft
 
@@ -306780,7 +307104,7 @@
 	GIT_AUTHOR_NAME="C" GIT_AUTHOR_EMAIL="C@test.git" \
 	git commit -a -m "Incomplete"
 
-[branch2 7794d42] Incomplete
+[branch2 1009b24] Incomplete
  Author: C <C@test.git>
  1 file changed, 1 insertion(+)
 ok 18 - setup incomplete line
@@ -306791,10 +307115,10 @@
 git blame -c  file 
 Author A (expected 2, attributed 2) good
 Author B2 (expected 1, attributed 1) good
+Author C (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
-Author B1 (expected 2, attributed 2) good
-Author C (expected 1, attributed 1) good
 ok 19 - blame incomplete line
 
 expecting success: 
@@ -306807,7 +307131,7 @@
 	GIT_AUTHOR_NAME="D" GIT_AUTHOR_EMAIL="D@test.git" \
 	git commit -a -m "edit"
 
-[branch2 1bca583] edit
+[branch2 16a1253] edit
  Author: D <D@test.git>
  1 file changed, 1 insertion(+), 2 deletions(-)
 ok 20 - setup edits
@@ -306816,12 +307140,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 B2 (expected 1, attributed 1) good
 Author A (expected 1, attributed 1) good
 Author A U Thor (expected 1, attributed 1) good
+Author C (expected 1, attributed 1) good
 Author D (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
+Author B (expected 1, attributed 1) good
 Author B1 (expected 1, attributed 1) good
 ok 21 - blame edits
 
@@ -306832,7 +307156,7 @@
 	GIT_AUTHOR_NAME="E" GIT_AUTHOR_EMAIL="E at test dot git" \
 	git commit -a -m "norobots"
 
-[branch2 7548ede] norobots
+[branch2 0ef22a5] norobots
  Author: E <E at test dot git>
  1 file changed, 1 insertion(+)
 ok 22 - setup obfuscated email
@@ -306841,42 +307165,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 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 E (expected 1, attributed 1) good
+Author B1 (expected 1, attributed 1) good
 Author A (expected 1, attributed 1) good
-Author D (expected 1, attributed 1) good
-Author C (expected 1, attributed 1) good
-Author B (expected 1, attributed 1) good
 Author A U Thor (expected 1, attributed 1) good
+Author B (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
 ok 23 - blame obfuscated email
 
 expecting success: 
 	check_count -L1 A 1 B 1 B1 1 B2 1 "A U Thor" 1 C 1 D 1 E 1
 
 git blame -c  -L1 file 
+Author B2 (expected 1, attributed 1) good
 Author D (expected 1, attributed 1) good
-Author B1 (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
 Author B (expected 1, attributed 1) good
+Author B1 (expected 1, attributed 1) good
 Author E (expected 1, attributed 1) good
 Author A U Thor (expected 1, attributed 1) good
 Author C (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
-Author A (expected 1, attributed 1) good
 ok 24 - blame -L 1 (all)
 
 expecting success: 
 	check_count -L, A 1 B 1 B1 1 B2 1 "A U Thor" 1 C 1 D 1 E 1
 
 git blame -c  -L, file 
-Author A (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
 Author E (expected 1, attributed 1) good
 Author D (expected 1, attributed 1) good
+Author B1 (expected 1, attributed 1) good
+Author B (expected 1, attributed 1) good
 Author C (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
 Author A U Thor (expected 1, attributed 1) good
-Author B (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
-Author B1 (expected 1, attributed 1) good
 ok 25 - blame -L , (all)
 
 expecting success: 
@@ -306895,8 +307219,8 @@
 git blame -c  -L5, file 
 Author C (expected 1, attributed 1) good
 Author B1 (expected 1, attributed 1) good
-Author A U Thor (expected 1, attributed 1) good
 Author D (expected 1, attributed 1) good
+Author A U Thor (expected 1, attributed 1) good
 ok 27 - blame -L X, (X to end)
 
 expecting success: 
@@ -306904,8 +307228,8 @@
 
 git blame -c  -L,3 file 
 Author E (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
 Author A (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
 ok 28 - blame -L ,Y (up to Y)
 
 expecting success: 
@@ -306919,19 +307243,19 @@
 	check_count -L3,6 B 1 B1 1 B2 1 D 1
 
 git blame -c  -L3,6 file 
+Author B1 (expected 1, attributed 1) good
 Author B2 (expected 1, attributed 1) good
-Author B (expected 1, attributed 1) good
 Author D (expected 1, attributed 1) good
-Author B1 (expected 1, attributed 1) good
+Author B (expected 1, attributed 1) good
 ok 30 - blame -L X,Y
 
 expecting success: 
 	check_count -L6,3 B 1 B1 1 B2 1 D 1
 
 git blame -c  -L6,3 file 
-Author B (expected 1, attributed 1) good
 Author B1 (expected 1, attributed 1) good
 Author D (expected 1, attributed 1) good
+Author B (expected 1, attributed 1) good
 Author B2 (expected 1, attributed 1) good
 ok 31 - blame -L Y,X (undocumented)
 
@@ -306976,10 +307300,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 38 - blame -L X,+N
 
 expecting success: 
@@ -307005,26 +307329,26 @@
 	check_count -L6,-4 B 1 B1 1 B2 1 D 1
 
 git blame -c  -L6,-4 file 
-Author B2 (expected 1, attributed 1) good
-Author 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 42 - blame -L X,-N
 
 expecting success: 
 	check_count -L/evil/ C 1 "A U Thor" 1
 
 git blame -c  -L/evil/ file 
-Author A U Thor (expected 1, attributed 1) good
 Author C (expected 1, attributed 1) good
+Author A U Thor (expected 1, attributed 1) good
 ok 43 - blame -L /RE/ (RE to end)
 
 expecting success: 
 	check_count -L/robot/,/green/ A 1 B 1 B2 1 D 1 E 1
 
 git blame -c  -L/robot/,/green/ file 
-Author B2 (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 E (expected 1, attributed 1) good
 Author D (expected 1, attributed 1) good
@@ -307034,26 +307358,26 @@
 	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 D (expected 1, attributed 1) good
-Author B1 (expected 1, attributed 1) good
 ok 45 - blame -L X,/RE/
 
 expecting success: 
 	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 B1 (expected 1, attributed 1) good
+Author A U Thor (expected 1, attributed 1) good
 ok 46 - blame -L /RE/,Y
 
 expecting success: 
 	check_count -L/99/,+3 B1 1 D 1 "A U Thor" 1
 
 git blame -c  -L/99/,+3 file 
-Author D (expected 1, attributed 1) good
 Author B1 (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
 Author A U Thor (expected 1, attributed 1) good
 ok 47 - blame -L /RE/,+N
 
@@ -307061,9 +307385,9 @@
 	check_count -L/99/,-3 B 1 B2 1 D 1
 
 git blame -c  -L/99/,-3 file 
-Author B2 (expected 1, attributed 1) good
 Author B (expected 1, attributed 1) good
 Author D (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
 ok 48 - blame -L /RE/,-N
 
 expecting success: 
@@ -307092,14 +307416,14 @@
 	check_count -L,$n A 1 B 1 B1 1 B2 1 "A U Thor" 1 C 1 D 1 E 1
 
 git blame -c  -L,8 file 
-Author A U Thor (expected 1, attributed 1) good
-Author B1 (expected 1, attributed 1) good
-Author E (expected 1, attributed 1) good
-Author B (expected 1, attributed 1) good
-Author A (expected 1, attributed 1) good
 Author B2 (expected 1, attributed 1) good
+Author B1 (expected 1, attributed 1) good
 Author D (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
 Author C (expected 1, attributed 1) good
+Author B (expected 1, attributed 1) good
+Author A U Thor (expected 1, attributed 1) good
+Author E (expected 1, attributed 1) good
 ok 52 - blame -L ,Y (Y == nlines)
 
 expecting success: 
@@ -307107,28 +307431,28 @@
 	check_count -L,$n A 1 B 1 B1 1 B2 1 "A U Thor" 1 C 1 D 1 E 1
 
 git blame -c  -L,9 file 
-Author B2 (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
 Author C (expected 1, attributed 1) good
-Author E (expected 1, attributed 1) good
 Author A U Thor (expected 1, attributed 1) good
-Author B1 (expected 1, attributed 1) good
-Author D (expected 1, attributed 1) good
-Author B (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
+Author B (expected 1, attributed 1) good
+Author B1 (expected 1, attributed 1) good
 ok 53 - blame -L ,Y (Y == nlines + 1)
 
 expecting success: 
 	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 B (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
-Author A (expected 1, attributed 1) good
+Author B1 (expected 1, attributed 1) good
+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 A U Thor (expected 1, attributed 1) good
 Author D (expected 1, attributed 1) good
-Author B1 (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
+Author B (expected 1, attributed 1) good
 ok 54 - blame -L ,Y (Y > nlines)
 
 expecting success: 
@@ -307136,85 +307460,85 @@
 
 git blame -c  -L2,3 -L6,7 file 
 Author A U Thor (expected 1, attributed 1) good
-Author A (expected 1, attributed 1) good
-Author B2 (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 55 - blame -L multiple (disjoint)
 
 expecting success: 
 	check_count -L6,7 -L2,3 A 1 B1 1 B2 1 "A U Thor" 1
 
 git blame -c  -L6,7 -L2,3 file 
-Author A (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
 Author B1 (expected 1, attributed 1) good
 Author A U Thor (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
 ok 56 - blame -L multiple (disjoint: unordered)
 
 expecting success: 
 	check_count -L2,3 -L4,5 A 1 B 1 B2 1 D 1
 
 git blame -c  -L2,3 -L4,5 file 
-Author A (expected 1, attributed 1) good
-Author D (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
 Author B (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
 ok 57 - blame -L multiple (adjacent)
 
 expecting success: 
 	check_count -L4,5 -L2,3 A 1 B 1 B2 1 D 1
 
 git blame -c  -L4,5 -L2,3 file 
-Author D (expected 1, attributed 1) good
-Author A (expected 1, attributed 1) good
 Author B (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
 Author B2 (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
 ok 58 - blame -L multiple (adjacent: unordered)
 
 expecting success: 
 	check_count -L2,4 -L3,5 A 1 B 1 B2 1 D 1
 
 git blame -c  -L2,4 -L3,5 file 
+Author A (expected 1, attributed 1) good
 Author B2 (expected 1, attributed 1) good
 Author B (expected 1, attributed 1) good
 Author D (expected 1, attributed 1) good
-Author A (expected 1, attributed 1) good
 ok 59 - blame -L multiple (overlapping)
 
 expecting success: 
 	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 60 - blame -L multiple (overlapping: unordered)
 
 expecting success: 
 	check_count -L2,8 -L3,5 A 1 B 1 B1 1 B2 1 C 1 D 1 "A U Thor" 1
 
 git blame -c  -L2,8 -L3,5 file 
-Author A U Thor (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
-Author C (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 B1 (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
+Author A U Thor (expected 1, attributed 1) good
+Author C (expected 1, attributed 1) good
 ok 61 - blame -L multiple (superset/subset)
 
 expecting success: 
 	check_count -L3,5 -L2,8 A 1 B 1 B1 1 B2 1 C 1 D 1 "A U Thor" 1
 
 git blame -c  -L3,5 -L2,8 file 
-Author A (expected 1, attributed 1) good
-Author C (expected 1, attributed 1) good
 Author A U Thor (expected 1, attributed 1) good
-Author D (expected 1, attributed 1) good
+Author C (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
 Author B1 (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
 Author B (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
 ok 62 - blame -L multiple (superset/subset: unordered)
 
 expecting success: 
@@ -307222,23 +307546,23 @@
 
 git blame -c  -L3,3 -L/fox/ file 
 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 U Thor (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
 ok 63 - blame -L /RE/ (relative)
 
 expecting success: 
 	check_count -L/dog/ A 1 B 1 B1 1 B2 1 C 1 D 1 "A U Thor" 1
 
 git blame -c  -L/dog/ file 
-Author C (expected 1, attributed 1) good
+Author A U Thor (expected 1, attributed 1) good
 Author A (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
+Author B1 (expected 1, attributed 1) good
 Author 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
-Author A U Thor (expected 1, attributed 1) good
 ok 64 - blame -L /RE/ (relative: no preceding range)
 
 expecting success: 
@@ -307273,8 +307597,8 @@
 	check_count -L^/dog/,+2 A 1 B2 1
 
 git blame -c  -L^/dog/,+2 file 
-Author A (expected 1, attributed 1) good
 Author B2 (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
 ok 69 - blame -L ^/RE/ (absolute: no preceding range)
 
 expecting success: 
@@ -307288,9 +307612,9 @@
 	check_count -L$n -L^/$/,+2 A 1 C 1 E 1
 
 git blame -c  -L8 -L^/$/,+2 file 
-Author A (expected 1, attributed 1) good
 Author C (expected 1, attributed 1) good
 Author E (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
 ok 71 - blame -L ^/RE/ (absolute: end-of-file)
 
 expecting success: 
@@ -307322,14 +307646,14 @@
 	GIT_AUTHOR_NAME="H" GIT_AUTHOR_EMAIL="H@test.git" \
 	git commit -a -m "mail"
 
-[branch2 5b8f51a] hello
+[branch2 6f8ecb3] hello
  Author: F <F@test.git>
  1 file changed, 4 insertions(+)
  create mode 100644 hello.c
-[branch2 df5d04f] goodbye
+[branch2 e6186d5] goodbye
  Author: G <G@test.git>
  1 file changed, 1 insertion(+)
-[branch2 f6d51b1] mail
+[branch2 540983c] mail
  Author: H <H@test.git>
  1 file changed, 5 insertions(+)
 ok 72 - setup -L :regex
@@ -307367,8 +307691,8 @@
 	check_count -f hello.c -L:ma.. F 4 G 1
 
 git blame -c  -L:ma.. hello.c 
-Author G (expected 1, attributed 1) good
 Author F (expected 4, attributed 4) good
+Author G (expected 1, attributed 1) good
 ok 77 - blame -L :RE (relative: no preceding range)
 
 expecting success: 
@@ -307387,16 +307711,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 80 - blame -L ^:RE (absolute)
 
 expecting success: 
 	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 81 - blame -L ^:RE (absolute: no preceding range)
 
 expecting success: 
@@ -307410,8 +307734,8 @@
 	check_count -f hello.c -L$n -L^:ma.. F 4 G 1 H 1
 
 git blame -c  -L10 -L^:ma.. hello.c 
-Author H (expected 1, attributed 1) good
 Author G (expected 1, attributed 1) good
+Author H (expected 1, attributed 1) good
 Author F (expected 4, attributed 4) good
 ok 83 - blame -L ^:RE (absolute: end-of-file)
 
@@ -307430,14 +307754,14 @@
 	git commit -a -m "step 1"
 	)
 
-[branch2 e250ca8] step 0
+[branch2 c2adee8] step 0
  Author: I <I@test.git>
  1 file changed, 0 insertions(+), 0 deletions(-)
  create mode 100644 incremental
-[branch2 c658604] step 0.5
+[branch2 084d71d] step 0.5
  Author: I <I@test.git>
  1 file changed, 1 insertion(+)
-[branch2 c3a10c5] step 1
+[branch2 24bcadd] step 1
  Author: I <I@test.git>
  1 file changed, 1 insertion(+), 1 deletion(-)
 ok 84 - setup incremental
@@ -307648,1675 +307972,72 @@
 	test_line_count = 1 colored &&
 	grep qfunc colored
 
-[branch2 c078944] new commit
+[branch2 7f1c1bb] new commit
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-<CYAN>c0789446 (A U Thor 2021-12-03 05:10:03 +0000 11) <RESET>void qfunc();
+<CYAN>7f1c1bba (A U Thor 2023-01-05 11:50:16 +0000 11) <RESET>void qfunc();
 ok 109 - blame color by age: new code is different
 
 # passed all 109 test(s)
 1..109
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t7406-submodule-update.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7406-submodule-update/.git/
-expecting success: 
-	echo file > file &&
-	git add file &&
-	test_tick &&
-	git commit -m upstream &&
-	git clone . super &&
-	git clone super submodule &&
-	git clone super rebasing &&
-	git clone super merging &&
-	git clone super none &&
-	(cd super &&
-	 git submodule add ../submodule submodule &&
-	 test_tick &&
-	 git commit -m "submodule" &&
-	 git submodule init submodule
-	) &&
-	(cd submodule &&
-	echo "line2" > file &&
-	git add file &&
-	git commit -m "Commit 2"
-	) &&
-	(cd super &&
-	 (cd submodule &&
-	  git pull --rebase origin
-	 ) &&
-	 git add submodule &&
-	 git commit -m "submodule update"
-	) &&
-	(cd super &&
-	 git submodule add ../rebasing rebasing &&
-	 test_tick &&
-	 git commit -m "rebasing"
-	) &&
-	(cd super &&
-	 git submodule add ../merging merging &&
-	 test_tick &&
-	 git commit -m "rebasing"
-	) &&
-	(cd super &&
-	 git submodule add ../none none &&
-	 test_tick &&
-	 git commit -m "none"
-	) &&
-	git clone . recursivesuper &&
-	( cd recursivesuper &&
-	 git submodule add ../super super
-	)
-
-[master (root-commit) 0c90624] upstream
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-Cloning into 'super'...
-done.
-Cloning into 'submodule'...
-done.
-Cloning into 'rebasing'...
-done.
-Cloning into 'merging'...
-done.
-Cloning into 'none'...
-done.
-Cloning into '/build/git-2.20.1/t/trash directory.t7406-submodule-update/super/submodule'...
-done.
-[master 3ae95bc] submodule
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 submodule
-[master 4301fd3] Commit 2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-From /build/git-2.20.1/t/trash directory.t7406-submodule-update/submodule
-   0c90624..4301fd3  master     -> origin/master
-Updating 0c90624..4301fd3
-Fast-forward
- file | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Current branch master is up to date.
-[master fed7cea] submodule update
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Cloning into '/build/git-2.20.1/t/trash directory.t7406-submodule-update/super/rebasing'...
-done.
-[master 5366fa1] rebasing
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 160000 rebasing
-Cloning into '/build/git-2.20.1/t/trash directory.t7406-submodule-update/super/merging'...
-done.
-[master 7cb8417] rebasing
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 160000 merging
-Cloning into '/build/git-2.20.1/t/trash directory.t7406-submodule-update/super/none'...
-done.
-[master e1c6586] none
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 160000 none
-Cloning into 'recursivesuper'...
-done.
-Cloning into '/build/git-2.20.1/t/trash directory.t7406-submodule-update/recursivesuper/super'...
-done.
-ok 1 - setup a submodule tree
-
-expecting success: 
-	(cd super/submodule &&
-	 git reset --hard HEAD~1
-	) &&
-	(cd super &&
-	 (cd submodule &&
-	  compare_head
-	 ) &&
-	 git submodule update submodule &&
-	 cd submodule &&
-	 ! compare_head
-	)
-
-HEAD is now at 0c90624 upstream
-Submodule path 'submodule': checked out '4301fd3e4110d3b6212c19aed3094150392545b9'
-ok 2 - submodule update detaching the HEAD 
-
-expecting success: 
-	(cd super/submodule &&
-	 git reset --hard HEAD~1
-	) &&
-	mkdir super/sub &&
-	(cd super/sub &&
-	 (cd ../submodule &&
-	  compare_head
-	 ) &&
-	 git submodule update ../submodule &&
-	 cd ../submodule &&
-	 ! compare_head
-	)
-
-HEAD is now at 0c90624 upstream
-Submodule path '../submodule': checked out '4301fd3e4110d3b6212c19aed3094150392545b9'
-ok 3 - submodule update from subdirectory
-
-expecting success: 
-	git -C recursivesuper/super reset --hard HEAD^ &&
-	(cd recursivesuper &&
-	 mkdir tmp &&
-	 cd tmp &&
-	 git submodule update --init --recursive ../super >../../actual 2>../../actual2
-	) &&
-	test_i18ncmp expect actual &&
-	sort actual2 >actual2.sorted &&
-	test_i18ncmp expect2 actual2.sorted
-
-HEAD is now at 7cb8417 rebasing
-ok 4 - submodule update --init --recursive from subdirectory
-
-expecting success: 
-	git init withsubs &&
-	(cd withsubs &&
-	 mkdir foo &&
-	 git submodule add "$(pwd)/../rebasing" foo/sub &&
-	 (cd foo &&
-	  git submodule deinit -f sub &&
-	  git submodule update --init sub 2>../../actual2
-	 )
-	) &&
-	test_i18ncmp expect2 actual2
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7406-submodule-update/withsubs/.git/
-Cloning into '/build/git-2.20.1/t/trash directory.t7406-submodule-update/withsubs/foo/sub'...
-done.
-Cleared directory 'sub'
-Submodule 'foo/sub' (/build/git-2.20.1/t/trash directory.t7406-submodule-update/withsubs/../rebasing) unregistered for path 'sub'
-Submodule path 'sub': checked out '0c90624ab7f1aaa301d3bb79f60dcfed1ec4897f'
-ok 5 - submodule update --init from and of subdirectory
-
-expecting success: 
-	(cd submodule &&
-	  echo line3 >> file &&
-	  git add file &&
-	  test_tick &&
-	  git commit -m "upstream line3"
-	) &&
-	(cd super/submodule &&
-	  head=$(git rev-parse --verify HEAD) &&
-	  echo "Submodule path ${apos}submodule$apos: checked out $apos$head$apos" > ../../expected &&
-	  git reset --hard HEAD~1
-	) &&
-	(cd super &&
-	  git submodule update > ../actual 2> ../actual.err
-	) &&
-	test_i18ncmp expected actual &&
-	test_must_be_empty actual.err
-
-[master 820877d] upstream line3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-HEAD is now at 0c90624 upstream
-ok 6 - submodule update does not fetch already present commits
-
-expecting success: 
-	(cd super/submodule &&
-	 git reset --hard HEAD~1 &&
-	 echo "local change" > file
-	) &&
-	(cd super &&
-	 (cd submodule &&
-	  compare_head
-	 ) &&
-	 test_must_fail git submodule update submodule
-	)
-
-HEAD is now at 0c90624 upstream
-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
-Unable to checkout '4301fd3e4110d3b6212c19aed3094150392545b9' in submodule path 'submodule'
-ok 7 - submodule update should fail due to local changes
-
-expecting success: 
-	(cd super &&
-	 (cd submodule &&
-	  compare_head
-	 ) &&
-	 git submodule update --force submodule &&
-	 cd submodule &&
-	 ! compare_head
-	)
-
-Submodule path 'submodule': checked out '4301fd3e4110d3b6212c19aed3094150392545b9'
-ok 8 - submodule update should throw away changes with --force 
-
-expecting success: 
-	(cd super &&
-	 (cd submodule &&
-	  rm -f file
-	 ) &&
-	 git submodule update --force submodule &&
-	 (cd submodule &&
-	  test "$(git status -s file)" = ""
-	 )
-	)
-
-Submodule path 'submodule': checked out '4301fd3e4110d3b6212c19aed3094150392545b9'
-ok 9 - submodule update --force forcibly checks out submodules
-
-expecting success: 
-	(cd submodule &&
-	 echo line4 >> file &&
-	 git add file &&
-	 test_tick &&
-	 git commit -m "upstream line4"
-	) &&
-	(cd super &&
-	 git submodule update --remote --force submodule &&
-	 cd submodule &&
-	 test "$(git log -1 --oneline)" = "$(GIT_DIR=../../submodule/.git git log -1 --oneline)"
-	)
-
-[master 6355002] upstream line4
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-From /build/git-2.20.1/t/trash directory.t7406-submodule-update/submodule
-   4301fd3..6355002  master     -> origin/master
-Submodule path 'submodule': checked out '63550025de24fe5dc1a12e7b0c6d73ec59137ab7'
-ok 10 - submodule update --remote should fetch upstream changes
-
-expecting success: 
-	(
-		cd super &&
-		git config -f .gitmodules submodule."submodule".branch "." &&
-		git add .gitmodules &&
-		git commit -m "submodules: update from the respective superproject branch"
-	) &&
-	(
-		cd submodule &&
-		echo line4a >> file &&
-		git add file &&
-		test_tick &&
-		git commit -m "upstream line4a" &&
-		git checkout -b test-branch &&
-		test_commit on-test-branch
-	) &&
-	(
-		cd super &&
-		git submodule update --remote --force submodule &&
-		git -C submodule log -1 --oneline >actual &&
-		git -C ../submodule log -1 --oneline master >expect &&
-		test_cmp expect actual &&
-		git checkout -b test-branch &&
-		git submodule update --remote --force submodule &&
-		git -C submodule log -1 --oneline >actual &&
-		git -C ../submodule log -1 --oneline test-branch >expect &&
-		test_cmp expect actual &&
-		git checkout master &&
-		git branch -d test-branch &&
-		git reset --hard HEAD^
-	)
-
-[master 3ce6992] submodules: update from the respective superproject branch
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[master b0b6cde] upstream line4a
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Switched to a new branch 'test-branch'
-[test-branch c326505] on-test-branch
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 on-test-branch.t
-From /build/git-2.20.1/t/trash directory.t7406-submodule-update/submodule
-   6355002..b0b6cde  master         -> origin/master
- * [new branch]      test-branch    -> origin/test-branch
- * [new tag]         on-test-branch -> on-test-branch
-Submodule path 'submodule': checked out 'b0b6cdeaf939e317dabcdecfa7ee099e17b520e8'
-Switched to a new branch 'test-branch'
-M	submodule
-Submodule path 'submodule': checked out 'c3265059a95726b1f19f9ee98d3c9f4835e09e8f'
-Switched to branch 'master'
-M	submodule
-Your branch is ahead of 'origin/master' by 6 commits.
-  (use "git push" to publish your local commits)
-Deleted branch test-branch (was 3ce6992).
-HEAD is now at e1c6586 none
-ok 11 - submodule update --remote should fetch upstream changes with .
-
-expecting success: 
-	(cd submodule &&
-	 git checkout test-branch &&
-	 echo line5 >> file &&
-	 git add file &&
-	 test_tick &&
-	 git commit -m "upstream line5" &&
-	 git checkout master
-	) &&
-	(cd super &&
-	 git config submodule.submodule.branch test-branch &&
-	 git submodule update --remote --force submodule &&
-	 cd submodule &&
-	 test "$(git log -1 --oneline)" = "$(GIT_DIR=../../submodule/.git git log -1 --oneline test-branch)"
-	)
-
-Already on 'test-branch'
-[test-branch e396f16] upstream line5
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Switched to branch 'master'
-Your branch is ahead of 'origin/master' by 4 commits.
-  (use "git push" to publish your local commits)
-From /build/git-2.20.1/t/trash directory.t7406-submodule-update/submodule
-   c326505..e396f16  test-branch -> origin/test-branch
-Submodule path 'submodule': checked out 'e396f163e62f5fbe39de2f6bd37bf79618268b5c'
-ok 12 - local config should override .gitmodules branch
-
-expecting success: 
-	(cd super/submodule &&
-	  git checkout master
-	) &&
-	(cd super &&
-	 (cd submodule &&
-	  compare_head
-	 ) &&
-	 git submodule update --rebase submodule &&
-	 cd submodule &&
-	 compare_head
-	)
-
-Previous HEAD position was e396f16 upstream line5
-Switched to branch 'master'
-Your branch is behind 'origin/master' by 4 commits, and can be fast-forwarded.
-  (use "git pull" to update your local branch)
-First, rewinding head to replay your work on top of it...
-Fast-forwarded master to 4301fd3e4110d3b6212c19aed3094150392545b9.
-Submodule path 'submodule': rebased into '4301fd3e4110d3b6212c19aed3094150392545b9'
-ok 13 - submodule update --rebase staying on master
-
-expecting success: 
-	(cd super/submodule &&
-	  git reset --hard HEAD~1
-	) &&
-	(cd super &&
-	 (cd submodule &&
-	  compare_head
-	 ) &&
-	 git submodule update --merge submodule &&
-	 cd submodule &&
-	 compare_head
-	)
-
-HEAD is now at 0c90624 upstream
-Updating 0c90624..4301fd3
-Fast-forward
- file | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Submodule path 'submodule': merged in '4301fd3e4110d3b6212c19aed3094150392545b9'
-ok 14 - submodule update --merge staying on master
-
-expecting success: 
-	(cd super &&
-	 git config submodule.submodule.update rebase
-	) &&
-	(cd super/submodule &&
-	  git reset --hard HEAD~1
-	) &&
-	(cd super &&
-	 (cd submodule &&
-	  compare_head
-	 ) &&
-	 git submodule update submodule &&
-	 cd submodule &&
-	 compare_head
-	)
-
-HEAD is now at 0c90624 upstream
-First, rewinding head to replay your work on top of it...
-Fast-forwarded master to 4301fd3e4110d3b6212c19aed3094150392545b9.
-Submodule path 'submodule': rebased into '4301fd3e4110d3b6212c19aed3094150392545b9'
-ok 15 - submodule update - rebase in .git/config
-
-expecting success: 
-	(cd super &&
-	 git config submodule.submodule.update checkout
-	) &&
-	(cd super/submodule &&
-	  git reset --hard HEAD~1
-	) &&
-	(cd super &&
-	 (cd submodule &&
-	  compare_head
-	 ) &&
-	 git submodule update --rebase submodule &&
-	 cd submodule &&
-	 compare_head
-	)
-
-HEAD is now at 0c90624 upstream
-First, rewinding head to replay your work on top of it...
-Fast-forwarded master to 4301fd3e4110d3b6212c19aed3094150392545b9.
-Submodule path 'submodule': rebased into '4301fd3e4110d3b6212c19aed3094150392545b9'
-ok 16 - submodule update - checkout in .git/config but --rebase given
-
-expecting success: 
-	(cd super &&
-	 git config submodule.submodule.update merge
-	) &&
-	(cd super/submodule &&
-	  git reset --hard HEAD~1
-	) &&
-	(cd super &&
-	 (cd submodule &&
-	  compare_head
-	 ) &&
-	 git submodule update submodule &&
-	 cd submodule &&
-	 compare_head
-	)
-
-HEAD is now at 0c90624 upstream
-Updating 0c90624..4301fd3
-Fast-forward
- file | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Submodule path 'submodule': merged in '4301fd3e4110d3b6212c19aed3094150392545b9'
-ok 17 - submodule update - merge in .git/config
-
-expecting success: 
-	(cd super &&
-	 git config submodule.submodule.update checkout
-	) &&
-	(cd super/submodule &&
-	  git reset --hard HEAD~1
-	) &&
-	(cd super &&
-	 (cd submodule &&
-	  compare_head
-	 ) &&
-	 git submodule update --merge submodule &&
-	 cd submodule &&
-	 compare_head
-	)
-
-HEAD is now at 0c90624 upstream
-Updating 0c90624..4301fd3
-Fast-forward
- file | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Submodule path 'submodule': merged in '4301fd3e4110d3b6212c19aed3094150392545b9'
-ok 18 - submodule update - checkout in .git/config but --merge given
-
-expecting success: 
-	(cd super &&
-	 git config submodule.submodule.update checkout
-	) &&
-	(cd super/submodule &&
-	  git reset --hard HEAD^
-	) &&
-	(cd super &&
-	 (cd submodule &&
-	  compare_head
-	 ) &&
-	 git submodule update submodule &&
-	 cd submodule &&
-	 ! compare_head
-	)
-
-HEAD is now at 0c90624 upstream
-Submodule path 'submodule': checked out '4301fd3e4110d3b6212c19aed3094150392545b9'
-ok 19 - submodule update - checkout in .git/config
-
-expecting success: 
-	(cd super &&
-	 git config submodule.submodule.update "!git checkout"
-	) &&
-	(cd super/submodule &&
-	  git reset --hard HEAD^
-	) &&
-	(cd super &&
-	 (cd submodule &&
-	  compare_head
-	 ) &&
-	 git submodule update submodule &&
-	 cd submodule &&
-	 ! compare_head
-	)
-
-HEAD is now at 0c90624 upstream
-Previous HEAD position was 0c90624 upstream
-HEAD is now at 4301fd3 Commit 2
-Submodule path 'submodule': 'git checkout 4301fd3e4110d3b6212c19aed3094150392545b9'
-ok 20 - submodule update - command in .git/config
-
-expecting success: 
-	test_when_finished "git -C super reset --hard HEAD^" &&
-	git -C super config -f .gitmodules submodule.submodule.update "!false" &&
-	git -C super commit -a -m "add command to .gitmodules file" &&
-	git -C super/submodule reset --hard $submodulesha1^ &&
-	test_must_fail git -C super submodule update submodule
-
-[master 943703a] add command to .gitmodules file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-HEAD is now at 0c90624 upstream
-fatal: invalid value for submodule.submodule.update
-HEAD is now at e1c6586 none
-ok 21 - submodule update - command in .gitmodules is rejected
-
-expecting success: 
-	git init command-in-gitmodules &&
-	(
-		cd command-in-gitmodules &&
-		git submodule add ../submodule submodule &&
-		test_commit adding-submodule &&
-
-		git config -f .gitmodules submodule.submodule.update "!false" &&
-		git add .gitmodules &&
-		test_commit configuring-update &&
-		test_must_fail git fsck
-	)
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7406-submodule-update/command-in-gitmodules/.git/
-Cloning into '/build/git-2.20.1/t/trash directory.t7406-submodule-update/command-in-gitmodules/submodule'...
-done.
-[master (root-commit) e9e4b27] adding-submodule
- Author: A U Thor <author@example.com>
- 3 files changed, 5 insertions(+)
- create mode 100644 .gitmodules
- create mode 100644 adding-submodule.t
- create mode 160000 submodule
-[master ab1e31c] configuring-update
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 configuring-update.t
-error in blob 34075c13cf76fa2281e921a63acb1c52594ee0a0: gitmodulesUpdate: disallowed submodule update setting: !false
-ok 22 - fsck detects command in .gitmodules
-
-expecting success: 
-	(cd super &&
-	 git config submodule.submodule.update "!false"
-	) &&
-	(cd super/submodule &&
-	  git reset --hard $submodulesha1^
-	) &&
-	(cd super &&
-	 test_must_fail git submodule update submodule 2>../actual
-	) &&
-	test_i18ncmp actual expect
-
-HEAD is now at 0c90624 upstream
-ok 23 - submodule update - command in .git/config catches failure
-
-expecting success: 
-	(cd super &&
-	 git config submodule.submodule.update "!false"
-	) &&
-	(cd super/submodule &&
-	  git reset --hard $submodulesha1^
-	) &&
-	(cd super &&
-	 mkdir tmp && cd tmp &&
-	 test_must_fail git submodule update ../submodule 2>../../actual
-	) &&
-	test_i18ncmp actual expect
-
-HEAD is now at 0c90624 upstream
-ok 24 - submodule update - command in .git/config catches failure -- subdirectory
-
-expecting success: 
-	cat >expect <<-EOF &&
-	Execution of 'false $submodulesha1' failed in submodule path 'submodule'
-	EOF
-	rm -rf super/submodule &&
-	test_must_fail git -C super submodule update 2>actual &&
-	test_i18ncmp expect actual &&
-	git -C super submodule update --checkout
-
-Submodule path 'submodule': checked out '4301fd3e4110d3b6212c19aed3094150392545b9'
-ok 25 - submodule update - command run for initial population of submodule
-
-expecting success: 
-	(cd recursivesuper &&
-	 git submodule update --remote super &&
-	 git add super &&
-	 git commit -m "update to latest to have more than one commit in submodules"
-	) &&
-	git -C recursivesuper/super config submodule.submodule.update "!false" &&
-	git -C recursivesuper/super/submodule reset --hard $submodulesha1^ &&
-	(cd recursivesuper &&
-	 mkdir -p tmp && cd tmp &&
-	 test_must_fail git submodule update --recursive ../super 2>../../actual
-	) &&
-	test_i18ncmp actual expect
-
-[master a3db8ed] update to latest to have more than one commit in submodules
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 super
-HEAD is now at 0c90624 upstream
-ok 26 - recursive submodule update - command in .git/config catches failure -- subdirectory
-
-expecting success: 
-	test_when_finished "git -C super update-index --force-remove submodule1" &&
-	test_when_finished git config -f super/.gitmodules \
-		--remove-section submodule.submodule1 &&
-	(cd super &&
-	 git ls-files -s submodule >out &&
-	 H=$(cut -d" " -f2 out) &&
-	 mkdir submodule1 &&
-	 git update-index --add --cacheinfo 160000 $H submodule1 &&
-	 git config -f .gitmodules submodule.submodule1.path submodule1 &&
-	 git config -f .gitmodules submodule.submodule1.url ../submodule &&
-	 git config -f .gitmodules submodule.submodule1.update !false &&
-	 test_must_fail git submodule init submodule1 &&
-	 test_expect_code 1 git config submodule.submodule1.update >actual &&
-	 test_must_be_empty actual
-	)
-
-fatal: invalid value for submodule.submodule1.update
-ok 27 - submodule init does not copy command into .git/config
-
-expecting success: 
-	(cd super &&
-	 git config -f .gitmodules submodule.rebasing.update rebase &&
-	 git submodule init rebasing &&
-	 test "rebase" = "$(git config submodule.rebasing.update)"
-	)
-
-ok 28 - submodule init picks up rebase
-
-expecting success: 
-	(cd super &&
-	 git config -f .gitmodules submodule.merging.update merge &&
-	 git submodule init merging &&
-	 test "merge" = "$(git config submodule.merging.update)"
-	)
-
-ok 29 - submodule init picks up merge
-
-expecting success: 
-	test_config -C super submodule.submodule.update checkout &&
-	(cd super &&
-	 rm -rf submodule &&
-	 git submodule update submodule &&
-	 git status -s submodule >expect &&
-	 rm -rf submodule &&
-	 git submodule update --merge submodule &&
-	 git status -s submodule >actual &&
-	 test_cmp expect actual
-	)
-
-Submodule path 'submodule': checked out '4301fd3e4110d3b6212c19aed3094150392545b9'
-Submodule path 'submodule': checked out '4301fd3e4110d3b6212c19aed3094150392545b9'
-ok 30 - submodule update --merge  - ignores --merge  for new submodules
-
-expecting success: 
-	test_config -C super submodule.submodule.update checkout &&
-	(cd super &&
-	 rm -rf submodule &&
-	 git submodule update submodule &&
-	 git status -s submodule >expect &&
-	 rm -rf submodule &&
-	 git submodule update --rebase submodule &&
-	 git status -s submodule >actual &&
-	 test_cmp expect actual
-	)
-
-Submodule path 'submodule': checked out '4301fd3e4110d3b6212c19aed3094150392545b9'
-Submodule path 'submodule': checked out '4301fd3e4110d3b6212c19aed3094150392545b9'
-ok 31 - submodule update --rebase - ignores --rebase for new submodules
-
-expecting success: 
-	(cd super &&
-	 rm -rf submodule &&
-	 git submodule update submodule &&
-	 git status -s submodule >expect &&
-	 rm -rf submodule &&
-	 git config submodule.submodule.update merge &&
-	 git submodule update submodule &&
-	 git status -s submodule >actual &&
-	 git config --unset submodule.submodule.update &&
-	 test_cmp expect actual
-	)
-
-Submodule path 'submodule': checked out '4301fd3e4110d3b6212c19aed3094150392545b9'
-Submodule path 'submodule': checked out '4301fd3e4110d3b6212c19aed3094150392545b9'
-ok 32 - submodule update ignores update=merge config for new submodules
-
-expecting success: 
-	(cd super &&
-	 rm -rf submodule &&
-	 git submodule update submodule &&
-	 git status -s submodule >expect &&
-	 rm -rf submodule &&
-	 git config submodule.submodule.update rebase &&
-	 git submodule update submodule &&
-	 git status -s submodule >actual &&
-	 git config --unset submodule.submodule.update &&
-	 test_cmp expect actual
-	)
-
-Submodule path 'submodule': checked out '4301fd3e4110d3b6212c19aed3094150392545b9'
-Submodule path 'submodule': checked out '4301fd3e4110d3b6212c19aed3094150392545b9'
-ok 33 - submodule update ignores update=rebase config for new submodules
-
-expecting success: 
-	(cd super &&
-	 git config -f .gitmodules submodule.none.update none &&
-	 git submodule init none &&
-	 test "none" = "$(git config submodule.none.update)"
-	)
-
-ok 34 - submodule init picks up update=none
-
-expecting success: 
-	(cd super &&
-	 git config submodule.submodule.update none &&
-	 (cd submodule &&
-	  git checkout master &&
-	  compare_head
-	 ) &&
-	 git diff --name-only >out &&
-	 grep ^submodule$ out &&
-	 git submodule update &&
-	 git diff --name-only >out &&
-	 grep ^submodule$ out &&
-	 (cd submodule &&
-	  compare_head
-	 ) &&
-	 git config --unset submodule.submodule.update &&
-	 git submodule update submodule
-	)
-
-Previous HEAD position was 4301fd3 Commit 2
-Switched to branch 'master'
-Your branch is behind 'origin/master' by 4 commits, and can be fast-forwarded.
-  (use "git pull" to update your local branch)
-submodule
-Skipping submodule 'none'
-Skipping submodule 'submodule'
-submodule
-Submodule path 'submodule': checked out '4301fd3e4110d3b6212c19aed3094150392545b9'
-ok 35 - submodule update - update=none in .git/config
-
-expecting success: 
-	(cd super &&
-	 git config submodule.submodule.update none &&
-	 (cd submodule &&
-	  git checkout master &&
-	  compare_head
-	 ) &&
-	 git diff --name-only >out &&
-	 grep ^submodule$ out &&
-	 git submodule update --checkout &&
-	 git diff --name-only >out &&
-	 ! grep ^submodule$ out &&
-	 (cd submodule &&
-	  ! compare_head
-	 ) &&
-	 git config --unset submodule.submodule.update
-	)
-
-Previous HEAD position was 4301fd3 Commit 2
-Switched to branch 'master'
-Your branch is behind 'origin/master' by 4 commits, and can be fast-forwarded.
-  (use "git pull" to update your local branch)
-submodule
-Submodule path 'submodule': checked out '4301fd3e4110d3b6212c19aed3094150392545b9'
-ok 36 - submodule update - update=none in .git/config but --checkout given
-
-expecting success: 
-	(cd super &&
-	 git add .gitmodules &&
-	 git commit -m ".gitmodules"
-	) &&
-	git clone super cloned &&
-	(cd cloned &&
-	 git submodule update --init &&
-	 test_path_exists submodule/.git &&
-	 test_path_is_missing none/.git
-	)
-
-[master 856277d] .gitmodules
- Author: A U Thor <author@example.com>
- 1 file changed, 3 insertions(+)
-Cloning into 'cloned'...
-done.
-Submodule 'merging' (/build/git-2.20.1/t/trash directory.t7406-submodule-update/merging) registered for path 'merging'
-Submodule 'none' (/build/git-2.20.1/t/trash directory.t7406-submodule-update/none) registered for path 'none'
-Submodule 'rebasing' (/build/git-2.20.1/t/trash directory.t7406-submodule-update/rebasing) registered for path 'rebasing'
-Submodule 'submodule' (/build/git-2.20.1/t/trash directory.t7406-submodule-update/submodule) registered for path 'submodule'
-Cloning into '/build/git-2.20.1/t/trash directory.t7406-submodule-update/cloned/merging'...
-done.
-Skipping submodule 'none'
-Cloning into '/build/git-2.20.1/t/trash directory.t7406-submodule-update/cloned/rebasing'...
-done.
-Cloning into '/build/git-2.20.1/t/trash directory.t7406-submodule-update/cloned/submodule'...
-done.
-Submodule path 'merging': checked out '0c90624ab7f1aaa301d3bb79f60dcfed1ec4897f'
-Submodule path 'rebasing': checked out '0c90624ab7f1aaa301d3bb79f60dcfed1ec4897f'
-Submodule path 'submodule': checked out '4301fd3e4110d3b6212c19aed3094150392545b9'
-ok 37 - submodule update --init skips submodule with update=none
-
-expecting success: 
-	(cd super &&
-	 git reset --hard HEAD &&
-	 git submodule add ../submodule submodule2 &&
-	 git submodule init &&
-	 git commit -am "new_submodule" &&
-	 (cd submodule2 &&
-	  git rev-parse --verify HEAD >../expect
-	 ) &&
-	 (cd submodule &&
-	  test_commit "update_submodule" file
-	 ) &&
-	 (cd submodule2 &&
-	  test_commit "update_submodule2" file
-	 ) &&
-	 git add submodule &&
-	 git add submodule2 &&
-	 git commit -m "two_new_submodule_commits" &&
-	 (cd submodule &&
-	  echo "" > file
-	 ) &&
-	 git checkout HEAD^ &&
-	 test_must_fail git submodule update &&
-	 (cd submodule2 &&
-	  git rev-parse --verify HEAD >../actual
-	 ) &&
-	 test_cmp expect actual
-	)
-
-HEAD is now at 856277d .gitmodules
-Cloning into '/build/git-2.20.1/t/trash directory.t7406-submodule-update/super/submodule2'...
-done.
-[master d261494] new_submodule
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 160000 submodule2
-[detached HEAD 83199b0] update_submodule
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[master 8dc4de1] update_submodule2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 4 deletions(-)
-[master 9bb2d46] two_new_submodule_commits
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+), 2 deletions(-)
-Note: checking out '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 performing another checkout.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
-
-  git checkout -b <new-branch-name>
-
-HEAD is now at d261494 new_submodule
-M	submodule
-M	submodule2
-Skipping submodule 'none'
-error: Your local changes to the following files would be overwritten by checkout:
-	file
-Please commit your changes or stash them before you switch branches.
-Aborting
-Submodule path 'submodule2': checked out 'b0b6cdeaf939e317dabcdecfa7ee099e17b520e8'
-Unable to checkout '4301fd3e4110d3b6212c19aed3094150392545b9' in submodule path 'submodule'
-ok 38 - submodule update continues after checkout error
-
-expecting success: 
-	(cd super &&
-	 git reset --hard HEAD &&
-	 git checkout master &&
-	 git submodule update &&
-	 (cd submodule &&
-	  git submodule add ../submodule subsubmodule &&
-	  git submodule init &&
-	  git commit -m "new_subsubmodule"
-	 ) &&
-	 git add submodule &&
-	 git commit -m "update_submodule" &&
-	 (cd submodule &&
-	  (cd subsubmodule &&
-	   test_commit "update_subsubmodule" file
-	  ) &&
-	  git add subsubmodule &&
-	  test_commit "update_submodule_again" file &&
-	  (cd subsubmodule &&
-	   test_commit "update_subsubmodule_again" file
-	  ) &&
-	  test_commit "update_submodule_again_again" file
-	 ) &&
-	 (cd submodule2 &&
-	  git rev-parse --verify HEAD >../expect &&
-	  test_commit "update_submodule2_again" file
-	 ) &&
-	 git add submodule &&
-	 git add submodule2 &&
-	 git commit -m "new_commits" &&
-	 git checkout HEAD^ &&
-	 (cd submodule &&
-	  git checkout HEAD^ &&
-	  (cd subsubmodule &&
-	   echo "" > file
-	  )
-	 ) &&
-	 test_must_fail git submodule update --recursive &&
-	 (cd submodule2 &&
-	  git rev-parse --verify HEAD >../actual
-	 ) &&
-	 test_cmp expect actual
-	)
-
-HEAD is now at d261494 new_submodule
-Previous HEAD position was d261494 new_submodule
-Switched to branch 'master'
-M	submodule
-M	submodule2
-Your branch is ahead of 'origin/master' by 8 commits.
-  (use "git push" to publish your local commits)
-Skipping submodule 'none'
-Submodule path 'submodule2': checked out '8dc4de1dc365211781d03828f944165cc86d7a98'
-Cloning into '/build/git-2.20.1/t/trash directory.t7406-submodule-update/super/submodule/subsubmodule'...
-done.
-[detached HEAD 043bc58] new_subsubmodule
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 subsubmodule
-[master b91cc26] update_submodule
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[master c3ee4ca] update_subsubmodule
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 4 deletions(-)
-[detached HEAD f306cbe] update_submodule_again
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+), 2 deletions(-)
-[master 8e13b9e] update_subsubmodule_again
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[detached HEAD c412560] update_submodule_again_again
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[detached HEAD 49d2396] update_submodule2_again
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[master 664863f] new_commits
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+), 2 deletions(-)
-Note: checking out '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 performing another checkout.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
-
-  git checkout -b <new-branch-name>
-
-HEAD is now at b91cc26 update_submodule
-M	submodule
-M	submodule2
-Previous HEAD position was c412560 update_submodule_again_again
-HEAD is now at f306cbe update_submodule_again
-M	subsubmodule
-Skipping submodule 'none'
-Submodule path 'submodule': checked out '043bc58326b64f6ed86c060b72707767701d8437'
-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
-Unable to checkout 'b0b6cdeaf939e317dabcdecfa7ee099e17b520e8' in submodule path 'submodule/subsubmodule'
-Submodule path 'submodule2': checked out '8dc4de1dc365211781d03828f944165cc86d7a98'
-Failed to recurse into submodule path 'submodule'
-ok 39 - submodule update continues after recursive checkout error
-
-expecting success: 
-	(cd super &&
-	 git checkout master &&
-	 git reset --hard HEAD &&
-	 (cd submodule &&
-	  (cd subsubmodule &&
-	   git reset --hard HEAD
-	  )
-	 ) &&
-	 git submodule update --recursive &&
-	 (cd submodule &&
-	  test_commit "update_submodule_2" file
-	 ) &&
-	 (cd submodule2 &&
-	  test_commit "update_submodule2_2" file
-	 ) &&
-	 git add submodule &&
-	 git add submodule2 &&
-	 git commit -m "two_new_submodule_commits" &&
-	 (cd submodule &&
-	  git checkout master &&
-	  test_commit "conflict" file &&
-	  echo "conflict" > file
-	 ) &&
-	 git checkout HEAD^ &&
-	 (cd submodule2 &&
-	  git rev-parse --verify HEAD >../expect
-	 ) &&
-	 git config submodule.submodule.update merge &&
-	 test_must_fail git submodule update &&
-	 (cd submodule2 &&
-	  git rev-parse --verify HEAD >../actual
-	 ) &&
-	 test_cmp expect actual
-	)
-
-Previous HEAD position was b91cc26 update_submodule
-Switched to branch 'master'
-M	submodule
-M	submodule2
-Your branch is ahead of 'origin/master' by 10 commits.
-  (use "git push" to publish your local commits)
-HEAD is now at 664863f new_commits
-HEAD is now at 8e13b9e update_subsubmodule_again
-Skipping submodule 'none'
-Submodule path 'submodule': checked out 'c412560ec4b0712c06d4a914c8e3483f5650d569'
-Submodule path 'submodule/subsubmodule': checked out 'c3ee4ca43a6bcb7b5233ba2ca7e2c8adf5ffdfbd'
-Submodule path 'submodule2': checked out '49d2396b9c5ba1bfa95b0db5a1e98a4b8dd73b7c'
-[detached HEAD 72dc65f] update_submodule_2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[detached HEAD 2e0306e] update_submodule2_2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[master b1cb70d] two_new_submodule_commits
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+), 2 deletions(-)
-warning: unable to rmdir 'subsubmodule': Directory not empty
-Previous HEAD position was 72dc65f update_submodule_2
-Switched to branch 'master'
-Your branch is behind 'origin/master' by 4 commits, and can be fast-forwarded.
-  (use "git pull" to update your local branch)
-[master 08cc343] conflict
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Note: checking out '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 performing another checkout.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
-
-  git checkout -b <new-branch-name>
-
-HEAD is now at 664863f new_commits
-M	submodule
-M	submodule2
-Skipping submodule 'none'
-Merging:
-08cc343 conflict
-virtual c412560ec4b0712c06d4a914c8e3483f5650d569
-found 1 common ancestor:
-0c90624 upstream
-Auto-merging file
-CONFLICT (content): Merge conflict in file
-Automatic merge failed; fix conflicts and then commit the result.
-Unable to merge 'c412560ec4b0712c06d4a914c8e3483f5650d569' in submodule path 'submodule'
-ok 40 - submodule update exit immediately in case of merge conflict
-
-expecting success: 
-	(cd super &&
-	 git checkout master &&
-	 git reset --hard HEAD &&
-	 (cd submodule &&
-	  git reset --hard HEAD &&
-	  git submodule update --recursive
-	 ) &&
-	 (cd submodule &&
-	  test_commit "update_submodule_3" file
-	 ) &&
-	 (cd submodule2 &&
-	  test_commit "update_submodule2_3" file
-	 ) &&
-	 git add submodule &&
-	 git add submodule2 &&
-	 git commit -m "two_new_submodule_commits" &&
-	 (cd submodule &&
-	  git checkout master &&
-	  test_commit "conflict2" file &&
-	  echo "conflict" > file
-	 ) &&
-	 git checkout HEAD^ &&
-	 (cd submodule2 &&
-	  git rev-parse --verify HEAD >../expect
-	 ) &&
-	 git config submodule.submodule.update rebase &&
-	 test_must_fail git submodule update &&
-	 (cd submodule2 &&
-	  git rev-parse --verify HEAD >../actual
-	 ) &&
-	 test_cmp expect actual
-	)
-
-Previous HEAD position was 664863f new_commits
-Switched to branch 'master'
-M	submodule
-Your branch is ahead of 'origin/master' by 11 commits.
-  (use "git push" to publish your local commits)
-HEAD is now at b1cb70d two_new_submodule_commits
-warning: unable to rmdir 'subsubmodule': Directory not empty
-HEAD is now at 08cc343 conflict
-[master 85c1732] update_submodule_3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[detached HEAD 88bf62e] update_submodule2_3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[master 3a98345] two_new_submodule_commits
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+), 2 deletions(-)
-Already on 'master'
-Your branch and 'origin/master' have diverged,
-and have 2 and 4 different commits each, respectively.
-  (use "git pull" to merge the remote branch into yours)
-[master 10845e8] conflict2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Note: checking out '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 performing another checkout.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
-
-  git checkout -b <new-branch-name>
-
-HEAD is now at b1cb70d two_new_submodule_commits
-M	submodule
-M	submodule2
-Skipping submodule 'none'
-error: cannot rebase: You have unstaged changes.
-error: Please commit or stash them.
-Unable to rebase '72dc65ffc818dbfc1fc7a18b36ab97538db4c5f8' in submodule path 'submodule'
-ok 41 - submodule update exit immediately after recursive rebase error
-
-expecting success: 
-	(cd super &&
-	 git submodule add ../submodule s1 &&
-	 test_must_fail git submodule add ../merging s1
-	)
-
-Cloning into '/build/git-2.20.1/t/trash directory.t7406-submodule-update/super/s1'...
-done.
-'s1' already exists in the index
-ok 42 - add different submodules to the same path
-
-expecting success: 
-	(cd super &&
-	 mkdir deeper &&
-	 git submodule add ../submodule deeper/submodule &&
-	 (cd deeper/submodule &&
-	  git log > ../../expected
-	 ) &&
-	 (cd .git/modules/deeper/submodule &&
-	  git log > ../../../../actual
-	 ) &&
-	 test_cmp expected actual
-	)
-
-Cloning into '/build/git-2.20.1/t/trash directory.t7406-submodule-update/super/deeper/submodule'...
-done.
-ok 43 - submodule add places git-dir in superprojects git-dir
-
-expecting success: 
-	(cd super &&
-	 git commit -m "added submodule"
-	) &&
-	git clone super super2 &&
-	(cd super2 &&
-	 git submodule init deeper/submodule &&
-	 git submodule update &&
-	 (cd deeper/submodule &&
-	  git log > ../../expected
-	 ) &&
-	 (cd .git/modules/deeper/submodule &&
-	  git log > ../../../../actual
-	 ) &&
-	 test_cmp expected actual
-	)
-
-[detached HEAD 6857011] 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: checking out '68570117d0ae9a128a018881fbc8c0b7ca51de67'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by performing another checkout.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
-
-  git checkout -b <new-branch-name>
-
-Submodule 'deeper/submodule' (/build/git-2.20.1/t/trash directory.t7406-submodule-update/submodule) registered for path 'deeper/submodule'
-Cloning into '/build/git-2.20.1/t/trash directory.t7406-submodule-update/super2/deeper/submodule'...
-done.
-Skipping submodule 'none'
-Submodule path 'deeper/submodule': checked out 'b0b6cdeaf939e317dabcdecfa7ee099e17b520e8'
-ok 44 - submodule update places git-dir in superprojects git-dir
-
-expecting success: 
-	(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/git-2.20.1/t/trash directory.t7406-submodule-update/super2/deeper/submodule/subsubmodule'...
-done.
-[detached HEAD c234cdc] 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 f17dd01] update submodule
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Everything up-to-date
-ok 45 - submodule add places git-dir in superprojects git-dir recursive
-
-expecting success: 
-	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 master
-	) &&
-	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 master
-	) &&
-	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 master
-	) &&
-	rm -rf super_update_r2 &&
-	git clone super_update_r super_update_r2 &&
-	(cd super_update_r2 &&
-	 git submodule update --init --recursive >actual &&
-	 test_i18ngrep "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/git-2.20.1/t/trash directory.t7406-submodule-update/super_update_r/
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7406-submodule-update/subsuper_update_r/
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7406-submodule-update/subsubsuper_update_r/
-Cloning into 'subsubsuper_update_r2'...
-warning: You appear to have cloned an empty repository.
-done.
-[master (root-commit) e13bbd9] update_subsubsuper
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-To /build/git-2.20.1/t/trash directory.t7406-submodule-update/subsubsuper_update_r
- * [new branch]      master -> master
-Cloning into 'subsuper_update_r2'...
-warning: You appear to have cloned an empty repository.
-done.
-[master (root-commit) 7cab57e] update_subsuper
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-Cloning into '/build/git-2.20.1/t/trash directory.t7406-submodule-update/subsuper_update_r2/subsubmodule'...
-done.
-[master 796fb1a] subsubmodule
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 subsubmodule
-To /build/git-2.20.1/t/trash directory.t7406-submodule-update/subsuper_update_r
- * [new branch]      master -> master
-Cloning into 'super_update_r2'...
-warning: You appear to have cloned an empty repository.
-done.
-[master (root-commit) 489f12d] update_super
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-Cloning into '/build/git-2.20.1/t/trash directory.t7406-submodule-update/super_update_r2/submodule'...
-done.
-[master 8dc9f2e] submodule
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 submodule
-To /build/git-2.20.1/t/trash directory.t7406-submodule-update/super_update_r
- * [new branch]      master -> master
-Cloning into 'super_update_r2'...
-done.
-Submodule 'submodule' (/build/git-2.20.1/t/trash directory.t7406-submodule-update/subsuper_update_r) registered for path 'submodule'
-Cloning into '/build/git-2.20.1/t/trash directory.t7406-submodule-update/super_update_r2/submodule'...
-done.
-Submodule 'subsubmodule' (/build/git-2.20.1/t/trash directory.t7406-submodule-update/subsubsuper_update_r) registered for path 'submodule/subsubmodule'
-Cloning into '/build/git-2.20.1/t/trash directory.t7406-submodule-update/super_update_r2/submodule/subsubmodule'...
-done.
-Submodule path 'submodule/subsubmodule': checked out 'e13bbd9c3df4762b3c846e1fb977b29be7746269'
-ok 46 - submodule update places git-dir in superprojects git-dir recursive
-
-expecting success: 
-	(cd super &&
-	 git reset --hard master &&
-	 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 3a98345 two_new_submodule_commits
-Reactivating local git directory for submodule 'deeper/submodule'.
-ok 47 - submodule add properly re-creates deeper level submodules
-
-expecting success: 
-	(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 4c7a6eb] 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 9e9ffb2] 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 '88bf62ef75633c13999647494b82e33847ce431f'
-ok 48 - submodule update properly revives a moved submodule
-
-checking prerequisite: SYMLINKS
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
-	# test whether the filesystem supports symbolic links
-	ln -s x y && test -h y
-
-)
-prerequisite SYMLINKS ok
-expecting success: 
-	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/git-2.20.1/t/trash directory.t7406-submodule-update/subsuper_update_r) registered for path 'submodule'
-Cloning into '/build/git-2.20.1/t/trash directory.t7406-submodule-update/linked/dir/super/submodule'...
-done.
-Submodule path 'submodule': checked out '796fb1a6484f5f6c560d10b7517c12bee8a9388a'
-Submodule 'subsubmodule' (/build/git-2.20.1/t/trash directory.t7406-submodule-update/subsubsuper_update_r) registered for path 'submodule/subsubmodule'
-Cloning into '/build/git-2.20.1/t/trash directory.t7406-submodule-update/linked/dir/super/submodule/subsubmodule'...
-done.
-Submodule path 'submodule/subsubmodule': checked out 'e13bbd9c3df4762b3c846e1fb977b29be7746269'
-ok 49 - submodule update can handle symbolic links in pwd
-
-expecting success: 
-	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/git-2.20.1/t/trash directory.t7406-submodule-update/merging) registered for path 'merging'
-Submodule 'none' (file:///build/git-2.20.1/t/trash directory.t7406-submodule-update/none) registered for path 'none'
-Submodule 'rebasing' (file:///build/git-2.20.1/t/trash directory.t7406-submodule-update/rebasing) registered for path 'rebasing'
-Submodule 'submodule' (file:///build/git-2.20.1/t/trash directory.t7406-submodule-update/submodule) registered for path 'submodule'
-Cloning into '/build/git-2.20.1/t/trash directory.t7406-submodule-update/super3/merging'...
-Skipping submodule 'none'
-Cloning into '/build/git-2.20.1/t/trash directory.t7406-submodule-update/super3/rebasing'...
-Cloning into '/build/git-2.20.1/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 50 - submodule update clone shallow submodule
-
-expecting success: 
-	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 &&
-		test_must_fail git submodule update --init --depth=1 2>actual &&
-		test_i18ngrep "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'
-Fetched in submodule path 'submodule', but it did not contain 4301fd3e4110d3b6212c19aed3094150392545b9. Direct fetching of that commit failed.
-Skipping submodule 'none'
-From file:///build/git-2.20.1/t/trash directory.t7406-submodule-update/submodule
- * branch            4301fd3e4110d3b6212c19aed3094150392545b9 -> FETCH_HEAD
-ok 51 - submodule update clone shallow submodule outside of depth
-
-expecting success: 
-	(cd super2 &&
-	 (cd deeper/submodule/subsubmodule &&
-	  git checkout HEAD^
-	 ) &&
-	 git submodule update --recursive deeper/submodule >actual &&
-	 test_i18ngrep "Submodule path .deeper/submodule/subsubmodule.: checked out" actual
-	)
-
-Note: checking out '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 performing another checkout.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
-
-  git checkout -b <new-branch-name>
-
-HEAD is now at 6355002 upstream line4
-Submodule path 'deeper/submodule/subsubmodule': checked out 'b0b6cdeaf939e317dabcdecfa7ee099e17b520e8'
-ok 52 - submodule update --recursive drops module name before recursing
-
+*** t9103-git-svn-tracked-directory-removed.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9103-git-svn-tracked-directory-removed/.git/
 expecting success: 
-	(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
-	)
+	mkdir import &&
+	mkdir import/trunk &&
+	echo hello >> import/trunk/README &&
+	svn_cmd import -m initial import "$svnrepo" &&
+	rm -rf import &&
+	svn_cmd co "$svnrepo"/trunk trunk &&
+	echo bye bye >> trunk/README &&
+	svn_cmd rm -m "gone" "$svnrepo"/trunk &&
+	rm -rf trunk &&
+	mkdir trunk &&
+	echo "new" > trunk/FOLLOWME &&
+	svn_cmd import -m "new trunk" trunk "$svnrepo"/trunk
 
-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 53 - submodule update can be run in parallel
+Adding         import/trunk
+Adding         import/trunk/README
+Committing transaction...
+Committed revision 1.
+A    trunk/README
+Checked out revision 1.
+Committing transaction...
+Committed revision 2.
+Adding         trunk/FOLLOWME
+Committing transaction...
+Committed revision 3.
+ok 1 - make history for tracking
 
 expecting success: 
-	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
+	git svn clone -s "$svnrepo" x &&
+	test_path_is_file x/FOLLOWME &&
+	test_path_is_missing x/README
 
-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 54 - git clone passes the parallel jobs config on to submodules
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9103-git-svn-tracked-directory-removed/x/.git/
+	A	README
+r1 = 8eb7b2c55d05521391016939dfee01afd05b535a (refs/remotes/origin/trunk)
+	D	README
+	A	FOLLOWME
+r3 = e88c109ef4268a81a033cbfc6df59f8cbae289e6 (refs/remotes/origin/trunk)
+Checked out HEAD:
+  file:///build/git-2.20.1/t/trash%20directory.t9103-git-svn-tracked-directory-removed/svnrepo/trunk r3
+ok 2 - clone repo with git
 
-# passed all 54 test(s)
-1..54
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t9102-git-svn-deep-rmdir.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9102-git-svn-deep-rmdir/.git/
 expecting success: 
-	mkdir import &&
 	(
-		cd import &&
-		mkdir -p deeply/nested/directory/number/1 &&
-		mkdir -p deeply/nested/directory/number/2 &&
-		echo foo >deeply/nested/directory/number/1/file &&
-		echo foo >deeply/nested/directory/number/2/another &&
-		svn_cmd import -m "import for git svn" . "$svnrepo"
+		cd x &&
+		test -n "$(git svn find-rev r1)" &&
+		git reset --hard "$(git svn find-rev r1)" &&
+		test_path_is_file README &&
+		test_path_is_missing FOLLOWME &&
+		test -z "$(git svn find-rev r2)"
 	)
-	
-Adding         deeply
-Adding         deeply/nested
-Adding         deeply/nested/directory
-Adding         deeply/nested/directory/number
-Adding         deeply/nested/directory/number/1
-Adding         deeply/nested/directory/number/1/file
-Adding         deeply/nested/directory/number/2
-Adding         deeply/nested/directory/number/2/another
-Committing transaction...
-Committed revision 1.
-ok 1 - initialize repo
-
-expecting success: 
-	git svn init "$svnrepo" &&
-	git svn fetch &&
-	git checkout -f -b test-rmdir remotes/git-svn
-	
-	A	deeply/nested/directory/number/1/file
-	A	deeply/nested/directory/number/2/another
-r1 = fab26b14260610d4fbb65be85734918b5b5cd3a1 (refs/remotes/git-svn)
-Checked out HEAD:
-  file:///build/git-2.20.1/t/trash%20directory.t9102-git-svn-deep-rmdir/svnrepo r1
-Switched to a new branch 'test-rmdir'
-ok 2 - mirror via git svn
 
-expecting success: 
-	git rm -f deeply/nested/directory/number/2/another &&
-	git commit -a -m "remove another" &&
-	git svn set-tree --rmdir HEAD &&
-	svn_cmd ls -R "$svnrepo" | grep ^deeply/nested/directory/number/1
-	
-rm 'deeply/nested/directory/number/2/another'
-[test-rmdir 18a79bf] remove another
- Author: A U Thor <author@example.com>
- 1 file changed, 1 deletion(-)
- delete mode 100644 deeply/nested/directory/number/2/another
-	D	deeply/nested/directory/number/2/another
-	D+	deeply/nested/directory/number/2/
-	D	deeply/nested/directory/number/2/another
-	D	deeply/nested/directory/number/2/
-W: -empty_dir: deeply/nested/directory/number/2
-r2 = 914e9667321378b328f3f2b042d05cf9ba436385 (refs/remotes/git-svn)
-Done committing 1 revisions to SVN
-deeply/nested/directory/number/1/
-deeply/nested/directory/number/1/file
-ok 3 - Try a commit on rmdir
+HEAD is now at 8eb7b2c initial
+ok 3 - make sure r2 still has old file
 
 # passed all 3 test(s)
 1..3
@@ -311609,62 +310330,62 @@
 1..221
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t9103-git-svn-tracked-directory-removed.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9103-git-svn-tracked-directory-removed/.git/
+*** t9105-git-svn-commit-diff.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9105-git-svn-commit-diff/.git/
 expecting success: 
 	mkdir import &&
-	mkdir import/trunk &&
-	echo hello >> import/trunk/README &&
-	svn_cmd import -m initial import "$svnrepo" &&
-	rm -rf import &&
-	svn_cmd co "$svnrepo"/trunk trunk &&
-	echo bye bye >> trunk/README &&
-	svn_cmd rm -m "gone" "$svnrepo"/trunk &&
-	rm -rf trunk &&
-	mkdir trunk &&
-	echo "new" > trunk/FOLLOWME &&
-	svn_cmd import -m "new trunk" trunk "$svnrepo"/trunk
-
-Adding         import/trunk
-Adding         import/trunk/README
+	(
+		cd import &&
+		echo 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.
-A    trunk/README
-Checked out revision 1.
-Committing transaction...
-Committed revision 2.
-Adding         trunk/FOLLOWME
-Committing transaction...
-Committed revision 3.
-ok 1 - make history for tracking
+[master (root-commit) 9ea89f7] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 readme
+[master 700f274] another
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 1 - initialize repo
 
 expecting success: 
-	git svn clone -s "$svnrepo" x &&
-	test_path_is_file x/FOLLOWME &&
-	test_path_is_missing x/README
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9103-git-svn-tracked-directory-removed/x/.git/
-	A	README
-r1 = df85b958deac7213d9fdf3e414a9bae52bf292fd (refs/remotes/origin/trunk)
-	D	README
-	A	FOLLOWME
-r3 = 731216fdac22a0cb9233b2f53c3ff7209c7a5c7a (refs/remotes/origin/trunk)
-Checked out HEAD:
-  file:///build/git-2.20.1/t/trash%20directory.t9103-git-svn-tracked-directory-removed/svnrepo/trunk r3
-ok 2 - clone repo with git
+	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: 
-	(
-		cd x &&
-		test -n "$(git svn find-rev r1)" &&
-		git reset --hard "$(git svn find-rev r1)" &&
-		test_path_is_file README &&
-		test_path_is_missing FOLLOWME &&
-		test -z "$(git svn find-rev r2)"
-	)
-
-HEAD is now at df85b95 initial
-ok 3 - make sure r2 still has old file
+	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/git-2.20.1/t/trash%20directory.t9105-git-svn-commit-diff/svnrepo/subdir => file:///build/git-2.20.1/t/trash%20directory.t9105-git-svn-commit-diff/svnrepo
+	A	readme
+r3 = 7bfc1bd967c0f5eb62db34c999a66e1144791b71 (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
@@ -311697,12 +310418,12 @@
 	git commit -a -m "branch changed file" &&
 	git checkout master
 
-[master (root-commit) c0301b0] added file
+[master (root-commit) 9f7df0e] added file
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 file
 Switched to a new branch 'branch'
-[branch 877a000] branch changed file
+[branch e54318a] branch changed file
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 Switched to branch 'master'
@@ -311818,7 +310539,7 @@
 	test_config difftool.trustExitCode false &&
 	test_must_fail git difftool -y -t nonexistent branch
 
-/build/git-2.20.1/git-difftool--helper: 1: eval: i-dont-exist: not found
+/build/git-2.20.1/git-mergetool--lib: line 124: i-dont-exist: command not found
 fatal: external diff died, stopping at file
 ok 14 - difftool honors exit status if command not found
 
@@ -312033,12 +310754,12 @@
 	git commit -a -m "branch changed file2" &&
 	git checkout master
 
-[master 4587183] added file2
+[master 028ce3b] added file2
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 file2
 Switched to branch 'branch'
-[branch 6aad389] branch changed file2
+[branch 4adf847] branch changed file2
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 file2
@@ -312100,11 +310821,11 @@
 	git commit -m "modified both"
 
 Already on 'master'
-[master 058e64e] added sub/sub
+[master 5af94c7] added sub/sub
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 sub/sub
-[master d8f1664] modified both
+[master 30a8612] modified both
  Author: A U Thor <author@example.com>
  2 files changed, 2 insertions(+)
 ok 40 - setup change in subdirectory
@@ -312417,7 +311138,7 @@
 	
 file2
 file2
-HEAD is now at d8f1664 modified both
+HEAD is now at 30a8612 modified both
 ok 58 - difftool --dir-diff when worktree file is missing --no-symlinks
 
 expecting success: 
@@ -312431,7 +311152,7 @@
 	
 file2
 file2
-HEAD is now at d8f1664 modified both
+HEAD is now at 30a8612 modified both
 ok 59 - difftool --dir-diff when worktree file is missing --symlinks
 
 expecting success: 
@@ -312462,27 +311183,27 @@
 Switched to a new branch 'conflict-a'
 Switched to a new branch 'conflict-b'
 Switched to branch 'conflict-a'
-[conflict-a c7b48c5] conflict-a
+[conflict-a a58d904] conflict-a
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 Switched to branch 'conflict-b'
-[conflict-b 8125981] conflict-b
+[conflict-b 6e67c57] conflict-b
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 Switched to branch 'master'
-Updating d8f1664..c7b48c5
+Updating 30a8612..a58d904
 Fast-forward
  file | 1 +
  1 file changed, 1 insertion(+)
 Merging:
-c7b48c5 conflict-a
+a58d904 conflict-a
 virtual conflict-b
 found 1 common ancestor:
-d8f1664 modified both
+30a8612 modified both
 Auto-merging file
 CONFLICT (content): Merge conflict in file
 Automatic merge failed; fix conflicts and then commit the result.
-HEAD is now at c7b48c5 conflict-a
+HEAD is now at a58d904 conflict-a
 ok 60 - difftool --dir-diff with unmerged files --no-symlinks
 
 expecting success: 
@@ -312513,27 +311234,27 @@
 Switched to and reset branch 'conflict-a'
 Switched to and reset branch 'conflict-b'
 Switched to branch 'conflict-a'
-[conflict-a b2f5e1d] conflict-a
+[conflict-a 5453945] conflict-a
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 Switched to branch 'conflict-b'
-[conflict-b 73ba0e4] conflict-b
+[conflict-b 37965fe] conflict-b
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 Switched to branch 'master'
-Updating c7b48c5..b2f5e1d
+Updating a58d904..5453945
 Fast-forward
  file | 1 +
  1 file changed, 1 insertion(+)
 Merging:
-b2f5e1d conflict-a
+5453945 conflict-a
 virtual conflict-b
 found 1 common ancestor:
-c7b48c5 conflict-a
+a58d904 conflict-a
 Auto-merging file
 CONFLICT (content): Merge conflict in file
 Automatic merge failed; fix conflicts and then commit the result.
-HEAD is now at b2f5e1d conflict-a
+HEAD is now at 5453945 conflict-a
 ok 61 - difftool --dir-diff with unmerged files --symlinks
 
 expecting success: 
@@ -312561,7 +311282,7 @@
 	test_cmp expect file
 
 	
-HEAD is now at b2f5e1d conflict-a
+HEAD is now at 5453945 conflict-a
 ok 63 - difftool --dir-diff syncs worktree with unstaged change --no-symlinks
 
 expecting success: 
@@ -312574,7 +311295,7 @@
 	test_cmp expect file
 
 	
-HEAD is now at b2f5e1d conflict-a
+HEAD is now at 5453945 conflict-a
 ok 64 - difftool --dir-diff syncs worktree with unstaged change --symlinks
 
 expecting success: 
@@ -312586,7 +311307,7 @@
 	test_cmp expect file
 
 	
-HEAD is now at b2f5e1d conflict-a
+HEAD is now at 5453945 conflict-a
 ok 65 - difftool --dir-diff syncs worktree without unstaged change --no-symlinks
 
 expecting success: 
@@ -312598,7 +311319,7 @@
 	test_cmp expect file
 
 	
-HEAD is now at b2f5e1d conflict-a
+HEAD is now at 5453945 conflict-a
 ok 66 - difftool --dir-diff syncs worktree without unstaged change --symlinks
 
 expecting success: 
@@ -312621,10 +311342,10 @@
 		test_cmp expect "$(cat tmpdir)/file"
 	)
 
-warning: both files modified: '/build/git-2.20.1/t/trash directory.t7800-difftool/file' and '/build/git-2.20.1/t/trash directory.t7800-difftool/git-difftool.9l2N7m/right/file'.
+warning: both files modified: '/build/git-2.20.1/t/trash directory.t7800-difftool/file' and '/build/git-2.20.1/t/trash directory.t7800-difftool/git-difftool.YRZkuN/right/file'.
 warning: working tree file has been left.
 warning: 
-warning: temporary files exist in '/build/git-2.20.1/t/trash directory.t7800-difftool/git-difftool.9l2N7m'.
+warning: temporary files exist in '/build/git-2.20.1/t/trash directory.t7800-difftool/git-difftool.YRZkuN'.
 warning: you may want to cleanup or recover these.
 ok 68 - difftool --no-symlinks detects conflict 
 
@@ -312677,7 +311398,7 @@
  2 files changed, 2 insertions(+)
  create mode 120000 link
  create mode 100644 symlink-two.t
-HEAD is now at b2f5e1d conflict-a
+HEAD is now at 5453945 conflict-a
 ok 70 - difftool --dir-diff symlinked directories
 
 expecting success: 
@@ -312739,79 +311460,1647 @@
 	grep -v ^/ output >actual &&
 	test_cmp expect actual
 
-[master 7d2e17d] initial
+[master 3fd3161] initial
  Author: A U Thor <author@example.com>
  2 files changed, 1 insertion(+)
  create mode 100644 b
  create mode 120000 c
-HEAD is now at 7d2e17d initial
+HEAD is now at 3fd3161 initial
 ok 71 - difftool --dir-diff handles modified symlinks
 
 # passed all 71 test(s)
 1..71
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t9105-git-svn-commit-diff.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9105-git-svn-commit-diff/.git/
+*** t7406-submodule-update.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7406-submodule-update/.git/
+expecting success: 
+	echo file > file &&
+	git add file &&
+	test_tick &&
+	git commit -m upstream &&
+	git clone . super &&
+	git clone super submodule &&
+	git clone super rebasing &&
+	git clone super merging &&
+	git clone super none &&
+	(cd super &&
+	 git submodule add ../submodule submodule &&
+	 test_tick &&
+	 git commit -m "submodule" &&
+	 git submodule init submodule
+	) &&
+	(cd submodule &&
+	echo "line2" > file &&
+	git add file &&
+	git commit -m "Commit 2"
+	) &&
+	(cd super &&
+	 (cd submodule &&
+	  git pull --rebase origin
+	 ) &&
+	 git add submodule &&
+	 git commit -m "submodule update"
+	) &&
+	(cd super &&
+	 git submodule add ../rebasing rebasing &&
+	 test_tick &&
+	 git commit -m "rebasing"
+	) &&
+	(cd super &&
+	 git submodule add ../merging merging &&
+	 test_tick &&
+	 git commit -m "rebasing"
+	) &&
+	(cd super &&
+	 git submodule add ../none none &&
+	 test_tick &&
+	 git commit -m "none"
+	) &&
+	git clone . recursivesuper &&
+	( cd recursivesuper &&
+	 git submodule add ../super super
+	)
+
+[master (root-commit) 0c90624] upstream
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+Cloning into 'super'...
+done.
+Cloning into 'submodule'...
+done.
+Cloning into 'rebasing'...
+done.
+Cloning into 'merging'...
+done.
+Cloning into 'none'...
+done.
+Cloning into '/build/git-2.20.1/t/trash directory.t7406-submodule-update/super/submodule'...
+done.
+[master 3ae95bc] submodule
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 submodule
+[master 4301fd3] Commit 2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+From /build/git-2.20.1/t/trash directory.t7406-submodule-update/submodule
+   0c90624..4301fd3  master     -> origin/master
+Updating 0c90624..4301fd3
+Fast-forward
+ file | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Current branch master is up to date.
+[master fed7cea] submodule update
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Cloning into '/build/git-2.20.1/t/trash directory.t7406-submodule-update/super/rebasing'...
+done.
+[master 5366fa1] rebasing
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 160000 rebasing
+Cloning into '/build/git-2.20.1/t/trash directory.t7406-submodule-update/super/merging'...
+done.
+[master 7cb8417] rebasing
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 160000 merging
+Cloning into '/build/git-2.20.1/t/trash directory.t7406-submodule-update/super/none'...
+done.
+[master e1c6586] none
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 160000 none
+Cloning into 'recursivesuper'...
+done.
+Cloning into '/build/git-2.20.1/t/trash directory.t7406-submodule-update/recursivesuper/super'...
+done.
+ok 1 - setup a submodule tree
+
+expecting success: 
+	(cd super/submodule &&
+	 git reset --hard HEAD~1
+	) &&
+	(cd super &&
+	 (cd submodule &&
+	  compare_head
+	 ) &&
+	 git submodule update submodule &&
+	 cd submodule &&
+	 ! compare_head
+	)
+
+HEAD is now at 0c90624 upstream
+Submodule path 'submodule': checked out '4301fd3e4110d3b6212c19aed3094150392545b9'
+ok 2 - submodule update detaching the HEAD 
+
+expecting success: 
+	(cd super/submodule &&
+	 git reset --hard HEAD~1
+	) &&
+	mkdir super/sub &&
+	(cd super/sub &&
+	 (cd ../submodule &&
+	  compare_head
+	 ) &&
+	 git submodule update ../submodule &&
+	 cd ../submodule &&
+	 ! compare_head
+	)
+
+HEAD is now at 0c90624 upstream
+Submodule path '../submodule': checked out '4301fd3e4110d3b6212c19aed3094150392545b9'
+ok 3 - submodule update from subdirectory
+
+expecting success: 
+	git -C recursivesuper/super reset --hard HEAD^ &&
+	(cd recursivesuper &&
+	 mkdir tmp &&
+	 cd tmp &&
+	 git submodule update --init --recursive ../super >../../actual 2>../../actual2
+	) &&
+	test_i18ncmp expect actual &&
+	sort actual2 >actual2.sorted &&
+	test_i18ncmp expect2 actual2.sorted
+
+HEAD is now at 7cb8417 rebasing
+ok 4 - submodule update --init --recursive from subdirectory
+
+expecting success: 
+	git init withsubs &&
+	(cd withsubs &&
+	 mkdir foo &&
+	 git submodule add "$(pwd)/../rebasing" foo/sub &&
+	 (cd foo &&
+	  git submodule deinit -f sub &&
+	  git submodule update --init sub 2>../../actual2
+	 )
+	) &&
+	test_i18ncmp expect2 actual2
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7406-submodule-update/withsubs/.git/
+Cloning into '/build/git-2.20.1/t/trash directory.t7406-submodule-update/withsubs/foo/sub'...
+done.
+Cleared directory 'sub'
+Submodule 'foo/sub' (/build/git-2.20.1/t/trash directory.t7406-submodule-update/withsubs/../rebasing) unregistered for path 'sub'
+Submodule path 'sub': checked out '0c90624ab7f1aaa301d3bb79f60dcfed1ec4897f'
+ok 5 - submodule update --init from and of subdirectory
+
+expecting success: 
+	(cd submodule &&
+	  echo line3 >> file &&
+	  git add file &&
+	  test_tick &&
+	  git commit -m "upstream line3"
+	) &&
+	(cd super/submodule &&
+	  head=$(git rev-parse --verify HEAD) &&
+	  echo "Submodule path ${apos}submodule$apos: checked out $apos$head$apos" > ../../expected &&
+	  git reset --hard HEAD~1
+	) &&
+	(cd super &&
+	  git submodule update > ../actual 2> ../actual.err
+	) &&
+	test_i18ncmp expected actual &&
+	test_must_be_empty actual.err
+
+[master 820877d] upstream line3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+HEAD is now at 0c90624 upstream
+ok 6 - submodule update does not fetch already present commits
+
+expecting success: 
+	(cd super/submodule &&
+	 git reset --hard HEAD~1 &&
+	 echo "local change" > file
+	) &&
+	(cd super &&
+	 (cd submodule &&
+	  compare_head
+	 ) &&
+	 test_must_fail git submodule update submodule
+	)
+
+HEAD is now at 0c90624 upstream
+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
+Unable to checkout '4301fd3e4110d3b6212c19aed3094150392545b9' in submodule path 'submodule'
+ok 7 - submodule update should fail due to local changes
+
+expecting success: 
+	(cd super &&
+	 (cd submodule &&
+	  compare_head
+	 ) &&
+	 git submodule update --force submodule &&
+	 cd submodule &&
+	 ! compare_head
+	)
+
+Submodule path 'submodule': checked out '4301fd3e4110d3b6212c19aed3094150392545b9'
+ok 8 - submodule update should throw away changes with --force 
+
+expecting success: 
+	(cd super &&
+	 (cd submodule &&
+	  rm -f file
+	 ) &&
+	 git submodule update --force submodule &&
+	 (cd submodule &&
+	  test "$(git status -s file)" = ""
+	 )
+	)
+
+Submodule path 'submodule': checked out '4301fd3e4110d3b6212c19aed3094150392545b9'
+ok 9 - submodule update --force forcibly checks out submodules
+
+expecting success: 
+	(cd submodule &&
+	 echo line4 >> file &&
+	 git add file &&
+	 test_tick &&
+	 git commit -m "upstream line4"
+	) &&
+	(cd super &&
+	 git submodule update --remote --force submodule &&
+	 cd submodule &&
+	 test "$(git log -1 --oneline)" = "$(GIT_DIR=../../submodule/.git git log -1 --oneline)"
+	)
+
+[master 6355002] upstream line4
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+From /build/git-2.20.1/t/trash directory.t7406-submodule-update/submodule
+   4301fd3..6355002  master     -> origin/master
+Submodule path 'submodule': checked out '63550025de24fe5dc1a12e7b0c6d73ec59137ab7'
+ok 10 - submodule update --remote should fetch upstream changes
+
 expecting success: 
-	mkdir import &&
 	(
-		cd import &&
-		echo hello >readme &&
-		svn_cmd import -m "initial" . "$svnrepo"
+		cd super &&
+		git config -f .gitmodules submodule."submodule".branch "." &&
+		git add .gitmodules &&
+		git commit -m "submodules: update from the respective superproject branch"
 	) &&
-	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) 4fcc8fd] initial
+	(
+		cd submodule &&
+		echo line4a >> file &&
+		git add file &&
+		test_tick &&
+		git commit -m "upstream line4a" &&
+		git checkout -b test-branch &&
+		test_commit on-test-branch
+	) &&
+	(
+		cd super &&
+		git submodule update --remote --force submodule &&
+		git -C submodule log -1 --oneline >actual &&
+		git -C ../submodule log -1 --oneline master >expect &&
+		test_cmp expect actual &&
+		git checkout -b test-branch &&
+		git submodule update --remote --force submodule &&
+		git -C submodule log -1 --oneline >actual &&
+		git -C ../submodule log -1 --oneline test-branch >expect &&
+		test_cmp expect actual &&
+		git checkout master &&
+		git branch -d test-branch &&
+		git reset --hard HEAD^
+	)
+
+[master 3ce6992] submodules: update from the respective superproject branch
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 readme
-[master d77b128] another
+[master b0b6cde] upstream line4a
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-ok 1 - initialize repo
+Switched to a new branch 'test-branch'
+[test-branch c326505] on-test-branch
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 on-test-branch.t
+From /build/git-2.20.1/t/trash directory.t7406-submodule-update/submodule
+   6355002..b0b6cde  master         -> origin/master
+ * [new branch]      test-branch    -> origin/test-branch
+ * [new tag]         on-test-branch -> on-test-branch
+Submodule path 'submodule': checked out 'b0b6cdeaf939e317dabcdecfa7ee099e17b520e8'
+Switched to a new branch 'test-branch'
+M	submodule
+Submodule path 'submodule': checked out 'c3265059a95726b1f19f9ee98d3c9f4835e09e8f'
+Switched to branch 'master'
+M	submodule
+Your branch is ahead of 'origin/master' by 6 commits.
+  (use "git push" to publish your local commits)
+Deleted branch test-branch (was 3ce6992).
+HEAD is now at e1c6586 none
+ok 11 - submodule update --remote should fetch upstream changes with .
 
 expecting success: 
-	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
+	(cd submodule &&
+	 git checkout test-branch &&
+	 echo line5 >> file &&
+	 git add file &&
+	 test_tick &&
+	 git commit -m "upstream line5" &&
+	 git checkout master
+	) &&
+	(cd super &&
+	 git config submodule.submodule.branch test-branch &&
+	 git submodule update --remote --force submodule &&
+	 cd submodule &&
+	 test "$(git log -1 --oneline)" = "$(GIT_DIR=../../submodule/.git git log -1 --oneline test-branch)"
+	)
+
+Already on 'test-branch'
+[test-branch e396f16] upstream line5
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Switched to branch 'master'
+Your branch is ahead of 'origin/master' by 4 commits.
+  (use "git push" to publish your local commits)
+From /build/git-2.20.1/t/trash directory.t7406-submodule-update/submodule
+   c326505..e396f16  test-branch -> origin/test-branch
+Submodule path 'submodule': checked out 'e396f163e62f5fbe39de2f6bd37bf79618268b5c'
+ok 12 - local config should override .gitmodules branch
 
 expecting success: 
-	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/git-2.20.1/t/trash%20directory.t9105-git-svn-commit-diff/svnrepo/subdir => file:///build/git-2.20.1/t/trash%20directory.t9105-git-svn-commit-diff/svnrepo
-	A	readme
-r3 = e538786dc517c4582dae44141af5ccf72d631420 (refs/remotes/git-svn)
-	M	readme
-Committed r4
-ok 3 - commit-diff to a sub-directory (with git svn config)
+	(cd super/submodule &&
+	  git checkout master
+	) &&
+	(cd super &&
+	 (cd submodule &&
+	  compare_head
+	 ) &&
+	 git submodule update --rebase submodule &&
+	 cd submodule &&
+	 compare_head
+	)
+
+Previous HEAD position was e396f16 upstream line5
+Switched to branch 'master'
+Your branch is behind 'origin/master' by 4 commits, and can be fast-forwarded.
+  (use "git pull" to update your local branch)
+First, rewinding head to replay your work on top of it...
+Fast-forwarded master to 4301fd3e4110d3b6212c19aed3094150392545b9.
+Submodule path 'submodule': rebased into '4301fd3e4110d3b6212c19aed3094150392545b9'
+ok 13 - submodule update --rebase staying on master
+
+expecting success: 
+	(cd super/submodule &&
+	  git reset --hard HEAD~1
+	) &&
+	(cd super &&
+	 (cd submodule &&
+	  compare_head
+	 ) &&
+	 git submodule update --merge submodule &&
+	 cd submodule &&
+	 compare_head
+	)
+
+HEAD is now at 0c90624 upstream
+Updating 0c90624..4301fd3
+Fast-forward
+ file | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Submodule path 'submodule': merged in '4301fd3e4110d3b6212c19aed3094150392545b9'
+ok 14 - submodule update --merge staying on master
+
+expecting success: 
+	(cd super &&
+	 git config submodule.submodule.update rebase
+	) &&
+	(cd super/submodule &&
+	  git reset --hard HEAD~1
+	) &&
+	(cd super &&
+	 (cd submodule &&
+	  compare_head
+	 ) &&
+	 git submodule update submodule &&
+	 cd submodule &&
+	 compare_head
+	)
+
+HEAD is now at 0c90624 upstream
+First, rewinding head to replay your work on top of it...
+Fast-forwarded master to 4301fd3e4110d3b6212c19aed3094150392545b9.
+Submodule path 'submodule': rebased into '4301fd3e4110d3b6212c19aed3094150392545b9'
+ok 15 - submodule update - rebase in .git/config
+
+expecting success: 
+	(cd super &&
+	 git config submodule.submodule.update checkout
+	) &&
+	(cd super/submodule &&
+	  git reset --hard HEAD~1
+	) &&
+	(cd super &&
+	 (cd submodule &&
+	  compare_head
+	 ) &&
+	 git submodule update --rebase submodule &&
+	 cd submodule &&
+	 compare_head
+	)
+
+HEAD is now at 0c90624 upstream
+First, rewinding head to replay your work on top of it...
+Fast-forwarded master to 4301fd3e4110d3b6212c19aed3094150392545b9.
+Submodule path 'submodule': rebased into '4301fd3e4110d3b6212c19aed3094150392545b9'
+ok 16 - submodule update - checkout in .git/config but --rebase given
+
+expecting success: 
+	(cd super &&
+	 git config submodule.submodule.update merge
+	) &&
+	(cd super/submodule &&
+	  git reset --hard HEAD~1
+	) &&
+	(cd super &&
+	 (cd submodule &&
+	  compare_head
+	 ) &&
+	 git submodule update submodule &&
+	 cd submodule &&
+	 compare_head
+	)
+
+HEAD is now at 0c90624 upstream
+Updating 0c90624..4301fd3
+Fast-forward
+ file | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Submodule path 'submodule': merged in '4301fd3e4110d3b6212c19aed3094150392545b9'
+ok 17 - submodule update - merge in .git/config
+
+expecting success: 
+	(cd super &&
+	 git config submodule.submodule.update checkout
+	) &&
+	(cd super/submodule &&
+	  git reset --hard HEAD~1
+	) &&
+	(cd super &&
+	 (cd submodule &&
+	  compare_head
+	 ) &&
+	 git submodule update --merge submodule &&
+	 cd submodule &&
+	 compare_head
+	)
+
+HEAD is now at 0c90624 upstream
+Updating 0c90624..4301fd3
+Fast-forward
+ file | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Submodule path 'submodule': merged in '4301fd3e4110d3b6212c19aed3094150392545b9'
+ok 18 - submodule update - checkout in .git/config but --merge given
+
+expecting success: 
+	(cd super &&
+	 git config submodule.submodule.update checkout
+	) &&
+	(cd super/submodule &&
+	  git reset --hard HEAD^
+	) &&
+	(cd super &&
+	 (cd submodule &&
+	  compare_head
+	 ) &&
+	 git submodule update submodule &&
+	 cd submodule &&
+	 ! compare_head
+	)
+
+HEAD is now at 0c90624 upstream
+Submodule path 'submodule': checked out '4301fd3e4110d3b6212c19aed3094150392545b9'
+ok 19 - submodule update - checkout in .git/config
+
+expecting success: 
+	(cd super &&
+	 git config submodule.submodule.update "!git checkout"
+	) &&
+	(cd super/submodule &&
+	  git reset --hard HEAD^
+	) &&
+	(cd super &&
+	 (cd submodule &&
+	  compare_head
+	 ) &&
+	 git submodule update submodule &&
+	 cd submodule &&
+	 ! compare_head
+	)
+
+HEAD is now at 0c90624 upstream
+Previous HEAD position was 0c90624 upstream
+HEAD is now at 4301fd3 Commit 2
+Submodule path 'submodule': 'git checkout 4301fd3e4110d3b6212c19aed3094150392545b9'
+ok 20 - submodule update - command in .git/config
+
+expecting success: 
+	test_when_finished "git -C super reset --hard HEAD^" &&
+	git -C super config -f .gitmodules submodule.submodule.update "!false" &&
+	git -C super commit -a -m "add command to .gitmodules file" &&
+	git -C super/submodule reset --hard $submodulesha1^ &&
+	test_must_fail git -C super submodule update submodule
+
+[master 943703a] add command to .gitmodules file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+HEAD is now at 0c90624 upstream
+fatal: invalid value for submodule.submodule.update
+HEAD is now at e1c6586 none
+ok 21 - submodule update - command in .gitmodules is rejected
+
+expecting success: 
+	git init command-in-gitmodules &&
+	(
+		cd command-in-gitmodules &&
+		git submodule add ../submodule submodule &&
+		test_commit adding-submodule &&
+
+		git config -f .gitmodules submodule.submodule.update "!false" &&
+		git add .gitmodules &&
+		test_commit configuring-update &&
+		test_must_fail git fsck
+	)
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7406-submodule-update/command-in-gitmodules/.git/
+Cloning into '/build/git-2.20.1/t/trash directory.t7406-submodule-update/command-in-gitmodules/submodule'...
+done.
+[master (root-commit) e9e4b27] adding-submodule
+ Author: A U Thor <author@example.com>
+ 3 files changed, 5 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 100644 adding-submodule.t
+ create mode 160000 submodule
+[master ab1e31c] configuring-update
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 configuring-update.t
+error in blob 34075c13cf76fa2281e921a63acb1c52594ee0a0: gitmodulesUpdate: disallowed submodule update setting: !false
+ok 22 - fsck detects command in .gitmodules
+
+expecting success: 
+	(cd super &&
+	 git config submodule.submodule.update "!false"
+	) &&
+	(cd super/submodule &&
+	  git reset --hard $submodulesha1^
+	) &&
+	(cd super &&
+	 test_must_fail git submodule update submodule 2>../actual
+	) &&
+	test_i18ncmp actual expect
+
+HEAD is now at 0c90624 upstream
+ok 23 - submodule update - command in .git/config catches failure
+
+expecting success: 
+	(cd super &&
+	 git config submodule.submodule.update "!false"
+	) &&
+	(cd super/submodule &&
+	  git reset --hard $submodulesha1^
+	) &&
+	(cd super &&
+	 mkdir tmp && cd tmp &&
+	 test_must_fail git submodule update ../submodule 2>../../actual
+	) &&
+	test_i18ncmp actual expect
+
+HEAD is now at 0c90624 upstream
+ok 24 - submodule update - command in .git/config catches failure -- subdirectory
+
+expecting success: 
+	cat >expect <<-EOF &&
+	Execution of 'false $submodulesha1' failed in submodule path 'submodule'
+	EOF
+	rm -rf super/submodule &&
+	test_must_fail git -C super submodule update 2>actual &&
+	test_i18ncmp expect actual &&
+	git -C super submodule update --checkout
+
+Submodule path 'submodule': checked out '4301fd3e4110d3b6212c19aed3094150392545b9'
+ok 25 - submodule update - command run for initial population of submodule
+
+expecting success: 
+	(cd recursivesuper &&
+	 git submodule update --remote super &&
+	 git add super &&
+	 git commit -m "update to latest to have more than one commit in submodules"
+	) &&
+	git -C recursivesuper/super config submodule.submodule.update "!false" &&
+	git -C recursivesuper/super/submodule reset --hard $submodulesha1^ &&
+	(cd recursivesuper &&
+	 mkdir -p tmp && cd tmp &&
+	 test_must_fail git submodule update --recursive ../super 2>../../actual
+	) &&
+	test_i18ncmp actual expect
+
+[master a3db8ed] update to latest to have more than one commit in submodules
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 super
+HEAD is now at 0c90624 upstream
+ok 26 - recursive submodule update - command in .git/config catches failure -- subdirectory
+
+expecting success: 
+	test_when_finished "git -C super update-index --force-remove submodule1" &&
+	test_when_finished git config -f super/.gitmodules \
+		--remove-section submodule.submodule1 &&
+	(cd super &&
+	 git ls-files -s submodule >out &&
+	 H=$(cut -d" " -f2 out) &&
+	 mkdir submodule1 &&
+	 git update-index --add --cacheinfo 160000 $H submodule1 &&
+	 git config -f .gitmodules submodule.submodule1.path submodule1 &&
+	 git config -f .gitmodules submodule.submodule1.url ../submodule &&
+	 git config -f .gitmodules submodule.submodule1.update !false &&
+	 test_must_fail git submodule init submodule1 &&
+	 test_expect_code 1 git config submodule.submodule1.update >actual &&
+	 test_must_be_empty actual
+	)
+
+fatal: invalid value for submodule.submodule1.update
+ok 27 - submodule init does not copy command into .git/config
+
+expecting success: 
+	(cd super &&
+	 git config -f .gitmodules submodule.rebasing.update rebase &&
+	 git submodule init rebasing &&
+	 test "rebase" = "$(git config submodule.rebasing.update)"
+	)
+
+ok 28 - submodule init picks up rebase
+
+expecting success: 
+	(cd super &&
+	 git config -f .gitmodules submodule.merging.update merge &&
+	 git submodule init merging &&
+	 test "merge" = "$(git config submodule.merging.update)"
+	)
+
+ok 29 - submodule init picks up merge
+
+expecting success: 
+	test_config -C super submodule.submodule.update checkout &&
+	(cd super &&
+	 rm -rf submodule &&
+	 git submodule update submodule &&
+	 git status -s submodule >expect &&
+	 rm -rf submodule &&
+	 git submodule update --merge submodule &&
+	 git status -s submodule >actual &&
+	 test_cmp expect actual
+	)
+
+Submodule path 'submodule': checked out '4301fd3e4110d3b6212c19aed3094150392545b9'
+Submodule path 'submodule': checked out '4301fd3e4110d3b6212c19aed3094150392545b9'
+ok 30 - submodule update --merge  - ignores --merge  for new submodules
+
+expecting success: 
+	test_config -C super submodule.submodule.update checkout &&
+	(cd super &&
+	 rm -rf submodule &&
+	 git submodule update submodule &&
+	 git status -s submodule >expect &&
+	 rm -rf submodule &&
+	 git submodule update --rebase submodule &&
+	 git status -s submodule >actual &&
+	 test_cmp expect actual
+	)
+
+Submodule path 'submodule': checked out '4301fd3e4110d3b6212c19aed3094150392545b9'
+Submodule path 'submodule': checked out '4301fd3e4110d3b6212c19aed3094150392545b9'
+ok 31 - submodule update --rebase - ignores --rebase for new submodules
+
+expecting success: 
+	(cd super &&
+	 rm -rf submodule &&
+	 git submodule update submodule &&
+	 git status -s submodule >expect &&
+	 rm -rf submodule &&
+	 git config submodule.submodule.update merge &&
+	 git submodule update submodule &&
+	 git status -s submodule >actual &&
+	 git config --unset submodule.submodule.update &&
+	 test_cmp expect actual
+	)
+
+Submodule path 'submodule': checked out '4301fd3e4110d3b6212c19aed3094150392545b9'
+Submodule path 'submodule': checked out '4301fd3e4110d3b6212c19aed3094150392545b9'
+ok 32 - submodule update ignores update=merge config for new submodules
+
+expecting success: 
+	(cd super &&
+	 rm -rf submodule &&
+	 git submodule update submodule &&
+	 git status -s submodule >expect &&
+	 rm -rf submodule &&
+	 git config submodule.submodule.update rebase &&
+	 git submodule update submodule &&
+	 git status -s submodule >actual &&
+	 git config --unset submodule.submodule.update &&
+	 test_cmp expect actual
+	)
+
+Submodule path 'submodule': checked out '4301fd3e4110d3b6212c19aed3094150392545b9'
+Submodule path 'submodule': checked out '4301fd3e4110d3b6212c19aed3094150392545b9'
+ok 33 - submodule update ignores update=rebase config for new submodules
+
+expecting success: 
+	(cd super &&
+	 git config -f .gitmodules submodule.none.update none &&
+	 git submodule init none &&
+	 test "none" = "$(git config submodule.none.update)"
+	)
+
+ok 34 - submodule init picks up update=none
+
+expecting success: 
+	(cd super &&
+	 git config submodule.submodule.update none &&
+	 (cd submodule &&
+	  git checkout master &&
+	  compare_head
+	 ) &&
+	 git diff --name-only >out &&
+	 grep ^submodule$ out &&
+	 git submodule update &&
+	 git diff --name-only >out &&
+	 grep ^submodule$ out &&
+	 (cd submodule &&
+	  compare_head
+	 ) &&
+	 git config --unset submodule.submodule.update &&
+	 git submodule update submodule
+	)
+
+Previous HEAD position was 4301fd3 Commit 2
+Switched to branch 'master'
+Your branch is behind 'origin/master' by 4 commits, and can be fast-forwarded.
+  (use "git pull" to update your local branch)
+submodule
+Skipping submodule 'none'
+Skipping submodule 'submodule'
+submodule
+Submodule path 'submodule': checked out '4301fd3e4110d3b6212c19aed3094150392545b9'
+ok 35 - submodule update - update=none in .git/config
+
+expecting success: 
+	(cd super &&
+	 git config submodule.submodule.update none &&
+	 (cd submodule &&
+	  git checkout master &&
+	  compare_head
+	 ) &&
+	 git diff --name-only >out &&
+	 grep ^submodule$ out &&
+	 git submodule update --checkout &&
+	 git diff --name-only >out &&
+	 ! grep ^submodule$ out &&
+	 (cd submodule &&
+	  ! compare_head
+	 ) &&
+	 git config --unset submodule.submodule.update
+	)
+
+Previous HEAD position was 4301fd3 Commit 2
+Switched to branch 'master'
+Your branch is behind 'origin/master' by 4 commits, and can be fast-forwarded.
+  (use "git pull" to update your local branch)
+submodule
+Submodule path 'submodule': checked out '4301fd3e4110d3b6212c19aed3094150392545b9'
+ok 36 - submodule update - update=none in .git/config but --checkout given
+
+expecting success: 
+	(cd super &&
+	 git add .gitmodules &&
+	 git commit -m ".gitmodules"
+	) &&
+	git clone super cloned &&
+	(cd cloned &&
+	 git submodule update --init &&
+	 test_path_exists submodule/.git &&
+	 test_path_is_missing none/.git
+	)
+
+[master 856277d] .gitmodules
+ Author: A U Thor <author@example.com>
+ 1 file changed, 3 insertions(+)
+Cloning into 'cloned'...
+done.
+Submodule 'merging' (/build/git-2.20.1/t/trash directory.t7406-submodule-update/merging) registered for path 'merging'
+Submodule 'none' (/build/git-2.20.1/t/trash directory.t7406-submodule-update/none) registered for path 'none'
+Submodule 'rebasing' (/build/git-2.20.1/t/trash directory.t7406-submodule-update/rebasing) registered for path 'rebasing'
+Submodule 'submodule' (/build/git-2.20.1/t/trash directory.t7406-submodule-update/submodule) registered for path 'submodule'
+Cloning into '/build/git-2.20.1/t/trash directory.t7406-submodule-update/cloned/merging'...
+done.
+Cloning into '/build/git-2.20.1/t/trash directory.t7406-submodule-update/cloned/submodule'...
+done.
+Skipping submodule 'none'
+Cloning into '/build/git-2.20.1/t/trash directory.t7406-submodule-update/cloned/rebasing'...
+done.
+Submodule path 'merging': checked out '0c90624ab7f1aaa301d3bb79f60dcfed1ec4897f'
+Submodule path 'rebasing': checked out '0c90624ab7f1aaa301d3bb79f60dcfed1ec4897f'
+Submodule path 'submodule': checked out '4301fd3e4110d3b6212c19aed3094150392545b9'
+ok 37 - submodule update --init skips submodule with update=none
+
+expecting success: 
+	(cd super &&
+	 git reset --hard HEAD &&
+	 git submodule add ../submodule submodule2 &&
+	 git submodule init &&
+	 git commit -am "new_submodule" &&
+	 (cd submodule2 &&
+	  git rev-parse --verify HEAD >../expect
+	 ) &&
+	 (cd submodule &&
+	  test_commit "update_submodule" file
+	 ) &&
+	 (cd submodule2 &&
+	  test_commit "update_submodule2" file
+	 ) &&
+	 git add submodule &&
+	 git add submodule2 &&
+	 git commit -m "two_new_submodule_commits" &&
+	 (cd submodule &&
+	  echo "" > file
+	 ) &&
+	 git checkout HEAD^ &&
+	 test_must_fail git submodule update &&
+	 (cd submodule2 &&
+	  git rev-parse --verify HEAD >../actual
+	 ) &&
+	 test_cmp expect actual
+	)
+
+HEAD is now at 856277d .gitmodules
+Cloning into '/build/git-2.20.1/t/trash directory.t7406-submodule-update/super/submodule2'...
+done.
+[master d261494] new_submodule
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 160000 submodule2
+[detached HEAD 83199b0] update_submodule
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[master 8dc4de1] update_submodule2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+[master 9bb2d46] two_new_submodule_commits
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+Note: checking out '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 performing another checkout.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -b with the checkout command again. Example:
+
+  git checkout -b <new-branch-name>
+
+HEAD is now at d261494 new_submodule
+M	submodule
+M	submodule2
+Skipping submodule 'none'
+error: Your local changes to the following files would be overwritten by checkout:
+	file
+Please commit your changes or stash them before you switch branches.
+Aborting
+Submodule path 'submodule2': checked out 'b0b6cdeaf939e317dabcdecfa7ee099e17b520e8'
+Unable to checkout '4301fd3e4110d3b6212c19aed3094150392545b9' in submodule path 'submodule'
+ok 38 - submodule update continues after checkout error
+
+expecting success: 
+	(cd super &&
+	 git reset --hard HEAD &&
+	 git checkout master &&
+	 git submodule update &&
+	 (cd submodule &&
+	  git submodule add ../submodule subsubmodule &&
+	  git submodule init &&
+	  git commit -m "new_subsubmodule"
+	 ) &&
+	 git add submodule &&
+	 git commit -m "update_submodule" &&
+	 (cd submodule &&
+	  (cd subsubmodule &&
+	   test_commit "update_subsubmodule" file
+	  ) &&
+	  git add subsubmodule &&
+	  test_commit "update_submodule_again" file &&
+	  (cd subsubmodule &&
+	   test_commit "update_subsubmodule_again" file
+	  ) &&
+	  test_commit "update_submodule_again_again" file
+	 ) &&
+	 (cd submodule2 &&
+	  git rev-parse --verify HEAD >../expect &&
+	  test_commit "update_submodule2_again" file
+	 ) &&
+	 git add submodule &&
+	 git add submodule2 &&
+	 git commit -m "new_commits" &&
+	 git checkout HEAD^ &&
+	 (cd submodule &&
+	  git checkout HEAD^ &&
+	  (cd subsubmodule &&
+	   echo "" > file
+	  )
+	 ) &&
+	 test_must_fail git submodule update --recursive &&
+	 (cd submodule2 &&
+	  git rev-parse --verify HEAD >../actual
+	 ) &&
+	 test_cmp expect actual
+	)
+
+HEAD is now at d261494 new_submodule
+Previous HEAD position was d261494 new_submodule
+Switched to branch 'master'
+M	submodule
+M	submodule2
+Your branch is ahead of 'origin/master' by 8 commits.
+  (use "git push" to publish your local commits)
+Skipping submodule 'none'
+Submodule path 'submodule2': checked out '8dc4de1dc365211781d03828f944165cc86d7a98'
+Cloning into '/build/git-2.20.1/t/trash directory.t7406-submodule-update/super/submodule/subsubmodule'...
+done.
+[detached HEAD 043bc58] new_subsubmodule
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 subsubmodule
+[master b91cc26] update_submodule
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[master c3ee4ca] update_subsubmodule
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+[detached HEAD f306cbe] update_submodule_again
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+[master 8e13b9e] update_subsubmodule_again
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[detached HEAD c412560] update_submodule_again_again
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[detached HEAD 49d2396] update_submodule2_again
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[master 664863f] new_commits
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+Note: checking out '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 performing another checkout.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -b with the checkout command again. Example:
+
+  git checkout -b <new-branch-name>
+
+HEAD is now at b91cc26 update_submodule
+M	submodule
+M	submodule2
+Previous HEAD position was c412560 update_submodule_again_again
+HEAD is now at f306cbe update_submodule_again
+M	subsubmodule
+Skipping submodule 'none'
+Submodule path 'submodule': checked out '043bc58326b64f6ed86c060b72707767701d8437'
+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
+Unable to checkout 'b0b6cdeaf939e317dabcdecfa7ee099e17b520e8' in submodule path 'submodule/subsubmodule'
+Submodule path 'submodule2': checked out '8dc4de1dc365211781d03828f944165cc86d7a98'
+Failed to recurse into submodule path 'submodule'
+ok 39 - submodule update continues after recursive checkout error
+
+expecting success: 
+	(cd super &&
+	 git checkout master &&
+	 git reset --hard HEAD &&
+	 (cd submodule &&
+	  (cd subsubmodule &&
+	   git reset --hard HEAD
+	  )
+	 ) &&
+	 git submodule update --recursive &&
+	 (cd submodule &&
+	  test_commit "update_submodule_2" file
+	 ) &&
+	 (cd submodule2 &&
+	  test_commit "update_submodule2_2" file
+	 ) &&
+	 git add submodule &&
+	 git add submodule2 &&
+	 git commit -m "two_new_submodule_commits" &&
+	 (cd submodule &&
+	  git checkout master &&
+	  test_commit "conflict" file &&
+	  echo "conflict" > file
+	 ) &&
+	 git checkout HEAD^ &&
+	 (cd submodule2 &&
+	  git rev-parse --verify HEAD >../expect
+	 ) &&
+	 git config submodule.submodule.update merge &&
+	 test_must_fail git submodule update &&
+	 (cd submodule2 &&
+	  git rev-parse --verify HEAD >../actual
+	 ) &&
+	 test_cmp expect actual
+	)
+
+Previous HEAD position was b91cc26 update_submodule
+Switched to branch 'master'
+M	submodule
+M	submodule2
+Your branch is ahead of 'origin/master' by 10 commits.
+  (use "git push" to publish your local commits)
+HEAD is now at 664863f new_commits
+HEAD is now at 8e13b9e update_subsubmodule_again
+Skipping submodule 'none'
+Submodule path 'submodule': checked out 'c412560ec4b0712c06d4a914c8e3483f5650d569'
+Submodule path 'submodule/subsubmodule': checked out 'c3ee4ca43a6bcb7b5233ba2ca7e2c8adf5ffdfbd'
+Submodule path 'submodule2': checked out '49d2396b9c5ba1bfa95b0db5a1e98a4b8dd73b7c'
+[detached HEAD 72dc65f] update_submodule_2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[detached HEAD 2e0306e] update_submodule2_2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[master b1cb70d] two_new_submodule_commits
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+warning: unable to rmdir 'subsubmodule': Directory not empty
+Previous HEAD position was 72dc65f update_submodule_2
+Switched to branch 'master'
+Your branch is behind 'origin/master' by 4 commits, and can be fast-forwarded.
+  (use "git pull" to update your local branch)
+[master 08cc343] conflict
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Note: checking out '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 performing another checkout.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -b with the checkout command again. Example:
+
+  git checkout -b <new-branch-name>
+
+HEAD is now at 664863f new_commits
+M	submodule
+M	submodule2
+Skipping submodule 'none'
+Merging:
+08cc343 conflict
+virtual c412560ec4b0712c06d4a914c8e3483f5650d569
+found 1 common ancestor:
+0c90624 upstream
+Auto-merging file
+CONFLICT (content): Merge conflict in file
+Automatic merge failed; fix conflicts and then commit the result.
+Unable to merge 'c412560ec4b0712c06d4a914c8e3483f5650d569' in submodule path 'submodule'
+ok 40 - submodule update exit immediately in case of merge conflict
+
+expecting success: 
+	(cd super &&
+	 git checkout master &&
+	 git reset --hard HEAD &&
+	 (cd submodule &&
+	  git reset --hard HEAD &&
+	  git submodule update --recursive
+	 ) &&
+	 (cd submodule &&
+	  test_commit "update_submodule_3" file
+	 ) &&
+	 (cd submodule2 &&
+	  test_commit "update_submodule2_3" file
+	 ) &&
+	 git add submodule &&
+	 git add submodule2 &&
+	 git commit -m "two_new_submodule_commits" &&
+	 (cd submodule &&
+	  git checkout master &&
+	  test_commit "conflict2" file &&
+	  echo "conflict" > file
+	 ) &&
+	 git checkout HEAD^ &&
+	 (cd submodule2 &&
+	  git rev-parse --verify HEAD >../expect
+	 ) &&
+	 git config submodule.submodule.update rebase &&
+	 test_must_fail git submodule update &&
+	 (cd submodule2 &&
+	  git rev-parse --verify HEAD >../actual
+	 ) &&
+	 test_cmp expect actual
+	)
+
+Previous HEAD position was 664863f new_commits
+Switched to branch 'master'
+M	submodule
+Your branch is ahead of 'origin/master' by 11 commits.
+  (use "git push" to publish your local commits)
+HEAD is now at b1cb70d two_new_submodule_commits
+warning: unable to rmdir 'subsubmodule': Directory not empty
+HEAD is now at 08cc343 conflict
+[master 85c1732] update_submodule_3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[detached HEAD 88bf62e] update_submodule2_3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[master 3a98345] two_new_submodule_commits
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+Already on 'master'
+Your branch and 'origin/master' have diverged,
+and have 2 and 4 different commits each, respectively.
+  (use "git pull" to merge the remote branch into yours)
+[master 10845e8] conflict2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Note: checking out '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 performing another checkout.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -b with the checkout command again. Example:
+
+  git checkout -b <new-branch-name>
+
+HEAD is now at b1cb70d two_new_submodule_commits
+M	submodule
+M	submodule2
+Skipping submodule 'none'
+error: cannot rebase: You have unstaged changes.
+error: Please commit or stash them.
+Unable to rebase '72dc65ffc818dbfc1fc7a18b36ab97538db4c5f8' in submodule path 'submodule'
+ok 41 - submodule update exit immediately after recursive rebase error
+
+expecting success: 
+	(cd super &&
+	 git submodule add ../submodule s1 &&
+	 test_must_fail git submodule add ../merging s1
+	)
+
+Cloning into '/build/git-2.20.1/t/trash directory.t7406-submodule-update/super/s1'...
+done.
+'s1' already exists in the index
+ok 42 - add different submodules to the same path
+
+expecting success: 
+	(cd super &&
+	 mkdir deeper &&
+	 git submodule add ../submodule deeper/submodule &&
+	 (cd deeper/submodule &&
+	  git log > ../../expected
+	 ) &&
+	 (cd .git/modules/deeper/submodule &&
+	  git log > ../../../../actual
+	 ) &&
+	 test_cmp expected actual
+	)
+
+Cloning into '/build/git-2.20.1/t/trash directory.t7406-submodule-update/super/deeper/submodule'...
+done.
+ok 43 - submodule add places git-dir in superprojects git-dir
+
+expecting success: 
+	(cd super &&
+	 git commit -m "added submodule"
+	) &&
+	git clone super super2 &&
+	(cd super2 &&
+	 git submodule init deeper/submodule &&
+	 git submodule update &&
+	 (cd deeper/submodule &&
+	  git log > ../../expected
+	 ) &&
+	 (cd .git/modules/deeper/submodule &&
+	  git log > ../../../../actual
+	 ) &&
+	 test_cmp expected actual
+	)
+
+[detached HEAD 6857011] 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: checking out '68570117d0ae9a128a018881fbc8c0b7ca51de67'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by performing another checkout.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -b with the checkout command again. Example:
+
+  git checkout -b <new-branch-name>
+
+Submodule 'deeper/submodule' (/build/git-2.20.1/t/trash directory.t7406-submodule-update/submodule) registered for path 'deeper/submodule'
+Cloning into '/build/git-2.20.1/t/trash directory.t7406-submodule-update/super2/deeper/submodule'...
+done.
+Skipping submodule 'none'
+Submodule path 'deeper/submodule': checked out 'b0b6cdeaf939e317dabcdecfa7ee099e17b520e8'
+ok 44 - submodule update places git-dir in superprojects git-dir
+
+expecting success: 
+	(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/git-2.20.1/t/trash directory.t7406-submodule-update/super2/deeper/submodule/subsubmodule'...
+done.
+[detached HEAD c234cdc] 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 f17dd01] update submodule
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Everything up-to-date
+ok 45 - submodule add places git-dir in superprojects git-dir recursive
+
+expecting success: 
+	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 master
+	) &&
+	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 master
+	) &&
+	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 master
+	) &&
+	rm -rf super_update_r2 &&
+	git clone super_update_r super_update_r2 &&
+	(cd super_update_r2 &&
+	 git submodule update --init --recursive >actual &&
+	 test_i18ngrep "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/git-2.20.1/t/trash directory.t7406-submodule-update/super_update_r/
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7406-submodule-update/subsuper_update_r/
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7406-submodule-update/subsubsuper_update_r/
+Cloning into 'subsubsuper_update_r2'...
+warning: You appear to have cloned an empty repository.
+done.
+[master (root-commit) e13bbd9] update_subsubsuper
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+To /build/git-2.20.1/t/trash directory.t7406-submodule-update/subsubsuper_update_r
+ * [new branch]      master -> master
+Cloning into 'subsuper_update_r2'...
+warning: You appear to have cloned an empty repository.
+done.
+[master (root-commit) 7cab57e] update_subsuper
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+Cloning into '/build/git-2.20.1/t/trash directory.t7406-submodule-update/subsuper_update_r2/subsubmodule'...
+done.
+[master 796fb1a] subsubmodule
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 subsubmodule
+To /build/git-2.20.1/t/trash directory.t7406-submodule-update/subsuper_update_r
+ * [new branch]      master -> master
+Cloning into 'super_update_r2'...
+warning: You appear to have cloned an empty repository.
+done.
+[master (root-commit) 489f12d] update_super
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+Cloning into '/build/git-2.20.1/t/trash directory.t7406-submodule-update/super_update_r2/submodule'...
+done.
+[master 8dc9f2e] submodule
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 submodule
+To /build/git-2.20.1/t/trash directory.t7406-submodule-update/super_update_r
+ * [new branch]      master -> master
+Cloning into 'super_update_r2'...
+done.
+Submodule 'submodule' (/build/git-2.20.1/t/trash directory.t7406-submodule-update/subsuper_update_r) registered for path 'submodule'
+Cloning into '/build/git-2.20.1/t/trash directory.t7406-submodule-update/super_update_r2/submodule'...
+done.
+Submodule 'subsubmodule' (/build/git-2.20.1/t/trash directory.t7406-submodule-update/subsubsuper_update_r) registered for path 'submodule/subsubmodule'
+Cloning into '/build/git-2.20.1/t/trash directory.t7406-submodule-update/super_update_r2/submodule/subsubmodule'...
+done.
+Submodule path 'submodule/subsubmodule': checked out 'e13bbd9c3df4762b3c846e1fb977b29be7746269'
+ok 46 - submodule update places git-dir in superprojects git-dir recursive
+
+expecting success: 
+	(cd super &&
+	 git reset --hard master &&
+	 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 3a98345 two_new_submodule_commits
+Reactivating local git directory for submodule 'deeper/submodule'.
+ok 47 - submodule add properly re-creates deeper level submodules
+
+expecting success: 
+	(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 4c7a6eb] 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 9e9ffb2] 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 '88bf62ef75633c13999647494b82e33847ce431f'
+ok 48 - submodule update properly revives a moved submodule
+
+checking prerequisite: SYMLINKS
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
+	# test whether the filesystem supports symbolic links
+	ln -s x y && test -h y
+
+)
+prerequisite SYMLINKS ok
+expecting success: 
+	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/git-2.20.1/t/trash directory.t7406-submodule-update/subsuper_update_r) registered for path 'submodule'
+Cloning into '/build/git-2.20.1/t/trash directory.t7406-submodule-update/linked/dir/super/submodule'...
+done.
+Submodule path 'submodule': checked out '796fb1a6484f5f6c560d10b7517c12bee8a9388a'
+Submodule 'subsubmodule' (/build/git-2.20.1/t/trash directory.t7406-submodule-update/subsubsuper_update_r) registered for path 'submodule/subsubmodule'
+Cloning into '/build/git-2.20.1/t/trash directory.t7406-submodule-update/linked/dir/super/submodule/subsubmodule'...
+done.
+Submodule path 'submodule/subsubmodule': checked out 'e13bbd9c3df4762b3c846e1fb977b29be7746269'
+ok 49 - submodule update can handle symbolic links in pwd
+
+expecting success: 
+	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/git-2.20.1/t/trash directory.t7406-submodule-update/merging) registered for path 'merging'
+Submodule 'none' (file:///build/git-2.20.1/t/trash directory.t7406-submodule-update/none) registered for path 'none'
+Submodule 'rebasing' (file:///build/git-2.20.1/t/trash directory.t7406-submodule-update/rebasing) registered for path 'rebasing'
+Submodule 'submodule' (file:///build/git-2.20.1/t/trash directory.t7406-submodule-update/submodule) registered for path 'submodule'
+Cloning into '/build/git-2.20.1/t/trash directory.t7406-submodule-update/super3/merging'...
+Skipping submodule 'none'
+Cloning into '/build/git-2.20.1/t/trash directory.t7406-submodule-update/super3/rebasing'...
+Cloning into '/build/git-2.20.1/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 50 - submodule update clone shallow submodule
+
+expecting success: 
+	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 &&
+		test_must_fail git submodule update --init --depth=1 2>actual &&
+		test_i18ngrep "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'
+Fetched in submodule path 'submodule', but it did not contain 4301fd3e4110d3b6212c19aed3094150392545b9. Direct fetching of that commit failed.
+Skipping submodule 'none'
+From file:///build/git-2.20.1/t/trash directory.t7406-submodule-update/submodule
+ * branch            4301fd3e4110d3b6212c19aed3094150392545b9 -> FETCH_HEAD
+ok 51 - submodule update clone shallow submodule outside of depth
+
+expecting success: 
+	(cd super2 &&
+	 (cd deeper/submodule/subsubmodule &&
+	  git checkout HEAD^
+	 ) &&
+	 git submodule update --recursive deeper/submodule >actual &&
+	 test_i18ngrep "Submodule path .deeper/submodule/subsubmodule.: checked out" actual
+	)
+
+Note: checking out '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 performing another checkout.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -b with the checkout command again. Example:
+
+  git checkout -b <new-branch-name>
+
+HEAD is now at 6355002 upstream line4
+Submodule path 'deeper/submodule/subsubmodule': checked out 'b0b6cdeaf939e317dabcdecfa7ee099e17b520e8'
+ok 52 - submodule update --recursive drops module name before recursing
+
+expecting success: 
+	(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 53 - submodule update can be run in parallel
+
+expecting success: 
+	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 54 - git clone passes the parallel jobs config on to submodules
+
+# passed all 54 test(s)
+1..54
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t9112-git-svn-md5less-file.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9112-git-svn-md5less-file/.git/
+expecting success: 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: git svn init "$svnrepo"
+ok 2 - initialize git svn
+
+expecting success: git svn fetch
+	A	md5less-file
+r1 = 0a18483994584e7d303eab12285fcb1bc2edbc04 (refs/remotes/git-svn)
+Checked out HEAD:
+  file:///build/git-2.20.1/t/trash%20directory.t9112-git-svn-md5less-file/svnrepo r1
+ok 3 - fetch revisions from svn
 
 # passed all 3 test(s)
 1..3
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
+*** t9113-git-svn-dcommit-new-file.sh ***
+Initialized empty Git repository in /build/git-2.20.1/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/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
 *** t7508-status.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7508-status/.git/
 expecting success: 
@@ -313475,6 +313764,7 @@
 	test_terminal git status | test_decode_color >output &&
 	test_i18ncmp expect output
 
+died of signal 15 at /build/git-2.20.1/t/test-terminal.perl line 35.
 ok 40 - status with color.status
 
 expecting success: 
@@ -314339,8 +314629,8 @@
 	git -c status.branch=true status -s >actual &&
 	test_must_fail test_cmp expected_nobranch actual
 
---- expected_nobranch	2021-12-03 05:10:02.227393084 +0000
-+++ actual	2021-12-03 05:10:02.239392735 +0000
+--- expected_nobranch	2023-01-05 11:50:16.106868030 +0000
++++ actual	2023-01-05 11:50:16.130868030 +0000
 @@ -1,2 +1,3 @@
 +## master...upstream [ahead 2, behind 2]
   M dir1/modified
@@ -314548,52 +314838,440 @@
 ok 111 - "Initial commit" should not be noted in commit template
 
 expecting success: 
-	test-tool chmtime =1234567890 .git/index &&
-	git --no-optional-locks status &&
-	test-tool chmtime --get .git/index >out &&
-	grep ^1234567890 out &&
-	git status &&
-	test-tool chmtime --get .git/index >out &&
-	! grep ^1234567890 out
-
-On branch empty-branch-4
-Changes to be committed:
-  (use "git reset HEAD <file>..." to unstage)
+	test-tool chmtime =1234567890 .git/index &&
+	git --no-optional-locks status &&
+	test-tool chmtime --get .git/index >out &&
+	grep ^1234567890 out &&
+	git status &&
+	test-tool chmtime --get .git/index >out &&
+	! grep ^1234567890 out
+
+On branch empty-branch-4
+Changes to be committed:
+  (use "git reset HEAD <file>..." to unstage)
+
+	new file:   to_be_committed_2
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+
+	.gitmodules
+	actual
+	dir1/untracked
+	dir2/modified
+	dir2/untracked
+	untracked
+
+1234567890
+On branch empty-branch-4
+Changes to be committed:
+  (use "git reset HEAD <file>..." to unstage)
+
+	new file:   to_be_committed_2
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+
+	.gitmodules
+	actual
+	dir1/untracked
+	dir2/modified
+	dir2/untracked
+	out
+	untracked
+
+ok 112 - --no-optional-locks prevents index update
+
+# passed all 112 test(s)
+1..112
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t9111-git-svn-use-svnsync-props.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9111-git-svn-use-svnsync-props/.git/
+expecting success: 
+	svnadmin load -q "$rawsvnrepo" < "$TEST_DIRECTORY"/t9111/svnsync.dump &&
+	git svn init --minimize-url -R arr -i bar "$svnrepo"/bar &&
+	git svn init --minimize-url -R argh -i dir "$svnrepo"/dir &&
+	git svn init --minimize-url -R argh -i e "$svnrepo"/dir/a/b/c/d/e &&
+	git config svn.useSvnsyncProps true &&
+	git svn fetch --all
+	
+Using higher level of URL: file:///build/git-2.20.1/t/trash%20directory.t9111-git-svn-use-svnsync-props/svnrepo/bar => file:///build/git-2.20.1/t/trash%20directory.t9111-git-svn-use-svnsync-props/svnrepo
+Using higher level of URL: file:///build/git-2.20.1/t/trash%20directory.t9111-git-svn-use-svnsync-props/svnrepo/dir => file:///build/git-2.20.1/t/trash%20directory.t9111-git-svn-use-svnsync-props/svnrepo
+Using higher level of URL: file:///build/git-2.20.1/t/trash%20directory.t9111-git-svn-use-svnsync-props/svnrepo/dir/a/b/c/d/e => file:///build/git-2.20.1/t/trash%20directory.t9111-git-svn-use-svnsync-props/svnrepo
+	A	file
+r1 = 6aadfc98d31cbed4e89c9d601491ad7b5c46d857 (refs/remotes/e)
+	A	a/b/c/d/e/file
+r1 = 79a1181387506bdda9e0f310c40ddb3f4eed7179 (refs/remotes/dir)
+	D	a/b/c/d/e/file
+	D	a/
+	A	file
+W: -empty_dir: dir/a
+r2 = c165f07c4c5694be18c9c28331ca7efd46d78417 (refs/remotes/dir)
+	A	zzz
+r1 = 44a982ce17928f9542c6f3fce48affc197150e1e (refs/remotes/bar)
+	M	zzz
+r6 = 2ebd1f75bc1fdd83dcbcdf6194f8b9a16e4fdeb0 (refs/remotes/bar)
+	A	d
+r9 = 07c2950915eb3ada192043ac2e5efcf9d9e07de3 (refs/remotes/bar)
+	A	newdir/dir
+r10 = 7b59bc03f91e595ef213c16f436644c05d922782 (refs/remotes/bar)
+	M	newdir/dir
+r11 = 8775e0be15e9c3fd282c6f4e71a82766ab3e9231 (refs/remotes/bar)
+	M	d
+r12 = ab9ada04d293d792e2e941a664911858fe0167af (refs/remotes/bar)
+Checked out HEAD:
+  file:///build/git-2.20.1/t/trash%20directory.t9111-git-svn-use-svnsync-props/svnrepo/bar r12
+ok 1 - load svnsync repo
+
+expecting success: 
+	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: 
+	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: 
+	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/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t9110-git-svn-use-svm-props.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9110-git-svn-use-svm-props/.git/
+expecting success: 
+	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/git-2.20.1/t/trash%20directory.t9110-git-svn-use-svm-props/svnrepo/mirror/arr => file:///build/git-2.20.1/t/trash%20directory.t9110-git-svn-use-svm-props/svnrepo
+Using higher level of URL: file:///build/git-2.20.1/t/trash%20directory.t9110-git-svn-use-svm-props/svnrepo/mirror/argh => file:///build/git-2.20.1/t/trash%20directory.t9110-git-svn-use-svm-props/svnrepo
+Using higher level of URL: file:///build/git-2.20.1/t/trash%20directory.t9110-git-svn-use-svm-props/svnrepo/mirror/argh/a/b/c/d/e => file:///build/git-2.20.1/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/git-2.20.1/t/trash%20directory.t9110-git-svn-use-svm-props/svnrepo/mirror/arr r7
+ok 1 - load svm repo
+
+expecting success: 
+	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: 
+	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
 
-	new file:   to_be_committed_2
+expecting success: 
+	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
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
+expecting success: 
+	git svn find-rev r12 >actual &&
+	grep ab9ada04d293d792e2e941a664911858fe0167af actual
+        
+ab9ada04d293d792e2e941a664911858fe0167af
+ok 5 - find commit based on SVN revision number
 
-	.gitmodules
-	actual
-	dir1/untracked
-	dir2/modified
-	dir2/untracked
-	untracked
+expecting success: 
+	git svn rebase
+	
+Current branch master is up to date.
+ok 6 - empty rebase
 
-1234567890
-On branch empty-branch-4
-Changes to be committed:
-  (use "git reset HEAD <file>..." to unstage)
+# passed all 6 test(s)
+1..6
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t9108-git-svn-glob.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9108-git-svn-glob/.git/
+expecting success: 
+	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 &&
+	sed -e "s/^.\{41\}//" 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.20.1) of git-svn) does not exist.
+Done migrating from a git-svn v1 layout
+	A	readme
+r1 = 1f42c5472594150b7e41ab769bbb68e7a40ccece (refs/remotes/trunk)
+branch_from: /trunk => /trunk/src/a
+Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9108-git-svn-glob/svnrepo/trunk/src/a => file:///build/git-2.20.1/t/trash%20directory.t9108-git-svn-glob/svnrepo/branches/start/src/a, 1
+Found branch parent: (refs/remotes/branches/start) 1f42c5472594150b7e41ab769bbb68e7a40ccece
+Following parent with do_switch
+Successfully followed parent
+r2 = 5e8268bdbea9d8ccbc1446f59f4a80bb9998f63c (refs/remotes/branches/start)
+	M	readme
+r3 = 7fd15cc313dc66962a7a1a8e7608769e6f7cf8be (refs/remotes/branches/start)
+branch_from: /branches/start => /branches/start/src/a
+Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9108-git-svn-glob/svnrepo/branches/start/src/a => file:///build/git-2.20.1/t/trash%20directory.t9108-git-svn-glob/svnrepo/tags/end/src/a, 3
+Found branch parent: (refs/remotes/tags/end) 7fd15cc313dc66962a7a1a8e7608769e6f7cf8be
+Following parent with do_switch
+	M	readme
+Successfully followed parent
+r4 = 665159c04b05d6d243ba4a32633e8dfe53e3a42b (refs/remotes/tags/end)
+Checked out HEAD:
+  file:///build/git-2.20.1/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
 
-	new file:   to_be_committed_2
+expecting success: 
+	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 &&
+	sed -e "s/^.\{41\}//" 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 = 36cb117afb41aff5c34898afa2b3cbfe70b192dc (refs/remotes/two/trunk)
+Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9108-git-svn-glob/svnrepo/trunk => file:///build/git-2.20.1/t/trash%20directory.t9108-git-svn-glob/svnrepo/branches/start, 1
+Found branch parent: (refs/remotes/two/branches/start) 36cb117afb41aff5c34898afa2b3cbfe70b192dc
+Following parent with do_switch
+Successfully followed parent
+r2 = 20c0617b0c0a557355b475aa88a28c468a23b604 (refs/remotes/two/branches/start)
+	M	src/a/readme
+	M	src/b/readme
+r3 = 41b9f9690bf7afbf424afee9b8f3265332f7a119 (refs/remotes/two/branches/start)
+Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9108-git-svn-glob/svnrepo/branches/start => file:///build/git-2.20.1/t/trash%20directory.t9108-git-svn-glob/svnrepo/tags/end, 3
+Found branch parent: (refs/remotes/two/tags/end) 41b9f9690bf7afbf424afee9b8f3265332f7a119
+Following parent with do_switch
+	M	src/a/readme
+	M	src/b/readme
+Successfully followed parent
+r4 = 0c6d17695d5eaea54c6329e4c9ab84ba16b5e7b5 (refs/remotes/two/tags/end)
+	M	src/b/readme
+r5 = 6f4e1f1428eb132a88c734480d2d13d3e89d719f (refs/remotes/two/tags/end)
+	M	src/b/readme
+r6 = 86964e1e71778c40987a522c479f00eb380e5d65 (refs/remotes/two/tags/end)
+ok 2 - test left-hand-side only globbing
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
+expecting success: 
+cat >expect.three <<EOF
+Only one set of wildcards (e.g. '*' or '*/*/*') is supported: branches/*/t/*
 
-	.gitmodules
-	actual
-	dir1/untracked
-	dir2/modified
-	dir2/untracked
-	out
-	untracked
+EOF
+	
+ok 3 - prepare test disallow multi-globs
 
-ok 112 - --no-optional-locks prevents index update
+expecting success: 
+	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 112 test(s)
-1..112
+# passed all 4 test(s)
+1..4
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
 *** t7400-submodule-basic.sh ***
@@ -314609,7 +315287,7 @@
 	git commit -m "initial commit" &&
 	git branch initial
 
-[master (root-commit) c702aff] initial commit
+[master (root-commit) db43a3b] initial commit
  Author: A U Thor <author@example.com>
  1 file changed, 0 insertions(+), 0 deletions(-)
  create mode 100644 t
@@ -314657,7 +315335,7 @@
 	)
 
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7400-submodule-basic/init/.git/
-[master (root-commit) 112eb48] submodule commit 1
+[master (root-commit) 92f3543] submodule commit 1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 a
@@ -314683,7 +315361,7 @@
 hint: 	git rm --cached init
 hint: 
 hint: See "git help submodule" for more information.
-[master 6ea05e5] super commit 1
+[master 8155028] super commit 1
  Author: A U Thor <author@example.com>
  3 files changed, 3 insertions(+)
  create mode 100644 a
@@ -315018,14 +315696,14 @@
 	printf "rev1: %s\n" "$rev1" &&
 	test -n "$rev1"
 
-rev1: 112eb48e1b5b312f9622c35b99a8fdcbef280423
+rev1: 92f35430bdaba97b133d4bea8c02f56079ed0ce5
 ok 30 - setup - fetch commit name from submodule
 
 expecting success: 
 	git submodule status >lines &&
 	grep "^-$rev1" lines
 
--112eb48e1b5b312f9622c35b99a8fdcbef280423 init
+-92f35430bdaba97b133d4bea8c02f56079ed0ce5 init
 ok 31 - status should initially be "missing"
 
 expecting success: 
@@ -315118,7 +315796,7 @@
 	git submodule status >list &&
 	grep "^ $rev1" list
 
- 112eb48e1b5b312f9622c35b99a8fdcbef280423 init (rev-1)
+ 92f35430bdaba97b133d4bea8c02f56079ed0ce5 init (rev-1)
 ok 40 - status should be "up-to-date" after update
 
 expecting success: 
@@ -315130,8 +315808,8 @@
 	grep "^ $rev1" list &&
 	grep "\\.\\./init" list
 
- 112eb48e1b5b312f9622c35b99a8fdcbef280423 ../init (rev-1)
- 112eb48e1b5b312f9622c35b99a8fdcbef280423 ../init (rev-1)
+ 92f35430bdaba97b133d4bea8c02f56079ed0ce5 ../init (rev-1)
+ 92f35430bdaba97b133d4bea8c02f56079ed0ce5 ../init (rev-1)
 ok 41 - status "up-to-date" from subdirectory
 
 expecting success: 
@@ -315143,8 +315821,8 @@
 	grep "^ $rev1" list &&
 	grep "\\.\\./init" list
 
- 112eb48e1b5b312f9622c35b99a8fdcbef280423 ../init (rev-1)
- 112eb48e1b5b312f9622c35b99a8fdcbef280423 ../init (rev-1)
+ 92f35430bdaba97b133d4bea8c02f56079ed0ce5 ../init (rev-1)
+ 92f35430bdaba97b133d4bea8c02f56079ed0ce5 ../init (rev-1)
 ok 42 - status "up-to-date" from subdirectory with path
 
 expecting success: 
@@ -315161,25 +315839,25 @@
 
 	grep "^+$rev2" list
 
-[detached HEAD 01d9580] submodule commit 2
+[detached HEAD 2d2fda0] submodule commit 2
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 b
-+01d9580fd960229f5c403f526586affa0d6ae59f init (rev-1-1-g01d9580)
++2d2fda0ef5bee4ba748e3aefc2ff452e7ec4b901 init (rev-1-1-g2d2fda0)
 ok 43 - status should be "modified" after submodule commit
 
 expecting success: 
 	git submodule --cached status >list &&
 	grep "^+$rev1" list
 
-+112eb48e1b5b312f9622c35b99a8fdcbef280423 init (rev-1)
++92f35430bdaba97b133d4bea8c02f56079ed0ce5 init (rev-1)
 ok 44 - the --cached sha1 should be rev1
 
 expecting success: 
 	git diff >diff &&
 	grep "^+Subproject commit $rev2" diff
 
-+Subproject commit 01d9580fd960229f5c403f526586affa0d6ae59f
++Subproject commit 2d2fda0ef5bee4ba748e3aefc2ff452e7ec4b901
 ok 45 - git diff should report the SHA1 of the new submodule commit
 
 expecting success: 
@@ -315191,7 +315869,7 @@
 
 	test_cmp expect head-sha1
 
-Submodule path 'init': checked out '112eb48e1b5b312f9622c35b99a8fdcbef280423'
+Submodule path 'init': checked out '92f35430bdaba97b133d4bea8c02f56079ed0ce5'
 fatal: ref HEAD is not a symbolic ref
 ok 46 - update should checkout rev1
 
@@ -315199,7 +315877,7 @@
 	git submodule status >list &&
 	grep "^ $rev1" list
 
- 112eb48e1b5b312f9622c35b99a8fdcbef280423 init (rev-1)
+ 92f35430bdaba97b133d4bea8c02f56079ed0ce5 init (rev-1)
 ok 47 - status should be "up-to-date" after update
 
 expecting success: 
@@ -315228,11 +315906,11 @@
 	git diff --cached master >staged &&
 	test_must_be_empty staged
 
-[detached HEAD 4911488] change subproject
+[detached HEAD f1c89db] change subproject
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 s
-[master 0f07078] change init
+[master fea339e] change init
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 Switched to branch 'second'
@@ -315259,7 +315937,7 @@
 Submodule path 'init' not initialized
 fatal: not a gitdir 'init/.git'
 Submodule 'example' (/build/git-2.20.1/t/trash directory.t7400-submodule-basic/init2) registered for path 'init'
-Submodule path 'init': checked out '4911488848567dd4687dcd133d7565dfc841e8de'
+Submodule path 'init': checked out 'f1c89dbe8f52333ec2c6f3d05949995558d13a41'
 /build/git-2.20.1/t/trash directory.t7400-submodule-basic/.git/modules/example
 ok 50 - update --init
 
@@ -315286,7 +315964,7 @@
 Submodule path 'init' not initialized
 fatal: not a gitdir '../init/.git'
 Submodule 'example' (/build/git-2.20.1/t/trash directory.t7400-submodule-basic/init2) registered for path '../init'
-Submodule path '../init': checked out '4911488848567dd4687dcd133d7565dfc841e8de'
+Submodule path '../init': checked out 'f1c89dbe8f52333ec2c6f3d05949995558d13a41'
 /build/git-2.20.1/t/trash directory.t7400-submodule-basic/.git/modules/example
 ok 51 - update --init from subdirectory
 
@@ -315296,7 +315974,7 @@
 	test_must_fail git add init/a
 
 
-HEAD is now at 6ea05e5 super commit 1
+HEAD is now at 8155028 super commit 1
 fatal: Pathspec 'init/a' is in submodule 'init'
 ok 52 - do not add files from a submodule
 
@@ -315319,17 +315997,17 @@
 	git diff --exit-code --cached init
 
 
-HEAD is now at 6ea05e5 super commit 1
-[second 5c35a2a] commit subproject
+HEAD is now at 8155028 super commit 1
+[second 6649a90] commit subproject
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 diff --git a/init b/init
-index 4911488..87bed35 160000
+index f1c89db..f952035 160000
 --- a/init
 +++ b/init
 @@ -1 +1 @@
--Subproject commit 4911488848567dd4687dcd133d7565dfc841e8de
-+Subproject commit 87bed35058d937bfe2d68d8f27e522d8cad8272c
+-Subproject commit f1c89dbe8f52333ec2c6f3d05949995558d13a41
++Subproject commit f952035cbd2c4c13967e260fd01598d06f2a68fa
 Unstaged changes after reset:
 M	init
 ok 53 - gracefully add/reset submodule with a trailing slash
@@ -315349,7 +316027,7 @@
 	test ! -d init &&
 	git checkout second
 
-HEAD is now at 5c35a2a commit subproject
+HEAD is now at 6649a90 commit subproject
 Switched to branch 'initial'
 Switched to branch 'second'
 ok 55 - moving to a commit without submodule does not leave empty dir
@@ -315857,7 +316535,7 @@
 
 Cloning into '/build/git-2.20.1/t/trash directory.t7400-submodule-basic/example2'...
 done.
-[second ec26871] submodule example2 added
+[second 95fa9a3] submodule example2 added
  Author: A U Thor <author@example.com>
  2 files changed, 7 insertions(+)
  create mode 100644 .gitmodules
@@ -315912,7 +316590,7 @@
 	rmdir init
 
 Submodule 'example' (/build/git-2.20.1/t/trash directory.t7400-submodule-basic/init2) registered for path 'init'
-Submodule path 'init': checked out '4911488848567dd4687dcd133d7565dfc841e8de'
+Submodule path 'init': checked out 'f1c89dbe8f52333ec2c6f3d05949995558d13a41'
 Cleared directory '../init'
 Submodule 'example' (/build/git-2.20.1/t/trash directory.t7400-submodule-basic/init2) unregistered for path '../init'
 ok 84 - submodule deinit from subdirectory
@@ -315930,7 +316608,7 @@
 	rmdir init example2
 
 Submodule 'example' (/build/git-2.20.1/t/trash directory.t7400-submodule-basic/init2) registered for path 'init'
-Submodule path 'init': checked out '4911488848567dd4687dcd133d7565dfc841e8de'
+Submodule path 'init': checked out 'f1c89dbe8f52333ec2c6f3d05949995558d13a41'
 fatal: Use '--all' if you really want to deinitialize all submodules
 Cleared directory 'init'
 Cleared directory 'example2'
@@ -315951,8 +316629,8 @@
 warning: could not look up configuration 'remote.origin.url'. Assuming this repository is its own authoritative upstream.
 Submodule 'example2' (/build/git-2.20.1/t/trash directory.t7400-submodule-basic/init2) registered for path 'example2'
 Submodule 'example' (/build/git-2.20.1/t/trash directory.t7400-submodule-basic/init2) registered for path 'init'
-Submodule path 'example2': checked out '87bed35058d937bfe2d68d8f27e522d8cad8272c'
-Submodule path 'init': checked out '4911488848567dd4687dcd133d7565dfc841e8de'
+Submodule path 'example2': checked out 'f952035cbd2c4c13967e260fd01598d06f2a68fa'
+Submodule path 'init': checked out 'f1c89dbe8f52333ec2c6f3d05949995558d13a41'
 fatal: Use '--all' if you really want to deinitialize all submodules
 Cleared directory 'init'
 Cleared directory 'example2'
@@ -315971,8 +316649,8 @@
 warning: could not look up configuration 'remote.origin.url'. Assuming this repository is its own authoritative upstream.
 Submodule 'example2' (/build/git-2.20.1/t/trash directory.t7400-submodule-basic/init2) registered for path 'example2'
 Submodule 'example' (/build/git-2.20.1/t/trash directory.t7400-submodule-basic/init2) registered for path 'init'
-Submodule path 'example2': checked out '87bed35058d937bfe2d68d8f27e522d8cad8272c'
-Submodule path 'init': checked out '4911488848567dd4687dcd133d7565dfc841e8de'
+Submodule path 'example2': checked out 'f952035cbd2c4c13967e260fd01598d06f2a68fa'
+Submodule path 'init': checked out 'f1c89dbe8f52333ec2c6f3d05949995558d13a41'
 Cleared directory 'example2'
 ok 87 - submodule deinit deinits a submodule when its work tree is missing or empty
 
@@ -315990,8 +316668,8 @@
 warning: could not look up configuration 'remote.origin.url'. Assuming this repository is its own authoritative upstream.
 Submodule 'example2' (/build/git-2.20.1/t/trash directory.t7400-submodule-basic/init2) registered for path 'example2'
 Submodule 'example' (/build/git-2.20.1/t/trash directory.t7400-submodule-basic/init2) registered for path 'init'
-Submodule path 'example2': checked out '87bed35058d937bfe2d68d8f27e522d8cad8272c'
-Submodule path 'init': checked out '4911488848567dd4687dcd133d7565dfc841e8de'
+Submodule path 'example2': checked out 'f952035cbd2c4c13967e260fd01598d06f2a68fa'
+Submodule path 'init': checked out 'f1c89dbe8f52333ec2c6f3d05949995558d13a41'
 error: the following file has local modifications:
     init
 (use --cached to keep the file, or -f to force removal)
@@ -316011,7 +316689,7 @@
 	rmdir init
 
 Submodule 'example' (/build/git-2.20.1/t/trash directory.t7400-submodule-basic/init2) registered for path 'init'
-Submodule path 'init': checked out '4911488848567dd4687dcd133d7565dfc841e8de'
+Submodule path 'init': checked out 'f1c89dbe8f52333ec2c6f3d05949995558d13a41'
 error: the following file has local modifications:
     init
 (use --cached to keep the file, or -f to force removal)
@@ -316034,18 +316712,18 @@
 	rmdir init
 
 Submodule 'example' (/build/git-2.20.1/t/trash directory.t7400-submodule-basic/init2) registered for path 'init'
-Submodule path 'init': checked out '4911488848567dd4687dcd133d7565dfc841e8de'
+Submodule path 'init': checked out 'f1c89dbe8f52333ec2c6f3d05949995558d13a41'
 Warning: you are leaving 1 commit behind, not connected to
 any of your branches:
 
-  4911488 change subproject
+  f1c89db change subproject
 
 If you want to keep it by creating a new branch, this may be a good time
 to do so with:
 
- git branch <new-branch-name> 4911488
+ git branch <new-branch-name> f1c89db
 
-HEAD is now at 112eb48 submodule commit 1
+HEAD is now at 92f3543 submodule commit 1
 error: the following file has local modifications:
     init
 (use --cached to keep the file, or -f to force removal)
@@ -316077,8 +316755,8 @@
 
 Submodule 'example' (/build/git-2.20.1/t/trash directory.t7400-submodule-basic/init2) registered for path 'init'
 From /build/git-2.20.1/t/trash directory.t7400-submodule-basic/./.subrepo
- * branch            4911488848567dd4687dcd133d7565dfc841e8de -> FETCH_HEAD
-Submodule path 'init': checked out '4911488848567dd4687dcd133d7565dfc841e8de'
+ * branch            f1c89dbe8f52333ec2c6f3d05949995558d13a41 -> FETCH_HEAD
+Submodule path 'init': checked out 'f1c89dbe8f52333ec2c6f3d05949995558d13a41'
 Submodule 'example' (/build/git-2.20.1/t/trash directory.t7400-submodule-basic/init2) unregistered for path 'init'
 Cleared directory 'init'
 Cleared directory 'init'
@@ -316104,8 +316782,8 @@
 warning: could not look up configuration 'remote.origin.url'. Assuming this repository is its own authoritative upstream.
 Submodule 'example2' (/build/git-2.20.1/t/trash directory.t7400-submodule-basic/init2) registered for path 'example2'
 Submodule 'example' (/build/git-2.20.1/t/trash directory.t7400-submodule-basic/init2) registered for path 'init'
-Submodule path 'example2': checked out '87bed35058d937bfe2d68d8f27e522d8cad8272c'
-Submodule path 'init': checked out '4911488848567dd4687dcd133d7565dfc841e8de'
+Submodule path 'example2': checked out 'f952035cbd2c4c13967e260fd01598d06f2a68fa'
+Submodule path 'init': checked out 'f1c89dbe8f52333ec2c6f3d05949995558d13a41'
 fatal: Submodule work tree 'init' contains a .git directory (use 'rm -rf' if you really want to remove it including all of its history)
 fatal: Submodule work tree 'init' contains a .git directory (use 'rm -rf' if you really want to remove it including all of its history)
 ok 92 - submodule deinit fails when submodule has a .git directory even when forced
@@ -316130,8 +316808,8 @@
  1 file changed, 0 insertions(+), 0 deletions(-)
  create mode 100644 sub
 Adding existing repo at 'å äö' to the index
- 87bed35058d937bfe2d68d8f27e522d8cad8272c example2 (rev-1-2-g87bed35)
- 4911488848567dd4687dcd133d7565dfc841e8de init (rev-1-1-g4911488)
+ f952035cbd2c4c13967e260fd01598d06f2a68fa example2 (rev-1-2-gf952035)
+ f1c89dbe8f52333ec2c6f3d05949995558d13a41 init (rev-1-1-gf1c89db)
  ea6909a6ccbadc034edc8c42d9d2b85a69afe610 å äö (heads/master)
 ok 93 - submodule with UTF-8 name
 
@@ -316188,7 +316866,7 @@
  create mode 100644 testfile1
 Adding existing repo at 'dir1/b' to the index
 Adding existing repo at 'dir2/b' to the index
-[second 2b57009] first submodule commit
+[second 13b62f4] first submodule commit
  Author: A U Thor <author@example.com>
  4 files changed, 12 insertions(+)
  create mode 160000 dir1/b
@@ -316327,9 +317005,9 @@
 
 Cloning into 'test/test'...
 Cloning into '/build/git-2.20.1/t/trash directory.t7400-submodule-basic/test/test/sub0'...
+Cloning into '/build/git-2.20.1/t/trash directory.t7400-submodule-basic/test/test/sub3'...
 Cloning into '/build/git-2.20.1/t/trash directory.t7400-submodule-basic/test/test/sub1'...
 Cloning into '/build/git-2.20.1/t/trash directory.t7400-submodule-basic/test/test/sub2'...
-Cloning into '/build/git-2.20.1/t/trash directory.t7400-submodule-basic/test/test/sub3'...
 Submodule path 'sub0': checked out '71cddcbcdbe5634f8172f69e2745e3c01ba0d1bb'
 Submodule path 'sub1': checked out '71cddcbcdbe5634f8172f69e2745e3c01ba0d1bb'
 Submodule path 'sub2': checked out '71cddcbcdbe5634f8172f69e2745e3c01ba0d1bb'
@@ -316503,421 +317181,375 @@
 1..105
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t9113-git-svn-dcommit-new-file.sh ***
-Initialized empty Git repository in /build/git-2.20.1/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/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t9112-git-svn-md5less-file.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9112-git-svn-md5less-file/.git/
-expecting success: 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: git svn init "$svnrepo"
-ok 2 - initialize git svn
-
-expecting success: git svn fetch
-	A	md5less-file
-r1 = e3111ccf5beb8a9868af0241533a16f46cc5ba20 (refs/remotes/git-svn)
-Checked out HEAD:
-  file:///build/git-2.20.1/t/trash%20directory.t9112-git-svn-md5less-file/svnrepo r1
-ok 3 - fetch revisions from svn
-
-# passed all 3 test(s)
-1..3
+*** t9119-git-svn-info.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9119-git-svn-info/.git/
+1..0 # SKIP skipping svn-info test (SVN version: 1.10.4 not supported)
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t9108-git-svn-glob.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9108-git-svn-glob/.git/
+*** t9114-git-svn-dcommit-merge.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9114-git-svn-dcommit-merge/.git/
 expecting success: 
-	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 &&
+	svn_cmd co "$svnrepo" mysvnwork &&
+	mkdir -p mysvnwork/trunk &&
 	(
-		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 &&
-	sed -e "s/^.\{41\}//" 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
+		cd mysvnwork &&
+		big_text_block >>trunk/README &&
+		svn_cmd add trunk &&
+		svn_cmd ci -m "first commit" trunk
+	)
 	
-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
+Checked out revision 0.
+A         trunk
+A         trunk/README
+Adding         trunk
+Adding         trunk/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.20.1) of git-svn) does not exist.
-Done migrating from a git-svn v1 layout
-	A	readme
-r1 = 77a179583762da8261c9ef3e6f08df6993fb6610 (refs/remotes/trunk)
-branch_from: /trunk => /trunk/src/a
-Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9108-git-svn-glob/svnrepo/trunk/src/a => file:///build/git-2.20.1/t/trash%20directory.t9108-git-svn-glob/svnrepo/branches/start/src/a, 1
-Found branch parent: (refs/remotes/branches/start) 77a179583762da8261c9ef3e6f08df6993fb6610
-Following parent with do_switch
-Successfully followed parent
-r2 = 3ade70ad129be228c6907f0c9017a750e51965c3 (refs/remotes/branches/start)
-	M	readme
-r3 = 9f8033726e573c850cb7c88ebcf10cf58e06fa77 (refs/remotes/branches/start)
-branch_from: /branches/start => /branches/start/src/a
-Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9108-git-svn-glob/svnrepo/branches/start/src/a => file:///build/git-2.20.1/t/trash%20directory.t9108-git-svn-glob/svnrepo/tags/end/src/a, 3
-Found branch parent: (refs/remotes/tags/end) 9f8033726e573c850cb7c88ebcf10cf58e06fa77
-Following parent with do_switch
-	M	readme
-Successfully followed parent
-r4 = 1951f4a31f33b3447d90c300c1a9c959d361a7ee (refs/remotes/tags/end)
+Committed revision 1.
+ok 1 - setup svn repository
+
+expecting success: 
+	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 = ca8ef9d057e95316430c6c80f1bda09e4268463c (refs/remotes/origin/trunk)
 Checked out HEAD:
-  file:///build/git-2.20.1/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
+  file:///build/git-2.20.1/t/trash%20directory.t9114-git-svn-dcommit-merge/svnrepo/trunk r1
+Switched to a new branch 'svn'
+Switched to a new branch 'merge'
+[merge 75f5084] New file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 new_file
+[merge 21c524d] hello
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[merge 7dff2bd] add some stuff
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Switched to branch 'svn'
+[svn 6af522f] friend
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Merging:
+6af522f friend
+virtual merge
+found 1 common ancestor:
+ca8ef9d first commit
+Auto-merging README
+Merge made by the 'recursive' 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: 
-	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 &&
-	sed -e "s/^.\{41\}//" actual >output.two &&
-	test_cmp expect.two output.two
+	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
 	
-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 = 43eccde3938c594c2141799218328e46c792d1c1 (refs/remotes/two/trunk)
-Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9108-git-svn-glob/svnrepo/trunk => file:///build/git-2.20.1/t/trash%20directory.t9108-git-svn-glob/svnrepo/branches/start, 1
-Found branch parent: (refs/remotes/two/branches/start) 43eccde3938c594c2141799218328e46c792d1c1
-Following parent with do_switch
-Successfully followed parent
-r2 = 372ef7303b556e3accd298d0146a87a1d7942f45 (refs/remotes/two/branches/start)
-	M	src/a/readme
-	M	src/b/readme
-r3 = 0c2dcb2823fe755f3ca858e74af76c15ee9dd2f1 (refs/remotes/two/branches/start)
-Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9108-git-svn-glob/svnrepo/branches/start => file:///build/git-2.20.1/t/trash%20directory.t9108-git-svn-glob/svnrepo/tags/end, 3
-Found branch parent: (refs/remotes/two/tags/end) 0c2dcb2823fe755f3ca858e74af76c15ee9dd2f1
-Following parent with do_switch
-	M	src/a/readme
-	M	src/b/readme
-Successfully followed parent
-r4 = f0b76b83d903a34b75706d19441b024b4868a6f8 (refs/remotes/two/tags/end)
-	M	src/b/readme
-r5 = ca92f162849646c7596045464caba37a03b46fa6 (refs/remotes/two/tags/end)
-	M	src/b/readme
-r6 = 918881183a70f2330a42a29ecc345d99f5008ecf (refs/remotes/two/tags/end)
-ok 2 - test left-hand-side only globbing
+friend
+ok 3 - verify pre-merge ancestry
 
 expecting success: 
-cat >expect.three <<EOF
-Only one set of wildcards (e.g. '*' or '*/*/*') is supported: branches/*/t/*
+	git svn dcommit
+	
+Committing to file:///build/git-2.20.1/t/trash%20directory.t9114-git-svn-dcommit-merge/svnrepo/trunk ...
+	M	README
+Committed r2
+	M	README
+r2 = e20ad2be1b773708fe59e8b68596aad9a5352654 (refs/remotes/origin/trunk)
+	A	new_file
+	M	README
+Committed r3
+	M	README
+	A	new_file
+r3 = d5b7132d8a4e565d467a165921b6972291ce6718 (refs/remotes/origin/trunk)
+No changes between d43460e2ef07f99b65f9baef801f9059ecbe9117 and refs/remotes/origin/trunk
+Resetting to the latest refs/remotes/origin/trunk
+ok 4 - git svn dcommit merges
 
-EOF
+expecting success: 
+	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
 	
-ok 3 - prepare test disallow multi-globs
+friend
+ok 5 - verify post-merge ancestry
 
 expecting success: 
-	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
+	git rev-list --pretty=raw -1 refs/heads/svn >actual &&
+	grep "    Merge branch 'merge' into svn" actual
 	
-Sending        tags/end/src/b/readme
-Transmitting file data .done
-Committing transaction...
-Committed revision 7.
-ok 4 - test disallow multi-globs
+    Merge branch 'merge' into svn
+ok 6 - verify merge commit message
 
-# passed all 4 test(s)
-1..4
+# passed all 6 test(s)
+1..6
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t9111-git-svn-use-svnsync-props.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9111-git-svn-use-svnsync-props/.git/
+*** t9107-git-svn-migrate.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9107-git-svn-migrate/.git/
 expecting success: 
-	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
+	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/git-2.20.1/t/trash%20directory.t9111-git-svn-use-svnsync-props/svnrepo/bar => file:///build/git-2.20.1/t/trash%20directory.t9111-git-svn-use-svnsync-props/svnrepo
-Using higher level of URL: file:///build/git-2.20.1/t/trash%20directory.t9111-git-svn-use-svnsync-props/svnrepo/dir => file:///build/git-2.20.1/t/trash%20directory.t9111-git-svn-use-svnsync-props/svnrepo
-Using higher level of URL: file:///build/git-2.20.1/t/trash%20directory.t9111-git-svn-use-svnsync-props/svnrepo/dir/a/b/c/d/e => file:///build/git-2.20.1/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 = 9a2b734adf65dea22727c8237d0947637812103e (refs/remotes/git-svn)
 Checked out HEAD:
-  file:///build/git-2.20.1/t/trash%20directory.t9111-git-svn-use-svnsync-props/svnrepo/bar r12
-ok 1 - load svnsync repo
+  file:///build/git-2.20.1/t/trash%20directory.t9107-git-svn-migrate/svnrepo r1
+ok 1 - setup old-looking metadata
 
 expecting success: 
-	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
+	git rev-parse --verify refs/heads/git-svn-HEAD^0
 
-expecting success: 
-	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
+9a2b734adf65dea22727c8237d0947637812103e
+ok 2 - git-svn-HEAD is a real HEAD
 
 expecting success: 
-	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
+	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/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
+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.20.1) 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
+9a2b734adf65dea22727c8237d0947637812103e
+9a2b734adf65dea22727c8237d0947637812103e
+ok 3 - initialize old-style (v0) git svn layout
 
-# passed all 4 test(s)
-1..4
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t9110-git-svn-use-svm-props.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9110-git-svn-use-svm-props/.git/
 expecting success: 
-	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
+	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 higher level of URL: file:///build/git-2.20.1/t/trash%20directory.t9110-git-svn-use-svm-props/svnrepo/mirror/arr => file:///build/git-2.20.1/t/trash%20directory.t9110-git-svn-use-svm-props/svnrepo
-Using higher level of URL: file:///build/git-2.20.1/t/trash%20directory.t9110-git-svn-use-svm-props/svnrepo/mirror/argh => file:///build/git-2.20.1/t/trash%20directory.t9110-git-svn-use-svm-props/svnrepo
-Using higher level of URL: file:///build/git-2.20.1/t/trash%20directory.t9110-git-svn-use-svm-props/svnrepo/mirror/argh/a/b/c/d/e => file:///build/git-2.20.1/t/trash%20directory.t9110-git-svn-use-svm-props/svnrepo
-	A	a/b/c/d/e/file
-r9 (@1) = 79a1181387506bdda9e0f310c40ddb3f4eed7179 (refs/remotes/dir)
-	A	file
-r9 (@1) = 6aadfc98d31cbed4e89c9d601491ad7b5c46d857 (refs/remotes/e)
-	D	a/b/c/d/e/file
-	D	a/
-	A	file
-W: -empty_dir: mirror/argh/a
-r10 (@2) = c165f07c4c5694be18c9c28331ca7efd46d78417 (refs/remotes/dir)
-	A	zzz
-r2 (@1) = 44a982ce17928f9542c6f3fce48affc197150e1e (refs/remotes/bar)
-	M	zzz
-r3 (@6) = 2ebd1f75bc1fdd83dcbcdf6194f8b9a16e4fdeb0 (refs/remotes/bar)
-	A	d
-r4 (@9) = 07c2950915eb3ada192043ac2e5efcf9d9e07de3 (refs/remotes/bar)
-	A	newdir/dir
-r5 (@10) = 7b59bc03f91e595ef213c16f436644c05d922782 (refs/remotes/bar)
-	M	newdir/dir
-r6 (@11) = 8775e0be15e9c3fd282c6f4e71a82766ab3e9231 (refs/remotes/bar)
-	M	d
-r7 (@12) = ab9ada04d293d792e2e941a664911858fe0167af (refs/remotes/bar)
-Checked out HEAD:
-  file:///build/git-2.20.1/t/trash%20directory.t9110-git-svn-use-svm-props/svnrepo/mirror/arr r7
-ok 1 - load svm repo
+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: 
-	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
+	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
 
-expecting success: 
-	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
+Rebuilding .git/svn/git-svn/.rev_map.a2a9acbf-0f2e-48db-b4b0-0b4e9a666787 ...
+r1 = 9a2b734adf65dea22727c8237d0947637812103e
+Done rebuilding .git/svn/git-svn/.rev_map.a2a9acbf-0f2e-48db-b4b0-0b4e9a666787
+	A	README
+r1 = 8867083fcf6cc5d3f104366ad87291edbdca9a07 (refs/remotes/origin/tags/0.3)
+	A	README
+r1 = 50fb5b087961d3d661509443e0c6bd589da8f1a7 (refs/remotes/origin/tags/0.2)
+	A	README
+r1 = 72a89068daa7a27640d3a07301f4ee8a5e836cbd (refs/remotes/origin/a)
+	A	README
+r1 = add531e9bee4ed61228d221f82eab48404fa5a5e (refs/remotes/origin/tags/0.1)
+	A	README
+r1 = 9e8ee8023fae6dad63b6cd9852aa05a7b17d9638 (refs/remotes/origin/trunk)
+	A	README
+r1 = e7041230073265c439a0cdcb0066aeea7e209ef6 (refs/remotes/origin/b)
+ok 5 - multi-fetch works on partial urls + paths
 
 expecting success: 
-	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 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=$(expr $i : "\([^:]*\):.*$")
+		ref=$(expr $i : "[^:]*:\(refs/remotes/.*\)$")
+		if test -z "$ref"; 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
-
-expecting success: 
-	git svn find-rev r12 >actual &&
-	grep ab9ada04d293d792e2e941a664911858fe0167af actual
-        
-ab9ada04d293d792e2e941a664911858fe0167af
-ok 5 - find commit based on SVN revision number
+Using existing [svn-remote "svn"]
+Using higher level of URL: file:///build/git-2.20.1/t/trash%20directory.t9107-git-svn-migrate/svnrepo/branches/a => file:///build/git-2.20.1/t/trash%20directory.t9107-git-svn-migrate/svnrepo
+Using existing [svn-remote "svn"]
+Using higher level of URL: file:///build/git-2.20.1/t/trash%20directory.t9107-git-svn-migrate/svnrepo/branches/b => file:///build/git-2.20.1/t/trash%20directory.t9107-git-svn-migrate/svnrepo
+Using existing [svn-remote "svn"]
+Using higher level of URL: file:///build/git-2.20.1/t/trash%20directory.t9107-git-svn-migrate/svnrepo/tags/0.1 => file:///build/git-2.20.1/t/trash%20directory.t9107-git-svn-migrate/svnrepo
+Using existing [svn-remote "svn"]
+Using higher level of URL: file:///build/git-2.20.1/t/trash%20directory.t9107-git-svn-migrate/svnrepo/tags/0.2 => file:///build/git-2.20.1/t/trash%20directory.t9107-git-svn-migrate/svnrepo
+Using existing [svn-remote "svn"]
+Using higher level of URL: file:///build/git-2.20.1/t/trash%20directory.t9107-git-svn-migrate/svnrepo/tags/0.3 => file:///build/git-2.20.1/t/trash%20directory.t9107-git-svn-migrate/svnrepo
+Using existing [svn-remote "svn"]
+Using higher level of URL: file:///build/git-2.20.1/t/trash%20directory.t9107-git-svn-migrate/svnrepo/trunk => file:///build/git-2.20.1/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: 
-	git svn rebase
+	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"
 	
-Current branch master is up to date.
-ok 6 - empty rebase
+Rebuilding .git/svn/refs/remotes/git-svn/.rev_map.a2a9acbf-0f2e-48db-b4b0-0b4e9a666787 ...
+r1 = 9a2b734adf65dea22727c8237d0947637812103e
+Done rebuilding .git/svn/refs/remotes/git-svn/.rev_map.a2a9acbf-0f2e-48db-b4b0-0b4e9a666787
+Rebuilding .git/svn/refs/remotes/origin/a/.rev_map.a2a9acbf-0f2e-48db-b4b0-0b4e9a666787 ...
+r1 = 72a89068daa7a27640d3a07301f4ee8a5e836cbd
+Done rebuilding .git/svn/refs/remotes/origin/a/.rev_map.a2a9acbf-0f2e-48db-b4b0-0b4e9a666787
+Rebuilding .git/svn/refs/remotes/origin/b/.rev_map.a2a9acbf-0f2e-48db-b4b0-0b4e9a666787 ...
+r1 = e7041230073265c439a0cdcb0066aeea7e209ef6
+Done rebuilding .git/svn/refs/remotes/origin/b/.rev_map.a2a9acbf-0f2e-48db-b4b0-0b4e9a666787
+Rebuilding .git/svn/refs/remotes/origin/tags/0.1/.rev_map.a2a9acbf-0f2e-48db-b4b0-0b4e9a666787 ...
+r1 = add531e9bee4ed61228d221f82eab48404fa5a5e
+Done rebuilding .git/svn/refs/remotes/origin/tags/0.1/.rev_map.a2a9acbf-0f2e-48db-b4b0-0b4e9a666787
+Rebuilding .git/svn/refs/remotes/origin/tags/0.2/.rev_map.a2a9acbf-0f2e-48db-b4b0-0b4e9a666787 ...
+r1 = 50fb5b087961d3d661509443e0c6bd589da8f1a7
+Done rebuilding .git/svn/refs/remotes/origin/tags/0.2/.rev_map.a2a9acbf-0f2e-48db-b4b0-0b4e9a666787
+Rebuilding .git/svn/refs/remotes/origin/tags/0.3/.rev_map.a2a9acbf-0f2e-48db-b4b0-0b4e9a666787 ...
+r1 = 8867083fcf6cc5d3f104366ad87291edbdca9a07
+Done rebuilding .git/svn/refs/remotes/origin/tags/0.3/.rev_map.a2a9acbf-0f2e-48db-b4b0-0b4e9a666787
+Rebuilding .git/svn/refs/remotes/origin/trunk/.rev_map.a2a9acbf-0f2e-48db-b4b0-0b4e9a666787 ...
+r1 = 9e8ee8023fae6dad63b6cd9852aa05a7b17d9638
+Done rebuilding .git/svn/refs/remotes/origin/trunk/.rev_map.a2a9acbf-0f2e-48db-b4b0-0b4e9a666787
+Rebuilding .git/svn/refs/remotes/origin/trunk/.rev_map.a2a9acbf-0f2e-48db-b4b0-0b4e9a666787 ...
+r1 = 9e8ee8023fae6dad63b6cd9852aa05a7b17d9638
+Done rebuilding .git/svn/refs/remotes/origin/trunk/.rev_map.a2a9acbf-0f2e-48db-b4b0-0b4e9a666787
+ok 7 - .rev_db auto-converted to .rev_map.UUID
 
-# passed all 6 test(s)
-1..6
+# passed all 7 test(s)
+1..7
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
 *** t9106-git-svn-commit-diff-clobber.sh ***
@@ -316936,7 +317568,7 @@
 Adding         file
 Committing transaction...
 Committed revision 1.
-[master (root-commit) aef5025] initial
+[master (root-commit) 7bbbb25] initial
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 file
@@ -316965,7 +317597,7 @@
 	git commit -a -m "second line from git" &&
 	test_must_fail git svn commit-diff -r1 HEAD~1 HEAD "$svnrepo"
 
-[master 878ea5a] second line from git
+[master cf124e7] second line from git
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 Transaction is out of date: File '/file' is out of date at /build/git-2.20.1/git-svn line 1542.
@@ -316980,11 +317612,11 @@
 	git commit -a -m "third line from git" &&
 	git svn commit-diff -r2 HEAD~1 HEAD "$svnrepo"
 	
-HEAD is now at aef5025 initial
-[master aa078ae] second line from svn
+HEAD is now at 7bbbb25 initial
+[master a5c8017] second line from svn
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[master 580839b] third line from git
+[master 46f6a47] third line from git
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 	M	file
@@ -317008,26 +317640,26 @@
 	test_must_fail git svn dcommit
 	
 	A	file
-r1 = 5125725cd68f38cbf50891b14fa20c17c8c0bc69 (refs/remotes/git-svn)
+r1 = 72a6fa4a79aff061e0ce0e46a05b77452a4dc2a6 (refs/remotes/git-svn)
 	M	file
-r2 = ca2916a5a50a64b51e8bead1ab12f37c83df78ab (refs/remotes/git-svn)
+r2 = 0948a96da146c518266cde469fc0a7d005992147 (refs/remotes/git-svn)
 	M	file
-r3 = fabd910de5bb02149bae0096f42b2d91ac3fad88 (refs/remotes/git-svn)
-HEAD is now at fabd910 third line from git
+r3 = 108ace05100ccf7e13bd144f9c2a6d86ea42ceac (refs/remotes/git-svn)
+HEAD is now at 108ace0 third line from git
 A    t.svn/file
 Checked out revision 3.
 Sending        file
 Transmitting file data .done
 Committing transaction...
 Committed revision 4.
-[master 8f78030] fourth line from git
+[master d22c65c] fourth line from git
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 Committing to file:///build/git-2.20.1/t/trash%20directory.t9106-git-svn-commit-diff-clobber/svnrepo ...
 
 ERROR from SVN:
 Transaction is out of date: File '/file' is out of date
-W: 8f7803036f42a885b7a1fd8c404d64f302b41a87 and refs/remotes/git-svn differ, using rebase:
+W: d22c65c45356969603f6c75e34fc97e0c96b25ff 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
@@ -317046,30 +317678,30 @@
 	git commit -a -m 'more changes' &&
 	git svn dcommit
 	
-HEAD is now at fabd910 third line from git
-[master d654f0f] index merge
+HEAD is now at 108ace0 third line from git
+[master bd3b23d] index merge
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 file2
-[master 2db09a4] more changes
+[master cab658b] more changes
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 Committing to file:///build/git-2.20.1/t/trash%20directory.t9106-git-svn-commit-diff-clobber/svnrepo ...
 	A	file2
 Committed r5
 	M	file
-r4 = 192c648d9e6a66c5d8e0a31d30e58a56786624de (refs/remotes/git-svn)
+r4 = 058282cd36bc869f87831e0d9941cdd730656494 (refs/remotes/git-svn)
 	A	file2
-r5 = 7ebef66a0a67ec84f6025a351ff1754eb4def8e8 (refs/remotes/git-svn)
-W: d654f0f955350c01ccdc1c1925e36da6055d8471 and refs/remotes/git-svn differ, using rebase:
+r5 = e2d1880d619460bae1c779e432173356e29c41e0 (refs/remotes/git-svn)
+W: bd3b23d91d74c60139bdda515a2e6eaff428ff17 and refs/remotes/git-svn differ, using rebase:
 :100644 100644 d270188940c824ce4f1e8aa864ca5d2f8c75f939 b349877e032add143a5dc286d30e523181dea4ef M	file
 First, rewinding head to replay your work on top of it...
 Applying: more changes
 	M	file2
 Committed r6
 	M	file2
-r6 = b028e32963950eb8c38ff6b537c5e5bc25ea093c (refs/remotes/git-svn)
-No changes between 8fe9057255f2466d14eab02582943e30aa1c019a and refs/remotes/git-svn
+r6 = 3a945bb519fe943a4db384a87eb3316496968d80 (refs/remotes/git-svn)
+No changes between 3dfaf80f4a4d7c8f292113c115756aab86bee66d and refs/remotes/git-svn
 Resetting to the latest refs/remotes/git-svn
 ok 6 - dcommit does the svn equivalent of an index merge
 
@@ -317101,22 +317733,22 @@
 	git commit -a -m 'clobber' &&
 	test_must_fail git svn dcommit
 	
-HEAD is now at b028e32 more changes
-[master 8ba6241] new file
+HEAD is now at 3a945bb more changes
+[master babfac5] new file
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 new-file
-[master 40dd78f] clobber
+[master 8294896] clobber
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 4 deletions(-)
 Committing to file:///build/git-2.20.1/t/trash%20directory.t9106-git-svn-commit-diff-clobber/svnrepo ...
 	A	new-file
 Committed r8
 	M	file
-r7 = 423206d255adeedb97e2990b90d26f4e3443cdc5 (refs/remotes/git-svn)
+r7 = 420ab2b781e930d93b6f175c08f89e11596211bf (refs/remotes/git-svn)
 	A	new-file
-r8 = 65e73e53d1faffa8f6e37a829817f80cbe77809e (refs/remotes/git-svn)
-W: 8ba6241ad323734d2ba1ef6fd6fb818aab4cd99f and refs/remotes/git-svn differ, using rebase:
+r8 = e0937b15037aad033007122acc7a5e940f3dde59 (refs/remotes/git-svn)
+W: babfac5428000d1644dcd827aacad22b7537b8a8 and refs/remotes/git-svn differ, using rebase:
 :100644 100644 b349877e032add143a5dc286d30e523181dea4ef fad4bec9888fc6883cc5a8447f365d44b8e4ebba M	file
 First, rewinding head to replay your work on top of it...
 Applying: clobber
@@ -317124,7 +317756,7 @@
 M	file
 Falling back to patching base and 3-way merge...
 Merging:
-65e73e5 new file
+e0937b1 new file
 virtual clobber
 found 1 common ancestor:
 virtual 76ac259f7ab5e2e4bb7a2fecf07396a2695c68c9
@@ -317159,8 +317791,8 @@
 	M	file
 Committed r9
 	M	file
-r9 = 1f6e67b292baaca27d0580a9df61ed945cac06eb (refs/remotes/git-svn)
-No changes between 3db50f2bad7692dd765672548f29314d5d328fe0 and refs/remotes/git-svn
+r9 = b0ef27a1d9ca63fbb607d5f2bc59e35a4a111d01 (refs/remotes/git-svn)
+No changes between e8650cec6698f42db1a799e8692ee98e8372b7fe and refs/remotes/git-svn
 Resetting to the latest refs/remotes/git-svn
 ok 10 - resolve, continue the rebase and dcommit
 
@@ -317168,6 +317800,684 @@
 1..10
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
+*** t9101-git-svn-props.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9101-git-svn-props/.git/
+expecting success: 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: 
+	(
+		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: git svn init "$svnrepo"
+ok 3 - initialize git svn
+
+expecting success: 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 = bc9dbcbd2435f64bbb12faee42aa5c80e6e24464 (refs/remotes/git-svn)
+	M	kw.c
+r2 = f8b54e5e1a0decf9dfd9d57137bd6f6337006814 (refs/remotes/git-svn)
+	M	kw.c
+r3 = 02f1ca68ca78de14c14c4f15e160730c633b1a60 (refs/remotes/git-svn)
+	M	kw.c
+r4 = 04c0f1f376f01268f2accea5f339ff48eaf7648e (refs/remotes/git-svn)
+Checked out HEAD:
+  file:///build/git-2.20.1/t/trash%20directory.t9101-git-svn-props/svnrepo r4
+ok 4 - fetch revisions from svn
+
+expecting success: 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 56c9d07] test keywords ignoring
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+	M	kw.c
+	M	kw.c
+r5 = c86a317c5f0b7a235e9a800b556cadda6255072c (refs/remotes/git-svn)
+Done committing 1 revisions to SVN
+From .
+ * remote-tracking branch git-svn    -> FETCH_HEAD
+Updating 56c9d07..c86a317
+Fast-forward
+ok 5 - test svn:keywords ignoring
+
+expecting success: test '/* $Id$ */' = '/* $Id$ */'
+ok 6 - raw $Id$ found in kw.c
+
+expecting success: 
+	(
+		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: git svn fetch &&
+	 git pull . remotes/git-svn &&
+	 svn_cmd co "$svnrepo" new_wc
+	M	crlf
+	M	empty
+	M	ne_crlf
+r6 = 0ec114da23b9e8c1034ed36286ba29210b340811 (refs/remotes/git-svn)
+From .
+ * remote-tracking branch git-svn    -> FETCH_HEAD
+Updating c86a317..0ec114d
+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: cmp crlf new_wc/crlf
+ok 9 - Comparing crlf
+
+expecting success: cmp ne_crlf new_wc/ne_crlf
+ok 10 - Comparing ne_crlf
+
+expecting success: cmp lf new_wc/lf
+ok 11 - Comparing lf
+
+expecting success: cmp ne_lf new_wc/ne_lf
+ok 12 - Comparing ne_lf
+
+expecting success: cmp cr new_wc/cr
+ok 13 - Comparing cr
+
+expecting success: cmp ne_cr new_wc/ne_cr
+ok 14 - Comparing ne_cr
+
+expecting success: cmp empty_cr new_wc/empty_cr
+ok 15 - Comparing empty_cr
+
+expecting success: cmp empty_lf new_wc/empty_lf
+ok 16 - Comparing empty_lf
+
+expecting success: cmp empty new_wc/empty
+ok 17 - Comparing empty
+
+expecting success: cmp empty_crlf new_wc/empty_crlf
+ok 18 - Comparing empty_crlf
+
+expecting success: 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: git svn fetch && git pull . remotes/git-svn
+	M	cr
+	M	ne_cr
+r7 = c5d0a9a36193f86c244eb9b912b18be67151c0b0 (refs/remotes/git-svn)
+From .
+ * remote-tracking branch git-svn    -> FETCH_HEAD
+Updating 0ec114d..c5d0a9a
+Fast-forward
+ cr    | 4 +++-
+ ne_cr | 4 +++-
+ 2 files changed, 6 insertions(+), 2 deletions(-)
+ok 20 - fetch and pull latest from svn
+
+expecting success: test 'f39bd49beefa1dff130e47c7a24777dfc3657ba2' = 'f39bd49beefa1dff130e47c7a24777dfc3657ba2'
+ok 21 - CRLF + $Id$
+
+expecting success: test '41c5e77993f143876592cd19b5e9a6f6d2e4ff8a' = '41c5e77993f143876592cd19b5e9a6f6d2e4ff8a'
+ok 22 - CRLF + $Id$ (no newline)
+
+expecting success: 
+	(
+		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: 
+	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 = b7e30afee607cae78961349fc5ae187726df6d8c (refs/remotes/git-svn)
+From .
+ * remote-tracking branch git-svn    -> FETCH_HEAD
+Updating c5d0a9a..b7e30af
+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: 
+	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: 
+	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/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t9121-git-svn-fetch-renamed-dir.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9121-git-svn-fetch-renamed-dir/.git/
+expecting success: 
+	svnadmin load -q "$rawsvnrepo" < "$TEST_DIRECTORY"/t9121/renamed-dir.dump
+	
+ok 1 - load repository with renamed directory
+
+expecting success: 
+	git svn init "$svnrepo/newname" &&
+	git svn fetch
+	
+	A	a.txt
+r2 = 8c16d1458452a1c4223f0004b62d031aa3afadfd (refs/remotes/git-svn)
+Checked out HEAD:
+  file:///build/git-2.20.1/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/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t9109-git-svn-multi-glob.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9109-git-svn-multi-glob/.git/
+expecting success: 
+	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 &&
+	sed -e "s/^.\{41\}//" 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.
+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.20.1) of git-svn) does not exist.
+Done migrating from a git-svn v1 layout
+	A	readme
+r1 = c6e135a3dcc5ccaab092ee05c2ba9bd59cd732e7 (refs/remotes/trunk)
+branch_from: /trunk => /trunk/src/a
+Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9109-git-svn-multi-glob/svnrepo/trunk/src/a => file:///build/git-2.20.1/t/trash%20directory.t9109-git-svn-multi-glob/svnrepo/branches/v1/start/src/a, 1
+Found branch parent: (refs/remotes/branches/v1/start) c6e135a3dcc5ccaab092ee05c2ba9bd59cd732e7
+Following parent with do_switch
+Successfully followed parent
+r2 = 0ac0c58aca0e2dffa03ebb4e9bccf7e997c93515 (refs/remotes/branches/v1/start)
+	M	readme
+r3 = 8525ff8d52020fd601f7b97221d46a4e88e1fd77 (refs/remotes/branches/v1/start)
+branch_from: /branches/v1/start => /branches/v1/start/src/a
+Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9109-git-svn-multi-glob/svnrepo/branches/v1/start/src/a => file:///build/git-2.20.1/t/trash%20directory.t9109-git-svn-multi-glob/svnrepo/tags/end/src/a, 3
+Found branch parent: (refs/remotes/tags/end) 8525ff8d52020fd601f7b97221d46a4e88e1fd77
+Following parent with do_switch
+	M	readme
+Successfully followed parent
+r4 = 8895dca8cfa69275b3791e4f7766fe0799224a0d (refs/remotes/tags/end)
+Checked out HEAD:
+  file:///build/git-2.20.1/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: 
+	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/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 &&
+	sed -e "s/^.\{41\}//" 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 = 1822ea0f1f1c59993a194eb91b84ccbd485c82d4 (refs/remotes/two/trunk)
+Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9109-git-svn-multi-glob/svnrepo/trunk => file:///build/git-2.20.1/t/trash%20directory.t9109-git-svn-multi-glob/svnrepo/branches/v1/start, 1
+Found branch parent: (refs/remotes/two/branches/v1/start) 1822ea0f1f1c59993a194eb91b84ccbd485c82d4
+Following parent with do_switch
+Successfully followed parent
+r2 = cd5d2b39bb326088b189b144df08635a427d5f3a (refs/remotes/two/branches/v1/start)
+	M	src/a/readme
+	M	src/b/readme
+r3 = 6c6a214064c0f665ab58a4da213929237459ce06 (refs/remotes/two/branches/v1/start)
+Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9109-git-svn-multi-glob/svnrepo/branches/v1/start => file:///build/git-2.20.1/t/trash%20directory.t9109-git-svn-multi-glob/svnrepo/tags/end, 3
+Found branch parent: (refs/remotes/two/tags/end) 6c6a214064c0f665ab58a4da213929237459ce06
+Following parent with do_switch
+	M	src/a/readme
+	M	src/b/readme
+Successfully followed parent
+r4 = 9aba5568e76f20a46c23db0bdedd6cec89efde73 (refs/remotes/two/tags/end)
+	M	src/b/readme
+r5 = 815b51d85c7befa9a9f095497d5a2523a63aff1c (refs/remotes/two/tags/end)
+	M	src/b/readme
+r6 = 6dddfcd68953a642cc8de6d0ad5a5881d0a4daa9 (refs/remotes/two/tags/end)
+ok 2 - test left-hand-side only globbing
+
+expecting success: 
+	(
+		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 &&
+	sed -e "s/^.\{41\}//" 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 = 1822ea0f1f1c59993a194eb91b84ccbd485c82d4 (refs/remotes/four/trunk)
+Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9109-git-svn-multi-glob/svnrepo/trunk => file:///build/git-2.20.1/t/trash%20directory.t9109-git-svn-multi-glob/svnrepo/branches/v1/start, 1
+Found branch parent: (refs/remotes/four/branches/v1/start) 1822ea0f1f1c59993a194eb91b84ccbd485c82d4
+Following parent with do_switch
+Successfully followed parent
+r2 = cd5d2b39bb326088b189b144df08635a427d5f3a (refs/remotes/four/branches/v1/start)
+	M	src/a/readme
+	M	src/b/readme
+r3 = 6c6a214064c0f665ab58a4da213929237459ce06 (refs/remotes/four/branches/v1/start)
+Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9109-git-svn-multi-glob/svnrepo/branches/v1/start => file:///build/git-2.20.1/t/trash%20directory.t9109-git-svn-multi-glob/svnrepo/tags/end, 3
+Found branch parent: (refs/remotes/four/tags/end) 6c6a214064c0f665ab58a4da213929237459ce06
+Following parent with do_switch
+	M	src/a/readme
+	M	src/b/readme
+Successfully followed parent
+r4 = 9aba5568e76f20a46c23db0bdedd6cec89efde73 (refs/remotes/four/tags/end)
+	M	src/b/readme
+r5 = 815b51d85c7befa9a9f095497d5a2523a63aff1c (refs/remotes/four/tags/end)
+	M	src/b/readme
+r6 = 6dddfcd68953a642cc8de6d0ad5a5881d0a4daa9 (refs/remotes/four/tags/end)
+Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9109-git-svn-multi-glob/svnrepo/trunk => file:///build/git-2.20.1/t/trash%20directory.t9109-git-svn-multi-glob/svnrepo/branches/v2/start, 3
+Found branch parent: (refs/remotes/four/branches/v2/start) 1822ea0f1f1c59993a194eb91b84ccbd485c82d4
+Following parent with do_switch
+Successfully followed parent
+r7 = 62242434df9d01432be09370a0edc5142bacd63b (refs/remotes/four/branches/v2/start)
+	M	src/a/readme
+	M	src/b/readme
+r8 = 231d84cfec47942c05f0f62e18d89029d17ce0e4 (refs/remotes/four/branches/v2/start)
+Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9109-git-svn-multi-glob/svnrepo/branches/v2/start => file:///build/git-2.20.1/t/trash%20directory.t9109-git-svn-multi-glob/svnrepo/tags/next, 8
+Found branch parent: (refs/remotes/four/tags/next) 231d84cfec47942c05f0f62e18d89029d17ce0e4
+Following parent with do_switch
+	M	src/a/readme
+	M	src/b/readme
+Successfully followed parent
+r9 = 28ba11f6f0dfc397cd739b721d48477aa49fceac (refs/remotes/four/tags/next)
+	M	src/b/readme
+r10 = 22502a736d0db79da6cb164ae68cdd2d928ad981 (refs/remotes/four/tags/next)
+ok 3 - test another branch
+
+expecting success: 
+cat >expect.three <<EOF
+Only one set of wildcards (e.g. '*' or '*/*/*') is supported: branches/*/t/*
+
+EOF
+	
+ok 4 - prepare test disallow multiple globs
+
+expecting success: 
+	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 11.
+ok 5 - test disallow multiple globs
+
+# passed all 5 test(s)
+1..5
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t9123-git-svn-rebuild-with-rewriteroot.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9123-git-svn-rebuild-with-rewriteroot/.git/
+expecting success: 
+	git svn init --rewrite-root=http://invalid.invalid/ "$svnrepo" &&
+	git svn fetch &&
+	git checkout -b mybranch remotes/git-svn
+	
+	A	foo
+r1 = 56da8b62a756024fdff53b9efa219c6e7e62431c (refs/remotes/git-svn)
+Checked out HEAD:
+  file:///build/git-2.20.1/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: 
+	rm "$GIT_SVN_DIR"/.rev_map.*
+	
+ok 2 - remove rev_map
+
+expecting success: 
+	git svn rebase >/dev/null
+	
+ok 3 - rebuild rev_map
+
+# passed all 3 test(s)
+1..3
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t9126-git-svn-follow-deleted-readded-directory.sh ***
+Initialized empty Git repository in /build/git-2.20.1/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/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t9128-git-svn-cmd-branch.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9128-git-svn-cmd-branch/.git/
+skipping test t9128 altogether
+1..0 # SKIP skip all tests in t9128
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
 *** t7112-reset-submodule.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7112-reset-submodule/.git/
 expecting success: 
@@ -317182,21 +318492,21 @@
 		)
 	
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update_sub1/.git/
-[master (root-commit) 3d81de3] Base inside first submodule
+[master (root-commit) 0ed6db5] 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/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update_sub2/.git/
-[master (root-commit) 318f4bd] nested submodule base
+[master (root-commit) 5f0c5f9] 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/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update_repo/.git/
-[master (root-commit) 4f39616] Base
+[master (root-commit) 57e0c19] Base
  Author: A U Thor <author@example.com>
  3 files changed, 4 insertions(+)
  create mode 100644 .gitignore
@@ -317207,7 +318517,7 @@
 done.
 Cloning into '/build/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update_repo/uninitialized_sub'...
 done.
-[add_sub1 8408ab2] Add sub1
+[add_sub1 139f1bf] Add sub1
  Author: A U Thor <author@example.com>
  2 files changed, 8 insertions(+)
  create mode 100644 .gitmodules
@@ -317216,45 +318526,45 @@
 Removing uninitialized_sub
 Removing sub1
 Removing .gitmodules
-[remove_sub1 af1dd81] Revert "Add sub1"
+[remove_sub1 8ba99cb] Revert "Add sub1"
  Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:09:28 2021 +0000
+ Date: Thu Jan 5 11:49:45 2023 +0000
  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 d561bc8] modified file2 and added file3
+[modifications eabea0c] 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/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update_sub1
  * [new branch]      modifications -> modifications
-[modify_sub1 54656e0] Modify sub1
+[modify_sub1 2db46ca] 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/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update_repo/sub1/sub2'...
 done.
-[add_nested_sub faebae8] add a nested submodule
+[add_nested_sub 6e6ea9a] 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 04b4532] update submodule, that updates a nested submodule
+[add_nested_sub e5fd312] 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 78b1341] make a change in nested sub
+[modify_sub1_recursively 8444434] 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 7674ae2] update nested sub
+[modify_sub1_recursively 1b962ed] update nested sub
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-[modify_sub1_recursively cc37cb9] update sub1, that updates nested sub
+[modify_sub1_recursively 8756b74] update sub1, that updates nested sub
  Author: A U Thor <author@example.com>
 To /build/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update_sub1
  * [new branch]      modify_sub1_recursively -> modify_sub1_recursively
@@ -317263,11 +318573,11 @@
 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 '3d81de3941d60f57e05396e35392cd2c6296ea98'
-Previous HEAD position was 3d81de3 Base inside first submodule
+Submodule path 'sub1': checked out '0ed6db5622e5e3701b49973ce199a51e48ac9eb4'
+Previous HEAD position was 0ed6db5 Base inside first submodule
 Switched to branch 'modifications'
 rm 'sub1'
-[replace_sub1_with_directory 5968646] Replace sub1 with directory
+[replace_sub1_with_directory e4d43a6] Replace sub1 with directory
  Author: A U Thor <author@example.com>
  5 files changed, 3 insertions(+), 5 deletions(-)
  delete mode 160000 sub1
@@ -317279,32 +318589,32 @@
 Removing sub1/file2
 Removing sub1/file1
 Adding sub1
-[replace_directory_with_sub1 8ea0f2b] Revert "Replace sub1 with directory"
+[replace_directory_with_sub1 883b3d2] Revert "Replace sub1 with directory"
  Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:09:30 2021 +0000
+ Date: Thu Jan 5 11:49:47 2023 +0000
  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 2cdd674] Replace sub1 with file
+[replace_sub1_with_file 07c229f] 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 2febcc3] Revert "Replace sub1 with file"
+[replace_file_with_sub1 e920f39] Revert "Replace sub1 with file"
  Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:09:30 2021 +0000
+ Date: Thu Jan 5 11:49:47 2023 +0000
  2 files changed, 5 insertions(+), 1 deletion(-)
  mode change 100644 => 160000 sub1
 Switched to a new branch 'invalid_sub1'
-[invalid_sub1 eb92071] Invalid sub1 commit
+[invalid_sub1 3867b17] Invalid sub1 commit
  Author: A U Thor <author@example.com>
 Switched to a new branch 'valid_sub1'
-[valid_sub1 d8b1884] Revert "Invalid sub1 commit"
+[valid_sub1 c4e794c] Revert "Invalid sub1 commit"
  Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:09:30 2021 +0000
+ Date: Thu Jan 5 11:49:47 2023 +0000
 warning: unable to rmdir 'uninitialized_sub': Directory not empty
 Switched to branch 'master'
 Cloning into 'submodule_update'...
@@ -317356,7 +318666,7 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out '3d81de3941d60f57e05396e35392cd2c6296ea98'
+Submodule path 'sub1': checked out '0ed6db5622e5e3701b49973ce199a51e48ac9eb4'
 Switched to a new branch 'keep_branch'
 Branch 'modify_sub1' set up to track remote branch 'modify_sub1' from 'origin'.
 fatal: ref HEAD is not a symbolic ref
@@ -317418,7 +318728,7 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out '3d81de3941d60f57e05396e35392cd2c6296ea98'
+Submodule path 'sub1': checked out '0ed6db5622e5e3701b49973ce199a51e48ac9eb4'
 Branch 'remove_sub1' set up to track remote branch 'remove_sub1' from 'origin'.
 ok 6 - git reset --keep --recurse-submodules: removed submodule removes submodules working tree
 
@@ -317443,7 +318753,7 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out '3d81de3941d60f57e05396e35392cd2c6296ea98'
+Submodule path 'sub1': checked out '0ed6db5622e5e3701b49973ce199a51e48ac9eb4'
 Branch 'remove_sub1' set up to track remote branch 'remove_sub1' from 'origin'.
 Migrating git directory of 'sub1' from
 '/build/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update/sub1/.git' to
@@ -317468,7 +318778,7 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out '3d81de3941d60f57e05396e35392cd2c6296ea98'
+Submodule path 'sub1': checked out '0ed6db5622e5e3701b49973ce199a51e48ac9eb4'
 Branch 'replace_sub1_with_file' set up to track remote branch 'replace_sub1_with_file' from 'origin'.
 ok 8 - git reset --keep --recurse-submodules: replace submodule with a file
 
@@ -317492,7 +318802,7 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out '3d81de3941d60f57e05396e35392cd2c6296ea98'
+Submodule path 'sub1': checked out '0ed6db5622e5e3701b49973ce199a51e48ac9eb4'
 Branch 'replace_sub1_with_file' set up to track remote branch 'replace_sub1_with_file' from 'origin'.
 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
@@ -317515,7 +318825,7 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out '3d81de3941d60f57e05396e35392cd2c6296ea98'
+Submodule path 'sub1': checked out '0ed6db5622e5e3701b49973ce199a51e48ac9eb4'
 Branch 'modify_sub1' set up to track remote branch 'modify_sub1' from 'origin'.
 ok 10 - git reset --keep --recurse-submodules: modified submodule updates submodule work tree
 
@@ -317538,7 +318848,7 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out '3d81de3941d60f57e05396e35392cd2c6296ea98'
+Submodule path 'sub1': checked out '0ed6db5622e5e3701b49973ce199a51e48ac9eb4'
 Branch 'invalid_sub1' set up to track remote branch 'invalid_sub1' from 'origin'.
 error: Submodule 'sub1' could not be updated.
 error: Submodule 'sub1' cannot checkout new HEAD.
@@ -317607,7 +318917,7 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out '3d81de3941d60f57e05396e35392cd2c6296ea98'
+Submodule path 'sub1': checked out '0ed6db5622e5e3701b49973ce199a51e48ac9eb4'
 Branch 'replace_sub1_with_directory' set up to track remote branch 'replace_sub1_with_directory' from 'origin'.
 error: Untracked working tree file 'sub1/file1' would be overwritten by merge.
 fatal: Could not reset index file to revision 'replace_sub1_with_directory'.
@@ -317633,7 +318943,7 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out '3d81de3941d60f57e05396e35392cd2c6296ea98'
+Submodule path 'sub1': checked out '0ed6db5622e5e3701b49973ce199a51e48ac9eb4'
 Branch 'replace_sub1_with_directory' set up to track remote branch 'replace_sub1_with_directory' from 'origin'.
 error: Untracked working tree file 'sub1/file1' would be overwritten by merge.
 fatal: Could not reset index file to revision 'replace_sub1_with_directory'.
@@ -317660,7 +318970,7 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out '3d81de3941d60f57e05396e35392cd2c6296ea98'
+Submodule path 'sub1': checked out '0ed6db5622e5e3701b49973ce199a51e48ac9eb4'
 Branch 'replace_sub1_with_file' set up to track remote branch 'replace_sub1_with_file' from 'origin'.
 ok 16 - git reset --keep --recurse-submodules: replace submodule with a file works ignores ignored files in submodule
 
@@ -317682,7 +318992,7 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out '3d81de3941d60f57e05396e35392cd2c6296ea98'
+Submodule path 'sub1': checked out '0ed6db5622e5e3701b49973ce199a51e48ac9eb4'
 Branch 'modify_sub1' set up to track remote branch 'modify_sub1' from 'origin'.
 ok 17 - git -c submodule.recurse=true reset --keep: modified submodule updates submodule work tree
 
@@ -317705,11 +319015,11 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out 'faebae85e7bc50eacc47d88f842cbbb82e7eb939'
+Submodule path 'sub1': checked out '6e6ea9a74d530ac63e2d4b9865464034fa8a141f'
 Submodule 'sub2' (/build/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update_sub2) registered for path 'sub1/sub2'
 Cloning into '/build/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update/sub1/sub2'...
 done.
-Submodule path 'sub1/sub2': checked out '318f4bdfc5a9b9a32a2b453c447f568a99c8afc8'
+Submodule path 'sub1/sub2': checked out '5f0c5f9e48260f02c6bb02e509927d56bfb85cd4'
 Branch 'modify_sub1_recursively' set up to track remote branch 'modify_sub1_recursively' from 'origin'.
 ok 18 - git reset --keep --recurse-submodules: modified submodule updates submodule recursively
 
@@ -317729,7 +319039,7 @@
 Switched to a new branch 'no_submodule'
 Branch 'no_submodule' set up to track remote branch 'no_submodule' from 'origin'.
 Branch 'add_sub1' set up to track remote branch 'add_sub1' from 'origin'.
-HEAD is now at 8408ab2 Add sub1
+HEAD is now at 139f1bf Add sub1
 ok 19 - git reset --hard --recurse-submodules: added submodule is checked out
 
 expecting success: 
@@ -317749,7 +319059,7 @@
 Switched to a new branch 'no_submodule'
 Branch 'no_submodule' set up to track remote branch 'no_submodule' from 'origin'.
 Branch 'add_sub1' set up to track remote branch 'add_sub1' from 'origin'.
-HEAD is now at 8408ab2 Add sub1
+HEAD is now at 139f1bf Add sub1
 ok 20 - git reset --hard --recurse-submodules: added submodule is checked out in empty dir
 
 expecting success: 
@@ -317775,10 +319085,10 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out '3d81de3941d60f57e05396e35392cd2c6296ea98'
+Submodule path 'sub1': checked out '0ed6db5622e5e3701b49973ce199a51e48ac9eb4'
 Switched to a new branch 'keep_branch'
 Branch 'modify_sub1' set up to track remote branch 'modify_sub1' from 'origin'.
-HEAD is now at 54656e0 Modify sub1
+HEAD is now at 2db46ca Modify sub1
 fatal: ref HEAD is not a symbolic ref
 ok 21 - git reset --hard --recurse-submodules: submodule branch is not changed, detach HEAD instead
 
@@ -317799,7 +319109,7 @@
 Branch 'replace_sub1_with_file' set up to track remote branch 'replace_sub1_with_file' from 'origin'.
 fatal: Needed a single revision
 Branch 'replace_file_with_sub1' set up to track remote branch 'replace_file_with_sub1' from 'origin'.
-HEAD is now at 2febcc3 Revert "Replace sub1 with file"
+HEAD is now at e920f39 Revert "Replace sub1 with file"
 ok 22 - git reset --hard --recurse-submodules: replace tracked file with submodule checks out submodule
 
 expecting success: 
@@ -317819,7 +319129,7 @@
 Branch 'replace_sub1_with_directory' set up to track remote branch 'replace_sub1_with_directory' from 'origin'.
 fatal: Needed a single revision
 Branch 'replace_directory_with_sub1' set up to track remote branch 'replace_directory_with_sub1' from 'origin'.
-HEAD is now at 8ea0f2b Revert "Replace sub1 with directory"
+HEAD is now at 883b3d2 Revert "Replace sub1 with directory"
 ok 23 - git reset --hard --recurse-submodules: replace directory with submodule
 
 expecting success: 
@@ -317840,9 +319150,9 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out '3d81de3941d60f57e05396e35392cd2c6296ea98'
+Submodule path 'sub1': checked out '0ed6db5622e5e3701b49973ce199a51e48ac9eb4'
 Branch 'remove_sub1' set up to track remote branch 'remove_sub1' from 'origin'.
-HEAD is now at af1dd81 Revert "Add sub1"
+HEAD is now at 8ba99cb Revert "Add sub1"
 ok 24 - git reset --hard --recurse-submodules: removed submodule removes submodules working tree
 
 expecting success: 
@@ -317866,12 +319176,12 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out '3d81de3941d60f57e05396e35392cd2c6296ea98'
+Submodule path 'sub1': checked out '0ed6db5622e5e3701b49973ce199a51e48ac9eb4'
 Branch 'remove_sub1' set up to track remote branch 'remove_sub1' from 'origin'.
 Migrating git directory of 'sub1' from
 '/build/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update/sub1/.git' to
 '/build/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update/.git/modules/sub1'
-HEAD is now at af1dd81 Revert "Add sub1"
+HEAD is now at 8ba99cb Revert "Add sub1"
 ok 25 - git reset --hard --recurse-submodules: removed submodule absorbs submodules .git directory
 
 expecting success: 
@@ -317892,9 +319202,9 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out '3d81de3941d60f57e05396e35392cd2c6296ea98'
+Submodule path 'sub1': checked out '0ed6db5622e5e3701b49973ce199a51e48ac9eb4'
 Branch 'replace_sub1_with_file' set up to track remote branch 'replace_sub1_with_file' from 'origin'.
-HEAD is now at 2cdd674 Replace sub1 with file
+HEAD is now at 07c229f Replace sub1 with file
 ok 26 - git reset --hard --recurse-submodules: replace submodule with a file
 
 checking known breakage: 
@@ -317917,9 +319227,9 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out '3d81de3941d60f57e05396e35392cd2c6296ea98'
+Submodule path 'sub1': checked out '0ed6db5622e5e3701b49973ce199a51e48ac9eb4'
 Branch 'replace_sub1_with_file' set up to track remote branch 'replace_sub1_with_file' from 'origin'.
-HEAD is now at 2cdd674 Replace sub1 with file
+HEAD is now at 07c229f Replace sub1 with file
 test_must_fail: command succeeded: git reset --hard --recurse-submodules replace_sub1_with_file
 not ok 27 - git reset --hard --recurse-submodules: replace submodule with a file must fail with untracked files # TODO known breakage
 
@@ -317941,9 +319251,9 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out '3d81de3941d60f57e05396e35392cd2c6296ea98'
+Submodule path 'sub1': checked out '0ed6db5622e5e3701b49973ce199a51e48ac9eb4'
 Branch 'modify_sub1' set up to track remote branch 'modify_sub1' from 'origin'.
-HEAD is now at 54656e0 Modify sub1
+HEAD is now at 2db46ca Modify sub1
 ok 28 - git reset --hard --recurse-submodules: modified submodule updates submodule work tree
 
 expecting success: 
@@ -317965,7 +319275,7 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out '3d81de3941d60f57e05396e35392cd2c6296ea98'
+Submodule path 'sub1': checked out '0ed6db5622e5e3701b49973ce199a51e48ac9eb4'
 Branch 'invalid_sub1' set up to track remote branch 'invalid_sub1' from 'origin'.
 error: Submodule 'sub1' could not be updated.
 error: Submodule 'sub1' cannot checkout new HEAD.
@@ -317989,7 +319299,7 @@
 Switched to a new branch 'no_submodule'
 Branch 'no_submodule' set up to track remote branch 'no_submodule' from 'origin'.
 Branch 'add_sub1' set up to track remote branch 'add_sub1' from 'origin'.
-HEAD is now at 8408ab2 Add sub1
+HEAD is now at 139f1bf Add sub1
 ok 30 - git reset --hard --recurse-submodules: added submodule does remove untracked unignored file with same name when forced
 
 expecting success: 
@@ -318009,9 +319319,9 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out '3d81de3941d60f57e05396e35392cd2c6296ea98'
+Submodule path 'sub1': checked out '0ed6db5622e5e3701b49973ce199a51e48ac9eb4'
 Branch 'replace_sub1_with_directory' set up to track remote branch 'replace_sub1_with_directory' from 'origin'.
-HEAD is now at 5968646 Replace sub1 with directory
+HEAD is now at e4d43a6 Replace sub1 with directory
 ok 31 - git reset --hard --recurse-submodules: replace submodule with a directory
 
 expecting success: 
@@ -318034,12 +319344,12 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out '3d81de3941d60f57e05396e35392cd2c6296ea98'
+Submodule path 'sub1': checked out '0ed6db5622e5e3701b49973ce199a51e48ac9eb4'
 Branch 'replace_sub1_with_directory' set up to track remote branch 'replace_sub1_with_directory' from 'origin'.
 Migrating git directory of 'sub1' from
 '/build/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update/sub1/.git' to
 '/build/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update/.git/modules/sub1'
-HEAD is now at 5968646 Replace sub1 with directory
+HEAD is now at e4d43a6 Replace sub1 with directory
 ok 32 - git reset --hard --recurse-submodules: replace submodule containing a .git directory with a directory must fail
 
 expecting success: 
@@ -318060,9 +319370,9 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out '3d81de3941d60f57e05396e35392cd2c6296ea98'
+Submodule path 'sub1': checked out '0ed6db5622e5e3701b49973ce199a51e48ac9eb4'
 Branch 'replace_sub1_with_file' set up to track remote branch 'replace_sub1_with_file' from 'origin'.
-HEAD is now at 2cdd674 Replace sub1 with file
+HEAD is now at 07c229f Replace sub1 with file
 ok 33 - git reset --hard --recurse-submodules: replace submodule with a file ignoring ignored files
 
 expecting success: 
@@ -318082,7 +319392,7 @@
 Branch 'invalid_sub1' set up to track remote branch 'invalid_sub1' from 'origin'.
 fatal: Needed a single revision
 Branch 'valid_sub1' set up to track remote branch 'valid_sub1' from 'origin'.
-HEAD is now at d8b1884 Revert "Invalid sub1 commit"
+HEAD is now at c4e794c Revert "Invalid sub1 commit"
 ok 34 - git reset --hard --recurse-submodules: modified submodule does update submodule work tree from invalid commit
 
 expecting success: 
@@ -318104,9 +319414,9 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out '3d81de3941d60f57e05396e35392cd2c6296ea98'
+Submodule path 'sub1': checked out '0ed6db5622e5e3701b49973ce199a51e48ac9eb4'
 Branch 'modify_sub1' set up to track remote branch 'modify_sub1' from 'origin'.
-HEAD is now at 54656e0 Modify sub1
+HEAD is now at 2db46ca Modify sub1
 ok 35 - git reset --hard --recurse-submodules: updating submodules fixes .git links
 
 expecting success: 
@@ -318129,8 +319439,8 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out '3d81de3941d60f57e05396e35392cd2c6296ea98'
-HEAD is now at 8408ab2 Add sub1
+Submodule path 'sub1': checked out '0ed6db5622e5e3701b49973ce199a51e48ac9eb4'
+HEAD is now at 139f1bf Add sub1
 ok 36 - git reset --hard --recurse-submodules: changed submodule worktree is reset
 
 expecting success: 
@@ -318157,8 +319467,8 @@
 done.
 Cloning into '/build/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update/uninitialized_sub'...
 done.
-Submodule path 'sub1': checked out '3d81de3941d60f57e05396e35392cd2c6296ea98'
-Submodule path 'uninitialized_sub': checked out '3d81de3941d60f57e05396e35392cd2c6296ea98'
+Submodule path 'sub1': checked out '0ed6db5622e5e3701b49973ce199a51e48ac9eb4'
+Submodule path 'uninitialized_sub': checked out '0ed6db5622e5e3701b49973ce199a51e48ac9eb4'
 ok 37 - git reset --keep: added submodule creates empty directory
 
 expecting success: 
@@ -318186,8 +319496,8 @@
 done.
 Cloning into '/build/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update/uninitialized_sub'...
 done.
-Submodule path 'sub1': checked out '3d81de3941d60f57e05396e35392cd2c6296ea98'
-Submodule path 'uninitialized_sub': checked out '3d81de3941d60f57e05396e35392cd2c6296ea98'
+Submodule path 'sub1': checked out '0ed6db5622e5e3701b49973ce199a51e48ac9eb4'
+Submodule path 'uninitialized_sub': checked out '0ed6db5622e5e3701b49973ce199a51e48ac9eb4'
 ok 38 - git reset --keep: added submodule leaves existing empty directory alone
 
 expecting success: 
@@ -318215,8 +319525,8 @@
 done.
 Cloning into '/build/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update/uninitialized_sub'...
 done.
-Submodule path 'sub1': checked out '3d81de3941d60f57e05396e35392cd2c6296ea98'
-Submodule path 'uninitialized_sub': checked out '3d81de3941d60f57e05396e35392cd2c6296ea98'
+Submodule path 'sub1': checked out '0ed6db5622e5e3701b49973ce199a51e48ac9eb4'
+Submodule path 'uninitialized_sub': checked out '0ed6db5622e5e3701b49973ce199a51e48ac9eb4'
 ok 39 - git reset --keep: replace tracked file with submodule creates empty directory
 
 expecting success: 
@@ -318244,8 +319554,8 @@
 done.
 Cloning into '/build/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update/uninitialized_sub'...
 done.
-Submodule path 'sub1': checked out '3d81de3941d60f57e05396e35392cd2c6296ea98'
-Submodule path 'uninitialized_sub': checked out '3d81de3941d60f57e05396e35392cd2c6296ea98'
+Submodule path 'sub1': checked out '0ed6db5622e5e3701b49973ce199a51e48ac9eb4'
+Submodule path 'uninitialized_sub': checked out '0ed6db5622e5e3701b49973ce199a51e48ac9eb4'
 ok 40 - git reset --keep: replace directory with submodule
 
 expecting success: 
@@ -318266,7 +319576,7 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out '3d81de3941d60f57e05396e35392cd2c6296ea98'
+Submodule path 'sub1': checked out '0ed6db5622e5e3701b49973ce199a51e48ac9eb4'
 Branch 'remove_sub1' set up to track remote branch 'remove_sub1' from 'origin'.
 warning: unable to rmdir 'sub1': Directory not empty
 ok 41 - git reset --keep: removed submodule leaves submodule directory and its contents in place
@@ -318291,7 +319601,7 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out '3d81de3941d60f57e05396e35392cd2c6296ea98'
+Submodule path 'sub1': checked out '0ed6db5622e5e3701b49973ce199a51e48ac9eb4'
 Branch 'remove_sub1' set up to track remote branch 'remove_sub1' from 'origin'.
 warning: unable to rmdir 'sub1': Directory not empty
 ok 42 - git reset --keep: removed submodule leaves submodule containing a .git directory alone
@@ -318314,7 +319624,7 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out '3d81de3941d60f57e05396e35392cd2c6296ea98'
+Submodule path 'sub1': checked out '0ed6db5622e5e3701b49973ce199a51e48ac9eb4'
 Branch 'replace_sub1_with_directory' set up to track remote branch 'replace_sub1_with_directory' from 'origin'.
 error: Untracked working tree file 'sub1/file1' would be overwritten by merge.
 fatal: Could not reset index file to revision 'replace_sub1_with_directory'.
@@ -318340,7 +319650,7 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out '3d81de3941d60f57e05396e35392cd2c6296ea98'
+Submodule path 'sub1': checked out '0ed6db5622e5e3701b49973ce199a51e48ac9eb4'
 Branch 'replace_sub1_with_directory' set up to track remote branch 'replace_sub1_with_directory' from 'origin'.
 error: Untracked working tree file 'sub1/file1' would be overwritten by merge.
 fatal: Could not reset index file to revision 'replace_sub1_with_directory'.
@@ -318364,7 +319674,7 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out '3d81de3941d60f57e05396e35392cd2c6296ea98'
+Submodule path 'sub1': checked out '0ed6db5622e5e3701b49973ce199a51e48ac9eb4'
 Branch 'replace_sub1_with_file' set up to track remote branch 'replace_sub1_with_file' from 'origin'.
 test_must_fail: command succeeded: git reset --keep replace_sub1_with_file
 not ok 45 - git reset --keep: replace submodule with a file must fail # TODO known breakage
@@ -318389,7 +319699,7 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out '3d81de3941d60f57e05396e35392cd2c6296ea98'
+Submodule path 'sub1': checked out '0ed6db5622e5e3701b49973ce199a51e48ac9eb4'
 Branch 'replace_sub1_with_file' set up to track remote branch 'replace_sub1_with_file' from 'origin'.
 test_must_fail: command succeeded: git reset --keep replace_sub1_with_file
 not ok 46 - git reset --keep: replace submodule containing a .git directory with a file must fail # TODO known breakage
@@ -318414,9 +319724,9 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out '3d81de3941d60f57e05396e35392cd2c6296ea98'
+Submodule path 'sub1': checked out '0ed6db5622e5e3701b49973ce199a51e48ac9eb4'
 Branch 'modify_sub1' set up to track remote branch 'modify_sub1' from 'origin'.
-Submodule path 'sub1': checked out 'd561bc8c2cc3c5c24da7f4d64e0209dd2f34cc90'
+Submodule path 'sub1': checked out 'eabea0ccd59b2361e7874c34ae40dd6834503e34'
 ok 47 - git reset --keep: modified submodule does not update submodule work tree
 
 expecting success: 
@@ -318439,7 +319749,7 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out '3d81de3941d60f57e05396e35392cd2c6296ea98'
+Submodule path 'sub1': checked out '0ed6db5622e5e3701b49973ce199a51e48ac9eb4'
 Branch 'invalid_sub1' set up to track remote branch 'invalid_sub1' from 'origin'.
 error: Server does not allow request for unadvertised object 0123456789012345678901234567890123456789
 Fetched in submodule path 'sub1', but it did not contain 0123456789012345678901234567890123456789. Direct fetching of that commit failed.
@@ -318470,8 +319780,8 @@
 done.
 Cloning into '/build/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update/uninitialized_sub'...
 done.
-Submodule path 'sub1': checked out '3d81de3941d60f57e05396e35392cd2c6296ea98'
-Submodule path 'uninitialized_sub': checked out '3d81de3941d60f57e05396e35392cd2c6296ea98'
+Submodule path 'sub1': checked out '0ed6db5622e5e3701b49973ce199a51e48ac9eb4'
+Submodule path 'uninitialized_sub': checked out '0ed6db5622e5e3701b49973ce199a51e48ac9eb4'
 ok 49 - git reset --keep: modified submodule does not update submodule work tree from invalid commit
 
 expecting success: 
@@ -318519,8 +319829,8 @@
 done.
 Cloning into '/build/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update/uninitialized_sub'...
 done.
-Submodule path 'sub1': checked out '3d81de3941d60f57e05396e35392cd2c6296ea98'
-Submodule path 'uninitialized_sub': checked out '3d81de3941d60f57e05396e35392cd2c6296ea98'
+Submodule path 'sub1': checked out '0ed6db5622e5e3701b49973ce199a51e48ac9eb4'
+Submodule path 'uninitialized_sub': checked out '0ed6db5622e5e3701b49973ce199a51e48ac9eb4'
 ok 51 - git reset --merge: added submodule creates empty directory
 
 expecting success: 
@@ -318548,8 +319858,8 @@
 done.
 Cloning into '/build/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update/uninitialized_sub'...
 done.
-Submodule path 'sub1': checked out '3d81de3941d60f57e05396e35392cd2c6296ea98'
-Submodule path 'uninitialized_sub': checked out '3d81de3941d60f57e05396e35392cd2c6296ea98'
+Submodule path 'sub1': checked out '0ed6db5622e5e3701b49973ce199a51e48ac9eb4'
+Submodule path 'uninitialized_sub': checked out '0ed6db5622e5e3701b49973ce199a51e48ac9eb4'
 ok 52 - git reset --merge: added submodule leaves existing empty directory alone
 
 expecting success: 
@@ -318577,8 +319887,8 @@
 done.
 Cloning into '/build/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update/uninitialized_sub'...
 done.
-Submodule path 'sub1': checked out '3d81de3941d60f57e05396e35392cd2c6296ea98'
-Submodule path 'uninitialized_sub': checked out '3d81de3941d60f57e05396e35392cd2c6296ea98'
+Submodule path 'sub1': checked out '0ed6db5622e5e3701b49973ce199a51e48ac9eb4'
+Submodule path 'uninitialized_sub': checked out '0ed6db5622e5e3701b49973ce199a51e48ac9eb4'
 ok 53 - git reset --merge: replace tracked file with submodule creates empty directory
 
 expecting success: 
@@ -318606,8 +319916,8 @@
 done.
 Cloning into '/build/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update/uninitialized_sub'...
 done.
-Submodule path 'sub1': checked out '3d81de3941d60f57e05396e35392cd2c6296ea98'
-Submodule path 'uninitialized_sub': checked out '3d81de3941d60f57e05396e35392cd2c6296ea98'
+Submodule path 'sub1': checked out '0ed6db5622e5e3701b49973ce199a51e48ac9eb4'
+Submodule path 'uninitialized_sub': checked out '0ed6db5622e5e3701b49973ce199a51e48ac9eb4'
 ok 54 - git reset --merge: replace directory with submodule
 
 expecting success: 
@@ -318628,7 +319938,7 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out '3d81de3941d60f57e05396e35392cd2c6296ea98'
+Submodule path 'sub1': checked out '0ed6db5622e5e3701b49973ce199a51e48ac9eb4'
 Branch 'remove_sub1' set up to track remote branch 'remove_sub1' from 'origin'.
 warning: unable to rmdir 'sub1': Directory not empty
 ok 55 - git reset --merge: removed submodule leaves submodule directory and its contents in place
@@ -318653,7 +319963,7 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out '3d81de3941d60f57e05396e35392cd2c6296ea98'
+Submodule path 'sub1': checked out '0ed6db5622e5e3701b49973ce199a51e48ac9eb4'
 Branch 'remove_sub1' set up to track remote branch 'remove_sub1' from 'origin'.
 warning: unable to rmdir 'sub1': Directory not empty
 ok 56 - git reset --merge: removed submodule leaves submodule containing a .git directory alone
@@ -318676,7 +319986,7 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out '3d81de3941d60f57e05396e35392cd2c6296ea98'
+Submodule path 'sub1': checked out '0ed6db5622e5e3701b49973ce199a51e48ac9eb4'
 Branch 'replace_sub1_with_directory' set up to track remote branch 'replace_sub1_with_directory' from 'origin'.
 error: Untracked working tree file 'sub1/file1' would be overwritten by merge.
 fatal: Could not reset index file to revision 'replace_sub1_with_directory'.
@@ -318702,7 +320012,7 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out '3d81de3941d60f57e05396e35392cd2c6296ea98'
+Submodule path 'sub1': checked out '0ed6db5622e5e3701b49973ce199a51e48ac9eb4'
 Branch 'replace_sub1_with_directory' set up to track remote branch 'replace_sub1_with_directory' from 'origin'.
 error: Untracked working tree file 'sub1/file1' would be overwritten by merge.
 fatal: Could not reset index file to revision 'replace_sub1_with_directory'.
@@ -318726,7 +320036,7 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out '3d81de3941d60f57e05396e35392cd2c6296ea98'
+Submodule path 'sub1': checked out '0ed6db5622e5e3701b49973ce199a51e48ac9eb4'
 Branch 'replace_sub1_with_file' set up to track remote branch 'replace_sub1_with_file' from 'origin'.
 test_must_fail: command succeeded: git reset --merge replace_sub1_with_file
 not ok 59 - git reset --merge: replace submodule with a file must fail # TODO known breakage
@@ -318751,7 +320061,7 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out '3d81de3941d60f57e05396e35392cd2c6296ea98'
+Submodule path 'sub1': checked out '0ed6db5622e5e3701b49973ce199a51e48ac9eb4'
 Branch 'replace_sub1_with_file' set up to track remote branch 'replace_sub1_with_file' from 'origin'.
 test_must_fail: command succeeded: git reset --merge replace_sub1_with_file
 not ok 60 - git reset --merge: replace submodule containing a .git directory with a file must fail # TODO known breakage
@@ -318776,9 +320086,9 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out '3d81de3941d60f57e05396e35392cd2c6296ea98'
+Submodule path 'sub1': checked out '0ed6db5622e5e3701b49973ce199a51e48ac9eb4'
 Branch 'modify_sub1' set up to track remote branch 'modify_sub1' from 'origin'.
-Submodule path 'sub1': checked out 'd561bc8c2cc3c5c24da7f4d64e0209dd2f34cc90'
+Submodule path 'sub1': checked out 'eabea0ccd59b2361e7874c34ae40dd6834503e34'
 ok 61 - git reset --merge: modified submodule does not update submodule work tree
 
 expecting success: 
@@ -318801,7 +320111,7 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out '3d81de3941d60f57e05396e35392cd2c6296ea98'
+Submodule path 'sub1': checked out '0ed6db5622e5e3701b49973ce199a51e48ac9eb4'
 Branch 'invalid_sub1' set up to track remote branch 'invalid_sub1' from 'origin'.
 error: Server does not allow request for unadvertised object 0123456789012345678901234567890123456789
 Fetched in submodule path 'sub1', but it did not contain 0123456789012345678901234567890123456789. Direct fetching of that commit failed.
@@ -318832,8 +320142,8 @@
 done.
 Cloning into '/build/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update/uninitialized_sub'...
 done.
-Submodule path 'sub1': checked out '3d81de3941d60f57e05396e35392cd2c6296ea98'
-Submodule path 'uninitialized_sub': checked out '3d81de3941d60f57e05396e35392cd2c6296ea98'
+Submodule path 'sub1': checked out '0ed6db5622e5e3701b49973ce199a51e48ac9eb4'
+Submodule path 'uninitialized_sub': checked out '0ed6db5622e5e3701b49973ce199a51e48ac9eb4'
 ok 63 - git reset --merge: modified submodule does not update submodule work tree from invalid commit
 
 expecting success: 
@@ -318875,15 +320185,15 @@
 Switched to a new branch 'no_submodule'
 Branch 'no_submodule' set up to track remote branch 'no_submodule' from 'origin'.
 Branch 'add_sub1' set up to track remote branch 'add_sub1' from 'origin'.
-HEAD is now at 8408ab2 Add sub1
+HEAD is now at 139f1bf Add sub1
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
 Submodule 'uninitialized_sub' (/build/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
 Cloning into '/build/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
 done.
 Cloning into '/build/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update/uninitialized_sub'...
 done.
-Submodule path 'sub1': checked out '3d81de3941d60f57e05396e35392cd2c6296ea98'
-Submodule path 'uninitialized_sub': checked out '3d81de3941d60f57e05396e35392cd2c6296ea98'
+Submodule path 'sub1': checked out '0ed6db5622e5e3701b49973ce199a51e48ac9eb4'
+Submodule path 'uninitialized_sub': checked out '0ed6db5622e5e3701b49973ce199a51e48ac9eb4'
 ok 65 - git reset --hard: added submodule creates empty directory
 
 expecting success: 
@@ -318905,15 +320215,15 @@
 Switched to a new branch 'no_submodule'
 Branch 'no_submodule' set up to track remote branch 'no_submodule' from 'origin'.
 Branch 'add_sub1' set up to track remote branch 'add_sub1' from 'origin'.
-HEAD is now at 8408ab2 Add sub1
+HEAD is now at 139f1bf Add sub1
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
 Submodule 'uninitialized_sub' (/build/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
 Cloning into '/build/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
 done.
 Cloning into '/build/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update/uninitialized_sub'...
 done.
-Submodule path 'sub1': checked out '3d81de3941d60f57e05396e35392cd2c6296ea98'
-Submodule path 'uninitialized_sub': checked out '3d81de3941d60f57e05396e35392cd2c6296ea98'
+Submodule path 'sub1': checked out '0ed6db5622e5e3701b49973ce199a51e48ac9eb4'
+Submodule path 'uninitialized_sub': checked out '0ed6db5622e5e3701b49973ce199a51e48ac9eb4'
 ok 66 - git reset --hard: added submodule leaves existing empty directory alone
 
 expecting success: 
@@ -318935,15 +320245,15 @@
 Branch 'replace_sub1_with_file' set up to track remote branch 'replace_sub1_with_file' from 'origin'.
 fatal: Needed a single revision
 Branch 'replace_file_with_sub1' set up to track remote branch 'replace_file_with_sub1' from 'origin'.
-HEAD is now at 2febcc3 Revert "Replace sub1 with file"
+HEAD is now at e920f39 Revert "Replace sub1 with file"
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
 Submodule 'uninitialized_sub' (/build/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
 Cloning into '/build/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
 done.
 Cloning into '/build/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update/uninitialized_sub'...
 done.
-Submodule path 'sub1': checked out '3d81de3941d60f57e05396e35392cd2c6296ea98'
-Submodule path 'uninitialized_sub': checked out '3d81de3941d60f57e05396e35392cd2c6296ea98'
+Submodule path 'sub1': checked out '0ed6db5622e5e3701b49973ce199a51e48ac9eb4'
+Submodule path 'uninitialized_sub': checked out '0ed6db5622e5e3701b49973ce199a51e48ac9eb4'
 ok 67 - git reset --hard: replace tracked file with submodule creates empty directory
 
 expecting success: 
@@ -318965,15 +320275,15 @@
 Branch 'replace_sub1_with_directory' set up to track remote branch 'replace_sub1_with_directory' from 'origin'.
 fatal: Needed a single revision
 Branch 'replace_directory_with_sub1' set up to track remote branch 'replace_directory_with_sub1' from 'origin'.
-HEAD is now at 8ea0f2b Revert "Replace sub1 with directory"
+HEAD is now at 883b3d2 Revert "Replace sub1 with directory"
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
 Submodule 'uninitialized_sub' (/build/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
 Cloning into '/build/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
 done.
 Cloning into '/build/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update/uninitialized_sub'...
 done.
-Submodule path 'sub1': checked out '3d81de3941d60f57e05396e35392cd2c6296ea98'
-Submodule path 'uninitialized_sub': checked out '3d81de3941d60f57e05396e35392cd2c6296ea98'
+Submodule path 'sub1': checked out '0ed6db5622e5e3701b49973ce199a51e48ac9eb4'
+Submodule path 'uninitialized_sub': checked out '0ed6db5622e5e3701b49973ce199a51e48ac9eb4'
 ok 68 - git reset --hard: replace directory with submodule
 
 expecting success: 
@@ -318994,10 +320304,10 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out '3d81de3941d60f57e05396e35392cd2c6296ea98'
+Submodule path 'sub1': checked out '0ed6db5622e5e3701b49973ce199a51e48ac9eb4'
 Branch 'remove_sub1' set up to track remote branch 'remove_sub1' from 'origin'.
 warning: unable to rmdir 'sub1': Directory not empty
-HEAD is now at af1dd81 Revert "Add sub1"
+HEAD is now at 8ba99cb Revert "Add sub1"
 ok 69 - git reset --hard: removed submodule leaves submodule directory and its contents in place
 
 expecting success: 
@@ -319020,10 +320330,10 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out '3d81de3941d60f57e05396e35392cd2c6296ea98'
+Submodule path 'sub1': checked out '0ed6db5622e5e3701b49973ce199a51e48ac9eb4'
 Branch 'remove_sub1' set up to track remote branch 'remove_sub1' from 'origin'.
 warning: unable to rmdir 'sub1': Directory not empty
-HEAD is now at af1dd81 Revert "Add sub1"
+HEAD is now at 8ba99cb Revert "Add sub1"
 ok 70 - git reset --hard: removed submodule leaves submodule containing a .git directory alone
 
 checking known breakage: 
@@ -319044,10 +320354,10 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out '3d81de3941d60f57e05396e35392cd2c6296ea98'
+Submodule path 'sub1': checked out '0ed6db5622e5e3701b49973ce199a51e48ac9eb4'
 Branch 'replace_sub1_with_directory' set up to track remote branch 'replace_sub1_with_directory' from 'origin'.
 warning: unable to rmdir 'sub1': Directory not empty
-HEAD is now at 5968646 Replace sub1 with directory
+HEAD is now at e4d43a6 Replace sub1 with directory
 test_must_fail: command succeeded: git reset --hard replace_sub1_with_directory
 not ok 71 - git reset --hard: replace submodule with a directory must fail # TODO known breakage
 
@@ -319071,10 +320381,10 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out '3d81de3941d60f57e05396e35392cd2c6296ea98'
+Submodule path 'sub1': checked out '0ed6db5622e5e3701b49973ce199a51e48ac9eb4'
 Branch 'replace_sub1_with_directory' set up to track remote branch 'replace_sub1_with_directory' from 'origin'.
 warning: unable to rmdir 'sub1': Directory not empty
-HEAD is now at 5968646 Replace sub1 with directory
+HEAD is now at e4d43a6 Replace sub1 with directory
 test_must_fail: command succeeded: git reset --hard replace_sub1_with_directory
 not ok 72 - git reset --hard: replace submodule containing a .git directory with a directory must fail # TODO known breakage
 
@@ -319096,9 +320406,9 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out '3d81de3941d60f57e05396e35392cd2c6296ea98'
+Submodule path 'sub1': checked out '0ed6db5622e5e3701b49973ce199a51e48ac9eb4'
 Branch 'replace_sub1_with_file' set up to track remote branch 'replace_sub1_with_file' from 'origin'.
-HEAD is now at 2cdd674 Replace sub1 with file
+HEAD is now at 07c229f Replace sub1 with file
 test_must_fail: command succeeded: git reset --hard replace_sub1_with_file
 not ok 73 - git reset --hard: replace submodule with a file must fail # TODO known breakage
 
@@ -319122,9 +320432,9 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out '3d81de3941d60f57e05396e35392cd2c6296ea98'
+Submodule path 'sub1': checked out '0ed6db5622e5e3701b49973ce199a51e48ac9eb4'
 Branch 'replace_sub1_with_file' set up to track remote branch 'replace_sub1_with_file' from 'origin'.
-HEAD is now at 2cdd674 Replace sub1 with file
+HEAD is now at 07c229f Replace sub1 with file
 test_must_fail: command succeeded: git reset --hard replace_sub1_with_file
 not ok 74 - git reset --hard: replace submodule containing a .git directory with a file must fail # TODO known breakage
 
@@ -319148,10 +320458,10 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out '3d81de3941d60f57e05396e35392cd2c6296ea98'
+Submodule path 'sub1': checked out '0ed6db5622e5e3701b49973ce199a51e48ac9eb4'
 Branch 'modify_sub1' set up to track remote branch 'modify_sub1' from 'origin'.
-HEAD is now at 54656e0 Modify sub1
-Submodule path 'sub1': checked out 'd561bc8c2cc3c5c24da7f4d64e0209dd2f34cc90'
+HEAD is now at 2db46ca Modify sub1
+Submodule path 'sub1': checked out 'eabea0ccd59b2361e7874c34ae40dd6834503e34'
 ok 75 - git reset --hard: modified submodule does not update submodule work tree
 
 expecting success: 
@@ -319174,9 +320484,9 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out '3d81de3941d60f57e05396e35392cd2c6296ea98'
+Submodule path 'sub1': checked out '0ed6db5622e5e3701b49973ce199a51e48ac9eb4'
 Branch 'invalid_sub1' set up to track remote branch 'invalid_sub1' from 'origin'.
-HEAD is now at eb92071 Invalid sub1 commit
+HEAD is now at 3867b17 Invalid sub1 commit
 error: Server does not allow request for unadvertised object 0123456789012345678901234567890123456789
 Fetched in submodule path 'sub1', but it did not contain 0123456789012345678901234567890123456789. Direct fetching of that commit failed.
 ok 76 - git reset --hard: modified submodule does not update submodule work tree to invalid commit
@@ -319200,15 +320510,15 @@
 Branch 'invalid_sub1' set up to track remote branch 'invalid_sub1' from 'origin'.
 fatal: Needed a single revision
 Branch 'valid_sub1' set up to track remote branch 'valid_sub1' from 'origin'.
-HEAD is now at d8b1884 Revert "Invalid sub1 commit"
+HEAD is now at c4e794c Revert "Invalid sub1 commit"
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
 Submodule 'uninitialized_sub' (/build/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
 Cloning into '/build/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
 done.
 Cloning into '/build/git-2.20.1/t/trash directory.t7112-reset-submodule/submodule_update/uninitialized_sub'...
 done.
-Submodule path 'sub1': checked out '3d81de3941d60f57e05396e35392cd2c6296ea98'
-Submodule path 'uninitialized_sub': checked out '3d81de3941d60f57e05396e35392cd2c6296ea98'
+Submodule path 'sub1': checked out '0ed6db5622e5e3701b49973ce199a51e48ac9eb4'
+Submodule path 'uninitialized_sub': checked out '0ed6db5622e5e3701b49973ce199a51e48ac9eb4'
 ok 77 - git reset --hard: modified submodule does not update submodule work tree from invalid commit
 
 expecting success: 
@@ -319228,7 +320538,7 @@
 Switched to a new branch 'no_submodule'
 Branch 'no_submodule' set up to track remote branch 'no_submodule' from 'origin'.
 Branch 'add_sub1' set up to track remote branch 'add_sub1' from 'origin'.
-HEAD is now at 8408ab2 Add sub1
+HEAD is now at 139f1bf Add sub1
 ok 78 - git reset --hard: added submodule does remove untracked unignored file with same name when forced
 
 # still have 13 known breakage(s)
@@ -319236,1055 +320546,6 @@
 1..78
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t9119-git-svn-info.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9119-git-svn-info/.git/
-1..0 # SKIP skipping svn-info test (SVN version: 1.10.4 not supported)
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t9114-git-svn-dcommit-merge.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9114-git-svn-dcommit-merge/.git/
-expecting success: 
-	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: 
-	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 = d09274cd6c14dcab297b353fc542e098ab299fd3 (refs/remotes/origin/trunk)
-Checked out HEAD:
-  file:///build/git-2.20.1/t/trash%20directory.t9114-git-svn-dcommit-merge/svnrepo/trunk r1
-Switched to a new branch 'svn'
-Switched to a new branch 'merge'
-[merge 6adf3ef] New file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 new_file
-[merge 3a7d476] hello
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[merge d1d9290] add some stuff
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Switched to branch 'svn'
-[svn 925a819] friend
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Merging:
-925a819 friend
-virtual merge
-found 1 common ancestor:
-d09274c first commit
-Auto-merging README
-Merge made by the 'recursive' 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: 
-	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: 
-	git svn dcommit
-	
-Committing to file:///build/git-2.20.1/t/trash%20directory.t9114-git-svn-dcommit-merge/svnrepo/trunk ...
-	M	README
-Committed r2
-	M	README
-r2 = b1b3abba01befc36d04fab8565c4aaa7ddc41e50 (refs/remotes/origin/trunk)
-	A	new_file
-	M	README
-Committed r3
-	M	README
-	A	new_file
-r3 = 882bf581bad320cfdbcc22266e2b164bce25504b (refs/remotes/origin/trunk)
-No changes between 98f647f6d768476542f17461c161332ee26ffef4 and refs/remotes/origin/trunk
-Resetting to the latest refs/remotes/origin/trunk
-ok 4 - git svn dcommit merges
-
-expecting success: 
-	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: 
-	git rev-list --pretty=raw -1 refs/heads/svn >actual &&
-	grep "    Merge branch 'merge' into svn" actual
-	
-    Merge branch 'merge' into svn
-ok 6 - verify merge commit message
-
-# passed all 6 test(s)
-1..6
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t9107-git-svn-migrate.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9107-git-svn-migrate/.git/
-expecting success: 
-	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 = 6a8bea4ae35809259c777d7277463515121855f9 (refs/remotes/git-svn)
-Checked out HEAD:
-  file:///build/git-2.20.1/t/trash%20directory.t9107-git-svn-migrate/svnrepo r1
-ok 1 - setup old-looking metadata
-
-expecting success: 
-	git rev-parse --verify refs/heads/git-svn-HEAD^0
-
-6a8bea4ae35809259c777d7277463515121855f9
-ok 2 - git-svn-HEAD is a real HEAD
-
-expecting success: 
-	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.20.1) 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
-6a8bea4ae35809259c777d7277463515121855f9
-6a8bea4ae35809259c777d7277463515121855f9
-ok 3 - initialize old-style (v0) git svn layout
-
-expecting success: 
-	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: 
-	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.2dd46b5a-e095-4dd0-b880-df2df15e0530 ...
-r1 = 6a8bea4ae35809259c777d7277463515121855f9
-Done rebuilding .git/svn/git-svn/.rev_map.2dd46b5a-e095-4dd0-b880-df2df15e0530
-	A	README
-r1 = e94264bf78127b4268cbb0c04814a6066bd45db0 (refs/remotes/origin/a)
-	A	README
-r1 = d1a3cf1b8519f906a1f951f2609e69f5b52f0c6f (refs/remotes/origin/trunk)
-	A	README
-r1 = 5f2bcf43efed6c25e442a8a991f6971dc435032e (refs/remotes/origin/tags/0.1)
-	A	README
-r1 = fb3be3f3736017306065741068fa7446a902a25c (refs/remotes/origin/b)
-	A	README
-r1 = 1630f14e2513a7ca9cd14894490663e6f35070db (refs/remotes/origin/tags/0.3)
-	A	README
-r1 = 82c8e11d907ccb733d0c3860374da5d1026484fe (refs/remotes/origin/tags/0.2)
-ok 5 - multi-fetch works on partial urls + paths
-
-expecting success: 
-	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=$(expr $i : "\([^:]*\):.*$")
-		ref=$(expr $i : "[^:]*:\(refs/remotes/.*\)$")
-		if test -z "$ref"; 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/git-2.20.1/t/trash%20directory.t9107-git-svn-migrate/svnrepo/branches/a => file:///build/git-2.20.1/t/trash%20directory.t9107-git-svn-migrate/svnrepo
-Using existing [svn-remote "svn"]
-Using higher level of URL: file:///build/git-2.20.1/t/trash%20directory.t9107-git-svn-migrate/svnrepo/branches/b => file:///build/git-2.20.1/t/trash%20directory.t9107-git-svn-migrate/svnrepo
-Using existing [svn-remote "svn"]
-Using higher level of URL: file:///build/git-2.20.1/t/trash%20directory.t9107-git-svn-migrate/svnrepo/tags/0.1 => file:///build/git-2.20.1/t/trash%20directory.t9107-git-svn-migrate/svnrepo
-Using existing [svn-remote "svn"]
-Using higher level of URL: file:///build/git-2.20.1/t/trash%20directory.t9107-git-svn-migrate/svnrepo/tags/0.2 => file:///build/git-2.20.1/t/trash%20directory.t9107-git-svn-migrate/svnrepo
-Using existing [svn-remote "svn"]
-Using higher level of URL: file:///build/git-2.20.1/t/trash%20directory.t9107-git-svn-migrate/svnrepo/tags/0.3 => file:///build/git-2.20.1/t/trash%20directory.t9107-git-svn-migrate/svnrepo
-Using existing [svn-remote "svn"]
-Using higher level of URL: file:///build/git-2.20.1/t/trash%20directory.t9107-git-svn-migrate/svnrepo/trunk => file:///build/git-2.20.1/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: 
-	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.2dd46b5a-e095-4dd0-b880-df2df15e0530 ...
-r1 = 6a8bea4ae35809259c777d7277463515121855f9
-Done rebuilding .git/svn/refs/remotes/git-svn/.rev_map.2dd46b5a-e095-4dd0-b880-df2df15e0530
-Rebuilding .git/svn/refs/remotes/origin/a/.rev_map.2dd46b5a-e095-4dd0-b880-df2df15e0530 ...
-r1 = e94264bf78127b4268cbb0c04814a6066bd45db0
-Done rebuilding .git/svn/refs/remotes/origin/a/.rev_map.2dd46b5a-e095-4dd0-b880-df2df15e0530
-Rebuilding .git/svn/refs/remotes/origin/b/.rev_map.2dd46b5a-e095-4dd0-b880-df2df15e0530 ...
-r1 = fb3be3f3736017306065741068fa7446a902a25c
-Done rebuilding .git/svn/refs/remotes/origin/b/.rev_map.2dd46b5a-e095-4dd0-b880-df2df15e0530
-Rebuilding .git/svn/refs/remotes/origin/tags/0.1/.rev_map.2dd46b5a-e095-4dd0-b880-df2df15e0530 ...
-r1 = 5f2bcf43efed6c25e442a8a991f6971dc435032e
-Done rebuilding .git/svn/refs/remotes/origin/tags/0.1/.rev_map.2dd46b5a-e095-4dd0-b880-df2df15e0530
-Rebuilding .git/svn/refs/remotes/origin/tags/0.2/.rev_map.2dd46b5a-e095-4dd0-b880-df2df15e0530 ...
-r1 = 82c8e11d907ccb733d0c3860374da5d1026484fe
-Done rebuilding .git/svn/refs/remotes/origin/tags/0.2/.rev_map.2dd46b5a-e095-4dd0-b880-df2df15e0530
-Rebuilding .git/svn/refs/remotes/origin/tags/0.3/.rev_map.2dd46b5a-e095-4dd0-b880-df2df15e0530 ...
-r1 = 1630f14e2513a7ca9cd14894490663e6f35070db
-Done rebuilding .git/svn/refs/remotes/origin/tags/0.3/.rev_map.2dd46b5a-e095-4dd0-b880-df2df15e0530
-Rebuilding .git/svn/refs/remotes/origin/trunk/.rev_map.2dd46b5a-e095-4dd0-b880-df2df15e0530 ...
-r1 = d1a3cf1b8519f906a1f951f2609e69f5b52f0c6f
-Done rebuilding .git/svn/refs/remotes/origin/trunk/.rev_map.2dd46b5a-e095-4dd0-b880-df2df15e0530
-Rebuilding .git/svn/refs/remotes/origin/trunk/.rev_map.2dd46b5a-e095-4dd0-b880-df2df15e0530 ...
-r1 = d1a3cf1b8519f906a1f951f2609e69f5b52f0c6f
-Done rebuilding .git/svn/refs/remotes/origin/trunk/.rev_map.2dd46b5a-e095-4dd0-b880-df2df15e0530
-ok 7 - .rev_db auto-converted to .rev_map.UUID
-
-# passed all 7 test(s)
-1..7
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t9101-git-svn-props.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9101-git-svn-props/.git/
-expecting success: 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: 
-	(
-		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: git svn init "$svnrepo"
-ok 3 - initialize git svn
-
-expecting success: 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 = a052ebb282a3104cc5792801c976e5a1ebfba5a5 (refs/remotes/git-svn)
-	M	kw.c
-r2 = 25d026a0bdca2af2bee09e21a4369c05d7043841 (refs/remotes/git-svn)
-	M	kw.c
-r3 = 636e28a94a5de77d365415ad86e9eed6a558b711 (refs/remotes/git-svn)
-	M	kw.c
-r4 = c6c77581f0e1b30a8e88f0b294521fb50733e8cf (refs/remotes/git-svn)
-Checked out HEAD:
-  file:///build/git-2.20.1/t/trash%20directory.t9101-git-svn-props/svnrepo r4
-ok 4 - fetch revisions from svn
-
-expecting success: 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 4482415] test keywords ignoring
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-	M	kw.c
-	M	kw.c
-r5 = 636e06b717d6a73308263ff11668146deff4388a (refs/remotes/git-svn)
-Done committing 1 revisions to SVN
-From .
- * remote-tracking branch git-svn    -> FETCH_HEAD
-Updating 4482415..636e06b
-Fast-forward
-ok 5 - test svn:keywords ignoring
-
-expecting success: test '/* $Id$ */' = '/* $Id$ */'
-ok 6 - raw $Id$ found in kw.c
-
-expecting success: 
-	(
-		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: git svn fetch &&
-	 git pull . remotes/git-svn &&
-	 svn_cmd co "$svnrepo" new_wc
-	M	crlf
-	M	empty
-	M	ne_crlf
-r6 = a4f60bc74c0746b459275c42142ae19270444379 (refs/remotes/git-svn)
-From .
- * remote-tracking branch git-svn    -> FETCH_HEAD
-Updating 636e06b..a4f60bc
-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: cmp crlf new_wc/crlf
-ok 9 - Comparing crlf
-
-expecting success: cmp ne_crlf new_wc/ne_crlf
-ok 10 - Comparing ne_crlf
-
-expecting success: cmp lf new_wc/lf
-ok 11 - Comparing lf
-
-expecting success: cmp ne_lf new_wc/ne_lf
-ok 12 - Comparing ne_lf
-
-expecting success: cmp cr new_wc/cr
-ok 13 - Comparing cr
-
-expecting success: cmp ne_cr new_wc/ne_cr
-ok 14 - Comparing ne_cr
-
-expecting success: cmp empty_cr new_wc/empty_cr
-ok 15 - Comparing empty_cr
-
-expecting success: cmp empty_lf new_wc/empty_lf
-ok 16 - Comparing empty_lf
-
-expecting success: cmp empty new_wc/empty
-ok 17 - Comparing empty
-
-expecting success: cmp empty_crlf new_wc/empty_crlf
-ok 18 - Comparing empty_crlf
-
-expecting success: 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: git svn fetch && git pull . remotes/git-svn
-	M	cr
-	M	ne_cr
-r7 = 5be2dab9841763b7c7e8c9f6b4be30d995b1177e (refs/remotes/git-svn)
-From .
- * remote-tracking branch git-svn    -> FETCH_HEAD
-Updating a4f60bc..5be2dab
-Fast-forward
- cr    | 4 +++-
- ne_cr | 4 +++-
- 2 files changed, 6 insertions(+), 2 deletions(-)
-ok 20 - fetch and pull latest from svn
-
-expecting success: test 'f39bd49beefa1dff130e47c7a24777dfc3657ba2' = 'f39bd49beefa1dff130e47c7a24777dfc3657ba2'
-ok 21 - CRLF + $Id$
-
-expecting success: test '41c5e77993f143876592cd19b5e9a6f6d2e4ff8a' = '41c5e77993f143876592cd19b5e9a6f6d2e4ff8a'
-ok 22 - CRLF + $Id$ (no newline)
-
-expecting success: 
-	(
-		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: 
-	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 = f27aa822d43aad149e6269313d92c57c0673415b (refs/remotes/git-svn)
-From .
- * remote-tracking branch git-svn    -> FETCH_HEAD
-Updating 5be2dab..f27aa82
-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: 
-	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: 
-	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/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t9121-git-svn-fetch-renamed-dir.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9121-git-svn-fetch-renamed-dir/.git/
-expecting success: 
-	svnadmin load -q "$rawsvnrepo" < "$TEST_DIRECTORY"/t9121/renamed-dir.dump
-	
-ok 1 - load repository with renamed directory
-
-expecting success: 
-	git svn init "$svnrepo/newname" &&
-	git svn fetch
-	
-	A	a.txt
-r2 = 8c16d1458452a1c4223f0004b62d031aa3afadfd (refs/remotes/git-svn)
-Checked out HEAD:
-  file:///build/git-2.20.1/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/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t9109-git-svn-multi-glob.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9109-git-svn-multi-glob/.git/
-expecting success: 
-	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 &&
-	sed -e "s/^.\{41\}//" 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.
-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.20.1) of git-svn) does not exist.
-Done migrating from a git-svn v1 layout
-	A	readme
-r1 = 6adb545b9487f19338a9f8e58e980c8534677da2 (refs/remotes/trunk)
-branch_from: /trunk => /trunk/src/a
-Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9109-git-svn-multi-glob/svnrepo/trunk/src/a => file:///build/git-2.20.1/t/trash%20directory.t9109-git-svn-multi-glob/svnrepo/branches/v1/start/src/a, 1
-Found branch parent: (refs/remotes/branches/v1/start) 6adb545b9487f19338a9f8e58e980c8534677da2
-Following parent with do_switch
-Successfully followed parent
-r2 = 54c2e34d6676e2ec5b5c0b96b2b148b39bc10175 (refs/remotes/branches/v1/start)
-	M	readme
-r3 = 2129d86eebea15ea0b7c105a77a3dc4d2ba3d9f5 (refs/remotes/branches/v1/start)
-branch_from: /branches/v1/start => /branches/v1/start/src/a
-Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9109-git-svn-multi-glob/svnrepo/branches/v1/start/src/a => file:///build/git-2.20.1/t/trash%20directory.t9109-git-svn-multi-glob/svnrepo/tags/end/src/a, 3
-Found branch parent: (refs/remotes/tags/end) 2129d86eebea15ea0b7c105a77a3dc4d2ba3d9f5
-Following parent with do_switch
-	M	readme
-Successfully followed parent
-r4 = 4d897e29914804f69f695f420dc0e864c24fcb49 (refs/remotes/tags/end)
-Checked out HEAD:
-  file:///build/git-2.20.1/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: 
-	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/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 &&
-	sed -e "s/^.\{41\}//" 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 = 73adf04ae32e9e2048e48829d616a328b6a79fa5 (refs/remotes/two/trunk)
-Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9109-git-svn-multi-glob/svnrepo/trunk => file:///build/git-2.20.1/t/trash%20directory.t9109-git-svn-multi-glob/svnrepo/branches/v1/start, 1
-Found branch parent: (refs/remotes/two/branches/v1/start) 73adf04ae32e9e2048e48829d616a328b6a79fa5
-Following parent with do_switch
-Successfully followed parent
-r2 = f4d9d53d0241cb2368ff83e25ff31ddd3c41a54e (refs/remotes/two/branches/v1/start)
-	M	src/a/readme
-	M	src/b/readme
-r3 = d66ab407d7f363aaf0819b8208ca4b4bbb5960fc (refs/remotes/two/branches/v1/start)
-Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9109-git-svn-multi-glob/svnrepo/branches/v1/start => file:///build/git-2.20.1/t/trash%20directory.t9109-git-svn-multi-glob/svnrepo/tags/end, 3
-Found branch parent: (refs/remotes/two/tags/end) d66ab407d7f363aaf0819b8208ca4b4bbb5960fc
-Following parent with do_switch
-	M	src/a/readme
-	M	src/b/readme
-Successfully followed parent
-r4 = 1a6e516bc9e43459b333110dc35dfa8d57ca324f (refs/remotes/two/tags/end)
-	M	src/b/readme
-r5 = 9e8cb555c7f2ce3edfba3b17aeef4b58ea28972f (refs/remotes/two/tags/end)
-	M	src/b/readme
-r6 = 04291d6cd11f985cdd4215b0a65bae6f81056823 (refs/remotes/two/tags/end)
-ok 2 - test left-hand-side only globbing
-
-expecting success: 
-	(
-		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 &&
-	sed -e "s/^.\{41\}//" 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 = 73adf04ae32e9e2048e48829d616a328b6a79fa5 (refs/remotes/four/trunk)
-Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9109-git-svn-multi-glob/svnrepo/trunk => file:///build/git-2.20.1/t/trash%20directory.t9109-git-svn-multi-glob/svnrepo/branches/v1/start, 1
-Found branch parent: (refs/remotes/four/branches/v1/start) 73adf04ae32e9e2048e48829d616a328b6a79fa5
-Following parent with do_switch
-Successfully followed parent
-r2 = f4d9d53d0241cb2368ff83e25ff31ddd3c41a54e (refs/remotes/four/branches/v1/start)
-	M	src/a/readme
-	M	src/b/readme
-r3 = d66ab407d7f363aaf0819b8208ca4b4bbb5960fc (refs/remotes/four/branches/v1/start)
-Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9109-git-svn-multi-glob/svnrepo/branches/v1/start => file:///build/git-2.20.1/t/trash%20directory.t9109-git-svn-multi-glob/svnrepo/tags/end, 3
-Found branch parent: (refs/remotes/four/tags/end) d66ab407d7f363aaf0819b8208ca4b4bbb5960fc
-Following parent with do_switch
-	M	src/a/readme
-	M	src/b/readme
-Successfully followed parent
-r4 = 1a6e516bc9e43459b333110dc35dfa8d57ca324f (refs/remotes/four/tags/end)
-	M	src/b/readme
-r5 = 9e8cb555c7f2ce3edfba3b17aeef4b58ea28972f (refs/remotes/four/tags/end)
-	M	src/b/readme
-r6 = 04291d6cd11f985cdd4215b0a65bae6f81056823 (refs/remotes/four/tags/end)
-Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9109-git-svn-multi-glob/svnrepo/trunk => file:///build/git-2.20.1/t/trash%20directory.t9109-git-svn-multi-glob/svnrepo/branches/v2/start, 3
-Found branch parent: (refs/remotes/four/branches/v2/start) 73adf04ae32e9e2048e48829d616a328b6a79fa5
-Following parent with do_switch
-Successfully followed parent
-r7 = 8c68910d1a0bdfad2e842a84dd26b5586b0b47da (refs/remotes/four/branches/v2/start)
-	M	src/a/readme
-	M	src/b/readme
-r8 = dee1699731aa2c0a6b8e6034ccdcc33886595174 (refs/remotes/four/branches/v2/start)
-Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9109-git-svn-multi-glob/svnrepo/branches/v2/start => file:///build/git-2.20.1/t/trash%20directory.t9109-git-svn-multi-glob/svnrepo/tags/next, 8
-Found branch parent: (refs/remotes/four/tags/next) dee1699731aa2c0a6b8e6034ccdcc33886595174
-Following parent with do_switch
-	M	src/a/readme
-	M	src/b/readme
-Successfully followed parent
-r9 = 5b5b696055315cef7d6984a2de183e9b8a090bca (refs/remotes/four/tags/next)
-	M	src/b/readme
-r10 = f66031f0c4440e6817976a61afff7ff78aad915e (refs/remotes/four/tags/next)
-ok 3 - test another branch
-
-expecting success: 
-cat >expect.three <<EOF
-Only one set of wildcards (e.g. '*' or '*/*/*') is supported: branches/*/t/*
-
-EOF
-	
-ok 4 - prepare test disallow multiple globs
-
-expecting success: 
-	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 11.
-ok 5 - test disallow multiple globs
-
-# passed all 5 test(s)
-1..5
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t9126-git-svn-follow-deleted-readded-directory.sh ***
-Initialized empty Git repository in /build/git-2.20.1/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/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t9123-git-svn-rebuild-with-rewriteroot.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9123-git-svn-rebuild-with-rewriteroot/.git/
-expecting success: 
-	git svn init --rewrite-root=http://invalid.invalid/ "$svnrepo" &&
-	git svn fetch &&
-	git checkout -b mybranch remotes/git-svn
-	
-	A	foo
-r1 = b663fe1764cfbcb4a5baaba9eb7c94d959159e83 (refs/remotes/git-svn)
-Checked out HEAD:
-  file:///build/git-2.20.1/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: 
-	rm "$GIT_SVN_DIR"/.rev_map.*
-	
-ok 2 - remove rev_map
-
-expecting success: 
-	git svn rebase >/dev/null
-	
-ok 3 - rebuild rev_map
-
-# passed all 3 test(s)
-1..3
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t9128-git-svn-cmd-branch.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9128-git-svn-cmd-branch/.git/
-skipping test t9128 altogether
-1..0 # SKIP skip all tests in t9128
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
 *** t9125-git-svn-multi-glob-branch-names.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9125-git-svn-multi-glob-branch-names/.git/
 expecting success: 
@@ -320322,21 +320583,21 @@
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9125-git-svn-multi-glob-branch-names/project/.git/
 Using higher level of URL: file:///build/git-2.20.1/t/trash%20directory.t9125-git-svn-multi-glob-branch-names/svnrepo/project => file:///build/git-2.20.1/t/trash%20directory.t9125-git-svn-multi-glob-branch-names/svnrepo
 	A	foo
-r1 = 879452af2a8b928e809ce73974721c3d854e9da4 (refs/remotes/origin/trunk)
+r1 = 05e5da433a6e43a7eb3390d8b1851aec7abce5e8 (refs/remotes/origin/trunk)
 Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9125-git-svn-multi-glob-branch-names/svnrepo/project/trunk => file:///build/git-2.20.1/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) 879452af2a8b928e809ce73974721c3d854e9da4
+Found branch parent: (refs/remotes/origin/v14.1/beta) 05e5da433a6e43a7eb3390d8b1851aec7abce5e8
 Following parent with do_switch
 Successfully followed parent
-r2 = 6d6a11d2ddefaf97b70cb1d0b3745f26ac0089c6 (refs/remotes/origin/v14.1/beta)
+r2 = de067d049b90024113289726cdf0ba7843388b44 (refs/remotes/origin/v14.1/beta)
 Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9125-git-svn-multi-glob-branch-names/svnrepo/project/branches/v14.1/beta => file:///build/git-2.20.1/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) 6d6a11d2ddefaf97b70cb1d0b3745f26ac0089c6
+Found branch parent: (refs/remotes/origin/v14.1/gold) de067d049b90024113289726cdf0ba7843388b44
 Following parent with do_switch
 Successfully followed parent
-r3 = 160a1a7001d8cf97425101e50c75a1a7c927a7df (refs/remotes/origin/v14.1/gold)
+r3 = 107d10adbcfa2eecb11468186c42932ab0ec80dc (refs/remotes/origin/v14.1/gold)
 Checked out HEAD:
   file:///build/git-2.20.1/t/trash%20directory.t9125-git-svn-multi-glob-branch-names/svnrepo/project/trunk r1
-6d6a11d2ddefaf97b70cb1d0b3745f26ac0089c6
-160a1a7001d8cf97425101e50c75a1a7c927a7df
+de067d049b90024113289726cdf0ba7843388b44
+107d10adbcfa2eecb11468186c42932ab0ec80dc
 ok 2 - test clone with multi-glob in branch names
 
 expecting success: 
@@ -320347,16 +320608,16 @@
 	git svn dcommit
 	)
 	
-HEAD is now at 160a1a7 more fun!
-[master 2988b81] hello
+HEAD is now at 107d10a more fun!
+[master 7c4d0ed] hello
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 Committing to file:///build/git-2.20.1/t/trash%20directory.t9125-git-svn-multi-glob-branch-names/svnrepo/project/branches/v14.1/gold ...
 	M	foo
 Committed r4
 	M	foo
-r4 = 27a80db0307656262b4002bc64641df932f145dd (refs/remotes/origin/v14.1/gold)
-No changes between 2988b8129bc3edede99738dcfa824893617ce4a3 and refs/remotes/origin/v14.1/gold
+r4 = 51a693b7dcdc2c5c8d01bfefec9a9269968598c8 (refs/remotes/origin/v14.1/gold)
+No changes between 7c4d0ed49127b556b87589548b8f27b4afa2a9c2 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
 
@@ -320452,74 +320713,74 @@
 
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9122-git-svn-author/work.git/.git/
 	A	file
-r1 = 57ce9753f0c5ab845315d3f28d32ea193d0970e3 (refs/remotes/git-svn)
+r1 = 37cc50283761a5331547863a201eae4f2e509c41 (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/git-2.20.1/t/trash%20directory.t9122-git-svn-author/svnrepo r1
-[master da61cc2] second
+[master 3f2e7b4] second
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 Committing to file:///build/git-2.20.1/t/trash%20directory.t9122-git-svn-author/svnrepo ...
 	M	file
 Committed r2
 	M	file
-r2 = 7597c9c2d53602a44e8007a9725eeb19ed5e1c77 (refs/remotes/git-svn)
-No changes between da61cc22c81001ff1edca82d63cc9aba56c1d008 and refs/remotes/git-svn
+r2 = cdd5b333c46ebc098469e17b32a552d4475be4b8 (refs/remotes/git-svn)
+No changes between 3f2e7b4d4e62aeb712101a12cee8ca128e05370d and refs/remotes/git-svn
 Resetting to the latest refs/remotes/git-svn
-[master f1b79d1] third
+[master 21fe3db] third
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 Committing to file:///build/git-2.20.1/t/trash%20directory.t9122-git-svn-author/svnrepo ...
 	M	file
 Committed r3
 	M	file
-r3 = 2336697fdeeea42f3afc26cbe60dbd52b2d5cf88 (refs/remotes/git-svn)
-No changes between f1b79d108cb8eb38ecaa509d7d0b61746bff6905 and refs/remotes/git-svn
+r3 = e90109fdebc142f8fd6f93ad8e8556f938a624c8 (refs/remotes/git-svn)
+No changes between 21fe3dba9a98e67d271c0fa386b1c5c03169079f and refs/remotes/git-svn
 Resetting to the latest refs/remotes/git-svn
-[master ce9299f] fourth
+[master 6be2faf] fourth
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 Committing to file:///build/git-2.20.1/t/trash%20directory.t9122-git-svn-author/svnrepo ...
 	M	file
 Committed r4
 	M	file
-r4 = 6cdcf5b8b7f366e834a0039f792f7c0b34f9c34c (refs/remotes/git-svn)
-No changes between ce9299f81b992d49f872b8833d6da15d8d53c596 and refs/remotes/git-svn
+r4 = 0110618ca87bf9411e7f2be5aab32ffc4bfba169 (refs/remotes/git-svn)
+No changes between 6be2faf6de052b6c047ff10ff8c447c5ecbfb3f3 and refs/remotes/git-svn
 Resetting to the latest refs/remotes/git-svn
-commit 6cdcf5b8b7f366e834a0039f792f7c0b34f9c34c
+commit 0110618ca87bf9411e7f2be5aab32ffc4bfba169
 Author: A U Thor <author@example.com>
-Date:   Fri Dec 3 05:10:27 2021 +0000
+Date:   Thu Jan 5 11:50:36 2023 +0000
 
     fourth
     
     From: A U Thor <author@example.com>
     
-    git-svn-id: file:///build/git-2.20.1/t/trash%20directory.t9122-git-svn-author/svnrepo@4 9f46c5c0-a813-4397-919d-f51103dda0b8
+    git-svn-id: file:///build/git-2.20.1/t/trash%20directory.t9122-git-svn-author/svnrepo@4 af6e2fa2-552e-4328-87ae-cbb73a6cb637
 
-commit 2336697fdeeea42f3afc26cbe60dbd52b2d5cf88
-Author: pbuilder1 <pbuilder1@9f46c5c0-a813-4397-919d-f51103dda0b8>
-Date:   Fri Dec 3 05:10:26 2021 +0000
+commit e90109fdebc142f8fd6f93ad8e8556f938a624c8
+Author: pbuilder2 <pbuilder2@af6e2fa2-552e-4328-87ae-cbb73a6cb637>
+Date:   Thu Jan 5 11:50:34 2023 +0000
 
     third
     
     From: A U Thor <author@example.com>
     
-    git-svn-id: file:///build/git-2.20.1/t/trash%20directory.t9122-git-svn-author/svnrepo@3 9f46c5c0-a813-4397-919d-f51103dda0b8
+    git-svn-id: file:///build/git-2.20.1/t/trash%20directory.t9122-git-svn-author/svnrepo@3 af6e2fa2-552e-4328-87ae-cbb73a6cb637
 
-commit 7597c9c2d53602a44e8007a9725eeb19ed5e1c77
-Author: pbuilder1 <pbuilder1@9f46c5c0-a813-4397-919d-f51103dda0b8>
-Date:   Fri Dec 3 05:10:24 2021 +0000
+commit cdd5b333c46ebc098469e17b32a552d4475be4b8
+Author: pbuilder2 <pbuilder2@af6e2fa2-552e-4328-87ae-cbb73a6cb637>
+Date:   Thu Jan 5 11:50:32 2023 +0000
 
     second
     
-    git-svn-id: file:///build/git-2.20.1/t/trash%20directory.t9122-git-svn-author/svnrepo@2 9f46c5c0-a813-4397-919d-f51103dda0b8
+    git-svn-id: file:///build/git-2.20.1/t/trash%20directory.t9122-git-svn-author/svnrepo@2 af6e2fa2-552e-4328-87ae-cbb73a6cb637
 
-commit 57ce9753f0c5ab845315d3f28d32ea193d0970e3
-Author: pbuilder1 <pbuilder1@9f46c5c0-a813-4397-919d-f51103dda0b8>
-Date:   Fri Dec 3 05:10:21 2021 +0000
+commit 37cc50283761a5331547863a201eae4f2e509c41
+Author: pbuilder2 <pbuilder2@af6e2fa2-552e-4328-87ae-cbb73a6cb637>
+Date:   Thu Jan 5 11:50:29 2023 +0000
 
     first commit
     
-    git-svn-id: file:///build/git-2.20.1/t/trash%20directory.t9122-git-svn-author/svnrepo@1 9f46c5c0-a813-4397-919d-f51103dda0b8
+    git-svn-id: file:///build/git-2.20.1/t/trash%20directory.t9122-git-svn-author/svnrepo@1 af6e2fa2-552e-4328-87ae-cbb73a6cb637
     From: A U Thor <author@example.com>
     From: A U Thor <author@example.com>
 Author: A U Thor <author@example.com>
@@ -320549,7 +320810,7 @@
 Committing transaction...
 Committed revision 1.
 	A	foo
-r1 = c4625a3dddd1e15eb0eacbb9f483403c51ef76d8 (refs/remotes/git-svn)
+r1 = 19c9b28dfd84f0d0803edf8de93dd00ad39f5a5b (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/git-2.20.1/t/trash%20directory.t9124-git-svn-dcommit-auto-props/svnrepo r1
 ok 1 - initialize git svn
@@ -320568,7 +320829,7 @@
 	git commit -m "files for enabled auto-props" &&
 	git svn dcommit --config-dir=user
 
-[master 8e03363] files for enabled auto-props
+[master 468341e] files for enabled auto-props
  Author: A U Thor <author@example.com>
  3 files changed, 3 insertions(+)
  create mode 100644 bar
@@ -320582,8 +320843,8 @@
 	A	bar
 	A	exec1.sh
 	A	hello.txt
-r2 = ff1916fbe275fea28cd3032b81b5a8eef6317618 (refs/remotes/git-svn)
-No changes between 8e03363dd593166ba266641d396cc474b3da7ce5 and refs/remotes/git-svn
+r2 = a975d19f8b8b05ecc158652d61db489322c62d0f (refs/remotes/git-svn)
+No changes between 468341e5e178ea4c598d3711465fb5bc0861a5d9 and refs/remotes/git-svn
 Resetting to the latest refs/remotes/git-svn
 ok 3 - add files matching auto-props
 
@@ -320600,7 +320861,7 @@
 	git commit -m "files for disabled auto-props" &&
 	git svn dcommit --config-dir=user
 
-[master d680bd8] files for disabled auto-props
+[master ce04a5e] files for disabled auto-props
  Author: A U Thor <author@example.com>
  3 files changed, 3 insertions(+)
  create mode 100755 exec2.sh
@@ -320614,8 +320875,8 @@
 	A	exec2.sh
 	A	world.txt
 	A	zot
-r3 = 4bd12de469d88e1e932708f85be37e083ffb2148 (refs/remotes/git-svn)
-No changes between d680bd8b7b8dd82903d8a17ceeae27f73494c75b and refs/remotes/git-svn
+r3 = cb6a1224f8230bb9bf9014db9b9bec03942852c8 (refs/remotes/git-svn)
+No changes between ce04a5ed50382941fd9950d424d5a59c91cc9348 and refs/remotes/git-svn
 Resetting to the latest refs/remotes/git-svn
 ok 5 - add files matching disabled auto-props
 
@@ -320684,7 +320945,7 @@
 		test "x$(svn_cmd propget svn:eol-style foo.sh)" = "xLF"
 	)
 
-[master ae1947d] foo => foo.sh
+[master 1a2f757] foo => foo.sh
  Author: A U Thor <author@example.com>
  1 file changed, 0 insertions(+), 0 deletions(-)
  rename foo => foo.sh (100%)
@@ -320694,8 +320955,8 @@
 	D	foo
 	A	foo.sh
 W: -empty_dir: foo
-r4 = 9cb9a9a4a692a9ee8cb1d61010e47a3eb675d153 (refs/remotes/git-svn)
-No changes between ae1947da3de9d5969242bc7ea2847e78fd677cee and refs/remotes/git-svn
+r4 = 3a97e59a29d63bbbcdbe9280a1dc1edab9ee34f7 (refs/remotes/git-svn)
+No changes between 1a2f757cb36096c7bac63e17ed41a9cfcfea7426 and refs/remotes/git-svn
 Resetting to the latest refs/remotes/git-svn
 Updating '.':
 D    foo
@@ -320774,51 +321035,51 @@
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9118-git-svn-funky-branch-names/project/.git/
 Using higher level of URL: file:///build/git-2.20.1/t/trash%20directory.t9118-git-svn-funky-branch-names/svnrepo/pr%20ject => file:///build/git-2.20.1/t/trash%20directory.t9118-git-svn-funky-branch-names/svnrepo
 	A	foo
-r1 = 24fb08731ab727e73db658ded38df3875825f73e (refs/remotes/origin/trunk)
+r1 = eb52682c14a1655d48b0e393854a9f4fe0965722 (refs/remotes/origin/trunk)
 Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9118-git-svn-funky-branch-names/svnrepo/pr%20ject/trunk => file:///build/git-2.20.1/t/trash%20directory.t9118-git-svn-funky-branch-names/svnrepo/pr%20ject/branches/fun%20plugin, 1
-Found branch parent: (refs/remotes/origin/fun plugin) 24fb08731ab727e73db658ded38df3875825f73e
+Found branch parent: (refs/remotes/origin/fun plugin) eb52682c14a1655d48b0e393854a9f4fe0965722
 Following parent with do_switch
 Successfully followed parent
-r2 = 590114eedda4c8ff1bd886e0257c64d8e364a654 (refs/remotes/origin/fun plugin)
+r2 = 21982cc7c8b099dd6cffaa609a4bd14226a11003 (refs/remotes/origin/fun plugin)
 Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9118-git-svn-funky-branch-names/svnrepo/pr%20ject/branches/fun%20plugin => file:///build/git-2.20.1/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!) 590114eedda4c8ff1bd886e0257c64d8e364a654
+Found branch parent: (refs/remotes/origin/more fun plugin!) 21982cc7c8b099dd6cffaa609a4bd14226a11003
 Following parent with do_switch
 Successfully followed parent
-r3 = 2d3d96e00535b95cf1084adbf15d07cc8469a1c1 (refs/remotes/origin/more fun plugin!)
+r3 = ba31780387a1c4233b502c1023ad82f5ec41fd7a (refs/remotes/origin/more fun plugin!)
 Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9118-git-svn-funky-branch-names/svnrepo/pr%20ject/branches/fun%20plugin => file:///build/git-2.20.1/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)) 590114eedda4c8ff1bd886e0257c64d8e364a654
+Found branch parent: (refs/remotes/origin/Abo-Uebernahme (Bug #994)) 21982cc7c8b099dd6cffaa609a4bd14226a11003
 Following parent with do_switch
 Successfully followed parent
-r4 = 8f562fb9847b12f6f25a3d14a4c5cf8c5c8b721c (refs/remotes/origin/Abo-Uebernahme (Bug #994))
+r4 = d52e5fc8815f381f51863672cab3844c5f367efe (refs/remotes/origin/Abo-Uebernahme (Bug #994))
 Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9118-git-svn-funky-branch-names/svnrepo/pr%20ject/trunk => file:///build/git-2.20.1/t/trash%20directory.t9118-git-svn-funky-branch-names/svnrepo/pr%20ject/branches/.leading_dot, 4
-Found branch parent: (refs/remotes/origin/.leading_dot) 24fb08731ab727e73db658ded38df3875825f73e
+Found branch parent: (refs/remotes/origin/.leading_dot) eb52682c14a1655d48b0e393854a9f4fe0965722
 Following parent with do_switch
 Successfully followed parent
-r5 = 794c50889f164a8b9b7bf69b809f3bda7c3d7ce5 (refs/remotes/origin/.leading_dot)
+r5 = 4a4813dcebe55bf3a14316295dc72f1dd85dadd6 (refs/remotes/origin/.leading_dot)
 Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9118-git-svn-funky-branch-names/svnrepo/pr%20ject/trunk => file:///build/git-2.20.1/t/trash%20directory.t9118-git-svn-funky-branch-names/svnrepo/pr%20ject/branches/trailing_dot., 5
-Found branch parent: (refs/remotes/origin/trailing_dot.) 24fb08731ab727e73db658ded38df3875825f73e
+Found branch parent: (refs/remotes/origin/trailing_dot.) eb52682c14a1655d48b0e393854a9f4fe0965722
 Following parent with do_switch
 Successfully followed parent
-r6 = 8edc826719b4e37ef0bb58bf0b7af0ecb68f4966 (refs/remotes/origin/trailing_dot.)
+r6 = ab3fba0ec1c666f724a9957e94658abbd7b234c5 (refs/remotes/origin/trailing_dot.)
 Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9118-git-svn-funky-branch-names/svnrepo/pr%20ject/trunk => file:///build/git-2.20.1/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) 24fb08731ab727e73db658ded38df3875825f73e
+Found branch parent: (refs/remotes/origin/trailing_dotlock.lock) eb52682c14a1655d48b0e393854a9f4fe0965722
 Following parent with do_switch
 Successfully followed parent
-r7 = 13c1ba33a83e9bc79536dbe05de92dd7bee8c894 (refs/remotes/origin/trailing_dotlock.lock)
+r7 = cdbefd14b5107d12889478583dd922417833f391 (refs/remotes/origin/trailing_dotlock.lock)
 Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9118-git-svn-funky-branch-names/svnrepo/pr%20ject/trunk => file:///build/git-2.20.1/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) 24fb08731ab727e73db658ded38df3875825f73e
+Found branch parent: (refs/remotes/origin/not-a@{0}reflog) eb52682c14a1655d48b0e393854a9f4fe0965722
 Following parent with do_switch
 Successfully followed parent
-r8 = 3f379fffb238765a895a9d69859456b9f53cccdd (refs/remotes/origin/not-a@{0}reflog)
+r8 = dd4af4cf0022184d84863243d9a2f315eeafb18c (refs/remotes/origin/not-a@{0}reflog)
 Checked out HEAD:
   file:///build/git-2.20.1/t/trash%20directory.t9118-git-svn-funky-branch-names/svnrepo/pr%20ject/trunk r1
-590114eedda4c8ff1bd886e0257c64d8e364a654
-2d3d96e00535b95cf1084adbf15d07cc8469a1c1
-8f562fb9847b12f6f25a3d14a4c5cf8c5c8b721c
-794c50889f164a8b9b7bf69b809f3bda7c3d7ce5
-8edc826719b4e37ef0bb58bf0b7af0ecb68f4966
-13c1ba33a83e9bc79536dbe05de92dd7bee8c894
-3f379fffb238765a895a9d69859456b9f53cccdd
+21982cc7c8b099dd6cffaa609a4bd14226a11003
+ba31780387a1c4233b502c1023ad82f5ec41fd7a
+d52e5fc8815f381f51863672cab3844c5f367efe
+4a4813dcebe55bf3a14316295dc72f1dd85dadd6
+ab3fba0ec1c666f724a9957e94658abbd7b234c5
+cdbefd14b5107d12889478583dd922417833f391
+dd4af4cf0022184d84863243d9a2f315eeafb18c
 ok 2 - test clone with funky branch names
 
 expecting success: 
@@ -320830,240 +321091,1905 @@
 		git svn dcommit
 	)
 	
-HEAD is now at 2d3d96e more fun!
-[master 329e1f4] hello
+HEAD is now at ba31780 more fun!
+[master 8faa43c] hello
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 Committing to file:///build/git-2.20.1/t/trash%20directory.t9118-git-svn-funky-branch-names/svnrepo/pr%20ject/branches/more%20fun%20plugin! ...
 	M	foo
 Committed r9
 	M	foo
-r9 = 7ccbd90e761a0656b4292202df29aa7b854e84e1 (refs/remotes/origin/more fun plugin!)
-No changes between 329e1f4c37e9ab694047361f02971f2b246ac292 and refs/remotes/origin/more%20fun%20plugin!
+r9 = b429dded688d356a51c251027a17c4b74390d59b (refs/remotes/origin/more fun plugin!)
+No changes between 8faa43c6158eafc63b1b2e18ac557729eccdf205 and refs/remotes/origin/more%20fun%20plugin!
 Resetting to the latest refs/remotes/origin/more%20fun%20plugin!
 ok 3 - test dcommit to funky branch
 
 expecting success: 
 	(
-		cd project &&
-		git reset --hard "refs/remotes/origin/$scary_ref" &&
-		echo urls are scary >> foo &&
-		git commit -m "eep" -- foo &&
-		git svn dcommit
+		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 d52e5fc scary
+[master c61fd90] eep
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Committing to file:///build/git-2.20.1/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 = e47366c2ef2b152f7317f6e74de469bc1b9cc7b4 (refs/remotes/origin/Abo-Uebernahme (Bug #994))
+No changes between c61fd90f32dfd5638ddb8c5789d3fb75a045e668 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: 
+	(
+		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 cdbefd1 trailing .lock
+[master 38ac6ce] bar
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Committing to file:///build/git-2.20.1/t/trash%20directory.t9118-git-svn-funky-branch-names/svnrepo/pr%20ject/branches/trailing_dotlock.lock ...
+	M	foo
+Committed r11
+	M	foo
+r11 = f220eb363313d414a6ed6afb207d92188401df4e (refs/remotes/origin/trailing_dotlock.lock)
+No changes between 38ac6ce49429ad79aebcc7e7865099ce75f8088f 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/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t9120-git-svn-clone-with-percent-escapes.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9120-git-svn-clone-with-percent-escapes/.git/
+expecting success: 
+	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: 
+	git svn clone "$svnrepo/pr%20ject" clone &&
+	(
+		cd clone &&
+		git rev-parse refs/remotes/git-svn
+	)
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9120-git-svn-clone-with-percent-escapes/clone/.git/
+	A	trunk/foo
+W: +empty_dir: branches
+W: +empty_dir: tags
+r1 = 877a9d4636b1c0186fb488178faaeddd981e9589 (refs/remotes/git-svn)
+	A	branches/b/foo
+r2 = a1c237d29912b9e49389e19189ad5816dbd80bc9 (refs/remotes/git-svn)
+	A	tags/v1/foo
+r3 = e260f7eb0dc5a0630634f3ca67afb1dbfe1beb2f (refs/remotes/git-svn)
+Checked out HEAD:
+  file:///build/git-2.20.1/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject r3
+e260f7eb0dc5a0630634f3ca67afb1dbfe1beb2f
+ok 2 - test clone with percent escapes
+
+expecting success: 
+	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: 
+	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: 
+	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/git-2.20.1/t/trash directory.t9120-git-svn-clone-with-percent-escapes/minimize/.git/
+Using higher level of URL: file:///build/git-2.20.1/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject/trunk => file:///build/git-2.20.1/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo
+	A	foo
+r1 = efb1f502f274f691da5adac6a956557c13990db4 (refs/remotes/git-svn)
+Checked out HEAD:
+  file:///build/git-2.20.1/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject/trunk r1
+efb1f502f274f691da5adac6a956557c13990db4
+ok 5 - test clone trunk with percent escapes and minimize-url
+
+expecting success: 
+	git svn clone "$svnrepo/pr%20ject/trunk" trunk &&
+	(
+		cd trunk &&
+		git rev-parse refs/remotes/git-svn
+	)
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9120-git-svn-clone-with-percent-escapes/trunk/.git/
+	A	foo
+r1 = efb1f502f274f691da5adac6a956557c13990db4 (refs/remotes/git-svn)
+Checked out HEAD:
+  file:///build/git-2.20.1/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject/trunk r1
+efb1f502f274f691da5adac6a956557c13990db4
+ok 6 - test clone trunk with percent escapes
+
+expecting success: 
+	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/git-2.20.1/t/trash directory.t9120-git-svn-clone-with-percent-escapes/percent/.git/
+Using higher level of URL: file:///build/git-2.20.1/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject => file:///build/git-2.20.1/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo
+	A	foo
+r1 = efb1f502f274f691da5adac6a956557c13990db4 (refs/remotes/origin/trunk)
+Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject/trunk => file:///build/git-2.20.1/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject/branches/b, 1
+Found branch parent: (refs/remotes/origin/b) efb1f502f274f691da5adac6a956557c13990db4
+Following parent with do_switch
+Successfully followed parent
+r2 = ad4632830fbb80a313f7c4d73571c998f723e69f (refs/remotes/origin/b)
+Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject/trunk => file:///build/git-2.20.1/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject/tags/v1, 2
+Found branch parent: (refs/remotes/origin/tags/v1) efb1f502f274f691da5adac6a956557c13990db4
+Following parent with do_switch
+Successfully followed parent
+r3 = 5a484c6a659b01a25607824c83cdc1a28996dca4 (refs/remotes/origin/tags/v1)
+Checked out HEAD:
+  file:///build/git-2.20.1/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject/trunk r1
+efb1f502f274f691da5adac6a956557c13990db4
+ad4632830fbb80a313f7c4d73571c998f723e69f
+5a484c6a659b01a25607824c83cdc1a28996dca4
+ok 7 - test clone --stdlayout with percent escapes
+
+expecting success: 
+	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/git-2.20.1/t/trash directory.t9120-git-svn-clone-with-percent-escapes/space/.git/
+Using higher level of URL: file:///build/git-2.20.1/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject => file:///build/git-2.20.1/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo
+	A	foo
+r1 = efb1f502f274f691da5adac6a956557c13990db4 (refs/remotes/origin/trunk)
+Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject/trunk => file:///build/git-2.20.1/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject/branches/b, 1
+Found branch parent: (refs/remotes/origin/b) efb1f502f274f691da5adac6a956557c13990db4
+Following parent with do_switch
+Successfully followed parent
+r2 = ad4632830fbb80a313f7c4d73571c998f723e69f (refs/remotes/origin/b)
+Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject/trunk => file:///build/git-2.20.1/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject/tags/v1, 2
+Found branch parent: (refs/remotes/origin/tags/v1) efb1f502f274f691da5adac6a956557c13990db4
+Following parent with do_switch
+Successfully followed parent
+r3 = 5a484c6a659b01a25607824c83cdc1a28996dca4 (refs/remotes/origin/tags/v1)
+Checked out HEAD:
+  file:///build/git-2.20.1/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject/trunk r1
+efb1f502f274f691da5adac6a956557c13990db4
+ad4632830fbb80a313f7c4d73571c998f723e69f
+5a484c6a659b01a25607824c83cdc1a28996dca4
+ok 8 - test clone -s with unescaped space
+
+# passed all 8 test(s)
+1..8
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t9132-git-svn-broken-symlink.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9132-git-svn-broken-symlink/.git/
+expecting success: 
+	svnadmin load "$rawsvnrepo" <<EOF
+SVN-fs-dump-format-version: 2
+
+UUID: 60780f9a-7df5-43b4-83ab-60e2c0673ef7
+
+Revision-number: 0
+Prop-content-length: 56
+Content-length: 56
+
+K 8
+svn:date
+V 27
+2008-11-26T07:17:27.590577Z
+PROPS-END
+
+Revision-number: 1
+Prop-content-length: 111
+Content-length: 111
+
+K 7
+svn:log
+V 4
+test
+K 10
+svn:author
+V 12
+normalperson
+K 8
+svn:date
+V 27
+2008-11-26T07:18:03.511836Z
+PROPS-END
+
+Node-path: bar
+Node-kind: file
+Node-action: add
+Prop-content-length: 33
+Text-content-length: 4
+Text-content-md5: 912ec803b2ce49e4a541068d495ab570
+Content-length: 37
+
+K 11
+svn:special
+V 1
+*
+PROPS-END
+asdf
+
+Revision-number: 2
+Prop-content-length: 121
+Content-length: 121
+
+K 7
+svn:log
+V 13
+bar => doink
+
+K 10
+svn:author
+V 12
+normalperson
+K 8
+svn:date
+V 27
+2008-11-27T03:55:31.601672Z
+PROPS-END
+
+Node-path: bar
+Node-kind: file
+Node-action: change
+Text-content-length: 10
+Text-content-md5: 92ca4fe7a9721f877f765c252dcd66c9
+Content-length: 10
+
+link doink
+
+EOF
+
+<<< Started new transaction, based on original revision 1
+     * editing path : bar ... done.
+
+------- Committed revision 1 >>>
+
+<<< Started new transaction, based on original revision 2
+     * editing path : bar ... done.
+
+------- Committed revision 2 >>>
+
+ok 1 - load svn dumpfile
+
+expecting success: git svn clone -r1 "$svnrepo" x
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9132-git-svn-broken-symlink/x/.git/
+bar has mode 120000 but is not a link
+	A	bar
+r1 = 9934d0c230cdfdf887b4cc2433fb3d06aafa0c25 (refs/remotes/git-svn)
+Checked out HEAD:
+  file:///build/git-2.20.1/t/trash%20directory.t9132-git-svn-broken-symlink/svnrepo r1
+ok 2 - clone using git svn
+
+checking prerequisite: SYMLINKS
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
+	# test whether the filesystem supports symbolic links
+	ln -s x y && test -h y
+
+)
+prerequisite SYMLINKS ok
+expecting success: 
+	test -L x/bar &&
+	(cd x && test xasdf = x"$(git cat-file blob HEAD:bar)")
+
+ok 3 - "bar" is a symlink that points to "asdf"
+
+expecting success: 
+	(cd x && git svn rebase)
+
+Checksum mismatch: bar 5e40c0877058c504203932e5136051cf3cd3519b
+expected: 912ec803b2ce49e4a541068d495ab570
+     got: 3f9dfa058a15dc34057c51ec4d35393c
+Retrying... (possibly a bad symlink from SVN)
+	M	bar
+r2 = 229fb64484715d303a0bbb7239a3114e9420466b (refs/remotes/git-svn)
+First, rewinding head to replay your work on top of it...
+Fast-forwarded master to refs/remotes/git-svn.
+ok 4 - get "bar" => symlink fix from svn
+
+expecting success: 
+	test -L x/bar &&
+	(cd x && test xdoink = x"$(git cat-file blob HEAD:bar)")
+
+ok 5 - "bar" remains a proper symlink
+
+# passed all 5 test(s)
+1..5
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t9127-git-svn-partial-rebuild.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9127-git-svn-partial-rebuild/.git/
+expecting success: 
+	mkdir import &&
+	(
+		(cd import &&
+		mkdir trunk branches tags &&
+		(cd trunk &&
+		echo foo > foo
+		) &&
+		svn_cmd import -m "import for git-svn" . "$svnrepo" >/dev/null &&
+		svn_cmd copy "$svnrepo"/trunk "$svnrepo"/branches/a \
+			-m "created branch a"
+		) &&
+		rm -rf import &&
+		svn_cmd co "$svnrepo"/trunk trunk &&
+		(cd trunk &&
+		echo bar >> foo &&
+		svn_cmd ci -m "updated trunk"
+		) &&
+		svn_cmd co "$svnrepo"/branches/a a &&
+		(cd a &&
+		echo baz >> a &&
+		svn_cmd add a &&
+		svn_cmd ci -m "updated a"
+		) &&
+		git svn init --stdlayout "$svnrepo"
+	)
+
+Committing transaction...
+Committed revision 2.
+A    trunk/foo
+Checked out revision 2.
+Sending        foo
+Transmitting file data .done
+Committing transaction...
+Committed revision 3.
+A    a/foo
+Checked out revision 3.
+A         a
+Adding         a
+Transmitting file data .done
+Committing transaction...
+Committed revision 4.
+ok 1 - initialize svnrepo
+
+expecting success: 
+	git svn fetch -r1:2
+
+	A	foo
+r1 = 0fb22f06c22eb65f1489b9f7583dd20a9b13e172 (refs/remotes/origin/trunk)
+Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9127-git-svn-partial-rebuild/svnrepo/trunk => file:///build/git-2.20.1/t/trash%20directory.t9127-git-svn-partial-rebuild/svnrepo/branches/a, 1
+Found branch parent: (refs/remotes/origin/a) 0fb22f06c22eb65f1489b9f7583dd20a9b13e172
+Following parent with do_switch
+Successfully followed parent
+r2 = 00597debcf98313d470a85c688d1a5ff57a26ff8 (refs/remotes/origin/a)
+Checked out HEAD:
+  file:///build/git-2.20.1/t/trash%20directory.t9127-git-svn-partial-rebuild/svnrepo/trunk r1
+ok 2 - import an early SVN revision into git
+
+expecting success: 
+	mkdir mirror &&
+	(
+		(cd mirror &&
+		git init &&
+		git svn init --stdlayout "$svnrepo" &&
+		git svn fetch
+		)
+	)
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9127-git-svn-partial-rebuild/mirror/.git/
+	A	foo
+r1 = 0fb22f06c22eb65f1489b9f7583dd20a9b13e172 (refs/remotes/origin/trunk)
+Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9127-git-svn-partial-rebuild/svnrepo/trunk => file:///build/git-2.20.1/t/trash%20directory.t9127-git-svn-partial-rebuild/svnrepo/branches/a, 1
+Found branch parent: (refs/remotes/origin/a) 0fb22f06c22eb65f1489b9f7583dd20a9b13e172
+Following parent with do_switch
+Successfully followed parent
+r2 = 00597debcf98313d470a85c688d1a5ff57a26ff8 (refs/remotes/origin/a)
+	M	foo
+r3 = 639a2d05b5bd7afb8614f96c5a92192020b6bdff (refs/remotes/origin/trunk)
+	A	a
+r4 = ca2ecfe1e507a07155fd9239d77bb91cfec46c46 (refs/remotes/origin/a)
+Checked out HEAD:
+  file:///build/git-2.20.1/t/trash%20directory.t9127-git-svn-partial-rebuild/svnrepo/trunk r3
+ok 3 - make full git mirror of SVN
+
+expecting success: 
+	git config --add remote.origin.url "file://$PWD/mirror/.git" &&
+	git config --add remote.origin.fetch refs/remotes/*:refs/remotes/* &&
+	git fetch origin &&
+	git svn fetch
+
+From file:///build/git-2.20.1/t/trash directory.t9127-git-svn-partial-rebuild/mirror/
+   00597de..ca2ecfe  origin/a     -> origin/a
+   0fb22f0..639a2d0  origin/trunk -> origin/trunk
+Partial-rebuilding .git/svn/refs/remotes/origin/trunk/.rev_map.0fd3ce34-42df-416b-8c40-43513774302d ...
+Currently at 1 = 0fb22f06c22eb65f1489b9f7583dd20a9b13e172
+r3 = 639a2d05b5bd7afb8614f96c5a92192020b6bdff
+Done rebuilding .git/svn/refs/remotes/origin/trunk/.rev_map.0fd3ce34-42df-416b-8c40-43513774302d
+Partial-rebuilding .git/svn/refs/remotes/origin/a/.rev_map.0fd3ce34-42df-416b-8c40-43513774302d ...
+Currently at 2 = 00597debcf98313d470a85c688d1a5ff57a26ff8
+r4 = ca2ecfe1e507a07155fd9239d77bb91cfec46c46
+Done rebuilding .git/svn/refs/remotes/origin/a/.rev_map.0fd3ce34-42df-416b-8c40-43513774302d
+ok 4 - fetch from git mirror and partial-rebuild
+
+# passed all 4 test(s)
+1..4
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t9117-git-svn-init-clone.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9117-git-svn-init-clone/.git/
+expecting success: 
+	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: 
+	test ! -d trunk &&
+	git svn clone "$svnrepo"/project/trunk &&
+	test -d trunk/.git/svn &&
+	test -e trunk/foo &&
+	rm -rf trunk
+	
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9117-git-svn-init-clone/tmp/trunk/.git/
+	A	foo
+r1 = 7d7cacb2bdf0e2de8d336b865aad91ae17c74eb1 (refs/remotes/git-svn)
+Checked out HEAD:
+  file:///build/git-2.20.1/t/trash%20directory.t9117-git-svn-init-clone/svnrepo/project/trunk r1
+ok 2 - basic clone
+
+expecting success: 
+	test ! -d target &&
+	git svn clone "$svnrepo"/project/trunk target &&
+	test -d target/.git/svn &&
+	test -e target/foo &&
+	rm -rf target
+	
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9117-git-svn-init-clone/tmp/target/.git/
+	A	foo
+r1 = 7d7cacb2bdf0e2de8d336b865aad91ae17c74eb1 (refs/remotes/git-svn)
+Checked out HEAD:
+  file:///build/git-2.20.1/t/trash%20directory.t9117-git-svn-init-clone/svnrepo/project/trunk r1
+ok 3 - clone to target directory
+
+expecting success: 
+	test ! -d project &&
+	git svn clone -s "$svnrepo"/project &&
+	test -d project/.git/svn &&
+	test -e project/foo &&
+	rm -rf project
+	
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9117-git-svn-init-clone/tmp/project/.git/
+Using higher level of URL: file:///build/git-2.20.1/t/trash%20directory.t9117-git-svn-init-clone/svnrepo/project => file:///build/git-2.20.1/t/trash%20directory.t9117-git-svn-init-clone/svnrepo
+	A	foo
+r1 = 7d7cacb2bdf0e2de8d336b865aad91ae17c74eb1 (refs/remotes/origin/trunk)
+Checked out HEAD:
+  file:///build/git-2.20.1/t/trash%20directory.t9117-git-svn-init-clone/svnrepo/project/trunk r1
+ok 4 - clone with --stdlayout
+
+expecting success: 
+	test ! -d target &&
+	git svn clone -s "$svnrepo"/project target &&
+	test -d target/.git/svn &&
+	test -e target/foo &&
+	rm -rf target
+	
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9117-git-svn-init-clone/tmp/target/.git/
+Using higher level of URL: file:///build/git-2.20.1/t/trash%20directory.t9117-git-svn-init-clone/svnrepo/project => file:///build/git-2.20.1/t/trash%20directory.t9117-git-svn-init-clone/svnrepo
+	A	foo
+r1 = 7d7cacb2bdf0e2de8d336b865aad91ae17c74eb1 (refs/remotes/origin/trunk)
+Checked out HEAD:
+  file:///build/git-2.20.1/t/trash%20directory.t9117-git-svn-init-clone/svnrepo/project/trunk r1
+ok 5 - clone to target directory with --stdlayout
+
+expecting success: 
+	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/git-2.20.1/t/trash directory.t9117-git-svn-init-clone/tmp/trunk/.git/
+ok 6 - init without -s/-T/-b/-t does not warn
+
+expecting success: 
+	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/git-2.20.1/t/trash directory.t9117-git-svn-init-clone/tmp/trunk/.git/
+	A	foo
+r1 = 7d7cacb2bdf0e2de8d336b865aad91ae17c74eb1 (refs/remotes/git-svn)
+ok 7 - clone without -s/-T/-b/-t does not warn
+
+expecting success: 
+	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/git-2.20.1/t/trash directory.t9117-git-svn-init-clone/tmp/project/.git/
+ok 8 - init with -s/-T/-b/-t assumes --prefix=origin/
+
+expecting success: 
+	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/git-2.20.1/t/trash directory.t9117-git-svn-init-clone/tmp/project/.git/
+	A	foo
+r1 = 7d7cacb2bdf0e2de8d336b865aad91ae17c74eb1 (refs/remotes/origin/trunk)
+ok 9 - clone with -s/-T/-b/-t assumes --prefix=origin/
+
+expecting success: 
+	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/git-2.20.1/t/trash directory.t9117-git-svn-init-clone/tmp/project/.git/
+ok 10 - init with -s/-T/-b/-t and --prefix "" still works
+
+expecting success: 
+	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/git-2.20.1/t/trash directory.t9117-git-svn-init-clone/tmp/project/.git/
+	A	foo
+r1 = 7d7cacb2bdf0e2de8d336b865aad91ae17c74eb1 (refs/remotes/trunk)
+ok 11 - clone with -s/-T/-b/-t and --prefix "" still works
+
+expecting success: 
+	test ! -d project &&
+	git svn init -T "$svnrepo"/project/trunk project &&
+	rm -rf project
+	
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9117-git-svn-init-clone/tmp/.git/
+Using higher level of URL: file:///build/git-2.20.1/t/trash%20directory.t9117-git-svn-init-clone/svnrepo/project/trunk => file:///build/git-2.20.1/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/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t9135-git-svn-moved-branch-empty-file.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9135-git-svn-moved-branch-empty-file/.git/
+expecting success: 
+	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: git svn clone -s "$svnrepo" x
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9135-git-svn-moved-branch-empty-file/x/.git/
+r1 = beb01d4ccb97d931f0082004f7e70ee795dddcf1 (refs/remotes/origin/trunk)
+Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9135-git-svn-moved-branch-empty-file/svnrepo/trunk => file:///build/git-2.20.1/t/trash%20directory.t9135-git-svn-moved-branch-empty-file/svnrepo/branches/branch-b, 1
+Found branch parent: (refs/remotes/origin/branch-b) beb01d4ccb97d931f0082004f7e70ee795dddcf1
+Following parent with do_switch
+Successfully followed parent
+r2 = 3e7959ea28a29e231ed91200eac0e589352b53aa (refs/remotes/origin/branch-b)
+	A	b1
+r3 = c0eab6674035d23fa6a4b35435414dbc682efeca (refs/remotes/origin/branch-b)
+Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9135-git-svn-moved-branch-empty-file/svnrepo/trunk => file:///build/git-2.20.1/t/trash%20directory.t9135-git-svn-moved-branch-empty-file/svnrepo/branches/branch-c, 3
+Found branch parent: (refs/remotes/origin/branch-c) beb01d4ccb97d931f0082004f7e70ee795dddcf1
+Following parent with do_switch
+Successfully followed parent
+r4 = 1845bb1989aa28cf00d9cd59607abb22ac63383c (refs/remotes/origin/branch-c)
+Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9135-git-svn-moved-branch-empty-file/svnrepo/branches/branch-b => file:///build/git-2.20.1/t/trash%20directory.t9135-git-svn-moved-branch-empty-file/svnrepo/branches/branch-c, 5
+Found branch parent: (refs/remotes/origin/branch-c) c0eab6674035d23fa6a4b35435414dbc682efeca
+Index mismatch: 934e48f4addc4882a9b7b99615348569d531c873 != 4b825dc642cb6eb9a060e54bf8d69288fbee4904
+rereading c0eab6674035d23fa6a4b35435414dbc682efeca
+Following parent with do_switch
+Successfully followed parent
+r6 = b750165942f32942fe186e97c51ffe8c678e6966 (refs/remotes/origin/branch-c)
+Checked out HEAD:
+  file:///build/git-2.20.1/t/trash%20directory.t9135-git-svn-moved-branch-empty-file/svnrepo/trunk r1
+ok 2 - clone using git svn
+
+expecting success: 
+	(
+		cd x &&
+		git reset --hard origin/branch-c &&
+		test_must_be_empty b1
+	)
+	
+HEAD is now at b750165 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/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t9136-git-svn-recreated-branch-empty-file.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9136-git-svn-recreated-branch-empty-file/.git/
+expecting success: 
+	svnadmin load "$rawsvnrepo" < "${TEST_DIRECTORY}/t9136/svn.dump"
+	
+<<< Started new transaction, based on original revision 1
+     * editing path : branches ... done.
+     * editing path : tags ... done.
+     * editing path : trunk ... done.
+     * editing path : trunk/file ... done.
+
+------- Committed revision 1 >>>
+
+<<< Started new transaction, based on original revision 2
+     * editing path : tags/1.0 ...COPIED... done.
+
+------- Committed revision 2 >>>
+
+<<< Started new transaction, based on original revision 3
+     * editing path : tags/1.0.1 ...COPIED... done.
+
+------- Committed revision 3 >>>
+
+<<< Started new transaction, based on original revision 4
+     * editing path : tags/1.0.1 ... done.
+
+------- Committed revision 4 >>>
+
+<<< Started new transaction, based on original revision 5
+     * editing path : branches/1.0 ...COPIED... done.
+
+------- Committed revision 5 >>>
+
+<<< Started new transaction, based on original revision 6
+     * editing path : tags/1.0.1 ...COPIED... done.
+
+------- Committed revision 6 >>>
+
+ok 1 - load svn dumpfile
+
+expecting success: git svn clone -s "$svnrepo" x
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9136-git-svn-recreated-branch-empty-file/x/.git/
+	A	file
+r1 = fd4f1d6ab481174c4fbde57ea3920c85cee55140 (refs/remotes/origin/trunk)
+Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9136-git-svn-recreated-branch-empty-file/svnrepo/trunk => file:///build/git-2.20.1/t/trash%20directory.t9136-git-svn-recreated-branch-empty-file/svnrepo/tags/1.0, 1
+Found branch parent: (refs/remotes/origin/tags/1.0) fd4f1d6ab481174c4fbde57ea3920c85cee55140
+Following parent with do_switch
+Successfully followed parent
+r2 = 8b59f27d0431e30c2338effb3fe48f135ddf1f8d (refs/remotes/origin/tags/1.0)
+Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9136-git-svn-recreated-branch-empty-file/svnrepo/tags/1.0 => file:///build/git-2.20.1/t/trash%20directory.t9136-git-svn-recreated-branch-empty-file/svnrepo/tags/1.0.1, 2
+Found branch parent: (refs/remotes/origin/tags/1.0.1) 8b59f27d0431e30c2338effb3fe48f135ddf1f8d
+Following parent with do_switch
+Successfully followed parent
+r3 = 0099ccb2088d781c560075b94f064869894209d6 (refs/remotes/origin/tags/1.0.1)
+Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9136-git-svn-recreated-branch-empty-file/svnrepo/tags/1.0 => file:///build/git-2.20.1/t/trash%20directory.t9136-git-svn-recreated-branch-empty-file/svnrepo/branches/1.0, 4
+Found branch parent: (refs/remotes/origin/1.0) 8b59f27d0431e30c2338effb3fe48f135ddf1f8d
+Following parent with do_switch
+Successfully followed parent
+r5 = 1b79f58e0752f299b18aa054f6bbf09330fa8a32 (refs/remotes/origin/1.0)
+Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9136-git-svn-recreated-branch-empty-file/svnrepo/branches/1.0 => file:///build/git-2.20.1/t/trash%20directory.t9136-git-svn-recreated-branch-empty-file/svnrepo/tags/1.0.1, 5
+Found branch parent: (refs/remotes/origin/tags/1.0.1) 1b79f58e0752f299b18aa054f6bbf09330fa8a32
+Following parent with do_switch
+Successfully followed parent
+r6 = 9f81ec92ddf0fc1598b893a8b5134df27950a3c3 (refs/remotes/origin/tags/1.0.1)
+Checked out HEAD:
+  file:///build/git-2.20.1/t/trash%20directory.t9136-git-svn-recreated-branch-empty-file/svnrepo/trunk r1
+ok 2 - clone using git svn
+
+# passed all 2 test(s)
+1..2
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t9131-git-svn-empty-symlink.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9131-git-svn-empty-symlink/.git/
+expecting success: 
+	svnadmin load "$rawsvnrepo" <<EOF
+SVN-fs-dump-format-version: 2
+
+UUID: 60780f9a-7df5-43b4-83ab-60e2c0673ef7
+
+Revision-number: 0
+Prop-content-length: 56
+Content-length: 56
+
+K 8
+svn:date
+V 27
+2008-11-26T07:17:27.590577Z
+PROPS-END
+
+Revision-number: 1
+Prop-content-length: 111
+Content-length: 111
+
+K 7
+svn:log
+V 4
+test
+K 10
+svn:author
+V 12
+normalperson
+K 8
+svn:date
+V 27
+2008-11-26T07:18:03.511836Z
+PROPS-END
+
+Node-path: bar
+Node-kind: file
+Node-action: add
+Prop-content-length: 33
+Text-content-length: 0
+Text-content-md5: d41d8cd98f00b204e9800998ecf8427e
+Content-length: 33
+
+K 11
+svn:special
+V 1
+*
+PROPS-END
+
+Revision-number: 2
+Prop-content-length: 121
+Content-length: 121
+
+K 7
+svn:log
+V 13
+bar => doink
+
+K 10
+svn:author
+V 12
+normalperson
+K 8
+svn:date
+V 27
+2008-11-27T03:55:31.601672Z
+PROPS-END
+
+Node-path: bar
+Node-kind: file
+Node-action: change
+Text-content-length: 10
+Text-content-md5: 92ca4fe7a9721f877f765c252dcd66c9
+Content-length: 10
+
+link doink
+
+EOF
+
+<<< Started new transaction, based on original revision 1
+     * editing path : bar ... done.
+
+------- Committed revision 1 >>>
+
+<<< Started new transaction, based on original revision 2
+     * editing path : bar ... done.
+
+------- Committed revision 2 >>>
+
+ok 1 - load svn dumpfile
+
+expecting success: git svn clone -r1 "$svnrepo" x
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9131-git-svn-empty-symlink/x/.git/
+bar has mode 120000 but it points to nothing
+converting to an empty file with mode 100644
+	A	bar
+r1 = fafb149e12503e34dbf2627e060fa62d6cf51385 (refs/remotes/git-svn)
+Checked out HEAD:
+  file:///build/git-2.20.1/t/trash%20directory.t9131-git-svn-empty-symlink/svnrepo r1
+ok 2 - clone using git svn
+
+expecting success: (cd x && git config svn.brokenSymlinkWorkaround true)
+ok 3 - enable broken symlink workaround
+
+expecting success: test_must_be_empty x/bar
+ok 4 - "bar" is an empty file
+
+expecting success: (cd x && git svn rebase)
+Scanning for empty symlinks, this may take a while if you have many empty files
+You may disable this with `git config svn.brokenSymlinkWorkaround false'.
+This may be done in a different terminal without restarting git svn
+	M	bar
+r2 = 33ef57f848781c501761f7fe4d89dbc37814d871 (refs/remotes/git-svn)
+First, rewinding head to replay your work on top of it...
+Fast-forwarded master to refs/remotes/git-svn.
+ok 5 - get "bar" => symlink fix from svn
+
+checking prerequisite: SYMLINKS
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
+	# test whether the filesystem supports symbolic links
+	ln -s x y && test -h y
+
+)
+prerequisite SYMLINKS ok
+expecting success: test -h x/bar
+ok 6 - "bar" becomes a symlink
+
+expecting success: git svn clone -r1 "$svnrepo" y
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9131-git-svn-empty-symlink/y/.git/
+bar has mode 120000 but it points to nothing
+converting to an empty file with mode 100644
+	A	bar
+r1 = fafb149e12503e34dbf2627e060fa62d6cf51385 (refs/remotes/git-svn)
+Checked out HEAD:
+  file:///build/git-2.20.1/t/trash%20directory.t9131-git-svn-empty-symlink/svnrepo r1
+ok 7 - clone using git svn
+
+expecting success: (cd y && git config svn.brokenSymlinkWorkaround false)
+ok 8 - disable broken symlink workaround
+
+expecting success: test_must_be_empty y/bar
+ok 9 - "bar" is an empty file
+
+expecting success: (cd y && git svn rebase)
+	M	bar
+r2 = ac95711dc99299c22df63138bafdcbe4969df3cb (refs/remotes/git-svn)
+First, rewinding head to replay your work on top of it...
+Fast-forwarded master to refs/remotes/git-svn.
+ok 10 - get "bar" => symlink fix from svn
+
+expecting success: ! test -L y/bar
+ok 11 - "bar" does not become a symlink
+
+expecting success: git svn clone -r1 "$svnrepo" z
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9131-git-svn-empty-symlink/z/.git/
+bar has mode 120000 but it points to nothing
+converting to an empty file with mode 100644
+	A	bar
+r1 = fafb149e12503e34dbf2627e060fa62d6cf51385 (refs/remotes/git-svn)
+Checked out HEAD:
+  file:///build/git-2.20.1/t/trash%20directory.t9131-git-svn-empty-symlink/svnrepo r1
+ok 12 - clone using git svn
+
+expecting success: test_must_be_empty z/bar
+ok 13 - "bar" is an empty file
+
+expecting success: (cd z && git svn rebase)
+	M	bar
+r2 = ac95711dc99299c22df63138bafdcbe4969df3cb (refs/remotes/git-svn)
+First, rewinding head to replay your work on top of it...
+Fast-forwarded master to refs/remotes/git-svn.
+ok 14 - get "bar" => symlink fix from svn
+
+expecting success: ! test -L z/bar
+ok 15 - "bar" does not become a symlink
+
+# passed all 15 test(s)
+1..15
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t9129-git-svn-i18n-commitencoding.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9129-git-svn-i18n-commitencoding/.git/
+expecting success: 
+		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/git-2.20.1/t/trash directory.t9129-git-svn-i18n-commitencoding/ISO8859-1/.git/
+r1 = f3dffd9ae2547e024db99c7ff33c285570ddef7c (refs/remotes/git-svn)
+Checked out HEAD:
+  file:///build/git-2.20.1/t/trash%20directory.t9129-git-svn-i18n-commitencoding/svnrepo/ISO8859-1 r1
+ok 1 - ISO8859-1 setup
+
+expecting success: 
+		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/git-2.20.1/t/trash directory.t9129-git-svn-i18n-commitencoding/eucJP/.git/
+r2 = fbfe5fbd7885fcab9abf87ca2902c9746b033fcb (refs/remotes/git-svn)
+Checked out HEAD:
+  file:///build/git-2.20.1/t/trash%20directory.t9129-git-svn-i18n-commitencoding/svnrepo/eucJP r2
+ok 2 - eucJP setup
+
+expecting success: 
+		mkdir $H &&
+		svn_cmd import -m "$H test" $H "$svnrepo"/$H &&
+		git svn clone "$svnrepo"/$H $H
+	
+Committing transaction...
+Committed revision 3.
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9129-git-svn-i18n-commitencoding/ISO-2022-JP/.git/
+r3 = 70fcda595cafff3577dde2441c99fc0dd4efdb38 (refs/remotes/git-svn)
+Checked out HEAD:
+  file:///build/git-2.20.1/t/trash%20directory.t9129-git-svn-i18n-commitencoding/svnrepo/ISO-2022-JP r3
+ok 3 - ISO-2022-JP setup
+
+expecting success: 
+	(
+		cd $H &&
+		git config i18n.commitencoding $H &&
+		git checkout -b t refs/remotes/git-svn &&
+		echo $H >F &&
+		git add F &&
+		git commit -a -F "$TEST_DIRECTORY"/t3900/$H.txt &&
+		E=$(git cat-file commit HEAD | sed -ne "s/^encoding //p") &&
+		test "z$E" = "z$H" &&
+		compare_git_head_with "$TEST_DIRECTORY"/t3900/$H.txt
+	)
+	
+Switched to a new branch 't'
+[t d87518b] ÄËÑÏÖ
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 F
+ok 4 - ISO8859-1 commit on git side
+
+expecting success: 
+	(
+		cd $H &&
+		git config i18n.commitencoding $H &&
+		git checkout -b t refs/remotes/git-svn &&
+		echo $H >F &&
+		git add F &&
+		git commit -a -F "$TEST_DIRECTORY"/t3900/$H.txt &&
+		E=$(git cat-file commit HEAD | sed -ne "s/^encoding //p") &&
+		test "z$E" = "z$H" &&
+		compare_git_head_with "$TEST_DIRECTORY"/t3900/$H.txt
+	)
+	
+Switched to a new branch 't'
+[t d683064] ¤Ï¤ì¤Ò¤Û¤Õ
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 F
+ok 5 - eucJP commit on git side
+
+expecting success: 
+	(
+		cd $H &&
+		git config i18n.commitencoding $H &&
+		git checkout -b t refs/remotes/git-svn &&
+		echo $H >F &&
+		git add F &&
+		git commit -a -F "$TEST_DIRECTORY"/t3900/$H.txt &&
+		E=$(git cat-file commit HEAD | sed -ne "s/^encoding //p") &&
+		test "z$E" = "z$H" &&
+		compare_git_head_with "$TEST_DIRECTORY"/t3900/$H.txt
+	)
+	
+Switched to a new branch 't'
+[t d450fb5] $B$O$l$R$[$U(B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 F
+ok 6 - ISO-2022-JP commit on git side
+
+expecting success: 
+	(
+		cd $H &&
+		git svn dcommit &&
+		git cat-file commit HEAD | grep git-svn-id: &&
+		E=$(git cat-file commit HEAD | sed -ne "s/^encoding //p") &&
+		test "z$E" = "z$H" &&
+		compare_git_head_with "$TEST_DIRECTORY"/t3900/$H.txt
+	)
+	
+Committing to file:///build/git-2.20.1/t/trash%20directory.t9129-git-svn-i18n-commitencoding/svnrepo/ISO8859-1 ...
+	A	F
+Committed r4
+	A	F
+r4 = 389718f5ffa44735d7c6b8a4fa5fa3012bf1d2b4 (refs/remotes/git-svn)
+No changes between d87518b90d378085ed7a0b17a5fdfa72844814fc and refs/remotes/git-svn
+Resetting to the latest refs/remotes/git-svn
+git-svn-id: file:///build/git-2.20.1/t/trash%20directory.t9129-git-svn-i18n-commitencoding/svnrepo/ISO8859-1@4 dbe39ade-aeca-484c-93c9-02c47c357205
+ok 7 - ISO8859-1 dcommit to svn
+
+expecting success: 
+	(
+		cd $H &&
+		git svn dcommit &&
+		git cat-file commit HEAD | grep git-svn-id: &&
+		E=$(git cat-file commit HEAD | sed -ne "s/^encoding //p") &&
+		test "z$E" = "z$H" &&
+		compare_git_head_with "$TEST_DIRECTORY"/t3900/$H.txt
+	)
+	
+Committing to file:///build/git-2.20.1/t/trash%20directory.t9129-git-svn-i18n-commitencoding/svnrepo/eucJP ...
+	A	F
+Committed r5
+	A	F
+r5 = 6bad2687d1ac83d81c9d709f182bf689e7a239d7 (refs/remotes/git-svn)
+No changes between d68306490b3190014c96aad719bc7d438017e737 and refs/remotes/git-svn
+Resetting to the latest refs/remotes/git-svn
+git-svn-id: file:///build/git-2.20.1/t/trash%20directory.t9129-git-svn-i18n-commitencoding/svnrepo/eucJP@5 dbe39ade-aeca-484c-93c9-02c47c357205
+ok 8 - eucJP dcommit to svn
+
+expecting success: 
+	(
+		cd $H &&
+		git svn dcommit &&
+		git cat-file commit HEAD | grep git-svn-id: &&
+		E=$(git cat-file commit HEAD | sed -ne "s/^encoding //p") &&
+		test "z$E" = "z$H" &&
+		compare_git_head_with "$TEST_DIRECTORY"/t3900/$H.txt
+	)
+	
+Committing to file:///build/git-2.20.1/t/trash%20directory.t9129-git-svn-i18n-commitencoding/svnrepo/ISO-2022-JP ...
+	A	F
+Committed r6
+	A	F
+r6 = 64e6d6ae2dbd83c220d61cb12191d9d56ead6774 (refs/remotes/git-svn)
+No changes between d450fb5224b7ea5a0fce930768ba9a691d3da525 and refs/remotes/git-svn
+Resetting to the latest refs/remotes/git-svn
+git-svn-id: file:///build/git-2.20.1/t/trash%20directory.t9129-git-svn-i18n-commitencoding/svnrepo/ISO-2022-JP@6 dbe39ade-aeca-484c-93c9-02c47c357205
+ok 9 - ISO-2022-JP dcommit to svn
+
+expecting success: 
+	(
+		cd ISO8859-1 &&
+		compare_svn_head_with "$TEST_DIRECTORY"/t3900/1-UTF-8.txt
+	)
+
+ok 10 - ISO-8859-1 should match UTF-8 in svn
+
+expecting success: 
+		(
+			cd $H &&
+			compare_svn_head_with "$TEST_DIRECTORY"/t3900/2-UTF-8.txt
+		)
+	
+ok 11 - eucJP should match UTF-8 in svn
+
+expecting success: 
+		(
+			cd $H &&
+			compare_svn_head_with "$TEST_DIRECTORY"/t3900/2-UTF-8.txt
+		)
+	
+ok 12 - ISO-2022-JP should match UTF-8 in svn
+
+# passed all 12 test(s)
+1..12
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t9133-git-svn-nested-git-repo.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9133-git-svn-nested-git-repo/.git/
+expecting success: 
+	svn_cmd co "$svnrepo" s &&
+	(
+		cd s &&
+		git init &&
+		test -f .git/HEAD &&
+		> .git/a &&
+		echo a > a &&
+		svn_cmd add .git a &&
+		svn_cmd commit -m "create a nested git repo" &&
+		svn_cmd up &&
+		echo hi >> .git/a &&
+		svn_cmd commit -m "modify .git/a" &&
+		svn_cmd up
+	)
+
+Checked out revision 0.
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9133-git-svn-nested-git-repo/s/.git/
+A         .git
+A         .git/objects
+A         .git/objects/info
+A         .git/objects/pack
+A         .git/info
+A         .git/info/exclude
+A         .git/refs
+A         .git/refs/heads
+A         .git/refs/tags
+A         .git/a
+A         .git/HEAD
+A         .git/hooks
+A         .git/hooks/fsmonitor-watchman.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/applypatch-msg.sample
+A         .git/hooks/pre-applypatch.sample
+A         .git/hooks/commit-msg.sample
+A         .git/hooks/pre-commit.sample
+A         .git/description
+A         .git/config
+A         .git/branches
+A         a
+Adding         .git
+Adding         .git/HEAD
+Adding         .git/a
+Adding         .git/branches
+Adding         .git/config
+Adding         .git/description
+Adding         .git/hooks
+Adding         .git/hooks/applypatch-msg.sample
+Adding         .git/hooks/commit-msg.sample
+Adding         .git/hooks/fsmonitor-watchman.sample
+Adding         .git/hooks/post-update.sample
+Adding         .git/hooks/pre-applypatch.sample
+Adding         .git/hooks/pre-commit.sample
+Adding         .git/hooks/pre-push.sample
+Adding         .git/hooks/pre-rebase.sample
+Adding         .git/hooks/pre-receive.sample
+Adding         .git/hooks/prepare-commit-msg.sample
+Adding         .git/hooks/update.sample
+Adding         .git/info
+Adding         .git/info/exclude
+Adding         .git/objects
+Adding         .git/objects/info
+Adding         .git/objects/pack
+Adding         .git/refs
+Adding         .git/refs/heads
+Adding         .git/refs/tags
+Adding         a
+Transmitting file data .................done
+Committing transaction...
+Committed revision 1.
+Updating '.':
+At revision 1.
+Sending        .git/a
+Transmitting file data .done
+Committing transaction...
+Committed revision 2.
+Updating '.':
+At revision 2.
+ok 1 - setup repo with a git repo inside it
+
+expecting success: 
+	git svn clone "$svnrepo" g &&
+	echo a > expect &&
+	test_cmp expect g/a
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9133-git-svn-nested-git-repo/g/.git/
+	A	a
+r1 = 2d3fbaa3a2e41034f3715d419d7570764d4c2f77 (refs/remotes/git-svn)
+r2 = 97b05e3cd5d673e9f16fc31225c6a1f047039f81 (refs/remotes/git-svn)
+Checked out HEAD:
+  file:///build/git-2.20.1/t/trash%20directory.t9133-git-svn-nested-git-repo/svnrepo r2
+ok 2 - clone an SVN repo containing a git repo
+
+expecting success: 
+	(
+		cd s &&
+		echo b >> a &&
+		svn_cmd commit -m "SVN-side change outside of .git" &&
+		svn_cmd up &&
+		svn_cmd log -v | fgrep "SVN-side change outside of .git"
+	)
+
+Sending        a
+Transmitting file data .done
+Committing transaction...
+Committed revision 3.
+Updating '.':
+At revision 3.
+SVN-side change outside of .git
+ok 3 - SVN-side change outside of .git
+
+expecting success: 
+	(
+		cd g &&
+		git svn rebase &&
+		echo a > expect &&
+		echo b >> expect &&
+		test_cmp expect a &&
+		rm expect
+	)
+
+	M	a
+r3 = 14c44ab773680d1126061e8febfc9370fee3eeb3 (refs/remotes/git-svn)
+First, rewinding head to replay your work on top of it...
+Fast-forwarded master to refs/remotes/git-svn.
+ok 4 - update git svn-cloned repo
+
+expecting success: 
+	(
+		cd s &&
+		git add a &&
+		git commit -m "add a inside an SVN repo" &&
+		git log &&
+		svn_cmd add --force .git &&
+		svn_cmd commit -m "SVN-side change inside of .git" &&
+		svn_cmd up &&
+		svn_cmd log -v | fgrep "SVN-side change inside of .git"
+	)
+
+[master (root-commit) b1e94f3] add a inside an SVN repo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 a
+commit b1e94f363b01cf3ffce884e188fa812e8b86433e
+Author: A U Thor <author@example.com>
+Date:   Thu Jan 5 11:50:45 2023 +0000
+
+    add a inside an SVN repo
+A         .git/logs
+A         .git/logs/refs
+A         .git/logs/refs/heads
+A         .git/logs/refs/heads/master
+A         .git/logs/HEAD
+A         .git/COMMIT_EDITMSG
+A  (bin)  .git/index
+A         .git/objects/42
+A  (bin)  .git/objects/42/2c2b7ab3b3c668038da977e4e93a5fc623169c
+A         .git/objects/b1
+A  (bin)  .git/objects/b1/e94f363b01cf3ffce884e188fa812e8b86433e
+A         .git/objects/a3
+A  (bin)  .git/objects/a3/8e8ab7e857af7a7ac6f49fa3d3821f26fedca8
+A         .git/refs/heads/master
+Adding         .git/COMMIT_EDITMSG
+Adding  (bin)  .git/index
+Adding         .git/logs
+Adding         .git/logs/HEAD
+Adding         .git/logs/refs
+Adding         .git/logs/refs/heads
+Adding         .git/logs/refs/heads/master
+Adding         .git/objects/42
+Adding  (bin)  .git/objects/42/2c2b7ab3b3c668038da977e4e93a5fc623169c
+Adding         .git/objects/a3
+Adding  (bin)  .git/objects/a3/8e8ab7e857af7a7ac6f49fa3d3821f26fedca8
+Adding         .git/objects/b1
+Adding  (bin)  .git/objects/b1/e94f363b01cf3ffce884e188fa812e8b86433e
+Adding         .git/refs/heads/master
+Transmitting file data ........done
+Committing transaction...
+Committed revision 4.
+Updating '.':
+At revision 4.
+SVN-side change inside of .git
+ok 5 - SVN-side change inside of .git
+
+expecting success: 
+	(
+		cd g &&
+		git svn rebase &&
+		echo a > expect &&
+		echo b >> expect &&
+		test_cmp expect a &&
+		rm expect
+	)
+
+r4 = 9aaf1ec6caebb570acc398e5e11fc492fce7f2f7 (refs/remotes/git-svn)
+First, rewinding head to replay your work on top of it...
+Fast-forwarded master to refs/remotes/git-svn.
+ok 6 - update git svn-cloned repo
+
+expecting success: 
+	(
+		cd s &&
+		echo c >> a &&
+		git add a &&
+		git commit -m "add a inside an SVN repo" &&
+		svn_cmd commit -m "SVN-side change in and out of .git" &&
+		svn_cmd up &&
+		svn_cmd log -v | fgrep "SVN-side change in and out of .git"
+	)
+
+[master 584a996] add a inside an SVN repo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Sending        .git/index
+Sending        .git/logs/HEAD
+Sending        .git/logs/refs/heads/master
+Sending        .git/refs/heads/master
+Sending        a
+Transmitting file data .....done
+Committing transaction...
+Committed revision 5.
+Updating '.':
+At revision 5.
+SVN-side change in and out of .git
+ok 7 - SVN-side change in and out of .git
+
+expecting success: 
+	(
+		cd g &&
+		git svn rebase &&
+		echo a > expect &&
+		echo b >> expect &&
+		echo c >> expect &&
+		test_cmp expect a &&
+		rm expect
+	)
+
+	M	a
+r5 = b0e028c8e042e80b6de4d8d01f4c69d7d01cb80d (refs/remotes/git-svn)
+First, rewinding head to replay your work on top of it...
+Fast-forwarded master to refs/remotes/git-svn.
+ok 8 - update git svn-cloned repo again
+
+# passed all 8 test(s)
+1..8
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t9137-git-svn-dcommit-clobber-series.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9137-git-svn-dcommit-clobber-series/.git/
+expecting success: 
+	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 = 7c7a6e8f2f95e0d8ce7b896b9aaa8d46e572c36e (refs/remotes/git-svn)
+Checked out HEAD:
+  file:///build/git-2.20.1/t/trash%20directory.t9137-git-svn-dcommit-clobber-series/svnrepo r1
+ok 1 - initialize repo
+
+expecting success: 
+	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: 
+	echo hi > life &&
+	git update-index --add life &&
+	git commit -m hi-life &&
+	echo bye >> life &&
+	git commit -m bye-life life
+	
+[master f8f33d6] hi-life
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 life
+[master a4b2546] bye-life
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 3 - some unrelated changes to git
+
+expecting success: 
+	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 8237524] 4 => 4444, 7 => 7777
+ Author: A U Thor <author@example.com>
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+Committing to file:///build/git-2.20.1/t/trash%20directory.t9137-git-svn-dcommit-clobber-series/svnrepo ...
+	A	life
+Committed r3
+	M	file
+r2 = 684f747391216aa91749fb2ceb177aa61fc79a54 (refs/remotes/git-svn)
+	A	life
+r3 = 5f7983663fb9ca80d4ee570284668fbe7c111c38 (refs/remotes/git-svn)
+W: f8f33d6a818ef7c21bfc25055e77bb13c01c1876 and refs/remotes/git-svn differ, using rebase:
+:100644 100644 55200b3d5d7c0e515eaccaf8465a295017e88249 15dcf092297e5fcea41cadcc3eb0a689aaa3e65e M	file
+First, rewinding head to replay your work on top of it...
+Applying: bye-life
+Applying: 4 => 4444, 7 => 7777
+	M	life
+Committed r4
+	M	life
+r4 = ec2a27f39fdeb318de9d8d4b73fecaabd921b922 (refs/remotes/git-svn)
+	M	file
+Committed r5
+	M	file
+r5 = 324f4f24b9c5fb798561f217ae0909899b8d6c40 (refs/remotes/git-svn)
+No changes between 0956b9d964f901cc4de7876920a554dc0e6c38b3 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: 
+	echo foo >>file &&
+	git add file &&
+	test_must_fail git svn dcommit
+
+Cannot dcommit with a dirty index.  Commit your changes first, or stash them with `git stash'.
+ at /build/git-2.20.1/git-svn line 852.
+
+ok 5 - attempt to dcommit with a dirty index
+
+# passed all 5 test(s)
+1..5
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t9142-git-svn-shallow-clone.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9142-git-svn-shallow-clone/.git/
+expecting success: 
+	svn_cmd mkdir -m "create standard layout" \
+	  "$svnrepo"/trunk "$svnrepo"/branches "$svnrepo"/tags &&
+	svn_cmd cp -m "branch off trunk" \
+	  "$svnrepo"/trunk "$svnrepo"/branches/a &&
+	svn_cmd co "$svnrepo"/branches/a &&
+	(
+		cd a &&
+		> foo &&
+		svn_cmd add foo &&
+		svn_cmd commit -m "add foo"
+	) &&
+	maybe_start_httpd
+
+Committing transaction...
+Committed revision 1.
+Committing transaction...
+Committed revision 2.
+Checked out revision 2.
+A         foo
+Adding         foo
+Transmitting file data .done
+Committing transaction...
+Committed revision 3.
+ok 1 - setup test repository
+
+expecting success: 
+	git svn clone -r HEAD "$svnrepo/trunk" g &&
+	( cd g && git rev-parse --symbolic --verify HEAD )
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9142-git-svn-shallow-clone/g/.git/
+r1 = e633a70919e1e57fe2e0733e02644b87c3b8f8a3 (refs/remotes/git-svn)
+Checked out HEAD:
+  file:///build/git-2.20.1/t/trash%20directory.t9142-git-svn-shallow-clone/svnrepo/trunk r1
+HEAD
+ok 2 - clone trunk with "-r HEAD"
+
+# passed all 2 test(s)
+1..2
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t9115-git-svn-dcommit-funky-renames.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9115-git-svn-dcommit-funky-renames/.git/
+expecting success: 
+	svnadmin load -q "$rawsvnrepo" <"$TEST_DIRECTORY"/t9115/funky-names.dump
+
+ok 1 - load repository with strange names
+
+expecting success: 
+	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 = abad896ccbe64d6a2ca599d118bee00b532049d1 (refs/remotes/git-svn)
+Checked out HEAD:
+  file:///build/git-2.20.1/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 abad896 what will those wacky people think of next?
+ok 2 - init and fetch repository
+
+expecting success: 
+	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 3cb3a97] new file in ugly parent
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 #{bad_directory_name}/ foo
+Committing to file:///build/git-2.20.1/t/trash%20directory.t9115-git-svn-dcommit-funky-renames/svnrepo ...
+	A	#{bad_directory_name}/ foo
+Committed r2
+	A	#{bad_directory_name}/ foo
+r2 = 2884d22c322b64923098823e6a0c393b47979af1 (refs/remotes/git-svn)
+No changes between 3cb3a97752dfde2b55c2e087c6a6884d7b4f3219 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: 
+	git mv "#{bad_directory_name}/ foo" "file name with feces" &&
+	git commit -m "rename ugly file" &&
+	git svn dcommit
+	
+[master afda391] 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%)
+Committing to file:///build/git-2.20.1/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 = 2e1613b2f2e41f1c7195c3cb947aa01aa84182da (refs/remotes/git-svn)
+No changes between afda391339409de0453bbd5753d77a9e40802786 and refs/remotes/git-svn
+Resetting to the latest refs/remotes/git-svn
+ok 4 - rename ugly file
+
+expecting success: 
+	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 293e426] pretty :x
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 pretty
+Committing to file:///build/git-2.20.1/t/trash%20directory.t9115-git-svn-dcommit-funky-renames/svnrepo ...
+	A	pretty
+Committed r4
+	A	pretty
+r4 = f025bcbfc324e6f1d28a74d71718b9a920effad0 (refs/remotes/git-svn)
+No changes between 293e426cfa353cb9cf1a71d96f954446f4988179 and refs/remotes/git-svn
+Resetting to the latest refs/remotes/git-svn
+[master c8eade9] moved pretty file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename pretty => regular_dir_name/pretty (100%)
+Committing to file:///build/git-2.20.1/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 = 14b24cd9ec1daf10e0c67633c7bce91f7db919ca (refs/remotes/git-svn)
+No changes between c8eade9f52f4c2c21b79adb2182a3979c4b2a24f and refs/remotes/git-svn
+Resetting to the latest refs/remotes/git-svn
+ok 5 - rename pretty file
+
+expecting success: 
+	git mv regular_dir_name/pretty "#{bad_directory_name}/ booboo" &&
+	git commit -m booboo &&
+	git svn dcommit
+	
+[master 92d5eab] 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%)
+Committing to file:///build/git-2.20.1/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 = 9a4c29229b1b19514fb305a66f4f541f8e38b2ed (refs/remotes/git-svn)
+No changes between 92d5eab39d0d810f030a66d3cf4d552b0d72a39b and refs/remotes/git-svn
+Resetting to the latest refs/remotes/git-svn
+ok 6 - rename pretty file into ugly one
+
+expecting success: 
+	echo .. > +_+ &&
+	git update-index --add +_+ &&
+	git commit -m plus &&
+	mkdir gtk+ &&
+	git mv +_+ gtk+/_+_ &&
+	git commit -m plus_dir &&
+	git svn dcommit
+	
+[master f51b255] plus
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 +_+
+[master 5c74f04] plus_dir
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename +_+ => gtk+/_+_ (100%)
+Committing to file:///build/git-2.20.1/t/trash%20directory.t9115-git-svn-dcommit-funky-renames/svnrepo ...
+	A	+_+
+Committed r7
+	A	+_+
+r7 = ebebe97350dc1cb149a27df6f2026884e673aab8 (refs/remotes/git-svn)
+	R	+_+ => gtk+/_+_
+Committed r8
+	D	+_+
+	A	gtk+/_+_
+W: -empty_dir: +_+
+r8 = 284a73eabb1356b36962515893314394309763f5 (refs/remotes/git-svn)
+No changes between 5c74f04218184ed0113958cff52787e44b985725 and refs/remotes/git-svn
+Resetting to the latest refs/remotes/git-svn
+ok 7 - add a file with plus signs
+
+expecting success: 
+	git svn clone "$svnrepo" test-rebase &&
+	(
+		cd test-rebase &&
+		echo test-rebase >test-rebase &&
+		git add test-rebase &&
+		git commit -m test-rebase
 	)
 	
-HEAD is now at 8f562fb scary
-[master 9ef2067] eep
+Initialized empty Git repository in /build/git-2.20.1/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 = abad896ccbe64d6a2ca599d118bee00b532049d1 (refs/remotes/git-svn)
+	A	#{bad_directory_name}/ foo
+r2 = 2884d22c322b64923098823e6a0c393b47979af1 (refs/remotes/git-svn)
+	D	#{bad_directory_name}/ foo
+	A	file name with feces
+W: -empty_dir: #{bad_directory_name}/ foo
+r3 = 2e1613b2f2e41f1c7195c3cb947aa01aa84182da (refs/remotes/git-svn)
+	A	pretty
+r4 = f025bcbfc324e6f1d28a74d71718b9a920effad0 (refs/remotes/git-svn)
+	D	pretty
+	A	regular_dir_name/pretty
+W: -empty_dir: pretty
+r5 = 14b24cd9ec1daf10e0c67633c7bce91f7db919ca (refs/remotes/git-svn)
+	A	#{bad_directory_name}/ booboo
+	D	regular_dir_name/pretty
+W: -empty_dir: regular_dir_name/pretty
+r6 = 9a4c29229b1b19514fb305a66f4f541f8e38b2ed (refs/remotes/git-svn)
+	A	+_+
+r7 = ebebe97350dc1cb149a27df6f2026884e673aab8 (refs/remotes/git-svn)
+	D	+_+
+	A	gtk+/_+_
+W: -empty_dir: +_+
+r8 = 284a73eabb1356b36962515893314394309763f5 (refs/remotes/git-svn)
+Checked out HEAD:
+  file:///build/git-2.20.1/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 e4fcd59] test-rebase
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-Committing to file:///build/git-2.20.1/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 = eef4af121a24d1722a121703718fbfbe9d1aff38 (refs/remotes/origin/Abo-Uebernahme (Bug #994))
-No changes between 9ef2067474d75bffe3187514095d714410754879 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
+ create mode 100644 test-rebase
+ok 8 - clone the repository to test rebase
 
 expecting success: 
-	(
-		cd project &&
-		git reset --hard "refs/remotes/origin/trailing_dotlock%2Elock" &&
-		echo who names branches like this anyway? >> foo &&
-		git commit -m "bar" -- foo &&
+		echo test-rebase-main > test-rebase-main &&
+		git add test-rebase-main &&
+		git commit -m test-rebase-main &&
 		git svn dcommit
-	)
 	
-HEAD is now at 13c1ba3 trailing .lock
-[master e6181a6] bar
+[master 471a6f3] test-rebase-main
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-Committing to file:///build/git-2.20.1/t/trash%20directory.t9118-git-svn-funky-branch-names/svnrepo/pr%20ject/branches/trailing_dotlock.lock ...
-	M	foo
-Committed r11
-	M	foo
-r11 = 898e0d242ff3beffa51fcb1ec7c6596228fc113e (refs/remotes/origin/trailing_dotlock.lock)
-No changes between e6181a642973e8bc3d458f0a6f1c25fef21fc63e 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/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t9120-git-svn-clone-with-percent-escapes.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9120-git-svn-clone-with-percent-escapes/.git/
-expecting success: 
-	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: 
-	git svn clone "$svnrepo/pr%20ject" clone &&
-	(
-		cd clone &&
-		git rev-parse refs/remotes/git-svn
-	)
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9120-git-svn-clone-with-percent-escapes/clone/.git/
-	A	trunk/foo
-W: +empty_dir: branches
-W: +empty_dir: tags
-r1 = 352a8e1d47934f93357b76d2af50a7aa5da54984 (refs/remotes/git-svn)
-	A	branches/b/foo
-r2 = e674811fa48fe1338ae5b9b5601d269f32962ee8 (refs/remotes/git-svn)
-	A	tags/v1/foo
-r3 = 132deeb4bd44ceee8402143b6502c17c0011284c (refs/remotes/git-svn)
-Checked out HEAD:
-  file:///build/git-2.20.1/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject r3
-132deeb4bd44ceee8402143b6502c17c0011284c
-ok 2 - test clone with percent escapes
-
-expecting success: 
-	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: 
-	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
+ create mode 100644 test-rebase-main
+Committing to file:///build/git-2.20.1/t/trash%20directory.t9115-git-svn-dcommit-funky-renames/svnrepo ...
+	A	test-rebase-main
+Committed r9
+	A	test-rebase-main
+r9 = a880fafea3db7dca66ebbab431b14105672151e1 (refs/remotes/git-svn)
+No changes between 471a6f3649c082e0ac68fd3772b0aeb9a6ce299d and refs/remotes/git-svn
+Resetting to the latest refs/remotes/git-svn
+ok 9 - make a commit to test rebase
 
 expecting success: 
-	git svn clone --minimize-url "$svnrepo/pr%20ject/trunk" minimize &&
 	(
-		cd minimize &&
-		git rev-parse refs/remotes/git-svn
+		cd test-rebase &&
+		git svn rebase &&
+		test -e test-rebase-main &&
+		test -e test-rebase
 	)
+	A	test-rebase-main
+r9 = a880fafea3db7dca66ebbab431b14105672151e1 (refs/remotes/git-svn)
+First, rewinding head to replay your work on top of it...
+Applying: test-rebase
+ok 10 - git svn rebase works inside a fresh-cloned repository
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9120-git-svn-clone-with-percent-escapes/minimize/.git/
-Using higher level of URL: file:///build/git-2.20.1/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject/trunk => file:///build/git-2.20.1/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo
-	A	foo
-r1 = bb5e71adf68d3af3f0ba2a19df8e48a4334eac4a (refs/remotes/git-svn)
-Checked out HEAD:
-  file:///build/git-2.20.1/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject/trunk r1
-bb5e71adf68d3af3f0ba2a19df8e48a4334eac4a
-ok 5 - test clone trunk with percent escapes and minimize-url
-
-expecting success: 
-	git svn clone "$svnrepo/pr%20ject/trunk" trunk &&
-	(
-		cd trunk &&
-		git rev-parse refs/remotes/git-svn
-	)
+checking prerequisite: UTF8_NFD_TO_NFC
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9120-git-svn-clone-with-percent-escapes/trunk/.git/
-	A	foo
-r1 = bb5e71adf68d3af3f0ba2a19df8e48a4334eac4a (refs/remotes/git-svn)
-Checked out HEAD:
-  file:///build/git-2.20.1/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject/trunk r1
-bb5e71adf68d3af3f0ba2a19df8e48a4334eac4a
-ok 6 - test clone trunk with percent escapes
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
+	# 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: 
-	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
-	)
+	LC_ALL=$a_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
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9120-git-svn-clone-with-percent-escapes/percent/.git/
-Using higher level of URL: file:///build/git-2.20.1/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject => file:///build/git-2.20.1/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo
-	A	foo
-r1 = bb5e71adf68d3af3f0ba2a19df8e48a4334eac4a (refs/remotes/origin/trunk)
-Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject/trunk => file:///build/git-2.20.1/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject/branches/b, 1
-Found branch parent: (refs/remotes/origin/b) bb5e71adf68d3af3f0ba2a19df8e48a4334eac4a
-Following parent with do_switch
-Successfully followed parent
-r2 = 82655485c3d857c1f8e942eef447a0babae27f84 (refs/remotes/origin/b)
-Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject/trunk => file:///build/git-2.20.1/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject/tags/v1, 2
-Found branch parent: (refs/remotes/origin/tags/v1) bb5e71adf68d3af3f0ba2a19df8e48a4334eac4a
-Following parent with do_switch
-Successfully followed parent
-r3 = 82cec77324ae44cd2e70e341d1f7170bbccede0d (refs/remotes/origin/tags/v1)
-Checked out HEAD:
-  file:///build/git-2.20.1/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject/trunk r1
-bb5e71adf68d3af3f0ba2a19df8e48a4334eac4a
-82655485c3d857c1f8e942eef447a0babae27f84
-82cec77324ae44cd2e70e341d1f7170bbccede0d
-ok 7 - test clone --stdlayout with percent escapes
+[master 331d4a8] neq
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 "\201\202"
+Committing to file:///build/git-2.20.1/t/trash%20directory.t9115-git-svn-dcommit-funky-renames/svnrepo ...
+	A	�‚
+Committed r10
+	A	�‚
+r10 = 24421c72b2d9075dcba5224200fbd4ac3da99934 (refs/remotes/git-svn)
+No changes between 331d4a8fabd286cd415a3786c0e591de39834cec and refs/remotes/git-svn
+Resetting to the latest refs/remotes/git-svn
+ok 11 - svn.pathnameencoding=cp932 new file on dcommit
 
 expecting success: 
-	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
-	)
+	LC_ALL=$a_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
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9120-git-svn-clone-with-percent-escapes/space/.git/
-Using higher level of URL: file:///build/git-2.20.1/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject => file:///build/git-2.20.1/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo
-	A	foo
-r1 = bb5e71adf68d3af3f0ba2a19df8e48a4334eac4a (refs/remotes/origin/trunk)
-Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject/trunk => file:///build/git-2.20.1/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject/branches/b, 1
-Found branch parent: (refs/remotes/origin/b) bb5e71adf68d3af3f0ba2a19df8e48a4334eac4a
-Following parent with do_switch
-Successfully followed parent
-r2 = 82655485c3d857c1f8e942eef447a0babae27f84 (refs/remotes/origin/b)
-Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject/trunk => file:///build/git-2.20.1/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject/tags/v1, 2
-Found branch parent: (refs/remotes/origin/tags/v1) bb5e71adf68d3af3f0ba2a19df8e48a4334eac4a
-Following parent with do_switch
-Successfully followed parent
-r3 = 82cec77324ae44cd2e70e341d1f7170bbccede0d (refs/remotes/origin/tags/v1)
-Checked out HEAD:
-  file:///build/git-2.20.1/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject/trunk r1
-bb5e71adf68d3af3f0ba2a19df8e48a4334eac4a
-82655485c3d857c1f8e942eef447a0babae27f84
-82cec77324ae44cd2e70e341d1f7170bbccede0d
-ok 8 - test clone -s with unescaped space
+[master 989349e] inf
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 "\201\207"
+Committing to file:///build/git-2.20.1/t/trash%20directory.t9115-git-svn-dcommit-funky-renames/svnrepo ...
+	A	�‡
+Committed r11
+	A	�‡
+r11 = 4c2b4a3dff9b5e4ce1b27c96f6884bc6568b7c65 (refs/remotes/git-svn)
+No changes between 989349e53a3c7127366e91663bca911e194b0b8c and refs/remotes/git-svn
+Resetting to the latest refs/remotes/git-svn
+[master 3b62a32] inf rename
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename "\201\207" => inf (100%)
+Committing to file:///build/git-2.20.1/t/trash%20directory.t9115-git-svn-dcommit-funky-renames/svnrepo ...
+	R	�‡ => inf
+Committed r12
+	D	�‡
+	A	inf
+W: -empty_dir: ∞
+r12 = 250fc0c21a8ada74e06a0b5b34c0c684151bedc4 (refs/remotes/git-svn)
+No changes between 3b62a32cbf0df1b3300e99584437367456a2a2fd and refs/remotes/git-svn
+Resetting to the latest refs/remotes/git-svn
+ok 12 - svn.pathnameencoding=cp932 rename on dcommit
 
-# passed all 8 test(s)
-1..8
+# passed all 12 test(s)
+1..12
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
 *** t7613-merge-submodule.sh ***
@@ -321082,21 +323008,21 @@
 		)
 	
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7613-merge-submodule/submodule_update_sub1/.git/
-[master (root-commit) 0497b78] Base inside first submodule
+[master (root-commit) c1ddb64] 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/git-2.20.1/t/trash directory.t7613-merge-submodule/submodule_update_sub2/.git/
-[master (root-commit) 6a1be0f] nested submodule base
+[master (root-commit) 7d04653] 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/git-2.20.1/t/trash directory.t7613-merge-submodule/submodule_update_repo/.git/
-[master (root-commit) 0af481d] Base
+[master (root-commit) cf058e2] Base
  Author: A U Thor <author@example.com>
  3 files changed, 4 insertions(+)
  create mode 100644 .gitignore
@@ -321107,7 +323033,7 @@
 done.
 Cloning into '/build/git-2.20.1/t/trash directory.t7613-merge-submodule/submodule_update_repo/uninitialized_sub'...
 done.
-[add_sub1 7eeaf54] Add sub1
+[add_sub1 aca18bc] Add sub1
  Author: A U Thor <author@example.com>
  2 files changed, 8 insertions(+)
  create mode 100644 .gitmodules
@@ -321116,45 +323042,45 @@
 Removing uninitialized_sub
 Removing sub1
 Removing .gitmodules
-[remove_sub1 7b5a1dc] Revert "Add sub1"
+[remove_sub1 d24a0c1] Revert "Add sub1"
  Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:09:52 2021 +0000
+ Date: Thu Jan 5 11:50:06 2023 +0000
  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 cc2b71f] modified file2 and added file3
+[modifications 4a757cc] 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/git-2.20.1/t/trash directory.t7613-merge-submodule/submodule_update_sub1
  * [new branch]      modifications -> modifications
-[modify_sub1 0a10e58] Modify sub1
+[modify_sub1 dc93f32] 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/git-2.20.1/t/trash directory.t7613-merge-submodule/submodule_update_repo/sub1/sub2'...
 done.
-[add_nested_sub 4ac859d] add a nested submodule
+[add_nested_sub f3ea74f] 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 42183c4] update submodule, that updates a nested submodule
+[add_nested_sub aa02035] 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 7ece1a5] make a change in nested sub
+[modify_sub1_recursively 129038a] 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 4c22a65] update nested sub
+[modify_sub1_recursively 9be0ae4] update nested sub
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-[modify_sub1_recursively d29f415] update sub1, that updates nested sub
+[modify_sub1_recursively acd9da4] update sub1, that updates nested sub
  Author: A U Thor <author@example.com>
 To /build/git-2.20.1/t/trash directory.t7613-merge-submodule/submodule_update_sub1
  * [new branch]      modify_sub1_recursively -> modify_sub1_recursively
@@ -321163,11 +323089,11 @@
 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 '0497b78833d25cf4ea4aebff14949f49c353716d'
-Previous HEAD position was 0497b78 Base inside first submodule
+Submodule path 'sub1': checked out 'c1ddb64dfd73a606856765b3189c9cdfc0b15c1e'
+Previous HEAD position was c1ddb64 Base inside first submodule
 Switched to branch 'modifications'
 rm 'sub1'
-[replace_sub1_with_directory 25ebb67] Replace sub1 with directory
+[replace_sub1_with_directory 09cd9be] Replace sub1 with directory
  Author: A U Thor <author@example.com>
  5 files changed, 3 insertions(+), 5 deletions(-)
  delete mode 160000 sub1
@@ -321179,32 +323105,32 @@
 Removing sub1/file2
 Removing sub1/file1
 Adding sub1
-[replace_directory_with_sub1 5557f84] Revert "Replace sub1 with directory"
+[replace_directory_with_sub1 7fc92f5] Revert "Replace sub1 with directory"
  Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:09:54 2021 +0000
+ Date: Thu Jan 5 11:50:07 2023 +0000
  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 a07ca03] Replace sub1 with file
+[replace_sub1_with_file a6be878] 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 3d1bf76] Revert "Replace sub1 with file"
+[replace_file_with_sub1 7b5ea55] Revert "Replace sub1 with file"
  Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:09:54 2021 +0000
+ Date: Thu Jan 5 11:50:07 2023 +0000
  2 files changed, 5 insertions(+), 1 deletion(-)
  mode change 100644 => 160000 sub1
 Switched to a new branch 'invalid_sub1'
-[invalid_sub1 113cbfd] Invalid sub1 commit
+[invalid_sub1 9745032] Invalid sub1 commit
  Author: A U Thor <author@example.com>
 Switched to a new branch 'valid_sub1'
-[valid_sub1 42dd848] Revert "Invalid sub1 commit"
+[valid_sub1 1b13bb2] Revert "Invalid sub1 commit"
  Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:09:54 2021 +0000
+ Date: Thu Jan 5 11:50:07 2023 +0000
 warning: unable to rmdir 'uninitialized_sub': Directory not empty
 Switched to branch 'master'
 Cloning into 'submodule_update'...
@@ -321212,7 +323138,7 @@
 Switched to a new branch 'no_submodule'
 Branch 'no_submodule' set up to track remote branch 'no_submodule' from 'origin'.
 Branch 'add_sub1' set up to track remote branch 'add_sub1' from 'origin'.
-Updating 0af481d..7eeaf54
+Updating cf058e2..aca18bc
 Fast-forward
  .gitmodules | 7 +++++++
  1 file changed, 7 insertions(+)
@@ -321223,8 +323149,8 @@
 done.
 Cloning into '/build/git-2.20.1/t/trash directory.t7613-merge-submodule/submodule_update/uninitialized_sub'...
 done.
-Submodule path 'sub1': checked out '0497b78833d25cf4ea4aebff14949f49c353716d'
-Submodule path 'uninitialized_sub': checked out '0497b78833d25cf4ea4aebff14949f49c353716d'
+Submodule path 'sub1': checked out 'c1ddb64dfd73a606856765b3189c9cdfc0b15c1e'
+Submodule path 'uninitialized_sub': checked out 'c1ddb64dfd73a606856765b3189c9cdfc0b15c1e'
 ok 1 - git merge: added submodule creates empty directory
 
 expecting success: 
@@ -321246,7 +323172,7 @@
 Switched to a new branch 'no_submodule'
 Branch 'no_submodule' set up to track remote branch 'no_submodule' from 'origin'.
 Branch 'add_sub1' set up to track remote branch 'add_sub1' from 'origin'.
-Updating 0af481d..7eeaf54
+Updating cf058e2..aca18bc
 Fast-forward
  .gitmodules | 7 +++++++
  1 file changed, 7 insertions(+)
@@ -321257,8 +323183,8 @@
 done.
 Cloning into '/build/git-2.20.1/t/trash directory.t7613-merge-submodule/submodule_update/uninitialized_sub'...
 done.
-Submodule path 'sub1': checked out '0497b78833d25cf4ea4aebff14949f49c353716d'
-Submodule path 'uninitialized_sub': checked out '0497b78833d25cf4ea4aebff14949f49c353716d'
+Submodule path 'sub1': checked out 'c1ddb64dfd73a606856765b3189c9cdfc0b15c1e'
+Submodule path 'uninitialized_sub': checked out 'c1ddb64dfd73a606856765b3189c9cdfc0b15c1e'
 ok 2 - git merge: added submodule leaves existing empty directory alone
 
 expecting success: 
@@ -321280,7 +323206,7 @@
 Branch 'replace_sub1_with_file' set up to track remote branch 'replace_sub1_with_file' from 'origin'.
 fatal: Needed a single revision
 Branch 'replace_file_with_sub1' set up to track remote branch 'replace_file_with_sub1' from 'origin'.
-Updating a07ca03..3d1bf76
+Updating a6be878..7b5ea55
 Fast-forward
  .gitmodules | 4 ++++
  sub1        | 2 +-
@@ -321292,8 +323218,8 @@
 done.
 Cloning into '/build/git-2.20.1/t/trash directory.t7613-merge-submodule/submodule_update/uninitialized_sub'...
 done.
-Submodule path 'sub1': checked out '0497b78833d25cf4ea4aebff14949f49c353716d'
-Submodule path 'uninitialized_sub': checked out '0497b78833d25cf4ea4aebff14949f49c353716d'
+Submodule path 'sub1': checked out 'c1ddb64dfd73a606856765b3189c9cdfc0b15c1e'
+Submodule path 'uninitialized_sub': checked out 'c1ddb64dfd73a606856765b3189c9cdfc0b15c1e'
 ok 3 - git merge: replace tracked file with submodule creates empty directory
 
 expecting success: 
@@ -321315,7 +323241,7 @@
 Branch 'replace_sub1_with_directory' set up to track remote branch 'replace_sub1_with_directory' from 'origin'.
 fatal: Needed a single revision
 Branch 'replace_directory_with_sub1' set up to track remote branch 'replace_directory_with_sub1' from 'origin'.
-Updating 25ebb67..5557f84
+Updating 09cd9be..7fc92f5
 Fast-forward
  .gitmodules | 4 ++++
  sub1/file1  | 1 -
@@ -321331,8 +323257,8 @@
 done.
 Cloning into '/build/git-2.20.1/t/trash directory.t7613-merge-submodule/submodule_update/uninitialized_sub'...
 done.
-Submodule path 'sub1': checked out '0497b78833d25cf4ea4aebff14949f49c353716d'
-Submodule path 'uninitialized_sub': checked out '0497b78833d25cf4ea4aebff14949f49c353716d'
+Submodule path 'sub1': checked out 'c1ddb64dfd73a606856765b3189c9cdfc0b15c1e'
+Submodule path 'uninitialized_sub': checked out 'c1ddb64dfd73a606856765b3189c9cdfc0b15c1e'
 ok 4 - git merge: replace directory with submodule
 
 expecting success: 
@@ -321353,10 +323279,10 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t7613-merge-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t7613-merge-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out '0497b78833d25cf4ea4aebff14949f49c353716d'
+Submodule path 'sub1': checked out 'c1ddb64dfd73a606856765b3189c9cdfc0b15c1e'
 Branch 'remove_sub1' set up to track remote branch 'remove_sub1' from 'origin'.
 warning: unable to rmdir 'sub1': Directory not empty
-Updating 7eeaf54..7b5a1dc
+Updating aca18bc..d24a0c1
 Fast-forward
  .gitmodules | 7 -------
  1 file changed, 7 deletions(-)
@@ -321383,10 +323309,10 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t7613-merge-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t7613-merge-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out '0497b78833d25cf4ea4aebff14949f49c353716d'
+Submodule path 'sub1': checked out 'c1ddb64dfd73a606856765b3189c9cdfc0b15c1e'
 Branch 'remove_sub1' set up to track remote branch 'remove_sub1' from 'origin'.
 warning: unable to rmdir 'sub1': Directory not empty
-Updating 7eeaf54..7b5a1dc
+Updating aca18bc..d24a0c1
 Fast-forward
  .gitmodules | 7 -------
  1 file changed, 7 deletions(-)
@@ -321411,14 +323337,14 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t7613-merge-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t7613-merge-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out '0497b78833d25cf4ea4aebff14949f49c353716d'
+Submodule path 'sub1': checked out 'c1ddb64dfd73a606856765b3189c9cdfc0b15c1e'
 Branch 'replace_sub1_with_directory' set up to track remote branch 'replace_sub1_with_directory' from 'origin'.
 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 7eeaf54..25ebb67
+Updating aca18bc..09cd9be
 ok 7 - git merge: replace submodule with a directory must fail
 
 expecting success: 
@@ -321441,14 +323367,14 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t7613-merge-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t7613-merge-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out '0497b78833d25cf4ea4aebff14949f49c353716d'
+Submodule path 'sub1': checked out 'c1ddb64dfd73a606856765b3189c9cdfc0b15c1e'
 Branch 'replace_sub1_with_directory' set up to track remote branch 'replace_sub1_with_directory' from 'origin'.
 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 7eeaf54..25ebb67
+Updating aca18bc..09cd9be
 ok 8 - git merge: replace submodule containing a .git directory with a directory must fail
 
 checking known breakage: 
@@ -321469,9 +323395,9 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t7613-merge-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t7613-merge-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out '0497b78833d25cf4ea4aebff14949f49c353716d'
+Submodule path 'sub1': checked out 'c1ddb64dfd73a606856765b3189c9cdfc0b15c1e'
 Branch 'replace_sub1_with_file' set up to track remote branch 'replace_sub1_with_file' from 'origin'.
-Updating 7eeaf54..a07ca03
+Updating aca18bc..a6be878
 Fast-forward
  .gitmodules | 4 ----
  sub1        | 2 +-
@@ -321500,9 +323426,9 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t7613-merge-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t7613-merge-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out '0497b78833d25cf4ea4aebff14949f49c353716d'
+Submodule path 'sub1': checked out 'c1ddb64dfd73a606856765b3189c9cdfc0b15c1e'
 Branch 'replace_sub1_with_file' set up to track remote branch 'replace_sub1_with_file' from 'origin'.
-Updating 7eeaf54..a07ca03
+Updating aca18bc..a6be878
 Fast-forward
  .gitmodules | 4 ----
  sub1        | 2 +-
@@ -321531,11 +323457,11 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t7613-merge-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t7613-merge-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out '0497b78833d25cf4ea4aebff14949f49c353716d'
+Submodule path 'sub1': checked out 'c1ddb64dfd73a606856765b3189c9cdfc0b15c1e'
 Branch 'modify_sub1' set up to track remote branch 'modify_sub1' from 'origin'.
-Updating 7eeaf54..0a10e58
+Updating aca18bc..dc93f32
 Fast-forward
-Submodule path 'sub1': checked out 'cc2b71f8402300c8573a77a5c6f3bb65e2e05258'
+Submodule path 'sub1': checked out '4a757cc6e1a31f149e2a0c32430ced1fdf506792'
 ok 11 - git merge: modified submodule does not update submodule work tree
 
 expecting success: 
@@ -321558,9 +323484,9 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t7613-merge-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t7613-merge-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out '0497b78833d25cf4ea4aebff14949f49c353716d'
+Submodule path 'sub1': checked out 'c1ddb64dfd73a606856765b3189c9cdfc0b15c1e'
 Branch 'invalid_sub1' set up to track remote branch 'invalid_sub1' from 'origin'.
-Updating 7eeaf54..113cbfd
+Updating aca18bc..9745032
 Fast-forward
 error: Server does not allow request for unadvertised object 0123456789012345678901234567890123456789
 Fetched in submodule path 'sub1', but it did not contain 0123456789012345678901234567890123456789. Direct fetching of that commit failed.
@@ -321585,7 +323511,7 @@
 Branch 'invalid_sub1' set up to track remote branch 'invalid_sub1' from 'origin'.
 fatal: Needed a single revision
 Branch 'valid_sub1' set up to track remote branch 'valid_sub1' from 'origin'.
-Updating 113cbfd..42dd848
+Updating 9745032..1b13bb2
 Fast-forward
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t7613-merge-submodule/submodule_update_sub1) registered for path 'sub1'
 Submodule 'uninitialized_sub' (/build/git-2.20.1/t/trash directory.t7613-merge-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
@@ -321593,8 +323519,8 @@
 done.
 Cloning into '/build/git-2.20.1/t/trash directory.t7613-merge-submodule/submodule_update/uninitialized_sub'...
 done.
-Submodule path 'sub1': checked out '0497b78833d25cf4ea4aebff14949f49c353716d'
-Submodule path 'uninitialized_sub': checked out '0497b78833d25cf4ea4aebff14949f49c353716d'
+Submodule path 'sub1': checked out 'c1ddb64dfd73a606856765b3189c9cdfc0b15c1e'
+Submodule path 'uninitialized_sub': checked out 'c1ddb64dfd73a606856765b3189c9cdfc0b15c1e'
 ok 13 - git merge: modified submodule does not update submodule work tree from invalid commit
 
 expecting success: 
@@ -321618,7 +323544,7 @@
 	sub1
 Please move or remove them before you merge.
 Aborting
-Updating 0af481d..7eeaf54
+Updating cf058e2..aca18bc
 ok 14 - git merge: added submodule doesn't remove untracked unignored file with same name
 
 expecting success: 
@@ -321639,7 +323565,7 @@
 Switched to a new branch 'no_submodule'
 Branch 'no_submodule' set up to track remote branch 'no_submodule' from 'origin'.
 Branch 'add_sub1' set up to track remote branch 'add_sub1' from 'origin'.
-Updating 0af481d..7eeaf54
+Updating cf058e2..aca18bc
 Fast-forward
  .gitmodules | 7 +++++++
  1 file changed, 7 insertions(+)
@@ -321650,8 +323576,8 @@
 done.
 Cloning into '/build/git-2.20.1/t/trash directory.t7613-merge-submodule/submodule_update/uninitialized_sub'...
 done.
-Submodule path 'sub1': checked out '0497b78833d25cf4ea4aebff14949f49c353716d'
-Submodule path 'uninitialized_sub': checked out '0497b78833d25cf4ea4aebff14949f49c353716d'
+Submodule path 'sub1': checked out 'c1ddb64dfd73a606856765b3189c9cdfc0b15c1e'
+Submodule path 'uninitialized_sub': checked out 'c1ddb64dfd73a606856765b3189c9cdfc0b15c1e'
 ok 15 - git merge --ff: added submodule creates empty directory
 
 expecting success: 
@@ -321673,7 +323599,7 @@
 Switched to a new branch 'no_submodule'
 Branch 'no_submodule' set up to track remote branch 'no_submodule' from 'origin'.
 Branch 'add_sub1' set up to track remote branch 'add_sub1' from 'origin'.
-Updating 0af481d..7eeaf54
+Updating cf058e2..aca18bc
 Fast-forward
  .gitmodules | 7 +++++++
  1 file changed, 7 insertions(+)
@@ -321684,8 +323610,8 @@
 done.
 Cloning into '/build/git-2.20.1/t/trash directory.t7613-merge-submodule/submodule_update/uninitialized_sub'...
 done.
-Submodule path 'sub1': checked out '0497b78833d25cf4ea4aebff14949f49c353716d'
-Submodule path 'uninitialized_sub': checked out '0497b78833d25cf4ea4aebff14949f49c353716d'
+Submodule path 'sub1': checked out 'c1ddb64dfd73a606856765b3189c9cdfc0b15c1e'
+Submodule path 'uninitialized_sub': checked out 'c1ddb64dfd73a606856765b3189c9cdfc0b15c1e'
 ok 16 - git merge --ff: added submodule leaves existing empty directory alone
 
 expecting success: 
@@ -321707,7 +323633,7 @@
 Branch 'replace_sub1_with_file' set up to track remote branch 'replace_sub1_with_file' from 'origin'.
 fatal: Needed a single revision
 Branch 'replace_file_with_sub1' set up to track remote branch 'replace_file_with_sub1' from 'origin'.
-Updating a07ca03..3d1bf76
+Updating a6be878..7b5ea55
 Fast-forward
  .gitmodules | 4 ++++
  sub1        | 2 +-
@@ -321719,8 +323645,8 @@
 done.
 Cloning into '/build/git-2.20.1/t/trash directory.t7613-merge-submodule/submodule_update/uninitialized_sub'...
 done.
-Submodule path 'sub1': checked out '0497b78833d25cf4ea4aebff14949f49c353716d'
-Submodule path 'uninitialized_sub': checked out '0497b78833d25cf4ea4aebff14949f49c353716d'
+Submodule path 'sub1': checked out 'c1ddb64dfd73a606856765b3189c9cdfc0b15c1e'
+Submodule path 'uninitialized_sub': checked out 'c1ddb64dfd73a606856765b3189c9cdfc0b15c1e'
 ok 17 - git merge --ff: replace tracked file with submodule creates empty directory
 
 expecting success: 
@@ -321742,7 +323668,7 @@
 Branch 'replace_sub1_with_directory' set up to track remote branch 'replace_sub1_with_directory' from 'origin'.
 fatal: Needed a single revision
 Branch 'replace_directory_with_sub1' set up to track remote branch 'replace_directory_with_sub1' from 'origin'.
-Updating 25ebb67..5557f84
+Updating 09cd9be..7fc92f5
 Fast-forward
  .gitmodules | 4 ++++
  sub1/file1  | 1 -
@@ -321758,8 +323684,8 @@
 done.
 Cloning into '/build/git-2.20.1/t/trash directory.t7613-merge-submodule/submodule_update/uninitialized_sub'...
 done.
-Submodule path 'sub1': checked out '0497b78833d25cf4ea4aebff14949f49c353716d'
-Submodule path 'uninitialized_sub': checked out '0497b78833d25cf4ea4aebff14949f49c353716d'
+Submodule path 'sub1': checked out 'c1ddb64dfd73a606856765b3189c9cdfc0b15c1e'
+Submodule path 'uninitialized_sub': checked out 'c1ddb64dfd73a606856765b3189c9cdfc0b15c1e'
 ok 18 - git merge --ff: replace directory with submodule
 
 expecting success: 
@@ -321780,10 +323706,10 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t7613-merge-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t7613-merge-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out '0497b78833d25cf4ea4aebff14949f49c353716d'
+Submodule path 'sub1': checked out 'c1ddb64dfd73a606856765b3189c9cdfc0b15c1e'
 Branch 'remove_sub1' set up to track remote branch 'remove_sub1' from 'origin'.
 warning: unable to rmdir 'sub1': Directory not empty
-Updating 7eeaf54..7b5a1dc
+Updating aca18bc..d24a0c1
 Fast-forward
  .gitmodules | 7 -------
  1 file changed, 7 deletions(-)
@@ -321810,10 +323736,10 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t7613-merge-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t7613-merge-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out '0497b78833d25cf4ea4aebff14949f49c353716d'
+Submodule path 'sub1': checked out 'c1ddb64dfd73a606856765b3189c9cdfc0b15c1e'
 Branch 'remove_sub1' set up to track remote branch 'remove_sub1' from 'origin'.
 warning: unable to rmdir 'sub1': Directory not empty
-Updating 7eeaf54..7b5a1dc
+Updating aca18bc..d24a0c1
 Fast-forward
  .gitmodules | 7 -------
  1 file changed, 7 deletions(-)
@@ -321838,14 +323764,14 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t7613-merge-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t7613-merge-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out '0497b78833d25cf4ea4aebff14949f49c353716d'
+Submodule path 'sub1': checked out 'c1ddb64dfd73a606856765b3189c9cdfc0b15c1e'
 Branch 'replace_sub1_with_directory' set up to track remote branch 'replace_sub1_with_directory' from 'origin'.
 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 7eeaf54..25ebb67
+Updating aca18bc..09cd9be
 ok 21 - git merge --ff: replace submodule with a directory must fail
 
 expecting success: 
@@ -321868,14 +323794,14 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t7613-merge-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t7613-merge-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out '0497b78833d25cf4ea4aebff14949f49c353716d'
+Submodule path 'sub1': checked out 'c1ddb64dfd73a606856765b3189c9cdfc0b15c1e'
 Branch 'replace_sub1_with_directory' set up to track remote branch 'replace_sub1_with_directory' from 'origin'.
 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 7eeaf54..25ebb67
+Updating aca18bc..09cd9be
 ok 22 - git merge --ff: replace submodule containing a .git directory with a directory must fail
 
 checking known breakage: 
@@ -321896,9 +323822,9 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t7613-merge-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t7613-merge-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out '0497b78833d25cf4ea4aebff14949f49c353716d'
+Submodule path 'sub1': checked out 'c1ddb64dfd73a606856765b3189c9cdfc0b15c1e'
 Branch 'replace_sub1_with_file' set up to track remote branch 'replace_sub1_with_file' from 'origin'.
-Updating 7eeaf54..a07ca03
+Updating aca18bc..a6be878
 Fast-forward
  .gitmodules | 4 ----
  sub1        | 2 +-
@@ -321927,9 +323853,9 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t7613-merge-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t7613-merge-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out '0497b78833d25cf4ea4aebff14949f49c353716d'
+Submodule path 'sub1': checked out 'c1ddb64dfd73a606856765b3189c9cdfc0b15c1e'
 Branch 'replace_sub1_with_file' set up to track remote branch 'replace_sub1_with_file' from 'origin'.
-Updating 7eeaf54..a07ca03
+Updating aca18bc..a6be878
 Fast-forward
  .gitmodules | 4 ----
  sub1        | 2 +-
@@ -321958,11 +323884,11 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t7613-merge-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t7613-merge-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out '0497b78833d25cf4ea4aebff14949f49c353716d'
+Submodule path 'sub1': checked out 'c1ddb64dfd73a606856765b3189c9cdfc0b15c1e'
 Branch 'modify_sub1' set up to track remote branch 'modify_sub1' from 'origin'.
-Updating 7eeaf54..0a10e58
+Updating aca18bc..dc93f32
 Fast-forward
-Submodule path 'sub1': checked out 'cc2b71f8402300c8573a77a5c6f3bb65e2e05258'
+Submodule path 'sub1': checked out '4a757cc6e1a31f149e2a0c32430ced1fdf506792'
 ok 25 - git merge --ff: modified submodule does not update submodule work tree
 
 expecting success: 
@@ -321985,9 +323911,9 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t7613-merge-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t7613-merge-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out '0497b78833d25cf4ea4aebff14949f49c353716d'
+Submodule path 'sub1': checked out 'c1ddb64dfd73a606856765b3189c9cdfc0b15c1e'
 Branch 'invalid_sub1' set up to track remote branch 'invalid_sub1' from 'origin'.
-Updating 7eeaf54..113cbfd
+Updating aca18bc..9745032
 Fast-forward
 error: Server does not allow request for unadvertised object 0123456789012345678901234567890123456789
 Fetched in submodule path 'sub1', but it did not contain 0123456789012345678901234567890123456789. Direct fetching of that commit failed.
@@ -322012,7 +323938,7 @@
 Branch 'invalid_sub1' set up to track remote branch 'invalid_sub1' from 'origin'.
 fatal: Needed a single revision
 Branch 'valid_sub1' set up to track remote branch 'valid_sub1' from 'origin'.
-Updating 113cbfd..42dd848
+Updating 9745032..1b13bb2
 Fast-forward
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t7613-merge-submodule/submodule_update_sub1) registered for path 'sub1'
 Submodule 'uninitialized_sub' (/build/git-2.20.1/t/trash directory.t7613-merge-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
@@ -322020,8 +323946,8 @@
 done.
 Cloning into '/build/git-2.20.1/t/trash directory.t7613-merge-submodule/submodule_update/uninitialized_sub'...
 done.
-Submodule path 'sub1': checked out '0497b78833d25cf4ea4aebff14949f49c353716d'
-Submodule path 'uninitialized_sub': checked out '0497b78833d25cf4ea4aebff14949f49c353716d'
+Submodule path 'sub1': checked out 'c1ddb64dfd73a606856765b3189c9cdfc0b15c1e'
+Submodule path 'uninitialized_sub': checked out 'c1ddb64dfd73a606856765b3189c9cdfc0b15c1e'
 ok 27 - git merge --ff: modified submodule does not update submodule work tree from invalid commit
 
 expecting success: 
@@ -322045,7 +323971,7 @@
 	sub1
 Please move or remove them before you merge.
 Aborting
-Updating 0af481d..7eeaf54
+Updating cf058e2..aca18bc
 ok 28 - git merge --ff: added submodule doesn't remove untracked unignored file with same name
 
 expecting success: 
@@ -322066,7 +323992,7 @@
 Switched to a new branch 'no_submodule'
 Branch 'no_submodule' set up to track remote branch 'no_submodule' from 'origin'.
 Branch 'add_sub1' set up to track remote branch 'add_sub1' from 'origin'.
-Updating 0af481d..7eeaf54
+Updating cf058e2..aca18bc
 Fast-forward
  .gitmodules | 7 +++++++
  1 file changed, 7 insertions(+)
@@ -322077,8 +324003,8 @@
 done.
 Cloning into '/build/git-2.20.1/t/trash directory.t7613-merge-submodule/submodule_update/uninitialized_sub'...
 done.
-Submodule path 'sub1': checked out '0497b78833d25cf4ea4aebff14949f49c353716d'
-Submodule path 'uninitialized_sub': checked out '0497b78833d25cf4ea4aebff14949f49c353716d'
+Submodule path 'sub1': checked out 'c1ddb64dfd73a606856765b3189c9cdfc0b15c1e'
+Submodule path 'uninitialized_sub': checked out 'c1ddb64dfd73a606856765b3189c9cdfc0b15c1e'
 ok 29 - git merge --ff-only: added submodule creates empty directory
 
 expecting success: 
@@ -322100,7 +324026,7 @@
 Switched to a new branch 'no_submodule'
 Branch 'no_submodule' set up to track remote branch 'no_submodule' from 'origin'.
 Branch 'add_sub1' set up to track remote branch 'add_sub1' from 'origin'.
-Updating 0af481d..7eeaf54
+Updating cf058e2..aca18bc
 Fast-forward
  .gitmodules | 7 +++++++
  1 file changed, 7 insertions(+)
@@ -322111,8 +324037,8 @@
 done.
 Cloning into '/build/git-2.20.1/t/trash directory.t7613-merge-submodule/submodule_update/uninitialized_sub'...
 done.
-Submodule path 'sub1': checked out '0497b78833d25cf4ea4aebff14949f49c353716d'
-Submodule path 'uninitialized_sub': checked out '0497b78833d25cf4ea4aebff14949f49c353716d'
+Submodule path 'sub1': checked out 'c1ddb64dfd73a606856765b3189c9cdfc0b15c1e'
+Submodule path 'uninitialized_sub': checked out 'c1ddb64dfd73a606856765b3189c9cdfc0b15c1e'
 ok 30 - git merge --ff-only: added submodule leaves existing empty directory alone
 
 expecting success: 
@@ -322134,7 +324060,7 @@
 Branch 'replace_sub1_with_file' set up to track remote branch 'replace_sub1_with_file' from 'origin'.
 fatal: Needed a single revision
 Branch 'replace_file_with_sub1' set up to track remote branch 'replace_file_with_sub1' from 'origin'.
-Updating a07ca03..3d1bf76
+Updating a6be878..7b5ea55
 Fast-forward
  .gitmodules | 4 ++++
  sub1        | 2 +-
@@ -322146,8 +324072,8 @@
 done.
 Cloning into '/build/git-2.20.1/t/trash directory.t7613-merge-submodule/submodule_update/uninitialized_sub'...
 done.
-Submodule path 'sub1': checked out '0497b78833d25cf4ea4aebff14949f49c353716d'
-Submodule path 'uninitialized_sub': checked out '0497b78833d25cf4ea4aebff14949f49c353716d'
+Submodule path 'sub1': checked out 'c1ddb64dfd73a606856765b3189c9cdfc0b15c1e'
+Submodule path 'uninitialized_sub': checked out 'c1ddb64dfd73a606856765b3189c9cdfc0b15c1e'
 ok 31 - git merge --ff-only: replace tracked file with submodule creates empty directory
 
 expecting success: 
@@ -322169,7 +324095,7 @@
 Branch 'replace_sub1_with_directory' set up to track remote branch 'replace_sub1_with_directory' from 'origin'.
 fatal: Needed a single revision
 Branch 'replace_directory_with_sub1' set up to track remote branch 'replace_directory_with_sub1' from 'origin'.
-Updating 25ebb67..5557f84
+Updating 09cd9be..7fc92f5
 Fast-forward
  .gitmodules | 4 ++++
  sub1/file1  | 1 -
@@ -322185,8 +324111,8 @@
 done.
 Cloning into '/build/git-2.20.1/t/trash directory.t7613-merge-submodule/submodule_update/uninitialized_sub'...
 done.
-Submodule path 'sub1': checked out '0497b78833d25cf4ea4aebff14949f49c353716d'
-Submodule path 'uninitialized_sub': checked out '0497b78833d25cf4ea4aebff14949f49c353716d'
+Submodule path 'sub1': checked out 'c1ddb64dfd73a606856765b3189c9cdfc0b15c1e'
+Submodule path 'uninitialized_sub': checked out 'c1ddb64dfd73a606856765b3189c9cdfc0b15c1e'
 ok 32 - git merge --ff-only: replace directory with submodule
 
 expecting success: 
@@ -322207,10 +324133,10 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t7613-merge-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t7613-merge-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out '0497b78833d25cf4ea4aebff14949f49c353716d'
+Submodule path 'sub1': checked out 'c1ddb64dfd73a606856765b3189c9cdfc0b15c1e'
 Branch 'remove_sub1' set up to track remote branch 'remove_sub1' from 'origin'.
 warning: unable to rmdir 'sub1': Directory not empty
-Updating 7eeaf54..7b5a1dc
+Updating aca18bc..d24a0c1
 Fast-forward
  .gitmodules | 7 -------
  1 file changed, 7 deletions(-)
@@ -322237,10 +324163,10 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t7613-merge-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t7613-merge-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out '0497b78833d25cf4ea4aebff14949f49c353716d'
+Submodule path 'sub1': checked out 'c1ddb64dfd73a606856765b3189c9cdfc0b15c1e'
 Branch 'remove_sub1' set up to track remote branch 'remove_sub1' from 'origin'.
 warning: unable to rmdir 'sub1': Directory not empty
-Updating 7eeaf54..7b5a1dc
+Updating aca18bc..d24a0c1
 Fast-forward
  .gitmodules | 7 -------
  1 file changed, 7 deletions(-)
@@ -322265,14 +324191,14 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t7613-merge-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t7613-merge-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out '0497b78833d25cf4ea4aebff14949f49c353716d'
+Submodule path 'sub1': checked out 'c1ddb64dfd73a606856765b3189c9cdfc0b15c1e'
 Branch 'replace_sub1_with_directory' set up to track remote branch 'replace_sub1_with_directory' from 'origin'.
 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 7eeaf54..25ebb67
+Updating aca18bc..09cd9be
 ok 35 - git merge --ff-only: replace submodule with a directory must fail
 
 expecting success: 
@@ -322295,14 +324221,14 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t7613-merge-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t7613-merge-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out '0497b78833d25cf4ea4aebff14949f49c353716d'
+Submodule path 'sub1': checked out 'c1ddb64dfd73a606856765b3189c9cdfc0b15c1e'
 Branch 'replace_sub1_with_directory' set up to track remote branch 'replace_sub1_with_directory' from 'origin'.
 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 7eeaf54..25ebb67
+Updating aca18bc..09cd9be
 ok 36 - git merge --ff-only: replace submodule containing a .git directory with a directory must fail
 
 checking known breakage: 
@@ -322323,9 +324249,9 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t7613-merge-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t7613-merge-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out '0497b78833d25cf4ea4aebff14949f49c353716d'
+Submodule path 'sub1': checked out 'c1ddb64dfd73a606856765b3189c9cdfc0b15c1e'
 Branch 'replace_sub1_with_file' set up to track remote branch 'replace_sub1_with_file' from 'origin'.
-Updating 7eeaf54..a07ca03
+Updating aca18bc..a6be878
 Fast-forward
  .gitmodules | 4 ----
  sub1        | 2 +-
@@ -322354,9 +324280,9 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t7613-merge-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t7613-merge-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out '0497b78833d25cf4ea4aebff14949f49c353716d'
+Submodule path 'sub1': checked out 'c1ddb64dfd73a606856765b3189c9cdfc0b15c1e'
 Branch 'replace_sub1_with_file' set up to track remote branch 'replace_sub1_with_file' from 'origin'.
-Updating 7eeaf54..a07ca03
+Updating aca18bc..a6be878
 Fast-forward
  .gitmodules | 4 ----
  sub1        | 2 +-
@@ -322385,11 +324311,11 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t7613-merge-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t7613-merge-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out '0497b78833d25cf4ea4aebff14949f49c353716d'
+Submodule path 'sub1': checked out 'c1ddb64dfd73a606856765b3189c9cdfc0b15c1e'
 Branch 'modify_sub1' set up to track remote branch 'modify_sub1' from 'origin'.
-Updating 7eeaf54..0a10e58
+Updating aca18bc..dc93f32
 Fast-forward
-Submodule path 'sub1': checked out 'cc2b71f8402300c8573a77a5c6f3bb65e2e05258'
+Submodule path 'sub1': checked out '4a757cc6e1a31f149e2a0c32430ced1fdf506792'
 ok 39 - git merge --ff-only: modified submodule does not update submodule work tree
 
 expecting success: 
@@ -322412,9 +324338,9 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t7613-merge-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t7613-merge-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out '0497b78833d25cf4ea4aebff14949f49c353716d'
+Submodule path 'sub1': checked out 'c1ddb64dfd73a606856765b3189c9cdfc0b15c1e'
 Branch 'invalid_sub1' set up to track remote branch 'invalid_sub1' from 'origin'.
-Updating 7eeaf54..113cbfd
+Updating aca18bc..9745032
 Fast-forward
 error: Server does not allow request for unadvertised object 0123456789012345678901234567890123456789
 Fetched in submodule path 'sub1', but it did not contain 0123456789012345678901234567890123456789. Direct fetching of that commit failed.
@@ -322439,7 +324365,7 @@
 Branch 'invalid_sub1' set up to track remote branch 'invalid_sub1' from 'origin'.
 fatal: Needed a single revision
 Branch 'valid_sub1' set up to track remote branch 'valid_sub1' from 'origin'.
-Updating 113cbfd..42dd848
+Updating 9745032..1b13bb2
 Fast-forward
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t7613-merge-submodule/submodule_update_sub1) registered for path 'sub1'
 Submodule 'uninitialized_sub' (/build/git-2.20.1/t/trash directory.t7613-merge-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
@@ -322447,8 +324373,8 @@
 done.
 Cloning into '/build/git-2.20.1/t/trash directory.t7613-merge-submodule/submodule_update/uninitialized_sub'...
 done.
-Submodule path 'sub1': checked out '0497b78833d25cf4ea4aebff14949f49c353716d'
-Submodule path 'uninitialized_sub': checked out '0497b78833d25cf4ea4aebff14949f49c353716d'
+Submodule path 'sub1': checked out 'c1ddb64dfd73a606856765b3189c9cdfc0b15c1e'
+Submodule path 'uninitialized_sub': checked out 'c1ddb64dfd73a606856765b3189c9cdfc0b15c1e'
 ok 41 - git merge --ff-only: modified submodule does not update submodule work tree from invalid commit
 
 expecting success: 
@@ -322472,7 +324398,7 @@
 	sub1
 Please move or remove them before you merge.
 Aborting
-Updating 0af481d..7eeaf54
+Updating cf058e2..aca18bc
 ok 42 - git merge --ff-only: added submodule doesn't remove untracked unignored file with same name
 
 expecting success: 
@@ -322494,10 +324420,10 @@
 Branch 'no_submodule' set up to track remote branch 'no_submodule' from 'origin'.
 Branch 'add_sub1' set up to track remote branch 'add_sub1' from 'origin'.
 Merging:
-0af481d Base
+cf058e2 Base
 virtual add_sub1
 found 1 common ancestor:
-0af481d Base
+cf058e2 Base
 Merge made by the 'recursive' strategy.
  .gitmodules | 7 +++++++
  1 file changed, 7 insertions(+)
@@ -322508,8 +324434,8 @@
 done.
 Cloning into '/build/git-2.20.1/t/trash directory.t7613-merge-submodule/submodule_update/uninitialized_sub'...
 done.
-Submodule path 'sub1': checked out '0497b78833d25cf4ea4aebff14949f49c353716d'
-Submodule path 'uninitialized_sub': checked out '0497b78833d25cf4ea4aebff14949f49c353716d'
+Submodule path 'sub1': checked out 'c1ddb64dfd73a606856765b3189c9cdfc0b15c1e'
+Submodule path 'uninitialized_sub': checked out 'c1ddb64dfd73a606856765b3189c9cdfc0b15c1e'
 ok 43 - git merge --no-ff: added submodule creates empty directory
 
 expecting success: 
@@ -322532,10 +324458,10 @@
 Branch 'no_submodule' set up to track remote branch 'no_submodule' from 'origin'.
 Branch 'add_sub1' set up to track remote branch 'add_sub1' from 'origin'.
 Merging:
-0af481d Base
+cf058e2 Base
 virtual add_sub1
 found 1 common ancestor:
-0af481d Base
+cf058e2 Base
 Merge made by the 'recursive' strategy.
  .gitmodules | 7 +++++++
  1 file changed, 7 insertions(+)
@@ -322546,8 +324472,8 @@
 done.
 Cloning into '/build/git-2.20.1/t/trash directory.t7613-merge-submodule/submodule_update/uninitialized_sub'...
 done.
-Submodule path 'sub1': checked out '0497b78833d25cf4ea4aebff14949f49c353716d'
-Submodule path 'uninitialized_sub': checked out '0497b78833d25cf4ea4aebff14949f49c353716d'
+Submodule path 'sub1': checked out 'c1ddb64dfd73a606856765b3189c9cdfc0b15c1e'
+Submodule path 'uninitialized_sub': checked out 'c1ddb64dfd73a606856765b3189c9cdfc0b15c1e'
 ok 44 - git merge --no-ff: added submodule leaves existing empty directory alone
 
 expecting success: 
@@ -322570,10 +324496,10 @@
 fatal: Needed a single revision
 Branch 'replace_file_with_sub1' set up to track remote branch 'replace_file_with_sub1' from 'origin'.
 Merging:
-a07ca03 Replace sub1 with file
+a6be878 Replace sub1 with file
 virtual replace_file_with_sub1
 found 1 common ancestor:
-a07ca03 Replace sub1 with file
+a6be878 Replace sub1 with file
 Merge made by the 'recursive' strategy.
  .gitmodules | 4 ++++
  sub1        | 2 +-
@@ -322585,8 +324511,8 @@
 done.
 Cloning into '/build/git-2.20.1/t/trash directory.t7613-merge-submodule/submodule_update/uninitialized_sub'...
 done.
-Submodule path 'sub1': checked out '0497b78833d25cf4ea4aebff14949f49c353716d'
-Submodule path 'uninitialized_sub': checked out '0497b78833d25cf4ea4aebff14949f49c353716d'
+Submodule path 'sub1': checked out 'c1ddb64dfd73a606856765b3189c9cdfc0b15c1e'
+Submodule path 'uninitialized_sub': checked out 'c1ddb64dfd73a606856765b3189c9cdfc0b15c1e'
 ok 45 - git merge --no-ff: replace tracked file with submodule creates empty directory
 
 checking known breakage: 
@@ -322609,10 +324535,10 @@
 fatal: Needed a single revision
 Branch 'replace_directory_with_sub1' set up to track remote branch 'replace_directory_with_sub1' from 'origin'.
 Merging:
-25ebb67 Replace sub1 with directory
+09cd9be Replace sub1 with directory
 virtual replace_directory_with_sub1
 found 1 common ancestor:
-25ebb67 Replace sub1 with directory
+09cd9be Replace sub1 with directory
 Removing sub1/file3
 Removing sub1/file2
 Removing sub1/file1
@@ -322647,13 +324573,13 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t7613-merge-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t7613-merge-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out '0497b78833d25cf4ea4aebff14949f49c353716d'
+Submodule path 'sub1': checked out 'c1ddb64dfd73a606856765b3189c9cdfc0b15c1e'
 Branch 'remove_sub1' set up to track remote branch 'remove_sub1' from 'origin'.
 Merging:
-7eeaf54 Add sub1
+aca18bc Add sub1
 virtual remove_sub1
 found 1 common ancestor:
-7eeaf54 Add sub1
+aca18bc Add sub1
 Removing uninitialized_sub
 Removing sub1
 Removing .gitmodules
@@ -322683,13 +324609,13 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t7613-merge-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t7613-merge-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out '0497b78833d25cf4ea4aebff14949f49c353716d'
+Submodule path 'sub1': checked out 'c1ddb64dfd73a606856765b3189c9cdfc0b15c1e'
 Branch 'remove_sub1' set up to track remote branch 'remove_sub1' from 'origin'.
 Merging:
-7eeaf54 Add sub1
+aca18bc Add sub1
 virtual remove_sub1
 found 1 common ancestor:
-7eeaf54 Add sub1
+aca18bc Add sub1
 Removing uninitialized_sub
 Removing sub1
 Removing .gitmodules
@@ -322717,15 +324643,15 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t7613-merge-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t7613-merge-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out '0497b78833d25cf4ea4aebff14949f49c353716d'
+Submodule path 'sub1': checked out 'c1ddb64dfd73a606856765b3189c9cdfc0b15c1e'
 Branch 'replace_sub1_with_directory' set up to track remote branch 'replace_sub1_with_directory' from 'origin'.
 error: refusing to lose untracked file at 'sub1/file2'
 error: refusing to lose untracked file at 'sub1/file1'
 Merging:
-7eeaf54 Add sub1
+aca18bc Add sub1
 virtual replace_sub1_with_directory
 found 1 common ancestor:
-7eeaf54 Add sub1
+aca18bc Add sub1
 Adding sub1/file3
 Adding sub1/file2
 Adding sub1/file1
@@ -322762,15 +324688,15 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t7613-merge-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t7613-merge-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out '0497b78833d25cf4ea4aebff14949f49c353716d'
+Submodule path 'sub1': checked out 'c1ddb64dfd73a606856765b3189c9cdfc0b15c1e'
 Branch 'replace_sub1_with_directory' set up to track remote branch 'replace_sub1_with_directory' from 'origin'.
 error: refusing to lose untracked file at 'sub1/file2'
 error: refusing to lose untracked file at 'sub1/file1'
 Merging:
-7eeaf54 Add sub1
+aca18bc Add sub1
 virtual replace_sub1_with_directory
 found 1 common ancestor:
-7eeaf54 Add sub1
+aca18bc Add sub1
 Adding sub1/file3
 Adding sub1/file2
 Adding sub1/file1
@@ -322805,13 +324731,13 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t7613-merge-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t7613-merge-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out '0497b78833d25cf4ea4aebff14949f49c353716d'
+Submodule path 'sub1': checked out 'c1ddb64dfd73a606856765b3189c9cdfc0b15c1e'
 Branch 'replace_sub1_with_file' set up to track remote branch 'replace_sub1_with_file' from 'origin'.
 Merging:
-7eeaf54 Add sub1
+aca18bc Add sub1
 virtual replace_sub1_with_file
 found 1 common ancestor:
-7eeaf54 Add sub1
+aca18bc Add sub1
 Merge made by the 'recursive' strategy.
  .gitmodules | 4 ----
  sub1        | 2 +-
@@ -322840,13 +324766,13 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t7613-merge-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t7613-merge-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out '0497b78833d25cf4ea4aebff14949f49c353716d'
+Submodule path 'sub1': checked out 'c1ddb64dfd73a606856765b3189c9cdfc0b15c1e'
 Branch 'replace_sub1_with_file' set up to track remote branch 'replace_sub1_with_file' from 'origin'.
 Merging:
-7eeaf54 Add sub1
+aca18bc Add sub1
 virtual replace_sub1_with_file
 found 1 common ancestor:
-7eeaf54 Add sub1
+aca18bc Add sub1
 Merge made by the 'recursive' strategy.
  .gitmodules | 4 ----
  sub1        | 2 +-
@@ -322875,15 +324801,15 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t7613-merge-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t7613-merge-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out '0497b78833d25cf4ea4aebff14949f49c353716d'
+Submodule path 'sub1': checked out 'c1ddb64dfd73a606856765b3189c9cdfc0b15c1e'
 Branch 'modify_sub1' set up to track remote branch 'modify_sub1' from 'origin'.
 Merging:
-7eeaf54 Add sub1
+aca18bc Add sub1
 virtual modify_sub1
 found 1 common ancestor:
-7eeaf54 Add sub1
+aca18bc Add sub1
 Merge made by the 'recursive' strategy.
-Submodule path 'sub1': checked out 'cc2b71f8402300c8573a77a5c6f3bb65e2e05258'
+Submodule path 'sub1': checked out '4a757cc6e1a31f149e2a0c32430ced1fdf506792'
 ok 53 - git merge --no-ff: modified submodule does not update submodule work tree
 
 expecting success: 
@@ -322906,13 +324832,13 @@
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t7613-merge-submodule/submodule_update_sub1) registered for path 'sub1'
 Cloning into '/build/git-2.20.1/t/trash directory.t7613-merge-submodule/submodule_update/sub1'...
 done.
-Submodule path 'sub1': checked out '0497b78833d25cf4ea4aebff14949f49c353716d'
+Submodule path 'sub1': checked out 'c1ddb64dfd73a606856765b3189c9cdfc0b15c1e'
 Branch 'invalid_sub1' set up to track remote branch 'invalid_sub1' from 'origin'.
 Merging:
-7eeaf54 Add sub1
+aca18bc Add sub1
 virtual invalid_sub1
 found 1 common ancestor:
-7eeaf54 Add sub1
+aca18bc Add sub1
 Merge made by the 'recursive' strategy.
 error: Server does not allow request for unadvertised object 0123456789012345678901234567890123456789
 Fetched in submodule path 'sub1', but it did not contain 0123456789012345678901234567890123456789. Direct fetching of that commit failed.
@@ -322938,10 +324864,10 @@
 fatal: Needed a single revision
 Branch 'valid_sub1' set up to track remote branch 'valid_sub1' from 'origin'.
 Merging:
-113cbfd Invalid sub1 commit
+9745032 Invalid sub1 commit
 virtual valid_sub1
 found 1 common ancestor:
-113cbfd Invalid sub1 commit
+9745032 Invalid sub1 commit
 Merge made by the 'recursive' strategy.
 Submodule 'sub1' (/build/git-2.20.1/t/trash directory.t7613-merge-submodule/submodule_update_sub1) registered for path 'sub1'
 Submodule 'uninitialized_sub' (/build/git-2.20.1/t/trash directory.t7613-merge-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
@@ -322949,8 +324875,8 @@
 done.
 Cloning into '/build/git-2.20.1/t/trash directory.t7613-merge-submodule/submodule_update/uninitialized_sub'...
 done.
-Submodule path 'sub1': checked out '0497b78833d25cf4ea4aebff14949f49c353716d'
-Submodule path 'uninitialized_sub': checked out '0497b78833d25cf4ea4aebff14949f49c353716d'
+Submodule path 'sub1': checked out 'c1ddb64dfd73a606856765b3189c9cdfc0b15c1e'
+Submodule path 'uninitialized_sub': checked out 'c1ddb64dfd73a606856765b3189c9cdfc0b15c1e'
 ok 55 - git merge --no-ff: modified submodule does not update submodule work tree from invalid commit
 
 expecting success: 
@@ -322974,12 +324900,12 @@
 	sub1
 Please move or remove them before you merge.
 Aborting
-error: merging of trees ec38489b3f8eda08fda17055ad272abc24bdf929 and ba56ef6348134e31e20163237cafbaec32a734f0 failed
+error: merging of trees ec38489b3f8eda08fda17055ad272abc24bdf929 and f20918aab270d950a48f9bebd42d2fe307175f88 failed
 Merging:
-0af481d Base
+cf058e2 Base
 virtual add_sub1
 found 1 common ancestor:
-0af481d Base
+cf058e2 Base
 ok 56 - git merge --no-ff: added submodule doesn't remove untracked unignored file with same name
 
 # still have 11 known breakage(s)
@@ -322987,1671 +324913,6 @@
 1..56
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t9127-git-svn-partial-rebuild.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9127-git-svn-partial-rebuild/.git/
-expecting success: 
-	mkdir import &&
-	(
-		(cd import &&
-		mkdir trunk branches tags &&
-		(cd trunk &&
-		echo foo > foo
-		) &&
-		svn_cmd import -m "import for git-svn" . "$svnrepo" >/dev/null &&
-		svn_cmd copy "$svnrepo"/trunk "$svnrepo"/branches/a \
-			-m "created branch a"
-		) &&
-		rm -rf import &&
-		svn_cmd co "$svnrepo"/trunk trunk &&
-		(cd trunk &&
-		echo bar >> foo &&
-		svn_cmd ci -m "updated trunk"
-		) &&
-		svn_cmd co "$svnrepo"/branches/a a &&
-		(cd a &&
-		echo baz >> a &&
-		svn_cmd add a &&
-		svn_cmd ci -m "updated a"
-		) &&
-		git svn init --stdlayout "$svnrepo"
-	)
-
-Committing transaction...
-Committed revision 2.
-A    trunk/foo
-Checked out revision 2.
-Sending        foo
-Transmitting file data .done
-Committing transaction...
-Committed revision 3.
-A    a/foo
-Checked out revision 3.
-A         a
-Adding         a
-Transmitting file data .done
-Committing transaction...
-Committed revision 4.
-ok 1 - initialize svnrepo
-
-expecting success: 
-	git svn fetch -r1:2
-
-	A	foo
-r1 = 819423506de3ff33c6e2336d52afbb4b3782910c (refs/remotes/origin/trunk)
-Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9127-git-svn-partial-rebuild/svnrepo/trunk => file:///build/git-2.20.1/t/trash%20directory.t9127-git-svn-partial-rebuild/svnrepo/branches/a, 1
-Found branch parent: (refs/remotes/origin/a) 819423506de3ff33c6e2336d52afbb4b3782910c
-Following parent with do_switch
-Successfully followed parent
-r2 = 2babb605c2448c0a58266e33c013c549ff7d8596 (refs/remotes/origin/a)
-Checked out HEAD:
-  file:///build/git-2.20.1/t/trash%20directory.t9127-git-svn-partial-rebuild/svnrepo/trunk r1
-ok 2 - import an early SVN revision into git
-
-expecting success: 
-	mkdir mirror &&
-	(
-		(cd mirror &&
-		git init &&
-		git svn init --stdlayout "$svnrepo" &&
-		git svn fetch
-		)
-	)
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9127-git-svn-partial-rebuild/mirror/.git/
-	A	foo
-r1 = 819423506de3ff33c6e2336d52afbb4b3782910c (refs/remotes/origin/trunk)
-Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9127-git-svn-partial-rebuild/svnrepo/trunk => file:///build/git-2.20.1/t/trash%20directory.t9127-git-svn-partial-rebuild/svnrepo/branches/a, 1
-Found branch parent: (refs/remotes/origin/a) 819423506de3ff33c6e2336d52afbb4b3782910c
-Following parent with do_switch
-Successfully followed parent
-r2 = 2babb605c2448c0a58266e33c013c549ff7d8596 (refs/remotes/origin/a)
-	M	foo
-r3 = 9f0ca170f59f3b8a24cc577ebaef6b09433e0648 (refs/remotes/origin/trunk)
-	A	a
-r4 = a6a05582cb0df3fc351cfcf3a5fe3b3d5eef4f86 (refs/remotes/origin/a)
-Checked out HEAD:
-  file:///build/git-2.20.1/t/trash%20directory.t9127-git-svn-partial-rebuild/svnrepo/trunk r3
-ok 3 - make full git mirror of SVN
-
-expecting success: 
-	git config --add remote.origin.url "file://$PWD/mirror/.git" &&
-	git config --add remote.origin.fetch refs/remotes/*:refs/remotes/* &&
-	git fetch origin &&
-	git svn fetch
-
-From file:///build/git-2.20.1/t/trash directory.t9127-git-svn-partial-rebuild/mirror/
-   2babb60..a6a0558  origin/a     -> origin/a
-   8194235..9f0ca17  origin/trunk -> origin/trunk
-Partial-rebuilding .git/svn/refs/remotes/origin/trunk/.rev_map.66627477-4544-48bd-9bb8-17282ad44801 ...
-Currently at 1 = 819423506de3ff33c6e2336d52afbb4b3782910c
-r3 = 9f0ca170f59f3b8a24cc577ebaef6b09433e0648
-Done rebuilding .git/svn/refs/remotes/origin/trunk/.rev_map.66627477-4544-48bd-9bb8-17282ad44801
-Partial-rebuilding .git/svn/refs/remotes/origin/a/.rev_map.66627477-4544-48bd-9bb8-17282ad44801 ...
-Currently at 2 = 2babb605c2448c0a58266e33c013c549ff7d8596
-r4 = a6a05582cb0df3fc351cfcf3a5fe3b3d5eef4f86
-Done rebuilding .git/svn/refs/remotes/origin/a/.rev_map.66627477-4544-48bd-9bb8-17282ad44801
-ok 4 - fetch from git mirror and partial-rebuild
-
-# passed all 4 test(s)
-1..4
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t9117-git-svn-init-clone.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9117-git-svn-init-clone/.git/
-expecting success: 
-	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: 
-	test ! -d trunk &&
-	git svn clone "$svnrepo"/project/trunk &&
-	test -d trunk/.git/svn &&
-	test -e trunk/foo &&
-	rm -rf trunk
-	
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9117-git-svn-init-clone/tmp/trunk/.git/
-	A	foo
-r1 = 1d85748a1be44bcc9fb6ba7367f9feb6307357e1 (refs/remotes/git-svn)
-Checked out HEAD:
-  file:///build/git-2.20.1/t/trash%20directory.t9117-git-svn-init-clone/svnrepo/project/trunk r1
-ok 2 - basic clone
-
-expecting success: 
-	test ! -d target &&
-	git svn clone "$svnrepo"/project/trunk target &&
-	test -d target/.git/svn &&
-	test -e target/foo &&
-	rm -rf target
-	
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9117-git-svn-init-clone/tmp/target/.git/
-	A	foo
-r1 = 1d85748a1be44bcc9fb6ba7367f9feb6307357e1 (refs/remotes/git-svn)
-Checked out HEAD:
-  file:///build/git-2.20.1/t/trash%20directory.t9117-git-svn-init-clone/svnrepo/project/trunk r1
-ok 3 - clone to target directory
-
-expecting success: 
-	test ! -d project &&
-	git svn clone -s "$svnrepo"/project &&
-	test -d project/.git/svn &&
-	test -e project/foo &&
-	rm -rf project
-	
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9117-git-svn-init-clone/tmp/project/.git/
-Using higher level of URL: file:///build/git-2.20.1/t/trash%20directory.t9117-git-svn-init-clone/svnrepo/project => file:///build/git-2.20.1/t/trash%20directory.t9117-git-svn-init-clone/svnrepo
-	A	foo
-r1 = 1d85748a1be44bcc9fb6ba7367f9feb6307357e1 (refs/remotes/origin/trunk)
-Checked out HEAD:
-  file:///build/git-2.20.1/t/trash%20directory.t9117-git-svn-init-clone/svnrepo/project/trunk r1
-ok 4 - clone with --stdlayout
-
-expecting success: 
-	test ! -d target &&
-	git svn clone -s "$svnrepo"/project target &&
-	test -d target/.git/svn &&
-	test -e target/foo &&
-	rm -rf target
-	
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9117-git-svn-init-clone/tmp/target/.git/
-Using higher level of URL: file:///build/git-2.20.1/t/trash%20directory.t9117-git-svn-init-clone/svnrepo/project => file:///build/git-2.20.1/t/trash%20directory.t9117-git-svn-init-clone/svnrepo
-	A	foo
-r1 = 1d85748a1be44bcc9fb6ba7367f9feb6307357e1 (refs/remotes/origin/trunk)
-Checked out HEAD:
-  file:///build/git-2.20.1/t/trash%20directory.t9117-git-svn-init-clone/svnrepo/project/trunk r1
-ok 5 - clone to target directory with --stdlayout
-
-expecting success: 
-	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/git-2.20.1/t/trash directory.t9117-git-svn-init-clone/tmp/trunk/.git/
-ok 6 - init without -s/-T/-b/-t does not warn
-
-expecting success: 
-	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/git-2.20.1/t/trash directory.t9117-git-svn-init-clone/tmp/trunk/.git/
-	A	foo
-r1 = 1d85748a1be44bcc9fb6ba7367f9feb6307357e1 (refs/remotes/git-svn)
-ok 7 - clone without -s/-T/-b/-t does not warn
-
-expecting success: 
-	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/git-2.20.1/t/trash directory.t9117-git-svn-init-clone/tmp/project/.git/
-ok 8 - init with -s/-T/-b/-t assumes --prefix=origin/
-
-expecting success: 
-	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/git-2.20.1/t/trash directory.t9117-git-svn-init-clone/tmp/project/.git/
-	A	foo
-r1 = 1d85748a1be44bcc9fb6ba7367f9feb6307357e1 (refs/remotes/origin/trunk)
-ok 9 - clone with -s/-T/-b/-t assumes --prefix=origin/
-
-expecting success: 
-	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/git-2.20.1/t/trash directory.t9117-git-svn-init-clone/tmp/project/.git/
-ok 10 - init with -s/-T/-b/-t and --prefix "" still works
-
-expecting success: 
-	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/git-2.20.1/t/trash directory.t9117-git-svn-init-clone/tmp/project/.git/
-	A	foo
-r1 = 1d85748a1be44bcc9fb6ba7367f9feb6307357e1 (refs/remotes/trunk)
-ok 11 - clone with -s/-T/-b/-t and --prefix "" still works
-
-expecting success: 
-	test ! -d project &&
-	git svn init -T "$svnrepo"/project/trunk project &&
-	rm -rf project
-	
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9117-git-svn-init-clone/tmp/.git/
-Using higher level of URL: file:///build/git-2.20.1/t/trash%20directory.t9117-git-svn-init-clone/svnrepo/project/trunk => file:///build/git-2.20.1/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/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t9132-git-svn-broken-symlink.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9132-git-svn-broken-symlink/.git/
-expecting success: 
-	svnadmin load "$rawsvnrepo" <<EOF
-SVN-fs-dump-format-version: 2
-
-UUID: 60780f9a-7df5-43b4-83ab-60e2c0673ef7
-
-Revision-number: 0
-Prop-content-length: 56
-Content-length: 56
-
-K 8
-svn:date
-V 27
-2008-11-26T07:17:27.590577Z
-PROPS-END
-
-Revision-number: 1
-Prop-content-length: 111
-Content-length: 111
-
-K 7
-svn:log
-V 4
-test
-K 10
-svn:author
-V 12
-normalperson
-K 8
-svn:date
-V 27
-2008-11-26T07:18:03.511836Z
-PROPS-END
-
-Node-path: bar
-Node-kind: file
-Node-action: add
-Prop-content-length: 33
-Text-content-length: 4
-Text-content-md5: 912ec803b2ce49e4a541068d495ab570
-Content-length: 37
-
-K 11
-svn:special
-V 1
-*
-PROPS-END
-asdf
-
-Revision-number: 2
-Prop-content-length: 121
-Content-length: 121
-
-K 7
-svn:log
-V 13
-bar => doink
-
-K 10
-svn:author
-V 12
-normalperson
-K 8
-svn:date
-V 27
-2008-11-27T03:55:31.601672Z
-PROPS-END
-
-Node-path: bar
-Node-kind: file
-Node-action: change
-Text-content-length: 10
-Text-content-md5: 92ca4fe7a9721f877f765c252dcd66c9
-Content-length: 10
-
-link doink
-
-EOF
-
-<<< Started new transaction, based on original revision 1
-     * editing path : bar ... done.
-
-------- Committed revision 1 >>>
-
-<<< Started new transaction, based on original revision 2
-     * editing path : bar ... done.
-
-------- Committed revision 2 >>>
-
-ok 1 - load svn dumpfile
-
-expecting success: git svn clone -r1 "$svnrepo" x
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9132-git-svn-broken-symlink/x/.git/
-bar has mode 120000 but is not a link
-	A	bar
-r1 = 9934d0c230cdfdf887b4cc2433fb3d06aafa0c25 (refs/remotes/git-svn)
-Checked out HEAD:
-  file:///build/git-2.20.1/t/trash%20directory.t9132-git-svn-broken-symlink/svnrepo r1
-ok 2 - clone using git svn
-
-checking prerequisite: SYMLINKS
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
-	# test whether the filesystem supports symbolic links
-	ln -s x y && test -h y
-
-)
-prerequisite SYMLINKS ok
-expecting success: 
-	test -L x/bar &&
-	(cd x && test xasdf = x"$(git cat-file blob HEAD:bar)")
-
-ok 3 - "bar" is a symlink that points to "asdf"
-
-expecting success: 
-	(cd x && git svn rebase)
-
-Checksum mismatch: bar 5e40c0877058c504203932e5136051cf3cd3519b
-expected: 912ec803b2ce49e4a541068d495ab570
-     got: 3f9dfa058a15dc34057c51ec4d35393c
-Retrying... (possibly a bad symlink from SVN)
-	M	bar
-r2 = 229fb64484715d303a0bbb7239a3114e9420466b (refs/remotes/git-svn)
-First, rewinding head to replay your work on top of it...
-Fast-forwarded master to refs/remotes/git-svn.
-ok 4 - get "bar" => symlink fix from svn
-
-expecting success: 
-	test -L x/bar &&
-	(cd x && test xdoink = x"$(git cat-file blob HEAD:bar)")
-
-ok 5 - "bar" remains a proper symlink
-
-# passed all 5 test(s)
-1..5
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t9135-git-svn-moved-branch-empty-file.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9135-git-svn-moved-branch-empty-file/.git/
-expecting success: 
-	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: git svn clone -s "$svnrepo" x
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9135-git-svn-moved-branch-empty-file/x/.git/
-r1 = beb01d4ccb97d931f0082004f7e70ee795dddcf1 (refs/remotes/origin/trunk)
-Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9135-git-svn-moved-branch-empty-file/svnrepo/trunk => file:///build/git-2.20.1/t/trash%20directory.t9135-git-svn-moved-branch-empty-file/svnrepo/branches/branch-b, 1
-Found branch parent: (refs/remotes/origin/branch-b) beb01d4ccb97d931f0082004f7e70ee795dddcf1
-Following parent with do_switch
-Successfully followed parent
-r2 = 3e7959ea28a29e231ed91200eac0e589352b53aa (refs/remotes/origin/branch-b)
-	A	b1
-r3 = c0eab6674035d23fa6a4b35435414dbc682efeca (refs/remotes/origin/branch-b)
-Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9135-git-svn-moved-branch-empty-file/svnrepo/trunk => file:///build/git-2.20.1/t/trash%20directory.t9135-git-svn-moved-branch-empty-file/svnrepo/branches/branch-c, 3
-Found branch parent: (refs/remotes/origin/branch-c) beb01d4ccb97d931f0082004f7e70ee795dddcf1
-Following parent with do_switch
-Successfully followed parent
-r4 = 1845bb1989aa28cf00d9cd59607abb22ac63383c (refs/remotes/origin/branch-c)
-Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9135-git-svn-moved-branch-empty-file/svnrepo/branches/branch-b => file:///build/git-2.20.1/t/trash%20directory.t9135-git-svn-moved-branch-empty-file/svnrepo/branches/branch-c, 5
-Found branch parent: (refs/remotes/origin/branch-c) c0eab6674035d23fa6a4b35435414dbc682efeca
-Index mismatch: 934e48f4addc4882a9b7b99615348569d531c873 != 4b825dc642cb6eb9a060e54bf8d69288fbee4904
-rereading c0eab6674035d23fa6a4b35435414dbc682efeca
-Following parent with do_switch
-Successfully followed parent
-r6 = b750165942f32942fe186e97c51ffe8c678e6966 (refs/remotes/origin/branch-c)
-Checked out HEAD:
-  file:///build/git-2.20.1/t/trash%20directory.t9135-git-svn-moved-branch-empty-file/svnrepo/trunk r1
-ok 2 - clone using git svn
-
-expecting success: 
-	(
-		cd x &&
-		git reset --hard origin/branch-c &&
-		test_must_be_empty b1
-	)
-	
-HEAD is now at b750165 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/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t9136-git-svn-recreated-branch-empty-file.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9136-git-svn-recreated-branch-empty-file/.git/
-expecting success: 
-	svnadmin load "$rawsvnrepo" < "${TEST_DIRECTORY}/t9136/svn.dump"
-	
-<<< Started new transaction, based on original revision 1
-     * editing path : branches ... done.
-     * editing path : tags ... done.
-     * editing path : trunk ... done.
-     * editing path : trunk/file ... done.
-
-------- Committed revision 1 >>>
-
-<<< Started new transaction, based on original revision 2
-     * editing path : tags/1.0 ...COPIED... done.
-
-------- Committed revision 2 >>>
-
-<<< Started new transaction, based on original revision 3
-     * editing path : tags/1.0.1 ...COPIED... done.
-
-------- Committed revision 3 >>>
-
-<<< Started new transaction, based on original revision 4
-     * editing path : tags/1.0.1 ... done.
-
-------- Committed revision 4 >>>
-
-<<< Started new transaction, based on original revision 5
-     * editing path : branches/1.0 ...COPIED... done.
-
-------- Committed revision 5 >>>
-
-<<< Started new transaction, based on original revision 6
-     * editing path : tags/1.0.1 ...COPIED... done.
-
-------- Committed revision 6 >>>
-
-ok 1 - load svn dumpfile
-
-expecting success: git svn clone -s "$svnrepo" x
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9136-git-svn-recreated-branch-empty-file/x/.git/
-	A	file
-r1 = fd4f1d6ab481174c4fbde57ea3920c85cee55140 (refs/remotes/origin/trunk)
-Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9136-git-svn-recreated-branch-empty-file/svnrepo/trunk => file:///build/git-2.20.1/t/trash%20directory.t9136-git-svn-recreated-branch-empty-file/svnrepo/tags/1.0, 1
-Found branch parent: (refs/remotes/origin/tags/1.0) fd4f1d6ab481174c4fbde57ea3920c85cee55140
-Following parent with do_switch
-Successfully followed parent
-r2 = 8b59f27d0431e30c2338effb3fe48f135ddf1f8d (refs/remotes/origin/tags/1.0)
-Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9136-git-svn-recreated-branch-empty-file/svnrepo/tags/1.0 => file:///build/git-2.20.1/t/trash%20directory.t9136-git-svn-recreated-branch-empty-file/svnrepo/tags/1.0.1, 2
-Found branch parent: (refs/remotes/origin/tags/1.0.1) 8b59f27d0431e30c2338effb3fe48f135ddf1f8d
-Following parent with do_switch
-Successfully followed parent
-r3 = 0099ccb2088d781c560075b94f064869894209d6 (refs/remotes/origin/tags/1.0.1)
-Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9136-git-svn-recreated-branch-empty-file/svnrepo/tags/1.0 => file:///build/git-2.20.1/t/trash%20directory.t9136-git-svn-recreated-branch-empty-file/svnrepo/branches/1.0, 4
-Found branch parent: (refs/remotes/origin/1.0) 8b59f27d0431e30c2338effb3fe48f135ddf1f8d
-Following parent with do_switch
-Successfully followed parent
-r5 = 1b79f58e0752f299b18aa054f6bbf09330fa8a32 (refs/remotes/origin/1.0)
-Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9136-git-svn-recreated-branch-empty-file/svnrepo/branches/1.0 => file:///build/git-2.20.1/t/trash%20directory.t9136-git-svn-recreated-branch-empty-file/svnrepo/tags/1.0.1, 5
-Found branch parent: (refs/remotes/origin/tags/1.0.1) 1b79f58e0752f299b18aa054f6bbf09330fa8a32
-Following parent with do_switch
-Successfully followed parent
-r6 = 9f81ec92ddf0fc1598b893a8b5134df27950a3c3 (refs/remotes/origin/tags/1.0.1)
-Checked out HEAD:
-  file:///build/git-2.20.1/t/trash%20directory.t9136-git-svn-recreated-branch-empty-file/svnrepo/trunk r1
-ok 2 - clone using git svn
-
-# passed all 2 test(s)
-1..2
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t9129-git-svn-i18n-commitencoding.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9129-git-svn-i18n-commitencoding/.git/
-expecting success: 
-		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/git-2.20.1/t/trash directory.t9129-git-svn-i18n-commitencoding/ISO8859-1/.git/
-r1 = 04ffa5165c166ad3486a785bd204994d15e83f74 (refs/remotes/git-svn)
-Checked out HEAD:
-  file:///build/git-2.20.1/t/trash%20directory.t9129-git-svn-i18n-commitencoding/svnrepo/ISO8859-1 r1
-ok 1 - ISO8859-1 setup
-
-expecting success: 
-		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/git-2.20.1/t/trash directory.t9129-git-svn-i18n-commitencoding/eucJP/.git/
-r2 = 88e21ed489ed5ed31f794efcde8ca3a08c8cad18 (refs/remotes/git-svn)
-Checked out HEAD:
-  file:///build/git-2.20.1/t/trash%20directory.t9129-git-svn-i18n-commitencoding/svnrepo/eucJP r2
-ok 2 - eucJP setup
-
-expecting success: 
-		mkdir $H &&
-		svn_cmd import -m "$H test" $H "$svnrepo"/$H &&
-		git svn clone "$svnrepo"/$H $H
-	
-Committing transaction...
-Committed revision 3.
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9129-git-svn-i18n-commitencoding/ISO-2022-JP/.git/
-r3 = ae5f003a2bb49dd5d1fc71a63e427354290f71de (refs/remotes/git-svn)
-Checked out HEAD:
-  file:///build/git-2.20.1/t/trash%20directory.t9129-git-svn-i18n-commitencoding/svnrepo/ISO-2022-JP r3
-ok 3 - ISO-2022-JP setup
-
-expecting success: 
-	(
-		cd $H &&
-		git config i18n.commitencoding $H &&
-		git checkout -b t refs/remotes/git-svn &&
-		echo $H >F &&
-		git add F &&
-		git commit -a -F "$TEST_DIRECTORY"/t3900/$H.txt &&
-		E=$(git cat-file commit HEAD | sed -ne "s/^encoding //p") &&
-		test "z$E" = "z$H" &&
-		compare_git_head_with "$TEST_DIRECTORY"/t3900/$H.txt
-	)
-	
-Switched to a new branch 't'
-[t 3af3f26] ÄËÑÏÖ
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 F
-ok 4 - ISO8859-1 commit on git side
-
-expecting success: 
-	(
-		cd $H &&
-		git config i18n.commitencoding $H &&
-		git checkout -b t refs/remotes/git-svn &&
-		echo $H >F &&
-		git add F &&
-		git commit -a -F "$TEST_DIRECTORY"/t3900/$H.txt &&
-		E=$(git cat-file commit HEAD | sed -ne "s/^encoding //p") &&
-		test "z$E" = "z$H" &&
-		compare_git_head_with "$TEST_DIRECTORY"/t3900/$H.txt
-	)
-	
-Switched to a new branch 't'
-[t 15cbc56] ¤Ï¤ì¤Ò¤Û¤Õ
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 F
-ok 5 - eucJP commit on git side
-
-expecting success: 
-	(
-		cd $H &&
-		git config i18n.commitencoding $H &&
-		git checkout -b t refs/remotes/git-svn &&
-		echo $H >F &&
-		git add F &&
-		git commit -a -F "$TEST_DIRECTORY"/t3900/$H.txt &&
-		E=$(git cat-file commit HEAD | sed -ne "s/^encoding //p") &&
-		test "z$E" = "z$H" &&
-		compare_git_head_with "$TEST_DIRECTORY"/t3900/$H.txt
-	)
-	
-Switched to a new branch 't'
-[t 070fe6e] $B$O$l$R$[$U(B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 F
-ok 6 - ISO-2022-JP commit on git side
-
-expecting success: 
-	(
-		cd $H &&
-		git svn dcommit &&
-		git cat-file commit HEAD | grep git-svn-id: &&
-		E=$(git cat-file commit HEAD | sed -ne "s/^encoding //p") &&
-		test "z$E" = "z$H" &&
-		compare_git_head_with "$TEST_DIRECTORY"/t3900/$H.txt
-	)
-	
-Committing to file:///build/git-2.20.1/t/trash%20directory.t9129-git-svn-i18n-commitencoding/svnrepo/ISO8859-1 ...
-	A	F
-Committed r4
-	A	F
-r4 = b04877aab228f8d0a5cb9bd097a3dac195441464 (refs/remotes/git-svn)
-No changes between 3af3f2609f03977da6f38de7e55f579c1494f96d and refs/remotes/git-svn
-Resetting to the latest refs/remotes/git-svn
-git-svn-id: file:///build/git-2.20.1/t/trash%20directory.t9129-git-svn-i18n-commitencoding/svnrepo/ISO8859-1@4 e5f5289e-1a2c-49f8-8933-54ff659d5997
-ok 7 - ISO8859-1 dcommit to svn
-
-expecting success: 
-	(
-		cd $H &&
-		git svn dcommit &&
-		git cat-file commit HEAD | grep git-svn-id: &&
-		E=$(git cat-file commit HEAD | sed -ne "s/^encoding //p") &&
-		test "z$E" = "z$H" &&
-		compare_git_head_with "$TEST_DIRECTORY"/t3900/$H.txt
-	)
-	
-Committing to file:///build/git-2.20.1/t/trash%20directory.t9129-git-svn-i18n-commitencoding/svnrepo/eucJP ...
-	A	F
-Committed r5
-	A	F
-r5 = 614a795606ca32d1b403e1f93c0b6b45bcefb75b (refs/remotes/git-svn)
-No changes between 15cbc56634c5401a79c96b52989100ed8d46f039 and refs/remotes/git-svn
-Resetting to the latest refs/remotes/git-svn
-git-svn-id: file:///build/git-2.20.1/t/trash%20directory.t9129-git-svn-i18n-commitencoding/svnrepo/eucJP@5 e5f5289e-1a2c-49f8-8933-54ff659d5997
-ok 8 - eucJP dcommit to svn
-
-expecting success: 
-	(
-		cd $H &&
-		git svn dcommit &&
-		git cat-file commit HEAD | grep git-svn-id: &&
-		E=$(git cat-file commit HEAD | sed -ne "s/^encoding //p") &&
-		test "z$E" = "z$H" &&
-		compare_git_head_with "$TEST_DIRECTORY"/t3900/$H.txt
-	)
-	
-Committing to file:///build/git-2.20.1/t/trash%20directory.t9129-git-svn-i18n-commitencoding/svnrepo/ISO-2022-JP ...
-	A	F
-Committed r6
-	A	F
-r6 = 3729beb3cd0f95e389bfb95f44006d2ab22aaebc (refs/remotes/git-svn)
-No changes between 070fe6e2b634ada37918f87a4d7e80628c69afad and refs/remotes/git-svn
-Resetting to the latest refs/remotes/git-svn
-git-svn-id: file:///build/git-2.20.1/t/trash%20directory.t9129-git-svn-i18n-commitencoding/svnrepo/ISO-2022-JP@6 e5f5289e-1a2c-49f8-8933-54ff659d5997
-ok 9 - ISO-2022-JP dcommit to svn
-
-expecting success: 
-	(
-		cd ISO8859-1 &&
-		compare_svn_head_with "$TEST_DIRECTORY"/t3900/1-UTF-8.txt
-	)
-
-ok 10 - ISO-8859-1 should match UTF-8 in svn
-
-expecting success: 
-		(
-			cd $H &&
-			compare_svn_head_with "$TEST_DIRECTORY"/t3900/2-UTF-8.txt
-		)
-	
-ok 11 - eucJP should match UTF-8 in svn
-
-expecting success: 
-		(
-			cd $H &&
-			compare_svn_head_with "$TEST_DIRECTORY"/t3900/2-UTF-8.txt
-		)
-	
-ok 12 - ISO-2022-JP should match UTF-8 in svn
-
-# passed all 12 test(s)
-1..12
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t9133-git-svn-nested-git-repo.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9133-git-svn-nested-git-repo/.git/
-expecting success: 
-	svn_cmd co "$svnrepo" s &&
-	(
-		cd s &&
-		git init &&
-		test -f .git/HEAD &&
-		> .git/a &&
-		echo a > a &&
-		svn_cmd add .git a &&
-		svn_cmd commit -m "create a nested git repo" &&
-		svn_cmd up &&
-		echo hi >> .git/a &&
-		svn_cmd commit -m "modify .git/a" &&
-		svn_cmd up
-	)
-
-Checked out revision 0.
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9133-git-svn-nested-git-repo/s/.git/
-A         .git
-A         .git/objects
-A         .git/objects/info
-A         .git/objects/pack
-A         .git/info
-A         .git/info/exclude
-A         .git/refs
-A         .git/refs/heads
-A         .git/refs/tags
-A         .git/a
-A         .git/HEAD
-A         .git/hooks
-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/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/description
-A         .git/config
-A         .git/branches
-A         a
-Adding         .git
-Adding         .git/HEAD
-Adding         .git/a
-Adding         .git/branches
-Adding         .git/config
-Adding         .git/description
-Adding         .git/hooks
-Adding         .git/hooks/applypatch-msg.sample
-Adding         .git/hooks/commit-msg.sample
-Adding         .git/hooks/fsmonitor-watchman.sample
-Adding         .git/hooks/post-update.sample
-Adding         .git/hooks/pre-applypatch.sample
-Adding         .git/hooks/pre-commit.sample
-Adding         .git/hooks/pre-push.sample
-Adding         .git/hooks/pre-rebase.sample
-Adding         .git/hooks/pre-receive.sample
-Adding         .git/hooks/prepare-commit-msg.sample
-Adding         .git/hooks/update.sample
-Adding         .git/info
-Adding         .git/info/exclude
-Adding         .git/objects
-Adding         .git/objects/info
-Adding         .git/objects/pack
-Adding         .git/refs
-Adding         .git/refs/heads
-Adding         .git/refs/tags
-Adding         a
-Transmitting file data .................done
-Committing transaction...
-Committed revision 1.
-Updating '.':
-At revision 1.
-Sending        .git/a
-Transmitting file data .done
-Committing transaction...
-Committed revision 2.
-Updating '.':
-At revision 2.
-ok 1 - setup repo with a git repo inside it
-
-expecting success: 
-	git svn clone "$svnrepo" g &&
-	echo a > expect &&
-	test_cmp expect g/a
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9133-git-svn-nested-git-repo/g/.git/
-	A	a
-r1 = 03d2bce762dcee819e23b751d88aa2e28bfcd762 (refs/remotes/git-svn)
-r2 = f6016d5ad177eab22dd1e12939f160e9a239b1ab (refs/remotes/git-svn)
-Checked out HEAD:
-  file:///build/git-2.20.1/t/trash%20directory.t9133-git-svn-nested-git-repo/svnrepo r2
-ok 2 - clone an SVN repo containing a git repo
-
-expecting success: 
-	(
-		cd s &&
-		echo b >> a &&
-		svn_cmd commit -m "SVN-side change outside of .git" &&
-		svn_cmd up &&
-		svn_cmd log -v | fgrep "SVN-side change outside of .git"
-	)
-
-Sending        a
-Transmitting file data .done
-Committing transaction...
-Committed revision 3.
-Updating '.':
-At revision 3.
-SVN-side change outside of .git
-ok 3 - SVN-side change outside of .git
-
-expecting success: 
-	(
-		cd g &&
-		git svn rebase &&
-		echo a > expect &&
-		echo b >> expect &&
-		test_cmp expect a &&
-		rm expect
-	)
-
-	M	a
-r3 = 88e82274092a110384c24ad21ebe259c40155f5a (refs/remotes/git-svn)
-First, rewinding head to replay your work on top of it...
-Fast-forwarded master to refs/remotes/git-svn.
-ok 4 - update git svn-cloned repo
-
-expecting success: 
-	(
-		cd s &&
-		git add a &&
-		git commit -m "add a inside an SVN repo" &&
-		git log &&
-		svn_cmd add --force .git &&
-		svn_cmd commit -m "SVN-side change inside of .git" &&
-		svn_cmd up &&
-		svn_cmd log -v | fgrep "SVN-side change inside of .git"
-	)
-
-[master (root-commit) b903a23] add a inside an SVN repo
- Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+)
- create mode 100644 a
-commit b903a23a48aa7a468e30401f874e7d7ad4fd68f0
-Author: A U Thor <author@example.com>
-Date:   Fri Dec 3 05:10:36 2021 +0000
-
-    add a inside an SVN repo
-A         .git/objects/42
-A  (bin)  .git/objects/42/2c2b7ab3b3c668038da977e4e93a5fc623169c
-A         .git/objects/b9
-A  (bin)  .git/objects/b9/03a23a48aa7a468e30401f874e7d7ad4fd68f0
-A         .git/objects/a3
-A  (bin)  .git/objects/a3/8e8ab7e857af7a7ac6f49fa3d3821f26fedca8
-A         .git/refs/heads/master
-A         .git/logs
-A         .git/logs/refs
-A         .git/logs/refs/heads
-A         .git/logs/refs/heads/master
-A         .git/logs/HEAD
-A         .git/COMMIT_EDITMSG
-A  (bin)  .git/index
-Adding         .git/COMMIT_EDITMSG
-Adding  (bin)  .git/index
-Adding         .git/logs
-Adding         .git/logs/HEAD
-Adding         .git/logs/refs
-Adding         .git/logs/refs/heads
-Adding         .git/logs/refs/heads/master
-Adding         .git/objects/42
-Adding  (bin)  .git/objects/42/2c2b7ab3b3c668038da977e4e93a5fc623169c
-Adding         .git/objects/a3
-Adding  (bin)  .git/objects/a3/8e8ab7e857af7a7ac6f49fa3d3821f26fedca8
-Adding         .git/objects/b9
-Adding  (bin)  .git/objects/b9/03a23a48aa7a468e30401f874e7d7ad4fd68f0
-Adding         .git/refs/heads/master
-Transmitting file data ........done
-Committing transaction...
-Committed revision 4.
-Updating '.':
-At revision 4.
-SVN-side change inside of .git
-ok 5 - SVN-side change inside of .git
-
-expecting success: 
-	(
-		cd g &&
-		git svn rebase &&
-		echo a > expect &&
-		echo b >> expect &&
-		test_cmp expect a &&
-		rm expect
-	)
-
-r4 = 6bf404cd5ad63b6875c059f6d2559e2635622a7e (refs/remotes/git-svn)
-First, rewinding head to replay your work on top of it...
-Fast-forwarded master to refs/remotes/git-svn.
-ok 6 - update git svn-cloned repo
-
-expecting success: 
-	(
-		cd s &&
-		echo c >> a &&
-		git add a &&
-		git commit -m "add a inside an SVN repo" &&
-		svn_cmd commit -m "SVN-side change in and out of .git" &&
-		svn_cmd up &&
-		svn_cmd log -v | fgrep "SVN-side change in and out of .git"
-	)
-
-[master c245b0a] add a inside an SVN repo
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Sending        .git/index
-Sending        .git/logs/HEAD
-Sending        .git/logs/refs/heads/master
-Sending        .git/refs/heads/master
-Sending        a
-Transmitting file data .....done
-Committing transaction...
-Committed revision 5.
-Updating '.':
-At revision 5.
-SVN-side change in and out of .git
-ok 7 - SVN-side change in and out of .git
-
-expecting success: 
-	(
-		cd g &&
-		git svn rebase &&
-		echo a > expect &&
-		echo b >> expect &&
-		echo c >> expect &&
-		test_cmp expect a &&
-		rm expect
-	)
-
-	M	a
-r5 = 232a27ad295f6ea854c17ac6be2f129deb38fa19 (refs/remotes/git-svn)
-First, rewinding head to replay your work on top of it...
-Fast-forwarded master to refs/remotes/git-svn.
-ok 8 - update git svn-cloned repo again
-
-# passed all 8 test(s)
-1..8
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t9131-git-svn-empty-symlink.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9131-git-svn-empty-symlink/.git/
-expecting success: 
-	svnadmin load "$rawsvnrepo" <<EOF
-SVN-fs-dump-format-version: 2
-
-UUID: 60780f9a-7df5-43b4-83ab-60e2c0673ef7
-
-Revision-number: 0
-Prop-content-length: 56
-Content-length: 56
-
-K 8
-svn:date
-V 27
-2008-11-26T07:17:27.590577Z
-PROPS-END
-
-Revision-number: 1
-Prop-content-length: 111
-Content-length: 111
-
-K 7
-svn:log
-V 4
-test
-K 10
-svn:author
-V 12
-normalperson
-K 8
-svn:date
-V 27
-2008-11-26T07:18:03.511836Z
-PROPS-END
-
-Node-path: bar
-Node-kind: file
-Node-action: add
-Prop-content-length: 33
-Text-content-length: 0
-Text-content-md5: d41d8cd98f00b204e9800998ecf8427e
-Content-length: 33
-
-K 11
-svn:special
-V 1
-*
-PROPS-END
-
-Revision-number: 2
-Prop-content-length: 121
-Content-length: 121
-
-K 7
-svn:log
-V 13
-bar => doink
-
-K 10
-svn:author
-V 12
-normalperson
-K 8
-svn:date
-V 27
-2008-11-27T03:55:31.601672Z
-PROPS-END
-
-Node-path: bar
-Node-kind: file
-Node-action: change
-Text-content-length: 10
-Text-content-md5: 92ca4fe7a9721f877f765c252dcd66c9
-Content-length: 10
-
-link doink
-
-EOF
-
-<<< Started new transaction, based on original revision 1
-     * editing path : bar ... done.
-
-------- Committed revision 1 >>>
-
-<<< Started new transaction, based on original revision 2
-     * editing path : bar ... done.
-
-------- Committed revision 2 >>>
-
-ok 1 - load svn dumpfile
-
-expecting success: git svn clone -r1 "$svnrepo" x
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9131-git-svn-empty-symlink/x/.git/
-bar has mode 120000 but it points to nothing
-converting to an empty file with mode 100644
-	A	bar
-r1 = fafb149e12503e34dbf2627e060fa62d6cf51385 (refs/remotes/git-svn)
-Checked out HEAD:
-  file:///build/git-2.20.1/t/trash%20directory.t9131-git-svn-empty-symlink/svnrepo r1
-ok 2 - clone using git svn
-
-expecting success: (cd x && git config svn.brokenSymlinkWorkaround true)
-ok 3 - enable broken symlink workaround
-
-expecting success: test_must_be_empty x/bar
-ok 4 - "bar" is an empty file
-
-expecting success: (cd x && git svn rebase)
-Scanning for empty symlinks, this may take a while if you have many empty files
-You may disable this with `git config svn.brokenSymlinkWorkaround false'.
-This may be done in a different terminal without restarting git svn
-	M	bar
-r2 = 33ef57f848781c501761f7fe4d89dbc37814d871 (refs/remotes/git-svn)
-First, rewinding head to replay your work on top of it...
-Fast-forwarded master to refs/remotes/git-svn.
-ok 5 - get "bar" => symlink fix from svn
-
-checking prerequisite: SYMLINKS
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
-	# test whether the filesystem supports symbolic links
-	ln -s x y && test -h y
-
-)
-prerequisite SYMLINKS ok
-expecting success: test -h x/bar
-ok 6 - "bar" becomes a symlink
-
-expecting success: git svn clone -r1 "$svnrepo" y
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9131-git-svn-empty-symlink/y/.git/
-bar has mode 120000 but it points to nothing
-converting to an empty file with mode 100644
-	A	bar
-r1 = fafb149e12503e34dbf2627e060fa62d6cf51385 (refs/remotes/git-svn)
-Checked out HEAD:
-  file:///build/git-2.20.1/t/trash%20directory.t9131-git-svn-empty-symlink/svnrepo r1
-ok 7 - clone using git svn
-
-expecting success: (cd y && git config svn.brokenSymlinkWorkaround false)
-ok 8 - disable broken symlink workaround
-
-expecting success: test_must_be_empty y/bar
-ok 9 - "bar" is an empty file
-
-expecting success: (cd y && git svn rebase)
-	M	bar
-r2 = ac95711dc99299c22df63138bafdcbe4969df3cb (refs/remotes/git-svn)
-First, rewinding head to replay your work on top of it...
-Fast-forwarded master to refs/remotes/git-svn.
-ok 10 - get "bar" => symlink fix from svn
-
-expecting success: ! test -L y/bar
-ok 11 - "bar" does not become a symlink
-
-expecting success: git svn clone -r1 "$svnrepo" z
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9131-git-svn-empty-symlink/z/.git/
-bar has mode 120000 but it points to nothing
-converting to an empty file with mode 100644
-	A	bar
-r1 = fafb149e12503e34dbf2627e060fa62d6cf51385 (refs/remotes/git-svn)
-Checked out HEAD:
-  file:///build/git-2.20.1/t/trash%20directory.t9131-git-svn-empty-symlink/svnrepo r1
-ok 12 - clone using git svn
-
-expecting success: test_must_be_empty z/bar
-ok 13 - "bar" is an empty file
-
-expecting success: (cd z && git svn rebase)
-	M	bar
-r2 = ac95711dc99299c22df63138bafdcbe4969df3cb (refs/remotes/git-svn)
-First, rewinding head to replay your work on top of it...
-Fast-forwarded master to refs/remotes/git-svn.
-ok 14 - get "bar" => symlink fix from svn
-
-expecting success: ! test -L z/bar
-ok 15 - "bar" does not become a symlink
-
-# passed all 15 test(s)
-1..15
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t9137-git-svn-dcommit-clobber-series.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9137-git-svn-dcommit-clobber-series/.git/
-expecting success: 
-	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 = 44a5d932a0619bfc802d23afcb62e6d6df46fd6e (refs/remotes/git-svn)
-Checked out HEAD:
-  file:///build/git-2.20.1/t/trash%20directory.t9137-git-svn-dcommit-clobber-series/svnrepo r1
-ok 1 - initialize repo
-
-expecting success: 
-	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: 
-	echo hi > life &&
-	git update-index --add life &&
-	git commit -m hi-life &&
-	echo bye >> life &&
-	git commit -m bye-life life
-	
-[master a69a042] hi-life
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 life
-[master 676cb9a] bye-life
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 3 - some unrelated changes to git
-
-expecting success: 
-	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 545e75d] 4 => 4444, 7 => 7777
- Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+), 2 deletions(-)
-Committing to file:///build/git-2.20.1/t/trash%20directory.t9137-git-svn-dcommit-clobber-series/svnrepo ...
-	A	life
-Committed r3
-	M	file
-r2 = 8cebe6b6e4b980fadaf4b09dc7810a64b5b102d2 (refs/remotes/git-svn)
-	A	life
-r3 = d043b7b88b4379874cc250fc2316cb434d2b774c (refs/remotes/git-svn)
-W: a69a042261ee6844bbc16bdefe34f17177a8bb10 and refs/remotes/git-svn differ, using rebase:
-:100644 100644 55200b3d5d7c0e515eaccaf8465a295017e88249 15dcf092297e5fcea41cadcc3eb0a689aaa3e65e M	file
-First, rewinding head to replay your work on top of it...
-Applying: bye-life
-Applying: 4 => 4444, 7 => 7777
-	M	life
-Committed r4
-	M	life
-r4 = 47750fd98b82d140b941db37298f5a5316fd4dda (refs/remotes/git-svn)
-	M	file
-Committed r5
-	M	file
-r5 = b3b9989a2e1efe98cafb762fc854b0014d70038a (refs/remotes/git-svn)
-No changes between 78d1e7aa76e554ef0705b131eef233c65227e833 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: 
-	echo foo >>file &&
-	git add file &&
-	test_must_fail git svn dcommit
-
-Cannot dcommit with a dirty index.  Commit your changes first, or stash them with `git stash'.
- at /build/git-2.20.1/git-svn line 852.
-
-ok 5 - attempt to dcommit with a dirty index
-
-# passed all 5 test(s)
-1..5
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t9142-git-svn-shallow-clone.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9142-git-svn-shallow-clone/.git/
-expecting success: 
-	svn_cmd mkdir -m "create standard layout" \
-	  "$svnrepo"/trunk "$svnrepo"/branches "$svnrepo"/tags &&
-	svn_cmd cp -m "branch off trunk" \
-	  "$svnrepo"/trunk "$svnrepo"/branches/a &&
-	svn_cmd co "$svnrepo"/branches/a &&
-	(
-		cd a &&
-		> foo &&
-		svn_cmd add foo &&
-		svn_cmd commit -m "add foo"
-	) &&
-	maybe_start_httpd
-
-Committing transaction...
-Committed revision 1.
-Committing transaction...
-Committed revision 2.
-Checked out revision 2.
-A         foo
-Adding         foo
-Transmitting file data .done
-Committing transaction...
-Committed revision 3.
-ok 1 - setup test repository
-
-expecting success: 
-	git svn clone -r HEAD "$svnrepo/trunk" g &&
-	( cd g && git rev-parse --symbolic --verify HEAD )
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9142-git-svn-shallow-clone/g/.git/
-r1 = 9cf72b253e43e3058945c955e3da85c759f183ef (refs/remotes/git-svn)
-Checked out HEAD:
-  file:///build/git-2.20.1/t/trash%20directory.t9142-git-svn-shallow-clone/svnrepo/trunk r1
-HEAD
-ok 2 - clone trunk with "-r HEAD"
-
-# passed all 2 test(s)
-1..2
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t9115-git-svn-dcommit-funky-renames.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9115-git-svn-dcommit-funky-renames/.git/
-expecting success: 
-	svnadmin load -q "$rawsvnrepo" <"$TEST_DIRECTORY"/t9115/funky-names.dump
-
-ok 1 - load repository with strange names
-
-expecting success: 
-	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 = abad896ccbe64d6a2ca599d118bee00b532049d1 (refs/remotes/git-svn)
-Checked out HEAD:
-  file:///build/git-2.20.1/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 abad896 what will those wacky people think of next?
-ok 2 - init and fetch repository
-
-expecting success: 
-	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 6f9b948] new file in ugly parent
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 #{bad_directory_name}/ foo
-Committing to file:///build/git-2.20.1/t/trash%20directory.t9115-git-svn-dcommit-funky-renames/svnrepo ...
-	A	#{bad_directory_name}/ foo
-Committed r2
-	A	#{bad_directory_name}/ foo
-r2 = 9f2abdc464d7c70f082d848ff6cf89e8c47b95be (refs/remotes/git-svn)
-No changes between 6f9b948b96816ff1e9053921816ef8faae9b1007 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: 
-	git mv "#{bad_directory_name}/ foo" "file name with feces" &&
-	git commit -m "rename ugly file" &&
-	git svn dcommit
-	
-[master 77d952e] 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%)
-Committing to file:///build/git-2.20.1/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 = 2407ec806cc1c7828a818698633e6509347d9f77 (refs/remotes/git-svn)
-No changes between 77d952e0f105b7cf48874511cc93c44122510629 and refs/remotes/git-svn
-Resetting to the latest refs/remotes/git-svn
-ok 4 - rename ugly file
-
-expecting success: 
-	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 c60b123] pretty :x
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 pretty
-Committing to file:///build/git-2.20.1/t/trash%20directory.t9115-git-svn-dcommit-funky-renames/svnrepo ...
-	A	pretty
-Committed r4
-	A	pretty
-r4 = 765019f9a59bc08613803676b2c6d834c2d328e3 (refs/remotes/git-svn)
-No changes between c60b12387cb8d519a929ac7031f623ec292d0934 and refs/remotes/git-svn
-Resetting to the latest refs/remotes/git-svn
-[master 424eb11] moved pretty file
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename pretty => regular_dir_name/pretty (100%)
-Committing to file:///build/git-2.20.1/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 = 995391fef35b2e3be798acbedb545f7e60c9e930 (refs/remotes/git-svn)
-No changes between 424eb11e08f4b847d5ceb6a37a6c2514e2261d11 and refs/remotes/git-svn
-Resetting to the latest refs/remotes/git-svn
-ok 5 - rename pretty file
-
-expecting success: 
-	git mv regular_dir_name/pretty "#{bad_directory_name}/ booboo" &&
-	git commit -m booboo &&
-	git svn dcommit
-	
-[master ad885f6] 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%)
-Committing to file:///build/git-2.20.1/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 = 287bb9c0798dda6e6c3c67b0054b171408096874 (refs/remotes/git-svn)
-No changes between ad885f666241f86daf26df7cb543edb62e458132 and refs/remotes/git-svn
-Resetting to the latest refs/remotes/git-svn
-ok 6 - rename pretty file into ugly one
-
-expecting success: 
-	echo .. > +_+ &&
-	git update-index --add +_+ &&
-	git commit -m plus &&
-	mkdir gtk+ &&
-	git mv +_+ gtk+/_+_ &&
-	git commit -m plus_dir &&
-	git svn dcommit
-	
-[master c991121] plus
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 +_+
-[master fbe4fdb] plus_dir
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename +_+ => gtk+/_+_ (100%)
-Committing to file:///build/git-2.20.1/t/trash%20directory.t9115-git-svn-dcommit-funky-renames/svnrepo ...
-	A	+_+
-Committed r7
-	A	+_+
-r7 = 4d6a7cfdcc9ae045cbc6212b578fdb6ea8953e94 (refs/remotes/git-svn)
-	R	+_+ => gtk+/_+_
-Committed r8
-	D	+_+
-	A	gtk+/_+_
-W: -empty_dir: +_+
-r8 = ea2d9f4d2c76266b69cfa2baaface39a8f9e84dc (refs/remotes/git-svn)
-No changes between fbe4fdbf225751557aa1b8a400ea4196d8052464 and refs/remotes/git-svn
-Resetting to the latest refs/remotes/git-svn
-ok 7 - add a file with plus signs
-
-expecting success: 
-	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/git-2.20.1/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 = abad896ccbe64d6a2ca599d118bee00b532049d1 (refs/remotes/git-svn)
-	A	#{bad_directory_name}/ foo
-r2 = 9f2abdc464d7c70f082d848ff6cf89e8c47b95be (refs/remotes/git-svn)
-	D	#{bad_directory_name}/ foo
-	A	file name with feces
-W: -empty_dir: #{bad_directory_name}/ foo
-r3 = 2407ec806cc1c7828a818698633e6509347d9f77 (refs/remotes/git-svn)
-	A	pretty
-r4 = 765019f9a59bc08613803676b2c6d834c2d328e3 (refs/remotes/git-svn)
-	D	pretty
-	A	regular_dir_name/pretty
-W: -empty_dir: pretty
-r5 = 995391fef35b2e3be798acbedb545f7e60c9e930 (refs/remotes/git-svn)
-	A	#{bad_directory_name}/ booboo
-	D	regular_dir_name/pretty
-W: -empty_dir: regular_dir_name/pretty
-r6 = 287bb9c0798dda6e6c3c67b0054b171408096874 (refs/remotes/git-svn)
-	A	+_+
-r7 = 4d6a7cfdcc9ae045cbc6212b578fdb6ea8953e94 (refs/remotes/git-svn)
-	D	+_+
-	A	gtk+/_+_
-W: -empty_dir: +_+
-r8 = ea2d9f4d2c76266b69cfa2baaface39a8f9e84dc (refs/remotes/git-svn)
-Checked out HEAD:
-  file:///build/git-2.20.1/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 56544fa] 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: 
-		echo test-rebase-main > test-rebase-main &&
-		git add test-rebase-main &&
-		git commit -m test-rebase-main &&
-		git svn dcommit
-	
-[master 75585a8] test-rebase-main
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 test-rebase-main
-Committing to file:///build/git-2.20.1/t/trash%20directory.t9115-git-svn-dcommit-funky-renames/svnrepo ...
-	A	test-rebase-main
-Committed r9
-	A	test-rebase-main
-r9 = c470c9711cbf886056976014861d1e2989e6107e (refs/remotes/git-svn)
-No changes between 75585a8e4bdb425f59436f41728dc02762f3ec29 and refs/remotes/git-svn
-Resetting to the latest refs/remotes/git-svn
-ok 9 - make a commit to test rebase
-
-expecting success: 
-	(
-		cd test-rebase &&
-		git svn rebase &&
-		test -e test-rebase-main &&
-		test -e test-rebase
-	)
-	A	test-rebase-main
-r9 = c470c9711cbf886056976014861d1e2989e6107e (refs/remotes/git-svn)
-First, rewinding head to replay your work on top of it...
-Applying: test-rebase
-ok 10 - git svn rebase works inside a fresh-cloned repository
-
-checking prerequisite: UTF8_NFD_TO_NFC
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
-	# 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: 
-	LC_ALL=$a_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 a51ae99] neq
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 "\201\202"
-Committing to file:///build/git-2.20.1/t/trash%20directory.t9115-git-svn-dcommit-funky-renames/svnrepo ...
-	A	�‚
-Committed r10
-	A	�‚
-r10 = 45e593363c894c542c6b3452a085d27bf8e408c5 (refs/remotes/git-svn)
-No changes between a51ae99f213387bc3ea7ee4f647275f30509a39a and refs/remotes/git-svn
-Resetting to the latest refs/remotes/git-svn
-ok 11 - svn.pathnameencoding=cp932 new file on dcommit
-
-expecting success: 
-	LC_ALL=$a_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 9fd1894] inf
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 "\201\207"
-Committing to file:///build/git-2.20.1/t/trash%20directory.t9115-git-svn-dcommit-funky-renames/svnrepo ...
-	A	�‡
-Committed r11
-	A	�‡
-r11 = 5a35cb05545da27a06a82b6acea731c85b0de163 (refs/remotes/git-svn)
-No changes between 9fd18945590bdb4c8cac358837e839cfe1a7e760 and refs/remotes/git-svn
-Resetting to the latest refs/remotes/git-svn
-[master 5ba6dd0] inf rename
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename "\201\207" => inf (100%)
-Committing to file:///build/git-2.20.1/t/trash%20directory.t9115-git-svn-dcommit-funky-renames/svnrepo ...
-	R	�‡ => inf
-Committed r12
-	D	�‡
-	A	inf
-W: -empty_dir: ∞
-r12 = f76089bd322462fde11b07d6c1043fa71b4bab8b (refs/remotes/git-svn)
-No changes between 5ba6dd0d0e60564dc4fbb2ae66685fdfbd1e09a8 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/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
 *** t9138-git-svn-authors-prog.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9138-git-svn-authors-prog/.git/
 expecting success: 
@@ -324687,17 +324948,17 @@
 
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9138-git-svn-authors-prog/x/.git/
 W: +empty_dir: aa
-r1 = 531190a6abdb674acc872aa2c7861bac3f3b76d7 (refs/remotes/git-svn)
+r1 = 86fde95731386ab94e880992c587993312d49088 (refs/remotes/git-svn)
 W: +empty_dir: bb
-r2 = 805769e33dcebb8b426e1fcc45d3fc97717e82c7 (refs/remotes/git-svn)
+r2 = 9e732bb31b9a1cee516f16aa14bda3118ace62ee (refs/remotes/git-svn)
 W: +empty_dir: cc-sub
-r3 = 4a192fc1f3ccd7aa815cd553a44c4694683bf8ed (refs/remotes/git-svn)
+r3 = 48af18fe8364a4a432a9a60da49992d1abcc59d2 (refs/remotes/git-svn)
 W: +empty_dir: dd-sub
-r4 = 30d0ad9f8a8a4739c9a1e2b5561c27dc9fd4ded0 (refs/remotes/git-svn)
+r4 = cd5e84d54a87a2026c517621cf5ffe35eb815f81 (refs/remotes/git-svn)
 W: +empty_dir: ee-foo
-r5 = 9a96cec96c1cc54447c490aa8b550faf4a11d626 (refs/remotes/git-svn)
+r5 = 8326604e6b347c70bbdd473e8ab605408a843357 (refs/remotes/git-svn)
 W: +empty_dir: ff
-r6 = 61cc9d4d9da63fd34b3eecb9965e65370eb00770 (refs/remotes/git-svn)
+r6 = 9cc40250a2e3728109d0579e8b0c4cbae10047a8 (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/git-2.20.1/t/trash%20directory.t9138-git-svn-authors-prog/svnrepo r6
 creating empty directory: aa
@@ -324732,11 +324993,11 @@
 		grep "^author aa <aa@example\.com> " actual
 	)
 
-author ee-foo <ee-foo@example.com> 1638508236 +0000
-author dd <dd@sub.example.com> 1638508236 +0000
-author cc <cc@sub.example.com> 1638508236 +0000
-author bb <bb@example.com> 1638508236 +0000
-author aa <aa@example.com> 1638508236 +0000
+author ee-foo <ee-foo@example.com> 1672919446 +0000
+author dd <dd@sub.example.com> 1672919446 +0000
+author cc <cc@sub.example.com> 1672919446 +0000
+author bb <bb@example.com> 1672919446 +0000
+author aa <aa@example.com> 1672919446 +0000
 ok 5 - authors-prog ran correctly
 
 expecting success: 
@@ -324746,7 +325007,7 @@
 		grep "^author FFFFFFF FFFFFFF <fFf@other\.example\.com> " actual
 	)
 
-author FFFFFFF FFFFFFF <fFf@other.example.com> 1638508236 +0000
+author FFFFFFF FFFFFFF <fFf@other.example.com> 1672919446 +0000
 ok 6 - authors-file overrode authors-prog
 
 expecting success: 
@@ -324761,8 +325022,8 @@
 Committing transaction...
 Committed revision 7.
 W: +empty_dir: gg
-r7 = fcbade82090fddacab003771e0f849a0d8ef6ae7 (refs/remotes/git-svn)
-author gg <> 1638508241 +0000
+r7 = e47d397f520ca42395e810c1ab2957f78d501d89 (refs/remotes/git-svn)
+author gg <> 1672919450 +0000
 ok 7 - authors-prog imported user without email
 
 expecting success: 
@@ -324779,8 +325040,8 @@
 Committing transaction...
 Committed revision 8.
 W: +empty_dir: hh
-r8 = 4f48ff9bfb6c1c51433fecb51b29565f314922d3 (refs/remotes/git-svn)
-author hh <hh@aa4db3ca-f780-4133-be82-5e0bca296cfb> 1638508242 +0000
+r8 = afb7535fcd8e6439efd15511adb76520f34c8a5b (refs/remotes/git-svn)
+author hh <hh@b28ec7e6-93e8-44e1-865c-48b80c814026> 1672919453 +0000
 ok 8 - imported without authors-prog and authors-file
 
 expecting success: 
@@ -324796,81 +325057,14 @@
 Committing transaction...
 Committed revision 9.
 W: +empty_dir: bad
-r9 = bb2bba78570cffaa9811cef75e117aea0f6d2615 (refs/remotes/git-svn)
-author xyz; touch evil <xyz; touch evil@example.com> 1638508244 +0000
+r9 = 9874e65274d9540e6519c7b391cf2fc65219e1da (refs/remotes/git-svn)
+author xyz; touch evil <xyz; touch evil@example.com> 1672919456 +0000
 ok 9 - authors-prog handled special characters in username
 
 # passed all 9 test(s)
 1..9
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t9143-git-svn-gc.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9143-git-svn-gc/.git/
-expecting success: 
-	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: svn_cmd co "$svnrepo" test_wc
-A    test_wc/test.txt
-Checked out revision 1.
-ok 2 - checkout working copy from svn
-
-expecting success: 
-	(
-		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: git svn init "$svnrepo"
-ok 4 - Setup repo
-
-expecting success: git svn fetch
-	A	test.txt
-r1 = ae3f54e3983f921b42fec4f66c21e48843d3a8d2 (refs/remotes/git-svn)
-	M	test.txt
-r2 = 985ed453633bad8b2a5c13f47f80e2b186825a39 (refs/remotes/git-svn)
-Checked out HEAD:
-  file:///build/git-2.20.1/t/trash%20directory.t9143-git-svn-gc/svnrepo r2
-ok 5 - Fetch repo
-
-expecting success: 
-	 cp .git/svn/refs/remotes/git-svn/unhandled.log tmp
-	
-ok 6 - make backup copy of unhandled.log
-
-expecting success: > .git/svn/refs/remotes/git-svn/index
-ok 7 - create leftover index
-
-expecting success: git svn gc
-ok 8 - git svn gc runs
-
-expecting success: ! test -f .git/svn/refs/remotes/git-svn/index
-ok 9 - git svn index removed
-
-expecting success: 
-		 gunzip .git/svn/refs/remotes/git-svn/unhandled.log.gz
-		
-ok 10 - git svn gc produces a valid gzip file
-
-expecting success: 
-	 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/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
 *** t9130-git-svn-authors-file.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9130-git-svn-authors-file/.git/
 expecting success: 
@@ -324894,9 +325088,9 @@
 	
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9130-git-svn-authors-file/x/.git/
 W: +empty_dir: aa
-r1 = 37a7bb94ca20f74a8c2e7a674799dd3e24e1d62a (refs/remotes/git-svn)
+r1 = df1558747bdbe2e6cfa8711bbe51eab04854e9e4 (refs/remotes/git-svn)
 W: +empty_dir: bb
-r2 = f0dafa9b66de5740316d06ab63945f7633306581 (refs/remotes/git-svn)
+r2 = c5414a9eda83550148fcfe0f9308977c5c9a1c83 (refs/remotes/git-svn)
 W: +empty_dir: cc
 Author: cc not defined in svn-authors file
 
@@ -324913,8 +325107,8 @@
 		grep "^author AAAAAAA AAAAAAA <aa@example\.com> " actual
 	)
 	
-author BBBBBBB BBBBBBB <bb@example.com> 1638508227 +0000
-author AAAAAAA AAAAAAA <aa@example.com> 1638508227 +0000
+author BBBBBBB BBBBBBB <bb@example.com> 1672919437 +0000
+author AAAAAAA AAAAAAA <aa@example.com> 1672919437 +0000
 ok 3 - imported 2 revisions successfully
 
 expecting success: 
@@ -324930,17 +325124,17 @@
 	)
 	
 W: +empty_dir: cc
-r3 = d208cdea3c96a9eefed67d15dcaf54abacb7b757 (refs/remotes/git-svn)
+r3 = 7ac26005ba601e998b1eef2d298cbedcf920377b (refs/remotes/git-svn)
 W: +empty_dir: dd
-r4 = a2168c861886a9d892d73843377d44bbce186ab3 (refs/remotes/git-svn)
+r4 = a1f6154ae1c444d2b54633bbb7167c2b932f4d69 (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/git-2.20.1/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> 1638508227 +0000
-author CCCCCCC CCCCCCC <cc@example.com> 1638508227 +0000
+author DDDDDDD DDDDDDD <dd@example.com> 1672919437 +0000
+author CCCCCCC CCCCCCC <cc@example.com> 1672919437 +0000
 ok 4 - continues to import once authors have been added
 
 expecting success: 
@@ -324957,7 +325151,7 @@
 Committed revision 5.
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9130-git-svn-authors-file/aa-work/.git/
 Using higher level of URL: file:///build/git-2.20.1/t/trash%20directory.t9130-git-svn-authors-file/svnrepo/aa => file:///build/git-2.20.1/t/trash%20directory.t9130-git-svn-authors-file/svnrepo
-r5 = c7a65993d93056373fed4cee7a0ad3f2a6cc92b7 (refs/remotes/origin/trunk)
+r5 = bd4e9b0b08112072aa904210d71753fbf0f1d0fd (refs/remotes/origin/trunk)
 Checked out HEAD:
   file:///build/git-2.20.1/t/trash%20directory.t9130-git-svn-authors-file/svnrepo/aa/trunk r5
 Committing transaction...
@@ -324971,7 +325165,7 @@
 expecting success: 
 	( cd aa-work && test_must_fail git svn fetch --authors-file=../svn-authors )
 	
-r6 = 150bcaee73facafbce30ec649966876c4e966259 (refs/remotes/origin/bb)
+r6 = 2a52ccd6accc1162adba9035db3d6ec3aed80155 (refs/remotes/origin/bb)
 Author: ee not defined in ../svn-authors file
 
 ok 6 - fetch fails on ee
@@ -324993,8 +325187,8 @@
 		test 8 -eq "$(tmp_config_get svn-remote.svn.tags-maxRev)"
 	)
 	
-r7 = c00db54bde20e72c1f62c085cd16b1cf5d01110f (refs/remotes/origin/ee)
-r8 = 592f678d79380e8f8db1263c4278cda49bb6a60e (refs/remotes/origin/cc)
+r7 = f3cd2ae09fae4b950f2c85067b4fd5d9f5aea67d (refs/remotes/origin/ee)
+r8 = 3eab81a6260d62b9926f49bd991b082ba83f2fb4 (refs/remotes/origin/cc)
 ok 8 - fetch continues after authors-file is fixed
 
 expecting success: 
@@ -325017,23 +325211,23 @@
 
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9130-git-svn-authors-file/gitconfig.clone/.git/
 W: +empty_dir: aa
-r1 = 37a7bb94ca20f74a8c2e7a674799dd3e24e1d62a (refs/remotes/git-svn)
+r1 = df1558747bdbe2e6cfa8711bbe51eab04854e9e4 (refs/remotes/git-svn)
 W: +empty_dir: bb
-r2 = f0dafa9b66de5740316d06ab63945f7633306581 (refs/remotes/git-svn)
+r2 = c5414a9eda83550148fcfe0f9308977c5c9a1c83 (refs/remotes/git-svn)
 W: +empty_dir: cc
-r3 = d208cdea3c96a9eefed67d15dcaf54abacb7b757 (refs/remotes/git-svn)
+r3 = 7ac26005ba601e998b1eef2d298cbedcf920377b (refs/remotes/git-svn)
 W: +empty_dir: dd
-r4 = a2168c861886a9d892d73843377d44bbce186ab3 (refs/remotes/git-svn)
+r4 = a1f6154ae1c444d2b54633bbb7167c2b932f4d69 (refs/remotes/git-svn)
 W: +empty_dir: aa/branches
 W: +empty_dir: aa/tags
 W: +empty_dir: aa/trunk
-r5 = 0ebd9512a6ccd80986d1b490666f22e7a7055db9 (refs/remotes/git-svn)
+r5 = 920cf96b54498754dd2c43498eee753cbb220466 (refs/remotes/git-svn)
 W: +empty_dir: aa/branches/bb
-r6 = dcdc2e27882456d8b0322f5c9bf7096c36e36c38 (refs/remotes/git-svn)
+r6 = ac437164e38b231b7497d6a526e6db447ceb6569 (refs/remotes/git-svn)
 W: +empty_dir: aa/branches/ee
-r7 = dcd9d339950307d20c5421fc510d120206176fdd (refs/remotes/git-svn)
+r7 = f6cf7fed0683030415bb984b276810f75a06b4df (refs/remotes/git-svn)
 W: +empty_dir: aa/branches/cc
-r8 = 858495ae0c3ec46459a0430a683213c4962e832b (refs/remotes/git-svn)
+r8 = e6054e403fda4da6cfe30d589bbf3ecbd99c9856 (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/git-2.20.1/t/trash%20directory.t9130-git-svn-authors-file/svnrepo r8
 creating empty directory: aa
@@ -325059,55 +325253,79 @@
 	
 Committing transaction...
 Committed revision 9.
-r9 = 5200df49035abef358003cf6d8c12a4fa311d027 (refs/remotes/origin/ff)
-author FFFFFFF FFFFFFF <> 1638508245 +0000
+r9 = 2d382b7e2ea565eb4fa4c676d78b2f5410ff374e (refs/remotes/origin/ff)
+author FFFFFFF FFFFFFF <> 1672919455 +0000
 ok 10 - authors-file imported user without email
 
 # passed all 10 test(s)
 1..10
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t9145-git-svn-master-branch.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9145-git-svn-master-branch/.git/
+*** t9143-git-svn-gc.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9143-git-svn-gc/.git/
 expecting success: 
-	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"
+	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
 
-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: svn_cmd co "$svnrepo" test_wc
+A    test_wc/test.txt
+Checked out revision 1.
+ok 2 - checkout working copy from svn
 
 expecting success: 
-	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/master^0)
+		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
 
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9145-git-svn-master-branch/g/.git/
-	A	a
-r1 = 4894b7e2fb395ec0bcab0811f4d7997839d6758f (refs/remotes/origin/trunk)
-	A	a
-r2 = 443eb8d5cdb1b59b3828094b02b33a76d00c40cc (refs/remotes/origin/a)
-	A	a
-r3 = 398b62a015e84f1057847bce802b868265dfbec0 (refs/remotes/origin/b)
+expecting success: git svn init "$svnrepo"
+ok 4 - Setup repo
+
+expecting success: git svn fetch
+	A	test.txt
+r1 = faea1cca2cda2d48af0fc8f865e360ebfdd4cb84 (refs/remotes/git-svn)
+	M	test.txt
+r2 = bf0cc6184a4217cd2693fd75955b00a8f1d5c040 (refs/remotes/git-svn)
 Checked out HEAD:
-  file:///build/git-2.20.1/t/trash%20directory.t9145-git-svn-master-branch/svnrepo/trunk r1
-ok 2 - git svn clone --stdlayout sets up trunk as master
+  file:///build/git-2.20.1/t/trash%20directory.t9143-git-svn-gc/svnrepo r2
+ok 5 - Fetch repo
 
-# passed all 2 test(s)
-1..2
+expecting success: 
+	 cp .git/svn/refs/remotes/git-svn/unhandled.log tmp
+	
+ok 6 - make backup copy of unhandled.log
+
+expecting success: > .git/svn/refs/remotes/git-svn/index
+ok 7 - create leftover index
+
+expecting success: git svn gc
+ok 8 - git svn gc runs
+
+expecting success: ! test -f .git/svn/refs/remotes/git-svn/index
+ok 9 - git svn index removed
+
+expecting success: 
+		 gunzip .git/svn/refs/remotes/git-svn/unhandled.log.gz
+		
+ok 10 - git svn gc produces a valid gzip file
+
+expecting success: 
+	 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/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
 *** t9139-git-svn-non-utf8-commitencoding.sh ***
@@ -325120,7 +325338,7 @@
 Committing transaction...
 Committed revision 1.
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9139-git-svn-non-utf8-commitencoding/ISO8859-1/.git/
-r1 = 4251a4627398b66017057368b6919c2b7b452480 (refs/remotes/git-svn)
+r1 = 6f5bdbc0784abc70af1cac9a393c9265120b2f6f (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/git-2.20.1/t/trash%20directory.t9139-git-svn-non-utf8-commitencoding/svnrepo/ISO8859-1 r1
 ok 1 - ISO8859-1 setup
@@ -325133,7 +325351,7 @@
 Committing transaction...
 Committed revision 2.
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9139-git-svn-non-utf8-commitencoding/eucJP/.git/
-r2 = b10283e51a532c85ba36b4ccad6f4f481901503f (refs/remotes/git-svn)
+r2 = a300224c8da10fb2753aba5763079a2da4be891c (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/git-2.20.1/t/trash%20directory.t9139-git-svn-non-utf8-commitencoding/svnrepo/eucJP r2
 ok 2 - eucJP setup
@@ -325151,7 +325369,7 @@
 	)
 	
 Switched to a new branch 't'
-[t 8082eba] ÄËÑÏÖ
+[t 0d0f236] ÄËÑÏÖ
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 F
@@ -325170,7 +325388,7 @@
 	)
 	
 Switched to a new branch 't'
-[t fc41fda] ¤Ï¤ì¤Ò¤Û¤Õ
+[t 415ceef] ¤Ï¤ì¤Ò¤Û¤Õ
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 F
@@ -325213,56 +325431,44 @@
 1..6
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t9144-git-svn-old-rev_map.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9144-git-svn-old-rev_map/.git/
+*** t9145-git-svn-master-branch.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9145-git-svn-master-branch/.git/
 expecting success: 
 	mkdir i &&
-	(cd i && > a) &&
-	svn_cmd import -m- i "$svnrepo" &&
-	git svn init "$svnrepo" &&
-	git svn fetch &&
-	test -d .git/svn/refs/remotes/git-svn/ &&
-	! test -e .git/svn/git-svn/ &&
-	mv .git/svn/refs/remotes/git-svn .git/svn/ &&
-	rm -r .git/svn/refs
+	> 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.
-	A	a
-r1 = 56c5adf0390541ca16bf154d74904d8e67abdd77 (refs/remotes/git-svn)
-Checked out HEAD:
-  file:///build/git-2.20.1/t/trash%20directory.t9144-git-svn-old-rev_map/svnrepo r1
-ok 1 - setup test repository with old layout
-
-expecting success: 
-	svn_cmd import -m- i "$svnrepo/b" &&
-	git svn rebase &&
-	echo a >> b/a &&
-	git add b/a &&
-	git commit -m- -a &&
-	git svn dcommit &&
-	! test -d .git/svn/refs/ &&
-	test -e .git/svn/git-svn/
-
 Adding         i/a
 Committing transaction...
 Committed revision 2.
-	A	b/a
-r2 = 51031cf4b4c4a0a62dbb980c080d1b6351258f76 (refs/remotes/git-svn)
-First, rewinding head to replay your work on top of it...
-Fast-forwarded master to refs/remotes/git-svn.
-[master 42bd87a] -
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Committing to file:///build/git-2.20.1/t/trash%20directory.t9144-git-svn-old-rev_map/svnrepo ...
-	M	b/a
-Committed r3
-	M	b/a
-r3 = c18fdd804deddf915f94bbe7754d4f448aabb779 (refs/remotes/git-svn)
-No changes between 42bd87ac625c76857d3cbea6686af7edaa50acaa 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 3.
+ok 1 - setup test repository
+
+expecting success: 
+	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/master^0)
+	)
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9145-git-svn-master-branch/g/.git/
+	A	a
+r1 = e369bbd416e10090016734714682b5711301cac4 (refs/remotes/origin/trunk)
+	A	a
+r2 = eacb0b30d10c07e3edadf8174161ce560b6c37cd (refs/remotes/origin/a)
+	A	a
+r3 = 5d15a484291f8093fcc459cd0bfc5c35317c3bf2 (refs/remotes/origin/b)
+Checked out HEAD:
+  file:///build/git-2.20.1/t/trash%20directory.t9145-git-svn-master-branch/svnrepo/trunk r1
+ok 2 - git svn clone --stdlayout sets up trunk as master
 
 # passed all 2 test(s)
 1..2
@@ -325316,8 +325522,8 @@
 
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9134-git-svn-ignore-paths/g/.git/
 	A	qqq/test_qqq.txt
-r1 = 924e8e5704b726f3d87ec82fa2031293af388f52 (refs/remotes/git-svn)
-r2 = 0b416d92dfcc3ed2b57caa31d1539e37a6499042 (refs/remotes/git-svn)
+r1 = 262bec0623c3875ee8185a63d906dab731c7cd82 (refs/remotes/git-svn)
+r2 = 7edff8c4201aed91dcdf64f69daddb893727777b (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/git-2.20.1/t/trash%20directory.t9134-git-svn-ignore-paths/svnrepo r2
 ok 2 - clone an SVN repository with ignored www directory
@@ -325332,8 +325538,8 @@
 
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9134-git-svn-ignore-paths/c/.git/
 	A	qqq/test_qqq.txt
-r1 = 924e8e5704b726f3d87ec82fa2031293af388f52 (refs/remotes/git-svn)
-r2 = 0b416d92dfcc3ed2b57caa31d1539e37a6499042 (refs/remotes/git-svn)
+r1 = 262bec0623c3875ee8185a63d906dab731c7cd82 (refs/remotes/git-svn)
+r2 = 7edff8c4201aed91dcdf64f69daddb893727777b (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/git-2.20.1/t/trash%20directory.t9134-git-svn-ignore-paths/svnrepo r2
 ok 3 - init+fetch an SVN repository with ignored www directory
@@ -325376,7 +325582,7 @@
 	)
 
 	M	qqq/test_qqq.txt
-r3 = 3e7f03186cc32a232cf180d194f52c09cc8fe626 (refs/remotes/git-svn)
+r3 = 8bdc29635f1bfd4fa10be0c7391dccbf4d23aefc (refs/remotes/git-svn)
 First, rewinding head to replay your work on top of it...
 Fast-forwarded master to refs/remotes/git-svn.
 ok 6 - update git svn-cloned repo (config ignore)
@@ -325392,7 +325598,7 @@
 	)
 
 	M	qqq/test_qqq.txt
-r3 = 3e7f03186cc32a232cf180d194f52c09cc8fe626 (refs/remotes/git-svn)
+r3 = 8bdc29635f1bfd4fa10be0c7391dccbf4d23aefc (refs/remotes/git-svn)
 First, rewinding head to replay your work on top of it...
 Fast-forwarded master to refs/remotes/git-svn.
 ok 7 - update git svn-cloned repo (option ignore)
@@ -325425,7 +325631,7 @@
 		rm expect expect2
 	)
 
-r4 = fb561244edef7aa47f5e6a2df4ae8f43b4c9ff33 (refs/remotes/git-svn)
+r4 = 39be956bfbeded73f4d2c88c46d880c072adf873 (refs/remotes/git-svn)
 First, rewinding head to replay your work on top of it...
 Fast-forwarded master to refs/remotes/git-svn.
 ok 9 - update git svn-cloned repo (config ignore)
@@ -325440,7 +325646,7 @@
 		rm expect expect2
 	)
 
-r4 = fb561244edef7aa47f5e6a2df4ae8f43b4c9ff33 (refs/remotes/git-svn)
+r4 = 39be956bfbeded73f4d2c88c46d880c072adf873 (refs/remotes/git-svn)
 First, rewinding head to replay your work on top of it...
 Fast-forwarded master to refs/remotes/git-svn.
 ok 10 - update git svn-cloned repo (option ignore)
@@ -325476,7 +325682,7 @@
 	)
 
 	M	qqq/test_qqq.txt
-r5 = ccc8a946e3e918a26fa139e4ea2dd1c10fee940f (refs/remotes/git-svn)
+r5 = 2309845f2d6717d80d795e911f2e930d9ccb2854 (refs/remotes/git-svn)
 First, rewinding head to replay your work on top of it...
 Fast-forwarded master to refs/remotes/git-svn.
 ok 12 - update git svn-cloned repo again (config ignore)
@@ -325492,7 +325698,7 @@
 	)
 
 	M	qqq/test_qqq.txt
-r5 = ccc8a946e3e918a26fa139e4ea2dd1c10fee940f (refs/remotes/git-svn)
+r5 = 2309845f2d6717d80d795e911f2e930d9ccb2854 (refs/remotes/git-svn)
 First, rewinding head to replay your work on top of it...
 Fast-forwarded master to refs/remotes/git-svn.
 ok 13 - update git svn-cloned repo again (option ignore)
@@ -325554,32 +325760,32 @@
 Committing transaction...
 Committed revision 1.
 	A	README
-r1 = 9d649c54d75e19d164c511674e05c3437166a1b6 (refs/remotes/origin/tags/0.3)
+r1 = 9dd445db684724b364806986b430a39dacae41d9 (refs/remotes/origin/tags/0.2)
 	A	README
-r1 = c90a0a2c24cb6703a763d4efe39e605b68e2a4d5 (refs/remotes/origin/tags/0.1)
+r1 = de46138ccc8207b0d83a958010cec630376d3083 (refs/remotes/origin/tags/0.3)
 	A	README
-r1 = d3c15da943e5f9ab26dcf535b8724297767b908b (refs/remotes/origin/tags/0.2)
+r1 = e371a2302731e16994b0d67e3560bbe8222e9911 (refs/remotes/origin/tags/0.1)
 	A	README
-r1 = a71b7089192ee027b64e91f0fd99ec2364b3015d (refs/remotes/origin/a)
+r1 = 4d6c074fb589a1abe7316aed9fe1c5be4553f9ae (refs/remotes/origin/a)
 	A	README
-r1 = 98b7a5290df7b2231295c417944d66fd5c273a1c (refs/remotes/origin/b)
+r1 = 8f218487f1eb4abb6925c574ac4b1caedc465ae3 (refs/remotes/origin/b)
 	A	README
-r1 = 0f7c370089d40efb0f7460ce944cdbd1fba71357 (refs/remotes/origin/trunk)
+r1 = 56ef4cde07ea2c04ff6ed09120b7a803b8ea7580 (refs/remotes/origin/trunk)
 Checked out HEAD:
   file:///build/git-2.20.1/t/trash%20directory.t9116-git-svn-log/svnrepo/trunk r1
-HEAD is now at 0f7c370 test
-[master b804b44] bye
+HEAD is now at 56ef4cd test
+[master ee21126] bye
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 Committing to file:///build/git-2.20.1/t/trash%20directory.t9116-git-svn-log/svnrepo/trunk ...
 	M	README
 Committed r2
 	M	README
-r2 = 09c2570bc3716bf97207fb932ade98adc297e026 (refs/remotes/origin/trunk)
-No changes between b804b446e219ff32e4e51462b913428f07c4dc5b and refs/remotes/origin/trunk
+r2 = f4de31adc5e69f78187082800600f6e336dc146c (refs/remotes/origin/trunk)
+No changes between ee21126c932d250d5985eb51958e3c21f5d9dd10 and refs/remotes/origin/trunk
 Resetting to the latest refs/remotes/origin/trunk
-HEAD is now at a71b708 test
-[master 50ebfe9] feedme
+HEAD is now at 4d6c074 test
+[master bad8f04] feedme
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 FEEDME
@@ -325587,37 +325793,37 @@
 	A	FEEDME
 Committed r3
 	A	FEEDME
-r3 = 4d752c6b419f90569f16db7073b0d7c212a7a3a9 (refs/remotes/origin/a)
-No changes between 50ebfe991e7913790db5235021b0e092e9dd019a and refs/remotes/origin/a
+r3 = 341bd144b956ca5e8813a55c39c3029a72dde244 (refs/remotes/origin/a)
+No changes between bad8f0476f9930bb9b3effec4cbea13f4c45fce2 and refs/remotes/origin/a
 Resetting to the latest refs/remotes/origin/a
-HEAD is now at 09c2570 bye
-[master 0e0999a] aye
+HEAD is now at f4de31a bye
+[master 471dde7] aye
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 Committing to file:///build/git-2.20.1/t/trash%20directory.t9116-git-svn-log/svnrepo/trunk ...
 	M	README
 Committed r4
 	M	README
-r4 = 38b1b05adc7740bbe013d66e094520c496147429 (refs/remotes/origin/trunk)
-No changes between 0e0999a9058ec2c79e89eb91bdfadceb57760673 and refs/remotes/origin/trunk
+r4 = 21802ebc52fa4aeefb205acce86deccabea123ad (refs/remotes/origin/trunk)
+No changes between 471dde7173b190af7f9c3c992ca84e88ca8fa0bd and refs/remotes/origin/trunk
 Resetting to the latest refs/remotes/origin/trunk
-HEAD is now at 98b7a52 test
-[master e6cf588] spy
+HEAD is now at 8f21848 test
+[master 99bad09] spy
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[master cfe71da] try
+[master 446bbe1] try
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 Committing to file:///build/git-2.20.1/t/trash%20directory.t9116-git-svn-log/svnrepo/branches/b ...
 	M	README
 Committed r5
 	M	README
-r5 = 897db1b5aeed1ce42adbd9366470c5e9be81d7da (refs/remotes/origin/b)
+r5 = 864ffd1b380d3cd3edfba3590a8de526f415ee50 (refs/remotes/origin/b)
 	M	README
 Committed r6
 	M	README
-r6 = 5c7700098edfc028e02b6f17e8e44db5efd188f9 (refs/remotes/origin/b)
-No changes between cfe71da78cda4f11836e2aa37ae20b7b31dcc962 and refs/remotes/origin/b
+r6 = 48509769004118542d9c355bbddba07b4391f306 (refs/remotes/origin/b)
+No changes between 446bbe14630da3436fd506efb6cff6e72b854772 and refs/remotes/origin/b
 Resetting to the latest refs/remotes/origin/b
 ok 1 - setup repository and import
 
@@ -325627,32 +325833,32 @@
 	git svn log -r4 origin/trunk | grep ^r4 &&
 	git svn log -r3 | grep ^r3
 	
-HEAD is now at 4d752c6 feedme
-r2 | pbuilder1 | 2021-12-03 05:10:22 +0000 (Fri, 03 Dec 2021) | 2 lines
-r4 | pbuilder1 | 2021-12-03 05:10:25 +0000 (Fri, 03 Dec 2021) | 2 lines
-r3 | pbuilder1 | 2021-12-03 05:10:24 +0000 (Fri, 03 Dec 2021) | 2 lines
+HEAD is now at 341bd14 feedme
+r2 | pbuilder2 | 2023-01-05 11:50:29 +0000 (Thu, 05 Jan 2023) | 2 lines
+r4 | pbuilder2 | 2023-01-05 11:50:33 +0000 (Thu, 05 Jan 2023) | 2 lines
+r3 | pbuilder2 | 2023-01-05 11:50:31 +0000 (Thu, 05 Jan 2023) | 2 lines
 ok 2 - run log
 
 expecting success: 
 	git reset --hard origin/trunk &&
 	git svn log -r3 origin/a | grep ^r3
 	
-HEAD is now at 38b1b05 aye
-r3 | pbuilder1 | 2021-12-03 05:10:24 +0000 (Fri, 03 Dec 2021) | 2 lines
+HEAD is now at 21802eb aye
+r3 | pbuilder2 | 2023-01-05 11:50:31 +0000 (Thu, 05 Jan 2023) | 2 lines
 ok 3 - run log against a from trunk
 
 expecting success: 
 	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 38b1b05 aye
+HEAD is now at 21802eb aye
 ok 4 - test ascending revision range
 
 expecting success: 
 	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 38b1b05 aye
+HEAD is now at 21802eb aye
 ok 5 - test ascending revision range with --show-commit
 
 expecting success: 
@@ -325664,206 +325870,172 @@
 	git rev-parse $(cat out) >actual &&
 	test_cmp expected-range-r1-r2-r4-sha1 actual
 	
-HEAD is now at 38b1b05 aye
+HEAD is now at 21802eb aye
 ok 6 - test ascending revision range with --show-commit (sha1)
 
 expecting success: 
 	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 38b1b05 aye
+HEAD is now at 21802eb aye
 ok 7 - test descending revision range
 
 expecting success: 
 	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 38b1b05 aye
+HEAD is now at 21802eb aye
 ok 8 - test ascending revision range with unreachable revision
 
 expecting success: 
 	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 38b1b05 aye
+HEAD is now at 21802eb aye
 ok 9 - test descending revision range with unreachable revision
 
 expecting success: 
 	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 38b1b05 aye
+HEAD is now at 21802eb aye
 ok 10 - test ascending revision range with unreachable upper boundary revision and 1 commit
 
 expecting success: 
 	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 38b1b05 aye
+HEAD is now at 21802eb aye
 ok 11 - test descending revision range with unreachable upper boundary revision and 1 commit
 
 expecting success: 
 	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 38b1b05 aye
+HEAD is now at 21802eb aye
 ok 12 - test ascending revision range with unreachable lower boundary revision and 1 commit
 
 expecting success: 
 	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 38b1b05 aye
+HEAD is now at 21802eb aye
 ok 13 - test descending revision range with unreachable lower boundary revision and 1 commit
 
 expecting success: 
 	git reset --hard origin/trunk &&
 	git svn log -r 5:6 | test_cmp expected-separator -
 	
-HEAD is now at 38b1b05 aye
+HEAD is now at 21802eb aye
 ok 14 - test ascending revision range with unreachable boundary revisions and no commits
 
 expecting success: 
 	git reset --hard origin/trunk &&
 	git svn log -r 6:5 | test_cmp expected-separator -
 	
-HEAD is now at 38b1b05 aye
+HEAD is now at 21802eb aye
 ok 15 - test descending revision range with unreachable boundary revisions and no commits
 
 expecting success: 
 	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 38b1b05 aye
+HEAD is now at 21802eb aye
 ok 16 - test ascending revision range with unreachable boundary revisions and 1 commit
 
 expecting success: 
 	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 38b1b05 aye
+HEAD is now at 21802eb 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/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t9140-git-svn-reset.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9140-git-svn-reset/.git/
+*** t9144-git-svn-old-rev_map.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9144-git-svn-old-rev_map/.git/
 expecting success: 
-	svn_cmd co "$svnrepo" s &&
-	(
-		cd s &&
-		mkdir vis &&
-		echo always visible > vis/vis.txt &&
-		svn_cmd add vis &&
-		svn_cmd commit -m "create visible files" &&
-		mkdir hid &&
-		echo initially hidden > hid/hid.txt &&
-		svn_cmd add hid &&
-		svn_cmd commit -m "create initially hidden files" &&
-		svn_cmd up &&
-		echo mod >> vis/vis.txt &&
-		svn_cmd commit -m "modify vis" &&
-		svn_cmd up
-	)
+	mkdir i &&
+	(cd i && > a) &&
+	svn_cmd import -m- i "$svnrepo" &&
+	git svn init "$svnrepo" &&
+	git svn fetch &&
+	test -d .git/svn/refs/remotes/git-svn/ &&
+	! test -e .git/svn/git-svn/ &&
+	mv .git/svn/refs/remotes/git-svn .git/svn/ &&
+	rm -r .git/svn/refs
 
-Checked out revision 0.
-A         vis
-A         vis/vis.txt
-Adding         vis
-Adding         vis/vis.txt
-Transmitting file data .done
+Adding         i/a
 Committing transaction...
 Committed revision 1.
-A         hid
-A         hid/hid.txt
-Adding         hid
-Adding         hid/hid.txt
-Transmitting file data .done
-Committing transaction...
-Committed revision 2.
-Updating '.':
-At revision 2.
-Sending        vis/vis.txt
-Transmitting file data .done
-Committing transaction...
-Committed revision 3.
-Updating '.':
-At revision 3.
-ok 1 - setup test repository
-
-expecting success: 
-	git svn init "$svnrepo" g &&
-	( cd g && git svn fetch --ignore-paths="^hid" )
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9140-git-svn-reset/g/.git/
-	A	vis/vis.txt
-r1 = d809c1a839a966fb970761e80670f67c52ffe06a (refs/remotes/git-svn)
-r2 = dacae016dcf83a26f6c0cbe1c8542768e6420435 (refs/remotes/git-svn)
-	M	vis/vis.txt
-r3 = d3745a7d4927044e5b5c78a0a33f570c174a92d7 (refs/remotes/git-svn)
+	A	a
+r1 = 3022accbf232fdfaba786413e375343bab0fae8e (refs/remotes/git-svn)
 Checked out HEAD:
-  file:///build/git-2.20.1/t/trash%20directory.t9140-git-svn-reset/svnrepo r3
-ok 2 - clone SVN repository with hidden directory
+  file:///build/git-2.20.1/t/trash%20directory.t9144-git-svn-old-rev_map/svnrepo r1
+ok 1 - setup test repository with old layout
 
 expecting success: 
-	( cd s &&
-	  echo mod hidden >> hid/hid.txt &&
-	  svn_cmd commit -m "modify hid" &&
-	  svn_cmd up
-	)
+	svn_cmd import -m- i "$svnrepo/b" &&
+	git svn rebase &&
+	echo a >> b/a &&
+	git add b/a &&
+	git commit -m- -a &&
+	git svn dcommit &&
+	! test -d .git/svn/refs/ &&
+	test -e .git/svn/git-svn/
 
-Sending        hid/hid.txt
-Transmitting file data .done
+Adding         i/a
 Committing transaction...
-Committed revision 4.
-Updating '.':
-At revision 4.
-ok 3 - modify hidden file in SVN repo
-
-expecting success: 
-	( cd g &&
-	  git svn find-rev refs/remotes/git-svn > ../expect &&
-	  test_must_fail git svn fetch 2> ../errors &&
-	  git svn find-rev refs/remotes/git-svn > ../expect2 ) &&
-	fgrep "not found in commit" errors &&
-	test_cmp expect expect2
-
-hid/hid.txt was not found in commit d3745a7d4927044e5b5c78a0a33f570c174a92d7 (r3)
-ok 4 - fetch fails on modified hidden file
+Committed revision 2.
+	A	b/a
+r2 = 49c2a17b2219ce2bd6a645a614aa46de0d010520 (refs/remotes/git-svn)
+First, rewinding head to replay your work on top of it...
+Fast-forwarded master to refs/remotes/git-svn.
+[master 1e281d1] -
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Committing to file:///build/git-2.20.1/t/trash%20directory.t9144-git-svn-old-rev_map/svnrepo ...
+	M	b/a
+Committed r3
+	M	b/a
+r3 = 557900776244648d9f85fda7f40dbbab9b6af1fd (refs/remotes/git-svn)
+No changes between 1e281d117ac9b80c63b925245e7a9b4b11846cda 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/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t9153-git-svn-rewrite-uuid.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9153-git-svn-rewrite-uuid/.git/
 expecting success: 
-	( cd g &&
-	  git svn reset -r1 &&
-	  git svn find-rev refs/remotes/git-svn > ../expect2 ) &&
-	echo 1 >expect &&
-	test_cmp expect expect2
-
-r1 = d809c1a839a966fb970761e80670f67c52ffe06a (refs/remotes/git-svn)
-ok 5 - reset unwinds back to r1
+	svnadmin load -q '/build/git-2.20.1/t/trash directory.t9153-git-svn-rewrite-uuid/svnrepo' < '/build/git-2.20.1/t/t9153/svn.dump' &&
+	git svn init --minimize-url --rewrite-uuid='6cc8ada4-5932-4b4a-8242-3534ed8a3232' 'file:///build/git-2.20.1/t/trash directory.t9153-git-svn-rewrite-uuid/svnrepo' &&
+	git svn fetch
+	
+	A	foo
+r1 = a2376dec3d8e3656a95f9ab3e1c9c8b9fa3dea09 (refs/remotes/git-svn)
+	M	foo
+r2 = d0fdbc70c19b714ac36d437b78eaca386b764320 (refs/remotes/git-svn)
+Checked out HEAD:
+  file:///build/git-2.20.1/t/trash%20directory.t9153-git-svn-rewrite-uuid/svnrepo r2
+ok 1 - load svn repo
 
 expecting success: 
-	( cd g &&
-	  git svn fetch &&
-	  git svn rebase &&
-	  fgrep "mod hidden" hid/hid.txt
-	)
-
-Index mismatch: a4b5c203f79112e92d530cb82366ca4d706fa4a8 != 6b5a1244749c8cdb5442eefd0abc3689d666322d
-rereading d809c1a839a966fb970761e80670f67c52ffe06a
-	A	hid/hid.txt
-r2 = 25f5f61a3b3bc45db9ed635c1c55bf238e70f5df (refs/remotes/git-svn)
-	M	vis/vis.txt
-r3 = d1171b2f6e8eccb47ffd33efbeeae4c441f328a9 (refs/remotes/git-svn)
-	M	hid/hid.txt
-r4 = 102cce7b7c90c7a32b9e9077c3e4d1527872504b (refs/remotes/git-svn)
-First, rewinding head to replay your work on top of it...
-mod hidden
-ok 6 - refetch succeeds not ignoring any files
+	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/git-2.20.1/t/trash%20directory.t9153-git-svn-rewrite-uuid/svnrepo@2 6cc8ada4-5932-4b4a-8242-3534ed8a3232
+git-svn-id: file:///build/git-2.20.1/t/trash%20directory.t9153-git-svn-rewrite-uuid/svnrepo@1 6cc8ada4-5932-4b4a-8242-3534ed8a3232
+ok 2 - verify uuid
 
-# passed all 6 test(s)
-1..6
+# passed all 2 test(s)
+1..2
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
 *** t9150-svk-mergetickets.sh ***
@@ -325930,19 +326102,19 @@
 expecting success: git svn clone "$svnrepo" cloned
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9152-svn-empty-dirs-after-gc/cloned/.git/
 W: +empty_dir: a
-r1 = 9efc6963b2965c6cf9bead7d200f01da4ed8de3b (refs/remotes/git-svn)
+r1 = 8f5b3379360d7d26db14dbd1bac83c2df8bfd7cd (refs/remotes/git-svn)
 W: +empty_dir: b
-r2 = aaff6b47d5a8c4d9d6791bf05880df8b4534c38f (refs/remotes/git-svn)
+r2 = 73f1df1dc2d0e9d64d48f3e3fb9ce6319a4af7d6 (refs/remotes/git-svn)
 W: +empty_dir: c
-r3 = 1c5d79c5fe5a0d6fc1fa8179406864e4e3e4f19f (refs/remotes/git-svn)
+r3 = 90fe4de620a321baec262a9589a88b9174620f35 (refs/remotes/git-svn)
 W: +empty_dir: d
-r4 = fdb2edc8c3afaf8a15fc7b8b27a376eeb924aaea (refs/remotes/git-svn)
+r4 = 93d9becfd4813d4815a8f64beb6f911e69071c00 (refs/remotes/git-svn)
 W: +empty_dir: d/e
-r5 = 8027f40ea9c33d1b53e983dbd6548a5825a1e67b (refs/remotes/git-svn)
+r5 = 9a3800f88f6c43f03ec3817691a89150c759a92b (refs/remotes/git-svn)
 W: +empty_dir: d/e/f
-r6 = 4328cf4a88ce9a0b4768f0d34b3649f4843f9ce0 (refs/remotes/git-svn)
+r6 = 74b93e51c732fa6379a3090d20252c448498e7ea (refs/remotes/git-svn)
 W: +empty_dir: weird file name
-r7 = c01eca90d1f00e4a348a7e539ada25500823b383 (refs/remotes/git-svn)
+r7 = 016824894fb021c8a322b89c9e3cc24d1e432fb3 (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/git-2.20.1/t/trash%20directory.t9152-svn-empty-dirs-after-gc/svnrepo r7
 creating empty directory: a
@@ -325990,33 +326162,122 @@
 1..4
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t9153-git-svn-rewrite-uuid.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9153-git-svn-rewrite-uuid/.git/
+*** t9140-git-svn-reset.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9140-git-svn-reset/.git/
 expecting success: 
-	svnadmin load -q '/build/git-2.20.1/t/trash directory.t9153-git-svn-rewrite-uuid/svnrepo' < '/build/git-2.20.1/t/t9153/svn.dump' &&
-	git svn init --minimize-url --rewrite-uuid='6cc8ada4-5932-4b4a-8242-3534ed8a3232' 'file:///build/git-2.20.1/t/trash directory.t9153-git-svn-rewrite-uuid/svnrepo' &&
-	git svn fetch
-	
-	A	foo
-r1 = a2376dec3d8e3656a95f9ab3e1c9c8b9fa3dea09 (refs/remotes/git-svn)
-	M	foo
-r2 = d0fdbc70c19b714ac36d437b78eaca386b764320 (refs/remotes/git-svn)
+	svn_cmd co "$svnrepo" s &&
+	(
+		cd s &&
+		mkdir vis &&
+		echo always visible > vis/vis.txt &&
+		svn_cmd add vis &&
+		svn_cmd commit -m "create visible files" &&
+		mkdir hid &&
+		echo initially hidden > hid/hid.txt &&
+		svn_cmd add hid &&
+		svn_cmd commit -m "create initially hidden files" &&
+		svn_cmd up &&
+		echo mod >> vis/vis.txt &&
+		svn_cmd commit -m "modify vis" &&
+		svn_cmd up
+	)
+
+Checked out revision 0.
+A         vis
+A         vis/vis.txt
+Adding         vis
+Adding         vis/vis.txt
+Transmitting file data .done
+Committing transaction...
+Committed revision 1.
+A         hid
+A         hid/hid.txt
+Adding         hid
+Adding         hid/hid.txt
+Transmitting file data .done
+Committing transaction...
+Committed revision 2.
+Updating '.':
+At revision 2.
+Sending        vis/vis.txt
+Transmitting file data .done
+Committing transaction...
+Committed revision 3.
+Updating '.':
+At revision 3.
+ok 1 - setup test repository
+
+expecting success: 
+	git svn init "$svnrepo" g &&
+	( cd g && git svn fetch --ignore-paths="^hid" )
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9140-git-svn-reset/g/.git/
+	A	vis/vis.txt
+r1 = 3f534eaf274e4dbc9c4ec3dd3028e9b7c7367b13 (refs/remotes/git-svn)
+r2 = 12263626698162f66cf8e8b446c29c51bebaf357 (refs/remotes/git-svn)
+	M	vis/vis.txt
+r3 = 0addf676ed76cd7bc84f03691229b008ae9deb64 (refs/remotes/git-svn)
 Checked out HEAD:
-  file:///build/git-2.20.1/t/trash%20directory.t9153-git-svn-rewrite-uuid/svnrepo r2
-ok 1 - load svn repo
+  file:///build/git-2.20.1/t/trash%20directory.t9140-git-svn-reset/svnrepo r3
+ok 2 - clone SVN repository with hidden directory
 
 expecting success: 
-	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/git-2.20.1/t/trash%20directory.t9153-git-svn-rewrite-uuid/svnrepo@2 6cc8ada4-5932-4b4a-8242-3534ed8a3232
-git-svn-id: file:///build/git-2.20.1/t/trash%20directory.t9153-git-svn-rewrite-uuid/svnrepo@1 6cc8ada4-5932-4b4a-8242-3534ed8a3232
-ok 2 - verify uuid
+	( cd s &&
+	  echo mod hidden >> hid/hid.txt &&
+	  svn_cmd commit -m "modify hid" &&
+	  svn_cmd up
+	)
 
-# passed all 2 test(s)
-1..2
+Sending        hid/hid.txt
+Transmitting file data .done
+Committing transaction...
+Committed revision 4.
+Updating '.':
+At revision 4.
+ok 3 - modify hidden file in SVN repo
+
+expecting success: 
+	( cd g &&
+	  git svn find-rev refs/remotes/git-svn > ../expect &&
+	  test_must_fail git svn fetch 2> ../errors &&
+	  git svn find-rev refs/remotes/git-svn > ../expect2 ) &&
+	fgrep "not found in commit" errors &&
+	test_cmp expect expect2
+
+hid/hid.txt was not found in commit 0addf676ed76cd7bc84f03691229b008ae9deb64 (r3)
+ok 4 - fetch fails on modified hidden file
+
+expecting success: 
+	( cd g &&
+	  git svn reset -r1 &&
+	  git svn find-rev refs/remotes/git-svn > ../expect2 ) &&
+	echo 1 >expect &&
+	test_cmp expect expect2
+
+r1 = 3f534eaf274e4dbc9c4ec3dd3028e9b7c7367b13 (refs/remotes/git-svn)
+ok 5 - reset unwinds back to r1
+
+expecting success: 
+	( cd g &&
+	  git svn fetch &&
+	  git svn rebase &&
+	  fgrep "mod hidden" hid/hid.txt
+	)
+
+Index mismatch: a4b5c203f79112e92d530cb82366ca4d706fa4a8 != 6b5a1244749c8cdb5442eefd0abc3689d666322d
+rereading 3f534eaf274e4dbc9c4ec3dd3028e9b7c7367b13
+	A	hid/hid.txt
+r2 = 54b33cedf1d532a9cc585b64372d862742c2197a (refs/remotes/git-svn)
+	M	vis/vis.txt
+r3 = 1bb649f3fee2635e2addab21978b3e571ed155a4 (refs/remotes/git-svn)
+	M	hid/hid.txt
+r4 = cc438b2d43e487b0514b9d3c358b4742bcdade49 (refs/remotes/git-svn)
+First, rewinding head to replay your work on top of it...
+mod hidden
+ok 6 - refetch succeeds not ignoring any files
+
+# passed all 6 test(s)
+1..6
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
 *** t9100-git-svn-basic.sh ***
@@ -326293,7 +326554,7 @@
 	A	exec.sh
 	A	foo
 	A	foo.link
-r1 = 4bed63e45d5808fe3b861fe84d1adeb4f7db9f8a (refs/remotes/git-svn)
+r1 = 11f4108d96eb0756fd591d65656f07b0b43437a2 (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/git-2.20.1/t/trash%20directory.t9100-git-svn-basic/svnrepo r1
 ok 4 - import an SVN revision into git
@@ -326325,7 +326586,7 @@
 	svn_cmd up "$SVN_TREE" &&
 	test -d "$SVN_TREE"/dir && test ! -d "$SVN_TREE"/dir/a
 Switched to a new branch 'mybranch'
-[mybranch b28b24e] try a deep --rmdir with a commit
+[mybranch f40a251] 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%)
@@ -326342,7 +326603,7 @@
 	A	dir/file
 	A	file
 W: -empty_dir: dir/a
-r2 = 37326f4893651753f7faf059906510baa313d787 (refs/remotes/git-svn)
+r2 = 416f92dba0d793794864cd42433c382ed733dd6c (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
@@ -326356,2665 +326617,811 @@
 	mv dir/file dir/new_file/file &&
 	mv dir/new_file dir/file &&
 	git update-index --remove dir/file &&
-	git update-index --add dir/file/file &&
-	git commit -m 'detect node change from file to directory #1' &&
-	test_must_fail git svn set-tree --find-copies-harder --rmdir 		remotes/git-svn..mybranch
-
-[mybranch 78fbc29] 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%)
-dir/file already exists in repository at r2 and it is not a directory (file/1)
-ok 7 - detect node change from file to directory #1
-
-expecting success: 
-	rm -rf dir "$GIT_DIR"/index &&
-	git checkout -f -b mybranch2 remotes/git-svn &&
-	mv bar/zzz zzz &&
-	rm -rf bar &&
-	mv zzz bar &&
-	git update-index --remove -- bar/zzz &&
-	git update-index --add -- bar &&
-	git commit -m "$name" &&
-	test_must_fail git svn set-tree --find-copies-harder --rmdir \
-		remotes/git-svn..mybranch2
-
-Switched to a new branch 'mybranch2'
-[mybranch2 27b7b89] 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%)
-Transaction is out of date: Directory '/bar' is out of date at /build/git-2.20.1/perl/build/lib/Git/SVN.pm line 2075.
-
-ok 8 - detect node change from directory to file #1
-
-expecting success: 
-	rm -f "$GIT_DIR"/index &&
-	git checkout -f -b mybranch3 remotes/git-svn &&
-	rm bar/zzz &&
-	git update-index --remove bar/zzz &&
-	mkdir bar/zzz &&
-	echo yyy > bar/zzz/yyy &&
-	git update-index --add bar/zzz/yyy &&
-	git commit -m "$name" &&
-	git svn set-tree --find-copies-harder --rmdir \
-		remotes/git-svn..mybranch3 &&
-	svn_cmd up "$SVN_TREE" &&
-	test -d "$SVN_TREE"/bar/zzz &&
-	test -e "$SVN_TREE"/bar/zzz/yyy
-
-Switched to a new branch 'mybranch3'
-[mybranch3 81ad2bb] 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
- create mode 100644 bar/zzz/yyy
-	D	bar/zzz
-	A	bar/zzz/yyy
-	D	bar/zzz
-	A	bar/zzz/yyy
-r3 = b23587db35a366045833007537e08464accc39ae (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
-A    .git/svn/refs/remotes/git-svn/svn-tree/bar/zzz
-A    .git/svn/refs/remotes/git-svn/svn-tree/bar/zzz/yyy
-Updated to revision 3.
-ok 9 - detect node change from file to directory #2
-
-expecting success: 
-	rm -f "$GIT_DIR"/index &&
-	git checkout -f -b mybranch4 remotes/git-svn &&
-	rm -rf dir &&
-	git update-index --remove -- dir/file &&
-	touch dir &&
-	echo asdf > dir &&
-	git update-index --add -- dir &&
-	git commit -m "$name" &&
-	test_must_fail git svn set-tree --find-copies-harder --rmdir \
-		remotes/git-svn..mybranch4
-
-Switched to a new branch 'mybranch4'
-[mybranch4 17c3827] 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 'edf6db31-36c5-4b9f-ae33-82cf4e47ee5c', transaction '3-5', path '/dir' at /build/git-2.20.1/perl/build/lib/Git/SVN.pm line 2075.
-
-ok 10 - detect node change from directory to file #2
-
-expecting success: 
-	rm -f "$GIT_DIR"/index &&
-	git checkout -f -b mybranch5 remotes/git-svn &&
-	chmod -x exec.sh &&
-	git update-index exec.sh &&
-	git commit -m "$name" &&
-	git svn set-tree --find-copies-harder --rmdir \
-		remotes/git-svn..mybranch5 &&
-	svn_cmd up "$SVN_TREE" &&
-	test ! -x "$SVN_TREE"/exec.sh
-Switched to a new branch 'mybranch5'
-[mybranch5 4f3bd93] 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 = f5246c69438874291d56c33694261326c7cd74f5 (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
-Updated to revision 4.
-ok 11 - remove executable bit from a file
-
-expecting success: 
-	chmod +x exec.sh &&
-	git update-index exec.sh &&
-	git commit -m "$name" &&
-	git svn set-tree --find-copies-harder --rmdir \
-		remotes/git-svn..mybranch5 &&
-	svn_cmd up "$SVN_TREE" &&
-	test -x "$SVN_TREE"/exec.sh
-[mybranch5 4e1c033] 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 = b79c0508101f45504937508d62a182efeb9fb155 (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
-Updated to revision 5.
-ok 12 - add executable bit back file
-
-checking prerequisite: SYMLINKS
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
-	# test whether the filesystem supports symbolic links
-	ln -s x y && test -h y
-
-)
-prerequisite SYMLINKS ok
-expecting success: 
-	rm exec.sh &&
-	ln -s file exec.sh &&
-	git update-index exec.sh &&
-	git commit -m "$name" &&
-	git svn set-tree --find-copies-harder --rmdir \
-		remotes/git-svn..mybranch5 &&
-	svn_cmd up "$SVN_TREE" &&
-	test -h "$SVN_TREE"/exec.sh
-[mybranch5 af9a818] executable file becomes a symlink to file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
- rewrite exec.sh (100%)
- mode change 100755 => 120000
-	D	exec.sh
-	A	exec.sh
-	D	exec.sh
-	A	exec.sh
-W: -empty_dir: exec.sh
-r6 = fbf448690408fcdf96ef4eea8fa35983164c1b83 (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
-A    .git/svn/refs/remotes/git-svn/svn-tree/exec.sh
-Updated to revision 6.
-ok 13 - executable file becomes a symlink to file
-
-expecting success: 
-	chmod +x file &&
-	ln -s file exec-2.sh &&
-	git update-index --add file exec-2.sh &&
-	git commit -m "$name" &&
-	git svn set-tree --find-copies-harder --rmdir \
-		remotes/git-svn..mybranch5 &&
-	svn_cmd up "$SVN_TREE" &&
-	test -x "$SVN_TREE"/file &&
-	test -h "$SVN_TREE"/exec-2.sh
-[mybranch5 5f781ba] 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
- mode change 100644 => 100755 file
-	C	exec.sh => exec-2.sh
-	M	file
-	A	exec-2.sh
-	M	file
-r7 = 04b4b72156c386997c8444f72fd698358db6cf36 (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
- U   .git/svn/refs/remotes/git-svn/svn-tree/file
-Updated to revision 7.
-ok 14 - new symlink is added to a file that was also just made executable
-
-expecting success: 
-	echo git help >help &&
-	rm exec-2.sh &&
-	cp help exec-2.sh &&
-	git update-index exec-2.sh &&
-	git commit -m "$name" &&
-	git svn set-tree --find-copies-harder --rmdir \
-		remotes/git-svn..mybranch5 &&
-	svn_cmd up "$SVN_TREE" &&
-	test -f "$SVN_TREE"/exec-2.sh &&
-	test ! -h "$SVN_TREE"/exec-2.sh &&
-	test_cmp help "$SVN_TREE"/exec-2.sh
-[mybranch5 9baa199] modify a symlink to become a file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
- rewrite exec-2.sh (100%)
- mode change 120000 => 100644
-	D	exec-2.sh
-	A	exec-2.sh
-	D	exec-2.sh
-	A	exec-2.sh
-W: -empty_dir: exec-2.sh
-r8 = d34b1f59e4b62b5a6b5187fd6e846224ab20d821 (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
-A    .git/svn/refs/remotes/git-svn/svn-tree/exec-2.sh
-Updated to revision 8.
-ok 15 - modify a symlink to become a file
-
-skipping test: commit with UTF-8 message: locale: C 
-	echo '# hello' >> exec-2.sh &&
-	git update-index exec-2.sh &&
-	git commit -m 'éï�' &&
-	git svn set-tree HEAD
-ok 16 # skip commit with UTF-8 message: locale: C (missing UTF8 of UTF8,POSIXPERM,SYMLINKS)
-
-expecting success: git svn init "$svnrepo" && git svn fetch &&
-     git rev-list --pretty=raw remotes/git-svn | grep ^tree | uniq > a &&
-     git rev-list --pretty=raw remotes/alt | grep ^tree | uniq > b &&
-     test_cmp a b
-Using existing [svn-remote "svn"]
-	A	bar/zzz
-	A	dir/a/b/c/d/e/file
-	A	exec.sh
-	A	foo
-	A	foo.link
-r1 = 4bed63e45d5808fe3b861fe84d1adeb4f7db9f8a (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 = abe13aac677d95821f8ca9f3b53f9ce17e7a7a69 (refs/remotes/alt)
-	D	bar/zzz
-	A	bar/zzz/yyy
-r3 = 4bb89640d1ea0b26538c0553db9723d795c6e75d (refs/remotes/alt)
-	M	exec.sh
-r4 = 15e133352b38a8e865ac7ca64a75dd49a479f9e0 (refs/remotes/alt)
-	M	exec.sh
-r5 = 86f29c0e9051a4479b16431bf8636ecbd66d81af (refs/remotes/alt)
-	D	exec.sh
-	A	exec.sh
-W: -empty_dir: exec.sh
-r6 = 85648838dc14ab8e6ec1b8e6eecd17f08017f5a6 (refs/remotes/alt)
-	A	exec-2.sh
-	M	file
-r7 = 359e54cde3b6aa3b44806f20e8e1241ffcba9112 (refs/remotes/alt)
-	D	exec-2.sh
-	A	exec-2.sh
-W: -empty_dir: exec-2.sh
-r8 = 33f30aace3cb08159c5cc468eda5583efaf5283e (refs/remotes/alt)
-ok 17 - test fetch functionality (svn => git) with alternate GIT_SVN_ID
-
-expecting success: test_cmp expected a
-ok 18 - check imported tree checksums expected tree checksums
-
-expecting success: 
-        git config --add svn-remote.svn.fetch \
-		bar:refs/remotes/git-svn &&
-	test_must_fail git svn migrate
-
-Remote ref refs/remote/git-svn is tracked by
-  "svn-remote.svn.fetch=bar:refs/remotes/git-svn"
-and
-  "svn-remote.svn.fetch=:refs/remotes/git-svn"
-Please resolve this ambiguity in your git configuration file before continuing
-
-ok 19 - exit if remote refs are ambigious
-
-expecting success: 
-        svnadmin create "${PWD}/svnrepo2" &&
-        svn mkdir -m "mkdir bar" "${svnrepo}2/bar" &&
-        git config --unset svn-remote.svn.fetch \
-		"^bar:refs/remotes/git-svn$" &&
-	test_must_fail git svn init "${svnrepo}2/bar"
-        
-Committing transaction...
-Committed revision 1.
-svn-remote.svn.url already set: file:///build/git-2.20.1/t/trash%20directory.t9100-git-svn-basic/svnrepo
-wanted to set to: file:///build/git-2.20.1/t/trash%20directory.t9100-git-svn-basic/svnrepo2/bar
-
-ok 20 - exit if init-ing a would clobber a URL
-
-expecting success: 
-        git svn init --minimize-url -i bar "$svnrepo/bar" &&
-        git config --get svn-remote.svn.fetch \
-                              "^bar:refs/remotes/bar$" &&
-        git config --get svn-remote.svn.fetch \
-			      "^:refs/remotes/git-svn$"
-        
-Using existing [svn-remote "svn"]
-Using higher level of URL: file:///build/git-2.20.1/t/trash%20directory.t9100-git-svn-basic/svnrepo/bar => file:///build/git-2.20.1/t/trash%20directory.t9100-git-svn-basic/svnrepo
-bar:refs/remotes/bar
-:refs/remotes/git-svn
-ok 21 - init allows us to connect to another directory in the same repo
-
-expecting success: 
-	git svn fetch -i bar &&
-	git checkout -b my-bar refs/remotes/bar &&
-	echo 1 > foo &&
-	git add foo &&
-	git commit -m "change 1" &&
-	echo 2 > foo &&
-	git add foo &&
-	git commit -m "change 2" &&
-	old_head=$(git rev-parse HEAD) &&
-	git svn dcommit -i bar HEAD^ &&
-	test $old_head = $(git rev-parse HEAD) &&
-	test refs/heads/my-bar = $(git symbolic-ref HEAD) &&
-	git log refs/remotes/bar | grep "change 1" &&
-	! git log refs/remotes/bar | grep "change 2" &&
-	git checkout master &&
-	git branch -D my-bar
-	
-	A	zzz
-r1 = db5587937f4f393b2712c3062d9674ffb9182069 (refs/remotes/bar)
-	D	zzz
-	A	zzz/yyy
-r3 = 5f58e9705be28f5a5f597ca71be9f411ae803b40 (refs/remotes/bar)
-Switched to a new branch 'my-bar'
-[my-bar 6e201ff] change 1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo
-[my-bar 3b38870] change 2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Committing to file:///build/git-2.20.1/t/trash%20directory.t9100-git-svn-basic/svnrepo/bar ...
-	A	foo
-Committed r9
-	A	foo
-r9 = 8bc133151d8016936f39d33f259b2dd0f1f4e89f (refs/remotes/bar)
-No changes between 6e201ff668b82f2660949fab2b007fba604bbc98 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: 8bc133151d8016936f39d33f259b2dd0f1f4e89f
-    change 1
-Switched to branch 'master'
-Deleted branch my-bar (was 3b38870).
-ok 22 - dcommit $rev does not clobber current branch
-
-expecting success: 
-	git svn fetch -i bar &&
-	git checkout -b my-bar refs/remotes/bar &&
-	echo abc > d &&
-	git update-index --add d &&
-	git commit -m "/bar/d should be in the log" &&
-	git svn dcommit -i bar &&
-	test -z "$(git diff refs/heads/my-bar refs/remotes/bar)" &&
-	mkdir newdir &&
-	echo new > newdir/dir &&
-	git update-index --add newdir/dir &&
-	git commit -m "add a new directory" &&
-	git svn dcommit -i bar &&
-	test -z "$(git diff refs/heads/my-bar refs/remotes/bar)" &&
-	echo foo >> newdir/dir &&
-	git update-index newdir/dir &&
-	git commit -m "modify a file in new directory" &&
-	git svn dcommit -i bar &&
-	test -z "$(git diff refs/heads/my-bar refs/remotes/bar)"
-
-	A	bar/foo
-r9 = 5e8884ab76060efb1ccfbb8f88861d1c2f180752 (refs/remotes/alt)
-Switched to a new branch 'my-bar'
-[my-bar c2bb942] /bar/d should be in the log
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 d
-Committing to file:///build/git-2.20.1/t/trash%20directory.t9100-git-svn-basic/svnrepo/bar ...
-	A	d
-Committed r10
-	A	d
-r10 = 0f0bb4322fc1a6b869a81aab18c17910e074fe6e (refs/remotes/bar)
-No changes between c2bb9424ed240bfc0b6db7a5192fc87231f92f3b and refs/remotes/bar
-Resetting to the latest refs/remotes/bar
-[my-bar 8c2f66f] add a new directory
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 newdir/dir
-Committing to file:///build/git-2.20.1/t/trash%20directory.t9100-git-svn-basic/svnrepo/bar ...
-	A	newdir/dir
-Committed r11
-	A	newdir/dir
-r11 = f6050e210d115c88ce57d433f252ed6e23a84807 (refs/remotes/bar)
-No changes between 8c2f66f283a1cf70b9ae7bd476af7b165c852eb4 and refs/remotes/bar
-Resetting to the latest refs/remotes/bar
-[my-bar 286afcb] modify a file in new directory
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Committing to file:///build/git-2.20.1/t/trash%20directory.t9100-git-svn-basic/svnrepo/bar ...
-	M	newdir/dir
-Committed r12
-	M	newdir/dir
-r12 = 2b612dc01b39a4255da4ccdd3b0e76d2b676d603 (refs/remotes/bar)
-No changes between 286afcbcec9f058a07583550f11f608791ffb99a and refs/remotes/bar
-Resetting to the latest refs/remotes/bar
-ok 23 - able to dcommit to a subdirectory
-
-expecting success: 
-	test_commit "commit-new-file-foo2" foo2 &&
-	test-tool chmtime =-60 foo &&
-	git svn dcommit
-
-[my-bar a87a984] commit-new-file-foo2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo2
-Committing to file:///build/git-2.20.1/t/trash%20directory.t9100-git-svn-basic/svnrepo/bar ...
-	A	foo2
-Committed r13
-	A	foo2
-r13 = cdcb03e6b6c705465c2ac418b1f4fe4304f6c368 (refs/remotes/bar)
-No changes between a87a9844df165073f9c6c9b2780b7760812fdaeb and refs/remotes/bar
-Resetting to the latest refs/remotes/bar
-ok 24 - dcommit should not fail with a touched file
-
-expecting success: 
-	test-tool chmtime =-60 foo &&
-	git svn rebase
-
-Current branch my-bar is up to date.
-ok 25 - rebase should not fail with a touched file
-
-expecting success: 
-	echo cba > d &&
-	git update-index d &&
-	git commit -m "update /bar/d" &&
-	git svn set-tree -i bar HEAD &&
-	test -z "$(git diff refs/heads/my-bar refs/remotes/bar)"
-
-[my-bar 22519ad] update /bar/d
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-	M	d
-	M	d
-r14 = 219fcef9c8060f179674371616a531f5718f2e1d (refs/remotes/bar)
-Done committing 1 revisions to SVN
-ok 26 - able to set-tree to a subdirectory
-
-expecting success: 
-	mkdir bare-repo &&
-	( cd bare-repo &&
-	git init --bare &&
-	GIT_DIR=. git svn init "$svnrepo" &&
-	git svn fetch ) &&
-	rm -rf bare-repo
-	
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9100-git-svn-basic/bare-repo/
-	A	bar/zzz
-	A	dir/a/b/c/d/e/file
-	A	exec.sh
-	A	foo
-	A	foo.link
-r1 = 4bed63e45d5808fe3b861fe84d1adeb4f7db9f8a (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 = abe13aac677d95821f8ca9f3b53f9ce17e7a7a69 (refs/remotes/alt)
-	D	bar/zzz
-	A	bar/zzz/yyy
-r3 = 4bb89640d1ea0b26538c0553db9723d795c6e75d (refs/remotes/alt)
-	M	exec.sh
-r4 = 15e133352b38a8e865ac7ca64a75dd49a479f9e0 (refs/remotes/alt)
-	M	exec.sh
-r5 = 86f29c0e9051a4479b16431bf8636ecbd66d81af (refs/remotes/alt)
-	D	exec.sh
-	A	exec.sh
-W: -empty_dir: exec.sh
-r6 = 85648838dc14ab8e6ec1b8e6eecd17f08017f5a6 (refs/remotes/alt)
-	A	exec-2.sh
-	M	file
-r7 = 359e54cde3b6aa3b44806f20e8e1241ffcba9112 (refs/remotes/alt)
-	D	exec-2.sh
-	A	exec-2.sh
-W: -empty_dir: exec-2.sh
-r8 = 33f30aace3cb08159c5cc468eda5583efaf5283e (refs/remotes/alt)
-	A	bar/foo
-r9 = 5e8884ab76060efb1ccfbb8f88861d1c2f180752 (refs/remotes/alt)
-	A	bar/d
-r10 = 0eeaa57756db04bb9fd2cbf4a3c9a6172ab82a3a (refs/remotes/alt)
-	A	bar/newdir/dir
-r11 = babe3b43c7de324206bb2100fb4f587e00a4ceba (refs/remotes/alt)
-	M	bar/newdir/dir
-r12 = e77d11fd74cdf839967012180b3e058664db15c9 (refs/remotes/alt)
-	A	bar/foo2
-r13 = 3bb9207ab8e4cbbd371d5f615412c8ce06105439 (refs/remotes/alt)
-	M	bar/d
-r14 = 17a093f497db9f6288ace50ebc8c4a9408704fd9 (refs/remotes/alt)
-ok 27 - git-svn works in a bare repository
-
-expecting success: 
-	mkdir worktree gitdir &&
-	( cd worktree &&
-	git svn init "$svnrepo" &&
-	git init --separate-git-dir ../gitdir &&
-	git svn fetch ) &&
-	rm -rf worktree gitdir
-	
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9100-git-svn-basic/worktree/.git/
-Reinitialized existing Git repository in /build/git-2.20.1/t/trash directory.t9100-git-svn-basic/gitdir/
-	A	bar/zzz
-	A	dir/a/b/c/d/e/file
-	A	exec.sh
-	A	foo
-	A	foo.link
-r1 = 4bed63e45d5808fe3b861fe84d1adeb4f7db9f8a (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 = abe13aac677d95821f8ca9f3b53f9ce17e7a7a69 (refs/remotes/alt)
-	D	bar/zzz
-	A	bar/zzz/yyy
-r3 = 4bb89640d1ea0b26538c0553db9723d795c6e75d (refs/remotes/alt)
-	M	exec.sh
-r4 = 15e133352b38a8e865ac7ca64a75dd49a479f9e0 (refs/remotes/alt)
-	M	exec.sh
-r5 = 86f29c0e9051a4479b16431bf8636ecbd66d81af (refs/remotes/alt)
-	D	exec.sh
-	A	exec.sh
-W: -empty_dir: exec.sh
-r6 = 85648838dc14ab8e6ec1b8e6eecd17f08017f5a6 (refs/remotes/alt)
-	A	exec-2.sh
-	M	file
-r7 = 359e54cde3b6aa3b44806f20e8e1241ffcba9112 (refs/remotes/alt)
-	D	exec-2.sh
-	A	exec-2.sh
-W: -empty_dir: exec-2.sh
-r8 = 33f30aace3cb08159c5cc468eda5583efaf5283e (refs/remotes/alt)
-	A	bar/foo
-r9 = 5e8884ab76060efb1ccfbb8f88861d1c2f180752 (refs/remotes/alt)
-	A	bar/d
-r10 = 0eeaa57756db04bb9fd2cbf4a3c9a6172ab82a3a (refs/remotes/alt)
-	A	bar/newdir/dir
-r11 = babe3b43c7de324206bb2100fb4f587e00a4ceba (refs/remotes/alt)
-	M	bar/newdir/dir
-r12 = e77d11fd74cdf839967012180b3e058664db15c9 (refs/remotes/alt)
-	A	bar/foo2
-r13 = 3bb9207ab8e4cbbd371d5f615412c8ce06105439 (refs/remotes/alt)
-	M	bar/d
-r14 = 17a093f497db9f6288ace50ebc8c4a9408704fd9 (refs/remotes/alt)
-ok 28 - git-svn works in in a repository with a gitdir: link
-
-# passed all 28 test(s)
-1..28
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t9156-git-svn-fetch-deleted-tag-2.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9156-git-svn-fetch-deleted-tag-2/.git/
-expecting success: 
-	mkdir -p import/branches &&
-	mkdir -p import/tags &&
-	mkdir -p import/trunk/subdir1 &&
-	mkdir -p import/trunk/subdir2 &&
-	mkdir -p import/trunk/subdir3 &&
-	echo "file1" >import/trunk/subdir1/file &&
-	echo "file2" >import/trunk/subdir2/file &&
-	echo "file3" >import/trunk/subdir3/file &&
-	svn_cmd import -m "import for git svn" import "$svnrepo" &&
-	rm -rf import &&
-
-	svn_cmd co "$svnrepo/trunk" svn_project &&
-	(cd svn_project &&
-		echo "change1" >>subdir1/file &&
-		echo "change2" >>subdir2/file &&
-		echo "change3" >>subdir3/file &&
-		svn_cmd ci -m "change" .
-	) &&
-
-	svn_cmd cp -m "create mytag 1" -r2 "$svnrepo/trunk/subdir1" "$svnrepo/tags/mytag" &&
-	svn_cmd rm -m "delete mytag 1" "$svnrepo/tags/mytag" &&
-	svn_cmd cp -m "create mytag 2" -r2 "$svnrepo/trunk/subdir2" "$svnrepo/tags/mytag" &&
-	svn_cmd rm -m "delete mytag 2" "$svnrepo/tags/mytag" &&
-	svn_cmd cp -m "create mytag 3" -r2 "$svnrepo/trunk/subdir3" "$svnrepo/tags/mytag"
-
-Adding         import/branches
-Adding         import/tags
-Adding         import/trunk
-Adding         import/trunk/subdir1
-Adding         import/trunk/subdir1/file
-Adding         import/trunk/subdir2
-Adding         import/trunk/subdir2/file
-Adding         import/trunk/subdir3
-Adding         import/trunk/subdir3/file
-Committing transaction...
-Committed revision 1.
-A    svn_project/subdir1
-A    svn_project/subdir1/file
-A    svn_project/subdir2
-A    svn_project/subdir2/file
-A    svn_project/subdir3
-A    svn_project/subdir3/file
-Checked out revision 1.
-Sending        subdir1/file
-Sending        subdir2/file
-Sending        subdir3/file
-Transmitting file data ...done
-Committing transaction...
-Committed revision 2.
-Committing transaction...
-Committed revision 3.
-Committing transaction...
-Committed revision 4.
-Committing transaction...
-Committed revision 5.
-Committing transaction...
-Committed revision 6.
-Committing transaction...
-Committed revision 7.
-ok 1 - setup svn repo
-
-expecting success: 
-	git svn init --stdlayout "$svnrepo" git_project &&
-	cd git_project &&
-	git svn fetch &&
-
-	git diff --exit-code master:subdir3/file origin/tags/mytag:file &&
-	git diff --exit-code master:subdir2/file origin/tags/mytag^:file &&
-	git diff --exit-code master:subdir1/file origin/tags/mytag^^:file
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9156-git-svn-fetch-deleted-tag-2/git_project/.git/
-	A	subdir1/file
-	A	subdir2/file
-	A	subdir3/file
-r1 = 0869edf3f79c103484937963c47cc6ab26b37b15 (refs/remotes/origin/trunk)
-	M	subdir1/file
-	M	subdir2/file
-	M	subdir3/file
-r2 = f5cdf46f075b4b8aa921acb6c6ade551e676e3da (refs/remotes/origin/trunk)
-Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9156-git-svn-fetch-deleted-tag-2/svnrepo/trunk/subdir1 => file:///build/git-2.20.1/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 = d856c4b5ce6a33d11ab48cb56ed3647e3abd2583 (refs/remotes/origin/tags/mytag@2)
-	M	file
-r2 = ac875e4da2799b5ff7a98d8d1db11a26c366a830 (refs/remotes/origin/tags/mytag@2)
-Found branch parent: (refs/remotes/origin/tags/mytag) ac875e4da2799b5ff7a98d8d1db11a26c366a830
-Following parent with do_switch
-Successfully followed parent
-r3 = 73da303871073c5a3c414c326155cc61bb59eb5c (refs/remotes/origin/tags/mytag)
-Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9156-git-svn-fetch-deleted-tag-2/svnrepo/trunk/subdir2 => file:///build/git-2.20.1/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 = e7615b242d9d1214198ac5e313d0c13f3f06e61a (refs/remotes/origin/tags/mytag@2-)
-	M	file
-r2 = 946f6feac701face5381ba50f74f72e3e9788678 (refs/remotes/origin/tags/mytag@2-)
-Found branch parent: (refs/remotes/origin/tags/mytag) 946f6feac701face5381ba50f74f72e3e9788678
-Index mismatch: 03a4eca29b077f8b0867e84854a2c6e71eeac380 != 7745dab6988f4d78b3241eec1b66b56c15e67e83
-rereading 946f6feac701face5381ba50f74f72e3e9788678
-Following parent with do_switch
-Successfully followed parent
-r5 = 3ed58b745c5f907b5d190c513efefb692290df5c (refs/remotes/origin/tags/mytag)
-Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9156-git-svn-fetch-deleted-tag-2/svnrepo/trunk/subdir3 => file:///build/git-2.20.1/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 = 12280f572f5c502f14e3d3671993b444fe940340 (refs/remotes/origin/tags/mytag@2--)
-	M	file
-r2 = 9960888d93e36e188b0fbf3e986e76cfc83e3373 (refs/remotes/origin/tags/mytag@2--)
-Found branch parent: (refs/remotes/origin/tags/mytag) 9960888d93e36e188b0fbf3e986e76cfc83e3373
-Index mismatch: de577018db9919b0130637aa9ac28b5dabe70913 != 03a4eca29b077f8b0867e84854a2c6e71eeac380
-rereading 9960888d93e36e188b0fbf3e986e76cfc83e3373
-Following parent with do_switch
-Successfully followed parent
-r7 = 64b0e413146d6a2b5fe121c843f0a5304bdf3d41 (refs/remotes/origin/tags/mytag)
-Checked out HEAD:
-  file:///build/git-2.20.1/t/trash%20directory.t9156-git-svn-fetch-deleted-tag-2/svnrepo/trunk r2
-ok 2 - fetch deleted tags from same revision with no checksum error
-
-# passed all 2 test(s)
-1..2
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t9155-git-svn-fetch-deleted-tag.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9155-git-svn-fetch-deleted-tag/.git/
-expecting success: 
-	mkdir -p import/trunk/subdir &&
-	mkdir -p import/branches &&
-	mkdir -p import/tags &&
-	echo "base" >import/trunk/subdir/file &&
-	svn_cmd import -m "import for git svn" import "$svnrepo" &&
-	rm -rf import &&
-
-	svn_cmd mkdir -m "create mybranch directory" "$svnrepo/branches/mybranch" &&
-	svn_cmd cp -m "create branch mybranch" "$svnrepo/trunk" "$svnrepo/branches/mybranch/trunk" &&
-
-	svn_cmd co "$svnrepo/trunk" svn_project &&
-	(cd svn_project &&
-		echo "trunk change" >>subdir/file &&
-		svn_cmd ci -m "trunk change" subdir/file &&
-
-		svn_cmd switch "$svnrepo/branches/mybranch/trunk" &&
-		echo "branch change" >>subdir/file &&
-		svn_cmd ci -m "branch change" subdir/file
-	) &&
-
-	svn_cmd cp -m "create mytag attempt 1" -r5 "$svnrepo/trunk/subdir" "$svnrepo/tags/mytag" &&
-	svn_cmd rm -m "delete mytag attempt 1" "$svnrepo/tags/mytag" &&
-	svn_cmd cp -m "create mytag attempt 2" -r5 "$svnrepo/branches/mybranch/trunk/subdir" "$svnrepo/tags/mytag"
-
-Adding         import/branches
-Adding         import/tags
-Adding         import/trunk
-Adding         import/trunk/subdir
-Adding         import/trunk/subdir/file
-Committing transaction...
-Committed revision 1.
-Committing transaction...
-Committed revision 2.
-Committing transaction...
-Committed revision 3.
-A    svn_project/subdir
-A    svn_project/subdir/file
-Checked out revision 3.
-Sending        subdir/file
-Transmitting file data .done
-Committing transaction...
-Committed revision 4.
-U    subdir/file
-Updated to revision 4.
-Sending        subdir/file
-Transmitting file data .done
-Committing transaction...
-Committed revision 5.
-Committing transaction...
-Committed revision 6.
-Committing transaction...
-Committed revision 7.
-Committing transaction...
-Committed revision 8.
-ok 1 - setup svn repo
-
-expecting success: 
-	git svn init --stdlayout "$svnrepo" git_project &&
-	cd git_project &&
-	git svn fetch &&
-
-	git diff --exit-code origin/mybranch:trunk/subdir/file origin/tags/mytag:file &&
-	git diff --exit-code master:subdir/file origin/tags/mytag^:file
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9155-git-svn-fetch-deleted-tag/git_project/.git/
-	A	subdir/file
-r1 = e8c4cd5eb05028bc39dfd6d3423d7001f5cde878 (refs/remotes/origin/trunk)
-r2 = f5a300f5eb38b2fae2bbba7f9b34457a708b8b5a (refs/remotes/origin/mybranch)
-	A	trunk/subdir/file
-r3 = 7096e292fdaa4ddadb84c67cb94b741e3ea9b76c (refs/remotes/origin/mybranch)
-	M	subdir/file
-r4 = 81261ae7e3211b993e42713ce9176a949f477310 (refs/remotes/origin/trunk)
-	M	trunk/subdir/file
-r5 = 1220f27861f6a4870574d03ea4b0b8315e2c6a83 (refs/remotes/origin/mybranch)
-Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9155-git-svn-fetch-deleted-tag/svnrepo/trunk/subdir => file:///build/git-2.20.1/t/trash%20directory.t9155-git-svn-fetch-deleted-tag/svnrepo/tags/mytag, 5
-Initializing parent: refs/remotes/origin/tags/mytag@5
-	A	file
-r1 = 35c5d640308bc11cda84766daf8eaafc5b88abd6 (refs/remotes/origin/tags/mytag@5)
-	M	file
-r4 = 1a31c2ef4ea2032254feed2813fc92870c15bff1 (refs/remotes/origin/tags/mytag@5)
-Found branch parent: (refs/remotes/origin/tags/mytag) 1a31c2ef4ea2032254feed2813fc92870c15bff1
-Following parent with do_switch
-Successfully followed parent
-r6 = d993c513b501636bf5bbce3d45fe8cfccd7b1bd8 (refs/remotes/origin/tags/mytag)
-Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9155-git-svn-fetch-deleted-tag/svnrepo/branches/mybranch/trunk/subdir => file:///build/git-2.20.1/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/git-2.20.1/t/trash%20directory.t9155-git-svn-fetch-deleted-tag/svnrepo/trunk/subdir => file:///build/git-2.20.1/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 = 35c5d640308bc11cda84766daf8eaafc5b88abd6 (refs/remotes/origin/tags/mytag@2)
-Found branch parent: (refs/remotes/origin/tags/mytag@5-) 35c5d640308bc11cda84766daf8eaafc5b88abd6
-Following parent with do_switch
-Successfully followed parent
-r3 = 310c2b964c46964e445155a17d8c0381206467dc (refs/remotes/origin/tags/mytag@5-)
-	M	file
-r5 = 1cd4e51d27aec224bb7a2ef3765e1f37ae863522 (refs/remotes/origin/tags/mytag@5-)
-Found branch parent: (refs/remotes/origin/tags/mytag) 1cd4e51d27aec224bb7a2ef3765e1f37ae863522
-Index mismatch: 13f9c6ca01f81b94d8eca8eba510eafa2445e890 != 343cf4718d6a013cf33cf3cea8e0dc0a8efa64dc
-rereading 1cd4e51d27aec224bb7a2ef3765e1f37ae863522
-Following parent with do_switch
-Successfully followed parent
-r8 = 1b3a03a5fd95558489a685ee7ace15cbcd4886e8 (refs/remotes/origin/tags/mytag)
-Checked out HEAD:
-  file:///build/git-2.20.1/t/trash%20directory.t9155-git-svn-fetch-deleted-tag/svnrepo/trunk r4
-ok 2 - fetch deleted tags from same revision with checksum error
-
-# passed all 2 test(s)
-1..2
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t7610-mergetool.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7610-mergetool/.git/
-expecting success: 
-	test_config rerere.enabled true &&
-	echo master >file1 &&
-	echo master spaced >"spaced name" &&
-	echo master file11 >file11 &&
-	echo master file12 >file12 &&
-	echo master file13 >file13 &&
-	echo master file14 >file14 &&
-	mkdir subdir &&
-	echo master sub >subdir/file3 &&
-	test_create_repo submod &&
-	(
-		cd submod &&
-		: >foo &&
-		git add foo &&
-		git commit -m "Add foo"
-	) &&
-	git submodule add git://example.com/submod submod &&
-	git add file1 "spaced name" file1[1-4] subdir/file3 .gitmodules submod &&
-	git commit -m "add initial versions" &&
-
-	git checkout -b branch1 master &&
-	git submodule update -N &&
-	echo branch1 change >file1 &&
-	echo branch1 newfile >file2 &&
-	echo branch1 spaced >"spaced name" &&
-	echo branch1 both added >both &&
-	echo branch1 change file11 >file11 &&
-	echo branch1 change file13 >file13 &&
-	echo branch1 sub >subdir/file3 &&
-	(
-		cd submod &&
-		echo branch1 submodule >bar &&
-		git add bar &&
-		git commit -m "Add bar on branch1" &&
-		git checkout -b submod-branch1
-	) &&
-	git add file1 "spaced name" file11 file13 file2 subdir/file3 submod &&
-	git add both &&
-	git rm file12 &&
-	git commit -m "branch1 changes" &&
-
-	git checkout -b delete-base branch1 &&
-	mkdir -p a/a &&
-	test_write_lines one two 3 4 >a/a/file.txt &&
-	git add a/a/file.txt &&
-	git commit -m"base file" &&
-	git checkout -b move-to-b delete-base &&
-	mkdir -p b/b &&
-	git mv a/a/file.txt b/b/file.txt &&
-	test_write_lines one two 4 >b/b/file.txt &&
-	git commit -a -m"move to b" &&
-	git checkout -b move-to-c delete-base &&
-	mkdir -p c/c &&
-	git mv a/a/file.txt c/c/file.txt &&
-	test_write_lines one two 3 >c/c/file.txt &&
-	git commit -a -m"move to c" &&
-
-	git checkout -b stash1 master &&
-	echo stash1 change file11 >file11 &&
-	git add file11 &&
-	git commit -m "stash1 changes" &&
-
-	git checkout -b stash2 master &&
-	echo stash2 change file11 >file11 &&
-	git add file11 &&
-	git commit -m "stash2 changes" &&
-
-	git checkout master &&
-	git submodule update -N &&
-	echo master updated >file1 &&
-	echo master new >file2 &&
-	echo master updated spaced >"spaced name" &&
-	echo master both added >both &&
-	echo master updated file12 >file12 &&
-	echo master updated file14 >file14 &&
-	echo master new sub >subdir/file3 &&
-	(
-		cd submod &&
-		echo master submodule >bar &&
-		git add bar &&
-		git commit -m "Add bar on master" &&
-		git checkout -b submod-master
-	) &&
-	git add file1 "spaced name" file12 file14 file2 subdir/file3 submod &&
-	git add both &&
-	git rm file11 &&
-	git commit -m "master updates" &&
-
-	git clean -fdx &&
-	git checkout -b order-file-start master &&
-	echo start >a &&
-	echo start >b &&
-	git add a b &&
-	git commit -m start &&
-	git checkout -b order-file-side1 order-file-start &&
-	echo side1 >a &&
-	echo side1 >b &&
-	git add a b &&
-	git commit -m side1 &&
-	git checkout -b order-file-side2 order-file-start &&
-	echo side2 >a &&
-	echo side2 >b &&
-	git add a b &&
-	git commit -m side2 &&
-
-	git config merge.tool mytool &&
-	git config mergetool.mytool.cmd "cat \"\$REMOTE\" >\"\$MERGED\"" &&
-	git config mergetool.mytool.trustExitCode true &&
-	git config mergetool.mybase.cmd "cat \"\$BASE\" >\"\$MERGED\"" &&
-	git config mergetool.mybase.trustExitCode true
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7610-mergetool/submod/.git/
-[master (root-commit) ca639d9] Add foo
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 foo
-Adding existing repo at 'submod' to the index
-[master (root-commit) a130783] add initial versions
- Author: A U Thor <author@example.com>
- 9 files changed, 11 insertions(+)
- create mode 100644 .gitmodules
- create mode 100644 file1
- create mode 100644 file11
- create mode 100644 file12
- create mode 100644 file13
- create mode 100644 file14
- create mode 100644 spaced name
- create mode 100644 subdir/file3
- create mode 160000 submod
-Switched to a new branch 'branch1'
-[master 5178faa] Add bar on branch1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 bar
-Switched to a new branch 'submod-branch1'
-rm 'file12'
-[branch1 afa562b] branch1 changes
- Author: A U Thor <author@example.com>
- 9 files changed, 8 insertions(+), 7 deletions(-)
- create mode 100644 both
- delete mode 100644 file12
- create mode 100644 file2
-Switched to a new branch 'delete-base'
-[delete-base 3728485] base file
- Author: A U Thor <author@example.com>
- 1 file changed, 4 insertions(+)
- create mode 100644 a/a/file.txt
-Switched to a new branch 'move-to-b'
-[move-to-b 7ba305a] move to b
- Author: A U Thor <author@example.com>
- 1 file changed, 1 deletion(-)
- rename {a/a => b/b}/file.txt (83%)
-Switched to a new branch 'move-to-c'
-[move-to-c 323e890] move to c
- Author: A U Thor <author@example.com>
- 1 file changed, 1 deletion(-)
- rename {a/a => c/c}/file.txt (83%)
-Switched to a new branch 'stash1'
-M	submod
-[stash1 667df55] stash1 changes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'stash2'
-M	submod
-[stash2 62e3426] stash2 changes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to branch 'master'
-M	submod
-Submodule path 'submod': checked out 'ca639d99ea7029b9dc5d2a6bc2d92b4107cbe3dd'
-[detached HEAD 369c179] Add bar on master
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 bar
-Switched to a new branch 'submod-master'
-rm 'file11'
-[master e3c814d] master updates
- Author: A U Thor <author@example.com>
- 9 files changed, 8 insertions(+), 7 deletions(-)
- create mode 100644 both
- delete mode 100644 file11
- create mode 100644 file2
-Removing a/
-Switched to a new branch 'order-file-start'
-[order-file-start 4558409] start
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 a
- create mode 100644 b
-Switched to a new branch 'order-file-side1'
-[order-file-side1 714136f] side1
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+), 2 deletions(-)
-Switched to a new branch 'order-file-side2'
-[order-file-side2 53b99bd] side2
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+), 2 deletions(-)
-ok 1 - setup
-
-expecting success: 
-	test_when_finished "git reset --hard" &&
-	git checkout -b test$test_count branch1 &&
-	git submodule update -N &&
-	test_must_fail git merge master >/dev/null 2>&1 &&
-	( yes "" | git mergetool both >/dev/null 2>&1 ) &&
-	( yes "" | git mergetool file1 file1 ) &&
-	( yes "" | git mergetool file2 "spaced name" >/dev/null 2>&1 ) &&
-	( yes "" | git mergetool subdir/file3 >/dev/null 2>&1 ) &&
-	( yes "d" | git mergetool file11 >/dev/null 2>&1 ) &&
-	( yes "d" | git mergetool file12 >/dev/null 2>&1 ) &&
-	( yes "l" | git mergetool submod >/dev/null 2>&1 ) &&
-	test "$(cat file1)" = "master updated" &&
-	test "$(cat file2)" = "master new" &&
-	test "$(cat subdir/file3)" = "master new sub" &&
-	test "$(cat submod/bar)" = "branch1 submodule" &&
-	git commit -m "branch1 resolved with mergetool"
-
-Switched to a new branch 'test2'
-M	submod
-Submodule path 'submod': checked out '5178faa356dc98300152496c68bbc28d09f77078'
-Merging:
-file1
-
-Normal merge conflict for 'file1':
-  {local}: modified file
-  {remote}: modified file
-Recorded resolution for 'both'.
-Recorded resolution for 'file1'.
-Recorded resolution for 'file2'.
-Recorded resolution for 'spaced name'.
-Recorded resolution for 'subdir/file3'.
-[test2 2aa5169] branch1 resolved with mergetool
- Author: A U Thor <author@example.com>
-HEAD is now at 2aa5169 branch1 resolved with mergetool
-ok 2 - custom mergetool
-
-expecting success: 
-	test_when_finished "git reset --hard" &&
-	# This test_config line must go after the above reset line so that
-	# core.autocrlf is unconfigured before reset runs.  (The
-	# test_config command uses test_when_finished internally and
-	# test_when_finished is LIFO.)
-	test_config core.autocrlf true &&
-	git checkout -b test$test_count branch1 &&
-	test_must_fail git merge master >/dev/null 2>&1 &&
-	( yes "" | git mergetool file1 >/dev/null 2>&1 ) &&
-	( yes "" | git mergetool file2 >/dev/null 2>&1 ) &&
-	( yes "" | git mergetool "spaced name" >/dev/null 2>&1 ) &&
-	( yes "" | git mergetool both >/dev/null 2>&1 ) &&
-	( yes "" | git mergetool subdir/file3 >/dev/null 2>&1 ) &&
-	( yes "d" | git mergetool file11 >/dev/null 2>&1 ) &&
-	( yes "d" | git mergetool file12 >/dev/null 2>&1 ) &&
-	( yes "r" | git mergetool submod >/dev/null 2>&1 ) &&
-	test "$(printf x | cat file1 -)" = "$(printf "master updated\r\nx")" &&
-	test "$(printf x | cat file2 -)" = "$(printf "master new\r\nx")" &&
-	test "$(printf x | cat subdir/file3 -)" = "$(printf "master new sub\r\nx")" &&
-	git submodule update -N &&
-	test "$(cat submod/bar)" = "master submodule" &&
-	git commit -m "branch1 resolved with mergetool - autocrlf"
-
-Switched to a new branch 'test3'
-Submodule path 'submod': checked out '369c179056ee23661cc437cf94a9156432b09d2c'
-Recorded resolution for 'both'.
-Recorded resolution for 'file1'.
-Recorded resolution for 'file2'.
-Recorded resolution for 'spaced name'.
-Recorded resolution for 'subdir/file3'.
-[test3 c14736c] branch1 resolved with mergetool - autocrlf
- Author: A U Thor <author@example.com>
-HEAD is now at c14736c branch1 resolved with mergetool - autocrlf
-ok 3 - mergetool crlf
-
-expecting success: 
-	test_when_finished "git reset --hard" &&
-	git checkout -b test$test_count branch1 &&
-	git submodule update -N &&
-	(
-		cd subdir &&
-		test_must_fail git merge master >/dev/null 2>&1 &&
-		( yes "" | git mergetool file3 >/dev/null 2>&1 ) &&
-		test "$(cat file3)" = "master new sub"
-	)
-
-Switched to a new branch 'test4'
-M	submod
-Submodule path 'submod': checked out '5178faa356dc98300152496c68bbc28d09f77078'
-HEAD is now at afa562b branch1 changes
-ok 4 - mergetool in subdir
-
-expecting success: 
-	test_when_finished "git reset --hard" &&
-	git checkout -b test$test_count branch1 &&
-	git submodule update -N &&
-	(
-		cd subdir &&
-		test_must_fail git merge master >/dev/null 2>&1 &&
-		( yes "" | git mergetool file3 >/dev/null 2>&1 ) &&
-		( yes "" | git mergetool ../file1 >/dev/null 2>&1 ) &&
-		( yes "" | git mergetool ../file2 ../spaced\ name >/dev/null 2>&1 ) &&
-		( yes "" | git mergetool ../both >/dev/null 2>&1 ) &&
-		( yes "d" | git mergetool ../file11 >/dev/null 2>&1 ) &&
-		( yes "d" | git mergetool ../file12 >/dev/null 2>&1 ) &&
-		( yes "l" | git mergetool ../submod >/dev/null 2>&1 ) &&
-		test "$(cat ../file1)" = "master updated" &&
-		test "$(cat ../file2)" = "master new" &&
-		test "$(cat ../submod/bar)" = "branch1 submodule" &&
-		git commit -m "branch1 resolved with mergetool - subdir"
-	)
-
-Switched to a new branch 'test5'
-[test5 fe4ac7d] branch1 resolved with mergetool - subdir
- Author: A U Thor <author@example.com>
-HEAD is now at fe4ac7d branch1 resolved with mergetool - subdir
-ok 5 - mergetool on file in parent dir
-
-expecting success: 
-	test_when_finished "git reset --hard" &&
-	git checkout -b test$test_count branch1 &&
-	git submodule update -N &&
-	test_must_fail git merge master &&
-	test -n "$(git ls-files -u)" &&
-	( yes "d" | git mergetool file11 >/dev/null 2>&1 ) &&
-	( yes "d" | git mergetool file12 >/dev/null 2>&1 ) &&
-	( yes "l" | git mergetool submod >/dev/null 2>&1 ) &&
-	output="$(git mergetool --no-prompt)" &&
-	test "$output" = "No files need merging"
-
-Switched to a new branch 'test6'
-Merging:
-afa562b branch1 changes
-virtual master
-found 1 common ancestor:
-a130783 add initial versions
-Failed to merge submodule submod (merge following commits not found)
-Auto-merging submod
-CONFLICT (submodule): Merge conflict in submod
-Auto-merging subdir/file3
-CONFLICT (content): Merge conflict in subdir/file3
-Auto-merging spaced name
-CONFLICT (content): Merge conflict in spaced name
-Auto-merging file2
-CONFLICT (add/add): Merge conflict in file2
-CONFLICT (modify/delete): file12 deleted in HEAD and modified in master. Version master of file12 left in tree.
-CONFLICT (modify/delete): file11 deleted in master and modified in HEAD. Version HEAD of file11 left in tree.
-Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-Auto-merging both
-CONFLICT (add/add): Merge conflict in both
-Resolved 'both' using previous resolution.
-Resolved 'file1' using previous resolution.
-Resolved 'file2' using previous resolution.
-Resolved 'spaced name' using previous resolution.
-Resolved 'subdir/file3' using previous resolution.
-Automatic merge failed; fix conflicts and then commit the result.
-HEAD is now at afa562b branch1 changes
-ok 6 - mergetool skips autoresolved
-
-expecting success: 
-	test_when_finished "git reset --hard" &&
-	git checkout -b test$test_count branch1 &&
-	test_config rerere.enabled false &&
-	(
-		cd subdir &&
-		test_must_fail git merge master &&
-		( yes "r" | git mergetool ../submod ) &&
-		( yes "d" "d" | git mergetool --no-prompt ) &&
-		test "$(cat ../file1)" = "master updated" &&
-		test "$(cat ../file2)" = "master new" &&
-		test "$(cat file3)" = "master new sub" &&
-		( cd .. && git submodule update -N ) &&
-		test "$(cat ../submod/bar)" = "master submodule" &&
-		git commit -m "branch2 resolved by mergetool from subdir"
-	)
-
-Switched to a new branch 'test7'
-Merging:
-afa562b branch1 changes
-virtual master
-found 1 common ancestor:
-a130783 add initial versions
-Failed to merge submodule submod (merge following commits not found)
-Auto-merging submod
-CONFLICT (submodule): Merge conflict in submod
-Auto-merging subdir/file3
-CONFLICT (content): Merge conflict in subdir/file3
-Auto-merging spaced name
-CONFLICT (content): Merge conflict in spaced name
-Auto-merging file2
-CONFLICT (add/add): Merge conflict in file2
-CONFLICT (modify/delete): file12 deleted in HEAD and modified in master. Version master of file12 left in tree.
-CONFLICT (modify/delete): file11 deleted in master and modified in HEAD. Version HEAD of file11 left in tree.
-Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-Auto-merging both
-CONFLICT (add/add): Merge conflict in both
-Automatic merge failed; fix conflicts and then commit the result.
-Merging:
-submod
-
-Submodule merge conflict for 'submod':
-  {local}: submodule commit 5178faa356dc98300152496c68bbc28d09f77078
-  {remote}: submodule commit 369c179056ee23661cc437cf94a9156432b09d2c
-Use (l)ocal or (r)emote, or (a)bort? Merging:
-both
-file1
-file11
-file12
-file2
-spaced name
-subdir/file3
-
-Normal merge conflict for 'both':
-  {local}: created file
-  {remote}: created file
-
-Normal merge conflict for 'file1':
-  {local}: modified file
-  {remote}: modified file
-
-Deleted merge conflict for 'file11':
-  {local}: modified file
-  {remote}: deleted
-Use (m)odified or (d)eleted file, or (a)bort? 
-Deleted merge conflict for 'file12':
-  {local}: deleted
-  {remote}: modified file
-Use (m)odified or (d)eleted file, or (a)bort? 
-Normal merge conflict for 'file2':
-  {local}: created file
-  {remote}: created file
-
-Normal merge conflict for 'spaced name':
-  {local}: modified file
-  {remote}: modified file
-
-Normal merge conflict for 'subdir/file3':
-  {local}: modified file
-  {remote}: modified file
-Submodule path 'submod': checked out '369c179056ee23661cc437cf94a9156432b09d2c'
-[test7 cc83e7f] branch2 resolved by mergetool from subdir
- Author: A U Thor <author@example.com>
-HEAD is now at cc83e7f branch2 resolved by mergetool from subdir
-ok 7 - mergetool merges all from subdir (rerere disabled)
-
-expecting success: 
-	test_when_finished "git reset --hard" &&
-	git checkout -b test$test_count branch1 &&
-	test_config rerere.enabled true &&
-	rm -rf .git/rr-cache &&
-	(
-		cd subdir &&
-		test_must_fail git merge master &&
-		( yes "r" | git mergetool ../submod ) &&
-		( yes "d" "d" | git mergetool --no-prompt ) &&
-		test "$(cat ../file1)" = "master updated" &&
-		test "$(cat ../file2)" = "master new" &&
-		test "$(cat file3)" = "master new sub" &&
-		( cd .. && git submodule update -N ) &&
-		test "$(cat ../submod/bar)" = "master submodule" &&
-		git commit -m "branch2 resolved by mergetool from subdir"
-	)
-
-Switched to a new branch 'test8'
-M	submod
-Merging:
-afa562b branch1 changes
-virtual master
-found 1 common ancestor:
-a130783 add initial versions
-Failed to merge submodule submod (merge following commits not found)
-Auto-merging submod
-CONFLICT (submodule): Merge conflict in submod
-Auto-merging subdir/file3
-CONFLICT (content): Merge conflict in subdir/file3
-Auto-merging spaced name
-CONFLICT (content): Merge conflict in spaced name
-Auto-merging file2
-CONFLICT (add/add): Merge conflict in file2
-CONFLICT (modify/delete): file12 deleted in HEAD and modified in master. Version master of file12 left in tree.
-CONFLICT (modify/delete): file11 deleted in master and modified in HEAD. Version HEAD of file11 left in tree.
-Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-Auto-merging both
-CONFLICT (add/add): Merge conflict in both
-Recorded preimage for 'both'
-Recorded preimage for 'file1'
-Recorded preimage for 'file2'
-Recorded preimage for 'spaced name'
-Recorded preimage for 'subdir/file3'
-Automatic merge failed; fix conflicts and then commit the result.
-Merging:
-submod
-
-Submodule merge conflict for 'submod':
-  {local}: submodule commit 5178faa356dc98300152496c68bbc28d09f77078
-  {remote}: submodule commit 369c179056ee23661cc437cf94a9156432b09d2c
-Use (l)ocal or (r)emote, or (a)bort? Merging:
-both
-file1
-file11
-file12
-file2
-spaced name
-subdir/file3
-
-Normal merge conflict for 'both':
-  {local}: created file
-  {remote}: created file
-
-Normal merge conflict for 'file1':
-  {local}: modified file
-  {remote}: modified file
-
-Deleted merge conflict for 'file11':
-  {local}: modified file
-  {remote}: deleted
-Use (m)odified or (d)eleted file, or (a)bort? 
-Deleted merge conflict for 'file12':
-  {local}: deleted
-  {remote}: modified file
-Use (m)odified or (d)eleted file, or (a)bort? 
-Normal merge conflict for 'file2':
-  {local}: created file
-  {remote}: created file
-
-Normal merge conflict for 'spaced name':
-  {local}: modified file
-  {remote}: modified file
-
-Normal merge conflict for 'subdir/file3':
-  {local}: modified file
-  {remote}: modified file
-Recorded resolution for 'both'.
-Recorded resolution for 'file1'.
-Recorded resolution for 'file2'.
-Recorded resolution for 'spaced name'.
-Recorded resolution for 'subdir/file3'.
-[test8 a99bd04] branch2 resolved by mergetool from subdir
- Author: A U Thor <author@example.com>
-HEAD is now at a99bd04 branch2 resolved by mergetool from subdir
-ok 8 - mergetool merges all from subdir (rerere enabled)
-
-expecting success: 
-	test_when_finished "git reset --hard" &&
-	test_config rerere.enabled true &&
-	rm -rf .git/rr-cache &&
-	git checkout -b test$test_count branch1 &&
-	git submodule update -N &&
-	test_must_fail git merge master >/dev/null 2>&1 &&
-	( yes "l" | git mergetool --no-prompt submod >/dev/null 2>&1 ) &&
-	( yes "d" "d" | git mergetool --no-prompt >/dev/null 2>&1 ) &&
-	git submodule update -N &&
-	output="$(yes "n" | git mergetool --no-prompt)" &&
-	test "$output" = "No files need merging"
-
-Switched to a new branch 'test9'
-M	submod
-Submodule path 'submod': checked out '5178faa356dc98300152496c68bbc28d09f77078'
-HEAD is now at afa562b branch1 changes
-ok 9 - mergetool skips resolved paths when rerere is active
-
-expecting success: 
-	test_when_finished "git reset --hard" &&
-	test_config rerere.enabled true &&
-	git checkout stash1 &&
-	echo "Conflicting stash content" >file11 &&
-	git stash &&
-
-	git checkout --detach stash2 &&
-	test_must_fail git stash apply &&
-
-	test -n "$(git ls-files -u)" &&
-	conflicts="$(git rerere remaining)" &&
-	test "$conflicts" = "file11" &&
-	output="$(git mergetool --no-prompt)" &&
-	test "$output" != "No files need merging" &&
-
-	git commit -am "save the stash resolution" &&
-
-	git reset --hard stash2 &&
-	test_must_fail git stash apply &&
-
-	test -n "$(git ls-files -u)" &&
-	conflicts="$(git rerere remaining)" &&
-	test -z "$conflicts" &&
-	output="$(git mergetool --no-prompt)" &&
-	test "$output" = "No files need merging"
-
-Switched to branch 'stash1'
-M	submod
-Saved working directory and index state WIP on stash1: 667df55 stash1 changes
-HEAD is now at 62e3426 stash2 changes
-M	submod
-Merging Updated upstream with Stashed changes
-Merging:
-virtual Updated upstream
-virtual Stashed changes
-found 1 common ancestor:
-virtual 49add87c96e8bb0cd9fab7df66b97cb94a8c3285
-Auto-merging file11
-CONFLICT (content): Merge conflict in file11
-Recorded preimage for 'file11'
-Recorded resolution for 'file11'.
-[detached HEAD c436e9c] save the stash resolution
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+), 2 deletions(-)
-HEAD is now at 62e3426 stash2 changes
-Merging Updated upstream with Stashed changes
-Merging:
-virtual Updated upstream
-virtual Stashed changes
-found 1 common ancestor:
-virtual 49add87c96e8bb0cd9fab7df66b97cb94a8c3285
-Auto-merging file11
-CONFLICT (content): Merge conflict in file11
-Resolved 'file11' using previous resolution.
-HEAD is now at 62e3426 stash2 changes
-ok 10 - conflicted stash sets up rerere
-
-expecting success: 
-	test_when_finished "git reset --hard" &&
-	test_config rerere.enabled false &&
-	git checkout -b test$test_count branch1 &&
-	git submodule update -N &&
-	test_must_fail git merge master &&
-
-	( yes "" | git mergetool subdir ) &&
-
-	test "$(cat subdir/file3)" = "master new sub"
-
-Previous HEAD position was 62e3426 stash2 changes
-Switched to a new branch 'test11'
-Merging:
-afa562b branch1 changes
-virtual master
-found 1 common ancestor:
-a130783 add initial versions
-Failed to merge submodule submod (merge following commits not found)
-Auto-merging submod
-CONFLICT (submodule): Merge conflict in submod
-Auto-merging subdir/file3
-CONFLICT (content): Merge conflict in subdir/file3
-Auto-merging spaced name
-CONFLICT (content): Merge conflict in spaced name
-Auto-merging file2
-CONFLICT (add/add): Merge conflict in file2
-CONFLICT (modify/delete): file12 deleted in HEAD and modified in master. Version master of file12 left in tree.
-CONFLICT (modify/delete): file11 deleted in master and modified in HEAD. Version HEAD of file11 left in tree.
-Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-Auto-merging both
-CONFLICT (add/add): Merge conflict in both
-Automatic merge failed; fix conflicts and then commit the result.
-Merging:
-subdir/file3
-
-Normal merge conflict for 'subdir/file3':
-  {local}: modified file
-  {remote}: modified file
-HEAD is now at afa562b branch1 changes
-ok 11 - mergetool takes partial path
-
-expecting success: 
-	test_when_finished "git reset --hard" &&
-	git checkout -b test$test_count move-to-c &&
-	test_must_fail git merge move-to-b &&
-	echo d | git mergetool a/a/file.txt &&
-	! test -f a/a/file.txt &&
-	git reset --hard &&
-	test_must_fail git merge move-to-b &&
-	echo m | git mergetool a/a/file.txt &&
-	test -f b/b/file.txt &&
-	git reset --hard &&
-	test_must_fail git merge move-to-b &&
-	! echo a | git mergetool a/a/file.txt &&
-	! test -f a/a/file.txt
-
-Switched to a new branch 'test12'
-Merging:
-323e890 move to c
-virtual move-to-b
-found 1 common ancestor:
-3728485 base file
-CONFLICT (rename/rename): Rename directory a/a->c/c in HEAD. Rename directory a/a->b/b in move-to-b
-CONFLICT (rename/rename): Rename "a/a/file.txt"->"c/c/file.txt" in branch "HEAD" rename "a/a/file.txt"->"b/b/file.txt" in "move-to-b"
-Automatic merge failed; fix conflicts and then commit the result.
-Merging:
-a/a/file.txt
-
-Deleted merge conflict for 'a/a/file.txt':
-  {local}: deleted
-  {remote}: deleted
-Use (m)odified or (d)eleted file, or (a)bort? HEAD is now at 323e890 move to c
-Merging:
-323e890 move to c
-virtual move-to-b
-found 1 common ancestor:
-3728485 base file
-CONFLICT (rename/rename): Rename directory a/a->c/c in HEAD. Rename directory a/a->b/b in move-to-b
-CONFLICT (rename/rename): Rename "a/a/file.txt"->"c/c/file.txt" in branch "HEAD" rename "a/a/file.txt"->"b/b/file.txt" in "move-to-b"
-Automatic merge failed; fix conflicts and then commit the result.
-Merging:
-a/a/file.txt
-
-Deleted merge conflict for 'a/a/file.txt':
-  {local}: deleted
-  {remote}: deleted
-Use (m)odified or (d)eleted file, or (a)bort? HEAD is now at 323e890 move to c
-Merging:
-323e890 move to c
-virtual move-to-b
-found 1 common ancestor:
-3728485 base file
-CONFLICT (rename/rename): Rename directory a/a->c/c in HEAD. Rename directory a/a->b/b in move-to-b
-CONFLICT (rename/rename): Rename "a/a/file.txt"->"c/c/file.txt" in branch "HEAD" rename "a/a/file.txt"->"b/b/file.txt" in "move-to-b"
-Automatic merge failed; fix conflicts and then commit the result.
-Merging:
-a/a/file.txt
-
-Deleted merge conflict for 'a/a/file.txt':
-  {local}: deleted
-  {remote}: deleted
-Use (m)odified or (d)eleted file, or (a)bort? HEAD is now at 323e890 move to c
-ok 12 - mergetool delete/delete conflict
-
-expecting success: 
-	test_when_finished "git reset --hard" &&
-	git checkout -b test$test_count move-to-c &&
-	test_config mergetool.keepBackup true &&
-	test_must_fail git merge move-to-b &&
-	echo d | git mergetool a/a/file.txt 2>actual &&
-	test_must_be_empty actual &&
-	! test -d a
-
-Switched to a new branch 'test13'
-Merging:
-323e890 move to c
-virtual move-to-b
-found 1 common ancestor:
-3728485 base file
-CONFLICT (rename/rename): Rename directory a/a->c/c in HEAD. Rename directory a/a->b/b in move-to-b
-CONFLICT (rename/rename): Rename "a/a/file.txt"->"c/c/file.txt" in branch "HEAD" rename "a/a/file.txt"->"b/b/file.txt" in "move-to-b"
-Automatic merge failed; fix conflicts and then commit the result.
-Merging:
-a/a/file.txt
-
-Deleted merge conflict for 'a/a/file.txt':
-  {local}: deleted
-  {remote}: deleted
-Use (m)odified or (d)eleted file, or (a)bort? HEAD is now at 323e890 move to c
-ok 13 - mergetool produces no errors when keepBackup is used
-
-expecting success: 
-	test_when_finished "git reset --hard" &&
-	git checkout -b test$test_count move-to-c &&
-	test_config mergetool.keepTemporaries false &&
-	test_must_fail git merge move-to-b &&
-	echo d | git mergetool a/a/file.txt &&
-	! test -d a
-
-Switched to a new branch 'test14'
-Merging:
-323e890 move to c
-virtual move-to-b
-found 1 common ancestor:
-3728485 base file
-CONFLICT (rename/rename): Rename directory a/a->c/c in HEAD. Rename directory a/a->b/b in move-to-b
-CONFLICT (rename/rename): Rename "a/a/file.txt"->"c/c/file.txt" in branch "HEAD" rename "a/a/file.txt"->"b/b/file.txt" in "move-to-b"
-Automatic merge failed; fix conflicts and then commit the result.
-Merging:
-a/a/file.txt
-
-Deleted merge conflict for 'a/a/file.txt':
-  {local}: deleted
-  {remote}: deleted
-Use (m)odified or (d)eleted file, or (a)bort? HEAD is now at 323e890 move to c
-ok 14 - mergetool honors tempfile config for deleted files
-
-expecting success: 
-	test_when_finished "git reset --hard" &&
-	test_when_finished "git clean -fdx" &&
-	git checkout -b test$test_count move-to-c &&
-	test_config mergetool.keepTemporaries true &&
-	test_must_fail git merge move-to-b &&
-	! test_write_lines a n | git mergetool a/a/file.txt &&
-	test -d a/a &&
-	cat >expect <<-\EOF &&
-	file_BASE_.txt
-	file_LOCAL_.txt
-	file_REMOTE_.txt
-	EOF
-	ls -1 a/a | sed -e "s/[0-9]*//g" >actual &&
-	test_cmp expect actual
-
-Switched to a new branch 'test15'
-Merging:
-323e890 move to c
-virtual move-to-b
-found 1 common ancestor:
-3728485 base file
-CONFLICT (rename/rename): Rename directory a/a->c/c in HEAD. Rename directory a/a->b/b in move-to-b
-CONFLICT (rename/rename): Rename "a/a/file.txt"->"c/c/file.txt" in branch "HEAD" rename "a/a/file.txt"->"b/b/file.txt" in "move-to-b"
-Automatic merge failed; fix conflicts and then commit the result.
-Merging:
-a/a/file.txt
-
-Deleted merge conflict for 'a/a/file.txt':
-  {local}: deleted
-  {remote}: deleted
-Use (m)odified or (d)eleted file, or (a)bort? Removing a/a/file_BASE_3503930.txt
-Removing a/a/file_LOCAL_3503930.txt
-Removing a/a/file_REMOTE_3503930.txt
-Removing actual
-Removing both.orig
-Removing expect
-Removing file1.orig
-Removing file11.orig
-Removing file2.orig
-Removing spaced name.orig
-Removing subdir/file3.orig
-HEAD is now at 323e890 move to c
-ok 15 - mergetool keeps tempfiles when aborting delete/delete
-
-expecting success: 
-	test_when_finished "git reset --hard" &&
-	git checkout -b test$test_count branch1 &&
-	git submodule update -N &&
-	mv submod submod-movedaside &&
-	git rm --cached submod &&
-	git commit -m "Submodule deleted from branch" &&
-	git checkout -b test$test_count.a test$test_count &&
-	test_must_fail git merge master &&
-	test -n "$(git ls-files -u)" &&
-	( yes "" | git mergetool file1 file2 spaced\ name subdir/file3 >/dev/null 2>&1 ) &&
-	( yes "" | git mergetool both >/dev/null 2>&1 ) &&
-	( yes "d" | git mergetool file11 file12 >/dev/null 2>&1 ) &&
-	( yes "r" | git mergetool submod ) &&
-	rmdir submod && mv submod-movedaside submod &&
-	test "$(cat submod/bar)" = "branch1 submodule" &&
-	git submodule update -N &&
-	test "$(cat submod/bar)" = "master submodule" &&
-	output="$(git mergetool --no-prompt)" &&
-	test "$output" = "No files need merging" &&
-	git commit -m "Merge resolved by keeping module" &&
-
-	mv submod submod-movedaside &&
-	git checkout -b test$test_count.b test$test_count &&
-	git submodule update -N &&
-	test_must_fail git merge master &&
-	test -n "$(git ls-files -u)" &&
-	( yes "" | git mergetool file1 file2 spaced\ name subdir/file3 >/dev/null 2>&1 ) &&
-	( yes "" | git mergetool both >/dev/null 2>&1 ) &&
-	( yes "d" | git mergetool file11 file12 >/dev/null 2>&1 ) &&
-	( yes "l" | git mergetool submod ) &&
-	test ! -e submod &&
-	output="$(git mergetool --no-prompt)" &&
-	test "$output" = "No files need merging" &&
-	git commit -m "Merge resolved by deleting module" &&
-
-	mv submod-movedaside submod &&
-	git checkout -b test$test_count.c master &&
-	git submodule update -N &&
-	test_must_fail git merge test$test_count &&
-	test -n "$(git ls-files -u)" &&
-	( yes "" | git mergetool file1 file2 spaced\ name subdir/file3 >/dev/null 2>&1 ) &&
-	( yes "" | git mergetool both >/dev/null 2>&1 ) &&
-	( yes "d" | git mergetool file11 file12 >/dev/null 2>&1 ) &&
-	( yes "r" | git mergetool submod ) &&
-	test ! -e submod &&
-	test -d submod.orig &&
-	git submodule update -N &&
-	output="$(git mergetool --no-prompt)" &&
-	test "$output" = "No files need merging" &&
-	git commit -m "Merge resolved by deleting module" &&
-	mv submod.orig submod &&
-
-	git checkout -b test$test_count.d master &&
-	git submodule update -N &&
-	test_must_fail git merge test$test_count &&
-	test -n "$(git ls-files -u)" &&
-	( yes "" | git mergetool file1 file2 spaced\ name subdir/file3 >/dev/null 2>&1 ) &&
-	( yes "" | git mergetool both >/dev/null 2>&1 ) &&
-	( yes "d" | git mergetool file11 file12 >/dev/null 2>&1 ) &&
-	( yes "l" | git mergetool submod ) &&
-	test "$(cat submod/bar)" = "master submodule" &&
-	git submodule update -N &&
-	test "$(cat submod/bar)" = "master submodule" &&
-	output="$(git mergetool --no-prompt)" &&
-	test "$output" = "No files need merging" &&
-	git commit -m "Merge resolved by keeping module"
-
-Switched to a new branch 'test16'
-rm 'submod'
-[test16 63e3214] Submodule deleted from branch
- Author: A U Thor <author@example.com>
- 1 file changed, 1 deletion(-)
- delete mode 160000 submod
-Switched to a new branch 'test16.a'
-Merging:
-63e3214 Submodule deleted from branch
-virtual master
-found 1 common ancestor:
-a130783 add initial versions
-CONFLICT (modify/delete): submod deleted in HEAD and modified in master. Version master of submod left in tree.
-Auto-merging subdir/file3
-CONFLICT (content): Merge conflict in subdir/file3
-Auto-merging spaced name
-CONFLICT (content): Merge conflict in spaced name
-Auto-merging file2
-CONFLICT (add/add): Merge conflict in file2
-CONFLICT (modify/delete): file12 deleted in HEAD and modified in master. Version master of file12 left in tree.
-CONFLICT (modify/delete): file11 deleted in master and modified in HEAD. Version HEAD of file11 left in tree.
-Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-Auto-merging both
-CONFLICT (add/add): Merge conflict in both
-Recorded preimage for 'both'
-Recorded preimage for 'file1'
-Recorded preimage for 'file2'
-Recorded preimage for 'spaced name'
-Recorded preimage for 'subdir/file3'
-Automatic merge failed; fix conflicts and then commit the result.
-Merging:
-submod
-
-Submodule merge conflict for 'submod':
-  {local}: deleted
-  {remote}: submodule commit 369c179056ee23661cc437cf94a9156432b09d2c
-Use (l)ocal or (r)emote, or (a)bort? Submodule path 'submod': checked out '369c179056ee23661cc437cf94a9156432b09d2c'
-Recorded resolution for 'both'.
-Recorded resolution for 'file1'.
-Recorded resolution for 'file2'.
-Recorded resolution for 'spaced name'.
-Recorded resolution for 'subdir/file3'.
-[test16.a f2c2560] Merge resolved by keeping module
- Author: A U Thor <author@example.com>
-Switched to a new branch 'test16.b'
-Merging:
-63e3214 Submodule deleted from branch
-virtual master
-found 1 common ancestor:
-a130783 add initial versions
-CONFLICT (modify/delete): submod deleted in HEAD and modified in master. Version master of submod left in tree.
-Auto-merging subdir/file3
-CONFLICT (content): Merge conflict in subdir/file3
-Auto-merging spaced name
-CONFLICT (content): Merge conflict in spaced name
-Auto-merging file2
-CONFLICT (add/add): Merge conflict in file2
-CONFLICT (modify/delete): file12 deleted in HEAD and modified in master. Version master of file12 left in tree.
-CONFLICT (modify/delete): file11 deleted in master and modified in HEAD. Version HEAD of file11 left in tree.
-Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-Auto-merging both
-CONFLICT (add/add): Merge conflict in both
-Resolved 'both' using previous resolution.
-Resolved 'file1' using previous resolution.
-Resolved 'file2' using previous resolution.
-Resolved 'spaced name' using previous resolution.
-Resolved 'subdir/file3' using previous resolution.
-Automatic merge failed; fix conflicts and then commit the result.
-Merging:
-submod
-
-Submodule merge conflict for 'submod':
-  {local}: deleted
-  {remote}: submodule commit 369c179056ee23661cc437cf94a9156432b09d2c
-Use (l)ocal or (r)emote, or (a)bort? [test16.b 39d52ee] Merge resolved by deleting module
- Author: A U Thor <author@example.com>
-Switched to a new branch 'test16.c'
-Merging:
-e3c814d master updates
-virtual test16
-found 1 common ancestor:
-a130783 add initial versions
-CONFLICT (modify/delete): submod deleted in test16 and modified in HEAD. Version HEAD of submod left in tree at submod~HEAD.
-Auto-merging subdir/file3
-CONFLICT (content): Merge conflict in subdir/file3
-Auto-merging spaced name
-CONFLICT (content): Merge conflict in spaced name
-Auto-merging file2
-CONFLICT (add/add): Merge conflict in file2
-CONFLICT (modify/delete): file12 deleted in test16 and modified in HEAD. Version HEAD of file12 left in tree.
-CONFLICT (modify/delete): file11 deleted in HEAD and modified in test16. Version test16 of file11 left in tree.
-Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-Auto-merging both
-CONFLICT (add/add): Merge conflict in both
-Resolved 'both' using previous resolution.
-Resolved 'file1' using previous resolution.
-Resolved 'file2' using previous resolution.
-Resolved 'spaced name' using previous resolution.
-Resolved 'subdir/file3' using previous resolution.
-Automatic merge failed; fix conflicts and then commit the result.
-Merging:
-submod
-
-Submodule merge conflict for 'submod':
-  {local}: submodule commit 369c179056ee23661cc437cf94a9156432b09d2c
-  {remote}: deleted
-Use (l)ocal or (r)emote, or (a)bort? [test16.c 917eaab] Merge resolved by deleting module
- Author: A U Thor <author@example.com>
-Switched to a new branch 'test16.d'
-Merging:
-e3c814d master updates
-virtual test16
-found 1 common ancestor:
-a130783 add initial versions
-CONFLICT (modify/delete): submod deleted in test16 and modified in HEAD. Version HEAD of submod left in tree at submod~HEAD.
-Auto-merging subdir/file3
-CONFLICT (content): Merge conflict in subdir/file3
-Auto-merging spaced name
-CONFLICT (content): Merge conflict in spaced name
-Auto-merging file2
-CONFLICT (add/add): Merge conflict in file2
-CONFLICT (modify/delete): file12 deleted in test16 and modified in HEAD. Version HEAD of file12 left in tree.
-CONFLICT (modify/delete): file11 deleted in HEAD and modified in test16. Version test16 of file11 left in tree.
-Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-Auto-merging both
-CONFLICT (add/add): Merge conflict in both
-Resolved 'both' using previous resolution.
-Resolved 'file1' using previous resolution.
-Resolved 'file2' using previous resolution.
-Resolved 'spaced name' using previous resolution.
-Resolved 'subdir/file3' using previous resolution.
-Automatic merge failed; fix conflicts and then commit the result.
-Merging:
-submod
-
-Submodule merge conflict for 'submod':
-  {local}: submodule commit 369c179056ee23661cc437cf94a9156432b09d2c
-  {remote}: deleted
-Use (l)ocal or (r)emote, or (a)bort? [test16.d c264cd9] Merge resolved by keeping module
- Author: A U Thor <author@example.com>
-HEAD is now at c264cd9 Merge resolved by keeping module
-ok 16 - deleted vs modified submodule
-
-expecting success: 
-	test_when_finished "git reset --hard" &&
-	git checkout -b test$test_count branch1 &&
-	git submodule update -N &&
-	mv submod submod-movedaside &&
-	git rm --cached submod &&
-	echo not a submodule >submod &&
-	git add submod &&
-	git commit -m "Submodule path becomes file" &&
-	git checkout -b test$test_count.a branch1 &&
-	test_must_fail git merge master &&
-	test -n "$(git ls-files -u)" &&
-	( yes "" | git mergetool file1 file2 spaced\ name subdir/file3 >/dev/null 2>&1 ) &&
-	( yes "" | git mergetool both >/dev/null 2>&1 ) &&
-	( yes "d" | git mergetool file11 file12 >/dev/null 2>&1 ) &&
-	( yes "r" | git mergetool submod ) &&
-	rmdir submod && mv submod-movedaside submod &&
-	test "$(cat submod/bar)" = "branch1 submodule" &&
-	git submodule update -N &&
-	test "$(cat submod/bar)" = "master submodule" &&
-	output="$(git mergetool --no-prompt)" &&
-	test "$output" = "No files need merging" &&
-	git commit -m "Merge resolved by keeping module" &&
-
-	mv submod submod-movedaside &&
-	git checkout -b test$test_count.b test$test_count &&
-	test_must_fail git merge master &&
-	test -n "$(git ls-files -u)" &&
-	( yes "" | git mergetool file1 file2 spaced\ name subdir/file3 >/dev/null 2>&1 ) &&
-	( yes "" | git mergetool both >/dev/null 2>&1 ) &&
-	( yes "d" | git mergetool file11 file12 >/dev/null 2>&1 ) &&
-	( yes "l" | git mergetool submod ) &&
-	git submodule update -N &&
-	test "$(cat submod)" = "not a submodule" &&
-	output="$(git mergetool --no-prompt)" &&
-	test "$output" = "No files need merging" &&
-	git commit -m "Merge resolved by keeping file" &&
-
-	git checkout -b test$test_count.c master &&
-	rmdir submod && mv submod-movedaside submod &&
-	test ! -e submod.orig &&
-	git submodule update -N &&
-	test_must_fail git merge test$test_count &&
-	test -n "$(git ls-files -u)" &&
-	( yes "" | git mergetool file1 file2 spaced\ name subdir/file3 >/dev/null 2>&1 ) &&
-	( yes "" | git mergetool both >/dev/null 2>&1 ) &&
-	( yes "d" | git mergetool file11 file12 >/dev/null 2>&1 ) &&
-	( yes "r" | git mergetool submod ) &&
-	test -d submod.orig &&
-	git submodule update -N &&
-	test "$(cat submod)" = "not a submodule" &&
-	output="$(git mergetool --no-prompt)" &&
-	test "$output" = "No files need merging" &&
-	git commit -m "Merge resolved by keeping file" &&
-
-	git checkout -b test$test_count.d master &&
-	rmdir submod && mv submod.orig submod &&
-	git submodule update -N &&
-	test_must_fail git merge test$test_count &&
-	test -n "$(git ls-files -u)" &&
-	( yes "" | git mergetool file1 file2 spaced\ name subdir/file3 >/dev/null 2>&1 ) &&
-	( yes "" | git mergetool both>/dev/null 2>&1 ) &&
-	( yes "d" | git mergetool file11 file12 >/dev/null 2>&1 ) &&
-	( yes "l" | git mergetool submod ) &&
-	test "$(cat submod/bar)" = "master submodule" &&
-	git submodule update -N &&
-	test "$(cat submod/bar)" = "master submodule" &&
-	output="$(git mergetool --no-prompt)" &&
-	test "$output" = "No files need merging" &&
-	git commit -m "Merge resolved by keeping module"
-
-Switched to a new branch 'test17'
-M	submod
-Submodule path 'submod': checked out '5178faa356dc98300152496c68bbc28d09f77078'
-rm 'submod'
-[test17 2411789] Submodule path becomes file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
- mode change 160000 => 100644 submod
-Switched to a new branch 'test17.a'
-Merging:
-afa562b branch1 changes
-virtual master
-found 1 common ancestor:
-a130783 add initial versions
-Failed to merge submodule submod (not checked out)
-Auto-merging submod
-CONFLICT (submodule): Merge conflict in submod
-Auto-merging subdir/file3
-CONFLICT (content): Merge conflict in subdir/file3
-Auto-merging spaced name
-CONFLICT (content): Merge conflict in spaced name
-Auto-merging file2
-CONFLICT (add/add): Merge conflict in file2
-CONFLICT (modify/delete): file12 deleted in HEAD and modified in master. Version master of file12 left in tree.
-CONFLICT (modify/delete): file11 deleted in master and modified in HEAD. Version HEAD of file11 left in tree.
-Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-Auto-merging both
-CONFLICT (add/add): Merge conflict in both
-Resolved 'both' using previous resolution.
-Resolved 'file1' using previous resolution.
-Resolved 'file2' using previous resolution.
-Resolved 'spaced name' using previous resolution.
-Resolved 'subdir/file3' using previous resolution.
-Automatic merge failed; fix conflicts and then commit the result.
-Merging:
-submod
+	git update-index --add dir/file/file &&
+	git commit -m 'detect node change from file to directory #1' &&
+	test_must_fail git svn set-tree --find-copies-harder --rmdir 		remotes/git-svn..mybranch
 
-Submodule merge conflict for 'submod':
-  {local}: submodule commit 5178faa356dc98300152496c68bbc28d09f77078
-  {remote}: submodule commit 369c179056ee23661cc437cf94a9156432b09d2c
-Use (l)ocal or (r)emote, or (a)bort? Submodule path 'submod': checked out '369c179056ee23661cc437cf94a9156432b09d2c'
-[test17.a 1a074c2] Merge resolved by keeping module
+[mybranch 07c7f42] detect node change from file to directory #1
  Author: A U Thor <author@example.com>
-Switched to a new branch 'test17.b'
-Merging:
-2411789 Submodule path becomes file
-virtual master
-found 1 common ancestor:
-a130783 add initial versions
-CONFLICT (content): Merge conflict in submod
-Auto-merging subdir/file3
-CONFLICT (content): Merge conflict in subdir/file3
-Auto-merging spaced name
-CONFLICT (content): Merge conflict in spaced name
-Auto-merging file2
-CONFLICT (add/add): Merge conflict in file2
-CONFLICT (modify/delete): file12 deleted in HEAD and modified in master. Version master of file12 left in tree.
-CONFLICT (modify/delete): file11 deleted in master and modified in HEAD. Version HEAD of file11 left in tree.
-Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-Auto-merging both
-CONFLICT (add/add): Merge conflict in both
-Resolved 'both' using previous resolution.
-Resolved 'file1' using previous resolution.
-Resolved 'file2' using previous resolution.
-Resolved 'spaced name' using previous resolution.
-Resolved 'subdir/file3' using previous resolution.
-Automatic merge failed; fix conflicts and then commit the result.
-Merging:
-submod
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename dir/{ => file}/file (100%)
+dir/file already exists in repository at r2 and it is not a directory (file/1)
+ok 7 - detect node change from file to directory #1
 
-Submodule merge conflict for 'submod':
-  {local}: modified file
-  {remote}: submodule commit 369c179056ee23661cc437cf94a9156432b09d2c
-Use (l)ocal or (r)emote, or (a)bort? [test17.b d8fa1b7] Merge resolved by keeping file
- Author: A U Thor <author@example.com>
-Switched to a new branch 'test17.c'
-error: failed to create path 'submod': perhaps a D/F conflict?
-Merging:
-e3c814d master updates
-virtual test17
-found 1 common ancestor:
-a130783 add initial versions
-CONFLICT (content): Merge conflict in submod
-Auto-merging subdir/file3
-CONFLICT (content): Merge conflict in subdir/file3
-Auto-merging spaced name
-CONFLICT (content): Merge conflict in spaced name
-Auto-merging file2
-CONFLICT (add/add): Merge conflict in file2
-CONFLICT (modify/delete): file12 deleted in test17 and modified in HEAD. Version HEAD of file12 left in tree.
-CONFLICT (modify/delete): file11 deleted in HEAD and modified in test17. Version test17 of file11 left in tree.
-Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-Auto-merging both
-CONFLICT (add/add): Merge conflict in both
-Resolved 'both' using previous resolution.
-Resolved 'file1' using previous resolution.
-Resolved 'file2' using previous resolution.
-Resolved 'spaced name' using previous resolution.
-Resolved 'subdir/file3' using previous resolution.
-Automatic merge failed; fix conflicts and then commit the result.
-Merging:
-submod
+expecting success: 
+	rm -rf dir "$GIT_DIR"/index &&
+	git checkout -f -b mybranch2 remotes/git-svn &&
+	mv bar/zzz zzz &&
+	rm -rf bar &&
+	mv zzz bar &&
+	git update-index --remove -- bar/zzz &&
+	git update-index --add -- bar &&
+	git commit -m "$name" &&
+	test_must_fail git svn set-tree --find-copies-harder --rmdir \
+		remotes/git-svn..mybranch2
 
-Submodule merge conflict for 'submod':
-  {local}: submodule commit 369c179056ee23661cc437cf94a9156432b09d2c
-  {remote}: modified file
-Use (l)ocal or (r)emote, or (a)bort? [test17.c 08f889a] Merge resolved by keeping file
+Switched to a new branch 'mybranch2'
+[mybranch2 0cb9afe] detect node change from directory to file #1
  Author: A U Thor <author@example.com>
-Switched to a new branch 'test17.d'
-error: failed to create path 'submod': perhaps a D/F conflict?
-Merging:
-e3c814d master updates
-virtual test17
-found 1 common ancestor:
-a130783 add initial versions
-CONFLICT (content): Merge conflict in submod
-Auto-merging subdir/file3
-CONFLICT (content): Merge conflict in subdir/file3
-Auto-merging spaced name
-CONFLICT (content): Merge conflict in spaced name
-Auto-merging file2
-CONFLICT (add/add): Merge conflict in file2
-CONFLICT (modify/delete): file12 deleted in test17 and modified in HEAD. Version HEAD of file12 left in tree.
-CONFLICT (modify/delete): file11 deleted in HEAD and modified in test17. Version test17 of file11 left in tree.
-Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-Auto-merging both
-CONFLICT (add/add): Merge conflict in both
-Resolved 'both' using previous resolution.
-Resolved 'file1' using previous resolution.
-Resolved 'file2' using previous resolution.
-Resolved 'spaced name' using previous resolution.
-Resolved 'subdir/file3' using previous resolution.
-Automatic merge failed; fix conflicts and then commit the result.
-Merging:
-submod
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename bar/zzz => bar (100%)
+Transaction is out of date: Directory '/bar' is out of date at /build/git-2.20.1/perl/build/lib/Git/SVN.pm line 2075.
 
-Submodule merge conflict for 'submod':
-  {local}: submodule commit 369c179056ee23661cc437cf94a9156432b09d2c
-  {remote}: modified file
-Use (l)ocal or (r)emote, or (a)bort? [test17.d 430aed5] Merge resolved by keeping module
- Author: A U Thor <author@example.com>
-HEAD is now at 430aed5 Merge resolved by keeping module
-ok 17 - file vs modified submodule
+ok 8 - detect node change from directory to file #1
 
 expecting success: 
-	test_when_finished "git reset --hard" &&
-	git checkout -b test$test_count branch1 &&
-	git submodule update -N &&
-	(
-		cd subdir &&
-		test_create_repo subdir_module &&
-		(
-		cd subdir_module &&
-		: >file15 &&
-		git add file15 &&
-		git commit -m "add initial versions"
-		)
-	) &&
-	test_when_finished "rm -rf subdir/subdir_module" &&
-	git submodule add git://example.com/subsubmodule subdir/subdir_module &&
-	git add subdir/subdir_module &&
-	git commit -m "add submodule in subdirectory" &&
+	rm -f "$GIT_DIR"/index &&
+	git checkout -f -b mybranch3 remotes/git-svn &&
+	rm bar/zzz &&
+	git update-index --remove bar/zzz &&
+	mkdir bar/zzz &&
+	echo yyy > bar/zzz/yyy &&
+	git update-index --add bar/zzz/yyy &&
+	git commit -m "$name" &&
+	git svn set-tree --find-copies-harder --rmdir \
+		remotes/git-svn..mybranch3 &&
+	svn_cmd up "$SVN_TREE" &&
+	test -d "$SVN_TREE"/bar/zzz &&
+	test -e "$SVN_TREE"/bar/zzz/yyy
 
-	git checkout -b test$test_count.a test$test_count &&
-	git submodule update -N &&
-	(
-	cd subdir/subdir_module &&
-		git checkout -b super10.a &&
-		echo test$test_count.a >file15 &&
-		git add file15 &&
-		git commit -m "on branch 10.a"
-	) &&
-	git add subdir/subdir_module &&
-	git commit -m "change submodule in subdirectory on test$test_count.a" &&
+Switched to a new branch 'mybranch3'
+[mybranch3 085cf29] 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
+ create mode 100644 bar/zzz/yyy
+	D	bar/zzz
+	A	bar/zzz/yyy
+	D	bar/zzz
+	A	bar/zzz/yyy
+r3 = 7e1c17d3726f24007ebf6f4d09d78123c690da8f (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
+A    .git/svn/refs/remotes/git-svn/svn-tree/bar/zzz
+A    .git/svn/refs/remotes/git-svn/svn-tree/bar/zzz/yyy
+Updated to revision 3.
+ok 9 - detect node change from file to directory #2
 
-	git checkout -b test$test_count.b test$test_count &&
-	git submodule update -N &&
-	(
-		cd subdir/subdir_module &&
-		git checkout -b super10.b &&
-		echo test$test_count.b >file15 &&
-		git add file15 &&
-		git commit -m "on branch 10.b"
-	) &&
-	git add subdir/subdir_module &&
-	git commit -m "change submodule in subdirectory on test$test_count.b" &&
+expecting success: 
+	rm -f "$GIT_DIR"/index &&
+	git checkout -f -b mybranch4 remotes/git-svn &&
+	rm -rf dir &&
+	git update-index --remove -- dir/file &&
+	touch dir &&
+	echo asdf > dir &&
+	git update-index --add -- dir &&
+	git commit -m "$name" &&
+	test_must_fail git svn set-tree --find-copies-harder --rmdir \
+		remotes/git-svn..mybranch4
 
-	test_must_fail git merge test$test_count.a >/dev/null 2>&1 &&
-	(
-		cd subdir &&
-		( yes "l" | git mergetool subdir_module )
-	) &&
-	test "$(cat subdir/subdir_module/file15)" = "test$test_count.b" &&
-	git submodule update -N &&
-	test "$(cat subdir/subdir_module/file15)" = "test$test_count.b" &&
-	git reset --hard &&
-	git submodule update -N &&
+Switched to a new branch 'mybranch4'
+[mybranch4 64b6ffc] 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 '2e799572-7ff3-4ff1-aa99-c2954751b74e', transaction '3-5', path '/dir' at /build/git-2.20.1/perl/build/lib/Git/SVN.pm line 2075.
 
-	test_must_fail git merge test$test_count.a >/dev/null 2>&1 &&
-	( yes "r" | git mergetool subdir/subdir_module ) &&
-	test "$(cat subdir/subdir_module/file15)" = "test$test_count.b" &&
-	git submodule update -N &&
-	test "$(cat subdir/subdir_module/file15)" = "test$test_count.a" &&
-	git commit -m "branch1 resolved with mergetool"
+ok 10 - detect node change from directory to file #2
 
-Switched to a new branch 'test18'
-M	submod
-Submodule path 'submod': checked out '5178faa356dc98300152496c68bbc28d09f77078'
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7610-mergetool/subdir/subdir_module/.git/
-[master (root-commit) b74a500] add initial versions
+expecting success: 
+	rm -f "$GIT_DIR"/index &&
+	git checkout -f -b mybranch5 remotes/git-svn &&
+	chmod -x exec.sh &&
+	git update-index exec.sh &&
+	git commit -m "$name" &&
+	git svn set-tree --find-copies-harder --rmdir \
+		remotes/git-svn..mybranch5 &&
+	svn_cmd up "$SVN_TREE" &&
+	test ! -x "$SVN_TREE"/exec.sh
+Switched to a new branch 'mybranch5'
+[mybranch5 761a26b] remove executable bit from a file
  Author: A U Thor <author@example.com>
  1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 file15
-Adding existing repo at 'subdir/subdir_module' to the index
-[test18 60996b1] add submodule in subdirectory
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 160000 subdir/subdir_module
-Switched to a new branch 'test18.a'
-Switched to a new branch 'super10.a'
-[super10.a 96e2b25] on branch 10.a
+ mode change 100755 => 100644 exec.sh
+	M	exec.sh
+	M	exec.sh
+r4 = d5e6d7690a3de7ccae3d310e5c406f4fd72ade08 (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
+Updated to revision 4.
+ok 11 - remove executable bit from a file
+
+expecting success: 
+	chmod +x exec.sh &&
+	git update-index exec.sh &&
+	git commit -m "$name" &&
+	git svn set-tree --find-copies-harder --rmdir \
+		remotes/git-svn..mybranch5 &&
+	svn_cmd up "$SVN_TREE" &&
+	test -x "$SVN_TREE"/exec.sh
+[mybranch5 dcfd55b] add executable bit back file
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[test18.a 74f3c07] change submodule in subdirectory on test18.a
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ mode change 100644 => 100755 exec.sh
+	M	exec.sh
+	M	exec.sh
+r5 = 0fe9bcfd6fb3dcce243846a7007ef47a876803ff (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
+Updated to revision 5.
+ok 12 - add executable bit back file
+
+checking prerequisite: SYMLINKS
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
+	# test whether the filesystem supports symbolic links
+	ln -s x y && test -h y
+
+)
+prerequisite SYMLINKS ok
+expecting success: 
+	rm exec.sh &&
+	ln -s file exec.sh &&
+	git update-index exec.sh &&
+	git commit -m "$name" &&
+	git svn set-tree --find-copies-harder --rmdir \
+		remotes/git-svn..mybranch5 &&
+	svn_cmd up "$SVN_TREE" &&
+	test -h "$SVN_TREE"/exec.sh
+[mybranch5 c7f6002] executable file becomes a symlink to file
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'test18.b'
-M	subdir/subdir_module
-Submodule path 'subdir/subdir_module': checked out 'b74a50063cde377109f873100f9c3e9d77d805ff'
-Switched to a new branch 'super10.b'
-[super10.b 0d7f23e] on branch 10.b
+ rewrite exec.sh (100%)
+ mode change 100755 => 120000
+	D	exec.sh
+	A	exec.sh
+	D	exec.sh
+	A	exec.sh
+W: -empty_dir: exec.sh
+r6 = 1fff0e9b0bf776a5b4ec90f521ac94021f6add7e (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
+A    .git/svn/refs/remotes/git-svn/svn-tree/exec.sh
+Updated to revision 6.
+ok 13 - executable file becomes a symlink to file
+
+expecting success: 
+	chmod +x file &&
+	ln -s file exec-2.sh &&
+	git update-index --add file exec-2.sh &&
+	git commit -m "$name" &&
+	git svn set-tree --find-copies-harder --rmdir \
+		remotes/git-svn..mybranch5 &&
+	svn_cmd up "$SVN_TREE" &&
+	test -x "$SVN_TREE"/file &&
+	test -h "$SVN_TREE"/exec-2.sh
+[mybranch5 0096538] new symlink is added to a file that was also just made executable
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[test18.b 453f121] change submodule in subdirectory on test18.b
+ 2 files changed, 1 insertion(+)
+ create mode 120000 exec-2.sh
+ mode change 100644 => 100755 file
+	C	exec.sh => exec-2.sh
+	M	file
+	A	exec-2.sh
+	M	file
+r7 = f112224175155c7fdfb6a7f5fb49b413892d236c (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
+ U   .git/svn/refs/remotes/git-svn/svn-tree/file
+Updated to revision 7.
+ok 14 - new symlink is added to a file that was also just made executable
+
+expecting success: 
+	echo git help >help &&
+	rm exec-2.sh &&
+	cp help exec-2.sh &&
+	git update-index exec-2.sh &&
+	git commit -m "$name" &&
+	git svn set-tree --find-copies-harder --rmdir \
+		remotes/git-svn..mybranch5 &&
+	svn_cmd up "$SVN_TREE" &&
+	test -f "$SVN_TREE"/exec-2.sh &&
+	test ! -h "$SVN_TREE"/exec-2.sh &&
+	test_cmp help "$SVN_TREE"/exec-2.sh
+[mybranch5 134bb2c] modify a symlink to become a file
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-Merging:
-subdir/subdir_module
+ rewrite exec-2.sh (100%)
+ mode change 120000 => 100644
+	D	exec-2.sh
+	A	exec-2.sh
+	D	exec-2.sh
+	A	exec-2.sh
+W: -empty_dir: exec-2.sh
+r8 = 297d0b397bcc4e8e2df73a0762feed545bb5fa79 (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
+A    .git/svn/refs/remotes/git-svn/svn-tree/exec-2.sh
+Updated to revision 8.
+ok 15 - modify a symlink to become a file
 
-Submodule merge conflict for 'subdir/subdir_module':
-  {local}: submodule commit 0d7f23e25cd7e40632f2fad0fcf57375978cba42
-  {remote}: submodule commit 96e2b25eb3cbf351d780e4e8ca00e1524df50988
-Use (l)ocal or (r)emote, or (a)bort? HEAD is now at 453f121 change submodule in subdirectory on test18.b
-Merging:
-subdir/subdir_module
+skipping test: commit with UTF-8 message: locale: C 
+	echo '# hello' >> exec-2.sh &&
+	git update-index exec-2.sh &&
+	git commit -m 'éï�' &&
+	git svn set-tree HEAD
+ok 16 # skip commit with UTF-8 message: locale: C (missing UTF8 of UTF8,POSIXPERM,SYMLINKS)
 
-Submodule merge conflict for 'subdir/subdir_module':
-  {local}: submodule commit 0d7f23e25cd7e40632f2fad0fcf57375978cba42
-  {remote}: submodule commit 96e2b25eb3cbf351d780e4e8ca00e1524df50988
-Use (l)ocal or (r)emote, or (a)bort? Submodule path 'subdir/subdir_module': checked out '96e2b25eb3cbf351d780e4e8ca00e1524df50988'
-[test18.b aeb999a] branch1 resolved with mergetool
- Author: A U Thor <author@example.com>
-HEAD is now at aeb999a branch1 resolved with mergetool
-ok 18 - submodule in subdirectory
+expecting success: git svn init "$svnrepo" && git svn fetch &&
+     git rev-list --pretty=raw remotes/git-svn | grep ^tree | uniq > a &&
+     git rev-list --pretty=raw remotes/alt | grep ^tree | uniq > b &&
+     test_cmp a b
+Using existing [svn-remote "svn"]
+	A	bar/zzz
+	A	dir/a/b/c/d/e/file
+	A	exec.sh
+	A	foo
+	A	foo.link
+r1 = 11f4108d96eb0756fd591d65656f07b0b43437a2 (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 = 52803a0e6ddcf68ba1fe76140a76534b5bd63318 (refs/remotes/alt)
+	D	bar/zzz
+	A	bar/zzz/yyy
+r3 = f44c2afeb4fdd606ff130c3d78b3b2f8aee9ccfc (refs/remotes/alt)
+	M	exec.sh
+r4 = 8d222d2372cfd447f9cd77beaaa49631ff7ab0bc (refs/remotes/alt)
+	M	exec.sh
+r5 = d859ac96b7c031fe003cbc420e9dee36259187fb (refs/remotes/alt)
+	D	exec.sh
+	A	exec.sh
+W: -empty_dir: exec.sh
+r6 = 2f46ddcdbca215d0d678eb21279dcdc6edb929c1 (refs/remotes/alt)
+	A	exec-2.sh
+	M	file
+r7 = 0f0bcac060fa5a8fd3828561d3be9ef21b48a8c9 (refs/remotes/alt)
+	D	exec-2.sh
+	A	exec-2.sh
+W: -empty_dir: exec-2.sh
+r8 = a84f025267f18c6b001b7539ef1d6de3603309ac (refs/remotes/alt)
+ok 17 - test fetch functionality (svn => git) with alternate GIT_SVN_ID
+
+expecting success: test_cmp expected a
+ok 18 - check imported tree checksums expected tree checksums
 
 expecting success: 
-	test_when_finished "git reset --hard" &&
-	git checkout -b test$test_count branch1 &&
-	mv submod submod-movedaside &&
-	git rm --cached submod &&
-	mkdir submod &&
-	echo not a submodule >submod/file16 &&
-	git add submod/file16 &&
-	git commit -m "Submodule path becomes directory" &&
+        git config --add svn-remote.svn.fetch \
+		bar:refs/remotes/git-svn &&
+	test_must_fail git svn migrate
 
-	test_must_fail git merge master &&
-	test -n "$(git ls-files -u)" &&
-	( yes "l" | git mergetool submod ) &&
-	test "$(cat submod/file16)" = "not a submodule" &&
-	rm -rf submod.orig &&
+Remote ref refs/remote/git-svn is tracked by
+  "svn-remote.svn.fetch=bar:refs/remotes/git-svn"
+and
+  "svn-remote.svn.fetch=:refs/remotes/git-svn"
+Please resolve this ambiguity in your git configuration file before continuing
 
-	git reset --hard &&
-	test_must_fail git merge master &&
-	test -n "$(git ls-files -u)" &&
-	test ! -e submod.orig &&
-	( yes "r" | git mergetool submod ) &&
-	test -d submod.orig &&
-	test "$(cat submod.orig/file16)" = "not a submodule" &&
-	rm -r submod.orig &&
-	mv submod-movedaside/.git submod &&
-	( cd submod && git clean -f && git reset --hard ) &&
-	git submodule update -N &&
-	test "$(cat submod/bar)" = "master submodule" &&
-	git reset --hard &&
-	rm -rf submod-movedaside &&
+ok 19 - exit if remote refs are ambigious
 
-	git checkout -b test$test_count.c master &&
-	git submodule update -N &&
-	test_must_fail git merge test$test_count &&
-	test -n "$(git ls-files -u)" &&
-	( yes "l" | git mergetool submod ) &&
-	git submodule update -N &&
-	test "$(cat submod/bar)" = "master submodule" &&
+expecting success: 
+        svnadmin create "${PWD}/svnrepo2" &&
+        svn mkdir -m "mkdir bar" "${svnrepo}2/bar" &&
+        git config --unset svn-remote.svn.fetch \
+		"^bar:refs/remotes/git-svn$" &&
+	test_must_fail git svn init "${svnrepo}2/bar"
+        
+Committing transaction...
+Committed revision 1.
+svn-remote.svn.url already set: file:///build/git-2.20.1/t/trash%20directory.t9100-git-svn-basic/svnrepo
+wanted to set to: file:///build/git-2.20.1/t/trash%20directory.t9100-git-svn-basic/svnrepo2/bar
 
-	git reset --hard &&
-	git submodule update -N &&
-	test_must_fail git merge test$test_count &&
-	test -n "$(git ls-files -u)" &&
-	test ! -e submod.orig &&
-	( yes "r" | git mergetool submod ) &&
-	test "$(cat submod/file16)" = "not a submodule" &&
+ok 20 - exit if init-ing a would clobber a URL
 
-	git reset --hard master &&
-	( cd submod && git clean -f && git reset --hard ) &&
-	git submodule update -N
+expecting success: 
+        git svn init --minimize-url -i bar "$svnrepo/bar" &&
+        git config --get svn-remote.svn.fetch \
+                              "^bar:refs/remotes/bar$" &&
+        git config --get svn-remote.svn.fetch \
+			      "^:refs/remotes/git-svn$"
+        
+Using existing [svn-remote "svn"]
+Using higher level of URL: file:///build/git-2.20.1/t/trash%20directory.t9100-git-svn-basic/svnrepo/bar => file:///build/git-2.20.1/t/trash%20directory.t9100-git-svn-basic/svnrepo
+bar:refs/remotes/bar
+:refs/remotes/git-svn
+ok 21 - init allows us to connect to another directory in the same repo
 
-Switched to a new branch 'test19'
-rm 'submod'
-[test19 43f00ad] Submodule path becomes directory
+expecting success: 
+	git svn fetch -i bar &&
+	git checkout -b my-bar refs/remotes/bar &&
+	echo 1 > foo &&
+	git add foo &&
+	git commit -m "change 1" &&
+	echo 2 > foo &&
+	git add foo &&
+	git commit -m "change 2" &&
+	old_head=$(git rev-parse HEAD) &&
+	git svn dcommit -i bar HEAD^ &&
+	test $old_head = $(git rev-parse HEAD) &&
+	test refs/heads/my-bar = $(git symbolic-ref HEAD) &&
+	git log refs/remotes/bar | grep "change 1" &&
+	! git log refs/remotes/bar | grep "change 2" &&
+	git checkout master &&
+	git branch -D my-bar
+	
+	A	zzz
+r1 = 1d11ce7ca243f7c828e7724c6c06b4383174fa0f (refs/remotes/bar)
+	D	zzz
+	A	zzz/yyy
+r3 = 2c01bacbefcc8ea155163f6470a35f702cca5c3c (refs/remotes/bar)
+Switched to a new branch 'my-bar'
+[my-bar 7a58a99] change 1
  Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+), 1 deletion(-)
- delete mode 160000 submod
- create mode 100644 submod/file16
-Merging:
-43f00ad Submodule path becomes directory
-virtual master
-found 1 common ancestor:
-a130783 add initial versions
-Adding submod/file16
-CONFLICT (modify/delete): submod deleted in HEAD and modified in master. Version master of submod left in tree at submod~master.
-Auto-merging subdir/file3
-CONFLICT (content): Merge conflict in subdir/file3
-Auto-merging spaced name
-CONFLICT (content): Merge conflict in spaced name
-Auto-merging file2
-CONFLICT (add/add): Merge conflict in file2
-CONFLICT (modify/delete): file12 deleted in HEAD and modified in master. Version master of file12 left in tree.
-CONFLICT (modify/delete): file11 deleted in master and modified in HEAD. Version HEAD of file11 left in tree.
-Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-Auto-merging both
-CONFLICT (add/add): Merge conflict in both
-Resolved 'both' using previous resolution.
-Resolved 'file1' using previous resolution.
-Resolved 'file2' using previous resolution.
-Resolved 'spaced name' using previous resolution.
-Resolved 'subdir/file3' using previous resolution.
-Automatic merge failed; fix conflicts and then commit the result.
-Merging:
-submod
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo
+[my-bar 7cfb377] change 2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Committing to file:///build/git-2.20.1/t/trash%20directory.t9100-git-svn-basic/svnrepo/bar ...
+	A	foo
+Committed r9
+	A	foo
+r9 = bfb0ee120968d3c6571642becf0ecd5c845b5087 (refs/remotes/bar)
+No changes between 7a58a99ea0fd305fe6d793a21c9468e58024968f 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: bfb0ee120968d3c6571642becf0ecd5c845b5087
+    change 1
+Switched to branch 'master'
+Deleted branch my-bar (was 7cfb377).
+ok 22 - dcommit $rev does not clobber current branch
 
-Submodule merge conflict for 'submod':
-  {local}: deleted
-  {remote}: submodule commit 369c179056ee23661cc437cf94a9156432b09d2c
-Use (l)ocal or (r)emote, or (a)bort? warning: unable to rmdir 'submod': Directory not empty
-HEAD is now at 43f00ad Submodule path becomes directory
-Merging:
-43f00ad Submodule path becomes directory
-virtual master
-found 1 common ancestor:
-a130783 add initial versions
-Adding submod/file16
-CONFLICT (modify/delete): submod deleted in HEAD and modified in master. Version master of submod left in tree at submod~master.
-Auto-merging subdir/file3
-CONFLICT (content): Merge conflict in subdir/file3
-Auto-merging spaced name
-CONFLICT (content): Merge conflict in spaced name
-Auto-merging file2
-CONFLICT (add/add): Merge conflict in file2
-CONFLICT (modify/delete): file12 deleted in HEAD and modified in master. Version master of file12 left in tree.
-CONFLICT (modify/delete): file11 deleted in master and modified in HEAD. Version HEAD of file11 left in tree.
-Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-Auto-merging both
-CONFLICT (add/add): Merge conflict in both
-Resolved 'both' using previous resolution.
-Resolved 'file1' using previous resolution.
-Resolved 'file2' using previous resolution.
-Resolved 'spaced name' using previous resolution.
-Resolved 'subdir/file3' using previous resolution.
-Automatic merge failed; fix conflicts and then commit the result.
-Merging:
-submod
+expecting success: 
+	git svn fetch -i bar &&
+	git checkout -b my-bar refs/remotes/bar &&
+	echo abc > d &&
+	git update-index --add d &&
+	git commit -m "/bar/d should be in the log" &&
+	git svn dcommit -i bar &&
+	test -z "$(git diff refs/heads/my-bar refs/remotes/bar)" &&
+	mkdir newdir &&
+	echo new > newdir/dir &&
+	git update-index --add newdir/dir &&
+	git commit -m "add a new directory" &&
+	git svn dcommit -i bar &&
+	test -z "$(git diff refs/heads/my-bar refs/remotes/bar)" &&
+	echo foo >> newdir/dir &&
+	git update-index newdir/dir &&
+	git commit -m "modify a file in new directory" &&
+	git svn dcommit -i bar &&
+	test -z "$(git diff refs/heads/my-bar refs/remotes/bar)"
 
-Submodule merge conflict for 'submod':
-  {local}: deleted
-  {remote}: submodule commit 369c179056ee23661cc437cf94a9156432b09d2c
-Use (l)ocal or (r)emote, or (a)bort? HEAD is now at 5178faa Add bar on branch1
-Submodule path 'submod': checked out '369c179056ee23661cc437cf94a9156432b09d2c'
-warning: unable to rmdir 'submod': Directory not empty
-HEAD is now at 43f00ad Submodule path becomes directory
-Switched to a new branch 'test19.c'
-Merging:
-e3c814d master updates
-virtual test19
-found 1 common ancestor:
-a130783 add initial versions
-Adding submod/file16
-CONFLICT (modify/delete): submod deleted in test19 and modified in HEAD. Version HEAD of submod left in tree at submod~HEAD.
-Auto-merging subdir/file3
-CONFLICT (content): Merge conflict in subdir/file3
-Auto-merging spaced name
-CONFLICT (content): Merge conflict in spaced name
-Auto-merging file2
-CONFLICT (add/add): Merge conflict in file2
-CONFLICT (modify/delete): file12 deleted in test19 and modified in HEAD. Version HEAD of file12 left in tree.
-CONFLICT (modify/delete): file11 deleted in HEAD and modified in test19. Version test19 of file11 left in tree.
-Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-Auto-merging both
-CONFLICT (add/add): Merge conflict in both
-Resolved 'both' using previous resolution.
-Resolved 'file1' using previous resolution.
-Resolved 'file2' using previous resolution.
-Resolved 'spaced name' using previous resolution.
-Resolved 'subdir/file3' using previous resolution.
-Automatic merge failed; fix conflicts and then commit the result.
-Merging:
-submod
+	A	bar/foo
+r9 = 5e1dc507714a877e5b4d260e04423d34a05235f3 (refs/remotes/alt)
+Switched to a new branch 'my-bar'
+[my-bar ae83eb8] /bar/d should be in the log
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 d
+Committing to file:///build/git-2.20.1/t/trash%20directory.t9100-git-svn-basic/svnrepo/bar ...
+	A	d
+Committed r10
+	A	d
+r10 = a0f149fd5b3442feb71de750c8f95b4c188ce815 (refs/remotes/bar)
+No changes between ae83eb8089a3f056cdf92159bd9b8a1d10603e3a and refs/remotes/bar
+Resetting to the latest refs/remotes/bar
+[my-bar f6ff8cd] add a new directory
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 newdir/dir
+Committing to file:///build/git-2.20.1/t/trash%20directory.t9100-git-svn-basic/svnrepo/bar ...
+	A	newdir/dir
+Committed r11
+	A	newdir/dir
+r11 = e0429a01902c7c4412bbcd3e4ef7698197cbfbd7 (refs/remotes/bar)
+No changes between f6ff8cd8d708d2fcad600d17079d072d8836c7e4 and refs/remotes/bar
+Resetting to the latest refs/remotes/bar
+[my-bar 51c3a21] modify a file in new directory
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Committing to file:///build/git-2.20.1/t/trash%20directory.t9100-git-svn-basic/svnrepo/bar ...
+	M	newdir/dir
+Committed r12
+	M	newdir/dir
+r12 = a6b7a2ecc6f018a37f54d9ce1ac3767a8e8f5e36 (refs/remotes/bar)
+No changes between 51c3a212525e181275076b31f3edfc26d7fbbd9c and refs/remotes/bar
+Resetting to the latest refs/remotes/bar
+ok 23 - able to dcommit to a subdirectory
 
-Submodule merge conflict for 'submod':
-  {local}: submodule commit 369c179056ee23661cc437cf94a9156432b09d2c
-  {remote}: deleted
-Use (l)ocal or (r)emote, or (a)bort? HEAD is now at e3c814d master updates
-error: refusing to lose untracked file at 'submod/file16'
-Merging:
-e3c814d master updates
-virtual test19
-found 1 common ancestor:
-a130783 add initial versions
-Adding submod/file16
-CONFLICT (modify/delete): submod deleted in test19 and modified in HEAD. Version HEAD of submod left in tree at submod~HEAD.
-Auto-merging subdir/file3
-CONFLICT (content): Merge conflict in subdir/file3
-Auto-merging spaced name
-CONFLICT (content): Merge conflict in spaced name
-Auto-merging file2
-CONFLICT (add/add): Merge conflict in file2
-CONFLICT (modify/delete): file12 deleted in test19 and modified in HEAD. Version HEAD of file12 left in tree.
-CONFLICT (modify/delete): file11 deleted in HEAD and modified in test19. Version test19 of file11 left in tree.
-Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-Auto-merging both
-CONFLICT (add/add): Merge conflict in both
-Resolved 'both' using previous resolution.
-Resolved 'file1' using previous resolution.
-Resolved 'file2' using previous resolution.
-Resolved 'spaced name' using previous resolution.
-Resolved 'subdir/file3' using previous resolution.
-Automatic merge failed; fix conflicts and then commit the result.
-Merging:
-submod
+expecting success: 
+	test_commit "commit-new-file-foo2" foo2 &&
+	test-tool chmtime =-60 foo &&
+	git svn dcommit
 
-Submodule merge conflict for 'submod':
-  {local}: submodule commit 369c179056ee23661cc437cf94a9156432b09d2c
-  {remote}: deleted
-Use (l)ocal or (r)emote, or (a)bort? HEAD is now at e3c814d master updates
-HEAD is now at 369c179 Add bar on master
-HEAD is now at e3c814d master updates
-ok 19 - directory vs modified submodule
+[my-bar 694794f] commit-new-file-foo2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo2
+Committing to file:///build/git-2.20.1/t/trash%20directory.t9100-git-svn-basic/svnrepo/bar ...
+	A	foo2
+Committed r13
+	A	foo2
+r13 = eda1a003d999bdc783a82bef8fc5dfe16136f0b3 (refs/remotes/bar)
+No changes between 694794f2d7bb5dd632491c910c40293257c999c1 and refs/remotes/bar
+Resetting to the latest refs/remotes/bar
+ok 24 - dcommit should not fail with a touched file
 
 expecting success: 
-	test_when_finished "git reset --hard" &&
-	git checkout -b test$test_count branch1 &&
-	test_must_fail git merge master &&
-	git mergetool --no-prompt --tool mybase -- both &&
-	test_must_be_empty both
-
-Switched to a new branch 'test20'
-M	submod
-Merging:
-afa562b branch1 changes
-virtual master
-found 1 common ancestor:
-a130783 add initial versions
-Failed to merge submodule submod (merge following commits not found)
-Auto-merging submod
-CONFLICT (submodule): Merge conflict in submod
-Auto-merging subdir/file3
-CONFLICT (content): Merge conflict in subdir/file3
-Auto-merging spaced name
-CONFLICT (content): Merge conflict in spaced name
-Auto-merging file2
-CONFLICT (add/add): Merge conflict in file2
-CONFLICT (modify/delete): file12 deleted in HEAD and modified in master. Version master of file12 left in tree.
-CONFLICT (modify/delete): file11 deleted in master and modified in HEAD. Version HEAD of file11 left in tree.
-Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-Auto-merging both
-CONFLICT (add/add): Merge conflict in both
-Resolved 'both' using previous resolution.
-Resolved 'file1' using previous resolution.
-Resolved 'file2' using previous resolution.
-Resolved 'spaced name' using previous resolution.
-Resolved 'subdir/file3' using previous resolution.
-Automatic merge failed; fix conflicts and then commit the result.
-Merging:
-both
+	test-tool chmtime =-60 foo &&
+	git svn rebase
 
-Normal merge conflict for 'both':
-  {local}: created file
-  {remote}: created file
-HEAD is now at afa562b branch1 changes
-ok 20 - file with no base
+Current branch my-bar is up to date.
+ok 25 - rebase should not fail with a touched file
 
 expecting success: 
-	test_when_finished "git reset --hard" &&
-	git checkout -b test$test_count branch1 &&
-	test_config mergetool.defaults.cmd "cat \"\$REMOTE\" >\"\$MERGED\"" &&
-	test_config mergetool.defaults.trustExitCode true &&
-	test_must_fail git merge master &&
-	git mergetool --no-prompt --tool defaults -- both &&
-	echo master both added >expected &&
-	test_cmp expected both
+	echo cba > d &&
+	git update-index d &&
+	git commit -m "update /bar/d" &&
+	git svn set-tree -i bar HEAD &&
+	test -z "$(git diff refs/heads/my-bar refs/remotes/bar)"
 
-Switched to a new branch 'test21'
-M	submod
-Merging:
-afa562b branch1 changes
-virtual master
-found 1 common ancestor:
-a130783 add initial versions
-Failed to merge submodule submod (merge following commits not found)
-Auto-merging submod
-CONFLICT (submodule): Merge conflict in submod
-Auto-merging subdir/file3
-CONFLICT (content): Merge conflict in subdir/file3
-Auto-merging spaced name
-CONFLICT (content): Merge conflict in spaced name
-Auto-merging file2
-CONFLICT (add/add): Merge conflict in file2
-CONFLICT (modify/delete): file12 deleted in HEAD and modified in master. Version master of file12 left in tree.
-CONFLICT (modify/delete): file11 deleted in master and modified in HEAD. Version HEAD of file11 left in tree.
-Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-Auto-merging both
-CONFLICT (add/add): Merge conflict in both
-Resolved 'both' using previous resolution.
-Resolved 'file1' using previous resolution.
-Resolved 'file2' using previous resolution.
-Resolved 'spaced name' using previous resolution.
-Resolved 'subdir/file3' using previous resolution.
-Automatic merge failed; fix conflicts and then commit the result.
-Merging:
-both
+[my-bar e41acbe] update /bar/d
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+	M	d
+	M	d
+r14 = eda60a99db1a368e37fd799a2cc841edb052602c (refs/remotes/bar)
+Done committing 1 revisions to SVN
+ok 26 - able to set-tree to a subdirectory
 
-Normal merge conflict for 'both':
-  {local}: created file
-  {remote}: created file
-HEAD is now at afa562b branch1 changes
-ok 21 - custom commands override built-ins
+expecting success: 
+	mkdir bare-repo &&
+	( cd bare-repo &&
+	git init --bare &&
+	GIT_DIR=. git svn init "$svnrepo" &&
+	git svn fetch ) &&
+	rm -rf bare-repo
+	
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9100-git-svn-basic/bare-repo/
+	A	bar/zzz
+	A	dir/a/b/c/d/e/file
+	A	exec.sh
+	A	foo
+	A	foo.link
+r1 = 11f4108d96eb0756fd591d65656f07b0b43437a2 (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 = 52803a0e6ddcf68ba1fe76140a76534b5bd63318 (refs/remotes/alt)
+	D	bar/zzz
+	A	bar/zzz/yyy
+r3 = f44c2afeb4fdd606ff130c3d78b3b2f8aee9ccfc (refs/remotes/alt)
+	M	exec.sh
+r4 = 8d222d2372cfd447f9cd77beaaa49631ff7ab0bc (refs/remotes/alt)
+	M	exec.sh
+r5 = d859ac96b7c031fe003cbc420e9dee36259187fb (refs/remotes/alt)
+	D	exec.sh
+	A	exec.sh
+W: -empty_dir: exec.sh
+r6 = 2f46ddcdbca215d0d678eb21279dcdc6edb929c1 (refs/remotes/alt)
+	A	exec-2.sh
+	M	file
+r7 = 0f0bcac060fa5a8fd3828561d3be9ef21b48a8c9 (refs/remotes/alt)
+	D	exec-2.sh
+	A	exec-2.sh
+W: -empty_dir: exec-2.sh
+r8 = a84f025267f18c6b001b7539ef1d6de3603309ac (refs/remotes/alt)
+	A	bar/foo
+r9 = 5e1dc507714a877e5b4d260e04423d34a05235f3 (refs/remotes/alt)
+	A	bar/d
+r10 = 4567e089fb955b57234ddbc284168c3bcd20bb75 (refs/remotes/alt)
+	A	bar/newdir/dir
+r11 = 713a49ae7290c6f75b6b8fb18920a0ac35e5653e (refs/remotes/alt)
+	M	bar/newdir/dir
+r12 = 4407735297143a2f81f5154879cb8f76f45f3b4a (refs/remotes/alt)
+	A	bar/foo2
+r13 = 5f056880bd21750564afe497343286d4d060552c (refs/remotes/alt)
+	M	bar/d
+r14 = 74ec5063c1f411da56708643f1b6828f50554b53 (refs/remotes/alt)
+ok 27 - git-svn works in a bare repository
 
 expecting success: 
-	test_when_finished "git reset --hard" &&
-	git checkout -b test$test_count branch1 &&
-	test_config mergetool.writeToTemp false &&
-	test_config mergetool.myecho.cmd "echo \"\$LOCAL\"" &&
-	test_config mergetool.myecho.trustExitCode true &&
-	test_must_fail git merge master &&
-	git mergetool --no-prompt --tool myecho -- both >actual &&
-	grep ^\./both_LOCAL_ actual >/dev/null
+	mkdir worktree gitdir &&
+	( cd worktree &&
+	git svn init "$svnrepo" &&
+	git init --separate-git-dir ../gitdir &&
+	git svn fetch ) &&
+	rm -rf worktree gitdir
+	
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9100-git-svn-basic/worktree/.git/
+Reinitialized existing Git repository in /build/git-2.20.1/t/trash directory.t9100-git-svn-basic/gitdir/
+	A	bar/zzz
+	A	dir/a/b/c/d/e/file
+	A	exec.sh
+	A	foo
+	A	foo.link
+r1 = 11f4108d96eb0756fd591d65656f07b0b43437a2 (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 = 52803a0e6ddcf68ba1fe76140a76534b5bd63318 (refs/remotes/alt)
+	D	bar/zzz
+	A	bar/zzz/yyy
+r3 = f44c2afeb4fdd606ff130c3d78b3b2f8aee9ccfc (refs/remotes/alt)
+	M	exec.sh
+r4 = 8d222d2372cfd447f9cd77beaaa49631ff7ab0bc (refs/remotes/alt)
+	M	exec.sh
+r5 = d859ac96b7c031fe003cbc420e9dee36259187fb (refs/remotes/alt)
+	D	exec.sh
+	A	exec.sh
+W: -empty_dir: exec.sh
+r6 = 2f46ddcdbca215d0d678eb21279dcdc6edb929c1 (refs/remotes/alt)
+	A	exec-2.sh
+	M	file
+r7 = 0f0bcac060fa5a8fd3828561d3be9ef21b48a8c9 (refs/remotes/alt)
+	D	exec-2.sh
+	A	exec-2.sh
+W: -empty_dir: exec-2.sh
+r8 = a84f025267f18c6b001b7539ef1d6de3603309ac (refs/remotes/alt)
+	A	bar/foo
+r9 = 5e1dc507714a877e5b4d260e04423d34a05235f3 (refs/remotes/alt)
+	A	bar/d
+r10 = 4567e089fb955b57234ddbc284168c3bcd20bb75 (refs/remotes/alt)
+	A	bar/newdir/dir
+r11 = 713a49ae7290c6f75b6b8fb18920a0ac35e5653e (refs/remotes/alt)
+	M	bar/newdir/dir
+r12 = 4407735297143a2f81f5154879cb8f76f45f3b4a (refs/remotes/alt)
+	A	bar/foo2
+r13 = 5f056880bd21750564afe497343286d4d060552c (refs/remotes/alt)
+	M	bar/d
+r14 = 74ec5063c1f411da56708643f1b6828f50554b53 (refs/remotes/alt)
+ok 28 - git-svn works in in a repository with a gitdir: link
 
-Switched to a new branch 'test22'
-M	submod
-Merging:
-afa562b branch1 changes
-virtual master
-found 1 common ancestor:
-a130783 add initial versions
-Failed to merge submodule submod (merge following commits not found)
-Auto-merging submod
-CONFLICT (submodule): Merge conflict in submod
-Auto-merging subdir/file3
-CONFLICT (content): Merge conflict in subdir/file3
-Auto-merging spaced name
-CONFLICT (content): Merge conflict in spaced name
-Auto-merging file2
-CONFLICT (add/add): Merge conflict in file2
-CONFLICT (modify/delete): file12 deleted in HEAD and modified in master. Version master of file12 left in tree.
-CONFLICT (modify/delete): file11 deleted in master and modified in HEAD. Version HEAD of file11 left in tree.
-Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-Auto-merging both
-CONFLICT (add/add): Merge conflict in both
-Resolved 'both' using previous resolution.
-Resolved 'file1' using previous resolution.
-Resolved 'file2' using previous resolution.
-Resolved 'spaced name' using previous resolution.
-Resolved 'subdir/file3' using previous resolution.
-Automatic merge failed; fix conflicts and then commit the result.
-HEAD is now at afa562b branch1 changes
-ok 22 - filenames seen by tools start with ./
+# passed all 28 test(s)
+1..28
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t9156-git-svn-fetch-deleted-tag-2.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9156-git-svn-fetch-deleted-tag-2/.git/
+expecting success: 
+	mkdir -p import/branches &&
+	mkdir -p import/tags &&
+	mkdir -p import/trunk/subdir1 &&
+	mkdir -p import/trunk/subdir2 &&
+	mkdir -p import/trunk/subdir3 &&
+	echo "file1" >import/trunk/subdir1/file &&
+	echo "file2" >import/trunk/subdir2/file &&
+	echo "file3" >import/trunk/subdir3/file &&
+	svn_cmd import -m "import for git svn" import "$svnrepo" &&
+	rm -rf import &&
 
-checking prerequisite: MKTEMP
+	svn_cmd co "$svnrepo/trunk" svn_project &&
+	(cd svn_project &&
+		echo "change1" >>subdir1/file &&
+		echo "change2" >>subdir2/file &&
+		echo "change3" >>subdir3/file &&
+		svn_cmd ci -m "change" .
+	) &&
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
-	tempdir=$(mktemp -d -t foo.XXXXXX) &&
-	test -d "$tempdir" &&
-	rmdir "$tempdir"
+	svn_cmd cp -m "create mytag 1" -r2 "$svnrepo/trunk/subdir1" "$svnrepo/tags/mytag" &&
+	svn_cmd rm -m "delete mytag 1" "$svnrepo/tags/mytag" &&
+	svn_cmd cp -m "create mytag 2" -r2 "$svnrepo/trunk/subdir2" "$svnrepo/tags/mytag" &&
+	svn_cmd rm -m "delete mytag 2" "$svnrepo/tags/mytag" &&
+	svn_cmd cp -m "create mytag 3" -r2 "$svnrepo/trunk/subdir3" "$svnrepo/tags/mytag"
+
+Adding         import/branches
+Adding         import/tags
+Adding         import/trunk
+Adding         import/trunk/subdir1
+Adding         import/trunk/subdir1/file
+Adding         import/trunk/subdir2
+Adding         import/trunk/subdir2/file
+Adding         import/trunk/subdir3
+Adding         import/trunk/subdir3/file
+Committing transaction...
+Committed revision 1.
+A    svn_project/subdir1
+A    svn_project/subdir1/file
+A    svn_project/subdir2
+A    svn_project/subdir2/file
+A    svn_project/subdir3
+A    svn_project/subdir3/file
+Checked out revision 1.
+Sending        subdir1/file
+Sending        subdir2/file
+Sending        subdir3/file
+Transmitting file data ...done
+Committing transaction...
+Committed revision 2.
+Committing transaction...
+Committed revision 3.
+Committing transaction...
+Committed revision 4.
+Committing transaction...
+Committed revision 5.
+Committing transaction...
+Committed revision 6.
+Committing transaction...
+Committed revision 7.
+ok 1 - setup svn repo
 
-)
-prerequisite MKTEMP ok
 expecting success: 
-	test_when_finished "git reset --hard" &&
-	git checkout -b test$test_count branch1 &&
-	test_config mergetool.writeToTemp true &&
-	test_config mergetool.myecho.cmd "echo \"\$LOCAL\"" &&
-	test_config mergetool.myecho.trustExitCode true &&
-	test_must_fail git merge master &&
-	git mergetool --no-prompt --tool myecho -- both >actual &&
-	! grep ^\./both_LOCAL_ actual >/dev/null &&
-	grep /both_LOCAL_ actual >/dev/null
+	git svn init --stdlayout "$svnrepo" git_project &&
+	cd git_project &&
+	git svn fetch &&
 
-Switched to a new branch 'test23'
-M	submod
-Merging:
-afa562b branch1 changes
-virtual master
-found 1 common ancestor:
-a130783 add initial versions
-Failed to merge submodule submod (merge following commits not found)
-Auto-merging submod
-CONFLICT (submodule): Merge conflict in submod
-Auto-merging subdir/file3
-CONFLICT (content): Merge conflict in subdir/file3
-Auto-merging spaced name
-CONFLICT (content): Merge conflict in spaced name
-Auto-merging file2
-CONFLICT (add/add): Merge conflict in file2
-CONFLICT (modify/delete): file12 deleted in HEAD and modified in master. Version master of file12 left in tree.
-CONFLICT (modify/delete): file11 deleted in master and modified in HEAD. Version HEAD of file11 left in tree.
-Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-Auto-merging both
-CONFLICT (add/add): Merge conflict in both
-Resolved 'both' using previous resolution.
-Resolved 'file1' using previous resolution.
-Resolved 'file2' using previous resolution.
-Resolved 'spaced name' using previous resolution.
-Resolved 'subdir/file3' using previous resolution.
-Automatic merge failed; fix conflicts and then commit the result.
-HEAD is now at afa562b branch1 changes
-ok 23 - temporary filenames are used with mergetool.writeToTemp
+	git diff --exit-code master:subdir3/file origin/tags/mytag:file &&
+	git diff --exit-code master:subdir2/file origin/tags/mytag^:file &&
+	git diff --exit-code master:subdir1/file origin/tags/mytag^^:file
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9156-git-svn-fetch-deleted-tag-2/git_project/.git/
+	A	subdir1/file
+	A	subdir2/file
+	A	subdir3/file
+r1 = b94e61ed9a98fc1352458544df1b8b5abead08b2 (refs/remotes/origin/trunk)
+	M	subdir1/file
+	M	subdir2/file
+	M	subdir3/file
+r2 = cfd4536be1b823540e9b8e88364d43f5803f3693 (refs/remotes/origin/trunk)
+Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9156-git-svn-fetch-deleted-tag-2/svnrepo/trunk/subdir1 => file:///build/git-2.20.1/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 = 19262ef306d1e877ad1f4f4b1a867fe54b2850a2 (refs/remotes/origin/tags/mytag@2)
+	M	file
+r2 = beee6ec4177b8a3bd7920592c92444eb60f0fbde (refs/remotes/origin/tags/mytag@2)
+Found branch parent: (refs/remotes/origin/tags/mytag) beee6ec4177b8a3bd7920592c92444eb60f0fbde
+Following parent with do_switch
+Successfully followed parent
+r3 = c302186192653062a10b42befaefbb7732efc395 (refs/remotes/origin/tags/mytag)
+Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9156-git-svn-fetch-deleted-tag-2/svnrepo/trunk/subdir2 => file:///build/git-2.20.1/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 = b68accbf96ec9ce8a7df36559dfe73b7baef47a5 (refs/remotes/origin/tags/mytag@2-)
+	M	file
+r2 = 153a681b5ae12892b99de1c8a527bed323919e5b (refs/remotes/origin/tags/mytag@2-)
+Found branch parent: (refs/remotes/origin/tags/mytag) 153a681b5ae12892b99de1c8a527bed323919e5b
+Index mismatch: 03a4eca29b077f8b0867e84854a2c6e71eeac380 != 7745dab6988f4d78b3241eec1b66b56c15e67e83
+rereading 153a681b5ae12892b99de1c8a527bed323919e5b
+Following parent with do_switch
+Successfully followed parent
+r5 = a3bfa5ec51ccdcba73dc100d5ae2264efde19ceb (refs/remotes/origin/tags/mytag)
+Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9156-git-svn-fetch-deleted-tag-2/svnrepo/trunk/subdir3 => file:///build/git-2.20.1/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 = 148b114245198c0acd57edc35706f39a98cae2aa (refs/remotes/origin/tags/mytag@2--)
+	M	file
+r2 = 99b1d93494997f7568c8ff20023393aeba348ecb (refs/remotes/origin/tags/mytag@2--)
+Found branch parent: (refs/remotes/origin/tags/mytag) 99b1d93494997f7568c8ff20023393aeba348ecb
+Index mismatch: de577018db9919b0130637aa9ac28b5dabe70913 != 03a4eca29b077f8b0867e84854a2c6e71eeac380
+rereading 99b1d93494997f7568c8ff20023393aeba348ecb
+Following parent with do_switch
+Successfully followed parent
+r7 = 046236322dbdafa38e6cf08fe9f00854c35eeeb0 (refs/remotes/origin/tags/mytag)
+Checked out HEAD:
+  file:///build/git-2.20.1/t/trash%20directory.t9156-git-svn-fetch-deleted-tag-2/svnrepo/trunk r2
+ok 2 - fetch deleted tags from same revision with no checksum error
 
+# passed all 2 test(s)
+1..2
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t9155-git-svn-fetch-deleted-tag.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9155-git-svn-fetch-deleted-tag/.git/
 expecting success: 
-	test_when_finished "git reset --hard" &&
-	git checkout -b test$test_count order-file-side2 &&
-	test_config diff.orderFile order-file &&
-	test_config mergetool.myecho.cmd "echo \"\$LOCAL\"" &&
-	test_config mergetool.myecho.trustExitCode true &&
-	echo b >order-file &&
-	echo a >>order-file &&
-	test_must_fail git merge order-file-side1 &&
-	cat >expect <<-\EOF &&
-		Merging:
-		b
-		a
-	EOF
+	mkdir -p import/trunk/subdir &&
+	mkdir -p import/branches &&
+	mkdir -p import/tags &&
+	echo "base" >import/trunk/subdir/file &&
+	svn_cmd import -m "import for git svn" import "$svnrepo" &&
+	rm -rf import &&
 
-	# make sure "order-file" that is ambiguous between
-	# rev and path is understood correctly.
-	git branch order-file HEAD &&
+	svn_cmd mkdir -m "create mybranch directory" "$svnrepo/branches/mybranch" &&
+	svn_cmd cp -m "create branch mybranch" "$svnrepo/trunk" "$svnrepo/branches/mybranch/trunk" &&
 
-	git mergetool --no-prompt --tool myecho >output &&
-	git grep --no-index -h -A2 Merging: output >actual &&
-	test_cmp expect actual
+	svn_cmd co "$svnrepo/trunk" svn_project &&
+	(cd svn_project &&
+		echo "trunk change" >>subdir/file &&
+		svn_cmd ci -m "trunk change" subdir/file &&
 
-Switched to a new branch 'test24'
-Merging:
-53b99bd side2
-virtual order-file-side1
-found 1 common ancestor:
-4558409 start
-Auto-merging b
-CONFLICT (content): Merge conflict in b
-Auto-merging a
-CONFLICT (content): Merge conflict in a
-Recorded preimage for 'a'
-Recorded preimage for 'b'
-Automatic merge failed; fix conflicts and then commit the result.
-HEAD is now at 53b99bd side2
-ok 24 - diff.orderFile configuration is honored
+		svn_cmd switch "$svnrepo/branches/mybranch/trunk" &&
+		echo "branch change" >>subdir/file &&
+		svn_cmd ci -m "branch change" subdir/file
+	) &&
+
+	svn_cmd cp -m "create mytag attempt 1" -r5 "$svnrepo/trunk/subdir" "$svnrepo/tags/mytag" &&
+	svn_cmd rm -m "delete mytag attempt 1" "$svnrepo/tags/mytag" &&
+	svn_cmd cp -m "create mytag attempt 2" -r5 "$svnrepo/branches/mybranch/trunk/subdir" "$svnrepo/tags/mytag"
+
+Adding         import/branches
+Adding         import/tags
+Adding         import/trunk
+Adding         import/trunk/subdir
+Adding         import/trunk/subdir/file
+Committing transaction...
+Committed revision 1.
+Committing transaction...
+Committed revision 2.
+Committing transaction...
+Committed revision 3.
+A    svn_project/subdir
+A    svn_project/subdir/file
+Checked out revision 3.
+Sending        subdir/file
+Transmitting file data .done
+Committing transaction...
+Committed revision 4.
+U    subdir/file
+Updated to revision 4.
+Sending        subdir/file
+Transmitting file data .done
+Committing transaction...
+Committed revision 5.
+Committing transaction...
+Committed revision 6.
+Committing transaction...
+Committed revision 7.
+Committing transaction...
+Committed revision 8.
+ok 1 - setup svn repo
 
 expecting success: 
-	test_when_finished "git reset --hard" &&
-	git checkout -b test$test_count order-file-side2 &&
-	test_config diff.orderFile order-file &&
-	test_config mergetool.myecho.cmd "echo \"\$LOCAL\"" &&
-	test_config mergetool.myecho.trustExitCode true &&
-	echo b >order-file &&
-	echo a >>order-file &&
-	test_must_fail git merge order-file-side1 &&
-	cat >expect <<-\EOF &&
-		Merging:
-		a
-		b
-	EOF
-	git mergetool -O/dev/null --no-prompt --tool myecho >output &&
-	git grep --no-index -h -A2 Merging: output >actual &&
-	test_cmp expect actual &&
-	git reset --hard &&
+	git svn init --stdlayout "$svnrepo" git_project &&
+	cd git_project &&
+	git svn fetch &&
 
-	git config --unset diff.orderFile &&
-	test_must_fail git merge order-file-side1 &&
-	cat >expect <<-\EOF &&
-		Merging:
-		b
-		a
-	EOF
-	git mergetool -Oorder-file --no-prompt --tool myecho >output &&
-	git grep --no-index -h -A2 Merging: output >actual &&
-	test_cmp expect actual
+	git diff --exit-code origin/mybranch:trunk/subdir/file origin/tags/mytag:file &&
+	git diff --exit-code master:subdir/file origin/tags/mytag^:file
 
-Switched to a new branch 'test25'
-Merging:
-53b99bd side2
-virtual order-file-side1
-found 1 common ancestor:
-4558409 start
-Auto-merging b
-CONFLICT (content): Merge conflict in b
-Auto-merging a
-CONFLICT (content): Merge conflict in a
-Recorded preimage for 'a'
-Recorded preimage for 'b'
-Automatic merge failed; fix conflicts and then commit the result.
-HEAD is now at 53b99bd side2
-Merging:
-53b99bd side2
-virtual order-file-side1
-found 1 common ancestor:
-4558409 start
-Auto-merging b
-CONFLICT (content): Merge conflict in b
-Auto-merging a
-CONFLICT (content): Merge conflict in a
-Recorded preimage for 'a'
-Recorded preimage for 'b'
-Automatic merge failed; fix conflicts and then commit the result.
-HEAD is now at 53b99bd side2
-ok 25 - mergetool -Oorder-file is honored
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9155-git-svn-fetch-deleted-tag/git_project/.git/
+	A	subdir/file
+r1 = ec91f9b0f109f962cd05a2fbbe77a49611d44f01 (refs/remotes/origin/trunk)
+r2 = 7232e58d7e3ea7479009efdf2835fb4e455bc402 (refs/remotes/origin/mybranch)
+	A	trunk/subdir/file
+r3 = 049056569cd1ace9064ddf366ecfd5b8497937b4 (refs/remotes/origin/mybranch)
+	M	subdir/file
+r4 = 6e3e6766ec6f345a009a6e4624698d8d1a80545f (refs/remotes/origin/trunk)
+	M	trunk/subdir/file
+r5 = 2d5269613c34c96c02985fd6e83642a05876bf2b (refs/remotes/origin/mybranch)
+Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9155-git-svn-fetch-deleted-tag/svnrepo/trunk/subdir => file:///build/git-2.20.1/t/trash%20directory.t9155-git-svn-fetch-deleted-tag/svnrepo/tags/mytag, 5
+Initializing parent: refs/remotes/origin/tags/mytag@5
+	A	file
+r1 = 56afd999ac6dccc4f83244a6e0c3052c151768cc (refs/remotes/origin/tags/mytag@5)
+	M	file
+r4 = 28da9881e0222ad669873df1a6680e34118ad375 (refs/remotes/origin/tags/mytag@5)
+Found branch parent: (refs/remotes/origin/tags/mytag) 28da9881e0222ad669873df1a6680e34118ad375
+Following parent with do_switch
+Successfully followed parent
+r6 = 15e20e07af4a09066329386dec7752b1ed9d0bf3 (refs/remotes/origin/tags/mytag)
+Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9155-git-svn-fetch-deleted-tag/svnrepo/branches/mybranch/trunk/subdir => file:///build/git-2.20.1/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/git-2.20.1/t/trash%20directory.t9155-git-svn-fetch-deleted-tag/svnrepo/trunk/subdir => file:///build/git-2.20.1/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 = 56afd999ac6dccc4f83244a6e0c3052c151768cc (refs/remotes/origin/tags/mytag@2)
+Found branch parent: (refs/remotes/origin/tags/mytag@5-) 56afd999ac6dccc4f83244a6e0c3052c151768cc
+Following parent with do_switch
+Successfully followed parent
+r3 = 9ea78e99e6df026713657a96a4b30a613c003926 (refs/remotes/origin/tags/mytag@5-)
+	M	file
+r5 = b19f2ff0caab83d9c8aebf99033e4216cd7d93c0 (refs/remotes/origin/tags/mytag@5-)
+Found branch parent: (refs/remotes/origin/tags/mytag) b19f2ff0caab83d9c8aebf99033e4216cd7d93c0
+Index mismatch: 13f9c6ca01f81b94d8eca8eba510eafa2445e890 != 343cf4718d6a013cf33cf3cea8e0dc0a8efa64dc
+rereading b19f2ff0caab83d9c8aebf99033e4216cd7d93c0
+Following parent with do_switch
+Successfully followed parent
+r8 = 41229c0d027a141524b63bbd2941c01d0bb8bfdc (refs/remotes/origin/tags/mytag)
+Checked out HEAD:
+  file:///build/git-2.20.1/t/trash%20directory.t9155-git-svn-fetch-deleted-tag/svnrepo/trunk r4
+ok 2 - fetch deleted tags from same revision with checksum error
 
-# passed all 25 test(s)
-1..25
+# passed all 2 test(s)
+1..2
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
 *** t9157-git-svn-fetch-merge.sh ***
@@ -329124,153 +327531,138 @@
 	git svn init -s "$svnrepo" &&
 	git svn fetch
 
-r1 = 9dffb29a505f7fb3ce94491673164862afe4923d (refs/remotes/origin/trunk)
+r1 = e01bc9c4ec1785e654f70e342f590622a154b259 (refs/remotes/origin/trunk)
 	A	foo
-r3 = c3550fc40e13b2242cf3a809b0ed15ed376d1686 (refs/remotes/origin/trunk)
+r3 = 7fd4ac695c13374a1e0979ab0155580a09c58514 (refs/remotes/origin/trunk)
 Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9157-git-svn-fetch-merge/svnrepo/trunk => file:///build/git-2.20.1/t/trash%20directory.t9157-git-svn-fetch-merge/svnrepo/branches/branch1, 3
-Found branch parent: (refs/remotes/origin/branch1) c3550fc40e13b2242cf3a809b0ed15ed376d1686
+Found branch parent: (refs/remotes/origin/branch1) 7fd4ac695c13374a1e0979ab0155580a09c58514
 Following parent with do_switch
 Successfully followed parent
-r4 = b337b6b01f479874606072a81d6ac69a7351c7fe (refs/remotes/origin/branch1)
+r4 = 68b9472a0c86ccfa51261d8ea75e212742de83e1 (refs/remotes/origin/branch1)
 	A	bar
-r5 = 83f9ddb63e2a4304368e92023d08ac0ccf14e2ae (refs/remotes/origin/trunk)
+r5 = 97272c14d4ebfd5722b1f03497208963005ac1d5 (refs/remotes/origin/trunk)
 Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9157-git-svn-fetch-merge/svnrepo/trunk => file:///build/git-2.20.1/t/trash%20directory.t9157-git-svn-fetch-merge/svnrepo/branches/branch2, 5
-Found branch parent: (refs/remotes/origin/branch2) 83f9ddb63e2a4304368e92023d08ac0ccf14e2ae
+Found branch parent: (refs/remotes/origin/branch2) 97272c14d4ebfd5722b1f03497208963005ac1d5
 Following parent with do_switch
 Successfully followed parent
-r6 = ea0e65e1f526191f795e93acad6c31331ba3e365 (refs/remotes/origin/branch2)
+r6 = 9666a44d8f542666aa3ca26fe6190a71738208bf (refs/remotes/origin/branch2)
 	A	baz
-r7 = 1ce1cc83e3cf0e1cff5ca8cd47c660fc1a68e266 (refs/remotes/origin/branch1)
+r7 = def38978882e1a1b3b2f12bca96ffaca949e7e93 (refs/remotes/origin/branch1)
 	A	baz
 Checking svn:mergeinfo changes since r5: 1 sources, 1 changed
-Found merge parent (/branches/branch1:4-7): 1ce1cc83e3cf0e1cff5ca8cd47c660fc1a68e266
-r8 = 06327a3c1e66106e2ae35c59f6588d4415fb2657 (refs/remotes/origin/trunk)
+Found merge parent (/branches/branch1:4-7): def38978882e1a1b3b2f12bca96ffaca949e7e93
+r8 = 3c72f8f32b6b39ce1170eff81c3dbfee262c9762 (refs/remotes/origin/trunk)
 	A	baz
 Checking svn:mergeinfo changes since r6: 1 sources, 1 changed
-Found merge parent (/branches/branch1:4-8): 1ce1cc83e3cf0e1cff5ca8cd47c660fc1a68e266
-r9 = e51bbf8843d2b6d9ed1cdc3b1a3a2900eee8cac8 (refs/remotes/origin/branch2)
+Found merge parent (/branches/branch1:4-8): def38978882e1a1b3b2f12bca96ffaca949e7e93
+r9 = 2d6fe293456e0bcb6ca0f7a7326070d27609741c (refs/remotes/origin/branch2)
 Checking svn:mergeinfo changes since r8: 2 sources, 2 changed
-Found merge parent (/branches/branch2:6-9): e51bbf8843d2b6d9ed1cdc3b1a3a2900eee8cac8
-r10 = b4248abdea366e8736312c996438b3e6918817f5 (refs/remotes/origin/trunk)
+Found merge parent (/branches/branch2:6-9): 2d6fe293456e0bcb6ca0f7a7326070d27609741c
+r10 = d7fe92438825f9c6b1c51fbd57a72fbc0167ff26 (refs/remotes/origin/trunk)
 Checked out HEAD:
   file:///build/git-2.20.1/t/trash%20directory.t9157-git-svn-fetch-merge/svnrepo/trunk r10
 ok 2 - clone svn repo
 
 expecting success: git rev-parse HEAD^2
-e51bbf8843d2b6d9ed1cdc3b1a3a2900eee8cac8
+2d6fe293456e0bcb6ca0f7a7326070d27609741c
 ok 3 - verify merge commit
 
 # passed all 3 test(s)
 1..3
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t9159-git-svn-no-parent-mergeinfo.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9159-git-svn-no-parent-mergeinfo/.git/
+*** t9158-git-svn-mergeinfo.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9158-git-svn-mergeinfo/.git/
 expecting success: 
-	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 &&
+	svn_cmd mkdir -m x "$svnrepo"/trunk &&
+	svn_cmd co "$svnrepo"/trunk "$SVN_TREE" &&
 	(
-		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"
+		cd "$SVN_TREE" &&
+		touch foo &&
+		svn_cmd add foo &&
+		svn_cmd commit -m "initial commit"
 	) &&
-	git svn init -s "$svnrepo" &&
-	git svn fetch
-	
-Adding         init/branches
-Adding         init/tags
-Adding         init/trunk
-Adding         init/trunk/file.txt
+	rm -rf "$SVN_TREE"
+
 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
+A         foo
+Adding         foo
 Transmitting file data .done
 Committing transaction...
 Committed revision 2.
-Updating 'branches/a':
-A    branches/a/file.txt
-Updated to revision 1.
-A         branches/a
-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.
-Updating 'branches/c':
-A    branches/c/file2.txt
-Updated to revision 5.
-A         branches/c
-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 = 43e8e7167bb0bf84b72fd1c34f087bcca99e6a50 (refs/remotes/origin/trunk)
-	M	file.txt
-r2 = fb524af835bd93025a228c4d291396d9f0bf753f (refs/remotes/origin/trunk)
-Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9159-git-svn-no-parent-mergeinfo/svnrepo/trunk => file:///build/git-2.20.1/t/trash%20directory.t9159-git-svn-no-parent-mergeinfo/svnrepo/branches/a, 1
-Found branch parent: (refs/remotes/origin/a) 43e8e7167bb0bf84b72fd1c34f087bcca99e6a50
-Following parent with do_switch
-Successfully followed parent
-r3 = c1f8632c536ab244965eca22ed3e1e1eb5a8d5ed (refs/remotes/origin/a)
-Checking svn:mergeinfo changes since r3: 1 sources, 1 changed
-Found merge parent (/trunk:1-2): fb524af835bd93025a228c4d291396d9f0bf753f
-r4 = 040be371c95ca9203ac33d2d05ac5f565c05ce5e (refs/remotes/origin/a)
-	A	file2.txt
-r5 = 3d68c3be76e1ae807c06809d9f276c5665b47551 (refs/remotes/origin/b)
-	M	file2.txt
-r6 = d1b4a9cb95bd340b273fe56a851807948e6efcfc (refs/remotes/origin/b)
-Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9159-git-svn-no-parent-mergeinfo/svnrepo/branches/b => file:///build/git-2.20.1/t/trash%20directory.t9159-git-svn-no-parent-mergeinfo/svnrepo/branches/c, 5
-Found branch parent: (refs/remotes/origin/c) 3d68c3be76e1ae807c06809d9f276c5665b47551
-Following parent with do_switch
-Successfully followed parent
-r7 = 7bca3cd5fce499937adb6d83d3870888ab2b73fa (refs/remotes/origin/c)
-Checking svn:mergeinfo changes since r7: 1 sources, 1 changed
-Found merge parent (/branches/b:5-6): d1b4a9cb95bd340b273fe56a851807948e6efcfc
-r8 = 93e3bb75fc409915e1bc3395b76a8d078f6db3f4 (refs/remotes/origin/c)
+ok 1 - initialize source svn repo
+
+expecting success: 
+	git svn init "$svnrepo"/trunk &&
+	git svn fetch
+
+r1 = 848a805e60dd16b8bd03ced4c0aa43341bd4f1c9 (refs/remotes/git-svn)
+	A	foo
+r2 = 3f00e3e522c09f818caeee6a91d1594a6e7517f5 (refs/remotes/git-svn)
 Checked out HEAD:
-  file:///build/git-2.20.1/t/trash%20directory.t9159-git-svn-no-parent-mergeinfo/svnrepo/trunk r2
-ok 1 - test handling of root commits in merge ranges
+  file:///build/git-2.20.1/t/trash%20directory.t9158-git-svn-mergeinfo/svnrepo/trunk r2
+ok 2 - clone svn repo
 
-# passed all 1 test(s)
-1..1
+expecting success: 
+	touch bar &&
+	git add bar &&
+	git commit -m "bar" &&
+	git svn dcommit --mergeinfo="/branches/foo:1-10"
+
+[master b16fb80] bar
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 bar
+Committing to file:///build/git-2.20.1/t/trash%20directory.t9158-git-svn-mergeinfo/svnrepo/trunk ...
+	A	bar
+Committed r3
+	A	bar
+Checking svn:mergeinfo changes since r2: 1 sources, 1 changed
+Couldn't find revmap for file:///build/git-2.20.1/t/trash%20directory.t9158-git-svn-mergeinfo/svnrepo/trunk/branches/foo
+r3 = da9b06197e01f0b9db6931b0dd24b5f8adfa4a52 (refs/remotes/git-svn)
+No changes between b16fb80a4b12047ab63474b2939d62cebc7c13fe and refs/remotes/git-svn
+Resetting to the latest refs/remotes/git-svn
+ok 3 - change svn:mergeinfo
+
+expecting success: 
+	mergeinfo=$(svn_cmd propget svn:mergeinfo "$svnrepo"/trunk) &&
+	test "$mergeinfo" = "/branches/foo:1-10"
+
+ok 4 - verify svn:mergeinfo
+
+expecting success: 
+	touch baz &&
+	git add baz &&
+	git commit -m "baz" &&
+	git svn dcommit --mergeinfo="/branches/bar:1-10 /branches/other:3-5,8,10-11"
+
+[master 2b1bd45] baz
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 baz
+Committing to file:///build/git-2.20.1/t/trash%20directory.t9158-git-svn-mergeinfo/svnrepo/trunk ...
+	A	baz
+Committed r4
+	A	baz
+Checking svn:mergeinfo changes since r3: 2 sources, 2 changed
+Couldn't find revmap for file:///build/git-2.20.1/t/trash%20directory.t9158-git-svn-mergeinfo/svnrepo/trunk/branches/bar
+Couldn't find revmap for file:///build/git-2.20.1/t/trash%20directory.t9158-git-svn-mergeinfo/svnrepo/trunk/branches/other
+r4 = fa499e8e98b822b38c64fdb713e1ce5972b98159 (refs/remotes/git-svn)
+No changes between 2b1bd45e6941d56c1f9db1bf9be932c92d58b184 and refs/remotes/git-svn
+Resetting to the latest refs/remotes/git-svn
+ok 5 - change svn:mergeinfo multiline
+
+expecting success: 
+	mergeinfo=$(svn_cmd propget svn:mergeinfo "$svnrepo"/trunk) &&
+	test "$mergeinfo" = "/branches/bar:1-10
+/branches/other:3-5,8,10-11"
+
+ok 6 - verify svn:mergeinfo multiline
+
+# passed all 6 test(s)
+1..6
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
 *** t9148-git-svn-propset.sh ***
@@ -329286,7 +327678,7 @@
 	A	foo
 	A	subdir/foo_subdir
 	A	subdir/subdir2/foo_subdir2
-r1 = 8fb0e5deeb1cad73cf1f995d8e32b892d58a8f88 (refs/remotes/git-svn)
+r1 = 7efba546520f0f3ed8b201b92839d3b17779f50c (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/git-2.20.1/t/trash%20directory.t9148-git-svn-propset/svnrepo r1
 ok 2 - fetch revisions from svn
@@ -329298,15 +327690,15 @@
 	confirm_props "." "foo" "svn:keywords" "FreeBSD=%H" &&
 	rm -rf svn_project
 	
-[master 13913c4] testing propset
+[master 005e6ae] testing propset
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 Committing to file:///build/git-2.20.1/t/trash%20directory.t9148-git-svn-propset/svnrepo ...
 	M	foo
 Committed r2
 	M	foo
-r2 = ae6fd075ed2a400f8f3af686bad979b730a4d184 (refs/remotes/git-svn)
-No changes between 13913c4a7cfff6d8affe37c093835bf113ba552d and refs/remotes/git-svn
+r2 = 070c3825e84a96dc04658295b008acf86af27e98 (refs/remotes/git-svn)
+No changes between 005e6aea876b94f20c6d89d27b5c44c31022343f and refs/remotes/git-svn
 Resetting to the latest refs/remotes/git-svn
 A    svn_project/foo
 A    svn_project/subdir
@@ -329325,15 +327717,15 @@
 		"svn:keywords" "FreeBSD=%H" fbsd:nokeywords yes &&
 	rm -rf svn_project
 	
-[master 8b9de6d] testing propset
+[master 7bdbff7] testing propset
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 Committing to file:///build/git-2.20.1/t/trash%20directory.t9148-git-svn-propset/svnrepo ...
 	M	foo
 Committed r3
 	M	foo
-r3 = 2c61ae207ba9edaccac67d5c28d25a52c559dcfc (refs/remotes/git-svn)
-No changes between 8b9de6da2aa3c805f1cbe55e7e278b28e462c1b5 and refs/remotes/git-svn
+r3 = db6c3da0adf8a58725a00260b66adf1b71c69d2e (refs/remotes/git-svn)
+No changes between 7bdbff7640ddcb96dec04255be176eecc51bd2de and refs/remotes/git-svn
 Resetting to the latest refs/remotes/git-svn
 A    svn_project/foo
 A    svn_project/subdir
@@ -329350,15 +327742,15 @@
 	confirm_props "." "$foo_subdir2" "svn:keywords" "FreeBSD=%H" &&
 	rm -rf svn_project
 	
-[master 613743d] testing propset
+[master f7e2d1c] testing propset
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 Committing to file:///build/git-2.20.1/t/trash%20directory.t9148-git-svn-propset/svnrepo ...
 	M	subdir/subdir2/foo_subdir2
 Committed r4
 	M	subdir/subdir2/foo_subdir2
-r4 = 6c4393b571ae73b5080fb82e96f106c34949a3a4 (refs/remotes/git-svn)
-No changes between 613743d8013c65683594ea66e3ab1dfe0e05bb5c and refs/remotes/git-svn
+r4 = 7258e28daff745f8f63ee3d2440ab3e8c6c60625 (refs/remotes/git-svn)
+No changes between f7e2d1cad97f19d39d8620e3317dbc89c325b7bc and refs/remotes/git-svn
 Resetting to the latest refs/remotes/git-svn
 A    svn_project/foo
 A    svn_project/subdir
@@ -329377,15 +327769,15 @@
 		svn:keywords "FreeBSD=%H" &&
 	rm -rf svn_project
 	
-[master c1f90bc] testing propset
+[master 73d9a2d] testing propset
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 Committing to file:///build/git-2.20.1/t/trash%20directory.t9148-git-svn-propset/svnrepo ...
 	M	subdir/foo_subdir
 Committed r5
 	M	subdir/foo_subdir
-r5 = 9e6d8067cc7ee9cfa52b3ed554322c741916ba52 (refs/remotes/git-svn)
-No changes between c1f90bca711c7cb702f296de7ddf495cce1b876d and refs/remotes/git-svn
+r5 = 9e7fc0ca36af4ae0184055d0cd7538ba23c54637 (refs/remotes/git-svn)
+No changes between 73d9a2dbbfbe44331a1c703dfea135aabc4d4aab and refs/remotes/git-svn
 Resetting to the latest refs/remotes/git-svn
 A    svn_project/foo
 A    svn_project/subdir
@@ -329399,98 +327791,219 @@
 1..6
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t9158-git-svn-mergeinfo.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9158-git-svn-mergeinfo/.git/
+*** t9159-git-svn-no-parent-mergeinfo.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9159-git-svn-no-parent-mergeinfo/.git/
 expecting success: 
-	svn_cmd mkdir -m x "$svnrepo"/trunk &&
-	svn_cmd co "$svnrepo"/trunk "$SVN_TREE" &&
+	mkdir -p init/trunk init/branches init/tags &&
+	echo "r1" > init/trunk/file.txt &&
+	svn_cmd import -m "initial import" init "$svnrepo" &&
+	svn_cmd co "$svnrepo" tmp &&
 	(
-		cd "$SVN_TREE" &&
-		touch foo &&
-		svn_cmd add foo &&
-		svn_cmd commit -m "initial commit"
+		cd tmp &&
+		echo "r2" > trunk/file.txt &&
+		svn_cmd commit -m "Modify file.txt on trunk" &&
+		svn_cmd cp trunk@1 branches/a &&
+		svn_cmd commit -m "Create branch a from trunk r1" &&
+		svn_cmd propset svn:mergeinfo /trunk:1-2 branches/a &&
+		svn_cmd commit -m "Fake merge of trunk r2 into branch a" &&
+		mkdir branches/b &&
+		echo "r5" > branches/b/file2.txt &&
+		svn_cmd add branches/b &&
+		svn_cmd commit -m "Create branch b from thin air" &&
+		echo "r6" > branches/b/file2.txt &&
+		svn_cmd commit -m "Modify file2.txt on branch b" &&
+		svn_cmd cp branches/b@5 branches/c &&
+		svn_cmd commit -m "Create branch c from branch b r5" &&
+		svn_cmd propset svn:mergeinfo /branches/b:5-6 branches/c &&
+		svn_cmd commit -m "Fake merge of branch b r6 into branch c"
 	) &&
-	rm -rf "$SVN_TREE"
-
+	git svn init -s "$svnrepo" &&
+	git svn fetch
+	
+Adding         init/branches
+Adding         init/tags
+Adding         init/trunk
+Adding         init/trunk/file.txt
 Committing transaction...
 Committed revision 1.
+A    tmp/branches
+A    tmp/tags
+A    tmp/trunk
+A    tmp/trunk/file.txt
 Checked out revision 1.
-A         foo
-Adding         foo
+Sending        trunk/file.txt
 Transmitting file data .done
 Committing transaction...
 Committed revision 2.
-ok 1 - initialize source svn repo
+Updating 'branches/a':
+A    branches/a/file.txt
+Updated to revision 1.
+A         branches/a
+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.
+Updating 'branches/c':
+A    branches/c/file2.txt
+Updated to revision 5.
+A         branches/c
+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 = ae5bc75afebdea1ab0ae9a0311517cc7fb492cd5 (refs/remotes/origin/trunk)
+	M	file.txt
+r2 = 96ff8f1ecc02255447c64a1eb79495fde36bf054 (refs/remotes/origin/trunk)
+Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9159-git-svn-no-parent-mergeinfo/svnrepo/trunk => file:///build/git-2.20.1/t/trash%20directory.t9159-git-svn-no-parent-mergeinfo/svnrepo/branches/a, 1
+Found branch parent: (refs/remotes/origin/a) ae5bc75afebdea1ab0ae9a0311517cc7fb492cd5
+Following parent with do_switch
+Successfully followed parent
+r3 = 9046ffdbe78850c59cbca3abfd53c6d224946cea (refs/remotes/origin/a)
+Checking svn:mergeinfo changes since r3: 1 sources, 1 changed
+Found merge parent (/trunk:1-2): 96ff8f1ecc02255447c64a1eb79495fde36bf054
+r4 = f3879af14fc001e6d2bdeb497288e8199412921c (refs/remotes/origin/a)
+	A	file2.txt
+r5 = 97699631514b8f6d80b58f63cd76b31a10f1cc2b (refs/remotes/origin/b)
+	M	file2.txt
+r6 = 59d51304ab2eb196fef3bedd611e56baaa1b5392 (refs/remotes/origin/b)
+Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9159-git-svn-no-parent-mergeinfo/svnrepo/branches/b => file:///build/git-2.20.1/t/trash%20directory.t9159-git-svn-no-parent-mergeinfo/svnrepo/branches/c, 5
+Found branch parent: (refs/remotes/origin/c) 97699631514b8f6d80b58f63cd76b31a10f1cc2b
+Following parent with do_switch
+Successfully followed parent
+r7 = b3a0ce3b3d39afc5d380f84048a562ccf08903e0 (refs/remotes/origin/c)
+Checking svn:mergeinfo changes since r7: 1 sources, 1 changed
+Found merge parent (/branches/b:5-6): 59d51304ab2eb196fef3bedd611e56baaa1b5392
+r8 = 4c8132d5c8c6723c3614ab6061d20424eeb84ad4 (refs/remotes/origin/c)
+Checked out HEAD:
+  file:///build/git-2.20.1/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/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t9154-git-svn-fancy-glob.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9154-git-svn-fancy-glob/.git/
 expecting success: 
-	git svn init "$svnrepo"/trunk &&
+	svnadmin load -q '/build/git-2.20.1/t/trash directory.t9154-git-svn-fancy-glob/svnrepo' < '/build/git-2.20.1/t/t9154/svn.dump' &&
+	git svn init --minimize-url -T trunk 'file:///build/git-2.20.1/t/trash directory.t9154-git-svn-fancy-glob/svnrepo' &&
 	git svn fetch
-
-r1 = 5e1e82417e4621bdd6d4039bfdb2779332a8568e (refs/remotes/git-svn)
+	
 	A	foo
-r2 = 5d2113b5055073f57e5294fed7fea97d058256ab (refs/remotes/git-svn)
+r1 = ac83a73c6afcea9b3882d772c81307999649fe15 (refs/remotes/origin/trunk)
+	M	foo
+r6 = 68a286025294fbc4a64ed4678ccb3a33e4ef7b4e (refs/remotes/origin/trunk)
 Checked out HEAD:
-  file:///build/git-2.20.1/t/trash%20directory.t9158-git-svn-mergeinfo/svnrepo/trunk r2
-ok 2 - clone svn repo
+  file:///build/git-2.20.1/t/trash%20directory.t9154-git-svn-fancy-glob/svnrepo/trunk r6
+ok 1 - load svn repo
 
 expecting success: 
-	touch bar &&
-	git add bar &&
-	git commit -m "bar" &&
-	git svn dcommit --mergeinfo="/branches/foo:1-10"
-
-[master 674b3d1] bar
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 bar
-Committing to file:///build/git-2.20.1/t/trash%20directory.t9158-git-svn-mergeinfo/svnrepo/trunk ...
-	A	bar
-Committed r3
-	A	bar
-Checking svn:mergeinfo changes since r2: 1 sources, 1 changed
-Couldn't find revmap for file:///build/git-2.20.1/t/trash%20directory.t9158-git-svn-mergeinfo/svnrepo/trunk/branches/foo
-r3 = a0ed914e7386cd2e4be0e179ce88272d6375ec53 (refs/remotes/git-svn)
-No changes between 674b3d164a67a8443cbf6b1fe3f055da456e1732 and refs/remotes/git-svn
-Resetting to the latest refs/remotes/git-svn
-ok 3 - change svn:mergeinfo
+	git config svn-remote.svn.branches 'branches/{red}:refs/remotes/*' &&
+	git svn fetch &&
+	git rev-parse refs/remotes/red &&
+	test_must_fail git rev-parse refs/remotes/green &&
+	test_must_fail git rev-parse refs/remotes/blue
+	
+Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9154-git-svn-fancy-glob/svnrepo/trunk => file:///build/git-2.20.1/t/trash%20directory.t9154-git-svn-fancy-glob/svnrepo/branches/red, 1
+Found branch parent: (refs/remotes/red) ac83a73c6afcea9b3882d772c81307999649fe15
+Following parent with do_switch
+Successfully followed parent
+r2 = 3a59c318da54c62b03a3991a2dbf27473a73703d (refs/remotes/red)
+	M	foo
+r3 = 212269725a14bac9d0b75ed1d37df0e2d35c73ce (refs/remotes/red)
+212269725a14bac9d0b75ed1d37df0e2d35c73ce
+fatal: ambiguous argument 'refs/remotes/green': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+refs/remotes/green
+fatal: ambiguous argument 'refs/remotes/blue': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+refs/remotes/blue
+ok 2 - add red branch
 
 expecting success: 
-	mergeinfo=$(svn_cmd propget svn:mergeinfo "$svnrepo"/trunk) &&
-	test "$mergeinfo" = "/branches/foo:1-10"
-
-ok 4 - verify svn:mergeinfo
+	git config --file=.git/svn/.metadata --unset svn-remote.svn.branches-maxRev &&
+	git config svn-remote.svn.branches 'branches/{red,gre}:refs/remotes/*' &&
+	git svn fetch &&
+	git rev-parse refs/remotes/red &&
+	test_must_fail git rev-parse refs/remotes/green &&
+	test_must_fail git rev-parse refs/remotes/blue
+	
+212269725a14bac9d0b75ed1d37df0e2d35c73ce
+fatal: ambiguous argument 'refs/remotes/green': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+refs/remotes/green
+fatal: ambiguous argument 'refs/remotes/blue': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+refs/remotes/blue
+ok 3 - add gre branch
 
 expecting success: 
-	touch baz &&
-	git add baz &&
-	git commit -m "baz" &&
-	git svn dcommit --mergeinfo="/branches/bar:1-10 /branches/other:3-5,8,10-11"
-
-[master b0f17b8] baz
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 baz
-Committing to file:///build/git-2.20.1/t/trash%20directory.t9158-git-svn-mergeinfo/svnrepo/trunk ...
-	A	baz
-Committed r4
-	A	baz
-Checking svn:mergeinfo changes since r3: 2 sources, 2 changed
-Couldn't find revmap for file:///build/git-2.20.1/t/trash%20directory.t9158-git-svn-mergeinfo/svnrepo/trunk/branches/bar
-Couldn't find revmap for file:///build/git-2.20.1/t/trash%20directory.t9158-git-svn-mergeinfo/svnrepo/trunk/branches/other
-r4 = 6081ea42eabd4a9e14f566bff6c693a1490252cd (refs/remotes/git-svn)
-No changes between b0f17b82febf757ce33040a1bbf4524a7841add7 and refs/remotes/git-svn
-Resetting to the latest refs/remotes/git-svn
-ok 5 - change svn:mergeinfo multiline
+	git config --file=.git/svn/.metadata --unset svn-remote.svn.branches-maxRev &&
+	git config svn-remote.svn.branches 'branches/{red,green}:refs/remotes/*' &&
+	git svn fetch &&
+	git rev-parse refs/remotes/red &&
+	git rev-parse refs/remotes/green &&
+	test_must_fail git rev-parse refs/remotes/blue
+	
+Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9154-git-svn-fancy-glob/svnrepo/trunk => file:///build/git-2.20.1/t/trash%20directory.t9154-git-svn-fancy-glob/svnrepo/branches/green, 1
+Found branch parent: (refs/remotes/green) ac83a73c6afcea9b3882d772c81307999649fe15
+Following parent with do_switch
+Successfully followed parent
+r2 = d163bf551af34b49b1a0a799428d297d97d2cf16 (refs/remotes/green)
+	M	foo
+r4 = ea020edba7724a14541b9991abc280e46099ec6f (refs/remotes/green)
+212269725a14bac9d0b75ed1d37df0e2d35c73ce
+ea020edba7724a14541b9991abc280e46099ec6f
+fatal: ambiguous argument 'refs/remotes/blue': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+refs/remotes/blue
+ok 4 - add green branch
 
 expecting success: 
-	mergeinfo=$(svn_cmd propget svn:mergeinfo "$svnrepo"/trunk) &&
-	test "$mergeinfo" = "/branches/bar:1-10
-/branches/other:3-5,8,10-11"
-
-ok 6 - verify svn:mergeinfo multiline
+	git config --file=.git/svn/.metadata --unset svn-remote.svn.branches-maxRev &&
+	git config svn-remote.svn.branches 'branches/*:refs/remotes/*' &&
+	git svn fetch &&
+	git rev-parse refs/remotes/red &&
+	git rev-parse refs/remotes/green &&
+	git rev-parse refs/remotes/blue
+	
+Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9154-git-svn-fancy-glob/svnrepo/trunk => file:///build/git-2.20.1/t/trash%20directory.t9154-git-svn-fancy-glob/svnrepo/branches/blue, 1
+Found branch parent: (refs/remotes/blue) ac83a73c6afcea9b3882d772c81307999649fe15
+Following parent with do_switch
+Successfully followed parent
+r2 = d0496894da2737c908783e11a4527bc5faac7e09 (refs/remotes/blue)
+	M	foo
+r5 = b14315a51e337d7c2b2b6b8719453734a242295e (refs/remotes/blue)
+212269725a14bac9d0b75ed1d37df0e2d35c73ce
+ea020edba7724a14541b9991abc280e46099ec6f
+b14315a51e337d7c2b2b6b8719453734a242295e
+ok 5 - add all branches
 
-# passed all 6 test(s)
-1..6
+# passed all 5 test(s)
+1..5
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
 *** t9167-git-svn-cmd-branch-subproject.sh ***
@@ -329553,8 +328066,8 @@
 
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9147-git-svn-include-paths/g/.git/
 	A	qqq/test_qqq.txt
-r1 = 480ac6439d904d48590fe63b84cfee42d970221b (refs/remotes/git-svn)
-r2 = 3adea863313d8a174df4e3c9854cac7de276e0e9 (refs/remotes/git-svn)
+r1 = 719e71657bb1d1e8ce21f9b7e6aa203fc110c57e (refs/remotes/git-svn)
+r2 = 47cbb25dad9b564ec11c31a8ebb76fcae048dd01 (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/git-2.20.1/t/trash%20directory.t9147-git-svn-include-paths/svnrepo r2
 ok 2 - clone an SVN repository with filter to include qqq directory
@@ -329569,8 +328082,8 @@
 
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9147-git-svn-include-paths/c/.git/
 	A	qqq/test_qqq.txt
-r1 = 480ac6439d904d48590fe63b84cfee42d970221b (refs/remotes/git-svn)
-r2 = 3adea863313d8a174df4e3c9854cac7de276e0e9 (refs/remotes/git-svn)
+r1 = 719e71657bb1d1e8ce21f9b7e6aa203fc110c57e (refs/remotes/git-svn)
+r2 = 47cbb25dad9b564ec11c31a8ebb76fcae048dd01 (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/git-2.20.1/t/trash%20directory.t9147-git-svn-include-paths/svnrepo r2
 ok 3 - init+fetch an SVN repository with included qqq directory
@@ -329613,7 +328126,7 @@
 	)
 
 	M	qqq/test_qqq.txt
-r3 = 75bdad280b48b0182c7f0d08dea33241341ccc53 (refs/remotes/git-svn)
+r3 = d9b69b2802b1a75cc184d0c167dffbf47a604aee (refs/remotes/git-svn)
 First, rewinding head to replay your work on top of it...
 Fast-forwarded master to refs/remotes/git-svn.
 ok 6 - update git svn-cloned repo (config include)
@@ -329629,7 +328142,7 @@
 	)
 
 	M	qqq/test_qqq.txt
-r3 = 75bdad280b48b0182c7f0d08dea33241341ccc53 (refs/remotes/git-svn)
+r3 = d9b69b2802b1a75cc184d0c167dffbf47a604aee (refs/remotes/git-svn)
 First, rewinding head to replay your work on top of it...
 Fast-forwarded master to refs/remotes/git-svn.
 ok 7 - update git svn-cloned repo (option include)
@@ -329662,7 +328175,7 @@
 		rm expect expect2
 	)
 
-r4 = 93f9c3ebbf5b79df28f5b134556226d188d36beb (refs/remotes/git-svn)
+r4 = 40bc5abe509c3cbe0ed4cb96e7c7e7594ea7566d (refs/remotes/git-svn)
 First, rewinding head to replay your work on top of it...
 Fast-forwarded master to refs/remotes/git-svn.
 ok 9 - update git svn-cloned repo (config include)
@@ -329677,7 +328190,7 @@
 		rm expect expect2
 	)
 
-r4 = 93f9c3ebbf5b79df28f5b134556226d188d36beb (refs/remotes/git-svn)
+r4 = 40bc5abe509c3cbe0ed4cb96e7c7e7594ea7566d (refs/remotes/git-svn)
 First, rewinding head to replay your work on top of it...
 Fast-forwarded master to refs/remotes/git-svn.
 ok 10 - update git svn-cloned repo (option include)
@@ -329713,7 +328226,7 @@
 	)
 
 	M	qqq/test_qqq.txt
-r5 = 0f55ed8b7371525437d09ea472c7cffa32d0c5d4 (refs/remotes/git-svn)
+r5 = d6600c558966248c6e9453e7ca9f792310920470 (refs/remotes/git-svn)
 First, rewinding head to replay your work on top of it...
 Fast-forwarded master to refs/remotes/git-svn.
 ok 12 - update git svn-cloned repo again (config include)
@@ -329729,7 +328242,7 @@
 	)
 
 	M	qqq/test_qqq.txt
-r5 = 0f55ed8b7371525437d09ea472c7cffa32d0c5d4 (refs/remotes/git-svn)
+r5 = d6600c558966248c6e9453e7ca9f792310920470 (refs/remotes/git-svn)
 First, rewinding head to replay your work on top of it...
 Fast-forwarded master to refs/remotes/git-svn.
 ok 13 - update git svn-cloned repo again (option include)
@@ -329738,112 +328251,6 @@
 1..13
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t9154-git-svn-fancy-glob.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9154-git-svn-fancy-glob/.git/
-expecting success: 
-	svnadmin load -q '/build/git-2.20.1/t/trash directory.t9154-git-svn-fancy-glob/svnrepo' < '/build/git-2.20.1/t/t9154/svn.dump' &&
-	git svn init --minimize-url -T trunk 'file:///build/git-2.20.1/t/trash directory.t9154-git-svn-fancy-glob/svnrepo' &&
-	git svn fetch
-	
-	A	foo
-r1 = ac83a73c6afcea9b3882d772c81307999649fe15 (refs/remotes/origin/trunk)
-	M	foo
-r6 = 68a286025294fbc4a64ed4678ccb3a33e4ef7b4e (refs/remotes/origin/trunk)
-Checked out HEAD:
-  file:///build/git-2.20.1/t/trash%20directory.t9154-git-svn-fancy-glob/svnrepo/trunk r6
-ok 1 - load svn repo
-
-expecting success: 
-	git config svn-remote.svn.branches 'branches/{red}:refs/remotes/*' &&
-	git svn fetch &&
-	git rev-parse refs/remotes/red &&
-	test_must_fail git rev-parse refs/remotes/green &&
-	test_must_fail git rev-parse refs/remotes/blue
-	
-Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9154-git-svn-fancy-glob/svnrepo/trunk => file:///build/git-2.20.1/t/trash%20directory.t9154-git-svn-fancy-glob/svnrepo/branches/red, 1
-Found branch parent: (refs/remotes/red) ac83a73c6afcea9b3882d772c81307999649fe15
-Following parent with do_switch
-Successfully followed parent
-r2 = 3a59c318da54c62b03a3991a2dbf27473a73703d (refs/remotes/red)
-	M	foo
-r3 = 212269725a14bac9d0b75ed1d37df0e2d35c73ce (refs/remotes/red)
-212269725a14bac9d0b75ed1d37df0e2d35c73ce
-fatal: ambiguous argument 'refs/remotes/green': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-refs/remotes/green
-fatal: ambiguous argument 'refs/remotes/blue': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-refs/remotes/blue
-ok 2 - add red branch
-
-expecting success: 
-	git config --file=.git/svn/.metadata --unset svn-remote.svn.branches-maxRev &&
-	git config svn-remote.svn.branches 'branches/{red,gre}:refs/remotes/*' &&
-	git svn fetch &&
-	git rev-parse refs/remotes/red &&
-	test_must_fail git rev-parse refs/remotes/green &&
-	test_must_fail git rev-parse refs/remotes/blue
-	
-212269725a14bac9d0b75ed1d37df0e2d35c73ce
-fatal: ambiguous argument 'refs/remotes/green': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-refs/remotes/green
-fatal: ambiguous argument 'refs/remotes/blue': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-refs/remotes/blue
-ok 3 - add gre branch
-
-expecting success: 
-	git config --file=.git/svn/.metadata --unset svn-remote.svn.branches-maxRev &&
-	git config svn-remote.svn.branches 'branches/{red,green}:refs/remotes/*' &&
-	git svn fetch &&
-	git rev-parse refs/remotes/red &&
-	git rev-parse refs/remotes/green &&
-	test_must_fail git rev-parse refs/remotes/blue
-	
-Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9154-git-svn-fancy-glob/svnrepo/trunk => file:///build/git-2.20.1/t/trash%20directory.t9154-git-svn-fancy-glob/svnrepo/branches/green, 1
-Found branch parent: (refs/remotes/green) ac83a73c6afcea9b3882d772c81307999649fe15
-Following parent with do_switch
-Successfully followed parent
-r2 = d163bf551af34b49b1a0a799428d297d97d2cf16 (refs/remotes/green)
-	M	foo
-r4 = ea020edba7724a14541b9991abc280e46099ec6f (refs/remotes/green)
-212269725a14bac9d0b75ed1d37df0e2d35c73ce
-ea020edba7724a14541b9991abc280e46099ec6f
-fatal: ambiguous argument 'refs/remotes/blue': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-refs/remotes/blue
-ok 4 - add green branch
-
-expecting success: 
-	git config --file=.git/svn/.metadata --unset svn-remote.svn.branches-maxRev &&
-	git config svn-remote.svn.branches 'branches/*:refs/remotes/*' &&
-	git svn fetch &&
-	git rev-parse refs/remotes/red &&
-	git rev-parse refs/remotes/green &&
-	git rev-parse refs/remotes/blue
-	
-Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9154-git-svn-fancy-glob/svnrepo/trunk => file:///build/git-2.20.1/t/trash%20directory.t9154-git-svn-fancy-glob/svnrepo/branches/blue, 1
-Found branch parent: (refs/remotes/blue) ac83a73c6afcea9b3882d772c81307999649fe15
-Following parent with do_switch
-Successfully followed parent
-r2 = d0496894da2737c908783e11a4527bc5faac7e09 (refs/remotes/blue)
-	M	foo
-r5 = b14315a51e337d7c2b2b6b8719453734a242295e (refs/remotes/blue)
-212269725a14bac9d0b75ed1d37df0e2d35c73ce
-ea020edba7724a14541b9991abc280e46099ec6f
-b14315a51e337d7c2b2b6b8719453734a242295e
-ok 5 - add all branches
-
-# passed all 5 test(s)
-1..5
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
 *** t9169-git-svn-dcommit-crlf.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9169-git-svn-dcommit-crlf/.git/
 expecting success: 
@@ -329870,7 +328277,7 @@
 Committed revision 1.
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9169-git-svn-dcommit-crlf/work/.git/
 W: +empty_dir: dir
-r1 = 98120f80d0ce9ba7241541131150d3f4e068118d (refs/remotes/git-svn)
+r1 = afeabae921c13b62b6e4e3043224fc4f5d252826 (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/git-2.20.1/t/trash%20directory.t9169-git-svn-dcommit-crlf/svnrepo r1
 creating empty directory: dir
@@ -329878,8 +328285,8 @@
 	A	foo
 Committed r2
 	A	foo
-r2 = a538ceab9b63c28879c1342c53251a6e78c516a2 (refs/remotes/git-svn)
-No changes between f04443c0ade38977269395c5f181c8a20c7f0c48 and refs/remotes/git-svn
+r2 = c1b9994f1225748ecb489e92a7e4ee2bf431ab4d (refs/remotes/git-svn)
+No changes between 698876d31cbe6f630c9a035de271254418cc64ae and refs/remotes/git-svn
 Resetting to the latest refs/remotes/git-svn
 ok 1 - setup commit repository
 
@@ -329914,19 +328321,19 @@
 expecting success: git svn clone "$svnrepo" cloned
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9146-git-svn-empty-dirs/cloned/.git/
 W: +empty_dir: a
-r1 = f11efae32d700e0fde50f2f35ce3bf9101f6d6d0 (refs/remotes/git-svn)
+r1 = c5874af18d5f698254344587022246e613d4ef30 (refs/remotes/git-svn)
 W: +empty_dir: b
-r2 = 4576e889cf09bd24a48bf1766cc060cd1dae0d93 (refs/remotes/git-svn)
+r2 = d39ffa582c4477c84948b41bc0459ea8731df48e (refs/remotes/git-svn)
 W: +empty_dir: c
-r3 = aacfd1fa96285775f8a1f177a21b142537723162 (refs/remotes/git-svn)
+r3 = c533f5ba062fa2ccf2801d1302858eea407a5fd2 (refs/remotes/git-svn)
 W: +empty_dir: d
-r4 = ae90f4666a71bed098ff6bde5d45062febd162c6 (refs/remotes/git-svn)
+r4 = eba05e62d2892673f74702745f47774770430cee (refs/remotes/git-svn)
 W: +empty_dir: d/e
-r5 = f4f261f97e2128d5155c0c81bbbd41d433d62a18 (refs/remotes/git-svn)
+r5 = cb4189b53cc30da6f44324f9f359dfed5e1696f6 (refs/remotes/git-svn)
 W: +empty_dir: d/e/f
-r6 = b544c3ce6fdee5b3f00e5c7f8d10a4541e8f0424 (refs/remotes/git-svn)
+r6 = 329d38782c4ed71dc49172e9d645353284459820 (refs/remotes/git-svn)
 W: +empty_dir: weird file name
-r7 = 27f05acb1fa9002be80022c6c907b94f50a9518b (refs/remotes/git-svn)
+r7 = 89fae96e8e0fdf24ea1de76e92980ac8f6ed4100 (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/git-2.20.1/t/trash%20directory.t9146-git-svn-empty-dirs/svnrepo r7
 creating empty directory: a
@@ -329971,19 +328378,19 @@
 
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9146-git-svn-empty-dirs/cloned-no-mkdirs/.git/
 W: +empty_dir: a
-r1 = f11efae32d700e0fde50f2f35ce3bf9101f6d6d0 (refs/remotes/git-svn)
+r1 = c5874af18d5f698254344587022246e613d4ef30 (refs/remotes/git-svn)
 W: +empty_dir: b
-r2 = 4576e889cf09bd24a48bf1766cc060cd1dae0d93 (refs/remotes/git-svn)
+r2 = d39ffa582c4477c84948b41bc0459ea8731df48e (refs/remotes/git-svn)
 W: +empty_dir: c
-r3 = aacfd1fa96285775f8a1f177a21b142537723162 (refs/remotes/git-svn)
+r3 = c533f5ba062fa2ccf2801d1302858eea407a5fd2 (refs/remotes/git-svn)
 W: +empty_dir: d
-r4 = ae90f4666a71bed098ff6bde5d45062febd162c6 (refs/remotes/git-svn)
+r4 = eba05e62d2892673f74702745f47774770430cee (refs/remotes/git-svn)
 W: +empty_dir: d/e
-r5 = f4f261f97e2128d5155c0c81bbbd41d433d62a18 (refs/remotes/git-svn)
+r5 = cb4189b53cc30da6f44324f9f359dfed5e1696f6 (refs/remotes/git-svn)
 W: +empty_dir: d/e/f
-r6 = b544c3ce6fdee5b3f00e5c7f8d10a4541e8f0424 (refs/remotes/git-svn)
+r6 = 329d38782c4ed71dc49172e9d645353284459820 (refs/remotes/git-svn)
 W: +empty_dir: weird file name
-r7 = 27f05acb1fa9002be80022c6c907b94f50a9518b (refs/remotes/git-svn)
+r7 = 89fae96e8e0fdf24ea1de76e92980ac8f6ed4100 (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/git-2.20.1/t/trash%20directory.t9146-git-svn-empty-dirs/svnrepo r7
 ok 4 - option automkdirs set to false
@@ -330000,7 +328407,7 @@
 	test -d cloned/"! !"
 
 W: +empty_dir: ! !
-r8 = ca93a5431f0aea4a599d234bdeaa4b0bebda31c5 (refs/remotes/git-svn)
+r8 = dade59c4409fe26ef324d927c55a2dafdda166fc (refs/remotes/git-svn)
 First, rewinding head to replay your work on top of it...
 Fast-forwarded master to refs/remotes/git-svn.
 creating empty directory: ! !
@@ -330085,11 +328492,11 @@
 
 expecting success: git svn clone -s "$svnrepo" trunk
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9146-git-svn-empty-dirs/trunk/.git/
-r9 = 8585bd71ba01819697b989b9145379de93b0b2a2 (refs/remotes/origin/trunk)
+r9 = 1f66f76b574b4c3b8346951e59e2128f27e396af (refs/remotes/origin/trunk)
 W: +empty_dir: trunk/a
-r10 = 8b3a6a23d5bbdb96fdffb101f3592b3b7ba0a666 (refs/remotes/origin/trunk)
+r10 = 9c0a0d6968220fecb46e791e67d8b1849ac22114 (refs/remotes/origin/trunk)
 W: +empty_dir: trunk/weird file name
-r11 = 4dabe1c4ebfbece091194120732330196a144afa (refs/remotes/origin/trunk)
+r11 = f1261a7b691d54a521568e7f402c373ae5ee28be (refs/remotes/origin/trunk)
 Checked out HEAD:
   file:///build/git-2.20.1/t/trash%20directory.t9146-git-svn-empty-dirs/svnrepo/trunk r11
 creating empty directory: a
@@ -330125,30 +328532,30 @@
 
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9146-git-svn-empty-dirs/removed/.git/
 W: +empty_dir: a
-r1 = f11efae32d700e0fde50f2f35ce3bf9101f6d6d0 (refs/remotes/git-svn)
+r1 = c5874af18d5f698254344587022246e613d4ef30 (refs/remotes/git-svn)
 W: +empty_dir: b
-r2 = 4576e889cf09bd24a48bf1766cc060cd1dae0d93 (refs/remotes/git-svn)
+r2 = d39ffa582c4477c84948b41bc0459ea8731df48e (refs/remotes/git-svn)
 W: +empty_dir: c
-r3 = aacfd1fa96285775f8a1f177a21b142537723162 (refs/remotes/git-svn)
+r3 = c533f5ba062fa2ccf2801d1302858eea407a5fd2 (refs/remotes/git-svn)
 W: +empty_dir: d
-r4 = ae90f4666a71bed098ff6bde5d45062febd162c6 (refs/remotes/git-svn)
+r4 = eba05e62d2892673f74702745f47774770430cee (refs/remotes/git-svn)
 W: +empty_dir: d/e
-r5 = f4f261f97e2128d5155c0c81bbbd41d433d62a18 (refs/remotes/git-svn)
+r5 = cb4189b53cc30da6f44324f9f359dfed5e1696f6 (refs/remotes/git-svn)
 W: +empty_dir: d/e/f
-r6 = b544c3ce6fdee5b3f00e5c7f8d10a4541e8f0424 (refs/remotes/git-svn)
+r6 = 329d38782c4ed71dc49172e9d645353284459820 (refs/remotes/git-svn)
 W: +empty_dir: weird file name
-r7 = 27f05acb1fa9002be80022c6c907b94f50a9518b (refs/remotes/git-svn)
+r7 = 89fae96e8e0fdf24ea1de76e92980ac8f6ed4100 (refs/remotes/git-svn)
 W: +empty_dir: ! !
-r8 = ca93a5431f0aea4a599d234bdeaa4b0bebda31c5 (refs/remotes/git-svn)
+r8 = dade59c4409fe26ef324d927c55a2dafdda166fc (refs/remotes/git-svn)
 W: +empty_dir: trunk
-r9 = 1f341e0adb1dc77268b3764216c063f7d1c1f414 (refs/remotes/git-svn)
+r9 = ebb06977116ed8bd5b56bc8714411f340b666a0f (refs/remotes/git-svn)
 W: +empty_dir: trunk/a
-r10 = 3af60901535bcdec230699e2febb9bae4ff406f0 (refs/remotes/git-svn)
+r10 = 6203e7637c5811a11a7ecbdae65d75d013e1e274 (refs/remotes/git-svn)
 W: +empty_dir: trunk/weird file name
-r11 = 000da2bcbd8b265db29c4d6fb9dd8e5d311f1394 (refs/remotes/git-svn)
+r11 = a8713e3a26e3b52a0bafb54110206d7ce2ed100d (refs/remotes/git-svn)
 	D	d
 W: -empty_dir: d
-r12 = 596728ff09e4900bd615762a834d2d6732ee8f80 (refs/remotes/git-svn)
+r12 = 5c514dd8bdac0893573866d55b45a734a0a920f6 (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/git-2.20.1/t/trash%20directory.t9146-git-svn-empty-dirs/svnrepo r12
 creating empty directory: ! !
@@ -330186,9 +328593,9 @@
 
 Committing transaction...
 Committed revision 13.
-HEAD is now at f11efae mkdir a
+HEAD is now at c5874af mkdir a
 W: +empty_dir: gz
-r13 = 284a9285f0acf7a64bc035939542ef43dd579971 (refs/remotes/git-svn)
+r13 = 6e6193eeb3f9e52cce0f14aabc28ea9fef34b695 (refs/remotes/git-svn)
 First, rewinding head to replay your work on top of it...
 Fast-forwarded master to refs/remotes/git-svn.
 creating empty directory: gz
@@ -330198,6 +328605,336 @@
 1..14
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
+*** t9160-git-svn-preserve-empty-dirs.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9160-git-svn-preserve-empty-dirs/.git/
+expecting success: 
+	svn_cmd mkdir -m x "$svnrepo"/trunk &&
+	svn_cmd co "$svnrepo"/trunk "$SVN_TREE" &&
+	(
+		cd "$SVN_TREE" &&
+		mkdir -p 1 2 3/a 3/b 4 5 6 &&
+		echo "First non-empty file"  > 2/file1.txt &&
+		echo "Second non-empty file" > 2/file2.txt &&
+		echo "Third non-empty file"  > 3/a/file1.txt &&
+		echo "Fourth non-empty file" > 3/b/file1.txt &&
+		svn_cmd add 1 2 3 4 5 6 &&
+		svn_cmd commit -m "initial commit" &&
+
+		mkdir 4/a &&
+		svn_cmd add 4/a &&
+		svn_cmd commit -m "nested empty directory" &&
+		mkdir 4/a/b &&
+		svn_cmd add 4/a/b &&
+		svn_cmd commit -m "deeply nested empty directory" &&
+		mkdir 4/a/b/c &&
+		svn_cmd add 4/a/b/c &&
+		svn_cmd commit -m "really deeply nested empty directory" &&
+		echo "Kill the placeholder file" > 4/a/b/c/foo &&
+		svn_cmd add 4/a/b/c/foo &&
+		svn_cmd commit -m "Regular file to remove placeholder" &&
+
+		svn_cmd del 2/file2.txt &&
+		svn_cmd del 3/b &&
+		svn_cmd commit -m "delete non-last entry in directory" &&
+
+		svn_cmd del 2/file1.txt &&
+		svn_cmd del 3/a &&
+		svn_cmd commit -m "delete last entry in directory" &&
+
+		echo "Conflict file" > 5/.placeholder &&
+		mkdir 6/.placeholder &&
+		svn_cmd add 5/.placeholder 6/.placeholder &&
+		svn_cmd commit -m "Placeholder Namespace conflict"
+	) &&
+	rm -rf "$SVN_TREE"
+
+Committing transaction...
+Committed revision 1.
+Checked out revision 1.
+A         1
+A         2
+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         4
+A         5
+A         6
+Adding         1
+Adding         2
+Adding         2/file1.txt
+Adding         2/file2.txt
+Adding         3
+Adding         3/a
+Adding         3/a/file1.txt
+Adding         3/b
+Adding         3/b/file1.txt
+Adding         4
+Adding         5
+Adding         6
+Transmitting file data ....done
+Committing transaction...
+Committed revision 2.
+A         4/a
+Adding         4/a
+Committing transaction...
+Committed revision 3.
+A         4/a/b
+Adding         4/a/b
+Committing transaction...
+Committed revision 4.
+A         4/a/b/c
+Adding         4/a/b/c
+Committing transaction...
+Committed revision 5.
+A         4/a/b/c/foo
+Adding         4/a/b/c/foo
+Transmitting file data .done
+Committing transaction...
+Committed revision 6.
+D         2/file2.txt
+D         3/b
+D         3/b/file1.txt
+Deleting       2/file2.txt
+Deleting       3/b
+Committing transaction...
+Committed revision 7.
+D         2/file1.txt
+D         3/a
+D         3/a/file1.txt
+Deleting       2/file1.txt
+Deleting       3/a
+Committing transaction...
+Committed revision 8.
+A         5/.placeholder
+A         6/.placeholder
+Adding         5/.placeholder
+Adding         6/.placeholder
+Transmitting file data .done
+Committing transaction...
+Committed revision 9.
+ok 1 - initialize source svn repo containing empty dirs
+
+expecting success: 
+	git svn clone "$svnrepo"/trunk --preserve-empty-dirs "$GIT_REPO"
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9160-git-svn-preserve-empty-dirs/git-svn-repo/.git/
+r1 = a0d8602788ca5fd2d8eabe8e553a357f7b6efaaf (refs/remotes/git-svn)
+	A	2/file1.txt
+	A	2/file2.txt
+	A	3/a/file1.txt
+	A	3/b/file1.txt
+r2 = 07e6a4f5bf20979980e61b4da33848f36c6bcbf5 (refs/remotes/git-svn)
+	D	4/.gitignore
+W: -empty_dir: 4/.gitignore
+r3 = 2032a00b63bc3b0619824c318e152c5612aac375 (refs/remotes/git-svn)
+	D	4/a/.gitignore
+W: -empty_dir: 4/a/.gitignore
+r4 = 8c268a8b28946eb959c69043ede52ce2d8e6053c (refs/remotes/git-svn)
+	D	4/a/b/.gitignore
+W: -empty_dir: 4/a/b/.gitignore
+r5 = cae0621c11b99d2275df1f088a6d416eb686b816 (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 = 586baad4f944485a70b06439afe8fe2149c88138 (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 = e0371a06fbe44245c2e82541d0f3125069e2eaf1 (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 = ea01218c26078d4a6bce2c444c58a61a28466d79 (refs/remotes/git-svn)
+	D	5/.gitignore
+	A	5/.placeholder
+	D	6/.gitignore
+W: -empty_dir: 5/.gitignore
+W: -empty_dir: 6/.gitignore
+r9 = a4f47154be77ae54364e4af150aacd5403cd2a99 (refs/remotes/git-svn)
+Checked out HEAD:
+  file:///build/git-2.20.1/t/trash%20directory.t9160-git-svn-preserve-empty-dirs/svnrepo/trunk r9
+ok 2 - clone svn repo with --preserve-empty-dirs
+
+expecting success: 
+	test -f "$GIT_REPO"/1/.gitignore &&
+	test $(find "$GIT_REPO"/1 -type f | wc -l) = "1"
+
+ok 3 - directory empty from inception
+
+expecting success: 
+	test -f "$GIT_REPO"/2/.gitignore &&
+	test $(find "$GIT_REPO"/2 -type f | wc -l) = "1" &&
+	test -f "$GIT_REPO"/3/.gitignore &&
+	test $(find "$GIT_REPO"/3 -type f | wc -l) = "1"
+
+ok 4 - directory empty from subsequent svn commit
+
+expecting success: 
+	test $(find "$GIT_REPO"/4 -type f | wc -l) = "1" &&
+	test -f "$GIT_REPO"/4/a/b/c/foo
+
+ok 5 - add entry to previously empty directory
+
+expecting success: 
+	(
+		cd "$GIT_REPO" &&
+		git checkout HEAD~2
+	) &&
+	test_must_fail test -f "$GIT_REPO"/2/.gitignore &&
+	test_must_fail test -f "$GIT_REPO"/3/.gitignore
+
+Note: checking out 'HEAD~2'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by performing another checkout.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -b with the checkout command again. Example:
+
+  git checkout -b <new-branch-name>
+
+HEAD is now at e0371a0 delete non-last entry in directory
+ok 6 - remove non-last entry from directory
+
+expecting success: 
+	rm -rf "$GIT_REPO" &&
+	git svn clone "$svnrepo"/trunk --preserve-empty-dirs \
+		--placeholder-file=.placeholder "$GIT_REPO" &&
+	find "$GIT_REPO" -type f -name ".placeholder" &&
+	test $(find "$GIT_REPO" -type f -name ".placeholder" | wc -l) = "5"
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9160-git-svn-preserve-empty-dirs/git-svn-repo/.git/
+r1 = a0d8602788ca5fd2d8eabe8e553a357f7b6efaaf (refs/remotes/git-svn)
+	A	2/file1.txt
+	A	2/file2.txt
+	A	3/a/file1.txt
+	A	3/b/file1.txt
+r2 = 742a9a8c02ba1a8ac150411a72b2a40fd9b80f98 (refs/remotes/git-svn)
+	D	4/.placeholder
+W: -empty_dir: 4/.placeholder
+r3 = 13a75609eb833812406e9764875113403a66b17c (refs/remotes/git-svn)
+	D	4/a/.placeholder
+W: -empty_dir: 4/a/.placeholder
+r4 = 27cb4ca1c88f037e6249efef43491d7dd54a1bd7 (refs/remotes/git-svn)
+	D	4/a/b/.placeholder
+W: -empty_dir: 4/a/b/.placeholder
+r5 = ae9f7bab0b049affa65749dd6b2b027ba33cf410 (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 = 27e40ccaec7ef11e617790312046f387657f1a04 (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 = 634dadf6ecb7fd9cc3d805d74a7389747bb9b327 (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 = 348abc56392ed67de833d14586ecbde8d10ab285 (refs/remotes/git-svn)
+	A	5/.placeholder
+	D	6/.placeholder
+r9 = 40d1d5919b9dbbdeeed05c85c1d4c28891924c6c (refs/remotes/git-svn)
+Checked out HEAD:
+  file:///build/git-2.20.1/t/trash%20directory.t9160-git-svn-preserve-empty-dirs/svnrepo/trunk r9
+git-svn-repo/6/.placeholder/.placeholder
+git-svn-repo/5/.placeholder
+git-svn-repo/3/.placeholder
+git-svn-repo/2/.placeholder
+git-svn-repo/1/.placeholder
+ok 7 - clone svn repo with --placeholder-file specified
+
+expecting success: 
+	test -s "$GIT_REPO"/5/.placeholder
+
+ok 8 - placeholder namespace conflict with file
+
+expecting success: 
+	test -d "$GIT_REPO"/6/.placeholder &&
+	test -f "$GIT_REPO"/6/.placeholder/.placeholder &&
+	test $(find "$GIT_REPO"/6 -type f | wc -l) = "1"
+
+ok 9 - placeholder namespace conflict with directory
+
+expecting success: 
+	svn_cmd co "$svnrepo"/trunk "$SVN_TREE" &&
+	(
+		cd "$SVN_TREE" &&
+		mkdir -p 7 &&
+		echo "This should remove placeholder" > 1/file1.txt &&
+		echo "This should not remove placeholder" > 5/file1.txt &&
+		svn_cmd add 7 1/file1.txt 5/file1.txt &&
+		svn_cmd commit -m "subsequent svn commit for persistence tests"
+	) &&
+	rm -rf "$SVN_TREE" &&
+	(
+		cd "$GIT_REPO" &&
+		git svn rebase
+	)
+
+A    .git/svn/refs/remotes/git-svn/svn-tree/1
+A    .git/svn/refs/remotes/git-svn/svn-tree/2
+A    .git/svn/refs/remotes/git-svn/svn-tree/3
+A    .git/svn/refs/remotes/git-svn/svn-tree/4
+A    .git/svn/refs/remotes/git-svn/svn-tree/4/a
+A    .git/svn/refs/remotes/git-svn/svn-tree/4/a/b
+A    .git/svn/refs/remotes/git-svn/svn-tree/4/a/b/c
+A    .git/svn/refs/remotes/git-svn/svn-tree/4/a/b/c/foo
+A    .git/svn/refs/remotes/git-svn/svn-tree/5
+A    .git/svn/refs/remotes/git-svn/svn-tree/5/.placeholder
+A    .git/svn/refs/remotes/git-svn/svn-tree/6
+A    .git/svn/refs/remotes/git-svn/svn-tree/6/.placeholder
+Checked out revision 9.
+A         7
+A         1/file1.txt
+A         5/file1.txt
+Adding         1/file1.txt
+Adding         5/file1.txt
+Adding         7
+Transmitting file data ..done
+Committing transaction...
+Committed revision 10.
+	D	1/.placeholder
+	A	1/file1.txt
+	A	5/file1.txt
+W: -empty_dir: 1/.placeholder
+r10 = dc267401314eb41f3a329b5848b0f887977c4cfe (refs/remotes/git-svn)
+First, rewinding head to replay your work on top of it...
+Fast-forwarded master to refs/remotes/git-svn.
+ok 10 - second set of svn commits and rebase
+
+expecting success: 
+	test -f "$GIT_REPO"/7/.placeholder &&
+	test $(find "$GIT_REPO"/7 -type f | wc -l) = "1"
+
+ok 11 - flag persistence during subsqeuent rebase
+
+expecting success: 
+	test -f "$GIT_REPO"/1/file1.txt &&
+	test $(find "$GIT_REPO"/1 -type f | wc -l) = "1" &&
+
+	test -f "$GIT_REPO"/5/file1.txt &&
+	test -f "$GIT_REPO"/5/.placeholder &&
+	test $(find "$GIT_REPO"/5 -type f | wc -l) = "2"
+
+ok 12 - placeholder list persistence during subsqeuent rebase
+
+# passed all 12 test(s)
+1..12
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
 *** t9166-git-svn-fetch-merge-branch-of-branch2.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9166-git-svn-fetch-merge-branch-of-branch2/.git/
 expecting success: 
@@ -330270,29 +329007,29 @@
 	git svn init -s "$svnrepo" &&
 	git svn fetch
 
-r1 = 47f6053a37d82be9c691e954674810f0699f5598 (refs/remotes/origin/trunk)
+r1 = bf3f8c3af4caf7943f21ea36c4736bdc6ed1783b (refs/remotes/origin/trunk)
 	A	foo
-r3 = a3d3e0fbc7e20468f394d37a756b84f3f1b8dea7 (refs/remotes/origin/trunk)
+r3 = 47ae7f60a34c919c8ed8b33115bd2b65e5c4ecd6 (refs/remotes/origin/trunk)
 Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9166-git-svn-fetch-merge-branch-of-branch2/svnrepo/trunk => file:///build/git-2.20.1/t/trash%20directory.t9166-git-svn-fetch-merge-branch-of-branch2/svnrepo/branches/branch1, 3
-Found branch parent: (refs/remotes/origin/branch1) a3d3e0fbc7e20468f394d37a756b84f3f1b8dea7
+Found branch parent: (refs/remotes/origin/branch1) 47ae7f60a34c919c8ed8b33115bd2b65e5c4ecd6
 Following parent with do_switch
 Successfully followed parent
-r4 = cf93677eb098274d264734e8cfc9608e1ac7c4d6 (refs/remotes/origin/branch1)
+r4 = cd66b55c461f938b74e4360886cd52cd81069ee3 (refs/remotes/origin/branch1)
 	A	bar
-r5 = 653a1772874633b4ed6eabb07da09b5d8257e56c (refs/remotes/origin/branch1)
+r5 = d401d06c58eeb33076d18098b8166b66599cfc2a (refs/remotes/origin/branch1)
 Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9166-git-svn-fetch-merge-branch-of-branch2/svnrepo/branches/branch1 => file:///build/git-2.20.1/t/trash%20directory.t9166-git-svn-fetch-merge-branch-of-branch2/svnrepo/branches/branch2, 5
-Found branch parent: (refs/remotes/origin/branch2) 653a1772874633b4ed6eabb07da09b5d8257e56c
+Found branch parent: (refs/remotes/origin/branch2) d401d06c58eeb33076d18098b8166b66599cfc2a
 Following parent with do_switch
 Successfully followed parent
-r6 = d719250b7087e4966d4c93041931726ad0dc1093 (refs/remotes/origin/branch2)
+r6 = 89791e38768e151e1def2cdc1aed3b9beab27e49 (refs/remotes/origin/branch2)
 	A	baz
-r7 = bf66387ca54944a67f1a9e3a4f5136b0a7b49528 (refs/remotes/origin/branch2)
+r7 = b4748e6caf5f0271e44545bed4404686b6940a22 (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): 653a1772874633b4ed6eabb07da09b5d8257e56c
-Found merge parent (/branches/branch2:6-7): bf66387ca54944a67f1a9e3a4f5136b0a7b49528
-r8 = 6e870328a28e0bde3761adb2c70a096e8f4ecf00 (refs/remotes/origin/trunk)
+Found merge parent (/branches/branch1:4-5): d401d06c58eeb33076d18098b8166b66599cfc2a
+Found merge parent (/branches/branch2:6-7): b4748e6caf5f0271e44545bed4404686b6940a22
+r8 = aa1e4828ed924c1c0ae42e7a926d8513fedd9a37 (refs/remotes/origin/trunk)
 Checked out HEAD:
   file:///build/git-2.20.1/t/trash%20directory.t9166-git-svn-fetch-merge-branch-of-branch2/svnrepo/trunk r8
 ok 2 - clone svn repo
@@ -330307,6 +329044,199 @@
 1..3
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
+*** t9302-fast-import-unpack-limit.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9302-fast-import-unpack-limit/.git/
+expecting success: 
+	test_tick &&
+	cat >input <<-INPUT_END &&
+	commit refs/heads/master
+	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
+
+/build/git-2.20.1/git-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:          2282 KiB
+       pools:          2048 KiB
+     objects:           234 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize = 1073741824
+pack_report: core.packedGitLimit      = 35184372088832
+pack_report: pack_used_ctr            =          0
+pack_report: pack_mmap_calls          =          0
+pack_report: pack_open_windows        =          0 /          0
+pack_report: pack_mapped              =          0 /          0
+---------------------------------------------------------------------
+
+ok 1 - create loose objects on import
+
+expecting success: 
+	test_tick &&
+	cat >input <<-INPUT_END &&
+	commit refs/heads/master
+	committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
+	data <<COMMIT
+	incremental should create a pack
+	COMMIT
+	from refs/heads/master^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
+
+/build/git-2.20.1/git-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:          2282 KiB
+       pools:          2048 KiB
+     objects:           234 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize = 1073741824
+pack_report: core.packedGitLimit      = 35184372088832
+pack_report: pack_used_ctr            =          4
+pack_report: pack_mmap_calls          =          1
+pack_report: pack_open_windows        =          1 /          1
+pack_report: pack_mapped              =        329 /        329
+---------------------------------------------------------------------
+
+ok 2 - bigger packs are preserved
+
+expecting success: 
+	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/master^0) &&
+	(
+		cat <<-INPUT_END &&
+		blob
+		mark :1
+		data 6
+		hello
+
+		commit refs/heads/master
+		mark :2
+		committer $id
+		data <<COMMIT
+		checkpoint after this
+		COMMIT
+		from refs/heads/master^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/master^0)
+		done &&
+		cat <<-INPUT_END &&
+		commit refs/heads/master
+		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
+
+/build/git-2.20.1/git-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:          2344 KiB
+       pools:          2110 KiB
+     objects:           234 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize = 1073741824
+pack_report: core.packedGitLimit      = 35184372088832
+pack_report: pack_used_ctr            =          5
+pack_report: pack_mmap_calls          =          2
+pack_report: pack_open_windows        =          1 /          2
+pack_report: pack_mapped              =        329 /        581
+---------------------------------------------------------------------
+
+ok 3 - lookups after checkpoint works
+
+# passed all 3 test(s)
+1..3
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
 *** t9141-git-svn-multiple-branches.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9141-git-svn-multiple-branches/.git/
 expecting success: 
@@ -330472,95 +329402,95 @@
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9141-git-svn-multiple-branches/git_project/.git/
 Using higher level of URL: file:///build/git-2.20.1/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project => file:///build/git-2.20.1/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo
 	A	a.file
-r1 = b9b703773fb80cee3440ef83f4be589b28a3842b (refs/remotes/origin/trunk)
+r1 = a619387274e79d30b85fcf4bb989b89b048000fe (refs/remotes/origin/trunk)
 Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/trunk => file:///build/git-2.20.1/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/b_one/first, 1
-Found branch parent: (refs/remotes/origin/first) b9b703773fb80cee3440ef83f4be589b28a3842b
+Found branch parent: (refs/remotes/origin/first) a619387274e79d30b85fcf4bb989b89b048000fe
 Following parent with do_switch
 Successfully followed parent
-r2 = 8eee444bd8b2be9d14e2d1b4b4f3f8f4e2bdb6a7 (refs/remotes/origin/first)
+r2 = 7540578b5b86d1fd91df072debd17845c2135e9b (refs/remotes/origin/first)
 Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/trunk => file:///build/git-2.20.1/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/tags_A/1.0, 2
-Found branch parent: (refs/remotes/origin/tags/1.0) b9b703773fb80cee3440ef83f4be589b28a3842b
+Found branch parent: (refs/remotes/origin/tags/1.0) a619387274e79d30b85fcf4bb989b89b048000fe
 Following parent with do_switch
 Successfully followed parent
-r3 = bb5e66712767f8a516579744dfd282935b02e882 (refs/remotes/origin/tags/1.0)
+r3 = 9de026bf640fe8336fe286c8aa32cd6e0b4b5232 (refs/remotes/origin/tags/1.0)
 	M	a.file
-r4 = c00b23d68e35747b23a502551c82304bf7a795b9 (refs/remotes/origin/trunk)
+r4 = 633224e0711ac9fc07c9e0b67f61be4d95b03ea9 (refs/remotes/origin/trunk)
 Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/trunk => file:///build/git-2.20.1/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/b_one/second, 4
-Found branch parent: (refs/remotes/origin/second) c00b23d68e35747b23a502551c82304bf7a795b9
+Found branch parent: (refs/remotes/origin/second) 633224e0711ac9fc07c9e0b67f61be4d95b03ea9
 Following parent with do_switch
 Successfully followed parent
-r5 = c04e613c301954ea928c527ad2131bb62ca3ba1e (refs/remotes/origin/second)
+r5 = 470b7bf0778c259d926afc900762a2b9fbfcceb4 (refs/remotes/origin/second)
 Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/trunk => file:///build/git-2.20.1/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/tags_A/2.0, 5
-Found branch parent: (refs/remotes/origin/tags/2.0) c00b23d68e35747b23a502551c82304bf7a795b9
+Found branch parent: (refs/remotes/origin/tags/2.0) 633224e0711ac9fc07c9e0b67f61be4d95b03ea9
 Following parent with do_switch
 Successfully followed parent
-r6 = e9ea70eccdae2c28c47335cae65c32e110d49ba7 (refs/remotes/origin/tags/2.0)
+r6 = 740b133206e4d0adbbf7f35407dbdc3b6411dbf5 (refs/remotes/origin/tags/2.0)
 	M	a.file
-r7 = 9a1bdf3a3777241b58c43a2839abdc323f59fed6 (refs/remotes/origin/trunk)
+r7 = 55f472628a199f0c299e857f86e5adc8b21848dd (refs/remotes/origin/trunk)
 Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/trunk => file:///build/git-2.20.1/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/b_two/1, 7
-Found branch parent: (refs/remotes/origin/1) 9a1bdf3a3777241b58c43a2839abdc323f59fed6
+Found branch parent: (refs/remotes/origin/1) 55f472628a199f0c299e857f86e5adc8b21848dd
 Following parent with do_switch
 Successfully followed parent
-r8 = 8491fdc702138b7166abd4a31dabb9ead0f288ce (refs/remotes/origin/1)
+r8 = 65a187d08615c02ba43702937075f58582f79e74 (refs/remotes/origin/1)
 Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/trunk => file:///build/git-2.20.1/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/tags_A/3.0, 8
-Found branch parent: (refs/remotes/origin/tags/3.0) 9a1bdf3a3777241b58c43a2839abdc323f59fed6
+Found branch parent: (refs/remotes/origin/tags/3.0) 55f472628a199f0c299e857f86e5adc8b21848dd
 Following parent with do_switch
 Successfully followed parent
-r9 = 8578082f2cf4c609c45e6779ff800ff0076eb7b4 (refs/remotes/origin/tags/3.0)
+r9 = 919dec1ae5fb05a0c296d852b1eae35f51e8e07f (refs/remotes/origin/tags/3.0)
 	M	a.file
-r10 = 79f67b72fbdd96f6e06b8515db069db38d99d104 (refs/remotes/origin/trunk)
+r10 = 459346b04fd16e9547f8f21e2a9499188f6381e9 (refs/remotes/origin/trunk)
 Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/trunk => file:///build/git-2.20.1/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/b_two/2, 10
-Found branch parent: (refs/remotes/origin/2) 79f67b72fbdd96f6e06b8515db069db38d99d104
+Found branch parent: (refs/remotes/origin/2) 459346b04fd16e9547f8f21e2a9499188f6381e9
 Following parent with do_switch
 Successfully followed parent
-r11 = c1fd5a7dce9acd984362fdf57f11ed3071b792eb (refs/remotes/origin/2)
+r11 = f19d9dac2179756bf4fc860f101abf9df612b9cf (refs/remotes/origin/2)
 Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/trunk => file:///build/git-2.20.1/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/tags_A/4.0, 11
-Found branch parent: (refs/remotes/origin/tags/4.0) 79f67b72fbdd96f6e06b8515db069db38d99d104
+Found branch parent: (refs/remotes/origin/tags/4.0) 459346b04fd16e9547f8f21e2a9499188f6381e9
 Following parent with do_switch
 Successfully followed parent
-r12 = 3f53f878a7c6d6eb47b33cc2c75f33e0a4fa2d7f (refs/remotes/origin/tags/4.0)
+r12 = 9f4c2497579463ef09076c619b1d1e5038da3630 (refs/remotes/origin/tags/4.0)
 	M	a.file
-r13 = b781363621417f2fa0a4c1cd95bd0a79b0b4adf0 (refs/remotes/origin/first)
+r13 = 1370bba5c5f9aa0e293b0126f40023b2ad77bf46 (refs/remotes/origin/first)
 Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/b_one/first => file:///build/git-2.20.1/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/tags_B/v5, 13
-Found branch parent: (refs/remotes/origin/tags/v5) b781363621417f2fa0a4c1cd95bd0a79b0b4adf0
+Found branch parent: (refs/remotes/origin/tags/v5) 1370bba5c5f9aa0e293b0126f40023b2ad77bf46
 Following parent with do_switch
 Successfully followed parent
-r14 = 1dd99fe063e9b2d9117706a2061855a60f384a92 (refs/remotes/origin/tags/v5)
+r14 = f0ce499b2810a08b40107b26464ff31b9bf36d5a (refs/remotes/origin/tags/v5)
 	M	a.file
-r15 = 3418b219bea9e63bffe71b9cf020376acdf84330 (refs/remotes/origin/second)
+r15 = 25cb7033b42fe6e56e91fabfebc803cf7bde9f5b (refs/remotes/origin/second)
 Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/b_one/second => file:///build/git-2.20.1/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/tags_B/v6, 15
-Found branch parent: (refs/remotes/origin/tags/v6) 3418b219bea9e63bffe71b9cf020376acdf84330
+Found branch parent: (refs/remotes/origin/tags/v6) 25cb7033b42fe6e56e91fabfebc803cf7bde9f5b
 Following parent with do_switch
 Successfully followed parent
-r16 = 0e117bc08b5cca9863799cc2492c3eff45f166ea (refs/remotes/origin/tags/v6)
+r16 = dda7c621d2b925641655b69fcc4b427c6bfe4230 (refs/remotes/origin/tags/v6)
 	M	a.file
-r17 = 3cb11621a7cf58a0e69651ecc1f702e5486756f7 (refs/remotes/origin/1)
+r17 = 2e5ed58955c6f0552d7481d425c5ebf35c50e4a9 (refs/remotes/origin/1)
 Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/b_two/1 => file:///build/git-2.20.1/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/tags_B/v7, 17
-Found branch parent: (refs/remotes/origin/tags/v7) 3cb11621a7cf58a0e69651ecc1f702e5486756f7
+Found branch parent: (refs/remotes/origin/tags/v7) 2e5ed58955c6f0552d7481d425c5ebf35c50e4a9
 Following parent with do_switch
 Successfully followed parent
-r18 = 252d829a098315e1f8ac0741b4ebb1bf840f3f4b (refs/remotes/origin/tags/v7)
+r18 = d2673277394e9fd1270adbfa08f6d24224ddfd37 (refs/remotes/origin/tags/v7)
 	M	a.file
-r19 = 55cf6c797d0d4d49a3860daddecc629ccef63b7f (refs/remotes/origin/2)
+r19 = 5a9af50a20223cdfc6e74c56e1db07a62d72b3b8 (refs/remotes/origin/2)
 Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/b_two/2 => file:///build/git-2.20.1/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/tags_B/v8, 19
-Found branch parent: (refs/remotes/origin/tags/v8) 55cf6c797d0d4d49a3860daddecc629ccef63b7f
+Found branch parent: (refs/remotes/origin/tags/v8) 5a9af50a20223cdfc6e74c56e1db07a62d72b3b8
 Following parent with do_switch
 Successfully followed parent
-r20 = 5f77b92a9fd0bacf7166c3c39ac5fa1d47be7a8d (refs/remotes/origin/tags/v8)
+r20 = 8a48dc4111d76d31750efe9aefa855521517cec9 (refs/remotes/origin/tags/v8)
 Checked out HEAD:
   file:///build/git-2.20.1/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/trunk r10
-b781363621417f2fa0a4c1cd95bd0a79b0b4adf0
-3418b219bea9e63bffe71b9cf020376acdf84330
-3cb11621a7cf58a0e69651ecc1f702e5486756f7
-55cf6c797d0d4d49a3860daddecc629ccef63b7f
-bb5e66712767f8a516579744dfd282935b02e882
-e9ea70eccdae2c28c47335cae65c32e110d49ba7
-8578082f2cf4c609c45e6779ff800ff0076eb7b4
-3f53f878a7c6d6eb47b33cc2c75f33e0a4fa2d7f
-1dd99fe063e9b2d9117706a2061855a60f384a92
-0e117bc08b5cca9863799cc2492c3eff45f166ea
-252d829a098315e1f8ac0741b4ebb1bf840f3f4b
-5f77b92a9fd0bacf7166c3c39ac5fa1d47be7a8d
+1370bba5c5f9aa0e293b0126f40023b2ad77bf46
+25cb7033b42fe6e56e91fabfebc803cf7bde9f5b
+2e5ed58955c6f0552d7481d425c5ebf35c50e4a9
+5a9af50a20223cdfc6e74c56e1db07a62d72b3b8
+9de026bf640fe8336fe286c8aa32cd6e0b4b5232
+740b133206e4d0adbbf7f35407dbdc3b6411dbf5
+919dec1ae5fb05a0c296d852b1eae35f51e8e07f
+9f4c2497579463ef09076c619b1d1e5038da3630
+f0ce499b2810a08b40107b26464ff31b9bf36d5a
+dda7c621d2b925641655b69fcc4b427c6bfe4230
+d2673277394e9fd1270adbfa08f6d24224ddfd37
+8a48dc4111d76d31750efe9aefa855521517cec9
 ok 2 - clone multiple branch and tag paths
 
 expecting success: 
@@ -330627,40 +329557,40 @@
 
 Copying file:///build/git-2.20.1/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/trunk at r10 to file:///build/git-2.20.1/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/b_one/New1...
 Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/trunk => file:///build/git-2.20.1/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/b_one/New1, 10
-Found branch parent: (refs/remotes/origin/New1) 79f67b72fbdd96f6e06b8515db069db38d99d104
+Found branch parent: (refs/remotes/origin/New1) 459346b04fd16e9547f8f21e2a9499188f6381e9
 Following parent with do_switch
 Successfully followed parent
-r21 = 9eacaa135abdabf7192f3c77252027af05d654c5 (refs/remotes/origin/New1)
+r21 = f54ebca8f4b63cfa6d9b871c815f3222ace05944 (refs/remotes/origin/New1)
 Updating '.':
 A    b_one/New1
 A    b_one/New1/a.file
 Updated to revision 21.
 Copying file:///build/git-2.20.1/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/trunk at r10 to file:///build/git-2.20.1/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/b_two/New2...
 Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/trunk => file:///build/git-2.20.1/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/b_two/New2, 10
-Found branch parent: (refs/remotes/origin/New2) 79f67b72fbdd96f6e06b8515db069db38d99d104
+Found branch parent: (refs/remotes/origin/New2) 459346b04fd16e9547f8f21e2a9499188f6381e9
 Following parent with do_switch
 Successfully followed parent
-r22 = b7edbc65d31effbbbf2e516f828efbe362003144 (refs/remotes/origin/New2)
+r22 = 04d96bc2c207133f7d58a977a45f3b30aba2e021 (refs/remotes/origin/New2)
 Updating '.':
 A    b_two/New2
 A    b_two/New2/a.file
 Updated to revision 22.
 Copying file:///build/git-2.20.1/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/trunk at r10 to file:///build/git-2.20.1/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/tags_A/Tag1...
 Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/trunk => file:///build/git-2.20.1/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/tags_A/Tag1, 10
-Found branch parent: (refs/remotes/origin/tags/Tag1) 79f67b72fbdd96f6e06b8515db069db38d99d104
+Found branch parent: (refs/remotes/origin/tags/Tag1) 459346b04fd16e9547f8f21e2a9499188f6381e9
 Following parent with do_switch
 Successfully followed parent
-r23 = 385bf0a09c0eb0e59f136df087e3d5ad7b4a84b5 (refs/remotes/origin/tags/Tag1)
+r23 = 0eb5c950fe4853dd2604fd2786cb7543a612d85e (refs/remotes/origin/tags/Tag1)
 Updating '.':
 A    tags_A/Tag1
 A    tags_A/Tag1/a.file
 Updated to revision 23.
 Copying file:///build/git-2.20.1/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/trunk at r10 to file:///build/git-2.20.1/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/tags_B/Tag2...
 Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/trunk => file:///build/git-2.20.1/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/tags_B/Tag2, 10
-Found branch parent: (refs/remotes/origin/tags/Tag2) 79f67b72fbdd96f6e06b8515db069db38d99d104
+Found branch parent: (refs/remotes/origin/tags/Tag2) 459346b04fd16e9547f8f21e2a9499188f6381e9
 Following parent with do_switch
 Successfully followed parent
-r24 = 2b72f47230b45f841cb289fb3e68f3b5502ce92b (refs/remotes/origin/tags/Tag2)
+r24 = 8938967446c79d12fc6b24218e65bcec5beee98a (refs/remotes/origin/tags/Tag2)
 Updating '.':
 A    tags_B/Tag2
 A    tags_B/Tag2/a.file
@@ -330751,8 +329681,8 @@
 Adding         bar2
 Committing transaction...
 Committed revision 9.
-D    bar
 D    baz
+D    bar
  U   .
 Updated to revision 9.
 --- Merging differences between repository URLs into '.':
@@ -330771,35 +329701,35 @@
 	git svn init -s "$svnrepo" &&
 	git svn fetch
 
-r1 = b8dce5fc8ba28fd170de1baae0c2d573e1553f9d (refs/remotes/origin/trunk)
+r1 = b8b5728ae658c2b6f3f1bbff532f3e0baae80969 (refs/remotes/origin/trunk)
 	A	foo
-r3 = 007784241a492bf041b6c21f107e467d39370d4f (refs/remotes/origin/trunk)
+r3 = 6d072db010d48fea11dc625628ce77e4143639a5 (refs/remotes/origin/trunk)
 Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9165-git-svn-fetch-merge-branch-of-branch/svnrepo/trunk => file:///build/git-2.20.1/t/trash%20directory.t9165-git-svn-fetch-merge-branch-of-branch/svnrepo/branches/branch1, 3
-Found branch parent: (refs/remotes/origin/branch1) 007784241a492bf041b6c21f107e467d39370d4f
+Found branch parent: (refs/remotes/origin/branch1) 6d072db010d48fea11dc625628ce77e4143639a5
 Following parent with do_switch
 Successfully followed parent
-r4 = 853089458662f7e0d30a8cfd15613653493377d0 (refs/remotes/origin/branch1)
+r4 = e5c2bf97f75e3a723ec0c5ef68ccc4ffe7d25464 (refs/remotes/origin/branch1)
 	A	bar
-r5 = 675af390d814db373c1f2ed8b6ee35c253f25eea (refs/remotes/origin/branch1)
+r5 = 17b30f06acb8a2c1eff83901d8ba95466680559b (refs/remotes/origin/branch1)
 Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9165-git-svn-fetch-merge-branch-of-branch/svnrepo/branches/branch1 => file:///build/git-2.20.1/t/trash%20directory.t9165-git-svn-fetch-merge-branch-of-branch/svnrepo/branches/branch2, 5
-Found branch parent: (refs/remotes/origin/branch2) 675af390d814db373c1f2ed8b6ee35c253f25eea
+Found branch parent: (refs/remotes/origin/branch2) 17b30f06acb8a2c1eff83901d8ba95466680559b
 Following parent with do_switch
 Successfully followed parent
-r6 = d97701c94aefe6f875aa547d502c62dee858ad89 (refs/remotes/origin/branch2)
+r6 = 81ea83f102ae3f4038beda77904ee71bb26a1e0e (refs/remotes/origin/branch2)
 	A	baz
-r7 = 48b4f788aa2c510654fb6a5ae77216e3d36733c3 (refs/remotes/origin/branch2)
+r7 = 0f545c556dafd04d01b04f809313672275aae221 (refs/remotes/origin/branch2)
 	A	bar2
-r8 = a7a96ae77ff6bd7414828df9fece632411d5a3d0 (refs/remotes/origin/trunk)
+r8 = 5c5b63f0454004103149a4e3282689e38cd63049 (refs/remotes/origin/trunk)
 	A	bar2
 Checking svn:mergeinfo changes since r7: 1 sources, 1 changed
-Found merge parent (/trunk:4-8): a7a96ae77ff6bd7414828df9fece632411d5a3d0
-r9 = 7a5f92394e07b94108e9869e638ba4583626c11c (refs/remotes/origin/branch2)
+Found merge parent (/trunk:4-8): 5c5b63f0454004103149a4e3282689e38cd63049
+r9 = b6035b8dffb281b6d52f43aa4c57e414032a35b8 (refs/remotes/origin/branch2)
 	A	bar
 	A	baz
 Checking svn:mergeinfo changes since r8: 2 sources, 2 changed
-Found merge parent (/branches/branch1:4-5): 675af390d814db373c1f2ed8b6ee35c253f25eea
-Found merge parent (/branches/branch2:6-9): 7a5f92394e07b94108e9869e638ba4583626c11c
-r10 = fb46fbb7b0b75b2b2c91fc2ea478e79bcfc062f7 (refs/remotes/origin/trunk)
+Found merge parent (/branches/branch1:4-5): 17b30f06acb8a2c1eff83901d8ba95466680559b
+Found merge parent (/branches/branch2:6-9): b6035b8dffb281b6d52f43aa4c57e414032a35b8
+r10 = 60322686a936c3b8fb1341bb057472ccde07b5e5 (refs/remotes/origin/trunk)
 Checked out HEAD:
   file:///build/git-2.20.1/t/trash%20directory.t9165-git-svn-fetch-merge-branch-of-branch/svnrepo/trunk r10
 ok 2 - clone svn repo
@@ -330814,199 +329744,6 @@
 1..3
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t9302-fast-import-unpack-limit.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9302-fast-import-unpack-limit/.git/
-expecting success: 
-	test_tick &&
-	cat >input <<-INPUT_END &&
-	commit refs/heads/master
-	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
-
-/build/git-2.20.1/git-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:          2282 KiB
-       pools:          2048 KiB
-     objects:           234 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize = 1073741824
-pack_report: core.packedGitLimit      = 35184372088832
-pack_report: pack_used_ctr            =          0
-pack_report: pack_mmap_calls          =          0
-pack_report: pack_open_windows        =          0 /          0
-pack_report: pack_mapped              =          0 /          0
----------------------------------------------------------------------
-
-ok 1 - create loose objects on import
-
-expecting success: 
-	test_tick &&
-	cat >input <<-INPUT_END &&
-	commit refs/heads/master
-	committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
-	data <<COMMIT
-	incremental should create a pack
-	COMMIT
-	from refs/heads/master^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
-
-/build/git-2.20.1/git-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:          2282 KiB
-       pools:          2048 KiB
-     objects:           234 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize = 1073741824
-pack_report: core.packedGitLimit      = 35184372088832
-pack_report: pack_used_ctr            =          4
-pack_report: pack_mmap_calls          =          1
-pack_report: pack_open_windows        =          1 /          1
-pack_report: pack_mapped              =        329 /        329
----------------------------------------------------------------------
-
-ok 2 - bigger packs are preserved
-
-expecting success: 
-	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/master^0) &&
-	(
-		cat <<-INPUT_END &&
-		blob
-		mark :1
-		data 6
-		hello
-
-		commit refs/heads/master
-		mark :2
-		committer $id
-		data <<COMMIT
-		checkpoint after this
-		COMMIT
-		from refs/heads/master^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/master^0)
-		done &&
-		cat <<-INPUT_END &&
-		commit refs/heads/master
-		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
-
-/build/git-2.20.1/git-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:          2344 KiB
-       pools:          2110 KiB
-     objects:           234 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize = 1073741824
-pack_report: core.packedGitLimit      = 35184372088832
-pack_report: pack_used_ctr            =          5
-pack_report: pack_mmap_calls          =          2
-pack_report: pack_open_windows        =          1 /          2
-pack_report: pack_mapped              =        329 /        581
----------------------------------------------------------------------
-
-ok 3 - lookups after checkpoint works
-
-# passed all 3 test(s)
-1..3
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
 *** t9351-fast-export-anonymize.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9351-fast-export-anonymize/.git/
 expecting success: 
@@ -331167,8 +329904,8 @@
 	test_line_count = 1 unique &&
 	! test_cmp authors committers
 
---- authors	2021-12-03 05:11:13.873310336 +0000
-+++ committers	2021-12-03 05:11:13.893309754 +0000
+--- authors	2023-01-05 11:51:34.078868030 +0000
++++ committers	2023-01-05 11:51:34.106868030 +0000
 @@ -1,4 +1,4 @@
 -User 1 <user1@example.com>
 -User 1 <user1@example.com>
@@ -331184,1181 +329921,6 @@
 1..14
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t9160-git-svn-preserve-empty-dirs.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9160-git-svn-preserve-empty-dirs/.git/
-expecting success: 
-	svn_cmd mkdir -m x "$svnrepo"/trunk &&
-	svn_cmd co "$svnrepo"/trunk "$SVN_TREE" &&
-	(
-		cd "$SVN_TREE" &&
-		mkdir -p 1 2 3/a 3/b 4 5 6 &&
-		echo "First non-empty file"  > 2/file1.txt &&
-		echo "Second non-empty file" > 2/file2.txt &&
-		echo "Third non-empty file"  > 3/a/file1.txt &&
-		echo "Fourth non-empty file" > 3/b/file1.txt &&
-		svn_cmd add 1 2 3 4 5 6 &&
-		svn_cmd commit -m "initial commit" &&
-
-		mkdir 4/a &&
-		svn_cmd add 4/a &&
-		svn_cmd commit -m "nested empty directory" &&
-		mkdir 4/a/b &&
-		svn_cmd add 4/a/b &&
-		svn_cmd commit -m "deeply nested empty directory" &&
-		mkdir 4/a/b/c &&
-		svn_cmd add 4/a/b/c &&
-		svn_cmd commit -m "really deeply nested empty directory" &&
-		echo "Kill the placeholder file" > 4/a/b/c/foo &&
-		svn_cmd add 4/a/b/c/foo &&
-		svn_cmd commit -m "Regular file to remove placeholder" &&
-
-		svn_cmd del 2/file2.txt &&
-		svn_cmd del 3/b &&
-		svn_cmd commit -m "delete non-last entry in directory" &&
-
-		svn_cmd del 2/file1.txt &&
-		svn_cmd del 3/a &&
-		svn_cmd commit -m "delete last entry in directory" &&
-
-		echo "Conflict file" > 5/.placeholder &&
-		mkdir 6/.placeholder &&
-		svn_cmd add 5/.placeholder 6/.placeholder &&
-		svn_cmd commit -m "Placeholder Namespace conflict"
-	) &&
-	rm -rf "$SVN_TREE"
-
-Committing transaction...
-Committed revision 1.
-Checked out revision 1.
-A         1
-A         2
-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         4
-A         5
-A         6
-Adding         1
-Adding         2
-Adding         2/file1.txt
-Adding         2/file2.txt
-Adding         3
-Adding         3/a
-Adding         3/a/file1.txt
-Adding         3/b
-Adding         3/b/file1.txt
-Adding         4
-Adding         5
-Adding         6
-Transmitting file data ....done
-Committing transaction...
-Committed revision 2.
-A         4/a
-Adding         4/a
-Committing transaction...
-Committed revision 3.
-A         4/a/b
-Adding         4/a/b
-Committing transaction...
-Committed revision 4.
-A         4/a/b/c
-Adding         4/a/b/c
-Committing transaction...
-Committed revision 5.
-A         4/a/b/c/foo
-Adding         4/a/b/c/foo
-Transmitting file data .done
-Committing transaction...
-Committed revision 6.
-D         2/file2.txt
-D         3/b
-D         3/b/file1.txt
-Deleting       2/file2.txt
-Deleting       3/b
-Committing transaction...
-Committed revision 7.
-D         2/file1.txt
-D         3/a
-D         3/a/file1.txt
-Deleting       2/file1.txt
-Deleting       3/a
-Committing transaction...
-Committed revision 8.
-A         5/.placeholder
-A         6/.placeholder
-Adding         5/.placeholder
-Adding         6/.placeholder
-Transmitting file data .done
-Committing transaction...
-Committed revision 9.
-ok 1 - initialize source svn repo containing empty dirs
-
-expecting success: 
-	git svn clone "$svnrepo"/trunk --preserve-empty-dirs "$GIT_REPO"
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9160-git-svn-preserve-empty-dirs/git-svn-repo/.git/
-r1 = e4ff5f77be9e14def9496d102228896a19c1b745 (refs/remotes/git-svn)
-	A	2/file1.txt
-	A	2/file2.txt
-	A	3/a/file1.txt
-	A	3/b/file1.txt
-r2 = faa030e72c29d868d857622dab3c0941625be0e6 (refs/remotes/git-svn)
-	D	4/.gitignore
-W: -empty_dir: 4/.gitignore
-r3 = 32b172cec568fb586d35e8570a8cd5b3566202d4 (refs/remotes/git-svn)
-	D	4/a/.gitignore
-W: -empty_dir: 4/a/.gitignore
-r4 = 2e457e755e0b92b3035cedc5c83e38219c602d81 (refs/remotes/git-svn)
-	D	4/a/b/.gitignore
-W: -empty_dir: 4/a/b/.gitignore
-r5 = c9620356702a24506660453e6ffe298ffc4bff9d (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 = da39bcdc0a14927ff02c3cd0c5d0ccf421583d95 (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 = c0267ad50019003f3db14a371cdf6392cdad6399 (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 = 215bb446a0759527b9347d18eae15d8db8af27f6 (refs/remotes/git-svn)
-	D	5/.gitignore
-	A	5/.placeholder
-	D	6/.gitignore
-W: -empty_dir: 5/.gitignore
-W: -empty_dir: 6/.gitignore
-r9 = 167238c05d3988b084c1032a36665b02d56ceea3 (refs/remotes/git-svn)
-Checked out HEAD:
-  file:///build/git-2.20.1/t/trash%20directory.t9160-git-svn-preserve-empty-dirs/svnrepo/trunk r9
-ok 2 - clone svn repo with --preserve-empty-dirs
-
-expecting success: 
-	test -f "$GIT_REPO"/1/.gitignore &&
-	test $(find "$GIT_REPO"/1 -type f | wc -l) = "1"
-
-ok 3 - directory empty from inception
-
-expecting success: 
-	test -f "$GIT_REPO"/2/.gitignore &&
-	test $(find "$GIT_REPO"/2 -type f | wc -l) = "1" &&
-	test -f "$GIT_REPO"/3/.gitignore &&
-	test $(find "$GIT_REPO"/3 -type f | wc -l) = "1"
-
-ok 4 - directory empty from subsequent svn commit
-
-expecting success: 
-	test $(find "$GIT_REPO"/4 -type f | wc -l) = "1" &&
-	test -f "$GIT_REPO"/4/a/b/c/foo
-
-ok 5 - add entry to previously empty directory
-
-expecting success: 
-	(
-		cd "$GIT_REPO" &&
-		git checkout HEAD~2
-	) &&
-	test_must_fail test -f "$GIT_REPO"/2/.gitignore &&
-	test_must_fail test -f "$GIT_REPO"/3/.gitignore
-
-Note: checking out 'HEAD~2'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by performing another checkout.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
-
-  git checkout -b <new-branch-name>
-
-HEAD is now at c0267ad delete non-last entry in directory
-ok 6 - remove non-last entry from directory
-
-expecting success: 
-	rm -rf "$GIT_REPO" &&
-	git svn clone "$svnrepo"/trunk --preserve-empty-dirs \
-		--placeholder-file=.placeholder "$GIT_REPO" &&
-	find "$GIT_REPO" -type f -name ".placeholder" &&
-	test $(find "$GIT_REPO" -type f -name ".placeholder" | wc -l) = "5"
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9160-git-svn-preserve-empty-dirs/git-svn-repo/.git/
-r1 = e4ff5f77be9e14def9496d102228896a19c1b745 (refs/remotes/git-svn)
-	A	2/file1.txt
-	A	2/file2.txt
-	A	3/a/file1.txt
-	A	3/b/file1.txt
-r2 = 008f6292f5fdc42e71baa6bec5f5e6307dcaf518 (refs/remotes/git-svn)
-	D	4/.placeholder
-W: -empty_dir: 4/.placeholder
-r3 = 6450f6cfb962a383934352f6cb6c2d698128544e (refs/remotes/git-svn)
-	D	4/a/.placeholder
-W: -empty_dir: 4/a/.placeholder
-r4 = d4f8194114f087f2604a0eb894e32062e4424871 (refs/remotes/git-svn)
-	D	4/a/b/.placeholder
-W: -empty_dir: 4/a/b/.placeholder
-r5 = 6b43f8a3cf5e850e2af0ac57bbaa99e9a28836e3 (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 = de65a102afb7e61f3492527d346704fa34e22a7c (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 = 258c47f0ca6b542ee11007d0c2a5e31b65f909df (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 = 139d599788d236110090a6c6beae9e5601e73db4 (refs/remotes/git-svn)
-	A	5/.placeholder
-	D	6/.placeholder
-r9 = 6fe28e1d4de4e33b3f0c2bf3ceeef46eb740c33e (refs/remotes/git-svn)
-Checked out HEAD:
-  file:///build/git-2.20.1/t/trash%20directory.t9160-git-svn-preserve-empty-dirs/svnrepo/trunk r9
-git-svn-repo/6/.placeholder/.placeholder
-git-svn-repo/5/.placeholder
-git-svn-repo/3/.placeholder
-git-svn-repo/2/.placeholder
-git-svn-repo/1/.placeholder
-ok 7 - clone svn repo with --placeholder-file specified
-
-expecting success: 
-	test -s "$GIT_REPO"/5/.placeholder
-
-ok 8 - placeholder namespace conflict with file
-
-expecting success: 
-	test -d "$GIT_REPO"/6/.placeholder &&
-	test -f "$GIT_REPO"/6/.placeholder/.placeholder &&
-	test $(find "$GIT_REPO"/6 -type f | wc -l) = "1"
-
-ok 9 - placeholder namespace conflict with directory
-
-expecting success: 
-	svn_cmd co "$svnrepo"/trunk "$SVN_TREE" &&
-	(
-		cd "$SVN_TREE" &&
-		mkdir -p 7 &&
-		echo "This should remove placeholder" > 1/file1.txt &&
-		echo "This should not remove placeholder" > 5/file1.txt &&
-		svn_cmd add 7 1/file1.txt 5/file1.txt &&
-		svn_cmd commit -m "subsequent svn commit for persistence tests"
-	) &&
-	rm -rf "$SVN_TREE" &&
-	(
-		cd "$GIT_REPO" &&
-		git svn rebase
-	)
-
-A    .git/svn/refs/remotes/git-svn/svn-tree/1
-A    .git/svn/refs/remotes/git-svn/svn-tree/2
-A    .git/svn/refs/remotes/git-svn/svn-tree/3
-A    .git/svn/refs/remotes/git-svn/svn-tree/4
-A    .git/svn/refs/remotes/git-svn/svn-tree/4/a
-A    .git/svn/refs/remotes/git-svn/svn-tree/4/a/b
-A    .git/svn/refs/remotes/git-svn/svn-tree/4/a/b/c
-A    .git/svn/refs/remotes/git-svn/svn-tree/4/a/b/c/foo
-A    .git/svn/refs/remotes/git-svn/svn-tree/5
-A    .git/svn/refs/remotes/git-svn/svn-tree/5/.placeholder
-A    .git/svn/refs/remotes/git-svn/svn-tree/6
-A    .git/svn/refs/remotes/git-svn/svn-tree/6/.placeholder
-Checked out revision 9.
-A         7
-A         1/file1.txt
-A         5/file1.txt
-Adding         1/file1.txt
-Adding         5/file1.txt
-Adding         7
-Transmitting file data ..done
-Committing transaction...
-Committed revision 10.
-	D	1/.placeholder
-	A	1/file1.txt
-	A	5/file1.txt
-W: -empty_dir: 1/.placeholder
-r10 = ce96693477f89073b1584f1a334daeb528e8ed22 (refs/remotes/git-svn)
-First, rewinding head to replay your work on top of it...
-Fast-forwarded master to refs/remotes/git-svn.
-ok 10 - second set of svn commits and rebase
-
-expecting success: 
-	test -f "$GIT_REPO"/7/.placeholder &&
-	test $(find "$GIT_REPO"/7 -type f | wc -l) = "1"
-
-ok 11 - flag persistence during subsqeuent rebase
-
-expecting success: 
-	test -f "$GIT_REPO"/1/file1.txt &&
-	test $(find "$GIT_REPO"/1 -type f | wc -l) = "1" &&
-
-	test -f "$GIT_REPO"/5/file1.txt &&
-	test -f "$GIT_REPO"/5/.placeholder &&
-	test $(find "$GIT_REPO"/5 -type f | wc -l) = "2"
-
-ok 12 - placeholder list persistence during subsqeuent rebase
-
-# passed all 12 test(s)
-1..12
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t9104-git-svn-follow-parent.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9104-git-svn-follow-parent/.git/
-expecting success: 
-	mkdir import &&
-	(
-		cd import &&
-		mkdir -p trunk &&
-		echo hello >trunk/readme &&
-		svn_cmd import -m "initial" . "$svnrepo"
-	) &&
-	svn_cmd co "$svnrepo" wc &&
-	(
-		cd wc &&
-		echo world >>trunk/readme &&
-		poke trunk/readme &&
-		svn_cmd commit -m "another commit" &&
-		svn_cmd up &&
-		svn_cmd mv trunk thunk &&
-		echo goodbye >>thunk/readme &&
-		poke thunk/readme &&
-		svn_cmd commit -m "bye now"
-	)
-	
-Adding         trunk
-Adding         trunk/readme
-Committing transaction...
-Committed revision 1.
-A    wc/trunk
-A    wc/trunk/readme
-Checked out revision 1.
-Sending        trunk/readme
-Transmitting file data .done
-Committing transaction...
-Committed revision 2.
-Updating '.':
-At revision 2.
-A         thunk
-D         trunk
-D         trunk/readme
-Adding         thunk
-Sending        thunk/readme
-Deleting       trunk
-Transmitting file data .done
-Committing transaction...
-Committed revision 3.
-ok 1 - initialize repo
-
-expecting success: 
-	git svn init --minimize-url -i thunk "$svnrepo"/thunk &&
-	git svn fetch -i thunk &&
-	test "$(git rev-parse --verify refs/remotes/thunk@2)" \
-	   = "$(git rev-parse --verify refs/remotes/thunk~1)" &&
-	git cat-file blob refs/remotes/thunk:readme >actual &&
-	test "$(sed -n -e "3p" actual)" = goodbye &&
-	test -z "$(git config --get svn-remote.svn.fetch \
-		 "^trunk:refs/remotes/thunk@2$")"
-	
-Using higher level of URL: file:///build/git-2.20.1/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/thunk => file:///build/git-2.20.1/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo
-Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/trunk => file:///build/git-2.20.1/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/thunk, 2
-Initializing parent: refs/remotes/thunk@2
-	A	readme
-r1 = 37a9e5ad33fbb5251d7d41c0731411014091f43c (refs/remotes/thunk@2)
-	M	readme
-r2 = deb4b8ce988e117664d3307c54397b8aff7017d3 (refs/remotes/thunk@2)
-Found branch parent: (refs/remotes/thunk) deb4b8ce988e117664d3307c54397b8aff7017d3
-Following parent with do_switch
-	M	readme
-Successfully followed parent
-r3 = 835b42f5d2f84a9217e5dd51649fa0578df35dbf (refs/remotes/thunk)
-Checked out HEAD:
-  file:///build/git-2.20.1/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/thunk r3
-ok 2 - init and fetch a moved directory
-
-expecting success: 
-        git config svn-remote.svn.url "$svnrepo" &&
-        git config --add svn-remote.svn.fetch \
-          trunk:refs/remotes/svn/trunk &&
-        git config --add svn-remote.svn.fetch \
-          thunk:refs/remotes/svn/thunk &&
-        git svn fetch -i svn/thunk &&
-	test "$(git rev-parse --verify refs/remotes/svn/trunk)" \
-	   = "$(git rev-parse --verify refs/remotes/svn/thunk~1)" &&
-	git cat-file blob refs/remotes/svn/thunk:readme >actual &&
-	test "$(sed -n -e "3p" actual)" = goodbye
-        
-	A	readme
-r1 = 37a9e5ad33fbb5251d7d41c0731411014091f43c (refs/remotes/svn/trunk)
-	M	readme
-r2 = deb4b8ce988e117664d3307c54397b8aff7017d3 (refs/remotes/svn/trunk)
-Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/trunk => file:///build/git-2.20.1/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/thunk, 2
-Found branch parent: (refs/remotes/svn/thunk) deb4b8ce988e117664d3307c54397b8aff7017d3
-Following parent with do_switch
-	M	readme
-Successfully followed parent
-r3 = 835b42f5d2f84a9217e5dd51649fa0578df35dbf (refs/remotes/svn/thunk)
-ok 3 - init and fetch from one svn-remote
-
-expecting success: 
-        (svn_cmd cp -m "resurrecting trunk as junk" \
-               "$svnrepo"/trunk@2 "$svnrepo"/junk ||
-         svn cp -m "resurrecting trunk as junk" \
-               -r2 "$svnrepo"/trunk "$svnrepo"/junk) &&
-        git config --add svn-remote.svn.fetch \
-          junk:refs/remotes/svn/junk &&
-        git svn fetch -i svn/thunk &&
-        git svn fetch -i svn/junk &&
-	test -z "$(git diff svn/junk svn/trunk)" &&
-	test "$(git merge-base svn/junk svn/trunk)" \
-	   = "$(git rev-parse svn/trunk)"
-        
-Committing transaction...
-Committed revision 4.
-Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/trunk => file:///build/git-2.20.1/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/junk, 2
-Found branch parent: (refs/remotes/svn/junk) deb4b8ce988e117664d3307c54397b8aff7017d3
-Following parent with do_switch
-Successfully followed parent
-r4 = b6b3ed1e4af95b1667d54dc81f9dbee334e4b35e (refs/remotes/svn/junk)
-ok 4 - follow deleted parent
-
-expecting success: 
-        mkdir -p import/trunk/thunk/bump/thud &&
-        echo hi > import/trunk/thunk/bump/thud/file &&
-        svn import -m "import a larger parent" import "$svnrepo"/larger-parent &&
-        svn cp -m "hi" "$svnrepo"/larger-parent "$svnrepo"/another-larger &&
-        git svn init --minimize-url -i larger \
-	  "$svnrepo"/larger-parent/trunk/thunk/bump/thud &&
-        git svn fetch -i larger &&
-	git svn init --minimize-url -i larger-parent \
-	  "$svnrepo"/another-larger/trunk/thunk/bump/thud &&
-	git svn fetch -i larger-parent &&
-        git rev-parse --verify refs/remotes/larger &&
-        git rev-parse --verify \
-	   refs/remotes/larger-parent &&
-	test "$(git merge-base \
-		 refs/remotes/larger-parent \
-		 refs/remotes/larger)" = \
-	     "$(git rev-parse refs/remotes/larger)"
-        
-Adding         import/trunk
-Adding         import/trunk/readme
-Adding         import/trunk/thunk
-Adding         import/trunk/thunk/bump
-Adding         import/trunk/thunk/bump/thud
-Adding         import/trunk/thunk/bump/thud/file
-Committing transaction...
-Committed revision 5.
-Committing transaction...
-Committed revision 6.
-Using existing [svn-remote "svn"]
-Using higher level of URL: file:///build/git-2.20.1/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/larger-parent/trunk/thunk/bump/thud => file:///build/git-2.20.1/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo
-	A	file
-r5 = 43f9e071ecb638933188c50d2072ed16148304b7 (refs/remotes/larger)
-Using existing [svn-remote "svn"]
-Using higher level of URL: file:///build/git-2.20.1/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/another-larger/trunk/thunk/bump/thud => file:///build/git-2.20.1/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/git-2.20.1/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/larger-parent/trunk/thunk/bump/thud => file:///build/git-2.20.1/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/another-larger/trunk/thunk/bump/thud, 5
-Found branch parent: (refs/remotes/larger-parent) 43f9e071ecb638933188c50d2072ed16148304b7
-Following parent with do_switch
-Successfully followed parent
-r6 = 91ca1dfb213ff89205ba7b9e9e78df26639db47e (refs/remotes/larger-parent)
-43f9e071ecb638933188c50d2072ed16148304b7
-91ca1dfb213ff89205ba7b9e9e78df26639db47e
-ok 5 - follow larger parent
-
-expecting success: 
-	svn mkdir -m "follow higher-level parent" "$svnrepo"/blob &&
-	svn co "$svnrepo"/blob blob &&
-	(
-		cd blob &&
-		echo hi > hi &&
-		svn add hi &&
-		svn commit -m "hihi"
-	) &&
-	svn mkdir -m "new glob at top level" "$svnrepo"/glob &&
-	svn mv -m "move blob down a level" "$svnrepo"/blob "$svnrepo"/glob/blob &&
-	git svn init --minimize-url -i blob "$svnrepo"/glob/blob &&
-        git svn fetch -i blob
-        
-Committing transaction...
-Committed revision 7.
-Checked out revision 7.
-A         hi
-Adding         hi
-Transmitting file data .done
-Committing transaction...
-Committed revision 8.
-Committing transaction...
-Committed revision 9.
-Committing transaction...
-Committed revision 10.
-Using existing [svn-remote "svn"]
-Using higher level of URL: file:///build/git-2.20.1/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/glob/blob => file:///build/git-2.20.1/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo
-Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/blob => file:///build/git-2.20.1/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/glob/blob, 9
-Initializing parent: refs/remotes/blob@9
-r7 = c5e7541258ef07c1a573e32ec2869ced43b590d9 (refs/remotes/blob@9)
-	A	hi
-r8 = 4c566a7d991049b3ed90eca926a5106459436b19 (refs/remotes/blob@9)
-Found branch parent: (refs/remotes/blob) 4c566a7d991049b3ed90eca926a5106459436b19
-Following parent with do_switch
-Successfully followed parent
-r10 = a397a82ade6d29eed5fcbb59b3feacceaaae11a3 (refs/remotes/blob)
-ok 6 - follow higher-level parent
-
-expecting success: 
-	svn_cmd mv -m "bye!" "$svnrepo"/glob/blob/hi "$svnrepo"/glob/blob/bye &&
-	svn_cmd rm -m "remove glob" "$svnrepo"/glob &&
-	git svn init --minimize-url -i glob "$svnrepo"/glob &&
-	git svn fetch -i glob &&
-	test "$(git cat-file blob refs/remotes/glob:blob/bye)" = hi &&
-	git ls-tree refs/remotes/glob >actual &&
-	test_line_count = 1 actual
-	
-Committing transaction...
-Committed revision 11.
-Committing transaction...
-Committed revision 12.
-Using existing [svn-remote "svn"]
-Using higher level of URL: file:///build/git-2.20.1/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/glob => file:///build/git-2.20.1/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo
-r9 = 32788f53d5f8fb4e972632d32756c506003d5b96 (refs/remotes/glob)
-	A	blob/hi
-r10 = a199b15aa85b5a094ff541fd5f8ed0f2666fad3d (refs/remotes/glob)
-	D	blob/hi
-	A	blob/bye
-W: -empty_dir: glob/blob/hi
-r11 = 029c49d40c3f38bb96ec9aaa52ac24e74807a84b (refs/remotes/glob)
-	D	hi
-	A	bye
-W: -empty_dir: glob/blob/hi
-r11 = 8bf8918ce3990fba3a1345cce12dba65e86d4a73 (refs/remotes/blob)
-ok 7 - follow deleted directory
-
-expecting success: 
-	mkdir -p import/trunk/subversion/bindings/swig/perl/t &&
-	for i in a b c ; do \
-	  echo $i > import/trunk/subversion/bindings/swig/perl/$i.pm &&
-	  echo _$i > import/trunk/subversion/bindings/swig/perl/t/$i.t; \
-	done &&
-	  echo "bad delete test" > \
-	   import/trunk/subversion/bindings/swig/perl/t/larger-parent &&
-	  echo "bad delete test 2" > \
-	   import/trunk/subversion/bindings/swig/perl/another-larger &&
-	(
-		cd import &&
-		svn import -m "r9270 test" . "$svnrepo"/r9270
-	) &&
-	svn_cmd co "$svnrepo"/r9270/trunk/subversion/bindings/swig/perl r9270 &&
-	(
-		cd r9270 &&
-		svn mkdir native &&
-		svn mv t native/t &&
-		for i in a b c
-		do
-			svn mv $i.pm native/$i.pm
-		done &&
-		echo z >>native/t/c.t &&
-		poke native/t/c.t &&
-		svn commit -m "reorg test"
-	) &&
-	git svn init --minimize-url -i r9270-t \
-	  "$svnrepo"/r9270/trunk/subversion/bindings/swig/perl/native/t &&
-	git svn fetch -i r9270-t &&
-	test $(git rev-list r9270-t | wc -l) -eq 2 &&
-	test "$(git ls-tree --name-only r9270-t~1)" = \
-	     "$(git ls-tree --name-only r9270-t)"
-	
-Adding         trunk
-Adding         trunk/readme
-Adding         trunk/subversion
-Adding         trunk/subversion/bindings
-Adding         trunk/subversion/bindings/swig
-Adding         trunk/subversion/bindings/swig/perl
-Adding         trunk/subversion/bindings/swig/perl/a.pm
-Adding         trunk/subversion/bindings/swig/perl/another-larger
-Adding         trunk/subversion/bindings/swig/perl/b.pm
-Adding         trunk/subversion/bindings/swig/perl/c.pm
-Adding         trunk/subversion/bindings/swig/perl/t
-Adding         trunk/subversion/bindings/swig/perl/t/a.t
-Adding         trunk/subversion/bindings/swig/perl/t/b.t
-Adding         trunk/subversion/bindings/swig/perl/t/c.t
-Adding         trunk/subversion/bindings/swig/perl/t/larger-parent
-Adding         trunk/thunk
-Adding         trunk/thunk/bump
-Adding         trunk/thunk/bump/thud
-Adding         trunk/thunk/bump/thud/file
-Committing transaction...
-Committed revision 13.
-A    r9270/a.pm
-A    r9270/another-larger
-A    r9270/b.pm
-A    r9270/c.pm
-A    r9270/t
-A    r9270/t/a.t
-A    r9270/t/b.t
-A    r9270/t/c.t
-A    r9270/t/larger-parent
-Checked out revision 13.
-A         native
-A         native/t
-D         t
-D         t/a.t
-D         t/b.t
-D         t/c.t
-D         t/larger-parent
-A         native/a.pm
-D         a.pm
-A         native/b.pm
-D         b.pm
-A         native/c.pm
-D         c.pm
-Deleting       a.pm
-Deleting       b.pm
-Deleting       c.pm
-Adding         native
-Adding         native/a.pm
-Adding         native/b.pm
-Adding         native/c.pm
-Adding         native/t
-Sending        native/t/c.t
-Deleting       t
-Transmitting file data .done
-Committing transaction...
-Committed revision 14.
-Using existing [svn-remote "svn"]
-Using higher level of URL: file:///build/git-2.20.1/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/r9270/trunk/subversion/bindings/swig/perl/native/t => file:///build/git-2.20.1/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo
-Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/r9270/trunk/subversion/bindings/swig/perl/t => file:///build/git-2.20.1/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 = 010cb80df1952a0293688c9dbdcf3dbcf03a521d (refs/remotes/r9270-t@13)
-Found branch parent: (refs/remotes/r9270-t) 010cb80df1952a0293688c9dbdcf3dbcf03a521d
-Following parent with do_switch
-	M	c.t
-Successfully followed parent
-r14 = 7bacf4910bd6416ddcd96c1d4419aea09598400d (refs/remotes/r9270-t)
-ok 8 - follow-parent avoids deleting relevant info
-
-expecting success: 
-	svn_cmd cp -m "wheee!" "$svnrepo"/r9270/trunk "$svnrepo"/r9270/drunk &&
-	git svn init --minimize-url -i r9270-d \
-	  "$svnrepo"/r9270/drunk/subversion/bindings/swig/perl/native/t &&
-	git svn fetch -i r9270-d &&
-	test $(git rev-list r9270-d | wc -l) -eq 3 &&
-	test "$(git ls-tree --name-only r9270-t)" = \
-	     "$(git ls-tree --name-only r9270-d)" &&
-	test "$(git rev-parse r9270-t)" = \
-	     "$(git rev-parse r9270-d~1)"
-	
-Committing transaction...
-Committed revision 15.
-Using existing [svn-remote "svn"]
-Using higher level of URL: file:///build/git-2.20.1/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/r9270/drunk/subversion/bindings/swig/perl/native/t => file:///build/git-2.20.1/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/git-2.20.1/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/r9270/trunk/subversion/bindings/swig/perl/native/t => file:///build/git-2.20.1/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) 7bacf4910bd6416ddcd96c1d4419aea09598400d
-Following parent with do_switch
-Successfully followed parent
-r15 = a0722f09b9bb9dae024ccdce33d0d5a5a25da476 (refs/remotes/r9270-d)
-ok 9 - track initial change if it was only made to parent
-
-expecting success: 
-	(
-		cd wc &&
-		svn_cmd up &&
-		svn_cmd mkdir stunk &&
-		echo "trunk stunk" > stunk/readme &&
-		svn_cmd add stunk/readme &&
-		svn_cmd ci -m "trunk stunk" &&
-		echo "stunk like junk" >> stunk/readme &&
-		svn_cmd ci -m "really stunk" &&
-		echo "stink stank stunk" >> stunk/readme &&
-		svn_cmd ci -m "even the grinch agrees"
-	) &&
-	svn_cmd copy -m "stunk flunked" "$svnrepo"/stunk "$svnrepo"/flunk &&
-	{ svn cp -m "early stunk flunked too" \
-		"$svnrepo"/stunk@17 "$svnrepo"/flunked ||
-	svn_cmd cp -m "early stunk flunked too" \
-		-r17 "$svnrepo"/stunk "$svnrepo"/flunked; } &&
-	git svn init --minimize-url -i stunk "$svnrepo"/stunk &&
-	git svn fetch -i stunk &&
-	git update-ref refs/remotes/flunk@18 refs/remotes/stunk~2 &&
-	git update-ref -d refs/remotes/stunk &&
-	git config --unset svn-remote.svn.fetch stunk &&
-	mkdir -p "$GIT_DIR"/svn/refs/remotes/flunk@18 &&
-	rev_map=$(cd "$GIT_DIR"/svn/refs/remotes/stunk && ls .rev_map*) &&
-	dd if="$GIT_DIR"/svn/refs/remotes/stunk/$rev_map \
-	   of="$GIT_DIR"/svn/refs/remotes/flunk@18/$rev_map bs=24 count=1 &&
-	rm -rf "$GIT_DIR"/svn/refs/remotes/stunk &&
-	git svn init --minimize-url -i flunk "$svnrepo"/flunk &&
-	git svn fetch -i flunk &&
-	git svn init --minimize-url -i stunk "$svnrepo"/stunk &&
-	git svn fetch -i stunk &&
-	git svn init --minimize-url -i flunked "$svnrepo"/flunked &&
-	git svn fetch -i flunked &&
-	test "$(git rev-parse --verify refs/remotes/flunk@18)" \
-	   = "$(git rev-parse --verify refs/remotes/stunk)" &&
-	test "$(git rev-parse --verify refs/remotes/flunk~1)" \
-	   = "$(git rev-parse --verify refs/remotes/stunk)" &&
-	test "$(git rev-parse --verify refs/remotes/flunked~1)" \
-	   = "$(git rev-parse --verify refs/remotes/stunk~1)"
-	
-Updating '.':
-A    another-larger
-A    another-larger/trunk
-A    another-larger/trunk/readme
-A    another-larger/trunk/thunk
-A    another-larger/trunk/thunk/bump
-A    another-larger/trunk/thunk/bump/thud
-A    another-larger/trunk/thunk/bump/thud/file
-A    junk
-A    junk/readme
-A    larger-parent
-A    larger-parent/trunk
-A    larger-parent/trunk/readme
-A    larger-parent/trunk/thunk
-A    larger-parent/trunk/thunk/bump
-A    larger-parent/trunk/thunk/bump/thud
-A    larger-parent/trunk/thunk/bump/thud/file
-A    r9270
-A    r9270/drunk
-A    r9270/drunk/readme
-A    r9270/drunk/subversion
-A    r9270/drunk/subversion/bindings
-A    r9270/drunk/subversion/bindings/swig
-A    r9270/drunk/subversion/bindings/swig/perl
-A    r9270/drunk/subversion/bindings/swig/perl/another-larger
-A    r9270/drunk/subversion/bindings/swig/perl/native
-A    r9270/drunk/subversion/bindings/swig/perl/native/a.pm
-A    r9270/drunk/subversion/bindings/swig/perl/native/b.pm
-A    r9270/drunk/subversion/bindings/swig/perl/native/c.pm
-A    r9270/drunk/subversion/bindings/swig/perl/native/t
-A    r9270/drunk/subversion/bindings/swig/perl/native/t/a.t
-A    r9270/drunk/subversion/bindings/swig/perl/native/t/b.t
-A    r9270/drunk/subversion/bindings/swig/perl/native/t/c.t
-A    r9270/drunk/subversion/bindings/swig/perl/native/t/larger-parent
-A    r9270/drunk/thunk
-A    r9270/drunk/thunk/bump
-A    r9270/drunk/thunk/bump/thud
-A    r9270/drunk/thunk/bump/thud/file
-A    r9270/trunk
-A    r9270/trunk/readme
-A    r9270/trunk/subversion
-A    r9270/trunk/subversion/bindings
-A    r9270/trunk/subversion/bindings/swig
-A    r9270/trunk/subversion/bindings/swig/perl
-A    r9270/trunk/subversion/bindings/swig/perl/another-larger
-A    r9270/trunk/subversion/bindings/swig/perl/native
-A    r9270/trunk/subversion/bindings/swig/perl/native/a.pm
-A    r9270/trunk/subversion/bindings/swig/perl/native/b.pm
-A    r9270/trunk/subversion/bindings/swig/perl/native/c.pm
-A    r9270/trunk/subversion/bindings/swig/perl/native/t
-A    r9270/trunk/subversion/bindings/swig/perl/native/t/a.t
-A    r9270/trunk/subversion/bindings/swig/perl/native/t/b.t
-A    r9270/trunk/subversion/bindings/swig/perl/native/t/c.t
-A    r9270/trunk/subversion/bindings/swig/perl/native/t/larger-parent
-A    r9270/trunk/thunk
-A    r9270/trunk/thunk/bump
-A    r9270/trunk/thunk/bump/thud
-A    r9270/trunk/thunk/bump/thud/file
-Updated to revision 15.
-A         stunk
-A         stunk/readme
-Adding         stunk
-Adding         stunk/readme
-Transmitting file data .done
-Committing transaction...
-Committed revision 16.
-Sending        stunk/readme
-Transmitting file data .done
-Committing transaction...
-Committed revision 17.
-Sending        stunk/readme
-Transmitting file data .done
-Committing transaction...
-Committed revision 18.
-Committing transaction...
-Committed revision 19.
-Committing transaction...
-Committed revision 20.
-Using existing [svn-remote "svn"]
-Using higher level of URL: file:///build/git-2.20.1/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/stunk => file:///build/git-2.20.1/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo
-	A	readme
-r16 = 4a45ece0e56ef09bcf47f3f4478cd42a5e56212a (refs/remotes/stunk)
-	M	readme
-r17 = 676bb5c4c19eed05079dcca8b9a7b15bff631058 (refs/remotes/stunk)
-	M	readme
-r18 = 8c5d85576f07eb4ca42ef2a676d746f5da1f40c0 (refs/remotes/stunk)
-1+0 records in
-1+0 records out
-24 bytes copied, 4.8979e-05 s, 490 kB/s
-Using existing [svn-remote "svn"]
-Using higher level of URL: file:///build/git-2.20.1/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/flunk => file:///build/git-2.20.1/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo
-Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/stunk => file:///build/git-2.20.1/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/flunk, 18
-Initializing parent: refs/remotes/flunk@18
-	M	readme
-r17 = 676bb5c4c19eed05079dcca8b9a7b15bff631058 (refs/remotes/flunk@18)
-	M	readme
-r18 = 8c5d85576f07eb4ca42ef2a676d746f5da1f40c0 (refs/remotes/flunk@18)
-Found branch parent: (refs/remotes/flunk) 8c5d85576f07eb4ca42ef2a676d746f5da1f40c0
-Following parent with do_switch
-Successfully followed parent
-r19 = 538ad1b6b9644ca68f1f59bd5f8e0d881dd3cb2a (refs/remotes/flunk)
-Using existing [svn-remote "svn"]
-Using higher level of URL: file:///build/git-2.20.1/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/stunk => file:///build/git-2.20.1/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo
-	A	readme
-r16 = 4a45ece0e56ef09bcf47f3f4478cd42a5e56212a (refs/remotes/stunk)
-	M	readme
-r17 = 676bb5c4c19eed05079dcca8b9a7b15bff631058 (refs/remotes/stunk)
-	M	readme
-r18 = 8c5d85576f07eb4ca42ef2a676d746f5da1f40c0 (refs/remotes/stunk)
-Using existing [svn-remote "svn"]
-Using higher level of URL: file:///build/git-2.20.1/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/flunked => file:///build/git-2.20.1/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo
-Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/stunk => file:///build/git-2.20.1/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/flunked, 17
-Found branch parent: (refs/remotes/flunked) 676bb5c4c19eed05079dcca8b9a7b15bff631058
-Following parent with do_switch
-Successfully followed parent
-r20 = 568a3b4b26e211e12fda38fcdf42f9474b83d37a (refs/remotes/flunked)
-ok 10 - follow-parent is atomic
-
-expecting success: 
-	svn_cmd cp -m "resurrect /glob" "$svnrepo"/r9270 "$svnrepo"/glob &&
-	git svn multi-fetch &&
-	git cat-file commit refs/remotes/glob >actual &&
-	grep "^parent " actual >actual2 &&
-	test_line_count = 2 actual2
-	
-Committing transaction...
-Committed revision 21.
-Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/r9270 => file:///build/git-2.20.1/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/glob, 20
-Initializing parent: refs/remotes/glob@20
-	A	trunk/readme
-	A	trunk/subversion/bindings/swig/perl/a.pm
-	A	trunk/subversion/bindings/swig/perl/another-larger
-	A	trunk/subversion/bindings/swig/perl/b.pm
-	A	trunk/subversion/bindings/swig/perl/c.pm
-	A	trunk/subversion/bindings/swig/perl/t/a.t
-	A	trunk/subversion/bindings/swig/perl/t/b.t
-	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 = 9698452726713c52f2a1d500f2be39c92757944d (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
-	D	trunk/subversion/bindings/swig/perl/t/larger-parent
-	D	trunk/subversion/bindings/swig/perl/t/
-	D	trunk/subversion/bindings/swig/perl/a.pm
-	D	trunk/subversion/bindings/swig/perl/b.pm
-	D	trunk/subversion/bindings/swig/perl/c.pm
-	A	trunk/subversion/bindings/swig/perl/native/a.pm
-	A	trunk/subversion/bindings/swig/perl/native/b.pm
-	A	trunk/subversion/bindings/swig/perl/native/c.pm
-	A	trunk/subversion/bindings/swig/perl/native/t/a.t
-	A	trunk/subversion/bindings/swig/perl/native/t/b.t
-	A	trunk/subversion/bindings/swig/perl/native/t/c.t
-	A	trunk/subversion/bindings/swig/perl/native/t/larger-parent
-W: -empty_dir: r9270/trunk/subversion/bindings/swig/perl/a.pm
-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 = aafbae5e389d3a5237a0fa3b2b2305c1a4e5e1c1 (refs/remotes/glob@20)
-	A	drunk/readme
-	A	drunk/subversion/bindings/swig/perl/another-larger
-	A	drunk/subversion/bindings/swig/perl/native/a.pm
-	A	drunk/subversion/bindings/swig/perl/native/b.pm
-	A	drunk/subversion/bindings/swig/perl/native/c.pm
-	A	drunk/subversion/bindings/swig/perl/native/t/a.t
-	A	drunk/subversion/bindings/swig/perl/native/t/b.t
-	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 = 8ffacbc75a7c6742dd7a5e9377bec2f7ecd917cc (refs/remotes/glob@20)
-Found branch parent: (refs/remotes/glob) 8ffacbc75a7c6742dd7a5e9377bec2f7ecd917cc
-Index mismatch: 3cd9c37c278d8b60927f43385900d57622921efe != b80e441d0bfb8031c1110b908fb333507c1b9180
-rereading 8ffacbc75a7c6742dd7a5e9377bec2f7ecd917cc
-Following parent with do_switch
-Successfully followed parent
-r21 = d09403fb3bc11f15da74dfbb281354978e6ee7db (refs/remotes/glob)
-ok 11 - track multi-parent paths
-
-expecting success: 
-	git svn multi-fetch
-	
-ok 12 - multi-fetch continues to work
-
-expecting success: 
-	rm -rf "$GIT_DIR/svn" &&
-	git for-each-ref --format="option no-deref%0adelete %(refname)" refs/remotes |
-	git update-ref --stdin &&
-	git reflog expire --all --expire=all &&
-	mkdir "$GIT_DIR/svn" &&
-	git svn multi-fetch
-	
-	A	readme
-r1 = 37a9e5ad33fbb5251d7d41c0731411014091f43c (refs/remotes/svn/trunk)
-	M	readme
-r2 = deb4b8ce988e117664d3307c54397b8aff7017d3 (refs/remotes/svn/trunk)
-Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/trunk => file:///build/git-2.20.1/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/thunk, 2
-Found branch parent: (refs/remotes/svn/thunk) deb4b8ce988e117664d3307c54397b8aff7017d3
-Following parent with do_switch
-	M	readme
-Successfully followed parent
-r3 = 835b42f5d2f84a9217e5dd51649fa0578df35dbf (refs/remotes/svn/thunk)
-Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/trunk => file:///build/git-2.20.1/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/junk, 2
-Found branch parent: (refs/remotes/svn/junk) deb4b8ce988e117664d3307c54397b8aff7017d3
-Following parent with do_switch
-Successfully followed parent
-r4 = b6b3ed1e4af95b1667d54dc81f9dbee334e4b35e (refs/remotes/svn/junk)
-	A	file
-r5 = 43f9e071ecb638933188c50d2072ed16148304b7 (refs/remotes/larger)
-branch_from: /larger-parent => /larger-parent/trunk/thunk/bump/thud
-Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/larger-parent/trunk/thunk/bump/thud => file:///build/git-2.20.1/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/another-larger/trunk/thunk/bump/thud, 5
-Found branch parent: (refs/remotes/larger-parent) 43f9e071ecb638933188c50d2072ed16148304b7
-Following parent with do_switch
-Successfully followed parent
-r6 = 91ca1dfb213ff89205ba7b9e9e78df26639db47e (refs/remotes/larger-parent)
-r9 = 32788f53d5f8fb4e972632d32756c506003d5b96 (refs/remotes/glob)
-	A	blob/hi
-r10 = a199b15aa85b5a094ff541fd5f8ed0f2666fad3d (refs/remotes/glob)
-Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/blob => file:///build/git-2.20.1/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/glob/blob, 9
-Initializing parent: refs/remotes/blob@9
-r7 = c5e7541258ef07c1a573e32ec2869ced43b590d9 (refs/remotes/blob@9)
-	A	hi
-r8 = 4c566a7d991049b3ed90eca926a5106459436b19 (refs/remotes/blob@9)
-Found branch parent: (refs/remotes/blob) 4c566a7d991049b3ed90eca926a5106459436b19
-Following parent with do_switch
-Successfully followed parent
-r10 = a397a82ade6d29eed5fcbb59b3feacceaaae11a3 (refs/remotes/blob)
-	D	blob/hi
-	A	blob/bye
-W: -empty_dir: glob/blob/hi
-r11 = 029c49d40c3f38bb96ec9aaa52ac24e74807a84b (refs/remotes/glob)
-	D	hi
-	A	bye
-W: -empty_dir: glob/blob/hi
-r11 = 8bf8918ce3990fba3a1345cce12dba65e86d4a73 (refs/remotes/blob)
-Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/r9270/trunk/subversion/bindings/swig/perl/t => file:///build/git-2.20.1/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 = 010cb80df1952a0293688c9dbdcf3dbcf03a521d (refs/remotes/r9270-t@13)
-Found branch parent: (refs/remotes/r9270-t) 010cb80df1952a0293688c9dbdcf3dbcf03a521d
-Following parent with do_switch
-	M	c.t
-Successfully followed parent
-r14 = 7bacf4910bd6416ddcd96c1d4419aea09598400d (refs/remotes/r9270-t)
-branch_from: /r9270/trunk => /r9270/trunk/subversion/bindings/swig/perl/native/t
-Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/r9270/trunk/subversion/bindings/swig/perl/native/t => file:///build/git-2.20.1/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) 7bacf4910bd6416ddcd96c1d4419aea09598400d
-Following parent with do_switch
-Successfully followed parent
-r15 = a0722f09b9bb9dae024ccdce33d0d5a5a25da476 (refs/remotes/r9270-d)
-	A	readme
-r16 = 4a45ece0e56ef09bcf47f3f4478cd42a5e56212a (refs/remotes/stunk)
-	M	readme
-r17 = 676bb5c4c19eed05079dcca8b9a7b15bff631058 (refs/remotes/stunk)
-	M	readme
-r18 = 8c5d85576f07eb4ca42ef2a676d746f5da1f40c0 (refs/remotes/stunk)
-Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/stunk => file:///build/git-2.20.1/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/flunk, 18
-Found branch parent: (refs/remotes/flunk) 8c5d85576f07eb4ca42ef2a676d746f5da1f40c0
-Following parent with do_switch
-Successfully followed parent
-r19 = 538ad1b6b9644ca68f1f59bd5f8e0d881dd3cb2a (refs/remotes/flunk)
-Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/stunk => file:///build/git-2.20.1/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/flunked, 17
-Found branch parent: (refs/remotes/flunked) 676bb5c4c19eed05079dcca8b9a7b15bff631058
-Following parent with do_switch
-Successfully followed parent
-r20 = 568a3b4b26e211e12fda38fcdf42f9474b83d37a (refs/remotes/flunked)
-Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/r9270 => file:///build/git-2.20.1/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/glob, 20
-Initializing parent: refs/remotes/glob@20
-	A	trunk/readme
-	A	trunk/subversion/bindings/swig/perl/a.pm
-	A	trunk/subversion/bindings/swig/perl/another-larger
-	A	trunk/subversion/bindings/swig/perl/b.pm
-	A	trunk/subversion/bindings/swig/perl/c.pm
-	A	trunk/subversion/bindings/swig/perl/t/a.t
-	A	trunk/subversion/bindings/swig/perl/t/b.t
-	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 = 9698452726713c52f2a1d500f2be39c92757944d (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
-	D	trunk/subversion/bindings/swig/perl/t/larger-parent
-	D	trunk/subversion/bindings/swig/perl/t/
-	D	trunk/subversion/bindings/swig/perl/a.pm
-	D	trunk/subversion/bindings/swig/perl/b.pm
-	D	trunk/subversion/bindings/swig/perl/c.pm
-	A	trunk/subversion/bindings/swig/perl/native/a.pm
-	A	trunk/subversion/bindings/swig/perl/native/b.pm
-	A	trunk/subversion/bindings/swig/perl/native/c.pm
-	A	trunk/subversion/bindings/swig/perl/native/t/a.t
-	A	trunk/subversion/bindings/swig/perl/native/t/b.t
-	A	trunk/subversion/bindings/swig/perl/native/t/c.t
-	A	trunk/subversion/bindings/swig/perl/native/t/larger-parent
-W: -empty_dir: r9270/trunk/subversion/bindings/swig/perl/a.pm
-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 = aafbae5e389d3a5237a0fa3b2b2305c1a4e5e1c1 (refs/remotes/glob@20)
-	A	drunk/readme
-	A	drunk/subversion/bindings/swig/perl/another-larger
-	A	drunk/subversion/bindings/swig/perl/native/a.pm
-	A	drunk/subversion/bindings/swig/perl/native/b.pm
-	A	drunk/subversion/bindings/swig/perl/native/c.pm
-	A	drunk/subversion/bindings/swig/perl/native/t/a.t
-	A	drunk/subversion/bindings/swig/perl/native/t/b.t
-	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 = 8ffacbc75a7c6742dd7a5e9377bec2f7ecd917cc (refs/remotes/glob@20)
-Found branch parent: (refs/remotes/glob) 8ffacbc75a7c6742dd7a5e9377bec2f7ecd917cc
-Index mismatch: 3cd9c37c278d8b60927f43385900d57622921efe != b80e441d0bfb8031c1110b908fb333507c1b9180
-rereading 8ffacbc75a7c6742dd7a5e9377bec2f7ecd917cc
-Following parent with do_switch
-Successfully followed parent
-r21 = d09403fb3bc11f15da74dfbb281354978e6ee7db (refs/remotes/glob)
-ok 13 - multi-fetch works off a 'clean' repository
-
-# passed all 13 test(s)
-1..13
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t9163-git-svn-reset-clears-caches.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9163-git-svn-reset-clears-caches/.git/
-expecting success: 
-	svn_cmd mkdir -m "create trunk" "$svnrepo"/trunk &&
-	svn_cmd mkdir -m "create branches" "$svnrepo/branches" &&
-	svn_cmd co "$svnrepo"/trunk "$SVN_TREE" &&
-	(
-		cd "$SVN_TREE" &&
-		touch foo &&
-		svn_cmd add foo &&
-		svn_cmd commit -m "a" &&
-		svn_cmd cp -m branch "$svnrepo"/trunk "$svnrepo"/branches/branch1 &&
-		svn_cmd switch "$svnrepo"/branches/branch1 &&
-		touch bar &&
-		svn_cmd add bar &&
-		svn_cmd commit -m b &&
-		svn_cmd switch "$svnrepo"/trunk &&
-		touch baz &&
-		svn_cmd add baz &&
-		svn_cmd commit -m c &&
-		svn_cmd up &&
-		svn_cmd merge "$svnrepo"/branches/branch1 &&
-		svn_cmd commit -m "m"
-	) &&
-	rm -rf "$SVN_TREE"
-
-Committing transaction...
-Committed revision 1.
-Committing transaction...
-Committed revision 2.
-Checked out revision 2.
-A         foo
-Adding         foo
-Transmitting file data .done
-Committing transaction...
-Committed revision 3.
-Committing transaction...
-Committed revision 4.
-At revision 4.
-A         bar
-Adding         bar
-Transmitting file data .done
-Committing transaction...
-Committed revision 5.
-D    bar
-Updated to revision 5.
-A         baz
-Adding         baz
-Transmitting file data .done
-Committing transaction...
-Committed revision 6.
-Updating '.':
-At revision 6.
---- Merging r4 through r6 into '.':
-A    bar
---- Recording mergeinfo for merge of r4 through r6 into '.':
- U   .
-Sending        .
-Adding         bar
-Committing transaction...
-Committed revision 7.
-ok 1 - initialize source svn repo
-
-expecting success: 
-	git svn init -s "$svnrepo" &&
-	git svn fetch --revision BASE:3
-
-r1 = 66c1fe78de18d4794c798188d4d4d2a28fab44f2 (refs/remotes/origin/trunk)
-	A	foo
-r3 = 9a11276a2f1406c4667db57ca5d70d83aaab738c (refs/remotes/origin/trunk)
-Checked out HEAD:
-  file:///build/git-2.20.1/t/trash%20directory.t9163-git-svn-reset-clears-caches/svnrepo/trunk r3
-ok 2 - fetch to merge-base (a)
-
-expecting success: 
-	git svn rebase &&
-	git svn fetch &&
-	test 1 = $(git cat-file -p master|grep parent|wc -l)
-
-	A	baz
-r6 = 1e9ac0f7bdfdc0691eb8edfc26ddbdfc7209ad5f (refs/remotes/origin/trunk)
-	A	bar
-Checking svn:mergeinfo changes since r6: 1 sources, 1 changed
-Couldn't find revmap for file:///build/git-2.20.1/t/trash%20directory.t9163-git-svn-reset-clears-caches/svnrepo/branches/branch1
-r7 = 84c8092a39f903805dbc1ab1a01a617573ef4d13 (refs/remotes/origin/trunk)
-First, rewinding head to replay your work on top of it...
-Fast-forwarded master to refs/remotes/origin/trunk.
-Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9163-git-svn-reset-clears-caches/svnrepo/trunk => file:///build/git-2.20.1/t/trash%20directory.t9163-git-svn-reset-clears-caches/svnrepo/branches/branch1, 3
-Found branch parent: (refs/remotes/origin/branch1) 9a11276a2f1406c4667db57ca5d70d83aaab738c
-Following parent with do_switch
-Successfully followed parent
-r4 = 0bc03cd0b40e2378b82c3412d2787175b5516188 (refs/remotes/origin/branch1)
-	A	bar
-r5 = ad1ff868910400e2c3480ee492fe9530fa2724e1 (refs/remotes/origin/branch1)
-ok 3 - rebase looses SVN merge (m)
-
-expecting success: 
-	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 = 9a11276a2f1406c4667db57ca5d70d83aaab738c (refs/remotes/origin/trunk)
-HEAD is now at 9a11276 a
-Index mismatch: 4d5fcadc293a348e88f777dc0920f11e7d71441c != 4e126a1a1821dd5763468eb219c1ecdb6f7f0fda
-rereading 9a11276a2f1406c4667db57ca5d70d83aaab738c
-	A	baz
-r6 = 1e9ac0f7bdfdc0691eb8edfc26ddbdfc7209ad5f (refs/remotes/origin/trunk)
-	A	bar
-Checking svn:mergeinfo changes since r6: 1 sources, 1 changed
-Found merge parent (/branches/branch1:4-6): ad1ff868910400e2c3480ee492fe9530fa2724e1
-r7 = b17702400c6313423a3e4fcafe5abd9eef52bb0b (refs/remotes/origin/trunk)
-ok 4 - reset and fetch gets the SVN merge (m) correctly
-
-# passed all 4 test(s)
-1..4
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
 *** t9151-svn-mergeinfo.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9151-svn-mergeinfo/.git/
 expecting success: 
@@ -332429,7 +329991,7 @@
 r20 = d3a5e11772cce14223736862eaae254c6361de52 (refs/remotes/origin/left)
 	A	wham_eth
 Checking svn:mergeinfo changes since r20: 1 sources, 1 changed
-W: svn cherry-pick ignored (/branches/left-sub:19) - missing 6 commit(s) (eg 577c6d95762177126ca3068518ff8b75fcf0c25e)
+W: svn cherry-pick ignored (/branches/left-sub:19) - missing 6 commit(s) (eg 2d65500a924079bcf2a63be861289fc72bc3e87f)
 r21 = 26f066648b9fbb8d41953f51720855ea7b504643 (refs/remotes/origin/left)
 	M	Makefile
 	A	README
@@ -332594,6 +330156,124 @@
 1..7
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
+*** t9163-git-svn-reset-clears-caches.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9163-git-svn-reset-clears-caches/.git/
+expecting success: 
+	svn_cmd mkdir -m "create trunk" "$svnrepo"/trunk &&
+	svn_cmd mkdir -m "create branches" "$svnrepo/branches" &&
+	svn_cmd co "$svnrepo"/trunk "$SVN_TREE" &&
+	(
+		cd "$SVN_TREE" &&
+		touch foo &&
+		svn_cmd add foo &&
+		svn_cmd commit -m "a" &&
+		svn_cmd cp -m branch "$svnrepo"/trunk "$svnrepo"/branches/branch1 &&
+		svn_cmd switch "$svnrepo"/branches/branch1 &&
+		touch bar &&
+		svn_cmd add bar &&
+		svn_cmd commit -m b &&
+		svn_cmd switch "$svnrepo"/trunk &&
+		touch baz &&
+		svn_cmd add baz &&
+		svn_cmd commit -m c &&
+		svn_cmd up &&
+		svn_cmd merge "$svnrepo"/branches/branch1 &&
+		svn_cmd commit -m "m"
+	) &&
+	rm -rf "$SVN_TREE"
+
+Committing transaction...
+Committed revision 1.
+Committing transaction...
+Committed revision 2.
+Checked out revision 2.
+A         foo
+Adding         foo
+Transmitting file data .done
+Committing transaction...
+Committed revision 3.
+Committing transaction...
+Committed revision 4.
+At revision 4.
+A         bar
+Adding         bar
+Transmitting file data .done
+Committing transaction...
+Committed revision 5.
+D    bar
+Updated to revision 5.
+A         baz
+Adding         baz
+Transmitting file data .done
+Committing transaction...
+Committed revision 6.
+Updating '.':
+At revision 6.
+--- Merging r4 through r6 into '.':
+A    bar
+--- Recording mergeinfo for merge of r4 through r6 into '.':
+ U   .
+Sending        .
+Adding         bar
+Committing transaction...
+Committed revision 7.
+ok 1 - initialize source svn repo
+
+expecting success: 
+	git svn init -s "$svnrepo" &&
+	git svn fetch --revision BASE:3
+
+r1 = c42335da4828f3e051dc7b38cddf017d27983b98 (refs/remotes/origin/trunk)
+	A	foo
+r3 = 4c486d635b30c9da7f556c84498302ef1a8d6f8f (refs/remotes/origin/trunk)
+Checked out HEAD:
+  file:///build/git-2.20.1/t/trash%20directory.t9163-git-svn-reset-clears-caches/svnrepo/trunk r3
+ok 2 - fetch to merge-base (a)
+
+expecting success: 
+	git svn rebase &&
+	git svn fetch &&
+	test 1 = $(git cat-file -p master|grep parent|wc -l)
+
+	A	baz
+r6 = 42358680bbff5040b58b4e4ad8b799a908082c44 (refs/remotes/origin/trunk)
+	A	bar
+Checking svn:mergeinfo changes since r6: 1 sources, 1 changed
+Couldn't find revmap for file:///build/git-2.20.1/t/trash%20directory.t9163-git-svn-reset-clears-caches/svnrepo/branches/branch1
+r7 = af808fed7f81631d3b3442843c6f99e98dfdbd7d (refs/remotes/origin/trunk)
+First, rewinding head to replay your work on top of it...
+Fast-forwarded master to refs/remotes/origin/trunk.
+Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9163-git-svn-reset-clears-caches/svnrepo/trunk => file:///build/git-2.20.1/t/trash%20directory.t9163-git-svn-reset-clears-caches/svnrepo/branches/branch1, 3
+Found branch parent: (refs/remotes/origin/branch1) 4c486d635b30c9da7f556c84498302ef1a8d6f8f
+Following parent with do_switch
+Successfully followed parent
+r4 = 61461d2935a3ea6a33d673206cafb0fc289d66b1 (refs/remotes/origin/branch1)
+	A	bar
+r5 = e9de6d6d3b5f278e889c1a57b13a5c19e183c298 (refs/remotes/origin/branch1)
+ok 3 - rebase looses SVN merge (m)
+
+expecting success: 
+	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 = 4c486d635b30c9da7f556c84498302ef1a8d6f8f (refs/remotes/origin/trunk)
+HEAD is now at 4c486d6 a
+Index mismatch: 4d5fcadc293a348e88f777dc0920f11e7d71441c != 4e126a1a1821dd5763468eb219c1ecdb6f7f0fda
+rereading 4c486d635b30c9da7f556c84498302ef1a8d6f8f
+	A	baz
+r6 = 42358680bbff5040b58b4e4ad8b799a908082c44 (refs/remotes/origin/trunk)
+	A	bar
+Checking svn:mergeinfo changes since r6: 1 sources, 1 changed
+Found merge parent (/branches/branch1:4-6): e9de6d6d3b5f278e889c1a57b13a5c19e183c298
+r7 = 51929bc22a369e18e1018bc453af19133052df2a (refs/remotes/origin/trunk)
+ok 4 - reset and fetch gets the SVN merge (m) correctly
+
+# passed all 4 test(s)
+1..4
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
 *** t9303-fast-import-compression.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9303-fast-import-compression/.git/
 expecting success: 
@@ -333188,10 +330868,10 @@
 Committing transaction...
 Committed revision 1.
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9162-git-svn-dcommit-interactive/test-interactive/.git/
-r1 = ba7b13b4924252bd626f7e429af8492fcbbf7a7d (refs/remotes/git-svn)
+r1 = b9014893a6b0e74a74cba9c5fff68c3602736852 (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/git-2.20.1/t/trash%20directory.t9162-git-svn-dcommit-interactive/svnrepo/test-interactive r1
-[master 68847e4] foo: first commit
+[master ed30892] foo: first commit
  Author: A U Thor <author@example.com>
  1 file changed, 0 insertions(+), 0 deletions(-)
  create mode 100644 foo
@@ -333199,8 +330879,8 @@
 	A	foo
 Committed r2
 	A	foo
-r2 = 163866ceeb9fe9ffb0703d8edad8ab28c1957ee7 (refs/remotes/git-svn)
-No changes between 68847e4743f6a73391a07d7db8da6c2112cec0dd and refs/remotes/git-svn
+r2 = 5ae020a77fa5b9d651126682fe45d378f0178262 (refs/remotes/git-svn)
+No changes between ed3089271c2a9a5499e48f714c62cd97bdf6cbef and refs/remotes/git-svn
 Resetting to the latest refs/remotes/git-svn
 ok 1 - initialize repo
 
@@ -333215,174 +330895,901 @@
 		test $(git rev-parse HEAD) = $(git rev-parse remotes/git-svn)
 	)
 	
-[master d7c8903] change #1
+[master 4267549] change #1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[master c5a9f92] change #2
+[master 769564b] change #2
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[master 485e69d] change #3
+[master c9c04cb] change #3
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 Committing to file:///build/git-2.20.1/t/trash%20directory.t9162-git-svn-dcommit-interactive/svnrepo/test-interactive ...
-commit d7c8903af7edfe87e3c243173171c124810b60a3
+commit 4267549f2695a1a0535095f9a8d0b1328cb3fa6b
 Author: A U Thor <author@example.com>
-Date:   Fri Dec 3 05:11:06 2021 +0000
+Date:   Thu Jan 5 11:51:27 2023 +0000
 
     change #1
 
-Commit this patch to SVN? ([y]es (default)|[n]o|[q]uit|[a]ll): commit c5a9f925225ba4dd6ecd1a6de549a195f5c6bfb3
+Commit this patch to SVN? ([y]es (default)|[n]o|[q]uit|[a]ll): commit 769564bade83c98eb3fd8e8531ec2b0c345a9747
 Author: A U Thor <author@example.com>
-Date:   Fri Dec 3 05:11:06 2021 +0000
+Date:   Thu Jan 5 11:51:27 2023 +0000
 
     change #2
 
-Commit this patch to SVN? ([y]es (default)|[n]o|[q]uit|[a]ll): commit 485e69df65ee9405465d8ebf2b0f96cf73f27d5b
+Commit this patch to SVN? ([y]es (default)|[n]o|[q]uit|[a]ll): commit c9c04cb115952965b1a149620ca4d6079334fb9e
 Author: A U Thor <author@example.com>
-Date:   Fri Dec 3 05:11:06 2021 +0000
+Date:   Thu Jan 5 11:51:27 2023 +0000
 
     change #3
 
 Commit this patch to SVN? ([y]es (default)|[n]o|[q]uit|[a]ll): 	M	foo
 Committed r3
 	M	foo
-r3 = e8f9ad8ca359d725a3a35143d470b786e9cc5b01 (refs/remotes/git-svn)
+r3 = daf5786052c3745737706a736f0da308adfddafd (refs/remotes/git-svn)
 	M	foo
 Committed r4
 	M	foo
-r4 = 2f8b4fb156a940c3988986f27a59bf8b38c5c20c (refs/remotes/git-svn)
+r4 = 085b08b0e282f024c872583873f27c1bc2136309 (refs/remotes/git-svn)
 	M	foo
 Committed r5
 	M	foo
-r5 = 22bd83fb2d16ed4eea1810a2a349bdc278094f73 (refs/remotes/git-svn)
-No changes between 485e69df65ee9405465d8ebf2b0f96cf73f27d5b and refs/remotes/git-svn
+r5 = b9d7c61b92b52943e317f04ad761e568070ff107 (refs/remotes/git-svn)
+No changes between c9c04cb115952965b1a149620ca4d6079334fb9e and refs/remotes/git-svn
 Resetting to the latest refs/remotes/git-svn
 ok 2 - answers: y [\n] yes
 
 expecting success: 
-	(
-		echo "change #1" >> foo && git commit -a -m"change #1" &&
-		echo "change #2" >> foo && git commit -a -m"change #2" &&
-		echo "change #3" >> foo && git commit -a -m"change #3" &&
-		( echo "yes
-yes
-no" | GIT_SVN_NOTTY=1 git svn dcommit --interactive ) &&
-		test $(git rev-parse HEAD^^^) = $(git rev-parse remotes/git-svn) &&
-		git reset --hard remotes/git-svn
-	)
+	(
+		echo "change #1" >> foo && git commit -a -m"change #1" &&
+		echo "change #2" >> foo && git commit -a -m"change #2" &&
+		echo "change #3" >> foo && git commit -a -m"change #3" &&
+		( echo "yes
+yes
+no" | GIT_SVN_NOTTY=1 git svn dcommit --interactive ) &&
+		test $(git rev-parse HEAD^^^) = $(git rev-parse remotes/git-svn) &&
+		git reset --hard remotes/git-svn
+	)
+	
+[master 1f02caa] change #1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master 173617b] change #2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master b4dc196] change #3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Committing to file:///build/git-2.20.1/t/trash%20directory.t9162-git-svn-dcommit-interactive/svnrepo/test-interactive ...
+commit 1f02caa2362a4918098ead4cc4d9778ddcdf48bf
+Author: A U Thor <author@example.com>
+Date:   Thu Jan 5 11:51:30 2023 +0000
+
+    change #1
+
+Commit this patch to SVN? ([y]es (default)|[n]o|[q]uit|[a]ll): commit 173617b398efd08ce230cd2d9bf5840425288653
+Author: A U Thor <author@example.com>
+Date:   Thu Jan 5 11:51:30 2023 +0000
+
+    change #2
+
+Commit this patch to SVN? ([y]es (default)|[n]o|[q]uit|[a]ll): commit b4dc196147fa27f45c2ed3f5f9b1188eb1d6b6c1
+Author: A U Thor <author@example.com>
+Date:   Thu Jan 5 11:51:30 2023 +0000
+
+    change #3
+
+Commit this patch to SVN? ([y]es (default)|[n]o|[q]uit|[a]ll): HEAD is now at b9d7c61 change #3
+ok 3 - answers: yes yes no
+
+expecting success: 
+	(
+		echo "change #1" >> foo && git commit -a -m"change #1" &&
+		echo "change #2" >> foo && git commit -a -m"change #2" &&
+		echo "change #3" >> foo && git commit -a -m"change #3" &&
+		( echo "yes
+quit" | GIT_SVN_NOTTY=1 git svn dcommit --interactive ) &&
+		test $(git rev-parse HEAD^^^) = $(git rev-parse remotes/git-svn) &&
+		git reset --hard remotes/git-svn
+	)
+	
+[master cbf6ef1] change #1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master 8337f53] change #2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master 7a0b026] change #3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Committing to file:///build/git-2.20.1/t/trash%20directory.t9162-git-svn-dcommit-interactive/svnrepo/test-interactive ...
+commit cbf6ef1272200810f1a6552dba6e713c214b5c4b
+Author: A U Thor <author@example.com>
+Date:   Thu Jan 5 11:51:32 2023 +0000
+
+    change #1
+
+Commit this patch to SVN? ([y]es (default)|[n]o|[q]uit|[a]ll): commit 8337f53dba8bbd36b18c21ff93811b5d4c3802f6
+Author: A U Thor <author@example.com>
+Date:   Thu Jan 5 11:51:32 2023 +0000
+
+    change #2
+
+Commit this patch to SVN? ([y]es (default)|[n]o|[q]uit|[a]ll): HEAD is now at b9d7c61 change #3
+ok 4 - answers: yes quit
+
+expecting success: 
+	(
+		echo "change #1" >> foo && git commit -a -m"change #1" &&
+		echo "change #2" >> foo && git commit -a -m"change #2" &&
+		echo "change #3" >> foo && git commit -a -m"change #3" &&
+		( echo "all" | GIT_SVN_NOTTY=1 git svn dcommit --interactive ) &&
+		test $(git rev-parse HEAD) = $(git rev-parse remotes/git-svn) &&
+		git reset --hard remotes/git-svn
+	)
+	
+[master f7578da] change #1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master 6f34f7e] change #2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master 73f2044] change #3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Committing to file:///build/git-2.20.1/t/trash%20directory.t9162-git-svn-dcommit-interactive/svnrepo/test-interactive ...
+commit f7578da95b9d07a40d0eaaea362904398ebb0f02
+Author: A U Thor <author@example.com>
+Date:   Thu Jan 5 11:51:33 2023 +0000
+
+    change #1
+
+Commit this patch to SVN? ([y]es (default)|[n]o|[q]uit|[a]ll): 	M	foo
+Committed r6
+	M	foo
+r6 = e0d45fb4a2d317a5e822f6168eab21eb122f5c9b (refs/remotes/git-svn)
+	M	foo
+Committed r7
+	M	foo
+r7 = 2a0ba8c829a2b995ba9843390832789b06c6f9db (refs/remotes/git-svn)
+	M	foo
+Committed r8
+	M	foo
+r8 = 42d5bd03a28ac77cc4f711ecb596732aedb0cac0 (refs/remotes/git-svn)
+No changes between 73f20447caa7866d692ee8d7efbe10e029c04968 and refs/remotes/git-svn
+Resetting to the latest refs/remotes/git-svn
+HEAD is now at 42d5bd0 change #3
+ok 5 - answers: all
+
+# passed all 5 test(s)
+1..5
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t9104-git-svn-follow-parent.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9104-git-svn-follow-parent/.git/
+expecting success: 
+	mkdir import &&
+	(
+		cd import &&
+		mkdir -p trunk &&
+		echo hello >trunk/readme &&
+		svn_cmd import -m "initial" . "$svnrepo"
+	) &&
+	svn_cmd co "$svnrepo" wc &&
+	(
+		cd wc &&
+		echo world >>trunk/readme &&
+		poke trunk/readme &&
+		svn_cmd commit -m "another commit" &&
+		svn_cmd up &&
+		svn_cmd mv trunk thunk &&
+		echo goodbye >>thunk/readme &&
+		poke thunk/readme &&
+		svn_cmd commit -m "bye now"
+	)
+	
+Adding         trunk
+Adding         trunk/readme
+Committing transaction...
+Committed revision 1.
+A    wc/trunk
+A    wc/trunk/readme
+Checked out revision 1.
+Sending        trunk/readme
+Transmitting file data .done
+Committing transaction...
+Committed revision 2.
+Updating '.':
+At revision 2.
+A         thunk
+D         trunk
+D         trunk/readme
+Adding         thunk
+Sending        thunk/readme
+Deleting       trunk
+Transmitting file data .done
+Committing transaction...
+Committed revision 3.
+ok 1 - initialize repo
+
+expecting success: 
+	git svn init --minimize-url -i thunk "$svnrepo"/thunk &&
+	git svn fetch -i thunk &&
+	test "$(git rev-parse --verify refs/remotes/thunk@2)" \
+	   = "$(git rev-parse --verify refs/remotes/thunk~1)" &&
+	git cat-file blob refs/remotes/thunk:readme >actual &&
+	test "$(sed -n -e "3p" actual)" = goodbye &&
+	test -z "$(git config --get svn-remote.svn.fetch \
+		 "^trunk:refs/remotes/thunk@2$")"
+	
+Using higher level of URL: file:///build/git-2.20.1/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/thunk => file:///build/git-2.20.1/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo
+Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/trunk => file:///build/git-2.20.1/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/thunk, 2
+Initializing parent: refs/remotes/thunk@2
+	A	readme
+r1 = fef07077f6a671ae7e017c0615e25974d6e4b2ed (refs/remotes/thunk@2)
+	M	readme
+r2 = 54c77117b6ab9c2f585fe18c722cdc1446a324d9 (refs/remotes/thunk@2)
+Found branch parent: (refs/remotes/thunk) 54c77117b6ab9c2f585fe18c722cdc1446a324d9
+Following parent with do_switch
+	M	readme
+Successfully followed parent
+r3 = b967b50fcd54b8868fc3fb3ed990e3cedf620b7d (refs/remotes/thunk)
+Checked out HEAD:
+  file:///build/git-2.20.1/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/thunk r3
+ok 2 - init and fetch a moved directory
+
+expecting success: 
+        git config svn-remote.svn.url "$svnrepo" &&
+        git config --add svn-remote.svn.fetch \
+          trunk:refs/remotes/svn/trunk &&
+        git config --add svn-remote.svn.fetch \
+          thunk:refs/remotes/svn/thunk &&
+        git svn fetch -i svn/thunk &&
+	test "$(git rev-parse --verify refs/remotes/svn/trunk)" \
+	   = "$(git rev-parse --verify refs/remotes/svn/thunk~1)" &&
+	git cat-file blob refs/remotes/svn/thunk:readme >actual &&
+	test "$(sed -n -e "3p" actual)" = goodbye
+        
+	A	readme
+r1 = fef07077f6a671ae7e017c0615e25974d6e4b2ed (refs/remotes/svn/trunk)
+	M	readme
+r2 = 54c77117b6ab9c2f585fe18c722cdc1446a324d9 (refs/remotes/svn/trunk)
+Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/trunk => file:///build/git-2.20.1/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/thunk, 2
+Found branch parent: (refs/remotes/svn/thunk) 54c77117b6ab9c2f585fe18c722cdc1446a324d9
+Following parent with do_switch
+	M	readme
+Successfully followed parent
+r3 = b967b50fcd54b8868fc3fb3ed990e3cedf620b7d (refs/remotes/svn/thunk)
+ok 3 - init and fetch from one svn-remote
+
+expecting success: 
+        (svn_cmd cp -m "resurrecting trunk as junk" \
+               "$svnrepo"/trunk@2 "$svnrepo"/junk ||
+         svn cp -m "resurrecting trunk as junk" \
+               -r2 "$svnrepo"/trunk "$svnrepo"/junk) &&
+        git config --add svn-remote.svn.fetch \
+          junk:refs/remotes/svn/junk &&
+        git svn fetch -i svn/thunk &&
+        git svn fetch -i svn/junk &&
+	test -z "$(git diff svn/junk svn/trunk)" &&
+	test "$(git merge-base svn/junk svn/trunk)" \
+	   = "$(git rev-parse svn/trunk)"
+        
+Committing transaction...
+Committed revision 4.
+Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/trunk => file:///build/git-2.20.1/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/junk, 2
+Found branch parent: (refs/remotes/svn/junk) 54c77117b6ab9c2f585fe18c722cdc1446a324d9
+Following parent with do_switch
+Successfully followed parent
+r4 = f2f45f671bca1a594b12c8ef635d8a19909d0b96 (refs/remotes/svn/junk)
+ok 4 - follow deleted parent
+
+expecting success: 
+        mkdir -p import/trunk/thunk/bump/thud &&
+        echo hi > import/trunk/thunk/bump/thud/file &&
+        svn import -m "import a larger parent" import "$svnrepo"/larger-parent &&
+        svn cp -m "hi" "$svnrepo"/larger-parent "$svnrepo"/another-larger &&
+        git svn init --minimize-url -i larger \
+	  "$svnrepo"/larger-parent/trunk/thunk/bump/thud &&
+        git svn fetch -i larger &&
+	git svn init --minimize-url -i larger-parent \
+	  "$svnrepo"/another-larger/trunk/thunk/bump/thud &&
+	git svn fetch -i larger-parent &&
+        git rev-parse --verify refs/remotes/larger &&
+        git rev-parse --verify \
+	   refs/remotes/larger-parent &&
+	test "$(git merge-base \
+		 refs/remotes/larger-parent \
+		 refs/remotes/larger)" = \
+	     "$(git rev-parse refs/remotes/larger)"
+        
+Adding         import/trunk
+Adding         import/trunk/readme
+Adding         import/trunk/thunk
+Adding         import/trunk/thunk/bump
+Adding         import/trunk/thunk/bump/thud
+Adding         import/trunk/thunk/bump/thud/file
+Committing transaction...
+Committed revision 5.
+Committing transaction...
+Committed revision 6.
+Using existing [svn-remote "svn"]
+Using higher level of URL: file:///build/git-2.20.1/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/larger-parent/trunk/thunk/bump/thud => file:///build/git-2.20.1/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo
+	A	file
+r5 = 8303378a62bd777a8a826878723f95b0d95c57b5 (refs/remotes/larger)
+Using existing [svn-remote "svn"]
+Using higher level of URL: file:///build/git-2.20.1/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/another-larger/trunk/thunk/bump/thud => file:///build/git-2.20.1/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/git-2.20.1/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/larger-parent/trunk/thunk/bump/thud => file:///build/git-2.20.1/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/another-larger/trunk/thunk/bump/thud, 5
+Found branch parent: (refs/remotes/larger-parent) 8303378a62bd777a8a826878723f95b0d95c57b5
+Following parent with do_switch
+Successfully followed parent
+r6 = 32591beffd72bc198774a2dd708850eda890391b (refs/remotes/larger-parent)
+8303378a62bd777a8a826878723f95b0d95c57b5
+32591beffd72bc198774a2dd708850eda890391b
+ok 5 - follow larger parent
+
+expecting success: 
+	svn mkdir -m "follow higher-level parent" "$svnrepo"/blob &&
+	svn co "$svnrepo"/blob blob &&
+	(
+		cd blob &&
+		echo hi > hi &&
+		svn add hi &&
+		svn commit -m "hihi"
+	) &&
+	svn mkdir -m "new glob at top level" "$svnrepo"/glob &&
+	svn mv -m "move blob down a level" "$svnrepo"/blob "$svnrepo"/glob/blob &&
+	git svn init --minimize-url -i blob "$svnrepo"/glob/blob &&
+        git svn fetch -i blob
+        
+Committing transaction...
+Committed revision 7.
+Checked out revision 7.
+A         hi
+Adding         hi
+Transmitting file data .done
+Committing transaction...
+Committed revision 8.
+Committing transaction...
+Committed revision 9.
+Committing transaction...
+Committed revision 10.
+Using existing [svn-remote "svn"]
+Using higher level of URL: file:///build/git-2.20.1/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/glob/blob => file:///build/git-2.20.1/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo
+Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/blob => file:///build/git-2.20.1/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/glob/blob, 9
+Initializing parent: refs/remotes/blob@9
+r7 = b82a0b2253814c3481d579deb90c411ffef4b9a3 (refs/remotes/blob@9)
+	A	hi
+r8 = 1022fc9f1cc37b2ae3c9fdccb37a803c1aae9bdc (refs/remotes/blob@9)
+Found branch parent: (refs/remotes/blob) 1022fc9f1cc37b2ae3c9fdccb37a803c1aae9bdc
+Following parent with do_switch
+Successfully followed parent
+r10 = d406d00712228fec633eee21f66f3a93ee9463f2 (refs/remotes/blob)
+ok 6 - follow higher-level parent
+
+expecting success: 
+	svn_cmd mv -m "bye!" "$svnrepo"/glob/blob/hi "$svnrepo"/glob/blob/bye &&
+	svn_cmd rm -m "remove glob" "$svnrepo"/glob &&
+	git svn init --minimize-url -i glob "$svnrepo"/glob &&
+	git svn fetch -i glob &&
+	test "$(git cat-file blob refs/remotes/glob:blob/bye)" = hi &&
+	git ls-tree refs/remotes/glob >actual &&
+	test_line_count = 1 actual
+	
+Committing transaction...
+Committed revision 11.
+Committing transaction...
+Committed revision 12.
+Using existing [svn-remote "svn"]
+Using higher level of URL: file:///build/git-2.20.1/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/glob => file:///build/git-2.20.1/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo
+r9 = f59f1d6893e2b32d752169a866634f78fc548db5 (refs/remotes/glob)
+	A	blob/hi
+r10 = d94c0989e8b950e7f9d1f854a6e68c08e71080b8 (refs/remotes/glob)
+	D	blob/hi
+	A	blob/bye
+W: -empty_dir: glob/blob/hi
+r11 = f45fb17162c4d2cae3ccd2707312f39a78818b35 (refs/remotes/glob)
+	D	hi
+	A	bye
+W: -empty_dir: glob/blob/hi
+r11 = b583203b3b4ca8fad1f4d1bf8a9e278ac3f1ab69 (refs/remotes/blob)
+ok 7 - follow deleted directory
+
+expecting success: 
+	mkdir -p import/trunk/subversion/bindings/swig/perl/t &&
+	for i in a b c ; do \
+	  echo $i > import/trunk/subversion/bindings/swig/perl/$i.pm &&
+	  echo _$i > import/trunk/subversion/bindings/swig/perl/t/$i.t; \
+	done &&
+	  echo "bad delete test" > \
+	   import/trunk/subversion/bindings/swig/perl/t/larger-parent &&
+	  echo "bad delete test 2" > \
+	   import/trunk/subversion/bindings/swig/perl/another-larger &&
+	(
+		cd import &&
+		svn import -m "r9270 test" . "$svnrepo"/r9270
+	) &&
+	svn_cmd co "$svnrepo"/r9270/trunk/subversion/bindings/swig/perl r9270 &&
+	(
+		cd r9270 &&
+		svn mkdir native &&
+		svn mv t native/t &&
+		for i in a b c
+		do
+			svn mv $i.pm native/$i.pm
+		done &&
+		echo z >>native/t/c.t &&
+		poke native/t/c.t &&
+		svn commit -m "reorg test"
+	) &&
+	git svn init --minimize-url -i r9270-t \
+	  "$svnrepo"/r9270/trunk/subversion/bindings/swig/perl/native/t &&
+	git svn fetch -i r9270-t &&
+	test $(git rev-list r9270-t | wc -l) -eq 2 &&
+	test "$(git ls-tree --name-only r9270-t~1)" = \
+	     "$(git ls-tree --name-only r9270-t)"
+	
+Adding         trunk
+Adding         trunk/readme
+Adding         trunk/subversion
+Adding         trunk/subversion/bindings
+Adding         trunk/subversion/bindings/swig
+Adding         trunk/subversion/bindings/swig/perl
+Adding         trunk/subversion/bindings/swig/perl/a.pm
+Adding         trunk/subversion/bindings/swig/perl/another-larger
+Adding         trunk/subversion/bindings/swig/perl/b.pm
+Adding         trunk/subversion/bindings/swig/perl/c.pm
+Adding         trunk/subversion/bindings/swig/perl/t
+Adding         trunk/subversion/bindings/swig/perl/t/a.t
+Adding         trunk/subversion/bindings/swig/perl/t/b.t
+Adding         trunk/subversion/bindings/swig/perl/t/c.t
+Adding         trunk/subversion/bindings/swig/perl/t/larger-parent
+Adding         trunk/thunk
+Adding         trunk/thunk/bump
+Adding         trunk/thunk/bump/thud
+Adding         trunk/thunk/bump/thud/file
+Committing transaction...
+Committed revision 13.
+A    r9270/a.pm
+A    r9270/another-larger
+A    r9270/b.pm
+A    r9270/c.pm
+A    r9270/t
+A    r9270/t/a.t
+A    r9270/t/b.t
+A    r9270/t/c.t
+A    r9270/t/larger-parent
+Checked out revision 13.
+A         native
+A         native/t
+D         t
+D         t/a.t
+D         t/b.t
+D         t/c.t
+D         t/larger-parent
+A         native/a.pm
+D         a.pm
+A         native/b.pm
+D         b.pm
+A         native/c.pm
+D         c.pm
+Deleting       a.pm
+Deleting       b.pm
+Deleting       c.pm
+Adding         native
+Adding         native/a.pm
+Adding         native/b.pm
+Adding         native/c.pm
+Adding         native/t
+Sending        native/t/c.t
+Deleting       t
+Transmitting file data .done
+Committing transaction...
+Committed revision 14.
+Using existing [svn-remote "svn"]
+Using higher level of URL: file:///build/git-2.20.1/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/r9270/trunk/subversion/bindings/swig/perl/native/t => file:///build/git-2.20.1/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo
+Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/r9270/trunk/subversion/bindings/swig/perl/t => file:///build/git-2.20.1/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 = e22d022a7480b146fd2e6f9e0f088c614fa9eb8d (refs/remotes/r9270-t@13)
+Found branch parent: (refs/remotes/r9270-t) e22d022a7480b146fd2e6f9e0f088c614fa9eb8d
+Following parent with do_switch
+	M	c.t
+Successfully followed parent
+r14 = 5cad207555369778bd17dbbb53ed435ce79bc718 (refs/remotes/r9270-t)
+ok 8 - follow-parent avoids deleting relevant info
+
+expecting success: 
+	svn_cmd cp -m "wheee!" "$svnrepo"/r9270/trunk "$svnrepo"/r9270/drunk &&
+	git svn init --minimize-url -i r9270-d \
+	  "$svnrepo"/r9270/drunk/subversion/bindings/swig/perl/native/t &&
+	git svn fetch -i r9270-d &&
+	test $(git rev-list r9270-d | wc -l) -eq 3 &&
+	test "$(git ls-tree --name-only r9270-t)" = \
+	     "$(git ls-tree --name-only r9270-d)" &&
+	test "$(git rev-parse r9270-t)" = \
+	     "$(git rev-parse r9270-d~1)"
+	
+Committing transaction...
+Committed revision 15.
+Using existing [svn-remote "svn"]
+Using higher level of URL: file:///build/git-2.20.1/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/r9270/drunk/subversion/bindings/swig/perl/native/t => file:///build/git-2.20.1/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/git-2.20.1/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/r9270/trunk/subversion/bindings/swig/perl/native/t => file:///build/git-2.20.1/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) 5cad207555369778bd17dbbb53ed435ce79bc718
+Following parent with do_switch
+Successfully followed parent
+r15 = 5bc2b36b461bf1173195310940ef8a9028a8bc7a (refs/remotes/r9270-d)
+ok 9 - track initial change if it was only made to parent
+
+expecting success: 
+	(
+		cd wc &&
+		svn_cmd up &&
+		svn_cmd mkdir stunk &&
+		echo "trunk stunk" > stunk/readme &&
+		svn_cmd add stunk/readme &&
+		svn_cmd ci -m "trunk stunk" &&
+		echo "stunk like junk" >> stunk/readme &&
+		svn_cmd ci -m "really stunk" &&
+		echo "stink stank stunk" >> stunk/readme &&
+		svn_cmd ci -m "even the grinch agrees"
+	) &&
+	svn_cmd copy -m "stunk flunked" "$svnrepo"/stunk "$svnrepo"/flunk &&
+	{ svn cp -m "early stunk flunked too" \
+		"$svnrepo"/stunk@17 "$svnrepo"/flunked ||
+	svn_cmd cp -m "early stunk flunked too" \
+		-r17 "$svnrepo"/stunk "$svnrepo"/flunked; } &&
+	git svn init --minimize-url -i stunk "$svnrepo"/stunk &&
+	git svn fetch -i stunk &&
+	git update-ref refs/remotes/flunk@18 refs/remotes/stunk~2 &&
+	git update-ref -d refs/remotes/stunk &&
+	git config --unset svn-remote.svn.fetch stunk &&
+	mkdir -p "$GIT_DIR"/svn/refs/remotes/flunk@18 &&
+	rev_map=$(cd "$GIT_DIR"/svn/refs/remotes/stunk && ls .rev_map*) &&
+	dd if="$GIT_DIR"/svn/refs/remotes/stunk/$rev_map \
+	   of="$GIT_DIR"/svn/refs/remotes/flunk@18/$rev_map bs=24 count=1 &&
+	rm -rf "$GIT_DIR"/svn/refs/remotes/stunk &&
+	git svn init --minimize-url -i flunk "$svnrepo"/flunk &&
+	git svn fetch -i flunk &&
+	git svn init --minimize-url -i stunk "$svnrepo"/stunk &&
+	git svn fetch -i stunk &&
+	git svn init --minimize-url -i flunked "$svnrepo"/flunked &&
+	git svn fetch -i flunked &&
+	test "$(git rev-parse --verify refs/remotes/flunk@18)" \
+	   = "$(git rev-parse --verify refs/remotes/stunk)" &&
+	test "$(git rev-parse --verify refs/remotes/flunk~1)" \
+	   = "$(git rev-parse --verify refs/remotes/stunk)" &&
+	test "$(git rev-parse --verify refs/remotes/flunked~1)" \
+	   = "$(git rev-parse --verify refs/remotes/stunk~1)"
+	
+Updating '.':
+A    another-larger
+A    another-larger/trunk
+A    another-larger/trunk/readme
+A    another-larger/trunk/thunk
+A    another-larger/trunk/thunk/bump
+A    another-larger/trunk/thunk/bump/thud
+A    another-larger/trunk/thunk/bump/thud/file
+A    junk
+A    junk/readme
+A    larger-parent
+A    larger-parent/trunk
+A    larger-parent/trunk/readme
+A    larger-parent/trunk/thunk
+A    larger-parent/trunk/thunk/bump
+A    larger-parent/trunk/thunk/bump/thud
+A    larger-parent/trunk/thunk/bump/thud/file
+A    r9270
+A    r9270/drunk
+A    r9270/drunk/readme
+A    r9270/drunk/subversion
+A    r9270/drunk/subversion/bindings
+A    r9270/drunk/subversion/bindings/swig
+A    r9270/drunk/subversion/bindings/swig/perl
+A    r9270/drunk/subversion/bindings/swig/perl/another-larger
+A    r9270/drunk/subversion/bindings/swig/perl/native
+A    r9270/drunk/subversion/bindings/swig/perl/native/a.pm
+A    r9270/drunk/subversion/bindings/swig/perl/native/b.pm
+A    r9270/drunk/subversion/bindings/swig/perl/native/c.pm
+A    r9270/drunk/subversion/bindings/swig/perl/native/t
+A    r9270/drunk/subversion/bindings/swig/perl/native/t/a.t
+A    r9270/drunk/subversion/bindings/swig/perl/native/t/b.t
+A    r9270/drunk/subversion/bindings/swig/perl/native/t/c.t
+A    r9270/drunk/subversion/bindings/swig/perl/native/t/larger-parent
+A    r9270/drunk/thunk
+A    r9270/drunk/thunk/bump
+A    r9270/drunk/thunk/bump/thud
+A    r9270/drunk/thunk/bump/thud/file
+A    r9270/trunk
+A    r9270/trunk/readme
+A    r9270/trunk/subversion
+A    r9270/trunk/subversion/bindings
+A    r9270/trunk/subversion/bindings/swig
+A    r9270/trunk/subversion/bindings/swig/perl
+A    r9270/trunk/subversion/bindings/swig/perl/another-larger
+A    r9270/trunk/subversion/bindings/swig/perl/native
+A    r9270/trunk/subversion/bindings/swig/perl/native/a.pm
+A    r9270/trunk/subversion/bindings/swig/perl/native/b.pm
+A    r9270/trunk/subversion/bindings/swig/perl/native/c.pm
+A    r9270/trunk/subversion/bindings/swig/perl/native/t
+A    r9270/trunk/subversion/bindings/swig/perl/native/t/a.t
+A    r9270/trunk/subversion/bindings/swig/perl/native/t/b.t
+A    r9270/trunk/subversion/bindings/swig/perl/native/t/c.t
+A    r9270/trunk/subversion/bindings/swig/perl/native/t/larger-parent
+A    r9270/trunk/thunk
+A    r9270/trunk/thunk/bump
+A    r9270/trunk/thunk/bump/thud
+A    r9270/trunk/thunk/bump/thud/file
+Updated to revision 15.
+A         stunk
+A         stunk/readme
+Adding         stunk
+Adding         stunk/readme
+Transmitting file data .done
+Committing transaction...
+Committed revision 16.
+Sending        stunk/readme
+Transmitting file data .done
+Committing transaction...
+Committed revision 17.
+Sending        stunk/readme
+Transmitting file data .done
+Committing transaction...
+Committed revision 18.
+Committing transaction...
+Committed revision 19.
+Committing transaction...
+Committed revision 20.
+Using existing [svn-remote "svn"]
+Using higher level of URL: file:///build/git-2.20.1/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/stunk => file:///build/git-2.20.1/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo
+	A	readme
+r16 = 8d87f95d3a957e37ce9381f6cd9107a9abb27385 (refs/remotes/stunk)
+	M	readme
+r17 = f697198b81ce78b80cfce7a2f44f95aa158a2c3b (refs/remotes/stunk)
+	M	readme
+r18 = 6b3708a9c0d2ca0718e6ef2539d30ca01ec3e1fe (refs/remotes/stunk)
+1+0 records in
+1+0 records out
+24 bytes copied, 7.387e-05 s, 325 kB/s
+Using existing [svn-remote "svn"]
+Using higher level of URL: file:///build/git-2.20.1/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/flunk => file:///build/git-2.20.1/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo
+Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/stunk => file:///build/git-2.20.1/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/flunk, 18
+Initializing parent: refs/remotes/flunk@18
+	M	readme
+r17 = f697198b81ce78b80cfce7a2f44f95aa158a2c3b (refs/remotes/flunk@18)
+	M	readme
+r18 = 6b3708a9c0d2ca0718e6ef2539d30ca01ec3e1fe (refs/remotes/flunk@18)
+Found branch parent: (refs/remotes/flunk) 6b3708a9c0d2ca0718e6ef2539d30ca01ec3e1fe
+Following parent with do_switch
+Successfully followed parent
+r19 = 02e34f38b26f183f95c56025298980796e8d1efb (refs/remotes/flunk)
+Using existing [svn-remote "svn"]
+Using higher level of URL: file:///build/git-2.20.1/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/stunk => file:///build/git-2.20.1/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo
+	A	readme
+r16 = 8d87f95d3a957e37ce9381f6cd9107a9abb27385 (refs/remotes/stunk)
+	M	readme
+r17 = f697198b81ce78b80cfce7a2f44f95aa158a2c3b (refs/remotes/stunk)
+	M	readme
+r18 = 6b3708a9c0d2ca0718e6ef2539d30ca01ec3e1fe (refs/remotes/stunk)
+Using existing [svn-remote "svn"]
+Using higher level of URL: file:///build/git-2.20.1/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/flunked => file:///build/git-2.20.1/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo
+Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/stunk => file:///build/git-2.20.1/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/flunked, 17
+Found branch parent: (refs/remotes/flunked) f697198b81ce78b80cfce7a2f44f95aa158a2c3b
+Following parent with do_switch
+Successfully followed parent
+r20 = 5088ad7e24ce812f21c8e97c1a9d75009e84f2fc (refs/remotes/flunked)
+ok 10 - follow-parent is atomic
+
+expecting success: 
+	svn_cmd cp -m "resurrect /glob" "$svnrepo"/r9270 "$svnrepo"/glob &&
+	git svn multi-fetch &&
+	git cat-file commit refs/remotes/glob >actual &&
+	grep "^parent " actual >actual2 &&
+	test_line_count = 2 actual2
 	
-[master 3cf5023] change #1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[master 09f26bc] change #2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[master df6c418] change #3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Committing to file:///build/git-2.20.1/t/trash%20directory.t9162-git-svn-dcommit-interactive/svnrepo/test-interactive ...
-commit 3cf502334387d4fa1050d183116d69cb73821e32
-Author: A U Thor <author@example.com>
-Date:   Fri Dec 3 05:11:10 2021 +0000
-
-    change #1
-
-Commit this patch to SVN? ([y]es (default)|[n]o|[q]uit|[a]ll): commit 09f26bce02061f7a833cb1cb363c6a5548e198bb
-Author: A U Thor <author@example.com>
-Date:   Fri Dec 3 05:11:10 2021 +0000
-
-    change #2
-
-Commit this patch to SVN? ([y]es (default)|[n]o|[q]uit|[a]ll): commit df6c41877f3c165eedd081c963cf41bd52b840a8
-Author: A U Thor <author@example.com>
-Date:   Fri Dec 3 05:11:10 2021 +0000
-
-    change #3
-
-Commit this patch to SVN? ([y]es (default)|[n]o|[q]uit|[a]ll): HEAD is now at 22bd83f change #3
-ok 3 - answers: yes yes no
+Committing transaction...
+Committed revision 21.
+Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/r9270 => file:///build/git-2.20.1/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/glob, 20
+Initializing parent: refs/remotes/glob@20
+	A	trunk/readme
+	A	trunk/subversion/bindings/swig/perl/a.pm
+	A	trunk/subversion/bindings/swig/perl/another-larger
+	A	trunk/subversion/bindings/swig/perl/b.pm
+	A	trunk/subversion/bindings/swig/perl/c.pm
+	A	trunk/subversion/bindings/swig/perl/t/a.t
+	A	trunk/subversion/bindings/swig/perl/t/b.t
+	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 = 04c3e78e4bcf64d45e0968c04fa7b9ad3e926056 (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
+	D	trunk/subversion/bindings/swig/perl/t/larger-parent
+	D	trunk/subversion/bindings/swig/perl/t/
+	D	trunk/subversion/bindings/swig/perl/a.pm
+	D	trunk/subversion/bindings/swig/perl/b.pm
+	D	trunk/subversion/bindings/swig/perl/c.pm
+	A	trunk/subversion/bindings/swig/perl/native/a.pm
+	A	trunk/subversion/bindings/swig/perl/native/b.pm
+	A	trunk/subversion/bindings/swig/perl/native/c.pm
+	A	trunk/subversion/bindings/swig/perl/native/t/a.t
+	A	trunk/subversion/bindings/swig/perl/native/t/b.t
+	A	trunk/subversion/bindings/swig/perl/native/t/c.t
+	A	trunk/subversion/bindings/swig/perl/native/t/larger-parent
+W: -empty_dir: r9270/trunk/subversion/bindings/swig/perl/a.pm
+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 = 8ce078a7c26caac7b528ceaa08ecebcd54e24dd6 (refs/remotes/glob@20)
+	A	drunk/readme
+	A	drunk/subversion/bindings/swig/perl/another-larger
+	A	drunk/subversion/bindings/swig/perl/native/a.pm
+	A	drunk/subversion/bindings/swig/perl/native/b.pm
+	A	drunk/subversion/bindings/swig/perl/native/c.pm
+	A	drunk/subversion/bindings/swig/perl/native/t/a.t
+	A	drunk/subversion/bindings/swig/perl/native/t/b.t
+	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 = c141b2bd222b320c9deb337350f42708dd7c862b (refs/remotes/glob@20)
+Found branch parent: (refs/remotes/glob) c141b2bd222b320c9deb337350f42708dd7c862b
+Index mismatch: 3cd9c37c278d8b60927f43385900d57622921efe != b80e441d0bfb8031c1110b908fb333507c1b9180
+rereading c141b2bd222b320c9deb337350f42708dd7c862b
+Following parent with do_switch
+Successfully followed parent
+r21 = 129085331e82bc41dc7a5c7cb62822c41b523b98 (refs/remotes/glob)
+ok 11 - track multi-parent paths
 
 expecting success: 
-	(
-		echo "change #1" >> foo && git commit -a -m"change #1" &&
-		echo "change #2" >> foo && git commit -a -m"change #2" &&
-		echo "change #3" >> foo && git commit -a -m"change #3" &&
-		( echo "yes
-quit" | GIT_SVN_NOTTY=1 git svn dcommit --interactive ) &&
-		test $(git rev-parse HEAD^^^) = $(git rev-parse remotes/git-svn) &&
-		git reset --hard remotes/git-svn
-	)
+	git svn multi-fetch
 	
-[master e9aa138] change #1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[master 405dacf] change #2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[master c968701] change #3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Committing to file:///build/git-2.20.1/t/trash%20directory.t9162-git-svn-dcommit-interactive/svnrepo/test-interactive ...
-commit e9aa138fd1370c53c7c0f49548ff6daa903ebb8c
-Author: A U Thor <author@example.com>
-Date:   Fri Dec 3 05:11:11 2021 +0000
-
-    change #1
-
-Commit this patch to SVN? ([y]es (default)|[n]o|[q]uit|[a]ll): commit 405dacfa0887c26b05ffa707dd7820704521c021
-Author: A U Thor <author@example.com>
-Date:   Fri Dec 3 05:11:11 2021 +0000
-
-    change #2
-
-Commit this patch to SVN? ([y]es (default)|[n]o|[q]uit|[a]ll): HEAD is now at 22bd83f change #3
-ok 4 - answers: yes quit
+ok 12 - multi-fetch continues to work
 
 expecting success: 
-	(
-		echo "change #1" >> foo && git commit -a -m"change #1" &&
-		echo "change #2" >> foo && git commit -a -m"change #2" &&
-		echo "change #3" >> foo && git commit -a -m"change #3" &&
-		( echo "all" | GIT_SVN_NOTTY=1 git svn dcommit --interactive ) &&
-		test $(git rev-parse HEAD) = $(git rev-parse remotes/git-svn) &&
-		git reset --hard remotes/git-svn
-	)
+	rm -rf "$GIT_DIR/svn" &&
+	git for-each-ref --format="option no-deref%0adelete %(refname)" refs/remotes |
+	git update-ref --stdin &&
+	git reflog expire --all --expire=all &&
+	mkdir "$GIT_DIR/svn" &&
+	git svn multi-fetch
 	
-[master ab57e82] change #1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[master ea42778] change #2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[master 2a77535] change #3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Committing to file:///build/git-2.20.1/t/trash%20directory.t9162-git-svn-dcommit-interactive/svnrepo/test-interactive ...
-commit ab57e8236176273a1efd98e84a19e31147854570
-Author: A U Thor <author@example.com>
-Date:   Fri Dec 3 05:11:13 2021 +0000
-
-    change #1
-
-Commit this patch to SVN? ([y]es (default)|[n]o|[q]uit|[a]ll): 	M	foo
-Committed r6
-	M	foo
-r6 = 0a75d4053948c65c8956c267e5c88e4c455c60e3 (refs/remotes/git-svn)
-	M	foo
-Committed r7
-	M	foo
-r7 = 63ca4d066e35a8e83658c271fec8bec10f34718b (refs/remotes/git-svn)
-	M	foo
-Committed r8
-	M	foo
-r8 = b818017f7485bf0a5df134849cf5663983a1ca5d (refs/remotes/git-svn)
-No changes between 2a77535cd241cf9da538f17e6ecbaf1afa3e0c63 and refs/remotes/git-svn
-Resetting to the latest refs/remotes/git-svn
-HEAD is now at b818017 change #3
-ok 5 - answers: all
+	A	readme
+r1 = fef07077f6a671ae7e017c0615e25974d6e4b2ed (refs/remotes/svn/trunk)
+	M	readme
+r2 = 54c77117b6ab9c2f585fe18c722cdc1446a324d9 (refs/remotes/svn/trunk)
+Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/trunk => file:///build/git-2.20.1/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/thunk, 2
+Found branch parent: (refs/remotes/svn/thunk) 54c77117b6ab9c2f585fe18c722cdc1446a324d9
+Following parent with do_switch
+	M	readme
+Successfully followed parent
+r3 = b967b50fcd54b8868fc3fb3ed990e3cedf620b7d (refs/remotes/svn/thunk)
+Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/trunk => file:///build/git-2.20.1/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/junk, 2
+Found branch parent: (refs/remotes/svn/junk) 54c77117b6ab9c2f585fe18c722cdc1446a324d9
+Following parent with do_switch
+Successfully followed parent
+r4 = f2f45f671bca1a594b12c8ef635d8a19909d0b96 (refs/remotes/svn/junk)
+	A	file
+r5 = 8303378a62bd777a8a826878723f95b0d95c57b5 (refs/remotes/larger)
+branch_from: /larger-parent => /larger-parent/trunk/thunk/bump/thud
+Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/larger-parent/trunk/thunk/bump/thud => file:///build/git-2.20.1/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/another-larger/trunk/thunk/bump/thud, 5
+Found branch parent: (refs/remotes/larger-parent) 8303378a62bd777a8a826878723f95b0d95c57b5
+Following parent with do_switch
+Successfully followed parent
+r6 = 32591beffd72bc198774a2dd708850eda890391b (refs/remotes/larger-parent)
+r9 = f59f1d6893e2b32d752169a866634f78fc548db5 (refs/remotes/glob)
+Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/blob => file:///build/git-2.20.1/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/glob/blob, 9
+Initializing parent: refs/remotes/blob@9
+r7 = b82a0b2253814c3481d579deb90c411ffef4b9a3 (refs/remotes/blob@9)
+	A	hi
+r8 = 1022fc9f1cc37b2ae3c9fdccb37a803c1aae9bdc (refs/remotes/blob@9)
+Found branch parent: (refs/remotes/blob) 1022fc9f1cc37b2ae3c9fdccb37a803c1aae9bdc
+Following parent with do_switch
+Successfully followed parent
+r10 = d406d00712228fec633eee21f66f3a93ee9463f2 (refs/remotes/blob)
+	A	blob/hi
+r10 = d94c0989e8b950e7f9d1f854a6e68c08e71080b8 (refs/remotes/glob)
+	D	hi
+	A	bye
+W: -empty_dir: glob/blob/hi
+r11 = b583203b3b4ca8fad1f4d1bf8a9e278ac3f1ab69 (refs/remotes/blob)
+	D	blob/hi
+	A	blob/bye
+W: -empty_dir: glob/blob/hi
+r11 = f45fb17162c4d2cae3ccd2707312f39a78818b35 (refs/remotes/glob)
+Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/r9270/trunk/subversion/bindings/swig/perl/t => file:///build/git-2.20.1/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 = e22d022a7480b146fd2e6f9e0f088c614fa9eb8d (refs/remotes/r9270-t@13)
+Found branch parent: (refs/remotes/r9270-t) e22d022a7480b146fd2e6f9e0f088c614fa9eb8d
+Following parent with do_switch
+	M	c.t
+Successfully followed parent
+r14 = 5cad207555369778bd17dbbb53ed435ce79bc718 (refs/remotes/r9270-t)
+branch_from: /r9270/trunk => /r9270/trunk/subversion/bindings/swig/perl/native/t
+Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/r9270/trunk/subversion/bindings/swig/perl/native/t => file:///build/git-2.20.1/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) 5cad207555369778bd17dbbb53ed435ce79bc718
+Following parent with do_switch
+Successfully followed parent
+r15 = 5bc2b36b461bf1173195310940ef8a9028a8bc7a (refs/remotes/r9270-d)
+	A	readme
+r16 = 8d87f95d3a957e37ce9381f6cd9107a9abb27385 (refs/remotes/stunk)
+	M	readme
+r17 = f697198b81ce78b80cfce7a2f44f95aa158a2c3b (refs/remotes/stunk)
+	M	readme
+r18 = 6b3708a9c0d2ca0718e6ef2539d30ca01ec3e1fe (refs/remotes/stunk)
+Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/stunk => file:///build/git-2.20.1/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/flunk, 18
+Found branch parent: (refs/remotes/flunk) 6b3708a9c0d2ca0718e6ef2539d30ca01ec3e1fe
+Following parent with do_switch
+Successfully followed parent
+r19 = 02e34f38b26f183f95c56025298980796e8d1efb (refs/remotes/flunk)
+Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/stunk => file:///build/git-2.20.1/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/flunked, 17
+Found branch parent: (refs/remotes/flunked) f697198b81ce78b80cfce7a2f44f95aa158a2c3b
+Following parent with do_switch
+Successfully followed parent
+r20 = 5088ad7e24ce812f21c8e97c1a9d75009e84f2fc (refs/remotes/flunked)
+Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/r9270 => file:///build/git-2.20.1/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/glob, 20
+Initializing parent: refs/remotes/glob@20
+	A	trunk/readme
+	A	trunk/subversion/bindings/swig/perl/a.pm
+	A	trunk/subversion/bindings/swig/perl/another-larger
+	A	trunk/subversion/bindings/swig/perl/b.pm
+	A	trunk/subversion/bindings/swig/perl/c.pm
+	A	trunk/subversion/bindings/swig/perl/t/a.t
+	A	trunk/subversion/bindings/swig/perl/t/b.t
+	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 = 04c3e78e4bcf64d45e0968c04fa7b9ad3e926056 (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
+	D	trunk/subversion/bindings/swig/perl/t/larger-parent
+	D	trunk/subversion/bindings/swig/perl/t/
+	D	trunk/subversion/bindings/swig/perl/a.pm
+	D	trunk/subversion/bindings/swig/perl/b.pm
+	D	trunk/subversion/bindings/swig/perl/c.pm
+	A	trunk/subversion/bindings/swig/perl/native/a.pm
+	A	trunk/subversion/bindings/swig/perl/native/b.pm
+	A	trunk/subversion/bindings/swig/perl/native/c.pm
+	A	trunk/subversion/bindings/swig/perl/native/t/a.t
+	A	trunk/subversion/bindings/swig/perl/native/t/b.t
+	A	trunk/subversion/bindings/swig/perl/native/t/c.t
+	A	trunk/subversion/bindings/swig/perl/native/t/larger-parent
+W: -empty_dir: r9270/trunk/subversion/bindings/swig/perl/a.pm
+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 = 8ce078a7c26caac7b528ceaa08ecebcd54e24dd6 (refs/remotes/glob@20)
+	A	drunk/readme
+	A	drunk/subversion/bindings/swig/perl/another-larger
+	A	drunk/subversion/bindings/swig/perl/native/a.pm
+	A	drunk/subversion/bindings/swig/perl/native/b.pm
+	A	drunk/subversion/bindings/swig/perl/native/c.pm
+	A	drunk/subversion/bindings/swig/perl/native/t/a.t
+	A	drunk/subversion/bindings/swig/perl/native/t/b.t
+	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 = c141b2bd222b320c9deb337350f42708dd7c862b (refs/remotes/glob@20)
+Found branch parent: (refs/remotes/glob) c141b2bd222b320c9deb337350f42708dd7c862b
+Index mismatch: 3cd9c37c278d8b60927f43385900d57622921efe != b80e441d0bfb8031c1110b908fb333507c1b9180
+rereading c141b2bd222b320c9deb337350f42708dd7c862b
+Following parent with do_switch
+Successfully followed parent
+r21 = 129085331e82bc41dc7a5c7cb62822c41b523b98 (refs/remotes/glob)
+ok 13 - multi-fetch works off a 'clean' repository
 
-# passed all 5 test(s)
-1..5
+# passed all 13 test(s)
+1..13
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
 *** t9350-fast-export.sh ***
@@ -334049,8 +332456,8 @@
 		test_cmp expected output
 	)
 
---- expected	2021-12-03 05:11:15.773255103 +0000
-+++ output	2021-12-03 05:11:15.829253475 +0000
+--- expected	2023-01-05 11:51:35.722868030 +0000
++++ output	2023-01-05 11:51:35.758868030 +0000
 @@ -8,8 +8,7 @@
  data 3
  hi
@@ -334486,6 +332893,1860 @@
 1..36
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
+*** t7610-mergetool.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7610-mergetool/.git/
+expecting success: 
+	test_config rerere.enabled true &&
+	echo master >file1 &&
+	echo master spaced >"spaced name" &&
+	echo master file11 >file11 &&
+	echo master file12 >file12 &&
+	echo master file13 >file13 &&
+	echo master file14 >file14 &&
+	mkdir subdir &&
+	echo master sub >subdir/file3 &&
+	test_create_repo submod &&
+	(
+		cd submod &&
+		: >foo &&
+		git add foo &&
+		git commit -m "Add foo"
+	) &&
+	git submodule add git://example.com/submod submod &&
+	git add file1 "spaced name" file1[1-4] subdir/file3 .gitmodules submod &&
+	git commit -m "add initial versions" &&
+
+	git checkout -b branch1 master &&
+	git submodule update -N &&
+	echo branch1 change >file1 &&
+	echo branch1 newfile >file2 &&
+	echo branch1 spaced >"spaced name" &&
+	echo branch1 both added >both &&
+	echo branch1 change file11 >file11 &&
+	echo branch1 change file13 >file13 &&
+	echo branch1 sub >subdir/file3 &&
+	(
+		cd submod &&
+		echo branch1 submodule >bar &&
+		git add bar &&
+		git commit -m "Add bar on branch1" &&
+		git checkout -b submod-branch1
+	) &&
+	git add file1 "spaced name" file11 file13 file2 subdir/file3 submod &&
+	git add both &&
+	git rm file12 &&
+	git commit -m "branch1 changes" &&
+
+	git checkout -b delete-base branch1 &&
+	mkdir -p a/a &&
+	test_write_lines one two 3 4 >a/a/file.txt &&
+	git add a/a/file.txt &&
+	git commit -m"base file" &&
+	git checkout -b move-to-b delete-base &&
+	mkdir -p b/b &&
+	git mv a/a/file.txt b/b/file.txt &&
+	test_write_lines one two 4 >b/b/file.txt &&
+	git commit -a -m"move to b" &&
+	git checkout -b move-to-c delete-base &&
+	mkdir -p c/c &&
+	git mv a/a/file.txt c/c/file.txt &&
+	test_write_lines one two 3 >c/c/file.txt &&
+	git commit -a -m"move to c" &&
+
+	git checkout -b stash1 master &&
+	echo stash1 change file11 >file11 &&
+	git add file11 &&
+	git commit -m "stash1 changes" &&
+
+	git checkout -b stash2 master &&
+	echo stash2 change file11 >file11 &&
+	git add file11 &&
+	git commit -m "stash2 changes" &&
+
+	git checkout master &&
+	git submodule update -N &&
+	echo master updated >file1 &&
+	echo master new >file2 &&
+	echo master updated spaced >"spaced name" &&
+	echo master both added >both &&
+	echo master updated file12 >file12 &&
+	echo master updated file14 >file14 &&
+	echo master new sub >subdir/file3 &&
+	(
+		cd submod &&
+		echo master submodule >bar &&
+		git add bar &&
+		git commit -m "Add bar on master" &&
+		git checkout -b submod-master
+	) &&
+	git add file1 "spaced name" file12 file14 file2 subdir/file3 submod &&
+	git add both &&
+	git rm file11 &&
+	git commit -m "master updates" &&
+
+	git clean -fdx &&
+	git checkout -b order-file-start master &&
+	echo start >a &&
+	echo start >b &&
+	git add a b &&
+	git commit -m start &&
+	git checkout -b order-file-side1 order-file-start &&
+	echo side1 >a &&
+	echo side1 >b &&
+	git add a b &&
+	git commit -m side1 &&
+	git checkout -b order-file-side2 order-file-start &&
+	echo side2 >a &&
+	echo side2 >b &&
+	git add a b &&
+	git commit -m side2 &&
+
+	git config merge.tool mytool &&
+	git config mergetool.mytool.cmd "cat \"\$REMOTE\" >\"\$MERGED\"" &&
+	git config mergetool.mytool.trustExitCode true &&
+	git config mergetool.mybase.cmd "cat \"\$BASE\" >\"\$MERGED\"" &&
+	git config mergetool.mybase.trustExitCode true
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7610-mergetool/submod/.git/
+[master (root-commit) 98e2f77] Add foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 foo
+Adding existing repo at 'submod' to the index
+[master (root-commit) c4e17ff] add initial versions
+ Author: A U Thor <author@example.com>
+ 9 files changed, 11 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 100644 file1
+ create mode 100644 file11
+ create mode 100644 file12
+ create mode 100644 file13
+ create mode 100644 file14
+ create mode 100644 spaced name
+ create mode 100644 subdir/file3
+ create mode 160000 submod
+Switched to a new branch 'branch1'
+[master 03b6835] Add bar on branch1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 bar
+Switched to a new branch 'submod-branch1'
+rm 'file12'
+[branch1 2ed2aee] branch1 changes
+ Author: A U Thor <author@example.com>
+ 9 files changed, 8 insertions(+), 7 deletions(-)
+ create mode 100644 both
+ delete mode 100644 file12
+ create mode 100644 file2
+Switched to a new branch 'delete-base'
+[delete-base d20801c] base file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 4 insertions(+)
+ create mode 100644 a/a/file.txt
+Switched to a new branch 'move-to-b'
+[move-to-b 5717026] move to b
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 deletion(-)
+ rename {a/a => b/b}/file.txt (83%)
+Switched to a new branch 'move-to-c'
+[move-to-c 5427531] move to c
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 deletion(-)
+ rename {a/a => c/c}/file.txt (83%)
+Switched to a new branch 'stash1'
+M	submod
+[stash1 f64be01] stash1 changes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'stash2'
+M	submod
+[stash2 ddf97b3] stash2 changes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to branch 'master'
+M	submod
+Submodule path 'submod': checked out '98e2f77445a6411981cc26db1372f2bde8135fc5'
+[detached HEAD 25e4b0b] Add bar on master
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 bar
+Switched to a new branch 'submod-master'
+rm 'file11'
+[master 5c9be73] master updates
+ Author: A U Thor <author@example.com>
+ 9 files changed, 8 insertions(+), 7 deletions(-)
+ create mode 100644 both
+ delete mode 100644 file11
+ create mode 100644 file2
+Removing a/
+Switched to a new branch 'order-file-start'
+[order-file-start 0c14618] start
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 a
+ create mode 100644 b
+Switched to a new branch 'order-file-side1'
+[order-file-side1 a8513a0] side1
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+Switched to a new branch 'order-file-side2'
+[order-file-side2 a7a2b49] side2
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+ok 1 - setup
+
+expecting success: 
+	test_when_finished "git reset --hard" &&
+	git checkout -b test$test_count branch1 &&
+	git submodule update -N &&
+	test_must_fail git merge master >/dev/null 2>&1 &&
+	( yes "" | git mergetool both >/dev/null 2>&1 ) &&
+	( yes "" | git mergetool file1 file1 ) &&
+	( yes "" | git mergetool file2 "spaced name" >/dev/null 2>&1 ) &&
+	( yes "" | git mergetool subdir/file3 >/dev/null 2>&1 ) &&
+	( yes "d" | git mergetool file11 >/dev/null 2>&1 ) &&
+	( yes "d" | git mergetool file12 >/dev/null 2>&1 ) &&
+	( yes "l" | git mergetool submod >/dev/null 2>&1 ) &&
+	test "$(cat file1)" = "master updated" &&
+	test "$(cat file2)" = "master new" &&
+	test "$(cat subdir/file3)" = "master new sub" &&
+	test "$(cat submod/bar)" = "branch1 submodule" &&
+	git commit -m "branch1 resolved with mergetool"
+
+Switched to a new branch 'test2'
+M	submod
+Submodule path 'submod': checked out '03b68353219fdf835e23c740e11254c10dc68d32'
+Merging:
+file1
+
+Normal merge conflict for 'file1':
+  {local}: modified file
+  {remote}: modified file
+Recorded resolution for 'both'.
+Recorded resolution for 'file1'.
+Recorded resolution for 'file2'.
+Recorded resolution for 'spaced name'.
+Recorded resolution for 'subdir/file3'.
+[test2 72b081b] branch1 resolved with mergetool
+ Author: A U Thor <author@example.com>
+HEAD is now at 72b081b branch1 resolved with mergetool
+ok 2 - custom mergetool
+
+expecting success: 
+	test_when_finished "git reset --hard" &&
+	# This test_config line must go after the above reset line so that
+	# core.autocrlf is unconfigured before reset runs.  (The
+	# test_config command uses test_when_finished internally and
+	# test_when_finished is LIFO.)
+	test_config core.autocrlf true &&
+	git checkout -b test$test_count branch1 &&
+	test_must_fail git merge master >/dev/null 2>&1 &&
+	( yes "" | git mergetool file1 >/dev/null 2>&1 ) &&
+	( yes "" | git mergetool file2 >/dev/null 2>&1 ) &&
+	( yes "" | git mergetool "spaced name" >/dev/null 2>&1 ) &&
+	( yes "" | git mergetool both >/dev/null 2>&1 ) &&
+	( yes "" | git mergetool subdir/file3 >/dev/null 2>&1 ) &&
+	( yes "d" | git mergetool file11 >/dev/null 2>&1 ) &&
+	( yes "d" | git mergetool file12 >/dev/null 2>&1 ) &&
+	( yes "r" | git mergetool submod >/dev/null 2>&1 ) &&
+	test "$(printf x | cat file1 -)" = "$(printf "master updated\r\nx")" &&
+	test "$(printf x | cat file2 -)" = "$(printf "master new\r\nx")" &&
+	test "$(printf x | cat subdir/file3 -)" = "$(printf "master new sub\r\nx")" &&
+	git submodule update -N &&
+	test "$(cat submod/bar)" = "master submodule" &&
+	git commit -m "branch1 resolved with mergetool - autocrlf"
+
+Switched to a new branch 'test3'
+Submodule path 'submod': checked out '25e4b0b0c4fded0492db093dc6ef5baf77c05922'
+Recorded resolution for 'both'.
+Recorded resolution for 'file1'.
+Recorded resolution for 'file2'.
+Recorded resolution for 'spaced name'.
+Recorded resolution for 'subdir/file3'.
+[test3 dd27689] branch1 resolved with mergetool - autocrlf
+ Author: A U Thor <author@example.com>
+HEAD is now at dd27689 branch1 resolved with mergetool - autocrlf
+ok 3 - mergetool crlf
+
+expecting success: 
+	test_when_finished "git reset --hard" &&
+	git checkout -b test$test_count branch1 &&
+	git submodule update -N &&
+	(
+		cd subdir &&
+		test_must_fail git merge master >/dev/null 2>&1 &&
+		( yes "" | git mergetool file3 >/dev/null 2>&1 ) &&
+		test "$(cat file3)" = "master new sub"
+	)
+
+Switched to a new branch 'test4'
+M	submod
+Submodule path 'submod': checked out '03b68353219fdf835e23c740e11254c10dc68d32'
+HEAD is now at 2ed2aee branch1 changes
+ok 4 - mergetool in subdir
+
+expecting success: 
+	test_when_finished "git reset --hard" &&
+	git checkout -b test$test_count branch1 &&
+	git submodule update -N &&
+	(
+		cd subdir &&
+		test_must_fail git merge master >/dev/null 2>&1 &&
+		( yes "" | git mergetool file3 >/dev/null 2>&1 ) &&
+		( yes "" | git mergetool ../file1 >/dev/null 2>&1 ) &&
+		( yes "" | git mergetool ../file2 ../spaced\ name >/dev/null 2>&1 ) &&
+		( yes "" | git mergetool ../both >/dev/null 2>&1 ) &&
+		( yes "d" | git mergetool ../file11 >/dev/null 2>&1 ) &&
+		( yes "d" | git mergetool ../file12 >/dev/null 2>&1 ) &&
+		( yes "l" | git mergetool ../submod >/dev/null 2>&1 ) &&
+		test "$(cat ../file1)" = "master updated" &&
+		test "$(cat ../file2)" = "master new" &&
+		test "$(cat ../submod/bar)" = "branch1 submodule" &&
+		git commit -m "branch1 resolved with mergetool - subdir"
+	)
+
+Switched to a new branch 'test5'
+[test5 6dbef48] branch1 resolved with mergetool - subdir
+ Author: A U Thor <author@example.com>
+HEAD is now at 6dbef48 branch1 resolved with mergetool - subdir
+ok 5 - mergetool on file in parent dir
+
+expecting success: 
+	test_when_finished "git reset --hard" &&
+	git checkout -b test$test_count branch1 &&
+	git submodule update -N &&
+	test_must_fail git merge master &&
+	test -n "$(git ls-files -u)" &&
+	( yes "d" | git mergetool file11 >/dev/null 2>&1 ) &&
+	( yes "d" | git mergetool file12 >/dev/null 2>&1 ) &&
+	( yes "l" | git mergetool submod >/dev/null 2>&1 ) &&
+	output="$(git mergetool --no-prompt)" &&
+	test "$output" = "No files need merging"
+
+Switched to a new branch 'test6'
+Merging:
+2ed2aee branch1 changes
+virtual master
+found 1 common ancestor:
+c4e17ff add initial versions
+Failed to merge submodule submod (merge following commits not found)
+Auto-merging submod
+CONFLICT (submodule): Merge conflict in submod
+Auto-merging subdir/file3
+CONFLICT (content): Merge conflict in subdir/file3
+Auto-merging spaced name
+CONFLICT (content): Merge conflict in spaced name
+Auto-merging file2
+CONFLICT (add/add): Merge conflict in file2
+CONFLICT (modify/delete): file12 deleted in HEAD and modified in master. Version master of file12 left in tree.
+CONFLICT (modify/delete): file11 deleted in master and modified in HEAD. Version HEAD of file11 left in tree.
+Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+Auto-merging both
+CONFLICT (add/add): Merge conflict in both
+Resolved 'both' using previous resolution.
+Resolved 'file1' using previous resolution.
+Resolved 'file2' using previous resolution.
+Resolved 'spaced name' using previous resolution.
+Resolved 'subdir/file3' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+HEAD is now at 2ed2aee branch1 changes
+ok 6 - mergetool skips autoresolved
+
+expecting success: 
+	test_when_finished "git reset --hard" &&
+	git checkout -b test$test_count branch1 &&
+	test_config rerere.enabled false &&
+	(
+		cd subdir &&
+		test_must_fail git merge master &&
+		( yes "r" | git mergetool ../submod ) &&
+		( yes "d" "d" | git mergetool --no-prompt ) &&
+		test "$(cat ../file1)" = "master updated" &&
+		test "$(cat ../file2)" = "master new" &&
+		test "$(cat file3)" = "master new sub" &&
+		( cd .. && git submodule update -N ) &&
+		test "$(cat ../submod/bar)" = "master submodule" &&
+		git commit -m "branch2 resolved by mergetool from subdir"
+	)
+
+Switched to a new branch 'test7'
+Merging:
+2ed2aee branch1 changes
+virtual master
+found 1 common ancestor:
+c4e17ff add initial versions
+Failed to merge submodule submod (merge following commits not found)
+Auto-merging submod
+CONFLICT (submodule): Merge conflict in submod
+Auto-merging subdir/file3
+CONFLICT (content): Merge conflict in subdir/file3
+Auto-merging spaced name
+CONFLICT (content): Merge conflict in spaced name
+Auto-merging file2
+CONFLICT (add/add): Merge conflict in file2
+CONFLICT (modify/delete): file12 deleted in HEAD and modified in master. Version master of file12 left in tree.
+CONFLICT (modify/delete): file11 deleted in master and modified in HEAD. Version HEAD of file11 left in tree.
+Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+Auto-merging both
+CONFLICT (add/add): Merge conflict in both
+Automatic merge failed; fix conflicts and then commit the result.
+Merging:
+submod
+
+Submodule merge conflict for 'submod':
+  {local}: submodule commit 03b68353219fdf835e23c740e11254c10dc68d32
+  {remote}: submodule commit 25e4b0b0c4fded0492db093dc6ef5baf77c05922
+Use (l)ocal or (r)emote, or (a)bort? Merging:
+both
+file1
+file11
+file12
+file2
+spaced name
+subdir/file3
+
+Normal merge conflict for 'both':
+  {local}: created file
+  {remote}: created file
+
+Normal merge conflict for 'file1':
+  {local}: modified file
+  {remote}: modified file
+
+Deleted merge conflict for 'file11':
+  {local}: modified file
+  {remote}: deleted
+Use (m)odified or (d)eleted file, or (a)bort? 
+Deleted merge conflict for 'file12':
+  {local}: deleted
+  {remote}: modified file
+Use (m)odified or (d)eleted file, or (a)bort? 
+Normal merge conflict for 'file2':
+  {local}: created file
+  {remote}: created file
+
+Normal merge conflict for 'spaced name':
+  {local}: modified file
+  {remote}: modified file
+
+Normal merge conflict for 'subdir/file3':
+  {local}: modified file
+  {remote}: modified file
+Submodule path 'submod': checked out '25e4b0b0c4fded0492db093dc6ef5baf77c05922'
+[test7 e4e69fa] branch2 resolved by mergetool from subdir
+ Author: A U Thor <author@example.com>
+HEAD is now at e4e69fa branch2 resolved by mergetool from subdir
+ok 7 - mergetool merges all from subdir (rerere disabled)
+
+expecting success: 
+	test_when_finished "git reset --hard" &&
+	git checkout -b test$test_count branch1 &&
+	test_config rerere.enabled true &&
+	rm -rf .git/rr-cache &&
+	(
+		cd subdir &&
+		test_must_fail git merge master &&
+		( yes "r" | git mergetool ../submod ) &&
+		( yes "d" "d" | git mergetool --no-prompt ) &&
+		test "$(cat ../file1)" = "master updated" &&
+		test "$(cat ../file2)" = "master new" &&
+		test "$(cat file3)" = "master new sub" &&
+		( cd .. && git submodule update -N ) &&
+		test "$(cat ../submod/bar)" = "master submodule" &&
+		git commit -m "branch2 resolved by mergetool from subdir"
+	)
+
+Switched to a new branch 'test8'
+M	submod
+Merging:
+2ed2aee branch1 changes
+virtual master
+found 1 common ancestor:
+c4e17ff add initial versions
+Failed to merge submodule submod (merge following commits not found)
+Auto-merging submod
+CONFLICT (submodule): Merge conflict in submod
+Auto-merging subdir/file3
+CONFLICT (content): Merge conflict in subdir/file3
+Auto-merging spaced name
+CONFLICT (content): Merge conflict in spaced name
+Auto-merging file2
+CONFLICT (add/add): Merge conflict in file2
+CONFLICT (modify/delete): file12 deleted in HEAD and modified in master. Version master of file12 left in tree.
+CONFLICT (modify/delete): file11 deleted in master and modified in HEAD. Version HEAD of file11 left in tree.
+Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+Auto-merging both
+CONFLICT (add/add): Merge conflict in both
+Recorded preimage for 'both'
+Recorded preimage for 'file1'
+Recorded preimage for 'file2'
+Recorded preimage for 'spaced name'
+Recorded preimage for 'subdir/file3'
+Automatic merge failed; fix conflicts and then commit the result.
+Merging:
+submod
+
+Submodule merge conflict for 'submod':
+  {local}: submodule commit 03b68353219fdf835e23c740e11254c10dc68d32
+  {remote}: submodule commit 25e4b0b0c4fded0492db093dc6ef5baf77c05922
+Use (l)ocal or (r)emote, or (a)bort? Merging:
+both
+file1
+file11
+file12
+file2
+spaced name
+subdir/file3
+
+Normal merge conflict for 'both':
+  {local}: created file
+  {remote}: created file
+
+Normal merge conflict for 'file1':
+  {local}: modified file
+  {remote}: modified file
+
+Deleted merge conflict for 'file11':
+  {local}: modified file
+  {remote}: deleted
+Use (m)odified or (d)eleted file, or (a)bort? 
+Deleted merge conflict for 'file12':
+  {local}: deleted
+  {remote}: modified file
+Use (m)odified or (d)eleted file, or (a)bort? 
+Normal merge conflict for 'file2':
+  {local}: created file
+  {remote}: created file
+
+Normal merge conflict for 'spaced name':
+  {local}: modified file
+  {remote}: modified file
+
+Normal merge conflict for 'subdir/file3':
+  {local}: modified file
+  {remote}: modified file
+Recorded resolution for 'both'.
+Recorded resolution for 'file1'.
+Recorded resolution for 'file2'.
+Recorded resolution for 'spaced name'.
+Recorded resolution for 'subdir/file3'.
+[test8 e031514] branch2 resolved by mergetool from subdir
+ Author: A U Thor <author@example.com>
+HEAD is now at e031514 branch2 resolved by mergetool from subdir
+ok 8 - mergetool merges all from subdir (rerere enabled)
+
+expecting success: 
+	test_when_finished "git reset --hard" &&
+	test_config rerere.enabled true &&
+	rm -rf .git/rr-cache &&
+	git checkout -b test$test_count branch1 &&
+	git submodule update -N &&
+	test_must_fail git merge master >/dev/null 2>&1 &&
+	( yes "l" | git mergetool --no-prompt submod >/dev/null 2>&1 ) &&
+	( yes "d" "d" | git mergetool --no-prompt >/dev/null 2>&1 ) &&
+	git submodule update -N &&
+	output="$(yes "n" | git mergetool --no-prompt)" &&
+	test "$output" = "No files need merging"
+
+Switched to a new branch 'test9'
+M	submod
+Submodule path 'submod': checked out '03b68353219fdf835e23c740e11254c10dc68d32'
+HEAD is now at 2ed2aee branch1 changes
+ok 9 - mergetool skips resolved paths when rerere is active
+
+expecting success: 
+	test_when_finished "git reset --hard" &&
+	test_config rerere.enabled true &&
+	git checkout stash1 &&
+	echo "Conflicting stash content" >file11 &&
+	git stash &&
+
+	git checkout --detach stash2 &&
+	test_must_fail git stash apply &&
+
+	test -n "$(git ls-files -u)" &&
+	conflicts="$(git rerere remaining)" &&
+	test "$conflicts" = "file11" &&
+	output="$(git mergetool --no-prompt)" &&
+	test "$output" != "No files need merging" &&
+
+	git commit -am "save the stash resolution" &&
+
+	git reset --hard stash2 &&
+	test_must_fail git stash apply &&
+
+	test -n "$(git ls-files -u)" &&
+	conflicts="$(git rerere remaining)" &&
+	test -z "$conflicts" &&
+	output="$(git mergetool --no-prompt)" &&
+	test "$output" = "No files need merging"
+
+Switched to branch 'stash1'
+M	submod
+Saved working directory and index state WIP on stash1: f64be01 stash1 changes
+HEAD is now at ddf97b3 stash2 changes
+M	submod
+Merging Updated upstream with Stashed changes
+Merging:
+virtual Updated upstream
+virtual Stashed changes
+found 1 common ancestor:
+virtual 0913626744276ae037d0ab30e722e798e5bbceae
+Auto-merging file11
+CONFLICT (content): Merge conflict in file11
+Recorded preimage for 'file11'
+Recorded resolution for 'file11'.
+[detached HEAD eecefda] save the stash resolution
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+HEAD is now at ddf97b3 stash2 changes
+Merging Updated upstream with Stashed changes
+Merging:
+virtual Updated upstream
+virtual Stashed changes
+found 1 common ancestor:
+virtual 0913626744276ae037d0ab30e722e798e5bbceae
+Auto-merging file11
+CONFLICT (content): Merge conflict in file11
+Resolved 'file11' using previous resolution.
+HEAD is now at ddf97b3 stash2 changes
+ok 10 - conflicted stash sets up rerere
+
+expecting success: 
+	test_when_finished "git reset --hard" &&
+	test_config rerere.enabled false &&
+	git checkout -b test$test_count branch1 &&
+	git submodule update -N &&
+	test_must_fail git merge master &&
+
+	( yes "" | git mergetool subdir ) &&
+
+	test "$(cat subdir/file3)" = "master new sub"
+
+Previous HEAD position was ddf97b3 stash2 changes
+Switched to a new branch 'test11'
+Merging:
+2ed2aee branch1 changes
+virtual master
+found 1 common ancestor:
+c4e17ff add initial versions
+Failed to merge submodule submod (merge following commits not found)
+Auto-merging submod
+CONFLICT (submodule): Merge conflict in submod
+Auto-merging subdir/file3
+CONFLICT (content): Merge conflict in subdir/file3
+Auto-merging spaced name
+CONFLICT (content): Merge conflict in spaced name
+Auto-merging file2
+CONFLICT (add/add): Merge conflict in file2
+CONFLICT (modify/delete): file12 deleted in HEAD and modified in master. Version master of file12 left in tree.
+CONFLICT (modify/delete): file11 deleted in master and modified in HEAD. Version HEAD of file11 left in tree.
+Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+Auto-merging both
+CONFLICT (add/add): Merge conflict in both
+Automatic merge failed; fix conflicts and then commit the result.
+Merging:
+subdir/file3
+
+Normal merge conflict for 'subdir/file3':
+  {local}: modified file
+  {remote}: modified file
+HEAD is now at 2ed2aee branch1 changes
+ok 11 - mergetool takes partial path
+
+expecting success: 
+	test_when_finished "git reset --hard" &&
+	git checkout -b test$test_count move-to-c &&
+	test_must_fail git merge move-to-b &&
+	echo d | git mergetool a/a/file.txt &&
+	! test -f a/a/file.txt &&
+	git reset --hard &&
+	test_must_fail git merge move-to-b &&
+	echo m | git mergetool a/a/file.txt &&
+	test -f b/b/file.txt &&
+	git reset --hard &&
+	test_must_fail git merge move-to-b &&
+	! echo a | git mergetool a/a/file.txt &&
+	! test -f a/a/file.txt
+
+Switched to a new branch 'test12'
+Merging:
+5427531 move to c
+virtual move-to-b
+found 1 common ancestor:
+d20801c base file
+CONFLICT (rename/rename): Rename directory a/a->c/c in HEAD. Rename directory a/a->b/b in move-to-b
+CONFLICT (rename/rename): Rename "a/a/file.txt"->"c/c/file.txt" in branch "HEAD" rename "a/a/file.txt"->"b/b/file.txt" in "move-to-b"
+Automatic merge failed; fix conflicts and then commit the result.
+Merging:
+a/a/file.txt
+
+Deleted merge conflict for 'a/a/file.txt':
+  {local}: deleted
+  {remote}: deleted
+Use (m)odified or (d)eleted file, or (a)bort? HEAD is now at 5427531 move to c
+Merging:
+5427531 move to c
+virtual move-to-b
+found 1 common ancestor:
+d20801c base file
+CONFLICT (rename/rename): Rename directory a/a->c/c in HEAD. Rename directory a/a->b/b in move-to-b
+CONFLICT (rename/rename): Rename "a/a/file.txt"->"c/c/file.txt" in branch "HEAD" rename "a/a/file.txt"->"b/b/file.txt" in "move-to-b"
+Automatic merge failed; fix conflicts and then commit the result.
+Merging:
+a/a/file.txt
+
+Deleted merge conflict for 'a/a/file.txt':
+  {local}: deleted
+  {remote}: deleted
+Use (m)odified or (d)eleted file, or (a)bort? HEAD is now at 5427531 move to c
+Merging:
+5427531 move to c
+virtual move-to-b
+found 1 common ancestor:
+d20801c base file
+CONFLICT (rename/rename): Rename directory a/a->c/c in HEAD. Rename directory a/a->b/b in move-to-b
+CONFLICT (rename/rename): Rename "a/a/file.txt"->"c/c/file.txt" in branch "HEAD" rename "a/a/file.txt"->"b/b/file.txt" in "move-to-b"
+Automatic merge failed; fix conflicts and then commit the result.
+Merging:
+a/a/file.txt
+
+Deleted merge conflict for 'a/a/file.txt':
+  {local}: deleted
+  {remote}: deleted
+Use (m)odified or (d)eleted file, or (a)bort? HEAD is now at 5427531 move to c
+ok 12 - mergetool delete/delete conflict
+
+expecting success: 
+	test_when_finished "git reset --hard" &&
+	git checkout -b test$test_count move-to-c &&
+	test_config mergetool.keepBackup true &&
+	test_must_fail git merge move-to-b &&
+	echo d | git mergetool a/a/file.txt 2>actual &&
+	test_must_be_empty actual &&
+	! test -d a
+
+Switched to a new branch 'test13'
+Merging:
+5427531 move to c
+virtual move-to-b
+found 1 common ancestor:
+d20801c base file
+CONFLICT (rename/rename): Rename directory a/a->c/c in HEAD. Rename directory a/a->b/b in move-to-b
+CONFLICT (rename/rename): Rename "a/a/file.txt"->"c/c/file.txt" in branch "HEAD" rename "a/a/file.txt"->"b/b/file.txt" in "move-to-b"
+Automatic merge failed; fix conflicts and then commit the result.
+Merging:
+a/a/file.txt
+
+Deleted merge conflict for 'a/a/file.txt':
+  {local}: deleted
+  {remote}: deleted
+Use (m)odified or (d)eleted file, or (a)bort? HEAD is now at 5427531 move to c
+ok 13 - mergetool produces no errors when keepBackup is used
+
+expecting success: 
+	test_when_finished "git reset --hard" &&
+	git checkout -b test$test_count move-to-c &&
+	test_config mergetool.keepTemporaries false &&
+	test_must_fail git merge move-to-b &&
+	echo d | git mergetool a/a/file.txt &&
+	! test -d a
+
+Switched to a new branch 'test14'
+Merging:
+5427531 move to c
+virtual move-to-b
+found 1 common ancestor:
+d20801c base file
+CONFLICT (rename/rename): Rename directory a/a->c/c in HEAD. Rename directory a/a->b/b in move-to-b
+CONFLICT (rename/rename): Rename "a/a/file.txt"->"c/c/file.txt" in branch "HEAD" rename "a/a/file.txt"->"b/b/file.txt" in "move-to-b"
+Automatic merge failed; fix conflicts and then commit the result.
+Merging:
+a/a/file.txt
+
+Deleted merge conflict for 'a/a/file.txt':
+  {local}: deleted
+  {remote}: deleted
+Use (m)odified or (d)eleted file, or (a)bort? HEAD is now at 5427531 move to c
+ok 14 - mergetool honors tempfile config for deleted files
+
+expecting success: 
+	test_when_finished "git reset --hard" &&
+	test_when_finished "git clean -fdx" &&
+	git checkout -b test$test_count move-to-c &&
+	test_config mergetool.keepTemporaries true &&
+	test_must_fail git merge move-to-b &&
+	! test_write_lines a n | git mergetool a/a/file.txt &&
+	test -d a/a &&
+	cat >expect <<-\EOF &&
+	file_BASE_.txt
+	file_LOCAL_.txt
+	file_REMOTE_.txt
+	EOF
+	ls -1 a/a | sed -e "s/[0-9]*//g" >actual &&
+	test_cmp expect actual
+
+Switched to a new branch 'test15'
+Merging:
+5427531 move to c
+virtual move-to-b
+found 1 common ancestor:
+d20801c base file
+CONFLICT (rename/rename): Rename directory a/a->c/c in HEAD. Rename directory a/a->b/b in move-to-b
+CONFLICT (rename/rename): Rename "a/a/file.txt"->"c/c/file.txt" in branch "HEAD" rename "a/a/file.txt"->"b/b/file.txt" in "move-to-b"
+Automatic merge failed; fix conflicts and then commit the result.
+Merging:
+a/a/file.txt
+
+Deleted merge conflict for 'a/a/file.txt':
+  {local}: deleted
+  {remote}: deleted
+Use (m)odified or (d)eleted file, or (a)bort? Removing a/a/file_BASE_2918853.txt
+Removing a/a/file_LOCAL_2918853.txt
+Removing a/a/file_REMOTE_2918853.txt
+Removing actual
+Removing both.orig
+Removing expect
+Removing file1.orig
+Removing file11.orig
+Removing file2.orig
+Removing spaced name.orig
+Removing subdir/file3.orig
+HEAD is now at 5427531 move to c
+ok 15 - mergetool keeps tempfiles when aborting delete/delete
+
+expecting success: 
+	test_when_finished "git reset --hard" &&
+	git checkout -b test$test_count branch1 &&
+	git submodule update -N &&
+	mv submod submod-movedaside &&
+	git rm --cached submod &&
+	git commit -m "Submodule deleted from branch" &&
+	git checkout -b test$test_count.a test$test_count &&
+	test_must_fail git merge master &&
+	test -n "$(git ls-files -u)" &&
+	( yes "" | git mergetool file1 file2 spaced\ name subdir/file3 >/dev/null 2>&1 ) &&
+	( yes "" | git mergetool both >/dev/null 2>&1 ) &&
+	( yes "d" | git mergetool file11 file12 >/dev/null 2>&1 ) &&
+	( yes "r" | git mergetool submod ) &&
+	rmdir submod && mv submod-movedaside submod &&
+	test "$(cat submod/bar)" = "branch1 submodule" &&
+	git submodule update -N &&
+	test "$(cat submod/bar)" = "master submodule" &&
+	output="$(git mergetool --no-prompt)" &&
+	test "$output" = "No files need merging" &&
+	git commit -m "Merge resolved by keeping module" &&
+
+	mv submod submod-movedaside &&
+	git checkout -b test$test_count.b test$test_count &&
+	git submodule update -N &&
+	test_must_fail git merge master &&
+	test -n "$(git ls-files -u)" &&
+	( yes "" | git mergetool file1 file2 spaced\ name subdir/file3 >/dev/null 2>&1 ) &&
+	( yes "" | git mergetool both >/dev/null 2>&1 ) &&
+	( yes "d" | git mergetool file11 file12 >/dev/null 2>&1 ) &&
+	( yes "l" | git mergetool submod ) &&
+	test ! -e submod &&
+	output="$(git mergetool --no-prompt)" &&
+	test "$output" = "No files need merging" &&
+	git commit -m "Merge resolved by deleting module" &&
+
+	mv submod-movedaside submod &&
+	git checkout -b test$test_count.c master &&
+	git submodule update -N &&
+	test_must_fail git merge test$test_count &&
+	test -n "$(git ls-files -u)" &&
+	( yes "" | git mergetool file1 file2 spaced\ name subdir/file3 >/dev/null 2>&1 ) &&
+	( yes "" | git mergetool both >/dev/null 2>&1 ) &&
+	( yes "d" | git mergetool file11 file12 >/dev/null 2>&1 ) &&
+	( yes "r" | git mergetool submod ) &&
+	test ! -e submod &&
+	test -d submod.orig &&
+	git submodule update -N &&
+	output="$(git mergetool --no-prompt)" &&
+	test "$output" = "No files need merging" &&
+	git commit -m "Merge resolved by deleting module" &&
+	mv submod.orig submod &&
+
+	git checkout -b test$test_count.d master &&
+	git submodule update -N &&
+	test_must_fail git merge test$test_count &&
+	test -n "$(git ls-files -u)" &&
+	( yes "" | git mergetool file1 file2 spaced\ name subdir/file3 >/dev/null 2>&1 ) &&
+	( yes "" | git mergetool both >/dev/null 2>&1 ) &&
+	( yes "d" | git mergetool file11 file12 >/dev/null 2>&1 ) &&
+	( yes "l" | git mergetool submod ) &&
+	test "$(cat submod/bar)" = "master submodule" &&
+	git submodule update -N &&
+	test "$(cat submod/bar)" = "master submodule" &&
+	output="$(git mergetool --no-prompt)" &&
+	test "$output" = "No files need merging" &&
+	git commit -m "Merge resolved by keeping module"
+
+Switched to a new branch 'test16'
+rm 'submod'
+[test16 9d65334] Submodule deleted from branch
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 deletion(-)
+ delete mode 160000 submod
+Switched to a new branch 'test16.a'
+Merging:
+9d65334 Submodule deleted from branch
+virtual master
+found 1 common ancestor:
+c4e17ff add initial versions
+CONFLICT (modify/delete): submod deleted in HEAD and modified in master. Version master of submod left in tree.
+Auto-merging subdir/file3
+CONFLICT (content): Merge conflict in subdir/file3
+Auto-merging spaced name
+CONFLICT (content): Merge conflict in spaced name
+Auto-merging file2
+CONFLICT (add/add): Merge conflict in file2
+CONFLICT (modify/delete): file12 deleted in HEAD and modified in master. Version master of file12 left in tree.
+CONFLICT (modify/delete): file11 deleted in master and modified in HEAD. Version HEAD of file11 left in tree.
+Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+Auto-merging both
+CONFLICT (add/add): Merge conflict in both
+Recorded preimage for 'both'
+Recorded preimage for 'file1'
+Recorded preimage for 'file2'
+Recorded preimage for 'spaced name'
+Recorded preimage for 'subdir/file3'
+Automatic merge failed; fix conflicts and then commit the result.
+Merging:
+submod
+
+Submodule merge conflict for 'submod':
+  {local}: deleted
+  {remote}: submodule commit 25e4b0b0c4fded0492db093dc6ef5baf77c05922
+Use (l)ocal or (r)emote, or (a)bort? Submodule path 'submod': checked out '25e4b0b0c4fded0492db093dc6ef5baf77c05922'
+Recorded resolution for 'both'.
+Recorded resolution for 'file1'.
+Recorded resolution for 'file2'.
+Recorded resolution for 'spaced name'.
+Recorded resolution for 'subdir/file3'.
+[test16.a fc92172] Merge resolved by keeping module
+ Author: A U Thor <author@example.com>
+Switched to a new branch 'test16.b'
+Merging:
+9d65334 Submodule deleted from branch
+virtual master
+found 1 common ancestor:
+c4e17ff add initial versions
+CONFLICT (modify/delete): submod deleted in HEAD and modified in master. Version master of submod left in tree.
+Auto-merging subdir/file3
+CONFLICT (content): Merge conflict in subdir/file3
+Auto-merging spaced name
+CONFLICT (content): Merge conflict in spaced name
+Auto-merging file2
+CONFLICT (add/add): Merge conflict in file2
+CONFLICT (modify/delete): file12 deleted in HEAD and modified in master. Version master of file12 left in tree.
+CONFLICT (modify/delete): file11 deleted in master and modified in HEAD. Version HEAD of file11 left in tree.
+Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+Auto-merging both
+CONFLICT (add/add): Merge conflict in both
+Resolved 'both' using previous resolution.
+Resolved 'file1' using previous resolution.
+Resolved 'file2' using previous resolution.
+Resolved 'spaced name' using previous resolution.
+Resolved 'subdir/file3' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+Merging:
+submod
+
+Submodule merge conflict for 'submod':
+  {local}: deleted
+  {remote}: submodule commit 25e4b0b0c4fded0492db093dc6ef5baf77c05922
+Use (l)ocal or (r)emote, or (a)bort? [test16.b 0d5bd9f] Merge resolved by deleting module
+ Author: A U Thor <author@example.com>
+Switched to a new branch 'test16.c'
+Merging:
+5c9be73 master updates
+virtual test16
+found 1 common ancestor:
+c4e17ff add initial versions
+CONFLICT (modify/delete): submod deleted in test16 and modified in HEAD. Version HEAD of submod left in tree at submod~HEAD.
+Auto-merging subdir/file3
+CONFLICT (content): Merge conflict in subdir/file3
+Auto-merging spaced name
+CONFLICT (content): Merge conflict in spaced name
+Auto-merging file2
+CONFLICT (add/add): Merge conflict in file2
+CONFLICT (modify/delete): file12 deleted in test16 and modified in HEAD. Version HEAD of file12 left in tree.
+CONFLICT (modify/delete): file11 deleted in HEAD and modified in test16. Version test16 of file11 left in tree.
+Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+Auto-merging both
+CONFLICT (add/add): Merge conflict in both
+Resolved 'both' using previous resolution.
+Resolved 'file1' using previous resolution.
+Resolved 'file2' using previous resolution.
+Resolved 'spaced name' using previous resolution.
+Resolved 'subdir/file3' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+Merging:
+submod
+
+Submodule merge conflict for 'submod':
+  {local}: submodule commit 25e4b0b0c4fded0492db093dc6ef5baf77c05922
+  {remote}: deleted
+Use (l)ocal or (r)emote, or (a)bort? [test16.c 4b93762] Merge resolved by deleting module
+ Author: A U Thor <author@example.com>
+Switched to a new branch 'test16.d'
+Merging:
+5c9be73 master updates
+virtual test16
+found 1 common ancestor:
+c4e17ff add initial versions
+CONFLICT (modify/delete): submod deleted in test16 and modified in HEAD. Version HEAD of submod left in tree at submod~HEAD.
+Auto-merging subdir/file3
+CONFLICT (content): Merge conflict in subdir/file3
+Auto-merging spaced name
+CONFLICT (content): Merge conflict in spaced name
+Auto-merging file2
+CONFLICT (add/add): Merge conflict in file2
+CONFLICT (modify/delete): file12 deleted in test16 and modified in HEAD. Version HEAD of file12 left in tree.
+CONFLICT (modify/delete): file11 deleted in HEAD and modified in test16. Version test16 of file11 left in tree.
+Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+Auto-merging both
+CONFLICT (add/add): Merge conflict in both
+Resolved 'both' using previous resolution.
+Resolved 'file1' using previous resolution.
+Resolved 'file2' using previous resolution.
+Resolved 'spaced name' using previous resolution.
+Resolved 'subdir/file3' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+Merging:
+submod
+
+Submodule merge conflict for 'submod':
+  {local}: submodule commit 25e4b0b0c4fded0492db093dc6ef5baf77c05922
+  {remote}: deleted
+Use (l)ocal or (r)emote, or (a)bort? [test16.d b3d7bd6] Merge resolved by keeping module
+ Author: A U Thor <author@example.com>
+HEAD is now at b3d7bd6 Merge resolved by keeping module
+ok 16 - deleted vs modified submodule
+
+expecting success: 
+	test_when_finished "git reset --hard" &&
+	git checkout -b test$test_count branch1 &&
+	git submodule update -N &&
+	mv submod submod-movedaside &&
+	git rm --cached submod &&
+	echo not a submodule >submod &&
+	git add submod &&
+	git commit -m "Submodule path becomes file" &&
+	git checkout -b test$test_count.a branch1 &&
+	test_must_fail git merge master &&
+	test -n "$(git ls-files -u)" &&
+	( yes "" | git mergetool file1 file2 spaced\ name subdir/file3 >/dev/null 2>&1 ) &&
+	( yes "" | git mergetool both >/dev/null 2>&1 ) &&
+	( yes "d" | git mergetool file11 file12 >/dev/null 2>&1 ) &&
+	( yes "r" | git mergetool submod ) &&
+	rmdir submod && mv submod-movedaside submod &&
+	test "$(cat submod/bar)" = "branch1 submodule" &&
+	git submodule update -N &&
+	test "$(cat submod/bar)" = "master submodule" &&
+	output="$(git mergetool --no-prompt)" &&
+	test "$output" = "No files need merging" &&
+	git commit -m "Merge resolved by keeping module" &&
+
+	mv submod submod-movedaside &&
+	git checkout -b test$test_count.b test$test_count &&
+	test_must_fail git merge master &&
+	test -n "$(git ls-files -u)" &&
+	( yes "" | git mergetool file1 file2 spaced\ name subdir/file3 >/dev/null 2>&1 ) &&
+	( yes "" | git mergetool both >/dev/null 2>&1 ) &&
+	( yes "d" | git mergetool file11 file12 >/dev/null 2>&1 ) &&
+	( yes "l" | git mergetool submod ) &&
+	git submodule update -N &&
+	test "$(cat submod)" = "not a submodule" &&
+	output="$(git mergetool --no-prompt)" &&
+	test "$output" = "No files need merging" &&
+	git commit -m "Merge resolved by keeping file" &&
+
+	git checkout -b test$test_count.c master &&
+	rmdir submod && mv submod-movedaside submod &&
+	test ! -e submod.orig &&
+	git submodule update -N &&
+	test_must_fail git merge test$test_count &&
+	test -n "$(git ls-files -u)" &&
+	( yes "" | git mergetool file1 file2 spaced\ name subdir/file3 >/dev/null 2>&1 ) &&
+	( yes "" | git mergetool both >/dev/null 2>&1 ) &&
+	( yes "d" | git mergetool file11 file12 >/dev/null 2>&1 ) &&
+	( yes "r" | git mergetool submod ) &&
+	test -d submod.orig &&
+	git submodule update -N &&
+	test "$(cat submod)" = "not a submodule" &&
+	output="$(git mergetool --no-prompt)" &&
+	test "$output" = "No files need merging" &&
+	git commit -m "Merge resolved by keeping file" &&
+
+	git checkout -b test$test_count.d master &&
+	rmdir submod && mv submod.orig submod &&
+	git submodule update -N &&
+	test_must_fail git merge test$test_count &&
+	test -n "$(git ls-files -u)" &&
+	( yes "" | git mergetool file1 file2 spaced\ name subdir/file3 >/dev/null 2>&1 ) &&
+	( yes "" | git mergetool both>/dev/null 2>&1 ) &&
+	( yes "d" | git mergetool file11 file12 >/dev/null 2>&1 ) &&
+	( yes "l" | git mergetool submod ) &&
+	test "$(cat submod/bar)" = "master submodule" &&
+	git submodule update -N &&
+	test "$(cat submod/bar)" = "master submodule" &&
+	output="$(git mergetool --no-prompt)" &&
+	test "$output" = "No files need merging" &&
+	git commit -m "Merge resolved by keeping module"
+
+Switched to a new branch 'test17'
+M	submod
+Submodule path 'submod': checked out '03b68353219fdf835e23c740e11254c10dc68d32'
+rm 'submod'
+[test17 5f748ae] Submodule path becomes file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ mode change 160000 => 100644 submod
+Switched to a new branch 'test17.a'
+Merging:
+2ed2aee branch1 changes
+virtual master
+found 1 common ancestor:
+c4e17ff add initial versions
+Failed to merge submodule submod (not checked out)
+Auto-merging submod
+CONFLICT (submodule): Merge conflict in submod
+Auto-merging subdir/file3
+CONFLICT (content): Merge conflict in subdir/file3
+Auto-merging spaced name
+CONFLICT (content): Merge conflict in spaced name
+Auto-merging file2
+CONFLICT (add/add): Merge conflict in file2
+CONFLICT (modify/delete): file12 deleted in HEAD and modified in master. Version master of file12 left in tree.
+CONFLICT (modify/delete): file11 deleted in master and modified in HEAD. Version HEAD of file11 left in tree.
+Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+Auto-merging both
+CONFLICT (add/add): Merge conflict in both
+Resolved 'both' using previous resolution.
+Resolved 'file1' using previous resolution.
+Resolved 'file2' using previous resolution.
+Resolved 'spaced name' using previous resolution.
+Resolved 'subdir/file3' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+Merging:
+submod
+
+Submodule merge conflict for 'submod':
+  {local}: submodule commit 03b68353219fdf835e23c740e11254c10dc68d32
+  {remote}: submodule commit 25e4b0b0c4fded0492db093dc6ef5baf77c05922
+Use (l)ocal or (r)emote, or (a)bort? Submodule path 'submod': checked out '25e4b0b0c4fded0492db093dc6ef5baf77c05922'
+[test17.a 820665a] Merge resolved by keeping module
+ Author: A U Thor <author@example.com>
+Switched to a new branch 'test17.b'
+Merging:
+5f748ae Submodule path becomes file
+virtual master
+found 1 common ancestor:
+c4e17ff add initial versions
+CONFLICT (content): Merge conflict in submod
+Auto-merging subdir/file3
+CONFLICT (content): Merge conflict in subdir/file3
+Auto-merging spaced name
+CONFLICT (content): Merge conflict in spaced name
+Auto-merging file2
+CONFLICT (add/add): Merge conflict in file2
+CONFLICT (modify/delete): file12 deleted in HEAD and modified in master. Version master of file12 left in tree.
+CONFLICT (modify/delete): file11 deleted in master and modified in HEAD. Version HEAD of file11 left in tree.
+Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+Auto-merging both
+CONFLICT (add/add): Merge conflict in both
+Resolved 'both' using previous resolution.
+Resolved 'file1' using previous resolution.
+Resolved 'file2' using previous resolution.
+Resolved 'spaced name' using previous resolution.
+Resolved 'subdir/file3' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+Merging:
+submod
+
+Submodule merge conflict for 'submod':
+  {local}: modified file
+  {remote}: submodule commit 25e4b0b0c4fded0492db093dc6ef5baf77c05922
+Use (l)ocal or (r)emote, or (a)bort? [test17.b b4100f7] Merge resolved by keeping file
+ Author: A U Thor <author@example.com>
+Switched to a new branch 'test17.c'
+error: failed to create path 'submod': perhaps a D/F conflict?
+Merging:
+5c9be73 master updates
+virtual test17
+found 1 common ancestor:
+c4e17ff add initial versions
+CONFLICT (content): Merge conflict in submod
+Auto-merging subdir/file3
+CONFLICT (content): Merge conflict in subdir/file3
+Auto-merging spaced name
+CONFLICT (content): Merge conflict in spaced name
+Auto-merging file2
+CONFLICT (add/add): Merge conflict in file2
+CONFLICT (modify/delete): file12 deleted in test17 and modified in HEAD. Version HEAD of file12 left in tree.
+CONFLICT (modify/delete): file11 deleted in HEAD and modified in test17. Version test17 of file11 left in tree.
+Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+Auto-merging both
+CONFLICT (add/add): Merge conflict in both
+Resolved 'both' using previous resolution.
+Resolved 'file1' using previous resolution.
+Resolved 'file2' using previous resolution.
+Resolved 'spaced name' using previous resolution.
+Resolved 'subdir/file3' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+Merging:
+submod
+
+Submodule merge conflict for 'submod':
+  {local}: submodule commit 25e4b0b0c4fded0492db093dc6ef5baf77c05922
+  {remote}: modified file
+Use (l)ocal or (r)emote, or (a)bort? [test17.c e7bdca3] Merge resolved by keeping file
+ Author: A U Thor <author@example.com>
+Switched to a new branch 'test17.d'
+error: failed to create path 'submod': perhaps a D/F conflict?
+Merging:
+5c9be73 master updates
+virtual test17
+found 1 common ancestor:
+c4e17ff add initial versions
+CONFLICT (content): Merge conflict in submod
+Auto-merging subdir/file3
+CONFLICT (content): Merge conflict in subdir/file3
+Auto-merging spaced name
+CONFLICT (content): Merge conflict in spaced name
+Auto-merging file2
+CONFLICT (add/add): Merge conflict in file2
+CONFLICT (modify/delete): file12 deleted in test17 and modified in HEAD. Version HEAD of file12 left in tree.
+CONFLICT (modify/delete): file11 deleted in HEAD and modified in test17. Version test17 of file11 left in tree.
+Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+Auto-merging both
+CONFLICT (add/add): Merge conflict in both
+Resolved 'both' using previous resolution.
+Resolved 'file1' using previous resolution.
+Resolved 'file2' using previous resolution.
+Resolved 'spaced name' using previous resolution.
+Resolved 'subdir/file3' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+Merging:
+submod
+
+Submodule merge conflict for 'submod':
+  {local}: submodule commit 25e4b0b0c4fded0492db093dc6ef5baf77c05922
+  {remote}: modified file
+Use (l)ocal or (r)emote, or (a)bort? [test17.d 30c2b75] Merge resolved by keeping module
+ Author: A U Thor <author@example.com>
+HEAD is now at 30c2b75 Merge resolved by keeping module
+ok 17 - file vs modified submodule
+
+expecting success: 
+	test_when_finished "git reset --hard" &&
+	git checkout -b test$test_count branch1 &&
+	git submodule update -N &&
+	(
+		cd subdir &&
+		test_create_repo subdir_module &&
+		(
+		cd subdir_module &&
+		: >file15 &&
+		git add file15 &&
+		git commit -m "add initial versions"
+		)
+	) &&
+	test_when_finished "rm -rf subdir/subdir_module" &&
+	git submodule add git://example.com/subsubmodule subdir/subdir_module &&
+	git add subdir/subdir_module &&
+	git commit -m "add submodule in subdirectory" &&
+
+	git checkout -b test$test_count.a test$test_count &&
+	git submodule update -N &&
+	(
+	cd subdir/subdir_module &&
+		git checkout -b super10.a &&
+		echo test$test_count.a >file15 &&
+		git add file15 &&
+		git commit -m "on branch 10.a"
+	) &&
+	git add subdir/subdir_module &&
+	git commit -m "change submodule in subdirectory on test$test_count.a" &&
+
+	git checkout -b test$test_count.b test$test_count &&
+	git submodule update -N &&
+	(
+		cd subdir/subdir_module &&
+		git checkout -b super10.b &&
+		echo test$test_count.b >file15 &&
+		git add file15 &&
+		git commit -m "on branch 10.b"
+	) &&
+	git add subdir/subdir_module &&
+	git commit -m "change submodule in subdirectory on test$test_count.b" &&
+
+	test_must_fail git merge test$test_count.a >/dev/null 2>&1 &&
+	(
+		cd subdir &&
+		( yes "l" | git mergetool subdir_module )
+	) &&
+	test "$(cat subdir/subdir_module/file15)" = "test$test_count.b" &&
+	git submodule update -N &&
+	test "$(cat subdir/subdir_module/file15)" = "test$test_count.b" &&
+	git reset --hard &&
+	git submodule update -N &&
+
+	test_must_fail git merge test$test_count.a >/dev/null 2>&1 &&
+	( yes "r" | git mergetool subdir/subdir_module ) &&
+	test "$(cat subdir/subdir_module/file15)" = "test$test_count.b" &&
+	git submodule update -N &&
+	test "$(cat subdir/subdir_module/file15)" = "test$test_count.a" &&
+	git commit -m "branch1 resolved with mergetool"
+
+Switched to a new branch 'test18'
+M	submod
+Submodule path 'submod': checked out '03b68353219fdf835e23c740e11254c10dc68d32'
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7610-mergetool/subdir/subdir_module/.git/
+[master (root-commit) 4ae2fa7] add initial versions
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 file15
+Adding existing repo at 'subdir/subdir_module' to the index
+[test18 0d08ec7] add submodule in subdirectory
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 160000 subdir/subdir_module
+Switched to a new branch 'test18.a'
+Switched to a new branch 'super10.a'
+[super10.a aa5b362] on branch 10.a
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[test18.a cd54179] change submodule in subdirectory on test18.a
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'test18.b'
+M	subdir/subdir_module
+Submodule path 'subdir/subdir_module': checked out '4ae2fa730d059d427d44e743a08579aab4f24550'
+Switched to a new branch 'super10.b'
+[super10.b edd116a] on branch 10.b
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[test18.b 3e0309d] change submodule in subdirectory on test18.b
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Merging:
+subdir/subdir_module
+
+Submodule merge conflict for 'subdir/subdir_module':
+  {local}: submodule commit edd116a0546763caa39019b3aa665267690dab80
+  {remote}: submodule commit aa5b36237d70cd1434bd2ed88bc71c58fa238a3c
+Use (l)ocal or (r)emote, or (a)bort? HEAD is now at 3e0309d change submodule in subdirectory on test18.b
+Merging:
+subdir/subdir_module
+
+Submodule merge conflict for 'subdir/subdir_module':
+  {local}: submodule commit edd116a0546763caa39019b3aa665267690dab80
+  {remote}: submodule commit aa5b36237d70cd1434bd2ed88bc71c58fa238a3c
+Use (l)ocal or (r)emote, or (a)bort? Submodule path 'subdir/subdir_module': checked out 'aa5b36237d70cd1434bd2ed88bc71c58fa238a3c'
+[test18.b d62558a] branch1 resolved with mergetool
+ Author: A U Thor <author@example.com>
+HEAD is now at d62558a branch1 resolved with mergetool
+ok 18 - submodule in subdirectory
+
+expecting success: 
+	test_when_finished "git reset --hard" &&
+	git checkout -b test$test_count branch1 &&
+	mv submod submod-movedaside &&
+	git rm --cached submod &&
+	mkdir submod &&
+	echo not a submodule >submod/file16 &&
+	git add submod/file16 &&
+	git commit -m "Submodule path becomes directory" &&
+
+	test_must_fail git merge master &&
+	test -n "$(git ls-files -u)" &&
+	( yes "l" | git mergetool submod ) &&
+	test "$(cat submod/file16)" = "not a submodule" &&
+	rm -rf submod.orig &&
+
+	git reset --hard &&
+	test_must_fail git merge master &&
+	test -n "$(git ls-files -u)" &&
+	test ! -e submod.orig &&
+	( yes "r" | git mergetool submod ) &&
+	test -d submod.orig &&
+	test "$(cat submod.orig/file16)" = "not a submodule" &&
+	rm -r submod.orig &&
+	mv submod-movedaside/.git submod &&
+	( cd submod && git clean -f && git reset --hard ) &&
+	git submodule update -N &&
+	test "$(cat submod/bar)" = "master submodule" &&
+	git reset --hard &&
+	rm -rf submod-movedaside &&
+
+	git checkout -b test$test_count.c master &&
+	git submodule update -N &&
+	test_must_fail git merge test$test_count &&
+	test -n "$(git ls-files -u)" &&
+	( yes "l" | git mergetool submod ) &&
+	git submodule update -N &&
+	test "$(cat submod/bar)" = "master submodule" &&
+
+	git reset --hard &&
+	git submodule update -N &&
+	test_must_fail git merge test$test_count &&
+	test -n "$(git ls-files -u)" &&
+	test ! -e submod.orig &&
+	( yes "r" | git mergetool submod ) &&
+	test "$(cat submod/file16)" = "not a submodule" &&
+
+	git reset --hard master &&
+	( cd submod && git clean -f && git reset --hard ) &&
+	git submodule update -N
+
+Switched to a new branch 'test19'
+rm 'submod'
+[test19 fe11ea9] Submodule path becomes directory
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+), 1 deletion(-)
+ delete mode 160000 submod
+ create mode 100644 submod/file16
+Merging:
+fe11ea9 Submodule path becomes directory
+virtual master
+found 1 common ancestor:
+c4e17ff add initial versions
+Adding submod/file16
+CONFLICT (modify/delete): submod deleted in HEAD and modified in master. Version master of submod left in tree at submod~master.
+Auto-merging subdir/file3
+CONFLICT (content): Merge conflict in subdir/file3
+Auto-merging spaced name
+CONFLICT (content): Merge conflict in spaced name
+Auto-merging file2
+CONFLICT (add/add): Merge conflict in file2
+CONFLICT (modify/delete): file12 deleted in HEAD and modified in master. Version master of file12 left in tree.
+CONFLICT (modify/delete): file11 deleted in master and modified in HEAD. Version HEAD of file11 left in tree.
+Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+Auto-merging both
+CONFLICT (add/add): Merge conflict in both
+Resolved 'both' using previous resolution.
+Resolved 'file1' using previous resolution.
+Resolved 'file2' using previous resolution.
+Resolved 'spaced name' using previous resolution.
+Resolved 'subdir/file3' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+Merging:
+submod
+
+Submodule merge conflict for 'submod':
+  {local}: deleted
+  {remote}: submodule commit 25e4b0b0c4fded0492db093dc6ef5baf77c05922
+Use (l)ocal or (r)emote, or (a)bort? warning: unable to rmdir 'submod': Directory not empty
+HEAD is now at fe11ea9 Submodule path becomes directory
+Merging:
+fe11ea9 Submodule path becomes directory
+virtual master
+found 1 common ancestor:
+c4e17ff add initial versions
+Adding submod/file16
+CONFLICT (modify/delete): submod deleted in HEAD and modified in master. Version master of submod left in tree at submod~master.
+Auto-merging subdir/file3
+CONFLICT (content): Merge conflict in subdir/file3
+Auto-merging spaced name
+CONFLICT (content): Merge conflict in spaced name
+Auto-merging file2
+CONFLICT (add/add): Merge conflict in file2
+CONFLICT (modify/delete): file12 deleted in HEAD and modified in master. Version master of file12 left in tree.
+CONFLICT (modify/delete): file11 deleted in master and modified in HEAD. Version HEAD of file11 left in tree.
+Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+Auto-merging both
+CONFLICT (add/add): Merge conflict in both
+Resolved 'both' using previous resolution.
+Resolved 'file1' using previous resolution.
+Resolved 'file2' using previous resolution.
+Resolved 'spaced name' using previous resolution.
+Resolved 'subdir/file3' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+Merging:
+submod
+
+Submodule merge conflict for 'submod':
+  {local}: deleted
+  {remote}: submodule commit 25e4b0b0c4fded0492db093dc6ef5baf77c05922
+Use (l)ocal or (r)emote, or (a)bort? HEAD is now at 03b6835 Add bar on branch1
+Submodule path 'submod': checked out '25e4b0b0c4fded0492db093dc6ef5baf77c05922'
+warning: unable to rmdir 'submod': Directory not empty
+HEAD is now at fe11ea9 Submodule path becomes directory
+Switched to a new branch 'test19.c'
+Merging:
+5c9be73 master updates
+virtual test19
+found 1 common ancestor:
+c4e17ff add initial versions
+Adding submod/file16
+CONFLICT (modify/delete): submod deleted in test19 and modified in HEAD. Version HEAD of submod left in tree at submod~HEAD.
+Auto-merging subdir/file3
+CONFLICT (content): Merge conflict in subdir/file3
+Auto-merging spaced name
+CONFLICT (content): Merge conflict in spaced name
+Auto-merging file2
+CONFLICT (add/add): Merge conflict in file2
+CONFLICT (modify/delete): file12 deleted in test19 and modified in HEAD. Version HEAD of file12 left in tree.
+CONFLICT (modify/delete): file11 deleted in HEAD and modified in test19. Version test19 of file11 left in tree.
+Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+Auto-merging both
+CONFLICT (add/add): Merge conflict in both
+Resolved 'both' using previous resolution.
+Resolved 'file1' using previous resolution.
+Resolved 'file2' using previous resolution.
+Resolved 'spaced name' using previous resolution.
+Resolved 'subdir/file3' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+Merging:
+submod
+
+Submodule merge conflict for 'submod':
+  {local}: submodule commit 25e4b0b0c4fded0492db093dc6ef5baf77c05922
+  {remote}: deleted
+Use (l)ocal or (r)emote, or (a)bort? HEAD is now at 5c9be73 master updates
+error: refusing to lose untracked file at 'submod/file16'
+Merging:
+5c9be73 master updates
+virtual test19
+found 1 common ancestor:
+c4e17ff add initial versions
+Adding submod/file16
+CONFLICT (modify/delete): submod deleted in test19 and modified in HEAD. Version HEAD of submod left in tree at submod~HEAD.
+Auto-merging subdir/file3
+CONFLICT (content): Merge conflict in subdir/file3
+Auto-merging spaced name
+CONFLICT (content): Merge conflict in spaced name
+Auto-merging file2
+CONFLICT (add/add): Merge conflict in file2
+CONFLICT (modify/delete): file12 deleted in test19 and modified in HEAD. Version HEAD of file12 left in tree.
+CONFLICT (modify/delete): file11 deleted in HEAD and modified in test19. Version test19 of file11 left in tree.
+Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+Auto-merging both
+CONFLICT (add/add): Merge conflict in both
+Resolved 'both' using previous resolution.
+Resolved 'file1' using previous resolution.
+Resolved 'file2' using previous resolution.
+Resolved 'spaced name' using previous resolution.
+Resolved 'subdir/file3' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+Merging:
+submod
+
+Submodule merge conflict for 'submod':
+  {local}: submodule commit 25e4b0b0c4fded0492db093dc6ef5baf77c05922
+  {remote}: deleted
+Use (l)ocal or (r)emote, or (a)bort? HEAD is now at 5c9be73 master updates
+HEAD is now at 25e4b0b Add bar on master
+HEAD is now at 5c9be73 master updates
+ok 19 - directory vs modified submodule
+
+expecting success: 
+	test_when_finished "git reset --hard" &&
+	git checkout -b test$test_count branch1 &&
+	test_must_fail git merge master &&
+	git mergetool --no-prompt --tool mybase -- both &&
+	test_must_be_empty both
+
+Switched to a new branch 'test20'
+M	submod
+Merging:
+2ed2aee branch1 changes
+virtual master
+found 1 common ancestor:
+c4e17ff add initial versions
+Failed to merge submodule submod (merge following commits not found)
+Auto-merging submod
+CONFLICT (submodule): Merge conflict in submod
+Auto-merging subdir/file3
+CONFLICT (content): Merge conflict in subdir/file3
+Auto-merging spaced name
+CONFLICT (content): Merge conflict in spaced name
+Auto-merging file2
+CONFLICT (add/add): Merge conflict in file2
+CONFLICT (modify/delete): file12 deleted in HEAD and modified in master. Version master of file12 left in tree.
+CONFLICT (modify/delete): file11 deleted in master and modified in HEAD. Version HEAD of file11 left in tree.
+Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+Auto-merging both
+CONFLICT (add/add): Merge conflict in both
+Resolved 'both' using previous resolution.
+Resolved 'file1' using previous resolution.
+Resolved 'file2' using previous resolution.
+Resolved 'spaced name' using previous resolution.
+Resolved 'subdir/file3' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+Merging:
+both
+
+Normal merge conflict for 'both':
+  {local}: created file
+  {remote}: created file
+HEAD is now at 2ed2aee branch1 changes
+ok 20 - file with no base
+
+expecting success: 
+	test_when_finished "git reset --hard" &&
+	git checkout -b test$test_count branch1 &&
+	test_config mergetool.defaults.cmd "cat \"\$REMOTE\" >\"\$MERGED\"" &&
+	test_config mergetool.defaults.trustExitCode true &&
+	test_must_fail git merge master &&
+	git mergetool --no-prompt --tool defaults -- both &&
+	echo master both added >expected &&
+	test_cmp expected both
+
+Switched to a new branch 'test21'
+M	submod
+Merging:
+2ed2aee branch1 changes
+virtual master
+found 1 common ancestor:
+c4e17ff add initial versions
+Failed to merge submodule submod (merge following commits not found)
+Auto-merging submod
+CONFLICT (submodule): Merge conflict in submod
+Auto-merging subdir/file3
+CONFLICT (content): Merge conflict in subdir/file3
+Auto-merging spaced name
+CONFLICT (content): Merge conflict in spaced name
+Auto-merging file2
+CONFLICT (add/add): Merge conflict in file2
+CONFLICT (modify/delete): file12 deleted in HEAD and modified in master. Version master of file12 left in tree.
+CONFLICT (modify/delete): file11 deleted in master and modified in HEAD. Version HEAD of file11 left in tree.
+Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+Auto-merging both
+CONFLICT (add/add): Merge conflict in both
+Resolved 'both' using previous resolution.
+Resolved 'file1' using previous resolution.
+Resolved 'file2' using previous resolution.
+Resolved 'spaced name' using previous resolution.
+Resolved 'subdir/file3' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+Merging:
+both
+
+Normal merge conflict for 'both':
+  {local}: created file
+  {remote}: created file
+HEAD is now at 2ed2aee branch1 changes
+ok 21 - custom commands override built-ins
+
+expecting success: 
+	test_when_finished "git reset --hard" &&
+	git checkout -b test$test_count branch1 &&
+	test_config mergetool.writeToTemp false &&
+	test_config mergetool.myecho.cmd "echo \"\$LOCAL\"" &&
+	test_config mergetool.myecho.trustExitCode true &&
+	test_must_fail git merge master &&
+	git mergetool --no-prompt --tool myecho -- both >actual &&
+	grep ^\./both_LOCAL_ actual >/dev/null
+
+Switched to a new branch 'test22'
+M	submod
+Merging:
+2ed2aee branch1 changes
+virtual master
+found 1 common ancestor:
+c4e17ff add initial versions
+Failed to merge submodule submod (merge following commits not found)
+Auto-merging submod
+CONFLICT (submodule): Merge conflict in submod
+Auto-merging subdir/file3
+CONFLICT (content): Merge conflict in subdir/file3
+Auto-merging spaced name
+CONFLICT (content): Merge conflict in spaced name
+Auto-merging file2
+CONFLICT (add/add): Merge conflict in file2
+CONFLICT (modify/delete): file12 deleted in HEAD and modified in master. Version master of file12 left in tree.
+CONFLICT (modify/delete): file11 deleted in master and modified in HEAD. Version HEAD of file11 left in tree.
+Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+Auto-merging both
+CONFLICT (add/add): Merge conflict in both
+Resolved 'both' using previous resolution.
+Resolved 'file1' using previous resolution.
+Resolved 'file2' using previous resolution.
+Resolved 'spaced name' using previous resolution.
+Resolved 'subdir/file3' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+HEAD is now at 2ed2aee branch1 changes
+ok 22 - filenames seen by tools start with ./
+
+checking prerequisite: MKTEMP
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
+	tempdir=$(mktemp -d -t foo.XXXXXX) &&
+	test -d "$tempdir" &&
+	rmdir "$tempdir"
+
+)
+prerequisite MKTEMP ok
+expecting success: 
+	test_when_finished "git reset --hard" &&
+	git checkout -b test$test_count branch1 &&
+	test_config mergetool.writeToTemp true &&
+	test_config mergetool.myecho.cmd "echo \"\$LOCAL\"" &&
+	test_config mergetool.myecho.trustExitCode true &&
+	test_must_fail git merge master &&
+	git mergetool --no-prompt --tool myecho -- both >actual &&
+	! grep ^\./both_LOCAL_ actual >/dev/null &&
+	grep /both_LOCAL_ actual >/dev/null
+
+Switched to a new branch 'test23'
+M	submod
+Merging:
+2ed2aee branch1 changes
+virtual master
+found 1 common ancestor:
+c4e17ff add initial versions
+Failed to merge submodule submod (merge following commits not found)
+Auto-merging submod
+CONFLICT (submodule): Merge conflict in submod
+Auto-merging subdir/file3
+CONFLICT (content): Merge conflict in subdir/file3
+Auto-merging spaced name
+CONFLICT (content): Merge conflict in spaced name
+Auto-merging file2
+CONFLICT (add/add): Merge conflict in file2
+CONFLICT (modify/delete): file12 deleted in HEAD and modified in master. Version master of file12 left in tree.
+CONFLICT (modify/delete): file11 deleted in master and modified in HEAD. Version HEAD of file11 left in tree.
+Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+Auto-merging both
+CONFLICT (add/add): Merge conflict in both
+Resolved 'both' using previous resolution.
+Resolved 'file1' using previous resolution.
+Resolved 'file2' using previous resolution.
+Resolved 'spaced name' using previous resolution.
+Resolved 'subdir/file3' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+HEAD is now at 2ed2aee branch1 changes
+ok 23 - temporary filenames are used with mergetool.writeToTemp
+
+expecting success: 
+	test_when_finished "git reset --hard" &&
+	git checkout -b test$test_count order-file-side2 &&
+	test_config diff.orderFile order-file &&
+	test_config mergetool.myecho.cmd "echo \"\$LOCAL\"" &&
+	test_config mergetool.myecho.trustExitCode true &&
+	echo b >order-file &&
+	echo a >>order-file &&
+	test_must_fail git merge order-file-side1 &&
+	cat >expect <<-\EOF &&
+		Merging:
+		b
+		a
+	EOF
+
+	# make sure "order-file" that is ambiguous between
+	# rev and path is understood correctly.
+	git branch order-file HEAD &&
+
+	git mergetool --no-prompt --tool myecho >output &&
+	git grep --no-index -h -A2 Merging: output >actual &&
+	test_cmp expect actual
+
+Switched to a new branch 'test24'
+Merging:
+a7a2b49 side2
+virtual order-file-side1
+found 1 common ancestor:
+0c14618 start
+Auto-merging b
+CONFLICT (content): Merge conflict in b
+Auto-merging a
+CONFLICT (content): Merge conflict in a
+Recorded preimage for 'a'
+Recorded preimage for 'b'
+Automatic merge failed; fix conflicts and then commit the result.
+HEAD is now at a7a2b49 side2
+ok 24 - diff.orderFile configuration is honored
+
+expecting success: 
+	test_when_finished "git reset --hard" &&
+	git checkout -b test$test_count order-file-side2 &&
+	test_config diff.orderFile order-file &&
+	test_config mergetool.myecho.cmd "echo \"\$LOCAL\"" &&
+	test_config mergetool.myecho.trustExitCode true &&
+	echo b >order-file &&
+	echo a >>order-file &&
+	test_must_fail git merge order-file-side1 &&
+	cat >expect <<-\EOF &&
+		Merging:
+		a
+		b
+	EOF
+	git mergetool -O/dev/null --no-prompt --tool myecho >output &&
+	git grep --no-index -h -A2 Merging: output >actual &&
+	test_cmp expect actual &&
+	git reset --hard &&
+
+	git config --unset diff.orderFile &&
+	test_must_fail git merge order-file-side1 &&
+	cat >expect <<-\EOF &&
+		Merging:
+		b
+		a
+	EOF
+	git mergetool -Oorder-file --no-prompt --tool myecho >output &&
+	git grep --no-index -h -A2 Merging: output >actual &&
+	test_cmp expect actual
+
+Switched to a new branch 'test25'
+Merging:
+a7a2b49 side2
+virtual order-file-side1
+found 1 common ancestor:
+0c14618 start
+Auto-merging b
+CONFLICT (content): Merge conflict in b
+Auto-merging a
+CONFLICT (content): Merge conflict in a
+Recorded preimage for 'a'
+Recorded preimage for 'b'
+Automatic merge failed; fix conflicts and then commit the result.
+HEAD is now at a7a2b49 side2
+Merging:
+a7a2b49 side2
+virtual order-file-side1
+found 1 common ancestor:
+0c14618 start
+Auto-merging b
+CONFLICT (content): Merge conflict in b
+Auto-merging a
+CONFLICT (content): Merge conflict in a
+Recorded preimage for 'a'
+Recorded preimage for 'b'
+Automatic merge failed; fix conflicts and then commit the result.
+HEAD is now at a7a2b49 side2
+ok 25 - mergetool -Oorder-file is honored
+
+# passed all 25 test(s)
+1..25
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
 *** t9601-cvsimport-vendor-branch.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9601-cvsimport-vendor-branch/.git/
 expecting success: 
@@ -334524,7 +334785,7 @@
 
 
 --- module-cvs-master/imported-twice.txt	2004-02-09 15:43:13.000000000 +0000
-+++ module-git/imported-twice.txt	2021-12-03 05:11:20.129128474 +0000
++++ module-git/imported-twice.txt	2023-01-05 11:51:39.106868030 +0000
 @@ -1 +1 @@
 -This is vtag-2 (on vbranchA) of imported-twice.txt.
 +This is vtag-1 (on vbranchA) of imported-twice.txt.
@@ -334563,6 +334824,364 @@
 1..9
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
+*** t9603-cvsimport-patchsets.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9603-cvsimport-patchsets/.git/
+checking known breakage: 
+
+    git cvsimport -p"-x" -C module-git module &&
+    (cd module-git &&
+        git log --pretty=format:%s > ../actual-master &&
+        git log A~2..A --pretty="format:%s %ad" -- > ../actual-A &&
+        echo "" >> ../actual-master &&
+	echo "" >> ../actual-A
+    ) &&
+    echo "Rev 4
+Rev 3
+Rev 2
+Rev 1" > expect-master &&
+    test_cmp expect-master actual-master &&
+
+    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/git-2.20.1/t/trash directory.t9603-cvsimport-patchsets/module-git/.git/
+--- expect-master	2023-01-05 11:51:41.566868030 +0000
++++ actual-master	2023-01-05 11:51:41.562868030 +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/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t9600-cvsimport.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9600-cvsimport/.git/
+checking prerequisite: NOT_ROOT
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
+	uid=$(id -u) &&
+	test "$uid" != 0
+
+)
+prerequisite NOT_ROOT ok
+expecting success: 
+	CVSROOT=$(pwd)/cvsroot &&
+	export CVSROOT
+
+ok 1 - setup cvsroot environment
+
+expecting success: $CVS init
+ok 2 - setup cvsroot
+
+expecting success: 
+
+	mkdir "$CVSROOT/module" &&
+	$CVS co -d module-cvs module &&
+	(cd module-cvs &&
+	cat <<EOF >o_fortuna &&
+O Fortuna
+velut luna
+statu variabilis,
+
+semper crescis
+aut decrescis;
+vita detestabilis
+
+nunc obdurat
+et tunc curat
+ludo mentis aciem,
+
+egestatem,
+potestatem
+dissolvit ut glaciem.
+EOF
+	$CVS add o_fortuna &&
+	cat <<EOF >message &&
+add "O Fortuna" lyrics
+
+These public domain lyrics make an excellent sample text.
+EOF
+	$CVS commit -F message
+	)
+
+cvs checkout: Updating module-cvs
+cvs add: scheduling file `o_fortuna' for addition
+cvs add: use `cvs commit' to add this file permanently
+cvs commit: Examining .
+/build/git-2.20.1/t/trash directory.t9600-cvsimport/cvsroot/module/o_fortuna,v  <--  o_fortuna
+initial revision: 1.1
+ok 3 - setup a cvs module
+
+expecting success: 
+
+	git cvsimport -a -R -z 0 -C module-git module &&
+	test_cmp module-cvs/o_fortuna module-git/o_fortuna
+
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9600-cvsimport/module-git/.git/
+ok 4 - import a trivial module
+
+expecting success: (cd module-git && git gc)
+ok 5 - pack refs
+
+expecting success: 
+
+	(cd module-git &&
+	 git log --format="o_fortuna 1.1 %H" -1) > expected &&
+	test_cmp expected module-git/.git/cvs-revisions
+
+ok 6 - initial import has correct .git/cvs-revisions
+
+expecting success: 
+	(cd module-cvs &&
+	cat <<EOF >o_fortuna &&
+O Fortune,
+like the moon
+you are changeable,
+
+ever waxing
+and waning;
+hateful life
+
+first oppresses
+and then soothes
+as fancy takes it;
+
+poverty
+and power
+it melts them like ice.
+EOF
+	cat <<EOF >message &&
+translate to English
+
+My Latin is terrible.
+EOF
+	$CVS commit -F message
+	)
+
+cvs commit: Examining .
+/build/git-2.20.1/t/trash directory.t9600-cvsimport/cvsroot/module/o_fortuna,v  <--  o_fortuna
+new revision: 1.2; previous revision: 1.1
+ok 7 - update cvs module
+
+expecting success: 
+
+	(cd module-git &&
+	git config cvsimport.trackRevisions true &&
+	git cvsimport -a -z 0 module &&
+	git merge origin
+	) &&
+	test_cmp module-cvs/o_fortuna module-git/o_fortuna
+
+
+Updating a80553d..352faf3
+Fast-forward (no commit created; -m option ignored)
+ o_fortuna | 24 ++++++++++++------------
+ 1 file changed, 12 insertions(+), 12 deletions(-)
+Already up to date.
+ok 8 - update git module
+
+expecting success: 
+
+	(cd module-git &&
+	 git log --format="o_fortuna 1.1 %H" -1 HEAD^ &&
+	 git log --format="o_fortuna 1.2 %H" -1 HEAD) > expected &&
+	test_cmp expected module-git/.git/cvs-revisions
+
+ok 9 - update has correct .git/cvs-revisions
+
+expecting success: 
+
+	(cd module-cvs &&
+		echo 1 >tick &&
+		$CVS add tick &&
+		$CVS commit -m 1
+	)
+
+cvs add: scheduling file `tick' for addition
+cvs add: use `cvs commit' to add this file permanently
+cvs commit: Examining .
+/build/git-2.20.1/t/trash directory.t9600-cvsimport/cvsroot/module/tick,v  <--  tick
+initial revision: 1.1
+ok 10 - update cvs module
+
+expecting success: 
+
+	(cd module-git &&
+		git config cvsimport.module module &&
+		git config cvsimport.trackRevisions true &&
+		git cvsimport -a -z0 &&
+		git merge origin
+	) &&
+	test_cmp module-cvs/tick module-git/tick
+
+
+Updating 352faf3..37b3cc5
+Fast-forward (no commit created; -m option ignored)
+ tick | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 tick
+Already up to date.
+ok 11 - cvsimport.module config works
+
+expecting success: 
+
+	(cd module-git &&
+	 git log --format="o_fortuna 1.1 %H" -1 HEAD^^ &&
+	 git log --format="o_fortuna 1.2 %H" -1 HEAD^ &&
+	 git log --format="tick 1.1 %H" -1 HEAD) > expected &&
+	test_cmp expected module-git/.git/cvs-revisions
+
+ok 12 - second update has correct .git/cvs-revisions
+
+expecting success: 
+
+	$CVS co -d import-from-wt module &&
+	(cd import-from-wt &&
+		git config cvsimport.trackRevisions false &&
+		git cvsimport -a -z0 &&
+		echo 1 >expect &&
+		git log -1 --pretty=format:%s%n >actual &&
+		test_cmp expect actual
+	)
+
+
+cvs checkout: Updating import-from-wt
+U import-from-wt/o_fortuna
+U import-from-wt/tick
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9600-cvsimport/import-from-wt/.git/
+ok 13 - import from a CVS working tree
+
+expecting success: 
+
+	! test -e import-from-wt/.git/cvs-revisions
+
+
+ok 14 - no .git/cvs-revisions created by default
+
+expecting success: test_cmp_branch_tree master
+cvs checkout: Updating module-cvs-master
+U module-cvs-master/o_fortuna
+U module-cvs-master/tick
+Already on 'master'
+ok 15 - test entire HEAD
+
+# passed all 15 test(s)
+1..15
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t9700-perl-git.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9700-perl-git/.git/
+expecting success: 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) 3eae35a] 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 380449a] commit in directory2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 directory2/file2
+[master 296b953] second commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 1 - set up test repository
+
+# run 1: Perl API (perl /build/git-2.20.1/t/t9700/test.pl)
+ok 2 - use Git;
+ok 3 - open repository
+ok 4 - config scalar: string
+ok 5 - config array: string
+ok 6 - config scalar: nonexistent
+ok 7 - config array: nonexistent
+ok 8 - config_int: integer
+ok 9 - config_int: nonexistent
+ok 10 - config_bool: true
+ok 11 - config_bool: false
+ok 12 - config_path: ~/foo expansion
+ok 13 - config_path: multiple values
+ok 14 - get_color
+ok 15 - config: multivar
+ok 16 - config_bool: non-boolean values fail
+ok 17 - ident scalar: author (type)
+ok 18 - ident scalar: committer (type)
+ok 19 - ident scalar: invalid ident string (no parsing)
+ok 20 - ident array: author
+ok 21 - ident array: author
+ok 22 - ident array: ident string
+ok 23 - ident array: invalid ident string
+ok 24 - ident_person: author (type)
+ok 25 - ident_person: ident string
+ok 26 - ident_person: array
+ok 27 - (get file hash)
+ok 28 - cat_blob: size
+ok 29 - cat_blob: data
+ok 30 - hash_object: roundtrip
+ok 31 - hash_and_insert_object: returns hash
+ok 32 - cat_blob: roundtrip size
+ok 33 - cat_blob: roundtrip data
+ok 34 - repo_path
+ok 35 - wc_path
+ok 36 - wc_subdir initial
+ok 37 - wc_subdir after wc_chdir
+ok 38 - config after wc_chdir
+ok 39 - repo_path (2)
+ok 40 - wc_path (2)
+ok 41 - wc_subdir initial (2)
+ok 42 - rev-parse returned hash
+ok 43 - log . does not show last commit
+ok 44 - cat_blob(outside): size
+ok 45 - unquote unquoted path
+ok 46 - unquote simple quoted path
+ok 47 - unquote escape sequences
+1..47
+# test_external test Perl API was ok
+# expecting no stderr from previous command
+# test_external_without_stderr test no stderr: Perl API was ok
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t9800-git-p4-basic.sh ***
+1..0 # SKIP skipping git p4 tests; no p4 or p4d
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
 *** t9502-gitweb-standalone-parse-output.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9502-gitweb-standalone-parse-output/.git/
 expecting success: 
@@ -334742,32 +335361,32 @@
 <td></td>
 <td><a class="list" href="/build/git-2.20.1/t/../gitweb/gitweb.perl?p=.git;a=summary">.git</a></td>
 <td><a class="list" href="/build/git-2.20.1/t/../gitweb/gitweb.perl?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">16 years ago</td>
+<td><i>second user</i></td>
+<td class="age2">17 years ago</td>
 <td class="link"><a href="/build/git-2.20.1/t/../gitweb/gitweb.perl?p=.git;a=summary">summary</a> | <a href="/build/git-2.20.1/t/../gitweb/gitweb.perl?p=.git;a=shortlog">shortlog</a> | <a href="/build/git-2.20.1/t/../gitweb/gitweb.perl?p=.git;a=log">log</a> | <a href="/build/git-2.20.1/t/../gitweb/gitweb.perl?p=.git;a=tree">tree</a></td>
 </tr>
 <tr class="light">
 <td></td>
 <td><a class="list" href="/build/git-2.20.1/t/../gitweb/gitweb.perl?p=foo.bar.git;a=summary">foo.bar.git</a></td>
 <td><a class="list" href="/build/git-2.20.1/t/../gitweb/gitweb.perl?p=foo.bar.git;a=summary" title="foo.bar">foo.bar</a></td>
-<td><i></i></td>
-<td class="age2">16 years ago</td>
+<td><i>second user</i></td>
+<td class="age2">17 years ago</td>
 <td class="link"><a href="/build/git-2.20.1/t/../gitweb/gitweb.perl?p=foo.bar.git;a=summary">summary</a> | <a href="/build/git-2.20.1/t/../gitweb/gitweb.perl?p=foo.bar.git;a=shortlog">shortlog</a> | <a href="/build/git-2.20.1/t/../gitweb/gitweb.perl?p=foo.bar.git;a=log">log</a> | <a href="/build/git-2.20.1/t/../gitweb/gitweb.perl?p=foo.bar.git;a=tree">tree</a></td>
 </tr>
 <tr class="dark">
 <td><a href="/build/git-2.20.1/t/../gitweb/gitweb.perl?p=foo.git;a=forks" title="1 forks">+</a></td>
 <td><a class="list" href="/build/git-2.20.1/t/../gitweb/gitweb.perl?p=foo.git;a=summary">foo.git</a></td>
 <td><a class="list" href="/build/git-2.20.1/t/../gitweb/gitweb.perl?p=foo.git;a=summary" title="foo">foo</a></td>
-<td><i></i></td>
-<td class="age2">16 years ago</td>
+<td><i>second user</i></td>
+<td class="age2">17 years ago</td>
 <td class="link"><a href="/build/git-2.20.1/t/../gitweb/gitweb.perl?p=foo.git;a=summary">summary</a> | <a href="/build/git-2.20.1/t/../gitweb/gitweb.perl?p=foo.git;a=shortlog">shortlog</a> | <a href="/build/git-2.20.1/t/../gitweb/gitweb.perl?p=foo.git;a=log">log</a> | <a href="/build/git-2.20.1/t/../gitweb/gitweb.perl?p=foo.git;a=tree">tree</a> | <a href="/build/git-2.20.1/t/../gitweb/gitweb.perl?p=foo.git;a=forks">forks</a></td>
 </tr>
 <tr class="light">
 <td></td>
 <td><a class="list" href="/build/git-2.20.1/t/../gitweb/gitweb.perl?p=foo_baz.git;a=summary">foo_baz.git</a></td>
 <td><a class="list" href="/build/git-2.20.1/t/../gitweb/gitweb.perl?p=foo_baz.git;a=summary" title="foo_baz">foo_baz</a></td>
-<td><i></i></td>
-<td class="age2">16 years ago</td>
+<td><i>second user</i></td>
+<td class="age2">17 years ago</td>
 <td class="link"><a href="/build/git-2.20.1/t/../gitweb/gitweb.perl?p=foo_baz.git;a=summary">summary</a> | <a href="/build/git-2.20.1/t/../gitweb/gitweb.perl?p=foo_baz.git;a=shortlog">shortlog</a> | <a href="/build/git-2.20.1/t/../gitweb/gitweb.perl?p=foo_baz.git;a=log">log</a> | <a href="/build/git-2.20.1/t/../gitweb/gitweb.perl?p=foo_baz.git;a=tree">tree</a></td>
 </tr>
 </table>
@@ -334822,32 +335441,32 @@
 <td></td>
 <td><a class="list" href="/build/git-2.20.1/t/../gitweb/gitweb.perl?p=.git;a=summary">.git</a></td>
 <td><a class="list" href="/build/git-2.20.1/t/../gitweb/gitweb.perl?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">16 years ago</td>
+<td><i>second user</i></td>
+<td class="age2">17 years ago</td>
 <td class="link"><a href="/build/git-2.20.1/t/../gitweb/gitweb.perl?p=.git;a=summary">summary</a> | <a href="/build/git-2.20.1/t/../gitweb/gitweb.perl?p=.git;a=shortlog">shortlog</a> | <a href="/build/git-2.20.1/t/../gitweb/gitweb.perl?p=.git;a=log">log</a> | <a href="/build/git-2.20.1/t/../gitweb/gitweb.perl?p=.git;a=tree">tree</a></td>
 </tr>
 <tr class="light">
 <td></td>
 <td><a class="list" href="/build/git-2.20.1/t/../gitweb/gitweb.perl?p=foo.bar.git;a=summary">foo.bar.git</a></td>
 <td><a class="list" href="/build/git-2.20.1/t/../gitweb/gitweb.perl?p=foo.bar.git;a=summary" title="foo.bar">foo.bar</a></td>
-<td><i></i></td>
-<td class="age2">16 years ago</td>
+<td><i>second user</i></td>
+<td class="age2">17 years ago</td>
 <td class="link"><a href="/build/git-2.20.1/t/../gitweb/gitweb.perl?p=foo.bar.git;a=summary">summary</a> | <a href="/build/git-2.20.1/t/../gitweb/gitweb.perl?p=foo.bar.git;a=shortlog">shortlog</a> | <a href="/build/git-2.20.1/t/../gitweb/gitweb.perl?p=foo.bar.git;a=log">log</a> | <a href="/build/git-2.20.1/t/../gitweb/gitweb.perl?p=foo.bar.git;a=tree">tree</a></td>
 </tr>
 <tr class="dark">
 <td><a href="/build/git-2.20.1/t/../gitweb/gitweb.perl?p=foo.git;a=forks" title="1 forks">+</a></td>
 <td><a class="list" href="/build/git-2.20.1/t/../gitweb/gitweb.perl?p=foo.git;a=summary">foo.git</a></td>
 <td><a class="list" href="/build/git-2.20.1/t/../gitweb/gitweb.perl?p=foo.git;a=summary" title="foo">foo</a></td>
-<td><i></i></td>
-<td class="age2">16 years ago</td>
+<td><i>second user</i></td>
+<td class="age2">17 years ago</td>
 <td class="link"><a href="/build/git-2.20.1/t/../gitweb/gitweb.perl?p=foo.git;a=summary">summary</a> | <a href="/build/git-2.20.1/t/../gitweb/gitweb.perl?p=foo.git;a=shortlog">shortlog</a> | <a href="/build/git-2.20.1/t/../gitweb/gitweb.perl?p=foo.git;a=log">log</a> | <a href="/build/git-2.20.1/t/../gitweb/gitweb.perl?p=foo.git;a=tree">tree</a> | <a href="/build/git-2.20.1/t/../gitweb/gitweb.perl?p=foo.git;a=forks">forks</a></td>
 </tr>
 <tr class="light">
 <td></td>
 <td><a class="list" href="/build/git-2.20.1/t/../gitweb/gitweb.perl?p=foo_baz.git;a=summary">foo_baz.git</a></td>
 <td><a class="list" href="/build/git-2.20.1/t/../gitweb/gitweb.perl?p=foo_baz.git;a=summary" title="foo_baz">foo_baz</a></td>
-<td><i></i></td>
-<td class="age2">16 years ago</td>
+<td><i>second user</i></td>
+<td class="age2">17 years ago</td>
 <td class="link"><a href="/build/git-2.20.1/t/../gitweb/gitweb.perl?p=foo_baz.git;a=summary">summary</a> | <a href="/build/git-2.20.1/t/../gitweb/gitweb.perl?p=foo_baz.git;a=shortlog">shortlog</a> | <a href="/build/git-2.20.1/t/../gitweb/gitweb.perl?p=foo_baz.git;a=log">log</a> | <a href="/build/git-2.20.1/t/../gitweb/gitweb.perl?p=foo_baz.git;a=tree">tree</a></td>
 </tr>
 </table>
@@ -334906,258 +335525,88 @@
 1..18
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t9600-cvsimport.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9600-cvsimport/.git/
-checking prerequisite: NOT_ROOT
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir" &&
-	uid=$(id -u) &&
-	test "$uid" != 0
-
-)
-prerequisite NOT_ROOT ok
-expecting success: 
-	CVSROOT=$(pwd)/cvsroot &&
-	export CVSROOT
-
-ok 1 - setup cvsroot environment
-
-expecting success: $CVS init
-ok 2 - setup cvsroot
-
-expecting success: 
-
-	mkdir "$CVSROOT/module" &&
-	$CVS co -d module-cvs module &&
-	(cd module-cvs &&
-	cat <<EOF >o_fortuna &&
-O Fortuna
-velut luna
-statu variabilis,
-
-semper crescis
-aut decrescis;
-vita detestabilis
-
-nunc obdurat
-et tunc curat
-ludo mentis aciem,
-
-egestatem,
-potestatem
-dissolvit ut glaciem.
-EOF
-	$CVS add o_fortuna &&
-	cat <<EOF >message &&
-add "O Fortuna" lyrics
-
-These public domain lyrics make an excellent sample text.
-EOF
-	$CVS commit -F message
-	)
-
-cvs checkout: Updating module-cvs
-cvs add: scheduling file `o_fortuna' for addition
-cvs add: use `cvs commit' to add this file permanently
-cvs commit: Examining .
-/build/git-2.20.1/t/trash directory.t9600-cvsimport/cvsroot/module/o_fortuna,v  <--  o_fortuna
-initial revision: 1.1
-ok 3 - setup a cvs module
-
-expecting success: 
-
-	git cvsimport -a -R -z 0 -C module-git module &&
-	test_cmp module-cvs/o_fortuna module-git/o_fortuna
-
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9600-cvsimport/module-git/.git/
-ok 4 - import a trivial module
-
-expecting success: (cd module-git && git gc)
-ok 5 - pack refs
-
-expecting success: 
-
-	(cd module-git &&
-	 git log --format="o_fortuna 1.1 %H" -1) > expected &&
-	test_cmp expected module-git/.git/cvs-revisions
-
-ok 6 - initial import has correct .git/cvs-revisions
-
-expecting success: 
-	(cd module-cvs &&
-	cat <<EOF >o_fortuna &&
-O Fortune,
-like the moon
-you are changeable,
-
-ever waxing
-and waning;
-hateful life
-
-first oppresses
-and then soothes
-as fancy takes it;
-
-poverty
-and power
-it melts them like ice.
-EOF
-	cat <<EOF >message &&
-translate to English
-
-My Latin is terrible.
-EOF
-	$CVS commit -F message
-	)
-
-cvs commit: Examining .
-/build/git-2.20.1/t/trash directory.t9600-cvsimport/cvsroot/module/o_fortuna,v  <--  o_fortuna
-new revision: 1.2; previous revision: 1.1
-ok 7 - update cvs module
-
-expecting success: 
-
-	(cd module-git &&
-	git config cvsimport.trackRevisions true &&
-	git cvsimport -a -z 0 module &&
-	git merge origin
-	) &&
-	test_cmp module-cvs/o_fortuna module-git/o_fortuna
-
-
-Updating 66feee4..b8449f4
-Fast-forward (no commit created; -m option ignored)
- o_fortuna | 24 ++++++++++++------------
- 1 file changed, 12 insertions(+), 12 deletions(-)
-Already up to date.
-ok 8 - update git module
-
-expecting success: 
-
-	(cd module-git &&
-	 git log --format="o_fortuna 1.1 %H" -1 HEAD^ &&
-	 git log --format="o_fortuna 1.2 %H" -1 HEAD) > expected &&
-	test_cmp expected module-git/.git/cvs-revisions
-
-ok 9 - update has correct .git/cvs-revisions
-
-expecting success: 
-
-	(cd module-cvs &&
-		echo 1 >tick &&
-		$CVS add tick &&
-		$CVS commit -m 1
-	)
-
-cvs add: scheduling file `tick' for addition
-cvs add: use `cvs commit' to add this file permanently
-cvs commit: Examining .
-/build/git-2.20.1/t/trash directory.t9600-cvsimport/cvsroot/module/tick,v  <--  tick
-initial revision: 1.1
-ok 10 - update cvs module
-
-expecting success: 
-
-	(cd module-git &&
-		git config cvsimport.module module &&
-		git config cvsimport.trackRevisions true &&
-		git cvsimport -a -z0 &&
-		git merge origin
-	) &&
-	test_cmp module-cvs/tick module-git/tick
-
-
-Updating b8449f4..60fa934
-Fast-forward (no commit created; -m option ignored)
- tick | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 tick
-Already up to date.
-ok 11 - cvsimport.module config works
-
-expecting success: 
-
-	(cd module-git &&
-	 git log --format="o_fortuna 1.1 %H" -1 HEAD^^ &&
-	 git log --format="o_fortuna 1.2 %H" -1 HEAD^ &&
-	 git log --format="tick 1.1 %H" -1 HEAD) > expected &&
-	test_cmp expected module-git/.git/cvs-revisions
-
-ok 12 - second update has correct .git/cvs-revisions
-
-expecting success: 
-
-	$CVS co -d import-from-wt module &&
-	(cd import-from-wt &&
-		git config cvsimport.trackRevisions false &&
-		git cvsimport -a -z0 &&
-		echo 1 >expect &&
-		git log -1 --pretty=format:%s%n >actual &&
-		test_cmp expect actual
-	)
-
-
-cvs checkout: Updating import-from-wt
-U import-from-wt/o_fortuna
-U import-from-wt/tick
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9600-cvsimport/import-from-wt/.git/
-ok 13 - import from a CVS working tree
-
-expecting success: 
-
-	! test -e import-from-wt/.git/cvs-revisions
-
-
-ok 14 - no .git/cvs-revisions created by default
-
-expecting success: test_cmp_branch_tree master
-cvs checkout: Updating module-cvs-master
-U module-cvs-master/o_fortuna
-U module-cvs-master/tick
-Already on 'master'
-ok 15 - test entire HEAD
-
-# passed all 15 test(s)
-1..15
+*** t9801-git-p4-branch.sh ***
+1..0 # SKIP skipping git p4 tests; no p4 or p4d
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t9603-cvsimport-patchsets.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9603-cvsimport-patchsets/.git/
-checking known breakage: 
-
-    git cvsimport -p"-x" -C module-git module &&
-    (cd module-git &&
-        git log --pretty=format:%s > ../actual-master &&
-        git log A~2..A --pretty="format:%s %ad" -- > ../actual-A &&
-        echo "" >> ../actual-master &&
-	echo "" >> ../actual-A
-    ) &&
-    echo "Rev 4
-Rev 3
-Rev 2
-Rev 1" > expect-master &&
-    test_cmp expect-master actual-master &&
-
-    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/git-2.20.1/t/trash directory.t9603-cvsimport-patchsets/module-git/.git/
---- expect-master	2021-12-03 05:11:25.304978009 +0000
-+++ actual-master	2021-12-03 05:11:25.304978009 +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
+*** t9803-git-p4-shell-metachars.sh ***
+1..0 # SKIP skipping git p4 tests; no p4 or p4d
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t9802-git-p4-filetype.sh ***
+1..0 # SKIP skipping git p4 tests; no p4 or p4d
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t9805-git-p4-skip-submit-edit.sh ***
+1..0 # SKIP skipping git p4 tests; no p4 or p4d
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t9804-git-p4-label.sh ***
+1..0 # SKIP skipping git p4 tests; no p4 or p4d
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t9806-git-p4-options.sh ***
+1..0 # SKIP skipping git p4 tests; no p4 or p4d
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t9807-git-p4-submit.sh ***
+1..0 # SKIP skipping git p4 tests; no p4 or p4d
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t9808-git-p4-chdir.sh ***
+1..0 # SKIP skipping git p4 tests; no p4 or p4d
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t9809-git-p4-client-view.sh ***
+1..0 # SKIP skipping git p4 tests; no p4 or p4d
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t9810-git-p4-rcs.sh ***
+1..0 # SKIP skipping git p4 tests; no p4 or p4d
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t9811-git-p4-label-import.sh ***
+1..0 # SKIP skipping git p4 tests; no p4 or p4d
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t9812-git-p4-wildcards.sh ***
+1..0 # SKIP skipping git p4 tests; no p4 or p4d
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t9813-git-p4-preserve-users.sh ***
+1..0 # SKIP skipping git p4 tests; no p4 or p4d
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t9814-git-p4-rename.sh ***
+1..0 # SKIP skipping git p4 tests; no p4 or p4d
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t9815-git-p4-submit-fail.sh ***
+1..0 # SKIP skipping git p4 tests; no p4 or p4d
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t9816-git-p4-locked.sh ***
+1..0 # SKIP skipping git p4 tests; no p4 or p4d
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t9817-git-p4-exclude.sh ***
+1..0 # SKIP skipping git p4 tests; no p4 or p4d
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t9818-git-p4-block.sh ***
+1..0 # SKIP skipping git p4 tests; no p4 or p4d
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t9819-git-p4-case-folding.sh ***
+1..0 # SKIP skipping git p4 tests; no p4 or p4d
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t9820-git-p4-editor-handling.sh ***
+1..0 # SKIP skipping git p4 tests; no p4 or p4d
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
+*** t9821-git-p4-path-variations.sh ***
+1..0 # SKIP skipping git p4 tests; no p4 or p4d
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
 *** t9501-gitweb-standalone-http-status.sh ***
@@ -335345,155 +335794,51 @@
 1..19
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t9800-git-p4-basic.sh ***
-1..0 # SKIP skipping git p4 tests; no p4 or p4d
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t9801-git-p4-branch.sh ***
+*** t9822-git-p4-path-encoding.sh ***
 1..0 # SKIP skipping git p4 tests; no p4 or p4d
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t9802-git-p4-filetype.sh ***
+*** t9823-git-p4-mock-lfs.sh ***
 1..0 # SKIP skipping git p4 tests; no p4 or p4d
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t9803-git-p4-shell-metachars.sh ***
+*** t9824-git-p4-git-lfs.sh ***
 1..0 # SKIP skipping git p4 tests; no p4 or p4d
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t9804-git-p4-label.sh ***
+*** t9826-git-p4-keep-empty-commits.sh ***
 1..0 # SKIP skipping git p4 tests; no p4 or p4d
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t9805-git-p4-skip-submit-edit.sh ***
+*** t9825-git-p4-handle-utf16-without-bom.sh ***
 1..0 # SKIP skipping git p4 tests; no p4 or p4d
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t9806-git-p4-options.sh ***
+*** t9827-git-p4-change-filetype.sh ***
 1..0 # SKIP skipping git p4 tests; no p4 or p4d
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t9807-git-p4-submit.sh ***
+*** t9828-git-p4-map-user.sh ***
 1..0 # SKIP skipping git p4 tests; no p4 or p4d
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t9808-git-p4-chdir.sh ***
+*** t9829-git-p4-jobs.sh ***
 1..0 # SKIP skipping git p4 tests; no p4 or p4d
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t9809-git-p4-client-view.sh ***
+*** t9830-git-p4-symlink-dir.sh ***
 1..0 # SKIP skipping git p4 tests; no p4 or p4d
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t9810-git-p4-rcs.sh ***
+*** t9831-git-p4-triggers.sh ***
 1..0 # SKIP skipping git p4 tests; no p4 or p4d
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t9700-perl-git.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9700-perl-git/.git/
-expecting success: 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) 5e85fde] 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 dad0022] commit in directory2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 directory2/file2
-[master 17bad92] second commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 1 - set up test repository
-
-# run 1: Perl API (perl /build/git-2.20.1/t/t9700/test.pl)
-ok 2 - use Git;
-ok 3 - open repository
-ok 4 - config scalar: string
-ok 5 - config array: string
-ok 6 - config scalar: nonexistent
-ok 7 - config array: nonexistent
-ok 8 - config_int: integer
-ok 9 - config_int: nonexistent
-ok 10 - config_bool: true
-ok 11 - config_bool: false
-ok 12 - config_path: ~/foo expansion
-ok 13 - config_path: multiple values
-ok 14 - get_color
-ok 15 - config: multivar
-ok 16 - config_bool: non-boolean values fail
-ok 17 - ident scalar: author (type)
-ok 18 - ident scalar: committer (type)
-ok 19 - ident scalar: invalid ident string (no parsing)
-ok 20 - ident array: author
-ok 21 - ident array: author
-ok 22 - ident array: ident string
-ok 23 - ident array: invalid ident string
-ok 24 - ident_person: author (type)
-ok 25 - ident_person: ident string
-ok 26 - ident_person: array
-ok 27 - (get file hash)
-ok 28 - cat_blob: size
-ok 29 - cat_blob: data
-ok 30 - hash_object: roundtrip
-ok 31 - hash_and_insert_object: returns hash
-ok 32 - cat_blob: roundtrip size
-ok 33 - cat_blob: roundtrip data
-ok 34 - repo_path
-ok 35 - wc_path
-ok 36 - wc_subdir initial
-ok 37 - wc_subdir after wc_chdir
-ok 38 - config after wc_chdir
-ok 39 - repo_path (2)
-ok 40 - wc_path (2)
-ok 41 - wc_subdir initial (2)
-ok 42 - rev-parse returned hash
-ok 43 - log . does not show last commit
-ok 44 - cat_blob(outside): size
-ok 45 - unquote unquoted path
-ok 46 - unquote simple quoted path
-ok 47 - unquote escape sequences
-1..47
-# test_external test Perl API was ok
-# expecting no stderr from previous command
-# test_external_without_stderr test no stderr: Perl API was ok
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t9811-git-p4-label-import.sh ***
+*** t9832-unshelve.sh ***
 1..0 # SKIP skipping git p4 tests; no p4 or p4d
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t9812-git-p4-wildcards.sh ***
+*** t9833-errors.sh ***
 1..0 # SKIP skipping git p4 tests; no p4 or p4d
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
@@ -335533,7 +335878,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_3594773
+fast-import: dumping crash report to .git/fast_import_crash_2973682
 ok 2 - truncated stream complains
 
 expecting success: 
@@ -335987,7 +336332,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_3597579
+fast-import: dumping crash report to .git/fast_import_crash_2975996
 ok 19 - B: fail on invalid blob sha1
 
 expecting success: 
@@ -336144,7 +336489,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_3598585
+fast-import: dumping crash report to .git/fast_import_crash_2977156
 ok 23 - B: fail on invalid committer (1)
 
 expecting success: 
@@ -336160,7 +336505,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_3598731
+fast-import: dumping crash report to .git/fast_import_crash_2977262
 ok 24 - B: fail on invalid committer (2)
 
 expecting success: 
@@ -336176,7 +336521,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_3598840
+fast-import: dumping crash report to .git/fast_import_crash_2977359
 ok 25 - B: fail on invalid committer (3)
 
 expecting success: 
@@ -336192,7 +336537,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_3598993
+fast-import: dumping crash report to .git/fast_import_crash_2977459
 ok 26 - B: fail on invalid committer (4)
 
 expecting success: 
@@ -336208,7 +336553,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_3599121
+fast-import: dumping crash report to .git/fast_import_crash_2977607
 ok 27 - B: fail on invalid committer (5)
 
 expecting success: 
@@ -336437,7 +336782,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_3600310
+fast-import: dumping crash report to .git/fast_import_crash_2979048
 ok 38 - E: rfc2822 date, --date-format=raw
 
 expecting success: 
@@ -336835,7 +337180,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_3602936
+fast-import: dumping crash report to .git/fast_import_crash_2981998
 ok 56 - J: tag must fail on empty branch
 
 expecting success: 
@@ -337808,7 +338153,7 @@
 	INPUT_END
 
 fatal: Empty path component found in input
-fast-import: dumping crash report to .git/fast_import_crash_3606005
+fast-import: dumping crash report to .git/fast_import_crash_2985302
 ok 75 - N: reject foo/ syntax
 
 expecting success: 
@@ -337824,7 +338169,7 @@
 	INPUT_END
 
 fatal: Empty path component found in input
-fast-import: dumping crash report to .git/fast_import_crash_3606084
+fast-import: dumping crash report to .git/fast_import_crash_2985392
 ok 76 - N: reject foo/ syntax in copy source
 
 expecting success: 
@@ -337840,7 +338185,7 @@
 	INPUT_END
 
 fatal: Path file2/ not in branch
-fast-import: dumping crash report to .git/fast_import_crash_3606185
+fast-import: dumping crash report to .git/fast_import_crash_2985458
 ok 77 - N: reject foo/ syntax in rename source
 
 expecting success: 
@@ -337856,7 +338201,7 @@
 	INPUT_END
 
 fatal: Empty path component found in input
-fast-import: dumping crash report to .git/fast_import_crash_3606269
+fast-import: dumping crash report to .git/fast_import_crash_2985520
 ok 78 - N: reject foo/ syntax in ls argument
 
 expecting success: 
@@ -338500,7 +338845,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_3608353
+fast-import: dumping crash report to .git/fast_import_crash_2988058
 ok 89 - P: fail on inline gitlink
 
 expecting success: 
@@ -338527,7 +338872,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_3608400
+fast-import: dumping crash report to .git/fast_import_crash_2988131
 ok 90 - P: fail on blob mark in gitlink
 
 expecting success: 
@@ -338918,7 +339263,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_3610040
+fast-import: dumping crash report to .git/fast_import_crash_2989842
 ok 112 - Q: deny note on empty branch
 
 expecting success: 
@@ -338929,7 +339274,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_3610109
+fast-import: dumping crash report to .git/fast_import_crash_2989890
 ok 113 - R: abort on unsupported feature
 
 expecting success: 
@@ -338976,7 +339321,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_3610239
+fast-import: dumping crash report to .git/fast_import_crash_2989984
 ok 115 - R: abort on receiving feature after data command
 
 expecting success: 
@@ -338987,9 +339332,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_3610301
+fast-import: dumping crash report to .git/fast_import_crash_2990034
 fatal: feature 'import-marks-if-exists' forbidden in input without --allow-unsafe-features
-fast-import: dumping crash report to .git/fast_import_crash_3610334
+fast-import: dumping crash report to .git/fast_import_crash_2990049
 ok 116 - R: import-marks features forbidden by default
 
 expecting success: 
@@ -339003,7 +339348,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_3610393
+fast-import: dumping crash report to .git/fast_import_crash_2990145
 ok 117 - R: only one import-marks feature allowed per stream
 
 expecting success: 
@@ -339011,7 +339356,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_3610470
+fast-import: dumping crash report to .git/fast_import_crash_2990212
 ok 118 - R: export-marks feature forbidden by default
 
 expecting success: 
@@ -339101,9 +339446,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_3610643
+fast-import: dumping crash report to .git/fast_import_crash_2990516
 fatal: cannot read 'nonexistent.marks': No such file or directory
-fast-import: dumping crash report to .git/fast_import_crash_3610670
+fast-import: dumping crash report to .git/fast_import_crash_2990539
 ok 121 - R: catch typo in marks file name
 
 expecting success: 
@@ -339190,7 +339535,7 @@
 	EOF
 
 fatal: cannot read 'io.marks': No such file or directory
-fast-import: dumping crash report to .git/fast_import_crash_3610799
+fast-import: dumping crash report to .git/fast_import_crash_2990713
 ok 123 - R: --import-marks=foo --output-marks=foo to create foo fails
 
 expecting success: 
@@ -339624,7 +339969,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_3611927
+fast-import: dumping crash report to .git/fast_import_crash_2991630
 ok 133 - R: cat-blob-fd must be a nonnegative integer
 
 expecting success: 
@@ -340139,9 +340484,9 @@
 	test_must_fail git fast-import --done </dev/null
 
 fatal: stream ends early
-fast-import: dumping crash report to .git/fast_import_crash_3613244
+fast-import: dumping crash report to .git/fast_import_crash_2992966
 fatal: stream ends early
-fast-import: dumping crash report to .git/fast_import_crash_3613269
+fast-import: dumping crash report to .git/fast_import_crash_2992987
 ok 145 - R: feature done means terminating "done" is mandatory
 
 expecting success: 
@@ -340263,14 +340608,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_3613527
+fast-import: dumping crash report to .git/fast_import_crash_2993254
 ok 148 - R: die on unknown option
 
 expecting success: \
 	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_3613618
+fast-import: dumping crash report to .git/fast_import_crash_2993300
 ok 149 - R: unknown commandline options are rejected
 
 expecting success: 
@@ -340281,11 +340626,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_3613719
+fast-import: dumping crash report to .git/fast_import_crash_2993346
 fatal: --depth: argument must be a non-negative integer
-fast-import: dumping crash report to .git/fast_import_crash_3613749
+fast-import: dumping crash report to .git/fast_import_crash_2993365
 fatal: --depth: argument must be a non-negative integer
-fast-import: dumping crash report to .git/fast_import_crash_3613784
+fast-import: dumping crash report to .git/fast_import_crash_2993404
 ok 150 - R: die on invalid option argument
 
 expecting success: 
@@ -340336,7 +340681,7 @@
 	test_cmp expect io.marks
 
 fatal: object not found: 0000000000000000000000000000000000000000
-fast-import: dumping crash report to .git/fast_import_crash_3613988
+fast-import: dumping crash report to .git/fast_import_crash_2993555
 ok 152 - R: corrupt lines do not mess marks file
 
 expecting success: 
@@ -340495,7 +340840,7 @@
 	test_i18ngrep "space after mark" err
 
 fatal: Missing space after mark: M 100644 :403x hello.c
-fast-import: dumping crash report to .git/fast_import_crash_3615144
+fast-import: dumping crash report to .git/fast_import_crash_2994534
 fatal: Missing space after mark: M 100644 :403x hello.c
 ok 158 - S: filemodify with garbage after mark must fail
 
@@ -340515,7 +340860,7 @@
 	test_i18ngrep "nvalid dataref" err
 
 fatal: Invalid dataref: M 100644 inlineX hello.c
-fast-import: dumping crash report to .git/fast_import_crash_3615218
+fast-import: dumping crash report to .git/fast_import_crash_2994636
 fatal: Invalid dataref: M 100644 inlineX hello.c
 ok 159 - S: filemodify with garbage after inline must fail
 
@@ -340533,7 +340878,7 @@
 	test_i18ngrep "space after SHA1" err
 
 fatal: Missing space after SHA1: M 100644 f4b9ac379fda0ad3560620918bf73440e46eeb8cx hello.c
-fast-import: dumping crash report to .git/fast_import_crash_3615328
+fast-import: dumping crash report to .git/fast_import_crash_2994769
 fatal: Missing space after SHA1: M 100644 f4b9ac379fda0ad3560620918bf73440e46eeb8cx hello.c
 ok 160 - S: filemodify with garbage after sha1 must fail
 
@@ -340550,7 +340895,7 @@
 	test_i18ngrep "space after mark" err
 
 fatal: Missing space after mark: N :202x :302
-fast-import: dumping crash report to .git/fast_import_crash_3615403
+fast-import: dumping crash report to .git/fast_import_crash_2994867
 fatal: Missing space after mark: N :202x :302
 ok 161 - S: notemodify with garbage after mark dataref must fail
 
@@ -340570,7 +340915,7 @@
 	test_i18ngrep "nvalid dataref" err
 
 fatal: Invalid dataref: N inlineX :302
-fast-import: dumping crash report to .git/fast_import_crash_3615500
+fast-import: dumping crash report to .git/fast_import_crash_2994972
 fatal: Invalid dataref: N inlineX :302
 ok 162 - S: notemodify with garbage after inline dataref must fail
 
@@ -340588,7 +340933,7 @@
 	test_i18ngrep "space after SHA1" err
 
 fatal: Missing space after SHA1: N d2f48fdae4e23fc19cf4a8454054695714188709x :302
-fast-import: dumping crash report to .git/fast_import_crash_3615624
+fast-import: dumping crash report to .git/fast_import_crash_2995094
 fatal: Missing space after SHA1: N d2f48fdae4e23fc19cf4a8454054695714188709x :302
 ok 163 - S: notemodify with garbage after sha1 dataref must fail
 
@@ -340605,7 +340950,7 @@
 	test_i18ngrep "after mark" err
 
 fatal: Garbage after mark: N :202 :302x
-fast-import: dumping crash report to .git/fast_import_crash_3615742
+fast-import: dumping crash report to .git/fast_import_crash_2995172
 fatal: Garbage after mark: N :202 :302x
 ok 164 - S: notemodify with garbage after mark commit-ish must fail
 
@@ -340664,7 +341009,7 @@
 ---------------------------------------------------------------------
 
 fatal: Garbage after mark: from :301x
-fast-import: dumping crash report to .git/fast_import_crash_3615809
+fast-import: dumping crash report to .git/fast_import_crash_2995285
 fatal: Garbage after mark: from :301x
 ok 165 - S: from with garbage after mark must fail
 
@@ -340684,7 +341029,7 @@
 	test_i18ngrep "after mark" err
 
 fatal: Garbage after mark: merge :303x
-fast-import: dumping crash report to .git/fast_import_crash_3615937
+fast-import: dumping crash report to .git/fast_import_crash_2995421
 fatal: Garbage after mark: merge :303x
 ok 166 - S: merge with garbage after mark must fail
 
@@ -340701,7 +341046,7 @@
 	test_i18ngrep "after mark" err
 
 fatal: Garbage after mark: from :302x
-fast-import: dumping crash report to .git/fast_import_crash_3616048
+fast-import: dumping crash report to .git/fast_import_crash_2995540
 fatal: Garbage after mark: from :302x
 ok 167 - S: tag with garbage after mark must fail
 
@@ -340713,7 +341058,7 @@
 	test_i18ngrep "after mark" err
 
 fatal: Garbage after mark: cat-blob :403x
-fast-import: dumping crash report to .git/fast_import_crash_3616148
+fast-import: dumping crash report to .git/fast_import_crash_2995674
 fatal: Garbage after mark: cat-blob :403x
 ok 168 - S: cat-blob with garbage after mark must fail
 
@@ -340725,7 +341070,7 @@
 	test_i18ngrep "space after mark" err
 
 fatal: Missing space after mark: ls :302x hello.c
-fast-import: dumping crash report to .git/fast_import_crash_3616229
+fast-import: dumping crash report to .git/fast_import_crash_2995790
 fatal: Missing space after mark: ls :302x hello.c
 ok 169 - S: ls with garbage after mark must fail
 
@@ -340738,7 +341083,7 @@
 	test_i18ngrep "space after tree-ish" err
 
 fatal: Missing space after tree-ish: ls 09b8212d623219bb80c949d5065e559b231d90adx hello.c
-fast-import: dumping crash report to .git/fast_import_crash_3616345
+fast-import: dumping crash report to .git/fast_import_crash_2995888
 fatal: Missing space after tree-ish: ls 09b8212d623219bb80c949d5065e559b231d90adx hello.c
 ok 170 - S: ls with garbage after sha1 must fail
 
@@ -341190,22 +341535,6 @@
 1..185
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t9815-git-p4-submit-fail.sh ***
-1..0 # SKIP skipping git p4 tests; no p4 or p4d
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t9813-git-p4-preserve-users.sh ***
-1..0 # SKIP skipping git p4 tests; no p4 or p4d
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t9814-git-p4-rename.sh ***
-1..0 # SKIP skipping git p4 tests; no p4 or p4d
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t9816-git-p4-locked.sh ***
-1..0 # SKIP skipping git p4 tests; no p4 or p4d
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
 *** t9168-git-svn-partially-globbed-names.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9168-git-svn-partially-globbed-names/.git/
 expecting success: 
@@ -341314,22 +341643,22 @@
 	(required for this version (2.20.1) of git-svn) does not exist.
 Done migrating from a git-svn v1 layout
 	A	readme
-r1 = 7e902543ce7ab9964780c2812d76529863f0dc2a (refs/remotes/trunk)
+r1 = 6e0e27e63e26a01eeb26a1308c1fe5596950cc81 (refs/remotes/trunk)
 branch_from: /trunk => /trunk/src/a
 Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/trunk/src/a => file:///build/git-2.20.1/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/branches/b_start/src/a, 1
-Found branch parent: (refs/remotes/branches/b_start) 7e902543ce7ab9964780c2812d76529863f0dc2a
+Found branch parent: (refs/remotes/branches/b_start) 6e0e27e63e26a01eeb26a1308c1fe5596950cc81
 Following parent with do_switch
 Successfully followed parent
-r2 = eb3c9950290da926491c3050f164fb57da3f0b95 (refs/remotes/branches/b_start)
+r2 = fde5b094ad0c079de0ba2a57df432553ecfbc424 (refs/remotes/branches/b_start)
 	M	readme
-r3 = 3a3f1254c9a5ee0309cb0371289a3a51b54706d6 (refs/remotes/branches/b_start)
+r3 = df76889dd68ab601c012987bfeb9fe1817496ea3 (refs/remotes/branches/b_start)
 branch_from: /branches/b_start => /branches/b_start/src/a
 Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/branches/b_start/src/a => file:///build/git-2.20.1/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/tags/t_end/src/a, 3
-Found branch parent: (refs/remotes/tags/t_end) 3a3f1254c9a5ee0309cb0371289a3a51b54706d6
+Found branch parent: (refs/remotes/tags/t_end) df76889dd68ab601c012987bfeb9fe1817496ea3
 Following parent with do_switch
 	M	readme
 Successfully followed parent
-r4 = c58ad273042b33c12503f89d03d3d907f9f5105c (refs/remotes/tags/t_end)
+r4 = 00aeaf004ee0699b718e7fb4c9cb9106753b4c4f (refs/remotes/tags/t_end)
 Checked out HEAD:
   file:///build/git-2.20.1/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.
@@ -341378,26 +341707,26 @@
 	A	src/a/readme
 	A	src/b/readme
 W: +empty_dir: trunk/doc
-r1 = 8faa4e8dbd31efe14e786a512fbcf31f68211e46 (refs/remotes/two/trunk)
+r1 = b228ac81ec73fbe39980b9f08dce0ac585f2d0f8 (refs/remotes/two/trunk)
 Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/trunk => file:///build/git-2.20.1/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/branches/b_start, 1
-Found branch parent: (refs/remotes/two/branches/b_start) 8faa4e8dbd31efe14e786a512fbcf31f68211e46
+Found branch parent: (refs/remotes/two/branches/b_start) b228ac81ec73fbe39980b9f08dce0ac585f2d0f8
 Following parent with do_switch
 Successfully followed parent
-r2 = c30854a0f52cc59ebf584ff6815ddb96a1629b27 (refs/remotes/two/branches/b_start)
+r2 = 1a6cfac405b3b62db187b620c04db914c4316418 (refs/remotes/two/branches/b_start)
 	M	src/a/readme
 	M	src/b/readme
-r3 = c5b1467ad47f8613689bab735fcfb626ba262cfe (refs/remotes/two/branches/b_start)
+r3 = 5c65b316f9d803e836079bd478d57fb7d5791fca (refs/remotes/two/branches/b_start)
 Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/branches/b_start => file:///build/git-2.20.1/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/tags/t_end, 3
-Found branch parent: (refs/remotes/two/tags/t_end) c5b1467ad47f8613689bab735fcfb626ba262cfe
+Found branch parent: (refs/remotes/two/tags/t_end) 5c65b316f9d803e836079bd478d57fb7d5791fca
 Following parent with do_switch
 	M	src/a/readme
 	M	src/b/readme
 Successfully followed parent
-r4 = 9a47ce1f0378042049ca2af90aacfd3590f0fb2d (refs/remotes/two/tags/t_end)
+r4 = 367be16fef0e589becda33dc726febaafa9c3167 (refs/remotes/two/tags/t_end)
 	M	src/b/readme
-r5 = 70083a0ce5df16e0fb91073a945def7f26343d87 (refs/remotes/two/tags/t_end)
+r5 = f15477aabf3d026823ce5bee8ee9a9d8278e42fb (refs/remotes/two/tags/t_end)
 	M	src/b/readme
-r6 = 331d0da5f96b4774fe0284c304f364dceb4147f8 (refs/remotes/two/tags/t_end)
+r6 = cce469f7ec6993570e6f6cd787b7f3dda55bb3a5 (refs/remotes/two/tags/t_end)
 ok 4 - test left-hand-side only prefixed globbing
 
 expecting success: 
@@ -341461,38 +341790,38 @@
 	A	src/a/readme
 	A	src/b/readme
 W: +empty_dir: trunk/doc
-r1 = 8faa4e8dbd31efe14e786a512fbcf31f68211e46 (refs/remotes/three/trunk)
+r1 = b228ac81ec73fbe39980b9f08dce0ac585f2d0f8 (refs/remotes/three/trunk)
 Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/trunk => file:///build/git-2.20.1/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/branches/b_start, 1
-Found branch parent: (refs/remotes/three/branches/b_start) 8faa4e8dbd31efe14e786a512fbcf31f68211e46
+Found branch parent: (refs/remotes/three/branches/b_start) b228ac81ec73fbe39980b9f08dce0ac585f2d0f8
 Following parent with do_switch
 Successfully followed parent
-r2 = c30854a0f52cc59ebf584ff6815ddb96a1629b27 (refs/remotes/three/branches/b_start)
+r2 = 1a6cfac405b3b62db187b620c04db914c4316418 (refs/remotes/three/branches/b_start)
 	M	src/a/readme
 	M	src/b/readme
-r3 = c5b1467ad47f8613689bab735fcfb626ba262cfe (refs/remotes/three/branches/b_start)
+r3 = 5c65b316f9d803e836079bd478d57fb7d5791fca (refs/remotes/three/branches/b_start)
 Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/branches/b_start => file:///build/git-2.20.1/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/tags/t_end, 3
-Found branch parent: (refs/remotes/three/tags/t_end) c5b1467ad47f8613689bab735fcfb626ba262cfe
+Found branch parent: (refs/remotes/three/tags/t_end) 5c65b316f9d803e836079bd478d57fb7d5791fca
 Following parent with do_switch
 	M	src/a/readme
 	M	src/b/readme
 Successfully followed parent
-r4 = 9a47ce1f0378042049ca2af90aacfd3590f0fb2d (refs/remotes/three/tags/t_end)
+r4 = 367be16fef0e589becda33dc726febaafa9c3167 (refs/remotes/three/tags/t_end)
 	M	src/b/readme
-r5 = 70083a0ce5df16e0fb91073a945def7f26343d87 (refs/remotes/three/tags/t_end)
+r5 = f15477aabf3d026823ce5bee8ee9a9d8278e42fb (refs/remotes/three/tags/t_end)
 	M	src/b/readme
-r6 = 331d0da5f96b4774fe0284c304f364dceb4147f8 (refs/remotes/three/tags/t_end)
+r6 = cce469f7ec6993570e6f6cd787b7f3dda55bb3a5 (refs/remotes/three/tags/t_end)
 Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/trunk => file:///build/git-2.20.1/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/branches/b_, 3
-Found branch parent: (refs/remotes/three/branches/b_) 8faa4e8dbd31efe14e786a512fbcf31f68211e46
+Found branch parent: (refs/remotes/three/branches/b_) b228ac81ec73fbe39980b9f08dce0ac585f2d0f8
 Following parent with do_switch
 	M	src/a/readme
 Successfully followed parent
-r7 = eda39d0b7a66336b1080a146cd63ea1f441a566c (refs/remotes/three/branches/b_)
+r7 = fdd5afe2821afd1e0455be71bce8e0d7474afe01 (refs/remotes/three/branches/b_)
 Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/branches/b_ => file:///build/git-2.20.1/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/tags/t_, 7
-Found branch parent: (refs/remotes/three/tags/t_) eda39d0b7a66336b1080a146cd63ea1f441a566c
+Found branch parent: (refs/remotes/three/tags/t_) fdd5afe2821afd1e0455be71bce8e0d7474afe01
 Following parent with do_switch
 	M	src/a/readme
 Successfully followed parent
-r8 = 47fa77499d7002887eb93297ca142d23ebd9c497 (refs/remotes/three/tags/t_)
+r8 = 305d13b8edd78ec8bb0de37f22a6d277a9bdcf82 (refs/remotes/three/tags/t_)
 ok 6 - test prefixed globs match just prefix
 
 expecting success: 
@@ -341590,19 +341919,23 @@
 	A	src/a/readme
 	A	src/b/readme
 W: +empty_dir: trunk/doc
-r1 = 8faa4e8dbd31efe14e786a512fbcf31f68211e46 (refs/remotes/five/trunk)
+r1 = b228ac81ec73fbe39980b9f08dce0ac585f2d0f8 (refs/remotes/five/trunk)
 Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/trunk => file:///build/git-2.20.1/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/branches/abcde, 8
-Found branch parent: (refs/remotes/five/branches/abcde) 8faa4e8dbd31efe14e786a512fbcf31f68211e46
+	A	src/a/readme
+	A	src/b/readme
+W: +empty_dir: trunk/doc
+r1 = b228ac81ec73fbe39980b9f08dce0ac585f2d0f8 (refs/remotes/four/trunk)
+Found branch parent: (refs/remotes/five/branches/abcde) b228ac81ec73fbe39980b9f08dce0ac585f2d0f8
 Following parent with do_switch
 	M	src/a/readme
 Successfully followed parent
-r10 = a86089baa2994d421f76765081a3888ea97abaa6 (refs/remotes/five/branches/abcde)
+r10 = fae632df5037969f30dd0b086ad5cde551fa1a3b (refs/remotes/five/branches/abcde)
 Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/branches/abcde => file:///build/git-2.20.1/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/tags/fghij, 10
-Found branch parent: (refs/remotes/five/tags/fghij) a86089baa2994d421f76765081a3888ea97abaa6
+Found branch parent: (refs/remotes/five/tags/fghij) fae632df5037969f30dd0b086ad5cde551fa1a3b
 Following parent with do_switch
 	M	src/a/readme
 Successfully followed parent
-r11 = f8f559583217a7f7dd7cb0a3bfdb5e3dc63012ad (refs/remotes/five/tags/fghij)
+r11 = 0f3d06145b84c32d0716e96ddc0ac00e055dea57 (refs/remotes/five/tags/fghij)
 ok 10 - test globbing in the middle of the word
 
 expecting success: 
@@ -341638,74 +341971,6 @@
 1..12
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t9818-git-p4-block.sh ***
-1..0 # SKIP skipping git p4 tests; no p4 or p4d
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t9817-git-p4-exclude.sh ***
-1..0 # SKIP skipping git p4 tests; no p4 or p4d
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t9820-git-p4-editor-handling.sh ***
-1..0 # SKIP skipping git p4 tests; no p4 or p4d
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t9819-git-p4-case-folding.sh ***
-1..0 # SKIP skipping git p4 tests; no p4 or p4d
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t9821-git-p4-path-variations.sh ***
-1..0 # SKIP skipping git p4 tests; no p4 or p4d
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t9822-git-p4-path-encoding.sh ***
-1..0 # SKIP skipping git p4 tests; no p4 or p4d
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t9823-git-p4-mock-lfs.sh ***
-1..0 # SKIP skipping git p4 tests; no p4 or p4d
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t9824-git-p4-git-lfs.sh ***
-1..0 # SKIP skipping git p4 tests; no p4 or p4d
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t9827-git-p4-change-filetype.sh ***
-1..0 # SKIP skipping git p4 tests; no p4 or p4d
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t9826-git-p4-keep-empty-commits.sh ***
-1..0 # SKIP skipping git p4 tests; no p4 or p4d
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t9825-git-p4-handle-utf16-without-bom.sh ***
-1..0 # SKIP skipping git p4 tests; no p4 or p4d
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t9828-git-p4-map-user.sh ***
-1..0 # SKIP skipping git p4 tests; no p4 or p4d
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t9831-git-p4-triggers.sh ***
-1..0 # SKIP skipping git p4 tests; no p4 or p4d
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t9832-unshelve.sh ***
-1..0 # SKIP skipping git p4 tests; no p4 or p4d
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t9829-git-p4-jobs.sh ***
-1..0 # SKIP skipping git p4 tests; no p4 or p4d
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t9830-git-p4-symlink-dir.sh ***
-1..0 # SKIP skipping git p4 tests; no p4 or p4d
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
-*** t9833-errors.sh ***
-1..0 # SKIP skipping git p4 tests; no p4 or p4d
-make[4]: Leaving directory '/build/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
 *** t9901-git-web--browse.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9901-git-web--browse/.git/
 expecting success: 
@@ -341832,6 +342097,337 @@
 1..2
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
+*** t9161-git-svn-mergeinfo-push.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9161-git-svn-mergeinfo-push/.git/
+expecting success: 
+	svnadmin load -q '/build/git-2.20.1/t/trash directory.t9161-git-svn-mergeinfo-push/svnrepo' 	  < '/build/git-2.20.1/t/t9161/branches.dump' &&
+	git svn init --minimize-url -R svnmerge 	  -T trunk -b branches 'file:///build/git-2.20.1/t/trash directory.t9161-git-svn-mergeinfo-push/svnrepo' &&
+	git svn fetch --all
+	
+r1 = 3bd49f43c7bbcdce4f71fb1f256e700181553858 (refs/remotes/origin/trunk)
+Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9161-git-svn-mergeinfo-push/svnrepo/trunk => file:///build/git-2.20.1/t/trash%20directory.t9161-git-svn-mergeinfo-push/svnrepo/branches/svnb1, 1
+Found branch parent: (refs/remotes/origin/svnb1) 3bd49f43c7bbcdce4f71fb1f256e700181553858
+Following parent with do_switch
+Successfully followed parent
+r2 = 326d6a4c69859506546aa924f7366933af13d448 (refs/remotes/origin/svnb1)
+Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9161-git-svn-mergeinfo-push/svnrepo/trunk => file:///build/git-2.20.1/t/trash%20directory.t9161-git-svn-mergeinfo-push/svnrepo/branches/svnb2, 1
+Found branch parent: (refs/remotes/origin/svnb2) 3bd49f43c7bbcdce4f71fb1f256e700181553858
+Following parent with do_switch
+Successfully followed parent
+r3 = 15249b203fe62837dc94994226c9b271b988a390 (refs/remotes/origin/svnb2)
+Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9161-git-svn-mergeinfo-push/svnrepo/trunk => file:///build/git-2.20.1/t/trash%20directory.t9161-git-svn-mergeinfo-push/svnrepo/branches/svnb3, 1
+Found branch parent: (refs/remotes/origin/svnb3) 3bd49f43c7bbcdce4f71fb1f256e700181553858
+Following parent with do_switch
+Successfully followed parent
+r4 = 02c6c67d279fbc3bb7a0a8ddb83501f4bde3ed67 (refs/remotes/origin/svnb3)
+Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9161-git-svn-mergeinfo-push/svnrepo/trunk => file:///build/git-2.20.1/t/trash%20directory.t9161-git-svn-mergeinfo-push/svnrepo/branches/svnb4, 1
+Found branch parent: (refs/remotes/origin/svnb4) 3bd49f43c7bbcdce4f71fb1f256e700181553858
+Following parent with do_switch
+Successfully followed parent
+r5 = e37d2d6f5d9499a8a64fbaebee6e66335ccb82f3 (refs/remotes/origin/svnb4)
+Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9161-git-svn-mergeinfo-push/svnrepo/trunk => file:///build/git-2.20.1/t/trash%20directory.t9161-git-svn-mergeinfo-push/svnrepo/branches/svnb5, 1
+Found branch parent: (refs/remotes/origin/svnb5) 3bd49f43c7bbcdce4f71fb1f256e700181553858
+Following parent with do_switch
+Successfully followed parent
+r6 = 1592eb1f73f45a092c8c3b08b00eed6abec164f7 (refs/remotes/origin/svnb5)
+	A	b1file
+r7 = a88a9983c3e49a1ff7f1991149c9f20eafc2902c (refs/remotes/origin/svnb1)
+	A	b2file
+r8 = 3d3cd0ea4d0c8e0d2d2048cc161bebcbf6f3b595 (refs/remotes/origin/svnb2)
+	A	b3file
+r9 = d8f372046127bf97e47d5c0c1f83976d1eaa229c (refs/remotes/origin/svnb3)
+	A	b4file
+r10 = 71554700e35fb0fb11e2202345a038d1a4e71eab (refs/remotes/origin/svnb4)
+	A	b5file
+r11 = 4784ed8ad1ba755a2fe240f3b85c087d9d5ccac9 (refs/remotes/origin/svnb5)
+	A	b5file
+Checking svn:mergeinfo changes since r10: 1 sources, 1 changed
+Found merge parent (/branches/svnb5:6,11): 4784ed8ad1ba755a2fe240f3b85c087d9d5ccac9
+r12 = 353bb21bb7f9babd6426c3e21298b4091d2e4c83 (refs/remotes/origin/svnb4)
+Checked out HEAD:
+  file:///build/git-2.20.1/t/trash%20directory.t9161-git-svn-mergeinfo-push/svnrepo/trunk r1
+ok 1 - load svn dump
+
+expecting success: 
+	git config svn.pushmergeinfo yes &&
+	git checkout origin/svnb1 &&
+	git merge --no-ff origin/svnb2 &&
+	git svn dcommit
+	
+Note: checking out 'origin/svnb1'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by performing another checkout.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -b with the checkout command again. Example:
+
+  git checkout -b <new-branch-name>
+
+HEAD is now at a88a998 b1 commit
+Merging:
+a88a998 b1 commit
+virtual origin/svnb2
+found 1 common ancestor:
+3bd49f4 Base commit
+Merge made by the 'recursive' strategy.
+ b2file | 0
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 b2file
+Committing to file:///build/git-2.20.1/t/trash%20directory.t9161-git-svn-mergeinfo-push/svnrepo/branches/svnb1 ...
+	A	b2file
+Committed r13
+	A	b2file
+Checking svn:mergeinfo changes since r7: 1 sources, 1 changed
+Found merge parent (/branches/svnb2:3,8): 3d3cd0ea4d0c8e0d2d2048cc161bebcbf6f3b595
+r13 = 7647bd343eaa52282d95a32b4be61129dc5abca9 (refs/remotes/origin/svnb1)
+No changes between c3b143c4c67e51da1df1e265306e988148023061 and refs/remotes/origin/svnb1
+Resetting to the latest refs/remotes/origin/svnb1
+ok 2 - propagate merge information
+
+expecting success: 
+	mergeinfo=$(svn_cmd propget svn:mergeinfo "$svnrepo"/branches/svnb1) &&
+	test "$mergeinfo" = "/branches/svnb2:3,8"
+	
+ok 3 - check svn:mergeinfo
+
+expecting success: 
+	git merge --no-ff origin/svnb3 &&
+	git svn dcommit
+	
+Merging:
+7647bd3 Merge remote-tracking branch 'origin/svnb2' into HEAD
+virtual origin/svnb3
+found 1 common ancestor:
+3bd49f4 Base commit
+Merge made by the 'recursive' strategy.
+ b3file | 0
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 b3file
+Committing to file:///build/git-2.20.1/t/trash%20directory.t9161-git-svn-mergeinfo-push/svnrepo/branches/svnb1 ...
+	A	b3file
+Committed r14
+	A	b3file
+Checking svn:mergeinfo changes since r13: 2 sources, 1 changed
+Found merge parent (/branches/svnb3:4,9): d8f372046127bf97e47d5c0c1f83976d1eaa229c
+r14 = 87e78f6c1de6ef885045c3bbbb57753b1ff2fa33 (refs/remotes/origin/svnb1)
+No changes between 3c80567970084d3f4bcd83c3a4aa4045de45df68 and refs/remotes/origin/svnb1
+Resetting to the latest refs/remotes/origin/svnb1
+ok 4 - merge another branch
+
+expecting success: 
+	mergeinfo=$(svn_cmd propget svn:mergeinfo "$svnrepo"/branches/svnb1) &&
+	test "$mergeinfo" = "/branches/svnb2:3,8
+/branches/svnb3:4,9"
+	
+ok 5 - check primary parent mergeinfo respected
+
+expecting success: 
+	git merge --no-ff origin/svnb4 &&
+	git svn dcommit
+	
+Merging:
+87e78f6 Merge remote-tracking branch 'origin/svnb3' into HEAD
+virtual origin/svnb4
+found 1 common ancestor:
+3bd49f4 Base commit
+Merge made by the 'recursive' strategy.
+ b4file | 0
+ b5file | 0
+ 2 files changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 b4file
+ create mode 100644 b5file
+Committing to file:///build/git-2.20.1/t/trash%20directory.t9161-git-svn-mergeinfo-push/svnrepo/branches/svnb1 ...
+	A	b4file
+	A	b5file
+Committed r15
+	A	b4file
+	A	b5file
+Checking svn:mergeinfo changes since r14: 4 sources, 2 changed
+Found merge parent (/branches/svnb4:5-6,10-12): 353bb21bb7f9babd6426c3e21298b4091d2e4c83
+Found merge parent (/branches/svnb5:6,11): 4784ed8ad1ba755a2fe240f3b85c087d9d5ccac9
+r15 = 6a2abd975608f6388bc7766bfc0075dbadcd9a52 (refs/remotes/origin/svnb1)
+No changes between 33b9bc66ecc15c8339de9d02fac95d7db6256fbc and refs/remotes/origin/svnb1
+Resetting to the latest refs/remotes/origin/svnb1
+ok 6 - merge existing merge
+
+expecting success: 
+	mergeinfo=$(svn_cmd propget svn:mergeinfo "$svnrepo"/branches/svnb1) &&
+	test "$mergeinfo" = "/branches/svnb2:3,8
+/branches/svnb3:4,9
+/branches/svnb4:5-6,10-12
+/branches/svnb5:6,11"
+	
+ok 7 - check both parents' mergeinfo respected
+
+expecting success: 
+	git checkout origin/svnb2 &&
+	touch newb2file &&
+	git add newb2file &&
+	git commit -m "later b2 commit" &&
+	touch newb2file-2 &&
+	git add newb2file-2 &&
+	git commit -m "later b2 commit 2" &&
+	git svn dcommit
+	
+Previous HEAD position was 6a2abd9 Merge remote-tracking branch 'origin/svnb4' into HEAD
+HEAD is now at 3d3cd0e b2 commit
+[detached HEAD 3441932] later b2 commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 newb2file
+[detached HEAD d12c459] later b2 commit 2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 newb2file-2
+Committing to file:///build/git-2.20.1/t/trash%20directory.t9161-git-svn-mergeinfo-push/svnrepo/branches/svnb2 ...
+	A	newb2file
+Committed r16
+	A	newb2file
+r16 = a0e99bdab6ddd1d615fc5a2f5fb56f5f97058888 (refs/remotes/origin/svnb2)
+	A	newb2file-2
+Committed r17
+	A	newb2file-2
+r17 = 158cea57bbb57317aa0107a01110babd22e1a597 (refs/remotes/origin/svnb2)
+No changes between d12c45925c91cc929709eb3197354ecdd90b280b and refs/remotes/origin/svnb2
+Resetting to the latest refs/remotes/origin/svnb2
+ok 8 - make further commits to branch
+
+expecting success: 
+	git checkout origin/svnb1 &&
+	git merge --no-ff origin/svnb2 &&
+	git svn dcommit
+	
+Previous HEAD position was 158cea5 later b2 commit 2
+HEAD is now at 6a2abd9 Merge remote-tracking branch 'origin/svnb4' into HEAD
+Merging:
+6a2abd9 Merge remote-tracking branch 'origin/svnb4' into HEAD
+virtual origin/svnb2
+found 1 common ancestor:
+3d3cd0e b2 commit
+Merge made by the 'recursive' strategy.
+ newb2file   | 0
+ newb2file-2 | 0
+ 2 files changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 newb2file
+ create mode 100644 newb2file-2
+Committing to file:///build/git-2.20.1/t/trash%20directory.t9161-git-svn-mergeinfo-push/svnrepo/branches/svnb1 ...
+	A	newb2file
+	A	newb2file-2
+Committed r18
+	A	newb2file
+	A	newb2file-2
+Checking svn:mergeinfo changes since r15: 4 sources, 1 changed
+Found merge parent (/branches/svnb2:8,16-17): 158cea57bbb57317aa0107a01110babd22e1a597
+r18 = 9e74ff0818961eee05e24741c4193a99f114f1db (refs/remotes/origin/svnb1)
+No changes between 50096e486b36424aae42da311193908db58cdc15 and refs/remotes/origin/svnb1
+Resetting to the latest refs/remotes/origin/svnb1
+ok 9 - second forward merge
+
+expecting success: 
+	mergeinfo=$(svn_cmd propget svn:mergeinfo "$svnrepo"/branches/svnb1) &&
+	test "$mergeinfo" = "/branches/svnb2:3,8,16-17
+/branches/svnb3:4,9
+/branches/svnb4:5-6,10-12
+/branches/svnb5:6,11"
+	
+ok 10 - check new mergeinfo added
+
+expecting success: 
+	git checkout origin/svnb4 &&
+	git merge --no-ff origin/svnb1 &&
+	git svn dcommit
+	
+Previous HEAD position was 9e74ff0 Merge remote-tracking branch 'origin/svnb2' into HEAD
+HEAD is now at 353bb21 Merge remote-tracking branch 'svnb5' into HEAD
+Merging:
+353bb21 Merge remote-tracking branch 'svnb5' into HEAD
+virtual origin/svnb1
+found 1 common ancestor:
+353bb21 Merge remote-tracking branch 'svnb5' into HEAD
+Merge made by the 'recursive' strategy.
+ b1file      | 0
+ b2file      | 0
+ b3file      | 0
+ newb2file   | 0
+ newb2file-2 | 0
+ 5 files changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 b1file
+ create mode 100644 b2file
+ create mode 100644 b3file
+ create mode 100644 newb2file
+ create mode 100644 newb2file-2
+Committing to file:///build/git-2.20.1/t/trash%20directory.t9161-git-svn-mergeinfo-push/svnrepo/branches/svnb4 ...
+	A	b1file
+	A	b2file
+	A	b3file
+	A	newb2file
+	A	newb2file-2
+Committed r19
+	A	b1file
+	A	b2file
+	A	b3file
+	A	newb2file
+	A	newb2file-2
+Checking svn:mergeinfo changes since r12: 4 sources, 3 changed
+Found merge parent (/branches/svnb1:2-4,7-9,13-18): 9e74ff0818961eee05e24741c4193a99f114f1db
+Found merge parent (/branches/svnb2:3,8,16-17): 158cea57bbb57317aa0107a01110babd22e1a597
+Found merge parent (/branches/svnb3:4,9): d8f372046127bf97e47d5c0c1f83976d1eaa229c
+r19 = 82a0018c2399b1065d23720880fd950de654e3c6 (refs/remotes/origin/svnb4)
+No changes between 437860702d7c7f899955e03f7228a63462f3e446 and refs/remotes/origin/svnb4
+Resetting to the latest refs/remotes/origin/svnb4
+ok 11 - reintegration merge
+
+expecting success: 
+	mergeinfo=$(svn_cmd propget svn:mergeinfo "$svnrepo"/branches/svnb4) &&
+	test "$mergeinfo" = "/branches/svnb1:2-4,7-9,13-18
+/branches/svnb2:3,8,16-17
+/branches/svnb3:4,9
+/branches/svnb5:6,11"
+	
+ok 12 - check reintegration mergeinfo
+
+expecting success: 
+	git checkout origin/svnb1 &&
+	touch anotherfile &&
+	git add anotherfile &&
+	git commit -m "a commit" &&
+	git merge origin/svnb4 &&
+	git svn dcommit
+	
+Previous HEAD position was 82a0018 Merge remote-tracking branch 'origin/svnb1' into HEAD
+HEAD is now at 9e74ff0 Merge remote-tracking branch 'origin/svnb2' into HEAD
+[detached HEAD c980e3f] a commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 anotherfile
+Merging:
+c980e3f a commit
+virtual origin/svnb4
+found 1 common ancestor:
+9e74ff0 Merge remote-tracking branch 'origin/svnb2' into HEAD
+Already up to date!
+Merge made by the 'recursive' strategy.
+Committing to file:///build/git-2.20.1/t/trash%20directory.t9161-git-svn-mergeinfo-push/svnrepo/branches/svnb1 ...
+	A	anotherfile
+Committed r20
+	A	anotherfile
+r20 = 7cde7da297f156ce9ccf3564bfe63e395f491cb8 (refs/remotes/origin/svnb1)
+Committed r21
+No changes
+d046e51ad62fb5ce0f9605c28400f3bfd09a90d4~1 == d046e51ad62fb5ce0f9605c28400f3bfd09a90d4
+Checking svn:mergeinfo changes since r20: 4 sources, 1 changed
+Found merge parent (/branches/svnb4:10-12,19): 82a0018c2399b1065d23720880fd950de654e3c6
+r21 = 9bb10458f18f370467a6feef7d6bf3edabbb936c (refs/remotes/origin/svnb1)
+No changes between d046e51ad62fb5ce0f9605c28400f3bfd09a90d4 and refs/remotes/origin/svnb1
+Resetting to the latest refs/remotes/origin/svnb1
+ok 13 - dcommit a merge at the top of a stack
+
+# passed all 13 test(s)
+1..13
+make[4]: Leaving directory '/build/git-2.20.1/t'
+make[4]: Entering directory '/build/git-2.20.1/t'
 *** t9301-fast-import-notes.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9301-fast-import-notes/.git/
 expecting success: 
@@ -342350,64 +342946,198 @@
 1..17
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t9161-git-svn-mergeinfo-push.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9161-git-svn-mergeinfo-push/.git/
+*** t9602-cvsimport-branches-tags.sh ***
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9602-cvsimport-branches-tags/.git/
 expecting success: 
-	svnadmin load -q '/build/git-2.20.1/t/trash directory.t9161-git-svn-mergeinfo-push/svnrepo' 	  < '/build/git-2.20.1/t/t9161/branches.dump' &&
-	git svn init --minimize-url -R svnmerge 	  -T trunk -b branches 'file:///build/git-2.20.1/t/trash directory.t9161-git-svn-mergeinfo-push/svnrepo' &&
-	git svn fetch --all
-	
-r1 = 3bd49f43c7bbcdce4f71fb1f256e700181553858 (refs/remotes/origin/trunk)
-Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9161-git-svn-mergeinfo-push/svnrepo/trunk => file:///build/git-2.20.1/t/trash%20directory.t9161-git-svn-mergeinfo-push/svnrepo/branches/svnb1, 1
-Found branch parent: (refs/remotes/origin/svnb1) 3bd49f43c7bbcdce4f71fb1f256e700181553858
-Following parent with do_switch
-Successfully followed parent
-r2 = 326d6a4c69859506546aa924f7366933af13d448 (refs/remotes/origin/svnb1)
-Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9161-git-svn-mergeinfo-push/svnrepo/trunk => file:///build/git-2.20.1/t/trash%20directory.t9161-git-svn-mergeinfo-push/svnrepo/branches/svnb2, 1
-Found branch parent: (refs/remotes/origin/svnb2) 3bd49f43c7bbcdce4f71fb1f256e700181553858
-Following parent with do_switch
-Successfully followed parent
-r3 = 15249b203fe62837dc94994226c9b271b988a390 (refs/remotes/origin/svnb2)
-Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9161-git-svn-mergeinfo-push/svnrepo/trunk => file:///build/git-2.20.1/t/trash%20directory.t9161-git-svn-mergeinfo-push/svnrepo/branches/svnb3, 1
-Found branch parent: (refs/remotes/origin/svnb3) 3bd49f43c7bbcdce4f71fb1f256e700181553858
-Following parent with do_switch
-Successfully followed parent
-r4 = 02c6c67d279fbc3bb7a0a8ddb83501f4bde3ed67 (refs/remotes/origin/svnb3)
-Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9161-git-svn-mergeinfo-push/svnrepo/trunk => file:///build/git-2.20.1/t/trash%20directory.t9161-git-svn-mergeinfo-push/svnrepo/branches/svnb4, 1
-Found branch parent: (refs/remotes/origin/svnb4) 3bd49f43c7bbcdce4f71fb1f256e700181553858
-Following parent with do_switch
-Successfully followed parent
-r5 = e37d2d6f5d9499a8a64fbaebee6e66335ccb82f3 (refs/remotes/origin/svnb4)
-Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9161-git-svn-mergeinfo-push/svnrepo/trunk => file:///build/git-2.20.1/t/trash%20directory.t9161-git-svn-mergeinfo-push/svnrepo/branches/svnb5, 1
-Found branch parent: (refs/remotes/origin/svnb5) 3bd49f43c7bbcdce4f71fb1f256e700181553858
-Following parent with do_switch
-Successfully followed parent
-r6 = 1592eb1f73f45a092c8c3b08b00eed6abec164f7 (refs/remotes/origin/svnb5)
-	A	b1file
-r7 = a88a9983c3e49a1ff7f1991149c9f20eafc2902c (refs/remotes/origin/svnb1)
-	A	b2file
-r8 = 3d3cd0ea4d0c8e0d2d2048cc161bebcbf6f3b595 (refs/remotes/origin/svnb2)
-	A	b3file
-r9 = d8f372046127bf97e47d5c0c1f83976d1eaa229c (refs/remotes/origin/svnb3)
-	A	b4file
-r10 = 71554700e35fb0fb11e2202345a038d1a4e71eab (refs/remotes/origin/svnb4)
-	A	b5file
-r11 = 4784ed8ad1ba755a2fe240f3b85c087d9d5ccac9 (refs/remotes/origin/svnb5)
-	A	b5file
-Checking svn:mergeinfo changes since r10: 1 sources, 1 changed
-Found merge parent (/branches/svnb5:6,11): 4784ed8ad1ba755a2fe240f3b85c087d9d5ccac9
-r12 = 353bb21bb7f9babd6426c3e21298b4091d2e4c83 (refs/remotes/origin/svnb4)
-Checked out HEAD:
-  file:///build/git-2.20.1/t/trash%20directory.t9161-git-svn-mergeinfo-push/svnrepo/trunk r1
-ok 1 - load svn dump
+
+	git cvsimport -C module-git module
+
+
+Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9602-cvsimport-branches-tags/module-git/.git/
+ok 1 - import module
 
 expecting success: 
-	git config svn.pushmergeinfo yes &&
-	git checkout origin/svnb1 &&
-	git merge --no-ff origin/svnb2 &&
-	git svn dcommit
-	
-Note: checking out 'origin/svnb1'.
+
+	test_cmp_branch_tree master
+
+
+cvs checkout: Updating module-cvs-master
+U module-cvs-master/default
+cvs checkout: Updating module-cvs-master/sub1
+U module-cvs-master/sub1/default
+cvs checkout: Updating module-cvs-master/sub1/subsubA
+U module-cvs-master/sub1/subsubA/default
+cvs checkout: Updating module-cvs-master/sub1/subsubB
+U module-cvs-master/sub1/subsubB/default
+cvs checkout: Updating module-cvs-master/sub2
+U module-cvs-master/sub2/default
+cvs checkout: Updating module-cvs-master/sub2/subsubA
+U module-cvs-master/sub2/subsubA/default
+cvs checkout: Updating module-cvs-master/sub3
+U module-cvs-master/sub3/default
+Already on 'master'
+ok 2 - test branch master
+
+expecting success: 
+
+	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: 
+
+	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: 
+
+	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: 
+
+	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	2023-01-05 11:51:45.054868030 +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: 
+
+	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: 
+
+	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: 
+
+	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: checking out '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
@@ -342418,267 +343148,64 @@
 
   git checkout -b <new-branch-name>
 
-HEAD is now at a88a998 b1 commit
-Merging:
-a88a998 b1 commit
-virtual origin/svnb2
-found 1 common ancestor:
-3bd49f4 Base commit
-Merge made by the 'recursive' strategy.
- b2file | 0
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 b2file
-Committing to file:///build/git-2.20.1/t/trash%20directory.t9161-git-svn-mergeinfo-push/svnrepo/branches/svnb1 ...
-	A	b2file
-Committed r13
-	A	b2file
-Checking svn:mergeinfo changes since r7: 1 sources, 1 changed
-Found merge parent (/branches/svnb2:3,8): 3d3cd0ea4d0c8e0d2d2048cc161bebcbf6f3b595
-r13 = a7f49ea3cb7af926916db9d8c9f0d23748966399 (refs/remotes/origin/svnb1)
-No changes between 8ec7c4262844363530cc67d9b326c1ce7f0ccb10 and refs/remotes/origin/svnb1
-Resetting to the latest refs/remotes/origin/svnb1
-ok 2 - propagate merge information
-
-expecting success: 
-	mergeinfo=$(svn_cmd propget svn:mergeinfo "$svnrepo"/branches/svnb1) &&
-	test "$mergeinfo" = "/branches/svnb2:3,8"
-	
-ok 3 - check svn:mergeinfo
-
-expecting success: 
-	git merge --no-ff origin/svnb3 &&
-	git svn dcommit
-	
-Merging:
-a7f49ea Merge remote-tracking branch 'origin/svnb2' into HEAD
-virtual origin/svnb3
-found 1 common ancestor:
-3bd49f4 Base commit
-Merge made by the 'recursive' strategy.
- b3file | 0
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 b3file
-Committing to file:///build/git-2.20.1/t/trash%20directory.t9161-git-svn-mergeinfo-push/svnrepo/branches/svnb1 ...
-	A	b3file
-Committed r14
-	A	b3file
-Checking svn:mergeinfo changes since r13: 2 sources, 1 changed
-Found merge parent (/branches/svnb3:4,9): d8f372046127bf97e47d5c0c1f83976d1eaa229c
-r14 = 29ad4a2ab76d0d3f5e9c258ee010b231bc51d1ac (refs/remotes/origin/svnb1)
-No changes between 435d8d63e0747a7eb7f25ad9c82ee8f5f64dccfc and refs/remotes/origin/svnb1
-Resetting to the latest refs/remotes/origin/svnb1
-ok 4 - merge another branch
-
-expecting success: 
-	mergeinfo=$(svn_cmd propget svn:mergeinfo "$svnrepo"/branches/svnb1) &&
-	test "$mergeinfo" = "/branches/svnb2:3,8
-/branches/svnb3:4,9"
-	
-ok 5 - check primary parent mergeinfo respected
+HEAD is now at e9bb65d Initial import.
+ok 9 - test tag T_ALL_INITIAL_FILES
 
-expecting success: 
-	git merge --no-ff origin/svnb4 &&
-	git svn dcommit
-	
-Merging:
-29ad4a2 Merge remote-tracking branch 'origin/svnb3' into HEAD
-virtual origin/svnb4
-found 1 common ancestor:
-3bd49f4 Base commit
-Merge made by the 'recursive' strategy.
- b4file | 0
- b5file | 0
- 2 files changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 b4file
- create mode 100644 b5file
-Committing to file:///build/git-2.20.1/t/trash%20directory.t9161-git-svn-mergeinfo-push/svnrepo/branches/svnb1 ...
-	A	b4file
-	A	b5file
-Committed r15
-	A	b4file
-	A	b5file
-Checking svn:mergeinfo changes since r14: 4 sources, 2 changed
-Found merge parent (/branches/svnb4:5-6,10-12): 353bb21bb7f9babd6426c3e21298b4091d2e4c83
-Found merge parent (/branches/svnb5:6,11): 4784ed8ad1ba755a2fe240f3b85c087d9d5ccac9
-r15 = 69d960308e5d4d21fa6e63d687d869b97cd98383 (refs/remotes/origin/svnb1)
-No changes between ed19d567bf5877989e50d29081ae8b3f53046fb4 and refs/remotes/origin/svnb1
-Resetting to the latest refs/remotes/origin/svnb1
-ok 6 - merge existing merge
+checking known breakage: 
 
-expecting success: 
-	mergeinfo=$(svn_cmd propget svn:mergeinfo "$svnrepo"/branches/svnb1) &&
-	test "$mergeinfo" = "/branches/svnb2:3,8
-/branches/svnb3:4,9
-/branches/svnb4:5-6,10-12
-/branches/svnb5:6,11"
-	
-ok 7 - check both parents' mergeinfo respected
+	test_cmp_branch_tree T_ALL_INITIAL_FILES_BUT_ONE
 
-expecting success: 
-	git checkout origin/svnb2 &&
-	touch newb2file &&
-	git add newb2file &&
-	git commit -m "later b2 commit" &&
-	touch newb2file-2 &&
-	git add newb2file-2 &&
-	git commit -m "later b2 commit 2" &&
-	git svn dcommit
-	
-Previous HEAD position was 69d9603 Merge remote-tracking branch 'origin/svnb4' into HEAD
-HEAD is now at 3d3cd0e b2 commit
-[detached HEAD 2f451cc] later b2 commit
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 newb2file
-[detached HEAD 6b42e04] later b2 commit 2
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 newb2file-2
-Committing to file:///build/git-2.20.1/t/trash%20directory.t9161-git-svn-mergeinfo-push/svnrepo/branches/svnb2 ...
-	A	newb2file
-Committed r16
-	A	newb2file
-r16 = 43a62276d39692093d8ac0a1be962267c1cd2468 (refs/remotes/origin/svnb2)
-	A	newb2file-2
-Committed r17
-	A	newb2file-2
-r17 = cf31f0d0d1338ba36410f632b6f2d602a4b297a0 (refs/remotes/origin/svnb2)
-No changes between 6b42e0451bcaf8e7ece6319c05c48cea3dc7692d and refs/remotes/origin/svnb2
-Resetting to the latest refs/remotes/origin/svnb2
-ok 8 - make further commits to branch
 
-expecting success: 
-	git checkout origin/svnb1 &&
-	git merge --no-ff origin/svnb2 &&
-	git svn dcommit
-	
-Previous HEAD position was cf31f0d later b2 commit 2
-HEAD is now at 69d9603 Merge remote-tracking branch 'origin/svnb4' into HEAD
-Merging:
-69d9603 Merge remote-tracking branch 'origin/svnb4' into HEAD
-virtual origin/svnb2
-found 1 common ancestor:
-3d3cd0e b2 commit
-Merge made by the 'recursive' strategy.
- newb2file   | 0
- newb2file-2 | 0
- 2 files changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 newb2file
- create mode 100644 newb2file-2
-Committing to file:///build/git-2.20.1/t/trash%20directory.t9161-git-svn-mergeinfo-push/svnrepo/branches/svnb1 ...
-	A	newb2file
-	A	newb2file-2
-Committed r18
-	A	newb2file
-	A	newb2file-2
-Checking svn:mergeinfo changes since r15: 4 sources, 1 changed
-Found merge parent (/branches/svnb2:8,16-17): cf31f0d0d1338ba36410f632b6f2d602a4b297a0
-r18 = 10460d80a6dcc349257f166c12b17802120028e2 (refs/remotes/origin/svnb1)
-No changes between 09aa53a2baf6fe1d9723c0733071dc6da3ab6cb7 and refs/remotes/origin/svnb1
-Resetting to the latest refs/remotes/origin/svnb1
-ok 9 - second forward merge
+cvs checkout: Updating module-cvs-T_ALL_INITIAL_FILES_BUT_ONE
+U module-cvs-T_ALL_INITIAL_FILES_BUT_ONE/default
+cvs checkout: Updating module-cvs-T_ALL_INITIAL_FILES_BUT_ONE/sub1
+U module-cvs-T_ALL_INITIAL_FILES_BUT_ONE/sub1/default
+cvs checkout: Updating module-cvs-T_ALL_INITIAL_FILES_BUT_ONE/sub1/subsubA
+U module-cvs-T_ALL_INITIAL_FILES_BUT_ONE/sub1/subsubA/default
+cvs checkout: Updating module-cvs-T_ALL_INITIAL_FILES_BUT_ONE/sub1/subsubB
+cvs checkout: Updating module-cvs-T_ALL_INITIAL_FILES_BUT_ONE/sub2
+U module-cvs-T_ALL_INITIAL_FILES_BUT_ONE/sub2/default
+cvs checkout: Updating module-cvs-T_ALL_INITIAL_FILES_BUT_ONE/sub2/subsubA
+U module-cvs-T_ALL_INITIAL_FILES_BUT_ONE/sub2/subsubA/default
+cvs checkout: Updating module-cvs-T_ALL_INITIAL_FILES_BUT_ONE/sub3
+U module-cvs-T_ALL_INITIAL_FILES_BUT_ONE/sub3/default
+error: pathspec 'T_ALL_INITIAL_FILES_BUT_ONE' did not match any file(s) known to git
+not ok 10 - test tag T_ALL_INITIAL_FILES_BUT_ONE # TODO known breakage
 
-expecting success: 
-	mergeinfo=$(svn_cmd propget svn:mergeinfo "$svnrepo"/branches/svnb1) &&
-	test "$mergeinfo" = "/branches/svnb2:3,8,16-17
-/branches/svnb3:4,9
-/branches/svnb4:5-6,10-12
-/branches/svnb5:6,11"
-	
-ok 10 - check new mergeinfo added
+checking known breakage: 
 
-expecting success: 
-	git checkout origin/svnb4 &&
-	git merge --no-ff origin/svnb1 &&
-	git svn dcommit
-	
-Previous HEAD position was 10460d8 Merge remote-tracking branch 'origin/svnb2' into HEAD
-HEAD is now at 353bb21 Merge remote-tracking branch 'svnb5' into HEAD
-Merging:
-353bb21 Merge remote-tracking branch 'svnb5' into HEAD
-virtual origin/svnb1
-found 1 common ancestor:
-353bb21 Merge remote-tracking branch 'svnb5' into HEAD
-Merge made by the 'recursive' strategy.
- b1file      | 0
- b2file      | 0
- b3file      | 0
- newb2file   | 0
- newb2file-2 | 0
- 5 files changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 b1file
- create mode 100644 b2file
- create mode 100644 b3file
- create mode 100644 newb2file
- create mode 100644 newb2file-2
-Committing to file:///build/git-2.20.1/t/trash%20directory.t9161-git-svn-mergeinfo-push/svnrepo/branches/svnb4 ...
-	A	b1file
-	A	b2file
-	A	b3file
-	A	newb2file
-	A	newb2file-2
-Committed r19
-	A	b1file
-	A	b2file
-	A	b3file
-	A	newb2file
-	A	newb2file-2
-Checking svn:mergeinfo changes since r12: 4 sources, 3 changed
-Found merge parent (/branches/svnb1:2-4,7-9,13-18): 10460d80a6dcc349257f166c12b17802120028e2
-Found merge parent (/branches/svnb2:3,8,16-17): cf31f0d0d1338ba36410f632b6f2d602a4b297a0
-Found merge parent (/branches/svnb3:4,9): d8f372046127bf97e47d5c0c1f83976d1eaa229c
-r19 = 94e3ecc92b3a1d506b428b12b551935391a9a152 (refs/remotes/origin/svnb4)
-No changes between fb4af62ad99fa082e37237e565dbe93497cb01a6 and refs/remotes/origin/svnb4
-Resetting to the latest refs/remotes/origin/svnb4
-ok 11 - reintegration merge
+	test_cmp_branch_tree T_MIXED
 
-expecting success: 
-	mergeinfo=$(svn_cmd propget svn:mergeinfo "$svnrepo"/branches/svnb4) &&
-	test "$mergeinfo" = "/branches/svnb1:2-4,7-9,13-18
-/branches/svnb2:3,8,16-17
-/branches/svnb3:4,9
-/branches/svnb5:6,11"
-	
-ok 12 - check reintegration mergeinfo
 
-expecting success: 
-	git checkout origin/svnb1 &&
-	touch anotherfile &&
-	git add anotherfile &&
-	git commit -m "a commit" &&
-	git merge origin/svnb4 &&
-	git svn dcommit
-	
-Previous HEAD position was 94e3ecc Merge remote-tracking branch 'origin/svnb1' into HEAD
-HEAD is now at 10460d8 Merge remote-tracking branch 'origin/svnb2' into HEAD
-[detached HEAD 1b0a47e] a commit
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 anotherfile
-Merging:
-1b0a47e a commit
-virtual origin/svnb4
-found 1 common ancestor:
-10460d8 Merge remote-tracking branch 'origin/svnb2' into HEAD
-Already up to date!
-Merge made by the 'recursive' strategy.
-Committing to file:///build/git-2.20.1/t/trash%20directory.t9161-git-svn-mergeinfo-push/svnrepo/branches/svnb1 ...
-	A	anotherfile
-Committed r20
-	A	anotherfile
-r20 = 66d38d22b5104f9c17962ef5453c07f4e8d9601f (refs/remotes/origin/svnb1)
-Committed r21
-No changes
-9d2d588027f4b49353dd603adc22fcfa7373d1ce~1 == 9d2d588027f4b49353dd603adc22fcfa7373d1ce
-Checking svn:mergeinfo changes since r20: 4 sources, 1 changed
-Found merge parent (/branches/svnb4:10-12,19): 94e3ecc92b3a1d506b428b12b551935391a9a152
-r21 = 501e37171a51fe86087057a0fe5f43798d5da34f (refs/remotes/origin/svnb1)
-No changes between 9d2d588027f4b49353dd603adc22fcfa7373d1ce and refs/remotes/origin/svnb1
-Resetting to the latest refs/remotes/origin/svnb1
-ok 13 - dcommit a merge at the top of a stack
+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	2023-01-05 11:51:50.030868030 +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
 
-# passed all 13 test(s)
-1..13
+# still have 6 known breakage(s)
+# passed all remaining 5 test(s)
+1..11
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
 *** t9903-bash-prompt.sh ***
@@ -343702,268 +344229,6 @@
 1..65
 make[4]: Leaving directory '/build/git-2.20.1/t'
 make[4]: Entering directory '/build/git-2.20.1/t'
-*** t9602-cvsimport-branches-tags.sh ***
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9602-cvsimport-branches-tags/.git/
-expecting success: 
-
-	git cvsimport -C module-git module
-
-
-Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9602-cvsimport-branches-tags/module-git/.git/
-ok 1 - import module
-
-expecting success: 
-
-	test_cmp_branch_tree master
-
-
-cvs checkout: Updating module-cvs-master
-U module-cvs-master/default
-cvs checkout: Updating module-cvs-master/sub1
-U module-cvs-master/sub1/default
-cvs checkout: Updating module-cvs-master/sub1/subsubA
-U module-cvs-master/sub1/subsubA/default
-cvs checkout: Updating module-cvs-master/sub1/subsubB
-U module-cvs-master/sub1/subsubB/default
-cvs checkout: Updating module-cvs-master/sub2
-U module-cvs-master/sub2/default
-cvs checkout: Updating module-cvs-master/sub2/subsubA
-U module-cvs-master/sub2/subsubA/default
-cvs checkout: Updating module-cvs-master/sub3
-U module-cvs-master/sub3/default
-Already on 'master'
-ok 2 - test branch master
-
-expecting success: 
-
-	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: 
-
-	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: 
-
-	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: 
-
-	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	2021-12-03 05:11:29.032869636 +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: 
-
-	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: 
-
-	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: 
-
-	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: checking out '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 performing another checkout.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -b with the checkout command again. Example:
-
-  git checkout -b <new-branch-name>
-
-HEAD is now at e9bb65d Initial import.
-ok 9 - test tag T_ALL_INITIAL_FILES
-
-checking known breakage: 
-
-	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: 
-
-	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	2021-12-03 05:11:34.032724287 +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/git-2.20.1/t'
-make[4]: Entering directory '/build/git-2.20.1/t'
 *** t9902-completion.sh ***
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9902-completion/.git/
 expecting success: 
@@ -344505,9 +344770,9 @@
 	rm -f .git/FETCH_HEAD &&
 	git init thirdrepo
 
-[master (root-commit) e15c214] initial
+[master (root-commit) 1cb8271] initial
  Author: A U Thor <author@example.com>
-[master (root-commit) e15c214] initial
+[master (root-commit) 1cb8271] initial
  Author: A U Thor <author@example.com>
 From /build/git-2.20.1/t/trash directory.t9902-completion/otherrepo/
  * [new branch]      branch-in-other -> other/branch-in-other
@@ -344972,9 +345237,9 @@
 	git update-ref -d refs/remotes/other/matching/branch-in-other &&
 	git -C otherrepo branch -D matching/branch-in-other
 
-Deleted branch matching/branch (was e15c214).
-Deleted tag 'matching/tag' (was e15c214)
-Deleted branch matching/branch-in-other (was e15c214).
+Deleted branch matching/branch (was 1cb8271).
+Deleted tag 'matching/tag' (was 1cb8271)
+Deleted branch matching/branch-in-other (was 1cb8271).
 ok 83 - teardown after filtering matching refs
 
 expecting success: 
@@ -345180,8 +345445,8 @@
 	git tag -d matching-tag &&
 	git remote remove other
 
-Deleted branch matching-branch (was e15c214).
-Deleted tag 'matching-tag' (was e15c214)
+Deleted branch matching-branch (was 1cb8271).
+Deleted tag 'matching-tag' (was 1cb8271)
 ok 97 - teardown after ref completion
 
 expecting success: 
@@ -345439,7 +345704,7 @@
 	git branch mybranch &&
 	git tag mytag
 
-[master f96c955] one
+[master 8f52f14] one
  Author: A U Thor <author@example.com>
  2 files changed, 2 insertions(+)
  create mode 100644 file1
@@ -345487,7 +345752,7 @@
 	name with spaces Z
 	EOF
 
-[master ba1c3e1] spaces
+[master dfcaf12] spaces
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 name with spaces
@@ -345502,7 +345767,7 @@
 	name with spaces Z
 	EOF
 
-[master a2aca64] meta
+[master e31a777] meta
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 name with ${meta}
@@ -345583,15 +345848,15 @@
 	test_completion "git add mom" "momified"
 
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9902-completion/tmp/.git/
-[master (root-commit) 57d580b] ignore
+[master (root-commit) 0a77bca] ignore
  Author: A U Thor <author@example.com>
  1 file changed, 3 insertions(+)
  create mode 100644 .gitignore
-[master 0be33a3] new
+[master 9dc2d4e] new
  Author: A U Thor <author@example.com>
  1 file changed, 0 insertions(+), 0 deletions(-)
  create mode 100644 new
-[master 447328f] dir
+[master 33b7efa] dir
  Author: A U Thor <author@example.com>
  2 files changed, 0 insertions(+), 0 deletions(-)
  rename new => dir/file-in-dir (100%)
@@ -345645,8 +345910,8 @@
 	test_completion "git add ~/tmp/" "~/tmp/file"
 
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9902-completion/tmp/.git/
---- expected	2021-12-03 05:11:34.440712426 +0000
-+++ out_sorted	2021-12-03 05:11:34.456711961 +0000
+--- expected	2023-01-05 11:51:52.666868030 +0000
++++ out_sorted	2023-01-05 11:51:52.678868030 +0000
 @@ -1 +1 @@
 -~/tmp/file
 +
@@ -345688,8 +345953,8 @@
 		) &&
 		test_cmp expected out
 	
---- expected	2021-12-03 05:11:34.576708472 +0000
-+++ out	2021-12-03 05:11:34.588708124 +0000
+--- expected	2023-01-05 11:51:52.778868030 +0000
++++ out	2023-01-05 11:51:52.790868030 +0000
 @@ -1 +1 @@
 -master-in-other 
 +master 
@@ -345721,8 +345986,8 @@
 		) &&
 		test_cmp expected out
 	
---- expected	2021-12-03 05:11:34.652706263 +0000
-+++ out	2021-12-03 05:11:34.664705914 +0000
+--- expected	2023-01-05 11:51:52.850868030 +0000
++++ out	2023-01-05 11:51:52.866868030 +0000
 @@ -1 +1 @@
 -master-in-other 
 +master 
@@ -345804,11 +346069,11 @@
 Updating '.':
 U    auto_updated_file
 Updated to revision 3.
---- auto_updated_file	2021-12-03 05:11:03.185621031 +0000
-+++ au_file_saved	2021-12-03 05:11:02.857630566 +0000
+--- auto_updated_file	2023-01-05 11:51:24.278868030 +0000
++++ au_file_saved	2023-01-05 11:51:24.030868030 +0000
 @@ -1,2 +1 @@
  
--3589677
+-2967324
 ok 2 - check if post-commit hook creates a concurrent commit
 
 expecting success: 
@@ -345854,34 +346119,34 @@
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9164-git-svn-dcommit-concurrent/work1.git/.git/
 	A	auto_updated_file
 	A	file
-r1 = b671fe0811eae2ad20fb740b095ce8bc0d70e3f7 (refs/remotes/git-svn)
+r1 = 318c82961815275819681142feab1f6f2d173f3c (refs/remotes/git-svn)
 	M	file
-r2 = eb766715b0c66ee7002e764cc3356a2d6d1e5fb5 (refs/remotes/git-svn)
+r2 = d61be438bc3c2ea1d17f33b732a61c6ede415e24 (refs/remotes/git-svn)
 	M	auto_updated_file
-r3 = dff1a2a9066da6983d5ec276a6c4bdd52785dd2a (refs/remotes/git-svn)
+r3 = 7b186037a17d4ca2a00d8de081ef3127f88a79f7 (refs/remotes/git-svn)
 	M	file
-r4 = 8378219ab1593c987f689cb343908c3ce4001629 (refs/remotes/git-svn)
+r4 = dece7cb3d1b676db0171fb78612390e1b80e14f0 (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/git-2.20.1/t/trash%20directory.t9164-git-svn-dcommit-concurrent/svnrepo r4
-[master 7eeaec0] commit change 1.1
+[master f0cce1c] commit change 1.1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[master 8b1e924] commit change 1.2
+[master 91dd945] commit change 1.2
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[master 413ba22] commit change 1.3
+[master 4b4058a] commit change 1.3
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 Committing to file:///build/git-2.20.1/t/trash%20directory.t9164-git-svn-dcommit-concurrent/svnrepo ...
 	M	file
 Committed r5
 	M	file
-r5 = f64ecef41a0e0ccc31f093a1cce63e8d87be296b (refs/remotes/git-svn)
+r5 = 2504f946a59896ab29372e62891d9c8240a18b64 (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: 413ba2268219276cadc391b3ed0cdb7b9e675962 and refs/remotes/git-svn differ, using rebase:
+W: 4b4058aae9afb4284f9fb3c41c1f6b0990fd0e5a and refs/remotes/git-svn differ, using rebase:
 :100644 100644 fb014dd41485c73acf40cd9548cd4cd812fee4ec e6ac0ef8373861d92d8eecf8d88e592606a70872 M	file
 First, rewinding head to replay your work on top of it...
 Applying: commit change 1.2
@@ -345913,46 +346178,46 @@
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9164-git-svn-dcommit-concurrent/work2.git/.git/
 	A	auto_updated_file
 	A	file
-r1 = b671fe0811eae2ad20fb740b095ce8bc0d70e3f7 (refs/remotes/git-svn)
+r1 = 318c82961815275819681142feab1f6f2d173f3c (refs/remotes/git-svn)
 	M	file
-r2 = eb766715b0c66ee7002e764cc3356a2d6d1e5fb5 (refs/remotes/git-svn)
+r2 = d61be438bc3c2ea1d17f33b732a61c6ede415e24 (refs/remotes/git-svn)
 	M	auto_updated_file
-r3 = dff1a2a9066da6983d5ec276a6c4bdd52785dd2a (refs/remotes/git-svn)
+r3 = 7b186037a17d4ca2a00d8de081ef3127f88a79f7 (refs/remotes/git-svn)
 	M	file
-r4 = 8378219ab1593c987f689cb343908c3ce4001629 (refs/remotes/git-svn)
+r4 = dece7cb3d1b676db0171fb78612390e1b80e14f0 (refs/remotes/git-svn)
 	M	file
-r5 = f64ecef41a0e0ccc31f093a1cce63e8d87be296b (refs/remotes/git-svn)
+r5 = 2504f946a59896ab29372e62891d9c8240a18b64 (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/git-2.20.1/t/trash%20directory.t9164-git-svn-dcommit-concurrent/svnrepo r5
-[master 8603fc6] commit change 2.1
+[master 1dc5a83] commit change 2.1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[master eaebf47] commit change 2.2
+[master 4d2181d] commit change 2.2
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[master 26f15e6] commit change 2.3
+[master f7fe61c] commit change 2.3
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 Committing to file:///build/git-2.20.1/t/trash%20directory.t9164-git-svn-dcommit-concurrent/svnrepo ...
 	M	file
 Committed r6
 	M	file
-r6 = 199a4ee80bb339a3794da85628add8a0e689b744 (refs/remotes/git-svn)
+r6 = 5e1ff89cbd9bd0f29c4ae6c3322f09926e9e29f8 (refs/remotes/git-svn)
 	M	file
 Committed r7
 	M	file
-r7 = 6fff8859863729bec42ecc67b8cb643be149b7cb (refs/remotes/git-svn)
+r7 = c3298c14103cbaf13229415000d7d7db480d67a7 (refs/remotes/git-svn)
 	M	auto_updated_file
-r8 = 09171707190f3cbe6df78c222e9a9bcf7bdc9a33 (refs/remotes/git-svn)
-W: eaebf47dde6d34247b3d9f91a27cbcd7bacfe382 and refs/remotes/git-svn differ, using rebase:
-:100644 100644 e2581315a28ecd39504cac429be9e96cd832d7c6 126c651de6c8ef1f5a1cabf1039e090378c92e61 M	auto_updated_file
+r8 = 5aec95c03e95692337c5120806f6d8934cad0a96 (refs/remotes/git-svn)
+W: 4d2181d7d558cc8466c5ed7268cd75c0b1d471b6 and refs/remotes/git-svn differ, using rebase:
+:100644 100644 4d1edad3bf098fcf36d0ea5c29333367c11c17c7 f06a759cad6a9da80e6acf50d473e86f5b8bb0c7 M	auto_updated_file
 First, rewinding head to replay your work on top of it...
 Applying: commit change 2.3
 	M	file
 Committed r9
 	M	file
-r9 = c0472e2dfc7d005d9d1f5ea4fa27c2b4272d37e6 (refs/remotes/git-svn)
-No changes between 8c5f7fe1767a938a55e88b3d3e7c3959a6ba4ef3 and refs/remotes/git-svn
+r9 = fed17011f5e36c8ead9ea5bd62098a49d00446a1 (refs/remotes/git-svn)
+No changes between 288cd81264f9f4356e80af9e87d44b5b26fcca26 and refs/remotes/git-svn
 Resetting to the latest refs/remotes/git-svn
 Updating '.':
 U    file
@@ -345984,54 +346249,54 @@
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9164-git-svn-dcommit-concurrent/work3.git/.git/
 	A	auto_updated_file
 	A	file
-r1 = b671fe0811eae2ad20fb740b095ce8bc0d70e3f7 (refs/remotes/git-svn)
+r1 = 318c82961815275819681142feab1f6f2d173f3c (refs/remotes/git-svn)
 	M	file
-r2 = eb766715b0c66ee7002e764cc3356a2d6d1e5fb5 (refs/remotes/git-svn)
+r2 = d61be438bc3c2ea1d17f33b732a61c6ede415e24 (refs/remotes/git-svn)
 	M	auto_updated_file
-r3 = dff1a2a9066da6983d5ec276a6c4bdd52785dd2a (refs/remotes/git-svn)
+r3 = 7b186037a17d4ca2a00d8de081ef3127f88a79f7 (refs/remotes/git-svn)
 	M	file
-r4 = 8378219ab1593c987f689cb343908c3ce4001629 (refs/remotes/git-svn)
+r4 = dece7cb3d1b676db0171fb78612390e1b80e14f0 (refs/remotes/git-svn)
 	M	file
-r5 = f64ecef41a0e0ccc31f093a1cce63e8d87be296b (refs/remotes/git-svn)
+r5 = 2504f946a59896ab29372e62891d9c8240a18b64 (refs/remotes/git-svn)
 	M	file
-r6 = 199a4ee80bb339a3794da85628add8a0e689b744 (refs/remotes/git-svn)
+r6 = 5e1ff89cbd9bd0f29c4ae6c3322f09926e9e29f8 (refs/remotes/git-svn)
 	M	file
-r7 = 6fff8859863729bec42ecc67b8cb643be149b7cb (refs/remotes/git-svn)
+r7 = c3298c14103cbaf13229415000d7d7db480d67a7 (refs/remotes/git-svn)
 	M	auto_updated_file
-r8 = 09171707190f3cbe6df78c222e9a9bcf7bdc9a33 (refs/remotes/git-svn)
+r8 = 5aec95c03e95692337c5120806f6d8934cad0a96 (refs/remotes/git-svn)
 	M	file
-r9 = c0472e2dfc7d005d9d1f5ea4fa27c2b4272d37e6 (refs/remotes/git-svn)
+r9 = fed17011f5e36c8ead9ea5bd62098a49d00446a1 (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/git-2.20.1/t/trash%20directory.t9164-git-svn-dcommit-concurrent/svnrepo r9
-[master 1e284c9] commit change 3.1
+[master b266cb9] commit change 3.1
  Author: A U Thor <author@example.com>
  1 file changed, 7 insertions(+)
-[master 519d92a] commit change 3.2
+[master ae2ae05] commit change 3.2
  Author: A U Thor <author@example.com>
  1 file changed, 1 deletion(-)
-[master d94c7d7] commit change 3.3
+[master 653c8bb] commit change 3.3
  Author: A U Thor <author@example.com>
  1 file changed, 1 deletion(-)
 Committing to file:///build/git-2.20.1/t/trash%20directory.t9164-git-svn-dcommit-concurrent/svnrepo ...
 	M	auto_updated_file
 Committed r10
 	M	auto_updated_file
-r10 = 0457f9614ff54ac23fb449970b8098f5a9cb87b2 (refs/remotes/git-svn)
+r10 = 40f37d9a01b2bce457ec3c6f527c3a200a142691 (refs/remotes/git-svn)
 	M	auto_updated_file
 Committed r11
 	M	auto_updated_file
-r11 = e32ab91159f82d383ddb46767143d07970c319f2 (refs/remotes/git-svn)
+r11 = 530b5355952230ede05c230ff6cbd29d47fedcdc (refs/remotes/git-svn)
 	M	auto_updated_file
-r12 = e427ddfe3e42cc1f1c569d86977e366c053c373f (refs/remotes/git-svn)
-W: 519d92a19f69bb66ffc15d8d46984c08e649d5fc and refs/remotes/git-svn differ, using rebase:
-:100644 100644 012dc3f9eeb700cc3ca8c0476d57b0d55ffc6b19 0bfce118a3b7cb2bf59a5fa9dba938b4403bdf19 M	auto_updated_file
+r12 = c27c7da9cc15953bac58e6cbf8b5b0720886f248 (refs/remotes/git-svn)
+W: ae2ae056d5c503cb82ebee123592ffc678db9bfe and refs/remotes/git-svn differ, using rebase:
+:100644 100644 6e133d230fd55bc97f41af9a2814ffed2297dfc0 66657673e189813533214d7b67bf19e8c3bf4438 M	auto_updated_file
 First, rewinding head to replay your work on top of it...
 Applying: commit change 3.3
 	M	auto_updated_file
 Committed r13
 	M	auto_updated_file
-r13 = 7cfe64005c1e527e38e790cb373065e349f2c4aa (refs/remotes/git-svn)
-No changes between c2d97f7354224c21cfc45607fd4c5508d8591ed0 and refs/remotes/git-svn
+r13 = 11c1bbfc105d73914d6849300ee5c4979851527c (refs/remotes/git-svn)
+No changes between 1632fd5ee8bda79a314ed2fad0a8049e299f3913 and refs/remotes/git-svn
 Resetting to the latest refs/remotes/git-svn
 Updating '.':
 U    auto_updated_file
@@ -346061,40 +346326,40 @@
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9164-git-svn-dcommit-concurrent/work4.git/.git/
 	A	auto_updated_file
 	A	file
-r1 = b671fe0811eae2ad20fb740b095ce8bc0d70e3f7 (refs/remotes/git-svn)
+r1 = 318c82961815275819681142feab1f6f2d173f3c (refs/remotes/git-svn)
 	M	file
-r2 = eb766715b0c66ee7002e764cc3356a2d6d1e5fb5 (refs/remotes/git-svn)
+r2 = d61be438bc3c2ea1d17f33b732a61c6ede415e24 (refs/remotes/git-svn)
 	M	auto_updated_file
-r3 = dff1a2a9066da6983d5ec276a6c4bdd52785dd2a (refs/remotes/git-svn)
+r3 = 7b186037a17d4ca2a00d8de081ef3127f88a79f7 (refs/remotes/git-svn)
 	M	file
-r4 = 8378219ab1593c987f689cb343908c3ce4001629 (refs/remotes/git-svn)
+r4 = dece7cb3d1b676db0171fb78612390e1b80e14f0 (refs/remotes/git-svn)
 	M	file
-r5 = f64ecef41a0e0ccc31f093a1cce63e8d87be296b (refs/remotes/git-svn)
+r5 = 2504f946a59896ab29372e62891d9c8240a18b64 (refs/remotes/git-svn)
 	M	file
-r6 = 199a4ee80bb339a3794da85628add8a0e689b744 (refs/remotes/git-svn)
+r6 = 5e1ff89cbd9bd0f29c4ae6c3322f09926e9e29f8 (refs/remotes/git-svn)
 	M	file
-r7 = 6fff8859863729bec42ecc67b8cb643be149b7cb (refs/remotes/git-svn)
+r7 = c3298c14103cbaf13229415000d7d7db480d67a7 (refs/remotes/git-svn)
 	M	auto_updated_file
-r8 = 09171707190f3cbe6df78c222e9a9bcf7bdc9a33 (refs/remotes/git-svn)
+r8 = 5aec95c03e95692337c5120806f6d8934cad0a96 (refs/remotes/git-svn)
 	M	file
-r9 = c0472e2dfc7d005d9d1f5ea4fa27c2b4272d37e6 (refs/remotes/git-svn)
+r9 = fed17011f5e36c8ead9ea5bd62098a49d00446a1 (refs/remotes/git-svn)
 	M	auto_updated_file
-r10 = 0457f9614ff54ac23fb449970b8098f5a9cb87b2 (refs/remotes/git-svn)
+r10 = 40f37d9a01b2bce457ec3c6f527c3a200a142691 (refs/remotes/git-svn)
 	M	auto_updated_file
-r11 = e32ab91159f82d383ddb46767143d07970c319f2 (refs/remotes/git-svn)
+r11 = 530b5355952230ede05c230ff6cbd29d47fedcdc (refs/remotes/git-svn)
 	M	auto_updated_file
-r12 = e427ddfe3e42cc1f1c569d86977e366c053c373f (refs/remotes/git-svn)
+r12 = c27c7da9cc15953bac58e6cbf8b5b0720886f248 (refs/remotes/git-svn)
 	M	auto_updated_file
-r13 = 7cfe64005c1e527e38e790cb373065e349f2c4aa (refs/remotes/git-svn)
+r13 = 11c1bbfc105d73914d6849300ee5c4979851527c (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/git-2.20.1/t/trash%20directory.t9164-git-svn-dcommit-concurrent/svnrepo r13
-[master bbf10c9] commit change 4.1
+[master 93f6743] commit change 4.1
  Author: A U Thor <author@example.com>
  1 file changed, 7 insertions(+)
-[master da43906] commit change 4.2
+[master d8bf68d] commit change 4.2
  Author: A U Thor <author@example.com>
  1 file changed, 1 deletion(-)
-[master a3d4f34] commit change 4.3
+[master 6593e84] commit change 4.3
  Author: A U Thor <author@example.com>
  1 file changed, 1 deletion(-)
 Committing to file:///build/git-2.20.1/t/trash%20directory.t9164-git-svn-dcommit-concurrent/svnrepo ...
@@ -346103,13 +346368,13 @@
 	M	auto_updated_file
 Committed r14
 	M	auto_updated_file
-r14 = 6831df058cd799ad551c4ee2f35e5d909b863571 (refs/remotes/git-svn)
+r14 = 076b78cb7d5bc6a106c38f79d34bba4e1d4541dc (refs/remotes/git-svn)
 	M	auto_updated_file
 Committed r15
 	M	auto_updated_file
-r15 = 1875148963150e49b600bab1892b9c62a05502bc (refs/remotes/git-svn)
+r15 = b4a9fd38e734598de1b3cf8b9588b575a0d7dd64 (refs/remotes/git-svn)
 	M	auto_updated_file
-r16 = efc06837e664c9544d6e26300ceae1058c34dcd4 (refs/remotes/git-svn)
+r16 = 3437ea8c627147b121fd79be914fdba46f2db2fc (refs/remotes/git-svn)
 
 ERROR from SVN:
 Transaction is out of date: File '/auto_updated_file' is out of date
@@ -346136,67 +346401,67 @@
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9164-git-svn-dcommit-concurrent/work5.git/.git/
 	A	auto_updated_file
 	A	file
-r1 = b671fe0811eae2ad20fb740b095ce8bc0d70e3f7 (refs/remotes/git-svn)
+r1 = 318c82961815275819681142feab1f6f2d173f3c (refs/remotes/git-svn)
 	M	file
-r2 = eb766715b0c66ee7002e764cc3356a2d6d1e5fb5 (refs/remotes/git-svn)
+r2 = d61be438bc3c2ea1d17f33b732a61c6ede415e24 (refs/remotes/git-svn)
 	M	auto_updated_file
-r3 = dff1a2a9066da6983d5ec276a6c4bdd52785dd2a (refs/remotes/git-svn)
+r3 = 7b186037a17d4ca2a00d8de081ef3127f88a79f7 (refs/remotes/git-svn)
 	M	file
-r4 = 8378219ab1593c987f689cb343908c3ce4001629 (refs/remotes/git-svn)
+r4 = dece7cb3d1b676db0171fb78612390e1b80e14f0 (refs/remotes/git-svn)
 	M	file
-r5 = f64ecef41a0e0ccc31f093a1cce63e8d87be296b (refs/remotes/git-svn)
+r5 = 2504f946a59896ab29372e62891d9c8240a18b64 (refs/remotes/git-svn)
 	M	file
-r6 = 199a4ee80bb339a3794da85628add8a0e689b744 (refs/remotes/git-svn)
+r6 = 5e1ff89cbd9bd0f29c4ae6c3322f09926e9e29f8 (refs/remotes/git-svn)
 	M	file
-r7 = 6fff8859863729bec42ecc67b8cb643be149b7cb (refs/remotes/git-svn)
+r7 = c3298c14103cbaf13229415000d7d7db480d67a7 (refs/remotes/git-svn)
 	M	auto_updated_file
-r8 = 09171707190f3cbe6df78c222e9a9bcf7bdc9a33 (refs/remotes/git-svn)
+r8 = 5aec95c03e95692337c5120806f6d8934cad0a96 (refs/remotes/git-svn)
 	M	file
-r9 = c0472e2dfc7d005d9d1f5ea4fa27c2b4272d37e6 (refs/remotes/git-svn)
+r9 = fed17011f5e36c8ead9ea5bd62098a49d00446a1 (refs/remotes/git-svn)
 	M	auto_updated_file
-r10 = 0457f9614ff54ac23fb449970b8098f5a9cb87b2 (refs/remotes/git-svn)
+r10 = 40f37d9a01b2bce457ec3c6f527c3a200a142691 (refs/remotes/git-svn)
 	M	auto_updated_file
-r11 = e32ab91159f82d383ddb46767143d07970c319f2 (refs/remotes/git-svn)
+r11 = 530b5355952230ede05c230ff6cbd29d47fedcdc (refs/remotes/git-svn)
 	M	auto_updated_file
-r12 = e427ddfe3e42cc1f1c569d86977e366c053c373f (refs/remotes/git-svn)
+r12 = c27c7da9cc15953bac58e6cbf8b5b0720886f248 (refs/remotes/git-svn)
 	M	auto_updated_file
-r13 = 7cfe64005c1e527e38e790cb373065e349f2c4aa (refs/remotes/git-svn)
+r13 = 11c1bbfc105d73914d6849300ee5c4979851527c (refs/remotes/git-svn)
 	M	auto_updated_file
-r14 = 6831df058cd799ad551c4ee2f35e5d909b863571 (refs/remotes/git-svn)
+r14 = 076b78cb7d5bc6a106c38f79d34bba4e1d4541dc (refs/remotes/git-svn)
 	M	auto_updated_file
-r15 = 1875148963150e49b600bab1892b9c62a05502bc (refs/remotes/git-svn)
+r15 = b4a9fd38e734598de1b3cf8b9588b575a0d7dd64 (refs/remotes/git-svn)
 	M	auto_updated_file
-r16 = efc06837e664c9544d6e26300ceae1058c34dcd4 (refs/remotes/git-svn)
+r16 = 3437ea8c627147b121fd79be914fdba46f2db2fc (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/git-2.20.1/t/trash%20directory.t9164-git-svn-dcommit-concurrent/svnrepo r16
-[master bd11bdb] commit change 5.1
+[master ffad649] commit change 5.1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[master ac4a880] commit change 5.2
+[master 3e4a90a] commit change 5.2
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[master c142c21] commit change 5.3
+[master bb08d68] commit change 5.3
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 Committing to file:///build/git-2.20.1/t/trash%20directory.t9164-git-svn-dcommit-concurrent/svnrepo ...
 	M	file
 Committed r17
 	M	file
-r17 = adc66199f968e10a63bdf0005767c627816e583a (refs/remotes/git-svn)
+r17 = d8f3d5184de229a32a54adff9df124bde6f48e7f (refs/remotes/git-svn)
 	M	auto_updated_file
-r18 = 96c03ab4c747ac6030ea177785942674b51a27c7 (refs/remotes/git-svn)
-W: bd11bdbe77899bfb0dc4ac1704096d9d9a74de32 and refs/remotes/git-svn differ, using rebase:
-:100644 100644 5a97350b5c780641f392e94ee91e7d96e09a30f7 129c99162248c61583bcf2066e6b865bccf02b35 M	auto_updated_file
+r18 = a8099f69f0ba15abdb18c4d9dec215ebb048145e (refs/remotes/git-svn)
+W: ffad6499178d9771c5823afc0f9a4a0dc46bcc27 and refs/remotes/git-svn differ, using rebase:
+:100644 100644 1762087eda56dceb5c06dc9b9ed4e1d6211c1dee 459cf43c16adaa79dfb5aba0280fe4aaefdd29f0 M	auto_updated_file
 First, rewinding head to replay your work on top of it...
 Applying: commit change 5.2
 Using index info to reconstruct a base tree...
 M	auto_updated_file
 Falling back to patching base and 3-way merge...
 Merging:
-96c03ab auto-committing concurrent change
+a8099f6 auto-committing concurrent change
 virtual commit change 5.2
 found 1 common ancestor:
-virtual 53cb3ed7069fbc1c6da90a751bc31189ebf0fa2b
+virtual ea5b2af45c7ce7c7de609f09af5dc9ce0735a985
 Auto-merging auto_updated_file
 CONFLICT (content): Merge conflict in auto_updated_file
 error: Failed to merge in the changes.
@@ -346251,7 +346516,7 @@
      test_cmp C/newfile3.png ../C/newfile3.png &&
      test_cmp D/newfile4.png ../D/newfile4.png
      )
-[master 0f98628] Test: New file
+[master b925007] Test: New file
  Author: A U Thor <author@example.com>
  4 files changed, 2 insertions(+)
  create mode 100644 A/newfile1.txt
@@ -346311,7 +346576,7 @@
      test_cmp E/newfile5.txt ../E/newfile5.txt &&
      test_cmp F/newfile6.png ../F/newfile6.png
      )
-[master ec92789] Test: Remove, add and update
+[master 6370826] 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
@@ -346358,10 +346623,10 @@
      (cd "$CVSWORK" &&
      test_must_fail git cvsexportcommit -c $id
      )
-[master 2f64530] generatiion 1
+[master cd5f473] generatiion 1
  Author: A U Thor <author@example.com>
  1 file changed, 0 insertions(+), 0 deletions(-)
-[master 419a2d9] generation 2
+[master 3dcb00d] generation 2
  Author: A U Thor <author@example.com>
  1 file changed, 0 insertions(+), 0 deletions(-)
 Checking if patch will apply
@@ -346387,8 +346652,8 @@
      test_cmp E/newfile5.txt ../E/newfile5.txt &&
      test_cmp F/newfile6.png ../F/newfile6.png
      )
-HEAD is now at ec92789 Test: Remove, add and update
-[master 99ad8bf] test: remove only a binary file
+HEAD is now at 6370826 Test: Remove, add and update
+[master a041bd5] 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
@@ -346420,7 +346685,7 @@
      test_cmp E/newfile5.txt ../E/newfile5.txt &&
      test_cmp F/newfile6.png ../F/newfile6.png
      )
-[master 47d5427] test: remove only a binary file
+[master d200ab0] test: remove only a binary file
  Author: A U Thor <author@example.com>
  1 file changed, 2 deletions(-)
  delete mode 100644 A/newfile1.txt
@@ -346449,7 +346714,7 @@
       git cvsexportcommit -c $id &&
       check_entries "G g" "with spaces.png/1.1/-kb|with spaces.txt/1.1/"
       )
-[master dcd568a] With spaces
+[master 583b7cb] With spaces
  Author: A U Thor <author@example.com>
  2 files changed, 1 insertion(+)
  create mode 100644 G g/with spaces.png
@@ -346482,7 +346747,7 @@
       git cvsexportcommit -c $id &&
       check_entries "G g" "with spaces.png/1.2/-kb|with spaces.txt/1.2/"
       )
-[master 70461a8] Update with spaces
+[master 9d3d351] Update with spaces
  Author: A U Thor <author@example.com>
  2 files changed, 1 insertion(+)
 Checking if patch will apply
@@ -346512,12 +346777,12 @@
       "Å/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 e2386ea] Går det så går det
+[master 203e053] 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 e2386eab3283a9eaea3db292985c708c818620ef from parent 70461a8bd01af6f43f97e6c4c186a66315aea208
+Applying to CVS commit 203e053544bd9d68bcaaa6a2aca359913f07146b from parent 9d3d3517eebcfaefbf77ac3c3d74a5704c4a13ca
 Checking if patch will apply
 Applying
 Patch applied successfully. Adding new files and directories to CVS
@@ -346577,10 +346842,10 @@
       (cd "$CVSWORK" &&
       test_must_fail git cvsexportcommit -c $id
       )
-[master 310bdf5] Update one
+[master b9284d8] Update one
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[master bb50dd4] Update two
+[master a9d1272] Update two
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 Checking if patch will apply
@@ -346611,7 +346876,7 @@
       test -x G/on &&
       ! test -x G/off
       )
-[master 01fc834] Execute test
+[master abb9cf1] Execute test
  Author: A U Thor <author@example.com>
  2 files changed, 2 insertions(+)
  create mode 100644 G/off
@@ -346650,7 +346915,7 @@
       test_cmp "$CVSWORK/W/file2.txt" ../W/file2.txt
       )
 
-[master a7fb5bd] More updates
+[master 13304f6] More updates
  Author: A U Thor <author@example.com>
  2 files changed, 2 insertions(+)
  create mode 100644 W/file1.txt
@@ -346696,7 +346961,7 @@
 	test_cmp "$CVSWORK/release-notes" release-notes
 
 
-[master 12e24b4] Add release notes
+[master 27379f5] Add release notes
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 release-notes
@@ -346713,7 +346978,7 @@
 /build/git-2.20.1/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/release-notes,v  <--  release-notes
 initial revision: 1.1
 Committed successfully to CVS
-[master 4a09131] Add two files with the same basename
+[master f7eb7fa] 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
@@ -346757,7 +347022,7 @@
     (cd "$CVSWORK" && cvs -Q update -d) &&
     test -f "$CVSWORK/attic_gremlin"
 
-[master a82d26d] Added attic_gremlin
+[master ee6bd4a] Added attic_gremlin
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 attic_gremlin
@@ -346789,7 +347054,7 @@
 	test_cmp "$CVSWORK/ space" " space"
 
 
-[master 751fa76] Add a file with a leading space
+[master a6991e9] Add a file with a leading space
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644  space
@@ -346897,11 +347162,11 @@
 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/git-2.20.1/t/trash directory.t9200-git-cvsexportcommit/shared/.git/
-[master (root-commit) 625b6e1] fake initial commit
+[master (root-commit) 834cb8a] fake initial commit
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644  space
-[master 5a67ee8] Another change
+[master bcf1cdd] Another change
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 Checking if patch will apply
@@ -346912,7 +347177,7 @@
 Autocommit
   cvs commit -F .msg  space
 Committed successfully to CVS
-HEAD is now at 5a67ee8 Another change
+HEAD is now at bcf1cdd Another change
 Hello
 ok 15 - use the same checkout for Git and CVS
 
@@ -346942,7 +347207,7 @@
   echo cvsuser:cvGVEarMLnhlA > "$SERVERDIR/auth.db"
 
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9400-git-cvsserver-server/secondroot/.git/
-[master (root-commit) ea3c52f] second root
+[master (root-commit) deaa492] second root
  Author: A U Thor <author@example.com>
  1 file changed, 0 insertions(+), 0 deletions(-)
  create mode 100644 secondrootfile
@@ -346950,8 +347215,8 @@
 From secondroot
  * branch            master     -> FETCH_HEAD
 Merging:
-1ad987c First Commit
-virtual ea3c52f9391a25f7f557061e174dc1588ba47611
+8e3adec First Commit
+virtual deaa49208bba01e1534326512e3d421d128081f2
 found 0 common ancestors:
 Merge made by the 'recursive' strategy.
  secondrootfile | 0
@@ -347126,7 +347391,7 @@
    test "$(echo $(grep testfile1 CVS/Entries|cut -d/ -f2,3,5))" = "testfile1/1.1/" &&
    test_cmp testfile1 ../testfile1
 To gitcvs.git
-   8165419..3da5b7b  master -> master
+   b259a52..0cd9303  master -> master
 U testfile1
 ok 24 - cvs update (create new file)
 
@@ -347139,7 +347404,7 @@
    test "$(echo $(grep testfile1 CVS/Entries|cut -d/ -f2,3,5))" = "testfile1/1.2/" &&
    test_cmp testfile1 ../testfile1
 To gitcvs.git
-   3da5b7b..e6d931f  master -> master
+   0cd9303..f5752ed  master -> master
 U testfile1
 ok 25 - cvs update (update existing file)
 
@@ -347154,7 +347419,7 @@
    test ! -d test
 
 To gitcvs.git
-   e6d931f..4d115d8  master -> master
+   f5752ed..8ebbc38  master -> master
 U test/empty
 not ok 26 - cvs update w/o -d doesn't create subdir (TODO) # TODO known breakage
 
@@ -347178,7 +347443,7 @@
     done) &&
    test ! -f failure
 To gitcvs.git
-   4d115d8..48fa2b3  master -> master
+   8ebbc38..d552e16  master -> master
 U A/file_in_A
 U E/file_in_E
 U A/B/file_in_A B
@@ -347195,7 +347460,7 @@
    test ! -f testfile1
 rm 'testfile1'
 To gitcvs.git
-   48fa2b3..713ef4a  master -> master
+   d552e16..f7ec93c  master -> master
 cvs update: `testfile1' is no longer in the repository
 ok 28 - cvs update (delete file)
 
@@ -347208,7 +347473,7 @@
    test "$(echo $(grep testfile1 CVS/Entries|cut -d/ -f2,3,5))" = "testfile1/1.4/" &&
    test_cmp testfile1 ../testfile1
 To gitcvs.git
-   713ef4a..5c125be  master -> master
+   f7ec93c..8954163  master -> master
 U testfile1
 ok 29 - cvs update (re-add deleted file)
 
@@ -347238,10 +347503,10 @@
    GIT_CONFIG="$git_config" cvs -Q update &&
    test_cmp merge ../expected
 To gitcvs.git
-   5c125be..950d7b4  master -> master
+   8954163..daf3b40  master -> master
 U merge
 To gitcvs.git
-   950d7b4..a6a669a  master -> master
+   daf3b40..df82475  master -> master
 Merging differences between 1.1 and 1.2 into merge
 M merge
 ok 30 - cvs update (merge)
@@ -347255,7 +347520,7 @@
    GIT_CONFIG="$git_config" cvs -Q update &&
    test_cmp merge ../expected.C
 To gitcvs.git
-   a6a669a..a912d11  master -> master
+   df82475..a505e31  master -> master
 Merging differences between 1.2 and 1.3 into merge
 cvs update: conflicts found in merge
 C merge
@@ -347286,7 +347551,7 @@
     GIT_CONFIG="$git_config" cvs -Q update &&
     test_cmp merge ../merge
 To gitcvs.git
-   a912d11..9909a16  master -> master
+   a505e31..d550ad6  master -> master
 Merging differences between 1.3 and 1.4 into merge
 M merge
 ok 33 - cvs update (merge no-op)
@@ -347306,7 +347571,7 @@
     done
 
 To gitcvs.git
-   9909a16..c9a3944  master -> master
+   d550ad6..e348210  master -> master
 cvs update: Updating .
 M merge
 U no-lf
@@ -347340,20 +347605,20 @@
     test_line_count = 2 ../out
 
 To gitcvs.git
-   c9a3944..7973c41  master -> master
+   e348210..9896e0d  master -> master
+cvs update: Updating .
 Use of uninitialized value $wrev in string ne at /build/git-2.20.1/git-cvsserver line 1263.
 Use of uninitialized value $wrev in string ne at /build/git-2.20.1/git-cvsserver line 1308.
+cvs update: `empty.out' is no longer in the repository
 Use of uninitialized value $wrev in string ne at /build/git-2.20.1/git-cvsserver line 1263.
 Use of uninitialized value $wrev in string ne at /build/git-2.20.1/git-cvsserver line 1308.
+M merge
+cvs update: `merge.out' is no longer in the repository
 Use of uninitialized value $wrev in string ne at /build/git-2.20.1/git-cvsserver line 1263.
 Use of uninitialized value $wrev in string ne at /build/git-2.20.1/git-cvsserver line 1308.
+cvs update: `no-lf.out' is no longer in the repository
 Use of uninitialized value $wrev in string ne at /build/git-2.20.1/git-cvsserver line 1263.
 Use of uninitialized value $wrev in string ne at /build/git-2.20.1/git-cvsserver line 1308.
-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
@@ -347467,25 +347732,25 @@
 description:
 ----------------------------
 revision 1.4
-date: 2021/12/03 05:11:32;  author: author;  state: Exp;  lines: +2 -3
+date: 2023/01/05 11:51:52;  author: author;  state: Exp;  lines: +2 -3
 
 Merge test (no-op)
  
 ----------------------------
 revision 1.3
-date: 2021/12/03 05:11:30;  author: author;  state: Exp;  lines: +2 -3
+date: 2023/01/05 11:51:50;  author: author;  state: Exp;  lines: +2 -3
 
 Merge test (conflict)
  
 ----------------------------
 revision 1.2
-date: 2021/12/03 05:11:28;  author: author;  state: Exp;  lines: +2 -3
+date: 2023/01/05 11:51:48;  author: author;  state: Exp;  lines: +2 -3
 
 Merge test (merge)
  
 ----------------------------
 revision 1.1
-date: 2021/12/03 05:11:27;  author: author;  state: Exp;  lines: +2 -3
+date: 2023/01/05 11:51:47;  author: author;  state: Exp;  lines: +2 -3
 
 Merge test (pre-merge)
  
@@ -347611,7 +347876,7 @@
 
 From gitcvs
  * branch            HEAD       -> FETCH_HEAD
-Updating 9661dad..f9287d7
+Updating e257389..43dd7f7
 Fast-forward
  subdir/src.c    | 1 +
  subdir/temp.bin | 1 +
@@ -347619,7 +347884,7 @@
  create mode 100644 subdir/src.c
  create mode 100644 subdir/temp.bin
 To gitcvs.git
-   f9287d7..52ba8eb  master -> master
+   43dd7f7..840d13d  master -> master
 Use of uninitialized value $wrev in string ne at /build/git-2.20.1/git-cvsserver line 1263.
 Use of uninitialized value $wrev in string ne at /build/git-2.20.1/git-cvsserver line 1308.
 U binfile.bin
@@ -347662,7 +347927,7 @@
     git push gitcvs.git >/dev/null
 
 To gitcvs.git
-   52ba8eb..52bdd02  master -> master
+   840d13d..3403ce7  master -> master
 ok 9 - setup multi-line files
 
 expecting success: 
@@ -347827,7 +348092,7 @@
 
 From gitcvs
  * branch            master     -> FETCH_HEAD
-Updating 52bdd02..0569a1e
+Updating 3403ce7..166b874
 Fast-forward
  simpleBin.bin     | Bin 0 -> 27 bytes
  simpleText.c      |   1 +
@@ -347839,7 +348104,7 @@
  delete mode 100644 subdir/file.h
  delete mode 100644 subdir/withCr.bin
 To gitcvs.git
-   0569a1e..4b0e544  master -> master
+   166b874..7ef7cff  master -> master
 ok 18 - update/merge full other copy (guess)
 
 # passed all 18 test(s)
@@ -347854,7 +348119,7 @@
 	git add file &&
 	GIT_AUTHOR_NAME="A" git commit -a -m "Initial."
 
-[master (root-commit) 0fba449] Initial.
+[master (root-commit) 43ee015] Initial.
  Author: A <author@example.com>
  1 file changed, 2 insertions(+)
  create mode 100644 file
@@ -347877,7 +348142,7 @@
 	git add fake.sendmail &&
 	GIT_AUTHOR_NAME="A" git commit -a -m "Second."
 
-[master fa9efd3] Second.
+[master e20c067] Second.
  Author: A <author@example.com>
  1 file changed, 12 insertions(+)
  create mode 100755 fake.sendmail
@@ -347922,8 +348187,8 @@
 	One <one@example.com>,
 	two@example.com
 Subject: [PATCH 1/1] Second.
-Date: Fri,  3 Dec 2021 05:10:00 +0000
-Message-Id: <20211203051000.3470662-1-nobody@example.com>
+Date: Thu,  5 Jan 2023 11:50:12 +0000
+Message-Id: <20230105115012.2879948-1-nobody@example.com>
 X-Mailer: git-send-email 2.20.1
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -347962,8 +348227,8 @@
 	One <one@example.com>,
 	two@example.com
 Subject: [PATCH 1/1] Second.
-Date: Fri,  3 Dec 2021 05:10:01 +0000
-Message-Id: <20211203051001.3473177-1-nobody@example.com>
+Date: Thu,  5 Jan 2023 11:50:13 +0000
+Message-Id: <20230105115013.2882358-1-nobody@example.com>
 X-Mailer: git-send-email 2.20.1
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -348004,8 +348269,8 @@
 	One <one@example.com>,
 	two@example.com
 Subject: [PATCH 1/1] Second.
-Date: Fri,  3 Dec 2021 05:10:02 +0000
-Message-Id: <20211203051002.3475022-1-nobody@example.com>
+Date: Thu,  5 Jan 2023 11:50:14 +0000
+Message-Id: <20230105115014.2884377-1-nobody@example.com>
 X-Mailer: git-send-email 2.20.1
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -348062,16 +348327,16 @@
 		--smtp-server="$(pwd)/fake.sendmail" &&
 	test_cmp expected-cc commandline1
 
-[master 8762411] cc-trailer
+[master 247fd7c] cc-trailer
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 cc-trailer.t
-[master eb5ce3e] Test Cc: trailers.
+[master f349c9b] Test Cc: trailers.
  Author: A U Thor <author@example.com>
  Date: Thu Apr 7 15:13:13 2005 -0700
  1 file changed, 1 insertion(+)
  create mode 100644 cc-trailer.t
-/tmp/N0tguOcRHi/0001-Test-Cc-trailers.patch
+/tmp/PSmBRULoFH/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'
@@ -348091,14 +348356,14 @@
 	five@example.com,
 	six@example.com
 Subject: [PATCH] Test Cc: trailers.
-Date: Fri,  3 Dec 2021 05:10:03 +0000
-Message-Id: <20211203051003.3477488-1-author@example.com>
+Date: Thu,  5 Jan 2023 11:50:14 +0000
+Message-Id: <20230105115014.2886702-1-author@example.com>
 X-Mailer: git-send-email 2.20.1
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
 
 Result: OK
-HEAD is now at fa9efd3 Second.
+HEAD is now at e20c067 Second.
 ok 17 - cc trailer with various syntax
 
 expecting success: 
@@ -348120,7 +348385,7 @@
 		--smtp-server="$(pwd)/fake.sendmail" &&
 	test_cmp expected-cc commandline1
 
-/tmp/sUCMudUJ5B/0001-Second.patch
+/tmp/fRCC2wdwpl/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'
@@ -348140,8 +348405,8 @@
 	five@example.com (open list:FOR THING (FOO/bar)),
 	six@example.com (open list)
 Subject: [PATCH] Second.
-Date: Fri,  3 Dec 2021 05:10:03 +0000
-Message-Id: <20211203051003.3479714-1-author@example.com>
+Date: Thu,  5 Jan 2023 11:50:15 +0000
+Message-Id: <20230105115015.2888823-1-author@example.com>
 X-Mailer: git-send-email 2.20.1
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -348188,11 +348453,11 @@
 expecting success: 
 	test_suppress_self_unquoted 'A U Thor' 'author@example.com' 		'self_name_suppressed'
 
-[master ee973d2] unquoted-self_name_suppressed
+[master d902fd4] unquoted-self_name_suppressed
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 unquoted-self_name_suppressed.t
-[master daba759] test suppress-cc.self unquoted-self_name_suppressed with name A U Thor email author@example.com
+[master d94c7e6] test suppress-cc.self unquoted-self_name_suppressed with name A U Thor email author@example.com
  Author: A U Thor <author@example.com>
  Date: Thu Apr 7 15:14:13 2005 -0700
  1 file changed, 1 insertion(+)
@@ -348203,24 +348468,24 @@
 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: Fri,  3 Dec 2021 05:10:04 +0000
-Message-Id: <20211203051004.3481639-1-author@example.com>
+Date: Thu,  5 Jan 2023 11:50:16 +0000
+Message-Id: <20230105115016.2890882-1-author@example.com>
 X-Mailer: git-send-email 2.20.1
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
 
 Result: OK
-HEAD is now at fa9efd3 Second.
+HEAD is now at e20c067 Second.
 ok 21 - self name is suppressed
 
 expecting success: 
 	test_suppress_self_quoted 'A U. Thor' 'author@example.com' 		'self_name_dot_suppressed'
 
-[master 1434889] quoted-self_name_dot_suppressed
+[master c67fa9a] quoted-self_name_dot_suppressed
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 quoted-self_name_dot_suppressed.t
-[master 86a506e] test suppress-cc.self quoted-self_name_dot_suppressed with name A U. Thor email author@example.com
+[master f21bc30] test suppress-cc.self quoted-self_name_dot_suppressed with name A U. Thor email author@example.com
  Author: A U. Thor <author@example.com>
  Date: Thu Apr 7 15:15:13 2005 -0700
  1 file changed, 1 insertion(+)
@@ -348231,24 +348496,24 @@
 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: Fri,  3 Dec 2021 05:10:05 +0000
-Message-Id: <20211203051005.3483288-1-author@example.com>
+Date: Thu,  5 Jan 2023 11:50:17 +0000
+Message-Id: <20230105115017.2892835-1-author@example.com>
 X-Mailer: git-send-email 2.20.1
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
 
 Result: OK
-HEAD is now at fa9efd3 Second.
+HEAD is now at e20c067 Second.
 ok 22 - self name with dot is suppressed
 
 expecting success: 
 	test_suppress_self_quoted 'Füñný Nâmé' 'odd_?=mail@example.com' 		'non_ascii_self_suppressed'
 
-[master 51ea3be] quoted-non_ascii_self_suppressed
+[master 8601703] quoted-non_ascii_self_suppressed
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 quoted-non_ascii_self_suppressed.t
-[master 51a5ed6] test suppress-cc.self quoted-non_ascii_self_suppressed with name Füñný Nâmé email odd_?=mail@example.com
+[master e5c2e56] test suppress-cc.self quoted-non_ascii_self_suppressed with name Füñný Nâmé email odd_?=mail@example.com
  Author: Füñný Nâmé <odd_?=mail@example.com>
  Date: Thu Apr 7 15:16:13 2005 -0700
  1 file changed, 1 insertion(+)
@@ -348259,25 +348524,25 @@
 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: Fri,  3 Dec 2021 05:10:06 +0000
-Message-Id: <20211203051006.3484908-1-odd_?=mail@example.com>
+Date: Thu,  5 Jan 2023 11:50:18 +0000
+Message-Id: <20230105115018.2894570-1-odd_?=mail@example.com>
 X-Mailer: git-send-email 2.20.1
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
 
 Result: OK
-HEAD is now at fa9efd3 Second.
+HEAD is now at e20c067 Second.
 ok 23 - non-ascii self name is suppressed
 
 expecting success: 
 	test_suppress_self_quoted 'Ƒüñníęř €. Nâ�é' 'odd_?=mail@example.com' 		'long_non_ascii_self_suppressed'
 
-[master 0d42f67] quoted-long_non_ascii_self_suppressed
+[master 52eea85] quoted-long_non_ascii_self_suppressed
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 quoted-long_non_ascii_self_suppressed.t
-[master 2ed0d89] test suppress-cc.self quoted-long_non_ascii_self_suppressed with name Ƒüñníęř €. Nâ�é email odd_?=mail@example.com
+[master 846ae57] test suppress-cc.self quoted-long_non_ascii_self_suppressed with name Ƒüñníęř €. Nâ�é email odd_?=mail@example.com
  Author: Ƒüñníęř €. Nâ�é <odd_?=mail@example.com>
  Date: Thu Apr 7 15:17:13 2005 -0700
  1 file changed, 1 insertion(+)
@@ -348288,25 +348553,25 @@
 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: Fri,  3 Dec 2021 05:10:08 +0000
-Message-Id: <20211203051008.3486677-1-odd_?=mail@example.com>
+Date: Thu,  5 Jan 2023 11:50:19 +0000
+Message-Id: <20230105115019.2896230-1-odd_?=mail@example.com>
 X-Mailer: git-send-email 2.20.1
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
 
 Result: OK
-HEAD is now at fa9efd3 Second.
+HEAD is now at e20c067 Second.
 ok 24 - long non-ascii self name is suppressed
 
 expecting success: 
 	test_suppress_self_unquoted '"A U. Thor"' 'author@example.com' 		'self_name_sanitized_suppressed'
 
-[master 15520b1] unquoted-self_name_sanitized_suppressed
+[master 0b42cbe] unquoted-self_name_sanitized_suppressed
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 unquoted-self_name_sanitized_suppressed.t
-[master 410ceb4] test suppress-cc.self unquoted-self_name_sanitized_suppressed with name "A U. Thor" email author@example.com
+[master 070b8fd] test suppress-cc.self unquoted-self_name_sanitized_suppressed with name "A U. Thor" email author@example.com
  Author: A U. Thor <author@example.com>
  Date: Thu Apr 7 15:18:13 2005 -0700
  1 file changed, 1 insertion(+)
@@ -348317,14 +348582,14 @@
 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: Fri,  3 Dec 2021 05:10:09 +0000
-Message-Id: <20211203051009.3488362-1-author@example.com>
+Date: Thu,  5 Jan 2023 11:50:20 +0000
+Message-Id: <20230105115020.2898035-1-author@example.com>
 X-Mailer: git-send-email 2.20.1
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
 
 Result: OK
-HEAD is now at fa9efd3 Second.
+HEAD is now at e20c067 Second.
 ok 25 - sanitized self name is suppressed
 
 expecting success: 
@@ -348369,8 +348634,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Fri,  3 Dec 2021 05:10:12 +0000
-Message-Id: <20211203051012.3491254-1-author@example.com>
+Date: Thu,  5 Jan 2023 11:50:21 +0000
+Message-Id: <20230105115021.2901090-1-author@example.com>
 X-Mailer: git-send-email 2.20.1
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -348390,20 +348655,9 @@
 	git var GIT_AUTHOR_IDENT
 
 )
-
-*** 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@ionos1-amd64.debian.net>) not allowed
-prerequisite AUTOIDENT not satisfied
-skipping test: implicit ident is allowed 
+second user <pbuilder2@ionos5-amd64.debian.net> 1112912293 -0700
+prerequisite AUTOIDENT ok
+expecting success: 
 	clean_fake_sendmail &&
 	(sane_unset GIT_AUTHOR_NAME &&
 	sane_unset GIT_AUTHOR_EMAIL &&
@@ -348415,9 +348669,30 @@
 		$patches </dev/null 2>errors
 	)
 
-ok 28 # skip implicit ident is allowed (missing AUTOIDENT of PERL,AUTOIDENT)
+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/git-2.20.1/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@ionos5-amd64.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,  5 Jan 2023 11:50:22 +0000
+Message-Id: <20230105115022.2902829-1-pbuilder2@ionos5-amd64.debian.net>
+X-Mailer: git-send-email 2.20.1
+MIME-Version: 1.0
+Content-Transfer-Encoding: 8bit
+
+Result: OK
+ok 28 - implicit ident is allowed
 
-expecting success: 
+skipping test: broken implicit ident aborts send-email 
 	clean_fake_sendmail &&
 	(sane_unset GIT_AUTHOR_NAME &&
 	sane_unset GIT_AUTHOR_EMAIL &&
@@ -348431,8 +348706,7 @@
 	test_i18ngrep "tell me who you are" errors
 	)
 
-*** Please tell me who you are.
-ok 29 - broken implicit ident aborts send-email
+ok 29 # skip broken implicit ident aborts send-email (missing !AUTOIDENT of PERL,!AUTOIDENT)
 
 expecting success: 
 	write_script tocmd-sed <<-\EOF &&
@@ -348471,8 +348745,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Fri,  3 Dec 2021 05:10:14 +0000
-Message-Id: <20211203051014.3494144-1-nobody@example.com>
+Date: Thu,  5 Jan 2023 11:50:22 +0000
+Message-Id: <20230105115022.2904248-1-nobody@example.com>
 X-Mailer: git-send-email 2.20.1
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -348510,8 +348784,8 @@
 	C O Mitter <committer@example.com>,
 	cccmd@example.com
 Subject: [PATCH 1/1] Second.
-Date: Fri,  3 Dec 2021 05:10:14 +0000
-Message-Id: <20211203051014.3495353-1-nobody@example.com>
+Date: Thu,  5 Jan 2023 11:50:23 +0000
+Message-Id: <20230105115023.2905866-1-nobody@example.com>
 X-Mailer: git-send-email 2.20.1
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -348568,8 +348842,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Fri,  3 Dec 2021 05:10:16 +0000
-Message-Id: <20211203051016.3498043-1-nobody@example.com>
+Date: Thu,  5 Jan 2023 11:50:25 +0000
+Message-Id: <20230105115025.2908934-1-nobody@example.com>
 X-Mailer: git-send-email 2.20.1
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -348602,8 +348876,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Fri,  3 Dec 2021 05:10:17 +0000
-Message-Id: <20211203051017.3499139-1-author@example.com>
+Date: Thu,  5 Jan 2023 11:50:25 +0000
+Message-Id: <20230105115025.2910149-1-author@example.com>
 X-Mailer: git-send-email 2.20.1
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -348635,8 +348909,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Fri,  3 Dec 2021 05:10:16 +0000
-Message-Id: <20211203051017.3500382-1-nobody@example.com>
+Date: Thu,  5 Jan 2023 11:50:25 +0000
+Message-Id: <20230105115026.2911419-1-nobody@example.com>
 X-Mailer: git-send-email 2.20.1
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -348655,11 +348929,11 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Fri,  3 Dec 2021 05:10:17 +0000
-Message-Id: <20211203051017.3500382-2-nobody@example.com>
+Date: Thu,  5 Jan 2023 11:50:26 +0000
+Message-Id: <20230105115026.2911419-2-nobody@example.com>
 X-Mailer: git-send-email 2.20.1
-In-Reply-To: <20211203051017.3500382-1-nobody@example.com>
-References: <20211203051017.3500382-1-nobody@example.com>
+In-Reply-To: <20230105115026.2911419-1-nobody@example.com>
+References: <20230105115026.2911419-1-nobody@example.com>
 MIME-Version: 1.0
 Content-Transfer-Encoding: quoted-printable
 
@@ -348690,8 +348964,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Fri,  3 Dec 2021 05:10:18 +0000
-Message-Id: <20211203051018.3501655-1-author@example.com>
+Date: Thu,  5 Jan 2023 11:50:27 +0000
+Message-Id: <20230105115027.2912838-1-author@example.com>
 X-Mailer: git-send-email 2.20.1
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -348725,8 +348999,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Fri,  3 Dec 2021 05:10:19 +0000
-Message-Id: <20211203051019.3502749-1-nobody@example.com>
+Date: Thu,  5 Jan 2023 11:50:28 +0000
+Message-Id: <20230105115028.2914157-1-nobody@example.com>
 X-Mailer: git-send-email 2.20.1
 MIME-Version: 1.0
 Content-Transfer-Encoding: quoted-printable
@@ -348759,8 +349033,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Fri,  3 Dec 2021 05:10:19 +0000
-Message-Id: <20211203051020.3503980-1-nobody@example.com>
+Date: Thu,  5 Jan 2023 11:50:27 +0000
+Message-Id: <20230105115028.2915625-1-nobody@example.com>
 X-Mailer: git-send-email 2.20.1
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -348779,11 +349053,11 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Fri,  3 Dec 2021 05:10:20 +0000
-Message-Id: <20211203051020.3503980-2-nobody@example.com>
+Date: Thu,  5 Jan 2023 11:50:28 +0000
+Message-Id: <20230105115028.2915625-2-nobody@example.com>
 X-Mailer: git-send-email 2.20.1
-In-Reply-To: <20211203051020.3503980-1-nobody@example.com>
-References: <20211203051020.3503980-1-nobody@example.com>
+In-Reply-To: <20230105115028.2915625-1-nobody@example.com>
+References: <20230105115028.2915625-1-nobody@example.com>
 MIME-Version: 1.0
 Content-Transfer-Encoding: quoted-printable
 
@@ -348814,8 +349088,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Fri,  3 Dec 2021 05:10:19 +0000
-Message-Id: <20211203051020.3505170-1-nobody@example.com>
+Date: Thu,  5 Jan 2023 11:50:28 +0000
+Message-Id: <20230105115029.2916823-1-nobody@example.com>
 X-Mailer: git-send-email 2.20.1
 MIME-Version: 1.0
 Content-Transfer-Encoding: quoted-printable
@@ -348834,11 +349108,11 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Fri,  3 Dec 2021 05:10:20 +0000
-Message-Id: <20211203051020.3505170-2-nobody@example.com>
+Date: Thu,  5 Jan 2023 11:50:29 +0000
+Message-Id: <20230105115029.2916823-2-nobody@example.com>
 X-Mailer: git-send-email 2.20.1
-In-Reply-To: <20211203051020.3505170-1-nobody@example.com>
-References: <20211203051020.3505170-1-nobody@example.com>
+In-Reply-To: <20230105115029.2916823-1-nobody@example.com>
+References: <20230105115029.2916823-1-nobody@example.com>
 MIME-Version: 1.0
 Content-Transfer-Encoding: quoted-printable
 
@@ -348869,8 +349143,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Fri,  3 Dec 2021 05:10:20 +0000
-Message-Id: <20211203051021.3506141-1-nobody@example.com>
+Date: Thu,  5 Jan 2023 11:50:29 +0000
+Message-Id: <20230105115030.2917990-1-nobody@example.com>
 X-Mailer: git-send-email 2.20.1
 MIME-Version: 1.0
 Content-Transfer-Encoding: base64
@@ -348889,11 +349163,11 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Fri,  3 Dec 2021 05:10:21 +0000
-Message-Id: <20211203051021.3506141-2-nobody@example.com>
+Date: Thu,  5 Jan 2023 11:50:30 +0000
+Message-Id: <20230105115030.2917990-2-nobody@example.com>
 X-Mailer: git-send-email 2.20.1
-In-Reply-To: <20211203051021.3506141-1-nobody@example.com>
-References: <20211203051021.3506141-1-nobody@example.com>
+In-Reply-To: <20230105115030.2917990-1-nobody@example.com>
+References: <20230105115030.2917990-1-nobody@example.com>
 MIME-Version: 1.0
 Content-Transfer-Encoding: base64
 
@@ -348924,8 +349198,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Fri,  3 Dec 2021 05:10:22 +0000
-Message-Id: <20211203051022.3507172-1-nobody@example.com>
+Date: Thu,  5 Jan 2023 11:50:31 +0000
+Message-Id: <20230105115031.2918943-1-nobody@example.com>
 X-Mailer: git-send-email 2.20.1
 MIME-Version: 1.0
 Content-Transfer-Encoding: 7bit
@@ -348958,8 +349232,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Fri,  3 Dec 2021 05:10:23 +0000
-Message-Id: <20211203051023.3508182-1-nobody@example.com>
+Date: Thu,  5 Jan 2023 11:50:32 +0000
+Message-Id: <20230105115032.2920046-1-nobody@example.com>
 X-Mailer: git-send-email 2.20.1
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -348992,8 +349266,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Fri,  3 Dec 2021 05:10:23 +0000
-Message-Id: <20211203051023.3509475-1-nobody@example.com>
+Date: Thu,  5 Jan 2023 11:50:32 +0000
+Message-Id: <20230105115032.2921021-1-nobody@example.com>
 X-Mailer: git-send-email 2.20.1
 MIME-Version: 1.0
 Content-Transfer-Encoding: quoted-printable
@@ -349026,8 +349300,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Fri,  3 Dec 2021 05:10:24 +0000
-Message-Id: <20211203051024.3510930-1-nobody@example.com>
+Date: Thu,  5 Jan 2023 11:50:33 +0000
+Message-Id: <20230105115033.2922185-1-nobody@example.com>
 X-Mailer: git-send-email 2.20.1
 MIME-Version: 1.0
 Content-Transfer-Encoding: base64
@@ -349061,8 +349335,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Fri,  3 Dec 2021 05:10:25 +0000
-Message-Id: <20211203051025.3512170-1-nobody@example.com>
+Date: Thu,  5 Jan 2023 11:50:34 +0000
+Message-Id: <20230105115034.2923360-1-nobody@example.com>
 X-Mailer: git-send-email 2.20.1
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -349094,8 +349368,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Fri,  3 Dec 2021 05:10:26 +0000
-Message-Id: <20211203051026.3513268-1-author@example.com>
+Date: Thu,  5 Jan 2023 11:50:35 +0000
+Message-Id: <20230105115035.2924652-1-author@example.com>
 X-Mailer: git-send-email 2.20.1
 In-Reply-To: <To Example <to@example.com>
 References: <To Example <to@example.com>
@@ -349142,8 +349416,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Fri,  3 Dec 2021 05:10:24 +0000
-Message-Id: <20211203051026.3514489-1-nobody@example.com>
+Date: Thu,  5 Jan 2023 11:50:35 +0000
+Message-Id: <20230105115037.2925711-1-nobody@example.com>
 X-Mailer: git-send-email 2.20.1
 In-Reply-To: <unique-message-id@example.com>
 References: <unique-message-id@example.com>
@@ -349164,12 +349438,12 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Fri,  3 Dec 2021 05:10:25 +0000
-Message-Id: <20211203051026.3514489-2-nobody@example.com>
+Date: Thu,  5 Jan 2023 11:50:36 +0000
+Message-Id: <20230105115037.2925711-2-nobody@example.com>
 X-Mailer: git-send-email 2.20.1
-In-Reply-To: <20211203051026.3514489-1-nobody@example.com>
+In-Reply-To: <20230105115037.2925711-1-nobody@example.com>
 References: <unique-message-id@example.com>
- <20211203051026.3514489-1-nobody@example.com>
+ <20230105115037.2925711-1-nobody@example.com>
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
 
@@ -349187,12 +349461,12 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Fri,  3 Dec 2021 05:10:26 +0000
-Message-Id: <20211203051026.3514489-3-nobody@example.com>
+Date: Thu,  5 Jan 2023 11:50:37 +0000
+Message-Id: <20230105115037.2925711-3-nobody@example.com>
 X-Mailer: git-send-email 2.20.1
-In-Reply-To: <20211203051026.3514489-1-nobody@example.com>
+In-Reply-To: <20230105115037.2925711-1-nobody@example.com>
 References: <unique-message-id@example.com>
- <20211203051026.3514489-1-nobody@example.com>
+ <20230105115037.2925711-1-nobody@example.com>
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
 
@@ -349235,8 +349509,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Fri,  3 Dec 2021 05:10:25 +0000
-Message-Id: <20211203051027.3515786-1-nobody@example.com>
+Date: Thu,  5 Jan 2023 11:50:36 +0000
+Message-Id: <20230105115038.2927216-1-nobody@example.com>
 X-Mailer: git-send-email 2.20.1
 In-Reply-To: <unique-message-id@example.com>
 References: <unique-message-id@example.com>
@@ -349257,12 +349531,12 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Fri,  3 Dec 2021 05:10:26 +0000
-Message-Id: <20211203051027.3515786-2-nobody@example.com>
+Date: Thu,  5 Jan 2023 11:50:37 +0000
+Message-Id: <20230105115038.2927216-2-nobody@example.com>
 X-Mailer: git-send-email 2.20.1
-In-Reply-To: <20211203051027.3515786-1-nobody@example.com>
+In-Reply-To: <20230105115038.2927216-1-nobody@example.com>
 References: <unique-message-id@example.com>
- <20211203051027.3515786-1-nobody@example.com>
+ <20230105115038.2927216-1-nobody@example.com>
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
 
@@ -349280,13 +349554,13 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Fri,  3 Dec 2021 05:10:27 +0000
-Message-Id: <20211203051027.3515786-3-nobody@example.com>
+Date: Thu,  5 Jan 2023 11:50:38 +0000
+Message-Id: <20230105115038.2927216-3-nobody@example.com>
 X-Mailer: git-send-email 2.20.1
-In-Reply-To: <20211203051027.3515786-2-nobody@example.com>
+In-Reply-To: <20230105115038.2927216-2-nobody@example.com>
 References: <unique-message-id@example.com>
- <20211203051027.3515786-1-nobody@example.com>
- <20211203051027.3515786-2-nobody@example.com>
+ <20230105115038.2927216-1-nobody@example.com>
+ <20230105115038.2927216-2-nobody@example.com>
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
 
@@ -349316,8 +349590,8 @@
 From: Example <nobody@example.com>
 To: nobody@example.com
 Subject: foo
-Date: Fri,  3 Dec 2021 05:10:27 +0000
-Message-Id: <20211203051028.3517474-1-nobody@example.com>
+Date: Thu,  5 Jan 2023 11:50:38 +0000
+Message-Id: <20230105115039.2928755-1-nobody@example.com>
 X-Mailer: git-send-email 2.20.1
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -349336,11 +349610,11 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Fri,  3 Dec 2021 05:10:28 +0000
-Message-Id: <20211203051028.3517474-2-nobody@example.com>
+Date: Thu,  5 Jan 2023 11:50:39 +0000
+Message-Id: <20230105115039.2928755-2-nobody@example.com>
 X-Mailer: git-send-email 2.20.1
-In-Reply-To: <20211203051028.3517474-1-nobody@example.com>
-References: <20211203051028.3517474-1-nobody@example.com>
+In-Reply-To: <20230105115039.2928755-1-nobody@example.com>
+References: <20230105115039.2928755-1-nobody@example.com>
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
 
@@ -349742,8 +350016,8 @@
 To: nobody@example.com
 Cc: A <author@example.com>
 Subject: [PATCH 1/2] Initial.
-Date: Fri,  3 Dec 2021 05:10:45 +0000
-Message-Id: <20211203051046.3564766-1-nobody@example.com>
+Date: Thu,  5 Jan 2023 11:50:59 +0000
+Message-Id: <20230105115100.2948231-1-nobody@example.com>
 X-Mailer: git-send-email 2.20.1
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -349765,8 +350039,8 @@
 To: nobody@example.com
 Cc: A <author@example.com>
 Subject: [PATCH 1/2] Initial.
-Date: Fri,  3 Dec 2021 05:10:45 +0000
-Message-Id: <20211203051046.3564766-1-nobody@example.com>
+Date: Thu,  5 Jan 2023 11:50:59 +0000
+Message-Id: <20230105115100.2948231-1-nobody@example.com>
 X-Mailer: git-send-email 2.20.1
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -349778,11 +350052,11 @@
 To: nobody@example.com
 Cc: A <author@example.com>
 Subject: [PATCH 2/2] Second.
-Date: Fri,  3 Dec 2021 05:10:46 +0000
-Message-Id: <20211203051046.3564766-2-nobody@example.com>
+Date: Thu,  5 Jan 2023 11:51:00 +0000
+Message-Id: <20230105115100.2948231-2-nobody@example.com>
 X-Mailer: git-send-email 2.20.1
-In-Reply-To: <20211203051046.3564766-1-nobody@example.com>
-References: <20211203051046.3564766-1-nobody@example.com>
+In-Reply-To: <20230105115100.2948231-1-nobody@example.com>
+References: <20230105115100.2948231-1-nobody@example.com>
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
 
@@ -349793,11 +350067,11 @@
 To: nobody@example.com
 Cc: A <author@example.com>
 Subject: [PATCH 2/2] Second.
-Date: Fri,  3 Dec 2021 05:10:46 +0000
-Message-Id: <20211203051046.3564766-2-nobody@example.com>
+Date: Thu,  5 Jan 2023 11:51:00 +0000
+Message-Id: <20230105115100.2948231-2-nobody@example.com>
 X-Mailer: git-send-email 2.20.1
-In-Reply-To: <20211203051046.3564766-1-nobody@example.com>
-References: <20211203051046.3564766-1-nobody@example.com>
+In-Reply-To: <20230105115100.2948231-1-nobody@example.com>
+References: <20230105115100.2948231-1-nobody@example.com>
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
 
@@ -349828,8 +350102,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Fri,  3 Dec 2021 05:10:47 +0000
-Message-Id: <20211203051047.3566524-1-nobody@example.com>
+Date: Thu,  5 Jan 2023 11:51:02 +0000
+Message-Id: <20230105115102.2949586-1-nobody@example.com>
 X-Mailer: git-send-email 2.20.1
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -349862,8 +350136,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Fri,  3 Dec 2021 05:10:48 +0000
-Message-Id: <20211203051048.3567980-1-nobody@example.com>
+Date: Thu,  5 Jan 2023 11:51:04 +0000
+Message-Id: <20230105115104.2950767-1-nobody@example.com>
 X-Mailer: git-send-email 2.20.1
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -349894,8 +350168,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: Fri,  3 Dec 2021 05:10:49 +0000
-Message-Id: <20211203051049.3569488-1-nobody@example.com>
+Date: Thu,  5 Jan 2023 11:51:05 +0000
+Message-Id: <20230105115105.2952104-1-nobody@example.com>
 X-Mailer: git-send-email 2.20.1
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -349925,8 +350199,8 @@
 From: Example <nobody@example.com>
 To: nobody@example.com
 Subject: foo
-Date: Fri,  3 Dec 2021 05:10:49 +0000
-Message-Id: <20211203051050.3570549-1-nobody@example.com>
+Date: Thu,  5 Jan 2023 11:51:06 +0000
+Message-Id: <20230105115107.2953374-1-nobody@example.com>
 X-Mailer: git-send-email 2.20.1
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
@@ -349946,11 +350220,11 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Fri,  3 Dec 2021 05:10:50 +0000
-Message-Id: <20211203051050.3570549-2-nobody@example.com>
+Date: Thu,  5 Jan 2023 11:51:07 +0000
+Message-Id: <20230105115107.2953374-2-nobody@example.com>
 X-Mailer: git-send-email 2.20.1
-In-Reply-To: <20211203051050.3570549-1-nobody@example.com>
-References: <20211203051050.3570549-1-nobody@example.com>
+In-Reply-To: <20230105115107.2953374-1-nobody@example.com>
+References: <20230105115107.2953374-1-nobody@example.com>
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
 
@@ -349988,8 +350262,8 @@
 From: Example <nobody@example.com>
 To: nobody@example.com
 Subject: foo
-Date: Fri,  3 Dec 2021 05:10:50 +0000
-Message-Id: <20211203051051.3571807-1-nobody@example.com>
+Date: Thu,  5 Jan 2023 11:51:08 +0000
+Message-Id: <20230105115109.2954811-1-nobody@example.com>
 X-Mailer: git-send-email 2.20.1
 MIME-Version: 1.0
 Content-Type: text/plain; charset=iso-8859-1;
@@ -350009,11 +350283,11 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Fri,  3 Dec 2021 05:10:51 +0000
-Message-Id: <20211203051051.3571807-2-nobody@example.com>
+Date: Thu,  5 Jan 2023 11:51:09 +0000
+Message-Id: <20230105115109.2954811-2-nobody@example.com>
 X-Mailer: git-send-email 2.20.1
-In-Reply-To: <20211203051051.3571807-1-nobody@example.com>
-References: <20211203051051.3571807-1-nobody@example.com>
+In-Reply-To: <20230105115109.2954811-1-nobody@example.com>
+References: <20230105115109.2954811-1-nobody@example.com>
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
 
@@ -350040,8 +350314,8 @@
 From: Example <nobody@example.com>
 To: nobody@example.com
 Subject: =?UTF-8?q?utf8-s=C3=BCbj=C3=ABct?=
-Date: Fri,  3 Dec 2021 05:10:50 +0000
-Message-Id: <20211203051051.3573050-1-nobody@example.com>
+Date: Thu,  5 Jan 2023 11:51:10 +0000
+Message-Id: <20230105115111.2955927-1-nobody@example.com>
 X-Mailer: git-send-email 2.20.1
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
@@ -350061,11 +350335,11 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Fri,  3 Dec 2021 05:10:51 +0000
-Message-Id: <20211203051051.3573050-2-nobody@example.com>
+Date: Thu,  5 Jan 2023 11:51:11 +0000
+Message-Id: <20230105115111.2955927-2-nobody@example.com>
 X-Mailer: git-send-email 2.20.1
-In-Reply-To: <20211203051051.3573050-1-nobody@example.com>
-References: <20211203051051.3573050-1-nobody@example.com>
+In-Reply-To: <20230105115111.2955927-1-nobody@example.com>
+References: <20230105115111.2955927-1-nobody@example.com>
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
 
@@ -350086,11 +350360,11 @@
 		funny_name.patch &&
 	grep "^From: Füñný Nâmé <odd_?=mail@example.com>" msgtxt1
 
-[master b9ff5c8] weird_author
+[master be6c8bd] weird_author
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 weird_author.t
-[master 0dce269] weird_author
+[master 09348f8] weird_author
  Author: Füñný Nâmé <odd_?=mail@example.com>
  Date: Thu Apr 7 15:19:13 2005 -0700
  1 file changed, 1 insertion(+)
@@ -350103,8 +350377,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: Fri,  3 Dec 2021 05:10:52 +0000
-Message-Id: <20211203051052.3574536-1-nobody@example.com>
+Date: Thu,  5 Jan 2023 11:51:13 +0000
+Message-Id: <20230105115113.2957074-1-nobody@example.com>
 X-Mailer: git-send-email 2.20.1
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
@@ -350112,7 +350386,7 @@
 
 Result: OK
 From: Füñný Nâmé <odd_?=mail@example.com>
-HEAD is now at fa9efd3 Second.
+HEAD is now at e20c067 Second.
 ok 86 - utf8 author is correctly passed on
 
 expecting success: 
@@ -350128,11 +350402,11 @@
 	grep "^From: " msgtxt1 >msgfrom &&
 	test_line_count = 1 msgfrom
 
-[master 41ee3d4] weird_sender
+[master 34a79e4] weird_sender
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 weird_sender.t
-[master ffd9384] weird_sender
+[master f149c85] weird_sender
  Author: Füñný Nâmé <odd_?=mail@example.com>
  Date: Thu Apr 7 15:20:13 2005 -0700
  1 file changed, 1 insertion(+)
@@ -350145,14 +350419,14 @@
 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: Fri,  3 Dec 2021 05:10:53 +0000
-Message-Id: <20211203051053.3575801-1-odd_?=mail@example.com>
+Date: Thu,  5 Jan 2023 11:51:15 +0000
+Message-Id: <20230105115115.2958673-1-odd_?=mail@example.com>
 X-Mailer: git-send-email 2.20.1
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
 
 Result: OK
-HEAD is now at fa9efd3 Second.
+HEAD is now at e20c067 Second.
 ok 87 - utf8 sender is not duplicated
 
 expecting success: 
@@ -350177,8 +350451,8 @@
 From: Example <nobody@example.com>
 To: nobody@example.com
 Subject: foo
-Date: Fri,  3 Dec 2021 05:10:53 +0000
-Message-Id: <20211203051054.3577283-1-nobody@example.com>
+Date: Thu,  5 Jan 2023 11:51:16 +0000
+Message-Id: <20230105115117.2960206-1-nobody@example.com>
 X-Mailer: git-send-email 2.20.1
 MIME-Version: 1.0
 Content-Type: text/plain; charset=iso-8859-1
@@ -350198,11 +350472,11 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Fri,  3 Dec 2021 05:10:54 +0000
-Message-Id: <20211203051054.3577283-2-nobody@example.com>
+Date: Thu,  5 Jan 2023 11:51:17 +0000
+Message-Id: <20230105115117.2960206-2-nobody@example.com>
 X-Mailer: git-send-email 2.20.1
-In-Reply-To: <20211203051054.3577283-1-nobody@example.com>
-References: <20211203051054.3577283-1-nobody@example.com>
+In-Reply-To: <20230105115117.2960206-1-nobody@example.com>
+References: <20230105115117.2960206-1-nobody@example.com>
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
 
@@ -350233,8 +350507,8 @@
 From: Example <nobody@example.com>
 To: nobody@example.com
 Subject: foo
-Date: Fri,  3 Dec 2021 05:10:54 +0000
-Message-Id: <20211203051055.3578516-1-nobody@example.com>
+Date: Thu,  5 Jan 2023 11:51:17 +0000
+Message-Id: <20230105115118.2961840-1-nobody@example.com>
 X-Mailer: git-send-email 2.20.1
 MIME-Version: 1.0
 Content-Type: text/plain; charset=iso-8859-1
@@ -350254,11 +350528,11 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Fri,  3 Dec 2021 05:10:55 +0000
-Message-Id: <20211203051055.3578516-2-nobody@example.com>
+Date: Thu,  5 Jan 2023 11:51:18 +0000
+Message-Id: <20230105115118.2961840-2-nobody@example.com>
 X-Mailer: git-send-email 2.20.1
-In-Reply-To: <20211203051055.3578516-1-nobody@example.com>
-References: <20211203051055.3578516-1-nobody@example.com>
+In-Reply-To: <20230105115118.2961840-1-nobody@example.com>
+References: <20230105115118.2961840-1-nobody@example.com>
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
 
@@ -350290,8 +350564,8 @@
 From: Example <nobody@example.com>
 To: nobody@example.com
 Subject: foo
-Date: Fri,  3 Dec 2021 05:10:55 +0000
-Message-Id: <20211203051056.3579798-1-nobody@example.com>
+Date: Thu,  5 Jan 2023 11:51:19 +0000
+Message-Id: <20230105115120.2963214-1-nobody@example.com>
 X-Mailer: git-send-email 2.20.1
 MIME-Version: 1.0
 Content-Type: text/plain; charset=iso-8859-2
@@ -350311,11 +350585,11 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Fri,  3 Dec 2021 05:10:56 +0000
-Message-Id: <20211203051056.3579798-2-nobody@example.com>
+Date: Thu,  5 Jan 2023 11:51:20 +0000
+Message-Id: <20230105115120.2963214-2-nobody@example.com>
 X-Mailer: git-send-email 2.20.1
-In-Reply-To: <20211203051056.3579798-1-nobody@example.com>
-References: <20211203051056.3579798-1-nobody@example.com>
+In-Reply-To: <20230105115120.2963214-1-nobody@example.com>
+References: <20230105115120.2963214-1-nobody@example.com>
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
 
@@ -350343,8 +350617,8 @@
 From: Example <nobody@example.com>
 To: nobody@example.com
 Subject: =?iso-8859-2?q?utf8-s=C3=BCbj=C3=ABct?=
-Date: Fri,  3 Dec 2021 05:10:56 +0000
-Message-Id: <20211203051057.3580804-1-nobody@example.com>
+Date: Thu,  5 Jan 2023 11:51:21 +0000
+Message-Id: <20230105115122.2964544-1-nobody@example.com>
 X-Mailer: git-send-email 2.20.1
 MIME-Version: 1.0
 Content-Type: text/plain; charset=iso-8859-2
@@ -350364,11 +350638,11 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Fri,  3 Dec 2021 05:10:57 +0000
-Message-Id: <20211203051057.3580804-2-nobody@example.com>
+Date: Thu,  5 Jan 2023 11:51:22 +0000
+Message-Id: <20230105115122.2964544-2-nobody@example.com>
 X-Mailer: git-send-email 2.20.1
-In-Reply-To: <20211203051057.3580804-1-nobody@example.com>
-References: <20211203051057.3580804-1-nobody@example.com>
+In-Reply-To: <20230105115122.2964544-1-nobody@example.com>
+References: <20230105115122.2964544-1-nobody@example.com>
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
 
@@ -350384,7 +350658,7 @@
 	test_must_fail git send-email --dry-run master 2>errors &&
 	grep disambiguate errors
 
-[master 2ba032c] add master
+[master 4d61bc0] add master
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 master
@@ -350441,7 +350715,7 @@
 		$patches $patches >stdout &&
 	grep "In-Reply-To: " stdout
 
-In-Reply-To: <20211203051101.3587113-1-nobody@example.com>
+In-Reply-To: <20230105115128.2970715-1-nobody@example.com>
 ok 96 - threading but no chain-reply-to
 
 expecting success: 
@@ -351315,6 +351589,7 @@
 	>actual-list &&
 	test_cmp expected-list actual-list
 
+./test-lib.sh: line 690: warning: command substitution: ignored null byte in input
 ok 160 - leading and trailing whitespaces are removed
 
 expecting success: 
@@ -351366,8 +351641,8 @@
 Cc: Somebody <somebody@ex.com>,
 	A U Thor <author@example.com>
 Subject: [PATCH] add master
-Date: Fri,  3 Dec 2021 05:11:43 +0000
-Message-Id: <20211203051143.3638689-1-nobody@example.com>
+Date: Thu,  5 Jan 2023 11:52:04 +0000
+Message-Id: <20230105115204.3013905-1-nobody@example.com>
 X-Mailer: git-send-email 2.20.1
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -351390,8 +351665,8 @@
 To: nobody@example.com
 Cc: A U Thor <author@example.com>
 Subject: [PATCH] add master
-Date: Fri,  3 Dec 2021 05:11:44 +0000
-Message-Id: <20211203051144.3639295-1-nobody@example.com>
+Date: Thu,  5 Jan 2023 11:52:05 +0000
+Message-Id: <20230105115205.3014215-1-nobody@example.com>
 X-Mailer: git-send-email 2.20.1
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -351413,8 +351688,8 @@
 To: nobody@example.com
 Cc: A U Thor <author@example.com>
 Subject: [PATCH] add master
-Date: Fri,  3 Dec 2021 05:11:44 +0000
-Message-Id: <20211203051144.3639295-1-nobody@example.com>
+Date: Thu,  5 Jan 2023 11:52:05 +0000
+Message-Id: <20230105115205.3014215-1-nobody@example.com>
 X-Mailer: git-send-email 2.20.1
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -351528,7 +351803,7 @@
 
 Switched to branch 'b1'
 To gitcvs.git
-   0c0cb1b..a493c33  b1 -> b1
+   0e9a3e9..36bb63a  b1 -> b1
  * [new tag]         v1.2 -> v1.2
 ok 6 - setup v1.2 on b1
 
@@ -351688,7 +351963,7 @@
 	check_end_full_tree cvswork2 v2
 
 From gitcvs
-   4ce204e..738fb66  b2         -> b2
+   454ce67..29b8275  b2         -> b2
 To gitcvs.git
  * [new tag]         v2 -> v2
 ok 18 - validate result of edits [cvswork2]
@@ -351862,7 +352137,7 @@
 	git tag v3 b3
 
 Switched to a new branch 'b3'
-[b3 fc85c5c] cvswork3 edits applied
+[b3 35b5014] cvswork3 edits applied
  Author: A U Thor <author@example.com>
  3 files changed, 2 insertions(+), 2 deletions(-)
  create mode 100644 adir/afile5
@@ -351888,10 +352163,10 @@
 	git push --tags gitcvs.git b3:b3
 
 Merging:
-fc85c5c cvswork3 edits applied
+35b5014 cvswork3 edits applied
 virtual b1
 found 1 common ancestor:
-0c0cb1b First Commit (v1)
+0e9a3e9 First Commit (v1)
 Removing adir/bdir/b2file
 Auto-merging adir/afile
 Removing adir/a2file
@@ -351912,7 +352187,7 @@
  create mode 100644 cdir/cfile
  create mode 100644 t3
 From gitwork3
-   fc85c5c..8683ae0  b3         -> b3
+   35b5014..5d5ac41  b3         -> b3
 To gitcvs.git
  * [new branch]      b3 -> b3
  * [new tag]         v3 -> v3
@@ -351997,7 +352272,7 @@
 	 git add file &&
 	 git commit -a -m "Initial commit." &&
 	 git branch b
-[master (root-commit) fec618d] Initial commit.
+[master (root-commit) fcd5e58] Initial commit.
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 file
@@ -352061,7 +352336,7 @@
 	 git add new_file &&
 	 git commit -a -m "File added." &&
 	 gitweb_run "p=.git;a=commitdiff"
-[master 1f7aada] File added.
+[master 15fc1cc] File added.
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 new_file
@@ -352070,7 +352345,7 @@
 expecting success: test_chmod +x new_file &&
 	 git commit -a -m "Mode changed." &&
 	 gitweb_run "p=.git;a=commitdiff"
-[master 4988683] Mode changed.
+[master cefca4e] Mode changed.
  Author: A U Thor <author@example.com>
  1 file changed, 0 insertions(+), 0 deletions(-)
  mode change 100644 => 100755 new_file
@@ -352079,7 +352354,7 @@
 expecting success: git mv new_file renamed_file &&
 	 git commit -a -m "File renamed." &&
 	 gitweb_run "p=.git;a=commitdiff"
-[master 113809d] File renamed.
+[master 10348de] File renamed.
  Author: A U Thor <author@example.com>
  1 file changed, 0 insertions(+), 0 deletions(-)
  rename new_file => renamed_file (100%)
@@ -352099,7 +352374,7 @@
 
 )
 prerequisite SYMLINKS ok
-[master 292653f] File to symlink.
+[master 5753047] File to symlink.
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
  rewrite renamed_file (100%)
@@ -352111,7 +352386,7 @@
 	 git commit -a -m "File removed." &&
 	 gitweb_run "p=.git;a=commitdiff"
 rm 'renamed_file'
-[master 9967349] File removed.
+[master a5fc258] File removed.
  Author: A U Thor <author@example.com>
  1 file changed, 1 deletion(-)
  delete mode 120000 renamed_file
@@ -352121,7 +352396,7 @@
 	 git add file2 &&
 	 git commit -a -m "File copied." &&
 	 gitweb_run "p=.git;a=commitdiff"
-[master a3f5a13] File copied.
+[master dcd98e1] File copied.
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 file2
@@ -352131,7 +352406,7 @@
 	 test_chmod +x file2 &&
 	 git commit -a -m "Mode change and modification." &&
 	 gitweb_run "p=.git;a=commitdiff"
-[master 0f10baa] Mode change and modification.
+[master fd1a638] Mode change and modification.
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  mode change 100644 => 100755 file2
@@ -352151,10 +352426,10 @@
 	 echo "Propter nomen suum." >> file3 &&
 	 git commit -a -m "File rename and modification." &&
 	 gitweb_run "p=.git;a=commitdiff"
-[master cfbe994] File added.
+[master 1318306] File added.
  Author: A U Thor <author@example.com>
  1 file changed, 7 insertions(+), 2 deletions(-)
-[master 068509b] File rename and modification.
+[master e7d4a35] File rename and modification.
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  rename file2 => file3 (90%)
@@ -352165,7 +352440,7 @@
 	 test_chmod +x file2 &&
 	 git commit -a -m "File rename, mode change and modification." &&
 	 gitweb_run "p=.git;a=commitdiff"
-[master a8870f0] File rename, mode change and modification.
+[master f67c3ee] File rename, mode change and modification.
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  rename file3 => file2 (91%)
@@ -352198,27 +352473,27 @@
 	git commit -m "foo/baz is the original foo" &&
 	git branch foo-baz-renamed-from-foo
 	
-[master 956cc13] initial
+[master bf83a12] initial
  Author: A U Thor <author@example.com>
  2 files changed, 2 insertions(+)
  create mode 100644 bar
  create mode 100644 foo
-[master 7dd94d4] foo symlinked to bar
+[master eb5957b] foo symlinked to bar
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
  rewrite foo (100%)
  mode change 100644 => 120000
-[master 279d511] foo back to file
+[master c0e203f] foo back to file
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
  rewrite foo (100%)
  mode change 120000 => 100644
-[master 1345896] foo becomes a directory
+[master 15ca53f] foo becomes a directory
  Author: A U Thor <author@example.com>
  2 files changed, 1 insertion(+), 1 deletion(-)
  delete mode 100644 foo
  create mode 100644 foo/baz
-[master 62d1a84] foo/baz is the original foo
+[master f841f22] foo/baz is the original foo
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 ok 37 - setup typechange commits
@@ -352274,19 +352549,19 @@
 	git commit -a -m "Remove incomplete line" &&
 	git tag incomplete_lines_rem
 
-[master 3c4cc44] Preparing for incomplete lines
+[master 91dbd36] Preparing for incomplete lines
  Author: A U Thor <author@example.com>
  1 file changed, 8 insertions(+), 1 deletion(-)
-[master 1f29412] Add incomplete line
+[master d8c95e7] Add incomplete line
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[master 224ea57] Incomplete context line
+[master c443a70] Incomplete context line
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-[master 2cbb32e] Change incomplete line
+[master 042aa88] Change incomplete line
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 8 deletions(-)
-[master 16777b2] Remove incomplete line
+[master 593f9e1] Remove incomplete line
  Author: A U Thor <author@example.com>
  1 file changed, 1 deletion(-)
 ok 46 - setup incomplete lines
@@ -352319,16 +352594,16 @@
 	 git merge b &&
 	 git tag merge_commit
 Switched to branch 'b'
-[b 507ffa3] On branch
+[b 37f12e9] On branch
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 b
 Switched to branch 'master'
 Merging:
-16777b2 Remove incomplete line
+593f9e1 Remove incomplete line
 virtual b
 found 1 common ancestor:
-fec618d Initial commit.
+fcd5e58 Initial commit.
 Merge made by the 'recursive' strategy.
  b | 1 +
  1 file changed, 1 insertion(+)
@@ -352366,7 +352641,7 @@
 	 git commit -a -m "Large commit" &&
 	 git checkout master
 Switched to branch 'b'
-[b 47fb983] Prepare large commit
+[b 52fc620] Prepare large commit
  Author: A U Thor <author@example.com>
  7 files changed, 7 insertions(+)
  create mode 100644 01-change
@@ -352377,7 +352652,7 @@
  create mode 100644 06-file-or-symlink
  create mode 100644 07-change-mode-change
 rm '03-delete'
-[b 4d31e2b] Large commit
+[b 3c49298] Large commit
  Author: A U Thor <author@example.com>
  8 files changed, 5 insertions(+), 4 deletions(-)
  rename 02-pure-rename-from => 02-pure-rename-to (100%)
@@ -352462,12 +352737,12 @@
 	 git commit -m "Delete file" &&
 	 gitweb_run "p=.git;a=history;f=deleted_file"
 Already on 'master'
-[master 2cfd710] Add file to be deleted
+[master 84b00ae] Add file to be deleted
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 deleted_file
 rm 'deleted_file'
-[master a59e5ea] Delete file
+[master cc0461f] Delete file
  Author: A U Thor <author@example.com>
  1 file changed, 1 deletion(-)
  delete mode 100644 deleted_file
@@ -352522,7 +352797,7 @@
 	 git add file &&
 	 git commit -F "$TEST_DIRECTORY"/t3900/1-UTF-8.txt &&
 	 gitweb_run "p=.git;a=commit"
-[master fc15e76] ÄËÑ�Ö
+[master 4e78bc1] ÄËÑ�Ö
  Author: �éí óú <author@example.com>
  1 file changed, 1 insertion(+)
 ok 84 - encode(commit): utf8
@@ -352535,7 +352810,7 @@
 	 test_config i18n.commitencoding ISO-8859-1 &&
 	 git commit -F "$TEST_DIRECTORY"/t3900/ISO8859-1.txt &&
 	 gitweb_run "p=.git;a=commit"
-[master c016bb0] ÄËÑ�Ö
+[master 7827d84] ÄËÑ�Ö
  Author: Áéí óú <author@example.com>
  1 file changed, 1 insertion(+)
 ok 85 - encode(commit): iso-8859-1
@@ -352594,7 +352869,7 @@
 	 echo "MATCH" >>bar &&
 	 git add file bar &&
 	 git commit -m "Added MATCH word"
-[master 281fbf2] Added MATCH word
+[master 0820f99] Added MATCH word
  Author: A U Thor <author@example.com>
  2 files changed, 3 insertions(+)
 ok 100 - search: preparation
@@ -352647,7 +352922,7 @@
 	  git clone --shared --bare ../foo.git foo-forked.git &&
 	  echo "fork of foo" > foo-forked.git/description)
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t9500-gitweb-standalone-no-errors/foo.git/
-[master (root-commit) 126d35e] Initial commit
+[master (root-commit) c01881a] Initial commit
  Author: A U Thor <author@example.com>
  1 file changed, 5 insertions(+)
  create mode 100644 file
@@ -352704,7 +352979,7 @@
 	echo "$f"; \
 done | '/bin/sh' ./aggregate-results.sh
 fixed   0
-success 20121
+success 20120
 failed  0
 broken  271
 total   20605
@@ -352766,9 +353041,9 @@
 	git checkout remotes/origin/trunk
 
 	A	foo
-r1 = 0af49f60d1c51334ed98c33fce9a34b5273ba253 (refs/remotes/origin/trunk)
+r1 = 678dacfbfb9aa9b6cbe940432927ec62ad358997 (refs/remotes/origin/trunk)
 	M	foo
-r2 = 4712dbb1f71a4d8b3160713832fc973410c8b92c (refs/remotes/origin/trunk)
+r2 = 09a97fe76b64e722d3c7ee89f43d880bc1ca82f7 (refs/remotes/origin/trunk)
 Checked out HEAD:
   file:///build/git-2.20.1/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/trunk/project r2
 Note: checking out 'remotes/origin/trunk'.
@@ -352782,7 +353057,7 @@
 
   git checkout -b <new-branch-name>
 
-HEAD is now at 4712dbb updated trunk
+HEAD is now at 09a97fe updated trunk
 ok 2 - import into git
 
 expecting success: 
@@ -352801,40 +353076,40 @@
 Creating parent folder file:///build/git-2.20.1/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/branches/a ...
 Copying file:///build/git-2.20.1/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/trunk/project at r2 to file:///build/git-2.20.1/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/branches/a/project...
 Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/trunk/project => file:///build/git-2.20.1/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/branches/a/project, 2
-Found branch parent: (refs/remotes/origin/a) 4712dbb1f71a4d8b3160713832fc973410c8b92c
+Found branch parent: (refs/remotes/origin/a) 09a97fe76b64e722d3c7ee89f43d880bc1ca82f7
 Following parent with do_switch
 Successfully followed parent
-r4 = b9af0d4372eb348575b96589a056ebc622bd4fda (refs/remotes/origin/a)
+r4 = 3d31c196ecb9e6bd678a0547369369a63f60b227 (refs/remotes/origin/a)
 Copying file:///build/git-2.20.1/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/trunk/project at r2 to file:///build/git-2.20.1/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/git-2.20.1/git-svn line 1203.
 
 Creating parent folder file:///build/git-2.20.1/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/tags/tag1 ...
 Copying file:///build/git-2.20.1/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/trunk/project at r2 to file:///build/git-2.20.1/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/tags/tag1/project...
 Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/trunk/project => file:///build/git-2.20.1/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/tags/tag1/project, 2
-Found branch parent: (refs/remotes/origin/tags/tag1) 4712dbb1f71a4d8b3160713832fc973410c8b92c
+Found branch parent: (refs/remotes/origin/tags/tag1) 09a97fe76b64e722d3c7ee89f43d880bc1ca82f7
 Following parent with do_switch
 Successfully followed parent
-r6 = 6cd19ca5e7eba74bdfb1b8abd9b737ea5c06c428 (refs/remotes/origin/tags/tag1)
+r6 = 3106c27149331e274697b16a9dd457305e2209f0 (refs/remotes/origin/tags/tag1)
 Copying file:///build/git-2.20.1/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/trunk/project at r2 to file:///build/git-2.20.1/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/git-2.20.1/git-svn line 1203.
 
 Creating parent folder file:///build/git-2.20.1/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/tags/tag2 ...
 Copying file:///build/git-2.20.1/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/trunk/project at r2 to file:///build/git-2.20.1/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/tags/tag2/project...
 Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/trunk/project => file:///build/git-2.20.1/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/tags/tag2/project, 2
-Found branch parent: (refs/remotes/origin/tags/tag2) 4712dbb1f71a4d8b3160713832fc973410c8b92c
+Found branch parent: (refs/remotes/origin/tags/tag2) 09a97fe76b64e722d3c7ee89f43d880bc1ca82f7
 Following parent with do_switch
 Successfully followed parent
-r8 = d34072ae05718f4d95b54ef9f2ef40fb9a53e13f (refs/remotes/origin/tags/tag2)
+r8 = 29e81effb45859e583e83bee77ca5afe9bd5b832 (refs/remotes/origin/tags/tag2)
 Copying file:///build/git-2.20.1/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/trunk/project at r2 to file:///build/git-2.20.1/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/git-2.20.1/git-svn line 1203.
 
 Creating parent folder file:///build/git-2.20.1/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/tags/tag3 ...
 Copying file:///build/git-2.20.1/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/trunk/project at r2 to file:///build/git-2.20.1/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/tags/tag3/project...
 Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/trunk/project => file:///build/git-2.20.1/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/tags/tag3/project, 2
-Found branch parent: (refs/remotes/origin/tags/tag3) 4712dbb1f71a4d8b3160713832fc973410c8b92c
+Found branch parent: (refs/remotes/origin/tags/tag3) 09a97fe76b64e722d3c7ee89f43d880bc1ca82f7
 Following parent with do_switch
 Successfully followed parent
-r10 = 6bd8c27b218e9134b405cd11279e1aa4f13947d6 (refs/remotes/origin/tags/tag3)
+r10 = 881f97d0e7dabd2edcf08b498c8f55a3c5792b87 (refs/remotes/origin/tags/tag3)
 ok 3 - git svn branch tests
 
 # passed all 3 test(s)
@@ -352876,9 +353151,9 @@
 	git checkout remotes/origin/trunk
 
 	A	foo
-r1 = 53692de546a789767793a54014a8d6a9ed9c5cac (refs/remotes/origin/trunk)
+r1 = 887668a254e70c89b04efac0551d78a67b734bcc (refs/remotes/origin/trunk)
 	M	foo
-r2 = 511a844df4efe5f167c5c802b7a646f4b9737155 (refs/remotes/origin/trunk)
+r2 = 7671f5eda6b68f17f214e7e456f457b5200e087b (refs/remotes/origin/trunk)
 Checked out HEAD:
   file:///build/git-2.20.1/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/trunk r2
 Note: checking out 'remotes/origin/trunk'.
@@ -352892,7 +353167,7 @@
 
   git checkout -b <new-branch-name>
 
-HEAD is now at 511a844 updated trunk
+HEAD is now at 7671f5e updated trunk
 ok 2 - import into git
 
 expecting success: 
@@ -352920,16 +353195,16 @@
 
 Copying file:///build/git-2.20.1/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/trunk at r2 to file:///build/git-2.20.1/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/branches/a...
 Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/trunk => file:///build/git-2.20.1/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/branches/a, 2
-Found branch parent: (refs/remotes/origin/a) 511a844df4efe5f167c5c802b7a646f4b9737155
+Found branch parent: (refs/remotes/origin/a) 7671f5eda6b68f17f214e7e456f457b5200e087b
 Following parent with do_switch
 Successfully followed parent
-r3 = 4f71d67fa77421af6f3bce81d50bd68467aad36f (refs/remotes/origin/a)
+r3 = 57c2124973a5f9d35e9aac31fc5947123a447b49 (refs/remotes/origin/a)
 Copying file:///build/git-2.20.1/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/trunk at r2 to file:///build/git-2.20.1/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/branches/b...
 Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/trunk => file:///build/git-2.20.1/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/branches/b, 2
-Found branch parent: (refs/remotes/origin/b) 511a844df4efe5f167c5c802b7a646f4b9737155
+Found branch parent: (refs/remotes/origin/b) 7671f5eda6b68f17f214e7e456f457b5200e087b
 Following parent with do_switch
 Successfully followed parent
-r4 = 44ac93e9cfb1af9b34ac1f54e6f52e9e5e28cd9a (refs/remotes/origin/b)
+r4 = 3d1f3db2cb225acddfbea12ee4296ca2fd231664 (refs/remotes/origin/b)
 fatal: Invalid branch name: 'HEAD'
 Copying file:///build/git-2.20.1/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/trunk at r2 to file:///build/git-2.20.1/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.
@@ -352940,28 +353215,28 @@
 
 Copying file:///build/git-2.20.1/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/trunk at r2 to file:///build/git-2.20.1/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/tags/tag1...
 Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/trunk => file:///build/git-2.20.1/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/tags/tag1, 2
-Found branch parent: (refs/remotes/origin/tags/tag1) 511a844df4efe5f167c5c802b7a646f4b9737155
+Found branch parent: (refs/remotes/origin/tags/tag1) 7671f5eda6b68f17f214e7e456f457b5200e087b
 Following parent with do_switch
 Successfully followed parent
-r5 = bf5932f31f1ddd527588b9ef0d659db8a6d62518 (refs/remotes/origin/tags/tag1)
+r5 = 56b8b2a048832d942ec398a7371dacade99c4a51 (refs/remotes/origin/tags/tag1)
 Copying file:///build/git-2.20.1/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/trunk at r2 to file:///build/git-2.20.1/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/tags/tag2...
 Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/trunk => file:///build/git-2.20.1/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/tags/tag2, 2
-Found branch parent: (refs/remotes/origin/tags/tag2) 511a844df4efe5f167c5c802b7a646f4b9737155
+Found branch parent: (refs/remotes/origin/tags/tag2) 7671f5eda6b68f17f214e7e456f457b5200e087b
 Following parent with do_switch
 Successfully followed parent
-r6 = 28df9d119ade19142bfbbf70f7894be260a966ff (refs/remotes/origin/tags/tag2)
+r6 = 13c0b8c88c98e7af8950a58f7863b352ba8b326b (refs/remotes/origin/tags/tag2)
 Copying file:///build/git-2.20.1/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/trunk at r2 to file:///build/git-2.20.1/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/tags/tag3...
 Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/trunk => file:///build/git-2.20.1/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/tags/tag3, 2
-Found branch parent: (refs/remotes/origin/tags/tag3) 511a844df4efe5f167c5c802b7a646f4b9737155
+Found branch parent: (refs/remotes/origin/tags/tag3) 7671f5eda6b68f17f214e7e456f457b5200e087b
 Following parent with do_switch
 Successfully followed parent
-r7 = 4173c1605da91ef6042736f7375b3c5b38eeda9b (refs/remotes/origin/tags/tag3)
+r7 = 9336fb2b4012d5419f708a0e566781683e92c21c (refs/remotes/origin/tags/tag3)
 Copying file:///build/git-2.20.1/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/trunk at r2 to file:///build/git-2.20.1/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/tags/tag4...
 Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/trunk => file:///build/git-2.20.1/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/tags/tag4, 2
-Found branch parent: (refs/remotes/origin/tags/tag4) 511a844df4efe5f167c5c802b7a646f4b9737155
+Found branch parent: (refs/remotes/origin/tags/tag4) 7671f5eda6b68f17f214e7e456f457b5200e087b
 Following parent with do_switch
 Successfully followed parent
-r8 = 0a13bb4f414847970067c7a6ca2b9046597ec09f (refs/remotes/origin/tags/tag4)
+r8 = e8d8efa63cdc059b2c246a0f06d32a656a48c6e3 (refs/remotes/origin/tags/tag4)
 tag name required
 
 Copying file:///build/git-2.20.1/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/trunk at r2 to file:///build/git-2.20.1/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/tags/tag5...
@@ -353019,55 +353294,55 @@
 Committing transaction...
 Committed revision 9.
 Using higher level of URL: file:///build/git-2.20.1/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/mirror => file:///build/git-2.20.1/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo
-branch_from: /branches => /branches/b
-Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/branches/b => file:///build/git-2.20.1/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/mirror/branches/b, 8
-Found branch parent: (refs/remotes/mirror/b) 44ac93e9cfb1af9b34ac1f54e6f52e9e5e28cd9a
+branch_from: /tags => /tags/tag4
+Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/tags/tag4 => file:///build/git-2.20.1/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/mirror/tags/tag4, 8
+Found branch parent: (refs/remotes/mirror/tags/tag4) e8d8efa63cdc059b2c246a0f06d32a656a48c6e3
 Following parent with do_switch
 Successfully followed parent
-r9 = 0d6ff5d0295650097dc5a391cc97be39dd446c17 (refs/remotes/mirror/b)
+r9 = 0673e6c4a675e8171fecb094ef95cf283ca7d224 (refs/remotes/mirror/tags/tag4)
 branch_from: /tags => /tags/tag2
 Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/tags/tag2 => file:///build/git-2.20.1/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/mirror/tags/tag2, 8
-Found branch parent: (refs/remotes/mirror/tags/tag2) 28df9d119ade19142bfbbf70f7894be260a966ff
+Found branch parent: (refs/remotes/mirror/tags/tag2) 13c0b8c88c98e7af8950a58f7863b352ba8b326b
 Following parent with do_switch
 Successfully followed parent
-r9 = 857a6329a5d88295ccfcb8d736d21eafc60ff663 (refs/remotes/mirror/tags/tag2)
+r9 = 2468ad48dc6033489294670d332cc464e937113f (refs/remotes/mirror/tags/tag2)
 Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/trunk => file:///build/git-2.20.1/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/mirror/trunk, 8
-Found branch parent: (refs/remotes/mirror/trunk) 511a844df4efe5f167c5c802b7a646f4b9737155
+Found branch parent: (refs/remotes/mirror/trunk) 7671f5eda6b68f17f214e7e456f457b5200e087b
 Following parent with do_switch
 Successfully followed parent
-r9 = 061732c7ca187986475ffef2c4291912f81127de (refs/remotes/mirror/trunk)
-branch_from: /tags => /tags/tag4
-Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/tags/tag4 => file:///build/git-2.20.1/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/mirror/tags/tag4, 8
-Found branch parent: (refs/remotes/mirror/tags/tag4) 0a13bb4f414847970067c7a6ca2b9046597ec09f
+r9 = dc7837d7216c1a456c116c359991debb2d515cdb (refs/remotes/mirror/trunk)
+branch_from: /tags => /tags/tag3
+Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/tags/tag3 => file:///build/git-2.20.1/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/mirror/tags/tag3, 8
+Found branch parent: (refs/remotes/mirror/tags/tag3) 9336fb2b4012d5419f708a0e566781683e92c21c
 Following parent with do_switch
 Successfully followed parent
-r9 = 41da6ee7a19cdbbaab02730879c8e2adb01bd81a (refs/remotes/mirror/tags/tag4)
+r9 = e761aa47e19dce2b5fa08f44e59b0d327cae7950 (refs/remotes/mirror/tags/tag3)
 branch_from: /branches => /branches/a
 Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/branches/a => file:///build/git-2.20.1/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/mirror/branches/a, 8
-Found branch parent: (refs/remotes/mirror/a) 4f71d67fa77421af6f3bce81d50bd68467aad36f
+Found branch parent: (refs/remotes/mirror/a) 57c2124973a5f9d35e9aac31fc5947123a447b49
 Following parent with do_switch
 Successfully followed parent
-r9 = bf8e2b8d1a3215d65642c02ddd926fe693a0a14d (refs/remotes/mirror/a)
-branch_from: /tags => /tags/tag1
-Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/tags/tag1 => file:///build/git-2.20.1/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/mirror/tags/tag1, 8
-Found branch parent: (refs/remotes/mirror/tags/tag1) bf5932f31f1ddd527588b9ef0d659db8a6d62518
+r9 = 5918e9142198b0347508b96176f4b57ced3eb820 (refs/remotes/mirror/a)
+branch_from: /branches => /branches/b
+Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/branches/b => file:///build/git-2.20.1/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/mirror/branches/b, 8
+Found branch parent: (refs/remotes/mirror/b) 3d1f3db2cb225acddfbea12ee4296ca2fd231664
 Following parent with do_switch
 Successfully followed parent
-r9 = dd49da47861fb33a15339fe46aacde78e99a7296 (refs/remotes/mirror/tags/tag1)
-branch_from: /tags => /tags/tag3
-Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/tags/tag3 => file:///build/git-2.20.1/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/mirror/tags/tag3, 8
-Found branch parent: (refs/remotes/mirror/tags/tag3) 4173c1605da91ef6042736f7375b3c5b38eeda9b
+r9 = 7539541fb06dc6433932f44558faa36eca6d93bc (refs/remotes/mirror/b)
+branch_from: /tags => /tags/tag1
+Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/tags/tag1 => file:///build/git-2.20.1/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/mirror/tags/tag1, 8
+Found branch parent: (refs/remotes/mirror/tags/tag1) 56b8b2a048832d942ec398a7371dacade99c4a51
 Following parent with do_switch
 Successfully followed parent
-r9 = 5358dd24bdfc2fe9050a4210b97401a1dc2df73c (refs/remotes/mirror/tags/tag3)
-Previous HEAD position was 511a844 updated trunk
-HEAD is now at 061732c made mirror
+r9 = 3f07cebb53f3ec144837142113633716a39976f8 (refs/remotes/mirror/tags/tag1)
+Previous HEAD position was 7671f5e updated trunk
+HEAD is now at dc7837d made mirror
 Copying file:///build/git-2.20.1/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/mirror/trunk at r9 to file:///build/git-2.20.1/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/mirror/branches/d...
 Found possible branch point: file:///build/git-2.20.1/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/mirror/trunk => file:///build/git-2.20.1/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/mirror/branches/d, 9
-Found branch parent: (refs/remotes/mirror/d) 061732c7ca187986475ffef2c4291912f81127de
+Found branch parent: (refs/remotes/mirror/d) dc7837d7216c1a456c116c359991debb2d515cdb
 Following parent with do_switch
 Successfully followed parent
-r10 = 548d4139b7b91b69bde6b4f7dff4d6b208e81d5b (refs/remotes/mirror/d)
+r10 = 8b03ebdc1d987d594e2618950cd20e63a9fff8ab (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>...]'
@@ -353102,11 +353377,11 @@
 
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7900-subtree/1/.git/
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7900-subtree/1/sub proj/.git/
-[master (root-commit) 96353fb] main1
+[master (root-commit) 27fa0c3] main1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 main1
-[master (root-commit) 3b8cd75] sub1
+[master (root-commit) 1006dc8] sub1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 sub1
@@ -353128,11 +353403,11 @@
 	)
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7900-subtree/2/.git/
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7900-subtree/2/sub proj/.git/
-[master (root-commit) 96353fb] main1
+[master (root-commit) 27fa0c3] main1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 main1
-[master (root-commit) 3b8cd75] sub1
+[master (root-commit) 1006dc8] sub1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 sub1
@@ -353156,11 +353431,11 @@
 
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7900-subtree/3/.git/
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7900-subtree/3/sub proj/.git/
-[master (root-commit) 96353fb] main1
+[master (root-commit) 27fa0c3] main1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 main1
-[master (root-commit) 3b8cd75] sub1
+[master (root-commit) 1006dc8] sub1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 sub1
@@ -353184,11 +353459,11 @@
 
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7900-subtree/4/.git/
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7900-subtree/4/sub proj/.git/
-[master (root-commit) 96353fb] main1
+[master (root-commit) 4afa8e4] main1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 main1
-[master (root-commit) 3b8cd75] sub1
+[master (root-commit) 2e86658] sub1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 sub1
@@ -353212,11 +353487,11 @@
 
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7900-subtree/5/.git/
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7900-subtree/5/sub proj/.git/
-[master (root-commit) ba053a8] main1
+[master (root-commit) 4afa8e4] main1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 main1
-[master (root-commit) 1184494] sub1
+[master (root-commit) 2e86658] sub1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 sub1
@@ -353240,11 +353515,11 @@
 
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7900-subtree/6/.git/
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7900-subtree/6/sub proj/.git/
-[master (root-commit) ba053a8] main1
+[master (root-commit) 4afa8e4] main1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 main1
-[master (root-commit) 1184494] sub1
+[master (root-commit) 2e86658] sub1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 sub1
@@ -353274,11 +353549,11 @@
 
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7900-subtree/7/.git/
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7900-subtree/7/sub proj/.git/
-[master (root-commit) ba053a8] main1
+[master (root-commit) 4afa8e4] main1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 main1
-[master (root-commit) 1184494] sub1
+[master (root-commit) 2e86658] sub1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 sub1
@@ -353286,17 +353561,17 @@
 From ./sub proj
  * branch            master     -> FETCH_HEAD
 Added dir 'sub dir'
-[master c82f9c4] sub2
+[master b0a7f80] sub2
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 sub2
 From ./sub proj
  * branch            master     -> FETCH_HEAD
 Merging:
-6865bc7 Add 'sub dir/' from commit '1184494398213b540bddbdd2143ddb909d019a34'
-virtual c82f9c4ed4b6809bf2bfe7eec116294ea8f21871
+a97be17 Add 'sub dir/' from commit '2e86658266685d488cc15f72d3f783a3bd2fb102'
+virtual b0a7f809d23739d2f4606f8328a742ce8f3e549e
 found 1 common ancestor:
-1184494 sub1
+2e86658 sub1
 Merge made by the 'recursive' strategy.
  sub dir/sub2 | 1 +
  1 file changed, 1 insertion(+)
@@ -353323,11 +353598,11 @@
 
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7900-subtree/8/.git/
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7900-subtree/8/sub proj/.git/
-[master (root-commit) ba053a8] main1
+[master (root-commit) 4afa8e4] main1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 main1
-[master (root-commit) 1184494] sub1
+[master (root-commit) 2e86658] sub1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 sub1
@@ -353335,17 +353610,17 @@
 From ./sub proj
  * branch            master     -> FETCH_HEAD
 Added dir 'sub dir'
-[master c82f9c4] sub2
+[master 7ebb82c] sub2
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 sub2
 From ./sub proj
  * branch            master     -> FETCH_HEAD
 Merging:
-6865bc7 Add 'sub dir/' from commit '1184494398213b540bddbdd2143ddb909d019a34'
-virtual c82f9c4ed4b6809bf2bfe7eec116294ea8f21871
+882d14e Add 'sub dir/' from commit '2e86658266685d488cc15f72d3f783a3bd2fb102'
+virtual 7ebb82c08037300b1daceeda5a9c717e74471da7
 found 1 common ancestor:
-1184494 sub1
+2e86658 sub1
 Merge made by the 'recursive' strategy.
  sub dir/sub2 | 1 +
  1 file changed, 1 insertion(+)
@@ -353372,11 +353647,11 @@
 
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7900-subtree/9/sub proj/.git/
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7900-subtree/9/.git/
-[master (root-commit) ba053a8] main1
+[master (root-commit) b7febc5] main1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 main1
-[master (root-commit) 1184494] sub1
+[master (root-commit) ae5fc8f] sub1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 sub1
@@ -353384,17 +353659,17 @@
 From ./sub proj
  * branch            master     -> FETCH_HEAD
 Added dir 'sub dir'
-[master c82f9c4] sub2
+[master 47314c8] sub2
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 sub2
 From ./sub proj
  * branch            master     -> FETCH_HEAD
 Merging:
-6865bc7 Add 'sub dir/' from commit '1184494398213b540bddbdd2143ddb909d019a34'
-virtual cfb59948181777d982291d48f9ccdf42f6fa4496
+88996ae Add 'sub dir/' from commit 'ae5fc8fd971ff518174a46ce01def08439111489'
+virtual 94fb668d8c28d49d95663be8143c75a493d78334
 found 1 common ancestor:
-1184494 sub1
+ae5fc8f sub1
 Merge made by the 'recursive' strategy.
  sub dir/sub2 | 1 +
  1 file changed, 1 insertion(+)
@@ -353418,11 +353693,11 @@
 
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7900-subtree/10/.git/
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7900-subtree/10/sub proj/.git/
-[master (root-commit) 0abbde9] main1
+[master (root-commit) b7febc5] main1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 main1
-[master (root-commit) 0e653d6] sub1
+[master (root-commit) ae5fc8f] sub1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 sub1
@@ -353452,11 +353727,11 @@
 
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7900-subtree/11/.git/
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7900-subtree/11/subproj/.git/
-[master (root-commit) 0abbde9] main1
+[master (root-commit) b7febc5] main1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 main1
-[master (root-commit) 0e653d6] sub1
+[master (root-commit) ae5fc8f] sub1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 sub1
@@ -353464,17 +353739,17 @@
 From ./subproj
  * branch            master     -> FETCH_HEAD
 Added dir 'subdir'
-[master 3aad716] sub2
+[master 47314c8] sub2
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 sub2
 From ./subproj
  * branch            master     -> FETCH_HEAD
 Merging:
-46810a9 Add 'subdir/' from commit '0e653d6205e30487b0c90826e94382c66884c311'
-virtual 3aad716510219a5fb04d310e9e59ce5e00911b3a
+1eef67a Add 'subdir/' from commit 'ae5fc8fd971ff518174a46ce01def08439111489'
+virtual 47314c833bd5ddc47d7568492d0227b4d099f5bc
 found 1 common ancestor:
-0e653d6 sub1
+ae5fc8f sub1
 Merge made by the 'recursive' strategy.
  subdir/sub2 | 1 +
  1 file changed, 1 insertion(+)
@@ -353501,11 +353776,11 @@
 
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7900-subtree/12/.git/
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7900-subtree/12/sub proj/.git/
-[master (root-commit) 0abbde9] main1
+[master (root-commit) b2d4cc5] main1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 main1
-[master (root-commit) 0e653d6] sub1
+[master (root-commit) 46f27df] sub1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 sub1
@@ -353535,11 +353810,11 @@
 
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7900-subtree/13/.git/
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7900-subtree/13/sub proj/.git/
-[master (root-commit) 0abbde9] main1
+[master (root-commit) b2d4cc5] main1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 main1
-[master (root-commit) 0e653d6] sub1
+[master (root-commit) 46f27df] sub1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 sub1
@@ -353574,11 +353849,11 @@
  
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7900-subtree/14/.git/
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7900-subtree/14/sub proj/.git/
-[master (root-commit) 0abbde9] main1
+[master (root-commit) b2d4cc5] main1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 main1
-[master (root-commit) 0e653d6] sub1
+[master (root-commit) 46f27df] sub1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 sub1
@@ -353586,35 +353861,35 @@
 From ./sub proj
  * branch            master     -> FETCH_HEAD
 Added dir 'sub dir'
-[master 74fcd39] sub dir/main-sub1
+[master 4298b7f] sub dir/main-sub1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 sub dir/main-sub1
-[master ccc395d] main2
+[master 9d0384d] main2
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 main2
-[master bcadac2] sub2
+[master e58e5e8] sub2
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 sub2
-[master cd4243f] sub dir/main-sub2
+[master 72886ca] sub dir/main-sub2
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 sub dir/main-sub2
 From ./sub proj
  * branch            master     -> FETCH_HEAD
 Merging:
-cd4243f sub dir/main-sub2
-virtual bcadac26dfb144853ed3b4f6e1c544daae52967b
+72886ca sub dir/main-sub2
+virtual e58e5e845d6c91a6f6689557b16485359e33c296
 found 1 common ancestor:
-0e653d6 sub1
+46f27df sub1
 Merge made by the 'recursive' strategy.
  sub dir/sub2 | 1 +
  1 file changed, 1 insertion(+)
  create mode 100644 sub dir/sub2
 1/8 (0) [0]
2/8 (0) [0]
3/8 (0) [0]
3/8 (1) [1]
3/8 (1) [2]
4/8 (1) [2]
5/8 (2) [2]
6/8 (3) [2]
7/8 (4) [2]
8/8 (5) [2]
8/8 (6) [3]
1/8 (0) [0]
2/8 (0) [0]
3/8 (0) [0]
3/8 (1) [1]
3/8 (1) [2]
4/8 (1) [2]
5/8 (2) [2]
6/8 (3) [2]
7/8 (4) [2]
8/8 (5) [2]
8/8 (6) [3]
Merge made by the 'ours' strategy.
-b0eb3a89cdb66b9135ae2f79edb12052ef00de31
+9991c1141de9c2ae04785b7b5afe5a13d44935ed
 ok 14 - split sub dir/ with --rejoin
 
 expecting success: 
@@ -353632,17 +353907,17 @@
 	)
  
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7900-subtree/15/.git/
-[master (root-commit) a11c112] main1
+[master (root-commit) ce133cb] main1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 main1
-[master afebb83] sub dir file
+[master 3ce82e8] sub dir file
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 sub dir/file
 1/2 (0) [0]
2/2 (1) [0]
Merge made by the 'ours' strategy.
 1/3 (0) [0]
2/3 (0) [0]
3/3 (0) [0]
3/3 (1) [1]
3/3 (1) [2]
Already up to date.
-d69f399c944b51107cd375a9479c125c27031fab
+712cf255a0f140a542e5f259827630f1c5815df1
 ok 15 - split sub dir/ with --rejoin from scratch
 
 expecting success: 
@@ -353669,11 +353944,11 @@
 
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7900-subtree/16/.git/
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7900-subtree/16/sub proj/.git/
-[master (root-commit) a11c112] main1
+[master (root-commit) ce133cb] main1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 main1
-[master (root-commit) f308109] sub1
+[master (root-commit) 4004a58] sub1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 sub1
@@ -353681,35 +353956,35 @@
 From ./sub proj
  * branch            master     -> FETCH_HEAD
 Added dir 'sub dir'
-[master e81073f] sub dir/main-sub1
+[master 14ca83b] sub dir/main-sub1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 sub dir/main-sub1
-[master 30d86f4] main2
+[master cc552df] main2
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 main2
-[master 8f79f24] sub2
+[master 461c068] sub2
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 sub2
-[master f8066d0] sub dir/main-sub2
+[master 997f670] sub dir/main-sub2
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 sub dir/main-sub2
 From ./sub proj
  * branch            master     -> FETCH_HEAD
 Merging:
-f8066d0 sub dir/main-sub2
-virtual 8f79f2459200dd7b1e78fffaad65ed65d96504cf
+997f670 sub dir/main-sub2
+virtual 461c0682541530f0d2ca2072b318f76e88653bdf
 found 1 common ancestor:
-f308109 sub1
+4004a58 sub1
 Merge made by the 'recursive' strategy.
  sub dir/sub2 | 1 +
  1 file changed, 1 insertion(+)
  create mode 100644 sub dir/sub2
 1/8 (0) [0]
2/8 (0) [0]
3/8 (0) [0]
3/8 (1) [1]
3/8 (1) [2]
4/8 (1) [2]
5/8 (2) [2]
6/8 (3) [2]
7/8 (4) [2]
8/8 (5) [2]
8/8 (6) [3]
Merge made by the 'ours' strategy.
-74443b00ae0e123d9ee3fe30c803efa26216ba2f
+b85f269fa691fbf72856d40cd375fce2dd2e415e
 ok 16 - split sub dir/ with --rejoin and --message
 
 expecting success: 
@@ -353737,11 +354012,11 @@
 
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7900-subtree/17/.git/
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7900-subtree/17/sub proj/.git/
-[master (root-commit) d059b8c] main1
+[master (root-commit) af72374] main1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 main1
-[master (root-commit) fd99f9f] sub1
+[master (root-commit) d47d5c6] sub1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 sub1
@@ -353749,35 +354024,35 @@
 From ./sub proj
  * branch            master     -> FETCH_HEAD
 Added dir 'sub dir'
-[master 62dd14a] sub dir/main-sub1
+[master 4491885] sub dir/main-sub1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 sub dir/main-sub1
-[master 8c1ff3c] main2
+[master 8102ed7] main2
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 main2
-[master f184507] sub2
+[master ae366b1] sub2
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 sub2
-[master 7f031ac] sub dir/main-sub2
+[master 0a3fd16] sub dir/main-sub2
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 sub dir/main-sub2
 From ./sub proj
  * branch            master     -> FETCH_HEAD
 Merging:
-7f031ac sub dir/main-sub2
-virtual f18450748496f277760818eb49ae087f012ddd03
+0a3fd16 sub dir/main-sub2
+virtual ae366b1f742bc7be0fb5d0562436539a2454e4c3
 found 1 common ancestor:
-fd99f9f sub1
+d47d5c6 sub1
 Merge made by the 'recursive' strategy.
  sub dir/sub2 | 1 +
  1 file changed, 1 insertion(+)
  create mode 100644 sub dir/sub2
 1/8 (0) [0]
2/8 (0) [0]
3/8 (0) [0]
3/8 (1) [1]
3/8 (1) [2]
4/8 (1) [2]
5/8 (2) [2]
6/8 (3) [2]
7/8 (4) [2]
8/8 (5) [2]
8/8 (6) [3]
1/8 (0) [0]
2/8 (0) [0]
3/8 (0) [0]
3/8 (1) [1]
3/8 (1) [2]
4/8 (1) [2]
5/8 (2) [2]
6/8 (3) [2]
7/8 (4) [2]
8/8 (5) [2]
8/8 (6) [3]
Created branch 'subproj-br'
-758f6b1576453551f11513855f008f319cd200df
+fa55ce7e3de100f9613b5739cae0eaee9678ab4e
 ok 17 - split "sub dir"/ with --branch
 
 expecting success: 
@@ -353812,11 +354087,11 @@
 
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7900-subtree/18/.git/
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7900-subtree/18/sub proj/.git/
-[master (root-commit) d059b8c] main1
+[master (root-commit) af72374] main1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 main1
-[master (root-commit) fd99f9f] sub1
+[master (root-commit) d47d5c6] sub1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 sub1
@@ -353824,35 +354099,35 @@
 From ./sub proj
  * branch            master     -> FETCH_HEAD
 Added dir 'sub dir'
-[master 62dd14a] sub dir/main-sub1
+[master 9683784] sub dir/main-sub1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 sub dir/main-sub1
-[master 376762f] main2
+[master 6894dd1] main2
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 main2
-[master 0f1f690] sub2
+[master 8d62272] sub2
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 sub2
-[master b9d00b1] sub dir/main-sub2
+[master f6b39bf] sub dir/main-sub2
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 sub dir/main-sub2
 From ./sub proj
  * branch            master     -> FETCH_HEAD
 Merging:
-b9d00b1 sub dir/main-sub2
-virtual 0f1f690783d50d158ced5373c9b383a751a76b96
+f6b39bf sub dir/main-sub2
+virtual 8d62272255df0b90aaaaabe0783571df717e2bdc
 found 1 common ancestor:
-fd99f9f sub1
+d47d5c6 sub1
 Merge made by the 'recursive' strategy.
  sub dir/sub2 | 1 +
  1 file changed, 1 insertion(+)
  create mode 100644 sub dir/sub2
 1/8 (0) [0]
2/8 (0) [0]
3/8 (0) [0]
3/8 (1) [1]
3/8 (1) [2]
4/8 (1) [2]
5/8 (2) [2]
6/8 (3) [2]
7/8 (4) [2]
8/8 (5) [2]
8/8 (6) [3]
1/8 (0) [0]
2/8 (0) [0]
3/8 (0) [0]
3/8 (1) [1]
3/8 (1) [2]
4/8 (1) [2]
5/8 (2) [2]
6/8 (3) [2]
7/8 (4) [2]
8/8 (5) [2]
8/8 (6) [3]
Created branch 'subproj-br'
-be100f9a174ad8d19794c2bfc5ab855b8e7767eb
+aa2dc2389c4864e5fa7cbd82848a13f47f9a04ed
 ok 18 - check hash of split
 
 expecting success: 
@@ -353881,11 +354156,11 @@
 
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7900-subtree/19/.git/
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7900-subtree/19/sub proj/.git/
-[master (root-commit) 32970c3] main1
+[master (root-commit) cfcaa41] main1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 main1
-[master (root-commit) 9cd0523] sub1
+[master (root-commit) 0bfe0c0] sub1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 sub1
@@ -353893,35 +354168,35 @@
 From ./sub proj
  * branch            master     -> FETCH_HEAD
 Added dir 'sub dir'
-[master e4c451b] sub dir/main-sub1
+[master 6a998b5] sub dir/main-sub1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 sub dir/main-sub1
-[master bb7292c] main2
+[master 840e640] main2
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 main2
-[master 882e40f] sub2
+[master d0fbcb9] sub2
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 sub2
-[master d4e4db9] sub dir/main-sub2
+[master 373afac] sub dir/main-sub2
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 sub dir/main-sub2
 From ./sub proj
  * branch            master     -> FETCH_HEAD
 Merging:
-d4e4db9 sub dir/main-sub2
-virtual 882e40ffce1e0c5e44c120ce15174d23876c87f3
+373afac sub dir/main-sub2
+virtual d0fbcb9da1de612eca5f772594bac322729f2e01
 found 1 common ancestor:
-9cd0523 sub1
+0bfe0c0 sub1
 Merge made by the 'recursive' strategy.
  sub dir/sub2 | 1 +
  1 file changed, 1 insertion(+)
  create mode 100644 sub dir/sub2
 1/8 (0) [0]
2/8 (0) [0]
3/8 (0) [0]
3/8 (1) [1]
3/8 (1) [2]
4/8 (1) [2]
5/8 (2) [2]
6/8 (3) [2]
7/8 (4) [2]
8/8 (5) [2]
8/8 (6) [3]
1/8 (0) [0]
2/8 (0) [0]
3/8 (0) [0]
3/8 (1) [1]
3/8 (1) [2]
4/8 (1) [2]
5/8 (2) [2]
6/8 (3) [2]
7/8 (4) [2]
8/8 (5) [2]
8/8 (6) [3]
Updated branch 'subproj-br'
-835bb3788da22d31aeafc3287afaf81bff994d71
+75eafb15ef78405d8e4e8b5bd8c2ab20289da40a
 ok 19 - split "sub dir"/ with --branch for an existing branch
 
 expecting success: 
@@ -353948,11 +354223,11 @@
 
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7900-subtree/20/.git/
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7900-subtree/20/sub proj/.git/
-[master (root-commit) a0393f3] main1
+[master (root-commit) 452d91b] main1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 main1
-[master (root-commit) 56f79f8] sub1
+[master (root-commit) c1ad294] sub1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 sub1
@@ -353960,34 +354235,34 @@
 From ./sub proj
  * branch            master     -> FETCH_HEAD
 Added dir 'sub dir'
-[master 49716ef] sub dir/main-sub1
+[master f8dc0c4] sub dir/main-sub1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 sub dir/main-sub1
-[master 082ca87] main2
+[master c1b864f] main2
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 main2
-[master 6ba5596] sub2
+[master 191f7e1] sub2
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 sub2
-[master 87c4a38] sub dir/main-sub2
+[master 90c1130] sub dir/main-sub2
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 sub dir/main-sub2
 From ./sub proj
  * branch            master     -> FETCH_HEAD
 Merging:
-87c4a38 sub dir/main-sub2
-virtual 6ba5596fedbb7ffcfb3cf6026fa06acbd7d26d25
+90c1130 sub dir/main-sub2
+virtual 191f7e1df5b1b21669014c838373d47d6de10cc9
 found 1 common ancestor:
-56f79f8 sub1
+c1ad294 sub1
 Merge made by the 'recursive' strategy.
  sub dir/sub2 | 1 +
  1 file changed, 1 insertion(+)
  create mode 100644 sub dir/sub2
-1/8 (0) [0]
2/8 (0) [0]
3/8 (0) [0]
3/8 (1) [1]
3/8 (1) [2]
4/8 (1) [2]
5/8 (2) [2]
6/8 (3) [2]
7/8 (4) [2]
8/8 (5) [2]
8/8 (6) [3]
Branch 'init' is not an ancestor of commit '61a1451784b88fe07ac79ddfd9aa9ca72df56e89'.
+1/8 (0) [0]
2/8 (0) [0]
3/8 (0) [0]
3/8 (1) [1]
3/8 (1) [2]
4/8 (1) [2]
5/8 (2) [2]
6/8 (3) [2]
7/8 (4) [2]
8/8 (5) [2]
8/8 (6) [3]
Branch 'init' is not an ancestor of commit '95187d834db85bffdc5b1d52e89f0a89f3098099'.
 ok 20 - split "sub dir"/ with --branch for an incompatible branch
 
 expecting success: 
@@ -354040,11 +354315,11 @@
 
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7900-subtree/21/.git/
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7900-subtree/21/sub proj/.git/
-[master (root-commit) a0393f3] main1
+[master (root-commit) 203991d] main1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 main1
-[master (root-commit) 56f79f8] sub1
+[master (root-commit) 9dceccb] sub1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 sub1
@@ -354052,78 +354327,78 @@
 From ./sub proj
  * branch            master     -> FETCH_HEAD
 Added dir 'sub dir'
-[master 49716ef] sub dir/main-sub1
+[master cd2beed] sub dir/main-sub1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 sub dir/main-sub1
-[master 082ca87] main2
+[master 0cfdd0c] main2
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 main2
-[master 6ba5596] sub2
+[master c44207b] sub2
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 sub2
-[master 87c4a38] sub dir/main-sub2
+[master c99348f] sub dir/main-sub2
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 sub dir/main-sub2
 From ./sub proj
  * branch            master     -> FETCH_HEAD
 Merging:
-87c4a38 sub dir/main-sub2
-virtual 6ba5596fedbb7ffcfb3cf6026fa06acbd7d26d25
+c99348f sub dir/main-sub2
+virtual c44207bd3bc12841072cdf1e404c4a24de6e066b
 found 1 common ancestor:
-56f79f8 sub1
+9dceccb sub1
 Merge made by the 'recursive' strategy.
  sub dir/sub2 | 1 +
  1 file changed, 1 insertion(+)
  create mode 100644 sub dir/sub2
 1/8 (0) [0]
2/8 (0) [0]
3/8 (0) [0]
3/8 (1) [1]
3/8 (1) [2]
4/8 (1) [2]
5/8 (2) [2]
6/8 (3) [2]
7/8 (4) [2]
8/8 (5) [2]
8/8 (6) [3]
Merge made by the 'ours' strategy.
 Created branch 'subproj-br'
-4222efdef2f809c955f9ec486032a8c5367d3df8
-[master a1bb5aa] sub3
+aa5d387c168fffb72486fc594d09a6576ccc0fa4
+[master 5f30018] sub3
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 sub3
-[master ba1ee80] sub dir/main-sub3
+[master 1a5b711] sub dir/main-sub3
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 sub dir/main-sub3
 From ..
  * branch            subproj-br -> FETCH_HEAD
 Merging:
-a1bb5aa sub3
-virtual 4222efdef2f809c955f9ec486032a8c5367d3df8
+5f30018 sub3
+virtual aa5d387c168fffb72486fc594d09a6576ccc0fa4
 found 1 common ancestor:
-6ba5596 sub2
+c44207b sub2
 Merge made by the 'recursive' strategy.
  main-sub1 | 1 +
  main-sub2 | 1 +
  2 files changed, 2 insertions(+)
  create mode 100644 main-sub1
  create mode 100644 main-sub2
-[master 5c5ded6] sub4
+[master e9a7312] sub4
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 sub4
 1/5 (0) [0]
2/5 (1) [0]
3/5 (1) [0]
4/5 (1) [0]
4/5 (2) [1]
4/5 (2) [2]
5/5 (2) [2]
Merge made by the 'ours' strategy.
 Updated branch 'subproj-br'
-41841285d0f7a4c3e84e6750996e27d36e902f55
-[master 82adb34] sub dir/main-sub4
+cd916c6fc14d9c9b17d80807988fd96c3061ed93
+[master cbbba01] sub dir/main-sub4
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 sub dir/main-sub4
 1/4 (0) [0]
2/4 (0) [0]
3/4 (0) [0]
3/4 (1) [1]
3/4 (1) [2]
4/4 (1) [2]
Merge made by the 'ours' strategy.
 Updated branch 'subproj-br'
-f5bb64e964382dce55705e2b3f0a4335f9119a8b
+cdc761b1b550f2a33bf3d708b637b38135dd3f50
 From ..
  * branch            subproj-br -> FETCH_HEAD
 Merging:
-5c5ded6 sub4
-virtual f5bb64e964382dce55705e2b3f0a4335f9119a8b
+e9a7312 sub4
+virtual cdc761b1b550f2a33bf3d708b637b38135dd3f50
 found 1 common ancestor:
-4222efd *Merge commit '6ba5596fedbb7ffcfb3cf6026fa06acbd7d26d25'
+aa5d387 *Merge commit 'c44207bd3bc12841072cdf1e404c4a24de6e066b'
 Merge made by the 'recursive' strategy.
  main-sub3 | 1 +
  main-sub4 | 1 +
@@ -354183,11 +354458,11 @@
 
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7900-subtree/22/.git/
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7900-subtree/22/sub proj/.git/
-[master (root-commit) d899bdc] main1
+[master (root-commit) db67981] main1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 main1
-[master (root-commit) 246517a] sub1
+[master (root-commit) 75cc225] sub1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 sub1
@@ -354195,78 +354470,78 @@
 From ./sub proj
  * branch            master     -> FETCH_HEAD
 Added dir 'sub dir'
-[master 5b7ea89] sub dir/main-sub1
+[master 84bee04] sub dir/main-sub1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 sub dir/main-sub1
-[master 681ba35] main2
+[master 6d9e5b9] main2
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 main2
-[master 805d076] sub2
+[master 03cf00c] sub2
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 sub2
-[master d38231e] sub dir/main-sub2
+[master c2ec00b] sub dir/main-sub2
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 sub dir/main-sub2
 From ./sub proj
  * branch            master     -> FETCH_HEAD
 Merging:
-d38231e sub dir/main-sub2
-virtual 805d076c7041de6e9be7333106eec8f3e76a00cc
+c2ec00b sub dir/main-sub2
+virtual 03cf00c2e20bdc76cd5ae38a32a91a4d0e9066c0
 found 1 common ancestor:
-246517a sub1
+75cc225 sub1
 Merge made by the 'recursive' strategy.
  sub dir/sub2 | 1 +
  1 file changed, 1 insertion(+)
  create mode 100644 sub dir/sub2
 1/8 (0) [0]
2/8 (0) [0]
3/8 (0) [0]
3/8 (1) [1]
3/8 (1) [2]
4/8 (1) [2]
5/8 (2) [2]
6/8 (3) [2]
7/8 (4) [2]
8/8 (5) [2]
8/8 (6) [3]
Merge made by the 'ours' strategy.
 Created branch 'subproj-br'
-3028ab6b3d5bd7e49a6cacaf69b94f8a27e3b04c
-[master 69ba2a6] sub3
+86c1e6ea569031f16785951432252623028a2977
+[master e41b6df] sub3
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 sub3
-[master 3d09496] sub dir/main-sub3
+[master 3fc9c32] sub dir/main-sub3
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 sub dir/main-sub3
 From ..
  * branch            subproj-br -> FETCH_HEAD
 Merging:
-69ba2a6 sub3
-virtual 3028ab6b3d5bd7e49a6cacaf69b94f8a27e3b04c
+e41b6df sub3
+virtual 86c1e6ea569031f16785951432252623028a2977
 found 1 common ancestor:
-805d076 sub2
+03cf00c sub2
 Merge made by the 'recursive' strategy.
  main-sub1 | 1 +
  main-sub2 | 1 +
  2 files changed, 2 insertions(+)
  create mode 100644 main-sub1
  create mode 100644 main-sub2
-[master 62016f2] sub4
+[master 5edab75] sub4
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 sub4
 1/5 (0) [0]
2/5 (1) [0]
3/5 (1) [0]
4/5 (1) [0]
4/5 (2) [1]
4/5 (2) [2]
5/5 (2) [2]
Merge made by the 'ours' strategy.
 Updated branch 'subproj-br'
-8d8a25f5d455dc534e9c5372b99fcd1aa8bc5123
-[master cc8cd31] sub dir/main-sub4
+d1ee2655d32a8564aa1e72b40dbc767d53fbfdc4
+[master 909705a] sub dir/main-sub4
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 sub dir/main-sub4
 1/4 (0) [0]
2/4 (0) [0]
3/4 (0) [0]
3/4 (1) [1]
3/4 (1) [2]
4/4 (1) [2]
Merge made by the 'ours' strategy.
 Updated branch 'subproj-br'
-c3b3f4f7c46e5906913b2fbcbf543484f245daa2
+0e7f5660ce4c63c99b731994f888ceac2012e82f
 From ..
  * branch            subproj-br -> FETCH_HEAD
 Merging:
-62016f2 sub4
-virtual c3b3f4f7c46e5906913b2fbcbf543484f245daa2
+5edab75 sub4
+virtual 0e7f5660ce4c63c99b731994f888ceac2012e82f
 found 1 common ancestor:
-3028ab6 *Merge commit '805d076c7041de6e9be7333106eec8f3e76a00cc'
+86c1e6e *Merge commit '03cf00c2e20bdc76cd5ae38a32a91a4d0e9066c0'
 Merge made by the 'recursive' strategy.
  main-sub3 | 1 +
  main-sub4 | 1 +
@@ -354334,11 +354609,11 @@
 
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7900-subtree/23/.git/
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7900-subtree/23/sub proj/.git/
-[master (root-commit) f4f1be9] main1
+[master (root-commit) c4346be] main1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 main1
-[master (root-commit) e43f901] sub1
+[master (root-commit) 4f88808] sub1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 sub1
@@ -354346,78 +354621,78 @@
 From ./sub proj
  * branch            master     -> FETCH_HEAD
 Added dir 'sub dir'
-[master b578a11] sub dir/main-sub1
+[master c3825d8] sub dir/main-sub1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 sub dir/main-sub1
-[master b3bec75] main2
+[master 4b0ae6f] main2
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 main2
-[master 00f25dd] sub2
+[master 9d2b927] sub2
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 sub2
-[master 67e0974] sub dir/main-sub2
+[master 51ace4b] sub dir/main-sub2
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 sub dir/main-sub2
 From ./sub proj
  * branch            master     -> FETCH_HEAD
 Merging:
-67e0974 sub dir/main-sub2
-virtual 00f25ddf3a750f8ab7835d5fb3999999b3fdd233
+51ace4b sub dir/main-sub2
+virtual 9d2b927601f041be20d2c98114216fe5d49e5606
 found 1 common ancestor:
-e43f901 sub1
+4f88808 sub1
 Merge made by the 'recursive' strategy.
  sub dir/sub2 | 1 +
  1 file changed, 1 insertion(+)
  create mode 100644 sub dir/sub2
 1/8 (0) [0]
2/8 (0) [0]
3/8 (0) [0]
3/8 (1) [1]
3/8 (1) [2]
4/8 (1) [2]
5/8 (2) [2]
6/8 (3) [2]
7/8 (4) [2]
8/8 (5) [2]
8/8 (6) [3]
Merge made by the 'ours' strategy.
 Created branch 'subproj-br'
-0f0cad39b14d63f5e7be38e6cf6457d54b22fdc4
-[master 03c6fd8] sub3
+3b74cad4f5dfc3bacd74e1c6c595c11b35e308b4
+[master 0ba82d2] sub3
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 sub3
-[master 8519e12] sub dir/main-sub3
+[master 6e50a4f] sub dir/main-sub3
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 sub dir/main-sub3
 From ..
  * branch            subproj-br -> FETCH_HEAD
 Merging:
-03c6fd8 sub3
-virtual 0f0cad39b14d63f5e7be38e6cf6457d54b22fdc4
+0ba82d2 sub3
+virtual 3b74cad4f5dfc3bacd74e1c6c595c11b35e308b4
 found 1 common ancestor:
-00f25dd sub2
+9d2b927 sub2
 Merge made by the 'recursive' strategy.
  main-sub1 | 1 +
  main-sub2 | 1 +
  2 files changed, 2 insertions(+)
  create mode 100644 main-sub1
  create mode 100644 main-sub2
-[master 2323812] sub4
+[master 4312270] sub4
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 sub4
 1/5 (0) [0]
2/5 (1) [0]
3/5 (1) [0]
4/5 (1) [0]
4/5 (2) [1]
4/5 (2) [2]
5/5 (2) [2]
Merge made by the 'ours' strategy.
 Updated branch 'subproj-br'
-8d5a8221a931a96f1985feac6ecaf51900064f5c
-[master 81d5bcc] sub dir/main-sub4
+c3b5e03b753268572cdc68ffef785c2d44324cbd
+[master 63f7619] sub dir/main-sub4
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 sub dir/main-sub4
 1/4 (0) [0]
2/4 (0) [0]
3/4 (0) [0]
3/4 (1) [1]
3/4 (1) [2]
4/4 (1) [2]
Merge made by the 'ours' strategy.
 Updated branch 'subproj-br'
-1467da6632e15ca345a15cfd2041e25d3964e660
+ebcb754d43a553012fa371a37b731ccfcecb57a4
 From ..
  * branch            subproj-br -> FETCH_HEAD
 Merging:
-2323812 sub4
-virtual 1467da6632e15ca345a15cfd2041e25d3964e660
+4312270 sub4
+virtual ebcb754d43a553012fa371a37b731ccfcecb57a4
 found 1 common ancestor:
-0f0cad3 *Merge commit '00f25ddf3a750f8ab7835d5fb3999999b3fdd233'
+3b74cad *Merge commit '9d2b927601f041be20d2c98114216fe5d49e5606'
 Merge made by the 'recursive' strategy.
  main-sub3 | 1 +
  main-sub4 | 1 +
@@ -354427,10 +354702,10 @@
 From ./sub proj
  * branch            master     -> FETCH_HEAD
 Merging:
-3dc9b13 Split 'sub dir/' into commit '1467da6632e15ca345a15cfd2041e25d3964e660'
-virtual 01065967739092ef941e4048b78ef52b614bfb21
+4780624 Split 'sub dir/' into commit 'ebcb754d43a553012fa371a37b731ccfcecb57a4'
+virtual 4e6a8e8bf7feebab4e2d732ee632b1e436e67b50
 found 1 common ancestor:
-1467da6 *sub dir/main-sub4
+ebcb754 *sub dir/main-sub4
 Merge made by the 'recursive' strategy.
  sub dir/sub3 | 1 +
  sub dir/sub4 | 1 +
@@ -354505,11 +354780,11 @@
 
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7900-subtree/24/.git/
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7900-subtree/24/sub proj/.git/
-[master (root-commit) 92da206] main1
+[master (root-commit) 3df2a51] main1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 main1
-[master (root-commit) f60359d] sub1
+[master (root-commit) e5826fc] sub1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 sub1
@@ -354517,78 +354792,78 @@
 From ./sub proj
  * branch            master     -> FETCH_HEAD
 Added dir 'sub dir'
-[master 06a4b90] sub dir/main-sub1
+[master 90ba1d1] sub dir/main-sub1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 sub dir/main-sub1
-[master f3f9c70] main2
+[master 90aaf4d] main2
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 main2
-[master 0c4b7cc] sub2
+[master 072b12b] sub2
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 sub2
-[master 71a799a] sub dir/main-sub2
+[master 5f80af5] sub dir/main-sub2
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 sub dir/main-sub2
 From ./sub proj
  * branch            master     -> FETCH_HEAD
 Merging:
-71a799a sub dir/main-sub2
-virtual 0c4b7cc7d57204db86d798def18be6d6fe3fbcea
+5f80af5 sub dir/main-sub2
+virtual 072b12b56d6714e104891b17d316ad13286500c7
 found 1 common ancestor:
-f60359d sub1
+e5826fc sub1
 Merge made by the 'recursive' strategy.
  sub dir/sub2 | 1 +
  1 file changed, 1 insertion(+)
  create mode 100644 sub dir/sub2
 1/8 (0) [0]
2/8 (0) [0]
3/8 (0) [0]
3/8 (1) [1]
3/8 (1) [2]
4/8 (1) [2]
5/8 (2) [2]
6/8 (3) [2]
7/8 (4) [2]
8/8 (5) [2]
8/8 (6) [3]
Merge made by the 'ours' strategy.
 Created branch 'subproj-br'
-5915f84dde740dbf4d8f51ce565c7166e46d90d0
-[master 2cdf770] sub3
+3ee3484460dc7f009accf238a7225e53eb6e72a7
+[master 6fce3cc] sub3
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 sub3
-[master 21e0ad0] sub dir/main-sub3
+[master f808c52] sub dir/main-sub3
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 sub dir/main-sub3
 From ..
  * branch            subproj-br -> FETCH_HEAD
 Merging:
-2cdf770 sub3
-virtual 5915f84dde740dbf4d8f51ce565c7166e46d90d0
+6fce3cc sub3
+virtual 3ee3484460dc7f009accf238a7225e53eb6e72a7
 found 1 common ancestor:
-0c4b7cc sub2
+072b12b sub2
 Merge made by the 'recursive' strategy.
  main-sub1 | 1 +
  main-sub2 | 1 +
  2 files changed, 2 insertions(+)
  create mode 100644 main-sub1
  create mode 100644 main-sub2
-[master e10db34] sub4
+[master a32ccd7] sub4
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 sub4
 1/5 (0) [0]
2/5 (1) [0]
3/5 (1) [0]
4/5 (1) [0]
4/5 (2) [1]
4/5 (2) [2]
5/5 (2) [2]
Merge made by the 'ours' strategy.
 Updated branch 'subproj-br'
-6b7a7be8db7cfe2be412dc63760cc62610ed17a9
-[master 7dd36da] sub dir/main-sub4
+6d6e3db7f530188d38cee305e41aa1f0aed904c0
+[master 4fd7a35] sub dir/main-sub4
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 sub dir/main-sub4
 1/4 (0) [0]
2/4 (0) [0]
3/4 (0) [0]
3/4 (1) [1]
3/4 (1) [2]
4/4 (1) [2]
Merge made by the 'ours' strategy.
 Updated branch 'subproj-br'
-746796fcff4d63d63b1519ca1100bc98c76e1278
+a96ff248ce3a13f1bd1afeb8c1484729958f029f
 From ..
  * branch            subproj-br -> FETCH_HEAD
 Merging:
-e10db34 sub4
-virtual 746796fcff4d63d63b1519ca1100bc98c76e1278
+a32ccd7 sub4
+virtual a96ff248ce3a13f1bd1afeb8c1484729958f029f
 found 1 common ancestor:
-5915f84 *Merge commit '0c4b7cc7d57204db86d798def18be6d6fe3fbcea'
+3ee3484 *Merge commit '072b12b56d6714e104891b17d316ad13286500c7'
 Merge made by the 'recursive' strategy.
  main-sub3 | 1 +
  main-sub4 | 1 +
@@ -354598,10 +354873,10 @@
 From ./sub proj
  * branch            master     -> FETCH_HEAD
 Merging:
-e59e630 Split 'sub dir/' into commit '746796fcff4d63d63b1519ca1100bc98c76e1278'
-virtual 25723c18c652ba5ed7df120386c90ec026f83149
+c272c24 Split 'sub dir/' into commit 'a96ff248ce3a13f1bd1afeb8c1484729958f029f'
+virtual 235d42a479039eba9112d87fda0df7d40c14671e
 found 1 common ancestor:
-746796f *sub dir/main-sub4
+a96ff24 *sub dir/main-sub4
 Merge made by the 'recursive' strategy.
  sub dir/sub3 | 1 +
  sub dir/sub4 | 1 +
@@ -354660,11 +354935,11 @@
 
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7900-subtree/25/.git/
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7900-subtree/25/sub proj/.git/
-[master (root-commit) 7a48f33] main1
+[master (root-commit) 6cd25e0] main1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 main1
-[master (root-commit) da90e6f] sub1
+[master (root-commit) 71dcdac] sub1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 sub1
@@ -354672,78 +354947,78 @@
 From ./sub proj
  * branch            master     -> FETCH_HEAD
 Added dir 'sub dir'
-[master 6042cbc] sub dir/main-sub1
+[master 65b199f] sub dir/main-sub1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 sub dir/main-sub1
-[master 7526dc2] main2
+[master 874902b] main2
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 main2
-[master 88ec28b] sub2
+[master 45d7262] sub2
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 sub2
-[master b9e8e9e] sub dir/main-sub2
+[master f78eca1] sub dir/main-sub2
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 sub dir/main-sub2
 From ./sub proj
  * branch            master     -> FETCH_HEAD
 Merging:
-b9e8e9e sub dir/main-sub2
-virtual 88ec28b3de307e9708fe5581ab1a8700a05fbdd8
+f78eca1 sub dir/main-sub2
+virtual 45d7262b620a50d47ee83cdace302cda2ce63a4f
 found 1 common ancestor:
-da90e6f sub1
+71dcdac sub1
 Merge made by the 'recursive' strategy.
  sub dir/sub2 | 1 +
  1 file changed, 1 insertion(+)
  create mode 100644 sub dir/sub2
 1/8 (0) [0]
2/8 (0) [0]
3/8 (0) [0]
3/8 (1) [1]
3/8 (1) [2]
4/8 (1) [2]
5/8 (2) [2]
6/8 (3) [2]
7/8 (4) [2]
8/8 (5) [2]
8/8 (6) [3]
Merge made by the 'ours' strategy.
 Created branch 'subproj-br'
-64d398d6946160da02da510c568f040275f22a57
-[master 161c86a] sub3
+58a3185a90ed40e9d73c6ff88374f8c466d3bd77
+[master a6e4e00] sub3
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 sub3
-[master d0e861e] sub dir/main-sub3
+[master fbf9fff] sub dir/main-sub3
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 sub dir/main-sub3
 From ..
  * branch            subproj-br -> FETCH_HEAD
 Merging:
-161c86a sub3
-virtual 64d398d6946160da02da510c568f040275f22a57
+a6e4e00 sub3
+virtual 58a3185a90ed40e9d73c6ff88374f8c466d3bd77
 found 1 common ancestor:
-88ec28b sub2
+45d7262 sub2
 Merge made by the 'recursive' strategy.
  main-sub1 | 1 +
  main-sub2 | 1 +
  2 files changed, 2 insertions(+)
  create mode 100644 main-sub1
  create mode 100644 main-sub2
-[master 2e4b894] sub4
+[master e0d9455] sub4
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 sub4
 1/5 (0) [0]
2/5 (1) [0]
3/5 (1) [0]
4/5 (1) [0]
4/5 (2) [1]
4/5 (2) [2]
5/5 (2) [2]
Merge made by the 'ours' strategy.
 Updated branch 'subproj-br'
-b0f8d2e0f5a7cafcf761f59c445254d29a678193
-[master 95aae91] sub dir/main-sub4
+0142da26a6fc15bcf29b0c075f2bac698cbdad48
+[master a441646] sub dir/main-sub4
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 sub dir/main-sub4
 1/4 (0) [0]
2/4 (0) [0]
3/4 (0) [0]
3/4 (1) [1]
3/4 (1) [2]
4/4 (1) [2]
Merge made by the 'ours' strategy.
 Updated branch 'subproj-br'
-999e0449db76a6e9de0354efb83f5faafb07b662
+703aa5a698e0203ce19e40bd2516a306f3530542
 From ..
  * branch            subproj-br -> FETCH_HEAD
 Merging:
-2e4b894 sub4
-virtual 999e0449db76a6e9de0354efb83f5faafb07b662
+e0d9455 sub4
+virtual 703aa5a698e0203ce19e40bd2516a306f3530542
 found 1 common ancestor:
-64d398d *Merge commit '88ec28b3de307e9708fe5581ab1a8700a05fbdd8'
+58a3185 *Merge commit '45d7262b620a50d47ee83cdace302cda2ce63a4f'
 Merge made by the 'recursive' strategy.
  main-sub3 | 1 +
  main-sub4 | 1 +
@@ -354753,10 +355028,10 @@
 From ./sub proj
  * branch            master     -> FETCH_HEAD
 Merging:
-ffdcef3 Split 'sub dir/' into commit '999e0449db76a6e9de0354efb83f5faafb07b662'
-virtual bdad1288a636e5a5d08afd4fe81d04b3c9f2de79
+9601c57 Split 'sub dir/' into commit '703aa5a698e0203ce19e40bd2516a306f3530542'
+virtual 137c92d45981f365399b0f546460fb74caba27d3
 found 1 common ancestor:
-999e044 *sub dir/main-sub4
+703aa5a *sub dir/main-sub4
 Merge made by the 'recursive' strategy.
  sub dir/sub3 | 1 +
  sub dir/sub4 | 1 +
@@ -354817,11 +355092,11 @@
 
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7900-subtree/26/.git/
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7900-subtree/26/sub proj/.git/
-[master (root-commit) 5c22d0e] main1
+[master (root-commit) 790763e] main1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 main1
-[master (root-commit) b0ce7f5] sub1
+[master (root-commit) d71fd41] sub1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 sub1
@@ -354829,78 +355104,78 @@
 From ./sub proj
  * branch            master     -> FETCH_HEAD
 Added dir 'sub dir'
-[master f9a315b] sub dir/main-sub1
+[master 294a01e] sub dir/main-sub1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 sub dir/main-sub1
-[master d187729] main2
+[master ccc4ce8] main2
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 main2
-[master ad73821] sub2
+[master cb26289] sub2
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 sub2
-[master d775e71] sub dir/main-sub2
+[master afc7b21] sub dir/main-sub2
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 sub dir/main-sub2
 From ./sub proj
  * branch            master     -> FETCH_HEAD
 Merging:
-d775e71 sub dir/main-sub2
-virtual ad73821a13113ee9809e9b74a344fab6411b8329
+afc7b21 sub dir/main-sub2
+virtual cb26289b96aba939c84069e363e63cfe41a50ed6
 found 1 common ancestor:
-b0ce7f5 sub1
+d71fd41 sub1
 Merge made by the 'recursive' strategy.
  sub dir/sub2 | 1 +
  1 file changed, 1 insertion(+)
  create mode 100644 sub dir/sub2
 1/8 (0) [0]
2/8 (0) [0]
3/8 (0) [0]
3/8 (1) [1]
3/8 (1) [2]
4/8 (1) [2]
5/8 (2) [2]
6/8 (3) [2]
7/8 (4) [2]
8/8 (5) [2]
8/8 (6) [3]
Merge made by the 'ours' strategy.
 Created branch 'subproj-br'
-3d5907e018a64196298833c75bd07741ee801e5e
-[master 752378a] sub3
+6e02146fce44c0c8b0d0f46064eef826ab326128
+[master 8d874a2] sub3
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 sub3
-[master 0808615] sub dir/main-sub3
+[master 0664ead] sub dir/main-sub3
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 sub dir/main-sub3
 From ..
  * branch            subproj-br -> FETCH_HEAD
 Merging:
-752378a sub3
-virtual 3d5907e018a64196298833c75bd07741ee801e5e
+8d874a2 sub3
+virtual 6e02146fce44c0c8b0d0f46064eef826ab326128
 found 1 common ancestor:
-ad73821 sub2
+cb26289 sub2
 Merge made by the 'recursive' strategy.
  main-sub1 | 1 +
  main-sub2 | 1 +
  2 files changed, 2 insertions(+)
  create mode 100644 main-sub1
  create mode 100644 main-sub2
-[master 053d6fe] sub4
+[master 48ad97e] sub4
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 sub4
 1/5 (0) [0]
2/5 (1) [0]
3/5 (1) [0]
4/5 (1) [0]
4/5 (2) [1]
4/5 (2) [2]
5/5 (2) [2]
Merge made by the 'ours' strategy.
 Updated branch 'subproj-br'
-4f718ceb4b52e24fb6a2aa2e5774969393a18091
-[master 6687caf] sub dir/main-sub4
+4064d97c28b15436d17c49a89e14da96f54f5e26
+[master 5c86b5d] sub dir/main-sub4
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 sub dir/main-sub4
 1/4 (0) [0]
2/4 (0) [0]
3/4 (0) [0]
3/4 (1) [1]
3/4 (1) [2]
4/4 (1) [2]
Merge made by the 'ours' strategy.
 Updated branch 'subproj-br'
-969bb21b20153f41104eba475fbaf4aa0bea3472
+10b2d16da6545b64d05d5d790ed0f0be51f2effd
 From ..
  * branch            subproj-br -> FETCH_HEAD
 Merging:
-053d6fe sub4
-virtual 969bb21b20153f41104eba475fbaf4aa0bea3472
+48ad97e sub4
+virtual 10b2d16da6545b64d05d5d790ed0f0be51f2effd
 found 1 common ancestor:
-3d5907e *Merge commit 'ad73821a13113ee9809e9b74a344fab6411b8329'
+6e02146 *Merge commit 'cb26289b96aba939c84069e363e63cfe41a50ed6'
 Merge made by the 'recursive' strategy.
  main-sub3 | 1 +
  main-sub4 | 1 +
@@ -354910,10 +355185,10 @@
 From ./sub proj
  * branch            master     -> FETCH_HEAD
 Merging:
-23f3be5 Split 'sub dir/' into commit '969bb21b20153f41104eba475fbaf4aa0bea3472'
-virtual 95d8dada11468e041e897edc58640482f4d1c619
+150e32a Split 'sub dir/' into commit '10b2d16da6545b64d05d5d790ed0f0be51f2effd'
+virtual 3ca42c389c6abacfabebb5a1b356597a3deee6b6
 found 1 common ancestor:
-969bb21 *sub dir/main-sub4
+10b2d16 *sub dir/main-sub4
 Merge made by the 'recursive' strategy.
  sub dir/sub3 | 1 +
  sub dir/sub4 | 1 +
@@ -354953,11 +355228,11 @@
 
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7900-subtree/27/.git/
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7900-subtree/27/sub proj/.git/
-[master (root-commit) 3685071] main1
+[master (root-commit) 97341d9] main1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 main1
-[master (root-commit) 42ac38c] sub1
+[master (root-commit) 4f7ea0c] sub1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 sub1
@@ -354965,27 +355240,27 @@
 From ./sub proj
  * branch            master     -> FETCH_HEAD
 Added dir 'sub dir'
-[master b9c8e4a] sub2
+[master b135a26] sub2
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 sub2
 From ./sub proj
  * branch            master     -> FETCH_HEAD
 Merging:
-0cdd246 Add 'sub dir/' from commit '42ac38cfeed784fbe1076cd6b10c1e713364a4ca'
-virtual b9c8e4a124df528227ca62ba63310f8f94006a65
+a4ff7fc Add 'sub dir/' from commit '4f7ea0c8a211436ce04e946f220a2eee5e018f08'
+virtual b135a2655f73b5221fae1e4b21c39b509b7b7ff2
 found 1 common ancestor:
-42ac38c sub1
+4f7ea0c sub1
 Merge made by the 'recursive' strategy.
  sub dir/sub2 | 1 +
  1 file changed, 1 insertion(+)
  create mode 100644 sub dir/sub2
-[master 03255e8] sub dir/main-sub1
+[master 9de7e7b] sub dir/main-sub1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 sub dir/main-sub1
 1/6 (0) [0]
2/6 (0) [0]
3/6 (0) [0]
3/6 (1) [1]
3/6 (1) [2]
4/6 (1) [2]
5/6 (2) [2]
5/6 (3) [3]
6/6 (3) [3]
Created branch 'subproj-br'
-62170ca1f722201b7ab6bf67fa74bbe1787e5fac
+88223bef7d57c85e77e70dca712eab0dc1cbe011
 ok 27 - make sure "git subtree split" find the correct parent
 
 expecting success: 
@@ -355023,11 +355298,11 @@
 
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7900-subtree/28/.git/
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7900-subtree/28/sub proj/.git/
-[master (root-commit) 65d8e73] main1
+[master (root-commit) 97341d9] main1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 main1
-[master (root-commit) 8a96065] sub1
+[master (root-commit) 4f7ea0c] sub1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 sub1
@@ -355035,33 +355310,33 @@
 From ./sub proj
  * branch            master     -> FETCH_HEAD
 Added dir 'sub dir'
-[master 4236889] sub2
+[master b135a26] sub2
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 sub2
 From ./sub proj
  * branch            master     -> FETCH_HEAD
 Merging:
-fe2cdf9 Add 'sub dir/' from commit '8a960652289aa5e082e6e0b65dfb45f42b37da5c'
-virtual 42368898b0e9b249987424b0e273e7d00c345710
+a4ff7fc Add 'sub dir/' from commit '4f7ea0c8a211436ce04e946f220a2eee5e018f08'
+virtual b135a2655f73b5221fae1e4b21c39b509b7b7ff2
 found 1 common ancestor:
-8a96065 sub1
+4f7ea0c sub1
 Merge made by the 'recursive' strategy.
  sub dir/sub2 | 1 +
  1 file changed, 1 insertion(+)
  create mode 100644 sub dir/sub2
-[master 8ac61b4] sub dir/main-sub1
+[master 9de7e7b] sub dir/main-sub1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 sub dir/main-sub1
 1/6 (0) [0]
2/6 (0) [0]
3/6 (0) [0]
3/6 (1) [1]
3/6 (1) [2]
4/6 (1) [2]
5/6 (2) [2]
5/6 (3) [3]
6/6 (3) [3]
Created branch 'subproj-br'
-fdfa1b14790b4d909d6571d439d2927c703b9149
-[master 2beee54] sub dir2/main-sub2
+88223bef7d57c85e77e70dca712eab0dc1cbe011
+[master 56b8494] sub dir2/main-sub2
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 sub dir2/main-sub2
 1/7 (0) [0]
2/7 (1) [0]
3/7 (2) [0]
4/7 (3) [0]
5/7 (4) [0]
6/7 (5) [0]
7/7 (6) [0]
Created branch 'subproj2-br'
-ee6c5f7806ba692fe3f51bcb2bce0cd4b5230f0c
+51380b5bdc949f99a91381261fb8d1b52e1aa2f1
 ok 28 - split a new subtree without --onto option
 
 expecting success: 
@@ -355108,11 +355383,11 @@
 
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7900-subtree/29/.git/
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7900-subtree/29/sub proj/.git/
-[master (root-commit) 65d8e73] main1
+[master (root-commit) 8ee6586] main1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 main1
-[master (root-commit) 8a96065] sub1
+[master (root-commit) 4d84094] sub1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 sub1
@@ -355120,33 +355395,33 @@
 From ./sub proj
  * branch            master     -> FETCH_HEAD
 Added dir 'sub dir'
-[master 07ebf10] sub2
+[master ccd3312] sub2
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 sub2
 From ./sub proj
  * branch            master     -> FETCH_HEAD
 Merging:
-1d9fc6c Add 'sub dir/' from commit '8a960652289aa5e082e6e0b65dfb45f42b37da5c'
-virtual 07ebf10dba2595e1567b7b7f5a48c2580c2ce40f
+973a270 Add 'sub dir/' from commit '4d84094544160641ffface4094a168e36c74f558'
+virtual ccd33129a361b39f7601ff638a3ba95779eae050
 found 1 common ancestor:
-8a96065 sub1
+4d84094 sub1
 Merge made by the 'recursive' strategy.
  sub dir/sub2 | 1 +
  1 file changed, 1 insertion(+)
  create mode 100644 sub dir/sub2
-[master 3613519] sub dir/main-sub1
+[master 0d8232e] sub dir/main-sub1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 sub dir/main-sub1
 1/6 (0) [0]
2/6 (0) [0]
3/6 (0) [0]
3/6 (1) [1]
3/6 (1) [2]
4/6 (1) [2]
5/6 (2) [2]
5/6 (3) [3]
6/6 (3) [3]
Created branch 'subproj-br'
-3570a17d20ef81c44b9861213caaf18e38bfb2af
-[master 26fba8a] sub dir2/main-sub2
+7df0a24cf1335b2140264de6c8f57beafd516256
+[master c8eb01e] sub dir2/main-sub2
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 sub dir2/main-sub2
 1/7 (0) [0]
2/7 (1) [0]
3/7 (2) [0]
4/7 (3) [0]
5/7 (4) [0]
6/7 (5) [0]
7/7 (6) [0]
Created branch 'subproj2-br'
-5488bc408bcf1fd3e4634b81a9c0618dbd07dd89
+51380b5bdc949f99a91381261fb8d1b52e1aa2f1
 ok 29 - verify one file change per commit
 
 expecting success: 
@@ -355181,11 +355456,11 @@
 
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7900-subtree/30/.git/
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7900-subtree/30/sub proj/.git/
-[master (root-commit) ca94fe7] main1
+[master (root-commit) c804347] main1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 main1
-[master (root-commit) e00b48e] sub1
+[master (root-commit) 0148edd] sub1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 sub1
@@ -355193,40 +355468,40 @@
 From ./sub proj
  * branch            master     -> FETCH_HEAD
 Added dir 'sub dir'
-[master cb91a33] sub dir/main-sub1
+[master 5efd634] sub dir/main-sub1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 sub dir/main-sub1
-[master 4e23ea4] main2
+[master eee872f] main2
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 main2
-[master 4199549] sub2
+[master 7ab2ef8] sub2
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 sub2
-[master 0420050] sub dir/main-sub2
+[master b4de542] sub dir/main-sub2
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 sub dir/main-sub2
 From ./sub proj
  * branch            master     -> FETCH_HEAD
 Merging:
-0420050 sub dir/main-sub2
-virtual 419954964010c413d9a314c0b9b52d9acf1e5a4b
+b4de542 sub dir/main-sub2
+virtual 7ab2ef83b28978343149bda9a4796926f7aff18f
 found 1 common ancestor:
-e00b48e sub1
+0148edd sub1
 Merge made by the 'recursive' strategy.
  sub dir/sub2 | 1 +
  1 file changed, 1 insertion(+)
  create mode 100644 sub dir/sub2
-[master ea04b8c] sub dir/main-sub3
+[master 1ebcc32] sub dir/main-sub3
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 sub dir/main-sub3
 git push using:  ./sub proj sub-branch-1
 1/9 (0) [0]
2/9 (0) [0]
3/9 (0) [0]
3/9 (1) [1]
3/9 (1) [2]
4/9 (1) [2]
5/9 (2) [2]
6/9 (3) [2]
7/9 (4) [2]
8/9 (5) [2]
8/9 (6) [3]
9/9 (6) [3]
To ./sub proj
-   4199549..dd555f3  dd555f358b0cf9a061f9f873d998f1e2abd2f205 -> sub-branch-1
+   7ab2ef8..a6c3779  a6c37795859a5af92bba47c0c3b80ca866be2b7e -> sub-branch-1
 Switched to branch 'sub-branch-1'
 ok 30 - push split to subproj
 
@@ -355269,61 +355544,61 @@
 	)
 
 Initialized empty Git repository in /build/git-2.20.1/t/trash directory.t7900-subtree/31/.git/
-[master (root-commit) 4c678b9] folder_subtree/a
+[master (root-commit) a9898ae] folder_subtree/a
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 folder_subtree/a
-[master 7040a38] folder_subtree/0
+[master cdbfb40] folder_subtree/0
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 folder_subtree/0
-[master dc19011] folder_subtree/b
+[master 6f99f9d] folder_subtree/b
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 folder_subtree/b
 Switched to branch 'branch'
-[branch 22f600e] commit_on_branch
+[branch 236eeb7] commit_on_branch
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 commit_on_branch
-[branch 5729637] folder_subtree/b
+[branch c047c3f] folder_subtree/b
  Author: A U Thor <author@example.com>
- Date: Fri Dec 3 05:12:18 2021 +0000
+ Date: Thu Jan 5 11:52:38 2023 +0000
  1 file changed, 1 insertion(+)
  create mode 100644 folder_subtree/b
 Switched to branch 'master'
 Merging:
-dc19011 folder_subtree/b
+6f99f9d folder_subtree/b
 virtual branch
 found 1 common ancestor:
-4c678b9 folder_subtree/a
+a9898ae folder_subtree/a
 Merge made by the 'recursive' strategy.
  commit_on_branch | 1 +
  1 file changed, 1 insertion(+)
  create mode 100644 commit_on_branch
-[master 1c8c0ae] folder_subtree/d
+[master 9bf875f] folder_subtree/d
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 folder_subtree/d
 Switched to branch 'no_subtree_work_branch'
-[no_subtree_work_branch 37e9666] not_a_subtree_change
+[no_subtree_work_branch 2c30ac6] not_a_subtree_change
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 not_a_subtree_change
 Switched to branch 'master'
 Merging:
-1c8c0ae folder_subtree/d
+9bf875f folder_subtree/d
 virtual no_subtree_work_branch
 found 1 common ancestor:
-497f268 merge should be kept on subtree
+699e32f merge should be kept on subtree
 Merge made by the 'recursive' strategy.
  not_a_subtree_change | 1 +
  1 file changed, 1 insertion(+)
  create mode 100644 not_a_subtree_change
 1/9 (0) [0]
2/9 (1) [0]
3/9 (2) [0]
4/9 (3) [0]
5/9 (4) [0]
6/9 (5) [0]
6/9 (6) [1]
6/9 (6) [2]
7/9 (6) [2]
8/9 (7) [2]
9/9 (8) [2]
9/9 (9) [3]
9/9 (9) [4]
Created branch 'subtree_tip'
-9ae76c96de81c9bedc8cd530169b58b27a5d8035
+fe851dec0137a24a2d22df71fd5984291bd26249
 1/3 (0) [0]
2/3 (1) [0]
3/3 (2) [0]
Created branch 'subtree_branch'
-e2474616b18d4610c21109e80763d7d74391edbb
+d0e6812b6376030f2b5148dc3758370aa899b78f
 ok 31 - subtree descendant check
 
 # passed all 31 test(s)
@@ -355361,16 +355636,16 @@
 make[1]: Leaving directory '/build/git-2.20.1'
 DESTDIR='/build/git-2.20.1/debian/git' /usr/bin/make install NO_OPENSSL=1 prefix=/usr gitexecdir=/usr/lib/git-core libexecdir=/usr/lib/git-core mandir=/usr/share/man htmldir=/usr/share/doc/git/html INSTALLDIRS=vendor SANE_TOOL_PATH= INSTALL=install TAR=tar NO_CROSS_DIRECTORY_HARDLINKS=1 NO_INSTALL_HARDLINKS=1 NO_PERL_CPAN_FALLBACKS=1 DEFAULT_PAGER=pager DEFAULT_EDITOR=editor CC='gcc' CFLAGS='-Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2' LDFLAGS='-Wl,-z,relro' V=1 USE_LIBPCRE2=1
 make[2]: Entering directory '/build/git-2.20.1'
-rm -f git-add--interactive git-add--interactive+ && \
+rm -f git-archimport git-archimport+ && \
 sed -e '1{' \
     -e '	s|#!.*perl|#!/usr/bin/perl|' \
     -e '	r GIT-PERL-HEADER' \
     -e '	G' \
     -e '}' \
     -e 's/@@GIT_VERSION@@/2.20.1/g' \
-    git-add--interactive.perl >git-add--interactive+ && \
-chmod +x git-add--interactive+ && \
-mv git-add--interactive+ git-add--interactive
+    git-archimport.perl >git-archimport+ && \
+chmod +x git-archimport+ && \
+mv git-archimport+ git-archimport
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
 rm -f git-cvsexportcommit git-cvsexportcommit+ && \
@@ -355385,52 +355660,52 @@
 mv git-cvsexportcommit+ git-cvsexportcommit
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-rm -f git-send-email git-send-email+ && \
+rm -f git-add--interactive git-add--interactive+ && \
 sed -e '1{' \
     -e '	s|#!.*perl|#!/usr/bin/perl|' \
     -e '	r GIT-PERL-HEADER' \
     -e '	G' \
     -e '}' \
     -e 's/@@GIT_VERSION@@/2.20.1/g' \
-    git-send-email.perl >git-send-email+ && \
-chmod +x git-send-email+ && \
-mv git-send-email+ git-send-email
+    git-add--interactive.perl >git-add--interactive+ && \
+chmod +x git-add--interactive+ && \
+mv git-add--interactive+ git-add--interactive
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-rm -f git-cvsimport git-cvsimport+ && \
+rm -f git-cvsserver git-cvsserver+ && \
 sed -e '1{' \
     -e '	s|#!.*perl|#!/usr/bin/perl|' \
     -e '	r GIT-PERL-HEADER' \
     -e '	G' \
     -e '}' \
     -e 's/@@GIT_VERSION@@/2.20.1/g' \
-    git-cvsimport.perl >git-cvsimport+ && \
-chmod +x git-cvsimport+ && \
-mv git-cvsimport+ git-cvsimport
+    git-cvsserver.perl >git-cvsserver+ && \
+chmod +x git-cvsserver+ && \
+mv git-cvsserver+ git-cvsserver
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-rm -f git-cvsserver git-cvsserver+ && \
+rm -f git-send-email git-send-email+ && \
 sed -e '1{' \
     -e '	s|#!.*perl|#!/usr/bin/perl|' \
     -e '	r GIT-PERL-HEADER' \
     -e '	G' \
     -e '}' \
     -e 's/@@GIT_VERSION@@/2.20.1/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/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
-rm -f git-archimport git-archimport+ && \
+rm -f git-cvsimport git-cvsimport+ && \
 sed -e '1{' \
     -e '	s|#!.*perl|#!/usr/bin/perl|' \
     -e '	r GIT-PERL-HEADER' \
     -e '	G' \
     -e '}' \
     -e 's/@@GIT_VERSION@@/2.20.1/g' \
-    git-archimport.perl >git-archimport+ && \
-chmod +x git-archimport+ && \
-mv git-archimport+ git-archimport
+    git-cvsimport.perl >git-cvsimport+ && \
+chmod +x git-cvsimport+ && \
+mv git-cvsimport+ git-cvsimport
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
 rm -f git-p4 git-p4+ && \
@@ -355671,6 +355946,7 @@
 make[1]: Leaving directory '/build/git-2.20.1'
    debian/rules override_dh_auto_install-indep
 DESTDIR='/build/git-2.20.1/debian/tmp' /usr/bin/make install install-doc NO_OPENSSL=1 prefix=/usr gitexecdir=/usr/lib/git-core libexecdir=/usr/lib/git-core mandir=/usr/share/man htmldir=/usr/share/doc/git/html INSTALLDIRS=vendor SANE_TOOL_PATH= INSTALL=install TAR=tar NO_CROSS_DIRECTORY_HARDLINKS=1 NO_INSTALL_HARDLINKS=1 NO_PERL_CPAN_FALLBACKS=1 DEFAULT_PAGER=pager DEFAULT_EDITOR=editor CC='gcc' CFLAGS='-Wall -g -O2 -ffile-prefix-map=/build/git-2.20.1=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2' LDFLAGS='-Wl,-z,relro' V=1 USE_LIBPCRE2=1
+/usr/bin/make -C git-gui  gitexecdir='/usr/lib/git-core' all
 make[2]: Entering directory '/build/git-2.20.1'
 mkdir -p perl/build/man/man3/ && \
 pod2man perl/Git.pm perl/build/man/man3/Git.3pm
@@ -355683,42 +355959,29 @@
 (cd '/build/git-2.20.1/debian/tmp/usr/share/man/man3' && umask 022 && tar xof -)
 make[2]: Leaving directory '/build/git-2.20.1'
 /usr/bin/make -C Documentation install
-/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/git-2.20.1/templates'
 : no custom templates yet
 make[3]: Leaving directory '/build/git-2.20.1/templates'
-/usr/bin/make -C ../  GIT-VERSION-FILE
 make[2]: Entering directory '/build/git-2.20.1'
 install -d -m 755 '/build/git-2.20.1/debian/tmp/usr/bin'
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
 install -d -m 755 '/build/git-2.20.1/debian/tmp/usr/lib/git-core'
 make[2]: Leaving directory '/build/git-2.20.1'
+/usr/bin/make -C ../  GIT-VERSION-FILE
 make[3]: Entering directory '/build/git-2.20.1/Documentation'
 rm -f doc.dep+ doc.dep && \
 /usr/bin/perl ./build-docdep.perl >doc.dep+  && \
 mv doc.dep+ doc.dep
 make[3]: Leaving directory '/build/git-2.20.1/Documentation'
-make[4]: 'GIT-VERSION-FILE' is up to date.
-/usr/bin/make -C ../  GIT-VERSION-FILE
 make[2]: Entering directory '/build/git-2.20.1'
 install   git-credential-store git-daemon git-fast-import git-http-backend git-imap-send git-sh-i18n--envsubst git-shell git-remote-testsvn git-http-fetch git-http-push git-credential-cache git-credential-cache--daemon git-remote-http git-remote-https git-remote-ftp git-remote-ftps git-bisect git-difftool--helper git-filter-branch git-merge-octopus git-merge-one-file git-merge-resolve git-mergetool git-quiltimport git-legacy-rebase git-request-pull git-stash git-submodule git-web--browse git-add--interactive git-archimport git-cvsexportcommit git-cvsimport git-cvsserver git-send-email git-svn git-p4 git-instaweb '/build/git-2.20.1/debian/tmp/usr/lib/git-core'
 make[2]: Leaving directory '/build/git-2.20.1'
 make[2]: Entering directory '/build/git-2.20.1'
 install -m 644  git-mergetool--lib git-parse-remote git-rebase--am git-rebase--common git-rebase--preserve-merges git-rebase--merge git-sh-setup git-sh-i18n '/build/git-2.20.1/debian/tmp/usr/lib/git-core'
 make[2]: Leaving directory '/build/git-2.20.1'
-make[4]: 'GIT-VERSION-FILE' is up to date.
-make[3]: Entering directory '/build/git-2.20.1/Documentation'
-install -d -m 755 /build/git-2.20.1/debian/tmp/usr/share/man/man1
-make[3]: Leaving directory '/build/git-2.20.1/Documentation'
-make[3]: Entering directory '/build/git-2.20.1/Documentation'
-install -d -m 755 /build/git-2.20.1/debian/tmp/usr/share/man/man5
-make[3]: Leaving directory '/build/git-2.20.1/Documentation'
-make[3]: Entering directory '/build/git-2.20.1/Documentation'
-install -d -m 755 /build/git-2.20.1/debian/tmp/usr/share/man/man7
-make[3]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1'
 install git git-upload-pack git-receive-pack git-upload-archive git-shell git-cvsserver '/build/git-2.20.1/debian/tmp/usr/bin'
 make[2]: Leaving directory '/build/git-2.20.1'
@@ -355742,9 +356005,6 @@
 make[2]: Entering directory '/build/git-2.20.1'
 install -d -m 755 '/build/git-2.20.1/debian/tmp/usr/share/locale'
 make[2]: Leaving directory '/build/git-2.20.1'
-make[3]: Entering directory '/build/git-2.20.1/Documentation'
-install -m 644 git-credential-store.1 git-upload-pack.1 git-commit-tree.1 git-check-attr.1 git-parse-remote.1 git-mv.1 git-multi-pack-index.1 git-rev-list.1 git-bisect.1 git-count-objects.1 git-verify-tag.1 git-http-fetch.1 git-gc.1 git-fast-import.1 git-sh-setup.1 git-apply.1 git-var.1 git-imap-send.1 git-notes.1 git-ls-remote.1 git-rerere.1 git-merge-one-file.1 git-ls-files.1 git-name-rev.1 git-diff-files.1 git-remote-ext.1 git-update-server-info.1 git-remote-fd.1 git-read-tree.1 git-mailsplit.1 git-merge.1 git-mergetool--lib.1 git-update-index.1 git-shortlog.1 git-merge-tree.1 git-cherry-pick.1 git-checkout-index.1 git-show-ref.1 git-ls-tree.1 git-send-pack.1 git-request-pull.1 git-tag.1 git-credential-cache--daemon.1 git-am.1 git-get-tar-commit-id.1 git-shell.1 git-diff-index.1 git-write-tree.1 git-diff.1 git-daemon.1 git-blame.1 git-send-email.1 git-remote-testgit.1 git-index-pack.1 git-upload-archive.1 git-patch-id.1 git-fsck-objects.1 git-prune-packed.1 git-receive-pack.1 git-gui.1 git-cvsimport.1 git-add.1 git-pack-redundant.1 git-show-branch.1 git-http-backend.1 git-show.1 git-reset.1 git-worktree.1 git-archive.1 git-mergetool.1 git-mktree.1 git-repack.1 git-cherry.1 git-check-ignore.1 git-web--browse.1 git-update-ref.1 git-help.1 git-fast-export.1 git-fsck.1 git-http-push.1 git-merge-file.1 git-branch.1 git-for-each-ref.1 git-describe.1 git-unpack-file.1 git-check-ref-format.1 git-stage.1 git-merge-base.1 git-verify-commit.1 git-filter-branch.1 git-log.1 git-merge-index.1 git-difftool.1 git-p4.1 git-svn.1 git-grep.1 git-instaweb.1 git-mailinfo.1 git-interpret-trailers.1 git-whatchanged.1 git-unpack-objects.1 git-push.1 git-commit-graph.1 git-remote.1 git-hash-object.1 git-fmt-merge-msg.1 git-credential.1 git-stripspace.1 git-rebase.1 git-submodule.1 git-fetch.1 git-commit.1 git-verify-pack.1 git-checkout.1 git-status.1 git-archimport.1 git-format-patch.1 git-bundle.1 git-fetch-pack.1 git-init-db.1 git-rm.1 git-check-mailmap.1 git-quiltimport.1 git-range-diff.1 git-sh-i18n.1 git-mktag.1 git-pack-objects.1 git-reflog.1 git-clean.1 git-revert.1 git-replace.1 git-stash.1 git-sh-i18n--envsubst.1 git-credential-cache.1 git-clone.1 git-column.1 git-pack-refs.1 git-cvsexportcommit.1 git-show-index.1 git-cvsserver.1 git-pull.1 git-diff-tree.1 git-citool.1 git-prune.1 git-config.1 git-cat-file.1 git-annotate.1 git-rev-parse.1 git-symbolic-ref.1 git-init.1 git.1 gitk.1 gitremote-helpers.1 gitweb.1 /build/git-2.20.1/debian/tmp/usr/share/man/man1
-make[3]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1'
 (cd po/build/locale && tar cf - .) | \
 (cd '/build/git-2.20.1/debian/tmp/usr/share/locale' && umask 022 && tar xof -)
@@ -355752,18 +356012,14 @@
 make[2]: Entering directory '/build/git-2.20.1'
 install -d -m 755 '/build/git-2.20.1/debian/tmp/usr/share/perl5'
 make[2]: Leaving directory '/build/git-2.20.1'
-make[3]: Entering directory '/build/git-2.20.1/Documentation'
-install -m 644 gitattributes.5 githooks.5 gitignore.5 gitmodules.5 gitrepository-layout.5 gitweb.conf.5 /build/git-2.20.1/debian/tmp/usr/share/man/man5
-make[3]: Leaving directory '/build/git-2.20.1/Documentation'
 make[2]: Entering directory '/build/git-2.20.1'
 (cd perl/build/lib && tar cf - .) | \
 (cd '/build/git-2.20.1/debian/tmp/usr/share/perl5' && umask 022 && tar xof -)
 make[2]: Leaving directory '/build/git-2.20.1'
 /usr/bin/make -C gitweb install
 /usr/bin/make -C ../  GIT-VERSION-FILE
-make[3]: Entering directory '/build/git-2.20.1/Documentation'
-install -m 644 gitcli.7 gitcore-tutorial.7 gitcredentials.7 gitcvs-migration.7 gitdiffcore.7 giteveryday.7 gitglossary.7 gitnamespaces.7 gitrevisions.7 gitsubmodules.7 gittutorial-2.7 gittutorial.7 gitworkflows.7 /build/git-2.20.1/debian/tmp/usr/share/man/man7
-make[3]: Leaving directory '/build/git-2.20.1/Documentation'
+make[4]: 'GIT-VERSION-FILE' is up to date.
+/usr/bin/make -C ../  GIT-VERSION-FILE
 make[4]: 'GIT-VERSION-FILE' is up to date.
 make[3]: Entering directory '/build/git-2.20.1/gitweb'
 install -d -m 755 '/build/git-2.20.1/debian/tmp/usr/share/gitweb'
@@ -355800,6 +356056,7 @@
 make[3]: Entering directory '/build/git-2.20.1/git-gui'
 install -m 755 git-gui--askpass  '/build/git-2.20.1/debian/tmp/usr/lib/git-core'
 make[3]: Leaving directory '/build/git-2.20.1/git-gui'
+make[4]: 'GIT-VERSION-FILE' is up to date.
 make[3]: Entering directory '/build/git-2.20.1/git-gui'
 rm -f '/build/git-2.20.1/debian/tmp/usr/lib/git-core/git-citool' && ln '/build/git-2.20.1/debian/tmp/usr/lib/git-core/git-gui' '/build/git-2.20.1/debian/tmp/usr/lib/git-core/git-citool'  && true
 make[3]: Leaving directory '/build/git-2.20.1/git-gui'
@@ -355809,6 +356066,24 @@
 make[3]: Entering directory '/build/git-2.20.1/git-gui'
 install -m 644 lib/tclIndex  '/build/git-2.20.1/debian/tmp/usr/share/git-gui/lib'
 make[3]: Leaving directory '/build/git-2.20.1/git-gui'
+make[3]: Entering directory '/build/git-2.20.1/Documentation'
+install -d -m 755 /build/git-2.20.1/debian/tmp/usr/share/man/man1
+make[3]: Leaving directory '/build/git-2.20.1/Documentation'
+make[3]: Entering directory '/build/git-2.20.1/Documentation'
+install -d -m 755 /build/git-2.20.1/debian/tmp/usr/share/man/man5
+make[3]: Leaving directory '/build/git-2.20.1/Documentation'
+make[3]: Entering directory '/build/git-2.20.1/Documentation'
+install -d -m 755 /build/git-2.20.1/debian/tmp/usr/share/man/man7
+make[3]: Leaving directory '/build/git-2.20.1/Documentation'
+make[3]: Entering directory '/build/git-2.20.1/Documentation'
+install -m 644 git-commit-tree.1 git-check-attr.1 git-parse-remote.1 git-mv.1 git-symbolic-ref.1 git-multi-pack-index.1 git-rev-list.1 git-bisect.1 git-count-objects.1 git-verify-tag.1 git-http-fetch.1 git-gc.1 git-fast-import.1 git-sh-setup.1 git-apply.1 git-var.1 git-credential-cache.1 git-imap-send.1 git-notes.1 git-ls-remote.1 git-rerere.1 git-merge-one-file.1 git-ls-files.1 git-name-rev.1 git-diff-files.1 git-remote-ext.1 git-update-server-info.1 git-remote-fd.1 git-read-tree.1 git-mailsplit.1 git-merge.1 git-mergetool--lib.1 git-update-index.1 git-shortlog.1 git-merge-tree.1 git-cherry-pick.1 git-checkout-index.1 git-show-ref.1 git-ls-tree.1 git-send-pack.1 git-request-pull.1 git-tag.1 git-credential-cache--daemon.1 git-am.1 git-get-tar-commit-id.1 git-shell.1 git-diff-index.1 git-write-tree.1 git-diff.1 git-daemon.1 git-blame.1 git-send-email.1 git-remote-testgit.1 git-index-pack.1 git-upload-archive.1 git-patch-id.1 git-fsck-objects.1 git-prune-packed.1 git-receive-pack.1 git-gui.1 git-cvsimport.1 git-add.1 git-pack-redundant.1 git-show-branch.1 git-http-backend.1 git-show.1 git-reset.1 git-worktree.1 git-mergetool.1 git-mktree.1 git-cherry.1 git-check-ignore.1 git-web--browse.1 git-update-ref.1 git-help.1 git-fast-export.1 git-fsck.1 git-http-push.1 git-merge-file.1 git-branch.1 git-for-each-ref.1 git-describe.1 git-unpack-file.1 git-check-ref-format.1 git-rev-parse.1 git-stage.1 git-merge-base.1 git-verify-commit.1 git-filter-branch.1 git-log.1 git-merge-index.1 git-difftool.1 git-p4.1 git-svn.1 git-grep.1 git-instaweb.1 git-mailinfo.1 git-interpret-trailers.1 git-unpack-objects.1 git-whatchanged.1 git-push.1 git-commit-graph.1 git-remote.1 git-hash-object.1 git-fmt-merge-msg.1 git-range-diff.1 git-credential.1 git-stripspace.1 git-rebase.1 git-submodule.1 git-fetch.1 git-commit.1 git-verify-pack.1 git-checkout.1 git-status.1 git-archimport.1 git-format-patch.1 git-archive.1 git-bundle.1 git-fetch-pack.1 git-init-db.1 git-rm.1 git-check-mailmap.1 git-quiltimport.1 git-sh-i18n.1 git-mktag.1 git-pack-objects.1 git-reflog.1 git-clean.1 git-revert.1 git-replace.1 git-stash.1 git-sh-i18n--envsubst.1 git-clone.1 git-column.1 git-pack-refs.1 git-cvsexportcommit.1 git-show-index.1 git-cvsserver.1 git-pull.1 git-diff-tree.1 git-citool.1 git-prune.1 git-repack.1 git-config.1 git-cat-file.1 git-annotate.1 git-init.1 git-credential-store.1 git-upload-pack.1 git.1 gitk.1 gitremote-helpers.1 gitweb.1 /build/git-2.20.1/debian/tmp/usr/share/man/man1
+make[3]: Leaving directory '/build/git-2.20.1/Documentation'
+make[3]: Entering directory '/build/git-2.20.1/Documentation'
+install -m 644 gitattributes.5 githooks.5 gitignore.5 gitmodules.5 gitrepository-layout.5 gitweb.conf.5 /build/git-2.20.1/debian/tmp/usr/share/man/man5
+make[3]: Leaving directory '/build/git-2.20.1/Documentation'
+make[3]: Entering directory '/build/git-2.20.1/Documentation'
+install -m 644 gitcli.7 gitcore-tutorial.7 gitcredentials.7 gitcvs-migration.7 gitdiffcore.7 giteveryday.7 gitglossary.7 gitnamespaces.7 gitrevisions.7 gitsubmodules.7 gittutorial-2.7 gittutorial.7 gitworkflows.7 /build/git-2.20.1/debian/tmp/usr/share/man/man7
+make[3]: Leaving directory '/build/git-2.20.1/Documentation'
 make[3]: Entering directory '/build/git-2.20.1/git-gui'
 install -m 644 lib/class.tcl  '/build/git-2.20.1/debian/tmp/usr/share/git-gui/lib' &&  install -m 644 lib/themed.tcl  '/build/git-2.20.1/debian/tmp/usr/share/git-gui/lib' &&  install -m 644 lib/console.tcl  '/build/git-2.20.1/debian/tmp/usr/share/git-gui/lib' &&  install -m 644 lib/remote_add.tcl  '/build/git-2.20.1/debian/tmp/usr/share/git-gui/lib' &&  install -m 644 lib/browser.tcl  '/build/git-2.20.1/debian/tmp/usr/share/git-gui/lib' &&  install -m 644 lib/merge.tcl  '/build/git-2.20.1/debian/tmp/usr/share/git-gui/lib' &&  install -m 644 lib/tools.tcl  '/build/git-2.20.1/debian/tmp/usr/share/git-gui/lib' &&  install -m 644 lib/branch_checkout.tcl  '/build/git-2.20.1/debian/tmp/usr/share/git-gui/lib' &&  install -m 644 lib/diff.tcl  '/build/git-2.20.1/debian/tmp/usr/share/git-gui/lib' &&  install -m 644 lib/remote.tcl  '/build/git-2.20.1/debian/tmp/usr/share/git-gui/lib' &&  install -m 644 lib/branch_rename.tcl  '/build/git-2.20.1/debian/tmp/usr/share/git-gui/lib' &&  install -m 644 lib/choose_font.tcl  '/build/git-2.20.1/debian/tmp/usr/share/git-gui/lib' &&  install -m 644 lib/option.tcl  '/build/git-2.20.1/debian/tmp/usr/share/git-gui/lib' &&  install -m 644 lib/encoding.tcl  '/build/git-2.20.1/debian/tmp/usr/share/git-gui/lib' &&  install -m 644 lib/spellcheck.tcl  '/build/git-2.20.1/debian/tmp/usr/share/git-gui/lib' &&  install -m 644 lib/mergetool.tcl  '/build/git-2.20.1/debian/tmp/usr/share/git-gui/lib' &&  install -m 644 lib/tools_dlg.tcl  '/build/git-2.20.1/debian/tmp/usr/share/git-gui/lib' &&  install -m 644 lib/status_bar.tcl  '/build/git-2.20.1/debian/tmp/usr/share/git-gui/lib' &&  install -m 644 lib/search.tcl  '/build/git-2.20.1/debian/tmp/usr/share/git-gui/lib' &&  install -m 644 lib/shortcut.tcl  '/build/git-2.20.1/debian/tmp/usr/share/git-gui/lib' &&  install -m 644 lib/remote_branch_delete.tcl  '/build/git-2.20.1/debian/tmp/usr/share/git-gui/lib' &&  install -m 644 lib/choose_repository.tcl  '/build/git-2.20.1/debian/tmp/usr/share/git-gui/lib' &&  install -m 644 lib/blame.tcl  '/build/git-2.20.1/debian/tmp/usr/share/git-gui/lib' &&  install -m 644 lib/about.tcl  '/build/git-2.20.1/debian/tmp/usr/share/git-gui/lib' &&  install -m 644 lib/transport.tcl  '/build/git-2.20.1/debian/tmp/usr/share/git-gui/lib' &&  install -m 644 lib/win32.tcl  '/build/git-2.20.1/debian/tmp/usr/share/git-gui/lib' &&  install -m 644 lib/checkout_op.tcl  '/build/git-2.20.1/debian/tmp/usr/share/git-gui/lib' &&  install -m 644 lib/sshkey.tcl  '/build/git-2.20.1/debian/tmp/usr/share/git-gui/lib' &&  install -m 644 lib/branch_create.tcl  '/build/git-2.20.1/debian/tmp/usr/share/git-gui/lib' &&  install -m 644 lib/choose_rev.tcl  '/build/git-2.20.1/debian/tmp/usr/share/git-gui/lib' &&  install -m 644 lib/line.tcl  '/build/git-2.20.1/debian/tmp/usr/share/git-gui/lib' &&  install -m 644 lib/branch.tcl  '/build/git-2.20.1/debian/tmp/usr/share/git-gui/lib' &&  install -m 644 lib/commit.tcl  '/build/git-2.20.1/debian/tmp/usr/share/git-gui/lib' &&  install -m 644 lib/branch_delete.tcl  '/build/git-2.20.1/debian/tmp/usr/share/git-gui/lib' &&  install -m 644 lib/index.tcl  '/build/git-2.20.1/debian/tmp/usr/share/git-gui/lib' &&  install -m 644 lib/logo.tcl  '/build/git-2.20.1/debian/tmp/usr/share/git-gui/lib' &&  install -m 644 lib/date.tcl  '/build/git-2.20.1/debian/tmp/usr/share/git-gui/lib' &&  install -m 644 lib/database.tcl  '/build/git-2.20.1/debian/tmp/usr/share/git-gui/lib' &&  install -m 644 lib/error.tcl  '/build/git-2.20.1/debian/tmp/usr/share/git-gui/lib' &&  install -m 644 lib/git-gui.ico  '/build/git-2.20.1/debian/tmp/usr/share/git-gui/lib' &&  install -m 644 lib/win32_shortcut.js  '/build/git-2.20.1/debian/tmp/usr/share/git-gui/lib' && true
 make[3]: Leaving directory '/build/git-2.20.1/git-gui'
@@ -355912,10 +356187,6 @@
 /usr/bin/make -C ../../ GIT-VERSION-FILE
 make[3]: 'GIT-VERSION-FILE' is up to date.
 make[2]: Entering directory '/build/git-2.20.1/contrib/subtree'
-asciidoc -b docbook -d manpage -f ../../Documentation/asciidoc.conf \
-	-agit_version=2.20.1  git-subtree.txt
-make[2]: Leaving directory '/build/git-2.20.1/contrib/subtree'
-make[2]: Entering directory '/build/git-2.20.1/contrib/subtree'
 asciidoc -b xhtml11 -d manpage -f ../../Documentation/asciidoc.conf \
 	-agit_version=2.20.1  git-subtree.txt
 make[2]: Leaving directory '/build/git-2.20.1/contrib/subtree'
@@ -355926,6 +356197,10 @@
 install -m 644 git-subtree.html /build/git-2.20.1/debian/tmp/usr/share/doc/git/html
 make[2]: Leaving directory '/build/git-2.20.1/contrib/subtree'
 make[2]: Entering directory '/build/git-2.20.1/contrib/subtree'
+asciidoc -b docbook -d manpage -f ../../Documentation/asciidoc.conf \
+	-agit_version=2.20.1  git-subtree.txt
+make[2]: Leaving directory '/build/git-2.20.1/contrib/subtree'
+make[2]: Entering directory '/build/git-2.20.1/contrib/subtree'
 xmlto -m ../../Documentation/manpage-normal.xsl man git-subtree.xml
 make[2]: Leaving directory '/build/git-2.20.1/contrib/subtree'
 make[2]: Entering directory '/build/git-2.20.1/contrib/subtree'
@@ -356028,19 +356303,19 @@
    dh_perl
    dh_link
    dh_strip_nondeterminism
-	Normalized debian/git/usr/share/locale/is/LC_MESSAGES/git.mo
 	Normalized debian/git/usr/share/locale/pt_PT/LC_MESSAGES/git.mo
 	Normalized debian/git/usr/share/locale/ru/LC_MESSAGES/git.mo
-	Normalized debian/git/usr/share/locale/ko/LC_MESSAGES/git.mo
+	Normalized debian/git/usr/share/locale/is/LC_MESSAGES/git.mo
+	Normalized debian/git/usr/share/locale/ca/LC_MESSAGES/git.mo
+	Normalized debian/git/usr/share/locale/es/LC_MESSAGES/git.mo
 	Normalized debian/git/usr/share/locale/fr/LC_MESSAGES/git.mo
+	Normalized debian/git/usr/share/locale/ko/LC_MESSAGES/git.mo
+	Normalized debian/git/usr/share/locale/sv/LC_MESSAGES/git.mo
+	Normalized debian/git/usr/share/locale/de/LC_MESSAGES/git.mo
 	Normalized debian/git/usr/share/locale/it/LC_MESSAGES/git.mo
-	Normalized debian/git/usr/share/locale/ca/LC_MESSAGES/git.mo
+	Normalized debian/git/usr/share/locale/vi/LC_MESSAGES/git.mo
 	Normalized debian/git/usr/share/locale/zh_CN/LC_MESSAGES/git.mo
 	Normalized debian/git/usr/share/locale/bg/LC_MESSAGES/git.mo
-	Normalized debian/git/usr/share/locale/es/LC_MESSAGES/git.mo
-	Normalized debian/git/usr/share/locale/vi/LC_MESSAGES/git.mo
-	Normalized debian/git/usr/share/locale/de/LC_MESSAGES/git.mo
-	Normalized debian/git/usr/share/locale/sv/LC_MESSAGES/git.mo
    debian/rules override_dh_compress
 make[1]: Entering directory '/build/git-2.20.1'
 dh_compress -X.txt -Xcontrib
@@ -356062,14 +356337,14 @@
    dh_builddeb
 dpkg-deb: building package 'git-dbgsym' in '../git-dbgsym_2.20.1-2+deb10u3_amd64.deb'.
 dpkg-deb: building package 'git-man' in '../git-man_2.20.1-2+deb10u3_all.deb'.
-dpkg-deb: building package 'git-svn' in '../git-svn_2.20.1-2+deb10u3_all.deb'.
+dpkg-deb: building package 'git-cvs' in '../git-cvs_2.20.1-2+deb10u3_all.deb'.
 dpkg-deb: building package 'git-doc' in '../git-doc_2.20.1-2+deb10u3_all.deb'.
+dpkg-deb: building package 'git-svn' in '../git-svn_2.20.1-2+deb10u3_all.deb'.
 dpkg-deb: building package 'git-mediawiki' in '../git-mediawiki_2.20.1-2+deb10u3_all.deb'.
-dpkg-deb: building package 'git-cvs' in '../git-cvs_2.20.1-2+deb10u3_all.deb'.
 dpkg-deb: building package 'git-email' in '../git-email_2.20.1-2+deb10u3_all.deb'.
 dpkg-deb: building package 'git-gui' in '../git-gui_2.20.1-2+deb10u3_all.deb'.
-dpkg-deb: building package 'git-all' in '../git-all_2.20.1-2+deb10u3_all.deb'.
 dpkg-deb: building package 'gitk' in '../gitk_2.20.1-2+deb10u3_all.deb'.
+dpkg-deb: building package 'git-all' in '../git-all_2.20.1-2+deb10u3_all.deb'.
 dpkg-deb: building package 'git-el' in '../git-el_2.20.1-2+deb10u3_all.deb'.
 dpkg-deb: building package 'git' in '../git_2.20.1-2+deb10u3_amd64.deb'.
 dpkg-deb: building package 'git-daemon-run' in '../git-daemon-run_2.20.1-2+deb10u3_all.deb'.
@@ -356082,12 +356357,14 @@
 dpkg-buildpackage: info: binary-only upload (no source included)
 dpkg-genchanges: info: not including original source code in upload
 I: copying local configuration
+I: user script /srv/workspace/pbuilder/2302516/tmp/hooks/B01_cleanup starting
+I: user script /srv/workspace/pbuilder/2302516/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/2804152 and its subdirectories
-I: Current time: Thu Dec  2 17:16:33 -12 2021
-I: pbuilder-time-stamp: 1638508593
+I: removing directory /srv/workspace/pbuilder/2302516 and its subdirectories
+I: Current time: Fri Jan  6 01:53:47 +14 2023
+I: pbuilder-time-stamp: 1672919627